0 files changed, 0 insertions, 0 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 0000000000..7c32d1f7ee
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,37 @@
+;; Copyright (c) 2018 Urabe, Shyouhei.  All rights reserved.
+;;
+;; This file is a part of  the programming language Ruby.  Permission is hereby
+;; granted, to either  redistribute and/or modify this file,  provided that the
+;; conditions mentioned  in the  file COPYING  are met.   Consult the  file for
+;; details.
+
+((nil .
+     ((indent-tabs-mode . nil)
+      (require-final-newline . t)
+      (tab-width . 8)
+      (show-trailing-whitespace . t)
+      (whitespace-line-column . 80))) ;; See also [Misc #12277]
+
+ ;; (bat-mode . ((buffer-file-coding-system . utf-8-dos)))
+
+ (ruby-mode . ((ruby-indent-level . 2)))
+
+ (rdoc-mode . ((fill-column . 74)))
+
+ (yaml-mode . ((yaml-indent-offset . 2)))
+
+ (makefile-mode . ((indent-tabs-mode . t)))
+
+ (c-mode . ((c-file-style . "ruby")))
+
+ (change-log-mode .
+     ((buffer-file-coding-system . us-ascii)
+      (indent-tabs-mode . t)
+      (change-log-indent-text . 2)
+      (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)))))))
diff --git a/.document b/.document
index 8a05d61beb..8a418e5d4a 100644
--- a/.document
+++ b/.document
@@ -5,18 +5,38 @@
 
 # Process all the C source files
 *.c
+*.y
 
 # prelude
 prelude.rb
+rbconfig.rb
 
-# the lib/ directory (which has its own .document file)
+ast.rb
+gc.rb
+io.rb
+pack.rb
+trace_point.rb
+warning.rb
 
+# the lib/ directory (which has its own .document file)
 lib
 
-
 # and some of the ext/ directory (which has its own .document file)
-
 ext
 
 # rdoc files
-doc/*.rdoc
+NEWS
+
+README.md
+README.ja.md
+
+COPYING
+COPYING.ja
+CONTRIBUTING.md
+
+LEGAL
+
+# win32/README.win32 linked from README.md
+win32
+
+doc
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..4633a7acae
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,30 @@
+root = true
+
+[*]
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+tab_width = 8
+trim_trailing_whitespace = true
+
+[*.bat]
+end_of_line = crlf
+
+[*.gemspec]
+indent_size = 2
+
+[*.rb]
+indent_size = 2
+
+[*.yml]
+indent_size = 2
+
+[{*[Mm]akefile*,*.mak,*.mk,depend}]
+indent_style = tab
+
+[enc/*]
+indent_size = 2
+
+[reg*.[ch]]
+indent_size = 2
diff --git a/.gdbinit b/.gdbinit
index 2a38da8892..0d44622691 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -1,80 +1,36 @@
-define rp
+set startup-with-shell off
+
+define hook-run
+  set $color_type = 0
+  set $color_highlite = 0
+  set $color_end = 0
+end
+
+define ruby_gdb_init
+  if !$color_type
+    set $color_type = "\033[31m"
+  end
+  if !$color_highlite
+    set $color_highlite = "\033[36m"
+  end
+  if !$color_end
+    set $color_end = "\033[m"
+  end
   if ruby_dummy_gdb_enums.special_consts
   end
+end
+
+# set prompt \033[36m(gdb)\033[m\040
+
+define rp
+  ruby_gdb_init
   if (VALUE)($arg0) & RUBY_FIXNUM_FLAG
     printf "FIXNUM: %ld\n", (long)($arg0) >> 1
   else
   if ((VALUE)($arg0) & ~(~(VALUE)0<<RUBY_SPECIAL_SHIFT)) == RUBY_SYMBOL_FLAG
     set $id = (($arg0) >> RUBY_SPECIAL_SHIFT)
-    if $id == '!' || $id == '+' || $id == '-' || $id == '*' || $id == '/' || $id == '%' || $id == '<' || $id == '>' || $id == '`'
-      printf "SYMBOL(:%c)\n", $id
-    else
-    if $id == idDot2
-      echo SYMBOL(:..)\n
-    else
-    if $id == idDot3
-      echo SYMBOL(:...)\n
-    else
-    if $id == idUPlus
-      echo SYMBOL(:+@)\n
-    else
-    if $id == idUMinus
-      echo SYMBOL(:-@)\n
-    else
-    if $id == idPow
-      echo SYMBOL(:**)\n
-    else
-    if $id == idCmp
-      echo SYMBOL(:<=>)\n
-    else
-    if $id == idLTLT
-      echo SYMBOL(:<<)\n
-    else
-    if $id == idLE
-      echo SYMBOL(:<=)\n
-    else
-    if $id == idGE
-      echo SYMBOL(:>=)\n
-    else
-    if $id == idEq
-      echo SYMBOL(:==)\n
-    else
-    if $id == idEqq
-      echo SYMBOL(:===)\n
-    else
-    if $id == idNeq
-      echo SYMBOL(:!=)\n
-    else
-    if $id == idEqTilde
-      echo SYMBOL(:=~)\n
-    else
-    if $id == idNeqTilde
-      echo SYMBOL(:!~)\n
-    else
-    if $id == idAREF
-      echo SYMBOL(:[])\n
-    else
-    if $id == idASET
-      echo SYMBOL(:[]=)\n
-    else
-      printf "SYMBOL(%ld)\n", $id
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
+    printf "%sSYMBOL%s: ", $color_type, $color_end
+    rp_id $id
   else
   if ($arg0) == RUBY_Qfalse
     echo false\n
@@ -89,85 +45,69 @@ define rp
     echo undef\n
   else
   if (VALUE)($arg0) & RUBY_IMMEDIATE_MASK
-    echo immediate\n
+    if ((VALUE)($arg0) & RUBY_FLONUM_MASK) == RUBY_FLONUM_FLAG
+      printf "%sFLONUM%s: %g\n", $color_type, $color_end, (double)rb_float_value($arg0)
+    else
+      echo immediate\n
+    end
   else
   set $flags = ((struct RBasic*)($arg0))->flags
+  if ($flags & RUBY_FL_PROMOTED) == RUBY_FL_PROMOTED
+    printf "[PROMOTED] "
+  end
   if ($flags & RUBY_T_MASK) == RUBY_T_NONE
-    printf "T_NONE: "
+    printf "%sT_NONE%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_NIL
-    printf "T_NIL: "
+    printf "%sT_NIL%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_OBJECT
-    printf "T_OBJECT: "
-    print (struct RObject *)($arg0)
+    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)
+      if (((struct RObject*)($arg0))->as.heap.numiv) > 0
+        print/x *(((struct RObject*)($arg0))->as.heap.ivptr) @ (((struct RObject*)($arg0))->as.heap.numiv)
+      end
+    end
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_CLASS
-    printf "T_CLASS%s: ", ($flags & RUBY_FL_SINGLETON) ? "*" : ""
-    print (struct RClass *)($arg0)
+    printf "%sT_CLASS%s%s: ", $color_type, ($flags & RUBY_FL_SINGLETON) ? "*" : "", $color_end
+    rp_class $arg0
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_ICLASS
-    printf "T_ICLASS: "
-    print (struct RClass *)($arg0)
+    printf "%sT_ICLASS%s: ", $color_type, $color_end
+    rp_class $arg0
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_MODULE
-    printf "T_MODULE: "
-    print (struct RClass *)($arg0)
+    printf "%sT_MODULE%s: ", $color_type, $color_end
+    rp_class $arg0
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_FLOAT
-    printf "T_FLOAT: %.16g ", (((struct RFloat*)($arg0))->float_value)
+    printf "%sT_FLOAT%s: %.16g ", $color_type, $color_end, (((struct RFloat*)($arg0))->float_value)
     print (struct RFloat *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_STRING
-    printf "T_STRING: "
-    set print address off
-    output (char *)(($flags & RUBY_FL_USER1) ? \
-	    ((struct RString*)($arg0))->as.heap.ptr : \
-	    ((struct RString*)($arg0))->as.ary)
-    set print address on
-    printf " bytesize:%ld ", ($flags & RUBY_FL_USER1) ? \
-            ((struct RString*)($arg0))->as.heap.len : \
-            (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
-    if !($flags & RUBY_FL_USER1)
-      printf "(embed) "
-    else
-      if ($flags & RUBY_FL_USER2)
-        printf "(shared) "
-      end
-      if ($flags & RUBY_FL_USER3)
-        printf "(assoc) "
-      end
-    end
-    printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
-    if ($flags & RUBY_ENC_CODERANGE_MASK) == 0
-      printf "coderange:unknown "
-    else
-    if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_7BIT
-      printf "coderange:7bit "
-    else
-    if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_VALID
-      printf "coderange:valid "
-    else
-      printf "coderange:broken "
-    end
-    end
-    end
-    print (struct RString *)($arg0)
+    printf "%sT_STRING%s: ", $color_type, $color_end
+    rp_string $arg0 $flags
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_REGEXP
     set $regsrc = ((struct RRegexp*)($arg0))->src
     set $rsflags = ((struct RBasic*)$regsrc)->flags
-    printf "T_REGEXP: "
+    printf "%sT_REGEXP%s: ", $color_type, $color_end
+    set $len = ($rsflags & RUBY_FL_USER1) ? \
+            ((struct RString*)$regsrc)->as.heap.len : \
+            (($rsflags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
     set print address off
-    output (char *)(($rsflags & RUBY_FL_USER1) ? \
+    output *(char *)(($rsflags & RUBY_FL_USER1) ? \
 	    ((struct RString*)$regsrc)->as.heap.ptr : \
-	    ((struct RString*)$regsrc)->as.ary)
+	    ((struct RString*)$regsrc)->as.ary) @ $len
     set print address on
-    printf " len:%ld ", ($rsflags & RUBY_FL_USER1) ? \
-            ((struct RString*)$regsrc)->as.heap.len : \
-            (($rsflags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
+    printf " len:%ld ", $len
     if $flags & RUBY_FL_USER6
       printf "(none) "
     end
@@ -183,17 +123,17 @@ define rp
   if ($flags & RUBY_T_MASK) == RUBY_T_ARRAY
     if ($flags & RUBY_FL_USER1)
       set $len = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3))
-      printf "T_ARRAY: len=%ld ", $len
+      printf "%sT_ARRAY%s: len=%ld ", $color_type, $color_end, $len
       printf "(embed) "
       if ($len == 0)
 	printf "{(empty)} "
       else
-	output/x *((VALUE*)((struct RArray*)($arg0))->as.ary) @ $len
+	print/x *((VALUE*)((struct RArray*)($arg0))->as.ary) @ $len
 	printf " "
       end
     else
       set $len = ((struct RArray*)($arg0))->as.heap.len
-      printf "T_ARRAY: len=%ld ", $len
+      printf "%sT_ARRAY%s: len=%ld ", $color_type, $color_end, $len
       if ($flags & RUBY_FL_USER2)
 	printf "(shared) shared="
 	output/x ((struct RArray*)($arg0))->as.heap.aux.shared
@@ -204,101 +144,128 @@ define rp
       if ($len == 0)
 	printf "{(empty)} "
       else
-	output/x *((VALUE*)((struct RArray*)($arg0))->as.heap.ptr) @ $len
+	print/x *((VALUE*)((struct RArray*)($arg0))->as.heap.ptr) @ $len
 	printf " "
       end
     end
     print (struct RArray *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_FIXNUM
-    printf "T_FIXNUM: "
+    printf "%sT_FIXNUM%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_HASH
-    printf "T_HASH: ",
-    if ((struct RHash *)($arg0))->ntbl
-      printf "len=%ld ", ((struct RHash *)($arg0))->ntbl->num_entries
+    printf "%sT_HASH%s: ", $color_type, $color_end,
+    if (((struct RHash *)($arg0))->basic->flags & RHASH_ST_TABLE_FLAG)
+      printf "st len=%ld ", ((struct RHash *)($arg0))->as.st->num_entries
+    else
+      printf "li len=%ld bound=%ld ", \
+        ((((struct RHash *)($arg0))->basic->flags & RHASH_AR_TABLE_SIZE_MASK) >> RHASH_AR_TABLE_SIZE_SHIFT), \
+        ((((struct RHash *)($arg0))->basic->flags & RHASH_AR_TABLE_BOUND_MASK) >> RHASH_AR_TABLE_BOUND_SHIFT)
     end
     print (struct RHash *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_STRUCT
-    printf "T_STRUCT: len=%ld ", \
-      (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
+    set $len = (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
        ($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) >> (RUBY_FL_USHIFT+1) : \
        ((struct RStruct *)($arg0))->as.heap.len)
+    printf "%sT_STRUCT%s: len=%ld ", $color_type, $color_end, $len
     print (struct RStruct *)($arg0)
-    x/xw (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
-          ((struct RStruct *)($arg0))->as.ary : \
-          ((struct RStruct *)($arg0))->as.heap.ptr)
+    output/x *(($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
+              ((struct RStruct *)($arg0))->as.ary : \
+              ((struct RStruct *)($arg0))->as.heap.ptr) @ $len
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_BIGNUM
-    printf "T_BIGNUM: sign=%d len=%ld ", \
-      (($flags & RUBY_FL_USER1) != 0), \
-      (($flags & RUBY_FL_USER2) ? \
-       ($flags & (RUBY_FL_USER5|RUBY_FL_USER4|RUBY_FL_USER3)) >> (RUBY_FL_USHIFT+3) : \
-       ((struct RBignum*)($arg0))->as.heap.len)
-    if $flags & RUBY_FL_USER2
-      printf "(embed) "
-    end
-    print (struct RBignum *)($arg0)
-    x/xw (($flags & RUBY_FL_USER2) ? \
-          ((struct RBignum*)($arg0))->as.ary : \
-          ((struct RBignum*)($arg0))->as.heap.digits)
+    rp_bignum $arg0
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_RATIONAL
-    printf "T_RATIONAL: "
+    printf "%sT_RATIONAL%s: ", $color_type, $color_end
     print (struct RRational *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_COMPLEX
-    printf "T_COMPLEX: "
+    printf "%sT_COMPLEX%s: ", $color_type, $color_end
     print (struct RComplex *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_FILE
-    printf "T_FILE: "
+    printf "%sT_FILE%s: ", $color_type, $color_end
     print (struct RFile *)($arg0)
     output *((struct RFile *)($arg0))->fptr
     printf "\n"
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_TRUE
-    printf "T_TRUE: "
+    printf "%sT_TRUE%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_FALSE
-    printf "T_FALSE: "
+    printf "%sT_FALSE%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_DATA
     if ((struct RTypedData *)($arg0))->typed_flag == 1
-      printf "T_DATA(%s): ", ((struct RTypedData *)($arg0))->type->wrap_struct_name
+      printf "%sT_DATA%s(%s): ", $color_type, $color_end, ((struct RTypedData *)($arg0))->type->wrap_struct_name
       print (struct RTypedData *)($arg0)
     else
-      printf "T_DATA: "
+      printf "%sT_DATA%s: ", $color_type, $color_end
       print (struct RData *)($arg0)
     end
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_MATCH
-    printf "T_MATCH: "
+    printf "%sT_MATCH%s: ", $color_type, $color_end
     print (struct RMatch *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_SYMBOL
-    printf "T_SYMBOL: "
-    print (struct RBasic *)($arg0)
+    printf "%sT_SYMBOL%s: ", $color_type, $color_end
+    print (struct RSymbol *)($arg0)
+    set $id_type = ((struct RSymbol *)($arg0))->id & RUBY_ID_SCOPE_MASK
+    if $id_type == RUBY_ID_LOCAL
+      printf "l"
+    else
+    if $id_type == RUBY_ID_INSTANCE
+      printf "i"
+    else
+    if $id_type == RUBY_ID_GLOBAL
+      printf "G"
+    else
+    if $id_type == RUBY_ID_ATTRSET
+      printf "a"
+    else
+    if $id_type == RUBY_ID_CONST
+      printf "C"
+    else
+    if $id_type == RUBY_ID_CLASS
+      printf "c"
+    else
+      printf "j"
+    end
+    end
+    end
+    end
+    end
+    end
+    set $id_fstr = ((struct RSymbol *)($arg0))->fstr
+    rp_string $id_fstr
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_UNDEF
-    printf "T_UNDEF: "
+    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)&RUBY_IMEMO_MASK)
+    printf "): "
+    rp_imemo $arg0
+  else
   if ($flags & RUBY_T_MASK) == RUBY_T_NODE
-    printf "T_NODE("
+    printf "%sT_NODE%s(", $color_type, $color_end
     output (enum node_type)(($flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
     printf "): "
     print *(NODE *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_ZOMBIE
-    printf "T_ZOMBIE: "
+    printf "%sT_ZOMBIE%s: ", $color_type, $color_end
     print (struct RData *)($arg0)
   else
-    printf "unknown: "
+    printf "%sunknown%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   end
   end
@@ -332,11 +299,302 @@ define rp
   end
   end
   end
+  end
 end
 document rp
   Print a Ruby's VALUE.
 end
 
+define rp_id
+  set $id = (ID)$arg0
+  if $id == '!' || $id == '+' || $id == '-' || $id == '*' || $id == '/' || $id == '%' || $id == '<' || $id == '>' || $id == '`'
+    printf "(:%c)\n", $id
+  else
+  if $id == idDot2
+    printf "(:..)\n"
+  else
+  if $id == idDot3
+    printf "(:...)\n"
+  else
+  if $id == idUPlus
+    printf "(:+@)\n"
+  else
+  if $id == idUMinus
+    printf "(:-@)\n"
+  else
+  if $id == idPow
+    printf "(:**)\n"
+  else
+  if $id == idCmp
+    printf "(:<=>)\n"
+  else
+  if $id == idLTLT
+    printf "(:<<)\n"
+  else
+  if $id == idGTGT
+    printf "(:>>)\n"
+  else
+  if $id == idLE
+    printf "(:<=)\n"
+  else
+  if $id == idGE
+    printf "(:>=)\n"
+  else
+  if $id == idEq
+    printf "(:==)\n"
+  else
+  if $id == idEqq
+    printf "(:===)\n"
+  else
+  if $id == idNeq
+    printf "(:!=)\n"
+  else
+  if $id == idEqTilde
+    printf "(:=~)\n"
+  else
+  if $id == idNeqTilde
+    printf "(:!~)\n"
+  else
+  if $id == idAREF
+    printf "(:[])\n"
+  else
+  if $id == idASET
+    printf "(:[]=)\n"
+  else
+  if $id == idCOLON2
+    printf "(:'::')\n"
+  else
+  if $id == idANDOP
+    printf "(:&&)\n"
+  else
+  if $id == idOROP
+    printf "(:||)\n"
+  else
+  if $id == idANDDOT
+    printf "(:&.)\n"
+  else
+    if $id <= tLAST_OP_ID
+      printf "O"
+    else
+      set $id_type = $id & RUBY_ID_SCOPE_MASK
+      if $id_type == RUBY_ID_LOCAL
+        printf "l"
+      else
+      if $id_type == RUBY_ID_INSTANCE
+        printf "i"
+      else
+      if $id_type == RUBY_ID_GLOBAL
+        printf "G"
+      else
+      if $id_type == RUBY_ID_ATTRSET
+        printf "a"
+      else
+      if $id_type == RUBY_ID_CONST
+        printf "C"
+      else
+      if $id_type == RUBY_ID_CLASS
+        printf "c"
+      else
+        printf "j"
+      end
+      end
+      end
+      end
+      end
+      end
+    end
+    printf "(%ld): ", $id
+    print_id $id
+    echo \n
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+end
+document rp_id
+  Print an ID.
+end
+
+define output_string
+  set $flags = ((struct RBasic*)($arg0))->flags
+  set $len = ($flags & RUBY_FL_USER1) ? \
+          ((struct RString*)($arg0))->as.heap.len : \
+          (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
+  if $len > 0
+    output *(char *)(($flags & RUBY_FL_USER1) ? \
+	    ((struct RString*)($arg0))->as.heap.ptr : \
+	    ((struct RString*)($arg0))->as.ary) @ $len
+  else
+    output ""
+  end
+end
+
+define print_string
+  set $flags = ((struct RBasic*)($arg0))->flags
+  set $len = ($flags & RUBY_FL_USER1) ? \
+          ((struct RString*)($arg0))->as.heap.len : \
+          (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
+  if $len > 0
+    printf "%s", *(char *)(($flags & RUBY_FL_USER1) ? \
+	    ((struct RString*)($arg0))->as.heap.ptr : \
+	    ((struct RString*)($arg0))->as.ary) @ $len
+  end
+end
+
+define rp_string
+  output_string $arg0
+  printf " bytesize:%ld ", $len
+  if !($flags & RUBY_FL_USER1)
+    printf "(embed) "
+  else
+    if ($flags & RUBY_FL_USER2)
+      printf "(shared) "
+    end
+    if ($flags & RUBY_FL_USER3)
+      printf "(assoc) "
+    end
+  end
+  printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
+  if ($flags & RUBY_ENC_CODERANGE_MASK) == 0
+    printf "coderange:unknown "
+  else
+  if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_7BIT
+    printf "coderange:7bit "
+  else
+  if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_VALID
+    printf "coderange:valid "
+  else
+    printf "coderange:broken "
+  end
+  end
+  end
+  print (struct RString *)($arg0)
+end
+document rp_string
+  Print the content of a String.
+end
+
+define rp_bignum
+  set $flags = ((struct RBignum*)($arg0))->basic.flags
+  set $len = (($flags & RUBY_FL_USER2) ? \
+       ($flags & (RUBY_FL_USER5|RUBY_FL_USER4|RUBY_FL_USER3)) >> (RUBY_FL_USHIFT+3) : \
+       ((struct RBignum*)($arg0))->as.heap.len)
+  printf "%sT_BIGNUM%s: sign=%d len=%ld ", $color_type, $color_end, \
+         (($flags & RUBY_FL_USER1) != 0), $len
+  if $flags & RUBY_FL_USER2
+    printf "(embed) "
+  end
+  print (struct RBignum *)($arg0)
+  set $ptr = (($flags & RUBY_FL_USER2) ? \
+              ((struct RBignum*)($arg0))->as.ary : \
+              ((struct RBignum*)($arg0))->as.heap.digits)
+  set $len = $len-1
+  printf "0x%x", $ptr[$len]
+  while $len > 0
+    set $len = $len-1
+    set $val = $ptr[$len]
+    set $w = sizeof($ptr[0])
+    printf "_"
+    if $w > 8
+      printf "%.32x", $val
+    else
+    if $w > 4
+      printf "%.16x", $val
+    else
+    if $w > 2
+      printf "%.8x", $val
+    else
+    if $w > 1
+      printf "%.4x", $val
+    else
+      printf "%.2x", $val
+    end
+    end
+    end
+    end
+  end
+  printf "\n"
+end
+document rp_bignum
+  Print the content of a Bignum.
+end
+
+define rp_class
+  printf "(struct RClass *) %p", (void*)$arg0
+  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))->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) & RUBY_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
@@ -361,260 +619,237 @@ end
 # Print members of ruby node.
 
 define nd_head
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_alen
-  printf "u2.argc: "
+  printf "%su2.argc%s: ", $color_highlite, $color_end
   p ($arg0).u2.argc
 end
 
 define nd_next
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_cond
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_body
-  printf "u2.node: "
+  printf "%su2.node%s: ", $color_highlite, $color_end
   rp ($arg0).u2.node
 end
 
 define nd_else
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_orig
-  printf "u3.value: "
+  printf "%su3.value%s: ", $color_highlite, $color_end
   rp ($arg0).u3.value
 end
 
 
 define nd_resq
-  printf "u2.node: "
+  printf "%su2.node%s: ", $color_highlite, $color_end
   rp ($arg0).u2.node
 end
 
 define nd_ensr
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_1st
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_2nd
-  printf "u2.node: "
+  printf "%su2.node%s: ", $color_highlite, $color_end
   rp ($arg0).u2.node
 end
 
 
 define nd_stts
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 
 define nd_entry
-  printf "u3.entry: "
+  printf "%su3.entry%s: ", $color_highlite, $color_end
   p ($arg0).u3.entry
 end
 
 define nd_vid
-  printf "u1.id: "
+  printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
 end
 
 define nd_cflag
-  printf "u2.id: "
+  printf "%su2.id%s: ", $color_highlite, $color_end
   p ($arg0).u2.id
 end
 
 define nd_cval
-  printf "u3.value: "
+  printf "%su3.value%s: ", $color_highlite, $color_end
   rp ($arg0).u3.value
 end
 
-
-define nd_cnt
-  printf "u3.cnt: "
-  p ($arg0).u3.cnt
-end
-
 define nd_tbl
-  printf "u1.tbl: "
+  printf "%su1.tbl%s: ", $color_highlite, $color_end
   p ($arg0).u1.tbl
 end
 
 
 define nd_var
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_ibdy
-  printf "u2.node: "
+  printf "%su2.node%s: ", $color_highlite, $color_end
   rp ($arg0).u2.node
 end
 
 define nd_iter
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_value
-  printf "u2.node: "
+  printf "%su2.node%s: ", $color_highlite, $color_end
   rp ($arg0).u2.node
 end
 
 define nd_aid
-  printf "u3.id: "
+  printf "%su3.id%s: ", $color_highlite, $color_end
   p ($arg0).u3.id
 end
 
 
 define nd_lit
-  printf "u1.value: "
+  printf "%su1.value%s: ", $color_highlite, $color_end
   rp ($arg0).u1.value
 end
 
-
-define nd_frml
-  printf "u1.node: "
-  rp ($arg0).u1.node
-end
-
 define nd_rest
-  printf "u2.argc: "
+  printf "%su2.argc%s: ", $color_highlite, $color_end
   p ($arg0).u2.argc
 end
 
 define nd_opt
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 
 define nd_recv
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_mid
-  printf "u2.id: "
+  printf "%su2.id%s: ", $color_highlite, $color_end
   p ($arg0).u2.id
 end
 
 define nd_args
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
-
-define nd_noex
-  printf "u1.id: "
-  p ($arg0).u1.id
-end
-
 define nd_defn
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_old
-  printf "u1.id: "
+  printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
 end
 
 define nd_new
-  printf "u2.id: "
+  printf "%su2.id%s: ", $color_highlite, $color_end
   p ($arg0).u2.id
 end
 
 
-define nd_cfnc
-  printf "u1.cfunc: "
-  p ($arg0).u1.cfunc
-end
-
-define nd_argc
-  printf "u2.argc: "
-  p ($arg0).u2.argc
-end
-
-
 define nd_cname
-  printf "u1.id: "
+  printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
 end
 
 define nd_super
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_modl
-  printf "u1.id: "
+  printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
 end
 
 define nd_clss
-  printf "u1.value: "
+  printf "%su1.value%s: ", $color_highlite, $color_end
   rp ($arg0).u1.value
 end
 
 
 define nd_beg
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_end
-  printf "u2.node: "
+  printf "%su2.node%s: ", $color_highlite, $color_end
   rp ($arg0).u2.node
 end
 
 define nd_state
-  printf "u3.state: "
+  printf "%su3.state%s: ", $color_highlite, $color_end
   p ($arg0).u3.state
 end
 
 define nd_rval
-  printf "u2.value: "
+  printf "%su2.value%s: ", $color_highlite, $color_end
   rp ($arg0).u2.value
 end
 
 
 define nd_nth
-  printf "u2.argc: "
+  printf "%su2.argc%s: ", $color_highlite, $color_end
   p ($arg0).u2.argc
 end
 
 
 define nd_tag
-  printf "u1.id: "
+  printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
 end
 
 define nd_tval
-  printf "u2.value: "
+  printf "%su2.value%s: ", $color_highlite, $color_end
   rp ($arg0).u2.value
 end
 
+define nd_tree
+  set $buf = (struct RString *)rb_str_buf_new(0)
+  call dump_node((VALUE)($buf), rb_str_tmp_new(0), 0, ($arg0))
+  printf "%s\n", $buf->as.heap.ptr
+end
+
 define rb_p
   call rb_p($arg0)
 end
@@ -625,18 +860,18 @@ define rb_numtable_entry
   set $rb_numtable_key = 0
   set $rb_numtable_rec = 0
   if $rb_numtable_tbl->entries_packed
-    set $rb_numtable_p = $rb_numtable_tbl->bins
-    while $rb_numtable_p && $rb_numtable_p < $rb_numtable_tbl->bins+$rb_numtable_tbl->num_entries
-      if (st_data_t)$rb_numtable_p[0] == $rb_numtable_id
-	set $rb_numtable_key = (st_data_t)$rb_numtable_p[0]
-	set $rb_numtable_rec = (st_data_t)$rb_numtable_p[1]
+    set $rb_numtable_p = $rb_numtable_tbl->as.packed.bins
+    while $rb_numtable_p && $rb_numtable_p < $rb_numtable_tbl->as.packed.bins+$rb_numtable_tbl->num_entries
+      if $rb_numtable_p.k == $rb_numtable_id
+	set $rb_numtable_key = $rb_numtable_p.k
+	set $rb_numtable_rec = $rb_numtable_p.v
 	set $rb_numtable_p = 0
       else
-	set $rb_numtable_p = $rb_numtable_p + 2
+	set $rb_numtable_p = $rb_numtable_p + 1
       end
     end
   else
-    set $rb_numtable_p = $rb_numtable_tbl->bins[$rb_numtable_id % $rb_numtable_tbl->num_bins]
+    set $rb_numtable_p = $rb_numtable_tbl->as.big.bins[st_numhash($rb_numtable_id) % $rb_numtable_tbl->num_bins]
     while $rb_numtable_p
       if $rb_numtable_p->key == $rb_numtable_id
 	set $rb_numtable_key = $rb_numtable_p->key
@@ -650,12 +885,9 @@ define rb_numtable_entry
 end
 
 define rb_id2name
-  rb_numtable_entry global_symbols.id_str (ID)$arg0
-  if $rb_numtable_rec
-    rp $rb_numtable_rec
-  else
-    echo undef\n
-  end
+  ruby_gdb_init
+  printf "%sID%s: ", $color_type, $color_end
+  rp_id $arg0
 end
 document rb_id2name
   Print the name of id
@@ -666,10 +898,10 @@ define rb_method_entry
   set $rb_method_entry_id = (ID)$arg1
   set $rb_method_entry_me = (rb_method_entry_t *)0
   while !$rb_method_entry_me && $rb_method_entry_klass
-    rb_numtable_entry $rb_method_entry_klass->m_tbl $rb_method_entry_id
+    rb_numtable_entry $rb_method_entry_klass->m_tbl_wrapper->tbl $rb_method_entry_id
     set $rb_method_entry_me = (rb_method_entry_t *)$rb_numtable_rec
     if !$rb_method_entry_me
-      set $rb_method_entry_klass = (struct RClass *)$rb_method_entry_klass->ptr->super
+      set $rb_method_entry_klass = (struct RClass *)RCLASS_SUPER($rb_method_entry_klass)
     end
   end
   if $rb_method_entry_me
@@ -684,9 +916,24 @@ document rb_method_entry
 end
 
 define rb_classname
-  call classname($arg0)
-  rb_p $
-  print *(struct RClass*)($arg0)
+  # up to 128bit int
+  set $rb_classname = rb_mod_name($arg0)
+  if $rb_classname != RUBY_Qnil
+    rp $rb_classname
+  else
+    echo anonymous class/module\n
+  end
+end
+
+define rb_ancestors
+  set $rb_ancestors_module = $arg0
+  while $rb_ancestors_module
+    rp_class $rb_ancestors_module
+    set $rb_ancestors_module = RCLASS_SUPER($rb_ancestors_module)
+  end
+end
+document rb_ancestors
+  Print ancestors.
 end
 
 define rb_backtrace
@@ -694,7 +941,7 @@ define rb_backtrace
 end
 
 define iseq
-  if dummy_gdb_enums.special_consts
+  if ruby_dummy_gdb_enums.special_consts
   end
   if ($arg0)->type == ISEQ_ELEMENT_NONE
     echo [none]\n
@@ -719,7 +966,7 @@ define iseq
 end
 
 define rb_ps
-  rb_ps_vm ruby_current_vm
+  rb_ps_vm ruby_current_vm_ptr
 end
 document rb_ps
 Dump all threads and their callstacks
@@ -727,31 +974,373 @@ end
 
 define rb_ps_vm
   print $ps_vm = (rb_vm_t*)$arg0
-  set $ps_threads = (st_table*)$ps_vm->living_threads
-  if $ps_threads->entries_packed
-    set $ps_threads_i = 0
-    while $ps_threads_i < $ps_threads->num_entries
-      set $ps_threads_key = (st_data_t)$ps_threads->bins[$ps_threads_i * 2]
-      set $ps_threads_val = (st_data_t)$ps_threads->bins[$ps_threads_i * 2 + 1]
-      rb_ps_thread $ps_threads_key $ps_threads_val
-      set $ps_threads_i = $ps_threads_i + 1
-    end
-  else
-    set $ps_threads_ptr = (st_table_entry*)$ps_threads->head
-    while $ps_threads_ptr
-      set $ps_threads_key = (st_data_t)$ps_threads_ptr->key
-      set $ps_threads_val = (st_data_t)$ps_threads_ptr->record
-      rb_ps_thread $ps_threads_key $ps_threads_val
-      set $ps_threads_ptr = (st_table_entry*)$ps_threads_ptr->fore
+  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
     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 $index = 0
+  set $size = $iseq->body->insns_info.size
+  set $table = $iseq->body->insns_info.body
+  set $positions = $iseq->body->insns_info.positions
+  #printf "size: %d\n", $size
+  if $size == 0
+  else
+  if $size == 1
+    printf "%d", $table[0].line_no
+  else
+    if $positions
+      # get_insn_info_linear_search
+      set $index = 1
+      while $index < $size
+        #printf "table[%d]: position: %d, line: %d, pos: %d\n", $i, $positions[$i], $table[$i].line_no, $pos
+        if $positions[$index] > $pos
+          loop_break
+        end
+        set $index = $index + 1
+        if $positions[$index] == $pos
+          loop_break
+        end
+      end
+    else
+      # get_insn_info_succinct_bitvector
+      set $sd = $iseq->body->insns_info.succ_index_table
+      set $immediate_table_size = sizeof($sd->imm_part) / sizeof(uint64_t) * 9
+      if $pos < $immediate_table_size
+        set $i = $pos / 9
+        set $j = $pos % 9
+        set $index = ((int)($sd->imm_part[$i] >> ($j * 7))) & 0x7f
+      else
+        set $block_index = ($pos - $immediate_table_size) / 512
+        set $block = &$sd->succ_part[$block_index]
+        set $block_bit_index = ($pos - $immediate_table_size) % 512
+        set $small_block_index = $block_bit_index / 64
+        set $small_block_popcount = $small_block_index == 0 ? 0 : (((int)($block->small_block_ranks >> (($small_block_index - 1) * 9))) & 0x1ff)
+        set $x = $block->bits[$small_block_index] << (63 - $block_bit_index % 64)
+        set $x = ($x & 0x5555555555555555) + ($x >> 1 & 0x5555555555555555)
+        set $x = ($x & 0x3333333333333333) + ($x >> 2 & 0x3333333333333333)
+        set $x = ($x & 0x0707070707070707) + ($x >> 4 & 0x0707070707070707)
+        set $x = ($x & 0x001f001f001f001f) + ($x >> 8 & 0x001f001f001f001f)
+        set $x = ($x & 0x0000003f0000003f) + ($x >>16 & 0x0000003f0000003f)
+        set $popcnt = ($x & 0x7f) + ($x >>32 & 0x7f)
+        set $index = $block->rank + $small_block_popcount + $popcnt
+      end
+    end
+    printf "%d", $table[$index-1].line_no
+  end
+  end
+end
+
+define check_method_entry
+  set $imemo = (struct RBasic *)$arg0
+  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
+    end
+    end
+  end
+end
+
+define print_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 <= ruby_global_symbols.last_id
+    set $idx = $serial / ID_ENTRY_UNIT
+    set $ids = (struct RArray *)ruby_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]
+	if $result != RUBY_Qnil
+          print_string $result
+	else
+	  echo undef
+	end
+      end
+    end
+  end
+end
+
+define print_pathobj
+  set $flags = ((struct RBasic*)($arg0))->flags
+  if ($flags & RUBY_T_MASK) == RUBY_T_STRING
+    print_string $arg0
+  end
+  if ($flags & RUBY_T_MASK) == RUBY_T_ARRAY
+    if $flags & RUBY_FL_USER1
+      set $str = ((struct RArray*)($arg0))->as.ary[0]
+    else
+      set $str = ((struct RArray*)($arg0))->as.heap.ptr[0]
+    end
+    print_string $str
+  end
+end
+
 define rb_ps_thread
   set $ps_thread = (struct RTypedData*)$arg0
-  set $ps_thread_id = $arg1
-  print $ps_thread_th = (rb_thread_t*)$ps_thread->data
+  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->ec->cfp
+  set $cfpend = (rb_control_frame_t *)($ps_thread_th->ec->vm_stack + $ps_thread_th->ec->vm_stack_size)-1
+  while $cfp < $cfpend
+    if $cfp->iseq
+      if !((VALUE)$cfp->iseq & RUBY_IMMEDIATE_MASK) && (((imemo_ifunc << RUBY_FL_USHIFT) | RUBY_T_IMEMO)==$cfp->iseq->flags & ((RUBY_IMEMO_MASK << RUBY_FL_USHIFT) | RUBY_T_MASK))
+        printf "%d:ifunc ", $cfpend-$cfp
+        set print symbol-filename on
+        output/a $cfp->iseq.body
+        set print symbol-filename off
+        printf "\n"
+      else
+      if $cfp->pc
+        set $location = $cfp->iseq->body->location
+        printf "%d:", $cfpend-$cfp
+        print_pathobj $location.pathobj
+        printf ":"
+        print_lineno $cfp
+        printf ":in `"
+        print_string $location.label
+        printf "'\n"
+      else
+        printf "%d: ???.rb:???:in `???'\n", $cfpend-$cfp
+      end
+      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
+          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
+        end
+        printf "%d:", $cfpend-$cfp
+        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 `"
+        print_id $mid
+        printf "'\n"
+      else
+        printf "%d:unknown_frame:???:in `???'\n", $cfpend-$cfp
+      end
+    end
+    set $cfp = $cfp + 1
+  end
+end
+
+define rb_count_objects
+  set $objspace = ruby_current_vm_ptr->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.
+end
+
+# Details: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/MachineInstructionsTraceWithGDB
+define trace_machine_instructions
+  set logging on
+  set height 0
+  set width 0
+  display/i $pc
+  while !$exit_code
+    info line *$pc
+    si
+  end
+end
+
+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
+
+define print_flags
+  printf "RUBY_FL_WB_PROTECTED: %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_WB_PROTECTED ? "1" : "0"
+  printf "RUBY_FL_PROMOTED0   : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_PROMOTED0 ? "1" : "0"
+  printf "RUBY_FL_PROMOTED1   : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_PROMOTED1 ? "1" : "0"
+  printf "RUBY_FL_FINALIZE    : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_FINALIZE ? "1" : "0"
+  printf "RUBY_FL_TAINT       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_TAINT ? "1" : "0"
+  printf "RUBY_FL_UNTRUSTED   : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_UNTRUSTED ? "1" : "0"
+  printf "RUBY_FL_EXIVAR      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_EXIVAR ? "1" : "0"
+  printf "RUBY_FL_FREEZE      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_FREEZE ? "1" : "0"
+
+  printf "RUBY_FL_USER0       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER0 ? "1" : "0"
+  printf "RUBY_FL_USER1       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER1 ? "1" : "0"
+  printf "RUBY_FL_USER2       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER2 ? "1" : "0"
+  printf "RUBY_FL_USER3       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER3 ? "1" : "0"
+  printf "RUBY_FL_USER4       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER4 ? "1" : "0"
+  printf "RUBY_FL_USER5       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER5 ? "1" : "0"
+  printf "RUBY_FL_USER6       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER6 ? "1" : "0"
+  printf "RUBY_FL_USER7       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER7 ? "1" : "0"
+  printf "RUBY_FL_USER8       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER8 ? "1" : "0"
+  printf "RUBY_FL_USER9       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER9 ? "1" : "0"
+  printf "RUBY_FL_USER10      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER10 ? "1" : "0"
+  printf "RUBY_FL_USER11      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER11 ? "1" : "0"
+  printf "RUBY_FL_USER12      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER12 ? "1" : "0"
+  printf "RUBY_FL_USER13      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER13 ? "1" : "0"
+  printf "RUBY_FL_USER14      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER14 ? "1" : "0"
+  printf "RUBY_FL_USER15      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER15 ? "1" : "0"
+  printf "RUBY_FL_USER16      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER16 ? "1" : "0"
+  printf "RUBY_FL_USER17      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER17 ? "1" : "0"
+  printf "RUBY_FL_USER18      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER18 ? "1" : "0"
 end
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..d0c2d266b4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,8 @@
+*.gemspec diff=ruby
+*.rb diff=ruby
+bin svn-properties=svn:ignore=ruby
+bin/* diff=ruby
+tool/update-deps diff=ruby
+tool/make-snapshot diff=ruby
+tool/format-release diff=ruby
+tool/leaked-globals diff=ruby
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
new file mode 100644
index 0000000000..56baa29942
--- /dev/null
+++ b/.github/SECURITY.md
@@ -0,0 +1,9 @@
+# Security Policy
+
+## Supported Versions
+
+See <https://www.ruby-lang.org/en/downloads/branches/>.
+
+## Reporting a Vulnerability
+
+See <https://www.ruby-lang.org/en/security/>.
diff --git a/.github/workflows/check_branch.yml b/.github/workflows/check_branch.yml
new file mode 100644
index 0000000000..37cf3a9a8f
--- /dev/null
+++ b/.github/workflows/check_branch.yml
@@ -0,0 +1,22 @@
+# We bidirectionally synchronize github.com/ruby/ruby.git's master branch and
+# git.ruby-lang.org/ruby.git's master branch.
+# We can use a pull request's merge button only on the master branch.
+#
+# Therefore, we require to pass this "check_branch" on all protected branches
+# to prevent us from accidentally pushing commits to GitHub directly.
+#
+# Details: https://bugs.ruby-lang.org/issues/16094
+name: Pull Request
+on: [pull_request]
+jobs:
+  check_branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if branch is master
+        run: |
+          if [ "$BASE_REF" != master ]; then
+            echo "Only master branch accepts a pull request, but it's '$BASE_REF'."
+            exit 1
+          fi
+        env:
+          BASE_REF: ${{ github.base_ref }}
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
new file mode 100644
index 0000000000..515b47e141
--- /dev/null
+++ b/.github/workflows/cygwin.yml
@@ -0,0 +1,79 @@
+name: Cygwin
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+jobs:
+  make:
+    strategy:
+      matrix:
+        test_task: [test]
+        os: [windows-2019]
+        vs: [2019]
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+      - uses: actions/cache@v1
+        with:
+          path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
+          key: ${{ runner.os }}-cygwin-chocolatey-${{ matrix.os }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-cygwin-chocolatey-${{ matrix.os }}-
+            ${{ runner.os }}-cygwin-chocolatey-
+      - name: Install cygwin base packages with chocolatey
+        run: |
+          choco install --no-progress cygwin
+      - uses: actions/cache@v1
+        with:
+          path: C:\tools\cygwin\package
+          key: ${{ runner.os }}-cygwin-package-${{ matrix.os }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-cygwin-package-${{ matrix.os }}-
+            ${{ runner.os }}-cygwin-package-
+      - name: Install cygwin additional packages
+        run: |
+          C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -l C:/tools/cygwin/package -s http://mirrors.kernel.org/sourceware/cygwin/ -P autoconf,bison,gcc-core,git,libffi-devel,libgdbm-devel,libgmp-devel,libreadline-devel,libssl-devel,make,patch,ruby,zlib-devel
+        shell: cmd
+      - name: Set ENV
+        run: |
+          echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin'
+      # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
+      - name: Checkout ruby/ruby
+        run: |
+          git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src
+          git -C src reset --hard ${{ github.sha }}
+        if: github.event_name == 'push'
+        shell: cmd
+      - name: Checkout a pull request
+        run: |
+          git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src
+          git -C src reset --hard ${{ github.event.pull_request.head.sha }}
+        if: github.event_name == 'pull_request'
+        shell: cmd
+      - run: ./src/tool/actions-commit-info.sh
+        shell: bash
+        id: commit_info
+      - name: Autoconf
+        run: |
+          cd src
+          bash /usr/bin/autoconf
+        shell: cmd
+      - name: Configure
+        run: |
+          md build
+          cd build
+          bash ../src/configure
+        shell: cmd
+      - name: make
+        run: |
+          make -C build
+        shell: cmd
+      # TODO: Fix test fail on cygwin environment on GitHub Actions
+      # - name: make btest
+      #   run: |
+      #     make -C build btest
+      #   shell: cmd
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
new file mode 100644
index 0000000000..724081d9dc
--- /dev/null
+++ b/.github/workflows/macos.yml
@@ -0,0 +1,81 @@
+name: macOS
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+jobs:
+  make:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        test_task: [ "check", "test-bundler", "test-bundled-gems" ]
+      fail-fast: false
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+      - name: Disable Firewall
+        run: |
+          sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+          sudo /usr/libexec/ApplicationFirewall/socketfilterfw --getglobalstate
+      # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
+      - name: Checkout ruby/ruby
+        run: |
+          git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src
+          git -C src reset --hard "$GITHUB_SHA"
+        if: github.event_name == 'push'
+      - name: Checkout a pull request
+        run: |
+          git clone --single-branch --shallow-since=yesterday "--branch=$GITHUB_BRANCH" "https://github.com/${GITHUB_REPO}" src
+          git -C src reset --hard "$GITHUB_REV"
+        env:
+          GITHUB_REV: ${{ github.event.pull_request.head.sha }}
+          GITHUB_BRANCH: ${{ github.event.pull_request.head.ref }}
+          GITHUB_REPO: ${{ github.event.pull_request.head.repo.full_name }}
+        if: github.event_name == 'pull_request'
+      - run: ./src/tool/actions-commit-info.sh
+        id: commit_info
+      - name: Install libraries
+        run: |
+          export WAITS='5 60'
+          cd src
+          tool/travis_retry.sh brew update
+          tool/travis_retry.sh brew install gdbm gmp libffi openssl@1.1 zlib autoconf automake libtool readline
+      - name: Set ENV
+        run: |
+          echo '::set-env name=JOBS::'-j$((1 + $(sysctl -n hw.activecpu)))
+      - name: Autoconf
+        run: |
+          cd src
+          autoconf
+      - name: Configure
+        run: |
+          mkdir build
+          cd build
+          ../src/configure -C --disable-install-doc --with-openssl-dir=$(brew --prefix openssl@1.1) --with-readline-dir=$(brew --prefix readline)
+      - name: Make
+        run: make -C build $JOBS
+      - name: Extract gems
+        run: make -C build update-gems extract-gems
+        if: matrix.test_task == 'check'
+      - name: Tests
+        run: make -C build $JOBS -s ${{ matrix.test_task }}
+        env:
+          RUBY_TESTOPTS: "-q --tty=no"
+      - name: Leaked Globals
+        run: make -C build -s leaked-globals
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "attachments": [{
+                "text": "${{ job.status }}: ${{ github.workflow }} / ${{ matrix.test_task }} <https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks|${{ steps.commit_info.outputs.COMMIT_DATE }} #${{ steps.commit_info.outputs.COMMIT_NUMBER_OF_DAY }}> " +
+                        "(<https://github.com/${{ github.repository }}/commit/${{ github.sha }}|" + "${{ github.sha }}".substring(0, 10) + ">) " +
+                        "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }}",
+                "color": "danger"
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        if: failure() && github.event_name == 'push'
diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml
new file mode 100644
index 0000000000..d23c136619
--- /dev/null
+++ b/.github/workflows/mjit.yml
@@ -0,0 +1,79 @@
+name: MJIT
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+jobs:
+  test:
+    strategy:
+      matrix:
+        jit_opts: [ "--jit", "--jit-wait" ]
+      fail-fast: false
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+      - name: Install libraries
+        run: |
+          set -x
+          sudo apt-get update -q || :
+          sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby
+      # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
+      - name: Checkout ruby/ruby
+        run: |
+          git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src
+          git -C src reset --hard "$GITHUB_SHA"
+        if: github.event_name == 'push'
+      - name: Checkout a pull request
+        run: |
+          git clone --single-branch --shallow-since=yesterday "--branch=$GITHUB_BRANCH" "https://github.com/${GITHUB_REPO}" src
+          git -C src reset --hard "$GITHUB_REV"
+        env:
+          GITHUB_REV: ${{ github.event.pull_request.head.sha }}
+          GITHUB_BRANCH: ${{ github.event.pull_request.head.ref }}
+          GITHUB_REPO: ${{ github.event.pull_request.head.repo.full_name }}
+        if: github.event_name == 'pull_request'
+      - run: ./src/tool/actions-commit-info.sh
+        id: commit_info
+      - name: Fixed world writable dirs
+        run: |
+          chmod go-w $HOME
+          sudo chmod -R go-w /usr/share
+      - name: Set ENV
+        run: |
+          echo '::set-env name=JOBS::'-j$((1 + $(nproc --all)))
+      - name: Autoconf
+        run: cd src && exec autoconf
+      - name: configure
+        run: |
+          mkdir build
+          cd build
+          ../src/configure -C --disable-install-doc
+      - name: make all
+        run: make -C build $JOBS
+      - name: make install
+        run: sudo make -C build $JOBS install
+      - name: make test
+        run: "make -C build $JOBS -s test TESTOPTS='-q --tty=no' RUN_OPTS='--disable-gems --jit-warnings ${{ matrix.jit_opts }}'"
+      - name: make test-all
+        run: "make -C build $JOBS -s test-all TESTOPTS='-q --tty=no' RUN_OPTS='--disable-gems --jit-warnings ${{ matrix.jit_opts }}'"
+      - name: make test-spec
+        run: "make -C build $JOBS -s test-spec RUN_OPTS='--disable-gems --jit-warnings ${{ matrix.jit_opts }}'"
+      - name: Leaked Globals
+        run: make -C build -s leaked-globals
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "attachments": [{
+                "text": "${{ job.status }}: ${{ github.workflow }} / ${{ matrix.jit_opts }} <https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks|${{ steps.commit_info.outputs.COMMIT_DATE }} #${{ steps.commit_info.outputs.COMMIT_NUMBER_OF_DAY }}> " +
+                        "(<https://github.com/${{ github.repository }}/commit/${{ github.sha }}|" + "${{ github.sha }}".substring(0, 10) + ">) " +
+                        "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }}",
+                "color": "danger"
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        if: failure() && github.event_name == 'push'
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
new file mode 100644
index 0000000000..885f078f07
--- /dev/null
+++ b/.github/workflows/ubuntu.yml
@@ -0,0 +1,115 @@
+name: Ubuntu
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+jobs:
+  make:
+    strategy:
+      matrix:
+        test_task: [ "check", "test-bundler", "test-bundled-gems" ]
+        os: [ubuntu-latest, ubuntu-16.04]
+        exclude:
+          - test_task: test-bundler
+            os: ubuntu-16.04
+          - test_task: test-bundled-gems
+            os: ubuntu-16.04
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+      - run: env | sort
+      - name: Dump GitHub context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+      - name: Dump job context
+        env:
+          JOB_CONTEXT: ${{ toJson(job) }}
+        run: echo "$JOB_CONTEXT"
+      - name: Dump steps context
+        env:
+          STEPS_CONTEXT: ${{ toJson(steps) }}
+        run: echo "$STEPS_CONTEXT"
+      - name: Dump runner context
+        env:
+          RUNNER_CONTEXT: ${{ toJson(runner) }}
+        run: echo "$RUNNER_CONTEXT"
+      - name: Dump strategy context
+        env:
+          STRATEGY_CONTEXT: ${{ toJson(strategy) }}
+        run: echo "$STRATEGY_CONTEXT"
+      - name: Dump matrix context
+        env:
+          MATRIX_CONTEXT: ${{ toJson(matrix) }}
+        run: echo "$MATRIX_CONTEXT"
+
+      - name: Install libraries
+        run: |
+          set -x
+          sudo apt-get update -q || :
+          sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby
+      # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
+      - name: Checkout ruby/ruby
+        run: |
+          git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src
+          git -C src reset --hard "$GITHUB_SHA"
+        if: github.event_name == 'push'
+      - name: Checkout a pull request
+        run: |
+          git clone --single-branch --shallow-since=yesterday "--branch=$GITHUB_BRANCH" "https://github.com/${GITHUB_REPO}" src
+          git -C src reset --hard "$GITHUB_REV"
+        env:
+          GITHUB_REV: ${{ github.event.pull_request.head.sha }}
+          GITHUB_BRANCH: ${{ github.event.pull_request.head.ref }}
+          GITHUB_REPO: ${{ github.event.pull_request.head.repo.full_name }}
+        if: github.event_name == 'pull_request'
+      - run: ./src/tool/actions-commit-info.sh
+        id: commit_info
+      - name: Fixed world writable dirs
+        run: |
+          chmod go-w $HOME
+          sudo chmod -R go-w /usr/share
+      - name: Set ENV
+        run: |
+          echo '::set-env name=JOBS::'-j$((1 + $(nproc --all)))
+      - name: Autoconf
+        run: cd src && exec autoconf
+      - name: configure
+        run: |
+          mkdir build
+          cd build
+          ../src/configure -C --disable-install-doc
+      - name: Make
+        run: make -C build $JOBS
+      - name: Extract gems
+        run: make -C build update-gems extract-gems
+        if: matrix.test_task == 'check'
+      - name: Create dummy files in build dir
+        run: |
+          cd build
+          ./miniruby -e '(("a".."z").to_a+("A".."Z").to_a+("0".."9").to_a+%w[foo bar test zzz]).each{|basename|File.write("#{basename}.rb", "raise %(do not load #{basename}.rb)")}'
+        if: matrix.test_task == 'check'
+      - name: Tests
+        run: make -C build $JOBS -s ${{ matrix.test_task }}
+        env:
+          RUBY_TESTOPTS: "-q --tty=no"
+      - name: Leaked Globals
+        run: make -C build -s leaked-globals
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "attachments": [{
+                "text": "${{ job.status }}: ${{ matrix.os }} / ${{ matrix.test_task }} <https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks|${{ steps.commit_info.outputs.COMMIT_DATE }} #${{ steps.commit_info.outputs.COMMIT_NUMBER_OF_DAY }}> " +
+                        "(<https://github.com/${{ github.repository }}/commit/${{ github.sha }}|" + "${{ github.sha }}".substring(0, 10) + ">) " +
+                        "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }}",
+                "color": "danger"
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        if: failure() && github.event_name == 'push'
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 0000000000..09e588784c
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,90 @@
+name: Windows
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+jobs:
+  make:
+    strategy:
+      matrix:
+        test_task: [test]
+        os: [windows-2019]
+        vs: [2019]
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+      - uses: actions/cache@v1
+        with:
+          path: C:\vcpkg\downloads
+          key: ${{ runner.os }}-vcpkg-download-${{ matrix.os }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-vcpkg-download-${{ matrix.os }}-
+            ${{ runner.os }}-vcpkg-download-
+      - name: Install libraries with vcpkg
+        run: |
+          vcpkg --triplet x64-windows install readline zlib
+      - uses: actions/cache@v1
+        with:
+          path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
+          key: ${{ runner.os }}-chocolatey-${{ matrix.os }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-chocolatey-${{ matrix.os }}-
+            ${{ runner.os }}-chocolatey-
+      - name: Install libraries with chocolatey
+        run: |
+          choco install --no-progress openssl winflexbison3
+      # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
+      - name: Checkout ruby/ruby
+        run: |
+          git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src
+          git -C src reset --hard ${{ github.sha }}
+        if: github.event_name == 'push'
+      - name: Checkout a pull request
+        run: |
+          git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src
+          git -C src reset --hard ${{ github.event.pull_request.head.sha }}
+        if: github.event_name == 'pull_request'
+      - run: ./src/tool/actions-commit-info.sh
+        shell: bash
+        id: commit_info
+      - name: Configure
+        run: |
+          md build
+          cd build
+          call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          ../src/win32/configure.bat --disable-install-doc --without-ext=+,dbm,gdbm --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows --with-openssl-dir="C:/Program Files/OpenSSL-Win64"
+        shell: cmd
+      - name: nmake
+        run: |
+          call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          set YACC=win_bison
+          cd build
+          echo on
+          nmake up
+          nmake extract-gems
+          nmake
+        shell: cmd
+      - name: nmake test
+        run: |
+          call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          cd build
+          nmake ${{ matrix.test_task }}
+        shell: cmd
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "attachments": [{
+                "text": "${{ job.status }}: ${{ matrix.os }} / ${{ matrix.test_task }} <https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks|${{ steps.commit_info.outputs.COMMIT_DATE }} #${{ steps.commit_info.outputs.COMMIT_NUMBER_OF_DAY }}> " +
+                        "(<https://github.com/${{ github.repository }}/commit/${{ github.sha }}|" + "${{ github.sha }}".substring(0, 10) + ">) " +
+                        "of ${{ github.repository }}@" + "${{ github.ref }}".split('/').reverse()[0] + " by ${{ github.event.head_commit.committer.name }}",
+                "color": "danger"
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        if: failure() && github.event_name == 'push'
diff --git a/.gitignore b/.gitignore
index 57557c9c2e..487af950f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,65 @@
 *-*-*.def
+*-*-*.exp
+*-*-*.lib
 *.a
 *.bak
+*.bc
+*.bundle
 *.dSYM
+*.dmyh
 *.dylib
+*.elc
+*.i
 *.inc
 *.log
 *.o
+*.obj
+*.old
 *.orig
+*.pch
+*.pdb
+*.rbinc
 *.rej
+*.s
 *.sav
+*.sl
+*.so
 *.swp
+*.yarb
 *~
 .*-*
 .*.list
 .*.time
 .DS_Store
+.bundle
 .ccmalloc
 .ext
 .pc
 .ppack
 .svn
+.time
 Makefile
+cygruby*.def
 extconf.h
 y.output
 y.tab.c
+*.gcda
+*.gcno
+*.gcov
+*.vscode
+lcov*.info
 
 # /
+/*-fake.rb
+/*.dll
+/*.exe
+/*.res
 /*.pc
+/*.rc
 /*_prelude.c
+/build*/
 /COPYING.LIB
-/ChangeLog-1.8.0
-/ChangeLog.pre-alpha
-/ChangeLog.pre1_1
+/ChangeLog
 /Doxyfile
 /GNUmakefile
 /README.atheos
@@ -41,7 +69,9 @@ y.tab.c
 /archive
 /autom4te*.cache
 /automake
+/benchmark/benchmark-driver
 /beos
+/bmlog-*
 /breakpoints.gdb
 /config.cache
 /config.h
@@ -49,14 +79,23 @@ y.tab.c
 /config.status
 /config.status.lineno
 /configure
+/coverage/simplecov
+/coverage/simplecov-html
+/coverage/doclie
+/coverage/.last_run.json
+/coverage/.resultset.json*
+/coverage/assets
+/coverage/index.html
 /doc/capi
 /enc.mk
-/enc/trans/*.c
 /encdb.h
 /exts.mk
 /goruby
-/id.h
+/id.[ch]
 /largefile.h
+/lcov-c-out
+/lcov-rb-out
+/lcov-out
 /lex.c
 /libruby*.*
 /miniprelude.c
@@ -72,6 +111,8 @@ y.tab.c
 /ppack
 /prelude.c
 /preview
+/probes.dmyh
+/probes.h
 /rbconfig.rb
 /rename2.h
 /repack
@@ -79,34 +120,73 @@ y.tab.c
 /riscos
 /rubicon
 /ruby
+/ruby-runner
+/ruby-runner.h
 /ruby-man.rd.gz
+/run.gdb
+/sizes.c
 /test.rb
+/test-coverage.dat
 /tmp
 /transdb.h
 /uncommon.mk
+/verconf.h
+/verconf.mk
 /web
 /yasmdata.rb
 
+# /bin/
+
+/bin/*.exe
+/bin/*.dll
+
 # /benchmark/
+/benchmark/bm_require.data
 /benchmark/bmx_*.rb
+/benchmark/fasta.output.*
+/benchmark/wc.input
+
+/enc/*.def
+/enc/*.exp
+/enc/*.lib
+/enc/jis/props.h
+/enc/unicode/data
+
+# /coroutine/
+!/coroutine/**/*.s
 
 # /enc/trans/
 /enc/trans/*.c
+/enc/trans/*.def
+/enc/trans/*.exp
+/enc/trans/*.lib
+
+# /exe/
+/exe/goruby
+/exe/ruby
 
 # /ext/
 /ext/extinit.c
+/ext/configure-ext.mk
+/ext/*/exts.mk
 
-# /ext/dl/
-/ext/dl/*.func
+# /ext/-test-/cxxanyargs
+/ext/-test-/cxxanyargs/failure*.failed
 
-# /ext/dl/callback/
-/ext/dl/callback/*.func
-/ext/dl/callback/callback-*.c
-/ext/dl/callback/callback.c
+# /ext/-test-/win32/dln/
+/ext/-test-/win32/dln/dlntest.dll
+/ext/-test-/win32/dln/dlntest.exp
+/ext/-test-/win32/dln/dlntest.lib
 
-# /ext/iconv/
-/ext/iconv/config.charset
-/ext/iconv/iconv.rb
+# /ext/etc/
+/ext/etc/constdefs.h
+
+# /ext/fiddle/
+/ext/fiddle/libffi-*
+
+# /ext/rbconfig/
+/ext/rbconfig/sizeof/sizes.c
+/ext/rbconfig/sizeof/limits.c
 
 # /ext/ripper/
 /ext/ripper/eventids1.c
@@ -120,12 +200,26 @@ y.tab.c
 /ext/socket/constdefs.h
 /ext/socket/constdefs.c
 
-# /ext/tk/
-/ext/tk/config_list
+# /gems
+/gems/*.gem
+/gems/src
+/gems/*-*
+
+# /lib/
+/lib/ruby/[1-9]*.*
+/lib/ruby/vendor_ruby
 
-# /spec/
-/spec/mspec
-/spec/rubyspec
+# /spec/bundler
+/.rspec_status
+
+# /tool/
+/tool/config.guess
+/tool/config.sub
 
 # /win32/
 /win32/*.ico
+
+# MJIT
+/rb_mjit_header.h
+/mjit_config.h
+/include/ruby-*/*/rb_mjit_min_header-*.h
diff --git a/.indent.pro b/.indent.pro
deleted file mode 100644
index 6a207a0554..0000000000
--- a/.indent.pro
+++ /dev/null
@@ -1,21 +0,0 @@
--bap
--nbbb
--nbc
--br
--nbs
--ncdb
--ce
--cli0.5
--ndj
--ei
--nfc1
--i4
--l120
--lp
--npcs
--psl
--sc
--sob
-
--TID
--TVALUE
diff --git a/.rspec_parallel b/.rspec_parallel
new file mode 100644
index 0000000000..aaff198a32
--- /dev/null
+++ b/.rspec_parallel
@@ -0,0 +1,2 @@
+--format progress
+--format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..71945e349e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,550 @@
+# -*- YAML -*-
+# Copyright (C) 2011 Urabe, Shyouhei.  All rights reserved.
+#
+# This file is  a part of the programming language  Ruby.  Permission is hereby
+# granted,  to either  redistribute  or  modify this  file,  provided that  the
+# conditions  mentioned in  the file  COPYING are  met.  Consult  the  file for
+# details.
+
+# This is  a Travis-CI  build configuration file.   The list  of configurations
+# available is located in
+#
+#     http://about.travis-ci.org/docs/user/build-configuration/
+#
+# and as Ruby itself is a project written in C language,
+#
+#     http://about.travis-ci.org/docs/user/languages/c/
+#
+# is also a good place to look at.
+
+language: c
+
+os: linux
+
+dist: xenial
+
+git:
+  quiet: true
+
+cache:
+  ccache: true
+  directories:
+    - $HOME/config_2nd
+    - $HOME/.downloaded-cache
+
+env:
+  global:
+    # Reset timestamps early
+    - _=$(touch NEWS && find . -type f -exec touch -r NEWS {} +)
+    - CONFIGURE_TTY=no
+    - CCACHE_COMPILERCHECK=none
+    - CCACHE_NOCOMPRESS=1
+    - CCACHE_MAXSIZE=512Mi
+    - NPROC="`nproc`"
+    # JOBS and SETARCH are overridden when necessary; see below.
+    - JOBS=-j$((1+${NPROC}))
+    - SETARCH=
+    - RUBY_PREFIX=/tmp/ruby-prefix
+    - GEMS_FOR_TEST='timezone tzinfo'
+    - UPDATE_UNICODE="UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=."
+    # https://github.com/travis-ci/travis-build/blob/e411371dda21430a60f61b8f3f57943d2fe4d344/lib/travis/build/bash/travis_apt_get_options.bash#L7
+    - travis_apt_get_options='--allow-downgrades --allow-remove-essential --allow-change-held-packages'
+    - travis_apt_get_options="-yq --no-install-suggests --no-install-recommends $travis_apt_get_options"
+
+.org.ruby-lang.ci.matrix-definitions:
+
+  - &cron-only
+    if: (type = cron) AND (branch = master) AND (fork = false)
+
+  - &make-test-only
+    script:
+      - $SETARCH make -s test TESTOPTS="${TESTOPTS=$JOBS -q --tty=no}"
+
+  - &gcc-8
+    compiler: gcc-8
+    # # Not using addon to control retries
+    # addons:
+    #   apt:
+    #     sources:
+    #       - ubuntu-toolchain-r-test
+    before_install:
+      - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+      - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq"
+      - |-
+        ${BEFORE_INSTALL}
+        tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \
+          ccache \
+          gcc-8 \
+          g++-8 \
+          libffi-dev \
+          libgdbm-dev \
+          libgmp-dev \
+          libjemalloc-dev \
+          libncurses5-dev \
+          libncursesw5-dev \
+          libreadline6-dev \
+          libssl-dev \
+          libyaml-dev \
+          openssl \
+          valgrind \
+          zlib1g-dev
+
+  - &clang-8
+    compiler: clang-8
+    addons:
+      apt:
+        # Not doing this manually unlike other sources, because it has been stable.
+        sources:
+          - llvm-toolchain-xenial-8
+        config:
+          retries: true
+    before_install:
+      - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq"
+      - |-
+        tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \
+          clang-8 \
+          llvm-8-tools \
+          libffi-dev \
+          libgdbm-dev \
+          libgmp-dev \
+          libjemalloc-dev \
+          libncurses5-dev \
+          libncursesw5-dev \
+          libreadline6-dev \
+          libssl-dev \
+          libyaml-dev \
+          openssl \
+          valgrind \
+          zlib1g-dev
+
+  # --------
+
+  - &x86_64-linux
+    name: x86_64-linux
+    <<: *gcc-8
+
+  - &arm64-linux
+    name: arm64-linux
+    arch: arm64
+    <<: *gcc-8
+
+  - &s390x-linux
+    name: s390x-linux
+    arch: s390x
+    <<: *gcc-8
+    
+  - &jemalloc
+    name: --with-jemalloc
+    <<: *gcc-8
+    <<: *cron-only
+    env:
+      - CONFIG_FLAG='--with-gmp --with-jemalloc --with-valgrind'
+
+  - &assertions
+    name: RUBY_DEBUG=1
+    <<: *gcc-8
+    #<<: *cron-only
+    <<: *make-test-only
+    env:
+      - GEMS_FOR_TEST=
+      - cppflags='-DRUBY_DEBUG -DVM_CHECK_MODE=1 -DTRANSIENT_HEAP_CHECK_MODE -DRGENGC_CHECK_MODE -DENC_DEBUG'
+
+  - &VM_CHECK_MODE
+    name: VM_CHECK_MODE=3
+    <<: *gcc-8
+    <<: *cron-only
+    <<: *make-test-only
+    env:
+      - GEMS_FOR_TEST=
+      - cppflags=-DVM_CHECK_MODE=0x0003
+
+  - &SUPPORT_JOKE
+    name: SUPPORT_JOKE
+    <<: *gcc-8
+    <<: *cron-only
+    <<: *make-test-only
+    env:
+      - BEFORE_INSTALL="sed vm_opts.h -e 's/OPT_SUPPORT_JOKE *0/OPT_SUPPORT_JOKE 1/' -i"
+
+  - &CPDEBUG
+    name: CPDEBUG
+    <<: *gcc-8
+    <<: *cron-only
+    <<: *make-test-only
+    env:
+      - cppflags=-DCPDEBUG
+
+  - &WITH_COROUTINE_UCONTEXT
+    name: COROUTINE=ucontext
+    <<: *gcc-8
+    <<: *cron-only
+    env:
+      - CONFIG_FLAG='--with-coroutine=ucontext'
+
+  - &WITH_COROUTINE_COPY
+    name: COROUTINE=copy
+    <<: *gcc-8
+    <<: *cron-only
+    env:
+      - CONFIG_FLAG='--with-coroutine=copy'
+
+  - &TOKEN_THREADED_CODE
+    name: TOKEN_THREADED_CODE
+    <<: *gcc-8
+    <<: *cron-only
+    <<: *make-test-only
+    env:
+      - GEMS_FOR_TEST=
+      - cppflags=-DOPT_THREADED_CODE=1
+
+  - &CALL_THREADED_CODE
+    name: CALL_THREADED_CODE
+    <<: *gcc-8
+    <<: *cron-only
+    <<: *make-test-only
+    env:
+      - GEMS_FOR_TEST=
+      - cppflags=-DOPT_THREADED_CODE=2
+
+  - &NO_THREADED_CODE
+    name: NO_THREADED_CODE
+    <<: *gcc-8
+    <<: *cron-only
+    <<: *make-test-only
+    env:
+      - GEMS_FOR_TEST=
+      - cppflags=-DOPT_THREADED_CODE=3
+
+  - &ASAN
+    name: -fsanitize=address
+    <<: *clang-8
+    #<<: *cron-only
+    <<: *make-test-only
+    env:
+      - GEMS_FOR_TEST=
+      - ASAN_OPTIONS=detect_leaks=0
+      - cflags='-U_FORTIFY_SOURCE -march=native -fsanitize=address -fno-omit-frame-pointer -fPIC'
+      - debugflags=-ggdb3
+      - optflags=-O1
+      - LD=clang-8
+      - LDFLAGS='-fsanitize=address -fPIC'
+      - CONFIG_FLAG='--with-out-ext=openssl --without-gmp --without-jemalloc --without-valgrind'
+
+  - &MSAN
+    name: -fsanitize=memory
+    <<: *clang-8
+    #<<: *cron-only
+    <<: *make-test-only
+    env:
+      - GEMS_FOR_TEST=
+      - cflags='-U_FORTIFY_SOURCE -fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -fPIC'
+      - optflags=-O1
+      - LD=clang-8
+      - LDFLAGS='-fsanitize=memory -fPIC'
+      - CONFIG_FLAG='--with-out-ext=openssl --without-gmp --without-jemalloc --without-valgrind'
+
+  - &UBSAN
+    name: -fsanitize=undefined
+    <<: *clang-8
+    #<<: *cron-only
+    <<: *make-test-only
+    env:
+      - GEMS_FOR_TEST=
+      - cflags='-U_FORTIFY_SOURCE -fsanitize=undefined,integer,nullability -fno-sanitize=implicit-integer-sign-change,unsigned-integer-overflow'
+      - cppflags=-DUNALIGNED_WORD_ACCESS=0
+      - debugflags=-ggdb3
+      - optflags='-O1 -march=native'
+      - LD=clang-8
+      - LDFLAGS='-fsanitize=undefined,integer,nullability -fno-sanitize=implicit-integer-sign-change,unsigned-integer-overflow'
+
+  - &i686-linux
+    name: i686-linux
+    compiler: gcc-8
+    env:
+      - GCC_FLAGS=-m32
+      - CXX='g++-8 -m32'
+      - debugflags=-g0
+      - SETARCH='setarch i686 --verbose --3gb'
+    # # Not using addon to control retries
+    # addons:
+    #   apt:
+    #     sources:
+    #       - ubuntu-toolchain-r-test
+    before_install:
+      - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+      - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq"
+      - |-
+        tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \
+          gcc-8-multilib \
+          g++-8 \
+          g++-8-multilib \
+          libstdc++-8-dev:i386 \
+          libffi-dev:i386 \
+          libffi6:i386 \
+          libgdbm-dev:i386 \
+          libgdbm3:i386 \
+          libncurses5-dev:i386 \
+          libncurses5:i386 \
+          libncursesw5-dev:i386 \
+          libreadline6-dev:i386 \
+          libreadline6:i386 \
+          libssl-dev:i386 \
+          libssl1.0.0:i386 \
+          linux-libc-dev:i386 \
+          zlib1g-dev:i386 \
+          zlib1g:i386
+
+  - &arm32-linux
+    name: arm32-linux
+    arch: arm64
+    # https://packages.ubuntu.com/xenial/crossbuild-essential-armhf
+    compiler: arm-linux-gnueabihf-gcc
+    env:
+      - debugflags=-g0
+      - SETARCH='setarch linux32 --verbose --32bit'
+    before_install:
+      - sudo dpkg --add-architecture armhf
+      - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq"
+      - |-
+        tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \
+          ccache \
+          crossbuild-essential-armhf \
+          libc6:armhf \
+          libstdc++-5-dev:armhf \
+          libffi-dev:armhf \
+          libffi6:armhf \
+          libgdbm-dev:armhf \
+          libgdbm3:armhf \
+          libncurses5-dev:armhf \
+          libncurses5:armhf \
+          libncursesw5-dev:armhf \
+          libreadline6-dev:armhf \
+          libreadline6:armhf \
+          libssl-dev:armhf \
+          libssl1.0.0:armhf \
+          linux-libc-dev:armhf \
+          zlib1g-dev:armhf \
+          zlib1g:armhf
+
+  - &pedanticism
+    name: -std=c99 -pedantic
+    compiler: clang
+    <<: *make-test-only
+    env:
+      - GEMS_FOR_TEST=
+      - GCC_FLAGS='-std=c99 -Werror=pedantic -pedantic-errors'
+      - CONFIG_FLAG=
+      - JOBS=
+      - >-
+        warnflags='
+        -Wall
+        -Wextra
+        -Werror=deprecated-declarations
+        -Werror=division-by-zero
+        -Werror=extra-tokens
+        -Werror=implicit-function-declaration
+        -Werror=implicit-int
+        -Werror=pointer-arith
+        -Werror=shorten-64-to-32
+        -Werror=write-strings
+        -Wmissing-noreturn
+        -Wno-constant-logical-operand
+        -Wno-missing-field-initializers
+        -Wno-overlength-strings
+        -Wno-parentheses-equality
+        -Wno-self-assign
+        -Wno-tautological-compare
+        -Wno-unused-local-typedef
+        -Wno-unused-parameter
+        -Wunused-variable'
+      - LDFLAGS=-Wno-unused-command-line-argument
+
+  - &rubyspec
+    name: Check ruby/spec version guards on Ruby 2.4
+    language: ruby
+    rvm: 2.4.6
+    before_install:
+    install:
+    before_script: chmod -R u+w spec/ruby
+    # -j randomly hangs.
+    script: ruby -C spec/ruby ../mspec/bin/mspec .
+    after_failure:
+      - echo "ruby/spec failed on Ruby 2.4. This is likely because of a missing ruby_version_is guard, please add it. See spec/README.md."
+
+  - &baseruby
+    name: "BASERUBY: Ruby 2.2"
+    <<: *gcc-8
+    <<: *make-test-only
+    language: ruby
+    rvm: 2.2
+
+  - &dependency
+    name: Check dependencies in makefiles
+    language: ruby
+    before_install:
+    install:
+    before_script:
+      - |-
+        ruby -e 'new = []
+          Dir.glob("ext/**/extconf.rb") {|ex|
+            unless File.exist?(dep = File.dirname(ex)+"/depend")
+              puts "Adding "+dep
+              File.copy_stream("template/depend.tmpl", dep)
+              new << dep
+            end
+          }
+          exec("git", "add", *new) unless new.empty?'
+      - git diff --cached
+      - "> config.status"
+      - "> .rbconfig.time"
+      - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile
+      - make touch-unicode-files
+      - make -s $JOBS $UPDATE_UNICODE up
+      - make -s $JOBS srcs
+      - rm -f config.status Makefile rbconfig.rb .rbconfig.time
+      - $SETARCH ./configure -C --disable-install-doc --prefix=$RUBY_PREFIX --disable-rubygems 'optflags=-O0' 'debugflags=-save-temps=obj -g'
+      - ruby tool/update-deps --fix
+    script:
+      - git diff --no-ext-diff --ignore-submodules --exit-code
+    after_failure:
+      - echo "Dependencies need to update"
+    env:
+      - CONFIG_FLAG=
+
+matrix:
+  include:
+    # Build every commit:
+    - <<: *x86_64-linux
+    - <<: *arm64-linux
+    - <<: *i686-linux
+    - <<: *arm32-linux
+    - <<: *s390x-linux
+    - <<: *pedanticism
+    - <<: *assertions
+    - <<: *baseruby
+    - <<: *rubyspec
+    - <<: *dependency
+    # Build every commit (Allowed Failures):
+    - <<: *ASAN
+    - <<: *MSAN
+    - <<: *UBSAN
+    # Cron only:
+    - <<: *jemalloc
+    - <<: *VM_CHECK_MODE
+    - <<: *SUPPORT_JOKE
+    - <<: *CPDEBUG
+    - <<: *WITH_COROUTINE_UCONTEXT
+    - <<: *WITH_COROUTINE_COPY
+    - <<: *TOKEN_THREADED_CODE
+    - <<: *CALL_THREADED_CODE
+    - <<: *NO_THREADED_CODE
+  allow_failures:
+    - name: s390x-linux
+    - name: -fsanitize=address
+    - name: -fsanitize=memory
+    - name: -fsanitize=undefined
+  fast_finish: true
+
+before_script:
+  - date # Debugging "Permission defined" failure on darwin like https://travis-ci.org/ruby/ruby/jobs/508683759
+  - dpkg --print-architecture
+  - dpkg --print-foreign-architectures
+  - setarch --list
+  - echo JOBS=${JOBS} SETARCH=${SETARCH}
+  - $SETARCH uname -a
+  - $SETARCH uname -r
+  - rm -fr .ext autom4te.cache
+  - echo $TERM
+  - |-
+    [ -d ~/.downloaded-cache ] ||
+    mkdir ~/.downloaded-cache
+  - ln -s ~/.downloaded-cache
+  - "> config.status"
+  - "> .rbconfig.time"
+  - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile
+  - date; make touch-unicode-files
+  - date; make -s $JOBS $UPDATE_UNICODE up
+  - date; make -s $JOBS srcs
+  - rm -f config.status Makefile rbconfig.rb .rbconfig.time
+  - |-
+    if [ -d ~/config_2nd ]; then
+      cp -pr ~/config_2nd build
+    else
+      mkdir build
+    fi
+  - mkdir config_1st config_2nd
+  - chmod -R a-w .
+  - chmod -R u+w build config_1st config_2nd
+  - cd build
+  - ccache --show-stats
+  - |-
+    case "$CC" in
+    gcc*)   CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-diagnostics-color";;
+    clang*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-color-diagnostics";;
+    esac
+  - |-
+    [ ! -f config.cache ] ||
+    [ "$CC" = "`sed -n s/^ac_cv_prog_CC=//p config.cache`" ] ||
+    (set -x; exec rm config.cache)
+  - $SETARCH ../configure -C --disable-install-doc --prefix=$RUBY_PREFIX $CONFIG_FLAG
+  - cp -pr config.cache config.status .ext/include ../config_1st
+  - $SETARCH make reconfig
+  - cp -pr config.cache config.status .ext/include ../config_2nd
+  - (cd .. && exec diff -ru config_1st config_2nd)
+  - chmod u+w ..
+  - rm -rf ~/config_2nd
+  - mv ../config_2nd ~
+  - chmod u-w ..
+  - $SETARCH make -s $JOBS
+  - |-
+    date; : # Debugging "Permission defined" failure on darwin like https://travis-ci.org/ruby/ruby/jobs/508683759
+    if ! make install; then
+      if [ "$(uname)" = Darwin ]; then
+        # Debugging "Permission defined" failure on darwin like https://travis-ci.org/ruby/ruby/jobs/508683759
+        set -x
+        date
+        ./miniruby -e 'ARGV.map{|path|[path,File.stat(path)]}.sort_by{|path,st|st.mtime}.each{|path,st|p mtime:st.mtime.to_f, ctime:st.ctime.to_f, path:path}' .ext/.timestamp/.RUBYCOMMONDIR*time .ext/common/bigdecimal/*.rb ../ext/bigdecimal/lib/bigdecimal/*.rb . .. .ext .ext/common .ext/common/bigdecimal ext/bigdecimal ../ext ../ext/bigdecimal ../ext/bigdecimal/lib ../ext/bigdecimal/lib/bigdecimal
+        make COPY='cp -f' install
+      else
+        exit 1
+      fi
+    fi
+  - ccache --show-stats
+  - |-
+    [ -z "${GEMS_FOR_TEST}" ] ||
+    $RUBY_PREFIX/bin/gem install --no-document $GEMS_FOR_TEST
+  - echo "raise 'do not load ~/.irbrc in test'" > ~/.irbrc
+
+script:
+  - $SETARCH make -s test -o showflags TESTOPTS="${TESTOPTS=$JOBS -q --tty=no}"
+  - travis_wait 50 $SETARCH make -s test-all -o exts TESTOPTS="${TESTOPTS} ${TEST_ALL_OPTS}" RUBYOPT="-w"
+  - $SETARCH make -s test-spec MSPECOPT=-ff # not using `-j` because sometimes `mspec -j` silently dies
+  - $SETARCH make -s -o showflags leaked-globals
+
+# Branch matrix.  Not all branches are Travis-ready so we limit branches here.
+branches:
+  only:
+    - master
+    - ruby_2_4
+    - ruby_2_5
+    - ruby_2_6
+
+# We want to be notified when something happens.
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#ruby-core"
+    on_success: change # [always|never|change] # default: always
+    on_failure: always # [always|never|change] # default: always
+    template:
+      - "%{message} by @%{author}: See %{build_url}"
+
+  slack:
+    rooms:
+      - secure: ah7UEHBvncXT7bM5mvYIQAO+tIyV/wl7nXLb7wQD16dO2v8Gragy0mWjB79Q09hrrMGmp6H9bCDpdGS80boIA5EHaHoG4QaP0i9bsSt8U2AMWgZtfyIgQKJ4H2kXkGlrjO+AXTgnIkP7LNjdgAVUUTGQPb26T3QmoN2Splt+fIQ= # ruby:<token>#alerts
+    on_pull_requests: false
+    on_success: change
+    on_failure: always
+
+  email:
+    - ko1c-failure@atdot.net
diff --git a/BSDL b/BSDL
index 82725534fa..a009caefea 100644
--- a/BSDL
+++ b/BSDL
@@ -1,4 +1,4 @@
-Copyright (C) 1993-2010 Yukihiro Matsumoto. All rights reserved.
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..ffdf2dd4b8
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,4 @@
+Please see the [official issue tracker] and wiki [HowToContribute].
+
+[official issue tracker]: https://bugs.ruby-lang.org
+[HowToContribute]: https://bugs.ruby-lang.org/projects/ruby/wiki/HowToContribute
diff --git a/COPYING b/COPYING
index a1f19ff99d..48e5a96de7 100644
--- a/COPYING
+++ b/COPYING
@@ -2,55 +2,55 @@ Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
 You can redistribute it and/or modify it under either the terms of the
 2-clause BSDL (see the file BSDL), 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.
+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:
+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.
+   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.
+   b. use the modified software only within your corporation or
+      organization.
 
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
 
-       d) make other distribution arrangements with the author.
+   d. make other distribution arrangements with the author.
 
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
+3. You may distribute the software in object code or binary form,
+   provided that you do at least ONE of the following:
 
-       a) distribute the binaries and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
+   a. distribute the binaries 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.
+   b. accompany the distribution with the machine-readable source of
+      the software.
 
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
 
-       d) make other distribution arrangements with the author.
+   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).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
+4. You may modify and include the part of the software into any other
+   software (possibly commercial).  But some files in the distribution
+   are not written by the author, so that they are not under these terms.
 
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
+   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 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
+5. The scripts and library files supplied as input to or produced as
+   output from the software do not automatically fall under the
+   copyright of the software, but belong to whomever generated them,
+   and may be sold commercially, and may be aggregated with this
+   software.
 
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
+6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE.
diff --git a/COPYING.ja b/COPYING.ja
index 5b5b91c149..230376bc60 100644
--- a/COPYING.ja
+++ b/COPYING.ja
@@ -1,51 +1,51 @@
-$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(B2-clause BSDL
-$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G$-$^$9(B
-2-clause BSDL$B$K$D$$$F$O(BBSDL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
+本プログラムはフリーソフトウェアです．2-clause BSDL
+または以下に示す条件で本プログラムを再配布できます
+2-clause BSDLについてはBSDLファイルを参照して下さい．
 
-  1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B
+1. 複製は制限なく自由です．
 
-  2. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$N%=!<%9$r(B
-     $B<+M3$KJQ99$G$-$^$9!%(B
+2. 以下の条件のいずれかを満たす時に本プログラムのソースを
+   自由に変更できます．
 
-     (a) $B%M%C%H%K%e!<%:$K%]%9%H$7$?$j!$:n<T$KJQ99$rAwIU$9$k(B
-         $B$J$I$NJ}K!$G!$JQ99$r8x3+$9$k!%(B
+   a.  ネットニューズにポストしたり，作者に変更を送付する
+       などの方法で，変更を公開する．
 
-     (b) $BJQ99$7$?K\%W%m%0%i%`$r<+J,$N=jB0$9$kAH?%FbIt$@$1$G(B
-         $B;H$&!%(B
+   b.  変更した本プログラムを自分の所属する組織内部だけで
+       使う．
 
-     (c) $BJQ99E@$rL@<($7$?$&$(!$%=%U%H%&%'%"$NL>A0$rJQ99$9$k!%(B
-         $B$=$N%=%U%H%&%'%"$rG[I[$9$k;~$K$OJQ99A0$NK\%W%m%0%i(B
-         $B%`$bF1;~$KG[I[$9$k!%$^$?$OJQ99A0$NK\%W%m%0%i%`$N%=!<(B
-         $B%9$NF~<jK!$rL@<($9$k!%(B
+   c.  変更点を明示したうえ，ソフトウェアの名前を変更する．
+       そのソフトウェアを配布する時には変更前の本プログラ
+       ムも同時に配布する．または変更前の本プログラムのソー
+       スの入手法を明示する．
 
-     (d) $B$=$NB>$NJQ99>r7o$r:n<T$H9g0U$9$k!%(B
+   d.  その他の変更条件を作者と合意する．
 
-  3. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$r%3%s%Q%$(B
-     $B%k$7$?%*%V%8%'%/%H%3!<%I$d<B9T7A<0$G$bG[I[$G$-$^$9!%(B
+3. 以下の条件のいずれかを満たす時に本プログラムをコンパイ
+   ルしたオブジェクトコードや実行形式でも配布できます．
 
-     (a) $B%P%$%J%j$r<u$1<h$C$??M$,%=!<%9$rF~<j$G$-$k$h$&$K!$(B
-         $B%=!<%9$NF~<jK!$rL@<($9$k!%(B
+   a.  バイナリを受け取った人がソースを入手できるように，
+       ソースの入手法を明示する．
 
-     (b) $B5!3#2DFI$J%=!<%9%3!<%I$rE:IU$9$k!%(B
+   b.  機械可読なソースコードを添付する．
 
-     (c) $BJQ99$r9T$C$?%P%$%J%j$OL>A0$rJQ99$7$?$&$(!$%*%j%8%J(B
-         $B%k$N%=!<%9%3!<%I$NF~<jK!$rL@<($9$k!%(B
+   c.  変更を行ったバイナリは名前を変更したうえ，オリジナ
+       ルのソースコードの入手法を明示する．
 
-     (d) $B$=$NB>$NG[I[>r7o$r:n<T$H9g0U$9$k!%(B
+   d.  その他の配布条件を作者と合意する．
 
-  4. $BB>$N%W%m%0%i%`$X$N0zMQ$O$$$+$J$kL\E*$G$"$l<+M3$G$9!%$?(B
-     $B$@$7!$K\%W%m%0%i%`$K4^$^$l$kB>$N:n<T$K$h$k%3!<%I$O!$$=(B
-     $B$l$>$l$N:n<T$N0U8~$K$h$k@)8B$,2C$($i$l$k>l9g$,$"$j$^$9!%(B
+4. 他のプログラムへの引用はいかなる目的であれ自由です．た
+   だし，本プログラムに含まれる他の作者によるコードは，そ
+   れぞれの作者の意向による制限が加えられる場合があります．
 
-     $B$=$l$i%U%!%$%k$N0lMw$H$=$l$>$l$NG[I[>r7o$J$I$KIU$$$F$O(B
-     LEGAL$B%U%!%$%k$r;2>H$7$F$/$@$5$$!%(B
+   それらファイルの一覧とそれぞれの配布条件などに付いては
+   LEGALファイルを参照してください．
 
-  5. $BK\%W%m%0%i%`$X$NF~NO$H$J$k%9%/%j%W%H$*$h$S!$K\%W%m%0%i(B
-     $B%`$+$i$N=PNO$N8"Mx$OK\%W%m%0%i%`$N:n<T$G$O$J$/!$$=$l$>(B
-     $B$l$NF~=PNO$r@8@.$7$??M$KB0$7$^$9!%$^$?!$K\%W%m%0%i%`$K(B
-     $BAH$_9~$^$l$k$?$a$N3HD%%i%$%V%i%j$K$D$$$F$bF1MM$G$9!%(B
+5. 本プログラムへの入力となるスクリプトおよび，本プログラ
+   ムからの出力の権利は本プログラムの作者ではなく，それぞ
+   れの入出力を生成した人に属します．また，本プログラムに
+   組み込まれるための拡張ライブラリについても同様です．
 
-  6. $BK\%W%m%0%i%`$OL5J]>Z$G$9!%:n<T$OK\%W%m%0%i%`$r%5%]!<%H(B
-     $B$9$k0U;V$O$"$j$^$9$,!$%W%m%0%i%`<+?H$N%P%0$"$k$$$OK\%W(B
-     $B%m%0%i%`$N<B9T$J$I$+$iH/@8$9$k$$$+$J$kB;32$KBP$7$F$b@U(B
-     $BG$$r;}$A$^$;$s!%(B
+6. 本プログラムは無保証です．作者は本プログラムをサポート
+   する意志はありますが，プログラム自身のバグあるいは本プ
+   ログラムの実行などから発生するいかなる損害に対しても責
+   任を持ちません．
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index d9f47d1fb7..0000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,13644 +0,0 @@
-Sat Sep 17 23:34:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_data_type): inherit the core type in ripper so
-	  that checks in core would work.  [ruby-core:39591] [Bug #5331]
-
-Fri Sep 23 14:15:01 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c
-	  ext/openssl/ossl_pkey.c: Remove unused variables.
-
-Fri Sep 23 06:54:44 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r33315 from trunk.
-
-	* test/openssl/test_ssl_session.rb: execute test_session_exts_read
-	  only for OpenSSL versions >= 0.9.8k. Thanks, Eric Wong, for
-	  reporting this.
-	  [Bug #4961] [ruby-core:37726]
-
-Fri Sep 23 12:18:52 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r33311 from trunk.
-
-	* test/openssl/test_ssl_session.rb: ensure server calls callbacks in
-	  test_ctx_server_session_cb. Thanks to Eric Wong for the patch.
-	  [Bug #5336] [ruby-core:39619]
-
-Thu Sep 22 19:45:22 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* thread_pthread.c (ubf_select): activate timer thread when interrupt
-	  blocking thread.
-	  A patch created by Koichi Sasada. [ruby-core:39634] [Bug #5343]
-	  to cover race condition, timer thread periodically send SIGVTARLM to
-	  threads in signal thread list. so you should activate timer thread
-	  when interrupt a thread.
-
-Wed Sep 21 16:57:03 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/io/wait/test_io_wait.rb (TestIOWait#setup): of course, the
-	  behavior of mingw is just same with mswin.
-
-Sat Sep 17 22:21:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (rb_vm_make_env_object, rb_vm_get_sourceline): export as a
-	  workaround for ruby-debug19 for the time being.
-	  [ruby-core:38972] [Bug #5193]
-
-Fri Sep 16 01:08:19 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* NEWS: cosmetic changes.
-
-Wed Sep 14 12:39:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* configure.in: do not use gcc-4.2 as the default compiler.
-
-	* NEWS: describe the issue about Xcode.
-
-Wed Sep 14 11:46:30 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_fd_rcopy): added an argument guard.
-	  Patch by NAKAMURA Usaku. [Bug #5306] [ruby-core:39435]
-
-Tue Sep 13 09:28:58 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* NEWS: wrote about rb_reserved_fd_p() and objspace.
-
-Mon Sep 12 20:47:52 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_select): fix a typo to initialize efds
-	  properly.  [Bug #5299] [ruby-core:39380]
-
-Mon Sep 12 20:41:20 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_thread_select): fix to ignore an argument
-	  modification of rb_thread_fd_select().
-	  based on a patch by Eric Wong. [Bug #5306] [ruby-core:39435]
-	* thread.c (rb_fd_rcopy): New. for reverse fd copy.
-
-	* test/-ext-/old_thread_select/test_old_thread_select.rb
-	(test_old_select_false_positive): test for bug5306.
-
-	* ext/-test-/old_thread_select/old_thread_select.c (fdset2array):
-	  New. convert fdsets to array.
-	* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
-	  return 'read', 'write', 'except' argument of rb_thread_select()
-	  to ruby script.
-
-Tue Sep  6 13:15:44 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (load_encoding): predefined encoding names are safe.
-	  [ruby-dev:44469] [Bug #5279]
-
-	* transcode.c (load_transcoder_entry): ditto.
-
-Fri Sep  9 16:02:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* insns.def (concatstrings): don't use initial ASCII-8BIT string.
-	  [ruby-core:38635] [Bug #5126]
-
-Thu Sep  8 21:17:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: import nkf 2.1.2 (be9c280)
-	  Bump version number/release date only.
-
-Wed Sep  7 23:42:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (argf_next_argv): open in default text mode.
-	  [ruby-core:39234] [Bug #5268]
-
-Mon Sep  5 15:06:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/rubygems/test_gem_security.rb
-	  (test_class_build_self_signed_cert): reset opt[:trust_dir] to apply
-	  temporary Gem.user_home.
-
-Sun Sep  4 00:56:58 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* backport r33177 from trunk.
-
-	* test/ruby/test_fiber.rb (TestFiber#test_no_valid_cfp):
-	  add a test. Unlike TestThread#test_no_valid_cfp,
-	  this test succeeds even if win32ole is required (see r33153).
-
-Fri Sep  2 21:11:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (validate_enc_binmode, prep_stdio): default to text mode on
-	  dosish platforms.  [ruby-core:38822] [Bug #5164]
-
-	* transcode.c (rb_econv_prepare_options): keep default ecflags
-	  unchanged if no options.
-
-Fri Sep  2 14:36:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_search_const_defined_class): search
-	  ancestors only when global scope.  [ruby-core:39227] [Bug #5264]
-
-Fri Sep  2 09:58:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_tokadd_string, parser_yylex): ignore a backslash
-	  which prefixes an non-ascii character, which has no escape
-	  syntax.  [ruby-core:39222] [Ruby 1.9 - Bug #5262]
-
-Thu Sep  1 17:31:22 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* insns.def (defineclass), vm_insnhelper.c (vm_get_cvar_base): see
-	  also inherited constants for classes without superclass and
-	  modules.  [ruby-core:37698] [Bug #3423]
-
-Thu Sep  1 14:11:16 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_thread.rb (TestThread#test_no_valid_cfp): skip when
-	  win32ole is required.  in such case, win32ole redefines
-	  Thread#initialize, and the block argument becomes to be not the top
-	  of the thread, then this testcase always fails.
-
-Wed Aug 31 16:02:45 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).
-
-Wed Aug 31 13:19:31 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* numeric.c (flo_round): Avoid overflow by optimizing for trivial
-	  cases
-	  [Bug #5227]
-
-Wed Aug 31 06:45:32 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: fix r32835. $withval can't be used outer AC_ARG_WITH().
-
-Wed Aug 31 05:29:03 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_select_with_thread): and my typo. we all must
-	  be more careful.
-
-Wed Aug 31 05:28:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread.c (rb_thread_select): critical typo in r33117.
-
-Wed Aug 31 05:28:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/-ext-/old_thread_select/test_old_thread_select.rb
-	  (TestOldThreadSelect#test_old_select_read_timeout): if the machine
-	  is fast enough, the time used by code around IO.select may be smaller
-	  than Time implement threshold.
-
-Wed Aug 31 05:27:59 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
-	  typo.
-
-	* test/-ext-/old_thread_select/test_old_thread_select.rb
-	  (TestOldThreadSelect#test_old_select_signal_safe): use SIGINT instead
-	  of SIGUSR1 because the former is general and the latter is platform
-	  dependent.
-
-Wed Aug 31 05:26:30 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c, include/ruby/intern.h (rb_w32_fd_copy): implement
-	  for rb_thread_select() in thread.c.  the use of rb_fd_copy() is
-	  introduced in r33117.
-	  [Bug #5229] [ruby-core:39102]
-
-	* thread.c (rb_thread_select): must call rb_fd_init() before using
-	  rb_fdset_t.  see the implementations of rb_fd_init()s if you want to
-	  know the reason.
-
-Tue Aug 30 11:25:21 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1).
-	  [Bug #5173] [ruby-core:38866]
-
-Tue Aug 30 09:53:59 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* cont.c (fiber_entry): fix stack allocation failure on Debian
-	  GNU/kFreeBSD.
-	  Patch by Lucas Nussbaum <lucas at lucas-nussbaum dot net>.
-	  [Bug #5241] [ruby-core:39147]
-
-Tue Aug 30 09:52:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* backport r33117 from trunk.
-	
-	* thread.c (rb_thread_select): rewrite by using
-	  rb_thread_fd_select(). old one is EINTR unsafe.
-	  Patch by Eric Wong. [Bug #5229] [ruby-core:39102]
-	
-	* test/-ext-/old_thread_select/test_old_thread_select.rb:
-	  a testcase for rb_thread_select().
-	* ext/-test-/old_thread_select/old_thread_select.c: ditto.
-	* ext/-test-/old_thread_select/depend: ditto.
-	* ext/-test-/old_thread_select/extconf.rb: ditto.
-
-Tue Aug 30 09:16:17 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: fix a build failure on GNU Hurd.
-	  Patch by Samuel Thibault <sthibault at debian dot org>. Thank you!
-	  [Bug #5250] [ruby-core:39185]
-
-Sun Aug 28 15:38:17 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* backport r33106 from trunk.
-
-	* ext/date/date_parse.c (date_zone_to_diff): keep a temporary string
-	  stored in variable while the contents buffer is beeing used.
-
-	* ext/date/date_parse.c (date_zone_to_diff): get rid of out of bounds
-	  memory read. [ruby-dev:44409] [Bug #5213]
-
-Sun Aug 28 05:29:50 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* backport r33102 from trunk.
-
-	* lib/minitest/*: Imported minitest 2.5.1 (r6596)
-	* test/minitest/*: ditto
-
-Sat Aug 27 20:54:54 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* backport r33099 from trunk.
-
-	* vm.c (rb_vm_rewrite_dfp_in_errinfo): change return type
-	  to suppress a warning.
-
-	* vm_core.h: ditto.
-
-Sat Aug 27 19:03:44 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* backport r33096 from trunk.
-
-	* proc.c (proc_new): force to rewrite errinfo when calling Proc.new in ensure.
-	  [Bug #5234] [ruby-core:39125]
-
-	* vm.c (rb_vm_rewrite_dfp_in_errinfo): new function.
-
-	* vm.c (vm_make_env_each): changed accordingly.
-
-	* vm_core.h: ditto.
-
-	* bootstraptest/test_flow.rb: add tests for above.
-
-Sat Aug 27 08:59:12 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* NEWS:  Update version of rake to 0.9.2.2.
-
-Sat Aug 27 08:44:58 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r33087 from trunk
-
-	* lib/rdoc:  Import RDoc 3.9.4.  Typo and grammar fixes by Luke Gruber.
-	  [Ruby 1.9 - Bug #5203]
-
-Sat Aug 27 07:53:34 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r33087 from trunk.
-
-	* lib/open-uri.rb:  Fix indentation of OpenURI::OpenRead#open.  Use ++
-	  instead of `' for method arguments in open-uri.rb
-
-Sat Aug 27 07:22:07 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r33086 from trunk.
-
-	* ext/pathname/lib/pathname.rb:  Fix typos and grammar mistakes.  Patch
-	  by Luke Gruber.  [#5203]
-	* ext/pty/lib/expect.rb:  ditto
-	* lib/mathn.rb:  ditto
-	* lib/net/http.rb:  ditto
-	* lib/open-uri.rb:  ditto
-	* lib/ostruct.rb:  ditto
-	* lib/tempfile.rb:  ditto
-	* lib/thread.rb:  ditto
-	* lib/weakref.rb:  ditto
-	* sample/webrick/httpproxy.rb:  ditto
-
-Fri Aug 26 10:10:37 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r33074 from trunk.
-
-	* lib/rubygems:  Update to RubyGems 1.8.10.  Fixes security issue in
-	  creating ruby-format gemspecs.  Fixes Gem.dir not being at the front
-	  of Gem.path to fix uninstall and cleanup commands.  Fixes gem
-	  uninstall stopping on the first missing gem.
-
-Wed Aug 24 09:49:10 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* backport r33045 from trunk.
-
-	* insns.def (defined): fix to checking class variable.
-	  A patch by Magnus Holm <judofyr@gmail.com>.  Thanks!
-
-Fri Aug 26 08:21:10 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* test/ruby/test_variable.rb: add a test for above.
-
-Thu Aug 25 09:43:16 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r33066 from trunk.
-
-	* ext/openssl/lib/openssl/bn.rb:  Hide copyright info from RDoc.
-	* ext/openssl/lib/openssl/digest.rb:  ditto
-	* ext/openssl/lib/openssl/cipher.rb:  ditto
-
-Thu Aug 25 09:25:48 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r33065 from trunk.
-
-	* ext/openssl/ossl_digest.c:  Document OpenSSL::Digest::digest and add
-	  an example to OpenSSL::Digest.  Patch by Sylvain Daubert.
-	  [Ruby 1.9 - Bug #5166]
-	* ext/openssl/lib/openssl/digest.rb (module OpenSSL):  ditto
-
-Thu Aug 25 08:19:43 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (vm_make_env_each): work around to solve Bug #2729.
-	  fixes: Bug #2729
-	  a patch from Kazuki Tsujimoto <kazuki@callcc.net>
-	  This problem is caused by changing dfp (dynamic env pointer)
-	  from saved dfp.  Saved dfp is pointed env in VM stack.  However,
-	  the dfp can be moved because VM copies env from VM stack to
-	  the heap.  At this copying, dfp was also changed.  To solve this
-	  problem, I'll try to change throw mechanism (not save target dfp,
-	  but save target cfp).
-
-	* bootstraptest/test_flow.rb: add a test for above.
-
-Thu Aug 25 08:04:08 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* numeric.c (int_round): Fix Integer#round [ruby-core:39096]
-
-Thu Aug 25 06:51:08 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych.rb: Fixing psych version number.
-
-Thu Aug 25 06:11:35 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/nodes/node.rb: default `to_yaml` encoding to be
-	  UTF-8.
-	* test/psych/test_encoding.rb: test yaml dump encoding.
-
-Wed Aug 24 08:53:06 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r33043 from trunk.
-
-	* lib/rdoc:  Update to RDoc 3.9.3.  Fixes RDoc with `ruby -Ku`.  Allows
-	  HTTPS image paths to be turned into <img> tags.  Prevents special
-	  markup inside <tt> from being processed.
-
-Wed Aug 24 07:57:43 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r33040 from trunk.
-
-	* lib/rubygems:  Update to RubyGems 1.8.9.  Fixes uninstalling multiple
-	  gems and gem cleanup.
-
-Wed Aug 24 06:45:20 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* backport r33036 from trunk.
-
-	* lib/minitest/*: Imported minitest 2.5.0 (r6557)
-	* test/minitest/*: ditto
-
-Tue Aug 23 15:23:56 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r33027 from trunk.
-
-	* load.c (rb_f_require):  Improve documentation of Kernel#require.
-	  [Ruby 1.9 - Bug #5210]
-
-Tue Aug 23 15:11:48 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r33023 from trunk.
-
-	* ext/zlib/zlib.c (gzfile_read_header): Ensure that each section of
-	  gzip header is readable to avoid SEGV.
-
-	* test/zlib/test_zlib.rb (test_corrupted_header): Test it.
-
-Mon Aug 22 23:43:33 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* backport r33021 from trunk.
-
-	* sprintf.c (rb_str_format): add RB_GC_GUARD to prevent temporary
-	  strings from GC.
-
-Sun Aug 21 17:58:38 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* backport r33019 from trunk.
-
-	* iseq.c (iseq_s_disasm): remove variable which is no longer used
-	  since r33013.
-
-Sun Aug 21 14:20:58 2011  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* configure.in: use LD_LIBRARY_PATH_64 on 64-bit Solaris.
-
-Sun Aug 21 11:13:54 2011  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* backport r32895 from trunk.
-
-	* ext/fiddle/conversions.c (generic_to_value): ffi_arg and ffi_sarg
-	  should be used to handle shorter return value. fix [Bug #3861]
-	  [ruby-core:32504]
-
-	* ext/fiddle/closure.c (callback): ditto
-
-	* ext/fiddle/conversions.h (fiddle_generic): ditto
-
-	* ext/fiddle/conversions.c (value_to_generic): char, short and int
-	  are strictly distinguished on big-endian CPU, e.g. sparc64.
-
-Sat Aug 20 13:28:32 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* backport r33013 from trunk.
-
-	* iseq.c (iseq_s_disasm): fix a bug that may cause SEGV.
-
-	* test/ruby/test_method.rb (test_body): add a test for the above change.
-
-Sat Aug 20 10:43:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_read): return new string if nil
-	  is explicitly given as a buffer ([Bug #5207]), otherwise set the
-	  encoding.  also removed dead code.
-
-Fri Aug 19 14:25:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_spawn_v, proc_spawn): should not wait the
-	  spawned process.
-
-	* process.c (proc_spawn_v): fix missing argument, and try with
-	  /bin/sh only if failed with ENOEXEC.
-
-Fri Aug 19 14:12:57 2011  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* backport r33007 from trunk.
-
-	* lib/net/imap.rb (idle): raises a Net::IMAP::Error when the
-	  connection is closed.  based on the patch by Hugo Barauna.
-	  [Bug #5190] [ruby-core:38930]
-
-Fri Aug 19 11:28:58 2011  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* backport r33001 from trunk.
-
-	* lib/net/imap.rb (msg_att): accepts extra space before ')'.
-	  based on the patch by art lussos.  [Bug #5163] [ruby-core:38820]
-
-Wed Aug 17 15:27:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* backport r32996 from trunk.
-
-	* ext/bigdecimal/bigdecimal.c (cannot_be_coerced_into_BigDecimal):
-	  add a new function for raising error when an object cannot coerce
-	  into BigDecimal.  [Bug #5172]
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimalValueWithPrec): use
-	  cannot_be_coerced_into_BigDecimal function.
-
-	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): ditto.
-
-	* ext/bigdecimal/bigdecimal.c (BigMath_s_log): ditto.
-
-	* test/bigdecimal/test_bigdecimal.rb: test for the avobe changes.
-
-	* test/bigdecimal/testbase.rb (under_gc_stress): add a new utility
-	  method to run tests under the condition of GC.stress = true.
-
-Wed Aug 17 10:16:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* backport r32994 from trunk.
-
-	* rational.c (nurat_coerce): Rational#coerce should converts itself
-	  into Complex if the argument is a Complex with non-zero imaginary
-	  part.  [Bug #5020] [ruby-dev:44088]
-
-	* test/ruby/test_rational.rb (test_coerce): test for the above change.
-
-Wed Aug 17 06:33:19 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r32992 from trunk.
-
-	* ext/openssl/ossl_x509cert.c: Add class documentation for
-	  OpenSSL::X509::Certificate.
-
-Wed Aug 17 05:02:25 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r32987 from trunk.
-
-	* ext/openssl/ossl_pkey.c: corrected docs, OpenSSL::PKey::DH does
-	  *not* support #sign/verify.
-
-Tue Aug 16 18:56:54 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (ruby_threadptr_data_type): rename to hide.
-	  [ruby-core:38972]
-
-Tue Aug 16 18:52:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/mkexports.rb (Exports::Mswin#each_export): exclude Init_
-	  and _threadptr_ functions, as well as mingw.
-
-Tue Aug 16 09:38:37 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r32981 and r32982 from trunk.
-
-	* ext/dl:  Add documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #5192]
-
-	* ext/.document (fiddle):  Remove duplicate entry
-
-	* ext/fiddle:  Complete documentation of Fiddle.  Patch by Vincent
-	  Batts.  [#5192]
-
-Tue Aug 16 08:00:15 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r32977 from trunk
-
-	* ext/socket:  Make Socket documentation appear.  Add documentation for
-	  Socket, TCPServer, SOCKSSocket.  Patch by Sylvain Daubert.
-	  [Ruby 1.9 - Feature #5182]
-
-Mon Aug 15 10:16:55 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-	* backport r32973 from trunk.
-
-	* ext/openssl/ossl_ssl.c: Support disabling OpenSSL compression.
-
-	* test/openssl/test_ssl.rb: Add a test for it.
-	  Thanks to Eric Wong for the patch.
-	  [Ruby 1.9 - Feature #5183] [ruby-core:38911]
-
-Sat Aug 13 22:17:27 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/mkconfig.rb: do not make the entries related to sitedir and
-	  verdordir if disabled by --without options.  [ruby-core:38922]
-	  [Bug #5187]
-
-Sat Aug 13 17:06:57 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: [ruby-core:38861]
-
-Sat Aug 13 16:59:51 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/test_*.rb: added tests.
-
-Sat Aug 13 09:36:19 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* ext/date/date_parse.c (parse_ddd_cb): fix r32896. RB_GC_GUARD
-	  insertion position was mistaken. [ruby-dev:44337] [Bug #5152]
-
-Sat Aug 13 09:26:24 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/core_ext.rb: Make Kernel#y private.
-	  [ruby-core:38913]
-
-	* test/psych/test_yaml.rb: corresponding test.
-
-Sat Aug 13 09:15:16 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (date_strftime_alloc): followed the change
-	  of r32885.
-
-	* NEWS: followed the above change.
-
-Sat Aug 13 08:49:05 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: [ruby-core:38855].
-
-Sat Aug 13 03:41:37 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r32953 from trunk.
-
-	* lib/uri/common.rb:  Fix documentation of URI::Parser.new.  Patch by
-	  Steve Klabnik.  [Ruby 1.9 - Bug #5177]
-
-Sat Aug 13 02:19:57 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r32950 from trunk.
-
-	* ext/digest/digest.c:  Add documentation for the Digest module.  Patch
-	  by Sylvain Daubert.  [Ruby 1.9 - Bug #5167]
-
-Fri Aug  5 13:32:43 2011  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* backport r32856 from trunk.
-
-	* lib/xmlrpc/client.rb, lib/xmlrpc/server.rb: should use
-	  String#bytesize instead of String#size.
-
-Fri Aug 12 13:53:03 2011  Narihiro Nakamura  <narihiro@netlab.jp>
-
-	* backport r32894 from trunk.
-
-	* gc.c (gc_lazy_sweep): if sweep target slots are not found, we
-	  try heap_increment() because it might be able to expand the
-	  heap. [Bug #5127] [ruby-dev:44285]
-
-	* gc.c (gc_clear_mark_on_sweep_slots): if a sweeping was
-	  interrupted, we expand the heap if at all possible.
-
-Fri Aug 12 12:28:17 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rake:  Update to Rake 0.9.2.2.  Prevent pollution of toplevel
-	  namespace by Commands.  Remove unused variable and debugging
-	  statement in tests.
-
-Fri Aug 12 09:00:24 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r32941 from trunk
-
-	* lib/rubygems:  Import RubyGems 1.8.8.  Fixes encoding of YAML gemspec
-	  from gems.  Github Issue #149
-
-Fri Aug 12 03:24:35 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* backport r32935 from trunk
-
-	* lib/rdoc:  Import RDoc 3.9.2.  Fixes TIDYLINK for HTML output.
-
-Tue Aug  2 22:04:46 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* backport r32815 from trunk.
-
-	* gc.c (init_heap): allocate sigaltstack after heaps are allocated.
-	  [ruby-dev:44315] [Bug #5139]
-
-	* vm.c (thread_free): use free because objspace is not ready.
-
-	* vm.c (th_init): use malloc because objspace is not ready.
-
-Thu Aug 11 19:04:38 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32931 from trunk.
-
-	* variable.c (autoload_delete): An autoload entry is still in a
-	  RCLASS_IV_TBL, not in a RCLASS_CONST_TBL, so take back the table
-	  changed in r29600. And an autoload entry keeps not a
-	  rb_const_entry_t but a NODE so remove rb_const_entry_t thing added
-	  in r29602.
-
-Thu Aug 11 15:07:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (link_command): use LIBRUBYARG in rbconfig for
-	  unbundled extensions.  [ruby-core:38802] [Bug #5147]
-
-	* lib/mkmf.rb (init_mkmf): revert r32902.  [ruby-core:38903]
-
-Wed Aug 10 19:30:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* backport r32903 from trunk.
-
-	* complex.c (nucomp_rationalize): calls rationalize of real part if
-	  imaginary part is exactly zero.  The patch is made by Marc-Andre
-	  Lafortune.  fixes [Bug #5178] [ruby-core:38885]
-
-	* test/ruby/test_complex.rb (test_rationalize): add a test for the
-	  above change.
-
-	* complex.c (nucomp_to_r): fix RDoc comment.  The patch is made by
-	  Marc-Andre Lafortune.
-
-Wed Aug 10 14:11:07 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (init_mkmf): set $LIBRUBYARG regardless of shared
-	  option.  [ruby-core:38802] [Bug #5147]
-
-Wed Aug 10 02:57:01 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb: come back autoload. OpenSSL constant is used
-	  some places, so it leads mistakes like HTTP.start.
-
-Tue Aug  9 22:57:45 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* ext/date/date_parse.c (date_zone_to_diff): add RB_GC_GUARD.
-	  [ruby-dev:44337] [Bug #5152]
-
-	* ext/date/data_parse.c (parse_ddd_cb): ditto.
-
-Tue Aug  9 12:20:33 2011  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/fiddle/helper.rb (libc_so, libm_so): Solaris support added.
-	  [ruby-core:38853] [Bug #5168]
-
-	* test/dl/test_base.rb (libc_so, libm_so): on Solaris, remove libc
-	  and libm version numbers for detecting default libc and libm.
-
-Tue Aug  9 10:49:52 2011  Igor Zubkov  <igor.zubkov@gmail.com>
-
-	* array.c: Fix typo. https://github.com/ruby/ruby/pull/36
-
-Mon Aug  8 00:10:45 2011  Akinori MUSHA  <knu@iDaemons.org>
-
-	* test/test_syslog.rb (TestSyslog#test_log): Do not be too
-	  specific about the log line format.  Fixes #5081.
-
-Sun Aug  7 23:39:44 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* time.c (rb_strftime_alloc): raise ERANGE if width is too large.
-	  Patch by Nobuyoshi Nakada. [Bug #4457] [ruby-dev:43285]
-
-	* test/ruby/test_time.rb (class TestTime): add a test for the
-	  above change.
-
-Sun Aug  7 14:15:10 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* backport r32876 from trunk.
-
-	* ext/objspace/objspace.c: fix typos in a document.
-
-Sun Aug  7 04:42:36 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* marshal.c (w_object):  Fix exception message when _dump_data
-	  is not defined on a T_DATA object.
-
-Sat Aug  6 06:14:20 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc:  Update to 3.9.1.  Fixes === lines in verbatim sections.
-	  Fixes :nodoc: on class aliases.  Fixes :stopdoc: creating references
-	  to Object.  Fixes spacing when class comments are merged in ri.
-	  Fixes `ri []` crash.  Fixes bug report URL when rdoc crashes.  Adds
-	  :doc: and :nodoc: to allow hiding of implementation details in ruby.
-	  Makes `rdoc` and `ri` gem-aware.
-
-Sat Aug  6 03:19:45 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems:  Import RubyGems 1.8.7:
-	  Added missing require for `gem uninstall --format-executable`.
-
-	  The correct name of the executable being uninstalled is now displayed
-	  with --format-executable.
-
-	  Fixed `gem unpack uninstalled_gem` default version picker.
-
-	  RubyGems no longer claims a nonexistent gem can be uninstalled.
-
-	  `gem which` no longer claims directories are requirable files.
-
-	  `gem cleanup` continues cleaning up gems if one can't be uninstalled
-	  due to permissions.  Issue #82.
-
-	  Gem repository directories are no longer created world-writable.
-	  Patch by Sakuro OZAWA.  [Ruby 1.9 - Bug #4930]
-
-Fri Aug  5 23:08:39 2011  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* backport r32845 from trunk.
-
-	* configure.in: when Solaris cc, use $(CC) to link shared libs.
-
-Fri Aug  5 22:16:20 2011  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* numeric.c (rb_infinity, rb_nan): use WORDS_BIGENDIAN to get endian.
-	  fix [Bug #5160] [ruby-dev:44356]
-
-Fri Aug  5 15:57:10 2011  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* complex.c (f_signbit): fix compile error in gcc4 on Solaris with
-	  CFLAGS="-std=gnu99".  [ruby-dev:44355] fix [Bug #5159]
-
-	* math.c: ditto.
-
-Thu Aug  5 10:09:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* backport r32846 from trunk.
-
-	* thread_pthread.c (native_cond_signal): retry to call pthread_cond_signal
-	  and pthread_cond_broadcast if they return EAGAIN in
-	  native_cond_signal and native_cond_broadcast, respectively.
-	  It is for the pthread implementation of Mac OS X 10.7 (Lion).
-	  fixes #5155.  [ruby-dev:44342].
-
-	* thread_pthread.c (native_cond_broadcast): ditto.
-
-	* thread_pthread.c (struct cached_thread_entry): stop using
-	  pthread_cond_t and its functions directly.
-
-	* thread_pthread.c (register_cached_thread_and_wait): ditto.
-
-	* thread_pthread.c (use_cached_thread): ditto.
-
-Fri Aug  5 07:35:00 2011  Luis Lavena  <luislavena@gmail.com>
-
-	* lib/rubygems/installer.rb (class Gem): Correct path check on Windows
-	  Possible fix for [Ruby 1.9 - Bug #5111]
-
-	* test/rubygems/test_gem_installer.rb (load Gem): ditto
-	  Backported from trunk r32804
-
-Fri Aug  5 07:00:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/io/console/test_io_console.rb (test_noctty): daemon() on
-	  Fedora Rawhide seems not to detach the controlling terminal,
-	  when the argument noclose is non-zero.  ref: [Bug #5135]
-
-Wed Aug  4 02:35:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* configure.in: use build_os variable for checking C and C++ compilers
-	  matching.
-
-	* configure.in: use clang++ if clang is used.
-
-Thu Aug  4 02:21:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (link_command): use static library only for bundled
-	  extensions.  [Bug #5147]
-
-Wed Aug  3 00:11:08 2011  Tanaka Akira  <akr@fsij.org>
-
-	* lib/prettyprint.rb: update document.  [ruby-core:36776]
-
-
-Tue Aug  2 20:10:16 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/testunit/test_parallel.rb: pass "--ruby" option to
-	  test/testunit/tests_for_parallel/runner.rb. [Bug #5132] [ruby-dev:44303]
-	  Backported from trunk r32812.
-
-Tue Aug  2 12:03:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (recursive_hash): hash value of emptied hash should be
-	  equal to an empty hash.  [ruby-core:38650]
-
-Tue Aug  2 11:42:15 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_enc_symname2_p): :! is valid symbol.  [Bug #5136]
-
-Tue Aug  2 03:26:02 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rake/test_rake_directory_task.rb (TestRakeDirectoryTask#
-	  test_directory_win32): fixed wrong test.
-	  backported r32670 from trunk.
-
-Mon Aug  1 15:45:23 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* test/rake/test_rake_functional.rb:  Don't assume the binary name of
-	  ruby is "ruby".  [Ruby 1.9 - Bug #5114]
-	* test/rake/helper.rb:  ditto
-
-Mon Aug  1 05:21:42 2011  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
-
-	* cont.c (cont_save_thread): fix missing semicolon.
-
-Sun Jul 31 22:57:16 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* enc/Makefile.in (ECHO1): Same as the recent fix in common.mk.
-	  ":" in a make variable replacement cause a syntax error with
-	  /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.
-
-Sun Jul 31 22:44:08 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* configure.in: fix typos.
-
-Sun Jul 31 21:19:51 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* lib/mkmf.rb (configuration:ECHO1): Same as the recent fix in
-	  common.mk.
-	  ":" in a make variable replacement cause a syntax error with
-	  /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.
-
-Sun Jul 31 21:16:02 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* complex.c (f_signbit): gcc4 on Solaris DOES have signbit but does
-	  not have it on header.
-
-	* math.c: ditto.
-
-Sun Jul 31 21:09:04 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* common.mk (node_name.inc): Use $(Q) for consistency.
-
-	* Makefile.in (INSNS): ditto.
-
-Sun Jul 31 20:39:12 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* common.mk (ECHO1): nmake does not allow parenthesis in make variable
-	  replacement.
-
-Sun Jul 31 20:21:36 2011  "Yuki Sonoda (Yugui)"  <yugui@yugui.jp>
-
-	* common.mk (ECHO1): ":" in a make variable replacement cause a syntax
-	  error with /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.
-
-	* configure.in (NULLCMD): new check.
-
-	* Makefile.in (NULLCMD): Reflects checking in configure.
-
-	* win32/Makefile.sub (NULLCMD): new assignment.
-
-Sun Jul 31 11:31:07 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* backport r32768 from trunk.
-
-	* vm.c: check if cfp is valid. [Bug #5083] [ruby-dev:44208]
-
-Sat Jul 31 01:23:45 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* backport r32762 from trunk.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_version): removed.
-
-Sat Jul 30 23:51:44 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/cmath.rb (cbrt): should return a real number if possible.
-
-Sat Jul 30 23:48:04 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: an issue that is same as  [ruby-dev:44071].
-
-	* ext/date/date_strftime.c: identical to [ruby-dev:44112].
-
-Sat Jul 30 23:19:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* defs/default_gems: separate from tool/rbinstall.rb.
-
-Sat Jul 30 23:14:44 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_each_byte): rbuf can be refreshed during yield.
-	  [Bug #5119]
-
-Sat Jul 30 22:35:50 2011  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* strftime.c (NEEDS): avoid SEGV due to integer overflow in
-	  sparc-solaris2.10 and i686-linux.  fix [Bug #4456] [ruby-dev:43284]
-
-Sat Jul 30 14:27:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* backport r32754 from trunk.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_version): version 1.1.0.
-
-	* ext/bigdecimal/bigdecimal.gemspec: turn into a default gem.
-
-	* tool/rbinstall.rb: ditto.
-
-Sat Jul 30 13:52:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb (Rational#to_d):
-	  revive zero and implicit precision support as a deprecated feature.
-
-	* test/bigdecimal/test_bigdecimal_util.rb: modify a test for the above
-	  change.
-
-	* NEWS: describes the above change.
-
-Sat Jul 30 10:58:10 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm.c (th_init): preallocate alternative stack.
-	  NoMemoryError is better than rb_bug, of course.
-	  Patch by Eric Wong. [ruby-core:38572][ruby-core:38594].
-
-	* signal.c (rb_register_sigaltstack): ditto.
-
-	* vm_core.h: moved ALT_STACK_SIZE definition from signal.c.
-
-	* vm.c (thread_free): use xfree() instead of free().
-
-Sat Jul 30 07:20:49 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/lib/socket.rb (udp_server_sockets): unused variable
-	  removed.
-	  patch by Jeremy Evans.  [ruby-core:38600]
-
-Fri Jul 29 23:56:32 2011  Tanaka Akira  <akr@fsij.org>
-
-	* lib/securerandom.rb: call OpenSSL::Random.seed at the
-	  SecureRandom.random_bytes call.
-	  based on the patch by Masahiro Tomita.  [ruby-dev:44270]
-
-Fri Jul 29 20:48:39 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: fix typos.
-
-Fri Jul 29 20:28:56 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: use whitespaces as a separator.
-
-Fri Jul 29 18:59:07 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: add documents for constants.
-	  patch by Eric Hodel.  [ruby-core:37853] [Bug #4989]
-
-Mon Jul 25 23:51:01 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* backport r32671 from trunk.
-
-	* proc.c: pre-allocate the unlinked_method_entry_list_entry struct to
-	  avoid memory allocation during GC.  based on a patch from Eric Wong.
-	  [ruby-core:38498]
-
-Mon Jul 25 22:36:11 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* backport r32669 from trunk.
-
-	* proc.c (struct METHOD), gc.c (gc_marks), vm_method.c
-	  (rb_gc_mark_unlinked_live_method_entries): fix SEGV bug.
-	  rb_method_entry_t was free'd even when the method is still on the
-	  stack if it is BMETHOD (i.e., Method#call).  This is because
-	  rb_method_entry_t is embedded in struct METHOD.  This commit
-	  separates them and marks the live method entries.
-	  See [ruby-core:38449] in detail.  fix [Bug #5047] [ruby-core:38171]
-
-Thu Jul 28 23:36:28 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* ext/fiddle/closure.c (callback): use rb_ary_tmp_new() instead of
-	  xmalloc() to allocate an array for arguments of callback procedure,
-	  to prevent arguments from being swept by GC. [ruby-core:38546]
-	  [Bug #4929]
-
-Thu Jul 28 22:51:27 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32723 from trunk.
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_initialize): Avoid possible
-	  SEGV from AES encryption/decryption. Processing data by
-	  Cipher#update without initializing key (meaningless usage of Cipher
-	  object since we don't offer a way to export a key) could cause SEGV.
-
-	  In OpenSSL, 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. See
-	  #2768.
-
-	* test/openssl/test_cipher.rb: test it.
-
-Thu Jul 28 04:53:31 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/delegate.rb:  Move file-level documentation to the appropriate
-	  classes.
-
-Thu Jul 28 00:33:47 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/fileutils/test_fileutils.rb: add OpenBSD case.
-	  patched by Jeremy Evans [ruby-core:38530] see #5097
-
-	* test/ruby/test_process.rb: ditto.
-
-Wed Jul 27 17:59:46 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/missing.h: define __syscall if the platform has
-	  __syscall in the library but doesn't define it in headers
-	  for example Mac OS X.
-
-Wed Jul 27 15:39:14 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* object.c:  Add usage documentation for BasicObject.  Based on patch
-	  by Thomas Sawyer.  [Ruby 1.9 - Bug #5067]
-
-Wed Jul 27 12:24:17 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/uninstaller.rb:  Add missing require and update
-	  messaging to avoid confusion with uninstall --format-executable.
-	  [Ruby 1.9 - Bug #4062]
-
-Wed Jul 27 10:47:57 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems:  Update to RubyGems 1.8.6.1.
-
-Wed Jul 27 10:04:06 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r32690 from trunk.
-
-	* test/openssl/test_pkcs12.rb: Add test and intermediate certificates.
-	  [ Ruby 1.9 - Feature #3793 ] [ruby-core:32088]
-
-Sat Jul 27 01:26:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* NEWS: add changes of bigdecimal and bigdecimal/util.
-
-Wed Jul 27 01:13:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb (Rational#to_d):
-	  zero or negative precision is error.  fixes #5098.
-	  [ruby-dev:44210]
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb (Float#to_d): modified for
-	  specifying precision.  fixes #5098.  [ruby-dev:44210]
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb (Integer#to_d): added
-	  for symmetry to BigDecimal() function with an Integer.
-	  fixes #5098.  [ruby-dev:44210]
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb (BigDecimal#to_d): added
-	  for adapting other Numeric subclasses.  [ruby-dev:44245]
-
-	* test/bigdecimal/test_bigdecimal_util.rb: add tests for the above
-	  changes.
-
-Wed Jul 27 00:54:38 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bigdecimal/bigdecimal.c (VpDup) a new function for duplicating
-	  a BigDecimal.
-
-	* bigdecimal/bigdecimal.c (BigDecimal_new): support generating a new
-	  BigDecimal from another BigDecimal using BigDecimal global function
-	  or constructor.  [ruby-dev:44245]
-
-Mon Jul 25 22:24:09 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32666 from trunk.
-
-	* lib/xmlrpc/client.rb: Fix possible HTTP header formatting failure by
-	  'Basic' header. Long username caused the base64 String truncation in
-	  HTTP header which is not allowed. See #5046.
-
-	* test/xmlrpc/test_webrick_server.rb: test it.
-
-Mon Jul 25 15:36:07 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/{x509.rb,ssl.rb}: Add deprecation warning
-	  for openssl/{x509,ssl} usage. Users should require "openssl" instead
-	  of "openssl/ssl" and "openssl/x509". Start of transition period
-	  introduced by [ruby-dev:38018].
-
-Mon Jul 25 13:50:33 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32662 from trunk.
-
-	* ext/openssl/lib/openssl/x509.rb: Cosmetic change: move definition
-	  introduced in r30152 to x509-internal.rb.
-
-Mon Jul 25 13:35:20 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32658 from trunk.
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): Avoid randomly generated
-	  SSLError from SSLSocket just after invoking SSLSocket#close.
-	  OpenSSL's SSL_shutdown could try to send alert packet and it might
-	  set SSLerr(global error stack) as the result. It causes the next
-	  SSL read/write operation to fail by unrelated reason.
-
-	  By design, we're ignoring any error at SSL_shutdown() so we clear
-	  global error stack after SSL_shutdown is called. See #5039.
-
-Sun Jul 24 20:29:53 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/extconf.rb: refine the recvmsg test.
-
-Sun Jul 24 20:02:31 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/extconf.rb: fix the recvmsg test.
-
-Sun Jul 24 08:42:51 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/extconf.rb: test recvmsg allocates file descriptors for
-	  fd passing even with MSG_PEEK.
-
-	* ext/socket/ancdata.c: use the above test result.
-
-Sun Jul 24 01:24:31 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb:  Restore behavior of
-	  Gem::Specification#loaded.  [Ruby 1.9 - Bug #5032]
-
-Sun Jul 24 01:14:49 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/rake/test_rake_functional.rb (setup): Use __FILE__ for the base
-	  directory. Current directory is not the top source directory when
-	  the building process runs on other than there.
-
-	* test/rake/test_rake_rake_test_loader.rb: ditto.
-
-	* test/rake/test_rake_task_argument_parsing.rb
-	  (test_terminal_width_using_hardcoded_80): hardcoded 80 is used
-	  when app.unix? is false.
-
-Sun Jul 24 00:42:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* configure.in: change the default compiler to gcc-4.2 if target os
-	  is OS X 10.7 (Lion).
-
-Sat Jul 23 17:06:25 2011  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (rb_update_max_fd): validate fd.
-
-	* ext/socket/rubysocket.h (rsock_discard_cmsg_resource): add
-	  msg_peek_p argument for the declaration.
-
-	* ext/socket/ancdata.c (discard_cmsg): add msg_peek_p argument.
-	  assume FreeBSD, NetBSD and MacOS X doesn't generate passed fd
-	  when MSG_PEEK.
-	  (rsock_discard_cmsg_resource): add msg_peek_p argument.
-	  (bsock_recvmsg_internal): call rsock_discard_cmsg_resource with
-	  msg_peek_p argument.
-
-	* ext/socket/unixsocket.c (unix_recv_io): call
-	  rsock_discard_cmsg_resource with msg_peek_p argument.
-
-Sat Jul 23 14:38:28 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* test/rake*: Remove dependencies on flexmock and session gems.
-	  [Ruby 1.9 - Bug #4987]
-
-Fri Jul 22 21:46:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_insnhelper.c (vm_call_cfunc): added volatile for a workaround
-	  of cfp consistency error problem on OS X 10.7 (Lion). It's
-	  suspected llvm optimization bug.
-	  [Bug #5076] [ruby-dev:44185]
-
-Fri Jul 22 21:50:16 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb (WFKV_): unroll the loop of regexp.
-
-	* lib/uri/generic.rb (URI.decode_www_form_component): ditto.
-
-Fri Jul 22 21:49:48 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enum.c (enum_inject): remove empty line to notify rdoc
-	  Enumerable#reduce is alias. patched by milki@github.
-	  https://github.com/ruby/ruby/pull/26
-
-Fri Jul 22 21:49:28 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#each):
-	  Allow HTTP/0.9 request which doesn't has any header or body.
-	  patched by Felix Jodoin. [ruby-core:38040] [Bug #5022]
-
-Fri Jul 22 21:45:21 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/dl/handle.c (dlhandle_sym): clear previous error with dlerror()
-	  before calling dlsym(). [ruby-dev:44091] [Bug #5021]
-
-Fri Jul 22 19:05:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_enc_symname2_p): get rid of potential out-of-bound
-	  access.
-
-Fri Jul 22 13:55:59 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/http.rb:  Net::HTTP#finish is used to manually close
-	  connections.  [Ruby 1.9 - Bug #5045]
-
-Fri Jul 22 13:51:29 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/readline/readline.c:  Add examples for Readline.completion_proc=.
-	  [Ruby 1.9 - Bug #5057]
-
-Fri Jul 22 13:20:33 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* tool/rbinstall.rb (default gems):  Install executables into the fake
-	  gem dir for Gem.bin_path.  [Ruby 1.9 - Bug #4485]
-
-Fri Jul 22 13:03:12 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r32609 from trunk.
-
-	* ext/openssl/ossl_hmac.c: Revert checking return type of
-	  HMAC_Init_ex as it is not compatible with OpenSSL < 1.0.0.
-
-Fri Jul 22 11:22:20 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r32606 from trunk.
-
-	* ext/openssl/ossl_digest.c: Check return value of EVP_DigestInit_ex.
-	* ext/openssl/ossl_hmac.c: Check return value of HMAC_Init_ex.
-	  Thanks, Jared Jennings, for the patch.
-	  [ Ruby 1.9 - Bug #4944 ] [ruby-core:37670]
-
-Fri Jul 22 09:17:43 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r32604 from trunk.
-
-	* ext/openssl/ossl_engine.c: Avoid double free of ENGINE reference.
-	* test/openssl/test_engine.rb: Add a test for it.
-	  Thanks to Ippei Obayashi for providing the patch.
-	  [ Ruby 1.9 - Bug #5062 ] [ruby-dev:44173]
-
-Fri Jul 22 06:39:34 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/csv.rb: Do not modify CSV.generate's argument [ruby-core:38356]
-
-Thu Jul 21 20:02:11 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* thread.c (set_trace_func, thread_set_trace_func_m): reset tracing
-	  state when set_trace_func hook is removed.  This is workaround patch
-	  to force to reset tracing state that is broken by continuation call.
-	  a patch from James M. Lawrence.  [Feature #4347] [ruby-core:34998]
-
-	* test/ruby/test_continuation.rb (class TestContinuation): add a test
-	  for above.  a patch from James M. Lawrence.
-
-Thu Jul 21 20:59:59 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/ancdata.c (discard_cmsg): workaround for MacOS X Lion.
-
-
-Thu Jul 21 07:07:57 2011  Tanaka Akira  <akr@fsij.org>
-
-	* backport r32579, r32581, r32587 by akr and r32588 by kazu.
-
-	r32579:
-
-	* io.c (rb_update_max_fd): new function.
-
-	* internal.h (rb_update_max_fd): declare rb_update_max_fd.
-
-	* thread_pthread.c (rb_thread_create_timer_thread): update max fd when
-	  timer thread pipe is created.
-
-	r32581:
-
-	* io.c (UPDATE_MAXFD): removed.
-
-	r32587:
-
-	* include/ruby/intern.h (rb_update_max_fd): declaration moved from
-	  internal.h.
-
-	* file.c: ditto.
-
-	* io.c: call rb_update_max_fd for each new fds.
-
-	* process.c: ditto.
-
-	* random.c: ditto.
-
-	* ruby.c: ditto.
-
-	* ext/io/console/console.c: ditto.
-
-	* ext/openssl/ossl_bio.c: ditto.
-
-	* ext/pty/pty.c: ditto.
-
-	* ext/socket/init.c: ditto.
-
-	* ext/socket/socket.c: ditto.
-
-	* ext/socket/ancdata.c: ditto.
-
-	* ext/socket/unixsocket.c: ditto.
-
-	r32588:
-
-	* io.c (rb_update_max_fd): remove parentheses. they are not in
-	  macro.
-
-Sun Jul 17 08:07:31 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r32563 from trunk
-
-	* test/openssl/test_ssl_session.rb: add PEM SSL session without TLS
-	  extensions. Use this as the default for the tests to ensure
-	  compatibility with OpenSSL 0.9.7.
-	  [ Ruby 1.9 - Bug #4961 ] [ruby-core:37726]
-
-Sat Jul 16 17:29:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_UNIVERSAL_ARCH): restore arch flag.
-	  Bug #4977
-
-Sat Jul 16 11:18:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/setup.mak: support to build x64-mswin64 on Windows7 (and Vista,
-	  perhaps).
-	  backported r32521 from trunk
-
-Sat Jul 16 06:31:23 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/uri/common.rb (module): Remove optional parser argument to
-	  Kernel#URI
-	  [ruby-core:38061]
-
-	* lib/uri/generic.rb (module): ditto
-
-Sat Jul 16 01:15:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* time.c (time_dup): used rb_obj_class() instead of CLASS_OF().
-	  The patch is made by Kazuki Tsujimoto. [Bug #5012] [ruby-dev:44071]
-
-	* test/ruby/test_time.rb (TestTime#test_getlocal_dont_share_eigenclass):
-	  added a new test for eigenclass of time object.
-
-Fri Jul 15 19:11:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (bigsub_int): add RB_GC_GUARD.  This patch is made by
-	  Makoto Kishimoto.  fixes #4223 [ruby-dev:42907]
-
-	* bignum.c (bigadd_int): ditto.
-
-Fri Jul 15 09:59:12 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32546 from trunk.
-
-	* ext/digest/sha2/sha2.c (SHA256_Update, SHA512_Update): avoid Bus
-	  Error caused by unalignment access on Sparc-Solaris (and possibly on
-	  other similar environment.) This patch just do memcpy always instead
-	  of checking architecture. I see no perf drop on my 64bit env. For
-	  more details, see #4320.
-
-	* test/digest/test_digest.rb: add test for unalignment access.
-
-
-Thu Jul 14 12:40:07 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32537 from trunk.
-
-	* ext/openssl/ossl.c (ossl_verify_cb): trap the exception from
-	  verify callback of SSLContext and X509Store and make the
-	  verification fail normally. Raising exception directly from callback
-	  causes orphan resouces in OpenSSL stack. Patched by Ippei Obayashi.
-	  See #4445.
-
-	* test/openssl/test_ssl.rb
-	  (test_exception_in_verify_callback_is_ignored): test it.
-
-Wed Jul 13 08:20:08 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb(Test::Unit::Options#process_args): Fix bug.
-	  Fix process_args didn't return `@option` after r30939. Backported
-	  r32526 from trunk.
-
-Mon Jul 11 23:50:39 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
-
-	* time.c: can't compile time.c on AIX due to missing declaration for
-	  ffs(). It is declared in strings.h on AIX. backported r32518 from
-	  trunk.
-
-Mon Jul 11 23:47:00 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
-
-	* thread_pthread.c (get_stack):  need to adjust stack addr for
-	  [Bug #1813] on AIX. backported r32511 from trunk.
-
-Mon Jul 11 15:17:03 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* numeric.c (rb_num2ull): use FIX2LONG instead of FIX2ULONG. see
-	  rb_num2ulong(). fixed the problem of ObjectSpace._id2ref of IL32LLP64
-	  platforms, introduced at r32433.
-	  backported r32512 from trunk.
-
-Sun Jul 10 23:58:55 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* version.h: 1.9.3 is no longer trunk.
-
-Sun Jul 10 23:24:29 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* class.c (rb_mix_module): reverted r31873.
-	  (check_mix_method_i, do_mix_method_i) reverted r31917.
-
-	* test/ruby/test_module.rb (TestModule#test_mix_const): reverted
-	  r31918.
-
-Sun Jul 10 22:50:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (rmpd_power_by_big_decimal): fix
-	  precision treatment errors.
-
-	* test/bigdecimal/test_bigdecimal.rb: add tests for the above change.
-	  fix precision treatment errors.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_power): precision argument
-	  should be optional for its compatibility.
-
-Sun Jul 10 22:38:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (var_ref): distinguish vcall from local variable
-	  references.  based on a patch by Michael Edgar michael.j.edgar
-	  AT dartmouth.edu.  Bug #5002
-
-Sun Jul 10 21:51:29 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h: add comments (cautions).
-
-Sun Jul 10 20:59:38 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb: Add new class variable `@@testfile_prefix`.
-	  This is for changing test name prefix. (For testing)
-
-	* test/testunit/tests_for_parallel/ptest_first.rb: Renamed from
-	  test_first.rb
-
-	* test/testunit/tests_for_parallel/ptest_second.rb: Renamed from
-	  test_second.rb
-
-	* test/testunit/tests_for_parallel/ptest_third.rb: Renamed from
-	  test_third.rb
-
-	* test/testunit/tests_for_parallel/ptest_forth.rb: Renamed from
-	  test_forth.rb
-
-	* test/testunit/tests_for_parallel/runner.rb: Remove misc.rb
-
-	* test/testunit/tests_for_parallel/ptest_first.rb: ditto.
-
-	* test/testunit/tests_for_parallel/ptest_second.rb: ditto.
-
-	* test/testunit/tests_for_parallel/ptest_third.rb: ditto.
-
-	* test/testunit/tests_for_parallel/ptest_forth.rb: ditto.
-
-	* test/testunit/tests_for_parallel/misc.rb: Removed because no longer
-	  needed.
-
-	* test/testunit/test_parallel.rb: Fix assertions for above.
-
-Sun Jul 10 16:57:08 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_throw): check a class frame.
-	  Fixes Bug #4648.
-	  The patch is contributed by Kazuki Tsujimoto.
-
-	* bootstraptest/test_proc.rb: add tests for above.
-
-Sun Jul 10 17:28:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (mutex_debug): use exit(EXIT_FAILURE) instad of
-	  exit(1).
-	* thread_pthread.c (add_signal_thread_list): ditto.
-	* thread.c (rb_thread_call_with_gvl): ditto.
-	* util.c (Bug): ditto.
-
-Sun Jul 10 15:58:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd).
-	  [Bug #4700]
-
-Sun Jul 10 16:41:32 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_core.h (typedef struct rb_vm_struct): create a new
-	  'inhibit_thread_createion' field.
-	* thread.c (rb_thread_terminate_all): set inhibit_thread_creation.
-	* thread.c (thread_s_new): don't permit to create new thread
-	  if the VM is under destruction. Otherwise evil finalizer code
-	  can make SEGV. [Bug #4992][ruby-core:37858]
-
-	* bootstraptest/test_objectspace.rb: new test for this fix.
-
-Sun Jul 10 16:06:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* signal.c (sigsegv): use abort() instead of exit() when nested
-	  SEGV was happen. Because unnested SEGV use abort().
-	  [Bug #5013][ruby-dev:44078]
-
-Sun Jul 10 15:30:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* load.c (rb_f_autoload): prevent to autoload for singleton
-	  classes.  fixes [Bug #4886] [ruby-dev:43816]
-
-	* bootstraptest/test_autoload.rb: add tests for the above change.
-
-Sun Jul 10 15:09:17 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit/assertions.rb: Import documentation patch by Justin
-	  Collins. [ruby-core:37225] [Feature #4903]
-
-Sun Jul 10 14:57:36 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: canonicalizes nth and sf.
-
-Sun Jul 10 14:13:50 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h (rb_thread_call_with_gvl, rb_thread_call_without_gvl):
-	  make them visible as experimental C APIs.  fixes Feature #4328.
-
-Sun Jul 10 12:18:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_power): support non-integral
-	  exponent.  fixes [Bug #3271]
-
-	* ext/bigdecimal/bigdecimal.c (rmpd_power_by_big_decimal): ditto.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_power_op): add a function to
-	  only use for "**" operator.
-
-	* test/bigdecimal/test_bigdecimal.rb: add a bunch of tests for the
-	  above changes.
-
-	* ext/bigdecimal/bigdecimal.c (is_integer): add an utility function.
-
-	* ext/bigdecimal/bigdecimal.c (is_negative): ditto.
-
-	* ext/bigdecimal/bigdecimal.c (is_positive): ditto.
-
-	* ext/bigdecimal/bigdecimal.c (is_zero): ditto.
-
-	* ext/bigdecimal/bigdecimal.c (is_one): ditto.
-
-	* ext/bigdecimal/bigdecimal.c (is_even): ditto.
-
-Sun Jul 10 12:08:39 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* compile.c (when_vals): when a string literal is written on when
-	  clause, skip string creation to make it faster.  [ruby-dev:44068]
-	  [Feature #5000]
-
-Sun Jul 10 11:35:29 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* parse.y (reduce_nodes_gen): NODE_RETURN in rescue body must not be
-	  reduced when there is an else clause.  This caused bizarre behavior
-	  in [Bug #4473] [ruby-core:35629] [ruby-core:37884].
-
-Sun Jul 10 09:46:14 2011  Masaya Tarui  <tarui@ruby-lnag.org>
-
-	* range.c (range_max): fix behavior with excluded end value.
-	  [Bug #4591]
-
-Sun Jul 10 09:13:18 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* NEWS:  Fix RubyGems version.  [Ruby 1.9 - Bug #5004]
-
-Sat Jul  9 20:01:59 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* internal.h: rb_rational_reciprocal is defined in rational.c.
-
-Sat Jul  9 19:48:31 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* internal.h: added declarations.
-	* complex.c: followed the above change.
-
-Sat Jul  9 17:24:41 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* NEWS: bigdecimal is not a builtin.
-
-Sat Jul  9 17:17:53 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: some improvements for performance.
-
-Sat Jul  9 16:56:01 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* atomic.h (ATOMIC_OR): _InterlockedOr is unavailable in VC6.
-
-	* numeric.c (ULLONG_MAX): fallback definition.
-
-Sat Jul  9 15:59:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_{read,write}): should be signed.
-	  Bug #5001
-
-Sat Jul  9 14:02:20 2011  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
-
-	* lib/cgi/core.rb: fix multipart form parsing bug. [Bug #3866]
-
-Sat Jul  9 11:41:03 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Add Vector#normalize [ruby-dev:43829]
-
-Sat Jul  9 09:25:06 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* enumerator.c:  Remove "enumeration sequenced by".
-	  [Ruby 1.9 - Bug #4757]
-
-Sat Jul  9 09:14:56 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* io.c:  Note that methods other than IO#gets may increase IO#lineno.
-	  [Ruby 1.9 - Bug #4902]
-
-Sat Jul  9 08:39:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (RUN_OPT): disable gems.
-
-Sat Jul  9 08:37:05 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_close): close(2) on a fd which is being read by
-	  another thread causes deadlock on Mac OS X 10.5
-
-Fri Jul  8 21:20:39 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c: use USE_ELF instead of __ELF__ because Solaris
-	  doesn't define it. USE_ELF is already provided by configure.
-	  patched by Naohisa Goto. [ruby-dev:44066] [Bug #4998]
-
-	* addr2line.h: ditto.
-
-	* vm_dump.c: ditto.
-
-Fri Jul  8 16:40:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/parser/parser.rl (convert_encoding): should not modify
-	  the argument.
-
-	* ext/json/parser/parser.rl (convert_encoding): no needs to use
-	  force_encoding.
-
-Fri Jul  8 15:53:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_bug): get rid of segfault after all threads
-	  disposed.
-
-Fri Jul  8 15:01:06 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/ossl.h: include openssl/e_os2.h before checking the
-	  defition of OPENSSL_SYS_WIN32.
-
-Fri Jul  8 14:40:39 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (wunlink): reverted a part of r32426. it was mistakenly
-	  mixed.
-
-Fri Jul  8 14:29:47 2011  Narihiro Nakamura  <authornari@gmail.com>
-
-	* configure.in: can't subtract void *.
-
-Fri Jul  8 14:33:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (config.h): define GC_MARK_STACKFRAME_WORD.
-	  fixed build problem of r32438.  the value (30) is temporary value.
-	  maybe it's enough by 20~24 according to my observation.
-
-Fri Jul  8 13:47:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_mutex_unlock_all): folded into
-	  rb_threadptr_unlock_all_locking_mutexes.
-	* thread.c (rb_threadptr_unlock_all_locking_mutexes) ditto.
-
-Fri Jul  8 13:36:02 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (thread_unlock_all_locking_mutexes): rename to
-	  rb_threadptr_unlock_all_locking_mutexes and remove static.
-	* vm_core.h: add rb_threadptr_unlock_all_locking_mutexes declaration.
-	* thread.c (thread_start_func_2): adjust the above rename.
-
-	* eval.c (ruby_cleanup): call rb_threadptr_unlock_all_locking_mutexes
-	  again after finalizer. [Bug #4988] [ruby-dev:44049]
-
-Fri Jul  8 13:06:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* cont.c (FIBER_MACHINE_STACK_ALLOCATION_SIZE): Fiber stack size
-	  don't need to keep multiple number of sizeof(VALUE).
-
-Fri Jul  8 11:39:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (sudo-precheck): true command is not standard on
-	  Windows.
-
-Fri Jul  8 10:39:52 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (gvl_destroy): fix cond_t leak.
-
-Fri Jul  8 09:17:59 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* gc.c:  Improve documentation
-
-Thu Jul  7 23:35:31 2011  Narihiro Nakamura  <authornari@gmail.com>
-
-	* gc.c: change water_mark value that may call
-	  gc_mark(lev <= GC_LEVEL_MAX) in gc_mark().
-	  In ruby_stack_check(), water_mark is a value that may call some
-	  C function. Fixes Bug #3781
-
-	* configure.in: define GC_MARK_STACKFRAME_WORD that approximate
-	  size of gc_mark() and gc_mark_children() stackframes.
-
-Thu Jul  7 17:55:05 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/testunit/test_parallel.rb (TestParallelWorker#teardown): wait
-	  the child process even if the communication pipe is broken.
-
-Thu Jul  7 15:44:42 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_set_index, rb_enc_associate_index): should
-	  check if frozen.
-
-	* parse.y (rb_intern3), ruby.c (process_options, ruby_script):
-	  defer freezing after associating encodings.
-
-Thu Jul  7 15:16:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (rb_num2ull): use own switch sentence.
-	  Current implementation can't convert 18446744073709551615.
-
-Thu Jul  7 06:56:15 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* cont.c (FIBER_STACK_FLAGS): workaround fix for r32420 on FreeBSD.
-
-Thu Jul  7 06:46:12 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* benchmark/driver.rb:  Add difference column to report that averages
-	  across all runs of a benchmark.  [Ruby 1.9 - Feature #4982]
-
-Thu Jul  7 06:19:38 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  Reduce requires to improve `make benchmark`.
-	  [#4962]
-	* lib/rubygems/specification.rb:  Delay initialization of rubygems
-	  until require is called.
-
-Thu Jul  7 04:31:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (arg): rescue_mod is in inverse order from other
-	  modifiers.  patched by michael.j.edgar AT dartmouth.edu at
-	  [ruby-core:36248].  fixed #4716.
-
-Thu Jul  7 00:40:16 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (kill): check that the process exited or not before
-	  terminating it. [Bug #4943]
-
-Wed Jul  6 23:13:19 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (opt_call_args): allow trailing comma after assoc
-	  argument e.g. 'foo(bar:1,)'.  fixed #3456
-
-Wed Jul  6 22:11:12 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Validate date in
-	  "Date:" header
-
-Wed Jul  6 21:29:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* cont.c (fiber_machine_stack_alloc): cleanup pointer arithmetic.
-	  "size/sizeof(VALUE)" is ugly and easy confusing.
-	* cont.c (fiber_initialize_machine_stack_context): ditto.
-
-Wed Jul  6 21:24:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* cont.c (fiber_machine_stack_alloc): fix mprotect misuse. A stack
-	  guard page should have PROT_NONE.
-	* cont.c (fiber_initialize_machine_stack_context):
-	  th->machine_stack_maxsize shouldn't be included guard pages size.
-	  [Bug #4983][ruby-dev:44043]
-
-Wed Jul  6 21:23:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* cont.c (fiber_machine_stack_alloc): use MAP_STACK if it's provided.
-
-Wed Jul  6 21:22:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* cont.c (fiber_machine_stack_alloc): use MAP_FAILED instead of -1.
-
-Wed Jul  6 21:21:05 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* cont.c (fiber_machine_stack_alloc): remove unnecessary cast.
-
-Wed Jul  6 18:10:13 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Adding space after
-	  comma.
-
-	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Remove variable
-	  `now`. Suppress warning.
-
-Wed Jul  6 12:18:09 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Fix bug depends to
-	  time. The test fails if time past 1 second in line 136-145
-
-Tue Jul  5 15:28:04 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_here_document): should dispatch heredoc_end
-	  scanner event on an empty here document.  fixed Bug#4543.
-
-Tue Jul  5 13:49:26 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* addr2line.c: fix r32407 to check HAVE_ALLOCA_H.
-
-Tue Jul  5 14:05:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/webrick/httpauth/digestauth.rb (_authenticate):
-	  Literal texts in HTTP ABNF is case-insensitive (RFC2616 2.1),
-	  and a ample implementation in RFC2617 also ignores the case
-	  of algorithms. So now this ignores those cases.
-	  [ruby-dev:43965] [Feature #4936]
-
-	* lib/webrick/httpauth/digestauth.rb (initialize):
-	  Because of above, opera_hack is useless and removed.
-
-Tue Jul  5 01:30:01 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* thread_pthread.c (native_sleep): cut the waiting time up to
-	  100,000,000 because Solaris cond_timedwait() return EINVAL if an
-	  argument is greater than current_time + 100,000,000.  This is
-	  considered as a kind of spurious wakeup.  The caller to native_sleep
-	  should care about spurious wakeup.
-
-Tue Jul  5 01:24:26 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* cont.c: disable FIBER_USE_NATIVE on Solaris because resuming any
-	  Fiber caused SEGV.  I haven't follow up the issue deeply, but it
-	  works when disabling the feature.
-
-Tue Jul  5 01:22:46 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* addr2line.c: include <alloca.h> to fix a build issue on Solaris.
-
-Tue Jul  5 00:49:05 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* ext/coverage/coverage.c: resurrect r32071 + add GC guard for
-	  rb_coverages. [ruby-core:37352] [Bug #4927]
-	  [ruby-core:36539] [Feature #4796]
-
-	* test/coverage/test_coverage.rb resurrect r32071.
-
-Mon Jul  4 22:24:46 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (get_stack): For NetBSD/FreeBSD, use
-	  pthread_attr_getstack() if possible. and, remove an assumption
-	  of stack growing direction.
-
-Mon Jul  4 20:42:31 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* ext/coverage/coverage.c: revert r32071.  The commit caused SEGV on
-	  some minor nonfree OS.  I have no means of debugging the bug.  My
-	  personal opinion is that such OS should be unsupported unless there
-	  is an active maintainer.  [ruby-core:37352]
-
-	* test/coverage/test_coverage.rb: ditto.
-
-Mon Jul  4 07:14:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* thread_pthread.c (get_stack): the return address of get_stack
-	  must be the highest address of the current thread's stack.
-
-Mon Jul  4 06:37:22 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/intern.h, thread_pthread.c (rb_reserved_fd_p,
-	  RB_RESERVED_FD_P): added.  This C API is to limit to access
-	  fds which are used by RubyVM internal.  In this version of
-	  CRuby, return 1 if fd is communication pipe.
-	  If your application needs to close all file descriptors to
-	  present resource leak, skip internal fds using this C API.
-	  We also define a macro RB_RESERVED_FD_P(fd).  So you can write
-	    #ifndef RB_RESERVED_FD_P
-	    #define RB_RESERVED_FD_P(fd) 0
-	    #endif
-	  for Ruby 1.9.2 or previous version to write compatible extensions.
-	  See [ruby-core:37727]
-
-	* thread_win32.c (rb_reserved_fd_p): added (return 0 for any fds).
-
-	* io.c (rb_io_initialize): raise ArgumentError if given fd is reserved by Ruby.
-
-Sun Jul  3 23:43:56 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* ext/extmk.rb (extmake): suppresses outputs from extconf.rb.
-	  (extmake) warns a failure in extconf.rb.
-
-Sun Jul  3 13:44:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (ary_reject_bang): should not remove elements which are
-	  not yielded.  [Bug #2545]
-
-Sun Jul  3 06:10:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (get_stack): pthread_attr_getstack() doesn't
-	  return stack start address, but stack base address. Thus,
-	  we need to add stack size for getting stack start address.
-	  And, we don't have to decrease guard size twice.
-	* thread_pthread.c (thread_start_func_1): don't use inaccurate
-	  stack start guess if native_thread_init_stack() can be used.
-	  [Bug #1813] [ruby-core:24540]
-
-Sun Jul  3 04:50:08 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (get_stack): add to a care of guard page on Mac
-	  OS X. [Bug #1813] [ruby-core:24540]
-	* signal.c (ruby_signal): SIGBUS use alternative stack too.
-	* signal.c (sigbus): On Mac, thread stack overflow makes SIGBUS
-	  instead of SIGSEGV. thus, added stackoverflow check.
-	* signal.c (default_handler): get rid of compilation warning.
-	* signal.c (Init_signal): ditto.
-
-Sat Jul 02 08:59:20 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_ocsp.rb
-	* test/openssl/test_x509_cert.rb: Perform SHA-256 tests only if
-	  supported by the available OpenSSL version. Versions < 0.9.8 don't
-	  support it. [ruby-core:37724]
-
-Sat Jul  2 07:17:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_reject_bang, rb_ary_delete_if): rejected
-	  elements should be removed.  fixed [Bug #2545]
-
-Sat Jul  2 01:57:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* NEWS: remove a description of Kernel#respond_to? because it has
-	  been reverted at revision 28564.
-
-Sat Jul  2 00:58:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* NEWS: describe a change of multiplication of Bignum.
-
-Fri Jul  1 18:52:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/bm_app_erb.rb: increase loop count. too short
-	  measurement time makes less accuracy.
-	* benchmark/bm_app_factorial.rb: ditto.
-	* benchmark/bm_app_mandelbrot.rb: ditto.
-	* benchmark/bm_app_strconcat.rb: ditto.
-
-	* benchmark/bm_io_file_create.rb: ditto.
-	* benchmark/bm_io_file_read.rb: ditto.
-	* benchmark/bm_io_file_write.rb: ditto.
-
-	* benchmark/bm_so_concatenate.rb: ditto.
-	* benchmark/bm_so_lists.rb: ditto.
-	* benchmark/bm_so_matrix.rb: ditto.
-	* benchmark/bm_so_random.rb: ditto.
-	* benchmark/bm_so_sieve.rb: ditto.
-
-	* benchmark/bm_vm_thread_mutex1.rb: ditto.
-	* benchmark/bm_vm_thread_mutex2.rb: ditto.
-	* benchmark/bm_vm_thread_mutex3.rb: ditto.
-
-	* benchmark/bm_vm1_block.rb: cleanup.
-	* benchmark/bm_vm1_const.rb: cleanup.
-	* benchmark/bm_vm1_ensure.rb: cleanup.
-	* benchmark/bm_vm1_ivar.rb: cleanup.
-	* benchmark/bm_vm1_length.rb: cleanup.
-	* benchmark/bm_vm1_neq.rb: cleanup.
-	* benchmark/bm_vm1_not.rb: cleanup.
-	* benchmark/bm_vm1_rescue.rb: cleanup.
-	* benchmark/bm_vm1_simplereturn.rb: cleanup.
-	* benchmark/bm_vm1_swap.rb: cleanup.
-
-	* benchmark/bm_vm2_array.rb: cleanup.
-	* benchmark/bm_vm2_case.rb: cleanup.
-	* benchmark/bm_vm2_defined_method.rb: cleanup.
-	* benchmark/bm_vm2_eval.rb: cleanup.
-	* benchmark/bm_vm2_method.rb: cleanup.
-	* benchmark/bm_vm2_mutex.rb: cleanup.
-	* benchmark/bm_vm2_poly_method.rb: cleanup.
-	* benchmark/bm_vm2_poly_method_ov.rb: cleanup.
-	* benchmark/bm_vm2_proc.rb: cleanup.
-	* benchmark/bm_vm2_regexp.rb: cleanup.
-	* benchmark/bm_vm2_send.rb: cleanup.
-	* benchmark/bm_vm2_super.rb: cleanup.
-	* benchmark/bm_vm2_unif1.rb: cleanup.
-	* benchmark/bm_vm2_zsuper.rb: cleanup.
-
-	* benchmark/bm_vm_thread_alive_check1.rb: cleanup.
-
-Fri Jul  1 15:23:00 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix: Add LUP decomposition
-
-Fri Jul  1 15:21:14 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Allow non integer exponents for Matrix#**
-
-Fri Jul  1 15:13:25 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix: Add Eigenvalue Decomposition
-
-Fri Jul  1 15:10:22 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix: Add Matrix#round
-
-Fri Jul  1 11:41:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (tr_trans): free heap ptr when the str is not embedded.
-	  patched by Eric Wong. [Bug #4956] [ruby-core:37708]
-
-Fri Jul  1 11:07:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (do_select): fix memory leak.
-	  Patch by Eric Wong. Thank you! [Bug #4953] [ruby-core:37702]
-
-Fri Jul  1 08:21:28 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_getivar): check vm state version
-	  to invalidate inline cache (ivar index).
-	  fixes Bug #4926.
-
-	* vm_insnhelper.c (vm_setivar): ditto.
-
-Fri Jul  1 08:03:15 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c, thread_pthread.c (WRITE_CONST): suppress warnings
-	  `ignoring return value'.
-
-Fri Jul  1 06:41:36 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (rb_threadptr_check_signal): only wake up main thread.
-
-	* thread.c (rb_threadptr_execute_interrupts_common): check signal
-	  delivery if it is main thread.
-	  fixes [ruby-dev:44005] [Ruby 1.9 - Bug #4950]
-
-	* bootstraptest/test_fork.rb: add a test for above.
-
-	* signal.c (rb_get_next_signal): skip if signal_buff is empty.
-	  (check signal_buff.size first)
-
-	* vm_core.h: remove unused variable rb_thread_t::exec_signal.
-
-	* thread.c (rb_thread_check_trap_pending): check
-	  rb_signal_buff_size() because rb_thread_t::exec_signal
-	  is no longer available.
-
-Fri Jul  1 03:28:25 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* class.c (Init_class_hierarchy): should name BasicObject
-	  explicitly.
-
-	* variable.c (rb_const_defined_0): should not check for
-	  superclasses as const_get.
-
-Fri Jul  1 03:24:03 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: mathn is still alive (should die soon).
-
-Thu Jun 30 23:50:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* misc/ruby-mode.el (ruby-indent-beg-re): Fix broken regular
-	  expression.  Fixes #4546
-
-Thu Jun 30 23:43:30 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl.c/.h: Added ossl_x509_name_sk2ary.
-	* ext/openssl/ossl.c: Replaced ossl_x509_ary2k by generic macro to
-	  simplify future conversions.
-	* ext/openssl/ossl_ssl.c: Implement SSLSocket#client_ca.
-	* test/openssl/test_ssl.rb: Add test for SSLSocket#client_ca.
-	  Thanks to Ippei Obayashi for providing the patch!
-	  [ Ruby 1.9 - Feature #4481 ] [ruby-core:35461]
-
-Thu Jun 30 22:38:58 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm2_defined_method.rb: added to measure performance of
-	  bmethod (method defined by define_method()).
-
-Thu Jun 30 22:17:04 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_call_bmethod): fix to hook call/return event
-	  for methods defined by define_method().  fixes Bug #4613.
-
-	* thread.c (call_trace_proc): Fix to skip if class is not given (0).
-	  Note that ID and Class object are passed for call/return event
-	  if the called method was defined by define_method().
-	  If you are author of tracer/profiler/debugger, this may be an
-	  important change.  You should check passed class as zero or
-	  non-zero instead of checking the event type.
-
-	* test/ruby/test_settracefunc.rb: add a test for above.
-
-Thu Jun 30 21:18:35 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
-
-	* configure.in: Add warnflags for XL/C on AIX during configure
-	  to avoid [Bug #3971]. See [ruby-core:32859]
-
-Thu Jun 30 21:16:04 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (m_ajd): refers a constant.
-
-Thu Jun 30 20:54:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	  * ext/io/console/io-console.gemspec: spin-off gem for 1.9.2.
-
-Thu Jun 30 20:36:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: trivial changes.
-
-Thu Jun 30 20:12:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_module.rb: tests for [Bug #3422] and [Bug #3423].
-
-Thu Jun 30 20:03:39 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: modified doc.
-
-Thu Jun 30 19:09:19 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c (thread_timer): ignore unknown errno.
-	  (we observed that select(2) was canceled by errno=514 on
-	  boron == Linux/Xen environment)
-
-Thu Jun 30 17:33:25 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c (ObjectSpace.count_tdata_objects):
-	  Fix rdoc.  Fixes Bug #3892.
-
-	* ext/objspace/objspace.c (ObjectSpace.count_tdata_objects):
-	  Change key type if the klass of a object is zero (internal object).
-	  Read rdoc for details.
-
-	* internal.h: export rb_objspace_data_type_name().
-
-Thu Jun 30 17:25:08 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c (ping_signal_thread_list, thread_timer):
-	  fix to keep polling state if there are any ping-tasks.
-
-Thu Jun 30 12:25:34 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c (rb_thread_create_timer_thread): allocate
-	  machine stack for the timer thread at least 12KB.  FreeBSD 8.2
-	  AMD64 causes machine stack overflow (SIGSEGV) only with
-	  PTHREAD_STACK_MIN (maybe defined as 2KB).
-
-Thu Jun 30 09:36:37 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/weakref.rb:  Attach documentation to WeakRef and add missing
-	  documentation
-
-Thu Jun 30 09:30:14 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/yaml.rb:  Document toplevel YAML and YAML::ENGINE to describe
-	  Psych vs Syck engines.
-
-Thu Jun 30 09:21:52 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/cmath.rb:  Hide handle_no_method_error from RDoc.
-	* error.c:  Document or hide undocumented error classes.
-
-Thu Jun 30 07:49:04 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* hash.c:  Document ENV
-
-Thu Jun 30 06:37:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (ruby_init_loadpath_safe): ensure RUBYLIB_PREFIX stored
-	  before RUBYLIB, even if MANGLED_PATH is enabled.  fixed #1679.
-	  MANGLED_PATH is disabled by the default and will be removed
-	  completely in the future.
-
-Thu Jun 30 06:32:21 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/drb/drb.rb:  Hide deprecated toplevel DRb constants.
-
-Thu Jun 30 06:17:02 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/cmath.rb (CMath.log): second argument: b can be nil.
-
-Thu Jun 30 06:23:28 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* thread.c (ruby_thread_s_pass):  Fix typo.
-
-Thu Jun 30 06:16:53 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc:  Update to RDoc 3.8 which contains fixes for documentation
-	  in trunk.
-
-Thu Jun 30 02:53:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_threadptr_execute_interrupts_common): remove
-	  meaningless native_thread_yield(). It never close a race.
-
-Thu Jun 30 02:41:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_thread_schedule_limits): minor optimization.
-	  eliminate machine context saving when running time is enough small.
-
-Thu Jun 30 02:28:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_thread_schedule_rec): move interrupt_flag check to
-	  rb_thread_schedule().
-	  And also rename to rb_thread_schedule_limits() and remove
-	  sched_depth argument. It's no longer called recursive.
-	* thread.c (rb_thread_schedule): add to check interrupt_flag as
-	  above explained.
-
-	* thread.c (rb_threadptr_execute_interrupts_rec): rename to
-	  rb_threadptr_execute_interrupts_common() and remove sched_depth
-	  argument. It's no longer called recursive.
-
-	* thread.c (rb_thread_sleep): adapt the renaming.
-	* thread.c (rb_threadptr_execute_interrupts): ditto.
-	* thread.c (rb_thread_execute_interrupts): ditto.
-
-Thu Jun 30 01:31:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (thread_s_pass): change RDoc description and remove
-	  a sample code. The actual implementation never behave as explained by
-	  an example. It's a documentation bug.
-
-Thu Jun 30 00:54:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_thread_stop): change RDoc sample code. The old
-	  example is buggy and may cause deadlock. The patch is
-	  suggested by Heesob Park <phasis@gmail.com>. Thank you!
-	  [Bug #3606][ruby-core:31454]
-
-Thu Jun 30 00:49:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_thread_wakeup): change RDoc sample code. The old
-	  example is buggy and may not display anything by a race.
-	  The patch is suggested by Heesob Park <phasis@gmail.com>.
-	  Thank you! [Bug #3606][ruby-core:31454]
-
-Thu Jun 30 00:43:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_thread_run): change RDoc. The old example is buggy
-	  and may cause deadlock. The patch is suggested by Heesob Park
-	  <phasis@gmail.com>. Thank you! [Bug #3606][ruby-core:31454]
-
-Thu Jun 30 00:30:15 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/cmath.rb: make same exception for Math. fix [Bug #3137].
-
-Thu Jun 30 00:03:20 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/irb/completion.rb: complement correctly string literal. fix
-	  [Bug #1145].
-
-Wed Jun 29 23:42:51 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: avoided using timev.
-	* ext/date/date_strftime.c: ditto.
-	* ext/date/date_tmx.h: ditto.
-
-Wed Jun 29 23:17:57 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
-
-Wed Jun 29 23:09:14 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.
-
-Wed Jun 29 22:49:10 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/irb/cmd/help.rb: support RDoc 3.7. fix [Bug #3760].
-
-Wed Jun 29 22:04:14 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* lib/tracer.rb: Tracer.on only if required by -r command-line option.
-	  and consider --disable-gems option.
-	* test/test_tracer.rb: add tests for it.
-
-Wed Jun 29 13:55:36 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_const_get_0): should not look for superclasses if
-	  the second optional argument is given for #const_get().
-	  fix [Bug #3422] [Bug #3423]
-
-Wed Jun 29 12:07:27 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* math.c:  Attach documentation for Math.
-	* object.c:  Document NIL, TRUE, FALSE.
-	* io.c:  Improve grammar in ARGF comment.  Document STDIN/OUT/ERR.
-	  Document ARGF global constant.
-	* lib/rake:  Hide deprecated toplevel constants from RDoc (import from
-	  rake trunk).
-	* lib/thwait.rb:  Document ThWait.
-	* lib/mathn.rb:  Hide Math redefinition from RDoc
-	* lib/sync.rb:  Add a basic comment for Sync_m, Synchronizer_m, Sync,
-	  Synchronizer.
-	* parse.y:  Document SCRIPT_LINES__.
-	* hash.c:  Document ENV class and global constant.
-	* vm.c:  Document TOPLEVEL_BINDING.
-	* version.c:  Document RUBY_* constants.
-	* ruby.c:  Document DATA and ARGV.
-
-Wed Jun 29 10:13:12 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Matrix.zero can build rectangular matrices.
-	  Vector#r should be called #magnitude
-
-Wed Jun 29 10:11:08 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Add Matrix#diagonal?, hermitian?, normal?,
-	  orthogonal?
-	  permutation?, symmetric?, {lower|upper}triangular?, unitary?, zero?
-
-Wed Jun 29 10:09:35 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Specialize Matrix#find_index to return [row, col]
-	  and accept the same optional argument as #each
-
-Wed Jun 29 10:07:32 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Matrix#each{_with_index} can iterate over a subset
-	  of the Matrix
-
-Wed Jun 29 06:21:02 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c (native_stop_timer_thread): skip to close
-	  communication pipe to avoid timing bug (process termination timing).
-	  The communication pipe will closed by OS.
-
-Wed Jun 29 06:09:54 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* error.c (rb_async_bug_errno): async-safe bug report function.
-	  In timer thread, signal handler should use it.
-	  The patch is contributed by Eric Wong <normalperson@yhbt.net>.
-	  Refs: [ruby-core:37644] and [ruby-core:37647]
-
-	* thread_pthread.c: use rb_async_bug_errno().
-	  And replace all fprintf() to write().
-
-	* internal.h (rb_async_bug_errno): add decl. of above func.
-
-Tue Jun 28 23:46:08 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/tracer.rb: count only non-internal libraries in stack trace,
-	  ignoring custom_require.
-
-Tue Jun 28 21:44:58 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/irb/ruby-lex.rb: recognize '\char' in ruby statement.
-
-Tue Jun 28 20:39:29 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* lib/debug.rb (var_list): Command 'var *' did not work on 1.9(!).
-	  global_variables, local_variables, and instance_variables returns
-	  Symbols from 1.9 and need to stringify before evaling it.
-	  See #4931.
-
-Tue Jun 28 19:23:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* signal.c: Now, USE_TRAP_SIGMASK depend on HAVE_PTHREAD_SIGMASK.
-	  The code have already depended on pthread_sigmask since r27464.
-
-Tue Jun 28 15:09:21 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/benchmark.rb: merge eregon/benchmark.
-	  https://github.com/eregon/ruby/tree/benchmark
-	  patched by Benoit Daloze. [ruby-core:37593] [Bug #4940]
-
-	* lib/benchmark (Benchmark#bmbm): bmbm should be consistent with bm
-	  for the return value.
-
-	* test/benchmark: remove preemptive test instead of skipping
-	  I removed the preemptive test I wrote for Feature #4197.
-	  I'll add it back when the implementation will be able to satisfy it.
-
-	* lib/benchmark (Benchmark#bmbm): remove useless explicit call,
-	  #format is an alias of #to_s test/benchmark: add a test for
-	  format of long time.
-
-	* lib/benchmark: fix label width: always add 1 to ensure there is a
-	  space delimiter even with times over 100s
-	  When I asked for Feature #4197, I wanted to make delimiting spaces
-	  consistent for #bm and #bmbm.
-	  But with times over 100s, the output contains no space between the
-	  label and the first time (user).
-	  Now both ensure there is always a space, even if that means 3 spaces
-	  with times under 10s (because it is formatted as %10.6f)
-
-	* test/benchmark: let labels be a constant
-	  lib/benchmark (Benchmark#realtime): avoid creating an unused Proc
-	  lib/benchmark (Benchmark#benchmark): use ensure clause to restore
-	  STDOUT.sync, as in #bmbm
-
-Tue Jun 28 13:41:51 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread_win32.c (native_stop_timer_thread): fixed commit miss of
-	  r32244.  grep sources before changing the signature of a function.
-
-Tue Jun 28 11:49:14 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c (consume_communication_pipe):
-	  Make "buff" as static.  (Maybe) "buff" can be shared between
-	  any caller (any threads) because no one use the read values.
-	  "buff" (1024 byte) on stack may cause stack overflow on
-	  several environment (we found a crash on FreeBSD).
-	  And remove const value "buff_size", and define CCP_READ_BUFF_SIZE
-	  macro.
-
-Tue Jun 28 11:45:30 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rake:  Update rake to fix some bugs and hide deprecated features
-	  from RDoc.
-	* lib/rake/version.rb:  Bump version to 0.9.2.1 to distinguish it from
-	  the released version.
-	* NEWS:  ditto
-
-Tue Jun 28 11:17:28 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc:  Update to RDoc 3.7 (final)
-	* NEWS:  ditto
-
-Tue Jun 28 10:18:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* process.c (rb_daemon): fix wrong #endif position.
-
-Tue Jun 28 07:50:32 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* object.c (Init_Object):  Teach RDoc what Init_class_hierarchy does to
-	  hook up ri for BasicObject, Object, Module and Class.
-
-Tue Jun 28 05:03:32 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* thread.c (rb_thread_local_aref): RDoc fix. Thread#[] example
-	  had a race. See #4480.
-
-Tue Jun 28 01:22:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigMath_s_log): move BigMath.log from
-	  bigdecimal/math.rb.
-
-	* ext/bigdecimal/lib/bigdecimal/math.rb: ditto.
-
-	* test/bigdecimal/test_bigdecimal.rb: move test for BigMath.log from
-	  test/bigdecimal/test_bigmath.rb.
-
-	* test/bigdecimal/test_bigmath.rb: ditto.
-
-Tue Jun 28 01:19:52 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/irb/ruby-lex.rb: fix [Bug #4232].
-
-Tue Jun 28 00:14:13 2011  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: fix [Bug #4409]. add DRbServer#here?.
-
-	* test/drb/test_drb.rb: ditto.
-
-	* test/drb/drbtest.rb: ditto.
-
-	* test/drb/ut_eq.rb: ditto.
-
-Tue Jun 28 00:08:43 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/irb/workspace.rb: fix BUG#4793.
-
-Mon Jun 27 22:06:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (consume_communication_pipe): don't use C99
-	  style variable length array.
-
-Mon Jun 27 22:04:27 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (consume_communication_pipe): change return
-	  type to void. caller doesn't use it.
-
-Mon Jun 27 21:29:50 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.h (rb_global_vm_lock_struct): add volatile to
-	  gvl->waiting. now thread_timer() access it w/o lock.
-
-Mon Jun 27 21:16:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c: s/__gvl_acquire/gvl_acquire_common/ and
-	  s/__gvl_release/gvl_release_common/.
-
-Mon Jun 27 11:41:47 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* thread_pthread.c (rb_thread_create_timer_thread):
-	  the type of return value of write(2) is ssize_t.
-
-Mon Jun 27 09:57:02 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c (rb_thread_create_timer_thread):
-	  Fixes missing initialization of oflags.
-
-Mon Jun 27 09:07:42 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c: Stop polling in the timer thread when there are
-	  no waiting thread.  If there are 2 or more runnable threads,
-	  the timer thread does polling.  Avoid polling makes power save
-	  for several computers (0.2W per a Ruby process, when I measured).
-	  If outside-event such as signal or Thread#kill was occurred
-	  when the timer thread does not do polling, then wake-up
-	  the timer thread using communication-pipe (the timer thread
-	  waits this communication-pipe with select(2)).
-	  The discussion about this modification can be found from the post
-	  [ruby-core:33456] and other related posts.
-	  Note that Eric Wong and KOSAKI Motohiro give us the huge
-	  contributions for this modification.  Thanks.
-
-	* thread_pthread.c (rb_thread_wakeup_timer_thread): add a function.
-	  This function wakes up the timer thread using communication-pipe.
-
-	* thread.c (rb_thread_stop_timer_thread): add a parameter which
-	  specify closing communication-pipe or not.
-
-	* thread.c (rb_thread_terminate_all): do not stop timer thread here
-	  (ruby_cleanup() terminate timer thread).
-
-	* signal.c: wake up timer thread using
-	  rb_thread_wakeup_timer_thread() from signal handler.
-
-	* eval.c (ruby_cleanup): use rb_thread_stop_timer_thread(1).
-
-	* process.c: use rb_thread_stop_timer_thread(0)
-	  (reuse communication-pipe).
-
-	* thread_win32.c (rb_thread_wakeup_timer_thread): add a dummy
-	  function.
-
-	* vm_core.h: add and fix decl. of functions.
-
-Mon Jun 27 08:01:19 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_parse.c: should use ALLOCA_N.
-
-Mon Jun 27 01:34:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries
-	  start with + sign, which means NIS.  these are returned in the
-	  case that passwd and group entries in /etc/nsswitch.conf are set
-	  to use "nis" explicitly on Debian.  fixed #3683
-
-Mon Jun 27 00:44:53 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* parse.y (rb_parser_end_seen_p): fix documentation about return
-	  value. patched by Sho Hashimoto. [Bug #4511]
-
-Mon Jun 27 00:40:47 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* hash.c (rb_hash_reject): add documentation that Hash#reject
-	  without block returns enumerator.
-	  patched by Michael Edgar [Bug #4847] [ruby-core:36800]
-
-Sun Jun 26 23:49:21 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/test_switch_hitter.rb: added a test.
-
- Sun Jun 26 22:21:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: refactoring.
-
-Sun Jun 26 18:03:30 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* parse.y: comma at the end of line is no longer allowed.
-	  A patch from Yukihiro Matsumoto  <matz AT ruby-lang.org>.
-	  (fixed #3456).
-
-Sun Jun 26 13:35:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_dump.c (rb_vm_bugreport): change CrashReporter suggestion messages
-	  on Mac. It should be placed after "-- C level backtrace" line.
-	  Suggested by Endoh-san.
-
-	  <before>
-	  -- See Crash Report log file under ~/Library/Logs/CrashReporter or ---------
-	  -- /Library/Logs/CrashReporter, for the more detail of ---------------------
-	  -- C level backtrace information -------------------------------------------
-
-	<after>
-	  -- C level backtrace information -------------------------------------------
-
-	     See Crash Report log file under ~/Library/Logs/CrashReporter or
-	     /Library/Logs/CrashReporter, for the more detail of.
-
-Sun Jun 26 10:08:28 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/extconf.rb
-	* ext/openssl/ossl_missing.h/.c: add ASN1_put_eoc if missing.
-
-	* ext/openssl/ossl_asn1.c: introduce ossl_asn1_object_size and
-	  ossl_asn1_put_object to wrap functionality depending on OpenSSL
-	  version in use.
-	  Fixes	[ Ruby 1.9 - Bug #4916 ] reported by Hiroshi Nakamura.
-	  [ruby-core:37286]
-
-Sun Jun 26 01:00:15 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (date_strftime_internal): removed meaningless braces.
-	* ext/date/date_core.c (gengo): the value should be int.
-
-Sat Jun 25 23:45:30 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* vm_insnhelper.c (vm_search_superclass): avoid control frame
-	  stack overrun. currently super() in Proc created in a method
-	  defined by Module#define_method raise NoMethodError. [Bug #4881]
-	* test/ruby/test_method.rb t_super_in_proc_from_define_method):
-	  add test for it.
-
-Sat Jun 25 23:23:14 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* thread.c (sleep_forever): now Kernel#sleep don't wakeup by
-	  signal handler execution. [Bug #4072]
-
-Sat Jun 25 23:14:47 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* thread.c (rb_threadptr_check_signal): remove unnecessary th->status
-	  backup. fix race condition which may results unexpected main thread's
-	  status transition. see #4072
-
-Fri Jun 24 19:57:30 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* lib/webrick/httprequest.rb (setup_forwarded_info): Parsing request
-	  header failed when the request is from 2 or more Apache reverse
-	  proxies. It's said that all X-Forwarded-* headers will contain more
-	  than one (comma-separated) value if the original request already
-	  contained one of these headers.  Since we could use these values as
-	  Host header, we choose the initial(first) value. See #4922.
-
-	* test/webrick/test_httprequest.rb (test_forwarded): Test it.
-
-Fri Jun 24 17:06:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_daemon): should not start timer thread
-	  twice.  fixed Bug#4920.
-
-Fri Jun 24 15:54:14 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): Try to shutdown SSL
-	  connection more gracefully. Call SSL_shutdown() max 4 times until it
-	  returns 1 (success). Bi-directional SSL close has several states but
-	  SSL_shutdown() kicks only 1 transition per call. Max 4 is from
-	  mod_ssl.c of Apache httpd that says 'max 2x pending + 2x data = 4'.
-	  See #4237.
-
-Fri Jun 24 07:24:37 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rake/version.rb:  Fixed VERSION to work with tool/rbinstall.rb
-	* bin/rake:  Import bin/rake from 0.9.2
-	* tool/rbinstall.rb (install):  Rake::VERSION is now in
-	  lib/rake/version.rb.  Fixes `make install`
-
-Fri Jun 24 07:11:37 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rake: Import Rake 0.9.2
-
-Fri Jun 24 00:44:15 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (c_valid_{julian,gregorian}_p): fixed the range of month.
-
-Fri Jun 24 00:14:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: trivial changes on text.
-
-Thu Jun 23 22:46:57 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_x509name.c: Add X509::Name#hash_old as a wrapper
-	  for X509_NAME_hash_old in OpenSSL 1.0.0. See #4805
-
-	* test/openssl/test_x509name.rb (test_hash): Make test pass with
-	  OpenSSL 1.0.0.
-
-	* NEWS: Add it.
-
-Thu Jun 23 19:30:53 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_time): Check
-	  argument type with NUM2LONG if the arg is not a Time object.
-	  See #4919.
-
-	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_timeout): Check
-	  type with NUM2LONG. Time as an arg is not allowed. See #4919.
-
-	* test/openssl/test_ssl_session.rb (test_session_time,
-	  test_session_timeout): Test it.
-
-Wed Jun 23 13:30:30 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* signal.c(ruby_atomic_exchange): Fix definition style.
-
-Wed Jun 22 22:34:05 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_session_new_cb): Return 0 to
-	  OpenSSL from the callback for SSL_CTX_sess_set_get_cb().
-	  Returning 0 means to OpenSSL that the session is still valid
-	  (since we created Ruby Session object) and was not freed by us with
-	  SSL_SESSION_free(). Call SSLContext#remove_session(sess) in
-	  session_get_cb block if you don't want OpenSSL to cache the session
-	  internally.
-	  This potential issue was pointed by Ippei Obayashi. See #4416.
-
-	* test/openssl/test_ssl_session.rb (test_ctx_server_session_cb): Test
-	  it.
-
-Wed Jun 22 22:21:17 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_ssl_session.c: Respect T_BIGNUM time values. Patch by
-	  Tomoyuki Chikanaga.
-	  [ Ruby 1.9 - Bug #4919 ] [ruby-dev:43869]
-
-Wed Jun 22 21:29:25 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/socket/depend (SOCK_HEADERS): use $(top_srcdir) instead of
-	  $(topdir). sorry!
-
-Wed Jun 22 19:47:03 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* cont.c (cont_capture): add volatile.
-	  On clang -O, it is needed to avoid the optimization.
-	  With this and llvm/clang's recent fix, clang 3.0 can
-	  build ruby-trunk with -O option.
-
-	* cont.c (cont_capture): use for-loop.
-
-	* array.c (rb_ary_each): add volatile and use it.
-
-	* vm_insnhelper.c (vm_call_cfunc): ditto.
-
-Wed Jun 22 18:20:46 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_session_remove_cb):
-	  OpenSSL::SSL::SSLContext#session_remove_cb was broken. It wrongly
-	  tried to call the session_*new*_cb callback.
-
-	* test/openssl/test_ssl_session.rb (class OpenSSL): Test it.
-
-Wed Jun 22 17:37:49 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl.h: Introduced OSSL_BIO_reset macro for PEM/DER
-	  fallback scenarios.
-
-	* ext/openssl/ossl_pkey_dsa.c
-	* ext/openssl/ossl_x509req.c
-	* ext/openssl/ossl_pkey_rsa.c
-	* ext/openssl/ossl_pkey_ec.c
-	* ext/openssl/ossl_ssl_session.c
-	* ext/openssl/ossl_x509crl.c
-	* ext/openssl/ossl_pkey.c
-	* ext/openssl/ossl_pkey_dh.c
-	* ext/openssl/ossl_x509cert.c
-	* ext/openssl/ossl_pkcs7.c: Use OSSL_BIO_reset.
-
-	* ext/openssl/ossl_ssl.c
-	* ext/openssl/ossl_cipher.c
-	* ext/openssl/ossl_pkey_ec.c
-	* ext/openssl/ossl_pkcs12.c
-	* ext/openssl/ossl_ssl_session.c: Replace rb_raise occurrences by
-	  ossl_raise. This automatically flushes OpenSSL's error queue.
-
-	* ext/openssl/ossl_pkcs7.c: Raise error if DER fallback for parsing
-	  fails.
-
-	* test/openssl/test_pkey_ec.rb
-	* test/openssl/test_pkey_dsa.rb
-	* test/openssl/test_pkey_rsa.rb: Add assertions that OpenSSL.errors is
-	  empty.
-
-	* test/openssl/test_pkey_rsa.rb: Remove initial OpenSSL.errors call in
-	  test_new.
-	  [ Ruby 1.9 - Bug #4885 ] [ruby-core:37134]
-
-Wed Jun 22 15:01:24 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_ssl.c: Use SSL_MODE_RELEASE_BUFFERS if available.
-	  Thanks, Eric Wong, for providing the patch.
-	  [ Ruby 1.9 - Feature #4672 ] [ruby-core:36127]
-
-Wed Jun 22 14:47:53 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_buffering.rb
-	* test/openssl/test_pkcs12.rb: Inherit from Test::Unit::TestCase
-	  instead of MiniTest::Unit::TestCase. [ruby-core:37275]
-
-Wed Jun 22 12:41:03 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der):
-	  OpenSSL::SSL::Session#to_der was broken. Fix buffer handling.
-
-	* test/openssl/test_ssl_session.rb (test_session): Test it.
-
-Wed Jun 22 12:38:52 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* test/openssl/test_ssl_session.rb: Split out SSL::Session related
-	  tests from test_ssl.rb
-
-Wed Jun 22 03:20:52 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: Fix cyclic references of
-	  objects.  Thanks to CvX for reporting the bug and a test case.
-	* test/psych/test_object.rb: test for cyclic object references.
-
-Wed Jun 22 02:39:54 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTP.post_form): Do not ignore query part of
-	  the given URI to post. See #655.
-
-	* test/net/http/test_http.rb, test/net/http/utils.rb: Test it.
-
-Wed Jun 22 01:28:13 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* test/openssl/test_x509store.rb (test_set_errors): Redhat is
-	  distributing a patched version of OpenSSL that allows multiple CRL
-	  for a key (multi-crl.patch.) Make test pass on such env. See #4122,
-	  #4554.
-
-Tue Jun 21 21:50:37 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* lib/webrick/httpresponse.rb (HTTPResponse#setup_header): Close
-	  HTTP/1.1 connection when returning an IO object as response body
-	  without setting HTTPResponse#chunked to true. See #855 no.1.
-
-	* test/webrick/test_httpserver.rb: Test it.
-
-Tue Jun 21 21:27:34 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* internal.h: move rb_thread_io_blocking_region() declaration
-	  from intern.h to internal.h. It's still experimental API and
-	  need more discussion. [ruby-dev:43698]
-	* include/ruby/intern.h: ditto.
-
-	* ext/socket/rubysocket.h: include internal.h.
-	* ext/socket/depend: add internal.h dependency.
-	* ext/socket/extconf.rb: add $INCFLAGS to topdir.
-
-Tue Jun 21 20:38:47 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (datetime_s_*): canonicalize 24 o'clock.
-
-Tue Jun 21 19:46:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_thread.rb (TestThread#test_priority): enable
-	  this test again. Current GVL respect thread priority rather
-	  than past.
-
-Tue Jun 21 13:25:35 2011  TAKAO Kouji  <kouji@takao7.net>
-
-	* ext/readline/readline.c (readline_getc): applied a patch in
-	  #3827 by by Akio Tajima <artonx AT yahoo.co.jp>. (see #3827)
-
-Tue Jun 21 13:16:31 2011  TAKAO Kouji  <kouji@takao7.net>
-
-	* ext/readline/extconf.rb: fixed bug, specify --disable-libedit
-	  then disable libedit, does not specify then check readline and
-	  libedit if failed checking readline. (fixes #3375)
-
-Mon Jun 20 22:52:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (before_exec): use sig_do_nothing instead of SIG_DFL
-	  for avoiding a race.
-	* process.c (sig_do_nothing): new function.
-
-Mon Jun 20 21:31:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (thread_timer): rename timeout_10ms to
-	  time_quantum. it's no longer 10ms.
-
-Mon Jun 20 18:46:02 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_cipher.c, ext/openssl/lib/openssl/cipher.rb:
-	  Documentation fix by Ippei Obayashi. See #4419.
-
-Mon Jun 20 15:41:33 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* lib/webrick/cookie.rb (WEBrick::Cookie.parse): Revert r31228.
-	  r31228 was for allowing the 'Cookie:' header which did not have no
-	  SP after ';' for separating cookie-pairs but RFC6265 requires single
-	  SP after ';' there.  We allow multiple SPs here for compatibility
-	  with older WEBrick version.
-
-	* test/webrick/test_cookie.rb: Test it.
-
-Sun Jun 19 13:31:26 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* NEWS: Introduce --hide-skip on test/unit.
-
-Sun Jun 19 10:05:16 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit/parallel.rb: Override Test::Unit::TestCase#on_parallel_worker?
-	  only when $0 == __FILE__.
-
-	* lib/test/unit/parallel.rb: Run Test::Unit::Worker.run only when
-	  $0 == __FILE__.
-
-Sat Jun 18 23:59:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (fill_cbuf): finish reading at EOF, and the readconv has
-	  been cleared by another thread while io_fillbuf() is waiting at
-	  select().  a patch in [ruby-core:37197] by Hiroshi Shirosaki
-	  <h.shirosaki AT gmail.com>.  fixed #3840
-
-Sat Jun 18 21:36:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c: remove GVL_DEBUG
-
-Sat Jun 18 21:32:02 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm.c, vm_core.h (rb_vm_stack_to_heap): remove const.
-	  It makes compilations warnings.
-
-Sat Jun 18 18:54:15 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, vm_core.h (rb_vm_stack_to_heap): fix "const" place.
-
-Sat Jun 18 17:23:38 2011  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c, hash.c, load.c, proc.c, range.c, thread.c, time.c: don't
-	  declare internal functions.
-
-	* internal.h, vm_core.h: declare internal functions.
-
-	* array.c: include internal.h.
-
-	* common.mk: update dependency for array.o.
-
-Sat Jun 18 13:39:33 2011  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h: declarations declared in include/ruby/*.h removed.
-
-Sat Jun 18 12:42:17 2011  Tanaka Akira  <akr@fsij.org>
-
-	* method.h, internal.h iseq.h: declare internal functions.
-
-	* compile.c, eval.c, iseq.c, object.c, parse.y, proc.c, process.c,
-	  thread.c, vm.c, vm_eval.c, vm_insnhelper.c, vm_method.c: don't
-	  declare internal functions.
-
-	  Note that rb_method_entry_eq() is defined in vm_method.c but
-	  there was a declaration in proc.c with different const-ness.
-	  Now it is declared in method.h with same const-ness to the
-	  definition.
-
-	* object.c (rb_mod_module_exec): don't declare functions declared in
-	  include/ruby/intern.h.
-
-Sat Jun 18 12:05:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/backward/classext.h: for evil gems.  fixed #4803
-
-Sat Jun 18 11:12:13 2011  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk: update dependencies.
-
-Sat Jun 18 11:09:03 2011  Tanaka Akira  <akr@fsij.org>
-
-	* io.c: suppress warnings.
-
-Sat Jun 18 10:22:39 2011  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h: declare more internal functions.
-
-	* iseq.h (rb_method_get_iseq): declared.
-
-	* compile.c, eval.c, eval_error.c, iseq.c, parse.y, proc.c, range.c,
-	  ruby.c, time.c, util.c, vm.c: don't declare internal functions.
-
-	* eval.c, parse.y, thread_pthread.c: non-existing function declarations
-	  removed.
-
-Sat Jun 18 08:12:54 2011  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk: dependencies updated.
-
-	* tool/update-deps: new file to assist update dependencies in
-	  common.mk.
-
-Sat Jun 18 07:27:27 2011  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h: declare internal functions here.
-
-	* node.h: declare NODE dependent internal functions here.
-
-	* iseq.h: declare rb_iseq_t dependent internal functions here.
-
-	* vm_core.h: declare rb_thread_t dependent internal functions here.
-
-	* bignum.c, class.c, compile.c, complex.c, cont.c, dir.c, encoding.c,
-	  enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c, io.c,
-	  iseq.c, load.c, marshal.c, math.c, numeric.c, object.c, parse.y,
-	  proc.c, process.c, range.c, rational.c, re.c, ruby.c, string.c,
-	  thread.c, time.c, transcode.c, variable.c, vm.c,
-	  tool/compile_prelude.rb: don't declare internal functions declared
-	  in above headers.  include above headers if required.
-
-	  Note that rb_thread_mark() was declared as
-	  void rb_thread_mark(rb_thread_t *th) in cont.c but defined as
-	  void rb_thread_mark(void *ptr) in vm.c.  Now it is declared as
-	  the later in internal.h.
-
-Sat Jun 18 02:36:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (VpNewRbClass): fix type of the 2nd
-	  argument.
-
-	* ext/bigdecimal/bigdecimal.h: ditto.
-
-Sat Jun 18 02:30:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): move BigMath.exp from
-	  bigdecimal/math.rb.
-
-	* ext/bigdecimal/lib/bigdecimal/math.rb: ditto.
-
-	* test/bigdecimal/test_bigdecimal.rb: move test for BigMath.exp from
-	  test/bigdecimal/test_bigmath.rb.
-
-	* test/bigdecimal/test_bigmath.rb: ditto.
-
-Sat Jun 18 00:20:54 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: do not define wnum[01].
-
-Fri Jun 17 18:57:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): fix return value of obj[a,*b]=c.
-
-Fri Jun 17 13:09:45 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/curses/curses.c:  Clean up documentation.
-
-Fri Jun 17 09:25:14 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/curses/curses.c:  Document curses constants.  Patch by Vincent
-	  Batts.  [Ruby 1.9 - Bug #4880]
-
-Fri Jun 17 09:11:05 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* object.c:  Document Module#method_added and #method_removed.
-	  Patch by Bryce Kerley.  [Ruby 1.9 - Feature #4867]
-
-Fri Jun 17 08:50:16 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* io.c:  Improve documentation of IO and File open and new.
-	  Patch by Roger Pack.  [Ruby 1.9 - Bug #4790]
-
-Fri Jun 17 07:53:50 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/csv.rb:  Document #raw_encoding.  Patch by David Czarnecki.
-	  [Ruby 1.9 - Bug #4874]
-
-Fri Jun 17 07:46:50 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/benchmark.rb:  Document Benchmark::Tms#memberwise.  Patch by
-	  David Czarnecki.  [Ruby 1.9 - Bug #4873]
-
-Fri Jun 17 07:38:31 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/prettyprint.rb:  Improve documentation.  Patch by Ysiad
-	  Ferreiras.  [#4834]
-
-Fri Jun 17 07:23:03 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* array.c (rb_ary_drop):  Improve documentation.  Patch by Caley Woods.
-	  [Ruby 1.9 - Bug #4858]
-
-Fri Jun 17 06:11:31 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/webrick/log.rb:  Improve documentation of BasicLog and Log.
-	  Patch by Olivier Brisse.  [Ruby 1.9 - Bug #4833]
-	* lib/webrick/httpstatus.rb:  Improve documentation of
-	  WEBrick::HTTPStatus.  Patch by Olivier Brisse.
-	  [Ruby 1.9 - Bug #4833]
-
-Fri Jun 17 04:48:22 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c, thread_pthread.h: remove unused variables.
-	  (native_thread_data_t::gvl_cond, native_thread_data_t::gvl_next)
-
-Thu Jun 16 14:32:31 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (rb_time_new): prevent overflow by "* 1000".
-
-Fri Jun 17 03:07:36 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm4_thread_create_join.rb,
-	  benchmark/bm_vm4_thread_mutex[1-3].rb: renamed to
-	  bm_thread_* (fix last rename).
-
-Fri Jun 17 02:26:47 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c (native_thread_create): fix debug message.
-	  (add last newline)
-
-Thu Jun 16 23:40:49 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_thread_schedule_rec): fix {UN,}LIKELY macro misuse.
-	* gc.c (rb_newobj): ditto.
-	* vm_insnhelper.c (vm_method_search): ditto.
-
-Thu Jun 16 20:06:15 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/testunit/test_parallel.rb: Fix Regexp for test.
-
-	* test/testunit/tests_for_parallel/test_third.rb: Use
-	  Test::Unit::TestCase#on_parallel_worker? for detecting worker.
-
-	* lib/test/unit/testcase.rb(Test::Unit::TestCase#on_parallel_worker?):
-	  New Method Test::Unit::TestCase#on_parallel_worker? returns true
-	  when a testcase is running on parallel worker.
-	* lib/test/unit/parallel.rb(Test::Unit::TestCase#on_parallel_worker?):
-	  ditto.
-
-Thu Jun 16 19:27:12 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* test/test_securerandom.rb: Add testcase.  This testcase does NOT aim
-	  to test cryptographically strongness and randomness.  It includes
-	  the test for PID recycle issue of OpenSSL described in #4579 but
-	  it's disabled by default.
-
-Thu Jun 16 17:55:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_io.rb (TestIO#test_copy_stream_socket): fix
-	  test hanging up issue. Patch by CHIKANAGA Tomoyuki.
-
-Thu Jun 16 15:17:39 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* variable.c (const_missing):  Add simple example of const_missing.
-	  Patch by Anuj Dutta.  [Ruby 1.9 - Bug #4794]
-
-Thu Jun 16 15:09:29 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/monitor.rb:  Improve documentation.  Patch by Sandor Szucs.
-	  [Ruby 1.9 - Bug #4823]
-
-Thu Jun 16 14:54:09 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/webrick/utils.rb: Document WEBrick::Utils.  Patch by Olivier
-	  Brisse.  [Ruby 1.9 - Bug #4819]
-
-Thu Jun 16 14:26:46 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/webrick/httpservlet/erbhandler.rb:  Allow the ERB document to
-	  alter the content-type of the response.  [Ruby 1.9 - Bug #4685]
-
-Thu Jun 16 14:15:47 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/timeout.rb: Clarify timeout duration types.  Patch by Alf Mikula.
-	  [Ruby 1.9 - Bug #4791]
-	* lib/net/http.rb: ditto
-
-Thu Jun 16 13:25:25 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc*:  Import RDoc 3.7 release candidate
-
-Thu Jun 16 11:35:09 2011  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (search_response): parses SEARCH responses from
-	  the Yahoo IMAP server correctly.  patched by Mark Nadig.  [Bug #4509]
-
-Thu Jun 16 09:12:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* fix for build on solaris 10.
-
-Thu Jun 16 09:08:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/io/console/test_io_console.rb (TestIO_Console#test_sync):
-	  fix for daemon process.
-
-Thu Jun 16 07:58:01 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/testunit/test_parallel.rb(test_ignore_tzero): Test for r32109.
-
-	* test/testunit/tests_for_parallel/test_third.rb: Use another way to
-	  detect that test is running on worker. This fixes sometimes
-	  TestParallel failing.
-
-Thu Jun 16 07:20:06 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb(Test::Unit::Runner#_run_parallel): Ignore -j0
-	  because it makes blocking forever by IO.select.
-
-Thu Jun 16 03:08:11 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/testunit/test_parallel.rb (TestParallel::TestParallelWorker#
-	  setup): now can run on Windows, probably.
-
-	* test/testunit/test_parallel.rb (TestParallel::TestParallel#setup):
-	  ditto.
-
-Thu Jun 16 03:00:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread.c (do_select): Windows: no need to poll if select(2) is
-	  cancelable.
-
-	* thread_win32.c (native_fd_select): new function to make select(2)
-	  cancelable.
-
-	* thread_win32.c (rb_w32_check_interrupt): new function for checking
-	  interrupt.
-
-	* win32/win32.c (rb_w32_select_with_thread): new function. cancelable
-	  select(2).
-
-	* win32/win32.c (rb_w32_select): use above function internally.
-
-Wed Jun 15 23:30:45 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* gc.c: fix a regression by r31690 on AIX because AIX malloc
-	  return NULL if it's passed 0. But some caller don't expect it.
-	  patch by Yutaka Kanemoto. [ruby-dev:43779]
-	(vm_malloc_prepare): return calculated size.
-	(vm_xmalloc): use above result.
-	(vm_xcalloc): ditto.
-
-Wed Jun 15 23:11:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c: remove BLOCKING_REGION_CORE() macro. It's no longer used
-	  since r32022.
-
-Wed Jun 15 21:00:47 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_config.rb: execute based on the existence of the
-	  OpenSSL module.
-
-Wed Jun 15 12:35:11 2011  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_io.rb (test_copy_stream_socket): wait a child process
-	  before SIGUSR1 handler is removed.
-
-	* test/pathname/test_pathname.rb (define_assertion): use line number
-	  for test method names.
-
-Wed Jun 15 10:37:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* file.c (rb_stat_rdev): use DEVT2NUM.
-
-	* file.c (rb_stat_rdev_major): ditto.
-
-	* file.c (rb_stat_rdev_minor): ditto.
-
-Wed Jun 15 05:12:59 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c (lib_eventloop_core): revert the last change (it's
-	  the part for ruby_1_8), and use rb_thread_check_ints() when RUBY_VM
-	  is defined.
-
-Wed Jun 15 04:42:47 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm3_thread_*.rb: renamed bm_vm3_thread_*.rb to
-	  benchmark/bm_vm_thread_*.rb.
-
-Wed Jun 15 04:28:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/bm_vm4_thread_pass.rb: rename bm_vm4* to
-	  bm_vm_thread_*. suggested by ko1.
-	* benchmark/bm_vm4_pipe.rb: ditto.
-	* benchmark/bm_vm4_alive_check1.rb: ditto.
-	* benchmark/bm_vm4_pass_flood.rb: ditto.
-
-Wed Jun 15 03:52:50 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/bm_vm4_pass_flood.rb: new benchmark for GVL fairness.
-	* benchmark/bm_vm4_alive_check1.rb: ditto.
-
-Wed Jun 15 01:27:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (gvl_yield): fix live lock issue on 1-2 cpus
-	  system. It's additional fix for r32021.
-	* thread_pthread.c (gvl_init): add switch_wait_cond.
-	* thread_pthread.h (typedef struct rb_global_vm_lock_struct): ditto.
-
-Tue Jun 14 23:16:22 2011  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (show_progress): refine verbose mode.
-	  (exec_test): ditto.
-
-Tue Jun 14 23:02:36 2011  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (show_progress): extracted from assert_check.
-	  (assert_check): use show_progress.
-	  (assert_normal_exit): ditto.
-	  (assert_finish): ditto.
-	  (flunk): ditto.
-
-Tue Jun 14 22:51:42 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/test_*.rb: added tests.
-
-Tue Jun 14 22:09:58 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: renamed some functions.
-	* ext/date/date_core.c: modified doc.
-
-Tue Jun 14 21:26:01 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* cont.c (cont_save_thread): add new utility function.
-	  rb_context_t::saved_thread.machine_stack_start and
-	  machine_stack_end should be cleared immediately after a snapshot of
-	  current thread is stored to saved_thread. [ruby-dev:43680] [Bug #4855]
-	  this change aims to get rid of unnecessary GC mark at machine stack.
-
-Tue Jun 14 19:50:49 2011  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_autoload.rb: remove temporary directory.
-
-Tue Jun 14 11:05:03 2011  Narihiro Nakamura  <narihiro@netlab.jp>
-
-	* gc.c (rb_gc_set_params): call initial_expand_heap if
-	  initial_heap_min_slots is set.
-
-Tue Jun 14 11:02:08 2011  Narihiro Nakamura  <narihiro@netlab.jp>
-
-	* gc.c: use size_t.
-
-Tue Jun 14 01:10:38 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/coverage/test_coverage.rb: add a test for restart.  a patch
-	  from Xavier Shay.  [ruby-core:36745]
-
-Tue Jun 14 01:05:10 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* ext/coverage/coverage.c: make it restartable.  [ruby-core:36539]
-
-Mon Jun 13 23:55:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_thread_schedule_rec): call gvl_yield() unconditionally.
-	* thread_pthread.c: remove HAVE_GVL_YIELD macro.
-	* thread_win32.c (gvl_yield): new. this fallback logic was moved from
-	  rb_thread_schedule_rec().
-
-Mon Jun 13 23:50:25 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/io/console/console.c (console_dev): typo.
-
-Mon Jun 13 23:38:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_parse_string): flush delayed token.  based on a
-	  patch by Masaya Tarui in [ruby-dev:43762].  Bug #4544
-
-	* parse.y (yylex): revert r24557.  delayed token at the end of
-	  string should be flushed already by the above change.
-
-Mon Jun 13 23:33:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (console_dev): console should be
-	  unbuffered.
-
-	* ext/io/console/console.c (console_dev): take care of no-ctty
-	  case.
-
-Mon Jun 13 23:06:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c: rewrite GVL completely. This fix improve some
-	  benchmark dramatically (e.g. vm3_thread_mutex result changed
-	  form 120.601sec to 3.426sec).
-	* thread_win32.c: ditto.
-	* thread_pthread.h: ditto.
-	* vm_core.h: ditto.
-	* thread.c: ditto.
-
-Mon Jun 13 23:11:52 2011  Tanaka Akira  <akr@fsij.org>
-
-	* test/socket/test_unix.rb: don't use Thread.abort_on_exception.
-
-Mon Jun 13 23:05:01 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/unixsocket.c (unix_send_io): race condition fixed.
-	  (unix_recv_io): ditto.
-	  fixed by Eric Wong.  [ruby-core:35574]
-
-	* test/socket/test_unix.rb: test added for above problem.
-
-Mon Jun 13 21:41:05 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_win32.c (native_cond_signal): remove unnecessary rb_bug().
-	  It's additional fix for r32021. [Bug #4696]
-
-Mon Jun 13 20:50:49 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_ec.rb
-	  test/openssl/test_pkey_ec.rb: merge both files into test_pkey_ec.rb.
-	  Removed redundant group instantiation from PKey tests.
-	* test/openssl/utils.rb: only create TEST_PKEY_EC_P256V1 if EC is
-	  defined.
-
-Mon Jun 13 20:28:24 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/digest.rb: remove MDC2 from test, it is not available
-	  by default in an OpenSSL installation.
-
-Mon Jun 13 20:18:55 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h, vm_insnhelper.h: move decl. of
-	  ruby_vm_global_state_version and related macros
-	  from vm_core.h to vm_insnhelper.h.
-
-	* vm.c (vm_clear_all_cache): added.  This function is called
-	  when ruby_vm_global_state_version overflows.
-	  TODO: vm_clear_all_inline_method_cache() is only place holder.
-	        We need to implement it ASAP.
-
-	* vm_method.c (vm_clear_global_method_cache): added.
-
-Mon Jun 13 19:46:21 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/cmath.rb: add new method Object#real?. fix #3137
-
-Mon Jun 13 18:52:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (is_kind_of_BigDecimal): new function to
-	  examine the whether the object is kind of BigDecimal.
-
-Mon Jun 13 18:49:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimalCmp): use GetVpValueWithPrec
-	  for Float and Rational arguments.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_new, test_cmp, test_power):
-	  add and modify tests for the above change.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimalCmp): modify coding style to
-	  match ruby's standard.
-
-Mon Jun 13 18:33:04 2011  Tanaka Akira  <akr@fsij.org>
-
-	* lib/securerandom.rb (SecureRandom.random_bytes): modify PRNG state
-	  to prevent random number sequence repetition at forked child
-	  process which has same pid.
-	  reported by Eric Wong.  [ruby-core:35765]
-
-Mon Jun 13 17:02:34 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTP#use_ssl?): require 'openssl' only when
-	  https is needed. fixes r31933.
-
-Mon Jun 13 14:35:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* lib/cmath.rb (CMath.cbrt): returns the principal value of the cube
-	  root of the argument.  fix #3676
-
-	* test/test_cmath.rb (test_cbrt_returns_principal_value_of_cube_root):
-	  test for the above change.
-
-Mon Jun 13 14:17:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* lib/test/unit.rb (Test::Unit::GlobOption#non_options): fix typo.
-
-Mon Jun 13 13:04:20 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_digest.c: fix error for digests that have no oid
-	(e.g. DSS1).
-	* test/openssl/test_digest.c: add tests for this.
-
-Mon Jun 13 12:51:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/yaml.rb: load psych only when syck is not loaded.
-
-Mon Jun 13 12:23:39 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-Mon Jun 13 12:23:39 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/psych/lib/psych/deprecated.rb (Object#to_yaml_properties):
-	  undef to_yaml_properties before redefine it.
-
-	* ext/syck/lib/syck/rubytypes.rb: ditto.
-
-Mon Jun 13 11:30:10 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_digest.c: allow Digests to be created by sn, ln or
-	  oid.
-	* test/openssl/test_digest.rb: add tests for this.
-	  [Ruby 1.9 - Feature #4412] [ruby-core:35319]
-
-Mon Jun 13 10:54:03 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/pkey_dh.c: corrected documentation.
-	* test/openssl/utils.rb: add test key for DH.
-	* test/openssl/test_pkey_dh.rb: add tests.
-
-Mon Jun 13 10:13:08 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/pkey_dh.c: clarify difference between DH#public_key and
-	DH#pub_key in documentation.
-
-Mon Jun 13 05:50:43 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* NEWS: introduce PKey.read.
-
-Mon Jun 13 05:17:29 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey.c: added PKey.read module function that allows
-	  reading arbitrary public/private keys from DER-/PEM-encoded File or
-	  string instances.
-	* ext/openssl/ossl_pkey_dh.c: improved documentation.
-	* test/openssl/utils.rb: added EC test key.
-	* test/openssl/test_pkey_rsa.rb
-	  test/openssl/test_pkey_dsa.rb: Test PKey.read. Reuse keys from
-	  OpenSSL::TestUtils.
-	* test/openssl/test_pkey_ec.rb: Created test file for EC tests.
-	  Test PKey.read.
-	  [Ruby 1.9 - Feature #4424] [ruby-core:35330]
-
-Mon Jun 13 04:42:24 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c (total_i): fix to skip no ruby objects.
-
-Mon Jun 13 03:07:38 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/benchmark/test_benchmark.rb (capture_output):
-	  replace '-' as space. On NetBSD, subtract between two Process.times
-	  after and before the short process may return negative value like:
-	  t0=Process.times; yield; t1=Process.times; p t1.utime-t0.utime
-
-Mon Jun 13 02:40:23 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_pkey_dsa.rb: Test for DSA#syssign/sysverify.
-
-Mon Jun 13 01:59:19 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey_dh.c: completed documentation.
-	* ext/openssl/ossl_pkey_dsa.c: corrected examples. Improved parameter
-	  sections.
-
-Mon Jun 13 00:25:10 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey_dsa.c: completed documentation.
-
-Sun Jun 12 23:36:46 2011  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (kill_sub_thread): remove the method. [ruby-core:34185]
-
-Sun Jun 12 21:01:56 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (d_lite_marshal_load): should give converted value.
-
-Sun Jun 12 20:36:30 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: edited doc.
-
-Sun Jun 12 18:12:07 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm3_clearmethodcache.rb: added.
-
-Sun Jun 12 17:40:29 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c (rb_clear_cache*): update only vm state version.
-
-	* vm_method.c (rb_method_entry_get_without_cache, rb_method_entry):
-	  Fill method cache entry with vm state version, and
-	  check current vm state version for method (cache) look up.
-	  This modification speed-up invalidating of global method cache table.
-	  [Ruby 1.9 - Feature #3905] [ruby-core:36908]
-
-Sun Jun 12 16:19:48 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/extconf.rb: fail on Mac OS X. [Bug #4853][ruby-dev:43655]
-
-Sun Jun 12 15:56:08 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c: remove th->transition_for_lock. It's thread unsafe.
-	  [Bug #4723][ruby-dev:43563]
-
-Sun Jun 12 15:47:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c: introduce spurious wakeup safe deadlock check.
-	  [Bug #4696][ruby-dev:43554]
-
-Sun Jun 12 13:33:52 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm3_thread_mutex.rb: remove it.
-
-	* benchmark/bm_vm3_thread_mutex[1-3].rb: added 3 benchmarks.
-	    1: one thread with one mutex (no contention).
-	    2: two threads with one mutex (contention).
-	    3: 1000 threads with one mutex (huge number of contention)
-	  Above removed benchmark was type 3.
-	  Therefore, this commit adds type 1 and 2 benchmark.
-
-Sun Jun 12 11:16:59 2011  Tanaka Akira  <akr@fsij.org>
-
-	* io.c: use select() appropriately for sendfile().
-	  Fixed by Eric Wong.  [ruby-core:36150]
-	  (maygvl_copy_stream_wait_readwrite): removed.
-	  (nogvl_copy_stream_sendfile): use nogvl_copy_stream_wait_write and
-	  maygvl_copy_stream_wait_read instead of
-	  maygvl_copy_stream_wait_readwrite.
-
-Sun Jun 12 09:32:13 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* atomic.h (ATOMIC_OR): _InterlockedOr is not available on mingw.h
-	* gc.c (rb_gc_set_params): VM_OBJSPACE is disabled on mingw.
-
-Sun Jun 12 01:07:09 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: edited doc.
-
-Sat Jun 11 23:18:00 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_core.h (RUBY_VM_SET_TIMER_INTERRUPT, RUBY_VM_SET_INTERRUPT,
-	  RUBY_VM_SET_FINALIZER_INTERRUPT): use atomic ops for preventing
-	  interrupt_flag bit lost. [Bug #4770][ruby-dev:43467]
-	* thread.c (rb_threadptr_execute_interrupts_rec): ditto.
-	* vm_core.h (typedef struct rb_thread_struct): change type of
-	  interrupt_flag to rb_atomic_t.
-	* atomic.h: move atomic ops definition from signal.c.
-	* signal.c: remove atomic ops definition.
-	* common.mk (gc, signal, thread, cont): add to dependency to atomic.h.
-
-Sat Jun 11 23:23:52 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: edited doc.
-
-Sat Jun 11 23:02:36 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/buffering.rb (module OpenSSL):
-	  Buffering#each_byte should return String in accordance with IO in
-	  1.9.
-
-	* test/openssl/test_buffering.rb (class OpenSSL): add tests for getc
-	  and each_byte.
-
-Sat Jun 11 22:41:37 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* time.c: a correction of doc for strftime (%v).
-
-Sat Jun 11 22:30:53 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: replaced doc for strftime based on Time's one.
-
-Sat Jun 11 22:07:56 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (datetime_s_{iso8601,rfc3339,xmlschema,rfc2822,httpdate}):
-	  do not take argument comp.
-
-Sat Jun 11 21:58:31 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: added examples.
-
-Sat Jun 11 19:40:45 2011  Narihiro Nakamura  <authornari@gmail.com>
-
-	* gc.c: expand heap if initial_heap_min_slots is bigger than
-	  HEAP_MIN_SLOTS.
-
-Sat Jun 11 19:42:50 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ChangeLog (vim): set shiftwidth to 2.
-
-Sat Jun 11 19:27:06 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_x509req.c: raise RequestError instead of
-	  CertificateError when Request#to_der gets an error from OpenSSL.
-	  Patch from Ippei Obayashi, see #4420. I cannot write a test for
-	  this... Request does not allow to create broken bytes...
-
-Sat Jun 11 19:34:51 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (Date::(ABBR_)?(MONTH|DAY)NAMES): should be usascii.
-
-Sat Jun 11 19:24:33 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: rewrote doc.
-
-Sat Jun 11 19:04:15 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb (Test::Unit::GlobOption#non_options): should run
-	  with 1.8.
-
-Sat Jun 11 18:05:57 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* bootstraptest/runner.rb: should initialize $stress to avoid warnings.
-
-Sat Jun 11 18:02:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_getc): should be 7bit if ascii.  fixes #4557
-
-Sat Jun 11 16:52:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (rb_enc_uint_chr): fix message format. Bug#4869
-
-Sat Jun 11 16:28:25 2011  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/formatters/pretty.rb
-	  (REXML::Formatters::Pretty#write_text),
-	  test/rexml/test_core.rb
-	  (Tester#test_pretty_format_long_text_finite): don't ignore
-	  'width' parameter in pretty formatter. fixes #4498
-	  Reported by Michael Frasca. Thanks!!!
-
-Sat Jun 11 16:11:36 2011  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_core.rb
-	  (Tester#test_pretty_format_long_text_finite): remove needless
-	  assert_nothing_raised.
-
-Sat Jun 11 16:04:03 2011  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/parsers/xpathparser.rb
-	  (REXML::Parsers::XPathParser#parse),
-	  test/rexml/test_elements.rb
-	  (ElementsTester#test_each_with_frozen_condition):
-	  don't modify original XPath. fixes #4161
-	  Reported by Pavel Shved. Thanks!!!
-
-Sat Jun 11 15:53:27 2011  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_elements.rb (ElementsTester): remove needless
-	  prefix from test name.
-
-Sat Jun 11 15:36:36 2011  Martin Duerst  <duerst@it.aoyama.ac.jp>
-	* common.mk: fixed a grammatical error
-
-Sat Jun 11 14:20:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm.c (thread_memsize): don't ignore size of th->local_storage.
-
-Sat Jun 11 10:32:46 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb: should quote arch_hdrdir and libpath for the case
-	  installed prefix contains spaces.
-
-Sat Jun 11 10:20:52 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (native_cond_timeout): wrap conditionally used
-	  label.
-
-	* thread_pthread.c (native_sleep): remove unused variable.
-
-Sat Jun 11 10:15:50 2011  Tanaka Akira  <akr@fsij.org>
-
-	* thread.c (rb_thread_execute_interrupts): use GetThreadPtr to extract
-	  rb_thread_t from VALUE.
-	  reported by Motohiro KOSAKI.  [ruby-dev:43700]
-
-Sat Jun 11 10:00:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (ruby_process_options): add missing return type.
-
-Fri Jun 10 23:18:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/tk/tcltklib.c (lib_eventloop_core): replace CHECK_INTS with
-	  rb_thread_check_ints(). Because current code can't be compiled.
-
-Fri Jun 10 16:38:13 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (rb_locale_charmap): When ruby process is run as Windows
-	  Service the console codepage is not set, GetConsoleCP returns 0.
-	  So on such environment, use GetACP().
-	  http://blogs.msdn.com/b/michkap/archive/2005/02/08/369197.aspx
-	  patched by Rafal Bigaj [ruby-core:36832] [Bug #4854]
-
-Fri Jun 10 14:34:24 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: restore TESTRUN_SCRIPT to "$(srcdir)/test.rb".
-	  TESTRUN_SCRIPT is used by "make run", "make gdb" and so on.
-
-Fri Jun 10 13:01:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_module.rb (TestModule#remove_rake_mixins): remove all
-	  module related to Rake.
-
-Fri Jun 10 09:52:38 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* encoding.c:  Mention that Encoding.compatible? can work with more
-	  than just Strings.
-
-Fri Jun 10 02:25:53 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych.rb: updating version to match released gem.
-
-Fri Jun 10 01:06:29 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/bigdecimal (BigDecimal_to_i): Integer#** may return flonum.
-
-Fri Jun 10 00:35:12 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c (string_to_c_internal): uses rb_reg_nth_match;
-	* rational.c (string_to_r_internal): ditto.
-
-Fri Jun 10 00:25:03 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* gc.c: remove an unused declaration.
-
-Fri Jun 10 00:24:04 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* rational.c (string_to_r): Rational#** may return flonum.
-
-Thu Jun  9 23:57:53 2011  Tanaka Akira  <akr@fsij.org>
-
-	* io.c: fix IO.copy_stream interrupt handling.
-	  based on the patch by Eric Wong.  [ruby-core:36156]
-
-	* vm_core.h (rb_thread_call_with_gvl): don't declare here.
-
-	* thread.c: include internal.h.
-	  (rb_thread_execute_interrupts): new function.
-
-	* internal.h (rb_thread_execute_interrupts): declared.
-	  (rb_thread_call_with_gvl): declared.
-
-Thu Jun  9 23:34:01 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* gc.c (rb_objspace_call_finalizer): use rb_typeddata_is_kind_of() for
-	  type check to get rid of a double free when main Thread has singleton
-	  class. [ruby-core:36741] [Bug #4828]
-	* thread.c (rb_obj_is_mutex): add a new utility function.
-	* vm.c (rb_obj_is_thread): ditto.
-
-Thu Jun  9 22:53:49 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* test/ruby/test_thread.rb (TestThread#test_kill_thread_subclass):
-	  add test for Thread.kill with Thread subclass instance.
-
-Thu Jun  9 22:31:47 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* test/ruby/test_thread.rb (TestThread#test_kill_wrong_argument):
-	  test for [ruby-core:35086].
-	  partially forward porting r31402 from ruby_1_9_2 branch.
-
-Thu Jun  9 18:36:00 2011  Kenta Murata <mrkn@mrkn.jp>
-
-	* string.c: Fix the ambiguous description of the behavior of
-	  rb_str_aref_m with a range.  It returns nil when the beginning of
-	  the range is greater than the end of the string rather than the range.
-
-Thu Jun  9 10:57:03 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: Hash subclasses can be read
-	  from YAML files.
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: Hash subclasses can be
-	  dumped to YAML files.
-	* test/psych/test_hash.rb: corresponding test.
-
-Thu Jun  9 09:18:51 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: Ruby modules can be loaded
-	  from YAML files.
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby modules can be
-	  dumped to YAML files.
-	* test/psych/test_class.rb: corresponding test.
-
-Thu Jun  9 09:05:04 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: Ruby classes can be loaded
-	  from YAML files.
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby classes can be
-	  dumped to YAML files.
-	* test/psych/test_class.rb: corresponding test.
-
-Wed Jun  8 21:38:57 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* cont.c (root_fiber_alloc): set root fiber's status RUNNING.
-	  in cont_mark() only RUNNING fiber's machine stack is marked.
-	  root fiber's status should be RUNNING at the beginning regardless of
-	  FIBER_USE_NATIVE. [ruby-core:36735] fixes #4827
-
-Tue Jun  7 20:50:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* doc/irb/irb.rd: fix typo. patch by Nobuhiro IMAI.
-	  [Bug #4843] [ruby-dev:43639]
-	* doc/irb/irb.rd.ja: ditto.
-	* doc/ChangeLog-YARV: ditto.
-
-Tue Jun  7 18:52:55 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/rubygems/user_interaction.rb (Gem::StreamUI#tty?): IO#tty? of
-	  Windows has been fixed at r29969.
-
-	* test/rubygems/test_gem_stream_ui.rb: now can run tests.
-
-Tue Jun  7 18:36:41 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rubygems/test_gem.rb (TestGem#{test_self_user_home_userprofile,
-	  test_self_user_home_user_drive_and_path}): should simply ignore
-	  meaningless tests instead of skipping them.
-
-Tue Jun  7 18:15:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
-	  should show some messages when skipping tests.
-
-Tue Jun  7 13:59:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_core.c (date_s_today, datetime_s_now): check the
-	  result of localtime_r().
-
-Tue Jun  7 13:36:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of
-	  command line escape issues on Windows.  fixed #4835.
-
-Tue Jun  7 03:18:45 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_io.rb (TestIO#test_s_{,bin}write): do not create a
-	  file under /tmp. [Bug #4846]
-
-Mon Jun  6 22:51:43 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* cont.c: use #if FIBER_USE_NATIVE instead of #ifdef.
-	  you can suppress use of setcontext for Fiber with compile option
-	  -DFIBER_USE_NATIVE=0
-
-Mon Jun  6 21:59:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/test_switch_hitter.rb: added a test.
-
-Mon Jun  6 21:37:45 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: added notes.
-
-Mon Jun  6 21:02:12 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: flattened format to strftimev.
-	* ext/date/date_core.c (date_strftime_internal): taints run.
-
-Mon Jun  6 15:10:17 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/{defines,missing}.h (rb_infinity, rb_nan): move from
-	  defines.h to missing.h.  (couldn't use RUBY_EXTERN there.)
-
-Mon Jun  6 14:35:48 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rdoc/test_rdoc_markup_pre_process.rb (TestRDocMarkupPreProcess#
-	  {test_include_file,test_include_file_encoding_incompatible}): no
-	  need to write such workaround.  don't hide the bug of ruby. (and the
-	  bug is already fixed.)
-
-Mon Jun  6 14:11:11 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/date/date_core.c (valid_jd_sub): need to convert from VALUE to
-	  double.
-
-	* ext/date/date_core.c (offset_to_sec): get rid of a compiler warning.
-
-Mon Jun  6 14:09:08 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/defines.h (rb_infinity, rb_nan): export for Windows.
-
-Mon Jun  6 10:54:45 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb(Test::Unit::Runner#puke):
-	  Add overriding from MiniTest::Unit#puke. This reverts minitest's fix
-	  that skip messages are hidden when not verbose mode (-v option).
-	  To hide skip messages, use --hide-skip option instead.
-
-Mon Jun  6 10:52:13 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb: don't use autoload.
-
-Mon Jun  6 09:39:43 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/parser.c (parse): release event objects to plug memory
-	leak.  Thanks Mark J. Titorenko!
-
-Sun Jun  5 23:26:15 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* eval.c: remove rb_thread_stop_timer_thread function declaration.
-	  Instead, include vm_core.h.
-	* process.c: ditto.
-
-Sun Jun  5 21:38:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (thread_timer): add to care a spurious wakeup.
-	  When native_cond_timedwait() return 0 by spurious wakeup, we
-	  don't have to neither 1) call timer_thread_function and 2)
-	  exit the timer thread.
-
-Sun Jun  5 17:50:01 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (m_real_cwyear): new.  derived from m_cwyear.
-	* ext/date/date_strftime.c: trivial changes.
-
-Sun Jun  5 17:22:01 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/config_list.in: add new options for tcltklib.
-
-Sun Jun  5 10:06:50 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_tmx.h: now does not place decoded data.  allows to
-	  access indirectly via functions on demand.
-	* ext/date/date_strftime.c: ditto.
-	* ext/date/date_core.c: ditto.
-	* ext/date/date_core.c ({d|dt}_lite_to_s): use strftime.
-
-Sun Jun  5 06:22:02 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* NEWS: wrote about changes of date.
-
-Sat Jun  4 16:59:26 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (d_lite_inspect): changed the format.
-	* ext/date/date_core.c: refactoring and fixing some bugs.
-
-Sat Jun  4 04:04:41 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/rubygems/test_gem_commands_which_command.rb:
-	  "missing" exists on ruby's top source directory. [Bug #4815]
-
-Fri Jun  3 21:48:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/rubygems/test_case.rb: Refix for test-all in separate directory.
-	  r31147 + r31151.
-
-Fri Jun  3 20:58:47 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/date/date_core.c (d_lite_plus): get rid of compiler warnings.
-
-Fri Jun  3 20:56:40 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/missing.h, numeric.c (round): moved prototype of round()
-	  from numeric.c to missing.h.  (note: round() is C99 feature, so ruby
-	  provides it if not exist in C runtime.)
-
-Fri Jun  3 20:42:04 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit/parallel.rb: Keep $stdin, $stdout before run testcase
-	  and restore after run. Because some test break $stdin, $stdout.
-	  Fixes [Bug #4433] [ruby-core:35353]
-
-Fri Jun  3 19:58:14 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (io_fflush): windows -- call fsync() only when the FD is tied to
-	  file, because if the FD is pipe, it blocks.
-
-Fri Jun  3 09:27:31 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (URI::HTTP#request_uri): return nil when the uri
-	  is path-rootless form. Bug #4759
-
-Thu Jun  2 23:51:03 2011  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	* lib/csv.rb: Improve the line ending detection algorithm
-	  patch by Alexey).
-
-Thu Jun  2 20:05:57 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (rb_io_s_write, rb_io_s_binwrite): return!!!
-
-Thu Jun  2 16:29:34 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* io.c: Add File.write, File.binwrite. [Feature #1081] [ruby-core:21701]
-
-	* test/ruby/test_io.rb: Test for File.write, File.binwrite.
-
-	* NEWS: News for above.
-
-Thu Jun  2 12:33:09 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (io_fflush, rb_io_flush): need to fsync() when ruby calls
-	  internal flush. [ruby-core:36670] [Bug #4813]
-
-Thu Jun  2 07:56:24 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: reduce CPU power required by an eventloop.
-
-Tue May 31 21:28:33 2011  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring):
-	  redirect stderr to null device.
-
-Thu Jun  2 00:45:26 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/extconf.rb: fix for uninitialized global variables.
-	  [Ruby 1.9 - Bug #4811]
-
-Wed Jun  1 21:57:08 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (native_sleep): fix 1000times calculation error.
-	  this is a regression since r31457. [Bug #4808] [ruby-dev:43606]
-
-Wed Jun  1 17:19:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c: remove unused macro.
-
-Wed Jun  1 15:42:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (peek_n): new macro to see next nth char.
-
-Wed Jun  1 15:40:46 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/rbinstall.rb (gem): fix for rubygems change.
-
-Wed Jun  1 14:07:57 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/minitest/*: Imported minitest 2.2.2 (r6281)
-	* test/minitest/*: ditto
-
-Wed Jun  1 12:35:50 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/rubygems*: Import rubygems 1.8.5 (released @ 137c80f)
-	* test/rubygems: Ditto
-
-Wed Jun  1 12:34:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* NEWS: add new features of bigdecimal.
-
-Wed Jun  1 09:41:14 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/cgi/util.rb:  Improve documentation.  Patch by Kuba Fietkiewicz.
-	  [Ruby 1.9 - Bug #4775]
-	* lib/cgi/core.rb:  ditto
-
-Wed Jun  1 09:26:05 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/mathn.rb:  Improve documentation and attach it to Numeric.
-	  Modified from patch by Anil V.  [Ruby 1.9 - Bug #4762]
-
-Wed Jun  1 09:21:30 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/prime.rb:  Indent examples enough to appear as code sections.
-	  Note that Prime is Enumerable.  [#4762]
-
-Wed Jun  1 07:34:57 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* hash.c (key_i):  Change rdoc from "the first occurrence" to "an
-	  occurrence" since first occurrence is not a specification of
-	  Hash#key.  [Ruby 1.9 - Bug #4760]
-
-Wed Jun  1 07:26:19 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/pty/pty.c (pty_check):  Restore "not reached" comment.
-	  [Ruby 1.9 - Bug #4756]
-
-Wed Jun  1 07:21:40 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/zlib/zlib.c:  Fix document-method declarations for set_sync and
-	  set_comment.  [Ruby 1.9 - Bug #4695]
-
-Wed Jun  1 06:43:13 2011  Masaya Tarui  <tarui@ruby-lang.org>
-
-	* load.c (loaded_feature_path): cut nonsense loop execution to fix
-	  performance bug.
-
-Wed Jun  1 01:16:02 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_mix_module): implement Module#mix.
-
-Wed Jun  1 01:15:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_encoding_set): should honor already set ecflags since it
-	  might be set by mode option.  fixed #4804
-
-Wed Jun  1 00:34:04 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): remove unused
-	  variable.
-
-Wed Jun  1 00:32:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): support instantiation from
-	  a Float through Rational.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_new): ditto.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_global_new_float): add a test for
-	  the above changes.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_new_with_float): ditto.
-
-Wed Jun  1 00:07:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_coerce): support coerce with a
-	  Rational.  The precision used for instantiate a BigDecimal from the
-	  given Rational is obtained from the receiver BigDecimal.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_coerce): add a test for the
-	  above change.
-
-Tue May 31 23:49:08 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (offset_to_sec): fixed invalid validation.
-
-Tue May 31 23:43:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): replace the algorithm for
-	  coercing from a Rational to stop requiring "bigdecimal/util.rb".
-	  [ruby-core:34318]
-
-	* ext/bigdecimal/bigdecimal.c (GetVpValue): refactoring.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_new): support instantiation from a
-	  Rational.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_global_new_with_rational): add a
-	  test for the above change.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_new_with_rational): ditto.
-
-Tue May 31 22:44:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_new): support instantiation a
-	  BigDecimal object from an Integer.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_new_with_integer):
-	  add for testing the above change.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_global_new): replace its body
-	  with a BigDecimal_new call.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_global_new_with_integer):
-	  add for testing the above change.
-
-Tue May 31 22:24:39 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: use simple/complex mode instead of light/right mode.
-	* test/date/*.rb: followed the above changes.
-
-Tue May 31 21:28:33 2011  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring):
-	  initialize SIGINT handler.
-
-Tue May 31 17:03:24 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* lib/net/http.rb, lib/net/protocol.rb: Allow to configure to wait
-	  server returning '100 continue' response before sending HTTP request
-	  body. See NEWS for more detail. See #3622.
-	  Original patch is made by Eric Hodel <drbrain@segment7.net>.
-
-	* test/net/http/test_http.rb: test it.
-
-	* NEWS: Add new feature.
-
-Tue May 31 14:17:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (rb_io_s_pipe): potential bug. the mode of read IO is set as
-	  DEFAULT_TEXTMODE in call of io_set_encoding(), and of write IO is
-	  also set as it in call of io_new_instance() via rb_protect().
-	  so, if DEFAULT_TEXTMODE is not 0, we should check the result of
-	  extract_binmode() and avoid crush of default IO mode and the result.
-
-Tue May 31 13:00:17 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* strftime.c (rb_strftime_with_timespec): improved style consistency.
-	  constified some variables.
-
-	* test/test_time.rb (TestTime#test_huge_precision): test for #4456.
-
-Tue May 31 12:53:10 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/io/wait/test_io_wait.rb (TestIOWait#{test_nread,test_ready?,
-	  test_wait}: give system some time to process the written data.
-
-Tue May 31 12:40:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (TestIO#test_open_mode): MUST release resources
-	  explicitly. fix problem of r31671
-
-Tue May 31 10:49:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_exec.c: remove conditions for clang
-	  because clang version 3.0 (trunk 132165) doesn't need them.
-
-Mon May 30 22:19:33 2011  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring): don't
-	  close stderr.
-
-Mon May 30 20:22:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring): small
-	  but critical typo of r31642.  sorry...
-	  [Bug #4798] [ruby-core:36550]
-
-Mon May 30 15:44:16 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* insns.def (opt_mult): as r31805, volatile it.
-	  Without this, clang -O fails calculation.
-
-	* numeric.c (fix_mul): ditto.
-
-	* rational.c (f_imul): ditto.
-
-Mon May 30 10:26:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (int_pow): make sure to assign the result of x * z.
-	  If xz is optimized out, the value won't overflow.
-
-Sun May 29 23:17:29 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (rb_reg_match): fix rdoc of Regexp#=~.
-	  patched by Tsuyoshi Sawada. [Bug #4781]
-
-Sun May 29 23:10:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/webrick/https.rb (WEBrick::HTTPRequest#parse_uri):
-	  keep parse_uri as private. patched by okkez. [Bug #4773]
-
-Sun May 29 17:53:03 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* numeric.c: add #include "internal.h" for rb_big_uminus() prototype.
-
-Sun May 29 15:09:05 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_round): fix for negative value.
-
-Sun May 29 02:16:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/net/http/utils.rb (TestNetHTTPUtils#teardown): add nil check.
-
-Sun May 29 00:22:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (before_exec, after_exec): change from macro to function.
-
-Sat May 28 19:30:17 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (before_exec, after_exec): change SIGPIPE handler to SIG_DFL
-	  before calling execve(). Because r31760 reintroduced an issue that
-	  system() may hang up (i.e. [ruby-dev:12261]).
-	* process.c (save_sigpipe, restore_sigpipe): new.
-
-Sat May 28 16:08:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* signal.c (Init_signal, default_handler): change default SIGPIPE handler
-	  from empty function to SIG_IGN. [ruby-dev:43215]
-	* signal.c (sigpipe): removed.
-
-Sat May 28 03:04:27 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (fill_cbuf): return MORE_CHAR_SUSPENDED when cbuf is not empty.
-
-Sat May 28 02:22:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* string.c (rb_str_bytesize): rb_str_bytesize() should use LONG2NUM().
-	  Patch by Nikolai Weibull. [Bug #4789] [ruby-core:36511]
-
-Sat May 28 02:06:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (fill_cbuf): Fix test-all crash.
-
-Sat May 28 00:58:40 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/ostruct.rb (method_missing): Handle [] and []= correctly.
-	  Based on a patch by Caius Durling, bug #4179 [ruby-core:33792]
-
-Fri May 27 23:56:54 2011  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_core.rb (Tester::test_text_frozen): split frozen
-	  string test. refs #4783
-
-Fri May 27 22:46:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/rbinstall.rb (gem): install gemspec of json.  fixed #4784
-
-Fri May 27 22:45:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (validate_enc_binmode): do not clear textmode flag if
-	  default.  fixed #4732
-
-	* io.c (fill_cbuf): finish reading at EOF.
-
-Fri May 27 11:31:51 2011  misfo <tedwardo2@gmail.com>
-
-	* lib/rexml/text.rb (REXML::Text#initialize): prevent an error
-	  when passing a frozen string to REXML::Text.new
-
-	  dup the string passed in instead of cloning so that it's frozen
-	  state is ignored
-
-Fri May 27 08:47:26 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* thread.c (ppoll): typo bug fix.
-
-Fri May 27 08:35:04 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: hang-up at exit before calling Tk.mainloop.
-
-	* ext/tk/lib/tk/extconf.rb: cannot make on MinGW [Ruby 1.9 - Bug #4141].
-
-Thu May 27 00:34:07 2011  James Edward Gray II  <jeg2@ruby-lang.org>
-
-    * lib/csv.rb: Enhance each() to support Enumerator.
-
-Thu May 26 10:32:11 2011  James Edward Gray II  <jeg2@ruby-lang.org>
-
-    * lib/csv.rb: Documentation improvements from Ysiad Ferreiras.
-      [Ruby 1.9 - Bug #4785]
-
-Thu May 26 15:42:02 2011  Cezary Baginski <cezary.baginski@gmail.com>
-
-	* lib/xmlrpc/parser.rb (FaultException): fix to_s and inspect
-
-	* test/xmlrpc/parser.rb: test for the above
-
-Wed May 25 11:54:31 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/curses/curses.c:  Remove color constants block.
-	  [Ruby 1.9 - Bug #4748]
-
-Wed May 25 09:56:45 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/curses/curses.c:  Add missing documentation for button state, MIN
-	  and MAX comments.  Add Curses. to TABSIZE= and ESCDELAY= methods.
-	  [Ruby 1.9 - Bug #4747]
-
-Wed May 25 09:35:31 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/benchmark.rb:  Restore nodoc for Benchmark::Job and
-	  Benchmark::Report.  [Ruby 1.9 - Bug #4726]
-
-Wed May 25 09:29:38 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/pop.rb:  Hide implementation details from RDoc.
-	  [Ruby 1.9 - Bug #4711]
-
-Wed May 25 09:26:29 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/ftp.rb:  Add :nodoc: for private methods.
-	  [Ruby 1.9 - Bug #4710]
-
-Wed May 25 09:19:17 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/zlib/zlib.c:  Fix Document-method declarations.  Improve
-	  Zlib::GzipFile's method catalog.  [Ruby 1.9 - Bug #4695]
-
-Wed May 25 08:22:12 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/erb.rb:  Hide documentation for implementation details of ERB.
-	  [Ruby 1.9 - Bug #4694]
-
-Wed May 25 07:58:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/tempfile.rb (Tempfile.{mkdir,rmdir}): revert for backward
-	  compatibility.
-
-Wed May 25 07:13:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* spec/README: update the description.
-
-Wed May 25 07:12:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/tempfile.rb (Tempfile.{lock,unlock}_tempfile): refactor.
-
-Tue May 24 17:30:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* spec/README: fix typo.
-	  patched by bowsersenior. https://github.com/ruby/ruby/pull/24
-
-Tue May 24 07:06:34 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: fail to start Tk.mainloop (exit immediately) on
-	  some environment (reported on [ruby-talk:381444]).
-
-	* ext/tk/lib/tk/canvas.rb: support creating a canvas item object from
-	  an item ID number.
-
-	* ext/tk/lib/tk/image.rb: import documents which are pull-requested.
-	  [Ruby 1.9 - Feature #4595]
-
-	* ext/tk/lib/tk/extconf.rb: search directories for 64bit library (e.g.
-	  /usr/lib64), add some new configure options (see README.tcltklib),
-	  and bug fix.
-
-	* ext/tk/lib/tk/README.tcltklib: modify docs for some new configure
-	  options.
-
-Tue May 24 04:01:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/yaml.rb: switch default YAML engine to Psych, old syck engine
-	  may be enabled via YAML::ENGINE.yamler = "syck". [ruby-core:36374]
-
-Mon May 23 09:45:26 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* include/ruby/defines.h (CASEFOLD_FILESYSTEM): Revert r30508. Forgot to
-	  include this file in the commit r31692. __APPLE__ is not
-	  CASEFOLD_FILESYSTEM again, from this time.
-
-Mon May 23 10:01:02 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Do not parse zero-tagged values as EOC. Do
-	  not let current length become negative for infinite length constructed
-	  values. Support constructed values of length zero. Added tests.
-
-Mon May 23 09:19:53 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/smtp.rb:  Document Net::SMTP::Response.  Patch by J.R. Garcia.
-	  [Ruby 1.9 - Bug #4768]
-
-Mon May 23 09:03:52 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit/parallel.rb: Never Ignore SIGINT. When received
-	Interrupt, immediately puts result and exit. [ruby-dev:43571]
-
-	* lib/test/unit.rb: When received Interrupt, wait results from workers
-	and collect them. [ruby-dev:43571]
-
-Mon May 23 09:08:07 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/mathn.rb:  Improve documentation.  Patch by Sandor Szucs.
-	  [Ruby 1.9 - Bug #4767]
-
-Mon May 23 08:45:55 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/ostruct.rb:  Improve documentation.  Patch by Franklin Webber.
-	  [Ruby 1.9 - Bug #4761]
-
-Mon May 23 08:35:24 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* hash.c:  Improve documentation of Hash#key.  Patch by Utkarsh
-	  Kukreti.  [Ruby 1.9 - Bug #4760]
-
-Mon May 23 08:32:59 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* enumerator.c:  Improve documentation.  Patch by Dave Copeland.
-	  [Ruby 1.9 - Bug #4757]
-
-Mon May 23 07:19:45 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* NEWS (openssl): Infinite length support. Different behavior of
-	  Constructive and Primitive constructors.
-
-Mon May 23 06:58:33 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Forbid Constructives whose value is not an
-	  Array to prevent segfault. Added test.
-
-Mon May 23 06:33:17 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Forbid Constructive without infinite
-	  length. This also prevents a segfault. Added test and improved
-	  documentation.
-
-Mon May 23 05:58:14 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Fix decoding of infinite length values.
-	  Simplified ossl_asn1_decode0 by splitting it into three separate
-	  functions. Add tests.
-	  [Ruby 1.9 - Bug #4374][ruby-core:35123]
-
-Mon May 23 04:03:46 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_initialize): Allow creation of
-	  Constructives with an explicit tag_class parameter without
-	  automatically setting tagging to :EXPLICIT. Fixes a bug when encoding
-	  infinite length primitive values.
-
-Mon May 23 04:03:46 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_cons_to_der): Add an additional
-	  EOC for infinite length Constructives that are supposed to be encoded
-	  with explicit tagging. Also tabify method correctly.
-
-Mon May 23 03:44:39 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1data_to_der): Remove redundant
-	  flag tmp_cons.
-
-Mon May 23 00:35:00 2001  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (dump_bignum, bigmul1_balance, big_split, biglsh_bang),
-	  (bigrsh_bang, big_split3, bigmul1_toom3, bigmul0): implement Toom3 (Toom-Cook)
-	  multiplication.
-
-	* include/ruby/defines.h: add format prefixes for BDIGIT and BDIGIT_DBL.
-
-Sun May 22 23:24:02 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Instead of rb_intern use static symbols to
-	  improve performance.
-
-Sun May 22 21:56:51 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Use OpenSSL constants V_ASN1_xxx instead of
-	  hardcoded numbers for initializing class_tag_map.
-
-Sun May 22 21:29:29 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* include/ruby/defines.h (CASEFOLD_FILESYSTEM): Revert r30508. See #4255.
-	  Now __APPLE__ is not CASEFOLD_FILESYSTEM again.
-
-	* load.c (loaded_feature_path, rb_feature_p, load_lock): Revert r30508.
-	  See #4255. Make $LOADED_FEATURES scanning case-sensitive again.
-
-Sun May 22 18:59:27 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_asn1.c(ossl_asn1_default_tag): avoid using RCLASS_SUPER
-	  to make it compilable. Plus, tabify and change variable definition style.
-
-Sun May 22 18:26:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (vm_xcalloc): use calloc provided by platforms.
-	  fixes #4754
-
-Sun May 22 11:44:53 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/pty/pty.c:  Improve documentation.  Patch by David Copeland.
-	  [Ruby 1.9 - Bug #4756]
-
-Sun May 22 11:26:39 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/timeout.rb:  Improve documentation.  Patch by David Copeland.
-	  [Ruby 1.9 - Bug #4755]
-
-Sun May 22 11:21:41 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/ipaddr.rb:  Improve documentation.  Patch by Sandor Szucs.
-	  [Ruby 1.9 - Bug #4753]
-
-Sun May 22 11:14:40 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/forwardable.rb:  Document def_delegator.  Patch by Sandor Szucs.
-	  [Ruby 1.9 - Bug #4752]
-
-Sun May 22 11:11:41 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/fileutils.rb:  Document block behavior of FileUtils.cd.  Patch by
-	  Bil Kleb.  [Ruby 1.9 - Bug #4751]
-
-Sun May 22 11:07:47 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/curses/curses.c:  Complete documentation.  Patch by Vincent
-	  Batts.  [Ruby 1.9 - Bug #4748]
-
-Sun May 22 09:29:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
-	  use spawn. it prevent that other tests inherit renamed $0.
-
-Sun May 22 08:57:13 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Default tag lookup in constant time via hash
-	  instead of previous linear algorithm.
-	  [Ruby 1.9 - Feature #4309][ruby-core:34813]
-
-Sun May 22 07:54:16 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_digest.c: Explain DSS and DSS1 in documentation.
-
-Sun May 22 07:10:25 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_pkey_dsa.rb: Add tests for sign/verify.
-
-Sun May 22 06:07:17 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_x509cert.rb: Merge DSA-related tests from ruby_1_8
-	  branch.
-
-Sun May 22 04:11:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (Init_Thread): add a code comment why the meaningless
-	  line is necessary.
-
-Sun May 22 01:35:12 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: modified documentation.
-
-Sat May 21 22:46:26 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_strftime(date_strftime_with_tmx): "%v" means "%e-%b-%Y".
-
-Sat May 21 22:14:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_io_extract_modeenc): accept combination hash and
-	  File::Constants. (eg. File.open('yo', :mode => File::WRONLY))
-	  [Feature #4742][ruby-core:36338]
-	* test/ruby/test_io.rb (TestIO#test_open_mode): new test.
-
-Sat May 21 21:44:14 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/test_switch_hitter.rb: new.
-
-Sat May 21 21:18:29 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_{core,parse}.c: moved nearly all core code from ext/date/lib.
-	* ext/date/lib/{date,date/format}.rb: removed nearly all code.
-
-Sat May 21 02:58:46 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/.document:  Add curses to documented extensions.
-	* ext/curses/curses.c:  Improve documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #4747]
-
-Sat May 21 02:51:01 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb:  Improve documentation.  Patch
-	  by Pete Higgins.  [Ruby 1.9 - Bug #4746]
-
-Sat May 21 02:44:10 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/bigdecimal/lib/bigdecimal/jacobian.rb:  Document isEqual.  Patch
-	  by Kuba Fietkiewicz.  [Ruby 1.9 - Bug #4744]
-
-Sat May 21 02:22:34 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/date/lib/date/format.rb:  Document date formats.  Patch by
-	  Clinton Nixon.  [Ruby 1.9 - Bug #4743]
-
-Fri May 20 05:15:19 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
-
-	* gc.c: Fix build on m68k by 'error: too few arguments to
-	  function 'mark_locations_array''.
-
-Fri May 20 04:23:42 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/scanf.rb:  Improve documentation.  Patch by Gabe McArthur.
-	  [Ruby 1.9 - Bug #4735]
-
-Fri May 20 00:58:01 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/trans/ibm737-tbl.rb: greek code page.  fixes #4738
-
-Thu May 19 14:44:05 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_signal.rb (test_signal_requiring): skip on Windows.
-	  we can send SIGINT only to pid 0 and the process itself.
-
-Thu May 19 09:07:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib: revert r31635-r31638 and untabify with expand(1).
-
-Thu May 19 07:47:26 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_pkey_rsa.rb: Add tests for sign/verify.
-
-Thu May 19 07:19:16 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey.c: Add documentation.
-
-Thu May 19 07:06:56 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/benchmark.rb:  Fix indentation.
-	* lib/net/imap.rb:  Fix indentation of regular expressions.
-
-Thu May 19 06:36:11 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/imap.rb:  Fix indentation of EOF for heredoc.
-	* lib/debug.rb (Commands):  Fix indentation of EOHELP for heredoc.
-
-Thu May 19 06:30:38 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/mkmf.rb:  Fix indentation of EOM for heredoc.
-
-Thu May 19 06:16:41 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib:  Convert tabs to spaces for ruby files per
-	  http://redmine.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style
-	  Patch by Steve Klabnik [Ruby 1.9 - Bug #4730]
-	  Patch by Jason Dew [Ruby 1.9 - Feature #4718]
-
-Thu May 19 06:06:07 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/cgi/util.rb:  Improve documentation.  Patch by Clinton Nixon.
-	  [Ruby 1.9 - Bug #4733]
-	* lib/cgi/core.rb:  ditto
-	* lib/cgi/cookie.rb:  ditto
-
-Thu May 19 06:02:21 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/tempfile.rb:  Document Dir.mkdir and Dir.rmdir.  Patch by Clinton
-	  Nixon.  [Ruby 1.9 - Bug #4728]
-
-Thu May 19 05:57:52 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* encoding.c:  Improve documentation for Encoding#default_external and
-	  Encoding#default_internal.
-
-Wed May 18 22:45:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/lib/console/size.rb (IO#console_size): new
-	  method.  (EXPERIMENTAL)
-
-Wed May 18 22:41:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h: add for internal use only.
-
-Wed May 18 22:36:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (setup_exception): internal exception should be hidden
-
-Wed May 18 20:25:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* lib/timeout.rb (Timeout#timeout): don't leak "execution expired"
-	  exception. [Bug #4283] [ruby-core:34534].
-
-Wed May 18 06:09:24 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/cmath.rb:  Add some examples and improve documentation.  Patch by
-	  Sandor Szucs.  [Ruby 1.9 - Bug #4727]
-
-Wed May 18 05:40:31 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/benchmark.rb:  Remove nodoc from Benchmark::Job and
-	  Benchmark::Report.  Patch by Sandor Szucs.  [Ruby 1.9 - Bug #4726]
-
-Wed May 18 05:29:26 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/webrick/compat.rb:  Improve documentation.  Patch by Sandor
-	  Szucs.  [Ruby 1.9 - Bug #4725]
-
-Wed May 18 05:10:35 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/tracer.rb:  Improve documentation.  Patch by Richard Ramsden.
-	  [Ruby 1.9 - Feature #4720]
-
-Wed May 18 04:53:41 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/cmath.rb:  Improve documentation.  Patch by Jason Dew.
-	  [Ruby 1.9 - Feature #4717]
-
-Wed May 18 04:50:24 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/ftp.rb:  Improve documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #4710]
-
-Wed May 18 03:14:49 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* test/test_singleton.rb:  Add tests from lib/singleton.rb.  Patch by
-	  Pete Higgins.  [Ruby 1.9 - Bug #4715]
-
-Wed May 18 03:03:07 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/singleton.rb:  Improve documentation.  Patch by Pete Higgins.
-	  [Ruby 1.9 - Bug #4709]
-
-Tue May 17 21:24:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_mutex_lock): remove remove_signal_thread_list() call.
-	  It's meaningless because lock_interrupt doesn't call
-	  add_signal_thread_list().
-
-Tue May 17 20:20:49 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_core.h (rb_thread_struct): add volatile to
-	  transition_for_lock because it is not protected by lock.
-
-Tue May 17 20:08:53 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* LEGAL (missing/{elf,tgamma,lgamma_r}.c): they've been replaced by
-	  public domain implementations.
-
-	* LEGAL (vsnprintf.c): it has moved to srcdir from missing/.
-
-	* LEGAL (missing/crypt.c): list its original license.
-
-Tue May 17 19:54:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* LEGAL (configure): add missing/setproctitle.c
-
-Tue May 17 19:35:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-	Fix FreeBSD test failure.
-
-	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
-	  use ps -o command instead of ps -o cmd. FreeBSD doesn't support
-	  -o cmd option.
-
-Tue May 17 08:04:26 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_digest.c: Add documentation.
-
-Tue May 17 07:14:58 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/http.rb:  Improve documentation of proxy configuration
-	  methods.  Patch by Alf Mikula.  [Ruby 1.9 - Bug #4714]
-
-Tue May 17 07:09:01 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/pop.rb:  Improve documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #4711]
-	* lib/net/telnet.rb:  ditto
-
-Tue May 17 07:00:41 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/http.rb:  Fix nodoc for Net::HTTP::version_1_1?.  Patch by
-	  Alf Mikula.  [Ruby 1.9 - Bug #4713]
-
-Tue May 17 06:56:26 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/optparse.rb:  Add link to make_switch to improve documentation.
-	  Patch by David Copeland.  [Ruby 1.9 - Bug #4708]
-
-Tue May 17 06:50:40 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/observer.rb:  Improve documentation.  Patch by David Copeland.
-	  [Ruby 1.9 - Bug #4707]
-
-Tue May 17 06:42:53 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/logger.rb:  Improve documentation.  Patch by David Copeland.
-	  [Ruby 1.9 - Bug #4706]
-
-Tue May 17 06:28:14 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/gserver.rb:  Improve documentation.  Patch by David Copeland.
-	  [Ruby 1.9 - Bug #4705]
-
-Tue May 17 06:21:15 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/cgi.rb: Add toplevel documentation to class CGI
-	* lib/cgi/session.rb: Add overview documentation to CGI::Cookie
-	* lib/cgi/html.rb:  Don't add CGI::TagMaker documentation to CGI.
-	  Patch by David Copeland.  [Ruby 1.9 - Bug #4704]
-	* lib/cgi/core.rb:  Clean up CGI documentation.  Patch by David
-	  Copeland.  [Ruby 1.9 - Bug #4704]
-	* lib/cgi/cookie.rb:  Clean up CGI::Cookie documentation.  Patch by
-	  David Copeland.  [Ruby 1.9 - Bug #4704]
-
-Tue May 17 05:52:30 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/digest: Improve documentation of Digest, Digest::HMAC and
-	  Digest::SHA2.  Patch by Pete Higgins.  [Ruby 1.9 - Bug #4702]
-
-Tue May 17 03:51:42 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/abbrev.rb:  Hide copyright and revision information from RDoc.
-	  Inspired by patch from David Copeland, bug #4703.
-
-Tue May 17 03:33:21 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/timeout.rb (module Timeout):  Hide internal constants.  Patch by
-	  Pete Higgins.  [Ruby 1.9 - Bug #4701]
-
-Mon May 16 11:21:09 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in, win32/Makefile.sub (RUBY_SO_NAME): add CPU as prefix
-	  of RUBY_SO_NAME on x64/ia64 mswin/mingw.
-	  [Feature #4602]
-
-Mon May 16 08:00:05 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc.rb:  Update to RDoc 3.6.1, allows OpenSSL::Digest to be
-	  found.
-
-Mon May 16 05:49:54 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/drb/acl.rb:  Add documentation.
-
-Mon May 16 05:13:20 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Add documentation.
-
-Mon May 16 00:32:05 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_signal.rb (TestSignal#test_signal_process_group):
-	  skip if the platform doesn't have :pgroup capability. (i.e. skip
-	  if mswin32)
-
-Sun May 15 23:53:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/intern.h: resurrect old rb_fd_copy().
-	* thread.c (rb_fd_copy): ditto.
-
-Sun May 15 23:45:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/intern.h: remove rb_fd_copy() to rb_fd_dup() and
-	  rb_w32_fdcopy() to rb_w32_fd_dup().
-	* win32/win32.c: ditto.
-	* thread.c: ditto.
-
-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 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.
-
-Sun May 15 21:22:35 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* cont.c (cont_init): clear macihne_stack_start/end of saved thread to
-	  prevent mark machine stack of GC'ed Thread. root Fiber is not
-	  initialized by fiber_init().
-	  based on a patch by Serge Balyuk [ruby-core:35891] fixes #4612
-	* test/ruby/test_fiber.rb (test_gc_root_fiber): add test for it.
-
-Sun May 15 21:04:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (econv_init): revert r31353.  [ruby-dev:43512]
-
-Sun May 15 03:39:35 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/zlib/zlib.c:  Improve documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #4695]
-
-Sun May 15 03:23:46 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/erb.rb:  Document ERB::Compiler.  Patch by Simon Chiang.
-	  [Ruby 1.9 - Bug #4694]
-
-Sun May 15 00:58:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-	fix mswin32 build error.
-
-	* missing/setproctitle.c: add #ifdef HAVE_UNISTD_H.
-	* win32/Makefile.sub (MISSING): add setproctitle.obj
-
-Sat May 14 22:45:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* missing/setproctitle.c: add to include "ruby/util.h".
-
-Sat May 14 19:52:22 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
-	  add for $0 test.
-
-Sat May 14 19:50:46 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* missing/setproctitle.c (compat_init_setproctitle): use
-	  ruby_strdup() instead of strdup().
-
-Sat May 14 19:37:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/missing.h: add setproctitle() declaration.
-	* missing/setproctitle.c: added.
-	* configure.in: add check for missing/setproctitle.c.
-
-	* ruby.c (ruby_process_options): add to call compat_init_setproctitle().
-	* ruby.c (set_arg0): remove all platform specific code. it's
-	  moved to missing/setproctitle.c.
-	* ruby.c (origarg): remove len field. It's no longer used.
-	* ruby.c (get_arglen): removed.
-
-	This patch makes a lot of cleanup set_arg0 related code and fixes
-	[Feature #4689].
-
-Sat May 14 17:42:21 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* process.c (rb_proc_times): improve documentation.
-	  [ruby-core:35785] fixes #4581, reported by Andrew Grimm.
-
-Sat May 14 12:12:54 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_pkey_dsa.rb: Add basic tests and tests that
-	  ensure new public key PEM encoding behavior and ensure backward
-	  compatibility.
-	  [Ruby 1.9 - Bug #4422] [ruby-core:35328]
-	* test/openssl/test_pkey_rsa.rb: Remove line with 'puts'.
-
-Sat May 14 12:06:49 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/context.rb (class RDoc):  Fix infinite loop caused by
-	  re-encountering BasicObject.
-
-Sat May 14 10:32:36 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_pkey_rsa.rb: Add tests that ensure new public key
-	  encoding behavior and also ensure backward compatibility.
-	  [Ruby 1.9 - Bug #4421] [ruby-core:35327]
-
-Sat May 14 09:50:10 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/yaml/dbm.rb:  Add documentation.  Patch by Justin Collins.
-	  [Ruby 1.9 - Bug #4693]
-	* lib/yaml/store.rb:  ditto
-
-Sat May 14 09:31:43 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc.rb: Updated to RDoc 3.6
-
-Sat May 14 07:30:29 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych.rb: released a new gem, so increasing version.
-
-Sat May 14 05:08:32 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_digest.c
-	* ext/openssl/ossl_pkey.c
-	* ext/openssl/ossl_pkey.h
-	* test/openssl/pkey/test_pkey_rsa.rb
-	  Reverted premature commit. Sorry for the noise!
-
-Sat May 14 05:02:58 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/uri.rb:  Add toplevel documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #4690]
-
-Sat May 14 04:19:06 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* NEWS: Describe altered behaviour for RSA and DSA public key
-	  encoding. [Ruby 1.9 - Bug #4421, Bug #4422]
-	  [ruby-core:35327,35328]
-
-Sat May 14 02:57:52 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/ipaddr.rb (unless Socket):  Document valid*? methods.  Patch by
-	  Sebastian Martinez.  [Ruby 1.9 - Feature #4687]
-
-Sat May 14 02:54:04 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rexml/functions.rb:  Add some documentation for REXML::Functions.
-	  Patch by Sebastian Martinez.  [Ruby 1.9 - Feature #4688]
-
-Sat May 14 02:51:42 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/resolv.rb:  Hide private method and state-tracking constants from
-	  RDoc.  Patch by Mark Turner.  [Ruby 1.9 - Feature #4691]
-
-Fri May 13 19:23:21 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* numeric.c (flo_coerce): Add #flo_coerce documentation.
-	  Patch by Sebastian Martinez.
-	  https://github.com/ruby/ruby/pull/21
-
-Fri May 13 18:42:22 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* README.EXT: fix typo.  Patch by William Blackerby.
-	  https://github.com/ruby/ruby/pull/19
-
-	* README.EXT.ja: ditto.
-
-Fri May 13 15:22:34 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_select): check invalid handle before doing
-	  select operations.  see [ruby-dev:43513], [ruby-dev:43535]
-
-Fri May 13 08:34:00 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/rdoc.rb:  Output summary after documentation report.
-	* lib/rdoc/stats/normal.rb:  Don't output information for users when
-	  we're not on a TTY
-
-Fri May 13 07:49:02 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/fileutils.rb:  Hide internal methods from RDoc.  Patch by Darragh
-	  Curran.  [Ruby 1.9 - Bug #4684]
-
-Fri May 13 07:36:23 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/webrick/httpservlet/erbhandler.rb:  Add documentation.
-
-Fri May 13 07:04:33 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/mathn.rb:  Fix indentation.  Patch by Jason Dew.
-	  [Ruby 1.9 - Feature #4682]
-
-Fri May 13 06:50:43 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/mathn.rb:  Add documentation.  Patch by Jason Dew.  [Ruby 1.9 -
-	  Feature #4667]
-
-Fri May 13 05:44:19 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/logger.rb (class Logger):  Document Logger#datetime_format.
-	  Patch by Sergio Gil Perez de la Manga.  [Ruby 1.9 - Bug #4678]
-
-Fri May 13 05:39:11 2011  Eric Hodel <drbrain@segment7.net>
-
-	* re.c (Init_Regexp): Document option constants.  Patch by Vincent
-	  Batts.  [Ruby 1.9 - Bug #4677]
-	* lib/uri/common.rb (module URI):  Documentation for URI.  Patch by
-	  Vincent Batts.  [Ruby 1.9- Bug #4677]
-	* lib/uri/ftp.rb (module URI):  ditto
-	* lib/uri/generic.rb (module URI):  ditto
-	* lib/uri/http.rb (module URI):  ditto
-	* lib/uri/https.rb (module URI):  ditto
-	* lib/uri/ldap.rb (module URI):  ditto
-	* lib/uri/ldaps.rb (module URI):  ditto
-	* lib/uri/mailto.rb (module URI):  ditto
-	* process.c (Init_process):  Document Process constants.  Patch by
-	  Vincent Batts.  [Ruby 1.9- Bug #4677]
-
-Fri May 13 05:16:38 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rss/atom.rb (module RSS):  Document URIs.  Patch by Mark Turner.
-	  [Ruby 1.9 - #4671]
-	* lib/rss/rss.rb (module RSS):  Document exception classes.  Patch by
-	  Mark Turner.  [Ruby 1.9 - #4671]
-
-Fri May 13 02:15:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (select_internal): remove unused variable (interrupt_flag).
-
-Thu May 12 18:24:34 2011  Kouhei Sutou  <kou@clear-code.com>
-
-	* configure.in: limit to "T" type for prefix of external symbols
-	  because x86_64-w64-mingw32-gcc on Debian GNU/Linux generates the
-	  following symbol:
-	    0000000068483390 D _GLOBAL__F__conftest_external
-
-	  Approved by nobu.
-
-Thu May 12 14:50:52 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/dl/test_base.rb (Fiddle::LIBC_SO): its always msvc*.dll on
-	  mswin/mingw.
-
-Thu May 12 14:47:53 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (Logging.postpone): copy only when temporary logfile
-	  exists.
-
-Thu May 12 12:24:22 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
-
-	* ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is
-	  executed.
-	  However, the problem is not revised in this.
-	  This adds the control of using function of SSLv2 in made macro by
-	  function check.
-
-Thu May 12 08:10:46 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/set.rb (class Set):  Add nodoc to internal-use methods.  Patch
-	  by Pete Higgins.  [Ruby 1.9 - Bug #4665]
-
-Thu May 12 08:01:14 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey_ec.c: Allow encryption when PEM-encoding
-	  Elliptic Curve private keys.
-	  [ruby-core:35329] [Bug #4423]
-
-Thu May 12 07:54:59 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* object.c (rb_obj_equal):  Add documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #4664]
-	* lib/rexml:  ditto
-	* lib/mkmf.rb:  ditto
-	* ext/socket/lib/socket.rb:  ditto
-
-Thu May 12 07:30:08 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* Various .document files: Update .document files to match files which
-	  have documentation.
-
-Thu May 12 07:18:45 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey_dsa.c: Use generic X.509 SubjectPublicKeyInfo
-	  format for PEM-encoding DSA public keys.
-	  [ruby-core:35328] [Bug #4422]
-
-Thu May 12 06:27:31 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey_rsa.c: Use generic X.509 SubjectPublicKeyInfo
-	  format for encoding RSA public keys.
-	  [ruby-core:35327] [Bug #4421]
-
-Wed May 11 19:45:27 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/forwardable.rb: support 'delegate :foo => :bar' for to meet
-	  by specification of RDOC.
-
-Wed May 11 08:36:38 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/webrick: Add documentation for WEBrick::HTTPAuth
-
-Wed May 11 03:06:35 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rss.rb: Add documentation for RSS.  Patch by Steve Klabnik.
-	  [Ruby 1.9 - Bug #4663]
-
-Tue May 10 14:50:32 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb: Add option for hiding skip messages when test
-	  ends. #4657
-
-	* test/testunit/test_hideskip.rb, test/testunit/test4test_hideskip.rb:
-	  test for above.
-
-Tue May 10 10:53:04 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* common.mk (rdoc): Add rdoc-coverage rule
-
-Tue May 10 09:13:21 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/webrick: Add Documentation
-
-Tue May 10 04:22:09  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/webrick/log.rb: Hide copyright info from ri
-	* lib/webrick/httpstatus.rb: ditto
-	* lib/webrick/htmlutils.rb: ditto
-	* lib/webrick/httpversion.rb: ditto
-	* lib/webrick/version.rb: ditto
-	* lib/webrick/httpauth/userdb.rb: ditto
-	* lib/webrick/httpauth/authenticator.rb: ditto
-	* lib/webrick/accesslog.rb: ditto
-
-Mon May  9 20:57:13 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/ruby/test_{complex,rational}.rb: added tests.
-
-Mon May  9 20:29:44 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c (string_to_c_internal): a refactoring.
-
-Mon May  9 18:33:05 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c: Improve documentation for String#start_with? and
-	  String#end_with?. fixes #4652
-	  patched by Andrew Grimm <andrew.j.grimm at gmail.com>
-
-Mon May  9 13:49:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* complex.c (string_to_c_internal): support scientific notation.
-	  patched by Tinco Andringa. https://github.com/ruby/ruby/pull/16
-	  [ruby-core:36046][Bug #4655]
-
-Mon May  9 11:52:48 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (int_ord): remove K&R style.
-	  patched by Daehyub Kim. https://github.com/ruby/ruby/pull/17
-
-Sun May  8 22:17:24 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/ruby/test_{complex2,complexrational}.rb: use skip.
-	* test/date/*.rb: ditto.
-
-Sun May  8 21:02:31 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/ruby/test_{complex2,complexrational}.rb: NEVER SKIP.
-
-Sun May  8 21:01:21 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/test_date_base.rb: fixed.
-
-Sun May  8 20:54:11 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/*.rb: NEVER SKIP.
-
-Sun May  8 20:37:33 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/*.rb: reverted 31432.
-
-Sun May  8 20:32:43 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/*.rb: reverted 31483.
-
-Sun May  8 19:39:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (native_cond_timedwait): add to care EINTR.
-	* thread_pthread.c (thread_timer): remove EINTR check.
-
-Sun May  8 19:04:15 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/time.rb (xmlschema): avoid passing any negative numbers.
-
-Sun May  8 18:40:03 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_{parse,strptime}.c: introduced some macros.
-
-Sun May  8 17:17:13 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/*.rb: use skip /w messages.
-
-Sun May  8 17:04:55 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb (_httpdate): omitted to call zone_to_diff.
-
-Sun May  8 16:56:19 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (date_s_test_*): use macros.
-
-Sun May  8 10:24:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c: cleanup signal_thread_list related ifdef.
-	  1) we don't have to use #ifdef FOO-PLATFORM directly 2) About
-	  half #ifdef didn't care symbian properly.
-
-Sun May  8 05:19:37 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/io/wait/test_io_wait.rb: Linux socketpair(2) only support
-	  AF_UNIX, but windows socketpair doesn't support it. we can't
-	  avoid platform check. sigh!
-
-Sun May  8 00:13:05 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/io/wait/test_io_wait.rb: use Socket.pair instead of pipe.
-	  Windows can only treat a socket.
-
-Sat May  7 22:43:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_fd_zero): remove redundant zero fill.
-
-Sat May  7 22:38:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_fd_init): remove volatile qualifier.
-
-Sat May  7 22:34:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_fd_init_copy): new internal api. It provide efficient
-	  copy constructor semantics.
-	* thread.c (do_select): use rb_fd_init_copy().
-
-Sat May  7 15:18:06 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-	fix incorrect native_cond_signal call when deadlock was detected.
-
-	* thread.c (lock_func): decrement cond_waiting if timeout was happen.
-
-Sat May  7 18:28:37 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (USE_MONOTONIC_COND): check the availability
-	  more strictly.
-
-	* thread_pthread.h (rb_thread_cond_t): ditto.
-
-Sat May  7 15:15:10 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	fix win32 native_cond_timedwait() makes SIGSEGV.
-
-	* thread_win32.h (rb_thread_cond_struct): add prev field instead of
-	  last. (ie cond_event_entry is now using double linked list instead of
-	  single)
-	* thread_win32.c (cond_event_entry): add prev field.
-
-	* thread_win32.c (__cond_timedwait): remove entry properly if timeout
-	  was happen.
-
-	* thread_win32.c (native_cond_signal): change for double linked list.
-	* thread_win32.c (native_cond_broadcast): ditto.
-	* thread_win32.c (native_cond_initialize): ditto.
-
-Sat May  7 12:41:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-	fix mutex deadlock test hang-up.
-
-	* thread_win32.c (abs_timespec_to_timeout_ms): fix 1000x calculation
-	  mistake. (ie fix hang-up native_cond_timedwait())
-
-Sat May  7 03:14:13 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	sleep_cond use monotonic time if possible.
-
-	* thread_pthread.c (native_thread_init): change sleep_cond
-	  attribute to monotonic.
-	* thread_pthread.c (native_sleep): use native_cond_timeout().
-
-	* thread_pthread.c (native_cond_timeout): add overflow care.
-	* thread_win32.c (native_cond_timeout): ditto.
-
-Sat May  7 02:49:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-	  fix win32 compile error.
-
-	* thread_win32.c (RB_CONDATTR_CLOCK_MONOTONIC): define
-	  RB_CONDATTR_CLOCK_MONOTONIC always.
-	* thread_pthread.c (RB_CONDATTR_CLOCK_MONOTONIC): ditto.
-
-Sat May  7 02:29:41 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	  mutex: deadlock check timeout use monotonic time.
-
-	* thread_pthread.c (native_cond_timeout): new internal api.
-	  it calculate a proper time for argument of native_cond_timedwait().
-	* thread_win32.c (native_cond_timeout): ditto.
-
-	* thread_pthread.c (thread_timer): use native_cond_timeout()
-	  instead of get_ts.
-	* thread.c (lock_func): ditto.
-
-	* thread_pthread.c (get_ts): removed. use native_cond_timeout().
-	* thread.c (init_lock_timeout): ditto.
-
-Sat May  7 01:54:21 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (get_ts): add monotonic clock capability.
-	* thread_pthread.c (rb_thread_create_timer_thread): use monotonic
-	  clock if possible.
-
-Sat May  7 01:43:37 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.h (rb_thread_cond_t): add clockid field. it's
-	  no longer an alias of pthread_cond_t.
-	* thread_pthread.c: adapt new rb_thread_cond_t type.
-	* thread.c (mutex_alloc): ditto.
-	* thread_win32.c (native_cond_initialize): ditto.
-	* configure.in: add check for pthread_cond_attr_setclock() and
-	  clockid_t type.
-
-Fri May  6 23:29:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_wait_for_single_fd): use ppoll() instead of poll()
-	  if possible. based on a patch from Eric Wong. [ruby-core:36003].
-
-Fri May  6 23:13:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: remove nanosleep check. we no longer use it.
-	  r20124 removed last usage.
-
-Fri May  6 22:35:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck/rubyext.c (mktime_do): extra digits are not used.
-
-Fri May  6 17:43:07 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/syck/rubyext.c (mktime_do): remove unused variable offset.
-
-	* ext/syck/syck.h: use #ifdef instead of #if DEBUG.
-
-Fri May  6 16:27:33 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/date_core.c (DAY_IN_NANOSECONDS): refix: 31438.
-	  check with LONG_MAX and cast as long; without this the calculation
-	  will be done as int and overflow.
-
-Fri May  6 15:01:11 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* ext/syck/rubyext.c (mktime_do): avoid buffer overrun, by
-	  silently ignoring lesser significant digits.  Required buffer
-	  length can be computable so you might at first think of
-	  allocating enough memory space on the fly using alloca().  That
-	  is a wrong idea because when using alloca there is always risk
-	  of integer overflow.  A function that accepts outer-process
-	  resources like this should not blindly trust its inputs.  In
-	  this particular case we just want to generate milliseconds
-	  resolution by strtod() so the string in question needs no more
-	  length than what we originally have.  Ignoring lesser
-	  significant digits should suffice I believe.
-
-Fri May  6 14:25:53 2011  Tinco Andringa <mail@tinco.nl>
-
-	* ext/syck/rubyext.c (mktime_do): YAML.load time correctly parse
-	  usecs smaller than 1 fixes #4571
-
-Thu May  5 22:23:34 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (native_mutex_reinitialize_atfork): removed
-	  unused macro.
-	* thread_win32.c (native_mutex_reinitialize_atfork): ditto.
-
-Thu May  5 22:09:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_core.c (DAY_IN_NANOSECONDS): long long int is not
-	  available on all platforms.
-
-Thu May  5 17:36:31 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* eval.c (frame_func_id): store result of method_entry_of_iseq() to
-	  cfp->me because method_entry_of_iseq() might become expensive.
-
-Thu May  5 15:03:51 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* eval.c (frame_func_id): __method__ return different name from
-	  methods defined by Module#define_method with a same block.
-	  [ruby-core:35386] fixes #4606
-	* eval.c (method_entry_of_iseq): new helper function. search control
-	  frame stack for a method entry which has given iseq.
-	* test/ruby/test_method.rb: add tests for #4606
-
-Wed May  4 22:13:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/bm_vm4_pipe.rb: Reduced iterations. Too slow benchmark
-	  is bad.
-	* benchmark/bm_vm4_thread_pass.rb: ditto.
-
-Wed May  4 22:08:22 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/date/test_date_base.rb: don't use no message skip().
-
-Wed May  4 21:11:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/bm_io_select2.rb: reduce number of using file
-	  descriptors. because gdb need some fds.
-
-Wed May  4 19:00:59 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_wait_for_single_fd): Fix wrong return value.
-	* test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb
-	  (TestWaitForSingleFD#test_wait_for_closed_pipe): test for it.
-
-Wed May  4 18:46:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/-test-/wait_for_single_fd: New. for testing
-	  rb_wait_for_single_fd() internal function.
-	  The patch was written by Eric Wong. [ruby-core:35991]
-
-	* test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb: ditto.
-
-Wed May  4 12:46:25 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_wait_for_single_fd): Added POLLNVAL check.
-	  based on a patch from Eric Wong at [ruby-core:35991].
-
-Wed May  4 11:51:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_f_select): remove useless ifdef.
-
-Wed May  4 11:42:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/socket/init.c (wait_connectable): fix error handling code.
-	  RB_WAITFD_OUT is turned on even though an error occur.
-
-Wed May  4 10:12:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/readline/readline.c (readline_event): use rb_wait_for_single_fd().
-	The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
-
-Wed May  4 10:10:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/socket/init.c (wait_connectable): use rb_wait_for_single_fd().
-	  The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
-
-	* ext/socket/init.c (try_wait_connectable, wait_connectable_ensure):
-	  removed.
-
-Wed May  4 10:07:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/io/wait/wait.c (io_wait): use rb_wait_for_single_fd().
-	  The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
-
-Wed May  4 10:01:27 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_wait_for_single_fd): new. poll(2) based backend for
-	  rb_wait_for_single_fd().
-	  Now only Linux uses it.
-
-	The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
-
-Wed May  4 09:56:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_wait_for_single_fd): new.
-	* thread.c (select_single): select(2) based backend for
-	  rb_wait_for_single_fd().
-
-	* io.c (make_writeconv): use rb_wait_for_single_fd() instead of
-	  rb_thread_fd_select().
-	* io.c (rb_io_wait_readable): ditto.
-	* thread.c (rb_thread_wait_fd_rw): ditto.
-
-	* io.c (wait_readable): removed.
-	* thread.c (init_set_fd): new helper function.
-	* include/ruby/io.h (RB_WAITFD_IN, RB_WAITFD_PRI, RB_WAITFD_OUT):
-	  new constant for rb_single_wait_fd().
-
-	The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
-
-Wed May  4 08:04:59 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix time dumping so that
-	  Syck can load UTC times that Psych dumps.
-
-Wed May  4 07:33:00 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_fd_copy): fix wrong argument.This issue was pointed
-	  out by Eric Wong. [ruby-core:35982]
-
-Tue May  3 20:29:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_symbol_mode):
-	  Skip sticky bit test if the platform is FreeBSD. It doesn't allow to
-	  change sticky bit if a target is regular file.
-
-Tue May  3 18:23:57 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* test/date/test_date.rb (TestDate#test_coerce):
-	  test for [ruby-core:35127].
-
-Tue May  3 04:27:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_select): preserve errno if no error
-	  occurred.
-
-Tue May  3 03:57:04 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_w32_fdcopy): add prototype.  fixes
-	  #4640
-
-Mon May  2 01:02:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* lib/fileutils.rb (FileUtils#chmod): accept symbolic mode argument.
-	  The patch was written by takkanm. [ruby-core:26029][Feature #2190]
-
-	* lib/fileutils.rb (FileUtils#fu_mode): new helper function.
-	* lib/fileutils.rb (FileUtils#symbolic_modes_to_i): ditto.
-	* lib/fileutils.rb (FileUtils#mode_mask): ditto.
-	* lib/fileutils.rb (FileUtils#user_mask): ditto.
-
-	* test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_symbol_mode):
-	  new test for the above symbolic mode.
-	* test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_R): ditto.
-
-Mon May  2 00:36:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/socket/init.c (rsock_connect): add to care EINTR. based
-	  on a patch from Eric Wong at [ruby-core:35621][Bug #4555]
-
-Sun May  1 01:06:24 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_thread_select): release GVL while waiting select().
-
-Sat Apr 30 23:10:15 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/win32.c (rb_w32_fdcopy): New. This can copy even though
-	  fdset size exceed FD_SETSIZE.
-	* include/ruby/intern.h (rb_fd_copy): use rb_w32_fdcopy()
-
-Sat Apr 30 20:18:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (do_select): Change argument type to rb_fdset_t.
-	  Now do_select() is free from unexpected hangup if
-	  HAVE_RB_FD_INIT=1 [Bug #4636]
-
-	* thread.c (rb_thread_fd_select, rb_thread_wait_fd_rw):
-	  adapt new argument type.
-
-	* thread.c (rb_thread_select): make dummy implementation.
-
-Sat Apr 30 20:16:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_fd_copy): Change function argument. Now
-	  rb_fd_copy() has fully copy semantics.
-	* include/ruby/intern.h: ditto.
-
-Sat Apr 30 20:11:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/intern.h (rb_thread_select): mark as deprecated.
-
-	* ext/io/wait/wait.c (wait_readable): use rb_thread_fd_select
-	  instead of rb_thread_select.
-	* ext/socket/init.c (wait_connectable0): ditto.
-	* ext/readline/readline.c (readline_event): ditto.
-	* io.c (rb_io_wait_readable, wait_readable, rb_io_wait_writable,
-	  wait_writable): ditto.
-
-Sat Apr 30 20:06:36 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (do_select): remove useless ifdef. time calculation
-	  is not heavy weight.
-
-Sat Apr 30 16:48:36 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/bm_io_select3.rb: New.
-
-Sat Apr 30 16:27:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (copy_stream_body, rb_io_s_copy_stream): move rb_fd_init()
-	  from copy_stream_body to rb_io_s_copy_stream. fds of passing
-	  rb_fd_term() have to be guaranteed initialized.
-
-Sat Apr 30 16:13:17 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/bm_io_select.rb, benchmark/bm_io_select2.rb: New.
-	  based on a patch from Eric Wong at [Feature #4531]
-
-Sat Apr 30 03:25:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/io/wait/test_io_wait.rb: New. for testing ext/io/wait.
-	  the patch was written by Eric Wong. [Feature #4531]
-
-Sat Apr 30 00:34:56 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/win32.h: remove redundant declaration of
-	  rb_w32_time_subtract().
-
-Sat Apr 30 00:16:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (gvl_init): fix hangup if GVL_SIMPLE_LOCK=1.
-	  We don't have to call mutex_unlock() before initialize it!
-
-Fri Apr 29 13:15:15 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_win32.c (native_cond_timedwait): New. r31373 caused
-	  win32 build failure.
-
-	* thread_win32.c (__cond_timedwait, abs_timespec_to_timeout_ms):
-	  New helper functions.
-
-	* win32/win32.c (rb_w32_time_subtract): rename from subtract and
-	  remove static.
-
-Fri Apr 29 10:43:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/bm_vm4_pipe.rb: Add two new benchmark for GVL
-	  performance. They was written by Koichi Sasada.
-	* benchmark/bm_vm4_thread_pass.rb: ditto.
-
-Fri Apr 29 10:25:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_method.c (rb_clear_cache_by_class): Revert r29673. It made
-	  a segmentation fault regression. [Bug #4289][ruby-core:34554].
-
-Fri Apr 29 10:24:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (make_writeconv): do not add textmode newline decorator if any
-	  newline decorator is set already.  fixes #4618, fixes #4619
-
-Fri Apr 29 10:17:42 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (lock_func): small cleanup.
-
-Fri Apr 29 10:07:13 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_mutex_lock, lock_func): Avoid busy loop and
-	  performance regression. bm_vm3_thread_mutex.rb performance
-	  change from 109.064sec to 16.331sec. [Feature #4607]
-
-	* thread.c (init_lock_timeout): New helper function.
-
-Thu Apr 28 16:15:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/{win32.c,dir.h} (rb_w32_uopendir): new API to pass UTF-8 path.
-
-	* win32/win32.c (opendir_internal, rb_w32_opendir): extract and merge
-	  common part of rb_w32_opendir() and rb_w32_uopendir().
-
-	* dir.c (do_opendir, glob_helper): encoding.
-
-	* dir.c (dir_initialize, do_opendir): convert path to UTF-8 and call
-	  rb_w32_uopendir() instead of rb_w32_opendir() on Windows.
-	  fixes #4491, reported by Joey Zhou.
-
-Thu Apr 28 15:32:53 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on
-	  mswin/mingw.
-
-Thu Apr 28 06:07:06 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/csv.rb (CSV::open): suppress universal newline decorator.
-	  fixes #4603
-
-	* lib/csv.rb (CSV.read): no mode is needed.
-
-Thu Apr 28 06:06:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_extract_modeenc, rb_f_backquote): set default text
-	  mode.  fixes #4619
-
-	* io.c (pipe_open): set universal newline decorator if needed.
-
-Wed Apr 27 11:33:08 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/emoji_iso2022_kddi.trans: ISO-2022-JP-KDDI doesn't have
-	  CP932 UDA. Another reason is emacs-mule: the implementation of
-	  stateless-iso-2022-jp doesn't support beyond 94x94 (0x7fxx);
-	  but CP932 UDA is in 7Fxx-92xx.
-
-Wed Apr 27 07:42:44 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (STRIP): use proper toolchain.  based on a patch
-	  from Jon Forums at [ruby-core:35909].  fixes #4617
-
-Wed Apr 27 01:20:59 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (date_zone_to_diff): renamed.
-	* ext/date/date_parse.c: ditto.
-	* ext/date/date_strptime.c: ditto.
-
-Wed Apr 27 01:16:59 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (enc_find): accept Encoding objects.
-
-Wed Apr 27 00:55:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (econv_opts): add newline option.
-
-	* io.c (validate_enc_binmode, rb_io_extract_modeenc): set newline
-	  decorator according to open mode.
-
-	* transcode.c (rb_econv_prepare_options): new function, to prepare
-	  econv options with newline flags.
-
-	* include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_MASK): add.
-
-Wed Apr 27 00:51:01 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_truncate): fix function.
-
-	* include/ruby/win32.h (ftruncate, truncate, ftello, fseeko): non-64
-	  versions on mingw are useless because they use int32_t.  fixes #4564
-
-Wed Apr 27 00:50:33 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: modified validation methods.
-	* ext/date/lib/date.rb: ditto.
-
-Wed Apr 27 00:00:37 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (dt_lite_set_tmx): should get df value.
-
-Tue Apr 26 22:34:04 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb (_iso8601): allowed day only civil
-	  date.  disallowed separatorless day only ordinal date.
-
-Mon Apr 25 21:31:36 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
-
-	* ext/openssl/extconf.rb: Should check SSLv2_*method.
-	  openssl compiled with "no-ssl2" the extconf don't fail
-	  when running `make' having this compilation errors.
-	  Patched by Laurent Arnoud. fixes #4562, #4556
-
-Mon Apr 25 20:53:32 2011  Tajima, Akio <artonx@yahoo.co.jp>
-
-	* win32/win32.c (kill): accept 0 only sig is SIGINT #4596
-
-Mon Apr 25 19:59:47 2011  Tajima, Akio <artonx@yahoo.co.jp>
-
-	* win32/win32.c (kill): accept 0 as pid, fixes #4596
-
-Mon Apr 25 16:43:45 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* random.c (random_rand): remove unused variables.
-
-	* struct.c (rb_struct_define_without_accessor): ditto.
-
-	* strftime.c (rb_strftime_with_timespec): ditto.
-
-	* sprintf.c: ditto.
-
-	* time.c (time_asctime): remove useless GetTimeval().
-
-	* thread_pthread.c: cast to (void *) for %p.
-
-Mon Apr 25 11:02:11 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/ripper/lib/ripper/sexp.rb: fix rdoc around sexp.
-	  patched by Sho Hashimoto. fixes #4599
-
-Mon Apr 25 08:24:04 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* random.c (rb_f_rand, random_s_rand): RDocs for them.
-
-Mon Apr 25 07:18:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* random.c (random_s_rand, Init_Random): Random.rand should behave as
-	  Random::DEFAULT.rand rather than Kernel#rand.
-
-	* random.c (rand_range, random_rand): rand_range function extracted
-	  from random_rand function.
-
-	* random.c (rb_f_rand): accept a Range argument as Random#rand
-	  [ruby-dev:43427] #4605
-
-Mon Apr 25 03:31:06 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/time.rb: require 'date'.
-	* ext/date/lib/date/format.rb: removed require line.
-
-Mon Apr 25 03:08:39 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb: require 'date'.
-
-Mon Apr 25 03:04:16 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb (_iso8601): added a pattern.
-
-Mon Apr 25 02:51:22 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/lib/date/format.rb: require 'date_core.so'.
-	  date/format needs methods which are now in date_core.so.
-	  This breaks make rdoc which uses Date._parse from time.rb.
-
-Mon Apr 25 02:47:46 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb (_iso8601): fixed a bug of regex.
-
-Mon Apr 25 02:12:26 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb: an adjustment of regex.
-
-Mon Apr 25 01:58:50 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb: omitted to call _parse.
-
-Mon Apr 25 01:03:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* string.c (rb_to_id): remove unused variable.
-
-Sun Apr 24 22:19:05 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c, rational.c: omitted some method calls.
-
-Sun Apr 24 02:57:27 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_parse.c (n2i): takes long.
-
-Sun Apr 24 02:51:06 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_parse.c: reverted.
-
-Sun Apr 24 02:25:23 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/intern.h: pcc can't use __builtin_constant_p.
-
-	* vm_exec.c: change condition.
-
-Sun Apr 24 01:58:01 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/date_core.c (leap_p): suppress warning: parentheses.
-
-	* ext/date/date_core.c (date_s__parse_internal): remove unused
-	  variable "str".
-
-	* ext/date/date_parse.c (parse_ddd_cb): use RSTRING_LENINT.
-
-	* ext/date/date_strftime.c (date_strftime_with_tmx): remove unused
-	  variable.
-
-Sun Apr 24 00:34:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_parse.c: removed some unused macros.  use strchr()
-	  instead of index().
-
-Sat Apr 23 21:29:42 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: replacement of implementation of
-	  _parse.  [experimental]
-	* ext/date/date_parse.c: new.
-	* ext/date/lib/date/format.rb: removed ruby version of _parse.
-
-Fri Apr 22 12:04:15 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (rb_ary_sort_bang): fix rdoc.
-	  patched by burningTyger. https://github.com/ruby/ruby/pull/11
-
-Fri Apr 22 11:49:49 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/xmlrpc/create.rb (XMLRPC::Create#conv2value):
-	  XML-RPC's int is 32bit int, and Fixnum also may be beyond 32bit.
-
-	* lib/xmlrpc/create.rb (XMLRPC::Create#conv2value):
-	  XML-RPC doesn't allow Infinity and NaN.
-	  http://www.xmlrpc.com/spec
-
-Fri Apr 22 04:16:14 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/parser.c (parse): strings from psych have proper taint
-	  markings.
-
-	* test/psych/test_tainted.rb: test for string taint
-
-Thu Apr 21 01:30:02 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* random.c (rb_f_srand): fix rdoc: srand(0)'s 0 is a seed.
-	  [ruby-core:35833] fixes #4590
-
-Thu Apr 21 01:01:28 2011  Masaya Tarui  <tarui@ruby-lang.org>
-
-	* win32/win32.c (CreateChild): maximum length of lpCommandLine is
-	  32,768 characters, including the Unicode terminating null character.
-
-Wed Apr 20 21:32:11 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_strptime.c (date__strptime_internal): do not
-	  overwrite local variables.
-
-Wed Apr 20 14:41:28 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_each_line): check string's length when compare
-	  separator and string. [ruby-core:35815] fixes #4586
-
-Wed Apr 20 00:02:13 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-parse-partial): use position of open paren.
-
-Tue Apr 19 01:00:21 2011  Tajima Akio <artonx@yahoo.co.jp>
-
-	* test/ruby/test_io.rb (TestIO#test_cross_thread_close_fd):
-	  skip cross thread pipe close if windows
-
-Mon Apr 18 12:15:46 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
-	  avoid float error. [ruby-core:35804]
-
-Sun Apr 17 00:20:14 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_{core,strftime}.c: use struct tmx instead of vtm.
-	* ext/date/date_tmx.h: new.
-
-Sat Apr 16 22:23:52 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_strftime.c (date_strftime_wo_timespec): changed
-	  the way of validation of locale modifiers.
-
-Sat Apr 16 21:55:12 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: replacement of implementation of
-	  _strptime.  [experimental]
-	* ext/date/date_strptime.c: new.
-	* ext/date/lib/date/format.rb: removed ruby version of _strptime.
-
-Sat Apr 16 10:18:30 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* vm.c (Init_VM): suppress warning: "OPT_BASIC_OPERATIONS" is not
-	  defined.
-
-Fri Apr 15 23:41:18 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* ruby.c (proc_options): suppress warning:
-	  "ALLOW_DEFAULT_SOURCE_ENCODING" is not defined.
-
-Fri Apr 15 15:10:29 2011  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/uri/generic.rb (#route_from_path): Fix a bug where
-	  URI('http://h/b/').route_to('http://h/b') wrongly returned './'
-	  (should be '../b'). [Bug #4476]
-
-Fri Apr 15 14:58:06 2011  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/fileutils.rb (FileUtils#touch): Fix corrupted output when
-	  mtime is specified in addition to nocreate (and verbose).
-	  ref [ruby-dev:43401]
-
-Thu Apr 14 23:43:43 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* numeric.c (ruby_float_step): wrong loop condition.
-	  fixes [ruby-core:35753], reported by Joey Zhou.
-
-	* test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
-	  test above change.
-
-Thu Apr 14 22:48:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb (Test::Unit::Options#setup_options): set possible
-	  values for completion. no conversion is needed.
-
-	* lib/test/unit.rb (Test::Unit::Runner::Worker#initialize): use
-	  positional arguments instead of keyword arguments.
-
-	* lib/test/unit.rb (Test::Unit::Runner#jobs_status): io/console may
-	  not be available. use 80 as the last resort if IO#winsize and
-	  COLUMNS are unavailable.
-
-	* lib/test/unit.rb (Test::Unit::Runner::Worker#died): rename using a
-	  verb.
-
-	* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): check if worker
-	  is signaled and use its exit status.
-
-	* lib/test/unit.rb (Test::Unit::Runner::Worker#dead): no longer @in
-	  and @out are separated.
-
-Thu Apr 14 21:23:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_autoload_p): search superclasses as same as actual
-	  loading.  fixes [ruby-core:35679]
-
-Thu Apr 14 21:21:06 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/win32.h (frexp, modf): wrongly declared as pure in
-	  mingw math.h.
-
-	* include/ruby/win32.h (ftruncate, truncate): mingw64 misses
-	  prototypes.
-
-	* win32/win32.c (rb_w32_read): suppress warning.
-
-Thu Apr 14 19:55:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* lib/fileutils.rb (FileUtils#touch): fix corrupted output when
-	  FileUtils.touch(:nocreate => true, :verbose => true) case.
-	  The patch was written by Hiroyuki Iwatsuki. [ruby-dev:43401]
-
-Thu Apr 14 16:01:45 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* io.c (rb_f_syscall): suppress warning: "HAVE___SYSCALL" is not
-	  defined.
-
-Thu Apr 14 00:41:09 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* thread.c (thread_fd_close_i): IOError exception should be assigned
-	  to rb_thread_t::thrown_errinfo.
-
-Wed Apr 13 20:12:26 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* io.c (rb_io_fdatasync): remove unused variable.
-
-Tue Apr 12 20:54:12 2011  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/st.h: parenthesize macro arguments.
-
-Tue Apr 12 19:19:50 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/common.rb: avoid race condition. fixes #4572
-
-Tue Apr 12 18:07:13 2011  TAKAO Kouji  <kouji@takao7.net>
-
-	* ext/readline/extconf.rb: --disable-libedit to disable
-	  libedit. fixes #4550
-
-Tue Apr 12 10:37:39 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/win32.h: VC doesn't have ftruncate() and others, but
-	  ruby needs HAVE_ macros to use our emulation functions.
-	  (fix the problem of 31262)
-
-Tue Apr 12 01:33:00 2011  Luis Lavena  <luislavena@gmail.com>
-
-	* configure.in: properly evaluate existence of truncate, ftruncate
-	  and ftello for MinGW. [ruby-core:35678]
-	* win32/win32.c: rename truncate, ftruncate and ftello to avoid
-	  redefinitions.
-	* win32/win32.h: ditto.
-
-Mon Apr 11 21:51:52 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c: revert r31230. Because it made a regression.
-	  [ruby-core:35631]
-
-Mon Apr 11 21:49:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_io.rb: Added TestIO#test_cross_thread_close_stdio
-	  and TestIO#test_cross_thread_close_fd.
-	  The patch was written by Eric Wong. [ruby-core:35669]
-
-Mon Apr 11 21:15:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* file.c (rb_group_member): kill 256K of stack usage.
-	  the patch was written by Eric Wong. [ruby-core:35699]
-
-Mon Apr 11 07:24:13 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/openssl/ossl.c:  Fix typo, document version constants.
-
-Sun Apr 10 22:23:45 2011  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h: parenthesize macro arguments.
-
-Sat Apr  9 23:31:47 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* ext/stringio/stringio.c (strio_each, strio_readlines):
-	  Use `NUM2LONG` instead of `FIX2INT`. Fixes [ruby-dev:43395].
-
-Sat Apr  9 23:22:27 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* ext/stringio/stringio.c (strio_each):
-	  Fix exception message and don't raise immediately if block is not
-	  given.
-	  Fixes [ruby-dev:43394].
-
-	* test/stringio/test_stringio.rb (test_each_line_limit_0):
-	  Fix test for above.
-
-Sat Apr  9 21:54:15 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* ext/stringio/stringio.c (strio_each, strio_readlines):
-	  limit must not be zero. Fixes [ruby-dev:43392].
-
-	* test/stringio/test_stringio.rb: Add tests for above.
-
-Sat Apr  9 18:01:36 2011  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/util.h: parenthesize macro arguments.
-
-Fri Apr  8 16:01:56 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_getline): check whether str is
-	  a string when str and lim are given.
-	  https://twitter.com/watson1978/status/56225052152168449
-
-Thu Apr  7 20:03:52 2011  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/io.h: parenthesize macro arguments.
-
-Wed Apr  6 21:08:31 2011  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/intern.h: parenthesize macro arguments.
-
-Wed Apr  6 15:12:40 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize):
-	  pop pushed error after each try of reading. fixes #4550
-
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
-
-	* ext/openssl/ossl_pkey_ec.c (ossl_ec_initialize): ditto.
-
-Wed Apr  6 11:36:44 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize):
-	  pop pushed error after each try of reading. fixes #4550
-
-Tue Apr  5 20:33:43 2011  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/encoding.h: parenthesize macro arguments.
-
-Mon Apr  4 22:02:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/io/nonblock/nonblock.c (io_nonblock_set): Avoid F_SETFL if
-	  we're not changing the O_NONBLOCK bit. F_SETFL is an expensive
-	  operation since it needs to affect all processes with the same
-	  file object.
-	  The patch is written by Eric Wong. [ruby-core:35556]
-
-Mon Apr  4 21:41:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_io_syswrite): While local FS writes are usually
-	  buffered, the buffers can be full or the file opened with
-	  O_SYNC. IO#syswrite can also be used on blocking IOs
-	  (pipe/socket) just like IO#write.
-	  The patch is written by Eric Wong. [ruby-core:35554]
-
-Mon Apr  4 11:50:40 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/test_tempfile.rb: simply ignore platform dependent testcases
-	  instead of skipping.
-
-Sun Apr  3 22:52:22 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* ext/syslog/syslog.c: improve rdoc.
-	  a patch by Jonas Pfenniger. [ruby-core:35592] fixes #4545
-
-Sun Apr  3 22:10:09 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/zlib/zlib.c: parenthesize macro arguments.
-
-Sun Apr  3 21:33:58 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: disable fdatasync again on Mac OS X.
-	  [ruby-core:35493][Bug #4500]
-
-Sun Apr  3 21:16:20 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (io_reopen): IO#close releases GVL if possible.
-	  close() may block for certain file types (NFS, SO_LINGER
-	  sockets, inotify), so let other threads run. The patch was
-	  created by Eric Wong [ruby-core:35555][Bug #4527]
-
-	* io.c (fptr_finalize): ditto.
-
-	* io.c (maygvl_fclose): new.
-	* io.c (nogvl_fclose): ditto.
-	* io.c (maygvl_close): ditto.
-	* io.c (nogvl_close): ditto.
-
-Fri Apr  1 22:25:50 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/syslog/syslog.c: parenthesize macro arguments.
-
-Fri Apr 1 18:53:06 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/webrick/cookie.rb (WEBrick::Cookie.parse): 'white space is
-	  permitted between tokens' according to RFC2965. Though 'Netscape
-	  spec' does not define the syntax clearly, make it tolerant as a
-	  server. As a real-world example, rest-client gem sends
-	  'Cookie: foo=1;bar=2'
-
-	* test/webrick/test_cookie.rb (test_parse_non_whitespace): test it.
-
-Fri Apr  1 13:19:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (RUBY_VM_CHECK_INTS_TH): merge a patch by ko1
-	  in [ruby-dev:43373].
-
-Thu Mar 31 23:15:46 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-brace-to-do-end, ruby-do-end-to-brace):
-	  adjust space between block beginning and block arguments
-
-Thu Mar 31 20:42:05 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/strscan/strscan.c:  parenthesize macro arguments.
-
-Thu Mar 31 18:06:12 2011  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_get_ev_const): should ignore crefs with
-	  the NODE_FL_CREF_PUSHED_BY_EVAL flag.
-
-Thu Mar 31 16:49:56 2011  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_get_ev_const): search root cref properly.
-	  [ruby-dev:43365]
-
-Thu Mar 31 14:50:25 2011  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* eval.c (rb_mod_s_constants): should ignore crefs with
-	  the NODE_FL_CREF_PUSHED_BY_EVAL flag.
-
-Wed Mar 30 22:55:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-toggle-block): toggle do/end and {}.
-
-	* misc/ruby-mode.el (ruby-move-to-block): move to opening of
-	  block.
-
-Wed Mar 30 14:35:15 2011  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_insnhelper.h (COPY_CREF): should copy
-	  the NODE_FL_CREF_PUSHED_BY_EVAL flag to hide constants from
-	  methods defined by class_eval.  [ruby-dev:43365]
-
-Wed Mar 30 00:24:53 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/stringio/stringio.c: parenthesize macro arguments.
-
-Tue Mar 29 21:51:31 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* object.c (rb_String): Kernel#String should call to_str before to_s.
-
-Tue Mar 29 10:28:08 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/webrick/test_filehandler.rb
-	  (WEBrick::TestFileHandler#test_short_filename): the cgi doesn't exist
-	  on current directory.
-
-Tue Mar 29 05:19:57 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/raddrinfo.c: parenthesize macro arguments.
-
-Tue Mar 29 00:03:51 2011 Tajima Akio <artonx@yahoo.co.jp>
-
-	* test/webrick/test_filehandler.rb (test_short_filename):
-	  read real short filename by cmd because smb mounted files
-	  have different naming convention.
-
-Mon Mar 28 11:38:08 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/date_core.c (date_s_today): use int for year.
-
-	* ext/date/date_core.c (datetime_s_now): ditto.
-
-Mon Mar 28 11:07:41 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/extmk.rb: set MFLAGS from MAKEFLAGS when using nmake.
-
-Mon Mar 28 11:07:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (love): all you need is love.
-
-Sun Mar 27 23:16:31 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/ipsocket.c: parenthesize macro arguments.
-
-Sun Mar 27 16:55:34 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-mode-map): remove unnecessary
-	  binding. fixes
-	  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468952
-
-	* misc/ruby-mode.el: suppress warnings at byte compile.  fixes
-	  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502926
-
-Sun Mar 27 11:18:35 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: removed unused variables.
-
-Sat Mar 26 15:16:09 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/getaddrinfo.c: parenthesize macro arguments.
-
-Sat Mar 26 05:27:34 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/lib/date/format.rb (DateTime#strftime): removed because
-	  date_core defines it.
-
-Fri Mar 25 21:59:45 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: should not force cast with macros.
-
-Fri Mar 25 21:56:10 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/sdbm/init.c: parenthesize macro arguments.
-
-Fri Mar 25 19:39:40 2011  Ben Walton <bwalton@artsci.utoronto.ca>
-
-	* test/test_syslog.rb:
-	  Skip syslog tests that rely on LOG_PERROR unless it's defined
-
-	  Instead of checking looking at the platform to determine if the tests
-	  relying on LOG_PERROR should be run, look for the definition of the
-	  constant as this will be robust against all platforms as long as the
-	  underlying syslog.c code sets it up correctly.
-
-	  This specifically addresses failures on Solaris 9.
-
-	  Use LOG_PID instead of LOG_PERROR in Syslog.open test
-
-	  LOG_PERROR isn't a POSIX option for syslog, so it fails on platforms
-	  that don't define it.  Solaris 9 and 10 are examples of this.
-
-	  Use LOG_PID instead.
-
-Fri Mar 25 15:42:17 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/sdbm/_sdbm.c (sdbm_open): use size_t.
-
-	* ext/syck/bytecode.c: ditto.
-
-	* ext/sdbm/_sdbm.c (delpair): use ptrdiff_t.
-
-	* ext/sdbm/init.c: use RSTRING_LENINT.
-
-	* ext/dl/handle.c: suppress warning: shorten-64-to-32.
-
-	* ext/strscan/strscan.c: ditto.
-
-	* ext/syck/emitter.c: ditto.
-
-	* ext/syck/implicit.c: ditto.
-
-	* ext/syck/syck.c: ditto.
-
-	* ext/syck/token.c: ditto.
-
-Fri Mar 25 12:14:58 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: import nkf 7f18e30.
-
-Fri Mar 25 11:49:29 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_process.rb (TestProcess#test_no_curdir): skip silently
-	  on Windows, because this tests a platform specific feature and it'll
-	  never be supported on ruby on Windows.
-
-	* test/ruby/test_dir_m17n.rb
-	  (TestDir_M17N#test_filename_extutf8_invalid,
-	  TestDir_M17N#test_filename_as_bytes_extutf8): ditto.
-
-	* test/open-uri/test_open-uri.rb
-	  (TestOpenURI#test_find_proxy_case_sensitive_env): ditto.
-
-	* test/dl/test_handle.rb (DL::TestHandle#test_NEXT,
-	  DL::TestHandle#test_DEFAULT): ditto.
-
-Thu Mar 24 23:06:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_get_ev_const): should not autoload in
-	  defined? mode.
-
-	* variable.c (rb_const_defined_0): fix autoloading base.
-	  [ruby-core:35509]
-
-Thu Mar 24 22:48:43 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/sdbm/_sdbm.c: parenthesize macro arguments.
-
-Thu Mar 24 14:45:57 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl.c: suppress warning: shorten-64-to-32.
-
-	* ext/openssl/ossl.h: ditto.
-
-	* ext/openssl/ossl_asn1.c: ditto.
-
-	* ext/openssl/ossl_bio.c: ditto.
-
-	* ext/openssl/ossl_bn.c: ditto.
-
-	* ext/openssl/ossl_cipher.c: ditto.
-
-	* ext/openssl/ossl_hmac.c: ditto.
-
-	* ext/openssl/ossl_ns_spki.c: ditto.
-
-	* ext/openssl/ossl_ocsp.c: ditto.
-
-	* ext/openssl/ossl_pkcs5.c: ditto.
-
-	* ext/openssl/ossl_pkey.c: ditto.
-
-	* ext/openssl/ossl_pkey_dh.c: ditto.
-
-	* ext/openssl/ossl_pkey_dsa.c: ditto.
-
-	* ext/openssl/ossl_pkey_ec.c: ditto.
-
-	* ext/openssl/ossl_pkey_rsa.c: ditto.
-
-	* ext/openssl/ossl_rand.c: ditto.
-
-	* ext/openssl/ossl_ssl.c: ditto.
-
-	* ext/openssl/ossl_x509ext.c: ditto.
-
-	* ext/openssl/ossl_x509name.c: ditto.
-
-Thu Mar 24 11:48:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_rand.c (ossl_rand_egd_bytes): use NUM2INT because
-	  the result is used with functions whose argument is int.
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): ditto.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_purpose): ditto.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_trust): ditto.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_purpose): ditto.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_trust): ditto.
-
-Thu Mar 24 11:36:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_x509name.c: id_aref's type is ID.
-
-Thu Mar 24 10:04:35 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/io/console/console.c (console_set_winsize):
-	  suppress warning: shorten-64-to-32.
-
-Thu Mar 24 09:56:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify): flags is VALUE,
-	  so it should use NUM2INT.
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): ditto.
-
-Wed Mar 23 21:09:29 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/readline/readline.c: parenthesize macro arguments.
-
-Wed Mar 23 08:07:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_round): fix inaccurate results.
-
-Wed Mar 23 00:12:16 2011  Tajima Akio <artonx@yahoo.co.jp>
-
-	* win32/win32.c: wait process real termination after reading
-	  exit code. fixes #4518
-
-Tue Mar 22 21:20:10 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/rubygems/test_case.rb: save current dir to @current_dir
-	  before Dir.chdir.
-
-Tue Mar 22 20:10:04 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/psych/parser.c: parenthesize macro arguments.
-
-Tue Mar 22 20:10:01 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ruby_missing.h: parenthesize macro arguments.
-
-Tue Mar 22 13:33:22 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/buffering.rb: removed circular require of
-	  openssl.rb.
-
-	* ext/openssl/lib/openssl/*: removed following comment for transition
-	  measures of avoiding circular require. No one claimed about this as
-	  far as I know.
-	  ##
-	  # Should we care what if somebody require this file directly?
-	  # require "openssl"
-
-Tue Mar 22 10:57:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/runner.rb: set Gem::TestCase's @@project_dir.
-
-	* lib/rubygems/test_case.rb: set Gem::TestCase's @@project_dir only
-	  when it is not defined.
-
-Tue Mar 22 09:38:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (flo_round): use pow instead of while-loop. fixes #4510
-	  patched by Alex Young [ruby-core:35526]
-
-Tue Mar 22 06:47:46 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/date_strftime.c (date_strftime_wo_timespec):
-	  suppress warning: shorten-64-to-32.
-
-Tue Mar 22 06:42:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/date_core.c: suppress warning: shorten-64-to-32.
-
-Tue Mar 22 06:41:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/test/unit/parallel.rb: remove unused variable.
-
-Tue Mar 22 06:19:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/utf_16le.c: suppress warning: shorten-64-to-32.
-
-	* ext/dbm/dbm.c: ditto.
-
-	* ext/gdbm/gdbm.c: ditto.
-
-	* parse.y (Init_ripper): suppress warning: unused value.
-
-Mon Mar 21 11:21:32 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb: Refactoring. Unified if and elsif.
-
-Sun Mar 20 23:09:34 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_strftime.c: checks duplicated modifiers.
-
-Sun Mar 20 22:32:30 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_strftime.c: removed unused code and arguments.
-
-Sun Mar 20 21:34:49 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: replacement of implementation of
-	  strftime. It has some limitations that is same as Time's
-	  one.  [experimental]
-	* ext/date/date_strftime.c: new.
-	* ext/date/lib/date/format.rb: removed ruby version of strftime.
-
-Sun Mar 20 12:43:12 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509store.c: parenthesize macro arguments.
-
-Sun Mar 20 01:39:48 2011  Tajima Akio <artonx@yahoo.co.jp>
-
-	* hash.c (ruby_setenv): check env process block size with OS ver.
-	* win32/win32.c: export rb_w32_osver for above patch.
-	* include/ruby/win32.h: declare rb_w32_osver for Win32 Libs.
-
-Sat Mar 19 18:35:05 2011  Tajima Akio <artonx@yahoo.co.jp>
-
-	* hash.c (ruby_setenv): calculate total env block size for win32.
-	* test/ruby/test_env.rb: add test for above patch.
-
-Sat Mar 19 17:14:46 2011  Tajima Akio <artonx@yahoo.co.jp>
-
-	* hash.c (ruby_setenv): checking with max process environment
-	  block size for Win32. 32767 for 2000/XP, 2003. if failed to
-	  read the block, then checking with 5120 for earlier Windows.
-
-Sat Mar 19 12:30:25 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509revoked.c: parenthesize macro arguments.
-
-Fri Mar 18 20:44:36 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509req.c: parenthesize macro arguments.
-
-Fri Mar 18 08:48:06 2011  Oleg Shaldybin  <oleg.shaldybin@gmail.com>
-
-	* lib/fileutils.rb (FileUtils::Entry_#copy_file): updated FileUtils.cp
-	  to still copy file permissions when :preserve is false (as cp does
-	  this even when -p isn't set).
-
-Fri Mar 18 00:59:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32ole/extconf.rb (create_docfile): removed.  should not
-	  modify source directory unnecessarily, platform dependent
-	  documentation should be dealt with by rdoc.  [ruby-core:35495]
-
-Fri Mar 18 00:54:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_funcall_passing_block): add prototype.
-	  a patch by James M. Lawrence at [ruby-core:35501]
-
-Wed Mar 17 06:23:31 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509name.c: parenthesize macro arguments.
-
-Wed Mar 16 20:36:56 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/ipsocket.c (init_inetsock_internal): raise an error on
-	  listen(2) failure.
-	  reported by Xavier Shay.  [ruby-core:35505]
-
-Wed Mar 16 15:06:21 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/openssl/lib/openssl/buffering.rb (module OpenSSL): #flush should
-	  not change sync mode on exception.
-	* test/openssl/test_buffering.rb: added
-
-Wed Mar 16 13:45:28 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/openssl/lib/openssl/buffering.rb: de-nest Buffering module
-
-	* ext/openssl/lib/openssl/buffering.rb: add RDoc
-
-Wed Mar 16 08:40:39 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509ext.c: parenthesize macro arguments.
-
-Tue Mar 15 18:34:27 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509crl.c: parenthesize macro arguments.
-
-Tue Mar 15 09:49:03 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/misc/test_ruby_mode.rb (test_singleton_class): Skip for Pending.
-
-Mon Mar 14 21:20:44 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* test/ruby/test_require.rb (test_require_too_long_filename):
-	  increase path length, because MAXPATHLEN is defined as 4096 on linux.
-
-	* test/ruby/test_require.rb (test_require_path_home_1): ditto.
-
-	* test/ruby/test_require.rb (test_require_path_home_2): ditto.
-
-Mon Mar 14 19:54:37 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509cert.c: parenthesize macro arguments.
-
-Sun Mar 13 18:11:28 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509attr.c: parenthesize macro arguments.
-
-Sun Mar 13 16:07:58 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/pstore.rb: Fix don't raise "nested transaction" when thread_safe
-	  is true. Patch by Masaki Matsushita (Glass_saga). [ruby-dev:43337]
-
-	* test/test_pstore.rb: Test for above.
-	  Patch by Masaki Matsushita (Glass_saga) [ruby-dev:43337]
-
-Sat Mar 12 04:12:41 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_ssl_session.c: parenthesize macro arguments.
-
-Sat Mar 12 02:27:07 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c ({d,dt}_lite_marshal_load): checks the given
-	  argument.
-
-Sat Mar 12 01:26:24 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: changed some directives.
-
-Sat Mar 12 01:16:02 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c, ext/date/lib/*: moved rdoc descriptions.
-
-Sat Mar 12 00:06:24 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib: moved from lib.
-
-Fri Mar 11 23:32:38 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/delta*: removed undocumented delta.
-
-Fri Mar 11 18:42:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (find_executable0): should exclude directories.
-
-Fri Mar 11 01:40:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (proc_getmaxgroups, proc_setmaxgroups): Process#maxgroups
-	  and Process#maxgroups= now raise NotImplementedError if the
-	  platform don't support supplementary groups concept.
-
-Fri Mar 11 01:25:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (get_sc_ngroups_max): return -1 if platform don't
-	  support NGROUPS_MAX.
-
-Thu Mar 10 22:28:15 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_ssl.h: parenthesize macro arguments.
-
-Thu Mar 10 21:59:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* parse.y (parser_encode_length): add exception as UTF8-MAC for
-	  magic comment's emacs newline specifier
-	  patched by James M. Lawrence [ruby-core:35476] fixes #4489
-
-Thu Mar 10 16:00:22 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* parse.y (parser_encode_length): fix typo: the length of
-	  "-dos" and "-mac" is not 5 but 4.
-	  patched by James M. Lawrence [ruby-core:35476] fixes #4489
-
-Thu Mar 10 10:52:01 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_require.rb: setting too long string to ENV causes
-	  Errno::EINVAL on Windows.  long path name errors may causes over
-	  about 1024 bytes, then limit it about 4000 bytes.
-
-Thu Mar 10 10:09:35 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/test/unit.rb (Test::Unit::Runner::Worker#read): fix for the case
-	  when IO#read or IO#gets returns nil.
-
-Thu Mar 10 07:12:03 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/rubygems*: Import rubygems 1.6.2 (release candidate @ 2026fbb5)
-	* test/rubygems: Ditto
-	* test/runner.rb: Added test to load path to fix test requires.
-
-Thu Mar 10 03:00:43 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_ssl.c: parenthesize macro arguments.
-
-Wed Mar  9 23:51:26 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* test/ruby/test_io_m17n.rb (test_io_new_enc): "sjis" is now an alias
-	  of Windows-31J.
-
-Wed Mar  9 23:06:13 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-parse-partial): fix indent after aref.
-
-Wed Mar  9 12:50:24 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: Rescue exceptions when
-	  people implement the method method. Thanks Lin Jen-Shin.
-	  [ruby-core:35255]
-
-	* test/psych/visitors/test_yaml_tree.rb: test for implementation of
-	  method method.
-
-Wed Mar  9 11:53:31 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/shift_jis.c: Change SJIS as an alias of Windows-31J.
-	  [ruby-dev:43027] fixes #4280
-
-	* enc/shift_jis.c: Add PCK as an alias of Windows-31J.
-
-Wed Mar  9 00:45:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: nmake substitutes all occurrences in macro.
-
-	* ext/extmk.rb: workaround for nmake.
-
-Tue Mar  8 23:49:45 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (proc_setgroups): cleanup.
-
-Tue Mar  8 23:40:30 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/misc/test_ruby_mode.rb: test for ruby-mode.el.
-
-Tue Mar  8 23:27:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (get_sc_ngroups_max): try to use NGROUPS_MAX at first if
-	  _SC_NGROUP_MAX is not defined.
-
-Tue Mar  8 23:10:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-parse-partial): fix for array in block.
-
-Tue Mar  8 21:44:49 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_rand.c: parenthesize macro arguments.
-
-Tue Mar  8 16:45:31 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* hash.c (ruby_setenv): MSDN says that Windows XP or earlier limits
-	  the total size of environment block to 5,120 chars.  and on such
-	  OS, putenv() causes SEGV.  So, ruby should limit the size of an
-	  environment variable to 5,120 bytes for workaround.
-
-Tue Mar  8 15:57:20 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rubygems/test_gem_spec_fetcher.rb
-	  (TestGemSpecFetcher#test_cache_dir_escapes_windows_paths): cache_dir
-	  may have driveletter and `:' for base of cache_dir itself, so need
-	  to skip it for checking.
-
-Tue Mar  8 12:30:06 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-deep-indent-paren-p, ruby-calculate-indent):
-	  do not apply deep-indent inside parens at the beginning of
-	  expressions.
-
-Tue Mar  8 09:32:48 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (configure-ext, build-ext), ext/extmk.rb (extmake):
-	  support parallel-make under ext.
-
-Tue Mar  8 09:25:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_setgroups): use getgrnam() if getgrnam_r() is
-	  not available.
-
-	* process.c: RARRAY_LEN() returns long int.
-
-Tue Mar  8 09:07:03 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_REPLACE_TYPE): enclose in quotes for multiple
-	  type names.
-
-Tue Mar  8 01:43:11 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* process.c (get_sc_ngroups_max): define to wrap sysconf(3).
-	  this also supports Windows which doesn't have sysconf(3).
-
-	* process.c (maxgroups): use get_sc_ngroups_max.
-
-	* process.c (proc_setmaxgroups): ditto.
-
-Tue Mar  8 01:16:49 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* gc.c (rb_objspace): an initializer must be a constant.
-
-Tue Mar  8 01:11:44 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* process.c (maxgroups): cast because sysconf(3)'s return value is long.
-
-	* process.c (proc_setmaxgroups): ditto.
-
-	* process.c (proc_setgroups): cast because RARRAY_LEN() is long.
-
-Tue Mar  8 00:02:47 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_pkey_rsa.c: parenthesize macro arguments.
-
-Mon Mar  7 22:59:39 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/pstore.rb: Delete variable @transaction and fix #4474. Patch by
-	  Masaki Matsushita (Glass_saga).
-
-	* test/test_pstore.rb(test_thread_safe): Add test for #4474.
-
-Mon Mar  7 21:31:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (proc_setgroups): replace getgrnam() with getgrnam_r()
-	  because getgrnam() isn't thread safe.
-
-Mon Mar  7 20:49:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (proc_getmaxgroups, proc_setmaxgroups): reflect
-	  platform maxgroups limitation by default instead hardcoded 65536.
-
-Mon Mar  7 17:13:00 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc_set_params): allow GC parameter configuration by
-	  environment variables.  based on a patch from funny-falcon at
-	  https://gist.github.com/856296, but honors safe level.
-
-Mon Mar  7 09:05:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c: NUM2RLIM is defined but no getrlimit and setrlimit on
-	  mingw.
-
-Mon Mar  7 08:38:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_core.c (DateTimeData): should not use bare 'long long'
-	  and 'long double', which are not defined by C89.
-
-	* ext/date/date_core.c (dt_lite_plus): get rid of overflow at casting
-	  down double to integer.
-
-Mon Mar  7 00:21:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (proc_getgroups): get rid of maxgroups dependency.
-	  ngroups can be calculated dynamically.
-
-Sun Mar  6 23:45:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: rlim_t use standard RUBY_REPLACE_TYPE mechanism.
-
-Sun Mar  6 23:26:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (proc_setmaxgroups): added negative value check.
-	  This was suggested by Daniel Berger. Thanks Daniel!
-	  [ruby-core:35426][Bug#4467]
-
-Sun Mar  6 23:18:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (maxgroups, proc_setmaxgroups): increase max groups
-	  limitation up to 65536.
-
-Sun Mar  6 22:20:59 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_pkey_ec.c: parenthesize macro arguments.
-
-Sun Mar  6 21:49:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* sample/list.rb (MyElem#initialize): initialize @head
-	  explicitly. Otherwise -W2 option makes following warning.
-	  "warning: instance variable @head not initialized".
-	  This issue was founded by Andrew Grimm. Thanks Andrew!
-	  [ruby-core:35435][Bug#4471]
-
-Sun Mar  6 05:21:41 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* class.c: fix camelCase to snake_case in documentation code examples.
-	  patched by Andrew Grimm. fixes Bug #4469
-
-	* marshal.c: ditto.
-
-	* proc.c: ditto.
-
-	* sample/biorhythm.rb: ditto.
-
-	* vm_eval.c: ditto.
-
-	* vm_method.c: ditto.
-
-
-Sun Mar  6 03:22:27 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (io_cntl): use rb_thread_io_blocking_region() instead
-	  rb_thread_blocking_region().
-
-Sat Mar  5 22:54:36 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* include/ruby/intern.h: fix a typo of prototype declaration.
-	  rb_mutex_try_lock -> rb_mutex_trylock [ruby-dev:43213]
-
-Sat Mar  5 19:44:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_io.rb (TestIO#test_fcntl_lock): small clean up.
-
-Sat Mar  5 01:33:46 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (io_cntl, nogvl_io_cntl): IO.fcntl() and IO.ioctl()
-	  release GVL during calling kernel interface.
-	  Suggested by Eric Wong. [ruby-core:35417][Bug #4463]
-
-	* test/ruby/test_io.rb (TestIO#test_fcntl_lock): add new test for
-	  IO.fcntl().
-
-Fri Mar  4 23:09:12 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* test/testunit/test_parallel.rb
-	  (test_should_run_all_without_any_leaks): consider that the order of
-	  testcase could change. [ruby-dev:43300] [Bug #4466]
-
-Fri Mar  4 22:01:14 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (io_cntl): change 'cmd' type to int. ioctl and fcntl need to
-	  be passed int.
-	* io.c (rb_io_ctl): ditto.
-
-Fri Mar  4 21:10:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: save warnflags. the patch is created by Eric Wong.
-	  [Bug #4465]
-
-Wed Mar  2 21:15:00 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_pkey_dsa.c: parenthesize macro arguments.
-
-Thu Mar  3 22:10:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c (check_exec_redirect_fd, check_exec_redirect): raise
-	  ArgumentError if fd >= 3 on Windows because the feature is not
-	  supported.
-
-	* test/ruby/test_process.rb (test_execopts_redirect): remove meaningless
-	  argument.
-
-Thu Mar  3 21:21:42 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_process.rb (test_execopts_redirect): redirecting fd
-	  >= 3 is not supported on Windows, so should not specify such options
-	  when calling spawn or others.
-
-Thu Mar  3 18:59:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_slice_bang): raise error when the string is frozen.
-
-Thu Mar  3 14:25:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* strftime.c (STRFTIME): return 0 and ERANGE when precision is too
-	  large. [ruby-dev:43284] fixes #4456
-
-Thu Mar  3 00:46:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (uleb128): cast the value to unsigned long.
-
-	* addr2line.c (fill_lines): print error when lseek fails.
-
-Thu Mar  3 00:36:29 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/rexml/encoding.rb (REXML::Encoding#encoding=): store @encoding
-	  a String which means the name of the encoding.
-	  this partially revert r29646.
-
-	* lib/rexml/document.rb: follow above.
-
-	* lib/rexml/output.rb: ditto.
-
-	* lib/rexml/parsers/baseparser.rb: ditto.
-
-	* lib/rexml/source.rb: ditto.
-
-	* lib/rexml/xmldecl.rb: ditto.
-
-Wed Mar  2 23:19:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_byte_substr): return nil for negative length.
-
-Wed Mar  2 21:15:00 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_pkey_dh.c: parenthesize macro arguments.
-
-Wed Mar  2 14:24:04 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit/parallel.rb: Fix name from `inclement_io` to
-	  `increment_io`.
-
-Wed Mar  2 14:06:01 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_slice_bang): move treatments which is only needed
-	  when the result is not nil.
-
-Wed Mar  2 14:02:29 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/testunit/test_parallel.rb(TestParallel#spawn_runner):
-	  Fix outputing empty line in running test.
-
-	* test/testunit/tests_for_parallel/test_third.rb: Remove `sleep`
-
-Tue Mar  1 22:29:10 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_pkey.h: parenthesize macro arguments.
-
-Tue Mar  1 22:02:35 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit/parallel.rb: Fix number.
-
-Tue Mar  1 21:48:22 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit/parallel.rb: For Windows.
-
-	* test/testunit/test_parallel.rb(TestParallelWorker#test_quit_in_test):
-	  Fix for above specification change.
-	* test/testunit/test_parallel.rb(TestParallel#spawn_runner):
-	  Fix outputing empty line in running test.
-
-Tue Mar  1 20:51:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_system.rb (TestSystem#test_system_at):
-	  remove tests for [bug#4396]. because we decided to reject this
-	  ticket.
-
-Tue Mar  1 19:46:19 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/{test_date.rb,test_date_attr.rb}: [ruby-dev:43280]
-
-Tue Mar  1 18:40:38 2011  Ryan Davis  <ryan@YPCMC09457>
-
-	* lib/rubygems*: Import rubygems 1.6.0 (released version @ 58d8a0b9)
-	* test/rubygems: Ditto
-
-Tue Mar  1 16:22:22 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c: revert r30987 because it causes some failures in
-	  test-all, especially webrick.
-
-Tue Mar  1 15:59:53 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_byteslice): the resulted encoding should keep
-	  original encoding. this also fixes the encoding when the result
-	  shares internal string. [ruby-core:35376]
-
-Tue Mar  1 13:25:00 2011  Kenta Murata <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (VpMemAlloc): CVE-2011-0188.
-	  Fixes a bug reported by Drew Yao <ayao at apple.com>
-
-Tue Mar  1 10:34:39 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_byteslice): Add String#byteslice. [ruby-core:35376]
-
-Tue Mar  1 00:12:49 2011  Tajima Akio <artonx@yahoo.co.jp>
-
-	* include/ruby/win32.h: define WIN32 if neither _WIN64 nor WIN32
-	  defined. it forces to use push/pop for pack(4) pragma.
-
-Mon Feb 28 23:52:13 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* test/testunit/test_rake_integration.rb (test_with_rake_runner):
-	  use assert_in_out_err for suppress messages.
-
-Mon Feb 28 22:48:56 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/win32.c (rb_w32_spawn): use shell if a commandline contain
-	  double-quote character.
-	* win32/win32.c (is_internal_cmd): similar, use shell if a commandline
-	  contain caret character.
-
-	* test/ruby/test_system.rb (TestSystem#test_system_at): fix
-	  wrong test case. if system() invoke a command by using shell,
-	  system() never return nil. Also, "" quotation must not appear
-	  twice in a command line.
-
-Mon Feb 28 17:36:57 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_pkcs7.c: parenthesize macro arguments.
-
-Mon Feb 28 16:48:42 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_pkcs12.c: parenthesize macro arguments.
-
-Mon Feb 28 16:28:15 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (tr_trans): when the hash for multibyte repl is empty,
-	  tr is inverse mode, and a character doesn't much the table, the
-	  character should be replaced by last replacement. Bug #4449
-
-Mon Feb 28 16:38:56 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_ocsp.c: parenthesize macro arguments.
-
-Mon Feb 28 13:02:15 2011  Danial Pearce <github@tigris.id.au>
-
-	* lib/tempfile.rb: Fix example file paths in docs for tempfile.
-	  https://github.com/ruby/ruby/pull/5
-
-Mon Feb 28 12:56:18 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_init): typo fix.
-	  https://github.com/ruby/ruby/pull/8
-
-Mon Feb 28 12:28:13 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/date/date_core.c (datetime_s_now): localtime() and localtime_r()
-	  required time_t pointer as 1st parameter, and tv_sec member of struct
-	  timeval is long.
-
-Mon Feb 28 11:57:40 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/testunit/test_parallel.rb: Temporally disable test on Windows.
-
-Mon Feb 28 07:28:35 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb(Test::Unit::Runner#after_worker_quit):
-	  method name more be natural English.
-
-	* lib/test/unit.rb(Test::Unit::Runner::Worker.launch):
-	  IO.sync doesn't need. Should use "b" for mode.
-
-Sun Feb 27 21:59:37 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_system.rb (TestSystem#test_system_redirect_win):
-	  add test for system().
-
-Sun Feb 27 18:00:09 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb: Refactoring; Worker never use Hash for internal
-	  storage.
-
-	* lib/test/unit.rb: Never use Kernel#spawn. Use IO.popen instead.
-
-Sun Feb 27 13:16:48 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_ns_spki.c: parenthesize macro arguments.
-
-Sat Feb 26 17:07:53 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb: [Feature #4257]
-
-	* ext/date/extconf.rb: new
-
-	* ext/date/date_core.c: new
-
-Sat Feb 26 16:10:23 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb: --jobs-status won't puts over 2 lines.
-
-	* test/testunit/test_parallel.rb: Fix test for above.
-
-	* lib/test/*: refactoring.
-
-Sat Feb 26 07:10:05 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/scalar_scanner.rb: fix parsing timezone's whose
-	  whose format is (+/-)hhmm.  Thanks Goncalo Silva!
-
-	* test/psych/test_scalar_scanner.rb: test for bug.
-
-Thu Feb 24 23:02:55 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_hmac.c: parenthesize macro arguments.
-
-Thu Feb 24 22:53:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (love): for the birthday.
-
-Thu Feb 24 22:51:54 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (ruby_vm_destruct): run vm exit hooks after all objects are
-	  destructed.
-
-Thu Feb 24 14:40:33 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* ChangeLog (vim): Modeline for vim
-
-Thu Feb 24 13:39:25 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* common.mk: Use $RUNRUBY for worker process.
-
-	* lib/test/unit.rb: Fix bug.
-
-	* lib/test/unit.rb: @options[:ruby](@opts[:ruby]) is now Array.
-
-	* test/testunit/parallel.rb: Fix for above.
-
-Thu Feb 24 10:05:55 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/testunit/tests_for_parallel/misc.rb: Fix bug in r30947.
-
-	* lib/test/unit.rb, lib/test/unit/assertions.rb: For this test.
-
-Wed Feb 23 23:07:38 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/testunit/test_parallel.rb, test/testunit/parallel/*:
-	  Test for r30939.
-
-	* lib/test/unit.rb: For test.
-
-	* lib/test/parallel.rb: For test.
-
-	* lib/test/unit/testcase.rb: For test.
-
-Wed Feb 23 22:05:13 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_engine.c: parenthesize macro arguments.
-
-Tue Feb 22 23:15:17 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb: Fix --ruby option doesn't effect.
-
-	* lib/test/unit.rb: Fix typo.
-
-Tue Feb 22 21:39:28 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_digest.c: parenthesize macro arguments.
-
-Tue Feb 22 14:34:26 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb: Fix merging miss.
-
-Tue Feb 22 12:27:26 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb: Add new options; --jobs,-j,--ruby,--jobs-status,
-	  --no-retry.
-	  [Feature #4415] [ruby-dev:43226],[ruby-dev:43222],[ruby-core:35294]
-
-	* lib/test/unit/parallel.rb: Used at test/unit --jobs(-j) option.
-
-	* test/csv/test_serialization.rb: test/unit parallel running ready.
-
-	* test/rake/test_file_task.rb: test/unit parallel running ready.
-
-Tue Feb 22 06:09:10 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/syslog/syslog.c: Apply documentation patch from mathew murphy.
-	  [Bug #4149]
-
-Tue Feb 22 03:09:10 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych.rb: increase Psych to 1.1.0 for help with
-	  debugging.
-
-Tue Feb 22 03:04:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/streaming.rb: refactor streaming methods to a
-	  module.
-	* ext/psych/lib/psych/stream.rb: extracted streaming specific methods
-	  to a module.
-	* ext/psych/lib/psych/json/stream.rb: JSON stream inherits from
-	  JSONTree and includes streaming methods.
-	* ext/psych/lib/psych/visitors/json_tree.rb: JSON does not support
-	  object references, so remove object reference testing when building
-	  JSON trees.
-
-Tue Feb 22 02:41:51 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb (accept): use Hash#key?
-	  when looking up object references to err on the side of cache
-	  misses.
-
-Mon Feb 21 10:58:39 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/json/yaml_events.rb: refactoring JSON event
-	  handling methods to a module for reuse.
-	* ext/psych/lib/psych/json/tree_builder.rb: AST builder uses JSON
-	  event methods.
-	* ext/psych/lib/psych/json/stream.rb: stream emitter uses JSON event
-	  methods.
-
-Mon Feb 21 10:54:29 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/json/stream.rb: do not emit custom tags in maps
-	  or sequences when emitting JSON.
-	* ext/psych/lib/psych/json/tree_builder.rb: do not emit custom tags in
-	  sequences when emitting JSON.
-	* test/psych/json/test_stream.rb: tests for custom stream emits.
-	* test/psych/test_json_tree.rb: tests for JSON emits.
-
-Mon Feb 21 10:05:10 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/json/ruby_events.rb: DRY up ruby event handling
-	  for JSON.
-	* ext/psych/lib/psych/visitors/json_tree.rb: use ruby events module
-	* ext/psych/lib/psych/json/stream.rb: ditto
-
-Mon Feb 21 10:01:01 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/json/stream.rb: fix JSON stream emits to use
-	  double quotes during stream.
-	* test/psych/json/test_stream.rb: tests to reflect changes.
-
-Mon Feb 21 00:38:56 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_system.rb (TestSystem#test_system_at):
-	  add testcase for bug4396.
-
-Sun Feb 20 19:59:32 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_cipher.c: parenthesize macro arguments.
-
-Sun Feb 20 16:26:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (exec_recursive): prevent temporary objects from GC.
-
-	* prevent temporary objects from GC, and should not use
-	  RSTRING_PTR() for function calls since it evaluates the argument
-	  a couple of times.
-
-Sun Feb 20 16:22:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_flock): use rb_thread_io_blocking_region for the
-	  time being.
-
-Sun Feb 20 05:33:17 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/minitest/*.rb: Imported minitest 2.0.2 r6207.
-	* test/minitest/*: ditto
-
-Sun Feb 20 02:14:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* signal.c (sig_trap): avoid pthread_sigmask(xx, &mask, &mask) usage
-	  because FreeBSD don't permit it. If it's used, it behave as
-	  pthread_sigmask(xx, NULL, &mask).
-
-	* signal.c (init_sigchld): ditto.
-
-Sun Feb 20 00:46:51 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_bn.c: parenthesize macro arguments.
-
-Sat Feb 19 22:37:42 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* vm_insnhelper.c (vm_check_if_namespace): guard temporary object
-	  from GC.
-
-Sat Feb 19 06:36:27 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/test/unit.rb: partial revert of r30849. [ruby-core:32864]
-
-	* test/testunit/test_rake_integration.rb: adding an integration test
-	  with the rake loader to prevent regressions.
-
-Fri Feb 18 19:31:31 2011  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils::remove_entry_secure): there is a
-	  race condition in the case where the given path is a directory,
-	  and some other user can move that directory, and create a
-	  symlink while this method is executing.
-	  Reported by: Nicholas Jefferson <nicholas at pythonic.com.au>
-
-Fri Feb 18 00:28:39 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* compile.c (get_exception_sym2type): guard temporary object from GC.
-
-Thu Feb 17 23:54:29 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* iseq.c (prepare_iseq_build): initialize iseq_compile_data::err_info
-	  with nil. this fix exception in rb_iseq_load().
-
-Thu Feb 17 22:32:35 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* test/ruby/test_marshal.rb (test_marshal_dump_extra_iv):
-	  fix a typo of local variable. [Bug #3720] [ruby-dev:42083]
-
-Thu Feb 17 21:32:53 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl.h: parenthesize macro arguments.
-
-Wed Feb 16 20:37:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* eval_jump.c (rb_exec_end_proc): changed at_exit and END proc
-	  evaluation order. [Bug #4400] [ruby-core:35237]
-	* eval_jump.c (rb_mark_end_proc): ditto.
-
-	* test/ruby/test_beginendblock.rb (TestBeginEndBlock#test_nested_at_exit):
-	  added a test for nested at_exit.
-	* test/ruby/test_beginendblock.rb (TestBeginEndBlock#test_beginendblock):
-	  changed the test to adopt new spec.
-
-Wed Feb 16 20:17:06 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/openssl_missing.h: parenthesize macro arguments.
-
-Tue Feb 15 21:37:45 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/gdbm/gdbm.c: parenthesize macro arguments.
-
-Tue Feb 15 20:34:53 2011  Tanaka Akira  <akr@fsij.org>
-
-	* array.c (ary_join_1): fix array size.
-
-Tue Feb 15 19:43:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: fix and resubmit r30621. [ruby-dev:43203]
-
-Tue Feb 15 15:41:30 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (array_join): copy the encoding of the first element as
-	  an initial encoding.
-
-	* array.c (array_join_0): ditto.
-
-	* array.c (array_join_1): ditto.
-
-	* array.c (inspect_ary): ditto.
-
-	* array.c (array_join_1): add an argument to check the appending is
-	  first one or not.
-
-Tue Feb 15 15:40:53 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* hash.c (inspect_i): copy the encoding of the first key as
-	  an initial encoding.
-
-Mon Feb 14 15:00:16 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (inspect_ary): don't taint the inspected result of a
-	  recursive array.
-
-Tue Feb 15 15:43:29 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (rb_enc_compatible): change the rule for empty strings:
-	  remove the special treatment of the US-ASCII encoded empty string.
-	  Now Encoding.compatible? usually respect the encoding of the
-	  receiver.
-
-Tue Feb 15 15:39:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_enc_cr_str_buf_cat): remove special treatment of
-	  ASCII-8BIT receivers.
-
-	* string.c (str_gsub): set initial encoding of the buffer as the
-	  same of the receiver. [ruby-core:35141]
-
-Tue Feb 15 09:49:33 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_system.rb (TestSystem#test_system_at): use findstr
-	  command instead of find command, because the latter is confusing
-	  another famous Unix command.
-
-Mon Feb 14 23:01:19 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* thread.c (rb_thread_io_blocking_region): reset th->waiting_fd
-	  after blocking region, because remaining waiting_fd might
-	  cause unnecessary IOError.
-
-Mon Feb 14 21:06:50 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* configure.in: revert r30621.  That revision introduced mkmf test
-	  failures and it turned out to be OK to revert. [ruby-dev:43203]
-
-Mon Feb 14 21:04:01 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/fiddle/conversions.h: parenthesize macro arguments.
-
-Mon Feb 14 18:41:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/setup.mak (USE_RUBYGEMS): fixed r30835. It didn't work on
-	  mswin32 port. If you changed win32/configure.bat, you should change
-	  setup.mak too.
-
-Mon Feb 14 17:28:34 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_system.rb (TestSystem#test_system_at):
-	  added test. [ruby-core:35218] (#4393)
-
-Mon Feb 14 13:15:35 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (is_internal_cmd): if the first char of prog is '@',
-	  execute it via shell.  [ruby-core:35218] (#4393)
-
-Mon Feb 14 10:33:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/test/unit.rb: revert r30863, because it causes too many noise.
-
-Mon Feb 14 07:34:55 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/curses/curses.c: parenthesize macro arguments.
-
-Sun Feb 13 19:41:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb (Test::Unit::RequireFiles#non_options): skip
-	  test suites failed to load instead of mere messages.
-
-Sun Feb 13 09:56:44 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/openssl/test_config.rb (OpenSSL#test_freeze): fix error
-	  message assertion.
-
-	* test/io/nonblock/test_flush.rb (TestIONonblock#flush_test):
-	  return true to finish the test.
-
-	* test/syck/test_string.rb (Syck::TestString#test_non_binary_string):
-	  use assert_not instead of refute, unless required minitest
-	  explicitly.
-
-	* test/test_prime.rb (TestPrime::sieve.Integer): ditto.
-
-	* test/xmlrpc/webrick_testing.rb (WEBrick_Testing#start_server):
-	  catch IOError when server socket was closed.
-
-Sun Feb 13 07:39:51 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_inject): typo fixed. a patch from Gaku Ueda in
-	  [ruby-core:35216].
-
-Sun Feb 13 00:48:47 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (Date#===): [ruby-core:35127]
-
-Sun Feb 13 00:29:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb (Test::Unit::Options#process_args): always
-	  return options.
-
-	* lib/test/unit.rb (Test::Unit::RequireFiles#non_options): return
-	  if any test case get loaded.
-
-	* lib/test/unit.rb (Test::Unit::AutoRunner#initialize): do not add
-	  default directory if it is nil.
-
-	* lib/test/unit.rb (Test::Unit::AutoRunner#process_args): return
-	  true if any test cases to run.
-
-Sat Feb 12 23:17:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb (assert_include): add alias.
-
-Sat Feb 12 14:44:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_io_blocking_region): new function to run
-	  blocking region with GIL released, for fd.
-
-	* thread.c (rb_thread_fd_close): implement.  [ruby-core:35203]
-
-	* vm.c (th_init): rename from th_init2.
-
-Sat Feb 12 14:41:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb (Test::Unit::AutoRunner#initialize): use
-	  default_dir if no test case given.
-
-	* lib/test/unit.rb (Test::Unit::Runner): rename from Test::Unit::Mini.
-
-	* lib/test/unit.rb (Test::Unit::GlobOption#non_options): run tests
-	  under base directory if no argument given.
-
-Sat Feb 12 08:03:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_settracefunc.rb (TestSetTraceFunc): ensure to use
-	  method_added hook defined in Module.
-
-Sat Feb 12 01:04:02 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options): enable rubygems if --gem option is given.
-
-	* ruby.c (process_options): load rubygems if it is disabled but
-	  --gem option is given.
-
-Fri Feb 11 23:27:50 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* ruby.c (proc_options): add --gem=enabled as an alias of
-	  --enable=gems and --gem=disabled as an alias of --disable=gems.
-	  Gem named "enabled" or "disabled" has already been reserved
-	  legitimately for this purpose.
-
-Fri Feb 11 23:17:04 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/dl/cfunc.c: parenthesize macro arguments.
-
-Fri Feb 11 21:41:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bin/testrb, test/runner.rb, lib/test/unit.rb: improve backward
-	  compatibility.
-
-Fri Feb 11 19:45:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ruby_cleanup): use rb_ary_free to free internal object.
-
-	* gc.h (RUBY_FREE_UNLESS_NULL): get rid of double free.
-	  [ruby-core:35192]
-
-Fri Feb 11 16:57:03 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_transcode.rb (test_from_cp50221): fix wrong
-	  assertion and move back.
-
-Fri Feb 11 14:33:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb (assert_no_match): alias for
-	  backward compatibility.
-
-Fri Feb 11 12:06:48 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (add_gems, require_libraries, proc_options): add
-	  --require and --gem options.
-
-Fri Feb 11 12:03:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rubygems): add --disable-rubygems option.
-
-Fri Feb 11 11:39:03 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/fake.rb.in (CROSS_COMPILING): get rid of NameError.
-
-Thu Feb 10 23:12:34 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/dl/dl.h: parenthesize macro arguments.
-
-Wed Feb  9 23:11:27 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pty/pty.c: parenthesize macro arguments.
-
-Tue Feb  8 11:47:11 2011  Loren Sands-Ramshaw  <lorensr@gmail.com>
-
-	* array.c: documentation clarification in rotate, rotate!,
-	  index, and rindex. [ruby-core:35144]
-
-Wed Feb  9 09:45:43 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rdoc/test_rdoc_encoding.rb: remove unnecessary (and wrong)
-	  platform-dependent hacks.
-
-Wed Feb  9 00:47:18 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/etc/etc.c: parenthesize macro arguments.
-
-Tue Feb  8 19:38:00 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-expr-beg): fix for invalid nest errors.
-
-Tue Feb  8 19:22:59 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in (AC_MSG_CHECKING): fixed typo. the patch is
-	  created by Benoit Daloze. Thanks a lot. [Bug #4384][ruby-core:35148]
-
-Tue Feb  8 16:04:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_io_s_sysopen): use NUM2MODET() instead NUM2UINT().
-
-Tue Feb  8 15:59:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (rb_run_exec_options_err): use MODET2NUM() instead
-	  LONG2NUM().
-
-Tue Feb  8 13:59:56 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: revert r30725. Now we have proper runtime fallback.
-	  Therefore, no need compile time disabling. (see r30762).
-
-Tue Feb  8 01:00:21 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* process.c (proc_setgroups): add GC guard to prevent intermediate
-	  variable from GC.
-
-Tue Feb  8 00:56:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-expr-beg, ruby-in-here-doc-p): tell
-	  singleton class definitions from here documents.
-
-	* misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial): keyword
-	  followed by colon is label.
-
-Mon Feb  7 22:56:16 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of
-	  Object#tap to restore STDOUT.sync.
-
-Mon Feb  7 22:34:20 2011  Tanaka Akira  <akr@fsij.org>
-
-	* lib/net/http.rb (Net::HTTP#connect): support SNI (Server Name
-	  Indication) for HTTPS.  [ruby-dev:43164]
-	  http://stackoverflow.com/questions/4685736/openssl-server-name-indication-support-in-ruby
-
-Mon Feb  7 16:05:32 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc: Upgrade to RDoc 3.5.3  Fixes [Bug #4376]
-
-Mon Feb  7 11:46:59 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (rdoc): add --encoding=UTF-8; ruby's rdoc must be UTF-8.
-
-Mon Feb  7 10:21:50 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rdoc/test_rdoc_options.rb (TestRDocOptions#test_check_files):
-	  there is no easy way to create owner unreadable file on Windows.
-	  So, skip the test.
-
-Sun Feb  6 13:48:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/lib/json/common.rb (JSON::MissingUnicodeSupport.iconv):
-	  should not drop rest of the result.  use Iconv.conv instead.
-
-Sun Feb  6 12:46:02 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* string.c (gsub): Ensure result encoding is the same as input
-	  encoding.  [Bug #4340].
-
-Sun Feb  6 12:18:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (words, qwords): dispatch array events.  based on a
-	  patch from Michael Edgar.  [Bug #4365].
-
-Sun Feb  6 12:12:59 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/fileutils/fileasserts.rb (FileAssertions): separate module.
-
-Sun Feb  6 11:29:23 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/dbm/dbm.c: parenthesize macro arguments.
-
-Sat Feb  5 22:01:59 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
-	  revert r30796. r30797 and r30798 are an alternative fix.
-	  [ruby-dev:43174]
-
-Sat Feb  5 21:47:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (mlhs_basic): include mlhs_post for ripper.  a patch
-	  from Michael Edgar at [ruby-core:35078].
-
-Sat Feb  5 21:22:21 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb (assert_block): move from
-	  test/fileutils/fileasserts.rb.
-
-	* test/fileutils/fileasserts.rb (assert_block): pass arguments
-	  as-is.  [ruby-dev:43174]
-
-Sat Feb  5 16:47:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
-	  msg can be passed nil. [Bug #4371] [ruby-dev:43174]
-
-Sat Feb  5 15:18:25 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc: Upgrade to RDoc 3.5.2
-
-Sat Feb  5 12:05:27 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_node_init_copy): SyckNode is not
-	  copiable.  [ruby-core:35094]
-
-Sat Feb  5 11:48:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_alloc): leave data ptr
-	  NULL.
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_new, ossl_cipher_initialize):
-	  allocate internal structure.  [ruby-core:35094]
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_copy): ditto.
-
-Sat Feb  5 11:29:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/parser/parser.h (GET_PARSER): raise TypeError.
-
-	* ext/json/parser/parser.rl (cParser_initialize): ditto.
-
-	* ext/json/parser/parser.h (GET_PARSER): check if initialized.
-	  [ruby-core:35079]
-
-	* ext/json/parser/parser.rl (cParser_initialize): ditto.
-
-Sat Feb  5 10:09:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_get_expanded_load_path): always expand load paths.
-
-Sat Feb  5 09:38:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (encoded_dup): extract.
-
-Sat Feb  5 03:37:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils::LowMethods): make low level methods
-	  in NoWrite and DryRun to do nothing.  [ruby-dev:43129]
-
-	* test/fileutils/fileasserts.rb: add message arguments.
-
-	* test/fileutils/fileasserts.rb (Test::Unit::Assertions#assert_block):
-	  show the given message.
-
-Sat Feb  5 02:09:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (lex_getline, parser_set_encode): set encoding of lines
-	  in SCRIPT_LINES__ as source encoding.  [ruby-dev:43168]
-
-Sat Feb  5 02:08:37 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (ruby_thread_data_type): add prefix.
-
-Sat Feb  5 00:59:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_core.h (GetThreadPtr): use TypedData_Get_Struct() instead
-	  CoreDataFromValue() because we need type check. Otherwise,
-	  type mismatch can cause segmentation fault crash.
-	  [ruby-core:35086] [Ruby 1.9-Bug#4367]
-
-	* vm.c (thread_data_type): remove static.
-
-Fri Feb  4 19:14:27 2011  Tanaka Akira  <akr@fsij.org>
-
-	* enc/trans/utf8_mac.trans: parenthesize macro arguments.
-
-Fri Feb  4 12:11:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* string.c (str_utf8_nth): fixed a condition of optimized lead
-	  byte counting. [Bug #4366][ruby-dev:43170]
-
-Fri Feb  4 01:50:13 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* string.c (count_utf8_lead_bytes_with_word): wrote function
-	  comments.
-
-Fri Feb  4 00:14:55 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/zlib/zlib.c (gzfile_reader_get_unused): no need to dup
-	  before rb_str_resurrect.
-
-Thu Feb  3 20:04:44 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/curses/curses.c (CHECK): unused macro removed.
-
-Thu Feb  3 18:33:26 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_resurrect
-	  because gz->z.input is hidden string. [ruby-core:35057]
-
-Thu Feb  3 16:34:10 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/shift_jis.c (code_to_mbc): cast as int from the subtraction of
-	  pointers.
-
-	* enc/utf_16le.c (utf16le_mbc_enc_len): use ptrdiff_t.
-
-	* enc/utf_32be.c (utf32be_left_adjust_char_head): ditto.
-
-	* enc/utf_32le.c (utf32le_left_adjust_char_head): ditto.
-
-Thu Feb  3 16:31:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/missing.h: don't use HAVE_STDDEF_H because it never
-	  defined by configure though configure.bat defines it.
-
-	* include/ruby/ruby.h: move include stddef.h to defines.h
-
-	* include/ruby/defines.h: ditto.
-
-Wed Feb  2 20:25:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/encoding.h (rb_enc_step_back): cast 4th argument 'n'
-	  as int because Ruby usually treats length value as long but
-	  onigenc_step_back's 4th argument is int.
-
-Thu Feb  3 07:20:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: use Regexp::NOENCODING
-	  rather than magic number.
-
-	* ext/syck/lib/syck/rubytypes.rb: ditto
-
-Thu Feb  3 07:16:11 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* re.c (Init_Regexp): added a constant for ARG_ENCODING_NONE
-	  [ruby-core:35054]
-
-	* test/ruby/test_regexp.rb: corresponding test.
-
-Thu Feb  3 07:02:16 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: ARG_ENCODING_NONE regular
-	  expressions can round trip. [ruby-core:34969]
-
-	* test/psych/test_yaml.rb: test for ARG_ENCODING_NONE regex
-
-	* ext/sych/lib/syck/rubytypes.rb: ARG_ENCODING_NONE regular
-	  expressions can round trip.
-
-	* test/syck/test_yaml.rb: test for ARG_ENCODING_NONE regex
-
-Wed Feb  2 17:09:22 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_io_fdatasync): Use fsync(2) if the underlying
-	  operating system does not support fdatasync(2).
-
-Wed Feb  2 14:51:08 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/markup/to_tt_only.rb: commit miss
-	* test/rdoc/test_rdoc_markup_to_tt_only.rb: ditto
-	* test/rdoc/test_rdoc_single_class.rb: ditto
-
-Wed Feb  2 09:27:53 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc: Upgrade to RDoc 3.5.1
-
-Wed Feb  2 00:30:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/st.h (st_table): Added comment why we need __extension__.
-
-Tue Feb  1 20:45:44 2011  Tanaka Akira  <akr@fsij.org>
-
-	* enc/encdb.c: parenthesize macro arguments.
-
-Tue Feb  1 15:12:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_require.rb (TestRequire#test_require_with_unc):
-	  use ``127.0.0.1'' instead of ``localhost'' as host name, because
-	  XP or earlier cannot resolv it as NBT hostname.
-
-Tue Feb  1 13:20:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/benchmark/test_benchmark.rb (#capture_bench_output):
-	  Added explicit sleep. Windows have imprecise time support.
-	  Thus Tms.new.Add!{} may be or may be not equal 0. The
-	  test failure started since r30747.
-
-Tue Feb  1 11:03:47 2011  Ryan Davis  <ryan@lust.local>
-
-	* lib/rubygems*: Import rubygems 1.5.0 (released version @ 1fb59d0)
-	* test/rubygems: Ditto
-
-Tue Feb  1 08:01:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (console_set_winsize): new method to set
-	  console size.  [EXPERIMENTAL]
-
-	* ext/io/console/console.c (console_winsize): use GetWriteFD.
-
-Tue Feb  1 02:28:14 2011  Masaya Tarui  <tarui@ruby-lnag.org>
-
-	* include/ruby/win32.h, win32/win32.c: add rb_w32_inet_ntop.
-	  inet_ntop's minimum supported client is Vista.
-
-Tue Feb  1 00:10:30 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/benchmark.rb: fix benchmark to work with current ruby.
-	  patched by Benoit Daloze [ruby-core:33846] [ruby-dev:43143]
-	  merged from https://github.com/eregon/ruby/commits/benchmark
-
-	*  lib/benchmark (Report#width): update documentation
-	*  lib/benchmark: document the return value of #benchmark and the
-	   :list attribute in Report
-	*  lib/benchmark (Tms#format): rename variables, use String#%
-	   instead of Kernel.format
-	*  lib/benchmark: remove undocumented Benchmark::times (an alias
-	   of Process::times used twice)
-	*  lib/benchmark (#benchmark): use label_width for the caption
-	*  lib/benchmark (Tms#initialize): rename variables
-	*  lib/benchmark: allow title to not be a String and call #to_s
-	*  lib/benchmark (Benchmark#bm): return an Array of the times with
-	   the labels
-	*  lib/benchmark: correct output for Benchmark#bmbm
-	   (remove the extra space)
-	*  lib/benchmark: add a few tests for Benchmark::Tms output
-	*  lib/benchmark: improve style (enumerators, ljust, unused vars)
-	*  lib/benchmark: add spec about output and return value
-	*  lib/benchmark: improve basic style and consistency
-	   no parenthesis for print and use interpolation instead of printf
-	*  lib/benchmark: remove unnecessary conversions and variables
-	*  lib/benchmark: correct indentation
-	*  lib/benchmark: rename the FMTSTR constant and variable to FORMAT
-	*  lib/benchmark: remove useless exception
-
-	*  test/benchmark: remove unused variable warnings
-
-Mon Jan 31 23:27:23 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* node.c (add_id): remove duplicated rb_id2str() call.
-
-Sun Jan 30 17:19:46 2011  Tanaka Akira  <akr@fsij.org>
-
-	* missing/langinfo.c: parenthesize macro arguments.
-
-Mon Jan 31 21:57:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: revert r30698.
-
-Mon Jan 31 21:32:44 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* thread.c (thread_start_func_2): check deadlock condition before
-	  release thread stack. fix memory violation when deadlock detected.
-	  reported by Max Aller. [Bug #4009] [ruby-core:32982]
-
-Mon Jan 31 14:45:47 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* lib/irb/locale.rb (IRB::Locale::#search_file):
-	  Gem might be undefined if --disable-gems. [ruby-core:34990]
-
-Mon Jan 31 12:26:14 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c: suppressed shorten-64-to-32 warnings.
-	* regcomp.c: ditto.
-	* regexec.c: ditto.
-	* regint.h: ditto.
-	* regparse.c: ditto.
-	* regparse.h: ditto.
-	* time.c: ditto.
-	* variable.c: ditto.
-
-Mon Jan 31 04:45:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before
-	  ary_resize_capa because ary_resize_capa expects resized length is
-	  smaller than current array length. call rb_ary_unshare before
-	  ary_resize_capa because ary_resize_capa lost the reference to
-	  original shared array. [ruby-core:34997]
-
-Sun Jan 30 17:19:46 2011  Tanaka Akira  <akr@fsij.org>
-
-	* missing/crypt.c: parenthesize macro arguments.
-
-Sun Jan 30 16:40:27 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/rubygems/test_gem_security.rb (TestGemSecurity): valid only
-	  if OpenSSL is available.
-
-	* test/dl/test_dl2.rb (TestDL#test_sin): math functions do not
-	  work on x86_64 due to the design of DL2.
-
-	* test/dl/test_func.rb (DL::TestFunc#test_{sinf,sin): ditto.
-
-Sun Jan 30 16:09:22 2011  Tanaka Akira  <akr@fsij.org>
-
-	* strftime.c (rb_strftime_with_timespec): %G produces 4 digits.
-
-Sun Jan 30 15:13:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/emacs_mule.c (emacsmule_islead): 7bit range is also leading
-	  byte.
-
-Sun Jan 30 13:03:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_fetch_m): use useful message for longer key, not a
-	  nonsense id value.
-
-	* string.c (rb_str_ellipsize): new function to ellipsize a string.
-
-	* include/ruby/encoding.h (rb_enc_step_back): new function to step
-	  back n characters.
-
-Sun Jan 30 12:53:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/emacs_mule.c (emacsmule_islead): fix inverse condition.
-
-Sun Jan 30 09:37:25 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
-
-	* io.c (struct argf): char behaves like an unsigned char
-	  by default on AIX.
-
-Sun Jan 30 08:02:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: Mac OS X wrongly reports it has fdatasync(3).
-
-Sun Jan 30 03:29:47 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_bn.c (GetBNPtr): add missing nil case.
-	  patched by Martin Bosslet. [ruby-core:34987]
-
-Sun Jan 30 01:02:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/ruby.h: Added NUM2MODET() and MODET2NUM() default
-	  definition.
-	  Because r30686 introduced win32 build failure.
-
-Sat Jan 29 22:16:26 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (rb_ary_join): [].join.encoding must be US-ASCII.
-	  [ruby-list:47790]
-
-Sat Jan 29 20:22:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/driver.rb (BenchmarkDriver#measure): Show command line
-	  when abnormal exiting occur.
-
-Sat Jan 29 10:53:16 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* vm_insnhelper.c (vm_get_ev_const): no-scope reference to toplevel
-	  private constant has been prohibited incorrectly.
-
-	* test/ruby/test_module.rb (test_toplevel_private_constant): add a
-	  test for above.
-
-Sat Jan 29 08:43:23 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/rubygems*: Import rubygems 1.5.0 (release candidate @ 09893d9)
-	* test/rubygems: Ditto
-
-Sat Jan 29 02:02:37 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* variable.c (rb_mod_const_of, sv_i): Module#constant should exclude
-	  private constants.  see [ruby-core:32912].
-
-	* test/ruby/test_module.rb (test_constants_with_private_constant): add
-	  a test for above.
-
-Sat Jan 29 01:36:41 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* variable.c (rb_const_set): const_set should preserve constant
-	  visibility.  see [ruby-core:32912].
-
-	* test/ruby/test_module.rb: add a test for above.
-
-Sat Jan 29 01:24:57 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* compile.c (NODE_CLASS, NODE_MODULE), insns.def (defineclass): raise
-	  an exception when "class Foo::Bar" is evaluated and Foo::Bar is
-	  private.  To implement this, define_type of "defineclass" is added
-	  so that the instruction can distinguish whether the class definition
-	  is scoped (class Foo::Bar) or not (class Bar).
-
-	* test/ruby/test_class.rb (test_redefine_private_class),
-	  test/ruby/test_module.rb
-	  (test_define_module_under_private_constant): add tests for above.
-
-Sat Jan 29 01:19:17 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* constant.h, variable.c: to ensure compatibility, rb_const_get_* must
-	  not raise an exception even when the constant is private.  Instead,
-	  rb_public_const_get_* and rb_public_const_defined_* are introduced,
-	  which raise an exception when the referring constant is private.
-	  see [ruby-core:32912].
-
-	* vm_insnhelper.c (vm_get_ev_const): use rb_public_const_get_* instead
-	  of rb_const_get_* to follow the constant visibility when user code
-	  refers a constant.
-
-	* test/ruby/test_marshal.rb (test_marshal_private_class): add a test.
-	  This test had failed because of incompatibility of rb_const_get.
-
-Sat Jan 29 00:30:44 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* variable.c (set_const_visibility): fix typo.  a patch from Tomoyuki
-	  Chikanaga in [ruby-core:32919].
-
-Fri Jan 28 23:20:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create,
-	  TestGDBM2#test_writer_open_notexist): We only need to skip libgdbm
-	  1.8.0, not all 1.8.x. 1.8.1 or later don't have GDBM_WRITER sickness.
-
-Fri Jan 28 21:56:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/dbm/extconf.rb: Added new header places for Fedora13.
-
-Fri Jan 28 21:49:30 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/zlib/zlib.c: parenthesize macro arguments.
-
-Fri Jan 28 17:47:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/gdbm/test_gdbm.rb (TestGDBM2#test_writer_open_notexist):
-	  gdbm 1.8.x changed GDBM::WRITER behavior. Thus our testcase need
-	  to be changed too.
-
-Fri Jan 28 17:33:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create): skip
-	  the test if gdbm version is 1.8.x.
-
-Fri Jan 28 16:30:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_require.rb (TestRequire#test_require_too_long_filename):
-	  Added -w option because too long path error don't output a message
-	  by default since r30660. [Bug #4336] [ruby-dev:43134]
-
-Fri Jan 28 16:19:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_require.rb (TestRequire#test_require_path_home_{1,2}):
-	  Added -w option because too long path error don't output a message
-	  by default since r30660. [Bug #4336] [ruby-dev:43134]
-
-Fri Jan 28 16:04:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_require.rb (TestRequire#test_require_path_home_{1,2,3}):
-	  split from test_require_path_home.
-
-Fri Jan 28 13:04:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in (--with-valgrind): Fixed r29683. Now this option
-	  is really default on.
-
-Fri Jan 28 12:05:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: Add #include<sys/stat.h> when struct stat is
-	  tested. Otherwise, incomplete type dereference error will occur.
-
-Fri Jan 28 11:53:19 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: redundant variable names made strange conftest
-	  error. Fixed it.
-
-Fri Jan 28 11:47:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_process.rb (TestProcess#test_too_long_path{,2}):
-	  should handle Errno::E2BIG, because this test checks crash of ruby,
-	  not the error type system.
-
-Fri Jan 28 11:23:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_io_open): Use NUM2MODET() instead NUM2UINT().
-	* io.c (rb_scan_open_args): ditto.
-
-Fri Jan 28 10:58:20 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: Added mode_t type checking.
-	* process.c (rb_exec_arg_addopt): Use NUM2MODET() instead
-	  NUM2LONG because clang makes compile error by this narrowing
-	  conversion.
-	* process.c (rb_run_exec_options_err): ditto.
-
-Fri Jan 28 02:37:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* re.c (rb_reg_raise): add GC guard to prevent intermediate
-	  variable from GC.
-
-Fri Jan 28 02:35:41 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* hash.c (rb_hash_fetch_m): add GC guard to prevent intermediate
-	  variable from GC.
-
-Fri Jan 28 01:33:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_process.rb (TestProcess#test_too_long_path)
-	  TestProcess#test_too_long_path): Reduced string size from 100MB
-	  to 10MB. 100MB may cause no memory error. It isn't intended.
-
-Fri Jan 28 01:27:42 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_process.rb (TestProcess#test_too_long_path2):
-	  Factored out from test_too_long_path. A test should only do
-	  one test.
-
-Thu Jan 27 23:29:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* st.c (st_foreach): check if unpacked.
-
-Thu Jan 27 23:14:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-mode-map): remove deprecated binding.
-	  use M-; instead.
-
-Thu Jan 27 21:58:32 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* bignum.c (rb_str_to_inum): get rid of too huge alloca().
-
-Thu Jan 27 21:43:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* object.c (rb_str_to_dbl): rewrite again. use ALLOCV instead
-	  rb_str_tmp_new().
-
-Thu Jan 27 21:41:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/win32.c: get rid of STRNDUPA(). It's dangerous API.
-
-Thu Jan 27 21:31:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/win32.c (rb_w32_aspawn): get rid of too huge alloca().
-	  [Bug #4330] [ruby-core:34898]
-
-Thu Jan 27 20:30:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/win32.c (rb_w32_spawn): get rid of too huge alloca().
-
-Thu Jan 27 18:49:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/win32.c (open_dir_handle): get rid of too huge alloca().
-
-Thu Jan 27 18:34:58 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* file.c (w32_io_info): get rid of too huge alloca().
-	  [Bug #4313] [ruby-core:34830]
-
-Thu Jan 27 18:19:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/win32.c (wstati64): get rid of too huge alloca().
-	  [Bug #4316] [ruby-core:34834]
-
-Thu Jan 27 15:11:52 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): get rid of too huge
-	  alloca(). this is the real fix of [ruby-core:34833].
-
-Thu Jan 27 12:46:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (ALLOC_ARGV_WITH_STR): fix void pointer arithmetic.
-
-Thu Jan 27 08:41:40 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_exec_v, rb_proc_exec_n, rb_proc_exec)
-	  (proc_spawn_n, proc_spawn): get rid of too huge alloca().
-	  [ruby-core:34827], [ruby-core:34833]
-
-Thu Jan 27 08:32:17 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (ALLOCV): new API for exception-safe
-	  temporary buffer.  [ruby-core:34844]
-
-	* string.c (rb_alloc_tmp_buffer, rb_free_tmp_buffer):
-	  implementation of the API.
-
-Thu Jan 27 08:22:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln_find.c (dln_find_1): use rb_warning and return immediately
-	  if fname is longer than buffer.
-
-Wed Jan 26 22:57:30 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* class.c (clone_method): add GC guard to prevent intermediate
-	  variable from GC. [Bug #4321] [ruby-dev:43107]
-
-Wed Jan 26 22:45:16 2011  Tanaka Akira  <akr@fsij.org>
-
-	* template/id.h.tmpl: parenthesize macro arguments.
-
-Wed Jan 26 22:28:49 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* vm_eval.c (rb_throw_obj): add GC guard to prevent intermediate
-	  variable from GC. [Bug #4322] [ruby-dev:43108]
-
-Wed Jan 26 17:08:59 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): OpenSSL::ASN1.decode
-	  should reject indefinite length primitive encodings as that is
-	  illegal. Patch by Martin Bosslet. See #4324.
-
-Wed Jan 26 10:36:28 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (=~): documentation fix; the return value is nil when
-	  it doesn't match. patched by Andrei Kulakov [ruby-core:34562]
-
-Tue Jan 25 08:41:58 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln_find.c (dln_find_1): omit too long pathnames.
-
-Tue Jan 25 08:28:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_resize): get rid of out-of-bound access.
-
-Tue Jan 25 07:48:22 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_thread.rb: remove unused variables.
-
-Tue Jan 25 07:45:44 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_thread.rb (TestThread#test_condvar_nolock_2): get
-	  rid of method redefined.
-
-Tue Jan 25 07:00:52 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_string_value_cstr): rb_str_modify can change
-	  RSTRING_PTR.
-
-Tue Jan 25 03:24:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_thread.rb: Added various ConditionVariable tests.
-
-Mon Jan 24 22:26:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* object.c (rb_str_to_dbl): Fix again. use rb_str_tmp_new()
-	  instead ALLOC_N.
-
-Mon Jan 24 21:50:48 2011  Tanaka Akira  <akr@fsij.org>
-
-	* vm_insnhelper.h: parenthesize macro arguments.
-
-Mon Jan 24 21:28:34 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* object.c (rb_str_to_dbl): use ALLOC_N instead ALLOCA_N because
-	  ALLOC_N may cause stack overflow.
-
-Mon Jan 24 21:04:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_invalid_str): prevent intermediate variable from GC.
-	  [ruby-core:34820]
-
-Sun Jan 23 23:01:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/io/console/test_io_console.rb: Don't run test if the system
-	  don't support io/console.
-
-Sun Jan 23 22:17:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/fiddle/test_fiddle.rb: Don't run test if the system don't support
-	  fiddle.
-
-	* test/fiddle/test_function.rb: ditto.
-	* test/fiddle/test_closure.rb: ditto.
-
-Sun Jan 23 11:39:18 2011  Tanaka Akira  <akr@fsij.org>
-
-	* vm_exec.h: parenthesize macro arguments.
-
-Sun Jan 23 10:33:02 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/fake.rb.in (ruby): suppress warnings.
-
-Sun Jan 23 08:00:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_nth_len, str_utf8_nth): return the rest length together.
-
-	* string.c (rb_str_substr): get rid of measure the length always
-	  to improve performance for huge string.  [ruby-core:34648]
-
-Sun Jan 23 00:40:10 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/test_syslog.rb: Fix to make a lot of test failure if
-	  the platform doesn't support syslog.
-
-Sat Jan 22 11:49:55 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support
-	  when multiple merge keys are specified.
-
-	* test/psych/test_merge_keys.rb: tests for multi-merge key support
-
-Sat Jan 22 11:33:04 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually
-	  part of YAML 1.1, so they should be supported.  Remove warning and
-	  merge keys to parent.  [ruby-core:34679]
-
-	* test/psych/test_merge_keys.rb: test for merge keys
-
-Sat Jan 22 10:25:19 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/parser.c (parse): add the file name to the exception when
-	  parse errors occur.
-
-	* test/psych/test_parser.rb: test for parse error file name
-
-Sat Jan 22 10:12:30 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/parser.c (parse): fix assertion error when reusing a
-	  parser after an exception has been raised
-
-	* test/psych/test_parser.rb: test for assertion error
-
-Sat Jan 22 04:09:22 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/nodes/node.rb: Make Psych::Nodes::Node
-	  enumerable.
-
-	* ext/psych/lib/psych/visitors/depth_first.rb: Add a depth-first
-	  visitor to enumerate over a YAML AST in a depth-first fashion
-
-	* test/psych/nodes/test_enumerable.rb: test for enumerating nodes
-
-	* test/psych/visitors/test_depth_first.rb: test for depth-first
-	  visitor
-
-Sat Jan 22 00:53:42 2011  Tanaka Akira  <akr@fsij.org>
-
-	* vm_core.h: parenthesize macro arguments.
-
-Fri Jan 21 18:15:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: should not use -Werror=* flags while conftests.
-
-Fri Jan 21 09:17:00 2011  Luis Lavena  <luislavena@gmail.com>
-
-	* configure.in: Fix incorrectly detected x86_64-w64-mingw32 due
-	  canonalization of target_os. Bug #3889 [ruby-core:32634]
-
-Thu Jan 20 23:44:00 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: Fix rb_cv_va_args_macro was broken. We are using
-	  -Werror=implicit-function-declaration compile option. therefore
-	  we need a function declaration explicitly.
-
-Thu Jan 20 23:58:02 2011  Tanaka Akira  <akr@fsij.org>
-
-	* node.h: parenthesize macro arguments.
-
-Thu Jan 20 23:25:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: Add '#include <stdlib.h>' to
-	  rb_cv_localtime_overflow test too. It's reported by Tomoyuki
-	  Chikanaga. Thanks.
-
-Thu Jan 20 16:11:00 2011  Kenta Murata <mrkn@mrkn.jp>
-
-	* README.EXT, README.EXT.ja: You shouldn't choose ``conftest.c'' as a
-	  name of a source file.
-
-Thu Jan 20 12:15:44 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: Add stdlib.h inclusion into rb_cv_negative_time_t
-	  test because it's required for exit(3). The patch is
-	  created by Tomoyuki Chikanaga. [Bug #4287] [ruby-dev:43060]
-
-Thu Jan 20 11:39:41 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/webrick/utils.rb (TestWEBrick::RubyBin): test CGI does not need
-	  to load rubygems.  if it activated, ruby raises LoadError about
-	  rbconfig.rb.
-
-Thu Jan 20 09:19:42 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/json_tree.rb: Fix JSON emit for
-	  DateTime and Time classes.
-
-	* test/psych/test_json_tree.rb: test for JSON emit
-
-Thu Jan 20 08:02:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/coder.rb (represent_object): arbitrary objects
-	  may be passed to the Psych::Coder object.
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: support for visiting
-	  arbitrary objects set on the coder.
-
-	* test/psych/test_coder.rb: supporting test case.
-
-Thu Jan 20 06:03:17 2011  Tanaka Akira  <akr@fsij.org>
-
-	* method.h: parenthesize macro arguments.
-
-Wed Jan 19 13:16:05 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/sources_command.rb: Finish removing code,
-	  (fixes sources command test).
-
-Wed Jan 19 13:04:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* proc.c (proc_call): Add gc guard to avoid segfault. The fix
-	  is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963]
-
-Wed Jan 19 12:31:28 2011  Eric Hodel <drbrain@segment7.net>
-
-	* lib/rubygems.rb: Since gem_prelude requires rubygems, enable
-	  custom_require always.
-
-Wed Jan 19 12:08:08 2011  Eric Hodel <drbrain@segment7.net>
-
-	* lib/rubygems/commands/dependency_command.rb: Remove require of
-	  deleted file.
-	* lib/rubygems/commands/fetch_command.rb: ditto
-	* lib/rubygems/commands/setup_command.rb: ditto
-	* lib/rubygems/commands/sources_command.rb: ditto
-	* lib/rubygems/commands/specification_command.rb: ditto
-
-Wed Jan 19 08:13:59 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/rubygems*: Import rubygems 1.5.0 (release candidate)
-	* test/rubygems: Ditto
-
-Tue Jan 18 23:31:01 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* parse.y: avoid NULL reference.  [ruby-dev:43067]
-
-Wed Jan 19 02:54:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vsnprintf.c (cvt): set first byte of buf to NUL for the case when
-	  no bytes are written to the buf. [ruby-dev:43062]
-
-Tue Jan 18 23:04:51 2011  Tanaka Akira  <akr@fsij.org>
-
-	* gc.h: parenthesize macro arguments.
-
-Tue Jan 18 18:31:14 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/irb/completion.rb: Irb tab completion support for XX::method
-	  forms.
-
-Tue Jan 18 15:05:55 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/logger.rb: added RDoc document for logging message escape
-	  by Hal Brodigan. See #3869
-
-Tue Jan 18 07:53:52 2011  Tanaka Akira  <akr@fsij.org>
-
-	* eval_intern.h: parenthesize macro arguments.
-
-Tue Jan 18 04:42:44 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/parser.rb (Mark): Adding a class to wrap
-	  marker information
-
-	* ext/psych/parser.c (mark): Add a method to return the mark object
-	  for the parser
-
-	* test/psych/test_parser.rb: tests for the Mark class.
-
-Tue Jan 18 02:46:55 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/json_tree.rb (visit_String): JSON
-	  strings should be dumped with double quotes. [ruby-core:34186]
-
-	* test/psych/test_json_tree.rb: test for double quotes
-
-Mon Jan 17 23:36:33 2011  Tanaka Akira  <akr@fsij.org>
-
-	* array.c (rb_ary_times): less MEMCPY calls.
-
-Mon Jan 17 22:54:33 2011  Tanaka Akira  <akr@fsij.org>
-
-	* debug.h: parenthesize macro arguments.
-
-Mon Jan 17 21:40:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): revert r30549.
-
-Sun Jan 16 20:55:45 2011  Tanaka Akira  <akr@fsij.org>
-
-	* vsnprintf.c: parenthesize macro arguments.
-
-Sat Jan 15 11:57:30 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (warnflags): add -Werror=implicit-function-declaration
-	  if available.
-
-	* lib/mkmf.rb (init_mkmf): ignore warnings in mkmf tests.
-
-	* test/mkmf/base.rb (setup, teardown): restore config values.
-
-	* test/mkmf/test_flags.rb: split from test_find_executable.rb.
-
-Sat Jan 15 10:04:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): autoload rubygems.
-
-	* tool/compile_prelude.rb (Prelude#initialize): ignore empty
-	  preludes.
-
-	* ruby.c (ruby_init_prelude): get rid of global namespace
-	  pollution.
-
-Sat Jan 15 09:42:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/io.h: missing prototypes.
-
-Fri Jan 14 23:25:55 2011  Tanaka Akira  <akr@fsij.org>
-
-	* vm_method.c: parenthesize macro arguments.
-
-Fri Jan 14 15:32:29 2011  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/net/imap/test_imap.rb: call neither logout nor disconnect
-	  unless connected.  patch by Kazuhiro NISHIYAMA.  [ruby-dev:42860]
-
-Fri Jan 14 14:56:57 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/imap.rb: use bytesize for binary strings.
-	  patched by Yoshimasa Niwa. [ruby-core:34222]
-
-Fri Jan 14 14:01:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* pack.c (pack_unpack): the resulted string of unpack('M') must have
-	  ASCII-8BIT encoding (and ENC_CODERANGE_VALID). [ruby-core:34482]
-
-Fri Jan 14 13:38:58 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in
-	  gzip's header is the size of uncompressed input data modulo 2^32.
-	  [ruby-core:34481] http://www.ietf.org/rfc/rfc1952.txt
-
-Fri Jan 14 11:36:25 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in, win32/Makefile.sub (RUNRUBY): require path should
-	  include "." because rbconfig.rb is there.
-
-Fri Jan 14 10:40:11 2011  Ryan Davis  <ryan@lust.local>
-
-	* gem_prelude.rb: Just require rubygems. Fixes rubygems 1.4.
-	* lib/rubygems.rb: removed all Gem::Quickloader code.
-	* ruby.c: renamed ruby_init_gems to ruby_init_prelude. Set
-	  $disable_rubygems since there is no fine grained mechanism to
-	  skip parts of the prelude. Open to suggestions on how to do this
-	  better.
-	* test/*.rb: Load path isn't set up correctly, so add
-	  --disable-gems as needed to failing tests that are explicitly
-	  testing stderr w/ ==.
-
-Fri Jan 14 07:30:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (argf_next_argv): go advance when the next file cannot be
-	  read.  [ruby-core:34446]
-
-Thu Jan 13 20:49:19 2011  Tanaka Akira  <akr@fsij.org>
-
-	* vm_insnhelper.c: parenthesize macro arguments.
-
-Thu Jan 13 13:21:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* vm_dump.c: delete dashes to make lines 80 chars, Patched by
-	  Shota Fukumori (sora_h).  [Bug #4275] [ruby-dev:43021]
-
-Thu Jan 13 13:21:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* vm_dump.c: fix misspelling of CrashReporter, Patched by Shota
-	  Fukumori (sora_h).  [Bug #4275] [ruby-dev:43021]
-
-Thu Jan 13 06:27:29 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* error.c: Exception#to_s should actually call to_s.
-
-Thu Jan 13 00:32:54 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (get_nth_dirname): decrement the directory index
-	  because the index specifies the index of given included_directories
-	  which is separated by NUL and its index is begun from 1.
-	  Note that 0 specifies the current directory of the compilation.
-	  see also http://www.dwarfstd.org/doc/dwarf-2.0.0.pdf
-
-Thu Jan 13 00:06:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_f_syscall): Add warning messages. [ruby-core:34062]
-
-Thu Jan 13 00:00:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_f_syscall): Some syscall return unsigned or pointer value.
-	  Therefore we should only check the result is -1 or not.
-	  [ruby-core:34062]
-
-Wed Jan 12 23:55:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_f_syscall): Add 64bit Linux support. Some syscall takes
-	  long type arguments.
-
-Wed Jan 12 19:37:10 2011  Tanaka Akira  <akr@fsij.org>
-
-	* vm_dump.c: parenthesize macro arguments.
-
-Wed Jan 12 19:28:23 2011  Tanaka Akira  <akr@fsij.org>
-
-	* vm.c (thread_free): reset ruby_current_thread if it points the
-	  thread to free.
-	* gc.c (slot_sweep): don't call RUBY_VM_SET_FINALIZER_INTERRUPT if
-	  there is no current thread.
-	  [ruby-dev:43000]
-
-Wed Jan 12 19:09:29 2011  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (sort_by_i): reenter check more strictly.
-	  (sort_by_cmp): ditto.
-	  [ruby-dev:43003] reported by Usaku NAKAMURA.
-
-Wed Jan 12 16:25:12 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* lib/net/http.rb (Net::HTTP#connect): makes it timeout during
-	  SSL handshake too. [ruby-core:34203]
-	  Patch by Marc Slemko.
-
-	* test/net/http/test_http.rb (TestNetHTTP_v1_2#test_timeout_during_HTTP_session):
-	  test for [ruby-core:34203]
-
-	* test/net/http/test_https.rb (TestNetHTTPS#test_timeout_during_SSL_handshake):
-	  ditto.
-
-Wed Jan 12 16:24:53 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* ext/readline/extconf.rb: new checks for RL_PROMPT_START_IGNORE
-	  and RL_PROMPT_END_IGNORE. [ruby-core:34331]
-
-	* ext/readline/readline.c: enables USE_INSERT_IGNORE_ESCAPE only if
-	  RL_PROMPT_{START,END}_IGNORE are available to get rid of compilation
-	  error with libedit.
-
-Wed Jan 12 15:53:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* README.EXT.ja (rb_ensure): typo.
-
-Wed Jan 12 11:33:46 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c: OpenBSD uses the elf_abi.h header file instead of the
-	  elf.h header file. patched by Jeremy Evans [ruby-core:34384]
-
-Wed Jan 12 03:59:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/webrick/test_cgi.rb: Removes usage of deprecated
-	  :RequestHandler option.
-	  patched by Peter Weldon [ruby-core:34010]
-
-	* test/webrick/test_httpproxy.rb: ditto.
-
-	* test/webrick/test_httpserver.rb: Add a test of the deprecation
-	  behaviour.
-
-Wed Jan 12 08:37:07 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (hash_i): return different values for inverse hash.
-	  [ruby-core:34334]
-
-Tue Jan 11 20:32:59 2011  Tanaka Akira  <akr@fsij.org>
-
-	* variable.c: parenthesize macro arguments.
-
-Tue Jan 11 13:06:38 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* array.c (rb_ary_resize): should care of embeded array when extending
-	  the array.
-
-	* array.c (rb_ary_resize): need to set capa when changing the real
-	  size of the array.
-	  these are latent bugs.
-
-Mon Jan 10 22:46:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/defines.h (CASEFOLD_FILESYSTEM): HFS+ is case
-	  insensitive.
-
-	* load.c (loaded_feature_path, rb_feature_p, load_lock): on a
-	  case-insensitive filesystem, loaded features search should
-	  ignore case.  [ruby-core:34297]
-
-Mon Jan 10 21:34:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (showflags): show LD commands.
-
-Mon Jan 10 14:32:55 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_method.rb (TestMethod#test_define_method): method
-	  transplanting between class and module is impossible.
-
-Mon Jan 10 13:51:17 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/rdoc-mode.el (rdoc-mode): show trailing whitespace.
-
-Mon Jan 10 11:22:02 2011  Tanaka Akira  <akr@fsij.org>
-
-	* util.c: parenthesize macro arguments.
-
-Mon Jan 10 07:41:31 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* misc/README: mention rdoc-mode.el and ruby-style.el.
-
-Sun Jan  9 20:37:21 2011  Tanaka Akira  <akr@fsij.org>
-
-	* transcode.c: parenthesize macro arguments.
-
-Sun Jan  9 16:31:53 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* io.c (Kernel.#syscall): implemented on LP64/LLP64 environments too.
-	  also uses __syscall if available for *BSD on 64bit architecture.
-	  [ruby-core:34062]
-
-Sun Jan  9 16:31:34 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* lib/irb/locale.rb (IRB::Locale::LOCALE_NAME_RE):
-	  some platform has a locale without territory but with
-	  encoding.
-	  (#each_sub_locale): ditto.
-
-Sun Jan  9 14:47:50 2011  TAKAO Kouji  <kouji@takao7.net>
-
-	* ext/readline/readline.c: apply a patch from Nobuyoshi Nakada.
-	  fixed #3616 [ruby-core:31484] IRB + readline incorrectly counts
-	  non-printing characters in prompt
-
-Sat Jan  8 21:47:26 2011  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_sort_by): use rb_ary_resize.
-	  (ary_cutoff): removed.
-
-Sat Jan  8 21:24:17 2011  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c (swapf): compilation condition simplified.
-	  (swapd): ditto.
-
-Sat Jan  8 20:51:25 2011  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c (swapd): remove duplicated code.
-
-Sat Jan  8 19:28:55 2011  Tanaka Akira  <akr@fsij.org>
-
-	* thread.c: parenthesize macro arguments.
-
-Fri Jan  7 23:07:40 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (configuration): backref needs to capture.
-
-Fri Jan  7 21:57:22 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-mode-variables), misc/ruby-style.el:
-	  show trailing whitespace.
-
-	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): highlight
-	  regexp after open bracket.  [ruby-core:34183]
-
-Fri Jan  7 00:37:35 2011  Tanaka Akira  <akr@fsij.org>
-
-	* string.c: parenthesize macro arguments.
-
-Thu Jan  6 22:42:02 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (bigmul1_karatsuba): avoid overflow that make assertion
-	  fail in certain case.  this patch is contributed from Ray Chason
-	  <chasonr at gmail.com> in personal communication.
-
-Thu Jan  6 20:55:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): ignore rest from first dot from
-	  TARGET to generate init function name.
-	  this is followup of r30464.
-
-Thu Jan  6 11:27:01 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags
-	  should not be included in JSON mapping
-
-Thu Jan  6 09:23:33 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/net/protocol.rb (eof?): BufferedIO should proxy eof? to the
-	  underlying IO object.
-
-Thu Jan  6 09:12:31 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/mkmf.rb (configuration): fixing gsub when multiple error flags
-	  are passed to GCC.
-
-Thu Jan  6 05:25:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_modify): export.
-
-Thu Jan  6 05:14:41 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (get_strio, strio_set_string)
-	  (strio_reopen): check if frozen.  [ruby-core:33648]
-
-Thu Jan  6 05:10:58 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_resize): new utility function.  [ruby-dev:42912]
-
-Thu Jan  6 05:03:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln.c (init_funcname_len): ignore rest from first dot.
-	  [ruby-dev:41774]
-
-Thu Jan  6 02:55:48 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: use YAML 1.0 output
-	  format for serializing nil values.  Thanks Eric Hodel!
-
-	* test/psych/test_nil.rb: test for nil values
-
-Wed Jan  5 14:21:34 2011  Mark Dodwell  <hi@mkdynamic.co.uk>
-
-	* string.c: fix rdoc typo.
-	  https://github.com/shyouhei/ruby/pull/3
-
-Wed Jan  5 14:06:01 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rdoc/test_rdoc_options.rb (TestRDocOptions#test_check_files):
-	  skip on Windows because chmod 0 doesn't mean unreadable by owner.
-
-Wed Jan  5 13:56:54 2011  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/net/http.rb (Net::HTTP#get): A header hash given should not
-	  be modified.
-
-Wed Jan  5 12:10:08 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/dl/{cfunc.c,dl.h,handle.c}, ext/fiddle/fiddle.{h,c}: Use _WIN32
-	  rather than checking for windows.h.  Thanks Jon Forums!
-	  [ruby-core:33977]
-
-Sat Jan  1 17:02:50 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* lib/irb/locale.rb (IRB::Locale#search_file): make it possible
-	  to load a localization from a gem.
-	  (IRB::Locale#lc_path): obsoleted because of the change of #search_file
-	  (IRB::Locale#each_localized_path): new private method, based on
-	  lc_path
-	  (IRB::Locale#find): follows the change of #search_file.
-	  (IRB::Locale#load): removed duplicate with #find.
-
-Sat Jan  1 11:44:42 2011  Tanaka Akira  <akr@fsij.org>
-
-	* strftime.c: parenthesize macro arguments.
-
-Sat Jan  1 11:10:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/zlib/zlib.c: take care of platforms where long is bigger
-	  than int.
-
-Sat Jan  1 11:03:58 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* NEWS (optparse): shell completion support.
-
-	* misc/README (rb_optparse.{bash,zsh}): for shell completion.
-
-	* include/ruby/intern.h (VALUE rb_ary_print_on): I have never seen
-	  this function anywhere.
-
-Sat Jan  1 04:20:11 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_write_console): don't raise exception when
-	  the conversion is for writing to console.
-	  Patched by Heesob Park [ruby-core:33999]
-
-Fri Dec 31 12:02:06 2010  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_sort_by): use less temporary objects.
-
-Fri Dec 31 11:46:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (warnflags), lib/mkmf.rb (configuration): turn
-	  warnings into errors only for bundled extensions.
-	  [ruby-core:33815]
-
-Fri Dec 31 11:15:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/zlib/zlib.c (sizeof): zlib.h mistakenly assumes the result
-	  of sizeof to be int, not size_t.
-
-Fri Dec 31 10:27:34 2010  Tanaka Akira  <akr@fsij.org>
-
-	* st.c: parenthesize macro arguments.
-
-Fri Dec 31 03:23:26 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vsnprintf.c (BSD__uqtoa): Fix overflow when long != quad_t.
-	  patched by Peter Weldon <peter.weldon AT null.net>
-	  [ruby-core:33985]
-
-Fri Dec 31 03:00:34 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* Makefile.in: remove unnecessary semicolons.
-
-Thu Dec 30 23:09:47 2010  wanabe  <s.wanabe@gmail.com>
-
-	* vm.c (vm_define_method): guard iseq from GC while method definition.
-	  [ruby-dev:42832]
-
-Thu Dec 30 20:18:32 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/Makefile.sub: ditto.
-
-Thu Dec 30 20:57:09 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* Makefile.in: Check V=1 argument if run "make clean" or similar.
-
-Thu Dec 30 20:41:50 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* Makefile.in: Kill ugly line continuation.
-
-Thu Dec 30 11:49:40 2010  Tanaka Akira  <akr@fsij.org>
-
-	* sprintf.c: parenthesize macro arguments.
-
-Wed Dec 29 21:20:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (maygvl_copy_stream_wait_readwrite): define if USE_SENDFILE
-
-Wed Dec 29 20:37:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: strip current directory prefix.
-
-	* enc/depend (clean): remove name2ctype.h when out-of-place build.
-
-	* win32/Makefile.sub (clean-enc): pass V to inferior make.
-
-Wed Dec 29 18:23:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* re.c (rb_reg_expr_str): need to escape if the coderange is invalid.
-
-Wed Dec 29 10:06:51 2010  Tanaka Akira  <akr@fsij.org>
-
-	* signal.c: parenthesize macro arguments.
-
-Wed Dec 29 07:22:15 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rake/rdoctask.rb: Deprecate in favor of rdoc/task.
-
-Wed Dec 29 07:07:06 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc: Import RDoc 3.1
-
-Tue Dec 28 18:36:38 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* error.c, include/ruby/intern.h (rb_compile_error_with_enc): new
-	  function to raise syntax error, with source encoding'ed message.
-
-	* parse.y (compile_error): use above function.
-	  [ruby-core:33951] (#4217)
-
-Tue Dec 28 07:37:38 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ruby.c: parenthesize macro arguments.
-
-Tue Dec 28 07:17:11 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add ARGF.write and so on.
-
-Tue Dec 28 07:12:38 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add new magic-comment. (warn-indent) [ruby-core:25442]
-
-Tue Dec 28 04:32:37 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/fiddle/extconf.rb: check for windows.h while building fiddle.
-	  Thanks Jon Forums! [ruby-core:33923]
-
-Tue Dec 28 01:45:12 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: Add Zlib.deflate and Zlib.inflate.
-	  [ruby-dev:42833]
-
-Mon Dec 27 21:22:33 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/configure.bat: Remove obsoleted coding rule. Now, we
-	  don't support to build on Windows 95/98 and Me.
-
-Mon Dec 27 18:27:13 2010  Tanaka Akira  <akr@fsij.org>
-
-	* re.c: parenthesize macro arguments.
-
-Mon Dec 27 15:22:23 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/README.win32: note to need NT based OS to build ruby.
-
-Mon Dec 27 12:14:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (EXTMK_ARGS): specify to pass macro V, because nmake
-	  doesn't pass it via MAKEFLAGS.
-
-Mon Dec 27 10:33:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/zlib/zlib.c (Init_zlib): Add Zlib.deflate and Zlib.inflate.
-	  [ruby-dev:42833]
-
-Mon Dec 27 07:38:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* misc/rb_optparse.zsh: add compdef for generator.
-
-Mon Dec 27 07:32:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/optparse.rb (OptionParser#compsys): escape brackets too.
-	  [ruby-dev:42754]
-
-Mon Dec 27 01:30:08 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: add IF_NAMESIZE.
-	  add a default for INET6_ADDRSTRLEN.
-
-Sun Dec 26 23:49:47 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/Makefile.sub: suppress a strange error message when RMALL
-	  found no such file.
-	* win32/rmall.bat: new.
-
-Sun Dec 26 21:23:23 2010    <kosaki.motohiro@gmail.com>
-
-	* win32/Makefile.sub: fix 'nmake clean-enc' breakage since r28322.
-
-Sun Dec 26 22:25:07 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/ripper/depend (ripper.y): fix messages with nmake.
-	  [ruby-dev:42896]
-
-Sun Dec 26 22:24:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (file_expand_path): get rid of warnings caused by
-	  -Wdeclaration-after-statement on cygwin.
-
-Sun Dec 26 20:28:34 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (before_exec): add small comment.
-
-Sun Dec 26 20:52:21 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: define INET_ADDRSTRLEN as 16 if not
-	  available.  fix compilation error on mswin32-60.  reported by nobu.
-
-Sun Dec 26 19:37:37 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c: define IFNAMSIZ if not available.
-	  fix compilation error on mingw32.  reported by nobu.
-
-Sun Dec 26 12:16:29 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/ri/paths.rb (RDoc::RI::Paths::HOMEDIR): no exception if
-	  HOME is not set.  [ruby-core:33867]
-
-Sun Dec 26 11:39:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (stmt): missing ripper rule.  i.e., `a::B ||= c 1'.
-	  http://twitter.com/#!/wannabe53/status/18797576396472321
-	  http://twitter.com/#!/wannabe53/status/18798416150663168
-
-Sun Dec 26 11:15:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/with_different_ofs.rb (DifferentOFS): should not affect
-	  original classes.
-
-Sun Dec 26 09:35:07 2010  Tanaka Akira  <akr@fsij.org>
-
-	* rational.c: parenthesize macro arguments.
-
-Sun Dec 26 09:22:19 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c (rb_if_indextoname): new function to abstract
-	  environments without if_indextoname.
-	  (inspect_ipv6_multicast_if): new function to inspect
-	  IPV6_MULTICAST_IF.
-	  Socket::Option.new(:INET6, :IPV6, :MULTICAST_IF,
-	  [2].pack("I!")).inspect is
-	  "#<Socket::Option: INET6 IPV6 MULTICAST_IF eth0>".
-
-Sun Dec 26 04:31:15 2010  Luis Lavena  <luislavena@gmail.com>
-
-	* ext/dl/win32/registry.rb: Corrected RegCreateKeyExA signature.
-	  Patch by Rafal Michalski [ruby-core:33874] [Ruby 1.9-Bug#4203]
-
-Sun Dec 26 02:31:58 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (advice_arg_check): Change argument check.
-	  Now, an unsupported advice makes NotImplementedError.
-	  [ruby-dev:42887] [Ruby 1.9-Feature#4204]
-
-Sun Dec 26 03:00:53 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/socket/extconf.rb: Fix build error which was introduced r30372.
-
-Sun Dec 26 01:37:10 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/extconf.rb: check the existence of if_indextoname().
-
-	* ext/socket/option.c: yesterday's akr's commits destroyed the build of
-	  some unrelated platforms (such as Windows).
-
-Sat Dec 25 23:29:11 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c (inspect_ipv4_add_drop_membership): new function
-	  to inspect struct ip_mreq and struct ip_mreqn for
-	  IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP.
-	  Socket::Option.new(:INET, :IP, :ADD_MEMBERSHIP,
-	  [239,255,99,81, 0,0,0,0].pack("CCCCCCCC")).inspect is now
-	  "#<Socket::Option: INET IP ADD_MEMBERSHIP 239.255.99.81 0.0.0.0>".
-	  (inspect_ipv4_multicast_if): new function to inspect struct in_addr
-	  and struct ip_mreqn for IP_MULTICAST_IF.
-	  Socket::Option.new(:INET, :IP, :MULTICAST_IF,
-	  [192,168,0,7].pack("CCCC")).inspect is now
-	  "#<Socket::Option: INET IP MULTICAST_IF 192.168.0.7>".
-
-	* ext/socket/extconf.rb: check struct ip_mreq and struct ip_mreqn.
-
-Sat Dec 25 22:49:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/csv: DifferentOFS needs to be include in each classes.
-
-	* test/digest/test_digest_extend.rb (TestDigestExtend#setup):
-	  should not depend on the result of previous tests
-
-	* test/with_different_ofs.rb (DifferentOFS::WithDifferentOFS): give
-	  name.
-
-	* test/with_different_ofs.rb (DifferentOFS): test suite for test
-	  suites affected by $,.
-
-	* test/digest/test_digest_extend.rb (TestDigestExtend): should not
-	  assume $, invariant.
-
-	* test/csv/test_data_converters.rb, test/csv/test_table.rb: don't
-	  call setup within tests.
-
-Sat Dec 25 20:01:40 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (pipe_open): Added rb_thread_atfork(). We must reinitialize
-	  GVL at new process creation.
-
-Sat Dec 25 18:26:55 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c (inspect_ipv6_mreq): new function to inspect
-	  struct ipv6_mreq for IPV6_JOIN_GROUP and IPV6_LEAVE_GROUP.
-	  Socket::Option.new(:INET6, :IPV6, :JOIN_GROUP,
-	  [0xff12,0,0,0,0,0,0,1, 2].pack("nnnnnnnnI!")).inspect is now
-	  "#<Socket::Option: INET6 IPV6 JOIN_GROUP ff12::1 eth0>".
-
-	* ext/socket/extconf.rb: check struct ipv6_mreq.
-
-Sat Dec 25 18:04:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/csv.rb (CSV.foreach): 'rb' mode is defaulted in open.
-
-	* lib/csv.rb (CSV#init_separators): cannonicalize encoding options
-	  as Encoding objects.
-
-Sat Dec 25 18:30:34 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_thread_atfork): Add small comment why we need
-	  reset random seed.
-
-Sat Dec 25 17:33:55 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/csv/base.rb (TestCSV.with_different_ofs): give name to
-	  anonymous classes.
-
-	* lib/csv.rb (CSV#init_separators): use IO#gets with length
-	  parameter to get rid of wrong convertion.
-
-	* lib/csv.rb (CSV::foreach, CSV#initialize): directly use encoding
-
-	* lib/csv.rb, test/csv: should not assume $, invariant.
-
-Sat Dec 25 16:08:06 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* signal.c: change rb_atomic_t definition from uchar to uint.
-
-Sat Dec 25 15:04:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
-	  suite writing to the source directory.
-
-Sat Dec 25 15:08:08 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec().
-	  We must reinitialize GVL at new process creation. Otherwise
-	  we may meet an insane deadlock. [Bug#4121][ruby-dev:42686]
-
-Sat Dec 25 14:27:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_extract_encoding_option): accept Encoding object as
-	  encoding: optional argument.  [ruby-dev:42884]
-
-Sat Dec 25 13:37:55 2010  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/minitest/*.rb: Imported minitest 2.0.2 r6093.
-
-Sat Dec 25 13:05:59 2010  Tanaka Akira  <akr@fsij.org>
-
-	* random.c: parenthesize macro arguments.
-
-Sat Dec 25 12:48:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_f_require_relative): don't omit return type.
-
-Sat Dec 25 11:06:00 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* load.c (rb_f_require_relative): Add documentation.
-
-Sat Dec 25 11:02:52 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/zlib/zlib.c (gzreader_gets): support optional length
-	  parameter.
-
-	* ext/zlib/zlib.c (gzfile_read, gzfile_readpartial): length should
-	  be long.
-
-Sat Dec 25 10:51:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/generator/generator.{c,h} (fbuffer_free_only_buffer):
-	  unused.
-
-	* ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): add casts.
-
-Fri Dec 24 08:46:04 2010  Tanaka Akira  <akr@fsij.org>
-
-	* process.c: parenthesize macro arguments.
-
-Thu Dec 23 19:17:14 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* test/net/imap/cacert.pem: updated because it has been expired.
-
-	* test/net/imap/server.crt: signed again because CA cert was expired.
-
-Thu Dec 23 11:16:52 2010  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y: parenthesize macro arguments.
-
-Thu Dec 23 11:00:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_check_type): check for type from extensions for ruby
-	  1.8.  see [ruby-core:33797].
-
-Thu Dec 23 08:12:59 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/net/smtp.rb: refactoring Net::SMTP#esmtp= to use an
-	  attr_accessor
-
-Thu Dec 23 06:35:41 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/net/smtp.rb: Net::SMTP should close the SSL connection if the
-	  connection verification fails.
-
-Thu Dec 23 01:47:58 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: remove #object_id. [ruby-dev:42840]
-
-Wed Dec 22 08:56:39 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add Module#private_constant and Module#public_constant.
-	  [ruby-dev:39685][ruby-core:32698]
-
-Wed Dec 22 07:59:23 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add IO#advise. [ruby-core:33110] [Ruby 1.9-Feature#4038]
-
-Tue Dec 21 23:45:31 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (Init_GC): move back object_id to Kernel. [ruby-dev:42840]
-
-Tue Dec 21 12:45:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (target_archs): remove temporary objects.
-
-	* enc/Makefile.in, enc/depend (clean): remove work directories.
-
-Tue Dec 21 07:39:12 2010  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c: parenthesize macro arguments.
-
-Tue Dec 21 06:25:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/rexml/test_contrib.rb (ContribTester#test_pos): should not
-	  use fixed path name for tests.  [ruby-dev:42827]
-
-	* test/rexml/test_sax.rb (SAX2Tester#test_socket): should not use
-	  fixed port for tests.  [ruby-dev:42828]
-
-Tue Dec 21 06:10:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (setup_args), vm.c (invoke_block_from_c),
-	  vm_insnhelper.c (caller_setup_args): reverted r30241 and r30243
-	  except for the test.
-
-Tue Dec 21 01:41:42 2010  Masaya Tarui  <tarui@ruby-lnag.org>
-
-	* io.c : add an extra byte to buffer for the specification of read
-	  in Windows. see [ruby-core:33460] and r29980. and, we have to
-	  discuss how to do this one byte.
-
-Tue Dec 21 01:18:06 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* error.c: Fix build error for win32. This regression was
-	  introduced by r30271.
-
-Tue Dec 21 00:59:40 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (thread_cleanup_func): Moved interrupted_lock
-	  destroying code from native_thread_destroy() to
-	  thread_cleanup_func() because it's platform independent logic.
-
-	* thread_win32.c (native_thread_destroy): ditto.
-	* thread_pthread.c (native_thread_destroy): ditto.
-
-Tue Dec 21 00:46:20 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (thread_cleanup_func): Don't touch native threading
-	  resource at fork. Sadly this is purely bandaid. We need to
-	  implement proper fix later. [Bug #4169] [ruby-core:33767]
-
-Tue Dec 21 00:22:44 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* error.c (exit_success_p): Check status code more carefully.
-	  status code may have garbage in upper bit.
-
-Mon Dec 20 23:12:37 2010  Tanaka Akira  <akr@fsij.org>
-
-	* node.c: parenthesize macro arguments.
-
-Mon Dec 20 20:04:41 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add #__id__ and #object_id. [ruby-dev:42778]
-
-Mon Dec 20 20:03:21 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (native_thread_destroy): Fixed gvl_cond leak.
-
-Mon Dec 20 13:49:05 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* NEWS: Add item for RDoc 3.0.1
-
-	* lib/rdoc: Import RDoc 3.0.1, remove require for perl parser.
-
-Mon Dec 20 12:15:32 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc: Import RDoc 3.0.
-
-Mon Dec 20 01:55:03 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (Init_IO): Added O_DIRECT. This feature was proposed by
-	  Run Paint Run Run.
-	  [Feature #4015] [ruby-core:33018]
-
-Sun Dec 19 19:15:23 2010  Tanaka Akira  <akr@fsij.org>
-
-	* marshal.c: parenthesize macro arguments.
-
-Sat Dec 18 21:52:37 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* vsnprintf.c (BSD_vfprintf): suppress warning: "_WIN32" is not
-	  defined.
-
-Sat Dec 18 16:02:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (setup_args), vm.c (invoke_block_from_c),
-	  vm_insnhelper.c (caller_setup_args): fix of r30241. lambda block
-	  should check argument number.
-
-Sat Dec 18 14:42:29 2010  Tanaka Akira  <akr@fsij.org>
-
-	* load.c: parenthesize macro arguments.
-
-Sat Dec 18 10:07:04 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (setup_args, iseq_compile_each): optimize AMPER LAMBDA
-	  combination as block.
-
-Fri Dec 17 22:07:16 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (Init_GC): move #__id__ and #object_id to BasicObject.
-	  [ruby-dev:42778]
-
-Fri Dec 17 19:35:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/mkmf/base.rb (TestMkmf::FakeLog): capture output from mkmf.
-
-	* test/mkmf/test_find_executable.rb (test_find_executable):
-	  suppress meaningless differences for chkbuild.
-
-Fri Dec 17 13:26:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/setup.mak (BASERUBY): quit with an error when BASERUBY was not
-	  able to set, just like configure.in does. [ruby-dev:42782]
-
-Fri Dec 17 07:04:09 2010  Tanaka Akira  <akr@fsij.org>
-
-	* iseq.c: parenthesize macro arguments.
-
-Fri Dec 17 04:18:37 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* transcode.c (str_encode): Alter comment for better wording and ri
-	  output.
-
-Fri Dec 17 00:05:40 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_io_advise): New API. IO#advise() allows to tell the
-	  ruby runtime how it expects to use a file handle. This feature
-	  can be improved a performance some situations.
-	  Note: This feature is mainly developed by Run Paint Run Run.
-	  Thank you! [ruby-core:33110] [Ruby 1.9-Feature#4038]
-
-	* io.c (do_io_advise): Helper function.
-	* io.c (io_advise_sym_to_const): ditto.
-
-Thu Dec 16 23:29:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/rbinstall.rb (bin-comm): use transformed name.
-	  [ruby-dev:42777]
-
-Thu Dec 16 21:52:07 2010  Tanaka Akira  <akr@fsij.org>
-
-	* io.c: parenthesize macro arguments.
-
-Thu Dec 16 21:46:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/mkconfig.rb (RbConfig): honor ARCHFLAGS and RC_ARCHS to
-	  override embedded ARCH_FLAG value on universal-darwin.
-
-Thu Dec 16 19:50:12 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/{configure.bat,setup.mak,Makefile.sub} (PROGRAM_PREFIX,
-	  PROGRAM_SUFFIX): unite the differences of the names of macros of
-	  prefix and suffix.
-	  reported by HANEDA Norikatsu. [ruby-dev:42775]
-
-Thu Dec 16 08:04:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* node.h (RNode): match the type of flags to RBasic, and renamed
-	  nd_file as nd_reserved.
-
-	* iseq.c (set_relation), vm_insnhelper.c (vm_cref_push): nd_file
-	  is always zero-cleared.
-
-Thu Dec 16 07:22:30 2010  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/minitest/unit.rb: Imported minitest 2.0.1 r6079.
-
-Wed Dec 15 20:45:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/test/unit.rb (process_args): need to setup @help to print options.
-
-Wed Dec 15 11:19:33 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/zlib/test_zlib.rb (test_to_io): forgotten to fix with r30201.
-
-Wed Dec 15 11:07:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (simple_sendfile): enable on Mac OS X.
-
-	* io.c (nogvl_copy_stream_sendfile): moved precheck of copy length.
-
-	* io.c (nogvl_copy_stream_sendfile): should wait for both of
-	  read/write fds.
-
-Wed Dec 15 07:11:55 2010  Tanaka Akira  <akr@fsij.org>
-
-	* hash.c: parenthesize macro arguments.
-
-Wed Dec 15 04:02:00 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
-	  fix compile error when !HAVE_X509V3_SET_NCONF. Thanks
-	  Chikanaga-san. [ruby-dev:42761] [Ruby 1.9-Bug#4158]
-
-Wed Dec 15 03:41:31 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ripper/test_parser_events.rb (TestRipper#test_block_variables):
-	  Limit address space 100MB instead 100KB. Quite frankly, This
-	  margin is too narrow to contain ruby. [ruby-dev:42763] [Bug#4159]
-
-Tue Dec 14 23:53:52 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (simple_sendfile): improve linux compatibility on FreeBSD,
-	  and now it works. But without cpuset -l 0, it still gets stuck.
-
-Tue Dec 14 20:31:33 2010  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c: parenthesize macro arguments.
-
-Tue Dec 14 18:31:48 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/test/unit.rb: help messages.
-
-Tue Dec 14 18:19:03 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (help): there is no reason to use the abbreviation for here.
-
-Tue Dec 14 15:03:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (test_reopen, test_reinitialize): should close
-	  the temporary files.
-
-Tue Dec 14 14:24:15 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (make_tempfile): change the prefix from 'foo'
-	  to 'test_io' because the old one is meaningless and inconvenient.
-
-	* test/ruby/test_io.rb (test_binmode_after_closed): the temporary file
-	  maked by make_temfile is already closed.
-
-Tue Dec 14 13:52:19 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (test_flush_in_finalizer[12]): should close
-	  temporary file because it's only used for taking pathname and
-	  unlinking the file after the end of the test (in GC phase).
-
-Tue Dec 14 13:34:33 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/zlib/zlib.c (gzfile_s_open): should close the IO if some error
-	  occurs in initializing.
-
-Tue Dec 14 13:04:16 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTPRequest#send_request_body_data):
-	  set binmode to tempfile.
-
-Tue Dec 14 12:55:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/zlib/test_zlib.rb (*): should close files associated with zlib.
-
-Tue Dec 14 11:30:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_argf.rb (test_inplace_rename_impossible): unlink
-	  the renamed temporary file on no_safe_rename platforms.
-
-	* test/ruby/test_argf.rb (test_readlines_limit_0,
-	  test_each_line_limit_0): should close argf because the associated
-	  Tempfile object cannot unlink the temporary file when it's gc'ed
-	  on some platforms (Windows, etc.)
-
-Tue Dec 14 11:27:07 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/minitest/unit.rb (Minitest::Unit#_run_suite): split test
-	  name and its time. Thiw allows to know test's name when you are
-	  running tests and meet a test which spends long time at realtime.
-
-Tue Dec 14 11:25:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: Add -Werror=declaration-after-statement to default
-	  warning flag. If you are using GCC, this flag is useful to
-	  prevent breaking VC build.
-
-Tue Dec 14 10:25:57 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): how many gcc-c99isms
-	  must a man mend; before he can build with VC? r30178
-
-Mon Dec 13 21:26:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (simple_sendfile): disable the use of sendfile(2) on
-	  FreeBSD. It blocks on TestIO#test_copy_stream_socket.
-
-Mon Dec 13 18:35:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c: define USE_SENDFILE on FreeBSD or DragonFly BSD.
-	  Remove Mac OS X because its argument is different from them.
-
-Mon Dec 13 12:00:09 2010  Tanaka Akira  <akr@fsij.org>
-
-	* file.c: parenthesize macro arguments.
-
-Mon Dec 13 11:21:14 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (simple_sendfile): added for BSD version of sendfile(2).
-
-Mon Dec 13 09:50:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTPRequest#set_form): Added to support
-	  both application/x-www-form-urlencoded and multipart/form-data.
-	  There is a similar API, Net::HTTPRequest#set_form_data, but
-	  to keep its compatibility this is newly added. [ruby-dev:42729]
-
-Sun Dec 12 23:45:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): fix for __goto__ and __label__
-	  where were totally broken.
-
-Sun Dec 12 22:45:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (ID_H_INCLUDES): now id.h depends on vm_opts.h.
-
-Sun Dec 12 20:42:47 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* template/id.h.tmpl: suppress all warning: "SUPPORT_JOKE" is not
-	  defined.  [ruby-dev:42730]
-
-Sun Dec 12 20:35:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* misc/rb_optparse.zsh: update how to install.
-
-	* misc/rb_optparse.zsh: avoid error when setopt noclobber.
-
-	* lib/optparse.rb: fix typo. pointed out at
-	  <http://d.hatena.ne.jp/nagachika/20101207>.
-
-Sun Dec 12 13:27:35 2010  Tanaka Akira  <akr@fsij.org>
-
-	* eval_error.c: parenthesize macro arguments.
-
-Sun Dec 12 11:53:24 2010  Tanaka Akira  <akr@fsij.org>
-
-	* error.c: parenthesize macro arguments.
-
-Sun Dec 12 04:01:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_inspect): fix: extra back slash is added when
-	  the string is dummy encoding and includes \x22 or \x5C.
-
-Sun Dec 12 02:42:24 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/openssl/ossl_asn1.c: indefinite length BER to DER encoding is
-	  properly supported.  Thanks Martin Bosslet! [ruby-core:33082]
-
-Sat Dec 11 17:43:34 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* ext/bigdecimal/bigdecimal.h: suppress "warning: 'VPrint' declared
-	  'static' but never defined".
-
-Sat Dec 11 09:24:57 2010  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c: parenthesize macro arguments.
-
-Sat Dec 11 08:12:48 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/openssl/ossl.c, ext/openssl/ossl_pkey_rsa.c: Document RSA, RSA
-	  encryption/decryption and PKCS #5 encryption/decryption.
-
-Sat Dec 11 06:23:41 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/openssl/ossl_x509name.c: include Comparable to provide #==.
-	  Document OpenSSL::X509::Name#<=>.  [Ruby 1.9-Feature#4116]
-
-Sat Dec 11 05:48:28 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: infinite loop on method_missing at loading.
-	  [ruby-dev:42716] [Ruby 1.9-Bug#4129]
-
-	* ext/tk/lib/multi-tk.rb: when no eventloop is running, ruby freezes at
-	  exit.
-
-Sat Dec 11 02:23:15 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/openssl/extconf.rb: try pkgconfig first, then fall back to
-	  normal have_library, etc.  Thanks Erik Hollensbe. [ruby-core:32406]
-
-Fri Dec 10 22:33:39 2010  Tanaka Akira  <akr@fsij.org>
-
-	* dln_find.c: parenthesize macro arguments.
-
-Fri Dec 10 20:05:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/id.h.tmpl (ruby_method_ids): suppress warnings.
-	  [ruby-dev:42730]
-
-Fri Dec 10 18:29:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (ruby_init_loadpath_safe): relatively called non-shared
-	  binary cannot be found in PATH, so use given pathname.
-
-Fri Dec 10 18:28:40 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cygwin/GNUmakefile.in (SCRIPTPROGRAMS): ignore backup files and etc.
-
-	* cygwin/GNUmakefile.in (scriptbin): set executable bit.
-
-	* tool/rbinstall.rb (install_recursive): always skip default ignored
-	  files.  if block is given, call it instead of calling install.
-
-	* tool/rbinstall.rb (bin-comm): use install_recursive.
-
-Fri Dec 10 18:12:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/mkmf/base.rb (TestMkmf#config_value): extract macro value from
-	  config.h.
-
-	* test/mkmf/test_sizeof.rb (TestMkmf::TestSizeof#test_sizeof_builtin),
-	  (TestMkmf::TestSizeof#test_sizeof_struct): more tests.
-
-	* lib/mkmf.rb (check_signedness): should use the prelude code.
-	  [ruby-dev:42731]
-
-	* lib/mkmf.rb (Logging.log_close): separate from Logging.logfile.
-
-	* test/mkmf/base.rb (TestMkmf::MKMFLOG): show mkmf.log at failures.
-
-	* test/mkmf/base.rb (TestMkmf#teardown): close log file for each tests.
-
-Fri Dec 10 11:36:43 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* compile.c (enum): remove a comma at end of enumerator list.
-
-	* constant.h (rb_const_flag_t): ditto.
-
-	* iseq.h (enum catch_type): ditto.
-
-	* iseq.h (enum defined_type): ditto.
-
-	* vm_core.h (enum iseq_type): ditto.
-
-	* vm_core.h (enum vm_special_object_type): ditto.
-
-Fri Dec 10 10:47:53 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* sprintf.c (_HAVE_SANE_QUAD_): Don't forget LP64, r30156.
-
-Fri Dec 10 10:37:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* sprintf.c (_HAVE_SANE_QUAD_): if a certain platform has LONG_LONG in
-	  8 byte, it might be sane quad. [ruby-core:33634]
-
-Fri Dec 10 10:07:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb: remove version 1.1 features.
-
-Fri Dec 10 02:18:02 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/openssl/ossl_x509store.c (ossl_x509stctx_cleanup): removing C
-	  implementation of `cleanup`.
-
-	* ext/openssl/lib/openssl/x509.rb: adding ruby implementation of
-	  `cleanup`.  OpenSSL::X509::StoreContext#cleanup is deprecated since
-	  reusing the underlying struct doesn't make sense. [ruby-dev:42546]
-
-Thu Dec  9 20:14:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (lvar_defined_gen, shadowing_lvar_gen, dvar_defined): no
-	  warnings for unused method and block arguments.
-	  [ruby-dev:42718] [ruby-dev:42724]
-
-Thu Dec  9 19:25:49 2010  Tanaka Akira  <akr@fsij.org>
-
-	* dln.c: parenthesize macro arguments.
-
-Thu Dec  9 18:51:06 2010  Tanaka Akira  <akr@fsij.org>
-
-	* lib/webrick/accesslog.rb (WEBrick::AccessLog#format): support
-	  %{remote}p for logging remote (client) port number.
-	  [ruby-dev:42670]
-
-Thu Dec  9 11:00:30 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_dup): should copy contents only.  no instance
-	  variable, no class would be copied.  it would affect methods
-	  #sort, #reject, #transpose, #uniq, #compact, and #shuffle.
-	  [ruby-core:33640]
-
-	* array.c (rb_ary_reverse_m): ditto.
-
-	* array.c (rb_ary_rotate_m): ditto.
-
-Wed Dec  8 21:38:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/dl/lib/dl/struct.rb: clean a warning: assigned but unused
-	  variable. patched by Kouhei Yanagita. [ruby-dev:42722]
-
-	* ext/dl/lib/dl/import.rb: ditto.
-
-Wed Dec  8 21:36:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (shadowing_lvar_gen): fix line number.  [ruby-dev:42718]
-
-Wed Dec  8 20:37:11 2010  Tanaka Akira  <akr@fsij.org>
-
-	* dir.c: parenthesize macro arguments.
-
-Tue Dec  7 22:37:15 2010  Masaya Tarui  <tarui@ruby-lnag.org>
-
-	* io.c (io_read): duplicate string if shared. [ruby-dev:42719]
-
-Tue Dec  7 22:31:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser::Officious): separate completion
-	  options from --help.  [ruby-dev:42690]
-
-	* lib/optparse.rb (OptionParser::Completion#candidate),
-	  (OptionParser::Switch#compsys): remove unused variables.
-
-Tue Dec  7 22:05:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (transcode_loop): call default handler of the given
-	  hash, method, proc or [] method as fallback.  [ruby-dev:42692]
-
-Tue Dec  7 21:59:37 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/light/node.rb: remove circular require.
-
-Tue Dec  7 21:56:01 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_light.rb: really suppress a warning.
-
-Tue Dec  7 21:51:57 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_light.rb: suppress a warning.
-
-Tue Dec  7 21:14:03 2010  Tanaka Akira  <akr@fsij.org>
-
-	* debug.c: parenthesize macro arguments.
-
-Tue Dec  7 21:06:38 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/doctype.rb, test/rexml/test_doctype.rb: suppress warnings.
-	  [ruby-core:33305]
-	  Reported by Aaron Patterson. Thanks!!!
-
-Tue Dec  7 18:56:52 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc.
-	  patched by Kouhei Yanagita [ruby-dev:42696]
-
-Tue Dec  7 20:32:11 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_doctype.rb: add Accessor to test case name.
-
-Tue Dec  7 20:31:02 2010  Kouhei Sutou  <kou@clear-code.com>
-
-	* test/rexml/test_doctype.rb: Doctype -> DocType.
-
-Tue Dec  7 20:29:23 2010  Kouhei Sutou  <kou@clear-code.com>
-
-	* test/rexml/test_doctype_mixin.rb: rename to ...
-	* test/rexml/test_doctype.rb: ... this to remove needless name.
-
-Tue Dec  7 17:03:16 2010  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (xlist): supported the XLIST command, which is an
-	  extension by Apple and Google.  patch by Geoff Youngs.
-	  [ruby-core:33521]
-
-Tue Dec  7 08:00:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, win32/Makefile.sub (WERRORFLAG): flag to treat
-	  warnings as errors.
-
-	* lib/mkmf.rb (Logging.postpone): yield log file object.
-
-	* lib/mkmf.rb (xsystem): add options, :werror only right now.
-
-	* lib/mkmf.rb (with_werror): check as if warnings are errors.
-
-	* lib/mkmf.rb (convertible_int): make declaration conflict
-	  warnings errors not to pass wrong type.  [ruby-dev:42684]
-
-	* lib/mkmf.rb (COMMON_MACROS): get rid of conflicts.
-
-	* win32/Makefile.sub (WARNFLAGS): make declaration conflict
-	  warnings errors if possible.
-
-Sun Dec  7 21:16:10 2010  Tanaka Akira  <akr@fsij.org>
-
-	* cont.c: parenthesize macro arguments.
-
-Tue Dec  7 00:27:14 2010  Masaya Tarui  <tarui@ruby-lnag.org>
-
-	* win32/win32.c (rb_w32_read): fixed more for readline,
-	  and so on. [ruby-core:33511]
-
-Mon Dec  6 23:18:22 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/mkmf/base.rb (TestMkmf#setup): run quietly.
-
-	* test/mkmf/test_find_executable.rb (test_find_executable): use
-	  configured results.
-
-	* common.mk (test-build): test for build process.
-
-Mon Dec  6 22:47:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser#candidate): skip separators.
-
-	* sample/optparse/opttest.rb: should not override --help.
-	  [ruby-dev:42690]
-
-Mon Dec  6 19:00:48 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* misc/rb_optparse.zsh: fix typos.
-
-Mon Dec  6 18:59:04 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add new encodings.
-
-Mon Dec  6 18:56:42 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_string.rb (TestString#test_scan): add a test for
-	  [ruby-core:33338] #4087.
-
-Mon Dec  6 18:55:36 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/uri/test_common.rb (TestCommon#test_encode_www_form): add
-	  tests for r30015.
-
-Mon Dec  6 10:39:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/common.rb (URI::Parser#initialize_pattern):
-	  refix for restrict the pattern.
-
-Mon Dec  6 09:45:11 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/openssl (OpenSSL): add toplevel documentation
-	* ext/openssl/ossl_ssl.c (SSLContext, SSLSocket: add additional
-	  documentation
-	* ext/openssl: move "let rdoc know about mOSSL" comments so they don't
-	  show up in output
-
-Mon Dec  6 09:16:46 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/common.rb (URI::Parser#initialize_pattern):
-	  workaround fix pattern of hostname for RFC 3986. [ruby-dev:42672]
-
-Mon Dec  6 09:14:38 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/mkmf.rb (check_signedness): rename unused variable prelude.
-
-Sun Dec  5 17:56:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (make_metaclass): fix probable typo.  builtin type flag
-	  cannot be used with FL_TEST.
-
-Sun Dec  5 12:09:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]
-
-Sun Dec  5 11:27:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (load_file_internal): decrement for ungotten line.
-	  [ruby-dev:42680]
-
-Sun Dec  5 10:32:11 2010  Tanaka Akira  <akr@fsij.org>
-
-	* complex.c: parenthesize macro arguments.
-
-Sat Dec  4 11:39:17 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/openssl/ossl_x509ext.c (initialize): add documentation.
-
-Sat Dec  4 11:21:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_update_by): new API for Hash#update.
-
-Sat Dec  4 11:18:10 2010  Tanaka Akira  <akr@fsij.org>
-
-	* class.c: parenthesize macro arguments.
-
-Sat Dec  4 11:07:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (rb_vm_inc_const_missing_count): missing prototype.
-
-Sat Dec  4 08:50:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (Init_iconv): no warnings if $VERBOSE is nil.
-
-Sat Dec  4 08:25:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_call_method): revert r30064 and r30071,
-	  because of [ruby-core:26761]. Bug#4106 rejected.
-
-Sat Dec  4 07:46:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (String#tr_cpp): substitute * with P like as
-	  autoconf.
-
-Fri Dec  3 22:36:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_call_method): protected methods should be
-	  checked against the real class.
-
-Fri Dec  3 20:23:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (convertible_int): define printf format prefix too.
-
-	* lib/mkmf.rb (convertible_int): detect convertible integer type.
-	  port RUBY_REPLACE_INT from configure.in.
-
-	* lib/mkmf.rb (check_sizeof): should return integer always.
-
-Fri Dec  3 12:54:48 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (RCFLAGS): VC10 and after only. fixed the problem
-	  of r30015. [ruby-core:33530]
-
-Fri Dec  3 12:41:52 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* gc.c (rb_objspace_free): With our "lazy-sweep" GC engine, it is
-	  possible for an object to survive until its surrounding object
-	  space is about to be freed.  Those objects, if any, remains
-	  leaked for the rest of a process life.  This is problematic
-	  because for instance a T_DATA object may have its own destructor
-	  to terminate something.
-
-	* vm.c (ruby_vm_destruct): ruby_current_vm termination should be
-	  somewhere after rb_objspace_free for above reason.
-
-Fri Dec  3 12:17:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_call_method): protected singleton methods should
-	  be visible from same real class methods.  [ruby-core:33506]
-
-Fri Dec  3 07:08:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_getline): round upto next char
-	  boundary.  [ruby-dev:42674]
-
-Fri Dec  3 06:52:46 2010  Tanaka Akira  <akr@fsij.org>
-
-	* compile.c: parenthesize macro arguments.
-
-Fri Dec  3 04:08:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (enc_alias_internal): use st_insert2 and change return
-	  value to int.
-
-	* encoding.c (enc_alias): follow enc_alias_internal.
-
-Fri Dec  3 01:52:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (enc_alias_internal): use xfree instead of free.
-
-Thu Dec  2 23:52:26 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* NEWS: entry for ruby_vm_at_exit().
-
-	* eval.c (ruby_cleanup): bug fix around at_exit (1) timing was
-	  wrong. (2) execution order was opposite.
-
-Thu Dec  2 23:05:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (RCFLAGS): -nologo switch is only available in
-	  newer versions of rc.exe. fixed the problem of r30012.
-
-Thu Dec  2 21:28:07 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/json/lib/json/add/rails.rb: removed.
-
-Thu Dec  2 21:22:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (enc_alias_internal): free the copied key and
-	  return NULL when given key is already registered.
-
-	* encoding.c (enc_alias): call set_encoding_const only when the
-	  alias is not registered yet.
-
-Thu Dec  2 19:58:24 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* vm.c (ruby_vm_at_exit): new API.  This enables extension libs to
-	  hook a VM termination.  Right now, because the VM we have is
-	  process global, most extensions do not deallocate resources and
-	  leave them to Operating System's reaping userland processes.  But
-	  in a future we plan to have multiple VMs to run simultaneously in
-	  a single process (MVM project).  At that stage we can no longer
-	  rely on OSes and have to manage every resources to be reclaimed
-	  properly.  So it is.  For a forward-compatibility reason this API
-	  is introduced now, encouraging you to be as gentle as you can for
-	  your resources; that is, tidy up your room.
-
-	* include/ruby/vm.h: ditto.
-
-	* vm_core.h (rb_vm_struct): new field.
-
-	* vm.c (vm_init2): initialize above new field.
-
-	* eval.c (ruby_cleanup): trigger those hooks.
-
-Thu Dec  2 17:00:44 2010  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c: parenthesize macro arguments.
-
-Thu Dec  2 15:31:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_read): more fix. [ruby-core:33513]
-
-Thu Dec  2 13:41:43 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_read): workaround for console reading troubles.
-	  fixed [ruby-core:33511]
-
-Thu Dec  2 13:10:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/common.rb (URI.encode_www_form):
-	  split key-value when the value is Array like object.
-
-Thu Dec  2 10:39:39 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTP#set_form_data):
-	  use URI.encode_www_form for application/x-www-form-urlencoded.
-
-Thu Dec  2 10:38:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/extmk.rb: remove $makeflags.defined?, it should be $mflags.
-
-Thu Dec  2 10:19:47 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (rc): suppress meaningless message.
-
-Thu Dec  2 10:09:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/json/generator/extconf.rb: remove the lines which set -O3
-	  when -O option is not set.
-	  Note that -O3 doesn't always exist.
-
-	* ext/json/parser/extconf.rb: ditto.
-
-Thu Dec  2 10:01:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/extmk.rb: define $makeflags.defined? like $mflags.
-
-Thu Dec  2 07:20:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb (Test::Unit::GCStressOption): --gc-stress
-	  option.
-
-	* lib/test/unit.rb (Test::Unit::Mini#_run_suites): show the result
-	  even when interrupted on the way.
-
-Thu Dec  2 07:08:38 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (setattr): should retry on EINTR.
-	  [ruby-dev:42666]
-
-Thu Dec  2 02:30:50 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/http.rb: fixed positional wording to match revised order.
-
-Thu Dec  2 01:24:39 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/json/lib/json/common.rb: don't use iconv on 1.9.
-	  patched by Shota Fukumori [ruby-core:33164]
-
-Thu Dec  2 01:02:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/json: Update github/flori/json from 1.4.2+ to
-	  e22b2f2bdfe6a9b0. this fixes some bugs.
-
-Thu Dec  2 00:05:44 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb: improve rdoc.
-	  This change the order of chapter because such overview should
-	  begin with simple examples.
-	  patched by Eric Hodel [ruby-core:33469]
-
-Wed Dec  1 22:01:49 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* numeric.c (Init_Numeric): fixed a potential bug when using bccwin32
-	  ruby with Microsoft's dll, though we already gave up of supporting
-	  bccwin32. [ruby-core:33503]
-
-Wed Dec  1 21:43:21 2010  Tanaka Akira  <akr@fsij.org>
-
-	* array.c: parenthesize macro arguments.
-
-Wed Dec  1 21:41:57 2010  Tanaka Akira  <akr@fsij.org>
-
-	* test/socket/test_addrinfo.rb: extract Errno::EADDRINUSE as a method.
-
-	* test/socket/test_socket.rb: ditto.
-
-Wed Dec  1 15:08:32 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/openssl/test_ssl.rb (test_not_started_session): non socket
-	  argument of SSLSocket.new is not supported on Windows.
-
-Wed Dec  1 14:36:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_memhash): zero-filled strings should return
-	  different values.  [ruby-core:33500]
-
-Wed Dec  1 14:27:49 2010  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/minitest/*.rb: Imported minitest 2.0.0 r5952.
-	* test/minitest/*.rb: ditto.
-	* lib/test/unit.rb: Compatibility fix for minitest changes.
-
-Wed Dec  1 10:16:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_inspect): fix typo (not 0xFD but 0xFE).
-
-Wed Dec  1 09:28:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c: Follow .gnu_debuglink section.
-	  A user of distribution provided ruby will see line
-	  info if s/he has a debug package for ruby.
-	  patched by Shinichiro Hamaji [ruby-dev:42655]
-
-Wed Dec  1 01:29:15 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_inspect): inspect as a dummy encoding string
-	  when a UTF-16/32 (not BE/LE) string does not have a BOM.
-	  Unicode and some RFCs say that a string labeled as UTF-16/32
-	  doesn't have a BOM, it should be considered big endian.
-	  But many Windows programs generates little endian UTF-16
-	  strings without a BOM. So String#inspect treats a string
-	  labeled UTF-16/32 without a BOM as a dummy encoding string.
-	  patched by Martin Duerst. [ruby-core:33461]
-
-Tue Nov 30 17:04:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (parse_debug_line_cu): ignore DW_LNE_set_discriminator.
-	  To ignore, it needs to read a single unsigned LEB128 integer.
-
-Tue Nov 30 16:29:19 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_dump.c: undef HAVE_BACKTRACE when the OS is FreeBSD (in other
-	  words backtrace() is libexecinfo) and it is optimized.
-	  This temporary hack may be also applied to other libexecinfo
-	  environments.
-
-Tue Nov 30 16:23:23 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb: improve rdoc.
-	  patched by Eric Hodel ref #4100
-
-Tue Nov 30 12:23:52 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_read): read only 1 byte at once on console.
-	  workaround of Windows bug. see [ruby-core:33460].
-	  this is not the final solution.
-
-Tue Nov 30 11:39:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb: improve rdoc.
-	  patched by mathew murphy [ruby-core:33472] ref #4100
-
-Tue Nov 30 05:03:44 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/uri/common.rb (encode_www_form, encode_www_form_component):
-	  Improve English in documentation.
-
-	* ext/openssl/ossl_ssl.c (ssl_version=, ciphers=): Document
-	  #ssl_version=, add documentation for #ciphers=.
-
-Mon Nov 29 22:55:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/uri/common.rb (URI::WFKV_): get rid of backtrack explosion
-	  by nested repeat operators.  [ruby-core:33464]
-
-Mon Nov 29 22:53:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/Makefile.sub (scriptbin.mk): fix generated rules.
-
-	* win32/win32.c (rb_w32_write_console): fix argument type.
-
-Mon Nov 29 21:12:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-forward-sexp): stop after literal hash
-	  key labels.
-
-	* misc/ruby-mode.el (ruby-font-lock-keywords): highlight literal
-	  hash key labels as symbols.
-
-Mon Nov 29 18:31:31 2010  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
-	  - Removed commented-out options that are no longer under discussion.
-	  - Added two more tests for forthcomming clarifications.
-
-Mon Nov 29 14:31:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_isatty): use GetConsoleMode() to determine the
-	  fd is console or not, just like rb_w32_write_console(). [experimental]
-
-Mon Nov 29 14:19:40 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/win32.h (rb_w32_write_console): wrong prototype.
-
-Mon Nov 29 14:10:55 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_write_console): fixed indentation.
-
-Sun Nov 28 22:13:39 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c (NATIVE_MUTEX_LOCK_DEBUG): move and use it.
-
-	* ChangeLog: fix my timezone.
-
-Mon Nov 28 21:58:58 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c: remove pthread_atfork().
-
-Mon Nov 28 21:54:22 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c (native_cond_*): Check return code.
-	  (Some OSes except Linux return error code).
-
-Sun Nov 28 21:46:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (thread_start_func_1): initialize native thread
-	  data immediately before starting.
-
-Sun Nov 28 14:56:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (struct argf): make lineno long, and reorder members.
-
-Sun Nov 28 14:55:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_win32.c (gvl_release, gvl_init): suppress warnings.
-
-Sun Nov 28 14:48:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (gvl_release, gvl_init): suppress warnings.
-
-	* vm_core.h (rb_vm_gvl_destroy): add prototype.
-
-Sun Nov 28 14:46:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (gvl_reinit): register atfork handler only in
-	  the parent process, to get rid of dead lock.
-
-Sun Nov 28 12:23:57 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c, vm_core.h: make gvl_acquire/release/init/destruct
-	  APIs to modularize GVL implementation.
-
-	* thread_pthread.c, thread_pthread.h: Two GVL implementations.
-	  (1) Simple locking GVL which is same as existing GVL.
-	  (2) Wake-up queued threads.  The wake-up order is simple FIFO.
-	     (We can make several queues to support exact priorities, however
-	      this causes some issues such as priority inversion and so on.)
-	      This impl. prevents spin-loop (*1) caused on SMP environments.
-	  *1: Only one Ruby thread acquires GVL again and again.
-	      Bug #2359 [ruby-core:26694]
-
-	* thread_win32.c, thread_win32.h: Using simple lock
-	  not by CRITICAL_SECTION but by Mutex.
-	  Bug #3890 [ruby-dev:42315]
-
-	* vm.c (ruby_vm_destruct): ditto.
-
-Sun Nov 28 04:40:00 2010  Luis Lavena  <luislavena@gmail.com>
-
-	* io.c (io_fwrite): use rb_w32_write_console under Windows.
-
-	* win32/win32.c (rb_w32_write_console): added to write to write
-	  Unicode using WriteConsoleW for stdout/stderr. [ruby-core:33166]
-
-Sun Nov 28 03:58:47 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb: improve rdoc.
-	  patched by Mike Perham [ruby-core:33433]
-
-Sat Nov 27 19:12:10 2010  Tanaka Akira  <akr@fsij.org>
-
-	* time.c: parenthesize macro arguments.
-
-Sat Nov 27 18:08:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* time.c (leap_year_v_p): fixed typo.  [ruby-dev:42631]
-
-Sat Nov 27 17:57:08 2010  Tanaka Akira  <akr@fsij.org>
-
-	* resolv.rb (Resolv::DNS): use the same DNS server when retry using
-	  TCP.  reported by Julian Mehnle.  [ruby-core:32970]
-
-Sat Nov 27 15:45:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_dump.c (rb_vm_bugreport): see CrashReport log on Mac OS X.
-
-	* configure.in: link addr2line only for ELF.
-
-Sat Nov 27 13:58:55 2010  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser#candidate): : was missing.  Thanks,
-	  Shota Fukumori.  [ruby-dev:42634]
-
-Sat Nov 27 12:07:05 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* man/ruby.1: Ruby man page from Arthur Gunn in [ruby-core:33412]
-
-Sat Nov 27 11:29:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser#candidate): get rid of 1.9 syntax
-	  so that BASERUBY can be 1.8.
-
-Sat Nov 27 08:16:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* addr2line.c (rb_dump_backtrace_with_lines): should close fd on
-	  edge case.
-
-Fri Nov 26 13:33:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c: apply a patch from shinichiro.h.
-
-Fri Nov 26 12:21:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c: added to show source filename and line number of
-	  functions in backtrace. [ruby-dev:42625]
-	  a patch from shinichiro.h <shinichiro.hamaji AT gmail.com>
-
-	* addr2line.h: ditto.
-
-	* common.mk: add addr2line.$(OBJEXT).
-
-	* configure.in: check dl_iterate_phdr.
-
-	* vm_dump.c (rb_vm_bugreport): use rb_dump_backtrace_with_lines in
-	  addr2line.c when the binary is ELF.
-
-Fri Nov 26 12:12:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regcomp.c (setup_tree): restart setup_tree() for a node whose
-	  AnchorNode's type is ANCHOR_PREC_BEHIND or ANCHOR_PREC_BEHIND_NOT
-	  and divide_look_behind_alternatives() divided it to NT_ALT or
-	  NT_LIST. [ruby-core:33370]
-
-Fri Nov 26 11:40:11 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* vm_dump.c (dump_thread): get only required rights of the target
-	  thread because THREAD_ALL_ACCESS causes an access error on XP.
-	  reported by Masaya TARUI via IRC.
-
-Fri Nov 26 11:09:07 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* vm_dump.c (dump_thread): show the displacement from the beginning
-	  of the symbol.
-
-Fri Nov 26 10:48:23 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* vm_dump.c (dump_thread): follow the output of glibc.
-	  see [ruby-dev:42627]
-
-Fri Nov 26 09:48:45 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* re.c (rb_reg_initialize_str): should succeed the taint status from
-	  the origin. [ruby-core:33338]
-
-Fri Nov 26 09:32:37 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* vm_dump.c (dump_thread): seems to be necessary the 3rd argument of
-	  SymGetLineFromAddr64(), even though MSDN says it can be zero.
-
-Fri Nov 26 09:03:38 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regcomp.c (onig_is_prelude): added to check whether ruby is still
-	  in prelude (or other boot processes) or not.
-
-	* regcomp.c (optimize_node_left): use onig_is_prelude for printing.
-
-	* regcomp.c (set_optimize_info_from_tree): ditto.
-
-	* regcomp.c (onig_compile): ditto.
-
-	* regcomp.c (print_compiled_byte_code_list): print its address.
-
-	* regcomp.c (print_indent_tree): print its contents tree of
-	    ANCHOR_PREC_READ(_NOT) and ANCHOR_PREC_BEHIND(_NOT).
-
-Thu Nov 25 23:10:49 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regcomp.c (print_distance_range): use PRIuSIZE.
-
-	* regcomp.c (print_optimize_info): use %ld because the type of
-	  calculated value of integers is long.
-
-	* regexec.c (onig_print_compiled_byte_code): add prototype.
-
-	* regexec.c (match_at): add 2nd argument.
-
-Thu Nov 25 10:29:55 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/dl/callback/mkcallback.rb (gencallback): shouldn't assume that
-	  VALUE is the same size with long.
-
-Thu Nov 25 10:03:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/win32ole/test_err_in_callback.rb (teardown): remove tmp file
-	  only when it exists.
-
-Thu Nov 25 01:38:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/big5-hkscs-tbl.rb: Update table as HKSCS-2008.
-	  patched by oCameLo oTnTh [ruby-core:33256]
-
-	* enc/big5.c: add alias Big5-HKSCS:2008 to Big5-HKSCS.
-
-Wed Nov 24 15:18:07 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* vsnprintf (BSD_vfprintf): use QUADINT macro only when _HAVE_SANE_QUAD_
-	  macro is defined.
-
-Wed Nov 24 12:47:16 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* vsnprintf (BSD_vfprintf): added VC++ compatible size specifications
-	  (I, I32, I64).
-
-Wed Nov 24 11:19:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_inspect): treat UTF-16 and UTF-32 as BE or LE.
-
-Wed Nov 24 06:35:32 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/utf_16_32.trans: add the UTF-32 converter.
-
-Wed Nov 24 05:40:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-Wed Nov 24 06:13:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (filecp, wstr_to_mbstr, mbstr_to_wstr):
-	  refactored.
-
-Wed Nov 24 05:40:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/utf_16_32.trans: add a converter from UTF-8 to UTF-16.
-
-Wed Nov 24 03:21:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/utf_16_32.trans: raise error on unpaired upper
-	  surrogates.
-
-Wed Nov 24 01:40:23 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/utf_16_32.h: add UTF-16 and UTF-32 as a dummy encoding.
-
-	* enc/trans/utf_16_32.trans: add a converter from UTF-16 to UTF-8.
-
-Tue Nov 23 21:59:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (wlink, rb_w32_getppid): use typedef instead of
-	  repeating complicated function prototypes.
-
-Tue Nov 23 18:54:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (rb_thread_mark): should mark self in control
-	  frames.  [ruby-core:33289]
-
-Tue Nov 23 07:57:31 2010  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/delta/parser.{ry,rb}: fixed a bug of token scanner.
-
-Tue Nov 23 07:29:24 2010  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c, rational.c ({nucomp,nurat}_expt): added a check.
-
-Tue Nov 23 07:27:27 2010  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (daynum): should be private.
-
-Tue Nov 23 07:22:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ChangeLog (change-log-indent-text): hanging indent.
-
-Tue Nov 23 06:30:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (SITE_DIR, VENDOR_DIR),
-	  version.c (ruby_initial_load_paths): exclude directories that
-	  are configured without them from $LOAD_PATH. [ruby-core:33267]
-
-	* configure.in (rubylibprefix): No ruby, No libprefix.
-
-Tue Nov 23 01:05:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): don't output floating point
-	  when the precision is 0. [ruby-dev:42615]
-
-Mon Nov 22 21:30:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_inspect): fix for ascii-compatible external
-	  encoding and different encoding string.  [ruby-core:33283]
-
-Mon Nov 22 18:45:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): should not duplicate rules.
-	  bug fix of r29842.
-
-Mon Nov 22 18:04:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/big5.c: split CP950 from Big5.
-
-	* enc/big5.c: split CP951 from Big5-HKSCS.
-
-	* enc/trans/big5.trans: import conversion table of Big5, Big5-HKSCS,
-	  CP950, and CP951 from ICU. they need fallback conversions.
-	  ref [ruby-core:33256]
-	  http://source.icu-project.org/repos/icu/data/trunk/charset/data/ucm/
-
-	* tool/transcode-tblgen.rb (import_ucm): add to import ucm files.
-
-Mon Nov 22 18:33:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_inspect): append for each chars instead of bulk
-	  copy if encoding conversion is needed.  [ruby-core:33283]
-
-Mon Nov 22 14:22:45 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (time_zone): use rb_locale_str_new_cstr to set encoding
-	  as locale and convert its content to internal encoding.
-	  [ruby-core:33278]
-
-Mon Nov 22 11:58:11 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_concat): set ENC_CODERANGE_VALID when the
-	  receiver is 7BIT and the argument is non ASCII.
-
-Mon Nov 22 01:48:58 2010  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb: some improvements for performance.
-
-Sat Nov 20 07:45:50 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/mkmf.rb: adding compilation support for ObjC/ObjC++ extensions.
-	  Thanks Scott Gonyea! [ruby-core:33260]
-
-Sat Nov 20 01:57:55 2010  Akio Tajima  <artonx@yahoo.co.jp>
-
-	* common.mk: add dependency(insns.inc) to compile.obj
-
-Fri Nov 19 23:05:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/Makefile.sub (insns_rules.mk): remove extra backslash.
-
-	* cygwin/GNUmakefile.in, win32/Makefile.sub (clean): rc files are
-	  made at compile time, so should be removed by clean.
-
-Fri Nov 19 22:09:46 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_core.rb
-	  (Tester#test_pretty_format_long_text_finite): skip a test that
-	  uses long string on small memory system. [ruby-dev:42599]
-
-Fri Nov 19 21:07:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb: shell completion support for zsh.  based on
-	  <http://d.hatena.ne.jp/rubikitch/20071002/zshcomplete>
-
-	* lib/optparse.rb: shell completion support for bash.
-
-Fri Nov 19 00:00:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cygwin/GNUmakefile.in (SCRIPTPROGRAMS): no needs on cygwin.
-
-	* win32/Makefile.sub (scriptbin): create script binaries.
-
-Thu Nov 18 23:21:23 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/formatters/pretty.rb (REXML::Formatters::Pretty#wrap):
-	  REXML::Formatters::Pretty#wrap used a recursive method call to
-	  format text.  This switches it to use an iterative approach.
-	  [ruby-core:33245]
-	  Patch by Jeremy Evans. Thanks!!!
-
-	* test/rexml/test_core.rb: add a test for it.
-
-Thu Nov 18 22:58:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/io.h (rb_io_buffer_t): extract from rb_io_t.
-
-Thu Nov 18 07:37:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (reconfig): force reconfigure with previous options.
-
-	* common.mk (showconfig): show configure flags, like as
-	  `config.status --config' generated by recent autoconf.
-
-Thu Nov 18 07:16:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* missing/langinfo.c (strncasecmp): get rid of redefinition.
-
-Thu Nov 18 00:02:17 2010  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	* lib/csv.rb: Upgrading output encoding with ASCII content
-	  as needed.  [ruby-core:33229]
-
-Wed Nov 17 23:19:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/configure.bat: remove quotes from arguments to be quoted.
-
-	* lib/mkmf.rb (create_makefile): use forward slashes in messages.
-
-	* lib/mkmf.rb (create_makefile): make extension libraries messages
-	  brief.
-
-	* win32/Makefile.sub (MAKEDIRS): should not include silent flag.
-
-	* common.mk (ext/ripper/ripper.c, ext/json/parser/parser.c): pass
-	  Q and ECHO.  [ruby-core:33226]
-
-Wed Nov 17 16:09:52 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* test/test_tracer.rb: new test case.
-	  minimal regression test for r29280.
-
-Wed Nov 17 16:04:23 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* test/ruby/envutil.rb (Test::Unit::Assersions#assert_warn):
-	  new assertion to assert that a particular warning message is
-	  displayed.
-	  forward port from branches/ruby_1_9_2@29795.
-
-Wed Nov 17 15:16:48 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regint.h (OnigOpInfoType): constify name.
-
-	* regcomp.c (op2name): constify return value.
-
-	* regcomp.c (onig_print_compiled_byte_code): use PRIuPTR and
-	  uintptr_t to clean warnings.
-
-	* regcomp.c (print_indent_tree): use PRIxPTR and intptr_t.
-
-	* regexec.c (match_at): use PRIdPTR and intptr_t.
-
-Wed Nov 17 09:49:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/shift_jis.c (property_name_to_ctype): fix memory leak.
-
-	* enc/euc_jp.c (property_name_to_ctype): ditto.
-
-Wed Nov 17 08:54:04 2010  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	* lib/csv.rb: Upgrading output encoding as needed.  [ruby-core:33135]
-
-Tue Nov 16 22:30:39 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* vm_insnhelper.c (vm_throw): remove fear of undefined behavior :-)
-	  Coverity Scan found this bug.
-
-Tue Nov 16 09:33:00 2010  Kenta Murata <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb (to_digits): avoid unused
-	  variables warning, reported by Aaron Patterson.
-
-Tue Nov 16 06:39:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* pack.c (PACK_ITEM_ADJUST): return nil not result array and yield
-	  values if block is given.  [ruby-core:33193]
-
-Tue Nov 16 00:21:20 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* regparse.c (and_cclass, or_cclass): fix memory leak.  Coverity Scan
-	  found this bug.  [ruby-dev:42579]
-
-Tue Nov 16 00:07:32 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* gc.c (assign_heap_slot): fix fear of memory leak and memory
-	  violation.  Coverity Scan found this bug.
-
-Mon Nov 15 23:54:45 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* eval_intern.h (CHECK_STACK_OVERFLOW): it was not intended to add
-	  size_t to a pointer typed VALUE*.  Coverity Scan found this defect.
-
-Mon Nov 15 23:41:21 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* compile.c (iseq_set_exception_local_table, iseq_set_local_table,
-	  rb_iseq_build_from_ary): fix type inconsistency (which is benign
-	  because sizeof(ID) == sizeof(ID*), though).  Coverity Scan found
-	  these bugs.
-
-Mon Nov 15 22:47:27 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* vm_eval.c (rb_funcall): ensure va_end after va_init_list.  Coverity
-	  Scan found this bug.
-
-Mon Nov 15 08:36:12 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/racc/parser.rb (do_parse, yyparse): using class eval to define
-	  method and avoid __send__.
-
-Mon Nov 15 06:43:48 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
-	  pointer is invalid.  Thanks Ippei Obayashi! [ruby-dev:42573]
-
-Sun Nov 14 17:57:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/Makefile.in (distclean): should not remove sources which are
-	  distributed in tarball.
-
-Sun Nov 14 16:48:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_set_token_info): turn on/off with directives.
-	  [ruby-core:25442]
-
-Sun Nov 14 12:05:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (argf_readlines): forward to current_file for arguments
-	  check.  http://twitter.com/nagachika/status/3634254856589312
-
-Sun Nov 14 08:48:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/setup.mak (-basic-vars-, -runtime-): suppress trailing
-	  space and compiler command line.
-
-Sun Nov 14 04:22:32 2010  Alexander Zavorine  <alexandre.zavorine@nokia.com>
-
-	* symbian/setup (config.h): Added HAVE_LABS and HAVE_LLABS to config.h.
-
-	* symbian/configure.bat: Changed packaging version in line with API
-	  style 3 versioning.
-
-Sat Nov 13 16:37:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (showflags, help): emit messages at once.
-
-	* win32/Makefile.sub (MSG, EOM): remove surrounding quotes by %~I.
-
-Sat Nov 13 01:31:30 2010  Akio Tajima <artonx@yahoo.co.jp>
-
-	* win32/Makefile.sub: reorder variable End Of Message (don't display it)
-
-Fri Nov 12 20:52:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (showflags, help): use caret to quote leading spaces on
-	  Windows.
-
-	* Makefile.in, common.mk, cygwin/GNUmakefile.in, enc/depend,
-	  ext/ripper/depend, lib/mkmf.rb, win32/Makefile.sub: caddle up.
-
-Fri Nov 12 16:35:31 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: support C level backtrace information on FreeBSD.
-	  When devel/libexecinfo is installed on FreeBSD, now ruby
-	  can show C level backtrace information.
-	  http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/libexecinfo/
-
-Fri Nov 12 09:58:30 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/setup.mak: use findstr.exe instead of find.exe, because all
-	  target build platforms should have findstr.exe, and, find.exe often
-	  means another command such as cygwin's.
-
-Fri Nov 12 00:30:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/Makefile.sub (config.h): need PRI_LL_PREFIX.
-
-Thu Nov 11 23:38:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: ANSI C-conforming const and volatile are mandatory
-
-	* configure.in (AC_C_CONST, AC_C_INLINE, AC_C_VOLATILE): check
-	  before used in other checks.
-
-	* configure.in (RUBY_CHECK_PRINTF_PREFIX): should not break from
-	  RUBY_WERROR_FLAG, so that ac_c_werror_flag gets restored.
-
-Thu Nov 11 23:04:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (warn_deprecated): show caller position.
-
-Thu Nov 11 23:03:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (argf_close): untie tied io before closing.
-
-	* io.c (argf_write): add ARGF.write and so on.
-
-	* io.c (argf_read_nonblock): add ARGF.read_nonblock.
-
-Thu Nov 11 21:49:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/stats.rb (RDoc#print): get rid of NaN.
-
-Thu Nov 11 21:47:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (SHOWFLAGS): show compile flags.
-
-	* common.mk: hide long command lines by default.  verbose-mode is
-	  turned on by V=1 as before.
-	  http://jarp.does.notwork.org/diary/200605b.html#200605121
-
-Thu Nov 11 21:32:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (try_func): accept variable address.
-
-	* ext/win32ole/extconf.rb: libuuid is needed on cygwin.
-
-Thu Nov 11 21:24:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (file_expand_path): use cygwin_conv_path on cygwin 1.7 or
-	  later.
-
-	* ruby.c (push_include_cygwin): ditto.
-
-Thu Nov 11 20:49:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (PRI_LL_PREFIX): format type specifier for
-	  LONG_LONG may vary on platforms.
-
-Thu Nov 11 20:45:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (SYMBOL_PREFIX): separate from EXPORT_PREFIX.
-
-	* win32/mkexports.rb (Exports#each_export): use SYMBOL_PREFIX.
-
-Wed Nov 10 07:20:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cygwin/GNUmakefile.in (scriptbin): make executable file from
-	  scripts with stub.
-
-	* ruby.c (load_file_internal): assume xflag for exe file as well
-	  as no-shebang file.
-
-	* tool/rbinstall.rb: install script programs.
-
-	* win32/mkexports.rb (Exports#initialize): alias ruby_sysinit for
-	  stub.
-
-	* win32/stub.c: stub for scripts.  [EXPERIMENTAL]
-
-Tue Nov  9 21:57:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln.c (init_funcname): allocate and build initialization
-	  funciton name at once.
-
-Tue Nov  9 21:14:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (AC_FUNC_GETPGRP, AC_FUNC_SETPGRP): no need when
-	  not used.
-
-	* configure.in (EXPORT_PREFIX): check generic prefix.
-
-Tue Nov  9 13:24:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regenc.c (onigenc_minimum_property_name_to_ctype):
-	  \p{...} should be case insensitive. [ruby-core:33000]
-
-	* regenc.c (onigenc_property_list_add_property):
-	  ditto.
-
-	* enc/euc_jp.c (init_property_list, property_name_to_ctype):
-	  to lowercase property names.
-
-	* enc/shift_jis.c (init_property_list, property_name_to_ctype):
-	  ditto.
-
-Tue Nov  9 13:29:36 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (overlapped_socket_io): get rid of a warning of 64bit
-	  mingw.
-
-Tue Nov  9 10:44:19 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* util.c (ruby_strtod): this code uses FPU's rounding system.
-	  But x86's FPU calculates double precision floating-point
-	  numbers in 80bit precision, so it fails to round the value.
-	  So ensure the value is assigned a variable. [ruby-dev:42551]
-	  see also [ruby-math:00802]
-	  http://www.shudo.net/java-grandprix99/strictfp/
-
-Tue Nov  9 07:30:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_syserr_new): new function to make SystemCallError
-	  instance without errno.  [EXPERIMENTAL]
-
-	* error.c (rb_syserr_fail, rb_mod_syserr_fail): ditto.
-
-Tue Nov  9 05:54:57 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/*.rb: Remove unused variable warnings.
-	  Patch by Run Paint [ruby-core:30991]
-
-	* lib/rubygems/*, lib/rdoc/*.rb, lib/rake/*.rb: ditto
-
-Mon Nov  8 18:26:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* util.c (ruby_hdtoa): fix type cast and bufsize.
-
-Mon Nov  8 15:40:56 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): fix precision specifier doesn't
-	  work well on %f. [ruby-dev:42552]
-
-Mon Nov  8 14:41:40 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (get_wsa_extension_function): typos.
-
-Mon Nov  8 13:41:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/enc-unicode.rb,
-	  enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
-	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
-	  Add Age property to regexp. [ruby-core:33019]
-	  patched by Ammar Ali, tested by Run Paint Run Run
-
-Mon Nov  8 12:16:39 2010  Ben Walton  <bwalton@artsci.utoronto.ca>
-
-	* configure.in: support -h for solaris linker when gcc not used
-
-Mon Nov  8 11:47:39 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (finish_overlapped_socket): refactoring.
-
-Mon Nov  8 11:02:21 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (get_proc_address): refactoring.
-
-	* win32/win32.c (get_wsa_exetinsion_function): refactoring.
-
-Mon Nov  8 09:45:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/gbk-tbl.rb: Add euro sign. [ruby-core:33094]
-	  CP936, which is de facto definition of GBK, has it.
-	  http://msdn.microsoft.com/en-us/goglobal/cc305153.aspx
-
-Mon Nov  8 07:26:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: check only the first symbol to get rid of
-	  duplication.  [ruby-core:33084] #4031
-
-Sun Nov  7 10:13:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (NM): check on all platforms.  #4031
-
-Sun Nov  7 06:16:33 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* test/openssl/test_ocsp.rb: adding test for r29699.  Thanks Elise
-	  Huard! [ruby-core:32460]
-
-Sat Nov  6 07:33:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_export_prefix): check for prefixed
-	  underscore of exported symbols
-
-	* tool/rbinstall.rb (bin-comm): prepend prolog shell script if
-	  necessary.
-
-	* configure.in (LIBRUBY_RELATIVE): use rpath token expansion.
-
-Sat Nov  6 07:24:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/ruby.pc.in (arch, sitearch): reordered.
-
-	* configure.in: keep failed file.
-
-Sat Nov  6 07:03:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_fork_err): save errinfo before fdopen.
-
-Sat Nov  6 00:43:58 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspcid_initialize): an optional
-	  parameter may be used to specify the OpenSSL::OCSP::CertificateId on
-	  initialization.  Thanks Elise Huard! [ruby-core:32460]
-
-Fri Nov  5 12:23:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_{process,system}.rb (test_fallback_to_sh):
-	  meaningless and wrong tests where /bin/sh does not exist.
-
-	* process.c (proc_spawn_v): should spawn, not exec.
-
-Fri Nov  5 01:21:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_exec_v, proc_spawn_v): try to execute with sh if
-	  no shebang.  [ruby-core:32745] [EXPERIMENTAL]
-
-Fri Nov  5 00:39:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_readlines, rb_io_each_line): limit must not be zero.
-	  a patch from Tomoyuki Chikanaga at [ruby-dev:42538].  #4024
-
-Fri Nov  5 00:14:15 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/fiddle/extconf.rb: fixing ffi library location on windows.
-	  Thanks Usa! [ruby-core:32930]
-
-Thu Nov  4 20:04:44 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_newobj): force garbage_collect() if GC.stress == true.
-
-Thu Nov  4 19:48:22 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* ChangeLog: missed to write a last ChangeLog.
-
-	* gc.c (gc_finalize_deferred): removed.
-
-	* gc.c (rb_gc_finalize_deferred): Do not invoke a free_unused_heaps().
-
-Thu Nov  4 19:45:27 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (run_final): do not need argument obj.
-
-Thu Nov  4 19:26:10 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (before_gc_sweep): fix commit miss.
-
-Thu Nov  4 19:20:46 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (after_gc_sweep, before_gc_sweep):
-	  invoke rb_sweep_method_entry() as soon as possible.
-
-Thu Nov  4 19:13:58 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (after_gc_sweep, slot_sweep): finalizers should be invoked
-	  as soon as possible.
-
-Thu Nov  4 10:30:40 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* configure.in (--with-valgrind): Now this option is default on.
-	  You can still explicitly disable this feature by specifying
-	  --without-valgrind.
-
-Thu Nov  4 02:06:16 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* cont.c (fiber_t_alloc): raise an error when fiber is going to be
-	  initialized twice.  [ruby-dev:42524]
-
-Thu Nov  4 02:04:25 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* cont.c (rb_fiber_resume): raise an "double resume" error when root
-	  fiber is going to be resumed.  [ruby-dev:42523]
-
-Wed Nov  3 14:17:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/ostruct.rb (OpenStruct#delete_field): also undefine
-	  accessor methods.  [ruby-core:33010]
-
-Wed Nov  3 14:13:46 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_enc_cr_str_buf_cat): concatenation of valid
-	  encoding string and invalid encoding string should result
-	  invalid encoding.  [ruby-core:33027]
-
-Wed Nov  3 08:58:59 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c, vm.c, vm_core.h: remove USE_VALUE_CACHE option.
-
-Wed Nov  3 07:47:25 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple
-	  regex options.  a patch from Heesob Park in [ruby-core:32988].
-
-Wed Nov  3 07:33:57 2010  Tanaka Akira  <akr@fsij.org>
-
-	* vm_method.c (rb_clear_cache_by_class): just return if the class has
-	  no method.  reported by Eric Wong.  [ruby-core:32689]
-
-Tue Nov  2 22:50:25 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/visitor.rb (initialize): push accessor
-	  methods to subclass that actually uses them.
-
-Tue Nov  2 22:47:08 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/visitor.rb (accept): switch to
-	  a dispatch cache rather than case / when statement.
-
-Tue Nov  2 21:46:52 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* NEWS: fix a typo.
-
-Tue Nov  2 20:10:32 2010  Tajima Akio <artonx@yahoo.co.jp>
-
-	* test/rake/test_tasks.rb: clear env var which is used by the test.
-	  [ruby-dev:42508]
-
-Tue Nov  2 00:25:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/extconf.rb: win64 is just same with win32 about socket.
-	  notice: but wince is not same.
-
-Mon Nov  1 21:25:57 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* main.c: <stdlib.h> is needed, to introduce the getenv(3)
-	  prototype declaration.  Without it a C compiler shall infer
-	  the getenv type as "int getenv(...);", but this is totally
-	  wrong, especially when your machine's sizeof(int) and
-	  sizeof(char*) differs.  On such environment a return value
-	  of getenv(3), which is in fact a char*, might first casted
-	  into a int (loses data here), and then casted back to char*
-	  by automatic integral promotion to fit to the prototype of
-	  ruby_set_debug_option().
-
-Sun Oct 31 23:27:09 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (finalizer_table, objspace->final.table):
-	  Create finalizer_table at Init_heap().
-	  Remove all null checks of finalizer_table.
-
-	* gc.c (mark_tbl): skip if no table entries.
-
-	* gc.c (slot_swee): remove useless need_call_final check.
-
-Sun Oct 31 22:32:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (rb_objspace_free): finalizers should be called separately
-	  from freeing objspace.  [ruby-dev:42479]
-
-Sun Oct 31 22:24:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ruby_cleanup): free current VM and its objspace even
-	  when exiting by SystemExit.
-
-Sun Oct 31 22:10:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (new_child_iseq): adjust argument types.
-
-	* iseq.c (prepare_iseq_build, rb_iseq_new),
-	  (rb_iseq_new_with_bopt_and_opt, rb_iseq_new_with_opt),
-	  (rb_iseq_new_with_bopt): ditto.
-
-	* compile.c (iseq_set_exception_table): suppress warnings.
-
-	* insns.def (putspecialobject, defined): ditto.
-
-	* iseq.c (iseq_load): ditto.
-
-Sun Oct 31 09:30:51 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: some refactoring.
-	  - move decl. of rb_compile_option_struct to iseq.h.
-	  - define enum iseq_type.
-	  - define enum vm_special_object_type.
-
-	* compile.c: some refactoring.
-	  - apply above changes.
-	  - (struct iseq_link_element): change value of type.
-	  - remove unused decl.
-	  - fix comment.
-	  - rename iseq_build_body and iseq_build_exception to
-	    iseq_build_from_ary_body and iseq_build_from_ary_exception.
-
-	* iseq.h: define enum catch_type and enum defined_type.
-
-	* insns.def: apply above changes.
-
-	* iseq.c: define ISEQ_MAJOR_VERSION and ISEQ_MINOR_VERSION.
-
-Sat Oct 30 23:38:59 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/encoding.rb: untabify.
-
-Sat Oct 30 21:06:37 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/encoding.rb: use Ruby native encoding mechanism.
-	  [ruby-dev:42464]
-	* lib/rexml/encodings/: remove.
-
-	* lib/rexml/document.rb, lib/rexml/formatters/default.rb,
-	  lib/rexml/output.rb, lib/rexml/parseexception.rb,
-	  lib/rexml/parsers/baseparser.rb, lib/rexml/source.rb,
-	  lib/rexml/xmldecl.rb: use Ruby's native Encoding object.
-
-	* test/rexml/, test/rss/: follow the above encoding changes.
-
-	* NEWS: add REXML's incompatible change about encoding.
-
-Sat Oct 30 17:23:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_strtod): get rid of overflow/underflow as possible.
-
-Sat Oct 30 14:37:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ruby_pc): erase runtime-defined variables and
-	  check if generated pc file is valid.
-
-	* template/ruby.pc.in (DEFFILE): need for mingw.
-
-	* template/ruby.pc.in (LIBRUBY): fix the order.
-
-Sat Oct 30 11:33:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/Makefile.sub (ruby_pc): ignore missing variables.
-
-	* template/ruby.pc.in: add missing variables for mswin.
-
-Sat Oct 30 10:24:35 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* object.c: Make BasicObject.new accept no parameter.
-	  Revert of r26135 [ruby-core:27080], as per [ruby-core:32952].
-
-Sat Oct 30 09:40:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c: use constants in id.h.
-
-Sat Oct 30 09:08:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/fiddle/closure.c (fiddle_closure): embed cif not reference
-	  so that the content surely get initialized.  [ruby-dev:42480]
-
-Sat Oct 30 07:01:53 2010  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv-replace.rb: suppress warning.
-
-	* lib/open-uri.rb: ditto.
-
-Sat Oct 30 06:32:52 2010  Tanaka Akira  <akr@fsij.org>
-
-	* test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the
-	  group of the created file is inherited from the parent
-	  directory on BSDs and MacOS X.  Linux also inherit the group if
-	  the setgid bit of the directory is set.  It causes the test fail.
-	  fixed by Shota Fukumori.  [ruby-dev:42458]
-
-Sat Oct 30 05:58:54 2010  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb: retry via TCP if UDP reply is truncated.
-	  fixed by Julian Mehnle.  [ruby-core:32407]
-
-Sat Oct 30 00:35:13 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (iseq_s_compile): fix optional argument.
-	  a patch from Yutaka HARA [ruby-core:32953] [Ruby 1.9-Bug#4001]
-
-Sat Oct 30 00:24:42 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c (memsize_of): take care of
-	  T_CLASS/const_tbl.
-	  a patch from nagachika <nagachika00@gmail.com> [ruby-dev:42490]
-
-Fri Oct 29 23:32:36 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* test/profile_test_all.rb: added.
-	  You can use test-all profiler with the following command:
-	    RUBY_TEST_ALL_PROFILE=true make test-all
-	  This command generates ./test_all_profile and you can analyze
-	  which tests consume memories.
-
-	* test/runner.rb: ditto.
-
-Fri Oct 29 10:02:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/enc-unicode.rb,
-	  enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
-	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
-	  Add 'Unknown' Script.
-	  patched by Run Paint Run Run. [ruby-core:32937] #3998
-
-Fri Oct 29 05:13:34 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c (ObjectSpace.memsize_of_all): rename
-	  ObjectSpace.total_memsize_of_all_objects() to
-	  ObjectSpace.memsize_of_all([klass]).
-	  Accept Class object to filter the objects.
-
-	* test/objspace/test_objspace.rb: fix test for above change.
-
-Fri Oct 29 03:04:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_dump): fix expected length. [ruby-core:32935]
-
-Thu Oct 28 23:31:39 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (before_gc_sweep, run_final): fix decrement timing of final_num.
-
-Thu Oct 28 20:11:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/enc-unicode.rb,
-	  enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
-	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
-	  Update Oniguruma for Unicode 6.
-	  patched by Run Paint Run Run. [ruby-core:32923] #3989
-
-Thu Oct 28 20:06:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/oniguruma.h (ONIGENC_CTYPE_SPECIAL_MASK):
-	  change mask from 128 to 256. [ruby-core:32931]
-
-Thu Oct 28 12:06:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/webrick/httprequest.rb (read_request_line): extend max
-	  length to 2083. This is from Internet Explorer's max uri
-	  length. http://support.microsoft.com/kb/208427 [ruby-core:32924]
-
-Thu Oct 28 04:00:08 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (GC.stat): added.  [ruby-dev:38607]
-
-	* test/ruby/test_gc.rb: add a test for above.
-
-Thu Oct 28 03:13:06 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c (memsize_of): fix rdoc.
-
-	* ext/objspace/objspace.c (total_memsize_of_all_objects): added.
-
-	* test/objspace/test_objspace.rb:
-	  - add a test for ObjectSpace.total_memsize_of_all_objects.
-	  - add two tests for ObjectSpace.memsize_of (for nil and Fixnum).
-
-Wed Oct 27 23:55:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (Init_iconv): warn deprecated use.
-
-Wed Oct 27 18:50:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bignum.c (rb_big2long, rb_big2ulong): rb2ulong() returns VALUE, but
-	  its real range is ulong. So, if the size of VALUE is bigger than
-	  ulong, upper bits are always zero even if the actual value is
-	  negative.
-	  fixed #3490
-
-Wed Oct 27 18:27:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (TestIO#pipe): should close write end of pipe
-	  before closing read end, to get rid of timing problem.
-
-	* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
-
-Wed Oct 27 18:14:27 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_getppid): support Win64.
-
-Wed Oct 27 15:07:19 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread_win32.c (w32_error): should get error no only once, because
-	  the result of the second getting will indicate the error of the
-	  first FormatMessage() call.
-
-Wed Oct 27 13:51:25 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (TestIO#pipe): need to propagate exceptions
-	  in read/write thread. fix r29541.
-
-	* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
-
-Wed Oct 27 12:05:40 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* class.c (clone_const): need to return value. fix r29602.
-
-Wed Oct 27 11:58:58 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/ruby.h (NUM2LONG_internal): add cast to get rid of a
-	  non GCC compiler warning. this is intentional type conversion.
-
-Wed Oct 27 09:25:46 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* cont.c: apply documentation patch by Run Paint Run Run.
-	  [ruby-core:32915]
-
-Wed Oct 27 02:12:10 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* object.c (Init_Object), constant.h, variable.c
-	  (rb_mod_private_constant, rb_mod_public_constant,
-	  set_const_visibility, rb_const_get_0): add Module#public_constant
-	  and private_constant.  [ruby-dev:39685][ruby-core:32698]
-
-	* test/ruby/test_module.rb: add tests for above.
-
-Wed Oct 27 02:02:54 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* class.c, constant.h, gc.c, method.h, object.c, variable.c,
-	  vm_insnhelper.c: use struct rb_constant_entry_t as entry of
-	  RCLASS_CONST_TBL.  RCLASS_CONST_TBL has contained VALUE of constant
-	  directly.  Now instead rb_const_entry_t is contained in
-	  RCLASS_CONST_TBL,  rb_const_entry_t is managed by malloc, and
-	  have not only the value itself but also visibility flag.
-	  This is another preparation for private constant (see
-	  [ruby-dev:39685][ruby-core:32698]).
-
-Wed Oct 27 01:56:34 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* class.c, gc.c, object.c, variable.c, vm_insnhelper.c,
-	  include/ruby/ruby.h: separate RCLASS_CONST_TBL from RCLASS_IV_TBL.
-	  RCLASS_IV_TBL has contained not only instance variable table but
-	  also constant table.  Now the two table are separated to
-	  RCLASS_CONST_TBL and RCLASS_IV_TBL.  This is a preparation for
-	  private constant (see [ruby-dev:39685][ruby-core:32698]).
-
-Tue Oct 26 18:51:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/scanf.rb (extract_float): allow 2.e+2 style.
-	  [ruby-dev:42452] #3978
-
-Tue Oct 26 18:09:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (ASFLAGS): needs INCFLAGS.
-
-	* configure.in (rb_cv_dynamic_alloca): check if extra source for
-	  dynamic size alloca.
-
-	* missing/x86_64-chkstk.s (___chkstk): necessary for alloca of
-	  amd64-mingw32msvc-gcc on Ubuntu.
-
-	* thread_win32.c (ruby_alloca_chkstk): check stack overflow
-
-Tue Oct 26 18:04:53 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/ruby.pc.in (Libs): needs DLDFLAGS.
-
-Tue Oct 26 12:47:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (pkgconfig-data): moved from Makefile.in.
-
-	* tool/rbinstall.rb: install pc file only if non-empty.
-	  [ruby-core:32901] #3983
-
-	* win32/Makefile.sub (ruby_pc): create pc file.
-
-Tue Oct 26 09:13:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_gcc_atomic_builtins): check for atomic
-	  builtins, all are not available in Apple derivative gcc.
-
-Tue Oct 26 00:29:26 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (pkgconfig-data): create pkg-config metadata file.
-
-	* tool/rbinstall.rb: install pkg-config metadata file.
-
-	* template/ruby.pc.in: template of pkg-config metadata file.
-
-Mon Oct 25 16:38:07 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* signal.c  (rb_atomic_t): GCC (of  at least  recent versions)
-	  has  ubiquitous  support  for  atomic operations.   On  that
-	  compiler a C program can  issue a memory barrier using these
-	  dedicated  instructions.  According to  the GCC  manual they
-	  cargo culted  this feature form  the Itanium ABI  so chances
-	  are that  other compilers  could also support  this feature.
-	  But so far GCC is the  only compiler that I know to have it.
-	  Also note that this works on non-Itanium machines.
-
-Mon Oct 25 06:21:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): prec digits fractal part should be
-	  appended to 0 if prec is given.  [ruby-dev:42453] #3979
-
-Mon Oct 25 02:57:21 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk (run.gdb): Quit gdb on 'make gdb' when
-	  no signals are received.
-
-Mon Oct 25 00:25:23 2010  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb: some corrections of documentation.
-
-Sun Oct 24 17:14:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c, gc.c, hash.c, object.c, string.c, struct.c,
-	  transcode.c, variable.c, vm.c, vm_insnhelper.c, vm_method.c:
-	  replace calls to rb_error_frozen() with rb_check_frozen().  a
-	  patch from Run Paint Run Run at [ruby-core:32014]
-
-	* include/ruby/intern.h (rb_check_frozen): optimize.
-	  [ruby-core:32878]
-
-Sun Oct 24 15:16:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb (Test::Unit::Mini#run): abort if interrupted.
-
-	* lib/test/unit.rb (Test::Unit::Mini#run_test_suites): show the
-	  result even when interrupted on the way.
-
-	* lib/test/unit.rb (Test::Unit::Mini#run_test_suites): ensure
-	  output sync mode to be restored.
-
-Sun Oct 24 14:11:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (vm_define_method): defined method is run with the default
-	  public visibility regardless the visibility context of definition.
-	  [ruby-core:30638]
-
-Sun Oct 24 12:08:54 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/test/unit.rb: make test/unit play nicely with the rake test
-	  loader. [ruby-core:32864]
-
-Sun Oct 24 00:25:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_rubyoptions.rb (test_segv_test): follow up the
-	  change at r29556.
-
-Sat Oct 23 14:39:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb: $extmk should be true for test/runner.
-
-Sat Oct 23 10:55:37 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_dump.c (rb_vm_bugreport): fix to add bug outputs.
-	  - loaded script ($0)
-	  - loaded features ($")
-	  - process memory map on Linux (/proc/self/maps)
-
-	* vm_dump.c (rb_vmdebug_stack_dump_raw): fix header message.
-
-Fri Oct 22 14:50:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
-	  assertion message must not be nil.
-
-Fri Oct 22 13:59:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
-	  treat nil case. Please run test-all before commit such change.
-
-Thu Oct 21 23:58:14 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_lazy_sweep): Variable declarations should be at
-	  the head of block.
-
-Thu Oct 21 23:56:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (objspace_each_objects, rb_objspace_each_objects): use
-	  struct.
-
-	* gc.c (objspace_each_objects): fix return with no value.
-
-Thu Oct 21 23:47:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (dir_initialize): remove useless intermediate variable.
-
-Thu Oct 21 16:07:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (rb_f_select): change rdoc.
-	  patched by Eito Katagiri [ruby-core:31805]
-
-Thu Oct 21 15:55:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/webrick/httpauth/digestauth.rb
-	  (WEBrick::HTTPAuth::ProxyDigestAuth#check_uri): privated.
-	  [ruby-dev:42344]
-
-Thu Oct 21 15:50:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (rb_f_select): add correct rdoc.
-	  patched by Dave Thomas [ruby-core:32467]
-
-Thu Oct 21 15:42:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/telnet.rb (Net::Telnet#close): added.
-	  patched by Erik Hollensbe [ruby-dev:42260] #3830
-
-Thu Oct 21 13:08:00 2010  Narihiro Nakamura  <authornari@gmail.com>
-
-	* gc.c (rb_objspace_each_objects): don't lazy sweep in
-	  rb_objspace_each_objects. [Bug #3940] [ruby-dev:42369]
-
-Thu Oct 21 00:05:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_io.rb (TestIO#pipe): get rid of deadlock on pipe.
-	  a patch from Tomoyuki Chikanaga at [ruby-dev:42435].  #3970
-
-	* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
-
-Wed Oct 20 23:54:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/dbm/dbm.c: rdoc based on a patch by mathew meta AT
-	  pobox.com, at [ruby-core:32853].
-
-Wed Oct 20 10:47:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* util.c (ruby_strtod): reject 0x1.p+0. [ruby-dev:42432] #3966
-
-Wed Oct 20 10:00:57 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): print floating point on "%#a".
-	  [ruby-dev:42431] Bug#3965
-
-Tue Oct 19 19:30:11 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): clear ALT flag for %a.
-	  [ruby-core:32841] [ruby-core:32848]
-
-Tue Oct 19 12:19:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): fix over-count of field size.
-
-Tue Oct 19 03:08:52 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): use HEXPREFIX flag for prefix of %a.
-	  [ruby-core:32841]
-
-Mon Oct 18 13:18:01 2010  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c (rb_digest_class_init): Define
-	  Digest::Class.new(). [Feature #3954]
-
-Mon Oct 18 12:58:40 2010  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c (pack_pack): refine the document.  [ruby-dev:42397]
-	  (pack_unpack): ditto.
-
-Mon Oct 18 10:19:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (transport_request): @socket may be nil.
-	  patched by Egbert Eich [ruby-core:32829]
-
-Mon Oct 18 09:57:28 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* sprintf.c (BSD_vfprintf): wrong padding around prefix and
-	  floating point with %a. [ruby-dev:42403] Bug #3956
-
-Sun Oct 17 22:36:33 2010  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/delta.rb: added an rdoc tag.
-
-Sun Oct 17 10:47:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_mod_remove_const): update rdoc.
-	  [ruby-core:31957]
-
-Sun Oct 17 10:40:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_define_{class,module}_id_under): register to be
-	  marked, which probably are defined and used internally.
-
-Sat Oct 16 11:10:55 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_encoding2cp): set codepage 20936
-	  according to GB2312. [Bug #3937] [ruby-core:32758]
-
-Sat Oct 16 10:54:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (CPP): already used in .c.i rule.
-
-	* cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and
-	  --preprocessor options explicitly.  [ruby-core:32776]
-
-Sat Oct 16 10:06:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/sdbm/_sdbm.c (SEEDUPS, BADMESS): make settable using command
-	  line options.
-
-	* ext/sdbm/_sdbm.c (makroom): suppress unused result warning.
-
-	* ext/sdbm/extconf.rb: disable BADMESS, a library should not emit
-	  messages directly.
-
-Sat Oct 16 08:39:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln.c (dln_strerror): get English message first, instead of
-	  system default. see [ruby-dev:42358].
-
-Sat Oct 16 00:08:00 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* hash.c (rb_hash_aref): skip calling "default" method
-	  if it is not needed, for speed-up.
-
-Fri Oct 15 23:36:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (NUM2DEVT, DEVT2NUM, PRI_DEVT_PREFIX): fallback to
-	  unsigned int.
-
-Fri Oct 15 22:54:46 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_hresult2msg): get English message first,
-	  instead of system default. [ruby-core:32765]
-
-Fri Oct 15 22:47:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (VALUE): prefer long over uintptr_t,
-	  FIX2LONG expects VALUE to be long at least.
-
-	* include/ruby/ruby.h (FIX2LONG): parenthesize the argument.
-
-Fri Oct 15 20:30:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (dev_t): use RUBY_REPLACE_TYPE.
-
-	* file.c (rb_stat_inspect): use PRI_DEVT_PREFIX.
-
-Fri Oct 15 17:26:57 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* pack.c (pack_pack): simplify comparison of explicit_endian
-	  as pointed by nobu.
-
-	* pack.c (pack_unpack): ditto.
-
-Fri Oct 15 16:40:37 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* pack.c (pack_pack): fix more than one modifiers appear in the
-	  format string. [ruby-core:32793]
-
-	* pack.c (pack_unpack): ditto.
-
-Thu Oct 14 23:20:42 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_folderitem2_invokeverb.rb: refactoring.
-
-Thu Oct 14 22:18:29 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, iseq.c, vm_insnhelper.c: rename variable name
-	  (ip -> iseq).
-
-Thu Oct 14 20:41:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* pack.c (pack_pack): support endian modifiers: < and >.
-	  [ruby-dev:42376] Feature #3491
-
-	* pack.c (pack_unpack): ditto.
-
-Thu Oct 14 20:50:51 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (reg_get_val): expand environment in
-	  the pathname. [Bug #3907]
-
-Thu Oct 14 07:35:07 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* file.c (DEVT2NUM): added. Size of dev_t is depend on the
-	  environment even if POSIX defines dev_t as unsigned integer.
-	  For example, OpenVMS, 64bit Solaris 9, and NetBSD 6 defines
-	  dev_t as 64bit unsigned integer.
-
-	* file.c (rb_stat_dev): use DEVT2NUM.
-
-	* file.c (rb_stat_dev_major): dev_t is not long. major(3)'s return
-	  value is int.
-
-	* file.c (rb_stat_dev_minor): dev_t is not long. minor(3)'s return
-	  value is int.
-
-	* configure.in: check size of dev_t.
-
-Thu Oct 14 07:22:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_and, rb_ary_or), class.c (rb_mod_init_copy),
-	  gc.c (undefine_final), time.c (time_mload): get rid of
-	  type-punning casts.
-
-Thu Oct 14 04:16:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (ruby_float_step): fix Numeric#step with infinity unit
-	  doesn't works well. [ruby-core:32779]
-
-Wed Oct 13 23:16:46 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/enc-unicode.rb: get rid of lots of warnings.
-
-	* iseq.c (insn_operand_intern, rb_iseq_disasm): fix format specifiers.
-
-	* vm.c (thread_free): ditto.
-
-	* numeric.c (check_uint): get rid of overflow on LLP64 platforms.
-
-	* insns.def (opt_case_dispatch): use st_data_t.
-
-Wed Oct 13 22:32:34 2010  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
-
-	* lib/cgi/util.rb (CGI::unescape): bugfix to unescape the multibyte
-	  string. Thanks nobu and tDiary dev members. [Bug #3909]
-
-Wed Oct 13 21:13:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (int_chr): raise error when the value is negative.
-
-Wed Oct 13 19:24:08 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* vm.c (ruby_vm_destruct): This function type was wrong; correct to the prototype.
-
-Wed Oct 13 14:58:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (rb_num_to_uint): fix 32bit logic.
-
-Wed Oct 13 12:53:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (rb_num_to_uint): added to check the range of arguments.
-	  Mainly for negative value with NUM2UINT on 32bit environment.
-
-	* string.c (rb_str_concat): use rb_num_to_uint.
-
-Wed Oct 13 12:10:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread_win32.c (w32_error): get English message first, instead
-	  of system default. see [ruby-core:32765].
-	  [experimental]
-
-Wed Oct 13 11:04:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* debug.c (ruby_set_debug_option): define always for binary
-	  compatibility with debug env enabled binary.
-
-	* signal.c (ruby_enable_coredump): ditto.
-
-Wed Oct 13 10:52:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (ruby_executable_node): missing prototype.
-
-Wed Oct 13 05:23:04 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* missing/strchr.c: add strlen's prototype.
-
-	* missing/strstr.c: ditto.
-
-Wed Oct 13 00:21:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck/rubyext.c (struct mktime_arg): constified.
-
-	* ext/syck/rubyext.c (mktime_do, mktime_r, rb_syck_mktime): fix
-	  function signatures.
-
-Wed Oct 13 00:18:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* st.c (MurmurMagic): get rid of literal overflow.
-
-	* configure.in (RUBY_CHECK_PRINTF_PREFIX): check for printf format
-	  specifier if possible.
-
-Tue Oct 12 23:58:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_open_osfhandle, rb_w32_wopen, rb_w32_pipe):
-	  use uintptr_t instead of long for win64.
-
-	* win32/win32.c (socketpair_internal): suppress warnings.
-
-	* win32/win32.c (ftruncate): use HANDLE instead of long for win64.
-
-	* vsnprintf.c (BSD_vfprintf): fix cast.
-
-	* numeric.c (rb_num2fix): result of rb_num2long is SIGNED_VALUE.
-
-	* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
-	  (syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
-	  (run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
-	  (rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
-	  iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
-	  thread.c (rb_thread_local_aref),
-	  variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
-	  (rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
-	  vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
-	  ext/iconv/iconv.c (map_charset): use st_data_t.
-
-	* compile.c (iseq_build_body), insns.def (getglobal, setglobal),
-	  iseq.c (iseq_load, iseq_data_to_ary), util.c (valid_filename):
-	  use VALUE.
-
-	* gc.c (obj_free, rb_objspace_call_finalizer): fix truncating
-	  cast.
-
-	* gc.c (mark_current_machine_context): suppress warnings.
-
-	* compile.c (iseq_compile_each): fix truncating cast.
-
-	* cont.c (fiber_setcontext): missing variable definition.
-
-Tue Oct 12 19:25:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* error.c (exc_to_s): use OBJ_INFECT.
-
-	* error.c (name_err_to_s): ditto.
-
-	* error.c (name_err_mesg_to_str): ditto.
-
-	* error.c (syserr_initialize): ditto.
-
-Tue Oct 12 19:07:55 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* error.c (syserr_initialize): taint message if mesg is given
-	  and it is tainted.
-
-Tue Oct 12 18:25:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (rb_io_ungetc): always see Bignum. On 32bit valid value
-	  may be a Bignum. On 64bit for errors. [ruby-dev:42366]
-
-Tue Oct 12 18:25:04 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_concat): use unsigned int for GB18030.
-
-Tue Oct 12 17:53:49 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric (check_uint): the mask must refer to VALUE.
-
-Tue Oct 12 17:47:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric (check_uint): set MSB for negative value.
-
-	* numeric (rb_num2uint): return value's type of rb_num2ulong
-	  is VALUE.
-
-	* numeric (int_chr): variable i can't be negative.
-
-Tue Oct 12 16:04:37 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_strerror): get English message first, instead
-	  of system default. see [ruby-dev:42358].
-	  [experimental]
-
-Tue Oct 12 15:52:35 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_strerror): unmap some range of errno for
-	  workaround of VC10's strerror() and sys_nerr problem.
-	  based on a patch from Akio Tajima, [ruby-dev:42355].
-
-Tue Oct 12 15:36:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (rb_io_ungetc): use unsigned int for GB18030.
-
-Tue Oct 12 15:14:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (rb_io_putc): support multibyte characters.
-	  [ruby-core:30697]
-
-Tue Oct 12 15:10:31 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (rb_enc_uint_chr): split from int_chr.
-
-	* numeric.c (int_chr): use rb_enc_uint_chr.
-
-	* include/ruby/encoding.h (rb_enc_uint_chr): added.
-
-Tue Oct 12 14:04:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (int_chr): a codepoint of Ruby M17N must be 32bit
-	  unsigned int; GB18030 uses MSB. Also note that OnigCodePoint
-	  is defined as unsigned int.
-
-Tue Oct 12 12:20:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* vm_dump.c (dump_thread): foolish mistake.
-
-Tue Oct 12 10:39:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_MINGW32): canonicalize only on mingw.
-
-Mon Oct 11 20:20:23 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (HTTP.get): specify ASCII-8BIT as the result
-	  encoding of Zlib::GzipReader.
-	  http://hibari.2ch.net/test/read.cgi/tech/1281473294/271
-
-Mon Oct 11 17:42:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* error.c (syserr_initialize): use mesg's encoding when locale
-	  encoding is US-ASCII. If locale encoding is not US-ASCII,
-	  assume err has non ASCII characters. [ruby-dev:42358]
-
-Mon Oct 11 14:03:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* error.c (syserr_initialize): set the encoding of Errno::*#message
-	  as locale. [ruby-dev:42358]
-
-Mon Oct 11 06:38:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_set_encoding):
-	  StringIO#set_encoding can get 2nd argument and optional hash
-	  for API compatibility to IO. [ruby-dev:42356]
-
-Mon Oct 11 06:11:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (rb_io_set_encoding): use rb_funcall2 when the io is not
-	  a T_FILE. [ruby-dev:42356]
-
-Sun Oct 10 18:42:23 2010  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb (Set#replace): Apply a bit of optimization.
-
-Sun Oct 10 10:20:07 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_MINGW32): canonicalize as like mswin version.
-
-Sun Oct 10 05:33:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (rb_signal_buff_size, rb_signal_exec): moved
-	  declarations from thread.c.
-
-Sat Oct  9 16:54:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RSHIFT): quote to get rid of argument expansion
-	  for autoconf 2.68.
-
-Sat Oct  9 11:00:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_reset_event_flags, exec_event_hooks): ignore
-	  hooks marked as removed.
-
-	* thread.c (thread_exec_event_hooks): remove hooks to be removed.
-
-	* thread.c (rb_threadptr_remove_event_hook, rb_remove_event_hook):
-	  defer removing hooks if running the hooks.  [ruby-dev:42350]
-
-Sat Oct  9 10:51:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_threadptr_exec_event_hooks): suppress each event
-	  hooks separately.
-
-	* thread.c (thread_suppress_tracing): split from
-	  ruby_suppress_tracing, accepting thread pointer and event mask.
-
-Sat Oct  9 08:16:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_threadptr_remove_event_hook): fix typo.
-
-Fri Oct  8 10:52:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (RBCONFIG): depends on version.h due to
-	  RUBY_PATCHLEVEL.  [ruby-core:32709]
-
-Fri Oct  8 00:24:54 2010  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	* lib/csv.rb: Fixing documentation typos.  [ruby-core:32712]
-
-Thu Oct  7 09:14:28 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_exec.c (vm_exec_core):  Treat clang as non gcc on this
-	  context: It has __asm__ but doesn't works well.
-
-Wed Oct  6 12:28:22 2010  Tanaka Akira  <akr@fsij.org>
-
-	* lib/uri/generic.rb (URI::Generic#hostname): new method.
-	  (URI::Generic#hostname=): ditto.
-
-	* lib/open-uri.rb: use URI#hostname
-
-	* lib/net/http.rb: ditto.
-
-	  reported by Adam Majer.  [ruby-core:32056]
-
-Wed Oct  6 11:52:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (fptr_finalize): write_mutex might have been destroyed
-	  already in finalization phase, as the order of finalizers is not
-	  guaranteed.  rb_mutex_t should be used in place of Mutex object
-	  in the future.
-
-Tue Oct  5 22:17:02 2010  wanabe  <s.wanabe@gmail.com>
-
-	* win32/mkexports.rb: revert r29320 and r29402.
-
-Mon Oct  4 12:43:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (regexp): dregexp has literal string only at the head
-	  and successors are array.  [ruby-core:32682]
-
-Mon Oct  4 10:22:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* random.c (rand_init): This checks the value is in 32bit or not,
-	  so use int32_t, not int.
-
-Mon Oct  4 09:47:39 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* random.c (rand_init): remove useless assignment.
-
-	* re.c (update_char_offset): remove unused variable.
-
-	* re.c (read_escaped_byte): ditto.
-
-Mon Oct  4 09:30:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/bn.rb (Integer#to_bn): OpenSSL::BN.new
-	  accepts only Strings, so call Integer#to_s(16).
-	  16 is for an optimization. [ruby-dev:42336]
-
-Mon Oct  4 07:57:51 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* cont.c (fiber_memsize): Return size.
-	  Before this change, fiber_memsize always returns 0.
-
-Mon Oct  4 07:16:55 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/unicode.c (onigenc_unicode_property_name_to_ctype):
-	  remove useless assignment.
-
-	* vm.c (vm_make_proc_from_block): ditto.
-
-	* variable.c (rb_ivar_count): ditto.
-
-Mon Oct  4 06:40:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* Makefile.in (clean-rdoc): Don't use \ in variable expansion.
-	  BSD make treats it as an escape character.
-
-Mon Oct  4 00:01:53 2010  wanabe  <s.wanabe@gmail.com>
-
-	* tool/config.sub: revert r29320, r29324, r29347, r29354, r29365
-	  to automake-1.11.1. [ruby-core:32634]
-
-	* win32/mkexports.rb: no longer use 'mingw64'. a patch from Luis Lavena
-	  at [ruby-core:32678].
-
-Sun Oct  3 20:36:37 2010  Akio Tajima (arton)  <artonx@yahoo.co.jp>
-
-	* test/win32ole/test_folderitem2_invokeverb.rb: Change creating
-	  shortcut verb to 'Link' [Bug #3339]
-
-Sun Oct  3 19:44:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (Makefile): get rid of duplicated ruby target when
-	  already there it was.
-
-Sat Oct  2 22:59:32 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_thread.rb: add for win32ole with Thread.
-
-Fri Oct  1 17:03:00 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* test/webrick/test_httpproxy.rb (TestWEBrickHTTPProxy::test_upstream_proxy):
-	  My machine fails this test at this line, saying 503 service unavailable.
-
-Thu Sep 30 16:11:08 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_getenv): should return NULL if specified name
-	  is empty. a patch from Heesob Park at [ruby-core:32650]
-
-Thu Sep 30 15:18:23 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (command_asgn): allow command_call to be right hand side
-	  expression of chained assignment.  [ruby-dev:42313]
-
-Thu Sep 30 10:55:38 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* hash.c (ruby_setenv): workaround for old Windows. a patch from
-	  Heesob Park. [ruby-core:32353]
-
-Thu Sep 30 09:29:06 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/common.rb (URI.encode_www_form): change treatment of
-	  undefined value in given array as latest internet draft for
-	  application/www-form-urlencoded.
-	  http://tools.ietf.org/html/draft-hoehrmann-urlencoded-01
-
-Thu Sep 30 09:34:03 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* vm_dump.c (dump_thread): fixed wrong type of return value of
-	  SymGetModuleBase64(). [ruby-dev:42306]
-
-Wed Sep 29 21:04:05 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* test/ruby/test_rubyoptions.rb (TestRubyOptions::test_script_from_stdin):
-	  As usual, PTY is not always available.
-
-Wed Sep 29 18:38:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/config.sub (x64): regularize only for pc vendor, and strip
-	  useless 64 suffix.
-
-Wed Sep 29 17:53:02 2010  Kenta Murata <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BIGDECIMAL_ENABLE_VPRINT):
-	  VPrint is usually disabled.  It's only used in debugging.
-
-Wed Sep 29 17:41:34 2010  Kenta Murata <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_save_limit):
-	  return the result of a block.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_save_limit):
-	  add a test for the above change.
-
-Wed Sep 29 16:18:03 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* vm_dump.c (dump_thread): remove unused optional arguments.
-
-Wed Sep 29 13:26:30 2010  Kenta Murata <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_save_rounding_mode):
-	  return the result of a block.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_save_rounding_mode):
-	  add a test for the above change.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_save_exception_mode):
-	  add a test for the return value of BigDecimal.save_exception_mode.
-
-Wed Sep 29 12:45:30 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_div2, BigDecimal_add2,
-	  BigDecimal_sub2, BigDecimal_mult2, VpLimitRound): remove meaningless
-	  casts to get rid of compiler warnings.
-
-Wed Sep 29 12:35:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (VPrint, VpToString): fix format.
-
-Wed Sep 29 12:31:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/known_classes.rb (RDoc::KNOWN_CLASSES): add Encoding.
-
-Tue Sep 28 20:50:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/config.sub (x64): regularize same as mswin.
-
-Tue Sep 28 20:06:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* vm_dump.c (rb_vm_bugreport): add windows support.
-	  based on patches from Peter Weldon at [ruby-core:32551]
-
-Mon Sep 27 23:30:34 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (opt_case_dispatch), vm_insnhelper.c:
-	  execute the procedures of "when" clauses by bytecode
-	  instead of st_foreach() when the object does not hit
-	  prepared hash.  [ruby-dev:42304]
-
-Mon Sep 27 15:54:03 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* test/net/http/test_https.rb: As always, localhost is not
-	  guaranteed to be resolved as 127.0.0.1.  But a SSL
-	  certificate needs a socket to listen on a specific address
-	  where a CN resolves to.  On situations where localhost is
-	  not 127.0.0.1, these tests are not possible.
-
-Mon Sep 27 15:25:05 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* test/net/imap/test_imap.rb: resurrection of r29259.
-	  this change depends on minitest 1.7.1.
-
-	* lib/test/unit/assertions.rb: ditto.
-
-Sun Sep 26 22:59:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/config.sub (x86_64-pc-mingw64): regularize.
-
-Sun Sep 26 22:21:07 2010  wanabe  <s.wanabe@gmail.com>
-
-	* ext/openssl/ossl_hmac.c (ossl_hmac_hexdigest, ossl_hmac_s_hexdigest),
-	  ext/openssl/ossl_pkey_ec.c (ossl_ec_group_set_seed),
-	  ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der),
-	  ext/openssl/ossl_pkcs7.c (numberof): suppress warnings.
-	  [ruby-core:31932]
-
-Sun Sep 26 10:25:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/config.{guess,sub}: updated to automake-1.11.1.
-
-Sat Sep 25 22:48:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (LIBRUBY_DLDFLAGS): fix quoting.
-
-Sat Sep 25 10:30:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (LIBRUBY_DLDFLAGS): use -unexported_symbol only
-	  when available.  http://trac.macports.org/ticket/26341
-
-Sat Sep 25 10:05:49 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: Always add -mieee for Renesas SH4.
-	  Thanks, Nobuhiro Iwamatsu. [Feature #3874] [ruby-core:32548]
-
-Sat Sep 25 01:34:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (install-cross): target to install cross-compiling
-	  stuff.
-
-Fri Sep 24 23:44:59 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (sym_call), vm.c (invoke_block_from_c),
-	  vm_insnhelper.c (vm_yield_with_cfunc): pass given block.
-	  [ruby-core:32075]
-
-	* vm_eval.c (rb_funcall_passing_block): new function to call
-	  method with passing given block.
-
-Fri Sep 24 15:50:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_to_i): fix rdoc: String#to_i raises an
-	  exception when base is invalid. [ruby-core:31685]
-
-Fri Sep 24 15:28:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_rindex): use rb_enc_prev_char instead of repeated
-	  str_nth.
-	  patched by Michael Selig [ruby-core:32498]
-
-Fri Sep 24 14:19:12 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* test/test_pty.rb: Same as 229281; existence of PTY class do not
-	  guarantee a successful pty operation.
-
-Fri Sep 24 06:25:55 2010  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/minitest/*.rb: Imported minitest 1.7.2 r5879.
-	* test/minitest/*.rb: ditto.
-
-Thu Sep 23 23:09:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_get_cref0): cref is stacked only in normal
-	  iseqs, so check if it is the case first.
-
-Thu Sep 23 23:08:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/config.sub: mingw64 should use x86_64.  [ruby-core:32514]
-
-Thu Sep 23 21:40:40 2010  wanabe  <s.wanabe@gmail.com>
-
-	* ext/socket/raddrinfo.c (init_addrinfo, inspect_sockaddr): suppress
-	  warnings.  see [ruby-core:31932].
-
-Thu Sep 23 19:27:57 2010  wanabe  <s.wanabe@gmail.com>
-
-	* thread_win32.c (w32_wait_events, w32_close_handle): suppress warnings.
-	  see [ruby-core:31932].
-
-Thu Sep 23 18:54:39 2010  wanabe  <s.wanabe@gmail.com>
-
-	* tool/config.sub: add mingw64.
-
-	* win32/mkexports.rb (Exports::Mingw64): added.
-
-	* win32/mkexports.rb (Exports::Mingw32): renamed from Exports::Mingw.
-
-Thu Sep 23 09:01:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_cref_push): no outer cref is needed for proc
-	  from method.  Bug #3786, Bug #3860, [ruby-core:32501]
-
-Wed Sep 22 17:12:01 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/openssl/utils.rb (OpenSSL#silent): always restore $VERBOSE.
-	  [ruby-dev:42285]
-
-Wed Sep 22 16:59:40 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* test/test_prime.rb (TestPrime#test_new): the warning expected have
-	  not been displayed when $VERBOSE == nil. Patch by Shota Fukumori
-	  a.k.a. sora_h. [ruby-dev:42272]
-	  Recovers $stderr even if StringIO.new fails. Reported by unak.
-
-Wed Sep 22 01:55:48 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_method.rb: fix last commit.
-
-Wed Sep 22 01:49:52 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_method.rb: add a test for [ruby-core:30534].
-
-Wed Sep 22 00:52:44 2010  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/rdoc/ri/store.rb (save_cache): remove duplicate entries.
-
-Wed Sep 22 00:00:05 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_f_pathname): Pathname() translated
-	  from pathname.rb.
-
-Tue Sep 21 22:18:30 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/mkconfig.rb: fixed build problem on mswin64 introduced in r29278.
-
-Tue Sep 21 02:42:35 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/pathname/test_pathname.rb (TestPathname#test_mkdir): fix typo.
-
-Mon Sep 20 23:23:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (bracket): get rid of scanning at the end of the pattern
-	  string, not to raise an exception while globbing command line.
-	  [ruby-core:32478]
-
-Mon Sep 20 11:25:49 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (Init_pathname): Pathname#=~ undefinition
-	  translated from pathname.rb.
-
-Mon Sep 20 02:34:11 2010  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (check_rounding_mode, BigDecimal_mode):
-	  raise ArgumentError instead of TypeError passing invalid modes.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_mode, test_round):
-	  change against the above modifications.
-
-Sun Sep 19 22:08:39 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* lib/mkmf.rb (try_link): rdoc
-	  (try_compile): ditto
-	  (try_cpp): ditto
-	  (try_func): ditto
-	  (try_var): ditto
-	  (try_run): ditto
-	  (egrep_cpp): ditto
-
-Sun Sep 19 20:43:33 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* configure.in (--disable-install-doc): disables capi too, in addition
-	  to rdoc.
-	  (--disable-install-rdoc): a new option for disabling only rdoc.
-	  (--disable-install-capi): a new option for disabling only capi.
-
-Sun Sep 19 20:37:45 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* common.mk (clean): removes all documents on cleaning.o
-	  (CAPIOUT): new variable.
-	  (clean-capi, distclean-capi, realclean-capi): new targets
-
-	* Makefile.in (clean-capi, distclean-capi, realclean-capi): ditto.
-
-	* win32/Makefile.sub (clean-capi, distclean-capi, realclean-capi):
-	  ditto.
-
-Sun Sep 19 13:44:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (LIBRUBY_SO): fix an oversight of replace
-	  RUBY_INSTALL_NAME with RUBY_SO_NAME.  a patch from Jeremy Evans
-	  at [ruby-core:32474].
-
-Sun Sep 19 07:48:20 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_unlink): Pathname#unlink and
-	  Pathname#delete translated from pathname.rb.
-
-Sun Sep 19 06:06:07 2010  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (check_rounding_mode): added for
-	  converting symbol to rounding mode number.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_mode, BigDecimal_round):
-	  support to specify rounding mode by symbol.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_mode, test_round):
-	  add tests for above changes.
-
-Sun Sep 19 05:14:35 2010  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c: fix rounding algorithms for half-down
-	  and half-even.  This change is based on the patch created by Matthew
-	  Willson, the reporter of this bug.  [Bug #3803] [ruby-core:32136]
-
-	* test/bigdecimal/test_bigdecimal.rb: add tests for above changes.
-
-Sat Sep 18 20:09:51 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_each_entry): Pathname#each_entry
-	  translated from pathname.rb.
-
-Fri Sep 17 23:44:07 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/xpath_parser.rb, test/rexml/test_xpath.rb:
-	  add missing method availability check. [ruby-core:32447]
-	  Reported by Wiebe Cazemier. Thanks!!!
-
-Fri Sep 17 23:23:26 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_sax.rb: don't use thread and sleep to avoid slow test.
-
-Fri Sep 17 23:10:44 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_core.rb: enable.
-
-Fri Sep 17 22:46:02 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/: untabify.
-
-Fri Sep 17 22:29:56 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/: fix fixture data path. All REXML tests are worked.
-
-Fri Sep 17 22:15:15 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_listener.rb: remove needless codes.
-
-Fri Sep 17 22:12:23 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/: import REXML tests from
-	  http://www.germane-software.com/repos/rexml/trunk/test/.
-	  Many tests are failed temporary. I'll fix them quickly. Sorry.
-
-Fri Sep 17 16:48:49 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* test/io/console/test_io_console.rb (TestIO_Console::helper):
-	  PTY.open is not guaranteed to work.  On my machine opening a
-	  pty is prohibited via process control group.  On those cases
-	  exceptions shall occur, and that doesn't mean our fault.
-	  Skip those tests on such situations.
-
-Fri Sep 17 08:30:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/tracer.rb: count only non-internal libraries in stack trace,
-	  ignoring custom_require.  [ruby-core:31858]
-
-Fri Sep 17 02:18:41 2010  Akinori MUSHA  <knu@iDaemons.org>
-
-	* tool/mkconfig.rb: Fix build with m4 1.4.15 generating duplicate
-	  lines in config.status.  According to nobu, the mswin32 port may
-	  depend on the piece of code in question, so the behavior is left
-	  unchanged on mswin32.
-
-Thu Sep 16 23:47:59 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_opendir): Pathname#opendir translated
-	  from pathname.rb.
-
-Thu Sep 16 21:40:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb (Test::Unit::GlobOption): merged RejectOption.
-
-	* test/runner.rb: utilize GlobOption.
-
-Thu Sep 16 21:31:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/ri/driver.rb (RDoc::RI::Driver.setup_options)
-	  (RDoc::RI::Driver.fixup_options): split from process_args.
-	  libraries should not parse ARGV inside, since it's a task of
-	  applications, not libraries.
-
-Thu Sep 16 21:02:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/ri/paths.rb (RDoc::RI::Paths.each): HOMEDIR can be nil
-	  if $HOME is unset.
-
-Thu Sep 16 14:50:42 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* test/ruby/test_file_exhaustive.rb (TestFileExhaustive::test_expand_path):
-	  ENV["HOME"] might not be set.  On those cases without it an
-	  exception raises here, which effectively disables later
-	  tests on this method.
-
-Thu Sep 16 08:30:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): fix rdoc.  pointed out by Tomoyuki
-	  Chikanaga at [ruby-core:32395], and a patch from Daniel
-	  Bovensiepen at [ruby-core:32403].
-
-Thu Sep 16 08:27:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.
-	  [ruby-core:32394]
-
-Thu Sep 16 06:07:24 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_rmdir): Pathname#rmdir translated
-	  from pathname.rb.
-
-Thu Sep 16 00:36:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/readline/extconf.rb: Remove Readline 6 check because
-	  Ruby's license is now GPLv3 compatible. [ruby-core:28736]
-
-Thu Sep 16 00:26:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* COPYING: change Ruby's License from a dual license with GPLv2
-	  to a dual license with 2-clause BSDL.
-	  [ruby-dev:42166] [ruby-core:31971]
-	  [ruby-dev:39167] [ruby-core:25272]
-
-	* COPYING.ja: ditto.
-
-	* BSDL: added. this is from The FreeBSD License.
-
-Wed Sep 15 21:07:06 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_mkdir): Pathname#mkdir translated
-	  from pathname.rb.
-
-Wed Sep 15 13:37:00 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* test/net/imap/test_imap.rb: "localhost" not guaranteed to
-	  resolve to "127.0.0.1".  On my machine it is "::1" instead.
-	  The problem is, you have to connect to the imaps server via
-	  the canonical name written in a server certificate, and that
-	  of the server.cert is "localhost".  So you have to listen to
-	  the address of what "localhost" resolves to.  I think this
-	  situation cannot be resolved in a handy manner because the
-	  test "test_imaps_post_connection_check" is actually
-	  expecting to connect to a server via an address other than
-	  the CN.  On my machine several assertions won't pass because
-	  the test cannot connect to the server.
-
-Wed Sep 15 09:12:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_puts): fix for wide char encoding strings.
-	  [ruby-dev:42212]
-
-Wed Sep 15 07:27:52 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_format_m): mentioned about Hash argument.  a patch
-	  from Daniel Bovensiepen at [ruby-core:32386].
-
-	* sprintf.c (get_hash): ditto, and fix typo.
-
-Wed Sep 15 07:22:20 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_entries): Pathname#entries translated
-	  from pathname.rb.
-
-Wed Sep 15 02:13:44 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/fiddle/closure.c : Don't use FFI closure alloc on OpenBSD.
-	  Thanks Jeremy Evans! [ruby-core:32384]
-
-Tue Sep 14 20:17:48 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_s_getwd): Pathname.getwd and
-	  Pathname.pwd translated from pathname.rb.
-
-Tue Sep 14 05:13:04 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_s_glob): Pathname.glob translated
-	  from pathname.rb.
-
-Tue Sep 14 01:24:51 2010  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
-
-	* ext/socket/raddrinfo.c (ruby_getaddrinfo__aix): suppress a
-	  warning.
-
-Mon Sep 13 20:48:30 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_zero_p): Pathname#zero? translated
-	  from pathname.rb.
-
-Mon Sep 13 19:56:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/rubysocket.h (__DARWIN_ALIGNBYTES): workaround of a
-	  bug in system header of darwin 9.  [ruby-core:32341]
-
-Mon Sep 13 18:11:55 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (try_do): fix typo.  a patch from Peter Weldon
-	  at [ruby-core:32327].
-
-Mon Sep 13 10:12:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* util.c (ruby_strtod): reject Float('0x0.').
-	  [ruby-dev:42239] Bug #3820
-
-Mon Sep 13 09:23:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_bn.c (ossl_bn_is_prime): fix comparison
-	  with rb_scan_args. Before this fix, OpenSSL::BN#prime?
-	  is fully broken. [ruby-dev:42225]
-
-Mon Sep 13 06:45:24 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_writable_real_p):
-	  Pathname#writable_real? translated from pathname.rb.
-
-Sun Sep 12 21:21:50 2010  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb: [ruby-core:32096]  Thanks Colin Bartlett.
-
-Sun Sep 12 19:30:27 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_world_writable_p):
-	  Pathname#world_writable? translated from pathname.rb.
-
-Sun Sep 12 09:16:06 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_writable_p): Pathname#writable?
-	  translated from pathname.rb.
-
-Sun Sep 12 08:36:15 2010  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (rlimit_resource_name2int): support more limits:
-	  RLIMIT_MSGQUEUE, RLIMIT_NICE, RLIMIT_RTPRIO, RLIMIT_RTTIME and
-	  RLIMIT_SIGPENDING.
-	  (Init_process): ditto.
-	  patch by Run Paint Run Run.  [ruby-core:32262]
-
-Sun Sep 12 04:27:13 2010  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (rlimit_resource_name2int): use STRCASECMP to avoid
-	  ALLOCA_N.
-
-Sat Sep 11 16:47:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (ruby_setenv): raise if putenv and SetEnvironmentVariable
-	  failed, because of the restriction of the size on Windows.
-	  based on a patch from Peter Weldon at [ruby-core:32304].  fix:
-	  Bug#3812, [ruby-core:32250]
-
-Sat Sep 11 15:19:57 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/webrick/httpauth/digestauth.rb (WEBrick::Config::DigestAuth):
-	  Add documentation
-
-	* lib/webrick/config.rb (WEBrick::Config::DigestAuth): Add
-	  documentation
-
-Sat Sep 11 12:32:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_set_kcode, rb_get_kcode): removed
-	  zombie prototype declarations.  a patch from Eric Hodel
-	  at [ruby-core:32305].
-
-Sat Sep 11 06:53:12 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_symlink_p): Pathname#symlink?
-	  translated from pathname.rb.
-
-Fri Sep 10 23:03:43 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_sticky_p): Pathname#sticky? translated
-	  from pathname.rb.
-
-Fri Sep 10 19:11:13 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#continue): add
-	  method for generating HTTP/1.1 100 continue response if the client
-	  expects it, otherwise does nothing.  Patch by Brian Candler.
-	  ref #855.
-
-	* test/webrick/test_httprequest.rb: test added.
-
-Fri Sep 10 17:49:34 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/x509-internal.rb: removed unused local
-	  variable.
-
-	* test/openssl/*: less warnings while test running with -w.
-
-Fri Sep 10 16:49:20 2010  Akinori MUSHA  <knu@iDaemons.org>
-
-	* class.c (rb_scan_args): Add support for optional keyword
-	  argument hash. [ruby-dev:42221] [ruby-dev:38048]
-
-	* README.EXT, README.EXT.ja: Update documentation accordingly.
-
-	* dir.c (dir_initialize): Make use of the new rb_scan_args()
-	  feature.
-
-	* io.c (rb_io_s_popen, rb_scan_open_args, rb_io_initialize)
-	  (rb_io_s_pipe, open_key_args, io_s_foreach, io_s_readlines)
-	  (rb_io_s_read, rb_io_set_encoding): Ditto.
-
-	* transcode.c (str_transcode, econv_args)
-	  (econv_primitive_convert): Ditto.
-
-	* ext/zlib/zlib.c (rb_gzreader_initialize): Ditto.
-
-Fri Sep 10 10:33:18 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* random.c (rb_genrand_ulong_limited): renamed from
-	  rb_rand_internal and now this is public API.
-
-	* include/ruby/ruby.h (rb_genrand_ulong_limited): added.
-
-	* bignum.c (big_sparse_p): use rb_genrand_ulong_limited.
-
-Fri Sep 10 13:07:22 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* ext/digest/lib/digest.rb: removed unused exception variable
-	  assignment to avoid a warning.
-
-Fri Sep 10 07:29:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/etc/etc.c (etc_systmpdir): assume system default tmpdir
-	  safe.  [ruby-dev:42089]
-
-Fri Sep 10 07:03:23 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_size_p): Pathname#size? translated from
-	  pathname.rb.
-
-Fri Sep 10 02:15:29 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c (inspect_peercred): support OpenBSD-current.
-	  patch by Jeremy Evans.  [ruby-core:32240]
-
-Thu Sep  9 23:25:53 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (vm_backtrace_each): skip allocator frames which have no
-	  name.  [ruby-core:32231]
-
-Thu Sep  9 22:39:08 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_size): Pathname#size translated from
-	  pathname.rb.
-
-Thu Sep  9 22:34:48 2010  wanabe  <s.wanabe@gmail.com>
-
-	* compile.c (case_when_optimizable_literal): When float value can be
-	  treated as integer, add to table hash of case that way.
-	  based on a patch from Ikuo KOBORI. [ruby-dev:42038]
-
-	* insns.def (opt_case_dispatch): ditto.
-
-	* test/ruby/test_case.rb: add tests.
-
-Thu Sep  9 17:15:15 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/net/http/test_https.rb (test_identity_verify_failure): follows
-	  the SSL hostname check error message of openssl.
-
-Thu Sep  9 10:44:46 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/ruby/test_env.rb (test_aset): OpenBSD acts like NetBSD in
-	  that it ignores characters after = in ENV.
-	  patched by Jeremy Evans [ruby-core:32184]
-
-Thu Sep  9 09:02:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/rbinstall.rb (install?): gemspec filename should include
-	  its version. patched by Luis Lavena [ruby-core:32165]
-
-Wed Sep  8 22:46:31 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was
-	  blocked on Windows while blocking call for SSLSocket.  Need to
-	  convert errno for letting rb_io_wait_readable detect EWOULDBLOCK.
-	  Patch by arton. ref #3794.
-
-Wed Sep  8 20:56:57 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_setgid_p): Pathname#setgid? translated
-	  from pathname.rb.
-
-Wed Sep  8 06:25:41 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_setuid_p): Pathname#setuid? translated
-	  from pathname.rb.
-
-Tue Sep  7 21:03:35 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_readable_real_p):
-	  Pathname#readable_real?  translated from pathname.rb.
-
-Mon Sep  6 23:07:25 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_world_readable_p):
-	  Pathname#world_readable?  translated from pathname.rb.
-
-Mon Sep  6 11:03:13 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* Fixed wrong check of missing functions. Patch by Adrian Quark.
-	  ref #3400
-	  The patch contains following comment:
-	    This patch should avoid unnecessary incompatibility with future
-	    versions of Openssl.  Changes suggested by bmaher_at_amazon.com.
-
-Mon Sep  6 10:46:55 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* Fixed exception message for SSL post connection check failure. Patch
-	  by Paul Betteridge. ref [Bug #3704]
-
-Mon Sep  6 10:31:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/readline/readline.c (readline_s_get_line_buffer):
-	  Readline.line_buffer should return locale string.
-	  [ruby-dev:42184] #3791
-
-Mon Sep  6 09:47:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* util.c (ruby_strtod): check there is at least 1 digit after
-	  "0x" before ".". [ruby-dev:42183] #3790
-
-Mon Sep  6 09:44:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* util.c (ruby_strtod): check integer overflow.
-	  [ruby-dev:42180] #3789
-
-Mon Sep  6 06:17:21 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_readable_p): Pathname#readable?
-	  translated from pathname.rb.
-
-Sun Sep  5 23:02:34 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_owned_p): Pathname#owned?
-	  translated from pathname.rb.
-
-Sat Sep  4 23:48:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_readlink): symlink target should be in
-	  filesystem encoding.
-
-Sat Sep  4 10:40:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (ruby_init_ext): export for golfers.
-
-	* vm_core.h (rb_iseq_eval, rb_iseq_compile_with_option): ditto.
-
-Sun May 23 17:29:41 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* common.mk (capi): uses a timestamp file to get rid of
-	  generating twice.
-
-Fri Jun 18 01:33:21 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* enc/Makefile.in (realclean): has been missing. necessary
-	  for make realclean-enc.
-
-Fri Sep  3 23:51:26 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_socket_p): Pathname#socket?
-	  translated from pathname.rb.
-
-Fri Sep  3 06:40:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/pty/pty.c (chfunc): pass through exceptions.
-
-	* io.c (rb_io_bufwrite, rb_io_bufread): added.
-
-	* process.c (rb_fork_err): protect from exceptions.
-
-Fri Sep  3 06:16:07 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_pipe_p): Pathname#pipe?
-	  translated from pathname.rb.
-
-Fri Sep  3 06:14:40 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/pty/pty.c (chfunc): restore errno from SystemCallError and
-	  propagate proper exception to the parent.  [ruby-dev:41965]
-
-Thu Sep  2 22:10:38 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_file_p): Pathname#file?
-	  translated from pathname.rb.
-
-Thu Sep  2 09:12:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): don't forget to free
-	  memory.
-
-Thu Sep  2 09:01:13 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (CreateChild): unicodize.
-
-	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): convert arguments of
-	  CreateChild() from ACP to WideChar.
-
-Thu Sep  2 06:53:43 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_directory_p): Pathname#directory?
-	  translated from pathname.rb.
-
-Wed Sep  1 22:03:41 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_grpowned_p): Pathname#grpowned?
-	  translated from pathname.rb.
-
-Wed Sep  1 17:39:02 2010  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/minitest/*.rb: Imported minitest 1.7.1 r5835.
-	* test/minitest/*.rb: ditto.
-
-Wed Sep  1 16:50:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (tr_setup_table): optimized. don't create hash objects
-	  when given pattern is ASCII only.
-
-	* string.c (tr_find): ditto.
-
-Wed Sep  1 14:35:29 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (rb_ary_rotate_m): fix typo of rdoc.
-	  patched by Andrei Kulakov [ruby-core:31975]
-
-Wed Sep  1 14:33:36 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enum.c (enum_zip): fix typo of rdoc.
-	  patched by Andrei Kulakov [ruby-core:31974]
-
-Wed Sep  1 12:56:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (ruby_suppress_tracing): restore the state and invoke
-	  the func with normal state.  a patch from Satoshi Shiba <shiba
-	  AT rvm.jp> at [ruby-dev:42162].  [ruby-core:31783]
-
-Tue Aug 31 21:10:23 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_exist_p): Pathname#exist? translated
-	  from pathname.rb.
-
-Tue Aug 31 17:32:34 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk with enabling
-	  stubs". Thanks, Akio Tajima [ruby-dev:42159].
-
-Tue Aug 31 03:42:14 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (tr_setup_table): fix bug in r29146.
-	  Initialize table even if cflag is 0; tr_find see whether
-	  del is empty or not.
-
-	* string.c (tr_find): nodel can't be NULL; if NULL, it means
-	  it is not specified.
-
-Mon Aug 30 21:29:21 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_executable_real_p):
-	  Pathname#executable_real? translated from pathname.rb.
-
-Mon Aug 30 15:00:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (tr_setup_table): initialize negating table when
-	  negating string is given. [ruby-core:31851]
-
-	* string.c (tr_find): add a sentence for the time when
-	  target characters include negating one.
-
-	* string.c (rb_str_count): move definition.
-
-Mon Aug 30 07:32:41 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_executable_p): Pathname#executable?
-	  translated from pathname.rb.
-
-Sun Aug 29 23:54:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/parser/ruby.rb (RDoc#parse_call_parameters): don't
-	  include assignment.  [Bug #3759], [ruby-dev:42154]
-
-	* lib/rdoc/parser/ruby.rb (RDoc#parse_class): ignore non-constant
-	  name singleton class.  [Bug #3759], [ruby-dev:42154]
-
-Sun Aug 29 23:25:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_get_path_check): clarify error message for
-	  ASCII-incompatible path name.
-
-Sun Aug 29 16:02:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (node_name.inc): remove command option -n and give
-	  file as stdin, because IronRuby 1.1 still doesn't support it.
-	  So now we can use ir.exe as BASERUBY.
-
-	* tool/node_name.rb: read stdin with while gets.
-
-Sun Aug 29 13:22:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (rb_thread_method_id_and_class): curried proc has no
-	  method.  [ruby-core:31871]
-
-Sun Aug 29 12:51:33 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_provide_feature): clarify error message for frozen
-	  $LOADED_FEATURES.  based on a patch from Run Paint Run Run at
-	  [ruby-core:31913].
-
-Sun Aug 29 12:19:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (load_failed): should honor encoding.  [ruby-core:31915]
-
-Sun Aug 29 09:35:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (clean): exclude *.inc. [ruby-dev:41931]
-
-	* common.mk (distclean): include *.inc.
-
-	* common.mk (help): change description about clean and distclean.
-
-Sat Aug 29 06:34:52 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_chardev_p): Pathname#chardev?
-	  translated from pathname.rb.
-
-Sat Aug 28 17:39:33 2010  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_save_exception_mode,
-	  BigDecimal_save_rounding_mode, BigDecimal_save_limit): added.
-
-	* test/bigdecimal/test_bigdecimal.rb: added tests for the above
-	  features.
-
-Sat Aug 28 08:11:05 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_blockdev_p): Pathname#blockdev?
-	  translated from pathname.rb.
-
-Fri Aug 27 16:20:01 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* string.c (rb_str_prepend): new method by Shota Fukumori (sora_h)
-	  [Feature #3765]
-
-Fri Aug 27 15:24:20 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* math.c (math_atan2): you should know that M_PI is not the feature
-	  of C90.
-	  fixed build failure caused by r29115.
-
-Fri Aug 27 15:26:33 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (null_device): move from io.c.
-
-Fri Aug 27 12:47:44 2010  Kenta Murata  <mrkn@mrkn.jp>
-
-	* math.c (math_atan2): change the behavior when x and y are zero.
-	  [ruby-dev:42090] [Bug #3736] [ruby-dev:42116]
-
-	* test/ruby/test_math.rb (test_atan2): add tests for the above
-	  changes.
-
-Fri Aug 27 12:26:23 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* object.c (rb_obj_class): remove mention of obsolete method.
-	  a patch from Run Paint Run Run at [ruby-core:31842].
-
-Fri Aug 27 12:25:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (null_device): the name of null device.  [ruby-dev:41791]
-
-Fri Aug 27 07:57:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_shuffle_bang): bail out from modification during
-	  shuffle.
-
-	* array.c (rb_ary_sample): ditto.
-
-Fri Aug 27 05:11:51 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_sysopen): Pathname#sysopen translated
-	  from pathname.rb.
-
-Thu Aug 26 22:53:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_shuffle): rdoc fix.  argument name was missing.
-	  a patch from Run Paint Run Run at [ruby-core:31848].
-
-Thu Aug 26 21:49:46 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_readlines): Pathname#readlines
-	  translated from pathname.rb.
-
-Thu Aug 26 10:37:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regint.h (OnigStackIndex): the type should be intptr_t.
-	  Original Oniguruma assumes the size of long and that of void *
-	  are equal, but it's not true on LLP64 platform: mswin64.
-	  originally patched by shintaro kuwamoto [ruby-dev:42133]
-
-Thu Aug 26 10:38:11 2010  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
-
-	* test/dl/test_base.rb: AIX does not have dynamically loadable lib[cm].
-
-	* test/fiddle/helper.rb: AIX does not have dynamically loadable lib[cm].
-
-Thu Aug 26 09:49:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_shuffle_bang): check number of argument.
-
-Tue Aug 26 09:11:40 2010  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
-	  rmpd_set_thread_local_exception_mode, VpGetException,
-	  VpSetException): thread-local exception mode.
-
-	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
-	  rmpd_set_thread_local_precision_limit, VpGetPrecLimit,
-	  VpSetPrecLimit): thread-local precision limit.
-
-	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
-	  rmpd_set_thread_local_rounding_mode, VpGetRoundMode,
-	  VpSetRoundMode, VpException, VpInternalRound):
-	  thread-local rounding mode.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_mode, BigDecimal_round,
-	  VpIsRoundMode, VpGetRoundMode, VpSetRoundMode, VpActiveRound,
-	  VpMidRound, VpLeftRound), ext/bigdecimal/bigdecimal.h:
-	  use unsigned short for rounding mode.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_mode): add test for
-	  setting rounding mode.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_thread_local_mode):
-	  add test for setting mode thread-locally.
-
-Thu Aug 26 07:29:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_{shuffle_bang,sample}): use Random class object.
-
-	* random.c (try_get_rnd): use default_rand for Random as same as
-	  singleton methods.
-
-	* random.c (rb_random_real): check the range of result.
-
-Wed Aug 25 22:11:11 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_binread): Pathname#binread translated
-	  from pathname.rb.
-
-Wed Aug 25 03:42:43 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/dl/cfunc.c (rb_dlcfunc_call): workaround for VC9 for x64.
-	  reported by kuwamoto shintaro in [ruby-dev:42125].
-
-Tue Aug 24 23:28:50 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* .gitignore: updated.
-
-Tue Aug 24 22:07:28 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_read): Pathname#read translated from
-	  pathname.rb.
-
-Tue Aug 24 10:11:04 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: read API version from include/ruby/version.h.
-
-	* {bcc,win}32/setup.mak (-version-): ditto.
-
-	* version.h (RUBY_LIB_VERSION): use API version numbers.
-
-Tue Aug 24 07:07:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_shuffle_bang, rb_ary_sample): add optional
-	  argument random.  [ruby-dev:41923] [EXPERIMENTAL]
-
-	* random.c (rb_random_{int32,real,bytes}): fallback to normal
-	  method invocation.
-
-Tue Aug 24 06:08:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/version.h (RUBY_API_VERSION_*): renamed and moved
-	  from version.h.  [ruby-dev:42103]
-
-Tue Aug 24 05:58:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ChangeLog: flushed.  [ruby-dev:42050]
-
-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/GPL b/GPL
index 5b6e7c66c2..d159169d10 100644
--- a/GPL
+++ b/GPL
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/KNOWNBUGS.rb b/KNOWNBUGS.rb
index 5c0e4d5156..35a8e75876 100644
--- a/KNOWNBUGS.rb
+++ b/KNOWNBUGS.rb
@@ -1,16 +1,7 @@
 #
-# This test file concludes tests which point out known bugs.
+# 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.
 # So all tests will cause failure.
 #
-
-assert_normal_exit %q{
-  open("tst-remove-load.rb", "w") {|f|
-    f << <<-'End'
-      module Kernel
-        remove_method :load
-      end
-      raise
-    End
-  }
-  load "tst-remove-load.rb"
-}, '[ruby-dev:40234] [ruby-core:27959]', :timeout => 1
diff --git a/LEGAL b/LEGAL
index 0086b83665..565c4c9cde 100644
--- a/LEGAL
+++ b/LEGAL
@@ -1,85 +1,231 @@
-LEGAL NOTICE INFORMATION
-------------------------
+# -*- rdoc -*-
+
+= LEGAL NOTICE INFORMATION
+--------------------------
 
 All the files in this distribution are covered under either the Ruby's
 license (see the file COPYING) or public-domain except some files
 mentioned below.
 
-include/ruby/oniguruma.h:
-regcomp.c:
-regenc.[ch]:
-regerror.c:
-regexec.c:
-regint.h:
-regparse.[ch]:
-enc/ascii.c
-enc/big5.c
-enc/cp949.c
-enc/emacs_mule.c
-enc/encdb.c
-enc/euc_jp.c
-enc/euc_kr.c
-enc/euc_tw.c
-enc/gb18030.c
-enc/gb2312.c
-enc/gbk.c
-enc/iso_8859_1.c
-enc/iso_8859_10.c
-enc/iso_8859_11.c
-enc/iso_8859_13.c
-enc/iso_8859_14.c
-enc/iso_8859_15.c
-enc/iso_8859_16.c
-enc/iso_8859_2.c
-enc/iso_8859_3.c
-enc/iso_8859_4.c
-enc/iso_8859_5.c
-enc/iso_8859_6.c
-enc/iso_8859_7.c
-enc/iso_8859_8.c
-enc/iso_8859_9.c
-enc/koi8_r.c
-enc/koi8_u.c
-enc/shift_jis.c
-enc/unicode.c
-enc/us_ascii.c
-enc/utf_16be.c
-enc/utf_16le.c
-enc/utf_32be.c
-enc/utf_32le.c
-enc/utf_8.c
-enc/windows_1251.c
-
-Oniguruma  ----   (C) K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
-
-http://www.geocities.jp/kosako3/oniguruma/
-http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/oniguruma/
-http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/oniguruma/
-
-   When this software is partly used or it is distributed with Ruby, 
-   this of Ruby follows the license of Ruby.
-
-configure:
+ccan/build_assert/build_assert.h::
+ccan/check_type/check_type.h::
+ccan/container_of/container_of.h::
+ccan/str/str.h::
+
+  These files are licensed under the CC0.
+
+  >>>
+    https://creativecommons.org/choose/zero/
+
+ccan/list/list.h::
+
+  This file is licensed under the MIT License.
+
+  >>>
+    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.
+
+include/ruby/onigmo.h::
+include/ruby/oniguruma.h::
+regcomp.c::
+regenc.c::
+regenc.h::
+regerror.c::
+regexec.c::
+regint.h::
+regparse.c::
+regparse.h::
+enc/ascii.c::
+enc/big5.c::
+enc/cp949.c::
+enc/emacs_mule.c::
+enc/encdb.c::
+enc/euc_jp.c::
+enc/euc_kr.c::
+enc/euc_tw.c::
+enc/gb18030.c::
+enc/gb2312.c::
+enc/gbk.c::
+enc/iso_8859_1.c::
+enc/iso_8859_10.c::
+enc/iso_8859_11.c::
+enc/iso_8859_13.c::
+enc/iso_8859_14.c::
+enc/iso_8859_15.c::
+enc/iso_8859_16.c::
+enc/iso_8859_2.c::
+enc/iso_8859_3.c::
+enc/iso_8859_4.c::
+enc/iso_8859_5.c::
+enc/iso_8859_6.c::
+enc/iso_8859_7.c::
+enc/iso_8859_8.c::
+enc/iso_8859_9.c::
+enc/koi8_r.c::
+enc/koi8_u.c::
+enc/shift_jis.c::
+enc/unicode.c::
+enc/us_ascii.c::
+enc/utf_16be.c::
+enc/utf_16le.c::
+enc/utf_32be.c::
+enc/utf_32le.c::
+enc/utf_8.c::
+enc/windows_1251.c::
+
+  Onigmo (Oniguruma-mod) LICENSE
+
+  >>>
+    Copyright (c) 2002-2009  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>  
+    Copyright (c) 2011-2014  K.Takata  <kentkt AT csc 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.
+
+  Oniguruma LICENSE
+
+  >>>
+    Copyright (c) 2002-2009  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.
+
+  * https://github.com/k-takata/Onigmo/
+  * https://github.com/kkos/oniguruma
+  * https://svnweb.freebsd.org/ports/head/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::
+enc/trans/GB/GB2312%UCS.src::
+enc/trans/GB/UCS%GB2312.src::
+
+  These files have this explanatory texts.
+
+  >>>
+    This mapping data was created from files provided by Unicode, Inc.
+    (The Unicode Consortium). The files were used to create a product supporting
+    Unicode, as explicitly permitted in the files' copyright notices.
+    Please note that Unicode, Inc. never made any claims as to fitness of these
+    files for any particular purpose, and has ceased to publish the files many
+    years ago.
+
+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::
+
+  These files are copyrighted as the following.
+
+  >>>
+    © 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::
+
+  These files are copyrighted as the following.
+
+  >>>
+    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::
+
+  These files are copyrighted as the following.
+
+  >>>
+    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.
 
-    Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+  >>>
+    Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 
     This configure script is free software; the Free Software Foundation
     gives unlimited permission to copy, distribute and modify it.
 
-tool/config.guess:
-tool/config.sub:
+tool/config.guess::
+tool/config.sub::
 
   As long as you distribute these files with the file configure, they
   are covered under the Ruby's license.
 
-      Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
-      Free Software Foundation, Inc.
+  >>>
+    Copyright 1992-2018 Free Software Foundation, Inc.
 
     This file is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful, but
@@ -88,53 +234,55 @@ tool/config.sub:
     General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    along with this program; if not, see <https://www.gnu.org/licenses/>.
 
     As a special exception to the GNU General Public License, if you
     distribute this file as part of a program that contains a
     configuration script generated by Autoconf, you may include it under
-    the same distribution terms that you use for the rest of that program.
+    the same distribution terms that you use for the rest of that
+    program.  This Exception is an additional permission under section 7
+    of the GNU General Public License, version 3 ("GPLv3").
 
-parse.c:
+parse.c::
 
-  This file is licensed under the GPL, but is incorporated into Ruby and 
+  This file is licensed under the GPL, but is incorporated into Ruby and
   redistributed under the terms of the Ruby license, as permitted by the
   exception to the GPL below.
 
-     Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-     Free Software Foundation, Inc.
+  >>>
+    Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
 
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; either version 2, or (at your option)
-     any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-     You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.  */
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+    As a special exception, you may create a larger work that contains
+    part or all of the Bison parser skeleton and distribute that work
+    under terms of your choice, so long as that work isn't itself a
+    parser generator using the skeleton or a modified version thereof
+    as a parser skeleton.  Alternatively, if you modify or redistribute
+    the parser skeleton itself, you may (at your option) remove this
+    special exception, which will cause the skeleton and the resulting
+    Bison output files to be licensed under the GNU General Public
+    License without this special exception.
 
-  /* As a special exception, you may create a larger work that contains
-     part or all of the Bison parser skeleton and distribute that work
-     under terms of your choice, so long as that work isn't itself a
-     parser generator using the skeleton or a modified version thereof
-     as a parser skeleton.  Alternatively, if you modify or redistribute
-     the parser skeleton itself, you may (at your option) remove this
-     special exception, which will cause the skeleton and the resulting
-     Bison output files to be licensed under the GNU General Public
-     License without this special exception.
+    This special exception was added by the Free Software Foundation in
+    version 2.2 of Bison.
 
-     This special exception was added by the Free Software Foundation in
-     version 2.2 of Bison.  */
+missing/dtoa.c::
 
-util.c (partly):
+  This file is under these licenses.
 
+  >>>
     Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
 
     Permission to use, copy, modify, and distribute this software for any
@@ -148,72 +296,72 @@ util.c (partly):
     REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
     OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
 
-util.c (partly):
-win32/win32.[ch]:
+  >>>
+    Copyright (c) 2004-2008 David Schultz <das@FreeBSD.ORG>  
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+win32/win32.{c,h}::
 
   You can apply the Artistic License to these files. (or GPL,
   alternatively)
 
+  >>>
     Copyright (c) 1993, Intergraph Corporation
 
     You may distribute under the terms of either the GNU General Public
     License or the Artistic License, as specified in the perl README file.
 
-util.c (partly):
-
-   Copyright (c) 2004-2008 David Schultz <das@FreeBSD.ORG>
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-   SUCH DAMAGE.
-
-random.c
+missing/mt19937.c::
 
   This file is under the new-style BSD license.
 
+  >>>
     A C-program for MT19937, with initialization improved 2002/2/10.
-    Coded by Takuji Nishimura and Makoto Matsumoto.
+    Coded by Takuji Nishimura and Makoto Matsumoto.  
     This is a faster version by taking Shawn Cokus's optimization,
     Matthe Bellew's simplification, Isaku Wada's real version.
 
-    Before using, initialize the state by using init_genrand(seed) 
+    Before using, initialize the state by using init_genrand(seed)
     or init_by_array(init_key, key_length).
 
     Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-    All rights reserved.                          
+    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.
+    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.
+    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 names of its contributors may not be used to endorse or promote 
-	 products derived from this software without specific prior written 
-	 permission.
+    3. The names of its contributors may not be used to endorse or promote
+       products derived from this software without specific prior written
+       permission.
 
     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -232,13 +380,47 @@ random.c
     http://www.math.keio.ac.jp/matumoto/emt.html
     email: matumoto@math.keio.ac.jp
 
-vsnprintf.c:
+  The Wayback Machine url: http://web.archive.org/web/19990429082237/http://www.math.keio.ac.jp/matumoto/emt.html
+
+missing/procstat_vm.c::
+
+  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 $
+
+vsnprintf.c::
 
   This file is under the old-style BSD license.  Note that the
   paragraph 3 below is now null and void.
 
-    Copyright (c) 1990, 1993
-         The Regents of the University of California.  All rights reserved.
+  >>>
+    Copyright (c) 1990, 1993  
+    The Regents of the University of California.  All rights reserved.
 
     This code is derived from software contributed to Berkeley by
     Chris Torek.
@@ -272,32 +454,40 @@ vsnprintf.c:
     From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
     paragraph 3 above is now null and void.
 
-st.[ch]:
-missing/alloca.c:
-missing/dup2.c:
-missing/erf.c:
-missing/finite.c:
-missing/hypot.c:
-missing/isinf.c:
-missing/isnan.c:
-missing/lgamma_r.c:
-missing/memcmp.c:
-missing/memmove.c:
-missing/strchr.c:
-missing/strstr.c:
-missing/strtol.c:
-missing/tgamma.c:
-ext/digest/sha1/sha1.[ch]:
+st.c::
+strftime.c::
+include/ruby/st.h::
+missing/acosh.c::
+missing/alloca.c::
+missing/dup2.c::
+missing/erf.c::
+missing/finite.c::
+missing/hypot.c::
+missing/isinf.c::
+missing/isnan.c::
+missing/lgamma_r.c::
+missing/memcmp.c::
+missing/memmove.c::
+missing/strchr.c::
+missing/strerror.c::
+missing/strstr.c::
+missing/tgamma.c::
+ext/date/date_strftime.c::
+ext/digest/sha1/sha1.c::
+ext/digest/sha1/sha1.h::
+ext/sdbm/_sdbm.c::
+ext/sdbm/sdbm.h::
 
   These files are all under public domain.
 
-missing/crypt.c:
+missing/crypt.c::
 
   This file is under the old-style BSD license.  Note that the
   paragraph 3 below is now null and void.
 
-    Copyright (c) 1989, 1993
-    	The Regents of the University of California.  All rights reserved.
+  >>>
+    Copyright (c) 1989, 1993  
+    The Regents of the University of California.  All rights reserved.
 
     This code is derived from software contributed to Berkeley by
     Tom Truscott.
@@ -326,15 +516,16 @@ missing/crypt.c:
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-missing/setproctitle.c
+missing/setproctitle.c::
 
   This file is under the old-style BSD license.  Note that the
   paragraph 3 below is now null and void.
 
-    Copyright 2003 Damien Miller
-    Copyright (c) 1983, 1995-1997 Eric P. Allman
-    Copyright (c) 1988, 1993
-    	The Regents of the University of California.  All rights reserved.
+  >>>
+    Copyright 2003 Damien Miller  
+    Copyright (c) 1983, 1995-1997 Eric P. Allman  
+    Copyright (c) 1988, 1993  
+    The Regents of the University of California.  All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -360,52 +551,45 @@ missing/setproctitle.c
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-missing/strlcat.c
-missing/strlcpy.c
+missing/strlcat.c::
+missing/strlcpy.c::
 
-  These files are under the new-style BSD license.
+  These files are under an ISC-style license.
+
+  >>>
+    Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
+
+    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.
-
-   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
+    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.
+
+missing/langinfo.c::
 
   This file is from http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c.
   Ruby uses a modified version. The file contains the following
   author/copyright notice:
 
-  Markus.Kuhn@cl.cam.ac.uk -- 2002-03-11
-  Permission to use, copy, modify, and distribute this software
-  for any purpose and without fee is hereby granted. The author
-  disclaims all warranties with regard to this software.
+  >>>
+    Markus.Kuhn@cl.cam.ac.uk -- 2002-03-11  
+    Permission to use, copy, modify, and distribute this software
+    for any purpose and without fee is hereby granted. The author
+    disclaims all warranties with regard to this software.
 
-ext/digest/md5/md5.[ch]:
+ext/digest/md5/md5.c::
+ext/digest/md5/md5.h::
 
   These files are under the following license.  Ruby uses modified
   versions of them.
 
+  >>>
     Copyright (C) 1999, 2000 Aladdin Enterprises.  All rights reserved.
 
     This software is provided 'as-is', without any express or implied
@@ -427,22 +611,26 @@ ext/digest/md5/md5.[ch]:
     L. Peter Deutsch
     ghost@aladdin.com
 
-ext/digest/rmd160/rmd160.[ch]:
+ext/digest/rmd160/rmd160.c::
+ext/digest/rmd160/rmd160.h::
 
   These files have the following copyright information, and by the
   author we are allowed to use it under the new-style BSD license.
 
-    AUTHOR:   Antoon Bosselaers, ESAT-COSIC
+  >>>
+    AUTHOR::  Antoon Bosselaers, ESAT-COSIC
               (Arranged for libc by Todd C. Miller)
-    DATE:     1 March 1996
+    DATE::    1 March 1996
 
     Copyright (c) Katholieke Universiteit Leuven
     1996, All Rights Reserved
 
-ext/digest/sha2/sha2.[ch]:
+ext/digest/sha2/sha2.c::
+ext/digest/sha2/sha2.h::
 
   These files are under the new-style BSD license.
 
+  >>>
     Copyright 2000 Aaron D. Gifford.  All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -469,28 +657,108 @@ ext/digest/sha2/sha2.[ch]:
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-ext/nkf/nkf-utf8/config.h:
-ext/nkf/nkf-utf8/nkf.c:
-ext/nkf/nkf-utf8/utf8tbl.c:
+ext/json/generator/generator.c::
+
+  The file contains the following copyright notice.
+
+  >>>
+    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::
 
   These files are under the following license.  So to speak, it is
   copyrighted semi-public-domain software.
 
+  >>>
     Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
-       Everyone is permitted to do anything on this program 
-       including copying, modifying, improving,
-       as long as you don't try to pretend that you wrote it.
-       i.e., the above copyright notice has to appear in all copies.
-       Binary distribution requires original version messages.
-       You don't have to ask before copying, redistribution or publishing.
-       THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
-
-ext/socket/addrinfo.h:
-ext/socket/getaddrinfo.c:
-ext/socket/getnameinfo.c:
+
+    Everyone is permitted to do anything on this program
+    including copying, modifying, improving,
+    as long as you don't try to pretend that you wrote it.
+    i.e., the above copyright notice has to appear in all copies.
+    Binary distribution requires original version messages.
+    You don't have to ask before copying, redistribution or publishing.
+    THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
+
+ext/psych::
+test/psych::
+
+  The files under these directories are under the following license, except for
+  ext/psych/yaml.
+
+  >>>
+    Copyright 2009 Aaron Patterson, et al.
+
+    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.
+
+ext/psych/yaml::
+
+  The files under this directory are under the following license.
+
+  >>>
+    Copyright (c) 2006 Kirill Simonov
+
+    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.
+
+ext/socket/addrinfo.h::
+ext/socket/getaddrinfo.c::
+ext/socket/getnameinfo.c::
 
   These files are under the new-style BSD license.
 
+  >>>
     Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
     All rights reserved.
 
@@ -518,17 +786,150 @@ ext/socket/getnameinfo.c:
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-ext/win32ole/win32ole.c:
+ext/win32ole/win32ole.c::
 
   You can apply the Artistic License to this file. (or GPL,
   alternatively)
 
+  >>>
     (c) 1995 Microsoft Corporation. All rights reserved.
     Developed by ActiveWare Internet Corp., http://www.ActiveWare.com
 
     Other modifications Copyright (c) 1997, 1998 by Gurusamy Sarathy
     <gsar@umich.edu> and Jan Dubois <jan.dubois@ibm.net>
- 
+
     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.
+
+  The Wayback Machine url: http://web.archive.org/web/19970607104352/http://www.activeware.com:80/
+
+lib/rdoc/generator/template/darkfish/css/fonts.css::
+
+  This file is licensed under the SIL Open Font License.
+
+  >>>
+    http://scripts.sil.org/OFL
+
+spec/mspec::
+spec/ruby::
+
+  The files under these directories are under the following license.
+
+  >>>
+    Copyright (c) 2008 Engine Yard, Inc. All rights reserved.
+
+    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.
+
+lib/rubygems.rb::
+lib/rubygems::
+test/rubygems::
+
+  RubyGems is under the following license.
+
+  >>>
+    RubyGems is copyrighted free software by Chad Fowler, Rich Kilmer, Jim
+    Weirich and others.  You can redistribute it and/or modify it under
+    either the terms of the MIT license (see the file MIT.txt), 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. 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.
+
+    3. You may distribute the software in object code or executable
+       form, provided that you do at least ONE of the following:
+
+       a. distribute the executables and library files of the software,
+          together with instructions (in the manual page or equivalent)
+          on where to get the original distribution.
+
+       b. accompany the distribution with the machine-readable source of
+          the software.
+
+       c. give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d. make other distribution arrangements with the author.
+
+    4. You may modify and include the part of the software into any other
+       software (possibly commercial).
+
+    5. The scripts and library files supplied as input to or produced as
+       output from the software do not automatically fall under the
+       copyright of the software, but belong to whomever generated them,
+       and may be sold commercially, and may be aggregated with this
+       software.
+
+    6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+       IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+       WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+       PURPOSE.
+
+lib/bundler::
+lib/bundler.rb::
+lib/bundler.gemspec::
+spec/bundler::
+man/bundle-*,gemfile.*::
+
+  Bundler is under the following license.
+
+  >>>
+    Portions copyright (c) 2010 Andre Arko  
+    Portions copyright (c) 2009 Engine Yard  
+
+    MIT License::
+
+      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.
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index bcdaf5f7a9..0000000000
--- a/Makefile.in
+++ /dev/null
@@ -1,385 +0,0 @@
-SHELL = /bin/sh
-NULLCMD = @NULLCMD@
-RUNCMD = $(SHELL)
-CHDIR = @CHDIR@
-exec = exec
-NULL = /dev/null
-
-#### Start of system configuration section. ####
-
-srcdir = @srcdir@
-top_srcdir = $(srcdir)
-hdrdir = $(srcdir)/include
-
-CC = @CC@
-CPP = @CPP@
-YACC = bison
-PURIFY =
-AUTOCONF = autoconf
-@SET_MAKE@
-MKFILES = @MAKEFILES@
-BASERUBY = @BASERUBY@
-TEST_RUNNABLE = @TEST_RUNNABLE@
-DOXYGEN = @DOXYGEN@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-sbindir = @sbindir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-datarootdir = @datarootdir@
-datadir = @datadir@
-arch = @arch@
-sitearch = @sitearch@
-sitedir = @sitedir@
-ruby_version = @ruby_version@
-
-TESTUI = console
-TESTS =
-INSTALLDOC = @INSTALLDOC@
-DOCTARGETS = @RDOCTARGET@ @CAPITARGET@
-
-EXTOUT = @EXTOUT@
-arch_hdrdir = $(EXTOUT)/include/$(arch)
-VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/enc:$(srcdir)/missing
-
-empty =
-OUTFLAG = @OUTFLAG@$(empty)
-COUTFLAG = @COUTFLAG@$(empty)
-ARCH_FLAG = @ARCH_FLAG@
-CFLAGS = @CFLAGS@
-cflags = @cflags@
-optflags = @optflags@
-debugflags = @debugflags@
-warnflags = @warnflags@
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir)
-XCFLAGS = @XCFLAGS@
-CPPFLAGS = @CPPFLAGS@ $(INCFLAGS)
-LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
-EXTLDFLAGS = 
-XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
-EXTLIBS = 
-LIBS = @LIBS@ $(EXTLIBS)
-MISSING = @LIBOBJS@ @ALLOCA@
-LDSHARED = @LIBRUBY_LDSHARED@
-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) $(ARCH_FLAG)
-SOLIBS = @SOLIBS@
-MAINLIBS = @MAINLIBS@
-ARCHMINIOBJS = @MINIOBJS@
-BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@
-BUILTIN_TRANSSRCS = @BUILTIN_TRANSSRCS@
-BUILTIN_TRANSOBJS = @BUILTIN_TRANSOBJS@
-
-RUBY_BASE_NAME=@RUBY_BASE_NAME@
-RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
-RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
-RUBY_SO_NAME=@RUBY_SO_NAME@
-EXEEXT = @EXEEXT@
-PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
-RUBY = $(RUBY_INSTALL_NAME)
-MINIRUBY = @MINIRUBY@\
-	$(MINIRUBYOPT)
-RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) -- $(RUN_OPTS)
-XRUBY = @XRUBY@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-XRUBY_LIBDIR = @XRUBY_LIBDIR@
-XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
-XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
-
-DEFAULT_PRELUDES = $(@USE_RUBYGEMS@_GEM_PRELUDE)
-
-#### End of system configuration section. ####
-
-MAJOR=	@MAJOR@
-MINOR=	@MINOR@
-TEENY=	@TEENY@
-
-LIBRUBY_A     = @LIBRUBY_A@
-LIBRUBY_SO    = @LIBRUBY_SO@
-LIBRUBY_ALIASES= @LIBRUBY_ALIASES@
-LIBRUBY	      = @LIBRUBY@
-LIBRUBYARG    = @LIBRUBYARG@
-LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
-LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
-
-THREAD_MODEL  = @THREAD_MODEL@
-
-PREP          = @PREP@
-ARCHFILE      = @ARCHFILE@
-SETUP         =
-EXTSTATIC     = @EXTSTATIC@
-SET_LC_MESSAGES = env LC_MESSAGES=C
-
-MAKEDIRS      = @MKDIR_P@
-CP            = cp
-MV            = mv
-RM            = rm -f
-RMDIR         = @RMDIR@
-RMDIRS        = @RMDIRS@
-RMALL         = @RMALL@
-NM            = @NM@
-AR            = @AR@
-ARFLAGS       = rcu
-RANLIB        = @RANLIB@
-AS            = @AS@
-ASFLAGS       = @ASFLAGS@ $(INCFLAGS)
-IFCHANGE      = $(srcdir)/tool/ifchange
-SET_LC_MESSAGES = env LC_MESSAGES=C
-OBJDUMP       = @OBJDUMP@
-OBJCOPY       = @OBJCOPY@
-VCS           = @VCS@
-VCSUP         = @VCSUP@
-
-OBJEXT        = @OBJEXT@
-ASMEXT        = S
-DLEXT         = @DLEXT@
-MANTYPE	      = @MANTYPE@
-SYMBOL_PREFIX = @SYMBOL_PREFIX@
-
-INSTALLED_LIST= .installed.list
-
-MKMAIN_CMD    = mkmain.sh
-
-SRC_FILE      = $<
-
-MESSAGE_BEGIN = @for line in
-MESSAGE_END = ; do echo "$$line"; done
-
-configure_args = @configure_args@
-#### End of variables
-
-all:
-
-.DEFAULT: all
-
-# Prevent GNU make v3 from overflowing arg limit on SysV.
-.NOEXPORT:
-
-miniruby$(EXEEXT):
-		@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
-		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@
-
-$(PROGRAM):
-		@$(RM) $@
-		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
-
-# We must `rm' the library each time this rule is invoked because "updating" a
-# MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
-# supported.
-$(LIBRUBY_A):
-		@$(RM) $@
-		$(ECHO) linking static-library $@
-		$(Q) $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT)
-		@-$(RANLIB) $@ 2> /dev/null || true
-
-$(LIBRUBY_SO):
-		@-$(PRE_LIBRUBY_UPDATE)
-		$(ECHO) linking shared-library $@
-		$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
-		-$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)*_threadptr_*' $@
-		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
-						  File.symlink "$(LIBRUBY_SO)", link}' \
-				$(LIBRUBY_ALIASES) || true
-
-fake: $(arch)-fake.rb
-$(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
-
-install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \
-	$(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE)
-	$(ECHO) installing cross-compiling stuff
-	$(Q) $(MAKEDIRS) $(XRUBY_RUBYLIBDIR)/$(arch) $(XRUBY_RUBYHDRDIR)/$(arch)/ruby
-	$(Q) sed '/^\$$:\.unshift/q' $(arch)-fake.rb > fake.rb
-	$(Q) $(BASERUBY) -p \
-	-e '~/^\s*CONFIG\["LDFLAGS"\]/ and' \
-	-e '$$_[/(?=\s*"$$)/] = %q[ #{(CONFIG["LIBPATHFLAG"]%File.dirname(__FILE__)).strip}]' \
-	rbconfig.rb > fake-rbconfig.rb
-	$(INSTALL_SCRIPT) fake.rb $(XRUBY_RUBYLIBDIR)/$(arch)/fake.rb
-	$(INSTALL_SCRIPT) fake-rbconfig.rb $(XRUBY_RUBYLIBDIR)/$(arch)/rbconfig.rb
-	@$(RM) fake.rb fake-rbconfig.rb
-	$(INSTALL_DATA) $(arch_hdrdir)/ruby/config.h $(XRUBY_RUBYHDRDIR)/$(arch)/ruby
-	$(INSTALL_DATA) $(top_srcdir)/include/ruby/win32.h $(XRUBY_RUBYHDRDIR)/ruby
-	$(INSTALL_DATA) $(LIBRUBY) $(LIBRUBY_A) $(XRUBY_RUBYLIBDIR)/$(arch)
-	$(INSTALL_PROGRAM) $(LIBRUBY_SO) $(XRUBY_RUBYLIBDIR)/$(arch)
-
-Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
-
-$(MKFILES): config.status
-		MAKE=$(MAKE) $(SHELL) ./config.status
-		@{ \
-		    echo "all:; -@rm -f conftest.mk"; \
-		    echo "conftest.mk: .force; @echo AUTO_REMAKE"; \
-		    echo ".force:"; \
-		} > conftest.mk || exit 1; \
-		$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
-		{ echo "Makefile updated, restart."; exit 1; }
-
-uncommon.mk: $(srcdir)/common.mk
-		sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
-
-.PHONY: reconfig
-reconfig-args = $(srcdir)/configure $(configure_args)
-config.status-args = ./config.status --recheck
-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
-	@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
-	set $(SHELL) $($@-args); $(reconfig-exec-$(V))
-
-$(srcdir)/configure: $(srcdir)/configure.in
-	$(CHDIR) $(srcdir) && exec $(AUTOCONF)
-
-incs: id.h
-
-# Things which should be considered:
-# * with gperf v.s. without gperf
-# * committers may have various versions of gperf
-# * ./configure v.s. ../ruby/configure
-# * GNU make v.s. HP-UX make	# HP-UX make invokes the action if lex.c and keywords has same mtime.
-# * svn checkout generate a file with mtime as current time
-# * ext4 and XFS has a mtime with fractional part
-lex.c: defs/keywords
-	@\
-	if cmp -s $(srcdir)/defs/lex.c.src $?; then \
-	  [ $(Q) ] && echo copying $@ || set -x; \
-	  $(CP) $(srcdir)/lex.c.blt $@; \
-	else \
-	  [ $(Q) ] && echo generating $@ || set -x; \
-	  gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && \
-	  $(MV) $@.tmp $@ && \
-	  $(CP) $? $(srcdir)/defs/lex.c.src && \
-	  $(CP) $@ $(srcdir)/lex.c.blt; \
-	fi
-
-NAME2CTYPE_OPTIONS = -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p
-
-enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
-	$(MAKEDIRS) $(@D)
-	@set +e; \
-	if cmp -s $(?:.kwd=.src) $?; then \
-	  set -x; \
-	  $(CP) $(?:.kwd=.h.blt) $@; \
-	else \
-	  trap '$(RM) $@-1.h $@-2.h' 0 && \
-	  set -x; \
-	  sed '/^#ifdef USE_UNICODE_PROPERTIES/,/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-1.h && \
-	  gperf $(NAME2CTYPE_OPTIONS) < $? > $@-2.h && \
-	  diff -DUSE_UNICODE_PROPERTIES $@-1.h $@-2.h > $@.tmp || :; \
-	  $(MV) $@.tmp $@ && \
-	  $(CP) $? $(?:.kwd=.src) && \
-	  $(CP) $@ $(?:.kwd=.h.blt); \
-	fi
-
-.c.@OBJEXT@:
-	@$(ECHO) compiling $<
-	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
-
-.s.@OBJEXT@:
-	@$(ECHO) assembling $<
-	$(Q) $(AS) $(ASFLAGS) -o $@ $<
-
-.c.S:
-	@$(ECHO) translating $<
-	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
-
-.c.i:
-	@$(ECHO) preprocessing $<
-	$(Q) $(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
-
-clean-local::
-	$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output
-	-$(Q)$(RM) $(pkgconfig_DATA)
-
-distclean-local::
-	$(Q)$(RM) ext/config.cache $(RBCONFIG) Doxyfile
-	-$(Q)$(RM) run.gdb
-	-$(Q)$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h
-	-$(Q)$(RMDIRS) $(arch_hdrdir)/ruby 2> /dev/null || true
-
-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 | sed 's:~$$::'; \
-	`; shift; \
-	cd ..; \
-	for dir do \
-	    echo $(@:-ext=)ing "$$dir"; \
-	    (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
-	    case "$@" in \
-	    *distclean-ext*|*realclean-ext*) \
-		$(RMDIRS) "ext/$$dir" 2> /dev/null || true;; \
-	    esac; \
-	done
-
-distclean-ext realclean-ext::
-	-$(Q)$(RMDIR) ext 2> /dev/null || true
-
-clean-extout:
-	-$(Q)$(RMDIRS) $(EXTOUT) 2> /dev/null || true
-
-clean-enc distclean-enc realclean-enc:
-	@test -f "$(ENC_MK)" || exit 0; \
-	echo $(@:-enc=ing) encodings; \
-	exec $(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
-
-clean-rdoc distclean-rdoc realclean-rdoc:
-	@echo $(@:-rdoc=ing) rdoc
-	$(Q)$(RMALL) $(RDOCOUT)
-clean-capi distclean-capi realclean-capi:
-	@echo $(@:-capi=ing) capi
-	$(Q)$(RMALL) $(CAPIOUT)
-
-
-ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
-	$(ECHO) compiling $@
-	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
-
-up::
-	@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
-
-update-mspec:
-	@$(CHDIR) $(srcdir); \
-	if [ -d spec/mspec ]; then \
-	  cd spec/mspec; \
-	  echo updating mspec ...; \
-	  exec git pull; \
-	else \
-	  echo retrieving mspec ...; \
-	  exec git clone $(MSPEC_GIT_URL) spec/mspec; \
-	fi
-
-update-rubyspec: update-mspec
-	@$(CHDIR) $(srcdir); \
-	if [ -d spec/rubyspec ]; then \
-	  cd spec/rubyspec; \
-	  echo updating rubyspec ...; \
-	  exec git pull; \
-	else \
-	  echo retrieving rubyspec ...; \
-	  exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
-	fi
-
-test-rubyspec-precheck:
-	@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
-
-INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
-	  vmtc.inc vm.inc
-
-$(INSNS): $(srcdir)/insns.def vm_opts.h \
-	  $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def \
-	  $(srcdir)/tool/instruction.rb $(srcdir)/tool/insns2vm.rb
-	$(ECHO) generating $@
-	$(Q) $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
diff --git a/NEWS b/NEWS
index 30fec33fdd..e1adb5115d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,341 +1,826 @@
-# -*- rd -*-
-= NEWS
+# -*- rdoc -*-
+
+= NEWS for Ruby 2.7.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.
+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 1.9.2 release
-=== License
+== Changes since the 2.6.0 release
 
-* Ruby's License is changed from a dual license with GPLv2
-  to a dual license with 2-clause BSDL.
+=== Language changes
 
-=== Known platform dependent issues
-==== OS X Lion
+==== Pattern matching
 
-* You have to configure ruby with '--with-gcc=gcc-4.2' if you're using
-  Xcode 4.1, or, if you're using Xcode 4.2, you have to configure ruby
-  with '--with-gcc=clang'.
+* Pattern matching is introduced as an experimental feature. [Feature #14912]
 
-=== C API updates
+    case [0, [1, 2, 3]]
+    in [a, [b, *c]]
+      p a #=> 0
+      p b #=> 1
+      p c #=> [2, 3]
+    end
+
+    case {a: 0, b: 1}
+    in {a: 0, x: 1}
+      :unreachable
+    in {a: 0, b: var}
+      p var #=> 1
+    end
 
-* rb_scan_args() is enhanced with support for option hash argument
-  extraction.
-
-* ruby_vm_at_exit() added.  This enables extension libs to hook a VM
-  termination.
-
-* rb_reserved_fd_p() added.  If you want to close all file descriptors,
-  check using this API.  [ruby-core:37759]
-
-=== Library updates (outstanding ones only)
-
-* builtin classes
-
-  * ARGF
-    * new methods:
-      * ARGF.print
-      * ARGF.printf
-      * ARGF.putc
-      * ARGF.puts
-      * ARGF.read_nonblock
-      * ARGF.to_write_io
-      * ARGF.write
+    case -1
+    in 0 then :unreachable
+    in 1 then :unreachable
+    end #=> NoMatchingPatternError
 
-  * Array
-    * extended method:
-      * Array#pack supports endian modifiers
+    json = <<END
+    {
+      "name": "Alice",
+      "age": 30,
+      "children": [{ "name": "Bob", "age": 2 }]
+    }
+    END
 
-  * Bignum
-    * Multiplication algorithm for Bignums with a large number of digits over
-      150 BDIGITs is changed in order to reduce its calculation time.
-      Now such large Bignums are multiplied by using Toom-3 algorithm.
+    JSON.parse(json, symbolize_names: true) in {name: "Alice", children: [{name: name, age: age}]}
 
-  * Encoding
-    * new encodings:
-      * CP950
-      * CP951
-      * UTF-16
-      * UTF-32
-    * change alias:
-      * SJIS is Windows-31J
+    p name #=> "Bob"
+    p age  #=> 2
 
-  * File
-    * new constant:
-      * File::NULL
-        name of NULL device.
-      * File::DIRECT
-        name of O_DIRECT.
+    JSON.parse(json, symbolize_names: true) in {name: "Alice", children: [{name: "Charlie", age: age}]}
+    #=> NoMatchingPatternError
 
-  * IO
-    * extended method:
-      * IO#putc supports multibyte characters
-    * new methods:
-      * IO#advise
-      * IO.write(name, string, [offset] )
-        Write `string` to file `name`.
-        Opposite with File.read.
-      * IO.binwrite(name, string, [offset] )
-        binary version of IO.write.
+* See the following slides for more details:
+  * https://speakerdeck.com/k_tsj/pattern-matching-new-feature-in-ruby-2-dot-7
+  * Note that the slides are slightly obsolete.
 
-  * Kernel
-    * move #__id__ to BasicObject.
-    * extended method:
-      * Kernel#rand supports range argument
+* The warning against pattern matching can be suppressed with
+  {-W:no-experimental option}[#label-Warning+option].
 
-  * Module
-    * new methods:
-      * Module#private_constant
-      * Module#public_constant
+==== The spec of keyword arguments is changed towards 3.0
 
-  * Random
-    * extended method:
-      * Random.rand supports range argument
+* Automatic conversion of keyword arguments and positional arguments is
+  deprecated, and conversion will be removed in Ruby 3.  [Feature #14183]
 
-  * String
-    * extended method:
-      * String#unpack supports endian modifiers
-    * new method:
-      * String#prepend
-      * String#byteslice
+  * When a method call passes a Hash at the last argument, and when it
+    passes no keywords, and when the called method accepts keywords,
+    a warning is emitted.  To continue treating the hash as keywords,
+    add a double splat operator to avoid the warning and ensure
+    correct behavior in Ruby 3.
 
-  * Time
-    * extended method:
-      * Time#strftime supports %:z and %::z.
-
-  * Process
-    * Process#maxgroups and Process#maxgroups= now raise NotImplementedError if
-      the platform don't support supplementary groups concept.
-
-* bigdecimal
-
-  * BigDecimal#power and BigDecimal#** support non-integral exponent.
-
-  * Kernel.BigDecimal and BigDecimal.new now accept instances of Integer,
-    Rational, Float, and BigDecimal.  If you pass a Rational or a Float to
-    them, you must specify the precision to produce the digits of a BigDecimal.
-
-  * The behavior of BigDecimal#coerce with a Rational is changed.  It uses
-    the precision of the receiver BigDecimal to produce the digits of a
-    BigDecimal from the given Rational.
-
-* bigdecimal/util
-
-  * BigDecimal#to_d and Integer#to_d are added.
-
-  * Float#to_d accepts a precision.
-
-  * Rational#to_d raises ArgumentError when passing zero or negative
-    precision.
-
-  * Rational#to_d
-
-    * Zero and an implicit precision is deprecated.
-      This feature is removed at the next release of bigdecimal.
-
-    * A negative precision isn't supported.
-      Be careful it is an incompatible change.
-
-* date
-
-  * Accepts flonum explicitly with limitations.
-    * If the given offset is flonum, DateTime assumes its precision is
-      at most second.
-
-      DateTime.new(2001,2,3,0,0,0,3.0/24) ==
-      DateTime.new(2001,2,3,0,0,0,'+03:00')
-        #=> true
-
-    * If the given operand for -/+ is flonum, DateTime assumes its
-      precision is at most nanosecond.
-
-      DateTime.new(2001,2,3) + 0.5 == DateTime.new(2001,2,3,12)
-        #=> true
-
-    * Precision of offset is always at most second.
-
-      Rational('0.5') == Rational('0.500001')  #=> false
-      DateTime.new(2001,2,3,0,0,0,Rational('0.5')) ==
-      DateTime.new(2001,2,3,0,0,0,Rational('0.500001'))
-        #=> true
-
-  * Ignores long offset and far reform day (with warning).
-
-    * Now accepts only:
-
-      -1<=offset<=1 (-24:00..+24:00)
-      2298874<=start<=2426355 or -/+oo
-        (proleptic Gregorian/Julian mean -/+oo)
-
-  * A method strftime cannot produce huge output (same as Time's one).
-
-    * Even though Date/DateTime can handle far dates, the following causes
-      an exception.
-
-      DateTime.new(1<<10000).strftime('%Y')  # Errno::ERANGE
-
-  * Changed the format of inspect.
-  * Changed the format of marshal (but, can load old dumps).
-
-* io/console
-  * new methods:
-    * IO#noecho {|io| }
-    * IO#echo=
-    * IO#echo?
-    * IO#raw {|io| }
-    * IO#raw!
-    * IO#getch
-    * IO#winsize
-    * IO.console
-
-* json
-  * updated to v1.5.4.
-
-* matrix
-  * new classes:
-    * Matrix::EigenvalueDecomposition
-    * Matrix::LUPDecomposition
-  * new methods:
-    * Matrix#diagonal?
-    * Matrix#eigen
-    * Matrix#eigensystem
-    * Matrix#hermitian?
-    * Matrix#lower_triangular?
-    * Matrix#lup
-    * Matrix#lup_decomposition
-    * Matrix#normal?
-    * Matrix#orthogonal?
-    * Matrix#permutation?
-    * Matrix#round
-    * Matrix#symmetric?
-    * Matrix#unitary?
-    * Matrix#upper_triangular?
-    * Matrix#zero?
-    * Vector#magnitude, #norm
-    * Vector#normalize
-  * extended methods:
-    * Matrix#each and #each_with_index can iterate on a subset of the elements
-    * Matrix#find_index returns [row, column] and can iterate on a subset
-      of the elements
-    * Matrix#** implements Numeric exponents (using the eigensystem)
-    * Matrix.zero can build rectangular matrices
-
-* minitest
-  * Minitest has been updated to version 2.2.2.
-  * For full details, see https://github.com/seattlerb/minitest/blob/master/History.txt
-
-* net/http
-  * SNI (Server Name Indication) supported for HTTPS.
-
-  * Allow to configure to wait server returning '100 continue' response
-    before sending HTTP request body. Set Net::HTTP#continue_timeout AND pass
-    'expect' => '100-continue' to a extra HTTP header.
-
-    For example, the following code sends HTTP header and waits for getting
-    '100 continue' response before sending HTTP request body. When 0.5 [sec]
-    timeout occurs or the server send '100 continue', the client sends HTTP
-    request body.
-      http.continue_timeout = 0.5
-      http.request_post('/continue', 'body=BODY', 'expect' => '100-continue')
-
-  * new method:
-    * Net::HTTPRequest#set_form): Added to support
-      both application/x-www-form-urlencoded and multipart/form-data.
-
-* objspace
-  * new method:
-    * ObjectSpace::memsize_of_all
-
-* openssl
-  * PKey::RSA and PKey::DSA now use the generic X.509 encoding scheme
-    (e.g. used in a X.509 certificate's Subject Public Key Info) when
-    exporting public keys to DER or PEM. Backward compatibility is
-    ensured by (already existing) fallbacks during creation.
-  * OpenSSL::ASN1::Constructive#new and OpenSSL::ASN1::Primitive#new
-    (and the constructors of their sub-classes) will no longer force
-    tagging to be set to :EXPLICIT when tag and/or tag_class are passed
-    as parameters. tagging must be set explicitly.
-  * Support for infinite length encodings via infinite_length attribute.
-  * OpenSSL::PKey.read( file | string [, pwd] ) allows to read arbitrary
-    public/private keys in DER-/PEM-encoded form with an optional password
-    for encrypted PEM encodings.
-  * Add new method OpenSSL::X509::Name#hash_old as a wrapper of
-    X509_NAME_hash_old() defined from OpenSSL 1.0.0. It returns OpenSSL 0.9.8
-    compatible hash value.
-
-* optparse
-  * support for bash/zsh completion.
-
-* Rake
-  * Rake has been upgraded from 0.8.7 to 0.9.2.2.  For full release notes see
-    https://github.com/jimweirich/rake/blob/master/CHANGES
-
-* RDoc
-  * RDoc has been upgraded to version 3.9.4.  For full release notes see
-    http://docs.seattlerb.org/rdoc/History_txt.html
-
-* rexml
-  * Support Ruby native encoding mechanism and iconv dependency is dropped.
-
-* RubyGems
-  * RubyGems has been upgraded to version 1.8.10. For full release notes see
-    http://rubygems.rubyforge.org/rubygems-update/History_txt.html
-
-* stringio
-  * extended method:
-    * StringIO#set_encoding can get 2nd argument and optional hash.
-
-* test/unit
-  * New arguments:
-    * -j N, --jobs=N: Allow run N testcases at once.
-    * --jobs-status: Show status of jobs when parallel running.
-    * --no-retry: Don't retry testcases which failed when parallel running.
-    * --ruby=RUBY: path to ruby for job(worker) process. optional.
-    * --hide-skip: Hide skip messages. You'll see the number of skips at end of
-      test result.
-
-* uri
-  * new methods:
-    * URI::Generic#hostname
-    * URI::Generic#hostname=
-
-* webrick
-  * new method:
-    * WEBrick::HTTPRequest#continue for generating '100 continue' response.
-  * new logging directive:
-    * %{remote}p for remote (client) port number.
-
-* yaml
-  * The default YAML engine is now Psych. You may downgrade to syck by setting
-    YAML::ENGINE.yamler = 'syck'.
-
-* zlib
-  * new methods:
-    * Zlib.deflate
-    * Zlib.inflate
-
-* FileUtils
-  * extended method:
-    * FileUtils#chmod supports symbolic mode argument.
+      def foo(key: 42); end; foo({key: 42})   # warned
+      def foo(**kw);    end; foo({key: 42})   # warned
+      def foo(key: 42); end; foo(**{key: 42}) # OK
+      def foo(**kw);    end; foo(**{key: 42}) # OK
 
-=== Language changes
+  * When a method call passes keywords to a method that accepts keywords,
+    but it does not pass enough required positional arguments, the
+    keywords are treated as a final required positional argument, and a
+    warning is emitted.  Pass the argument as a hash instead of keywords
+    to avoid the warning and ensure correct behavior in Ruby 3.
+
+      def foo(h, **kw); end; foo(key: 42)      # warned
+      def foo(h, key: 42); end; foo(key: 42)   # warned
+      def foo(h, **kw); end; foo({key: 42})    # OK
+      def foo(h, key: 42); end; foo({key: 42}) # OK
+
+  * When a method accepts specific keywords but not a keyword splat, and
+    a hash or keywords splat is passed to the method that includes both
+    Symbol and non-Symbol keys, the hash will continue to be split, and
+    a warning will be emitted.  You will need to update the calling code
+    to pass separate hashes to ensure correct behavior in Ruby 3.
+
+      def foo(h={}, key: 42); end; foo("key" => 43, key: 42)   # warned
+      def foo(h={}, key: 42); end; foo({"key" => 43, key: 42}) # warned
+      def foo(h={}, key: 42); end; foo({"key" => 43}, key: 42) # OK
+
+  * If a method does not accept keywords, and is called with keywords,
+    the keywords are still treated as a positional hash, with no warning.
+    This behavior will continue to work in Ruby 3.
+
+      def foo(opt={});  end; foo( key: 42 )   # OK
+
+* Non-symbols are allowed as keyword argument keys if the method accepts
+  arbitrary keywords. [Feature #14183]
+
+  * Non-Symbol keys in a keyword arguments hash were prohibited in 2.6.0,
+    but are now allowed again.  [Bug #15658]
+
+      def foo(**kw); p kw; end; foo("str" => 1) #=> {"str"=>1}
+
+* <code>**nil</code> is allowed in method definitions to explicitly mark
+  that the method accepts no keywords. Calling such a method with keywords
+  will result in an ArgumentError. [Feature #14183]
+
+    def foo(h, **nil); end; foo(key: 1)       # ArgumentError
+    def foo(h, **nil); end; foo(**{key: 1})   # ArgumentError
+    def foo(h, **nil); end; foo("str" => 1)   # ArgumentError
+    def foo(h, **nil); end; foo({key: 1})     # OK
+    def foo(h, **nil); end; foo({"str" => 1}) # OK
+
+* Passing an empty keyword splat to a method that does not accept keywords
+  no longer passes an empty hash, unless the empty hash is necessary for
+  a required parameter, in which case a warning will be emitted.  Remove
+  the double splat to continue passing a positional hash.  [Feature #14183]
+
+    h = {}; def foo(*a) a end; foo(**h) # []
+    h = {}; def foo(a) a end; foo(**h)  # {} and warning
+    h = {}; def foo(*a) a end; foo(h)   # [{}]
+    h = {}; def foo(a) a end; foo(h)    # {}
+
+* Above warnings can be suppressed also with {-W:no-deprecated option}[#label-Warning+option].
+
+==== Numbered parameters
+
+* Numbered parameters as default block parameters are introduced.
+  [Feature #4475]
+
+    [1, 2, 10].map { _1.to_s(16) }    #=> ["1", "2", "a"]
+    [[1, 2], [3, 4]].map { _1 + _2 }  #=> [3, 7]
+
+  You can still define a local variable named +_1+ and so on,
+  and that is honored when present, but renders a warning.
+
+    _1 = 0            #=> warning: `_1' is reserved for numbered parameter; consider another name
+    [1].each { p _1 } # prints 0 instead of 1
+
+==== proc/lambda without block is deprecated
+
+* Proc.new and Kernel#proc with no block in a method called with a block is
+  warned now.
+
+    def foo
+      proc
+    end
+    foo { puts "Hello" } #=> warning: Capturing the given block using Kernel#proc is deprecated; use `&block` instead
+
+  This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option].
+
+* Kernel#lambda with no block in a method called with a block raises an exception.
+
+    def bar
+      lambda
+    end
+    bar { puts "Hello" } #=> tried to create Proc object without a block (ArgumentError)
+
+==== Other miscellaneous changes
+
+* A beginless range is experimentally introduced.  It might be useful
+  in +case+, new call-sequence of the <code>Comparable#clamp</code>,
+  constants and DSLs.  [Feature #14799]
+
+     ary[..3]  # identical to ary[0..3]
+
+     case RUBY_VERSION
+     when ..."2.4" then puts "EOL"
+     # ...
+     end
+
+     age.clamp(..100)
+
+     where(sales: ..100)
+
+* Setting <code>$;</code> to a non-nil value is warned now. [Feature #14240]
+  Use of it in String#split is warned too.
+  This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option].
+
+* Setting <code>$,</code> to a non-nil value is warned now. [Feature #14240]
+  Use of it in Array#join is warned too.
+  This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option].
+
+* Quoted here-document identifiers must end within the same line.
+
+     <<"EOS
+     " # This had been warned since 2.4; Now it raises a SyntaxError
+     EOS
+
+* The flip-flop syntax deprecation is reverted. [Feature #5400]
+
+* Comment lines can be placed between fluent dot now.
+
+    foo
+      # .bar
+      .baz # => foo.baz
+
+* Calling a private method with a literal +self+ as the receiver
+  is now allowed. [Feature #11297] [Feature #16123]
+
+* Modifier rescue now operates the same for multiple assignment as single
+  assignment. [Bug #8279]
+
+    a, b = raise rescue [1, 2]
+    # Previously parsed as: (a, b = raise) rescue [1, 2]
+    # Now parsed as:         a, b = (raise rescue [1, 2])
+
+* +yield+ in singleton class syntax is warned and will be deprecated later. [Feature #15575].
+
+   def foo
+     class << Object.new
+       yield #=> warning: `yield' in class syntax will not be supported from Ruby 3.0. [Feature #15575]
+     end
+   end
+   foo { p :ok }
+
+  This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option].
+
+* Argument forwarding by <code>(...)</code> is introduced. [Feature #16253]
+
+    def foo(...)
+      bar(...)
+    end
+
+  All arguments to +foo+ are forwarded to +bar+, including keyword and
+  block arguments.
+  Note that the parentheses are mandatory.  <code>bar ...</code> is parsed
+  as an endless range.
+
+* Access and setting of <code>$SAFE</code> is now always warned. <code>$SAFE</code>
+  will become a normal global variable in Ruby 3.0. [Feature #16131]
+
+* <code>Object#{taint,untaint,trust,untrust}</code> and related functions in the C-API
+  no longer have an effect (all objects are always considered untainted), and are now
+  warned in verbose mode. This warning will be disabled even in non-verbose mode in
+  Ruby 3.0, and the methods and C functions will be removed in Ruby 3.2. [Feature #16131]
+
+* Refinements take place at Object#method and Module#instance_method. [Feature #15373]
+
+=== Command line options
+
+==== Warning option
+
+The +-W+ option has been extended with a following +:+, to manage categorized
+warnings.  [Feature #16345] [Feature #16420]
+
+* To suppress deprecation warnings:
+
+    $ ruby -e '$; = ""'
+    -e:1: warning: `$;' is deprecated
+
+    $ ruby -W:no-deprecated -e '$; = //'
+
+* It works with the +RUBYOPT+ environment variable:
+
+    $ RUBYOPT=-W:no-deprecated ruby -e '$; = //'
+
+* To suppress experimental feature warnings:
+
+    $ ruby -e '0 in a'
+    -e:1: warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby!
+
+    $ ruby -W:no-experimental -e '0 in a'
+
+* To suppress both by using +RUBYOPT+, set space separated values:
+
+    $ RUBYOPT='-W:no-deprecated -W:no-experimental' ruby -e '($; = "") in a'
+
+See also Warning in {Core classes updates}[#label-Core+classes+updates+-28outstanding+ones+only-29].
+
+=== Core classes updates (outstanding ones only)
+
+Array::
+
+  New methods::
+
+    * Added Array#intersection. [Feature #16155]
+
+    * Added Array#minmax, with a faster implementation than Enumerable#minmax. [Bug #15929]
+
+Comparable::
+
+  Modified method::
+
+    * Comparable#clamp now accepts a Range argument. [Feature #14784]
+
+        -1.clamp(0..2) #=> 0
+         1.clamp(0..2) #=> 1
+         3.clamp(0..2) #=> 2
+        # With beginless and endless ranges:
+        -1.clamp(0..)  #=> 0
+         3.clamp(..2)  #=> 2
+
+
+Complex::
+
+  New method::
+
+    * Added Complex#<=>.
+      So <code>0 <=> 0i</code> will not raise NoMethodError. [Bug #15857]
+
+Dir::
+
+  Modified methods::
+
+    * Dir.glob and Dir.[] no longer allow NUL-separated glob pattern.
+      Use Array instead.  [Feature #14643]
+
+Encoding::
+
+  New encoding::
+
+    * Added new encoding CESU-8. [Feature #15931]
+
+Enumerable::
+
+  New methods::
+
+    * Added Enumerable#filter_map.  [Feature #15323]
+
+        [1, 2, 3].filter_map {|x| x.odd? ? x.to_s : nil } #=> ["1", "3"]
+
+    * Added Enumerable#tally.  [Feature #11076]
+
+        ["A", "B", "C", "B", "A"].tally #=> {"A"=>2, "B"=>2, "C"=>1}
+
+Enumerator::
+
+  New methods::
+
+    * Added Enumerator.produce to generate an Enumerator from any custom
+      data transformation.  [Feature #14781]
+
+        require "date"
+        dates = Enumerator.produce(Date.today, &:succ) #=> infinite sequence of dates
+        dates.detect(&:tuesday?) #=> next Tuesday
+
+    * Added Enumerator::Lazy#eager that generates a non-lazy enumerator
+      from a lazy enumerator.  [Feature #15901]
+
+        a = %w(foo bar baz)
+        e = a.lazy.map {|x| x.upcase }.map {|x| x + "!" }.eager
+        p e.class               #=> Enumerator
+        p e.map {|x| x + "?" }  #=> ["FOO!?", "BAR!?", "BAZ!?"]
+
+    * Added Enumerator::Yielder#to_proc so that a Yielder object
+      can be directly passed to another method as a block
+      argument.  [Feature #15618]
+
+Fiber::
+
+  New method::
+
+    * Added Fiber#raise that behaves like Fiber#resume but raises an
+      exception on the resumed fiber.  [Feature #10344]
+
+File::
+
+  Modified method::
+
+    * File.extname now returns a dot string for names ending with a dot on
+      non-Windows platforms.  [Bug #15267]
+
+          File.extname("foo.") #=> "."
+
+FrozenError::
+
+  New method::
+
+    * Added FrozenError#receiver to return the frozen object on which
+      modification was attempted.  To set this object when raising
+      FrozenError in Ruby code, FrozenError.new accepts a +:receiver+
+      option.  [Feature #15751]
+
+GC::
+
+  New method::
+
+    * Added GC.compact method for compacting the heap.
+      This function compacts live objects in the heap so that fewer pages may
+      be used, and the heap may be more CoW (copy-on-write) friendly. [Feature #15626]
+
+      Details on the algorithm and caveats can be found here:
+      https://bugs.ruby-lang.org/issues/15626
+
+IO::
+
+  New method::
+
+    * Added IO#set_encoding_by_bom to check the BOM and set the external
+      encoding.  [Bug #15210]
+
+Integer::
+
+  Modified method::
+
+    * Integer#[] now supports range operations.  [Feature #8842]
+
+         0b01001101[2, 4]  #=> 0b0011
+         0b01001100[2..5]  #=> 0b0011
+         0b01001100[2...6] #=> 0b0011
+         #   ^^^^
+
+Method::
+
+  Modified method::
+
+    * Method#inspect shows more information. [Feature #14145]
+
+Module::
+
+  New methods::
+
+    * Added Module#const_source_location to retrieve the location where a
+      constant is defined.  [Feature #10771]
+
+    * Added Module#ruby2_keywords for marking a method as passing keyword
+      arguments through a regular argument splat, useful when delegating
+      all arguments to another method in a way that can be backwards
+      compatible with older Ruby versions.  [Bug #16154]
 
-* Regexps now support Unicode 6.0. (new characters and scripts)
+  Modified methods::
 
-* [experimental] Regexps now support Age property.
-  Unlike Perl, current implementation takes interpretation of the
-  interpretation of UTS #18.
-  http://www.unicode.org/reports/tr18/
+    * Module#autoload? now takes an +inherit+ optional argument, like
+      Module#const_defined?.  [Feature #15777]
 
-* Turning on/off indentation warnings with directives.
-  ("# -*- warn-indent: true -*-" / "# -*- warn-indent: false -*-")
+    * Module#name now always returns a frozen String. The returned String is
+      always the same for a given Module. This change is
+      experimental. [Feature #16150]
+
+NilClass / TrueClass / FalseClass::
+
+  Modified methods::
+
+    * NilClass#to_s, TrueClass#to_s, and FalseClass#to_s now always return a
+      frozen String. The returned String is always the same for each of these
+      values. This change is experimental. [Feature #16150]
+
+ObjectSpace::WeakMap::
+
+  Modified method::
+
+    * ObjectSpace::WeakMap#[]= now accepts special objects as either key or
+      values.  [Feature #16035]
+
+Proc::
+
+  New method::
+
+    * Added Proc#ruby2_keywords for marking the proc as passing keyword
+      arguments through a regular argument splat, useful when delegating
+      all arguments to another method or proc in a way that can be backwards
+      compatible with older Ruby versions.  [Feature #16404]
+
+Range::
+
+  New method::
+
+    * Added Range#minmax, with a faster implementation than Enumerable#minmax.
+      It returns a maximum that now corresponds to Range#max. [Bug #15807]
+
+  Modified method::
+
+    * Range#=== now uses Range#cover? for String arguments, too (in Ruby 2.6, it was
+      changed from Range#include? for all types except strings). [Bug #15449]
+
+
+RubyVM::
+
+  Removed method::
+
+    * +RubyVM.resolve_feature_path+ moved to
+      <code>$LOAD_PATH.resolve_feature_path</code>.  [Feature #15903] [Feature #15230]
+
+String::
+
+  Unicode::
+
+    * Update Unicode version and Emoji version from 11.0.0 to
+      12.0.0.  [Feature #15321]
+
+    * Update Unicode version to 12.1.0, adding support for
+      U+32FF SQUARE ERA NAME REIWA.  [Feature #15195]
+
+    * Update Unicode Emoji version to 12.1. [Feature #16272]
+
+Symbol::
+
+  New methods::
+
+    * Added Symbol#start_with? and Symbol#end_with? methods.  [Feature #16348]
+
+Time::
+
+  New methods::
+
+    * Added Time#ceil method.  [Feature #15772]
+
+    * Added Time#floor method.  [Feature #15653]
+
+  Modified method::
+
+    * Time#inspect is separated from Time#to_s and it shows
+      the time's sub second.  [Feature #15958]
+
+UnboundMethod::
+
+  New method::
+
+    * Added UnboundMethod#bind_call method.  [Feature #15955]
+
+      <code>umethod.bind_call(obj, ...)</code> is semantically equivalent
+      to <code>umethod.bind(obj).call(...)</code>.  This idiom is used in
+      some libraries to call a method that is overridden.  The added
+      method does the same without allocation of an intermediate Method
+      object.
+
+          class Foo
+            def add_1(x)
+              x + 1
+            end
+          end
+          class Bar < Foo
+            def add_1(x) # override
+              x + 2
+            end
+          end
+
+          obj = Bar.new
+          p obj.add_1(1) #=> 3
+          p Foo.instance_method(:add_1).bind(obj).call(1) #=> 2
+          p Foo.instance_method(:add_1).bind_call(obj, 1) #=> 2
+
+Warning::
+
+  New methods::
+
+    * Added Warning.[] and Warning.[]= to manage emitting/suppressing
+      some categories of warnings.  [Feature #16345] [Feature #16420]
+
+$LOAD_PATH::
+
+  New method::
+
+    * Added <code>$LOAD_PATH.resolve_feature_path</code>.  [Feature #15903] [Feature #15230]
+
+=== Stdlib updates (outstanding ones only)
+
+Bundler::
+
+  * Upgrade to Bundler 2.1.2.
+    See https://github.com/bundler/bundler/releases/tag/v2.1.2
+
+CGI::
+
+  * CGI.escapeHTML becomes 2~5x faster when there is at least one escaped character.
+    See https://github.com/ruby/ruby/pull/2226
+
+CSV::
+
+  * Upgrade to 3.1.2.
+    See https://github.com/ruby/csv/blob/master/NEWS.md.
+
+Date::
+
+  * Date.jisx0301, Date#jisx0301, and Date.parse support the new Japanese
+    era.  [Feature #15742]
+
+Delegator::
+
+  * Object#DelegateClass accepts a block and module_evals it in the context
+    of the returned class, similar to Class.new and Struct.new.
+
+ERB::
+
+  * Prohibit marshaling ERB instance.
+
+IRB::
+
+  * Introduce syntax highlighting inspired by the Pry gem to Binding#irb
+    source lines, REPL input, and inspect output of some core-class objects.
+
+  * Introduce multiline editing mode provided by Reline.
+
+  * Show documentation when completion.
+
+  * Enable auto indent and save/load history by default.
+
+JSON::
+
+  * Upgrade to 2.3.0.
+
+Net::FTP::
+
+  * Add Net::FTP#features to check available features, and Net::FTP#option to
+    enable/disable each of them.  [Feature #15964]
+
+Net::HTTP::
+
+  * Add +ipaddr+ optional parameter to Net::HTTP#start to replace the address for
+    the TCP/IP connection. [Feature #5180]
+
+Net::IMAP::
+
+  * Add Server Name Indication (SNI) support.  [Feature #15594]
+
+open-uri::
+
+  * Warn open-uri's "open" method at Kernel.
+    Use URI.open instead.  [Misc #15893]
+
+  * The default charset of "text/*" media type is UTF-8 instead of
+    ISO-8859-1.  [Bug #15933]
+
+OptionParser::
+
+  * Now show "Did you mean?" for unknown options.  [Feature #16256]
+
+    test.rb:
+
+      require "optparse"
+      OptionParser.new do |opts|
+        opts.on("-f", "--foo", "foo") {|v| }
+        opts.on("-b", "--bar", "bar") {|v| }
+        opts.on("-c", "--baz", "baz") {|v| }
+      end.parse!
+
+    example:
+
+      $ ruby test.rb --baa
+      Traceback (most recent call last):
+      test.rb:7:in `<main>': invalid option: --baa (OptionParser::InvalidOption)
+      Did you mean?  baz
+                     bar
+
+Pathname::
+
+  * Pathname.glob now delegates 3 arguments to Dir.glob
+    to accept +base+ keyword. [Feature #14405]
+
+Racc::
+
+  * Merge 1.4.15 from upstream repository and added cli of racc.
+
+Reline::
+
+  * New stdlib that is compatible with the readline stdlib but is
+    implemented in pure Ruby. It also provides a multiline editing mode.
+
+REXML::
+
+  * Upgrade to 3.2.3.
+    See https://github.com/ruby/rexml/blob/master/NEWS.md.
+
+RSS::
+
+  * Upgrade to RSS 0.2.8.
+    See https://github.com/ruby/rss/blob/master/NEWS.md.
+
+RubyGems::
+
+  * Upgrade to RubyGems 3.1.2.
+    * https://github.com/rubygems/rubygems/releases/tag/v3.1.0
+    * https://github.com/rubygems/rubygems/releases/tag/v3.1.1
+    * https://github.com/rubygems/rubygems/releases/tag/v3.1.2
+
+StringScanner::
+
+  * Upgrade to 1.0.3.
+    See https://github.com/ruby/strscan/blob/master/NEWS.md.
 
 === Compatibility issues (excluding feature bug fixes)
 
-  * Rational#to_d
+* The following libraries are no longer bundled gems.
+  Install corresponding gems to use these features.
+  * CMath (cmath gem)
+  * Scanf (scanf gem)
+  * Shell (shell gem)
+  * Synchronizer (sync gem)
+  * ThreadsWait (thwait gem)
+  * E2MM (e2mmap gem)
+
+Proc::
+  * The Proc#to_s format was changed. [Feature #16101]
+
+Range::
+  * Range#minmax used to iterate on the range to determine the maximum.
+    It now uses the same algorithm as Range#max. In rare cases (e.g.
+    ranges of Floats or Strings), this may yield different results. [Bug #15807]
+
+=== Stdlib compatibility issues (excluding feature bug fixes)
+
+* Promote stdlib to default gems
+  * The following default gems were published on rubygems.org
+    * benchmark
+    * cgi
+    * delegate
+    * getoptlong
+    * net-pop
+    * net-smtp
+    * open3
+    * pstore
+    * readline
+    * readline-ext
+    * singleton
+  * The following default gems were only promoted at ruby-core,
+    but not yet published on rubygems.org.
+    * monitor
+    * observer
+    * timeout
+    * tracer
+    * uri
+    * yaml
+* The <tt>did_you_mean</tt> gem has been promoted up to a default gem from a bundled gem
+
+pathname::
+
+  * Kernel#Pathname when called with a Pathname argument now returns
+    the argument instead of creating a new Pathname. This is more
+    similar to other Kernel methods, but can break code that modifies
+    the return value and expects the argument not to be modified.
+
+profile.rb, Profiler__::
+
+  * Removed from standard library. It was unmaintained since Ruby 2.0.0.
+
+=== C API updates
+
+* Many <code>*_kw</code> functions have been added for setting whether
+  the final argument being passed should be treated as keywords. You
+  may need to switch to these functions to avoid keyword argument
+  separation warnings, and to ensure correct behavior in Ruby 3.
+
+* The <code>:</code> character in rb_scan_args format string is now
+  treated as keyword arguments. Passing a positional hash instead of
+  keyword arguments will emit a deprecation warning.
+
+* C API declarations with +ANYARGS+ are changed not to use +ANYARGS+.
+  See https://github.com/ruby/ruby/pull/2404
+
+=== Implementation improvements
+
+Fiber::
+
+  * Allow selecting different coroutine implementations by using
+    +--with-coroutine=+, e.g.
+
+         $ ./configure --with-coroutine=ucontext
+         $ ./configure --with-coroutine=copy
+
+  * Replace previous stack cache with fiber pool cache. The fiber pool
+    allocates many stacks in a single memory region. Stack allocation
+    becomes O(log N) and fiber creation is amortized O(1). Around 10x
+    performance improvement was measured in micro-benchmarks.
+    https://github.com/ruby/ruby/pull/2224
+
+File::
+  * File.realpath now uses realpath(3) on many platforms, which can
+    significantly improve performance. [Feature #15797]
+
+Hash::
+  * Change data structure of small Hash objects. [Feature #15602]
+
+Monitor::
+  * Monitor class is written in C-extension. [Feature #16255]
+
+Thread::
+
+  * VM stack memory allocation is now combined with native thread stack,
+    improving thread allocation performance and reducing allocation related
+    failures. Around 10x performance improvement was measured in micro-benchmarks.
+
+JIT::
+
+  * JIT-ed code is recompiled to less-optimized code when an optimization assumption is invalidated.
+
+  * Method inlining is performed when a method is considered as pure.
+    This optimization is still experimental and many methods are NOT considered as pure yet.
+
+  * The default value of +--jit-max-cache+ is changed from 1,000 to 100.
+
+  * The default value of +--jit-min-calls+ is changed from 5 to 10,000.
+
+RubyVM::
+
+  * Per-call-site method cache, which has been there since around 1.9, was
+    improved: cache hit rate raised from 89% to 94%.
+    See https://github.com/ruby/ruby/pull/2583
+
+RubyVM::InstructionSequence::
+
+  * RubyVM::InstructionSequence#to_binary method generates compiled binary.
+    The binary size is reduced. [Feature #16163]
+
+=== Miscellaneous changes
+
+* Support for IA64 architecture has been removed. Hardware for testing was
+  difficult to find, native fiber code is difficult to implement, and it added
+  non-trivial complexity to the interpreter. [Feature #15894]
+
+* Require compilers to support C99. [Misc #15347]
+
+  * Details of our dialect: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/C99
+
+* Ruby's upstream repository is changed from Subversion to Git.
+
+  * https://git.ruby-lang.org/ruby.git
+
+  * RUBY_REVISION class is changed from Integer to String.
+
+  * RUBY_DESCRIPTION includes Git revision instead of Subversion's one.
+
+* Support built-in methods in Ruby with the <code>_\_builtin_</code> syntax. [Feature #16254]
 
-    See above.
+  Some methods are defined in *.rb (such as trace_point.rb).
+  For example, it is easy to define a method which accepts keyword arguments.
diff --git a/README b/README
deleted file mode 100644
index 3d2e636e4d..0000000000
--- a/README
+++ /dev/null
@@ -1,140 +0,0 @@
-* What's Ruby
-
-Ruby is the interpreted scripting language for quick and
-easy object-oriented programming.  It has many features to
-process text files and to do system management tasks (as in
-Perl).  It is simple, straight-forward, and extensible.
-
-
-* Features of Ruby
-
-  + Simple Syntax
-  + *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 architecture)
-  + Highly Portable (works on many Unix-like/POSIX compatible platforms
-    as well as Windows, Mac OS X, BeOS etc.)
-    cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatforms
-
-
-* How to get Ruby
-
-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 http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
-
-There are some other branches under development.  Try the following
-command and see the list of branches:
-
-  $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
-
-
-* Ruby home-page
-
-The URL of the Ruby home-page is:
-
-   http://www.ruby-lang.org/
-
-
-* Mailing list
-
-There is a mailing list to talk about Ruby.
-To subscribe this list, please send the following phrase
-
-	subscribe YourFirstName YourFamilyName
-e.g.
-        subscribe Joseph Smith
-
-in the mail body (not subject) to the address <ruby-talk-ctl@ruby-lang.org>.
-
-
-* How to compile and install
-
-This is what you need to do to compile and install Ruby:
-
-  1. If ./configure does not exist or is older than configure.in,
-     run autoconf to (re)generate configure.
-
-  2. Run ./configure, which will generate config.h and Makefile.
-
-     Some C compiler flags may be added by default depending on your
-     environment.  Specify optflags=.. and warnflags=.. as necessary
-     to override them.
-
-  3. Edit defines.h if you need.  Usually this step will not be needed.
-
-  4. Remove comment mark(#) before the module names from ext/Setup (or
-     add module names if not present), if you want to link modules
-     statically.
-
-     If you don't want to compile non static extension modules
-     (probably on architectures which does not allow dynamic loading),
-     remove comment mark from the line "#option nodynamic" in
-     ext/Setup.
-
-  5. Run make.
-
-  6. Optionally, run 'make test' to check whether the compiled Ruby
-     interpreter works well.  If you see the message "test succeeded",
-     your ruby works as it should (hopefully).
-
-  7. Run 'make install'
-
-     This command will create following directories and install files
-     onto them.
-
-       * ${DESTDIR}${prefix}/bin
-       * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib
-       * ${DESTDIR}${prefix}/lib/ruby
-       * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib/ruby/site_ruby
-       * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby
-       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/share/man/man1
-       * ${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system
-
-     If Ruby's API version is `x.y.z', the ((|${MAJOR}|)) is `x', the
-     ((|${MINOR}|)) is `y', and the ((|${TEENY}|)) is `z'.
-
-     NOTE: teeny of the API version may be different from one of
-     Ruby's program version
-
-     You may have to be a super user to install ruby.
-
-If you fail to compile ruby, please send the detailed error report with
-the error log and machine/OS type, to help others.
-
-
-* Copying
-
-See the file COPYING.
-
-
-* The Author
-
-Feel free to send comments and bug reports to the author.  Here is the 
-author's latest mail address:
-
-  matz@netlab.jp
-
--------------------------------------------------------
-created at: Thu Aug  3 11:57:36 JST 1995
-Local variables:
-mode: indented-text
-end:
diff --git a/README.EXT b/README.EXT
index de63f54699..48b8d964c4 100644
--- a/README.EXT
+++ b/README.EXT
@@ -1,1469 +1 @@
-.\" README.EXT -  -*- Text -*- created at: Mon Aug  7 16:45:54 JST 1995
-
-This document explains how to make extension libraries for Ruby.
-
-1. 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.
-
-
-1.1 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
-	T_MATCH
-	T_UNDEF
-	T_NODE
-	T_ZOMBIE
-
-Most of the types are represented by C structures.
-
-1.2 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)
-
-1.3 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".
-
-There are some accessing macros for structure members, for example
-`RSTRING_LEN(str)' to get the size of the Ruby String object.  The
-allocated region can be accessed by `RSTRING_PTR(str)'.  For arrays,
-use `RARRAY_LEN(ary)' and `RARRAY_PTR(ary)' respectively.
-
-Notice: Do not change the value of the structure directly, unless you
-are responsible for the result.  This ends up being the cause of
-interesting bugs.
-
-1.4 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.
-
-1.5 Manipulating Ruby data
-
-As I already mentioned, it is not recommended to modify an object's
-internal structure.  To manipulate objects, use the functions supplied
-by the Ruby interpreter. Some (not all) of the useful functions are
-listed below:
-
- 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.
-
-  rb_str_cat(VALUE str, const char *ptr, long len)
-
-    Appends len bytes of data from ptr to the Ruby string.
-
-  rb_str_cat2(VALUE str, const char* ptr)
-
-    Appends C string ptr to Ruby string str.  This function is
-    equivalent to rb_str_cat(str, ptr, strlen(ptr)).
-
-  rb_str_catf(VALUE str, const char* format, ...)
-  rb_str_vcatf(VALUE str, const char* format, va_list ap)
-
-    Appends C string format and successive arguments to Ruby string
-    str according to a printf-like format.  These functions are
-    equivalent to rb_str_cat2(str, rb_sprintf(format, ...)) and
-    rb_str_cat2(str, rb_vsprintf(format, ap)), respectively.
-
-  rb_enc_str_new(const char *ptr, long len, rb_encoding *enc)
-  
-    Creates a new Ruby string with the specified encoding.
-     
-  rb_usascii_str_new(const char *ptr, long len)
-  rb_usascii_str_new_cstr(const char *ptr)
-
-    Creates a new Ruby string with encoding US-ASCII.
-
-  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)
-
-    Creates an array with no elements, allocating internal buffer
-    for len elements.
-
-  rb_ary_new3(long n, ...)
-
-    Creates an n-element array from the arguments.
-
-  rb_ary_new4(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)
-
-    Equivaelent to Array#[].
-
-  rb_ary_entry(VALUE ary, long offset)
-
-    ary[offset]
-
-  rb_ary_subseq(VALUE ary, long beg, long len)
-
-    ary[beg, len]
-
-  rb_ary_push(VALUE ary, VALUE val)
-  rb_ary_pop(VALUE ary)
-  rb_ary_shift(VALUE ary)
-  rb_ary_unshift(VALUE ary, VALUE val)
-
-
-2. Extending Ruby with C
-
-2.1 Adding new features to Ruby
-
-You can add new features (classes, methods, etc.) to the Ruby
-interpreter.  Ruby provides APIs for defining the following things:
-
- * Classes, Modules
- * Methods, Singleton Methods
- * Constants
-
-2.1.1 Class/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)
-
-2.1.2 Method/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 2.2.2 for IDs.
-
-  void rb_define_method_id(VALUE klass, ID name, 
-                           VALUE (*func)(ANYARGS), int argc)
-
-There are two functions to define private/protected methods:
-
-  void rb_define_private_method(VALUE klass, const char *name, 
-			        VALUE (*func)(), int argc)
-  void rb_define_protected_method(VALUE klass, const char *name, 
-			          VALUE (*func)(), int argc)
-
-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.
-
-2.1.3 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.
-
-2.2 Use Ruby features from C
-
-There are several ways to invoke Ruby's features from C code.
-
-2.2.1 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.
-
-
-2.2.2 ID or Symbol
-
-You can invoke methods directly, without parsing the string.  First I
-need to explain about ID.  ID is the integer number to represent
-Ruby's identifiers such as variable names.  The Ruby data type
-corresponding to ID is Symbol.  It can be accessed from Ruby in the
-form:
-
- :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)
-
-You can retrieve ID from Ruby object (Symbol or String) given as an
-argument by using
-
-  rb_to_id(VALUE symbol)
-
-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)
-
-2.2.3 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.
-
-2.2.4 Accessing the variables and constants
-
-You can access class variables and instance variables using access
-functions.  Also, global variables can be shared between both
-environments.  There's no way to access Ruby's local variables.
-
-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 2.1.3 for defining new constant.
-
-3. Information sharing between Ruby and C
-
-3.1 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.
-
-3.2 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);
-
-
-3.3 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, ptr)
-
-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. 
-
-4. 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.
-
-(1) make the directory
-
-  % mkdir ext/dbm
-
-Make a directory for the extension library under ext directory.
-
-(2) design the library
-
-You need to design the library features, before making it.
-
-(3) write 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 Enumerate 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) {\
-    Data_Get_Struct(obj, struct dbmdata, dbmp);\
-    if (dbmp->di_dbm == 0) closed_dbm();\
-}
---
-
-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)
-
-(4) 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_library(lib, func): check whether library containing function exists.
-  have_func(func, header): check whether function exists
-  have_header(header): check whether header file exists
-  create_makefile(target): generate Makefile
-
-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.
-
-(5) 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.
-
-(6) 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.
-
-(7) 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.
-
-(8) 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.
-
-(9) 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
-    -> parse.c    : automatically generated
-  keywords        : reserved keywords
-    -> lex.c      : automatically generated
-
-ruby evaluator (a.k.a. YARV)
-  compile.c
-  eval.c
-  eval_error.c
-  eval_jump.c
-  eval_safe.c
-  insns.def           : definition of VM instructions
-  iseq.c              : implementation of VM::ISeq
-  thread.c            : thread management and context swiching
-  thread_win32.c      : thread implementation
-  thread_pthread.c    : ditto
-  vm.c
-  vm_dump.c
-  vm_eval.c
-  vm_exec.c
-  vm_insnhelper.c
-  vm_method.c
-
-  opt_insns_unif.def  : instruction unification
-  opt_operand.def     : definitions for optimization
-
-    -> insn*.inc      : automatically generated
-    -> opt*.inc       : automatically generated
-    -> vm.inc         : automatically generated
-
-regular expression engine (oniguruma)
-  regex.c
-  regcomp.c
-  regenc.c
-  regerror.c
-  regexec.c
-  regparse.c
-  regsyntax.c
-
-utility functions
-
-  debug.c       : debug symbols for C debuggger
-  dln.c         : dynamic loading
-  st.c          : general purpose hash table
-  strftime.c    : formatting times
-  util.c        : misc utilities
-
-ruby interpreter implementation
-
-  dmyext.c
-  dmydln.c 
-  dmyencoding.c
-  id.c
-  inits.c
-  main.c
-  ruby.c
-  version.c
-
-  gem_prelude.rb
-  prelude.rb
-
-
-class library
-
-  array.c       : Array
-  bignum.c      : Bignum
-  compar.c      : Comparable
-  complex.c     : Complex
-  cont.c        : Fiber, Continuation
-  dir.c         : Dir
-  enum.c        : Enumerable
-  enumerator.c  : Enumerator
-  file.c        : File
-  hash.c        : Hash
-  io.c          : IO
-  marshal.c     : Marshal
-  math.c        : Math
-  numeric.c     : Numeric, Integer, Fixnum, Float
-  pack.c        : Array#pack, String#unpack
-  proc.c        : Binding, Proc
-  process.c     : Process
-  random.c      : random number
-  range.c       : Range
-  rational.c    : Rational
-  re.c          : Regexp, MatchData
-  signal.c      : Signal
-  sprintf.c     : 
-  string.c      : String
-  struct.c      : Struct
-  time.c        : Time
-
-  defs/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
-
-const: nil object
-
- Qtrue
-
-const: true object(default true value)
-
- Qfalse
-
-const: 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)
-FIXNUM_P(value)
-NIL_P(value)
-void Check_Type(VALUE value, int type)
-void Check_SafeStr(VALUE value)
-
-** Data type conversion
-
-FIX2INT(value), INT2FIX(i)
-FIX2LONG(value), LONG2FIX(l)
-NUM2INT(value), INT2NUM(i)
-NUM2UINT(value), UINT2NUM(ui)
-NUM2LONG(value), LONG2NUM(l)
-NUM2ULONG(value), ULONG2NUM(ul)
-NUM2LL(value), LL2NUM(ll)
-NUM2ULL(value), ULL2NUM(ull)
-NUM2OFFT(value), OFFT2NUM(off)
-NUM2SIZET(value), SIZET2NUM(size)
-NUM2SSIZET(value), SSIZET2NUM(ssize)
-NUM2DBL(value)
-rb_float_new(f)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
-rb_str_new2(s)
-
-** defining class/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().
-
- VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
-
-Invokes a method, passing arguments by an array of values.
-
- 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 occured.
-
- VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state)
-
-Calls the function func with arg as the argument.  If no exception
-occured during func, it returns the result of func and *state is zero.
-Otherwise, it returns Qnil and sets *state to nonzero.  If state is
-NULL, it is not set in both cases.
-
- void rb_jump_tag(int state)
-
-Continues the exception caught by rb_protect() and rb_eval_string_protect().
-state must be the returned value from those functions.  This function
-never return to the caller.
-
-** Exceptions and Errors
-
- 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.
-
-** 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.
-
- void ruby_run()
-
-Starts execution of the interpreter.
-
- 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 the Compatibilities
-
-Some macros to check API compatibilities are available by default.
-
- NORETURN_STYLE_NEW
-
-Means that NORETURN macro is functional style instead of prefix.
-
- HAVE_RB_DEFINE_ALLOC_FUNC
-
-Means that function rb_define_alloc_func() is provided, that means the
-allocation framework is used.  This is same as the result of
-have_func("rb_define_alloc_func", "ruby.h").
-
- HAVE_RB_REG_NEW_STR
-
-Means that function rb_reg_new_str() is provided, that creates Regexp
-object from String object.  This is same as the result of
-have_func("rb_reg_new_str", "ruby.h").
-
- HAVE_RB_IO_T
-
-Means that type rb_io_t is provided.
-
- USE_SYMBOL_AS_METHOD_NAME
-
-Means that Symbols will be returned as method names, e.g.,
-Module#methods, #singleton_methods and so on.
-
- HAVE_RUBY_*_H
-
-Defined in ruby.h and means correspoinding header is available.  For
-instance, when HAVE_RUBY_ST_H is defined you should use ruby/st.h not
-mere st.h.
-
- RB_EVENT_HOOKS_HAVE_CALLBACK_DATA
-
-Means that rb_add_event_hook() takes the third argument `data', to be
-passed to the given event hook function.
-
-Appendix C. Functions Available in extconf.rb
-
-These functions are available in extconf.rb:
-
- have_macro(macro, headers)
-
-Checks whether macro is defined with header.  Returns true if the macro
-is defined.
-
- have_library(lib, func)
-
-Checks whether the library exists, containing the specified function.
-Returns true if the library exists.
-
- find_library(lib, func, path...)
-
-Checks whether a library which contains the specified function exists in
-path.  Returns true if the library exists.
-
- have_func(func, header)
-
-Checks whether func exists with header.  Returns true if the function
-exists.  To check functions in an additional library, you need to
-check that library first using have_library().
-
- have_var(var, header)
-
-Checks whether var exists with header.  Returns true if the variable
-exists.  To check variables in an additional library, you need to
-check that library first using have_library().
-
- have_header(header)
-
-Checks whether header exists.  Returns true if the header file exists.
-
- find_header(header, path...)
-
-Checks whether header exists in path.  Returns true if the header file
-exists.
-
- have_struct_member(type, member, header)
-
-Checks whether type has member with header.  Returns true if the type
-is defined and has the member.
-
- have_type(type, header, opt)
-
-Checks whether type is defined with header.  Returns true if the type
-is defined.
-
- check_sizeof(type, header)
-
-Checks the size of type in char with header.  Returns the size if the
-type is defined, otherwise nil.
-
- create_makefile(target)
-
-Generates the Makefile for the extension library.  If you don't invoke
-this method, the compilation will not be done.
-
- find_executable(bin, path)
-
-Finds command in path, which is File::PATH_SEPARATOR-separated list of
-directories.  If path is nil or omitted, environment variable PATH
-will be used.  Returns the path name of the command if it is found,
-otherwise nil.
-
- with_config(withval[, default=nil])
-
-Parses the command line options and returns the value specified by
---with-<withval>.
-
- enable_config(config, *defaults)
- disable_config(config, *defaults)
-
-Parses the command line options for boolean.  Returns true if
---enable-<config> is given, or false if --disable-<config> is given.
-Otherwise, yields defaults to the given block and returns the result
-if it is called with a block, or returns defaults.
-
- dir_config(target[, default_dir])
- dir_config(target[, default_include, default_lib])
-
-Parses the command line options and adds the directories specified by
---with-<target>-dir, --with-<target>-include, and/or --with-<target>-lib
-to $CFLAGS and/or $LDFLAGS.  --with-<target>-dir=/path is equivalent to
---with-<target>-include=/path/include --with-<target>-lib=/path/lib.
-Returns an array of the added directories ([include_dir, lib_dir]).
-
- pkg_config(pkg)
-
-Obtains the information for pkg by pkg-config command.  The actual
-command name can be overridden by --with-pkg-config command line
-option.
-
-/*
- * Local variables:
- * fill-column: 70
- * end:
- */
+Moved to doc/extension.rdoc
diff --git a/README.EXT.ja b/README.EXT.ja
index f2d7609ff5..f884ecbb0e 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -1,1570 +1 @@
-.\" README.EXT.ja -  -*- Text -*- created at: Mon Aug  7 16:45:54 JST 1995
-
-Ruby�γ�ĥ�饤�֥��κ�������������ޤ���
-
-1�������μ�
-
-C���ѿ��ˤϷ������ꡤ�ǡ����ˤϷ�������ޤ��󡥤Ǥ����顤��
-�Ȥ��Хݥ��󥿤�int���ѿ�����������ȡ������ͤ������Ȥ��Ƽ�
-�갷���ޤ����դ�Ruby���ѿ��ˤϷ����ʤ����ǡ����˷��������
-�������ΰ㤤�Τ��ᡤC��Ruby����ߤ��Ѵ����ʤ���С����ߤ���
-�ǡ����򥢥������Ǥ��ޤ���
-
-Ruby�Υǡ�����VALUE�Ȥ���C�η���ɽ������ޤ���VALUE���Υǡ�
-���Ϥ��Υǡ��������פ�ʬ���ΤäƤ��ޤ������Υǡ��������פ�
-�����Τϥǡ���(���֥�������)�μºݤι�¤���̣���Ƥ��ơ�Ruby
-�Υ��饹�ȤϤޤ���ä���ΤǤ���
-
-VALUE����C�ˤȤäư�̣�Τ���ǡ�������Ф�����ˤ�
-
- (1) VALUE�Υǡ��������פ��Τ�
- (2) VALUE��C�Υǡ������Ѵ�����
-
-��ξ����ɬ�פǤ���(1)��˺���ȴְ�ä��ǡ������Ѵ����Ԥ��
-�ơ��ǰ��ץ�����बcore dump���ޤ���
-
-1.1 �ǡ���������
-
-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�ι�¤�ΤǼ�������Ƥ��ޤ���
-
-1.2 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)
-
-1.3 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())��
-
-��¤�Τ���ǡ�������Ф��ޥ������󶡤���Ƥ��ޤ���ʸ����
-str��Ĺ�������뤿��ˤϡ�RSTRING_LEN(str)�פȤ���ʸ����str��
-char*�Ȥ������뤿��ˤϡ�RSTRING_PTR(str)�פȤ��ޤ��������
-���ˤϡ����줾���RARRAY_LEN(ary)�ס���RARRAY_PTR(ary)�פ�
-�ʤ�ޤ���
-
-Ruby�ι�¤�Τ�ľ�ܥ�������������˵���Ĥ��ʤ���Фʤ�ʤ���
-�Ȥϡ������ʸ����ι�¤�Τ���Ȥϻ��Ȥ�������ǡ�ľ���ѹ���
-�ʤ����ȤǤ���ľ���ѹ�������硤���֥������Ȥ����Ƥ���������
-�Ȥ�ʤ��ʤäơ��פ�̥Х��θ����ˤʤ�ޤ���
-
-1.4 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���Ѵ�
-���Ƥ���ޤ�(���������٤�)��
-
-1.5 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��ʸ������������롥
-
-  rb_str_cat(VALUE str, const char *ptr, long len)
-
-    Ruby��ʸ����str��len�Х��Ȥ�ʸ����ptr���ɲä��롥
-
-  rb_str_cat2(VALUE str, const char* ptr)
-
-    Ruby��ʸ����str��C��ʸ����ptr���ɲä��롥���δؿ��ε�ǽ��
-    rb_str_cat(str, ptr, strlen(ptr))��Ʊ���Ǥ��롥
-
-  rb_str_catf(VALUE str, const char* format, ...)
-  rb_str_vcatf(VALUE str, const char* format, va_list ap)
-
-    C��ʸ����format��³��������printf(3)�Υե����ޥåȤˤ������ä�
-    ��������Ruby��ʸ����str���ɲä��롥���δؿ��ε�ǽ�ϡ����줾��
-    rb_str_cat2(str, rb_sprintf(format, ...)) ��
-    rb_str_cat2(str, rb_vsprintf(format, ap)) ��Ʊ���Ǥ��롥
-
-  rb_enc_str_new(const char *ptr, long len, rb_encoding *enc)
-  
-    ���ꤵ�줿���󥳡��ǥ��󥰤�Ruby��ʸ�������������.
-     
-  rb_usascii_str_new(const char *ptr, long len)
-  rb_usascii_str_new_cstr(const char *ptr)
-
-    ���󥳡��ǥ��󥰤�US-ASCII��Ruby��ʸ�������������.
-
-  rb_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)
-
-    ���Ǥ�0��������������롥len����ʬ���ΰ�򤢤餫������
-    ���ƤƤ�����
-
-  rb_ary_new3(long n, ...)
-
-    �����ǻ��ꤷ��n���Ǥ�ޤ�������������롥
-
-  rb_ary_new4(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_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)
-
-2��Ruby�ε�ǽ��Ȥ�
-
-����Ū��Ruby�ǽ񤱤뤳�Ȥ�C�Ǥ�񤱤ޤ���Ruby���Τ�Τ�C�ǵ�
-�Ҥ���Ƥ����Ǥ����顤�����Ȥ����������ʤ�Ǥ����ɡ�������
-��Ruby�γ�ĥ�˻Ȥ����Ȥ�¿����������ͽ¬����뵡ǽ���濴�˾�
-�𤷤ޤ���
-
-2.1 Ruby�˵�ǽ���ɲä���
-
-Ruby���󶡤���Ƥ���ؿ���Ȥ���Ruby���󥿥ץ꥿�˿�������ǽ
-���ɲä��뤳�Ȥ��Ǥ��ޤ���Ruby�Ǥϰʲ��ε�ǽ���ɲä���ؿ���
-�󶡤���Ƥ��ޤ���
-
- * ���饹���⥸�塼��
- * �᥽�åɡ��ðۥ᥽�åɤʤ�
- * ���
-
-�ǤϽ�˾Ҳ𤷤ޤ���
-
-2.1.1 ���饹/�⥸�塼�����
-
-���饹��⥸�塼���������뤿��ˤϡ��ʲ��δؿ���Ȥ��ޤ���
-
-  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)
-
-2.1.2 �᥽�å�/�ðۥ᥽�å����
-
-�᥽�åɤ��ðۥ᥽�åɤ��������ˤϰʲ��δؿ���Ȥ��ޤ���
-
-  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�ϥ��饹������Ȥ��Ƽ�����äơ�������������Ƥ�줿����
-�����󥹤��֤��ʤ��ƤϤʤ�ޤ��󡥤��Υ��󥹥��󥹤ϡ�������
-�������ʤɤ�ޤޤʤ����Ǥ�������ֶ��פΤޤޤˤ��Ƥ������ۤ�
-���褤�Ǥ��礦��
-
-2.1.3 ������
-
-��ĥ�饤�֥�꤬ɬ�פ�����Ϥ��餫����������Ƥ����������ɤ�
-�Ǥ��礦��������������ؿ�����Ĥ���ޤ���
-
-  void rb_define_const(VALUE klass, const char *name, VALUE val)
-  void rb_define_global_const(const char *name, VALUE val)
-
-���Ԥ�����Υ��饹/�⥸�塼���°�����������������Ρ���
-�Ԥϥ������Х���������������ΤǤ���
-
-2.2 Ruby�ε�ǽ��C����ƤӽФ�
-
-���ˡ�1.5 Ruby�Υǡ���������٤ǰ����Ҳ𤷤��褦�ʴؿ���
-�Ȥ��С�Ruby�ε�ǽ��¸����Ƥ���ؿ���ľ�ܸƤӽФ����Ȥ�����
-�ޤ���
-
-# ���Τ褦�ʴؿ��ΰ���ɽ�Ϥ��ޤΤȤ�������ޤ��󡥥�������
-# �뤷���ʤ��Ǥ��͡�
-
-����ʳ��ˤ�Ruby�ε�ǽ��ƤӽФ���ˡ�Ϥ����Ĥ�����ޤ���
-
-2.2.1 Ruby�Υץ�������eval����
-
-C����Ruby�ε�ǽ��ƤӽФ���äȤ��ñ����ˡ�Ȥ��ơ�ʸ�����
-Ϳ����줿Ruby�Υץ�������ɾ������ʲ��δؿ�������ޤ���
-
-  VALUE rb_eval_string(const char *str)
-
-����ɾ���ϸ��ߤδĶ��ǹԤ��ޤ����Ĥޤꡤ���ߤΥ��������ѿ�
-�ʤɤ�����Ѥ��ޤ���
-
-ɾ�����㳰��ȯ�����뤫�⤷��ʤ����Ȥ����դ��ޤ��礦. ������
-�ʴؿ��⤢��ޤ�.
-
-  VALUE rb_eval_string_protect(const char *str, int *state)
-
-���δؿ��ϥ��顼��ȯ�������nil���֤��ޤ��������ơ��������ˤ�
-*state�ϥ����ˡ�����ʤ����󥼥��ˤʤ�ޤ���
-
-
-2.2.2 ID�ޤ��ϥ���ܥ�
-
-C����ʸ������ͳ������Ruby�Υ᥽�åɤ�ƤӽФ����Ȥ�Ǥ���
-�����������ˡ�Ruby���󥿥ץ꥿��ǥ᥽�åɤ��ѿ�̾����ꤹ��
-���˻Ȥ��Ƥ���ID�ˤĤ����������Ƥ����ޤ��礦��
-
-ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby����Ǥ�
-
- :���̻�
-�ޤ���
- :"Ǥ�դ�ʸ����"
-
-�ǥ��������Ǥ��ޤ���C���餳�����������뤿��ˤϴؿ�
-
-  rb_intern(const char *name)
-
-��Ȥ��ޤ���Ruby��������Ȥ���Ϳ����줿����ܥ�(�ޤ���ʸ��
-��)��ID���Ѵ�����ˤϰʲ��δؿ���Ȥ��ޤ���
-
-  rb_to_id(VALUE symbol)
-
-2.2.3 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_apply(VALUE recv, ID mid, VALUE args)
-
-apply�ˤϰ����Ȥ���Ruby�������Ϳ���ޤ���
-
-2.2.4 �ѿ�/����򻲾�/��������
-
-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 �������٤ǾҲ�
-��Ƥ���ؿ���ȤäƤ���������
-
-3��Ruby��C�Ȥξ���ͭ
-
-C�����Ruby�δ֤Ǿ����ͭ������ˡ�ˤĤ��Ʋ��⤷�ޤ���
-
-3.1 C���黲�ȤǤ���Ruby�����
-
-�ʲ���Ruby�������C�Υ�٥뤫�黲�ȤǤ��ޤ���
-
-  Qtrue
-  Qfalse
-
-    �����͡�Qfalse��C����Ǥ⵶�Ȥߤʤ���ޤ�(�Ĥޤ�0)��
-
-  Qnil
-
-    C���줫�鸫����nil�ס�
-
-3.2 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);
-
-3.3 C�Υǡ�����Ruby���֥������Ȥˤ���
-
-C��������������줿�ǡ���(��¤��)��Ruby�Υ��֥������ȤȤ���
-��갷��������礬���ꤨ�ޤ������Τ褦�ʾ��ˤϡ�Data�Ȥ���
-Ruby���֥������Ȥ�C�ι�¤��(�ؤΥݥ���)�򤯤�ळ�Ȥ�Ruby
-���֥������ȤȤ��Ƽ�갷����褦�ˤʤ�ޤ���
-
-Data���֥������Ȥ��������ƹ�¤�Τ�Ruby���֥������Ȥ˥��ץ���
-�����뤿��ˤϡ��ʲ��Υޥ�����Ȥ��ޤ���
-
-  Data_Wrap_Struct(klass, mark, free, ptr)
-
-���Υޥ���������ͤ��������줿Data���֥������ȤǤ���
-
-klass�Ϥ���Data���֥������ȤΥ��饹�Ǥ���ptr�ϥ��ץ��벽����
-C�ι�¤�ΤؤΥݥ��󥿤Ǥ���mark�Ϥ��ι�¤�Τ�Ruby�Υ��֥���
-���Ȥؤλ��Ȥ�������˻Ȥ��ؿ��Ǥ������Τ褦�ʻ��Ȥ�ޤޤʤ�
-���ˤ�0����ꤷ�ޤ���
-
-# ���Τ褦�ʻ��Ȥϴ�����ޤ���
-
-free�Ϥ��ι�¤�Τ��⤦���פˤʤä����˸ƤФ��ؿ��Ǥ�������
-�ؿ��������١������쥯������ƤФ�ޤ������줬-1�ξ��ϡ�ñ
-��˳�������ޤ���
-
-mark�����free�ؿ���GC�¹���˸ƤӽФ���ޤ�.
-�ʤ�, GC�¹����Ruby���֥������ȤΥ������������϶ػߤ����
-��. ��ä�, mark�����free�ؿ���Ruby���֥������ȤΥ���������
-���ϹԤ�ʤ��Ǥ�������.
-
-C�ι�¤�Τγ�����Data���֥������Ȥ�������Ʊ���˹Ԥ��ޥ�����
-���ưʲ��Τ�Τ��󶡤���Ƥ��ޤ���
-
-  Data_Make_Struct(klass, type, mark, free, sval)
-
-���Υޥ���������ͤ��������줿Data���֥������ȤǤ���
-
-klass, mark, free��Data_Wrap_Struct��Ʊ��Ư���򤷤ޤ���type
-�ϳ�����Ƥ�C��¤�Τη��Ǥ���������Ƥ�줿��¤�Τ��ѿ�sval
-����������ޤ��������ѿ��η��� (type*) �Ǥ���ɬ�פ�����ޤ���
-
-Data���֥������Ȥ���ݥ��󥿤���Ф��Τϰʲ��Υޥ������Ѥ�
-�ޤ���
-
-  Data_Get_Struct(obj, type, sval)
-
-C�ι�¤�ΤؤΥݥ��󥿤��ѿ�sval����������ޤ���
-
-������Data�λȤ����Ϥ���ä�ʬ����ˤ����Τǡ������������
-����򻲾Ȥ��Ƥ���������
-
-4������ - dbm�ѥå���������
-
-�����ޤǤ������ǤȤꤢ������ĥ�饤�֥��Ϻ���Ϥ��Ǥ���
-Ruby��ext�ǥ��쥯�ȥ�ˤ��Ǥ˴ޤޤ�Ƥ���dbm�饤�֥������
-�����ʳ�Ū���������ޤ���
-
-(1) �ǥ��쥯�ȥ����
-
-  % mkdir ext/dbm
-
-Ruby 1.1�����Ǥ�դΥǥ��쥯�ȥ�ǥ����ʥߥå��饤�֥����
-�뤳�Ȥ��Ǥ���褦�ˤʤ�ޤ�����Ruby����Ū�˥�󥯤������
-��Ruby��Ÿ�������ǥ��쥯�ȥ�β���ext�ǥ��쥯�ȥ����˳�ĥ
-�饤�֥���ѤΥǥ��쥯�ȥ����ɬ�פ�����ޤ���̾����Ŭ����
-����ǹ����ޤ���
-
-(2) �߷פ���
-
-�ޤ��������ʤ�Ǥ����ɡ��ɤ�������ǽ��¸����뤫�ɤ����ޤ���
-�פ���ɬ�פ�����ޤ����ɤ�ʥ��饹��Ĥ��뤫�����Υ��饹�ˤ�
-�ɤ�ʥ᥽�åɤ����뤫�����饹���󶡤�������ʤɤˤĤ����߷�
-���ޤ���
-
-(3) 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��Enumerate�⥸�塼��򥤥󥯥롼�ɤ��� */
-    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) {\
-    Data_Get_Struct(obj, struct dbmdata, dbmp);\
-    if (dbmp->di_dbm == 0) closed_dbm();\
-}
---
-
-����ä�ʣ���ʥޥ����Ǥ������פ����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)
-
-(4) 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): Makefile������
-
-�ʲ����ѿ���Ȥ����Ȥ��Ǥ��ޤ���
-
-  $CFLAGS: ����ѥ�������ɲ�Ū�˻��ꤹ��ե饰(-O�ʤ�)
-  $CPPFLAGS: �ץ�ץ����å����ɲ�Ū�˻��ꤹ��ե饰(-I��-D�ʤ�)
-  $LDFLAGS: ��󥯻����ɲ�Ū�˻��ꤹ��ե饰(-L�ʤ�)
-  $objs: ��󥯤���륪�֥������ȥե�����̾�Υꥹ��
-
-���֥������ȥե�����Υꥹ�Ȥϡ��̾�ϥ������ե�����򸡺���
-�Ƽ�ưŪ����������ޤ�����make������ǥ���������������褦��
-��������Ū�˻��ꤹ��ɬ�פ�����ޤ���
-
-�饤�֥��򥳥�ѥ��뤹���郎·�鷺�����Υ饤�֥��򥳥�
-�ѥ��뤷�ʤ����ˤ�create_makefile��ƤФʤ����Makefile����
-�����줺������ѥ����Ԥ��ޤ���
-
-(5) depend���Ѱդ���
-
-�⤷���ǥ��쥯�ȥ��depend�Ȥ����ե����뤬¸�ߤ���С�
-Makefile����¸�ط�������å����Ƥ���ޤ���
-
-  % gcc -MM *.c > depend
-
-�ʤɤǺ�뤳�Ȥ�����ޤ������ä�»��̵���Ǥ��礦��
-
-(6) 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����������ޤ��Τǡ����Υ��ƥåפ����פǤ���
-
-(7) make����
-
-ưŪ��󥯥饤�֥�������������ˤϤ��ξ��make���Ƥ�����
-����ɬ�פǤ���� make install �ǥ��󥹥ȡ��뤵��ޤ���
-
-ext�ʲ��˥ǥ��쥯�ȥ���Ѱդ������ϡ�Ruby�Υǥ��쥯�ȥ��
-make��¹Ԥ����Makefile����������make��ɬ�פˤ�äƤϤ��Υ�
-���塼���Ruby�ؤΥ�󥯤ޤǼ�ưŪ�˼¹Ԥ��Ƥ���ޤ���
-extconf.rb��񤭴�����ʤɤ���Makefile�κ�������ɬ�פʻ��Ϥ�
-��Ruby�ǥ��쥯�ȥ��make���Ƥ���������
-
-��ĥ�饤�֥���make install��Ruby�饤�֥��Υǥ��쥯�ȥ��
-���˥��ԡ�����ޤ����⤷��ĥ�饤�֥��ȶ�Ĵ���ƻȤ�Ruby�ǵ�
-�Ҥ��줿�ץ�����ब���ꡤRuby�饤�֥����֤��������ˤϡ�
-��ĥ�饤�֥���ѤΥǥ��쥯�ȥ�β��� lib �Ȥ����ǥ��쥯�ȥ�
-���ꡤ������ ��ĥ�� .rb �Υե�������֤��Ƥ�����Ʊ���˥���
-���ȡ��뤵��ޤ���
-
-(8) �ǥХå�
-
-�ޤ����ǥХå����ʤ���ư���ʤ��Ǥ��礦�͡�ext/Setup�˥ǥ���
-���ȥ�̾��񤯤���Ū�˥�󥯤���ΤǥǥХå����Ȥ���褦�ˤ�
-��ޤ�������ʬ����ѥ��뤬�٤��ʤ�ޤ����ɡ�
-
-(9) �Ǥ�������
-
-��Ϥ��ä���Ȥ��ʤꡤ������������ʤꡤ���ʤꡤ����ͳ�ˤ�
-�Ȥ�����������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.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)
-void Check_SafeStr(VALUE 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)
-NUM2DBL(value)
-rb_float_new(f)
-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()��
-  �Ȥ���
-
-VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
-
-  �᥽�åɸƤӽФ���������argc, argv�������Ϥ���
-
-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���֤���
-
-void rb_jump_tag(int state)
-
-  rb_protect()��rb_eval_string_protect()����ª���줿�㳰���
-  �����롥state�Ϥ����δؿ������֤��줿�ͤǤʤ���Фʤ�ʤ���
-  ���δؿ���ľ�ܤθƤӽФ��������ʤ���
-
-** �㳰�����顼
-
-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, ...)
-
-  ���󥿡��ץ꥿�ʤɥץ������ΥХ��Ǥ���ȯ������Ϥ��Τʤ�
-  �����λ��Ƥ֡����󥿡��ץ꥿�ϥ�������פ�ľ���˽�λ���롥
-  �㳰�����ϰ��ڹԤʤ��ʤ���
-
-** Ruby�ν�������¹�
-
-Ruby�򥢥ץꥱ����������������ˤϰʲ��Υ��󥿥ե�����
-��Ȥ����̾�γ�ĥ�饤�֥��ˤ�ɬ�פʤ���
-
-void ruby_init()
-
-  Ruby���󥿥ץ꥿�ν������Ԥʤ���
-
-void ruby_options(int argc, char **argv)
-
-  Ruby���󥿥ץ꥿�Υ��ޥ�ɥ饤������ν�����Ԥʤ���
-
-void ruby_run()
-
-  Ruby���󥿥ץ꥿��¹Ԥ��롥
-
-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��¸�ߤ�����å����롥
-  �饤�֥�꤬¸�ߤ������true���֤���
-
-find_library(lib, func, path...)
-
-  �ؿ�func��������Ƥ���饤�֥��lib��¸�ߤ� -Lpath ���ɲ�
-  ���ʤ�������å����롥�饤�֥�꤬���դ��ä�����true���֤���
-
-have_func(func, header)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ��ƴؿ�func��¸�ߤ����
-  �å����롥func��ɸ��Ǥϥ�󥯤���ʤ��饤�֥����Τ�Τ�
-  ������ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ�
-  �������ؿ���¸�ߤ����true���֤���
-
-have_var(var, header)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ����ѿ�var��¸�ߤ������
-  �����롥var��ɸ��Ǥϥ�󥯤���ʤ��饤�֥����Τ�ΤǤ�
-  ����ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ���
-  �����ѿ���¸�ߤ����true���֤���
-
-have_header(header)
-
-  �إå��ե������¸�ߤ�����å����롥�إå��ե����뤬¸�ߤ�
-  ���true���֤���
-
-find_header(header, path...)
-
-  �إå��ե�����header��¸�ߤ� -Ipath ���ɲä��ʤ�������å�
-  ���롥�إå��ե����뤬���դ��ä�����true���֤���
-
-have_struct_member(type, member, header)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ��Ʒ�type�˥���member
-  ��¸�ߤ��뤫������å����롥type���������Ƥ��ơ�member��
-  ���Ĥ����true���֤���
-
-have_type(type, header, opt)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ��Ʒ�type��¸�ߤ��뤫��
-  �����å����롥type���������Ƥ����true���֤���
-
-check_sizeof(type, header)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ��Ʒ�type��charñ�̥���
-  ����Ĵ�٤롥type���������Ƥ�������Υ��������֤��������
-  ��Ƥ��ʤ��Ȥ���nil���֤���
-
-create_makefile(target)
-
-  ��ĥ�饤�֥���Ѥ�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)
-
-  pkg-config���ޥ�ɤ���ѥå�����pkg�ξ�������롥 
-  pkg-config�μºݤΥ��ޥ��̾�ϡ�--with-pkg-config���ޥ��
-  �饤�󥪥ץ����ǻ����ǽ��
-
-/*
- * Local variables:
- * fill-column: 60
- * end:
- */
+doc/extension.ja.rdocに移動しました
diff --git a/README.ja b/README.ja
deleted file mode 100644
index dd7f67ca59..0000000000
--- a/README.ja
+++ /dev/null
@@ -1,185 +0,0 @@
-* Ruby�Ȥ�
-
-Ruby�ϥ���ץ뤫�Ķ��Ϥʥ��֥������Ȼظ�������ץȸ���Ǥ���
-Ruby�Ϻǽ餫����ʥ��֥������Ȼظ�����Ȥ����߷פ���Ƥ���
-�����顤���֥������Ȼظ��ץ�����ߥ󥰤��ڤ˹Ԥ����������
-������������̾�μ�³�����Υץ�����ߥ󥰤��ǽ�Ǥ���
-
-Ruby�ϥƥ����Ƚ����ط���ǽ�Ϥʤɤ�ͥ�졤Perl��Ʊ�����餤����
-�Ǥ�������˥���ץ��ʸˡ�ȡ��㳰�����䥤�ƥ졼���ʤɤε���
-�ˤ�äơ����ʬ����䤹���ץ�����ߥ󥰤�����ޤ���
-
-
-* Ruby����Ĺ
-
-  + ����ץ��ʸˡ
-  + ���̤Υ��֥������Ȼظ���ǽ(���饹���᥽�åɥ�����ʤ�)
-  + �ü�ʥ��֥������Ȼظ���ǽ(Mixin, �ðۥ᥽�åɤʤ�)
-  + �黻�ҥ����С�������
-  + �㳰������ǽ
-  + ���ƥ졼���ȥ���������
-  + �����١������쥯��
-  + �����ʥߥå������ǥ��� (�������ƥ�����ˤ��)
-  + �ܿ������⤤��¿����Unix-like/POSIX�ߴ��ץ�åȥե�������
-    ư�������Ǥʤ���Windows�� Mac OS X��BeOS�ʤɤξ�Ǥ�ư��
-    cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatformsJa
-
-* ����ˡ
-
-** FTP��
-
-�ʲ��ξ��ˤ����Ƥ���ޤ���
-
-  ftp://ftp.ruby-lang.org/pub/ruby/
-
-** Subversion��
-
-��ȯ��ü�Υ����������ɤϼ��Υ��ޥ�ɤǼ����Ǥ��ޤ���
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
-
-¾�˳�ȯ��Υ֥����ΰ����ϼ��Υ��ޥ�ɤǸ����ޤ���
-
-  $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
-
-
-* �ۡ���ڡ���
-
-Ruby�Υۡ���ڡ�����URL��
-
-   http://www.ruby-lang.org/
-
-�Ǥ���
-
-
-* �᡼��󥰥ꥹ��
-
-Ruby�Υ᡼��󥰥ꥹ�Ȥ�����ޤ������ô�˾������
-
-   ruby-list-ctl@ruby-lang.org
-
-�ޤ���ʸ��
-
-   subscribe YourFirstName YourFamilyName
-   
-�Ƚ񤤤����äƲ������� 
-
-Ruby��ȯ�Ը����᡼��󥰥ꥹ�Ȥ⤢��ޤ���������Ǥ�ruby�Υ�
-��������λ��ͳ�ĥ�ʤɼ����������ˤĤ��Ƶ�������Ƥ��ޤ���
-���ô�˾������
-
-   ruby-dev-ctl@ruby-lang.org
-
-�ޤ�ruby-list��Ʊ�ͤ���ˡ�ǥ᡼�뤷�Ƥ��������� 
-
-Ruby��ĥ�⥸�塼��ˤĤ����ä��礦ruby-ext�᡼��󥰥ꥹ�Ȥ�
-���شط�������ˤĤ����ä��礦ruby-math�᡼��󥰥ꥹ�Ȥ�
-�Ѹ���ä��礦ruby-talk�᡼��󥰥ꥹ�Ȥ⤢��ޤ���������ˡ
-�Ϥɤ��Ʊ���Ǥ��� 
-
-
-* ����ѥ��롦���󥹥ȡ���
-
-�ʲ��μ��ǹԤäƤ���������
-
-  1. �⤷configure�ե����뤬���Ĥ���ʤ����⤷����
-     configure.in���Ť��褦�ʤ顢autoconf��¹Ԥ���
-     ������configure����������
-
-  2. configure��¹Ԥ���Makefile�ʤɤ���������
-
-     �Ķ��ˤ�äƤϥǥե���Ȥ�C����ѥ����ѥ��ץ�����դ�
-     �ޤ���configure���ץ����� optflags=.. warnflags=.. ��
-     �Ǿ�񤭤Ǥ��ޤ���
-
-  3. (ɬ�פʤ��)defines.h���Խ�����
-
-     ¿ʬ��ɬ��̵���Ȼפ��ޤ���
-
-  4. (ɬ�פʤ��)ext/Setup����Ū�˥�󥯤����ĥ�⥸�塼���
-     ���ꤹ��
-
-     ext/Setup�˵��Ҥ����⥸�塼�����Ū�˥�󥯤���ޤ���
-
-     �����ʥߥå������ǥ��󥰤򥵥ݡ��Ȥ��Ƥ��ʤ��������ƥ�
-     ����Ǥ�Setup��1���ܤΡ�option nodynamic�פȤ����ԤΥ�
-     ���Ȥ򳰤�ɬ�פ�����ޤ����ޤ������Υ������ƥ������
-     ��ĥ�⥸�塼������Ѥ��뤿��ˤϡ����餫������Ū�˥��
-     �����Ƥ���ɬ�פ�����ޤ���
-
-  5. make��¹Ԥ��ƥ���ѥ��뤹��
-
-  6. make test�ǥƥ��Ȥ�Ԥ���
-
-     ��test succeeded�פ�ɽ�������������Ǥ����������ƥ���
-     ���������Ƥⴰ�������ݾڤ���Ƥ������ǤϤ���ޤ���
-
-  7. make install
-
-     �ʲ��Υǥ��쥯�ȥ���äơ������˥ե�����򥤥󥹥ȡ�
-     �뤷�ޤ���
-
-       * ${DESTDIR}${prefix}/bin
-       * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib
-       * ${DESTDIR}${prefix}/lib/ruby
-       * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib/ruby/site_ruby
-       * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby
-       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/share/man/man1
-       * ${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system
-
-     Ruby��API�С������`x.y.z'�Ǥ���С�((|${MAJOR}|))��
-     `x'�ǡ�((|${MINOR}|))��`y'��((|${TEENY}|))��`z'�Ǥ���
-
-     ����: API�С�������teeny�ϡ�Ruby�ץ������ΥС�����
-     ��Ȥϰۤʤ뤳�Ȥ�����ޤ���
-
-     root�Ǻ�Ȥ���ɬ�פ����뤫�⤷��ޤ���
-
-�⤷������ѥ�����˥��顼��ȯ���������ˤϥ��顼�Υ����ȥ�
-����OS�μ����ޤ�Ǥ�������ܤ�����ݡ��Ȥ��Ԥ����äƤ�
-�������¾�����Τ���ˤ�ʤ�ޤ���
-
-
-* �ܿ�
-
-UNIX�Ǥ����configure���ۤȤ�ɤκ��ۤ�ۼ����Ƥ����Ϥ���
-�������פ�̸���Ȥ������ä����(����˰㤤�ʤ�)����Ԥˤ���
-���Ȥ��ݡ��Ȥ���С����Ǥ��뤫���Τ�ޤ���
-
-�������ƥ�����ˤ�äȤ��¸����Τ�GC���Ǥ���Ruby��GC���о�
-�Υ������ƥ����㤬setjmp()�ޤ���getcontext()�ˤ�ä����ƤΥ�
-��������jmp_buf��ucontext_t�˳�Ǽ���뤳�Ȥȡ�jmp_buf��
-ucontext_t�ȥ����å���32bit���饤����Ȥ���Ƥ��뤳�Ȥ���
-���Ƥ��ޤ����ä����Ԥ���Ω���ʤ������б������˺���Ǥ���
-������Ԥβ������Ū��ñ�ǡ�gc.c�ǥ����å���ޡ������Ƥ���
-��ʬ�˥��饤����ȤΥХ��ȿ��������餷�ƥޡ������륳���ɤ�
-�ɲä�������ǺѤߤޤ�����defined(__mc68000__)�פǳ���Ƥ�
-����ʬ�򻲹ͤˤ��Ƥ���������
-
-�쥸����������ɥ������CPU�Ǥϡ��쥸����������ɥ��򥹥���
-���˥ե�å��夹�륢����֥饳���ɤ��ɲä���ɬ�פ����뤫����
-��ޤ���
-
-
-* ���۾��
-
-COPYING.ja�ե�����򻲾Ȥ��Ƥ���������
-
-
-* ����
-
-�����ȡ��Х���ݡ��Ȥ���¾�� matz@netlab.jp �ޤǡ�
--------------------------------------------------------
-created at: Thu Aug  3 11:57:36 JST 1995
-Local variables:
-mode: indented-text
-end:
diff --git a/README.ja.md b/README.ja.md
new file mode 100644
index 0000000000..4e1e6b9d87
--- /dev/null
+++ b/README.ja.md
@@ -0,0 +1,185 @@
+[![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=master)](https://travis-ci.org/ruby/ruby)
+[![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master)
+![](https://github.com/ruby/ruby/workflows/Cygwin/badge.svg)
+![](https://github.com/ruby/ruby/workflows/macOS/badge.svg)
+![](https://github.com/ruby/ruby/workflows/MJIT/badge.svg)
+![](https://github.com/ruby/ruby/workflows/Ubuntu/badge.svg)
+![](https://github.com/ruby/ruby/workflows/Windows/badge.svg)
+
+# Rubyとは
+
+Rubyはシンプルかつ強力なオブジェクト指向スクリプト言語です． Rubyは純粋なオブジェクト指向言語として設計されているので，
+オブジェクト指向プログラミングを手軽に行う事が出来ます．もちろん普通の手続き型のプログラミングも可能です．
+
+Rubyはテキスト処理関係の能力などに優れ，Perlと同じくらい強力です．さらにシンプルな文法と，
+例外処理やイテレータなどの機構によって，より分かりやすいプログラミングが出来ます．
+
+## Rubyの特長
+
+*   シンプルな文法
+*   普通のオブジェクト指向機能(クラス，メソッドコールなど)
+*   特殊なオブジェクト指向機能(Mixin，特異メソッドなど)
+*   演算子オーバーロード
+*   例外処理機能
+*   イテレータとクロージャ
+*   ガーベージコレクタ
+*   ダイナミックローディング (アーキテクチャによる)
+*   移植性が高い．多くのUnix-like/POSIX互換プラットフォーム上で動くだけでなく，Windows， macOS，
+    Haikuなどの上でも動く cf.
+    https://github.com/ruby/ruby/blob/master/doc/contributing.rdoc#platform-maintainers
+
+
+## 入手法
+
+サードパーティーツールを使った方法を含むRubyのインストール方法の一覧は
+
+https://www.ruby-lang.org/ja/downloads/
+
+を参照してください．
+
+### Git
+
+ミラーをGitHubに公開しています． 以下のコマンドでリポジトリを取得できます．
+
+    $ git clone https://github.com/ruby/ruby.git
+
+他のブランチの一覧は次のコマンドで見られます．
+
+    $ git ls-remote https://github.com/ruby/ruby.git
+
+Rubyリポジトリの本来のmasterは https://git.ruby-lang.org/ruby.git にあります．
+コミッタはこちらを使います．
+
+### Subversion
+
+古いRubyのバージョンのソースコードは次のコマンドで取得できます．
+
+    $ svn co https://svn.ruby-lang.org/repos/ruby/branches/ruby_2_6/ ruby
+
+他に開発中のブランチの一覧は次のコマンドで見られます．
+
+    $ svn ls https://svn.ruby-lang.org/repos/ruby/branches/
+
+
+## ホームページ
+
+RubyのホームページのURLは
+
+https://www.ruby-lang.org/
+
+です．
+
+## メーリングリスト
+
+Rubyのメーリングリストがあります．参加希望の方は
+
+mailto:ruby-list-request@ruby-lang.org
+
+まで本文に
+
+    subscribe
+
+と書いて送って下さい．
+
+Ruby開発者向けメーリングリストもあります．こちらではrubyのバグ，将来の仕様拡張など実装上の問題について議論されています． 参加希望の方は
+
+mailto:ruby-dev-request@ruby-lang.org
+
+までruby-listと同様の方法でメールしてください．
+
+Ruby拡張モジュールについて話し合うruby-extメーリングリストと数学関係の話題について話し合うruby-mathメーリングリストと
+英語でrubyについて話し合うruby-talkメーリングリストもあります．参加方法はどれも同じです．
+
+## コンパイル・インストール
+
+以下の手順で行ってください．
+
+1.  もし `configure` ファイルが見つからない，もしくは `configure.ac` より古いようなら， `autoconf` を実行して
+    新しく `configure` を生成する
+
+2.  `configure` を実行して `Makefile` などを生成する
+
+    環境によってはデフォルトのCコンパイラ用オプションが付きます． `configure` オプションで `optflags=..`
+    `warnflags=..` 等で上書きできます．
+
+3.  (必要ならば)`defines.h` を編集する
+
+    多分，必要無いと思います．
+
+4.  (必要ならば)`ext/Setup` に静的にリンクする拡張モジュールを指定する
+
+    `ext/Setup` に記述したモジュールは静的にリンクされます．
+
+    ダイナミックローディングをサポートしていないアーキテクチャでは `Setup` の1行目の「`option nodynamic`」という行のコ
+    メントを外す必要があります．
+    また，このアーキテクチャで拡張モジュールを利用するためには，あらかじめ静的にリンクをしておく必要があります．
+
+5.  `make` を実行してコンパイルする
+
+6.  `make check`でテストを行う．
+
+    「`check succeeded`」と表示されれば成功です．ただしテストに成功しても完璧だと保証されている訳ではありません．
+
+7.  `make install`
+
+    以下のディレクトリを作って，そこにファイルをインストー ルします．
+
+    *   `${DESTDIR}${prefix}/bin`
+    *   `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib`
+    *   `${DESTDIR}${prefix}/lib/ruby`
+    *   `${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib/ruby/site_ruby`
+    *   `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib/ruby/vendor_ruby`
+    *   `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/share/man/man1`
+    *   `${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system`
+
+
+    RubyのAPIバージョンが'*x.y.z*'であれば，`${MAJOR}`は
+    '*x*'で，`${MINOR}`は'*y*'，`${TEENY}`は'*z*'です．
+
+    **注意**: APIバージョンの `teeny` は，Rubyプログラムのバージョンとは異なることがあります．
+
+    `root` で作業する必要があるかもしれません．
+
+
+もし，コンパイル時にエラーが発生した場合にはエラーのログとマシン，OSの種類を含むできるだけ詳しいレポートを作者に送って下さると他の方のためにもなります．
+
+## 移植
+
+UNIXであれば `configure` がほとんどの差異を吸収してくれるはずですが，思わぬ見落としがあった場合(ある事が多い)，作者にその
+ことを報告すれば，解決できる可能性があります．
+
+アーキテクチャにもっとも依存するのはGC部です．RubyのGCは対象
+のアーキテクチャが`setjmp()`または`getcontext()`によって全てのレジスタを `jmp_buf` や `ucontext_t`
+に格納することと， `jmp_buf` や `ucontext_t` とスタックが32bitアラインメントされていることを仮定
+しています．特に前者が成立しない場合の対応は非常に困難でしょう． 後者の解決は比較的簡単で， `gc.c` でスタックをマークしている
+部分にアラインメントのバイト数だけずらしてマークするコードを追加するだけで済みます．`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 で受け付けています．
+
+
+## 著者
+
+Rubyのオリジナル版は，1995年にまつもとゆきひろ氏によって設計・開発されました．
+
+<mailto:matz@ruby-lang.org>
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..1e935095c6
--- /dev/null
+++ b/README.md
@@ -0,0 +1,176 @@
+[![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=master)](https://travis-ci.org/ruby/ruby)
+[![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master)
+![](https://github.com/ruby/ruby/workflows/Cygwin/badge.svg)
+![](https://github.com/ruby/ruby/workflows/macOS/badge.svg)
+![](https://github.com/ruby/ruby/workflows/MJIT/badge.svg)
+![](https://github.com/ruby/ruby/workflows/Ubuntu/badge.svg)
+![](https://github.com/ruby/ruby/workflows/Windows/badge.svg)
+
+# What's Ruby
+
+Ruby is an interpreted object-oriented programming language often
+used for web development. It also offers many scripting features
+to process plain text and serialized files, or manage system tasks.
+It is simple, straightforward, and 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)
+*   Operator Overloading
+*   Exception Handling
+*   Iterators and Closures
+*   Garbage Collection
+*   Dynamic Loading of Object Files (on some architectures)
+*   Highly Portable (works on many Unix-like/POSIX compatible platforms as
+    well as Windows, macOS, Haiku, etc.) cf.
+    https://github.com/ruby/ruby/blob/master/doc/contributing.rdoc#platform-maintainers
+
+
+## How to get Ruby
+
+For a complete list of ways to install Ruby, including using third-party tools
+like rvm, see:
+
+https://www.ruby-lang.org/en/downloads/
+
+### Git
+
+The mirror of the Ruby source tree can be checked out with the following command:
+
+    $ git clone https://github.com/ruby/ruby.git
+
+There are some other branches under development. Try the following command
+to see the list of branches:
+
+    $ git ls-remote https://github.com/ruby/ruby.git
+
+You may also want to use https://git.ruby-lang.org/ruby.git (actual master of Ruby source)
+if you are a committer.
+
+### Subversion
+
+Stable branches for older Ruby versions can be checked out with the following command:
+
+    $ svn co https://svn.ruby-lang.org/repos/ruby/branches/ruby_2_6/ ruby
+
+Try the following command to see the list of branches:
+
+    $ svn ls https://svn.ruby-lang.org/repos/ruby/branches/
+
+
+## Ruby home page
+
+https://www.ruby-lang.org/
+
+## Mailing list
+
+There is a mailing list to discuss Ruby. To subscribe to this list, please
+send the following phrase:
+
+    subscribe
+
+in the mail body (not subject) to the address
+[ruby-talk-request@ruby-lang.org](mailto:ruby-talk-request@ruby-lang.org?subject=Join%20Ruby%20Mailing%20List&body=subscribe).
+
+## How to compile and install
+
+1.  If you want to use Microsoft Visual C++ to compile Ruby, read
+    [win32/README.win32](win32/README.win32) instead of this document.
+
+2.  If `./configure` does not exist or is older than `configure.ac`, run
+    `autoconf` to (re)generate configure.
+
+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
+    override them.
+
+4.  Edit `defines.h` if you need. Usually this step will not be needed.
+
+5.  Remove comment mark(`#`) before the module names from `ext/Setup` (or add
+    module names if not present), if you want to link modules statically.
+
+    If you don't want to compile non static extension modules (probably on
+    architectures which do not allow dynamic loading), remove comment mark
+    from the line "`#option nodynamic`" in `ext/Setup`.
+
+    Usually this step will not be needed.
+
+6.  Run `make`.
+
+    * On Mac, set RUBY\_CODESIGN environment variable with a signing identity.
+      It uses the identity to sign `ruby` binary. See also codesign(1).
+
+7.  Optionally, run '`make check`' to check whether the compiled Ruby
+    interpreter works well. If you see the message "`check succeeded`", your
+    Ruby works as it should (hopefully).
+
+8.  Optionally, run `make update-gems` and `make extract-gems`.
+
+    If you want to install bundled gems, run `make update-gems` and
+    `make extract-gems` before running `make install`.
+
+9.  Run '`make install`'.
+
+    This command will create the following directories and install files into
+    them.
+
+    *   `${DESTDIR}${prefix}/bin`
+    *   `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib`
+    *   `${DESTDIR}${prefix}/lib/ruby`
+    *   `${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib/ruby/site_ruby`
+    *   `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib/ruby/vendor_ruby`
+    *   `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/share/man/man1`
+    *   `${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system`
+
+
+    If Ruby's API version is '*x.y.z*', the `${MAJOR}` is '*x*', the
+    `${MINOR}` is '*y*', and the `${TEENY}` is '*z*'.
+
+    **NOTE**: teeny of the API version may be different from one of Ruby's
+    program version
+
+    You may have to be a super user to install Ruby.
+
+If you fail to compile Ruby, please send the detailed error report with the
+error log and machine/OS type, to help others.
+
+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.
+
+## Copying
+
+See the file [COPYING](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).
+
+Bugs should be reported 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)
+
+## The Author
+
+Ruby was originally designed and developed by Yukihiro Matsumoto (Matz) in 1995.
+
+<matz@ruby-lang.org>
diff --git a/ToDo b/ToDo
deleted file mode 100644
index 7e5ef523a8..0000000000
--- a/ToDo
+++ /dev/null
@@ -1,124 +0,0 @@
-Language Spec.
-
-- Class#allocate - basicNew
-- class Foo::Bar<Baz .. end, module Boo::Bar .. end
-- raise exception by `` error
-- a +1 to be a+1, not a(+1).
-- clarify evaluation order of operator argument (=~, .., ...)
-- :symbol => value hash in the form of {symbol: value, ...} ??
-* operator !! for rescue. ???
-* objectify characters
-* ../... outside condition invokes operator method too.
-* ... inside condition turns off just before right condition.???
-* package or access control for global variables??
-* named arguments like foo(nation:="german") or foo(nation: "german").
-* method to retrieve argument information (needs new C API)
-* multiple return values, yield values.  maybe incompatible ???
-* cascading method invocation ???
-* def Class#method .. end ??
-* def Foo::Bar::baz() .. end ??
-* I18N (or M17N) script/string/regexp
-* discourage use of symbol variables (e.g. $/, etc.) in manual
-* discourage use of Perlish features by giving warnings.
-* non confusing in-block local variable (is it possible?)
-  + remove scope by block
-  + variables appears within block may have independent values.
-* Regexp: make /o thread safe.
-* decide whether begin with rescue or ensure make do..while loop.
-* unify == and eql? again
-* to_i returns nil if str contains no digit.
-* jar like combined library package. -> RubyGems?
-* method combination, e.g. before, after, around, etc.
-* .. or something like defadvice in Emacs.
-* property - for methods, or for objects in general.
-* "in" modifier, to annotate, or to encourage assertion.
-* selector namespace - something like generic-flet in CLOS, to help RubyBehavior
-* private instance variable (as in Python?) @_foo in class Foo => @_Foo_foo
-* warn/error "bare word" method, like "foo",  you should type "foo()"
-
-Hacking Interpreter
-
-- generational GC
-* non-blocking open (e.g. for named pipe) for thread
-* avoid blocking with gethostbyname/gethostbyaddr (use fork ???)
-* objectify interpreters ???
-* remove rb_eval() recursions
-* syntax tree -> bytecode ???
-* scrambled script, or script filter
-* setuid ruby
-* performance tune for in-block (dynamic) local variables.
-* give warnings to assign magic variables.
-* export rb_io_{addstr,printf,puts,print}
-* autoload should work with threads [ruby-talk:4589]
-* remove stdio dependency from IOs.
-* warn for inconsistent local variable usage (lv m and method m at the same time). 
-* MicroRuby
-* Built-in Interactive Ruby.
-* Parser API
-* trap every method invocation, which can be enabled by e.g. trap_call :method.
-* unify Errno exceptions of same errno, or new exception comparison scheme.
-* 2.times{|i| if i==0 then a = 15 else puts eval("a") end} should print nil.
-* Thread#max_stack_size attribute (possible??)
-
-Standard Libraries
-
-- Module#define_method which takes a name and a body (block, proc or method).
-- Enume#inject
-- Array#fetch
-- IO::for_fd
-- Process::waitall [ruby-talk:4557]
-- Process::Status
-- File::lchown, File::lchmod; xxx - still need work for non existing platforms
-- move Time::times to Process.
-- Enumerable#sort_by for Schwartzian transformation
-- fork_and_kill_other_threads.
-- signal list (Signal::trap, Signal::list).
-- move NameError under StandardError.
-- Integer#to_s(base)
-- Hash::new{default}
-- hash etc. should handle self referenceing array/hash
-- Array#select(n1,n2...) works like Array#indexes(n1,n2...)
-- use Mersenne Twister RNG for random.
-- deprecate Array#indexes, and Array#indices.
-- remove dependency on MAXPATHLEN.
-- String#scanf(?)
-* Object#fmt(?)
-* Time::strptime
-* Integer[num], Float[num];  Fixnum[num]?
-* method to retrieve non-number trailer for to_i/to_f.
-* Stream or Port, abstract superclass of IO ?
-* String#{pred,prev}, String#downto
-* optional stepsize argument for succ()
-* Ruby module -- Ruby::Version, Ruby::Interpreter
-* introduce Boolean class; super of TrueClass, FalseClass
-* synchronized method - synchronized{...}, synchronized :foo, :bar
-* Array#&, Array#| to allow duplication. ???
-* way to specify immortal (fork endurance) thread;
-* or raise ForkException to every thread but fork caller.
-* new user-defined marshal scheme. _dump(dumper), _load(restorer)
-* library to load per-user profile seeking .ruby_profile or ruby.ini file.
-* warning framework (warn, warning for Ruby level)
-* marshal should not depend on sprintf (works bad with locale).
-* ternary arg pow: a.pow(b,c) == a**b%c
-* new caller(), e.g. call_stack; needs better name.
-* pointer share mechanism similar to one in String for Array.
-* require "1.6" etc. by /usr/lib/ruby/1.6/1.6.rb ;-)
-* save both "feature names" and "normalized path" in $"
-* implement Mutex_m (or MutexMixin) using Mutex.
-
-Extension Libraries
-
-* ptk.rb pTk wrapper that is compatible to tk.rb
-* Berkeley DB extension
-* BitVector
-* thread-safe fcgi
-
-Ruby Libraries
-
-- urllib.rb, nttplib.rb, etc.
-* format like perl's
-
-Tools
-
-* freeze or undump to bundle everything
-* bundle using zlib
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000000..ed7d14ef63
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,47 @@
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2018 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([tool/m4/_colorize_result_prepare.m4])
+m4_include([tool/m4/ac_msg_result.m4])
+m4_include([tool/m4/colorize_result.m4])
+m4_include([tool/m4/ruby_append_option.m4])
+m4_include([tool/m4/ruby_append_options.m4])
+m4_include([tool/m4/ruby_check_builtin_func.m4])
+m4_include([tool/m4/ruby_check_builtin_setjmp.m4])
+m4_include([tool/m4/ruby_check_printf_prefix.m4])
+m4_include([tool/m4/ruby_check_setjmp.m4])
+m4_include([tool/m4/ruby_check_signedness.m4])
+m4_include([tool/m4/ruby_check_sizeof.m4])
+m4_include([tool/m4/ruby_check_sysconf.m4])
+m4_include([tool/m4/ruby_cppoutfile.m4])
+m4_include([tool/m4/ruby_decl_attribute.m4])
+m4_include([tool/m4/ruby_default_arch.m4])
+m4_include([tool/m4/ruby_define_if.m4])
+m4_include([tool/m4/ruby_defint.m4])
+m4_include([tool/m4/ruby_dtrace_available.m4])
+m4_include([tool/m4/ruby_dtrace_postprocess.m4])
+m4_include([tool/m4/ruby_func_attribute.m4])
+m4_include([tool/m4/ruby_mingw32.m4])
+m4_include([tool/m4/ruby_prepend_option.m4])
+m4_include([tool/m4/ruby_prog_gnu_ld.m4])
+m4_include([tool/m4/ruby_replace_funcs.m4])
+m4_include([tool/m4/ruby_replace_type.m4])
+m4_include([tool/m4/ruby_rm_recursive.m4])
+m4_include([tool/m4/ruby_setjmp_type.m4])
+m4_include([tool/m4/ruby_stack_grow_direction.m4])
+m4_include([tool/m4/ruby_try_cflags.m4])
+m4_include([tool/m4/ruby_try_ldflags.m4])
+m4_include([tool/m4/ruby_type_attribute.m4])
+m4_include([tool/m4/ruby_universal_arch.m4])
+m4_include([tool/m4/ruby_werror_flag.m4])
diff --git a/addr2line.c b/addr2line.c
index 219d1d4b47..635194b96b 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -1,6 +1,6 @@
 /**********************************************************************
 
-  addr2line.h -
+  addr2line.c -
 
   $Author$
 
@@ -8,22 +8,35 @@
 
 **********************************************************************/
 
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wgnu-empty-initializer"
+#pragma clang diagnostic ignored "-Wgcc-compat"
+#endif
+
 #include "ruby/config.h"
+#include "ruby/defines.h"
+#include "ruby/missing.h"
 #include "addr2line.h"
 
 #include <stdio.h>
 #include <errno.h>
 
-#ifdef USE_ELF
+#ifdef HAVE_LIBPROC_H
+#include <libproc.h>
+#endif
 
-#ifdef __OpenBSD__
-#include <elf_abi.h>
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
 #else
-#include <elf.h>
+#include "missing/stdbool.h"
 #endif
+
+#if defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H)
+
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
@@ -31,15 +44,72 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#if defined(HAVE_ALLOCA_H)
-#include <alloca.h>
+/* Make alloca work the best possible way.  */
+#ifdef __GNUC__
+# ifndef alloca
+#  define alloca __builtin_alloca
+# endif
+#else
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+#pragma alloca
+#  else
+#   ifndef alloca		/* predefined by HP cc +Olibcalls */
+void *alloca();
+#   endif
+#  endif /* AIX */
+# endif	/* HAVE_ALLOCA_H */
+#endif /* __GNUC__ */
+
+#ifdef HAVE_DLADDR
+# include <dlfcn.h>
+#endif
+
+#ifdef HAVE_MACH_O_LOADER_H
+# include <crt_externs.h>
+# include <mach-o/fat.h>
+# include <mach-o/loader.h>
+# include <mach-o/nlist.h>
+# include <mach-o/stab.h>
 #endif
 
-#ifdef HAVE_DL_ITERATE_PHDR
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
+#ifdef USE_ELF
+# ifdef __OpenBSD__
+#  include <elf_abi.h>
+# else
+#  include <elf.h>
+# endif
+
+#ifndef ElfW
+# if SIZEOF_VOIDP == 8
+#  define ElfW(x) Elf64##_##x
+# else
+#  define ElfW(x) Elf32##_##x
 # endif
-# include <link.h>
+#endif
+#ifndef ELF_ST_TYPE
+# if SIZEOF_VOIDP == 8
+#  define ELF_ST_TYPE ELF64_ST_TYPE
+# else
+#  define ELF_ST_TYPE ELF32_ST_TYPE
+# endif
+#endif
+#endif
+
+#ifdef SHF_COMPRESSED
+# if defined(ELFCOMPRESS_ZLIB) && defined(HAVE_LIBZ)
+   /* FreeBSD 11.0 lacks ELFCOMPRESS_ZLIB */
+#  include <zlib.h>
+#  define SUPPORT_COMPRESSED_DEBUG_LINE
+# endif
+#else /* compatibility with glibc < 2.22 */
+# define SHF_COMPRESSED 0
+#endif
+
+#ifndef PATH_MAX
+#define PATH_MAX 4096
 #endif
 
 #define DW_LNS_copy                     0x01
@@ -61,30 +131,71 @@
 #define DW_LNE_define_file              0x03
 #define DW_LNE_set_discriminator        0x04  /* DWARF4 */
 
-#ifndef ElfW
-# if SIZEOF_VOIDP == 8
-#  define ElfW(x) Elf64##_##x
-# else
-#  define ElfW(x) Elf32##_##x
-# endif
-#endif
+PRINTF_ARGS(static int kprintf(const char *fmt, ...), 1, 2);
 
-typedef struct {
+typedef struct line_info {
     const char *dirname;
     const char *filename;
+    const char *path; /* object path */
     int line;
 
-    int fd;
-    void *mapped;
-    size_t mapped_size;
-    unsigned long base_addr;
+    uintptr_t base_addr;
+    uintptr_t saddr;
+    const char *sname; /* function name */
+
+    struct line_info *next;
 } line_info_t;
 
+struct dwarf_section {
+    char *ptr;
+    size_t size;
+    uint64_t flags;
+};
+
+typedef struct obj_info {
+    const char *path; /* object path */
+    char *mapped;
+    size_t mapped_size;
+    void *uncompressed;
+    uintptr_t base_addr;
+    uintptr_t vmaddr;
+    struct dwarf_section debug_abbrev;
+    struct dwarf_section debug_info;
+    struct dwarf_section debug_line;
+    struct dwarf_section debug_ranges;
+    struct dwarf_section debug_str;
+    struct obj_info *next;
+} obj_info_t;
+
+#define DWARF_SECTION_COUNT 5
+
+static struct dwarf_section *
+obj_dwarf_section_at(obj_info_t *obj, int n)
+{
+    struct dwarf_section *ary[] = {
+        &obj->debug_abbrev,
+        &obj->debug_info,
+        &obj->debug_line,
+        &obj->debug_ranges,
+        &obj->debug_str
+    };
+    if (n < 0 || DWARF_SECTION_COUNT <= n) {
+        abort();
+    }
+    return ary[n];
+}
+
+struct debug_section_definition {
+    const char *name;
+    struct dwarf_section *dwarf;
+};
+
 /* Avoid consuming stack as this module may be used from signal handler */
-static char binary_filename[PATH_MAX];
+static char binary_filename[PATH_MAX + 1];
 
 static unsigned long
-uleb128(char **p) {
+uleb128(char **p)
+{
     unsigned long r = 0;
     int s = 0;
     for (;;) {
@@ -100,7 +211,8 @@ uleb128(char **p) {
 }
 
 static long
-sleb128(char **p) {
+sleb128(char **p)
+{
     long r = 0;
     int s = 0;
     for (;;) {
@@ -130,7 +242,7 @@ get_nth_dirname(unsigned long dir, char *p)
 	while (*p) p++;
 	p++;
 	if (!*p) {
-	    fprintf(stderr, "Unexpected directory number %lu in %s\n",
+	    kprintf("Unexpected directory number %lu in %s\n",
 		    dir, binary_filename);
 	    return "";
 	}
@@ -139,8 +251,7 @@ get_nth_dirname(unsigned long dir, char *p)
 }
 
 static void
-fill_filename(int file, char *include_directories, char *filenames,
-	      line_info_t *line)
+fill_filename(int file, char *include_directories, char *filenames, line_info_t *line, obj_info_t *obj)
 {
     int i;
     char *p = filenames;
@@ -150,8 +261,8 @@ fill_filename(int file, char *include_directories, char *filenames,
 	filename = p;
 	if (!*p) {
 	    /* Need to output binary file name? */
-	    fprintf(stderr, "Unexpected file number %d in %s\n",
-		    file, binary_filename);
+	    kprintf("Unexpected file number %d in %s at %tx\n",
+		    file, binary_filename, filenames - obj->mapped);
 	    return;
 	}
 	while (*p) p++;
@@ -169,124 +280,134 @@ fill_filename(int file, char *include_directories, char *filenames,
     }
 }
 
-static int
-get_path_from_symbol(const char *symbol, const char **p, size_t *len)
-{
-    if (symbol[0] == '0') {
-	/* libexecinfo */
-	*p   = strchr(symbol, '/');
-	if (*p == NULL) return 0;
-	*len = strlen(*p);
-    }
-    else {
-	/* glibc */
-	const char *q;
-	*p   = symbol;
-	q   = strchr(symbol, '(');
-	if (q == NULL) return 0;
-	*len = q - symbol;
-    }
-    return 1;
-}
-
 static void
-fill_line(int num_traces, void **traces,
-	  unsigned long addr, int file, int line,
-	  char *include_directories, char *filenames, line_info_t *lines)
+fill_line(int num_traces, void **traces, uintptr_t addr, int file, int line,
+	  char *include_directories, char *filenames,
+	  obj_info_t *obj, line_info_t *lines, int offset)
 {
     int i;
-    for (i = 0; i < num_traces; i++) {
-	unsigned long a = (unsigned long)traces[i] - lines[i].base_addr;
+    addr += obj->base_addr - obj->vmaddr;
+    for (i = offset; i < num_traces; i++) {
+	uintptr_t a = (uintptr_t)traces[i];
 	/* We assume one line code doesn't result >100 bytes of native code.
        We may want more reliable way eventually... */
 	if (addr < a && a < addr + 100) {
-	    fill_filename(file, include_directories, filenames, &lines[i]);
+	    fill_filename(file, include_directories, filenames, &lines[i], obj);
 	    lines[i].line = line;
 	}
     }
 }
 
-static void
-parse_debug_line_cu(int num_traces, void **traces,
-		    char **debug_line, line_info_t *lines)
-{
-    char *p, *cu_end, *cu_start, *include_directories, *filenames;
-    unsigned long unit_length;
-    int default_is_stmt, line_base;
-    unsigned int header_length, minimum_instruction_length, line_range,
-		 opcode_base;
-    unsigned char *standard_opcode_lengths;
-
-    /* The registers. */
-    unsigned long addr = 0;
-    unsigned int file = 1;
-    unsigned int line = 1;
-    unsigned int column = 0;
-    int is_stmt;
-    int basic_block = 0;
-    int end_sequence = 0;
-    int prologue_end = 0;
-    int epilogue_begin = 0;
-    unsigned int isa = 0;
-
-    p = *debug_line;
+struct LineNumberProgramHeader {
+    uint64_t unit_length;
+    uint16_t version;
+    uint8_t format; /* 4 or 8 */
+    uint64_t header_length;
+    uint8_t minimum_instruction_length;
+    uint8_t maximum_operations_per_instruction;
+    uint8_t default_is_stmt;
+    int8_t line_base;
+    uint8_t line_range;
+    uint8_t opcode_base;
+    /* uint8_t standard_opcode_lengths[opcode_base-1]; */
+    const char *include_directories;
+    const char *filenames;
+    const char *cu_start;
+    const char *cu_end;
+};
 
-    unit_length = *(unsigned int *)p;
-    p += sizeof(unsigned int);
-    if (unit_length == 0xffffffff) {
-	unit_length = *(unsigned long *)p;
-	p += sizeof(unsigned long);
+static int
+parse_debug_line_header(const char **pp, struct LineNumberProgramHeader *header)
+{
+    const char *p = *pp;
+    header->unit_length = *(uint32_t *)p;
+    p += sizeof(uint32_t);
+
+    header->format = 4;
+    if (header->unit_length == 0xffffffff) {
+	header->unit_length = *(uint64_t *)p;
+	p += sizeof(uint64_t);
+        header->format = 8;
     }
 
-    cu_end = p + unit_length;
-
-    /*dwarf_version = *(unsigned short *)p;*/
-    p += 2;
+    header->cu_end = p + header->unit_length;
 
-    header_length = *(unsigned int *)p;
-    p += sizeof(unsigned int);
+    header->version = *(uint16_t *)p;
+    p += sizeof(uint16_t);
+    if (header->version > 4) return -1;
 
-    cu_start = p + header_length;
+    header->header_length = header->format == 4 ? *(uint32_t *)p : *(uint64_t *)p;
+    p += header->format;
+    header->cu_start = p + header->header_length;
 
-    minimum_instruction_length = *(unsigned char *)p;
-    p++;
-
-    is_stmt = default_is_stmt = *(unsigned char *)p;
-    p++;
+    header->minimum_instruction_length = *(uint8_t *)p++;
 
-    line_base = *(char *)p;
-    p++;
-
-    line_range = *(unsigned char *)p;
-    p++;
+    if (header->version >= 4) {
+        /* maximum_operations_per_instruction = *(uint8_t *)p; */
+        if (*p != 1) return -1; /* For non-VLIW architectures, this field is 1 */
+        p++;
+    }
 
-    opcode_base = *(unsigned char *)p;
-    p++;
+    header->default_is_stmt = *(uint8_t *)p++;
+    header->line_base = *(int8_t *)p++;
+    header->line_range = *(uint8_t *)p++;
+    header->opcode_base = *(uint8_t *)p++;
+    /* header->standard_opcode_lengths = (uint8_t *)p - 1; */
+    p += header->opcode_base - 1;
 
-    standard_opcode_lengths = (unsigned char *)p - 1;
-    p += opcode_base - 1;
+    header->include_directories = p;
 
-    include_directories = p;
+    /* temporary measure for compress-debug-sections */
+    if (p >= header->cu_end) return -1;
 
     /* skip include directories */
     while (*p) {
-	while (*p) p++;
+	p = memchr(p, '\0', header->cu_end - p);
+	if (!p) return -1;
 	p++;
     }
     p++;
 
-    filenames = p;
+    header->filenames = p;
 
-    p = cu_start;
+    *pp = header->cu_start;
+
+    return 0;
+}
+
+static int
+parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
+		obj_info_t *obj, line_info_t *lines, int offset)
+{
+    const char *p = (const char *)*debug_line;
+    struct LineNumberProgramHeader header;
+
+    /* The registers. */
+    unsigned long addr = 0;
+    unsigned int file = 1;
+    unsigned int line = 1;
+    /* unsigned int column = 0; */
+    int is_stmt;
+    /* int basic_block = 0; */
+    /* int end_sequence = 0; */
+    /* int prologue_end = 0; */
+    /* int epilogue_begin = 0; */
+    /* unsigned int isa = 0; */
+
+    if (parse_debug_line_header(&p, &header))
+        return -1;
+    is_stmt = header.default_is_stmt;
 
 #define FILL_LINE()						    \
     do {							    \
 	fill_line(num_traces, traces, addr, file, line,		    \
-		  include_directories, filenames, lines);	    \
-	basic_block = prologue_end = epilogue_begin = 0;	    \
+                  (char *)header.include_directories,               \
+                  (char *)header.filenames,                         \
+		  obj, lines, offset);				    \
+	/*basic_block = prologue_end = epilogue_begin = 0;*/	    \
     } while (0)
 
-    while (p < cu_end) {
+    while (p < header.cu_end) {
 	unsigned long a;
 	unsigned char op = *p++;
 	switch (op) {
@@ -294,29 +415,29 @@ parse_debug_line_cu(int num_traces, void **traces,
 	    FILL_LINE();
 	    break;
 	case DW_LNS_advance_pc:
-	    a = uleb128(&p);
+	    a = uleb128((char **)&p);
 	    addr += a;
 	    break;
 	case DW_LNS_advance_line: {
-	    long a = sleb128(&p);
+	    long a = sleb128((char **)&p);
 	    line += a;
 	    break;
 	}
 	case DW_LNS_set_file:
-	    file = (unsigned int)uleb128(&p);
+	    file = (unsigned int)uleb128((char **)&p);
 	    break;
 	case DW_LNS_set_column:
-	    column = (unsigned int)uleb128(&p);
+	    /*column = (unsigned int)*/(void)uleb128((char **)&p);
 	    break;
 	case DW_LNS_negate_stmt:
 	    is_stmt = !is_stmt;
 	    break;
 	case DW_LNS_set_basic_block:
-	    basic_block = 1;
+	    /*basic_block = 1; */
 	    break;
 	case DW_LNS_const_add_pc:
-	    a = ((255 - opcode_base) / line_range) *
-		minimum_instruction_length;
+	    a = ((255UL - header.opcode_base) / header.line_range) *
+		header.minimum_instruction_length;
 	    addr += a;
 	    break;
 	case DW_LNS_fixed_advance_pc:
@@ -324,89 +445,103 @@ parse_debug_line_cu(int num_traces, void **traces,
 	    addr += a;
 	    break;
 	case DW_LNS_set_prologue_end:
-	    prologue_end = 1;
+	    /* prologue_end = 1; */
 	    break;
 	case DW_LNS_set_epilogue_begin:
-	    epilogue_begin = 1;
+	    /* epilogue_begin = 1; */
 	    break;
 	case DW_LNS_set_isa:
-	    isa = (unsigned int)uleb128(&p);
+	    /* isa = (unsigned int)*/(void)uleb128((char **)&p);
 	    break;
 	case 0:
 	    a = *(unsigned char *)p++;
 	    op = *p++;
 	    switch (op) {
 	    case DW_LNE_end_sequence:
-		end_sequence = 1;
+		/* end_sequence = 1; */
 		FILL_LINE();
 		addr = 0;
 		file = 1;
 		line = 1;
-		column = 0;
-		is_stmt = default_is_stmt;
-		end_sequence = 0;
-		isa = 0;
+		/* column = 0; */
+		is_stmt = header.default_is_stmt;
+		/* end_sequence = 0; */
+		/* isa = 0; */
 		break;
 	    case DW_LNE_set_address:
 		addr = *(unsigned long *)p;
 		p += sizeof(unsigned long);
 		break;
 	    case DW_LNE_define_file:
-		fprintf(stderr, "Unsupported operation in %s\n",
+		kprintf("Unsupported operation in %s\n",
 			binary_filename);
 		break;
 	    case DW_LNE_set_discriminator:
 		/* TODO:currently ignore */
-		uleb128(&p);
+		uleb128((char **)&p);
 		break;
 	    default:
-		fprintf(stderr, "Unknown extended opcode: %d in %s\n",
+		kprintf("Unknown extended opcode: %d in %s\n",
 			op, binary_filename);
 	    }
 	    break;
 	default: {
-	    unsigned long addr_incr;
-	    unsigned long line_incr;
-	    a = op - opcode_base;
-	    addr_incr = (a / line_range) * minimum_instruction_length;
-	    line_incr = line_base + (a % line_range);
-	    addr += (unsigned int)addr_incr;
-	    line += (unsigned int)line_incr;
+            uint8_t adjusted_opcode = op - header.opcode_base;
+            uint8_t operation_advance = adjusted_opcode / header.line_range;
+            /* NOTE: this code doesn't support VLIW */
+            addr += operation_advance * header.minimum_instruction_length;
+            line += header.line_base + (adjusted_opcode % header.line_range);
 	    FILL_LINE();
 	}
 	}
     }
-    *debug_line = p;
+    *debug_line = (char *)p;
+    return 0;
 }
 
-static void
+static int
 parse_debug_line(int num_traces, void **traces,
-		 char *debug_line, unsigned long size, line_info_t *lines)
+		 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) {
-	parse_debug_line_cu(num_traces, traces, &debug_line, lines);
+	if (parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset))
+	    return -1;
     }
     if (debug_line != debug_line_end) {
-	fprintf(stderr, "Unexpected size of .debug_line in %s\n",
+	kprintf("Unexpected size of .debug_line in %s\n",
 		binary_filename);
     }
+    return 0;
 }
 
 /* read file and fill lines */
+static uintptr_t
+fill_lines(int num_traces, void **traces, int check_debuglink,
+	   obj_info_t **objp, line_info_t *lines, int offset);
+
 static void
-fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
-	   line_info_t *current_line, line_info_t *lines);
+append_obj(obj_info_t **objp)
+{
+    obj_info_t *newobj = calloc(1, sizeof(obj_info_t));
+    if (*objp) (*objp)->next = newobj;
+    *objp = newobj;
+}
 
+#ifdef USE_ELF
 static void
-follow_debuglink(char *debuglink, int num_traces, void **traces, char **syms,
-		 line_info_t *current_line, line_info_t *lines)
+follow_debuglink(const char *debuglink, int num_traces, void **traces,
+		 obj_info_t **objp, line_info_t *lines, int offset)
 {
     /* Ideally we should check 4 paths to follow gnu_debuglink,
        but we handle only one case for now as this format is used
        by some linux distributions. See GDB's info for detail. */
     static const char global_debug_dir[] = "/usr/lib/debug";
-    char *p, *subdir;
+    const size_t global_debug_dir_len = sizeof(global_debug_dir) - 1;
+    char *p;
+    obj_info_t *o1 = *objp, *o2;
+    size_t len;
 
     p = strrchr(binary_filename, '/');
     if (!p) {
@@ -414,197 +549,2115 @@ follow_debuglink(char *debuglink, int num_traces, void **traces, char **syms,
     }
     p[1] = '\0';
 
-    subdir = (char *)alloca(strlen(binary_filename) + 1);
-    strcpy(subdir, binary_filename);
-    strcpy(binary_filename, global_debug_dir);
-    strncat(binary_filename, subdir,
-	    PATH_MAX - strlen(binary_filename) - 1);
-    strncat(binary_filename, debuglink,
-	    PATH_MAX - strlen(binary_filename) - 1);
+    len = strlen(binary_filename);
+    if (len >= PATH_MAX - global_debug_dir_len)
+	len = PATH_MAX - global_debug_dir_len - 1;
+    memmove(binary_filename + global_debug_dir_len, binary_filename, len);
+    memcpy(binary_filename, global_debug_dir, global_debug_dir_len);
+    len += global_debug_dir_len;
+    strlcpy(binary_filename + len, debuglink, PATH_MAX - len);
+
+    append_obj(objp);
+    o2 = *objp;
+    o2->base_addr = o1->base_addr;
+    o2->path = o1->path;
+    fill_lines(num_traces, traces, 0, objp, lines, offset);
+}
+#endif
+
+enum
+{
+    DW_TAG_compile_unit = 0x11,
+    DW_TAG_inlined_subroutine = 0x1d,
+    DW_TAG_subprogram = 0x2e,
+};
 
-    munmap(current_line->mapped, current_line->mapped_size);
-    close(current_line->fd);
-    fill_lines(num_traces, traces, syms, 0, current_line, lines);
+/* Attributes encodings */
+enum
+{
+    DW_AT_sibling = 0x01,
+    DW_AT_location = 0x02,
+    DW_AT_name = 0x03,
+    /* Reserved 0x04 */
+    /* Reserved 0x05 */
+    /* Reserved 0x06 */
+    /* Reserved 0x07 */
+    /* Reserved 0x08 */
+    DW_AT_ordering = 0x09,
+    /* Reserved 0x0a */
+    DW_AT_byte_size = 0x0b,
+    /* Reserved 0x0c */
+    DW_AT_bit_size = 0x0d,
+    /* Reserved 0x0e */
+    /* Reserved 0x0f */
+    DW_AT_stmt_list = 0x10,
+    DW_AT_low_pc = 0x11,
+    DW_AT_high_pc = 0x12,
+    DW_AT_language = 0x13,
+    /* Reserved 0x14 */
+    DW_AT_discr = 0x15,
+    DW_AT_discr_value = 0x16,
+    DW_AT_visibility = 0x17,
+    DW_AT_import = 0x18,
+    DW_AT_string_length = 0x19,
+    DW_AT_common_reference = 0x1a,
+    DW_AT_comp_dir = 0x1b,
+    DW_AT_const_value = 0x1c,
+    DW_AT_containing_type = 0x1d,
+    DW_AT_default_value = 0x1e,
+    /* Reserved 0x1f */
+    DW_AT_inline = 0x20,
+    DW_AT_is_optional = 0x21,
+    DW_AT_lower_bound = 0x22,
+    /* Reserved 0x23 */
+    /* Reserved 0x24 */
+    DW_AT_producer = 0x25,
+    /* Reserved 0x26 */
+    DW_AT_prototyped = 0x27,
+    /* Reserved 0x28 */
+    /* Reserved 0x29 */
+    DW_AT_return_addr = 0x2a,
+    /* Reserved 0x2b */
+    DW_AT_start_scope = 0x2c,
+    /* Reserved 0x2d */
+    DW_AT_bit_stride = 0x2e,
+    DW_AT_upper_bound = 0x2f,
+    /* Reserved 0x30 */
+    DW_AT_abstract_origin = 0x31,
+    DW_AT_accessibility = 0x32,
+    DW_AT_address_class = 0x33,
+    DW_AT_artificial = 0x34,
+    DW_AT_base_types = 0x35,
+    DW_AT_calling_convention = 0x36,
+    DW_AT_count = 0x37,
+    DW_AT_data_member_location = 0x38,
+    DW_AT_decl_column = 0x39,
+    DW_AT_decl_file = 0x3a,
+    DW_AT_decl_line = 0x3b,
+    DW_AT_declaration = 0x3c,
+    DW_AT_discr_list = 0x3d,
+    DW_AT_encoding = 0x3e,
+    DW_AT_external = 0x3f,
+    DW_AT_frame_base = 0x40,
+    DW_AT_friend = 0x41,
+    DW_AT_identifier_case = 0x42,
+    /* Reserved 0x43 */
+    DW_AT_namelist_item = 0x44,
+    DW_AT_priority = 0x45,
+    DW_AT_segment = 0x46,
+    DW_AT_specification = 0x47,
+    DW_AT_static_link = 0x48,
+    DW_AT_type = 0x49,
+    DW_AT_use_location = 0x4a,
+    DW_AT_variable_parameter = 0x4b,
+    DW_AT_virtuality = 0x4c,
+    DW_AT_vtable_elem_location = 0x4d,
+    DW_AT_allocated = 0x4e,
+    DW_AT_associated = 0x4f,
+    DW_AT_data_location = 0x50,
+    DW_AT_byte_stride = 0x51,
+    DW_AT_entry_pc = 0x52,
+    DW_AT_use_UTF8 = 0x53,
+    DW_AT_extension = 0x54,
+    DW_AT_ranges = 0x55,
+    DW_AT_trampoline = 0x56,
+    DW_AT_call_column = 0x57,
+    DW_AT_call_file = 0x58,
+    DW_AT_call_line = 0x59,
+    DW_AT_description = 0x5a,
+    DW_AT_binary_scale = 0x5b,
+    DW_AT_decimal_scale = 0x5c,
+    DW_AT_small = 0x5d,
+    DW_AT_decimal_sign = 0x5e,
+    DW_AT_digit_count = 0x5f,
+    DW_AT_picture_string = 0x60,
+    DW_AT_mutable = 0x61,
+    DW_AT_threads_scaled = 0x62,
+    DW_AT_explicit = 0x63,
+    DW_AT_object_pointer = 0x64,
+    DW_AT_endianity = 0x65,
+    DW_AT_elemental = 0x66,
+    DW_AT_pure = 0x67,
+    DW_AT_recursive = 0x68,
+    DW_AT_signature = 0x69,
+    DW_AT_main_subprogram = 0x6a,
+    DW_AT_data_bit_offset = 0x6b,
+    DW_AT_const_expr = 0x6c,
+    DW_AT_enum_class = 0x6d,
+    DW_AT_linkage_name = 0x6e,
+    DW_AT_string_length_bit_size = 0x6f,
+    DW_AT_string_length_byte_size = 0x70,
+    DW_AT_rank = 0x71,
+    DW_AT_str_offsets_base = 0x72,
+    DW_AT_addr_base = 0x73,
+    DW_AT_rnglists_base = 0x74,
+    /* Reserved 0x75 */
+    DW_AT_dwo_name = 0x76,
+    DW_AT_reference = 0x77,
+    DW_AT_rvalue_reference = 0x78,
+    DW_AT_macros = 0x79,
+    DW_AT_call_all_calls = 0x7a,
+    DW_AT_call_all_source_calls = 0x7b,
+    DW_AT_call_all_tail_calls = 0x7c,
+    DW_AT_call_return_pc = 0x7d,
+    DW_AT_call_value = 0x7e,
+    DW_AT_call_origin = 0x7f,
+    DW_AT_call_parameter = 0x80,
+    DW_AT_call_pc = 0x81,
+    DW_AT_call_tail_call = 0x82,
+    DW_AT_call_target = 0x83,
+    DW_AT_call_target_clobbered = 0x84,
+    DW_AT_call_data_location = 0x85,
+    DW_AT_call_data_value = 0x86,
+    DW_AT_noreturn = 0x87,
+    DW_AT_alignment = 0x88,
+    DW_AT_export_symbols = 0x89,
+    DW_AT_deleted = 0x8a,
+    DW_AT_defaulted = 0x8b,
+    DW_AT_loclists_base = 0x8c,
+    DW_AT_lo_user = 0x2000,
+    DW_AT_hi_user = 0x3fff
+};
+
+/* Attribute form encodings */
+enum
+{
+    DW_FORM_addr = 0x01,
+    /* Reserved 0x02 */
+    DW_FORM_block2 = 0x03,
+    DW_FORM_block4 = 0x04,
+    DW_FORM_data2 = 0x05,
+    DW_FORM_data4 = 0x06,
+    DW_FORM_data8 = 0x07,
+    DW_FORM_string = 0x08,
+    DW_FORM_block = 0x09,
+    DW_FORM_block1 = 0x0a,
+    DW_FORM_data1 = 0x0b,
+    DW_FORM_flag = 0x0c,
+    DW_FORM_sdata = 0x0d,
+    DW_FORM_strp = 0x0e,
+    DW_FORM_udata = 0x0f,
+    DW_FORM_ref_addr = 0x10,
+    DW_FORM_ref1 = 0x11,
+    DW_FORM_ref2 = 0x12,
+    DW_FORM_ref4 = 0x13,
+    DW_FORM_ref8 = 0x14,
+    DW_FORM_ref_udata = 0x15,
+    DW_FORM_indirect = 0x16,
+    DW_FORM_sec_offset = 0x17,
+    DW_FORM_exprloc = 0x18,
+    DW_FORM_flag_present = 0x19,
+    DW_FORM_strx = 0x1a,
+    DW_FORM_addrx = 0x1b,
+    DW_FORM_ref_sup4 = 0x1c,
+    DW_FORM_strp_sup = 0x1d,
+    DW_FORM_data16 = 0x1e,
+    DW_FORM_line_strp = 0x1f,
+    DW_FORM_ref_sig8 = 0x20,
+    DW_FORM_implicit_const = 0x21,
+    DW_FORM_loclistx = 0x22,
+    DW_FORM_rnglistx = 0x23,
+    DW_FORM_ref_sup8 = 0x24,
+    DW_FORM_strx1 = 0x25,
+    DW_FORM_strx2 = 0x26,
+    DW_FORM_strx3 = 0x27,
+    DW_FORM_strx4 = 0x28,
+    DW_FORM_addrx1 = 0x29,
+    DW_FORM_addrx2 = 0x2a,
+    DW_FORM_addrx3 = 0x2b,
+    DW_FORM_addrx4 = 0x2c
+};
+
+enum {
+    VAL_none = 0,
+    VAL_cstr = 1,
+    VAL_data = 2,
+    VAL_uint = 3,
+    VAL_int = 4
+};
+
+# define ABBREV_TABLE_SIZE 256
+typedef struct {
+    obj_info_t *obj;
+    char *file;
+    char *current_cu;
+    uint64_t current_low_pc;
+    char *debug_line_cu_end;
+    char *debug_line_files;
+    char *debug_line_directories;
+    char *p;
+    char *cu_end;
+    char *pend;
+    char *q0;
+    char *q;
+    int format; // 4 or 8
+    uint8_t address_size;
+    int level;
+    char *abbrev_table[ABBREV_TABLE_SIZE];
+} DebugInfoReader;
+
+typedef struct {
+    ptrdiff_t pos;
+    int tag;
+    int has_children;
+} DIE;
+
+typedef struct {
+    union {
+        char *ptr;
+        uint64_t uint64;
+        int64_t int64;
+    } as;
+    uint64_t off;
+    uint64_t at;
+    uint64_t form;
+    size_t size;
+    int type;
+} DebugInfoValue;
+
+/* TODO: Big Endian */
+#define MERGE_2INTS(a,b,sz) (((uint64_t)(b)<<sz)|(a))
+
+static uint16_t
+get_uint16(const uint8_t *p)
+{
+    return (uint16_t)MERGE_2INTS(p[0],p[1],8);
+}
+
+static uint32_t
+get_uint32(const uint8_t *p)
+{
+    return (uint32_t)MERGE_2INTS(get_uint16(p),get_uint16(p+2),16);
+}
+
+static uint64_t
+get_uint64(const uint8_t *p)
+{
+    return MERGE_2INTS(get_uint32(p),get_uint32(p+4),32);
+}
+
+static uint8_t
+read_uint8(char **ptr)
+{
+    const unsigned char *p = (const unsigned char *)*ptr;
+    *ptr = (char *)(p + 1);
+    return *p;
+}
+
+static uint16_t
+read_uint16(char **ptr)
+{
+    const unsigned char *p = (const unsigned char *)*ptr;
+    *ptr = (char *)(p + 2);
+    return get_uint16(p);
+}
+
+static uint32_t
+read_uint24(char **ptr)
+{
+    const unsigned char *p = (const unsigned char *)*ptr;
+    *ptr = (char *)(p + 3);
+    return (*p << 16) | get_uint16(p+1);
+}
+
+static uint32_t
+read_uint32(char **ptr)
+{
+    const unsigned char *p = (const unsigned char *)*ptr;
+    *ptr = (char *)(p + 4);
+    return get_uint32(p);
+}
+
+static uint64_t
+read_uint64(char **ptr)
+{
+    const unsigned char *p = (const unsigned char *)*ptr;
+    *ptr = (char *)(p + 8);
+    return get_uint64(p);
+}
+
+static uintptr_t
+read_uintptr(char **ptr)
+{
+    const unsigned char *p = (const unsigned char *)*ptr;
+    *ptr = (char *)(p + SIZEOF_VOIDP);
+#if SIZEOF_VOIDP == 8
+    return get_uint64(p);
+#else
+    return get_uint32(p);
+#endif
+}
+
+static uint64_t
+read_uint(DebugInfoReader *reader)
+{
+    if (reader->format == 4) {
+        return read_uint32(&reader->p);
+    } else { /* 64 bit */
+        return read_uint64(&reader->p);
+    }
+}
+
+static uint64_t
+read_uleb128(DebugInfoReader *reader)
+{
+    return uleb128(&reader->p);
+}
+
+static int64_t
+read_sleb128(DebugInfoReader *reader)
+{
+    return sleb128(&reader->p);
 }
 
-/* read file and fill lines */
 static void
-fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
-	   line_info_t *current_line, line_info_t *lines)
+debug_info_reader_init(DebugInfoReader *reader, obj_info_t *obj)
 {
-    int i;
+    reader->file = obj->mapped;
+    reader->obj = obj;
+    reader->p = obj->debug_info.ptr;
+    reader->pend = obj->debug_info.ptr + obj->debug_info.size;
+    reader->debug_line_cu_end = obj->debug_line.ptr;
+}
+
+static void
+di_read_debug_abbrev_cu(DebugInfoReader *reader)
+{
+    uint64_t prev = 0;
+    char *p = reader->q0;
+    for (;;) {
+        uint64_t abbrev_number = uleb128(&p);
+        if (abbrev_number <= prev) break;
+        if (abbrev_number < ABBREV_TABLE_SIZE) {
+            reader->abbrev_table[abbrev_number] = p;
+        }
+        prev = abbrev_number;
+        uleb128(&p); /* tag */
+        p++; /* has_children */
+        /* skip content */
+        for (;;) {
+            uint64_t at = uleb128(&p);
+            uint64_t form = uleb128(&p);
+            if (!at && !form) break;
+        }
+    }
+}
+
+static int
+di_read_debug_line_cu(DebugInfoReader *reader)
+{
+    const char *p;
+    struct LineNumberProgramHeader header;
+
+    p = (const char *)reader->debug_line_cu_end;
+    if (parse_debug_line_header(&p, &header))
+        return -1;
+
+    reader->debug_line_cu_end = (char *)header.cu_end;
+    reader->debug_line_directories = (char *)header.include_directories;
+    reader->debug_line_files = (char *)header.filenames;
+
+    return 0;
+}
+
+static void
+set_uint_value(DebugInfoValue *v, uint64_t n)
+{
+    v->as.uint64 = n;
+    v->type = VAL_uint;
+}
+
+static void
+set_int_value(DebugInfoValue *v, int64_t n)
+{
+    v->as.int64 = n;
+    v->type = VAL_int;
+}
+
+static void
+set_cstr_value(DebugInfoValue *v, char *s)
+{
+    v->as.ptr = s;
+    v->off = 0;
+    v->type = VAL_cstr;
+}
+
+static void
+set_cstrp_value(DebugInfoValue *v, char *s, uint64_t off)
+{
+    v->as.ptr = s;
+    v->off = off;
+    v->type = VAL_cstr;
+}
+
+static void
+set_data_value(DebugInfoValue *v, char *s)
+{
+    v->as.ptr = s;
+    v->type = VAL_data;
+}
+
+static const char *
+get_cstr_value(DebugInfoValue *v)
+{
+    if (v->as.ptr) {
+        return v->as.ptr + v->off;
+    } else {
+        return NULL;
+    }
+}
+
+static void
+debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoValue *v)
+{
+    switch (form) {
+      case DW_FORM_addr:
+        if (reader->address_size == 4) {
+            set_uint_value(v, read_uint32(&reader->p));
+        } else if (reader->address_size == 8) {
+            set_uint_value(v, read_uint64(&reader->p));
+        } else {
+            fprintf(stderr,"unknown address_size:%d", reader->address_size);
+            abort();
+        }
+        break;
+      case DW_FORM_block2:
+        v->size = read_uint16(&reader->p);
+        set_data_value(v, reader->p);
+        reader->p += v->size;
+        break;
+      case DW_FORM_block4:
+        v->size = read_uint32(&reader->p);
+        set_data_value(v, reader->p);
+        reader->p += v->size;
+        break;
+      case DW_FORM_data2:
+        set_uint_value(v, read_uint16(&reader->p));
+        break;
+      case DW_FORM_data4:
+        set_uint_value(v, read_uint32(&reader->p));
+        break;
+      case DW_FORM_data8:
+        set_uint_value(v, read_uint64(&reader->p));
+        break;
+      case DW_FORM_string:
+        v->size = strlen(reader->p);
+        set_cstr_value(v, reader->p);
+        reader->p += v->size + 1;
+        break;
+      case DW_FORM_block:
+        v->size = uleb128(&reader->p);
+        set_data_value(v, reader->p);
+        reader->p += v->size;
+        break;
+      case DW_FORM_block1:
+        v->size = read_uint8(&reader->p);
+        set_data_value(v, reader->p);
+        reader->p += v->size;
+        break;
+      case DW_FORM_data1:
+        set_uint_value(v, read_uint8(&reader->p));
+        break;
+      case DW_FORM_flag:
+        set_uint_value(v, read_uint8(&reader->p));
+        break;
+      case DW_FORM_sdata:
+        set_int_value(v, read_sleb128(reader));
+        break;
+      case DW_FORM_strp:
+        set_cstrp_value(v, reader->obj->debug_str.ptr, read_uint(reader));
+        break;
+      case DW_FORM_udata:
+        set_uint_value(v, read_uleb128(reader));
+        break;
+      case DW_FORM_ref_addr:
+        if (reader->address_size == 4) {
+            set_uint_value(v, read_uint32(&reader->p));
+        } else if (reader->address_size == 8) {
+            set_uint_value(v, read_uint64(&reader->p));
+        } else {
+            fprintf(stderr,"unknown address_size:%d", reader->address_size);
+            abort();
+        }
+        break;
+      case DW_FORM_ref1:
+        set_uint_value(v, read_uint8(&reader->p));
+        break;
+      case DW_FORM_ref2:
+        set_uint_value(v, read_uint16(&reader->p));
+        break;
+      case DW_FORM_ref4:
+        set_uint_value(v, read_uint32(&reader->p));
+        break;
+      case DW_FORM_ref8:
+        set_uint_value(v, read_uint64(&reader->p));
+        break;
+      case DW_FORM_ref_udata:
+        set_uint_value(v, uleb128(&reader->p));
+        break;
+      case DW_FORM_indirect:
+        /* TODO: read the referred value */
+        set_uint_value(v, uleb128(&reader->p));
+        break;
+      case DW_FORM_sec_offset:
+        set_uint_value(v, read_uint(reader)); /* offset */
+        /* addrptr: debug_addr */
+        /* lineptr: debug_line */
+        /* loclist: debug_loclists */
+        /* loclistptr: debug_loclists */
+        /* macptr: debug_macro */
+        /* rnglist: debug_rnglists */
+        /* rnglistptr: debug_rnglists */
+        /* stroffsetsptr: debug_str_offsets */
+        break;
+      case DW_FORM_exprloc:
+        v->size = (size_t)read_uleb128(reader);
+        set_data_value(v, reader->p);
+        reader->p += v->size;
+        break;
+      case DW_FORM_flag_present:
+        set_uint_value(v, 1);
+        break;
+      case DW_FORM_strx:
+        set_uint_value(v, uleb128(&reader->p));
+        break;
+      case DW_FORM_addrx:
+        /* TODO: read .debug_addr */
+        set_uint_value(v, uleb128(&reader->p));
+        break;
+      case DW_FORM_ref_sup4:
+        set_uint_value(v, read_uint32(&reader->p));
+        break;
+      case DW_FORM_strp_sup:
+        set_uint_value(v, read_uint(reader));
+        /* *p = reader->sup_file + reader->sup_str->sh_offset + ret; */
+        break;
+      case DW_FORM_data16:
+        v->size = 16;
+        set_data_value(v, reader->p);
+        reader->p += v->size;
+        break;
+      case DW_FORM_line_strp:
+        set_uint_value(v, read_uint(reader));
+        /* *p = reader->file + reader->line->sh_offset + ret; */
+        break;
+      case DW_FORM_ref_sig8:
+        set_uint_value(v, read_uint64(&reader->p));
+        break;
+      case DW_FORM_implicit_const:
+        set_int_value(v, sleb128(&reader->q));
+        break;
+      case DW_FORM_loclistx:
+        set_uint_value(v, read_uleb128(reader));
+        break;
+      case DW_FORM_rnglistx:
+        set_uint_value(v, read_uleb128(reader));
+        break;
+      case DW_FORM_ref_sup8:
+        set_uint_value(v, read_uint64(&reader->p));
+        break;
+      case DW_FORM_strx1:
+        set_uint_value(v, read_uint8(&reader->p));
+        break;
+      case DW_FORM_strx2:
+        set_uint_value(v, read_uint16(&reader->p));
+        break;
+      case DW_FORM_strx3:
+        set_uint_value(v, read_uint24(&reader->p));
+        break;
+      case DW_FORM_strx4:
+        set_uint_value(v, read_uint32(&reader->p));
+        break;
+      case DW_FORM_addrx1:
+        set_uint_value(v, read_uint8(&reader->p));
+        break;
+      case DW_FORM_addrx2:
+        set_uint_value(v, read_uint16(&reader->p));
+        break;
+      case DW_FORM_addrx3:
+        set_uint_value(v, read_uint24(&reader->p));
+        break;
+      case DW_FORM_addrx4:
+        set_uint_value(v, read_uint32(&reader->p));
+        break;
+      case 0:
+        goto fail;
+        break;
+    }
+    return;
+
+  fail:
+    fprintf(stderr, "%d: unsupported form: %#"PRIx64"\n", __LINE__, form);
+    exit(1);
+}
+
+/* find abbrev in current compilation unit */
+static char *
+di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number)
+{
+    char *p;
+    if (abbrev_number < ABBREV_TABLE_SIZE) {
+        return reader->abbrev_table[abbrev_number];
+    }
+    p = reader->abbrev_table[ABBREV_TABLE_SIZE-1];
+    /* skip 255th record */
+    uleb128(&p); /* tag */
+    p++; /* has_children */
+    /* skip content */
+    for (;;) {
+        uint64_t at = uleb128(&p);
+        uint64_t form = uleb128(&p);
+        if (!at && !form) break;
+    }
+    for (uint64_t n = uleb128(&p); abbrev_number != n; n = uleb128(&p)) {
+        if (n == 0) {
+            fprintf(stderr,"%d: Abbrev Number %"PRId64" not found\n",__LINE__, abbrev_number);
+            exit(1);
+        }
+        uleb128(&p); /* tag */
+        p++; /* has_children */
+        /* skip content */
+        for (;;) {
+            uint64_t at = uleb128(&p);
+            uint64_t form = uleb128(&p);
+            if (!at && !form) break;
+        }
+    }
+    return p;
+}
+
+#if 0
+static void
+hexdump0(const unsigned char *p, size_t n)
+{
+    size_t i;
+    fprintf(stderr, "     0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F\n");
+    for (i=0; i < n; i++){
+        switch (i & 15) {
+          case 0:
+            fprintf(stderr, "%02zd: %02X ", i/16, p[i]);
+            break;
+          case 15:
+            fprintf(stderr, "%02X\n", p[i]);
+            break;
+          default:
+            fprintf(stderr, "%02X ", p[i]);
+            break;
+        }
+    }
+    if ((i & 15) != 15) {
+        fprintf(stderr, "\n");
+    }
+}
+#define hexdump(p,n) hexdump0((const unsigned char *)p, n)
+
+static void
+div_inspect(DebugInfoValue *v)
+{
+    switch (v->type) {
+      case VAL_uint:
+        fprintf(stderr,"%d: type:%d size:%zx v:%lx\n",__LINE__,v->type,v->size,v->as.uint64);
+        break;
+      case VAL_int:
+        fprintf(stderr,"%d: type:%d size:%zx v:%ld\n",__LINE__,v->type,v->size,(int64_t)v->as.uint64);
+        break;
+      case VAL_cstr:
+        fprintf(stderr,"%d: type:%d size:%zx v:'%s'\n",__LINE__,v->type,v->size,v->as.ptr);
+        break;
+      case VAL_data:
+        fprintf(stderr,"%d: type:%d size:%zx v:\n",__LINE__,v->type,v->size);
+        hexdump(v->as.ptr, 16);
+        break;
+    }
+}
+#endif
+
+static DIE *
+di_read_die(DebugInfoReader *reader, DIE *die)
+{
+    uint64_t abbrev_number = uleb128(&reader->p);
+    if (abbrev_number == 0) {
+        reader->level--;
+        return NULL;
+    }
+
+    reader->q = di_find_abbrev(reader, abbrev_number);
+
+    die->pos = reader->p - reader->obj->debug_info.ptr - 1;
+    die->tag = (int)uleb128(&reader->q); /* tag */
+    die->has_children = *reader->q++; /* has_children */
+    if (die->has_children) {
+        reader->level++;
+    }
+    return die;
+}
+
+static DebugInfoValue *
+di_read_record(DebugInfoReader *reader, DebugInfoValue *vp)
+{
+    uint64_t at = uleb128(&reader->q);
+    uint64_t form = uleb128(&reader->q);
+    if (!at || !form) return NULL;
+    vp->at = at;
+    vp->form = form;
+    debug_info_reader_read_value(reader, form, vp);
+    return vp;
+}
+
+static void
+di_skip_records(DebugInfoReader *reader)
+{
+    for (;;) {
+        DebugInfoValue v = {{}};
+        uint64_t at = uleb128(&reader->q);
+        uint64_t form = uleb128(&reader->q);
+        if (!at || !form) return;
+        debug_info_reader_read_value(reader, form, &v);
+    }
+}
+
+typedef struct {
+    uint64_t low_pc;
+    uint64_t high_pc;
+    uint64_t ranges;
+    bool low_pc_set;
+    bool high_pc_set;
+    bool ranges_set;
+} ranges_t;
+
+static void
+ranges_set(ranges_t *ptr, DebugInfoValue *v)
+{
+    switch (v->at) {
+      case DW_AT_low_pc:
+        ptr->low_pc = v->as.uint64;
+        ptr->low_pc_set = true;
+        break;
+      case DW_AT_high_pc:
+        if (v->form == DW_FORM_addr) {
+            ptr->high_pc = v->as.uint64;
+        }
+        else {
+            ptr->high_pc = ptr->low_pc + v->as.uint64;
+        }
+        ptr->high_pc_set = true;
+        break;
+      case DW_AT_ranges:
+        ptr->ranges = v->as.uint64;
+        ptr->ranges_set = true;
+        break;
+    }
+}
+
+static uintptr_t
+ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr)
+{
+    if (ptr->high_pc_set) {
+        if (ptr->ranges_set || !ptr->low_pc_set) {
+            exit(1);
+        }
+        if (ptr->low_pc <= addr && addr <= ptr->high_pc) {
+            return (uintptr_t)ptr->low_pc;
+        }
+    }
+    else if (ptr->ranges_set) {
+        /* TODO: support base address selection entry */
+        char *p = reader->obj->debug_ranges.ptr + ptr->ranges;
+        uint64_t base = ptr->low_pc_set ? ptr->low_pc : reader->current_low_pc;
+        for (;;) {
+            uintptr_t from = read_uintptr(&p);
+            uintptr_t to = read_uintptr(&p);
+            if (!from && !to) break;
+            if (from == UINTPTR_MAX) {
+                /* base address selection entry */
+                base = to;
+            }
+            else if (base + from <= addr && addr < base + to) {
+                return from;
+            }
+        }
+    }
+    else if (ptr->low_pc_set) {
+        if (ptr->low_pc == addr) {
+            return (uintptr_t)ptr->low_pc;
+        }
+    }
+    return false;
+}
+
+#if 0
+static void
+ranges_inspect(DebugInfoReader *reader, ranges_t *ptr)
+{
+    if (ptr->high_pc_set) {
+        if (ptr->ranges_set || !ptr->low_pc_set) {
+            fprintf(stderr,"low_pc_set:%d high_pc_set:%d ranges_set:%d\n",ptr->low_pc_set,ptr->high_pc_set,ptr->ranges_set);
+            exit(1);
+        }
+        fprintf(stderr,"low_pc:%"PRIx64" high_pc:%"PRIx64"\n",ptr->low_pc,ptr->high_pc);
+    }
+    else if (ptr->ranges_set) {
+        char *p = reader->obj->debug_ranges.ptr + ptr->ranges;
+        fprintf(stderr,"low_pc:%"PRIx64" ranges:%"PRIx64" %lx ",ptr->low_pc,ptr->ranges, p-reader->obj->mapped);
+        for (;;) {
+            uintptr_t from = read_uintptr(&p);
+            uintptr_t to = read_uintptr(&p);
+            if (!from && !to) break;
+            fprintf(stderr,"%"PRIx64"-%"PRIx64" ",ptr->low_pc+from,ptr->low_pc+to);
+        }
+        fprintf(stderr,"\n");
+    }
+    else if (ptr->low_pc_set) {
+        fprintf(stderr,"low_pc:%"PRIx64"\n",ptr->low_pc);
+    }
+    else {
+        fprintf(stderr,"empty\n");
+    }
+}
+#endif
+
+static int
+di_read_cu(DebugInfoReader *reader)
+{
+    uint64_t unit_length;
+    uint16_t version;
+    uint64_t debug_abbrev_offset;
+    reader->format = 4;
+    reader->current_cu = reader->p;
+    unit_length = read_uint32(&reader->p);
+    if (unit_length == 0xffffffff) {
+        unit_length = read_uint64(&reader->p);
+        reader->format = 8;
+    }
+    reader->cu_end = reader->p + unit_length;
+    version = read_uint16(&reader->p);
+    if (version > 5) {
+        return -1;
+    }
+    else if (version == 5) {
+        /* unit_type = */ read_uint8(&reader->p);
+        reader->address_size = read_uint8(&reader->p);
+        debug_abbrev_offset = read_uint(reader);
+    }
+    else {
+        debug_abbrev_offset = read_uint(reader);
+        reader->address_size = read_uint8(&reader->p);
+    }
+    reader->q0 = reader->obj->debug_abbrev.ptr + debug_abbrev_offset;
+
+    reader->level = 0;
+    di_read_debug_abbrev_cu(reader);
+    if (di_read_debug_line_cu(reader)) return -1;
+
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER_BUILD_DATE)
+    /* Though DWARF specifies "the applicable base address defaults to the base
+       address of the compilation unit", but GCC seems to use zero as default */
+#else
+    do {
+        DIE die;
+
+        if (!di_read_die(reader, &die)) continue;
+
+        if (die.tag != DW_TAG_compile_unit) {
+            di_skip_records(reader);
+            break;
+        }
+
+        /* enumerate abbrev */
+        for (;;) {
+            DebugInfoValue v = {{}};
+            if (!di_read_record(reader, &v)) break;
+            switch (v.at) {
+              case DW_AT_low_pc:
+                reader->current_low_pc = v.as.uint64;
+                break;
+            }
+        }
+    } while (0);
+#endif
+    return 0;
+}
+
+static void
+read_abstract_origin(DebugInfoReader *reader, uint64_t abstract_origin, line_info_t *line)
+{
+    char *p = reader->p;
+    char *q = reader->q;
+    int level = reader->level;
+    DIE die;
+
+    reader->p = reader->current_cu + abstract_origin;
+    if (!di_read_die(reader, &die)) goto finish;
+
+    /* enumerate abbrev */
+    for (;;) {
+        DebugInfoValue v = {{}};
+        if (!di_read_record(reader, &v)) break;
+        switch (v.at) {
+          case DW_AT_name:
+            line->sname = get_cstr_value(&v);
+            break;
+        }
+    }
+
+  finish:
+    reader->p = p;
+    reader->q = q;
+    reader->level = level;
+}
+
+static void
+debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
+         line_info_t *lines, int offset) {
+    while (reader->p < reader->cu_end) {
+        DIE die;
+        ranges_t ranges = {};
+        line_info_t line = {};
+
+        if (!di_read_die(reader, &die)) continue;
+        /* fprintf(stderr,"%d:%tx: <%d>\n",__LINE__,die.pos,reader->level,die.tag); */
+
+        if (die.tag != DW_TAG_subprogram && die.tag != DW_TAG_inlined_subroutine) {
+          skip_die:
+            di_skip_records(reader);
+            continue;
+        }
+
+        /* enumerate abbrev */
+        for (;;) {
+            DebugInfoValue v = {{}};
+            /* ptrdiff_t pos = reader->p - reader->p0; */
+            if (!di_read_record(reader, &v)) break;
+            /* fprintf(stderr,"\n%d:%tx: AT:%lx FORM:%lx\n",__LINE__,pos,v.at,v.form); */
+            /* div_inspect(&v); */
+            switch (v.at) {
+              case DW_AT_name:
+                line.sname = get_cstr_value(&v);
+                break;
+              case DW_AT_call_file:
+                fill_filename((int)v.as.uint64, reader->debug_line_directories, reader->debug_line_files, &line, reader->obj);
+                break;
+              case DW_AT_call_line:
+                line.line = (int)v.as.uint64;
+                break;
+              case DW_AT_low_pc:
+              case DW_AT_high_pc:
+              case DW_AT_ranges:
+                ranges_set(&ranges, &v);
+                break;
+              case DW_AT_declaration:
+                goto skip_die;
+              case DW_AT_inline:
+                /* 1 or 3 */
+                break; /* goto skip_die; */
+              case DW_AT_abstract_origin:
+                read_abstract_origin(reader, v.as.uint64, &line);
+                break; /* goto skip_die; */
+            }
+        }
+        /* ranges_inspect(reader, &ranges); */
+        /* fprintf(stderr,"%d:%tx: %x ",__LINE__,diepos,die.tag); */
+        for (int i=offset; i < num_traces; i++) {
+            uintptr_t addr = (uintptr_t)traces[i];
+            uintptr_t offset = addr - reader->obj->base_addr + reader->obj->vmaddr;
+            uintptr_t saddr = ranges_include(reader, &ranges, offset);
+            if (saddr) {
+                /* fprintf(stderr, "%d:%tx: %d %lx->%lx %x %s: %s/%s %d %s %s %s\n",__LINE__,die.pos, i,addr,offset, die.tag,line.sname,line.dirname,line.filename,line.line,reader->obj->path,line.sname,lines[i].sname); */
+                if (lines[i].sname) {
+                    line_info_t *lp = malloc(sizeof(line_info_t));
+                    memcpy(lp, &lines[i], sizeof(line_info_t));
+                    lines[i].next = lp;
+                    lp->dirname = line.dirname;
+                    lp->filename = line.filename;
+                    lp->line = line.line;
+                    lp->saddr = 0;
+                }
+                lines[i].path = reader->obj->path;
+                lines[i].base_addr = line.base_addr;
+                lines[i].sname = line.sname;
+                lines[i].saddr = saddr + reader->obj->base_addr - reader->obj->vmaddr;
+            }
+        }
+    }
+}
+
+#ifdef USE_ELF
+static unsigned long
+uncompress_debug_section(ElfW(Shdr) *shdr, char *file, char **ptr)
+{
+#ifdef SUPPORT_COMPRESSED_DEBUG_LINE
+    ElfW(Chdr) *chdr = (ElfW(Chdr) *)(file + shdr->sh_offset);
+    unsigned long destsize = chdr->ch_size;
+    int ret = 0;
+
+    if (chdr->ch_type != ELFCOMPRESS_ZLIB) {
+	/* unsupported compression type */
+	return 0;
+    }
+
+    *ptr = malloc(destsize);
+    if (!*ptr) return 0;
+    ret = uncompress((Bytef *)*ptr, &destsize,
+	    (const Bytef*)chdr + sizeof(ElfW(Chdr)),
+            shdr->sh_size - sizeof(ElfW(Chdr)));
+    if (ret != Z_OK) goto fail;
+    return destsize;
+
+fail:
+    free(*ptr);
+#endif
+    return 0;
+}
+
+/* read file and fill lines */
+static uintptr_t
+fill_lines(int num_traces, void **traces, int check_debuglink,
+	   obj_info_t **objp, line_info_t *lines, int offset)
+{
+    int i, j;
     char *shstr;
-    char *section_name;
     ElfW(Ehdr) *ehdr;
     ElfW(Shdr) *shdr, *shstr_shdr;
-    ElfW(Shdr) *debug_line_shdr = NULL, *gnu_debuglink_shdr = NULL;
+    ElfW(Shdr) *gnu_debuglink_shdr = NULL;
     int fd;
     off_t filesize;
     char *file;
+    ElfW(Shdr) *symtab_shdr = NULL, *strtab_shdr = NULL;
+    ElfW(Shdr) *dynsym_shdr = NULL, *dynstr_shdr = NULL;
+    obj_info_t *obj = *objp;
+    uintptr_t dladdr_fbase = 0;
 
     fd = open(binary_filename, O_RDONLY);
     if (fd < 0) {
-	return;
+	goto fail;
     }
     filesize = lseek(fd, 0, SEEK_END);
     if (filesize < 0) {
 	int e = errno;
 	close(fd);
-	fprintf(stderr, "lseek: %s\n", strerror(e));
-	return;
+	kprintf("lseek: %s\n", strerror(e));
+	goto fail;
     }
+#if SIZEOF_OFF_T > SIZEOF_SIZE_T
+    if (filesize > (off_t)SIZE_MAX) {
+	close(fd);
+	kprintf("Too large file %s\n", binary_filename);
+	goto fail;
+    }
+#endif
     lseek(fd, 0, SEEK_SET);
     /* async-signal unsafe */
-    file = (char *)mmap(NULL, filesize, PROT_READ, MAP_SHARED, fd, 0);
+    file = (char *)mmap(NULL, (size_t)filesize, PROT_READ, MAP_SHARED, fd, 0);
     if (file == MAP_FAILED) {
 	int e = errno;
 	close(fd);
-	fprintf(stderr, "mmap: %s\n", strerror(e));
-	return;
+	kprintf("mmap: %s\n", strerror(e));
+	goto fail;
     }
+    close(fd);
 
-    current_line->fd = fd;
-    current_line->mapped = file;
-    current_line->mapped_size = filesize;
-
-    for (i = 0; i < num_traces; i++) {
-	const char *path;
-	size_t len;
-	if (get_path_from_symbol(syms[i], &path, &len) &&
-		!strncmp(path, binary_filename, len)) {
-	    lines[i].line = -1;
-	}
+    ehdr = (ElfW(Ehdr) *)file;
+    if (memcmp(ehdr->e_ident, "\177ELF", 4) != 0) {
+	/*
+	 * Huh? Maybe filename was overridden by setproctitle() and
+	 * it match non-elf file.
+	 */
+	goto fail;
     }
+    obj->mapped = file;
+    obj->mapped_size = (size_t)filesize;
 
-    ehdr = (ElfW(Ehdr) *)file;
     shdr = (ElfW(Shdr) *)(file + ehdr->e_shoff);
 
     shstr_shdr = shdr + ehdr->e_shstrndx;
     shstr = file + shstr_shdr->sh_offset;
 
     for (i = 0; i < ehdr->e_shnum; i++) {
-	section_name = shstr + shdr[i].sh_name;
-	if (!strcmp(section_name, ".debug_line")) {
-	    debug_line_shdr = shdr + i;
+        char *section_name = shstr + shdr[i].sh_name;
+	switch (shdr[i].sh_type) {
+	  case SHT_STRTAB:
+	    if (!strcmp(section_name, ".strtab")) {
+		strtab_shdr = shdr + i;
+	    }
+	    else if (!strcmp(section_name, ".dynstr")) {
+		dynstr_shdr = shdr + i;
+	    }
+	    break;
+	  case SHT_SYMTAB:
+	    /* if (!strcmp(section_name, ".symtab")) */
+	    symtab_shdr = shdr + i;
+	    break;
+	  case SHT_DYNSYM:
+	    /* if (!strcmp(section_name, ".dynsym")) */
+	    dynsym_shdr = shdr + i;
 	    break;
-	} else if (!strcmp(section_name, ".gnu_debuglink")) {
-	    gnu_debuglink_shdr = shdr + i;
+	  case SHT_PROGBITS:
+	    if (!strcmp(section_name, ".gnu_debuglink")) {
+		gnu_debuglink_shdr = shdr + i;
+	    }
+            else {
+                const char *debug_section_names[] = {
+                    ".debug_abbrev",
+                    ".debug_info",
+                    ".debug_line",
+                    ".debug_ranges",
+                    ".debug_str"
+                };
+
+                for (j=0; j < DWARF_SECTION_COUNT; j++) {
+                    struct dwarf_section *s = obj_dwarf_section_at(obj, j);
+
+                    if (strcmp(section_name, debug_section_names[j]) != 0)
+                        continue;
+
+                    s->ptr = file + shdr[i].sh_offset;
+                    s->size = shdr[i].sh_size;
+                    s->flags = shdr[i].sh_flags;
+                    if (s->flags & SHF_COMPRESSED) {
+                        s->size = uncompress_debug_section(&shdr[i], file, &s->ptr);
+                        if (!s->size) goto fail;
+                    }
+                    break;
+                }
+            }
+	    break;
+	}
+    }
+
+    if (offset == -1) {
+	/* main executable */
+	offset = 0;
+	if (dynsym_shdr && dynstr_shdr) {
+	    char *strtab = file + dynstr_shdr->sh_offset;
+	    ElfW(Sym) *symtab = (ElfW(Sym) *)(file + dynsym_shdr->sh_offset);
+	    int symtab_count = (int)(dynsym_shdr->sh_size / sizeof(ElfW(Sym)));
+            void *handle = dlopen(NULL, RTLD_NOW|RTLD_LOCAL);
+            if (handle) {
+                for (j = 0; j < symtab_count; j++) {
+                    ElfW(Sym) *sym = &symtab[j];
+                    Dl_info info;
+                    void *s;
+                    if (ELF_ST_TYPE(sym->st_info) != STT_FUNC || sym->st_size == 0) continue;
+                    s = dlsym(handle, strtab + sym->st_name);
+                    if (s && dladdr(s, &info)) {
+                        obj->base_addr = dladdr_fbase;
+                        dladdr_fbase = (uintptr_t)info.dli_fbase;
+                        break;
+                    }
+                }
+                dlclose(handle);
+            }
+	    if (ehdr->e_type == ET_EXEC) {
+		obj->base_addr = 0;
+	    }
+	    else {
+		/* PIE (position-independent executable) */
+		obj->base_addr = dladdr_fbase;
+	    }
 	}
     }
 
-    if (!debug_line_shdr) {
+    if (obj->debug_info.ptr && obj->debug_abbrev.ptr) {
+        DebugInfoReader reader;
+        debug_info_reader_init(&reader, obj);
+        i = 0;
+        while (reader.p < reader.pend) {
+            /* fprintf(stderr, "%d:%tx: CU[%d]\n", __LINE__, reader.p - reader.obj->debug_info.ptr, i++); */
+            if (di_read_cu(&reader)) goto use_symtab;
+            debug_info_read(&reader, num_traces, traces, lines, offset);
+        }
+    }
+    else {
+        /* This file doesn't have dwarf, use symtab or dynsym */
+use_symtab:
+        if (!symtab_shdr) {
+            /* This file doesn't have symtab, use dynsym instead */
+            symtab_shdr = dynsym_shdr;
+            strtab_shdr = dynstr_shdr;
+        }
+
+        if (symtab_shdr && strtab_shdr) {
+            char *strtab = file + strtab_shdr->sh_offset;
+            ElfW(Sym) *symtab = (ElfW(Sym) *)(file + symtab_shdr->sh_offset);
+            int symtab_count = (int)(symtab_shdr->sh_size / sizeof(ElfW(Sym)));
+            for (j = 0; j < symtab_count; j++) {
+                ElfW(Sym) *sym = &symtab[j];
+                uintptr_t saddr = (uintptr_t)sym->st_value + obj->base_addr;
+                if (ELF_ST_TYPE(sym->st_info) != STT_FUNC) continue;
+                for (i = offset; i < num_traces; i++) {
+                    uintptr_t d = (uintptr_t)traces[i] - saddr;
+                    if (lines[i].line > 0 || d > (uintptr_t)sym->st_size)
+                        continue;
+                    /* fill symbol name and addr from .symtab */
+                    if (!lines[i].sname) lines[i].sname = strtab + sym->st_name;
+                    lines[i].saddr = saddr;
+                    lines[i].path  = obj->path;
+                    lines[i].base_addr = obj->base_addr;
+                }
+            }
+        }
+    }
+
+    if (!obj->debug_line.ptr) {
 	/* This file doesn't have .debug_line section,
 	   let's check .gnu_debuglink section instead. */
 	if (gnu_debuglink_shdr && check_debuglink) {
 	    follow_debuglink(file + gnu_debuglink_shdr->sh_offset,
-			     num_traces, traces, syms,
-			     current_line, lines);
+			     num_traces, traces,
+			     objp, lines, offset);
 	}
-	return;
+	goto finish;
     }
 
-    parse_debug_line(num_traces, traces,
-		     file + debug_line_shdr->sh_offset,
-		     debug_line_shdr->sh_size,
-		     lines);
+    if (parse_debug_line(num_traces, traces,
+            obj->debug_line.ptr,
+            obj->debug_line.size,
+            obj, lines, offset) == -1)
+        goto fail;
+
+finish:
+    return dladdr_fbase;
+fail:
+    return (uintptr_t)-1;
 }
+#else /* Mach-O */
+/* read file and fill lines */
+static uintptr_t
+fill_lines(int num_traces, void **traces, int check_debuglink,
+        obj_info_t **objp, line_info_t *lines, int offset)
+{
+# ifdef __LP64__
+#  define LP(x) x##_64
+# else
+#  define LP(x) x
+# endif
+    int fd;
+    off_t filesize;
+    char *file, *p = NULL;
+    obj_info_t *obj = *objp;
+    struct LP(mach_header) *header;
+    uintptr_t dladdr_fbase = 0;
+
+    {
+        char *s = binary_filename;
+        char *base = strrchr(binary_filename, '/')+1;
+        size_t max = PATH_MAX;
+        size_t size = strlen(binary_filename);
+        size_t basesize = size - (base - binary_filename);
+        s += size;
+        max -= size;
+        p = s;
+        size = strlcpy(s, ".dSYM/Contents/Resources/DWARF/", max);
+        if (size == 0) goto fail;
+        s += size;
+        max -= size;
+        if (max <= basesize) goto fail;
+        memcpy(s, base, basesize);
+        s[basesize] = 0;
+
+        fd = open(binary_filename, O_RDONLY);
+        if (fd < 0) {
+            *p = 0; /* binary_filename becomes original file name */
+            fd = open(binary_filename, O_RDONLY);
+            if (fd < 0) {
+                goto fail;
+            }
+        }
+    }
 
-#ifdef HAVE_DL_ITERATE_PHDR
+    filesize = lseek(fd, 0, SEEK_END);
+    if (filesize < 0) {
+        int e = errno;
+        close(fd);
+        kprintf("lseek: %s\n", strerror(e));
+        goto fail;
+    }
+#if SIZEOF_OFF_T > SIZEOF_SIZE_T
+    if (filesize > (off_t)SIZE_MAX) {
+        close(fd);
+        kprintf("Too large file %s\n", binary_filename);
+        goto fail;
+    }
+#endif
+    lseek(fd, 0, SEEK_SET);
+    /* async-signal unsafe */
+    file = (char *)mmap(NULL, (size_t)filesize, PROT_READ, MAP_SHARED, fd, 0);
+    if (file == MAP_FAILED) {
+        int e = errno;
+        close(fd);
+        kprintf("mmap: %s\n", strerror(e));
+        goto fail;
+    }
+    close(fd);
 
-typedef struct {
-    int num_traces;
-    char **syms;
-    line_info_t *lines;
-} fill_base_addr_state_t;
+    obj->mapped = file;
+    obj->mapped_size = (size_t)filesize;
 
-static int
-fill_base_addr(struct dl_phdr_info *info, size_t size, void *data)
+    header = (struct LP(mach_header) *)file;
+    if (header->magic == LP(MH_MAGIC)) {
+        /* non universal binary */
+        p = file;
+    }
+    else if (header->magic == FAT_CIGAM) {
+        struct LP(mach_header) *mhp = _NSGetMachExecuteHeader();
+        struct fat_header *fat = (struct fat_header *)file;
+        char *q = file + sizeof(*fat);
+        uint32_t nfat_arch = __builtin_bswap32(fat->nfat_arch);
+        /* fprintf(stderr,"%d: fat:%s %d\n",__LINE__, binary_filename,nfat_arch); */
+        for (uint32_t i = 0; i < nfat_arch; i++) {
+            struct fat_arch *arch = (struct fat_arch *)q;
+            cpu_type_t cputype = __builtin_bswap32(arch->cputype);
+            cpu_subtype_t cpusubtype = __builtin_bswap32(arch->cpusubtype);
+            uint32_t offset = __builtin_bswap32(arch->offset);
+            /* fprintf(stderr,"%d: fat %d %x/%x %x/%x\n",__LINE__, i, mhp->cputype,mhp->cpusubtype, cputype,cpusubtype); */
+            if (mhp->cputype == cputype &&
+                    (cpu_subtype_t)(mhp->cpusubtype & ~CPU_SUBTYPE_MASK) == cpusubtype) {
+                p = file + offset;
+                file = p;
+                header = (struct LP(mach_header) *)p;
+                if (header->magic == LP(MH_MAGIC)) {
+                    goto found_mach_header;
+                }
+                break;
+            }
+            q += sizeof(*arch);
+        }
+        kprintf("'%s' is not a Mach-O universal binary file!\n",binary_filename);
+        close(fd);
+        goto fail;
+    }
+    else {
+        kprintf("'%s' is not a "
+# ifdef __LP64__
+                "64"
+# else
+                "32"
+# endif
+                "-bit Mach-O file!\n",binary_filename);
+        close(fd);
+        goto fail;
+    }
+found_mach_header:
+    p += sizeof(*header);
+
+    for (uint32_t i = 0; i < (uint32_t)header->ncmds; i++) {
+        struct load_command *lcmd = (struct load_command *)p;
+        switch (lcmd->cmd) {
+          case LP(LC_SEGMENT):
+            {
+                static const char *debug_section_names[] = {
+                    "__debug_abbrev",
+                    "__debug_info",
+                    "__debug_line",
+                    "__debug_ranges",
+                    "__debug_str"
+                };
+                struct LP(segment_command) *scmd = (struct LP(segment_command) *)lcmd;
+                if (strcmp(scmd->segname, "__TEXT") == 0) {
+                    obj->vmaddr = scmd->vmaddr;
+                }
+                else if (strcmp(scmd->segname, "__DWARF") == 0) {
+                    p += sizeof(struct LP(segment_command));
+                    for (uint64_t i = 0; i < scmd->nsects; i++) {
+                        struct LP(section) *sect = (struct LP(section) *)p;
+                        p += sizeof(struct LP(section));
+                        for (int j=0; j < DWARF_SECTION_COUNT; j++) {
+                            struct dwarf_section *s = obj_dwarf_section_at(obj, j);
+
+                            if (strcmp(sect->sectname, debug_section_names[j]) != 0)
+                                continue;
+
+                            s->ptr = file + sect->offset;
+                            s->size = sect->size;
+                            s->flags = sect->flags;
+                            if (s->flags & SHF_COMPRESSED) {
+                                goto fail;
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+            break;
+
+          case LC_SYMTAB:
+            {
+                struct symtab_command *cmd = (struct symtab_command *)lcmd;
+                struct LP(nlist) *nl = (struct LP(nlist) *)(file + cmd->symoff);
+                char *strtab = file + cmd->stroff, *sname = 0;
+                uint32_t j;
+                uintptr_t saddr = 0;
+                /* kprintf("[%2d]: %x/symtab %p\n", i, cmd->cmd, p); */
+                for (j = 0; j < cmd->nsyms; j++) {
+                    uintptr_t symsize, d;
+                    struct LP(nlist) *e = &nl[j];
+                        /* kprintf("[%2d][%4d]: %02x/%x/%x: %s %llx\n", i, j, e->n_type,e->n_sect,e->n_desc,strtab+e->n_un.n_strx,e->n_value); */
+                    if (e->n_type != N_FUN) continue;
+                    if (e->n_sect) {
+                        saddr = (uintptr_t)e->n_value + obj->base_addr - obj->vmaddr;
+                        sname = strtab + e->n_un.n_strx;
+                        /* kprintf("[%2d][%4d]: %02x/%x/%x: %s %llx\n", i, j, e->n_type,e->n_sect,e->n_desc,strtab+e->n_un.n_strx,e->n_value); */
+                        continue;
+                    }
+                    for (int k = offset; k < num_traces; k++) {
+                        d = (uintptr_t)traces[k] - saddr;
+                        symsize = e->n_value;
+                        /* kprintf("%lx %lx %lx\n",saddr,symsize,traces[k]); */
+                        if (lines[k].line > 0 || d > (uintptr_t)symsize)
+                            continue;
+                        /* fill symbol name and addr from .symtab */
+                        if (!lines[k].sname) lines[k].sname = sname;
+                        lines[k].saddr = saddr;
+                        lines[k].path  = obj->path;
+                        lines[k].base_addr = obj->base_addr;
+                    }
+                }
+            }
+        }
+        p += lcmd->cmdsize;
+    }
+
+    if (obj->debug_info.ptr && obj->debug_abbrev.ptr) {
+        DebugInfoReader reader;
+        debug_info_reader_init(&reader, obj);
+        while (reader.p < reader.pend) {
+            if (di_read_cu(&reader)) goto fail;
+            debug_info_read(&reader, num_traces, traces, lines, offset);
+        }
+    }
+
+    if (parse_debug_line(num_traces, traces,
+            obj->debug_line.ptr,
+            obj->debug_line.size,
+            obj, lines, offset) == -1)
+        goto fail;
+
+    return dladdr_fbase;
+fail:
+    return (uintptr_t)-1;
+}
+#endif
+
+#define HAVE_MAIN_EXE_PATH
+#if defined(__FreeBSD__)
+# include <sys/sysctl.h>
+#endif
+/* ssize_t main_exe_path(void)
+ *
+ * store the path of the main executable to `binary_filename`,
+ * and returns strlen(binary_filename).
+ * it is NUL terminated.
+ */
+#if defined(__linux__)
+static ssize_t
+main_exe_path(void)
 {
-    int i;
-    fill_base_addr_state_t *st = (fill_base_addr_state_t *)data;
-    for (i = 0; i < st->num_traces; i++) {
-	const char *path;
-	size_t len;
-	size_t name_len = strlen(info->dlpi_name);
-
-	if (get_path_from_symbol(st->syms[i], &path, &len) &&
-		(len == name_len || (len > name_len && path[len-name_len-1] == '/')) &&
-		!strncmp(path+len-name_len, info->dlpi_name, name_len)) {
-	    st->lines[i].base_addr = info->dlpi_addr;
-	}
+# define PROC_SELF_EXE "/proc/self/exe"
+    ssize_t len = readlink(PROC_SELF_EXE, binary_filename, PATH_MAX);
+    if (len < 0) return 0;
+    binary_filename[len] = 0;
+    return len;
+}
+#elif defined(__FreeBSD__)
+static ssize_t
+main_exe_path(void)
+{
+    int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
+    size_t len = PATH_MAX;
+    int err = sysctl(mib, 4, binary_filename, &len, NULL, 0);
+    if (err) {
+	kprintf("Can't get the path of ruby");
+	return -1;
     }
-    return 0;
+    len--; /* sysctl sets strlen+1 */
+    return len;
+}
+#elif defined(HAVE_LIBPROC_H)
+static ssize_t
+main_exe_path(void)
+{
+    int len = proc_pidpath(getpid(), binary_filename, PATH_MAX);
+    if (len == 0) return 0;
+    binary_filename[len] = 0;
+    return len;
 }
+#else
+#undef HAVE_MAIN_EXE_PATH
+#endif
 
-#endif /* HAVE_DL_ITERATE_PHDR */
+static void
+print_line0(line_info_t *line, void *address)
+{
+    uintptr_t addr = (uintptr_t)address;
+    uintptr_t d = addr - line->saddr;
+    if (!address) {
+        /* inlined */
+        if (line->dirname && line->dirname[0]) {
+            kprintf("%s(%s) %s/%s:%d\n", line->path, line->sname, line->dirname, line->filename, line->line);
+        }
+        else {
+            kprintf("%s(%s) %s:%d\n", line->path, line->sname, line->filename, line->line);
+        }
+    }
+    else if (!line->path) {
+        kprintf("[0x%"PRIxPTR"]\n", addr);
+    }
+    else if (!line->saddr || !line->sname) {
+        kprintf("%s(0x%"PRIxPTR") [0x%"PRIxPTR"]\n", line->path, addr-line->base_addr, addr);
+    }
+    else if (line->line <= 0) {
+        kprintf("%s(%s+0x%"PRIxPTR") [0x%"PRIxPTR"]\n", line->path, line->sname,
+                d, addr);
+    }
+    else if (!line->filename) {
+        kprintf("%s(%s+0x%"PRIxPTR") [0x%"PRIxPTR"] ???:%d\n", line->path, line->sname,
+                d, addr, line->line);
+    }
+    else if (line->dirname && line->dirname[0]) {
+        kprintf("%s(%s+0x%"PRIxPTR") [0x%"PRIxPTR"] %s/%s:%d\n", line->path, line->sname,
+                d, addr, line->dirname, line->filename, line->line);
+    }
+    else {
+        kprintf("%s(%s+0x%"PRIxPTR") [0x%"PRIxPTR"] %s:%d\n", line->path, line->sname,
+                d, addr, line->filename, line->line);
+    }
+}
+
+static void
+print_line(line_info_t *line, void *address)
+{
+    print_line0(line, address);
+    if (line->next) {
+        print_line(line->next, NULL);
+    }
+}
 
 void
-rb_dump_backtrace_with_lines(int num_traces, void **trace, char **syms)
+rb_dump_backtrace_with_lines(int num_traces, void **traces)
 {
     int i;
     /* async-signal unsafe */
-    line_info_t *lines = (line_info_t *)calloc(num_traces,
-					       sizeof(line_info_t));
-
-    /* Note that line info of shared objects might not be shown
-       if we don't have dl_iterate_phdr */
-#ifdef HAVE_DL_ITERATE_PHDR
-    fill_base_addr_state_t fill_base_addr_state;
-
-    fill_base_addr_state.num_traces = num_traces;
-    fill_base_addr_state.syms = syms;
-    fill_base_addr_state.lines = lines;
-    /* maybe async-signal unsafe */
-    dl_iterate_phdr(fill_base_addr, &fill_base_addr_state);
-#endif /* HAVE_DL_ITERATE_PHDR */
-
-    for (i = 0; i < num_traces; i++) {
-	const char *path;
-	size_t len;
-	if (lines[i].line) {
-	    continue;
-	}
-
-	if (!get_path_from_symbol(syms[i], &path, &len)) {
-	    continue;
+    line_info_t *lines = (line_info_t *)calloc(num_traces, sizeof(line_info_t));
+    obj_info_t *obj = NULL;
+    /* 2 is NULL + main executable */
+    void **dladdr_fbases = (void **)calloc(num_traces+2, sizeof(void *));
+#ifdef HAVE_MAIN_EXE_PATH
+    char *main_path = NULL; /* used on printing backtrace */
+    ssize_t len;
+    if ((len = main_exe_path()) > 0) {
+	main_path = (char *)alloca(len + 1);
+	if (main_path) {
+	    uintptr_t addr;
+	    memcpy(main_path, binary_filename, len+1);
+	    append_obj(&obj);
+	    obj->path = main_path;
+	    addr = fill_lines(num_traces, traces, 1, &obj, lines, -1);
+	    if (addr != (uintptr_t)-1) {
+		dladdr_fbases[0] = (void *)addr;
+	    }
 	}
-
-	strncpy(binary_filename, path, len);
-	binary_filename[len] = '\0';
-
-	fill_lines(num_traces, trace, syms, 1, &lines[i], lines);
     }
+#endif
 
-    /* fprintf may not be async-signal safe */
+    /* fill source lines by reading dwarf */
     for (i = 0; i < num_traces; i++) {
-	line_info_t *line = &lines[i];
-
-	if (line->line > 0) {
-	    fprintf(stderr, "%s ", syms[i]);
-	    if (line->filename) {
-		if (line->dirname && line->dirname[0]) {
-		    fprintf(stderr, "%s/", line->dirname);
+	Dl_info info;
+	if (lines[i].line) continue;
+	if (dladdr(traces[i], &info)) {
+	    const char *path;
+	    void **p;
+
+	    /* skip symbols which is in already checked objects */
+	    /* if the binary is strip-ed, this may effect */
+	    for (p=dladdr_fbases; *p; p++) {
+		if (*p == info.dli_fbase) {
+		    lines[i].path = info.dli_fname;
+		    lines[i].sname = info.dli_sname;
+		    goto next_line;
 		}
-		fprintf(stderr, "%s", line->filename);
-	    } else {
-		fprintf(stderr, "???");
 	    }
-	    fprintf(stderr, ":%d\n", line->line);
-	} else {
-	    fprintf(stderr, "%s\n", syms[i]);
+	    *p = info.dli_fbase;
+
+	    append_obj(&obj);
+	    obj->base_addr = (uintptr_t)info.dli_fbase;
+	    path = info.dli_fname;
+	    obj->path = path;
+	    lines[i].path = path;
+            lines[i].sname = info.dli_sname;
+            lines[i].saddr = (uintptr_t)info.dli_saddr;
+	    strlcpy(binary_filename, path, PATH_MAX);
+	    if (fill_lines(num_traces, traces, 1, &obj, lines, i) == (uintptr_t)-1)
+		break;
 	}
+next_line:
+	continue;
     }
 
+    /* output */
     for (i = 0; i < num_traces; i++) {
-	line_info_t *line = &lines[i];
-	if (line->fd) {
-	    munmap(line->mapped, line->mapped_size);
-	    close(line->fd);
+        print_line(&lines[i], traces[i]);
+
+	/* FreeBSD's backtrace may show _start and so on */
+	if (lines[i].sname && strcmp("main", lines[i].sname) == 0)
+	    break;
+    }
+
+    /* free */
+    while (obj) {
+	obj_info_t *o = obj;
+        for (i=0; i < DWARF_SECTION_COUNT; i++) {
+            struct dwarf_section *s = obj_dwarf_section_at(obj, i);
+            if (s->flags & SHF_COMPRESSED) {
+                free(s->ptr);
+            }
+        }
+	if (obj->mapped_size) {
+	    munmap(obj->mapped, obj->mapped_size);
 	}
+	obj = o->next;
+	free(o);
+    }
+    for (i = 0; i < num_traces; i++) {
+        line_info_t *line = lines[i].next;
+        while (line) {
+            line_info_t *l = line;
+            line = line->next;
+            free(l);
+        }
     }
     free(lines);
+    free(dladdr_fbases);
+}
+
+/* From FreeBSD's lib/libstand/printf.c */
+/*-
+ * Copyright (c) 1986, 1988, 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * 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.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
+ */
+
+#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; }
+#define    hex2ascii(hex)  (hex2ascii_data[hex])
+static const char hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+static inline int imax(int a, int b) { return (a > b ? a : b); }
+static int kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap);
+
+static void putce(int c)
+{
+    char s[1];
+    ssize_t ret;
+
+    s[0] = (char)c;
+    ret = write(2, s, 1);
+    (void)ret;
+}
+
+static int
+kprintf(const char *fmt, ...)
+{
+	va_list ap;
+	int retval;
+
+	va_start(ap, fmt);
+	retval = kvprintf(fmt, putce, NULL, 10, ap);
+	va_end(ap);
+	return retval;
+}
+
+/*
+ * Put a NUL-terminated ASCII number (base <= 36) in a buffer in reverse
+ * order; return an optional length and a pointer to the last character
+ * written in the buffer (i.e., the first character of the string).
+ * The buffer pointed to by `nbuf' must have length >= MAXNBUF.
+ */
+static char *
+ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper)
+{
+	char *p, c;
+
+	p = nbuf;
+	*p = '\0';
+	do {
+		c = hex2ascii(num % base);
+		*++p = upper ? toupper(c) : c;
+	} while (num /= base);
+	if (lenp)
+		*lenp = (int)(p - nbuf);
+	return (p);
 }
 
+/*
+ * Scaled down version of printf(3).
+ *
+ * Two additional formats:
+ *
+ * The format %b is supported to decode error registers.
+ * Its usage is:
+ *
+ *	printf("reg=%b\n", regval, "<base><arg>*");
+ *
+ * where <base> is the output base expressed as a control character, e.g.
+ * \10 gives octal; \20 gives hex.  Each arg is a sequence of characters,
+ * the first of which gives the bit number to be inspected (origin 1), and
+ * the next characters (up to a control character, i.e. a character <= 32),
+ * give the name of the register.  Thus:
+ *
+ *	kvprintf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
+ *
+ * would produce output:
+ *
+ *	reg=3<BITTWO,BITONE>
+ *
+ * XXX:  %D  -- Hexdump, takes pointer and separator string:
+ *		("%6D", ptr, ":")   -> XX:XX:XX:XX:XX:XX
+ *		("%*D", len, ptr, " " -> XX XX XX XX ...
+ */
+static int
+kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap)
+{
+#define PCHAR(c) {int cc=(c); if (func) (*func)(cc); else *d++ = cc; retval++; }
+	char nbuf[MAXNBUF];
+	char *d;
+	const char *p, *percent, *q;
+	unsigned char *up;
+	int ch, n;
+	uintmax_t num;
+	int base, lflag, qflag, tmp, width, ladjust, sharpflag, neg, sign, dot;
+	int cflag, hflag, jflag, tflag, zflag;
+	int dwidth, upper;
+	char padc;
+	int stop = 0, retval = 0;
+
+	num = 0;
+	if (!func)
+		d = (char *) arg;
+	else
+		d = NULL;
+
+	if (fmt == NULL)
+		fmt = "(fmt null)\n";
+
+	if (radix < 2 || radix > 36)
+		radix = 10;
+
+	for (;;) {
+		padc = ' ';
+		width = 0;
+		while ((ch = (unsigned char)*fmt++) != '%' || stop) {
+			if (ch == '\0')
+				return (retval);
+			PCHAR(ch);
+		}
+		percent = fmt - 1;
+		qflag = 0; lflag = 0; ladjust = 0; sharpflag = 0; neg = 0;
+		sign = 0; dot = 0; dwidth = 0; upper = 0;
+		cflag = 0; hflag = 0; jflag = 0; tflag = 0; zflag = 0;
+reswitch:	switch (ch = (unsigned char)*fmt++) {
+		case '.':
+			dot = 1;
+			goto reswitch;
+		case '#':
+			sharpflag = 1;
+			goto reswitch;
+		case '+':
+			sign = 1;
+			goto reswitch;
+		case '-':
+			ladjust = 1;
+			goto reswitch;
+		case '%':
+			PCHAR(ch);
+			break;
+		case '*':
+			if (!dot) {
+				width = va_arg(ap, int);
+				if (width < 0) {
+					ladjust = !ladjust;
+					width = -width;
+				}
+			} else {
+				dwidth = va_arg(ap, int);
+			}
+			goto reswitch;
+		case '0':
+			if (!dot) {
+				padc = '0';
+				goto reswitch;
+			}
+		case '1': case '2': case '3': case '4':
+		case '5': case '6': case '7': case '8': case '9':
+				for (n = 0;; ++fmt) {
+					n = n * 10 + ch - '0';
+					ch = *fmt;
+					if (ch < '0' || ch > '9')
+						break;
+				}
+			if (dot)
+				dwidth = n;
+			else
+				width = n;
+			goto reswitch;
+		case 'b':
+			num = (unsigned int)va_arg(ap, int);
+			p = va_arg(ap, char *);
+			for (q = ksprintn(nbuf, num, *p++, NULL, 0); *q;)
+				PCHAR(*q--);
+
+			if (num == 0)
+				break;
+
+			for (tmp = 0; *p;) {
+				n = *p++;
+				if (num & (1 << (n - 1))) {
+					PCHAR(tmp ? ',' : '<');
+					for (; (n = *p) > ' '; ++p)
+						PCHAR(n);
+					tmp = 1;
+				} else
+					for (; *p > ' '; ++p)
+						continue;
+			}
+			if (tmp)
+				PCHAR('>');
+			break;
+		case 'c':
+			PCHAR(va_arg(ap, int));
+			break;
+		case 'D':
+			up = va_arg(ap, unsigned char *);
+			p = va_arg(ap, char *);
+			if (!width)
+				width = 16;
+			while(width--) {
+				PCHAR(hex2ascii(*up >> 4));
+				PCHAR(hex2ascii(*up & 0x0f));
+				up++;
+				if (width)
+					for (q=p;*q;q++)
+						PCHAR(*q);
+			}
+			break;
+		case 'd':
+		case 'i':
+			base = 10;
+			sign = 1;
+			goto handle_sign;
+		case 'h':
+			if (hflag) {
+				hflag = 0;
+				cflag = 1;
+			} else
+				hflag = 1;
+			goto reswitch;
+		case 'j':
+			jflag = 1;
+			goto reswitch;
+		case 'l':
+			if (lflag) {
+				lflag = 0;
+				qflag = 1;
+			} else
+				lflag = 1;
+			goto reswitch;
+		case 'n':
+			if (jflag)
+				*(va_arg(ap, intmax_t *)) = retval;
+			else if (qflag)
+				*(va_arg(ap, int64_t *)) = retval;
+			else if (lflag)
+				*(va_arg(ap, long *)) = retval;
+			else if (zflag)
+				*(va_arg(ap, size_t *)) = retval;
+			else if (hflag)
+				*(va_arg(ap, short *)) = retval;
+			else if (cflag)
+				*(va_arg(ap, char *)) = retval;
+			else
+				*(va_arg(ap, int *)) = retval;
+			break;
+		case 'o':
+			base = 8;
+			goto handle_nosign;
+		case 'p':
+			base = 16;
+			sharpflag = (width == 0);
+			sign = 0;
+			num = (uintptr_t)va_arg(ap, void *);
+			goto number;
+		case 'q':
+			qflag = 1;
+			goto reswitch;
+		case 'r':
+			base = radix;
+			if (sign)
+				goto handle_sign;
+			goto handle_nosign;
+		case 's':
+			p = va_arg(ap, char *);
+			if (p == NULL)
+				p = "(null)";
+			if (!dot)
+				n = (int)strlen (p);
+			else
+				for (n = 0; n < dwidth && p[n]; n++)
+					continue;
+
+			width -= n;
+
+			if (!ladjust && width > 0)
+				while (width--)
+					PCHAR(padc);
+			while (n--)
+				PCHAR(*p++);
+			if (ladjust && width > 0)
+				while (width--)
+					PCHAR(padc);
+			break;
+		case 't':
+			tflag = 1;
+			goto reswitch;
+		case 'u':
+			base = 10;
+			goto handle_nosign;
+		case 'X':
+			upper = 1;
+		case 'x':
+			base = 16;
+			goto handle_nosign;
+		case 'y':
+			base = 16;
+			sign = 1;
+			goto handle_sign;
+		case 'z':
+			zflag = 1;
+			goto reswitch;
+handle_nosign:
+			sign = 0;
+			if (jflag)
+				num = va_arg(ap, uintmax_t);
+			else if (qflag)
+				num = va_arg(ap, uint64_t);
+			else if (tflag)
+				num = va_arg(ap, ptrdiff_t);
+			else if (lflag)
+				num = va_arg(ap, unsigned long);
+			else if (zflag)
+				num = va_arg(ap, size_t);
+			else if (hflag)
+				num = (unsigned short)va_arg(ap, int);
+			else if (cflag)
+				num = (unsigned char)va_arg(ap, int);
+			else
+				num = va_arg(ap, unsigned int);
+			goto number;
+handle_sign:
+			if (jflag)
+				num = va_arg(ap, intmax_t);
+			else if (qflag)
+				num = va_arg(ap, int64_t);
+			else if (tflag)
+				num = va_arg(ap, ptrdiff_t);
+			else if (lflag)
+				num = va_arg(ap, long);
+			else if (zflag)
+				num = va_arg(ap, ssize_t);
+			else if (hflag)
+				num = (short)va_arg(ap, int);
+			else if (cflag)
+				num = (char)va_arg(ap, int);
+			else
+				num = va_arg(ap, int);
+number:
+			if (sign && (intmax_t)num < 0) {
+				neg = 1;
+				num = -(intmax_t)num;
+			}
+			p = ksprintn(nbuf, num, base, &n, upper);
+			tmp = 0;
+			if (sharpflag && num != 0) {
+				if (base == 8)
+					tmp++;
+				else if (base == 16)
+					tmp += 2;
+			}
+			if (neg)
+				tmp++;
+
+			if (!ladjust && padc == '0')
+				dwidth = width - tmp;
+			width -= tmp + imax(dwidth, n);
+			dwidth -= n;
+			if (!ladjust)
+				while (width-- > 0)
+					PCHAR(' ');
+			if (neg)
+				PCHAR('-');
+			if (sharpflag && num != 0) {
+				if (base == 8) {
+					PCHAR('0');
+				} else if (base == 16) {
+					PCHAR('0');
+					PCHAR('x');
+				}
+			}
+			while (dwidth-- > 0)
+				PCHAR('0');
+
+			while (*p)
+				PCHAR(*p--);
+
+			if (ladjust)
+				while (width-- > 0)
+					PCHAR(' ');
+
+			break;
+		default:
+			while (percent < fmt)
+				PCHAR(*percent++);
+			/*
+			 * Since we ignore an formatting argument it is no
+			 * longer safe to obey the remaining formatting
+			 * arguments as the arguments will no longer match
+			 * the format specs.
+			 */
+			stop = 1;
+			break;
+		}
+	}
+#undef PCHAR
+}
 #else /* defined(USE_ELF) */
 #error not supported
 #endif
diff --git a/addr2line.h b/addr2line.h
index 3782d89e07..4f6cf179ef 100644
--- a/addr2line.h
+++ b/addr2line.h
@@ -11,10 +11,10 @@
 #ifndef RUBY_ADDR2LINE_H
 #define RUBY_ADDR2LINE_H
 
-#ifdef USE_ELF
+#if (defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H))
 
 void
-rb_dump_backtrace_with_lines(int num_traces, void **traces, char **syms);
+rb_dump_backtrace_with_lines(int num_traces, void **traces);
 
 #endif /* USE_ELF */
 
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000000..bf10c97222
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,147 @@
+---
+version: '{build}'
+shallow_clone: true
+platform:
+  - x64
+branches:
+  except:
+    - trunk # mirrored from trunk. avoid doubly building on it
+environment:
+  ruby_version: "24-%Platform%"
+  zlib_version: "1.2.11"
+  matrix:
+    # to reduce time for finishing all jobs, run the slowest msys2 build first.
+    - build: msys2
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      GEMS_FOR_TEST: "timezone tzinfo"
+    - build: vs
+      vs: 120
+      ssl: OpenSSL
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      GEMS_FOR_TEST: ""
+    - build: vs
+      vs: 140
+      ssl: OpenSSL-v111
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      GEMS_FOR_TEST: ""
+  RELINE_TEST_ENCODING: "Windows-31J"
+  UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=."
+for:
+-
+  matrix:
+    only:
+      - build: vs
+  install:
+    - ver
+    - chcp
+    - SET BITS=%Platform:x86=32%
+    - SET BITS=%BITS:x=%
+    - SET OPENSSL_DIR=C:\%ssl%-Win%BITS%
+    - CALL SET vcvars=%%^VS%VS%COMNTOOLS^%%..\..\VC\vcvarsall.bat
+    - SET vcvars
+    - '"%vcvars%" %Platform:x64=amd64%'
+    - SET ruby_path=C:\Ruby%ruby_version:-x86=%
+    - SET PATH=\usr\local\bin;%ruby_path%\bin;%PATH%;C:\msys64\mingw64\bin;C:\msys64\usr\bin
+    - ruby --version
+    - 'cl'
+    - echo> Makefile srcdir=.
+    - echo>> Makefile MSC_VER=0
+    - echo>> Makefile RT=none
+    - echo>> Makefile RT_VER=0
+    - echo>> Makefile BUILTIN_ENCOBJS=nul
+    - type win32\Makefile.sub >> Makefile
+    - nmake %mflags% touch-unicode-files
+    - nmake %mflags% %UPDATE_UNICODE% up incs
+    - del Makefile
+    - mkdir \usr\local\bin
+    - mkdir \usr\local\include
+    - mkdir \usr\local\lib
+    - curl -fsSL -o zlib%zlib_version:.=%.zip --retry 10 https://zlib.net/zlib%zlib_version:.=%.zip
+    - 7z x -o%APPVEYOR_BUILD_FOLDER%\ext\zlib zlib%zlib_version:.=%.zip
+    - for %%I in (%OPENSSL_DIR%\*.dll) do mklink /h \usr\local\bin\%%~nxI %%I
+    - attrib +r /s /d
+    - mkdir %Platform%-mswin_%vs%
+  build_script:
+    - cd %APPVEYOR_BUILD_FOLDER%
+    - cd %Platform%-mswin_%vs%
+    - ..\win32\configure.bat --without-ext=+,dbm,gdbm,readline --with-opt-dir=/usr/local --with-openssl-dir=%OPENSSL_DIR:\=/%
+    - nmake -l
+    - nmake install-nodoc
+    - \usr\bin\ruby -v -e "p :locale => Encoding.find('locale'), :filesystem => Encoding.find('filesystem')"
+    - if not "%GEMS_FOR_TEST%" == "" \usr\bin\gem install --no-document %GEMS_FOR_TEST%
+    - \usr\bin\ruby -ropenssl -e "puts 'Build    ' + OpenSSL::OPENSSL_VERSION, 'Runtime  ' + OpenSSL::OPENSSL_LIBRARY_VERSION"
+  test_script:
+    - set /a JOBS=%NUMBER_OF_PROCESSORS%
+    - nmake -l "TESTOPTS=-v -q" btest
+    - nmake -l "TESTOPTS=-v -q" test-basic
+    - nmake -l "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor -j%JOBS% --exclude readline --exclude win32ole --exclude test_bignum --exclude test_syntax --exclude test_open-uri --exclude test_bundled_ca" test-all
+    # separately execute tests without -j which may crash worker with -j.
+    - nmake -l "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor" test-all TESTS="../test/win32ole ../test/ruby/test_bignum.rb ../test/ruby/test_syntax.rb ../test/open-uri/test_open-uri.rb ../test/rubygems/test_bundled_ca.rb"
+    - nmake -l test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
+-
+  matrix:
+    only:
+      - build: msys2
+  install:
+    - ver
+    - chcp
+    - set /a JOBS=%NUMBER_OF_PROCESSORS%
+    - set MSYS_NO_PATHCONV=1
+    - SET MSYSTEM=%Platform:x86=32%
+    - SET MSYSTEM=%MSYSTEM:x=MINGW%
+    - SET MSYS2_ARCH=%Platform:x86=i686%
+    - SET MSYS2_ARCH=%MSYS2_ARCH:x64=x86_64%
+    - set MSYSTEM_PREFIX=/mingw64
+    - set MINGW_CHOST=%MSYS2_ARCH%-w64-mingw32
+    - SET ruby_path=C:\Ruby%ruby_version:-x86=%
+    - cd ..
+    - mkdir build
+    - mkdir install
+    - SET PATH=%ruby_path%\bin;C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%PATH%
+    - ruby --version
+  build_script:
+    - pacman -Syd --noconfirm --noprogressbar --needed mingw-w64-x86_64-binutils mingw-w64-x86_64-isl mingw-w64-x86_64-libiconv mingw-w64-x86_64-mpc mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-windows-default-manifest mingw-w64-x86_64-winpthreads mingw-w64-x86_64-gcc
+    # when fixed in MSYS2 / Mingw-w64, remove above and use normal code below
+    #- pacman -Sy --noconfirm --noprogressbar --needed mingw-w64-x86_64-toolchain
+    - pacman -S  --noconfirm --noprogressbar --needed mingw-w64-x86_64-gdbm mingw-w64-x86_64-gmp mingw-w64-x86_64-libffi mingw-w64-x86_64-libyaml mingw-w64-x86_64-openssl mingw-w64-x86_64-ragel mingw-w64-x86_64-readline mingw-w64-x86_64-zlib
+    - cd %APPVEYOR_BUILD_FOLDER%
+    - set CFLAGS=-march=%MSYS2_ARCH:_=-% -mtune=generic -O3 -pipe
+    - set CXXFLAGS=%CFLAGS%
+    - set CPPFLAGS=-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048
+    - set LDFLAGS=-pipe
+    - sh -c "autoreconf -fi"
+    - cd ..\build
+    - sh ../ruby/configure --disable-install-doc --prefix=/. --build=%MINGW_CHOST% --host=%MINGW_CHOST% --target=%MINGW_CHOST%
+    - mingw32-make %mflags% touch-unicode-files
+    - mingw32-make -j%JOBS% %UPDATE_UNICODE% up incs
+    - mingw32-make -j%JOBS% V=1
+    - mingw32-make DESTDIR=../install install-nodoc
+    - if not "%GEMS_FOR_TEST%" == "" ..\install\bin\gem install --no-document %GEMS_FOR_TEST%
+    - ..\install\bin\ruby.exe -v -ropenssl -e "puts 'Build    ' + OpenSSL::OPENSSL_VERSION, 'Runtime  ' + OpenSSL::OPENSSL_LIBRARY_VERSION"
+  test_script:
+    - mingw32-make test
+    - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor -j %JOBS% --exclude win32ole --exclude test_open-uri"
+    # separately execute tests without -j which may crash worker with -j.
+    - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor" TESTS="../ruby/test/win32ole ../ruby/test/open-uri/test_open-uri.rb"
+    - mingw32-make test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
+notifications:
+  # Using "Webhook" with templated body to skip notification on Pull Request
+  - provider: Webhook
+    method: POST
+    url:
+      secure: iMINHMS0nZabaDsxN9omRDsekxzVvAAzEq5ev7lN6vb+gUETT+rbDKLGxBxBpEpxlnPlLdzroIJ+DTKlwfJA8VkGawTn9EXNsucH0OkSf2M= # AppVeyor CI
+    body: >-
+      {{^isPullRequest}}
+        {
+          "attachments": [
+            {
+              "text": "Build <{{buildUrl}}|#{{buildVersion}}> (<{{commitUrl}}|{{commitId}}>) of {{repositoryName}}@{{branch}} by {{commitAuthor}} {{status}}",
+              "color": "{{#passed}}good{{/passed}}{{#failed}}danger{{/failed}}"
+            }
+          ],
+          "channel": "#alerts"
+        }
+      {{/isPullRequest}}
+    on_build_success: false
+    on_build_failure: true
+    on_build_status_changed: true
diff --git a/array.c b/array.c
index 64b1890ae1..28bd8c866b 100644
--- a/array.c
+++ b/array.c
@@ -10,64 +10,73 @@
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
-
-#include "ruby/ruby.h"
+#include "ruby/encoding.h"
 #include "ruby/util.h"
 #include "ruby/st.h"
-#include "ruby/encoding.h"
+#include "probes.h"
+#include "id.h"
+#include "debug_counter.h"
+#include "transient_heap.h"
 #include "internal.h"
 
-#ifndef ARRAY_DEBUG
+#if !ARRAY_DEBUG
 # define NDEBUG
 #endif
-#include <assert.h>
-
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+#include "ruby_assert.h"
 
 VALUE rb_cArray;
 
-static ID id_cmp;
+/* for OPTIMIZED_CMP: */
+#define id_cmp idCmp
 
 #define ARY_DEFAULT_SIZE 16
 #define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE))
+#define SMALL_ARRAY_LEN 16
 
-void
-rb_mem_clear(register VALUE *mem, register long size)
+static int
+should_be_T_ARRAY(VALUE ary)
 {
-    while (size--) {
-	*mem++ = Qnil;
-    }
+    return RB_TYPE_P(ary, T_ARRAY);
 }
 
-static inline void
-memfill(register VALUE *mem, register long size, register VALUE val)
+static int
+should_not_be_shared_and_embedded(VALUE ary)
 {
-    while (size--) {
-	*mem++ = val;
-    }
+    return !FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG);
 }
 
-# define ARY_SHARED_P(ary) \
-    (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
-     FL_TEST((ary),ELTS_SHARED)!=0)
-# define ARY_EMBED_P(ary) \
-    (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
-     FL_TEST((ary), RARRAY_EMBED_FLAG)!=0)
+#define ARY_SHARED_P(ary) \
+  (assert(should_be_T_ARRAY((VALUE)(ary))), \
+   assert(should_not_be_shared_and_embedded((VALUE)ary)), \
+   FL_TEST_RAW((ary),ELTS_SHARED)!=0)
+
+#define ARY_EMBED_P(ary) \
+  (assert(should_be_T_ARRAY((VALUE)(ary))), \
+   assert(should_not_be_shared_and_embedded((VALUE)ary)), \
+   FL_TEST_RAW((ary), RARRAY_EMBED_FLAG) != 0)
 
 #define ARY_HEAP_PTR(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.ptr)
 #define ARY_HEAP_LEN(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.len)
+#define ARY_HEAP_CAPA(a) (assert(!ARY_EMBED_P(a)), assert(!ARY_SHARED_ROOT_P(a)), \
+                          RARRAY(a)->as.heap.aux.capa)
+
 #define ARY_EMBED_PTR(a) (assert(ARY_EMBED_P(a)), RARRAY(a)->as.ary)
 #define ARY_EMBED_LEN(a) \
     (assert(ARY_EMBED_P(a)), \
      (long)((RBASIC(a)->flags >> RARRAY_EMBED_LEN_SHIFT) & \
 	 (RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)))
+#define ARY_HEAP_SIZE(a) (assert(!ARY_EMBED_P(a)), assert(ARY_OWNS_HEAP_P(a)), ARY_CAPA(a) * sizeof(VALUE))
+
+#define ARY_OWNS_HEAP_P(a) (assert(should_be_T_ARRAY((VALUE)(a))), \
+                            !FL_TEST_RAW((a), ELTS_SHARED|RARRAY_EMBED_FLAG))
 
-#define ARY_OWNS_HEAP_P(a) (!FL_TEST((a), ELTS_SHARED|RARRAY_EMBED_FLAG))
 #define FL_SET_EMBED(a) do { \
     assert(!ARY_SHARED_P(a)); \
-    assert(!OBJ_FROZEN(a)); \
     FL_SET((a), RARRAY_EMBED_FLAG); \
+    RARY_TRANSIENT_UNSET(a); \
+    ary_verify(a); \
 } while (0)
+
 #define FL_UNSET_EMBED(ary) FL_UNSET((ary), RARRAY_EMBED_FLAG|RARRAY_EMBED_LEN_MASK)
 #define FL_SET_SHARED(ary) do { \
     assert(!ARY_EMBED_P(ary)); \
@@ -116,7 +125,7 @@ memfill(register VALUE *mem, register long size, register VALUE val)
 } while (0)
 
 #define ARY_CAPA(ary) (ARY_EMBED_P(ary) ? RARRAY_EMBED_LEN_MAX : \
-		       ARY_SHARED_ROOT_P(ary) ? RARRAY_LEN(ary) : RARRAY(ary)->as.heap.aux.capa)
+                       ARY_SHARED_ROOT_P(ary) ? RARRAY_LEN(ary) : ARY_HEAP_CAPA(ary))
 #define ARY_SET_CAPA(ary, n) do { \
     assert(!ARY_EMBED_P(ary)); \
     assert(!ARY_SHARED_P(ary)); \
@@ -124,57 +133,341 @@ memfill(register VALUE *mem, register long size, register VALUE val)
     RARRAY(ary)->as.heap.aux.capa = (n); \
 } while (0)
 
-#define ARY_SHARED(ary) (assert(ARY_SHARED_P(ary)), RARRAY(ary)->as.heap.aux.shared)
+#define ARY_SHARED_ROOT(ary) (assert(ARY_SHARED_P(ary)), RARRAY(ary)->as.heap.aux.shared_root)
 #define ARY_SET_SHARED(ary, value) do { \
-    assert(!ARY_EMBED_P(ary)); \
-    assert(ARY_SHARED_P(ary)); \
-    assert(ARY_SHARED_ROOT_P(value)); \
-    RARRAY(ary)->as.heap.aux.shared = (value); \
+    const VALUE _ary_ = (ary); \
+    const VALUE _value_ = (value); \
+    assert(!ARY_EMBED_P(_ary_)); \
+    assert(ARY_SHARED_P(_ary_)); \
+    assert(ARY_SHARED_ROOT_P(_value_)); \
+    RB_OBJ_WRITE(_ary_, &RARRAY(_ary_)->as.heap.aux.shared_root, _value_); \
 } while (0)
 #define RARRAY_SHARED_ROOT_FLAG FL_USER5
-#define ARY_SHARED_ROOT_P(ary) (FL_TEST((ary), RARRAY_SHARED_ROOT_FLAG))
-#define ARY_SHARED_NUM(ary) \
+#define ARY_SHARED_ROOT_P(ary) (assert(should_be_T_ARRAY((VALUE)(ary))), \
+                                FL_TEST_RAW((ary), RARRAY_SHARED_ROOT_FLAG))
+#define ARY_SHARED_ROOT_REFCNT(ary) \
     (assert(ARY_SHARED_ROOT_P(ary)), RARRAY(ary)->as.heap.aux.capa)
-#define ARY_SET_SHARED_NUM(ary, value) do { \
+#define ARY_SHARED_ROOT_OCCUPIED(ary) (ARY_SHARED_ROOT_REFCNT(ary) == 1)
+#define ARY_SET_SHARED_ROOT_REFCNT(ary, value) do { \
     assert(ARY_SHARED_ROOT_P(ary)); \
     RARRAY(ary)->as.heap.aux.capa = (value); \
 } while (0)
 #define FL_SET_SHARED_ROOT(ary) do { \
     assert(!ARY_EMBED_P(ary)); \
+    assert(!RARRAY_TRANSIENT_P(ary)); \
     FL_SET((ary), RARRAY_SHARED_ROOT_FLAG); \
 } while (0)
 
+static inline void
+ARY_SET(VALUE a, long i, VALUE v)
+{
+    assert(!ARY_SHARED_P(a));
+    assert(!OBJ_FROZEN(a));
+
+    RARRAY_ASET(a, i, v);
+}
+#undef RARRAY_ASET
+
+
+#if ARRAY_DEBUG
+#define ary_verify(ary) ary_verify_(ary, __FILE__, __LINE__)
+
+static VALUE
+ary_verify_(VALUE ary, const char *file, int line)
+{
+    assert(RB_TYPE_P(ary, T_ARRAY));
+
+    if (FL_TEST(ary, ELTS_SHARED)) {
+        VALUE root = RARRAY(ary)->as.heap.aux.shared_root;
+        const VALUE *ptr = ARY_HEAP_PTR(ary);
+        const VALUE *root_ptr = RARRAY_CONST_PTR_TRANSIENT(root);
+        long len = ARY_HEAP_LEN(ary), root_len = RARRAY_LEN(root);
+        assert(FL_TEST(root, RARRAY_SHARED_ROOT_FLAG));
+        assert(root_ptr <= ptr && ptr + len <= root_ptr + root_len);
+        ary_verify(root);
+    }
+    else if (ARY_EMBED_P(ary)) {
+        assert(!RARRAY_TRANSIENT_P(ary));
+        assert(!ARY_SHARED_P(ary));
+        assert(RARRAY_LEN(ary) <= RARRAY_EMBED_LEN_MAX);
+    }
+    else {
+#if 1
+        const VALUE *ptr = RARRAY_CONST_PTR_TRANSIENT(ary);
+        long i, len = RARRAY_LEN(ary);
+        volatile VALUE v;
+        if (len > 1) len = 1; /* check only HEAD */
+        for (i=0; i<len; i++) {
+            v = ptr[i]; /* access check */
+        }
+        v = v;
+#endif
+    }
+
+    if (RARRAY_TRANSIENT_P(ary)) {
+        assert(rb_transient_heap_managed_ptr_p(RARRAY_CONST_PTR_TRANSIENT(ary)));
+    }
+
+    rb_transient_heap_verify();
+
+    return ary;
+}
+
+void
+rb_ary_verify(VALUE ary)
+{
+    ary_verify(ary);
+}
+#else
+#define ary_verify(ary) ((void)0)
+#endif
+
+VALUE *
+rb_ary_ptr_use_start(VALUE ary)
+{
+#if ARRAY_DEBUG
+    FL_SET_RAW(ary, RARRAY_PTR_IN_USE_FLAG);
+#endif
+    return (VALUE *)RARRAY_CONST_PTR_TRANSIENT(ary);
+}
+
+void
+rb_ary_ptr_use_end(VALUE ary)
+{
+#if ARRAY_DEBUG
+    FL_UNSET_RAW(ary, RARRAY_PTR_IN_USE_FLAG);
+#endif
+}
+
+void
+rb_mem_clear(VALUE *mem, long size)
+{
+    while (size--) {
+	*mem++ = Qnil;
+    }
+}
+
+static void
+ary_mem_clear(VALUE ary, long beg, long size)
+{
+    RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+	rb_mem_clear(ptr + beg, size);
+    });
+}
+
+static inline void
+memfill(register VALUE *mem, register long size, register VALUE val)
+{
+    while (size--) {
+	*mem++ = val;
+    }
+}
+
+static void
+ary_memfill(VALUE ary, long beg, long size, VALUE val)
+{
+    RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+	memfill(ptr + beg, size, val);
+	RB_OBJ_WRITTEN(ary, Qundef, val);
+    });
+}
+
+static void
+ary_memcpy0(VALUE ary, long beg, long argc, const VALUE *argv, VALUE buff_owner_ary)
+{
+    assert(!ARY_SHARED_P(buff_owner_ary));
+
+    if (argc > (int)(128/sizeof(VALUE)) /* is magic number (cache line size) */) {
+        rb_gc_writebarrier_remember(buff_owner_ary);
+        RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+            MEMCPY(ptr+beg, argv, VALUE, argc);
+        });
+    }
+    else {
+        int i;
+        RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+            for (i=0; i<argc; i++) {
+                RB_OBJ_WRITE(buff_owner_ary, &ptr[i+beg], argv[i]);
+            }
+        });
+    }
+}
+
+static void
+ary_memcpy(VALUE ary, long beg, long argc, const VALUE *argv)
+{
+    ary_memcpy0(ary, beg, argc, argv, ary);
+}
+
+static VALUE *
+ary_heap_alloc(VALUE ary, size_t capa)
+{
+    VALUE *ptr = rb_transient_heap_alloc(ary, sizeof(VALUE) * capa);
+
+    if (ptr != NULL) {
+        RARY_TRANSIENT_SET(ary);
+    }
+    else {
+        RARY_TRANSIENT_UNSET(ary);
+        ptr = ALLOC_N(VALUE, capa);
+    }
+
+    return ptr;
+}
+
+static void
+ary_heap_free_ptr(VALUE ary, const VALUE *ptr, long size)
+{
+    if (RARRAY_TRANSIENT_P(ary)) {
+        /* ignore it */
+    }
+    else {
+        ruby_sized_xfree((void *)ptr, size);
+    }
+}
+
+static void
+ary_heap_free(VALUE ary)
+{
+    if (RARRAY_TRANSIENT_P(ary)) {
+        RARY_TRANSIENT_UNSET(ary);
+    }
+    else {
+        ary_heap_free_ptr(ary, ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
+    }
+}
+
+static void
+ary_heap_realloc(VALUE ary, size_t new_capa)
+{
+    size_t old_capa = ARY_HEAP_CAPA(ary);
+
+    if (RARRAY_TRANSIENT_P(ary)) {
+        if (new_capa <= old_capa) {
+            /* do nothing */
+        }
+        else {
+            VALUE *new_ptr = rb_transient_heap_alloc(ary, sizeof(VALUE) * new_capa);
+
+            if (new_ptr == NULL) {
+                new_ptr = ALLOC_N(VALUE, new_capa);
+                RARY_TRANSIENT_UNSET(ary);
+            }
+
+            MEMCPY(new_ptr, ARY_HEAP_PTR(ary), VALUE, old_capa);
+            ARY_SET_PTR(ary, new_ptr);
+        }
+    }
+    else {
+        SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, new_capa, old_capa);
+    }
+    ary_verify(ary);
+}
+
+#if USE_TRANSIENT_HEAP
+static inline void
+rb_ary_transient_heap_evacuate_(VALUE ary, int transient, int promote)
+{
+    if (transient) {
+        VALUE *new_ptr;
+        const VALUE *old_ptr = ARY_HEAP_PTR(ary);
+        long capa = ARY_HEAP_CAPA(ary);
+        long len  = ARY_HEAP_LEN(ary);
+
+        if (ARY_SHARED_ROOT_P(ary)) {
+            capa = len;
+        }
+
+        assert(ARY_OWNS_HEAP_P(ary));
+        assert(RARRAY_TRANSIENT_P(ary));
+        assert(!ARY_PTR_USING_P(ary));
+
+        if (promote) {
+            new_ptr = ALLOC_N(VALUE, capa);
+            RARY_TRANSIENT_UNSET(ary);
+        }
+        else {
+            new_ptr = ary_heap_alloc(ary, capa);
+        }
+
+        MEMCPY(new_ptr, old_ptr, VALUE, capa);
+        /* do not use ARY_SET_PTR() because they assert !frozen */
+        RARRAY(ary)->as.heap.ptr = new_ptr;
+    }
+
+    ary_verify(ary);
+}
+
+void
+rb_ary_transient_heap_evacuate(VALUE ary, int promote)
+{
+    rb_ary_transient_heap_evacuate_(ary, RARRAY_TRANSIENT_P(ary), promote);
+}
+
+void
+rb_ary_detransient(VALUE ary)
+{
+    assert(RARRAY_TRANSIENT_P(ary));
+    rb_ary_transient_heap_evacuate_(ary, TRUE, TRUE);
+}
+#else
+void
+rb_ary_detransient(VALUE ary)
+{
+    /* do nothing */
+}
+#endif
+
 static void
 ary_resize_capa(VALUE ary, long capacity)
 {
     assert(RARRAY_LEN(ary) <= capacity);
     assert(!OBJ_FROZEN(ary));
     assert(!ARY_SHARED_P(ary));
+
     if (capacity > RARRAY_EMBED_LEN_MAX) {
         if (ARY_EMBED_P(ary)) {
             long len = ARY_EMBED_LEN(ary);
-            VALUE *ptr = ALLOC_N(VALUE, (capacity));
+            VALUE *ptr = ary_heap_alloc(ary, capacity);
+
             MEMCPY(ptr, ARY_EMBED_PTR(ary), VALUE, len);
             FL_UNSET_EMBED(ary);
             ARY_SET_PTR(ary, ptr);
             ARY_SET_HEAP_LEN(ary, len);
         }
         else {
-            REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, (capacity));
+            ary_heap_realloc(ary, capacity);
         }
-        ARY_SET_CAPA(ary, (capacity));
+        ARY_SET_CAPA(ary, capacity);
     }
     else {
         if (!ARY_EMBED_P(ary)) {
-            long len = RARRAY_LEN(ary);
-            VALUE *ptr = RARRAY_PTR(ary);
+            long len = ARY_HEAP_LEN(ary);
+            long old_capa = ARY_HEAP_CAPA(ary);
+            const VALUE *ptr = ARY_HEAP_PTR(ary);
+
             if (len > capacity) len = capacity;
-            MEMCPY(RARRAY(ary)->as.ary, ptr, VALUE, len);
+            MEMCPY((VALUE *)RARRAY(ary)->as.ary, ptr, VALUE, len);
+            ary_heap_free_ptr(ary, ptr, old_capa);
+
             FL_SET_EMBED(ary);
             ARY_SET_LEN(ary, len);
-            xfree(ptr);
         }
     }
+
+    ary_verify(ary);
+}
+
+static inline void
+ary_shrink_capa(VALUE ary)
+{
+    long capacity = ARY_HEAP_LEN(ary);
+    long old_capa = ARY_HEAP_CAPA(ary);
+    assert(!ARY_SHARED_P(ary));
+    assert(old_capa >= capacity);
+    if (old_capa > capacity) ary_heap_realloc(ary, capacity);
+
+    ary_verify(ary);
 }
 
 static void
@@ -190,19 +483,21 @@ ary_double_capa(VALUE ary, long min)
     }
     new_capa += min;
     ary_resize_capa(ary, new_capa);
+
+    ary_verify(ary);
 }
 
 static void
-rb_ary_decrement_share(VALUE shared)
+rb_ary_decrement_share(VALUE shared_root)
 {
-    if (shared) {
-	long num = ARY_SHARED_NUM(shared) - 1;
+    if (shared_root) {
+        long num = ARY_SHARED_ROOT_REFCNT(shared_root) - 1;
 	if (num == 0) {
-	    rb_ary_free(shared);
-	    rb_gc_force_recycle(shared);
+            rb_ary_free(shared_root);
+            rb_gc_force_recycle(shared_root);
 	}
 	else if (num > 0) {
-	    ARY_SET_SHARED_NUM(shared, num);
+            ARY_SET_SHARED_ROOT_REFCNT(shared_root, num);
 	}
     }
 }
@@ -210,8 +505,8 @@ rb_ary_decrement_share(VALUE shared)
 static void
 rb_ary_unshare(VALUE ary)
 {
-    VALUE shared = RARRAY(ary)->as.heap.aux.shared;
-    rb_ary_decrement_share(shared);
+    VALUE shared_root = RARRAY(ary)->as.heap.aux.shared_root;
+    rb_ary_decrement_share(shared_root);
     FL_UNSET_SHARED(ary);
 }
 
@@ -224,29 +519,29 @@ rb_ary_unshare_safe(VALUE ary)
 }
 
 static VALUE
-rb_ary_increment_share(VALUE shared)
+rb_ary_increment_share(VALUE shared_root)
 {
-    long num = ARY_SHARED_NUM(shared);
+    long num = ARY_SHARED_ROOT_REFCNT(shared_root);
     if (num >= 0) {
-	ARY_SET_SHARED_NUM(shared, num + 1);
+        ARY_SET_SHARED_ROOT_REFCNT(shared_root, num + 1);
     }
-    return shared;
+    return shared_root;
 }
 
 static void
-rb_ary_set_shared(VALUE ary, VALUE shared)
+rb_ary_set_shared(VALUE ary, VALUE shared_root)
 {
-    rb_ary_increment_share(shared);
+    rb_ary_increment_share(shared_root);
     FL_SET_SHARED(ary);
-    ARY_SET_SHARED(ary, shared);
+    RB_DEBUG_COUNTER_INC(obj_ary_shared_create);
+    ARY_SET_SHARED(ary, shared_root);
 }
 
 static inline void
 rb_ary_modify_check(VALUE ary)
 {
     rb_check_frozen(ary);
-    if (!OBJ_UNTRUSTED(ary) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: can't modify array");
+    ary_verify(ary);
 }
 
 void
@@ -254,62 +549,148 @@ rb_ary_modify(VALUE ary)
 {
     rb_ary_modify_check(ary);
     if (ARY_SHARED_P(ary)) {
-        long len = RARRAY_LEN(ary);
+	long shared_len, len = RARRAY_LEN(ary);
+        VALUE shared_root = ARY_SHARED_ROOT(ary);
+
+        ary_verify(shared_root);
+
         if (len <= RARRAY_EMBED_LEN_MAX) {
-            VALUE *ptr = ARY_HEAP_PTR(ary);
-            VALUE shared = ARY_SHARED(ary);
+	    const VALUE *ptr = ARY_HEAP_PTR(ary);
             FL_UNSET_SHARED(ary);
             FL_SET_EMBED(ary);
-            MEMCPY(ARY_EMBED_PTR(ary), ptr, VALUE, len);
-            rb_ary_decrement_share(shared);
+	    MEMCPY((VALUE *)ARY_EMBED_PTR(ary), ptr, VALUE, len);
+            rb_ary_decrement_share(shared_root);
             ARY_SET_EMBED_LEN(ary, len);
         }
+        else if (ARY_SHARED_ROOT_OCCUPIED(shared_root) && len > ((shared_len = RARRAY_LEN(shared_root))>>1)) {
+            long shift = RARRAY_CONST_PTR_TRANSIENT(ary) - RARRAY_CONST_PTR_TRANSIENT(shared_root);
+	    FL_UNSET_SHARED(ary);
+            ARY_SET_PTR(ary, RARRAY_CONST_PTR_TRANSIENT(shared_root));
+	    ARY_SET_CAPA(ary, shared_len);
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+		MEMMOVE(ptr, ptr+shift, VALUE, len);
+	    });
+            FL_SET_EMBED(shared_root);
+            rb_ary_decrement_share(shared_root);
+	}
         else {
-            VALUE *ptr = ALLOC_N(VALUE, len);
-            MEMCPY(ptr, RARRAY_PTR(ary), VALUE, len);
+            VALUE *ptr = ary_heap_alloc(ary, len);
+            MEMCPY(ptr, ARY_HEAP_PTR(ary), VALUE, len);
             rb_ary_unshare(ary);
             ARY_SET_CAPA(ary, len);
             ARY_SET_PTR(ary, ptr);
         }
+
+	rb_gc_writebarrier_remember(ary);
     }
+    ary_verify(ary);
 }
 
-VALUE
-rb_ary_freeze(VALUE ary)
+static VALUE
+ary_ensure_room_for_push(VALUE ary, long add_len)
 {
-    return rb_obj_freeze(ary);
+    long old_len = RARRAY_LEN(ary);
+    long new_len = old_len + 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_root = ARY_SHARED_ROOT(ary);
+            if (ARY_SHARED_ROOT_OCCUPIED(shared_root)) {
+                if (ARY_HEAP_PTR(ary) - RARRAY_CONST_PTR_TRANSIENT(shared_root) + new_len <= RARRAY_LEN(shared_root)) {
+		    rb_ary_modify_check(ary);
+
+                    ary_verify(ary);
+                    ary_verify(shared_root);
+                    return shared_root;
+		}
+		else {
+		    /* if array is shared, then it is likely it participate in push/shift pattern */
+		    rb_ary_modify(ary);
+		    capa = ARY_CAPA(ary);
+		    if (new_len > capa - (capa >> 6)) {
+			ary_double_capa(ary, new_len);
+		    }
+                    ary_verify(ary);
+		    return ary;
+		}
+	    }
+	}
+        ary_verify(ary);
+        rb_ary_modify(ary);
+    }
+    else {
+	rb_ary_modify_check(ary);
+    }
+    capa = ARY_CAPA(ary);
+    if (new_len > capa) {
+	ary_double_capa(ary, new_len);
+    }
+
+    ary_verify(ary);
+    return ary;
 }
 
 /*
  *  call-seq:
- *     ary.frozen?  -> true or false
+ *      ary.freeze -> ary
+ *
+ *  Calls Object#freeze on +ary+ to prevent any further
+ *  modification. A RuntimeError will be raised if a modification
+ *  attempt is made.
  *
- *  Return <code>true</code> if this array is frozen (or temporarily frozen
- *  while being sorted).
  */
 
-static VALUE
-rb_ary_frozen_p(VALUE ary)
+VALUE
+rb_ary_freeze(VALUE ary)
+{
+    return rb_obj_freeze(ary);
+}
+
+/* This can be used to take a snapshot of an array (with
+   e.g. rb_ary_replace) and check later whether the array has been
+   modified from the snapshot.  The snapshot is cheap, though if
+   something does modify the array it will pay the cost of copying
+   it.  If Array#pop or Array#shift has been called, the array will
+   be still shared with the snapshot, but the array length will
+   differ. */
+VALUE
+rb_ary_shared_with_p(VALUE ary1, VALUE ary2)
 {
-    if (OBJ_FROZEN(ary)) return Qtrue;
+    if (!ARY_EMBED_P(ary1) && ARY_SHARED_P(ary1) &&
+	!ARY_EMBED_P(ary2) && ARY_SHARED_P(ary2) &&
+        RARRAY(ary1)->as.heap.aux.shared_root == RARRAY(ary2)->as.heap.aux.shared_root &&
+	RARRAY(ary1)->as.heap.len == RARRAY(ary2)->as.heap.len) {
+	return Qtrue;
+    }
     return Qfalse;
 }
 
 static VALUE
 ary_alloc(VALUE klass)
 {
-    NEWOBJ(ary, struct RArray);
-    OBJSETUP(ary, klass, T_ARRAY);
-    FL_SET_EMBED((VALUE)ary);
-    ARY_SET_EMBED_LEN((VALUE)ary, 0);
-
+    NEWOBJ_OF(ary, struct RArray, klass, T_ARRAY | RARRAY_EMBED_FLAG | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0));
+    /* Created array is:
+     *   FL_SET_EMBED((VALUE)ary);
+     *   ARY_SET_EMBED_LEN((VALUE)ary, 0);
+     */
     return (VALUE)ary;
 }
 
 static VALUE
+empty_ary_alloc(VALUE klass)
+{
+    RUBY_DTRACE_CREATE_HOOK(ARRAY, 0);
+    return ary_alloc(klass);
+}
+
+static VALUE
 ary_new(VALUE klass, long capa)
 {
-    VALUE ary;
+    VALUE ary,*ptr;
 
     if (capa < 0) {
 	rb_raise(rb_eArgError, "negative array size (or size too big)");
@@ -317,10 +698,14 @@ ary_new(VALUE klass, long capa)
     if (capa > ARY_MAX_SIZE) {
 	rb_raise(rb_eArgError, "array size too big");
     }
+
+    RUBY_DTRACE_CREATE_HOOK(ARRAY, capa);
+
     ary = ary_alloc(klass);
     if (capa > RARRAY_EMBED_LEN_MAX) {
+        ptr = ary_heap_alloc(ary, capa);
         FL_UNSET_EMBED(ary);
-        ARY_SET_PTR(ary, ALLOC_N(VALUE, capa));
+        ARY_SET_PTR(ary, ptr);
         ARY_SET_CAPA(ary, capa);
         ARY_SET_HEAP_LEN(ary, 0);
     }
@@ -329,22 +714,19 @@ ary_new(VALUE klass, long capa)
 }
 
 VALUE
-rb_ary_new2(long capa)
+rb_ary_new_capa(long capa)
 {
     return ary_new(rb_cArray, capa);
 }
 
-
 VALUE
 rb_ary_new(void)
 {
     return rb_ary_new2(RARRAY_EMBED_LEN_MAX);
 }
 
-#include <stdarg.h>
-
 VALUE
-rb_ary_new3(long n, ...)
+(rb_ary_new_from_args)(long n, ...)
 {
     va_list ar;
     VALUE ary;
@@ -354,7 +736,7 @@ rb_ary_new3(long n, ...)
 
     va_start(ar, n);
     for (i=0; i<n; i++) {
-	RARRAY_PTR(ary)[i] = va_arg(ar, VALUE);
+	ARY_SET(ary, i, va_arg(ar, VALUE));
     }
     va_end(ar);
 
@@ -362,14 +744,14 @@ rb_ary_new3(long n, ...)
     return ary;
 }
 
-VALUE
-rb_ary_new4(long n, const VALUE *elts)
+MJIT_FUNC_EXPORTED VALUE
+rb_ary_tmp_new_from_values(VALUE klass, long n, const VALUE *elts)
 {
     VALUE ary;
 
-    ary = rb_ary_new2(n);
+    ary = ary_new(klass, n);
     if (n > 0 && elts) {
-	MEMCPY(RARRAY_PTR(ary), elts, VALUE, n);
+	ary_memcpy(ary, 0, n, elts);
 	ARY_SET_LEN(ary, n);
     }
 
@@ -377,16 +759,56 @@ rb_ary_new4(long n, const VALUE *elts)
 }
 
 VALUE
+rb_ary_new_from_values(long n, const VALUE *elts)
+{
+    return rb_ary_tmp_new_from_values(rb_cArray, n, elts);
+}
+
+VALUE
 rb_ary_tmp_new(long capa)
 {
-    return ary_new(0, capa);
+    VALUE ary = ary_new(0, capa);
+    rb_ary_transient_heap_evacuate(ary, TRUE);
+    return ary;
+}
+
+VALUE
+rb_ary_tmp_new_fill(long capa)
+{
+    VALUE ary = ary_new(0, capa);
+    ary_memfill(ary, 0, capa, Qnil);
+    ARY_SET_LEN(ary, capa);
+    rb_ary_transient_heap_evacuate(ary, TRUE);
+    return ary;
 }
 
 void
 rb_ary_free(VALUE ary)
 {
     if (ARY_OWNS_HEAP_P(ary)) {
-	xfree(ARY_HEAP_PTR(ary));
+        if (USE_DEBUG_COUNTER &&
+            !ARY_SHARED_ROOT_P(ary) &&
+            ARY_HEAP_CAPA(ary) > RARRAY_LEN(ary)) {
+            RB_DEBUG_COUNTER_INC(obj_ary_extracapa);
+        }
+
+        if (RARRAY_TRANSIENT_P(ary)) {
+            RB_DEBUG_COUNTER_INC(obj_ary_transient);
+        }
+        else {
+            RB_DEBUG_COUNTER_INC(obj_ary_ptr);
+            ary_heap_free(ary);
+        }
+    }
+    else {
+        RB_DEBUG_COUNTER_INC(obj_ary_embed);
+    }
+
+    if (ARY_SHARED_P(ary)) {
+        RB_DEBUG_COUNTER_INC(obj_ary_shared);
+    }
+    if (ARY_SHARED_ROOT_P(ary) && ARY_SHARED_ROOT_OCCUPIED(ary)) {
+        RB_DEBUG_COUNTER_INC(obj_ary_shared_root_occupied);
     }
 }
 
@@ -394,7 +816,7 @@ RUBY_FUNC_EXPORTED size_t
 rb_ary_memsize(VALUE ary)
 {
     if (ARY_OWNS_HEAP_P(ary)) {
-	return RARRAY(ary)->as.heap.aux.capa * sizeof(VALUE);
+	return ARY_CAPA(ary) * sizeof(VALUE);
     }
     else {
 	return 0;
@@ -406,49 +828,63 @@ ary_discard(VALUE ary)
 {
     rb_ary_free(ary);
     RBASIC(ary)->flags |= RARRAY_EMBED_FLAG;
-    RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK;
+    RBASIC(ary)->flags &= ~(RARRAY_EMBED_LEN_MASK | RARRAY_TRANSIENT_FLAG);
 }
 
 static VALUE
 ary_make_shared(VALUE ary)
 {
     assert(!ARY_EMBED_P(ary));
+    ary_verify(ary);
+
     if (ARY_SHARED_P(ary)) {
-	return ARY_SHARED(ary);
+        return ARY_SHARED_ROOT(ary);
     }
     else if (ARY_SHARED_ROOT_P(ary)) {
 	return ary;
     }
     else if (OBJ_FROZEN(ary)) {
-	ary_resize_capa(ary, ARY_HEAP_LEN(ary));
+        rb_ary_transient_heap_evacuate(ary, TRUE);
+	ary_shrink_capa(ary);
 	FL_SET_SHARED_ROOT(ary);
-	ARY_SET_SHARED_NUM(ary, 1);
+        ARY_SET_SHARED_ROOT_REFCNT(ary, 1);
 	return ary;
     }
     else {
-	NEWOBJ(shared, struct RArray);
-	OBJSETUP(shared, 0, T_ARRAY);
-        FL_UNSET_EMBED(shared);
+	long capa = ARY_CAPA(ary), len = RARRAY_LEN(ary);
+        const VALUE *ptr;
+	NEWOBJ_OF(shared, struct RArray, 0, T_ARRAY | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0));
+
+        rb_ary_transient_heap_evacuate(ary, TRUE);
+        ptr = ARY_HEAP_PTR(ary);
 
-        ARY_SET_LEN((VALUE)shared, RARRAY_LEN(ary));
-        ARY_SET_PTR((VALUE)shared, RARRAY_PTR(ary));
+        FL_UNSET_EMBED(shared);
+	ARY_SET_LEN((VALUE)shared, capa);
+        ARY_SET_PTR((VALUE)shared, ptr);
+        ary_mem_clear((VALUE)shared, len, capa - len);
 	FL_SET_SHARED_ROOT(shared);
-	ARY_SET_SHARED_NUM((VALUE)shared, 1);
+        ARY_SET_SHARED_ROOT_REFCNT((VALUE)shared, 1);
 	FL_SET_SHARED(ary);
+        RB_DEBUG_COUNTER_INC(obj_ary_shared_create);
 	ARY_SET_SHARED(ary, (VALUE)shared);
 	OBJ_FREEZE(shared);
-	return (VALUE)shared;
+
+        ary_verify((VALUE)shared);
+        ary_verify(ary);
+
+        return (VALUE)shared;
     }
 }
 
-
 static VALUE
 ary_make_substitution(VALUE ary)
 {
-    if (RARRAY_LEN(ary) <= RARRAY_EMBED_LEN_MAX) {
-        VALUE subst = rb_ary_new2(RARRAY_LEN(ary));
-        MEMCPY(ARY_EMBED_PTR(subst), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
-        ARY_SET_EMBED_LEN(subst, RARRAY_LEN(ary));
+    long len = RARRAY_LEN(ary);
+
+    if (len <= RARRAY_EMBED_LEN_MAX) {
+	VALUE subst = rb_ary_new2(len);
+        ary_memcpy(subst, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary));
+        ARY_SET_EMBED_LEN(subst, len);
         return subst;
     }
     else {
@@ -462,26 +898,32 @@ rb_assoc_new(VALUE car, VALUE cdr)
     return rb_ary_new3(2, car, cdr);
 }
 
-static VALUE
-to_ary(VALUE ary)
+VALUE
+rb_to_array_type(VALUE ary)
 {
-    return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
+    return rb_convert_type_with_id(ary, T_ARRAY, "Array", idTo_ary);
 }
+#define to_ary rb_to_array_type
 
 VALUE
 rb_check_array_type(VALUE ary)
 {
-    return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary");
+    return rb_check_convert_type_with_id(ary, T_ARRAY, "Array", idTo_ary);
+}
+
+MJIT_FUNC_EXPORTED VALUE
+rb_check_to_array(VALUE ary)
+{
+    return rb_check_convert_type_with_id(ary, T_ARRAY, "Array", idTo_a);
 }
 
 /*
  *  call-seq:
  *     Array.try_convert(obj) -> array or nil
  *
- *  Try to convert <i>obj</i> into an array, using +to_ary+ method.
- *  Returns converted array or +nil+ if <i>obj</i> cannot be converted
- *  for any reason. This method can be used to check if an argument is an
- *  array.
+ *  Tries to convert +obj+ into an array, using the +to_ary+ method.  Returns
+ *  the converted array or +nil+ if +obj+ cannot be converted.
+ *  This method can be used to check if an argument is an array.
  *
  *     Array.try_convert([1])   #=> [1]
  *     Array.try_convert("1")   #=> nil
@@ -502,40 +944,58 @@ rb_ary_s_try_convert(VALUE dummy, VALUE ary)
 
 /*
  *  call-seq:
- *     Array.new(size=0, obj=nil)
+ *     Array.new(size=0, default=nil)
  *     Array.new(array)
  *     Array.new(size) {|index| block }
  *
- *  Returns a new array. In the first form, the new array is
- *  empty. In the second it is created with _size_ copies of _obj_
- *  (that is, _size_ references to the same
- *  _obj_). The third form creates a copy of the array
- *  passed as a parameter (the array is generated by calling
- *  to_ary  on the parameter). In the last form, an array
- *  of the given size is created. Each element in this array is
- *  calculated by passing the element's index to the given block and
- *  storing the return value.
- *
- *     Array.new
- *     Array.new(2)
- *     Array.new(5, "A")
- *
- *     # only one copy of the object is created
+ *  Returns a new array.
+ *
+ *  In the first form, if no arguments are sent, the new array will be empty.
+ *  When a +size+ and an optional +default+ are sent, an array is created with
+ *  +size+ copies of +default+.  Take notice that all elements will reference the
+ *  same object +default+.
+ *
+ *  The second form creates a copy of the array passed as a parameter (the
+ *  array is generated by calling to_ary on the parameter).
+ *
+ *    first_array = ["Matz", "Guido"]
+ *
+ *    second_array = Array.new(first_array) #=> ["Matz", "Guido"]
+ *
+ *    first_array.equal? second_array       #=> false
+ *
+ *  In the last form, an array of the given size is created.  Each element in
+ *  this array is created by passing the element's index to the given block
+ *  and storing the return value.
+ *
+ *    Array.new(3) {|index| index ** 2}
+ *    # => [0, 1, 4]
+ *
+ *  == Common gotchas
+ *
+ *  When sending the second parameter, the same object will be used as the
+ *  value for all the array elements:
+ *
  *     a = Array.new(2, Hash.new)
+ *     # => [{}, {}]
+ *
  *     a[0]['cat'] = 'feline'
- *     a
+ *     a # => [{"cat"=>"feline"}, {"cat"=>"feline"}]
+ *
  *     a[1]['cat'] = 'Felix'
- *     a
+ *     a # => [{"cat"=>"Felix"}, {"cat"=>"Felix"}]
  *
- *     # here multiple copies are created
- *     a = Array.new(2) { Hash.new }
- *     a[0]['cat'] = 'feline'
- *     a
+ *  Since all the Array elements store the same hash, changes to one of them
+ *  will affect them all.
+ *
+ *  If multiple copies are what you want, you should use the block
+ *  version which uses the result of that block each time an element
+ *  of the array needs to be initialized:
  *
- *     squares = Array.new(5) {|i| i*i}
- *     squares
+ *     a = Array.new(2) {Hash.new}
+ *     a[0]['cat'] = 'feline'
+ *     a # => [{"cat"=>"feline"}, {}]
  *
- *     copy = Array.new(squares)
  */
 
 static VALUE
@@ -546,8 +1006,8 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 
     rb_ary_modify(ary);
     if (argc == 0) {
-	if (ARY_OWNS_HEAP_P(ary) && RARRAY_PTR(ary)) {
-	    xfree(RARRAY_PTR(ary));
+        if (ARY_OWNS_HEAP_P(ary) && ARY_HEAP_PTR(ary) != NULL) {
+            ary_heap_free(ary);
 	}
         rb_ary_unshare_safe(ary);
         FL_SET_EMBED(ary);
@@ -567,12 +1027,14 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
     }
 
     len = NUM2LONG(size);
+    /* NUM2LONG() may call size.to_int, ary can be frozen, modified, etc */
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative array size");
     }
     if (len > ARY_MAX_SIZE) {
 	rb_raise(rb_eArgError, "array size too big");
     }
+    /* recheck after argument conversion */
     rb_ary_modify(ary);
     ary_resize_capa(ary, len);
     if (rb_block_given_p()) {
@@ -587,27 +1049,26 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 	}
     }
     else {
-	memfill(RARRAY_PTR(ary), len, val);
+	ary_memfill(ary, 0, len, val);
 	ARY_SET_LEN(ary, len);
     }
     return ary;
 }
 
-
 /*
-* Returns a new array populated with the given objects.
-*
-*   Array.[]( 1, 'a', /^A/ )
-*   Array[ 1, 'a', /^A/ ]
-*   [ 1, 'a', /^A/ ]
-*/
+ * Returns a new array populated with the given objects.
+ *
+ *   Array.[]( 1, 'a', /^A/)  # => [1, "a", /^A/]
+ *   Array[ 1, 'a', /^A/ ]    # => [1, "a", /^A/]
+ *   [ 1, 'a', /^A/ ]         # => [1, "a", /^A/]
+ */
 
 static VALUE
 rb_ary_s_create(int argc, VALUE *argv, VALUE klass)
 {
     VALUE ary = ary_new(klass, argc);
     if (argc > 0 && argv) {
-        MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc);
+        ary_memcpy(ary, 0, argc, argv);
         ARY_SET_LEN(ary, argc);
     }
 
@@ -617,11 +1078,13 @@ rb_ary_s_create(int argc, VALUE *argv, VALUE klass)
 void
 rb_ary_store(VALUE ary, long idx, VALUE val)
 {
+    long len = RARRAY_LEN(ary);
+
     if (idx < 0) {
-	idx += RARRAY_LEN(ary);
+	idx += len;
 	if (idx < 0) {
 	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
-		     idx - RARRAY_LEN(ary), -RARRAY_LEN(ary));
+		     idx - len, -len);
 	}
     }
     else if (idx >= ARY_MAX_SIZE) {
@@ -632,15 +1095,14 @@ rb_ary_store(VALUE ary, long idx, VALUE val)
     if (idx >= ARY_CAPA(ary)) {
 	ary_double_capa(ary, idx);
     }
-    if (idx > RARRAY_LEN(ary)) {
-	rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary),
-		     idx-RARRAY_LEN(ary) + 1);
+    if (idx > len) {
+	ary_mem_clear(ary, len, idx - len + 1);
     }
 
-    if (idx >= RARRAY_LEN(ary)) {
+    if (idx >= len) {
 	ARY_SET_LEN(ary, idx + 1);
     }
-    RARRAY_PTR(ary)[idx] = val;
+    ARY_SET(ary, idx, val);
 }
 
 static VALUE
@@ -652,7 +1114,7 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
 
     if (len <= RARRAY_EMBED_LEN_MAX) {
         VALUE result = ary_alloc(klass);
-        MEMCPY(ARY_EMBED_PTR(result), RARRAY_PTR(ary) + offset, VALUE, len);
+        ary_memcpy(result, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary) + offset);
         ARY_SET_EMBED_LEN(result, len);
         return result;
     }
@@ -661,12 +1123,15 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
         FL_UNSET_EMBED(result);
 
         shared = ary_make_shared(ary);
-        ARY_SET_PTR(result, RARRAY_PTR(ary));
+        ARY_SET_PTR(result, RARRAY_CONST_PTR_TRANSIENT(ary));
         ARY_SET_LEN(result, RARRAY_LEN(ary));
         rb_ary_set_shared(result, shared);
 
         ARY_INCREASE_PTR(result, offset);
         ARY_SET_LEN(result, len);
+
+        ary_verify(shared);
+        ary_verify(result);
         return result;
     }
 }
@@ -684,28 +1149,32 @@ enum ary_take_pos_flags
 };
 
 static VALUE
-ary_take_first_or_last(int argc, VALUE *argv, VALUE ary, enum ary_take_pos_flags last)
+ary_take_first_or_last(int argc, const VALUE *argv, VALUE ary, enum ary_take_pos_flags last)
 {
-    VALUE nv;
     long n;
+    long len;
     long offset = 0;
 
-    rb_scan_args(argc, argv, "1", &nv);
-    n = NUM2LONG(nv);
-    if (n > RARRAY_LEN(ary)) {
-	n = RARRAY_LEN(ary);
+    argc = rb_check_arity(argc, 0, 1);
+    /* the case optional argument is omitted should be handled in
+     * callers of this function.  if another arity case is added,
+     * this arity check needs to rewrite. */
+    RUBY_ASSERT_ALWAYS(argc == 1);
+
+    n = NUM2LONG(argv[0]);
+    len = RARRAY_LEN(ary);
+    if (n > len) {
+	n = len;
     }
     else if (n < 0) {
 	rb_raise(rb_eArgError, "negative array size");
     }
     if (last) {
-	offset = RARRAY_LEN(ary) - n;
+	offset = len - n;
     }
     return ary_make_partial(ary, rb_cArray, offset, n);
 }
 
-static VALUE rb_ary_push_1(VALUE ary, VALUE item);
-
 /*
  *  call-seq:
  *     ary << obj            -> ary
@@ -714,7 +1183,10 @@ static VALUE rb_ary_push_1(VALUE ary, VALUE item);
  *  expression returns the array itself, so several appends
  *  may be chained together.
  *
- *     [ 1, 2 ] << "c" << "d" << [ 3, 4 ]
+ *     a = [ 1, 2 ]
+ *     a << "c" << "d" << [ 3, 4 ]
+ *             #=>  [ 1, 2, "c", "d", [ 3, 4 ] ]
+ *     a
  *             #=>  [ 1, 2, "c", "d", [ 3, 4 ] ]
  *
  */
@@ -722,44 +1194,47 @@ static VALUE rb_ary_push_1(VALUE ary, VALUE item);
 VALUE
 rb_ary_push(VALUE ary, VALUE item)
 {
-    rb_ary_modify(ary);
-    return rb_ary_push_1(ary, item);
+    long idx = RARRAY_LEN((ary_verify(ary), ary));
+    VALUE target_ary = ary_ensure_room_for_push(ary, 1);
+    RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+	RB_OBJ_WRITE(target_ary, &ptr[idx], item);
+    });
+    ARY_SET_LEN(ary, idx + 1);
+    ary_verify(ary);
+    return ary;
 }
 
-static VALUE
-rb_ary_push_1(VALUE ary, VALUE item)
+VALUE
+rb_ary_cat(VALUE ary, const VALUE *argv, long len)
 {
-    long idx = RARRAY_LEN(ary);
-
-    if (idx >= ARY_CAPA(ary)) {
-	ary_double_capa(ary, idx);
-    }
-    RARRAY_PTR(ary)[idx] = item;
-    ARY_SET_LEN(ary, idx + 1);
+    long oldlen = RARRAY_LEN(ary);
+    VALUE target_ary = ary_ensure_room_for_push(ary, len);
+    ary_memcpy0(ary, oldlen, len, argv, target_ary);
+    ARY_SET_LEN(ary, oldlen + len);
     return ary;
 }
 
 /*
  *  call-seq:
- *     ary.push(obj, ... )   -> ary
+ *     ary.push(obj, ...)    -> ary
+ *     ary.append(obj, ...)  -> ary
  *
- *  Append---Pushes the given object(s) on to the end of this array. This
+ *  Append --- Pushes the given object(s) on to the end of this array. This
  *  expression returns the array itself, so several appends
- *  may be chained together.
+ *  may be chained together. See also Array#pop for the opposite
+ *  effect.
  *
  *     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, 4, 5]
  */
 
 static VALUE
 rb_ary_push_m(int argc, VALUE *argv, VALUE ary)
 {
-    rb_ary_modify(ary);
-    while (argc--) {
-	rb_ary_push_1(ary, *argv++);
-    }
-    return ary;
+    return rb_ary_cat(ary, argv, argc);
 }
 
 VALUE
@@ -767,16 +1242,18 @@ rb_ary_pop(VALUE ary)
 {
     long n;
     rb_ary_modify_check(ary);
-    if (RARRAY_LEN(ary) == 0) return Qnil;
+    n = RARRAY_LEN(ary);
+    if (n == 0) return Qnil;
     if (ARY_OWNS_HEAP_P(ary) &&
-	RARRAY_LEN(ary) * 3 < ARY_CAPA(ary) &&
+	n * 3 < ARY_CAPA(ary) &&
 	ARY_CAPA(ary) > ARY_DEFAULT_SIZE)
     {
-	ary_resize_capa(ary, RARRAY_LEN(ary) * 2);
+	ary_resize_capa(ary, n * 2);
     }
-    n = RARRAY_LEN(ary)-1;
+    --n;
     ARY_SET_LEN(ary, n);
-    return RARRAY_PTR(ary)[n];
+    ary_verify(ary);
+    return RARRAY_AREF(ary, n);
 }
 
 /*
@@ -785,10 +1262,11 @@ rb_ary_pop(VALUE ary)
  *     ary.pop(n) -> new_ary
  *
  *  Removes the last element from +self+ and returns it, or
- *  <code>nil</code> if the array is empty.
+ *  +nil+ if the array is empty.
  *
- *  If a number _n_ is given, returns an array of the last n elements
- *  (or less) just like <code>array.slice!(-n, n)</code> does.
+ *  If a number +n+ is given, returns an array of the last +n+ elements
+ *  (or less) just like <code>array.slice!(-n, n)</code> does. See also
+ *  Array#push for the opposite effect.
  *
  *     a = [ "a", "b", "c", "d" ]
  *     a.pop     #=> "d"
@@ -808,6 +1286,7 @@ rb_ary_pop_m(int argc, VALUE *argv, VALUE ary)
     rb_ary_modify_check(ary);
     result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
     ARY_INCREASE_LEN(ary, -RARRAY_LEN(result));
+    ary_verify(ary);
     return result;
 }
 
@@ -815,27 +1294,33 @@ VALUE
 rb_ary_shift(VALUE ary)
 {
     VALUE top;
+    long len = RARRAY_LEN(ary);
 
     rb_ary_modify_check(ary);
-    if (RARRAY_LEN(ary) == 0) return Qnil;
-    top = RARRAY_PTR(ary)[0];
+    if (len == 0) return Qnil;
+    top = RARRAY_AREF(ary, 0);
     if (!ARY_SHARED_P(ary)) {
-	if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) {
-	    MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1);
+	if (len < ARY_DEFAULT_SIZE) {
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+		MEMMOVE(ptr, ptr+1, VALUE, len-1);
+	    }); /* WB: no new reference */
             ARY_INCREASE_LEN(ary, -1);
+            ary_verify(ary);
 	    return top;
 	}
         assert(!ARY_EMBED_P(ary)); /* ARY_EMBED_LEN_MAX < ARY_DEFAULT_SIZE */
 
-	RARRAY_PTR(ary)[0] = Qnil;
+	ARY_SET(ary, 0, Qnil);
 	ary_make_shared(ary);
     }
-    else if (ARY_SHARED_NUM(ARY_SHARED(ary)) == 1) {
-	RARRAY_PTR(ary)[0] = Qnil;
+    else if (ARY_SHARED_ROOT_OCCUPIED(ARY_SHARED_ROOT(ary))) {
+        RARRAY_PTR_USE_TRANSIENT(ary, ptr, ptr[0] = Qnil);
     }
     ARY_INCREASE_PTR(ary, 1);		/* shift ptr */
     ARY_INCREASE_LEN(ary, -1);
 
+    ary_verify(ary);
+
     return top;
 }
 
@@ -844,12 +1329,14 @@ rb_ary_shift(VALUE ary)
  *     ary.shift    -> obj or nil
  *     ary.shift(n) -> new_ary
  *
- *  Returns the first element of +self+ and removes it (shifting all
- *  other elements down by one). Returns <code>nil</code> if the array
+ *  Removes the first element of +self+ and returns it (shifting all
+ *  other elements down by one). Returns +nil+ if the array
  *  is empty.
  *
- *  If a number _n_ is given, returns an array of the first n elements
- *  (or less) just like <code>array.slice!(0, n)</code> does.
+ *  If a number +n+ is given, returns an array of the first +n+ elements
+ *  (or less) just like <code>array.slice!(0, n)</code> does. With +ary+
+ *  containing only the remainder elements, not including what was shifted to
+ *  +new_ary+. See also Array#unshift for the opposite effect.
  *
  *     args = [ "-m", "-q", "filename" ]
  *     args.shift     #=> "-m"
@@ -873,26 +1360,113 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
     rb_ary_modify_check(ary);
     result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
     n = RARRAY_LEN(result);
+    rb_ary_behead(ary,n);
+
+    return result;
+}
+
+MJIT_FUNC_EXPORTED VALUE
+rb_ary_behead(VALUE ary, long n)
+{
+    if (n<=0) return ary;
+
+    rb_ary_modify_check(ary);
     if (ARY_SHARED_P(ary)) {
-	if (ARY_SHARED_NUM(ARY_SHARED(ary)) == 1) {
-	    rb_mem_clear(RARRAY_PTR(ary), n);
+        if (ARY_SHARED_ROOT_OCCUPIED(ARY_SHARED_ROOT(ary))) {
+	  setup_occupied_shared:
+	    ary_mem_clear(ary, 0, n);
 	}
         ARY_INCREASE_PTR(ary, n);
     }
     else {
-	MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+n, VALUE, RARRAY_LEN(ary)-n);
+	if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) {
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+                MEMMOVE(ptr, ptr+n, VALUE, RARRAY_LEN(ary)-n);
+	    }); /* WB: no new reference */
+	}
+	else {
+	    ary_make_shared(ary);
+	    goto setup_occupied_shared;
+	}
     }
     ARY_INCREASE_LEN(ary, -n);
 
-    return result;
+    ary_verify(ary);
+    return ary;
+}
+
+static VALUE
+ary_ensure_room_for_unshift(VALUE ary, int argc)
+{
+    long len = RARRAY_LEN(ary);
+    long new_len = len + 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_root = ARY_SHARED_ROOT(ary);
+        capa = RARRAY_LEN(shared_root);
+        if (ARY_SHARED_ROOT_OCCUPIED(shared_root) && capa > new_len) {
+            rb_ary_modify_check(ary);
+            head = RARRAY_CONST_PTR_TRANSIENT(ary);
+            sharedp = RARRAY_CONST_PTR_TRANSIENT(shared_root);
+	    goto makeroom_if_need;
+	}
+    }
+
+    rb_ary_modify(ary);
+    capa = ARY_CAPA(ary);
+    if (capa - (capa >> 6) <= new_len) {
+	ary_double_capa(ary, new_len);
+    }
+
+    /* use shared array for big "queues" */
+    if (new_len > ARY_DEFAULT_SIZE * 4) {
+        ary_verify(ary);
+
+        /* make a room for unshifted items */
+	capa = ARY_CAPA(ary);
+	ary_make_shared(ary);
+
+        head = sharedp = RARRAY_CONST_PTR_TRANSIENT(ary);
+	goto makeroom;
+      makeroom_if_need:
+	if (head - sharedp < argc) {
+	    long room;
+	  makeroom:
+	    room = capa - new_len;
+	    room -= room >> 4;
+	    MEMMOVE((VALUE *)sharedp + argc + room, head, VALUE, len);
+	    head = sharedp + argc + room;
+	}
+	ARY_SET_PTR(ary, head - argc);
+        assert(ARY_SHARED_ROOT_OCCUPIED(ARY_SHARED_ROOT(ary)));
+
+        ary_verify(ary);
+        return ARY_SHARED_ROOT(ary);
+    }
+    else {
+	/* sliding items */
+        RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+	    MEMMOVE(ptr + argc, ptr, VALUE, len);
+	});
+
+        ary_verify(ary);
+	return ary;
+    }
 }
 
 /*
  *  call-seq:
  *     ary.unshift(obj, ...)  -> ary
+ *     ary.prepend(obj, ...)  -> ary
  *
- *  Prepends objects to the front of +self+,
- *  moving other elements upwards.
+ *  Prepends objects to the front of +self+, moving other elements upwards.
+ *  See also Array#shift for the opposite effect.
  *
  *     a = [ "b", "c", "d" ]
  *     a.unshift("a")   #=> ["a", "b", "c", "d"]
@@ -902,19 +1476,17 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
 static VALUE
 rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary)
 {
-    long len;
+    long len = RARRAY_LEN(ary);
+    VALUE target_ary;
 
-    rb_ary_modify(ary);
-    if (argc == 0) return ary;
-    if (ARY_CAPA(ary) <= (len = RARRAY_LEN(ary)) + argc) {
-	ary_double_capa(ary, len + argc);
+    if (argc == 0) {
+	rb_ary_modify_check(ary);
+	return ary;
     }
 
-    /* sliding items */
-    MEMMOVE(RARRAY_PTR(ary) + argc, RARRAY_PTR(ary), VALUE, len);
-    MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc);
-    ARY_INCREASE_LEN(ary, argc);
-
+    target_ary = ary_ensure_room_for_unshift(ary, argc);
+    ary_memcpy0(ary, 0, argc, argv, target_ary);
+    ARY_SET_LEN(ary, len + argc);
     return ary;
 }
 
@@ -928,32 +1500,31 @@ rb_ary_unshift(VALUE ary, VALUE item)
 static inline VALUE
 rb_ary_elt(VALUE ary, long offset)
 {
-    if (RARRAY_LEN(ary) == 0) return Qnil;
-    if (offset < 0 || RARRAY_LEN(ary) <= offset) {
+    long len = RARRAY_LEN(ary);
+    if (len == 0) return Qnil;
+    if (offset < 0 || len <= offset) {
 	return Qnil;
     }
-    return RARRAY_PTR(ary)[offset];
+    return RARRAY_AREF(ary, offset);
 }
 
 VALUE
 rb_ary_entry(VALUE ary, long offset)
 {
-    if (offset < 0) {
-	offset += RARRAY_LEN(ary);
-    }
-    return rb_ary_elt(ary, offset);
+    return rb_ary_entry_internal(ary, offset);
 }
 
 VALUE
 rb_ary_subseq(VALUE ary, long beg, long len)
 {
     VALUE klass;
+    long alen = RARRAY_LEN(ary);
 
-    if (beg > RARRAY_LEN(ary)) return Qnil;
+    if (beg > alen) return Qnil;
     if (beg < 0 || len < 0) return Qnil;
 
-    if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) {
-	len = RARRAY_LEN(ary) - beg;
+    if (alen < len || alen < beg + len) {
+	len = alen - beg;
     }
     klass = rb_obj_class(ary);
     if (len == 0) return ary_new(klass, 0);
@@ -961,6 +1532,8 @@ rb_ary_subseq(VALUE ary, long beg, long len)
     return ary_make_partial(ary, klass, beg, len);
 }
 
+static VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e);
+
 /*
  *  call-seq:
  *     ary[index]                -> obj     or nil
@@ -970,13 +1543,16 @@ rb_ary_subseq(VALUE ary, long beg, long len)
  *     ary.slice(start, length)  -> new_ary or nil
  *     ary.slice(range)          -> new_ary or nil
  *
- *  Element Reference---Returns the element at _index_,
- *  or returns a subarray starting at _start_ and
- *  continuing for _length_ elements, or returns a subarray
- *  specified by _range_.
- *  Negative indices count backward from the end of the
- *  array (-1 is the last element). Returns +nil+ if the index
- *  (or starting index) are out of range.
+ *  Element Reference --- Returns the element at +index+, or returns a
+ *  subarray starting at the +start+ index and continuing for +length+
+ *  elements, or returns a subarray specified by +range+ of indices.
+ *
+ *  Negative indices count backward from the end of the array (-1 is the last
+ *  element).  For +start+ and +range+ cases the starting index is just before
+ *  an element.  Additionally, an empty array is returned when the starting
+ *  index for an element range is at the end of the array.
+ *
+ *  Returns +nil+ if the index (or starting index) are out of range.
  *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a[2] +  a[0] + a[1]    #=> "cab"
@@ -988,29 +1564,38 @@ rb_ary_subseq(VALUE ary, long beg, long len)
  *     a[-3, 3]               #=> [ "c", "d", "e" ]
  *     # special cases
  *     a[5]                   #=> nil
+ *     a[6, 1]                #=> nil
  *     a[5, 1]                #=> []
  *     a[5..10]               #=> []
  *
  */
 
 VALUE
-rb_ary_aref(int argc, VALUE *argv, VALUE ary)
+rb_ary_aref(int argc, const VALUE *argv, VALUE ary)
 {
-    VALUE arg;
-    long beg, len;
-
+    rb_check_arity(argc, 1, 2);
     if (argc == 2) {
-	beg = NUM2LONG(argv[0]);
-	len = NUM2LONG(argv[1]);
-	if (beg < 0) {
-	    beg += RARRAY_LEN(ary);
-	}
-	return rb_ary_subseq(ary, beg, len);
+	return rb_ary_aref2(ary, argv[0], argv[1]);
     }
-    if (argc != 1) {
-	rb_scan_args(argc, argv, "11", 0, 0);
+    return rb_ary_aref1(ary, argv[0]);
+}
+
+VALUE
+rb_ary_aref2(VALUE ary, VALUE b, VALUE e)
+{
+    long beg = NUM2LONG(b);
+    long len = NUM2LONG(e);
+    if (beg < 0) {
+	beg += RARRAY_LEN(ary);
     }
-    arg = argv[0];
+    return rb_ary_subseq(ary, beg, len);
+}
+
+MJIT_FUNC_EXPORTED VALUE
+rb_ary_aref1(VALUE ary, VALUE arg)
+{
+    long beg, len;
+
     /* special case - speeding up */
     if (FIXNUM_P(arg)) {
 	return rb_ary_entry(ary, FIX2LONG(arg));
@@ -1031,16 +1616,16 @@ rb_ary_aref(int argc, VALUE *argv, VALUE ary)
  *  call-seq:
  *     ary.at(index)   ->   obj  or nil
  *
- *  Returns the element at _index_. A
- *  negative index counts from the end of +self+.  Returns +nil+
- *  if the index is out of range. See also <code>Array#[]</code>.
+ *  Returns the element at +index+. A negative index counts from the end of
+ *  +self+. Returns +nil+ if the index is out of range. See also
+ *  Array#[].
  *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a.at(0)     #=> "a"
  *     a.at(-1)    #=> "e"
  */
 
-static VALUE
+VALUE
 rb_ary_at(VALUE ary, VALUE pos)
 {
     return rb_ary_entry(ary, NUM2LONG(pos));
@@ -1052,8 +1637,9 @@ rb_ary_at(VALUE ary, VALUE pos)
  *     ary.first(n)  ->   new_ary
  *
  *  Returns the first element, or the first +n+ elements, of the array.
- *  If the array is empty, the first form returns <code>nil</code>, and the
- *  second form returns an empty array.
+ *  If the array is empty, the first form returns +nil+, and the
+ *  second form returns an empty array. See also Array#last for
+ *  the opposite effect.
  *
  *     a = [ "q", "r", "s", "t" ]
  *     a.first     #=> "q"
@@ -1065,7 +1651,7 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary)
 {
     if (argc == 0) {
 	if (RARRAY_LEN(ary) == 0) return Qnil;
-	return RARRAY_PTR(ary)[0];
+	return RARRAY_AREF(ary, 0);
     }
     else {
 	return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
@@ -1078,7 +1664,9 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary)
  *     ary.last(n)  ->  new_ary
  *
  *  Returns the last element(s) of +self+. If the array is empty,
- *  the first form returns <code>nil</code>.
+ *  the first form returns +nil+.
+ *
+ *  See also Array#first for the opposite effect.
  *
  *     a = [ "w", "x", "y", "z" ]
  *     a.last     #=> "z"
@@ -1086,11 +1674,12 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary)
  */
 
 VALUE
-rb_ary_last(int argc, VALUE *argv, VALUE ary)
+rb_ary_last(int argc, const VALUE *argv, VALUE ary)
 {
     if (argc == 0) {
-	if (RARRAY_LEN(ary) == 0) return Qnil;
-	return RARRAY_PTR(ary)[RARRAY_LEN(ary)-1];
+	long len = RARRAY_LEN(ary);
+	if (len == 0) return Qnil;
+	return RARRAY_AREF(ary, len-1);
     }
     else {
 	return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
@@ -1100,21 +1689,25 @@ rb_ary_last(int argc, VALUE *argv, VALUE ary)
 /*
  *  call-seq:
  *     ary.fetch(index)                    -> obj
- *     ary.fetch(index, default )          -> obj
- *     ary.fetch(index) {|index| block }   -> obj
+ *     ary.fetch(index, default)           -> obj
+ *     ary.fetch(index) {|index| block}    -> obj
+ *
+ *  Tries to return the element at position +index+, but throws an IndexError
+ *  exception if the referenced +index+ lies outside of the array bounds.  This
+ *  error can be prevented by supplying a second argument, which will act as a
+ *  +default+ value.
  *
- *  Tries to return the element at position <i>index</i>. If the index
- *  lies outside the array, the first form throws an
- *  <code>IndexError</code> exception, the second form returns
- *  <i>default</i>, and the third form returns the value of invoking
- *  the block, passing in the index. Negative values of <i>index</i>
- *  count from the end of the array.
+ *  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.
  *
  *     a = [ 11, 22, 33, 44 ]
  *     a.fetch(1)               #=> 22
  *     a.fetch(-1)              #=> 44
  *     a.fetch(4, 'cat')        #=> "cat"
- *     a.fetch(4) { |i| i*i }   #=> 16
+ *     a.fetch(100) {|i| puts "#{i} is out of bounds"}
+ *                              #=> "100 is out of bounds"
  */
 
 static VALUE
@@ -1142,29 +1735,33 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
 	}
 	return ifnone;
     }
-    return RARRAY_PTR(ary)[idx];
+    return RARRAY_AREF(ary, idx);
 }
 
 /*
  *  call-seq:
- *     ary.index(obj)           ->  int or nil
- *     ary.index {|item| block} ->  int or nil
- *     ary.index                ->  an_enumerator
+ *     ary.find_index(obj)             ->  int or nil
+ *     ary.find_index {|item| block}  ->  int or nil
+ *     ary.find_index                  ->  Enumerator
+ *     ary.index(obj)             ->  int or nil
+ *     ary.index {|item| block}   ->  int or nil
+ *     ary.index                  ->  Enumerator
  *
- *  Returns the index of the first object in +self+ such that the object is
- *  <code>==</code> to <i>obj</i>. If a block is given instead of an
- *  argument, returns index of first object for which <em>block</em> is true.
- *  Returns <code>nil</code> if no match is found.
- *  See also <code>Array#rindex</code>.
+ *  Returns the _index_ of the first object in +ary+ such that the object is
+ *  <code>==</code> to +obj+.
  *
- *  If neither block nor argument is given, an enumerator is returned instead.
+ *  If a block is given instead of an argument, returns the _index_ of the
+ *  first object for which the block returns +true+.  Returns +nil+ if no
+ *  match is found.
  *
- *     a = [ "a", "b", "c" ]
- *     a.index("b")        #=> 1
- *     a.index("z")        #=> nil
- *     a.index{|x|x=="b"}  #=> 1
+ *  See also Array#rindex.
  *
- *  This is an alias of <code>#find_index</code>.
+ *  An Enumerator is returned if neither a block nor argument is given.
+ *
+ *     a = [ "a", "b", "c" ]
+ *     a.index("b")              #=> 1
+ *     a.index("z")              #=> nil
+ *     a.index {|x| x == "b"}    #=> 1
  */
 
 static VALUE
@@ -1176,69 +1773,78 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
     if (argc == 0) {
 	RETURN_ENUMERATOR(ary, 0, 0);
 	for (i=0; i<RARRAY_LEN(ary); i++) {
-	    if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
+	    if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) {
 		return LONG2NUM(i);
 	    }
 	}
 	return Qnil;
     }
-    rb_scan_args(argc, argv, "1", &val);
+    rb_check_arity(argc, 0, 1);
+    val = argv[0];
     if (rb_block_given_p())
 	rb_warn("given block not used");
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	if (rb_equal(RARRAY_PTR(ary)[i], val))
+	VALUE e = RARRAY_AREF(ary, i);
+	if (rb_equal(e, val)) {
 	    return LONG2NUM(i);
+	}
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     ary.rindex(obj)           ->  int or nil
- *     ary.rindex {|item| block} ->  int or nil
- *     ary.rindex                ->  an_enumerator
+ *     ary.rindex(obj)             ->  int or nil
+ *     ary.rindex {|item| block}   ->  int or nil
+ *     ary.rindex                  ->  Enumerator
+ *
+ *  Returns the _index_ of the last object in +self+ <code>==</code> to +obj+.
+ *
+ *  If a block is given instead of an argument, returns the _index_ of the
+ *  first object for which the block returns +true+, starting from the last
+ *  object.
+ *
+ *  Returns +nil+ if no match is found.
  *
- *  Returns the index of the last object in +self+
- *  <code>==</code> to <i>obj</i>. If a block is given instead of an
- *  argument, returns index of first object for which <em>block</em> is
- *  true, starting from the last object.
- *  Returns <code>nil</code> if no match is found.
- *  See also <code>Array#index</code>.
+ *  See also Array#index.
  *
- *  If neither block nor argument is given, an enumerator is returned instead.
+ *  If neither block nor argument is given, an Enumerator is returned instead.
  *
  *     a = [ "a", "b", "b", "b", "c" ]
- *     a.rindex("b")        #=> 3
- *     a.rindex("z")        #=> nil
- *     a.rindex{|x|x=="b"}  #=> 3
+ *     a.rindex("b")             #=> 3
+ *     a.rindex("z")             #=> nil
+ *     a.rindex {|x| x == "b"}   #=> 3
  */
 
 static VALUE
 rb_ary_rindex(int argc, VALUE *argv, VALUE ary)
 {
     VALUE val;
-    long i = RARRAY_LEN(ary);
+    long i = RARRAY_LEN(ary), len;
 
     if (argc == 0) {
 	RETURN_ENUMERATOR(ary, 0, 0);
 	while (i--) {
-	    if (RTEST(rb_yield(RARRAY_PTR(ary)[i])))
+	    if (RTEST(rb_yield(RARRAY_AREF(ary, i))))
 		return LONG2NUM(i);
-	    if (i > RARRAY_LEN(ary)) {
-		i = RARRAY_LEN(ary);
+	    if (i > (len = RARRAY_LEN(ary))) {
+		i = len;
 	    }
 	}
 	return Qnil;
     }
-    rb_scan_args(argc, argv, "1", &val);
+    rb_check_arity(argc, 0, 1);
+    val = argv[0];
     if (rb_block_given_p())
 	rb_warn("given block not used");
     while (i--) {
-	if (rb_equal(RARRAY_PTR(ary)[i], val))
+	VALUE e = RARRAY_AREF(ary, i);
+	if (rb_equal(e, val)) {
 	    return LONG2NUM(i);
-	if (i > RARRAY_LEN(ary)) {
-	    i = RARRAY_LEN(ary);
 	}
+        if (i > RARRAY_LEN(ary)) {
+            break;
+        }
     }
     return Qnil;
 }
@@ -1253,63 +1859,90 @@ rb_ary_to_ary(VALUE obj)
 }
 
 static void
-rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
+rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen)
 {
-    long rlen;
+    long olen;
+    long rofs;
 
     if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
+    olen = RARRAY_LEN(ary);
     if (beg < 0) {
-	beg += RARRAY_LEN(ary);
+	beg += olen;
 	if (beg < 0) {
 	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
-		     beg - RARRAY_LEN(ary), -RARRAY_LEN(ary));
+		     beg - olen, -olen);
 	}
     }
-    if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) {
-	len = RARRAY_LEN(ary) - beg;
+    if (olen < len || olen < beg + len) {
+	len = olen - beg;
     }
 
-    if (rpl == Qundef) {
-	rlen = 0;
-    }
-    else {
-	rpl = rb_ary_to_ary(rpl);
-	rlen = RARRAY_LEN(rpl);
+    {
+        const VALUE *optr = RARRAY_CONST_PTR_TRANSIENT(ary);
+	rofs = (rptr >= optr && rptr < optr + olen) ? rptr - optr : -1;
     }
-    rb_ary_modify(ary);
-    if (beg >= RARRAY_LEN(ary)) {
+
+    if (beg >= olen) {
+	VALUE target_ary;
 	if (beg > ARY_MAX_SIZE - rlen) {
 	    rb_raise(rb_eIndexError, "index %ld too big", beg);
 	}
+	target_ary = ary_ensure_room_for_push(ary, rlen-len); /* len is 0 or negative */
 	len = beg + rlen;
-	if (len >= ARY_CAPA(ary)) {
-	    ary_double_capa(ary, len);
-	}
-	rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), beg - RARRAY_LEN(ary));
+	ary_mem_clear(ary, olen, beg - olen);
 	if (rlen > 0) {
-	    MEMCPY(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
+            if (rofs != -1) rptr = RARRAY_CONST_PTR_TRANSIENT(ary) + rofs;
+	    ary_memcpy0(ary, beg, rlen, rptr, target_ary);
 	}
 	ARY_SET_LEN(ary, len);
     }
     else {
 	long alen;
 
-	alen = RARRAY_LEN(ary) + rlen - len;
+	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)) {
 	    ary_double_capa(ary, alen);
 	}
 
 	if (len != rlen) {
-	    MEMMOVE(RARRAY_PTR(ary) + beg + rlen, RARRAY_PTR(ary) + beg + len,
-		    VALUE, RARRAY_LEN(ary) - (beg + len));
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr,
+                                     MEMMOVE(ptr + beg + rlen, ptr + beg + len,
+                                             VALUE, olen - (beg + len)));
 	    ARY_SET_LEN(ary, alen);
 	}
 	if (rlen > 0) {
-	    MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
+            if (rofs != -1) rptr = RARRAY_CONST_PTR_TRANSIENT(ary) + rofs;
+            /* give up wb-protected ary */
+            RB_OBJ_WB_UNPROTECT_FOR(ARRAY, ary);
+
+            /* do not use RARRAY_PTR() because it can causes GC.
+             * ary can contain T_NONE object because it is not cleared.
+             */
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr,
+                                     MEMMOVE(ptr + beg, rptr, VALUE, rlen));
 	}
     }
 }
 
+void
+rb_ary_set_len(VALUE ary, long len)
+{
+    long capa;
+
+    rb_ary_modify_check(ary);
+    if (ARY_SHARED_P(ary)) {
+	rb_raise(rb_eRuntimeError, "can't set length of shared ");
+    }
+    if (len > (capa = (long)ARY_CAPA(ary))) {
+	rb_bug("probable buffer overflow: %ld for %ld", len, capa);
+    }
+    ARY_SET_LEN(ary, len);
+}
+
 /*!
  * expands or shrinks \a ary to \a len elements.
  * expanded region will be filled with Qnil.
@@ -1333,8 +1966,8 @@ rb_ary_resize(VALUE ary, long len)
 	if (len >= ARY_CAPA(ary)) {
 	    ary_double_capa(ary, len);
 	}
-	rb_mem_clear(RARRAY_PTR(ary) + olen, len - olen);
-        ARY_SET_LEN(ary, len);
+	ary_mem_clear(ary, olen, len - olen);
+	ARY_SET_LEN(ary, len);
     }
     else if (ARY_EMBED_P(ary)) {
         ARY_SET_EMBED_LEN(ary, len);
@@ -1343,16 +1976,17 @@ rb_ary_resize(VALUE ary, long len)
 	VALUE tmp[RARRAY_EMBED_LEN_MAX];
 	MEMCPY(tmp, ARY_HEAP_PTR(ary), VALUE, len);
 	ary_discard(ary);
-	MEMCPY(ARY_EMBED_PTR(ary), tmp, VALUE, len);
+	MEMCPY((VALUE *)ARY_EMBED_PTR(ary), tmp, VALUE, len); /* WB: no new reference */
         ARY_SET_EMBED_LEN(ary, len);
     }
     else {
 	if (olen > len + ARY_DEFAULT_SIZE) {
-	    REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, len);
+            ary_heap_realloc(ary, len);
 	    ARY_SET_CAPA(ary, len);
 	}
 	ARY_SET_HEAP_LEN(ary, len);
     }
+    ary_verify(ary);
     return ary;
 }
 
@@ -1362,16 +1996,21 @@ rb_ary_resize(VALUE ary, long len)
  *     ary[start, length] = obj or other_ary or nil  ->  obj or other_ary or nil
  *     ary[range]         = obj or other_ary or nil  ->  obj or other_ary or nil
  *
- *  Element Assignment---Sets the element at _index_,
- *  or replaces a subarray starting at _start_ and
- *  continuing for _length_ elements, or replaces a subarray
- *  specified by _range_.  If indices are greater than
- *  the current capacity of the array, the array grows
- *  automatically. A negative indices will count backward
- *  from the end of the array. Inserts elements if _length_ is
- *  zero. An +IndexError+ is raised if a negative index points
- *  past the beginning of the array. See also
- *  <code>Array#push</code>, and <code>Array#unshift</code>.
+ *  Element Assignment --- Sets the element at +index+, or replaces a subarray
+ *  from the +start+ index for +length+ elements, or replaces a subarray
+ *  specified by the +range+ of indices.
+ *
+ *  If indices are greater than the current capacity of the array, the array
+ *  grows automatically.  Elements are inserted into the array at +start+ if
+ *  +length+ is zero.
+ *
+ *  Negative indices will count backward from the end of the array.  For
+ *  +start+ and +range+ cases the starting index is just before an element.
+ *
+ *  An IndexError is raised if a negative index points past the beginning of
+ *  the array.
+ *
+ *  See also Array#push, and Array#unshift.
  *
  *     a = Array.new
  *     a[4] = "4";                 #=> [nil, nil, nil, nil, "4"]
@@ -1382,23 +2021,23 @@ rb_ary_resize(VALUE ary, long len)
  *     a[-1]   = "Z"               #=> ["A", "Z"]
  *     a[1..-1] = nil              #=> ["A", nil]
  *     a[1..-1] = []               #=> ["A"]
+ *     a[0, 0] = [ 1, 2 ]          #=> [1, 2, "A"]
+ *     a[3, 0] = "B"               #=> [1, 2, "A", "B"]
  */
 
 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]);
-	rb_ary_splice(ary, beg, len, argv[2]);
-	return argv[2];
-    }
-    if (argc != 2) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
+	goto range;
     }
+    rb_check_arity(argc, 2, 2);
     rb_ary_modify_check(ary);
     if (FIXNUM_P(argv[0])) {
 	offset = FIX2LONG(argv[0]);
@@ -1406,8 +2045,11 @@ 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 */
-	rb_ary_splice(ary, beg, len, argv[1]);
-	return argv[1];
+      range:
+	rpl = rb_ary_to_ary(argv[argc-1]);
+        rb_ary_splice(ary, beg, len, RARRAY_CONST_PTR_TRANSIENT(rpl), RARRAY_LEN(rpl));
+	RB_GC_GUARD(rpl);
+	return argv[argc-1];
     }
 
     offset = NUM2LONG(argv[0]);
@@ -1420,8 +2062,12 @@ fixnum:
  *  call-seq:
  *     ary.insert(index, obj...)  -> ary
  *
- *  Inserts the given values before the element with the given index
- *  (which may be negative).
+ *  Inserts the given values before the element with the given +index+.
+ *
+ *  Negative indices count backwards from the end of the array, where +-1+ is
+ *  the last element. If a negative index is used, the given values will be
+ *  inserted after that element, so using an index of +-1+ will insert the
+ *  values at the end of the array.
  *
  *     a = %w{ a b c d }
  *     a.insert(2, 99)         #=> ["a", "b", 99, "c", "d"]
@@ -1433,31 +2079,43 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
 {
     long pos;
 
-    if (argc < 1) {
-	rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
-    }
+    rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     rb_ary_modify_check(ary);
-    if (argc == 1) return ary;
     pos = NUM2LONG(argv[0]);
+    if (argc == 1) return ary;
     if (pos == -1) {
 	pos = RARRAY_LEN(ary);
     }
-    if (pos < 0) {
+    else if (pos < 0) {
+	long minpos = -RARRAY_LEN(ary) - 1;
+	if (pos < minpos) {
+	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
+		     pos, minpos);
+	}
 	pos++;
     }
-    rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
+    rb_ary_splice(ary, pos, 0, argv + 1, argc - 1);
     return ary;
 }
 
+static VALUE
+rb_ary_length(VALUE ary);
+
+static VALUE
+ary_enum_length(VALUE ary, VALUE args, VALUE eobj)
+{
+    return rb_ary_length(ary);
+}
+
 /*
  *  call-seq:
- *     ary.each {|item| block }   -> ary
- *     ary.each                   -> an_enumerator
+ *     ary.each {|item| block}    -> ary
+ *     ary.each                   -> Enumerator
  *
- *  Calls <i>block</i> once for each element in +self+, passing that
- *  element as a parameter.
+ *  Calls the given block once for each element in +self+, passing that element
+ *  as a parameter.  Returns the array itself.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  If no block is given, an Enumerator is returned.
  *
  *     a = [ "a", "b", "c" ]
  *     a.each {|x| print x, " -- " }
@@ -1468,28 +2126,26 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
  */
 
 VALUE
-rb_ary_each(VALUE array)
+rb_ary_each(VALUE ary)
 {
     long i;
-    volatile VALUE ary = array;
-
-    RETURN_ENUMERATOR(ary, 0, 0);
+    ary_verify(ary);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	rb_yield(RARRAY_PTR(ary)[i]);
+	rb_yield(RARRAY_AREF(ary, i));
     }
     return ary;
 }
 
 /*
  *  call-seq:
- *     ary.each_index {|index| block }  -> ary
- *     ary.each_index                   -> an_enumerator
- *
- *  Same as <code>Array#each</code>, but passes the index of the element
- *  instead of the element itself.
+ *     ary.each_index {|index| block}    -> ary
+ *     ary.each_index                    -> Enumerator
  *
- *  If no block is given, an enumerator is returned instead.
+ *  Same as Array#each, but passes the +index+ of the element instead of the
+ *  element itself.
  *
+ *  An Enumerator is returned if no block is given.
  *
  *     a = [ "a", "b", "c" ]
  *     a.each_index {|x| print x, " -- " }
@@ -1503,7 +2159,7 @@ static VALUE
 rb_ary_each_index(VALUE ary)
 {
     long i;
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	rb_yield(LONG2NUM(i));
@@ -1513,11 +2169,10 @@ rb_ary_each_index(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.reverse_each {|item| block }   -> ary
- *     ary.reverse_each                   -> an_enumerator
+ *     ary.reverse_each {|item| block}    -> ary
+ *     ary.reverse_each                   -> Enumerator
  *
- *  Same as <code>Array#each</code>, but traverses +self+ in reverse
- *  order.
+ *  Same as Array#each, but traverses +self+ in reverse order.
  *
  *     a = [ "a", "b", "c" ]
  *     a.reverse_each {|x| print x, " " }
@@ -1532,12 +2187,14 @@ rb_ary_reverse_each(VALUE ary)
 {
     long len;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     len = RARRAY_LEN(ary);
     while (len--) {
-	rb_yield(RARRAY_PTR(ary)[len]);
-	if (RARRAY_LEN(ary) < len) {
-	    len = RARRAY_LEN(ary);
+	long nlen;
+	rb_yield(RARRAY_AREF(ary, len));
+	nlen = RARRAY_LEN(ary);
+	if (nlen < len) {
+	    len = nlen;
 	}
     }
     return ary;
@@ -1550,6 +2207,7 @@ rb_ary_reverse_each(VALUE ary)
  *  Returns the number of elements in +self+. May be zero.
  *
  *     [ 1, 2, 3, 4, 5 ].length   #=> 5
+ *     [].length                  #=> 0
  */
 
 static VALUE
@@ -1563,7 +2221,7 @@ rb_ary_length(VALUE ary)
  *  call-seq:
  *     ary.empty?   -> true or false
  *
- *  Returns <code>true</code> if +self+ contains no elements.
+ *  Returns +true+ if +self+ contains no elements.
  *
  *     [].empty?   #=> true
  */
@@ -1579,16 +2237,20 @@ rb_ary_empty_p(VALUE ary)
 VALUE
 rb_ary_dup(VALUE ary)
 {
-    VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
-    MEMCPY(RARRAY_PTR(dup), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
-    ARY_SET_LEN(dup, RARRAY_LEN(ary));
+    long len = RARRAY_LEN(ary);
+    VALUE dup = rb_ary_new2(len);
+    ary_memcpy(dup, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary));
+    ARY_SET_LEN(dup, len);
+
+    ary_verify(ary);
+    ary_verify(dup);
     return dup;
 }
 
 VALUE
 rb_ary_resurrect(VALUE ary)
 {
-    return rb_ary_new4(RARRAY_LEN(ary), RARRAY_PTR(ary));
+    return ary_make_partial(ary, rb_cArray, 0, RARRAY_LEN(ary));
 }
 
 extern VALUE rb_output_fs;
@@ -1619,14 +2281,12 @@ ary_join_0(VALUE ary, VALUE sep, long max, VALUE result)
     long i;
     VALUE val;
 
-    if (max > 0) rb_enc_copy(result, RARRAY_PTR(ary)[0]);
+    if (max > 0) rb_enc_copy(result, RARRAY_AREF(ary, 0));
     for (i=0; i<max; i++) {
-	val = RARRAY_PTR(ary)[i];
+	val = RARRAY_AREF(ary, i);
 	if (i > 0 && !NIL_P(sep))
 	    rb_str_buf_append(result, sep);
 	rb_str_buf_append(result, val);
-	if (OBJ_TAINTED(val)) OBJ_TAINT(result);
-	if (OBJ_UNTRUSTED(val)) OBJ_TAINT(result);
     }
 }
 
@@ -1639,13 +2299,16 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
 	if (i > 0 && !NIL_P(sep))
 	    rb_str_buf_append(result, sep);
 
-	val = RARRAY_PTR(ary)[i];
-	switch (TYPE(val)) {
-	  case T_STRING:
+	val = RARRAY_AREF(ary, i);
+	if (RB_TYPE_P(val, T_STRING)) {
 	  str_join:
 	    rb_str_buf_append(result, val);
-	    break;
-	  case T_ARRAY:
+	    if (*first) {
+		rb_enc_copy(result, val);
+		*first = FALSE;
+	    }
+	}
+	else if (RB_TYPE_P(val, T_ARRAY)) {
 	    obj = val;
 	  ary_join:
 	    if (val == ary) {
@@ -1654,30 +2317,27 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
 	    else {
 		VALUE args[4];
 
+		*first = FALSE;
 		args[0] = val;
 		args[1] = sep;
 		args[2] = result;
 		args[3] = (VALUE)first;
 		rb_exec_recursive(recursive_join, obj, (VALUE)args);
 	    }
-	    break;
-	  default:
+	}
+	else {
 	    tmp = rb_check_string_type(val);
 	    if (!NIL_P(tmp)) {
 		val = tmp;
 		goto str_join;
 	    }
-	    tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_ary");
+	    tmp = rb_check_array_type(val);
 	    if (!NIL_P(tmp)) {
 		obj = val;
 		val = tmp;
 		goto ary_join;
 	    }
 	    val = rb_obj_as_string(val);
-	    if (*first) {
-		rb_enc_copy(result, val);
-		*first = FALSE;
-	    }
 	    goto str_join;
 	}
     }
@@ -1687,28 +2347,22 @@ VALUE
 rb_ary_join(VALUE ary, VALUE sep)
 {
     long len = 1, i;
-    int taint = FALSE;
-    int untrust = FALSE;
     VALUE val, tmp, result;
 
     if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new(0, 0);
-    if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = TRUE;
-    if (OBJ_UNTRUSTED(ary) || OBJ_UNTRUSTED(sep)) untrust = TRUE;
 
     if (!NIL_P(sep)) {
 	StringValue(sep);
 	len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1);
     }
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	val = RARRAY_PTR(ary)[i];
+	val = RARRAY_AREF(ary, i);
 	tmp = rb_check_string_type(val);
 
 	if (NIL_P(tmp) || tmp != val) {
 	    int first;
 	    result = rb_str_buf_new(len + (RARRAY_LEN(ary)-i)*10);
 	    rb_enc_associate(result, rb_usascii_encoding());
-	    if (taint) OBJ_TAINT(result);
-	    if (untrust) OBJ_UNTRUST(result);
 	    ary_join_0(ary, sep, i, result);
 	    first = i == 0;
 	    ary_join_1(ary, ary, sep, i, result, &first);
@@ -1718,9 +2372,9 @@ rb_ary_join(VALUE ary, VALUE sep)
 	len += RSTRING_LEN(tmp);
     }
 
-    result = rb_str_buf_new(len);
-    if (taint) OBJ_TAINT(result);
-    if (untrust) OBJ_UNTRUST(result);
+    result = rb_str_new(0, len);
+    rb_str_set_len(result, 0);
+
     ary_join_0(ary, sep, RARRAY_LEN(ary), result);
 
     return result;
@@ -1728,13 +2382,20 @@ rb_ary_join(VALUE ary, VALUE sep)
 
 /*
  *  call-seq:
- *     ary.join(sep=$,)    -> str
+ *     ary.join(separator=$,)    -> str
  *
  *  Returns a string created by converting each element of the array to
- *  a string, separated by <i>sep</i>.
+ *  a string, separated by the given +separator+.
+ *  If the +separator+ is +nil+, it uses current <code>$,</code>.
+ *  If both the +separator+ and <code>$,</code> are +nil+,
+ *  it uses an empty string.
  *
  *     [ "a", "b", "c" ].join        #=> "abc"
  *     [ "a", "b", "c" ].join("-")   #=> "a-b-c"
+ *
+ *  For nested arrays, join is applied recursively:
+ *
+ *     [ "a", [1, 2, [:x, :y]], "b" ].join("-")   #=> "a-1-2-x-y-b"
  */
 
 static VALUE
@@ -1742,8 +2403,12 @@ rb_ary_join_m(int argc, VALUE *argv, VALUE ary)
 {
     VALUE sep;
 
-    rb_scan_args(argc, argv, "01", &sep);
-    if (NIL_P(sep)) sep = rb_output_fs;
+    if (rb_check_arity(argc, 0, 1) == 0 || NIL_P(sep = argv[0])) {
+        sep = rb_output_fs;
+        if (!NIL_P(sep)) {
+            rb_warn("$, is set to non-nil value");
+        }
+    }
 
     return rb_ary_join(ary, sep);
 }
@@ -1751,33 +2416,30 @@ rb_ary_join_m(int argc, VALUE *argv, VALUE ary)
 static VALUE
 inspect_ary(VALUE ary, VALUE dummy, int recur)
 {
-    int tainted = OBJ_TAINTED(ary);
-    int untrust = OBJ_UNTRUSTED(ary);
     long i;
     VALUE s, str;
 
     if (recur) return rb_usascii_str_new_cstr("[...]");
     str = rb_str_buf_new2("[");
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	s = rb_inspect(RARRAY_PTR(ary)[i]);
-	if (OBJ_TAINTED(s)) tainted = TRUE;
-	if (OBJ_UNTRUSTED(s)) untrust = TRUE;
+	s = rb_inspect(RARRAY_AREF(ary, i));
 	if (i > 0) rb_str_buf_cat2(str, ", ");
 	else rb_enc_copy(str, s);
 	rb_str_buf_append(str, s);
     }
     rb_str_buf_cat2(str, "]");
-    if (tainted) OBJ_TAINT(str);
-    if (untrust) OBJ_UNTRUST(str);
     return str;
 }
 
 /*
  *  call-seq:
- *     ary.to_s -> string
  *     ary.inspect  -> string
+ *     ary.to_s     -> string
  *
- *  Creates a string representation of +self+.
+ *  Creates a string representation of +self+, by calling #inspect
+ *  on each element.
+ *
+ *     [ "a", "b", "c" ].to_s     #=> "[\"a\", \"b\", \"c\"]"
  */
 
 static VALUE
@@ -1797,8 +2459,9 @@ rb_ary_to_s(VALUE ary)
  *  call-seq:
  *     ary.to_a     -> ary
  *
- *  Returns +self+. If called on a subclass of Array, converts
- *  the receiver to an Array object.
+ *  Returns +self+.
+ *
+ *  If called on a subclass of Array, converts the receiver to an Array object.
  */
 
 static VALUE
@@ -1814,6 +2477,48 @@ rb_ary_to_a(VALUE ary)
 
 /*
  *  call-seq:
+ *     ary.to_h                  -> hash
+ *     ary.to_h {|item| block }  -> hash
+ *
+ *  Returns the result of interpreting <i>ary</i> as an array of
+ *  <tt>[key, value]</tt> pairs.
+ *
+ *     [[:foo, :bar], [1, 2]].to_h
+ *       # => {:foo => :bar, 1 => 2}
+ *
+ *  If a block is given, the results of the block on each element of
+ *  the array will be used as pairs.
+ *
+ *     ["foo", "bar"].to_h {|s| [s.ord, s]}
+ *       # => {102=>"foo", 98=>"bar"}
+ */
+
+static VALUE
+rb_ary_to_h(VALUE ary)
+{
+    long i;
+    VALUE hash = rb_hash_new_with_size(RARRAY_LEN(ary));
+    int block_given = rb_block_given_p();
+
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	const VALUE e = rb_ary_elt(ary, i);
+	const VALUE elt = block_given ? rb_yield_force_blockarg(e) : e;
+	const VALUE key_value_pair = rb_check_array_type(elt);
+	if (NIL_P(key_value_pair)) {
+	    rb_raise(rb_eTypeError, "wrong element type %"PRIsVALUE" at %ld (expected array)",
+		     rb_obj_class(elt), i);
+	}
+	if (RARRAY_LEN(key_value_pair) != 2) {
+	    rb_raise(rb_eArgError, "wrong array length at %ld (expected 2, was %ld)",
+		i, RARRAY_LEN(key_value_pair));
+	}
+	rb_hash_aset(hash, RARRAY_AREF(key_value_pair, 0), RARRAY_AREF(key_value_pair, 1));
+    }
+    return hash;
+}
+
+/*
+ *  call-seq:
  *     ary.to_ary -> ary
  *
  *  Returns +self+.
@@ -1826,8 +2531,7 @@ rb_ary_to_ary_m(VALUE ary)
 }
 
 static void
-ary_reverse(p1, p2)
-    VALUE *p1, *p2;
+ary_reverse(VALUE *p1, VALUE *p2)
 {
     while (p1 < p2) {
 	VALUE tmp = *p1;
@@ -1839,13 +2543,15 @@ ary_reverse(p1, p2)
 VALUE
 rb_ary_reverse(VALUE ary)
 {
-    VALUE *p1, *p2;
+    VALUE *p2;
+    long len = RARRAY_LEN(ary);
 
     rb_ary_modify(ary);
-    if (RARRAY_LEN(ary) > 1) {
-	p1 = RARRAY_PTR(ary);
-	p2 = p1 + RARRAY_LEN(ary) - 1;	/* points last item */
-	ary_reverse(p1, p2);
+    if (len > 1) {
+        RARRAY_PTR_USE_TRANSIENT(ary, p1, {
+            p2 = p1 + len - 1;	/* points last item */
+            ary_reverse(p1, p2);
+	}); /* WB: no new reference */
     }
     return ary;
 }
@@ -1869,7 +2575,7 @@ rb_ary_reverse_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.reverse -> new_ary
+ *     ary.reverse    -> new_ary
  *
  *  Returns a new array containing +self+'s elements in reverse order.
  *
@@ -1884,8 +2590,8 @@ rb_ary_reverse_m(VALUE ary)
     VALUE dup = rb_ary_new2(len);
 
     if (len > 0) {
-	VALUE *p1 = RARRAY_PTR(ary);
-	VALUE *p2 = RARRAY_PTR(dup) + len - 1;
+        const VALUE *p1 = RARRAY_CONST_PTR_TRANSIENT(ary);
+        VALUE *p2 = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(dup) + len - 1;
 	do *p2-- = *p1++; while (--len > 0);
     }
     ARY_SET_LEN(dup, RARRAY_LEN(ary));
@@ -1898,34 +2604,39 @@ rotate_count(long cnt, long len)
     return (cnt < 0) ? (len - (~cnt % len) - 1) : (cnt % len);
 }
 
+static void
+ary_rotate_ptr(VALUE *ptr, long len, long cnt)
+{
+    --len;
+    if (cnt < len) ary_reverse(ptr + cnt, ptr + len);
+    if (--cnt > 0) ary_reverse(ptr, ptr + cnt);
+    if (len > 0) ary_reverse(ptr, ptr + len);
+}
+
 VALUE
 rb_ary_rotate(VALUE ary, long cnt)
 {
     rb_ary_modify(ary);
 
     if (cnt != 0) {
-	VALUE *ptr = RARRAY_PTR(ary);
-	long len = RARRAY_LEN(ary);
-
-	if (len > 0 && (cnt = rotate_count(cnt, len)) > 0) {
-	    --len;
-	    if (cnt < len) ary_reverse(ptr + cnt, ptr + len);
-	    if (--cnt > 0) ary_reverse(ptr, ptr + cnt);
-	    if (len > 0) ary_reverse(ptr, ptr + len);
-	    return ary;
-	}
+        long len = RARRAY_LEN(ary);
+        if (len > 0 && (cnt = rotate_count(cnt, len)) > 0) {
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr, ary_rotate_ptr(ptr, len, cnt));
+            return ary;
+        }
     }
-
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     ary.rotate!(cnt=1) -> ary
+ *     ary.rotate!(count=1)   -> ary
+ *
+ *  Rotates +self+ in place so that the element at +count+ comes first, and
+ *  returns +self+.
  *
- *  Rotates +self+ in place so that the element at +cnt+ comes first,
- *  and returns +self+.  If +cnt+ is negative then it rotates in
- *  the opposite direction.
+ *  If +count+ is negative then it rotates in the opposite direction, starting
+ *  from the end of the array where +-1+ is the last element.
  *
  *     a = [ "a", "b", "c", "d" ]
  *     a.rotate!        #=> ["b", "c", "d", "a"]
@@ -1937,24 +2648,20 @@ rb_ary_rotate(VALUE ary, long cnt)
 static VALUE
 rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary)
 {
-    long n = 1;
-
-    switch (argc) {
-      case 1: n = NUM2LONG(argv[0]);
-      case 0: break;
-      default: rb_scan_args(argc, argv, "01", NULL);
-    }
+    long n = (rb_check_arity(argc, 0, 1) ? NUM2LONG(argv[0]) : 1);
     rb_ary_rotate(ary, n);
     return ary;
 }
 
 /*
  *  call-seq:
- *     ary.rotate(cnt=1) -> new_ary
+ *     ary.rotate(count=1)    -> new_ary
  *
- *  Returns new array by rotating +self+ so that the element at
- *  +cnt+ in +self+ is the first element of the new array. If +cnt+
- *  is negative then it rotates in the opposite direction.
+ *  Returns a new array by rotating +self+ so that the element at +count+ is
+ *  the first element of the new array.
+ *
+ *  If +count+ is negative then it rotates in the opposite direction, starting
+ *  from the end of +self+ where +-1+ is the last element.
  *
  *     a = [ "a", "b", "c", "d" ]
  *     a.rotate         #=> ["b", "c", "d", "a"]
@@ -1966,24 +2673,19 @@ rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary)
 static VALUE
 rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE rotated, *ptr, *ptr2;
-    long len, cnt = 1;
-
-    switch (argc) {
-      case 1: cnt = NUM2LONG(argv[0]);
-      case 0: break;
-      default: rb_scan_args(argc, argv, "01", NULL);
-    }
+    VALUE rotated;
+    const VALUE *ptr;
+    long len;
+    long cnt = (rb_check_arity(argc, 0, 1) ? NUM2LONG(argv[0]) : 1);
 
     len = RARRAY_LEN(ary);
     rotated = rb_ary_new2(len);
     if (len > 0) {
 	cnt = rotate_count(cnt, len);
-	ptr = RARRAY_PTR(ary);
-	ptr2 = RARRAY_PTR(rotated);
+        ptr = RARRAY_CONST_PTR_TRANSIENT(ary);
 	len -= cnt;
-	MEMCPY(ptr2, ptr + cnt, VALUE, len);
-	MEMCPY(ptr2 + len, ptr, VALUE, cnt);
+	ary_memcpy(rotated, 0, len, ptr + cnt);
+	ary_memcpy(rotated, len, cnt, ptr);
     }
     ARY_SET_LEN(rotated, RARRAY_LEN(ary));
     return rotated;
@@ -1991,26 +2693,9 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
 
 struct ary_sort_data {
     VALUE ary;
-    int opt_methods;
-    int opt_inited;
+    struct cmp_opt_data cmp_opt;
 };
 
-enum {
-    sort_opt_Fixnum,
-    sort_opt_String,
-    sort_optimizable_count
-};
-
-#define STRING_P(s) (TYPE(s) == T_STRING && CLASS_OF(s) == rb_cString)
-
-#define SORT_OPTIMIZABLE_BIT(type) (1U << TOKEN_PASTE(sort_opt_,type))
-#define SORT_OPTIMIZABLE(data, type) \
-    (((data)->opt_inited & SORT_OPTIMIZABLE_BIT(type)) ? \
-     ((data)->opt_methods & SORT_OPTIMIZABLE_BIT(type)) : \
-     (((data)->opt_inited |= SORT_OPTIMIZABLE_BIT(type)), \
-      rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \
-      ((data)->opt_methods |= SORT_OPTIMIZABLE_BIT(type))))
-
 static VALUE
 sort_reentered(VALUE ary)
 {
@@ -2026,9 +2711,12 @@ sort_1(const void *ap, const void *bp, void *dummy)
     struct ary_sort_data *data = dummy;
     VALUE retval = sort_reentered(data->ary);
     VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
+    VALUE args[2];
     int n;
 
-    retval = rb_yield_values(2, a, b);
+    args[0] = a;
+    args[1] = b;
+    retval = rb_yield_values2(2, args);
     n = rb_cmpint(retval, a, b);
     sort_reentered(data->ary);
     return n;
@@ -2042,16 +2730,19 @@ 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) && SORT_OPTIMIZABLE(data, Fixnum)) {
+    if (FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, Fixnum)) {
 	if ((long)a > (long)b) return 1;
 	if ((long)a < (long)b) return -1;
 	return 0;
     }
-    if (STRING_P(a) && STRING_P(b) && SORT_OPTIMIZABLE(data, String)) {
+    if (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, String)) {
 	return rb_str_cmp(a, b);
     }
+    if (RB_FLOAT_TYPE_P(a) && CMP_OPTIMIZABLE(data->cmp_opt, Float)) {
+	return rb_float_cmp(a, b);
+    }
 
-    retval = rb_funcall(a, id_cmp, 1, b);
+    retval = rb_funcallv(a, id_cmp, 1, &b);
     n = rb_cmpint(retval, a, b);
     sort_reentered(data->ary);
 
@@ -2061,17 +2752,25 @@ sort_2(const void *ap, const void *bp, void *dummy)
 /*
  *  call-seq:
  *     ary.sort!                   -> ary
- *     ary.sort! {| a,b | block }  -> ary
+ *     ary.sort! {|a, b| block}    -> ary
  *
- *  Sorts +self+. Comparisons for
- *  the sort will be done using the <code><=></code> operator or using
- *  an optional code block. The block implements a comparison between
- *  <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
- *  <code>Enumerable#sort_by</code>.
+ *  Sorts +self+ in place.
  *
- *     a = [ "d", "a", "e", "c", "b" ]
- *     a.sort!                    #=> ["a", "b", "c", "d", "e"]
- *     a.sort! {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
+ *  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 to be stable.  When the comparison of two
+ *  elements returns +0+, the order of the elements is unpredictable.
+ *
+ *     ary = [ "d", "a", "e", "c", "b" ]
+ *     ary.sort!                     #=> ["a", "b", "c", "d", "e"]
+ *     ary.sort! {|a, b| b <=> a}    #=> ["e", "d", "c", "b", "a"]
+ *
+ *  See also Enumerable#sort_by.
  */
 
 VALUE
@@ -2082,29 +2781,28 @@ rb_ary_sort_bang(VALUE ary)
     if (RARRAY_LEN(ary) > 1) {
 	VALUE tmp = ary_make_substitution(ary); /* only ary refers tmp */
 	struct ary_sort_data data;
-
-	RBASIC(tmp)->klass = 0;
+	long len = RARRAY_LEN(ary);
+	RBASIC_CLEAR_CLASS(tmp);
 	data.ary = tmp;
-	data.opt_methods = 0;
-	data.opt_inited = 0;
-	ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE),
-		   rb_block_given_p()?sort_1:sort_2, &data);
-
+	data.cmp_opt.opt_methods = 0;
+	data.cmp_opt.opt_inited = 0;
+	RARRAY_PTR_USE(tmp, ptr, {
+            ruby_qsort(ptr, len, sizeof(VALUE),
+                       rb_block_given_p()?sort_1:sort_2, &data);
+	}); /* WB: no new reference */
+	rb_ary_modify(ary);
         if (ARY_EMBED_P(tmp)) {
-            assert(ARY_EMBED_P(tmp));
             if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */
                 rb_ary_unshare(ary);
+		FL_SET_EMBED(ary);
             }
-            FL_SET_EMBED(ary);
-            MEMCPY(RARRAY_PTR(ary), ARY_EMBED_PTR(tmp), VALUE, ARY_EMBED_LEN(tmp));
+	    ary_memcpy(ary, 0, ARY_EMBED_LEN(tmp), ARY_EMBED_PTR(tmp));
             ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
         }
         else {
-            assert(!ARY_EMBED_P(tmp));
-            if (ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) {
-                assert(!ARY_EMBED_P(ary));
+            if (!ARY_EMBED_P(ary) && ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) {
                 FL_UNSET_SHARED(ary);
-                ARY_SET_CAPA(ary, ARY_CAPA(tmp));
+                ARY_SET_CAPA(ary, RARRAY_LEN(tmp));
             }
             else {
                 assert(!ARY_SHARED_P(tmp));
@@ -2116,38 +2814,52 @@ rb_ary_sort_bang(VALUE ary)
                     rb_ary_unshare(ary);
                 }
                 else {
-                    xfree(ARY_HEAP_PTR(ary));
+                    ary_heap_free(ary);
                 }
-                ARY_SET_PTR(ary, RARRAY_PTR(tmp));
-                ARY_SET_HEAP_LEN(ary, RARRAY_LEN(tmp));
-                ARY_SET_CAPA(ary, ARY_CAPA(tmp));
+                ARY_SET_PTR(ary, ARY_HEAP_PTR(tmp));
+                ARY_SET_HEAP_LEN(ary, len);
+                ARY_SET_CAPA(ary, ARY_HEAP_LEN(tmp));
             }
             /* tmp was lost ownership for the ptr */
             FL_UNSET(tmp, FL_FREEZE);
             FL_SET_EMBED(tmp);
             ARY_SET_EMBED_LEN(tmp, 0);
             FL_SET(tmp, FL_FREEZE);
-	}
+        }
         /* tmp will be GC'ed. */
-        RBASIC(tmp)->klass = rb_cArray;
+        RBASIC_SET_CLASS_RAW(tmp, rb_cArray); /* rb_cArray must be marked */
     }
+    ary_verify(ary);
     return ary;
 }
 
 /*
  *  call-seq:
  *     ary.sort                   -> new_ary
- *     ary.sort {| a,b | block }  -> new_ary
+ *     ary.sort {|a, b| block}    -> new_ary
+ *
+ *  Returns a new array created by sorting +self+.
+ *
+ *  Comparisons for the sort will be done using the <code><=></code> operator
+ *  or using an optional code block.
+ *
+ *  The block 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 to be stable.  When the comparison of two
+ *  elements returns +0+, the order of the elements is unpredictable.
+ *
+ *     ary = [ "d", "a", "e", "c", "b" ]
+ *     ary.sort                     #=> ["a", "b", "c", "d", "e"]
+ *     ary.sort {|a, b| b <=> a}    #=> ["e", "d", "c", "b", "a"]
+ *
+ *  To produce the reverse order, the following can also be used
+ *  (and may be faster):
  *
- *  Returns a new array created by sorting +self+. Comparisons for
- *  the sort will be done using the <code><=></code> operator or using
- *  an optional code block. The block implements a comparison between
- *  <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
- *  <code>Enumerable#sort_by</code>.
+ *    ary.sort.reverse!             #=> ["e", "d", "c", "b", "a"]
  *
- *     a = [ "d", "a", "e", "c", "b" ]
- *     a.sort                    #=> ["a", "b", "c", "d", "e"]
- *     a.sort {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
+ *  See also Enumerable#sort_by.
  */
 
 VALUE
@@ -2158,23 +2870,153 @@ rb_ary_sort(VALUE ary)
     return ary;
 }
 
+static VALUE rb_ary_bsearch_index(VALUE ary);
+
+/*
+ *  call-seq:
+ *     ary.bsearch {|x| block }  -> elem
+ *
+ *  By using binary search, finds a value from this array which meets
+ *  the given condition in O(log n) where n is the size of the array.
+ *
+ *  You can use this method in two modes: a find-minimum mode and
+ *  a find-any mode.  In either case, the elements of the array must be
+ *  monotone (or sorted) with respect to the block.
+ *
+ *  In find-minimum mode (this is a good choice for typical use cases),
+ *  the block must always return true or false, and there must be an index i
+ *  (0 <= i <= ary.size) so that:
+ *
+ *  - the block returns false for any element whose index is less than
+ *    i, and
+ *  - the block returns true for any element whose index is greater
+ *    than or equal to i.
+ *
+ *  This method returns the i-th element.  If i is equal to ary.size,
+ *  it returns nil.
+ *
+ *     ary = [0, 4, 7, 10, 12]
+ *     ary.bsearch {|x| x >=   4 } #=> 4
+ *     ary.bsearch {|x| x >=   6 } #=> 7
+ *     ary.bsearch {|x| x >=  -1 } #=> 0
+ *     ary.bsearch {|x| x >= 100 } #=> nil
+ *
+ *  In find-any mode (this behaves like libc's bsearch(3)), the block
+ *  must always return a number, and there must be two indices i and j
+ *  (0 <= i <= j <= ary.size) so that:
+ *
+ *  - the block returns a positive number for ary[k] if 0 <= k < i,
+ *  - the block returns zero for ary[k] if i <= k < j, and
+ *  - the block returns a negative number for ary[k] if
+ *    j <= k < ary.size.
+ *
+ *  Under this condition, this method returns any element whose index
+ *  is within i...j.  If i is equal to j (i.e., there is no element
+ *  that satisfies the block), this method returns nil.
+ *
+ *     ary = [0, 4, 7, 10, 12]
+ *     # try to find v such that 4 <= v < 8
+ *     ary.bsearch {|x| 1 - x / 4 } #=> 4 or 7
+ *     # try to find v such that 8 <= v < 10
+ *     ary.bsearch {|x| 4 - x / 2 } #=> nil
+ *
+ *  You must not mix the two modes at a time; the block must always
+ *  return either true/false, or always return a number.  It is
+ *  undefined which value is actually picked up at each iteration.
+ */
+
+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. They are
+ *  exactly the same as in the case of the #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;
+
+    RETURN_ENUMERATOR(ary, 0, 0);
+    while (low < high) {
+	mid = low + ((high - low) / 2);
+	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 */
+	}
+	else if (v == Qtrue) {
+	    satisfied = 1;
+	    smaller = 1;
+	}
+	else if (v == Qfalse || v == Qnil) {
+	    smaller = 0;
+	}
+	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;
+	    }
+	}
+	else {
+	    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE
+		     " (must be numeric, true, false or nil)",
+		     rb_obj_class(v));
+	}
+	if (smaller) {
+	    high = mid;
+	}
+	else {
+	    low = mid + 1;
+	}
+    }
+    if (!satisfied) return Qnil;
+    return INT2FIX(low);
+}
+
 
 static VALUE
-sort_by_i(VALUE i)
+sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, dummy))
 {
     return rb_yield(i);
 }
 
 /*
  *  call-seq:
- *     ary.sort_by! {| obj | block }    -> ary
- *     ary.sort_by!                     -> an_enumerator
+ *     ary.sort_by! {|obj| block}      -> ary
+ *     ary.sort_by!                    -> Enumerator
  *
  *  Sorts +self+ in place using a set of keys generated by mapping the
  *  values in +self+ through the given block.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  The result is not guaranteed to be stable.  When two keys are equal,
+ *  the order of the corresponding elements is unpredictable.
  *
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *  See also Enumerable#sort_by.
  */
 
 static VALUE
@@ -2182,7 +3024,7 @@ rb_ary_sort_by_bang(VALUE ary)
 {
     VALUE sorted;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     rb_ary_modify(ary);
     sorted = rb_block_call(ary, rb_intern("sort_by"), 0, 0, sort_by_i, 0);
     rb_ary_replace(ary, sorted);
@@ -2192,20 +3034,23 @@ rb_ary_sort_by_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.collect {|item| block }  -> new_ary
- *     ary.map     {|item| block }  -> new_ary
- *     ary.collect                  -> an_enumerator
- *     ary.map                      -> an_enumerator
+ *     ary.collect {|item| block}    -> new_ary
+ *     ary.map     {|item| block}    -> new_ary
+ *     ary.collect                   -> Enumerator
+ *     ary.map                       -> Enumerator
+ *
+ *  Invokes the given block once for each element of +self+.
  *
- *  Invokes <i>block</i> once for each element of +self+. Creates a
- *  new array containing the values returned by the block.
- *  See also <code>Enumerable#collect</code>.
+ *  Creates a new array containing the values returned by the block.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  See also Enumerable#collect.
+ *
+ *  If no block is given, an Enumerator is returned instead.
  *
  *     a = [ "a", "b", "c", "d" ]
- *     a.collect {|x| x + "!" }   #=> ["a!", "b!", "c!", "d!"]
- *     a                          #=> ["a", "b", "c", "d"]
+ *     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
@@ -2214,10 +3059,10 @@ rb_ary_collect(VALUE ary)
     long i;
     VALUE collect;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     collect = rb_ary_new2(RARRAY_LEN(ary));
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	rb_ary_push(collect, rb_yield(RARRAY_PTR(ary)[i]));
+        rb_ary_push(collect, rb_yield(RARRAY_AREF(ary, i)));
     }
     return collect;
 }
@@ -2227,18 +3072,21 @@ rb_ary_collect(VALUE ary)
  *  call-seq:
  *     ary.collect! {|item| block }   -> ary
  *     ary.map!     {|item| block }   -> ary
- *     ary.collect                    -> an_enumerator
- *     ary.map                        -> an_enumerator
+ *     ary.collect!                   -> Enumerator
+ *     ary.map!                       -> Enumerator
+ *
+ *  Invokes the given block once for each element of +self+, replacing the
+ *  element with the value returned by the block.
  *
- *  Invokes the block once for each element of +self+, replacing the
- *  element with the value returned by _block_.
- *  See also <code>Enumerable#collect</code>.
+ *  See also Enumerable#collect.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  If no block is given, an Enumerator is returned instead.
  *
  *     a = [ "a", "b", "c", "d" ]
- *     a.collect! {|x| x + "!" }
- *     a             #=>  [ "a!", "b!", "c!", "d!" ]
+ *     a.map! {|x| x + "!" }
+ *     a #=>  [ "a!", "b!", "c!", "d!" ]
+ *     a.collect!.with_index {|x, i| x[0...i] }
+ *     a #=>  ["", "b", "c!", "d!"]
  */
 
 static VALUE
@@ -2246,16 +3094,16 @@ rb_ary_collect_bang(VALUE ary)
 {
     long i;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     rb_ary_modify(ary);
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	rb_ary_store(ary, i, rb_yield(RARRAY_PTR(ary)[i]));
+	rb_ary_store(ary, i, rb_yield(RARRAY_AREF(ary, i)));
     }
     return ary;
 }
 
 VALUE
-rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VALUE, long))
+rb_get_values_at(VALUE obj, long olen, int argc, const VALUE *argv, VALUE (*func) (VALUE, long))
 {
     VALUE result = rb_ary_new2(argc);
     long beg, len, i, j;
@@ -2266,15 +3114,13 @@ rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VAL
 	    continue;
 	}
 	/* check if idx is Range */
-	switch (rb_range_beg_len(argv[i], &beg, &len, olen, 0)) {
-	  case Qfalse:
-	    break;
-	  case Qnil:
-	    continue;
-	  default:
-	    for (j=0; j<len; j++) {
-		rb_ary_push(result, (*func)(obj, j+beg));
+	if (rb_range_beg_len(argv[i], &beg, &len, olen, 1)) {
+	    long end = olen < beg+len ? olen : beg+len;
+	    for (j = beg; j < end; j++) {
+		rb_ary_push(result, (*func)(obj, j));
 	    }
+	    if (beg + len > j)
+		rb_ary_resize(result, RARRAY_LEN(result) + (beg + len) - j);
 	    continue;
 	}
 	rb_ary_push(result, (*func)(obj, NUM2LONG(argv[i])));
@@ -2282,42 +3128,85 @@ rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VAL
     return result;
 }
 
+static VALUE
+append_values_at_single(VALUE result, VALUE ary, long olen, VALUE idx)
+{
+    long beg, len;
+    if (FIXNUM_P(idx)) {
+	beg = FIX2LONG(idx);
+    }
+    /* check if idx is Range */
+    else if (rb_range_beg_len(idx, &beg, &len, olen, 1)) {
+	if (len > 0) {
+            const VALUE *const src = RARRAY_CONST_PTR_TRANSIENT(ary);
+	    const long end = beg + len;
+	    const long prevlen = RARRAY_LEN(result);
+	    if (beg < olen) {
+		rb_ary_cat(result, src + beg, end > olen ? olen-beg : len);
+	    }
+	    if (end > olen) {
+		rb_ary_store(result, prevlen + len - 1, Qnil);
+	    }
+	}
+	return result;
+    }
+    else {
+	beg = NUM2LONG(idx);
+    }
+    return rb_ary_push(result, rb_ary_entry(ary, beg));
+}
+
 /*
  *  call-seq:
- *     ary.values_at(selector,... )  -> new_ary
+ *     ary.values_at(selector, ...)  -> new_ary
+ *
+ *  Returns an array containing the elements in +self+ corresponding to the
+ *  given +selector+(s).
  *
- *  Returns an array containing the elements in
- *  +self+ corresponding to the given selector(s). The selectors
- *  may be either integer indices or ranges.
- *  See also <code>Array#select</code>.
+ *  The selectors may be either integer indices or ranges.
+ *
+ *  See also Array#select.
  *
  *     a = %w{ a b c d e f }
- *     a.values_at(1, 3, 5)
- *     a.values_at(1, 3, 5, 7)
- *     a.values_at(-1, -3, -5, -7)
- *     a.values_at(1..3, 2...5)
+ *     a.values_at(1, 3, 5)          # => ["b", "d", "f"]
+ *     a.values_at(1, 3, 5, 7)       # => ["b", "d", "f", nil]
+ *     a.values_at(-1, -2, -2, -7)   # => ["f", "e", "e", nil]
+ *     a.values_at(4..6, 3...6)      # => ["e", "f", nil, "d", "e", "f"]
  */
 
 static VALUE
 rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
 {
-    return rb_get_values_at(ary, RARRAY_LEN(ary), argc, argv, rb_ary_entry);
+    long i, olen = RARRAY_LEN(ary);
+    VALUE result = rb_ary_new_capa(argc);
+    for (i = 0; i < argc; ++i) {
+	append_values_at_single(result, ary, olen, argv[i]);
+    }
+    RB_GC_GUARD(ary);
+    return result;
 }
 
 
 /*
  *  call-seq:
- *     ary.select {|item| block } -> new_ary
- *     ary.select                 -> an_enumerator
+ *     ary.select {|item| block}   -> new_ary
+ *     ary.select                  -> Enumerator
+ *     ary.filter {|item| block}   -> new_ary
+ *     ary.filter                  -> Enumerator
  *
- *  Invokes the block passing in successive elements from +self+,
- *  returning an array containing those elements for which the block
- *  returns a true value (equivalent to <code>Enumerable#select</code>).
+ *  Returns a new array containing all elements of +ary+
+ *  for which the given +block+ returns a true value.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  If no block is given, an Enumerator is returned instead.
  *
- *     a = %w{ a b c d e f }
- *     a.select {|v| v =~ /[aeiou]/}   #=> ["a", "e"]
+ *     [1,2,3,4,5].select {|num| num.even? }     #=> [2, 4]
+ *
+ *     a = %w[ a b c d e f ]
+ *     a.select {|v| v =~ /[aeiou]/ }    #=> ["a", "e"]
+ *
+ *  See also Enumerable#select.
+ *
+ *  Array#filter is an alias for Array#select.
  */
 
 static VALUE
@@ -2326,93 +3215,150 @@ rb_ary_select(VALUE ary)
     VALUE result;
     long i;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     result = rb_ary_new2(RARRAY_LEN(ary));
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
+	if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) {
 	    rb_ary_push(result, rb_ary_elt(ary, i));
 	}
     }
     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_TRANSIENT(ary, ptr, {
+		    MEMMOVE(ptr + i2, ptr + i1, VALUE, tail);
+		});
+	}
+	ARY_SET_LEN(ary, i2 + tail);
+    }
+    return ary;
+}
+
 /*
  *  call-seq:
- *     ary.select! {|item| block } -> new_ary or nil
- *     ary.select!                 -> an_enumerator
+ *     ary.select! {|item| block } -> ary or nil
+ *     ary.select!                 -> Enumerator
+ *     ary.filter! {|item| block } -> ary or nil
+ *     ary.filter!                 -> Enumerator
  *
- *  Invokes the block passing in successive elements from
- *  +self+, deleting elements for which the block returns a
- *  false value. It returns +self+ if changes were made,
- *  otherwise it returns <code>nil</code>.
- *  See also <code>Array#keep_if</code>
+ *  Invokes the given block passing in successive elements from +self+,
+ *  deleting elements for which the block returns a +false+ value.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  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+.
+ *
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *  See also Array#keep_if.
+ *
+ *  Array#filter! is an alias for Array#select!.
  */
 
 static VALUE
 rb_ary_select_bang(VALUE ary)
 {
-    long i1, i2;
+    struct select_bang_arg args;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    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_PTR(ary)[i1];
-	if (!RTEST(rb_yield(v))) continue;
-	if (i1 != i2) {
-	    rb_ary_store(ary, i2, v);
-	}
-	i2++;
-    }
 
-    if (RARRAY_LEN(ary) == i2) return Qnil;
-    if (i2 < RARRAY_LEN(ary))
-	ARY_SET_LEN(ary, i2);
-    return ary;
+    args.ary = ary;
+    args.len[0] = args.len[1] = 0;
+    return rb_ensure(select_bang_i, (VALUE)&args, select_bang_ensure, (VALUE)&args);
 }
 
 /*
  *  call-seq:
- *     ary.keep_if {|item| block } -> ary
- *     ary.keep_if                 -> an_enumerator
+ *     ary.keep_if {|item| block}   -> ary
+ *     ary.keep_if                  -> Enumerator
  *
- *  Deletes every element of +self+ for which <i>block</i> evaluates
- *  to false.
- *  See also <code>Array#select!</code>
+ *  Deletes every element of +self+ for which the given block evaluates to
+ *  +false+, and returns +self+.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  If no block is given, an Enumerator is returned instead.
  *
- *     a = %w{ a b c d e f }
- *     a.keep_if {|v| v =~ /[aeiou]/}   #=> ["a", "e"]
+ *     a = %w[ a b c d e f ]
+ *     a.keep_if {|v| v =~ /[aeiou]/ }    #=> ["a", "e"]
+ *     a                                  #=> ["a", "e"]
+ *
+ *  See also Array#select!.
  */
 
 static VALUE
 rb_ary_keep_if(VALUE ary)
 {
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     rb_ary_select_bang(ary);
     return ary;
 }
 
+static void
+ary_resize_smaller(VALUE ary, long len)
+{
+    rb_ary_modify(ary);
+    if (RARRAY_LEN(ary) > len) {
+	ARY_SET_LEN(ary, len);
+	if (len * 2 < ARY_CAPA(ary) &&
+	    ARY_CAPA(ary) > ARY_DEFAULT_SIZE) {
+	    ary_resize_capa(ary, len * 2);
+	}
+    }
+}
+
 /*
  *  call-seq:
- *     ary.delete(obj)            -> obj or nil
- *     ary.delete(obj) { block }  -> obj or nil
+ *     ary.delete(obj)            -> item or nil
+ *     ary.delete(obj) {block}    -> item or result of block
  *
- *  Deletes items from +self+ that are equal to <i>obj</i>.
- *  If any items are found, returns <i>obj</i>.   If
- *  the item is not found, returns <code>nil</code>. If the optional
- *  code block is given, returns the result of <i>block</i> if the item
- *  is not found.  (To remove <code>nil</code> elements and
- *  get an informative return value, use #compact!)
+ *  Deletes all items from +self+ that are equal to +obj+.
+ *
+ *  Returns the last deleted item, or +nil+ if no matching item is found.
+ *
+ *  If the optional code block is given, the result of the block is returned if
+ *  the item is not found.  (To remove +nil+ elements and get an informative
+ *  return value, use Array#compact!)
  *
  *     a = [ "a", "b", "b", "b", "c" ]
  *     a.delete("b")                   #=> "b"
  *     a                               #=> ["a", "c"]
  *     a.delete("z")                   #=> nil
- *     a.delete("z") { "not found" }   #=> "not found"
+ *     a.delete("z") {"not found"}     #=> "not found"
  */
 
 VALUE
@@ -2422,7 +3368,7 @@ rb_ary_delete(VALUE ary, VALUE item)
     long i1, i2;
 
     for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
-	VALUE e = RARRAY_PTR(ary)[i1];
+	VALUE e = RARRAY_AREF(ary, i1);
 
 	if (rb_equal(e, item)) {
 	    v = e;
@@ -2440,16 +3386,33 @@ rb_ary_delete(VALUE ary, VALUE item)
 	return Qnil;
     }
 
-    rb_ary_modify(ary);
-    if (RARRAY_LEN(ary) > i2) {
-	ARY_SET_LEN(ary, i2);
-	if (i2 * 2 < ARY_CAPA(ary) &&
-	    ARY_CAPA(ary) > ARY_DEFAULT_SIZE) {
-	    ary_resize_capa(ary, i2*2);
+    ary_resize_smaller(ary, i2);
+
+    ary_verify(ary);
+    return v;
+}
+
+void
+rb_ary_delete_same(VALUE ary, VALUE item)
+{
+    long i1, i2;
+
+    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
+	VALUE e = RARRAY_AREF(ary, i1);
+
+	if (e == item) {
+	    continue;
 	}
+	if (i1 != i2) {
+	    rb_ary_store(ary, i2, e);
+	}
+	i2++;
+    }
+    if (RARRAY_LEN(ary) == i2) {
+	return;
     }
 
-    return v;
+    ary_resize_smaller(ary, i2);
 }
 
 VALUE
@@ -2465,11 +3428,12 @@ rb_ary_delete_at(VALUE ary, long pos)
     }
 
     rb_ary_modify(ary);
-    del = RARRAY_PTR(ary)[pos];
-    MEMMOVE(RARRAY_PTR(ary)+pos, RARRAY_PTR(ary)+pos+1, VALUE,
-	    RARRAY_LEN(ary)-pos-1);
+    del = RARRAY_AREF(ary, pos);
+    RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+        MEMMOVE(ptr+pos, ptr+pos+1, VALUE, len-pos-1);
+    });
     ARY_INCREASE_LEN(ary, -1);
-
+    ary_verify(ary);
     return del;
 }
 
@@ -2477,11 +3441,12 @@ rb_ary_delete_at(VALUE ary, long pos)
  *  call-seq:
  *     ary.delete_at(index)  -> obj or nil
  *
- *  Deletes the element at the specified index, returning that element,
- *  or <code>nil</code> if the index is out of range. See also
- *  <code>Array#slice!</code>.
+ *  Deletes the element at the specified +index+, returning that element, or
+ *  +nil+ if the +index+ is out of range.
+ *
+ *  See also Array#slice!
  *
- *     a = %w( ant bat cat dog )
+ *     a = ["ant", "bat", "cat", "dog"]
  *     a.delete_at(2)    #=> "cat"
  *     a                 #=> ["ant", "bat", "dog"]
  *     a.delete_at(99)   #=> nil
@@ -2499,9 +3464,11 @@ rb_ary_delete_at_m(VALUE ary, VALUE pos)
  *     ary.slice!(start, length) -> new_ary or nil
  *     ary.slice!(range)         -> new_ary or nil
  *
- *  Deletes the element(s) given by an index (optionally with a length)
- *  or by a range. Returns the deleted object (or objects), or
- *  <code>nil</code> if the index is out of range.
+ *  Deletes the element(s) given by an +index+ (optionally up to +length+
+ *  elements) or by a +range+.
+ *
+ *  Returns the deleted object (or objects), or +nil+ if the +index+ is out of
+ *  range.
  *
  *     a = [ "a", "b", "c" ]
  *     a.slice!(1)     #=> "b"
@@ -2534,16 +3501,13 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
 	    len = orig_len - pos;
 	}
 	if (len == 0) return rb_ary_new2(0);
-	arg2 = rb_ary_new4(len, RARRAY_PTR(ary)+pos);
-	RBASIC(arg2)->klass = rb_obj_class(ary);
-	rb_ary_splice(ary, pos, len, Qundef);
+        arg2 = rb_ary_new4(len, RARRAY_CONST_PTR_TRANSIENT(ary)+pos);
+	RBASIC_SET_CLASS(arg2, rb_obj_class(ary));
+	rb_ary_splice(ary, pos, len, 0, 0);
 	return arg2;
     }
 
-    if (argc != 1) {
-	/* error report */
-	rb_scan_args(argc, argv, "11", NULL, NULL);
-    }
+    rb_check_arity(argc, 1, 2);
     arg1 = argv[0];
 
     if (!FIXNUM_P(arg1)) {
@@ -2569,66 +3533,77 @@ ary_reject(VALUE orig, VALUE result)
     long i;
 
     for (i = 0; i < RARRAY_LEN(orig); i++) {
-	VALUE v = RARRAY_PTR(orig)[i];
-	if (!RTEST(rb_yield(v))) {
-	    rb_ary_push_1(result, v);
+	VALUE v = RARRAY_AREF(orig, i);
+
+        if (!RTEST(rb_yield(v))) {
+	    rb_ary_push(result, v);
 	}
     }
     return result;
 }
 
 static VALUE
-ary_reject_bang(VALUE ary)
+reject_bang_i(VALUE a)
 {
-    long i;
-    VALUE result = Qnil;
+    volatile struct select_bang_arg *arg = (void *)a;
+    VALUE ary = arg->ary;
+    long i1, i2;
 
-    rb_ary_modify_check(ary);
-    for (i = 0; i < RARRAY_LEN(ary); ) {
-	VALUE v = RARRAY_PTR(ary)[i];
-	if (RTEST(rb_yield(v))) {
-	    rb_ary_delete_at(ary, i);
-	    result = ary;
-	}
-	else {
-	    i++;
+    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 result;
+    return (i1 == i2) ? Qnil : ary;
+}
+
+static VALUE
+ary_reject_bang(VALUE ary)
+{
+    struct select_bang_arg args;
+    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);
 }
 
 /*
  *  call-seq:
- *     ary.reject! {|item| block }  -> ary or nil
- *     ary.reject!                  -> an_enumerator
+ *     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 <code>Array#delete_if</code>, deleting elements from
- *  +self+ for which the block evaluates to true, but returns
- *  <code>nil</code> if no changes were made.
- *  See also <code>Enumerable#reject</code> and <code>Array#delete_if</code>.
+ *  The array may not be changed instantly every time the block is called.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  See also Enumerable#reject and Array#delete_if.
  *
+ *  If no block is given, an Enumerator is returned instead.
  */
 
 static VALUE
 rb_ary_reject_bang(VALUE ary)
 {
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
+    rb_ary_modify(ary);
     return ary_reject_bang(ary);
 }
 
 /*
  *  call-seq:
- *     ary.reject {|item| block }  -> new_ary
- *     ary.reject                  -> an_enumerator
+ *     ary.reject  {|item| block }  -> new_ary
+ *     ary.reject                   -> Enumerator
  *
- *  Returns a new array containing the items in +self+
- *  for which the block is not true.
- *  See also <code>Array#delete_if</code>
+ *  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.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  See also Array#delete_if
  *
+ *  If no block is given, an Enumerator is returned instead.
  */
 
 static VALUE
@@ -2636,7 +3611,7 @@ rb_ary_reject(VALUE ary)
 {
     VALUE rejected_ary;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     rejected_ary = rb_ary_new();
     ary_reject(ary, rejected_ary);
     return rejected_ary;
@@ -2644,31 +3619,37 @@ rb_ary_reject(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.delete_if {|item| block }  -> ary
- *     ary.delete_if                  -> an_enumerator
+ *     ary.delete_if {|item| block}    -> ary
+ *     ary.delete_if                   -> Enumerator
  *
- *  Deletes every element of +self+ for which <i>block</i> evaluates
- *  to true.
- *  See also <code>Array#reject!</code>
+ *  Deletes every element of +self+ for which block evaluates to +true+.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  The array is changed instantly every time the block is called, not after
+ *  the iteration is over.
  *
- *     a = [ "a", "b", "c" ]
- *     a.delete_if {|x| x >= "b" }   #=> ["a"]
+ *  See also Array#reject!
+ *
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *     scores = [ 97, 42, 75 ]
+ *     scores.delete_if {|score| score < 80 }   #=> [97]
  */
 
 static VALUE
 rb_ary_delete_if(VALUE ary)
 {
-    RETURN_ENUMERATOR(ary, 0, 0);
+    ary_verify(ary);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     ary_reject_bang(ary);
     return ary;
 }
 
 static VALUE
-take_i(VALUE val, VALUE *args, int argc, VALUE *argv)
+take_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, cbarg))
 {
-    if (args[1]-- == 0) rb_iter_break();
+    VALUE *args = (VALUE *)cbarg;
+    if (args[1] == 0) rb_iter_break();
+    else args[1]--;
     if (argc > 1) val = rb_ary_new4(argc, argv);
     rb_ary_push(args[0], val);
     return Qnil;
@@ -2683,61 +3664,92 @@ take_items(VALUE obj, long n)
     if (!NIL_P(result)) return rb_ary_subseq(result, 0, n);
     result = rb_ary_new2(n);
     args[0] = result; args[1] = (VALUE)n;
-    rb_block_call(obj, rb_intern("each"), 0, 0, take_i, (VALUE)args);
+    if (rb_check_block_call(obj, idEach, 0, 0, take_i, (VALUE)args) == Qundef)
+	rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (must respond to :each)",
+		 rb_obj_class(obj));
     return result;
 }
 
 
 /*
  *  call-seq:
- *     ary.zip(arg, ...)                   -> new_ary
- *     ary.zip(arg, ...) {| arr | block }  -> nil
- *
- *  Converts any arguments to arrays, then merges elements of
- *  +self+ with corresponding elements from each argument. This
- *  generates a sequence of <code>self.size</code> <em>n</em>-element
- *  arrays, where <em>n</em> is one more that the count of arguments. If
- *  the size of any argument is less than <code>enumObj.size</code>,
- *  <code>nil</code> values are supplied. If a block is given, it is
- *  invoked for each output array, otherwise an array of arrays is
- *  returned.
+ *     ary.zip(arg, ...)                  -> new_ary
+ *     ary.zip(arg, ...) {|arr| block}    -> nil
+ *
+ *  Converts any arguments to arrays, then merges elements of +self+ with
+ *  corresponding elements from each argument.
+ *
+ *  This generates a sequence of <code>ary.size</code> _n_-element arrays,
+ *  where _n_ is one more than the count of arguments.
+ *
+ *  If the size of any argument is less than the size of the initial array,
+ *  +nil+ values are supplied.
+ *
+ *  If a block is given, it is invoked for each output +array+, otherwise an
+ *  array of arrays is returned.
  *
  *     a = [ 4, 5, 6 ]
  *     b = [ 7, 8, 9 ]
- *     [1,2,3].zip(a, b)      #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
- *     [1,2].zip(a,b)         #=> [[1, 4, 7], [2, 5, 8]]
- *     a.zip([1,2],[8])       #=> [[4,1,8], [5,2,nil], [6,nil,nil]]
+ *     [1, 2, 3].zip(a, b)   #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
+ *     [1, 2].zip(a, b)      #=> [[1, 4, 7], [2, 5, 8]]
+ *     a.zip([1, 2], [8])    #=> [[4, 1, 8], [5, 2, nil], [6, nil, nil]]
  */
 
 static VALUE
 rb_ary_zip(int argc, VALUE *argv, VALUE ary)
 {
     int i, j;
-    long len;
+    long len = RARRAY_LEN(ary);
     VALUE result = Qnil;
 
-    len = RARRAY_LEN(ary);
     for (i=0; i<argc; i++) {
 	argv[i] = take_items(argv[i], len);
     }
-    if (!rb_block_given_p()) {
-	result = rb_ary_new2(len);
-    }
 
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	VALUE tmp = rb_ary_new2(argc+1);
+    if (rb_block_given_p()) {
+	int arity = rb_block_arity();
 
-	rb_ary_push(tmp, rb_ary_elt(ary, i));
-	for (j=0; j<argc; j++) {
-	    rb_ary_push(tmp, rb_ary_elt(argv[j], i));
-	}
-	if (NIL_P(result)) {
-	    rb_yield(tmp);
+	if (arity > 1) {
+	    VALUE work, *tmp;
+
+	    tmp = ALLOCV_N(VALUE, work, argc+1);
+
+	    for (i=0; i<RARRAY_LEN(ary); i++) {
+		tmp[0] = RARRAY_AREF(ary, i);
+		for (j=0; j<argc; j++) {
+		    tmp[j+1] = rb_ary_elt(argv[j], i);
+		}
+		rb_yield_values2(argc+1, tmp);
+	    }
+
+	    if (work) ALLOCV_END(work);
 	}
 	else {
+	    for (i=0; i<RARRAY_LEN(ary); i++) {
+		VALUE tmp = rb_ary_new2(argc+1);
+
+		rb_ary_push(tmp, RARRAY_AREF(ary, i));
+		for (j=0; j<argc; j++) {
+		    rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+		}
+		rb_yield(tmp);
+	    }
+	}
+    }
+    else {
+	result = rb_ary_new_capa(len);
+
+	for (i=0; i<len; i++) {
+	    VALUE tmp = rb_ary_new_capa(argc+1);
+
+	    rb_ary_push(tmp, RARRAY_AREF(ary, i));
+	    for (j=0; j<argc; j++) {
+		rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+	    }
 	    rb_ary_push(result, tmp);
 	}
     }
+
     return result;
 }
 
@@ -2745,11 +3757,13 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary)
  *  call-seq:
  *     ary.transpose -> new_ary
  *
- *  Assumes that +self+ is an array of arrays and transposes the
- *  rows and columns.
+ *  Assumes that +self+ is an array of arrays and transposes the rows and
+ *  columns.
  *
  *     a = [[1,2], [3,4], [5,6]]
  *     a.transpose   #=> [[1, 3, 5], [2, 4, 6]]
+ *
+ *  If the length of the subarrays don't match, an IndexError is raised.
  */
 
 static VALUE
@@ -2783,9 +3797,10 @@ rb_ary_transpose(VALUE ary)
 /*
  *  call-seq:
  *     ary.replace(other_ary)  -> ary
+ *     ary.initialize_copy(other_ary)	-> ary
  *
- *  Replaces the contents of +self+ with the contents of
- *  <i>other_ary</i>, truncating or expanding if necessary.
+ *  Replaces the contents of +self+ with the contents of +other_ary+,
+ *  truncating or expanding if necessary.
  *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a.replace([ "x", "y", "z" ])   #=> ["x", "y", "z"]
@@ -2800,37 +3815,36 @@ rb_ary_replace(VALUE copy, VALUE orig)
     if (copy == orig) return copy;
 
     if (RARRAY_LEN(orig) <= RARRAY_EMBED_LEN_MAX) {
-        VALUE *ptr;
-        VALUE shared = 0;
+        VALUE shared_root = 0;
 
         if (ARY_OWNS_HEAP_P(copy)) {
-            xfree(RARRAY_PTR(copy));
-        }
+            ary_heap_free(copy);
+	}
         else if (ARY_SHARED_P(copy)) {
-            shared = ARY_SHARED(copy);
+            shared_root = ARY_SHARED_ROOT(copy);
             FL_UNSET_SHARED(copy);
         }
         FL_SET_EMBED(copy);
-        ptr = RARRAY_PTR(orig);
-        MEMCPY(RARRAY_PTR(copy), ptr, VALUE, RARRAY_LEN(orig));
-        if (shared) {
-            rb_ary_decrement_share(shared);
+        ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR_TRANSIENT(orig));
+        if (shared_root) {
+            rb_ary_decrement_share(shared_root);
         }
         ARY_SET_LEN(copy, RARRAY_LEN(orig));
     }
     else {
-        VALUE shared = ary_make_shared(orig);
+        VALUE shared_root = ary_make_shared(orig);
         if (ARY_OWNS_HEAP_P(copy)) {
-            xfree(RARRAY_PTR(copy));
+            ary_heap_free(copy);
         }
         else {
             rb_ary_unshare_safe(copy);
         }
         FL_UNSET_EMBED(copy);
-        ARY_SET_PTR(copy, RARRAY_PTR(orig));
-        ARY_SET_LEN(copy, RARRAY_LEN(orig));
-        rb_ary_set_shared(copy, shared);
+        ARY_SET_PTR(copy, ARY_HEAP_PTR(orig));
+        ARY_SET_LEN(copy, ARY_HEAP_LEN(orig));
+        rb_ary_set_shared(copy, shared_root);
     }
+    ary_verify(copy);
     return copy;
 }
 
@@ -2848,35 +3862,44 @@ VALUE
 rb_ary_clear(VALUE ary)
 {
     rb_ary_modify_check(ary);
-    ARY_SET_LEN(ary, 0);
     if (ARY_SHARED_P(ary)) {
 	if (!ARY_EMBED_P(ary)) {
 	    rb_ary_unshare(ary);
 	    FL_SET_EMBED(ary);
+            ARY_SET_EMBED_LEN(ary, 0);
 	}
     }
-    else if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
-	ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2);
+    else {
+        ARY_SET_LEN(ary, 0);
+        if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
+            ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2);
+        }
     }
+    ary_verify(ary);
     return ary;
 }
 
 /*
  *  call-seq:
- *     ary.fill(obj)                                -> ary
- *     ary.fill(obj, start [, length])              -> ary
- *     ary.fill(obj, range )                        -> ary
- *     ary.fill {|index| block }                    -> ary
- *     ary.fill(start [, length] ) {|index| block } -> ary
- *     ary.fill(range) {|index| block }             -> ary
+ *     ary.fill(obj)                                 -> ary
+ *     ary.fill(obj, start [, length])               -> ary
+ *     ary.fill(obj, range)                          -> ary
+ *     ary.fill {|index| block}                      -> ary
+ *     ary.fill(start [, length]) {|index| block}    -> ary
+ *     ary.fill(range) {|index| block}               -> ary
  *
  *  The first three forms set the selected elements of +self+ (which
- *  may be the entire array) to <i>obj</i>. A <i>start</i> of
- *  <code>nil</code> is equivalent to zero. A <i>length</i> of
- *  <code>nil</code> is equivalent to <i>self.length</i>. The last three
- *  forms fill the array with the value of the block. The block is
- *  passed the absolute index of each element to be filled.
- *  Negative values of <i>start</i> count from the end of the array.
+ *  may be the entire array) to +obj+.
+ *
+ *  A +start+ of +nil+ is equivalent to zero.
+ *
+ *  A +length+ of +nil+ is equivalent to the length of the array.
+ *
+ *  The last three forms fill the array with the value of the given block,
+ *  which is passed the absolute index of each element to be filled.
+ *
+ *  Negative values of +start+ count from the end of the array, where +-1+ is
+ *  the last element.
  *
  *     a = [ "a", "b", "c", "d" ]
  *     a.fill("x")              #=> ["x", "x", "x", "x"]
@@ -2889,13 +3912,10 @@ rb_ary_clear(VALUE ary)
 static VALUE
 rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE item, arg1, arg2;
+    VALUE item = Qundef, arg1, arg2;
     long beg = 0, end = 0, len = 0;
-    VALUE *p, *pend;
-    int block_p = FALSE;
 
     if (rb_block_given_p()) {
-	block_p = TRUE;
 	rb_scan_args(argc, argv, "02", &arg1, &arg2);
 	argc += 1;		/* hackish */
     }
@@ -2933,26 +3953,22 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 	if (end >= ARY_CAPA(ary)) {
 	    ary_resize_capa(ary, end);
 	}
-	rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), end - RARRAY_LEN(ary));
+	ary_mem_clear(ary, RARRAY_LEN(ary), end - RARRAY_LEN(ary));
 	ARY_SET_LEN(ary, end);
     }
 
-    if (block_p) {
+    if (item == Qundef) {
 	VALUE v;
 	long i;
 
 	for (i=beg; i<end; i++) {
 	    v = rb_yield(LONG2NUM(i));
 	    if (i>=RARRAY_LEN(ary)) break;
-	    RARRAY_PTR(ary)[i] = v;
+	    ARY_SET(ary, i, v);
 	}
     }
     else {
-	p = RARRAY_PTR(ary) + beg;
-	pend = p + len;
-	while (p < pend) {
-	    *p++ = item;
-	}
+	ary_memfill(ary, beg, len, item);
     }
     return ary;
 }
@@ -2961,57 +3977,110 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
  *  call-seq:
  *     ary + other_ary   -> new_ary
  *
- *  Concatenation---Returns a new array built by concatenating the
+ *  Concatenation --- Returns a new array built by concatenating the
  *  two arrays together to produce a third array.
  *
  *     [ 1, 2, 3 ] + [ 4, 5 ]    #=> [ 1, 2, 3, 4, 5 ]
+ *     a = [ "a", "b", "c" ]
+ *     c = a + [ "d", "e", "f" ]
+ *     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.
  */
 
 VALUE
 rb_ary_plus(VALUE x, VALUE y)
 {
     VALUE z;
-    long len;
+    long len, xlen, ylen;
 
     y = to_ary(y);
-    len = RARRAY_LEN(x) + RARRAY_LEN(y);
+    xlen = RARRAY_LEN(x);
+    ylen = RARRAY_LEN(y);
+    len = xlen + ylen;
     z = rb_ary_new2(len);
-    MEMCPY(RARRAY_PTR(z), RARRAY_PTR(x), VALUE, RARRAY_LEN(x));
-    MEMCPY(RARRAY_PTR(z) + RARRAY_LEN(x), RARRAY_PTR(y), VALUE, RARRAY_LEN(y));
+
+    ary_memcpy(z, 0, xlen, RARRAY_CONST_PTR_TRANSIENT(x));
+    ary_memcpy(z, xlen, ylen, RARRAY_CONST_PTR_TRANSIENT(y));
     ARY_SET_LEN(z, len);
     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_TRANSIENT(y), n);
+    }
+    return x;
+}
+
 /*
  *  call-seq:
- *     ary.concat(other_ary)   -> ary
+ *     ary.concat(other_ary1, other_ary2, ...)   -> ary
+ *
+ *  Appends the elements of <code>other_ary</code>s 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 ]
  *
- *  Appends the elements of <i>other_ary</i> to +self+.
+ *     a = [ 1, 2 ]
+ *     a.concat(a, a)                    #=> [1, 2, 1, 2, 1, 2]
  *
- *     [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
+ *  See also Array#+.
  */
 
+static VALUE
+rb_ary_concat_multi(int argc, VALUE *argv, VALUE ary)
+{
+    rb_ary_modify_check(ary);
+
+    if (argc == 1) {
+	rb_ary_concat(ary, argv[0]);
+    }
+    else if (argc > 1) {
+	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);
+    }
+
+    ary_verify(ary);
+    return ary;
+}
 
 VALUE
 rb_ary_concat(VALUE x, VALUE 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;
+    return ary_append(x, to_ary(y));
 }
 
-
 /*
  *  call-seq:
  *     ary * int     -> new_ary
  *     ary * str     -> new_string
  *
- *  Repetition---With a String argument, equivalent to
- *  self.join(str). Otherwise, returns a new array
- *  built by concatenating the _int_ copies of +self+.
+ *  Repetition --- With a String argument, equivalent to
+ *  <code>ary.join(str)</code>.
+ *
+ *  Otherwise, returns a new array built by concatenating the +int+ copies of
+ *  +self+.
  *
  *
  *     [ 1, 2, 3 ] * 3    #=> [ 1, 2, 3, 1, 2, 3, 1, 2, 3 ]
@@ -3022,7 +4091,8 @@ rb_ary_concat(VALUE x, VALUE y)
 static VALUE
 rb_ary_times(VALUE ary, VALUE times)
 {
-    VALUE ary2, tmp, *ptr, *ptr2;
+    VALUE ary2, tmp;
+    const VALUE *ptr;
     long t, len;
 
     tmp = rb_check_string_type(times);
@@ -3046,36 +4116,33 @@ rb_ary_times(VALUE ary, VALUE times)
     ary2 = ary_new(rb_obj_class(ary), len);
     ARY_SET_LEN(ary2, len);
 
-    ptr = RARRAY_PTR(ary);
-    ptr2 = RARRAY_PTR(ary2);
+    ptr = RARRAY_CONST_PTR_TRANSIENT(ary);
     t = RARRAY_LEN(ary);
     if (0 < t) {
-        MEMCPY(ptr2, ptr, VALUE, t);
-        while (t <= len/2) {
-            MEMCPY(ptr2+t, ptr2, VALUE, t);
+	ary_memcpy(ary2, 0, t, ptr);
+	while (t <= len/2) {
+            ary_memcpy(ary2, t, t, RARRAY_CONST_PTR_TRANSIENT(ary2));
             t *= 2;
         }
         if (t < len) {
-            MEMCPY(ptr2+t, ptr2, VALUE, len-t);
+            ary_memcpy(ary2, t, len-t, RARRAY_CONST_PTR_TRANSIENT(ary2));
         }
     }
   out:
-    OBJ_INFECT(ary2, ary);
-
     return ary2;
 }
 
 /*
  *  call-seq:
- *     ary.assoc(obj)   -> new_ary  or  nil
+ *     ary.assoc(obj)   -> element_ary  or  nil
  *
- *  Searches through an array whose elements are also arrays
- *  comparing _obj_ with the first element of each contained array
- *  using obj.==.
- *  Returns the first contained array that matches (that
- *  is, the first associated array),
- *  or +nil+ if no match is found.
- *  See also <code>Array#rassoc</code>.
+ *  Searches through an array whose elements are also arrays comparing +obj+
+ *  with the first element of each contained array using <code>obj.==</code>.
+ *
+ *  Returns the first contained array that matches (that is, the first
+ *  associated array), or +nil+ if no match is found.
+ *
+ *  See also Array#rassoc
  *
  *     s1 = [ "colors", "red", "blue", "green" ]
  *     s2 = [ "letters", "a", "b", "c" ]
@@ -3092,9 +4159,9 @@ rb_ary_assoc(VALUE ary, VALUE key)
     VALUE v;
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	v = rb_check_array_type(RARRAY_PTR(ary)[i]);
+	v = rb_check_array_type(RARRAY_AREF(ary, i));
 	if (!NIL_P(v) && RARRAY_LEN(v) > 0 &&
-	    rb_equal(RARRAY_PTR(v)[0], key))
+	    rb_equal(RARRAY_AREF(v, 0), key))
 	    return v;
     }
     return Qnil;
@@ -3102,12 +4169,16 @@ rb_ary_assoc(VALUE ary, VALUE key)
 
 /*
  *  call-seq:
- *     ary.rassoc(obj) -> new_ary or nil
+ *     ary.rassoc(obj) -> element_ary or nil
+ *
+ *  Searches through the array whose elements are also arrays.
  *
- *  Searches through the array whose elements are also arrays. Compares
- *  _obj_ with the second element of each contained array using
- *  <code>==</code>. Returns the first contained array that matches. See
- *  also <code>Array#assoc</code>.
+ *  Compares +obj+ with the second element of each contained array using
+ *  <code>obj.==</code>.
+ *
+ *  Returns the first contained array that matches +obj+.
+ *
+ *  See also Array#assoc.
  *
  *     a = [ [ 1, "one"], [2, "two"], [3, "three"], ["ii", "two"] ]
  *     a.rassoc("two")    #=> [2, "two"]
@@ -3121,10 +4192,10 @@ rb_ary_rassoc(VALUE ary, VALUE value)
     VALUE v;
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	v = RARRAY_PTR(ary)[i];
-	if (TYPE(v) == T_ARRAY &&
+	v = RARRAY_AREF(ary, i);
+	if (RB_TYPE_P(v, T_ARRAY) &&
 	    RARRAY_LEN(v) > 1 &&
-	    rb_equal(RARRAY_PTR(v)[1], value))
+	    rb_equal(RARRAY_AREF(v, 1), value))
 	    return v;
     }
     return Qnil;
@@ -3133,12 +4204,33 @@ rb_ary_rassoc(VALUE ary, VALUE value)
 static VALUE
 recursive_equal(VALUE ary1, VALUE ary2, int recur)
 {
-    long i;
+    long i, len1;
+    const VALUE *p1, *p2;
 
     if (recur) return Qtrue; /* Subtle! */
-    for (i=0; i<RARRAY_LEN(ary1); i++) {
-	if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
-	    return Qfalse;
+
+    /* rb_equal() can evacuate ptrs */
+    p1 = RARRAY_CONST_PTR(ary1);
+    p2 = RARRAY_CONST_PTR(ary2);
+    len1 = RARRAY_LEN(ary1);
+
+    for (i = 0; i < len1; i++) {
+	if (*p1 != *p2) {
+	    if (rb_equal(*p1, *p2)) {
+		len1 = RARRAY_LEN(ary1);
+		if (len1 != RARRAY_LEN(ary2))
+		    return Qfalse;
+		if (len1 < i)
+		    return Qtrue;
+                p1 = RARRAY_CONST_PTR(ary1) + i;
+                p2 = RARRAY_CONST_PTR(ary2) + i;
+	    }
+	    else {
+		return Qfalse;
+	    }
+	}
+	p1++;
+	p2++;
     }
     return Qtrue;
 }
@@ -3147,9 +4239,9 @@ recursive_equal(VALUE ary1, VALUE ary2, int recur)
  *  call-seq:
  *     ary == other_ary   ->   bool
  *
- *  Equality---Two arrays are equal if they contain the same number
- *  of elements and if each element is equal to (according to
- *  Object.==) the corresponding element in the other array.
+ *  Equality --- Two arrays are equal if they contain the same number of
+ *  elements and if each element is equal to (according to Object#==) the
+ *  corresponding element in +other_ary+.
  *
  *     [ "a", "c" ]    == [ "a", "c", 7 ]     #=> false
  *     [ "a", "c", 7 ] == [ "a", "c", 7 ]     #=> true
@@ -3161,13 +4253,14 @@ static VALUE
 rb_ary_equal(VALUE ary1, VALUE ary2)
 {
     if (ary1 == ary2) return Qtrue;
-    if (TYPE(ary2) != T_ARRAY) {
-	if (!rb_respond_to(ary2, rb_intern("to_ary"))) {
+    if (!RB_TYPE_P(ary2, T_ARRAY)) {
+	if (!rb_respond_to(ary2, idTo_ary)) {
 	    return Qfalse;
 	}
 	return rb_equal(ary2, ary1);
     }
     if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
+    if (RARRAY_CONST_PTR_TRANSIENT(ary1) == RARRAY_CONST_PTR_TRANSIENT(ary2)) return Qtrue;
     return rb_exec_recursive_paired(recursive_equal, ary1, ary2, ary2);
 }
 
@@ -3188,61 +4281,55 @@ recursive_eql(VALUE ary1, VALUE ary2, int recur)
  *  call-seq:
  *     ary.eql?(other)  -> true or false
  *
- *  Returns <code>true</code> if +self+ and _other_ are the same object,
- *  or are both arrays with the same content.
+ *  Returns +true+ if +self+ and +other+ are the same object,
+ *  or are both arrays with the same content (according to Object#eql?).
  */
 
 static VALUE
 rb_ary_eql(VALUE ary1, VALUE ary2)
 {
     if (ary1 == ary2) return Qtrue;
-    if (TYPE(ary2) != T_ARRAY) return Qfalse;
+    if (!RB_TYPE_P(ary2, T_ARRAY)) return Qfalse;
     if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
+    if (RARRAY_CONST_PTR_TRANSIENT(ary1) == RARRAY_CONST_PTR_TRANSIENT(ary2)) return Qtrue;
     return rb_exec_recursive_paired(recursive_eql, ary1, ary2, ary2);
 }
 
+/*
+ *  call-seq:
+ *     ary.hash   -> integer
+ *
+ *  Compute a hash-code for this array.
+ *
+ *  Two arrays with the same content will have the same hash code (and will
+ *  compare using #eql?).
+ *
+ *  See also Object#hash.
+ */
+
 static VALUE
-recursive_hash(VALUE ary, VALUE dummy, int recur)
+rb_ary_hash(VALUE ary)
 {
     long i;
     st_index_t h;
     VALUE n;
 
     h = rb_hash_start(RARRAY_LEN(ary));
-    if (recur) {
-	h = rb_hash_uint(h, NUM2LONG(rb_hash(rb_cArray)));
-    }
-    else {
-	for (i=0; i<RARRAY_LEN(ary); i++) {
-	    n = rb_hash(RARRAY_PTR(ary)[i]);
-	    h = rb_hash_uint(h, NUM2LONG(n));
-	}
+    h = rb_hash_uint(h, (st_index_t)rb_ary_hash);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	n = rb_hash(RARRAY_AREF(ary, i));
+	h = rb_hash_uint(h, NUM2LONG(n));
     }
     h = rb_hash_end(h);
-    return LONG2FIX(h);
-}
-
-/*
- *  call-seq:
- *     ary.hash   -> fixnum
- *
- *  Compute a hash-code for this array. Two arrays with the same content
- *  will have the same hash code (and will compare using <code>eql?</code>).
- */
-
-static VALUE
-rb_ary_hash(VALUE ary)
-{
-    return rb_exec_recursive_outer(recursive_hash, ary, 0);
+    return ST2FIX(h);
 }
 
 /*
  *  call-seq:
- *     ary.include?(obj)   -> true or false
+ *     ary.include?(object)   -> true or false
  *
- *  Returns <code>true</code> if the given object is present in
- *  +self+ (that is, if any object <code>==</code> <i>anObject</i>),
- *  <code>false</code> otherwise.
+ *  Returns +true+ if the given +object+ is present in +self+ (that is, if any
+ *  element <code>==</code> +object+), otherwise returns +false+.
  *
  *     a = [ "a", "b", "c" ]
  *     a.include?("b")   #=> true
@@ -3253,15 +4340,31 @@ VALUE
 rb_ary_includes(VALUE ary, VALUE item)
 {
     long i;
+    VALUE e;
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	if (rb_equal(RARRAY_PTR(ary)[i], item)) {
+	e = RARRAY_AREF(ary, i);
+	if (rb_equal(e, item)) {
 	    return Qtrue;
 	}
     }
     return Qfalse;
 }
 
+static VALUE
+rb_ary_includes_by_eql(VALUE ary, VALUE item)
+{
+    long i;
+    VALUE e;
+
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	e = RARRAY_AREF(ary, i);
+	if (rb_eql(item, e)) {
+	    return Qtrue;
+	}
+    }
+    return Qfalse;
+}
 
 static VALUE
 recursive_cmp(VALUE ary1, VALUE ary2, int recur)
@@ -3274,7 +4377,8 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur)
 	len = RARRAY_LEN(ary2);
     }
     for (i=0; i<len; i++) {
-	VALUE v = rb_funcall(rb_ary_elt(ary1, i), id_cmp, 1, rb_ary_elt(ary2, i));
+	VALUE e1 = rb_ary_elt(ary1, i), e2 = rb_ary_elt(ary2, i);
+	VALUE v = rb_funcallv(e1, id_cmp, 1, &e2);
 	if (v != INT2FIX(0)) {
 	    return v;
 	}
@@ -3286,19 +4390,29 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur)
  *  call-seq:
  *     ary <=> other_ary   ->  -1, 0, +1 or nil
  *
- *  Comparison---Returns an integer (-1, 0,
- *  or +1) if this array is less than, equal to, or greater than
- *  <i>other_ary</i>.  Each object in each array is compared
- *  (using <=>). If any value isn't
- *  equal, then that inequality is the return value. If all the
- *  values found are equal, then the return is based on a
- *  comparison of the array lengths.  Thus, two arrays are
- *  ``equal'' according to <code>Array#<=></code> if and only if they have
- *  the same length and the value of each element is equal to the
- *  value of the corresponding element in the other array.
+ *  Comparison --- Returns an integer (+-1+, +0+, or <code>+1</code>) if this
+ *  array is less than, equal to, or greater than +other_ary+.
+ *
+ *  Each object in each array is compared (using the <=> operator).
+ *
+ *  Arrays are compared in an "element-wise" manner; the first element of +ary+
+ *  is compared with the first one of +other_ary+ using the <=> operator, then
+ *  each of the second elements, etc...
+ *  As soon as the result of any such comparison is non zero (i.e. the two
+ *  corresponding elements are not equal), that result is returned for the
+ *  whole array comparison.
+ *
+ *  If all the elements are equal, then the result is based on a comparison of
+ *  the array lengths. Thus, two arrays are "equal" according to Array#<=> if,
+ *  and only if, they have the same length and the value of each element is
+ *  equal to the value of the corresponding element in the other array.
+ *
+ *  +nil+ is returned if the +other_ary+ is not an array or if the comparison
+ *  of two elements returned +nil+.
  *
  *     [ "a", "a", "c" ]    <=> [ "a", "b", "c" ]   #=> -1
  *     [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ]            #=> +1
+ *     [ 1, 2 ]             <=> [ 1, :two ]         #=> nil
  *
  */
 
@@ -3325,24 +4439,26 @@ ary_add_hash(VALUE hash, VALUE ary)
     long i;
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	rb_hash_aset(hash, RARRAY_PTR(ary)[i], Qtrue);
+	VALUE elt = RARRAY_AREF(ary, i);
+	rb_hash_add_new_element(hash, elt, elt);
     }
     return hash;
 }
 
 static inline VALUE
-ary_tmp_hash_new(void)
+ary_tmp_hash_new(VALUE ary)
 {
-    VALUE hash = rb_hash_new();
+    long size = RARRAY_LEN(ary);
+    VALUE hash = rb_hash_new_with_size(size);
 
-    RBASIC(hash)->klass = 0;
+    RBASIC_CLEAR_CLASS(hash);
     return hash;
 }
 
 static VALUE
 ary_make_hash(VALUE ary)
 {
-    VALUE hash = ary_tmp_hash_new();
+    VALUE hash = ary_tmp_hash_new(ary);
     return ary_add_hash(hash, ary);
 }
 
@@ -3353,9 +4469,7 @@ 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);
-	if (rb_hash_lookup2(hash, k, Qundef) == Qundef) {
-	    rb_hash_aset(hash, k, v);
-	}
+	rb_hash_add_new_element(hash, k, v);
     }
     return hash;
 }
@@ -3363,17 +4477,18 @@ ary_add_hash_by(VALUE hash, VALUE ary)
 static VALUE
 ary_make_hash_by(VALUE ary)
 {
-    VALUE hash = ary_tmp_hash_new();
+    VALUE hash = ary_tmp_hash_new(ary);
     return ary_add_hash_by(hash, ary);
 }
 
 static inline void
 ary_recycle_hash(VALUE hash)
 {
-    if (RHASH(hash)->ntbl) {
-	st_table *tbl = RHASH(hash)->ntbl;
-	RHASH(hash)->ntbl = 0;
+    assert(RBASIC_CLASS(hash) == 0);
+    if (RHASH_ST_TABLE_P(hash)) {
+        st_table *tbl = RHASH_ST_TABLE(hash);
 	st_free_table(tbl);
+        RHASH_ST_CLEAR(hash);
     }
 }
 
@@ -3381,26 +4496,47 @@ ary_recycle_hash(VALUE hash)
  *  call-seq:
  *     ary - other_ary    -> new_ary
  *
- *  Array Difference---Returns a new array that is a copy of
- *  the original array, removing any items that also appear in
- *  <i>other_ary</i>. (If you need set-like behavior, see the
- *  library class Set.)
+ *  Array Difference
+ *
+ *  Returns a new array that is a copy of the original array, removing all
+ *  occurrences of any item that also appear in +other_ary+. The order is
+ *  preserved from the original array.
+ *
+ *  It compares elements using their #hash and #eql? methods for efficiency.
  *
  *     [ 1, 1, 2, 2, 3, 3, 4, 5 ] - [ 1, 2, 4 ]  #=>  [ 3, 3, 5 ]
+ *
+ *  Note that while 1 and 2 were only present once in the array argument, and
+ *  were present twice in the receiver array, all occurrences of each Integer are
+ *  removed in the returned array.
+ *
+ *  If you need set-like behavior, see the library class Set.
+ *
+ *  See also Array#difference.
  */
 
 static VALUE
 rb_ary_diff(VALUE ary1, VALUE ary2)
 {
     VALUE ary3;
-    volatile VALUE hash;
+    VALUE hash;
     long i;
 
-    hash = ary_make_hash(to_ary(ary2));
+    ary2 = to_ary(ary2);
     ary3 = rb_ary_new();
 
+    if (RARRAY_LEN(ary1) <= SMALL_ARRAY_LEN || RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) {
+	for (i=0; i<RARRAY_LEN(ary1); i++) {
+	    VALUE elt = rb_ary_elt(ary1, i);
+	    if (rb_ary_includes_by_eql(ary2, elt)) continue;
+	    rb_ary_push(ary3, elt);
+	}
+	return ary3;
+    }
+
+    hash = ary_make_hash(ary2);
     for (i=0; i<RARRAY_LEN(ary1); i++) {
-	if (st_lookup(RHASH_TBL(hash), RARRAY_PTR(ary1)[i], 0)) continue;
+        if (rb_hash_stlike_lookup(hash, RARRAY_AREF(ary1, i), NULL)) continue;
 	rb_ary_push(ary3, rb_ary_elt(ary1, i));
     }
     ary_recycle_hash(hash);
@@ -3409,12 +4545,83 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
 
 /*
  *  call-seq:
+ *     ary.difference(other_ary1, other_ary2, ...)   -> new_ary
+ *
+ *  Array Difference
+ *
+ *  Returns a new array that is a copy of the original array, removing all
+ *  occurrences of any item that also appear in +other_ary+. The order is
+ *  preserved from the original array.
+ *
+ *  It compares elements using their #hash and #eql? methods for efficiency.
+ *
+ *     [ 1, 1, 2, 2, 3, 3, 4, 5 ].difference([ 1, 2, 4 ])     #=> [ 3, 3, 5 ]
+ *
+ *  Note that while 1 and 2 were only present once in the array argument, and
+ *  were present twice in the receiver array, all occurrences of each Integer are
+ *  removed in the returned array.
+ *
+ *  Multiple array arguments can be supplied and all occurrences of any element
+ *  in those supplied arrays that match the receiver will be removed from the
+ *  returned array.
+ *
+ *     [ 1, 'c', :s, 'yep' ].difference([ 1 ], [ 'a', 'c' ])  #=> [ :s, "yep" ]
+ *
+ *  If you need set-like behavior, see the library class Set.
+ *
+ *  See also Array#-.
+ */
+
+static VALUE
+rb_ary_difference_multi(int argc, VALUE *argv, VALUE ary)
+{
+    VALUE ary_diff;
+    long i, length;
+    volatile VALUE t0;
+    bool *is_hash = ALLOCV_N(bool, t0, argc);
+    ary_diff = rb_ary_new();
+    length = RARRAY_LEN(ary);
+
+    for (i = 0; i < argc; i++) {
+        argv[i] = to_ary(argv[i]);
+        is_hash[i] = (length > SMALL_ARRAY_LEN && RARRAY_LEN(argv[i]) > SMALL_ARRAY_LEN);
+        if (is_hash[i]) argv[i] = ary_make_hash(argv[i]);
+    }
+
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+        int j;
+        VALUE elt = rb_ary_elt(ary, i);
+        for (j = 0; j < argc; j++) {
+            if (is_hash[j]) {
+                if (rb_hash_stlike_lookup(argv[j], RARRAY_AREF(ary, i), NULL))
+                    break;
+            }
+            else {
+                if (rb_ary_includes_by_eql(argv[j], elt)) break;
+            }
+        }
+        if (j == argc) rb_ary_push(ary_diff, elt);
+    }
+
+    ALLOCV_END(t0);
+
+    return ary_diff;
+}
+
+
+/*
+ *  call-seq:
  *     ary & other_ary      -> new_ary
  *
- *  Set Intersection---Returns a new array
- *  containing elements common to the two arrays, with no duplicates.
+ *  Set Intersection --- Returns a new array containing unique elements common to the
+ *  two arrays. 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 ]
+ *     [ 'a', 'b', 'b', 'z' ] & [ 'a', 'b', 'c' ]   #=> [ 'a', 'b' ]
  *
- *     [ 1, 1, 3, 5 ] & [ 1, 2, 3 ]   #=> [ 1, 3 ]
+ *  See also Array#uniq.
  */
 
 
@@ -3426,16 +4633,25 @@ rb_ary_and(VALUE ary1, VALUE ary2)
     long i;
 
     ary2 = to_ary(ary2);
-    ary3 = rb_ary_new2(RARRAY_LEN(ary1) < RARRAY_LEN(ary2) ?
-	    RARRAY_LEN(ary1) : RARRAY_LEN(ary2));
-    hash = ary_make_hash(ary2);
+    ary3 = rb_ary_new();
+    if (RARRAY_LEN(ary1) == 0 || RARRAY_LEN(ary2) == 0) return ary3;
+
+    if (RARRAY_LEN(ary1) <= SMALL_ARRAY_LEN && RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) {
+	for (i=0; i<RARRAY_LEN(ary1); i++) {
+	    v = RARRAY_AREF(ary1, i);
+	    if (!rb_ary_includes_by_eql(ary2, v)) continue;
+	    if (rb_ary_includes_by_eql(ary3, v)) continue;
+	    rb_ary_push(ary3, v);
+	}
+	return ary3;
+    }
 
-    if (RHASH_EMPTY_P(hash))
-        return ary3;
+    hash = ary_make_hash(ary2);
 
     for (i=0; i<RARRAY_LEN(ary1); i++) {
-	vv = (st_data_t)(v = rb_ary_elt(ary1, i));
-	if (st_delete(RHASH_TBL(hash), &vv, 0)) {
+	v = RARRAY_AREF(ary1, i);
+	vv = (st_data_t)v;
+        if (rb_hash_stlike_delete(hash, &vv, 0)) {
 	    rb_ary_push(ary3, v);
 	}
     }
@@ -3446,40 +4662,271 @@ rb_ary_and(VALUE ary1, VALUE ary2)
 
 /*
  *  call-seq:
+ *     ary.intersection(other_ary1, other_ary2, ...)      -> new_ary
+ *
+ *  Set Intersection --- Returns a new array containing unique elements common
+ *  to +self+ and <code>other_ary</code>s. Order is preserved from the original
+ *  array.
+ *
+ *  It compares elements using their #hash and #eql? methods for efficiency.
+ *
+ *     [ 1, 1, 3, 5 ].intersection([ 3, 2, 1 ])                    # => [ 1, 3 ]
+ *     [ "a", "b", "z" ].intersection([ "a", "b", "c" ], [ "b" ])  # => [ "b" ]
+ *     [ "a" ].intersection #=> [ "a" ]
+ *
+ *  See also Array#&.
+ */
+
+static VALUE
+rb_ary_intersection_multi(int argc, VALUE *argv, VALUE ary)
+{
+    VALUE result = rb_ary_dup(ary);
+    int i;
+
+    for (i = 0; i < argc; i++) {
+        result = rb_ary_and(result, argv[i]);
+    }
+
+    return result;
+}
+
+static int
+ary_hash_orset(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
+{
+    if (existing) return ST_STOP;
+    *key = *value = (VALUE)arg;
+    return ST_CONTINUE;
+}
+
+static void
+rb_ary_union(VALUE ary_union, VALUE ary)
+{
+    long i;
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+        VALUE elt = rb_ary_elt(ary, i);
+        if (rb_ary_includes_by_eql(ary_union, elt)) continue;
+        rb_ary_push(ary_union, elt);
+    }
+}
+
+static void
+rb_ary_union_hash(VALUE hash, VALUE ary2)
+{
+    long i;
+    for (i = 0; i < RARRAY_LEN(ary2); i++) {
+        VALUE elt = RARRAY_AREF(ary2, i);
+        if (!rb_hash_stlike_update(hash, (st_data_t)elt, ary_hash_orset, (st_data_t)elt)) {
+            RB_OBJ_WRITTEN(hash, Qundef, elt);
+        }
+    }
+}
+
+/*
+ *  call-seq:
  *     ary | other_ary     -> new_ary
  *
- *  Set Union---Returns a new array by joining this array with
- *  <i>other_ary</i>, removing duplicates.
+ *  Set Union --- Returns a new array by joining +ary+ with +other_ary+,
+ *  excluding any duplicates and preserving the order from the given arrays.
+ *
+ *  It compares elements using their #hash and #eql? methods for efficiency.
  *
- *     [ "a", "b", "c" ] | [ "c", "d", "a" ]
- *            #=> [ "a", "b", "c", "d" ]
+ *     [ "a", "b", "c" ] | [ "c", "d", "a" ]    #=> [ "a", "b", "c", "d" ]
+ *     [ "c", "d", "a" ] | [ "a", "b", "c" ]    #=> [ "c", "d", "a", "b" ]
+ *
+ *  See also Array#union.
  */
 
 static VALUE
 rb_ary_or(VALUE ary1, VALUE ary2)
 {
-    VALUE hash, ary3, v;
-    st_data_t vv;
-    long i;
+    VALUE hash, ary3;
 
     ary2 = to_ary(ary2);
-    ary3 = rb_ary_new2(RARRAY_LEN(ary1)+RARRAY_LEN(ary2));
-    hash = ary_add_hash(ary_make_hash(ary1), ary2);
+    if (RARRAY_LEN(ary1) + RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) {
+	ary3 = rb_ary_new();
+        rb_ary_union(ary3, ary1);
+        rb_ary_union(ary3, ary2);
+	return ary3;
+    }
 
-    for (i=0; i<RARRAY_LEN(ary1); i++) {
-	vv = (st_data_t)(v = rb_ary_elt(ary1, i));
-	if (st_delete(RHASH_TBL(hash), &vv, 0)) {
-	    rb_ary_push(ary3, v);
+    hash = ary_make_hash(ary1);
+    rb_ary_union_hash(hash, ary2);
+
+    ary3 = rb_hash_values(hash);
+    ary_recycle_hash(hash);
+    return ary3;
+}
+
+/*
+ *  call-seq:
+ *     ary.union(other_ary1, other_ary2, ...)   -> new_ary
+ *
+ *  Set Union --- Returns a new array by joining <code>other_ary</code>s with +self+,
+ *  excluding any duplicates and preserving the order from the given arrays.
+ *
+ *  It compares elements using their #hash and #eql? methods for efficiency.
+ *
+ *     [ "a", "b", "c" ].union( [ "c", "d", "a" ] )    #=> [ "a", "b", "c", "d" ]
+ *     [ "a" ].union( ["e", "b"], ["a", "c", "b"] )    #=> [ "a", "e", "b", "c" ]
+ *     [ "a" ].union #=> [ "a" ]
+ *
+ *  See also Array#|.
+ */
+
+static VALUE
+rb_ary_union_multi(int argc, VALUE *argv, VALUE ary)
+{
+    int i;
+    long sum;
+    VALUE hash, ary_union;
+
+    sum = RARRAY_LEN(ary);
+    for (i = 0; i < argc; i++) {
+        argv[i] = to_ary(argv[i]);
+        sum += RARRAY_LEN(argv[i]);
+    }
+
+    if (sum <= SMALL_ARRAY_LEN) {
+        ary_union = rb_ary_new();
+
+        rb_ary_union(ary_union, ary);
+        for (i = 0; i < argc; i++) rb_ary_union(ary_union, argv[i]);
+
+        return ary_union;
+    }
+
+    hash = ary_make_hash(ary);
+    for (i = 0; i < argc; i++) rb_ary_union_hash(hash, argv[i]);
+
+    ary_union = rb_hash_values(hash);
+    ary_recycle_hash(hash);
+    return ary_union;
+}
+
+/*
+ *  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 Comparable;
+ *  the second uses the block to return <em>a <=> b</em>.
+ *
+ *     ary = %w(albatross dog horse)
+ *     ary.max                                   #=> "horse"
+ *     ary.max {|a, b| a.length <=> b.length}    #=> "albatross"
+ *
+ *  If the +n+ argument is given, maximum +n+ elements are returned
+ *  as an array.
+ *
+ *     ary = %w[albatross dog horse]
+ *     ary.max(2)                                  #=> ["horse", "dog"]
+ *     ary.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;
+
+    if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0]))
+       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;
+	   }
 	}
     }
-    for (i=0; i<RARRAY_LEN(ary2); i++) {
-	vv = (st_data_t)(v = rb_ary_elt(ary2, i));
-	if (st_delete(RHASH_TBL(hash), &vv, 0)) {
-	    rb_ary_push(ary3, 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;
+	   }
 	}
     }
-    ary_recycle_hash(hash);
-    return ary3;
+    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 Comparable;
+ *  the second uses the block to return <em>a <=> b</em>.
+ *
+ *     ary = %w(albatross dog horse)
+ *     ary.min                                   #=> "albatross"
+ *     ary.min {|a, b| a.length <=> b.length}    #=> "dog"
+ *
+ *  If the +n+ argument is given, minimum +n+ elements are returned
+ *  as an array.
+ *
+ *     ary = %w[albatross dog horse]
+ *     ary.min(2)                                  #=> ["albatross", "dog"]
+ *     ary.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;
+
+    if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0]))
+       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;
+}
+
+/*
+ *  call-seq:
+ *     ary.minmax                       -> [obj, obj]
+ *     ary.minmax {| a,b | block }      -> [obj, obj]
+ *
+ *  Returns a two element array which contains the minimum and the
+ *  maximum value in the array.
+ *
+ *  Can be given an optional block to override the default comparison
+ *  method <code>a <=> b</code>.
+ */
+static VALUE
+rb_ary_minmax(VALUE ary)
+{
+    if (rb_block_given_p()) {
+        return rb_call_super(0, NULL);
+    }
+    return rb_assoc_new(rb_ary_min(0, 0, ary), rb_ary_max(0, 0, ary));
 }
 
 static int
@@ -3491,55 +4938,57 @@ push_value(st_data_t key, st_data_t val, st_data_t ary)
 
 /*
  *  call-seq:
- *     ary.uniq! -> ary or nil
+ *     ary.uniq!                -> ary or nil
+ *     ary.uniq! {|item| ...}   -> ary or nil
  *
  *  Removes duplicate elements from +self+.
- *  Returns <code>nil</code> if no changes are made (that is, no
- *  duplicates are found).
+ *
+ *  If a block is given, it will use the return value of the block for
+ *  comparison.
+ *
+ *  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" ]
- *     a.uniq!   #=> ["a", "b", "c"]
+ *     a.uniq!   # => ["a", "b", "c"]
+ *
  *     b = [ "a", "b", "c" ]
- *     b.uniq!   #=> nil
- *     c = [ "a:def", "a:xyz", "b:abc", "b:xyz", "c:jkl" ]
- *     c.uniq! {|s| s[/^\w+/]}  #=> [ "a:def", "b:abc", "c:jkl" ]
+ *     b.uniq!   # => nil
+ *
+ *     c = [["student","sam"], ["student","george"], ["teacher","matz"]]
+ *     c.uniq! {|s| s.first}   # => [["student", "sam"], ["teacher", "matz"]]
+ *
  */
 
 static VALUE
 rb_ary_uniq_bang(VALUE ary)
 {
-    VALUE hash, v;
-    long i, j;
+    VALUE hash;
+    long hash_size;
 
     rb_ary_modify_check(ary);
     if (RARRAY_LEN(ary) <= 1)
         return Qnil;
-    if (rb_block_given_p()) {
+    if (rb_block_given_p())
 	hash = ary_make_hash_by(ary);
-	if (RARRAY_LEN(ary) == (i = RHASH_SIZE(hash))) {
-	    return Qnil;
-	}
-	ARY_SET_LEN(ary, 0);
-	if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) {
-	    rb_ary_unshare(ary);
-	    FL_SET_EMBED(ary);
-	}
-	ary_resize_capa(ary, i);
-	st_foreach(RHASH_TBL(hash), push_value, ary);
-    }
-    else {
+    else
 	hash = ary_make_hash(ary);
-	if (RARRAY_LEN(ary) == (long)RHASH_SIZE(hash)) {
-	    return Qnil;
-	}
-	for (i=j=0; i<RARRAY_LEN(ary); i++) {
-	    st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i));
-	    if (st_delete(RHASH_TBL(hash), &vv, 0)) {
-		rb_ary_store(ary, j++, v);
-	    }
-	}
-	ARY_SET_LEN(ary, j);
+
+    hash_size = RHASH_SIZE(hash);
+    if (RARRAY_LEN(ary) == hash_size) {
+	return Qnil;
+    }
+    rb_ary_modify_check(ary);
+    ARY_SET_LEN(ary, 0);
+    if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) {
+	rb_ary_unshare(ary);
+	FL_SET_EMBED(ary);
     }
+    ary_resize_capa(ary, hash_size);
+    rb_hash_foreach(hash, push_value, ary);
     ary_recycle_hash(hash);
 
     return ary;
@@ -3547,40 +4996,46 @@ rb_ary_uniq_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.uniq   -> new_ary
+ *     ary.uniq                -> new_ary
+ *     ary.uniq {|item| ...}   -> new_ary
  *
  *  Returns a new array by removing duplicate values in +self+.
  *
+ *  If a block is given, it will use the return value of the block for comparison.
+ *
+ *  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"]
- *     c = [ "a:def", "a:xyz", "b:abc", "b:xyz", "c:jkl" ]
- *     c.uniq {|s| s[/^\w+/]}  #=> [ "a:def", "b:abc", "c:jkl" ]
+ *     a.uniq   # => ["a", "b", "c"]
+ *
+ *     b = [["student","sam"], ["student","george"], ["teacher","matz"]]
+ *     b.uniq {|s| s.first}   # => [["student", "sam"], ["teacher", "matz"]]
+ *
  */
 
 static VALUE
 rb_ary_uniq(VALUE ary)
 {
-    VALUE hash, uniq, v;
-    long i;
+    VALUE hash, uniq;
 
-    if (RARRAY_LEN(ary) <= 1)
-        return rb_ary_dup(ary);
-    if (rb_block_given_p()) {
+    if (RARRAY_LEN(ary) <= 1) {
+        hash = 0;
+        uniq = rb_ary_dup(ary);
+    }
+    else if (rb_block_given_p()) {
 	hash = ary_make_hash_by(ary);
-	uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash));
-	st_foreach(RHASH_TBL(hash), push_value, uniq);
+	uniq = rb_hash_values(hash);
     }
     else {
 	hash = ary_make_hash(ary);
-	uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash));
-	for (i=0; i<RARRAY_LEN(ary); i++) {
-	    st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i));
-	    if (st_delete(RHASH_TBL(hash), &vv, 0)) {
-		rb_ary_push(uniq, v);
-	    }
-	}
+	uniq = rb_hash_values(hash);
+    }
+    RBASIC_SET_CLASS(uniq, rb_obj_class(ary));
+    if (hash) {
+        ary_recycle_hash(hash);
     }
-    ary_recycle_hash(hash);
 
     return uniq;
 }
@@ -3590,8 +5045,8 @@ rb_ary_uniq(VALUE ary)
  *     ary.compact!    -> ary  or  nil
  *
  *  Removes +nil+ elements from the array.
- *  Returns +nil+ if no changes were made, otherwise returns
- *  <i>ary</i>.
+ *
+ *  Returns +nil+ if no changes were made, otherwise returns the array.
  *
  *     [ "a", nil, "b", nil, "c" ].compact! #=> [ "a", "b", "c" ]
  *     [ "a", "b", "c" ].compact!           #=> nil
@@ -3604,21 +5059,18 @@ rb_ary_compact_bang(VALUE ary)
     long n;
 
     rb_ary_modify(ary);
-    p = t = RARRAY_PTR(ary);
+    p = t = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(ary); /* WB: no new reference */
     end = p + RARRAY_LEN(ary);
 
     while (t < end) {
 	if (NIL_P(*t)) t++;
 	else *p++ = *t++;
     }
-    n = p - RARRAY_PTR(ary);
+    n = p - RARRAY_CONST_PTR_TRANSIENT(ary);
     if (RARRAY_LEN(ary) == n) {
 	return Qnil;
     }
-    ARY_SET_LEN(ary, n);
-    if (n * 2 < ARY_CAPA(ary) && ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
-	ary_resize_capa(ary, n * 2);
-    }
+    ary_resize_smaller(ary, n);
 
     return ary;
 }
@@ -3643,45 +5095,49 @@ rb_ary_compact(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.count      -> int
- *     ary.count(obj) -> int
- *     ary.count { |item| block }  -> int
+ *     ary.count                   -> int
+ *     ary.count(obj)              -> int
+ *     ary.count {|item| block}    -> int
+ *
+ *  Returns the number of elements.
+ *
+ *  If an argument is given, counts the number of elements which equal +obj+
+ *  using <code>==</code>.
  *
- *  Returns the number of elements.  If an argument is given, counts
- *  the number of elements which equals to <i>obj</i>.  If a block is
- *  given, counts the number of elements yielding a true value.
+ *  If a block is given, counts the number of elements for which the block
+ *  returns a true value.
  *
  *     ary = [1, 2, 4, 2]
- *     ary.count             #=> 4
- *     ary.count(2)          #=> 2
- *     ary.count{|x|x%2==0}  #=> 3
+ *     ary.count                  #=> 4
+ *     ary.count(2)               #=> 2
+ *     ary.count {|x| x%2 == 0}   #=> 3
  *
  */
 
 static VALUE
 rb_ary_count(int argc, VALUE *argv, VALUE ary)
 {
-    long n = 0;
+    long i, n = 0;
 
-    if (argc == 0) {
-	VALUE *p, *pend;
+    if (rb_check_arity(argc, 0, 1) == 0) {
+	VALUE v;
 
 	if (!rb_block_given_p())
 	    return LONG2NUM(RARRAY_LEN(ary));
 
-	for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
-	    if (RTEST(rb_yield(*p))) n++;
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    v = RARRAY_AREF(ary, i);
+	    if (RTEST(rb_yield(v))) n++;
 	}
     }
     else {
-	VALUE obj, *p, *pend;
+        VALUE obj = argv[0];
 
-	rb_scan_args(argc, argv, "1", &obj);
 	if (rb_block_given_p()) {
 	    rb_warn("given block not used");
 	}
-	for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
-	    if (rb_equal(*p, obj)) n++;
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    if (rb_equal(RARRAY_AREF(ary, i), obj)) n++;
 	}
     }
 
@@ -3689,34 +5145,64 @@ rb_ary_count(int argc, VALUE *argv, VALUE ary)
 }
 
 static VALUE
-flatten(VALUE ary, int level, int *modified)
+flatten(VALUE ary, int level)
 {
-    long i = 0;
-    VALUE stack, result, tmp, elt;
+    long i;
+    VALUE stack, result, tmp, elt, vmemo;
     st_table *memo;
     st_data_t id;
 
-    stack = ary_new(0, ARY_DEFAULT_SIZE);
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+        elt = RARRAY_AREF(ary, i);
+        tmp = rb_check_array_type(elt);
+        if (!NIL_P(tmp)) {
+            break;
+        }
+    }
+    if (i == RARRAY_LEN(ary)) {
+        return ary;
+    } else if (tmp == ary) {
+        rb_raise(rb_eArgError, "tried to flatten recursive array");
+    }
+
     result = ary_new(0, RARRAY_LEN(ary));
+    ary_memcpy(result, 0, i, RARRAY_CONST_PTR_TRANSIENT(ary));
+    ARY_SET_LEN(result, i);
+
+    stack = ary_new(0, ARY_DEFAULT_SIZE);
+    rb_ary_push(stack, ary);
+    rb_ary_push(stack, LONG2NUM(i + 1));
+
+    vmemo = rb_hash_new();
+    RBASIC_CLEAR_CLASS(vmemo);
     memo = st_init_numtable();
+    rb_hash_st_table_set(vmemo, memo);
     st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue);
-    *modified = 0;
+    st_insert(memo, (st_data_t)tmp, (st_data_t)Qtrue);
+
+    ary = tmp;
+    i = 0;
 
     while (1) {
 	while (i < RARRAY_LEN(ary)) {
-	    elt = RARRAY_PTR(ary)[i++];
+	    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_GC_GUARD(vmemo);
+                st_clear(memo);
 		rb_raise(rb_eRuntimeError, "flatten reentered");
 	    }
-	    if (NIL_P(tmp) || (level >= 0 && RARRAY_LEN(stack) / 2 >= level)) {
+	    if (NIL_P(tmp)) {
 		rb_ary_push(result, elt);
 	    }
 	    else {
-		*modified = 1;
 		id = (st_data_t)tmp;
-		if (st_lookup(memo, id, 0)) {
-		    st_free_table(memo);
+		if (st_is_member(memo, id)) {
+                    st_clear(memo);
 		    rb_raise(rb_eArgError, "tried to flatten recursive array");
 		}
 		st_insert(memo, id, (st_data_t)Qtrue);
@@ -3736,21 +5222,23 @@ flatten(VALUE ary, int level, int *modified)
 	ary = rb_ary_pop(stack);
     }
 
-    st_free_table(memo);
+    st_clear(memo);
 
-    RBASIC(result)->klass = rb_class_of(ary);
+    RBASIC_SET_CLASS(result, rb_obj_class(ary));
     return result;
 }
 
 /*
  *  call-seq:
  *     ary.flatten!        -> ary or nil
- *     ary.flatten!(level) -> array or nil
+ *     ary.flatten!(level) -> ary or nil
  *
  *  Flattens +self+ in place.
- *  Returns <code>nil</code> if no modifications were made (i.e.,
- *  <i>ary</i> contains no subarrays.)  If the optional <i>level</i>
- *  argument determines the level of recursion to flatten.
+ *
+ *  Returns +nil+ if no modifications were made (i.e., the array contains no
+ *  subarrays.)
+ *
+ *  The optional +level+ argument determines the level of recursion to flatten.
  *
  *     a = [ 1, 2, [3, [4, 5] ] ]
  *     a.flatten!   #=> [1, 2, 3, 4, 5]
@@ -3766,14 +5254,13 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
     int mod = 0, level = -1;
     VALUE result, lv;
 
-    rb_scan_args(argc, argv, "01", &lv);
+    lv = (rb_check_arity(argc, 0, 1) ? argv[0] : Qnil);
     rb_ary_modify_check(ary);
     if (!NIL_P(lv)) level = NUM2INT(lv);
     if (level == 0) return Qnil;
 
-    result = flatten(ary, level, &mod);
-    if (mod == 0) {
-	ary_discard(result);
+    result = flatten(ary, level);
+    if (result == ary) {
 	return Qnil;
     }
     if (!(mod = ARY_EMBED_P(result))) rb_obj_freeze(result);
@@ -3788,10 +5275,14 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
  *     ary.flatten -> new_ary
  *     ary.flatten(level) -> new_ary
  *
- *  Returns a new array that is a one-dimensional flattening of this
- *  array (recursively). That is, for every element that is an array,
- *  extract its elements into the new array.  If the optional
- *  <i>level</i> argument determines the level of recursion to flatten.
+ *  Returns a new array that is a one-dimensional flattening of +self+
+ *  (recursively).
+ *
+ *  That is, for every element that is an array, extract its elements into
+ *  the new array.
+ *
+ *  The optional +level+ argument determines the level of recursion to
+ *  flatten.
  *
  *     s = [ 1, 2, 3 ]           #=> [1, 2, 3]
  *     t = [ 4, 5, 6, [7, 8] ]   #=> [4, 5, 6, [7, 8]]
@@ -3804,24 +5295,27 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
 static VALUE
 rb_ary_flatten(int argc, VALUE *argv, VALUE ary)
 {
-    int mod = 0, level = -1;
-    VALUE result, lv;
+    int level = -1;
+    VALUE result;
 
-    rb_scan_args(argc, argv, "01", &lv);
-    if (!NIL_P(lv)) level = NUM2INT(lv);
-    if (level == 0) return ary_make_shared_copy(ary);
+    if (rb_check_arity(argc, 0, 1) && !NIL_P(argv[0])) {
+        level = NUM2INT(argv[0]);
+        if (level == 0) return ary_make_shared_copy(ary);
+    }
 
-    result = flatten(ary, level, &mod);
-    OBJ_INFECT(result, ary);
+    result = flatten(ary, level);
+    if (result == ary) {
+        result = ary_make_shared_copy(ary);
+    }
 
     return result;
 }
 
 #define OPTHASH_GIVEN_P(opts) \
     (argc > 0 && !NIL_P((opts) = rb_check_hash_type(argv[argc-1])) && (--argc, 1))
-static VALUE sym_random;
+static ID id_random;
 
-#define RAND_UPTO(max) (long)(rb_random_real(randgen)*(max))
+#define RAND_UPTO(max) (long)rb_random_ulong_limited((randgen), (max)-1)
 
 /*
  *  call-seq:
@@ -3829,36 +5323,47 @@ static VALUE sym_random;
  *     ary.shuffle!(random: rng) -> ary
  *
  *  Shuffles elements in +self+ in place.
- *  If +rng+ is given, it will be used as the random number generator.
+ *
+ *     a = [ 1, 2, 3 ]           #=> [1, 2, 3]
+ *     a.shuffle!                #=> [2, 3, 1]
+ *     a                         #=> [2, 3, 1]
+ *
+ *  The optional +rng+ argument will be used as the random number generator.
+ *
+ *     a.shuffle!(random: Random.new(1))  #=> [1, 3, 2]
  */
 
 static VALUE
 rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE *ptr, opts, *snap_ptr, randgen = rb_cRandom;
-    long i, snap_len;
+    VALUE opts, randgen = rb_cRandom;
+    long i, len;
 
     if (OPTHASH_GIVEN_P(opts)) {
-	randgen = rb_hash_lookup2(opts, sym_random, randgen);
-    }
-    if (argc > 0) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	VALUE rnd;
+	ID keyword_ids[1];
+
+	keyword_ids[0] = id_random;
+	rb_get_kwargs(opts, keyword_ids, 0, 1, &rnd);
+	if (rnd != Qundef) {
+	    randgen = rnd;
+	}
     }
+    rb_check_arity(argc, 0, 0);
     rb_ary_modify(ary);
-    i = RARRAY_LEN(ary);
-    ptr = RARRAY_PTR(ary);
-    snap_len = i;
-    snap_ptr = ptr;
-    while (i) {
-	long j = RAND_UPTO(i);
-	VALUE tmp;
-	if (snap_len != RARRAY_LEN(ary) || snap_ptr != RARRAY_PTR(ary)) {
-	    rb_raise(rb_eRuntimeError, "modified during shuffle");
+    i = len = RARRAY_LEN(ary);
+    RARRAY_PTR_USE(ary, ptr, {
+	while (i) {
+	    long j = RAND_UPTO(i);
+	    VALUE tmp;
+            if (len != RARRAY_LEN(ary) || ptr != RARRAY_CONST_PTR_TRANSIENT(ary)) {
+                rb_raise(rb_eRuntimeError, "modified during shuffle");
+	    }
+	    tmp = ptr[--i];
+	    ptr[i] = ptr[j];
+	    ptr[j] = tmp;
 	}
-	tmp = ptr[--i];
-	ptr[i] = ptr[j];
-	ptr[j] = tmp;
-    }
+    }); /* WB: no new reference */
     return ary;
 }
 
@@ -3868,12 +5373,13 @@ rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary)
  *     ary.shuffle              -> new_ary
  *     ary.shuffle(random: rng) -> new_ary
  *
- *  Returns a new array with elements of this array shuffled.
+ *  Returns a new array with elements of +self+ shuffled.
  *
  *     a = [ 1, 2, 3 ]           #=> [1, 2, 3]
  *     a.shuffle                 #=> [2, 3, 1]
+ *     a                         #=> [1, 2, 3]
  *
- *  If +rng+ is given, it will be used as the random number generator.
+ *  The optional +rng+ argument will be used as the random number generator.
  *
  *     a.shuffle(random: Random.new(1))  #=> [1, 3, 2]
  */
@@ -3894,81 +5400,103 @@ rb_ary_shuffle(int argc, VALUE *argv, VALUE ary)
  *     ary.sample(n)               -> new_ary
  *     ary.sample(n, random: rng)  -> new_ary
  *
- *  Choose a random element or +n+ random elements from the array. The elements
- *  are chosen by using random and unique indices into the array in order to
- *  ensure that an element doesn't repeat itself unless the array already
- *  contained duplicate elements. If the array is empty the first form returns
- *  <code>nil</code> and the second form returns an empty array.
+ *  Choose a random element or +n+ random elements from the array.
+ *
+ *  The elements are chosen by using random and unique indices into the array
+ *  in order to ensure that an element doesn't repeat itself unless the array
+ *  already contained duplicate elements.
+ *
+ *  If the array is empty the first form returns +nil+ and the second form
+ *  returns an empty array.
  *
- *  If +rng+ is given, it will be used as the random number generator.
+ *     a = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
+ *     a.sample         #=> 7
+ *     a.sample(4)      #=> [6, 4, 2, 5]
+ *
+ *  The optional +rng+ argument will be used as the random number generator.
+ *
+ *     a.sample(random: Random.new(1))     #=> 6
+ *     a.sample(4, random: Random.new(1))  #=> [6, 10, 9, 2]
  */
 
 
 static VALUE
 rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE nv, result, *ptr;
+    VALUE nv, result;
     VALUE opts, randgen = rb_cRandom;
     long n, len, i, j, k, idx[10];
-    double rnds[numberof(idx)];
+    long rnds[numberof(idx)];
+    long memo_threshold;
 
     if (OPTHASH_GIVEN_P(opts)) {
-	randgen = rb_hash_lookup2(opts, sym_random, randgen);
+	VALUE rnd;
+	ID keyword_ids[1];
+
+	keyword_ids[0] = id_random;
+	rb_get_kwargs(opts, keyword_ids, 0, 1, &rnd);
+	if (rnd != Qundef) {
+	    randgen = rnd;
+	}
     }
-    ptr = RARRAY_PTR(ary);
     len = RARRAY_LEN(ary);
-    if (argc == 0) {
-	if (len == 0) return Qnil;
-	if (len == 1) {
+    if (rb_check_arity(argc, 0, 1) == 0) {
+	if (len < 2)
 	    i = 0;
-	}
-	else {
-	    double x = rb_random_real(randgen);
-	    if ((len = RARRAY_LEN(ary)) == 0) return Qnil;
-	    i = (long)(x * len);
-	}
-	return RARRAY_PTR(ary)[i];
+	else
+	    i = RAND_UPTO(len);
+
+	return rb_ary_elt(ary, i);
     }
-    rb_scan_args(argc, argv, "1", &nv);
+    nv = argv[0];
     n = NUM2LONG(nv);
     if (n < 0) rb_raise(rb_eArgError, "negative sample number");
     if (n > len) n = len;
     if (n <= numberof(idx)) {
 	for (i = 0; i < n; ++i) {
-	    rnds[i] = rb_random_real(randgen);
+	    rnds[i] = RAND_UPTO(len - i);
 	}
     }
+    k = len;
     len = RARRAY_LEN(ary);
-    ptr = RARRAY_PTR(ary);
+    if (len < k && n <= numberof(idx)) {
+	for (i = 0; i < n; ++i) {
+	    if (rnds[i] >= len) return rb_ary_new_capa(0);
+	}
+    }
     if (n > len) n = len;
     switch (n) {
       case 0:
-	return rb_ary_new2(0);
+	return rb_ary_new_capa(0);
       case 1:
-	i = (long)(rnds[0] * len);
-	return rb_ary_new4(1, &ptr[i]);
+	i = rnds[0];
+	return rb_ary_new_from_values(1, &RARRAY_AREF(ary, i));
       case 2:
-	i = (long)(rnds[0] * len);
-	j = (long)(rnds[1] * (len-1));
+	i = rnds[0];
+	j = rnds[1];
 	if (j >= i) j++;
-	return rb_ary_new3(2, ptr[i], ptr[j]);
+	return rb_ary_new_from_args(2, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j));
       case 3:
-	i = (long)(rnds[0] * len);
-	j = (long)(rnds[1] * (len-1));
-	k = (long)(rnds[2] * (len-2));
+	i = rnds[0];
+	j = rnds[1];
+	k = rnds[2];
 	{
 	    long l = j, g = i;
 	    if (j >= i) l = i, g = ++j;
 	    if (k >= l && (++k >= g)) ++k;
 	}
-	return rb_ary_new3(3, ptr[i], ptr[j], ptr[k]);
+	return rb_ary_new_from_args(3, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j), RARRAY_AREF(ary, k));
     }
+    memo_threshold =
+	len < 2560 ? len / 128 :
+	len < 5120 ? len / 64 :
+	len < 10240 ? len / 32 :
+	len / 16;
     if (n <= numberof(idx)) {
-	VALUE *ptr_result;
 	long sorted[numberof(idx)];
-	sorted[0] = idx[0] = (long)(rnds[0] * len);
+	sorted[0] = idx[0] = rnds[0];
 	for (i=1; i<n; i++) {
-	    k = (long)(rnds[i] * --len);
+	    k = rnds[i];
 	    for (j = 0; j < i; ++j) {
 		if (k < sorted[j]) break;
 		++k;
@@ -3976,48 +5504,97 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 	    memmove(&sorted[j+1], &sorted[j], sizeof(sorted[0])*(i-j));
 	    sorted[j] = idx[i] = k;
 	}
-	result = rb_ary_new2(n);
-	ptr_result = RARRAY_PTR(result);
-	for (i=0; i<n; i++) {
-	    ptr_result[i] = ptr[idx[i]];
-	}
+	result = rb_ary_new_capa(n);
+        RARRAY_PTR_USE_TRANSIENT(result, ptr_result, {
+	    for (i=0; i<n; i++) {
+		ptr_result[i] = RARRAY_AREF(ary, idx[i]);
+	    }
+	});
+    }
+    else if (n <= memo_threshold / 2) {
+	long max_idx = 0;
+#undef RUBY_UNTYPED_DATA_WARNING
+#define RUBY_UNTYPED_DATA_WARNING 0
+	VALUE vmemo = Data_Wrap_Struct(0, 0, st_free_table, 0);
+	st_table *memo = st_init_numtable_with_size(n);
+	DATA_PTR(vmemo) = memo;
+	result = rb_ary_new_capa(n);
+	RARRAY_PTR_USE(result, ptr_result, {
+	    for (i=0; i<n; i++) {
+		long r = RAND_UPTO(len-i) + i;
+		ptr_result[i] = r;
+		if (r > max_idx) max_idx = r;
+	    }
+	    len = RARRAY_LEN(ary);
+	    if (len <= max_idx) n = 0;
+	    else if (n > len) n = len;
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr_ary, {
+		for (i=0; i<n; i++) {
+		    long j2 = j = ptr_result[i];
+		    long i2 = i;
+		    st_data_t value;
+		    if (st_lookup(memo, (st_data_t)i, &value)) i2 = (long)value;
+		    if (st_lookup(memo, (st_data_t)j, &value)) j2 = (long)value;
+		    st_insert(memo, (st_data_t)j, (st_data_t)i2);
+		    ptr_result[i] = ptr_ary[j2];
+		}
+	    });
+	});
+	DATA_PTR(vmemo) = 0;
+	st_free_table(memo);
     }
     else {
-	VALUE *ptr_result;
-	result = rb_ary_new4(len, ptr);
-	RBASIC(result)->klass = 0;
-	ptr_result = RARRAY_PTR(result);
+	result = rb_ary_dup(ary);
+	RBASIC_CLEAR_CLASS(result);
 	RB_GC_GUARD(ary);
-	for (i=0; i<n; i++) {
-	    j = RAND_UPTO(len-i) + i;
-	    nv = ptr_result[j];
-	    ptr_result[j] = ptr_result[i];
-	    ptr_result[i] = nv;
-	}
-	RBASIC(result)->klass = rb_cArray;
+	RARRAY_PTR_USE(result, ptr_result, {
+	    for (i=0; i<n; i++) {
+		j = RAND_UPTO(len-i) + i;
+		nv = ptr_result[j];
+		ptr_result[j] = ptr_result[i];
+		ptr_result[i] = nv;
+	    }
+	});
+	RBASIC_SET_CLASS_RAW(result, rb_cArray);
     }
     ARY_SET_LEN(result, n);
 
     return result;
 }
 
+static VALUE
+rb_ary_cycle_size(VALUE self, VALUE args, VALUE eobj)
+{
+    long mul;
+    VALUE n = Qnil;
+    if (args && (RARRAY_LEN(args) > 0)) {
+	n = RARRAY_AREF(args, 0);
+    }
+    if (RARRAY_LEN(self) == 0) return INT2FIX(0);
+    if (n == Qnil) return DBL2NUM(HUGE_VAL);
+    mul = NUM2LONG(n);
+    if (mul <= 0) return INT2FIX(0);
+    n = LONG2FIX(mul);
+    return rb_fix_mul_fix(rb_ary_length(self), n);
+}
 
 /*
  *  call-seq:
- *     ary.cycle(n=nil) {|obj| block }  -> nil
- *     ary.cycle(n=nil)                 -> an_enumerator
+ *     ary.cycle(n=nil) {|obj| block}    -> nil
+ *     ary.cycle(n=nil)                  -> Enumerator
+ *
+ *  Calls the given block for each element +n+ times or forever if +nil+ is
+ *  given.
  *
- *  Calls <i>block</i> for each element repeatedly _n_ times or
- *  forever if none or +nil+ is given.  If a non-positive number is
- *  given or the array is empty, does nothing.  Returns +nil+ if the
- *  loop has finished without getting interrupted.
+ *  Does nothing if a non-positive number is given or the array is empty.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  Returns +nil+ if the loop has finished without getting interrupted.
  *
+ *  If no block is given, an Enumerator is returned instead.
  *
  *     a = ["a", "b", "c"]
- *     a.cycle {|x| puts x }  # print, a, b, c, a, b, c,.. forever.
- *     a.cycle(2) {|x| puts x }  # print, a, b, c, a, b, c.
+ *     a.cycle {|x| puts x}       # print, a, b, c, a, b, c,.. forever.
+ *     a.cycle(2) {|x| puts x}    # print, a, b, c, a, b, c.
  *
  */
 
@@ -4025,112 +5602,183 @@ static VALUE
 rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
 {
     long n, i;
-    VALUE nv = Qnil;
 
-    rb_scan_args(argc, argv, "01", &nv);
+    rb_check_arity(argc, 0, 1);
 
-    RETURN_ENUMERATOR(ary, argc, argv);
-    if (NIL_P(nv)) {
+    RETURN_SIZED_ENUMERATOR(ary, argc, argv, rb_ary_cycle_size);
+    if (argc == 0 || NIL_P(argv[0])) {
         n = -1;
     }
     else {
-        n = NUM2LONG(nv);
+        n = NUM2LONG(argv[0]);
         if (n <= 0) return Qnil;
     }
 
     while (RARRAY_LEN(ary) > 0 && (n < 0 || 0 < n--)) {
         for (i=0; i<RARRAY_LEN(ary); i++) {
-            rb_yield(RARRAY_PTR(ary)[i]);
+            rb_yield(RARRAY_AREF(ary, i));
         }
     }
     return Qnil;
 }
 
-#define tmpbuf(n, size) rb_str_tmp_new((n)*(size))
-#define tmpbuf_discard(s) (rb_str_resize((s), 0L), RBASIC(s)->klass = rb_cString)
 #define tmpary(n) rb_ary_tmp_new(n)
-#define tmpary_discard(a) (ary_discard(a), RBASIC(a)->klass = rb_cArray)
+#define tmpary_discard(a) (ary_discard(a), RBASIC_SET_CLASS_RAW(a, rb_cArray))
+
+/*
+ * Build a ruby array of the corresponding values and yield it to the
+ * associated block.
+ * Return the class of +values+ for reentry check.
+ */
+static int
+yield_indexed_values(const VALUE values, const long r, const long *const p)
+{
+    const VALUE result = rb_ary_new2(r);
+    long i;
+
+    for (i = 0; i < r; i++) ARY_SET(result, i, RARRAY_AREF(values, p[i]));
+    ARY_SET_LEN(result, r);
+    rb_yield(result);
+    return !RBASIC(values)->klass;
+}
 
 /*
- * Recursively compute permutations of r elements of the set [0..n-1].
- * When we have a complete permutation of array indexes, copy the values
- * at those indexes into a new array and yield that array.
+ * 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.
  *
  * n: the size of the set
  * r: the number of elements in each permutation
  * p: the array (of size r) that we're filling in
- * index: what index we're filling in now
  * used: an array of booleans: whether a given index is already used
  * values: the Ruby array that holds the actual values to permute
  */
 static void
-permute0(long n, long r, long *p, long index, char *used, VALUE values)
+permute0(const long n, const long r, long *const p, char *const used, const VALUE values)
 {
-    long i,j;
-    for (i = 0; i < n; i++) {
-	if (used[i] == 0) {
+    long i = 0, index = 0;
+
+    for (;;) {
+	const char *const unused = memchr(&used[i], 0, n-i);
+	if (!unused) {
+	    if (!index) break;
+	    i = p[--index];                /* pop index */
+	    used[i++] = 0;                 /* index unused */
+	}
+	else {
+	    i = unused - used;
 	    p[index] = i;
+	    used[i] = 1;                   /* mark index used */
+	    ++index;
 	    if (index < r-1) {             /* if not done yet */
-		used[i] = 1;               /* mark index used */
-		permute0(n, r, p, index+1, /* recurse */
-			 used, values);
-		used[i] = 0;               /* index unused */
+		p[index] = i = 0;
+		continue;
 	    }
-	    else {
-		/* We have a complete permutation of array indexes */
-		/* Build a ruby array of the corresponding values */
-		/* And yield it to the associated block */
-		VALUE result = rb_ary_new2(r);
-		VALUE *result_array = RARRAY_PTR(result);
-		const VALUE *values_array = RARRAY_PTR(values);
-
-		for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
-		ARY_SET_LEN(result, r);
-		rb_yield(result);
-		if (RBASIC(values)->klass) {
+	    for (i = 0; i < n; ++i) {
+		if (used[i]) continue;
+		p[index] = i;
+		if (!yield_indexed_values(values, r, p)) {
 		    rb_raise(rb_eRuntimeError, "permute reentered");
 		}
 	    }
+	    i = p[--index];                /* pop index */
+	    used[i] = 0;                   /* index unused */
+	    p[index] = ++i;
 	}
     }
 }
 
 /*
+ * Returns the product of from, from-1, ..., from - how_many + 1.
+ * http://en.wikipedia.org/wiki/Pochhammer_symbol
+ */
+static VALUE
+descending_factorial(long from, long how_many)
+{
+    VALUE cnt;
+    if (how_many > 0) {
+	cnt = LONG2FIX(from);
+	while (--how_many > 0) {
+	    long v = --from;
+	    cnt = rb_int_mul(cnt, LONG2FIX(v));
+	}
+    }
+    else {
+	cnt = LONG2FIX(how_many == 0);
+    }
+    return cnt;
+}
+
+static VALUE
+binomial_coefficient(long comb, long size)
+{
+    VALUE r;
+    long i;
+    if (comb > size-comb) {
+	comb = size-comb;
+    }
+    if (comb < 0) {
+	return LONG2FIX(0);
+    }
+    else if (comb == 0) {
+	return LONG2FIX(1);
+    }
+    r = LONG2FIX(size);
+    for (i = 1; i < comb; ++i) {
+	r = rb_int_mul(r, LONG2FIX(size - i));
+	r = rb_int_idiv(r, LONG2FIX(i + 1));
+    }
+    return r;
+}
+
+static VALUE
+rb_ary_permutation_size(VALUE ary, VALUE args, VALUE eobj)
+{
+    long n = RARRAY_LEN(ary);
+    long k = (args && (RARRAY_LEN(args) > 0)) ? NUM2LONG(RARRAY_AREF(args, 0)) : n;
+
+    return descending_factorial(n, k);
+}
+
+/*
  *  call-seq:
- *     ary.permutation { |p| block }          -> ary
- *     ary.permutation                        -> an_enumerator
- *     ary.permutation(n) { |p| block }       -> ary
- *     ary.permutation(n)                     -> an_enumerator
+ *     ary.permutation {|p| block}            -> ary
+ *     ary.permutation                        -> Enumerator
+ *     ary.permutation(n) {|p| block}         -> ary
+ *     ary.permutation(n)                     -> Enumerator
+ *
+ * When invoked with a block, yield all permutations of length +n+ of the
+ * elements of the array, then return the array itself.
  *
- * When invoked with a block, yield all permutations of length <i>n</i>
- * of the elements of <i>ary</i>, then return the array itself.
- * If <i>n</i> is not specified, yield all permutations of all elements.
- * The implementation makes no guarantees about the order in which
- * the permutations are yielded.
+ * If +n+ is not specified, yield all permutations of all elements.
  *
- * If no block is given, an enumerator is returned instead.
+ * The implementation makes no guarantees about the order in which the
+ * permutations are yielded.
+ *
+ * If no block is given, an Enumerator is returned instead.
  *
  * Examples:
  *
- *     a = [1, 2, 3]
- *     a.permutation.to_a     #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
- *     a.permutation(1).to_a  #=> [[1],[2],[3]]
- *     a.permutation(2).to_a  #=> [[1,2],[1,3],[2,1],[2,3],[3,1],[3,2]]
- *     a.permutation(3).to_a  #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
- *     a.permutation(0).to_a  #=> [[]] # one permutation of length 0
- *     a.permutation(4).to_a  #=> []   # no permutations of length 4
+ *   a = [1, 2, 3]
+ *   a.permutation.to_a    #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
+ *   a.permutation(1).to_a #=> [[1],[2],[3]]
+ *   a.permutation(2).to_a #=> [[1,2],[1,3],[2,1],[2,3],[3,1],[3,2]]
+ *   a.permutation(3).to_a #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
+ *   a.permutation(0).to_a #=> [[]] # one permutation of length 0
+ *   a.permutation(4).to_a #=> []   # no permutations of length 4
  */
 
 static VALUE
 rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE num;
     long r, n, i;
 
     n = RARRAY_LEN(ary);                  /* Array length */
-    RETURN_ENUMERATOR(ary, argc, argv);   /* Return enumerator if no block */
-    rb_scan_args(argc, argv, "01", &num);
-    r = NIL_P(num) ? n : NUM2LONG(num);   /* Permutation size from argument */
+    RETURN_SIZED_ENUMERATOR(ary, argc, argv, rb_ary_permutation_size);   /* Return enumerator if no block */
+    r = n;
+    if (rb_check_arity(argc, 0, 1) && !NIL_P(argv[0]))
+        r = NUM2LONG(argv[0]);            /* Permutation size from argument */
 
     if (r < 0 || n < r) {
 	/* no permutations: yield nothing */
@@ -4140,38 +5788,67 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
     }
     else if (r == 1) { /* this is a special, easy case */
 	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
     else {             /* this is the general case */
-	volatile VALUE t0 = tmpbuf(n,sizeof(long));
-	long *p = (long*)RSTRING_PTR(t0);
-	volatile VALUE t1 = tmpbuf(n,sizeof(char));
-	char *used = (char*)RSTRING_PTR(t1);
+	volatile VALUE t0;
+	long *p = ALLOCV_N(long, t0, r+roomof(n, sizeof(long)));
+	char *used = (char*)(p + r);
 	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
-	RBASIC(ary0)->klass = 0;
+	RBASIC_CLEAR_CLASS(ary0);
 
 	MEMZERO(used, char, n); /* initialize array */
 
-	permute0(n, r, p, 0, used, ary0); /* compute and yield permutations */
-	tmpbuf_discard(t0);
-	tmpbuf_discard(t1);
-	RBASIC(ary0)->klass = rb_cArray;
+	permute0(n, r, p, used, ary0); /* compute and yield permutations */
+	ALLOCV_END(t0);
+	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
 
+static void
+combinate0(const long len, const long n, long *const stack, const VALUE values)
+{
+    long lev = 0;
+
+    MEMZERO(stack+1, long, n);
+    stack[0] = -1;
+    for (;;) {
+	for (lev++; lev < n; lev++) {
+	    stack[lev+1] = stack[lev]+1;
+	}
+	if (!yield_indexed_values(values, n, stack+1)) {
+	    rb_raise(rb_eRuntimeError, "combination reentered");
+	}
+	do {
+	    if (lev == 0) return;
+	    stack[lev--]++;
+	} while (stack[lev+1]+n == len+lev+1);
+    }
+}
+
+static VALUE
+rb_ary_combination_size(VALUE ary, VALUE args, VALUE eobj)
+{
+    long n = RARRAY_LEN(ary);
+    long k = NUM2LONG(RARRAY_AREF(args, 0));
+
+    return binomial_coefficient(k, n);
+}
+
 /*
  *  call-seq:
- *     ary.combination(n) { |c| block }    -> ary
- *     ary.combination(n)                  -> an_enumerator
+ *     ary.combination(n) {|c| block}      -> ary
+ *     ary.combination(n)                  -> Enumerator
+ *
+ * When invoked with a block, yields all combinations of length +n+ of elements
+ * from the array and then returns the array itself.
  *
- * When invoked with a block, yields all combinations of length <i>n</i>
- * of elements from <i>ary</i> and then returns <i>ary</i> itself.
- * The implementation makes no guarantees about the order in which
- * the combinations are yielded.
+ * The implementation makes no guarantees about the order in which the
+ * combinations are yielded.
  *
- * If no block is given, an enumerator is returned instead.
+ * If no block is given, an Enumerator is returned instead.
  *
  * Examples:
  *
@@ -4188,10 +5865,10 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
 static VALUE
 rb_ary_combination(VALUE ary, VALUE num)
 {
-    long n, i, len;
+    long i, n, len;
 
     n = NUM2LONG(num);
-    RETURN_ENUMERATOR(ary, 1, &num);
+    RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_combination_size);
     len = RARRAY_LEN(ary);
     if (n < 0 || len < n) {
 	/* yield nothing */
@@ -4200,90 +5877,85 @@ rb_ary_combination(VALUE ary, VALUE num)
 	rb_yield(rb_ary_new2(0));
     }
     else if (n == 1) {
-	for (i = 0; i < len; i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
     else {
-	volatile VALUE t0 = tmpbuf(n+1, sizeof(long));
-	long *stack = (long*)RSTRING_PTR(t0);
-	volatile VALUE cc = tmpary(n);
-	VALUE *chosen = RARRAY_PTR(cc);
-	long lev = 0;
-
-	MEMZERO(stack, long, n);
-	stack[0] = -1;
-	for (;;) {
-	    chosen[lev] = RARRAY_PTR(ary)[stack[lev+1]];
-	    for (lev++; lev < n; lev++) {
-		chosen[lev] = RARRAY_PTR(ary)[stack[lev+1] = stack[lev]+1];
-	    }
-	    rb_yield(rb_ary_new4(n, chosen));
-	    if (RBASIC(t0)->klass) {
-		rb_raise(rb_eRuntimeError, "combination reentered");
-	    }
-	    do {
-		if (lev == 0) goto done;
-		stack[lev--]++;
-	    } while (stack[lev+1]+n == len+lev+1);
-	}
-    done:
-	tmpbuf_discard(t0);
-	tmpary_discard(cc);
+	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+	volatile VALUE t0;
+	long *stack = ALLOCV_N(long, t0, n+1);
+
+	RBASIC_CLEAR_CLASS(ary0);
+	combinate0(len, n, stack, ary0);
+	ALLOCV_END(t0);
+	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
 
 /*
- * Recursively compute repeated permutations of r elements of the set
- * [0..n-1].
- * When we have a complete repeated permutation of array indexes, copy the
- * values at those indexes into a new array and yield that array.
+ * 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.
  *
  * n: the size of the set
  * r: the number of elements in each permutation
  * p: the array (of size r) that we're filling in
- * index: what index we're filling in now
  * values: the Ruby array that holds the actual values to permute
  */
 static void
-rpermute0(long n, long r, long *p, long index, VALUE values)
+rpermute0(const long n, const long r, long *const p, const VALUE values)
 {
-    long i, j;
-    for (i = 0; i < n; i++) {
-	p[index] = i;
-	if (index < r-1) {              /* if not done yet */
-	    rpermute0(n, r, p, index+1, values); /* recurse */
+    long i = 0, index = 0;
+
+    p[index] = i;
+    for (;;) {
+	if (++index < r-1) {
+	    p[index] = i = 0;
+	    continue;
 	}
-	else {
-	    /* We have a complete permutation of array indexes */
-	    /* Build a ruby array of the corresponding values */
-	    /* And yield it to the associated block */
-	    VALUE result = rb_ary_new2(r);
-	    VALUE *result_array = RARRAY_PTR(result);
-	    const VALUE *values_array = RARRAY_PTR(values);
-
-	    for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
-	    ARY_SET_LEN(result, r);
-	    rb_yield(result);
-	    if (RBASIC(values)->klass) {
+	for (i = 0; i < n; ++i) {
+	    p[index] = i;
+	    if (!yield_indexed_values(values, r, p)) {
 		rb_raise(rb_eRuntimeError, "repeated permute reentered");
 	    }
 	}
+	do {
+	    if (index <= 0) return;
+	} while ((i = ++p[--index]) >= n);
     }
 }
 
+static VALUE
+rb_ary_repeated_permutation_size(VALUE ary, VALUE args, VALUE eobj)
+{
+    long n = RARRAY_LEN(ary);
+    long k = NUM2LONG(RARRAY_AREF(args, 0));
+
+    if (k < 0) {
+	return LONG2FIX(0);
+    }
+    if (n <= 0) {
+	return LONG2FIX(!k);
+    }
+    return rb_int_positive_pow(n, (unsigned long)k);
+}
+
 /*
  *  call-seq:
- *     ary.repeated_permutation(n) { |p| block } -> ary
- *     ary.repeated_permutation(n)               -> an_enumerator
+ *     ary.repeated_permutation(n) {|p| block}   -> ary
+ *     ary.repeated_permutation(n)               -> Enumerator
+ *
+ * When invoked with a block, yield all repeated permutations of length +n+ of
+ * the elements of the array, then return the array itself.
  *
- * When invoked with a block, yield all repeated permutations of length
- * <i>n</i> of the elements of <i>ary</i>, then return the array itself.
- * The implementation makes no guarantees about the order in which
- * the repeated permutations are yielded.
+ * The implementation makes no guarantees about the order in which the repeated
+ * permutations are yielded.
  *
- * If no block is given, an enumerator is returned instead.
+ * If no block is given, an Enumerator is returned instead.
  *
  * Examples:
  *
@@ -4301,7 +5973,7 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
     long r, n, i;
 
     n = RARRAY_LEN(ary);                  /* Array length */
-    RETURN_ENUMERATOR(ary, 1, &num);      /* Return enumerator if no block */
+    RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_repeated_permutation_size);      /* Return Enumerator if no block */
     r = NUM2LONG(num);                    /* Permutation size from argument */
 
     if (r < 0) {
@@ -4312,70 +5984,80 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
     }
     else if (r == 1) { /* this is a special, easy case */
 	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
     else {             /* this is the general case */
-	volatile VALUE t0 = tmpbuf(r, sizeof(long));
-	long *p = (long*)RSTRING_PTR(t0);
+	volatile VALUE t0;
+	long *p = ALLOCV_N(long, t0, r);
 	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
-	RBASIC(ary0)->klass = 0;
+	RBASIC_CLEAR_CLASS(ary0);
 
-	rpermute0(n, r, p, 0, ary0); /* compute and yield repeated permutations */
-	tmpbuf_discard(t0);
-	RBASIC(ary0)->klass = rb_cArray;
+	rpermute0(n, r, p, ary0); /* compute and yield repeated permutations */
+	ALLOCV_END(t0);
+	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
 
 static void
-rcombinate0(long n, long r, long *p, long index, long rest, VALUE values)
+rcombinate0(const long n, const long r, long *const p, const long rest, const VALUE values)
 {
-    long j;
-    if (rest > 0) {
-	for (; index < n; ++index) {
-	    p[r-rest] = index;
-	    rcombinate0(n, r, p, index, rest-1, values);
+    long i = 0, index = 0;
+
+    p[index] = i;
+    for (;;) {
+	if (++index < r-1) {
+	    p[index] = i;
+	    continue;
 	}
-    }
-    else {
-	VALUE result = rb_ary_new2(r);
-	VALUE *result_array = RARRAY_PTR(result);
-	const VALUE *values_array = RARRAY_PTR(values);
-
-	for (j = 0; j < r; ++j) result_array[j] = values_array[p[j]];
-	ARY_SET_LEN(result, r);
-	rb_yield(result);
-	if (RBASIC(values)->klass) {
-	    rb_raise(rb_eRuntimeError, "repeated combination reentered");
+	for (; i < n; ++i) {
+	    p[index] = i;
+	    if (!yield_indexed_values(values, r, p)) {
+		rb_raise(rb_eRuntimeError, "repeated combination reentered");
+	    }
 	}
+	do {
+	    if (index <= 0) return;
+	} while ((i = ++p[--index]) >= n);
+    }
+}
+
+static VALUE
+rb_ary_repeated_combination_size(VALUE ary, VALUE args, VALUE eobj)
+{
+    long n = RARRAY_LEN(ary);
+    long k = NUM2LONG(RARRAY_AREF(args, 0));
+    if (k == 0) {
+	return LONG2FIX(1);
     }
+    return binomial_coefficient(k, n + k - 1);
 }
 
 /*
  *  call-seq:
- *     ary.repeated_combination(n) { |c| block } -> ary
- *     ary.repeated_combination(n)               -> an_enumerator
+ *     ary.repeated_combination(n) {|c| block}   -> ary
+ *     ary.repeated_combination(n)               -> Enumerator
  *
- * When invoked with a block, yields all repeated combinations of
- * length <i>n</i> of elements from <i>ary</i> and then returns
- * <i>ary</i> itself.
- * The implementation makes no guarantees about the order in which
- * the repeated combinations are yielded.
+ * When invoked with a block, yields all repeated combinations of length +n+ of
+ * elements from the array and then returns the array itself.
  *
- * If no block is given, an enumerator is returned instead.
+ * The implementation makes no guarantees about the order in which the repeated
+ * combinations are yielded.
+ *
+ * If no block is given, an Enumerator is returned instead.
  *
  * Examples:
  *
- *     a = [1, 2, 3]
- *     a.repeated_combination(1).to_a  #=> [[1], [2], [3]]
- *     a.repeated_combination(2).to_a  #=> [[1,1],[1,2],[1,3],[2,2],[2,3],[3,3]]
- *     a.repeated_combination(3).to_a  #=> [[1,1,1],[1,1,2],[1,1,3],[1,2,2],[1,2,3],
- *                                     #    [1,3,3],[2,2,2],[2,2,3],[2,3,3],[3,3,3]]
- *     a.repeated_combination(4).to_a  #=> [[1,1,1,1],[1,1,1,2],[1,1,1,3],[1,1,2,2],[1,1,2,3],
- *                                     #    [1,1,3,3],[1,2,2,2],[1,2,2,3],[1,2,3,3],[1,3,3,3],
- *                                     #    [2,2,2,2],[2,2,2,3],[2,2,3,3],[2,3,3,3],[3,3,3,3]]
- *     a.repeated_combination(0).to_a  #=> [[]] # one combination of length 0
+ *   a = [1, 2, 3]
+ *   a.repeated_combination(1).to_a  #=> [[1], [2], [3]]
+ *   a.repeated_combination(2).to_a  #=> [[1,1],[1,2],[1,3],[2,2],[2,3],[3,3]]
+ *   a.repeated_combination(3).to_a  #=> [[1,1,1],[1,1,2],[1,1,3],[1,2,2],[1,2,3],
+ *                                   #    [1,3,3],[2,2,2],[2,2,3],[2,3,3],[3,3,3]]
+ *   a.repeated_combination(4).to_a  #=> [[1,1,1,1],[1,1,1,2],[1,1,1,3],[1,1,2,2],[1,1,2,3],
+ *                                   #    [1,1,3,3],[1,2,2,2],[1,2,2,3],[1,2,3,3],[1,3,3,3],
+ *                                   #    [2,2,2,2],[2,2,2,3],[2,2,3,3],[2,3,3,3],[3,3,3,3]]
+ *   a.repeated_combination(0).to_a  #=> [[]] # one combination of length 0
  *
  */
 
@@ -4385,7 +6067,7 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
     long n, i, len;
 
     n = NUM2LONG(num);                 /* Combination size from argument */
-    RETURN_ENUMERATOR(ary, 1, &num);   /* Return enumerator if no block */
+    RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_repeated_combination_size);   /* Return enumerator if no block */
     len = RARRAY_LEN(ary);
     if (n < 0) {
 	/* yield nothing */
@@ -4394,22 +6076,22 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
 	rb_yield(rb_ary_new2(0));
     }
     else if (n == 1) {
-	for (i = 0; i < len; i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
     else if (len == 0) {
 	/* yield nothing */
     }
     else {
-	volatile VALUE t0 = tmpbuf(n, sizeof(long));
-	long *p = (long*)RSTRING_PTR(t0);
+	volatile VALUE t0;
+	long *p = ALLOCV_N(long, t0, n);
 	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
-	RBASIC(ary0)->klass = 0;
+	RBASIC_CLEAR_CLASS(ary0);
 
-	rcombinate0(len, n, p, 0, n, ary0); /* compute and yield repeated combinations */
-	tmpbuf_discard(t0);
-	RBASIC(ary0)->klass = rb_cArray;
+	rcombinate0(len, n, p, n, ary0); /* compute and yield repeated combinations */
+	ALLOCV_END(t0);
+	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
@@ -4417,14 +6099,15 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
 /*
  *  call-seq:
  *     ary.product(other_ary, ...)                -> new_ary
- *     ary.product(other_ary, ...) { |p| block }  -> ary
+ *     ary.product(other_ary, ...) {|p| block}    -> ary
+ *
+ *  Returns an array of all combinations of elements from all arrays.
  *
- *  Returns an array of all combinations of elements from all arrays,
- *  The length of the returned array is the product of the length
- *  of +self+ and the argument arrays.
- *  If given a block, <i>product</i> will yield all combinations
- *  and return +self+ instead.
+ *  The length of the returned array is the product of the length of +self+ and
+ *  the argument arrays.
  *
+ *  If given a block, #product will yield all combinations and return +self+
+ *  instead.
  *
  *     [1,2,3].product([4,5])     #=> [[1,4],[1,5],[2,4],[2,5],[3,4],[3,5]]
  *     [1,2].product([1,2])       #=> [[1,1],[1,2],[2,1],[2,2]]
@@ -4439,15 +6122,14 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
 {
     int n = argc+1;    /* How many arrays we're operating on */
     volatile VALUE t0 = tmpary(n);
-    volatile VALUE t1 = tmpbuf(n, sizeof(int));
+    volatile VALUE t1 = Qundef;
     VALUE *arrays = RARRAY_PTR(t0); /* The arrays we're computing the product of */
-    int *counters = (int*)RSTRING_PTR(t1); /* The current position in each one */
+    int *counters = ALLOCV_N(int, t1, n); /* The current position in each one */
     VALUE result = Qnil;      /* The array we'll be returning, when no block given */
     long i,j;
     long resultlen = 1;
 
-    RBASIC(t0)->klass = 0;
-    RBASIC(t1)->klass = 0;
+    RBASIC_CLEAR_CLASS(t0);
 
     /* initialize the arrays of arrays */
     ARY_SET_LEN(t0, n);
@@ -4469,15 +6151,14 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
     else {
 	/* Compute the length of the result array; return [] if any is empty */
 	for (i = 0; i < n; i++) {
-	    long k = RARRAY_LEN(arrays[i]), l = resultlen;
+	    long k = RARRAY_LEN(arrays[i]);
 	    if (k == 0) {
 		result = rb_ary_new2(0);
 		goto done;
 	    }
-	    resultlen *= k;
-	    if (resultlen < k || resultlen < l || resultlen / k != l) {
+            if (MUL_OVERFLOW_LONG_P(resultlen, k))
 		rb_raise(rb_eRangeError, "too big to product");
-	    }
+	    resultlen *= k;
 	}
 	result = rb_ary_new2(resultlen);
     }
@@ -4490,7 +6171,7 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
 	}
 
 	/* put it on the result array */
-	if(NIL_P(result)) {
+	if (NIL_P(result)) {
 	    FL_SET(t0, FL_USER5);
 	    rb_yield(subarray);
 	    if (! FL_TEST(t0, FL_USER5)) {
@@ -4519,7 +6200,7 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
     }
 done:
     tmpary_discard(t0);
-    tmpbuf_discard(t1);
+    ALLOCV_END(t1);
 
     return NIL_P(result) ? ary : result;
 }
@@ -4528,7 +6209,11 @@ done:
  *  call-seq:
  *     ary.take(n)               -> new_ary
  *
- *  Returns first n elements from <i>ary</i>.
+ *  Returns first +n+ elements from the array.
+ *
+ *  If a negative number is given, raises an ArgumentError.
+ *
+ *  See also Array#drop
  *
  *     a = [1, 2, 3, 4, 5, 0]
  *     a.take(3)             #=> [1, 2, 3]
@@ -4547,16 +6232,18 @@ rb_ary_take(VALUE obj, VALUE n)
 
 /*
  *  call-seq:
- *     ary.take_while {|arr| block }   -> new_ary
- *     ary.take_while                  -> an_enumerator
+ *     ary.take_while {|obj| block}    -> new_ary
+ *     ary.take_while                  -> Enumerator
  *
- *  Passes elements to the block until the block returns +nil+ or +false+,
- *  then stops iterating and returns an array of all prior elements.
+ *  Passes elements to the block until the block returns +nil+ or +false+, then
+ *  stops iterating and returns an array of all prior elements.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *  See also Array#drop_while
  *
  *     a = [1, 2, 3, 4, 5, 0]
- *     a.take_while {|i| i < 3 }   #=> [1, 2]
+ *     a.take_while {|i| i < 3}    #=> [1, 2]
  *
  */
 
@@ -4567,7 +6254,7 @@ rb_ary_take_while(VALUE ary)
 
     RETURN_ENUMERATOR(ary, 0, 0);
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break;
+	if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) break;
     }
     return rb_ary_take(ary, LONG2FIX(i));
 }
@@ -4576,8 +6263,12 @@ rb_ary_take_while(VALUE ary)
  *  call-seq:
  *     ary.drop(n)               -> new_ary
  *
- *  Drops first n elements from +ary+ and returns the rest of
- *  the elements in an array.
+ *  Drops first +n+ elements from +ary+ and returns the rest of the elements in
+ *  an array.
+ *
+ *  If a negative number is given, raises an ArgumentError.
+ *
+ *  See also Array#take
  *
  *     a = [1, 2, 3, 4, 5, 0]
  *     a.drop(3)             #=> [4, 5, 0]
@@ -4600,14 +6291,16 @@ rb_ary_drop(VALUE ary, VALUE n)
 
 /*
  *  call-seq:
- *     ary.drop_while {|arr| block }   -> new_ary
- *     ary.drop_while                  -> an_enumerator
+ *     ary.drop_while {|obj| block}     -> new_ary
+ *     ary.drop_while                  -> Enumerator
+ *
+ *  Drops elements up to, but not including, the first element for which the
+ *  block returns +nil+ or +false+ and returns an array containing the
+ *  remaining elements.
  *
- *  Drops elements up to, but not including, the first element for
- *  which the block returns +nil+ or +false+ and returns an array
- *  containing the remaining elements.
+ *  If no block is given, an Enumerator is returned instead.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  See also Array#take_while
  *
  *     a = [1, 2, 3, 4, 5, 0]
  *     a.drop_while {|i| i < 3 }   #=> [3, 4, 5, 0]
@@ -4621,18 +6314,605 @@ rb_ary_drop_while(VALUE ary)
 
     RETURN_ENUMERATOR(ary, 0, 0);
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break;
+	if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) break;
     }
     return rb_ary_drop(ary, LONG2FIX(i));
 }
 
+/*
+ *  call-seq:
+ *     ary.any? [{|obj| block}  ]   -> true or false
+ *     ary.any?(pattern)            -> true or false
+ *
+ *  See also Enumerable#any?
+ */
+
+static VALUE
+rb_ary_any_p(int argc, VALUE *argv, VALUE ary)
+{
+    long i, len = RARRAY_LEN(ary);
+
+    rb_check_arity(argc, 0, 1);
+    if (!len) return Qfalse;
+    if (argc) {
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
+	for (i = 0; i < RARRAY_LEN(ary); ++i) {
+	    if (RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) return Qtrue;
+	}
+    }
+    else if (!rb_block_given_p()) {
+        for (i = 0; i < len; ++i) {
+            if (RTEST(RARRAY_AREF(ary, i))) return Qtrue;
+        }
+    }
+    else {
+	for (i = 0; i < RARRAY_LEN(ary); ++i) {
+	    if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) return Qtrue;
+	}
+    }
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     ary.all? [{|obj| block}  ]   -> true or false
+ *     ary.all?(pattern)            -> true or false
+ *
+ *  See also Enumerable#all?
+ */
+
+static VALUE
+rb_ary_all_p(int argc, VALUE *argv, VALUE ary)
+{
+    long i, len = RARRAY_LEN(ary);
+
+    rb_check_arity(argc, 0, 1);
+    if (!len) return Qtrue;
+    if (argc) {
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (!RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) return Qfalse;
+        }
+    }
+    else if (!rb_block_given_p()) {
+        for (i = 0; i < len; ++i) {
+            if (!RTEST(RARRAY_AREF(ary, i))) return Qfalse;
+        }
+    }
+    else {
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) return Qfalse;
+        }
+    }
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     ary.none? [{|obj| block}  ]   -> true or false
+ *     ary.none?(pattern)            -> true or false
+ *
+ *  See also Enumerable#none?
+ */
+
+static VALUE
+rb_ary_none_p(int argc, VALUE *argv, VALUE ary)
+{
+    long i, len = RARRAY_LEN(ary);
+
+    rb_check_arity(argc, 0, 1);
+    if (!len) return Qtrue;
+    if (argc) {
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) return Qfalse;
+        }
+    }
+    else if (!rb_block_given_p()) {
+        for (i = 0; i < len; ++i) {
+            if (RTEST(RARRAY_AREF(ary, i))) return Qfalse;
+        }
+    }
+    else {
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) return Qfalse;
+        }
+    }
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     ary.one? [{|obj| block}  ]   -> true or false
+ *     ary.one?(pattern)            -> true or false
+ *
+ *  See also Enumerable#one?
+ */
 
+static VALUE
+rb_ary_one_p(int argc, VALUE *argv, VALUE ary)
+{
+    long i, len = RARRAY_LEN(ary);
+    VALUE result = Qfalse;
 
-/* Arrays are ordered, integer-indexed collections of any object.
- * Array indexing starts at 0, as in C or Java.  A negative index is
- * assumed to be relative to the end of the array---that is, an index of -1
- * indicates the last element of the array, -2 is the next to last
- * element in the array, and so on.
+    rb_check_arity(argc, 0, 1);
+    if (!len) return Qfalse;
+    if (argc) {
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) {
+                if (result) return Qfalse;
+                result = Qtrue;
+            }
+        }
+    }
+    else if (!rb_block_given_p()) {
+        for (i = 0; i < len; ++i) {
+            if (RTEST(RARRAY_AREF(ary, i))) {
+                if (result) return Qfalse;
+                result = Qtrue;
+            }
+        }
+    }
+    else {
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) {
+                if (result) return Qfalse;
+                result = Qtrue;
+            }
+        }
+    }
+    return result;
+}
+
+/*
+ * 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
+ */
+
+static 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);
+}
+
+static inline VALUE
+finish_exact_sum(long n, VALUE r, VALUE v, int z)
+{
+    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);
+    }
+    else if (!n && z) {
+        v = rb_fix_plus(LONG2FIX(0), v);
+    }
+    return v;
+}
+
+/*
+ * 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;
+
+    v = (rb_check_arity(argc, 0, 1) ? argv[0] : 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;
+    }
+    v = finish_exact_sum(n, r, v, argc!=0);
+    return v;
+
+  not_exact:
+    v = finish_exact_sum(n, r, v, i!=0);
+
+    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;
+        double x, t;
+
+        f = NUM2DBL(v);
+        c = 0.0;
+        goto has_float_value;
+        for (; i < RARRAY_LEN(ary); i++) {
+            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;
+
+            if (isnan(f)) continue;
+            if (isnan(x)) {
+                f = x;
+                continue;
+            }
+            if (isinf(x)) {
+                if (isinf(f) && signbit(x) != signbit(f))
+                    f = NAN;
+                else
+                    f = x;
+                continue;
+            }
+            if (isinf(f)) continue;
+
+            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;
+}
+
+static VALUE
+rb_ary_deconstruct(VALUE ary)
+{
+    return ary;
+}
+
+/*
+ *  Arrays are ordered, integer-indexed collections of any object.
+ *
+ *  Array indexing starts at 0, as in C or Java.  A negative index is assumed
+ *  to be relative to the end of the array---that is, an index of -1 indicates
+ *  the last element of the array, -2 is the next to last element in the
+ *  array, and so on.
+ *
+ *  == Creating Arrays
+ *
+ *  A new array can be created by using the literal constructor
+ *  <code>[]</code>.  Arrays can contain different types of objects.  For
+ *  example, the array below contains an Integer, a String and a Float:
+ *
+ *     ary = [1, "two", 3.0] #=> [1, "two", 3.0]
+ *
+ *  An array can also be created by explicitly calling Array.new with zero, one
+ *  (the initial size of the Array) or two arguments (the initial size and a
+ *  default object).
+ *
+ *     ary = Array.new    #=> []
+ *     Array.new(3)       #=> [nil, nil, nil]
+ *     Array.new(3, true) #=> [true, true, true]
+ *
+ *  Note that the second argument populates the array with references to the
+ *  same object.  Therefore, it is only recommended in cases when you need to
+ *  instantiate arrays with natively immutable objects such as Symbols,
+ *  numbers, true or false.
+ *
+ *  To create an array with separate objects a block can be passed instead.
+ *  This method is safe to use with mutable objects such as hashes, strings or
+ *  other arrays:
+ *
+ *     Array.new(4) {Hash.new}    #=> [{}, {}, {}, {}]
+ *     Array.new(4) {|i| i.to_s } #=> ["0", "1", "2", "3"]
+ *
+ *  This is also a quick way to build up multi-dimensional arrays:
+ *
+ *     empty_table = Array.new(3) {Array.new(3)}
+ *     #=> [[nil, nil, nil], [nil, nil, nil], [nil, nil, nil]]
+ *
+ *  An array can also be created by using the Array() method, provided by
+ *  Kernel, which tries to call #to_ary, then #to_a on its argument.
+ *
+ *	Array({:a => "a", :b => "b"}) #=> [[:a, "a"], [:b, "b"]]
+ *
+ *  == Example Usage
+ *
+ *  In addition to the methods it mixes in through the Enumerable module, the
+ *  Array class has proprietary methods for accessing, searching and otherwise
+ *  manipulating arrays.
+ *
+ *  Some of the more common ones are illustrated below.
+ *
+ *  == Accessing Elements
+ *
+ *  Elements in an array can be retrieved using the Array#[] method.  It can
+ *  take a single integer argument (a numeric index), a pair of arguments
+ *  (start and length) or a range. Negative indices start counting from the end,
+ *  with -1 being the last element.
+ *
+ *     arr = [1, 2, 3, 4, 5, 6]
+ *     arr[2]    #=> 3
+ *     arr[100]  #=> nil
+ *     arr[-3]   #=> 4
+ *     arr[2, 3] #=> [3, 4, 5]
+ *     arr[1..4] #=> [2, 3, 4, 5]
+ *     arr[1..-3] #=> [2, 3, 4]
+ *
+ *  Another way to access a particular array element is by using the #at method
+ *
+ *     arr.at(0) #=> 1
+ *
+ *  The #slice method works in an identical manner to Array#[].
+ *
+ *  To raise an error for indices outside of the array bounds or else to
+ *  provide a default value when that happens, you can use #fetch.
+ *
+ *     arr = ['a', 'b', 'c', 'd', 'e', 'f']
+ *     arr.fetch(100) #=> IndexError: index 100 outside of array bounds: -6...6
+ *     arr.fetch(100, "oops") #=> "oops"
+ *
+ *  The special methods #first and #last will return the first and last
+ *  elements of an array, respectively.
+ *
+ *     arr.first #=> 1
+ *     arr.last  #=> 6
+ *
+ *  To return the first +n+ elements of an array, use #take
+ *
+ *     arr.take(3) #=> [1, 2, 3]
+ *
+ *  #drop does the opposite of #take, by returning the elements after +n+
+ *  elements have been dropped:
+ *
+ *     arr.drop(3) #=> [4, 5, 6]
+ *
+ *  == Obtaining Information about an Array
+ *
+ *  Arrays keep track of their own length at all times.  To query an array
+ *  about the number of elements it contains, use #length, #count or #size.
+ *
+ *    browsers = ['Chrome', 'Firefox', 'Safari', 'Opera', 'IE']
+ *    browsers.length #=> 5
+ *    browsers.count #=> 5
+ *
+ *  To check whether an array contains any elements at all
+ *
+ *    browsers.empty? #=> false
+ *
+ *  To check whether a particular item is included in the array
+ *
+ *    browsers.include?('Konqueror') #=> false
+ *
+ *  == Adding Items to Arrays
+ *
+ *  Items can be added to the end of an array by using either #push or #<<
+ *
+ *    arr = [1, 2, 3, 4]
+ *    arr.push(5) #=> [1, 2, 3, 4, 5]
+ *    arr << 6    #=> [1, 2, 3, 4, 5, 6]
+ *
+ *  #unshift will add a new item to the beginning of an array.
+ *
+ *     arr.unshift(0) #=> [0, 1, 2, 3, 4, 5, 6]
+ *
+ *  With #insert you can add a new element to an array at any position.
+ *
+ *     arr.insert(3, 'apple')  #=> [0, 1, 2, 'apple', 3, 4, 5, 6]
+ *
+ *  Using the #insert method, you can also insert multiple values at once:
+ *
+ *     arr.insert(3, 'orange', 'pear', 'grapefruit')
+ *     #=> [0, 1, 2, "orange", "pear", "grapefruit", "apple", 3, 4, 5, 6]
+ *
+ *  == Removing Items from an Array
+ *
+ *  The method #pop removes the last element in an array and returns it:
+ *
+ *     arr =  [1, 2, 3, 4, 5, 6]
+ *     arr.pop #=> 6
+ *     arr #=> [1, 2, 3, 4, 5]
+ *
+ *  To retrieve and at the same time remove the first item, use #shift:
+ *
+ *     arr.shift #=> 1
+ *     arr #=> [2, 3, 4, 5]
+ *
+ *  To delete an element at a particular index:
+ *
+ *     arr.delete_at(2) #=> 4
+ *     arr #=> [2, 3, 5]
+ *
+ *  To delete a particular element anywhere in an array, use #delete:
+ *
+ *     arr = [1, 2, 2, 3]
+ *     arr.delete(2) #=> 2
+ *     arr #=> [1,3]
+ *
+ *  A useful method if you need to remove +nil+ values from an array is
+ *  #compact:
+ *
+ *     arr = ['foo', 0, nil, 'bar', 7, 'baz', nil]
+ *     arr.compact  #=> ['foo', 0, 'bar', 7, 'baz']
+ *     arr          #=> ['foo', 0, nil, 'bar', 7, 'baz', nil]
+ *     arr.compact! #=> ['foo', 0, 'bar', 7, 'baz']
+ *     arr          #=> ['foo', 0, 'bar', 7, 'baz']
+ *
+ *  Another common need is to remove duplicate elements from an array.
+ *
+ *  It has the non-destructive #uniq, and destructive method #uniq!
+ *
+ *     arr = [2, 5, 6, 556, 6, 6, 8, 9, 0, 123, 556]
+ *     arr.uniq #=> [2, 5, 6, 556, 8, 9, 0, 123]
+ *
+ *  == Iterating over Arrays
+ *
+ *  Like all classes that include the Enumerable module, Array has an each
+ *  method, which defines what elements should be iterated over and how.  In
+ *  case of Array's #each, all elements in the Array instance are yielded to
+ *  the supplied block in sequence.
+ *
+ *  Note that this operation leaves the array unchanged.
+ *
+ *     arr = [1, 2, 3, 4, 5]
+ *     arr.each {|a| print a -= 10, " "}
+ *     # prints: -9 -8 -7 -6 -5
+ *     #=> [1, 2, 3, 4, 5]
+ *
+ *  Another sometimes useful iterator is #reverse_each which will iterate over
+ *  the elements in the array in reverse order.
+ *
+ *     words = %w[first second third fourth fifth sixth]
+ *     str = ""
+ *     words.reverse_each {|word| str += "#{word} "}
+ *     p str #=> "sixth fifth fourth third second first "
+ *
+ *  The #map method can be used to create a new array based on the original
+ *  array, but with the values modified by the supplied block:
+ *
+ *     arr.map {|a| 2*a}     #=> [2, 4, 6, 8, 10]
+ *     arr                   #=> [1, 2, 3, 4, 5]
+ *     arr.map! {|a| a**2}   #=> [1, 4, 9, 16, 25]
+ *     arr                   #=> [1, 4, 9, 16, 25]
+ *
+ *  == Selecting Items from an Array
+ *
+ *  Elements can be selected from an array according to criteria defined in a
+ *  block.  The selection can happen in a destructive or a non-destructive
+ *  manner.  While the destructive operations will modify the array they were
+ *  called on, the non-destructive methods usually return a new array with the
+ *  selected elements, but leave the original array unchanged.
+ *
+ *  === Non-destructive Selection
+ *
+ *     arr = [1, 2, 3, 4, 5, 6]
+ *     arr.select {|a| a > 3}       #=> [4, 5, 6]
+ *     arr.reject {|a| a < 3}       #=> [3, 4, 5, 6]
+ *     arr.drop_while {|a| a < 4}   #=> [4, 5, 6]
+ *     arr                          #=> [1, 2, 3, 4, 5, 6]
+ *
+ *  === Destructive Selection
+ *
+ *  #select! and #reject! are the corresponding destructive methods to #select
+ *  and #reject
+ *
+ *  Similar to #select vs. #reject, #delete_if and #keep_if have the exact
+ *  opposite result when supplied with the same block:
+ *
+ *     arr.delete_if {|a| a < 4}   #=> [4, 5, 6]
+ *     arr                         #=> [4, 5, 6]
+ *
+ *     arr = [1, 2, 3, 4, 5, 6]
+ *     arr.keep_if {|a| a < 4}   #=> [1, 2, 3]
+ *     arr                       #=> [1, 2, 3]
+ *
  */
 
 void
@@ -4644,7 +6924,7 @@ Init_Array(void)
     rb_cArray  = rb_define_class("Array", rb_cObject);
     rb_include_module(rb_cArray, rb_mEnumerable);
 
-    rb_define_alloc_func(rb_cArray, ary_alloc);
+    rb_define_alloc_func(rb_cArray, empty_ary_alloc);
     rb_define_singleton_method(rb_cArray, "[]", rb_ary_s_create, -1);
     rb_define_singleton_method(rb_cArray, "try_convert", rb_ary_s_try_convert, 1);
     rb_define_method(rb_cArray, "initialize", rb_ary_initialize, -1);
@@ -4653,8 +6933,8 @@ Init_Array(void)
     rb_define_method(rb_cArray, "inspect", rb_ary_inspect, 0);
     rb_define_alias(rb_cArray,  "to_s", "inspect");
     rb_define_method(rb_cArray, "to_a", rb_ary_to_a, 0);
+    rb_define_method(rb_cArray, "to_h", rb_ary_to_h, 0);
     rb_define_method(rb_cArray, "to_ary", rb_ary_to_ary_m, 0);
-    rb_define_method(rb_cArray, "frozen?",  rb_ary_frozen_p, 0);
 
     rb_define_method(rb_cArray, "==", rb_ary_equal, 1);
     rb_define_method(rb_cArray, "eql?", rb_ary_eql, 1);
@@ -4666,12 +6946,17 @@ 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, 1);
+    rb_define_method(rb_cArray, "concat", rb_ary_concat_multi, -1);
+    rb_define_method(rb_cArray, "union", rb_ary_union_multi, -1);
+    rb_define_method(rb_cArray, "difference", rb_ary_difference_multi, -1);
+    rb_define_method(rb_cArray, "intersection", rb_ary_intersection_multi, -1);
     rb_define_method(rb_cArray, "<<", rb_ary_push, 1);
     rb_define_method(rb_cArray, "push", rb_ary_push_m, -1);
+    rb_define_alias(rb_cArray,  "append", "push");
     rb_define_method(rb_cArray, "pop", rb_ary_pop_m, -1);
     rb_define_method(rb_cArray, "shift", rb_ary_shift_m, -1);
     rb_define_method(rb_cArray, "unshift", rb_ary_unshift_m, -1);
+    rb_define_alias(rb_cArray,  "prepend", "unshift");
     rb_define_method(rb_cArray, "insert", rb_ary_insert, -1);
     rb_define_method(rb_cArray, "each", rb_ary_each, 0);
     rb_define_method(rb_cArray, "each_index", rb_ary_each_index, 0);
@@ -4696,6 +6981,8 @@ Init_Array(void)
     rb_define_method(rb_cArray, "map!", rb_ary_collect_bang, 0);
     rb_define_method(rb_cArray, "select", rb_ary_select, 0);
     rb_define_method(rb_cArray, "select!", rb_ary_select_bang, 0);
+    rb_define_method(rb_cArray, "filter", rb_ary_select, 0);
+    rb_define_method(rb_cArray, "filter!", rb_ary_select_bang, 0);
     rb_define_method(rb_cArray, "keep_if", rb_ary_keep_if, 0);
     rb_define_method(rb_cArray, "values_at", rb_ary_values_at, -1);
     rb_define_method(rb_cArray, "delete", rb_ary_delete, 1);
@@ -4724,6 +7011,10 @@ 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, "minmax", rb_ary_minmax, 0);
+
     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);
@@ -4745,7 +7036,16 @@ Init_Array(void)
     rb_define_method(rb_cArray, "take_while", rb_ary_take_while, 0);
     rb_define_method(rb_cArray, "drop", rb_ary_drop, 1);
     rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0);
-
-    id_cmp = rb_intern("<=>");
-    sym_random = ID2SYM(rb_intern("random"));
+    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, -1);
+    rb_define_method(rb_cArray, "all?", rb_ary_all_p, -1);
+    rb_define_method(rb_cArray, "none?", rb_ary_none_p, -1);
+    rb_define_method(rb_cArray, "one?", rb_ary_one_p, -1);
+    rb_define_method(rb_cArray, "dig", rb_ary_dig, -1);
+    rb_define_method(rb_cArray, "sum", rb_ary_sum, -1);
+
+    rb_define_method(rb_cArray, "deconstruct", rb_ary_deconstruct, 0);
+
+    id_random = rb_intern("random");
 }
diff --git a/ast.c b/ast.c
new file mode 100644
index 0000000000..1133fb8a10
--- /dev/null
+++ b/ast.c
@@ -0,0 +1,691 @@
+/* indent-tabs-mode: nil */
+#include "ruby.h"
+#include "ruby/encoding.h"
+#include "ruby/util.h"
+#include "internal.h"
+#include "node.h"
+#include "vm_core.h"
+#include "iseq.h"
+#include "builtin.h"
+
+static VALUE rb_mAST;
+static VALUE rb_cNode;
+
+struct ASTNodeData {
+    rb_ast_t *ast;
+    NODE *node;
+};
+
+static void
+node_gc_mark(void *ptr)
+{
+    struct ASTNodeData *data = (struct ASTNodeData *)ptr;
+    rb_gc_mark((VALUE)data->ast);
+}
+
+static size_t
+node_memsize(const void *ptr)
+{
+    struct ASTNodeData *data = (struct ASTNodeData *)ptr;
+    return rb_ast_memsize(data->ast);
+}
+
+static const rb_data_type_t rb_node_type = {
+    "AST/node",
+    {node_gc_mark, RUBY_TYPED_DEFAULT_FREE, node_memsize,},
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+static VALUE rb_ast_node_alloc(VALUE klass);
+
+static void
+setup_node(VALUE obj, rb_ast_t *ast, NODE *node)
+{
+    struct ASTNodeData *data;
+
+    TypedData_Get_Struct(obj, struct ASTNodeData, &rb_node_type, data);
+    data->ast = ast;
+    data->node = node;
+}
+
+static VALUE
+ast_new_internal(rb_ast_t *ast, NODE *node)
+{
+    VALUE obj;
+
+    obj = rb_ast_node_alloc(rb_cNode);
+    setup_node(obj, ast, node);
+
+    return obj;
+}
+
+static VALUE rb_ast_parse_str(VALUE str);
+static VALUE rb_ast_parse_file(VALUE path);
+static VALUE rb_ast_parse_array(VALUE array);
+
+static VALUE
+ast_parse_new(void)
+{
+    return rb_parser_set_context(rb_parser_new(), NULL, 0);
+}
+
+static VALUE
+ast_parse_done(rb_ast_t *ast)
+{
+    if (!ast->body.root) {
+        rb_ast_dispose(ast);
+        rb_exc_raise(GET_EC()->errinfo);
+    }
+
+    return ast_new_internal(ast, (NODE *)ast->body.root);
+}
+
+static VALUE
+ast_s_parse(rb_execution_context_t *ec, VALUE module, VALUE str)
+{
+    return rb_ast_parse_str(str);
+}
+
+static VALUE
+rb_ast_parse_str(VALUE str)
+{
+    rb_ast_t *ast = 0;
+
+    StringValue(str);
+    ast = rb_parser_compile_string_path(ast_parse_new(), Qnil, str, 1);
+    return ast_parse_done(ast);
+}
+
+static VALUE
+ast_s_parse_file(rb_execution_context_t *ec, VALUE module, VALUE path)
+{
+    return rb_ast_parse_file(path);
+}
+
+static VALUE
+rb_ast_parse_file(VALUE path)
+{
+    VALUE f;
+    rb_ast_t *ast = 0;
+    rb_encoding *enc = rb_utf8_encoding();
+
+    FilePathValue(path);
+    f = rb_file_open_str(path, "r");
+    rb_funcall(f, rb_intern("set_encoding"), 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
+    ast = rb_parser_compile_file_path(ast_parse_new(), Qnil, f, 1);
+    rb_io_close(f);
+    return ast_parse_done(ast);
+}
+
+static VALUE
+lex_array(VALUE array, int index)
+{
+    VALUE str = rb_ary_entry(array, index);
+    if (!NIL_P(str)) {
+        StringValue(str);
+        if (!rb_enc_asciicompat(rb_enc_get(str))) {
+            rb_raise(rb_eArgError, "invalid source encoding");
+        }
+    }
+    return str;
+}
+
+static VALUE
+rb_ast_parse_array(VALUE array)
+{
+    rb_ast_t *ast = 0;
+
+    array = rb_check_array_type(array);
+    ast = rb_parser_compile_generic(ast_parse_new(), lex_array, Qnil, array, 1);
+    return ast_parse_done(ast);
+}
+
+static VALUE node_children(rb_ast_t*, NODE*);
+
+static VALUE
+node_find(VALUE self, const int node_id)
+{
+    VALUE ary;
+    long i;
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    if (nd_node_id(data->node) == node_id) return self;
+
+    ary = node_children(data->ast, data->node);
+
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+        VALUE child = RARRAY_AREF(ary, i);
+
+        if (CLASS_OF(child) == rb_cNode) {
+            VALUE result = node_find(child, node_id);
+            if (RTEST(result)) return result;
+        }
+    }
+
+    return Qnil;
+}
+
+extern VALUE rb_e_script;
+
+static VALUE
+script_lines(VALUE path)
+{
+    VALUE hash, lines;
+    ID script_lines;
+    CONST_ID(script_lines, "SCRIPT_LINES__");
+    if (!rb_const_defined_at(rb_cObject, script_lines)) return Qnil;
+    hash = rb_const_get_at(rb_cObject, script_lines);
+    if (!RB_TYPE_P(hash, T_HASH)) return Qnil;
+    lines = rb_hash_lookup(hash, path);
+    if (!RB_TYPE_P(lines, T_ARRAY)) return Qnil;
+    return lines;
+}
+
+static VALUE
+ast_s_of(rb_execution_context_t *ec, VALUE module, VALUE body)
+{
+    VALUE path, node, lines;
+    int node_id;
+    const rb_iseq_t *iseq = NULL;
+
+    if (rb_obj_is_proc(body)) {
+        iseq = vm_proc_iseq(body);
+
+        if (!rb_obj_is_iseq((VALUE)iseq)) {
+            iseq = NULL;
+        }
+    }
+    else {
+        iseq = rb_method_iseq(body);
+    }
+
+    if (!iseq) return Qnil;
+
+    path = rb_iseq_path(iseq);
+    node_id = iseq->body->location.node_id;
+    if (!NIL_P(lines = script_lines(path))) {
+        node = rb_ast_parse_array(lines);
+    }
+    else if (RSTRING_LEN(path) == 2 && memcmp(RSTRING_PTR(path), "-e", 2) == 0) {
+        node = rb_ast_parse_str(rb_e_script);
+    }
+    else {
+        node = rb_ast_parse_file(path);
+    }
+
+    return node_find(node, node_id);
+}
+
+static VALUE
+rb_ast_node_alloc(VALUE klass)
+{
+    struct ASTNodeData *data;
+    VALUE obj = TypedData_Make_Struct(klass, struct ASTNodeData, &rb_node_type, data);
+
+    return obj;
+}
+
+static const char*
+node_type_to_str(const NODE *node)
+{
+    return (ruby_node_name(nd_type(node)) + rb_strlen_lit("NODE_"));
+}
+
+static VALUE
+ast_node_type(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return rb_sym_intern_ascii_cstr(node_type_to_str(data->node));
+}
+
+#define NEW_CHILD(ast, node) node ? ast_new_internal(ast, node) : Qnil
+
+static VALUE
+rb_ary_new_from_node_args(rb_ast_t *ast, long n, ...)
+{
+    va_list ar;
+    VALUE ary;
+    long i;
+
+    ary = rb_ary_new2(n);
+
+    va_start(ar, n);
+    for (i=0; i<n; i++) {
+        NODE *node;
+        node = va_arg(ar, NODE *);
+        rb_ary_push(ary, NEW_CHILD(ast, node));
+    }
+    va_end(ar);
+    return ary;
+}
+
+static VALUE
+dump_block(rb_ast_t *ast, NODE *node)
+{
+    VALUE ary = rb_ary_new();
+    do {
+        rb_ary_push(ary, NEW_CHILD(ast, node->nd_head));
+    } while (node->nd_next &&
+        nd_type(node->nd_next) == NODE_BLOCK &&
+        (node = node->nd_next, 1));
+    if (node->nd_next) {
+        rb_ary_push(ary, NEW_CHILD(ast, node->nd_next));
+    }
+
+    return ary;
+}
+
+static VALUE
+dump_array(rb_ast_t *ast, NODE *node)
+{
+    VALUE ary = rb_ary_new();
+    rb_ary_push(ary, NEW_CHILD(ast, node->nd_head));
+
+    while (node->nd_next && nd_type(node->nd_next) == NODE_LIST) {
+        node = node->nd_next;
+        rb_ary_push(ary, NEW_CHILD(ast, node->nd_head));
+    }
+    rb_ary_push(ary, NEW_CHILD(ast, node->nd_next));
+
+    return ary;
+}
+
+static VALUE
+var_name(ID id)
+{
+    if (!id) return Qnil;
+    if (!rb_id2str(id)) return Qnil;
+    return ID2SYM(id);
+}
+
+static VALUE
+node_children(rb_ast_t *ast, NODE *node)
+{
+    char name[DECIMAL_SIZE_OF_BITS(sizeof(long) * CHAR_BIT) + 2]; /* including '$' */
+
+    enum node_type type = nd_type(node);
+    switch (type) {
+      case NODE_BLOCK:
+        return dump_block(ast, node);
+      case NODE_IF:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_cond, node->nd_body, node->nd_else);
+      case NODE_UNLESS:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_cond, node->nd_body, node->nd_else);
+      case NODE_CASE:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+      case NODE_CASE2:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+      case NODE_CASE3:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+      case NODE_WHEN:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_body, node->nd_next);
+      case NODE_IN:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_body, node->nd_next);
+      case NODE_WHILE:
+        goto loop;
+      case NODE_UNTIL:
+      loop:
+        return rb_ary_push(rb_ary_new_from_node_args(ast, 2, node->nd_cond, node->nd_body),
+                           (node->nd_state ? Qtrue : Qfalse));
+      case NODE_ITER:
+      case NODE_FOR:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_iter, node->nd_body);
+      case NODE_FOR_MASGN:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_var);
+      case NODE_BREAK:
+        goto jump;
+      case NODE_NEXT:
+        goto jump;
+      case NODE_RETURN:
+      jump:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_stts);
+      case NODE_REDO:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_RETRY:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_BEGIN:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+      case NODE_RESCUE:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_resq, node->nd_else);
+      case NODE_RESBODY:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_args, node->nd_body, node->nd_head);
+      case NODE_ENSURE:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_ensr);
+      case NODE_AND:
+        goto andor;
+      case NODE_OR:
+      andor:
+        {
+            VALUE ary = rb_ary_new();
+
+            while (1) {
+                rb_ary_push(ary, NEW_CHILD(ast, node->nd_1st));
+                if (!node->nd_2nd || nd_type(node->nd_2nd) != (int)type)
+                    break;
+                node = node->nd_2nd;
+            }
+            rb_ary_push(ary, NEW_CHILD(ast, node->nd_2nd));
+            return ary;
+        }
+      case NODE_MASGN:
+        if (NODE_NAMED_REST_P(node->nd_args)) {
+            return rb_ary_new_from_node_args(ast, 3, node->nd_value, node->nd_head, node->nd_args);
+        }
+        else {
+            return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_value),
+                                        NEW_CHILD(ast, node->nd_head),
+                                        ID2SYM(rb_intern("NODE_SPECIAL_NO_NAME_REST")));
+        }
+      case NODE_LASGN:
+        goto asgn;
+      case NODE_DASGN:
+        goto asgn;
+      case NODE_DASGN_CURR:
+        goto asgn;
+      case NODE_IASGN:
+        goto asgn;
+      case NODE_CVASGN:
+      asgn:
+        if (NODE_REQUIRED_KEYWORD_P(node)) {
+            return rb_ary_new_from_args(2, var_name(node->nd_vid), ID2SYM(rb_intern("NODE_SPECIAL_REQUIRED_KEYWORD")));
+        }
+        return rb_ary_new_from_args(2, var_name(node->nd_vid), NEW_CHILD(ast, node->nd_value));
+      case NODE_GASGN:
+        goto asgn;
+      case NODE_CDECL:
+        if (node->nd_vid) {
+            return rb_ary_new_from_args(2, ID2SYM(node->nd_vid), NEW_CHILD(ast, node->nd_value));
+        }
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_else), ID2SYM(node->nd_else->nd_mid), NEW_CHILD(ast, node->nd_value));
+      case NODE_OP_ASGN1:
+        return rb_ary_new_from_args(4, NEW_CHILD(ast, node->nd_recv),
+                                    ID2SYM(node->nd_mid),
+                                    NEW_CHILD(ast, node->nd_args->nd_head),
+                                    NEW_CHILD(ast, node->nd_args->nd_body));
+      case NODE_OP_ASGN2:
+        return rb_ary_new_from_args(4, NEW_CHILD(ast, node->nd_recv),
+                                    node->nd_next->nd_aid ? Qtrue : Qfalse,
+                                    ID2SYM(node->nd_next->nd_vid),
+                                    NEW_CHILD(ast, node->nd_value));
+      case NODE_OP_ASGN_AND:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head), ID2SYM(idANDOP),
+                                    NEW_CHILD(ast, node->nd_value));
+      case NODE_OP_ASGN_OR:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head), ID2SYM(idOROP),
+                                    NEW_CHILD(ast, node->nd_value));
+      case NODE_OP_CDECL:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head),
+                                    ID2SYM(node->nd_aid),
+                                    NEW_CHILD(ast, node->nd_value));
+      case NODE_CALL:
+      case NODE_OPCALL:
+      case NODE_QCALL:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv),
+                                    ID2SYM(node->nd_mid),
+                                    NEW_CHILD(ast, node->nd_args));
+      case NODE_FCALL:
+        return rb_ary_new_from_args(2, ID2SYM(node->nd_mid),
+                                    NEW_CHILD(ast, node->nd_args));
+      case NODE_VCALL:
+        return rb_ary_new_from_args(1, ID2SYM(node->nd_mid));
+      case NODE_SUPER:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_args);
+      case NODE_ZSUPER:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_LIST:
+        goto ary;
+      case NODE_VALUES:
+      ary:
+        return dump_array(ast, node);
+      case NODE_ZLIST:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_HASH:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_head);
+      case NODE_YIELD:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_head);
+      case NODE_LVAR:
+      case NODE_DVAR:
+        return rb_ary_new_from_args(1, var_name(node->nd_vid));
+      case NODE_IVAR:
+      case NODE_CONST:
+      case NODE_CVAR:
+      case NODE_GVAR:
+        return rb_ary_new_from_args(1, ID2SYM(node->nd_vid));
+      case NODE_NTH_REF:
+        snprintf(name, sizeof(name), "$%ld", node->nd_nth);
+        return rb_ary_new_from_args(1, ID2SYM(rb_intern(name)));
+      case NODE_BACK_REF:
+        name[0] = '$';
+        name[1] = (char)node->nd_nth;
+        name[2] = '\0';
+        return rb_ary_new_from_args(1, ID2SYM(rb_intern(name)));
+      case NODE_MATCH:
+        goto lit;
+      case NODE_MATCH2:
+        if (node->nd_args) {
+            return rb_ary_new_from_node_args(ast, 3, node->nd_recv, node->nd_value, node->nd_args);
+        }
+        return rb_ary_new_from_node_args(ast, 2, node->nd_recv, node->nd_value);
+      case NODE_MATCH3:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_recv, node->nd_value);
+      case NODE_LIT:
+        goto lit;
+      case NODE_STR:
+        goto lit;
+      case NODE_XSTR:
+      lit:
+        return rb_ary_new_from_args(1, node->nd_lit);
+      case NODE_ONCE:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+      case NODE_DSTR:
+        goto dlit;
+      case NODE_DXSTR:
+        goto dlit;
+      case NODE_DREGX:
+        goto dlit;
+      case NODE_DSYM:
+      dlit:
+        return rb_ary_new_from_args(3, node->nd_lit,
+                                    NEW_CHILD(ast, node->nd_next->nd_head),
+                                    NEW_CHILD(ast, node->nd_next->nd_next));
+      case NODE_EVSTR:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+      case NODE_ARGSCAT:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+      case NODE_ARGSPUSH:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+      case NODE_SPLAT:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_head);
+      case NODE_BLOCK_PASS:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+      case NODE_DEFN:
+        return rb_ary_new_from_args(2, ID2SYM(node->nd_mid), NEW_CHILD(ast, node->nd_defn));
+      case NODE_DEFS:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv), ID2SYM(node->nd_mid), NEW_CHILD(ast, node->nd_defn));
+      case NODE_ALIAS:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_1st, node->nd_2nd);
+      case NODE_VALIAS:
+        return rb_ary_new_from_args(2, ID2SYM(node->nd_alias), ID2SYM(node->nd_orig));
+      case NODE_UNDEF:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_undef);
+      case NODE_CLASS:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_cpath, node->nd_super, node->nd_body);
+      case NODE_MODULE:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_cpath, node->nd_body);
+      case NODE_SCLASS:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_recv, node->nd_body);
+      case NODE_COLON2:
+        return rb_ary_new_from_args(2, NEW_CHILD(ast, node->nd_head), ID2SYM(node->nd_mid));
+      case NODE_COLON3:
+        return rb_ary_new_from_args(1, ID2SYM(node->nd_mid));
+      case NODE_DOT2:
+        goto dot;
+      case NODE_DOT3:
+        goto dot;
+      case NODE_FLIP2:
+        goto dot;
+      case NODE_FLIP3:
+      dot:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_beg, node->nd_end);
+      case NODE_SELF:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_NIL:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_TRUE:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_FALSE:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_ERRINFO:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_DEFINED:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_head);
+      case NODE_POSTEXE:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+      case NODE_ATTRASGN:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv), ID2SYM(node->nd_mid), NEW_CHILD(ast, node->nd_args));
+      case NODE_LAMBDA:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+      case NODE_OPT_ARG:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_body, node->nd_next);
+      case NODE_KW_ARG:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_body, node->nd_next);
+      case NODE_POSTARG:
+        if (NODE_NAMED_REST_P(node->nd_1st)) {
+            return rb_ary_new_from_node_args(ast, 2, node->nd_1st, node->nd_2nd);
+        }
+        return rb_ary_new_from_args(2, ID2SYM(rb_intern("NODE_SPECIAL_NO_NAME_REST")),
+                                    NEW_CHILD(ast, node->nd_2nd));
+      case NODE_ARGS:
+        {
+            struct rb_args_info *ainfo = node->nd_ainfo;
+            return rb_ary_new_from_args(10,
+                                        INT2NUM(ainfo->pre_args_num),
+                                        NEW_CHILD(ast, ainfo->pre_init),
+                                        NEW_CHILD(ast, ainfo->opt_args),
+                                        var_name(ainfo->first_post_arg),
+                                        INT2NUM(ainfo->post_args_num),
+                                        NEW_CHILD(ast, ainfo->post_init),
+                                        var_name(ainfo->rest_arg),
+                                        (ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast, ainfo->kw_args)),
+                                        (ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast, ainfo->kw_rest_arg)),
+                                        var_name(ainfo->block_arg));
+        }
+      case NODE_SCOPE:
+        {
+            ID *tbl = node->nd_tbl;
+            int i, size = tbl ? (int)*tbl++ : 0;
+            VALUE locals = rb_ary_new_capa(size);
+            for (i = 0; i < size; i++) {
+                rb_ary_push(locals, var_name(tbl[i]));
+            }
+            return rb_ary_new_from_args(3, locals, NEW_CHILD(ast, node->nd_args), NEW_CHILD(ast, node->nd_body));
+        }
+      case NODE_ARYPTN:
+        {
+            struct rb_ary_pattern_info *apinfo = node->nd_apinfo;
+            VALUE rest = NODE_NAMED_REST_P(apinfo->rest_arg) ? NEW_CHILD(ast, apinfo->rest_arg) :
+                                                               ID2SYM(rb_intern("NODE_SPECIAL_NO_NAME_REST"));
+            return rb_ary_new_from_args(4,
+                                        NEW_CHILD(ast, node->nd_pconst),
+                                        NEW_CHILD(ast, apinfo->pre_args),
+                                        rest,
+                                        NEW_CHILD(ast, apinfo->post_args));
+        }
+      case NODE_HSHPTN:
+        {
+            VALUE kwrest = node->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD ? ID2SYM(rb_intern("NODE_SPECIAL_NO_REST_KEYWORD")) :
+                                                                                 NEW_CHILD(ast, node->nd_pkwrestarg);
+
+            return rb_ary_new_from_args(3,
+                                        NEW_CHILD(ast, node->nd_pconst),
+                                        NEW_CHILD(ast, node->nd_pkwargs),
+                                        kwrest);
+        }
+      case NODE_ARGS_AUX:
+      case NODE_LAST:
+        break;
+    }
+
+    rb_bug("node_children: unknown node: %s", ruby_node_name(type));
+}
+
+static VALUE
+ast_node_children(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return node_children(data->ast, data->node);
+}
+
+static VALUE
+ast_node_first_lineno(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return INT2NUM(nd_first_lineno(data->node));
+}
+
+static VALUE
+ast_node_first_column(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return INT2NUM(nd_first_column(data->node));
+}
+
+static VALUE
+ast_node_last_lineno(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return INT2NUM(nd_last_lineno(data->node));
+}
+
+static VALUE
+ast_node_last_column(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return INT2NUM(nd_last_column(data->node));
+}
+
+static VALUE
+ast_node_inspect(rb_execution_context_t *ec, VALUE self)
+{
+    VALUE str;
+    VALUE cname;
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    cname = rb_class_path(rb_obj_class(self));
+    str = rb_str_new2("#<");
+
+    rb_str_append(str, cname);
+    rb_str_catf(str, ":%s@%d:%d-%d:%d>",
+                node_type_to_str(data->node),
+                nd_first_lineno(data->node), nd_first_column(data->node),
+                nd_last_lineno(data->node), nd_last_column(data->node));
+
+    return str;
+}
+
+#include "ast.rbinc"
+
+void
+Init_ast(void)
+{
+    rb_mAST = rb_define_module_under(rb_cRubyVM, "AbstractSyntaxTree");
+    rb_cNode = rb_define_class_under(rb_mAST, "Node", rb_cObject);
+    rb_undef_alloc_func(rb_cNode);
+
+    load_ast();
+}
diff --git a/ast.rb b/ast.rb
new file mode 100644
index 0000000000..1fedf76649
--- /dev/null
+++ b/ast.rb
@@ -0,0 +1,144 @@
+# for ast.c
+
+class RubyVM
+
+  # AbstractSyntaxTree provides methods to parse Ruby code into
+  # abstract syntax trees. The nodes in the tree
+  # are instances of RubyVM::AbstractSyntaxTree::Node.
+  #
+  # This class is MRI specific as it exposes implementation details
+  # of the MRI abstract syntax tree.
+  #
+  # This class is experimental and its API is not stable, therefore it might
+  # change without notice. As examples, the order of children nodes is not
+  # guaranteed, the number of children nodes might change, there is no way to
+  # access children nodes by name, etc.
+  #
+  # If you are looking for a stable API or an API working under multiple Ruby
+  # implementations, consider using the _parser_ gem or Ripper. If you would
+  # like to make RubyVM::AbstractSyntaxTree stable, please join the discussion
+  # at https://bugs.ruby-lang.org/issues/14844.
+  #
+  module AbstractSyntaxTree
+
+    #  call-seq:
+    #     RubyVM::AbstractSyntaxTree.parse(string) -> RubyVM::AbstractSyntaxTree::Node
+    #
+    #  Parses the given _string_ into an abstract syntax tree,
+    #  returning the root node of that tree.
+    #
+    #  SyntaxError is raised if the given _string_ is invalid syntax.
+    #
+    #    RubyVM::AbstractSyntaxTree.parse("x = 1 + 2")
+    #    # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-1:9>
+    def self.parse string
+      __builtin_ast_s_parse string
+    end
+
+    #  call-seq:
+    #     RubyVM::AbstractSyntaxTree.parse_file(pathname) -> RubyVM::AbstractSyntaxTree::Node
+    #
+    #   Reads the file from _pathname_, then parses it like ::parse,
+    #   returning the root node of the abstract syntax tree.
+    #
+    #   SyntaxError is raised if _pathname_'s contents are not
+    #   valid Ruby syntax.
+    #
+    #     RubyVM::AbstractSyntaxTree.parse_file("my-app/app.rb")
+    #     # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-31:3>
+    def self.parse_file pathname
+      __builtin_ast_s_parse_file pathname
+    end
+
+    #  call-seq:
+    #     RubyVM::AbstractSyntaxTree.of(proc)   -> RubyVM::AbstractSyntaxTree::Node
+    #     RubyVM::AbstractSyntaxTree.of(method) -> RubyVM::AbstractSyntaxTree::Node
+    #
+    #   Returns AST nodes of the given _proc_ or _method_.
+    #
+    #     RubyVM::AbstractSyntaxTree.of(proc {1 + 2})
+    #     # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:35-1:42>
+    #
+    #     def hello
+    #       puts "hello, world"
+    #     end
+    #
+    #     RubyVM::AbstractSyntaxTree.of(method(:hello))
+    #     # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-3:3>
+    def self.of body
+      __builtin_ast_s_of body
+    end
+
+    # RubyVM::AbstractSyntaxTree::Node instances are created by parse methods in
+    # RubyVM::AbstractSyntaxTree.
+    #
+    # This class is MRI specific.
+    #
+    class Node
+
+      #  call-seq:
+      #     node.type -> symbol
+      #
+      #  Returns the type of this node as a symbol.
+      #
+      #    root = RubyVM::AbstractSyntaxTree.parse("x = 1 + 2")
+      #    root.type # => :SCOPE
+      #    call = root.children[2]
+      #    call.type # => :OPCALL
+      def type
+        __builtin_ast_node_type
+      end
+
+      #  call-seq:
+      #     node.first_lineno -> integer
+      #
+      #  The line number in the source code where this AST's text began.
+      def first_lineno
+        __builtin_ast_node_first_lineno
+      end
+
+      #  call-seq:
+      #     node.first_column -> integer
+      #
+      #  The column number in the source code where this AST's text began.
+      def first_column
+        __builtin_ast_node_first_column
+      end
+
+      #  call-seq:
+      #     node.last_lineno -> integer
+      #
+      #  The line number in the source code where this AST's text ended.
+      def last_lineno
+        __builtin_ast_node_last_lineno
+      end
+
+      #  call-seq:
+      #     node.last_column -> integer
+      #
+      #  The column number in the source code where this AST's text ended.
+      def last_column
+        __builtin_ast_node_last_column
+      end
+
+      #  call-seq:
+      #     node.children -> array
+      #
+      #  Returns AST nodes under this one.  Each kind of node
+      #  has different children, depending on what kind of node it is.
+      #
+      #  The returned array may contain other nodes or <code>nil</code>.
+      def children
+        __builtin_ast_node_children
+      end
+
+      #  call-seq:
+      #     node.inspect -> string
+      #
+      #  Returns debugging information about this node as a string.
+      def inspect
+        __builtin_ast_node_inspect
+      end
+    end
+  end
+end
diff --git a/atomic.h b/atomic.h
deleted file mode 100644
index 5b3fb99024..0000000000
--- a/atomic.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef RUBY_ATOMIC_H
-#define RUBY_ATOMIC_H
-
-#ifdef _WIN32
-#if defined _MSC_VER && _MSC_VER > 1200
-#pragma intrinsic(_InterlockedOr)
-#endif
-typedef LONG rb_atomic_t;
-
-# define ATOMIC_SET(var, val) InterlockedExchange(&(var), (val))
-# define ATOMIC_INC(var) InterlockedIncrement(&(var))
-# define ATOMIC_DEC(var) InterlockedDecrement(&(var))
-#if defined __GNUC__
-# define ATOMIC_OR(var, val) __asm__("lock\n\t" "orl\t%1, %0" : "=m"(var) : "Ir"(val))
-#elif defined _MSC_VER && _MSC_VER <= 1200
-# define ATOMIC_OR(var, val) rb_w32_atomic_or(&(var), (val))
-static inline void
-rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val)
-{
-#ifdef _M_IX86
-    __asm mov eax, var;
-    __asm mov ecx, val;
-    __asm lock or [eax], ecx;
-#else
-#error unsupported architecture
-#endif
-}
-#else
-# define ATOMIC_OR(var, val) _InterlockedOr(&(var), (val))
-#endif
-# define ATOMIC_EXCHANGE(var, val) InterlockedExchange(&(var), (val))
-
-#elif defined HAVE_GCC_ATOMIC_BUILTINS
-/* @shyouhei hack to support atomic operations in case of gcc. Gcc
- * has its own pseudo-insns to support them.  See info, or
- * http://gcc.gnu.org/onlinedocs/gcc/Atomic-Builtins.html */
-
-typedef unsigned int rb_atomic_t; /* Anything OK */
-# define ATOMIC_SET(var, val)  __sync_lock_test_and_set(&(var), (val))
-# define ATOMIC_INC(var) __sync_fetch_and_add(&(var), 1)
-# define ATOMIC_DEC(var) __sync_fetch_and_sub(&(var), 1)
-# define ATOMIC_OR(var, val) __sync_or_and_fetch(&(var), (val))
-# define ATOMIC_EXCHANGE(var, val) __sync_lock_test_and_set(&(var), (val))
-
-#else
-typedef int rb_atomic_t;
-extern rb_atomic_t ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val);
-
-# define ATOMIC_SET(var, val) ((var) = (val))
-# define ATOMIC_INC(var) (++(var))
-# define ATOMIC_DEC(var) (--(var))
-# define ATOMIC_OR(var, val) ((var) |= (val))
-# define ATOMIC_EXCHANGE(var, val) ruby_atomic_exchange(&(var), (val))
-#endif
-
-#endif /* RUBY_ATOMIC_H */
diff --git a/basictest/runner.rb b/basictest/runner.rb
new file mode 100755
index 0000000000..0f398e7acc
--- /dev/null
+++ b/basictest/runner.rb
@@ -0,0 +1,33 @@
+#! ./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
new file mode 100755
index 0000000000..25a4298234
--- /dev/null
+++ b/basictest/test.rb
@@ -0,0 +1,2360 @@
+#! /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__, "../tool/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"
+
+# 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 assignment
+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/bcc32/Makefile.sub b/bcc32/Makefile.sub
deleted file mode 100644
index 1cd26a8643..0000000000
--- a/bcc32/Makefile.sub
+++ /dev/null
@@ -1,617 +0,0 @@
-# -*- makefile -*-
-
-SHELL = $(COMSPEC)
-MKFILES = Makefile
-
-!ifndef MFLAGS
-MFLAGS=-
-!endif
-
-#### Start of system configuration section. ####
-!ifndef OS
-OS = bccwin32
-!endif
-!if !defined(RT)
-!error RT not defined.  Retry from configure pass.
-!endif
-
-arch = $(ARCH)-$(OS)
-
-## variables may be overridden by $(compile_dir)/Makefile
-!ifndef srcdir
-srcdir = ..
-!endif
-!ifndef RUBY_INSTALL_NAME
-RUBY_INSTALL_NAME = ruby
-!endif
-!ifndef RUBYW_INSTALL_NAME
-RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
-!elif "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
-RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
-!endif
-!if "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
-RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
-!endif
-!ifndef RUBY_SO_NAME
-RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY)
-!endif
-!ifndef icondirs
-!ifdef ICONDIRS
-icondirs=$(ICONDIRS)
-!endif
-!endif
-!ifdef icondirs
-icondirs=$(icondirs:\=/)
-iconinc=-I$(icondirs: = -I)
-!endif
-###############
-
-.SUFFIXES: .y
-
-!ifndef CC
-CC = bcc32
-!endif
-!ifndef CPP
-CPP = cpp32
-!endif
-!ifndef RC
-RC = brcc32
-!endif
-!ifndef YACC
-YACC = bison
-!endif
-!ifndef AR
-AR = tlib
-!endif
-!ifndef BASERUBY
-BASERUBY = ruby
-!endif
-
-PURIFY =
-AUTOCONF = autoconf
-IFCHANGE = $(srcdir:/=\)\win32\ifchange.bat
-RM = $(srcdir:/=\)\win32\rm.bat
-CP = copy > nul
-MV = move > nul
-
-!if !defined(PROCESSOR_ARCHITECTURE)
-PROCESSOR_ARCHITECTURE = x86
-!endif
-MACHINE = $(PROCESSOR_ARCHITECTURE)
-!if "$(PROCESSOR_ARCHITECTURE)" == "x86"
-!ifndef PROCESSOR_LEVEL
-PROCESSOR_LEVEL = 5
-!endif
-!if 6 < $(PROCESSOR_LEVEL)
-PROCESSOR_LEVEL = 6
-!endif
-PROCESSOR_FLAG = -$(PROCESSOR_LEVEL)
-CPU = i$(PROCESSOR_LEVEL)86
-ARCH = i386
-!else
-CPU = $(PROCESSOR_ARCHITECTURE)
-ARCH = $(PROCESSOR_ARCHITECTURE)
-!endif
-!ifndef DEBUGFLAGS
-DEBUGFLAGS = 
-!endif
-!ifndef OPTFLAGS
-OPTFLAGS = -O
-!endif
-
-!ifndef prefix
-prefix = /usr
-!endif
-!ifndef exec_prefix
-exec_prefix = $(prefix)
-!endif
-!ifndef libdir
-libdir = $(exec_prefix)/lib
-!endif
-!if !defined(datadir)
-datadir = $(prefix)/share
-!endif
-!ifndef EXTOUT
-EXTOUT = .ext
-!endif
-!ifndef TESTUI
-TESTUI = console
-!endif
-!ifndef TESTS
-TESTS =
-!endif
-!ifndef RDOCTARGET
-RDOCTARGET = install-doc
-!endif
-
-OUTFLAG       = -o
-COUTFLAG      = -o
-!ifndef CFLAGS
-CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
-!endif
-!ifndef DEFS
-DEFS =
-!endif
-!ifndef CPPFLAGS
-CPPFLAGS =
-!endif
-CPPFLAGS = $(DEFS) $(CPPFLAGS)
-!ifndef CXXFLAGS
-CXXFLAGS = $(CFLAGS)
-!endif
-!ifndef LDFLAGS
-LDFLAGS = -S:$(STACK)
-!endif
-!ifndef RFLAGS
-RFLAGS = $(iconinc)
-!endif
-!ifndef EXTLIBS
-EXTLIBS =
-!endif
-!ifndef MEMLIB
-MEMLIB =
-!endif
-LIBS = $(MEMLIB) cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
-MISSING = acosh.obj cbrt.obj crypt.obj erf.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32.obj
-
-!ifndef STACK
-STACK = 0x2000000
-!endif
-
-XCFLAGS = -DRUBY_EXPORT -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing
-
-ARFLAGS = /a /p32
-LD = ilink32 -q -Gn
-LDSHARED  = $(LD)
-XLDFLAGS  = -Tpe c0x32.obj
-WLDFLAGS  = -aa -Tpe c0w32.obj
-DLDFLAGS  = -Tpd c0d32.obj
-LIBRUBY_LDSHARED = $(LDSHARED)
-LIBRUBY_DLDFLAGS = -Gi $(DLDFLAGS) $(EXTLDFLAGS)
-LDOBJECTS = $(MAINOBJ)
-
-SOLIBS = 
-
-EXEEXT = .exe
-PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
-WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
-RUBYDEF = $(RUBY_SO_NAME).def
-MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
-RUNRUBY = .\$(PROGRAM) -i"$(EXTOUT)/$(arch)" "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
-
-ORGLIBPATH = $(LIB)
-
-#### End of system configuration section. ####
-
-LIBRUBY_A     = $(RUBY_SO_NAME)-static.lib
-LIBRUBY_SO    = $(RUBY_SO_NAME).dll
-LIBRUBY       = $(RUBY_SO_NAME).lib
-LIBRUBYARG    = $(LIBRUBY)
-THREAD_MODEL  = win32
-
-PREP          = miniruby$(EXEEXT)
-
-OBJEXT        = obj
-ASMEXT        = asm
-
-INSTALLED_LIST= .installed.list
-
-MKMAIN_CMD    = mkmain.bat
-
-SRC_FILE      = $(<:\=/)
-
-WINMAINOBJ    = winmain.$(OBJEXT)
-ARCHMINIOBJS  = dmydln.$(OBJEXT)
-
-arch_hdrdir = $(EXTOUT)/include/$(arch)
-hdrdir = $(srcdir)/include
-VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/enc;$(srcdir)/missing;$(srcdir)/win32
-
-.path.c = .;$(srcdir);$(srcdir)/enc;$(srcdir)/win32;$(srcdir)/missing
-.path.ci = $(srcdir)
-.path.inc = .;$(srcdir)
-.path.def = .;$(srcdir)
-.path.h = .;$(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
-.path.y = $(srcdir)
-.path. = $(srcdir)
-
-.c.obj:
-	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:/=\)
-
-.c.asm:
-	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) $(COUTFLAG)$@ -S $(<:\=/)
-
-.rc.res:
-	$(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:/=\)
-
-all: $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
-
-ruby: $(PROGRAM)
-rubyw: $(WPROGRAM)
-
-!include $(srcdir)/common.mk
-
-$(MKFILES): $(srcdir)/bcc32/Makefile.sub $(srcdir)/bcc32/configure.bat $(srcdir)/bcc32/setup.mak
-	$(COMSPEC) /C $(srcdir:/=\)\bcc32\configure.bat $(configure_args)
-	@echo $(MKFILES) should be updated, re-run $(MAKE).
-	@$(MAKE) > nul -q -f &&|
-PHONY: nul
-	@exit
-|
-
-PHONY: nul
-
-RUBY_CONFIG_H = $(arch_hdrdir)/ruby/config.h
-CONFIG_H = ./.config.h.time
-
-config: config.status
-
-config.status: $(CONFIG_H)
-
-guard = INCLUDE_RUBY_CONFIG_H
-
-$(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
-	@if not exist $(arch_hdrdir:/=\) md $(arch_hdrdir:/=\)
-	@if not exist $(arch_hdrdir:/=\)\ruby md $(arch_hdrdir:/=\)\ruby
-	@$(IFCHANGE) $(RUBY_CONFIG_H:/=\) &&|
-\#ifndef $(guard)
-\#define $(guard) 1
-\#define NO_BIG_INLINE 1
-\#define HAVE_SYS_TYPES_H 1
-\#define HAVE_SYS_STAT_H 1
-\#define HAVE_STDLIB_H 1
-\#define HAVE_STRING_H 1
-\#define HAVE_MEMORY_H 1
-\#define HAVE_LONG_LONG 1
-\#define HAVE_OFF_T 1
-\#define SIZEOF_INT 4
-\#define SIZEOF_SHORT 2
-\#define SIZEOF_LONG 4
-\#define SIZEOF_LONG_LONG 0
-\#define SIZEOF___INT64 8
-\#define SIZEOF_OFF_T 8
-\#define SIZEOF_VOIDP 4
-\#define SIZEOF_FLOAT 4
-\#define SIZEOF_DOUBLE 8
-\#define SIZEOF_TIME_T 4
-\#define SIZEOF_RLIM_T 0
-\#define SIZEOF_SIZE_T 4
-\#define SIZEOF_PTRDIFF_T 4
-\#define HAVE_PROTOTYPES 1
-\#define TOKEN_PASTE(x,y) x\#\#y
-\#define HAVE_STDARG_PROTOTYPES 1
-\#define NORETURN(x) x
-\#define RUBY_EXTERN extern __declspec(dllimport)
-\#define HAVE_DECL_SYS_NERR 1
-\#define HAVE_LIMITS_H 1
-\#define HAVE_FCNTL_H 1
-\#define HAVE_UTIME_H 1
-\#define HAVE_FLOAT_H 1
-\#define rb_uid_t uid_t
-\#define rb_gid_t gid_t
-\#define rb_pid_t int
-\#define HAVE_STRUCT_STAT_ST_RDEV 1
-\#define HAVE_ST_RDEV 1
-!if $(BORLANDC) < 0x0580
-\#define int8_t signed char
-\#define uint8_t unsigned char
-\#define int16_t short
-\#define uint16_t unsigned short
-\#define int32_t int
-\#define uint32_t unsigned int
-\#define int64_t __int64
-\#define uint64_t unsigned __int64
-\#define ssize_t int
-!endif
-\#define HAVE_INT8_T 1
-\#define HAVE_UINT8_T 1
-\#define SIZEOF_INT8_T 1
-\#define HAVE_INT16_T 1
-\#define HAVE_UINT16_T 1
-\#define SIZEOF_INT32_T 2
-\#define HAVE_INT32_T 1
-\#define HAVE_UINT32_T 1
-\#define SIZEOF_INT32_T 4
-\#define HAVE_INT64_T 1
-\#define HAVE_UINT64_T 1
-\#define SIZEOF_INT64_T 8
-\#define HAVE_INTPTR_T 1
-\#define HAVE_UINTPTR_T 1
-\#define HAVE_SSIZE_T 1
-\#define GETGROUPS_T int
-\#define RETSIGTYPE void
-\#define HAVE_ALLOCA 1
-\#define HAVE_DUP2 1
-\#define HAVE_MEMMOVE 1
-\#define HAVE_MKDIR 1
-\#define HAVE_STRCASECMP 1
-\#define HAVE_STRNCASECMP 1
-\#define HAVE_STRERROR 1
-\#define HAVE_STRFTIME 1
-\#define HAVE_STRCHR 1
-\#define HAVE_STRSTR 1
-\#define HAVE_STRTOD 1
-\#define HAVE_STRTOL 1
-\#define HAVE_STRTOUL 1
-\#define HAVE_SNPRINTF 1
-\#define HAVE_VSNPRINTF 1
-\#define HAVE_ISNAN 1
-\#define HAVE_FINITE 1
-\#define HAVE_HYPOT 1
-\#define HAVE_FMOD 1
-\#define HAVE_WAITPID 1
-\#define HAVE_FSYNC 1
-\#define HAVE_GETCWD 1
-\#define HAVE_TRUNCATE 1
-\#define HAVE_FTRUNCATE 1
-\#define HAVE_FSEEKO 1
-\#define HAVE_FTELLO 1
-\#define HAVE_TIMES 1
-\#define HAVE_FCNTL 1
-\#define HAVE_LINK 1
-\#define HAVE_TELLDIR 1
-\#define HAVE_SEEKDIR 1
-\#define HAVE_COSH 1
-\#define HAVE_SINH 1
-\#define HAVE_TANH 1
-\#define RSHIFT(x,y) ((x)>>(int)y)
-\#define FILE_COUNT level
-\#define FILE_READPTR curp
-\#define RUBY_SETJMP(env) setjmp(env)
-\#define RUBY_LONGJMP(env,val) longjmp(env,val)
-\#define RUBY_JMP_BUF jmp_buf
-\#define inline __inline
-\#define NEED_IO_SEEK_BETWEEN_RW 1
-\#define STACK_GROW_DIRECTION -1
-\#define DEFAULT_KCODE KCODE_NONE
-\#define LOAD_RELATIVE 1
-\#define DLEXT ".so"
-\#define RUBY_LIB_PREFIX "/lib/ruby"
-\#define RUBY_PLATFORM "$(ARCH)-$(OS)"
-\#endif /* $(guard) */
-|
-	@exit > $(@:/=\)
-
-config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
-	@echo Creating $@
-	@type > $@ &&|
-# Generated automatically by Makefile.sub.
-s,@SHELL@,$$(COMSPEC),;t t
-s,@BUILD_FILE_SEPARATOR@,\,;t t
-s,@PATH_SEPARATOR@,;,;t t
-s,@CFLAGS@,$(CFLAGS),;t t
-s,@DEFS@,$(DEFS),;t t
-s,@CPPFLAGS@,$(CPPFLAGS),;t t
-s,@CXXFLAGS@,$(CXXFLAGS),;t t
-s,@FFLAGS@,$(FFLAGS),;t t
-s,@LDFLAGS@,,;t t
-s,@LIBS@,$(LIBS),;t t
-s,@exec_prefix@,$${prefix},;t t
-s,@prefix@,$(prefix),;t t
-s,@program_transform_name@,s,,,,;t t
-s,@bindir@,$${exec_prefix}/bin,;t t
-s,@sbindir@,$${exec_prefix}/sbin,;t t
-s,@libexecdir@,$${exec_prefix}/libexec,;t t
-s,@datadir@,$${prefix}/share,;t t
-s,@sysconfdir@,$${prefix}/etc,;t t
-s,@sharedstatedir@,/etc,;t t
-s,@localstatedir@,/var,;t t
-s,@libdir@,$${exec_prefix}/lib,;t t
-s,@includedir@,$${prefix}/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,$${prefix}/info,;t t
-s,@mandir@,$${prefix}/man,;t t
-s,@ridir@,$${prefix}/share/ri,;t t
-s,@build@,$(CPU)-pc-$(OS),;t t
-s,@build_alias@,$(CPU)-$(OS),;t t
-s,@build_cpu@,$(CPU),;t t
-s,@build_vendor@,pc,;t t
-s,@build_os@,$(OS),;t t
-s,@host@,$(CPU)-pc-$(OS),;t t
-s,@host_alias@,$(CPU)-$(OS),;t t
-s,@host_cpu@,$(CPU),;t t
-s,@host_vendor@,pc,;t t
-s,@host_os@,$(OS),;t t
-s,@target@,$(ARCH)-pc-$(OS),;t t
-s,@target_alias@,$(ARCH)-$(OS),;t t
-s,@target_cpu@,$(ARCH),;t t
-s,@target_vendor@,pc,;t t
-s,@target_os@,$(OS),;t t
-s,@CC@,$(CC),;t t
-s,@CPP@,cpp32,;t t
-s,@CXX@,$$(CC),;t t
-s,@LD@,$(LD),;t t
-s,@YACC@,$(YACC),;t t
-s,@RANLIB@,,;t t
-s,@AR@,$(AR),;t t
-s,@ARFLAGS@,$(ARFLAGS) ,;t t
-s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
-s,@RM@,$$(top_srcdir:/=\)\win32\rm.bat,;t t
-s,@CP@,copy > nul,;t t
-s,@LIBOBJS@, $(MISSING),;t t
-s,@ALLOCA@,$(ALLOCA),;t t
-s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
-s,@EXEEXT@,.exe,;t t
-s,@OBJEXT@,obj,;t t
-s,@XCFLAGS@,$(XCFLAGS),;t t
-s,@XLDFLAGS@,$(XLDFLAGS),;t t
-s,@DLDFLAGS@,$(DLDFLAGS),;t t
-s,@ARCH_FLAG@,$(ARCH_FLAG),;t t
-s,@STATIC@,$(STATIC),;t t
-s,@CCDLFLAGS@,,;t t
-s,@LDSHARED@,$(LDSHARED),;t t
-s,@DLEXT@,so,;t t
-s,@LIBEXT@,lib,;t t
-s,@STRIP@,$(STRIP),;t t
-s,@EXTSTATIC@,$(EXTSTATIC),;t t
-s,@setup@,Setup,;t t
-s,@MINIRUBY@,$(MINIRUBY),;t t
-s,@PREP@,miniruby$(EXEEXT),;t t
-s,@RUNRUBY@,$(RUNRUBY),;t t
-s,@EXTOUT@,$(EXTOUT),;t t
-s,@ARCHFILE@,,;t t
-s,@RDOCTARGET@,,;t t
-s,@LIBRUBY_LDSHARED@,$$(LDSHARED),;t t
-s,@LIBRUBY_DLDFLAGS@,-Gi $$(DLDFLAGS),;t t
-s,@RUBY_INSTALL_NAME@,$(RUBY_INSTALL_NAME),;t t
-s,@rubyw_install_name@,$(RUBYW_INSTALL_NAME),;t t
-s,@RUBYW_INSTALL_NAME@,$(RUBYW_INSTALL_NAME),;t t
-s,@RUBY_SO_NAME@,$(RUBY_SO_NAME),;t t
-s,@LIBRUBY_A@,$$(RUBY_SO_NAME)-static.lib,;t t
-s,@LIBRUBY_SO@,$$(RUBY_SO_NAME).dll,;t t
-s,@LIBRUBY_ALIASES@,$(LIBRUBY_ALIASES),;t t
-s,@LIBRUBY@,$$(RUBY_SO_NAME).lib,;t t
-s,@LIBRUBYARG@,$$(LIBRUBYARG_SHARED),;t t
-s,@LIBRUBYARG_STATIC@,$$(LIBRUBY_A),;t t
-s,@LIBRUBYARG_SHARED@,$$(LIBRUBY),;t t
-s,@SOLIBS@,$(SOLIBS),;t t
-s,@DLDLIBS@,$(DLDLIBS),;t t
-s,@ENABLE_SHARED@,yes,;t t
-s,@OUTFLAG@,$(OUTFLAG),;t t
-s,@COUTFLAG@,$(COUTFLAG),;t t
-s,@CPPOUTFILE@,,;t t
-s,@LIBPATHFLAG@, -L"%s",;t t
-s,@RPATHFLAG@,,;t t
-s,@LIBARG@,%s.lib,;t t
-s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS:/=\), $$(@:/=\), nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE:/=\), $$(RESFILE:/=\),;t t
-s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) $(COUTFLAG)$$(@) -c $$(<:/=\),;t t
-s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P $(COUTFLAG)$$(@) -c $$(<:/=\),;t t
-s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t
-s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t
-s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t
-s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN WIN32,;t t
-s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
-s,@cleanlibs@,$$*.tds,;t t
-s,@cleanobjs@,$$*-$$(arch).def $$*.il? $$*.lib,;t t
-s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t
-s,@EXPORT_PREFIX@,_,;t t
-s,@arch@,$(ARCH)-$(OS),;t t
-s,@sitearch@,$(ARCH)-$(OS),;t t
-s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
-s,@vendordir@,$${prefix}/lib/ruby/vendor_ruby,;t t
-s,@rubyhdrdir@,$$(includedir)/ruby-$$(MAJOR).$$(MINOR).$$(TEENY),;t t
-s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
-s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t
-s,@configure_args@,--enable-shared $(configure_args),;t t
-s,@configure_input@,$$configure_input,;t t
-s,@srcdir@,$(srcdir),;t t
-s,@top_srcdir@,$(srcdir),;t t
-|
-
-miniruby$(EXEEXT):
-		@echo $(LIBS)
-		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS:/=\) $(DMYEXT),$@,nul,$(LIBS)
-
-$(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
-		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBY_INSTALL_NAME).res
-
-$(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
-		$(LD) $(LDFLAGS) $(WLDFLAGS) $(MAINOBJ) $(WINMAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBYW_INSTALL_NAME).res
-
-$(LIBRUBY_A):	$(OBJS) $(DMYEXT)
-		@-if exist $@ del $@
-		$(AR) $(ARFLAGS) "$@" $(OBJS) $(DMYEXT)
-
-# $(LIBRUBY):	$(LIBRUBY_SO)
-#		implib $@ $(LIBRUBY_SO)
-
-$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
-		@echo $(DLDOBJS)
-		@$(PRE_LIBRUBY_UPDATE)
-		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
-
-$(LIBRUBY): $(LIBRUBY_SO)
-
-$(RUBYDEF):	$(LIBRUBY_A) $(PREP)
-		$(MINIRUBY) $(srcdir)/bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A)
-
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb $(srcdir)/revision.h $(srcdir)/win32/resource.rb
-		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
-			-ruby_name=$(RUBY_INSTALL_NAME) \
-			-rubyw_name=$(RUBYW_INSTALL_NAME) \
-			-so_name=$(RUBY_SO_NAME) \
-			. $(icondirs) $(srcdir)/win32
-
-lex.c: {$(srcdir)}lex.c.blt
-	copy "$(?:/=\)" $@
-
-post-install-bin::
-	@$(NULLCMD)
-post-install-lib::
-	@$(NULLCMD)
-post-install-ext-comm::
-	@$(NULLCMD)
-post-install-ext-arch::
-	@$(NULLCMD)
-post-install-man::
-	@$(NULLCMD)
-post-install-doc::
-	@$(NULLCMD)
-
-clean-local::
-		@$(RM) $(WINMAINOBJ) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib
-		@$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
-		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) ext\ripper\y.output
-
-distclean-local::
-		@$(RM) ext\config.cache $(RBCONFIG:/=\)
-		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
-
-clean-ext distclean-ext realclean-ext::
-		@for /R ext %I in (.) do @if exist %I\Makefile ( \
-		    echo $(@:-ext=)ing %~nI & \
-		    cd %I & \
-		    $(MAKE) $(MFLAGS) $(@:-ext=) & \
-		    cd %CD% \
-		)
-
-ext/extinit.obj: ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
-
-main.$(OBJEXT): win32.h
-ascii.$(OBJEXT): win32.h
-array.$(OBJEXT): win32.h
-bignum.$(OBJEXT): win32.h
-class.$(OBJEXT): win32.h
-compar.$(OBJEXT): win32.h
-dir.$(OBJEXT): dir.h win32.h
-dln.$(OBJEXT): win32.h
-enum.$(OBJEXT): win32.h
-error.$(OBJEXT): win32.h
-euc_jp.$(OBJEXT): win32.h
-eval.$(OBJEXT): win32.h
-file.$(OBJEXT): win32.h
-gc.$(OBJEXT): win32.h
-hash.$(OBJEXT): win32.h
-inits.$(OBJEXT): win32.h
-io.$(OBJEXT): win32.h
-marshal.$(OBJEXT): win32.h
-math.$(OBJEXT): win32.h
-numeric.$(OBJEXT): win32.h
-object.$(OBJEXT): win32.h
-pack.$(OBJEXT): win32.h
-parse.$(OBJEXT): win32.h
-process.$(OBJEXT): win32.h
-prec.$(OBJEXT): win32.h
-random.$(OBJEXT): win32.h
-range.$(OBJEXT): win32.h
-re.$(OBJEXT): win32.h
-regcomp.$(OBJEXT): win32.h
-regenc.$(OBJEXT): win32.h
-regerror.$(OBJEXT): win32.h
-regexec.$(OBJEXT): win32.h
-reggnu.$(OBJEXT): win32.h
-regparse.$(OBJEXT): win32.h
-ruby.$(OBJEXT): win32.h
-signal.$(OBJEXT): win32.h
-sjis.$(OBJEXT): win32.h
-sprintf.$(OBJEXT): win32.h
-st.$(OBJEXT): win32.h
-string.$(OBJEXT): win32.h
-struct.$(OBJEXT): win32.h
-time.$(OBJEXT): win32.h
-utf_8.$(OBJEXT): win32.h
-util.$(OBJEXT): win32.h
-variable.$(OBJEXT): win32.h
-version.$(OBJEXT): win32.h
diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32
deleted file mode 100644
index cd33eec0a1..0000000000
--- a/bcc32/README.bcc32
+++ /dev/null
@@ -1,130 +0,0 @@
-=begin
-
-= How to build ruby using Borland C++
-
-== Requirement
-
-(1) Borland C++ 5.0 or later.
-
-(2) Please set environment variable (({PATH}))
-    to run required commands properly from the command line.
-
-    Note: building ruby requires following commands.
-     * make
-     * bcc32
-     * tlib
-     * ilink32
-
-(3) If you want to build from CVS source, following commands are required.
-     * bison ((<URL:http://gnuwin32.sourceforge.net/packages/bison.htm>))
-     * sed   ((<URL:http://gnuwin32.sourceforge.net/packages/sed.htm>))
-
-(4) We strongly recommend to build ruby on C++Builder, to link following files.
-     * usebormm.lib
-     * memmgr.lib
-
-    RTL's internal memory manager cannot handle large memory block properly,
-    so we should use borlndmm.dll instead.
-     10000.times { "" << "." * 529671; GC.start } # crash
-
-== How to compile and install
-
-(1) Execute bcc32\configure.bat on your build directory.
-     ex. c:\src\ruby> bcc32\configure.bat
-    You can specify the target platform as an argument.
-    For example, run `((%configure i686-bccwin32%))'
-    You can also specify the install directory.
-    For example, run `((%configure --prefix=<install_directory>%))'
-    Default of the install directory is /usr .
-    The default ((|<PLATFORM>|)) is `(({i386-bccwin32}))'.
-     
-(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
-    if you want to change the name of the executable files. 
-    And add ((|RUBYW_INSTALL_NAME|)) to change the name of the
-    executable without console window if also you want.
-
-(3) Run `((%make%))'
-
-(4) Run `((%make test%))'
-
-(5) Run `((%make install%))'
-
-(6) Requires dynamic RTL (cc3250.dll on C++Builder5) and borlndmm.dll (If built with
-    usebormm.lib) to use installed binary. These files are ordinary in bcc32's bin
-    directory.
-
-== Icons
-
-Any icon files(*.ico) in the build directory, directories specified with
-((|icondirs|)) make variable and (({win32})) directory under the ruby
-source directory will be included in DLL or executable files, according
-to their base names.
-    $(RUBY_INSTALL_NAME).ico or ruby.ico   --> $(RUBY_INSTALL_NAME).exe
-    $(RUBYW_INSTALL_NAME).ico or rubyw.ico --> $(RUBYW_INSTALL_NAME).exe
-    the others                             --> $(RUBY_SO_NAME).dll
-
-Although no icons are distributed with the ruby source or in the official 
-site, you can use anything you like. For example, followings are written 
-in Japanese, but you can download at least.
-
-* ((<URL:http://member.nifty.ne.jp/ueivu/rubyico.html>)) or
-  ((<zipped icons|URL:http://member.nifty.ne.jp/ueivu/Ruby_ico.zip>))
-* ((<URL:http://homepage1.nifty.com/a_nakata/ruby/>)) or
-  ((<icon itself|URL:http://homepage1.nifty.com/a_nakata/ruby/RubyIcon.ico>))
-
-== Build examples
-
-* Build on the ruby source directory.
-
-  ex.)
-    ruby source directory:  C:\ruby
-    build directory:        C:\ruby
-    install directory:      C:\usr\local
-
-    C:
-    cd \ruby
-    bcc32\configure --prefix=/usr/local
-    make
-    make test
-    make install
-
-* Build on the relative directory from the ruby source directory and CPU type 
-  i386.
-
-  ex.)
-    ruby source directory:  C:\ruby
-    build directory:        C:\ruby\bccwin32
-    install directory:      C:\usr\local
-    CPU                     i386
-    
-    C:
-    cd \ruby
-    mkdir bccwin32
-    cd bccwin32
-    ..\bcc32\configure --prefix=/usr/local
-    make
-    make test
-    make install
-
-* Build on the different drive.
-
-  ex.)
-    ruby source directory:  C:\src\ruby
-    build directory:        D:\build\ruby
-    install directory:      C:\usr\local
-
-    D:
-    cd D:\build\ruby
-    C:\src\ruby\bcc32\configure --prefix=C:/usr/local
-    make
-    make test
-    make install
-
-== Bugs
-
-You can ((*NOT*)) use a path name contains any white space characters as
-the ruby source directory, this restriction comes from the behavior of
-(({!INCLUDE})) directives of (({MAKE})).
-((- you may call it a bug. -))
-
-=end
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
deleted file mode 100755
index 8cdfc64b03..0000000000
--- a/bcc32/configure.bat
+++ /dev/null
@@ -1,163 +0,0 @@
-@echo off
-::: Don't set environment variable in batch file other than autoexec.bat
-::: to avoid "Out of environment space" problem on Windows 95/98.
-::: set TMPMAKE=~tmp~.mak
-
-echo> ~tmp~.mak ####
-echo>> ~tmp~.mak conf = %0
-echo>> ~tmp~.mak $(conf:\=/): nul
-echo>> ~tmp~.mak 	@del ~setup~.mak
-echo>> ~tmp~.mak 	@-$(MAKE) -l$(MAKEFLAGS) -f $(@D)setup.mak \
-if exist pathlist.tmp del pathlist.tmp
-if exist confargs.mk del confargs.mk
-:loop
-if "%1" == "" goto :end
-if "%1" == "--prefix" goto :prefix
-if "%1" == "prefix" goto :prefix
-if "%1" == "--srcdir" goto :srcdir
-if "%1" == "srcdir" goto :srcdir
-if "%1" == "--target" goto :target
-if "%1" == "target" goto :target
-if "%1" == "--with-static-linked-ext" goto :extstatic
-if "%1" == "--program-suffix" goto :suffix
-if "%1" == "RUBY_SUFFIX" goto :suffix
-if "%1" == "--program-name" goto :installname
-if "%1" == "--install-name" goto :installname
-if "%1" == "RUBY_INSTALL_NAME" goto :installname
-if "%1" == "--so-name" goto :soname
-if "%1" == "RUBY_SO_NAME" goto :soname
-if "%1" == "--enable-install-doc" goto :enable-rdoc
-if "%1" == "--disable-install-doc" goto :disable-rdoc
-if "%1" == "--extout" goto :extout
-if "%1" == "EXTOUT" goto :extout
-if "%1" == "--with-baseruby" goto :baseruby
-if "%1" == "BASERUBY" goto :baseruby
-if "%1" == "--path" goto :path
-if "%1" == "-h" goto :help
-if "%1" == "--help" goto :help
-  echo>>confargs.tmp 	%1 \
-  shift
-goto :loop
-:srcdir
-  echo>> ~tmp~.mak 	-Dsrcdir=%2 \
-  echo>>confargs.tmp 	--srcdir=%2 \
-  shift
-  shift
-goto :loop
-:prefix
-  echo>> ~tmp~.mak 	-Dprefix=%2 \
-  echo>>confargs.tmp 	%1=%2 \
-  shift
-  shift
-goto :loop
-:suffix
-  echo>>confargs.mk !ifndef RUBY_SUFFIX
-  echo>>confargs.mk RUBY_SUFFIX = %2
-  echo>>confargs.mk !endif
-  echo>>confargs.tmp 	%1=%2 \
-  shift
-  shift
-goto :loop
-:installname
-  echo>>confargs.mk !ifndef RUBY_INSTALL_NAME
-  echo>>confargs.mk RUBY_INSTALL_NAME = %2
-  echo>>confargs.mk !endif
-  echo>>confargs.tmp 	%1=%2 \
-  shift
-  shift
-goto :loop
-:soname
-  echo>>confargs.mk !ifndef RUBY_SO_NAME
-  echo>>confargs.mk RUBY_SO_NAME = %2
-  echo>>confargs.mk !endif
-  echo>>confargs.tmp 	%1=%2 \
-  shift
-  shift
-goto :loop
-:target
-  echo>> ~tmp~.mak 	%2 \
-  echo>>confargs.tmp 	--target=%2 \
-  shift
-  shift
-goto :loop
-:extstatic
-  echo>>confargs.mk !ifndef EXTSTATIC
-  echo>>confargs.mk EXTSTATIC = static
-  echo>>confargs.mk !endif
-  echo>>confargs.tmp 	%1 \
-  shift
-goto :loop
-:enable-rdoc
-  echo>>confargs.mk !ifndef RDOCTARGET
-  echo>>confargs.mk RDOCTARGET = install-doc
-  echo>>confargs.mk !endif
-  echo>>confargs.tmp 	%1 \
-  shift
-goto :loop
-:disable-rdoc
-  echo>>confargs.mk !ifndef RDOCTARGET
-  echo>>confargs.mk RDOCTARGET = install-nodoc
-  echo>>confargs.mk !endif
-  echo>>confargs.tmp 	%1 \
-  shift
-goto :loop
-:extout
-  echo>>confargs.mk !ifndef EXTOUT
-  echo>>confargs.mk EXTOUT = %2
-  echo>>confargs.mk !endif
-  echo>>confargs.tmp 	%1=%2 \
-  shift
-  shift
-goto :loop
-:baseruby
-  echo>>confargs.mk !ifndef BASERUBY
-  echo>>confargs.mk BASERUBY = %2
-  echo>>confargs.mk !endif
-  echo>>confargs.tmp 	%1=%2 \
-  shift
-  shift
-goto :loop
-:path
-  echo>>pathlist.tmp %2;\
-  echo>>confargs.tmp 	%1=%2 \
-  shift
-  shift
-goto :loop
-:help
-  echo Configuration:
-  echo   --help                  display this help
-  echo   --srcdir=DIR            find the sources in DIR [configure dir or `..']
-  echo Installation directories:
-  echo   --prefix=PREFIX         install files in PREFIX (ignored currently)
-  echo System types:
-  echo   --target=TARGET         configure for TARGET [i386-bccwin32]
-  echo Optional Package:
-  echo   --with-baseruby=RUBY    use RUBY as baseruby [ruby]
-  echo   --with-static-linked-ext link external modules statically
-  echo   --enable-install-doc    install rdoc indexes during install
-  del *.tmp
-  del ~tmp~.mak
-goto :exit
-:end
-echo>> ~tmp~.mak 	-Dbcc32dir=$(@D)
-if not exist confargs.tmp goto :noconfargs
-    echo>>confargs.mk configure_args = \
-    type>>confargs.mk confargs.tmp
-    echo.>>confargs.mk
-    echo>>confargs.mk ####
-:noconfargs
-if not exist pathlist.tmp goto :nopathlist
-    echo>>confargs.mk pathlist = \
-    type>>confargs.mk pathlist.tmp
-    echo.>>confargs.mk
-    echo>>confargs.mk ####
-    echo>>confargs.mk PATH = $(pathlist:;=/bin;)$(PATH)
-    echo>>confargs.mk INCLUDE = $(pathlist:;=/include;)
-    echo>>confargs.mk LIB = $(pathlist:;=/lib;)
-:nopathlist
-if exist confargs.mk copy confargs.mk ~setup~.mak > nul
-type>>~setup~.mak ~tmp~.mak
-del *.tmp > nul
-del ~tmp~.mak > nul
-make -s -f ~setup~.mak
-:exit
diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb
deleted file mode 100755
index 888ab2e2a6..0000000000
--- a/bcc32/mkexports.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#!./miniruby -s
-
-$:.unshift(File.expand_path("../..", __FILE__))
-require 'win32/mkexports'
-
-class Exports::Bcc < Exports
-  def forwarding(internal, export)
-    internal[/\A_?/]+export
-  end
-
-  def each_line(objs, &block)
-    objs.each do |obj|
-      opt = /\.(?:so|dll)\z/i =~ obj ? "-ee" : "-oiPUBDEF -oiPUBD32"
-      IO.foreach("|tdump -q #{opt} #{obj.tr('/', '\\')} < nul", &block)
-    end
-  end
-
-  def each_export(objs)
-    objdump(objs) do |l|
-      next unless /(?:PUBDEF|PUBD32|EXPORT)/ =~ l
-      yield $1 if /'(.*?)'/ =~ l
-    end
-    yield "_strcasecmp", "_stricmp"
-    yield "_strncasecmp", "_strnicmp"
-  end
-end
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
deleted file mode 100644
index df2fd3c128..0000000000
--- a/bcc32/setup.mak
+++ /dev/null
@@ -1,179 +0,0 @@
-# -*- makefile -*-
-
-!if "$(srcdir)" != ""
-bcc32dir = $(srcdir)/bcc32
-!elseif "$(bcc32dir)" == "bcc32/"
-srcdir = .
-!elseif "$(bcc32dir:/bcc32/=)/bcc32/" == "$(bcc32dir)"
-srcdir = $(bcc32dir:/bcc32/=)
-!else
-srcdir = $(bcc32dir)/..
-!endif
-!ifndef prefix
-prefix = /usr
-!endif
-OS = bccwin32
-RT = $(OS)
-BANG = !
-APPEND = echo.>>$(MAKEFILE)
-!ifdef MAKEFILE
-MAKE = $(MAKE) -f $(MAKEFILE)
-!else
-MAKEFILE = Makefile
-!endif
-
-all: Makefile
-Makefile: -prologue- -generic- -epilogue-
-i386-$(OS): -prologue- -i386- -epilogue-
-i486-$(OS): -prologue- -i486- -epilogue-
-i586-$(OS): -prologue- -i586- -epilogue-
-i686-$(OS): -prologue- -i686- -epilogue-
-alpha-$(OS): -prologue- -alpha- -epilogue-
-
--prologue-: -basic-vars- -version- -system-vars-
-
--basic-vars-: nul
-	@echo Creating $(MAKEFILE)
-	@type > $(MAKEFILE) &&|
-\#\#\# Makefile for ruby $(OS) \#\#\#
-$(BANG)ifndef srcdir
-srcdir = $(srcdir:\=/)
-$(BANG)endif
-$(BANG)ifndef prefix
-prefix = $(prefix:\=/)
-$(BANG)endif
-$(BANG)if !defined(BASERUBY)
-!if defined(BASERUBY)
-BASERUBY = $(BASERUBY)
-!endif
-|
-!if !defined(BASERUBY)
-	@for %I in (ruby.exe) do @echo BASERUBY = "%~$$PATH:I" >> $(MAKEFILE)
-!endif
-	@type >> $(MAKEFILE) &&|
-$(BANG)endif
-|
-!if exist(confargs.mk)
-	@type confargs.mk >> $(MAKEFILE)
-	@del confargs.mk
-!endif
-
--system-vars-: -runtime- -bormm-
-
--bormm-: nul
-	@-ilink32 -q -Gn -x usebormm.lib > nul
-	@-if exist usebormm.tds $(APPEND) MEMLIB = usebormm.lib
-	@if exist usebormm.* del usebormm.*
-
--osname-: nul
-	@echo OS =  >>$(MAKEFILE)
-
--runtime-: nul
-	type > conftest.c &&|
-\#include <stdio.h>
-int main(){printf("");return 0;}
-|
-	bcc32 conftest.c cw32i.lib > nul
-	tdump conftest.exe < nul > conftest.i
-	grep "^Imports from CC" conftest.i > conftest.c
-	cpp32 -P- -DFile=\# -DImports=RTNAME -Dfrom== conftest.c > nul
-	$(MAKE) > nul -DBANG=$(BANG) -f &&|
--runtime-: nul
-$(BANG)include conftest.i
-RT = $$(RTNAME:.DLL=)
-OS = $$(RT:CC32=)
--runtime-:
-	del conftest.*
-$(BANG)if "$$(OS)" == "50"
-	echo OS = bccwin32 >> $(MAKEFILE)
-$(BANG)else
-	echo OS = bccwin32_$$(OS) >> $(MAKEFILE)
-$(BANG)endif
-|
-	@echo RT = $$(OS) >> $(MAKEFILE)
-
--version-: nul
-	@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
-\#define RUBY_REVISION 0
-\#include "version.h"
-MAJOR = RUBY_API_VERSION_MAJOR
-MINOR = RUBY_API_VERSION_MINOR
-TEENY = RUBY_API_VERSION_TEENY
-
-BORLANDC = __BORLANDC__
-|
-	@$(MAKE) > nul -DBANG=$(BANG) -f &&,
--version-: nul
-$(BANG)include $(MAKEFILE)
-$(BANG)include $(MAKEFILE).i
--version-:
-	@del $(MAKEFILE).i
-	@type >> $(MAKEFILE) &&|
-MAJOR = $$(MAJOR)
-MINOR = $$(MINOR)
-TEENY = $$(TEENY)
-BORLANDC = $$(BORLANDC)
-|
-,
-
--generic-: nul
-!if defined(PROCESSOR_ARCHITECTURE) ||  defined(PROCESSOR_LEVEL)
-	@type >> $(MAKEFILE) &&|
-!if defined(PROCESSOR_ARCHITECTURE)
-$(BANG)ifndef PROCESSOR_ARCHITECTURE
-PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
-$(BANG)endif
-!endif
-!if defined(PROCESSOR_LEVEL)
-$(BANG)ifndef PROCESSOR_LEVEL
-PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
-$(BANG)endif
-!endif
-|
-!endif
-
--alpha-: nul
-	@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
-	@$(APPEND) PROCESSOR_ARCHITECTURE = alpha
-	@$(APPEND) !endif
--ix86-: nul
-	@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
-	@$(APPEND) PROCESSOR_ARCHITECTURE = x86
-	@$(APPEND) !endif
-
--i386-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
-	@$(APPEND) PROCESSOR_LEVEL = 3
-	@$(APPEND) !endif
--i486-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
-	@$(APPEND) PROCESSOR_LEVEL = 4
-	@$(APPEND) !endif
--i586-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
-	@$(APPEND) PROCESSOR_LEVEL = 5
-	@$(APPEND) !endif
--i686-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
-	@$(APPEND) PROCESSOR_LEVEL = 6
-	@$(APPEND) !endif
-
--epilogue-: -encs-
-
--encs-: nul
-	@$(MAKE) -f $(srcdir)/win32/enc-setup.mak srcdir="$(srcdir)" MAKEFILE=$(MAKEFILE)
-
--epilogue-: nul
-	@type >> $(MAKEFILE) &&|
-
-\# RUBY_INSTALL_NAME = ruby
-\# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
-\# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
-\# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
-\# STACK = 0x2000000
-\# LDFLAGS = -S:$$(STACK)
-\# RFLAGS = $$(iconinc)
-\# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
-$(BANG)include $$(srcdir)/bcc32/Makefile.sub
-|
-	@echo type "`$(MAKE)'" to make ruby for $(OS).
diff --git a/benchmark/README.md b/benchmark/README.md
new file mode 100644
index 0000000000..24a2669143
--- /dev/null
+++ b/benchmark/README.md
@@ -0,0 +1,72 @@
+# ruby/benchmark
+
+This directory has benchmark definitions to be run with
+[benchmark\_driver.gem](https://github.com/benchmark-driver/benchmark-driver).
+
+## Normal usage
+
+Execute `gem install benchmark_driver` and run a command like:
+
+```bash
+# Run a benchmark script with the ruby in the $PATH
+benchmark-driver benchmark/app_fib.rb
+
+# Run benchmark scripts with multiple Ruby executables or options
+benchmark-driver benchmark/*.rb -e /path/to/ruby -e '/path/to/ruby --jit'
+
+# Or compare Ruby versions managed by rbenv
+benchmark-driver benchmark/*.rb --rbenv '2.5.1;2.6.0-preview2 --jit'
+
+# You can collect many metrics in many ways
+benchmark-driver benchmark/*.rb --runner memory --output markdown
+
+# Some are defined with YAML for complex setup or accurate measurement
+benchmark-driver benchmark/*.yml
+```
+
+See also:
+
+```console
+Usage: benchmark-driver [options] RUBY|YAML...
+    -r, --runner TYPE                Specify runner type: ips, time, memory, once (default: ips)
+    -o, --output TYPE                Specify output type: compare, simple, markdown, record (default: compare)
+    -e, --executables EXECS          Ruby executables (e1::path1 arg1; e2::path2 arg2;...)
+        --rbenv VERSIONS             Ruby executables in rbenv (x.x.x arg1;y.y.y arg2;...)
+        --repeat-count NUM           Try benchmark NUM times and use the fastest result or the worst memory usage
+        --repeat-result TYPE         Yield "best", "average" or "worst" result with --repeat-count (default: best)
+        --bundler                    Install and use gems specified in Gemfile
+        --filter REGEXP              Filter out benchmarks with given regexp
+        --run-duration SECONDS       Warmup estimates loop_count to run for this duration (default: 3)
+    -v, --verbose                    Verbose mode. Multiple -v options increase visilibity (max: 2)
+```
+
+## make benchmark
+
+Using `make benchmark`, `make update-benchmark-driver` automatically downloads
+the supported version of benchmark\_driver, and it runs benchmarks with the downloaded
+benchmark\_driver.
+
+```bash
+# Run all benchmarks with the ruby in the $PATH and the built ruby
+make benchmark
+
+# Or compare with specific ruby binary
+make benchmark COMPARE_RUBY="/path/to/ruby --jit"
+
+# Run vm1 benchmarks
+make benchmark ITEM=vm1
+
+# Run some limited benchmarks in ITEM-matched files
+make benchmark ITEM=vm1 OPTS=--filter=block
+
+# You can specify the benchmark by an exact filename instead of using the default argument:
+# ARGS = $$(find $(srcdir)/benchmark -maxdepth 1 -name '*$(ITEM)*.yml' -o -name '*$(ITEM)*.rb')
+make benchmark ARGS=../benchmark/erb_render.yml
+
+# You can specify any option via $OPTS
+make benchmark OPTS="--help"
+
+# With `make benchmark`, some special runner plugins are available:
+#   -r peak, -r size, -r total, -r utime, -r stime, -r cutime, -r cstime
+make benchmark ITEM=vm2_bigarray OPTS="-r peak"
+```
diff --git a/benchmark/bm_app_answer.rb b/benchmark/app_answer.rb
index 3cd8a8fd37..3cd8a8fd37 100644
--- a/benchmark/bm_app_answer.rb
+++ b/benchmark/app_answer.rb
diff --git a/benchmark/app_aobench.rb b/benchmark/app_aobench.rb
new file mode 100644
index 0000000000..16296af12b
--- /dev/null
+++ b/benchmark/app_aobench.rb
@@ -0,0 +1,297 @@
+# coding: US-ASCII
+
+# AO render benchmark
+# Original program (C) Syoyo Fujita in Javascript (and other languages)
+#      https://code.google.com/p/aobench/
+# Ruby(yarv2llvm) version by Hideki Miura
+#
+
+IMAGE_WIDTH = 256
+IMAGE_HEIGHT = 256
+NSUBSAMPLES = 2
+NAO_SAMPLES = 8
+
+srand(0)
+
+class Vec
+  def initialize(x, y, z)
+    @x = x
+    @y = y
+    @z = z
+  end
+
+  attr_accessor :x, :y, :z
+
+  def vadd(b)
+    Vec.new(@x + b.x, @y + b.y, @z + b.z)
+  end
+
+  def vsub(b)
+    Vec.new(@x - b.x, @y - b.y, @z - b.z)
+  end
+
+  def vcross(b)
+    Vec.new(@y * b.z - @z * b.y,
+            @z * b.x - @x * b.z,
+            @x * b.y - @y * b.x)
+  end
+
+  def vdot(b)
+    @x * b.x + @y * b.y + @z * b.z
+  end
+
+  def vlength
+    Math.sqrt(@x * @x + @y * @y + @z * @z)
+  end
+
+  def vnormalize
+    len = vlength
+    v = Vec.new(@x, @y, @z)
+    if len > 1.0e-17 then
+      v.x = v.x / len
+      v.y = v.y / len
+      v.z = v.z / len
+    end
+    v
+  end
+end
+
+
+class Sphere
+  def initialize(center, radius)
+    @center = center
+    @radius = radius
+  end
+
+  attr_reader :center, :radius
+
+  def intersect(ray, isect)
+    rs = ray.org.vsub(@center)
+    b = rs.vdot(ray.dir)
+    c = rs.vdot(rs) - (@radius * @radius)
+    d = b * b - c
+    if d > 0.0 then
+      t = - b - Math.sqrt(d)
+
+      if t > 0.0 and t < isect.t then
+        isect.t = t
+        isect.hit = true
+        isect.pl = Vec.new(ray.org.x + ray.dir.x * t,
+                          ray.org.y + ray.dir.y * t,
+                          ray.org.z + ray.dir.z * t)
+        n = isect.pl.vsub(@center)
+        isect.n = n.vnormalize
+      else
+        0.0
+      end
+    end
+    nil
+  end
+end
+
+class Plane
+  def initialize(p, n)
+    @p = p
+    @n = n
+  end
+
+  def intersect(ray, isect)
+    d = -@p.vdot(@n)
+    v = ray.dir.vdot(@n)
+    v0 = v
+    if v < 0.0 then
+      v0 = -v
+    end
+    if v0 < 1.0e-17 then
+      return
+    end
+
+    t = -(ray.org.vdot(@n) + d) / v
+
+    if t > 0.0 and t < isect.t then
+      isect.hit = true
+      isect.t = t
+      isect.n = @n
+      isect.pl = Vec.new(ray.org.x + t * ray.dir.x,
+                        ray.org.y + t * ray.dir.y,
+                        ray.org.z + t * ray.dir.z)
+    end
+    nil
+  end
+end
+
+class Ray
+  def initialize(org, dir)
+    @org = org
+    @dir = dir
+  end
+
+  attr_accessor :org, :dir
+end
+
+class Isect
+  def initialize
+    @t = 10000000.0
+    @hit = false
+    @pl = Vec.new(0.0, 0.0, 0.0)
+    @n = Vec.new(0.0, 0.0, 0.0)
+  end
+
+  attr_accessor :t, :hit, :pl, :n
+end
+
+def clamp(f)
+  i = f * 255.5
+  if i > 255.0 then
+    i = 255.0
+  end
+  if i < 0.0 then
+    i = 0.0
+  end
+  i.to_i
+end
+
+def otherBasis(basis, n)
+  basis[2] = Vec.new(n.x, n.y, n.z)
+  basis[1] = Vec.new(0.0, 0.0, 0.0)
+
+  if n.x < 0.6 and n.x > -0.6 then
+    basis[1].x = 1.0
+  elsif n.y < 0.6 and n.y > -0.6 then
+    basis[1].y = 1.0
+  elsif n.z < 0.6 and n.z > -0.6 then
+    basis[1].z = 1.0
+  else
+    basis[1].x = 1.0
+  end
+
+  basis[0] = basis[1].vcross(basis[2])
+  basis[0] = basis[0].vnormalize
+
+  basis[1] = basis[2].vcross(basis[0])
+  basis[1] = basis[1].vnormalize
+end
+
+class Scene
+  def initialize
+    @spheres = Array.new
+    @spheres[0] = Sphere.new(Vec.new(-2.0, 0.0, -3.5), 0.5)
+    @spheres[1] = Sphere.new(Vec.new(-0.5, 0.0, -3.0), 0.5)
+    @spheres[2] = Sphere.new(Vec.new(1.0, 0.0, -2.2), 0.5)
+    @plane = Plane.new(Vec.new(0.0, -0.5, 0.0), Vec.new(0.0, 1.0, 0.0))
+  end
+
+  def ambient_occlusion(isect)
+    basis = Array.new
+    otherBasis(basis, isect.n)
+
+    ntheta    = NAO_SAMPLES
+    nphi      = NAO_SAMPLES
+    eps       = 0.0001
+    occlusion = 0.0
+
+    p0 = Vec.new(isect.pl.x + eps * isect.n.x,
+                isect.pl.y + eps * isect.n.y,
+                isect.pl.z + eps * isect.n.z)
+    nphi.times do |j|
+      ntheta.times do |i|
+        r = rand
+        phi = 2.0 * 3.14159265 * rand
+        x = Math.cos(phi) * Math.sqrt(1.0 - r)
+        y = Math.sin(phi) * Math.sqrt(1.0 - r)
+        z = Math.sqrt(r)
+
+        rx = x * basis[0].x + y * basis[1].x + z * basis[2].x
+        ry = x * basis[0].y + y * basis[1].y + z * basis[2].y
+        rz = x * basis[0].z + y * basis[1].z + z * basis[2].z
+
+        raydir = Vec.new(rx, ry, rz)
+        ray = Ray.new(p0, raydir)
+
+        occisect = Isect.new
+        @spheres[0].intersect(ray, occisect)
+        @spheres[1].intersect(ray, occisect)
+        @spheres[2].intersect(ray, occisect)
+        @plane.intersect(ray, occisect)
+        if occisect.hit then
+          occlusion = occlusion + 1.0
+        else
+          0.0
+        end
+      end
+    end
+
+    occlusion = (ntheta.to_f * nphi.to_f - occlusion) / (ntheta.to_f * nphi.to_f)
+
+    Vec.new(occlusion, occlusion, occlusion)
+  end
+
+  def render(w, h, nsubsamples)
+    cnt = 0
+    nsf = nsubsamples.to_f
+    h.times do |y|
+      w.times do |x|
+        rad = Vec.new(0.0, 0.0, 0.0)
+
+        # Subsampling
+        nsubsamples.times do |v|
+          nsubsamples.times do |u|
+
+            cnt = cnt + 1
+            wf = w.to_f
+            hf = h.to_f
+            xf = x.to_f
+            yf = y.to_f
+            uf = u.to_f
+            vf = v.to_f
+
+            px = (xf + (uf / nsf) - (wf / 2.0)) / (wf / 2.0)
+            py = -(yf + (vf / nsf) - (hf / 2.0)) / (hf / 2.0)
+
+            eye = Vec.new(px, py, -1.0).vnormalize
+
+            ray = Ray.new(Vec.new(0.0, 0.0, 0.0), eye)
+
+            isect = Isect.new
+            @spheres[0].intersect(ray, isect)
+            @spheres[1].intersect(ray, isect)
+            @spheres[2].intersect(ray, isect)
+            @plane.intersect(ray, isect)
+            if isect.hit then
+              col = ambient_occlusion(isect)
+              rad.x = rad.x + col.x
+              rad.y = rad.y + col.y
+              rad.z = rad.z + col.z
+            end
+          end
+        end
+
+        r = rad.x / (nsf * nsf)
+        g = rad.y / (nsf * nsf)
+        b = rad.z / (nsf * nsf)
+        printf("%c", clamp(r))
+        printf("%c", clamp(g))
+        printf("%c", clamp(b))
+      end
+      nil
+    end
+
+    nil
+  end
+end
+
+alias printf_orig printf
+def printf *args
+  # $fp.printf(*args)
+end
+
+# File.open("ao.ppm", "w") do |fp|
+  # $fp = fp
+  printf("P6\n")
+  printf("%d %d\n", IMAGE_WIDTH, IMAGE_HEIGHT)
+  printf("255\n")
+  Scene.new.render(IMAGE_WIDTH, IMAGE_HEIGHT, NSUBSAMPLES)
+# end
+
+undef printf
+alias printf printf_orig
diff --git a/benchmark/app_erb.yml b/benchmark/app_erb.yml
new file mode 100644
index 0000000000..31e29b7644
--- /dev/null
+++ b/benchmark/app_erb.yml
@@ -0,0 +1,23 @@
+#
+# Create many HTML strings with ERB.
+#
+prelude: |
+  require 'erb'
+
+  data = <<erb
+  <html>
+    <head> <%= title %> </head>
+    <body>
+      <h1> <%= title %> </h1>
+      <p>
+        <%= content %>
+      </p>
+    </body>
+  </html>
+  erb
+
+  title = "hello world!"
+  content = "hello world!\n" * 10
+benchmark:
+  app_erb: ERB.new(data).result(binding)
+loop_count: 15000
diff --git a/benchmark/bm_app_factorial.rb b/benchmark/app_factorial.rb
index 45f471dfdb..45f471dfdb 100644
--- a/benchmark/bm_app_factorial.rb
+++ b/benchmark/app_factorial.rb
diff --git a/benchmark/bm_app_fib.rb b/benchmark/app_fib.rb
index 34a7b2e725..34a7b2e725 100644
--- a/benchmark/bm_app_fib.rb
+++ b/benchmark/app_fib.rb
diff --git a/benchmark/app_lc_fizzbuzz.rb b/benchmark/app_lc_fizzbuzz.rb
new file mode 100644
index 0000000000..f09574bbeb
--- /dev/null
+++ b/benchmark/app_lc_fizzbuzz.rb
@@ -0,0 +1,52 @@
+#
+# FizzBuzz program using only lambda calculus
+#
+# This program is quoted from
+#   "Understanding Computation" by Tom Stuart
+#   http://computationbook.com/
+#
+# You can understand why this program works fine by reading this book.
+#
+
+solution = -> k { -> f { -> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> l { -> x { -> g { -> b { b }[-> p { p[-> x { -> y { x } }] }[l]][x][-> y { g[f[-> l { -> p { p[-> x { -> y { y } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][x][g]][-> l { -> p { p[-> x { -> y { x } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][y] }] } } } }][k][-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> l { -> x { -> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[l][f[x]] } }] } }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[m][n]][-> x { -> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[f[-> n { -> p { -> x { p[n[p][x]] } } }[m]][n]][m][x] }][-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]] } } }][-> p { -> x { p[x] } }][-> p { -> x { p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[x]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]] } }]][-> n { -> b { b }[-> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> p { -> x { p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[x]]]]]]]]]]]]]]] } }]]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]][-> b { b }[-> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> p { -> x { p[p[p[x]]] } }]]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]][-> b { b }[-> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> n { -> l { -> x { -> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> l { -> x { -> g { -> b { b }[-> p { p[-> x { -> y { x } }] }[l]][x][-> y { g[f[-> l { -> p { p[-> x { -> y { y } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][x][g]][-> l { -> p { p[-> x { -> y { x } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][y] }] } } } }][l][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][x]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }] } }[-> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]][-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> x { f[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { -> n { -> p { -> x { p[n[p][x]] } } }[f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n]][x] }][-> p { -> x { x } }] } } }][n][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][x] }]][-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]] } }][n]]]] }]
+
+FIRST     = -> l { LEFT[RIGHT[l]] }
+IF        = -> b { b }
+LEFT      = -> p { p[-> x { -> y { x } } ] }
+RIGHT     = -> p { p[-> x { -> y { y } } ] }
+IS_EMPTY  = LEFT
+REST      = -> l { RIGHT[RIGHT[l]] }
+
+def to_integer(proc)
+  proc[-> n { n + 1 }][0]
+end
+
+def to_boolean(proc)
+  IF[proc][true][false]
+end
+
+def to_array(proc)
+  array = []
+
+  until to_boolean(IS_EMPTY[proc])
+    array.push(FIRST[proc])
+    proc = REST[proc]
+  end
+
+  array
+end
+
+def to_char(c)
+  '0123456789BFiuz'.slice(to_integer(c))
+end
+
+def to_string(s)
+  to_array(s).map { |c| to_char(c) }.join
+end
+
+answer = to_array(solution).map do |p|
+  to_string(p)
+end
+
+answer_ary = answer.to_a
+# puts answer_ary
diff --git a/benchmark/app_mandelbrot.rb b/benchmark/app_mandelbrot.rb
new file mode 100644
index 0000000000..801b75e8e2
--- /dev/null
+++ b/benchmark/app_mandelbrot.rb
@@ -0,0 +1,23 @@
+require 'complex'
+
+def mandelbrot? z
+  i = 0
+  while i<100
+    i += 1
+    z = z * z
+    return false if z.abs > 2
+  end
+  true
+end
+
+ary = []
+
+(0..1000).each{|dx|
+  (0..1000).each{|dy|
+    x = dx / 50.0
+    y = dy / 50.0
+    c = Complex(x, y)
+    ary << c if mandelbrot?(c)
+  }
+}
+
diff --git a/benchmark/app_pentomino.rb b/benchmark/app_pentomino.rb
new file mode 100644
index 0000000000..47be7b203f
--- /dev/null
+++ b/benchmark/app_pentomino.rb
@@ -0,0 +1,130 @@
+#!/usr/local/bin/ruby
+# This program is contributed by Shin Nishiyama
+
+
+# modified by K.Sasada
+
+NP = 5
+ROW = 8 + NP
+COL = 8
+
+$p = []
+$b = []
+$no = 0
+
+def piece(n, a, nb)
+  nb.each{|x|
+    a[n] = x
+    if n == NP-1
+      $p << [a.sort]
+    else
+      nbc=nb.dup
+      [-ROW, -1, 1, ROW].each{|d|
+        if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
+          nbc << x+d
+        end
+      }
+      nbc.delete x
+      piece(n+1,a[0..n],nbc)
+    end
+  }
+end
+
+def kikaku(a)
+  a.collect {|x| x - a[0]}
+end
+def ud(a)
+  kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
+end
+def rl(a)
+  kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
+end
+def xy(a)
+  kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
+end
+
+def mkpieces
+  piece(0,[],[0])
+  $p.each do |a|
+    a0 = a[0]
+    a[1] = ud(a0)
+    a[2] = rl(a0)
+    a[3] = ud(rl(a0))
+    a[4] = xy(a0)
+    a[5] = ud(xy(a0))
+    a[6] = rl(xy(a0))
+    a[7] = ud(rl(xy(a0)))
+    a.sort!
+    a.uniq!
+  end
+  $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
+end
+
+def mkboard
+  (0...ROW*COL).each{|i|
+    if i % ROW >= ROW-NP
+      $b[i] = -2
+    else
+      $b[i] = -1
+    end
+    $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
+  }
+end
+
+def pboard
+  return # skip print
+  print "No. #$no\n"
+  (0...COL).each{|i|
+    print "|"
+    (0...ROW-NP).each{|j|
+      x = $b[i*ROW+j]
+      if x < 0
+        print "..|"
+      else
+        printf "%2d|",x+1
+      end
+    }
+    print "\n"
+  }
+  print "\n"
+end
+
+$pnum=[]
+def setpiece(a,pos)
+  if a.length == $p.length then
+    $no += 1
+    pboard
+    return
+  end
+  while $b[pos] != -1
+    pos += 1
+  end
+  ($pnum - a).each do |i|
+    $p[i].each do |x|
+      f = 0
+      x.each{|s|
+        if $b[pos+s] != -1
+          f=1
+          break
+        end
+      }
+      if f == 0 then
+        x.each{|s|
+          $b[pos+s] = i
+        }
+        a << i
+        setpiece(a.dup, pos)
+        a.pop
+        x.each{|s|
+          $b[pos+s] = -1
+        }
+      end
+    end
+  end
+end
+
+mkpieces
+mkboard
+$p[4] = [$p[4][0]]
+$pnum = (0...$p.length).to_a
+setpiece([],0)
diff --git a/benchmark/app_raise.rb b/benchmark/app_raise.rb
new file mode 100644
index 0000000000..5db8f95d50
--- /dev/null
+++ b/benchmark/app_raise.rb
@@ -0,0 +1,8 @@
+i = 0
+while i<300000
+  i += 1
+  begin
+    raise
+  rescue
+  end
+end
diff --git a/benchmark/app_strconcat.rb b/benchmark/app_strconcat.rb
new file mode 100644
index 0000000000..7eed7c1aed
--- /dev/null
+++ b/benchmark/app_strconcat.rb
@@ -0,0 +1,5 @@
+i = 0
+while i<2_000_000
+  "#{1+1} #{1+1} #{1+1}"
+  i += 1
+end
diff --git a/benchmark/bm_app_tak.rb b/benchmark/app_tak.rb
index efe5380f4e..efe5380f4e 100644
--- a/benchmark/bm_app_tak.rb
+++ b/benchmark/app_tak.rb
diff --git a/benchmark/bm_app_tarai.rb b/benchmark/app_tarai.rb
index 4c146f5ccf..4c146f5ccf 100644
--- a/benchmark/bm_app_tarai.rb
+++ b/benchmark/app_tarai.rb
diff --git a/benchmark/bm_app_uri.rb b/benchmark/app_uri.rb
index 586edfd5dc..586edfd5dc 100644
--- a/benchmark/bm_app_uri.rb
+++ b/benchmark/app_uri.rb
diff --git a/benchmark/array_flatten.yml b/benchmark/array_flatten.yml
new file mode 100644
index 0000000000..88ef544ba0
--- /dev/null
+++ b/benchmark/array_flatten.yml
@@ -0,0 +1,19 @@
+prelude: |
+  small_flat_ary = 5.times.to_a
+  large_flat_ary = 100.times.to_a
+  small_pairs_ary = [[1, 2]] * 5
+  large_pairs_ary = [[1, 2]] * 100
+  mostly_flat_ary = 100.times.to_a.push([101, 102])
+
+benchmark:
+  small_flat_ary.flatten: small_flat_ary.flatten
+  small_flat_ary.flatten!: small_flat_ary.flatten!
+  large_flat_ary.flatten: large_flat_ary.flatten
+  large_flat_ary.flatten!: large_flat_ary.flatten!
+  small_pairs_ary.flatten: small_pairs_ary.flatten
+  small_pairs_ary.flatten!: small_pairs_ary.dup.flatten!
+  large_pairs_ary.flatten: large_pairs_ary.flatten
+  large_pairs_ary.flatten!: large_pairs_ary.dup.flatten!
+  mostly_flat_ary.flatten: mostly_flat_ary.flatten
+  mostly_flat_ary.flatten!: mostly_flat_ary.dup.flatten!
+loop_count: 10000
diff --git a/benchmark/array_intersection.yml b/benchmark/array_intersection.yml
new file mode 100644
index 0000000000..26705323fd
--- /dev/null
+++ b/benchmark/array_intersection.yml
@@ -0,0 +1,14 @@
+prelude: |
+  small1 = [1, 2, 3]
+  small2 = [1, 2, 3, 4, 5]
+  small3 = [2, 3, 4, 5]
+  small4 = [2]
+  big1 = [1, 2, 3, 4] * 64
+  big2 = [1, 2, 3] * 64
+  big3 = [1, 2] * 64
+
+benchmark:
+  small-&: small1 & small2 & small3 & small4
+  small-intersection: small1.intersection(small2, small3, small4)
+  big-&: big1 & big2 & big3
+  big-intersection: big1.intersection(big2, big3)
diff --git a/benchmark/array_sample_100k_10.rb b/benchmark/array_sample_100k_10.rb
new file mode 100644
index 0000000000..5f41ecc32b
--- /dev/null
+++ b/benchmark/array_sample_100k_10.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 10}
diff --git a/benchmark/array_sample_100k_11.rb b/benchmark/array_sample_100k_11.rb
new file mode 100644
index 0000000000..18b1715319
--- /dev/null
+++ b/benchmark/array_sample_100k_11.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 11}
diff --git a/benchmark/array_sample_100k__100.rb b/benchmark/array_sample_100k__100.rb
new file mode 100644
index 0000000000..22863afe89
--- /dev/null
+++ b/benchmark/array_sample_100k__100.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 100}
diff --git a/benchmark/array_sample_100k__1k.rb b/benchmark/array_sample_100k__1k.rb
new file mode 100644
index 0000000000..4cd79e6c67
--- /dev/null
+++ b/benchmark/array_sample_100k__1k.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 1000}
diff --git a/benchmark/array_sample_100k__6k.rb b/benchmark/array_sample_100k__6k.rb
new file mode 100644
index 0000000000..b3d264249e
--- /dev/null
+++ b/benchmark/array_sample_100k__6k.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 6000}
diff --git a/benchmark/array_sample_100k___10k.rb b/benchmark/array_sample_100k___10k.rb
new file mode 100644
index 0000000000..5dd55ec058
--- /dev/null
+++ b/benchmark/array_sample_100k___10k.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 10_000}
diff --git a/benchmark/array_sample_100k___50k.rb b/benchmark/array_sample_100k___50k.rb
new file mode 100644
index 0000000000..1506732c3c
--- /dev/null
+++ b/benchmark/array_sample_100k___50k.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 50_000}
diff --git a/benchmark/array_shift.rb b/benchmark/array_shift.rb
new file mode 100644
index 0000000000..798bb9e3f4
--- /dev/null
+++ b/benchmark/array_shift.rb
@@ -0,0 +1,14 @@
+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/array_small_and.rb b/benchmark/array_small_and.rb
new file mode 100644
index 0000000000..e53a6edae6
--- /dev/null
+++ b/benchmark/array_small_and.rb
@@ -0,0 +1,17 @@
+MIN_SIZE = ENV.fetch('SMALL_ARRAY_MIN', 0).to_i
+MAX_SIZE = ENV.fetch('SMALL_ARRAY_MAX', 16).to_i
+ITERATIONS = ENV.fetch('SMALL_ARRAY_ITERATIONS', 100).to_i
+
+ARRAYS = (MIN_SIZE..MAX_SIZE).map do |size1|
+  (MIN_SIZE..MAX_SIZE).map do |size2|
+    [Array.new(size1) { rand(MAX_SIZE) }, Array.new(size2) { rand(MAX_SIZE) }]
+  end
+end
+
+ITERATIONS.times do
+  ARRAYS.each do |group|
+    group.each do |arr1, arr2|
+      arr1 & arr2
+    end
+  end
+end
diff --git a/benchmark/array_small_diff.rb b/benchmark/array_small_diff.rb
new file mode 100644
index 0000000000..9661ee48db
--- /dev/null
+++ b/benchmark/array_small_diff.rb
@@ -0,0 +1,17 @@
+MIN_SIZE = ENV.fetch('SMALL_ARRAY_MIN', 0).to_i
+MAX_SIZE = ENV.fetch('SMALL_ARRAY_MAX', 16).to_i
+ITERATIONS = ENV.fetch('SMALL_ARRAY_ITERATIONS', 100).to_i
+
+ARRAYS = (MIN_SIZE..MAX_SIZE).map do |size1|
+  (MIN_SIZE..MAX_SIZE).map do |size2|
+    [Array.new(size1) { rand(MAX_SIZE) }, Array.new(size2) { rand(MAX_SIZE) }]
+  end
+end
+
+ITERATIONS.times do
+  ARRAYS.each do |group|
+    group.each do |arr1, arr2|
+      arr1 - arr2
+    end
+  end
+end
diff --git a/benchmark/array_small_or.rb b/benchmark/array_small_or.rb
new file mode 100644
index 0000000000..c58b5fd1ff
--- /dev/null
+++ b/benchmark/array_small_or.rb
@@ -0,0 +1,17 @@
+MIN_SIZE = ENV.fetch('SMALL_ARRAY_MIN', 0).to_i
+MAX_SIZE = ENV.fetch('SMALL_ARRAY_MAX', 16).to_i
+ITERATIONS = ENV.fetch('SMALL_ARRAY_ITERATIONS', 100).to_i
+
+ARRAYS = (MIN_SIZE..MAX_SIZE).map do |size1|
+  (MIN_SIZE..MAX_SIZE).map do |size2|
+    [Array.new(size1) { rand(MAX_SIZE) }, Array.new(size2) { rand(MAX_SIZE) }]
+  end
+end
+
+ITERATIONS.times do
+  ARRAYS.each do |group|
+    group.each do |arr1, arr2|
+      arr1 | arr2
+    end
+  end
+end
diff --git a/benchmark/array_sort_block.rb b/benchmark/array_sort_block.rb
new file mode 100644
index 0000000000..3579786056
--- /dev/null
+++ b/benchmark/array_sort_block.rb
@@ -0,0 +1,2 @@
+ary = Array.new(1000) { rand(1000) }
+10000.times { ary.sort { |a, b| a <=> b } }
diff --git a/benchmark/array_sort_float.rb b/benchmark/array_sort_float.rb
new file mode 100644
index 0000000000..9a6e2f8bd2
--- /dev/null
+++ b/benchmark/array_sort_float.rb
@@ -0,0 +1,2 @@
+arr = Array.new(1000) { rand }
+10000.times { arr.sort }
diff --git a/benchmark/array_values_at_int.rb b/benchmark/array_values_at_int.rb
new file mode 100644
index 0000000000..6cb394cb9f
--- /dev/null
+++ b/benchmark/array_values_at_int.rb
@@ -0,0 +1,2 @@
+ary = Array.new(10000) {|i| i}
+100000.times { ary.values_at(500) }
diff --git a/benchmark/array_values_at_range.rb b/benchmark/array_values_at_range.rb
new file mode 100644
index 0000000000..5b53806d1c
--- /dev/null
+++ b/benchmark/array_values_at_range.rb
@@ -0,0 +1,2 @@
+ary = Array.new(10000) {|i| i}
+100000.times { ary.values_at(1..2000) }
diff --git a/benchmark/bighash.rb b/benchmark/bighash.rb
new file mode 100644
index 0000000000..e2ad5a5c94
--- /dev/null
+++ b/benchmark/bighash.rb
@@ -0,0 +1 @@
+h = {}; 5000000.times {|n| h[n] = n }
diff --git a/benchmark/bm_app_erb.rb b/benchmark/bm_app_erb.rb
deleted file mode 100644
index 77c66a7949..0000000000
--- a/benchmark/bm_app_erb.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Create many HTML strings with ERB.
-#
-
-require 'erb'
-
-data = DATA.read
-max = 15_000
-title = "hello world!"
-content = "hello world!\n" * 10
-
-max.times{
-  ERB.new(data).result(binding)
-}
-
-__END__
-
-<html>
-  <head> <%= title %> </head>
-  <body>
-    <h1> <%= title %> </h1>
-    <p>
-      <%= content %>
-    </p>
-  </body>
-</html>
diff --git a/benchmark/bm_app_mandelbrot.rb b/benchmark/bm_app_mandelbrot.rb
deleted file mode 100644
index 89069db7ab..0000000000
--- a/benchmark/bm_app_mandelbrot.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'complex'
-
-def mandelbrot? z
-  i = 0
-  while i<100
-    i+=1
-    z = z * z
-    return false if z.abs > 2
-  end
-  true
-end
-
-ary = []
-
-(0..1000).each{|dx|
-  (0..1000).each{|dy|
-    x = dx / 50.0
-    y = dy / 50.0
-    c = Complex(x, y)
-    ary << c if mandelbrot?(c)
-  }
-}
-
diff --git a/benchmark/bm_app_pentomino.rb b/benchmark/bm_app_pentomino.rb
deleted file mode 100644
index 59c63f358e..0000000000
--- a/benchmark/bm_app_pentomino.rb
+++ /dev/null
@@ -1,259 +0,0 @@
-#!/usr/local/bin/ruby
-# This program is contributed by Shin Nishiyama
-
-
-# modified by K.Sasada
-
-NP = 5
-ROW = 8 + NP
-COL = 8
-
-$p = []
-$b = []
-$no = 0
-
-def piece(n, a, nb)
-  nb.each{|x|
-    a[n] = x
-    if n == NP-1
-      $p << [a.sort]
-    else
-      nbc=nb.dup
-      [-ROW, -1, 1, ROW].each{|d|
-        if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
-          nbc << x+d
-        end
-      }
-      nbc.delete x
-      piece(n+1,a[0..n],nbc)
-    end
-  }
-end
-
-def kikaku(a)
-  a.collect {|x| x - a[0]}
-end
-def ud(a)
-  kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
-end
-def rl(a)
-  kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
-end
-def xy(a)
-  kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
-end
-
-def mkpieces
-  piece(0,[],[0])
-  $p.each do |a|
-    a0 = a[0]
-    a[1] = ud(a0)
-    a[2] = rl(a0)
-    a[3] = ud(rl(a0))
-    a[4] = xy(a0)
-    a[5] = ud(xy(a0))
-    a[6] = rl(xy(a0))
-    a[7] = ud(rl(xy(a0)))
-    a.sort!
-    a.uniq!
-  end
-  $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
-end
-
-def mkboard
-  (0...ROW*COL).each{|i|
-    if i % ROW >= ROW-NP
-      $b[i] = -2
-    else
-      $b[i] = -1
-    end
-    $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
-  }
-end
-
-def pboard
-  return # skip print
-  print "No. #$no\n"
-  (0...COL).each{|i|
-    print "|"
-    (0...ROW-NP).each{|j|
-      x = $b[i*ROW+j]
-      if x < 0
-        print "..|"
-      else
-        printf "%2d|",x+1
-      end
-    }
-    print "\n"
-  }
-  print "\n"
-end
-
-$pnum=[]
-def setpiece(a,pos)
-  if a.length == $p.length then
-    $no += 1
-    pboard
-    return
-  end
-  while $b[pos] != -1
-    pos += 1
-  end
-  ($pnum - a).each do |i|
-    $p[i].each do |x|
-      f = 0
-      x.each{|s|
-        if $b[pos+s] != -1
-          f=1
-          break
-        end
-      }
-      if f == 0 then
-        x.each{|s|
-          $b[pos+s] = i
-        }
-        a << i
-        setpiece(a.dup, pos)
-        a.pop
-        x.each{|s|
-          $b[pos+s] = -1
-        }
-      end
-    end
-  end
-end
-
-mkpieces
-mkboard
-$p[4] = [$p[4][0]]
-$pnum = (0...$p.length).to_a
-setpiece([],0)
-
-
-__END__
-
-# original
-
-NP = 5
-ROW = 8 + NP
-COL = 8
-
-$p = []
-$b = []
-$no = 0
-
-def piece(n,a,nb)
-  for x in nb
-    a[n] = x
-    if n == NP-1
-      $p << [a.sort]
-    else
-      nbc=nb.dup
-      for d in [-ROW, -1, 1, ROW]
-        if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
-          nbc << x+d
-        end
-      end
-      nbc.delete x
-      piece(n+1,a[0..n],nbc)
-    end
-  end
-end
-
-def kikaku(a)
-  a.collect {|x| x - a[0]}
-end
-def ud(a)
-  kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
-end
-def rl(a)
-  kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
-end
-def xy(a)
-  kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
-end
-
-def mkpieces
-  piece(0,[],[0])
-  $p.each do |a|
-    a0 = a[0]
-    a[1] = ud(a0)
-    a[2] = rl(a0)
-    a[3] = ud(rl(a0))
-    a[4] = xy(a0)
-    a[5] = ud(xy(a0))
-    a[6] = rl(xy(a0))
-    a[7] = ud(rl(xy(a0)))
-    a.sort!
-    a.uniq!
-  end
-  $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
-end
-
-def mkboard
-  for i in 0...ROW*COL
-    if i % ROW >= ROW-NP
-      $b[i] = -2
-    else
-      $b[i] = -1
-    end
-    $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
-  end
-end
-
-def pboard
-  print "No. #$no\n"
-  for i in 0...COL
-    print "|"
-    for j in 0...ROW-NP
-      x = $b[i*ROW+j]
-      if x < 0
-        print "..|"
-      else
-        printf "%2d|",x+1
-      end
-    end
-    print "\n"
-  end
-  print "\n"
-end
-
-$pnum=[]
-def setpiece(a,pos)
-  if a.length == $p.length then
-    $no += 1
-    pboard
-    return
-  end
-  while $b[pos] != -1
-    pos += 1
-  end
-  ($pnum - a).each do |i|
-    $p[i].each do |x|
-      f = 0
-      for s in x do
-        if $b[pos+s] != -1
-          f=1
-          break
-        end
-      end
-      if f == 0 then
-        for s in x do
-          $b[pos+s] = i
-        end
-        a << i
-        setpiece(a.dup, pos)
-        a.pop
-        for s in x do
-          $b[pos+s] = -1
-        end
-      end
-    end
-  end
-end
-
-mkpieces
-mkboard
-$p[4] = [$p[4][0]]
-$pnum = (0...$p.length).to_a
-setpiece([],0)
diff --git a/benchmark/bm_app_raise.rb b/benchmark/bm_app_raise.rb
deleted file mode 100644
index 01d2ae3219..0000000000
--- a/benchmark/bm_app_raise.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i=0
-while i<300000
-  i+=1
-  begin
-    raise
-  rescue
-  end
-end
diff --git a/benchmark/bm_app_strconcat.rb b/benchmark/bm_app_strconcat.rb
deleted file mode 100644
index 7b2f2da5a7..0000000000
--- a/benchmark/bm_app_strconcat.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i=0
-while i<2_000_000
-  "#{1+1} #{1+1} #{1+1}"
-  i+=1
-end
diff --git a/benchmark/bm_io_select2.rb b/benchmark/bm_io_select2.rb
deleted file mode 100644
index 7b167af774..0000000000
--- a/benchmark/bm_io_select2.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# IO.select performance. worst case of single fd.
-
-ios = []
-nr = 1000000
-max = Process.getrlimit(Process::RLIMIT_NOFILE)[0]
-puts "max fd: #{max} (results not apparent with <= 1024 max fd)"
-
-((max / 2) - 10).times do
-  ios.concat IO.pipe
-end
-
-last = [ ios[-1] ]
-puts "last IO: #{last[0].inspect}"
-
-nr.times do
-  IO.select nil, last
-end
-
diff --git a/benchmark/bm_io_select3.rb b/benchmark/bm_io_select3.rb
deleted file mode 100644
index fcdbb96e0e..0000000000
--- a/benchmark/bm_io_select3.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# IO.select performance. a lot of fd
-
-ios = []
-nr = 100
-max = Process.getrlimit(Process::RLIMIT_NOFILE)[0]
-puts "max fd: #{max} (results not apparent with <= 1024 max fd)"
-
-(max - 10).times do
-  r, w = IO.pipe
-  r.close
-  ios.push w
-end
-
-nr.times do
-  IO.select nil, ios
-end
-
diff --git a/benchmark/bm_loop_whileloop.rb b/benchmark/bm_loop_whileloop.rb
deleted file mode 100644
index 43d35e1131..0000000000
--- a/benchmark/bm_loop_whileloop.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-i=0
-while i<30_000_000 # benchmark loop 1
-  i+=1
-end
diff --git a/benchmark/bm_loop_whileloop2.rb b/benchmark/bm_loop_whileloop2.rb
deleted file mode 100644
index e514989661..0000000000
--- a/benchmark/bm_loop_whileloop2.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-i=0
-while i< 6_000_000 # benchmark loop 2
-  i+=1
-end
diff --git a/benchmark/bm_so_ackermann.rb b/benchmark/bm_so_ackermann.rb
deleted file mode 100644
index 7db5be9050..0000000000
--- a/benchmark/bm_so_ackermann.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: ackermann-ruby.code,v 1.4 2004/11/13 07:40:41 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-
-def ack(m, n)
-    if m == 0 then
-        n + 1
-    elsif n == 0 then
-        ack(m - 1, 1)
-    else
-        ack(m - 1, ack(m, n - 1))
-    end
-end
-
-NUM = 9
-ack(3, NUM)
-
-
diff --git a/benchmark/bm_so_array.rb b/benchmark/bm_so_array.rb
deleted file mode 100644
index 2b8fce8f99..0000000000
--- a/benchmark/bm_so_array.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: ary-ruby.code,v 1.4 2004/11/13 07:41:27 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# with help from Paul Brannan and Mark Hubbart
-
-n = 9000 # Integer(ARGV.shift || 1)
-
-x = Array.new(n)
-y = Array.new(n, 0)
-
-n.times{|bi|
-  x[bi] = bi + 1
-}
-
-(0 .. 999).each do |e|
-  (n-1).step(0,-1) do |bi|
-    y[bi] += x.at(bi)
-  end
-end
-# puts "#{y.first} #{y.last}"
-
-
diff --git a/benchmark/bm_so_binary_trees.rb b/benchmark/bm_so_binary_trees.rb
deleted file mode 100644
index 6a26465578..0000000000
--- a/benchmark/bm_so_binary_trees.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# The Computer Language Shootout Benchmarks
-# http://shootout.alioth.debian.org
-#
-# contributed by Jesse Millikan
-
-# disable output
-def STDOUT.write_ *args
-end
-
-def item_check(tree)
- if tree[0] == nil
-  tree[1]
- else
-  tree[1] + item_check(tree[0]) - item_check(tree[2])
- end
-end
-
-def bottom_up_tree(item, depth)
- if depth > 0
-  item_item = 2 * item
-  depth -= 1
-  [bottom_up_tree(item_item - 1, depth), item, bottom_up_tree(item_item, depth)]
- else
-  [nil, item, nil]
- end
-end
-
-max_depth = 12 # 16 # ARGV[0].to_i
-min_depth = 4
-
-max_depth = min_depth + 2 if min_depth + 2 > max_depth
-
-stretch_depth = max_depth + 1
-stretch_tree = bottom_up_tree(0, stretch_depth)
-
-puts "stretch tree of depth #{stretch_depth}\t check: #{item_check(stretch_tree)}"
-stretch_tree = nil
-
-long_lived_tree = bottom_up_tree(0, max_depth)
-
-min_depth.step(max_depth + 1, 2) do |depth|
- iterations = 2**(max_depth - depth + min_depth)
-
- check = 0
-
- for i in 1..iterations
-  temp_tree = bottom_up_tree(i, depth)
-  check += item_check(temp_tree)
-
-  temp_tree = bottom_up_tree(-i, depth)
-  check += item_check(temp_tree)
- end
-
- puts "#{iterations * 2}\t trees of depth #{depth}\t check: #{check}"
-end
-
-puts "long lived tree of depth #{max_depth}\t check: #{item_check(long_lived_tree)}"
diff --git a/benchmark/bm_so_concatenate.rb b/benchmark/bm_so_concatenate.rb
deleted file mode 100644
index 56b9410632..0000000000
--- a/benchmark/bm_so_concatenate.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: strcat-ruby.code,v 1.4 2004/11/13 07:43:28 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# based on code from Aristarkh A Zagorodnikov and Dat Nguyen
-
-STUFF = "hello\n"
-i=0
-while i<10
-  i+=1
-  hello = ''
-  4_000_000.times do |e|
-    hello << STUFF
-  end
-end
-# puts hello.length
-
-
diff --git a/benchmark/bm_so_count_words.rb b/benchmark/bm_so_count_words.rb
deleted file mode 100644
index 65f6337a4a..0000000000
--- a/benchmark/bm_so_count_words.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: wc-ruby.code,v 1.4 2004/11/13 07:43:32 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# with help from Paul Brannan
-
-input = open(File.join(File.dirname($0), 'wc.input'), 'rb')
-
-nl = nw = nc = 0
-while true
-  tmp = input.read(4096) or break
-  data = tmp << (input.gets || "")
-  nc += data.length
-  nl += data.count("\n")
-  ((data.strip! || data).tr!("\n", " ") || data).squeeze!
-  nw += data.count(" ") + 1
-end
-# STDERR.puts "#{nl} #{nw} #{nc}"
-
diff --git a/benchmark/bm_so_exception.rb b/benchmark/bm_so_exception.rb
deleted file mode 100644
index d8b461290c..0000000000
--- a/benchmark/bm_so_exception.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: except-ruby.code,v 1.4 2004/11/13 07:41:33 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-
-$HI = 0
-$LO = 0
-NUM = 250000 # Integer(ARGV[0] || 1)
-
-
-class Lo_Exception < Exception
-  def initialize(num)
-    @value = num
-  end
-end
-
-class Hi_Exception < Exception
-  def initialize(num)
-    @value = num
-  end
-end
-
-def some_function(num)
-  begin
-    hi_function(num)
-  rescue
-    print "We shouldn't get here, exception is: #{$!.type}\n"
-  end
-end
-
-def hi_function(num)
-  begin
-    lo_function(num)
-  rescue Hi_Exception
-    $HI = $HI + 1
-  end
-end
-
-def lo_function(num)
-  begin
-    blowup(num)
-  rescue Lo_Exception
-    $LO = $LO + 1
-  end
-end
-
-def blowup(num)
-  if num % 2 == 0
-    raise Lo_Exception.new(num)
-  else
-    raise Hi_Exception.new(num)
-  end
-end
-
-
-i = 1
-max = NUM+1
-while i < max
-  i+=1
-  some_function(i+1)
-end
diff --git a/benchmark/bm_so_fasta.rb b/benchmark/bm_so_fasta.rb
deleted file mode 100644
index 3f759ba7ae..0000000000
--- a/benchmark/bm_so_fasta.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org/
-# Contributed by Sokolov Yura
-
-$last = 42.0
-def gen_random (max,im=139968,ia=3877,ic=29573)
-    (max * ($last = ($last * ia + ic) % im)) / im
-end
-
-alu =
-   "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG"+
-   "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA"+
-   "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT"+
-   "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA"+
-   "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG"+
-   "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC"+
-   "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA"
-
-iub = [
-    ["a", 0.27],
-    ["c", 0.12],
-    ["g", 0.12],
-    ["t", 0.27],
-
-    ["B", 0.02],
-    ["D", 0.02],
-    ["H", 0.02],
-    ["K", 0.02],
-    ["M", 0.02],
-    ["N", 0.02],
-    ["R", 0.02],
-    ["S", 0.02],
-    ["V", 0.02],
-    ["W", 0.02],
-    ["Y", 0.02],
-]
-homosapiens = [
-    ["a", 0.3029549426680],
-    ["c", 0.1979883004921],
-    ["g", 0.1975473066391],
-    ["t", 0.3015094502008],
-]
-
-def make_repeat_fasta(id, desc, src, n)
-    puts ">#{id} #{desc}"
-    v = nil
-    width = 60
-    l = src.length
-    s = src * ((n / l) + 1)
-    s.slice!(n, l)
-    puts(s.scan(/.{1,#{width}}/).join("\n"))
-end
-
-def make_random_fasta(id, desc, table, n)
-    puts ">#{id} #{desc}"
-    rand, v = nil,nil
-    width = 60
-    chunk = 1 * width
-    prob = 0.0
-    table.each{|v| v[1]= (prob += v[1])}
-    for i in 1..(n/width)
-        puts((1..width).collect{
-            rand = gen_random(1.0)
-            table.find{|v| v[1]>rand}[0]
-        }.join)
-    end
-    if n%width != 0
-        puts((1..(n%width)).collect{
-            rand = gen_random(1.0)
-            table.find{|v| v[1]>rand}[0]
-        }.join)
-    end
-end
-
-
-n = (ARGV[0] or 250_000).to_i
-
-make_repeat_fasta('ONE', 'Homo sapiens alu', alu, n*2)
-make_random_fasta('TWO', 'IUB ambiguity codes', iub, n*3)
-make_random_fasta('THREE', 'Homo sapiens frequency', homosapiens, n*5)
-
diff --git a/benchmark/bm_so_k_nucleotide.rb b/benchmark/bm_so_k_nucleotide.rb
deleted file mode 100644
index dadab3e79c..0000000000
--- a/benchmark/bm_so_k_nucleotide.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org
-#
-# contributed by jose fco. gonzalez
-# modified by Sokolov Yura
-
-seq = String.new
-
-def frecuency( seq,length )
-    n, table = seq.length - length + 1, Hash.new(0)
-    f, i = nil, nil
-    (0 ... length).each do |f|
-        (f ... n).step(length) do |i|
-            table[seq[i,length]] += 1
-        end
-    end
-    [n,table]
-
-end
-
-def sort_by_freq( seq,length )
-    n,table = frecuency( seq,length )
-    a, b, v = nil, nil, nil
-    table.sort{|a,b| b[1] <=> a[1]}.each do |v|
-        puts "%s %.3f" % [v[0].upcase,((v[1]*100).to_f/n)]
-    end
-    puts
-end
-
-def find_seq( seq,s )
-    n,table = frecuency( seq,s.length )
-    puts "#{table[s].to_s}\t#{s.upcase}"
-end
-
-input = open(File.join(File.dirname($0), 'fasta.output.100000'), 'rb')
-
-line = input.gets while line !~ /^>THREE/
-line = input.gets
-
-while (line !~ /^>/) & line do
-    seq << line.chomp
-    line = input.gets
-end
-
-[1,2].each {|i| sort_by_freq( seq,i ) }
-
-%w(ggt ggta ggtatt ggtattttaatt ggtattttaatttatagt).each{|s| find_seq( seq,s) }
-
diff --git a/benchmark/bm_so_lists.rb b/benchmark/bm_so_lists.rb
deleted file mode 100644
index f8d26797aa..0000000000
--- a/benchmark/bm_so_lists.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#from http://www.bagley.org/~doug/shootout/bench/lists/lists.ruby
-
-NUM = 300
-SIZE = 10000
-
-def test_lists()
-  # create a list of integers (Li1) from 1 to SIZE
-  li1 = (1..SIZE).to_a
-  # copy the list to li2 (not by individual items)
-  li2 = li1.dup
-  # remove each individual item from left side of li2 and
-  # append to right side of li3 (preserving order)
-  li3 = Array.new
-  while (not li2.empty?)
-    li3.push(li2.shift)
-  end
-  # li2 must now be empty
-  # remove each individual item from right side of li3 and
-  # append to right side of li2 (reversing list)
-  while (not li3.empty?)
-    li2.push(li3.pop)
-  end
-  # li3 must now be empty
-  # reverse li1 in place
-  li1.reverse!
-  # check that first item is now SIZE
-  if li1[0] != SIZE then
-    p "not SIZE"
-    0
-  else
-    # compare li1 and li2 for equality
-    if li1 != li2 then
-      return(0)
-    else
-      # return the length of the list
-      li1.length
-    end
-  end
-end
-
-i = 0
-while i<NUM
-  i+=1
-  result = test_lists()
-end
-
-result
diff --git a/benchmark/bm_so_matrix.rb b/benchmark/bm_so_matrix.rb
deleted file mode 100644
index e2c5c8e559..0000000000
--- a/benchmark/bm_so_matrix.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: matrix-ruby.code,v 1.4 2004/11/13 07:42:14 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-
-n = 60 #Integer(ARGV.shift || 1)
-
-size = 40
-
-def mkmatrix(rows, cols)
-    count = 1
-    mx = Array.new(rows)
-    (0 .. (rows - 1)).each do |bi|
-        row = Array.new(cols, 0)
-        (0 .. (cols - 1)).each do |j|
-            row[j] = count
-            count += 1
-        end
-        mx[bi] = row
-    end
-    mx
-end
-
-def mmult(rows, cols, m1, m2)
-    m3 = Array.new(rows)
-    (0 .. (rows - 1)).each do |bi|
-        row = Array.new(cols, 0)
-        (0 .. (cols - 1)).each do |j|
-            val = 0
-            (0 .. (cols - 1)).each do |k|
-                val += m1.at(bi).at(k) * m2.at(k).at(j)
-            end
-            row[j] = val
-        end
-        m3[bi] = row
-    end
-    m3
-end
-
-m1 = mkmatrix(size, size)
-m2 = mkmatrix(size, size)
-mm = Array.new
-n.times do
-    mm = mmult(size, size, m1, m2)
-end
-# puts "#{mm[0][0]} #{mm[2][3]} #{mm[3][2]} #{mm[4][4]}"
-
-
diff --git a/benchmark/bm_so_meteor_contest.rb b/benchmark/bm_so_meteor_contest.rb
deleted file mode 100644
index 99cf6a91cc..0000000000
--- a/benchmark/bm_so_meteor_contest.rb
+++ /dev/null
@@ -1,564 +0,0 @@
-#!/usr/bin/env ruby
-#
-# The Computer Language Shootout
-#   http://shootout.alioth.debian.org
-#   contributed by Kevin Barnes (Ruby novice)
-
-# PROGRAM:  the main body is at the bottom.
-#   1) read about the problem here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
-#   2) see how I represent a board as a bitmask by reading the blank_board comments
-#   3) read as your mental paths take you
-
-def print *args
-end
-
-# class to represent all information about a particular rotation of a particular piece
-class Rotation
-  # an array (by location) containing a bit mask for how the piece maps at the given location.
-  # if the rotation is invalid at that location the mask will contain false
-  attr_reader :start_masks
-
-  # maps a direction to a relative location.  these differ depending on whether it is an even or
-  # odd row being mapped from
-  @@rotation_even_adder = { :west => -1, :east => 1, :nw => -7, :ne => -6, :sw => 5, :se => 6 }
-  @@rotation_odd_adder = { :west => -1, :east => 1, :nw => -6, :ne => -5, :sw => 6, :se => 7 }
-
-  def initialize( directions )
-    @even_offsets, @odd_offsets = normalize_offsets( get_values( directions ))
-
-    @even_mask = mask_for_offsets( @even_offsets)
-    @odd_mask = mask_for_offsets( @odd_offsets)
-
-    @start_masks = Array.new(60)
-
-    # create the rotational masks by placing the base mask at the location and seeing if
-    # 1) it overlaps the boundries and 2) it produces a prunable board.  if either of these
-    # is true the piece cannot be placed
-    0.upto(59) do | offset |
-      mask = is_even(offset) ? (@even_mask << offset) : (@odd_mask << offset)
-      if (blank_board & mask == 0 && !prunable(blank_board | mask, 0, true)) then
-        imask = compute_required( mask, offset)
-        @start_masks[offset] = [ mask, imask, imask | mask ]
-      else
-        @start_masks[offset] = false
-      end
-    end
-  end
-
-  def compute_required( mask, offset )
-    board = blank_board
-    0.upto(offset) { | i | board |= 1 << i }
-    board |= mask
-    return 0 if (!prunable(board | mask, offset))
-    board = flood_fill(board,58)
-    count = 0
-    imask = 0
-    0.upto(59) do | i |
-      if (board[i] == 0) then
-        imask |= (1 << i)
-        count += 1
-      end
-    end
-    (count > 0 && count < 5) ? imask : 0
-  end
-
-  def flood_fill( board, location)
-    return board if (board[location] == 1)
-    board |= 1 << location
-    row, col = location.divmod(6)
-    board = flood_fill( board, location - 1) if (col > 0)
-    board = flood_fill( board, location + 1) if (col < 4)
-    if (row % 2 == 0) then
-      board = flood_fill( board, location - 7) if (col > 0 && row > 0)
-      board = flood_fill( board, location - 6) if (row > 0)
-      board = flood_fill( board, location + 6) if (row < 9)
-      board = flood_fill( board, location + 5) if (col > 0 && row < 9)
-    else
-      board = flood_fill( board, location - 5) if (col < 4 && row > 0)
-      board = flood_fill( board, location - 6) if (row > 0)
-      board = flood_fill( board, location + 6) if (row < 9)
-      board = flood_fill( board, location + 7) if (col < 4 && row < 9)
-    end
-    board
-  end
-
-  # given a location, produces a list of relative locations covered by the piece at this rotation
-  def offsets( location)
-    if is_even( location) then
-      @even_offsets.collect { | value | value + location }
-    else
-      @odd_offsets.collect { | value | value + location }
-    end
-  end
-
-  # returns a set of offsets relative to the top-left most piece of the rotation (by even or odd rows)
-  # this is hard to explain. imagine we have this partial board:
-  #   0 0 0 0 0 x        [positions 0-5]
-  #    0 0 1 1 0 x       [positions 6-11]
-  #   0 0 1 0 0 x        [positions 12-17]
-  #    0 1 0 0 0 x       [positions 18-23]
-  #   0 1 0 0 0 x        [positions 24-29]
-  #    0 0 0 0 0 x       [positions 30-35]
-  #       ...
-  # The top-left of the piece is at position 8, the
-  # board would be passed as a set of positions (values array) containing [8,9,14,19,25] not necessarily in that
-  # sorted order.  Since that array starts on an odd row, the offsets for an odd row are: [0,1,6,11,17] obtained
-  # by subtracting 8 from everything.  Now imagine the piece shifted up and to the right so it's on an even row:
-  #   0 0 0 1 1 x        [positions 0-5]
-  #    0 0 1 0 0 x       [positions 6-11]
-  #   0 0 1 0 0 x        [positions 12-17]
-  #    0 1 0 0 0 x       [positions 18-23]
-  #   0 0 0 0 0 x        [positions 24-29]
-  #    0 0 0 0 0 x       [positions 30-35]
-  #       ...
-  # Now the positions are [3,4,8,14,19] which after subtracting the lowest value (3) gives [0,1,5,11,16] thus, the
-  # offsets for this particular piece are (in even, odd order) [0,1,5,11,16],[0,1,6,11,17] which is what
-  # this function would return
-  def normalize_offsets( values)
-    min = values.min
-    even_min = is_even(min)
-    other_min = even_min ? min + 6 : min + 7
-    other_values = values.collect do | value |
-      if is_even(value) then
-        value + 6 - other_min
-      else
-        value + 7 - other_min
-      end
-    end
-    values.collect! { | value | value - min }
-
-    if even_min then
-      [values, other_values]
-    else
-      [other_values, values]
-    end
-  end
-
-  # produce a bitmask representation of an array of offset locations
-  def mask_for_offsets( offsets )
-    mask = 0
-    offsets.each { | value | mask = mask + ( 1 << value ) }
-    mask
-  end
-
-  # finds a "safe" position that a position as described by a list of directions can be placed
-  # without falling off any edge of the board.  the values returned a location to place the first piece
-  # at so it will fit after making the described moves
-  def start_adjust( directions )
-    south = east = 0;
-    directions.each do | direction |
-      east += 1 if ( direction == :sw || direction == :nw || direction == :west )
-      south += 1 if ( direction == :nw || direction == :ne )
-    end
-    south * 6 + east
-  end
-
-  # given a set of directions places the piece (as defined by a set of directions) on the board at
-  # a location that will not take it off the edge
-  def get_values ( directions )
-    start = start_adjust(directions)
-    values = [ start ]
-    directions.each do | direction |
-      if (start % 12 >= 6) then
-        start += @@rotation_odd_adder[direction]
-      else
-        start += @@rotation_even_adder[direction]
-      end
-      values += [ start ]
-    end
-
-    # some moves take you back to an existing location, we'll strip duplicates
-    values.uniq
-  end
-end
-
-# describes a piece and caches information about its rotations to as to be efficient for iteration
-# ATTRIBUTES:
-#   rotations -- all the rotations of the piece
-#   type -- a numeic "name" of the piece
-#   masks -- an array by location of all legal rotational masks (a n inner array) for that location
-#   placed -- the mask that this piece was last placed at (not a location, but the actual mask used)
-class Piece
-  attr_reader :rotations, :type, :masks
-  attr_accessor :placed
-
-  # transform hashes that change one direction into another when you either flip or rotate a set of directions
-  @@flip_converter = { :west => :west, :east => :east, :nw => :sw, :ne => :se, :sw => :nw, :se => :ne }
-  @@rotate_converter = { :west => :nw, :east => :se, :nw => :ne, :ne => :east, :sw => :west, :se => :sw }
-
-  def initialize( directions, type )
-    @type = type
-    @rotations = Array.new();
-    @map = {}
-
-    generate_rotations( directions )
-    directions.collect! { | value | @@flip_converter[value] }
-    generate_rotations( directions )
-
-    # creates the masks AND a map that returns [location, rotation] for any given mask
-    # this is used when a board is found and we want to draw it, otherwise the map is unused
-    @masks = Array.new();
-    0.upto(59) do | i |
-      even = true
-      @masks[i] = @rotations.collect do | rotation |
-        mask = rotation.start_masks[i]
-        @map[mask[0]] = [ i, rotation ] if (mask)
-        mask || nil
-      end
-      @masks[i].compact!
-    end
-  end
-
-  # rotates a set of directions through all six angles and adds a Rotation to the list for each one
-  def generate_rotations( directions )
-    6.times do
-      rotations.push( Rotation.new(directions))
-      directions.collect! { | value | @@rotate_converter[value] }
-    end
-  end
-
-  # given a board string, adds this piece to the board at whatever location/rotation
-  # important: the outbound board string is 5 wide, the normal location notation is six wide (padded)
-  def fill_string( board_string)
-    location, rotation = @map[@placed]
-    rotation.offsets(location).each do | offset |
-      row, col = offset.divmod(6)
-      board_string[ row*5 + col, 1 ] = @type.to_s
-    end
-  end
-end
-
-# a blank bit board having this form:
-#
-#    0 0 0 0 0 1
-#     0 0 0 0 0 1
-#    0 0 0 0 0 1
-#     0 0 0 0 0 1
-#    0 0 0 0 0 1
-#     0 0 0 0 0 1
-#    0 0 0 0 0 1
-#     0 0 0 0 0 1
-#    0 0 0 0 0 1
-#     0 0 0 0 0 1
-#    1 1 1 1 1 1
-#
-# where left lest significant bit is the top left and the most significant is the lower right
-# the actual board only consists of the 0 places, the 1 places are blockers to keep things from running
-# off the edges or bottom
-def blank_board
-  0b111111100000100000100000100000100000100000100000100000100000100000
-end
-
-def full_board
-  0b111111111111111111111111111111111111111111111111111111111111111111
-end
-
-# determines if a location (bit position) is in an even row
-def is_even( location)
-  (location % 12) < 6
-end
-
-# support function that create three utility maps:
-#  $converter -- for each row an array that maps a five bit row (via array mapping)
-#                to the a a five bit representation of the bits below it
-#  $bit_count -- maps a five bit row (via array mapping) to the number of 1s in the row
-#  @@new_regions -- maps a five bit row (via array mapping) to an array of "region" arrays
-#                   a region array has three values the first is a mask of bits in the region,
-#                   the second is the count of those bits and the third is identical to the first
-#                   examples:
-#                           0b10010 => [ 0b01100, 2, 0b01100 ], [ 0b00001, 1, 0b00001]
-#                           0b01010 => [ 0b10000, 1, 0b10000 ], [ 0b00100, 1, 0b00100 ], [ 0b00001, 1, 0b00001]
-#                           0b10001 => [ 0b01110, 3, 0b01110 ]
-def create_collector_support
-  odd_map = [0b11, 0b110, 0b1100, 0b11000, 0b10000]
-  even_map = [0b1, 0b11, 0b110, 0b1100, 0b11000]
-
-  all_odds = Array.new(0b100000)
-  all_evens = Array.new(0b100000)
-  bit_counts = Array.new(0b100000)
-  new_regions = Array.new(0b100000)
-  0.upto(0b11111) do | i |
-    bit_count = odd = even = 0
-    0.upto(4) do | bit |
-      if (i[bit] == 1) then
-        bit_count += 1
-        odd |= odd_map[bit]
-        even |= even_map[bit]
-      end
-    end
-    all_odds[i] = odd
-    all_evens[i] = even
-    bit_counts[i] = bit_count
-    new_regions[i] = create_regions( i)
-  end
-
-  $converter = []
-  10.times { | row | $converter.push((row % 2 == 0) ? all_evens : all_odds) }
-  $bit_counts = bit_counts
-  $regions = new_regions.collect { | set | set.collect { | value | [ value, bit_counts[value], value] } }
-end
-
-# determines if a board is punable, meaning that there is no possibility that it
-# can be filled up with pieces.  A board is prunable if there is a grouping of unfilled spaces
-# that are not a multiple of five.  The following board is an example of a prunable board:
-#    0 0 1 0 0
-#     0 1 0 0 0
-#    1 1 0 0 0
-#     0 1 0 0 0
-#    0 0 0 0 0
-#       ...
-#
-# This board is prunable because the top left corner is only 3 bits in area, no piece will ever fit it
-# parameters:
-#   board -- an initial bit board (6 bit padded rows, see blank_board for format)
-#   location -- starting location, everything above and to the left is already full
-#   slotting -- set to true only when testing initial pieces, when filling normally
-#               additional assumptions are possible
-#
-# Algorithm:
-#    The algorithm starts at the top row (as determined by location) and iterates a row at a time
-#    maintainng counts of active open areas (kept in the collector array) each collector contains
-#    three values at the start of an iteration:
-#          0: mask of bits that would be adjacent to the collector in this row
-#          1: the number of bits collected so far
-#          2: a scratch space starting as zero, but used during the computation to represent
-#             the empty bits in the new row that are adjacent (position 0)
-#  The exact procedure is described in-code
-def prunable( board, location, slotting = false)
-  collectors = []
-  # loop accross the rows
-  (location / 6).to_i.upto(9) do | row_on |
-    # obtain a set of regions representing the bits of the curent row.
-    regions = $regions[(board >> (row_on * 6)) & 0b11111]
-    converter = $converter[row_on]
-
-    # track the number of collectors at the start of the cycle so that
-    # we don't compute against newly created collectors, only existing collectors
-    initial_collector_count = collectors.length
-
-    # loop against the regions.  For each region of the row
-    # we will see if it connects to one or more existing collectors.
-    # if it connects to 1 collector, the bits from the region are added to the
-    # bits of the collector and the mask is placed in collector[2]
-    # If the region overlaps more than one collector then all the collectors
-    # it overlaps with are merged into the first one (the others are set to nil in the array)
-    # if NO collectors are found then the region is copied as a new collector
-    regions.each do | region |
-      collector_found = nil
-      region_mask = region[2]
-      initial_collector_count.times do | collector_num |
-        collector = collectors[collector_num]
-        if (collector) then
-          collector_mask = collector[0]
-          if (collector_mask & region_mask != 0) then
-            if (collector_found) then
-              collector_found[0] |= collector_mask
-              collector_found[1] += collector[1]
-              collector_found[2] |= collector[2]
-              collectors[collector_num] = nil
-            else
-              collector_found = collector
-              collector[1] += region[1]
-              collector[2] |= region_mask
-            end
-          end
-        end
-      end
-      if (collector_found == nil) then
-        collectors.push(Array.new(region))
-      end
-    end
-
-    # check the existing collectors, if any collector overlapped no bits in the region its [2] value will
-    # be zero.  The size of any such reaason is tested if it is not a muliple of five true is returned since
-    # the board is prunable.  if it is a multiple of five it is removed.
-    # Collector that are still active have a new adjacent value [0] set based n the matched bits
-    # and have [2] cleared out for the next cycle.
-    collectors.length.times do | collector_num |
-      collector = collectors[collector_num]
-      if (collector) then
-        if (collector[2] == 0) then
-          return true if (collector[1] % 5 != 0)
-          collectors[collector_num] = nil
-        else
-          # if a collector matches all bits in the row then we can return unprunable early for the
-          # follwing reasons:
-          #    1) there can be no more unavailable bits bince we fill from the top left downward
-          #    2) all previous regions have been closed or joined so only this region can fail
-          #    3) this region must be good since there can never be only 1 region that is nuot
-          #       a multiple of five
-          # this rule only applies when filling normally, so we ignore the rule if we are "slotting"
-          # in pieces to see what configurations work for them (the only other time this algorithm is used).
-          return false if (collector[2] == 0b11111 && !slotting)
-          collector[0] = converter[collector[2]]
-          collector[2] = 0
-        end
-      end
-    end
-
-    # get rid of all the empty converters for the next round
-    collectors.compact!
-  end
-  return false if (collectors.length <= 1) # 1 collector or less and the region is fine
-  collectors.any? { | collector | (collector[1] % 5) != 0 } # more than 1 and we test them all for bad size
-end
-
-# creates a region given a row mask.  see prunable for what a "region" is
-def create_regions( value )
-  regions = []
-  cur_region = 0
-  5.times do | bit |
-    if (value[bit] == 0) then
-      cur_region |= 1 << bit
-    else
-      if (cur_region != 0 ) then
-        regions.push( cur_region)
-        cur_region = 0;
-      end
-    end
-  end
-  regions.push(cur_region) if (cur_region != 0)
-  regions
-end
-
-# find up to the counted number of solutions (or all solutions) and prints the final result
-def find_all
-  find_top( 1)
-  find_top( 0)
-  print_results
-end
-
-# show the board
-def print_results
-  print "#{@boards_found} solutions found\n\n"
-  print_full_board( @min_board)
-  print "\n"
-  print_full_board( @max_board)
-  print "\n"
-end
-
-# finds solutions.  This special version of the main function is only used for the top level
-# the reason for it is basically to force a particular ordering on how the rotations are tested for
-# the first piece.  It is called twice, first looking for placements of the odd rotations and then
-# looking for placements of the even locations.
-#
-# WHY?
-#   Since any found solution has an inverse we want to maximize finding solutions that are not already found
-#   as an inverse.  The inverse will ALWAYS be 3 one of the piece configurations that is exactly 3 rotations away
-#   (an odd number).  Checking even vs odd then produces a higher probability of finding more pieces earlier
-#   in the cycle.  We still need to keep checking all the permutations, but our probability of finding one will
-#   diminsh over time.  Since we are TOLD how many to search for this lets us exit before checking all pieces
-#   this bennifit is very great when seeking small numbers of solutions and is 0 when looking for more than the
-#   maximum number
-def find_top( rotation_skip)
-  board = blank_board
-  (@pieces.length-1).times do
-    piece = @pieces.shift
-    piece.masks[0].each do | mask, imask, cmask |
-      if ((rotation_skip += 1) % 2 == 0) then
-        piece.placed = mask
-        find( 1, 1, board | mask)
-      end
-    end
-    @pieces.push(piece)
-  end
-  piece = @pieces.shift
-  @pieces.push(piece)
-end
-
-# the normail find routine, iterates through the available pieces, checks all rotations at the current location
-# and adds any boards found.  depth is acheived via recursion.  the overall approach is described
-# here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
-# parameters:
-#  start_location -- where to start looking for place for the next piece at
-#  placed -- number of pieces placed
-#  board -- current state of the board
-#
-# see in-code comments
-def find( start_location, placed, board)
-  # find the next location to place a piece by looking for an empty bit
-  while board[start_location] == 1
-    start_location += 1
-  end
-
-  @pieces.length.times do
-    piece = @pieces.shift
-    piece.masks[start_location].each do | mask, imask, cmask |
-      if ( board & cmask == imask) then
-        piece.placed = mask
-        if (placed == 9) then
-          add_board
-        else
-          find( start_location + 1, placed + 1, board | mask)
-        end
-      end
-    end
-    @pieces.push(piece)
-  end
-end
-
-# print the board
-def print_full_board( board_string)
-  10.times do | row |
-    print " " if (row % 2 == 1)
-    5.times do | col |
-      print "#{board_string[row*5 + col,1]} "
-    end
-    print "\n"
-  end
-end
-
-# when a board is found we "draw it" into a string and then flip that string, adding both to
-# the list (hash) of solutions if they are unique.
-def add_board
-  board_string = "99999999999999999999999999999999999999999999999999"
-  @all_pieces.each {  | piece | piece.fill_string( board_string ) }
-  save( board_string)
-  save( board_string.reverse)
-end
-
-# adds a board string to the list (if new) and updates the current best/worst board
-def save( board_string)
-  if (@all_boards[board_string] == nil) then
-    @min_board = board_string if (board_string < @min_board)
-    @max_board = board_string if (board_string > @max_board)
-    @all_boards.store(board_string,true)
-    @boards_found += 1
-
-    # the exit motif is a time saver.  Ideally the function should return, but those tests
-    # take noticable time (performance).
-    if (@boards_found == @stop_count) then
-      print_results
-      exit(0)
-    end
-  end
-end
-
-
-##
-## MAIN BODY :)
-##
-create_collector_support
-@pieces = [
-  Piece.new( [ :nw, :ne, :east, :east ], 2),
-  Piece.new( [ :ne, :se, :east, :ne ], 7),
-  Piece.new( [ :ne, :east, :ne, :nw ], 1),
-  Piece.new( [ :east, :sw, :sw, :se ], 6),
-  Piece.new( [ :east, :ne, :se, :ne ], 5),
-  Piece.new( [ :east, :east, :east, :se ], 0),
-  Piece.new( [ :ne, :nw, :se, :east, :se ], 4),
-  Piece.new( [ :se, :se, :se, :west ], 9),
-  Piece.new( [ :se, :se, :east, :se ], 8),
-  Piece.new( [ :east, :east, :sw, :se ], 3)
-  ];
-
-@all_pieces = Array.new( @pieces)
-
-@min_board = "99999999999999999999999999999999999999999999999999"
-@max_board = "00000000000000000000000000000000000000000000000000"
-@stop_count = ARGV[0].to_i || 2089
-@all_boards = {}
-@boards_found = 0
-
-find_all ######## DO IT!!!
-
diff --git a/benchmark/bm_so_nested_loop.rb b/benchmark/bm_so_nested_loop.rb
deleted file mode 100644
index a0513f8c47..0000000000
--- a/benchmark/bm_so_nested_loop.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: nestedloop-ruby.code,v 1.4 2004/11/13 07:42:22 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# from Avi Bryant
-
-n = 16 # Integer(ARGV.shift || 1)
-x = 0
-n.times do
-    n.times do
-        n.times do
-            n.times do
-                n.times do
-                    n.times do
-                        x += 1
-                    end
-                end
-            end
-        end
-    end
-end
-# puts x
-
-
diff --git a/benchmark/bm_so_nsieve_bits.rb b/benchmark/bm_so_nsieve_bits.rb
deleted file mode 100644
index 019b8b6382..0000000000
--- a/benchmark/bm_so_nsieve_bits.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/ruby
-#
-# The Great Computer Language Shootout
-# http://shootout.alioth.debian.org/
-#
-# nsieve-bits in Ruby
-# Contributed by Glenn Parker, March 2005
-
-CharExponent = 3
-BitsPerChar = 1 << CharExponent
-LowMask = BitsPerChar - 1
-
-def sieve(m)
-  items = "\xFF" * ((m / BitsPerChar) + 1)
-  masks = ""
-  BitsPerChar.times do |b|
-    masks << (1 << b).chr
-  end
-
-  count = 0
-  pmax = m - 1
-  2.step(pmax, 1) do |p|
-    if items[p >> CharExponent][p & LowMask] == 1
-      count += 1
-      p.step(pmax, p) do |mult|
-	a = mult >> CharExponent
-	b = mult & LowMask
-	items[a] -= masks[b] if items[a][b] != 0
-      end
-    end
-  end
-  count
-end
-
-n = 9 # (ARGV[0] || 2).to_i
-n.step(n - 2, -1) do |exponent|
-  break if exponent < 0
-  m = 2 ** exponent * 10_000
-  count = sieve(m)
-  printf "Primes up to %8d %8d\n", m, count
-end
-
diff --git a/benchmark/bm_so_object.rb b/benchmark/bm_so_object.rb
deleted file mode 100644
index e8607c7199..0000000000
--- a/benchmark/bm_so_object.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: objinst-ruby.code,v 1.4 2004/11/13 07:42:25 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# with help from Aristarkh Zagorodnikov
-
-class Toggle
-    def initialize(start_state)
-        @bool = start_state
-    end
-
-    def value
-        @bool
-    end
-
-    def activate
-        @bool = !@bool
-        self
-    end
-end
-
-class NthToggle < Toggle
-    def initialize(start_state, max_counter)
-        super start_state
-        @count_max = max_counter
-        @counter = 0
-    end
-
-    def activate
-        @counter += 1
-        if @counter >= @count_max
-            @bool = !@bool
-            @counter = 0
-        end
-        self
-    end
-end
-
-n = 1500000 # (ARGV.shift || 1).to_i
-
-toggle = Toggle.new 1
-5.times do
-    toggle.activate.value ? 'true' : 'false'
-end
-n.times do
-    toggle = Toggle.new 1
-end
-
-ntoggle = NthToggle.new 1, 3
-8.times do
-    ntoggle.activate.value ? 'true' : 'false'
-end
-n.times do
-    ntoggle = NthToggle.new 1, 3
-end
-
diff --git a/benchmark/bm_so_pidigits.rb b/benchmark/bm_so_pidigits.rb
deleted file mode 100644
index c7d6fbfb4d..0000000000
--- a/benchmark/bm_so_pidigits.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# The Great Computer Language Shootout
-# http://shootout.alioth.debian.org/
-#
-# contributed by Gabriele Renzi
-
-class PiDigitSpigot
-
-    def initialize()
-        @z = Transformation.new 1,0,0,1
-        @x = Transformation.new 0,0,0,0
-        @inverse = Transformation.new 0,0,0,0
-    end
-
-    def next!
-        @y = @z.extract(3)
-        if safe? @y
-            @z = produce(@y)
-            @y
-        else
-            @z = consume @x.next!()
-            next!()
-        end
-    end
-
-    def safe?(digit)
-        digit == @z.extract(4)
-    end
-
-    def produce(i)
-        @inverse.qrst(10,-10*i,0,1).compose(@z)
-    end
-
-    def consume(a)
-        @z.compose(a)
-    end
-end
-
-
-class Transformation
-    attr_reader :q, :r, :s, :t
-    def initialize (q, r, s, t)
-        @q,@r,@s,@t,@k = q,r,s,t,0
-    end
-
-    def next!()
-        @q = @k = @k + 1
-        @r = 4 * @k + 2
-        @s = 0
-        @t = 2 * @k + 1
-        self
-    end
-
-    def extract(j)
-        (@q * j + @r) / (@s * j + @t)
-    end
-
-    def compose(a)
-        self.class.new( @q * a.q,
-                        @q * a.r + r * a.t,
-                        @s * a.q + t * a.s,
-                        @s * a.r + t * a.t
-                    )
-    end
-
-    def qrst *args
-        initialize *args
-        self
-    end
-
-
-end
-
-
-WIDTH = 10
-n = 2_500 # Integer(ARGV[0])
-j = 0
-
-digits = PiDigitSpigot.new
-
-while n > 0
-    if n >= WIDTH
-        WIDTH.times {print digits.next!}
-        j += WIDTH
-    else
-        n.times {print digits.next!}
-        (WIDTH-n).times {print " "}
-        j += n
-    end
-    puts "\t:"+j.to_s
-    n -= WIDTH
-end
-
diff --git a/benchmark/bm_so_random.rb b/benchmark/bm_so_random.rb
deleted file mode 100644
index 57f700b863..0000000000
--- a/benchmark/bm_so_random.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# from http://www.bagley.org/~doug/shootout/bench/random/random.ruby
-
-IM = 139968.0
-IA = 3877.0
-IC = 29573.0
-
-$last = 42.0
-
-def gen_random(max)
-  (max * ($last = ($last * IA + IC) % IM)) / IM
-end
-
-N = 3_000_000
-
-i=0
-while i<N
-  i+=1
-  gen_random(100.0)
-end
-# "%.9f" % gen_random(100.0)
diff --git a/benchmark/bm_so_reverse_complement.rb b/benchmark/bm_so_reverse_complement.rb
deleted file mode 100644
index 82ea666994..0000000000
--- a/benchmark/bm_so_reverse_complement.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/ruby
-# The Great Computer Language Shootout
-# http://shootout.alioth.debian.org/
-#
-# Contributed by Peter Bjarke Olsen
-# Modified by Doug King
-
-seq=Array.new
-
-def revcomp(seq)
-  seq.reverse!.tr!('wsatugcyrkmbdhvnATUGCYRKMBDHVN','WSTAACGRYMKVHDBNTAACGRYMKVHDBN')
-  stringlen=seq.length
-  0.step(stringlen-1,60) {|x| print seq.slice(x,60) , "\n"}
-end
-
-input = open(File.join(File.dirname($0), 'fasta.output.2500000'), 'rb')
-
-while input.gets
-  if $_ =~ />/
-    if seq.length != 0
-      revcomp(seq.join)
-      seq=Array.new
-    end
-    puts $_
-  else
-    $_.sub(/\n/,'')
-    seq.push $_
-  end
-end
-revcomp(seq.join)
diff --git a/benchmark/bm_so_sieve.rb b/benchmark/bm_so_sieve.rb
deleted file mode 100644
index 3f1b138bd1..0000000000
--- a/benchmark/bm_so_sieve.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# from http://www.bagley.org/~doug/shootout/bench/sieve/sieve.ruby
-num = 500
-count = i = j = 0
-flags0 = Array.new(8192,1)
-k = 0
-while k < num
-  k+=1
-  count = 0
-  flags = flags0.dup
-  i = 2
-  while i<8192
-    i+=1
-    if flags[i]
-      # remove all multiples of prime: i
-      j = i*i
-      while j < 8192
-        j += i
-        flags[j] = nil
-      end
-      count += 1
-    end
-  end
-end
-count
diff --git a/benchmark/bm_vm1_block.rb b/benchmark/bm_vm1_block.rb
deleted file mode 100644
index 0a97883974..0000000000
--- a/benchmark/bm_vm1_block.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-def m
-  yield
-end
-
-i=0
-while i<30_000_000 # while loop 1
-  i+=1
-  m{
-  }
-end
diff --git a/benchmark/bm_vm1_const.rb b/benchmark/bm_vm1_const.rb
deleted file mode 100644
index 066916dc31..0000000000
--- a/benchmark/bm_vm1_const.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-Const = 1
-
-i = 0
-while i<30_000_000 # while loop 1
-  i+= 1
-  j = Const
-  k = Const
-end
diff --git a/benchmark/bm_vm1_ensure.rb b/benchmark/bm_vm1_ensure.rb
deleted file mode 100644
index b1948f7621..0000000000
--- a/benchmark/bm_vm1_ensure.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-i=0
-while i<30_000_000 # benchmark loop 1
-  i+=1
-  begin
-    begin
-    ensure
-    end
-  ensure
-  end
-end
-
diff --git a/benchmark/bm_vm1_ivar.rb b/benchmark/bm_vm1_ivar.rb
deleted file mode 100644
index 3ba56427f4..0000000000
--- a/benchmark/bm_vm1_ivar.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-@a = 1
-
-i = 0
-while i<30_000_000 # while loop 1
-  i+= 1
-  j = @a
-  k = @a
-end
diff --git a/benchmark/bm_vm1_ivar_set.rb b/benchmark/bm_vm1_ivar_set.rb
deleted file mode 100644
index c8076c6ab6..0000000000
--- a/benchmark/bm_vm1_ivar_set.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i = 0
-while i<30_000_000 # while loop 1
-  i+= 1
-  @a = 1
-  @b = 2
-end
diff --git a/benchmark/bm_vm1_length.rb b/benchmark/bm_vm1_length.rb
deleted file mode 100644
index ccb773278f..0000000000
--- a/benchmark/bm_vm1_length.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-a = 'abc'
-b = [1, 2, 3]
-i=0
-while i<30_000_000 # while loop 1
-  i+=1
-  a.length
-  b.length
-end
-
diff --git a/benchmark/bm_vm1_neq.rb b/benchmark/bm_vm1_neq.rb
deleted file mode 100644
index 9254a0ca9b..0000000000
--- a/benchmark/bm_vm1_neq.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i = 0
-obj1 = Object.new
-obj2 = Object.new
-
-while i<30_000_000 # while loop 1
-  i+= 1
-  obj1 != obj2
-end
diff --git a/benchmark/bm_vm1_not.rb b/benchmark/bm_vm1_not.rb
deleted file mode 100644
index ee9d0f3605..0000000000
--- a/benchmark/bm_vm1_not.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-i = 0
-obj = Object.new
-
-while i<30_000_000 # while loop 1
-  i+= 1
-  !obj
-end
diff --git a/benchmark/bm_vm1_rescue.rb b/benchmark/bm_vm1_rescue.rb
deleted file mode 100644
index 3af12bb0f3..0000000000
--- a/benchmark/bm_vm1_rescue.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-i=0
-while i<30_000_000 # while loop 1
-  i+=1
-  begin
-  rescue
-  end
-end
diff --git a/benchmark/bm_vm1_simplereturn.rb b/benchmark/bm_vm1_simplereturn.rb
deleted file mode 100644
index 8e9bcb0129..0000000000
--- a/benchmark/bm_vm1_simplereturn.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
-  return 1
-end
-i=0
-while i<30_000_000 # while loop 1
-  i+=1
-  m
-end
-
diff --git a/benchmark/bm_vm1_swap.rb b/benchmark/bm_vm1_swap.rb
deleted file mode 100644
index 611baf6b99..0000000000
--- a/benchmark/bm_vm1_swap.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-a = 1
-b = 2
-i=0
-while i<30_000_000 # while loop 1
-  i+=1
-  a, b = b, a
-end
-
diff --git a/benchmark/bm_vm2_array.rb b/benchmark/bm_vm2_array.rb
deleted file mode 100644
index 7713ae9f25..0000000000
--- a/benchmark/bm_vm2_array.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i=0
-while i<6_000_000 # benchmark loop 2
-  i+=1
-  a = [1,2,3,4,5,6,7,8,9,10]
-end
diff --git a/benchmark/bm_vm2_case.rb b/benchmark/bm_vm2_case.rb
deleted file mode 100644
index cd09788a85..0000000000
--- a/benchmark/bm_vm2_case.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-i=0
-while i<6_000_000 # while loop 2
-  case :foo
-  when :bar
-    raise
-  when :baz
-    raise
-  when :boo
-    raise
-  when :foo
-    i+=1
-  end
-end
-
diff --git a/benchmark/bm_vm2_defined_method.rb b/benchmark/bm_vm2_defined_method.rb
deleted file mode 100644
index 06c0d01baa..0000000000
--- a/benchmark/bm_vm2_defined_method.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class Object
-  define_method(:m){}
-end
-
-i=0
-while i<6_000_000 # benchmark loop 2
-  i+=1
-  m; m; m; m; m; m; m; m;
-end
diff --git a/benchmark/bm_vm2_eval.rb b/benchmark/bm_vm2_eval.rb
deleted file mode 100644
index e72b4661ac..0000000000
--- a/benchmark/bm_vm2_eval.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i=0
-while i<6_000_000 # benchmark loop 2
-  i+=1
-  eval("1")
-end
-
diff --git a/benchmark/bm_vm2_method.rb b/benchmark/bm_vm2_method.rb
deleted file mode 100644
index f92e39a73f..0000000000
--- a/benchmark/bm_vm2_method.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
-  nil
-end
-
-i=0
-while i<6_000_000 # benchmark loop 2
-  i+=1
-  m; m; m; m; m; m; m; m;
-end
diff --git a/benchmark/bm_vm2_mutex.rb b/benchmark/bm_vm2_mutex.rb
deleted file mode 100644
index 01b1c478cb..0000000000
--- a/benchmark/bm_vm2_mutex.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'thread'
-
-m = Mutex.new
-
-i=0
-while i<6_000_000 # benchmark loop 2
-  i+=1
-  m.synchronize{}
-end
diff --git a/benchmark/bm_vm2_poly_method.rb b/benchmark/bm_vm2_poly_method.rb
deleted file mode 100644
index 921457d817..0000000000
--- a/benchmark/bm_vm2_poly_method.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class C1
-  def m
-    1
-  end
-end
-class C2
-  def m
-    2
-  end
-end
-
-o1 = C1.new
-o2 = C2.new
-
-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_poly_method_ov.rb b/benchmark/bm_vm2_poly_method_ov.rb
deleted file mode 100644
index bf09837dd7..0000000000
--- a/benchmark/bm_vm2_poly_method_ov.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class C1
-  def m
-    1
-  end
-end
-class C2
-  def m
-    2
-  end
-end
-
-o1 = C1.new
-o2 = C2.new
-
-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_proc.rb b/benchmark/bm_vm2_proc.rb
deleted file mode 100644
index 3f51056bf9..0000000000
--- a/benchmark/bm_vm2_proc.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-def m &b
-  b
-end
-
-pr = m{
-  a = 1
-}
-
-i=0
-while i<6_000_000 # benchmark loop 2
-  i+=1
-  pr.call
-end
-
diff --git a/benchmark/bm_vm2_regexp.rb b/benchmark/bm_vm2_regexp.rb
deleted file mode 100644
index 428099e55a..0000000000
--- a/benchmark/bm_vm2_regexp.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i=0
-str = 'xxxhogexxx'
-while i<6_000_000 # benchmark loop 2
-  /hoge/ =~ str
-  i+=1
-end
diff --git a/benchmark/bm_vm2_send.rb b/benchmark/bm_vm2_send.rb
deleted file mode 100644
index 37c79fb1c3..0000000000
--- a/benchmark/bm_vm2_send.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class C
-  def m
-  end
-end
-
-o = C.new
-
-i=0
-while i<6_000_000 # benchmark loop 2
-  i+=1
-  o.__send__ :m
-end
diff --git a/benchmark/bm_vm2_super.rb b/benchmark/bm_vm2_super.rb
deleted file mode 100644
index d4f0b647de..0000000000
--- a/benchmark/bm_vm2_super.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-
-class C
-  def m
-    1
-  end
-end
-
-class CC < C
-  def m
-    super()
-  end
-end
-
-obj = CC.new
-
-i = 0
-while i<6_000_000 # benchmark loop 2
-  obj.m
-  i+=1
-end
diff --git a/benchmark/bm_vm2_unif1.rb b/benchmark/bm_vm2_unif1.rb
deleted file mode 100644
index 775f4d37e6..0000000000
--- a/benchmark/bm_vm2_unif1.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i = 0
-def m a, b
-end
-
-while i<6_000_000 # benchmark loop 2
-  i+=1
-  m 100, 200
-end
diff --git a/benchmark/bm_vm2_zsuper.rb b/benchmark/bm_vm2_zsuper.rb
deleted file mode 100644
index 7e90df1822..0000000000
--- a/benchmark/bm_vm2_zsuper.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-i = 0
-
-class C
-  def m a
-    1
-  end
-end
-
-class CC < C
-  def m a
-    super
-  end
-end
-
-obj = CC.new
-
-while i<6_000_000 # benchmark loop 2
-  obj.m 10
-  i+=1
-end
diff --git a/benchmark/bm_vm3_clearmethodcache.rb b/benchmark/bm_vm3_clearmethodcache.rb
deleted file mode 100644
index a25c372f06..0000000000
--- a/benchmark/bm_vm3_clearmethodcache.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i=0
-while i<200_000
-  i+=1
-
-  Class.new{
-    def m; end
-  }
-end
diff --git a/benchmark/bm_vm3_gc.rb b/benchmark/bm_vm3_gc.rb
deleted file mode 100755
index 7db9829d44..0000000000
--- a/benchmark/bm_vm3_gc.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /usr/bin/ruby
-5000.times do
-  100.times do
-    {"xxxx"=>"yyyy"}
-  end
-  GC.start
-end
diff --git a/benchmark/bm_vm_thread_alive_check1.rb b/benchmark/bm_vm_thread_alive_check1.rb
deleted file mode 100644
index c993accdda..0000000000
--- a/benchmark/bm_vm_thread_alive_check1.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-5_000.times{
-  t = Thread.new{}
-  while t.alive?
-    Thread.pass
-  end
-}
diff --git a/benchmark/bm_vm_thread_create_join.rb b/benchmark/bm_vm_thread_create_join.rb
deleted file mode 100644
index 325a66d587..0000000000
--- a/benchmark/bm_vm_thread_create_join.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i=0
-while i<100_000 # benchmark loop 3
-  i+=1
-  Thread.new{
-  }.join
-end
diff --git a/benchmark/bm_vm_thread_mutex1.rb b/benchmark/bm_vm_thread_mutex1.rb
deleted file mode 100644
index 588506e87c..0000000000
--- a/benchmark/bm_vm_thread_mutex1.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# one thread, one mutex (no contention)
-
-require 'thread'
-m = Mutex.new
-r = 0
-max = 2000
-lmax = max * max
-(1..1).map{
-  Thread.new{
-    i=0
-    while i<lmax
-      i+=1
-      m.synchronize{
-        r += 1
-      }
-    end
-  }
-}.each{|e|
-  e.join
-}
-raise r.to_s if r != max * max
diff --git a/benchmark/bm_vm_thread_mutex2.rb b/benchmark/bm_vm_thread_mutex2.rb
deleted file mode 100644
index d700b146d4..0000000000
--- a/benchmark/bm_vm_thread_mutex2.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# two threads, one mutex
-
-require 'thread'
-m = Mutex.new
-r = 0
-max = 2000
-lmax = (max * max)/2
-(1..2).map{
-  Thread.new{
-    i=0
-    while i<lmax
-      i+=1
-      m.synchronize{
-        r += 1
-      }
-    end
-  }
-}.each{|e|
-  e.join
-}
-raise r.to_s if r != max * max
diff --git a/benchmark/bm_vm_thread_mutex3.rb b/benchmark/bm_vm_thread_mutex3.rb
deleted file mode 100644
index f502b6ac84..0000000000
--- a/benchmark/bm_vm_thread_mutex3.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# 1000 threads, one mutex
-
-require 'thread'
-m = Mutex.new
-r = 0
-max = 2000
-(1..max).map{
-  Thread.new{
-    i=0
-    while i<max
-      i+=1
-      m.synchronize{
-        r += 1
-      }
-    end
-  }
-}.each{|e|
-  e.join
-}
-raise r.to_s if r != max * max
diff --git a/benchmark/bm_vm_thread_pass.rb b/benchmark/bm_vm_thread_pass.rb
deleted file mode 100644
index b5b3c0bc85..0000000000
--- a/benchmark/bm_vm_thread_pass.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Plenty Thtread.pass
-# A performance may depend on GVL implementation.
-
-tmax = (ARGV.shift || 2).to_i
-lmax = 200_000 / tmax
-
-(1..tmax).map{
-  Thread.new{
-    lmax.times{
-      Thread.pass
-    }
-  }
-}.each{|t| t.join}
-
-
diff --git a/benchmark/bm_vm_thread_pass_flood.rb b/benchmark/bm_vm_thread_pass_flood.rb
deleted file mode 100644
index 56b5b0a956..0000000000
--- a/benchmark/bm_vm_thread_pass_flood.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-1000.times{
-  Thread.new{loop{Thread.pass}}
-}
-
-i=0
-while i<10000
-  i += 1
-end
diff --git a/benchmark/bm_vm_thread_pipe.rb b/benchmark/bm_vm_thread_pipe.rb
deleted file mode 100644
index 272d231eba..0000000000
--- a/benchmark/bm_vm_thread_pipe.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# Mesure small and plenty pipe read/write.
-# A performance may depend on GVL implementation.
-
-lmax = 100_000
-r, w = IO.pipe
-[Thread.new{
-  lmax.times{
-    w.write('a')
-  }
-  p "w:exit"
-}, Thread.new{
-  lmax.times{
-    r.read(1)
-  }
-  p "r:exit"
-}].each{|t| t.join}
-
diff --git a/benchmark/bmx_temp.rb b/benchmark/bmx_temp.rb
deleted file mode 100644
index 0b4b219ca2..0000000000
--- a/benchmark/bmx_temp.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
-  nil
-end
-
-i=0
-while i<800000 # benchmark loop 2
-  i+=1
-  m; m; m; m; m; m; m; m;
-end
diff --git a/benchmark/cgi_escape_html.yml b/benchmark/cgi_escape_html.yml
new file mode 100644
index 0000000000..af6abd08ac
--- /dev/null
+++ b/benchmark/cgi_escape_html.yml
@@ -0,0 +1,40 @@
+prelude: require 'cgi/escape'
+benchmark:
+  - name: escape_html_blank
+    prelude: str = ""
+    script: CGI.escapeHTML(str)
+    loop_count: 20000000
+  - name: escape_html_short_none
+    prelude: str = "abcde"
+    script: CGI.escapeHTML(str)
+    loop_count: 20000000
+  - name: escape_html_short_one
+    prelude: str = "abcd<"
+    script: CGI.escapeHTML(str)
+    loop_count: 20000000
+  - name: escape_html_short_all
+    prelude: str = "'&\"<>"
+    script: CGI.escapeHTML(str)
+    loop_count: 5000000
+  - name: escape_html_long_none
+    prelude: str = "abcde" * 300
+    script: CGI.escapeHTML(str)
+    loop_count: 1000000
+  - name: escape_html_long_all
+    prelude: str = "'&\"<>" * 10
+    script: CGI.escapeHTML(str)
+    loop_count: 1000000
+  - name: escape_html_real
+    prelude: | # http://example.com/
+      str = <<~HTML
+        <body>
+        <div>
+            <h1>Example Domain</h1>
+            <p>This domain is established to be used for illustrative examples in documents. You may use this
+            domain in examples without prior coordination or asking for permission.</p>
+            <p><a href="http://www.iana.org/domains/example">More information...</a></p>
+        </div>
+        </body>
+      HTML
+    script: CGI.escapeHTML(str)
+    loop_count: 1000000
diff --git a/benchmark/complex_float_add.yml b/benchmark/complex_float_add.yml
new file mode 100644
index 0000000000..d0150c5e5b
--- /dev/null
+++ b/benchmark/complex_float_add.yml
@@ -0,0 +1,7 @@
+prelude: |
+  max, min = 1000.0, -1000.0
+  a = Complex(rand(max)+min, rand(max)+min)
+  b = Complex(rand(max)+min, rand(max)+min)
+benchmark:
+  complex_float_add: c = a + b
+loop_count: 1000000
diff --git a/benchmark/complex_float_div.yml b/benchmark/complex_float_div.yml
new file mode 100644
index 0000000000..b9f5e1d51c
--- /dev/null
+++ b/benchmark/complex_float_div.yml
@@ -0,0 +1,7 @@
+prelude: |
+  max, min = 1000.0, -1000.0
+  a = Complex(rand(max)+min, rand(max)+min)
+  b = Complex(rand(max)+min, rand(max)+min)
+benchmark:
+  complex_float_div: c = a / b
+loop_count: 1000000
diff --git a/benchmark/complex_float_mul.yml b/benchmark/complex_float_mul.yml
new file mode 100644
index 0000000000..59b096a6dc
--- /dev/null
+++ b/benchmark/complex_float_mul.yml
@@ -0,0 +1,7 @@
+prelude: |
+  max, min = 1000.0, -1000.0
+  a = Complex(rand(max)+min, rand(max)+min)
+  b = Complex(rand(max)+min, rand(max)+min)
+benchmark:
+  complex_float_mul: c = a * b
+loop_count: 1000000
diff --git a/benchmark/complex_float_new.yml b/benchmark/complex_float_new.yml
new file mode 100644
index 0000000000..6fcde3125b
--- /dev/null
+++ b/benchmark/complex_float_new.yml
@@ -0,0 +1,7 @@
+prelude: |
+  max, min = 1000.0, -1000.0
+  a = Complex(rand(max)+min, rand(max)+min)
+  b = Complex(rand(max)+min, rand(max)+min)
+benchmark:
+  complex_float_new: c = Complex(a, b)
+loop_count: 1000000
diff --git a/benchmark/complex_float_power.yml b/benchmark/complex_float_power.yml
new file mode 100644
index 0000000000..c40a31ab55
--- /dev/null
+++ b/benchmark/complex_float_power.yml
@@ -0,0 +1,7 @@
+prelude: |
+  max, min = 1000.0, -1000.0
+  a = Complex(rand(max)+min, rand(max)+min)
+  b = Complex(rand(max)+min, rand(max)+min)
+benchmark:
+  complex_float_power: c = a ** b
+loop_count: 1000000
diff --git a/benchmark/complex_float_sub.yml b/benchmark/complex_float_sub.yml
new file mode 100644
index 0000000000..3fafe7cdbe
--- /dev/null
+++ b/benchmark/complex_float_sub.yml
@@ -0,0 +1,7 @@
+prelude: |
+  max, min = 1000.0, -1000.0
+  a = Complex(rand(max)+min, rand(max)+min)
+  b = Complex(rand(max)+min, rand(max)+min)
+benchmark:
+  complex_float_sub: c = a - b
+loop_count: 1000000
diff --git a/benchmark/dir_empty_p.rb b/benchmark/dir_empty_p.rb
new file mode 100644
index 0000000000..8329c757cf
--- /dev/null
+++ b/benchmark/dir_empty_p.rb
@@ -0,0 +1,5 @@
+require 'tmpdir'
+max = 100_000
+Dir.mktmpdir('bm_dir_empty_p') do |dir|
+  max.times { Dir.empty?(dir) }
+end
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
deleted file mode 100644
index 7dab292a15..0000000000
--- a/benchmark/driver.rb
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Ruby Benchmark driver
-#
-
-first = true
-
-begin
-  require 'optparse'
-rescue LoadError
-  if first
-    first = false
-    $:.unshift File.join(File.dirname(__FILE__), '../lib')
-    retry
-  else
-    raise
-  end
-end
-
-require 'benchmark'
-require 'pp'
-
-class BenchmarkDriver
-  def self.benchmark(opt)
-    driver = self.new(opt[:execs], opt[:dir], opt)
-    begin
-      driver.run
-    ensure
-      driver.show_results
-    end
-  end
-
-  def output *args
-    puts(*args)
-    @output and @output.puts(*args)
-  end
-
-  def message *args
-    output(*args) if @verbose
-  end
-
-  def message_print *args
-    if @verbose
-      print(*args)
-      STDOUT.flush
-      @output and @output.print(*args)
-    end
-  end
-
-  def progress_message *args
-    unless STDOUT.tty?
-      STDERR.print(*args)
-      STDERR.flush
-    end
-  end
-
-  def initialize execs, dir, opt = {}
-    @execs = execs.map{|e|
-      e.strip!
-      next if e.empty?
-
-      if /(.+)::(.+)/ =~ e
-        # ex) ruby-a::/path/to/ruby-a
-        v = $1.strip
-        e = $2
-      else
-        v =  `#{e} -v`.chomp
-        v.sub!(/ patchlevel \d+/, '')
-      end
-      [e, v]
-    }.compact
-
-    @dir = dir
-    @repeat = opt[:repeat] || 1
-    @repeat = 1 if @repeat < 1
-    @pattern = opt[:pattern] || nil
-    @verbose = opt[:quiet] ? false : (opt[:verbose] || false)
-    @output = opt[:output] ? open(opt[:output], 'w') : nil
-    @loop_wl1 = @loop_wl2 = nil
-    @opt = opt
-
-    # [[name, [[r-1-1, r-1-2, ...], [r-2-1, r-2-2, ...]]], ...]
-    @results = []
-
-    if @verbose
-      @start_time = Time.now
-      message @start_time
-      @execs.each_with_index{|(e, v), i|
-        message "target #{i}: #{v}"
-      }
-    end
-  end
-
-  def average results
-    results.inject(:+) / results.length
-  end
-
-  def show_results
-    output
-
-    if @verbose
-      message '-----------------------------------------------------------'
-      message 'raw data:'
-      message
-      message PP.pp(@results, "", 79)
-      message
-      message "Elapesed time: #{Time.now - @start_time} (sec)"
-    end
-
-    output '-----------------------------------------------------------'
-    output 'benchmark results:'
-
-    if @verbose and @repeat > 1
-      output "minimum results in each #{@repeat} measurements."
-    end
-
-    difference = "\taverage difference" if @execs.length == 2
-    total_difference = 0
-
-    output "name\t#{@execs.map{|(e, v)| v}.join("\t")}#{difference}"
-    @results.each{|v, result|
-      rets = []
-      s = nil
-      result.each_with_index{|e, i|
-        r = e.min
-        case v
-        when /^vm1_/
-          if @loop_wl1
-            r -= @loop_wl1[i]
-            s = '*'
-          end
-        when /^vm2_/
-          if @loop_wl2
-            r -= @loop_wl2[i]
-            s = '*'
-          end
-        end
-        rets << sprintf("%.3f", r)
-      }
-
-      if difference
-        diff = average(result.last) - average(result.first)
-        total_difference += diff
-        rets << sprintf("%.3f", diff)
-      end
-
-      output "#{v}#{s}\t#{rets.join("\t")}"
-    }
-
-    if difference and @verbose
-      output '-----------------------------------------------------------'
-      output "average total difference is #{total_difference}"
-    end
-  end
-
-  def files
-    flag = {}
-    vm1 = vm2 = wl1 = wl2 = false
-    @files = Dir.glob(File.join(@dir, 'bm*.rb')).map{|file|
-      next if @pattern && /#{@pattern}/ !~ File.basename(file)
-      case file
-      when /bm_(vm[12])_/, /bm_loop_(whileloop2?).rb/
-        flag[$1] = true
-      end
-      file
-    }.compact
-
-    if flag['vm1'] && !flag['whileloop']
-      @files << File.join(@dir, 'bm_loop_whileloop.rb')
-    elsif flag['vm2'] && !flag['whileloop2']
-      @files << File.join(@dir, 'bm_loop_whileloop2.rb')
-    end
-
-    @files.sort!
-    progress_message "total: #{@files.size * @repeat} trial(s) (#{@repeat} trial(s) for #{@files.size} benchmark(s))\n"
-    @files
-  end
-
-  def run
-    files.each_with_index{|file, i|
-      @i = i
-      r = measure_file(file)
-
-      if /bm_loop_whileloop.rb/ =~ file
-        @loop_wl1 = r[1].map{|e| e.min}
-      elsif /bm_loop_whileloop2.rb/ =~ file
-        @loop_wl2 = r[1].map{|e| e.min}
-      end
-    }
-  end
-
-  def measure_file file
-    name = File.basename(file, '.rb').sub(/^bm_/, '')
-    prepare_file = File.join(File.dirname(file), "prepare_#{name}.rb")
-    load prepare_file if FileTest.exist?(prepare_file)
-
-    if @verbose
-      output
-      output '-----------------------------------------------------------'
-      output name
-      output
-      output File.read(file)
-      output
-    end
-
-    result = [name]
-    result << @execs.map{|(e, v)|
-      (0...@repeat).map{
-        message_print "#{v}\t"
-        progress_message '.'
-
-        m = measure(e, file)
-        message "#{m}"
-        m
-      }
-    }
-    @results << result
-    result
-  end
-
-  def measure executable, file
-    cmd = "#{executable} #{file}"
-    m = Benchmark.measure{
-      `#{cmd}`
-    }
-
-    if $? != 0
-      raise "\`#{cmd}\' exited with abnormal status (#{$?})"
-    end
-
-    m.real
-  end
-end
-
-if __FILE__ == $0
-  opt = {
-    :execs => ['ruby'],
-    :dir => './',
-    :repeat => 1,
-    :output => "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}",
-  }
-
-  parser = OptionParser.new{|o|
-    o.on('-e', '--executables [EXECS]',
-         "Specify benchmark one or more targets. (exec1; exec2; exec3, ...)"){|e|
-      opt[:execs] = e.split(/;/)
-    }
-    o.on('-d', '--directory [DIRECTORY]', "Benchmark suites directory"){|d|
-      opt[:dir] = d
-    }
-    o.on('-p', '--pattern [PATTERN]', "Benchmark name pattern"){|p|
-      opt[:pattern] = p
-    }
-    o.on('-r', '--repeat-count [NUM]', "Repeat count"){|n|
-      opt[:repeat] = n.to_i
-    }
-    o.on('-o', '--output-file [FILE]', "Output file"){|o|
-      opt[:output] = o
-    }
-    o.on('-q', '--quiet', "Run without notify information except result table."){|q|
-      opt[:quiet] = q
-    }
-    o.on('-v', '--verbose'){|v|
-      opt[:verbose] = v
-    }
-  }
-
-  parser.parse!(ARGV)
-  BenchmarkDriver.benchmark(opt)
-end
-
diff --git a/benchmark/enum_lazy_grep_v_100.rb b/benchmark/enum_lazy_grep_v_100.rb
new file mode 100644
index 0000000000..8832392e65
--- /dev/null
+++ b/benchmark/enum_lazy_grep_v_100.rb
@@ -0,0 +1,4 @@
+grep_data = (1..10).to_a * 1000
+N = 100
+enum = grep_data.lazy.grep_v(->(i){i == 0}).grep_v(->(i){i == 0})
+N.times {enum.each {}}
diff --git a/benchmark/enum_lazy_grep_v_20.rb b/benchmark/enum_lazy_grep_v_20.rb
new file mode 100644
index 0000000000..329509fa8f
--- /dev/null
+++ b/benchmark/enum_lazy_grep_v_20.rb
@@ -0,0 +1,4 @@
+grep_data = (1..10).to_a * 1000
+N = 100
+enum = grep_data.lazy.grep_v(->(i){i > 2}).grep_v(->(i){i > 2})
+N.times {enum.each {}}
diff --git a/benchmark/enum_lazy_grep_v_50.rb b/benchmark/enum_lazy_grep_v_50.rb
new file mode 100644
index 0000000000..02ea4d4e71
--- /dev/null
+++ b/benchmark/enum_lazy_grep_v_50.rb
@@ -0,0 +1,4 @@
+grep_data = (1..10).to_a * 1000
+N = 100
+enum = grep_data.lazy.grep_v(->(i){i > 5}).grep_v(->(i){i > 5})
+N.times {enum.each {}}
diff --git a/benchmark/enum_lazy_uniq_100.rb b/benchmark/enum_lazy_uniq_100.rb
new file mode 100644
index 0000000000..2e6434d9c4
--- /dev/null
+++ b/benchmark/enum_lazy_uniq_100.rb
@@ -0,0 +1,4 @@
+uniq_data = (1..10_000).to_a
+N = 100
+enum = uniq_data.lazy.uniq {|i| i % 10000}.uniq {|i| i % 10000}
+N.times {enum.each {}}
diff --git a/benchmark/enum_lazy_uniq_20.rb b/benchmark/enum_lazy_uniq_20.rb
new file mode 100644
index 0000000000..75e6398fee
--- /dev/null
+++ b/benchmark/enum_lazy_uniq_20.rb
@@ -0,0 +1,4 @@
+uniq_data = (1..10_000).to_a
+N = 100
+enum = uniq_data.lazy.uniq {|i| i % 2000}.uniq {|i| i % 2000}
+N.times {enum.each {}}
diff --git a/benchmark/enum_lazy_uniq_50.rb b/benchmark/enum_lazy_uniq_50.rb
new file mode 100644
index 0000000000..59a39b78ff
--- /dev/null
+++ b/benchmark/enum_lazy_uniq_50.rb
@@ -0,0 +1,4 @@
+uniq_data = (1..10_000).to_a
+N = 100
+enum = uniq_data.lazy.uniq {|i| i % 5000}.uniq {|i| i % 5000}
+N.times {enum.each {}}
diff --git a/benchmark/erb_render.yml b/benchmark/erb_render.yml
new file mode 100644
index 0000000000..15f6c3880b
--- /dev/null
+++ b/benchmark/erb_render.yml
@@ -0,0 +1,24 @@
+prelude: |
+  require 'erb'
+
+  data = <<erb
+  <html>
+    <head> <%= title %> </head>
+    <body>
+      <h1> <%= title %> </h1>
+      <p>
+        <%= content %>
+      </p>
+    </body>
+  </html>
+  erb
+
+  title = "hello world!"
+  content = "hello world!\n" * 10
+
+  src = "def self.render(title, content); #{ERB.new(data).src}; end"
+  mod = Module.new
+  mod.instance_eval(src, "(ERB)")
+benchmark:
+  erb_render: mod.render(title, content)
+loop_count: 1500000
diff --git a/benchmark/fiber_chain.yml b/benchmark/fiber_chain.yml
new file mode 100755
index 0000000000..a36c759f8e
--- /dev/null
+++ b/benchmark/fiber_chain.yml
@@ -0,0 +1,36 @@
+prelude: |
+  def make_link(previous)
+    Fiber.new do
+      while message = previous.resume
+        Fiber.yield(message)
+      end
+    end
+  end
+
+  def make_chain(length = 1000, &block)
+    chain = Fiber.new(&block)
+
+    (length - 1).times do
+      chain = make_link(chain)
+    end
+
+    return chain
+  end
+
+  message = "Hello World!"
+
+  chain = make_chain do
+    while true
+      Fiber.yield(message)
+    end
+  end
+benchmark:
+  make_chain: |
+    make_chain(100) do
+      while true
+        Fiber.yield(message)
+      end
+    end
+  resume_chain: |
+    chain.resume
+loop_count: 5000
diff --git a/benchmark/file_chmod.rb b/benchmark/file_chmod.rb
new file mode 100644
index 0000000000..1cd4760c9d
--- /dev/null
+++ b/benchmark/file_chmod.rb
@@ -0,0 +1,9 @@
+# chmod file
+require 'tempfile'
+max = 200_000
+tmp = Tempfile.new('chmod')
+path = tmp.path
+max.times do
+  File.chmod(0777, path)
+end
+tmp.close!
diff --git a/benchmark/file_rename.rb b/benchmark/file_rename.rb
new file mode 100644
index 0000000000..bbb44aebac
--- /dev/null
+++ b/benchmark/file_rename.rb
@@ -0,0 +1,11 @@
+# rename file
+require 'tempfile'
+
+max = 100_000
+tmp = [ Tempfile.new('rename-a'), Tempfile.new('rename-b') ]
+a, b = tmp.map { |x| x.path }
+tmp.each { |t| t.close } # Windows can't rename files without closing them
+max.times do
+  File.rename(a, b)
+  File.rename(b, a)
+end
diff --git a/benchmark/gc/aobench.rb b/benchmark/gc/aobench.rb
new file mode 100644
index 0000000000..275f58b924
--- /dev/null
+++ b/benchmark/gc/aobench.rb
@@ -0,0 +1 @@
+require_relative '../app_aobench'
diff --git a/benchmark/gc/binary_trees.rb b/benchmark/gc/binary_trees.rb
new file mode 100644
index 0000000000..83347cdd20
--- /dev/null
+++ b/benchmark/gc/binary_trees.rb
@@ -0,0 +1 @@
+require_relative '../so_binary_trees'
diff --git a/benchmark/gc/gcbench.rb b/benchmark/gc/gcbench.rb
new file mode 100644
index 0000000000..23d0b91c6c
--- /dev/null
+++ b/benchmark/gc/gcbench.rb
@@ -0,0 +1,57 @@
+require 'benchmark'
+require 'pp'
+require 'optparse'
+
+$list = true
+$gcprof = false
+
+opt = OptionParser.new
+opt.on('-q'){$list = false}
+opt.on('-d'){$gcprof = false}
+opt.on('-p'){$gcprof = true}
+opt.parse!(ARGV)
+
+script = File.join(File.dirname(__FILE__), ARGV.shift)
+script += '.rb' unless FileTest.exist?(script)
+raise "#{script} not found" unless FileTest.exist?(script)
+
+puts "Script: #{script}"
+
+if $gcprof
+  GC::Profiler.enable
+end
+
+tms = Benchmark.measure{|x|
+  load script
+}
+
+gc_time = 0
+
+if $gcprof
+  gc_time = GC::Profiler.total_time
+  GC::Profiler.report if $list and RUBY_VERSION >= '2.0.0' # before 1.9.3, report() may run infinite loop
+  GC::Profiler.disable
+end
+
+pp GC.stat
+
+puts "#{RUBY_DESCRIPTION} #{GC::OPTS.inspect}" if defined?(GC::OPTS)
+
+desc = "#{RUBY_VERSION}#{RUBY_PATCHLEVEL >= 0 ? "p#{RUBY_PATCHLEVEL}" : "dev"}"
+name = File.basename(script, '.rb')
+
+puts
+puts script
+puts Benchmark::CAPTION
+puts tms
+puts "GC total time (sec): #{gc_time}"
+
+# show High-Water Mark on Linux
+if File.exist?('/proc/self/status') && /VmHWM:\s*(\d+.+)/ =~ File.read('/proc/self/status')
+  puts
+  puts "VmHWM: #{$1.chomp}"
+end
+
+puts
+puts "Summary of #{name} on #{desc}\t#{tms.real}\t#{gc_time}\t#{GC.count}"
+puts "         (real time in sec, GC time in sec, GC count)"
diff --git a/benchmark/gc/hash1.rb b/benchmark/gc/hash1.rb
new file mode 100644
index 0000000000..cb030d458d
--- /dev/null
+++ b/benchmark/gc/hash1.rb
@@ -0,0 +1,11 @@
+value = 0.01
+h = {}
+n = 50_000
+
+1.upto(n){|i|
+  h["%020d" % i] = "v-#{i}"
+}
+
+(n * 1_000).times{
+  ''
+}
diff --git a/benchmark/gc/hash2.rb b/benchmark/gc/hash2.rb
new file mode 100644
index 0000000000..e8c943fb21
--- /dev/null
+++ b/benchmark/gc/hash2.rb
@@ -0,0 +1,7 @@
+value = 0.01
+h = {}
+n = 4*(10**6)
+
+1.upto(n){|i|
+  h["%020d" % i] = value * i
+}
diff --git a/benchmark/gc/null.rb b/benchmark/gc/null.rb
new file mode 100644
index 0000000000..c05a79f561
--- /dev/null
+++ b/benchmark/gc/null.rb
@@ -0,0 +1 @@
+# null
diff --git a/benchmark/gc/pentomino.rb b/benchmark/gc/pentomino.rb
new file mode 100644
index 0000000000..8ebdff7d1d
--- /dev/null
+++ b/benchmark/gc/pentomino.rb
@@ -0,0 +1 @@
+require_relative '../app_pentomino'
diff --git a/benchmark/gc/rdoc.rb b/benchmark/gc/rdoc.rb
new file mode 100644
index 0000000000..14c89f5611
--- /dev/null
+++ b/benchmark/gc/rdoc.rb
@@ -0,0 +1,13 @@
+require 'rdoc/rdoc'
+require 'tmpdir'
+
+srcdir = File.expand_path('../..', __dir__)
+
+Dir.mktmpdir('rdocbench-'){|d|
+  dir = File.join(d, 'rdocbench')
+  args = %W(--root #{srcdir} --page-dir #{srcdir}/doc --encoding=UTF-8 --no-force-update --all --ri --debug --quiet #{srcdir})
+  args << '--op' << dir
+
+  r = RDoc::RDoc.new
+  r.document args
+}
diff --git a/benchmark/gc/redblack.rb b/benchmark/gc/redblack.rb
new file mode 100644
index 0000000000..c66290140a
--- /dev/null
+++ b/benchmark/gc/redblack.rb
@@ -0,0 +1,366 @@
+# This benchmark is imported from https://github.com/jruby/rubybench/blob/master/time/bench_red_black.rb
+# License is License is Apache-2
+
+require 'benchmark'
+
+# Algorithm based on "Introduction to Algorithms" by Cormen and others
+class RedBlackTree
+  class Node
+    attr_accessor :color
+    attr_accessor :key
+    attr_accessor :left
+    attr_accessor :right
+    attr_accessor :parent
+
+    RED = :red
+    BLACK = :black
+    COLORS = [RED, BLACK].freeze
+
+    def initialize(key, color = RED)
+      raise ArgumentError, "Bad value for color parameter" unless COLORS.include?(color)
+      @color = color
+      @key = key
+      @left = @right = @parent = NilNode.instance
+    end
+
+    def black?
+      return color == BLACK
+    end
+
+    def red?
+      return color == RED
+    end
+  end
+
+  class NilNode < Node
+    class << self
+      private :new
+
+      # it's not thread safe
+      def instance
+        @instance ||= begin
+          def instance
+            return @instance
+          end
+
+          new
+        end
+      end
+    end
+
+    def initialize
+      self.color = BLACK
+      self.key = 0
+      self.left = nil
+      self.right = nil
+      self.parent = nil
+    end
+
+    def nil?
+      return true
+    end
+  end
+
+  include Enumerable
+
+  attr_accessor :root
+  attr_accessor :size
+
+  def initialize
+    self.root = NilNode.instance
+    self.size = 0
+  end
+
+  def add(key)
+    insert(Node.new(key))
+  end
+
+  def insert(x)
+    insert_helper(x)
+
+    x.color = Node::RED
+    while x != root && x.parent.color == Node::RED
+      if x.parent == x.parent.parent.left
+        y = x.parent.parent.right
+        if !y.nil? && y.color == Node::RED
+          x.parent.color = Node::BLACK
+          y.color = Node::BLACK
+          x.parent.parent.color = Node::RED
+          x = x.parent.parent
+        else
+          if x == x.parent.right
+            x = x.parent
+            left_rotate(x)
+          end
+          x.parent.color = Node::BLACK
+          x.parent.parent.color = Node::RED
+          right_rotate(x.parent.parent)
+        end
+      else
+        y = x.parent.parent.left
+        if !y.nil? && y.color == Node::RED
+          x.parent.color = Node::BLACK
+          y.color = Node::BLACK
+          x.parent.parent.color = Node::RED
+          x = x.parent.parent
+        else
+          if x == x.parent.left
+            x = x.parent
+            right_rotate(x)
+          end
+          x.parent.color = Node::BLACK
+          x.parent.parent.color = Node::RED
+          left_rotate(x.parent.parent)
+        end
+      end
+    end
+    root.color = Node::BLACK
+  end
+
+  alias << insert
+
+  def delete(z)
+    y = (z.left.nil? || z.right.nil?) ? z : successor(z)
+    x = y.left.nil? ? y.right : y.left
+    x.parent = y.parent
+
+    if y.parent.nil?
+      self.root = x
+    else
+      if y == y.parent.left
+        y.parent.left = x
+      else
+        y.parent.right = x
+      end
+    end
+
+    z.key = y.key if y != z
+
+    if y.color == Node::BLACK
+      delete_fixup(x)
+    end
+
+    self.size -= 1
+    return y
+  end
+
+  def minimum(x = root)
+    while !x.left.nil?
+      x = x.left
+    end
+    return x
+  end
+
+  def maximum(x = root)
+    while !x.right.nil?
+      x = x.right
+    end
+    return x
+  end
+
+  def successor(x)
+    if !x.right.nil?
+      return minimum(x.right)
+    end
+    y = x.parent
+    while !y.nil? && x == y.right
+      x = y
+      y = y.parent
+    end
+    return y
+  end
+
+  def predecessor(x)
+    if !x.left.nil?
+      return maximum(x.left)
+    end
+    y = x.parent
+    while !y.nil? && x == y.left
+      x = y
+      y = y.parent
+    end
+    return y
+  end
+
+  def inorder_walk(x = root)
+    x = self.minimum
+    while !x.nil?
+      yield x.key
+      x = successor(x)
+    end
+  end
+
+  alias each inorder_walk
+
+  def reverse_inorder_walk(x = root)
+    x = self.maximum
+    while !x.nil?
+      yield x.key
+      x = predecessor(x)
+    end
+  end
+
+  alias reverse_each reverse_inorder_walk
+
+  def search(key, x = root)
+    while !x.nil? && x.key != key
+      key < x.key ? x = x.left : x = x.right
+    end
+    return x
+  end
+
+  def empty?
+    return self.root.nil?
+  end
+
+  def black_height(x = root)
+    height = 0
+    while !x.nil?
+      x = x.left
+      height +=1 if x.nil? || x.black?
+    end
+    return height
+  end
+
+private
+
+  def left_rotate(x)
+    raise "x.right is nil!" if x.right.nil?
+    y = x.right
+    x.right = y.left
+    y.left.parent = x if !y.left.nil?
+    y.parent = x.parent
+    if x.parent.nil?
+      self.root = y
+    else
+      if x == x.parent.left
+        x.parent.left = y
+      else
+        x.parent.right = y
+      end
+    end
+    y.left = x
+    x.parent = y
+  end
+
+  def right_rotate(x)
+    raise "x.left is nil!" if x.left.nil?
+    y = x.left
+    x.left = y.right
+    y.right.parent = x if !y.right.nil?
+    y.parent = x.parent
+    if x.parent.nil?
+      self.root = y
+    else
+      if x == x.parent.left
+        x.parent.left = y
+      else
+        x.parent.right = y
+      end
+    end
+    y.right = x
+    x.parent = y
+  end
+
+  def insert_helper(z)
+    y = NilNode.instance
+    x = root
+    while !x.nil?
+      y = x
+      z.key < x.key ? x = x.left : x = x.right
+    end
+    z.parent = y
+    if y.nil?
+      self.root = z
+    else
+      z.key < y.key ? y.left = z : y.right = z
+    end
+    self.size += 1
+  end
+
+  def delete_fixup(x)
+    while x != root && x.color == Node::BLACK
+      if x == x.parent.left
+        w = x.parent.right
+        if w.color == Node::RED
+          w.color = Node::BLACK
+          x.parent.color = Node::RED
+          left_rotate(x.parent)
+          w = x.parent.right
+        end
+        if w.left.color == Node::BLACK && w.right.color == Node::BLACK
+          w.color = Node::RED
+          x = x.parent
+        else
+          if w.right.color == Node::BLACK
+            w.left.color = Node::BLACK
+            w.color = Node::RED
+            right_rotate(w)
+            w = x.parent.right
+          end
+          w.color = x.parent.color
+          x.parent.color = Node::BLACK
+          w.right.color = Node::BLACK
+          left_rotate(x.parent)
+          x = root
+        end
+      else
+        w = x.parent.left
+        if w.color == Node::RED
+          w.color = Node::BLACK
+          x.parent.color = Node::RED
+          right_rotate(x.parent)
+          w = x.parent.left
+        end
+        if w.right.color == Node::BLACK && w.left.color == Node::BLACK
+          w.color = Node::RED
+          x = x.parent
+        else
+          if w.left.color == Node::BLACK
+            w.right.color = Node::BLACK
+            w.color = Node::RED
+            left_rotate(w)
+            w = x.parent.left
+          end
+          w.color = x.parent.color
+          x.parent.color = Node::BLACK
+          w.left.color = Node::BLACK
+          right_rotate(x.parent)
+          x = root
+        end
+      end
+    end
+    x.color = Node::BLACK
+  end
+end
+
+def rbt_bm
+  n = 100_000
+  a1 = []; n.times { a1 << rand(999_999) }
+  a2 = []; n.times { a2 << rand(999_999) }
+
+  start = Time.now
+
+  tree = RedBlackTree.new
+
+  n.times {|i| tree.add(i) }
+  n.times { tree.delete(tree.root) }
+
+  tree = RedBlackTree.new
+  a1.each {|e| tree.add(e) }
+  a2.each {|e| tree.search(e) }
+  tree.inorder_walk {|key| key + 1 }
+  tree.reverse_inorder_walk {|key| key + 1 }
+  n.times { tree.minimum }
+  n.times { tree.maximum }
+
+  return Time.now - start
+end
+
+N = (ARGV[0] || 10).to_i
+
+N.times do
+  # puts rbt_bm.to_f
+  rbt_bm.to_f
+  # puts "GC.count = #{GC.count}" if GC.respond_to?(:count)
+end
diff --git a/benchmark/gc/ring.rb b/benchmark/gc/ring.rb
new file mode 100644
index 0000000000..be2c7b7250
--- /dev/null
+++ b/benchmark/gc/ring.rb
@@ -0,0 +1,29 @@
+# create many old objects
+
+max = 30_000_000
+
+class Ring
+  attr_reader :next_ring
+  def initialize n = nil
+    @next_ring = n
+  end
+
+
+  def size
+    s = 1
+    ring = self
+    while ring.next_ring
+      s += 1
+      ring = ring.next_ring
+    end
+    s
+  end
+end
+
+ring = Ring.new
+
+max.times{
+  ring = Ring.new(ring)
+}
+
+# p ring.size
diff --git a/benchmark/hash_aref_dsym.rb b/benchmark/hash_aref_dsym.rb
new file mode 100644
index 0000000000..af4f8c36d4
--- /dev/null
+++ b/benchmark/hash_aref_dsym.rb
@@ -0,0 +1,4 @@
+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/hash_aref_dsym_long.rb b/benchmark/hash_aref_dsym_long.rb
new file mode 100644
index 0000000000..9d7759379e
--- /dev/null
+++ b/benchmark/hash_aref_dsym_long.rb
@@ -0,0 +1,21 @@
+# [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/hash_aref_fix.rb b/benchmark/hash_aref_fix.rb
new file mode 100644
index 0000000000..1346890582
--- /dev/null
+++ b/benchmark/hash_aref_fix.rb
@@ -0,0 +1,4 @@
+h = {}
+nums = (1..26).to_a
+nums.each { |i| h[i] = i }
+200_000.times { nums.each { |s| h[s] } }
diff --git a/benchmark/hash_aref_flo.rb b/benchmark/hash_aref_flo.rb
new file mode 100644
index 0000000000..2217274c82
--- /dev/null
+++ b/benchmark/hash_aref_flo.rb
@@ -0,0 +1,4 @@
+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/hash_aref_miss.rb b/benchmark/hash_aref_miss.rb
new file mode 100644
index 0000000000..b0913dd4bb
--- /dev/null
+++ b/benchmark/hash_aref_miss.rb
@@ -0,0 +1,5 @@
+h = {}
+strs = ('a'..'z').to_a.map!(&:freeze)
+strs.each { |s| h[s] = s }
+strs = ('A'..'Z').to_a
+200_000.times { strs.each { |s| h[s] } }
diff --git a/benchmark/hash_aref_str.rb b/benchmark/hash_aref_str.rb
new file mode 100644
index 0000000000..19439b061b
--- /dev/null
+++ b/benchmark/hash_aref_str.rb
@@ -0,0 +1,4 @@
+h = {}
+strs = ('a'..'z').to_a.map!(&:freeze)
+strs.each { |s| h[s] = s }
+200_000.times { strs.each { |s| h[s] } }
diff --git a/benchmark/hash_aref_sym.rb b/benchmark/hash_aref_sym.rb
new file mode 100644
index 0000000000..f75d163fe6
--- /dev/null
+++ b/benchmark/hash_aref_sym.rb
@@ -0,0 +1,9 @@
+h = {}
+syms = ('a'..'z').to_a
+begin
+  syms = eval("%i[#{syms.join(' ')}]")
+rescue SyntaxError # <= 1.9.3
+  syms.map!(&:to_sym)
+end
+syms.each { |s| h[s] = s }
+200_000.times { syms.each { |s| h[s] } }
diff --git a/benchmark/hash_aref_sym_long.rb b/benchmark/hash_aref_sym_long.rb
new file mode 100644
index 0000000000..9dab8df7be
--- /dev/null
+++ b/benchmark/hash_aref_sym_long.rb
@@ -0,0 +1,13 @@
+h = {}
+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
+syms.each { |s| h[s] = s }
+200_000.times { syms.each { |s| h[s] } }
diff --git a/benchmark/hash_dup.yml b/benchmark/hash_dup.yml
new file mode 100644
index 0000000000..65f521ec94
--- /dev/null
+++ b/benchmark/hash_dup.yml
@@ -0,0 +1,8 @@
+prelude: |
+  small_hash = { a: 1 }
+  larger_hash = 20.times.map { |i| [('a'.ord + i).chr.to_sym, i] }.to_h
+
+benchmark:
+  dup_small: small_hash.dup
+  dup_larger: larger_hash.dup
+loop_count: 10000
diff --git a/benchmark/hash_flatten.rb b/benchmark/hash_flatten.rb
new file mode 100644
index 0000000000..e944aae9f2
--- /dev/null
+++ b/benchmark/hash_flatten.rb
@@ -0,0 +1,9 @@
+h = {}
+
+10000.times do |i|
+  h[i] = nil
+end
+
+1000.times do
+  h.flatten
+end
diff --git a/benchmark/hash_ident_flo.rb b/benchmark/hash_ident_flo.rb
new file mode 100644
index 0000000000..0c7edfed3e
--- /dev/null
+++ b/benchmark/hash_ident_flo.rb
@@ -0,0 +1,4 @@
+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/hash_ident_num.rb b/benchmark/hash_ident_num.rb
new file mode 100644
index 0000000000..b226736c6f
--- /dev/null
+++ b/benchmark/hash_ident_num.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+nums = (1..26).to_a
+nums.each { |n| h[n] = n }
+200_000.times { nums.each { |n| h[n] } }
diff --git a/benchmark/hash_ident_obj.rb b/benchmark/hash_ident_obj.rb
new file mode 100644
index 0000000000..4b3b58edec
--- /dev/null
+++ b/benchmark/hash_ident_obj.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+objs = 26.times.map { Object.new }
+objs.each { |o| h[o] = o }
+200_000.times { objs.each { |o| h[o] } }
diff --git a/benchmark/hash_ident_str.rb b/benchmark/hash_ident_str.rb
new file mode 100644
index 0000000000..8582b38e31
--- /dev/null
+++ b/benchmark/hash_ident_str.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+strs = ('a'..'z').to_a
+strs.each { |s| h[s] = s }
+200_000.times { strs.each { |s| h[s] } }
diff --git a/benchmark/hash_ident_sym.rb b/benchmark/hash_ident_sym.rb
new file mode 100644
index 0000000000..4c81e3d28e
--- /dev/null
+++ b/benchmark/hash_ident_sym.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+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/hash_keys.rb b/benchmark/hash_keys.rb
new file mode 100644
index 0000000000..6863cd01f9
--- /dev/null
+++ b/benchmark/hash_keys.rb
@@ -0,0 +1,9 @@
+h = {}
+
+10000.times do |i|
+  h[i] = nil
+end
+
+5000.times do
+  h.keys
+end
diff --git a/benchmark/hash_literal_small2.rb b/benchmark/hash_literal_small2.rb
new file mode 100644
index 0000000000..c188529260
--- /dev/null
+++ b/benchmark/hash_literal_small2.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+1_000_000.times.map { { "foo" => "bar", "bar" => "baz" }  }
diff --git a/benchmark/hash_literal_small4.rb b/benchmark/hash_literal_small4.rb
new file mode 100644
index 0000000000..739f71b5b0
--- /dev/null
+++ b/benchmark/hash_literal_small4.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+1_000_000.times.map { { "foo" => "bar", "bar" => "baz", "baz" => "lol", "lol" => "lgtm" } }
diff --git a/benchmark/hash_literal_small8.rb b/benchmark/hash_literal_small8.rb
new file mode 100644
index 0000000000..53d80af535
--- /dev/null
+++ b/benchmark/hash_literal_small8.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+1_000_000.times.map { { "foo" => "bar", "bar" => "baz", "baz" => "lol", "lol" => "lgtm", "lgtm" => "nope", "nope" => "ok", "ok" => "again", "again" => "wait" } }
diff --git a/benchmark/hash_long.rb b/benchmark/hash_long.rb
new file mode 100644
index 0000000000..03d9109602
--- /dev/null
+++ b/benchmark/hash_long.rb
@@ -0,0 +1,4 @@
+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/hash_shift.rb b/benchmark/hash_shift.rb
new file mode 100644
index 0000000000..a645671a5b
--- /dev/null
+++ b/benchmark/hash_shift.rb
@@ -0,0 +1,10 @@
+h = {}
+
+10000.times do |i|
+  h[i] = nil
+end
+
+50000.times do
+  k, v = h.shift
+  h[k] = v
+end
diff --git a/benchmark/hash_shift_u16.rb b/benchmark/hash_shift_u16.rb
new file mode 100644
index 0000000000..ec800d0342
--- /dev/null
+++ b/benchmark/hash_shift_u16.rb
@@ -0,0 +1,10 @@
+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/hash_shift_u24.rb b/benchmark/hash_shift_u24.rb
new file mode 100644
index 0000000000..de4e0fa696
--- /dev/null
+++ b/benchmark/hash_shift_u24.rb
@@ -0,0 +1,10 @@
+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/hash_shift_u32.rb b/benchmark/hash_shift_u32.rb
new file mode 100644
index 0000000000..656aa55583
--- /dev/null
+++ b/benchmark/hash_shift_u32.rb
@@ -0,0 +1,10 @@
+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/hash_small2.rb b/benchmark/hash_small2.rb
new file mode 100644
index 0000000000..45485d9c71
--- /dev/null
+++ b/benchmark/hash_small2.rb
@@ -0,0 +1 @@
+1000000.times.map{|i| a={}; 2.times{|j| a[j]=j}; a}
diff --git a/benchmark/hash_small4.rb b/benchmark/hash_small4.rb
new file mode 100644
index 0000000000..acd4084334
--- /dev/null
+++ b/benchmark/hash_small4.rb
@@ -0,0 +1 @@
+1000000.times.map{|i| a={}; 4.times{|j| a[j]=j}; a}
diff --git a/benchmark/hash_small8.rb b/benchmark/hash_small8.rb
new file mode 100644
index 0000000000..9cffcc91b6
--- /dev/null
+++ b/benchmark/hash_small8.rb
@@ -0,0 +1 @@
+1000000.times.map{|i| a={}; 8.times{|j| a[j]=j}; a}
diff --git a/benchmark/hash_to_proc.rb b/benchmark/hash_to_proc.rb
new file mode 100644
index 0000000000..2b675bf509
--- /dev/null
+++ b/benchmark/hash_to_proc.rb
@@ -0,0 +1,9 @@
+h = {}
+
+10000.times do |i|
+  h[i] = nil
+end
+
+5000.times do |i|
+  [i].map(&h)
+end
diff --git a/benchmark/hash_values.rb b/benchmark/hash_values.rb
new file mode 100644
index 0000000000..069441302f
--- /dev/null
+++ b/benchmark/hash_values.rb
@@ -0,0 +1,9 @@
+h = {}
+
+10000.times do |i|
+  h[i] = nil
+end
+
+5000.times do
+  h.values
+end
diff --git a/benchmark/int_quo.rb b/benchmark/int_quo.rb
new file mode 100644
index 0000000000..e22a3f8c30
--- /dev/null
+++ b/benchmark/int_quo.rb
@@ -0,0 +1 @@
+5000000.times { 42.quo(3) }
diff --git a/benchmark/io_copy_stream_write.rb b/benchmark/io_copy_stream_write.rb
new file mode 100644
index 0000000000..3fd87250a4
--- /dev/null
+++ b/benchmark/io_copy_stream_write.rb
@@ -0,0 +1,24 @@
+# The goal of this is to use a synthetic (non-IO) reader
+# to trigger the read/write loop of IO.copy_stream,
+# bypassing in-kernel mechanisms like sendfile for zero copy,
+# so we wrap the /dev/zero IO object:
+
+class Zero
+  def initialize
+    @n = 100000
+    @in = File.open('/dev/zero', 'rb')
+  end
+
+  def read(len, buf)
+    return if (@n -= 1) == 0
+    @in.read(len, buf)
+  end
+end
+
+begin
+  src = Zero.new
+  dst = File.open(IO::NULL, 'wb')
+  n = IO.copy_stream(src, dst)
+rescue Errno::ENOENT
+  # not *nix
+end if IO.respond_to?(:copy_stream) && IO.const_defined?(:NULL)
diff --git a/benchmark/io_copy_stream_write_socket.rb b/benchmark/io_copy_stream_write_socket.rb
new file mode 100644
index 0000000000..11f369bd0d
--- /dev/null
+++ b/benchmark/io_copy_stream_write_socket.rb
@@ -0,0 +1,35 @@
+# The goal of this is to use a synthetic (non-IO) reader
+# to trigger the read/write loop of IO.copy_stream,
+# bypassing in-kernel mechanisms like sendfile for zero copy,
+# so we wrap the /dev/zero IO object:
+class Zero
+  def initialize
+    @n = 100000
+    @in = File.open('/dev/zero', 'rb')
+  end
+
+  def read(len, buf)
+    return if (@n -= 1) == 0
+    @in.read(len, buf)
+  end
+end
+
+begin
+  require 'socket'
+  src = Zero.new
+  rd, wr = UNIXSocket.pair
+  pid = fork do
+    wr.close
+    buf = String.new
+    while rd.read(16384, buf)
+    end
+  end
+  rd.close
+  IO.copy_stream(src, wr)
+rescue Errno::ENOENT, NotImplementedError, NameError
+  # not *nix: missing /dev/zero, fork, or UNIXSocket
+rescue LoadError # no socket?
+ensure
+  wr.close if wr
+  Process.waitpid(pid) if pid
+end if IO.respond_to?(:copy_stream)
diff --git a/benchmark/bm_io_file_create.rb b/benchmark/io_file_create.rb
index 2f205c1333..2f205c1333 100644
--- a/benchmark/bm_io_file_create.rb
+++ b/benchmark/io_file_create.rb
diff --git a/benchmark/bm_io_file_read.rb b/benchmark/io_file_read.rb
index b9e796ed30..b9e796ed30 100644
--- a/benchmark/bm_io_file_read.rb
+++ b/benchmark/io_file_read.rb
diff --git a/benchmark/bm_io_file_write.rb b/benchmark/io_file_write.rb
index aa1be0e5fe..aa1be0e5fe 100644
--- a/benchmark/bm_io_file_write.rb
+++ b/benchmark/io_file_write.rb
diff --git a/benchmark/io_nonblock_noex.rb b/benchmark/io_nonblock_noex.rb
new file mode 100644
index 0000000000..da9357fdc6
--- /dev/null
+++ b/benchmark/io_nonblock_noex.rb
@@ -0,0 +1,22 @@
+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/io_nonblock_noex2.rb b/benchmark/io_nonblock_noex2.rb
new file mode 100644
index 0000000000..56819d049b
--- /dev/null
+++ b/benchmark/io_nonblock_noex2.rb
@@ -0,0 +1,21 @@
+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/io_pipe_rw.rb b/benchmark/io_pipe_rw.rb
new file mode 100644
index 0000000000..6862a8ae61
--- /dev/null
+++ b/benchmark/io_pipe_rw.rb
@@ -0,0 +1,13 @@
+# Measure uncontended GVL performance via read/write with 1:1 threading
+# If we switch to M:N threading, this will benchmark something else...
+r, w = IO.pipe
+src = '0'.freeze
+dst = String.new
+i = 0
+while i < 1_000_000
+  i += 1
+  w.write(src)
+  r.read(1, dst)
+end
+w.close
+r.close
diff --git a/benchmark/bm_io_select.rb b/benchmark/io_select.rb
index 19248daeb1..19248daeb1 100644
--- a/benchmark/bm_io_select.rb
+++ b/benchmark/io_select.rb
diff --git a/benchmark/io_select2.rb b/benchmark/io_select2.rb
new file mode 100644
index 0000000000..10e37d71b2
--- /dev/null
+++ b/benchmark/io_select2.rb
@@ -0,0 +1,22 @@
+# IO.select performance. worst case of single fd.
+
+ios = []
+nr = 1000000
+if defined?(Process::RLIMIT_NOFILE)
+  max = Process.getrlimit(Process::RLIMIT_NOFILE)[0]
+else
+  max = 64
+end
+puts "max fd: #{max} (results not apparent with <= 1024 max fd)"
+
+((max / 2) - 10).times do
+  ios.concat IO.pipe
+end
+
+last = [ ios[-1] ]
+puts "last IO: #{last[0].inspect}"
+
+nr.times do
+  IO.select nil, last
+end
+
diff --git a/benchmark/io_select3.rb b/benchmark/io_select3.rb
new file mode 100644
index 0000000000..7d0ba1f092
--- /dev/null
+++ b/benchmark/io_select3.rb
@@ -0,0 +1,21 @@
+# IO.select performance. a lot of fd
+
+ios = []
+nr = 100
+if defined?(Process::RLIMIT_NOFILE)
+  max = Process.getrlimit(Process::RLIMIT_NOFILE)[0]
+else
+  max = 64
+end
+puts "max fd: #{max} (results not apparent with <= 1024 max fd)"
+
+(max - 10).times do
+  r, w = IO.pipe
+  r.close
+  ios.push w
+end
+
+nr.times do
+  IO.select nil, ios
+end
+
diff --git a/benchmark/irb_color.yml b/benchmark/irb_color.yml
new file mode 100644
index 0000000000..ebdc8d7e8b
--- /dev/null
+++ b/benchmark/irb_color.yml
@@ -0,0 +1,13 @@
+prelude: |
+  require 'irb/color'
+  code = <<~'CODE'
+    def self.foo # bar
+      :"erb #{ERB.new("<%= self %>", trim_mode: ?-).result}"
+    end
+  CODE
+benchmark:
+  irb_color_complete: |
+    IRB::Color.colorize_code(code, complete: true)
+  irb_color_incomplete: |
+    IRB::Color.colorize_code(code, complete: false)
+loop_count: 2000000
diff --git a/benchmark/irb_exec.yml b/benchmark/irb_exec.yml
new file mode 100644
index 0000000000..28933f8b38
--- /dev/null
+++ b/benchmark/irb_exec.yml
@@ -0,0 +1,10 @@
+prelude: |
+  # frozen_string_literal: true
+  require 'rbconfig'
+  irb_f = [File.join(File.dirname(RbConfig.ruby), 'irb'), '-f']
+benchmark:
+  irb_exec: |
+    IO.popen(irb_f, 'w') do |io|
+      io.write('exit')
+    end
+loop_count: 30
diff --git a/benchmark/lib/benchmark_driver/output/driver.rb b/benchmark/lib/benchmark_driver/output/driver.rb
new file mode 100644
index 0000000000..d22236e9fb
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/output/driver.rb
@@ -0,0 +1,36 @@
+require 'benchmark_driver/output/simple'
+
+# This replicates the legacy benchmark/driver.rb behavior.
+class BenchmarkDriver::Output::Driver < BenchmarkDriver::Output::Simple
+  def initialize(*)
+    super
+    @stdout = $stdout
+    @strio  = StringIO.new
+    $stdout = IOMultiplexer.new(@stdout, @strio)
+  end
+
+  def with_benchmark(*)
+    super
+  ensure
+    logfile = "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}.log"
+    puts "\nLog file: #{logfile}"
+
+    $stdout = @stdout
+    File.write(logfile, @strio.tap(&:rewind).read)
+  end
+
+  class IOMultiplexer
+    def initialize(io1, io2)
+      @io1 = io1
+      @io2 = io2
+    end
+
+    [:write, :sync, :sync=, :puts, :print, :flush].each do |method|
+      define_method(method) do |*args|
+        @io1.send(method, *args)
+        @io2.send(method, *args)
+      end
+    end
+  end
+  private_constant :IOMultiplexer
+end
diff --git a/benchmark/lib/benchmark_driver/runner/cstime.rb b/benchmark/lib/benchmark_driver/runner/cstime.rb
new file mode 100644
index 0000000000..3c3453e527
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/cstime.rb
@@ -0,0 +1,22 @@
+require 'benchmark_driver/runner/total'
+
+class BenchmarkDriver::Runner::Cstime < BenchmarkDriver::Runner::Total
+  METRIC = BenchmarkDriver::Metric.new(name: 'cstime', unit: 's', larger_better: false)
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  private
+
+  # Overriding BenchmarkDriver::Runner::Total#metric
+  def metric
+    METRIC
+  end
+
+  # Overriding BenchmarkDriver::Runner::Total#target
+  def target
+    :cstime
+  end
+end
diff --git a/benchmark/lib/benchmark_driver/runner/cutime.rb b/benchmark/lib/benchmark_driver/runner/cutime.rb
new file mode 100644
index 0000000000..e139962ef2
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/cutime.rb
@@ -0,0 +1,22 @@
+require 'benchmark_driver/runner/total'
+
+class BenchmarkDriver::Runner::Cutime < BenchmarkDriver::Runner::Total
+  METRIC = BenchmarkDriver::Metric.new(name: 'cutime', unit: 's', larger_better: false)
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  private
+
+  # Overriding BenchmarkDriver::Runner::Total#metric
+  def metric
+    METRIC
+  end
+
+  # Overriding BenchmarkDriver::Runner::Total#target
+  def target
+    :cutime
+  end
+end
diff --git a/benchmark/lib/benchmark_driver/runner/mjit_exec.rb b/benchmark/lib/benchmark_driver/runner/mjit_exec.rb
new file mode 100644
index 0000000000..9f7c8c8af3
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/mjit_exec.rb
@@ -0,0 +1,237 @@
+require 'benchmark_driver/struct'
+require 'benchmark_driver/metric'
+require 'erb'
+
+# A special runner dedicated for measuring mjit_exec overhead.
+class BenchmarkDriver::Runner::MjitExec
+  METRIC = BenchmarkDriver::Metric.new(name: 'Iteration per second', unit: 'i/s')
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = ::BenchmarkDriver::Struct.new(
+    :name,        # @param [String] name - This is mandatory for all runner
+    :metrics,     # @param [Array<BenchmarkDriver::Metric>]
+    :num_methods, # @param [Integer] num_methods - The number of methods to be defined
+    :loop_count,  # @param [Integer] loop_count
+    :from_jit,    # @param [TrueClass,FalseClass] from_jit - Whether the mjit_exec() is from JIT or not
+    :to_jit,      # @param [TrueClass,FalseClass] to_jit - Whether the mjit_exec() is to JIT or not
+  )
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  class << JobParser = Module.new
+    # @param [Array,String] num_methods
+    # @param [Integer] loop_count
+    # @param [TrueClass,FalseClass] from_jit
+    # @param [TrueClass,FalseClass] to_jit
+    def parse(num_methods:, loop_count:, from_jit:, to_jit:)
+      if num_methods.is_a?(String)
+        num_methods = eval(num_methods)
+      end
+
+      num_methods.map do |num|
+        if num_methods.size > 1
+          suffix = "[#{'%4d' % num}]"
+        else
+          suffix = "_#{num}"
+        end
+        Job.new(
+          name: "mjit_exec_#{from_jit ? 'JT' : 'VM'}2#{to_jit ? 'JT' : 'VM'}#{suffix}",
+          metrics: [METRIC],
+          num_methods: num,
+          loop_count: loop_count,
+          from_jit: from_jit,
+          to_jit: to_jit,
+        )
+      end
+    end
+  end
+
+  # @param [BenchmarkDriver::Config::RunnerConfig] config
+  # @param [BenchmarkDriver::Output] output
+  # @param [BenchmarkDriver::Context] contexts
+  def initialize(config:, output:, contexts:)
+    @config = config
+    @output = output
+    @contexts = contexts
+  end
+
+  # This method is dynamically called by `BenchmarkDriver::JobRunner.run`
+  # @param [Array<BenchmarkDriver::Runner::Peak::Job>] jobs
+  def run(jobs)
+    @output.with_benchmark do
+      jobs.each do |job|
+        @output.with_job(name: job.name) do
+          @contexts.each do |context|
+            result = BenchmarkDriver::Repeater.with_repeat(config: @config, larger_better: true, rest_on_average: :average) do
+              run_benchmark(job, context: context)
+            end
+            value, duration = result.value
+            @output.with_context(name: context.name, executable: context.executable, gems: context.gems, prelude: context.prelude) do
+              @output.report(values: { METRIC => value }, duration: duration, loop_count: job.loop_count)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  private
+
+  # @param [BenchmarkDriver::Runner::Ips::Job] job - loop_count is not nil
+  # @param [BenchmarkDriver::Context] context
+  # @return [BenchmarkDriver::Metrics]
+  def run_benchmark(job, context:)
+    if job.from_jit
+      if job.to_jit
+        benchmark = BenchmarkJT2JT.new(num_methods: job.num_methods, loop_count: job.loop_count)
+      else
+        raise NotImplementedError, "JT2VM is not implemented yet"
+      end
+    else
+      if job.to_jit
+        benchmark = BenchmarkVM2JT.new(num_methods: job.num_methods, loop_count: job.loop_count)
+      else
+        benchmark = BenchmarkVM2VM.new(num_methods: job.num_methods, loop_count: job.loop_count)
+      end
+    end
+
+    duration = Tempfile.open(['benchmark_driver-result', '.txt']) do |f|
+      with_script(benchmark.render(result: f.path)) do |path|
+        opt = []
+        if context.executable.command.any? { |c| c.start_with?('--jit') }
+          opt << '--jit-min-calls=2'
+        end
+        IO.popen([*context.executable.command, '--disable-gems', *opt, path], &:read)
+        if $?.success?
+          Float(f.read)
+        else
+          BenchmarkDriver::Result::ERROR
+        end
+      end
+    end
+
+    [job.loop_count.to_f / duration, duration]
+  end
+
+  def with_script(script)
+    if @config.verbose >= 2
+      sep = '-' * 30
+      $stdout.puts "\n\n#{sep}[Script begin]#{sep}\n#{script}#{sep}[Script end]#{sep}\n\n"
+    end
+
+    Tempfile.open(['benchmark_driver-', '.rb']) do |f|
+      f.puts script
+      f.close
+      return yield(f.path)
+    end
+  end
+
+  # @param [Integer] num_methods
+  # @param [Integer] loop_count
+  BenchmarkVM2VM = ::BenchmarkDriver::Struct.new(:num_methods, :loop_count) do
+    # @param [String] result - A file to write result
+    def render(result:)
+      ERB.new(<<~EOS, trim_mode: '%').result(binding)
+        % num_methods.times do |i|
+        def a<%= i %>
+          nil
+        end
+        % end
+        RubyVM::MJIT.pause if RubyVM::MJIT.enabled?
+
+        def vm
+          t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          i = 0
+          while i < <%= loop_count / 1000 %>
+        % 1000.times do |i|
+            a<%= i % num_methods %>
+        % end
+            i += 1
+          end
+        % (loop_count % 1000).times do |i|
+          a<%= i % num_methods %>
+        % end
+          Process.clock_gettime(Process::CLOCK_MONOTONIC) - t
+        end
+
+        vm # warmup call cache
+        File.write(<%= result.dump %>, vm)
+      EOS
+    end
+  end
+  private_constant :BenchmarkVM2VM
+
+  # @param [Integer] num_methods
+  # @param [Integer] loop_count
+  BenchmarkVM2JT = ::BenchmarkDriver::Struct.new(:num_methods, :loop_count) do
+    # @param [String] result - A file to write result
+    def render(result:)
+      ERB.new(<<~EOS, trim_mode: '%').result(binding)
+        % num_methods.times do |i|
+        def a<%= i %>
+          nil
+        end
+        a<%= i %>
+        a<%= i %> # --jit-min-calls=2
+        % end
+        RubyVM::MJIT.pause if RubyVM::MJIT.enabled?
+
+        def vm
+          t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          i = 0
+          while i < <%= loop_count / 1000 %>
+        % 1000.times do |i|
+            a<%= i % num_methods %>
+        % end
+            i += 1
+          end
+        % (loop_count % 1000).times do |i|
+          a<%= i % num_methods %>
+        % end
+          Process.clock_gettime(Process::CLOCK_MONOTONIC) - t
+        end
+
+        vm # warmup call cache
+        File.write(<%= result.dump %>, vm)
+      EOS
+    end
+  end
+  private_constant :BenchmarkVM2JT
+
+  # @param [Integer] num_methods
+  # @param [Integer] loop_count
+  BenchmarkJT2JT = ::BenchmarkDriver::Struct.new(:num_methods, :loop_count) do
+    # @param [String] result - A file to write result
+    def render(result:)
+      ERB.new(<<~EOS, trim_mode: '%').result(binding)
+        % num_methods.times do |i|
+        def a<%= i %>
+          nil
+        end
+        % end
+
+        # You may need to:
+        #   * Increase `JIT_ISEQ_SIZE_THRESHOLD` to 10000000 in mjit.h
+        #   * Always return false in `inlinable_iseq_p()` of mjit_compile.c
+        def jit
+          t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          i = 0
+          while i < <%= loop_count / 1000 %>
+        % 1000.times do |i|
+            a<%= i % num_methods %>
+        % end
+            i += 1
+          end
+        % (loop_count % 1000).times do |i|
+          a<%= i % num_methods %>
+        % end
+          Process.clock_gettime(Process::CLOCK_MONOTONIC) - t
+        end
+
+        jit
+        jit
+        RubyVM::MJIT.pause if RubyVM::MJIT.enabled?
+        File.write(<%= result.dump %>, jit)
+      EOS
+    end
+  end
+  private_constant :BenchmarkJT2JT
+end
diff --git a/benchmark/lib/benchmark_driver/runner/peak.rb b/benchmark/lib/benchmark_driver/runner/peak.rb
new file mode 100644
index 0000000000..d04f2e51ff
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/peak.rb
@@ -0,0 +1,151 @@
+require 'benchmark_driver/struct'
+require 'benchmark_driver/metric'
+require 'benchmark_driver/default_job'
+require 'benchmark_driver/default_job_parser'
+require 'tempfile'
+
+class BenchmarkDriver::Runner::Peak
+  METRIC = BenchmarkDriver::Metric.new(
+    name: 'Peak memory usage', unit: 'bytes', larger_better: false, worse_word: 'larger',
+  )
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  # @param [BenchmarkDriver::Config::RunnerConfig] config
+  # @param [BenchmarkDriver::Output] output
+  # @param [BenchmarkDriver::Context] contexts
+  def initialize(config:, output:, contexts:)
+    @config = config
+    @output = output
+    @contexts = contexts
+  end
+
+  # This method is dynamically called by `BenchmarkDriver::JobRunner.run`
+  # @param [Array<BenchmarkDriver::Runner::Peak::Job>] jobs
+  def run(jobs)
+    if jobs.any? { |job| job.loop_count.nil? }
+      jobs = jobs.map do |job|
+        job.loop_count ? job : Job.new(job.to_h.merge(loop_count: 1))
+      end
+    end
+
+    @output.with_benchmark do
+      jobs.each do |job|
+        @output.with_job(name: job.name) do
+          job.runnable_contexts(@contexts).each do |context|
+            value = BenchmarkDriver::Repeater.with_repeat(config: @config, larger_better: false) do
+              run_benchmark(job, context: context)
+            end
+            @output.with_context(name: context.name, executable: context.executable, gems: context.gems, prelude: context.prelude) do
+              @output.report(values: { metric => value }, loop_count: job.loop_count)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  private
+
+  # @param [BenchmarkDriver::Runner::Ips::Job] job - loop_count is not nil
+  # @param [BenchmarkDriver::Context] context
+  # @return [BenchmarkDriver::Metrics]
+  def run_benchmark(job, context:)
+    benchmark = BenchmarkScript.new(
+      preludes:   [context.prelude, job.prelude],
+      script:     job.script,
+      teardown:   job.teardown,
+      loop_count: job.loop_count,
+    )
+
+    memory_status = File.expand_path('../../../../tool/lib/memory_status', __dir__)
+    Tempfile.open(['benchmark_driver-', '.rb']) do |f|
+      with_script(benchmark.render) do |path|
+        output = IO.popen([*context.executable.command, path, f.path, target, memory_status], &:read)
+        if $?.success?
+          Integer(f.read)
+        else
+          $stdout.print(output)
+          BenchmarkDriver::Result::ERROR
+        end
+      end
+    end
+  end
+
+  # Overridden by BenchmarkDriver::Runner::Size
+  def target
+    'peak'
+  end
+
+  # Overridden by BenchmarkDriver::Runner::Size
+  def metric
+    METRIC
+  end
+
+  def with_script(script)
+    if @config.verbose >= 2
+      sep = '-' * 30
+      $stdout.puts "\n\n#{sep}[Script begin]#{sep}\n#{script}#{sep}[Script end]#{sep}\n\n"
+    end
+
+    Tempfile.open(['benchmark_driver-', '.rb']) do |f|
+      f.puts script
+      f.close
+      return yield(f.path)
+    end
+  end
+
+  # @param [String] prelude
+  # @param [String] script
+  # @param [String] teardown
+  # @param [Integer] loop_count
+  BenchmarkScript = ::BenchmarkDriver::Struct.new(:preludes, :script, :teardown, :loop_count) do
+    def render
+      prelude = preludes.reject(&:nil?).reject(&:empty?).join("\n")
+      <<-RUBY
+#{prelude}
+#{while_loop(script, loop_count)}
+#{teardown}
+
+result_file, target, memory_status = ARGV
+require_relative memory_status
+
+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
+else
+  raise('unexpected target: ' + target)
+end
+
+File.write(result_file, ms[key])
+      RUBY
+    end
+
+    private
+
+    def while_loop(content, times)
+      if !times.is_a?(Integer) || times <= 0
+        raise ArgumentError.new("Unexpected times: #{times.inspect}")
+      end
+
+      if times > 1
+        <<-RUBY
+__bmdv_i = 0
+while __bmdv_i < #{times}
+  #{content}
+  __bmdv_i += 1
+end
+        RUBY
+      else
+        content
+      end
+    end
+  end
+  private_constant :BenchmarkScript
+end
diff --git a/benchmark/lib/benchmark_driver/runner/size.rb b/benchmark/lib/benchmark_driver/runner/size.rb
new file mode 100644
index 0000000000..1b31f901c7
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/size.rb
@@ -0,0 +1,25 @@
+require 'benchmark_driver/runner/peak'
+
+# Actually the same as BenchmarkDriver::Runner::Memory
+class BenchmarkDriver::Runner::Size < BenchmarkDriver::Runner::Peak
+  METRIC = BenchmarkDriver::Metric.new(
+    name: 'Max resident set size', unit: 'bytes', larger_better: false, worse_word: 'larger',
+  )
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  private
+
+  # Overriding BenchmarkDriver::Runner::Peak#metric
+  def metric
+    METRIC
+  end
+
+  # Overriding BenchmarkDriver::Runner::Peak#target
+  def target
+    'size'
+  end
+end
diff --git a/benchmark/lib/benchmark_driver/runner/stime.rb b/benchmark/lib/benchmark_driver/runner/stime.rb
new file mode 100644
index 0000000000..4577fb0bf8
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/stime.rb
@@ -0,0 +1,22 @@
+require 'benchmark_driver/runner/total'
+
+class BenchmarkDriver::Runner::Stime < BenchmarkDriver::Runner::Total
+  METRIC = BenchmarkDriver::Metric.new(name: 'stime', unit: 's', larger_better: false)
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  private
+
+  # Overriding BenchmarkDriver::Runner::Total#metric
+  def metric
+    METRIC
+  end
+
+  # Overriding BenchmarkDriver::Runner::Total#target
+  def target
+    :stime
+  end
+end
diff --git a/benchmark/lib/benchmark_driver/runner/total.rb b/benchmark/lib/benchmark_driver/runner/total.rb
new file mode 100644
index 0000000000..64dc14f84e
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/total.rb
@@ -0,0 +1,137 @@
+require 'benchmark_driver/struct'
+require 'benchmark_driver/metric'
+require 'benchmark_driver/default_job'
+require 'benchmark_driver/default_job_parser'
+require 'tempfile'
+
+class BenchmarkDriver::Runner::Total
+  METRIC = BenchmarkDriver::Metric.new(name: 'Total time', unit: 's', larger_better: false)
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  # @param [BenchmarkDriver::Config::RunnerConfig] config
+  # @param [BenchmarkDriver::Output] output
+  # @param [BenchmarkDriver::Context] contexts
+  def initialize(config:, output:, contexts:)
+    @config = config
+    @output = output
+    @contexts = contexts
+  end
+
+  # This method is dynamically called by `BenchmarkDriver::JobRunner.run`
+  # @param [Array<BenchmarkDriver::Runner::Total::Job>] jobs
+  def run(jobs)
+    if jobs.any? { |job| job.loop_count.nil? }
+      raise 'missing loop_count is not supported in Ruby repository'
+    end
+
+    @output.with_benchmark do
+      jobs.each do |job|
+        @output.with_job(name: job.name) do
+          job.runnable_contexts(@contexts).each do |context|
+            duration = BenchmarkDriver::Repeater.with_repeat(config: @config, larger_better: false) do
+              run_benchmark(job, context: context)
+            end
+            @output.with_context(name: context.name, executable: context.executable, gems: context.gems, prelude: context.prelude) do
+              @output.report(values: { metric => duration }, duration: duration, loop_count: job.loop_count)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  private
+
+  # @param [BenchmarkDriver::Runner::Ips::Job] job - loop_count is not nil
+  # @param [BenchmarkDriver::Context] context
+  # @return [BenchmarkDriver::Metrics]
+  def run_benchmark(job, context:)
+    benchmark = BenchmarkScript.new(
+      preludes:   [context.prelude, job.prelude],
+      script:     job.script,
+      teardown:   job.teardown,
+      loop_count: job.loop_count,
+    )
+
+    Tempfile.open(['benchmark_driver-', '.rb']) do |f|
+      with_script(benchmark.render(result: f.path, target: target)) do |path|
+        IO.popen([*context.executable.command, path], &:read) # TODO: print stdout if verbose=2
+        if $?.success?
+          Float(f.read)
+        else
+          BenchmarkDriver::Result::ERROR
+        end
+      end
+    end
+  end
+
+  # This method is overridden by some subclasses
+  def metric
+    METRIC
+  end
+
+  # This method is overridden by some subclasses
+  def target
+    :total
+  end
+
+  def with_script(script)
+    if @config.verbose >= 2
+      sep = '-' * 30
+      $stdout.puts "\n\n#{sep}[Script begin]#{sep}\n#{script}#{sep}[Script end]#{sep}\n\n"
+    end
+
+    Tempfile.open(['benchmark_driver-', '.rb']) do |f|
+      f.puts script
+      f.close
+      return yield(f.path)
+    end
+  end
+
+  # @param [String] prelude
+  # @param [String] script
+  # @param [String] teardown
+  # @param [Integer] loop_count
+  BenchmarkScript = ::BenchmarkDriver::Struct.new(:preludes, :script, :teardown, :loop_count) do
+    # @param [String] result - A file to write result
+    def render(result:, target:)
+      prelude = preludes.reject(&:nil?).reject(&:empty?).join("\n")
+      <<-RUBY
+#{prelude}
+
+require 'benchmark'
+__bmdv_result = Benchmark.measure {
+  #{while_loop(script, loop_count)}
+}
+
+#{teardown}
+
+File.write(#{result.dump}, __bmdv_result.#{target})
+      RUBY
+    end
+
+    private
+
+    def while_loop(content, times)
+      if !times.is_a?(Integer) || times <= 0
+        raise ArgumentError.new("Unexpected times: #{times.inspect}")
+      elsif times == 1
+        return content
+      end
+
+      # TODO: execute in batch
+      <<-RUBY
+__bmdv_i = 0
+while __bmdv_i < #{times}
+  #{content}
+  __bmdv_i += 1
+end
+      RUBY
+    end
+  end
+  private_constant :BenchmarkScript
+end
diff --git a/benchmark/lib/benchmark_driver/runner/utime.rb b/benchmark/lib/benchmark_driver/runner/utime.rb
new file mode 100644
index 0000000000..b61d83a188
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/utime.rb
@@ -0,0 +1,22 @@
+require 'benchmark_driver/runner/total'
+
+class BenchmarkDriver::Runner::Utime < BenchmarkDriver::Runner::Total
+  METRIC = BenchmarkDriver::Metric.new(name: 'utime', unit: 's', larger_better: false)
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  private
+
+  # Overriding BenchmarkDriver::Runner::Total#metric
+  def metric
+    METRIC
+  end
+
+  # Overriding BenchmarkDriver::Runner::Total#target
+  def target
+    :utime
+  end
+end
diff --git a/benchmark/lib/load.rb b/benchmark/lib/load.rb
new file mode 100644
index 0000000000..31b770c484
--- /dev/null
+++ b/benchmark/lib/load.rb
@@ -0,0 +1,18 @@
+# How to use this file:
+#   1. write a `$(srcdir)/test.rb` like:
+=begin
+require_relative 'benchmark/lib/load'
+
+Benchmark.driver(repeat_count: 5){|x|
+  x.executable name: 'clean-miniruby', command: %w'../clean-trunk/miniruby'
+  x.executable name: 'modif-miniruby', command: %w'./miniruby'
+
+  x.report %q{
+    h = {a: 1, b: 2, c: 3, d: 4}
+  }
+}
+=end
+#
+#  2. `make run`
+$:.unshift(File.join(__dir__, '../benchmark-driver/lib'))
+require 'benchmark_driver'
diff --git a/benchmark/bm_loop_for.rb b/benchmark/loop_for.rb
index 0fc4cc1511..0fc4cc1511 100644
--- a/benchmark/bm_loop_for.rb
+++ b/benchmark/loop_for.rb
diff --git a/benchmark/bm_loop_generator.rb b/benchmark/loop_generator.rb
index d3375c744c..d3375c744c 100644
--- a/benchmark/bm_loop_generator.rb
+++ b/benchmark/loop_generator.rb
diff --git a/benchmark/bm_loop_times.rb b/benchmark/loop_times.rb
index 521f72ad1a..521f72ad1a 100644
--- a/benchmark/bm_loop_times.rb
+++ b/benchmark/loop_times.rb
diff --git a/benchmark/loop_whileloop.rb b/benchmark/loop_whileloop.rb
new file mode 100644
index 0000000000..0072822c06
--- /dev/null
+++ b/benchmark/loop_whileloop.rb
@@ -0,0 +1,4 @@
+i = 0
+while i<30_000_000 # benchmark loop 1
+  i += 1
+end
diff --git a/benchmark/loop_whileloop2.rb b/benchmark/loop_whileloop2.rb
new file mode 100644
index 0000000000..47d02dffc4
--- /dev/null
+++ b/benchmark/loop_whileloop2.rb
@@ -0,0 +1,4 @@
+i = 0
+while i< 6_000_000 # benchmark loop 2
+  i += 1
+end
diff --git a/benchmark/make_fasta_output.rb b/benchmark/make_fasta_output.rb
deleted file mode 100644
index b6d787ae27..0000000000
--- a/benchmark/make_fasta_output.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# prepare 'fasta.output'
-
-def prepare_fasta_output n
-  filebase = File.join(File.dirname($0), 'fasta.output')
-  script = File.join(File.dirname($0), 'bm_so_fasta.rb')
-  file = "#{filebase}.#{n}"
-
-  unless FileTest.exist?(file)
-    STDERR.puts "preparing #{file}"
-
-    open(file, 'w'){|f|
-      ARGV[0] = n
-      $stdout = f
-      load script
-      $stdout = STDOUT
-    }
-  end
-end
-
diff --git a/benchmark/marshal_dump_flo.rb b/benchmark/marshal_dump_flo.rb
new file mode 100644
index 0000000000..9b8d0c6afb
--- /dev/null
+++ b/benchmark/marshal_dump_flo.rb
@@ -0,0 +1,2 @@
+bug10761 = 10000.times.map { |x| x.to_f }
+100.times { Marshal.dump(bug10761) }
diff --git a/benchmark/marshal_dump_load_geniv.rb b/benchmark/marshal_dump_load_geniv.rb
new file mode 100644
index 0000000000..8252ad90fa
--- /dev/null
+++ b/benchmark/marshal_dump_load_geniv.rb
@@ -0,0 +1,10 @@
+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/marshal_dump_load_time.rb b/benchmark/marshal_dump_load_time.rb
new file mode 100644
index 0000000000..e29743b791
--- /dev/null
+++ b/benchmark/marshal_dump_load_time.rb
@@ -0,0 +1 @@
+100000.times { Marshal.load(Marshal.dump(Time.now)) }
diff --git a/benchmark/match_gt4.rb b/benchmark/match_gt4.rb
new file mode 100644
index 0000000000..ffda109912
--- /dev/null
+++ b/benchmark/match_gt4.rb
@@ -0,0 +1 @@
+1000000.times { /(.)(.)(\d+)(\d)/.match("THX1138.") }
diff --git a/benchmark/match_small.rb b/benchmark/match_small.rb
new file mode 100644
index 0000000000..3b743d484a
--- /dev/null
+++ b/benchmark/match_small.rb
@@ -0,0 +1 @@
+1000000.times { 'haystack'.match(/hay/) }
diff --git a/benchmark/mjit_exec_jt2jt.yml b/benchmark/mjit_exec_jt2jt.yml
new file mode 100644
index 0000000000..5be408e30c
--- /dev/null
+++ b/benchmark/mjit_exec_jt2jt.yml
@@ -0,0 +1,8 @@
+# Usage:
+#   RUBYOPT=-Ibenchmark/lib benchmark-driver -e 'ruby --jit' benchmark/mjit_exec_vm2jt.yml
+type: mjit_exec # benchmark/lib/benchmark_driver/runner/mjit_exec.rb
+num_methods: [1]
+#num_methods: (1..100).to_a + [200, 300, 400, 500, 600, 700, 800, 900, 1000]
+loop_count: 50000000
+from_jit: true
+to_jit: true
diff --git a/benchmark/mjit_exec_vm2jt.yml b/benchmark/mjit_exec_vm2jt.yml
new file mode 100644
index 0000000000..9947dbb7dd
--- /dev/null
+++ b/benchmark/mjit_exec_vm2jt.yml
@@ -0,0 +1,8 @@
+# Usage:
+#   RUBYOPT=-Ibenchmark/lib benchmark-driver -e 'ruby --jit' benchmark/mjit_exec_vm2jt.yml
+type: mjit_exec # benchmark/lib/benchmark_driver/runner/mjit_exec.rb
+num_methods: [1]
+#num_methods: (1..100).to_a + [200, 300, 400, 500, 600, 700, 800, 900, 1000]
+loop_count: 50000000
+from_jit: false
+to_jit: true
diff --git a/benchmark/mjit_exec_vm2vm.yml b/benchmark/mjit_exec_vm2vm.yml
new file mode 100644
index 0000000000..4b84427b10
--- /dev/null
+++ b/benchmark/mjit_exec_vm2vm.yml
@@ -0,0 +1,8 @@
+# Usage:
+#   RUBYOPT=-Ibenchmark/lib benchmark-driver -e 'ruby --jit' benchmark/mjit_exec_vm2vm.yml
+type: mjit_exec # benchmark/lib/benchmark_driver/runner/mjit_exec.rb
+num_methods: [1]
+#num_methods: (1..100).to_a + [200, 300, 400, 500, 600, 700, 800, 900, 1000]
+loop_count: 50000000
+from_jit: false
+to_jit: false
diff --git a/benchmark/nil_p.yml b/benchmark/nil_p.yml
new file mode 100644
index 0000000000..79ba4f2177
--- /dev/null
+++ b/benchmark/nil_p.yml
@@ -0,0 +1,9 @@
+prelude: |
+  class Niller; def nil?; true; end; end
+  xnil, notnil = nil, Object.new
+  niller = Niller.new
+benchmark:
+  - xnil.nil?
+  - notnil.nil?
+  - niller.nil?
+loop_count: 10000000
diff --git a/benchmark/other-lang/fact.py b/benchmark/other-lang/fact.py
index 01593965d9..1ce9f76275 100644
--- a/benchmark/other-lang/fact.py
+++ b/benchmark/other-lang/fact.py
@@ -3,7 +3,7 @@
 
 def factL(n):
 	r = 1
-	for x in range(2, n):
+	for x in range(2, n+1):
 		r *= x
 	return r
 
diff --git a/benchmark/other-lang/fact.rb b/benchmark/other-lang/fact.rb
index 7e97b22b39..6cedc752cd 100644
--- a/benchmark/other-lang/fact.rb
+++ b/benchmark/other-lang/fact.rb
@@ -6,8 +6,8 @@ def fact(n)
   end
 end
 
-i=0
+i = 0
 while i<10000
-  i+=1
+  i += 1
   fact(100)
 end
diff --git a/benchmark/other-lang/loop.rb b/benchmark/other-lang/loop.rb
index d43cef61f3..b367b9dbf3 100644
--- a/benchmark/other-lang/loop.rb
+++ b/benchmark/other-lang/loop.rb
@@ -1,4 +1,4 @@
-i=0
+i = 0
 while i<30000000
-  i+=1
+  i += 1
 end
diff --git a/benchmark/prepare_so_count_words.rb b/benchmark/prepare_so_count_words.rb
deleted file mode 100644
index ee2138cdb2..0000000000
--- a/benchmark/prepare_so_count_words.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# prepare 'wc.input'
-
-def prepare_wc_input
-  wcinput = File.join(File.dirname($0), 'wc.input')
-  wcbase  = File.join(File.dirname($0), 'wc.input.base')
-  unless FileTest.exist?(wcinput)
-    data = File.read(wcbase)
-    13.times{
-      data << data
-    }
-    open(wcinput, 'w'){|f| f.write data}
-  end
-end
-
-prepare_wc_input
diff --git a/benchmark/prepare_so_k_nucleotide.rb b/benchmark/prepare_so_k_nucleotide.rb
deleted file mode 100644
index f28f4460a1..0000000000
--- a/benchmark/prepare_so_k_nucleotide.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require File.join(File.dirname(__FILE__), 'make_fasta_output')
-prepare_fasta_output(100_000)
diff --git a/benchmark/prepare_so_reverse_complement.rb b/benchmark/prepare_so_reverse_complement.rb
deleted file mode 100644
index 7f089109de..0000000000
--- a/benchmark/prepare_so_reverse_complement.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require File.join(File.dirname(__FILE__), 'make_fasta_output')
-prepare_fasta_output(2_500_000)
diff --git a/benchmark/range_last.yml b/benchmark/range_last.yml
new file mode 100644
index 0000000000..a6674f82ee
--- /dev/null
+++ b/benchmark/range_last.yml
@@ -0,0 +1,4 @@
+benchmark:
+  - (1..1_000_000).last(100)
+  - (1..1_000_000).last(1000)
+  - (1..1_000_000).last(10000)
diff --git a/benchmark/realpath.yml b/benchmark/realpath.yml
new file mode 100644
index 0000000000..90a029d5b9
--- /dev/null
+++ b/benchmark/realpath.yml
@@ -0,0 +1,30 @@
+prelude: |
+  f = File
+  pwd = Dir.pwd
+  Dir.mkdir('b') unless f.directory?('b')
+  f.write('b/a', '') unless f.file?('b/a')
+
+  relative = 'b/a'
+  absolute = File.join(pwd, relative)
+  dir = 'b'
+  file = 'a'
+
+  relative_dir = 'b/c'
+  absolute_dir = File.join(pwd, relative_dir)
+  file_dir = 'c'
+benchmark:
+  relative_nil: "f.realpath(relative, nil)"
+  absolute_nil: "f.realpath(absolute, nil)"
+  relative_relative: "f.realpath(file, dir)"
+  absolute_relative: "f.realpath(absolute, dir)"
+  relative_absolute: "f.realpath(relative, pwd)"
+  relative_nil_dir: "f.realdirpath(relative_dir, nil)"
+  absolute_nil_dir: "f.realdirpath(absolute_dir, nil)"
+  relative_relative_dir: "f.realdirpath(file_dir, dir)"
+  absolute_relative_dir: "f.realdirpath(absolute_dir, dir)"
+  relative_absolute_dir: "f.realdirpath(relative_dir, pwd)"
+  relative_nil_notexist: "f.realpath(relative_dir, nil) rescue nil"
+  absolute_nil_notexist: "f.realpath(absolute_dir, nil) rescue nil"
+  relative_relative_notexist: "f.realpath(file_dir, dir) rescue nil"
+  absolute_relative_notexist: "f.realpath(absolute_dir, dir) rescue nil"
+  relative_absolute_notexist: "f.realpath(relative_dir, pwd) rescue nil"
diff --git a/benchmark/report.rb b/benchmark/report.rb
deleted file mode 100644
index d2dc56b1e1..0000000000
--- a/benchmark/report.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# YARV benchmark driver
-#
-
-require 'yarvutil'
-require 'benchmark'
-require 'rbconfig'
-
-def exec_command type, file, w
-  <<-EOP
-  $DRIVER_PATH = '#{File.dirname($0)}'
-  $LOAD_PATH.replace $LOAD_PATH | #{$LOAD_PATH.inspect}
-  require 'benchmark'
-  require 'yarvutil'
-#  print '#{type}'
-  begin
-    puts Benchmark.measure{
-      #{w}('#{file}')
-    }.utime
-  rescue Exception => exec_command_error_variable
-    puts "\t" + exec_command_error_variable.message
-  end
-  EOP
-end
-
-def benchmark cmd
-  rubybin = ENV['RUBY'] || RbConfig.ruby
-
-  IO.popen(rubybin, 'r+'){|io|
-    io.write cmd
-    io.close_write
-    return io.gets
-  }
-end
-
-def ruby_exec file
-  prog = exec_command 'ruby', file, 'load'
-  benchmark prog
-end
-
-def yarv_exec file
-  prog = exec_command 'yarv', file, 'YARVUtil.load_bm'
-  benchmark prog
-end
-
-$wr = $wy = nil
-
-def measure bench
-  file = File.dirname($0) + "/bm_#{bench}.rb"
-  r = ruby_exec(file).to_f
-  y = yarv_exec(file).to_f
-  puts "#{bench}\t#{r}\t#{y}"
-end
-
-def measure2
-  r = ruby_exec.to_f
-  y = yarv_exec.to_f
-  puts r/y
-end
-
-if $0 == __FILE__
-  %w{
-    whileloop
-    whileloop2
-    times
-    const
-    method
-    poly_method
-    block
-    rescue
-    rescue2
-  }.each{|bench|
-    measure bench
-  }
-end
-
-
-
-
diff --git a/benchmark/require.yml b/benchmark/require.yml
new file mode 100644
index 0000000000..09f218cf08
--- /dev/null
+++ b/benchmark/require.yml
@@ -0,0 +1,32 @@
+prelude: |
+  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|
+      File.write("#{data_dir}/c#{i}.rb", "class C#{i}\n""end\n")
+    end
+  end
+
+  prepare
+benchmark:
+  require: |
+    $:.push File.join(File.dirname(__FILE__), "bm_require.data")
+
+    1.upto(10000) do |i|
+      require "c#{i}"
+    end
+
+    $:.pop
+loop_count: 1
diff --git a/benchmark/require_thread.yml b/benchmark/require_thread.yml
new file mode 100644
index 0000000000..0c63257106
--- /dev/null
+++ b/benchmark/require_thread.yml
@@ -0,0 +1,40 @@
+prelude: |
+  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|
+      File.write("#{data_dir}/c#{i}.rb", "class C#{i}\n""end\n")
+    end
+  end
+
+  prepare
+benchmark:
+  require_thread: |
+    $:.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
+loop_count: 1
diff --git a/benchmark/run.rb b/benchmark/run.rb
deleted file mode 100644
index 0cd2363849..0000000000
--- a/benchmark/run.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# Ruby benchmark driver
-#
-
-require 'benchmark'
-require 'rbconfig'
-
-$matzrubyonly = false
-$rubyonly = false
-
-$results  = []
-
-# prepare 'wc.input'
-def prepare_wc_input
-  wcinput = File.join(File.dirname($0), 'wc.input')
-  wcbase  = File.join(File.dirname($0), 'wc.input.base')
-  unless FileTest.exist?(wcinput)
-    data = File.read(wcbase)
-    13.times{
-      data << data
-    }
-    open(wcinput, 'w'){|f| f.write data}
-  end
-end
-
-prepare_wc_input
-
-def bm file
-  prog = File.readlines(file).map{|e| e.rstrip}.join("\n")
-  return if prog.empty?
-
-  /[a-z]+_(.+)\.rb/ =~ file
-  bm_name = $1
-  puts '-----------------------------------------------------------' unless $rubyonly || $matzrubyonly
-  puts "#{bm_name}: "
-
-
-puts <<EOS unless $matzrubyonly || $rubyonly
-#{prog}
---
-EOS
-  begin
-    result = [bm_name]
-    result << matzruby_exec(file) unless $rubyonly
-    result << ruby_exec(file) unless $matzrubyonly
-    $results << result
-
-  rescue Exception => e
-    puts
-    puts "** benchmark failure: #{e}"
-    puts e.backtrace
-  end
-end
-
-def benchmark file, bin
-  m = Benchmark.measure{
-    `#{bin} #{$opts} #{file}`
-  }
-  sec = '%.3f' % m.real
-  puts " #{sec}"
-  sec
-end
-
-def ruby_exec file
-  print 'ruby'
-  benchmark file, $ruby_program
-end
-
-def matzruby_exec file
-  print 'matz'
-  rubylib = ENV['RUBYLIB']
-  ENV['RUBYLIB'] = ''
-  r = benchmark file, $matzruby_program
-  ENV['RUBYLIB'] = rubylib
-  r
-end
-
-if $0 == __FILE__
-  ARGV.each{|arg|
-    case arg
-    when /\A--ruby=(.+)/
-      $ruby_program = $1
-    when /\A--matzruby=(.+)/
-      $matzruby_program = $1
-    when /\A--opts=(.+)/
-      $opts = $1
-    when /\A(-r|--only-ruby)\z/
-      $rubyonly = true
-    when /\A(-m|--only-matzruby)\z/
-      $matzrubyonly = true
-    end
-  }
-  ARGV.delete_if{|arg|
-    /\A-/ =~ arg
-  }
-
-  puts "MatzRuby:"
-  system("#{$matzruby_program} -v")
-  puts "Ruby:"
-  system("#{$ruby_program} -v")
-  puts
-
-  if ARGV.empty?
-    Dir.glob(File.dirname(__FILE__) + '/bm_*.rb').sort.each{|file|
-      bm file
-    }
-  else
-    ARGV.each{|file|
-      Dir.glob(File.join(File.dirname(__FILE__), file + '*')){|ef|
-        # file = "#{File.dirname(__FILE__)}/#{file}.rb"
-        bm ef
-      }
-    }
-  end
-
-  puts
-  puts "-- benchmark summary ---------------------------"
-  $results.each{|res|
-    print res.shift, "\t"
-    (res||[]).each{|result|
-      /([\d\.]+)/ =~ result
-      print $1 + "\t" if $1
-    }
-    puts
-  }
-end
-
diff --git a/benchmark/runc.rb b/benchmark/runc.rb
deleted file mode 100644
index 97c5cef045..0000000000
--- a/benchmark/runc.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-#
-#
-
-require 'benchmark'
-require 'rbconfig'
-
-$rubybin = ENV['RUBY'] || RbConfig.ruby
-
-def runfile file
-  puts file
-  file = File.join(File.dirname($0), 'contrib', file)
-  Benchmark.bm{|x|
-    x.report('ruby'){
-      system("#{$rubybin} #{file}")
-    }
-    x.report('yarv'){
-      system("#{$rubybin} -rite -I.. #{file}")
-    }
-  }
-end
-
-ARGV.each{|file|
-  runfile file
-}
-
-
diff --git a/benchmark/securerandom.rb b/benchmark/securerandom.rb
new file mode 100644
index 0000000000..a082ea6d5b
--- /dev/null
+++ b/benchmark/securerandom.rb
@@ -0,0 +1,5 @@
+require "securerandom"
+
+20_0000.times do
+  SecureRandom.random_number(100)
+end
diff --git a/benchmark/so_ackermann.rb b/benchmark/so_ackermann.rb
new file mode 100644
index 0000000000..4effa1ecaf
--- /dev/null
+++ b/benchmark/so_ackermann.rb
@@ -0,0 +1,19 @@
+#!/usr/bin/ruby
+# -*- Ruby -*-
+# $Id: ackermann-ruby.code,v 1.4 2004/11/13 07:40:41 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+
+def ack(m, n)
+    if m == 0 then
+        n + 1
+    elsif n == 0 then
+        ack(m - 1, 1)
+    else
+        ack(m - 1, ack(m, n - 1))
+    end
+end
+
+NUM = 9
+ack(3, NUM)
+
+
diff --git a/benchmark/so_array.rb b/benchmark/so_array.rb
new file mode 100644
index 0000000000..767e03db5f
--- /dev/null
+++ b/benchmark/so_array.rb
@@ -0,0 +1,23 @@
+#!/usr/bin/ruby
+# -*- Ruby -*-
+# $Id: ary-ruby.code,v 1.4 2004/11/13 07:41:27 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# with help from Paul Brannan and Mark Hubbart
+
+n = 9000 # Integer(ARGV.shift || 1)
+
+x = Array.new(n)
+y = Array.new(n, 0)
+
+n.times{|bi|
+  x[bi] = bi + 1
+}
+
+(0 .. 999).each do |e|
+  (n-1).step(0,-1) do |bi|
+    y[bi] += x.at(bi)
+  end
+end
+# puts "#{y.first} #{y.last}"
+
+
diff --git a/benchmark/so_binary_trees.rb b/benchmark/so_binary_trees.rb
new file mode 100644
index 0000000000..b1693e4109
--- /dev/null
+++ b/benchmark/so_binary_trees.rb
@@ -0,0 +1,62 @@
+# The Computer Language Shootout Benchmarks
+# http://shootout.alioth.debian.org
+#
+# contributed by Jesse Millikan
+
+# disable output
+alias puts_orig puts
+def puts str
+  # disable puts
+end
+
+def item_check(tree)
+ if tree[0] == nil
+  tree[1]
+ else
+  tree[1] + item_check(tree[0]) - item_check(tree[2])
+ end
+end
+
+def bottom_up_tree(item, depth)
+ if depth > 0
+  item_item = 2 * item
+  depth -= 1
+  [bottom_up_tree(item_item - 1, depth), item, bottom_up_tree(item_item, depth)]
+ else
+  [nil, item, nil]
+ end
+end
+
+max_depth = 16 # ARGV[0].to_i
+min_depth = 4
+
+max_depth = min_depth + 2 if min_depth + 2 > max_depth
+
+stretch_depth = max_depth + 1
+stretch_tree = bottom_up_tree(0, stretch_depth)
+
+puts "stretch tree of depth #{stretch_depth}\t check: #{item_check(stretch_tree)}"
+stretch_tree = nil
+
+long_lived_tree = bottom_up_tree(0, max_depth)
+
+min_depth.step(max_depth + 1, 2) do |depth|
+ iterations = 2**(max_depth - depth + min_depth)
+
+ check = 0
+
+ for i in 1..iterations
+  temp_tree = bottom_up_tree(i, depth)
+  check += item_check(temp_tree)
+
+  temp_tree = bottom_up_tree(-i, depth)
+  check += item_check(temp_tree)
+ end
+
+ puts "#{iterations * 2}\t trees of depth #{depth}\t check: #{check}"
+end
+
+puts "long lived tree of depth #{max_depth}\t check: #{item_check(long_lived_tree)}"
+
+undef puts
+alias puts puts_orig
diff --git a/benchmark/so_concatenate.rb b/benchmark/so_concatenate.rb
new file mode 100644
index 0000000000..4468e20ac8
--- /dev/null
+++ b/benchmark/so_concatenate.rb
@@ -0,0 +1,18 @@
+#!/usr/bin/ruby
+# -*- Ruby -*-
+# $Id: strcat-ruby.code,v 1.4 2004/11/13 07:43:28 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# based on code from Aristarkh A Zagorodnikov and Dat Nguyen
+
+STUFF = "hello\n"
+i = 0
+while i<10
+  i += 1
+  hello = ''
+  4_000_000.times do |e|
+    hello << STUFF
+  end
+end
+# puts hello.length
+
+
diff --git a/benchmark/so_count_words.yml b/benchmark/so_count_words.yml
new file mode 100644
index 0000000000..99683505f9
--- /dev/null
+++ b/benchmark/so_count_words.yml
@@ -0,0 +1,65 @@
+prelude: |
+  #!/usr/bin/ruby
+
+  wc_input_base = <<EOS
+  Subject:      Re: Who was Izchak Miller?
+  From:         "Jane D. Anonymous" <nobody@yale.edu>
+  Date:         1996/04/28
+  Message-Id:   <4lv7bc$oh@news.ycc.yale.edu>
+  References:   <317C405E.5DFA@panix.com> <4lk6vl$gde@ns.oar.net>
+  To:           75176.2330@compuserve.com
+  Content-Type: text/plain; charset=us-ascii
+  Organization: Yale University
+  X-Url:        news:4lk6vl$gde@ns.oar.net
+  Mime-Version: 1.0
+  Newsgroups:   rec.games.roguelike.nethack
+  X-Mailer:     Mozilla 1.1N (Macintosh; I; 68K)
+
+  Hello there, Izchak Miller was my father.  When I was younger I spent 
+  many a night, hunched over the keyboard with a cup of tea, playing 
+  nethack with him and my brother.  my dad was a philosopher with a strong 
+  weakness for fantasy/sci fi.  I remember when he started to get involved 
+  with the Nethack team- my brother's Dungeons and Dragons monster book 
+  found a regular place beside my dad's desk. it's nice to see him living 
+  on in the game he loved so much :-).  
+                                                                    Tamar Miller
+
+  The following is a really long word of 5000 characters:
+
+  wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
+  EOS
+
+  # prepare 'wc.input'
+
+  def prepare_wc_input(wcbase)
+    wcinput = File.join(File.dirname($0), 'wc.input')
+    unless FileTest.exist?(wcinput)
+      data = wcbase.dup
+      13.times{
+        data << data
+      }
+      open(wcinput, 'w'){|f| f.write data}
+    end
+  end
+
+  prepare_wc_input(wc_input_base)
+
+benchmark:
+  so_count_words: |
+    # $Id: wc-ruby.code,v 1.4 2004/11/13 07:43:32 bfulgham Exp $
+    # http://www.bagley.org/~doug/shootout/
+    # with help from Paul Brannan
+    input = open(File.join(File.dirname($0), 'wc.input'), 'rb')
+
+    nl = nw = nc = 0
+    while true
+      tmp = input.read(4096) or break
+      data = tmp << (input.gets || "")
+      nc += data.length
+      nl += data.count("\n")
+      ((data.strip! || data).tr!("\n", " ") || data).squeeze!
+      nw += data.count(" ") + 1
+    end
+    # STDERR.puts "#{nl} #{nw} #{nc}"
+
+loop_count: 1
diff --git a/benchmark/so_exception.rb b/benchmark/so_exception.rb
new file mode 100644
index 0000000000..eb205b4df1
--- /dev/null
+++ b/benchmark/so_exception.rb
@@ -0,0 +1,61 @@
+#!/usr/bin/ruby
+# -*- Ruby -*-
+# $Id: except-ruby.code,v 1.4 2004/11/13 07:41:33 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+
+$HI = 0
+$LO = 0
+NUM = 250000 # Integer(ARGV[0] || 1)
+
+
+class Lo_Exception < Exception
+  def initialize(num)
+    @value = num
+  end
+end
+
+class Hi_Exception < Exception
+  def initialize(num)
+    @value = num
+  end
+end
+
+def some_function(num)
+  begin
+    hi_function(num)
+  rescue
+    print "We shouldn't get here, exception is: #{$!.type}\n"
+  end
+end
+
+def hi_function(num)
+  begin
+    lo_function(num)
+  rescue Hi_Exception
+    $HI = $HI + 1
+  end
+end
+
+def lo_function(num)
+  begin
+    blowup(num)
+  rescue Lo_Exception
+    $LO = $LO + 1
+  end
+end
+
+def blowup(num)
+  if num % 2 == 0
+    raise Lo_Exception.new(num)
+  else
+    raise Hi_Exception.new(num)
+  end
+end
+
+
+i = 1
+max = NUM+1
+while i < max
+  i += 1
+  some_function(i+1)
+end
diff --git a/benchmark/bm_so_fannkuch.rb b/benchmark/so_fannkuch.rb
index bac5ecd44c..bac5ecd44c 100644
--- a/benchmark/bm_so_fannkuch.rb
+++ b/benchmark/so_fannkuch.rb
diff --git a/benchmark/so_fasta.rb b/benchmark/so_fasta.rb
new file mode 100644
index 0000000000..dcc6b39507
--- /dev/null
+++ b/benchmark/so_fasta.rb
@@ -0,0 +1,81 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org/
+# Contributed by Sokolov Yura
+
+$last = 42.0
+def gen_random(max, im=139968, ia=3877, ic=29573)
+    (max * ($last = ($last * ia + ic) % im)) / im
+end
+
+alu =
+   "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG"+
+   "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA"+
+   "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT"+
+   "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA"+
+   "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG"+
+   "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC"+
+   "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA"
+
+iub = [
+    ["a", 0.27],
+    ["c", 0.12],
+    ["g", 0.12],
+    ["t", 0.27],
+
+    ["B", 0.02],
+    ["D", 0.02],
+    ["H", 0.02],
+    ["K", 0.02],
+    ["M", 0.02],
+    ["N", 0.02],
+    ["R", 0.02],
+    ["S", 0.02],
+    ["V", 0.02],
+    ["W", 0.02],
+    ["Y", 0.02],
+]
+homosapiens = [
+    ["a", 0.3029549426680],
+    ["c", 0.1979883004921],
+    ["g", 0.1975473066391],
+    ["t", 0.3015094502008],
+]
+
+def make_repeat_fasta(id, desc, src, n)
+    puts ">#{id} #{desc}"
+    v = nil
+    width = 60
+    l = src.length
+    s = src * ((n / l) + 1)
+    s.slice!(n, l)
+    puts(s.scan(/.{1,#{width}}/).join("\n"))
+end
+
+def make_random_fasta(id, desc, table, n)
+    puts ">#{id} #{desc}"
+    rand, v = nil,nil
+    width = 60
+    chunk = 1 * width
+    prob = 0.0
+    table.each{|v| v[1]= (prob += v[1])}
+    for i in 1..(n/width)
+        puts((1..width).collect{
+            rand = gen_random(1.0)
+            table.find{|v| v[1]>rand}[0]
+        }.join)
+    end
+    if n%width != 0
+        puts((1..(n%width)).collect{
+            rand = gen_random(1.0)
+            table.find{|v| v[1]>rand}[0]
+        }.join)
+    end
+end
+
+
+n = (ARGV[0] or 250_000).to_i
+
+make_repeat_fasta('ONE', 'Homo sapiens alu', alu, n*2)
+make_random_fasta('TWO', 'IUB ambiguity codes', iub, n*3)
+make_random_fasta('THREE', 'Homo sapiens frequency', homosapiens, n*5)
+
diff --git a/benchmark/so_k_nucleotide.yml b/benchmark/so_k_nucleotide.yml
new file mode 100644
index 0000000000..d7df086c39
--- /dev/null
+++ b/benchmark/so_k_nucleotide.yml
@@ -0,0 +1,155 @@
+prelude: |
+  bm_so_fasta = <<'EOS'
+  # The Computer Language Shootout
+  # http://shootout.alioth.debian.org/
+  # Contributed by Sokolov Yura
+
+  $last = 42.0
+  def gen_random(max, im=139968, ia=3877, ic=29573)
+      (max * ($last = ($last * ia + ic) % im)) / im
+  end
+
+  alu =
+     "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG"+
+     "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA"+
+     "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT"+
+     "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA"+
+     "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG"+
+     "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC"+
+     "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA"
+
+  iub = [
+      ["a", 0.27],
+      ["c", 0.12],
+      ["g", 0.12],
+      ["t", 0.27],
+
+      ["B", 0.02],
+      ["D", 0.02],
+      ["H", 0.02],
+      ["K", 0.02],
+      ["M", 0.02],
+      ["N", 0.02],
+      ["R", 0.02],
+      ["S", 0.02],
+      ["V", 0.02],
+      ["W", 0.02],
+      ["Y", 0.02],
+  ]
+  homosapiens = [
+      ["a", 0.3029549426680],
+      ["c", 0.1979883004921],
+      ["g", 0.1975473066391],
+      ["t", 0.3015094502008],
+  ]
+
+  def make_repeat_fasta(id, desc, src, n)
+      puts ">#{id} #{desc}"
+      v = nil
+      width = 60
+      l = src.length
+      s = src * ((n / l) + 1)
+      s.slice!(n, l)
+      puts(s.scan(/.{1,#{width}}/).join("\n"))
+  end
+
+  def make_random_fasta(id, desc, table, n)
+      puts ">#{id} #{desc}"
+      rand, v = nil,nil
+      width = 60
+      chunk = 1 * width
+      prob = 0.0
+      table.each{|v| v[1]= (prob += v[1])}
+      for i in 1..(n/width)
+          puts((1..width).collect{
+              rand = gen_random(1.0)
+              table.find{|v| v[1]>rand}[0]
+          }.join)
+      end
+      if n%width != 0
+          puts((1..(n%width)).collect{
+              rand = gen_random(1.0)
+              table.find{|v| v[1]>rand}[0]
+          }.join)
+      end
+  end
+
+
+  n = (ARGV[0] or 250_000).to_i
+
+  make_repeat_fasta('ONE', 'Homo sapiens alu', alu, n*2)
+  make_random_fasta('TWO', 'IUB ambiguity codes', iub, n*3)
+  make_random_fasta('THREE', 'Homo sapiens frequency', homosapiens, n*5)
+  EOS
+benchmark:
+  - name: so_k_nucleotide
+    prelude: |
+      script = File.join(File.dirname($0), 'bm_so_fasta.rb')
+      File.write(script, bm_so_fasta)
+
+      def prepare_fasta_output n
+        filebase = File.join(File.dirname($0), 'fasta.output')
+        script = File.join(File.dirname($0), 'bm_so_fasta.rb')
+        file = "#{filebase}.#{n}"
+
+        unless FileTest.exist?(file)
+          STDERR.puts "preparing #{file}"
+
+          open(file, 'w'){|f|
+            ARGV[0] = n
+            $stdout = f
+            load script
+            $stdout = STDOUT
+          }
+        end
+      end
+      prepare_fasta_output(100_000)
+    script: |
+      # The Computer Language Shootout
+      # http://shootout.alioth.debian.org
+      #
+      # contributed by jose fco. gonzalez
+      # modified by Sokolov Yura
+
+      seq = String.new
+
+      def frecuency( seq,length )
+          n, table = seq.length - length + 1, Hash.new(0)
+          f, i = nil, nil
+          (0 ... length).each do |f|
+              (f ... n).step(length) do |i|
+                  table[seq[i,length]] += 1
+              end
+          end
+          [n,table]
+
+      end
+
+      def sort_by_freq( seq,length )
+          n,table = frecuency( seq,length )
+          a, b, v = nil, nil, nil
+          table.sort{|a,b| b[1] <=> a[1]}.each do |v|
+              puts "%s %.3f" % [v[0].upcase,((v[1]*100).to_f/n)]
+          end
+          puts
+      end
+
+      def find_seq( seq,s )
+          n,table = frecuency( seq,s.length )
+          puts "#{table[s].to_s}\t#{s.upcase}"
+      end
+
+      input = open(File.join(File.dirname($0), 'fasta.output.100000'), 'rb')
+
+      line = input.gets while line !~ /^>THREE/
+      line = input.gets
+
+      while (line !~ /^>/) & line do
+          seq << line.chomp
+          line = input.gets
+      end
+
+      [1,2].each {|i| sort_by_freq( seq,i ) }
+
+      %w(ggt ggta ggtatt ggtattttaatt ggtattttaatttatagt).each{|s| find_seq( seq,s) }
+    loop_count: 1
diff --git a/benchmark/so_lists.rb b/benchmark/so_lists.rb
new file mode 100644
index 0000000000..e8f4a2a5f7
--- /dev/null
+++ b/benchmark/so_lists.rb
@@ -0,0 +1,47 @@
+#from http://www.bagley.org/~doug/shootout/bench/lists/lists.ruby
+
+NUM = 300
+SIZE = 10000
+
+def test_lists()
+  # create a list of integers (Li1) from 1 to SIZE
+  li1 = (1..SIZE).to_a
+  # copy the list to li2 (not by individual items)
+  li2 = li1.dup
+  # remove each individual item from left side of li2 and
+  # append to right side of li3 (preserving order)
+  li3 = Array.new
+  while (not li2.empty?)
+    li3.push(li2.shift)
+  end
+  # li2 must now be empty
+  # remove each individual item from right side of li3 and
+  # append to right side of li2 (reversing list)
+  while (not li3.empty?)
+    li2.push(li3.pop)
+  end
+  # li3 must now be empty
+  # reverse li1 in place
+  li1.reverse!
+  # check that first item is now SIZE
+  if li1[0] != SIZE then
+    p "not SIZE"
+    0
+  else
+    # compare li1 and li2 for equality
+    if li1 != li2 then
+      return(0)
+    else
+      # return the length of the list
+      li1.length
+    end
+  end
+end
+
+i = 0
+while i<NUM
+  i += 1
+  result = test_lists()
+end
+
+result
diff --git a/benchmark/bm_so_mandelbrot.rb b/benchmark/so_mandelbrot.rb
index 76331c64b8..76331c64b8 100644
--- a/benchmark/bm_so_mandelbrot.rb
+++ b/benchmark/so_mandelbrot.rb
diff --git a/benchmark/so_matrix.rb b/benchmark/so_matrix.rb
new file mode 100644
index 0000000000..2d1e72bda9
--- /dev/null
+++ b/benchmark/so_matrix.rb
@@ -0,0 +1,48 @@
+#!/usr/bin/ruby
+# -*- Ruby -*-
+# $Id: matrix-ruby.code,v 1.4 2004/11/13 07:42:14 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+
+n = 60 #Integer(ARGV.shift || 1)
+
+size = 40
+
+def mkmatrix(rows, cols)
+    count = 1
+    mx = Array.new(rows)
+    (0 .. (rows - 1)).each do |bi|
+        row = Array.new(cols, 0)
+        (0 .. (cols - 1)).each do |j|
+            row[j] = count
+            count += 1
+        end
+        mx[bi] = row
+    end
+    mx
+end
+
+def mmult(rows, cols, m1, m2)
+    m3 = Array.new(rows)
+    (0 .. (rows - 1)).each do |bi|
+        row = Array.new(cols, 0)
+        (0 .. (cols - 1)).each do |j|
+            val = 0
+            (0 .. (cols - 1)).each do |k|
+                val += m1.at(bi).at(k) * m2.at(k).at(j)
+            end
+            row[j] = val
+        end
+        m3[bi] = row
+    end
+    m3
+end
+
+m1 = mkmatrix(size, size)
+m2 = mkmatrix(size, size)
+mm = Array.new
+n.times do
+    mm = mmult(size, size, m1, m2)
+end
+# puts "#{mm[0][0]} #{mm[2][3]} #{mm[3][2]} #{mm[4][4]}"
+
+
diff --git a/benchmark/so_meteor_contest.rb b/benchmark/so_meteor_contest.rb
new file mode 100644
index 0000000000..8c136baa6c
--- /dev/null
+++ b/benchmark/so_meteor_contest.rb
@@ -0,0 +1,563 @@
+#!/usr/bin/env ruby
+#
+# The Computer Language Shootout
+#   http://shootout.alioth.debian.org
+#   contributed by Kevin Barnes (Ruby novice)
+
+# PROGRAM:  the main body is at the bottom.
+#   1) read about the problem here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
+#   2) see how I represent a board as a bitmask by reading the blank_board comments
+#   3) read as your mental paths take you
+
+def print *args
+end
+
+# class to represent all information about a particular rotation of a particular piece
+class Rotation
+  # an array (by location) containing a bit mask for how the piece maps at the given location.
+  # if the rotation is invalid at that location the mask will contain false
+  attr_reader :start_masks
+
+  # maps a direction to a relative location.  these differ depending on whether it is an even or
+  # odd row being mapped from
+  @@rotation_even_adder = { :west => -1, :east => 1, :nw => -7, :ne => -6, :sw => 5, :se => 6 }
+  @@rotation_odd_adder = { :west => -1, :east => 1, :nw => -6, :ne => -5, :sw => 6, :se => 7 }
+
+  def initialize( directions )
+    @even_offsets, @odd_offsets = normalize_offsets( get_values( directions ))
+
+    @even_mask = mask_for_offsets( @even_offsets)
+    @odd_mask = mask_for_offsets( @odd_offsets)
+
+    @start_masks = Array.new(60)
+
+    # create the rotational masks by placing the base mask at the location and seeing if
+    # 1) it overlaps the boundaries and 2) it produces a prunable board.  if either of these
+    # is true the piece cannot be placed
+    0.upto(59) do | offset |
+      mask = is_even(offset) ? (@even_mask << offset) : (@odd_mask << offset)
+      if (blank_board & mask == 0 && !prunable(blank_board | mask, 0, true)) then
+        imask = compute_required( mask, offset)
+        @start_masks[offset] = [ mask, imask, imask | mask ]
+      else
+        @start_masks[offset] = false
+      end
+    end
+  end
+
+  def compute_required( mask, offset )
+    board = blank_board
+    0.upto(offset) { | i | board |= 1 << i }
+    board |= mask
+    return 0 if (!prunable(board | mask, offset))
+    board = flood_fill(board,58)
+    count = 0
+    imask = 0
+    0.upto(59) do | i |
+      if (board[i] == 0) then
+        imask |= (1 << i)
+        count += 1
+      end
+    end
+    (count > 0 && count < 5) ? imask : 0
+  end
+
+  def flood_fill( board, location)
+    return board if (board[location] == 1)
+    board |= 1 << location
+    row, col = location.divmod(6)
+    board = flood_fill( board, location - 1) if (col > 0)
+    board = flood_fill( board, location + 1) if (col < 4)
+    if (row % 2 == 0) then
+      board = flood_fill( board, location - 7) if (col > 0 && row > 0)
+      board = flood_fill( board, location - 6) if (row > 0)
+      board = flood_fill( board, location + 6) if (row < 9)
+      board = flood_fill( board, location + 5) if (col > 0 && row < 9)
+    else
+      board = flood_fill( board, location - 5) if (col < 4 && row > 0)
+      board = flood_fill( board, location - 6) if (row > 0)
+      board = flood_fill( board, location + 6) if (row < 9)
+      board = flood_fill( board, location + 7) if (col < 4 && row < 9)
+    end
+    board
+  end
+
+  # given a location, produces a list of relative locations covered by the piece at this rotation
+  def offsets( location)
+    if is_even( location) then
+      @even_offsets.collect { | value | value + location }
+    else
+      @odd_offsets.collect { | value | value + location }
+    end
+  end
+
+  # returns a set of offsets relative to the top-left most piece of the rotation (by even or odd rows)
+  # this is hard to explain. imagine we have this partial board:
+  #   0 0 0 0 0 x        [positions 0-5]
+  #    0 0 1 1 0 x       [positions 6-11]
+  #   0 0 1 0 0 x        [positions 12-17]
+  #    0 1 0 0 0 x       [positions 18-23]
+  #   0 1 0 0 0 x        [positions 24-29]
+  #    0 0 0 0 0 x       [positions 30-35]
+  #       ...
+  # The top-left of the piece is at position 8, the
+  # board would be passed as a set of positions (values array) containing [8,9,14,19,25] not necessarily in that
+  # sorted order.  Since that array starts on an odd row, the offsets for an odd row are: [0,1,6,11,17] obtained
+  # by subtracting 8 from everything.  Now imagine the piece shifted up and to the right so it's on an even row:
+  #   0 0 0 1 1 x        [positions 0-5]
+  #    0 0 1 0 0 x       [positions 6-11]
+  #   0 0 1 0 0 x        [positions 12-17]
+  #    0 1 0 0 0 x       [positions 18-23]
+  #   0 0 0 0 0 x        [positions 24-29]
+  #    0 0 0 0 0 x       [positions 30-35]
+  #       ...
+  # Now the positions are [3,4,8,14,19] which after subtracting the lowest value (3) gives [0,1,5,11,16] thus, the
+  # offsets for this particular piece are (in even, odd order) [0,1,5,11,16],[0,1,6,11,17] which is what
+  # this function would return
+  def normalize_offsets( values)
+    min = values.min
+    even_min = is_even(min)
+    other_min = even_min ? min + 6 : min + 7
+    other_values = values.collect do | value |
+      if is_even(value) then
+        value + 6 - other_min
+      else
+        value + 7 - other_min
+      end
+    end
+    values.collect! { | value | value - min }
+
+    if even_min then
+      [values, other_values]
+    else
+      [other_values, values]
+    end
+  end
+
+  # produce a bitmask representation of an array of offset locations
+  def mask_for_offsets( offsets )
+    mask = 0
+    offsets.each { | value | mask = mask + ( 1 << value ) }
+    mask
+  end
+
+  # finds a "safe" position that a position as described by a list of directions can be placed
+  # without falling off any edge of the board.  the values returned a location to place the first piece
+  # at so it will fit after making the described moves
+  def start_adjust( directions )
+    south = east = 0;
+    directions.each do | direction |
+      east += 1 if ( direction == :sw || direction == :nw || direction == :west )
+      south += 1 if ( direction == :nw || direction == :ne )
+    end
+    south * 6 + east
+  end
+
+  # given a set of directions places the piece (as defined by a set of directions) on the board at
+  # a location that will not take it off the edge
+  def get_values( directions )
+    start = start_adjust(directions)
+    values = [ start ]
+    directions.each do | direction |
+      if (start % 12 >= 6) then
+        start += @@rotation_odd_adder[direction]
+      else
+        start += @@rotation_even_adder[direction]
+      end
+      values += [ start ]
+    end
+
+    # some moves take you back to an existing location, we'll strip duplicates
+    values.uniq
+  end
+end
+
+# describes a piece and caches information about its rotations to as to be efficient for iteration
+# ATTRIBUTES:
+#   rotations -- all the rotations of the piece
+#   type -- a numeic "name" of the piece
+#   masks -- an array by location of all legal rotational masks (a n inner array) for that location
+#   placed -- the mask that this piece was last placed at (not a location, but the actual mask used)
+class Piece
+  attr_reader :rotations, :type, :masks
+  attr_accessor :placed
+
+  # transform hashes that change one direction into another when you either flip or rotate a set of directions
+  @@flip_converter = { :west => :west, :east => :east, :nw => :sw, :ne => :se, :sw => :nw, :se => :ne }
+  @@rotate_converter = { :west => :nw, :east => :se, :nw => :ne, :ne => :east, :sw => :west, :se => :sw }
+
+  def initialize( directions, type )
+    @type = type
+    @rotations = Array.new();
+    @map = {}
+
+    generate_rotations( directions )
+    directions.collect! { | value | @@flip_converter[value] }
+    generate_rotations( directions )
+
+    # creates the masks AND a map that returns [location, rotation] for any given mask
+    # this is used when a board is found and we want to draw it, otherwise the map is unused
+    @masks = Array.new();
+    0.upto(59) do | i |
+      even = true
+      @masks[i] = @rotations.collect do | rotation |
+        mask = rotation.start_masks[i]
+        @map[mask[0]] = [ i, rotation ] if (mask)
+        mask || nil
+      end
+      @masks[i].compact!
+    end
+  end
+
+  # rotates a set of directions through all six angles and adds a Rotation to the list for each one
+  def generate_rotations( directions )
+    6.times do
+      rotations.push( Rotation.new(directions))
+      directions.collect! { | value | @@rotate_converter[value] }
+    end
+  end
+
+  # given a board string, adds this piece to the board at whatever location/rotation
+  # important: the outbound board string is 5 wide, the normal location notation is six wide (padded)
+  def fill_string( board_string)
+    location, rotation = @map[@placed]
+    rotation.offsets(location).each do | offset |
+      row, col = offset.divmod(6)
+      board_string[ row*5 + col, 1 ] = @type.to_s
+    end
+  end
+end
+
+# a blank bit board having this form:
+#
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    1 1 1 1 1 1
+#
+# where left lest significant bit is the top left and the most significant is the lower right
+# the actual board only consists of the 0 places, the 1 places are blockers to keep things from running
+# off the edges or bottom
+def blank_board
+  0b111111100000100000100000100000100000100000100000100000100000100000
+end
+
+def full_board
+  0b111111111111111111111111111111111111111111111111111111111111111111
+end
+
+# determines if a location (bit position) is in an even row
+def is_even( location)
+  (location % 12) < 6
+end
+
+# support function that create three utility maps:
+#  $converter -- for each row an array that maps a five bit row (via array mapping)
+#                to the a five bit representation of the bits below it
+#  $bit_count -- maps a five bit row (via array mapping) to the number of 1s in the row
+#  @@new_regions -- maps a five bit row (via array mapping) to an array of "region" arrays
+#                   a region array has three values the first is a mask of bits in the region,
+#                   the second is the count of those bits and the third is identical to the first
+#                   examples:
+#                           0b10010 => [ 0b01100, 2, 0b01100 ], [ 0b00001, 1, 0b00001]
+#                           0b01010 => [ 0b10000, 1, 0b10000 ], [ 0b00100, 1, 0b00100 ], [ 0b00001, 1, 0b00001]
+#                           0b10001 => [ 0b01110, 3, 0b01110 ]
+def create_collector_support
+  odd_map = [0b11, 0b110, 0b1100, 0b11000, 0b10000]
+  even_map = [0b1, 0b11, 0b110, 0b1100, 0b11000]
+
+  all_odds = Array.new(0b100000)
+  all_evens = Array.new(0b100000)
+  bit_counts = Array.new(0b100000)
+  new_regions = Array.new(0b100000)
+  0.upto(0b11111) do | i |
+    bit_count = odd = even = 0
+    0.upto(4) do | bit |
+      if (i[bit] == 1) then
+        bit_count += 1
+        odd |= odd_map[bit]
+        even |= even_map[bit]
+      end
+    end
+    all_odds[i] = odd
+    all_evens[i] = even
+    bit_counts[i] = bit_count
+    new_regions[i] = create_regions( i)
+  end
+
+  $converter = []
+  10.times { | row | $converter.push((row % 2 == 0) ? all_evens : all_odds) }
+  $bit_counts = bit_counts
+  $regions = new_regions.collect { | set | set.collect { | value | [ value, bit_counts[value], value] } }
+end
+
+# determines if a board is punable, meaning that there is no possibility that it
+# can be filled up with pieces.  A board is prunable if there is a grouping of unfilled spaces
+# that are not a multiple of five.  The following board is an example of a prunable board:
+#    0 0 1 0 0
+#     0 1 0 0 0
+#    1 1 0 0 0
+#     0 1 0 0 0
+#    0 0 0 0 0
+#       ...
+#
+# This board is prunable because the top left corner is only 3 bits in area, no piece will ever fit it
+# parameters:
+#   board -- an initial bit board (6 bit padded rows, see blank_board for format)
+#   location -- starting location, everything above and to the left is already full
+#   slotting -- set to true only when testing initial pieces, when filling normally
+#               additional assumptions are possible
+#
+# Algorithm:
+#    The algorithm starts at the top row (as determined by location) and iterates a row at a time
+#    maintainng counts of active open areas (kept in the collector array) each collector contains
+#    three values at the start of an iteration:
+#          0: mask of bits that would be adjacent to the collector in this row
+#          1: the number of bits collected so far
+#          2: a scratch space starting as zero, but used during the computation to represent
+#             the empty bits in the new row that are adjacent (position 0)
+#  The exact procedure is described in-code
+def prunable( board, location, slotting = false)
+  collectors = []
+  # loop across the rows
+  (location / 6).to_i.upto(9) do | row_on |
+    # obtain a set of regions representing the bits of the current row.
+    regions = $regions[(board >> (row_on * 6)) & 0b11111]
+    converter = $converter[row_on]
+
+    # track the number of collectors at the start of the cycle so that
+    # we don't compute against newly created collectors, only existing collectors
+    initial_collector_count = collectors.length
+
+    # loop against the regions.  For each region of the row
+    # we will see if it connects to one or more existing collectors.
+    # if it connects to 1 collector, the bits from the region are added to the
+    # bits of the collector and the mask is placed in collector[2]
+    # If the region overlaps more than one collector then all the collectors
+    # it overlaps with are merged into the first one (the others are set to nil in the array)
+    # if NO collectors are found then the region is copied as a new collector
+    regions.each do | region |
+      collector_found = nil
+      region_mask = region[2]
+      initial_collector_count.times do | collector_num |
+        collector = collectors[collector_num]
+        if (collector) then
+          collector_mask = collector[0]
+          if (collector_mask & region_mask != 0) then
+            if (collector_found) then
+              collector_found[0] |= collector_mask
+              collector_found[1] += collector[1]
+              collector_found[2] |= collector[2]
+              collectors[collector_num] = nil
+            else
+              collector_found = collector
+              collector[1] += region[1]
+              collector[2] |= region_mask
+            end
+          end
+        end
+      end
+      if (collector_found == nil) then
+        collectors.push(Array.new(region))
+      end
+    end
+
+    # check the existing collectors, if any collector overlapped no bits in the region its [2] value will
+    # be zero.  The size of any such reaason is tested if it is not a multiple of five true is returned since
+    # the board is prunable.  if it is a multiple of five it is removed.
+    # Collector that are still active have a new adjacent value [0] set based n the matched bits
+    # and have [2] cleared out for the next cycle.
+    collectors.length.times do | collector_num |
+      collector = collectors[collector_num]
+      if (collector) then
+        if (collector[2] == 0) then
+          return true if (collector[1] % 5 != 0)
+          collectors[collector_num] = nil
+        else
+          # if a collector matches all bits in the row then we can return unprunable early for the
+          # following reasons:
+          #    1) there can be no more unavailable bits bince we fill from the top left downward
+          #    2) all previous regions have been closed or joined so only this region can fail
+          #    3) this region must be good since there can never be only 1 region that is nuot
+          #       a multiple of five
+          # this rule only applies when filling normally, so we ignore the rule if we are "slotting"
+          # in pieces to see what configurations work for them (the only other time this algorithm is used).
+          return false if (collector[2] == 0b11111 && !slotting)
+          collector[0] = converter[collector[2]]
+          collector[2] = 0
+        end
+      end
+    end
+
+    # get rid of all the empty converters for the next round
+    collectors.compact!
+  end
+  return false if (collectors.length <= 1) # 1 collector or less and the region is fine
+  collectors.any? { | collector | (collector[1] % 5) != 0 } # more than 1 and we test them all for bad size
+end
+
+# creates a region given a row mask.  see prunable for what a "region" is
+def create_regions( value )
+  regions = []
+  cur_region = 0
+  5.times do | bit |
+    if (value[bit] == 0) then
+      cur_region |= 1 << bit
+    else
+      if (cur_region != 0 ) then
+        regions.push( cur_region)
+        cur_region = 0;
+      end
+    end
+  end
+  regions.push(cur_region) if (cur_region != 0)
+  regions
+end
+
+# find up to the counted number of solutions (or all solutions) and prints the final result
+def find_all
+  find_top( 1)
+  find_top( 0)
+  print_results
+end
+
+# show the board
+def print_results
+  print "#{@boards_found} solutions found\n\n"
+  print_full_board( @min_board)
+  print "\n"
+  print_full_board( @max_board)
+  print "\n"
+end
+
+# finds solutions.  This special version of the main function is only used for the top level
+# the reason for it is basically to force a particular ordering on how the rotations are tested for
+# the first piece.  It is called twice, first looking for placements of the odd rotations and then
+# looking for placements of the even locations.
+#
+# WHY?
+#   Since any found solution has an inverse we want to maximize finding solutions that are not already found
+#   as an inverse.  The inverse will ALWAYS be 3 one of the piece configurations that is exactly 3 rotations away
+#   (an odd number).  Checking even vs odd then produces a higher probability of finding more pieces earlier
+#   in the cycle.  We still need to keep checking all the permutations, but our probability of finding one will
+#   diminsh over time.  Since we are TOLD how many to search for this lets us exit before checking all pieces
+#   this bennifit is very great when seeking small numbers of solutions and is 0 when looking for more than the
+#   maximum number
+def find_top( rotation_skip)
+  board = blank_board
+  (@pieces.length-1).times do
+    piece = @pieces.shift
+    piece.masks[0].each do | mask, imask, cmask |
+      if ((rotation_skip += 1) % 2 == 0) then
+        piece.placed = mask
+        find( 1, 1, board | mask)
+      end
+    end
+    @pieces.push(piece)
+  end
+  piece = @pieces.shift
+  @pieces.push(piece)
+end
+
+# the normail find routine, iterates through the available pieces, checks all rotations at the current location
+# and adds any boards found.  depth is achieved via recursion.  the overall approach is described
+# here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
+# parameters:
+#  start_location -- where to start looking for place for the next piece at
+#  placed -- number of pieces placed
+#  board -- current state of the board
+#
+# see in-code comments
+def find( start_location, placed, board)
+  # find the next location to place a piece by looking for an empty bit
+  while board[start_location] == 1
+    start_location += 1
+  end
+
+  @pieces.length.times do
+    piece = @pieces.shift
+    piece.masks[start_location].each do | mask, imask, cmask |
+      if ( board & cmask == imask) then
+        piece.placed = mask
+        if (placed == 9) then
+          add_board
+        else
+          find( start_location + 1, placed + 1, board | mask)
+        end
+      end
+    end
+    @pieces.push(piece)
+  end
+end
+
+# print the board
+def print_full_board( board_string)
+  10.times do | row |
+    print " " if (row % 2 == 1)
+    5.times do | col |
+      print "#{board_string[row*5 + col,1]} "
+    end
+    print "\n"
+  end
+end
+
+# when a board is found we "draw it" into a string and then flip that string, adding both to
+# the list (hash) of solutions if they are unique.
+def add_board
+  board_string = "99999999999999999999999999999999999999999999999999"
+  @all_pieces.each {  | piece | piece.fill_string( board_string ) }
+  save( board_string)
+  save( board_string.reverse)
+end
+
+# adds a board string to the list (if new) and updates the current best/worst board
+def save( board_string)
+  if (@all_boards[board_string] == nil) then
+    @min_board = board_string if (board_string < @min_board)
+    @max_board = board_string if (board_string > @max_board)
+    @all_boards.store(board_string,true)
+    @boards_found += 1
+
+    # the exit motif is a time saver.  Ideally the function should return, but those tests
+    # take noticeable time (performance).
+    if (@boards_found == @stop_count) then
+      print_results
+      exit(0)
+    end
+  end
+end
+
+
+##
+## MAIN BODY :)
+##
+create_collector_support
+@pieces = [
+  Piece.new( [ :nw, :ne, :east, :east ], 2),
+  Piece.new( [ :ne, :se, :east, :ne ], 7),
+  Piece.new( [ :ne, :east, :ne, :nw ], 1),
+  Piece.new( [ :east, :sw, :sw, :se ], 6),
+  Piece.new( [ :east, :ne, :se, :ne ], 5),
+  Piece.new( [ :east, :east, :east, :se ], 0),
+  Piece.new( [ :ne, :nw, :se, :east, :se ], 4),
+  Piece.new( [ :se, :se, :se, :west ], 9),
+  Piece.new( [ :se, :se, :east, :se ], 8),
+  Piece.new( [ :east, :east, :sw, :se ], 3)
+  ];
+
+@all_pieces = Array.new( @pieces)
+
+@min_board = "99999999999999999999999999999999999999999999999999"
+@max_board = "00000000000000000000000000000000000000000000000000"
+@stop_count = ARGV[0].to_i || 2089
+@all_boards = {}
+@boards_found = 0
+
+find_all ######## DO IT!!!
diff --git a/benchmark/bm_so_nbody.rb b/benchmark/so_nbody.rb
index d6c5bb9e61..d6c5bb9e61 100644
--- a/benchmark/bm_so_nbody.rb
+++ b/benchmark/so_nbody.rb
diff --git a/benchmark/so_nested_loop.rb b/benchmark/so_nested_loop.rb
new file mode 100644
index 0000000000..766fcf7b84
--- /dev/null
+++ b/benchmark/so_nested_loop.rb
@@ -0,0 +1,24 @@
+#!/usr/bin/ruby
+# -*- Ruby -*-
+# $Id: nestedloop-ruby.code,v 1.4 2004/11/13 07:42:22 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# from Avi Bryant
+
+n = 16 # Integer(ARGV.shift || 1)
+x = 0
+n.times do
+    n.times do
+        n.times do
+            n.times do
+                n.times do
+                    n.times do
+                        x += 1
+                    end
+                end
+            end
+        end
+    end
+end
+# puts x
+
+
diff --git a/benchmark/bm_so_nsieve.rb b/benchmark/so_nsieve.rb
index a65cc78233..a65cc78233 100644
--- a/benchmark/bm_so_nsieve.rb
+++ b/benchmark/so_nsieve.rb
diff --git a/benchmark/so_nsieve_bits.rb b/benchmark/so_nsieve_bits.rb
new file mode 100644
index 0000000000..6f958ee44e
--- /dev/null
+++ b/benchmark/so_nsieve_bits.rb
@@ -0,0 +1,43 @@
+#!/usr/bin/ruby
+#coding: us-ascii
+#
+# The Great Computer Language Shootout
+# http://shootout.alioth.debian.org/
+#
+# nsieve-bits in Ruby
+# Contributed by Glenn Parker, March 2005
+
+CharExponent = 3
+BitsPerChar = 1 << CharExponent
+LowMask = BitsPerChar - 1
+
+def sieve(m)
+  items = "\xFF" * ((m / BitsPerChar) + 1)
+  masks = ""
+  BitsPerChar.times do |b|
+    masks << (1 << b).chr
+  end
+
+  count = 0
+  pmax = m - 1
+  2.step(pmax, 1) do |p|
+    if items[p >> CharExponent][p & LowMask] == 1
+      count += 1
+      p.step(pmax, p) do |mult|
+	a = mult >> CharExponent
+	b = mult & LowMask
+	items[a] -= masks[b] if items[a][b] != 0
+      end
+    end
+  end
+  count
+end
+
+n = 9 # (ARGV[0] || 2).to_i
+n.step(n - 2, -1) do |exponent|
+  break if exponent < 0
+  m = 2 ** exponent * 10_000
+  count = sieve(m)
+  printf "Primes up to %8d %8d\n", m, count
+end
+
diff --git a/benchmark/so_object.rb b/benchmark/so_object.rb
new file mode 100644
index 0000000000..131f44624c
--- /dev/null
+++ b/benchmark/so_object.rb
@@ -0,0 +1,56 @@
+#!/usr/bin/ruby
+# -*- Ruby -*-
+# $Id: objinst-ruby.code,v 1.4 2004/11/13 07:42:25 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# with help from Aristarkh Zagorodnikov
+
+class Toggle
+    def initialize(start_state)
+        @bool = start_state
+    end
+
+    def value
+        @bool
+    end
+
+    def activate
+        @bool = !@bool
+        self
+    end
+end
+
+class NthToggle < Toggle
+    def initialize(start_state, max_counter)
+        super start_state
+        @count_max = max_counter
+        @counter = 0
+    end
+
+    def activate
+        @counter += 1
+        if @counter >= @count_max
+            @bool = !@bool
+            @counter = 0
+        end
+        self
+    end
+end
+
+n = 1500000 # (ARGV.shift || 1).to_i
+
+toggle = Toggle.new 1
+5.times do
+    toggle.activate.value ? 'true' : 'false'
+end
+n.times do
+    toggle = Toggle.new 1
+end
+
+ntoggle = NthToggle.new 1, 3
+8.times do
+    ntoggle.activate.value ? 'true' : 'false'
+end
+n.times do
+    ntoggle = NthToggle.new 1, 3
+end
+
diff --git a/benchmark/bm_so_partial_sums.rb b/benchmark/so_partial_sums.rb
index 630b45cb8d..630b45cb8d 100644
--- a/benchmark/bm_so_partial_sums.rb
+++ b/benchmark/so_partial_sums.rb
diff --git a/benchmark/so_pidigits.rb b/benchmark/so_pidigits.rb
new file mode 100644
index 0000000000..9a537b2d1c
--- /dev/null
+++ b/benchmark/so_pidigits.rb
@@ -0,0 +1,92 @@
+# The Great Computer Language Shootout
+# http://shootout.alioth.debian.org/
+#
+# contributed by Gabriele Renzi
+
+class PiDigitSpigot
+
+    def initialize()
+        @z = Transformation.new 1,0,0,1
+        @x = Transformation.new 0,0,0,0
+        @inverse = Transformation.new 0,0,0,0
+    end
+
+    def next!
+        @y = @z.extract(3)
+        if safe? @y
+            @z = produce(@y)
+            @y
+        else
+            @z = consume @x.next!()
+            next!()
+        end
+    end
+
+    def safe?(digit)
+        digit == @z.extract(4)
+    end
+
+    def produce(i)
+        @inverse.qrst(10,-10*i,0,1).compose(@z)
+    end
+
+    def consume(a)
+        @z.compose(a)
+    end
+end
+
+
+class Transformation
+    attr_reader :q, :r, :s, :t
+    def initialize(q, r, s, t)
+        @q,@r,@s,@t,@k = q,r,s,t,0
+    end
+
+    def next!()
+        @q = @k = @k + 1
+        @r = 4 * @k + 2
+        @s = 0
+        @t = 2 * @k + 1
+        self
+    end
+
+    def extract(j)
+        (@q * j + @r) / (@s * j + @t)
+    end
+
+    def compose(a)
+        self.class.new( @q * a.q,
+                        @q * a.r + r * a.t,
+                        @s * a.q + t * a.s,
+                        @s * a.r + t * a.t
+                    )
+    end
+
+    def qrst *args
+        initialize *args
+        self
+    end
+
+
+end
+
+
+WIDTH = 10
+n = 2_500 # Integer(ARGV[0])
+j = 0
+
+digits = PiDigitSpigot.new
+
+while n > 0
+    if n >= WIDTH
+        WIDTH.times {print digits.next!}
+        j += WIDTH
+    else
+        n.times {print digits.next!}
+        (WIDTH-n).times {print " "}
+        j += n
+    end
+    puts "\t:"+j.to_s
+    n -= WIDTH
+end
+
diff --git a/benchmark/so_random.rb b/benchmark/so_random.rb
new file mode 100644
index 0000000000..a66b9e8e63
--- /dev/null
+++ b/benchmark/so_random.rb
@@ -0,0 +1,20 @@
+# from http://www.bagley.org/~doug/shootout/bench/random/random.ruby
+
+IM = 139968.0
+IA = 3877.0
+IC = 29573.0
+
+$last = 42.0
+
+def gen_random(max)
+  (max * ($last = ($last * IA + IC) % IM)) / IM
+end
+
+N = 3_000_000
+
+i = 0
+while i<N
+  i +=1
+  gen_random(100.0)
+end
+# "%.9f" % gen_random(100.0)
diff --git a/benchmark/so_reverse_complement.yml b/benchmark/so_reverse_complement.yml
new file mode 100644
index 0000000000..de05eedfc4
--- /dev/null
+++ b/benchmark/so_reverse_complement.yml
@@ -0,0 +1,137 @@
+prelude: |
+  bm_so_fasta = <<'EOS'
+  # The Computer Language Shootout
+  # http://shootout.alioth.debian.org/
+  # Contributed by Sokolov Yura
+
+  $last = 42.0
+  def gen_random(max, im=139968, ia=3877, ic=29573)
+      (max * ($last = ($last * ia + ic) % im)) / im
+  end
+
+  alu =
+     "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG"+
+     "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA"+
+     "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT"+
+     "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA"+
+     "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG"+
+     "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC"+
+     "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA"
+
+  iub = [
+      ["a", 0.27],
+      ["c", 0.12],
+      ["g", 0.12],
+      ["t", 0.27],
+
+      ["B", 0.02],
+      ["D", 0.02],
+      ["H", 0.02],
+      ["K", 0.02],
+      ["M", 0.02],
+      ["N", 0.02],
+      ["R", 0.02],
+      ["S", 0.02],
+      ["V", 0.02],
+      ["W", 0.02],
+      ["Y", 0.02],
+  ]
+  homosapiens = [
+      ["a", 0.3029549426680],
+      ["c", 0.1979883004921],
+      ["g", 0.1975473066391],
+      ["t", 0.3015094502008],
+  ]
+
+  def make_repeat_fasta(id, desc, src, n)
+      puts ">#{id} #{desc}"
+      v = nil
+      width = 60
+      l = src.length
+      s = src * ((n / l) + 1)
+      s.slice!(n, l)
+      puts(s.scan(/.{1,#{width}}/).join("\n"))
+  end
+
+  def make_random_fasta(id, desc, table, n)
+      puts ">#{id} #{desc}"
+      rand, v = nil,nil
+      width = 60
+      chunk = 1 * width
+      prob = 0.0
+      table.each{|v| v[1]= (prob += v[1])}
+      for i in 1..(n/width)
+          puts((1..width).collect{
+              rand = gen_random(1.0)
+              table.find{|v| v[1]>rand}[0]
+          }.join)
+      end
+      if n%width != 0
+          puts((1..(n%width)).collect{
+              rand = gen_random(1.0)
+              table.find{|v| v[1]>rand}[0]
+          }.join)
+      end
+  end
+
+
+  n = (ARGV[0] or 250_000).to_i
+
+  make_repeat_fasta('ONE', 'Homo sapiens alu', alu, n*2)
+  make_random_fasta('TWO', 'IUB ambiguity codes', iub, n*3)
+  make_random_fasta('THREE', 'Homo sapiens frequency', homosapiens, n*5)
+  EOS
+benchmark:
+  - name: so_reverse_complement
+    prelude: |
+      script = File.join(File.dirname($0), 'bm_so_fasta.rb')
+      File.write(script, bm_so_fasta)
+
+      def prepare_fasta_output n
+        filebase = File.join(File.dirname($0), 'fasta.output')
+        script = File.join(File.dirname($0), 'bm_so_fasta.rb')
+        file = "#{filebase}.#{n}"
+
+        unless FileTest.exist?(file)
+          STDERR.puts "preparing #{file}"
+
+          open(file, 'w'){|f|
+            ARGV[0] = n
+            $stdout = f
+            load script
+            $stdout = STDOUT
+          }
+        end
+      end
+      prepare_fasta_output(2_500_000)
+    script: |
+      # The Great Computer Language Shootout
+      # http://shootout.alioth.debian.org/
+      #
+      # Contributed by Peter Bjarke Olsen
+      # Modified by Doug King
+
+      seq=Array.new
+
+      def revcomp(seq)
+        seq.reverse!.tr!('wsatugcyrkmbdhvnATUGCYRKMBDHVN','WSTAACGRYMKVHDBNTAACGRYMKVHDBN')
+        stringlen=seq.length
+        0.step(stringlen-1,60) {|x| print seq.slice(x,60) , "\n"}
+      end
+
+      input = open(File.join(File.dirname($0), 'fasta.output.2500000'), 'rb')
+
+      while input.gets
+        if $_ =~ />/
+          if seq.length != 0
+            revcomp(seq.join)
+            seq=Array.new
+          end
+          puts $_
+        else
+          $_.sub(/\n/,'')
+          seq.push $_
+        end
+      end
+      revcomp(seq.join)
+    loop_count: 1
diff --git a/benchmark/so_sieve.rb b/benchmark/so_sieve.rb
new file mode 100644
index 0000000000..43dc302648
--- /dev/null
+++ b/benchmark/so_sieve.rb
@@ -0,0 +1,24 @@
+# from http://www.bagley.org/~doug/shootout/bench/sieve/sieve.ruby
+num = 500
+count = i = j = 0
+flags0 = Array.new(8192,1)
+k = 0
+while k < num
+  k += 1
+  count = 0
+  flags = flags0.dup
+  i = 2
+  while i<8192
+    i += 1
+    if flags[i]
+      # remove all multiples of prime: i
+      j = i*i
+      while j < 8192
+        j += i
+        flags[j] = nil
+      end
+      count += 1
+    end
+  end
+end
+count
diff --git a/benchmark/bm_so_spectralnorm.rb b/benchmark/so_spectralnorm.rb
index 6b97206689..6b97206689 100644
--- a/benchmark/bm_so_spectralnorm.rb
+++ b/benchmark/so_spectralnorm.rb
diff --git a/benchmark/string_capitalize.yml b/benchmark/string_capitalize.yml
new file mode 100644
index 0000000000..7d23fd3d35
--- /dev/null
+++ b/benchmark/string_capitalize.yml
@@ -0,0 +1,10 @@
+prelude: |
+  str1 = [*"a".."m",*"N".."Z",*"0".."9"].join("")
+  str10 = str1 * 10
+  str100 = str10 * 10
+  str1000 = str100 * 10
+benchmark:
+  capitalize-1: str1.capitalize
+  capitalize-10: str10.capitalize
+  capitalize-100: str100.capitalize
+  capitalize-1000: str1000.capitalize
diff --git a/benchmark/string_downcase.yml b/benchmark/string_downcase.yml
new file mode 100644
index 0000000000..a31c3ac712
--- /dev/null
+++ b/benchmark/string_downcase.yml
@@ -0,0 +1,10 @@
+prelude: |
+  str1 = [*"A".."Z",*"0".."9"].join("")
+  str10 = str1 * 10
+  str100 = str10 * 10
+  str1000 = str100 * 10
+benchmark:
+  downcase-1: str1.upcase
+  downcase-10: str10.upcase
+  downcase-100: str100.upcase
+  downcase-1000: str1000.upcase
diff --git a/benchmark/string_index.rb b/benchmark/string_index.rb
new file mode 100644
index 0000000000..7783111082
--- /dev/null
+++ b/benchmark/string_index.rb
@@ -0,0 +1,3 @@
+str1 = "あ" * 1024 + "い" # not single byte optimizable
+str2 = "い"
+100_000.times { str1.index(str2) }
diff --git a/benchmark/string_scan_re.rb b/benchmark/string_scan_re.rb
new file mode 100644
index 0000000000..b0d60201a9
--- /dev/null
+++ b/benchmark/string_scan_re.rb
@@ -0,0 +1,2 @@
+str = Array.new(1_000, 'abc').join(',')
+1_000.times { str.scan(/abc/) }
diff --git a/benchmark/string_scan_str.rb b/benchmark/string_scan_str.rb
new file mode 100644
index 0000000000..42440bd948
--- /dev/null
+++ b/benchmark/string_scan_str.rb
@@ -0,0 +1,2 @@
+str = Array.new(1_000, 'abc').join(',')
+1_000.times { str.scan('abc') }
diff --git a/benchmark/string_split.yml b/benchmark/string_split.yml
new file mode 100644
index 0000000000..84ffe8f6a7
--- /dev/null
+++ b/benchmark/string_split.yml
@@ -0,0 +1,7 @@
+prelude: |
+  str0 = [*0..9].join("")
+benchmark:
+  to_chars-1: str0.split('')
+  to_chars-10: (str0 * 10).split('')
+  to_chars-100: (str0 * 100).split('')
+  to_chars-1000: (str0 * 1000).split('')
diff --git a/benchmark/string_swapcase.yml b/benchmark/string_swapcase.yml
new file mode 100644
index 0000000000..afaae3f696
--- /dev/null
+++ b/benchmark/string_swapcase.yml
@@ -0,0 +1,10 @@
+prelude: |
+  str1 = [*"A".."M",*"n".."z",*"0".."9"].join("")
+  str10 = str1 * 10
+  str100 = str10 * 10
+  str1000 = str100 * 10
+benchmark:
+  swapcase-1: str1.swapcase
+  swapcase-10: str10.swapcase
+  swapcase-100: str100.swapcase
+  swapcase-1000: str1000.swapcase
diff --git a/benchmark/string_upcase.yml b/benchmark/string_upcase.yml
new file mode 100644
index 0000000000..456d213c74
--- /dev/null
+++ b/benchmark/string_upcase.yml
@@ -0,0 +1,10 @@
+prelude: |
+  str1 = [*"a".."z",*"0".."9"].join("")
+  str10 = str1 * 10
+  str100 = str10 * 10
+  str1000 = str100 * 10
+benchmark:
+  upcase-1: str1.upcase
+  upcase-10: str10.upcase
+  upcase-100: str100.upcase
+  upcase-1000: str1000.upcase
diff --git a/benchmark/time_strptime.yml b/benchmark/time_strptime.yml
new file mode 100644
index 0000000000..8d89ebb7a7
--- /dev/null
+++ b/benchmark/time_strptime.yml
@@ -0,0 +1,13 @@
+prelude: |
+  require 'time'
+benchmark:
+  - Time.strptime("28/Aug/2005:06:54:20 +0000", "%d/%b/%Y:%T %z")
+  - Time.strptime("1", "%s")
+  - Time.strptime("0 +0100", "%s %z")
+  - Time.strptime("0 UTC", "%s %z")
+  - Time.strptime("1.5", "%s.%N")
+  - Time.strptime("1.000000000001", "%s.%N")
+  - Time.strptime("20010203 -0200", "%Y%m%d %z")
+  - Time.strptime("20010203 UTC", "%Y%m%d %z")
+  - Time.strptime("2018-365", "%Y-%j")
+  - Time.strptime("2018-091", "%Y-%j")
diff --git a/benchmark/time_subsec.rb b/benchmark/time_subsec.rb
new file mode 100644
index 0000000000..505021c701
--- /dev/null
+++ b/benchmark/time_subsec.rb
@@ -0,0 +1,2 @@
+t = Time.now
+4000000.times { t.subsec }
diff --git a/benchmark/vm1_attr_ivar.yml b/benchmark/vm1_attr_ivar.yml
new file mode 100644
index 0000000000..f714dd9bd9
--- /dev/null
+++ b/benchmark/vm1_attr_ivar.yml
@@ -0,0 +1,14 @@
+prelude: |
+  class C
+    attr_reader :a, :b
+    def initialize
+      @a = nil
+      @b = nil
+    end
+  end
+  obj = C.new
+benchmark:
+  vm1_attr_ivar: |
+    j = obj.a
+    k = obj.b
+loop_count: 30000000
diff --git a/benchmark/vm1_attr_ivar_set.yml b/benchmark/vm1_attr_ivar_set.yml
new file mode 100644
index 0000000000..f383e59ef4
--- /dev/null
+++ b/benchmark/vm1_attr_ivar_set.yml
@@ -0,0 +1,14 @@
+prelude: |
+  class C
+    attr_accessor :a, :b
+    def initialize
+      @a = nil
+      @b = nil
+    end
+  end
+  obj = C.new
+benchmark:
+  vm1_attr_ivar_set: |
+    obj.a = 1
+    obj.b = 2
+loop_count: 30000000
diff --git a/benchmark/vm1_block.yml b/benchmark/vm1_block.yml
new file mode 100644
index 0000000000..ac7c940f93
--- /dev/null
+++ b/benchmark/vm1_block.yml
@@ -0,0 +1,9 @@
+prelude: |
+  def m
+    yield
+  end
+benchmark:
+  vm1_block: |
+    m{
+    }
+loop_count: 30000000
diff --git a/benchmark/vm1_blockparam.yml b/benchmark/vm1_blockparam.yml
new file mode 100644
index 0000000000..947b8c53d5
--- /dev/null
+++ b/benchmark/vm1_blockparam.yml
@@ -0,0 +1,7 @@
+prelude: |
+  def m &b
+  end
+benchmark:
+  vm1_blockparam: |
+    m{}
+loop_count: 30000000
diff --git a/benchmark/vm1_blockparam_call.yml b/benchmark/vm1_blockparam_call.yml
new file mode 100644
index 0000000000..e2817a3ce2
--- /dev/null
+++ b/benchmark/vm1_blockparam_call.yml
@@ -0,0 +1,8 @@
+prelude: |
+  def m &b
+    b.call
+  end
+benchmark:
+  vm1_blockparam_call: |
+    m{}
+loop_count: 30000000
diff --git a/benchmark/vm1_blockparam_pass.yml b/benchmark/vm1_blockparam_pass.yml
new file mode 100644
index 0000000000..ca1bef3369
--- /dev/null
+++ b/benchmark/vm1_blockparam_pass.yml
@@ -0,0 +1,12 @@
+prelude: |
+  def bp_yield
+    yield
+  end
+
+  def bp_pass &b
+    bp_yield &b
+  end
+benchmark:
+  vm1_blockparam_pass: |
+    bp_pass{}
+loop_count: 30000000
diff --git a/benchmark/vm1_blockparam_yield.yml b/benchmark/vm1_blockparam_yield.yml
new file mode 100644
index 0000000000..56ae617798
--- /dev/null
+++ b/benchmark/vm1_blockparam_yield.yml
@@ -0,0 +1,8 @@
+prelude: |
+  def bp_yield &b
+    yield
+  end
+benchmark:
+  vm1_blockparam_yield: |
+    bp_yield{}
+loop_count: 30000000
diff --git a/benchmark/vm1_const.yml b/benchmark/vm1_const.yml
new file mode 100644
index 0000000000..b98db1545c
--- /dev/null
+++ b/benchmark/vm1_const.yml
@@ -0,0 +1,7 @@
+prelude: |
+  Const = 1
+benchmark:
+  vm1_const: |
+    j = Const
+    k = Const
+loop_count: 30000000
diff --git a/benchmark/vm1_ensure.yml b/benchmark/vm1_ensure.yml
new file mode 100644
index 0000000000..afbbe38bec
--- /dev/null
+++ b/benchmark/vm1_ensure.yml
@@ -0,0 +1,14 @@
+# Not utilizing loop_count since using it for this is too unstable for now
+benchmark:
+  vm1_ensure: |
+    i = 0
+    while i<30_000_000
+      i += 1
+      begin
+        begin
+        ensure
+        end
+      ensure
+      end
+    end
+loop_count: 1
diff --git a/benchmark/vm1_float_simple.yml b/benchmark/vm1_float_simple.yml
new file mode 100644
index 0000000000..4e9ad1852b
--- /dev/null
+++ b/benchmark/vm1_float_simple.yml
@@ -0,0 +1,8 @@
+prelude: |
+  f = 0.0
+benchmark:
+  vm1_float_simple: |
+    f += 0.1; f -= 0.1
+    f += 0.1; f -= 0.1
+    f += 0.1; f -= 0.1
+loop_count: 30000000
diff --git a/benchmark/vm1_gc_short_lived.yml b/benchmark/vm1_gc_short_lived.yml
new file mode 100644
index 0000000000..8fdcb7371d
--- /dev/null
+++ b/benchmark/vm1_gc_short_lived.yml
@@ -0,0 +1,9 @@
+benchmark:
+  vm1_gc_short_lived: |
+    a = '' # short-lived String
+    b = ''
+    c = ''
+    d = ''
+    e = ''
+    f = ''
+loop_count: 30000000
diff --git a/benchmark/vm1_gc_short_with_complex_long.yml b/benchmark/vm1_gc_short_with_complex_long.yml
new file mode 100644
index 0000000000..c22ea74a60
--- /dev/null
+++ b/benchmark/vm1_gc_short_with_complex_long.yml
@@ -0,0 +1,25 @@
+prelude: |
+  def nested_hash h, n
+    if n == 0
+      ''
+    else
+      10.times{
+        h[Object.new] = nested_hash(h, n-1)
+      }
+    end
+  end
+
+  long_lived = Hash.new
+  nested_hash long_lived, 6
+
+  GC.start
+  GC.start
+benchmark:
+  vm1_gc_short_with_complex_long: |
+    a = '' # short-lived String
+    b = ''
+    c = ''
+    d = ''
+    e = ''
+    f = ''
+loop_count: 30000000
diff --git a/benchmark/vm1_gc_short_with_long.yml b/benchmark/vm1_gc_short_with_long.yml
new file mode 100644
index 0000000000..c731aae548
--- /dev/null
+++ b/benchmark/vm1_gc_short_with_long.yml
@@ -0,0 +1,13 @@
+prelude: |
+  long_lived = Array.new(1_000_000){|i| "#{i}"}
+  GC.start
+  GC.start
+benchmark:
+  vm1_gc_short_with_long: |
+    a = '' # short-lived String
+    b = ''
+    c = ''
+    d = ''
+    e = ''
+    f = ''
+loop_count: 30000000
diff --git a/benchmark/vm1_gc_short_with_symbol.yml b/benchmark/vm1_gc_short_with_symbol.yml
new file mode 100644
index 0000000000..7fc1abedd8
--- /dev/null
+++ b/benchmark/vm1_gc_short_with_symbol.yml
@@ -0,0 +1,13 @@
+prelude: |
+  50_000.times{|i| sym = "sym#{i}".to_sym}
+  GC.start
+  GC.start
+benchmark:
+  vm1_gc_short_with_symbol: |
+    a = '' # short-lived String
+    b = ''
+    c = ''
+    d = ''
+    e = ''
+    f = ''
+loop_count: 30000000
diff --git a/benchmark/vm1_gc_wb_ary.yml b/benchmark/vm1_gc_wb_ary.yml
new file mode 100644
index 0000000000..50fb4b6f84
--- /dev/null
+++ b/benchmark/vm1_gc_wb_ary.yml
@@ -0,0 +1,12 @@
+prelude: |
+  short_lived_ary = []
+
+  if RUBY_VERSION >= "2.2.0"
+    GC.start(full_mark: false, immediate_mark: true, immediate_sweep: true)
+  end
+
+  short_lived = ''
+benchmark:
+  vm1_gc_wb_ary: |
+    short_lived_ary[0] = short_lived # write barrier
+loop_count: 30000000
diff --git a/benchmark/vm1_gc_wb_ary_promoted.yml b/benchmark/vm1_gc_wb_ary_promoted.yml
new file mode 100644
index 0000000000..cf9b5de005
--- /dev/null
+++ b/benchmark/vm1_gc_wb_ary_promoted.yml
@@ -0,0 +1,15 @@
+prelude: |
+  long_lived = []
+
+  if RUBY_VERSION > "2.2.0"
+    3.times{ GC.start(full_mark: false, immediate_mark: true, immediate_sweep: true) }
+  elsif
+    GC.start
+  end
+
+  short_lived = ''
+
+benchmark:
+  vm1_gc_wb_ary_promoted: |
+    long_lived[0] = short_lived # write barrier
+loop_count: 30000000
diff --git a/benchmark/vm1_gc_wb_obj.yml b/benchmark/vm1_gc_wb_obj.yml
new file mode 100644
index 0000000000..9dc08e7e1a
--- /dev/null
+++ b/benchmark/vm1_gc_wb_obj.yml
@@ -0,0 +1,15 @@
+prelude: |
+  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, immediate_sweep: true)
+  end
+
+  short_lived = ''
+benchmark:
+  vm1_gc_wb_obj: |
+    short_lived_obj.foo = short_lived # write barrier
+loop_count: 30000000
diff --git a/benchmark/vm1_gc_wb_obj_promoted.yml b/benchmark/vm1_gc_wb_obj_promoted.yml
new file mode 100644
index 0000000000..26859d2a52
--- /dev/null
+++ b/benchmark/vm1_gc_wb_obj_promoted.yml
@@ -0,0 +1,17 @@
+prelude: |
+  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, immediate_sweep: true) }
+  elsif
+    GC.start
+  end
+
+  short_lived = ''
+benchmark:
+  vm1_gc_wb_obj_promoted: |
+    long_lived.foo = short_lived # write barrier
+loop_count: 30000000
diff --git a/benchmark/vm1_ivar.yml b/benchmark/vm1_ivar.yml
new file mode 100644
index 0000000000..7aa6fac729
--- /dev/null
+++ b/benchmark/vm1_ivar.yml
@@ -0,0 +1,6 @@
+prelude: "@a = 1\n"
+benchmark:
+  vm1_ivar: |
+    j = @a
+    k = @a
+loop_count: 30000000
diff --git a/benchmark/vm1_ivar_set.yml b/benchmark/vm1_ivar_set.yml
new file mode 100644
index 0000000000..6f19412d16
--- /dev/null
+++ b/benchmark/vm1_ivar_set.yml
@@ -0,0 +1,5 @@
+benchmark:
+  vm1_ivar_set: |
+    @a = 1
+    @b = 2
+loop_count: 30000000
diff --git a/benchmark/vm1_length.yml b/benchmark/vm1_length.yml
new file mode 100644
index 0000000000..a18e2ca2e6
--- /dev/null
+++ b/benchmark/vm1_length.yml
@@ -0,0 +1,8 @@
+prelude: |
+  a = 'abc'
+  b = [1, 2, 3]
+benchmark:
+  vm1_length: |
+    a.length
+    b.length
+loop_count: 30000000
diff --git a/benchmark/vm1_lvar_init.yml b/benchmark/vm1_lvar_init.yml
new file mode 100644
index 0000000000..10e2becef9
--- /dev/null
+++ b/benchmark/vm1_lvar_init.yml
@@ -0,0 +1,21 @@
+# while loop cost is not removed because `i` is used in the script
+benchmark:
+  vm1_lvar_init: |
+    def m v
+      unless v
+        # unreachable code
+        v1 = v2 = v3 = v4 = v5 = v6 = v7 = v8 = v9 = v10 =
+        v11 = v12 = v13 = v14 = v15 = v16 = v17 = v18 = v19 = v20 =
+        v21 = v22 = v23 = v24 = v25 = v26 = v27 = v28 = v29 = v30 =
+        v31 = v32 = v33 = v34 = v35 = v36 = v37 = v38 = v39 = v40 =
+        v41 = v42 = v43 = v44 = v45 = v46 = v47 = v48 = v49 = v50 = 1
+      end
+    end
+
+    i = 0
+
+    while i<30_000_000
+      i += 1
+      m i
+    end
+loop_count: 1
diff --git a/benchmark/vm1_lvar_set.yml b/benchmark/vm1_lvar_set.yml
new file mode 100644
index 0000000000..df8f6b6ea4
--- /dev/null
+++ b/benchmark/vm1_lvar_set.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm1_lvar_set: |
+    a = b = c = d = e = f = g = h = j = k = l = m = n = o = p = q = r = 1
+loop_count: 30000000
diff --git a/benchmark/vm1_neq.yml b/benchmark/vm1_neq.yml
new file mode 100644
index 0000000000..65a8128dda
--- /dev/null
+++ b/benchmark/vm1_neq.yml
@@ -0,0 +1,7 @@
+prelude: |
+  obj1 = Object.new
+  obj2 = Object.new
+benchmark:
+  vm1_neq: |
+    obj1 != obj2
+loop_count: 30000000
diff --git a/benchmark/vm1_not.yml b/benchmark/vm1_not.yml
new file mode 100644
index 0000000000..0fb7b282a9
--- /dev/null
+++ b/benchmark/vm1_not.yml
@@ -0,0 +1,6 @@
+prelude: |
+  obj = Object.new
+benchmark:
+  vm1_not: |
+    !obj
+loop_count: 30000000
diff --git a/benchmark/vm1_rescue.yml b/benchmark/vm1_rescue.yml
new file mode 100644
index 0000000000..a175b823af
--- /dev/null
+++ b/benchmark/vm1_rescue.yml
@@ -0,0 +1,6 @@
+benchmark:
+  vm1_rescue: |
+    begin
+    rescue
+    end
+loop_count: 30000000
diff --git a/benchmark/vm1_simplereturn.yml b/benchmark/vm1_simplereturn.yml
new file mode 100644
index 0000000000..3564aac7e2
--- /dev/null
+++ b/benchmark/vm1_simplereturn.yml
@@ -0,0 +1,7 @@
+prelude: |
+  def m
+    return 1
+  end
+benchmark:
+  vm1_simplereturn: m
+loop_count: 30000000
diff --git a/benchmark/vm1_swap.yml b/benchmark/vm1_swap.yml
new file mode 100644
index 0000000000..fed87ccd62
--- /dev/null
+++ b/benchmark/vm1_swap.yml
@@ -0,0 +1,7 @@
+prelude: |
+  a = 1
+  b = 2
+benchmark:
+  vm1_swap: |
+    a, b = b, a
+loop_count: 30000000
diff --git a/benchmark/vm1_yield.yml b/benchmark/vm1_yield.yml
new file mode 100644
index 0000000000..ae1f9316f9
--- /dev/null
+++ b/benchmark/vm1_yield.yml
@@ -0,0 +1,13 @@
+# while loop cost is not removed due to benchmark_driver.gem's limitation
+benchmark:
+  vm1_yield: |
+    def m
+      i = 0
+      while i<30_000_000
+        i += 1
+        yield
+      end
+    end
+
+    m{}
+loop_count: 1
diff --git a/benchmark/vm2_array.yml b/benchmark/vm2_array.yml
new file mode 100644
index 0000000000..7373098d5e
--- /dev/null
+++ b/benchmark/vm2_array.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm2_array: |
+    a = [1,2,3,4,5,6,7,8,9,10]
+loop_count: 6000000
diff --git a/benchmark/vm2_bigarray.yml b/benchmark/vm2_bigarray.yml
new file mode 100644
index 0000000000..2ad6da3905
--- /dev/null
+++ b/benchmark/vm2_bigarray.yml
@@ -0,0 +1,105 @@
+benchmark:
+  vm2_bigarray: |
+    a = [
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+    ]
+loop_count: 6000000
diff --git a/benchmark/vm2_bighash.yml b/benchmark/vm2_bighash.yml
new file mode 100644
index 0000000000..e9154e4ba9
--- /dev/null
+++ b/benchmark/vm2_bighash.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm2_bighash: |
+    a = {0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 7=>7, 8=>8, 9=>9, 10=>10, 11=>11, 12=>12, 13=>13, 14=>14, 15=>15, 16=>16, 17=>17, 18=>18, 19=>19, 20=>20, 21=>21, 22=>22, 23=>23, 24=>24, 25=>25, 26=>26, 27=>27, 28=>28, 29=>29, 30=>30, 31=>31, 32=>32, 33=>33, 34=>34, 35=>35, 36=>36, 37=>37, 38=>38, 39=>39, 40=>40, 41=>41, 42=>42, 43=>43, 44=>44, 45=>45, 46=>46, 47=>47, 48=>48, 49=>49, 50=>50, 51=>51, 52=>52, 53=>53, 54=>54, 55=>55, 56=>56, 57=>57, 58=>58, 59=>59, 60=>60, 61=>61, 62=>62, 63=>63, 64=>64, 65=>65, 66=>66, 67=>67, 68=>68, 69=>69, 70=>70, 71=>71, 72=>72, 73=>73, 74=>74, 75=>75, 76=>76, 77=>77, 78=>78, 79=>79, 80=>80, 81=>81, 82=>82, 83=>83, 84=>84, 85=>85, 86=>86, 87=>87, 88=>88, 89=>89, 90=>90, 91=>91, 92=>92, 93=>93, 94=>94, 95=>95, 96=>96, 97=>97, 98=>98, 99=>99, 100=>100, 101=>101, 102=>102, 103=>103, 104=>104, 105=>105, 106=>106, 107=>107, 108=>108, 109=>109, 110=>110, 111=>111, 112=>112, 113=>113, 114=>114, 115=>115, 116=>116, 117=>117, 118=>118, 119=>119, 120=>120, 121=>121, 122=>122, 123=>123, 124=>124, 125=>125, 126=>126, 127=>127, 128=>128, 129=>129, 130=>130, 131=>131, 132=>132, 133=>133, 134=>134, 135=>135, 136=>136, 137=>137, 138=>138, 139=>139, 140=>140, 141=>141, 142=>142, 143=>143, 144=>144, 145=>145, 146=>146, 147=>147, 148=>148, 149=>149, 150=>150, 151=>151, 152=>152, 153=>153, 154=>154, 155=>155, 156=>156, 157=>157, 158=>158, 159=>159, 160=>160, 161=>161, 162=>162, 163=>163, 164=>164, 165=>165, 166=>166, 167=>167, 168=>168, 169=>169, 170=>170, 171=>171, 172=>172, 173=>173, 174=>174, 175=>175, 176=>176, 177=>177, 178=>178, 179=>179, 180=>180, 181=>181, 182=>182, 183=>183, 184=>184, 185=>185, 186=>186, 187=>187, 188=>188, 189=>189, 190=>190, 191=>191, 192=>192, 193=>193, 194=>194, 195=>195, 196=>196, 197=>197, 198=>198, 199=>199, 200=>200, 201=>201, 202=>202, 203=>203, 204=>204, 205=>205, 206=>206, 207=>207, 208=>208, 209=>209, 210=>210, 211=>211, 212=>212, 213=>213, 214=>214, 215=>215, 216=>216, 217=>217, 218=>218, 219=>219, 220=>220, 221=>221, 222=>222, 223=>223, 224=>224, 225=>225, 226=>226, 227=>227, 228=>228, 229=>229, 230=>230, 231=>231, 232=>232, 233=>233, 234=>234, 235=>235, 236=>236, 237=>237, 238=>238, 239=>239, 240=>240, 241=>241, 242=>242, 243=>243, 244=>244, 245=>245, 246=>246, 247=>247, 248=>248, 249=>249, 250=>250, 251=>251, 252=>252, 253=>253, 254=>254, 255=>255, 256=>256, 257=>257, 258=>258, 259=>259, 260=>260, 261=>261, 262=>262, 263=>263, 264=>264, 265=>265, 266=>266, 267=>267, 268=>268, 269=>269, 270=>270, 271=>271, 272=>272, 273=>273, 274=>274, 275=>275, 276=>276, 277=>277, 278=>278, 279=>279, 280=>280, 281=>281, 282=>282, 283=>283, 284=>284, 285=>285, 286=>286, 287=>287, 288=>288, 289=>289, 290=>290, 291=>291, 292=>292, 293=>293, 294=>294, 295=>295, 296=>296, 297=>297, 298=>298, 299=>299, 300=>300, 301=>301, 302=>302, 303=>303, 304=>304, 305=>305, 306=>306, 307=>307, 308=>308, 309=>309, 310=>310, 311=>311, 312=>312, 313=>313, 314=>314, 315=>315, 316=>316, 317=>317, 318=>318, 319=>319, 320=>320, 321=>321, 322=>322, 323=>323, 324=>324, 325=>325, 326=>326, 327=>327, 328=>328, 329=>329, 330=>330, 331=>331, 332=>332, 333=>333, 334=>334, 335=>335, 336=>336, 337=>337, 338=>338, 339=>339, 340=>340, 341=>341, 342=>342, 343=>343, 344=>344, 345=>345, 346=>346, 347=>347, 348=>348, 349=>349, 350=>350, 351=>351, 352=>352, 353=>353, 354=>354, 355=>355, 356=>356, 357=>357, 358=>358, 359=>359, 360=>360, 361=>361, 362=>362, 363=>363, 364=>364, 365=>365, 366=>366, 367=>367, 368=>368, 369=>369, 370=>370, 371=>371, 372=>372, 373=>373, 374=>374, 375=>375, 376=>376, 377=>377, 378=>378, 379=>379, 380=>380, 381=>381, 382=>382, 383=>383, 384=>384, 385=>385, 386=>386, 387=>387, 388=>388, 389=>389, 390=>390, 391=>391, 392=>392, 393=>393, 394=>394, 395=>395, 396=>396, 397=>397, 398=>398, 399=>399, 400=>400, 401=>401, 402=>402, 403=>403, 404=>404, 405=>405, 406=>406, 407=>407, 408=>408, 409=>409, 410=>410, 411=>411, 412=>412, 413=>413, 414=>414, 415=>415, 416=>416, 417=>417, 418=>418, 419=>419, 420=>420, 421=>421, 422=>422, 423=>423, 424=>424, 425=>425, 426=>426, 427=>427, 428=>428, 429=>429, 430=>430, 431=>431, 432=>432, 433=>433, 434=>434, 435=>435, 436=>436, 437=>437, 438=>438, 439=>439, 440=>440, 441=>441, 442=>442, 443=>443, 444=>444, 445=>445, 446=>446, 447=>447, 448=>448, 449=>449, 450=>450, 451=>451, 452=>452, 453=>453, 454=>454, 455=>455, 456=>456, 457=>457, 458=>458, 459=>459, 460=>460, 461=>461, 462=>462, 463=>463, 464=>464, 465=>465, 466=>466, 467=>467, 468=>468, 469=>469, 470=>470, 471=>471, 472=>472, 473=>473, 474=>474, 475=>475, 476=>476, 477=>477, 478=>478, 479=>479, 480=>480, 481=>481, 482=>482, 483=>483, 484=>484, 485=>485, 486=>486, 487=>487, 488=>488, 489=>489, 490=>490, 491=>491, 492=>492, 493=>493, 494=>494, 495=>495, 496=>496, 497=>497, 498=>498, 499=>499, 500=>500,}
+loop_count: 60000
diff --git a/benchmark/vm2_case.yml b/benchmark/vm2_case.yml
new file mode 100644
index 0000000000..7716783c09
--- /dev/null
+++ b/benchmark/vm2_case.yml
@@ -0,0 +1,13 @@
+benchmark:
+  vm2_case: |
+    case :foo
+    when :bar
+      raise
+    when :baz
+      raise
+    when :boo
+      raise
+    when :foo
+      # noop
+    end
+loop_count: 6000000
diff --git a/benchmark/vm2_case_lit.yml b/benchmark/vm2_case_lit.yml
new file mode 100644
index 0000000000..c49b8dfe5e
--- /dev/null
+++ b/benchmark/vm2_case_lit.yml
@@ -0,0 +1,23 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm2_case_lit: |
+    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
+      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
+loop_count: 1
diff --git a/benchmark/vm2_defined_method.yml b/benchmark/vm2_defined_method.yml
new file mode 100644
index 0000000000..e1b0d55674
--- /dev/null
+++ b/benchmark/vm2_defined_method.yml
@@ -0,0 +1,8 @@
+prelude: |
+  class Object
+    define_method(:m){}
+  end
+benchmark:
+  vm2_defined_method: |
+    m; m; m; m; m; m; m; m;
+loop_count: 6000000
diff --git a/benchmark/vm2_dstr.yml b/benchmark/vm2_dstr.yml
new file mode 100644
index 0000000000..f8bd6e0133
--- /dev/null
+++ b/benchmark/vm2_dstr.yml
@@ -0,0 +1,6 @@
+prelude: |
+  x = y = 'z'
+benchmark:
+  vm2_dstr: |
+    str = "foo#{x}bar#{y}baz"
+loop_count: 6000000
diff --git a/benchmark/vm2_eval.yml b/benchmark/vm2_eval.yml
new file mode 100644
index 0000000000..d506a9c079
--- /dev/null
+++ b/benchmark/vm2_eval.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm2_eval: |
+    eval("1")
+loop_count: 6000000
diff --git a/benchmark/vm2_fiber_allocate.yml b/benchmark/vm2_fiber_allocate.yml
new file mode 100644
index 0000000000..f29705f694
--- /dev/null
+++ b/benchmark/vm2_fiber_allocate.yml
@@ -0,0 +1,8 @@
+prelude: |
+  # Disable GC to see raw throughput:
+  GC.disable
+benchmark:
+  vm2_fiber_allocate: |
+    fiber = Fiber.new{Fiber.yield}
+    fiber.resume
+loop_count: 100000
diff --git a/benchmark/vm2_fiber_count.yml b/benchmark/vm2_fiber_count.yml
new file mode 100644
index 0000000000..3ecf6bdcb2
--- /dev/null
+++ b/benchmark/vm2_fiber_count.yml
@@ -0,0 +1,10 @@
+# On Linux, you will need to increase the maximum number of memory maps:
+# sudo sysctl -w vm.max_map_count=200000
+prelude: |
+  fibers = []
+benchmark:
+  vm2_fiber_count: |
+    fiber = Fiber.new{Fiber.yield}
+    fibers << fiber
+    fiber.resume
+loop_count: 100000
diff --git a/benchmark/vm2_fiber_reuse.yml b/benchmark/vm2_fiber_reuse.yml
new file mode 100644
index 0000000000..0170650638
--- /dev/null
+++ b/benchmark/vm2_fiber_reuse.yml
@@ -0,0 +1,14 @@
+prelude: |
+  GC.disable
+  fibers = []
+benchmark:
+  vm2_fiber_reuse: |
+    1024.times do
+      fiber = Fiber.new{Fiber.yield}
+      fibers << fiber
+      fiber.resume
+    end
+
+    fibers.clear
+    GC.start
+loop_count: 200
diff --git a/benchmark/vm2_fiber_reuse_gc.yml b/benchmark/vm2_fiber_reuse_gc.yml
new file mode 100644
index 0000000000..8fb91a84eb
--- /dev/null
+++ b/benchmark/vm2_fiber_reuse_gc.yml
@@ -0,0 +1,12 @@
+# https://bugs.ruby-lang.org/issues/16009
+prelude: |
+  fibers = []
+benchmark:
+  vm2_fiber_reuse_gc: |
+    2000.times do
+      fiber = Fiber.new{Fiber.yield}
+      fibers << fiber
+      fiber.resume
+    end
+    fibers.clear
+loop_count: 100
diff --git a/benchmark/vm2_fiber_switch.yml b/benchmark/vm2_fiber_switch.yml
new file mode 100644
index 0000000000..fbf7283c29
--- /dev/null
+++ b/benchmark/vm2_fiber_switch.yml
@@ -0,0 +1,9 @@
+prelude: |
+  # based on benchmark for [ruby-core:65518] [Feature #10341] by Knut Franke
+  fib = Fiber.new do
+    loop { Fiber.yield }
+  end
+benchmark:
+  vm2_fiber_switch: |
+    fib.resume
+loop_count: 20000000
diff --git a/benchmark/vm2_freezestring.yml b/benchmark/vm2_freezestring.yml
new file mode 100644
index 0000000000..b78af91a20
--- /dev/null
+++ b/benchmark/vm2_freezestring.yml
@@ -0,0 +1,10 @@
+prelude: |
+  class String
+    def freeze
+      -self
+    end
+  end
+benchmark:
+  vm2_freezestring: |
+    "tXnL1BP5T1WPXMjuFNLQtallEtRcay1t2lHtJSrlVsDgvunlbtfpr/DGdH0NGYE9".freeze
+loop_count: 6000000
diff --git a/benchmark/vm2_method.yml b/benchmark/vm2_method.yml
new file mode 100644
index 0000000000..cc7b9b28ff
--- /dev/null
+++ b/benchmark/vm2_method.yml
@@ -0,0 +1,8 @@
+prelude: |
+  def m
+    nil
+  end
+benchmark:
+  vm2_method: |
+    m; m; m; m; m; m; m; m;
+loop_count: 6000000
diff --git a/benchmark/vm2_method_missing.yml b/benchmark/vm2_method_missing.yml
new file mode 100644
index 0000000000..cbfb794b25
--- /dev/null
+++ b/benchmark/vm2_method_missing.yml
@@ -0,0 +1,11 @@
+prelude: |
+  class C
+    def method_missing mid
+    end
+  end
+
+  obj = C.new
+benchmark:
+  vm2_method_missing: |
+    obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m;
+loop_count: 6000000
diff --git a/benchmark/vm2_method_with_block.yml b/benchmark/vm2_method_with_block.yml
new file mode 100644
index 0000000000..6e522adccc
--- /dev/null
+++ b/benchmark/vm2_method_with_block.yml
@@ -0,0 +1,8 @@
+prelude: |
+  def m
+    nil
+  end
+benchmark:
+  vm2_method_with_block: |
+    m{}; m{}; m{}; m{}; m{}; m{}; m{}; m{};
+loop_count: 6000000
diff --git a/benchmark/vm2_module_ann_const_set.yml b/benchmark/vm2_module_ann_const_set.yml
new file mode 100644
index 0000000000..b0becd9d3d
--- /dev/null
+++ b/benchmark/vm2_module_ann_const_set.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm2_module_ann_const_set: |
+    Module.new.const_set(:X, Module.new)
+loop_count: 6000000
diff --git a/benchmark/vm2_module_const_set.yml b/benchmark/vm2_module_const_set.yml
new file mode 100644
index 0000000000..05a640069c
--- /dev/null
+++ b/benchmark/vm2_module_const_set.yml
@@ -0,0 +1,8 @@
+prelude: |
+  module M
+  end
+  $VERBOSE = nil
+benchmark:
+  vm2_module_const_set: |
+    M.const_set(:X, Module.new)
+loop_count: 6000000
diff --git a/benchmark/vm2_mutex.yml b/benchmark/vm2_mutex.yml
new file mode 100644
index 0000000000..c40a90444a
--- /dev/null
+++ b/benchmark/vm2_mutex.yml
@@ -0,0 +1,8 @@
+prelude: |
+  require 'thread'
+
+  m = Thread::Mutex.new
+benchmark:
+  vm2_mutex: |
+    m.synchronize{}
+loop_count: 6000000
diff --git a/benchmark/vm2_newlambda.yml b/benchmark/vm2_newlambda.yml
new file mode 100644
index 0000000000..93133f9f30
--- /dev/null
+++ b/benchmark/vm2_newlambda.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm2_newlambda: |
+    lambda {}
+loop_count: 6000000
diff --git a/benchmark/vm2_poly_method.yml b/benchmark/vm2_poly_method.yml
new file mode 100644
index 0000000000..0104bdfb66
--- /dev/null
+++ b/benchmark/vm2_poly_method.yml
@@ -0,0 +1,24 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm2_poly_method: |
+    class C1
+      def m
+        1
+      end
+    end
+    class C2
+      def m
+        2
+      end
+    end
+
+    o1 = C1.new
+    o2 = C2.new
+
+    i = 0
+    while i<6_000_000
+      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
+loop_count: 1
diff --git a/benchmark/vm2_poly_method_ov.yml b/benchmark/vm2_poly_method_ov.yml
new file mode 100644
index 0000000000..3748073ba2
--- /dev/null
+++ b/benchmark/vm2_poly_method_ov.yml
@@ -0,0 +1,24 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm2_poly_method_ov: |
+    class C1
+      def m
+        1
+      end
+    end
+    class C2
+      def m
+        2
+      end
+    end
+
+    o1 = C1.new
+    o2 = C2.new
+
+    i = 0
+    while i<6_000_000
+      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
+loop_count: 1
diff --git a/benchmark/vm2_poly_same_method.yml b/benchmark/vm2_poly_same_method.yml
new file mode 100644
index 0000000000..867c433cf8
--- /dev/null
+++ b/benchmark/vm2_poly_same_method.yml
@@ -0,0 +1,25 @@
+prelude: |
+  module AR; end
+  class AR::Base
+    def create_or_update
+      nil
+    end
+    def save
+      create_or_update
+    end
+  end
+  class Foo < AR::Base; end
+  class Bar < AR::Base; end
+  o1 = Foo.new
+  o2 = Bar.new
+benchmark:
+  vm2_poly_same_method: |
+    o1.save; o2.save;
+    o1.save; o2.save;
+    o1.save; o2.save;
+    o1.save; o2.save;
+    o1.save; o2.save;
+    o1.save; o2.save;
+    o1.save; o2.save;
+    o1.save; o2.save;
+loop_count: 6000000
diff --git a/benchmark/vm2_poly_singleton.yml b/benchmark/vm2_poly_singleton.yml
new file mode 100644
index 0000000000..e58d7bfb37
--- /dev/null
+++ b/benchmark/vm2_poly_singleton.yml
@@ -0,0 +1,18 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm2_poly_singleton: |
+    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
+loop_count: 1
diff --git a/benchmark/vm2_proc.yml b/benchmark/vm2_proc.yml
new file mode 100644
index 0000000000..5c36e936d9
--- /dev/null
+++ b/benchmark/vm2_proc.yml
@@ -0,0 +1,12 @@
+prelude: |
+  def m &b
+    b
+  end
+
+  pr = m{
+    a = 1
+  }
+benchmark:
+  vm2_proc: |
+    pr.call
+loop_count: 6000000
diff --git a/benchmark/vm2_raise1.yml b/benchmark/vm2_raise1.yml
new file mode 100644
index 0000000000..f6eb308968
--- /dev/null
+++ b/benchmark/vm2_raise1.yml
@@ -0,0 +1,16 @@
+prelude: |
+  def rec n
+    if n > 0
+      rec n-1
+    else
+      raise
+    end
+  end
+benchmark:
+  vm2_raise1: |
+    begin
+      rec 1
+    rescue
+      # ignore
+    end
+loop_count: 6000000
diff --git a/benchmark/vm2_raise2.yml b/benchmark/vm2_raise2.yml
new file mode 100644
index 0000000000..7d51b1b314
--- /dev/null
+++ b/benchmark/vm2_raise2.yml
@@ -0,0 +1,16 @@
+prelude: |
+  def rec n
+    if n > 0
+      rec n-1
+    else
+      raise
+    end
+  end
+benchmark:
+  vm2_raise2: |
+    begin
+      rec 10
+    rescue
+      # ignore
+    end
+loop_count: 6000000
diff --git a/benchmark/vm2_regexp.yml b/benchmark/vm2_regexp.yml
new file mode 100644
index 0000000000..e53341f43b
--- /dev/null
+++ b/benchmark/vm2_regexp.yml
@@ -0,0 +1,8 @@
+prelude: |
+  str = 'xxxhogexxx'
+benchmark:
+  vm2_regexp: |
+    /hoge/ =~ str
+  vm2_regexp_invert: |
+    str =~ /hoge/
+loop_count: 6000000
diff --git a/benchmark/vm2_send.yml b/benchmark/vm2_send.yml
new file mode 100644
index 0000000000..44a12a27d9
--- /dev/null
+++ b/benchmark/vm2_send.yml
@@ -0,0 +1,11 @@
+prelude: |
+  class C
+    def m
+    end
+  end
+
+  o = C.new
+benchmark:
+  vm2_send: |
+    o.__send__ :m
+loop_count: 6000000
diff --git a/benchmark/vm2_string_literal.yml b/benchmark/vm2_string_literal.yml
new file mode 100644
index 0000000000..54b0aec1fe
--- /dev/null
+++ b/benchmark/vm2_string_literal.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm2_string_literal: |
+    x = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+loop_count: 6000000
diff --git a/benchmark/vm2_struct_big_aref_hi.yml b/benchmark/vm2_struct_big_aref_hi.yml
new file mode 100644
index 0000000000..eed1846d28
--- /dev/null
+++ b/benchmark/vm2_struct_big_aref_hi.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+  x = s.new
+benchmark:
+  vm2_struct_big_aref_hi: |
+    x.z # x[25]
+loop_count: 6000000
diff --git a/benchmark/vm2_struct_big_aref_lo.yml b/benchmark/vm2_struct_big_aref_lo.yml
new file mode 100644
index 0000000000..0915435b76
--- /dev/null
+++ b/benchmark/vm2_struct_big_aref_lo.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+  x = s.new
+benchmark:
+  vm2_struct_big_aref_lo: |
+    x.k # x[10]
+loop_count: 6000000
diff --git a/benchmark/vm2_struct_big_aset.yml b/benchmark/vm2_struct_big_aset.yml
new file mode 100644
index 0000000000..6af50103d3
--- /dev/null
+++ b/benchmark/vm2_struct_big_aset.yml
@@ -0,0 +1,11 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm2_struct_big_aset: |
+    s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+    x = s.new
+    i = 0
+    while i<6_000_000
+      i += 1
+      x.k = i # x[10] = i
+    end
+loop_count: 1
diff --git a/benchmark/vm2_struct_big_href_hi.yml b/benchmark/vm2_struct_big_href_hi.yml
new file mode 100644
index 0000000000..60aa7fddf3
--- /dev/null
+++ b/benchmark/vm2_struct_big_href_hi.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+  x = s.new
+benchmark:
+  vm2_struct_big_href_hi: |
+    x[:z]
+loop_count: 6000000
diff --git a/benchmark/vm2_struct_big_href_lo.yml b/benchmark/vm2_struct_big_href_lo.yml
new file mode 100644
index 0000000000..c55c0bd16c
--- /dev/null
+++ b/benchmark/vm2_struct_big_href_lo.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+  x = s.new
+benchmark:
+  vm2_struct_big_href_lo: |
+    x[:k]
+loop_count: 6000000
diff --git a/benchmark/vm2_struct_big_hset.yml b/benchmark/vm2_struct_big_hset.yml
new file mode 100644
index 0000000000..d199c5bd47
--- /dev/null
+++ b/benchmark/vm2_struct_big_hset.yml
@@ -0,0 +1,11 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm2_struct_big_hset: |
+    s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+    x = s.new
+    i = 0
+    while i<6_000_000
+      i += 1
+      x[:k] = i
+    end
+loop_count: 1
diff --git a/benchmark/vm2_struct_small_aref.yml b/benchmark/vm2_struct_small_aref.yml
new file mode 100644
index 0000000000..83381bed3a
--- /dev/null
+++ b/benchmark/vm2_struct_small_aref.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(:a, :b, :c)
+  x = s.new
+benchmark:
+  vm2_struct_small_aref: |
+    x.a
+loop_count: 6000000
diff --git a/benchmark/vm2_struct_small_aset.yml b/benchmark/vm2_struct_small_aset.yml
new file mode 100644
index 0000000000..3e84a61dd0
--- /dev/null
+++ b/benchmark/vm2_struct_small_aset.yml
@@ -0,0 +1,11 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm2_struct_small_aset: |
+    s = Struct.new(:a, :b, :c)
+    x = s.new
+    i = 0
+    while i<6_000_000
+      i += 1
+      x.a = i
+    end
+loop_count: 1
diff --git a/benchmark/vm2_struct_small_href.yml b/benchmark/vm2_struct_small_href.yml
new file mode 100644
index 0000000000..b744f070d1
--- /dev/null
+++ b/benchmark/vm2_struct_small_href.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(:a, :b, :c)
+  x = s.new
+benchmark:
+  vm2_struct_small_href: |
+    x[:a]
+loop_count: 6000000
diff --git a/benchmark/vm2_struct_small_hset.yml b/benchmark/vm2_struct_small_hset.yml
new file mode 100644
index 0000000000..d43845d6e0
--- /dev/null
+++ b/benchmark/vm2_struct_small_hset.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(:a, :b, :c)
+  x = s.new
+benchmark:
+  vm2_struct_small_hset: |
+    x[:a] = 1
+loop_count: 6000000
diff --git a/benchmark/vm2_super.yml b/benchmark/vm2_super.yml
new file mode 100644
index 0000000000..674743762a
--- /dev/null
+++ b/benchmark/vm2_super.yml
@@ -0,0 +1,17 @@
+prelude: |
+  class C
+    def m
+      1
+    end
+  end
+
+  class CC < C
+    def m
+      super()
+    end
+  end
+
+  obj = CC.new
+benchmark:
+  vm2_super: obj.m
+loop_count: 6000000
diff --git a/benchmark/vm2_unif1.yml b/benchmark/vm2_unif1.yml
new file mode 100644
index 0000000000..caef13279f
--- /dev/null
+++ b/benchmark/vm2_unif1.yml
@@ -0,0 +1,7 @@
+prelude: |
+  def m a, b
+  end
+benchmark:
+  vm2_unif1: |
+    m 100, 200
+loop_count: 6000000
diff --git a/benchmark/vm2_zsuper.yml b/benchmark/vm2_zsuper.yml
new file mode 100644
index 0000000000..f760cfd48e
--- /dev/null
+++ b/benchmark/vm2_zsuper.yml
@@ -0,0 +1,18 @@
+prelude: |
+  class C
+    def m a
+      1
+    end
+  end
+
+  class CC < C
+    def m a
+      super
+    end
+  end
+
+  obj = CC.new
+benchmark:
+  vm2_zsuper: |
+    obj.m 10
+loop_count: 6000000
diff --git a/benchmark/vm3_backtrace.rb b/benchmark/vm3_backtrace.rb
new file mode 100644
index 0000000000..0fbf73e1ca
--- /dev/null
+++ b/benchmark/vm3_backtrace.rb
@@ -0,0 +1,22 @@
+# get last backtrace
+
+begin
+  caller(0, 0)
+rescue ArgumentError
+  alias caller_orig caller
+  def caller lev, n
+    caller_orig(lev)[0..n]
+  end
+end
+
+def rec n
+  if n < 0
+    100_000.times{
+      caller(0, 1)
+    }
+  else
+    rec(n-1)
+  end
+end
+
+rec 50
diff --git a/benchmark/vm3_clearmethodcache.rb b/benchmark/vm3_clearmethodcache.rb
new file mode 100644
index 0000000000..9661323cd2
--- /dev/null
+++ b/benchmark/vm3_clearmethodcache.rb
@@ -0,0 +1,8 @@
+i = 0
+while i<200_000
+  i += 1
+
+  Class.new{
+    def m; end
+  }
+end
diff --git a/benchmark/vm3_gc.rb b/benchmark/vm3_gc.rb
new file mode 100644
index 0000000000..e668026915
--- /dev/null
+++ b/benchmark/vm3_gc.rb
@@ -0,0 +1,6 @@
+5000.times do
+  100.times do
+    {"xxxx"=>"yyyy"}
+  end
+  GC.start
+end
diff --git a/benchmark/vm3_gc_old_full.rb b/benchmark/vm3_gc_old_full.rb
new file mode 100644
index 0000000000..cfdfc8c5a5
--- /dev/null
+++ b/benchmark/vm3_gc_old_full.rb
@@ -0,0 +1,4 @@
+old_object = Array.new(1_000_000){''}
+100.times do
+  GC.start
+end
diff --git a/benchmark/vm3_gc_old_immediate.rb b/benchmark/vm3_gc_old_immediate.rb
new file mode 100644
index 0000000000..ad22feb655
--- /dev/null
+++ b/benchmark/vm3_gc_old_immediate.rb
@@ -0,0 +1,4 @@
+old_object = Array.new(1_000_000){''}
+30_000.times do
+  GC.start(full_mark: false, immediate_sweep: true)
+end
diff --git a/benchmark/vm3_gc_old_lazy.rb b/benchmark/vm3_gc_old_lazy.rb
new file mode 100644
index 0000000000..b74d44baf1
--- /dev/null
+++ b/benchmark/vm3_gc_old_lazy.rb
@@ -0,0 +1,4 @@
+old_object = Array.new(1_000_000){''}
+30_000.times do
+  GC.start(full_mark: false, immediate_sweep: false)
+end
diff --git a/benchmark/vm_symbol_block_pass.rb b/benchmark/vm_symbol_block_pass.rb
new file mode 100644
index 0000000000..1d433353e1
--- /dev/null
+++ b/benchmark/vm_symbol_block_pass.rb
@@ -0,0 +1,13 @@
+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/vm_thread_alive_check.yml b/benchmark/vm_thread_alive_check.yml
new file mode 100644
index 0000000000..d21737d3e8
--- /dev/null
+++ b/benchmark/vm_thread_alive_check.yml
@@ -0,0 +1,8 @@
+benchmark:
+  vm_thread_alive_check: |
+    t = Thread.new{}
+    while t.alive?
+      Thread.pass
+    end
+loop_count: 50_000
+
diff --git a/benchmark/vm_thread_close.rb b/benchmark/vm_thread_close.rb
new file mode 100644
index 0000000000..3e9a265ce8
--- /dev/null
+++ b/benchmark/vm_thread_close.rb
@@ -0,0 +1,6 @@
+1000.times { Thread.new { sleep } }
+i = 0
+while i<100_000 # benchmark loop 3
+  i += 1
+  IO.pipe.each(&:close)
+end
diff --git a/benchmark/vm_thread_condvar1.rb b/benchmark/vm_thread_condvar1.rb
new file mode 100644
index 0000000000..cf5706b23e
--- /dev/null
+++ b/benchmark/vm_thread_condvar1.rb
@@ -0,0 +1,28 @@
+# two threads, two mutex, two condvar ping-pong
+require 'thread'
+m1 = Mutex.new
+m2 = Mutex.new
+cv1 = ConditionVariable.new
+cv2 = ConditionVariable.new
+max = 100000
+i = 0
+wait = nil
+m2.synchronize do
+  wait = Thread.new do
+    m1.synchronize do
+      m2.synchronize { cv2.signal }
+      while (i += 1) < max
+        cv1.wait(m1)
+        cv2.signal
+      end
+    end
+  end
+  cv2.wait(m2)
+end
+m1.synchronize do
+  while i < max
+    cv1.signal
+    cv2.wait(m1)
+  end
+end
+wait.join
diff --git a/benchmark/vm_thread_condvar2.rb b/benchmark/vm_thread_condvar2.rb
new file mode 100644
index 0000000000..7c8dc19481
--- /dev/null
+++ b/benchmark/vm_thread_condvar2.rb
@@ -0,0 +1,35 @@
+# many threads, one mutex, many condvars
+require 'thread'
+m = Mutex.new
+cv1 = ConditionVariable.new
+cv2 = ConditionVariable.new
+max = 1000
+n = 100
+waiting = 0
+scvs = []
+waiters = n.times.map do |i|
+  start_cv = ConditionVariable.new
+  scvs << start_cv
+  start_mtx = Mutex.new
+  start_mtx.synchronize do
+    th = Thread.new(start_mtx, start_cv) do |sm, scv|
+      m.synchronize do
+        sm.synchronize { scv.signal }
+        max.times do
+          cv2.signal if (waiting += 1) == n
+          cv1.wait(m)
+        end
+      end
+    end
+    start_cv.wait(start_mtx)
+    th
+  end
+end
+m.synchronize do
+  max.times do
+    cv2.wait(m) until waiting == n
+    waiting = 0
+    cv1.broadcast
+  end
+end
+waiters.each(&:join)
diff --git a/benchmark/vm_thread_create_join.rb b/benchmark/vm_thread_create_join.rb
new file mode 100644
index 0000000000..393cd45df9
--- /dev/null
+++ b/benchmark/vm_thread_create_join.rb
@@ -0,0 +1,6 @@
+i = 0
+while i<100_000 # benchmark loop 3
+  i += 1
+  Thread.new{
+  }.join
+end
diff --git a/benchmark/vm_thread_mutex1.rb b/benchmark/vm_thread_mutex1.rb
new file mode 100644
index 0000000000..66e42c85e1
--- /dev/null
+++ b/benchmark/vm_thread_mutex1.rb
@@ -0,0 +1,21 @@
+# one thread, one mutex (no contention)
+
+require 'thread'
+m = Thread::Mutex.new
+r = 0
+max = 2000
+lmax = max * max
+(1..1).map{
+  Thread.new{
+    i = 0
+    while i<lmax
+      i += 1
+      m.synchronize{
+        r += 1
+      }
+    end
+  }
+}.each{|e|
+  e.join
+}
+raise r.to_s if r != max * max
diff --git a/benchmark/vm_thread_mutex2.rb b/benchmark/vm_thread_mutex2.rb
new file mode 100644
index 0000000000..6e6c804c31
--- /dev/null
+++ b/benchmark/vm_thread_mutex2.rb
@@ -0,0 +1,21 @@
+# two threads, one mutex
+
+require 'thread'
+m = Thread::Mutex.new
+r = 0
+max = 2000
+lmax = (max * max)/2
+(1..2).map{
+  Thread.new{
+    i = 0
+    while i<lmax
+      i += 1
+      m.synchronize{
+        r += 1
+      }
+    end
+  }
+}.each{|e|
+  e.join
+}
+raise r.to_s if r != max * max
diff --git a/benchmark/vm_thread_mutex3.rb b/benchmark/vm_thread_mutex3.rb
new file mode 100644
index 0000000000..c750dc542a
--- /dev/null
+++ b/benchmark/vm_thread_mutex3.rb
@@ -0,0 +1,20 @@
+# 1000 threads, one mutex
+
+require 'thread'
+m = Thread::Mutex.new
+r = 0
+max = 2000
+(1..max).map{
+  Thread.new{
+    i = 0
+    while i<max
+      i += 1
+      m.synchronize{
+        r += 1
+      }
+    end
+  }
+}.each{|e|
+  e.join
+}
+raise r.to_s if r != max * max
diff --git a/benchmark/vm_thread_pass.rb b/benchmark/vm_thread_pass.rb
new file mode 100644
index 0000000000..438bd08d45
--- /dev/null
+++ b/benchmark/vm_thread_pass.rb
@@ -0,0 +1,15 @@
+# Plenty Thread.pass
+# A performance may depend on GVL implementation.
+
+tmax = (ARGV.shift || 8).to_i
+lmax = 400_000 / tmax
+
+(1..tmax).map{
+  Thread.new{
+    lmax.times{
+      Thread.pass
+    }
+  }
+}.each{|t| t.join}
+
+
diff --git a/benchmark/vm_thread_pass_flood.rb b/benchmark/vm_thread_pass_flood.rb
new file mode 100644
index 0000000000..65df8e6154
--- /dev/null
+++ b/benchmark/vm_thread_pass_flood.rb
@@ -0,0 +1,10 @@
+# n.b. this is a good test for GVL when pinned to a single CPU
+
+5_000.times{
+  Thread.new{loop{Thread.pass}}
+}
+
+i = 0
+while i<10_000
+  i += 1
+end
diff --git a/benchmark/vm_thread_pipe.rb b/benchmark/vm_thread_pipe.rb
new file mode 100644
index 0000000000..112a621905
--- /dev/null
+++ b/benchmark/vm_thread_pipe.rb
@@ -0,0 +1,17 @@
+# Measure small and plenty pipe read/write.
+# A performance may depend on GVL implementation.
+
+lmax = 100_000
+r, w = IO.pipe
+[Thread.new{
+  lmax.times{
+    w.write('a')
+  }
+  p "w:exit"
+}, Thread.new{
+  lmax.times{
+    r.read(1)
+  }
+  p "r:exit"
+}].each{|t| t.join}
+
diff --git a/benchmark/vm_thread_queue.rb b/benchmark/vm_thread_queue.rb
new file mode 100644
index 0000000000..1dd3696a3c
--- /dev/null
+++ b/benchmark/vm_thread_queue.rb
@@ -0,0 +1,18 @@
+require 'thread'
+
+n = 10_000_000
+q = Thread::Queue.new
+consumer = Thread.new{
+  while q.pop
+    # consuming
+  end
+}
+
+producer = Thread.new{
+  n.times{
+    q.push true
+  }
+  q.push nil
+}
+
+consumer.join
diff --git a/benchmark/vm_thread_sized_queue.rb b/benchmark/vm_thread_sized_queue.rb
new file mode 100644
index 0000000000..7b9af5482b
--- /dev/null
+++ b/benchmark/vm_thread_sized_queue.rb
@@ -0,0 +1,20 @@
+require 'thread'
+# on producer, one consumer
+
+n = 1_000_000
+q = Thread::SizedQueue.new(100)
+consumer = Thread.new{
+  while q.pop
+    # consuming
+  end
+}
+
+producer = Thread.new{
+  while n > 0
+    q.push true
+    n -= 1
+  end
+  q.push nil
+}
+
+consumer.join
diff --git a/benchmark/vm_thread_sized_queue2.rb b/benchmark/vm_thread_sized_queue2.rb
new file mode 100644
index 0000000000..de9f55e978
--- /dev/null
+++ b/benchmark/vm_thread_sized_queue2.rb
@@ -0,0 +1,23 @@
+require 'thread'
+# one producer, many consumers
+n = 1_000_000
+m = 10
+q = Thread::SizedQueue.new(100)
+consumers = m.times.map do
+  Thread.new do
+    while q.pop
+      # consuming
+    end
+  end
+end
+
+producer = Thread.new do
+  while n > 0
+    q.push true
+    n -= 1
+  end
+  m.times { q.push nil }
+end
+
+producer.join
+consumers.each(&:join)
diff --git a/benchmark/vm_thread_sized_queue3.rb b/benchmark/vm_thread_sized_queue3.rb
new file mode 100644
index 0000000000..ce5f1796d8
--- /dev/null
+++ b/benchmark/vm_thread_sized_queue3.rb
@@ -0,0 +1,22 @@
+require 'thread'
+# many producers, one consumer
+n = 1_000_000
+m = 10
+q = Thread::SizedQueue.new(100)
+consumer = Thread.new do
+  while q.pop
+    # consuming
+  end
+end
+
+producers = m.times.map do
+  Thread.new do
+    while n > 0
+      q.push true
+      n -= 1
+    end
+  end
+end
+producers.each(&:join)
+q.push nil
+consumer.join
diff --git a/benchmark/vm_thread_sized_queue4.rb b/benchmark/vm_thread_sized_queue4.rb
new file mode 100644
index 0000000000..a9b7d80ec0
--- /dev/null
+++ b/benchmark/vm_thread_sized_queue4.rb
@@ -0,0 +1,26 @@
+require 'thread'
+# many producers, many consumers
+nr = 1_000_000
+n = 10
+m = 10
+q = Thread::SizedQueue.new(100)
+consumers = n.times.map do
+  Thread.new do
+    while q.pop
+      # consuming
+    end
+  end
+end
+
+producers = m.times.map do
+  Thread.new do
+    while nr > 0
+      q.push true
+      nr -= 1
+    end
+  end
+end
+
+producers.each(&:join)
+n.times { q.push nil }
+consumers.each(&:join)
diff --git a/benchmark/vm_thread_sleep.yml b/benchmark/vm_thread_sleep.yml
new file mode 100644
index 0000000000..96901d8466
--- /dev/null
+++ b/benchmark/vm_thread_sleep.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm_thread_sleep: |
+    Thread.new { sleep }
+loop_count: 10_000
diff --git a/benchmark/wc.input.base b/benchmark/wc.input.base
deleted file mode 100644
index 41143fbac0..0000000000
--- a/benchmark/wc.input.base
+++ /dev/null
@@ -1,25 +0,0 @@
-Subject:      Re: Who was Izchak Miller?
-From:         "Jane D. Anonymous" <nobody@yale.edu>
-Date:         1996/04/28
-Message-Id:   <4lv7bc$oh@news.ycc.yale.edu>
-References:   <317C405E.5DFA@panix.com> <4lk6vl$gde@ns.oar.net>
-To:           75176.2330@compuserve.com
-Content-Type: text/plain; charset=us-ascii
-Organization: Yale University
-X-Url:        news:4lk6vl$gde@ns.oar.net
-Mime-Version: 1.0
-Newsgroups:   rec.games.roguelike.nethack
-X-Mailer:     Mozilla 1.1N (Macintosh; I; 68K)
-
-Hello there, Izchak Miller was my father.  When I was younger I spent 
-many a night, hunched over the keyboard with a cup of tea, playing 
-nethack with him and my brother.  my dad was a philosopher with a strong 
-weakness for fantasy/sci fi.  I remember when he started to get involved 
-with the Nethack team- my brother's Dungeons and Dragons monster book 
-found a regular place beside my dad's desk. it's nice to see him living 
-on in the game he loved so much :-).  
-                                                                  Tamar Miller
-
-The following is a really long word of 5000 characters:
-
-wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
diff --git a/bignum.c b/bignum.c
index 9c289f7a8e..4569183e45 100644
--- a/bignum.c
+++ b/bignum.c
@@ -9,42 +9,2880 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/util.h"
 #include "internal.h"
+#include "ruby/thread.h"
+#include "ruby/util.h"
+#include "id.h"
 
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #include <math.h>
 #include <float.h>
 #include <ctype.h>
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
-#include <assert.h>
+#include "ruby_assert.h"
+
+#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
+#define USE_GMP
+#include <gmp.h>
+#endif
+
+#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";
 
-static VALUE big_three = Qnil;
+#ifndef SIZEOF_BDIGIT_DBL
+# if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+#  define SIZEOF_BDIGIT_DBL SIZEOF_LONG_LONG
+# else
+#  define SIZEOF_BDIGIT_DBL SIZEOF_LONG
+# endif
+#endif
 
-#if defined __MINGW32__
-#define USHORT _USHORT
+STATIC_ASSERT(sizeof_bdigit_dbl, sizeof(BDIGIT_DBL) == SIZEOF_BDIGIT_DBL);
+STATIC_ASSERT(sizeof_bdigit_dbl_signed, sizeof(BDIGIT_DBL_SIGNED) == SIZEOF_BDIGIT_DBL);
+STATIC_ASSERT(sizeof_bdigit, SIZEOF_BDIGIT <= sizeof(BDIGIT));
+STATIC_ASSERT(sizeof_bdigit_and_dbl, SIZEOF_BDIGIT*2 <= SIZEOF_BDIGIT_DBL);
+STATIC_ASSERT(bdigit_signedness, 0 < (BDIGIT)-1);
+STATIC_ASSERT(bdigit_dbl_signedness, 0 < (BDIGIT_DBL)-1);
+STATIC_ASSERT(bdigit_dbl_signed_signedness, 0 > (BDIGIT_DBL_SIGNED)-1);
+STATIC_ASSERT(rbignum_embed_len_max, BIGNUM_EMBED_LEN_MAX <= (BIGNUM_EMBED_LEN_MASK >> BIGNUM_EMBED_LEN_SHIFT));
+
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_LONG % SIZEOF_BDIGIT == 0);
+#else
+STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGIT % SIZEOF_LONG == 0);
 #endif
 
-#define BDIGITS(x) (RBIGNUM_DIGITS(x))
-#define BITSPERDIG (SIZEOF_BDIGITS*CHAR_BIT)
+#ifdef WORDS_BIGENDIAN
+#   define HOST_BIGENDIAN_P 1
+#else
+#   define HOST_BIGENDIAN_P 0
+#endif
+/* (!LSHIFTABLE(d, n) ? 0 : (n)) is same as n but suppress a warning, C4293, by Visual Studio.  */
+#define LSHIFTABLE(d, n) ((n) < sizeof(d) * CHAR_BIT)
+#define LSHIFTX(d, n) (!LSHIFTABLE(d, n) ? 0 : ((d) << (!LSHIFTABLE(d, n) ? 0 : (n))))
+#define CLEAR_LOWBITS(d, numbits) ((d) & LSHIFTX(~((d)*0), (numbits)))
+#define FILL_LOWBITS(d, numbits) ((d) | (LSHIFTX(((d)*0+1), (numbits))-1))
+#define POW2_P(x) (((x)&((x)-1))==0)
+
+#define BDIGITS(x) (BIGNUM_DIGITS(x))
+#define BITSPERDIG (SIZEOF_BDIGIT*CHAR_BIT)
 #define BIGRAD ((BDIGIT_DBL)1 << BITSPERDIG)
 #define BIGRAD_HALF ((BDIGIT)(BIGRAD >> 1))
-#define DIGSPERLONG (SIZEOF_LONG/SIZEOF_BDIGITS)
-#if HAVE_LONG_LONG
-# define DIGSPERLL (SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
-#endif
-#define BIGUP(x) ((BDIGIT_DBL)(x) << BITSPERDIG)
+#define BDIGIT_MSB(d) (((d) & BIGRAD_HALF) != 0)
+#define BIGUP(x) LSHIFTX(((x) + (BDIGIT_DBL)0), BITSPERDIG)
 #define BIGDN(x) RSHIFT((x),BITSPERDIG)
-#define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1)))
-#define BDIGMAX ((BDIGIT)-1)
+#define BIGLO(x) ((BDIGIT)((x) & BDIGMAX))
+#define BDIGMAX ((BDIGIT)(BIGRAD-1))
+#define BDIGIT_DBL_MAX (~(BDIGIT_DBL)0)
+
+#if SIZEOF_BDIGIT == 2
+#   define swap_bdigit(x) swap16(x)
+#elif SIZEOF_BDIGIT == 4
+#   define swap_bdigit(x) swap32(x)
+#elif SIZEOF_BDIGIT == 8
+#   define swap_bdigit(x) swap64(x)
+#endif
 
-#define BIGZEROP(x) (RBIGNUM_LEN(x) == 0 || \
+#define BIGZEROP(x) (BIGNUM_LEN(x) == 0 || \
 		     (BDIGITS(x)[0] == 0 && \
-		      (RBIGNUM_LEN(x) == 1 || bigzero_p(x))))
+		      (BIGNUM_LEN(x) == 1 || bigzero_p(x))))
+#define BIGSIZE(x) (BIGNUM_LEN(x) == 0 ? (size_t)0 : \
+    BDIGITS(x)[BIGNUM_LEN(x)-1] ? \
+        (size_t)(BIGNUM_LEN(x)*SIZEOF_BDIGIT - nlz(BDIGITS(x)[BIGNUM_LEN(x)-1])/CHAR_BIT) : \
+    rb_absint_size(x, NULL))
+
+#define BIGDIVREM_EXTRA_WORDS 1
+#define bdigit_roomof(n) roomof(n, SIZEOF_BDIGIT)
+#define BARY_ARGS(ary) ary, numberof(ary)
+
+#define BARY_ADD(z, x, y) bary_add(BARY_ARGS(z), BARY_ARGS(x), BARY_ARGS(y))
+#define BARY_SUB(z, x, y) bary_sub(BARY_ARGS(z), BARY_ARGS(x), BARY_ARGS(y))
+#define BARY_SHORT_MUL(z, x, y) bary_short_mul(BARY_ARGS(z), BARY_ARGS(x), BARY_ARGS(y))
+#define BARY_DIVMOD(q, r, x, y) bary_divmod(BARY_ARGS(q), BARY_ARGS(r), BARY_ARGS(x), BARY_ARGS(y))
+#define BARY_ZERO_P(x) bary_zero_p(BARY_ARGS(x))
+
+#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 BDIGITS_ZERO(ptr, n) do { \
+  BDIGIT *bdigitz_zero_ptr = (ptr); \
+  size_t bdigitz_zero_n = (n); \
+  while (bdigitz_zero_n) { \
+    *bdigitz_zero_ptr++ = 0; \
+    bdigitz_zero_n--; \
+  } \
+} while (0)
+
+#define BARY_TRUNC(ds, n) do { \
+        while (0 < (n) && (ds)[(n)-1] == 0) \
+            (n)--; \
+    } while (0)
+
+#define KARATSUBA_BALANCED(xn, yn) ((yn)/2 < (xn))
+#define TOOM3_BALANCED(xn, yn) (((yn)+2)/3 * 2 < (xn))
+
+#define GMP_MUL_DIGITS 20
+#define KARATSUBA_MUL_DIGITS 70
+#define TOOM3_MUL_DIGITS 150
+
+#define GMP_DIV_DIGITS 20
+#define GMP_BIG2STR_DIGITS 20
+#define GMP_STR2BIG_DIGITS 20
+#ifdef USE_GMP
+# define NAIVE_MUL_DIGITS GMP_MUL_DIGITS
+#else
+# define NAIVE_MUL_DIGITS KARATSUBA_MUL_DIGITS
+#endif
+
+typedef void (mulfunc_t)(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn);
+
+static mulfunc_t bary_mul_toom3_start;
+static mulfunc_t bary_mul_karatsuba_start;
+static BDIGIT bigdivrem_single(BDIGIT *qds, const BDIGIT *xds, size_t xn, BDIGIT y);
+static void bary_divmod(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn);
+
+static VALUE bigmul0(VALUE x, VALUE y);
+static void bary_mul_toom3(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn);
+static VALUE bignew_1(VALUE klass, size_t len, int sign);
+static inline VALUE bigtrunc(VALUE x);
+
+static VALUE bigsq(VALUE x);
+static void bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp);
+static inline VALUE power_cache_get_power(int base, int power_level, size_t *numdigits_ret);
+
+#if SIZEOF_BDIGIT <= SIZEOF_INT
+static int nlz(BDIGIT x) { return nlz_int((unsigned int)x) - (SIZEOF_INT-SIZEOF_BDIGIT) * CHAR_BIT; }
+#elif SIZEOF_BDIGIT <= SIZEOF_LONG
+static int nlz(BDIGIT x) { return nlz_long((unsigned long)x) - (SIZEOF_LONG-SIZEOF_BDIGIT) * CHAR_BIT; }
+#elif SIZEOF_BDIGIT <= SIZEOF_LONG_LONG
+static int nlz(BDIGIT x) { return nlz_long_long((unsigned LONG_LONG)x) - (SIZEOF_LONG_LONG-SIZEOF_BDIGIT) * CHAR_BIT; }
+#elif SIZEOF_BDIGIT <= SIZEOF_INT128_T
+static int nlz(BDIGIT x) { return nlz_int128((uint128_t)x) - (SIZEOF_INT128_T-SIZEOF_BDIGIT) * CHAR_BIT; }
+#endif
+
+#define U16(a) ((uint16_t)(a))
+#define U32(a) ((uint32_t)(a))
+#ifdef HAVE_UINT64_T
+#define U64(a,b) (((uint64_t)(a) << 32) | (b))
+#endif
+#ifdef HAVE_UINT128_T
+#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.
+
+def big(n, bits)
+  ns = []
+  ((bits+31)/32).times {
+    ns << sprintf("0x%08x", n & 0xffff_ffff)
+    n >>= 32
+  }
+  "U#{bits}(" + ns.reverse.join(",") + ")"
+end
+def values(ary, width, indent)
+  lines = [""]
+  ary.each {|e|
+    lines << "" if !ary.last.empty? && width < (lines.last + e + ", ").length
+    lines.last << e + ", "
+  }
+  lines.map {|line| " " * indent + line.chomp(" ") + "\n" }.join
+end
+[16,32,64,128].each {|bits|
+  max = 2**bits-1
+  exps = []
+  nums = []
+  2.upto(36) {|base|
+    exp = 0
+    n = 1
+    while n * base <= max
+      exp += 1
+      n *= base
+    end
+    exps << exp.to_s
+    nums << big(n, bits)
+  }
+  puts "#ifdef HAVE_UINT#{bits}_T"
+  puts "static const int maxpow#{bits}_exp[35] = {"
+  print values(exps, 70, 4)
+  puts "};"
+  puts "static const uint#{bits}_t maxpow#{bits}_num[35] = {"
+  print values(nums, 70, 4)
+  puts "};"
+  puts "#endif"
+}
+
+ */
+
+#if SIZEOF_BDIGIT_DBL == 2
+static const int maxpow16_exp[35] = {
+    15, 10, 7, 6, 6, 5, 5, 5, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+};
+static const uint16_t maxpow16_num[35] = {
+    U16(0x00008000), U16(0x0000e6a9), U16(0x00004000), U16(0x00003d09),
+    U16(0x0000b640), U16(0x000041a7), U16(0x00008000), U16(0x0000e6a9),
+    U16(0x00002710), U16(0x00003931), U16(0x00005100), U16(0x00006f91),
+    U16(0x00009610), U16(0x0000c5c1), U16(0x00001000), U16(0x00001331),
+    U16(0x000016c8), U16(0x00001acb), U16(0x00001f40), U16(0x0000242d),
+    U16(0x00002998), U16(0x00002f87), U16(0x00003600), U16(0x00003d09),
+    U16(0x000044a8), U16(0x00004ce3), U16(0x000055c0), U16(0x00005f45),
+    U16(0x00006978), U16(0x0000745f), U16(0x00008000), U16(0x00008c61),
+    U16(0x00009988), U16(0x0000a77b), U16(0x0000b640),
+};
+#elif SIZEOF_BDIGIT_DBL == 4
+static const int maxpow32_exp[35] = {
+    31, 20, 15, 13, 12, 11, 10, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7,
+    7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+};
+static const uint32_t maxpow32_num[35] = {
+    U32(0x80000000), U32(0xcfd41b91), U32(0x40000000), U32(0x48c27395),
+    U32(0x81bf1000), U32(0x75db9c97), U32(0x40000000), U32(0xcfd41b91),
+    U32(0x3b9aca00), U32(0x8c8b6d2b), U32(0x19a10000), U32(0x309f1021),
+    U32(0x57f6c100), U32(0x98c29b81), U32(0x10000000), U32(0x18754571),
+    U32(0x247dbc80), U32(0x3547667b), U32(0x4c4b4000), U32(0x6b5a6e1d),
+    U32(0x94ace180), U32(0xcaf18367), U32(0x0b640000), U32(0x0e8d4a51),
+    U32(0x1269ae40), U32(0x17179149), U32(0x1cb91000), U32(0x23744899),
+    U32(0x2b73a840), U32(0x34e63b41), U32(0x40000000), U32(0x4cfa3cc1),
+    U32(0x5c13d840), U32(0x6d91b519), U32(0x81bf1000),
+};
+#elif SIZEOF_BDIGIT_DBL == 8 && defined HAVE_UINT64_T
+static const int maxpow64_exp[35] = {
+    63, 40, 31, 27, 24, 22, 21, 20, 19, 18, 17, 17, 16, 16, 15, 15, 15,
+    15, 14, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13, 12, 12, 12, 12, 12,
+    12,
+};
+static const uint64_t maxpow64_num[35] = {
+    U64(0x80000000,0x00000000), U64(0xa8b8b452,0x291fe821),
+    U64(0x40000000,0x00000000), U64(0x6765c793,0xfa10079d),
+    U64(0x41c21cb8,0xe1000000), U64(0x36427987,0x50226111),
+    U64(0x80000000,0x00000000), U64(0xa8b8b452,0x291fe821),
+    U64(0x8ac72304,0x89e80000), U64(0x4d28cb56,0xc33fa539),
+    U64(0x1eca170c,0x00000000), U64(0x780c7372,0x621bd74d),
+    U64(0x1e39a505,0x7d810000), U64(0x5b27ac99,0x3df97701),
+    U64(0x10000000,0x00000000), U64(0x27b95e99,0x7e21d9f1),
+    U64(0x5da0e1e5,0x3c5c8000), U64(0xd2ae3299,0xc1c4aedb),
+    U64(0x16bcc41e,0x90000000), U64(0x2d04b7fd,0xd9c0ef49),
+    U64(0x5658597b,0xcaa24000), U64(0xa0e20737,0x37609371),
+    U64(0x0c29e980,0x00000000), U64(0x14adf4b7,0x320334b9),
+    U64(0x226ed364,0x78bfa000), U64(0x383d9170,0xb85ff80b),
+    U64(0x5a3c23e3,0x9c000000), U64(0x8e651373,0x88122bcd),
+    U64(0xdd41bb36,0xd259e000), U64(0x0aee5720,0xee830681),
+    U64(0x10000000,0x00000000), U64(0x172588ad,0x4f5f0981),
+    U64(0x211e44f7,0xd02c1000), U64(0x2ee56725,0xf06e5c71),
+    U64(0x41c21cb8,0xe1000000),
+};
+#elif SIZEOF_BDIGIT_DBL == 16 && defined HAVE_UINT128_T
+static const int maxpow128_exp[35] = {
+    127, 80, 63, 55, 49, 45, 42, 40, 38, 37, 35, 34, 33, 32, 31, 31, 30,
+    30, 29, 29, 28, 28, 27, 27, 27, 26, 26, 26, 26, 25, 25, 25, 25, 24,
+    24,
+};
+static const uint128_t maxpow128_num[35] = {
+    U128(0x80000000,0x00000000,0x00000000,0x00000000),
+    U128(0x6f32f1ef,0x8b18a2bc,0x3cea5978,0x9c79d441),
+    U128(0x40000000,0x00000000,0x00000000,0x00000000),
+    U128(0xd0cf4b50,0xcfe20765,0xfff4b4e3,0xf741cf6d),
+    U128(0x6558e2a0,0x921fe069,0x42860000,0x00000000),
+    U128(0x5080c7b7,0xd0e31ba7,0x5911a67d,0xdd3d35e7),
+    U128(0x40000000,0x00000000,0x00000000,0x00000000),
+    U128(0x6f32f1ef,0x8b18a2bc,0x3cea5978,0x9c79d441),
+    U128(0x4b3b4ca8,0x5a86c47a,0x098a2240,0x00000000),
+    U128(0xffd1390a,0x0adc2fb8,0xdabbb817,0x4d95c99b),
+    U128(0x2c6fdb36,0x4c25e6c0,0x00000000,0x00000000),
+    U128(0x384bacd6,0x42c343b4,0xe90c4272,0x13506d29),
+    U128(0x31f5db32,0xa34aced6,0x0bf13a0e,0x00000000),
+    U128(0x20753ada,0xfd1e839f,0x53686d01,0x3143ee01),
+    U128(0x10000000,0x00000000,0x00000000,0x00000000),
+    U128(0x68ca11d6,0xb4f6d1d1,0xfaa82667,0x8073c2f1),
+    U128(0x223e493b,0xb3bb69ff,0xa4b87d6c,0x40000000),
+    U128(0xad62418d,0x14ea8247,0x01c4b488,0x6cc66f59),
+    U128(0x2863c1f5,0xcdae42f9,0x54000000,0x00000000),
+    U128(0xa63fd833,0xb9386b07,0x36039e82,0xbe651b25),
+    U128(0x1d1f7a9c,0xd087a14d,0x28cdf3d5,0x10000000),
+    U128(0x651b5095,0xc2ea8fc1,0xb30e2c57,0x77aaf7e1),
+    U128(0x0ddef20e,0xff760000,0x00000000,0x00000000),
+    U128(0x29c30f10,0x29939b14,0x6664242d,0x97d9f649),
+    U128(0x786a435a,0xe9558b0e,0x6aaf6d63,0xa8000000),
+    U128(0x0c5afe6f,0xf302bcbf,0x94fd9829,0xd87f5079),
+    U128(0x1fce575c,0xe1692706,0x07100000,0x00000000),
+    U128(0x4f34497c,0x8597e144,0x36e91802,0x00528229),
+    U128(0xbf3a8e1d,0x41ef2170,0x7802130d,0x84000000),
+    U128(0x0e7819e1,0x7f1eb0fb,0x6ee4fb89,0x01d9531f),
+    U128(0x20000000,0x00000000,0x00000000,0x00000000),
+    U128(0x4510460d,0xd9e879c0,0x14a82375,0x2f22b321),
+    U128(0x91abce3c,0x4b4117ad,0xe76d35db,0x22000000),
+    U128(0x08973ea3,0x55d75bc2,0x2e42c391,0x727d69e1),
+    U128(0x10e425c5,0x6daffabc,0x35c10000,0x00000000),
+};
+#endif
+
+static BDIGIT_DBL
+maxpow_in_bdigit_dbl(int base, int *exp_ret)
+{
+    BDIGIT_DBL maxpow;
+    int exponent;
+
+    assert(2 <= base && base <= 36);
+
+    {
+#if SIZEOF_BDIGIT_DBL == 2
+        maxpow = maxpow16_num[base-2];
+        exponent = maxpow16_exp[base-2];
+#elif SIZEOF_BDIGIT_DBL == 4
+        maxpow = maxpow32_num[base-2];
+        exponent = maxpow32_exp[base-2];
+#elif SIZEOF_BDIGIT_DBL == 8 && defined HAVE_UINT64_T
+        maxpow = maxpow64_num[base-2];
+        exponent = maxpow64_exp[base-2];
+#elif SIZEOF_BDIGIT_DBL == 16 && defined HAVE_UINT128_T
+        maxpow = maxpow128_num[base-2];
+        exponent = maxpow128_exp[base-2];
+#else
+        maxpow = base;
+        exponent = 1;
+        while (maxpow <= BDIGIT_DBL_MAX / base) {
+            maxpow *= base;
+            exponent++;
+        }
+#endif
+    }
+
+    *exp_ret = exponent;
+    return maxpow;
+}
+
+static inline BDIGIT_DBL
+bary2bdigitdbl(const BDIGIT *ds, size_t n)
+{
+    assert(n <= 2);
+
+    if (n == 2)
+        return ds[0] | BIGUP(ds[1]);
+    if (n == 1)
+        return ds[0];
+    return 0;
+}
+
+static inline void
+bdigitdbl2bary(BDIGIT *ds, size_t n, BDIGIT_DBL num)
+{
+    assert(n == 2);
+
+    ds[0] = BIGLO(num);
+    ds[1] = (BDIGIT)BIGDN(num);
+}
+
+static int
+bary_cmp(const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    size_t i;
+    BARY_TRUNC(xds, xn);
+    BARY_TRUNC(yds, yn);
+
+    if (xn < yn)
+        return -1;
+    if (xn > yn)
+        return 1;
+
+    for (i = 0; i < xn; i++)
+        if (xds[xn - i - 1] != yds[yn - i - 1])
+            break;
+    if (i == xn)
+        return 0;
+    return xds[xn - i - 1] < yds[yn - i - 1] ? -1 : 1;
+}
+
+static BDIGIT
+bary_small_lshift(BDIGIT *zds, const BDIGIT *xds, size_t n, int shift)
+{
+    size_t i;
+    BDIGIT_DBL num = 0;
+    assert(0 <= shift && shift < BITSPERDIG);
+
+    for (i=0; i<n; i++) {
+	num = num | (BDIGIT_DBL)*xds++ << shift;
+	*zds++ = BIGLO(num);
+	num = BIGDN(num);
+    }
+    return BIGLO(num);
+}
+
+static void
+bary_small_rshift(BDIGIT *zds, const BDIGIT *xds, size_t n, int shift, BDIGIT higher_bdigit)
+{
+    size_t i;
+    BDIGIT_DBL num = 0;
+
+    assert(0 <= shift && shift < BITSPERDIG);
+
+    num = BIGUP(higher_bdigit);
+    for (i = 0; i < n; i++) {
+        BDIGIT x = xds[n - i - 1];
+	num = (num | x) >> shift;
+        zds[n - i - 1] = BIGLO(num);
+	num = BIGUP(x);
+    }
+}
+
+static int
+bary_zero_p(const BDIGIT *xds, size_t xn)
+{
+    if (xn == 0)
+        return 1;
+    do {
+	if (xds[--xn]) return 0;
+    } while (xn);
+    return 1;
+}
+
+static void
+bary_neg(BDIGIT *ds, size_t n)
+{
+    size_t i;
+    for (i = 0; i < n; i++)
+        ds[n - i - 1] = BIGLO(~ds[n - i - 1]);
+}
+
+static int
+bary_2comp(BDIGIT *ds, size_t n)
+{
+    size_t i;
+    i = 0;
+    for (i = 0; i < n; i++) {
+        if (ds[i] != 0) {
+            goto non_zero;
+        }
+    }
+    return 1;
+
+  non_zero:
+    ds[i] = BIGLO(~ds[i] + 1);
+    i++;
+    for (; i < n; i++) {
+        ds[i] = BIGLO(~ds[i]);
+    }
+    return 0;
+}
+
+static void
+bary_swap(BDIGIT *ds, size_t num_bdigits)
+{
+    BDIGIT *p1 = ds;
+    BDIGIT *p2 = ds + num_bdigits - 1;
+    for (; p1 < p2; p1++, p2--) {
+        BDIGIT tmp = *p1;
+        *p1 = *p2;
+        *p2 = tmp;
+    }
+}
+
+#define INTEGER_PACK_WORDORDER_MASK \
+    (INTEGER_PACK_MSWORD_FIRST | \
+     INTEGER_PACK_LSWORD_FIRST)
+#define INTEGER_PACK_BYTEORDER_MASK \
+    (INTEGER_PACK_MSBYTE_FIRST | \
+     INTEGER_PACK_LSBYTE_FIRST | \
+     INTEGER_PACK_NATIVE_BYTE_ORDER)
+
+static void
+validate_integer_pack_format(size_t numwords, size_t wordsize, size_t nails, int flags, int supported_flags)
+{
+    int wordorder_bits = flags & INTEGER_PACK_WORDORDER_MASK;
+    int byteorder_bits = flags & INTEGER_PACK_BYTEORDER_MASK;
+
+    if (flags & ~supported_flags) {
+        rb_raise(rb_eArgError, "unsupported flags specified");
+    }
+    if (wordorder_bits == 0) {
+        if (1 < numwords)
+            rb_raise(rb_eArgError, "word order not specified");
+    }
+    else if (wordorder_bits != INTEGER_PACK_MSWORD_FIRST &&
+        wordorder_bits != INTEGER_PACK_LSWORD_FIRST)
+        rb_raise(rb_eArgError, "unexpected word order");
+    if (byteorder_bits == 0) {
+        rb_raise(rb_eArgError, "byte order not specified");
+    }
+    else if (byteorder_bits != INTEGER_PACK_MSBYTE_FIRST &&
+        byteorder_bits != INTEGER_PACK_LSBYTE_FIRST &&
+        byteorder_bits != INTEGER_PACK_NATIVE_BYTE_ORDER)
+        rb_raise(rb_eArgError, "unexpected byte order");
+    if (wordsize == 0)
+        rb_raise(rb_eArgError, "invalid wordsize: %"PRI_SIZE_PREFIX"u", wordsize);
+    if (SSIZE_MAX < wordsize)
+        rb_raise(rb_eArgError, "too big wordsize: %"PRI_SIZE_PREFIX"u", wordsize);
+    if (wordsize <= nails / CHAR_BIT)
+        rb_raise(rb_eArgError, "too big nails: %"PRI_SIZE_PREFIX"u", nails);
+    if (SIZE_MAX / wordsize < numwords)
+        rb_raise(rb_eArgError, "too big numwords * wordsize: %"PRI_SIZE_PREFIX"u * %"PRI_SIZE_PREFIX"u", numwords, wordsize);
+}
+
+static void
+integer_pack_loop_setup(
+    size_t numwords, size_t wordsize, size_t nails, int flags,
+    size_t *word_num_fullbytes_ret,
+    int *word_num_partialbits_ret,
+    size_t *word_start_ret,
+    ssize_t *word_step_ret,
+    size_t *word_last_ret,
+    size_t *byte_start_ret,
+    int *byte_step_ret)
+{
+    int wordorder_bits = flags & INTEGER_PACK_WORDORDER_MASK;
+    int byteorder_bits = flags & INTEGER_PACK_BYTEORDER_MASK;
+    size_t word_num_fullbytes;
+    int word_num_partialbits;
+    size_t word_start;
+    ssize_t word_step;
+    size_t word_last;
+    size_t byte_start;
+    int byte_step;
+
+    word_num_partialbits = CHAR_BIT - (int)(nails % CHAR_BIT);
+    if (word_num_partialbits == CHAR_BIT)
+        word_num_partialbits = 0;
+    word_num_fullbytes = wordsize - (nails / CHAR_BIT);
+    if (word_num_partialbits != 0) {
+        word_num_fullbytes--;
+    }
+
+    if (wordorder_bits == INTEGER_PACK_MSWORD_FIRST) {
+        word_start = wordsize*(numwords-1);
+        word_step = -(ssize_t)wordsize;
+        word_last = 0;
+    }
+    else {
+        word_start = 0;
+        word_step = wordsize;
+        word_last = wordsize*(numwords-1);
+    }
+
+    if (byteorder_bits == INTEGER_PACK_NATIVE_BYTE_ORDER) {
+#ifdef WORDS_BIGENDIAN
+        byteorder_bits = INTEGER_PACK_MSBYTE_FIRST;
+#else
+        byteorder_bits = INTEGER_PACK_LSBYTE_FIRST;
+#endif
+    }
+    if (byteorder_bits == INTEGER_PACK_MSBYTE_FIRST) {
+        byte_start = wordsize-1;
+        byte_step = -1;
+    }
+    else {
+        byte_start = 0;
+        byte_step = 1;
+    }
+
+    *word_num_partialbits_ret = word_num_partialbits;
+    *word_num_fullbytes_ret = word_num_fullbytes;
+    *word_start_ret = word_start;
+    *word_step_ret = word_step;
+    *word_last_ret = word_last;
+    *byte_start_ret = byte_start;
+    *byte_step_ret = byte_step;
+}
+
+static inline void
+integer_pack_fill_dd(BDIGIT **dpp, BDIGIT **dep, BDIGIT_DBL *ddp, int *numbits_in_dd_p)
+{
+    if (*dpp < *dep && BITSPERDIG <= (int)sizeof(*ddp) * CHAR_BIT - *numbits_in_dd_p) {
+        *ddp |= (BDIGIT_DBL)(*(*dpp)++) << *numbits_in_dd_p;
+        *numbits_in_dd_p += BITSPERDIG;
+    }
+    else if (*dpp == *dep) {
+        /* higher bits are infinity zeros */
+        *numbits_in_dd_p = (int)sizeof(*ddp) * CHAR_BIT;
+    }
+}
+
+static inline BDIGIT_DBL
+integer_pack_take_lowbits(int n, BDIGIT_DBL *ddp, int *numbits_in_dd_p)
+{
+    BDIGIT_DBL ret;
+    ret = (*ddp) & (((BDIGIT_DBL)1 << n) - 1);
+    *ddp >>= n;
+    *numbits_in_dd_p -= n;
+    return ret;
+}
+
+#if !defined(WORDS_BIGENDIAN)
+static int
+bytes_2comp(unsigned char *buf, size_t len)
+{
+    size_t i;
+    for (i = 0; i < len; i++) {
+        signed char c = buf[i];
+        signed int d = ~c;
+        unsigned int e = d & 0xFF;
+        buf[i] = e;
+    }
+    for (i = 0; i < len; i++) {
+        buf[i]++;
+        if (buf[i] != 0)
+            return 0;
+    }
+    return 1;
+}
+#endif
+
+static int
+bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords, size_t wordsize, size_t nails, int flags)
+{
+    BDIGIT *dp, *de;
+    unsigned char *buf, *bufend;
+
+    dp = ds;
+    de = ds + num_bdigits;
+
+    validate_integer_pack_format(numwords, wordsize, nails, flags,
+            INTEGER_PACK_MSWORD_FIRST|
+            INTEGER_PACK_LSWORD_FIRST|
+            INTEGER_PACK_MSBYTE_FIRST|
+            INTEGER_PACK_LSBYTE_FIRST|
+            INTEGER_PACK_NATIVE_BYTE_ORDER|
+            INTEGER_PACK_2COMP|
+            INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION);
+
+    while (dp < de && de[-1] == 0)
+        de--;
+    if (dp == de) {
+        sign = 0;
+    }
+
+    if (!(flags & INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION)) {
+        if (sign == 0) {
+            MEMZERO(words, unsigned char, numwords * wordsize);
+            return 0;
+        }
+        if (nails == 0 && numwords == 1) {
+            int need_swap = wordsize != 1 &&
+                (flags & INTEGER_PACK_BYTEORDER_MASK) != INTEGER_PACK_NATIVE_BYTE_ORDER &&
+                ((flags & INTEGER_PACK_MSBYTE_FIRST) ? !HOST_BIGENDIAN_P : HOST_BIGENDIAN_P);
+            if (0 < sign || !(flags & INTEGER_PACK_2COMP)) {
+                BDIGIT d;
+                if (wordsize == 1) {
+                    *((unsigned char *)words) = (unsigned char)(d = dp[0]);
+                    return ((1 < de - dp || CLEAR_LOWBITS(d, 8) != 0) ? 2 : 1) * sign;
+                }
+#if defined(HAVE_UINT16_T) && 2 <= SIZEOF_BDIGIT
+                if (wordsize == 2 && (uintptr_t)words % RUBY_ALIGNOF(uint16_t) == 0) {
+                    uint16_t u = (uint16_t)(d = dp[0]);
+                    if (need_swap) u = swap16(u);
+                    *((uint16_t *)words) = u;
+                    return ((1 < de - dp || CLEAR_LOWBITS(d, 16) != 0) ? 2 : 1) * sign;
+                }
+#endif
+#if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGIT
+                if (wordsize == 4 && (uintptr_t)words % RUBY_ALIGNOF(uint32_t) == 0) {
+                    uint32_t u = (uint32_t)(d = dp[0]);
+                    if (need_swap) u = swap32(u);
+                    *((uint32_t *)words) = u;
+                    return ((1 < de - dp || CLEAR_LOWBITS(d, 32) != 0) ? 2 : 1) * sign;
+                }
+#endif
+#if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGIT
+                if (wordsize == 8 && (uintptr_t)words % RUBY_ALIGNOF(uint64_t) == 0) {
+                    uint64_t u = (uint64_t)(d = dp[0]);
+                    if (need_swap) u = swap64(u);
+                    *((uint64_t *)words) = u;
+                    return ((1 < de - dp || CLEAR_LOWBITS(d, 64) != 0) ? 2 : 1) * sign;
+                }
+#endif
+            }
+            else { /* sign < 0 && (flags & INTEGER_PACK_2COMP) */
+                BDIGIT_DBL_SIGNED d;
+                if (wordsize == 1) {
+                    *((unsigned char *)words) = (unsigned char)(d = -(BDIGIT_DBL_SIGNED)dp[0]);
+                    return (1 < de - dp || FILL_LOWBITS(d, 8) != -1) ? -2 : -1;
+                }
+#if defined(HAVE_UINT16_T) && 2 <= SIZEOF_BDIGIT
+                if (wordsize == 2 && (uintptr_t)words % RUBY_ALIGNOF(uint16_t) == 0) {
+                    uint16_t u = (uint16_t)(d = -(BDIGIT_DBL_SIGNED)dp[0]);
+                    if (need_swap) u = swap16(u);
+                    *((uint16_t *)words) = u;
+                    return (wordsize == SIZEOF_BDIGIT && de - dp == 2 && dp[1] == 1 && dp[0] == 0) ? -1 :
+                        (1 < de - dp || FILL_LOWBITS(d, 16) != -1) ? -2 : -1;
+                }
+#endif
+#if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGIT
+                if (wordsize == 4 && (uintptr_t)words % RUBY_ALIGNOF(uint32_t) == 0) {
+                    uint32_t u = (uint32_t)(d = -(BDIGIT_DBL_SIGNED)dp[0]);
+                    if (need_swap) u = swap32(u);
+                    *((uint32_t *)words) = u;
+                    return (wordsize == SIZEOF_BDIGIT && de - dp == 2 && dp[1] == 1 && dp[0] == 0) ? -1 :
+                        (1 < de - dp || FILL_LOWBITS(d, 32) != -1) ? -2 : -1;
+                }
+#endif
+#if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGIT
+                if (wordsize == 8 && (uintptr_t)words % RUBY_ALIGNOF(uint64_t) == 0) {
+                    uint64_t u = (uint64_t)(d = -(BDIGIT_DBL_SIGNED)dp[0]);
+                    if (need_swap) u = swap64(u);
+                    *((uint64_t *)words) = u;
+                    return (wordsize == SIZEOF_BDIGIT && de - dp == 2 && dp[1] == 1 && dp[0] == 0) ? -1 :
+                        (1 < de - dp || FILL_LOWBITS(d, 64) != -1) ? -2 : -1;
+                }
+#endif
+            }
+        }
+#if !defined(WORDS_BIGENDIAN)
+        if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
+            (flags & INTEGER_PACK_WORDORDER_MASK) == INTEGER_PACK_LSWORD_FIRST &&
+            (flags & INTEGER_PACK_BYTEORDER_MASK) != INTEGER_PACK_MSBYTE_FIRST) {
+            size_t src_size = (de - dp) * SIZEOF_BDIGIT;
+            size_t dst_size = numwords * wordsize;
+            int overflow = 0;
+            while (0 < src_size && ((unsigned char *)ds)[src_size-1] == 0)
+                src_size--;
+            if (src_size <= dst_size) {
+                MEMCPY(words, dp, char, src_size);
+                MEMZERO((char*)words + src_size, char, dst_size - src_size);
+            }
+            else {
+                MEMCPY(words, dp, char, dst_size);
+                overflow = 1;
+            }
+            if (sign < 0 && (flags & INTEGER_PACK_2COMP)) {
+                int zero_p = bytes_2comp(words, dst_size);
+                if (zero_p && overflow) {
+                    unsigned char *p = (unsigned char *)dp;
+                    if (dst_size == src_size-1 &&
+                        p[dst_size] == 1) {
+                        overflow = 0;
+                    }
+                }
+            }
+            if (overflow)
+                sign *= 2;
+            return sign;
+        }
+#endif
+        if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
+            wordsize % SIZEOF_BDIGIT == 0 && (uintptr_t)words % RUBY_ALIGNOF(BDIGIT) == 0) {
+            size_t bdigits_per_word = wordsize / SIZEOF_BDIGIT;
+            size_t src_num_bdigits = de - dp;
+            size_t dst_num_bdigits = numwords * bdigits_per_word;
+            int overflow = 0;
+            int mswordfirst_p = (flags & INTEGER_PACK_MSWORD_FIRST) != 0;
+            int msbytefirst_p = (flags & INTEGER_PACK_NATIVE_BYTE_ORDER) ? HOST_BIGENDIAN_P :
+                (flags & INTEGER_PACK_MSBYTE_FIRST) != 0;
+            if (src_num_bdigits <= dst_num_bdigits) {
+                MEMCPY(words, dp, BDIGIT, src_num_bdigits);
+                BDIGITS_ZERO((BDIGIT*)words + src_num_bdigits, dst_num_bdigits - src_num_bdigits);
+            }
+            else {
+                MEMCPY(words, dp, BDIGIT, dst_num_bdigits);
+                overflow = 1;
+            }
+            if (sign < 0 && (flags & INTEGER_PACK_2COMP)) {
+                int zero_p = bary_2comp(words, dst_num_bdigits);
+                if (zero_p && overflow &&
+                    dst_num_bdigits == src_num_bdigits-1 &&
+                    dp[dst_num_bdigits] == 1)
+                    overflow = 0;
+            }
+            if (msbytefirst_p != HOST_BIGENDIAN_P) {
+                size_t i;
+                for (i = 0; i < dst_num_bdigits; i++) {
+                    BDIGIT d = ((BDIGIT*)words)[i];
+                    ((BDIGIT*)words)[i] = swap_bdigit(d);
+                }
+            }
+            if (mswordfirst_p ? !msbytefirst_p : msbytefirst_p) {
+                size_t i;
+                BDIGIT *p = words;
+                for (i = 0; i < numwords; i++) {
+                    bary_swap(p, bdigits_per_word);
+                    p += bdigits_per_word;
+                }
+            }
+            if (mswordfirst_p) {
+                bary_swap(words, dst_num_bdigits);
+            }
+            if (overflow)
+                sign *= 2;
+            return sign;
+        }
+    }
+
+    buf = words;
+    bufend = buf + numwords * wordsize;
+
+    if (buf == bufend) {
+        /* overflow if non-zero*/
+        if (!(flags & INTEGER_PACK_2COMP) || 0 <= sign)
+            sign *= 2;
+        else {
+            if (de - dp == 1 && dp[0] == 1)
+                sign = -1; /* val == -1 == -2**(numwords*(wordsize*CHAR_BIT-nails)) */
+            else
+                sign = -2; /* val < -1 == -2**(numwords*(wordsize*CHAR_BIT-nails)) */
+        }
+    }
+    else if (dp == de) {
+        memset(buf, '\0', bufend - buf);
+    }
+    else if (dp < de && buf < bufend) {
+        int word_num_partialbits;
+        size_t word_num_fullbytes;
+
+        ssize_t word_step;
+        size_t byte_start;
+        int byte_step;
+
+        size_t word_start, word_last;
+        unsigned char *wordp, *last_wordp;
+        BDIGIT_DBL dd;
+        int numbits_in_dd;
+
+        integer_pack_loop_setup(numwords, wordsize, nails, flags,
+            &word_num_fullbytes, &word_num_partialbits,
+            &word_start, &word_step, &word_last, &byte_start, &byte_step);
+
+        wordp = buf + word_start;
+        last_wordp = buf + word_last;
+
+        dd = 0;
+        numbits_in_dd = 0;
+
+#define FILL_DD \
+    integer_pack_fill_dd(&dp, &de, &dd, &numbits_in_dd)
+#define TAKE_LOWBITS(n) \
+    integer_pack_take_lowbits(n, &dd, &numbits_in_dd)
+
+        while (1) {
+            size_t index_in_word = 0;
+            unsigned char *bytep = wordp + byte_start;
+            while (index_in_word < word_num_fullbytes) {
+                FILL_DD;
+                *bytep = TAKE_LOWBITS(CHAR_BIT);
+                bytep += byte_step;
+                index_in_word++;
+            }
+            if (word_num_partialbits) {
+                FILL_DD;
+                *bytep = TAKE_LOWBITS(word_num_partialbits);
+                bytep += byte_step;
+                index_in_word++;
+            }
+            while (index_in_word < wordsize) {
+                *bytep = 0;
+                bytep += byte_step;
+                index_in_word++;
+            }
+
+            if (wordp == last_wordp)
+                break;
+
+            wordp += word_step;
+        }
+        FILL_DD;
+        /* overflow tests */
+        if (dp != de || 1 < dd) {
+            /* 2**(numwords*(wordsize*CHAR_BIT-nails)+1) <= abs(val) */
+            sign *= 2;
+        }
+        else if (dd == 1) {
+            /* 2**(numwords*(wordsize*CHAR_BIT-nails)) <= abs(val) < 2**(numwords*(wordsize*CHAR_BIT-nails)+1) */
+            if (!(flags & INTEGER_PACK_2COMP) || 0 <= sign)
+                sign *= 2;
+            else { /* overflow_2comp && sign == -1 */
+                /* test lower bits are all zero. */
+                dp = ds;
+                while (dp < de && *dp == 0)
+                    dp++;
+                if (de - dp == 1 && /* only one non-zero word. */
+                    POW2_P(*dp)) /* *dp contains only one bit set. */
+                    sign = -1; /* val == -2**(numwords*(wordsize*CHAR_BIT-nails)) */
+                else
+                    sign = -2; /* val < -2**(numwords*(wordsize*CHAR_BIT-nails)) */
+            }
+        }
+    }
+
+    if ((flags & INTEGER_PACK_2COMP) && (sign < 0 && numwords != 0)) {
+        int word_num_partialbits;
+        size_t word_num_fullbytes;
+
+        ssize_t word_step;
+        size_t byte_start;
+        int byte_step;
+
+        size_t word_start, word_last;
+        unsigned char *wordp, *last_wordp;
+
+        unsigned int partialbits_mask;
+        int carry;
+
+        integer_pack_loop_setup(numwords, wordsize, nails, flags,
+            &word_num_fullbytes, &word_num_partialbits,
+            &word_start, &word_step, &word_last, &byte_start, &byte_step);
+
+        partialbits_mask = (1 << word_num_partialbits) - 1;
+
+        buf = words;
+        wordp = buf + word_start;
+        last_wordp = buf + word_last;
+
+        carry = 1;
+        while (1) {
+            size_t index_in_word = 0;
+            unsigned char *bytep = wordp + byte_start;
+            while (index_in_word < word_num_fullbytes) {
+                carry += (unsigned char)~*bytep;
+                *bytep = (unsigned char)carry;
+                carry >>= CHAR_BIT;
+                bytep += byte_step;
+                index_in_word++;
+            }
+            if (word_num_partialbits) {
+                carry += (*bytep & partialbits_mask) ^ partialbits_mask;
+                *bytep = carry & partialbits_mask;
+                carry >>= word_num_partialbits;
+                bytep += byte_step;
+                index_in_word++;
+            }
+
+            if (wordp == last_wordp)
+                break;
+
+            wordp += word_step;
+        }
+    }
+
+    return sign;
+#undef FILL_DD
+#undef TAKE_LOWBITS
+}
+
+static size_t
+integer_unpack_num_bdigits_small(size_t numwords, size_t wordsize, size_t nails, int *nlp_bits_ret)
+{
+    /* nlp_bits stands for number of leading padding bits */
+    size_t num_bits = (wordsize * CHAR_BIT - nails) * numwords;
+    size_t num_bdigits = (num_bits + BITSPERDIG - 1) / BITSPERDIG;
+    *nlp_bits_ret = (int)(num_bdigits * BITSPERDIG - num_bits);
+    return num_bdigits;
+}
+
+static size_t
+integer_unpack_num_bdigits_generic(size_t numwords, size_t wordsize, size_t nails, int *nlp_bits_ret)
+{
+    /* BITSPERDIG = SIZEOF_BDIGIT * CHAR_BIT */
+    /* num_bits = (wordsize * CHAR_BIT - nails) * numwords */
+    /* num_bdigits = (num_bits + BITSPERDIG - 1) / BITSPERDIG */
+
+    /* num_bits = CHAR_BIT * (wordsize * numwords) - nails * numwords = CHAR_BIT * num_bytes1 - nails * numwords */
+    size_t num_bytes1 = wordsize * numwords;
+
+    /* q1 * CHAR_BIT + r1 = numwords */
+    size_t q1 = numwords / CHAR_BIT;
+    size_t r1 = numwords % CHAR_BIT;
+
+    /* num_bits = CHAR_BIT * num_bytes1 - nails * (q1 * CHAR_BIT + r1) = CHAR_BIT * num_bytes2 - nails * r1 */
+    size_t num_bytes2 = num_bytes1 - nails * q1;
+
+    /* q2 * CHAR_BIT + r2 = nails */
+    size_t q2 = nails / CHAR_BIT;
+    size_t r2 = nails % CHAR_BIT;
+
+    /* num_bits = CHAR_BIT * num_bytes2 - (q2 * CHAR_BIT + r2) * r1 = CHAR_BIT * num_bytes3 - r1 * r2 */
+    size_t num_bytes3 = num_bytes2 - q2 * r1;
+
+    /* q3 * BITSPERDIG + r3 = num_bytes3 */
+    size_t q3 = num_bytes3 / BITSPERDIG;
+    size_t r3 = num_bytes3 % BITSPERDIG;
+
+    /* num_bits = CHAR_BIT * (q3 * BITSPERDIG + r3) - r1 * r2 = BITSPERDIG * num_digits1 + CHAR_BIT * r3 - r1 * r2 */
+    size_t num_digits1 = CHAR_BIT * q3;
+
+    /*
+     * if CHAR_BIT * r3 >= r1 * r2
+     *   CHAR_BIT * r3 - r1 * r2 = CHAR_BIT * BITSPERDIG - (CHAR_BIT * BITSPERDIG - (CHAR_BIT * r3 - r1 * r2))
+     *   q4 * BITSPERDIG + r4 = CHAR_BIT * BITSPERDIG - (CHAR_BIT * r3 - r1 * r2)
+     *   num_bits = BITSPERDIG * num_digits1 + CHAR_BIT * BITSPERDIG - (q4 * BITSPERDIG + r4) = BITSPERDIG * num_digits2 - r4
+     * else
+     *   q4 * BITSPERDIG + r4 = -(CHAR_BIT * r3 - r1 * r2)
+     *   num_bits = BITSPERDIG * num_digits1 - (q4 * BITSPERDIG + r4) = BITSPERDIG * num_digits2 - r4
+     * end
+     */
+
+    if (CHAR_BIT * r3 >= r1 * r2) {
+        size_t tmp1 = CHAR_BIT * BITSPERDIG - (CHAR_BIT * r3 - r1 * r2);
+        size_t q4 = tmp1 / BITSPERDIG;
+        int r4 = (int)(tmp1 % BITSPERDIG);
+        size_t num_digits2 = num_digits1 + CHAR_BIT - q4;
+        *nlp_bits_ret = r4;
+        return num_digits2;
+    }
+    else {
+        size_t tmp1 = r1 * r2 - CHAR_BIT * r3;
+        size_t q4 = tmp1 / BITSPERDIG;
+        int r4 = (int)(tmp1 % BITSPERDIG);
+        size_t num_digits2 = num_digits1 - q4;
+        *nlp_bits_ret = r4;
+        return num_digits2;
+    }
+}
+
+static size_t
+integer_unpack_num_bdigits(size_t numwords, size_t wordsize, size_t nails, int *nlp_bits_ret)
+{
+    size_t num_bdigits;
+
+    if (numwords <= (SIZE_MAX - (BITSPERDIG-1)) / CHAR_BIT / wordsize) {
+        num_bdigits = integer_unpack_num_bdigits_small(numwords, wordsize, nails, nlp_bits_ret);
+#ifdef DEBUG_INTEGER_PACK
+        {
+            int nlp_bits1;
+            size_t num_bdigits1 = integer_unpack_num_bdigits_generic(numwords, wordsize, nails, &nlp_bits1);
+            assert(num_bdigits == num_bdigits1);
+            assert(*nlp_bits_ret == nlp_bits1);
+        }
+#endif
+    }
+    else {
+        num_bdigits = integer_unpack_num_bdigits_generic(numwords, wordsize, nails, nlp_bits_ret);
+    }
+    return num_bdigits;
+}
+
+static inline void
+integer_unpack_push_bits(int data, int numbits, BDIGIT_DBL *ddp, int *numbits_in_dd_p, BDIGIT **dpp)
+{
+    (*ddp) |= ((BDIGIT_DBL)data) << (*numbits_in_dd_p);
+    *numbits_in_dd_p += numbits;
+    while (BITSPERDIG <= *numbits_in_dd_p) {
+        *(*dpp)++ = BIGLO(*ddp);
+        *ddp = BIGDN(*ddp);
+        *numbits_in_dd_p -= BITSPERDIG;
+    }
+}
+
+static int
+integer_unpack_single_bdigit(BDIGIT u, size_t size, int flags, BDIGIT *dp)
+{
+    int sign;
+    if (flags & INTEGER_PACK_2COMP) {
+        sign = (flags & INTEGER_PACK_NEGATIVE) ?
+            ((size == SIZEOF_BDIGIT && u == 0) ? -2 : -1) :
+            ((u >> (size * CHAR_BIT - 1)) ? -1 : 1);
+        if (sign < 0) {
+            u |= LSHIFTX(BDIGMAX, size * CHAR_BIT);
+            u = BIGLO(1 + ~u);
+        }
+    }
+    else
+        sign = (flags & INTEGER_PACK_NEGATIVE) ? -1 : 1;
+    *dp = u;
+    return sign;
+}
+
+#ifdef HAVE_BUILTIN___BUILTIN_ASSUME_ALIGNED
+#define reinterpret_cast(type, value) (type) \
+    __builtin_assume_aligned((value), sizeof(*(type)NULL));
+#else
+#define reinterpret_cast(type, value) (type)value
+#endif
+
+static int
+bary_unpack_internal(BDIGIT *bdigits, size_t num_bdigits, const void *words, size_t numwords, size_t wordsize, size_t nails, int flags, int nlp_bits)
+{
+    int sign;
+    const unsigned char *buf = words;
+    BDIGIT *dp;
+    BDIGIT *de;
+
+    dp = bdigits;
+    de = dp + num_bdigits;
+
+    if (!(flags & INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION)) {
+        if (nails == 0 && numwords == 1) {
+            int need_swap = wordsize != 1 &&
+                (flags & INTEGER_PACK_BYTEORDER_MASK) != INTEGER_PACK_NATIVE_BYTE_ORDER &&
+                ((flags & INTEGER_PACK_MSBYTE_FIRST) ? !HOST_BIGENDIAN_P : HOST_BIGENDIAN_P);
+            if (wordsize == 1) {
+                return integer_unpack_single_bdigit(*(uint8_t *)buf, sizeof(uint8_t), flags, dp);
+            }
+#if defined(HAVE_UINT16_T) && 2 <= SIZEOF_BDIGIT
+            if (wordsize == 2 && (uintptr_t)words % RUBY_ALIGNOF(uint16_t) == 0) {
+                uint16_t u = *reinterpret_cast(const uint16_t *, buf);
+                return integer_unpack_single_bdigit(need_swap ? swap16(u) : u, sizeof(uint16_t), flags, dp);
+            }
+#endif
+#if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGIT
+            if (wordsize == 4 && (uintptr_t)words % RUBY_ALIGNOF(uint32_t) == 0) {
+                uint32_t u = *reinterpret_cast(const uint32_t *, buf);
+                return integer_unpack_single_bdigit(need_swap ? swap32(u) : u, sizeof(uint32_t), flags, dp);
+            }
+#endif
+#if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGIT
+            if (wordsize == 8 && (uintptr_t)words % RUBY_ALIGNOF(uint64_t) == 0) {
+                uint64_t u = *reinterpret_cast(const uint64_t *, buf);
+                return integer_unpack_single_bdigit(need_swap ? swap64(u) : u, sizeof(uint64_t), flags, dp);
+            }
+#endif
+#undef reinterpret_cast
+        }
+#if !defined(WORDS_BIGENDIAN)
+        if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
+            (flags & INTEGER_PACK_WORDORDER_MASK) == INTEGER_PACK_LSWORD_FIRST &&
+            (flags & INTEGER_PACK_BYTEORDER_MASK) != INTEGER_PACK_MSBYTE_FIRST) {
+            size_t src_size = numwords * wordsize;
+            size_t dst_size = num_bdigits * SIZEOF_BDIGIT;
+            MEMCPY(dp, words, char, src_size);
+            if (flags & INTEGER_PACK_2COMP) {
+                if (flags & INTEGER_PACK_NEGATIVE) {
+                    int zero_p;
+                    memset((char*)dp + src_size, 0xff, dst_size - src_size);
+                    zero_p = bary_2comp(dp, num_bdigits);
+                    sign = zero_p ? -2 : -1;
+                }
+                else if (buf[src_size-1] >> (CHAR_BIT-1)) {
+                    memset((char*)dp + src_size, 0xff, dst_size - src_size);
+                    bary_2comp(dp, num_bdigits);
+                    sign = -1;
+                }
+                else {
+                    MEMZERO((char*)dp + src_size, char, dst_size - src_size);
+                    sign = 1;
+                }
+            }
+            else {
+                MEMZERO((char*)dp + src_size, char, dst_size - src_size);
+                sign = (flags & INTEGER_PACK_NEGATIVE) ? -1 : 1;
+            }
+            return sign;
+        }
+#endif
+        if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
+            wordsize % SIZEOF_BDIGIT == 0) {
+            size_t bdigits_per_word = wordsize / SIZEOF_BDIGIT;
+            int mswordfirst_p = (flags & INTEGER_PACK_MSWORD_FIRST) != 0;
+            int msbytefirst_p = (flags & INTEGER_PACK_NATIVE_BYTE_ORDER) ? HOST_BIGENDIAN_P :
+                (flags & INTEGER_PACK_MSBYTE_FIRST) != 0;
+            MEMCPY(dp, words, BDIGIT, numwords*bdigits_per_word);
+            if (mswordfirst_p) {
+                bary_swap(dp, num_bdigits);
+            }
+            if (mswordfirst_p ? !msbytefirst_p : msbytefirst_p) {
+                size_t i;
+                BDIGIT *p = dp;
+                for (i = 0; i < numwords; i++) {
+                    bary_swap(p, bdigits_per_word);
+                    p += bdigits_per_word;
+                }
+            }
+            if (msbytefirst_p != HOST_BIGENDIAN_P) {
+                BDIGIT *p;
+                for (p = dp; p < de; p++) {
+                    BDIGIT d = *p;
+                    *p = swap_bdigit(d);
+                }
+            }
+            if (flags & INTEGER_PACK_2COMP) {
+                if (flags & INTEGER_PACK_NEGATIVE) {
+                    int zero_p = bary_2comp(dp, num_bdigits);
+                    sign = zero_p ? -2 : -1;
+                }
+                else if (BDIGIT_MSB(de[-1])) {
+                    bary_2comp(dp, num_bdigits);
+                    sign = -1;
+                }
+                else {
+                    sign = 1;
+                }
+            }
+            else {
+                sign = (flags & INTEGER_PACK_NEGATIVE) ? -1 : 1;
+            }
+            return sign;
+        }
+    }
+
+    if (num_bdigits != 0) {
+        int word_num_partialbits;
+        size_t word_num_fullbytes;
+
+        ssize_t word_step;
+        size_t byte_start;
+        int byte_step;
+
+        size_t word_start, word_last;
+        const unsigned char *wordp, *last_wordp;
+        BDIGIT_DBL dd;
+        int numbits_in_dd;
+
+        integer_pack_loop_setup(numwords, wordsize, nails, flags,
+            &word_num_fullbytes, &word_num_partialbits,
+            &word_start, &word_step, &word_last, &byte_start, &byte_step);
+
+        wordp = buf + word_start;
+        last_wordp = buf + word_last;
+
+        dd = 0;
+        numbits_in_dd = 0;
+
+#define PUSH_BITS(data, numbits) \
+        integer_unpack_push_bits(data, numbits, &dd, &numbits_in_dd, &dp)
+
+        while (1) {
+            size_t index_in_word = 0;
+            const unsigned char *bytep = wordp + byte_start;
+            while (index_in_word < word_num_fullbytes) {
+                PUSH_BITS(*bytep, CHAR_BIT);
+                bytep += byte_step;
+                index_in_word++;
+            }
+            if (word_num_partialbits) {
+                PUSH_BITS(*bytep & ((1 << word_num_partialbits) - 1), word_num_partialbits);
+                bytep += byte_step;
+                index_in_word++;
+            }
+
+            if (wordp == last_wordp)
+                break;
+
+            wordp += word_step;
+        }
+        if (dd)
+            *dp++ = (BDIGIT)dd;
+        assert(dp <= de);
+        while (dp < de)
+            *dp++ = 0;
+#undef PUSH_BITS
+    }
+
+    if (!(flags & INTEGER_PACK_2COMP)) {
+        sign = (flags & INTEGER_PACK_NEGATIVE) ? -1 : 1;
+    }
+    else {
+        if (nlp_bits) {
+            if ((flags & INTEGER_PACK_NEGATIVE) ||
+                (bdigits[num_bdigits-1] >> (BITSPERDIG - nlp_bits - 1))) {
+                bdigits[num_bdigits-1] |= BIGLO(BDIGMAX << (BITSPERDIG - nlp_bits));
+                sign = -1;
+            }
+            else {
+                sign = 1;
+            }
+        }
+        else {
+            if (flags & INTEGER_PACK_NEGATIVE) {
+                sign = bary_zero_p(bdigits, num_bdigits) ? -2 : -1;
+            }
+            else {
+                if (num_bdigits != 0 && BDIGIT_MSB(bdigits[num_bdigits-1]))
+                    sign = -1;
+                else
+                    sign = 1;
+            }
+        }
+        if (sign == -1 && num_bdigits != 0) {
+            bary_2comp(bdigits, num_bdigits);
+        }
+    }
+
+    return sign;
+}
+
+static void
+bary_unpack(BDIGIT *bdigits, size_t num_bdigits, const void *words, size_t numwords, size_t wordsize, size_t nails, int flags)
+{
+    size_t num_bdigits0;
+    int nlp_bits;
+    int sign;
+
+    validate_integer_pack_format(numwords, wordsize, nails, flags,
+            INTEGER_PACK_MSWORD_FIRST|
+            INTEGER_PACK_LSWORD_FIRST|
+            INTEGER_PACK_MSBYTE_FIRST|
+            INTEGER_PACK_LSBYTE_FIRST|
+            INTEGER_PACK_NATIVE_BYTE_ORDER|
+            INTEGER_PACK_2COMP|
+            INTEGER_PACK_FORCE_BIGNUM|
+            INTEGER_PACK_NEGATIVE|
+            INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION);
+
+    num_bdigits0 = integer_unpack_num_bdigits(numwords, wordsize, nails, &nlp_bits);
+
+    assert(num_bdigits0 <= num_bdigits);
+
+    sign = bary_unpack_internal(bdigits, num_bdigits0, words, numwords, wordsize, nails, flags, nlp_bits);
+
+    if (num_bdigits0 < num_bdigits) {
+        BDIGITS_ZERO(bdigits + num_bdigits0, num_bdigits - num_bdigits0);
+        if (sign == -2) {
+            bdigits[num_bdigits0] = 1;
+        }
+    }
+}
+
+static int
+bary_subb(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, int borrow)
+{
+    BDIGIT_DBL_SIGNED num;
+    size_t i;
+    size_t sn;
+
+    assert(xn <= zn);
+    assert(yn <= zn);
+
+    sn = xn < yn ? xn : yn;
+
+    num = borrow ? -1 : 0;
+    for (i = 0; i < sn; i++) {
+	num += (BDIGIT_DBL_SIGNED)xds[i] - yds[i];
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    if (yn <= xn) {
+        for (; i < xn; i++) {
+            if (num == 0) goto num_is_zero;
+            num += xds[i];
+            zds[i] = BIGLO(num);
+            num = BIGDN(num);
+        }
+    }
+    else {
+        for (; i < yn; i++) {
+            num -= yds[i];
+            zds[i] = BIGLO(num);
+            num = BIGDN(num);
+        }
+    }
+    if (num == 0) goto num_is_zero;
+    for (; i < zn; i++) {
+	zds[i] = BDIGMAX;
+    }
+    return 1;
+
+  num_is_zero:
+    if (xds == zds && xn == zn)
+        return 0;
+    for (; i < xn; i++) {
+	zds[i] = xds[i];
+    }
+    for (; i < zn; i++) {
+	zds[i] = 0;
+    }
+    return 0;
+}
+
+static int
+bary_sub(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    return bary_subb(zds, zn, xds, xn, yds, yn, 0);
+}
+
+static int
+bary_sub_one(BDIGIT *zds, size_t zn)
+{
+    return bary_subb(zds, zn, zds, zn, NULL, 0, 1);
+}
+
+static int
+bary_addc(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, int carry)
+{
+    BDIGIT_DBL num;
+    size_t i;
+
+    assert(xn <= zn);
+    assert(yn <= zn);
+
+    if (xn > yn) {
+	const BDIGIT *tds;
+	tds = xds; xds = yds; yds = tds;
+	i = xn; xn = yn; yn = i;
+    }
+
+    num = carry ? 1 : 0;
+    for (i = 0; i < xn; i++) {
+	num += (BDIGIT_DBL)xds[i] + yds[i];
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    for (; i < yn; i++) {
+        if (num == 0) goto num_is_zero;
+	num += yds[i];
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    for (; i < zn; i++) {
+        if (num == 0) goto num_is_zero;
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    return num != 0;
+
+  num_is_zero:
+    if (yds == zds && yn == zn)
+        return 0;
+    for (; i < yn; i++) {
+	zds[i] = yds[i];
+    }
+    for (; i < zn; i++) {
+	zds[i] = 0;
+    }
+    return 0;
+}
+
+static int
+bary_add(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    return bary_addc(zds, zn, xds, xn, yds, yn, 0);
+}
+
+static int
+bary_add_one(BDIGIT *ds, size_t n)
+{
+    size_t i;
+    for (i = 0; i < n; i++) {
+        BDIGIT_DBL n = ds[i];
+        n += 1;
+        ds[i] = BIGLO(n);
+        if (ds[i] != 0)
+            return 0;
+    }
+    return 1;
+}
+
+static void
+bary_mul_single(BDIGIT *zds, size_t zn, BDIGIT x, BDIGIT y)
+{
+    BDIGIT_DBL n;
+
+    assert(2 <= zn);
+
+    n = (BDIGIT_DBL)x * y;
+    bdigitdbl2bary(zds, 2, n);
+    BDIGITS_ZERO(zds + 2, zn - 2);
+}
+
+static int
+bary_muladd_1xN(BDIGIT *zds, size_t zn, BDIGIT x, const BDIGIT *yds, size_t yn)
+{
+    BDIGIT_DBL n;
+    BDIGIT_DBL dd;
+    size_t j;
+
+    assert(zn > yn);
+
+    if (x == 0)
+        return 0;
+    dd = x;
+    n = 0;
+    for (j = 0; j < yn; j++) {
+        BDIGIT_DBL ee = n + dd * yds[j];
+        if (ee) {
+            n = zds[j] + ee;
+            zds[j] = BIGLO(n);
+            n = BIGDN(n);
+        }
+        else {
+            n = 0;
+        }
+
+    }
+    for (; j < zn; j++) {
+        if (n == 0)
+            break;
+        n += zds[j];
+        zds[j] = BIGLO(n);
+        n = BIGDN(n);
+    }
+    return n != 0;
+}
+
+static BDIGIT_DBL_SIGNED
+bigdivrem_mulsub(BDIGIT *zds, size_t zn, BDIGIT x, const BDIGIT *yds, size_t yn)
+{
+    size_t i;
+    BDIGIT_DBL t2;
+    BDIGIT_DBL_SIGNED num;
+
+    assert(zn == yn + 1);
+
+    num = 0;
+    t2 = 0;
+    i = 0;
+
+    do {
+        BDIGIT_DBL_SIGNED ee;
+        t2 += (BDIGIT_DBL)yds[i] * x;
+        ee = num - BIGLO(t2);
+        num = (BDIGIT_DBL_SIGNED)zds[i] + ee;
+        if (ee) zds[i] = BIGLO(num);
+        num = BIGDN(num);
+        t2 = BIGDN(t2);
+    } while (++i < yn);
+    num -= (BDIGIT_DBL_SIGNED)t2;
+    num += (BDIGIT_DBL_SIGNED)zds[yn]; /* borrow from high digit; don't update */
+    return num;
+}
+
+static int
+bary_mulsub_1xN(BDIGIT *zds, size_t zn, BDIGIT x, const BDIGIT *yds, size_t yn)
+{
+    BDIGIT_DBL_SIGNED num;
+
+    assert(zn == yn + 1);
+
+    num = bigdivrem_mulsub(zds, zn, x, yds, yn);
+    zds[yn] = BIGLO(num);
+    if (BIGDN(num))
+        return 1;
+    return 0;
+}
+
+static void
+bary_mul_normal(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    size_t i;
+
+    assert(xn + yn <= zn);
+
+    BDIGITS_ZERO(zds, zn);
+    for (i = 0; i < xn; i++) {
+        bary_muladd_1xN(zds+i, zn-i, xds[i], yds, yn);
+    }
+}
+
+VALUE
+rb_big_mul_normal(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    bary_mul_normal(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    return z;
+}
+
+/* efficient squaring (2 times faster than normal multiplication)
+ * ref: Handbook of Applied Cryptography, Algorithm 14.16
+ *      http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf
+ */
+static void
+bary_sq_fast(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn)
+{
+    size_t i, j;
+    BDIGIT_DBL c, v, w;
+    BDIGIT vl;
+    int vh;
+
+    assert(xn * 2 <= zn);
+
+    BDIGITS_ZERO(zds, zn);
+
+    if (xn == 0)
+        return;
+
+    for (i = 0; i < xn-1; i++) {
+	v = (BDIGIT_DBL)xds[i];
+	if (!v)
+            continue;
+	c = (BDIGIT_DBL)zds[i + i] + v * v;
+	zds[i + i] = BIGLO(c);
+	c = BIGDN(c);
+	v *= 2;
+        vl = BIGLO(v);
+        vh = (int)BIGDN(v);
+	for (j = i + 1; j < xn; j++) {
+	    w = (BDIGIT_DBL)xds[j];
+	    c += (BDIGIT_DBL)zds[i + j] + vl * w;
+	    zds[i + j] = BIGLO(c);
+	    c = BIGDN(c);
+	    if (vh)
+                c += w;
+	}
+	if (c) {
+	    c += (BDIGIT_DBL)zds[i + xn];
+	    zds[i + xn] = BIGLO(c);
+	    c = BIGDN(c);
+            if (c)
+                zds[i + xn + 1] += (BDIGIT)c;
+	}
+    }
+
+    /* i == xn-1 */
+    v = (BDIGIT_DBL)xds[i];
+    if (!v)
+        return;
+    c = (BDIGIT_DBL)zds[i + i] + v * v;
+    zds[i + i] = BIGLO(c);
+    c = BIGDN(c);
+    if (c) {
+        zds[i + xn] += BIGLO(c);
+    }
+}
+
+VALUE
+rb_big_sq_fast(VALUE x)
+{
+    size_t xn = BIGNUM_LEN(x), zn = 2 * xn;
+    VALUE z = bignew(zn, 1);
+    bary_sq_fast(BDIGITS(z), zn, BDIGITS(x), xn);
+    RB_GC_GUARD(x);
+    return z;
+}
+
+/* balancing multiplication by slicing larger argument */
+static void
+bary_mul_balance_with_mulfunc(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn, mulfunc_t *mulfunc)
+{
+    VALUE work = 0;
+    size_t yn0 = yn;
+    size_t r, n;
+
+    assert(xn + yn <= zn);
+    assert(xn <= yn);
+    assert(!KARATSUBA_BALANCED(xn, yn) || !TOOM3_BALANCED(xn, yn));
+
+    BDIGITS_ZERO(zds, xn);
+
+    n = 0;
+    while (yn > 0) {
+        BDIGIT *tds;
+        size_t tn;
+	r = xn > yn ? yn : xn;
+        tn = xn + r;
+        if (2 * (xn + r) <= zn - n) {
+            tds = zds + n + xn + r;
+            mulfunc(tds, tn, xds, xn, yds + n, r, wds, wn);
+            BDIGITS_ZERO(zds + n + xn, r);
+            bary_add(zds + n, tn,
+                     zds + n, tn,
+                     tds, tn);
+        }
+        else {
+            if (wn < xn) {
+                wn = xn;
+                wds = ALLOCV_N(BDIGIT, work, wn);
+            }
+            tds = zds + n;
+            MEMCPY(wds, zds + n, BDIGIT, xn);
+            mulfunc(tds, tn, xds, xn, yds + n, r, wds+xn, wn-xn);
+            bary_add(zds + n, tn,
+                     zds + n, tn,
+                     wds, xn);
+        }
+	yn -= r;
+	n += r;
+    }
+    BDIGITS_ZERO(zds+xn+yn0, zn - (xn+yn0));
+
+    if (work)
+        ALLOCV_END(work);
+}
+
+VALUE
+rb_big_mul_balance(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    bary_mul_balance_with_mulfunc(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn, NULL, 0, bary_mul_toom3_start);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    return z;
+}
+
+/* multiplication by karatsuba method */
+static void
+bary_mul_karatsuba(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn)
+{
+    VALUE work = 0;
+
+    size_t n;
+    int sub_p, borrow, carry1, carry2, carry3;
+
+    int odd_y = 0;
+    int odd_xy = 0;
+    int sq;
+
+    const BDIGIT *xds0, *xds1, *yds0, *yds1;
+    BDIGIT *zds0, *zds1, *zds2, *zds3;
+
+    assert(xn + yn <= zn);
+    assert(xn <= yn);
+    assert(yn < 2 * xn);
+
+    sq = xds == yds && xn == yn;
+
+    if (yn & 1) {
+        odd_y = 1;
+        yn--;
+        if (yn < xn) {
+            odd_xy = 1;
+            xn--;
+        }
+    }
+
+    n = yn / 2;
+
+    assert(n < xn);
+
+    if (wn < n) {
+        /* This function itself needs only n BDIGITs for work area.
+         * However this function calls bary_mul_karatsuba and
+         * bary_mul_balance recursively.
+         * 2n BDIGITs are enough to avoid allocations in
+         * the recursively called functions.
+         */
+        wn = 2*n;
+        wds = ALLOCV_N(BDIGIT, work, wn);
+    }
+
+    /* Karatsuba algorithm:
+     *
+     * x = x0 + r*x1
+     * y = y0 + r*y1
+     * z = x*y
+     *   = (x0 + r*x1) * (y0 + r*y1)
+     *   = x0*y0 + r*(x1*y0 + x0*y1) + r*r*x1*y1
+     *   = x0*y0 + r*(x0*y0 + x1*y1 - (x1-x0)*(y1-y0)) + r*r*x1*y1
+     *   = x0*y0 + r*(x0*y0 + x1*y1 - (x0-x1)*(y0-y1)) + r*r*x1*y1
+     */
+
+    xds0 = xds;
+    xds1 = xds + n;
+    yds0 = yds;
+    yds1 = yds + n;
+    zds0 = zds;
+    zds1 = zds + n;
+    zds2 = zds + 2*n;
+    zds3 = zds + 3*n;
+
+    sub_p = 1;
+
+    /* zds0:? zds1:? zds2:? zds3:? wds:? */
+
+    if (bary_sub(zds0, n, xds, n, xds+n, xn-n)) {
+        bary_2comp(zds0, n);
+        sub_p = !sub_p;
+    }
+
+    /* zds0:|x1-x0| zds1:? zds2:? zds3:? wds:? */
+
+    if (sq) {
+        sub_p = 1;
+        bary_mul_karatsuba_start(zds1, 2*n, zds0, n, zds0, n, wds, wn);
+    }
+    else {
+        if (bary_sub(wds, n, yds, n, yds+n, n)) {
+            bary_2comp(wds, n);
+            sub_p = !sub_p;
+        }
+
+        /* zds0:|x1-x0| zds1:? zds2:? zds3:? wds:|y1-y0| */
+
+        bary_mul_karatsuba_start(zds1, 2*n, zds0, n, wds, n, wds+n, wn-n);
+    }
+
+    /* zds0:|x1-x0| zds1,zds2:|x1-x0|*|y1-y0| zds3:? wds:|y1-y0| */
+
+    borrow = 0;
+    if (sub_p) {
+        borrow = !bary_2comp(zds1, 2*n);
+    }
+    /* zds0:|x1-x0| zds1,zds2:-?|x1-x0|*|y1-y0| zds3:? wds:|y1-y0| */
+
+    MEMCPY(wds, zds1, BDIGIT, n);
+
+    /* zds0:|x1-x0| zds1,zds2:-?|x1-x0|*|y1-y0| zds3:? wds:lo(-?|x1-x0|*|y1-y0|) */
+
+    bary_mul_karatsuba_start(zds0, 2*n, xds0, n, yds0, n, wds+n, wn-n);
+
+    /* zds0,zds1:x0*y0 zds2:hi(-?|x1-x0|*|y1-y0|) zds3:? wds:lo(-?|x1-x0|*|y1-y0|) */
+
+    carry1 = bary_add(wds, n, wds, n, zds0, n);
+    carry1 = bary_addc(zds2, n, zds2, n, zds1, n, carry1);
+
+    /* zds0,zds1:x0*y0 zds2:hi(x0*y0-?|x1-x0|*|y1-y0|) zds3:? wds:lo(x0*y0-?|x1-x0|*|y1-y0|) */
+
+    carry2 = bary_add(zds1, n, zds1, n, wds, n);
+
+    /* zds0:lo(x0*y0) zds1:hi(x0*y0)+lo(x0*y0-?|x1-x0|*|y1-y0|) zds2:hi(x0*y0-?|x1-x0|*|y1-y0|) zds3:? wds:lo(x0*y0-?|x1-x0|*|y1-y0|) */
+
+    MEMCPY(wds, zds2, BDIGIT, n);
+
+    /* zds0:lo(x0*y0) zds1:hi(x0*y0)+lo(x0*y0-?|x1-x0|*|y1-y0|) zds2:_ zds3:? wds:hi(x0*y0-?|x1-x0|*|y1-y0|) */
+
+    bary_mul_karatsuba_start(zds2, zn-2*n, xds1, xn-n, yds1, n, wds+n, wn-n);
+
+    /* zds0:lo(x0*y0) zds1:hi(x0*y0)+lo(x0*y0-?|x1-x0|*|y1-y0|) zds2,zds3:x1*y1 wds:hi(x0*y0-?|x1-x0|*|y1-y0|) */
+
+    carry3 = bary_add(zds1, n, zds1, n, zds2, n);
+
+    /* zds0:lo(x0*y0) zds1:hi(x0*y0)+lo(x0*y0-?|x1-x0|*|y1-y0|)+lo(x1*y1) zds2,zds3:x1*y1 wds:hi(x0*y0-?|x1-x0|*|y1-y0|) */
+
+    carry3 = bary_addc(zds2, n, zds2, n, zds3, (4*n < zn ? n : zn-3*n), carry3);
+
+    /* zds0:lo(x0*y0) zds1:hi(x0*y0)+lo(x0*y0-?|x1-x0|*|y1-y0|)+lo(x1*y1) zds2,zds3:x1*y1+hi(x1*y1) wds:hi(x0*y0-?|x1-x0|*|y1-y0|) */
+
+    bary_add(zds2, zn-2*n, zds2, zn-2*n, wds, n);
+
+    /* zds0:lo(x0*y0) zds1:hi(x0*y0)+lo(x0*y0-?|x1-x0|*|y1-y0|)+lo(x1*y1) zds2,zds3:x1*y1+hi(x1*y1)+hi(x0*y0-?|x1-x0|*|y1-y0|) wds:_ */
+
+    if (carry2)
+        bary_add_one(zds2, zn-2*n);
+
+    if (carry1 + carry3 - borrow < 0)
+        bary_sub_one(zds3, zn-3*n);
+    else if (carry1 + carry3 - borrow > 0) {
+        BDIGIT c = carry1 + carry3 - borrow;
+        bary_add(zds3, zn-3*n, zds3, zn-3*n, &c, 1);
+    }
+
+    /*
+    if (SIZEOF_BDIGIT * zn <= 16) {
+        uint128_t z, x, y;
+        ssize_t i;
+        for (x = 0, i = xn-1; 0 <= i; i--) { x <<= SIZEOF_BDIGIT*CHAR_BIT; x |= xds[i]; }
+        for (y = 0, i = yn-1; 0 <= i; i--) { y <<= SIZEOF_BDIGIT*CHAR_BIT; y |= yds[i]; }
+        for (z = 0, i = zn-1; 0 <= i; i--) { z <<= SIZEOF_BDIGIT*CHAR_BIT; z |= zds[i]; }
+        assert(z == x * y);
+    }
+    */
+
+    if (odd_xy) {
+        bary_muladd_1xN(zds+yn, zn-yn, yds[yn], xds, xn);
+        bary_muladd_1xN(zds+xn, zn-xn, xds[xn], yds, yn+1);
+    }
+    else if (odd_y) {
+        bary_muladd_1xN(zds+yn, zn-yn, yds[yn], xds, xn);
+    }
+
+    if (work)
+        ALLOCV_END(work);
+}
+
+VALUE
+rb_big_mul_karatsuba(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    if (!((xn <= yn && yn < 2) || KARATSUBA_BALANCED(xn, yn)))
+        rb_raise(rb_eArgError, "unexpected bignum length for karatsuba");
+    bary_mul_karatsuba(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn, NULL, 0);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    return z;
+}
+
+static void
+bary_mul_toom3(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn)
+{
+    size_t n;
+    size_t wnc;
+    VALUE work = 0;
+
+    /* "p" stands for "positive".  Actually it means "non-negative", though. */
+    size_t x0n; const BDIGIT *x0ds;
+    size_t x1n; const BDIGIT *x1ds;
+    size_t x2n; const BDIGIT *x2ds;
+    size_t y0n; const BDIGIT *y0ds;
+    size_t y1n; const BDIGIT *y1ds;
+    size_t y2n; const BDIGIT *y2ds;
+
+    size_t u1n; BDIGIT *u1ds; int u1p;
+    size_t u2n; BDIGIT *u2ds; int u2p;
+    size_t u3n; BDIGIT *u3ds; int u3p;
+
+    size_t v1n; BDIGIT *v1ds; int v1p;
+    size_t v2n; BDIGIT *v2ds; int v2p;
+    size_t v3n; BDIGIT *v3ds; int v3p;
+
+    size_t t0n; BDIGIT *t0ds; int t0p;
+    size_t t1n; BDIGIT *t1ds; int t1p;
+    size_t t2n; BDIGIT *t2ds; int t2p;
+    size_t t3n; BDIGIT *t3ds; int t3p;
+    size_t t4n; BDIGIT *t4ds; int t4p;
+
+    size_t z0n; BDIGIT *z0ds;
+    size_t z1n; BDIGIT *z1ds; int z1p;
+    size_t z2n; BDIGIT *z2ds; int z2p;
+    size_t z3n; BDIGIT *z3ds; int z3p;
+    size_t z4n; BDIGIT *z4ds;
+
+    size_t zzn; BDIGIT *zzds;
+
+    int sq = xds == yds && xn == yn;
+
+    assert(xn <= yn);  /* assume y >= x */
+    assert(xn + yn <= zn);
+
+    n = (yn + 2) / 3;
+    assert(2*n < xn);
+
+    wnc = 0;
+
+    wnc += (u1n = n+1); /* BITSPERDIG*n+2 bits */
+    wnc += (u2n = n+1); /* BITSPERDIG*n+1 bits */
+    wnc += (u3n = n+1); /* BITSPERDIG*n+3 bits */
+    wnc += (v1n = n+1); /* BITSPERDIG*n+2 bits */
+    wnc += (v2n = n+1); /* BITSPERDIG*n+1 bits */
+    wnc += (v3n = n+1); /* BITSPERDIG*n+3 bits */
+
+    wnc += (t0n = 2*n); /* BITSPERDIG*2*n bits */
+    wnc += (t1n = 2*n+2); /* BITSPERDIG*2*n+4 bits but bary_mul needs u1n+v1n */
+    wnc += (t2n = 2*n+2); /* BITSPERDIG*2*n+2 bits but bary_mul needs u2n+v2n */
+    wnc += (t3n = 2*n+2); /* BITSPERDIG*2*n+6 bits but bary_mul needs u3n+v3n */
+    wnc += (t4n = 2*n); /* BITSPERDIG*2*n bits */
+
+    wnc += (z1n = 2*n+1); /* BITSPERDIG*2*n+5 bits */
+    wnc += (z2n = 2*n+1); /* BITSPERDIG*2*n+6 bits */
+    wnc += (z3n = 2*n+1); /* BITSPERDIG*2*n+8 bits */
+
+    if (wn < wnc) {
+        wn = wnc * 3 / 2; /* Allocate working memory for whole recursion at once. */
+        wds = ALLOCV_N(BDIGIT, work, wn);
+    }
+
+    u1ds = wds; wds += u1n;
+    u2ds = wds; wds += u2n;
+    u3ds = wds; wds += u3n;
+
+    v1ds = wds; wds += v1n;
+    v2ds = wds; wds += v2n;
+    v3ds = wds; wds += v3n;
+
+    t0ds = wds; wds += t0n;
+    t1ds = wds; wds += t1n;
+    t2ds = wds; wds += t2n;
+    t3ds = wds; wds += t3n;
+    t4ds = wds; wds += t4n;
+
+    z1ds = wds; wds += z1n;
+    z2ds = wds; wds += z2n;
+    z3ds = wds; wds += z3n;
+
+    wn -= wnc;
+
+    zzds = u1ds;
+    zzn = 6*n+1;
+
+    x0n = n;
+    x1n = n;
+    x2n = xn - 2*n;
+    x0ds = xds;
+    x1ds = xds + n;
+    x2ds = xds + 2*n;
+
+    if (sq) {
+        y0n = x0n;
+        y1n = x1n;
+        y2n = x2n;
+        y0ds = x0ds;
+        y1ds = x1ds;
+        y2ds = x2ds;
+    }
+    else {
+        y0n = n;
+        y1n = n;
+        y2n = yn - 2*n;
+        y0ds = yds;
+        y1ds = yds + n;
+        y2ds = yds + 2*n;
+    }
+
+    /*
+     * ref. http://en.wikipedia.org/wiki/Toom%E2%80%93Cook_multiplication
+     *
+     * x(b) = x0 * b^0 + x1 * b^1 + x2 * b^2
+     * y(b) = y0 * b^0 + y1 * b^1 + y2 * b^2
+     *
+     * z(b) = x(b) * y(b)
+     * z(b) = z0 * b^0 + z1 * b^1 + z2 * b^2 + z3 * b^3 + z4 * b^4
+     * where:
+     *   z0 = x0 * y0
+     *   z1 = x0 * y1 + x1 * y0
+     *   z2 = x0 * y2 + x1 * y1 + x2 * y0
+     *   z3 = x1 * y2 + x2 * y1
+     *   z4 = x2 * y2
+     *
+     * Toom3 method (a.k.a. Toom-Cook method):
+     * (Step1) calculating 5 points z(b0), z(b1), z(b2), z(b3), z(b4),
+     * where:
+     *   b0 = 0, b1 = 1, b2 = -1, b3 = -2, b4 = inf,
+     *   z(0)   = x(0)   * y(0)   = x0 * y0
+     *   z(1)   = x(1)   * y(1)   = (x0 + x1 + x2) * (y0 + y1 + y2)
+     *   z(-1)  = x(-1)  * y(-1)  = (x0 - x1 + x2) * (y0 - y1 + y2)
+     *   z(-2)  = x(-2)  * y(-2)  = (x0 - 2 * (x1 - 2 * x2)) * (y0 - 2 * (y1 - 2 * y2))
+     *   z(inf) = x(inf) * y(inf) = x2 * y2
+     *
+     * (Step2) interpolating z0, z1, z2, z3 and z4.
+     *
+     * (Step3) Substituting base value into b of the polynomial z(b),
+     */
+
+    /*
+     * [Step1] calculating 5 points z(b0), z(b1), z(b2), z(b3), z(b4)
+     */
+
+    /* u1 <- x0 + x2 */
+    bary_add(u1ds, u1n, x0ds, x0n, x2ds, x2n);
+    u1p = 1;
+
+    /* x(-1) : u2 <- u1 - x1 = x0 - x1 + x2 */
+    if (bary_sub(u2ds, u2n, u1ds, u1n, x1ds, x1n)) {
+        bary_2comp(u2ds, u2n);
+        u2p = 0;
+    }
+    else {
+        u2p = 1;
+    }
+
+    /* x(1) : u1 <- u1 + x1 = x0 + x1 + x2 */
+    bary_add(u1ds, u1n, u1ds, u1n, x1ds, x1n);
+
+    /* x(-2) : u3 <- 2 * (u2 + x2) - x0 = x0 - 2 * (x1 - 2 * x2) */
+    u3p = 1;
+    if (u2p) {
+        bary_add(u3ds, u3n, u2ds, u2n, x2ds, x2n);
+    }
+    else if (bary_sub(u3ds, u3n, x2ds, x2n, u2ds, u2n)) {
+        bary_2comp(u3ds, u3n);
+        u3p = 0;
+    }
+    bary_small_lshift(u3ds, u3ds, u3n, 1);
+    if (!u3p) {
+        bary_add(u3ds, u3n, u3ds, u3n, x0ds, x0n);
+    }
+    else if (bary_sub(u3ds, u3n, u3ds, u3n, x0ds, x0n)) {
+        bary_2comp(u3ds, u3n);
+        u3p = 0;
+    }
+
+    if (sq) {
+        v1n = u1n; v1ds = u1ds; v1p = u1p;
+        v2n = u2n; v2ds = u2ds; v2p = u2p;
+        v3n = u3n; v3ds = u3ds; v3p = u3p;
+    }
+    else {
+	/* v1 <- y0 + y2 */
+        bary_add(v1ds, v1n, y0ds, y0n, y2ds, y2n);
+        v1p = 1;
+
+	/* y(-1) : v2 <- v1 - y1 = y0 - y1 + y2 */
+        v2p = 1;
+        if (bary_sub(v2ds, v2n, v1ds, v1n, y1ds, y1n)) {
+            bary_2comp(v2ds, v2n);
+            v2p = 0;
+        }
+
+	/* y(1) : v1 <- v1 + y1 = y0 + y1 + y2 */
+        bary_add(v1ds, v1n, v1ds, v1n, y1ds, y1n);
+
+	/* y(-2) : v3 <- 2 * (v2 + y2) - y0 = y0 - 2 * (y1 - 2 * y2) */
+        v3p = 1;
+        if (v2p) {
+            bary_add(v3ds, v3n, v2ds, v2n, y2ds, y2n);
+        }
+        else if (bary_sub(v3ds, v3n, y2ds, y2n, v2ds, v2n)) {
+            bary_2comp(v3ds, v3n);
+            v3p = 0;
+        }
+        bary_small_lshift(v3ds, v3ds, v3n, 1);
+        if (!v3p) {
+            bary_add(v3ds, v3n, v3ds, v3n, y0ds, y0n);
+        }
+        else if (bary_sub(v3ds, v3n, v3ds, v3n, y0ds, y0n)) {
+            bary_2comp(v3ds, v3n);
+            v3p = 0;
+        }
+    }
+
+    /* z(0) : t0 <- x0 * y0 */
+    bary_mul_toom3_start(t0ds, t0n, x0ds, x0n, y0ds, y0n, wds, wn);
+    t0p = 1;
+
+    /* z(1) : t1 <- u1 * v1 */
+    bary_mul_toom3_start(t1ds, t1n, u1ds, u1n, v1ds, v1n, wds, wn);
+    t1p = u1p == v1p;
+    assert(t1ds[t1n-1] == 0);
+    t1n--;
+
+    /* z(-1) : t2 <- u2 * v2 */
+    bary_mul_toom3_start(t2ds, t2n, u2ds, u2n, v2ds, v2n, wds, wn);
+    t2p = u2p == v2p;
+    assert(t2ds[t2n-1] == 0);
+    t2n--;
+
+    /* z(-2) : t3 <- u3 * v3 */
+    bary_mul_toom3_start(t3ds, t3n, u3ds, u3n, v3ds, v3n, wds, wn);
+    t3p = u3p == v3p;
+    assert(t3ds[t3n-1] == 0);
+    t3n--;
+
+    /* z(inf) : t4 <- x2 * y2 */
+    bary_mul_toom3_start(t4ds, t4n, x2ds, x2n, y2ds, y2n, wds, wn);
+    t4p = 1;
+
+    /*
+     * [Step2] interpolating z0, z1, z2, z3 and z4.
+     */
+
+    /* z0 <- z(0) == t0 */
+    z0n = t0n; z0ds = t0ds;
+
+    /* z4 <- z(inf) == t4 */
+    z4n = t4n; z4ds = t4ds;
+
+    /* z3 <- (z(-2) - z(1)) / 3 == (t3 - t1) / 3 */
+    if (t3p == t1p) {
+        z3p = t3p;
+        if (bary_sub(z3ds, z3n, t3ds, t3n, t1ds, t1n)) {
+            bary_2comp(z3ds, z3n);
+            z3p = !z3p;
+        }
+    }
+    else {
+        z3p = t3p;
+        bary_add(z3ds, z3n, t3ds, t3n, t1ds, t1n);
+    }
+    bigdivrem_single(z3ds, z3ds, z3n, 3);
+
+    /* z1 <- (z(1) - z(-1)) / 2 == (t1 - t2) / 2 */
+    if (t1p == t2p) {
+        z1p = t1p;
+        if (bary_sub(z1ds, z1n, t1ds, t1n, t2ds, t2n)) {
+            bary_2comp(z1ds, z1n);
+            z1p = !z1p;
+        }
+    }
+    else {
+        z1p = t1p;
+        bary_add(z1ds, z1n, t1ds, t1n, t2ds, t2n);
+    }
+    bary_small_rshift(z1ds, z1ds, z1n, 1, 0);
+
+    /* z2 <- z(-1) - z(0) == t2 - t0 */
+    if (t2p == t0p) {
+        z2p = t2p;
+        if (bary_sub(z2ds, z2n, t2ds, t2n, t0ds, t0n)) {
+            bary_2comp(z2ds, z2n);
+            z2p = !z2p;
+        }
+    }
+    else {
+        z2p = t2p;
+        bary_add(z2ds, z2n, t2ds, t2n, t0ds, t0n);
+    }
+
+    /* z3 <- (z2 - z3) / 2 + 2 * z(inf) == (z2 - z3) / 2 + 2 * t4 */
+    if (z2p == z3p) {
+        z3p = z2p;
+        if (bary_sub(z3ds, z3n, z2ds, z2n, z3ds, z3n)) {
+            bary_2comp(z3ds, z3n);
+            z3p = !z3p;
+        }
+    }
+    else {
+        z3p = z2p;
+        bary_add(z3ds, z3n, z2ds, z2n, z3ds, z3n);
+    }
+    bary_small_rshift(z3ds, z3ds, z3n, 1, 0);
+    if (z3p == t4p) {
+        bary_muladd_1xN(z3ds, z3n, 2, t4ds, t4n);
+    }
+    else {
+        if (bary_mulsub_1xN(z3ds, z3n, 2, t4ds, t4n)) {
+            bary_2comp(z3ds, z3n);
+            z3p = !z3p;
+        }
+    }
+
+    /* z2 <- z2 + z1 - z(inf) == z2 + z1 - t4 */
+    if (z2p == z1p) {
+        bary_add(z2ds, z2n, z2ds, z2n, z1ds, z1n);
+    }
+    else {
+        if (bary_sub(z2ds, z2n, z2ds, z2n, z1ds, z1n)) {
+            bary_2comp(z2ds, z2n);
+            z2p = !z2p;
+        }
+    }
+
+    if (z2p == t4p) {
+        if (bary_sub(z2ds, z2n, z2ds, z2n, t4ds, t4n)) {
+            bary_2comp(z2ds, z2n);
+            z2p = !z2p;
+        }
+    }
+    else {
+        bary_add(z2ds, z2n, z2ds, z2n, t4ds, t4n);
+    }
+
+    /* z1 <- z1 - z3 */
+    if (z1p == z3p) {
+        if (bary_sub(z1ds, z1n, z1ds, z1n, z3ds, z3n)) {
+            bary_2comp(z1ds, z1n);
+            z1p = !z1p;
+        }
+    }
+    else {
+        bary_add(z1ds, z1n, z1ds, z1n, z3ds, z3n);
+    }
+
+    /*
+     * [Step3] Substituting base value into b of the polynomial z(b),
+     */
+
+    MEMCPY(zzds, z0ds, BDIGIT, z0n);
+    BDIGITS_ZERO(zzds + z0n, 4*n - z0n);
+    MEMCPY(zzds + 4*n, z4ds, BDIGIT, z4n);
+    BDIGITS_ZERO(zzds + 4*n + z4n, zzn - (4*n + z4n));
+    if (z1p)
+        bary_add(zzds +   n, zzn -   n, zzds +   n, zzn -   n, z1ds, z1n);
+    else
+        bary_sub(zzds +   n, zzn -   n, zzds +   n, zzn -   n, z1ds, z1n);
+    if (z2p)
+        bary_add(zzds + 2*n, zzn - 2*n, zzds + 2*n, zzn - 2*n, z2ds, z2n);
+    else
+        bary_sub(zzds + 2*n, zzn - 2*n, zzds + 2*n, zzn - 2*n, z2ds, z2n);
+    if (z3p)
+        bary_add(zzds + 3*n, zzn - 3*n, zzds + 3*n, zzn - 3*n, z3ds, z3n);
+    else
+        bary_sub(zzds + 3*n, zzn - 3*n, zzds + 3*n, zzn - 3*n, z3ds, z3n);
+
+    BARY_TRUNC(zzds, zzn);
+    MEMCPY(zds, zzds, BDIGIT, zzn);
+    BDIGITS_ZERO(zds + zzn, zn - zzn);
+
+    if (work)
+        ALLOCV_END(work);
+}
+
+VALUE
+rb_big_mul_toom3(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    if (xn > yn || yn < 3 || !TOOM3_BALANCED(xn,yn))
+        rb_raise(rb_eArgError, "unexpected bignum length for toom3");
+    bary_mul_toom3(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn, NULL, 0);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    return z;
+}
+
+#ifdef USE_GMP
+static void
+bary_mul_gmp(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
+    mpz_t x, y, z;
+    size_t count;
+
+    assert(xn + yn <= zn);
+
+    mpz_init(x);
+    mpz_init(y);
+    mpz_init(z);
+    mpz_import(x, xn, -1, sizeof(BDIGIT), 0, nails, xds);
+    if (xds == yds && xn == yn) {
+        mpz_mul(z, x, x);
+    }
+    else {
+        mpz_import(y, yn, -1, sizeof(BDIGIT), 0, nails, yds);
+        mpz_mul(z, x, y);
+    }
+    mpz_export(zds, &count, -1, sizeof(BDIGIT), 0, nails, z);
+    BDIGITS_ZERO(zds+count, zn-count);
+    mpz_clear(x);
+    mpz_clear(y);
+    mpz_clear(z);
+}
+
+VALUE
+rb_big_mul_gmp(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    bary_mul_gmp(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    return z;
+}
+#endif
+
+static void
+bary_short_mul(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    assert(xn + yn <= zn);
+
+    if (xn == 1 && yn == 1) {
+        bary_mul_single(zds, zn, xds[0], yds[0]);
+    }
+    else {
+        bary_mul_normal(zds, zn, xds, xn, yds, yn);
+        rb_thread_check_ints();
+    }
+}
+
+/* determine whether a bignum is sparse or not by random sampling */
+static inline int
+bary_sparse_p(const BDIGIT *ds, size_t n)
+{
+    long c = 0;
+
+    if (          ds[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
+    if (c <= 1 && ds[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
+    if (c <= 1 && ds[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
+
+    return (c <= 1) ? 1 : 0;
+}
+
+static int
+bary_mul_precheck(BDIGIT **zdsp, size_t *znp, const BDIGIT **xdsp, size_t *xnp, const BDIGIT **ydsp, size_t *ynp)
+{
+    size_t nlsz; /* number of least significant zero BDIGITs */
+
+    BDIGIT *zds = *zdsp;
+    size_t zn = *znp;
+    const BDIGIT *xds = *xdsp;
+    size_t xn = *xnp;
+    const BDIGIT *yds = *ydsp;
+    size_t yn = *ynp;
+
+    assert(xn + yn <= zn);
+
+    nlsz = 0;
+
+    while (0 < xn) {
+        if (xds[xn-1] == 0) {
+            xn--;
+        }
+        else {
+            do {
+                if (xds[0] != 0)
+                    break;
+                xds++;
+                xn--;
+                nlsz++;
+            } while (0 < xn);
+            break;
+        }
+    }
+
+    while (0 < yn) {
+        if (yds[yn-1] == 0) {
+            yn--;
+        }
+        else {
+            do {
+                if (yds[0] != 0)
+                    break;
+                yds++;
+                yn--;
+                nlsz++;
+            } while (0 < yn);
+            break;
+        }
+    }
+
+    if (nlsz) {
+        BDIGITS_ZERO(zds, nlsz);
+        zds += nlsz;
+        zn -= nlsz;
+    }
+
+    /* make sure that y is longer than x */
+    if (xn > yn) {
+        const BDIGIT *tds;
+        size_t tn;
+	tds = xds; xds = yds; yds = tds;
+	tn = xn; xn = yn; yn = tn;
+    }
+    assert(xn <= yn);
+
+    if (xn <= 1) {
+        if (xn == 0) {
+            BDIGITS_ZERO(zds, zn);
+            return 1;
+        }
+
+        if (xds[0] == 1) {
+            MEMCPY(zds, yds, BDIGIT, yn);
+            BDIGITS_ZERO(zds+yn, zn-yn);
+            return 1;
+        }
+        if (POW2_P(xds[0])) {
+            zds[yn] = bary_small_lshift(zds, yds, yn, bit_length(xds[0])-1);
+            BDIGITS_ZERO(zds+yn+1, zn-yn-1);
+            return 1;
+        }
+        if (yn == 1 && yds[0] == 1) {
+            zds[0] = xds[0];
+            BDIGITS_ZERO(zds+1, zn-1);
+            return 1;
+        }
+        bary_mul_normal(zds, zn, xds, xn, yds, yn);
+        return 1;
+    }
+
+    *zdsp = zds;
+    *znp = zn;
+    *xdsp = xds;
+    *xnp = xn;
+    *ydsp = yds;
+    *ynp = yn;
+
+    return 0;
+}
+
+static void
+bary_mul_karatsuba_branch(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn)
+{
+    /* normal multiplication when x is small */
+    if (xn < KARATSUBA_MUL_DIGITS) {
+      normal:
+        if (xds == yds && xn == yn)
+            bary_sq_fast(zds, zn, xds, xn);
+        else
+            bary_short_mul(zds, zn, xds, xn, yds, yn);
+        return;
+    }
+
+    /* normal multiplication when x or y is a sparse bignum */
+    if (bary_sparse_p(xds, xn)) goto normal;
+    if (bary_sparse_p(yds, yn)) {
+        bary_short_mul(zds, zn, yds, yn, xds, xn);
+        return;
+    }
+
+    /* balance multiplication by slicing y when x is much smaller than y */
+    if (!KARATSUBA_BALANCED(xn, yn)) {
+        bary_mul_balance_with_mulfunc(zds, zn, xds, xn, yds, yn, wds, wn, bary_mul_karatsuba_start);
+        return;
+    }
+
+    /* multiplication by karatsuba method */
+    bary_mul_karatsuba(zds, zn, xds, xn, yds, yn, wds, wn);
+}
+
+static void
+bary_mul_karatsuba_start(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn)
+{
+    if (bary_mul_precheck(&zds, &zn, &xds, &xn, &yds, &yn))
+        return;
+
+    bary_mul_karatsuba_branch(zds, zn, xds, xn, yds, yn, wds, wn);
+}
+
+static void
+bary_mul_toom3_branch(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn)
+{
+    if (xn < TOOM3_MUL_DIGITS) {
+        bary_mul_karatsuba_branch(zds, zn, xds, xn, yds, yn, wds, wn);
+        return;
+    }
+
+    if (!TOOM3_BALANCED(xn, yn)) {
+        bary_mul_balance_with_mulfunc(zds, zn, xds, xn, yds, yn, wds, wn, bary_mul_toom3_start);
+        return;
+    }
+
+    bary_mul_toom3(zds, zn, xds, xn, yds, yn, wds, wn);
+}
+
+static void
+bary_mul_toom3_start(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn)
+{
+    if (bary_mul_precheck(&zds, &zn, &xds, &xn, &yds, &yn))
+        return;
+
+    bary_mul_toom3_branch(zds, zn, xds, xn, yds, yn, wds, wn);
+}
+
+static void
+bary_mul(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    if (xn <= yn) {
+        if (xn < NAIVE_MUL_DIGITS) {
+            if (xds == yds && xn == yn)
+                bary_sq_fast(zds, zn, xds, xn);
+            else
+                bary_short_mul(zds, zn, xds, xn, yds, yn);
+            return;
+        }
+    }
+    else {
+        if (yn < NAIVE_MUL_DIGITS) {
+            bary_short_mul(zds, zn, yds, yn, xds, xn);
+            return;
+        }
+    }
+
+#ifdef USE_GMP
+    bary_mul_gmp(zds, zn, xds, xn, yds, yn);
+#else
+    bary_mul_toom3_start(zds, zn, xds, xn, yds, yn, NULL, 0);
+#endif
+}
+
+struct big_div_struct {
+    size_t yn, zn;
+    BDIGIT *yds, *zds;
+    volatile VALUE stop;
+};
+
+static void *
+bigdivrem1(void *ptr)
+{
+    struct big_div_struct *bds = (struct big_div_struct*)ptr;
+    size_t yn = bds->yn;
+    size_t zn = bds->zn;
+    BDIGIT *yds = bds->yds, *zds = bds->zds;
+    BDIGIT_DBL_SIGNED num;
+    BDIGIT q;
+
+    do {
+	if (bds->stop) {
+	    bds->zn = zn;
+	    return 0;
+        }
+	if (zds[zn-1] == yds[yn-1]) q = BDIGMAX;
+	else q = (BDIGIT)((BIGUP(zds[zn-1]) + zds[zn-2])/yds[yn-1]);
+	if (q) {
+            num = bigdivrem_mulsub(zds+zn-(yn+1), yn+1,
+                                   q,
+                                   yds, yn);
+	    while (num) { /* "add back" required */
+		q--;
+                num = bary_add(zds+zn-(yn+1), yn,
+                               zds+zn-(yn+1), yn,
+                               yds, yn);
+                num--;
+	    }
+	}
+        zn--;
+	zds[zn] = q;
+    } while (zn > yn);
+    return 0;
+}
+
+/* async-signal-safe */
+static void
+rb_big_stop(void *ptr)
+{
+    struct big_div_struct *bds = ptr;
+    bds->stop = Qtrue;
+}
+
+static BDIGIT
+bigdivrem_single1(BDIGIT *qds, const BDIGIT *xds, size_t xn, BDIGIT x_higher_bdigit, BDIGIT y)
+{
+    assert(0 < xn);
+    assert(x_higher_bdigit < y);
+    if (POW2_P(y)) {
+        BDIGIT r;
+        r = xds[0] & (y-1);
+        bary_small_rshift(qds, xds, xn, bit_length(y)-1, x_higher_bdigit);
+        return r;
+    }
+    else {
+        size_t i;
+        BDIGIT_DBL t2;
+        t2 = x_higher_bdigit;
+        for (i = 0; i < xn; i++) {
+            t2 = BIGUP(t2) + xds[xn - i - 1];
+            qds[xn - i - 1] = (BDIGIT)(t2 / y);
+            t2 %= y;
+        }
+        return (BDIGIT)t2;
+    }
+}
+
+static BDIGIT
+bigdivrem_single(BDIGIT *qds, const BDIGIT *xds, size_t xn, BDIGIT y)
+{
+    return bigdivrem_single1(qds, xds, xn, 0, y);
+}
+
+static void
+bigdivrem_restoring(BDIGIT *zds, size_t zn, BDIGIT *yds, size_t yn)
+{
+    struct big_div_struct bds;
+    size_t ynzero;
+
+    assert(yn < zn);
+    assert(BDIGIT_MSB(yds[yn-1]));
+    assert(zds[zn-1] < yds[yn-1]);
+
+    for (ynzero = 0; !yds[ynzero]; ynzero++);
+
+    if (ynzero+1 == yn) {
+        BDIGIT r;
+        r = bigdivrem_single1(zds+yn, zds+ynzero, zn-yn, zds[zn-1], yds[ynzero]);
+        zds[ynzero] = r;
+        return;
+    }
+
+    bds.yn = yn - ynzero;
+    bds.zds = zds + ynzero;
+    bds.yds = yds + ynzero;
+    bds.stop = Qfalse;
+    bds.zn = zn - ynzero;
+    if (bds.zn > 10000 || bds.yn > 10000) {
+      retry:
+	bds.stop = Qfalse;
+        rb_nogvl(bigdivrem1, &bds, rb_big_stop, &bds, RB_NOGVL_UBF_ASYNC_SAFE);
+
+	if (bds.stop == Qtrue) {
+	    /* execute trap handler, but exception was not raised. */
+	    goto retry;
+	}
+    }
+    else {
+	bigdivrem1(&bds);
+    }
+}
+
+static void
+bary_divmod_normal(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    int shift;
+    BDIGIT *zds, *yyds;
+    size_t zn;
+    VALUE tmpyz = 0;
+
+    assert(yn < xn || (xn == yn && yds[yn - 1] <= xds[xn - 1]));
+    assert(qds ? (xn - yn + 1) <= qn : 1);
+    assert(rds ? yn <= rn : 1);
+
+    zn = xn + BIGDIVREM_EXTRA_WORDS;
+
+    shift = nlz(yds[yn-1]);
+    if (shift) {
+        int alloc_y = !rds;
+        int alloc_z = !qds || qn < zn;
+        if (alloc_y && alloc_z) {
+            yyds = ALLOCV_N(BDIGIT, tmpyz, yn+zn);
+            zds = yyds + yn;
+        }
+        else {
+            yyds = alloc_y ? ALLOCV_N(BDIGIT, tmpyz, yn) : rds;
+            zds = alloc_z ? ALLOCV_N(BDIGIT, tmpyz, zn) : qds;
+        }
+        zds[xn] = bary_small_lshift(zds, xds, xn, shift);
+        bary_small_lshift(yyds, yds, yn, shift);
+    }
+    else {
+        if (qds && zn <= qn)
+            zds = qds;
+        else
+            zds = ALLOCV_N(BDIGIT, tmpyz, zn);
+        MEMCPY(zds, xds, BDIGIT, xn);
+        zds[xn] = 0;
+        /* bigdivrem_restoring will not modify y.
+         * So use yds directly.  */
+        yyds = (BDIGIT *)yds;
+    }
+
+    bigdivrem_restoring(zds, zn, yyds, yn);
+
+    if (rds) {
+        if (shift)
+            bary_small_rshift(rds, zds, yn, shift, 0);
+        else
+            MEMCPY(rds, zds, BDIGIT, yn);
+        BDIGITS_ZERO(rds+yn, rn-yn);
+    }
+
+    if (qds) {
+        size_t j = zn - yn;
+        MEMMOVE(qds, zds+yn, BDIGIT, j);
+        BDIGITS_ZERO(qds+j, qn-j);
+    }
+
+    if (tmpyz)
+        ALLOCV_END(tmpyz);
+}
+
+VALUE
+rb_big_divrem_normal(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), qn, rn;
+    BDIGIT *xds = BDIGITS(x), *yds = BDIGITS(y), *qds, *rds;
+    VALUE q, r;
+
+    BARY_TRUNC(yds, yn);
+    if (yn == 0)
+        rb_num_zerodiv();
+    BARY_TRUNC(xds, xn);
+
+    if (xn < yn || (xn == yn && xds[xn - 1] < yds[yn - 1]))
+        return rb_assoc_new(LONG2FIX(0), x);
+
+    qn = xn + BIGDIVREM_EXTRA_WORDS;
+    q = bignew(qn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    qds = BDIGITS(q);
+
+    rn = yn;
+    r = bignew(rn, BIGNUM_SIGN(x));
+    rds = BDIGITS(r);
+
+    bary_divmod_normal(qds, qn, rds, rn, xds, xn, yds, yn);
+
+    bigtrunc(q);
+    bigtrunc(r);
+
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+
+    return rb_assoc_new(q, r);
+}
+
+#ifdef USE_GMP
+static void
+bary_divmod_gmp(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
+    mpz_t x, y, q, r;
+    size_t count;
+
+    assert(yn < xn || (xn == yn && yds[yn - 1] <= xds[xn - 1]));
+    assert(qds ? (xn - yn + 1) <= qn : 1);
+    assert(rds ? yn <= rn : 1);
+    assert(qds || rds);
+
+    mpz_init(x);
+    mpz_init(y);
+    if (qds) mpz_init(q);
+    if (rds) mpz_init(r);
+
+    mpz_import(x, xn, -1, sizeof(BDIGIT), 0, nails, xds);
+    mpz_import(y, yn, -1, sizeof(BDIGIT), 0, nails, yds);
+
+    if (!rds) {
+        mpz_fdiv_q(q, x, y);
+    }
+    else if (!qds) {
+        mpz_fdiv_r(r, x, y);
+    }
+    else {
+        mpz_fdiv_qr(q, r, x, y);
+    }
+
+    mpz_clear(x);
+    mpz_clear(y);
+
+    if (qds) {
+        mpz_export(qds, &count, -1, sizeof(BDIGIT), 0, nails, q);
+        BDIGITS_ZERO(qds+count, qn-count);
+        mpz_clear(q);
+    }
+
+    if (rds) {
+        mpz_export(rds, &count, -1, sizeof(BDIGIT), 0, nails, r);
+        BDIGITS_ZERO(rds+count, rn-count);
+        mpz_clear(r);
+    }
+}
+
+VALUE
+rb_big_divrem_gmp(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), qn, rn;
+    BDIGIT *xds = BDIGITS(x), *yds = BDIGITS(y), *qds, *rds;
+    VALUE q, r;
+
+    BARY_TRUNC(yds, yn);
+    if (yn == 0)
+        rb_num_zerodiv();
+    BARY_TRUNC(xds, xn);
+
+    if (xn < yn || (xn == yn && xds[xn - 1] < yds[yn - 1]))
+        return rb_assoc_new(LONG2FIX(0), x);
+
+    qn = xn - yn + 1;
+    q = bignew(qn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    qds = BDIGITS(q);
+
+    rn = yn;
+    r = bignew(rn, BIGNUM_SIGN(x));
+    rds = BDIGITS(r);
+
+    bary_divmod_gmp(qds, qn, rds, rn, xds, xn, yds, yn);
+
+    bigtrunc(q);
+    bigtrunc(r);
+
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+
+    return rb_assoc_new(q, r);
+}
+#endif
+
+static void
+bary_divmod_branch(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+#ifdef USE_GMP
+    if (GMP_DIV_DIGITS < xn) {
+        bary_divmod_gmp(qds, qn, rds, rn, xds, xn, yds, yn);
+        return;
+    }
+#endif
+    bary_divmod_normal(qds, qn, rds, rn, xds, xn, yds, yn);
+}
+
+static void
+bary_divmod(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    assert(xn <= qn);
+    assert(yn <= rn);
+
+    BARY_TRUNC(yds, yn);
+    if (yn == 0)
+        rb_num_zerodiv();
+
+    BARY_TRUNC(xds, xn);
+    if (xn == 0) {
+        BDIGITS_ZERO(qds, qn);
+        BDIGITS_ZERO(rds, rn);
+        return;
+    }
+
+    if (xn < yn || (xn == yn && xds[xn - 1] < yds[yn - 1])) {
+        MEMCPY(rds, xds, BDIGIT, xn);
+        BDIGITS_ZERO(rds+xn, rn-xn);
+        BDIGITS_ZERO(qds, qn);
+    }
+    else if (yn == 1) {
+        MEMCPY(qds, xds, BDIGIT, xn);
+        BDIGITS_ZERO(qds+xn, qn-xn);
+        rds[0] = bigdivrem_single(qds, xds, xn, yds[0]);
+        BDIGITS_ZERO(rds+1, rn-1);
+    }
+    else if (xn == 2 && yn == 2) {
+        BDIGIT_DBL x = bary2bdigitdbl(xds, 2);
+        BDIGIT_DBL y = bary2bdigitdbl(yds, 2);
+        BDIGIT_DBL q = x / y;
+        BDIGIT_DBL r = x % y;
+        qds[0] = BIGLO(q);
+        qds[1] = BIGLO(BIGDN(q));
+        BDIGITS_ZERO(qds+2, qn-2);
+        rds[0] = BIGLO(r);
+        rds[1] = BIGLO(BIGDN(r));
+        BDIGITS_ZERO(rds+2, rn-2);
+    }
+    else {
+        bary_divmod_branch(qds, qn, rds, rn, xds, xn, yds, yn);
+    }
+}
+
 
 #define BIGNUM_DEBUG 0
 #if BIGNUM_DEBUG
@@ -53,11 +2891,11 @@ static void
 dump_bignum(VALUE x)
 {
     long i;
-    printf("%c0x0", RBIGNUM_SIGN(x) ? '+' : '-');
-    for (i = RBIGNUM_LEN(x); i--; ) {
-	printf("_%08"PRIxBDIGIT, BDIGITS(x)[i]);
+    printf("%c0x0", BIGNUM_SIGN(x) ? '+' : '-');
+    for (i = BIGNUM_LEN(x); i--; ) {
+        printf("_%0*"PRIxBDIGIT, SIZEOF_BDIGIT*2, BDIGITS(x)[i]);
     }
-    printf(", len=%lu", RBIGNUM_LEN(x));
+    printf(", len=%"PRIuSIZE, BIGNUM_LEN(x));
     puts("");
 }
 
@@ -74,13 +2912,7 @@ rb_big_dump(VALUE x)
 static int
 bigzero_p(VALUE x)
 {
-    long i;
-    BDIGIT *ds = BDIGITS(x);
-
-    for (i = RBIGNUM_LEN(x) - 1; 0 <= i; i--) {
-	if (ds[i]) return 0;
-    }
-    return 1;
+    return bary_zero_p(BDIGITS(x), BIGNUM_LEN(x));
 }
 
 int
@@ -101,9 +2933,9 @@ rb_cmpint(VALUE val, VALUE a, VALUE b)
         if (l < 0) return -1;
         return 0;
     }
-    if (TYPE(val) == T_BIGNUM) {
+    if (RB_BIGNUM_TYPE_P(val)) {
 	if (BIGZEROP(val)) return 0;
-	if (RBIGNUM_SIGN(val)) return 1;
+	if (BIGNUM_SIGN(val)) return 1;
 	return -1;
     }
     if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
@@ -111,38 +2943,39 @@ rb_cmpint(VALUE val, VALUE a, VALUE b)
     return 0;
 }
 
-#define RBIGNUM_SET_LEN(b,l) \
-    ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
+#define BIGNUM_SET_LEN(b,l) \
+    ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \
      (void)(RBASIC(b)->flags = \
-	    (RBASIC(b)->flags & ~RBIGNUM_EMBED_LEN_MASK) | \
-	    ((l) << RBIGNUM_EMBED_LEN_SHIFT)) : \
+	    (RBASIC(b)->flags & ~BIGNUM_EMBED_LEN_MASK) | \
+	    ((l) << BIGNUM_EMBED_LEN_SHIFT)) : \
      (void)(RBIGNUM(b)->as.heap.len = (l)))
 
 static void
-rb_big_realloc(VALUE big, long len)
+rb_big_realloc(VALUE big, size_t len)
 {
     BDIGIT *ds;
-    if (RBASIC(big)->flags & RBIGNUM_EMBED_FLAG) {
-	if (RBIGNUM_EMBED_LEN_MAX < len) {
+    if (RBASIC(big)->flags & BIGNUM_EMBED_FLAG) {
+	if (BIGNUM_EMBED_LEN_MAX < len) {
 	    ds = ALLOC_N(BDIGIT, len);
-	    MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, RBIGNUM_EMBED_LEN_MAX);
-	    RBIGNUM(big)->as.heap.len = RBIGNUM_LEN(big);
+	    MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, BIGNUM_EMBED_LEN_MAX);
+	    RBIGNUM(big)->as.heap.len = BIGNUM_LEN(big);
 	    RBIGNUM(big)->as.heap.digits = ds;
-	    RBASIC(big)->flags &= ~RBIGNUM_EMBED_FLAG;
+	    RBASIC(big)->flags &= ~BIGNUM_EMBED_FLAG;
 	}
     }
     else {
-	if (len <= RBIGNUM_EMBED_LEN_MAX) {
+	if (len <= BIGNUM_EMBED_LEN_MAX) {
 	    ds = RBIGNUM(big)->as.heap.digits;
-	    RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
-	    RBIGNUM_SET_LEN(big, len);
+	    RBASIC(big)->flags |= BIGNUM_EMBED_FLAG;
+	    BIGNUM_SET_LEN(big, len);
+            (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)RBIGNUM(big)->as.ary, sizeof(RBIGNUM(big)->as.ary));
 	    if (ds) {
 		MEMCPY(RBIGNUM(big)->as.ary, ds, BDIGIT, len);
 		xfree(ds);
 	    }
 	}
 	else {
-	    if (RBIGNUM_LEN(big) == 0) {
+	    if (BIGNUM_LEN(big) == 0) {
 		RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
 	    }
 	    else {
@@ -153,34 +2986,32 @@ rb_big_realloc(VALUE big, long len)
 }
 
 void
-rb_big_resize(VALUE big, long len)
+rb_big_resize(VALUE big, size_t len)
 {
     rb_big_realloc(big, len);
-    RBIGNUM_SET_LEN(big, len);
+    BIGNUM_SET_LEN(big, len);
 }
 
 static VALUE
-bignew_1(VALUE klass, long len, int sign)
+bignew_1(VALUE klass, size_t len, int sign)
 {
-    NEWOBJ(big, struct RBignum);
-    OBJSETUP(big, klass, T_BIGNUM);
-    RBIGNUM_SET_SIGN(big, sign?1:0);
-    if (len <= RBIGNUM_EMBED_LEN_MAX) {
-	RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
-	RBIGNUM_SET_LEN(big, len);
+    NEWOBJ_OF(big, struct RBignum, klass, T_BIGNUM | (RGENGC_WB_PROTECTED_BIGNUM ? FL_WB_PROTECTED : 0));
+    BIGNUM_SET_SIGN(big, sign);
+    if (len <= BIGNUM_EMBED_LEN_MAX) {
+	RBASIC(big)->flags |= BIGNUM_EMBED_FLAG;
+	BIGNUM_SET_LEN(big, len);
+        (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)RBIGNUM(big)->as.ary, sizeof(RBIGNUM(big)->as.ary));
     }
     else {
 	RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
 	RBIGNUM(big)->as.heap.len = len;
     }
-
+    OBJ_FREEZE(big);
     return (VALUE)big;
 }
 
-#define bignew(len,sign) bignew_1(rb_cBignum,(len),(sign))
-
 VALUE
-rb_big_new(long len, int sign)
+rb_big_new(size_t len, int sign)
 {
     return bignew(len, sign != 0);
 }
@@ -188,33 +3019,29 @@ rb_big_new(long len, int sign)
 VALUE
 rb_big_clone(VALUE x)
 {
-    long len = RBIGNUM_LEN(x);
-    VALUE z = bignew_1(CLASS_OF(x), len, RBIGNUM_SIGN(x));
+    size_t len = BIGNUM_LEN(x);
+    VALUE z = bignew_1(CLASS_OF(x), len, BIGNUM_SIGN(x));
 
     MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, len);
     return z;
 }
 
+static void
+big_extend_carry(VALUE x)
+{
+    rb_big_resize(x, BIGNUM_LEN(x)+1);
+    BDIGITS(x)[BIGNUM_LEN(x)-1] = 1;
+}
+
 /* modify a bignum by 2's complement */
 static void
 get2comp(VALUE x)
 {
-    long i = RBIGNUM_LEN(x);
+    long i = BIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
-    BDIGIT_DBL num;
 
-    if (!i) return;
-    while (i--) ds[i] = ~ds[i];
-    i = 0; num = 1;
-    do {
-	num += ds[i];
-	ds[i++] = BIGLO(num);
-	num = BIGDN(num);
-    } while (i < RBIGNUM_LEN(x));
-    if (num != 0) {
-	rb_big_resize(x, RBIGNUM_LEN(x)+1);
-	ds = BDIGITS(x);
-	ds[RBIGNUM_LEN(x)-1] = 1;
+    if (bary_2comp(ds, i)) {
+        big_extend_carry(x);
     }
 }
 
@@ -224,15 +3051,45 @@ rb_big_2comp(VALUE x)			/* get 2's complement */
     get2comp(x);
 }
 
+static BDIGIT
+abs2twocomp(VALUE *xp, long *n_ret)
+{
+    VALUE x = *xp;
+    long n = BIGNUM_LEN(x);
+    BDIGIT *ds = BDIGITS(x);
+    BDIGIT hibits = 0;
+
+    BARY_TRUNC(ds, n);
+
+    if (n != 0 && BIGNUM_NEGATIVE_P(x)) {
+        VALUE z = bignew_1(CLASS_OF(x), n, 0);
+        MEMCPY(BDIGITS(z), ds, BDIGIT, n);
+        bary_2comp(BDIGITS(z), n);
+        hibits = BDIGMAX;
+	*xp = z;
+    }
+    *n_ret = n;
+    return hibits;
+}
+
+static void
+twocomp2abs_bang(VALUE x, int hibits)
+{
+    BIGNUM_SET_SIGN(x, !hibits);
+    if (hibits) {
+        get2comp(x);
+    }
+}
+
 static inline VALUE
 bigtrunc(VALUE x)
 {
-    long len = RBIGNUM_LEN(x);
+    size_t len = BIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
 
     if (len == 0) return x;
     while (--len && !ds[len]);
-    if (RBIGNUM_LEN(x) > len+1) {
+    if (BIGNUM_LEN(x) > len+1) {
 	rb_big_resize(x, len+1);
     }
     return x;
@@ -241,36 +3098,52 @@ bigtrunc(VALUE x)
 static inline VALUE
 bigfixize(VALUE x)
 {
-    long len = RBIGNUM_LEN(x);
+    size_t n = BIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
-
-    if (len == 0) return INT2FIX(0);
-    if ((size_t)(len*SIZEOF_BDIGITS) <= sizeof(long)) {
-	long num = 0;
-#if 2*SIZEOF_BDIGITS > SIZEOF_LONG
-	num = (long)ds[0];
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    unsigned long u;
 #else
-	while (len--) {
-	    num = (long)(BIGUP(num) + ds[len]);
-	}
+    BDIGIT u;
 #endif
-	if (num >= 0) {
-	    if (RBIGNUM_SIGN(x)) {
-		if (POSFIXABLE(num)) return LONG2FIX(num);
-	    }
-	    else {
-		if (NEGFIXABLE(-num)) return LONG2FIX(-num);
-	    }
-	}
+
+    BARY_TRUNC(ds, n);
+
+    if (n == 0) return INT2FIX(0);
+
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (sizeof(long)/SIZEOF_BDIGIT < n)
+        goto return_big;
+    else {
+        int i = (int)n;
+        u = 0;
+        while (i--) {
+            u = (unsigned long)(BIGUP(u) + ds[i]);
+        }
+    }
+#else /* SIZEOF_BDIGIT >= SIZEOF_LONG */
+    if (1 < n)
+        goto return_big;
+    else
+        u = ds[0];
+#endif
+
+    if (BIGNUM_POSITIVE_P(x)) {
+        if (POSFIXABLE(u)) return LONG2FIX((long)u);
     }
+    else {
+        if (u <= -FIXNUM_MIN) return LONG2FIX(-(long)u);
+    }
+
+  return_big:
+    rb_big_resize(x, n);
     return x;
 }
 
 static VALUE
 bignorm(VALUE x)
 {
-    if (!FIXNUM_P(x) && TYPE(x) == T_BIGNUM) {
-	x = bigfixize(bigtrunc(x));
+    if (RB_BIGNUM_TYPE_P(x)) {
+	x = bigfixize(x);
     }
     return x;
 }
@@ -282,337 +3155,952 @@ rb_big_norm(VALUE x)
 }
 
 VALUE
-rb_uint2big(VALUE n)
+rb_uint2big(uintptr_t n)
 {
-    BDIGIT_DBL num = n;
-    long i = 0;
-    BDIGIT *digits;
-    VALUE big;
+    long i;
+    VALUE big = bignew(bdigit_roomof(SIZEOF_VALUE), 1);
+    BDIGIT *digits = BDIGITS(big);
 
-    big = bignew(DIGSPERLONG, 1);
-    digits = BDIGITS(big);
-    while (i < DIGSPERLONG) {
-	digits[i++] = BIGLO(num);
-	num = BIGDN(num);
+#if SIZEOF_BDIGIT >= SIZEOF_VALUE
+    digits[0] = n;
+#else
+    for (i = 0; i < bdigit_roomof(SIZEOF_VALUE); i++) {
+	digits[i] = BIGLO(n);
+	n = BIGDN(n);
     }
+#endif
 
-    i = DIGSPERLONG;
+    i = bdigit_roomof(SIZEOF_VALUE);
     while (--i && !digits[i]) ;
-    RBIGNUM_SET_LEN(big, i+1);
+    BIGNUM_SET_LEN(big, i+1);
     return big;
 }
 
 VALUE
-rb_int2big(SIGNED_VALUE n)
+rb_int2big(intptr_t n)
 {
     long neg = 0;
+    VALUE u;
     VALUE big;
 
     if (n < 0) {
-	n = -n;
+        u = 1 + (VALUE)(-(n + 1)); /* u = -n avoiding overflow */
 	neg = 1;
     }
-    big = rb_uint2big(n);
+    else {
+        u = n;
+    }
+    big = rb_uint2big(u);
     if (neg) {
-	RBIGNUM_SET_SIGN(big, 0);
+	BIGNUM_SET_NEGATIVE_SIGN(big);
     }
     return big;
 }
 
 VALUE
-rb_uint2inum(VALUE n)
+rb_uint2inum(uintptr_t n)
 {
     if (POSFIXABLE(n)) return LONG2FIX(n);
     return rb_uint2big(n);
 }
 
 VALUE
-rb_int2inum(SIGNED_VALUE n)
+rb_int2inum(intptr_t n)
 {
     if (FIXABLE(n)) return LONG2FIX(n);
     return rb_int2big(n);
 }
 
-#if SIZEOF_LONG % SIZEOF_BDIGITS != 0
-# error unexpected SIZEOF_LONG : SIZEOF_BDIGITS ratio
-#endif
+void
+rb_big_pack(VALUE val, unsigned long *buf, long num_longs)
+{
+    rb_integer_pack(val, buf, num_longs, sizeof(long), 0,
+            INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER|
+            INTEGER_PACK_2COMP);
+}
+
+VALUE
+rb_big_unpack(unsigned long *buf, long num_longs)
+{
+    return rb_integer_unpack(buf, num_longs, sizeof(long), 0,
+            INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER|
+            INTEGER_PACK_2COMP);
+}
 
 /*
- * buf is an array of long integers.
- * buf is ordered from least significant word to most significant word.
- * buf[0] is the least significant word and
- * buf[num_longs-1] is the most significant word.
- * This means words in buf is little endian.
- * However each word in buf is native endian.
- * (buf[i]&1) is the least significant bit and
- * (buf[i]&(1<<(SIZEOF_LONG*CHAR_BIT-1))) is the most significant bit
- * for each 0 <= i < num_longs.
- * So buf is little endian at whole on a little endian machine.
- * But buf is mixed endian on a big endian machine.
+ * Calculate the number of bytes to be required to represent
+ * the absolute value of the integer given as _val_.
+ *
+ * [val] an integer.
+ * [nlz_bits_ret] number of leading zero bits in the most significant byte is returned if not NULL.
+ *
+ * This function returns ((val_numbits * CHAR_BIT + CHAR_BIT - 1) / CHAR_BIT)
+ * where val_numbits is the number of bits of abs(val).
+ * This function should not overflow.
+ *
+ * If nlz_bits_ret is not NULL,
+ * (return_value * CHAR_BIT - val_numbits) is stored in *nlz_bits_ret.
+ * In this case, 0 <= *nlz_bits_ret < CHAR_BIT.
+ *
  */
-void
-rb_big_pack(VALUE val, unsigned long *buf, long num_longs)
+size_t
+rb_absint_size(VALUE val, int *nlz_bits_ret)
 {
+    BDIGIT *dp;
+    BDIGIT *de;
+    BDIGIT fixbuf[bdigit_roomof(sizeof(long))];
+
+    int num_leading_zeros;
+
     val = rb_to_int(val);
-    if (num_longs == 0)
-        return;
+
     if (FIXNUM_P(val)) {
-        long i;
-        long tmp = FIX2LONG(val);
-        buf[0] = (unsigned long)tmp;
-        tmp = tmp < 0 ? ~0L : 0;
-        for (i = 1; i < num_longs; i++)
-            buf[i] = (unsigned long)tmp;
-        return;
-    }
-    else {
-        long len = RBIGNUM_LEN(val);
-        BDIGIT *ds = BDIGITS(val), *dend = ds + len;
-        long i, j;
-        for (i = 0; i < num_longs && ds < dend; i++) {
-            unsigned long l = 0;
-            for (j = 0; j < DIGSPERLONG && ds < dend; j++, ds++) {
-                l |= ((unsigned long)*ds << (j * BITSPERDIG));
-            }
-            buf[i] = l;
+        long v = FIX2LONG(val);
+        if (v < 0) {
+            v = -v;
         }
-        for (; i < num_longs; i++)
-            buf[i] = 0;
-        if (RBIGNUM_NEGATIVE_P(val)) {
-            for (i = 0; i < num_longs; i++) {
-                buf[i] = ~buf[i];
-            }
-            for (i = 0; i < num_longs; i++) {
-                buf[i]++;
-                if (buf[i] != 0)
-                    return;
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
+        fixbuf[0] = v;
+#else
+        {
+            int i;
+            for (i = 0; i < numberof(fixbuf); i++) {
+                fixbuf[i] = BIGLO(v);
+                v = BIGDN(v);
             }
         }
+#endif
+        dp = fixbuf;
+        de = fixbuf + numberof(fixbuf);
+    }
+    else {
+        dp = BDIGITS(val);
+        de = dp + BIGNUM_LEN(val);
+    }
+    while (dp < de && de[-1] == 0)
+        de--;
+    if (dp == de) {
+        if (nlz_bits_ret)
+            *nlz_bits_ret = 0;
+        return 0;
     }
+    num_leading_zeros = nlz(de[-1]);
+    if (nlz_bits_ret)
+        *nlz_bits_ret = num_leading_zeros % CHAR_BIT;
+    return (de - dp) * SIZEOF_BDIGIT - num_leading_zeros / CHAR_BIT;
 }
 
-/* See rb_big_pack comment for endianness of buf. */
-VALUE
-rb_big_unpack(unsigned long *buf, long num_longs)
+static size_t
+absint_numwords_small(size_t numbytes, int nlz_bits_in_msbyte, size_t word_numbits, size_t *nlz_bits_ret)
 {
-    while (2 <= num_longs) {
-        if (buf[num_longs-1] == 0 && (long)buf[num_longs-2] >= 0)
-            num_longs--;
-        else if (buf[num_longs-1] == ~0UL && (long)buf[num_longs-2] < 0)
-            num_longs--;
-        else
-            break;
+    size_t val_numbits = numbytes * CHAR_BIT - nlz_bits_in_msbyte;
+    size_t div = val_numbits / word_numbits;
+    size_t mod = val_numbits % word_numbits;
+    size_t numwords;
+    size_t nlz_bits;
+    numwords = mod == 0 ? div : div + 1;
+    nlz_bits = mod == 0 ? 0 : word_numbits - mod;
+    *nlz_bits_ret = nlz_bits;
+    return numwords;
+}
+
+static size_t
+absint_numwords_generic(size_t numbytes, int nlz_bits_in_msbyte, size_t word_numbits, size_t *nlz_bits_ret)
+{
+    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 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)];
+    BDIGIT one[1] = { 1 };
+    size_t nlz_bits;
+    size_t mod;
+    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)
+     * numwords = mod == 0 ? div : div + 1
+     * nlz_bits = mod == 0 ? 0 : word_numbits - mod
+     */
+
+    bary_unpack(BARY_ARGS(numbytes_bary), &numbytes, 1, sizeof(numbytes), 0,
+        INTEGER_PACK_NATIVE_BYTE_ORDER);
+    BARY_SHORT_MUL(val_numbits_bary, numbytes_bary, char_bit);
+    if (nlz_bits_in_msbyte)
+        BARY_SUB(val_numbits_bary, val_numbits_bary, nlz_bits_in_msbyte_bary);
+    bary_unpack(BARY_ARGS(word_numbits_bary), &word_numbits, 1, sizeof(word_numbits), 0,
+        INTEGER_PACK_NATIVE_BYTE_ORDER);
+    BARY_DIVMOD(div_bary, mod_bary, val_numbits_bary, word_numbits_bary);
+    if (BARY_ZERO_P(mod_bary)) {
+        nlz_bits = 0;
     }
-    if (num_longs == 0)
-        return INT2FIX(0);
-    else if (num_longs == 1)
-        return LONG2NUM((long)buf[0]);
-    else {
-        VALUE big;
-        BDIGIT *ds;
-        long len = num_longs * DIGSPERLONG;
-        long i;
-        big = bignew(len, 1);
-        ds = BDIGITS(big);
-        for (i = 0; i < num_longs; i++) {
-            unsigned long d = buf[i];
-#if SIZEOF_LONG == SIZEOF_BDIGITS
-            *ds++ = d;
-#else
-            int j;
-            for (j = 0; j < DIGSPERLONG; j++) {
-                *ds++ = BIGLO(d);
-                d = BIGDN(d);
-            }
+    else {
+        BARY_ADD(div_bary, div_bary, one);
+        bary_pack(+1, BARY_ARGS(mod_bary), &mod, 1, sizeof(mod), 0,
+            INTEGER_PACK_NATIVE_BYTE_ORDER);
+        nlz_bits = word_numbits - mod;
+    }
+    sign = bary_pack(+1, BARY_ARGS(div_bary), &numwords, 1, sizeof(numwords), 0,
+        INTEGER_PACK_NATIVE_BYTE_ORDER);
+
+    if (sign == 2) {
+#if defined __GNUC__ && (__GNUC__ == 4 && __GNUC_MINOR__ == 4)
+	*nlz_bits_ret = 0;
 #endif
-        }
-        if ((long)buf[num_longs-1] < 0) {
-            get2comp(big);
-            RBIGNUM_SET_SIGN(big, 0);
-        }
-        return bignorm(big);
+        return (size_t)-1;
     }
+    *nlz_bits_ret = nlz_bits;
+    return numwords;
 }
 
-#define QUAD_SIZE 8
+/*
+ * Calculate the number of words to be required to represent
+ * the absolute value of the integer given as _val_.
+ *
+ * [val] an integer.
+ * [word_numbits] number of bits in a word.
+ * [nlz_bits_ret] number of leading zero bits in the most significant word is returned if not NULL.
+ *
+ * This function returns ((val_numbits * CHAR_BIT + word_numbits - 1) / word_numbits)
+ * where val_numbits is the number of bits of abs(val).
+ *
+ * This function can overflow.
+ * When overflow occur, (size_t)-1 is returned.
+ *
+ * If nlz_bits_ret is not NULL and overflow is not occur,
+ * (return_value * word_numbits - val_numbits) is stored in *nlz_bits_ret.
+ * In this case, 0 <= *nlz_bits_ret < word_numbits.
+ *
+ */
+size_t
+rb_absint_numwords(VALUE val, size_t word_numbits, size_t *nlz_bits_ret)
+{
+    size_t numbytes;
+    int nlz_bits_in_msbyte;
+    size_t numwords;
+    size_t nlz_bits;
+
+    if (word_numbits == 0)
+        return (size_t)-1;
+
+    numbytes = rb_absint_size(val, &nlz_bits_in_msbyte);
+
+    if (numbytes <= SIZE_MAX / CHAR_BIT) {
+        numwords = absint_numwords_small(numbytes, nlz_bits_in_msbyte, word_numbits, &nlz_bits);
+#ifdef DEBUG_INTEGER_PACK
+        {
+            size_t numwords0, nlz_bits0;
+            numwords0 = absint_numwords_generic(numbytes, nlz_bits_in_msbyte, word_numbits, &nlz_bits0);
+            assert(numwords0 == numwords);
+            assert(nlz_bits0 == nlz_bits);
+        }
+#endif
+    }
+    else {
+        numwords = absint_numwords_generic(numbytes, nlz_bits_in_msbyte, word_numbits, &nlz_bits);
+    }
+    if (numwords == (size_t)-1)
+        return numwords;
+
+    if (nlz_bits_ret)
+        *nlz_bits_ret = nlz_bits;
 
-#if SIZEOF_LONG_LONG == QUAD_SIZE && SIZEOF_BDIGITS*2 == SIZEOF_LONG_LONG
+    return numwords;
+}
 
-void
-rb_quad_pack(char *buf, VALUE val)
+/* Test abs(val) consists only a bit or not.
+ *
+ * Returns 1 if abs(val) == 1 << n for some n >= 0.
+ * Returns 0 otherwise.
+ *
+ * rb_absint_singlebit_p can be used to determine required buffer size
+ * for rb_integer_pack used with INTEGER_PACK_2COMP (two's complement).
+ *
+ * Following example calculates number of bits required to
+ * represent val in two's complement number, without sign bit.
+ *
+ *   size_t size;
+ *   int neg = FIXNUM_P(val) ? FIX2LONG(val) < 0 : BIGNUM_NEGATIVE_P(val);
+ *   size = rb_absint_numwords(val, 1, NULL)
+ *   if (size == (size_t)-1) ...overflow...
+ *   if (neg && rb_absint_singlebit_p(val))
+ *     size--;
+ *
+ * Following example calculates number of bytes required to
+ * represent val in two's complement number, with sign bit.
+ *
+ *   size_t size;
+ *   int neg = FIXNUM_P(val) ? FIX2LONG(val) < 0 : BIGNUM_NEGATIVE_P(val);
+ *   int nlz_bits;
+ *   size = rb_absint_size(val, &nlz_bits);
+ *   if (nlz_bits == 0 && !(neg && rb_absint_singlebit_p(val)))
+ *     size++;
+ */
+int
+rb_absint_singlebit_p(VALUE val)
 {
-    LONG_LONG q;
+    BDIGIT *dp;
+    BDIGIT *de;
+    BDIGIT fixbuf[bdigit_roomof(sizeof(long))];
+    BDIGIT d;
 
     val = rb_to_int(val);
+
     if (FIXNUM_P(val)) {
-	q = FIX2LONG(val);
+        long v = FIX2LONG(val);
+        if (v < 0) {
+            v = -v;
+        }
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
+        fixbuf[0] = v;
+#else
+        {
+            int i;
+            for (i = 0; i < numberof(fixbuf); i++) {
+                fixbuf[i] = BIGLO(v);
+                v = BIGDN(v);
+            }
+        }
+#endif
+        dp = fixbuf;
+        de = fixbuf + numberof(fixbuf);
     }
     else {
-	long len = RBIGNUM_LEN(val);
-	BDIGIT *ds;
+        dp = BDIGITS(val);
+        de = dp + BIGNUM_LEN(val);
+    }
+    while (dp < de && de[-1] == 0)
+        de--;
+    while (dp < de && dp[0] == 0)
+        dp++;
+    if (dp == de) /* no bit set. */
+        return 0;
+    if (dp != de-1) /* two non-zero words. two bits set, at least. */
+        return 0;
+    d = *dp;
+    return POW2_P(d);
+}
 
-	if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS) {
-	    len = SIZEOF_LONG_LONG/SIZEOF_BDIGITS;
-	}
-	ds = BDIGITS(val);
-	q = 0;
-	while (len--) {
-	    q = BIGUP(q);
-	    q += ds[len];
-	}
-	if (!RBIGNUM_SIGN(val)) q = -q;
+
+/*
+ * Export an integer into a buffer.
+ *
+ * This function fills the buffer specified by _words_ and _numwords_ as
+ * val in the format specified by _wordsize_, _nails_ and _flags_.
+ *
+ * [val] Fixnum, Bignum or another integer like object which has to_int method.
+ * [words] buffer to export abs(val).
+ * [numwords] the size of given buffer as number of words.
+ * [wordsize] the size of word as number of bytes.
+ * [nails] number of padding bits in a word.
+ *   Most significant nails bits of each word are filled by zero.
+ * [flags] bitwise or of constants which name starts "INTEGER_PACK_".
+ *
+ * flags:
+ * [INTEGER_PACK_MSWORD_FIRST] Store the most significant word as the first word.
+ * [INTEGER_PACK_LSWORD_FIRST] Store the least significant word as the first word.
+ * [INTEGER_PACK_MSBYTE_FIRST] Store the most significant byte in a word as the first byte in the word.
+ * [INTEGER_PACK_LSBYTE_FIRST] Store the least significant byte in a word as the first byte in the word.
+ * [INTEGER_PACK_NATIVE_BYTE_ORDER] INTEGER_PACK_MSBYTE_FIRST or INTEGER_PACK_LSBYTE_FIRST corresponding to the host's endian.
+ * [INTEGER_PACK_2COMP] Use 2's complement representation.
+ * [INTEGER_PACK_LITTLE_ENDIAN] Same as INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_LSBYTE_FIRST
+ * [INTEGER_PACK_BIG_ENDIAN] Same as INTEGER_PACK_MSWORD_FIRST|INTEGER_PACK_MSBYTE_FIRST
+ * [INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION] Use generic implementation (for test and debug).
+ *
+ * This function fills the buffer specified by _words_
+ * as abs(val) if INTEGER_PACK_2COMP is not specified in _flags_.
+ * If INTEGER_PACK_2COMP is specified, 2's complement representation of val is
+ * filled in the buffer.
+ *
+ * This function returns the signedness and overflow condition.
+ * The overflow condition depends on INTEGER_PACK_2COMP.
+ *
+ * INTEGER_PACK_2COMP is not specified:
+ *   -2 : negative overflow.  val <= -2**(numwords*(wordsize*CHAR_BIT-nails))
+ *   -1 : negative without overflow.  -2**(numwords*(wordsize*CHAR_BIT-nails)) < val < 0
+ *   0 : zero.  val == 0
+ *   1 : positive without overflow.  0 < val < 2**(numwords*(wordsize*CHAR_BIT-nails))
+ *   2 : positive overflow.  2**(numwords*(wordsize*CHAR_BIT-nails)) <= val
+ *
+ * INTEGER_PACK_2COMP is specified:
+ *   -2 : negative overflow.  val < -2**(numwords*(wordsize*CHAR_BIT-nails))
+ *   -1 : negative without overflow.  -2**(numwords*(wordsize*CHAR_BIT-nails)) <= val < 0
+ *   0 : zero.  val == 0
+ *   1 : positive without overflow.  0 < val < 2**(numwords*(wordsize*CHAR_BIT-nails))
+ *   2 : positive overflow.  2**(numwords*(wordsize*CHAR_BIT-nails)) <= val
+ *
+ * The value, -2**(numwords*(wordsize*CHAR_BIT-nails)), is representable
+ * in 2's complement representation but not representable in absolute value.
+ * So -1 is returned for the value if INTEGER_PACK_2COMP is specified
+ * but returns -2 if INTEGER_PACK_2COMP is not specified.
+ *
+ * The least significant words are filled in the buffer when overflow occur.
+ */
+
+int
+rb_integer_pack(VALUE val, void *words, size_t numwords, size_t wordsize, size_t nails, int flags)
+{
+    int sign;
+    BDIGIT *ds;
+    size_t num_bdigits;
+    BDIGIT fixbuf[bdigit_roomof(sizeof(long))];
+
+    RB_GC_GUARD(val) = rb_to_int(val);
+
+    if (FIXNUM_P(val)) {
+        long v = FIX2LONG(val);
+        if (v < 0) {
+            sign = -1;
+            v = -v;
+        }
+        else {
+            sign = 1;
+        }
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
+        fixbuf[0] = v;
+#else
+        {
+            int i;
+            for (i = 0; i < numberof(fixbuf); i++) {
+                fixbuf[i] = BIGLO(v);
+                v = BIGDN(v);
+            }
+        }
+#endif
+        ds = fixbuf;
+        num_bdigits = numberof(fixbuf);
     }
-    memcpy(buf, (char*)&q, SIZEOF_LONG_LONG);
+    else {
+        sign = BIGNUM_POSITIVE_P(val) ? 1 : -1;
+        ds = BDIGITS(val);
+        num_bdigits = BIGNUM_LEN(val);
+    }
+
+    return bary_pack(sign, ds, num_bdigits, words, numwords, wordsize, nails, flags);
 }
 
+/*
+ * Import an integer into a buffer.
+ *
+ * [words] buffer to import.
+ * [numwords] the size of given buffer as number of words.
+ * [wordsize] the size of word as number of bytes.
+ * [nails] number of padding bits in a word.
+ *   Most significant nails bits of each word are ignored.
+ * [flags] bitwise or of constants which name starts "INTEGER_PACK_".
+ *
+ * flags:
+ * [INTEGER_PACK_MSWORD_FIRST] Interpret the first word as the most significant word.
+ * [INTEGER_PACK_LSWORD_FIRST] Interpret the first word as the least significant word.
+ * [INTEGER_PACK_MSBYTE_FIRST] Interpret the first byte in a word as the most significant byte in the word.
+ * [INTEGER_PACK_LSBYTE_FIRST] Interpret the first byte in a word as the least significant byte in the word.
+ * [INTEGER_PACK_NATIVE_BYTE_ORDER] INTEGER_PACK_MSBYTE_FIRST or INTEGER_PACK_LSBYTE_FIRST corresponding to the host's endian.
+ * [INTEGER_PACK_2COMP] Use 2's complement representation.
+ * [INTEGER_PACK_LITTLE_ENDIAN] Same as INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_LSBYTE_FIRST
+ * [INTEGER_PACK_BIG_ENDIAN] Same as INTEGER_PACK_MSWORD_FIRST|INTEGER_PACK_MSBYTE_FIRST
+ * [INTEGER_PACK_FORCE_BIGNUM] the result will be a Bignum
+ *   even if it is representable as a Fixnum.
+ * [INTEGER_PACK_NEGATIVE] Returns non-positive value.
+ *   (Returns non-negative value if not specified.)
+ * [INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION] Use generic implementation (for test and debug).
+ *
+ * This function returns the imported integer as Fixnum or Bignum.
+ *
+ * The range of the result value depends on INTEGER_PACK_2COMP and INTEGER_PACK_NEGATIVE.
+ *
+ * INTEGER_PACK_2COMP is not set:
+ *   0 <= val < 2**(numwords*(wordsize*CHAR_BIT-nails)) if !INTEGER_PACK_NEGATIVE
+ *   -2**(numwords*(wordsize*CHAR_BIT-nails)) < val <= 0 if INTEGER_PACK_NEGATIVE
+ *
+ * INTEGER_PACK_2COMP is set:
+ *   -2**(numwords*(wordsize*CHAR_BIT-nails)-1) <= val <= 2**(numwords*(wordsize*CHAR_BIT-nails)-1)-1 if !INTEGER_PACK_NEGATIVE
+ *   -2**(numwords*(wordsize*CHAR_BIT-nails)) <= val <= -1 if INTEGER_PACK_NEGATIVE
+ *
+ * INTEGER_PACK_2COMP without INTEGER_PACK_NEGATIVE means sign extension.
+ * INTEGER_PACK_2COMP with INTEGER_PACK_NEGATIVE mean assuming the higher bits are 1.
+ *
+ * Note that this function returns 0 when numwords is zero and
+ * INTEGER_PACK_2COMP is set but INTEGER_PACK_NEGATIVE is not set.
+ */
+
 VALUE
-rb_quad_unpack(const char *buf, int sign)
+rb_integer_unpack(const void *words, size_t numwords, size_t wordsize, size_t nails, int flags)
 {
-    unsigned LONG_LONG q;
-    long neg = 0;
-    long i;
-    BDIGIT *digits;
-    VALUE big;
-
-    memcpy(&q, buf, SIZEOF_LONG_LONG);
-    if (sign) {
-	if (FIXABLE((LONG_LONG)q)) return LONG2FIX((LONG_LONG)q);
-	if ((LONG_LONG)q < 0) {
-	    q = -(LONG_LONG)q;
-	    neg = 1;
-	}
+    VALUE val;
+    size_t num_bdigits;
+    int sign;
+    int nlp_bits;
+    BDIGIT *ds;
+    BDIGIT fixbuf[2] = { 0, 0 };
+
+    validate_integer_pack_format(numwords, wordsize, nails, flags,
+            INTEGER_PACK_MSWORD_FIRST|
+            INTEGER_PACK_LSWORD_FIRST|
+            INTEGER_PACK_MSBYTE_FIRST|
+            INTEGER_PACK_LSBYTE_FIRST|
+            INTEGER_PACK_NATIVE_BYTE_ORDER|
+            INTEGER_PACK_2COMP|
+            INTEGER_PACK_FORCE_BIGNUM|
+            INTEGER_PACK_NEGATIVE|
+            INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION);
+
+    num_bdigits = integer_unpack_num_bdigits(numwords, wordsize, nails, &nlp_bits);
+
+    if (LONG_MAX-1 < num_bdigits)
+        rb_raise(rb_eArgError, "too big to unpack as an integer");
+    if (num_bdigits <= numberof(fixbuf) && !(flags & INTEGER_PACK_FORCE_BIGNUM)) {
+        val = Qfalse;
+        ds = fixbuf;
     }
     else {
-	if (POSFIXABLE(q)) return LONG2FIX(q);
+        val = bignew((long)num_bdigits, 0);
+        ds = BDIGITS(val);
     }
+    sign = bary_unpack_internal(ds, num_bdigits, words, numwords, wordsize, nails, flags, nlp_bits);
 
-    i = 0;
-    big = bignew(DIGSPERLL, 1);
-    digits = BDIGITS(big);
-    while (i < DIGSPERLL) {
-	digits[i++] = BIGLO(q);
-	q = BIGDN(q);
+    if (sign == -2) {
+        if (val) {
+            big_extend_carry(val);
+        }
+        else if (num_bdigits == numberof(fixbuf)) {
+            val = bignew((long)num_bdigits+1, 0);
+	    MEMCPY(BDIGITS(val), fixbuf, BDIGIT, num_bdigits);
+            BDIGITS(val)[num_bdigits++] = 1;
+        }
+        else {
+            ds[num_bdigits++] = 1;
+        }
     }
 
-    i = DIGSPERLL;
-    while (i-- && !digits[i]) ;
-    RBIGNUM_SET_LEN(big, i+1);
-
-    if (neg) {
-	RBIGNUM_SET_SIGN(big, 0);
+    if (!val) {
+        BDIGIT_DBL u = fixbuf[0] + BIGUP(fixbuf[1]);
+        if (u == 0)
+            return LONG2FIX(0);
+	if (0 < sign && POSFIXABLE(u))
+            return LONG2FIX(u);
+	if (sign < 0 && BDIGIT_MSB(fixbuf[1]) == 0 &&
+                NEGFIXABLE(-(BDIGIT_DBL_SIGNED)u))
+            return LONG2FIX(-(BDIGIT_DBL_SIGNED)u);
+        val = bignew((long)num_bdigits, 0 <= sign);
+        MEMCPY(BDIGITS(val), fixbuf, BDIGIT, num_bdigits);
     }
-    return bignorm(big);
+
+    if ((flags & INTEGER_PACK_FORCE_BIGNUM) && sign != 0 &&
+        bary_zero_p(BDIGITS(val), BIGNUM_LEN(val)))
+        sign = 0;
+    BIGNUM_SET_SIGN(val, 0 <= sign);
+
+    if (flags & INTEGER_PACK_FORCE_BIGNUM)
+        return bigtrunc(val);
+    return bignorm(val);
 }
 
-#else
+#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
-quad_buf_complement(char *buf, size_t len)
+str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size_t *num_digits_p, ssize_t *len_p)
 {
-    size_t i;
-    for (i = 0; i < len; i++)
-        buf[i] = ~buf[i];
-    for (i = 0; i < len; i++) {
-        buf[i]++;
-        if (buf[i] != 0)
-            return 0;
+    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;
     }
-    return 1;
+
+    if (badcheck && *str == '_') goto bad;
+
+    while ((c = *str++) != 0) {
+	if (c == '_') {
+	    if (nondigit) {
+		if (badcheck) goto bad;
+		break;
+	    }
+	    nondigit = (char) c;
+	}
+	else if ((c = conv_digit(c)) < 0 || c >= base) {
+	    break;
+	}
+	else {
+	    nondigit = 0;
+	    num_digits++;
+	    digits_end = str;
+	}
+	if (len > 0 && !--len) break;
+    }
+    if (badcheck && nondigit) goto bad;
+    if (badcheck && len) {
+	str--;
+	while (*str && ISSPACE(*str)) {
+	    str++;
+	    if (len > 0 && !--len) break;
+	}
+	if (len && *str) {
+	  bad:
+	    return FALSE;
+	}
+    }
+    *num_digits_p = num_digits;
+    *len_p = digits_end - digits_start;
+    return TRUE;
 }
 
-void
-rb_quad_pack(char *buf, VALUE val)
-{
-    long len;
+static VALUE
+str2big_poweroftwo(
+    int sign,
+    const char *digits_start,
+    const char *digits_end,
+    size_t num_digits,
+    int bits_per_digit)
+{
+    BDIGIT *dp;
+    BDIGIT_DBL dd;
+    int numbits;
+
+    size_t num_bdigits;
+    const char *p;
+    int c;
+    VALUE z;
 
-    memset(buf, 0, QUAD_SIZE);
-    val = rb_to_int(val);
-    if (FIXNUM_P(val)) {
-	val = rb_int2big(FIX2LONG(val));
+    num_bdigits = (num_digits / BITSPERDIG) * bits_per_digit + roomof((num_digits % BITSPERDIG) * bits_per_digit, BITSPERDIG);
+    z = bignew(num_bdigits, sign);
+    dp = BDIGITS(z);
+    dd = 0;
+    numbits = 0;
+    for (p = digits_end; digits_start < p; p--) {
+        if ((c = conv_digit(p[-1])) < 0)
+            continue;
+        dd |= (BDIGIT_DBL)c << numbits;
+        numbits += bits_per_digit;
+        if (BITSPERDIG <= numbits) {
+            *dp++ = BIGLO(dd);
+            dd = BIGDN(dd);
+            numbits -= BITSPERDIG;
+        }
     }
-    len = RBIGNUM_LEN(val) * SIZEOF_BDIGITS;
-    if (len > QUAD_SIZE) {
-        len = QUAD_SIZE;
+    if (numbits) {
+        *dp++ = BIGLO(dd);
     }
-    memcpy(buf, (char*)BDIGITS(val), len);
-    if (RBIGNUM_NEGATIVE_P(val)) {
-        quad_buf_complement(buf, QUAD_SIZE);
+    assert((size_t)(dp - BDIGITS(z)) == num_bdigits);
+
+    return z;
+}
+
+static VALUE
+str2big_normal(
+    int sign,
+    const char *digits_start,
+    const char *digits_end,
+    size_t num_bdigits,
+    int base)
+{
+    size_t blen = 1;
+    BDIGIT *zds;
+    BDIGIT_DBL num;
+
+    size_t i;
+    const char *p;
+    int c;
+    VALUE z;
+
+    z = bignew(num_bdigits, sign);
+    zds = BDIGITS(z);
+    BDIGITS_ZERO(zds, num_bdigits);
+
+    for (p = digits_start; p < digits_end; p++) {
+        if ((c = conv_digit(*p)) < 0)
+            continue;
+        num = c;
+        i = 0;
+        for (;;) {
+            while (i<blen) {
+                num += (BDIGIT_DBL)zds[i]*base;
+                zds[i++] = BIGLO(num);
+                num = BIGDN(num);
+            }
+            if (num) {
+                blen++;
+                continue;
+            }
+            break;
+        }
+        assert(blen <= num_bdigits);
     }
+
+    return z;
 }
 
-#define BNEG(b) (RSHIFT(((BDIGIT*)(b))[QUAD_SIZE/SIZEOF_BDIGITS-1],BITSPERDIG-1) != 0)
+static VALUE
+str2big_karatsuba(
+    int sign,
+    const char *digits_start,
+    const char *digits_end,
+    size_t num_digits,
+    size_t num_bdigits,
+    int digits_per_bdigits_dbl,
+    int base)
+{
+    VALUE powerv;
+    size_t unit;
+    VALUE tmpuv = 0;
+    BDIGIT *uds, *vds, *tds;
+    BDIGIT_DBL dd;
+    BDIGIT_DBL current_base;
+    int m;
+    int power_level = 0;
 
-VALUE
-rb_quad_unpack(const char *buf, int sign)
-{
-    VALUE big = bignew(QUAD_SIZE/SIZEOF_BDIGITS, 1);
+    size_t i;
+    const char *p;
+    int c;
+    VALUE z;
 
-    memcpy((char*)BDIGITS(big), buf, QUAD_SIZE);
-    if (sign && BNEG(buf)) {
-	char *tmp = (char*)BDIGITS(big);
+    uds = ALLOCV_N(BDIGIT, tmpuv, 2*num_bdigits);
+    vds = uds + num_bdigits;
 
-	RBIGNUM_SET_SIGN(big, 0);
-        quad_buf_complement(tmp, QUAD_SIZE);
+    powerv = power_cache_get_power(base, power_level, NULL);
+
+    i = 0;
+    dd = 0;
+    current_base = 1;
+    m = digits_per_bdigits_dbl;
+    if (num_digits < (size_t)m)
+        m = (int)num_digits;
+    for (p = digits_end; digits_start < p; p--) {
+        if ((c = conv_digit(p[-1])) < 0)
+            continue;
+        dd = dd + c * current_base;
+        current_base *= base;
+        num_digits--;
+        m--;
+        if (m == 0) {
+            uds[i++] = BIGLO(dd);
+            uds[i++] = (BDIGIT)BIGDN(dd);
+            dd = 0;
+            m = digits_per_bdigits_dbl;
+            if (num_digits < (size_t)m)
+                m = (int)num_digits;
+            current_base = 1;
+        }
     }
+    assert(i == num_bdigits);
+    for (unit = 2; unit < num_bdigits; unit *= 2) {
+        for (i = 0; i < num_bdigits; i += unit*2) {
+            if (2*unit <= num_bdigits - i) {
+                bary_mul(vds+i, unit*2, BDIGITS(powerv), BIGNUM_LEN(powerv), uds+i+unit, unit);
+                bary_add(vds+i, unit*2, vds+i, unit*2, uds+i, unit);
+            }
+            else if (unit <= num_bdigits - i) {
+                bary_mul(vds+i, num_bdigits-i, BDIGITS(powerv), BIGNUM_LEN(powerv), uds+i+unit, num_bdigits-(i+unit));
+                bary_add(vds+i, num_bdigits-i, vds+i, num_bdigits-i, uds+i, unit);
+            }
+            else {
+                MEMCPY(vds+i, uds+i, BDIGIT, num_bdigits-i);
+            }
+        }
+        power_level++;
+        powerv = power_cache_get_power(base, power_level, NULL);
+        tds = vds;
+        vds = uds;
+        uds = tds;
+    }
+    BARY_TRUNC(uds, num_bdigits);
+    z = bignew(num_bdigits, sign);
+    MEMCPY(BDIGITS(z), uds, BDIGIT, num_bdigits);
+
+    if (tmpuv)
+        ALLOCV_END(tmpuv);
 
-    return bignorm(big);
+    return z;
 }
 
+#ifdef USE_GMP
+static VALUE
+str2big_gmp(
+    int sign,
+    const char *digits_start,
+    const char *digits_end,
+    size_t num_digits,
+    size_t num_bdigits,
+    int base)
+{
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
+    char *buf, *p;
+    const char *q;
+    VALUE tmps;
+    mpz_t mz;
+    VALUE z;
+    BDIGIT *zds;
+    size_t zn, count;
+
+    buf = ALLOCV_N(char, tmps, num_digits+1);
+    p = buf;
+    for (q = digits_start; q < digits_end; q++) {
+        if (conv_digit(*q) < 0)
+            continue;
+        *p++ = *q;
+    }
+    *p = '\0';
+
+    mpz_init(mz);
+    mpz_set_str(mz, buf, base);
+    zn = num_bdigits;
+    z = bignew(zn, sign);
+    zds = BDIGITS(z);
+    mpz_export(BDIGITS(z), &count, -1, sizeof(BDIGIT), 0, nails, mz);
+    BDIGITS_ZERO(zds+count, zn-count);
+    mpz_clear(mz);
+
+    if (tmps)
+        ALLOCV_END(tmps);
+
+    return z;
+}
 #endif
 
+static VALUE rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base);
+
+/*
+ * 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)
 {
-    const char *s = str;
     char *end;
-    char sign = 1, nondigit = 0;
-    int c;
-    BDIGIT_DBL num;
-    long len, blen = 1;
-    long i;
-    VALUE z;
-    BDIGIT *zds;
+    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;
+}
 
-#undef ISDIGIT
-#define ISDIGIT(c) ('0' <= (c) && (c) <= '9')
-#define conv_digit(c) \
-    (!ISASCII(c) ? -1 : \
-     ISDIGIT(c) ? ((c) - '0') : \
-     ISLOWER(c) ? ((c) - 'a' + 10) : \
-     ISUPPER(c) ? ((c) - 'A' + 10) : \
-     -1)
+/*
+ * 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.
+ * ndigits: if non-NULL, the number of parsed digits is stored.
+ * base: see +rb_cstr_to_inum+
+ * flags: bitwise OR of below flags:
+ *       RB_INT_PARSE_SIGN: allow preceding spaces and +/- sign
+ *       RB_INT_PARSE_UNDERSCORE: allow an underscore between digits
+ *       RB_INT_PARSE_PREFIX: allow preceding prefix
+ */
+
+VALUE
+rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
+		  int base, int flags)
+{
+    const char *const s = str;
+    char sign = 1;
+    int c;
+    VALUE z = Qnil;
+
+    unsigned long val;
+    int ov;
+
+    const char *digits_start, *digits_end;
+    size_t num_digits = 0;
+    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)
 
     if (!str) {
-	if (badcheck) goto bad;
-	return INT2FIX(0);
+      bad:
+	if (endp) *endp = (char *)str;
+	if (ndigits) *ndigits = num_digits;
+	return z;
     }
-    while (ISSPACE(*str)) str++;
+    if (len && (flags & RB_INT_PARSE_SIGN)) {
+	while (ISSPACE(*str)) ADV(1);
 
-    if (str[0] == '+') {
-	str++;
-    }
-    else if (str[0] == '-') {
-	str++;
-	sign = 0;
-    }
-    if (str[0] == '+' || str[0] == '-') {
-	if (badcheck) goto bad;
-	return INT2FIX(0);
+	if (str[0] == '+') {
+	    ADV(1);
+	}
+	else if (str[0] == '-') {
+	    ADV(1);
+	    sign = 0;
+	}
+	ASSERT_LEN();
     }
     if (base <= 0) {
-	if (str[0] == '0') {
+	if (str[0] == '0' && len > 1) {
 	    switch (str[1]) {
 	      case 'x': case 'X':
 		base = 16;
+		ADV(2);
 		break;
 	      case 'b': case 'B':
 		base = 2;
+		ADV(2);
 		break;
 	      case 'o': case 'O':
 		base = 8;
+		ADV(2);
 		break;
 	      case 'd': case 'D':
 		base = 10;
+		ADV(2);
 		break;
 	      default:
 		base = 8;
@@ -625,75 +4113,75 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 	    base = 10;
 	}
     }
-    switch (base) {
-      case 2:
-	len = 1;
+    else if (len == 1 || !(flags & RB_INT_PARSE_PREFIX)) {
+	/* no prefix */
+    }
+    else if (base == 2) {
 	if (str[0] == '0' && (str[1] == 'b'||str[1] == 'B')) {
-	    str += 2;
+	    ADV(2);
 	}
-	break;
-      case 3:
-	len = 2;
-	break;
-      case 8:
+    }
+    else if (base == 8) {
 	if (str[0] == '0' && (str[1] == 'o'||str[1] == 'O')) {
-	    str += 2;
+	    ADV(2);
 	}
-      case 4: case 5: case 6: case 7:
-	len = 3;
-	break;
-      case 10:
+    }
+    else if (base == 10) {
 	if (str[0] == '0' && (str[1] == 'd'||str[1] == 'D')) {
-	    str += 2;
+	    ADV(2);
 	}
-      case 9: case 11: case 12: case 13: case 14: case 15:
-	len = 4;
-	break;
-      case 16:
-	len = 4;
+    }
+    else if (base == 16) {
 	if (str[0] == '0' && (str[1] == 'x'||str[1] == 'X')) {
-	    str += 2;
+	    ADV(2);
 	}
-	break;
-      default:
-	if (base < 2 || 36 < base) {
-	    rb_raise(rb_eArgError, "invalid radix %d", base);
-	}
-	if (base <= 32) {
-	    len = 5;
-	}
-	else {
-	    len = 6;
-	}
-	break;
     }
-    if (*str == '0') {		/* squeeze preceding 0s */
+    if (!valid_radix_p(base)) {
+        invalid_radix(base);
+    }
+    if (!len) goto bad;
+    num_digits = str - s;
+    if (*str == '0' && len != 1) { /* squeeze preceding 0s */
 	int us = 0;
-	while ((c = *++str) == '0' || c == '_') {
+	const char *end = len < 0 ? NULL : str + len;
+	++num_digits;
+	while ((c = *++str) == '0' ||
+	       ((flags & RB_INT_PARSE_UNDERSCORE) && c == '_')) {
 	    if (c == '_') {
 		if (++us >= 2)
 		    break;
-	    } else
+	    }
+	    else {
+		++num_digits;
 		us = 0;
+	    }
+	    if (str == end) break;
 	}
-	if (!(c = *str) || ISSPACE(c)) --str;
+	if (!c || ISSPACE(c)) --str;
+	if (end) len = end - str;
+	ASSERT_LEN();
     }
     c = *str;
     c = conv_digit(c);
     if (c < 0 || c >= base) {
-	if (badcheck) goto bad;
-	return INT2FIX(0);
-    }
-    len *= strlen(str)*sizeof(char);
-
-    if ((size_t)len <= (sizeof(long)*CHAR_BIT)) {
-	unsigned long val = STRTOUL(str, &end, base);
-
-	if (str < end && *end == '_') goto bigparse;
+	if (!badcheck && num_digits) z = INT2FIX(0);
+	goto bad;
+    }
+
+    if (ndigits) *ndigits = num_digits;
+    val = ruby_scan_digits(str, len, base, &num_digits, &ov);
+    if (!ov) {
+	const char *end = &str[num_digits];
+	if (num_digits > 0 && *end == '_' && (flags & RB_INT_PARSE_UNDERSCORE))
+	    goto bigparse;
+	if (endp) *endp = (char *)end;
+	if (ndigits) *ndigits += num_digits;
 	if (badcheck) {
-	    if (end == str) goto bad; /* no number */
-	    while (*end && ISSPACE(*end)) end++;
-	    if (*end) goto bad;	      /* trailing garbage */
+	    if (num_digits == 0) return Qnil; /* no number */
+	    while (len < 0 ? *end : end < str + len) {
+		if (!ISSPACE(*end)) return Qnil; /* trailing garbage */
+		end++;
+	    }
 	}
 
 	if (POSFIXABLE(val)) {
@@ -705,110 +4193,267 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 	}
 	else {
 	    VALUE big = rb_uint2big(val);
-	    RBIGNUM_SET_SIGN(big, sign);
+	    BIGNUM_SET_SIGN(big, sign);
 	    return bignorm(big);
 	}
     }
+
   bigparse:
-    len = (len/BITSPERDIG)+1;
-    if (badcheck && *str == '_') goto bad;
+    digits_start = str;
+    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
+	goto bad;
+    if (endp) *endp = (char *)(str + len);
+    if (ndigits) *ndigits += num_digits;
+    digits_end = digits_start + len;
 
-    z = bignew(len, sign);
-    zds = BDIGITS(z);
-    for (i=len;i--;) zds[i]=0;
-    while ((c = *str++) != 0) {
-	if (c == '_') {
-	    if (nondigit) {
-		if (badcheck) goto bad;
-		break;
-	    }
-	    nondigit = c;
-	    continue;
-	}
-	else if ((c = conv_digit(c)) < 0) {
-	    break;
-	}
-	if (c >= base) break;
-	nondigit = 0;
-	i = 0;
-	num = c;
-	for (;;) {
-	    while (i<blen) {
-		num += (BDIGIT_DBL)zds[i]*base;
-		zds[i++] = BIGLO(num);
-		num = BIGDN(num);
-	    }
-	    if (num) {
-		blen++;
-		continue;
-	    }
-	    break;
-	}
+    if (POW2_P(base)) {
+        z = str2big_poweroftwo(sign, digits_start, digits_end, num_digits,
+			       bit_length(base-1));
     }
-    if (badcheck) {
-	str--;
-	if (s+1 < str && str[-1] == '_') goto bad;
-	while (*str && ISSPACE(*str)) str++;
-	if (*str) {
-	  bad:
-	    rb_invalid_str(s, "Integer()");
-	}
+    else {
+        int digits_per_bdigits_dbl;
+        maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
+        num_bdigits = roomof(num_digits, digits_per_bdigits_dbl)*2;
+
+#ifdef USE_GMP
+        if (GMP_STR2BIG_DIGITS < num_bdigits) {
+            z = str2big_gmp(sign, digits_start, digits_end, num_digits,
+                    num_bdigits, base);
+        }
+        else
+#endif
+        if (num_bdigits < KARATSUBA_MUL_DIGITS) {
+            z = str2big_normal(sign, digits_start, digits_end,
+                    num_bdigits, base);
+        }
+        else {
+            z = str2big_karatsuba(sign, digits_start, digits_end, num_digits,
+                    num_bdigits, digits_per_bdigits_dbl, base);
+        }
     }
 
     return bignorm(z);
 }
 
+static VALUE
+rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
+{
+    return rb_int_parse_cstr(str, len, endp, NULL, base,
+			     RB_INT_PARSE_DEFAULT);
+}
+
 VALUE
-rb_str_to_inum(VALUE str, int base, int badcheck)
+rb_str_convert_to_inum(VALUE str, int base, int badcheck, int raise_exception)
 {
-    char *s;
-    long len;
-    VALUE v = 0;
     VALUE ret;
+    const char *s;
+    long len;
+    char *end;
 
     StringValue(str);
-    if (badcheck) {
-	s = StringValueCStr(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) {
+            if (!raise_exception) return Qnil;
+            invalid_integer(str);
+        }
+        ret = INT2FIX(0);
     }
-    else {
-	s = RSTRING_PTR(str);
+    return ret;
+}
+
+VALUE
+rb_str_to_inum(VALUE str, int base, int badcheck)
+{
+    return rb_str_convert_to_inum(str, base, badcheck, TRUE);
+}
+
+VALUE
+rb_str2big_poweroftwo(VALUE arg, int base, int badcheck)
+{
+    int positive_p = 1;
+    const char *s, *str;
+    const char *digits_start, *digits_end;
+    size_t num_digits;
+    ssize_t len;
+    VALUE z;
+
+    if (!valid_radix_p(base) || !POW2_P(base)) {
+        invalid_radix(base);
     }
-    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;
-	}
+    rb_must_asciicompat(arg);
+    s = str = StringValueCStr(arg);
+    len = RSTRING_LEN(arg);
+    if (*str == '-') {
+	len--;
+        str++;
+        positive_p = 0;
     }
-    ret = rb_cstr_to_inum(s, base, badcheck);
-    if (v)
-	ALLOCV_END(v);
-    return ret;
+
+    digits_start = str;
+    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
+	invalid_integer(arg);
+    digits_end = digits_start + len;
+
+    z = str2big_poweroftwo(positive_p, digits_start, digits_end, num_digits,
+            bit_length(base-1));
+
+    RB_GC_GUARD(arg);
+
+    return bignorm(z);
+}
+
+VALUE
+rb_str2big_normal(VALUE arg, int base, int badcheck)
+{
+    int positive_p = 1;
+    const char *s, *str;
+    const char *digits_start, *digits_end;
+    size_t num_digits;
+    ssize_t len;
+    VALUE z;
+
+    int digits_per_bdigits_dbl;
+    size_t num_bdigits;
+
+    if (!valid_radix_p(base)) {
+        invalid_radix(base);
+    }
+
+    rb_must_asciicompat(arg);
+    s = str = StringValuePtr(arg);
+    len = RSTRING_LEN(arg);
+    if (len > 0 && *str == '-') {
+	len--;
+        str++;
+        positive_p = 0;
+    }
+
+    digits_start = str;
+    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
+	invalid_integer(arg);
+    digits_end = digits_start + len;
+
+    maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
+    num_bdigits = roomof(num_digits, digits_per_bdigits_dbl)*2;
+
+    z = str2big_normal(positive_p, digits_start, digits_end,
+            num_bdigits, base);
+
+    RB_GC_GUARD(arg);
+
+    return bignorm(z);
 }
 
+VALUE
+rb_str2big_karatsuba(VALUE arg, int base, int badcheck)
+{
+    int positive_p = 1;
+    const char *s, *str;
+    const char *digits_start, *digits_end;
+    size_t num_digits;
+    ssize_t len;
+    VALUE z;
+
+    int digits_per_bdigits_dbl;
+    size_t num_bdigits;
+
+    if (!valid_radix_p(base)) {
+        invalid_radix(base);
+    }
+
+    rb_must_asciicompat(arg);
+    s = str = StringValuePtr(arg);
+    len = RSTRING_LEN(arg);
+    if (len > 0 && *str == '-') {
+	len--;
+        str++;
+        positive_p = 0;
+    }
+
+    digits_start = str;
+    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
+	invalid_integer(arg);
+    digits_end = digits_start + len;
+
+    maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
+    num_bdigits = roomof(num_digits, digits_per_bdigits_dbl)*2;
+
+    z = str2big_karatsuba(positive_p, digits_start, digits_end, num_digits,
+            num_bdigits, digits_per_bdigits_dbl, base);
+
+    RB_GC_GUARD(arg);
+
+    return bignorm(z);
+}
+
+#ifdef USE_GMP
+VALUE
+rb_str2big_gmp(VALUE arg, int base, int badcheck)
+{
+    int positive_p = 1;
+    const char *s, *str;
+    const char *digits_start, *digits_end;
+    size_t num_digits;
+    ssize_t len;
+    VALUE z;
+
+    int digits_per_bdigits_dbl;
+    size_t num_bdigits;
+
+    if (!valid_radix_p(base)) {
+        invalid_radix(base);
+    }
+
+    rb_must_asciicompat(arg);
+    s = str = StringValuePtr(arg);
+    len = RSTRING_LEN(arg);
+    if (len > 0 && *str == '-') {
+	len--;
+        str++;
+        positive_p = 0;
+    }
+
+    digits_start = str;
+    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
+	invalid_integer(arg);
+    digits_end = digits_start + len;
+
+    maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
+    num_bdigits = roomof(num_digits, digits_per_bdigits_dbl)*2;
+
+    z = str2big_gmp(positive_p, digits_start, digits_end, num_digits, num_bdigits, base);
+
+    RB_GC_GUARD(arg);
+
+    return bignorm(z);
+}
+#endif
+
 #if HAVE_LONG_LONG
 
 static VALUE
 rb_ull2big(unsigned LONG_LONG n)
 {
-    BDIGIT_DBL num = n;
-    long i = 0;
-    BDIGIT *digits;
-    VALUE big;
+    long i;
+    VALUE big = bignew(bdigit_roomof(SIZEOF_LONG_LONG), 1);
+    BDIGIT *digits = BDIGITS(big);
 
-    big = bignew(DIGSPERLL, 1);
-    digits = BDIGITS(big);
-    while (i < DIGSPERLL) {
-	digits[i++] = BIGLO(num);
-	num = BIGDN(num);
+#if SIZEOF_BDIGIT >= SIZEOF_LONG_LONG
+    digits[0] = n;
+#else
+    for (i = 0; i < bdigit_roomof(SIZEOF_LONG_LONG); i++) {
+	digits[i] = BIGLO(n);
+	n = BIGDN(n);
     }
+#endif
 
-    i = DIGSPERLL;
+    i = bdigit_roomof(SIZEOF_LONG_LONG);
     while (i-- && !digits[i]) ;
-    RBIGNUM_SET_LEN(big, i+1);
+    BIGNUM_SET_LEN(big, i+1);
     return big;
 }
 
@@ -816,15 +4461,19 @@ static VALUE
 rb_ll2big(LONG_LONG n)
 {
     long neg = 0;
+    unsigned LONG_LONG u;
     VALUE big;
 
     if (n < 0) {
-	n = -n;
+        u = 1 + (unsigned LONG_LONG)(-(n + 1)); /* u = -n avoiding overflow */
 	neg = 1;
     }
-    big = rb_ull2big(n);
+    else {
+        u = n;
+    }
+    big = rb_ull2big(u);
     if (neg) {
-	RBIGNUM_SET_SIGN(big, 0);
+	BIGNUM_SET_NEGATIVE_SIGN(big);
     }
     return big;
 }
@@ -845,6 +4494,46 @@ 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;
+}
+
+MJIT_FUNC_EXPORTED 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)
 {
@@ -857,378 +4546,610 @@ rb_str2inum(VALUE str, int base)
     return rb_str_to_inum(str, base, base==0);
 }
 
-const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-
-static VALUE bigsqr(VALUE x);
-static void bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp);
-
-#define POW2_P(x) (((x)&((x)-1))==0)
-
-static inline int
-ones(register unsigned long x)
+static VALUE
+big_shift3(VALUE x, int lshift_p, size_t shift_numdigits, int shift_numbits)
 {
-#if SIZEOF_LONG == 8
-# define MASK_55 0x5555555555555555UL
-# define MASK_33 0x3333333333333333UL
-# define MASK_0f 0x0f0f0f0f0f0f0f0fUL
-#else
-# define MASK_55 0x55555555UL
-# define MASK_33 0x33333333UL
-# define MASK_0f 0x0f0f0f0fUL
-#endif
-    x -= (x >> 1) & MASK_55;
-    x = ((x >> 2) & MASK_33) + (x & MASK_33);
-    x = ((x >> 4) + x) & MASK_0f;
-    x += (x >> 8);
-    x += (x >> 16);
-#if SIZEOF_LONG == 8
-    x += (x >> 32);
-#endif
-    return (int)(x & 0x7f);
-#undef MASK_0f
-#undef MASK_33
-#undef MASK_55
+    BDIGIT *xds, *zds;
+    long s1;
+    int s2;
+    VALUE z;
+    long xn;
+
+    if (lshift_p) {
+        if (LONG_MAX < shift_numdigits) {
+            rb_raise(rb_eArgError, "too big number");
+        }
+        s1 = shift_numdigits;
+        s2 = shift_numbits;
+        xn = BIGNUM_LEN(x);
+        z = bignew(xn+s1+1, BIGNUM_SIGN(x));
+        zds = BDIGITS(z);
+        BDIGITS_ZERO(zds, s1);
+        xds = BDIGITS(x);
+        zds[xn+s1] = bary_small_lshift(zds+s1, xds, xn, s2);
+    }
+    else {
+        long zn;
+        BDIGIT hibitsx;
+        if (LONG_MAX < shift_numdigits || (size_t)BIGNUM_LEN(x) <= shift_numdigits) {
+            if (BIGNUM_POSITIVE_P(x) ||
+                bary_zero_p(BDIGITS(x), BIGNUM_LEN(x)))
+                return INT2FIX(0);
+            else
+                return INT2FIX(-1);
+        }
+        s1 = shift_numdigits;
+        s2 = shift_numbits;
+        hibitsx = abs2twocomp(&x, &xn);
+        xds = BDIGITS(x);
+        if (xn <= s1) {
+            return hibitsx ? INT2FIX(-1) : INT2FIX(0);
+        }
+        zn = xn - s1;
+        z = bignew(zn, 0);
+        zds = BDIGITS(z);
+        bary_small_rshift(zds, xds+s1, zn, s2, hibitsx != 0 ? BDIGMAX : 0);
+        twocomp2abs_bang(z, hibitsx != 0);
+    }
+    RB_GC_GUARD(x);
+    return z;
 }
 
-static inline unsigned long
-next_pow2(register unsigned long x)
+static VALUE
+big_shift2(VALUE x, int lshift_p, VALUE y)
 {
-    x |= x >> 1;
-    x |= x >> 2;
-    x |= x >> 4;
-    x |= x >> 8;
-    x |= x >> 16;
-#if SIZEOF_LONG == 8
-    x |= x >> 32;
-#endif
-    return x + 1;
+    int sign;
+    size_t lens[2];
+    size_t shift_numdigits;
+    int shift_numbits;
+
+    assert(POW2_P(CHAR_BIT));
+    assert(POW2_P(BITSPERDIG));
+
+    if (BIGZEROP(x))
+        return INT2FIX(0);
+    sign = rb_integer_pack(y, lens, numberof(lens), sizeof(size_t), 0,
+        INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER);
+    if (sign < 0) {
+        lshift_p = !lshift_p;
+        sign = -sign;
+    }
+    if (lshift_p) {
+        if (1 < sign || CHAR_BIT <= lens[1])
+            rb_raise(rb_eRangeError, "shift width too big");
+    }
+    else {
+        if (1 < sign || CHAR_BIT <= lens[1])
+            return BIGNUM_POSITIVE_P(x) ? INT2FIX(0) : INT2FIX(-1);
+    }
+    shift_numbits = (int)(lens[0] & (BITSPERDIG-1));
+    shift_numdigits = (lens[0] >> bit_length(BITSPERDIG-1)) |
+      (lens[1] << (CHAR_BIT*SIZEOF_SIZE_T - bit_length(BITSPERDIG-1)));
+    return big_shift3(x, lshift_p, shift_numdigits, shift_numbits);
 }
 
-static inline int
-floor_log2(register unsigned long x)
+static VALUE
+big_lshift(VALUE x, unsigned long shift)
 {
-    x |= x >> 1;
-    x |= x >> 2;
-    x |= x >> 4;
-    x |= x >> 8;
-    x |= x >> 16;
-#if SIZEOF_LONG == 8
-    x |= x >> 32;
-#endif
-    return (int)ones(x) - 1;
+    long s1 = shift/BITSPERDIG;
+    int s2 = (int)(shift%BITSPERDIG);
+    return big_shift3(x, 1, s1, s2);
 }
 
-static inline int
-ceil_log2(register unsigned long x)
+static VALUE
+big_rshift(VALUE x, unsigned long shift)
 {
-    return floor_log2(x) + !POW2_P(x);
+    long s1 = shift/BITSPERDIG;
+    int s2 = (int)(shift%BITSPERDIG);
+    return big_shift3(x, 0, s1, s2);
 }
 
-#define LOG2_KARATSUBA_DIGITS 7
-#define KARATSUBA_DIGITS (1L<<LOG2_KARATSUBA_DIGITS)
-#define MAX_BIG2STR_TABLE_ENTRIES 64
+#define MAX_BASE36_POWER_TABLE_ENTRIES (SIZEOF_SIZE_T * CHAR_BIT + 1)
 
-static VALUE big2str_power_cache[35][MAX_BIG2STR_TABLE_ENTRIES];
+static VALUE base36_power_cache[35][MAX_BASE36_POWER_TABLE_ENTRIES];
+static size_t base36_numdigits_cache[35][MAX_BASE36_POWER_TABLE_ENTRIES];
 
 static void
 power_cache_init(void)
 {
     int i, j;
     for (i = 0; i < 35; ++i) {
-	for (j = 0; j < MAX_BIG2STR_TABLE_ENTRIES; ++j) {
-	    big2str_power_cache[i][j] = Qnil;
+	for (j = 0; j < MAX_BASE36_POWER_TABLE_ENTRIES; ++j) {
+	    base36_power_cache[i][j] = Qnil;
 	}
     }
 }
 
 static inline VALUE
-power_cache_get_power0(int base, int i)
+power_cache_get_power(int base, int power_level, size_t *numdigits_ret)
 {
-    if (NIL_P(big2str_power_cache[base - 2][i])) {
-	big2str_power_cache[base - 2][i] =
-	    i == 0 ? rb_big_pow(rb_int2big(base), INT2FIX(KARATSUBA_DIGITS))
-		   : bigsqr(power_cache_get_power0(base, i - 1));
-	rb_gc_register_mark_object(big2str_power_cache[base - 2][i]);
+    /*
+     * MAX_BASE36_POWER_TABLE_ENTRIES is big enough to that
+     * base36_power_cache[base][MAX_BASE36_POWER_TABLE_ENTRIES-1] fills whole memory.
+     * So MAX_BASE36_POWER_TABLE_ENTRIES <= power_level is not possible to calculate.
+     *
+     * number-of-bytes =
+     * log256(base36_power_cache[base][MAX_BASE36_POWER_TABLE_ENTRIES-1]) =
+     * log256(maxpow_in_bdigit_dbl(base)**(2**(MAX_BASE36_POWER_TABLE_ENTRIES-1))) =
+     * log256(maxpow_in_bdigit_dbl(base)**(2**(SIZEOF_SIZE_T*CHAR_BIT))) =
+     * (2**(SIZEOF_SIZE_T*CHAR_BIT))*log256(maxpow_in_bdigit_dbl(base)) =
+     * (256**SIZEOF_SIZE_T)*log256(maxpow_in_bdigit_dbl(base)) >
+     * (256**SIZEOF_SIZE_T)*(sizeof(BDIGIT_DBL)-1) >
+     * 256**SIZEOF_SIZE_T
+     */
+    if (MAX_BASE36_POWER_TABLE_ENTRIES <= power_level)
+        rb_bug("too big power number requested: maxpow_in_bdigit_dbl(%d)**(2**%d)", base, power_level);
+
+    if (NIL_P(base36_power_cache[base - 2][power_level])) {
+        VALUE power;
+        size_t numdigits;
+        if (power_level == 0) {
+            int numdigits0;
+            BDIGIT_DBL dd = maxpow_in_bdigit_dbl(base, &numdigits0);
+            power = bignew(2, 1);
+            bdigitdbl2bary(BDIGITS(power), 2, dd);
+            numdigits = numdigits0;
+        }
+        else {
+            power = bigtrunc(bigsq(power_cache_get_power(base, power_level - 1, &numdigits)));
+            numdigits *= 2;
+        }
+        rb_obj_hide(power);
+        base36_power_cache[base - 2][power_level] = power;
+        base36_numdigits_cache[base - 2][power_level] = numdigits;
+	rb_gc_register_mark_object(power);
     }
-    return big2str_power_cache[base - 2][i];
+    if (numdigits_ret)
+        *numdigits_ret = base36_numdigits_cache[base - 2][power_level];
+    return base36_power_cache[base - 2][power_level];
 }
 
-static VALUE
-power_cache_get_power(int base, long n1, long* m1)
-{
-    int i, m;
-    long j;
-    VALUE t;
-
-    if (n1 <= KARATSUBA_DIGITS)
-	rb_bug("n1 > KARATSUBA_DIGITS");
-
-    m = ceil_log2(n1);
-    if (m1) *m1 = 1 << m;
-    i = m - LOG2_KARATSUBA_DIGITS;
-    if (i >= MAX_BIG2STR_TABLE_ENTRIES)
-	i = MAX_BIG2STR_TABLE_ENTRIES - 1;
-    t = power_cache_get_power0(base, i);
+struct big2str_struct {
+    int negative;
+    int base;
+    BDIGIT_DBL hbase2;
+    int hbase2_numdigits;
+    VALUE result;
+    char *ptr;
+};
 
-    j = KARATSUBA_DIGITS*(1 << i);
-    while (n1 > j) {
-	t = bigsqr(t);
-	j *= 2;
-    }
-    return t;
+static void
+big2str_alloc(struct big2str_struct *b2s, size_t len)
+{
+    if (LONG_MAX-1 < len)
+        rb_raise(rb_eArgError, "too big number");
+    b2s->result = rb_usascii_str_new(0, (long)(len + 1)); /* plus one for sign */
+    b2s->ptr = RSTRING_PTR(b2s->result);
+    if (b2s->negative)
+        *b2s->ptr++ = '-';
 }
 
-/* big2str_muraken_find_n1
- *
- * Let a natural number x is given by:
- * x = 2^0 * x_0 + 2^1 * x_1 + ... + 2^(B*n_0 - 1) * x_{B*n_0 - 1},
- * where B is BITSPERDIG (i.e. BDIGITS*CHAR_BIT) and n_0 is
- * RBIGNUM_LEN(x).
- *
- * Now, we assume n_1 = min_n \{ n | 2^(B*n_0/2) <= b_1^(n_1) \}, so
- * it is realized that 2^(B*n_0) <= {b_1}^{2*n_1}, where b_1 is a
- * given radix number. And then, we have n_1 <= (B*n_0) /
- * (2*log_2(b_1)), therefore n_1 is given by ceil((B*n_0) /
- * (2*log_2(b_1))).
- */
-static long
-big2str_find_n1(VALUE x, int base)
-{
-    static const double log_2[] = {
-	1.0,              1.58496250072116, 2.0,
-	2.32192809488736, 2.58496250072116, 2.8073549220576,
-	3.0,              3.16992500144231, 3.32192809488736,
-	3.4594316186373,  3.58496250072116, 3.70043971814109,
-	3.8073549220576,  3.90689059560852, 4.0,
-	4.08746284125034, 4.16992500144231, 4.24792751344359,
-	4.32192809488736, 4.39231742277876, 4.4594316186373,
-	4.52356195605701, 4.58496250072116, 4.64385618977472,
-	4.70043971814109, 4.75488750216347, 4.8073549220576,
-	4.85798099512757, 4.90689059560852, 4.95419631038688,
-	5.0,              5.04439411935845, 5.08746284125034,
-	5.12928301694497, 5.16992500144231
-    };
-    long bits;
-
-    if (base < 2 || 36 < base)
-	rb_bug("invalid radix %d", base);
-
-    if (FIXNUM_P(x)) {
-	bits = (SIZEOF_LONG*CHAR_BIT - 1)/2 + 1;
-    }
-    else if (BIGZEROP(x)) {
-	return 0;
-    }
-    else if (RBIGNUM_LEN(x) >= LONG_MAX/BITSPERDIG) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
+static void
+big2str_2bdigits(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t taillen)
+{
+    size_t j;
+    BDIGIT_DBL num;
+    char buf[SIZEOF_BDIGIT_DBL*CHAR_BIT], *p;
+    int beginning = !b2s->ptr;
+    size_t len = 0;
+
+    assert(xn <= 2);
+    num = bary2bdigitdbl(xds, xn);
+
+    if (beginning) {
+        if (num == 0)
+            return;
+        p = buf;
+        j = sizeof(buf);
+        do {
+            BDIGIT_DBL idx = num % b2s->base;
+            num /= b2s->base;
+            p[--j] = ruby_digitmap[idx];
+        } while (num);
+        len = sizeof(buf) - j;
+        big2str_alloc(b2s, len + taillen);
+	MEMCPY(b2s->ptr, buf + j, char, len);
     }
     else {
-	bits = BITSPERDIG*RBIGNUM_LEN(x);
+        p = b2s->ptr;
+        j = b2s->hbase2_numdigits;
+        do {
+            BDIGIT_DBL idx = num % b2s->base;
+            num /= b2s->base;
+            p[--j] = ruby_digitmap[idx];
+        } while (j);
+        len = b2s->hbase2_numdigits;
     }
-
-    return (long)ceil(bits/log_2[base - 2]);
+    b2s->ptr += len;
 }
 
-static long
-big2str_orig(VALUE x, int base, char* ptr, long len, long hbase, int trim)
+static void
+big2str_karatsuba(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t wn,
+		  int power_level, size_t taillen)
 {
-    long i = RBIGNUM_LEN(x), j = len;
-    BDIGIT* ds = BDIGITS(x);
+    VALUE b;
+    size_t half_numdigits, lower_numdigits;
+    int lower_power_level;
+    size_t bn;
+    const BDIGIT *bds;
+    size_t len;
 
-    while (i && j > 0) {
-	long k = i;
-	BDIGIT_DBL num = 0;
+    /*
+     * Precondition:
+     * abs(x) < maxpow**(2**power_level)
+     * where
+     *   maxpow = maxpow_in_bdigit_dbl(base, &numdigits)
+     *
+     * This function generates sequence of zeros, and then stringized abs(x) into b2s->ptr.
+     *
+     * b2s->ptr can be NULL.
+     * It is allocated when the first character is generated via big2str_alloc.
+     *
+     * The prefix zeros should be generated if and only if b2s->ptr is not NULL.
+     * When the zeros are generated, the zeros and abs(x) consists
+     * numdigits*(2**power_level) characters at total.
+     *
+     * Note:
+     * power_cache_get_power(base, power_level, &len) may not be cached yet. It should not be called.
+     * power_cache_get_power(base, power_level-1, &len) should be cached already if 0 <= power_level-1.
+     */
 
-	while (k--) {               /* x / hbase */
-	    num = BIGUP(num) + ds[k];
-	    ds[k] = (BDIGIT)(num / hbase);
-	    num %= hbase;
-	}
-	if (trim && ds[i-1] == 0) i--;
-	k = SIZEOF_BDIGITS;
-	while (k--) {
-	    ptr[--j] = ruby_digitmap[num % base];
-	    num /= base;
-	    if (j <= 0) break;
-	    if (trim && i == 0 && num == 0) break;
+    if (xn == 0 || bary_zero_p(xds, xn)) {
+	if (b2s->ptr) {
+            /* When x is zero, power_cache_get_power(base, power_level) should be cached already. */
+            power_cache_get_power(b2s->base, power_level, &len);
+	    memset(b2s->ptr, '0', len);
+            b2s->ptr += len;
 	}
+        return;
     }
-    if (trim) {
-	while (j < len && ptr[j] == '0') j++;
-	MEMMOVE(ptr, ptr + j, char, len - j);
-	len -= j;
+
+    if (power_level == 0) {
+	big2str_2bdigits(b2s, xds, xn, taillen);
+        return;
     }
-    return len;
-}
 
-static long
-big2str_karatsuba(VALUE x, int base, char* ptr,
-		  long n1, long len, long hbase, int trim)
-{
-    long lh, ll, m1;
-    VALUE b, q, r;
+    lower_power_level = power_level-1;
+    b = power_cache_get_power(b2s->base, lower_power_level, &lower_numdigits);
+    bn = BIGNUM_LEN(b);
+    bds = BDIGITS(b);
 
-    if (BIGZEROP(x)) {
-	if (trim) return 0;
-	else {
-	    memset(ptr, '0', len);
-	    return len;
-	}
+    half_numdigits = lower_numdigits;
+
+    while (0 < lower_power_level &&
+            (xn < bn ||
+             (xn == bn && bary_cmp(xds, xn, bds, bn) < 0))) {
+        lower_power_level--;
+        b = power_cache_get_power(b2s->base, lower_power_level, &lower_numdigits);
+        bn = BIGNUM_LEN(b);
+        bds = BDIGITS(b);
     }
 
-    if (n1 <= KARATSUBA_DIGITS) {
-	return big2str_orig(x, base, ptr, len, hbase, trim);
+    if (lower_power_level == 0 &&
+            (xn < bn ||
+             (xn == bn && bary_cmp(xds, xn, bds, bn) < 0))) {
+        if (b2s->ptr) {
+            len = half_numdigits * 2 - lower_numdigits;
+            memset(b2s->ptr, '0', len);
+            b2s->ptr += len;
+        }
+	big2str_2bdigits(b2s, xds, xn, taillen);
     }
+    else {
+        BDIGIT *qds, *rds;
+        size_t qn, rn;
+        BDIGIT *tds;
+        int shift;
+
+        if (lower_power_level != power_level-1 && b2s->ptr) {
+            len = (half_numdigits - lower_numdigits) * 2;
+            memset(b2s->ptr, '0', len);
+            b2s->ptr += len;
+        }
+
+        shift = nlz(bds[bn-1]);
+
+        qn = xn + BIGDIVREM_EXTRA_WORDS;
 
-    b = power_cache_get_power(base, n1, &m1);
-    bigdivmod(x, b, &q, &r);
-    lh = big2str_karatsuba(q, base, ptr, (len - m1)/2,
-			   len - m1, hbase, trim);
-    rb_big_resize(q, 0);
-    ll = big2str_karatsuba(r, base, ptr + lh, m1/2,
-			   m1, hbase, !lh && trim);
-    rb_big_resize(r, 0);
+        if (shift == 0) {
+            /* bigdivrem_restoring will not modify y.
+             * So use bds directly.  */
+            tds = (BDIGIT *)bds;
+            xds[xn] = 0;
+        }
+        else {
+            /* bigdivrem_restoring will modify y.
+             * So use temporary buffer.  */
+            tds = xds + qn;
+            assert(qn + bn <= xn + wn);
+            bary_small_lshift(tds, bds, bn, shift);
+            xds[xn] = bary_small_lshift(xds, xds, xn, shift);
+        }
 
-    return lh + ll;
+        bigdivrem_restoring(xds, qn, tds, bn);
+
+        rds = xds;
+        rn = bn;
+
+        qds = xds + bn;
+        qn = qn - bn;
+
+        if (shift) {
+            bary_small_rshift(rds, rds, rn, shift, 0);
+        }
+
+        BARY_TRUNC(qds, qn);
+        assert(qn <= bn);
+        big2str_karatsuba(b2s, qds, qn, xn+wn - (rn+qn), lower_power_level, lower_numdigits+taillen);
+        BARY_TRUNC(rds, rn);
+        big2str_karatsuba(b2s, rds, rn, xn+wn - rn, lower_power_level, taillen);
+    }
+}
+
+static VALUE
+big2str_base_poweroftwo(VALUE x, int base)
+{
+    int word_numbits = ffs(base) - 1;
+    size_t numwords;
+    VALUE result;
+    char *ptr;
+    numwords = rb_absint_numwords(x, word_numbits, NULL);
+    if (BIGNUM_NEGATIVE_P(x)) {
+        if (LONG_MAX-1 < numwords)
+            rb_raise(rb_eArgError, "too big number");
+        result = rb_usascii_str_new(0, 1+numwords);
+        ptr = RSTRING_PTR(result);
+        *ptr++ = BIGNUM_POSITIVE_P(x) ? '+' : '-';
+    }
+    else {
+        if (LONG_MAX < numwords)
+            rb_raise(rb_eArgError, "too big number");
+        result = rb_usascii_str_new(0, numwords);
+        ptr = RSTRING_PTR(result);
+    }
+    rb_integer_pack(x, ptr, numwords, 1, CHAR_BIT-word_numbits,
+                    INTEGER_PACK_BIG_ENDIAN);
+    while (0 < numwords) {
+        *ptr = ruby_digitmap[*(unsigned char *)ptr];
+        ptr++;
+        numwords--;
+    }
+    return result;
 }
 
 VALUE
-rb_big2str0(VALUE x, int base, int trim)
+rb_big2str_poweroftwo(VALUE x, int base)
 {
-    int off;
-    VALUE ss, xx;
-    long n1, n2, len, hbase;
-    char* ptr;
+    return big2str_base_poweroftwo(x, base);
+}
 
-    if (FIXNUM_P(x)) {
-	return rb_fix2str(x, base);
-    }
-    if (BIGZEROP(x)) {
+static VALUE
+big2str_generic(VALUE x, int base)
+{
+    BDIGIT *xds;
+    size_t xn;
+    struct big2str_struct b2s_data;
+    int power_level;
+    VALUE power;
+
+    xds = BDIGITS(x);
+    xn = BIGNUM_LEN(x);
+    BARY_TRUNC(xds, xn);
+
+    if (xn == 0) {
 	return rb_usascii_str_new2("0");
     }
 
-    if (base < 2 || 36 < base)
-	rb_raise(rb_eArgError, "invalid radix %d", base);
+    if (!valid_radix_p(base))
+	invalid_radix(base);
 
-    n2 = big2str_find_n1(x, base);
-    n1 = (n2 + 1) / 2;
-    ss = rb_usascii_str_new(0, n2 + 1); /* plus one for sign */
-    ptr = RSTRING_PTR(ss);
-    ptr[0] = RBIGNUM_SIGN(x) ? '+' : '-';
+    if (xn >= LONG_MAX/BITSPERDIG) {
+        rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
+    }
 
-    hbase = base*base;
-#if SIZEOF_BDIGITS > 2
-    hbase *= hbase;
-#endif
-    off = !(trim && RBIGNUM_SIGN(x)); /* erase plus sign if trim */
-    xx = rb_big_clone(x);
-    RBIGNUM_SET_SIGN(xx, 1);
-    if (n1 <= KARATSUBA_DIGITS) {
-	len = off + big2str_orig(xx, base, ptr + off, n2, hbase, trim);
+    power_level = 0;
+    power = power_cache_get_power(base, power_level, NULL);
+    while (power_level < MAX_BASE36_POWER_TABLE_ENTRIES &&
+           (size_t)BIGNUM_LEN(power) <= (xn+1)/2) {
+        power_level++;
+        power = power_cache_get_power(base, power_level, NULL);
+    }
+    assert(power_level != MAX_BASE36_POWER_TABLE_ENTRIES);
+
+    if ((size_t)BIGNUM_LEN(power) <= xn) {
+        /*
+         * This increment guarantees x < power_cache_get_power(base, power_level)
+         * without invoking it actually.
+         * (power_cache_get_power(base, power_level) can be slow and not used
+         * in big2str_karatsuba.)
+         *
+         * Although it is possible that x < power_cache_get_power(base, power_level-1),
+         * it is no problem because big2str_karatsuba checks it and
+         * doesn't affect the result when b2s_data.ptr is NULL.
+         */
+        power_level++;
+    }
+
+    b2s_data.negative = BIGNUM_NEGATIVE_P(x);
+    b2s_data.base = base;
+    b2s_data.hbase2 = maxpow_in_bdigit_dbl(base, &b2s_data.hbase2_numdigits);
+
+    b2s_data.result = Qnil;
+    b2s_data.ptr = NULL;
+
+    if (power_level == 0) {
+	big2str_2bdigits(&b2s_data, xds, xn, 0);
     }
     else {
-	len = off + big2str_karatsuba(xx, base, ptr + off, n1,
-				      n2, hbase, trim);
+        VALUE tmpw = 0;
+        BDIGIT *wds;
+        size_t wn;
+        wn = power_level * BIGDIVREM_EXTRA_WORDS + BIGNUM_LEN(power);
+        wds = ALLOCV_N(BDIGIT, tmpw, xn + wn);
+        MEMCPY(wds, xds, BDIGIT, xn);
+	big2str_karatsuba(&b2s_data, wds, xn, wn, power_level, 0);
+        if (tmpw)
+            ALLOCV_END(tmpw);
     }
-    rb_big_resize(xx, 0);
+    RB_GC_GUARD(x);
 
-    ptr[len] = '\0';
-    rb_str_resize(ss, len);
+    *b2s_data.ptr = '\0';
+    rb_str_resize(b2s_data.result, (long)(b2s_data.ptr - RSTRING_PTR(b2s_data.result)));
 
-    return ss;
+    RB_GC_GUARD(x);
+    return b2s_data.result;
 }
 
 VALUE
-rb_big2str(VALUE x, int base)
+rb_big2str_generic(VALUE x, int base)
 {
-    return rb_big2str0(x, base, 1);
+    return big2str_generic(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"
- */
-
+#ifdef USE_GMP
 static VALUE
-rb_big_to_s(int argc, VALUE *argv, VALUE x)
+big2str_gmp(VALUE x, int base)
 {
-    int base;
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
+    mpz_t mx;
+    size_t size;
+    VALUE str;
+    BDIGIT *xds = BDIGITS(x);
+    size_t xn = BIGNUM_LEN(x);
 
-    if (argc == 0) base = 10;
+    mpz_init(mx);
+    mpz_import(mx, xn, -1, sizeof(BDIGIT), 0, nails, xds);
+
+    size = mpz_sizeinbase(mx, base);
+
+    if (BIGNUM_NEGATIVE_P(x)) {
+        mpz_neg(mx, mx);
+        str = rb_usascii_str_new(0, size+1);
+    }
     else {
-	VALUE b;
+        str = rb_usascii_str_new(0, size);
+    }
+    mpz_get_str(RSTRING_PTR(str), base, mx);
+    mpz_clear(mx);
 
-	rb_scan_args(argc, argv, "01", &b);
-	base = NUM2INT(b);
+    if (RSTRING_PTR(str)[RSTRING_LEN(str)-1] == '\0') {
+        rb_str_set_len(str, RSTRING_LEN(str)-1);
     }
-    return rb_big2str(x, base);
+
+    RB_GC_GUARD(x);
+    return str;
+}
+
+VALUE
+rb_big2str_gmp(VALUE x, int base)
+{
+    return big2str_gmp(x, base);
 }
+#endif
 
 static VALUE
-big2ulong(VALUE x, const char *type, int check)
+rb_big2str1(VALUE x, int base)
 {
-    long len = RBIGNUM_LEN(x);
-    BDIGIT_DBL num;
-    BDIGIT *ds;
+    BDIGIT *xds;
+    size_t xn;
 
-    if (len > DIGSPERLONG) {
-	if (check)
-	    rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
-	len = DIGSPERLONG;
+    if (FIXNUM_P(x)) {
+	return rb_fix2str(x, base);
     }
-    ds = BDIGITS(x);
-    num = 0;
-    while (len--) {
-	num = BIGUP(num);
-	num += ds[len];
+
+    bigtrunc(x);
+    xds = BDIGITS(x);
+    xn = BIGNUM_LEN(x);
+    BARY_TRUNC(xds, xn);
+
+    if (xn == 0) {
+	return rb_usascii_str_new2("0");
+    }
+
+    if (!valid_radix_p(base))
+	invalid_radix(base);
+
+    if (xn >= LONG_MAX/BITSPERDIG) {
+        rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
+    }
+
+    if (POW2_P(base)) {
+        /* base == 2 || base == 4 || base == 8 || base == 16 || base == 32 */
+        return big2str_base_poweroftwo(x, base);
+    }
+
+#ifdef USE_GMP
+    if (GMP_BIG2STR_DIGITS < xn) {
+        return big2str_gmp(x, base);
     }
-    return (VALUE)num;
+#endif
+
+    return big2str_generic(x, base);
 }
 
 VALUE
-rb_big2ulong_pack(VALUE x)
+rb_big2str(VALUE x, int base)
+{
+    return rb_big2str1(x, base);
+}
+
+static unsigned long
+big2ulong(VALUE x, const char *type)
 {
-    VALUE num = big2ulong(x, "unsigned long", FALSE);
-    if (!RBIGNUM_SIGN(x)) {
-	return (VALUE)(-(SIGNED_VALUE)num);
+#if SIZEOF_LONG > SIZEOF_BDIGIT
+    size_t i;
+#endif
+    size_t len = BIGNUM_LEN(x);
+    unsigned long num;
+    BDIGIT *ds;
+
+    if (len == 0)
+        return 0;
+    if (BIGSIZE(x) > sizeof(long)) {
+        rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
     }
+    ds = BDIGITS(x);
+#if SIZEOF_LONG <= SIZEOF_BDIGIT
+    num = (unsigned long)ds[0];
+#else
+    num = 0;
+    for (i = 0; i < len; i++) {
+	num <<= BITSPERDIG;
+        num += (unsigned long)ds[len - i - 1]; /* overflow is already checked */
+    }
+#endif
     return num;
 }
 
-VALUE
+unsigned long
 rb_big2ulong(VALUE x)
 {
-    VALUE num = big2ulong(x, "unsigned long", TRUE);
+    unsigned long num = big2ulong(x, "unsigned long");
 
-    if (!RBIGNUM_SIGN(x)) {
-	if ((long)num < 0) {
-	    rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
-	}
-	return (VALUE)(-(SIGNED_VALUE)num);
+    if (BIGNUM_POSITIVE_P(x)) {
+        return num;
     }
-    return num;
+    else {
+        if (num <= 1+(unsigned long)(-(LONG_MIN+1)))
+            return -(long)(num-1)-1;
+    }
+    rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
 }
 
-SIGNED_VALUE
+long
 rb_big2long(VALUE x)
 {
-    VALUE num = big2ulong(x, "long", TRUE);
+    unsigned long num = big2ulong(x, "long");
 
-    if ((long)num < 0 &&
-	(RBIGNUM_SIGN(x) || (long)num != LONG_MIN)) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
+    if (BIGNUM_POSITIVE_P(x)) {
+        if (num <= LONG_MAX)
+            return num;
     }
-    if (!RBIGNUM_SIGN(x)) return -(SIGNED_VALUE)num;
-    return num;
+    else {
+        if (num <= 1+(unsigned long)(-(LONG_MIN+1)))
+            return -(long)(num-1)-1;
+    }
+    rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
 }
 
 #if HAVE_LONG_LONG
@@ -1236,18 +5157,26 @@ rb_big2long(VALUE x)
 static unsigned LONG_LONG
 big2ull(VALUE x, const char *type)
 {
-    long len = RBIGNUM_LEN(x);
-    BDIGIT_DBL num;
-    BDIGIT *ds;
+#if SIZEOF_LONG_LONG > SIZEOF_BDIGIT
+    size_t i;
+#endif
+    size_t len = BIGNUM_LEN(x);
+    unsigned LONG_LONG num;
+    BDIGIT *ds = BDIGITS(x);
 
-    if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
+    if (len == 0)
+        return 0;
+    if (BIGSIZE(x) > SIZEOF_LONG_LONG)
 	rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
-    ds = BDIGITS(x);
+#if SIZEOF_LONG_LONG <= SIZEOF_BDIGIT
+    num = (unsigned LONG_LONG)ds[0];
+#else
     num = 0;
-    while (len--) {
+    for (i = 0; i < len; i++) {
 	num = BIGUP(num);
-	num += ds[len];
+        num += ds[len - i - 1];
     }
+#endif
     return num;
 }
 
@@ -1256,9 +5185,14 @@ rb_big2ull(VALUE x)
 {
     unsigned LONG_LONG num = big2ull(x, "unsigned long long");
 
-    if (!RBIGNUM_SIGN(x))
-	return (VALUE)(-(SIGNED_VALUE)num);
-    return num;
+    if (BIGNUM_POSITIVE_P(x)) {
+        return num;
+    }
+    else {
+        if (num <= 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
+            return -(LONG_LONG)(num-1)-1;
+    }
+    rb_raise(rb_eRangeError, "bignum out of range of unsigned long long");
 }
 
 LONG_LONG
@@ -1266,12 +5200,15 @@ rb_big2ll(VALUE x)
 {
     unsigned LONG_LONG num = big2ull(x, "long long");
 
-    if ((LONG_LONG)num < 0 && (RBIGNUM_SIGN(x)
-			       || (LONG_LONG)num != LLONG_MIN)) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
+    if (BIGNUM_POSITIVE_P(x)) {
+        if (num <= LLONG_MAX)
+            return num;
     }
-    if (!RBIGNUM_SIGN(x)) return -(LONG_LONG)num;
-    return num;
+    else {
+        if (num <= 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
+            return -(LONG_LONG)(num-1)-1;
+    }
+    rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
 }
 
 #endif  /* HAVE_LONG_LONG */
@@ -1292,7 +5229,7 @@ dbl2big(double d)
 	rb_raise(rb_eFloatDomainError, "NaN");
     }
 
-    while (!POSFIXABLE(u) || 0 != (long)u) {
+    while (1.0 <= u) {
 	u /= (double)(BIGRAD);
 	i++;
     }
@@ -1314,32 +5251,11 @@ rb_dbl2big(double d)
     return bignorm(dbl2big(d));
 }
 
-static int
-nlz(BDIGIT x)
-{
-    BDIGIT y;
-    int n = BITSPERDIG;
-#if BITSPERDIG > 64
-    y = x >> 64; if (y) {n -= 64; x = y;}
-#endif
-#if BITSPERDIG > 32
-    y = x >> 32; if (y) {n -= 32; x = y;}
-#endif
-#if BITSPERDIG > 16
-    y = x >> 16; if (y) {n -= 16; x = y;}
-#endif
-    y = x >>  8; if (y) {n -=  8; x = y;}
-    y = x >>  4; if (y) {n -=  4; x = y;}
-    y = x >>  2; if (y) {n -=  2; x = y;}
-    y = x >>  1; if (y) {return n - 2;}
-    return n - x;
-}
-
 static double
 big2dbl(VALUE x)
 {
     double d = 0.0;
-    long i = (bigtrunc(x), RBIGNUM_LEN(x)), lo = 0, bits;
+    long i = (bigtrunc(x), BIGNUM_LEN(x)), lo = 0, bits;
     BDIGIT *ds = BDIGITS(x), dl;
 
     if (i) {
@@ -1356,16 +5272,22 @@ big2dbl(VALUE x)
 		d = ds[i] + BIGRAD*d;
 	    }
 	    dl = ds[i];
-	    if (bits && (dl & (1UL << (bits %= BITSPERDIG)))) {
-		int carry = dl & ~(~(BDIGIT)0 << bits);
+	    if (bits && (dl & ((BDIGIT)1 << (bits %= BITSPERDIG)))) {
+		int carry = (dl & ~(BDIGMAX << bits)) != 0;
 		if (!carry) {
 		    while (i-- > 0) {
-			if ((carry = ds[i]) != 0) break;
+			carry = ds[i] != 0;
+			if (carry) break;
 		    }
 		}
 		if (carry) {
-		    dl &= (BDIGIT)~0 << bits;
-		    dl += (BDIGIT)1 << bits;
+                    BDIGIT mask = BDIGMAX;
+                    BDIGIT bit = 1;
+                    mask <<= bits;
+                    bit <<= bits;
+                    dl &= mask;
+                    dl += bit;
+                    dl = BIGLO(dl);
 		    if (!dl) d += 1;
 		}
 	    }
@@ -1380,7 +5302,7 @@ big2dbl(VALUE x)
 	    }
 	}
     }
-    if (!RBIGNUM_SIGN(x)) d = -d;
+    if (BIGNUM_NEGATIVE_P(x)) d = -d;
     return d;
 }
 
@@ -1399,181 +5321,192 @@ 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)
+VALUE
+rb_integer_float_cmp(VALUE x, VALUE y)
 {
-    return DBL2NUM(rb_big2dbl(x));
+    double yd = RFLOAT_VALUE(y);
+    double yi, yf;
+    VALUE rel;
+
+    if (isnan(yd))
+        return Qnil;
+    if (isinf(yd)) {
+        if (yd > 0.0) return INT2FIX(-1);
+        else return INT2FIX(1);
+    }
+    yf = modf(yd, &yi);
+    if (FIXNUM_P(x)) {
+#if SIZEOF_LONG * CHAR_BIT < DBL_MANT_DIG /* assume FLT_RADIX == 2 */
+        double xd = (double)FIX2LONG(x);
+        if (xd < yd)
+            return INT2FIX(-1);
+        if (xd > yd)
+            return INT2FIX(1);
+        return INT2FIX(0);
+#else
+        long xn, yn;
+        if (yi < FIXNUM_MIN)
+            return INT2FIX(1);
+        if (FIXNUM_MAX+1 <= yi)
+            return INT2FIX(-1);
+        xn = FIX2LONG(x);
+        yn = (long)yi;
+        if (xn < yn)
+            return INT2FIX(-1);
+        if (xn > yn)
+            return INT2FIX(1);
+        if (yf < 0.0)
+            return INT2FIX(1);
+        if (0.0 < yf)
+            return INT2FIX(-1);
+        return INT2FIX(0);
+#endif
+    }
+    y = rb_dbl2big(yi);
+    rel = rb_big_cmp(x, y);
+    if (yf == 0.0 || rel != INT2FIX(0))
+        return rel;
+    if (yf < 0.0)
+        return INT2FIX(1);
+    return INT2FIX(-1);
 }
 
-/*
- *  call-seq:
- *     big <=> numeric   -> -1, 0, +1 or nil
- *
- *  Comparison---Returns -1, 0, or +1 depending on whether <i>big</i> is
- *  less than, equal to, or greater than <i>numeric</i>. This is the
- *  basis for the tests in <code>Comparable</code>.
- *
- */
+#if SIZEOF_LONG * CHAR_BIT >= DBL_MANT_DIG /* assume FLT_RADIX == 2 */
+COMPILER_WARNING_PUSH
+#ifdef __has_warning
+#if __has_warning("-Wimplicit-int-float-conversion")
+COMPILER_WARNING_IGNORED(-Wimplicit-int-float-conversion)
+#endif
+#endif
+static const double LONG_MAX_as_double = LONG_MAX;
+COMPILER_WARNING_POP
+#endif
 
 VALUE
-rb_big_cmp(VALUE x, VALUE y)
+rb_integer_float_eq(VALUE x, VALUE y)
 {
-    long xlen = RBIGNUM_LEN(x);
-    BDIGIT *xds, *yds;
-
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	break;
+    double yd = RFLOAT_VALUE(y);
+    double yi, yf;
 
-      case T_BIGNUM:
-	break;
+    if (isnan(yd) || isinf(yd))
+        return Qfalse;
+    yf = modf(yd, &yi);
+    if (yf != 0)
+        return Qfalse;
+    if (FIXNUM_P(x)) {
+#if SIZEOF_LONG * CHAR_BIT < DBL_MANT_DIG /* assume FLT_RADIX == 2 */
+        double xd = (double)FIX2LONG(x);
+        if (xd != yd)
+            return Qfalse;
+        return Qtrue;
+#else
+        long xn, yn;
+        if (yi < LONG_MIN || LONG_MAX_as_double <= yi)
+            return Qfalse;
+        xn = FIX2LONG(x);
+        yn = (long)yi;
+        if (xn != yn)
+            return Qfalse;
+        return Qtrue;
+#endif
+    }
+    y = rb_dbl2big(yi);
+    return rb_big_eq(x, y);
+}
 
-      case T_FLOAT:
-	{
-	    double a = RFLOAT_VALUE(y);
 
-	    if (isinf(a)) {
-		if (a > 0.0) return INT2FIX(-1);
-		else return INT2FIX(1);
-	    }
-	    return rb_dbl_cmp(rb_big2dbl(x), a);
+VALUE
+rb_big_cmp(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(y)) {
+	x = bigfixize(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);
+        }
+    }
+    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);
 	}
-
-      default:
-	return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
     }
-
-    if (RBIGNUM_SIGN(x) > RBIGNUM_SIGN(y)) return INT2FIX(1);
-    if (RBIGNUM_SIGN(x) < RBIGNUM_SIGN(y)) return INT2FIX(-1);
-    if (xlen < RBIGNUM_LEN(y))
-	return (RBIGNUM_SIGN(x)) ? INT2FIX(-1) : INT2FIX(1);
-    if (xlen > RBIGNUM_LEN(y))
-	return (RBIGNUM_SIGN(x)) ? INT2FIX(1) : INT2FIX(-1);
-
-    xds = BDIGITS(x);
-    yds = BDIGITS(y);
-
-    while(xlen-- && (xds[xlen]==yds[xlen]));
-    if (-1 == xlen) return INT2FIX(0);
-    return (xds[xlen] > yds[xlen]) ?
-	(RBIGNUM_SIGN(x) ? INT2FIX(1) : INT2FIX(-1)) :
-	    (RBIGNUM_SIGN(x) ? INT2FIX(-1) : INT2FIX(1));
+    else if (RB_FLOAT_TYPE_P(y)) {
+        return rb_integer_float_cmp(x, y);
+    }
+    else {
+	return rb_num_coerce_cmp(x, y, idCmp);
+    }
+    return INT2FIX(BIGNUM_SIGN(x) ? 1 : -1);
 }
 
+enum big_op_t {
+    big_op_gt,
+    big_op_ge,
+    big_op_lt,
+    big_op_le
+};
+
 static VALUE
-big_op(VALUE x, VALUE y, int op)
+big_op(VALUE x, VALUE y, enum big_op_t op)
 {
     VALUE rel;
     int n;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
+    if (RB_INTEGER_TYPE_P(y)) {
 	rel = rb_big_cmp(x, y);
-	break;
-
-      case T_FLOAT:
-	{
-	    double a = RFLOAT_VALUE(y);
-
-	    if (isinf(a)) {
-		if (a > 0.0) rel = INT2FIX(-1);
-		else rel = INT2FIX(1);
-		break;
-	    }
-	    rel = rb_dbl_cmp(rb_big2dbl(x), a);
-	    break;
-	}
-
-      default:
-	{
-	    ID id = 0;
-	    switch (op) {
-		case 0: id = '>'; break;
-		case 1: id = rb_intern(">="); break;
-		case 2: id = '<'; break;
-		case 3: id = rb_intern("<="); break;
-	    }
-	    return rb_num_coerce_relop(x, y, id);
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
+        rel = rb_integer_float_cmp(x, y);
+    }
+    else {
+	ID id = 0;
+	switch (op) {
+	  case big_op_gt: id = '>'; break;
+	  case big_op_ge: id = idGE; break;
+	  case big_op_lt: id = '<'; break;
+	  case big_op_le: id = idLE; break;
 	}
+	return rb_num_coerce_relop(x, y, id);
     }
 
     if (NIL_P(rel)) return Qfalse;
     n = FIX2INT(rel);
 
     switch (op) {
-	case 0: return n >  0 ? Qtrue : Qfalse;
-	case 1: return n >= 0 ? Qtrue : Qfalse;
-	case 2: return n <  0 ? Qtrue : Qfalse;
-	case 3: return n <= 0 ? Qtrue : Qfalse;
+	case big_op_gt: return n >  0 ? Qtrue : Qfalse;
+	case big_op_ge: return n >= 0 ? Qtrue : Qfalse;
+	case big_op_lt: return n <  0 ? Qtrue : Qfalse;
+	case big_op_le: return n <= 0 ? Qtrue : Qfalse;
     }
     return Qundef;
 }
 
-/*
- * call-seq:
- *   big > real  ->  true or false
- *
- * Returns <code>true</code> if the value of <code>big</code> is
- * greater than that of <code>real</code>.
- */
-
-static VALUE
-big_gt(VALUE x, VALUE y)
+VALUE
+rb_big_gt(VALUE x, VALUE y)
 {
-    return big_op(x, y, 0);
+    return big_op(x, y, big_op_gt);
 }
 
-/*
- * 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)
+VALUE
+rb_big_ge(VALUE x, VALUE y)
 {
-    return big_op(x, y, 1);
+    return big_op(x, y, big_op_ge);
 }
 
-/*
- * 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)
+VALUE
+rb_big_lt(VALUE x, VALUE y)
 {
-    return big_op(x, y, 2);
+    return big_op(x, y, big_op_lt);
 }
 
-/*
- * 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)
+VALUE
+rb_big_le(VALUE x, VALUE y)
 {
-    return big_op(x, y, 3);
+    return big_op(x, y, big_op_le);
 }
 
 /*
@@ -1581,8 +5514,8 @@ 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>Bignum#eql?</code>, which
- *  requires <i>obj</i> to be a <code>Bignum</code>.
+ *  as <i>big</i>. Contrast this with Integer#eql?, which requires
+ *  <i>obj</i> to be a Integer.
  *
  *     68719476736 == 68719476736.0   #=> true
  */
@@ -1590,156 +5523,90 @@ big_le(VALUE x, VALUE y)
 VALUE
 rb_big_eq(VALUE x, VALUE y)
 {
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	break;
-      case T_BIGNUM:
-	break;
-      case T_FLOAT:
-	{
-	    volatile double a, b;
-
-	    a = RFLOAT_VALUE(y);
-	    if (isnan(a) || isinf(a)) return Qfalse;
-	    b = rb_big2dbl(x);
-	    return (a == b)?Qtrue:Qfalse;
-	}
-      default:
+    if (FIXNUM_P(y)) {
+	return bignorm(x) == y ? Qtrue : Qfalse;
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
+        return rb_integer_float_eq(x, y);
+    }
+    else {
 	return rb_equal(y, x);
     }
-    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y)) return Qfalse;
-    if (RBIGNUM_LEN(x) != RBIGNUM_LEN(y)) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM_LEN(y)) != 0) return Qfalse;
+    if (BIGNUM_SIGN(x) != BIGNUM_SIGN(y)) return Qfalse;
+    if (BIGNUM_LEN(x) != BIGNUM_LEN(y)) return Qfalse;
+    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,BIGNUM_LEN(y)) != 0) return Qfalse;
     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
- */
-
-static VALUE
+VALUE
 rb_big_eql(VALUE x, VALUE y)
 {
-    if (TYPE(y) != T_BIGNUM) return Qfalse;
-    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y)) return Qfalse;
-    if (RBIGNUM_LEN(x) != RBIGNUM_LEN(y)) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM_LEN(y)) != 0) return Qfalse;
+    if (!RB_BIGNUM_TYPE_P(y)) return Qfalse;
+    if (BIGNUM_SIGN(x) != BIGNUM_SIGN(y)) return Qfalse;
+    if (BIGNUM_LEN(x) != BIGNUM_LEN(y)) return Qfalse;
+    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,BIGNUM_LEN(y)) != 0) return Qfalse;
     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);
 
-    RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
+    BIGNUM_NEGATE(z);
 
     return bignorm(z);
 }
 
-/*
- * 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
+rb_big_comp(VALUE x)
 {
     VALUE z = rb_big_clone(x);
-    BDIGIT *ds;
-    long i;
-
-    if (!RBIGNUM_SIGN(x)) get2comp(z);
-    ds = BDIGITS(z);
-    i = RBIGNUM_LEN(x);
-    if (!i) return INT2FIX(~(SIGNED_VALUE)0);
-    while (i--) {
-	ds[i] = ~ds[i];
-    }
-    RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(z));
-    if (RBIGNUM_SIGN(x)) get2comp(z);
+    BDIGIT *ds = BDIGITS(z);
+    long n = BIGNUM_LEN(z);
 
-    return bignorm(z);
-}
-
-static void
-bigsub_core(BDIGIT *xds, long xn, BDIGIT *yds, long yn, BDIGIT *zds, long zn)
-{
-    BDIGIT_DBL_SIGNED num;
-    long i;
+    if (!n) return INT2FIX(-1);
 
-    for (i = 0, num = 0; i < yn; i++) {
-	num += (BDIGIT_DBL_SIGNED)xds[i] - yds[i];
-	zds[i] = BIGLO(num);
-	num = BIGDN(num);
-    }
-    while (num && i < xn) {
-	num += xds[i];
-	zds[i++] = BIGLO(num);
-	num = BIGDN(num);
-    }
-    while (i < xn) {
-	zds[i] = xds[i];
-	i++;
+    if (BIGNUM_POSITIVE_P(z)) {
+        if (bary_add_one(ds, n)) {
+            big_extend_carry(z);
+        }
+        BIGNUM_SET_NEGATIVE_SIGN(z);
     }
-    assert(i <= zn);
-    while (i < zn) {
-	zds[i++] = 0;
+    else {
+        bary_neg(ds, n);
+        if (bary_add_one(ds, n))
+            return INT2FIX(-1);
+        bary_neg(ds, n);
+        BIGNUM_SET_POSITIVE_SIGN(z);
     }
+
+    return bignorm(z);
 }
 
 static VALUE
 bigsub(VALUE x, VALUE y)
 {
-    VALUE z = 0;
-    long i = RBIGNUM_LEN(x);
-    BDIGIT *xds, *yds;
+    VALUE z;
+    BDIGIT *xds, *yds, *zds;
+    long xn, yn, zn;
 
-    /* if x is smaller than y, swap */
-    if (RBIGNUM_LEN(x) < RBIGNUM_LEN(y)) {
-	z = x; x = y; y = z;	/* swap x y */
-    }
-    else if (RBIGNUM_LEN(x) == RBIGNUM_LEN(y)) {
-	xds = BDIGITS(x);
-	yds = BDIGITS(y);
-	while (i > 0) {
-	    i--;
-	    if (xds[i] > yds[i]) {
-		break;
-	    }
-	    if (xds[i] < yds[i]) {
-		z = x; x = y; y = z;	/* swap x y */
-		break;
-	    }
-	}
-    }
+    xn = BIGNUM_LEN(x);
+    yn = BIGNUM_LEN(y);
+    zn = xn < yn ? yn : xn;
+
+    z = bignew(zn, 1);
+
+    xds = BDIGITS(x);
+    yds = BDIGITS(y);
+    zds = BDIGITS(z);
 
-    z = bignew(RBIGNUM_LEN(x), z==0);
-    bigsub_core(BDIGITS(x), RBIGNUM_LEN(x),
-		BDIGITS(y), RBIGNUM_LEN(y),
-		BDIGITS(z), RBIGNUM_LEN(z));
+    if (bary_sub(zds, zn, xds, xn, yds, yn)) {
+        bary_2comp(zds, zn);
+        BIGNUM_SET_NEGATIVE_SIGN(z);
+    }
 
     return z;
 }
@@ -1751,21 +5618,30 @@ bigsub_int(VALUE x, long y0)
 {
     VALUE z;
     BDIGIT *xds, *zds;
-    long xn;
+    long xn, zn;
     BDIGIT_DBL_SIGNED num;
     long i, y;
 
     y = y0;
     xds = BDIGITS(x);
-    xn = RBIGNUM_LEN(x);
+    xn = BIGNUM_LEN(x);
+
+    if (xn == 0)
+        return LONG2NUM(-y0);
 
-    z = bignew(xn, RBIGNUM_SIGN(x));
+    zn = xn;
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+    z = bignew(zn, BIGNUM_SIGN(x));
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS == SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
+    assert(xn == zn);
     num = (BDIGIT_DBL_SIGNED)xds[0] - y;
     if (xn == 1 && num < 0) {
-	RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
+	BIGNUM_NEGATE(z);
 	zds[0] = (BDIGIT)-num;
 	RB_GC_GUARD(x);
 	return bignorm(z);
@@ -1773,26 +5649,62 @@ bigsub_int(VALUE x, long y0)
     zds[0] = BIGLO(num);
     num = BIGDN(num);
     i = 1;
+    if (i < xn)
+        goto y_is_zero_x;
+    goto finish;
 #else
     num = 0;
-    for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
+    for (i=0; i < xn; i++) {
+        if (y == 0) goto y_is_zero_x;
 	num += (BDIGIT_DBL_SIGNED)xds[i] - BIGLO(y);
 	zds[i] = BIGLO(num);
 	num = BIGDN(num);
 	y = BIGDN(y);
     }
+    for (; i < zn; i++) {
+        if (y == 0) goto y_is_zero_z;
+        num -= BIGLO(y);
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
+        y = BIGDN(y);
+    }
+    goto finish;
 #endif
-    while (num && i < xn) {
+
+    for (; i < xn; i++) {
+      y_is_zero_x:
+        if (num == 0) goto num_is_zero_x;
 	num += xds[i];
-	zds[i++] = BIGLO(num);
+	zds[i] = BIGLO(num);
 	num = BIGDN(num);
     }
-    while (i < xn) {
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    for (; i < zn; i++) {
+      y_is_zero_z:
+        if (num == 0) goto num_is_zero_z;
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
+    }
+#endif
+    goto finish;
+
+    for (; i < xn; i++) {
+      num_is_zero_x:
 	zds[i] = xds[i];
-	i++;
     }
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    for (; i < zn; i++) {
+      num_is_zero_z:
+        zds[i] = 0;
+    }
+#endif
+    goto finish;
+
+  finish:
+    assert(num == 0 || num == -1);
     if (num < 0) {
-	z = bigsub(x, rb_int2big(y0));
+        get2comp(z);
+	BIGNUM_NEGATE(z);
     }
     RB_GC_GUARD(x);
     return bignorm(z);
@@ -1808,126 +5720,114 @@ bigadd_int(VALUE x, long y)
     long i;
 
     xds = BDIGITS(x);
-    xn = RBIGNUM_LEN(x);
+    xn = BIGNUM_LEN(x);
 
-    if (xn < 2) {
-	zn = 3;
-    }
-    else {
-	zn = xn + 1;
-    }
-    z = bignew(zn, RBIGNUM_SIGN(x));
+    if (xn == 0)
+        return LONG2NUM(y);
+
+    zn = xn;
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+    zn++;
+
+    z = bignew(zn, BIGNUM_SIGN(x));
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS == SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     num = (BDIGIT_DBL)xds[0] + y;
     zds[0] = BIGLO(num);
     num = BIGDN(num);
     i = 1;
+    if (i < xn)
+        goto y_is_zero_x;
+    goto y_is_zero_z;
 #else
     num = 0;
-    for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
+    for (i=0; i < xn; i++) {
+        if (y == 0) goto y_is_zero_x;
 	num += (BDIGIT_DBL)xds[i] + BIGLO(y);
 	zds[i] = BIGLO(num);
 	num = BIGDN(num);
 	y = BIGDN(y);
     }
-#endif
-    while (num && i < xn) {
-	num += xds[i];
-	zds[i++] = BIGLO(num);
+    for (; i < zn; i++) {
+        if (y == 0) goto y_is_zero_z;
+	num += BIGLO(y);
+	zds[i] = BIGLO(num);
 	num = BIGDN(num);
+	y = BIGDN(y);
     }
-    if (num) zds[i++] = (BDIGIT)num;
-    else while (i < xn) {
-	zds[i] = xds[i];
-	i++;
-    }
-    assert(i <= zn);
-    while (i < zn) {
-	zds[i++] = 0;
-    }
-    RB_GC_GUARD(x);
-    return bignorm(z);
-}
+    goto finish;
 
-static void
-bigadd_core(BDIGIT *xds, long xn, BDIGIT *yds, long yn, BDIGIT *zds, long zn)
-{
-    BDIGIT_DBL num = 0;
-    long i;
-
-    if (xn > yn) {
-	BDIGIT *tds;
-	tds = xds; xds = yds; yds = tds;
-	i = xn; xn = yn; yn = i;
-    }
+#endif
 
-    i = 0;
-    while (i < xn) {
-	num += (BDIGIT_DBL)xds[i] + yds[i];
-	zds[i++] = BIGLO(num);
+    for (;i < xn; i++) {
+      y_is_zero_x:
+        if (num == 0) goto num_is_zero_x;
+	num += (BDIGIT_DBL)xds[i];
+	zds[i] = BIGLO(num);
 	num = BIGDN(num);
     }
-    while (num && i < yn) {
-	num += yds[i];
-	zds[i++] = BIGLO(num);
+    for (; i < zn; i++) {
+      y_is_zero_z:
+        if (num == 0) goto num_is_zero_z;
+	zds[i] = BIGLO(num);
 	num = BIGDN(num);
     }
-    while (i < yn) {
-	zds[i] = yds[i];
-	i++;
+    goto finish;
+
+    for (;i < xn; i++) {
+      num_is_zero_x:
+	zds[i] = xds[i];
     }
-    if (num) zds[i++] = (BDIGIT)num;
-    assert(i <= zn);
-    while (i < zn) {
-	zds[i++] = 0;
+    for (; i < zn; i++) {
+      num_is_zero_z:
+	zds[i] = 0;
     }
+    goto finish;
+
+  finish:
+    RB_GC_GUARD(x);
+    return bignorm(z);
 }
 
 static VALUE
 bigadd(VALUE x, VALUE y, int sign)
 {
     VALUE z;
-    long len;
+    size_t len;
 
-    sign = (sign == RBIGNUM_SIGN(y));
-    if (RBIGNUM_SIGN(x) != sign) {
+    sign = (sign == BIGNUM_SIGN(y));
+    if (BIGNUM_SIGN(x) != sign) {
 	if (sign) return bigsub(y, x);
 	return bigsub(x, y);
     }
 
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	len = RBIGNUM_LEN(x) + 1;
+    if (BIGNUM_LEN(x) > BIGNUM_LEN(y)) {
+	len = BIGNUM_LEN(x) + 1;
     }
     else {
-	len = RBIGNUM_LEN(y) + 1;
+	len = BIGNUM_LEN(y) + 1;
     }
     z = bignew(len, sign);
 
-    bigadd_core(BDIGITS(x), RBIGNUM_LEN(x),
-		BDIGITS(y), RBIGNUM_LEN(y),
-		BDIGITS(z), RBIGNUM_LEN(z));
+    bary_add(BDIGITS(z), BIGNUM_LEN(z),
+             BDIGITS(x), BIGNUM_LEN(x),
+             BDIGITS(y), BIGNUM_LEN(y));
 
     return z;
 }
 
-/*
- *  call-seq:
- *     big + other  -> Numeric
- *
- *  Adds big and other, returning the result.
- */
-
 VALUE
 rb_big_plus(VALUE x, VALUE y)
 {
     long n;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	n = FIX2LONG(y);
-	if ((n > 0) != RBIGNUM_SIGN(x)) {
+	if ((n > 0) != BIGNUM_SIGN(x)) {
 	    if (n < 0) {
 		n = -n;
 	    }
@@ -1937,34 +5837,26 @@ rb_big_plus(VALUE x, VALUE y)
 	    n = -n;
 	}
 	return bigadd_int(x, n);
-
-      case T_BIGNUM:
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
 	return bignorm(bigadd(x, y, 1));
-
-      case T_FLOAT:
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
 	return DBL2NUM(rb_big2dbl(x) + RFLOAT_VALUE(y));
-
-      default:
+    }
+    else {
 	return rb_num_coerce_bin(x, y, '+');
     }
 }
 
-/*
- *  call-seq:
- *     big - other  -> Numeric
- *
- *  Subtracts other from big, returning the result.
- */
-
 VALUE
 rb_big_minus(VALUE x, VALUE y)
 {
     long n;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	n = FIX2LONG(y);
-	if ((n > 0) != RBIGNUM_SIGN(x)) {
+	if ((n > 0) != BIGNUM_SIGN(x)) {
 	    if (n < 0) {
 		n = -n;
 	    }
@@ -1974,773 +5866,178 @@ rb_big_minus(VALUE x, VALUE y)
 	    n = -n;
 	}
 	return bigsub_int(x, n);
-
-      case T_BIGNUM:
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
 	return bignorm(bigadd(x, y, 0));
-
-      case T_FLOAT:
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
 	return DBL2NUM(rb_big2dbl(x) - RFLOAT_VALUE(y));
-
-      default:
+    }
+    else {
 	return rb_num_coerce_bin(x, y, '-');
     }
 }
 
-static long
-big_real_len(VALUE x)
-{
-    long i = RBIGNUM_LEN(x);
-    BDIGIT *xds = BDIGITS(x);
-    while (--i && !xds[i]);
-    return i + 1;
-}
-
 static VALUE
-bigmul1_single(VALUE x, VALUE y)
+bigsq(VALUE x)
 {
-    BDIGIT_DBL n;
-    VALUE z = bignew(2, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
-    BDIGIT *xds, *yds, *zds;
-
-    xds = BDIGITS(x);
-    yds = BDIGITS(y);
-    zds = BDIGITS(z);
+    long xn, zn;
+    VALUE z;
+    BDIGIT *xds, *zds;
 
-    n = (BDIGIT_DBL)xds[0] * yds[0];
-    zds[0] = BIGLO(n);
-    zds[1] = (BDIGIT)BIGDN(n);
+    xn = BIGNUM_LEN(x);
+    zn = 2 * xn;
 
-    return z;
-}
-
-static VALUE
-bigmul1_normal(VALUE x, VALUE y)
-{
-    long xl = RBIGNUM_LEN(x), yl = RBIGNUM_LEN(y), i, j = xl + yl + 1;
-    BDIGIT_DBL n = 0;
-    VALUE z = bignew(j, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
-    BDIGIT *xds, *yds, *zds;
+    z = bignew(zn, 1);
 
     xds = BDIGITS(x);
-    yds = BDIGITS(y);
     zds = BDIGITS(z);
-    while (j--) zds[j] = 0;
-    for (i = 0; i < xl; i++) {
-	BDIGIT_DBL dd;
-	dd = xds[i];
-	if (dd == 0) continue;
-	n = 0;
-	for (j = 0; j < yl; j++) {
-	    BDIGIT_DBL ee = n + (BDIGIT_DBL)dd * yds[j];
-	    n = zds[i + j] + ee;
-	    if (ee) zds[i + j] = BIGLO(n);
-	    n = BIGDN(n);
-	}
-	if (n) {
-	    zds[i + j] = (BDIGIT)n;
-	}
-    }
-    rb_thread_check_ints();
-    return z;
-}
 
-static VALUE bigmul0(VALUE x, VALUE y);
-
-/* balancing multiplication by slicing larger argument */
-static VALUE
-bigmul1_balance(VALUE x, VALUE y)
-{
-    VALUE z, t1, t2;
-    long i, xn, yn, r, n;
-    BDIGIT *yds, *zds, *t1ds;
-
-    xn = RBIGNUM_LEN(x);
-    yn = RBIGNUM_LEN(y);
-    assert(2 * xn <= yn || 3 * xn <= 2*(yn+2));
-
-    z = bignew(xn + yn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
-    t1 = bignew(xn, 1);
-
-    yds = BDIGITS(y);
-    zds = BDIGITS(z);
-    t1ds = BDIGITS(t1);
-
-    for (i = 0; i < xn + yn; i++) zds[i] = 0;
-
-    n = 0;
-    while (yn > 0) {
-	r = xn > yn ? yn : xn;
-	MEMCPY(t1ds, yds + n, BDIGIT, r);
-	RBIGNUM_SET_LEN(t1, r);
-	t2 = bigmul0(x, t1);
-	bigadd_core(zds + n, RBIGNUM_LEN(z) - n,
-		    BDIGITS(t2), big_real_len(t2),
-		    zds + n, RBIGNUM_LEN(z) - n);
-	yn -= r;
-	n += r;
-    }
+    if (xn < NAIVE_MUL_DIGITS)
+        bary_sq_fast(zds, zn, xds, xn);
+    else
+        bary_mul(zds, zn, xds, xn, xds, xn);
 
+    RB_GC_GUARD(x);
     return z;
 }
 
-/* split a bignum into high and low bignums */
-static void
-big_split(VALUE v, long n, volatile VALUE *ph, volatile VALUE *pl)
-{
-    long hn = 0, ln = RBIGNUM_LEN(v);
-    VALUE h, l;
-    BDIGIT *vds = BDIGITS(v);
-
-    if (ln > n) {
-	hn = ln - n;
-	ln = n;
-    }
-
-    if (!hn) {
-	h = rb_uint2big(0);
-    }
-    else {
-	while (--hn && !vds[hn + ln]);
-	h = bignew(hn += 2, 1);
-	MEMCPY(BDIGITS(h), vds + ln, BDIGIT, hn - 1);
-	BDIGITS(h)[hn - 1] = 0; /* margin for carry */
-    }
-
-    while (--ln && !vds[ln]);
-    l = bignew(ln += 2, 1);
-    MEMCPY(BDIGITS(l), vds, BDIGIT, ln - 1);
-    BDIGITS(l)[ln - 1] = 0; /* margin for carry */
-
-    *pl = l;
-    *ph = h;
-}
-
-/* multiplication by karatsuba method */
 static VALUE
-bigmul1_karatsuba(VALUE x, VALUE y)
-{
-    long i, n, xn, yn, t1n, t2n;
-    VALUE xh, xl, yh, yl, z, t1, t2, t3;
-    BDIGIT *zds;
-
-    xn = RBIGNUM_LEN(x);
-    yn = RBIGNUM_LEN(y);
-    n = yn / 2;
-    big_split(x, n, &xh, &xl);
-    if (x == y) {
-	yh = xh; yl = xl;
-    }
-    else big_split(y, n, &yh, &yl);
-
-    /* x = xh * b + xl
-     * y = yh * b + yl
-     *
-     * Karatsuba method:
-     *   x * y = z2 * b^2 + z1 * b + z0
-     *   where
-     *     z2 = xh * yh
-     *     z0 = xl * yl
-     *     z1 = (xh + xl) * (yh + yl) - z2 - z0
-     *
-     *  ref: http://en.wikipedia.org/wiki/Karatsuba_algorithm
-     */
-
-    /* allocate a result bignum */
-    z = bignew(xn + yn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
-    zds = BDIGITS(z);
-
-    /* t1 <- xh * yh */
-    t1 = bigmul0(xh, yh);
-    t1n = big_real_len(t1);
-
-    /* copy t1 into high bytes of the result (z2) */
-    MEMCPY(zds + 2 * n, BDIGITS(t1), BDIGIT, t1n);
-    for (i = 2 * n + t1n; i < xn + yn; i++) zds[i] = 0;
-
-    if (!BIGZEROP(xl) && !BIGZEROP(yl)) {
-	/* t2 <- xl * yl */
-	t2 = bigmul0(xl, yl);
-	t2n = big_real_len(t2);
-
-	/* copy t2 into low bytes of the result (z0) */
-	MEMCPY(zds, BDIGITS(t2), BDIGIT, t2n);
-	for (i = t2n; i < 2 * n; i++) zds[i] = 0;
-    }
-    else {
-	t2 = Qundef;
-	t2n = 0;
-
-	/* copy 0 into low bytes of the result (z0) */
-	for (i = 0; i < 2 * n; i++) zds[i] = 0;
-    }
-
-    /* xh <- xh + xl */
-    if (RBIGNUM_LEN(xl) > RBIGNUM_LEN(xh)) {
-	t3 = xl; xl = xh; xh = t3;
-    }
-    /* xh has a margin for carry */
-    bigadd_core(BDIGITS(xh), RBIGNUM_LEN(xh),
-		BDIGITS(xl), RBIGNUM_LEN(xl),
-		BDIGITS(xh), RBIGNUM_LEN(xh));
-
-    /* yh <- yh + yl */
-    if (x != y) {
-	if (RBIGNUM_LEN(yl) > RBIGNUM_LEN(yh)) {
-	    t3 = yl; yl = yh; yh = t3;
-	}
-	/* yh has a margin for carry */
-	bigadd_core(BDIGITS(yh), RBIGNUM_LEN(yh),
-		    BDIGITS(yl), RBIGNUM_LEN(yl),
-		    BDIGITS(yh), RBIGNUM_LEN(yh));
-    }
-    else yh = xh;
-
-    /* t3 <- xh * yh */
-    t3 = bigmul0(xh, yh);
-
-    i = xn + yn - n;
-    /* subtract t1 from t3 */
-    bigsub_core(BDIGITS(t3), big_real_len(t3), BDIGITS(t1), t1n, BDIGITS(t3), big_real_len(t3));
-
-    /* subtract t2 from t3; t3 is now the middle term of the product */
-    if (t2 != Qundef) bigsub_core(BDIGITS(t3), big_real_len(t3), BDIGITS(t2), t2n, BDIGITS(t3), big_real_len(t3));
-
-    /* add t3 to middle bytes of the result (z1) */
-    bigadd_core(zds + n, i, BDIGITS(t3), big_real_len(t3), zds + n, i);
-
-    return z;
-}
-
-static void
-biglsh_bang(BDIGIT *xds, long xn, unsigned long shift)
-{
-    long const s1 = shift/BITSPERDIG;
-    int const s2 = (int)(shift%BITSPERDIG);
-    int const s3 = BITSPERDIG-s2;
-    BDIGIT* zds;
-    BDIGIT num;
-    long i;
-    if (s1 >= xn) {
-	MEMZERO(xds, BDIGIT, xn);
-	return;
-    }
-    zds = xds + xn - 1;
-    xn -= s1 + 1;
-    num = xds[xn]<<s2;
-    do {
-	*zds-- = num | xds[--xn]>>s3;
-	num = xds[xn]<<s2;
-    }
-    while (xn > 0);
-    *zds = num;
-    for (i = s1; i > 0; --i)
-	*zds-- = 0;
-}
-
-static void
-bigrsh_bang(BDIGIT* xds, long xn, unsigned long shift)
-{
-    long s1 = shift/BITSPERDIG;
-    int s2 = (int)(shift%BITSPERDIG);
-    int s3 = BITSPERDIG - s2;
-    int i;
-    BDIGIT num;
-    BDIGIT* zds;
-    if (s1 >= xn) {
-	MEMZERO(xds, BDIGIT, xn);
-	return;
-    }
-
-    i = 0;
-    zds = xds + s1;
-    num = *zds++>>s2;
-    do {
-	xds[i++] = (BDIGIT)(*zds<<s3) | num;
-	num = *zds++>>s2;
-    }
-    while (i < xn - s1 - 1);
-    xds[i] = num;
-    MEMZERO(xds + xn - s1, BDIGIT, s1);
-}
-
-static void
-big_split3(VALUE v, long n, volatile VALUE* p0, volatile VALUE* p1, volatile VALUE* p2)
-{
-    VALUE v0, v12, v1, v2;
-
-    big_split(v, n, &v12, &v0);
-    big_split(v12, n, &v2, &v1);
-
-    *p0 = bigtrunc(v0);
-    *p1 = bigtrunc(v1);
-    *p2 = bigtrunc(v2);
-}
-
-static VALUE big_lshift(VALUE, unsigned long);
-static VALUE big_rshift(VALUE, unsigned long);
-static VALUE bigdivrem(VALUE, VALUE, volatile VALUE*, volatile VALUE*);
-
-static VALUE
-bigmul1_toom3(VALUE x, VALUE y)
+bigmul0(VALUE x, VALUE y)
 {
-    long n, xn, yn, zn;
-    VALUE x0, x1, x2, y0, y1, y2;
-    VALUE u0, u1, u2, u3, u4, v1, v2, v3;
-    VALUE z0, z1, z2, z3, z4, z, t;
-    BDIGIT* zds;
-
-    xn = RBIGNUM_LEN(x);
-    yn = RBIGNUM_LEN(y);
-    assert(xn <= yn);  /* assume y >= x */
-
-    n = (yn + 2) / 3;
-    big_split3(x, n, &x0, &x1, &x2);
-    if (x == y) {
-	y0 = x0; y1 = x1; y2 = x2;
-    }
-    else big_split3(y, n, &y0, &y1, &y2);
-
-    /*
-     * ref. http://en.wikipedia.org/wiki/Toom%E2%80%93Cook_multiplication
-     *
-     * x(b) = x0 * b^0 + x1 * b^1 + x2 * b^2
-     * y(b) = y0 * b^0 + y1 * b^1 + y2 * b^2
-     *
-     * z(b) = x(b) * y(b)
-     * z(b) = z0 * b^0 + z1 * b^1 + z2 * b^2 + z3 * b^3 + z4 * b^4
-     * where:
-     *   z0 = x0 * y0
-     *   z1 = x0 * y1 + x1 * y0
-     *   z2 = x0 * y2 + x1 * y1 + x2 * y0
-     *   z3 = x1 * y2 + x2 * y1
-     *   z4 = x2 * y2
-     *
-     * Toom3 method (a.k.a. Toom-Cook method):
-     * (Step1) calculating 5 points z(b0), z(b1), z(b2), z(b3), z(b4),
-     * where:
-     *   b0 = 0, b1 = 1, b2 = -1, b3 = -2, b4 = inf,
-     *   z(0)   = x(0)   * y(0)   = x0 * y0
-     *   z(1)   = x(1)   * y(1)   = (x0 + x1 + x2) * (y0 + y1 + y2)
-     *   z(-1)  = x(-1)  * y(-1)  = (x0 - x1 + x2) * (y0 - y1 + y2)
-     *   z(-2)  = x(-2)  * y(-2)  = (x0 - 2 * (x1 - 2 * x2)) * (y0 - 2 * (y1 - 2 * y2))
-     *   z(inf) = x(inf) * y(inf) = x2 * y2
-     *
-     * (Step2) interpolating z0, z1, z2, z3, z4, and z5.
-     *
-     * (Step3) Substituting base value into b of the polynomial z(b),
-     */
-
-    /*
-     * [Step1] calculating 5 points z(b0), z(b1), z(b2), z(b3), z(b4)
-     */
-
-    /* u1 <- x0 + x2 */
-    u1 = bigtrunc(bigadd(x0, x2, 1));
-
-    /* x(-1) : u2 <- u1 - x1 = x0 - x1 + x2 */
-    u2 = bigtrunc(bigsub(u1, x1));
-
-    /* x(1) : u1 <- u1 + x1 = x0 + x1 + x2 */
-    u1 = bigtrunc(bigadd(u1, x1, 1));
-
-    /* x(-2) : u3 <- 2 * (u2 + x2) - x0 = x0 - 2 * (x1 - 2 * x2) */
-    u3 = bigadd(u2, x2, 1);
-    if (BDIGITS(u3)[RBIGNUM_LEN(u3)-1] & BIGRAD_HALF) {
-	rb_big_resize(u3, RBIGNUM_LEN(u3) + 1);
-	BDIGITS(u3)[RBIGNUM_LEN(u3)-1] = 0;
-    }
-    biglsh_bang(BDIGITS(u3), RBIGNUM_LEN(u3), 1);
-    u3 = bigtrunc(bigadd(bigtrunc(u3), x0, 0));
-
-    if (x == y) {
-	v1 = u1; v2 = u2; v3 = u3;
-    }
-    else {
-	/* v1 <- y0 + y2 */
-	v1 = bigtrunc(bigadd(y0, y2, 1));
-
-	/* y(-1) : v2 <- v1 - y1 = y0 - y1 + y2 */
-	v2 = bigtrunc(bigsub(v1, y1));
-
-	/* y(1) : v1 <- v1 + y1 = y0 + y1 + y2 */
-	v1 = bigtrunc(bigadd(v1, y1, 1));
-
-	/* y(-2) : v3 <- 2 * (v2 + y2) - y0 = y0 - 2 * (y1 - 2 * y2) */
-	v3 = bigadd(v2, y2, 1);
-	if (BDIGITS(v3)[RBIGNUM_LEN(v3)-1] & BIGRAD_HALF) {
-	    rb_big_resize(v3, RBIGNUM_LEN(v3) + 1);
-	    BDIGITS(v3)[RBIGNUM_LEN(v3)-1] = 0;
-	}
-	biglsh_bang(BDIGITS(v3), RBIGNUM_LEN(v3), 1);
-	v3 = bigtrunc(bigadd(bigtrunc(v3), y0, 0));
-    }
-
-    /* z(0) : u0 <- x0 * y0 */
-    u0 = bigtrunc(bigmul0(x0, y0));
-
-    /* z(1) : u1 <- u1 * v1 */
-    u1 = bigtrunc(bigmul0(u1, v1));
-
-    /* z(-1) : u2 <- u2 * v2 */
-    u2 = bigtrunc(bigmul0(u2, v2));
-
-    /* z(-2) : u3 <- u3 * v3 */
-    u3 = bigtrunc(bigmul0(u3, v3));
-
-    /* z(inf) : u4 <- x2 * y2 */
-    u4 = bigtrunc(bigmul0(x2, y2));
-
-    /* for GC */
-    v1 = v2 = v3 = Qnil;
-
-    /*
-     * [Step2] interpolating z0, z1, z2, z3, z4, and z5.
-     */
-
-    /* z0 <- z(0) == u0 */
-    z0 = u0;
-
-    /* z4 <- z(inf) == u4 */
-    z4 = u4;
-
-    /* z3 <- (z(-2) - z(1)) / 3 == (u3 - u1) / 3 */
-    z3 = bigadd(u3, u1, 0);
-    bigdivrem(z3, big_three, &z3, NULL); /* TODO: optimize */
-    bigtrunc(z3);
-
-    /* z1 <- (z(1) - z(-1)) / 2 == (u1 - u2) / 2 */
-    z1 = bigtrunc(bigadd(u1, u2, 0));
-    bigrsh_bang(BDIGITS(z1), RBIGNUM_LEN(z1), 1);
-
-    /* z2 <- z(-1) - z(0) == u2 - u0 */
-    z2 = bigtrunc(bigadd(u2, u0, 0));
-
-    /* z3 <- (z2 - z3) / 2 + 2 * z(inf) == (z2 - z3) / 2 + 2 * u4 */
-    z3 = bigadd(z2, z3, 0);
-    bigrsh_bang(BDIGITS(z3), RBIGNUM_LEN(z3), 1);
-    t = big_lshift(u4, 1); /* TODO: combining with next addition */
-    z3 = bigtrunc(bigadd(z3, t, 1));
+    long xn, yn, zn;
+    VALUE z;
+    BDIGIT *xds, *yds, *zds;
 
-    /* z2 <- z2 + z1 - z(inf) == z2 + z1 - u4 */
-    z2 = bigtrunc(bigadd(z2, z1, 1));
-    z2 = bigtrunc(bigadd(z2, u4, 0));
+    if (x == y)
+        return bigsq(x);
 
-    /* z1 <- z1 - z3 */
-    z1 = bigtrunc(bigadd(z1, z3, 0));
+    xn = BIGNUM_LEN(x);
+    yn = BIGNUM_LEN(y);
+    zn = xn + yn;
 
-    /*
-     * [Step3] Substituting base value into b of the polynomial z(b),
-     */
+    z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
 
-    zn = 6*n + 1;
-    z = bignew(zn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    xds = BDIGITS(x);
+    yds = BDIGITS(y);
     zds = BDIGITS(z);
-    MEMCPY(zds, BDIGITS(z0), BDIGIT, RBIGNUM_LEN(z0));
-    MEMZERO(zds + RBIGNUM_LEN(z0), BDIGIT, zn - RBIGNUM_LEN(z0));
-    bigadd_core(zds +   n, zn -   n, BDIGITS(z1), big_real_len(z1), zds +   n, zn -   n);
-    bigadd_core(zds + 2*n, zn - 2*n, BDIGITS(z2), big_real_len(z2), zds + 2*n, zn - 2*n);
-    bigadd_core(zds + 3*n, zn - 3*n, BDIGITS(z3), big_real_len(z3), zds + 3*n, zn - 3*n);
-    bigadd_core(zds + 4*n, zn - 4*n, BDIGITS(z4), big_real_len(z4), zds + 4*n, zn - 4*n);
-    z = bignorm(z);
 
-    return bignorm(z);
-}
+    bary_mul(zds, zn, xds, xn, yds, yn);
 
-/* efficient squaring (2 times faster than normal multiplication)
- * ref: Handbook of Applied Cryptography, Algorithm 14.16
- *      http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf
- */
-static VALUE
-bigsqr_fast(VALUE x)
-{
-    long len = RBIGNUM_LEN(x), i, j;
-    VALUE z = bignew(2 * len + 1, 1);
-    BDIGIT *xds = BDIGITS(x), *zds = BDIGITS(z);
-    BDIGIT_DBL c, v, w;
-
-    for (i = 2 * len + 1; i--; ) zds[i] = 0;
-    for (i = 0; i < len; i++) {
-	v = (BDIGIT_DBL)xds[i];
-	if (!v) continue;
-	c = (BDIGIT_DBL)zds[i + i] + v * v;
-	zds[i + i] = BIGLO(c);
-	c = BIGDN(c);
-	v *= 2;
-	for (j = i + 1; j < len; j++) {
-	    w = (BDIGIT_DBL)xds[j];
-	    c += (BDIGIT_DBL)zds[i + j] + BIGLO(v) * w;
-	    zds[i + j] = BIGLO(c);
-	    c = BIGDN(c);
-	    if (BIGDN(v)) c += w;
-	}
-	if (c) {
-	    c += (BDIGIT_DBL)zds[i + len];
-	    zds[i + len] = BIGLO(c);
-	    c = BIGDN(c);
-	}
-	if (c) zds[i + len + 1] += (BDIGIT)c;
-    }
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
     return z;
 }
 
-#define KARATSUBA_MUL_DIGITS 70
-#define TOOM3_MUL_DIGITS 150
-
-
-/* determine whether a bignum is sparse or not by random sampling */
-static inline VALUE
-big_sparse_p(VALUE x)
-{
-    long c = 0, n = RBIGNUM_LEN(x);
-
-    if (          BDIGITS(x)[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
-    if (c <= 1 && BDIGITS(x)[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
-    if (c <= 1 && BDIGITS(x)[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
-
-    return (c <= 1) ? Qtrue : Qfalse;
-}
-
-static VALUE
-bigmul0(VALUE x, VALUE y)
-{
-    long xn, yn;
-
-    xn = RBIGNUM_LEN(x);
-    yn = RBIGNUM_LEN(y);
-
-    /* make sure that y is longer than x */
-    if (xn > yn) {
-	VALUE t;
-	long tn;
-	t = x; x = y; y = t;
-	tn = xn; xn = yn; yn = tn;
-    }
-    assert(xn <= yn);
-
-    /* normal multiplication when x is small */
-    if (xn < KARATSUBA_MUL_DIGITS) {
-      normal:
-	if (x == y) return bigsqr_fast(x);
-	if (xn == 1 && yn == 1) return bigmul1_single(x, y);
-	return bigmul1_normal(x, y);
-    }
-
-    /* normal multiplication when x or y is a sparse bignum */
-    if (big_sparse_p(x)) goto normal;
-    if (big_sparse_p(y)) return bigmul1_normal(y, x);
-
-    /* balance multiplication by slicing y when x is much smaller than y */
-    if (2 * xn <= yn) return bigmul1_balance(x, y);
-
-    if (xn < TOOM3_MUL_DIGITS) {
-	/* multiplication by karatsuba method */
-	return bigmul1_karatsuba(x, y);
-    }
-    else if (3*xn <= 2*(yn + 2))
-	return bigmul1_balance(x, y);
-    return bigmul1_toom3(x, y);
-}
-
-/*
- *  call-seq:
- *     big * other  -> Numeric
- *
- *  Multiplies big and other, returning the result.
- */
-
 VALUE
 rb_big_mul(VALUE x, VALUE y)
 {
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      case T_FLOAT:
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
 	return DBL2NUM(rb_big2dbl(x) * RFLOAT_VALUE(y));
-
-      default:
+    }
+    else {
 	return rb_num_coerce_bin(x, y, '*');
     }
 
     return bignorm(bigmul0(x, y));
 }
 
-struct big_div_struct {
-    long nx, ny;
-    BDIGIT *yds, *zds;
-    VALUE stop;
-};
-
 static VALUE
-bigdivrem1(void *ptr)
+bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
 {
-    struct big_div_struct *bds = (struct big_div_struct*)ptr;
-    long nx = bds->nx, ny = bds->ny;
-    long i, j, nyzero;
-    BDIGIT *yds = bds->yds, *zds = bds->zds;
-    BDIGIT_DBL t2;
-    BDIGIT_DBL_SIGNED num;
-    BDIGIT q;
-
-    j = nx==ny?nx+1:nx;
-    for (nyzero = 0; !yds[nyzero]; nyzero++);
-    do {
-	if (bds->stop) return Qnil;
-	if (zds[j] ==  yds[ny-1]) q = (BDIGIT)BIGRAD-1;
-	else q = (BDIGIT)((BIGUP(zds[j]) + zds[j-1])/yds[ny-1]);
-	if (q) {
-           i = nyzero; num = 0; t2 = 0;
-	    do {			/* multiply and subtract */
-		BDIGIT_DBL ee;
-		t2 += (BDIGIT_DBL)yds[i] * q;
-		ee = num - BIGLO(t2);
-		num = (BDIGIT_DBL)zds[j - ny + i] + ee;
-		if (ee) zds[j - ny + i] = BIGLO(num);
-		num = BIGDN(num);
-		t2 = BIGDN(t2);
-	    } while (++i < ny);
-	    num += zds[j - ny + i] - t2;/* borrow from high digit; don't update */
-	    while (num) {		/* "add back" required */
-		i = 0; num = 0; q--;
-		do {
-		    BDIGIT_DBL ee = num + yds[i];
-		    num = (BDIGIT_DBL)zds[j - ny + i] + ee;
-		    if (ee) zds[j - ny + i] = BIGLO(num);
-		    num = BIGDN(num);
-		} while (++i < ny);
-		num--;
-	    }
-	}
-	zds[j] = q;
-    } while (--j >= ny);
-    return Qnil;
-}
+    long xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y);
+    VALUE z;
+    BDIGIT *xds, *yds, *zds;
+    BDIGIT dd;
 
-static void
-rb_big_stop(void *ptr)
-{
-    VALUE *stop = (VALUE*)ptr;
-    *stop = Qtrue;
-}
+    VALUE q = Qnil, r = Qnil;
+    BDIGIT *qds, *rds;
+    long qn, rn;
 
-static VALUE
-bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
-{
-    struct big_div_struct bds;
-    long nx = RBIGNUM_LEN(x), ny = RBIGNUM_LEN(y);
-    long i, j;
-    VALUE z, yy, zz;
-    BDIGIT *xds, *yds, *zds, *tds;
-    BDIGIT_DBL t2;
-    BDIGIT dd, q;
+    yds = BDIGITS(y);
+    BARY_TRUNC(yds, yn);
+    if (yn == 0)
+        rb_num_zerodiv();
 
-    if (BIGZEROP(y)) rb_num_zerodiv();
     xds = BDIGITS(x);
-    yds = BDIGITS(y);
-    if (nx < ny || (nx == ny && xds[nx - 1] < yds[ny - 1])) {
+    BARY_TRUNC(xds, xn);
+
+    if (xn < yn || (xn == yn && xds[xn - 1] < yds[yn - 1])) {
 	if (divp) *divp = rb_int2big(0);
 	if (modp) *modp = x;
 	return Qnil;
     }
-    if (ny == 1) {
+    if (yn == 1) {
 	dd = yds[0];
-	z = rb_big_clone(x);
+	z = bignew(xn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
 	zds = BDIGITS(z);
-	t2 = 0; i = nx;
-	while (i--) {
-	    t2 = BIGUP(t2) + zds[i];
-	    zds[i] = (BDIGIT)(t2 / dd);
-	    t2 %= dd;
-	}
-	RBIGNUM_SET_SIGN(z, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+        dd = bigdivrem_single(zds, xds, xn, dd);
 	if (modp) {
-	    *modp = rb_uint2big((VALUE)t2);
-	    RBIGNUM_SET_SIGN(*modp, RBIGNUM_SIGN(x));
+	    *modp = rb_uint2big((uintptr_t)dd);
+	    BIGNUM_SET_SIGN(*modp, BIGNUM_SIGN(x));
 	}
 	if (divp) *divp = z;
 	return Qnil;
     }
+    if (xn == 2 && yn == 2) {
+        BDIGIT_DBL x0 = bary2bdigitdbl(xds, 2);
+        BDIGIT_DBL y0 = bary2bdigitdbl(yds, 2);
+        BDIGIT_DBL q0 = x0 / y0;
+        BDIGIT_DBL r0 = x0 % y0;
+        if (divp) {
+            z = bignew(bdigit_roomof(sizeof(BDIGIT_DBL)), BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+            zds = BDIGITS(z);
+            zds[0] = BIGLO(q0);
+            zds[1] = BIGLO(BIGDN(q0));
+            *divp = z;
+        }
+        if (modp) {
+            z = bignew(bdigit_roomof(sizeof(BDIGIT_DBL)), BIGNUM_SIGN(x));
+            zds = BDIGITS(z);
+            zds[0] = BIGLO(r0);
+            zds[1] = BIGLO(BIGDN(r0));
+            *modp = z;
+        }
+        return Qnil;
+    }
 
-    z = bignew(nx==ny?nx+2:nx+1, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
-    zds = BDIGITS(z);
-    if (nx==ny) zds[nx+1] = 0;
-    while (!yds[ny-1]) ny--;
-
-    dd = 0;
-    q = yds[ny-1];
-    while ((q & (BDIGIT)(1UL<<(BITSPERDIG-1))) == 0) {
-	q <<= 1UL;
-	dd++;
-    }
-    if (dd) {
-	yy = rb_big_clone(y);
-	tds = BDIGITS(yy);
-	j = 0;
-	t2 = 0;
-	while (j<ny) {
-	    t2 += (BDIGIT_DBL)yds[j]<<dd;
-	    tds[j++] = BIGLO(t2);
-	    t2 = BIGDN(t2);
-	}
-	yds = tds;
-	RB_GC_GUARD(y) = yy;
-	j = 0;
-	t2 = 0;
-	while (j<nx) {
-	    t2 += (BDIGIT_DBL)xds[j]<<dd;
-	    zds[j++] = BIGLO(t2);
-	    t2 = BIGDN(t2);
-	}
-	zds[j] = (BDIGIT)t2;
+    if (divp) {
+        qn = xn + BIGDIVREM_EXTRA_WORDS;
+        q = bignew(qn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+        qds = BDIGITS(q);
     }
     else {
-	zds[nx] = 0;
-	j = nx;
-	while (j--) zds[j] = xds[j];
+        qn = 0;
+        qds = NULL;
     }
 
-    bds.nx = nx;
-    bds.ny = ny;
-    bds.zds = zds;
-    bds.yds = yds;
-    bds.stop = Qfalse;
-    if (nx > 10000 || ny > 10000) {
-	rb_thread_blocking_region(bigdivrem1, &bds, rb_big_stop, &bds.stop);
+    if (modp) {
+        rn = yn;
+        r = bignew(rn, BIGNUM_SIGN(x));
+        rds = BDIGITS(r);
     }
     else {
-	bigdivrem1(&bds);
+        rn = 0;
+        rds = NULL;
     }
 
-    if (divp) {			/* move quotient down in z */
-	*divp = zz = rb_big_clone(z);
-	zds = BDIGITS(zz);
-	j = (nx==ny ? nx+2 : nx+1) - ny;
-	for (i = 0;i < j;i++) zds[i] = zds[i+ny];
-	if (!zds[i-1]) i--;
-	RBIGNUM_SET_LEN(zz, i);
-    }
-    if (modp) {			/* normalize remainder */
-	*modp = zz = rb_big_clone(z);
-	zds = BDIGITS(zz);
-	while (--ny && !zds[ny]); ++ny;
-	if (dd) {
-	    t2 = 0; i = ny;
-	    while(i--) {
-		t2 = (t2 | zds[i]) >> dd;
-		q = zds[i];
-		zds[i] = BIGLO(t2);
-		t2 = BIGUP(q);
-	    }
-	}
-	if (!zds[ny-1]) ny--;
-	RBIGNUM_SET_LEN(zz, ny);
-	RBIGNUM_SET_SIGN(zz, RBIGNUM_SIGN(x));
+    bary_divmod_branch(qds, qn, rds, rn, xds, xn, yds, yn);
+
+    if (divp) {
+        bigtrunc(q);
+        *divp = q;
     }
-    return z;
+    if (modp) {
+        bigtrunc(r);
+        *modp = r;
+    }
+
+    return Qnil;
 }
 
 static void
@@ -2749,7 +6046,7 @@ bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
     VALUE mod;
 
     bigdivrem(x, y, divp, &mod);
-    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y) && !BIGZEROP(mod)) {
+    if (BIGNUM_SIGN(x) != BIGNUM_SIGN(y) && !BIGZEROP(mod)) {
 	if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
 	if (modp) *modp = bigadd(mod, y, 1);
     }
@@ -2764,26 +6061,25 @@ rb_big_divide(VALUE x, VALUE y, ID op)
 {
     VALUE z;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      case T_FLOAT:
-	{
-	    double div = rb_big2dbl(x) / RFLOAT_VALUE(y);
-	    if (op == '/') {
-		return DBL2NUM(div);
-	    }
-	    else {
-		return rb_dbl2big(div);
-	    }
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
+	if (op == '/') {
+            double dx = rb_big2dbl(x);
+            return rb_flo_div_flo(DBL2NUM(dx), y);
 	}
-
-      default:
+	else {
+            VALUE v;
+	    double dy = RFLOAT_VALUE(y);
+	    if (dy == 0.0) rb_num_zerodiv();
+            v = rb_big_divide(x, y, '/');
+            return rb_dbl2big(RFLOAT_VALUE(v));
+	}
+    }
+    else {
 	return rb_num_coerce_bin(x, y, op);
     }
     bigdivmod(x, y, &z, 0);
@@ -2791,57 +6087,27 @@ 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"));
+    return rb_big_divide(x, y, idDiv);
 }
 
-/*
- *  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)
 {
     VALUE z;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      default:
+    }
+    else if (!RB_BIGNUM_TYPE_P(y)) {
 	return rb_num_coerce_bin(x, y, '%');
     }
     bigdivmod(x, y, 0, &z);
@@ -2849,29 +6115,15 @@ rb_big_modulo(VALUE x, VALUE y)
     return bignorm(z);
 }
 
-/*
- *  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
+VALUE
 rb_big_remainder(VALUE x, VALUE y)
 {
     VALUE z;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      default:
+    }
+    else if (!RB_BIGNUM_TYPE_P(y)) {
 	return rb_num_coerce_bin(x, y, rb_intern("remainder"));
     }
     bigdivrem(x, y, 0, &z);
@@ -2879,851 +6131,1028 @@ 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)
 {
     VALUE div, mod;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      default:
-	return rb_num_coerce_bin(x, y, rb_intern("divmod"));
+    }
+    else if (!RB_BIGNUM_TYPE_P(y)) {
+        return rb_num_coerce_bin(x, y, idDivmod);
     }
     bigdivmod(x, y, &div, &mod);
 
     return rb_assoc_new(bignorm(div), bignorm(mod));
 }
 
-static int
-bdigbitsize(BDIGIT x)
-{
-    int size = 1;
-    int nb = BITSPERDIG / 2;
-    BDIGIT bits = (~0 << nb);
-
-    if (!x) return 0;
-    while (x > 1) {
-	if (x & bits) {
-	    size += nb;
-	    x >>= nb;
-	}
-	x &= ~bits;
-	nb /= 2;
-	bits >>= nb;
-    }
-
-    return size;
-}
-
-static VALUE big_lshift(VALUE, unsigned long);
-static VALUE big_rshift(VALUE, unsigned long);
-
 static VALUE
 big_shift(VALUE x, long n)
 {
     if (n < 0)
-	return big_lshift(x, (unsigned long)-n);
+	return big_lshift(x, 1+(unsigned long)(-(n+1)));
     else if (n > 0)
 	return big_rshift(x, (unsigned long)n);
     return x;
 }
 
-static VALUE
-big_fdiv(VALUE x, VALUE y)
+enum {DBL_BIGDIG = ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)};
+
+static double
+big_fdiv(VALUE x, VALUE y, long ey)
 {
-#define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)
     VALUE z;
-    long l, ex, ey;
-    int i;
+    long l, ex;
 
     bigtrunc(x);
-    l = RBIGNUM_LEN(x) - 1;
-    ex = l * BITSPERDIG;
-    ex += bdigbitsize(BDIGITS(x)[l]);
+    l = BIGNUM_LEN(x);
+    ex = l * BITSPERDIG - nlz(BDIGITS(x)[l-1]);
     ex -= 2 * DBL_BIGDIG * BITSPERDIG;
+    if (ex > BITSPERDIG) ex -= BITSPERDIG;
+    else if (ex > 0) ex = 0;
     if (ex) x = big_shift(x, ex);
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-      case T_BIGNUM: {
-	bigtrunc(y);
-	l = RBIGNUM_LEN(y) - 1;
-	ey = l * BITSPERDIG;
-	ey += bdigbitsize(BDIGITS(y)[l]);
-	ey -= DBL_BIGDIG * BITSPERDIG;
-	if (ey) y = big_shift(y, ey);
-      bignum:
-	bigdivrem(x, y, &z, 0);
-	l = ex - ey;
+    bigdivrem(x, y, &z, 0);
+    l = ex - ey;
 #if SIZEOF_LONG > SIZEOF_INT
-	{
-	    /* Visual C++ can't be here */
-	    if (l > INT_MAX) return DBL2NUM(INFINITY);
-	    if (l < INT_MIN) return DBL2NUM(0.0);
-	}
-#endif
-	return DBL2NUM(ldexp(big2dbl(z), (int)l));
-      }
-      case T_FLOAT:
-	y = dbl2big(ldexp(frexp(RFLOAT_VALUE(y), &i), DBL_MANT_DIG));
-	ey = i - DBL_MANT_DIG;
-	goto bignum;
+    {
+	/* Visual C++ can't be here */
+	if (l > INT_MAX) return HUGE_VAL;
+	if (l < INT_MIN) return 0.0;
     }
-    rb_bug("big_fdiv");
-    /* NOTREACHED */
+#endif
+    return ldexp(big2dbl(z), (int)l);
 }
 
-/*
- *  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
- *
- */
+static double
+big_fdiv_int(VALUE x, VALUE y)
+{
+    long l, ey;
+    bigtrunc(y);
+    l = BIGNUM_LEN(y);
+    ey = l * BITSPERDIG - nlz(BDIGITS(y)[l-1]);
+    ey -= DBL_BIGDIG * BITSPERDIG;
+    if (ey) y = big_shift(y, ey);
+    return big_fdiv(x, y, ey);
+}
 
+static double
+big_fdiv_float(VALUE x, VALUE y)
+{
+    int i;
+    y = dbl2big(ldexp(frexp(RFLOAT_VALUE(y), &i), DBL_MANT_DIG));
+    return big_fdiv(x, y, i - DBL_MANT_DIG);
+}
 
-VALUE
-rb_big_fdiv(VALUE x, VALUE y)
+double
+rb_big_fdiv_double(VALUE x, VALUE y)
 {
     double dx, dy;
+    VALUE v;
 
     dx = big2dbl(x);
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	dy = (double)FIX2LONG(y);
 	if (isinf(dx))
-	    return big_fdiv(x, y);
-	break;
-
-      case T_BIGNUM:
-	dy = rb_big2dbl(y);
-	if (isinf(dx) || isinf(dy))
-	    return big_fdiv(x, y);
-	break;
-
-      case T_FLOAT:
+	    return big_fdiv_int(x, rb_int2big(FIX2LONG(y)));
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+	return big_fdiv_int(x, y);
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
 	dy = RFLOAT_VALUE(y);
 	if (isnan(dy))
-	    return y;
+	    return dy;
 	if (isinf(dx))
-	    return big_fdiv(x, y);
-	break;
-
-      default:
-	return rb_num_coerce_bin(x, y, rb_intern("fdiv"));
+	    return big_fdiv_float(x, y);
     }
-    return DBL2NUM(dx / dy);
+    else {
+        return NUM2DBL(rb_num_coerce_bin(x, y, idFdiv));
+    }
+    v = rb_flo_div_flo(DBL2NUM(dx), DBL2NUM(dy));
+    return NUM2DBL(v);
 }
 
-static VALUE
-bigsqr(VALUE x)
+VALUE
+rb_big_fdiv(VALUE x, VALUE y)
 {
-    return bigtrunc(bigmul0(x, x));
+    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)
 {
     double d;
     SIGNED_VALUE yy;
 
+  again:
     if (y == INT2FIX(0)) return INT2FIX(1);
-    switch (TYPE(y)) {
-      case T_FLOAT:
+    if (y == INT2FIX(1)) return x;
+    if (RB_FLOAT_TYPE_P(y)) {
 	d = RFLOAT_VALUE(y);
-	if ((!RBIGNUM_SIGN(x) && !BIGZEROP(x)) && d != round(d))
-	    return rb_funcall(rb_complex_raw1(x), rb_intern("**"), 1, y);
-	break;
-
-      case T_BIGNUM:
+	if ((BIGNUM_NEGATIVE_P(x) && !BIGZEROP(x))) {
+            return rb_dbl_complex_new_polar_pi(pow(-rb_big2dbl(x), d), d);
+	}
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+	y = bignorm(y);
+	if (FIXNUM_P(y))
+	    goto again;
 	rb_warn("in a**b, b may be too big");
 	d = rb_big2dbl(y);
-	break;
-
-      case T_FIXNUM:
+    }
+    else if (FIXNUM_P(y)) {
 	yy = FIX2LONG(y);
 
-	if (yy < 0)
-	    return rb_funcall(rb_rational_raw1(x), rb_intern("**"), 1, y);
+        if (yy < 0) {
+            x = rb_big_pow(x, INT2NUM(-yy));
+            if (RB_INTEGER_TYPE_P(x))
+                return rb_rational_raw(INT2FIX(1), x);
+            else
+                return DBL2NUM(1.0 / NUM2DBL(x));
+        }
 	else {
 	    VALUE z = 0;
 	    SIGNED_VALUE mask;
-	    const long BIGLEN_LIMIT = 1024*1024 / SIZEOF_BDIGITS;
+            const size_t xbits = rb_absint_numwords(x, 1, NULL);
+	    const size_t BIGLEN_LIMIT = 32*1024*1024;
 
-	    if ((RBIGNUM_LEN(x) > BIGLEN_LIMIT) ||
-		(RBIGNUM_LEN(x) > BIGLEN_LIMIT / yy)) {
+	    if (xbits == (size_t)-1 ||
+                (xbits > BIGLEN_LIMIT) ||
+                (xbits * yy > BIGLEN_LIMIT)) {
 		rb_warn("in a**b, b may be too big");
 		d = (double)yy;
-		break;
 	    }
-	    for (mask = FIXNUM_MAX + 1; mask; mask >>= 1) {
-		if (z) z = bigsqr(z);
-		if (yy & mask) {
-		    z = z ? bigtrunc(bigmul0(z, x)) : x;
+	    else {
+		for (mask = FIXNUM_MAX + 1; mask; mask >>= 1) {
+		    if (z) z = bigsq(z);
+		    if (yy & mask) {
+			z = z ? bigtrunc(bigmul0(z, x)) : x;
+		    }
 		}
+		return bignorm(z);
 	    }
-	    return bignorm(z);
 	}
-	/* NOTREACHED */
-	break;
-
-      default:
-	return rb_num_coerce_bin(x, y, rb_intern("**"));
     }
-    return DBL2NUM(pow(rb_big2dbl(x), d));
-}
-
-static inline VALUE
-bit_coerce(VALUE x)
-{
-    while (!FIXNUM_P(x) && TYPE(x) != T_BIGNUM) {
-	if (TYPE(x) == T_FLOAT) {
-	    rb_raise(rb_eTypeError, "can't convert Float into Integer");
-	}
-	x = rb_to_int(x);
+    else {
+	return rb_num_coerce_bin(x, y, idPow);
     }
-    return x;
+    return DBL2NUM(pow(rb_big2dbl(x), d));
 }
 
 static VALUE
-bigand_int(VALUE x, long y)
+bigand_int(VALUE x, long xn, BDIGIT hibitsx, long y)
 {
     VALUE z;
     BDIGIT *xds, *zds;
-    long xn, zn;
+    long zn;
     long i;
-    char sign;
+    BDIGIT hibitsy;
 
     if (y == 0) return INT2FIX(0);
-    sign = (y > 0);
+    if (xn == 0) return hibitsx ? LONG2NUM(y) : 0;
+    hibitsy = 0 <= y ? 0 : BDIGMAX;
     xds = BDIGITS(x);
-    zn = xn = RBIGNUM_LEN(x);
-#if SIZEOF_BDIGITS == SIZEOF_LONG
-    if (sign) {
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
+    if (!hibitsy) {
 	y &= xds[0];
 	return LONG2NUM(y);
     }
 #endif
 
-    z = bignew(zn, RBIGNUM_SIGN(x) || sign);
+    zn = xn;
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (hibitsx && zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+
+    z = bignew(zn, 0);
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS == SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     i = 1;
-    zds[0] = xds[0] & y;
+    zds[0] = xds[0] & BIGLO(y);
 #else
-    {
-	BDIGIT_DBL num = y;
-
-	for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
-	    zds[i] = xds[i] & BIGLO(num);
-	    num = BIGDN(num);
-	}
+    for (i=0; i < xn; i++) {
+        if (y == 0 || y == -1) break;
+        zds[i] = xds[i] & BIGLO(y);
+        y = BIGDN(y);
+    }
+    for (; i < zn; i++) {
+        if (y == 0 || y == -1) break;
+        zds[i] = hibitsx & BIGLO(y);
+        y = BIGDN(y);
     }
 #endif
-    while (i < xn) {
-	zds[i] = sign?0:xds[i];
-	i++;
+    for (;i < xn; i++) {
+	zds[i] = xds[i] & hibitsy;
+    }
+    for (;i < zn; i++) {
+	zds[i] = hibitsx & hibitsy;
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    twocomp2abs_bang(z, hibitsx && hibitsy);
+    RB_GC_GUARD(x);
     return bignorm(z);
 }
 
-/*
- * call-seq:
- *     big & numeric   ->  integer
- *
- * Performs bitwise +and+ between _big_ and _numeric_.
- */
-
 VALUE
-rb_big_and(VALUE xx, VALUE yy)
+rb_big_and(VALUE x, VALUE y)
 {
-    volatile VALUE x, y, z;
+    VALUE z;
     BDIGIT *ds1, *ds2, *zds;
-    long i, l1, l2;
-    char sign;
+    long i, xn, yn, n1, n2;
+    BDIGIT hibitsx, hibitsy;
+    BDIGIT hibits1, hibits2;
+    VALUE tmpv;
+    BDIGIT tmph;
+    long tmpn;
 
-    x = xx;
-    y = bit_coerce(yy);
-    if (!RBIGNUM_SIGN(x)) {
-	x = rb_big_clone(x);
-	get2comp(x);
+    if (!RB_INTEGER_TYPE_P(y)) {
+	return rb_num_coerce_bit(x, y, '&');
     }
+
+    hibitsx = abs2twocomp(&x, &xn);
     if (FIXNUM_P(y)) {
-	return bigand_int(x, FIX2LONG(y));
-    }
-    if (!RBIGNUM_SIGN(y)) {
-	y = rb_big_clone(y);
-	get2comp(y);
+	return bigand_int(x, xn, hibitsx, FIX2LONG(y));
     }
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	l1 = RBIGNUM_LEN(y);
-	l2 = RBIGNUM_LEN(x);
-	ds1 = BDIGITS(y);
-	ds2 = BDIGITS(x);
-	sign = RBIGNUM_SIGN(y);
-    }
-    else {
-	l1 = RBIGNUM_LEN(x);
-	l2 = RBIGNUM_LEN(y);
-	ds1 = BDIGITS(x);
-	ds2 = BDIGITS(y);
-	sign = RBIGNUM_SIGN(x);
+    hibitsy = abs2twocomp(&y, &yn);
+    if (xn > yn) {
+        tmpv = x; x = y; y = tmpv;
+        tmpn = xn; xn = yn; yn = tmpn;
+        tmph = hibitsx; hibitsx = hibitsy; hibitsy = tmph;
     }
-    z = bignew(l2, RBIGNUM_SIGN(x) || RBIGNUM_SIGN(y));
+    n1 = xn;
+    n2 = yn;
+    ds1 = BDIGITS(x);
+    ds2 = BDIGITS(y);
+    hibits1 = hibitsx;
+    hibits2 = hibitsy;
+
+    if (!hibits1)
+        n2 = n1;
+
+    z = bignew(n2, 0);
     zds = BDIGITS(z);
 
-    for (i=0; i<l1; i++) {
+    for (i=0; i<n1; i++) {
 	zds[i] = ds1[i] & ds2[i];
     }
-    for (; i<l2; i++) {
-	zds[i] = sign?0:ds2[i];
+    for (; i<n2; i++) {
+	zds[i] = hibits1 & ds2[i];
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    twocomp2abs_bang(z, hibits1 && hibits2);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
     return bignorm(z);
 }
 
 static VALUE
-bigor_int(VALUE x, long y)
+bigor_int(VALUE x, long xn, BDIGIT hibitsx, long y)
 {
     VALUE z;
     BDIGIT *xds, *zds;
-    long xn, zn;
+    long zn;
     long i;
-    char sign;
+    BDIGIT hibitsy;
 
-    sign = (y >= 0);
+    if (y == -1) return INT2FIX(-1);
+    if (xn == 0) return hibitsx ? INT2FIX(-1) : LONG2FIX(y);
+    hibitsy = 0 <= y ? 0 : BDIGMAX;
     xds = BDIGITS(x);
-    zn = xn = RBIGNUM_LEN(x);
-    z = bignew(zn, RBIGNUM_SIGN(x) && sign);
+
+    zn = BIGNUM_LEN(x);
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+    z = bignew(zn, 0);
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS == SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     i = 1;
-    zds[0] = xds[0] | y;
+    zds[0] = xds[0] | BIGLO(y);
+    if (i < zn)
+        goto y_is_fixed_point;
+    goto finish;
 #else
-    {
-	BDIGIT_DBL num = y;
+    for (i=0; i < xn; i++) {
+        if (y == 0 || y == -1) goto y_is_fixed_point;
+        zds[i] = xds[i] | BIGLO(y);
+        y = BIGDN(y);
+    }
+    if (hibitsx)
+        goto fill_hibits;
+    for (; i < zn; i++) {
+        if (y == 0 || y == -1) goto y_is_fixed_point;
+        zds[i] = BIGLO(y);
+        y = BIGDN(y);
+    }
+  goto finish;
+#endif
 
-	for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
-	    zds[i] = xds[i] | BIGLO(num);
-	    num = BIGDN(num);
-	}
+  y_is_fixed_point:
+    if (hibitsy)
+        goto fill_hibits;
+    for (; i < xn; i++) {
+        zds[i] = xds[i];
     }
-#endif
-    while (i < xn) {
-	zds[i] = sign?xds[i]:(BDIGIT)(BIGRAD-1);
-	i++;
+    if (hibitsx)
+        goto fill_hibits;
+    for (; i < zn; i++) {
+        zds[i] = 0;
+    }
+  goto finish;
+
+  fill_hibits:
+    for (; i < zn; i++) {
+        zds[i] = BDIGMAX;
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+
+  finish:
+    twocomp2abs_bang(z, hibitsx || hibitsy);
+    RB_GC_GUARD(x);
     return bignorm(z);
 }
 
-/*
- * call-seq:
- *     big | numeric   ->  integer
- *
- * Performs bitwise +or+ between _big_ and _numeric_.
- */
-
 VALUE
-rb_big_or(VALUE xx, VALUE yy)
+rb_big_or(VALUE x, VALUE y)
 {
-    volatile VALUE x, y, z;
+    VALUE z;
     BDIGIT *ds1, *ds2, *zds;
-    long i, l1, l2;
-    char sign;
-
-    x = xx;
-    y = bit_coerce(yy);
+    long i, xn, yn, n1, n2;
+    BDIGIT hibitsx, hibitsy;
+    BDIGIT hibits1, hibits2;
+    VALUE tmpv;
+    BDIGIT tmph;
+    long tmpn;
 
-    if (!RBIGNUM_SIGN(x)) {
-	x = rb_big_clone(x);
-	get2comp(x);
+    if (!RB_INTEGER_TYPE_P(y)) {
+	return rb_num_coerce_bit(x, y, '|');
     }
+
+    hibitsx = abs2twocomp(&x, &xn);
     if (FIXNUM_P(y)) {
-	return bigor_int(x, FIX2LONG(y));
-    }
-    if (!RBIGNUM_SIGN(y)) {
-	y = rb_big_clone(y);
-	get2comp(y);
-    }
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	l1 = RBIGNUM_LEN(y);
-	l2 = RBIGNUM_LEN(x);
-	ds1 = BDIGITS(y);
-	ds2 = BDIGITS(x);
-	sign = RBIGNUM_SIGN(y);
+	return bigor_int(x, xn, hibitsx, FIX2LONG(y));
     }
-    else {
-	l1 = RBIGNUM_LEN(x);
-	l2 = RBIGNUM_LEN(y);
-	ds1 = BDIGITS(x);
-	ds2 = BDIGITS(y);
-	sign = RBIGNUM_SIGN(x);
+    hibitsy = abs2twocomp(&y, &yn);
+    if (xn > yn) {
+        tmpv = x; x = y; y = tmpv;
+        tmpn = xn; xn = yn; yn = tmpn;
+        tmph = hibitsx; hibitsx = hibitsy; hibitsy = tmph;
     }
-    z = bignew(l2, RBIGNUM_SIGN(x) && RBIGNUM_SIGN(y));
+    n1 = xn;
+    n2 = yn;
+    ds1 = BDIGITS(x);
+    ds2 = BDIGITS(y);
+    hibits1 = hibitsx;
+    hibits2 = hibitsy;
+
+    if (hibits1)
+        n2 = n1;
+
+    z = bignew(n2, 0);
     zds = BDIGITS(z);
 
-    for (i=0; i<l1; i++) {
+    for (i=0; i<n1; i++) {
 	zds[i] = ds1[i] | ds2[i];
     }
-    for (; i<l2; i++) {
-	zds[i] = sign?ds2[i]:(BDIGIT)(BIGRAD-1);
+    for (; i<n2; i++) {
+	zds[i] = hibits1 | ds2[i];
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    twocomp2abs_bang(z, hibits1 || hibits2);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
     return bignorm(z);
 }
 
 static VALUE
-bigxor_int(VALUE x, long y)
+bigxor_int(VALUE x, long xn, BDIGIT hibitsx, long y)
 {
     VALUE z;
     BDIGIT *xds, *zds;
-    long xn, zn;
+    long zn;
     long i;
-    char sign;
+    BDIGIT hibitsy;
 
-    sign = (y >= 0) ? 1 : 0;
+    hibitsy = 0 <= y ? 0 : BDIGMAX;
     xds = BDIGITS(x);
-    zn = xn = RBIGNUM_LEN(x);
-    z = bignew(zn, !(RBIGNUM_SIGN(x) ^ sign));
+    zn = BIGNUM_LEN(x);
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+    z = bignew(zn, 0);
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS == SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     i = 1;
-    zds[0] = xds[0] ^ y;
+    zds[0] = xds[0] ^ BIGLO(y);
 #else
-    {
-	BDIGIT_DBL num = y;
-
-	for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
-	    zds[i] = xds[i] ^ BIGLO(num);
-	    num = BIGDN(num);
-	}
+    for (i = 0; i < xn; i++) {
+        zds[i] = xds[i] ^ BIGLO(y);
+        y = BIGDN(y);
+    }
+    for (; i < zn; i++) {
+        zds[i] = hibitsx ^ BIGLO(y);
+        y = BIGDN(y);
     }
 #endif
-    while (i < xn) {
-	zds[i] = sign?xds[i]:~xds[i];
-	i++;
+    for (; i < xn; i++) {
+        zds[i] = xds[i] ^ hibitsy;
+    }
+    for (; i < zn; i++) {
+        zds[i] = hibitsx ^ hibitsy;
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    twocomp2abs_bang(z, (hibitsx ^ hibitsy) != 0);
+    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 xx, VALUE yy)
+rb_big_xor(VALUE x, VALUE y)
 {
-    volatile VALUE x, y;
     VALUE z;
     BDIGIT *ds1, *ds2, *zds;
-    long i, l1, l2;
-    char sign;
+    long i, xn, yn, n1, n2;
+    BDIGIT hibitsx, hibitsy;
+    BDIGIT hibits1, hibits2;
+    VALUE tmpv;
+    BDIGIT tmph;
+    long tmpn;
 
-    x = xx;
-    y = bit_coerce(yy);
-
-    if (!RBIGNUM_SIGN(x)) {
-	x = rb_big_clone(x);
-	get2comp(x);
+    if (!RB_INTEGER_TYPE_P(y)) {
+	return rb_num_coerce_bit(x, y, '^');
     }
+
+    hibitsx = abs2twocomp(&x, &xn);
     if (FIXNUM_P(y)) {
-	return bigxor_int(x, FIX2LONG(y));
+	return bigxor_int(x, xn, hibitsx, FIX2LONG(y));
     }
-    if (!RBIGNUM_SIGN(y)) {
-	y = rb_big_clone(y);
-	get2comp(y);
-    }
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	l1 = RBIGNUM_LEN(y);
-	l2 = RBIGNUM_LEN(x);
-	ds1 = BDIGITS(y);
-	ds2 = BDIGITS(x);
-	sign = RBIGNUM_SIGN(y);
-    }
-    else {
-	l1 = RBIGNUM_LEN(x);
-	l2 = RBIGNUM_LEN(y);
-	ds1 = BDIGITS(x);
-	ds2 = BDIGITS(y);
-	sign = RBIGNUM_SIGN(x);
-    }
-    RBIGNUM_SET_SIGN(x, RBIGNUM_SIGN(x)?1:0);
-    RBIGNUM_SET_SIGN(y, RBIGNUM_SIGN(y)?1:0);
-    z = bignew(l2, !(RBIGNUM_SIGN(x) ^ RBIGNUM_SIGN(y)));
+    hibitsy = abs2twocomp(&y, &yn);
+    if (xn > yn) {
+        tmpv = x; x = y; y = tmpv;
+        tmpn = xn; xn = yn; yn = tmpn;
+        tmph = hibitsx; hibitsx = hibitsy; hibitsy = tmph;
+    }
+    n1 = xn;
+    n2 = yn;
+    ds1 = BDIGITS(x);
+    ds2 = BDIGITS(y);
+    hibits1 = hibitsx;
+    hibits2 = hibitsy;
+
+    z = bignew(n2, 0);
     zds = BDIGITS(z);
 
-    for (i=0; i<l1; i++) {
+    for (i=0; i<n1; i++) {
 	zds[i] = ds1[i] ^ ds2[i];
     }
-    for (; i<l2; i++) {
-	zds[i] = sign?ds2[i]:~ds2[i];
+    for (; i<n2; i++) {
+	zds[i] = hibitsx ^ ds2[i];
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
-
+    twocomp2abs_bang(z, (hibits1 ^ hibits2) != 0);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
     return bignorm(z);
 }
 
-static VALUE
-check_shiftdown(VALUE y, VALUE x)
-{
-    if (!RBIGNUM_LEN(x)) return INT2FIX(0);
-    if (RBIGNUM_LEN(y) > SIZEOF_LONG / SIZEOF_BDIGITS) {
-	return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(-1);
-    }
-    return Qnil;
-}
-
-/*
- * call-seq:
- *     big << numeric   ->  integer
- *
- * Shifts big left _numeric_ positions (right if _numeric_ is negative).
- */
-
 VALUE
 rb_big_lshift(VALUE x, VALUE y)
 {
-    long shift;
-    int neg = 0;
+    int lshift_p;
+    size_t shift_numdigits;
+    int shift_numbits;
 
     for (;;) {
 	if (FIXNUM_P(y)) {
-	    shift = FIX2LONG(y);
-	    if (shift < 0) {
-		neg = 1;
-		shift = -shift;
+	    long l = FIX2LONG(y);
+            unsigned long shift;
+	    if (0 <= l) {
+		lshift_p = 1;
+                shift = l;
+            }
+            else {
+		lshift_p = 0;
+		shift = 1+(unsigned long)(-(l+1));
 	    }
-	    break;
+            shift_numbits = (int)(shift & (BITSPERDIG-1));
+            shift_numdigits = shift >> bit_length(BITSPERDIG-1);
+            return bignorm(big_shift3(x, lshift_p, shift_numdigits, shift_numbits));
 	}
-	else if (TYPE(y) == T_BIGNUM) {
-	    if (!RBIGNUM_SIGN(y)) {
-		VALUE t = check_shiftdown(y, x);
-		if (!NIL_P(t)) return t;
-		neg = 1;
-	    }
-	    shift = big2ulong(y, "long", TRUE);
-	    break;
+	else if (RB_BIGNUM_TYPE_P(y)) {
+            return bignorm(big_shift2(x, 1, y));
 	}
 	y = rb_to_int(y);
     }
-
-    x = neg ? big_rshift(x, shift) : big_lshift(x, shift);
-    return bignorm(x);
-}
-
-static VALUE
-big_lshift(VALUE x, unsigned long shift)
-{
-    BDIGIT *xds, *zds;
-    long s1 = shift/BITSPERDIG;
-    int s2 = (int)(shift%BITSPERDIG);
-    VALUE z;
-    BDIGIT_DBL num = 0;
-    long len, i;
-
-    len = RBIGNUM_LEN(x);
-    z = bignew(len+s1+1, RBIGNUM_SIGN(x));
-    zds = BDIGITS(z);
-    for (i=0; i<s1; i++) {
-	*zds++ = 0;
-    }
-    xds = BDIGITS(x);
-    for (i=0; i<len; i++) {
-	num = num | (BDIGIT_DBL)*xds++<<s2;
-	*zds++ = BIGLO(num);
-	num = BIGDN(num);
-    }
-    *zds = BIGLO(num);
-    return z;
 }
 
-/*
- * call-seq:
- *     big >> numeric   ->  integer
- *
- * Shifts big right _numeric_ positions (left if _numeric_ is negative).
- */
-
 VALUE
 rb_big_rshift(VALUE x, VALUE y)
 {
-    long shift;
-    int neg = 0;
+    int lshift_p;
+    size_t shift_numdigits;
+    int shift_numbits;
 
     for (;;) {
 	if (FIXNUM_P(y)) {
-	    shift = FIX2LONG(y);
-	    if (shift < 0) {
-		neg = 1;
-		shift = -shift;
+	    long l = FIX2LONG(y);
+            unsigned long shift;
+            if (0 <= l) {
+                lshift_p = 0;
+                shift = l;
+            }
+            else {
+                lshift_p = 1;
+		shift = 1+(unsigned long)(-(l+1));
 	    }
-	    break;
+            shift_numbits = (int)(shift & (BITSPERDIG-1));
+            shift_numdigits = shift >> bit_length(BITSPERDIG-1);
+            return bignorm(big_shift3(x, lshift_p, shift_numdigits, shift_numbits));
 	}
-	else if (TYPE(y) == T_BIGNUM) {
-	    if (RBIGNUM_SIGN(y)) {
-		VALUE t = check_shiftdown(y, x);
-		if (!NIL_P(t)) return t;
-	    }
-	    else {
-		neg = 1;
-	    }
-	    shift = big2ulong(y, "long", TRUE);
-	    break;
+	else if (RB_BIGNUM_TYPE_P(y)) {
+            return bignorm(big_shift2(x, 0, y));
 	}
 	y = rb_to_int(y);
     }
-
-    x = neg ? big_lshift(x, shift) : big_rshift(x, shift);
-    return bignorm(x);
 }
 
-static VALUE
-big_rshift(VALUE x, unsigned long shift)
+VALUE
+rb_big_aref(VALUE x, VALUE y)
 {
-    BDIGIT *xds, *zds;
-    long s1 = shift/BITSPERDIG;
-    int s2 = (int)(shift%BITSPERDIG);
-    VALUE z;
-    BDIGIT_DBL num = 0;
-    long i, j;
-    volatile VALUE save_x;
+    BDIGIT *xds;
+    size_t shift;
+    size_t i, s1, s2;
+    long l;
+    BDIGIT bit;
 
-    if (s1 > RBIGNUM_LEN(x)) {
-	if (RBIGNUM_SIGN(x))
+    if (RB_BIGNUM_TYPE_P(y)) {
+	if (BIGNUM_NEGATIVE_P(y))
 	    return INT2FIX(0);
-	else
-	    return INT2FIX(-1);
+	bigtrunc(y);
+	if (BIGSIZE(y) > sizeof(size_t)) {
+	  out_of_range:
+	    return BIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1);
+	}
+#if SIZEOF_SIZE_T <= SIZEOF_LONG
+	shift = big2ulong(y, "long");
+#else
+	shift = big2ull(y, "long long");
+#endif
     }
-    if (!RBIGNUM_SIGN(x)) {
-	save_x = x = rb_big_clone(x);
-	get2comp(x);
+    else {
+	l = NUM2LONG(y);
+	if (l < 0) return INT2FIX(0);
+	shift = (size_t)l;
     }
+    s1 = shift/BITSPERDIG;
+    s2 = shift%BITSPERDIG;
+    bit = (BDIGIT)1 << s2;
+
+    if (s1 >= BIGNUM_LEN(x)) goto out_of_range;
+
     xds = BDIGITS(x);
-    i = RBIGNUM_LEN(x); j = i - s1;
-    if (j == 0) {
-	if (RBIGNUM_SIGN(x)) return INT2FIX(0);
-	else return INT2FIX(-1);
-    }
-    z = bignew(j, RBIGNUM_SIGN(x));
-    if (!RBIGNUM_SIGN(x)) {
-	num = ((BDIGIT_DBL)~0) << BITSPERDIG;
-    }
-    zds = BDIGITS(z);
-    while (i--, j--) {
-	num = (num | xds[i]) >> s2;
-	zds[j] = BIGLO(num);
-	num = BIGUP(xds[i]);
-    }
-    if (!RBIGNUM_SIGN(x)) {
-	get2comp(z);
-    }
-    return z;
+    if (BIGNUM_POSITIVE_P(x))
+        return (xds[s1] & bit) ? INT2FIX(1) : INT2FIX(0);
+    if (xds[s1] & (bit-1))
+        return (xds[s1] & bit) ? INT2FIX(0) : INT2FIX(1);
+    for (i = 0; i < s1; i++)
+        if (xds[i])
+            return (xds[s1] & bit) ? INT2FIX(0) : INT2FIX(1);
+    return (xds[s1] & bit) ? INT2FIX(1) : INT2FIX(0);
+}
+
+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);
 }
 
 /*
- *  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.
+ * call-seq:
+ *   big.coerce(numeric)  ->  array
  *
- *     a = 9**15
- *     50.downto(0) do |n|
- *       print a[n]
- *     end
+ * Returns an array with both a +numeric+ and a +big+ represented as Bignum
+ * objects.
  *
- *  <em>produces:</em>
+ * This is achieved by converting +numeric+ to a Bignum.
  *
- *     000101110110100000111000011110010100111100010111001
+ * A TypeError is raised if the +numeric+ is not a Fixnum or Bignum type.
  *
+ *     (0x3FFFFFFFFFFFFFFF+1).coerce(42)   #=> [42, 4611686018427387904]
  */
 
 static VALUE
-rb_big_aref(VALUE x, VALUE y)
+rb_int_coerce(VALUE x, VALUE y)
 {
-    BDIGIT *xds;
-    BDIGIT_DBL num;
-    VALUE shift;
-    long i, s1, s2;
-
-    if (TYPE(y) == T_BIGNUM) {
-	if (!RBIGNUM_SIGN(y))
-	    return INT2FIX(0);
-	bigtrunc(y);
-	if (RBIGNUM_LEN(y) > DIGSPERLONG) {
-	  out_of_range:
-	    return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1);
-	}
-	shift = big2ulong(y, "long", FALSE);
+    if (RB_INTEGER_TYPE_P(y)) {
+        return rb_assoc_new(y, x);
     }
     else {
-	i = NUM2LONG(y);
-	if (i < 0) return INT2FIX(0);
-	shift = (VALUE)i;
+        x = rb_Float(x);
+        y = rb_Float(y);
+        return rb_assoc_new(y, x);
     }
-    s1 = shift/BITSPERDIG;
-    s2 = shift%BITSPERDIG;
+}
 
-    if (s1 >= RBIGNUM_LEN(x)) goto out_of_range;
-    if (!RBIGNUM_SIGN(x)) {
-	xds = BDIGITS(x);
-	i = 0; num = 1;
-	while (num += ~xds[i], ++i <= s1) {
-	    num = BIGDN(num);
-	}
-    }
-    else {
-	num = BDIGITS(x)[s1];
+VALUE
+rb_big_abs(VALUE x)
+{
+    if (BIGNUM_NEGATIVE_P(x)) {
+	x = rb_big_clone(x);
+	BIGNUM_SET_POSITIVE_SIGN(x);
     }
-    if (num & ((BDIGIT_DBL)1<<s2))
-	return INT2FIX(1);
-    return INT2FIX(0);
+    return x;
 }
 
-/*
- * call-seq:
- *   big.hash   -> fixnum
- *
- * Compute a hash based on the value of _big_.
- */
+int
+rb_big_sign(VALUE x)
+{
+    return BIGNUM_SIGN(x);
+}
 
-static VALUE
-rb_big_hash(VALUE x)
+size_t
+rb_big_size(VALUE big)
 {
-    st_index_t hash;
+    return BIGSIZE(big);
+}
 
-    hash = rb_memhash(BDIGITS(x), sizeof(BDIGIT)*RBIGNUM_LEN(x)) ^ RBIGNUM_SIGN(x);
-    return INT2FIX(hash);
+VALUE
+rb_big_size_m(VALUE big)
+{
+    return SIZET2NUM(rb_big_size(big));
 }
 
-/*
- * MISSING: documentation
- */
+VALUE
+rb_big_bit_length(VALUE big)
+{
+    int nlz_bits;
+    size_t numbytes;
 
-static VALUE
-rb_big_coerce(VALUE x, VALUE y)
+    static const BDIGIT char_bit[1] = { CHAR_BIT };
+    BDIGIT numbytes_bary[bdigit_roomof(sizeof(size_t))];
+    BDIGIT nlz_bary[1];
+    BDIGIT result_bary[bdigit_roomof(sizeof(size_t)+1)];
+
+    numbytes = rb_absint_size(big, &nlz_bits);
+
+    if (numbytes == 0)
+        return LONG2FIX(0);
+
+    if (BIGNUM_NEGATIVE_P(big) && rb_absint_singlebit_p(big)) {
+        if (nlz_bits != CHAR_BIT-1) {
+            nlz_bits++;
+        }
+        else {
+            nlz_bits = 0;
+            numbytes--;
+        }
+    }
+
+    if (numbytes <= SIZE_MAX / CHAR_BIT) {
+        return SIZET2NUM(numbytes * CHAR_BIT - nlz_bits);
+    }
+
+    nlz_bary[0] = nlz_bits;
+
+    bary_unpack(BARY_ARGS(numbytes_bary), &numbytes, 1, sizeof(numbytes), 0,
+            INTEGER_PACK_NATIVE_BYTE_ORDER);
+    BARY_SHORT_MUL(result_bary, numbytes_bary, char_bit);
+    BARY_SUB(result_bary, result_bary, nlz_bary);
+
+    return rb_integer_unpack(result_bary, numberof(result_bary), sizeof(BDIGIT), 0,
+            INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER);
+}
+
+VALUE
+rb_big_odd_p(VALUE num)
 {
-    if (FIXNUM_P(y)) {
-	return rb_assoc_new(rb_int2big(FIX2LONG(y)), x);
+    if (BIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+VALUE
+rb_big_even_p(VALUE num)
+{
+    if (BIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) {
+	return Qfalse;
+    }
+    return Qtrue;
+}
+
+unsigned long rb_ulong_isqrt(unsigned long);
+#if SIZEOF_BDIGIT*2 > SIZEOF_LONG
+BDIGIT rb_bdigit_dbl_isqrt(BDIGIT_DBL);
+# ifdef ULL_TO_DOUBLE
+#   define BDIGIT_DBL_TO_DOUBLE(n) ULL_TO_DOUBLE(n)
+# endif
+#else
+# define rb_bdigit_dbl_isqrt(x) (BDIGIT)rb_ulong_isqrt(x)
+#endif
+#ifndef BDIGIT_DBL_TO_DOUBLE
+# define BDIGIT_DBL_TO_DOUBLE(n) (double)(n)
+#endif
+
+static BDIGIT *
+estimate_initial_sqrt(VALUE *xp, const size_t xn, const BDIGIT *nds, size_t len)
+{
+    enum {dbl_per_bdig = roomof(DBL_MANT_DIG,BITSPERDIG)};
+    const int zbits = nlz(nds[len-1]);
+    VALUE x = *xp = bignew_1(0, xn, 1); /* division may release the GVL */
+    BDIGIT *xds = BDIGITS(x);
+    BDIGIT_DBL d = bary2bdigitdbl(nds+len-dbl_per_bdig, dbl_per_bdig);
+    BDIGIT lowbits = 1;
+    int rshift = (int)((BITSPERDIG*2-zbits+(len&BITSPERDIG&1) - DBL_MANT_DIG + 1) & ~1);
+    double f;
+
+    if (rshift > 0) {
+	lowbits = (BDIGIT)d & ~(~(BDIGIT)1U << rshift);
+	d >>= rshift;
     }
-    else if (TYPE(y) == T_BIGNUM) {
-       return rb_assoc_new(y, x);
+    else if (rshift < 0) {
+	d <<= -rshift;
+	d |= nds[len-dbl_per_bdig-1] >> (BITSPERDIG+rshift);
+    }
+    f = sqrt(BDIGIT_DBL_TO_DOUBLE(d));
+    d = (BDIGIT_DBL)ceil(f);
+    if (BDIGIT_DBL_TO_DOUBLE(d) == f) {
+	if (lowbits || (lowbits = !bary_zero_p(nds, len-dbl_per_bdig)))
+	    ++d;
     }
     else {
-	rb_raise(rb_eTypeError, "can't coerce %s to Bignum",
-		 rb_obj_classname(y));
+	lowbits = 1;
+    }
+    rshift /= 2;
+    rshift += (2-(len&1))*BITSPERDIG/2;
+    if (rshift >= 0) {
+        if (nlz((BDIGIT)d) + rshift >= BITSPERDIG) {
+            /* (d << rshift) does cause overflow.
+             * example: Integer.sqrt(0xffff_ffff_ffff_ffff ** 2)
+             */
+            d = ~(BDIGIT_DBL)0;
+        }
+        else {
+            d <<= rshift;
+        }
     }
-    /* not reached */
-    return Qnil;
-}
+    BDIGITS_ZERO(xds, xn-2);
+    bdigitdbl2bary(&xds[xn-2], 2, d);
 
-/*
- *  call-seq:
- *     big.abs -> aBignum
- *
- *  Returns the absolute value of <i>big</i>.
- *
- *     -1234567890987654321.abs   #=> 1234567890987654321
- */
+    if (!lowbits) return NULL; /* special case, exact result */
+    return xds;
+}
 
-static VALUE
-rb_big_abs(VALUE x)
+VALUE
+rb_big_isqrt(VALUE n)
 {
-    if (!RBIGNUM_SIGN(x)) {
-	x = rb_big_clone(x);
-	RBIGNUM_SET_SIGN(x, 1);
+    BDIGIT *nds = BDIGITS(n);
+    size_t len = BIGNUM_LEN(n);
+    size_t xn = (len+1) / 2;
+    VALUE x;
+    BDIGIT *xds;
+
+    if (len <= 2) {
+	BDIGIT sq = rb_bdigit_dbl_isqrt(bary2bdigitdbl(nds, len));
+#if SIZEOF_BDIGIT > SIZEOF_LONG
+	return ULL2NUM(sq);
+#else
+	return ULONG2NUM(sq);
+#endif
+    }
+    else if ((xds = estimate_initial_sqrt(&x, xn, nds, len)) != 0) {
+	size_t tn = xn + BIGDIVREM_EXTRA_WORDS;
+	VALUE t = bignew_1(0, tn, 1);
+	BDIGIT *tds = BDIGITS(t);
+	tn = BIGNUM_LEN(t);
+
+	/* t = n/x */
+	while (bary_divmod_branch(tds, tn, NULL, 0, nds, len, xds, xn),
+	       bary_cmp(tds, tn, xds, xn) < 0) {
+	    int carry;
+	    BARY_TRUNC(tds, tn);
+	    /* x = (x+t)/2 */
+	    carry = bary_add(xds, xn, xds, xn, tds, tn);
+	    bary_small_rshift(xds, xds, xn, 1, carry);
+	    tn = BIGNUM_LEN(t);
+	}
+	rb_big_realloc(t, 0);
+	rb_gc_force_recycle(t);
     }
+    RBASIC_SET_CLASS_RAW(x, rb_cInteger);
     return 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
- */
+#ifdef USE_GMP
+static void
+bary_powm_gmp(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, const BDIGIT *mds, size_t mn)
+{
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
+    mpz_t z, x, y, m;
+    size_t count;
+    mpz_init(x);
+    mpz_init(y);
+    mpz_init(m);
+    mpz_init(z);
+    mpz_import(x, xn, -1, sizeof(BDIGIT), 0, nails, xds);
+    mpz_import(y, yn, -1, sizeof(BDIGIT), 0, nails, yds);
+    mpz_import(m, mn, -1, sizeof(BDIGIT), 0, nails, mds);
+    mpz_powm(z, x, y, m);
+    mpz_export(zds, &count, -1, sizeof(BDIGIT), 0, nails, z);
+    BDIGITS_ZERO(zds+count, zn-count);
+    mpz_clear(x);
+    mpz_clear(y);
+    mpz_clear(m);
+    mpz_clear(z);
+}
+#endif
 
 static VALUE
-rb_big_size(VALUE big)
+int_pow_tmp3(VALUE x, VALUE y, VALUE m, int nega_flg)
 {
-    return LONG2FIX(RBIGNUM_LEN(big)*SIZEOF_BDIGITS);
+#ifdef USE_GMP
+    VALUE z;
+    size_t xn, yn, mn, zn;
+
+    if (FIXNUM_P(x)) {
+       x = rb_int2big(FIX2LONG(x));
+    }
+    if (FIXNUM_P(y)) {
+       y = rb_int2big(FIX2LONG(y));
+    }
+    assert(RB_BIGNUM_TYPE_P(m));
+    xn = BIGNUM_LEN(x);
+    yn = BIGNUM_LEN(y);
+    mn = BIGNUM_LEN(m);
+    zn = mn;
+    z = bignew(zn, 1);
+    bary_powm_gmp(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn, BDIGITS(m), mn);
+    if (nega_flg & BIGNUM_POSITIVE_P(z)) {
+        z = rb_big_minus(z, m);
+    }
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    RB_GC_GUARD(m);
+    return rb_big_norm(z);
+#else
+    VALUE tmp = LONG2FIX(1L);
+    long yy;
+
+    for (/*NOP*/; ! FIXNUM_P(y); y = rb_big_rshift(y, LONG2FIX(1L))) {
+        if (RTEST(rb_int_odd_p(y))) {
+            tmp = rb_int_mul(tmp, x);
+            tmp = rb_int_modulo(tmp, m);
+        }
+        x = rb_int_mul(x, x);
+        x = rb_int_modulo(x, m);
+    }
+    for (yy = FIX2LONG(y); yy; yy >>= 1L) {
+        if (yy & 1L) {
+            tmp = rb_int_mul(tmp, x);
+            tmp = rb_int_modulo(tmp, m);
+        }
+        x = rb_int_mul(x, x);
+        x = rb_int_modulo(x, m);
+    }
+
+    if (nega_flg && rb_int_positive_p(tmp)) {
+        tmp = rb_int_minus(tmp, m);
+    }
+    return tmp;
+#endif
 }
 
 /*
- *  call-seq:
- *     big.odd? -> true or false
- *
- *  Returns <code>true</code> if <i>big</i> is an odd number.
+ * Integer#pow
  */
 
 static VALUE
-rb_big_odd_p(VALUE num)
+int_pow_tmp1(VALUE x, VALUE y, long mm, int nega_flg)
 {
-    if (BDIGITS(num)[0] & 1) {
-	return Qtrue;
+    long xx = FIX2LONG(x);
+    long tmp = 1L;
+    long yy;
+
+    for (/*NOP*/; ! FIXNUM_P(y); y = rb_big_rshift(y, LONG2FIX(1L))) {
+        if (RTEST(rb_int_odd_p(y))) {
+            tmp = (tmp * xx) % mm;
+        }
+        xx = (xx * xx) % mm;
     }
-    return Qfalse;
+    for (yy = FIX2LONG(y); yy; yy >>= 1L) {
+        if (yy & 1L) {
+            tmp = (tmp * xx) % mm;
+        }
+        xx = (xx * xx) % mm;
+    }
+
+    if (nega_flg && tmp) {
+        tmp -= mm;
+    }
+    return LONG2FIX(tmp);
+}
+
+static VALUE
+int_pow_tmp2(VALUE x, VALUE y, long mm, int nega_flg)
+{
+    long tmp = 1L;
+    long yy;
+#ifdef DLONG
+    const DLONG m = mm;
+    long tmp2 = tmp;
+    long xx = FIX2LONG(x);
+# define MUL_MODULO(a, b, c) (long)(((DLONG)(a) * (DLONG)(b)) % (c))
+#else
+    const VALUE m = LONG2FIX(mm);
+    VALUE tmp2 = LONG2FIX(tmp);
+    VALUE xx = x;
+# define MUL_MODULO(a, b, c) rb_int_modulo(rb_fix_mul_fix((a), (b)), (c))
+#endif
+
+    for (/*NOP*/; ! FIXNUM_P(y); y = rb_big_rshift(y, LONG2FIX(1L))) {
+        if (RTEST(rb_int_odd_p(y))) {
+            tmp2 = MUL_MODULO(tmp2, xx, m);
+        }
+        xx = MUL_MODULO(xx, xx, m);
+    }
+    for (yy = FIX2LONG(y); yy; yy >>= 1L) {
+        if (yy & 1L) {
+            tmp2 = MUL_MODULO(tmp2, xx, m);
+        }
+        xx = MUL_MODULO(xx, xx, m);
+    }
+
+#ifdef DLONG
+    tmp = tmp2;
+#else
+    tmp = FIX2LONG(tmp2);
+#endif
+    if (nega_flg && tmp) {
+        tmp -= mm;
+    }
+    return LONG2FIX(tmp);
 }
 
 /*
- *  call-seq:
- *     big.even? -> true or false
+ * Document-method: Integer#pow
+ * call-seq:
+ *    integer.pow(numeric)           ->  numeric
+ *    integer.pow(integer, integer)  ->  integer
  *
- *  Returns <code>true</code> if <i>big</i> is an even number.
+ * Returns (modular) exponentiation as:
+ *
+ *   a.pow(b)     #=> same as a**b
+ *   a.pow(b, m)  #=> same as (a**b) % m, but avoids huge temporary values
  */
-
-static VALUE
-rb_big_even_p(VALUE num)
+VALUE
+rb_int_powm(int const argc, VALUE * const argv, VALUE const num)
 {
-    if (BDIGITS(num)[0] & 1) {
-	return Qfalse;
+    rb_check_arity(argc, 1, 2);
+
+    if (argc == 1) {
+        return rb_int_pow(num, argv[0]);
     }
-    return Qtrue;
+    else {
+        VALUE const a = num;
+        VALUE const b = argv[0];
+        VALUE m = argv[1];
+        int nega_flg = 0;
+        if ( ! RB_INTEGER_TYPE_P(b)) {
+            rb_raise(rb_eTypeError, "Integer#pow() 2nd argument not allowed unless a 1st argument is integer");
+        }
+        if (rb_int_negative_p(b)) {
+            rb_raise(rb_eRangeError, "Integer#pow() 1st argument cannot be negative when 2nd argument specified");
+        }
+        if (!RB_INTEGER_TYPE_P(m)) {
+            rb_raise(rb_eTypeError, "Integer#pow() 2nd argument not allowed unless all arguments are integers");
+        }
+
+        if (rb_int_negative_p(m)) {
+            m = rb_int_uminus(m);
+            nega_flg = 1;
+        }
+
+        if (FIXNUM_P(m)) {
+            long const half_val = (long)HALF_LONG_MSB;
+            long const mm = FIX2LONG(m);
+            if (!mm) rb_num_zerodiv();
+            if (mm <= half_val) {
+                return int_pow_tmp1(rb_int_modulo(a, m), b, mm, nega_flg);
+            }
+            else {
+                return int_pow_tmp2(rb_int_modulo(a, m), b, mm, nega_flg);
+            }
+        }
+        else {
+            if (rb_bigzero_p(m)) rb_num_zerodiv();
+            return int_pow_tmp3(rb_int_modulo(a, m), b, m, nega_flg);
+        }
+    }
+    UNREACHABLE_RETURN(Qnil);
 }
 
 /*
@@ -3747,48 +7176,19 @@ rb_big_even_p(VALUE num)
 void
 Init_Bignum(void)
 {
-    rb_cBignum = rb_define_class("Bignum", rb_cInteger);
-
-    rb_define_method(rb_cBignum, "to_s", rb_big_to_s, -1);
-    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, "odd?", rb_big_odd_p, 0);
-    rb_define_method(rb_cBignum, "even?", rb_big_even_p, 0);
+#ifndef RUBY_INTEGER_UNIFICATION
+    rb_cBignum = rb_cInteger;
+#endif
+    /* An obsolete class, use Integer */
+    rb_define_const(rb_cObject, "Bignum", rb_cInteger);
+    rb_deprecate_constant(rb_cObject, "Bignum");
 
-    power_cache_init();
+    rb_define_method(rb_cInteger, "coerce", rb_int_coerce, 1);
 
-    big_three = rb_uint2big(3);
-    rb_gc_register_mark_object(big_three);
+#ifdef USE_GMP
+    /* The version of loaded GMP. */
+    rb_define_const(rb_cInteger, "GMP_VERSION", rb_sprintf("GMP %s", gmp_version));
+#endif
+
+    power_cache_init();
 }
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 0000000000..1a0b06b005
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('bundler', 'bundle', version)
+else
+gem "bundler", version
+load Gem.bin_path("bundler", "bundle", version)
+end
diff --git a/bin/bundler b/bin/bundler
new file mode 100755
index 0000000000..e15eb39ed7
--- /dev/null
+++ b/bin/bundler
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('bundler', 'bundler', version)
+else
+gem "bundler", version
+load Gem.bin_path("bundler", "bundler", version)
+end
diff --git a/bin/erb b/bin/erb
index 6b92ac2284..2435224fe1 100755
--- a/bin/erb
+++ b/bin/erb
@@ -11,7 +11,8 @@ class ERB
       return nil if self.empty?
       arg = self.shift
       return nil if arg == '--'
-      if arg =~ /^-(.)(.*)/
+      case arg
+      when /\A-(.)(.*)/
         if $1 == '-'
           arg, @maybe_arg = arg.split(/=/, 2)
           return arg
@@ -24,6 +25,8 @@ class ERB
           @maybe_arg = nil
         end
         "-#{$1}"
+      when /\A(\w+)=/
+        arg
       else
         self.unshift arg
         nil
@@ -54,6 +57,7 @@ class ERB
     def run(factory=ERB)
       trim_mode = 0
       disable_percent = false
+      variables = {}
       begin
         while switch = ARGV.switch
           case switch
@@ -71,8 +75,9 @@ class ERB
           when '-r'                        # require
             require ARGV.req_arg
           when '-S'                        # security level
+            warn 'warning: -S option of erb command is deprecated. Please do not use this.'
             arg = ARGV.req_arg
-            raise "invalid safe_level #{arg.dump}" unless arg =~ /^[0-4]$/
+            raise "invalid safe_level #{arg.dump}" unless arg =~ /\A[0-1]\z/
             safe_level = arg.to_i
           when '-T'                        # trim mode
             arg = ARGV.req_arg
@@ -80,7 +85,7 @@ class ERB
               trim_mode = arg
               next
             end
-            raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
+            raise "invalid trim mode #{arg.dump}" unless arg =~ /\A[0-2]\z/
             trim_mode = arg.to_i
           when '-E', '--encoding'
             arg = ARGV.req_arg
@@ -91,35 +96,43 @@ class ERB
             disable_percent = true
           when '--help'
             raise "print this help"
-          else
+          when /\A-/
             raise "unknown switch #{switch.dump}"
+          else
+            var, val = *switch.split('=', 2)
+            (variables ||= {})[var] = val
           end
         end
       rescue                               # usage
         STDERR.puts $!.to_s
         STDERR.puts File.basename($0) +
-          " [switches] [inputfile]"
+          " [switches] [var=value...] [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..4)
   -E ex[:in]       set default external/internal encodings
-  -U               set default encoding to UTF-8.
+  -U               set default encoding to UTF-8
   -T trim_mode     specify trim_mode (0..2, -)
-  -P               ignore lines which start with "%"
+  -P               disable ruby code evaluation for lines beginning with %
+  var=value        set variable
 EOU
         exit 1
       end
 
-      $<.set_encoding(Encoding::ASCII_8BIT, nil)
+      $<.set_encoding(Encoding::UTF_8, nil)
       src = $<.read
       filename = $FILENAME
       exit 2 unless src
       trim = trim_mode_opt(trim_mode, disable_percent)
-      erb = factory.new(src.untaint, safe_level, trim)
+      if safe_level.nil?
+        erb = factory.new(src, trim_mode: trim)
+      else
+        # [deprecated] This will be removed at Ruby 2.7.
+        erb = factory.new(src, safe_level, trim_mode: trim)
+      end
       erb.filename = filename
       if output
         if number
@@ -130,15 +143,23 @@ EOU
           puts erb.src
         end
       else
-        erb.run(TOPLEVEL_BINDING.taint)
+        bind = TOPLEVEL_BINDING
+        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)
       end
     end
     module_function :run
 
     def set_encoding(extern, intern = nil)
       verbose, $VERBOSE = $VERBOSE, nil
-      Encoding.default_external = extern unless extern.nil? || extern.empty?
-      Encoding.default_internal = intern unless intern.nil? || intern.empty?
+      Encoding.default_external = extern unless extern.nil? || extern == ""
+      Encoding.default_internal = intern unless intern.nil? || intern == ""
       [$stdin, $stdout, $stderr].each do |io|
         io.set_encoding(extern, intern)
       end
diff --git a/bin/irb b/bin/irb
index 6c8465c802..ae6d358c9d 100755
--- a/bin/irb
+++ b/bin/irb
@@ -1,20 +1,27 @@
 #!/usr/bin/env ruby
 #
-#   irb.rb - interactive ruby
-#   	$Release Version: 0.9.6 $
-#   	$Revision$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# This file was generated by RubyGems.
+#
+# The application 'irb' is installed as part of a gem, and
+# this file is here to facilitate running it.
 #
 
-require "irb"
+require 'rubygems'
 
-if __FILE__ == $0
-  IRB.start(__FILE__)
-else
-  # check -e option
-  if /^-e$/ =~ $0
-    IRB.start(__FILE__)
-  else
-    IRB.setup(__FILE__)
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
   end
 end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('irb', 'irb', version)
+else
+gem "irb", version
+load Gem.bin_path("irb", "irb", version)
+end
diff --git a/bin/racc b/bin/racc
new file mode 100755
index 0000000000..3ddac532b4
--- /dev/null
+++ b/bin/racc
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'racc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
+    version = $1
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('racc', 'racc', version)
+else
+gem "racc", version
+load Gem.bin_path("racc", "racc", version)
+end
diff --git a/bin/racc2y b/bin/racc2y
new file mode 100755
index 0000000000..a1e4352632
--- /dev/null
+++ b/bin/racc2y
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'racc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
+    version = $1
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('racc', 'racc2y', version)
+else
+gem "racc", version
+load Gem.bin_path("racc", "racc2y", version)
+end
diff --git a/bin/rake b/bin/rake
deleted file mode 100755
index 0de43c97ec..0000000000
--- a/bin/rake
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/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'
-rescue LoadError
-end
-
-require 'rake'
-
-Rake.application.run
diff --git a/bin/rdoc b/bin/rdoc
index 20d866c220..8fa948cddb 100755
--- a/bin/rdoc
+++ b/bin/rdoc
@@ -1,40 +1,27 @@
 #!/usr/bin/env ruby
 #
-#  RDoc: Documentation tool for source code
-#        (see lib/rdoc/rdoc.rb for more information)
+# This file was generated by RubyGems.
+#
+# The application 'rdoc' is installed as part of a gem, and
+# this file is here to facilitate running it.
 #
-#  Copyright (c) 2003 Dave Thomas
-#  Released under the same terms as Ruby
 
-begin
-  gem 'rdoc'
-rescue NameError => e # --disable-gems
-  raise unless e.name == :gem
-rescue Gem::LoadError
-end
+require 'rubygems'
 
-require 'rdoc/rdoc'
+version = ">= 0.a"
 
-begin
-  r = RDoc::RDoc.new
-  r.document ARGV
-rescue SystemExit
-  raise
-rescue Exception => e
-  if $DEBUG_RDOC then
-    $stderr.puts e.message
-    $stderr.puts "#{e.backtrace.join "\n\t"}"
-    $stderr.puts
-  elsif Interrupt === e then
-    $stderr.puts
-    $stderr.puts 'Interrupted'
-  else
-    $stderr.puts "uh-oh! RDoc had a problem:"
-    $stderr.puts e.message
-    $stderr.puts
-    $stderr.puts "run with --debug for full backtrace"
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
   end
-
-  exit 1
 end
 
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('rdoc', 'rdoc', version)
+else
+gem "rdoc", version
+load Gem.bin_path("rdoc", "rdoc", version)
+end
diff --git a/bin/ri b/bin/ri
index 7fbed0c099..0cc2f73bb6 100755
--- a/bin/ri
+++ b/bin/ri
@@ -1,12 +1,27 @@
 #!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'rdoc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-begin
-  gem 'rdoc'
-rescue NameError => e # --disable-gems
-  raise unless e.name == :gem
-rescue Gem::LoadError
-end
+require 'rubygems'
+
+version = ">= 0.a"
 
-require 'rdoc/ri/driver'
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
 
-RDoc::RI::Driver.run ARGV
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('rdoc', 'ri', version)
+else
+gem "rdoc", version
+load Gem.bin_path("rdoc", "ri", version)
+end
diff --git a/bin/testrb b/bin/testrb
deleted file mode 100755
index e9046eb147..0000000000
--- a/bin/testrb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-require 'test/unit'
-tests = Test::Unit::AutoRunner.new(true)
-tests.options.banner.sub!(/\[options\]/, '\& tests...')
-unless tests.process_args(ARGV)
-  abort tests.options.banner
-end
-files = tests.to_run
-$0 = files.size == 1 ? File.basename(files[0]) : files.to_s
-exit tests.run
diff --git a/bin/y2racc b/bin/y2racc
new file mode 100755
index 0000000000..023615f369
--- /dev/null
+++ b/bin/y2racc
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'racc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
+    version = $1
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('racc', 'y2racc', version)
+else
+gem "racc", version
+load Gem.bin_path("racc", "y2racc", version)
+end
diff --git a/bootstraptest/pending.rb b/bootstraptest/pending.rb
index 744c0adac1..0959bfa2b0 100644
--- a/bootstraptest/pending.rb
+++ b/bootstraptest/pending.rb
@@ -37,3 +37,8 @@ assert_normal_exit %q{
   r.instance_eval { initialize r, r }
   r.inspect
 }
+
+# This randomly fails on mswin.
+assert_equal %q{[]}, %q{
+  Thread.new{sleep}.backtrace
+}
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index df58ca58f3..56b4b12230 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -1,4 +1,4 @@
-"exec" "${RUBY-ruby}" "-x" "$0" "$@"; true # -*- mode: ruby; coding: utf-8 -*-
+"exec" "${RUBY-ruby}" "-x" "$0" "$@" || true # -*- Ruby -*-
 #!./ruby
 # $Id$
 
@@ -6,6 +6,7 @@
 # Never use optparse in this file.
 # Never use test/unit in this file.
 # Never use Ruby extensions in this file.
+# Maintain Ruby 1.8 compatibility for now
 
 begin
   require 'fileutils'
@@ -60,7 +61,11 @@ end
 def main
   @ruby = File.expand_path('miniruby')
   @verbose = false
+  $VERBOSE = false
   $stress = false
+  @color = nil
+  @tty = nil
+  @quiet = false
   dir = nil
   quiet = false
   tests = nil
@@ -81,8 +86,17 @@ def main
       true
     when /\A(--stress|-s)/
       $stress = true
+    when /\A--color(?:=(?:always|(auto)|(never)|(.*)))?\z/
+      warn "unknown --color argument: #$3" if $3
+      @color = $1 ? nil : !$2
+      true
+    when /\A--tty(=(?:yes|(no)|(.*)))?\z/
+      warn "unknown --tty argument: #$3" if $3
+      @tty = !$1 || !$2
+      true
     when /\A(-q|--q(uiet))\z/
       quiet = true
+      @quiet = true
       true
     when /\A(-v|--v(erbose))\z/
       @verbose = true
@@ -92,12 +106,16 @@ Usage: #{File.basename($0, '.*')} --ruby=PATH [--sets=NAME,NAME,...]
         --sets=NAME,NAME,...        Name of test sets.
         --dir=DIRECTORY             Working directory.
                                     default: /tmp/bootstraptestXXXXX.tmpwd
+        --color[=WHEN]              Colorize the output.  WHEN defaults to 'always'
+                                    or can be 'never' or 'auto'.
     -s, --stress                    stress test.
     -v, --verbose                   Output test name before exec.
     -q, --quiet                     Don\'t print header message.
     -h, --help                      Print this message and quit.
 End
       exit true
+    when /\A-j/
+      true
     else
       false
     end
@@ -110,6 +128,29 @@ End
   tests = Dir.glob("#{File.dirname($0)}/test_*.rb").sort if tests.empty?
   pathes = tests.map {|path| File.expand_path(path) }
 
+  @progress = %w[- \\ | /]
+  @progress_bs = "\b" * @progress[0].size
+  @tty = $stderr.tty? if @tty.nil?
+  case @color
+  when nil
+    @color = @tty && /dumb/ !~ ENV["TERM"]
+  end
+  @tty &&= !@verbose
+  if @color
+    # dircolors-like style
+    colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
+    begin
+      File.read(File.join(__dir__, "../tool/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
   unless quiet
     puts Time.now
     if defined?(RUBY_DESCRIPTION)
@@ -129,29 +170,56 @@ End
   }
 end
 
+def erase(e = true)
+  if e and @columns > 0 and @tty and !@verbose
+    "\e[1K\r"
+  else
+    ""
+  end
+end
+
 def exec_test(pathes)
   @count = 0
   @error = 0
   @errbuf = []
   @location = nil
+  @columns = 0
+  @width = pathes.map {|path| File.basename(path).size}.max + 2
   pathes.each do |path|
-    $stderr.print "\n#{File.basename(path)} "
+    @basename = File.basename(path)
+    $stderr.printf("%s%-*s ", erase(@quiet), @width, @basename)
+    $stderr.flush
+    @columns = @width + 1
     $stderr.puts if @verbose
+    count = @count
+    error = @error
     load File.expand_path(path)
+    if @tty
+      if @error == error
+        msg = "PASS #{@count-count}"
+        @columns += msg.size - 1
+        $stderr.print "#{@progress_bs}#{@passed}#{msg}#{@reset}"
+      else
+        msg = "FAIL #{@error-error}/#{@count-count}"
+        $stderr.print "#{@progress_bs}#{@failed}#{msg}#{@reset}"
+        @columns = 0
+      end
+    end
+    $stderr.puts unless @quiet and @tty and @error == error
+  end
+  $stderr.print(erase) if @quiet
+  @errbuf.each do |msg|
+    $stderr.puts msg
   end
-  $stderr.puts
   if @error == 0
     if @count == 0
       $stderr.puts "No tests, no problem"
     else
-      $stderr.puts "PASS all #{@count} tests"
+      $stderr.puts "#{@passed}PASS#{@reset} all #{@count} tests"
     end
     exit true
   else
-    @errbuf.each do |msg|
-      $stderr.puts msg
-    end
-    $stderr.puts "FAIL #{@error}/#{@count} tests failed"
+    $stderr.puts "#{@failed}FAIL#{@reset} #{@error}/#{@count} tests failed"
     exit false
   end
 end
@@ -159,33 +227,62 @@ end
 def show_progress(message = '')
   if @verbose
     $stderr.print "\##{@count} #{@location} "
+  elsif @tty
+    $stderr.print "#{@progress_bs}#{@progress[@count % @progress.size]}"
   end
-  faildesc = yield
+  t = Time.now if @verbose
+  faildesc, errout = with_stderr {yield}
+  t = Time.now - t if @verbose
   if !faildesc
-    $stderr.print '.'
-    $stderr.puts if @verbose
+    if @tty
+      $stderr.print "#{@progress_bs}#{@progress[@count % @progress.size]}"
+    elsif @verbose
+      $stderr.printf(". %.3f\n", t)
+    else
+      $stderr.print '.'
+    end
   else
-    $stderr.print 'F'
+    $stderr.print "#{@failed}F"
+    $stderr.printf(" %.3f", t) if @verbose
+    $stderr.print @reset
     $stderr.puts if @verbose
     error faildesc, message
+    unless errout.empty?
+      $stderr.print "#{@failed}stderr output is not empty#{@reset}\n", adjust_indent(errout)
+    end
+    if @tty and !@verbose
+      $stderr.printf("%-*s%s", @width, @basename, @progress[@count % @progress.size])
+    end
   end
+rescue Interrupt
+  $stderr.puts "\##{@count} #{@location}"
+  raise
 rescue Exception => err
   $stderr.print 'E'
   $stderr.puts if @verbose
   error err.message, message
 end
 
-def assert_check(testsrc, message = '', opt = '')
+def show_limit(testsrc, opt = '', **argh)
+  result = get_result_string(testsrc, opt, **argh)
+  if @tty and @verbose
+    $stderr.puts ".{#@reset}\n#{erase}#{result}"
+  else
+    @errbuf.push result
+  end
+end
+
+def assert_check(testsrc, message = '', opt = '', **argh)
   show_progress(message) {
-    result = get_result_string(testsrc, opt)
+    result = get_result_string(testsrc, opt, **argh)
     check_coredump
     yield(result)
   }
 end
 
-def assert_equal(expected, testsrc, message = '')
+def assert_equal(expected, testsrc, message = '', opt = '', **argh)
   newtest
-  assert_check(testsrc, message) {|result|
+  assert_check(testsrc, message, opt, **argh) {|result|
     if expected == result
       nil
     else
@@ -226,13 +323,10 @@ def assert_valid_syntax(testsrc, message = '')
   }
 end
 
-def assert_normal_exit(testsrc, *rest)
+def assert_normal_exit(testsrc, *rest, timeout: nil, **opt)
   newtest
-  opt = {}
-  opt = rest.pop if Hash === rest.last
   message, ignore_signals = rest
   message ||= ''
-  timeout = opt[:timeout]
   show_progress(message) {
     faildesc = nil
     filename = make_srcfile(testsrc)
@@ -256,7 +350,7 @@ def assert_normal_exit(testsrc, *rest)
       $stderr.reopen(old_stderr)
       old_stderr.close
     end
-    if status.signaled?
+    if status && status.signaled?
       signo = status.termsig
       signame = Signal.list.invert[signo]
       unless ignore_signals and ignore_signals.include?(signame)
@@ -282,6 +376,9 @@ def assert_normal_exit(testsrc, *rest)
 end
 
 def assert_finish(timeout_seconds, testsrc, message = '')
+  if RubyVM.const_defined? :MJIT
+    timeout_seconds *= 3 if RubyVM::MJIT.enabled? # for --jit-wait
+  end
   newtest
   show_progress(message) {
     faildesc = nil
@@ -290,12 +387,24 @@ def assert_finish(timeout_seconds, testsrc, message = '')
     pid = io.pid
     waited = false
     tlimit = Time.now + timeout_seconds
-    while Time.now < tlimit
+    diff = timeout_seconds
+    while diff > 0
       if Process.waitpid pid, Process::WNOHANG
         waited = true
         break
       end
-      sleep 0.1
+      if io.respond_to?(:read_nonblock)
+        if IO.select([io], nil, nil, diff)
+          begin
+            io.read_nonblock(1024)
+          rescue Errno::EAGAIN, IO::WaitReadable, EOFError
+            break
+          end while true
+        end
+      else
+        sleep 0.1
+      end
+      diff = tlimit - Time.now
     end
     if !waited
       Process.kill(:KILL, pid)
@@ -313,35 +422,37 @@ def flunk(message = '')
 end
 
 def pretty(src, desc, result)
-  src = src.sub(/\A.*\n/, '')
+  src = src.sub(/\A\s*\n/, '')
   (/\n/ =~ src ? "\n#{adjust_indent(src)}" : src) + "  #=> #{desc}"
 end
 
 INDENT = 27
 
 def adjust_indent(src)
-  untabify(src).gsub(/^ {#{INDENT}}/o, '').gsub(/^/, '   ')
+  untabify(src).gsub(/^ {#{INDENT}}/o, '').gsub(/^/, '   ').sub(/\s*\z/, "\n")
 end
 
 def untabify(str)
   str.gsub(/^\t+/) {' ' * (8 * $&.size) }
 end
 
-def make_srcfile(src)
+def make_srcfile(src, frozen_string_literal: nil)
   filename = 'bootstraptest.tmp.rb'
   File.open(filename, 'w') {|f|
+    f.puts "#frozen_string_literal:true" if frozen_string_literal
     f.puts "GC.stress = true" if $stress
     f.puts "print(begin; #{src}; end)"
   }
   filename
 end
 
-def get_result_string(src, opt = '')
+def get_result_string(src, opt = '', **argh)
   if @ruby
-    filename = make_srcfile(src)
+    filename = make_srcfile(src, **argh)
     begin
       `#{@ruby} -W0 #{opt} #{filename}`
     ensure
+      raise Interrupt if $? and $?.signaled? && $?.termsig == Signal.list["INT"]
       raise CoreDumpError, "core dumped" if $? and $?.coredump?
     end
   else
@@ -349,6 +460,27 @@ def get_result_string(src, opt = '')
   end
 end
 
+def with_stderr
+  out = err = nil
+  begin
+    r, w = IO.pipe
+    stderr = $stderr.dup
+    $stderr.reopen(w)
+    w.close
+    reader = Thread.start {r.read}
+    begin
+      out = yield
+    ensure
+      $stderr.reopen(stderr)
+      err = reader.value
+    end
+  ensure
+    w.close rescue nil
+    r.close rescue nil
+  end
+  return out, err
+end
+
 def newtest
   @location = File.basename(caller(2).first)
   @count += 1
@@ -356,7 +488,12 @@ def newtest
 end
 
 def error(msg, additional_message)
-  @errbuf.push "\##{@count} #{@location}: #{msg}  #{additional_message}"
+  msg = "#{@failed}\##{@count} #{@location}#{@reset}: #{msg}  #{additional_message}"
+  if @tty
+    $stderr.puts "#{erase}#{msg}"
+  else
+    @errbuf.push msg
+  end
   @error += 1
 end
 
diff --git a/bootstraptest/test_autoload.rb b/bootstraptest/test_autoload.rb
index e8df6684b6..a9f8e6dacd 100644
--- a/bootstraptest/test_autoload.rb
+++ b/bootstraptest/test_autoload.rb
@@ -43,46 +43,6 @@ assert_equal 'ok', %q{
   ZZZ.ok
 }
 
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
-  autoload :ZZZ, "./zzz.rb"
-  proc{$SAFE=4; ZZZ.ok}.call
-}
-
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
-  autoload :ZZZ, "./zzz.rb"
-  require "./zzz.rb"
-  proc{$SAFE=4; ZZZ.ok}.call
-}
-
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
-  autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
-  module M; end
-  Thread.new{M.instance_eval('$SAFE=4; ZZZ.new.hoge')}.value
-}
-
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
-  autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
-  module M; end
-  Thread.new{$SAFE=4; M.instance_eval('ZZZ.new.hoge')}.value
-}
-
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
-  autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
-  Thread.new{$SAFE=4; eval('ZZZ.new.hoge')}.value
-}
-
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
-  autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
-  module M; end
-  Thread.new{eval('$SAFE=4; ZZZ.new.hoge')}.value
-}
-
 assert_equal 'okok', %q{
   open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
   autoload :ZZZ, "./zzz.rb"
diff --git a/bootstraptest/test_block.rb b/bootstraptest/test_block.rb
index ea6768cc25..cdc5960a59 100644
--- a/bootstraptest/test_block.rb
+++ b/bootstraptest/test_block.rb
@@ -565,3 +565,49 @@ assert_normal_exit %q{
   t.test_for_bug
 }, '[ruby-core:14395]'
 
+assert_equal 'true', %q{
+  class C0
+    def foo
+      block_given?
+    end
+  end
+
+  class C1 < C0
+    def foo
+      super
+    end
+  end
+
+  C1.new.foo{}
+}
+
+assert_equal 'true', %q{
+  class C0
+    def foo
+      block_given?
+    end
+  end
+
+  class C1 < C0
+    def foo
+      super()
+    end
+  end
+
+  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_class.rb b/bootstraptest/test_class.rb
index 664dd2f166..b7fe0a1acd 100644
--- a/bootstraptest/test_class.rb
+++ b/bootstraptest/test_class.rb
@@ -11,6 +11,16 @@ assert_equal 'C',       %q( class C; end
                             C.new.class.name )
 assert_equal 'Class',   %q( class C; end
                             C.new.class.class )
+assert_equal 'true',    %q( Object.__send__(:remove_const, :TrueClass)
+                            GC.start
+                            true.inspect)
+assert_equal 'false',   %q( Object.__send__(:remove_const, :FalseClass)
+                            GC.start
+                            false.inspect)
+assert_equal 'nil',     %q( Object.__send__(:remove_const, :NilClass)
+                            GC.start
+                            nil.inspect)
+
 
 # inherited class
 assert_equal 'true',    %q( class A; end
diff --git a/bootstraptest/test_env.rb b/bootstraptest/test_env.rb
new file mode 100644
index 0000000000..7d1b45b75e
--- /dev/null
+++ b/bootstraptest/test_env.rb
@@ -0,0 +1,12 @@
+assert_equal "true", %q{
+  ENV["ENVTEST"] = "\u{e9 3042 d76c}"
+  env = ENV["ENVTEST"]
+  env.valid_encoding?
+}
+
+# different encoding is used for PATH
+assert_equal "true", %q{
+  ENV["PATH"] = "\u{e9 3042 d76c}"
+  env = ENV["PATH"]
+  env.valid_encoding?
+}
diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb
index c347d50ac9..fa04323b7f 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 Fixnum
+  class Integer
     Const = 1
   end
   1.instance_eval %{
@@ -190,7 +190,8 @@ assert_equal %q{[10, main]}, %q{
 }
 
 %w[break next redo].each do |keyword|
-  assert_match %r"Can't escape from eval with #{keyword}\z", %{
+  assert_match %r"Can't escape from eval with #{keyword}\b", %{
+    STDERR.reopen(STDOUT)
     begin
       eval "0 rescue #{keyword}"
     rescue SyntaxError => e
@@ -264,24 +265,18 @@ assert_equal 'ok', %q{
 }, '[ruby-core:16794]'
 
 assert_equal 'ok', %q{
-  begin
-    nil.instance_eval {
-      def a() :a end
-    }
-  rescue TypeError
-    :ok
-  end
-}, '[ruby-core:16796]'
+  nil.instance_eval {
+    def defd_using_instance_eval() :ok end
+  }
+  nil.defd_using_instance_eval
+}, '[ruby-core:28324]'
 
 assert_equal 'ok', %q{
-  begin
-    nil.instance_exec {
-      def a() :a end
-    }
-  rescue TypeError
-    :ok
-  end
-}, '[ruby-core:16796]'
+  nil.instance_exec {
+    def defd_using_instance_exec() :ok end
+  }
+  nil.defd_using_instance_exec
+}, '[ruby-core:28324]'
 
 assert_normal_exit %q{
   eval("", method(:proc).call {}.binding)
@@ -316,6 +311,15 @@ assert_normal_exit %q{
   end
   begin
     eval "class C; @@h = #{hash.inspect}; end"
-  rescue SystemStackError
   end
 }, '[ruby-core:25714]'
+
+assert_normal_exit %q{
+  begin
+    eval("# encoding:utf-16le\nfoo")
+  rescue Exception => e
+    p e
+    RubyVM::InstructionSequence.compile("p:hello")
+  end
+}, 'check escaping the internal value th->base_block'
+
diff --git a/bootstraptest/test_exception.rb b/bootstraptest/test_exception.rb
index f7d5eeaa07..0fb6f552b8 100644
--- a/bootstraptest/test_exception.rb
+++ b/bootstraptest/test_exception.rb
@@ -402,7 +402,7 @@ assert_equal 'nil', %q{
   exc.inspect
 }, '[ruby-dev:32608]'
 
-assert_equal 'exception class/object expected', %q{
+assert_equal 'divided by 0', %q{
   class ZeroDivisionError
     def self.new(message)
       42
@@ -414,3 +414,19 @@ assert_equal 'exception class/object expected', %q{
     e.message
   end
 }, '[ruby-core:24767]'
+
+assert_equal 'ok', %q{
+  class C
+    def ===(o)
+      true
+    end
+  end
+  begin
+    begin
+      raise
+    rescue C.new
+    end
+  rescue TypeError
+    :ok
+  end
+}
diff --git a/bootstraptest/test_fiber.rb b/bootstraptest/test_fiber.rb
new file mode 100644
index 0000000000..35e1bf6851
--- /dev/null
+++ b/bootstraptest/test_fiber.rb
@@ -0,0 +1,39 @@
+show_limit %q{
+  fibers = []
+  begin
+    fiber = Fiber.new{Fiber.yield}
+    fiber.resume
+    fibers << fiber
+
+    raise Exception, "skipping" if fibers.count >= 10_000
+  rescue Exception => error
+    puts "Fiber count: #{fibers.count} (#{error})"
+    break
+  end while true
+}
+
+assert_equal %q{ok}, %q{
+  Fiber.new{
+  }.resume
+  :ok
+}
+
+assert_equal %q{ok}, %q{
+  10_000.times.collect{Fiber.new{}}
+  :ok
+}
+
+assert_equal %q{ok}, %q{
+  fibers = 100.times.collect{Fiber.new{Fiber.yield}}
+  fibers.each(&:resume)
+  fibers.each(&:resume)
+  :ok
+}
+
+assert_normal_exit %q{
+  at_exit { Fiber.new{}.resume }
+}
+
+assert_normal_exit %q{
+  Fiber.new(&Object.method(:class_eval)).resume("foo")
+}, '[ruby-dev:34128]'
diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb
index d40d814fbc..9da6d45cbd 100644
--- a/bootstraptest/test_flow.rb
+++ b/bootstraptest/test_flow.rb
@@ -543,9 +543,59 @@ assert_equal %Q{ENSURE\n}, %q{
     end
   end
   e = Bug5234.new
+}],
+ ['[ruby-dev:45656]', %q{
+  class Bug6460
+    include Enumerable
+    def each
+      begin
+        yield :foo
+      ensure
+        1.times { Proc.new }
+      end
+    end
+  end
+  e = Bug6460.new
 }]].each do |bug, src|
   assert_equal "foo", src + %q{e.detect {true}}, bug
   assert_equal "true", src + %q{e.any? {true}}, bug
   assert_equal "false", src + %q{e.all? {false}}, bug
   assert_equal "true", src + %q{e.include?(:foo)}, bug
 end
+
+assert_equal "foo", %q{
+  class Bug6460
+    def m1
+      m2 {|e|
+        return e
+      }
+    end
+
+    def m2
+      begin
+        yield :foo
+      ensure
+        begin
+          begin
+            yield :foo
+          ensure
+            Proc.new
+            raise ''
+          end
+        rescue
+        end
+      end
+    end
+  end
+  Bug6460.new.m1
+}, '[ruby-dev:46372]'
+
+assert_equal "foo", %q{
+  obj = "foo"
+  if obj || any1
+    any2 = any2
+  else
+    raise obj.inspect
+  end
+  obj
+}, '[ruby-core:87830]'
diff --git a/bootstraptest/test_fork.rb b/bootstraptest/test_fork.rb
index 384294727f..83923dad97 100644
--- a/bootstraptest/test_fork.rb
+++ b/bootstraptest/test_fork.rb
@@ -21,27 +21,35 @@ assert_finish 10, %q{
   end
 }, '[ruby-core:22158]'
 
-assert_normal_exit(<<'End', '[ruby-dev:37934]')
-  Thread.new { sleep 1; Thread.kill Thread.main }
-  Process.setrlimit(:NPROC, 1)
+# temporarily stop this test to enable explicit failure when
+# timer thread couldn't be created (r61706 and r61717).
+assert_normal_exit(<<'End', '[ruby-dev:37934]') if false
+  main = Thread.current
+  Thread.new { sleep 0.01 until main.stop?; Thread.kill main }
+  Process.setrlimit(:NPROC, 1) if defined?(Process::RLIMIT_NPROC)
   fork {}
 End
 
 assert_equal 'ok', %q{
   begin
+    r, w = IO.pipe
     if pid1 = fork
-      sleep 1
+      w.close
+      r.read(1)
       Process.kill("USR1", pid1)
       _, s = Process.wait2(pid1)
       s.success? ? :ok : :ng
     else
+      r.close
       if pid2 = fork
-        trap("USR1") { Time.now.to_s }
+        trap("USR1") { Time.now.to_s; Process.kill("USR2", pid2) }
+        w.close
         Process.wait2(pid2)
       else
-        sleep 2
+        w.close
+        sleep 0.2
       end
-      exit 0
+      exit true
     end
   rescue NotImplementedError
     :ok
@@ -50,17 +58,17 @@ assert_equal 'ok', %q{
 
 assert_equal '[1, 2]', %q{
   a = []
-  trap(:INT) { a.push(1) }
-  trap(:TERM) { a.push(2) }
+  main = Thread.current
+  trap(:INT) { a.push(1).size == 2 and main.wakeup }
+  trap(:TERM) { a.push(2).size == 2 and main.wakeup }
   pid = $$
   begin
-    fork do
-      sleep 0.5
+    pid = fork do
       Process.kill(:INT, pid)
       Process.kill(:TERM, pid)
     end
-
-    sleep 1
+    Process.wait(pid)
+    100.times {break if a.size > 1; sleep 0.001}
     a.sort
   rescue NotImplementedError
     [1, 2]
diff --git a/bootstraptest/test_insns.rb b/bootstraptest/test_insns.rb
new file mode 100644
index 0000000000..1269d7d013
--- /dev/null
+++ b/bootstraptest/test_insns.rb
@@ -0,0 +1,440 @@
+# C0 coverage of each instructions
+
+# :NOTE: This is for development purpose; never consider this file as
+# ISeq compilation specification.
+
+begin
+  # This library brings some additional coverage.
+  # Not mandatory.
+  require 'rbconfig/sizeof'
+rescue LoadError
+  # OK, just skip
+else
+  if defined? RbConfig::LIMITS
+    $FIXNUM_MAX = RbConfig::LIMITS["FIXNUM_MAX"]
+    $FIXNUM_MIN = RbConfig::LIMITS["FIXNUM_MIN"]
+  end
+end
+
+fsl   = { frozen_string_literal: true } # used later
+tests = [
+  # insn ,   expression to generate such insn
+  [ 'nop',   %q{ raise rescue true }, ],
+
+  [ 'setlocal *, 0', %q{ x = true }, ],
+  [ 'setlocal *, 1', %q{ x = nil; -> { x = true }.call }, ],
+  [ 'setlocal',      %q{ x = nil; -> { -> { x = true }.() }.() }, ],
+  [ 'getlocal *, 0', %q{ x = true; x }, ],
+  [ 'getlocal *, 1', %q{ x = true; -> { x }.call }, ],
+  [ 'getlocal',      %q{ x = true; -> { -> { x }.() }.() }, ],
+
+  [ 'setblockparam', <<-'},', ], # {
+    def m&b
+      b = # here
+        proc { true }
+    end
+    m { false }.call
+  },
+  [ 'getblockparam', <<-'},', ], # {
+    def m&b
+      b # here
+    end
+    m { true }.call
+  },
+  [ 'getblockparamproxy', <<-'},', ], # {
+    def m&b
+      b # here
+        .call
+    end
+    m { true }
+  },
+
+  [ 'setspecial', %q{ true if true..true }, ],
+  [ 'getspecial', %q{ $&.nil? }, ],
+  [ 'getspecial', %q{ $`.nil? }, ],
+  [ 'getspecial', %q{ $'.nil? }, ],
+  [ 'getspecial', %q{ $+.nil? }, ],
+  [ 'getspecial', %q{ $1.nil? }, ],
+  [ 'getspecial', %q{ $128.nil? }, ],
+
+  [ 'getglobal', %q{ String === $0 }, ],
+  [ 'getglobal', %q{ $_.nil? }, ],
+  [ 'setglobal', %q{ $0 = "true" }, ],
+
+  [ 'setinstancevariable', %q{ @x = true }, ],
+  [ 'getinstancevariable', %q{ @x = true; @x }, ],
+
+  [ 'setclassvariable', %q{ @@x = true }, ],
+  [ 'getclassvariable', %q{ @@x = true; @@x }, ],
+
+  [ 'setconstant', %q{ X = true }, ],
+  [ 'setconstant', %q{ Object::X = true }, ],
+  [ 'getconstant', %q{ X = true; X }, ],
+  [ 'getconstant', %q{ X = true; Object::X }, ],
+
+  [ 'getinlinecache / setinlinecache', %q{ def x; X; end; X = true; x; x; x }, ],
+
+  [ 'putnil',               %q{ $~ == nil }, ],
+  [ 'putself',              %q{ $~ != self }, ],
+  [ 'putobject INT2FIX(0)', %q{ $~ != 0 }, ],
+  [ 'putobject INT2FIX(1)', %q{ $~ != 1 }, ],
+  [ 'putobject',            %q{ $~ != -1 }, ],
+  [ 'putobject',            %q{ $~ != /x/ }, ],
+  [ 'putobject',            %q{ $~ != :x }, ],
+  [ 'putobject',            %q{ $~ != (1..2) }, ],
+  [ 'putobject',            %q{ $~ != true }, ],
+  [ 'putobject',            %q{ /(?<x>x)/ =~ "x"; x == "x" }, ],
+
+  [ 'putspecialobject',         %q{ {//=>true}[//] }, ],
+  [ 'putiseq',                  %q{ -> { true }.() }, ],
+  [ 'putstring',                %q{ "true" }, ],
+  [ 'tostring / concatstrings', %q{ "#{true}" }, ],
+  [ 'freezestring',             %q{ "#{true}" }, fsl, ],
+  [ 'freezestring',             %q{ "#{true}" }, '-d', fsl, ],
+  [ 'toregexp',                 %q{ /#{true}/ =~ "true" && $~ }, ],
+  [ 'intern',                   %q{ :"#{true}" }, ],
+
+  [ 'newarray',    %q{ ["true"][0] }, ],
+  [ 'newarraykwsplat', %q{ [**{x:'true'}][0][:x] }, ],
+  [ 'duparray',    %q{ [ true ][0] }, ],
+  [ 'expandarray', %q{ y = [ true, false, nil ]; x, = y; x }, ],
+  [ 'expandarray', %q{ y = [ true, false, nil ]; x, *z = y; x }, ],
+  [ 'expandarray', %q{ y = [ true, false, nil ]; x, *z, w = y; x }, ],
+  [ 'splatarray',  %q{ x, = *(y = true), false; x }, ],
+  [ 'concatarray', %q{ ["t", "r", *x = "u", "e"].join }, ],
+  [ 'concatarray', <<-'},', ],  # {
+    class X; def to_a; ['u']; end; end
+    ['t', 'r', *X.new, 'e'].join
+  },
+  [ 'concatarray', <<-'},', ],  # {
+    r = false
+    t = [true, nil]
+    q, w, e = r, *t             # here
+    w
+  },
+
+  [ 'newhash',  %q{ x = {}; x[x] = true }, ],
+  [ 'newhash',  %q{ x = true; { x => x }[x] }, ],
+  [ 'newhashfromarray', %q{ { a: true }[:a] }, ],
+  [ 'newrange', %q{ x = 1; [*(0..x)][0] == 0 }, ],
+  [ 'newrange', %q{ x = 1; [*(0...x)][0] == 0 }, ],
+
+  [ 'pop',     %q{ def x; true; end; x }, ],
+  [ 'dup',     %q{ x = y = true; x }, ],
+  [ 'dupn',    %q{ Object::X ||= true }, ],
+  [ 'reverse', %q{ q, (w, e), r = 1, [2, 3], 4; e == 3 }, ],
+  [ 'swap',    <<-'},', ],      # {
+    x = [[false, true]]
+    for i, j in x               # here
+      ;
+    end
+    j
+  },
+
+  [ 'topn',        %q{ x, y = [], 0; x[*y], = [true, false]; x[0] }, ],
+  [ 'setn',        %q{ x, y = [], 0; x[*y]  =  true        ; x[0] }, ],
+  [ 'adjuststack', %q{ x = [true]; x[0] ||= nil; x[0] }, ],
+
+  [ 'defined',      %q{ !defined?(x) }, ],
+  [ 'checkkeyword', %q{ def x x:rand;x end; x x: true }, ],
+  [ 'checktype',    %q{ x = true; "#{x}" }, ],
+  [ 'checkmatch',   <<-'},', ], # {
+    x = y = true
+    case x
+    when false
+      y = false
+    when true                   # here
+      y = nil
+    end
+    y == nil
+  },
+  [ 'checkmatch',   <<-'},', ], # {
+    x, y = true, [false]
+    case x
+    when *y                     # here
+      z = false
+    else
+      z = true
+    end
+    z
+  },
+  [ 'checkmatch',   <<-'},', ], # {
+    x = false
+    begin
+      raise
+    rescue                      # here
+      x = true
+    end
+    x
+  },
+
+  [ 'defineclass', %q{                 module X;    true end }, ],
+  [ 'defineclass', %q{ X = Module.new; module X;    true end }, ],
+  [ 'defineclass', %q{                 class X;     true end }, ],
+  [ 'defineclass', %q{ X = Class.new;  class X;     true end }, ],
+  [ 'defineclass', %q{ X = Class.new;  class Y < X; true end }, ],
+  [ 'defineclass', %q{ X = Class.new;  class << X;  true end }, ],
+  [ 'defineclass', <<-'},', ], # {
+    X = Class.new
+    Y = Class.new(X)
+    class Y < X
+      true
+    end
+  },
+
+  [ 'opt_send_without_block', %q{ true.to_s }, ],
+  [ 'send',                   %q{ true.tap {|i| i.to_s } }, ],
+  [ 'leave',                  %q{ def x; true; end; x }, ],
+  [ 'invokesuper',            <<-'},', ], # {
+    class X < String
+      def empty?
+        super                   # here
+      end
+    end
+   X.new.empty?
+  },
+  [ 'invokeblock',            <<-'},', ], # {
+    def x
+      return yield self         # here
+    end
+    x do
+      true
+    end
+  },
+
+  [ 'opt_str_freeze', %q{ 'true'.freeze }, ],
+  [ 'opt_nil_p',      %q{ nil.nil? }, ],
+  [ 'opt_nil_p',      %q{ !Object.nil? }, ],
+  [ 'opt_nil_p',      %q{ Class.new{def nil?; true end}.new.nil? }, ],
+  [ 'opt_str_uminus', %q{ -'true' }, ],
+  [ 'opt_str_freeze', <<-'},', ], # {
+    class String
+      def freeze
+        true
+      end
+    end
+    'true'.freeze
+  },
+
+  [ 'opt_newarray_max', %q{ [ ].max.nil? }, ],
+  [ 'opt_newarray_max', %q{ [1, x = 2, 3].max == 3 }, ],
+  [ 'opt_newarray_max', <<-'},', ], # {
+    class Array
+      def max
+        true
+      end
+    end
+    [1, x = 2, 3].max
+  },
+  [ 'opt_newarray_min', %q{ [ ].min.nil? }, ],
+  [ 'opt_newarray_min', %q{ [3, x = 2, 1].min == 1 }, ],
+  [ 'opt_newarray_min', <<-'},', ], # {
+    class Array
+      def min
+        true
+      end
+    end
+    [3, x = 2, 1].min
+  },
+
+  [ 'throw',        %q{ false.tap { break true } }, ],
+  [ 'branchif',     %q{ x = nil;  x ||= true }, ],
+  [ 'branchif',     %q{ x = true; x ||= nil; x }, ],
+  [ 'branchunless', %q{ x = 1;    x &&= true }, ],
+  [ 'branchunless', %q{ x = nil;  x &&= true; x.nil? }, ],
+  [ 'branchnil',    %q{ x = true; x&.to_s }, ],
+  [ 'branchnil',    %q{ x = nil;  (x&.to_s).nil? }, ],
+  [ 'jump',         <<-'},', ], # {
+    y = 1
+    x = if y == 0 then nil elsif y == 1 then true else nil end
+    x
+  },
+  [ 'jump',         <<-'},', ], # {
+    # ultra complicated situation: this ||= assignment only generates
+    # 15 instructions, not including the class definition.
+    class X; attr_accessor :x; end
+    x = X.new
+    x&.x ||= true               # here
+  },
+
+  [ 'once', %q{ /#{true}/o =~ "true" && $~ }, ],
+  [ 'once', <<-'},', ],         # {
+    def once expr
+      return /#{expr}/o         # here
+    end
+    x = once(true); x = once(false); x = once(nil);
+    x =~ "true" && $~
+  },
+  [ 'once', <<-'},', ],         # {
+    # recursive once
+    def once n
+      return %r/#{
+        if n == 0
+          true
+        else
+          once(n-1)             # here
+        end
+      }/ox
+    end
+    x = once(128); x = once(7); x = once(16);
+    x =~ "true" && $~
+  },
+  [ 'once', <<-'},', ],         # {
+    # inter-thread lockup situation
+    def once n
+      return Thread.start n do |m|
+        Thread.pass
+        next %r/#{
+          sleep m               # here
+          true
+        }/ox
+      end
+    end
+    x = once(1); y = once(0.1); z = y.value
+    z =~ "true" && $~
+  },
+
+  [ 'opt_case_dispatch', %q{ case   0 when 1.1 then false else true end }, ],
+  [ 'opt_case_dispatch', %q{ case 1.0 when 1.1 then false else true end }, ],
+
+  [ 'opt_plus',    %q{ 1 + 1 == 2 }, ],
+  if defined? $FIXNUM_MAX then
+    [ 'opt_plus',  %Q{ #{ $FIXNUM_MAX } + 1 == #{ $FIXNUM_MAX + 1 } }, ]
+  end,
+  [ 'opt_plus',    %q{ 1.0 + 1.0 == 2.0 }, ],
+  [ 'opt_plus',    %q{ x = +0.0.next_float; x + x >= x }, ],
+  [ 'opt_plus',    %q{ 't' + 'rue' }, ],
+  [ 'opt_plus',    %q{ ( ['t'] + ['r', ['u', ['e'], ], ] ).join }, ],
+  [ 'opt_plus',    %q{ Time.at(1) + 1 == Time.at(2) }, ],
+  [ 'opt_minus',   %q{ 1 - 1 == 0 }, ],
+  if defined? $FIXNUM_MIN then
+    [ 'opt_minus', %Q{ #{ $FIXNUM_MIN } - 1 == #{ $FIXNUM_MIN - 1 } }, ]
+  end,
+  [ 'opt_minus',   %q{ 1.0 - 1.0 == 0.0 }, ],
+  [ 'opt_minus',   %q{ x = -0.0.prev_float; x - x == 0.0 }, ],
+  [ 'opt_minus',   %q{ ( [false, true] - [false] )[0] }, ],
+  [ 'opt_mult',    %q{ 1 * 1 == 1 }, ],
+  [ 'opt_mult',    %q{ 1.0 * 1.0 == 1.0 }, ],
+  [ 'opt_mult',    %q{ x = +0.0.next_float; x * x <= x }, ],
+  [ 'opt_mult',    %q{ ( "ruet" * 3 )[7,4] }, ],
+  [ 'opt_div',     %q{ 1 / 1 == 1 }, ],
+  [ 'opt_div',     %q{ 1.0 / 1.0 == 1.0 }, ],
+  [ 'opt_div',     %q{ x = +0.0.next_float; x / x >= x }, ],
+  [ 'opt_div',     %q{ x = 1/2r; x / x == 1 }, ],
+  [ 'opt_mod',     %q{ 1 % 1 == 0 }, ],
+  [ 'opt_mod',     %q{ 1.0 % 1.0 == 0.0 }, ],
+  [ 'opt_mod',     %q{ x = +0.0.next_float; x % x == 0.0 }, ],
+  [ 'opt_mod',     %q{ '%s' % [ true ] }, ],
+
+  [ 'opt_eq', %q{ 1 == 1 }, ],
+  [ 'opt_eq', <<-'},', ],       # {
+    class X; def == other; true; end; end
+    X.new == true
+  },
+  [ 'opt_neq', %q{ 1 != 0 }, ],
+  [ 'opt_neq', <<-'},', ],       # {
+    class X; def != other; true; end; end
+    X.new != true
+  },
+
+  [ 'opt_lt', %q{            -1   <  0 }, ],
+  [ 'opt_lt', %q{            -1.0 <  0.0 }, ],
+  [ 'opt_lt', %q{ -0.0.prev_float <  0.0 }, ],
+  [ 'opt_lt', %q{              ?a <  ?z }, ],
+  [ 'opt_le', %q{            -1   <= 0 }, ],
+  [ 'opt_le', %q{            -1.0 <= 0.0 }, ],
+  [ 'opt_le', %q{ -0.0.prev_float <= 0.0 }, ],
+  [ 'opt_le', %q{              ?a <= ?z }, ],
+  [ 'opt_gt', %q{             1   >  0 }, ],
+  [ 'opt_gt', %q{             1.0 >  0.0 }, ],
+  [ 'opt_gt', %q{ +0.0.next_float >  0.0 }, ],
+  [ 'opt_gt', %q{              ?z >  ?a }, ],
+  [ 'opt_ge', %q{             1   >= 0 }, ],
+  [ 'opt_ge', %q{             1.0 >= 0.0 }, ],
+  [ 'opt_ge', %q{ +0.0.next_float >= 0.0 }, ],
+  [ 'opt_ge', %q{              ?z >= ?a }, ],
+
+  [ 'opt_ltlt', %q{  '' << 'true' }, ],
+  [ 'opt_ltlt', %q{ ([] << 'true').join }, ],
+  [ 'opt_ltlt', %q{ (1 << 31) == 2147483648 }, ],
+
+  [ 'opt_aref', %q{ ['true'][0] }, ],
+  [ 'opt_aref', %q{ { 0 => 'true'}[0] }, ],
+  [ 'opt_aref', %q{ 'true'[0] == ?t }, ],
+  [ 'opt_aset', %q{ [][0] = true }, ],
+  [ 'opt_aset', %q{ {}[0] = true }, ],
+  [ 'opt_aset', %q{ x = 'frue'; x[0] = 't'; x }, ],
+  [ 'opt_aset', <<-'},', ], # {
+    # opt_aref / opt_aset mixup situation
+    class X; def x; {}; end; end
+    x = X.new
+    x&.x[true] ||= true         # here
+  },
+
+  [ 'opt_aref_with', %q{ { 'true' => true }['true'] }, ],
+  [ 'opt_aref_with', %q{ Struct.new(:nil).new['nil'].nil? }, ],
+  [ 'opt_aset_with', %q{ {}['true'] = true }, ],
+  [ 'opt_aset_with', %q{ Struct.new(:true).new['true'] = true }, ],
+
+  [ 'opt_length',  %q{   'true'       .length == 4 }, ],
+  [ 'opt_length',  %q{   :true        .length == 4 }, ],
+  [ 'opt_length',  %q{ [ 'true' ]     .length == 1 }, ],
+  [ 'opt_length',  %q{ { 'true' => 1 }.length == 1 }, ],
+  [ 'opt_size',    %q{   'true'       .size   == 4 }, ],
+  [ 'opt_size',    %q{               1.size   >= 4 }, ],
+  [ 'opt_size',    %q{ [ 'true' ]     .size   == 1 }, ],
+  [ 'opt_size',    %q{ { 'true' => 1 }.size   == 1 }, ],
+  [ 'opt_empty_p', %q{ ''.empty? }, ],
+  [ 'opt_empty_p', %q{ [].empty? }, ],
+  [ 'opt_empty_p', %q{ {}.empty? }, ],
+  [ 'opt_empty_p', %q{ Queue.new.empty? }, ],
+
+  [ 'opt_succ',  %q{ 1.succ == 2 }, ],
+  if defined? $FIXNUM_MAX then
+    [ 'opt_succ',%Q{ #{ $FIXNUM_MAX }.succ == #{ $FIXNUM_MAX + 1 } }, ]
+  end,
+  [ 'opt_succ',  %q{ '1'.succ == '2' }, ],
+  [ 'opt_succ',  %q{ x = Time.at(0); x.succ == Time.at(1) }, ],
+
+  [ 'opt_not',  %q{ ! false }, ],
+  [ 'opt_neq', <<-'},', ],       # {
+    class X; def !; true; end; end
+    ! X.new
+  },
+
+  [ 'opt_regexpmatch2',  %q{ /true/ =~ 'true' && $~ }, ],
+  [ 'opt_regexpmatch2', <<-'},', ],       # {
+    class Regexp; def =~ other; true; end; end
+    /true/ =~ 'true'
+  },
+  [ 'opt_regexpmatch2',  %q{ 'true' =~ /true/ && $~ }, ],
+  [ 'opt_regexpmatch2', <<-'},', ],       # {
+    class String; def =~ other; true; end; end
+    'true' =~ /true/
+  },
+
+  [ 'opt_call_c_function', 'Struct.new(:x).new.x = true', ],
+]
+
+# normal path
+tests.compact.each do |(insn, expr, *a)|
+  if a.last.is_a?(Hash)
+    a = a.dup
+    kw = a.pop
+    assert_equal 'true', expr, insn, *a, **kw
+  else
+    assert_equal 'true', expr, insn, *a
+  end
+end
+
+# with trace
+tests.compact.each {|(insn, expr, *a)|
+  progn = "set_trace_func(proc{})\n" + expr
+  if a.last.is_a?(Hash)
+    a = a.dup
+    kw = a.pop
+    assert_equal 'true', progn, 'trace_' + insn, *a, **kw
+  else
+    assert_equal 'true', progn, 'trace_' + insn, *a
+  end
+}
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb
index 7304aebc26..89c00d0b88 100644
--- a/bootstraptest/test_io.rb
+++ b/bootstraptest/test_io.rb
@@ -2,9 +2,8 @@ assert_finish 5, %q{
   r, w = IO.pipe
   t1 = Thread.new { r.sysread(1) }
   t2 = Thread.new { r.sysread(1) }
-  sleep 0.1
+  sleep 0.01 until t1.stop? and t2.stop?
   w.write "a"
-  sleep 0.1
   w.write "a"
 }, '[ruby-dev:31866]'
 
@@ -27,16 +26,16 @@ assert_finish 10, %q{
       t1.join
       t2.join
     end
-  rescue LoadError, TimeoutError, NotImplementedError
+  rescue LoadError, Timeout::Error, NotImplementedError
   end
 }, '[ruby-dev:32566]'
 
 assert_finish 1, %q{
   r, w = IO.pipe
   Thread.new {
-  w << "ab"
-  sleep 0.1
-  w << "ab"
+    w << "ab"
+    sleep 0.01
+    w << "ab"
   }
   r.gets("abab")
 }
@@ -74,6 +73,12 @@ assert_equal 'ok', %q{
   :ok
 }
 
+assert_equal 'ok', %q{
+  dup = STDIN.dup
+  dupfd = dup.fileno
+  dupfd == STDIN.dup.fileno ? :ng : :ok
+}, '[ruby-dev:46834]'
+
 assert_normal_exit %q{
   ARGF.set_encoding "foo"
 }
@@ -85,7 +90,8 @@ assert_normal_exit %q{
     megacontent = "abc" * 12345678
     #File.open("megasrc", "w") {|f| f << megacontent }
 
-    Thread.new { sleep rand*0.2; Process.kill(:INT, $$) }
+    t0 = Thread.main
+    Thread.new { sleep 0.001 until t0.stop?; Process.kill(:INT, $$) }
 
     r1, w1 = IO.pipe
     r2, w2 = IO.pipe
diff --git a/bootstraptest/test_jump.rb b/bootstraptest/test_jump.rb
index 595aaa7c4b..7944915862 100644
--- a/bootstraptest/test_jump.rb
+++ b/bootstraptest/test_jump.rb
@@ -146,15 +146,16 @@ assert_equal %q{131}, %q{
     end
   }
 }
-assert_equal %q{ok}, %q{
+assert_match %r{Invalid retry}, %q{
+STDERR.reopen(STDOUT)
 begin
   eval %q{
     1.times{
       retry
     }
   }
-rescue SyntaxError
-  :ok
+rescue SyntaxError => e
+  e.message
 end
 }
 assert_equal %q{3}, %q{
diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb
index ab028e2c1e..9b3c10d519 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 'Fixnum',          '1234.class'
+assert_equal 'Integer',         '1234.class'
 assert_equal '1234',            '1_2_3_4'
-assert_equal 'Fixnum',          '1_2_3_4.class'
+assert_equal 'Integer',         '1_2_3_4.class'
 assert_equal '18',              '0x12'
-assert_equal 'Fixnum',          '0x12.class'
+assert_equal 'Integer',         '0x12.class'
 assert_equal '15',              '0o17'
-assert_equal 'Fixnum',          '0o17.class'
+assert_equal 'Integer',         '0o17.class'
 assert_equal '5',               '0b101'
-assert_equal 'Fixnum',          '0b101.class'
+assert_equal 'Integer',         '0b101.class'
 assert_equal '123456789012345678901234567890', '123456789012345678901234567890'
-assert_equal 'Bignum',          '123456789012345678901234567890.class'
+assert_equal 'Integer',         '123456789012345678901234567890.class'
 assert_equal '2.0',             '2.0'
 assert_equal 'Float',           '1.3.class'
 
@@ -82,7 +82,7 @@ assert_equal '0',               're = /test/; re =~ "test"'
 assert_equal '0',               'str = "test"; /test/ =~ str'
 assert_equal '0',               're = /test/; str = "test"; re =~ str'
 
-# dynacmi regexp
+# dynamic regexp
 assert_equal 'regexp',          %q(/re#{'ge'}xp/.source)
 assert_equal 'Regexp',          %q(/re#{'ge'}xp/.class)
 
@@ -97,7 +97,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'
@@ -167,7 +167,7 @@ assert_equal 'a',               'r = ("a".."c"); r.begin'
 assert_equal 'c',               'r = ("a".."c"); r.end'
 
 assert_equal 'String',          '__FILE__.class'
-assert_equal 'Fixnum',          '__LINE__.class'
+assert_equal 'Integer',         '__LINE__.class'
 
 ###
 
@@ -200,3 +200,48 @@ assert_equal 'ok', %q{
 assert_equal 'ok', %q{
   "#{}o""#{}k""#{}"
 }, '[ruby-core:25284]'
+
+assert_equal 'ok', %q{ #  long array literal
+  x = nil
+  eval "a = [#{(1..10_000).map{'x'}.join(", ")}]"
+  :ok
+}
+
+assert_equal 'ok', %q{ #  long array literal (optimized)
+  eval "a = [#{(1..10_000).to_a.join(", ")}]"
+  :ok
+}
+
+assert_equal 'ok', %q{ #  long hash literal
+  x = nil
+  eval "a = {#{(1..10_000).map{|n| "#{n} => x"}.join(', ')}}"
+  :ok
+}
+
+assert_equal 'ok', %q{ #  long hash literal (optimized)
+  eval "a = {#{(1..10_000).map{|n| "#{n} => #{n}"}.join(', ')}}"
+  :ok
+}
+
+assert_equal 'ok', %q{ #  Bug #15536
+  eval <<-END
+    {
+      **{
+        a0: nil, a1: nil, a2: nil, a3: nil, a4: nil, a5: nil, a6: nil, a7: nil, a8: nil,
+      },
+      a0: nil, a1: nil, a2: nil, a3: nil, a4: nil, a5: nil, a6: nil, a7: nil, a8: nil,
+      **{
+        c: nil
+      },
+      b0: nil, b1: nil, b2: nil, b3: nil, b4: nil, b5: nil, b6: nil, b7: nil, b8: nil,
+      b9: nil, b10: nil, b11: nil, b12: nil, b13: nil, b14: nil, b15: nil, b16: nil,
+      b17: nil, b18: nil, b19: nil, b20: nil, b21: nil,
+    }
+  END
+  :ok
+}
+
+assert_equal 'ok', %q{
+  [print(:ok), exit] # void literal with side-effect
+  :dummy
+}
diff --git a/bootstraptest/test_literal_suffix.rb b/bootstraptest/test_literal_suffix.rb
new file mode 100644
index 0000000000..c36fa7078f
--- /dev/null
+++ b/bootstraptest/test_literal_suffix.rb
@@ -0,0 +1,54 @@
+# numbers with suffix
+assert_equal '0/1',             '0r'
+assert_equal 'Rational',        '0r.class'
+assert_equal '1/1',             '1r'
+assert_equal 'Rational',        '1r.class'
+assert_equal '-1/1',            '-1r'
+assert_equal 'Rational',        '(-1r).class'
+assert_equal '1/1',             '0x1r'
+assert_equal 'Rational',        '0x1r.class'
+assert_equal '1/1',             '0b1r'
+assert_equal 'Rational',        '0b1r.class'
+assert_equal '1/1',             '0d1r'
+assert_equal 'Rational',        '0d1r.class'
+assert_equal '1/1',             '0o1r'
+assert_equal 'Rational',        '0o1r.class'
+assert_equal '1/1',             '01r'
+assert_equal 'Rational',        '01r.class'
+assert_equal '6/5',             '1.2r'
+assert_equal 'Rational',        '1.2r.class'
+assert_equal '-6/5',            '-1.2r'
+assert_equal 'Rational',        '(-1.2r).class'
+assert_equal '0+0i',            '0i'
+assert_equal 'Complex',         '0i.class'
+assert_equal '0+1i',            '1i'
+assert_equal 'Complex',         '1i.class'
+assert_equal '0+1i',            '0x1i'
+assert_equal 'Complex',         '0x1i.class'
+assert_equal '0+1i',            '0b1i'
+assert_equal 'Complex',         '0b1i.class'
+assert_equal '0+1i',            '0d1i'
+assert_equal 'Complex',         '0d1i.class'
+assert_equal '0+1i',            '0o1i'
+assert_equal 'Complex',         '0o1i.class'
+assert_equal '0+1i',            '01i'
+assert_equal 'Complex',         '01i.class'
+assert_equal '0+1.2i',          '1.2i'
+assert_equal 'Complex',         '1.2i.class'
+assert_equal '0+1/1i',          '1ri'
+assert_equal 'Complex',         '1ri.class'
+assert_equal '0+6/5i',          '1.2ri'
+assert_equal 'Complex',         '1.2ri.class'
+assert_equal '0+10.0i',         '1e1i'
+assert_equal 'Complex',         '1e1i.class'
+assert_equal '1',               '1if true'
+assert_equal '1',               '1rescue nil'
+assert_equal '10000000000000000001/10000000000000000000',
+             '1.0000000000000000001r'
+
+assert_equal 'syntax error, unexpected local variable or method, expecting end-of-input',
+             %q{begin eval('1ir', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
+assert_equal 'syntax error, unexpected local variable or method, expecting end-of-input',
+             %q{begin eval('1.2ir', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
+assert_equal 'syntax error, unexpected local variable or method, expecting end-of-input',
+             %q{begin eval('1e1r', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb
index 2baf33539d..3462aa9434 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_equal 'wrong number of arguments (1 for 0)', %q{
+assert_match /\Awrong number of arguments \(.*\b1\b.* 0\)\z/, %q{
   def m; end
   begin
     m(1)
@@ -12,7 +12,7 @@ assert_equal 'wrong number of arguments (1 for 0)', %q{
   end
 }
 
-assert_equal 'wrong number of arguments (0 for 1)', %q{
+assert_match /\Awrong number of arguments \(.*\b0\b.* 1\)\z/, %q{
   def m a; end
   begin
     m
@@ -886,50 +886,6 @@ class C0; def m *args; [:C0_m, args]; end; end
 class C1 < C0; def m a, o=:o; super; end; end
 ; C1.new.m 1, 2}
 
-assert_equal %q{[:ok, :ok, :ok, :ok, :ok, :ok, :ng, :ng]}, %q{
-  $ans = []
-  class Foo
-    def m
-    end
-  end
-
-  c1 = c2 = nil
-
-  lambda{
-    $SAFE = 4
-    c1 = Class.new{
-      def m
-      end
-    }
-    c2 = Class.new(Foo){
-      alias mm m
-    }
-  }.call
-
-  def test
-    begin
-      yield
-    rescue SecurityError
-      $ans << :ok
-    else
-      $ans << :ng
-    end
-  end
-
-  o1 = c1.new
-  o2 = c2.new
-
-  test{o1.m}
-  test{o2.mm}
-  test{o1.send :m}
-  test{o2.send :mm}
-  test{o1.public_send :m}
-  test{o2.public_send :mm}
-  test{o1.method(:m).call}
-  test{o2.method(:mm).call}
-  $ans
-}
-
 assert_equal 'ok', %q{
   class C
     def x=(n)
@@ -954,34 +910,6 @@ 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
@@ -1001,8 +929,8 @@ assert_equal 'ok', %q{
 
 assert_normal_exit %q{
   begin
-    Process.setrlimit(Process::RLIMIT_STACK, 4_202_496)
-    # FreeBSD fails this less than 4M + 8K bytes.
+    Process.setrlimit(Process::RLIMIT_STACK, 4_206_592)
+    # FreeBSD SEGVs this less than 4M + 12K bytes.
   rescue Exception
     exit
   end
@@ -1184,3 +1112,81 @@ assert_equal 'ok', %q{
   'ok'
 }, '[ruby-core:30534]'
 
+# should not cache when splat
+assert_equal 'ok', %q{
+  class C
+    attr_reader :a
+    def initialize
+      @a = 1
+    end
+  end
+
+  def m *args
+    C.new.a(*args)
+  end
+
+  m()
+  begin
+    m(1)
+  rescue ArgumentError
+    'ok'
+  end
+}
+
+assert_equal 'DC', %q{
+  $result = []
+
+  class C
+    def foo *args
+      $result << 'C'
+    end
+  end
+  class D
+    def foo *args
+      $result << 'D'
+    end
+  end
+
+  o1 = $o1 = C.new
+  o2 = $o2 = D.new
+
+  args = Object.new
+  def args.to_a
+    test1 $o2, nil
+    []
+  end
+  def test1 o, args
+    o.foo(*args)
+  end
+  test1 o1, args
+  $result.join
+}
+
+assert_equal 'DC', %q{
+  $result = []
+
+  class C
+    def foo *args
+      $result << 'C'
+    end
+  end
+  class D
+    def foo *args
+      $result << 'D'
+    end
+  end
+
+  o1 = $o1 = C.new
+  o2 = $o2 = D.new
+
+  block = Object.new
+  def block.to_proc
+    test2 $o2, %w(a, b, c), nil
+    Proc.new{}
+  end
+  def test2 o, args, block
+    o.foo(*args, &block)
+  end
+  test2 o1, [], block
+  $result.join
+}
diff --git a/bootstraptest/test_objectspace.rb b/bootstraptest/test_objectspace.rb
index 862a94e376..63a8d99322 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
-    Mutex.new.lock
+    Thread::Mutex.new.lock
   end
 }, '[ruby-dev:44049]'
 
@@ -44,3 +44,12 @@ assert_normal_exit %q{
     Thread.new {}
   end
 }, '[ruby-core:37858]'
+
+assert_equal 'ok', %q{
+  objects_and_ids = 1000.times.map { o = Object.new; [o, o.object_id] }
+  objects_and_ids.each { |expected, id|
+    actual = ObjectSpace._id2ref(id)
+    raise "expected #{expected.inspect}, got #{actual.inspect}" unless actual.equal?(expected)
+  }
+  'ok'
+}
diff --git a/bootstraptest/test_proc.rb b/bootstraptest/test_proc.rb
index 3d347004ea..1e384411dc 100644
--- a/bootstraptest/test_proc.rb
+++ b/bootstraptest/test_proc.rb
@@ -224,14 +224,14 @@ assert_equal %q{[[nil, []], [1, []], [1, [2]], [1, [2, 3]]]}, %q{
   Proc.new{|a, *b| [a, b]}.call(1, 2, 3),
   ]
 }
-assert_equal %q{0}, %q{
+assert_equal %q{1}, %q{
   pr = proc{
     $SAFE
   }
   $SAFE = 1
   pr.call
 }
-assert_equal %q{[1, 0]}, %q{
+assert_equal %q{[1, 1]}, %q{
   pr = proc{
     $SAFE += 1
   }
@@ -456,3 +456,28 @@ assert_equal 'ok', %q{
   end
 }
 
+assert_equal 'ok', %q{
+  def x
+    binding
+  end
+  b = x{|a| a }
+  b.eval('yield("ok")')
+}, '[Bug #5634]'
+
+assert_equal 'ok', %q{
+  def x
+    binding
+  end
+  eval("x { 'ok' }").eval "yield"
+}, '[Bug #5634]'
+
+assert_equal 'ok', %q{
+  def x
+    binding
+  end
+  def m
+    x{ 'ok' }
+  end
+  eval('yield', m)
+}, '[Bug #5634]'
+
diff --git a/bootstraptest/test_string.rb b/bootstraptest/test_string.rb
new file mode 100644
index 0000000000..849dcd45b0
--- /dev/null
+++ b/bootstraptest/test_string.rb
@@ -0,0 +1,3 @@
+assert_normal_exit %q{
+  inspect.clear
+}, '[ruby-core:68110]'
diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb
index ef1c622ace..a111990a1f 100644
--- a/bootstraptest/test_syntax.rb
+++ b/bootstraptest/test_syntax.rb
@@ -376,6 +376,8 @@ 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
@@ -529,7 +531,7 @@ def assert_syntax_error expected, code, message = ''
 end
 assert_syntax_error "unterminated string meets end of file", '().."', '[ruby-dev:29732]'
 assert_equal %q{[]}, %q{$&;[]}, '[ruby-dev:31068]'
-assert_syntax_error "syntax error, unexpected tSTAR, expecting '}'", %q{{*0}}, '[ruby-dev:31072]'
+assert_syntax_error "syntax error, unexpected *, expecting '}'", %q{{*0}}, '[ruby-dev:31072]'
 assert_syntax_error "`@0' is not allowed as an instance variable name", %q{@0..0}, '[ruby-dev:31095]'
 assert_syntax_error "identifier $00 is not valid to get", %q{$00..0}, '[ruby-dev:31100]'
 assert_syntax_error "identifier $00 is not valid to set", %q{0..$00=1}
@@ -541,7 +543,7 @@ assert_equal %q{1}, %q{
 assert_syntax_error "Can't set variable $1", %q{0..$1=1}, '[ruby-dev:31118]'
 assert_valid_syntax %q{1.times{1+(1&&next)}}, '[ruby-dev:31119]'
 assert_valid_syntax %q{x=-1;loop{x+=1&&redo if (x+=1).zero?}}, '[ruby-dev:31119]'
-assert_syntax_error %q{syntax error, unexpected $end}, %q{!}, '[ruby-dev:31243]'
+assert_syntax_error %q{syntax error, unexpected end-of-input}, %q{!}, '[ruby-dev:31243]'
 assert_equal %q{[nil]}, %q{[()]}, '[ruby-dev:31252]'
 assert_equal %q{true}, %q{!_=()}, '[ruby-dev:31263]'
 assert_equal 'ok', %q{while true; redo; end if 1 == 2; :ok}, '[ruby-dev:31360]'
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
index 2494cccbf3..f00e2f7efc 100644
--- a/bootstraptest/test_thread.rb
+++ b/bootstraptest/test_thread.rb
@@ -1,5 +1,14 @@
-# Thread and Fiber
+show_limit %q{
+  threads = []
+  begin
+    threads << Thread.new{sleep}
 
+    raise Exception, "skipping" if threads.count >= 10_000
+  rescue Exception => error
+    puts "Thread count: #{threads.count} (#{error})"
+    break
+  end while true
+}
 assert_equal %q{ok}, %q{
   Thread.new{
   }.join
@@ -10,7 +19,8 @@ assert_equal %q{ok}, %q{
     :ok
   }.value
 }
-assert_equal %q{20100}, %q{
+assert_equal %q{ok}, %q{
+begin
   v = 0
   (1..200).map{|i|
     Thread.new{
@@ -19,10 +29,14 @@ assert_equal %q{20100}, %q{
   }.each{|t|
     v += t.value
   }
-  v
+  v == 20100 ? :ok : v
+rescue ThreadError => e
+  :ok if /can't create Thread/ =~ e.message
+end
 }
-assert_equal %q{5000}, %q{
-  5000.times{|e|
+assert_equal %q{ok}, %q{
+begin
+  :ok if 5000 == 5000.times{|e|
     (1..2).map{
       Thread.new{
       }
@@ -30,9 +44,13 @@ assert_equal %q{5000}, %q{
       e.join()
     }
   }
+rescue ThreadError => e
+  /can't create Thread/ =~ e.message ? :ok : e.message
+end
 }
-assert_equal %q{5000}, %q{
-  5000.times{|e|
+assert_equal %q{ok}, %q{
+begin
+  :ok if 5000 == 5000.times{|e|
     (1..2).map{
       Thread.new{
       }
@@ -40,14 +58,21 @@ assert_equal %q{5000}, %q{
       e.join(1000000000)
     }
   }
+rescue ThreadError => e
+  /can't create Thread/ =~ e.message ? :ok : e.message
+end
 }
-assert_equal %q{5000}, %q{
-  5000.times{
+assert_equal %q{ok}, %q{
+begin
+  :ok if 5000 == 5000.times{
     t = Thread.new{}
     while t.alive?
       Thread.pass
     end
   }
+rescue NoMemoryError
+  :ok
+end
 }
 assert_equal %q{100}, %q{
   100.times{
@@ -77,7 +102,7 @@ assert_equal %q{ok}, %q{
       ans = :ok
     end
   }
-  Thread.pass
+  Thread.pass until t.stop?
   t.kill
   t.join
   ans
@@ -189,18 +214,18 @@ assert_equal %q{11}, %q{
   }.value + Thread.current[:a]
 }
 assert_normal_exit %q{
-begin
-  100.times do |i|
-    begin
-      th = Thread.start(Thread.current) {|u| u.raise }
-      raise
-    rescue
-    ensure
-      th.join
+  begin
+    100.times do |i|
+      begin
+        th = Thread.start(Thread.current) {|u| u.raise }
+        raise
+      rescue
+      ensure
+        th.join
+      end
     end
+  rescue
   end
-rescue
-end
 }, '[ruby-dev:31371]'
 
 assert_equal 'true', %{
@@ -233,16 +258,16 @@ assert_equal 'ok', %{
 }
 
 assert_finish 3, %{
-  th = Thread.new {sleep 2}
-  th.join(1)
+  th = Thread.new {sleep 0.2}
+  th.join(0.1)
   th.join
 }
 
 assert_finish 3, %{
   require 'timeout'
-  th = Thread.new {sleep 2}
+  th = Thread.new {sleep 0.2}
   begin
-    Timeout.timeout(1) {th.join}
+    Timeout.timeout(0.1) {th.join}
   rescue Timeout::Error
   end
   th.join
@@ -267,8 +292,8 @@ assert_normal_exit %q{
 
 assert_equal 'ok', %q{
   def m
-    t = Thread.new { while true do // =~ "" end }
-    sleep 0.1
+    t = Thread.new { while true; // =~ "" end }
+    sleep 0.01
     10.times {
       if /((ab)*(ab)*)*(b)/ =~ "ab"*7
         return :ng if !$4
@@ -283,10 +308,6 @@ assert_equal 'ok', %q{
 }, '[ruby-dev:34492]'
 
 assert_normal_exit %q{
-  at_exit { Fiber.new{}.resume }
-}
-
-assert_normal_exit %q{
   g = enum_for(:local_variables)
   loop { g.next }
 }, '[ruby-dev:34128]'
@@ -312,10 +333,6 @@ assert_normal_exit %q{
 }, '[ruby-dev:34128]'
 
 assert_normal_exit %q{
-  Fiber.new(&Object.method(:class_eval)).resume("foo")
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
   Thread.new("foo", &Object.method(:class_eval)).join
 }, '[ruby-dev:34128]'
 
@@ -331,9 +348,10 @@ assert_equal 'ok', %q{
 
 assert_equal 'ok', %q{
   begin
-    m1, m2 = Mutex.new, Mutex.new
-    Thread.new { m1.lock; sleep 1; m2.lock }
-    m2.lock; sleep 1; m1.lock
+    m1, m2 = Thread::Mutex.new, Thread::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
     :ng
   rescue Exception
     :ok
@@ -341,34 +359,34 @@ assert_equal 'ok', %q{
 }
 
 assert_equal 'ok', %q{
-  m = Mutex.new
-  Thread.new { m.lock }; sleep 1; m.lock
+  m = Thread::Mutex.new
+  Thread.new { m.lock }; sleep 0.1; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
-  m = Mutex.new
+  m = Thread::Mutex.new
   Thread.new { m.lock }; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
-  m = Mutex.new
+  m = Thread::Mutex.new
   Thread.new { m.lock }.join; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
-  m = Mutex.new
-  Thread.new { m.lock; sleep 2 }
-  sleep 1; m.lock
+  m = Thread::Mutex.new
+  Thread.new { m.lock; sleep 0.2 }
+  sleep 0.1; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
-  m = Mutex.new
-  Thread.new { m.lock; sleep 2; m.unlock }
-  sleep 1; m.lock
+  m = Thread::Mutex.new
+  Thread.new { m.lock; sleep 0.2; m.unlock }
+  sleep 0.1; m.lock
   :ok
 }
 
@@ -380,7 +398,9 @@ assert_equal 'ok', %q{
 
 assert_equal 'ok', %q{
   begin
-    10000.times { Thread.new(true) {|x| x == false } }
+    100.times{
+      (1..100).map{ Thread.new(true) {|x| x == false } }.each{|th| th.join}
+    }
   rescue NoMemoryError, StandardError
   end
   :ok
@@ -388,19 +408,20 @@ assert_equal 'ok', %q{
 
 assert_equal 'ok', %{
   open("zzz.rb", "w") do |f|
-    f.puts <<-END
+    f.puts <<-'end;' # do
       begin
-        m = Mutex.new
-        Thread.new { m.lock; sleep 1 }
-        sleep 0.3
+        m = Thread::Mutex.new
         parent = Thread.current
+        th1 = Thread.new { m.lock; sleep }
+        sleep 0.01 until th1.stop?
         Thread.new do
-          sleep 0.3
+          sleep 0.01 until parent.stop?
           begin
             fork { GC.start }
           rescue Exception
             parent.raise $!
           end
+          th1.run
         end
         m.lock
         pid, status = Process.wait2
@@ -408,7 +429,7 @@ assert_equal 'ok', %{
       rescue NotImplementedError
         $result = :ok
       end
-    END
+    end;
   end
   require "./zzz.rb"
   $result
@@ -417,8 +438,8 @@ assert_equal 'ok', %{
 assert_finish 3, %q{
   require 'thread'
 
-  lock = Mutex.new
-  cond = ConditionVariable.new
+  lock = Thread::Mutex.new
+  cond = Thread::ConditionVariable.new
   t = Thread.new do
     lock.synchronize do
       cond.wait(lock)
@@ -438,17 +459,27 @@ assert_finish 3, %q{
 
 assert_equal 'ok', %q{
   begin
-    Process.waitpid2(fork {sleep 1})[1].success? ? 'ok' : 'ng'
+    Process.waitpid2(fork {})[1].success? ? 'ok' : 'ng'
   rescue NotImplementedError
     'ok'
   end
 }
 
 assert_equal 'foo', %q{
-  f = proc {|s| /#{ sleep 1; s }/o }
-  [ Thread.new {            f.call("foo"); nil },
-    Thread.new { sleep 0.5; f.call("bar"); nil },
-  ].each {|t| t.join }
+  i = 0
+  Thread.start {sleep 1; exit!}
+  f = proc {|s, c| /#{c.call; s}/o }
+  th2 = Thread.new {
+    sleep 0.01 until i == 1
+    i = 2
+    f.call("bar", proc {sleep 2});
+    nil
+  }
+  th1 = Thread.new {
+    f.call("foo", proc {i = 1; sleep 0.01 until i == 2; sleep 0.01})
+    nil
+  }
+  [th1, th2].each {|t| t.join }
   GC.start
   f.call.source
 }
diff --git a/builtin.c b/builtin.c
new file mode 100644
index 0000000000..6de77228d0
--- /dev/null
+++ b/builtin.c
@@ -0,0 +1,69 @@
+#include "internal.h"
+#include "vm_core.h"
+#include "iseq.h"
+#include "builtin.h"
+
+#if CROSS_COMPILING
+
+#define INCLUDED_BY_BUILTIN_C 1
+#include "mini_builtin.c"
+
+#else
+
+#include "builtin_binary.inc"
+
+static const unsigned char*
+builtin_lookup(const char *feature, size_t *psize)
+{
+    static int index = 0;
+    int i = index++;
+
+    // usually, `builtin_binary` order is loading order at miniruby.
+    if (LIKELY(strcmp(builtin_binary[i].feature, feature) == 0)) {
+      found:
+        *psize = builtin_binary[i].bin_size;
+        return builtin_binary[i].bin;
+    }
+    else {
+        if (0) fprintf(stderr, "builtin_lookup: cached index miss (index:%d)\n", i);
+        for (i=0; i<BUILTIN_BINARY_SIZE; i++) {
+            if (strcmp(builtin_binary[i].feature, feature) == 0) {
+                goto found;
+            }
+        }
+    }
+    rb_bug("builtin_lookup: can not find %s\n", feature);
+}
+
+void
+rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table)
+{
+    // search binary
+    size_t size;
+    const unsigned char *bin = builtin_lookup(feature_name, &size);
+
+    // load binary
+    rb_vm_t *vm = GET_VM();
+    if (vm->builtin_function_table != NULL) rb_bug("vm->builtin_function_table should be NULL.");
+    vm->builtin_function_table = table;
+    vm->builtin_inline_index = 0;
+    const rb_iseq_t *iseq = rb_iseq_ibf_load_bytes((const char *)bin, size);
+    vm->builtin_function_table = NULL;
+
+    // exec
+    rb_iseq_eval(rb_iseq_check(iseq));
+}
+
+#endif
+
+void
+Init_builtin(void)
+{
+    // nothing
+}
+
+void
+Init_builtin_features(void)
+{
+    rb_load_with_builtin_functions("gem_prelude", NULL);
+}
diff --git a/builtin.h b/builtin.h
new file mode 100644
index 0000000000..f4d485e08d
--- /dev/null
+++ b/builtin.h
@@ -0,0 +1,78 @@
+#ifndef BUILTIN_H_INCLUDED
+#define BUILTIN_H_INCLUDED
+
+// invoke
+
+struct rb_builtin_function {
+    // for invocation
+    const void * const func_ptr;
+    const int argc;
+
+    // for load
+    const int index;
+    const char * const name;
+};
+
+#define RB_BUILTIN_FUNCTION(_i, _name, _fname, _arity) { \
+  .name = #_name, \
+  .func_ptr = (void *)_fname, \
+  .argc = _arity, \
+  .index = _i \
+}
+
+void rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table);
+
+#ifndef VM_CORE_H_EC_DEFINED
+typedef struct rb_execution_context_struct rb_execution_context_t;
+#endif
+
+/* The following code is generated by the following Ruby script:
+
+16.times{|i|
+  args = (i > 0 ? ', ' : '') + (0...i).map{"VALUE"}.join(', ')
+  puts "static inline void rb_builtin_function_check_arity#{i}(VALUE (*f)(rb_execution_context_t *ec, VALUE self#{args})){}"
+}
+*/
+
+static inline void rb_builtin_function_check_arity0(VALUE (*f)(rb_execution_context_t *ec, VALUE self)){}
+static inline void rb_builtin_function_check_arity1(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE)){}
+static inline void rb_builtin_function_check_arity2(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity3(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity4(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity5(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity6(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity7(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity8(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity9(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity10(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity11(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity12(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity13(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity14(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity15(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+
+VALUE rb_vm_lvar_exposed(rb_execution_context_t *ec, int index);
+
+// __builtin_inline!
+
+PUREFUNC(static inline VALUE rb_vm_lvar(rb_execution_context_t *ec, int index));
+
+static inline VALUE
+rb_vm_lvar(rb_execution_context_t *ec, int index)
+{
+#if VM_CORE_H_EC_DEFINED
+    return ec->cfp->ep[index];
+#else
+    return rb_vm_lvar_exposed(ec, index);
+#endif
+}
+
+// dump/load
+
+struct builtin_binary {
+    const char *feature;          // feature name
+    const unsigned char *bin;     // binary by ISeq#to_binary
+    size_t bin_size;
+};
+
+#endif // BUILTIN_H_INCLUDED
diff --git a/ccan/build_assert/build_assert.h b/ccan/build_assert/build_assert.h
new file mode 100644
index 0000000000..a04d1d4709
--- /dev/null
+++ b/ccan/build_assert/build_assert.h
@@ -0,0 +1,40 @@
+/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
+#ifndef CCAN_BUILD_ASSERT_H
+#define CCAN_BUILD_ASSERT_H
+
+/**
+ * BUILD_ASSERT - assert a build-time dependency.
+ * @cond: the compile-time condition which must be true.
+ *
+ * Your compile will fail if the condition isn't true, or can't be evaluated
+ * by the compiler.  This can only be used within a function.
+ *
+ * Example:
+ *	#include <stddef.h>
+ *	...
+ *	static char *foo_to_char(struct foo *foo)
+ *	{
+ *		// This code needs string to be at start of foo.
+ *		BUILD_ASSERT(offsetof(struct foo, string) == 0);
+ *		return (char *)foo;
+ *	}
+ */
+#define BUILD_ASSERT(cond) \
+	do { (void) sizeof(char [1 - 2*!(cond)]); } while(0)
+
+/**
+ * BUILD_ASSERT_OR_ZERO - assert a build-time dependency, as an expression.
+ * @cond: the compile-time condition which must be true.
+ *
+ * Your compile will fail if the condition isn't true, or can't be evaluated
+ * by the compiler.  This can be used in an expression: its value is "0".
+ *
+ * Example:
+ *	#define foo_to_char(foo)					\
+ *		 ((char *)(foo)						\
+ *		  + BUILD_ASSERT_OR_ZERO(offsetof(struct foo, string) == 0))
+ */
+#define BUILD_ASSERT_OR_ZERO(cond) \
+	(sizeof(char [1 - 2*!(cond)]) - 1)
+
+#endif /* CCAN_BUILD_ASSERT_H */
diff --git a/ccan/check_type/check_type.h b/ccan/check_type/check_type.h
new file mode 100644
index 0000000000..1f77a535e4
--- /dev/null
+++ b/ccan/check_type/check_type.h
@@ -0,0 +1,63 @@
+/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
+#ifndef CCAN_CHECK_TYPE_H
+#define CCAN_CHECK_TYPE_H
+
+/**
+ * check_type - issue a warning or build failure if type is not correct.
+ * @expr: the expression whose type we should check (not evaluated).
+ * @type: the exact type we expect the expression to be.
+ *
+ * This macro is usually used within other macros to try to ensure that a macro
+ * argument is of the expected type.  No type promotion of the expression is
+ * done: an unsigned int is not the same as an int!
+ *
+ * check_type() always evaluates to 0.
+ *
+ * If your compiler does not support typeof, then the best we can do is fail
+ * to compile if the sizes of the types are unequal (a less complete check).
+ *
+ * Example:
+ *	// They should always pass a 64-bit value to _set_some_value!
+ *	#define set_some_value(expr)			\
+ *		_set_some_value((check_type((expr), uint64_t), (expr)))
+ */
+
+/**
+ * check_types_match - issue a warning or build failure if types are not same.
+ * @expr1: the first expression (not evaluated).
+ * @expr2: the second expression (not evaluated).
+ *
+ * This macro is usually used within other macros to try to ensure that
+ * arguments are of identical types.  No type promotion of the expressions is
+ * done: an unsigned int is not the same as an int!
+ *
+ * check_types_match() always evaluates to 0.
+ *
+ * If your compiler does not support typeof, then the best we can do is fail
+ * to compile if the sizes of the types are unequal (a less complete check).
+ *
+ * Example:
+ *	// Do subtraction to get to enclosing type, but make sure that
+ *	// pointer is of correct type for that member.
+ *	#define container_of(mbr_ptr, encl_type, mbr)			\
+ *		(check_types_match((mbr_ptr), &((encl_type *)0)->mbr),	\
+ *		 ((encl_type *)						\
+ *		  ((char *)(mbr_ptr) - offsetof(enclosing_type, mbr))))
+ */
+#if HAVE_TYPEOF
+#define check_type(expr, type)			\
+	((typeof(expr) *)0 != (type *)0)
+
+#define check_types_match(expr1, expr2)		\
+	((typeof(expr1) *)0 != (typeof(expr2) *)0)
+#else
+#include "ccan/build_assert/build_assert.h"
+/* Without typeof, we can only test the sizes. */
+#define check_type(expr, type)					\
+	BUILD_ASSERT_OR_ZERO(sizeof(expr) == sizeof(type))
+
+#define check_types_match(expr1, expr2)				\
+	BUILD_ASSERT_OR_ZERO(sizeof(expr1) == sizeof(expr2))
+#endif /* HAVE_TYPEOF */
+
+#endif /* CCAN_CHECK_TYPE_H */
diff --git a/ccan/container_of/container_of.h b/ccan/container_of/container_of.h
new file mode 100644
index 0000000000..ae3e1fc81f
--- /dev/null
+++ b/ccan/container_of/container_of.h
@@ -0,0 +1,142 @@
+/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
+#ifndef CCAN_CONTAINER_OF_H
+#define CCAN_CONTAINER_OF_H
+#include "ccan/check_type/check_type.h"
+
+/**
+ * container_of - get pointer to enclosing structure
+ * @member_ptr: pointer to the structure member
+ * @containing_type: the type this member is within
+ * @member: the name of this member within the structure.
+ *
+ * Given a pointer to a member of a structure, this macro does pointer
+ * subtraction to return the pointer to the enclosing type.
+ *
+ * Example:
+ *	struct foo {
+ *		int fielda, fieldb;
+ *		// ...
+ *	};
+ *	struct info {
+ *		int some_other_field;
+ *		struct foo my_foo;
+ *	};
+ *
+ *	static struct info *foo_to_info(struct foo *foo)
+ *	{
+ *		return container_of(foo, struct info, my_foo);
+ *	}
+ */
+#define container_of(member_ptr, containing_type, member)		\
+	 ((containing_type *)						\
+	  ((char *)(member_ptr)						\
+	   - container_off(containing_type, member))			\
+	  + check_types_match(*(member_ptr), ((containing_type *)0)->member))
+
+
+/**
+ * container_of_or_null - get pointer to enclosing structure, or NULL
+ * @member_ptr: pointer to the structure member
+ * @containing_type: the type this member is within
+ * @member: the name of this member within the structure.
+ *
+ * Given a pointer to a member of a structure, this macro does pointer
+ * subtraction to return the pointer to the enclosing type, unless it
+ * is given NULL, in which case it also returns NULL.
+ *
+ * Example:
+ *	struct foo {
+ *		int fielda, fieldb;
+ *		// ...
+ *	};
+ *	struct info {
+ *		int some_other_field;
+ *		struct foo my_foo;
+ *	};
+ *
+ *	static struct info *foo_to_info_allowing_null(struct foo *foo)
+ *	{
+ *		return container_of_or_null(foo, struct info, my_foo);
+ *	}
+ */
+static inline char *container_of_or_null_(void *member_ptr, size_t offset)
+{
+	return member_ptr ? (char *)member_ptr - offset : NULL;
+}
+#define container_of_or_null(member_ptr, containing_type, member)	\
+	((containing_type *)						\
+	 container_of_or_null_(member_ptr,				\
+			       container_off(containing_type, member))	\
+	 + check_types_match(*(member_ptr), ((containing_type *)0)->member))
+
+/**
+ * container_off - get offset to enclosing structure
+ * @containing_type: the type this member is within
+ * @member: the name of this member within the structure.
+ *
+ * Given a pointer to a member of a structure, this macro does
+ * typechecking and figures out the offset to the enclosing type.
+ *
+ * Example:
+ *	struct foo {
+ *		int fielda, fieldb;
+ *		// ...
+ *	};
+ *	struct info {
+ *		int some_other_field;
+ *		struct foo my_foo;
+ *	};
+ *
+ *	static struct info *foo_to_info(struct foo *foo)
+ *	{
+ *		size_t off = container_off(struct info, my_foo);
+ *		return (void *)((char *)foo - off);
+ *	}
+ */
+#define container_off(containing_type, member)	\
+	offsetof(containing_type, member)
+
+/**
+ * container_of_var - get pointer to enclosing structure using a variable
+ * @member_ptr: pointer to the structure member
+ * @container_var: a pointer of same type as this member's container
+ * @member: the name of this member within the structure.
+ *
+ * Given a pointer to a member of a structure, this macro does pointer
+ * subtraction to return the pointer to the enclosing type.
+ *
+ * Example:
+ *	static struct info *foo_to_i(struct foo *foo)
+ *	{
+ *		struct info *i = container_of_var(foo, i, my_foo);
+ *		return i;
+ *	}
+ */
+#if HAVE_TYPEOF
+#define container_of_var(member_ptr, container_var, member) \
+	container_of(member_ptr, typeof(*container_var), member)
+#else
+#define container_of_var(member_ptr, container_var, member)	\
+	((void *)((char *)(member_ptr)	-			\
+		  container_off_var(container_var, member)))
+#endif
+
+/**
+ * container_off_var - get offset of a field in enclosing structure
+ * @container_var: a pointer to a container structure
+ * @member: the name of a member within the structure.
+ *
+ * Given (any) pointer to a structure and a its member name, this
+ * macro does pointer subtraction to return offset of member in a
+ * structure memory layout.
+ *
+ */
+#if HAVE_TYPEOF
+#define container_off_var(var, member)		\
+	container_off(typeof(*var), member)
+#else
+#define container_off_var(var, member)			\
+	((const char *)&(var)->member - (const char *)(var))
+#endif
+
+#endif /* CCAN_CONTAINER_OF_H */
diff --git a/ccan/licenses/BSD-MIT b/ccan/licenses/BSD-MIT
new file mode 100644
index 0000000000..89de354795
--- /dev/null
+++ b/ccan/licenses/BSD-MIT
@@ -0,0 +1,17 @@
+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.
diff --git a/ccan/licenses/CC0 b/ccan/licenses/CC0
new file mode 100644
index 0000000000..feb9b118e6
--- /dev/null
+++ b/ccan/licenses/CC0
@@ -0,0 +1,28 @@
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
+
+    the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
+    moral rights retained by the original author(s) and/or performer(s);
+    publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
+    rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
+    rights protecting the extraction, dissemination, use and reuse of data in a Work;
+    database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
+    other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+    No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
+    Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
+    Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
+    Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
diff --git a/ccan/list/list.h b/ccan/list/list.h
new file mode 100644
index 0000000000..7d219307bc
--- /dev/null
+++ b/ccan/list/list.h
@@ -0,0 +1,788 @@
+/* Licensed under BSD-MIT - see ccan/licenses/BSD-MIT file for details */
+#ifndef CCAN_LIST_H
+#define CCAN_LIST_H
+#include <assert.h>
+#include "ccan/str/str.h"
+#include "ccan/container_of/container_of.h"
+#include "ccan/check_type/check_type.h"
+
+/**
+ * struct list_node - an entry in a doubly-linked list
+ * @next: next entry (self if empty)
+ * @prev: previous entry (self if empty)
+ *
+ * This is used as an entry in a linked list.
+ * Example:
+ *	struct child {
+ *		const char *name;
+ *		// Linked list of all us children.
+ *		struct list_node list;
+ *	};
+ */
+struct list_node
+{
+	struct list_node *next, *prev;
+};
+
+/**
+ * struct list_head - the head of a doubly-linked list
+ * @h: the list_head (containing next and prev pointers)
+ *
+ * This is used as the head of a linked list.
+ * Example:
+ *	struct parent {
+ *		const char *name;
+ *		struct list_head children;
+ *		unsigned int num_children;
+ *	};
+ */
+struct list_head
+{
+	struct list_node n;
+};
+
+#define LIST_LOC __FILE__  ":" stringify(__LINE__)
+#define list_debug(h, loc) ((void)loc, h)
+#define list_debug_node(n, loc) ((void)loc, n)
+
+/**
+ * LIST_HEAD_INIT - initializer for an empty list_head
+ * @name: the name of the list.
+ *
+ * Explicit initializer for an empty list.
+ *
+ * See also:
+ *	LIST_HEAD, list_head_init()
+ *
+ * Example:
+ *	static struct list_head my_list = LIST_HEAD_INIT(my_list);
+ */
+#define LIST_HEAD_INIT(name) { { &(name).n, &(name).n } }
+
+/**
+ * LIST_HEAD - define and initialize an empty list_head
+ * @name: the name of the list.
+ *
+ * The LIST_HEAD macro defines a list_head and initializes it to an empty
+ * list.  It can be prepended by "static" to define a static list_head.
+ *
+ * See also:
+ *	LIST_HEAD_INIT, list_head_init()
+ *
+ * Example:
+ *	static LIST_HEAD(my_global_list);
+ */
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
+
+/**
+ * list_head_init - initialize a list_head
+ * @h: the list_head to set to the empty list
+ *
+ * Example:
+ *	...
+ *	struct parent *parent = malloc(sizeof(*parent));
+ *
+ *	list_head_init(&parent->children);
+ *	parent->num_children = 0;
+ */
+static inline void list_head_init(struct list_head *h)
+{
+	h->n.next = h->n.prev = &h->n;
+}
+
+/**
+ * list_node_init - initialize a list_node
+ * @n: the list_node to link to itself.
+ *
+ * You don't need to use this normally!  But it lets you list_del(@n)
+ * safely.
+ */
+static inline void list_node_init(struct list_node *n)
+{
+	n->next = n->prev = 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.
+ *
+ * The list_node does not need to be initialized; it will be overwritten.
+ * Example:
+ *	struct child *child = malloc(sizeof(*child));
+ *
+ *	child->name = "marvin";
+ *	list_add(&parent->children, &child->list);
+ *	parent->num_children++;
+ */
+#define list_add(h, n) list_add_(h, n, LIST_LOC)
+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;
+	(void)list_debug(h, abortstr);
+}
+
+/**
+ * list_add_tail - add an entry at the end of a linked list.
+ * @h: the list_head to add the node to
+ * @n: the list_node to add to the list.
+ *
+ * The list_node does not need to be initialized; it will be overwritten.
+ * Example:
+ *	list_add_tail(&parent->children, &child->list);
+ *	parent->num_children++;
+ */
+#define list_add_tail(h, n) list_add_tail_(h, n, LIST_LOC)
+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);
+}
+
+/**
+ * list_empty - is a list empty?
+ * @h: the list_head
+ *
+ * If the list is empty, returns true.
+ *
+ * Example:
+ *	assert(list_empty(&parent->children) == (parent->num_children == 0));
+ */
+#define list_empty(h) list_empty_(h, LIST_LOC)
+static inline int list_empty_(const struct list_head *h, const char* abortstr)
+{
+	(void)list_debug(h, abortstr);
+	return h->n.next == &h->n;
+}
+
+/**
+ * list_empty_nodebug - is a list empty (and don't perform debug checks)?
+ * @h: the list_head
+ *
+ * If the list is empty, returns true.
+ * This differs from list_empty() in that if CCAN_LIST_DEBUG is set it
+ * will NOT perform debug checks. Only use this function if you REALLY
+ * know what you're doing.
+ *
+ * Example:
+ *	assert(list_empty_nodebug(&parent->children) == (parent->num_children == 0));
+ */
+#ifndef CCAN_LIST_DEBUG
+#define list_empty_nodebug(h) list_empty(h)
+#else
+static inline int list_empty_nodebug(const struct list_head *h)
+{
+	return h->n.next == &h->n;
+}
+#endif
+
+/**
+ * list_empty_nocheck - is a list empty?
+ * @h: the list_head
+ *
+ * If the list is empty, returns true. This doesn't perform any
+ * debug check for list consistency, so it can be called without
+ * locks, racing with the list being modified. This is ok for
+ * checks where an incorrect result is not an issue (optimized
+ * bail out path for example).
+ */
+static inline bool list_empty_nocheck(const struct list_head *h)
+{
+	return h->n.next == &h->n;
+}
+
+/**
+ * list_del - delete an entry from an (unknown) linked list.
+ * @n: the list_node to delete from the list.
+ *
+ * Note that this leaves @n in an undefined state; it can be added to
+ * another list, but not deleted again.
+ *
+ * See also:
+ *	list_del_from(), list_del_init()
+ *
+ * Example:
+ *	list_del(&child->list);
+ *	parent->num_children--;
+ */
+#define list_del(n) list_del_(n, LIST_LOC)
+static inline void list_del_(struct list_node *n, const char* abortstr)
+{
+	(void)list_debug_node(n, abortstr);
+	n->next->prev = n->prev;
+	n->prev->next = n->next;
+#ifdef CCAN_LIST_DEBUG
+	/* Catch use-after-del. */
+	n->next = n->prev = NULL;
+#endif
+}
+
+/**
+ * list_del_init - delete a node, and reset it so it can be deleted again.
+ * @n: the list_node to be deleted.
+ *
+ * list_del(@n) or list_del_init() again after this will be safe,
+ * which can be useful in some cases.
+ *
+ * See also:
+ *	list_del_from(), list_del()
+ *
+ * Example:
+ *	list_del_init(&child->list);
+ *	parent->num_children--;
+ */
+#define list_del_init(n) list_del_init_(n, LIST_LOC)
+static inline void list_del_init_(struct list_node *n, const char *abortstr)
+{
+	list_del_(n, abortstr);
+	list_node_init(n);
+}
+
+/**
+ * list_del_from - delete an entry from a known linked list.
+ * @h: the list_head the node is in.
+ * @n: the list_node to delete from the list.
+ *
+ * This explicitly indicates which list a node is expected to be in,
+ * which is better documentation and can catch more bugs.
+ *
+ * See also: list_del()
+ *
+ * Example:
+ *	list_del_from(&parent->children, &child->list);
+ *	parent->num_children--;
+ */
+static inline void list_del_from(struct list_head *h, struct list_node *n)
+{
+#ifdef CCAN_LIST_DEBUG
+	{
+		/* Thorough check: make sure it was in list! */
+		struct list_node *i;
+		for (i = h->n.next; i != n; i = i->next)
+			assert(i != &h->n);
+	}
+#endif /* CCAN_LIST_DEBUG */
+
+	/* Quick test that catches a surprising number of bugs. */
+	assert(!list_empty(h));
+	list_del(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
+ * @member: the list_node member of the type
+ *
+ * Example:
+ *	// First list entry is children.next; convert back to child.
+ *	child = list_entry(parent->children.n.next, struct child, list);
+ *
+ * See Also:
+ *	list_top(), list_for_each()
+ */
+#define list_entry(n, type, member) container_of(n, type, member)
+
+/**
+ * list_top - get the first entry in a list
+ * @h: the list_head
+ * @type: the type of the entry
+ * @member: the list_node member of the type
+ *
+ * If the list is empty, returns NULL.
+ *
+ * Example:
+ *	struct child *first;
+ *	first = list_top(&parent->children, struct child, list);
+ *	if (!first)
+ *		printf("Empty list!\n");
+ */
+#define list_top(h, type, member)					\
+	((type *)list_top_((h), list_off_(type, member)))
+
+static inline const void *list_top_(const struct list_head *h, size_t off)
+{
+	if (list_empty(h))
+		return NULL;
+	return (const char *)h->n.next - off;
+}
+
+/**
+ * list_pop - remove the first entry in a list
+ * @h: the list_head
+ * @type: the type of the entry
+ * @member: the list_node member of the type
+ *
+ * If the list is empty, returns NULL.
+ *
+ * Example:
+ *	struct child *one;
+ *	one = list_pop(&parent->children, struct child, list);
+ *	if (!one)
+ *		printf("Empty list!\n");
+ */
+#define list_pop(h, type, member)					\
+	((type *)list_pop_((h), list_off_(type, member)))
+
+static inline const void *list_pop_(const struct list_head *h, size_t off)
+{
+	struct list_node *n;
+
+	if (list_empty(h))
+		return NULL;
+	n = h->n.next;
+	list_del(n);
+	return (const char *)n - off;
+}
+
+/**
+ * list_tail - get the last entry in a list
+ * @h: the list_head
+ * @type: the type of the entry
+ * @member: the list_node member of the type
+ *
+ * If the list is empty, returns NULL.
+ *
+ * Example:
+ *	struct child *last;
+ *	last = list_tail(&parent->children, struct child, list);
+ *	if (!last)
+ *		printf("Empty list!\n");
+ */
+#define list_tail(h, type, member) \
+	((type *)list_tail_((h), list_off_(type, member)))
+
+static inline const void *list_tail_(const struct list_head *h, size_t off)
+{
+	if (list_empty(h))
+		return NULL;
+	return (const char *)h->n.prev - off;
+}
+
+/**
+ * list_for_each - iterate through a list.
+ * @h: the list_head (warning: evaluated multiple times!)
+ * @i: 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.  It's
+ * a for loop, so you can break and continue as normal.
+ *
+ * Example:
+ *	list_for_each(&parent->children, child, list)
+ *		printf("Name: %s\n", child->name);
+ */
+#define list_for_each(h, i, member)					\
+	list_for_each_off(h, i, list_off_var_(i, member))
+
+/**
+ * list_for_each_rev - iterate through a list backwards.
+ * @h: the list_head
+ * @i: 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.  It's
+ * a for loop, so you can break and continue as normal.
+ *
+ * Example:
+ *	list_for_each_rev(&parent->children, child, list)
+ *		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))
+
+/**
+ * list_for_each_safe - iterate through a list, 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.  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:
+ *	list_for_each_safe(&parent->children, child, next, list) {
+ *		list_del(&child->list);
+ *		parent->num_children--;
+ *	}
+ */
+#define list_for_each_safe(h, i, nxt, member)				\
+	list_for_each_safe_off(h, i, nxt, list_off_var_(i, member))
+
+/**
+ * list_next - get the next entry in a list
+ * @h: the list_head
+ * @i: a pointer to an entry in the list.
+ * @member: the list_node member of the structure
+ *
+ * If @i was the last entry in the list, returns NULL.
+ *
+ * Example:
+ *	struct child *second;
+ *	second = list_next(&parent->children, first, list);
+ *	if (!second)
+ *		printf("No second child!\n");
+ */
+#define list_next(h, i, member)						\
+	((list_typeof(i))list_entry_or_null(list_debug(h,		\
+					    __FILE__ ":" stringify(__LINE__)), \
+					    (i)->member.next,		\
+					    list_off_var_((i), member)))
+
+/**
+ * list_prev - get the previous entry in a list
+ * @h: the list_head
+ * @i: a pointer to an entry in the list.
+ * @member: the list_node member of the structure
+ *
+ * If @i was the first entry in the list, returns NULL.
+ *
+ * Example:
+ *	first = list_prev(&parent->children, second, list);
+ *	if (!first)
+ *		printf("Can't go back to first child?!\n");
+ */
+#define list_prev(h, i, member)						\
+	((list_typeof(i))list_entry_or_null(list_debug(h,		\
+					    __FILE__ ":" stringify(__LINE__)), \
+					    (i)->member.prev,		\
+					    list_off_var_((i), member)))
+
+/**
+ * list_append_list - empty one list onto the end of another.
+ * @to: the list to append into
+ * @from: the list to empty.
+ *
+ * This takes the entire contents of @from and moves it to the end of
+ * @to.  After this @from will be empty.
+ *
+ * Example:
+ *	struct list_head adopter;
+ *
+ *	list_append_list(&adopter, &parent->children);
+ *	assert(list_empty(&parent->children));
+ *	parent->num_children = 0;
+ */
+#define list_append_list(t, f) list_append_list_(t, f,			\
+				   __FILE__ ":" stringify(__LINE__))
+static inline void list_append_list_(struct list_head *to,
+				     struct list_head *from,
+				     const char *abortstr)
+{
+	struct list_node *from_tail = list_debug(from, abortstr)->n.prev;
+	struct list_node *to_tail = list_debug(to, abortstr)->n.prev;
+
+	/* Sew in head and entire list. */
+	to->n.prev = from_tail;
+	from_tail->next = &to->n;
+	to_tail->next = &from->n;
+	from->n.prev = to_tail;
+
+	/* Now remove head. */
+	list_del(&from->n);
+	list_head_init(from);
+}
+
+/**
+ * list_prepend_list - empty one list into the start of another.
+ * @to: the list to prepend into
+ * @from: the list to empty.
+ *
+ * This takes the entire contents of @from and moves it to the start
+ * of @to.  After this @from will be empty.
+ *
+ * Example:
+ *	list_prepend_list(&adopter, &parent->children);
+ *	assert(list_empty(&parent->children));
+ *	parent->num_children = 0;
+ */
+#define list_prepend_list(t, f) list_prepend_list_(t, f, LIST_LOC)
+static inline void list_prepend_list_(struct list_head *to,
+				      struct list_head *from,
+				      const char *abortstr)
+{
+	struct list_node *from_tail = list_debug(from, abortstr)->n.prev;
+	struct list_node *to_head = list_debug(to, abortstr)->n.next;
+
+	/* Sew in head and entire list. */
+	to->n.next = &from->n;
+	from->n.prev = &to->n;
+	to_head->prev = from_tail;
+	from_tail->next = to_head;
+
+	/* Now remove head. */
+	list_del(&from->n);
+	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
+ * @i: the pointer to a memory region which contains list node data.
+ * @off: offset(relative to @i) at which list node data resides.
+ *
+ * This is a low-level wrapper to iterate @i over the entire list, used to
+ * implement all oher, more high-level, for-each constructs. It's a for loop,
+ * so you can break and continue as normal.
+ *
+ * WARNING! Being the low-level macro that it is, this wrapper doesn't know
+ * nor care about the type of @i. The only assumption made is that @i points
+ * to a chunk of memory that at some @offset, relative to @i, contains a
+ * properly filled `struct list_node' which in turn contains pointers to
+ * memory chunks and it's turtles all the way down. With all that in mind
+ * remember that given the wrong pointer/offset couple this macro will
+ * happily churn all you memory until SEGFAULT stops it, in other words
+ * caveat emptor.
+ *
+ * It is worth mentioning that one of legitimate use-cases for that wrapper
+ * is operation on opaque types with known offset for `struct list_node'
+ * member(preferably 0), because it allows you not to disclose the type of
+ * @i.
+ *
+ * Example:
+ *	list_for_each_off(&parent->children, child,
+ *				offsetof(struct child, list))
+ *		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 which 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)
+
+/**
+ * list_for_each_safe_off - iterate through a list of memory regions, maybe
+ * during deletion
+ * @h: the list_head
+ * @i: the pointer to a memory region which 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_off' and `list_for_each_safe'
+ * descriptions.
+ *
+ * Example:
+ *	list_for_each_safe_off(&parent->children, child,
+ *		next, offsetof(struct child, list))
+ *		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)
+
+/**
+ * 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 which 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)		\
+	((type *)list_node_from_off_((n), (off)))
+
+#define list_head_off(h, type, off)		\
+	((type *)list_head_off((h), (off)))
+
+#define list_tail_off(h, type, off)		\
+	((type *)list_tail_((h), (off)))
+
+#define list_add_off(h, n, off)                 \
+	list_add((h), list_node_from_off_((n), (off)))
+
+#define list_del_off(n, off)                    \
+	list_del(list_node_from_off_((n), (off)))
+
+#define list_del_from_off(h, n, off)			\
+	list_del_from(h, list_node_from_off_((n), (off)))
+
+/* Offset helper functions so we only single-evaluate. */
+static inline void *list_node_to_off_(struct list_node *node, size_t off)
+{
+	return (void *)((char *)node - off);
+}
+static inline struct list_node *list_node_from_off_(void *ptr, size_t off)
+{
+	return (struct list_node *)((char *)ptr + off);
+}
+
+/* Get the offset of the member, but make sure it's a list_node. */
+#define list_off_(type, member)					\
+	(container_off(type, member) +				\
+	 check_type(((type *)0)->member, struct list_node))
+
+#define list_off_var_(var, member)			\
+	(container_off_var(var, member) +		\
+	 check_type(var->member, struct list_node))
+
+#if HAVE_TYPEOF
+#define list_typeof(var) typeof(var)
+#else
+#define list_typeof(var) void *
+#endif
+
+/* Returns member, or NULL if at end of list. */
+static inline void *list_entry_or_null(const struct list_head *h,
+				       const struct list_node *n,
+				       size_t off)
+{
+	if (n == &h->n)
+		return NULL;
+	return (char *)n - off;
+}
+#endif /* CCAN_LIST_H */
diff --git a/ccan/str/str.h b/ccan/str/str.h
new file mode 100644
index 0000000000..9a9da9cd3f
--- /dev/null
+++ b/ccan/str/str.h
@@ -0,0 +1,16 @@
+/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
+#ifndef CCAN_STR_H
+#define CCAN_STR_H
+/**
+ * stringify - Turn expression into a string literal
+ * @expr: any C expression
+ *
+ * Example:
+ *	#define PRINT_COND_IF_FALSE(cond) \
+ *		((cond) || printf("%s is false!", stringify(cond)))
+ */
+#define stringify(expr)		stringify_1(expr)
+/* Double-indirection required to stringify expansions */
+#define stringify_1(expr)	#expr
+
+#endif /* CCAN_STR_H */
diff --git a/class.c b/class.c
index df19812d15..c866d1d727 100644
--- a/class.c
+++ b/class.c
@@ -23,16 +23,129 @@
  * \{
  */
 
-#include "ruby/ruby.h"
+#include "internal.h"
 #include "ruby/st.h"
-#include "method.h"
 #include "constant.h"
 #include "vm_core.h"
-#include "internal.h"
+#include "id_table.h"
 #include <ctype.h>
 
-extern st_table *rb_class_tbl;
-static ID id_attached;
+#define id_attached id__attached__
+
+void
+rb_class_subclass_add(VALUE super, VALUE klass)
+{
+    rb_subclass_entry_t *entry, *head;
+
+    if (super && super != Qundef) {
+	entry = ALLOC(rb_subclass_entry_t);
+	entry->klass = klass;
+	entry->next = NULL;
+
+	head = RCLASS_EXT(super)->subclasses;
+	if (head) {
+	    entry->next = head;
+	    RCLASS_EXT(head->klass)->parent_subclasses = &entry->next;
+	}
+
+	RCLASS_EXT(super)->subclasses = entry;
+	RCLASS_EXT(klass)->parent_subclasses = &RCLASS_EXT(super)->subclasses;
+    }
+}
+
+static void
+rb_module_add_to_subclasses_list(VALUE module, VALUE iclass)
+{
+    rb_subclass_entry_t *entry, *head;
+
+    entry = ALLOC(rb_subclass_entry_t);
+    entry->klass = iclass;
+    entry->next = NULL;
+
+    head = RCLASS_EXT(module)->subclasses;
+    if (head) {
+	entry->next = head;
+	RCLASS_EXT(head->klass)->module_subclasses = &entry->next;
+    }
+
+    RCLASS_EXT(module)->subclasses = entry;
+    RCLASS_EXT(iclass)->module_subclasses = &RCLASS_EXT(module)->subclasses;
+}
+
+void
+rb_class_remove_from_super_subclasses(VALUE klass)
+{
+    rb_subclass_entry_t *entry;
+
+    if (RCLASS_EXT(klass)->parent_subclasses) {
+	entry = *RCLASS_EXT(klass)->parent_subclasses;
+
+	*RCLASS_EXT(klass)->parent_subclasses = entry->next;
+	if (entry->next) {
+	    RCLASS_EXT(entry->next->klass)->parent_subclasses = RCLASS_EXT(klass)->parent_subclasses;
+	}
+	xfree(entry);
+    }
+
+    RCLASS_EXT(klass)->parent_subclasses = NULL;
+}
+
+void
+rb_class_remove_from_module_subclasses(VALUE klass)
+{
+    rb_subclass_entry_t *entry;
+
+    if (RCLASS_EXT(klass)->module_subclasses) {
+	entry = *RCLASS_EXT(klass)->module_subclasses;
+	*RCLASS_EXT(klass)->module_subclasses = entry->next;
+
+	if (entry->next) {
+	    RCLASS_EXT(entry->next->klass)->module_subclasses = RCLASS_EXT(klass)->module_subclasses;
+	}
+
+	xfree(entry);
+    }
+
+    RCLASS_EXT(klass)->module_subclasses = NULL;
+}
+
+void
+rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE arg)
+{
+    rb_subclass_entry_t *cur = RCLASS_EXT(klass)->subclasses;
+
+    /* do not be tempted to simplify this loop into a for loop, the order of
+       operations is important here if `f` modifies the linked list */
+    while (cur) {
+	VALUE curklass = cur->klass;
+	cur = cur->next;
+	f(curklass, arg);
+    }
+}
+
+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);
+}
+
+void
+rb_class_detach_module_subclasses(VALUE klass)
+{
+    rb_class_foreach_subclass(klass, class_detach_module_subclasses, Qnil);
+}
 
 /**
  * Allocates a struct RClass for a new class.
@@ -49,18 +162,31 @@ static ID id_attached;
 static VALUE
 class_alloc(VALUE flags, VALUE klass)
 {
-    rb_classext_t *ext = ALLOC(rb_classext_t);
-    NEWOBJ(obj, struct RClass);
-    OBJSETUP(obj, klass, flags);
-    obj->ptr = ext;
-    RCLASS_IV_TBL(obj) = 0;
-    RCLASS_CONST_TBL(obj) = 0;
-    RCLASS_M_TBL(obj) = 0;
-    RCLASS_SUPER(obj) = 0;
-    RCLASS_IV_INDEX_TBL(obj) = 0;
+    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);
+    RCLASS_SERIAL(obj) = rb_next_class_serial();
+    RB_OBJ_WRITE(obj, &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.
@@ -76,10 +202,9 @@ rb_class_boot(VALUE super)
 {
     VALUE klass = class_alloc(T_CLASS, rb_cClass);
 
-    RCLASS_SUPER(klass) = super;
-    RCLASS_M_TBL(klass) = st_init_numtable();
+    RCLASS_SET_SUPER(klass, super);
+    RCLASS_M_TBL_INIT(klass);
 
-    OBJ_INFECT(klass, super);
     return (VALUE)klass;
 }
 
@@ -93,9 +218,9 @@ rb_class_boot(VALUE super)
 void
 rb_check_inheritable(VALUE super)
 {
-    if (TYPE(super) != T_CLASS) {
-	rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
-		 rb_obj_classname(super));
+    if (!RB_TYPE_P(super, T_CLASS)) {
+	rb_raise(rb_eTypeError, "superclass must be a Class (%"PRIsVALUE" given)",
+		 rb_obj_class(super));
     }
     if (RBASIC(super)->flags & FL_SINGLETON) {
 	rb_raise(rb_eTypeError, "can't make subclass of singleton class");
@@ -120,140 +245,176 @@ rb_class_new(VALUE super)
     return rb_class_boot(super);
 }
 
-struct clone_method_data {
-    st_table *tbl;
-    VALUE klass;
-};
-
-VALUE rb_iseq_clone(VALUE iseqval, VALUE newcbase);
-
-static int
-clone_method(ID mid, const rb_method_entry_t *me, struct clone_method_data *data)
+static void
+clone_method(VALUE old_klass, VALUE new_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;
-	newiseqval = rb_iseq_clone(me->def->body.iseq->self, data->klass);
-	GetISeqPtr(newiseqval, iseq);
-	rb_add_method(data->klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag);
-	RB_GC_GUARD(newiseqval);
+    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));
     }
     else {
-	rb_method_entry_set(data->klass, mid, me, me->flag);
+	rb_method_entry_set(new_klass, mid, me, METHOD_ENTRY_VISI(me));
     }
-    return ST_CONTINUE;
 }
 
+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)
+{
+    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;
+}
+
+struct clone_const_arg {
+    VALUE klass;
+    struct rb_id_table *tbl;
+};
+
 static int
-clone_const(ID key, const rb_const_entry_t *ce, st_table *tbl)
+clone_const(ID key, const rb_const_entry_t *ce, struct clone_const_arg *arg)
 {
     rb_const_entry_t *nce = ALLOC(rb_const_entry_t);
-    *nce = *ce;
-    st_insert(tbl, key, (st_data_t)nce);
-    return ST_CONTINUE;
+    MEMCPY(nce, ce, rb_const_entry_t, 1);
+    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;
 }
 
-static int
-clone_const_i(st_data_t key, st_data_t value, st_data_t data)
+static enum rb_id_table_iterator_result
+clone_const_i(ID key, VALUE value, void *data)
 {
-    return clone_const((ID)key, (const rb_const_entry_t *)value, (st_table *)data);
+    return clone_const(key, (const rb_const_entry_t *)value, data);
+}
+
+static void
+class_init_copy_check(VALUE clone, VALUE orig)
+{
+    if (orig == rb_cBasicObject) {
+	rb_raise(rb_eTypeError, "can't copy the root class");
+    }
+    if (RCLASS_SUPER(clone) != 0 || clone == rb_cBasicObject) {
+	rb_raise(rb_eTypeError, "already initialized class");
+    }
+    if (FL_TEST(orig, FL_SINGLETON)) {
+	rb_raise(rb_eTypeError, "can't copy singleton class");
+    }
 }
 
 /* :nodoc: */
 VALUE
 rb_mod_init_copy(VALUE clone, VALUE orig)
 {
-    rb_obj_init_copy(clone, orig);
+    /* cloned flag is refer at constant inline cache
+     * see vm_get_const_key_cref() in vm_insnhelper.c
+     */
+    FL_SET(clone, RCLASS_CLONED);
+    FL_SET(orig , RCLASS_CLONED);
+
+    if (RB_TYPE_P(clone, T_CLASS)) {
+	class_init_copy_check(clone, orig);
+    }
+    if (!OBJ_INIT_COPY(clone, orig)) return clone;
     if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
-	RBASIC(clone)->klass = rb_singleton_class_clone(orig);
+	RBASIC_SET_CLASS(clone, rb_singleton_class_clone(orig));
 	rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
     }
-    RCLASS_SUPER(clone) = RCLASS_SUPER(orig);
+    RCLASS_SET_SUPER(clone, RCLASS_SUPER(orig));
+    RCLASS_EXT(clone)->allocator = RCLASS_EXT(orig)->allocator;
+    if (RCLASS_IV_TBL(clone)) {
+	st_free_table(RCLASS_IV_TBL(clone));
+	RCLASS_IV_TBL(clone) = 0;
+    }
+    if (RCLASS_CONST_TBL(clone)) {
+	rb_free_const_table(RCLASS_CONST_TBL(clone));
+	RCLASS_CONST_TBL(clone) = 0;
+    }
+    RCLASS_M_TBL(clone) = 0;
     if (RCLASS_IV_TBL(orig)) {
 	st_data_t id;
 
-	if (RCLASS_IV_TBL(clone)) {
-	    st_free_table(RCLASS_IV_TBL(clone));
-	}
-	RCLASS_IV_TBL(clone) = st_copy(RCLASS_IV_TBL(orig));
+	rb_iv_tbl_copy(clone, orig);
+	CONST_ID(id, "__tmp_classpath__");
+	st_delete(RCLASS_IV_TBL(clone), &id, 0);
 	CONST_ID(id, "__classpath__");
 	st_delete(RCLASS_IV_TBL(clone), &id, 0);
 	CONST_ID(id, "__classid__");
 	st_delete(RCLASS_IV_TBL(clone), &id, 0);
     }
     if (RCLASS_CONST_TBL(orig)) {
-	if (RCLASS_CONST_TBL(clone)) {
-	    rb_free_const_table(RCLASS_CONST_TBL(clone));
-	}
-	RCLASS_CONST_TBL(clone) = st_init_numtable();
-	st_foreach(RCLASS_CONST_TBL(orig), clone_const_i, (st_data_t)RCLASS_CONST_TBL(clone));
+	struct clone_const_arg arg;
+
+	arg.tbl = RCLASS_CONST_TBL(clone) = rb_id_table_create(0);
+	arg.klass = clone;
+	rb_id_table_foreach(RCLASS_CONST_TBL(orig), clone_const_i, &arg);
     }
     if (RCLASS_M_TBL(orig)) {
-	struct clone_method_data data;
-
-	if (RCLASS_M_TBL(clone)) {
-	    rb_free_m_table(RCLASS_M_TBL(clone));
-	}
-	data.tbl = RCLASS_M_TBL(clone) = st_init_numtable();
-	data.klass = clone;
-	st_foreach(RCLASS_M_TBL(orig), clone_method,
-		   (st_data_t)&data);
+	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);
     }
 
     return clone;
 }
 
-/* :nodoc: */
 VALUE
-rb_class_init_copy(VALUE clone, VALUE orig)
+rb_singleton_class_clone(VALUE obj)
 {
-    if (orig == rb_cBasicObject) {
-	rb_raise(rb_eTypeError, "can't copy the root class");
-    }
-    if (RCLASS_SUPER(clone) != 0 || clone == rb_cBasicObject) {
-	rb_raise(rb_eTypeError, "already initialized class");
-    }
-    if (FL_TEST(orig, FL_SINGLETON)) {
-	rb_raise(rb_eTypeError, "can't copy singleton class");
-    }
-    return rb_mod_init_copy(clone, orig);
+    return rb_singleton_class_clone_and_attach(obj, Qundef);
 }
 
 VALUE
-rb_singleton_class_clone(VALUE obj)
+rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach)
 {
-    VALUE klass = RBASIC(obj)->klass;
+    const VALUE klass = RBASIC(obj)->klass;
 
     if (!FL_TEST(klass, FL_SINGLETON))
 	return klass;
     else {
-	struct clone_method_data data;
 	/* copy singleton(unnamed) class */
-	VALUE clone = class_alloc((RBASIC(klass)->flags & ~(FL_MARK)), 0);
+	VALUE clone = class_alloc(RBASIC(klass)->flags, 0);
 
 	if (BUILTIN_TYPE(obj) == T_CLASS) {
-	    RBASIC(clone)->klass = (VALUE)clone;
+	    RBASIC_SET_CLASS(clone, clone);
 	}
 	else {
-	    RBASIC(clone)->klass = rb_singleton_class_clone(klass);
+	    RBASIC_SET_CLASS(clone, rb_singleton_class_clone(klass));
 	}
 
-	RCLASS_SUPER(clone) = RCLASS_SUPER(klass);
+	RCLASS_SET_SUPER(clone, RCLASS_SUPER(klass));
+	RCLASS_EXT(clone)->allocator = RCLASS_EXT(klass)->allocator;
 	if (RCLASS_IV_TBL(klass)) {
-	    RCLASS_IV_TBL(clone) = st_copy(RCLASS_IV_TBL(klass));
+	    rb_iv_tbl_copy(clone, klass);
 	}
 	if (RCLASS_CONST_TBL(klass)) {
-	    RCLASS_CONST_TBL(clone) = st_init_numtable();
-	    st_foreach(RCLASS_CONST_TBL(klass), clone_const_i, (st_data_t)RCLASS_CONST_TBL(clone));
+	    struct clone_const_arg arg;
+	    arg.tbl = RCLASS_CONST_TBL(clone) = rb_id_table_create(0);
+	    arg.klass = clone;
+	    rb_id_table_foreach(RCLASS_CONST_TBL(klass), clone_const_i, &arg);
 	}
-	RCLASS_M_TBL(clone) = st_init_numtable();
-	data.tbl = RCLASS_M_TBL(clone);
-	data.klass = (VALUE)clone;
-	st_foreach(RCLASS_M_TBL(klass), clone_method,
-		   (st_data_t)&data);
-	rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
+	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);
+	}
+	rb_singleton_class_attached(RBASIC(clone)->klass, clone);
 	FL_SET(clone, FL_SINGLETON);
-	return (VALUE)clone;
+
+	return clone;
     }
 }
 
@@ -268,13 +429,14 @@ rb_singleton_class_attached(VALUE klass, VALUE obj)
 	if (!RCLASS_IV_TBL(klass)) {
 	    RCLASS_IV_TBL(klass) = st_init_numtable();
 	}
-	st_insert(RCLASS_IV_TBL(klass), id_attached, obj);
+	rb_class_ivar_set(klass, id_attached, obj);
     }
 }
 
 
 
 #define METACLASS_OF(k) RBASIC(k)->klass
+#define SET_METACLASS_OF(k, cls) RBASIC_SET_CLASS(k, cls)
 
 /*!
  * whether k is a meta^(n)-class of Class class
@@ -283,6 +445,27 @@ 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
+ * @retval 0 otherwise
+ */
+#define HAVE_METACLASS_P(k) \
+    (FL_TEST(METACLASS_OF(k), FL_SINGLETON) && \
+     rb_singleton_class_has_metaclass_p(k))
 
 /*!
  * ensures \a klass belongs to its own eigenclass.
@@ -292,7 +475,7 @@ rb_singleton_class_attached(VALUE klass, VALUE obj)
  * @note this macro creates a new eigenclass if necessary.
  */
 #define ENSURE_EIGENCLASS(klass) \
- (rb_ivar_get(METACLASS_OF(klass), id_attached) == (klass) ? METACLASS_OF(klass) : make_metaclass(klass))
+    (HAVE_METACLASS_P(klass) ? METACLASS_OF(klass) : make_metaclass(klass))
 
 
 /*!
@@ -314,19 +497,18 @@ make_metaclass(VALUE klass)
     rb_singleton_class_attached(metaclass, klass);
 
     if (META_CLASS_OF_CLASS_CLASS_P(klass)) {
-	METACLASS_OF(klass) = METACLASS_OF(metaclass) = metaclass;
+	SET_METACLASS_OF(klass, metaclass);
+	SET_METACLASS_OF(metaclass, metaclass);
     }
     else {
 	VALUE tmp = METACLASS_OF(klass); /* for a meta^(n)-class klass, tmp is meta^(n)-class of Class class */
-	METACLASS_OF(klass) = metaclass;
-	METACLASS_OF(metaclass) = ENSURE_EIGENCLASS(tmp);
+	SET_METACLASS_OF(klass, metaclass);
+	SET_METACLASS_OF(metaclass, ENSURE_EIGENCLASS(tmp));
     }
 
     super = RCLASS_SUPER(klass);
     while (RB_TYPE_P(super, T_ICLASS)) super = RCLASS_SUPER(super);
-    RCLASS_SUPER(metaclass) = super ? ENSURE_EIGENCLASS(super) : rb_cClass;
-
-    OBJ_INFECT(metaclass, RCLASS_SUPER(metaclass));
+    RCLASS_SET_SUPER(metaclass, super ? ENSURE_EIGENCLASS(super) : rb_cClass);
 
     return metaclass;
 }
@@ -344,10 +526,10 @@ make_singleton_class(VALUE obj)
     VALUE klass = rb_class_boot(orig_class);
 
     FL_SET(klass, FL_SINGLETON);
-    RBASIC(obj)->klass = klass;
+    RBASIC_SET_CLASS(obj, klass);
     rb_singleton_class_attached(klass, obj);
 
-    METACLASS_OF(klass) = METACLASS_OF(rb_class_real(orig_class));
+    SET_METACLASS_OF(klass, METACLASS_OF(rb_class_real(orig_class)));
     return klass;
 }
 
@@ -355,32 +537,32 @@ make_singleton_class(VALUE obj)
 static VALUE
 boot_defclass(const char *name, VALUE super)
 {
-    extern st_table *rb_class_tbl;
     VALUE obj = rb_class_boot(super);
     ID id = rb_intern(name);
 
-    rb_name_class(obj, id);
-    st_add_direct(rb_class_tbl, id, obj);
     rb_const_set((rb_cObject ? rb_cObject : obj), id, obj);
+    rb_vm_add_root_module(id, obj);
     return obj;
 }
 
 void
 Init_class_hierarchy(void)
 {
-    id_attached = rb_intern("__attached__");
-
     rb_cBasicObject = boot_defclass("BasicObject", 0);
     rb_cObject = boot_defclass("Object", rb_cBasicObject);
+    rb_gc_register_mark_object(rb_cObject);
+
+    /* resolve class name ASAP for order-independence */
+    rb_set_class_path_string(rb_cObject, rb_cObject, rb_fstring_lit("Object"));
+
     rb_cModule = boot_defclass("Module", rb_cObject);
     rb_cClass =  boot_defclass("Class",  rb_cModule);
 
-    rb_const_set(rb_cObject, rb_intern("BasicObject"), rb_cBasicObject);
-    RBASIC(rb_cClass)->klass
-	= RBASIC(rb_cModule)->klass
-	= RBASIC(rb_cObject)->klass
-	= RBASIC(rb_cBasicObject)->klass
-	= rb_cClass;
+    rb_const_set(rb_cObject, rb_intern_const("BasicObject"), rb_cBasicObject);
+    RBASIC_SET_CLASS(rb_cClass, rb_cClass);
+    RBASIC_SET_CLASS(rb_cModule, rb_cClass);
+    RBASIC_SET_CLASS(rb_cObject, rb_cClass);
+    RBASIC_SET_CLASS(rb_cBasicObject, rb_cClass);
 }
 
 
@@ -437,7 +619,7 @@ rb_define_class_id(ID id, VALUE super)
  * \return the value \c Class#inherited's returns
  * \pre Each of \a super and \a klass must be a \c Class object.
  */
-VALUE
+MJIT_FUNC_EXPORTED VALUE
 rb_class_inherited(VALUE super, VALUE klass)
 {
     ID inherited;
@@ -452,12 +634,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 NameError if the class is already defined but the class can not
+ * \throw TypeError 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
@@ -472,20 +654,23 @@ rb_define_class(const char *name, VALUE super)
     id = rb_intern(name);
     if (rb_const_defined(rb_cObject, id)) {
 	klass = rb_const_get(rb_cObject, id);
-	if (TYPE(klass) != T_CLASS) {
-	    rb_raise(rb_eTypeError, "%s is not a class", name);
+	if (!RB_TYPE_P(klass, T_CLASS)) {
+	    rb_raise(rb_eTypeError, "%s is not a class (%"PRIsVALUE")",
+		     name, rb_obj_class(klass));
 	}
 	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
 	    rb_raise(rb_eTypeError, "superclass mismatch for class %s", name);
 	}
+
+        /* Class may have been defined in Ruby and not pin-rooted */
+        rb_vm_add_root_module(id, klass);
 	return klass;
     }
     if (!super) {
-	rb_warn("no super class for `%s', Object assumed", name);
+	rb_raise(rb_eArgError, "no super class for `%s'", name);
     }
     klass = rb_define_class_id(id, super);
-    st_add_direct(rb_class_tbl, id, klass);
-    rb_name_class(klass, id);
+    rb_vm_add_root_module(id, klass);
     rb_const_set(rb_cObject, id, klass);
     rb_class_inherited(super, klass);
 
@@ -502,7 +687,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 NameError if the class is already defined but the class can not
+ * \throw TypeError 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.
  *
@@ -525,7 +710,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 NameError if the class is already defined but the class can not
+ * \throw TypeError 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.
  *
@@ -539,22 +724,31 @@ 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 (TYPE(klass) != T_CLASS) {
-	    rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(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));
 	}
 	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
-	    rb_name_error(id, "%s is already defined", rb_id2name(id));
+	    rb_raise(rb_eTypeError, "superclass mismatch for class "
+		     "%"PRIsVALUE"::%"PRIsVALUE""
+		     " (%"PRIsVALUE" is given but was %"PRIsVALUE")",
+		     outer, rb_id2str(id), RCLASS_SUPER(klass), super);
 	}
+        /* Class may have been defined in Ruby and not pin-rooted */
+        rb_vm_add_root_module(id, klass);
+
 	return klass;
     }
     if (!super) {
-	rb_warn("no super class for `%s::%s', Object assumed",
-		rb_class2name(outer), rb_id2name(id));
+	rb_raise(rb_eArgError, "no super class for `%"PRIsVALUE"::%"PRIsVALUE"'",
+		 rb_class_path(outer), rb_id2str(id));
     }
     klass = rb_define_class_id(id, super);
     rb_set_class_path_string(klass, outer, rb_id2str(id));
     rb_const_set(outer, id, klass);
     rb_class_inherited(super, klass);
+    rb_vm_add_root_module(id, klass);
     rb_gc_register_mark_object(klass);
 
     return klass;
@@ -564,21 +758,14 @@ VALUE
 rb_module_new(void)
 {
     VALUE mdl = class_alloc(T_MODULE, rb_cModule);
-
-    RCLASS_M_TBL(mdl) = st_init_numtable();
-
+    RCLASS_M_TBL_INIT(mdl);
     return (VALUE)mdl;
 }
 
 VALUE
 rb_define_module_id(ID id)
 {
-    VALUE mdl;
-
-    mdl = rb_module_new();
-    rb_name_class(mdl, id);
-
-    return mdl;
+    return rb_module_new();
 }
 
 VALUE
@@ -590,12 +777,17 @@ 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 (TYPE(module) == T_MODULE)
-	    return module;
-	rb_raise(rb_eTypeError, "%s is not a module", rb_obj_classname(module));
+	if (!RB_TYPE_P(module, T_MODULE)) {
+	    rb_raise(rb_eTypeError, "%s is not a module (%"PRIsVALUE")",
+		     name, rb_obj_class(module));
+	}
+        /* Module may have been defined in Ruby and not pin-rooted */
+        rb_vm_add_root_module(id, module);
+	return module;
     }
     module = rb_define_module_id(id);
-    st_add_direct(rb_class_tbl, id, module);
+    rb_vm_add_root_module(id, module);
+    rb_gc_register_mark_object(module);
     rb_const_set(rb_cObject, id, module);
 
     return module;
@@ -614,10 +806,12 @@ rb_define_module_id_under(VALUE outer, ID id)
 
     if (rb_const_defined_at(outer, id)) {
 	module = rb_const_get_at(outer, id);
-	if (TYPE(module) == T_MODULE)
-	    return module;
-	rb_raise(rb_eTypeError, "%s::%s is not a module",
-		 rb_class2name(outer), rb_obj_classname(module));
+	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;
     }
     module = rb_define_module_id(id);
     rb_const_set(outer, id, module);
@@ -627,11 +821,15 @@ rb_define_module_id_under(VALUE outer, ID id)
     return module;
 }
 
-static VALUE
-include_class_new(VALUE module, VALUE super)
+VALUE
+rb_include_class_new(VALUE module, VALUE super)
 {
     VALUE klass = class_alloc(T_ICLASS, rb_cClass);
 
+    RCLASS_M_TBL(OBJ_WB_UNPROTECT(klass)) =
+      RCLASS_M_TBL(OBJ_WB_UNPROTECT(module)); /* TODO: unprotected? */
+
+    RCLASS_SET_ORIGIN(klass, module == RCLASS_ORIGIN(module) ? klass : RCLASS_ORIGIN(module));
     if (BUILTIN_TYPE(module) == T_ICLASS) {
 	module = RBASIC(module)->klass;
     }
@@ -639,69 +837,177 @@ include_class_new(VALUE module, VALUE super)
 	RCLASS_IV_TBL(module) = st_init_numtable();
     }
     if (!RCLASS_CONST_TBL(module)) {
-	RCLASS_CONST_TBL(module) = st_init_numtable();
+	RCLASS_CONST_TBL(module) = rb_id_table_create(0);
     }
     RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
     RCLASS_CONST_TBL(klass) = RCLASS_CONST_TBL(module);
-    RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);
-    RCLASS_SUPER(klass) = super;
-    if (TYPE(module) == T_ICLASS) {
-	RBASIC(klass)->klass = RBASIC(module)->klass;
+
+    RCLASS_SET_SUPER(klass, super);
+    if (RB_TYPE_P(module, T_ICLASS)) {
+	RBASIC_SET_CLASS(klass, RBASIC(module)->klass);
     }
     else {
-	RBASIC(klass)->klass = module;
+	RBASIC_SET_CLASS(klass, module);
     }
-    OBJ_INFECT(klass, module);
-    OBJ_INFECT(klass, super);
 
     return (VALUE)klass;
 }
 
+static int include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super);
+
+static void
+ensure_includable(VALUE klass, VALUE module)
+{
+    rb_class_modify_check(klass);
+    Check_Type(module, T_MODULE);
+    if (!NIL_P(rb_refinement_module_get_refined_class(module))) {
+	rb_raise(rb_eArgError, "refinement module is not allowed");
+    }
+}
+
 void
 rb_include_module(VALUE klass, VALUE module)
 {
-    VALUE p, c;
     int changed = 0;
 
-    rb_frozen_class_p(klass);
-    if (!OBJ_UNTRUSTED(klass)) {
-	rb_secure(4);
-    }
+    ensure_includable(klass, module);
+
+    changed = include_modules_at(klass, RCLASS_ORIGIN(klass), module, TRUE);
+    if (changed < 0)
+	rb_raise(rb_eArgError, "cyclic include detected");
+}
 
-    if (TYPE(module) != T_MODULE) {
-	Check_Type(module, T_MODULE);
+static enum rb_id_table_iterator_result
+add_refined_method_entry_i(ID key, VALUE value, void *data)
+{
+    rb_add_refined_method_entry((VALUE)data, key);
+    return ID_TABLE_CONTINUE;
+}
+
+static void ensure_origin(VALUE klass);
+
+static int
+include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super)
+{
+    VALUE p, iclass;
+    int method_changed = 0, constant_changed = 0;
+    struct rb_id_table *const klass_m_tbl = RCLASS_M_TBL(RCLASS_ORIGIN(klass));
+
+    if (FL_TEST(module, RCLASS_REFINED_BY_ANY)) {
+        ensure_origin(module);
     }
 
-    OBJ_INFECT(klass, module);
-    c = klass;
     while (module) {
 	int superclass_seen = FALSE;
+	struct rb_id_table *tbl;
 
-	if (RCLASS_M_TBL(klass) == RCLASS_M_TBL(module))
-	    rb_raise(rb_eArgError, "cyclic include detected");
+	if (klass_m_tbl && klass_m_tbl == RCLASS_M_TBL(module))
+	    return -1;
 	/* ignore if the module included already in superclasses */
 	for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) {
-	    switch (BUILTIN_TYPE(p)) {
-	      case T_ICLASS:
+	    int type = BUILTIN_TYPE(p);
+	    if (type == T_ICLASS) {
 		if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) {
 		    if (!superclass_seen) {
 			c = p;  /* move insertion point */
 		    }
 		    goto skip;
 		}
-		break;
-	      case T_CLASS:
+	    }
+	    else if (type == T_CLASS) {
+		if (!search_super) break;
 		superclass_seen = TRUE;
-		break;
 	    }
 	}
-	c = RCLASS_SUPER(c) = include_class_new(module, RCLASS_SUPER(c));
-	if (RMODULE_M_TBL(module) && RMODULE_M_TBL(module)->num_entries)
-	    changed = 1;
+	iclass = rb_include_class_new(module, RCLASS_SUPER(c));
+	c = RCLASS_SET_SUPER(c, iclass);
+        RCLASS_SET_INCLUDER(iclass, klass);
+
+	{
+	    VALUE m = module;
+	    if (BUILTIN_TYPE(m) == T_ICLASS) m = RBASIC(m)->klass;
+	    rb_module_add_to_subclasses_list(m, 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);
+	    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;
       skip:
 	module = RCLASS_SUPER(module);
     }
-    if (changed) rb_clear_cache();
+
+    if (method_changed) rb_clear_method_cache_by_class(klass);
+    if (constant_changed) rb_clear_constant_cache();
+
+    return method_changed;
+}
+
+static enum rb_id_table_iterator_result
+move_refined_method(ID key, VALUE value, void *data)
+{
+    rb_method_entry_t *me = (rb_method_entry_t *) value;
+    VALUE klass = (VALUE)data;
+    struct rb_id_table *tbl = RCLASS_M_TBL(klass);
+
+    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;
+	}
+	else {
+	    rb_id_table_insert(tbl, key, (VALUE)me);
+	    return ID_TABLE_DELETE;
+	}
+    }
+    else {
+	return ID_TABLE_CONTINUE;
+    }
+}
+
+static void
+ensure_origin(VALUE klass)
+{
+    VALUE origin = RCLASS_ORIGIN(klass);
+    if (origin == klass) {
+	origin = class_alloc(T_ICLASS, klass);
+	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_M_TBL_INIT(klass);
+	rb_id_table_foreach(RCLASS_M_TBL(origin), move_refined_method, (void *)klass);
+    }
+}
+
+void
+rb_prepend_module(VALUE klass, VALUE module)
+{
+    int changed = 0;
+
+    ensure_includable(klass, module);
+    ensure_origin(klass);
+    changed = include_modules_at(klass, klass, module, FALSE);
+    if (changed < 0)
+	rb_raise(rb_eArgError, "cyclic prepend detected");
+    if (changed) {
+	rb_vm_check_redefinition_by_prepend(klass);
+    }
 }
 
 /*
@@ -726,10 +1032,13 @@ rb_mod_included_modules(VALUE mod)
 {
     VALUE ary = rb_ary_new();
     VALUE p;
+    VALUE origin = RCLASS_ORIGIN(mod);
 
     for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
-	if (BUILTIN_TYPE(p) == T_ICLASS) {
-	    rb_ary_push(ary, RBASIC(p)->klass);
+	if (p != origin && BUILTIN_TYPE(p) == T_ICLASS) {
+	    VALUE m = RBASIC(p)->klass;
+	    if (RB_TYPE_P(m, T_MODULE))
+		rb_ary_push(ary, m);
 	}
     }
     return ary;
@@ -772,16 +1081,18 @@ rb_mod_include_p(VALUE mod, VALUE mod2)
  *  call-seq:
  *     mod.ancestors -> array
  *
- *  Returns a list of modules included in <i>mod</i> (including
- *  <i>mod</i> itself).
+ *  Returns a list of modules included/prepended in <i>mod</i>
+ *  (including <i>mod</i> itself).
  *
  *     module Mod
  *       include Math
  *       include Comparable
+ *       prepend Enumerable
  *     end
  *
- *     Mod.ancestors    #=> [Mod, Comparable, Math]
- *     Math.ancestors   #=> [Math]
+ *     Mod.ancestors        #=> [Enumerable, Mod, Comparable, Math]
+ *     Math.ancestors       #=> [Math]
+ *     Enumerable.ancestors #=> [Enumerable]
  */
 
 VALUE
@@ -790,115 +1101,142 @@ rb_mod_ancestors(VALUE mod)
     VALUE p, ary = rb_ary_new();
 
     for (p = mod; p; p = RCLASS_SUPER(p)) {
-	if (FL_TEST(p, FL_SINGLETON))
-	    continue;
+        if (p != RCLASS_ORIGIN(p)) continue;
 	if (BUILTIN_TYPE(p) == T_ICLASS) {
 	    rb_ary_push(ary, RBASIC(p)->klass);
 	}
-	else {
+        else {
 	    rb_ary_push(ary, p);
 	}
     }
     return ary;
 }
 
-#define VISI(x) ((x)&NOEX_MASK)
-#define VISI_CHECK(x,f) (VISI(x) == (f))
+static void
+ins_methods_push(st_data_t name, st_data_t ary)
+{
+    rb_ary_push((VALUE)ary, ID2SYM((ID)name));
+}
 
 static int
-ins_methods_push(ID name, long type, VALUE ary, long visi)
+ins_methods_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    if (type == -1) return ST_CONTINUE;
-
-    switch (visi) {
-      case NOEX_PRIVATE:
-      case NOEX_PROTECTED:
-      case NOEX_PUBLIC:
-	visi = (type == visi);
+    switch ((rb_method_visibility_t)type) {
+      case METHOD_VISI_UNDEF:
+      case METHOD_VISI_PRIVATE:
 	break;
-      default:
-	visi = (type != NOEX_PRIVATE);
+      default: /* everything but private */
+	ins_methods_push(name, ary);
 	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)
 {
-    return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PROTECTED);
+    if ((rb_method_visibility_t)type == METHOD_VISI_PROTECTED) {
+	ins_methods_push(name, ary);
+    }
+    return ST_CONTINUE;
 }
 
 static int
 ins_methods_priv_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PRIVATE);
+    if ((rb_method_visibility_t)type == METHOD_VISI_PRIVATE) {
+	ins_methods_push(name, ary);
+    }
+    return ST_CONTINUE;
 }
 
 static int
 ins_methods_pub_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PUBLIC);
+    if ((rb_method_visibility_t)type == METHOD_VISI_PUBLIC) {
+	ins_methods_push(name, ary);
+    }
+    return ST_CONTINUE;
 }
 
-static int
-method_entry_i(st_data_t key, st_data_t value, st_data_t data)
+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)
 {
     const rb_method_entry_t *me = (const rb_method_entry_t *)value;
-    st_table *list = (st_table *)data;
-    long type;
+    struct method_entry_arg *arg = (struct method_entry_arg *)data;
+    rb_method_visibility_t type;
 
-    if ((ID)key == ID_ALLOCATOR) {
-	return ST_CONTINUE;
+    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 (!st_lookup(list, key, 0)) {
+    if (!st_is_member(arg->list, key)) {
 	if (UNDEFINED_METHOD_ENTRY_P(me)) {
-	    type = -1; /* none */
+	    type = METHOD_VISI_UNDEF; /* none */
 	}
 	else {
-	    type = VISI(me->flag);
+	    type = METHOD_ENTRY_VISI(me);
 	}
-	st_add_direct(list, key, type);
+	st_add_direct(arg->list, key, (st_data_t)type);
     }
-    return ST_CONTINUE;
+    return ID_TABLE_CONTINUE;
+}
+
+static void
+add_instance_method_list(VALUE mod, struct method_entry_arg *me_arg)
+{
+    struct rb_id_table *m_tbl = RCLASS_M_TBL(mod);
+    if (!m_tbl) return;
+    rb_id_table_foreach(m_tbl, method_entry_i, me_arg);
+}
+
+static bool
+particular_class_p(VALUE mod)
+{
+    if (!mod) return false;
+    if (FL_TEST(mod, FL_SINGLETON)) return true;
+    if (BUILTIN_TYPE(mod) == T_ICLASS) return true;
+    return false;
 }
 
 static VALUE
-class_instance_method_list(int argc, VALUE *argv, VALUE mod, int obj, int (*func) (st_data_t, st_data_t, st_data_t))
+class_instance_method_list(int argc, const VALUE *argv, VALUE mod, int obj, int (*func) (st_data_t, st_data_t, st_data_t))
 {
     VALUE ary;
-    int recur;
-    st_table *list;
+    int recur = TRUE, prepended = 0;
+    struct method_entry_arg me_arg;
 
-    if (argc == 0) {
-	recur = TRUE;
+    if (rb_check_arity(argc, 0, 1)) recur = RTEST(argv[0]);
+
+    me_arg.list = st_init_numtable();
+    me_arg.recur = recur;
+
+    if (obj) {
+        for (; particular_class_p(mod); mod = RCLASS_SUPER(mod)) {
+            add_instance_method_list(mod, &me_arg);
+        }
     }
-    else {
-	VALUE r;
-	rb_scan_args(argc, argv, "01", &r);
-	recur = RTEST(r);
+
+    if (!recur && RCLASS_ORIGIN(mod) != mod) {
+	mod = RCLASS_ORIGIN(mod);
+	prepended = 1;
     }
 
-    list = st_init_numtable();
     for (; mod; mod = RCLASS_SUPER(mod)) {
-	st_foreach(RCLASS_M_TBL(mod), method_entry_i, (st_data_t)list);
-	if (BUILTIN_TYPE(mod) == T_ICLASS) continue;
-	if (obj && FL_TEST(mod, FL_SINGLETON)) continue;
+        add_instance_method_list(mod, &me_arg);
+	if (BUILTIN_TYPE(mod) == T_ICLASS && !prepended) continue;
 	if (!recur) break;
     }
-    ary = rb_ary_new();
-    st_foreach(list, func, ary);
-    st_free_table(list);
+    ary = rb_ary_new2(me_arg.list->num_entries);
+    st_foreach(me_arg.list, func, ary);
+    st_free_table(me_arg.list);
 
     return ary;
 }
@@ -909,29 +1247,29 @@ class_instance_method_list(int argc, VALUE *argv, VALUE mod, int obj, int (*func
  *
  *  Returns an array containing the names of the public and protected instance
  *  methods in the receiver. For a module, these are the public and protected methods;
- *  for a class, they are the instance (not singleton) methods. With no
- *  argument, or with an argument that is <code>false</code>, the
- *  instance methods in <i>mod</i> are returned, otherwise the methods
- *  in <i>mod</i> and <i>mod</i>'s superclasses are returned.
+ *  for a class, they are the instance (not singleton) methods. If the optional
+ *  parameter is <code>false</code>, the methods of any ancestors are not included.
  *
  *     module A
  *       def method1()  end
  *     end
  *     class B
+ *       include A
  *       def method2()  end
  *     end
  *     class C < B
  *       def method3()  end
  *     end
  *
- *     A.instance_methods                #=> [:method1]
- *     B.instance_methods(false)         #=> [:method2]
- *     C.instance_methods(false)         #=> [:method3]
- *     C.instance_methods(true).length   #=> 43
+ *     A.instance_methods(false)                   #=> [:method1]
+ *     B.instance_methods(false)                   #=> [:method2]
+ *     B.instance_methods(true).include?(:method1) #=> true
+ *     C.instance_methods(false)                   #=> [:method3]
+ *     C.instance_methods.include?(:method2)       #=> true
  */
 
 VALUE
-rb_class_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_instance_methods(int argc, const VALUE *argv, VALUE mod)
 {
     return class_instance_method_list(argc, argv, mod, 0, ins_methods_i);
 }
@@ -941,12 +1279,12 @@ rb_class_instance_methods(int argc, VALUE *argv, VALUE mod)
  *     mod.protected_instance_methods(include_super=true)   -> array
  *
  *  Returns a list of the protected instance methods defined in
- *  <i>mod</i>. If the optional parameter is not <code>false</code>, the
- *  methods of any ancestors are included.
+ *  <i>mod</i>. If the optional parameter is <code>false</code>, the
+ *  methods of any ancestors are not included.
  */
 
 VALUE
-rb_class_protected_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_protected_instance_methods(int argc, const VALUE *argv, VALUE mod)
 {
     return class_instance_method_list(argc, argv, mod, 0, ins_methods_prot_i);
 }
@@ -956,8 +1294,8 @@ rb_class_protected_instance_methods(int argc, VALUE *argv, VALUE mod)
  *     mod.private_instance_methods(include_super=true)    -> array
  *
  *  Returns a list of the private instance methods defined in
- *  <i>mod</i>. If the optional parameter is not <code>false</code>, the
- *  methods of any ancestors are included.
+ *  <i>mod</i>. If the optional parameter is <code>false</code>, the
+ *  methods of any ancestors are not included.
  *
  *     module Mod
  *       def method1()  end
@@ -969,7 +1307,7 @@ rb_class_protected_instance_methods(int argc, VALUE *argv, VALUE mod)
  */
 
 VALUE
-rb_class_private_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_private_instance_methods(int argc, const VALUE *argv, VALUE mod)
 {
     return class_instance_method_list(argc, argv, mod, 0, ins_methods_priv_i);
 }
@@ -979,23 +1317,26 @@ rb_class_private_instance_methods(int argc, VALUE *argv, VALUE mod)
  *     mod.public_instance_methods(include_super=true)   -> array
  *
  *  Returns a list of the public instance methods defined in <i>mod</i>.
- *  If the optional parameter is not <code>false</code>, the methods of
- *  any ancestors are included.
+ *  If the optional parameter is <code>false</code>, the methods of
+ *  any ancestors are not included.
  */
 
 VALUE
-rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_public_instance_methods(int argc, const VALUE *argv, VALUE mod)
 {
     return class_instance_method_list(argc, argv, mod, 0, ins_methods_pub_i);
 }
 
 /*
  *  call-seq:
- *     obj.methods    -> array
+ *     obj.methods(regular=true)    -> array
  *
  *  Returns a list of the names of public and protected methods of
  *  <i>obj</i>. This will include all the methods accessible in
  *  <i>obj</i>'s ancestors.
+ *  If the optional parameter is <code>false</code>, it
+ *  returns an array of <i>obj</i>'s public and protected singleton methods,
+ *  the array will not include methods in modules included in <i>obj</i>.
  *
  *     class Klass
  *       def klass_method()
@@ -1005,29 +1346,25 @@ rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
  *     k.methods[0..9]    #=> [:klass_method, :nil?, :===,
  *                        #    :==~, :!, :eql?
  *                        #    :hash, :<=>, :class, :singleton_class]
- *     k.methods.length   #=> 57
+ *     k.methods.length   #=> 56
+ *
+ *     k.methods(false)   #=> []
+ *     def k.singleton_method; end
+ *     k.methods(false)   #=> [:singleton_method]
+ *
+ *     module M123; def m123; end end
+ *     k.extend M123
+ *     k.methods(false)   #=> [:singleton_method]
  */
 
 VALUE
-rb_obj_methods(int argc, VALUE *argv, VALUE obj)
+rb_obj_methods(int argc, const VALUE *argv, VALUE obj)
 {
-  retry:
-    if (argc == 0) {
-	VALUE args[1];
-
-	args[0] = Qtrue;
-	return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_i);
-    }
-    else {
-	VALUE recur;
-
-	rb_scan_args(argc, argv, "1", &recur);
-	if (RTEST(recur)) {
-	    argc = 0;
-	    goto retry;
-	}
+    rb_check_arity(argc, 0, 1);
+    if (argc > 0 && !RTEST(argv[0])) {
 	return rb_obj_singleton_methods(argc, argv, obj);
     }
+    return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_i);
 }
 
 /*
@@ -1040,7 +1377,7 @@ rb_obj_methods(int argc, VALUE *argv, VALUE obj)
  */
 
 VALUE
-rb_obj_protected_methods(int argc, VALUE *argv, VALUE obj)
+rb_obj_protected_methods(int argc, const VALUE *argv, VALUE obj)
 {
     return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_prot_i);
 }
@@ -1055,7 +1392,7 @@ rb_obj_protected_methods(int argc, VALUE *argv, VALUE obj)
  */
 
 VALUE
-rb_obj_private_methods(int argc, VALUE *argv, VALUE obj)
+rb_obj_private_methods(int argc, const VALUE *argv, VALUE obj)
 {
     return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_priv_i);
 }
@@ -1070,7 +1407,7 @@ rb_obj_private_methods(int argc, VALUE *argv, VALUE obj)
  */
 
 VALUE
-rb_obj_public_methods(int argc, VALUE *argv, VALUE obj)
+rb_obj_public_methods(int argc, const VALUE *argv, VALUE obj)
 {
     return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_pub_i);
 }
@@ -1109,32 +1446,34 @@ rb_obj_public_methods(int argc, VALUE *argv, VALUE obj)
  */
 
 VALUE
-rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
+rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)
 {
-    VALUE recur, ary, klass;
-    st_table *list;
+    VALUE ary, klass, origin;
+    struct method_entry_arg me_arg;
+    struct rb_id_table *mtbl;
+    int recur = TRUE;
 
-    if (argc == 0) {
-	recur = Qtrue;
-    }
-    else {
-	rb_scan_args(argc, argv, "01", &recur);
+    if (rb_check_arity(argc, 0, 1)) recur = RTEST(argv[0]);
+    if (RB_TYPE_P(obj, T_CLASS) && FL_TEST(obj, FL_SINGLETON)) {
+        rb_singleton_class(obj);
     }
     klass = CLASS_OF(obj);
-    list = st_init_numtable();
+    origin = RCLASS_ORIGIN(klass);
+    me_arg.list = st_init_numtable();
+    me_arg.recur = recur;
     if (klass && FL_TEST(klass, FL_SINGLETON)) {
-	st_foreach(RCLASS_M_TBL(klass), method_entry_i, (st_data_t)list);
+	if ((mtbl = RCLASS_M_TBL(origin)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg);
 	klass = RCLASS_SUPER(klass);
     }
-    if (RTEST(recur)) {
-	while (klass && (FL_TEST(klass, FL_SINGLETON) || TYPE(klass) == T_ICLASS)) {
-	    st_foreach(RCLASS_M_TBL(klass), method_entry_i, (st_data_t)list);
+    if (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);
 	    klass = RCLASS_SUPER(klass);
 	}
     }
-    ary = rb_ary_new();
-    st_foreach(list, ins_methods_i, ary);
-    st_free_table(list);
+    ary = rb_ary_new2(me_arg.list->num_entries);
+    st_foreach(me_arg.list, ins_methods_i, ary);
+    st_free_table(me_arg.list);
 
     return ary;
 }
@@ -1196,34 +1535,63 @@ rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
  * \{
  */
 
+#ifdef rb_define_method_id
+#undef rb_define_method_id
+#endif
 void
 rb_define_method_id(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method_cfunc(klass, mid, func, argc, NOEX_PUBLIC);
+    rb_add_method_cfunc(klass, mid, func, argc, METHOD_VISI_PUBLIC);
 }
 
+#ifdef rb_define_method
+#undef rb_define_method
+#endif
 void
 rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PUBLIC);
+    rb_add_method_cfunc(klass, rb_intern(name), func, argc, METHOD_VISI_PUBLIC);
 }
 
+#ifdef rb_define_protected_method
+#undef rb_define_protected_method
+#endif
 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, NOEX_PROTECTED);
+    rb_add_method_cfunc(klass, rb_intern(name), func, argc, METHOD_VISI_PROTECTED);
 }
 
+#ifdef rb_define_private_method
+#undef rb_define_private_method
+#endif
 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, NOEX_PRIVATE);
+    rb_add_method_cfunc(klass, rb_intern(name), func, argc, METHOD_VISI_PRIVATE);
 }
 
 void
 rb_undef_method(VALUE klass, const char *name)
 {
-    rb_add_method(klass, rb_intern(name), VM_METHOD_TYPE_UNDEF, 0, NOEX_UNDEF);
+    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);
+    }
 }
 
 /*!
@@ -1240,6 +1608,20 @@ rb_undef_method(VALUE klass, const char *name)
     }\
 } while (0)
 
+static inline VALUE
+special_singleton_class_of(VALUE obj)
+{
+    SPECIAL_SINGLETON(Qnil, rb_cNilClass);
+    SPECIAL_SINGLETON(Qfalse, rb_cFalseClass);
+    SPECIAL_SINGLETON(Qtrue, rb_cTrueClass);
+    return Qnil;
+}
+
+VALUE
+rb_special_singleton_class(VALUE obj)
+{
+    return special_singleton_class_of(obj);
+}
 
 /*!
  * \internal
@@ -1255,47 +1637,78 @@ singleton_class_of(VALUE obj)
 {
     VALUE klass;
 
-    if (FIXNUM_P(obj) || SYMBOL_P(obj)) {
+    if (FIXNUM_P(obj) || FLONUM_P(obj) || STATIC_SYM_P(obj)) {
+      no_singleton:
 	rb_raise(rb_eTypeError, "can't define singleton");
     }
-    if (rb_special_const_p(obj)) {
-	SPECIAL_SINGLETON(Qnil, rb_cNilClass);
-	SPECIAL_SINGLETON(Qfalse, rb_cFalseClass);
-	SPECIAL_SINGLETON(Qtrue, rb_cTrueClass);
-	rb_bug("unknown immediate %p", (void *)obj);
-    }
-
-    if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON) &&
-	rb_ivar_get(RBASIC(obj)->klass, id_attached) == obj) {
-	klass = RBASIC(obj)->klass;
+    if (SPECIAL_CONST_P(obj)) {
+	klass = special_singleton_class_of(obj);
+	if (NIL_P(klass))
+	    rb_bug("unknown immediate %p", (void *)obj);
+	return klass;
     }
     else {
-	klass = rb_make_metaclass(obj, RBASIC(obj)->klass);
+	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;
+	}
     }
 
-    if (OBJ_TAINTED(obj)) {
-	OBJ_TAINT(klass);
+    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;
     }
-    else {
-	FL_UNSET(klass, FL_TAINT);
-    }
-    if (OBJ_UNTRUSTED(obj)) {
-	OBJ_UNTRUST(klass);
-    }
-    else {
-	FL_UNSET(klass, FL_UNTRUSTED);
-    }
-    if (OBJ_FROZEN(obj)) OBJ_FREEZE(klass);
+
+    RB_FL_SET_RAW(klass, RB_OBJ_FROZEN_RAW(obj));
 
     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.
+ *
+ * \param obj an arbitrary object.
+ * \return the singleton class or nil.
+ */
+VALUE
+rb_singleton_class_get(VALUE obj)
+{
+    VALUE klass;
+
+    if (SPECIAL_CONST_P(obj)) {
+	return rb_special_singleton_class(obj);
+    }
+    klass = RBASIC(obj)->klass;
+    if (!FL_TEST(klass, FL_SINGLETON)) return Qnil;
+    if (rb_ivar_get(klass, id_attached) != obj) return Qnil;
+    return klass;
+}
 
 /*!
  * Returns the singleton class of \a obj. Creates it if necessary.
  *
  * \param obj an arbitrary object.
- * \throw TypeError if \a obj is a Fixnum or a Symbol.
+ * \throw TypeError if \a obj is a Integer or a Symbol.
  * \return the singleton class.
  *
  * \post \a obj has its own singleton class.
@@ -1314,7 +1727,7 @@ rb_singleton_class(VALUE obj)
     VALUE klass = singleton_class_of(obj);
 
     /* ensures an exposed class belongs to its own eigenclass */
-    if (TYPE(obj) == T_CLASS) (void)ENSURE_EIGENCLASS(klass);
+    if (RB_TYPE_P(obj, T_CLASS)) (void)ENSURE_EIGENCLASS(klass);
 
     return klass;
 }
@@ -1328,6 +1741,9 @@ rb_singleton_class(VALUE obj)
  * \{
  */
 
+#ifdef rb_define_singleton_method
+#undef rb_define_singleton_method
+#endif
 /*!
  * Defines a singleton method for \a obj.
  * \param obj    an arbitrary object
@@ -1341,8 +1757,9 @@ rb_define_singleton_method(VALUE obj, const char *name, VALUE (*func)(ANYARGS),
     rb_define_method(singleton_class_of(obj), name, func, argc);
 }
 
-
-
+#ifdef rb_define_module_function
+#undef rb_define_module_function
+#endif
 /*!
  * Defines a module function for \a module.
  * \param module  an module or a class.
@@ -1357,7 +1774,9 @@ rb_define_module_function(VALUE module, const char *name, VALUE (*func)(ANYARGS)
     rb_define_singleton_method(module, name, func, argc);
 }
 
-
+#ifdef rb_define_global_function
+#undef rb_define_global_function
+#endif
 /*!
  * Defines a global function
  * \param name    name of the function
@@ -1396,98 +1815,295 @@ rb_define_attr(VALUE klass, const char *name, int read, int write)
     rb_attr(klass, rb_intern(name), read, write, FALSE);
 }
 
-int
-rb_obj_basic_to_s_p(VALUE obj)
+MJIT_FUNC_EXPORTED VALUE
+rb_keyword_error_new(const char *error, VALUE keys)
 {
-    const rb_method_entry_t *me = rb_method_entry(CLASS_OF(obj), rb_intern("to_s"));
-    if (me && me->def && me->def->type == VM_METHOD_TYPE_CFUNC &&
-	me->def->body.cfunc.func == rb_any_to_s)
-	return 1;
-    return 0;
+    long i = 0, len = RARRAY_LEN(keys);
+    VALUE error_message = rb_sprintf("%s keyword%.*s", error, len > 1, "s");
+
+    if (len > 0) {
+	rb_str_cat_cstr(error_message, ": ");
+	while (1) {
+            const VALUE k = RARRAY_AREF(keys, i);
+	    rb_str_append(error_message, rb_inspect(k));
+	    if (++i >= len) break;
+	    rb_str_cat_cstr(error_message, ", ");
+	}
+    }
+
+    return rb_exc_new_str(rb_eArgError, error_message);
 }
 
-#include <stdarg.h>
+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));
+}
 
-int
-rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
+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)
 {
     int i;
-    const char *p = fmt;
-    VALUE *var;
+    for (i = 0; i < keywords; i++) {
+	st_data_t key = ID2SYM(table[i]);
+        rb_hash_stlike_delete(hash, &key, NULL);
+    }
+    rb_keyword_error("unknown", rb_hash_keys(hash));
+}
+
+
+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;
+    }
+    rb_hash_foreach(hash, separate_symbol, (st_data_t)&parthash);
+    *orighash = parthash[1];
+    if (parthash[1] && RBASIC_CLASS(hash) != rb_cHash) {
+        RBASIC_SET_CLASS(parthash[1], RBASIC_CLASS(hash));
+    }
+    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 ? \
+     (rb_hash_stlike_delete(keyword_hash, &key, &(val)) || ((val) = Qundef, 0)) : \
+     rb_hash_stlike_lookup(keyword_hash, key, NULL))
+
+    if (NIL_P(keyword_hash)) keyword_hash = 0;
+
+    if (optional < 0) {
+	rest = 1;
+	optional = -1-optional;
+    }
+    if (required) {
+	for (; i < required; i++) {
+	    VALUE keyword = ID2SYM(table[i]);
+	    if (keyword_hash) {
+                if (extract_kwarg(keyword, values[i])) {
+		    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++) {
+            if (extract_kwarg(ID2SYM(table[required+i]), values[required+i])) {
+		j++;
+	    }
+	}
+    }
+    if (!rest && keyword_hash) {
+	if (RHASH_SIZE(keyword_hash) > (unsigned int)(values ? 0 : j)) {
+	    unknown_keyword_error(keyword_hash, table, required+optional);
+	}
+    }
+    if (values && !keyword_hash) {
+        for (i = 0; i < required + optional; i++) {
+            values[i] = Qundef;
+        }
+    }
+    return j;
+#undef extract_kwarg
+}
+
+struct rb_scan_args_t {
+    int argc;
+    const VALUE *argv;
     va_list vargs;
-    int f_var = 0, f_hash = 0, f_block = 0;
-    int n_lead = 0, n_opt = 0, n_trail = 0, n_mand;
-    int argi = 0;
-    VALUE hash = Qnil;
+    int f_var;
+    int f_hash;
+    int f_block;
+    int n_lead;
+    int n_opt;
+    int n_trail;
+    int n_mand;
+    int argi;
+    int last_idx;
+    VALUE hash;
+    VALUE last_hash;
+    VALUE *tmp_buffer;
+};
+
+static void
+rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, struct rb_scan_args_t *arg)
+{
+    const char *p = fmt;
+    VALUE *tmp_buffer = arg->tmp_buffer;
+    int keyword_given = 0;
+    int empty_keyword_given = 0;
+    int last_hash_keyword = 0;
+
+    memset(arg, 0, sizeof(*arg));
+    arg->last_idx = -1;
+    arg->hash = Qnil;
+
+    switch (kw_flag) {
+      case RB_SCAN_ARGS_PASS_CALLED_KEYWORDS:
+        if (!(keyword_given = rb_keyword_given_p())) {
+            empty_keyword_given = rb_empty_keyword_given_p();
+        }
+        break;
+      case RB_SCAN_ARGS_KEYWORDS:
+        keyword_given = 1;
+        break;
+      case RB_SCAN_ARGS_EMPTY_KEYWORDS:
+        empty_keyword_given = 1;
+        break;
+      case RB_SCAN_ARGS_LAST_HASH_KEYWORDS:
+        last_hash_keyword = 1;
+        break;
+    }
 
     if (ISDIGIT(*p)) {
-	n_lead = *p - '0';
+        arg->n_lead = *p - '0';
 	p++;
 	if (ISDIGIT(*p)) {
-	    n_opt = *p - '0';
+            arg->n_opt = *p - '0';
 	    p++;
-	    if (ISDIGIT(*p)) {
-		n_trail = *p - '0';
-		p++;
-		goto block_arg;
-	    }
 	}
     }
     if (*p == '*') {
-	f_var = 1;
+        arg->f_var = 1;
+	p++;
+    }
+    if (ISDIGIT(*p)) {
+        arg->n_trail = *p - '0';
 	p++;
-	if (ISDIGIT(*p)) {
-	    n_trail = *p - '0';
-	    p++;
-	}
     }
-  block_arg:
     if (*p == ':') {
-	f_hash = 1;
+        arg->f_hash = 1;
 	p++;
     }
     if (*p == '&') {
-	f_block = 1;
+        arg->f_block = 1;
 	p++;
     }
     if (*p != '\0') {
 	rb_fatal("bad scan arg format: %s", fmt);
     }
-    n_mand = n_lead + n_trail;
+    arg->n_mand = arg->n_lead + arg->n_trail;
 
-    if (argc < n_mand)
-	goto argc_error;
+    /* capture an option hash - phase 1: pop */
+    /* Ignore final positional hash if empty keywords given */
+    if (argc > 0 && !(arg->f_hash && empty_keyword_given)) {
+        VALUE last = argv[argc - 1];
+
+        if (arg->f_hash && arg->n_mand < argc) {
+            if (keyword_given) {
+                if (!RB_TYPE_P(last, T_HASH)) {
+                    rb_warn("Keyword flag set when calling rb_scan_args, but last entry is not a hash");
+                }
+                else {
+                    arg->hash = last;
+                }
+            }
+            else if (NIL_P(last)) {
+                /* For backwards compatibility, nil is taken as an empty
+                   option hash only if it is not ambiguous; i.e. '*' is
+                   not specified and arguments are given more than sufficient.
+                   This will be removed in Ruby 3. */
+                if (!arg->f_var && arg->n_mand + arg->n_opt < argc) {
+                    rb_warn("The last argument is nil, treating as empty keywords");
+                    argc--;
+                }
+            }
+            else {
+                arg->hash = rb_check_hash_type(last);
+            }
+
+            /* Ruby 3: Remove if branch, as it will not attempt to split hashes */
+            if (!NIL_P(arg->hash)) {
+                VALUE opts = rb_extract_keywords(&arg->hash);
+
+                if (!(arg->last_hash = arg->hash)) {
+                    if (!keyword_given && !last_hash_keyword) {
+                        /* Warn if treating positional as keyword, as in Ruby 3,
+                           this will be an error */
+                        rb_warn("Using the last argument as keyword parameters is deprecated");
+                    }
+                    argc--;
+                }
+                else {
+                    /* Warn if splitting either positional hash to keywords or keywords
+                       to positional hash, as in Ruby 3, no splitting will be done */
+                    rb_warn("The last argument is split into positional and keyword parameters");
+                    arg->last_idx = argc - 1;
+                }
+                arg->hash = opts ? opts : Qnil;
+            }
+        }
+        else if (arg->f_hash && keyword_given && arg->n_mand == argc) {
+            /* Warn if treating keywords as positional, as in Ruby 3, this will be an error */
+            rb_warn("Passing the keyword argument as the last hash parameter is deprecated");
+        }
+    }
+    if (arg->f_hash && arg->n_mand == argc+1 && empty_keyword_given) {
+        VALUE *ptr = rb_alloc_tmp_buffer2(tmp_buffer, argc+1, sizeof(VALUE));
+        memcpy(ptr, argv, sizeof(VALUE)*argc);
+        ptr[argc] = rb_hash_new();
+        argc++;
+        *(&argv) = ptr;
+        rb_warn("Passing the keyword argument as the last hash parameter is deprecated");
+    }
+
+    arg->argc = argc;
+    arg->argv = argv;
+}
 
-    va_start(vargs, fmt);
+static int
+rb_scan_args_assign(struct rb_scan_args_t *arg, va_list vargs)
+{
+    int argi = 0;
+    int i;
+    VALUE *var;
 
-    /* capture an option hash - phase 1: pop */
-    if (f_hash && n_mand < argc) {
-	VALUE last = argv[argc - 1];
-
-	if (NIL_P(last)) {
-	    /* nil is taken as an empty option hash only if it is not
-	       ambiguous; i.e. '*' is not specified and arguments are
-	       given more than sufficient */
-	    if (!f_var && n_mand + n_opt < argc)
-		argc--;
-	}
-	else {
-	    hash = rb_check_convert_type(last, T_HASH, "Hash", "to_hash");
-	    if (!NIL_P(hash))
-		argc--;
-	}
+    if (arg->argc < arg->n_mand) {
+        return 1;
     }
+
     /* capture leading mandatory arguments */
-    for (i = n_lead; i-- > 0; ) {
+    for (i = arg->n_lead; i-- > 0; ) {
 	var = va_arg(vargs, VALUE *);
-	if (var) *var = argv[argi];
+        if (var) *var = (argi == arg->last_idx) ? arg->last_hash : arg->argv[argi];
 	argi++;
     }
     /* capture optional arguments */
-    for (i = n_opt; i-- > 0; ) {
+    for (i = arg->n_opt; i-- > 0; ) {
 	var = va_arg(vargs, VALUE *);
-	if (argi < argc - n_trail) {
-	    if (var) *var = argv[argi];
+        if (argi < arg->argc - arg->n_trail) {
+            if (var) *var = (argi == arg->last_idx) ? arg->last_hash : arg->argv[argi];
 	    argi++;
 	}
 	else {
@@ -1495,12 +2111,16 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
 	}
     }
     /* capture variable length arguments */
-    if (f_var) {
-	int n_var = argc - argi - n_trail;
+    if (arg->f_var) {
+        int n_var = arg->argc - argi - arg->n_trail;
 
 	var = va_arg(vargs, VALUE *);
 	if (0 < n_var) {
-	    if (var) *var = rb_ary_new4(n_var, &argv[argi]);
+	    if (var) {
+                int f_last = (arg->last_idx + 1 == arg->argc - arg->n_trail);
+                *var = rb_ary_new4(n_var - f_last, &arg->argv[argi]);
+                if (f_last) rb_ary_push(*var, arg->last_hash);
+	    }
 	    argi += n_var;
 	}
 	else {
@@ -1508,18 +2128,18 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
 	}
     }
     /* capture trailing mandatory arguments */
-    for (i = n_trail; i-- > 0; ) {
+    for (i = arg->n_trail; i-- > 0; ) {
 	var = va_arg(vargs, VALUE *);
-	if (var) *var = argv[argi];
+        if (var) *var = (argi == arg->last_idx) ? arg->last_hash : arg->argv[argi];
 	argi++;
     }
     /* capture an option hash - phase 2: assignment */
-    if (f_hash) {
+    if (arg->f_hash) {
 	var = va_arg(vargs, VALUE *);
-	if (var) *var = hash;
+        if (var) *var = arg->hash;
     }
     /* capture iterator block */
-    if (f_block) {
+    if (arg->f_block) {
 	var = va_arg(vargs, VALUE *);
 	if (rb_block_given_p()) {
 	    *var = rb_block_proc();
@@ -1528,20 +2148,59 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
 	    *var = Qnil;
 	}
     }
-    va_end(vargs);
 
-    if (argi < argc)
-	goto argc_error;
+    if (argi < arg->argc) return 1;
 
-    return argc;
+    return 0;
+}
 
-  argc_error:
-    if (0 < n_opt)
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d..%d%s)",
-		 argc, n_mand, n_mand + n_opt, f_var ? "+" : "");
-    else
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d%s)",
-		 argc, n_mand, f_var ? "+" : "");
+#undef rb_scan_args
+int
+rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
+{
+    int error;
+    va_list vargs;
+    VALUE tmp_buffer = 0;
+    struct rb_scan_args_t arg;
+    arg.tmp_buffer = &tmp_buffer;
+    rb_scan_args_parse(RB_SCAN_ARGS_PASS_CALLED_KEYWORDS, argc, argv, fmt, &arg);
+    va_start(vargs,fmt);
+    error = rb_scan_args_assign(&arg, vargs);
+    va_end(vargs);
+    if (tmp_buffer) {
+        rb_free_tmp_buffer(&tmp_buffer);
+    }
+    if (error) {
+        rb_error_arity(arg.argc, arg.n_mand, arg.f_var ? UNLIMITED_ARGUMENTS : arg.n_mand + arg.n_opt);
+    }
+    return arg.argc;
+}
+
+int
+rb_scan_args_kw(int kw_flag, int argc, const VALUE *argv, const char *fmt, ...)
+{
+    int error;
+    va_list vargs;
+    VALUE tmp_buffer = 0;
+    struct rb_scan_args_t arg;
+    arg.tmp_buffer = &tmp_buffer;
+    rb_scan_args_parse(kw_flag, argc, argv, fmt, &arg);
+    va_start(vargs,fmt);
+    error = rb_scan_args_assign(&arg, vargs);
+    va_end(vargs);
+    if (tmp_buffer) {
+        rb_free_tmp_buffer(&tmp_buffer);
+    }
+    if (error) {
+        rb_error_arity(arg.argc, arg.n_mand, arg.f_var ? UNLIMITED_ARGUMENTS : arg.n_mand + arg.n_opt);
+    }
+    return arg.argc;
+}
+
+int
+rb_class_has_methods(VALUE c)
+{
+    return rb_id_table_size(RCLASS_M_TBL(c)) == 0 ? FALSE : TRUE;
 }
 
 /*!
diff --git a/common.mk b/common.mk
index ea244cca83..3706aeb4ce 100644
--- a/common.mk
+++ b/common.mk
@@ -1,68 +1,120 @@
+# -*- mode: makefile-gmake; indent-tabs-mode: t -*-
+
 bin: $(PROGRAM) $(WPROGRAM)
 lib: $(LIBRUBY)
 dll: $(LIBRUBY_SO)
 
-.SUFFIXES: .inc .h .c .y .i
+.SUFFIXES: .rbinc .rb .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT)
 
 # V=0 quiet, V=1 verbose.  other values don't work.
 V = 0
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
-n=$(NULLCMD)
-ECHO1 = $(V:1=@$n)
-ECHO = $(ECHO1:0=@echo)
-
-RUBYLIB       = -
+ECHO0 = $(ECHO1:0=echo)
+ECHO = @$(ECHO0)
+
+mflags = $(MFLAGS)
+gnumake_recursive =
+enable_shared = $(ENABLE_SHARED:no=)
+
+UNICODE_VERSION = 12.1.0
+UNICODE_EMOJI_VERSION = 12.1
+UNICODE_BETA = NO
+
+### 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)/ucd
+UNICODE_SRC_DATA_DIR = $(srcdir)/$(UNICODE_DATA_DIR)
+UNICODE_SRC_EMOJI_DATA_DIR = $(srcdir)/enc/unicode/data/emoji/$(UNICODE_EMOJI_VERSION)
+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)
+RUBYLIB       = $(PATH_SEPARATOR)
 RUBYOPT       = -
 RUN_OPTS      = --disable-gems
 
-SPEC_GIT_BASE = git://github.com/rubyspec
-MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
-RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
+GITPULLOPTIONS = --rebase
+
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR)
+
+GEM_HOME =
+GEM_PATH =
+GEM_VENDOR =
+
+BENCHMARK_DRIVER_GIT_URL = https://github.com/benchmark-driver/benchmark-driver
+BENCHMARK_DRIVER_GIT_REF = v0.15.6
+SIMPLECOV_GIT_URL = https://github.com/colszowka/simplecov.git
+SIMPLECOV_GIT_REF = v0.17.0
+SIMPLECOV_HTML_GIT_URL = https://github.com/colszowka/simplecov-html.git
+SIMPLECOV_HTML_GIT_REF = v0.10.2
+DOCLIE_GIT_URL = https://github.com/ms-ati/docile.git
+DOCLIE_GIT_REF = v1.3.2
 
 STATIC_RUBY   = static-ruby
 
+TIMESTAMPDIR  = $(EXTOUT)/.timestamp
+RUBYCOMMONDIR = $(EXTOUT)/common
 EXTCONF       = extconf.rb
-RBCONFIG      = ./.rbconfig.time
 LIBRUBY_EXTS  = ./.libruby-with-ext.time
 REVISION_H    = ./.revision.time
+PLATFORM_D    = $(TIMESTAMPDIR)/.$(PLATFORM_DIR).time
+ENC_TRANS_D   = $(TIMESTAMPDIR)/.enc-trans.time
+RDOC          = $(XRUBY) "$(srcdir)/libexec/rdoc" --root "$(srcdir)" --encoding=UTF-8 --all
 RDOCOUT       = $(EXTOUT)/rdoc
+HTMLOUT       = $(EXTOUT)/html
 CAPIOUT       = doc/capi
-ID_H_TARGET   = -id.h-
+INSTALL_DOC_OPTS = --rdoc-output="$(RDOCOUT)" --html-output="$(HTMLOUT)"
+RDOC_GEN_OPTS = --page-dir "$(srcdir)/doc" --no-force-update
 
-DMYEXT	      = dmyext.$(OBJEXT)
+INITOBJS      = dmyext.$(OBJEXT) dmyenc.$(OBJEXT)
 NORMALMAINOBJ = main.$(OBJEXT)
 MAINOBJ       = $(NORMALMAINOBJ)
-EXTOBJS	      = 
-DLDOBJS	      = $(DMYEXT)
-MINIOBJS      = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmyversion.$(OBJEXT) miniprelude.$(OBJEXT)
+DLDOBJS	      = $(INITOBJS)
+EXTSOLIBS     =
+MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(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) \
+		ast.$(OBJEXT) \
 		bignum.$(OBJEXT) \
 		class.$(OBJEXT) \
 		compar.$(OBJEXT) \
+		compile.$(OBJEXT) \
 		complex.$(OBJEXT) \
+		cont.$(OBJEXT) \
+		debug.$(OBJEXT) \
+		debug_counter.$(OBJEXT) \
 		dir.$(OBJEXT) \
 		dln_find.$(OBJEXT) \
+		encoding.$(OBJEXT) \
 		enum.$(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) \
+		mjit.$(OBJEXT) \
+		mjit_compile.$(OBJEXT) \
 		node.$(OBJEXT) \
 		numeric.$(OBJEXT) \
 		object.$(OBJEXT) \
 		pack.$(OBJEXT) \
 		parse.$(OBJEXT) \
+		proc.$(OBJEXT) \
 		process.$(OBJEXT) \
 		random.$(OBJEXT) \
 		range.$(OBJEXT) \
@@ -82,72 +134,118 @@ COMMONOBJS    = array.$(OBJEXT) \
 		strftime.$(OBJEXT) \
 		string.$(OBJEXT) \
 		struct.$(OBJEXT) \
+		symbol.$(OBJEXT) \
+		thread.$(OBJEXT) \
 		time.$(OBJEXT) \
 		transcode.$(OBJEXT) \
+		transient_heap.$(OBJEXT) \
 		util.$(OBJEXT) \
 		variable.$(OBJEXT) \
-		compile.$(OBJEXT) \
-		debug.$(OBJEXT) \
-		iseq.$(OBJEXT) \
+		version.$(OBJEXT) \
 		vm.$(OBJEXT) \
+		vm_backtrace.$(OBJEXT) \
 		vm_dump.$(OBJEXT) \
-		thread.$(OBJEXT) \
-		cont.$(OBJEXT) \
+		vm_trace.$(OBJEXT) \
+		$(COROUTINE_OBJ) \
+		$(DTRACE_OBJ) \
 		$(BUILTIN_ENCOBJS) \
 		$(BUILTIN_TRANSOBJS) \
 		$(MISSING)
 
-EXPORTOBJS    = dln.$(OBJEXT) \
-		encoding.$(OBJEXT) \
-		version.$(OBJEXT) \
+EXPORTOBJS    = $(DLNOBJ) \
+		localeinit.$(OBJEXT) \
+		loadpath.$(OBJEXT) \
 		$(COMMONOBJS)
 
-OBJS          = $(EXPORTOBJS) prelude.$(OBJEXT)
+OBJS          = $(EXPORTOBJS) builtin.$(OBJEXT)
+ALLOBJS       = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS)
 
 GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
 
-PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES)
-GEM_PRELUDE = $(srcdir)/gem_prelude.rb
-YES_GEM_PRELUDE = $(GEM_PRELUDE)
-NO_GEM_PRELUDE =
-PRELUDES      = prelude.c miniprelude.c
-GOLFPRELUDES = golf_prelude.c
+DEFAULT_PRELUDES = $(GEM_PRELUDE)
+PRELUDE_SCRIPTS = $(DEFAULT_PRELUDES)
+GEM_PRELUDE   =
+PRELUDES      = {$(srcdir)}miniprelude.c
+GOLFPRELUDES  = {$(srcdir)}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)'" --
-INSTRUBY      =	$(SUDO) $(MINIRUBY) $(srcdir)/tool/rbinstall.rb
+		--make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" \
+		--gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
+		--
+INSTRUBY      =	$(SUDO) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/tool/rbinstall.rb
 INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
 		--data-mode=$(INSTALL_DATA_MODE) \
 		--prog-mode=$(INSTALL_PROG_MODE) \
-		--installed-list $(INSTALLED_LIST)
+		--installed-list $(INSTALLED_LIST) \
+		--mantype="$(MANTYPE)"
 INSTALL_PROG_MODE = 0755
 INSTALL_DATA_MODE = 0644
 
-PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' -- \
-			$(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE)
-
 TESTSDIR      = $(srcdir)/test
+TOOL_TESTSDIR = $(srcdir)/tool/test
+TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/
 TESTWORKDIR   = testwork
+TESTOPTS      = $(RUBY_TESTOPTS)
 
 TESTRUN_SCRIPT = $(srcdir)/test.rb
 
-BOOTSTRAPRUBY = $(BASERUBY)
+COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmpl
 
-COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb
+SHOWFLAGS = showflags
 
-all: showflags main docs
+MAKE_LINK = $(MINIRUBY) -rfileutils -e "include FileUtils::Verbose" \
+	  -e "src, dest = ARGV" \
+	  -e "exit if File.identical?(src, dest) or cmp(src, dest) rescue nil" \
+	  -e "def noraise; yield; rescue; rescue NotImplementedError; end" \
+	  -e "noraise {ln_sf('../'*dest.count('/')+src, dest)} or" \
+	  -e "noraise {ln(src, dest)} or" \
+	  -e "cp(src, dest)"
 
-main: showflags encs exts
+
+all: $(SHOWFLAGS) main docs
+
+main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs
 	@$(NULLCMD)
 
+mjit-headers: $(MJIT_SUPPORT)-mjit-headers
+no-mjit-headers: PHONY
+yes-mjit-headers: mjit_config.h PHONY
+
+mjit.$(OBJEXT): mjit_config.h
+mjit_config.h: Makefile
+
+
+# These rules using MJIT_HEADER_SUFFIX must be in common.mk, not
+# Makefile.in, in order to override the macro in defs/universal.mk.
+
+# Other `-Dxxx`s preceding `-DMJIT_HEADER` will be removed in transform_mjit_header.rb.
+# So `-DMJIT_HEADER` should be passed first when rb_mjit_header.h is generated.
+$(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJEXT) \
+		$(TIMESTAMPDIR)/$(arch)/.time
+	$(ECHO) building $(@F:.time=.h)
+	$(Q) $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new
+	$(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new
+
+$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time
+
+$(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: \
+		$(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time \
+		$(srcdir)/tool/transform_mjit_header.rb $(PREP) \
+		$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h
+	$(ECHO) building $@
+	$(MINIRUBY) $(srcdir)/tool/transform_mjit_header.rb "$(CC) $(ARCH_FLAG) $(CFLAGS)" $(MJIT_HEADER:.h=)$(MJIT_HEADER_ARCH).h $@
+	$(Q) $(MAKEDIRS) $(MJIT_HEADER_INSTALL_DIR)
+	$(Q) $(MAKE_LINK) $@ $(MJIT_HEADER_INSTALL_DIR)/$(@F)
+
 .PHONY: showflags
-exts enc trans: showflags
+exts enc trans: $(SHOWFLAGS)
 showflags:
 	$(MESSAGE_BEGIN) \
+	"	BASERUBY = $(BASERUBY)" \
 	"	CC = $(CC)" \
 	"	LD = $(LD)" \
 	"	LDSHARED = $(LDSHARED)" \
@@ -156,72 +254,112 @@ showflags:
 	"	CPPFLAGS = $(CPPFLAGS)" \
 	"	DLDFLAGS = $(DLDFLAGS)" \
 	"	SOLIBS = $(SOLIBS)" \
+	"	LANG = $(LANG)" \
+	"	LC_ALL = $(LC_ALL)" \
+	"	LC_CTYPE = $(LC_CTYPE)" \
+	"	MFLAGS = $(MFLAGS)" \
 	$(MESSAGE_END)
+	-@$(CC_VERSION)
 
 .PHONY: showconfig
 showconfig:
-	@$(MESSAGE_BEGIN) \
-	"$(configure_args)" \
-	$(MESSAGE_END)
+	@$(ECHO_BEGIN) \
+	$(configure_args) \
+	$(ECHO_END)
+
+EXTS_NOTE = -f $(EXTS_MK) $(mflags) RUBY="$(MINIRUBY)" top_srcdir="$(srcdir)" note
 
 exts: build-ext
 
 EXTS_MK = exts.mk
-$(EXTS_MK): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY)
-	@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$(EXTS_MK) $(EXTMK_ARGS) configure
+$(EXTS_MK): ext/configure-ext.mk $(srcdir)/template/exts.mk.tmpl \
+	    $(TIMESTAMPDIR)/$(arch)/.time $(TIMESTAMPDIR)/.RUBYCOMMONDIR.time
+	$(Q)$(MAKE) -f ext/configure-ext.mk $(mflags) V=$(V) EXTSTATIC=$(EXTSTATIC) \
+		gnumake=$(gnumake) MINIRUBY="$(MINIRUBY)" \
+		EXTLDFLAGS="$(EXTLDFLAGS)" srcdir="$(srcdir)"
+	$(ECHO) generating makefile $@
+	$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \
+	    $(srcdir)/template/exts.mk.tmpl --gnumake=$(gnumake)
+
+ext/configure-ext.mk: $(PREP) all-incs $(MKFILES) $(RBCONFIG) $(LIBRUBY) \
+		$(srcdir)/template/configure-ext.mk.tmpl
+	$(ECHO) generating makefiles $@
+	$(Q)$(MAKEDIRS) $(@D)
+	$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \
+	    $(srcdir)/template/$(@F).tmpl --srcdir="$(srcdir)" \
+	    --miniruby="$(MINIRUBY)" --script-args='$(SCRIPT_ARGS)'
 
 configure-ext: $(EXTS_MK)
 
 build-ext: $(EXTS_MK)
-	$(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS)
+	$(Q)$(MAKE) -f $(EXTS_MK) $(mflags) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
+	    EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
+	$(Q)$(MAKE) $(EXTS_NOTE)
 
-$(MKMAIN_CMD): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY)
-	@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$@ $(EXTMK_ARGS)
+exts-note: $(EXTS_MK)
+	$(Q)$(MAKE) $(EXTS_NOTE)
 
-prog: program wprogram
+ext/extinit.c: $(srcdir)/template/extinit.c.tmpl
+	$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \
+	    $(srcdir)/template/extinit.c.tmpl $(EXTINITS)
 
-loadpath: $(PREP) PHONY
-	$(MINIRUBY) -e 'p $$:'
+prog: program wprogram
+programs: $(PROGRAM) $(WPROGRAM)
 
 $(PREP): $(MKFILES)
 
-miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE)
+miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE)
+
+objs: $(ALLOBJS)
 
 GORUBY = go$(RUBY_INSTALL_NAME)
-golf: $(LIBRUBY) $(GOLFOBJS) PHONY
-	$(Q) $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
+GOLF = $(GORUBY)
+golf: $(GOLF)
+$(GOLF): $(LIBRUBY) $(GOLFOBJS) PHONY
+	$(Q) $(MAKE) $(mflags) \
+		GOLF=_dummy_golf_target_to_avoid_conflict_just_in_case_ \
+		MAINOBJ=goruby.$(OBJEXT) \
+		EXTOBJS="golf_prelude.$(OBJEXT) $(EXTOBJS)" \
+		PROGRAM=$(GORUBY)$(EXEEXT) \
+		V=$(V) \
+	program
 capi: $(CAPIOUT)/.timestamp PHONY
 
-doc/capi/.timestamp: Doxyfile $(PREP)
-	$(Q) $(MAKEDIRS) doc/capi
+$(CAPIOUT)/.timestamp: Doxyfile $(PREP)
+	$(Q) $(MAKEDIRS) "$(@D)"
 	$(ECHO) generating capi
-	$(Q) $(DOXYGEN) -b
-	$(Q) $(MINIRUBY) -e 'File.open("$(CAPIOUT)/.timestamp", "w"){|f| f.puts(Time.now)}'
+	-$(Q) $(DOXYGEN) -b
+	$(Q) $(MINIRUBY) -e 'File.open(ARGV[0], "w"){'"|f|"' f.puts(Time.now)}' "$@"
 
 Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
 	$(ECHO) generating $@
 	$(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): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
+$(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
 
-$(LIBRUBY_A):	$(OBJS) $(DMYEXT) $(ARCHFILE)
+$(LIBRUBY_A):	$(LIBRUBY_A_OBJS) $(MAINOBJ) $(INITOBJS) $(ARCHFILE)
 
-$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(BUILTIN_ENCOBJS)
+$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(BUILTIN_ENCOBJS)
 
 $(LIBRUBY_EXTS):
-	@exit > $@
+	@$(NULLCMD) > $@
 
 $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
-	@$(RM) $@
-	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
-
-ruby.imp: $(EXPORTOBJS)
-	@$(NM) -Pgp $(EXPORTOBJS) | \
-	awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|.*_threadptr_|\.)/{print $$1}' | \
+	$(Q)$(RM) $@
+	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
+
+ruby.imp: $(COMMONOBJS)
+	$(Q){ \
+	$(NM) -Pgp $(COMMONOBJS) | \
+	awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^$(SYMBOL_PREFIX)(Init_|InitVM_|ruby_static_id_|.*_threadptr_|rb_ec_)|^\./{print $$1}'; \
+	($(CHDIR) $(srcdir) && \
+	 exec sed -n '/^MJIT_FUNC_EXPORTED/!d;N;s/.*\n\(rb_[a-zA-Z_0-9]*\).*/$(SYMBOL_PREFIX)\1/p' cont.c gc.c thread*c vm*.c) \
+	} | \
 	sort -u -o $@
 
 install: install-$(INSTALLDOC)
@@ -230,80 +368,80 @@ pkgconfig-data: $(ruby_pc)
 $(ruby_pc): $(srcdir)/template/ruby.pc.in config.status
 
 install-all: docs pre-install-all do-install-all post-install-all
-pre-install-all:: pre-install-local pre-install-ext pre-install-doc
-do-install-all: $(PROGRAM)
-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --rdoc-output="$(RDOCOUT)"
+pre-install-all:: all pre-install-local pre-install-ext pre-install-doc
+do-install-all: pre-install-all
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) $(INSTALL_DOC_OPTS)
 post-install-all:: post-install-local post-install-ext post-install-doc
 	@$(NULLCMD)
 
 install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
 pre-install-nodoc:: pre-install-local pre-install-ext
-do-install-nodoc: $(PREP)
-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
+do-install-nodoc: main pre-install-nodoc
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --exclude=doc
 post-install-nodoc:: post-install-local post-install-ext
 
 install-local: pre-install-local do-install-local post-install-local
 pre-install-local:: pre-install-bin pre-install-lib pre-install-man
-do-install-local: $(PREP)
-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
+do-install-local: $(PROGRAM) pre-install-local
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local
 post-install-local:: post-install-bin post-install-lib post-install-man
 
 install-ext: pre-install-ext do-install-ext post-install-ext
 pre-install-ext:: pre-install-ext-arch pre-install-ext-comm
-do-install-ext: $(PREP)
+do-install-ext: exts pre-install-ext
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
 post-install-ext:: post-install-ext-arch post-install-ext-comm
 
 install-arch: pre-install-arch do-install-arch post-install-arch
 pre-install-arch:: pre-install-bin pre-install-ext-arch
-do-install-arch: $(PREP)
-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
+do-install-arch: main do-install-arch
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=arch
 post-install-arch:: post-install-bin post-install-ext-arch
 
 install-comm: pre-install-comm do-install-comm post-install-comm
 pre-install-comm:: pre-install-lib pre-install-ext-comm pre-install-man
-do-install-comm: $(PREP)
+do-install-comm: $(PREP) pre-install-comm
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
 post-install-comm:: post-install-lib post-install-ext-comm post-install-man
 
 install-bin: pre-install-bin do-install-bin post-install-bin
 pre-install-bin:: install-prereq
-do-install-bin: $(PREP)
+do-install-bin: $(PROGRAM) pre-install-bin
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
 post-install-bin::
 	@$(NULLCMD)
 
 install-lib: pre-install-lib do-install-lib post-install-lib
 pre-install-lib:: install-prereq
-do-install-lib: $(PREP)
+do-install-lib: $(PREP) pre-install-lib
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
 post-install-lib::
 	@$(NULLCMD)
 
 install-ext-comm: pre-install-ext-comm do-install-ext-comm post-install-ext-comm
 pre-install-ext-comm:: install-prereq
-do-install-ext-comm: $(PREP)
+do-install-ext-comm: exts pre-install-ext-comm
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
 post-install-ext-comm::
 	@$(NULLCMD)
 
 install-ext-arch: pre-install-ext-arch do-install-ext-arch post-install-ext-arch
 pre-install-ext-arch:: install-prereq
-do-install-ext-arch: $(PREP)
+do-install-ext-arch: exts pre-install-ext-arch
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
 post-install-ext-arch::
 	@$(NULLCMD)
 
 install-man: pre-install-man do-install-man post-install-man
 pre-install-man:: install-prereq
-do-install-man: $(PREP)
-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
+do-install-man: $(PREP) pre-install-man
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man
 post-install-man::
 	@$(NULLCMD)
 
 install-capi: capi pre-install-capi do-install-capi post-install-capi
 pre-install-capi:: install-prereq
-do-install-capi: $(PREP)
+do-install-capi: $(PREP) pre-install-capi
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=capi
 post-install-capi::
 	@$(NULLCMD)
@@ -314,22 +452,27 @@ what-where-all: no-install-all
 no-install-all: pre-no-install-all dont-install-all post-no-install-all
 pre-no-install-all:: pre-no-install-local pre-no-install-ext pre-no-install-doc
 dont-install-all: $(PROGRAM)
-	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --rdoc-output="$(RDOCOUT)"
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all $(INSTALL_DOC_OPTS)
 post-no-install-all:: post-no-install-local post-no-install-ext post-no-install-doc
 	@$(NULLCMD)
 
+uninstall: $(INSTALLED_LIST) sudo-precheck
+	$(Q)$(SUDO) $(MINIRUBY) $(srcdir)/tool/rbuninstall.rb --destdir=$(DESTDIR) $(INSTALLED_LIST)
+
+reinstall: all uninstall install
+
 what-where-nodoc: no-install-nodoc
 no-install-nodoc: pre-no-install-nodoc dont-install-nodoc post-no-install-nodoc
 pre-no-install-nodoc:: pre-no-install-local pre-no-install-ext
 dont-install-nodoc:  $(PREP)
-	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS)
 post-no-install-nodoc:: post-no-install-local post-no-install-ext
 
 what-where-local: no-install-local
 no-install-local: pre-no-install-local dont-install-local post-no-install-local
 pre-no-install-local:: pre-no-install-bin pre-no-install-lib pre-no-install-man
 dont-install-local: $(PREP)
-	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local
 post-no-install-local:: post-no-install-bin post-no-install-lib post-no-install-man
 
 what-where-ext: no-install-ext
@@ -389,24 +532,45 @@ what-where-man: no-install-man
 no-install-man: pre-no-install-man dont-install-man post-no-install-man
 pre-no-install-man:: install-prereq
 dont-install-man: $(PREP)
-	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man
 post-no-install-man::
 	@$(NULLCMD)
 
 install-doc: rdoc pre-install-doc do-install-doc post-install-doc
 pre-install-doc:: install-prereq
-do-install-doc: $(PROGRAM)
-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+do-install-doc: $(PROGRAM) pre-install-doc
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc $(INSTALL_DOC_OPTS)
 post-install-doc::
 	@$(NULLCMD)
 
+install-gem: pre-install-gem do-install-gem post-install-gem
+pre-install-gem:: pre-install-bin pre-install-lib pre-install-man
+do-install-gem: $(PROGRAM) pre-install-gem
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=gem
+post-install-gem::
+	@$(NULLCMD)
+
 rdoc: PHONY main
 	@echo Generating RDoc documentation
-	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)"
+	$(Q) $(RDOC) --ri --op "$(RDOCOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) "$(srcdir)"
+
+html: PHONY main
+	@echo Generating RDoc HTML files
+	$(Q) $(RDOC) --op "$(HTMLOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) "$(srcdir)"
 
 rdoc-coverage: PHONY main
 	@echo Generating RDoc coverage report
-	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --encoding=UTF-8 --all --quiet -C $(RDOCFLAGS) "$(srcdir)"
+	$(Q) $(RDOC) --quiet -C $(RDOCFLAGS) "$(srcdir)"
+
+RDOCBENCHOUT=/tmp/rdocbench
+
+GCBENCH_ITEM=null
+
+gcbench: PHONY
+	$(Q) $(XRUBY) "$(srcdir)/benchmark/gc/gcbench.rb" $(GCBENCH_ITEM)
+
+gcbench-rdoc: PHONY
+	$(Q) $(XRUBY) "$(srcdir)/benchmark/gc/gcbench.rb" rdoc
 
 nodoc: PHONY
 
@@ -414,402 +578,492 @@ what-where-doc: no-install-doc
 no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc
 pre-no-install-doc:: install-prereq
 dont-install-doc:: $(PREP)
-	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc $(INSTALL_DOC_OPTS)
 post-no-install-doc::
 	@$(NULLCMD)
 
 CLEAR_INSTALLED_LIST = clear-installed-list
 
-install-prereq: $(CLEAR_INSTALLED_LIST) PHONY
+install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake sudo-precheck PHONY
 
 clear-installed-list: PHONY
 	@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
 
-clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout
-clean-local:: PHONY
-	@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
-	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
-	@$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc)
+clean: clean-ext clean-enc clean-golf clean-docs clean-extout clean-local clean-platform clean-spec
+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) $(COROUTINE_H:/Context.h=/.time)
+	$(Q)$(RM) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) ruby.imp
+	$(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb bisect.sh $(ENC_TRANS_D)
+	-$(Q) $(RMDIR) enc/jis enc/trans enc $(COROUTINE_H:/Context.h=) coroutine 2> $(NULL) || $(NULLCMD)
+
+bin/clean-runnable:: PHONY
+	$(Q)$(CHDIR) bin 2>$(NULL) && $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT) 2>$(NULL) || $(NULLCMD)
+lib/clean-runnable:: PHONY
+	$(Q)$(CHDIR) lib 2>$(NULL) && $(RM) $(LIBRUBY_A) $(LIBRUBY) $(LIBRUBY_ALIASES) $(RUBY_BASE_NAME)/$(RUBY_PROGRAM_VERSION) $(RUBY_BASE_NAME)/vendor_ruby 2>$(NULL) || $(NULLCMD)
+clean-runnable:: bin/clean-runnable lib/clean-runnable PHONY
+	$(Q)$(RMDIR) lib/$(RUBY_BASE_NAME) lib bin 2>$(NULL) || $(NULLCMD)
 clean-ext:: PHONY
 clean-golf: PHONY
-	@$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
+	$(Q)$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
 clean-rdoc: PHONY
+clean-html: PHONY
 clean-capi: PHONY
+clean-platform: PHONY
 clean-extout: PHONY
-clean-docs: clean-rdoc clean-capi
+	-$(Q)$(RMDIR) $(EXTOUT)/$(arch) $(EXTOUT) 2> $(NULL) || $(NULLCMD)
+clean-docs: clean-rdoc clean-html clean-capi
+clean-spec: PHONY
+clean-rubyspec: clean-spec
 
-distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
+distclean: distclean-ext distclean-enc distclean-golf distclean-docs distclean-extout distclean-local distclean-platform distclean-spec
 distclean-local:: clean-local
-	@$(RM) $(MKFILES) yasmdata.rb *.inc
-	@$(RM) config.cache config.status config.status.lineno $(PRELUDES)
-	@$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
+	$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc $(PRELUDES) *.rbinc
+	$(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
-	@$(RM) $(GOLFPRELUDES)
-distclean-rdoc: PHONY
-distclean-capi: PHONY
+distclean-rdoc: clean-rdoc
+distclean-html: clean-html
+distclean-capi: clean-capi
+distclean-docs: clean-docs
 distclean-extout: clean-extout
+distclean-platform: clean-platform
+distclean-spec: clean-spec
+distclean-rubyspec: distclean-spec
 
 realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
-realclean-local:: distclean-local
-	@$(RM) parse.c parse.h lex.c newline.c revision.h
-realclean-ext::
+realclean-local:: distclean-local realclean-srcs-local
+
+clean-srcs:: clean-srcs-local clean-srcs-ext
+realclean-srcs:: realclean-srcs-local realclean-srcs-ext
+
+clean-srcs-local::
+	$(Q)$(RM) parse.c parse.h lex.c enc/trans/newline.c revision.h
+	$(Q)$(RM) id.c id.h probes.dmyh probes.h
+	$(Q)$(RM) encdb.h transdb.h verconf.h ruby-runner.h
+	$(Q)$(RM) mjit_config.h rb_mjit_header.h
+	$(Q)$(RM) $(MJIT_MIN_HEADER) $(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFFIX:%=*).h
+
+realclean-srcs-local:: clean-srcs-local
+	$(Q)$(CHDIR) $(srcdir) && $(RM) \
+	  parse.c parse.h lex.c enc/trans/newline.c $(PRELUDES) revision.h \
+	  id.c id.h probes.dmyh configure aclocal.m4 tool/config.guess tool/config.sub gems/*.gem \
+	|| $(NULLCMD)
+
+clean-srcs-ext::
+realclean-srcs-ext:: clean-srcs-ext
+
+realclean-ext:: PHONY
 realclean-golf: distclean-golf
-realclean-capi: PHONY
+	$(Q)$(RM) $(GOLFPRELUDES)
+realclean-rdoc: distclean-rdoc
+realclean-html: distclean-html
+realclean-capi: distclean-capi
+realclean-docs: distclean-docs
 realclean-extout: distclean-extout
+realclean-platform: distclean-platform
+realclean-spec: distclean-spec
+realclean-rubyspec: realclean-spec
+
+clean-ext:: ext/clean gems/clean timestamp/clean
+distclean-ext:: ext/distclean gems/distclean timestamp/distclean
+realclean-ext:: ext/realclean gems/realclean timestamp/realclean
+
+ext/clean.mk ext/distclean.mk ext/realclean.mk::
+ext/clean:: ext/clean.mk
+ext/distclean:: ext/distclean.mk
+ext/realclean:: ext/realclean.mk
+
+timestamp/clean:: ext/clean gems/clean
+timestamp/distclean:: ext/distclean gems/distclean
+timestamp/realclean:: ext/realclean gems/realclean
+
+timestamp/clean timestamp/distclean timestamp/realclean::
+	$(Q)$(RM) $(TIMESTAMPDIR)/.*.time $(TIMESTAMPDIR)/$(arch)/.time
+	$(Q)$(RMDIRS) $(TIMESTAMPDIR)/$(arch) $(TIMESTAMPDIR) 2> $(NULL) || $(NULLCMD)
+
+clean-ext::
+	-$(Q)$(RM) ext/extinit.$(OBJEXT)
+
+distclean-ext realclean-ext::
+	-$(Q)$(RM) $(EXTS_MK) ext/extinit.* ext/configure-ext.mk
+	-$(Q)$(RMDIR) ext 2> $(NULL) || $(NULLCMD)
 
 clean-enc distclean-enc realclean-enc: PHONY
 
-check: test test-all
+clean-enc: clean-enc.d
+
+clean-enc.d: PHONY
+	$(Q)$(RM) $(ENC_TRANS_D)
+	-$(Q) $(RMDIR) enc/jis enc/trans enc 2> $(NULL) || $(NULLCMD)
+
+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)
+
+clean-platform:
+	$(Q) $(RM) $(PLATFORM_D)
+	-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || $(NULLCMD)
+
+RUBYSPEC_CAPIEXT = spec/ruby/optional/capi/ext
+clean-spec: PHONY
+	-$(Q) $(RM) $(RUBYSPEC_CAPIEXT)/*.$(OBJEXT) $(RUBYSPEC_CAPIEXT)/*.$(DLEXT)
+	-$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD)
+
+check: main test test-tool test-all test-spec
+	$(ECHO) check succeeded
+	-$(Q) if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && $(GIT) rev-parse > /dev/null 2>&1; then \
+	  set -x; $(GIT) --no-pager log --format=oneline -G "^ *# *include" origin/master..HEAD; \
+	fi
 check-ruby: test test-ruby
 
-btest: miniruby$(EXEEXT) $(TEST_RUNNABLE)-btest
+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) -DRUBY_EXPORT $(INCFLAGS) $(CPPFLAGS) "$(srcdir)/version.c" | \
+	$(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ "$(srcdir)/template/fake.rb.in" \
+		i=- srcdir="$(srcdir)" BASERUBY="$(BASERUBY)"
+
+btest: $(TEST_RUNNABLE)-btest
 no-btest: PHONY
-yes-btest: PHONY
-	$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" $(OPTS)
+yes-btest: fake miniruby$(EXEEXT) PHONY
+	$(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS)
 
-btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-btest-ruby
+btest-ruby: $(TEST_RUNNABLE)-btest-ruby
 no-btest-ruby: PHONY
-yes-btest-ruby: PHONY
-	@$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS)
+yes-btest-ruby: prog PHONY
+	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS) $(BTESTS)
 
-test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-test-sample
-no-test-sample: PHONY
-yes-test-sample: PHONY
-	@$(RUNRUBY) $(srcdir)/tool/rubytest.rb
+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-knownbugs: test-knownbug
-test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) $(TEST_RUNNABLE)-test-knownbug
+test-knownbug: $(TEST_RUNNABLE)-test-knownbug
 no-test-knownbug: PHONY
-yes-test-knownbug: PHONY
-	-$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb
+yes-test-knownbug: prog PHONY
+	-$(exec) $(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
+	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(TOOL_TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest
+no-test-testframework: PHONY
 
-test: test-sample btest-ruby test-knownbug
+test-tool: $(TEST_RUNNABLE)-test-tool
+yes-test-tool: prog PHONY
+	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(TOOL_TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS)
+no-test-tool: PHONY
 
+test-sample: test-basic # backward compatibility for mswin-build
+test-short: btest-ruby test-knownbug test-basic
+test: test-short
+
+# $ 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: PHONY
-	$(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTS)
+yes-test-all: programs PHONY
+	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
 TESTS_BUILD = mkmf
 no-test-all: PHONY
-	$(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTS_BUILD)
+	$(gnumake_recursive)$(MINIRUBY) -I"$(srcdir)/lib" "$(TESTSDIR)/runner.rb" $(TESTOPTS) $(TESTS_BUILD)
+
+test-almost: test-all
+yes-test-almost: yes-test-all
+no-test-almost: no-test-all
 
 test-ruby: $(TEST_RUNNABLE)-test-ruby
 no-test-ruby: PHONY
-yes-test-ruby: PHONY
-	$(RUNRUBY) "$(srcdir)/test/runner.rb" ruby
+yes-test-ruby: prog encs PHONY
+	$(gnumake_recursive)$(RUNRUBY) "$(TESTSDIR)/runner.rb" $(TEST_EXCLUDES) $(TESTOPTS) -- ruby -ext-
 
 extconf: $(PREP)
 	$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
-$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP)
-	@$(MINIRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
+$(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 \
+		-arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \
 		-install_name=$(RUBY_INSTALL_NAME) \
-		-so_name=$(RUBY_SO_NAME) rbconfig.rb
+		-so_name=$(RUBY_SO_NAME) \
+		-unicode_version=$(UNICODE_VERSION) \
+		-unicode_emoji_version=$(UNICODE_EMOJI_VERSION) \
+	> rbconfig.tmp
+	$(IFCHANGE) "--timestamp=$@" rbconfig.rb rbconfig.tmp
 
-test-rubyspec-precheck:
+test-rubyspec: test-spec
+yes-test-rubyspec: yes-test-spec
 
-test-rubyspec: test-rubyspec-precheck
-	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
+test-spec-precheck: $(arch)-fake.rb programs
+
+test-spec: $(TEST_RUNNABLE)-test-spec
+yes-test-spec: test-spec-precheck
+	$(gnumake_recursive)$(Q) \
+	$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) $(SPECOPTS)
+no-test-spec:
+
+RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
+runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY
+	$(Q) $(MINIRUBY) $(srcdir)/tool/mkrunnable.rb -v $(EXTOUT)
+yes-runnable: PHONY
 
 encs: enc trans
-encs enc trans: showflags $(ENC_MK) $(LIBRUBY) $(PREP)
+libencs: libenc libtrans
+encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP) PHONY
 	$(ECHO) making $@
-	$(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) $@
+	$(Q) $(MAKE) $(MAKE_ENC) $@
 
-enc: {$(VPATH)}encdb.h
-trans: {$(VPATH)}transdb.h
 
+libenc enc: {$(VPATH)}encdb.h
+libtrans trans: {$(VPATH)}transdb.h
+
+# Use MINIRUBY which loads fake.rb for cross compiling
 $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
-	$(srcdir)/lib/mkmf.rb $(RBCONFIG)
+	$(srcdir)/enc/encinit.c.erb $(srcdir)/lib/mkmf.rb $(RBCONFIG) fake
 	$(ECHO) generating $@
-	$(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" $@ $(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-extout
+.PHONY: clean clean-ext clean-local clean-enc clean-golf clean-rdoc clean-html clean-extout
 .PHONY: distclean distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
 .PHONY: realclean realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
-.PHONY: check test test-all btest btest-ruby test-sample test-knownbug
-.PHONY: run runruby parse benchmark benchmark-each tbench gdb gdb-ruby
-.PHONY: update-mspec update-rubyspec test-rubyspec
+.PHONY: exam check test test-short test-all btest btest-ruby test-basic test-knownbug
+.PHONY: run runruby parse benchmark gdb gdb-ruby
+.PHONY: update-mspec update-rubyspec test-rubyspec test-spec
+.PHONY: touch-unicode-files
 
 PHONY:
 
-{$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed
-parse.h {$(VPATH)}parse.h: {$(VPATH)}parse.c
+{$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed {$(VPATH)}id.h
+{$(VPATH)}parse.h: {$(VPATH)}parse.c
 
 {$(srcdir)}.y.c:
-	$(YACC) -d $(YFLAGS) -o y.tab.c $(SRC_FILE)
-	sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
-	@$(MV) $@.new $@
-	sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse\.y/d" y.tab.h > $(@:.c=.h).new
-	@$(IFCHANGE) $(@:.c=.h) $(@:.c=.h).new
-	@$(RM) y.tab.c y.tab.h
+	$(ECHO) generating $@
+	$(Q)$(BASERUBY) $(srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(SRC_FILE) > parse.tmp.y
+	$(Q)$(BASERUBY) $(srcdir)/tool/pure_parser.rb parse.tmp.y $(YACC)
+	$(Q)$(YACC) -d $(YFLAGS) -o y.tab.c parse.tmp.y
+	$(Q)$(RM) parse.tmp.y
+	$(Q)sed -f $(srcdir)/tool/ytab.sed -e "/^#/s|parse\.tmp\.[iy]|$(SRC_FILE)|" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
+	$(Q)$(MV) $@.new $@
+	$(Q)sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse.*\.y/d" y.tab.h > $(@:.c=.h)
+	$(Q)$(RM) y.tab.c y.tab.h
+
+$(PLATFORM_D):
+	$(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D)
+	@$(NULLCMD) > $@
+
+exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time miniruby$(EXEEXT) {$(VPATH)}config.h
+	$(Q) $(CC) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(@F) $(COUTFLAG)ruby-runner.$(OBJEXT) -c $(CSRCFLAG)$(srcdir)/ruby-runner.c
+	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) $(OUTFLAG)$@ ruby-runner.$(OBJEXT) $(LIBS)
+	$(Q) $(POSTLINK)
+	$(Q) ./miniruby$(EXEEXT) \
+	    -e 'prog, dest, inst = ARGV; dest += "/ruby"' \
+	    -e 'exit unless prog==inst' \
+	    -e 'unless prog=="ruby"' \
+	    -e '  begin File.unlink(dest); rescue Errno::ENOENT; end' \
+	    -e '  File.symlink(prog, dest)' \
+	    -e 'end' \
+	$(@F) $(@D) $(RUBY_INSTALL_NAME)$(EXEEXT)
+
+exe/.time:
+	$(Q) $(MAKEDIRS) $(@D)
+	@$(NULLCMD) > $@
+
+$(BUILTIN_ENCOBJS) $(BUILTIN_TRANSOBJS): $(ENC_TRANS_D)
+
+$(ENC_TRANS_D):
+	$(Q) $(MAKEDIRS) enc/trans $(@D)
+	@$(NULLCMD) > $@
+
+$(TIMESTAMPDIR)/$(arch)/.time:
+	$(Q)$(MAKEDIRS) $(@D) $(EXTOUT)/$(arch)
+	@$(NULLCMD) > $@
+
+$(TIMESTAMPDIR)/.RUBYCOMMONDIR.time:
+	$(Q)$(MAKEDIRS) $(@D) $(RUBYCOMMONDIR)
+	@$(NULLCMD) > $@
+
+###
+CCAN_DIR = {$(VPATH)}ccan
+
+RUBY_H_INCLUDES    = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \
+		     {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
+		     {$(VPATH)}assert.h {$(VPATH)}subst.h
+
+###
 
 acosh.$(OBJEXT): {$(VPATH)}acosh.c
 alloca.$(OBJEXT): {$(VPATH)}alloca.c {$(VPATH)}config.h
-crypt.$(OBJEXT): {$(VPATH)}crypt.c
+crypt.$(OBJEXT): {$(VPATH)}crypt.c {$(VPATH)}crypt.h {$(VPATH)}missing/des_tables.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
 strchr.$(OBJEXT): {$(VPATH)}strchr.c
 strdup.$(OBJEXT): {$(VPATH)}strdup.c
 strerror.$(OBJEXT): {$(VPATH)}strerror.c
+strlcat.$(OBJEXT): {$(VPATH)}strlcat.c
+strlcpy.$(OBJEXT): {$(VPATH)}strlcpy.c
 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 $<
 
-win32.$(OBJEXT): {$(VPATH)}win32.c $(RUBY_H_INCLUDES)
+.coroutine_obj $(COROUTINE_OBJ): \
+	{$(VPATH)}$(COROUTINE_SRC) \
+	$(COROUTINE_H:/Context.h=/.time)
+$(COROUTINE_H:/Context.h=/.time):
+	$(Q) $(MAKEDIRS) $(@D)
+	@$(NULLCMD) > $@
 
 ###
 
-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
-ID_H_INCLUDES      = {$(VPATH)}id.h {$(VPATH)}vm_opts.h
-VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}thread_$(THREAD_MODEL).h \
-		     {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}atomic.h \
-		     $(ID_H_INCLUDES)
-
-array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
-  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h
-bignum.$(OBJEXT): {$(VPATH)}bignum.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
-  {$(VPATH)}internal.h
-class.$(OBJEXT): {$(VPATH)}class.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h \
-  {$(VPATH)}constant.h
-compar.$(OBJEXT): {$(VPATH)}compar.c $(RUBY_H_INCLUDES)
-complex.$(OBJEXT): {$(VPATH)}complex.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}internal.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
-dmyencoding.$(OBJEXT): {$(VPATH)}dmyencoding.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}regenc.h {$(VPATH)}util.h $(ENCODING_H_INCLUDES) \
-  {$(VPATH)}encoding.c {$(VPATH)}internal.h
-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 $(ID_H_INCLUDES)
-enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES)
-error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}known_errors.inc \
-  $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) $(ENCODING_H_INCLUDES) \
-  {$(VPATH)}debug.h \
-  {$(VPATH)}internal.h
-eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_intern.h {$(VPATH)}vm.h \
-  $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_error.c \
-  {$(VPATH)}eval_jump.c {$(VPATH)}debug.h {$(VPATH)}gc.h {$(VPATH)}iseq.h \
-  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h
-load.$(OBJEXT): {$(VPATH)}load.c {$(VPATH)}eval_intern.h \
-  {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) \
-  {$(VPATH)}dln.h {$(VPATH)}debug.h \
-  {$(VPATH)}internal.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)}debug.h {$(VPATH)}internal.h {$(VPATH)}constant.h
-hash.$(OBJEXT): {$(VPATH)}hash.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
-  $(ENCODING_H_INCLUDES)
-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
-main.$(OBJEXT): {$(VPATH)}main.c $(RUBY_H_INCLUDES) {$(VPATH)}debug.h \
-  {$(VPATH)}node.h
-marshal.$(OBJEXT): {$(VPATH)}marshal.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
-  $(ENCODING_H_INCLUDES) {$(VPATH)}util.h {$(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)}debug.h
-numeric.$(OBJEXT): {$(VPATH)}numeric.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}util.h $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h
-object.$(OBJEXT): {$(VPATH)}object.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
-  {$(VPATH)}internal.h {$(VPATH)}constant.h
-pack.$(OBJEXT): {$(VPATH)}pack.c $(RUBY_H_INCLUDES) {$(VPATH)}encoding.h \
-  {$(VPATH)}oniguruma.h
-parse.$(OBJEXT): {$(VPATH)}parse.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
-  $(ENCODING_H_INCLUDES) $(ID_H_INCLUDES) {$(VPATH)}regenc.h \
-  {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c \
-  {$(VPATH)}defs/keywords {$(VPATH)}id.c {$(VPATH)}parse.y \
-  {$(VPATH)}parse.h \
-  {$(VPATH)}internal.h
-proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
-  $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
-  {$(VPATH)}debug.h {$(VPATH)}internal.h {$(VPATH)}iseq.h
-process.$(OBJEXT): {$(VPATH)}process.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}util.h {$(VPATH)}io.h $(ENCODING_H_INCLUDES) {$(VPATH)}dln.h \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h
-random.$(OBJEXT): {$(VPATH)}random.c $(RUBY_H_INCLUDES)
-range.$(OBJEXT): {$(VPATH)}range.c $(RUBY_H_INCLUDES) \
-  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h
-rational.$(OBJEXT): {$(VPATH)}rational.c $(RUBY_H_INCLUDES) {$(VPATH)}internal.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)}debug.h {$(VPATH)}internal.h
-safe.$(OBJEXT): {$(VPATH)}safe.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
-signal.$(OBJEXT): {$(VPATH)}signal.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
-sprintf.$(OBJEXT): {$(VPATH)}sprintf.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
-  {$(VPATH)}regex.h {$(VPATH)}vsnprintf.c $(ENCODING_H_INCLUDES)
-st.$(OBJEXT): {$(VPATH)}st.c $(RUBY_H_INCLUDES)
-strftime.$(OBJEXT): {$(VPATH)}strftime.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}timev.h
-string.$(OBJEXT): {$(VPATH)}string.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
-  {$(VPATH)}regex.h $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h
-struct.$(OBJEXT): {$(VPATH)}struct.c $(RUBY_H_INCLUDES) {$(VPATH)}internal.h
-thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \
-  $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
-  {$(VPATH)}debug.h {$(VPATH)}thread_$(THREAD_MODEL).c $(ENCODING_H_INCLUDES) \
-  {$(VPATH)}internal.h {$(VPATH)}io.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)}debug.h {$(VPATH)}internal.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)}oniguruma.h {$(VPATH)}internal.h {$(VPATH)}constant.h
-version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}version.h $(srcdir)/version.h $(srcdir)/revision.h {$(VPATH)}config.h
-dmyversion.$(OBJEXT): {$(VPATH)}dmyversion.c version.$(OBJEXT)
-
-compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
-  $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
-  {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc {$(VPATH)}debug.h \
-  {$(VPATH)}optunifs.inc {$(VPATH)}opt_sc.inc {$(VPATH)}insns.inc \
-  {$(VPATH)}internal.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)}debug.h {$(VPATH)}internal.h
-vm.$(OBJEXT): {$(VPATH)}vm.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
-  {$(VPATH)}eval_intern.h $(RUBY_H_INCLUDES) $(ENCODING_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}vm_method.c {$(VPATH)}vm_eval.c \
-  {$(VPATH)}vm_insnhelper.c {$(VPATH)}vm_insnhelper.h {$(VPATH)}vm_exec.c \
-  {$(VPATH)}vm_exec.h {$(VPATH)}insns.def {$(VPATH)}vmtc.inc \
-  {$(VPATH)}vm.inc {$(VPATH)}insns.inc {$(VPATH)}debug.h \
-  {$(VPATH)}internal.h {$(VPATH)}vm.h {$(VPATH)}constant.h
-vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}addr2line.h
-debug.$(OBJEXT): {$(VPATH)}debug.c $(RUBY_H_INCLUDES) \
-  $(ENCODING_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_intern.h \
-  {$(VPATH)}util.h {$(VPATH)}debug.h
-id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) $(ID_H_INCLUDES)
-miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h
-prelude.$(OBJEXT): {$(VPATH)}prelude.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h
-golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c $(RUBY_H_INCLUDES) \
-  $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h
-goruby.$(OBJEXT): {$(VPATH)}goruby.c {$(VPATH)}main.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}debug.h {$(VPATH)}node.h
-
-ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}missing.h
-us_ascii.$(OBJEXT): {$(VPATH)}us_ascii.c {$(VPATH)}regenc.h \
-  {$(VPATH)}config.h {$(VPATH)}oniguruma.h {$(VPATH)}missing.h
-unicode.$(OBJEXT): {$(VPATH)}unicode.c {$(VPATH)}regint.h \
-  {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}regenc.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}st.h {$(VPATH)}ruby.h \
-  {$(VPATH)}missing.h {$(VPATH)}intern.h {$(VPATH)}enc/unicode/name2ctype.h \
-  {$(VPATH)}subst.h
-
-utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}missing.h
-
-newline.c: $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb
-	$(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans
-newline.$(OBJEXT): {$(VPATH)}newline.c {$(VPATH)}defines.h \
-  {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
-  {$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}subst.h
+# dependencies for generated C sources.
+parse.$(OBJEXT): {$(VPATH)}parse.c
+miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c
 
-$(OBJS):  {$(VPATH)}config.h {$(VPATH)}missing.h
+# dependencies for optional sources.
+compile.$(OBJEXT): {$(VPATH)}opt_sc.inc {$(VPATH)}optunifs.inc
 
-INSNS2VMOPT = --srcdir="$(srcdir)"
+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) \
+  {$(VPATH)}vm.h $(PLATFORM_D)
+win32/file.$(OBJEXT): {$(VPATH)}win32/file.c {$(VPATH)}win32/file.h \
+  $(RUBY_H_INCLUDES) $(PLATFORM_D)
 
-{$(VPATH)}minsns.inc: $(srcdir)/template/minsns.inc.tmpl
+$(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)
 
-{$(VPATH)}opt_sc.inc: $(srcdir)/template/opt_sc.inc.tmpl
+verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb
+	$(ECHO) creating $@
+	$(Q) $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl
 
-{$(VPATH)}optinsn.inc: $(srcdir)/template/optinsn.inc.tmpl
+ruby-glommed.$(OBJEXT): $(OBJS)
 
-{$(VPATH)}optunifs.inc: $(srcdir)/template/optunifs.inc.tmpl
+$(OBJS):  {$(VPATH)}config.h {$(VPATH)}missing.h
 
-{$(VPATH)}insns.inc: $(srcdir)/template/insns.inc.tmpl
+INSNS2VMOPT = --srcdir="$(srcdir)"
 
-{$(VPATH)}insns_info.inc: $(srcdir)/template/insns_info.inc.tmpl
+srcs_vpath = {$(VPATH)}
+
+inc_common_headers = $(srcdir)/tool/ruby_vm/views/_copyright.erb $(srcdir)/tool/ruby_vm/views/_notice.erb
+$(srcs_vpath)opt_sc.inc: $(srcdir)/tool/ruby_vm/views/opt_sc.inc.erb $(inc_common_headers)
+$(srcs_vpath)optinsn.inc: $(srcdir)/tool/ruby_vm/views/optinsn.inc.erb $(inc_common_headers)
+$(srcs_vpath)optunifs.inc: $(srcdir)/tool/ruby_vm/views/optunifs.inc.erb $(inc_common_headers)
+$(srcs_vpath)insns.inc: $(srcdir)/tool/ruby_vm/views/insns.inc.erb $(inc_common_headers)
+$(srcs_vpath)insns_info.inc: $(srcdir)/tool/ruby_vm/views/insns_info.inc.erb $(inc_common_headers) \
+  $(srcdir)/tool/ruby_vm/views/_insn_type_chars.erb $(srcdir)/tool/ruby_vm/views/_insn_name_info.erb \
+  $(srcdir)/tool/ruby_vm/views/_insn_len_info.erb $(srcdir)/tool/ruby_vm/views/_insn_operand_info.erb \
+  $(srcdir)/tool/ruby_vm/views/_attributes.erb $(srcdir)/tool/ruby_vm/views/_comptime_insn_stack_increase.erb \
+  $(srcdir)/tool/ruby_vm/views/_insn_sp_pc_dependency.erb
+$(srcs_vpath)vmtc.inc: $(srcdir)/tool/ruby_vm/views/vmtc.inc.erb $(inc_common_headers)
+$(srcs_vpath)vm.inc: $(srcdir)/tool/ruby_vm/views/vm.inc.erb $(inc_common_headers) \
+  $(srcdir)/tool/ruby_vm/views/_insn_entry.erb $(srcdir)/tool/ruby_vm/views/_trace_instruction.erb
+$(srcs_vpath)mjit_compile.inc: $(srcdir)/tool/ruby_vm/views/mjit_compile.inc.erb $(inc_common_headers) \
+  $(srcdir)/tool/ruby_vm/views/_mjit_compile_insn.erb $(srcdir)/tool/ruby_vm/views/_mjit_compile_send.erb \
+  $(srcdir)/tool/ruby_vm/views/_mjit_compile_ivar.erb \
+  $(srcdir)/tool/ruby_vm/views/_mjit_compile_insn_body.erb $(srcdir)/tool/ruby_vm/views/_mjit_compile_pc_and_sp.erb
+
+BUILTIN_RB_SRCS = \
+		$(srcdir)/ast.rb \
+		$(srcdir)/gc.rb \
+		$(srcdir)/io.rb \
+		$(srcdir)/pack.rb \
+		$(srcdir)/trace_point.rb \
+		$(srcdir)/warning.rb \
+		$(srcdir)/prelude.rb \
+		$(srcdir)/gem_prelude.rb \
+		$(empty)
+BUILTIN_RB_INCS = $(BUILTIN_RB_SRCS:.rb=.rbinc)
+
+common-srcs: $(srcs_vpath)parse.c $(srcs_vpath)lex.c $(srcs_vpath)enc/trans/newline.c $(srcs_vpath)id.c \
+	     $(BUILTIN_RB_INCS) \
+	     srcs-lib srcs-ext incs
+
+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/rbconfig/sizeof/limits.c \
+	   $(srcdir)/ext/socket/constdefs.c \
+	   $(srcdir)/ext/etc/constdefs.h \
+	   # EXT_SRCS
 
-{$(VPATH)}vmtc.inc: $(srcdir)/template/vmtc.inc.tmpl
+srcs-ext: $(EXT_SRCS)
+realclean-srcs-ext::
+	$(Q)$(RM) $(EXT_SRCS)
 
-{$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl
+EXTRA_SRCS = $(srcdir)/ext/json/parser/parser.c \
+	     $(srcdir)/ext/date/zonetab.h \
+	     $(empty)
 
-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c srcs-ext srcs-enc
+srcs-extra: $(EXTRA_SRCS)
+realclean-srcs-extra::
+	$(Q)$(RM) $(EXTRA_SRCS)
 
-EXT_SRCS = $(srcdir)/ext/ripper/ripper.c $(srcdir)/ext/json/parser/parser.c
+LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb
 
-srcs-ext: $(EXT_SRCS)
+srcs-lib: $(LIB_SRCS)
 
 srcs-enc: $(ENC_MK)
 	$(ECHO) making srcs under enc
-	$(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
+	$(Q) $(MAKE) $(MAKE_ENC) srcs
 
-incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \
-      $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h
+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 \
+      {$(VPATH)}id.h {$(VPATH)}probes.dmyh
 
 insns: $(INSNS)
 
-id.h: parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl
+id.h: $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl $(srcdir)/defs/id.def
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
-		$(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h
+		$(srcdir)/template/id.h.tmpl
 
-node_name.inc: {$(VPATH)}node.h
+id.c: $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.c.tmpl $(srcdir)/defs/id.def
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $? > $@
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
+		$(srcdir)/template/id.c.tmpl
+
+node_name.inc: $(srcdir)/tool/node_name.rb $(srcdir)/node.h
+	$(ECHO) generating $@
+	$(Q) $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $(srcdir)/node.h > $@
 
 encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
 	$(ECHO) generating $@
@@ -819,78 +1073,144 @@ transdb.h: $(PREP) srcs-enc $(srcdir)/tool/generic_erb.rb $(srcdir)/template/tra
 	$(ECHO) generating $@
 	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans
 
+enc/encinit.c: $(ENC_MK) $(srcdir)/enc/encinit.c.erb
+
 known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
 
-miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
+vm_call_iseq_optimized.inc: $(srcdir)/tool/mk_call_iseq_optimized.rb
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
+	$(Q) $(BASERUBY) $(srcdir)/tool/mk_call_iseq_optimized.rb > $@
 
-prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) \
-	   $(srcdir)/lib/rubygems/defaults.rb $(srcdir)/lib/rubygems/custom_require.rb \
-	   $(PRELUDE_SCRIPTS) $(PREP)
+$(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(BUILTIN_RB_SRCS)
 	$(ECHO) generating $@
-	$(Q) $(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -o $@ \
+		$(srcdir)/template/prelude.c.tmpl $(BUILTIN_RB_SRCS)
 
-golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
+$(GOLF_PRELUDE_C): $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb
 	$(ECHO) generating $@
-	$(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
+		$(srcdir)/template/prelude.c.tmpl golf_prelude.rb
+
+MAINCPPFLAGS = $(ENABLE_DEBUG_ENV:yes=-DRUBY_DEBUG_ENV=1)
+
+$(MAINOBJ): $(srcdir)/$(MAINSRC)
+	$(ECHO) compiling $(srcdir)/$(MAINSRC)
+	$(Q) $(CC) $(MAINCPPFLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(srcdir)/$(MAINSRC)
+
+{$(VPATH)}probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
+
+probes.dmyh:
+	$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@
+
+probes.h: {$(VPATH)}probes.$(DTRACE_EXT)
 
 prereq: incs srcs preludes PHONY
 
 preludes: {$(VPATH)}miniprelude.c
 preludes: {$(srcdir)}golf_prelude.c
 
+{$(srcdir)}.rb.rbinc:
+	$(ECHO) making $@
+	$(Q) $(BASERUBY) $(srcdir)/tool/mk_builtin_loader.rb $<
+
+builtin_binary.inc: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/tool/mk_builtin_binary.rb
+	$(Q) $(MINIRUBY) $(srcdir)/tool/mk_builtin_binary.rb --cross=$(CROSS_COMPILING)
+
+$(BUILTIN_RB_INCS): $(top_srcdir)/tool/mk_builtin_loader.rb
+
 $(srcdir)/revision.h:
-	@exit > $@
+	$(Q)$(gnumake:yes=#) $(RM) $(@F)
+	$(Q)$(gnumake:yes=#) $(NULLCMD) > $@ || $(NULLCMD) > $(@F)
+
+revision.tmp::
+	$(Q) $(NULLCMD) > $@
+revision.$(HAVE_BASERUBY:yes=tmp):: $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
+	$(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb -q --revision.h --srcdir="$(srcdir)" > $@
+
+$(REVISION_H): revision.tmp
+	$(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp
+
+$(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y id.h $(srcdir)/ext/ripper/depend
+	$(ECHO) generating $@
+	$(Q) VPATH=$${PWD-`pwd`} && $(CHDIR) $(@D) && \
+	sed -e 's/{\$$([^(){}]*)[^{}]*}//g' -e /AUTOGENERATED/q depend | \
+	$(exec) $(MAKE) -f - $(mflags) \
+		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \
+		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
+
+$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/prereq.mk
+	$(ECHO) generating $@
+	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
 
-$(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
-	@-$(BASERUBY) $(srcdir)/tool/file2lastrev.rb --revision.h "$(srcdir)" > "$(srcdir)/revision.tmp"
-	@$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" "$(srcdir)/revision.tmp"
+$(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list $(srcdir)/ext/date/prereq.mk
+	$(ECHO) generating $@
+	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. BASERUBY="$(BASERUBY)"
 
-$(srcdir)/ext/ripper/ripper.c: parse.y
+$(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
+		$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.ac
 	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. RUBY=$(BASERUBY)
+	$(Q) $(CHDIR) $(@D) && \
+	sed '/AUTOGENERATED/q' depend | \
+	$(exec) $(MAKE) -f - $(mflags) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" $(@F)
 
-$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
+$(srcdir)/ext/rbconfig/sizeof/limits.c: $(srcdir)/ext/rbconfig/sizeof/depend \
+		$(srcdir)/tool/generic_erb.rb $(srcdir)/template/limits.c.tmpl
 	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=.
+	$(Q) $(CHDIR) $(@D) && \
+	sed '/AUTOGENERATED/q' depend | \
+	$(exec) $(MAKE) -f - $(mflags) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" $(@F)
+
+$(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)"
+
+$(srcdir)/ext/etc/constdefs.h: $(srcdir)/ext/etc/depend
+	$(Q) $(CHDIR) $(@D) && \
+	sed '/AUTOGENERATED/q' depend | \
+	$(exec) $(MAKE) -f - $(mflags) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)"
 
 ##
 
-run: miniruby$(EXEEXT) PHONY
-	$(MINIRUBY) $(TESTRUN_SCRIPT) $(RUNOPT)
+run: fake miniruby$(EXEEXT) PHONY
+	$(BTESTRUBY) $(TESTRUN_SCRIPT) $(RUNOPT)
 
 runruby: $(PROGRAM) PHONY
 	$(RUNRUBY) $(TESTRUN_SCRIPT)
 
-parse: miniruby$(EXEEXT) PHONY
-	$(MINIRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT)
+parse: fake miniruby$(EXEEXT) PHONY
+	$(BTESTRUBY) --dump=parsetree_with_comment,insns $(TESTRUN_SCRIPT)
 
-COMPARE_RUBY = $(BASERUBY)
-ITEM = 
-OPTS = 
-
-benchmark: $(PROGRAM) PHONY
-	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
-	            --pattern='bm_' --directory=$(srcdir)/benchmark $(OPTS)
+bisect: PHONY
+	$(srcdir)/tool/bisect.sh miniruby $(srcdir)
 
-benchmark-each: $(PROGRAM) PHONY
-	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
-	            --pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS)
+bisect-ruby: PHONY
+	$(srcdir)/tool/bisect.sh ruby $(srcdir)
 
-tbench: $(PROGRAM) PHONY
-	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
-	            --pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS)
+COMPARE_RUBY = $(BASERUBY)
+BENCH_RUBY = $(RUNRUBY)
+ITEM =
+ARGS = $$(find $(srcdir)/benchmark -maxdepth 1 -name '$(ITEM)' -o -name '*$(ITEM)*.yml' -o -name '*$(ITEM)*.rb' | sort)
+OPTS =
+
+# See benchmark/README.md for details.
+benchmark: miniruby$(EXEEXT) update-benchmark-driver PHONY
+	$(BASERUBY) -rrubygems -I$(srcdir)/benchmark/lib $(srcdir)/benchmark/benchmark-driver/exe/benchmark-driver \
+	            --executables="compare-ruby::$(COMPARE_RUBY) -I$(EXTOUT)/common --disable-gem" \
+	            --executables="built-ruby::$(BENCH_RUBY) --disable-gem" \
+	            $(ARGS) $(OPTS)
 
 run.gdb:
-	echo b ruby_debug_breakpoint           > run.gdb
+	echo set breakpoint pending on         > run.gdb
+	echo b ruby_debug_breakpoint          >> run.gdb
 	echo '# handle SIGINT nostop'         >> run.gdb
 	echo '# handle SIGPIPE nostop'        >> run.gdb
 	echo '# b rb_longjmp'                 >> run.gdb
@@ -907,62 +1227,2057 @@ gdb: miniruby$(EXEEXT) run.gdb PHONY
 	gdb -x run.gdb --quiet --args $(MINIRUBY) $(TESTRUN_SCRIPT)
 
 gdb-ruby: $(PROGRAM) run.gdb PHONY
-	gdb -x run.gdb --quiet --args $(PROGRAM) $(TESTRUN_SCRIPT)
+	$(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT)
+
+LLDB_INIT = command script import -r $(srcdir)/misc/lldb_cruby.py
 
+lldb: miniruby$(EXEEXT) PHONY
+	lldb -o '$(LLDB_INIT)' miniruby$(EXEEXT) -- $(TESTRUN_SCRIPT)
+
+lldb-ruby: $(PROGRAM) PHONY
+	lldb $(enable_shared:yes=-o 'target modules add ${LIBRUBY_SO}') -o '$(LLDB_INIT)' $(PROGRAM) -- $(TESTRUN_SCRIPT)
+
+DISTPKGS = gzip,zip,all
 dist:
-	$(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME)
+	$(BASERUBY) $(srcdir)/tool/make-snapshot \
+	-srcdir=$(srcdir) -packages=$(DISTPKGS) \
+	-unicode-version=$(UNICODE_VERSION) \
+	tmp $(RELNAME)
+
+up:: update-remote
+
+up::
+	-$(Q)$(MAKE) $(mflags) Q=$(Q) REVISION_FORCE=PHONY "$(REVISION_H)"
 
 up::
-	-@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"
+	-$(Q)$(MAKE) $(mflags) Q=$(Q) after-update
+
+yes::
+no::
+
+after-update:: extract-extlibs
+after-update:: extract-gems
+
+update-remote:: update-src update-download
+update-download:: $(ALWAYS_UPDATE_UNICODE:yes=update-unicode)
+update-download:: update-gems
+update-download:: download-extlibs
+
+update-mspec:
+update-rubyspec:
+
+update-config_files: PHONY
+	$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb -d tool --cache-dir=$(CACHE_DIR) -e gnu \
+	    config.guess config.sub
+
+refresh-gems: update-bundled_gems update-gems extract-gems
+
+update-gems: PHONY
+	$(ECHO) Downloading bundled gem files...
+	$(Q) $(BASERUBY) -C "$(srcdir)" \
+	    -I./tool -rdownloader -answ \
+	    -e 'gem, ver = *$$F' \
+	    -e 'old = Dir.glob("gems/#{gem}-*.gem")' \
+	    -e 'gem = "#{gem}-#{ver}.gem"' \
+	    -e 'Downloader::RubyGems.download(gem, "gems", nil) and' \
+	    -e '(old.delete("gems/#{gem}"); !old.empty?) and' \
+	    -e 'File.unlink(*old) and' \
+	    -e 'FileUtils.rm_rf(old.map{'"|n|"'n.chomp(".gem")})' \
+	    gems/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,src), = Gem::SpecFetcher.fetcher.detect(:latest) {'"|s|" \
+	    -e   's.platform=="ruby"&&s.name==$$F[0]' \
+	    -e '}' \
+	    -e 'gem = src.fetch_spec(gem)' \
+	    -e 'uri = gem.metadata["source_code_uri"]||gem.homepage' \
+	    -e 'uri = uri.sub(%r[\Ahttps://github\.com/[^/]+/[^/]+\K/tree/.*], "")' \
+	    -e '$$_ = [gem.name, gem.version, uri].join(" ")' \
+	     "$(srcdir)/gems/bundled_gems" | \
+	"$(IFCHANGE)" "$(srcdir)/gems/bundled_gems" -
+
+test-bundled-gems-precheck: $(arch)-fake.rb programs
+
+test-bundled-gems-fetch: $(PREP)
+	$(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb src bundled_gems
+
+test-bundled-gems-prepare: test-bundled-gems-precheck test-bundled-gems-fetch
+	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
+		--install-dir .bundle --conservative "bundler" "minitest:~> 5" 'test-unit' 'rake' 'hoe' 'yard' 'pry' 'packnga'
+
+PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
+test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems
+yes-test-bundled-gems: test-bundled-gems-run
+no-test-bundled-gems:
+
+# Override this to allow failure of specific gems on CI
+# TEST_BUNDLED_GEMS_ALLOW_FAILURES =
+
+test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS)
+	$(Q) $(XRUBY) $(srcdir)/tool/test-bundled-gems.rb
+
+test-bundler-precheck: $(arch)-fake.rb programs
+
+yes-test-bundler-prepare: test-bundler-precheck
+	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
+		--install-dir .bundle --conservative "rspec:~> 3.5" "rake:~> 12.0" "parallel_tests:~> 2.29"
+
+RSPECOPTS =
+BUNDLER_SPECS =
+test-bundler: $(TEST_RUNNABLE)-test-bundler
+yes-test-bundler: yes-test-bundler-prepare
+	$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \
+		--require spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
+no-test-bundler:
+
+PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log
+test-bundler-parallel: $(TEST_RUNNABLE)-test-bundler-parallel
+yes-test-bundler-parallel: yes-test-bundler-prepare
+	$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/parallel_rspec \
+		-o "--require $(srcdir)/spec/bundler/spec_helper --require $(srcdir)/spec/bundler/support/parallel" \
+		$(PARALLELRSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
+no-test-bundler-parallel:
+
+GEM = up
+sync-default-gems:
+	$(Q) $(XRUBY) -C "$(srcdir)" tool/sync_default_gems.rb $(GEM)
+
+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 \
+		$(empty)
+
+UNICODE_AUXILIARY_FILES =  \
+		$(UNICODE_SRC_DATA_DIR)/auxiliary/GraphemeBreakProperty.txt \
+		$(UNICODE_SRC_DATA_DIR)/auxiliary/GraphemeBreakTest.txt \
+		$(empty)
+
+UNICODE_EMOJI_FILES = \
+		$(UNICODE_SRC_EMOJI_DATA_DIR)/emoji-data.txt \
+		$(UNICODE_SRC_EMOJI_DATA_DIR)/emoji-sequences.txt \
+		$(UNICODE_SRC_EMOJI_DATA_DIR)/emoji-test.txt \
+		$(UNICODE_SRC_EMOJI_DATA_DIR)/emoji-variation-sequences.txt \
+		$(UNICODE_SRC_EMOJI_DATA_DIR)/emoji-zwj-sequences.txt \
+		$(empty)
+
+update-unicode: $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES) \
+		$(UNICODE_AUXILIARY_FILES) $(UNICODE_EMOJI_FILES)
+
+CACHE_DIR = $(srcdir)/.downloaded-cache
+UNICODE_DOWNLOAD = \
+	$(BASERUBY) $(srcdir)/tool/downloader.rb \
+	    --cache-dir=$(CACHE_DIR) \
+	    --unicode-beta $(UNICODE_BETA) \
+	    -d $(UNICODE_SRC_DATA_DIR) \
+	    -p $(UNICODE_VERSION)/ucd \
+	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
+UNICODE_AUXILIARY_DOWNLOAD = \
+	$(BASERUBY) $(srcdir)/tool/downloader.rb \
+	    --cache-dir=$(CACHE_DIR) \
+	    --unicode-beta $(UNICODE_BETA) \
+	    -d $(UNICODE_SRC_DATA_DIR)/auxiliary \
+	    -p $(UNICODE_VERSION)/ucd/auxiliary \
+	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
+UNICODE_EMOJI_DOWNLOAD = \
+	$(BASERUBY) $(srcdir)/tool/downloader.rb \
+	    --cache-dir=$(CACHE_DIR) \
+	    --unicode-beta $(UNICODE_BETA) \
+	    -d $(UNICODE_SRC_EMOJI_DATA_DIR) \
+	    -p emoji/$(UNICODE_EMOJI_VERSION) \
+	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
+
+$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES): update-unicode-files
+update-unicode-files:
+	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data and  property files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
+	$(Q) $(UNICODE_DOWNLOAD) $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
+
+$(UNICODE_AUXILIARY_FILES): update-unicode-auxiliary-files
+update-unicode-auxiliary-files:
+	$(ECHO) Downloading Unicode $(UNICODE_VERSION) auxiliary files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/auxiliary"
+	$(Q) $(UNICODE_AUXILIARY_DOWNLOAD) $(UNICODE_AUXILIARY_FILES)
+
+$(UNICODE_EMOJI_FILES): update-unicode-emoji-files
+update-unicode-emoji-files:
+	$(ECHO) Downloading Unicode emoji $(UNICODE_EMOJI_VERSION) files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_EMOJI_DATA_DIR)"
+	$(Q) $(UNICODE_EMOJI_DOWNLOAD) $(UNICODE_EMOJI_FILES)
+
+$(srcdir)/lib/unicode_normalize/$(HAVE_BASERUBY:yes=tables.rb): \
+	$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time
+
+$(UNICODE_SRC_DATA_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=.unicode-tables.time): \
+	$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES) \
+	$(UNICODE_AUXILIARY_FILES) $(UNICODE_EMOJI_FILES)
+
+touch-unicode-files:
+	$(MAKEDIRS) $(UNICODE_SRC_DATA_DIR)
+	touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS)
+
+UNICODE_TABLES_TIMESTAMP = yes
+$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
+		$(srcdir)/template/unicode_norm_gen.tmpl \
+		$(ALWAYS_UPDATE_UNICODE:yes=update-unicode)
+	$(Q) $(MAKE) $(@D)
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
+		-c $(UNICODE_TABLES_TIMESTAMP:yes=-t$@) \
+		-o $(srcdir)/lib/unicode_normalize/tables.rb \
+		-I $(srcdir) \
+		$(srcdir)/template/unicode_norm_gen.tmpl \
+		$(UNICODE_DATA_DIR) lib/unicode_normalize
+
+$(UNICODE_SRC_DATA_DIR):
+	$(gnumake_recursive)$(Q) $(MAKEDIRS) $@
+
+$(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=name2ctype.h): \
+		$(srcdir)/tool/enc-unicode.rb \
+		$(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
+		$(UNICODE_PROPERTY_FILES) \
+		$(UNICODE_EMOJI_FILES)
+
+$(UNICODE_HDR_DIR)/name2ctype.h:
+	$(MAKEDIRS) $(@D)
+	$(BOOTSTRAPRUBY) $(srcdir)/tool/enc-unicode.rb --header \
+		$(UNICODE_SRC_DATA_DIR) $(UNICODE_SRC_EMOJI_DATA_DIR) > $@.new
+	$(MV) $@.new $@
+
+# 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): \
+		$(srcdir)/enc/unicode/case-folding.rb \
+		$(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
+		$(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \
+		$(UNICODE_SRC_DATA_DIR)/CaseFolding.txt
+
+$(UNICODE_HDR_DIR)/casefold.h:
+	$(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
 
 info: info-program info-libruby_a info-libruby_so info-arch
-info-program:
+info-program: PHONY
 	@echo PROGRAM=$(PROGRAM)
-info-libruby_a:
+info-libruby_a: PHONY
 	@echo LIBRUBY_A=$(LIBRUBY_A)
-info-libruby_so:
+info-libruby_so: PHONY
 	@echo LIBRUBY_SO=$(LIBRUBY_SO)
-info-arch:
+info-arch: PHONY
 	@echo arch=$(arch)
 
-change: PHONY
-	$(BASERUBY) -C "$(srcdir)" ./tool/change_maker.rb $(CHANGES) > change.log
+exam: check
 
-love: sudo-precheck up all test install test-all
+love: sudo-precheck up all test exam install
 	@echo love is all you need
 
-sudo-precheck:
+great: exam
+
+yes-test-all no-test-all: sudo-precheck
+
+sudo-precheck: PHONY
 	@$(SUDO) echo > $(NULL)
 
+update-man-date: PHONY
+	-$(Q) $(BASERUBY) -I"$(srcdir)/tool/lib" -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_EXTRA_TASKS = ""
+
 help: PHONY
 	$(MESSAGE_BEGIN) \
 	"                Makefile of Ruby" \
 	"" \
 	"targets:" \
-	"  all (default):   builds all of below" \
-	"  miniruby:        builds only miniruby" \
-	"  encs:            builds encodings" \
-	"  exts:            builds extensions" \
-	"  main:            builds encodings, extensions and ruby" \
-	"  docs:            builds documents" \
-	"  run:             runs test.rb by miniruby" \
-	"  runruby:         runs test.rb by ruby you just built" \
-	"  gdb:             runs test.rb by miniruby under gdb" \
-	"  gdb-ruby:        runs test.rb by ruby under gdb" \
-	"  check:           equals make test test-all" \
-	"  test:            ruby core tests" \
-	"  test-all:        all ruby tests" \
-	"  test-rubyspec:   run RubySpec test suite" \
-	"  update-rubyspec: update local copy of RubySpec" \
-	"  benchmark:       benchmark this ruby and COMPARE_RUBY" \
-	"  install:         install all ruby distributions" \
-	"  install-nodoc:   install without rdoc" \
-	"  install-cross:   install cross compiling staff" \
-	"  clean:           clean for tarball" \
-	"  distclean:       clean for repository" \
-	"  change:          make change log template" \
-	"  golf:            for golfers" \
-	"" \
+	"  all (default):       builds all of below" \
+	"  miniruby:            builds only miniruby" \
+	"  encs:                builds encodings" \
+	"  exts:                builds extensions" \
+	"  main:                builds encodings, extensions and ruby" \
+	"  docs:                builds documents" \
+	"  install-capi:        builds C API documents" \
+	"  run:                 runs test.rb by miniruby" \
+	"  runruby:             runs test.rb by ruby you just built" \
+	"  gdb:                 runs test.rb by miniruby under gdb" \
+	"  gdb-ruby:            runs test.rb by ruby under gdb" \
+	"  check:               equals make test test-tool test-all test-spec" \
+	"  test:                ruby core tests [BTESTS=<bootstraptest files>]" \
+	"  test-all:            all ruby tests [TESTOPTS=-j4 TESTS=<test files>]" \
+	"  test-spec:           run the Ruby spec suite [SPECOPTS=<specs, opts>]" \
+	"  test-bundler:        run the Bundler spec" \
+	"  test-bundled-gems:   run the test suite of bundled gems" \
+	"  test-tool:           tests under the tool/test" \
+	"  update-gems:         download files of the bundled gems" \
+	"  update-bundled_gems: update the latest version of bundled gems" \
+	"  sync-default-gems:   sync default gems from upstream [GEM=<gem_name>]" \
+	"  up:                  update local copy and autogenerated files" \
+	"  benchmark:           benchmark this ruby and COMPARE_RUBY." \
+	"  gcbench:             gc benchmark [GCBENCH_ITEM=<item_name>]" \
+	"  install:             install all ruby distributions" \
+	"  install-nodoc:       install without rdoc" \
+	"  install-cross:       install cross compiling stuff" \
+	"  clean:               clean for tarball" \
+	"  distclean:           clean for repository" \
+	"  golf:                build goruby for golfers" \
+	$(HELP_EXTRA_TASKS) \
 	"see DeveloperHowto for more detail: " \
-	"  http://redmine.ruby-lang.org/wiki/ruby/DeveloperHowto" \
+	"  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)}defines.h
+addr2line.$(OBJEXT): {$(VPATH)}missing.h
+array.$(OBJEXT): $(hdrdir)/ruby.h
+array.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+array.$(OBJEXT): {$(VPATH)}array.c
+array.$(OBJEXT): {$(VPATH)}assert.h
+array.$(OBJEXT): {$(VPATH)}config.h
+array.$(OBJEXT): {$(VPATH)}debug_counter.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)}missing.h
+array.$(OBJEXT): {$(VPATH)}onigmo.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)}transient_heap.h
+array.$(OBJEXT): {$(VPATH)}util.h
+ast.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+ast.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+ast.$(OBJEXT): $(CCAN_DIR)/list/list.h
+ast.$(OBJEXT): $(CCAN_DIR)/str/str.h
+ast.$(OBJEXT): $(hdrdir)/ruby.h
+ast.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+ast.$(OBJEXT): {$(VPATH)}assert.h
+ast.$(OBJEXT): {$(VPATH)}ast.c
+ast.$(OBJEXT): {$(VPATH)}ast.rbinc
+ast.$(OBJEXT): {$(VPATH)}builtin.h
+ast.$(OBJEXT): {$(VPATH)}config.h
+ast.$(OBJEXT): {$(VPATH)}defines.h
+ast.$(OBJEXT): {$(VPATH)}encoding.h
+ast.$(OBJEXT): {$(VPATH)}id.h
+ast.$(OBJEXT): {$(VPATH)}intern.h
+ast.$(OBJEXT): {$(VPATH)}internal.h
+ast.$(OBJEXT): {$(VPATH)}iseq.h
+ast.$(OBJEXT): {$(VPATH)}method.h
+ast.$(OBJEXT): {$(VPATH)}missing.h
+ast.$(OBJEXT): {$(VPATH)}node.h
+ast.$(OBJEXT): {$(VPATH)}onigmo.h
+ast.$(OBJEXT): {$(VPATH)}oniguruma.h
+ast.$(OBJEXT): {$(VPATH)}ruby_assert.h
+ast.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+ast.$(OBJEXT): {$(VPATH)}st.h
+ast.$(OBJEXT): {$(VPATH)}subst.h
+ast.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+ast.$(OBJEXT): {$(VPATH)}thread_native.h
+ast.$(OBJEXT): {$(VPATH)}util.h
+ast.$(OBJEXT): {$(VPATH)}vm_core.h
+ast.$(OBJEXT): {$(VPATH)}vm_opts.h
+bignum.$(OBJEXT): $(hdrdir)/ruby.h
+bignum.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+bignum.$(OBJEXT): {$(VPATH)}assert.h
+bignum.$(OBJEXT): {$(VPATH)}bignum.c
+bignum.$(OBJEXT): {$(VPATH)}config.h
+bignum.$(OBJEXT): {$(VPATH)}defines.h
+bignum.$(OBJEXT): {$(VPATH)}id.h
+bignum.$(OBJEXT): {$(VPATH)}intern.h
+bignum.$(OBJEXT): {$(VPATH)}internal.h
+bignum.$(OBJEXT): {$(VPATH)}missing.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
+builtin.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+builtin.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+builtin.$(OBJEXT): $(CCAN_DIR)/list/list.h
+builtin.$(OBJEXT): $(CCAN_DIR)/str/str.h
+builtin.$(OBJEXT): $(hdrdir)/ruby.h
+builtin.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+builtin.$(OBJEXT): {$(VPATH)}assert.h
+builtin.$(OBJEXT): {$(VPATH)}builtin.c
+builtin.$(OBJEXT): {$(VPATH)}builtin.h
+builtin.$(OBJEXT): {$(VPATH)}builtin_binary.inc
+builtin.$(OBJEXT): {$(VPATH)}config.h
+builtin.$(OBJEXT): {$(VPATH)}defines.h
+builtin.$(OBJEXT): {$(VPATH)}id.h
+builtin.$(OBJEXT): {$(VPATH)}intern.h
+builtin.$(OBJEXT): {$(VPATH)}internal.h
+builtin.$(OBJEXT): {$(VPATH)}iseq.h
+builtin.$(OBJEXT): {$(VPATH)}method.h
+builtin.$(OBJEXT): {$(VPATH)}missing.h
+builtin.$(OBJEXT): {$(VPATH)}node.h
+builtin.$(OBJEXT): {$(VPATH)}ruby_assert.h
+builtin.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+builtin.$(OBJEXT): {$(VPATH)}st.h
+builtin.$(OBJEXT): {$(VPATH)}subst.h
+builtin.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+builtin.$(OBJEXT): {$(VPATH)}thread_native.h
+builtin.$(OBJEXT): {$(VPATH)}vm_core.h
+builtin.$(OBJEXT): {$(VPATH)}vm_opts.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.h
+class.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+class.$(OBJEXT): {$(VPATH)}assert.h
+class.$(OBJEXT): {$(VPATH)}class.c
+class.$(OBJEXT): {$(VPATH)}config.h
+class.$(OBJEXT): {$(VPATH)}constant.h
+class.$(OBJEXT): {$(VPATH)}defines.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)}method.h
+class.$(OBJEXT): {$(VPATH)}missing.h
+class.$(OBJEXT): {$(VPATH)}node.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_opts.h
+compar.$(OBJEXT): $(hdrdir)/ruby.h
+compar.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+compar.$(OBJEXT): {$(VPATH)}assert.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)}internal.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.h
+compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+compile.$(OBJEXT): {$(VPATH)}assert.h
+compile.$(OBJEXT): {$(VPATH)}builtin.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.def
+compile.$(OBJEXT): {$(VPATH)}insns.inc
+compile.$(OBJEXT): {$(VPATH)}insns_info.inc
+compile.$(OBJEXT): {$(VPATH)}intern.h
+compile.$(OBJEXT): {$(VPATH)}internal.h
+compile.$(OBJEXT): {$(VPATH)}iseq.h
+compile.$(OBJEXT): {$(VPATH)}method.h
+compile.$(OBJEXT): {$(VPATH)}missing.h
+compile.$(OBJEXT): {$(VPATH)}node.h
+compile.$(OBJEXT): {$(VPATH)}onigmo.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)}util.h
+compile.$(OBJEXT): {$(VPATH)}vm_core.h
+compile.$(OBJEXT): {$(VPATH)}vm_debug.h
+compile.$(OBJEXT): {$(VPATH)}vm_opts.h
+complex.$(OBJEXT): $(hdrdir)/ruby.h
+complex.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+complex.$(OBJEXT): {$(VPATH)}assert.h
+complex.$(OBJEXT): {$(VPATH)}complex.c
+complex.$(OBJEXT): {$(VPATH)}config.h
+complex.$(OBJEXT): {$(VPATH)}defines.h
+complex.$(OBJEXT): {$(VPATH)}id.h
+complex.$(OBJEXT): {$(VPATH)}intern.h
+complex.$(OBJEXT): {$(VPATH)}internal.h
+complex.$(OBJEXT): {$(VPATH)}missing.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.h
+cont.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+cont.$(OBJEXT): {$(VPATH)}$(COROUTINE_H)
+cont.$(OBJEXT): {$(VPATH)}assert.h
+cont.$(OBJEXT): {$(VPATH)}config.h
+cont.$(OBJEXT): {$(VPATH)}cont.c
+cont.$(OBJEXT): {$(VPATH)}debug_counter.h
+cont.$(OBJEXT): {$(VPATH)}defines.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)}method.h
+cont.$(OBJEXT): {$(VPATH)}missing.h
+cont.$(OBJEXT): {$(VPATH)}mjit.h
+cont.$(OBJEXT): {$(VPATH)}node.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_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.h
+debug.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+debug.$(OBJEXT): {$(VPATH)}assert.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)}gc.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)}onigmo.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)}symbol.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
+debug_counter.$(OBJEXT): $(hdrdir)/ruby.h
+debug_counter.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+debug_counter.$(OBJEXT): {$(VPATH)}assert.h
+debug_counter.$(OBJEXT): {$(VPATH)}config.h
+debug_counter.$(OBJEXT): {$(VPATH)}debug_counter.c
+debug_counter.$(OBJEXT): {$(VPATH)}debug_counter.h
+debug_counter.$(OBJEXT): {$(VPATH)}defines.h
+debug_counter.$(OBJEXT): {$(VPATH)}intern.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal.h
+debug_counter.$(OBJEXT): {$(VPATH)}missing.h
+debug_counter.$(OBJEXT): {$(VPATH)}st.h
+debug_counter.$(OBJEXT): {$(VPATH)}subst.h
+dir.$(OBJEXT): $(hdrdir)/ruby.h
+dir.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+dir.$(OBJEXT): {$(VPATH)}assert.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)}id.h
+dir.$(OBJEXT): {$(VPATH)}intern.h
+dir.$(OBJEXT): {$(VPATH)}internal.h
+dir.$(OBJEXT): {$(VPATH)}missing.h
+dir.$(OBJEXT): {$(VPATH)}onigmo.h
+dir.$(OBJEXT): {$(VPATH)}oniguruma.h
+dir.$(OBJEXT): {$(VPATH)}st.h
+dir.$(OBJEXT): {$(VPATH)}subst.h
+dir.$(OBJEXT): {$(VPATH)}thread.h
+dir.$(OBJEXT): {$(VPATH)}util.h
+dln.$(OBJEXT): $(hdrdir)/ruby.h
+dln.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+dln.$(OBJEXT): {$(VPATH)}assert.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)}internal.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)}assert.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)}assert.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)}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): $(UNICODE_HDR_DIR)/casefold.h
+enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/name2ctype.h
+enc/unicode.$(OBJEXT): $(hdrdir)/ruby/ruby.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)}onigmo.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)}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)}regenc.h
+encoding.$(OBJEXT): $(hdrdir)/ruby.h
+encoding.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+encoding.$(OBJEXT): {$(VPATH)}assert.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)}missing.h
+encoding.$(OBJEXT): {$(VPATH)}onigmo.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.h
+enum.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enum.$(OBJEXT): {$(VPATH)}assert.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)}missing.h
+enum.$(OBJEXT): {$(VPATH)}onigmo.h
+enum.$(OBJEXT): {$(VPATH)}oniguruma.h
+enum.$(OBJEXT): {$(VPATH)}st.h
+enum.$(OBJEXT): {$(VPATH)}subst.h
+enum.$(OBJEXT): {$(VPATH)}symbol.h
+enum.$(OBJEXT): {$(VPATH)}util.h
+enumerator.$(OBJEXT): $(hdrdir)/ruby.h
+enumerator.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enumerator.$(OBJEXT): {$(VPATH)}assert.h
+enumerator.$(OBJEXT): {$(VPATH)}config.h
+enumerator.$(OBJEXT): {$(VPATH)}defines.h
+enumerator.$(OBJEXT): {$(VPATH)}enumerator.c
+enumerator.$(OBJEXT): {$(VPATH)}id.h
+enumerator.$(OBJEXT): {$(VPATH)}intern.h
+enumerator.$(OBJEXT): {$(VPATH)}internal.h
+enumerator.$(OBJEXT): {$(VPATH)}missing.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.h
+error.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+error.$(OBJEXT): {$(VPATH)}assert.h
+error.$(OBJEXT): {$(VPATH)}builtin.h
+error.$(OBJEXT): {$(VPATH)}config.h
+error.$(OBJEXT): {$(VPATH)}defines.h
+error.$(OBJEXT): {$(VPATH)}encoding.h
+error.$(OBJEXT): {$(VPATH)}error.c
+error.$(OBJEXT): {$(VPATH)}eval_intern.h
+error.$(OBJEXT): {$(VPATH)}id.h
+error.$(OBJEXT): {$(VPATH)}intern.h
+error.$(OBJEXT): {$(VPATH)}internal.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)}onigmo.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_opts.h
+error.$(OBJEXT): {$(VPATH)}warning.rbinc
+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.h
+eval.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+eval.$(OBJEXT): {$(VPATH)}assert.h
+eval.$(OBJEXT): {$(VPATH)}config.h
+eval.$(OBJEXT): {$(VPATH)}debug_counter.h
+eval.$(OBJEXT): {$(VPATH)}defines.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)}iseq.h
+eval.$(OBJEXT): {$(VPATH)}method.h
+eval.$(OBJEXT): {$(VPATH)}missing.h
+eval.$(OBJEXT): {$(VPATH)}mjit.h
+eval.$(OBJEXT): {$(VPATH)}node.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_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.h
+file.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+file.$(OBJEXT): {$(VPATH)}assert.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)}id.h
+file.$(OBJEXT): {$(VPATH)}intern.h
+file.$(OBJEXT): {$(VPATH)}internal.h
+file.$(OBJEXT): {$(VPATH)}io.h
+file.$(OBJEXT): {$(VPATH)}missing.h
+file.$(OBJEXT): {$(VPATH)}onigmo.h
+file.$(OBJEXT): {$(VPATH)}oniguruma.h
+file.$(OBJEXT): {$(VPATH)}st.h
+file.$(OBJEXT): {$(VPATH)}subst.h
+file.$(OBJEXT): {$(VPATH)}thread.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.h
+gc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+gc.$(OBJEXT): {$(VPATH)}assert.h
+gc.$(OBJEXT): {$(VPATH)}builtin.h
+gc.$(OBJEXT): {$(VPATH)}config.h
+gc.$(OBJEXT): {$(VPATH)}constant.h
+gc.$(OBJEXT): {$(VPATH)}debug.h
+gc.$(OBJEXT): {$(VPATH)}debug_counter.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)}gc.rbinc
+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)}mjit.h
+gc.$(OBJEXT): {$(VPATH)}node.h
+gc.$(OBJEXT): {$(VPATH)}onigmo.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)}symbol.h
+gc.$(OBJEXT): {$(VPATH)}thread.h
+gc.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+gc.$(OBJEXT): {$(VPATH)}thread_native.h
+gc.$(OBJEXT): {$(VPATH)}transient_heap.h
+gc.$(OBJEXT): {$(VPATH)}util.h
+gc.$(OBJEXT): {$(VPATH)}vm_core.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.h
+golf_prelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+golf_prelude.$(OBJEXT): {$(VPATH)}assert.h
+golf_prelude.$(OBJEXT): {$(VPATH)}config.h
+golf_prelude.$(OBJEXT): {$(VPATH)}defines.h
+golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c
+golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.rb
+golf_prelude.$(OBJEXT): {$(VPATH)}id.h
+golf_prelude.$(OBJEXT): {$(VPATH)}intern.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal.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)}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_opts.h
+goruby.$(OBJEXT): $(hdrdir)/ruby.h
+goruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+goruby.$(OBJEXT): {$(VPATH)}assert.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.h
+hash.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+hash.$(OBJEXT): {$(VPATH)}assert.h
+hash.$(OBJEXT): {$(VPATH)}config.h
+hash.$(OBJEXT): {$(VPATH)}debug_counter.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)}missing.h
+hash.$(OBJEXT): {$(VPATH)}onigmo.h
+hash.$(OBJEXT): {$(VPATH)}oniguruma.h
+hash.$(OBJEXT): {$(VPATH)}probes.dmyh
+hash.$(OBJEXT): {$(VPATH)}probes.h
+hash.$(OBJEXT): {$(VPATH)}ruby_assert.h
+hash.$(OBJEXT): {$(VPATH)}st.h
+hash.$(OBJEXT): {$(VPATH)}subst.h
+hash.$(OBJEXT): {$(VPATH)}symbol.h
+hash.$(OBJEXT): {$(VPATH)}transient_heap.h
+hash.$(OBJEXT): {$(VPATH)}util.h
+inits.$(OBJEXT): $(hdrdir)/ruby.h
+inits.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+inits.$(OBJEXT): {$(VPATH)}assert.h
+inits.$(OBJEXT): {$(VPATH)}builtin.h
+inits.$(OBJEXT): {$(VPATH)}config.h
+inits.$(OBJEXT): {$(VPATH)}defines.h
+inits.$(OBJEXT): {$(VPATH)}inits.c
+inits.$(OBJEXT): {$(VPATH)}intern.h
+inits.$(OBJEXT): {$(VPATH)}internal.h
+inits.$(OBJEXT): {$(VPATH)}missing.h
+inits.$(OBJEXT): {$(VPATH)}prelude.rbinc
+inits.$(OBJEXT): {$(VPATH)}st.h
+inits.$(OBJEXT): {$(VPATH)}subst.h
+io.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+io.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+io.$(OBJEXT): $(CCAN_DIR)/list/list.h
+io.$(OBJEXT): $(CCAN_DIR)/str/str.h
+io.$(OBJEXT): $(hdrdir)/ruby.h
+io.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+io.$(OBJEXT): {$(VPATH)}assert.h
+io.$(OBJEXT): {$(VPATH)}builtin.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)}io.rbinc
+io.$(OBJEXT): {$(VPATH)}method.h
+io.$(OBJEXT): {$(VPATH)}missing.h
+io.$(OBJEXT): {$(VPATH)}node.h
+io.$(OBJEXT): {$(VPATH)}onigmo.h
+io.$(OBJEXT): {$(VPATH)}oniguruma.h
+io.$(OBJEXT): {$(VPATH)}ruby_assert.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)}thread_$(THREAD_MODEL).h
+io.$(OBJEXT): {$(VPATH)}thread_native.h
+io.$(OBJEXT): {$(VPATH)}util.h
+io.$(OBJEXT): {$(VPATH)}vm_core.h
+io.$(OBJEXT): {$(VPATH)}vm_opts.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.h
+iseq.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+iseq.$(OBJEXT): {$(VPATH)}assert.h
+iseq.$(OBJEXT): {$(VPATH)}builtin.h
+iseq.$(OBJEXT): {$(VPATH)}config.h
+iseq.$(OBJEXT): {$(VPATH)}debug_counter.h
+iseq.$(OBJEXT): {$(VPATH)}defines.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.def
+iseq.$(OBJEXT): {$(VPATH)}insns.inc
+iseq.$(OBJEXT): {$(VPATH)}insns_info.inc
+iseq.$(OBJEXT): {$(VPATH)}intern.h
+iseq.$(OBJEXT): {$(VPATH)}internal.h
+iseq.$(OBJEXT): {$(VPATH)}iseq.c
+iseq.$(OBJEXT): {$(VPATH)}iseq.h
+iseq.$(OBJEXT): {$(VPATH)}method.h
+iseq.$(OBJEXT): {$(VPATH)}missing.h
+iseq.$(OBJEXT): {$(VPATH)}mjit.h
+iseq.$(OBJEXT): {$(VPATH)}node.h
+iseq.$(OBJEXT): {$(VPATH)}node_name.inc
+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_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.h
+load.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+load.$(OBJEXT): {$(VPATH)}assert.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)}iseq.h
+load.$(OBJEXT): {$(VPATH)}load.c
+load.$(OBJEXT): {$(VPATH)}method.h
+load.$(OBJEXT): {$(VPATH)}missing.h
+load.$(OBJEXT): {$(VPATH)}node.h
+load.$(OBJEXT): {$(VPATH)}onigmo.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_opts.h
+loadpath.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+loadpath.$(OBJEXT): $(hdrdir)/ruby/version.h
+loadpath.$(OBJEXT): $(top_srcdir)/version.h
+loadpath.$(OBJEXT): {$(VPATH)}assert.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.h
+localeinit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+localeinit.$(OBJEXT): {$(VPATH)}assert.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)}localeinit.c
+localeinit.$(OBJEXT): {$(VPATH)}missing.h
+localeinit.$(OBJEXT): {$(VPATH)}onigmo.h
+localeinit.$(OBJEXT): {$(VPATH)}oniguruma.h
+localeinit.$(OBJEXT): {$(VPATH)}st.h
+localeinit.$(OBJEXT): {$(VPATH)}subst.h
+main.$(OBJEXT): $(hdrdir)/ruby.h
+main.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+main.$(OBJEXT): {$(VPATH)}assert.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.h
+marshal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+marshal.$(OBJEXT): {$(VPATH)}assert.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)}onigmo.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.h
+math.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+math.$(OBJEXT): {$(VPATH)}assert.h
+math.$(OBJEXT): {$(VPATH)}config.h
+math.$(OBJEXT): {$(VPATH)}defines.h
+math.$(OBJEXT): {$(VPATH)}intern.h
+math.$(OBJEXT): {$(VPATH)}internal.h
+math.$(OBJEXT): {$(VPATH)}math.c
+math.$(OBJEXT): {$(VPATH)}missing.h
+math.$(OBJEXT): {$(VPATH)}st.h
+math.$(OBJEXT): {$(VPATH)}subst.h
+miniinit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+miniinit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+miniinit.$(OBJEXT): $(CCAN_DIR)/list/list.h
+miniinit.$(OBJEXT): $(CCAN_DIR)/str/str.h
+miniinit.$(OBJEXT): $(hdrdir)/ruby.h
+miniinit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+miniinit.$(OBJEXT): {$(VPATH)}assert.h
+miniinit.$(OBJEXT): {$(VPATH)}ast.rb
+miniinit.$(OBJEXT): {$(VPATH)}builtin.h
+miniinit.$(OBJEXT): {$(VPATH)}config.h
+miniinit.$(OBJEXT): {$(VPATH)}defines.h
+miniinit.$(OBJEXT): {$(VPATH)}encoding.h
+miniinit.$(OBJEXT): {$(VPATH)}gc.rb
+miniinit.$(OBJEXT): {$(VPATH)}gem_prelude.rb
+miniinit.$(OBJEXT): {$(VPATH)}id.h
+miniinit.$(OBJEXT): {$(VPATH)}intern.h
+miniinit.$(OBJEXT): {$(VPATH)}internal.h
+miniinit.$(OBJEXT): {$(VPATH)}io.rb
+miniinit.$(OBJEXT): {$(VPATH)}iseq.h
+miniinit.$(OBJEXT): {$(VPATH)}method.h
+miniinit.$(OBJEXT): {$(VPATH)}mini_builtin.c
+miniinit.$(OBJEXT): {$(VPATH)}miniinit.c
+miniinit.$(OBJEXT): {$(VPATH)}miniprelude.c
+miniinit.$(OBJEXT): {$(VPATH)}missing.h
+miniinit.$(OBJEXT): {$(VPATH)}node.h
+miniinit.$(OBJEXT): {$(VPATH)}onigmo.h
+miniinit.$(OBJEXT): {$(VPATH)}oniguruma.h
+miniinit.$(OBJEXT): {$(VPATH)}pack.rb
+miniinit.$(OBJEXT): {$(VPATH)}prelude.rb
+miniinit.$(OBJEXT): {$(VPATH)}ruby_assert.h
+miniinit.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+miniinit.$(OBJEXT): {$(VPATH)}st.h
+miniinit.$(OBJEXT): {$(VPATH)}subst.h
+miniinit.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+miniinit.$(OBJEXT): {$(VPATH)}thread_native.h
+miniinit.$(OBJEXT): {$(VPATH)}trace_point.rb
+miniinit.$(OBJEXT): {$(VPATH)}vm_core.h
+miniinit.$(OBJEXT): {$(VPATH)}vm_opts.h
+miniinit.$(OBJEXT): {$(VPATH)}warning.rb
+mjit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+mjit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+mjit.$(OBJEXT): $(CCAN_DIR)/list/list.h
+mjit.$(OBJEXT): $(CCAN_DIR)/str/str.h
+mjit.$(OBJEXT): $(hdrdir)/ruby.h
+mjit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+mjit.$(OBJEXT): {$(VPATH)}assert.h
+mjit.$(OBJEXT): {$(VPATH)}config.h
+mjit.$(OBJEXT): {$(VPATH)}constant.h
+mjit.$(OBJEXT): {$(VPATH)}debug.h
+mjit.$(OBJEXT): {$(VPATH)}debug_counter.h
+mjit.$(OBJEXT): {$(VPATH)}defines.h
+mjit.$(OBJEXT): {$(VPATH)}dln.h
+mjit.$(OBJEXT): {$(VPATH)}gc.h
+mjit.$(OBJEXT): {$(VPATH)}id.h
+mjit.$(OBJEXT): {$(VPATH)}id_table.h
+mjit.$(OBJEXT): {$(VPATH)}intern.h
+mjit.$(OBJEXT): {$(VPATH)}internal.h
+mjit.$(OBJEXT): {$(VPATH)}method.h
+mjit.$(OBJEXT): {$(VPATH)}missing.h
+mjit.$(OBJEXT): {$(VPATH)}mjit.c
+mjit.$(OBJEXT): {$(VPATH)}mjit.h
+mjit.$(OBJEXT): {$(VPATH)}mjit_config.h
+mjit.$(OBJEXT): {$(VPATH)}mjit_worker.c
+mjit.$(OBJEXT): {$(VPATH)}node.h
+mjit.$(OBJEXT): {$(VPATH)}ruby_assert.h
+mjit.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+mjit.$(OBJEXT): {$(VPATH)}st.h
+mjit.$(OBJEXT): {$(VPATH)}subst.h
+mjit.$(OBJEXT): {$(VPATH)}thread.h
+mjit.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+mjit.$(OBJEXT): {$(VPATH)}thread_native.h
+mjit.$(OBJEXT): {$(VPATH)}util.h
+mjit.$(OBJEXT): {$(VPATH)}vm_core.h
+mjit.$(OBJEXT): {$(VPATH)}vm_opts.h
+mjit_compile.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+mjit_compile.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+mjit_compile.$(OBJEXT): $(CCAN_DIR)/list/list.h
+mjit_compile.$(OBJEXT): $(CCAN_DIR)/str/str.h
+mjit_compile.$(OBJEXT): $(hdrdir)/ruby.h
+mjit_compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+mjit_compile.$(OBJEXT): {$(VPATH)}assert.h
+mjit_compile.$(OBJEXT): {$(VPATH)}builtin.h
+mjit_compile.$(OBJEXT): {$(VPATH)}config.h
+mjit_compile.$(OBJEXT): {$(VPATH)}debug_counter.h
+mjit_compile.$(OBJEXT): {$(VPATH)}defines.h
+mjit_compile.$(OBJEXT): {$(VPATH)}id.h
+mjit_compile.$(OBJEXT): {$(VPATH)}insns.def
+mjit_compile.$(OBJEXT): {$(VPATH)}insns.inc
+mjit_compile.$(OBJEXT): {$(VPATH)}insns_info.inc
+mjit_compile.$(OBJEXT): {$(VPATH)}intern.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal.h
+mjit_compile.$(OBJEXT): {$(VPATH)}iseq.h
+mjit_compile.$(OBJEXT): {$(VPATH)}method.h
+mjit_compile.$(OBJEXT): {$(VPATH)}missing.h
+mjit_compile.$(OBJEXT): {$(VPATH)}mjit.h
+mjit_compile.$(OBJEXT): {$(VPATH)}mjit_compile.c
+mjit_compile.$(OBJEXT): {$(VPATH)}mjit_compile.inc
+mjit_compile.$(OBJEXT): {$(VPATH)}node.h
+mjit_compile.$(OBJEXT): {$(VPATH)}ruby_assert.h
+mjit_compile.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+mjit_compile.$(OBJEXT): {$(VPATH)}st.h
+mjit_compile.$(OBJEXT): {$(VPATH)}subst.h
+mjit_compile.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+mjit_compile.$(OBJEXT): {$(VPATH)}thread_native.h
+mjit_compile.$(OBJEXT): {$(VPATH)}vm_core.h
+mjit_compile.$(OBJEXT): {$(VPATH)}vm_exec.h
+mjit_compile.$(OBJEXT): {$(VPATH)}vm_insnhelper.h
+mjit_compile.$(OBJEXT): {$(VPATH)}vm_opts.h
+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.h
+node.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+node.$(OBJEXT): {$(VPATH)}assert.h
+node.$(OBJEXT): {$(VPATH)}config.h
+node.$(OBJEXT): {$(VPATH)}defines.h
+node.$(OBJEXT): {$(VPATH)}id.h
+node.$(OBJEXT): {$(VPATH)}intern.h
+node.$(OBJEXT): {$(VPATH)}internal.h
+node.$(OBJEXT): {$(VPATH)}method.h
+node.$(OBJEXT): {$(VPATH)}missing.h
+node.$(OBJEXT): {$(VPATH)}node.c
+node.$(OBJEXT): {$(VPATH)}node.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_opts.h
+numeric.$(OBJEXT): $(hdrdir)/ruby.h
+numeric.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+numeric.$(OBJEXT): {$(VPATH)}assert.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)}missing.h
+numeric.$(OBJEXT): {$(VPATH)}numeric.c
+numeric.$(OBJEXT): {$(VPATH)}onigmo.h
+numeric.$(OBJEXT): {$(VPATH)}oniguruma.h
+numeric.$(OBJEXT): {$(VPATH)}st.h
+numeric.$(OBJEXT): {$(VPATH)}subst.h
+numeric.$(OBJEXT): {$(VPATH)}util.h
+object.$(OBJEXT): $(hdrdir)/ruby.h
+object.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+object.$(OBJEXT): {$(VPATH)}assert.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)}missing.h
+object.$(OBJEXT): {$(VPATH)}object.c
+object.$(OBJEXT): {$(VPATH)}onigmo.h
+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.h
+pack.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+pack.$(OBJEXT): {$(VPATH)}assert.h
+pack.$(OBJEXT): {$(VPATH)}builtin.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)}missing.h
+pack.$(OBJEXT): {$(VPATH)}onigmo.h
+pack.$(OBJEXT): {$(VPATH)}oniguruma.h
+pack.$(OBJEXT): {$(VPATH)}pack.c
+pack.$(OBJEXT): {$(VPATH)}pack.rbinc
+pack.$(OBJEXT): {$(VPATH)}st.h
+pack.$(OBJEXT): {$(VPATH)}subst.h
+parse.$(OBJEXT): $(hdrdir)/ruby.h
+parse.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+parse.$(OBJEXT): {$(VPATH)}assert.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)}lex.c
+parse.$(OBJEXT): {$(VPATH)}missing.h
+parse.$(OBJEXT): {$(VPATH)}node.h
+parse.$(OBJEXT): {$(VPATH)}onigmo.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
+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.h
+proc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+proc.$(OBJEXT): {$(VPATH)}assert.h
+proc.$(OBJEXT): {$(VPATH)}config.h
+proc.$(OBJEXT): {$(VPATH)}defines.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)}iseq.h
+proc.$(OBJEXT): {$(VPATH)}method.h
+proc.$(OBJEXT): {$(VPATH)}missing.h
+proc.$(OBJEXT): {$(VPATH)}node.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_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.h
+process.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+process.$(OBJEXT): {$(VPATH)}assert.h
+process.$(OBJEXT): {$(VPATH)}config.h
+process.$(OBJEXT): {$(VPATH)}defines.h
+process.$(OBJEXT): {$(VPATH)}dln.h
+process.$(OBJEXT): {$(VPATH)}encoding.h
+process.$(OBJEXT): {$(VPATH)}hrtime.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)}onigmo.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_opts.h
+random.$(OBJEXT): $(hdrdir)/ruby.h
+random.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+random.$(OBJEXT): {$(VPATH)}assert.h
+random.$(OBJEXT): {$(VPATH)}config.h
+random.$(OBJEXT): {$(VPATH)}defines.h
+random.$(OBJEXT): {$(VPATH)}intern.h
+random.$(OBJEXT): {$(VPATH)}internal.h
+random.$(OBJEXT): {$(VPATH)}missing.h
+random.$(OBJEXT): {$(VPATH)}mt19937.c
+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.h
+range.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+range.$(OBJEXT): {$(VPATH)}assert.h
+range.$(OBJEXT): {$(VPATH)}config.h
+range.$(OBJEXT): {$(VPATH)}defines.h
+range.$(OBJEXT): {$(VPATH)}id.h
+range.$(OBJEXT): {$(VPATH)}intern.h
+range.$(OBJEXT): {$(VPATH)}internal.h
+range.$(OBJEXT): {$(VPATH)}missing.h
+range.$(OBJEXT): {$(VPATH)}range.c
+range.$(OBJEXT): {$(VPATH)}st.h
+range.$(OBJEXT): {$(VPATH)}subst.h
+rational.$(OBJEXT): $(hdrdir)/ruby.h
+rational.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+rational.$(OBJEXT): {$(VPATH)}assert.h
+rational.$(OBJEXT): {$(VPATH)}config.h
+rational.$(OBJEXT): {$(VPATH)}defines.h
+rational.$(OBJEXT): {$(VPATH)}id.h
+rational.$(OBJEXT): {$(VPATH)}intern.h
+rational.$(OBJEXT): {$(VPATH)}internal.h
+rational.$(OBJEXT): {$(VPATH)}missing.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.h
+re.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+re.$(OBJEXT): {$(VPATH)}assert.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)}missing.h
+re.$(OBJEXT): {$(VPATH)}onigmo.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)}assert.h
+regcomp.$(OBJEXT): {$(VPATH)}config.h
+regcomp.$(OBJEXT): {$(VPATH)}defines.h
+regcomp.$(OBJEXT): {$(VPATH)}intern.h
+regcomp.$(OBJEXT): {$(VPATH)}missing.h
+regcomp.$(OBJEXT): {$(VPATH)}onigmo.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)}assert.h
+regenc.$(OBJEXT): {$(VPATH)}config.h
+regenc.$(OBJEXT): {$(VPATH)}defines.h
+regenc.$(OBJEXT): {$(VPATH)}intern.h
+regenc.$(OBJEXT): {$(VPATH)}missing.h
+regenc.$(OBJEXT): {$(VPATH)}onigmo.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)}assert.h
+regerror.$(OBJEXT): {$(VPATH)}config.h
+regerror.$(OBJEXT): {$(VPATH)}defines.h
+regerror.$(OBJEXT): {$(VPATH)}intern.h
+regerror.$(OBJEXT): {$(VPATH)}missing.h
+regerror.$(OBJEXT): {$(VPATH)}onigmo.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)}assert.h
+regexec.$(OBJEXT): {$(VPATH)}config.h
+regexec.$(OBJEXT): {$(VPATH)}defines.h
+regexec.$(OBJEXT): {$(VPATH)}intern.h
+regexec.$(OBJEXT): {$(VPATH)}missing.h
+regexec.$(OBJEXT): {$(VPATH)}onigmo.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)}assert.h
+regparse.$(OBJEXT): {$(VPATH)}config.h
+regparse.$(OBJEXT): {$(VPATH)}defines.h
+regparse.$(OBJEXT): {$(VPATH)}intern.h
+regparse.$(OBJEXT): {$(VPATH)}missing.h
+regparse.$(OBJEXT): {$(VPATH)}onigmo.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)}assert.h
+regsyntax.$(OBJEXT): {$(VPATH)}config.h
+regsyntax.$(OBJEXT): {$(VPATH)}defines.h
+regsyntax.$(OBJEXT): {$(VPATH)}intern.h
+regsyntax.$(OBJEXT): {$(VPATH)}missing.h
+regsyntax.$(OBJEXT): {$(VPATH)}onigmo.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)}config.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.h
+ruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+ruby.$(OBJEXT): $(hdrdir)/ruby/version.h
+ruby.$(OBJEXT): {$(VPATH)}assert.h
+ruby.$(OBJEXT): {$(VPATH)}config.h
+ruby.$(OBJEXT): {$(VPATH)}debug_counter.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)}method.h
+ruby.$(OBJEXT): {$(VPATH)}missing.h
+ruby.$(OBJEXT): {$(VPATH)}mjit.h
+ruby.$(OBJEXT): {$(VPATH)}node.h
+ruby.$(OBJEXT): {$(VPATH)}onigmo.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_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.h
+safe.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+safe.$(OBJEXT): {$(VPATH)}assert.h
+safe.$(OBJEXT): {$(VPATH)}config.h
+safe.$(OBJEXT): {$(VPATH)}defines.h
+safe.$(OBJEXT): {$(VPATH)}id.h
+safe.$(OBJEXT): {$(VPATH)}intern.h
+safe.$(OBJEXT): {$(VPATH)}internal.h
+safe.$(OBJEXT): {$(VPATH)}method.h
+safe.$(OBJEXT): {$(VPATH)}missing.h
+safe.$(OBJEXT): {$(VPATH)}node.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_opts.h
+setproctitle.$(OBJEXT): $(hdrdir)/ruby.h
+setproctitle.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+setproctitle.$(OBJEXT): {$(VPATH)}assert.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.h
+signal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+signal.$(OBJEXT): {$(VPATH)}assert.h
+signal.$(OBJEXT): {$(VPATH)}config.h
+signal.$(OBJEXT): {$(VPATH)}debug_counter.h
+signal.$(OBJEXT): {$(VPATH)}defines.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)}method.h
+signal.$(OBJEXT): {$(VPATH)}missing.h
+signal.$(OBJEXT): {$(VPATH)}node.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_opts.h
+sprintf.$(OBJEXT): $(hdrdir)/ruby.h
+sprintf.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+sprintf.$(OBJEXT): {$(VPATH)}assert.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)}missing.h
+sprintf.$(OBJEXT): {$(VPATH)}onigmo.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): $(hdrdir)/ruby.h
+st.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+st.$(OBJEXT): {$(VPATH)}assert.h
+st.$(OBJEXT): {$(VPATH)}config.h
+st.$(OBJEXT): {$(VPATH)}defines.h
+st.$(OBJEXT): {$(VPATH)}intern.h
+st.$(OBJEXT): {$(VPATH)}internal.h
+st.$(OBJEXT): {$(VPATH)}missing.h
+st.$(OBJEXT): {$(VPATH)}st.c
+st.$(OBJEXT): {$(VPATH)}st.h
+st.$(OBJEXT): {$(VPATH)}subst.h
+strftime.$(OBJEXT): $(hdrdir)/ruby.h
+strftime.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+strftime.$(OBJEXT): {$(VPATH)}assert.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)}missing.h
+strftime.$(OBJEXT): {$(VPATH)}onigmo.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.h
+string.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+string.$(OBJEXT): {$(VPATH)}assert.h
+string.$(OBJEXT): {$(VPATH)}config.h
+string.$(OBJEXT): {$(VPATH)}crypt.h
+string.$(OBJEXT): {$(VPATH)}debug_counter.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)}missing.h
+string.$(OBJEXT): {$(VPATH)}onigmo.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
+string.$(OBJEXT): {$(VPATH)}util.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.h
+struct.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+struct.$(OBJEXT): {$(VPATH)}assert.h
+struct.$(OBJEXT): {$(VPATH)}config.h
+struct.$(OBJEXT): {$(VPATH)}defines.h
+struct.$(OBJEXT): {$(VPATH)}id.h
+struct.$(OBJEXT): {$(VPATH)}intern.h
+struct.$(OBJEXT): {$(VPATH)}internal.h
+struct.$(OBJEXT): {$(VPATH)}method.h
+struct.$(OBJEXT): {$(VPATH)}missing.h
+struct.$(OBJEXT): {$(VPATH)}node.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)}transient_heap.h
+struct.$(OBJEXT): {$(VPATH)}vm_core.h
+struct.$(OBJEXT): {$(VPATH)}vm_opts.h
+symbol.$(OBJEXT): $(hdrdir)/ruby.h
+symbol.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+symbol.$(OBJEXT): {$(VPATH)}assert.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)}missing.h
+symbol.$(OBJEXT): {$(VPATH)}onigmo.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.h
+thread.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+thread.$(OBJEXT): {$(VPATH)}assert.h
+thread.$(OBJEXT): {$(VPATH)}config.h
+thread.$(OBJEXT): {$(VPATH)}debug.h
+thread.$(OBJEXT): {$(VPATH)}debug_counter.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)}hrtime.h
+thread.$(OBJEXT): {$(VPATH)}id.h
+thread.$(OBJEXT): {$(VPATH)}intern.h
+thread.$(OBJEXT): {$(VPATH)}internal.h
+thread.$(OBJEXT): {$(VPATH)}io.h
+thread.$(OBJEXT): {$(VPATH)}iseq.h
+thread.$(OBJEXT): {$(VPATH)}method.h
+thread.$(OBJEXT): {$(VPATH)}missing.h
+thread.$(OBJEXT): {$(VPATH)}mjit.h
+thread.$(OBJEXT): {$(VPATH)}node.h
+thread.$(OBJEXT): {$(VPATH)}onigmo.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_opts.h
+time.$(OBJEXT): $(hdrdir)/ruby.h
+time.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+time.$(OBJEXT): {$(VPATH)}assert.h
+time.$(OBJEXT): {$(VPATH)}config.h
+time.$(OBJEXT): {$(VPATH)}defines.h
+time.$(OBJEXT): {$(VPATH)}encoding.h
+time.$(OBJEXT): {$(VPATH)}id.h
+time.$(OBJEXT): {$(VPATH)}intern.h
+time.$(OBJEXT): {$(VPATH)}internal.h
+time.$(OBJEXT): {$(VPATH)}missing.h
+time.$(OBJEXT): {$(VPATH)}onigmo.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.h
+transcode.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+transcode.$(OBJEXT): {$(VPATH)}assert.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)}missing.h
+transcode.$(OBJEXT): {$(VPATH)}onigmo.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
+transient_heap.$(OBJEXT): $(hdrdir)/ruby.h
+transient_heap.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+transient_heap.$(OBJEXT): {$(VPATH)}assert.h
+transient_heap.$(OBJEXT): {$(VPATH)}config.h
+transient_heap.$(OBJEXT): {$(VPATH)}debug.h
+transient_heap.$(OBJEXT): {$(VPATH)}debug_counter.h
+transient_heap.$(OBJEXT): {$(VPATH)}defines.h
+transient_heap.$(OBJEXT): {$(VPATH)}gc.h
+transient_heap.$(OBJEXT): {$(VPATH)}intern.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal.h
+transient_heap.$(OBJEXT): {$(VPATH)}missing.h
+transient_heap.$(OBJEXT): {$(VPATH)}node.h
+transient_heap.$(OBJEXT): {$(VPATH)}ruby_assert.h
+transient_heap.$(OBJEXT): {$(VPATH)}st.h
+transient_heap.$(OBJEXT): {$(VPATH)}subst.h
+transient_heap.$(OBJEXT): {$(VPATH)}transient_heap.c
+transient_heap.$(OBJEXT): {$(VPATH)}transient_heap.h
+transient_heap.$(OBJEXT): {$(VPATH)}vm_debug.h
+util.$(OBJEXT): $(hdrdir)/ruby.h
+util.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+util.$(OBJEXT): {$(VPATH)}assert.h
+util.$(OBJEXT): {$(VPATH)}config.h
+util.$(OBJEXT): {$(VPATH)}defines.h
+util.$(OBJEXT): {$(VPATH)}dtoa.c
+util.$(OBJEXT): {$(VPATH)}intern.h
+util.$(OBJEXT): {$(VPATH)}internal.h
+util.$(OBJEXT): {$(VPATH)}missing.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.h
+variable.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+variable.$(OBJEXT): {$(VPATH)}assert.h
+variable.$(OBJEXT): {$(VPATH)}config.h
+variable.$(OBJEXT): {$(VPATH)}constant.h
+variable.$(OBJEXT): {$(VPATH)}debug_counter.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)}method.h
+variable.$(OBJEXT): {$(VPATH)}missing.h
+variable.$(OBJEXT): {$(VPATH)}node.h
+variable.$(OBJEXT): {$(VPATH)}onigmo.h
+variable.$(OBJEXT): {$(VPATH)}oniguruma.h
+variable.$(OBJEXT): {$(VPATH)}ruby_assert.h
+variable.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+variable.$(OBJEXT): {$(VPATH)}st.h
+variable.$(OBJEXT): {$(VPATH)}subst.h
+variable.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+variable.$(OBJEXT): {$(VPATH)}thread_native.h
+variable.$(OBJEXT): {$(VPATH)}transient_heap.h
+variable.$(OBJEXT): {$(VPATH)}util.h
+variable.$(OBJEXT): {$(VPATH)}variable.c
+variable.$(OBJEXT): {$(VPATH)}variable.h
+variable.$(OBJEXT): {$(VPATH)}vm_core.h
+variable.$(OBJEXT): {$(VPATH)}vm_opts.h
+version.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+version.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+version.$(OBJEXT): $(CCAN_DIR)/list/list.h
+version.$(OBJEXT): $(CCAN_DIR)/str/str.h
+version.$(OBJEXT): $(hdrdir)/ruby.h
+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)}assert.h
+version.$(OBJEXT): {$(VPATH)}config.h
+version.$(OBJEXT): {$(VPATH)}debug_counter.h
+version.$(OBJEXT): {$(VPATH)}defines.h
+version.$(OBJEXT): {$(VPATH)}id.h
+version.$(OBJEXT): {$(VPATH)}intern.h
+version.$(OBJEXT): {$(VPATH)}internal.h
+version.$(OBJEXT): {$(VPATH)}method.h
+version.$(OBJEXT): {$(VPATH)}missing.h
+version.$(OBJEXT): {$(VPATH)}mjit.h
+version.$(OBJEXT): {$(VPATH)}node.h
+version.$(OBJEXT): {$(VPATH)}ruby_assert.h
+version.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+version.$(OBJEXT): {$(VPATH)}st.h
+version.$(OBJEXT): {$(VPATH)}subst.h
+version.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+version.$(OBJEXT): {$(VPATH)}thread_native.h
+version.$(OBJEXT): {$(VPATH)}version.c
+version.$(OBJEXT): {$(VPATH)}vm_core.h
+version.$(OBJEXT): {$(VPATH)}vm_opts.h
+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.h
+vm.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+vm.$(OBJEXT): {$(VPATH)}assert.h
+vm.$(OBJEXT): {$(VPATH)}builtin.h
+vm.$(OBJEXT): {$(VPATH)}config.h
+vm.$(OBJEXT): {$(VPATH)}constant.h
+vm.$(OBJEXT): {$(VPATH)}debug_counter.h
+vm.$(OBJEXT): {$(VPATH)}defines.h
+vm.$(OBJEXT): {$(VPATH)}defs/opt_operand.def
+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)}insns_info.inc
+vm.$(OBJEXT): {$(VPATH)}intern.h
+vm.$(OBJEXT): {$(VPATH)}internal.h
+vm.$(OBJEXT): {$(VPATH)}iseq.h
+vm.$(OBJEXT): {$(VPATH)}method.h
+vm.$(OBJEXT): {$(VPATH)}missing.h
+vm.$(OBJEXT): {$(VPATH)}mjit.h
+vm.$(OBJEXT): {$(VPATH)}node.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)}variable.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.h
+vm_backtrace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}assert.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)}iseq.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}method.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}missing.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}node.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}onigmo.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_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.h
+vm_dump.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+vm_dump.$(OBJEXT): {$(VPATH)}addr2line.h
+vm_dump.$(OBJEXT): {$(VPATH)}assert.h
+vm_dump.$(OBJEXT): {$(VPATH)}config.h
+vm_dump.$(OBJEXT): {$(VPATH)}defines.h
+vm_dump.$(OBJEXT): {$(VPATH)}gc.h
+vm_dump.$(OBJEXT): {$(VPATH)}id.h
+vm_dump.$(OBJEXT): {$(VPATH)}intern.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal.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)}procstat_vm.c
+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_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.h
+vm_trace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+vm_trace.$(OBJEXT): {$(VPATH)}assert.h
+vm_trace.$(OBJEXT): {$(VPATH)}builtin.h
+vm_trace.$(OBJEXT): {$(VPATH)}config.h
+vm_trace.$(OBJEXT): {$(VPATH)}debug.h
+vm_trace.$(OBJEXT): {$(VPATH)}debug_counter.h
+vm_trace.$(OBJEXT): {$(VPATH)}defines.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)}iseq.h
+vm_trace.$(OBJEXT): {$(VPATH)}method.h
+vm_trace.$(OBJEXT): {$(VPATH)}missing.h
+vm_trace.$(OBJEXT): {$(VPATH)}mjit.h
+vm_trace.$(OBJEXT): {$(VPATH)}node.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)}trace_point.rbinc
+vm_trace.$(OBJEXT): {$(VPATH)}vm_core.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 65def78484..94072c9fc1 100644
--- a/compar.c
+++ b/compar.c
@@ -10,41 +10,57 @@
 **********************************************************************/
 
 #include "ruby/ruby.h"
+#include "id.h"
+#include "internal.h"
 
 VALUE rb_mComparable;
 
-static ID cmp;
+static VALUE
+rb_cmp(VALUE x, VALUE y)
+{
+    return rb_funcallv(x, idCmp, 1, &y);
+}
 
 void
 rb_cmperr(VALUE x, VALUE y)
 {
-    const char *classname;
+    VALUE classname;
 
-    if (SPECIAL_CONST_P(y)) {
-	y = rb_inspect(y);
-	classname = StringValuePtr(y);
+    if (SPECIAL_CONST_P(y) || BUILTIN_TYPE(y) == T_FLOAT) {
+	classname = rb_inspect(y);
     }
     else {
-	classname = rb_obj_classname(y);
+	classname = rb_obj_class(y);
     }
-    rb_raise(rb_eArgError, "comparison of %s with %s failed",
-	     rb_obj_classname(x), classname);
+    rb_raise(rb_eArgError, "comparison of %"PRIsVALUE" with %"PRIsVALUE" failed",
+	     rb_obj_class(x), classname);
 }
 
 static VALUE
-cmp_eq(VALUE *a)
+invcmp_recursive(VALUE x, VALUE y, int recursive)
 {
-    VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
+    if (recursive) return Qnil;
+    return rb_cmp(y, x);
+}
 
-    if (NIL_P(c)) return Qfalse;
-    if (rb_cmpint(c, a[0], a[1]) == 0) return Qtrue;
-    return Qfalse;
+VALUE
+rb_invcmp(VALUE x, VALUE y)
+{
+    VALUE invcmp = rb_exec_recursive(invcmp_recursive, x, y);
+    if (invcmp == Qundef || NIL_P(invcmp)) {
+	return Qnil;
+    }
+    else {
+	int result = -rb_cmpint(invcmp, x, y);
+	return INT2FIX(result);
+    }
 }
 
 static VALUE
-cmp_failed(void)
+cmp_eq_recursive(VALUE arg1, VALUE arg2, int recursive)
 {
-    return Qfalse;
+    if (recursive) return Qnil;
+    return rb_cmp(arg1, arg2);
 }
 
 /*
@@ -59,12 +75,20 @@ cmp_failed(void)
 static VALUE
 cmp_equal(VALUE x, VALUE y)
 {
-    VALUE a[2];
-
+    VALUE c;
     if (x == y) return Qtrue;
 
-    a[0] = x; a[1] = y;
-    return rb_rescue(cmp_eq, (VALUE)a, cmp_failed, 0);
+    c = rb_exec_recursive_paired_outer(cmp_eq_recursive, x, y, y);
+
+    if (NIL_P(c)) return Qfalse;
+    if (rb_cmpint(c, x, y) == 0) return Qtrue;
+    return Qfalse;
+}
+
+static int
+cmpint(VALUE x, VALUE y)
+{
+    return rb_cmpint(rb_cmp(x, y), x, y);
 }
 
 /*
@@ -72,15 +96,13 @@ cmp_equal(VALUE x, VALUE y)
  *     obj > other    -> true or false
  *
  *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns 1.
+ *  method, returning true if it returns a value greater than 0.
  */
 
 static VALUE
 cmp_gt(VALUE x, VALUE y)
 {
-    VALUE c = rb_funcall(x, cmp, 1, y);
-
-    if (rb_cmpint(c, x, y) > 0) return Qtrue;
+    if (cmpint(x, y) > 0) return Qtrue;
     return Qfalse;
 }
 
@@ -89,15 +111,13 @@ cmp_gt(VALUE x, VALUE y)
  *     obj >= other    -> true or false
  *
  *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns 0 or 1.
+ *  method, returning true if it returns a value greater than or equal to 0.
  */
 
 static VALUE
 cmp_ge(VALUE x, VALUE y)
 {
-    VALUE c = rb_funcall(x, cmp, 1, y);
-
-    if (rb_cmpint(c, x, y) >= 0) return Qtrue;
+    if (cmpint(x, y) >= 0) return Qtrue;
     return Qfalse;
 }
 
@@ -106,15 +126,13 @@ cmp_ge(VALUE x, VALUE y)
  *     obj < other    -> true or false
  *
  *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns -1.
+ *  method, returning true if it returns a value less than 0.
  */
 
 static VALUE
 cmp_lt(VALUE x, VALUE y)
 {
-    VALUE c = rb_funcall(x, cmp, 1, y);
-
-    if (rb_cmpint(c, x, y) < 0) return Qtrue;
+    if (cmpint(x, y) < 0) return Qtrue;
     return Qfalse;
 }
 
@@ -123,15 +141,13 @@ cmp_lt(VALUE x, VALUE y)
  *     obj <= other    -> true or false
  *
  *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns -1 or 0.
+ *  method, returning true if it returns a value less than or equal to 0.
  */
 
 static VALUE
 cmp_le(VALUE x, VALUE y)
 {
-    VALUE c = rb_funcall(x, cmp, 1, y);
-
-    if (rb_cmpint(c, x, y) <= 0) return Qtrue;
+    if (cmpint(x, y) <= 0) return Qtrue;
     return Qfalse;
 }
 
@@ -139,9 +155,9 @@ cmp_le(VALUE x, VALUE y)
  *  call-seq:
  *     obj.between?(min, max)    -> true or false
  *
- *  Returns <code>false</code> if <i>obj</i> <code><=></code>
- *  <i>min</i> is less than zero or if <i>anObject</i> <code><=></code>
- *  <i>max</i> is greater than zero, <code>true</code> otherwise.
+ *  Returns <code>false</code> if _obj_ <code><=></code> _min_ is less
+ *  than zero or if _obj_ <code><=></code> _max_ is greater than zero,
+ *  <code>true</code> otherwise.
  *
  *     3.between?(1, 5)               #=> true
  *     6.between?(1, 5)               #=> false
@@ -153,28 +169,105 @@ cmp_le(VALUE x, VALUE y)
 static VALUE
 cmp_between(VALUE x, VALUE min, VALUE max)
 {
-    if (RTEST(cmp_lt(x, min))) return Qfalse;
-    if (RTEST(cmp_gt(x, max))) return Qfalse;
+    if (cmpint(x, min) < 0) return Qfalse;
+    if (cmpint(x, max) > 0) return Qfalse;
     return Qtrue;
 }
 
 /*
- *  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,
- *  or +1 depending on whether the receiver is less than, equal to, or
- *  greater than the other object. If the other object is not comparable
- *  then the <code><=></code> operator should return nil.
- *  <code>Comparable</code> uses
- *  <code><=></code> to implement the conventional comparison operators
- *  (<code><</code>, <code><=</code>, <code>==</code>, <code>>=</code>,
- *  and <code>></code>) and the method <code>between?</code>.
+ *  call-seq:
+ *     obj.clamp(min, max) ->  obj
+ *     obj.clamp(range)    ->  obj
+ *
+ * In <code>(min, max)</code> form, returns _min_ if _obj_
+ * <code><=></code> _min_ is less than zero, _max_ if _obj_
+ * <code><=></code> _max_ is greater than zero, and _obj_
+ * 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'
+ *
+ * In <code>(range)</code> form, returns _range.begin_ if _obj_
+ * <code><=></code> _range.begin_ is less than zero, _range.end_
+ * if _obj_ <code><=></code> _range.end_ is greater than zero, and
+ * _obj_ 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'
+ *
+ * If _range.begin_ is +nil+, it is considered smaller than _obj_,
+ * and if _range.end_ is +nil+, it is considered greater than
+ * _obj_.
+ *
+ *     -20.clamp(0..)           #=> 0
+ *     523.clamp(..100)         #=> 100
+ *
+ * When _range.end_ is excluded and not +nil+, an exception is
+ * raised.
+ *
+ *     100.clamp(0...100)       # ArgumentError
+ */
+
+static VALUE
+cmp_clamp(int argc, VALUE *argv, VALUE x)
+{
+    VALUE min, max;
+    int c, excl = 0;
+
+    if (rb_scan_args(argc, argv, "11", &min, &max) == 1) {
+        VALUE range = min;
+        if (!rb_range_values(range, &min, &max, &excl)) {
+            rb_raise(rb_eTypeError, "wrong argument type %s (expected Range)",
+                     rb_builtin_class_name(range));
+        }
+        if (!NIL_P(max)) {
+            if (excl) rb_raise(rb_eArgError, "cannot clamp with an exclusive range");
+            if (!NIL_P(min) && cmpint(min, max) > 0) goto arg_error;
+        }
+    }
+    else if (cmpint(min, max) > 0) {
+      arg_error:
+	rb_raise(rb_eArgError, "min argument must be smaller than max argument");
+    }
+
+    if (!NIL_P(min)) {
+        c = cmpint(x, min);
+        if (c == 0) return x;
+        if (c < 0) return min;
+    }
+    if (!NIL_P(max)) {
+        c = cmpint(x, max);
+        if (c > 0) return max;
+    }
+    return x;
+}
+
+/*
+ *  The Comparable 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 a
+ *  value less than 0, returning 0, or returning a value greater than 0,
+ *  depending on whether the receiver is less than, equal to,
+ *  or greater than the other object. If the other object is not
+ *  comparable then the <code><=></code> operator should return +nil+.
+ *  Comparable uses <code><=></code> to implement the conventional
+ *  comparison operators (<code><</code>, <code><=</code>,
+ *  <code>==</code>, <code>>=</code>, and <code>></code>) and the
+ *  method <code>between?</code>.
  *
  *     class SizeMatters
  *       include Comparable
  *       attr :str
- *       def <=>(anOther)
- *         str.size <=> anOther.str.size
+ *       def <=>(other)
+ *         str.size <=> other.str.size
  *       end
  *       def initialize(str)
  *         @str = str
@@ -210,6 +303,5 @@ 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);
-
-    cmp = rb_intern("<=>");
+    rb_define_method(rb_mComparable, "clamp", cmp_clamp, -1);
 }
diff --git a/compile.c b/compile.c
index 53149cafb2..7043ba9a73 100644
--- a/compile.c
+++ b/compile.c
@@ -9,26 +9,39 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "ruby/encoding.h"
+#include "ruby/re.h"
+#include "ruby/util.h"
 #include "internal.h"
+#include "encindex.h"
 #include <math.h>
 
-#define USE_INSN_STACK_INCREASE 1
 #include "vm_core.h"
+#include "vm_debug.h"
+#include "builtin.h"
 #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 numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
 #define FIXNUM_INC(n, i) ((n)+(INT2FIX(i)&~FIXNUM_FLAG))
 #define FIXNUM_OR(n, i) ((n)|INT2FIX(i))
 
 typedef struct iseq_link_element {
     enum {
-	ISEQ_ELEMENT_NONE,
+	ISEQ_ELEMENT_ANCHOR,
 	ISEQ_ELEMENT_LABEL,
 	ISEQ_ELEMENT_INSN,
-	ISEQ_ELEMENT_ADJUST
+	ISEQ_ELEMENT_ADJUST,
+        ISEQ_ELEMENT_TRACE,
     } type;
     struct iseq_link_element *next;
     struct iseq_link_element *prev;
@@ -39,22 +52,35 @@ 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;
+    unsigned int unremovable: 1;
 } LABEL;
 
 typedef struct iseq_insn_data {
     LINK_ELEMENT link;
     enum ruby_vminsn_type insn_id;
-    int line_no;
     int operand_size;
     int sc_state;
     VALUE *operands;
+    struct {
+	int line_no;
+	rb_event_flag_t events;
+    } insn_info;
 } INSN;
 
 typedef struct iseq_adjust_data {
@@ -63,6 +89,12 @@ typedef struct iseq_adjust_data {
     int line_no;
 } ADJUST;
 
+typedef struct iseq_trace_data {
+    LINK_ELEMENT link;
+    rb_event_flag_t event;
+    long data;
+} TRACE;
+
 struct ensure_range {
     LABEL *begin;
     LABEL *end;
@@ -70,11 +102,13 @@ struct ensure_range {
 };
 
 struct iseq_compile_data_ensure_node_stack {
-    NODE *ensure_node;
+    const NODE *ensure_node;
     struct iseq_compile_data_ensure_node_stack *prev;
     struct ensure_range *erange;
 };
 
+const ID rb_iseq_shared_exc_local_tbl[] = {idERROR_INFO};
+
 /**
  * debug function(macro) interface depend on CPDEBUG
  * if it is less than 0, runtime option is in effect.
@@ -95,7 +129,7 @@ struct iseq_compile_data_ensure_node_stack {
 #if CPDEBUG >= 0
 #define compile_debug CPDEBUG
 #else
-#define compile_debug iseq->compile_data->option->debug_level
+#define compile_debug ISEQ_COMPILE_DATA(iseq)->option->debug_level
 #endif
 
 #if CPDEBUG
@@ -125,35 +159,24 @@ struct iseq_compile_data_ensure_node_stack {
 
 #define debug_node_start(node)  ((void) \
   (compile_debug_print_indent(1) && \
-   (ruby_debug_print_node(1, CPDEBUG, "", (NODE *)(node)), gl_node_level)), \
+   (ruby_debug_print_node(1, CPDEBUG, "", (const NODE *)(node)), gl_node_level)), \
    gl_node_level++)
 
-#define debug_node_end()  gl_node_level --;
+#define debug_node_end()  gl_node_level --
 
 #else
 
-static inline ID
-r_id(ID id)
-{
-    return id;
-}
-
-static inline VALUE
-r_value(VALUE value)
-{
-    return value;
-}
-
-#define debugi(header, id)                 r_id(id)
-#define debugp(header, value)              r_value(value)
-#define debugp_verbose(header, value)      r_value(value)
-#define debugp_verbose_node(header, value) r_value(value)
-#define debugp_param(header, value)        r_value(value)
+#define debugi(header, id)                 ((void)0)
+#define debugp(header, value)              ((void)0)
+#define debugp_verbose(header, value)      ((void)0)
+#define debugp_verbose_node(header, value) ((void)0)
+#define debugp_param(header, value)        ((void)0)
 #define debug_node_start(node)             ((void)0)
 #define debug_node_end()                   ((void)0)
 #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
@@ -161,21 +184,17 @@ 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 LABEL_FORMAT "<L%03d>"
 
-#define iseq_filename(iseq) \
-  (((rb_iseq_t*)DATA_PTR(iseq))->filename)
-
-#define iseq_filepath(iseq) \
-  (((rb_iseq_t*)DATA_PTR(iseq))->filepath)
+#define NEW_ISEQ(node, name, type, line_no) \
+  new_child_iseq(iseq, (node), rb_fstring(name), 0, (type), (line_no))
 
-#define NEW_ISEQVAL(node, name, type, line_no)       \
-  new_child_iseq(iseq, (node), (name), 0, (type), (line_no))
-
-#define NEW_CHILD_ISEQVAL(node, name, type, line_no)       \
-  new_child_iseq(iseq, (node), (name), iseq->self, (type), (line_no))
+#define NEW_CHILD_ISEQ(node, name, type, line_no) \
+  new_child_iseq(iseq, (node), rb_fstring(name), iseq, (type), (line_no))
 
 /* add instructions */
 #define ADD_SEQ(seq1, seq2) \
@@ -185,16 +204,34 @@ r_value(VALUE value)
 #define ADD_INSN(seq, line, insn) \
   ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0))
 
-/* add an instruction with label operand */
-#define ADD_INSNL(seq, line, insn, label) \
-  ADD_ELEM((seq), (LINK_ELEMENT *) \
-           new_insn_body(iseq, (line), BIN(insn), 1, (VALUE)(label)))
+/* insert an instruction before next */
+#define INSERT_BEFORE_INSN(next, line, insn) \
+  ELEM_INSERT_PREV(&(next)->link, (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0))
+
+/* insert an instruction after prev */
+#define INSERT_AFTER_INSN(prev, line, insn) \
+  ELEM_INSERT_NEXT(&(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 next */
+#define INSERT_BEFORE_INSN1(next, line, insn, op1) \
+  ELEM_INSERT_PREV(&(next)->link, (LINK_ELEMENT *) \
+           new_insn_body(iseq, (line), BIN(insn), 1, (VALUE)(op1)))
+
+/* insert an instruction with some operands (1, 2, 3, 5) after prev */
+#define INSERT_AFTER_INSN1(prev, line, insn, op1) \
+  ELEM_INSERT_NEXT(&(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_INSN2(seq, line, insn, op1, op2) \
   ADD_ELEM((seq), (LINK_ELEMENT *) \
            new_insn_body(iseq, (line), BIN(insn), 2, (VALUE)(op1), (VALUE)(op2)))
@@ -205,50 +242,98 @@ r_value(VALUE value)
 
 /* Specific Insn factory */
 #define ADD_SEND(seq, line, id, argc) \
-  ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(0))
+  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)
 
 #define ADD_CALL_RECEIVER(seq, line) \
-  ADD_INSN((seq), (line), putnil)
+  ADD_INSN((seq), (line), putself)
 
 #define ADD_CALL(seq, line, id, argc) \
-  ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(VM_CALL_FCALL_BIT))
+  ADD_SEND_R((seq), (line), (id), (argc), NULL, (VALUE)INT2FIX(VM_CALL_FCALL), NULL)
 
 #define ADD_CALL_WITH_BLOCK(seq, line, id, argc, block) \
-  ADD_SEND_R((seq), (line), (id), (argc), (block), (VALUE)INT2FIX(VM_CALL_FCALL_BIT))
+  ADD_SEND_R((seq), (line), (id), (argc), (block), (VALUE)INT2FIX(VM_CALL_FCALL), NULL)
+
+#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_TRACE(seq, event) \
+  ADD_ELEM((seq), (LINK_ELEMENT *)new_trace_body(iseq, (event), 0))
+#define ADD_TRACE_WITH_DATA(seq, event, data) \
+  ADD_ELEM((seq), (LINK_ELEMENT *)new_trace_body(iseq, (event), (data)))
 
-#define ADD_SEND_R(seq, line, id, argc, block, flag) \
-  ADD_ELEM((seq), (LINK_ELEMENT *) \
-           new_insn_send(iseq, (line), \
-                         (VALUE)(id), (VALUE)(argc), (VALUE)(block), (VALUE)(flag)))
 
-#define ADD_TRACE(seq, line, event) \
+#define DECL_BRANCH_BASE(branches, first_line, first_column, last_line, last_column, type) \
   do { \
-      if ((event) == RUBY_EVENT_LINE && iseq->coverage && \
-	  (line) != iseq->compile_data->last_coverable_line) { \
-	  RARRAY_PTR(iseq->coverage)[(line) - 1] = INT2FIX(0); \
-	  iseq->compile_data->last_coverable_line = (line); \
-	  ADD_INSN1((seq), (line), trace, INT2FIX(RUBY_EVENT_COVERAGE)); \
+      if (ISEQ_COVERAGE(iseq) && \
+	  ISEQ_BRANCH_COVERAGE(iseq) && \
+	  (first_line) > 0) { \
+	  VALUE structure = RARRAY_AREF(ISEQ_BRANCH_COVERAGE(iseq), 0); \
+	  branches = rb_ary_tmp_new(5); \
+	  rb_ary_push(structure, branches); \
+	  rb_ary_push(branches, ID2SYM(rb_intern(type))); \
+	  rb_ary_push(branches, INT2FIX(first_line)); \
+	  rb_ary_push(branches, INT2FIX(first_column)); \
+	  rb_ary_push(branches, INT2FIX(last_line)); \
+	  rb_ary_push(branches, INT2FIX(last_column)); \
       } \
-      if (iseq->compile_data->option->trace_instruction) { \
-	  ADD_INSN1((seq), (line), trace, INT2FIX(event)); \
+  } while (0)
+#define ADD_TRACE_BRANCH_COVERAGE(seq, first_line, first_column, last_line, last_column, type, branches) \
+  do { \
+      if (ISEQ_COVERAGE(iseq) && \
+	  ISEQ_BRANCH_COVERAGE(iseq) && \
+	  (first_line) > 0) { \
+	  VALUE counters = RARRAY_AREF(ISEQ_BRANCH_COVERAGE(iseq), 1); \
+	  long counter_idx = RARRAY_LEN(counters); \
+	  rb_ary_push(counters, INT2FIX(0)); \
+	  rb_ary_push(branches, ID2SYM(rb_intern(type))); \
+	  rb_ary_push(branches, INT2FIX(first_line)); \
+	  rb_ary_push(branches, INT2FIX(first_column)); \
+	  rb_ary_push(branches, INT2FIX(last_line)); \
+	  rb_ary_push(branches, INT2FIX(last_column)); \
+	  rb_ary_push(branches, INT2FIX(counter_idx)); \
+          ADD_TRACE_WITH_DATA(seq, RUBY_EVENT_COVERAGE_BRANCH, counter_idx); \
+          ADD_INSN(seq, last_line, nop); \
       } \
-  }while(0);
+  } while (0)
+
+static void iseq_add_getlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line, int idx, int level);
+static void iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line, int idx, int level);
+
+#define ADD_GETLOCAL(seq, line, idx, level) iseq_add_getlocal(iseq, (seq), (line), (idx), (level))
+#define ADD_SETLOCAL(seq, line, idx, level) iseq_add_setlocal(iseq, (seq), (line), (idx), (level))
 
 /* add label */
 #define ADD_LABEL(seq, label) \
   ADD_ELEM((seq), (LINK_ELEMENT *) (label))
 
+#define APPEND_LABEL(seq, before, label) \
+  APPEND_ELEM((seq), (before), (LINK_ELEMENT *) (label))
+
 #define ADD_ADJUST(seq, line, label) \
   ADD_ELEM((seq), (LINK_ELEMENT *) new_adjust_body(iseq, (label), (line)))
 
 #define ADD_ADJUST_RESTORE(seq, label) \
   ADD_ELEM((seq), (LINK_ELEMENT *) new_adjust_body(iseq, (label), -1))
 
-#define ADD_CATCH_ENTRY(type, ls, le, iseqv, lc)		\
-    (rb_ary_push(iseq->compile_data->catch_table_ary,		\
-		 rb_ary_new3(5, (type),				\
-			     (VALUE)(ls) | 1, (VALUE)(le) | 1,	\
-			     (iseqv), (VALUE)(lc) | 1)))
+#define LABEL_UNREMOVABLE(label) \
+    ((label) ? (LABEL_REF(label), (label)->unremovable=1) : 0)
+#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);			\
+    LABEL_UNREMOVABLE(ls);							\
+    LABEL_REF(le);								\
+    LABEL_REF(lc);								\
+    if (NIL_P(ISEQ_COMPILE_DATA(iseq)->catch_table_ary)) \
+        RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, rb_ary_tmp_new(3)); \
+    rb_ary_push(ISEQ_COMPILE_DATA(iseq)->catch_table_ary, freeze_hide_obj(_e));	\
+} while (0)
 
 /* compile node */
 #define COMPILE(anchor, desc, node) \
@@ -256,14 +341,19 @@ r_value(VALUE value)
                  iseq_compile_each(iseq, (anchor), (node), 0)))
 
 /* compile node, this node's value will be popped */
-#define COMPILE_POPED(anchor, desc, node)    \
+#define COMPILE_POPPED(anchor, desc, node)    \
   (debug_compile("== " desc "\n", \
                  iseq_compile_each(iseq, (anchor), (node), 1)))
 
-/* compile node, which is popped when 'poped' is true */
-#define COMPILE_(anchor, desc, node, poped)  \
+/* compile node, which is popped when 'popped' is true */
+#define COMPILE_(anchor, desc, node, popped)  \
   (debug_compile("== " desc "\n", \
-                 iseq_compile_each(iseq, (anchor), (node), (poped))))
+                 iseq_compile_each(iseq, (anchor), (node), (popped))))
+
+#define COMPILE_RECV(anchor, desc, node) \
+    (private_recv_p(node) ? \
+     (ADD_INSN(anchor, nd_line(node), putself), VM_CALL_FCALL) : \
+     COMPILE(anchor, desc, node->nd_recv) ? 0 : -1)
 
 #define OPERAND_AT(insn, idx) \
   (((INSN*)(insn))->operands[(idx)])
@@ -271,34 +361,108 @@ 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_TRACE(link) ((link)->type == ISEQ_ELEMENT_TRACE)
+#define IS_INSN_ID(iobj, insn) (INSN_OF(iobj) == BIN(insn))
+#define IS_NEXT_INSN_ID(link, insn) \
+    ((link)->next && IS_INSN((link)->next) && IS_INSN_ID((link)->next, insn))
+
 /* error */
-#define COMPILE_ERROR(strs)                        \
-{                                                  \
-  VALUE tmp = GET_THREAD()->errinfo;               \
-  if (compile_debug) rb_compile_bug strs;          \
-  GET_THREAD()->errinfo = iseq->compile_data->err_info;  \
-  rb_compile_error strs;                           \
-  iseq->compile_data->err_info = GET_THREAD()->errinfo; \
-  GET_THREAD()->errinfo = tmp;                     \
-  ret = 0;                                         \
-  break;                                           \
+#if CPDEBUG > 0
+NORETURN(static void append_compile_error(const rb_iseq_t *iseq, int line, const char *fmt, ...));
+#endif
+
+static void
+append_compile_error(const rb_iseq_t *iseq, int line, const char *fmt, ...)
+{
+    VALUE err_info = ISEQ_COMPILE_DATA(iseq)->err_info;
+    VALUE file = rb_iseq_path(iseq);
+    VALUE err = err_info == Qtrue ? Qfalse : 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);
+    }
+    else if (!err_info) {
+	RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, Qtrue);
+    }
+    if (compile_debug) {
+        if (SPECIAL_CONST_P(err)) err = rb_eSyntaxError;
+        rb_exc_fatal(err);
+    }
 }
 
-#define ERROR_ARGS ruby_sourcefile, nd_line(node),
+#if 0
+static void
+compile_bug(rb_iseq_t *iseq, int line, const char *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    rb_report_bug_valist(rb_iseq_path(iseq), line, fmt, args);
+    va_end(args);
+    abort();
+}
+#endif
 
+#define COMPILE_ERROR append_compile_error
+
+#define ERROR_ARGS_AT(n) iseq, nd_line(n),
+#define ERROR_ARGS ERROR_ARGS_AT(node)
+
+#define EXPECT_NODE(prefix, node, ndtype, errval) \
+do { \
+    const NODE *error_node = (node); \
+    enum node_type error_type = nd_type(error_node); \
+    if (error_type != (ndtype)) { \
+	COMPILE_ERROR(ERROR_ARGS_AT(error_node) \
+		      prefix ": " #ndtype " is expected, but %s", \
+		      ruby_node_name(error_type)); \
+	return errval; \
+    } \
+} while (0)
+
+#define EXPECT_NODE_NONULL(prefix, parent, ndtype, errval) \
+do { \
+    COMPILE_ERROR(ERROR_ARGS_AT(parent) \
+		  prefix ": must be " #ndtype ", but 0"); \
+    return errval; \
+} while (0)
+
+#define UNKNOWN_NODE(prefix, node, errval) \
+do { \
+    const NODE *error_node = (node); \
+    COMPILE_ERROR(ERROR_ARGS_AT(error_node) prefix ": unknown node (%s)", \
+		  ruby_node_name(nd_type(error_node))); \
+    return errval; \
+} while (0)
 
 #define COMPILE_OK 1
 #define COMPILE_NG 0
 
+#define CHECK(sub) if (!(sub)) {BEFORE_RETURN;return COMPILE_NG;}
+#define NO_CHECK(sub) (void)(sub)
+#define BEFORE_RETURN
 
 /* leave name uninitialized so that compiler warn if INIT_ANCHOR is
  * missing */
 #define DECL_ANCHOR(name) \
-  LINK_ANCHOR *name, name##_body__ = {{0,},}
+    LINK_ANCHOR name[1] = {{{ISEQ_ELEMENT_ANCHOR,},}}
 #define INIT_ANCHOR(name) \
-  (name##_body__.last = &name##_body__.anchor, name = &name##_body__)
+    (name->last = &name->anchor)
 
-#define hide_obj(obj) do {OBJ_FREEZE(obj); RBASIC(obj)->klass = 0;} while (0)
+static inline VALUE
+freeze_hide_obj(VALUE obj)
+{
+    OBJ_FREEZE(obj);
+    RBASIC_CLEAR_CLASS(obj);
+    return obj;
+}
 
 #include "optinsn.inc"
 #if OPT_INSTRUCTIONS_UNIFICATION
@@ -315,42 +479,44 @@ r_value(VALUE value)
 #endif
 
 #if CPDEBUG
-#define gl_node_level iseq->compile_data->node_level
-#if 0
-static void debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor);
-#endif
+#define gl_node_level ISEQ_COMPILE_DATA(iseq)->node_level
 #endif
 
-static void dump_disasm_list(LINK_ELEMENT *elem);
+static void dump_disasm_list_with_cursor(const LINK_ELEMENT *link, const LINK_ELEMENT *curr, const LABEL *dest);
+static void dump_disasm_list(const LINK_ELEMENT *elem);
 
 static int insn_data_length(INSN *iobj);
-static int insn_data_line_no(INSN *iobj);
 static int calc_sp_depth(int depth, INSN *iobj);
 
-static INSN *new_insn_body(rb_iseq_t *iseq, int line_no, int insn_id, int argc, ...);
+static INSN *new_insn_body(rb_iseq_t *iseq, int line_no, enum ruby_vminsn_type insn_id, int argc, ...);
 static LABEL *new_label_body(rb_iseq_t *iseq, long line);
 static ADJUST *new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line);
+static TRACE *new_trace_body(rb_iseq_t *iseq, rb_event_flag_t event, long data);
 
-static int iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * n, int);
-static int iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-static int iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-static int iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
 
-static int iseq_set_local_table(rb_iseq_t *iseq, ID *tbl);
+static int iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *anchor, const NODE *n, int);
+static int iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
+static int iseq_setup_insn(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_set_local_table(rb_iseq_t *iseq, const ID *tbl);
 static int iseq_set_exception_local_table(rb_iseq_t *iseq);
-static int iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * node);
+static int iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const anchor, const NODE *const node);
 
-static int iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-static int iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+static int iseq_set_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_exception_table(rb_iseq_t *iseq);
 static int iseq_set_optargs_table(rb_iseq_t *iseq);
 
+static int compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, VALUE needstr);
+
 /*
  * To make Array to LinkedList, use link_anchor
  */
 
 static void
-verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *anchor)
+verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *const anchor)
 {
 #if CPDEBUG
     int flag = 0;
@@ -381,40 +547,62 @@ verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *anchor)
 #define verify_list(info, anchor) verify_list(iseq, (info), (anchor))
 #endif
 
+static void
+verify_call_cache(rb_iseq_t *iseq)
+{
+#if CPDEBUG
+    VALUE *original = rb_iseq_original_iseq(iseq);
+    size_t i = 0;
+    while (i < iseq->body->iseq_size) {
+        VALUE insn = original[i];
+        const char *types = insn_op_types(insn);
+
+        for (int j=0; types[j]; j++) {
+            if (types[j] == TS_CALLDATA) {
+                struct rb_call_cache cc;
+                struct rb_call_data *cd = (struct rb_call_data *)original[i+j+1];
+                MEMZERO(&cc, cc, 1);
+                if (memcmp(&cc, &cd->cc, sizeof(cc))) {
+                    rb_bug("call cache not zero for fresh iseq");
+                }
+            }
+        }
+        i += insn_len(insn);
+    }
+#endif
+}
+
 /*
  * elem1, elem2 => elem1, elem2, elem
  */
 static void
-ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem)
+ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *elem)
 {
     elem->prev = anchor->last;
     anchor->last->next = elem;
     anchor->last = elem;
     verify_list("add", anchor);
 }
-#if CPDEBUG < 0
-#define ADD_ELEM(anchor, elem) ADD_ELEM(iseq, (anchor), (elem))
-#endif
 
-static int
-iseq_add_mark_object(rb_iseq_t *iseq, VALUE v)
+/*
+ * elem1, before, elem2 => elem1, before, elem, elem2
+ */
+static void
+APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *before, LINK_ELEMENT *elem)
 {
-    if (!SPECIAL_CONST_P(v)) {
-	rb_ary_push(iseq->mark_ary, v);
-    }
-    return COMPILE_OK;
+    elem->prev = before;
+    elem->next = before->next;
+    elem->next->prev = elem;
+    before->next = elem;
+    if (before == anchor->last) anchor->last = elem;
+    verify_list("add", anchor);
 }
+#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))
+#endif
 
-#define ruby_sourcefile		RSTRING_PTR(iseq->filename)
-
-static int
-iseq_add_mark_object_compile_time(rb_iseq_t *iseq, VALUE v)
-{
-    if (!SPECIAL_CONST_P(v)) {
-	rb_ary_push(iseq->compile_data->mark_ary, v);
-    }
-    return COMPILE_OK;
-}
+#define ISEQ_LAST_LINE(iseq) (ISEQ_COMPILE_DATA(iseq)->last_line)
 
 static int
 validate_label(st_data_t name, st_data_t label, st_data_t arg)
@@ -423,9 +611,9 @@ validate_label(st_data_t name, st_data_t label, st_data_t arg)
     LABEL *lobj = (LABEL *)label;
     if (!lobj->link.next) {
 	do {
-	    int ret;
-	    COMPILE_ERROR((ruby_sourcefile, lobj->position,
-			   "%s: undefined label", rb_id2name((ID)name)));
+	    COMPILE_ERROR(iseq, lobj->position,
+			  "%"PRIsVALUE": undefined label",
+			  rb_sym2str((VALUE)name));
 	} while (0);
     }
     return ST_CONTINUE;
@@ -435,164 +623,293 @@ static void
 validate_labels(rb_iseq_t *iseq, st_table *labels_table)
 {
     st_foreach(labels_table, validate_label, (st_data_t)iseq);
-    if (!NIL_P(iseq->compile_data->err_info)) {
-	rb_exc_raise(iseq->compile_data->err_info);
-    }
+    st_free_table(labels_table);
 }
 
 VALUE
-rb_iseq_compile_node(VALUE self, NODE *node)
+rb_iseq_compile_callback(rb_iseq_t *iseq, const struct rb_iseq_new_with_callback_callback_func * ifunc)
 {
     DECL_ANCHOR(ret);
-    rb_iseq_t *iseq;
     INIT_ANCHOR(ret);
-    GetISeqPtr(self, iseq);
+
+    (*ifunc->func)(iseq, ret, ifunc->data);
+
+    ADD_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, leave);
+
+    CHECK(iseq_setup_insn(iseq, ret));
+    return iseq_setup(iseq, ret);
+}
+
+VALUE
+rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node)
+{
+    DECL_ANCHOR(ret);
+    INIT_ANCHOR(ret);
+
+    if (imemo_type_p((VALUE)node, imemo_ifunc)) {
+        rb_raise(rb_eArgError, "unexpected imemo_ifunc");
+    }
 
     if (node == 0) {
-	COMPILE(ret, "nil", node);
+        NO_CHECK(COMPILE(ret, "nil", node));
 	iseq_set_local_table(iseq, 0);
     }
+    /* assume node is T_NODE */
     else if (nd_type(node) == NODE_SCOPE) {
 	/* iseq type of top, method, class, block */
 	iseq_set_local_table(iseq, node->nd_tbl);
 	iseq_set_arguments(iseq, ret, node->nd_args);
 
-	switch (iseq->type) {
-	  case ISEQ_TYPE_BLOCK: {
-	    LABEL *start = iseq->compile_data->start_label = NEW_LABEL(0);
-	    LABEL *end = iseq->compile_data->end_label = NEW_LABEL(0);
-
-	    ADD_LABEL(ret, start);
-	    COMPILE(ret, "block body", node->nd_body);
-	    ADD_LABEL(ret, end);
-
-	    /* wide range catch handler must put at last */
-	    ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, 0, start);
-	    ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, 0, end);
-	    break;
-	  }
-	  case ISEQ_TYPE_CLASS: {
-	    ADD_TRACE(ret, FIX2INT(iseq->line_no), RUBY_EVENT_CLASS);
-	    COMPILE(ret, "scoped node", node->nd_body);
-	    ADD_TRACE(ret, nd_line(node), RUBY_EVENT_END);
-	    break;
-	  }
-	  case ISEQ_TYPE_METHOD: {
-	    ADD_TRACE(ret, FIX2INT(iseq->line_no), RUBY_EVENT_CALL);
-	    COMPILE(ret, "scoped node", node->nd_body);
-	    ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN);
-	    break;
-	  }
+	switch (iseq->body->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;
+
+		ADD_TRACE(ret, RUBY_EVENT_B_CALL);
+		ADD_INSN (ret, FIX2INT(iseq->body->location.first_lineno), nop);
+		ADD_LABEL(ret, start);
+		CHECK(COMPILE(ret, "block body", node->nd_body));
+		ADD_LABEL(ret, end);
+		ADD_TRACE(ret, RUBY_EVENT_B_RETURN);
+		ISEQ_COMPILE_DATA(iseq)->last_line = iseq->body->location.code_location.end_pos.lineno;
+
+		/* wide range catch handler must put at last */
+		ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, NULL, start);
+		ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, NULL, end);
+		break;
+	    }
+	  case ISEQ_TYPE_CLASS:
+	    {
+		ADD_TRACE(ret, RUBY_EVENT_CLASS);
+		CHECK(COMPILE(ret, "scoped node", node->nd_body));
+		ADD_TRACE(ret, RUBY_EVENT_END);
+		ISEQ_COMPILE_DATA(iseq)->last_line = nd_line(node);
+		break;
+	    }
+	  case ISEQ_TYPE_METHOD:
+	    {
+		ADD_TRACE(ret, RUBY_EVENT_CALL);
+		CHECK(COMPILE(ret, "scoped node", node->nd_body));
+		ADD_TRACE(ret, RUBY_EVENT_RETURN);
+		ISEQ_COMPILE_DATA(iseq)->last_line = nd_line(node);
+		break;
+	    }
 	  default: {
-	    COMPILE(ret, "scoped node", node->nd_body);
+	    CHECK(COMPILE(ret, "scoped node", node->nd_body));
 	    break;
 	  }
 	}
     }
     else {
-	switch (iseq->type) {
-	  case ISEQ_TYPE_METHOD:
-	  case ISEQ_TYPE_CLASS:
-	  case ISEQ_TYPE_BLOCK:
-	  case ISEQ_TYPE_EVAL:
-	  case ISEQ_TYPE_MAIN:
-	  case ISEQ_TYPE_TOP:
-	    rb_compile_error(ERROR_ARGS "compile/should not be reached: %s:%d",
-			     __FILE__, __LINE__);
-	    break;
+	const char *m;
+#define INVALID_ISEQ_TYPE(type) \
+	ISEQ_TYPE_##type: m = #type; goto invalid_iseq_type
+	switch (iseq->body->type) {
+	  case INVALID_ISEQ_TYPE(METHOD);
+	  case INVALID_ISEQ_TYPE(CLASS);
+	  case INVALID_ISEQ_TYPE(BLOCK);
+	  case INVALID_ISEQ_TYPE(EVAL);
+	  case INVALID_ISEQ_TYPE(MAIN);
+	  case INVALID_ISEQ_TYPE(TOP);
+#undef INVALID_ISEQ_TYPE /* invalid iseq types end */
 	  case ISEQ_TYPE_RESCUE:
 	    iseq_set_exception_local_table(iseq);
-	    COMPILE(ret, "rescue", node);
+	    CHECK(COMPILE(ret, "rescue", node));
 	    break;
 	  case ISEQ_TYPE_ENSURE:
 	    iseq_set_exception_local_table(iseq);
-	    COMPILE_POPED(ret, "ensure", node);
+	    CHECK(COMPILE_POPPED(ret, "ensure", node));
 	    break;
-	  case ISEQ_TYPE_DEFINED_GUARD:
-	    iseq_set_local_table(iseq, 0);
-	    COMPILE(ret, "defined guard", node);
+	  case ISEQ_TYPE_PLAIN:
+	    CHECK(COMPILE(ret, "ensure", node));
 	    break;
 	  default:
-	    rb_bug("unknown scope");
+	    COMPILE_ERROR(ERROR_ARGS "unknown scope: %d", iseq->body->type);
+	    return COMPILE_NG;
+	  invalid_iseq_type:
+	    COMPILE_ERROR(ERROR_ARGS "compile/ISEQ_TYPE_%s should not be reached", m);
+	    return COMPILE_NG;
 	}
     }
 
-    if (iseq->type == ISEQ_TYPE_RESCUE || iseq->type == ISEQ_TYPE_ENSURE) {
-	ADD_INSN2(ret, 0, getdynamic, INT2FIX(2), INT2FIX(0));
+    if (iseq->body->type == ISEQ_TYPE_RESCUE || iseq->body->type == ISEQ_TYPE_ENSURE) {
+	ADD_GETLOCAL(ret, 0, LVAR_ERRINFO, 0);
 	ADD_INSN1(ret, 0, throw, INT2FIX(0) /* continue throw */ );
     }
     else {
-	ADD_INSN(ret, iseq->compile_data->last_line, leave);
+	ADD_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, leave);
     }
 
-#if SUPPORT_JOKE
-    if (iseq->compile_data->labels_table) {
-	validate_labels(iseq, iseq->compile_data->labels_table);
+#if OPT_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);
     }
 #endif
+    CHECK(iseq_setup_insn(iseq, ret));
     return iseq_setup(iseq, ret);
 }
 
-int
+static int
 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 long i;
-
-    iseq->iseq_encoded = ALLOC_N(VALUE, iseq->iseq_size);
-    MEMCPY(iseq->iseq_encoded, iseq->iseq, VALUE, iseq->iseq_size);
+    unsigned int i;
+    VALUE *encoded = (VALUE *)iseq->body->iseq_encoded;
 
-    for (i = 0; i < iseq->iseq_size; /* */ ) {
-	int insn = (int)iseq->iseq_encoded[i];
+    for (i = 0; i < iseq->body->iseq_size; /* */ ) {
+	int insn = (int)iseq->body->iseq_encoded[i];
 	int len = insn_len(insn);
-	iseq->iseq_encoded[i] = (VALUE)table[insn];
+	encoded[i] = (VALUE)table[insn];
 	i += len;
     }
-#else
-    iseq->iseq_encoded = iseq->iseq;
+    FL_SET(iseq, ISEQ_TRANSLATED);
 #endif
     return COMPILE_OK;
 }
 
+VALUE *
+rb_iseq_original_iseq(const rb_iseq_t *iseq) /* cold path */
+{
+    VALUE *original_code;
+
+    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);
+
+#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];
+	    const int insn = rb_vm_insn_addr2insn(addr);
+
+	    original_code[i] = insn;
+	    i += insn_len(insn);
+	}
+    }
+#endif
+    return original_code;
+}
+
 /*********************************************/
 /* 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)
+compile_data_alloc_with_arena(struct iseq_compile_data_storage **arena, size_t size)
 {
     void *ptr = 0;
-    struct iseq_compile_data_storage *storage =
-	iseq->compile_data->storage_current;
+    struct iseq_compile_data_storage *storage = *arena;
+#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 */
 
-    if (storage->pos + size > storage->size) {
-	unsigned long alloc_size = storage->size * 2;
+    if (size >= INT_MAX - padding) rb_memerror();
+    if (storage->pos + size + padding > storage->size) {
+	unsigned int alloc_size = storage->size;
 
-      retry:
-	if (alloc_size < size) {
+	while (alloc_size < size + PADDING_SIZE_MAX) {
+	    if (alloc_size >= INT_MAX / 2) rb_memerror();
 	    alloc_size *= 2;
-	    goto retry;
 	}
 	storage->next = (void *)ALLOC_N(char, alloc_size +
-					sizeof(struct
-					       iseq_compile_data_storage));
-	storage = iseq->compile_data->storage_current = storage->next;
+					offsetof(struct iseq_compile_data_storage, buff));
+	storage = *arena = storage->next;
 	storage->next = 0;
 	storage->pos = 0;
 	storage->size = alloc_size;
-	storage->buff = (char *)(&storage->buff + 1);
+#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 += size;
+    storage->pos += (int)size;
     return ptr;
 }
 
+static void *
+compile_data_alloc(rb_iseq_t *iseq, size_t size)
+{
+    struct iseq_compile_data_storage ** arena = &ISEQ_COMPILE_DATA(iseq)->node.storage_current;
+    return compile_data_alloc_with_arena(arena, size);
+}
+
+static inline void *
+compile_data_alloc2(rb_iseq_t *iseq, size_t x, size_t y)
+{
+    size_t size = rb_size_mul_or_raise(x, y, rb_eRuntimeError);
+    return compile_data_alloc(iseq, size);
+}
+
 static INSN *
 compile_data_alloc_insn(rb_iseq_t *iseq)
 {
-    return (INSN *)compile_data_alloc(iseq, sizeof(INSN));
+    struct iseq_compile_data_storage ** arena = &ISEQ_COMPILE_DATA(iseq)->insn.storage_current;
+    return (INSN *)compile_data_alloc_with_arena(arena, sizeof(INSN));
 }
 
 static LABEL *
@@ -607,11 +924,17 @@ compile_data_alloc_adjust(rb_iseq_t *iseq)
     return (ADJUST *)compile_data_alloc(iseq, sizeof(ADJUST));
 }
 
+static TRACE *
+compile_data_alloc_trace(rb_iseq_t *iseq)
+{
+    return (TRACE *)compile_data_alloc(iseq, sizeof(TRACE));
+}
+
 /*
  * elem1, elemX => elem1, elem2, elemX
  */
 static void
-INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+ELEM_INSERT_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 {
     elem2->next = elem1->next;
     elem2->prev = elem1;
@@ -621,12 +944,11 @@ INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
     }
 }
 
-#if 0 /* unused */
 /*
- * elemX, elem1 => elemX, elem2, elem1
+ * elem1, elemX => elemX, elem2, elem1
  */
 static void
-INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+ELEM_INSERT_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 {
     elem2->prev = elem1->prev;
     elem2->next = elem1;
@@ -635,13 +957,12 @@ INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 	elem2->prev->next = elem2;
     }
 }
-#endif
 
 /*
  * elemX, elem1, elemY => elemX, elem2, elemY
  */
 static void
-REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+ELEM_REPLACE(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 {
     elem2->prev = elem1->prev;
     elem2->next = elem1->next;
@@ -654,7 +975,7 @@ REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 }
 
 static void
-REMOVE_ELEM(LINK_ELEMENT *elem)
+ELEM_REMOVE(LINK_ELEMENT *elem)
 {
     elem->prev->next = elem->next;
     if (elem->next) {
@@ -663,21 +984,19 @@ REMOVE_ELEM(LINK_ELEMENT *elem)
 }
 
 static LINK_ELEMENT *
-FIRST_ELEMENT(LINK_ANCHOR *anchor)
+FIRST_ELEMENT(const LINK_ANCHOR *const anchor)
 {
     return anchor->anchor.next;
 }
 
-#if 0 /* unused */
 static LINK_ELEMENT *
-LAST_ELEMENT(LINK_ANCHOR *anchor)
+LAST_ELEMENT(LINK_ANCHOR *const anchor)
 {
-  return anchor->last;
+    return anchor->last;
 }
-#endif
 
 static LINK_ELEMENT *
-POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
+POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor)
 {
     LINK_ELEMENT *elem = anchor->last;
     anchor->last = anchor->last->prev;
@@ -689,40 +1008,42 @@ POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
 #define POP_ELEMENT(anchor) POP_ELEMENT(iseq, (anchor))
 #endif
 
-#if 0 /* unused */
 static LINK_ELEMENT *
-SHIFT_ELEMENT(LINK_ANCHOR *anchor)
+ELEM_FIRST_INSN(LINK_ELEMENT *elem)
 {
-    LINK_ELEMENT *elem = anchor->anchor.next;
-    if (elem) {
-	anchor->anchor.next = elem->next;
+    while (elem) {
+	switch (elem->type) {
+	  case ISEQ_ELEMENT_INSN:
+	  case ISEQ_ELEMENT_ADJUST:
+	    return elem;
+	  default:
+	    elem = elem->next;
+	}
     }
-    return elem;
+    return NULL;
 }
-#endif
 
-#if 0 /* unused */
 static int
-LIST_SIZE(LINK_ANCHOR *anchor)
+LIST_INSN_SIZE_ONE(const LINK_ANCHOR *const anchor)
 {
-    LINK_ELEMENT *elem = anchor->anchor.next;
-    int size = 0;
-    while (elem) {
-	size += 1;
-	elem = elem->next;
+    LINK_ELEMENT *first_insn = ELEM_FIRST_INSN(FIRST_ELEMENT(anchor));
+    if (first_insn != NULL &&
+	ELEM_FIRST_INSN(first_insn->next) == NULL) {
+	return TRUE;
+    }
+    else {
+	return FALSE;
     }
-    return size;
 }
-#endif
 
 static int
-LIST_SIZE_ZERO(LINK_ANCHOR *anchor)
+LIST_INSN_SIZE_ZERO(const LINK_ANCHOR *const anchor)
 {
-    if (anchor->anchor.next == 0) {
-	return 1;
+    if (ELEM_FIRST_INSN(FIRST_ELEMENT(anchor)) == NULL) {
+	return TRUE;
     }
     else {
-	return 0;
+	return FALSE;
     }
 }
 
@@ -734,7 +1055,7 @@ LIST_SIZE_ZERO(LINK_ANCHOR *anchor)
  * anc2: e4, e5 (broken)
  */
 static void
-APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
+APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *const anc1, LINK_ANCHOR *const anc2)
 {
     if (anc2->anchor.next) {
 	anc1->last->next = anc2->anchor.next;
@@ -747,97 +1068,9 @@ APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
 #define APPEND_LIST(anc1, anc2) APPEND_LIST(iseq, (anc1), (anc2))
 #endif
 
-/*
- * anc1: e1, e2, e3
- * anc2: e4, e5
- *#=>
- * anc1: e4, e5, e1, e2, e3
- * anc2: e4, e5 (broken)
- */
-static void
-INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
-{
-    if (anc2->anchor.next) {
-	LINK_ELEMENT *first = anc1->anchor.next;
-	anc1->anchor.next = anc2->anchor.next;
-	anc1->anchor.next->prev = &anc1->anchor;
-	anc2->last->next = first;
-	if (first) {
-	    first->prev = anc2->last;
-	}
-	else {
-	    anc1->last = anc2->last;
-	}
-    }
-
-    verify_list("append", anc1);
-}
-#if CPDEBUG < 0
-#define INSERT_LIST(anc1, anc2) INSERT_LIST(iseq, (anc1), (anc2))
-#endif
-
-#if 0 /* unused */
-/*
- * anc1: e1, e2, e3
- * anc2: e4, e5
- *#=>
- * anc1: e4, e5
- * anc2: e1, e2, e3
- */
-static void
-SWAP_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
-{
-    LINK_ANCHOR tmp = *anc2;
-
-    /* it has bug */
-    *anc2 = *anc1;
-    *anc1 = tmp;
-
-    verify_list("swap1", anc1);
-    verify_list("swap2", anc2);
-}
-#if CPDEBUG < 0
-#define SWAP_LIST(anc1, anc2) SWAP_LIST(iseq, (anc1), (anc2))
-#endif
-
-static LINK_ANCHOR *
-REVERSE_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc)
-{
-    LINK_ELEMENT *first, *last, *elem, *e;
-    first = &anc->anchor;
-    elem = first->next;
-    last = anc->last;
-
-    if (elem != 0) {
-	anc->anchor.next = last;
-	anc->last = elem;
-    }
-    else {
-	/* null list */
-	return anc;
-    }
-    while (elem) {
-	e = elem->next;
-	elem->next = elem->prev;
-	elem->prev = e;
-	elem = e;
-    }
-
-    first->next = last;
-    last->prev = first;
-    anc->last->next = 0;
-
-    verify_list("reverse", anc);
-    return anc;
-}
-#if CPDEBUG < 0
-#define REVERSE_LIST(anc) REVERSE_LIST(iseq, (anc))
-#endif
-#endif
-
 #if CPDEBUG && 0
 static void
-debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
+debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor)
 {
     LINK_ELEMENT *list = FIRST_ELEMENT(anchor);
     printf("----\n");
@@ -856,8 +1089,23 @@ debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
 #if CPDEBUG < 0
 #define debug_list(anc) debug_list(iseq, (anc))
 #endif
+#else
+#define debug_list(anc) ((void)0)
 #endif
 
+static TRACE *
+new_trace_body(rb_iseq_t *iseq, rb_event_flag_t event, long data)
+{
+    TRACE *trace = compile_data_alloc_trace(iseq);
+
+    trace->link.type = ISEQ_ELEMENT_TRACE;
+    trace->link.next = NULL;
+    trace->event = event;
+    trace->data = data;
+
+    return trace;
+}
+
 static LABEL *
 new_label_body(rb_iseq_t *iseq, long line)
 {
@@ -866,9 +1114,13 @@ 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->label_no++;
+    labelobj->label_no = ISEQ_COMPILE_DATA(iseq)->label_no++;
     labelobj->sc_state = 0;
     labelobj->sp = -1;
+    labelobj->refcnt = 0;
+    labelobj->set = 0;
+    labelobj->rescued = LABEL_RESCUE_NONE;
+    labelobj->unremovable = 0;
     return labelobj;
 }
 
@@ -880,6 +1132,7 @@ new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line)
     adjust->link.next = 0;
     adjust->label = label;
     adjust->line_no = line;
+    LABEL_UNREMOVABLE(label);
     return adjust;
 }
 
@@ -888,12 +1141,14 @@ new_insn_core(rb_iseq_t *iseq, int line_no,
 	      int insn_id, int argc, VALUE *argv)
 {
     INSN *iobj = compile_data_alloc_insn(iseq);
+
     /* printf("insn_id: %d, line: %d\n", insn_id, line_no); */
 
     iobj->link.type = ISEQ_ELEMENT_INSN;
     iobj->link.next = 0;
     iobj->insn_id = insn_id;
-    iobj->line_no = line_no;
+    iobj->insn_info.line_no = line_no;
+    iobj->insn_info.events = 0;
     iobj->operands = argv;
     iobj->operand_size = argc;
     iobj->sc_state = 0;
@@ -901,14 +1156,14 @@ new_insn_core(rb_iseq_t *iseq, int line_no,
 }
 
 static INSN *
-new_insn_body(rb_iseq_t *iseq, int line_no, int insn_id, int argc, ...)
+new_insn_body(rb_iseq_t *iseq, int line_no, enum ruby_vminsn_type insn_id, int argc, ...)
 {
     VALUE *operands = 0;
     va_list argv;
     if (argc > 0) {
 	int i;
 	va_init_list(argv, argc);
-	operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc);
+        operands = compile_data_alloc2(iseq, sizeof(VALUE), argc);
 	for (i = 0; i < argc; i++) {
 	    VALUE v = va_arg(argv, VALUE);
 	    operands[i] = v;
@@ -918,39 +1173,159 @@ new_insn_body(rb_iseq_t *iseq, int line_no, int insn_id, int argc, ...)
     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)
+{
+    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;
+
+    ci->mid = mid;
+    ci->flag = flag;
+    ci->orig_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++;
+    }
+    else {
+	iseq->body->ci_size++;
+    }
+
+    if (!(ci->flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG | VM_CALL_KW_SPLAT)) &&
+	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,
-	      VALUE id, VALUE argc, VALUE block, VALUE flag)
+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)
 {
-    INSN *iobj = 0;
-    VALUE *operands =
-      (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 5);
-    operands[0] = id;
-    operands[1] = argc;
-    operands[2] = block;
-    operands[3] = flag;
-    operands[4] = INT2FIX(iseq->ic_size++);
-    iobj = new_insn_core(iseq, line_no, BIN(send), 5, operands);
-    return iobj;
+    VALUE *operands = compile_data_alloc2(iseq, sizeof(VALUE), 2);
+    operands[0] = (VALUE)new_callinfo(iseq, id, FIX2INT(argc), FIX2INT(flag), keywords, blockiseq != NULL);
+    operands[1] = (VALUE)blockiseq;
+    return new_insn_core(iseq, line_no, BIN(send), 2, operands);
 }
 
-static VALUE
-new_child_iseq(rb_iseq_t *iseq, NODE *node,
-	       VALUE name, VALUE parent, enum iseq_type type, int line_no)
+static rb_iseq_t *
+new_child_iseq(rb_iseq_t *iseq, const NODE *const node,
+	       VALUE name, const rb_iseq_t *parent, enum iseq_type type, int line_no)
 {
-    VALUE ret;
+    rb_iseq_t *ret_iseq;
+    rb_ast_body_t ast;
+
+    ast.root = node;
+    ast.compile_option = 0;
+    ast.line_count = -1;
 
     debugs("[new_child_iseq]> ---------------------------------------\n");
-    ret = rb_iseq_new_with_opt(node, name, iseq_filename(iseq->self), iseq_filepath(iseq->self), INT2FIX(line_no),
-			       parent, type, iseq->compile_data->option);
+    ret_iseq = rb_iseq_new_with_opt(&ast, name,
+				    rb_iseq_path(iseq), rb_iseq_realpath(iseq),
+				    INT2FIX(line_no), parent, type, ISEQ_COMPILE_DATA(iseq)->option);
     debugs("[new_child_iseq]< ---------------------------------------\n");
-    iseq_add_mark_object(iseq, ret);
-    return ret;
+    return ret_iseq;
+}
+
+static rb_iseq_t *
+new_child_iseq_with_callback(rb_iseq_t *iseq, const struct rb_iseq_new_with_callback_callback_func *ifunc,
+		     VALUE name, const rb_iseq_t *parent, enum iseq_type type, int line_no)
+{
+    rb_iseq_t *ret_iseq;
+
+    debugs("[new_child_iseq_with_callback]> ---------------------------------------\n");
+    ret_iseq = rb_iseq_new_with_callback(ifunc, name,
+				 rb_iseq_path(iseq), rb_iseq_realpath(iseq),
+				 INT2FIX(line_no), parent, type, ISEQ_COMPILE_DATA(iseq)->option);
+    debugs("[new_child_iseq_with_callback]< ---------------------------------------\n");
+    return ret_iseq;
+}
+
+static void
+set_catch_except_p(struct rb_iseq_constant_body *body)
+{
+    body->catch_except_p = TRUE;
+    if (body->parent_iseq != NULL) {
+        set_catch_except_p(body->parent_iseq->body);
+    }
+}
+
+/* Set body->catch_except_p to TRUE if the ISeq may catch an exception. If it is FALSE,
+   JIT-ed code may be optimized.  If we are extremely conservative, we should set TRUE
+   if catch table exists.  But we want to optimize while loop, which always has catch
+   table entries for break/next/redo.
+
+   So this function sets TRUE for limited ISeqs with break/next/redo catch table entries
+   whose child ISeq would really raise an exception. */
+static void
+update_catch_except_flags(struct rb_iseq_constant_body *body)
+{
+    unsigned int pos;
+    size_t i;
+    int insn;
+    const struct iseq_catch_table *ct = body->catch_table;
+
+    /* This assumes that a block has parent_iseq which may catch an exception from the block, and that
+       BREAK/NEXT/REDO catch table entries are used only when `throw` insn is used in the block. */
+    pos = 0;
+    while (pos < body->iseq_size) {
+#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
+        insn = rb_vm_insn_addr2insn((void *)body->iseq_encoded[pos]);
+#else
+        insn = (int)body->iseq_encoded[pos];
+#endif
+        if (insn == BIN(throw)) {
+            set_catch_except_p(body);
+            break;
+        }
+        pos += insn_len(insn);
+    }
+
+    if (ct == NULL)
+        return;
+
+    for (i = 0; i < ct->size; i++) {
+        const struct iseq_catch_table_entry *entry =
+            UNALIGNED_MEMBER_PTR(ct, entries[i]);
+        if (entry->type != CATCH_TYPE_BREAK
+            && entry->type != CATCH_TYPE_NEXT
+            && entry->type != CATCH_TYPE_REDO) {
+            body->catch_except_p = TRUE;
+            break;
+        }
+    }
+}
+
+static void
+iseq_insert_nop_between_end_and_cont(rb_iseq_t *iseq)
+{
+    VALUE catch_table_ary = ISEQ_COMPILE_DATA(iseq)->catch_table_ary;
+    if (NIL_P(catch_table_ary)) return;
+    unsigned int i, tlen = (unsigned int)RARRAY_LEN(catch_table_ary);
+    const VALUE *tptr = RARRAY_CONST_PTR_TRANSIENT(catch_table_ary);
+    for (i = 0; i < tlen; i++) {
+        const VALUE *ptr = RARRAY_CONST_PTR_TRANSIENT(tptr[i]);
+        LINK_ELEMENT *end = (LINK_ELEMENT *)(ptr[2] & ~1);
+        LINK_ELEMENT *cont = (LINK_ELEMENT *)(ptr[4] & ~1);
+        LINK_ELEMENT *e;
+        for (e = end; e && (IS_LABEL(e) || IS_TRACE(e)); e = e->next) {
+            if (e == cont) {
+                INSN *nop = new_insn_core(iseq, 0, BIN(nop), 0, 0);
+                ELEM_INSERT_NEXT(end, &nop->link);
+                break;
+            }
+        }
+    }
 }
 
 static int
-iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+iseq_setup_insn(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 {
+    if (RTEST(ISEQ_COMPILE_DATA(iseq)->err_info))
+	return COMPILE_NG;
+
     /* debugs("[compile step 2] (iseq_array_to_linkedlist)\n"); */
 
     if (compile_debug > 5)
@@ -962,166 +1337,344 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
     if (compile_debug > 5)
 	dump_disasm_list(FIRST_ELEMENT(anchor));
 
-    if (iseq->compile_data->option->instructions_unification) {
+    if (ISEQ_COMPILE_DATA(iseq)->option->instructions_unification) {
 	debugs("[compile step 3.2 (iseq_insns_unification)]\n");
 	iseq_insns_unification(iseq, anchor);
 	if (compile_debug > 5)
 	    dump_disasm_list(FIRST_ELEMENT(anchor));
     }
 
-    if (iseq->compile_data->option->stack_caching) {
+    if (ISEQ_COMPILE_DATA(iseq)->option->stack_caching) {
 	debugs("[compile step 3.3 (iseq_set_sequence_stackcaching)]\n");
 	iseq_set_sequence_stackcaching(iseq, anchor);
 	if (compile_debug > 5)
 	    dump_disasm_list(FIRST_ELEMENT(anchor));
     }
 
+    debugs("[compile step 3.4 (iseq_insert_nop_between_end_and_cont)]\n");
+    iseq_insert_nop_between_end_and_cont(iseq);
+
+    return COMPILE_OK;
+}
+
+static int
+iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
+{
+    if (RTEST(ISEQ_COMPILE_DATA(iseq)->err_info))
+        return COMPILE_NG;
+
     debugs("[compile step 4.1 (iseq_set_sequence)]\n");
-    iseq_set_sequence(iseq, anchor);
+    if (!iseq_set_sequence(iseq, anchor)) return COMPILE_NG;
     if (compile_debug > 5)
 	dump_disasm_list(FIRST_ELEMENT(anchor));
 
     debugs("[compile step 4.2 (iseq_set_exception_table)]\n");
-    iseq_set_exception_table(iseq);
+    if (!iseq_set_exception_table(iseq)) return COMPILE_NG;
 
     debugs("[compile step 4.3 (set_optargs_table)] \n");
-    iseq_set_optargs_table(iseq);
+    if (!iseq_set_optargs_table(iseq)) return COMPILE_NG;
 
     debugs("[compile step 5 (iseq_translate_threaded_code)] \n");
-    rb_iseq_translate_threaded_code(iseq);
+    if (!rb_iseq_translate_threaded_code(iseq)) return COMPILE_NG;
+
+    update_catch_except_flags(iseq->body);
 
     if (compile_debug > 1) {
-	VALUE str = rb_iseq_disasm(iseq->self);
+	VALUE str = rb_iseq_disasm(iseq);
 	printf("%s\n", StringValueCStr(str));
-	fflush(stdout);
     }
+    verify_call_cache(iseq);
     debugs("[compile step: finish]\n");
 
-    return 0;
+    return COMPILE_OK;
 }
 
 static int
 iseq_set_exception_local_table(rb_iseq_t *iseq)
 {
-    ID id_dollar_bang;
-
-    CONST_ID(id_dollar_bang, "#$!");
-    iseq->local_table = (ID *)ALLOC_N(ID, 1);
-    iseq->local_table_size = 1;
-    iseq->local_size = iseq->local_table_size + 1;
-    iseq->local_table[0] = id_dollar_bang;
+    iseq->body->local_table_size = numberof(rb_iseq_shared_exc_local_tbl);
+    iseq->body->local_table = rb_iseq_shared_exc_local_tbl;
     return COMPILE_OK;
 }
 
 static int
-get_dyna_var_idx_at_raw(rb_iseq_t *iseq, ID id)
+get_lvar_level(const rb_iseq_t *iseq)
 {
-    int i;
+    int lev = 0;
+    while (iseq != iseq->body->local_iseq) {
+	lev++;
+	iseq = iseq->body->parent_iseq;
+    }
+    return lev;
+}
 
-    for (i = 0; i < iseq->local_table_size; i++) {
-	if (iseq->local_table[i] == id) {
-	    return i;
+static int
+get_dyna_var_idx_at_raw(const rb_iseq_t *iseq, ID id)
+{
+    unsigned int i;
+
+    for (i = 0; i < iseq->body->local_table_size; i++) {
+	if (iseq->body->local_table[i] == id) {
+	    return (int)i;
 	}
     }
     return -1;
 }
 
 static int
-get_local_var_idx(rb_iseq_t *iseq, ID id)
+get_local_var_idx(const rb_iseq_t *iseq, ID id)
 {
-    int idx = get_dyna_var_idx_at_raw(iseq->local_iseq, id);
+    int idx = get_dyna_var_idx_at_raw(iseq->body->local_iseq, id);
 
     if (idx < 0) {
-	rb_bug("get_local_var_idx: %d", idx);
+        COMPILE_ERROR(iseq, ISEQ_LAST_LINE(iseq),
+                      "get_local_var_idx: %d", idx);
     }
 
     return idx;
 }
 
 static int
-get_dyna_var_idx(rb_iseq_t *iseq, ID id, int *level, int *ls)
+get_dyna_var_idx(const rb_iseq_t *iseq, ID id, int *level, int *ls)
 {
     int lv = 0, idx = -1;
+    const rb_iseq_t *const topmost_iseq = iseq;
 
     while (iseq) {
 	idx = get_dyna_var_idx_at_raw(iseq, id);
 	if (idx >= 0) {
 	    break;
 	}
-	iseq = iseq->parent_iseq;
+	iseq = iseq->body->parent_iseq;
 	lv++;
     }
 
     if (idx < 0) {
-	rb_bug("get_dyna_var_idx: -1");
+        COMPILE_ERROR(topmost_iseq, ISEQ_LAST_LINE(topmost_iseq),
+                      "get_dyna_var_idx: -1");
     }
 
     *level = lv;
-    *ls = iseq->local_size;
+    *ls = iseq->body->local_table_size;
     return idx;
 }
 
 static int
-iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
+iseq_local_block_param_p(const rb_iseq_t *iseq, unsigned int idx, unsigned int level)
 {
-    debugs("iseq_set_arguments: %s\n", node_args ? "" : "0");
+    const struct rb_iseq_constant_body *body;
+    while (level > 0) {
+	iseq = iseq->body->parent_iseq;
+	level--;
+    }
+    body = iseq->body;
+    if (body->local_iseq == iseq && /* local variables */
+	body->param.flags.has_block &&
+	body->local_table_size - body->param.block_start == idx) {
+	return TRUE;
+    }
+    else {
+	return FALSE;
+    }
+}
+
+static int
+iseq_block_param_id_p(const rb_iseq_t *iseq, ID id, int *pidx, int *plevel)
+{
+    int level, ls;
+    int idx = get_dyna_var_idx(iseq, id, &level, &ls);
+    if (iseq_local_block_param_p(iseq, ls - idx, level)) {
+	*pidx = ls - idx;
+	*plevel = level;
+	return TRUE;
+    }
+    else {
+	return FALSE;
+    }
+}
+
+static void
+iseq_add_getlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line, int idx, int level)
+{
+    if (iseq_local_block_param_p(iseq, idx, level)) {
+	ADD_INSN2(seq, line, getblockparam, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+    }
+    else {
+	ADD_INSN2(seq, line, getlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+    }
+}
+
+static void
+iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line, int idx, int level)
+{
+    if (iseq_local_block_param_p(iseq, idx, level)) {
+	ADD_INSN2(seq, line, setblockparam, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+    }
+    else {
+	ADD_INSN2(seq, line, setlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+    }
+}
+
 
-    if (node_args) {
-	NODE *node_aux = node_args->nd_next;
-	NODE *node_opt = node_args->nd_opt;
-	ID rest_id = 0;
-	int last_comma = 0;
-	ID block_id = 0;
-	NODE *node_init = 0;
 
-	if (nd_type(node_args) != NODE_ARGS) {
-	    rb_bug("iseq_set_arguments: NODE_ARGS is expected, but %s",
-		   ruby_node_name(nd_type(node_args)));
+static void
+iseq_calc_param_size(rb_iseq_t *iseq)
+{
+    struct rb_iseq_constant_body *const body = iseq->body;
+    if (body->param.flags.has_opt ||
+	body->param.flags.has_post ||
+	body->param.flags.has_rest ||
+	body->param.flags.has_block ||
+	body->param.flags.has_kw ||
+	body->param.flags.has_kwrest) {
+
+	if (body->param.flags.has_block) {
+	    body->param.size = body->param.block_start + 1;
+	}
+	else if (body->param.flags.has_kwrest) {
+	    body->param.size = body->param.keyword->rest_start + 1;
+	}
+	else if (body->param.flags.has_kw) {
+	    body->param.size = body->param.keyword->bits_start + 1;
+	}
+	else if (body->param.flags.has_post) {
+	    body->param.size = body->param.post_start + body->param.post_num;
 	}
+	else if (body->param.flags.has_rest) {
+	    body->param.size = body->param.rest_start + 1;
+	}
+	else if (body->param.flags.has_opt) {
+	    body->param.size = body->param.lead_num + body->param.opt_num;
+	}
+	else {
+            UNREACHABLE;
+	}
+    }
+    else {
+	body->param.size = body->param.lead_num;
+    }
+}
 
-	/*
-         * new argument information:
-         *   NODE_ARGS     [m: int,  o: NODE_OPT_ARG, ->]
-         *   NODE_ARGS_AUX [r: ID,   b: ID,           ->]
-         *   NODE_ARGS_AUX [Pst: id, Plen: int,       init: NODE*]
-         *  optarg information:
-         *   NODE_OPT_ARGS [idx,     expr,            next ->]
-	 *  init arg:
-	 *   NODE_AND(m_init, p_init)
-	 *  if "r" is 1, it's means "{|x,|}" type block parameter.
-	 */
+static int
+iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
+			    const struct rb_args_info *args, int arg_size)
+{
+    const NODE *node = args->kw_args;
+    struct rb_iseq_constant_body *const body = iseq->body;
+    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;
+
+    body->param.flags.has_kw = TRUE;
+    body->param.keyword = keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
+
+    while (node) {
+	kw++;
+	node = node->nd_next;
+    }
+    arg_size += kw;
+    keyword->bits_start = arg_size++;
 
-	iseq->argc = (int)node_args->nd_frml;
-	debugs("  - argc: %d\n", iseq->argc);
+    node = args->kw_args;
+    while (node) {
+	const NODE *val_node = node->nd_body->nd_value;
+	VALUE dv;
 
-	if (node_aux) {
-	    rest_id = node_aux->nd_rest;
-	    if (rest_id == 1) {
-		last_comma = 1;
-		rest_id = 0;
+        if (val_node == NODE_SPECIAL_REQUIRED_KEYWORD) {
+	    ++rkw;
+	}
+	else {
+	    switch (nd_type(val_node)) {
+	      case NODE_LIT:
+		dv = val_node->nd_lit;
+		break;
+	      case NODE_NIL:
+		dv = Qnil;
+		break;
+	      case NODE_TRUE:
+		dv = Qtrue;
+		break;
+	      case NODE_FALSE:
+		dv = Qfalse;
+		break;
+	      default:
+                NO_CHECK(COMPILE_POPPED(optargs, "kwarg", node)); /* nd_type(node) == NODE_KW_ARG */
+		dv = complex_mark;
 	    }
-	    block_id = (ID)node_aux->nd_body;
-	    node_aux = node_aux->nd_next;
 
-	    if (node_aux) {
-		ID post_start_id = node_aux->nd_pid;
-		iseq->arg_post_start = get_dyna_var_idx_at_raw(iseq, post_start_id);
-		iseq->arg_post_len = (int)node_aux->nd_plen;
-		node_init = node_aux->nd_next;
+	    keyword->num = ++di;
+	    rb_ary_push(default_values, dv);
+	}
+
+	node = node->nd_next;
+    }
+
+    keyword->num = kw;
+
+    if (args->kw_rest_arg->nd_vid != 0) {
+	keyword->rest_start = arg_size++;
+	body->param.flags.has_kwrest = TRUE;
+    }
+    keyword->required_num = rkw;
+    keyword->table = &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;
+	    if (!SPECIAL_CONST_P(dv)) {
+		RB_OBJ_WRITTEN(iseq, Qundef, dv);
 	    }
+	    dvs[i] = dv;
 	}
 
-	if (node_opt) {
-	    NODE *node = node_opt;
+	keyword->default_values = dvs;
+    }
+    return arg_size;
+}
+
+static int
+iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *const node_args)
+{
+    debugs("iseq_set_arguments: %s\n", node_args ? "" : "0");
+
+    if (node_args) {
+	struct rb_iseq_constant_body *const body = iseq->body;
+	struct rb_args_info *args = node_args->nd_ainfo;
+	ID rest_id = 0;
+	int last_comma = 0;
+	ID block_id = 0;
+	int arg_size;
+
+	EXPECT_NODE("iseq_set_arguments", node_args, NODE_ARGS, COMPILE_NG);
+
+        body->param.flags.ruby2_keywords = args->ruby2_keywords;
+	body->param.lead_num = arg_size = (int)args->pre_args_num;
+	if (body->param.lead_num > 0) body->param.flags.has_lead = TRUE;
+	debugs("  - argc: %d\n", body->param.lead_num);
+
+	rest_id = args->rest_arg;
+        if (rest_id == NODE_SPECIAL_EXCESSIVE_COMMA) {
+	    last_comma = 1;
+	    rest_id = 0;
+	}
+	block_id = args->block_arg;
+
+	if (args->opt_args) {
+	    const 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_POPED(optargs, "optarg", node->nd_body);
+                NO_CHECK(COMPILE_POPPED(optargs, "optarg", node->nd_body));
 		node = node->nd_next;
 		i += 1;
 	    }
@@ -1130,94 +1683,91 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 	    label = NEW_LABEL(nd_line(node_args));
 	    rb_ary_push(labels, (VALUE)label | 1);
 	    ADD_LABEL(optargs, label);
-	    i += 1;
 
-	    iseq->arg_opts = i;
-	    iseq->arg_opt_table = ALLOC_N(VALUE, i);
-	    MEMCPY(iseq->arg_opt_table, RARRAY_PTR(labels), VALUE, i);
-	    for (j = 0; j < i; j++) {
-		iseq->arg_opt_table[j] &= ~1;
+	    opt_table = ALLOC_N(VALUE, i+1);
+
+            MEMCPY(opt_table, RARRAY_CONST_PTR_TRANSIENT(labels), VALUE, i+1);
+	    for (j = 0; j < i+1; j++) {
+		opt_table[j] &= ~1;
 	    }
 	    rb_ary_clear(labels);
-	}
-	else {
-	    iseq->arg_opts = 0;
-	}
 
-	if (node_init) {
-	    if (node_init->nd_1st) { /* m_init */
-		COMPILE_POPED(optargs, "init arguments (m)", node_init->nd_1st);
-	    }
-	    if (node_init->nd_2nd) { /* p_init */
-		COMPILE_POPED(optargs, "init arguments (p)", node_init->nd_2nd);
-	    }
+	    body->param.flags.has_opt = TRUE;
+	    body->param.opt_num = i;
+	    body->param.opt_table = opt_table;
+	    arg_size += i;
 	}
 
 	if (rest_id) {
-	    iseq->arg_rest = get_dyna_var_idx_at_raw(iseq, rest_id);
+	    body->param.rest_start = arg_size++;
+	    body->param.flags.has_rest = TRUE;
+	    assert(body->param.rest_start != -1);
+	}
 
-	    if (iseq->arg_rest == -1) {
-		rb_bug("arg_rest: -1");
-	    }
+	if (args->first_post_arg) {
+	    body->param.post_start = arg_size;
+	    body->param.post_num = args->post_args_num;
+	    body->param.flags.has_post = TRUE;
+	    arg_size += args->post_args_num;
 
-	    if (iseq->arg_post_start == 0) {
-		iseq->arg_post_start = iseq->arg_rest + 1;
+	    if (body->param.flags.has_rest) { /* TODO: why that? */
+		body->param.post_start = body->param.rest_start + 1;
 	    }
 	}
 
+	if (args->kw_args) {
+	    arg_size = iseq_set_arguments_keywords(iseq, optargs, args, arg_size);
+	}
+	else if (args->kw_rest_arg) {
+	    struct rb_iseq_param_keyword *keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
+	    keyword->rest_start = arg_size++;
+	    body->param.keyword = keyword;
+	    body->param.flags.has_kwrest = TRUE;
+	}
+	else if (args->no_kwarg) {
+	    body->param.flags.accepts_no_kwarg = TRUE;
+	}
+
 	if (block_id) {
-	    iseq->arg_block = get_dyna_var_idx_at_raw(iseq, block_id);
+	    body->param.block_start = arg_size++;
+	    body->param.flags.has_block = TRUE;
 	}
 
-	if (iseq->arg_opts != 0 || iseq->arg_post_len != 0 ||
-	    iseq->arg_rest != -1 || iseq->arg_block != -1) {
-	    iseq->arg_simple = 0;
+	iseq_calc_param_size(iseq);
+	body->param.size = arg_size;
 
-	    /* set arg_size: size of arguments */
-	    if (iseq->arg_block != -1) {
-		iseq->arg_size = iseq->arg_block + 1;
-	    }
-	    else if (iseq->arg_post_len) {
-		iseq->arg_size = iseq->arg_post_start + iseq->arg_post_len;
-	    }
-	    else if (iseq->arg_rest != -1) {
-		iseq->arg_size = iseq->arg_rest + 1;
-	    }
-	    else if (iseq->arg_opts) {
-		iseq->arg_size = iseq->argc + iseq->arg_opts - 1;
-	    }
-	    else {
-		iseq->arg_size = iseq->argc;
-	    }
+	if (args->pre_init) { /* m_init */
+            NO_CHECK(COMPILE_POPPED(optargs, "init arguments (m)", args->pre_init));
 	}
-	else {
-	    iseq->arg_simple = 1;
-	    iseq->arg_size = iseq->argc;
+	if (args->post_init) { /* p_init */
+            NO_CHECK(COMPILE_POPPED(optargs, "init arguments (p)", args->post_init));
 	}
 
-	if (iseq->type == ISEQ_TYPE_BLOCK) {
-	    if (iseq->arg_opts == 0 && iseq->arg_post_len == 0 && iseq->arg_rest == -1) {
-		if (iseq->argc == 1 && last_comma == 0) {
+	if (body->type == ISEQ_TYPE_BLOCK) {
+	    if (body->param.flags.has_opt    == FALSE &&
+		body->param.flags.has_post   == FALSE &&
+		body->param.flags.has_rest   == FALSE &&
+		body->param.flags.has_kw     == FALSE &&
+		body->param.flags.has_kwrest == FALSE) {
+
+		if (body->param.lead_num == 1 && last_comma == 0) {
 		    /* {|a|} */
-		    iseq->arg_simple |= 0x02;
+		    body->param.flags.ambiguous_param0 = TRUE;
 		}
 	    }
 	}
     }
-    else {
-	iseq->arg_simple = 1;
-    }
 
     return COMPILE_OK;
 }
 
 static int
-iseq_set_local_table(rb_iseq_t *iseq, ID *tbl)
+iseq_set_local_table(rb_iseq_t *iseq, const ID *tbl)
 {
-    int size;
+    unsigned int size;
 
     if (tbl) {
-	size = (int)*tbl;
+	size = (unsigned int)*tbl;
 	tbl++;
     }
     else {
@@ -1225,48 +1775,70 @@ iseq_set_local_table(rb_iseq_t *iseq, ID *tbl)
     }
 
     if (size > 0) {
-	iseq->local_table = (ID *)ALLOC_N(ID, size);
-	MEMCPY(iseq->local_table, tbl, ID, size);
+	ID *ids = (ID *)ALLOC_N(ID, size);
+	MEMCPY(ids, tbl, ID, size);
+	iseq->body->local_table = ids;
     }
+    iseq->body->local_table_size = 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);
+    debugs("iseq_set_local_table: %u\n", iseq->body->local_table_size);
     return COMPILE_OK;
 }
 
 static int
 cdhash_cmp(VALUE val, VALUE lit)
 {
-    if (val == lit) return 0;
-    if (SPECIAL_CONST_P(lit)) {
-	return val != lit;
+    int tval, tlit;
+
+    if (val == lit) {
+        return 0;
+    }
+    else if ((tlit = OBJ_BUILTIN_TYPE(lit)) == -1) {
+        return val != lit;
+    }
+    else if ((tval = OBJ_BUILTIN_TYPE(val)) == -1) {
+        return -1;
+    }
+    else if (tlit != tval) {
+        return -1;
+    }
+    else if (tlit == T_SYMBOL) {
+        return val != lit;
+    }
+    else if (tlit == T_STRING) {
+        return rb_str_hash_cmp(lit, val);
     }
-    if (SPECIAL_CONST_P(val) || BUILTIN_TYPE(val) != BUILTIN_TYPE(lit)) {
-	return -1;
+    else if (tlit == T_BIGNUM) {
+        long x = FIX2LONG(rb_big_cmp(lit, val));
+
+        /* Given lit and val are both Bignum, x must be -1, 0, 1.
+         * There is no need to call rb_fix2int here. */
+        RUBY_ASSERT((x == 1) || (x == 0) || (x == -1));
+        return (int)x;
+    }
+    else if (tlit == T_FLOAT) {
+        return rb_float_cmp(lit, val);
     }
-    if (BUILTIN_TYPE(lit) == T_STRING) {
-	return rb_str_hash_cmp(lit, val);
+    else {
+        UNREACHABLE_RETURN(-1);
     }
-    return !rb_eql(lit, val);
 }
 
 static st_index_t
 cdhash_hash(VALUE a)
 {
-    if (SPECIAL_CONST_P(a)) return (st_index_t)a;
-    if (TYPE(a) == T_STRING) return rb_str_hash(a);
-    {
-	VALUE hval = rb_hash(a);
-	return (st_index_t)FIX2LONG(hval);
+    switch (OBJ_BUILTIN_TYPE(a)) {
+      case -1:
+      case T_SYMBOL:
+        return (st_index_t)a;
+      case T_STRING:
+        return rb_str_hash(a);
+      case T_BIGNUM:
+        return FIX2LONG(rb_big_hash(a));
+      case T_FLOAT:
+        return rb_dbl_long_hash(RFLOAT_VALUE(a));
+      default:
+        UNREACHABLE_RETURN(0);
     }
 }
 
@@ -1275,72 +1847,282 @@ static const struct st_hash_type cdhash_type = {
     cdhash_hash,
 };
 
+struct cdhash_set_label_struct {
+    VALUE hash;
+    int pos;
+    int len;
+};
+
+static int
+cdhash_set_label_i(VALUE key, VALUE val, VALUE ptr)
+{
+    struct cdhash_set_label_struct *data = (struct cdhash_set_label_struct *)ptr;
+    LABEL *lobj = (LABEL *)(val & ~1);
+    rb_hash_aset(data->hash, key, INT2FIX(lobj->position - (data->pos+data->len)));
+    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;
+}
+
+#define BADINSN_DUMP(anchor, list, dest) \
+    dump_disasm_list_with_cursor(FIRST_ELEMENT(anchor), list, dest)
+
+#define BADINSN_ERROR \
+    (xfree(generated_iseq), \
+     xfree(insns_info), \
+     BADINSN_DUMP(anchor, list, NULL), \
+     COMPILE_ERROR)
+
+static int
+fix_sp_depth(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
+{
+    int stack_max = 0, sp = 0, line = 0;
+    LINK_ELEMENT *list;
+
+    for (list = FIRST_ELEMENT(anchor); list; list = list->next) {
+	if (list->type == ISEQ_ELEMENT_LABEL) {
+	    LABEL *lobj = (LABEL *)list;
+	    lobj->set = TRUE;
+	}
+    }
+
+    for (list = FIRST_ELEMENT(anchor); list; list = list->next) {
+	switch (list->type) {
+	  case ISEQ_ELEMENT_INSN:
+	    {
+		int j, len, insn;
+		const char *types;
+		VALUE *operands;
+		INSN *iobj = (INSN *)list;
+
+		/* update sp */
+		sp = calc_sp_depth(sp, iobj);
+		if (sp < 0) {
+		    BADINSN_DUMP(anchor, list, NULL);
+		    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+				  "argument stack underflow (%d)", sp);
+		    return -1;
+		}
+		if (sp > stack_max) {
+		    stack_max = sp;
+		}
+
+		line = iobj->insn_info.line_no;
+		/* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */
+		operands = iobj->operands;
+		insn = iobj->insn_id;
+		types = insn_op_types(insn);
+		len = insn_len(insn);
+
+		/* operand check */
+		if (iobj->operand_size != len - 1) {
+		    /* printf("operand size miss! (%d, %d)\n", iobj->operand_size, len); */
+		    BADINSN_DUMP(anchor, list, NULL);
+		    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+				  "operand size miss! (%d for %d)",
+				  iobj->operand_size, len - 1);
+		    return -1;
+		}
+
+		for (j = 0; types[j]; j++) {
+		    if (types[j] == TS_OFFSET) {
+			/* label(destination position) */
+			LABEL *lobj = (LABEL *)operands[j];
+			if (!lobj->set) {
+			    BADINSN_DUMP(anchor, list, NULL);
+			    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+					  "unknown label: "LABEL_FORMAT, lobj->label_no);
+			    return -1;
+			}
+			if (lobj->sp == -1) {
+			    lobj->sp = sp;
+			}
+		    }
+		}
+		break;
+	    }
+	  case ISEQ_ELEMENT_LABEL:
+	    {
+		LABEL *lobj = (LABEL *)list;
+		if (lobj->sp == -1) {
+		    lobj->sp = sp;
+		}
+		else {
+		    sp = lobj->sp;
+		}
+		break;
+	    }
+	  case ISEQ_ELEMENT_TRACE:
+	    {
+		/* ignore */
+		break;
+	    }
+	  case ISEQ_ELEMENT_ADJUST:
+	    {
+		ADJUST *adjust = (ADJUST *)list;
+		int orig_sp = sp;
+
+		sp = adjust->label ? adjust->label->sp : 0;
+		if (adjust->line_no != -1 && orig_sp - sp < 0) {
+		    BADINSN_DUMP(anchor, list, NULL);
+		    COMPILE_ERROR(iseq, adjust->line_no,
+				  "iseq_set_sequence: adjust bug %d < %d",
+				  orig_sp, sp);
+		    return -1;
+		}
+		break;
+	    }
+	  default:
+	    BADINSN_DUMP(anchor, list, NULL);
+	    COMPILE_ERROR(iseq, line, "unknown list type: %d", list->type);
+	    return -1;
+	}
+    }
+    return stack_max;
+}
+
+static int
+add_insn_info(struct iseq_insn_info_entry *insns_info, unsigned int *positions,
+              int insns_info_index, int code_index, const INSN *iobj)
+{
+    if (insns_info_index == 0 ||
+        insns_info[insns_info_index-1].line_no != iobj->insn_info.line_no ||
+        insns_info[insns_info_index-1].events  != iobj->insn_info.events) {
+        insns_info[insns_info_index].line_no    = iobj->insn_info.line_no;
+        insns_info[insns_info_index].events     = iobj->insn_info.events;
+        positions[insns_info_index]             = code_index;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static int
+add_adjust_info(struct iseq_insn_info_entry *insns_info, unsigned int *positions,
+                int insns_info_index, int code_index, const ADJUST *adjust)
+{
+    if (insns_info_index > 0 ||
+        insns_info[insns_info_index-1].line_no != adjust->line_no) {
+        insns_info[insns_info_index].line_no    = adjust->line_no;
+        insns_info[insns_info_index].events     = 0;
+        positions[insns_info_index]             = code_index;
+        return TRUE;
+    }
+    return FALSE;
+}
+
 /**
   ruby insn object list -> raw instruction sequence
  */
 static int
-iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 {
-    LABEL *lobj;
-    INSN *iobj;
-    struct iseq_insn_info_entry *insn_info_table;
+    struct iseq_insn_info_entry *insns_info;
+    struct rb_iseq_constant_body *const body = iseq->body;
+    unsigned int *positions;
     LINK_ELEMENT *list;
     VALUE *generated_iseq;
+    rb_event_flag_t events = 0;
+    long data = 0;
 
-    int k, pos, sp, stack_max = 0, line = 0;
+    int insn_num, code_index, insns_info_index, sp = 0;
+    int stack_max = fix_sp_depth(iseq, anchor);
 
-    /* set label position */
-    list = FIRST_ELEMENT(anchor);
-    k = pos = 0;
-    while (list) {
+    if (stack_max < 0) return COMPILE_NG;
+
+    /* fix label position */
+    insn_num = code_index = 0;
+    for (list = FIRST_ELEMENT(anchor); list; list = list->next) {
 	switch (list->type) {
 	  case ISEQ_ELEMENT_INSN:
 	    {
-		iobj = (INSN *)list;
-		line = iobj->line_no;
-		pos += insn_data_length(iobj);
-		k++;
+		INSN *iobj = (INSN *)list;
+		/* update sp */
+		sp = calc_sp_depth(sp, iobj);
+		insn_num++;
+                events = iobj->insn_info.events |= events;
+                if (ISEQ_COVERAGE(iseq)) {
+                    if (ISEQ_LINE_COVERAGE(iseq) && (events & RUBY_EVENT_COVERAGE_LINE) &&
+                        !(rb_get_coverage_mode() & COVERAGE_TARGET_ONESHOT_LINES)) {
+                        int line = iobj->insn_info.line_no;
+                        if (line >= 1) {
+                            RARRAY_ASET(ISEQ_LINE_COVERAGE(iseq), line - 1, INT2FIX(0));
+                        }
+                    }
+                    if (ISEQ_BRANCH_COVERAGE(iseq) && (events & RUBY_EVENT_COVERAGE_BRANCH)) {
+                        while (RARRAY_LEN(ISEQ_PC2BRANCHINDEX(iseq)) <= code_index) {
+                            rb_ary_push(ISEQ_PC2BRANCHINDEX(iseq), Qnil);
+                        }
+                        RARRAY_ASET(ISEQ_PC2BRANCHINDEX(iseq), code_index, INT2FIX(data));
+                    }
+		}
+                code_index += insn_data_length(iobj);
+		events = 0;
+                data = 0;
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
 	    {
-		lobj = (LABEL *)list;
-		lobj->position = pos;
-		lobj->set = TRUE;
+		LABEL *lobj = (LABEL *)list;
+		lobj->position = code_index;
+		sp = lobj->sp;
 		break;
 	    }
-	  case ISEQ_ELEMENT_NONE:
+	  case ISEQ_ELEMENT_TRACE:
 	    {
-		/* ignore */
+		TRACE *trace = (TRACE *)list;
+		events |= trace->event;
+                if (trace->event & RUBY_EVENT_COVERAGE_BRANCH) data = trace->data;
 		break;
 	    }
 	  case ISEQ_ELEMENT_ADJUST:
 	    {
 		ADJUST *adjust = (ADJUST *)list;
 		if (adjust->line_no != -1) {
-		    pos += 2 /* insn + 1 operand */;
-		    k++;
+		    int orig_sp = sp;
+		    sp = adjust->label ? adjust->label->sp : 0;
+		    if (orig_sp - sp > 0) {
+			if (orig_sp - sp > 1) code_index++; /* 1 operand */
+			code_index++; /* insn */
+			insn_num++;
+		    }
 		}
 		break;
 	    }
-	  default:
-	    dump_disasm_list(FIRST_ELEMENT(anchor));
-	    dump_disasm_list(list);
-	    rb_compile_error(RSTRING_PTR(iseq->filename), line,
-			     "error: set_sequence");
-	    break;
+	  default: break;
 	}
-	list = list->next;
     }
 
     /* make instruction sequence */
-    generated_iseq = ALLOC_N(VALUE, pos);
-    insn_info_table = ALLOC_N(struct iseq_insn_info_entry, k);
-    iseq->ic_entries = ALLOC_N(struct iseq_inline_cache_entry, iseq->ic_size);
-    MEMZERO(iseq->ic_entries, struct iseq_inline_cache_entry, iseq->ic_size);
+    generated_iseq = ALLOC_N(VALUE, code_index);
+    insns_info = ALLOC_N(struct iseq_insn_info_entry, insn_num);
+    positions = ALLOC_N(unsigned int, insn_num);
+    body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, body->is_size);
+    body->call_data =
+        rb_xcalloc_mul_add_mul(
+            sizeof(struct rb_call_data), body->ci_size,
+            sizeof(struct rb_kwarg_call_data), body->ci_kw_size);
+    ISEQ_COMPILE_DATA(iseq)->ci_index = ISEQ_COMPILE_DATA(iseq)->ci_kw_index = 0;
 
     list = FIRST_ELEMENT(anchor);
-    k = pos = sp = 0;
+    insns_info_index = code_index = sp = 0;
 
     while (list) {
 	switch (list->type) {
@@ -1349,34 +2131,17 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 		int j, len, insn;
 		const char *types;
 		VALUE *operands;
-
-		iobj = (INSN *)list;
+		INSN *iobj = (INSN *)list;
 
 		/* update sp */
 		sp = calc_sp_depth(sp, iobj);
-		if (sp > stack_max) {
-		    stack_max = sp;
-		}
-
 		/* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */
 		operands = iobj->operands;
 		insn = iobj->insn_id;
-		generated_iseq[pos] = insn;
+		generated_iseq[code_index] = insn;
 		types = insn_op_types(insn);
 		len = insn_len(insn);
 
-		/* operand check */
-		if (iobj->operand_size != len - 1) {
-		    /* printf("operand size miss! (%d, %d)\n", iobj->operand_size, len); */
-		    dump_disasm_list(list);
-		    rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
-				     "operand size miss! (%d for %d)",
-				     iobj->operand_size, len - 1);
-		    xfree(generated_iseq);
-		    xfree(insn_info_table);
-		    return 0;
-		}
-
 		for (j = 0; types[j]; j++) {
 		    char type = types[j];
 		    /* printf("--> [%c - (%d-%d)]\n", type, k, j); */
@@ -1384,118 +2149,111 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 		      case TS_OFFSET:
 			{
 			    /* label(destination position) */
-			    lobj = (LABEL *)operands[j];
-			    if (!lobj->set) {
-				rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
-						 "unknown label");
-			    }
-			    if (lobj->sp == -1) {
-				lobj->sp = sp;
-			    }
-			    generated_iseq[pos + 1 + j] =
-				lobj->position - (pos + len);
+			    LABEL *lobj = (LABEL *)operands[j];
+			    generated_iseq[code_index + 1 + j] = lobj->position - (code_index + len);
 			    break;
 			}
 		      case TS_CDHASH:
 			{
-			    /*
-			     * [obj, label, ...]
-			     */
-			    int i;
-			    VALUE lits = operands[j];
-			    VALUE map = rb_hash_new();
-			    RHASH_TBL(map)->type = &cdhash_type;
-
-			    for (i=0; i < RARRAY_LEN(lits); i+=2) {
-				VALUE obj = rb_ary_entry(lits, i);
-				VALUE lv  = rb_ary_entry(lits, i+1);
-				lobj = (LABEL *)(lv & ~1);
-
-				if (!lobj->set) {
-				    rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
-						     "unknown label");
-				}
-				if (!st_lookup(rb_hash_tbl(map), obj, 0)) {
-				    rb_hash_aset(map, obj, INT2FIX(lobj->position - (pos+len)));
-				}
-				else {
-				    rb_compile_warning(RSTRING_PTR(iseq->filename), iobj->line_no,
-						       "duplicated when clause is ignored");
-				}
-			    }
-			    hide_obj(map);
-			    generated_iseq[pos + 1 + j] = map;
-			    iseq_add_mark_object(iseq, map);
+			    VALUE map = operands[j];
+			    struct cdhash_set_label_struct data;
+                            data.hash = map;
+                            data.pos = code_index;
+                            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;
+			    RB_OBJ_WRITTEN(iseq, Qundef, map);
+			    FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
 			    break;
 			}
 		      case TS_LINDEX:
-		      case TS_DINDEX:
 		      case TS_NUM:	/* ulong */
-			generated_iseq[pos + 1 + j] = FIX2INT(operands[j]);
+			generated_iseq[code_index + 1 + j] = FIX2INT(operands[j]);
 			break;
-		      case TS_ISEQ:	/* iseq */
-			{
-			    VALUE v = operands[j];
-			    rb_iseq_t *block = 0;
-			    if (v) {
-				GetISeqPtr(v, block);
-			    }
-			    generated_iseq[pos + 1 + j] = (VALUE)block;
-			    break;
-			}
 		      case TS_VALUE:	/* VALUE */
+		      case TS_ISEQ:	/* iseq */
 			{
 			    VALUE v = operands[j];
-			    generated_iseq[pos + 1 + j] = v;
+			    generated_iseq[code_index + 1 + j] = v;
 			    /* to mark ruby object */
-			    iseq_add_mark_object(iseq, v);
+			    if (!SPECIAL_CONST_P(v)) {
+				RB_OBJ_WRITTEN(iseq, Qundef, v);
+				FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
+			    }
 			    break;
 			}
+		      case TS_ISE: /* inline storage entry */
+			/* Treated as an IC, but may contain a markable VALUE */
+			FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
+                        /* fall through */
 		      case TS_IC: /* inline cache */
+		      case TS_IVC: /* inline ivar cache */
 			{
-			    int ic_index = FIX2INT(operands[j]);
-			    IC ic = &iseq->ic_entries[ic_index];
-			    if (UNLIKELY(ic_index >= iseq->ic_size)) {
-				rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d",
-				       ic_index, iseq->ic_size);
+			    unsigned int ic_index = FIX2UINT(operands[j]);
+			    IC ic = (IC)&body->is_entries[ic_index];
+			    if (UNLIKELY(ic_index >= body->is_size)) {
+                                BADINSN_DUMP(anchor, &iobj->link, 0);
+                                COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+                                              "iseq_set_sequence: ic_index overflow: index: %d, size: %d",
+                                              ic_index, body->is_size);
 			    }
-			    generated_iseq[pos + 1 + j] = (VALUE)ic;
+			    generated_iseq[code_index + 1 + j] = (VALUE)ic;
 			    break;
 			}
+                        case TS_CALLDATA:
+                        {
+                            struct rb_call_info *source_ci = (struct rb_call_info *)operands[j];
+                            struct rb_call_data *cd;
+
+                            if (source_ci->flag & VM_CALL_KWARG) {
+                                struct rb_kwarg_call_data *kw_calls = (struct rb_kwarg_call_data *)&body->call_data[body->ci_size];
+                                struct rb_kwarg_call_data *cd_kw = &kw_calls[ISEQ_COMPILE_DATA(iseq)->ci_kw_index++];
+                                cd_kw->ci_kw = *((struct rb_call_info_with_kwarg *)source_ci);
+                                cd = (struct rb_call_data *)cd_kw;
+                                assert(ISEQ_COMPILE_DATA(iseq)->ci_kw_index <= body->ci_kw_size);
+                            }
+                            else {
+                                cd = &body->call_data[ISEQ_COMPILE_DATA(iseq)->ci_index++];
+                                cd->ci = *source_ci;
+                                assert(ISEQ_COMPILE_DATA(iseq)->ci_index <= body->ci_size);
+                            }
+
+                            generated_iseq[code_index + 1 + j] = (VALUE)cd;
+                            break;
+                        }
 		      case TS_ID: /* ID */
-			generated_iseq[pos + 1 + j] = SYM2ID(operands[j]);
+			generated_iseq[code_index + 1 + j] = SYM2ID(operands[j]);
 			break;
 		      case TS_GENTRY:
 			{
 			    struct rb_global_entry *entry =
 				(struct rb_global_entry *)(operands[j] & (~1));
-			    generated_iseq[pos + 1 + j] = (VALUE)entry;
+			    generated_iseq[code_index + 1 + j] = (VALUE)entry;
 			}
 			break;
+		      case TS_FUNCPTR:
+			generated_iseq[code_index + 1 + j] = operands[j];
+			break;
+                      case TS_BUILTIN:
+                        generated_iseq[code_index + 1 + j] = operands[j];
+                        break;
 		      default:
-			rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
-					 "unknown operand type: %c", type);
-			xfree(generated_iseq);
-			xfree(insn_info_table);
-			return 0;
+			BADINSN_ERROR(iseq, iobj->insn_info.line_no,
+				      "unknown operand type: %c", type);
+			return COMPILE_NG;
 		    }
 		}
-		insn_info_table[k].line_no = iobj->line_no;
-		insn_info_table[k].position = pos;
-		insn_info_table[k].sp = sp;
-		pos += len;
-		k++;
+		if (add_insn_info(insns_info, positions, insns_info_index, code_index, iobj)) insns_info_index++;
+		code_index += len;
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
 	    {
-		lobj = (LABEL *)list;
-		if (lobj->sp == -1) {
-		    lobj->sp = sp;
-		}
-		else {
-		    sp = lobj->sp;
-		}
+		LABEL *lobj = (LABEL *)list;
+		sp = lobj->sp;
 		break;
 	    }
 	  case ISEQ_ELEMENT_ADJUST:
@@ -1511,25 +2269,27 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 		}
 
 		if (adjust->line_no != -1) {
-		    if (orig_sp - sp > 0) {
-			insn_info_table[k].line_no = adjust->line_no;
-			insn_info_table[k].position = pos;
-			insn_info_table[k].sp = sp;
-			k++;
-			generated_iseq[pos++] = BIN(adjuststack);
-			generated_iseq[pos++] = orig_sp - sp;
+		    const int diff = orig_sp - sp;
+		    if (diff > 0) {
+			if (add_adjust_info(insns_info, positions, insns_info_index, code_index, adjust)) insns_info_index++;
 		    }
-		    else if (orig_sp - sp == 0) {
-			/* jump to next insn */
-			insn_info_table[k].line_no = adjust->line_no;
-			insn_info_table[k].position = pos;
-			insn_info_table[k].sp = sp;
-			k++;
-			generated_iseq[pos++] = BIN(jump);
-			generated_iseq[pos++] = 0;
+		    if (diff > 1) {
+			generated_iseq[code_index++] = BIN(adjuststack);
+			generated_iseq[code_index++] = orig_sp - sp;
 		    }
-		    else {
-			rb_bug("iseq_set_sequence: adjust bug");
+		    else if (diff == 1) {
+			generated_iseq[code_index++] = BIN(pop);
+		    }
+		    else if (diff < 0) {
+			int label_no = adjust->label ? adjust->label->label_no : -1;
+			xfree(generated_iseq);
+			xfree(insns_info);
+			xfree(positions);
+			debug_list(anchor);
+			COMPILE_ERROR(iseq, adjust->line_no,
+				      "iseq_set_sequence: adjust bug to %d %d < %d",
+				      label_no, orig_sp, sp);
+			return COMPILE_NG;
 		    }
 		}
 		break;
@@ -1541,18 +2301,19 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 	list = list->next;
     }
 
-#if 0 /* XXX */
-    /* this check need dead code elimination */
-    if (sp != 1) {
-	rb_bug("SP is not 0 on %s (%d)\n", RSTRING_PTR(iseq->name), sp);
-    }
-#endif
+    body->iseq_encoded = (void *)generated_iseq;
+    body->iseq_size = code_index;
+    body->stack_max = stack_max;
+
+    /* get rid of memory leak when REALLOC failed */
+    body->insns_info.body = insns_info;
+    body->insns_info.positions = positions;
 
-    iseq->iseq = (void *)generated_iseq;
-    iseq->iseq_size = pos;
-    iseq->insn_info_table = insn_info_table;
-    iseq->insn_info_size = k;
-    iseq->stack_max = stack_max;
+    REALLOC_N(insns_info, struct iseq_insn_info_entry, insns_info_index);
+    body->insns_info.body = insns_info;
+    REALLOC_N(positions, unsigned int, insns_info_index);
+    body->insns_info.positions = positions;
+    body->insns_info.size = insns_info_index;
 
     return COMPILE_OK;
 }
@@ -1572,48 +2333,52 @@ label_get_sp(LABEL *lobj)
 static int
 iseq_set_exception_table(rb_iseq_t *iseq)
 {
-    VALUE *tptr, *ptr;
-    int tlen, i;
+    const VALUE *tptr, *ptr;
+    unsigned int tlen, i;
     struct iseq_catch_table_entry *entry;
 
-    tlen = (int)RARRAY_LEN(iseq->compile_data->catch_table_ary);
-    tptr = RARRAY_PTR(iseq->compile_data->catch_table_ary);
-
-    iseq->catch_table = tlen ? ALLOC_N(struct iseq_catch_table_entry, tlen) : 0;
-    iseq->catch_table_size = tlen;
-
-    for (i = 0; i < tlen; i++) {
-	ptr = RARRAY_PTR(tptr[i]);
-	entry = &iseq->catch_table[i];
-	entry->type = (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--;
+    if (NIL_P(ISEQ_COMPILE_DATA(iseq)->catch_table_ary)) goto no_catch_table;
+    tlen = (int)RARRAY_LEN(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
+    tptr = RARRAY_CONST_PTR_TRANSIENT(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
+
+    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_TRANSIENT(tptr[i]);
+	    entry = UNALIGNED_MEMBER_PTR(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];
+	    RB_OBJ_WRITTEN(iseq, Qundef, entry->iseq);
+
+	    /* stack depth */
+	    if (ptr[4]) {
+		LABEL *lobj = (LABEL *)(ptr[4] & ~1);
+		entry->cont = label_get_position(lobj);
+		entry->sp = label_get_sp(lobj);
+
+		/* TODO: Dirty Hack!  Fix me */
+		if (entry->type == CATCH_TYPE_RESCUE ||
+		    entry->type == CATCH_TYPE_BREAK ||
+		    entry->type == CATCH_TYPE_NEXT) {
+		    entry->sp--;
+		}
+	    }
+	    else {
+		entry->cont = 0;
 	    }
 	}
-	else {
-	    entry->cont = 0;
-	}
+	iseq->body->catch_table = table;
+	RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, 0); /* free */
+    }
+    else {
+        no_catch_table:
+          iseq->body->catch_table = NULL;
     }
 
-    iseq->compile_data->catch_table_ary = 0;	/* free */
     return COMPILE_OK;
 }
 
@@ -1630,11 +2395,11 @@ static int
 iseq_set_optargs_table(rb_iseq_t *iseq)
 {
     int i;
+    VALUE *opt_table = (VALUE *)iseq->body->param.opt_table;
 
-    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]);
+    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]);
 	}
     }
     return COMPILE_OK;
@@ -1645,14 +2410,32 @@ get_destination_insn(INSN *iobj)
 {
     LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0);
     LINK_ELEMENT *list;
+    rb_event_flag_t events = 0;
 
     list = lobj->link.next;
     while (list) {
-	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
+	switch (list->type) {
+	  case ISEQ_ELEMENT_INSN:
+	  case ISEQ_ELEMENT_ADJUST:
+	    goto found;
+	  case ISEQ_ELEMENT_LABEL:
+	    /* ignore */
 	    break;
+	  case ISEQ_ELEMENT_TRACE:
+	    {
+		TRACE *trace = (TRACE *)list;
+		events |= trace->event;
+	    }
+	    break;
+	  default: break;
 	}
 	list = list->next;
     }
+  found:
+    if (list && IS_INSN(list)) {
+	INSN *iobj = (INSN *)list;
+	iobj->insn_info.events |= events;
+    }
     return list;
 }
 
@@ -1662,7 +2445,7 @@ get_next_insn(INSN *iobj)
     LINK_ELEMENT *list = iobj->link.next;
 
     while (list) {
-	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
+	if (IS_INSN(list) || IS_ADJUST(list)) {
 	    return list;
 	}
 	list = list->next;
@@ -1676,7 +2459,7 @@ get_prev_insn(INSN *iobj)
     LINK_ELEMENT *list = iobj->link.prev;
 
     while (list) {
-	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
+	if (IS_INSN(list) || IS_ADJUST(list)) {
 	    return list;
 	}
 	list = list->prev;
@@ -1684,23 +2467,244 @@ 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) ELEM_REMOVE(&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) ELEM_REMOVE(&dl->link);
+}
+
+static LABEL*
+find_destination(INSN *i)
+{
+    int pos, len = insn_len(i->insn_id);
+    for (pos = 0; pos < len; ++pos) {
+	if (insn_op_types(i->insn_id)[pos] == TS_OFFSET) {
+	    return (LABEL *)OPERAND_AT(i, pos);
+	}
+    }
+    return 0;
+}
+
+static int
+remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
+{
+    LINK_ELEMENT *first = i, *end;
+    int *unref_counts = 0, nlabels = ISEQ_COMPILE_DATA(iseq)->label_no;
+
+    if (!i) return 0;
+    unref_counts = ALLOCA_N(int, nlabels);
+    MEMZERO(unref_counts, int, nlabels);
+    end = i;
+    do {
+	LABEL *lab;
+	if (IS_INSN(i)) {
+	    if (IS_INSN_ID(i, leave)) {
+		end = i;
+		break;
+	    }
+	    else if ((lab = find_destination((INSN *)i)) != 0) {
+		if (lab->unremovable) break;
+		unref_counts[lab->label_no]++;
+	    }
+	}
+	else if (IS_LABEL(i)) {
+	    lab = (LABEL *)i;
+	    if (lab->unremovable) return 0;
+	    if (lab->refcnt > unref_counts[lab->label_no]) {
+		if (i == first) return 0;
+		break;
+	    }
+	    continue;
+	}
+	else if (IS_TRACE(i)) {
+	    /* do nothing */
+	}
+	else if (IS_ADJUST(i)) {
+	    LABEL *dest = ((ADJUST *)i)->label;
+	    if (dest && dest->unremovable) return 0;
+	}
+	end = i;
+    } while ((i = i->next) != 0);
+    i = first;
+    do {
+	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_CALLDATA:
+		    if (((struct rb_call_info *)OPERAND_AT(i, pos))->flag & VM_CALL_KWARG)
+			--(body->ci_kw_size);
+		    else
+			--(body->ci_size);
+		    break;
+		}
+	    }
+	}
+	ELEM_REMOVE(i);
+    } while ((i != end) && (i = i->next) != 0);
+    return 1;
+}
+
+static int
+iseq_pop_newarray(rb_iseq_t *iseq, INSN *iobj)
+{
+    switch (OPERAND_AT(iobj, 0)) {
+      case INT2FIX(0): /* empty array */
+	ELEM_REMOVE(&iobj->link);
+	return TRUE;
+      case INT2FIX(1): /* single element array */
+	ELEM_REMOVE(&iobj->link);
+	return FALSE;
+      default:
+	iobj->insn_id = BIN(adjuststack);
+	return TRUE;
+    }
+}
+
+static int
+same_debug_pos_p(LINK_ELEMENT *iobj1, LINK_ELEMENT *iobj2)
+{
+    VALUE debug1 = OPERAND_AT(iobj1, 0);
+    VALUE debug2 = OPERAND_AT(iobj2, 0);
+    if (debug1 == debug2) return TRUE;
+    if (!RB_TYPE_P(debug1, T_ARRAY)) return FALSE;
+    if (!RB_TYPE_P(debug2, T_ARRAY)) return FALSE;
+    if (RARRAY_LEN(debug1) != 2) return FALSE;
+    if (RARRAY_LEN(debug2) != 2) return FALSE;
+    if (RARRAY_AREF(debug1, 0) != RARRAY_AREF(debug2, 0)) return FALSE;
+    if (RARRAY_AREF(debug1, 1) != RARRAY_AREF(debug2, 1)) return FALSE;
+    return TRUE;
+}
+
+static int
+is_frozen_putstring(INSN *insn, VALUE *op)
+{
+    if (IS_INSN_ID(insn, putstring)) {
+        *op = OPERAND_AT(insn, 0);
+        return 1;
+    }
+    else if (IS_INSN_ID(insn, putobject)) { /* frozen_string_literal */
+        *op = OPERAND_AT(insn, 0);
+        return RB_TYPE_P(*op, T_STRING);
+    }
+    return 0;
+}
+
+static int
+optimize_checktype(rb_iseq_t *iseq, INSN *iobj)
+{
+    /*
+     *   putobject obj
+     *   dup
+     *   checktype T_XXX
+     *   branchif l1
+     * l2:
+     *   ...
+     * l1:
+     *
+     * => obj is a T_XXX
+     *
+     *   putobject obj (T_XXX)
+     *   jump L1
+     * L1:
+     *
+     * => obj is not a T_XXX
+     *
+     *   putobject obj (T_XXX)
+     *   jump L2
+     * L2:
+     */
+    int line;
+    INSN *niobj, *ciobj, *dup = 0;
+    LABEL *dest = 0;
+    VALUE type;
+
+    switch (INSN_OF(iobj)) {
+      case BIN(putstring):
+	type = INT2FIX(T_STRING);
+	break;
+      case BIN(putnil):
+	type = INT2FIX(T_NIL);
+	break;
+      case BIN(putobject):
+	type = INT2FIX(TYPE(OPERAND_AT(iobj, 0)));
+	break;
+      default: return FALSE;
+    }
+
+    ciobj = (INSN *)get_next_insn(iobj);
+    if (IS_INSN_ID(ciobj, jump)) {
+	ciobj = (INSN *)get_next_insn((INSN*)OPERAND_AT(ciobj, 0));
+    }
+    if (IS_INSN_ID(ciobj, dup)) {
+	ciobj = (INSN *)get_next_insn(dup = ciobj);
+    }
+    if (!ciobj || !IS_INSN_ID(ciobj, checktype)) return FALSE;
+    niobj = (INSN *)get_next_insn(ciobj);
+    if (!niobj) {
+      no_branch:
+	/* TODO: putobject true/false */
+	return FALSE;
+    }
+    switch (INSN_OF(niobj)) {
+      case BIN(branchif):
+	if (OPERAND_AT(ciobj, 0) == type) {
+	    dest = (LABEL *)OPERAND_AT(niobj, 0);
+	}
+	break;
+      case BIN(branchunless):
+	if (OPERAND_AT(ciobj, 0) != type) {
+	    dest = (LABEL *)OPERAND_AT(niobj, 0);
+	}
+	break;
+      default:
+	goto no_branch;
+    }
+    line = ciobj->insn_info.line_no;
+    if (!dest) {
+	if (niobj->link.next && IS_LABEL(niobj->link.next)) {
+	    dest = (LABEL *)niobj->link.next; /* reuse label */
+	}
+	else {
+	    dest = NEW_LABEL(line);
+	    ELEM_INSERT_NEXT(&niobj->link, &dest->link);
+	}
+    }
+    INSERT_AFTER_INSN1(iobj, line, jump, dest);
+    LABEL_REF(dest);
+    if (!dup) INSERT_AFTER_INSN(iobj, line, pop);
+    return TRUE;
+}
+
 static int
 iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
 {
-    INSN *iobj = (INSN *)list;
+    INSN *const iobj = (INSN *)list;
+
   again:
-    if (iobj->insn_id == BIN(jump)) {
-	INSN *niobj, *diobj, *piobj;
-	/*
-	 *  useless jump elimination:
-	 *     jump LABEL1
-	 *     ...
-	 *   LABEL1:
-	 *     jump LABEL2
-	 *
-	 *   => in this case, first jump instruction should jump to
-	 *      LABEL2 directly
-	 */
+    optimize_checktype(iseq, iobj);
+
+    if (IS_INSN_ID(iobj, jump)) {
+        INSN *niobj, *diobj, *piobj;
 	diobj = (INSN *)get_destination_insn(iobj);
 	niobj = (INSN *)get_next_insn(iobj);
 
@@ -1711,15 +2715,28 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	     * =>
 	     *   LABEL:
 	     */
-	    REMOVE_ELEM(&iobj->link);
+	    unref_destination(iobj, 0);
+	    ELEM_REMOVE(&iobj->link);
+	    return COMPILE_OK;
 	}
-	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 (iobj != diobj && IS_INSN_ID(diobj, jump) &&
+		 OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0)) {
+	    /*
+	     *  useless jump elimination:
+	     *     jump LABEL1
+	     *     ...
+	     *   LABEL1:
+	     *     jump LABEL2
+	     *
+	     *   => in this case, first jump instruction should jump to
+	     *      LABEL2 directly
+	     */
+	    replace_destination(iobj, diobj);
+	    remove_unreachable_chunk(iseq, iobj->link.next);
+	    goto again;
 	}
-	else if (diobj->insn_id == BIN(leave)) {
+        else if (IS_INSN_ID(diobj, leave)) {
+	    INSN *pop;
 	    /*
 	     *  jump LABEL
 	     *  ...
@@ -1727,47 +2744,115 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	     *  leave
 	     * =>
 	     *  leave
+	     *  pop
 	     *  ...
 	     * LABEL:
 	     *  leave
 	     */
-	    INSN *eiobj = new_insn_core(iseq, iobj->line_no, BIN(leave),
-					diobj->operand_size, diobj->operands);
-	    INSN *popiobj = new_insn_core(iseq, iobj->line_no,
-					  BIN(pop), 0, 0);
 	    /* replace */
-	    REPLACE_ELEM((LINK_ELEMENT *)iobj, (LINK_ELEMENT *)eiobj);
-	    INSERT_ELEM_NEXT((LINK_ELEMENT *)eiobj, (LINK_ELEMENT *)popiobj);
-	    iobj = popiobj;
-	}
-	/*
-	 * useless jump elimination (if/unless destination):
-	 *   if   L1
-	 *   jump L2
-	 * L1:
-	 *   ...
-	 * L2:
-	 *
-	 * ==>
-	 *   unless L2
-	 * L1:
-	 *   ...
-	 * L2:
-	 */
-	else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 &&
-		 (piobj->insn_id == BIN(branchif) ||
-		  piobj->insn_id == BIN(branchunless))) {
-	    if (niobj == (INSN *)get_destination_insn(piobj)) {
-		piobj->insn_id = (piobj->insn_id == BIN(branchif))
+	    unref_destination(iobj, 0);
+            iobj->insn_id = BIN(leave);
+	    iobj->operand_size = 0;
+	    iobj->insn_info = diobj->insn_info;
+	    /* adjust stack depth */
+	    pop = new_insn_body(iseq, diobj->insn_info.line_no, BIN(pop), 0);
+            ELEM_INSERT_NEXT(&iobj->link, &pop->link);
+	    goto again;
+	}
+       else if (IS_INSN(iobj->link.prev) &&
+                 (piobj = (INSN *)iobj->link.prev) &&
+		 (IS_INSN_ID(piobj, branchif) ||
+		  IS_INSN_ID(piobj, branchunless))) {
+	    INSN *pdiobj = (INSN *)get_destination_insn(piobj);
+	    if (niobj == pdiobj) {
+		int refcnt = IS_LABEL(piobj->link.next) ?
+		    ((LABEL *)piobj->link.next)->refcnt : 0;
+		/*
+		 * useless jump elimination (if/unless destination):
+		 *   if   L1
+		 *   jump L2
+		 * L1:
+		 *   ...
+		 * L2:
+		 *
+		 * ==>
+		 *   unless L2
+		 * L1:
+		 *   ...
+		 * L2:
+		 */
+		piobj->insn_id = (IS_INSN_ID(piobj, branchif))
 		  ? BIN(branchunless) : BIN(branchif);
-		OPERAND_AT(piobj, 0) = OPERAND_AT(iobj, 0);
-		REMOVE_ELEM(&iobj->link);
+		replace_destination(piobj, iobj);
+		if (refcnt <= 1) {
+		    ELEM_REMOVE(&iobj->link);
+		}
+		else {
+		    /* TODO: replace other branch destinations too */
+		}
+		return COMPILE_OK;
 	    }
+	    else if (diobj == pdiobj) {
+		/*
+		 * useless jump elimination (if/unless before jump):
+		 * L1:
+		 *   ...
+		 *   if   L1
+		 *   jump L1
+		 *
+		 * ==>
+		 * L1:
+		 *   ...
+		 *   pop
+		 *   jump L1
+		 */
+		INSN *popiobj = new_insn_core(iseq, iobj->insn_info.line_no,
+					      BIN(pop), 0, 0);
+		ELEM_REPLACE(&piobj->link, &popiobj->link);
+	    }
+	}
+	if (remove_unreachable_chunk(iseq, iobj->link.next)) {
+	    goto again;
 	}
     }
 
-    if (iobj->insn_id == BIN(branchif) ||
-	iobj->insn_id == BIN(branchunless)) {
+    /*
+     * putstring "beg"
+     * putstring "end"
+     * newrange excl
+     *
+     * ==>
+     *
+     * putobject "beg".."end"
+     */
+    if (IS_INSN_ID(iobj, checkmatch)) {
+        INSN *range = (INSN *)get_prev_insn(iobj);
+        INSN *beg, *end;
+        VALUE str_beg, str_end;
+
+	if (range && IS_INSN_ID(range, newrange) &&
+                (end = (INSN *)get_prev_insn(range)) != 0 &&
+                is_frozen_putstring(end, &str_end) &&
+                (beg = (INSN *)get_prev_insn(end)) != 0 &&
+                is_frozen_putstring(beg, &str_beg)) {
+	    int excl = FIX2INT(OPERAND_AT(range, 0));
+	    VALUE lit_range = rb_range_new(str_beg, str_end, excl);
+
+	    ELEM_REMOVE(&beg->link);
+	    ELEM_REMOVE(&end->link);
+	    range->insn_id = BIN(putobject);
+	    OPERAND_AT(range, 0) = lit_range;
+	    RB_OBJ_WRITTEN(iseq, Qundef, lit_range);
+	}
+    }
+
+    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 L1
 	 *   ...
@@ -1777,45 +2862,410 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	 *   if L2
 	 */
 	INSN *nobj = (INSN *)get_destination_insn(iobj);
-	if (nobj->insn_id == BIN(jump)) {
-	    OPERAND_AT(iobj, 0) = OPERAND_AT(nobj, 0);
+
+        /* This is super nasty hack!!!
+         *
+         * This jump-jump optimization may ignore event flags of the jump
+         * instruction being skipped.  Actually, Line 2 TracePoint event
+         * is never fired in the following code:
+         *
+         *   1: raise if 1 == 2
+         *   2: while true
+         *   3:   break
+         *   4: end
+         *
+         * This is critical for coverage measurement.  [Bug #15980]
+         *
+         * This is a stopgap measure: stop the jump-jump optimization if
+         * coverage measurement is enabled and if the skipped instruction
+         * has any event flag.
+         *
+         * Note that, still, TracePoint Line event does not occur on Line 2.
+         * This should be fixed in future.
+         */
+        int stop_optimization =
+	    ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq) &&
+            nobj->insn_info.events;
+	if (!stop_optimization) {
+            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) ||
+                             IS_INSN_ID(pobj, duparray) ||
+                             IS_INSN_ID(pobj, newarray)) {
+                        cond = IS_INSN_ID(iobj, branchif);
+                    }
+                    else if (IS_INSN_ID(pobj, putnil)) {
+                        cond = !IS_INSN_ID(iobj, branchif);
+                    }
+                    else break;
+                    if (prev_dup || !IS_INSN_ID(pobj, newarray)) {
+                        ELEM_REMOVE(iobj->link.prev);
+                    }
+                    else if (!iseq_pop_newarray(iseq, pobj)) {
+                        pobj = new_insn_core(iseq, pobj->insn_info.line_no, BIN(pop), 0, NULL);
+                        ELEM_INSERT_PREV(&iobj->link, &pobj->link);
+                    }
+                    if (cond) {
+                        if (prev_dup) {
+                            pobj = new_insn_core(iseq, pobj->insn_info.line_no, BIN(putnil), 0, NULL);
+                            ELEM_INSERT_NEXT(&iobj->link, &pobj->link);
+                        }
+                        iobj->insn_id = BIN(jump);
+                        goto again;
+                    }
+                    else {
+                        unref_destination(iobj, 0);
+                        ELEM_REMOVE(&iobj->link);
+                    }
+                    break;
+                }
+                else break;
+                nobj = (INSN *)get_destination_insn(nobj);
+            }
+        }
+    }
+
+    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) ||
+		previ == BIN(dup) ||
+		previ == BIN(getlocal) ||
+		previ == BIN(getblockparam) ||
+		previ == BIN(getblockparamproxy) ||
+		/* getinstancevariable may issue a warning */
+		previ == BIN(duparray)) {
+		/* just push operand or static value and pop soon, no
+		 * side effects */
+		ELEM_REMOVE(prev);
+		ELEM_REMOVE(&iobj->link);
+	    }
+	    else if (previ == BIN(newarray) && iseq_pop_newarray(iseq, (INSN*)prev)) {
+		ELEM_REMOVE(&iobj->link);
+	    }
+	    else if (previ == BIN(concatarray)) {
+		INSN *piobj = (INSN *)prev;
+		INSERT_BEFORE_INSN1(piobj, piobj->insn_info.line_no, splatarray, Qfalse);
+		INSN_OF(piobj) = BIN(pop);
+	    }
+	    else if (previ == BIN(concatstrings)) {
+		if (OPERAND_AT(prev, 0) == INT2FIX(1)) {
+		    ELEM_REMOVE(prev);
+		}
+		else {
+		    ELEM_REMOVE(&iobj->link);
+		    INSN_OF(prev) = BIN(adjuststack);
+		}
+	    }
+	}
+    }
+
+    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 */
+	    ELEM_REMOVE(next);
+	}
+    }
+
+    if (IS_INSN_ID(iobj, tostring)) {
+	LINK_ELEMENT *next = iobj->link.next;
+	/*
+	 *  tostring
+	 *  concatstrings 1
+	 * =>
+	 *  tostring
+	 */
+	if (IS_INSN(next) && IS_INSN_ID(next, concatstrings) &&
+	    OPERAND_AT(next, 0) == INT2FIX(1)) {
+	    ELEM_REMOVE(next);
+	}
+    }
+
+    if (IS_INSN_ID(iobj, putstring) ||
+	(IS_INSN_ID(iobj, putobject) && RB_TYPE_P(OPERAND_AT(iobj, 0), T_STRING))) {
+	/*
+	 *  putstring ""
+	 *  concatstrings N
+	 * =>
+	 *  concatstrings N-1
+	 */
+	if (IS_NEXT_INSN_ID(&iobj->link, concatstrings) &&
+	    RSTRING_LEN(OPERAND_AT(iobj, 0)) == 0) {
+	    INSN *next = (INSN *)iobj->link.next;
+	    if ((OPERAND_AT(next, 0) = FIXNUM_INC(OPERAND_AT(next, 0), -1)) == INT2FIX(1)) {
+		ELEM_REMOVE(&next->link);
+	    }
+	    ELEM_REMOVE(&iobj->link);
+	}
+    }
+
+    if (IS_INSN_ID(iobj, concatstrings)) {
+	/*
+	 *  concatstrings N
+	 *  concatstrings M
+	 * =>
+	 *  concatstrings N+M-1
+	 */
+	LINK_ELEMENT *next = iobj->link.next, *freeze = 0;
+	INSN *jump = 0;
+	if (IS_INSN(next) && IS_INSN_ID(next, freezestring))
+	    next = (freeze = next)->next;
+	if (IS_INSN(next) && IS_INSN_ID(next, jump))
+	    next = get_destination_insn(jump = (INSN *)next);
+	if (IS_INSN(next) && IS_INSN_ID(next, concatstrings)) {
+	    int n = FIX2INT(OPERAND_AT(iobj, 0)) + FIX2INT(OPERAND_AT(next, 0)) - 1;
+	    OPERAND_AT(iobj, 0) = INT2FIX(n);
+	    if (jump) {
+		LABEL *label = ((LABEL *)OPERAND_AT(jump, 0));
+		if (!--label->refcnt) {
+		    ELEM_REMOVE(&label->link);
+		}
+		else {
+		    label = NEW_LABEL(0);
+		    OPERAND_AT(jump, 0) = (VALUE)label;
+		}
+		label->refcnt++;
+		if (freeze && IS_NEXT_INSN_ID(next, freezestring)) {
+		    if (same_debug_pos_p(freeze, next->next)) {
+			ELEM_REMOVE(freeze);
+		    }
+		    else {
+			next = next->next;
+		    }
+		}
+		ELEM_INSERT_NEXT(next, &label->link);
+		CHECK(iseq_peephole_optimize(iseq, get_next_insn(jump), do_tailcallopt));
+	    }
+	    else {
+		if (freeze) ELEM_REMOVE(freeze);
+		ELEM_REMOVE(next);
+	    }
+	}
+    }
+
+    if (IS_INSN_ID(iobj, freezestring) &&
+	NIL_P(OPERAND_AT(iobj, 0)) &&
+	IS_NEXT_INSN_ID(&iobj->link, send)) {
+	INSN *niobj = (INSN *)iobj->link.next;
+	struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(niobj, 0);
+	/*
+	 *  freezestring nil # no debug_info
+	 *  send <:+@, 0, ARG_SIMPLE>  # :-@, too
+	 * =>
+	 *  send <:+@, 0, ARG_SIMPLE>  # :-@, too
+	 */
+	if ((ci->mid == idUPlus || ci->mid == idUMinus) &&
+	    (ci->flag & VM_CALL_ARGS_SIMPLE) &&
+	    ci->orig_argc == 0) {
+	    ELEM_REMOVE(list);
+	    return COMPILE_OK;
 	}
     }
 
-    if (do_tailcallopt && iobj->insn_id == BIN(leave)) {
+    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))) {
 	/*
 	 *  send ...
 	 *  leave
 	 * =>
-	 *  send ..., ... | VM_CALL_TAILCALL_BIT, ...
+	 *  send ..., ... | VM_CALL_TAILCALL, ...
 	 *  leave # unreachable
 	 */
-	INSN *piobj = (INSN *)get_prev_insn((INSN *)list);
+	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):
+		    next = next->next;
+		    break;
+		  case BIN(jump):
+		    /* if cond
+		     *   return tailcall
+		     * end
+		     */
+		    next = get_destination_insn((INSN *)next);
+		    break;
+		  case BIN(leave):
+		    piobj = iobj;
+                    /* fall through */
+		  default:
+		    next = NULL;
+		    break;
+		}
+	    } while (next);
+	}
+
+	if (piobj) {
+            struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(piobj, 0);
+	    if (IS_INSN_ID(piobj, send) || IS_INSN_ID(piobj, invokesuper)) {
+                if (OPERAND_AT(piobj, 1) == 0) { /* no blockiseq */
+		    ci->flag |= VM_CALL_TAILCALL;
+		}
+	    }
+	    else {
+		ci->flag |= VM_CALL_TAILCALL;
+	    }
+	}
+    }
+
+    if (IS_INSN_ID(iobj, dup)) {
+	if (IS_NEXT_INSN_ID(&iobj->link, setlocal)) {
+	    LINK_ELEMENT *set1 = iobj->link.next, *set2 = NULL;
+	    if (IS_NEXT_INSN_ID(set1, setlocal)) {
+		set2 = set1->next;
+		if (OPERAND_AT(set1, 0) == OPERAND_AT(set2, 0) &&
+		    OPERAND_AT(set1, 1) == OPERAND_AT(set2, 1)) {
+		    ELEM_REMOVE(set1);
+		    ELEM_REMOVE(&iobj->link);
+		}
+	    }
+	    else if (IS_NEXT_INSN_ID(set1, dup) &&
+		     IS_NEXT_INSN_ID(set1->next, setlocal)) {
+		set2 = set1->next->next;
+		if (OPERAND_AT(set1, 0) == OPERAND_AT(set2, 0) &&
+		    OPERAND_AT(set1, 1) == OPERAND_AT(set2, 1)) {
+		    ELEM_REMOVE(set1->next);
+		    ELEM_REMOVE(set2);
+		}
+	    }
+	}
+    }
 
-	if (piobj->insn_id == BIN(send) &&
-	    piobj->operands[2] == 0 /* block */
-	    ) {
-	    piobj->operands[3] = FIXNUM_OR(piobj->operands[3], VM_CALL_TAILCALL_BIT);
+    if (IS_INSN_ID(iobj, getlocal)) {
+	LINK_ELEMENT *niobj = &iobj->link;
+	if (IS_NEXT_INSN_ID(niobj, dup)) {
+	    niobj = niobj->next;
+	}
+	if (IS_NEXT_INSN_ID(niobj, setlocal)) {
+	    LINK_ELEMENT *set1 = niobj->next;
+	    if (OPERAND_AT(iobj, 0) == OPERAND_AT(set1, 0) &&
+		OPERAND_AT(iobj, 1) == OPERAND_AT(set1, 1)) {
+		ELEM_REMOVE(set1);
+		ELEM_REMOVE(niobj);
+	    }
 	}
     }
+
+    if (IS_INSN_ID(iobj, opt_invokebuiltin_delegate)) {
+        if (IS_TRACE(iobj->link.next)) {
+            if (IS_NEXT_INSN_ID(iobj->link.next, leave)) {
+                iobj->insn_id = BIN(opt_invokebuiltin_delegate_leave);
+            }
+        }
+    }
+
     return COMPILE_OK;
 }
 
 static int
 insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int insn_id)
 {
-    int i, old_opsize = iobj->operand_size;
-
     iobj->insn_id = insn_id;
     iobj->operand_size = insn_len(insn_id) - 1;
-    /* printf("iobj->operand_size: %d\n", iobj->operand_size); */
 
-    if (iobj->operand_size > old_opsize) {
-	iobj->operands = (VALUE *)compile_data_alloc(iseq, iobj->operand_size);
-    }
-
-    for (i=0; i<iobj->operand_size; i++) {
-	iobj->operands[i] = INT2FIX(iseq->ic_size++);
+    if (insn_id == BIN(opt_neq)) {
+	VALUE *old_operands = iobj->operands;
+        iobj->operand_size = 2;
+        iobj->operands = compile_data_alloc2(iseq, iobj->operand_size, sizeof(VALUE));
+        iobj->operands[0] = (VALUE)new_callinfo(iseq, idEq, 1, 0, NULL, FALSE);
+        iobj->operands[1] = old_operands[0];
     }
 
     return COMPILE_OK;
@@ -1824,90 +3274,119 @@ 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 (iobj->insn_id == BIN(send)) {
-	ID mid = SYM2ID(OPERAND_AT(iobj, 0));
-	int argc = FIX2INT(OPERAND_AT(iobj, 1));
-	VALUE block = OPERAND_AT(iobj, 2);
-	VALUE flag = OPERAND_AT(iobj, 3);
-
-	/* TODO: should be more sophisticated search */
-	if (block == 0 && flag == INT2FIX(0)) {
-	    if (argc == 0) {
-		if (mid == idLength) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_length));
-		}
-		else if (mid == idSize) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_size));
-		}
-		else if (mid == idSucc) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_succ));
-		}
-		else if (mid == idNot) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_not));
+    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);
+		    ELEM_REMOVE(&niobj->link);
+		    return COMPILE_OK;
+		  case idMin:
+		    iobj->insn_id = BIN(opt_newarray_min);
+		    ELEM_REMOVE(&niobj->link);
+		    return COMPILE_OK;
 		}
 	    }
-	    else if (argc == 1) {
-		if (0) {
-		}
-		else if (mid == idPLUS) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_plus));
-		}
-		else if (mid == idMINUS) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_minus));
-		}
-		else if (mid == idMULT) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_mult));
-		}
-		else if (mid == idDIV) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_div));
-		}
-		else if (mid == idMOD) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_mod));
-		}
-		else if (mid == idEq) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_eq));
-		}
-		else if (mid == idNeq) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_neq));
-		}
-		else if (mid == idLT) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_lt));
-		}
-		else if (mid == idLE) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_le));
-		}
-		else if (mid == idGT) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_gt));
-		}
-		else if (mid == idGE) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_ge));
+	}
+    }
+
+    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, 1);
+
+#define SP_INSN(opt) insn_set_specialized_instruction(iseq, iobj, BIN(opt_##opt))
+	if (ci->flag & VM_CALL_ARGS_SIMPLE) {
+	    switch (ci->orig_argc) {
+	      case 0:
+		switch (ci->mid) {
+		  case idLength: SP_INSN(length); return COMPILE_OK;
+		  case idSize:	 SP_INSN(size);	  return COMPILE_OK;
+		  case idEmptyP: SP_INSN(empty_p);return COMPILE_OK;
+                  case idNilP:   SP_INSN(nil_p);  return COMPILE_OK;
+		  case idSucc:	 SP_INSN(succ);	  return COMPILE_OK;
+		  case idNot:	 SP_INSN(not);	  return COMPILE_OK;
 		}
-		else if (mid == idLTLT) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_ltlt));
+		break;
+	      case 1:
+		switch (ci->mid) {
+		  case idPLUS:	 SP_INSN(plus);	  return COMPILE_OK;
+		  case idMINUS:	 SP_INSN(minus);  return COMPILE_OK;
+		  case idMULT:	 SP_INSN(mult);	  return COMPILE_OK;
+		  case idDIV:	 SP_INSN(div);	  return COMPILE_OK;
+		  case idMOD:	 SP_INSN(mod);	  return COMPILE_OK;
+		  case idEq:	 SP_INSN(eq);	  return COMPILE_OK;
+		  case idNeq:	 SP_INSN(neq);	  return COMPILE_OK;
+		  case idEqTilde:SP_INSN(regexpmatch2);return COMPILE_OK;
+		  case idLT:	 SP_INSN(lt);	  return COMPILE_OK;
+		  case idLE:	 SP_INSN(le);	  return COMPILE_OK;
+		  case idGT:	 SP_INSN(gt);	  return COMPILE_OK;
+		  case idGE:	 SP_INSN(ge);	  return COMPILE_OK;
+		  case idLTLT:	 SP_INSN(ltlt);	  return COMPILE_OK;
+		  case idAREF:	 SP_INSN(aref);	  return COMPILE_OK;
+                  case idAnd:    SP_INSN(and);    return COMPILE_OK;
+                  case idOr:     SP_INSN(or);    return COMPILE_OK;
 		}
-		else if (mid == idAREF) {
-		    insn_set_specialized_instruction(iseq, iobj, BIN(opt_aref));
+		break;
+	      case 2:
+		switch (ci->mid) {
+		  case idASET:	 SP_INSN(aset);	  return COMPILE_OK;
 		}
+		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;
+	}
     }
+#undef SP_INSN
+
     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 *anchor)
+iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 {
     LINK_ELEMENT *list;
-    const int do_peepholeopt = iseq->compile_data->option->peephole_optimization;
-    const int do_tailcallopt = iseq->compile_data->option->tailcall_optimization;
-    const int do_si = iseq->compile_data->option->specialized_instruction;
-    const int do_ou = iseq->compile_data->option->operands_unification;
+    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;
+
     list = FIRST_ELEMENT(anchor);
 
     while (list) {
-	if (list->type == ISEQ_ELEMENT_INSN) {
+	if (IS_INSN(list)) {
 	    if (do_peepholeopt) {
-		iseq_peephole_optimize(iseq, list, do_tailcallopt);
+		iseq_peephole_optimize(iseq, list, tailcallopt);
 	    }
 	    if (do_si) {
 		iseq_specialized_instruction(iseq, (INSN *)list);
@@ -1916,6 +3395,17 @@ iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *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;
@@ -1941,7 +3431,7 @@ new_unified_insn(rb_iseq_t *iseq,
 
     if (argc > 0) {
 	ptr = operands =
-	    (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc);
+            compile_data_alloc2(iseq, sizeof(VALUE), argc);
     }
 
     /* copy operands */
@@ -1953,7 +3443,7 @@ new_unified_insn(rb_iseq_t *iseq,
 	list = list->next;
     }
 
-    return new_insn_core(iseq, iobj->line_no, insn_id, argc, operands);
+    return new_insn_core(iseq, iobj->insn_info.line_no, insn_id, argc, operands);
 }
 #endif
 
@@ -1963,7 +3453,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 *anchor)
+iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 {
 #if OPT_INSTRUCTIONS_UNIFICATION
     LINK_ELEMENT *list;
@@ -1973,7 +3463,7 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 
     list = FIRST_ELEMENT(anchor);
     while (list) {
-	if (list->type == ISEQ_ELEMENT_INSN) {
+	if (IS_INSN(list)) {
 	    iobj = (INSN *)list;
 	    id = iobj->insn_id;
 	    if (unified_insns_data[id] != 0) {
@@ -1982,7 +3472,7 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 		    const int *unified = entry[j];
 		    LINK_ELEMENT *li = list->next;
 		    for (k = 2; k < unified[1]; k++) {
-			if (li->type != ISEQ_ELEMENT_INSN ||
+			if (!IS_INSN(li) ||
 			    ((INSN *)li)->insn_id != unified[k]) {
 			    goto miss;
 			}
@@ -2021,7 +3511,7 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 #include "opt_sc.inc"
 
 static int
-insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state)
+insn_set_sc_state(rb_iseq_t *iseq, const LINK_ELEMENT *anchor, INSN *iobj, int state)
 {
     int nstate;
     int insn_id;
@@ -2036,12 +3526,12 @@ insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state)
 
 	if (lobj->sc_state != 0) {
 	    if (lobj->sc_state != nstate) {
-		dump_disasm_list((LINK_ELEMENT *)iobj);
-		dump_disasm_list((LINK_ELEMENT *)lobj);
-		printf("\n-- %d, %d\n", lobj->sc_state, nstate);
-		rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
-				 "insn_set_sc_state error\n");
-		return 0;
+		BADINSN_DUMP(anchor, iobj, lobj);
+		COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+			      "insn_set_sc_state error: %d at "LABEL_FORMAT
+			      ", %d expected\n",
+			      lobj->sc_state, lobj->label_no, nstate);
+		return COMPILE_NG;
 	    }
 	}
 	else {
@@ -2077,7 +3567,7 @@ label_set_sc_state(LABEL *lobj, int state)
 #endif
 
 static int
-iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 {
 #if OPT_STACK_CACHING
     LINK_ELEMENT *list;
@@ -2108,7 +3598,7 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 				new_insn_body(iseq, 0, BIN(reput), 0);
 
 			    /* replace this insn */
-			    REPLACE_ELEM(list, (LINK_ELEMENT *)rpobj);
+			    ELEM_REPLACE(list, (LINK_ELEMENT *)rpobj);
 			    list = (LINK_ELEMENT *)rpobj;
 			    goto redo_point;
 			}
@@ -2119,7 +3609,7 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 			if (state == SCS_AB || state == SCS_BA) {
 			    state = (state == SCS_AB ? SCS_BA : SCS_AB);
 
-			    REMOVE_ELEM(list);
+			    ELEM_REMOVE(list);
 			    list = list->next;
 			    goto redo_point;
 			}
@@ -2141,11 +3631,12 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 			  case SCS_XX:
 			    goto normal_insn;
 			  default:
-			    rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
-					     "unreachable");
+			    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+					  "unreachable");
+			    return COMPILE_NG;
 			}
 			/* remove useless pop */
-			REMOVE_ELEM(list);
+			ELEM_REMOVE(list);
 			list = list->next;
 			goto redo_point;
 		    }
@@ -2153,7 +3644,7 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 		    /* none */
 		}		/* end of switch */
 	      normal_insn:
-		state = insn_set_sc_state(iseq, iobj, state);
+		state = insn_set_sc_state(iseq, anchor, iobj, state);
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
@@ -2172,78 +3663,156 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
     return COMPILE_OK;
 }
 
-
+static int
+all_string_result_p(const NODE *node)
+{
+    if (!node) return FALSE;
+    switch (nd_type(node)) {
+      case NODE_STR: case NODE_DSTR:
+	return TRUE;
+      case NODE_IF: case NODE_UNLESS:
+	if (!node->nd_body || !node->nd_else) return FALSE;
+	if (all_string_result_p(node->nd_body))
+	    return all_string_result_p(node->nd_else);
+	return FALSE;
+      case NODE_AND: case NODE_OR:
+	if (!node->nd_2nd)
+	    return all_string_result_p(node->nd_1st);
+	if (!all_string_result_p(node->nd_1st))
+	    return FALSE;
+	return all_string_result_p(node->nd_2nd);
+      default:
+	return FALSE;
+    }
+}
 
 static int
-compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int *cntp)
+compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int *cntp)
 {
-    NODE *list = node->nd_next;
+    const 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)) {
-	hide_obj(lit);
 	cnt++;
+	if (!RB_TYPE_P(lit, T_STRING)) {
+	    COMPILE_ERROR(ERROR_ARGS "dstr: must be string: %s",
+			  rb_builtin_type_name(TYPE(lit)));
+	    return COMPILE_NG;
+	}
+	lit = rb_fstring(lit);
 	ADD_INSN1(ret, nd_line(node), putobject, lit);
+        RB_OBJ_WRITTEN(iseq, Qundef, lit);
+	if (RSTRING_LEN(lit) == 0) first_lit = LAST_ELEMENT(ret);
     }
 
     while (list) {
-	COMPILE(ret, "each string", list->nd_head);
+	const NODE *const head = list->nd_head;
+	if (nd_type(head) == NODE_STR) {
+	    lit = rb_fstring(head->nd_lit);
+	    ADD_INSN1(ret, nd_line(head), putobject, lit);
+            RB_OBJ_WRITTEN(iseq, Qundef, lit);
+	    lit = Qnil;
+	}
+	else {
+	    CHECK(COMPILE(ret, "each string", head));
+	}
 	cnt++;
 	list = list->nd_next;
     }
+    if (NIL_P(lit) && first_lit) {
+	ELEM_REMOVE(first_lit);
+	--cnt;
+    }
     *cntp = cnt;
 
     return COMPILE_OK;
 }
 
 static int
-compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
+compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
 {
     int cnt;
-    compile_dstr_fragments(iseq, ret, node, &cnt);
+    CHECK(compile_dstr_fragments(iseq, ret, node, &cnt));
     ADD_INSN1(ret, nd_line(node), concatstrings, INT2FIX(cnt));
     return COMPILE_OK;
 }
 
 static int
-compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
+compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
 {
     int cnt;
-    compile_dstr_fragments(iseq, ret, node, &cnt);
+    CHECK(compile_dstr_fragments(iseq, ret, node, &cnt));
     ADD_INSN2(ret, nd_line(node), toregexp, INT2FIX(node->nd_cflag), INT2FIX(cnt));
     return COMPILE_OK;
 }
 
 static int
-compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond,
+compile_flip_flop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const 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 */
+    CHECK(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);
+    CHECK(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, const NODE *cond,
 			 LABEL *then_label, LABEL *else_label)
 {
+  again:
     switch (nd_type(cond)) {
       case NODE_AND:
 	{
 	    LABEL *label = NEW_LABEL(nd_line(cond));
-	    compile_branch_condition(iseq, ret, cond->nd_1st, label,
-				     else_label);
+	    CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, label,
+					   else_label));
+	    if (!label->refcnt) break;
 	    ADD_LABEL(ret, label);
-	    compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
-				     else_label);
-	    break;
+	    cond = cond->nd_2nd;
+	    goto again;
 	}
       case NODE_OR:
 	{
 	    LABEL *label = NEW_LABEL(nd_line(cond));
-	    compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
-				     label);
+	    CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
+					   label));
+	    if (!label->refcnt) break;
 	    ADD_LABEL(ret, label);
-	    compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
-				     else_label);
-	    break;
+	    cond = cond->nd_2nd;
+	    goto again;
 	}
-      case NODE_LIT:		/* NODE_LIT is always not true */
+      case NODE_LIT:		/* NODE_LIT is always true */
       case NODE_TRUE:
       case NODE_STR:
+      case NODE_ZLIST:
+      case NODE_LAMBDA:
 	/* printf("useless condition eliminate (%s)\n",  ruby_node_name(nd_type(cond))); */
 	ADD_INSNL(ret, nd_line(cond), jump, then_label);
 	break;
@@ -2252,8 +3821,25 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *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_LIST:
+      case NODE_ARGSCAT:
+      case NODE_DREGX:
+      case NODE_DSTR:
+	CHECK(COMPILE_POPPED(ret, "branch condition", cond));
+	ADD_INSNL(ret, nd_line(cond), jump, then_label);
+	break;
+      case NODE_FLIP2:
+	CHECK(compile_flip_flop(iseq, ret, cond, TRUE, then_label, else_label));
+	break;
+      case NODE_FLIP3:
+	CHECK(compile_flip_flop(iseq, ret, cond, FALSE, then_label, else_label));
+	break;
+      case NODE_DEFINED:
+	CHECK(compile_defined_expr(iseq, ret, cond, Qfalse));
+	goto branch;
       default:
-	COMPILE(ret, "branch condition", cond);
+	CHECK(COMPILE(ret, "branch condition", cond));
+      branch:
 	ADD_INSNL(ret, nd_line(cond), branchunless, else_label);
 	ADD_INSNL(ret, nd_line(cond), jump, then_label);
 	break;
@@ -2262,74 +3848,450 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond,
 }
 
 static int
-compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
-	       VALUE opt_p, int poped)
+keyword_node_p(const NODE *const node)
 {
-    NODE *node = node_root;
-    int len = (int)node->nd_alen, line = (int)nd_line(node), i=0;
-    DECL_ANCHOR(anchor);
+    return nd_type(node) == NODE_HASH && node->nd_brace == FALSE;
+}
+
+static int
+compile_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,
+			  unsigned int *flag)
+{
+    if (kw_arg_ptr == NULL) return FALSE;
+
+    if (keyword_node_p(root_node) && root_node->nd_head && nd_type(root_node->nd_head) == NODE_LIST) {
+	const NODE *node = root_node->nd_head;
 
-    INIT_ANCHOR(anchor);
-    if (nd_type(node) != NODE_ZARRAY) {
 	while (node) {
-	    if (nd_type(node) != NODE_ARRAY) {
-		rb_bug("compile_array: This node is not NODE_ARRAY, but %s",
-		       ruby_node_name(nd_type(node)));
-	    }
+	    const NODE *key_node = node->nd_head;
 
-	    i++;
-	    if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
-		opt_p = Qfalse;
+	    assert(nd_type(node) == NODE_LIST);
+	    if (!key_node) {
+		if (flag) *flag |= VM_CALL_KW_SPLAT;
+		return FALSE;
 	    }
-	    COMPILE_(anchor, "array element", node->nd_head, poped);
+	    else if (nd_type(key_node) == NODE_LIT && RB_TYPE_P(key_node->nd_lit, T_SYMBOL)) {
+		/* can be keywords */
+	    }
+	    else {
+		if (flag) *flag |= VM_CALL_KW_SPLAT;
+		return FALSE;
+	    }
+	    node = node->nd_next; /* skip value node */
 	    node = node->nd_next;
 	}
-    }
 
-    if (len != i) {
-	if (0) {
-	    rb_bug("node error: compile_array (%d: %d-%d)",
-		   (int)nd_line(node_root), len, i);
+	/* may be keywords */
+	node = root_node->nd_head;
+	{
+	    int len = (int)node->nd_alen / 2;
+            struct rb_call_info_kw_arg *kw_arg =
+                rb_xmalloc_mul_add(len - 1, sizeof(VALUE), sizeof(struct rb_call_info_kw_arg));
+	    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) {
+		const NODE *key_node = node->nd_head;
+		const NODE *val_node = node->nd_next->nd_head;
+		keywords[i] = key_node->nd_lit;
+                NO_CHECK(COMPILE(ret, "keyword values", val_node));
+	    }
+	    assert(i == len);
+	    return TRUE;
 	}
-	len = i;
     }
+    return FALSE;
+}
 
-    if (opt_p == Qtrue) {
-	if (!poped) {
-	    VALUE ary = rb_ary_tmp_new(len);
-	    node = node_root;
-	    while (node) {
-		rb_ary_push(ary, node->nd_head->nd_lit);
-		node = node->nd_next;
-	    }
-	    OBJ_FREEZE(ary);
-	    iseq_add_mark_object_compile_time(iseq, ary);
-	    ADD_INSN1(ret, nd_line(node_root), duparray, ary);
-	}
+static int
+compile_args(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node,
+                   struct rb_call_info_kw_arg **keywords_ptr, unsigned int *flag)
+{
+    int len = 0;
+
+    for (; node; len++, node = node->nd_next) {
+        if (CPDEBUG > 0) {
+            EXPECT_NODE("compile_args", node, NODE_LIST, -1);
+        }
+
+        if (node->nd_next == NULL /* last node */ &&
+            compile_keyword_arg(iseq, ret, node->nd_head, keywords_ptr, flag)) {
+            len--;
+        }
+        else {
+            NO_CHECK(COMPILE_(ret, "array element", node->nd_head, FALSE));
+        }
     }
-    else {
-	if (!poped) {
-	    ADD_INSN1(anchor, line, newarray, INT2FIX(len));
+
+    return len;
+}
+
+static inline int
+static_literal_node_p(const NODE *node, const rb_iseq_t *iseq)
+{
+    node = node->nd_head;
+    switch (nd_type(node)) {
+      case NODE_LIT:
+      case NODE_NIL:
+      case NODE_TRUE:
+      case NODE_FALSE:
+	return TRUE;
+      case NODE_STR:
+        return ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal;
+      default:
+	return FALSE;
+    }
+}
+
+static inline VALUE
+static_literal_value(const NODE *node, rb_iseq_t *iseq)
+{
+    node = node->nd_head;
+    switch (nd_type(node)) {
+      case NODE_NIL:
+	return Qnil;
+      case NODE_TRUE:
+	return Qtrue;
+      case NODE_FALSE:
+	return Qfalse;
+      case NODE_STR:
+        if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
+            VALUE lit;
+            VALUE debug_info = rb_ary_new_from_args(2, rb_iseq_path(iseq), INT2FIX((int)nd_line(node)));
+            lit = rb_str_dup(node->nd_lit);
+            rb_ivar_set(lit, id_debug_created_info, rb_obj_freeze(debug_info));
+            return rb_str_freeze(lit);
+        }
+        else {
+            return rb_fstring(node->nd_lit);
+        }
+      default:
+	return node->nd_lit;
+    }
+}
+
+static int
+compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped)
+{
+    int line = (int)nd_line(node);
+
+    if (nd_type(node) == NODE_ZLIST) {
+	if (!popped) {
+	    ADD_INSN1(ret, line, newarray, INT2FIX(0));
 	}
-	APPEND_LIST(ret, anchor);
+        return 0;
     }
-    return len;
+
+    EXPECT_NODE("compile_array", node, NODE_LIST, -1);
+
+    if (popped) {
+        for (; node; node = node->nd_next) {
+            NO_CHECK(COMPILE_(ret, "array element", node->nd_head, popped));
+        }
+        return 1;
+    }
+
+    /* Compilation of an array literal.
+     * The following code is essentially the same as:
+     *
+     *     for (int count = 0; node; count++; node->nd_next) {
+     *         compile(node->nd_head);
+     *     }
+     *     ADD_INSN(newarray, count);
+     *
+     * However, there are three points.
+     *
+     * - The code above causes stack overflow for a big string literal.
+     *   The following limits the stack length up to max_stack_len.
+     *
+     *   [x1,x2,...,x10000] =>
+     *     push x1  ; push x2  ; ...; push x256; newarray 256;
+     *     push x257; push x258; ...; push x512; newarray 256; concatarray;
+     *     push x513; push x514; ...; push x768; newarray 256; concatarray;
+     *     ...
+     *
+     * - Long subarray can be optimized by pre-allocating a hidden array.
+     *
+     *   [1,2,3,...,100] =>
+     *     duparray [1,2,3,...,100]
+     *
+     *   [x, 1,2,3,...,100, z] =>
+     *     push x; newarray 1;
+     *     putobject [1,2,3,...,100] (<- hidden array); concatarray;
+     *     push z; newarray 1; concatarray
+     *
+     * - If the last element is a keyword, newarraykwsplat should be emitted
+     *   to check and remove empty keyword arguments hash from array.
+     *   (Note: a keyword is NODE_HASH which is not static_literal_node_p.)
+     *
+     *   [1,2,3,**kw] =>
+     *     putobject 1; putobject 2; putobject 3; push kw; newarraykwsplat
+     */
+
+    const int max_stack_len = 0x100;
+    const int min_tmp_ary_len = 0x40;
+    int stack_len = 0;
+    int first_chunk = 1;
+
+    /* Convert pushed elements to an array, and concatarray if needed */
+#define FLUSH_CHUNK(newarrayinsn)                               \
+    if (stack_len) {                                            \
+        ADD_INSN1(ret, line, newarrayinsn, INT2FIX(stack_len)); \
+        if (!first_chunk) ADD_INSN(ret, line, concatarray);     \
+        first_chunk = stack_len = 0;                            \
+    }
+
+    while (node) {
+        int count = 1;
+
+        /* pre-allocation check (this branch can be omittable) */
+        if (static_literal_node_p(node, iseq)) {
+            /* count the elements that are optimizable */
+            const NODE *node_tmp = node->nd_next;
+            for (; node_tmp && static_literal_node_p(node_tmp, iseq); node_tmp = node_tmp->nd_next)
+                count++;
+
+            if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_ary_len) {
+                /* The literal contains only optimizable elements, or the subarray is long enough */
+                VALUE ary = rb_ary_tmp_new(count);
+
+                /* Create a hidden array */
+                for (; count; count--, node = node->nd_next)
+                    rb_ary_push(ary, static_literal_value(node, iseq));
+                OBJ_FREEZE(ary);
+
+                /* Emit optimized code */
+                FLUSH_CHUNK(newarray);
+                if (first_chunk) {
+                    ADD_INSN1(ret, line, duparray, ary);
+                    first_chunk = 0;
+                }
+                else {
+                    ADD_INSN1(ret, line, putobject, ary);
+                    ADD_INSN(ret, line, concatarray);
+                }
+                RB_OBJ_WRITTEN(iseq, Qundef, ary);
+            }
+        }
+
+        /* Base case: Compile "count" elements */
+        for (; count; count--, node = node->nd_next) {
+            if (CPDEBUG > 0) {
+                EXPECT_NODE("compile_array", node, NODE_LIST, -1);
+            }
+
+            NO_CHECK(COMPILE_(ret, "array element", node->nd_head, 0));
+            stack_len++;
+
+            if (!node->nd_next && keyword_node_p(node->nd_head)) {
+                /* Reached the end, and the last element is a keyword */
+                FLUSH_CHUNK(newarraykwsplat);
+                return 1;
+            }
+
+            /* If there are many pushed elements, flush them to avoid stack overflow */
+            if (stack_len >= max_stack_len) FLUSH_CHUNK(newarray);
+        }
+    }
+
+    FLUSH_CHUNK(newarray);
+#undef FLUSH_CHUNK
+    return 1;
 }
 
-static VALUE
-compile_array(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root, VALUE opt_p)
+static inline int
+static_literal_node_pair_p(const NODE *node, const rb_iseq_t *iseq)
 {
-    return compile_array_(iseq, ret, node_root, opt_p, 0);
+    return node->nd_head && static_literal_node_p(node, iseq) && static_literal_node_p(node->nd_next, iseq);
 }
 
-static VALUE
-case_when_optimizable_literal(NODE * node)
+static int
+compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped)
+{
+    int line = (int)nd_line(node);
+
+    node = node->nd_head;
+
+    if (!node || nd_type(node) == NODE_ZLIST) {
+	if (!popped) {
+	    ADD_INSN1(ret, line, newhash, INT2FIX(0));
+	}
+        return 0;
+    }
+
+    EXPECT_NODE("compile_hash", node, NODE_LIST, -1);
+
+    if (popped) {
+        for (; node; node = node->nd_next) {
+            NO_CHECK(COMPILE_(ret, "hash element", node->nd_head, popped));
+        }
+        return 1;
+    }
+
+    /* Compilation of a hash literal (or keyword arguments).
+     * This is very similar to compile_array, but there are some differences:
+     *
+     * - It contains key-value pairs.  So we need to take every two elements.
+     *   We can assume that the length is always even.
+     *
+     * - Merging is done by a method call (id_core_hash_merge_ptr).
+     *   Sometimes we need to insert the receiver, so "anchor" is needed.
+     *   In addition, a method call is much slower than concatarray.
+     *   So it pays only when the subsequence is really long.
+     *   (min_tmp_hash_len must be much larger than min_tmp_ary_len.)
+     *
+     * - We need to handle keyword splat: **kw.
+     *   For **kw, the key part (node->nd_head) is NULL, and the value part
+     *   (node->nd_next->nd_head) is "kw".
+     *   The code is a bit difficult to avoid hash allocation for **{}.
+     */
+
+    const int max_stack_len = 0x100;
+    const int min_tmp_hash_len = 0x800;
+    int stack_len = 0;
+    int first_chunk = 1;
+    DECL_ANCHOR(anchor);
+    INIT_ANCHOR(anchor);
+
+    /* Convert pushed elements to a hash, and merge if needed */
+#define FLUSH_CHUNK()                                                                   \
+    if (stack_len) {                                                                    \
+        if (first_chunk) {                                                              \
+            APPEND_LIST(ret, anchor);                                                   \
+            ADD_INSN1(ret, line, newhash, INT2FIX(stack_len));                          \
+        }                                                                               \
+        else {                                                                          \
+            ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));  \
+            ADD_INSN(ret, line, swap);                                                  \
+            APPEND_LIST(ret, anchor);                                                   \
+            ADD_SEND(ret, line, id_core_hash_merge_ptr, INT2FIX(stack_len + 1));        \
+        }                                                                               \
+        INIT_ANCHOR(anchor);                                                            \
+        first_chunk = stack_len = 0;                                                    \
+    }
+
+    while (node) {
+        int count = 1;
+
+        /* pre-allocation check (this branch can be omittable) */
+        if (static_literal_node_pair_p(node, iseq)) {
+            /* count the elements that are optimizable */
+            const NODE *node_tmp = node->nd_next->nd_next;
+            for (; node_tmp && static_literal_node_pair_p(node_tmp, iseq); node_tmp = node_tmp->nd_next->nd_next)
+                count++;
+
+            if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_hash_len) {
+                /* The literal contains only optimizable elements, or the subsequence is long enough */
+                VALUE ary = rb_ary_tmp_new(count);
+
+                /* Create a hidden hash */
+                for (; count; count--, node = node->nd_next->nd_next) {
+                    VALUE elem[2];
+                    elem[0] = static_literal_value(node, iseq);
+                    elem[1] = static_literal_value(node->nd_next, iseq);
+                    rb_ary_cat(ary, elem, 2);
+                }
+                VALUE hash = rb_hash_new_with_size(RARRAY_LEN(ary) / 2);
+                rb_hash_bulk_insert(RARRAY_LEN(ary), RARRAY_CONST_PTR_TRANSIENT(ary), hash);
+                hash = rb_obj_hide(hash);
+                OBJ_FREEZE(hash);
+
+                /* Emit optimized code */
+                FLUSH_CHUNK();
+                if (first_chunk) {
+                    ADD_INSN1(ret, line, duphash, hash);
+                    first_chunk = 0;
+                }
+                else {
+                    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+                    ADD_INSN(ret, line, swap);
+
+                    ADD_INSN1(ret, line, putobject, hash);
+
+                    ADD_SEND(ret, line, id_core_hash_merge_kwd, INT2FIX(2));
+                }
+                RB_OBJ_WRITTEN(iseq, Qundef, hash);
+            }
+        }
+
+        /* Base case: Compile "count" elements */
+        for (; count; count--, node = node->nd_next->nd_next) {
+
+            if (CPDEBUG > 0) {
+                EXPECT_NODE("compile_hash", node, NODE_LIST, -1);
+            }
+
+            if (node->nd_head) {
+                /* Normal key-value pair */
+                NO_CHECK(COMPILE_(anchor, "hash key element", node->nd_head, 0));
+                NO_CHECK(COMPILE_(anchor, "hash value element", node->nd_next->nd_head, 0));
+                stack_len += 2;
+
+                /* If there are many pushed elements, flush them to avoid stack overflow */
+                if (stack_len >= max_stack_len) FLUSH_CHUNK();
+            }
+            else {
+                /* kwsplat case: foo(..., **kw, ...) */
+                FLUSH_CHUNK();
+
+                const NODE *kw = node->nd_next->nd_head;
+                int empty_kw = nd_type(kw) == NODE_LIT;       /* foo(  ..., **{}, ...) */
+                int first_kw = first_chunk && stack_len == 0; /* foo(1,2,3, **kw, ...) */
+                int last_kw = !node->nd_next->nd_next;        /* foo(  ..., **kw) */
+                int only_kw = last_kw && first_kw;            /* foo(1,2,3, **kw) */
+
+                if (empty_kw) {
+                    if (only_kw) {
+                        /* **{} appears at the last, so it won't be modified.
+                         * kw is a special NODE_LIT that contains a special empty hash,
+                         * so this emits: putobject {}
+                         */
+                        NO_CHECK(COMPILE(ret, "keyword splat", kw));
+                    }
+                    else if (first_kw) {
+                        /* **{} appears at the first, so it may be modified.
+                         * We need to create a fresh hash object.
+                         */
+                        ADD_INSN1(ret, line, newhash, INT2FIX(0));
+                    }
+                }
+                else {
+                    /* This is not empty hash: **{k:1}.
+                     * We need to clone the hash (if first), or merge the hash to
+                     * the accumulated hash (if not first).
+                     */
+                    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+                    if (first_kw) ADD_INSN1(ret, line, newhash, INT2FIX(0));
+                    else ADD_INSN(ret, line, swap);
+
+                    NO_CHECK(COMPILE(ret, "keyword splat", kw));
+
+                    ADD_SEND(ret, line, id_core_hash_merge_kwd, INT2FIX(2));
+                }
+
+                first_chunk = 0;
+            }
+        }
+    }
+
+    FLUSH_CHUNK();
+#undef FLUSH_CHUNK
+    return 1;
+}
+
+VALUE
+rb_node_case_when_optimizable_literal(const NODE *const node)
 {
     switch (nd_type(node)) {
       case NODE_LIT: {
 	VALUE v = node->nd_lit;
 	double ival;
-	if (TYPE(v) == T_FLOAT &&
+	if (RB_TYPE_P(v, T_FLOAT) &&
 	    modf(RFLOAT_VALUE(v), &ival) == 0.0) {
 	    return FIXABLE(ival) ? LONG2FIX((long)ival) : rb_dbl2big(ival);
 	}
@@ -2338,81 +4300,132 @@ 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;
+	return rb_fstring(node->nd_lit);
     }
-    return Qfalse;
+    return Qundef;
 }
 
-static VALUE
-when_vals(rb_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, VALUE special_literals)
+static int
+when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
+	  LABEL *l1, int only_special_literals, VALUE literals)
 {
     while (vals) {
-	VALUE lit;
-	NODE* val;
+	const NODE *val = vals->nd_head;
+        VALUE lit = rb_node_case_when_optimizable_literal(val);
 
-	val = vals->nd_head;
-
-	if (special_literals &&
-	    (lit = case_when_optimizable_literal(val)) != Qfalse) {
-	    rb_ary_push(special_literals, lit);
-	    rb_ary_push(special_literals, (VALUE)(l1) | 1);
+	if (lit == Qundef) {
+	    only_special_literals = 0;
 	}
-	else {
-	    special_literals = Qfalse;
+        else if (NIL_P(rb_hash_lookup(literals, lit))) {
+            rb_hash_aset(literals, lit, (VALUE)(l1) | 1);
 	}
 
+	ADD_INSN(cond_seq, nd_line(val), dup); /* dup target */
+
 	if (nd_type(val) == NODE_STR) {
 	    debugp_param("nd_lit", val->nd_lit);
-	    OBJ_FREEZE(val->nd_lit);
-	    ADD_INSN1(cond_seq, nd_line(val), putobject, val->nd_lit);
+	    lit = rb_fstring(val->nd_lit);
+	    ADD_INSN1(cond_seq, nd_line(val), putobject, lit);
+            RB_OBJ_WRITTEN(iseq, Qundef, lit);
 	}
 	else {
-	    COMPILE(cond_seq, "when cond", val);
+	    if (!COMPILE(cond_seq, "when cond", val)) return -1;
 	}
-	ADD_INSN1(cond_seq, nd_line(val), topn, INT2FIX(1));
-	ADD_SEND(cond_seq, nd_line(val), ID2SYM(idEqq), INT2FIX(1));
+
+	ADD_INSN1(cond_seq, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
 	ADD_INSNL(cond_seq, nd_line(val), branchif, l1);
 	vals = vals->nd_next;
     }
-    return special_literals;
+    return only_special_literals;
+}
+
+static int
+when_splat_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
+                LABEL *l1, int only_special_literals, VALUE literals)
+{
+    const int line = nd_line(vals);
+
+    switch (nd_type(vals)) {
+      case NODE_LIST:
+        if (when_vals(iseq, cond_seq, vals, l1, only_special_literals, literals) < 0)
+            return COMPILE_NG;
+        break;
+      case NODE_SPLAT:
+        ADD_INSN (cond_seq, line, dup);
+        CHECK(COMPILE(cond_seq, "when splat", vals->nd_head));
+        ADD_INSN1(cond_seq, line, splatarray, Qfalse);
+        ADD_INSN1(cond_seq, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE | VM_CHECKMATCH_ARRAY));
+        ADD_INSNL(cond_seq, line, branchif, l1);
+        break;
+      case NODE_ARGSCAT:
+        CHECK(when_splat_vals(iseq, cond_seq, vals->nd_head, l1, only_special_literals, literals));
+        CHECK(when_splat_vals(iseq, cond_seq, vals->nd_body, l1, only_special_literals, literals));
+        break;
+      case NODE_ARGSPUSH:
+        CHECK(when_splat_vals(iseq, cond_seq, vals->nd_head, l1, only_special_literals, literals));
+        ADD_INSN (cond_seq, line, dup);
+        CHECK(COMPILE(cond_seq, "when argspush body", vals->nd_body));
+        ADD_INSN1(cond_seq, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+        ADD_INSNL(cond_seq, line, branchif, l1);
+        break;
+      default:
+        ADD_INSN (cond_seq, line, dup);
+        CHECK(COMPILE(cond_seq, "when val", vals));
+        ADD_INSN1(cond_seq, line, splatarray, Qfalse);
+        ADD_INSN1(cond_seq, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE | VM_CHECKMATCH_ARRAY));
+        ADD_INSNL(cond_seq, line, branchif, l1);
+        break;
+    }
+    return COMPILE_OK;
 }
 
+
 static int
-compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
+compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
 {
     switch (nd_type(node)) {
       case NODE_ATTRASGN: {
 	INSN *iobj;
+	struct rb_call_info *ci;
 	VALUE dupidx;
+	int line = nd_line(node);
 
-	COMPILE_POPED(ret, "masgn lhs (NODE_ATTRASGN)", node);
-	POP_ELEMENT(ret);        /* pop pop insn */
-	iobj = (INSN *)POP_ELEMENT(ret); /* pop send insn */
+	CHECK(COMPILE_POPPED(ret, "masgn lhs (NODE_ATTRASGN)", node));
 
-	dupidx = iobj->operands[1];
-	dupidx = FIXNUM_INC(dupidx, 1);
-	iobj->operands[1] = dupidx;
+	iobj = (INSN *)get_prev_insn((INSN *)LAST_ELEMENT(ret)); /* send insn */
+        ci = (struct rb_call_info *)OPERAND_AT(iobj, 0);
+	ci->orig_argc += 1;
+	dupidx = INT2FIX(ci->orig_argc);
 
-	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    */
+	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 */
 	break;
       }
       case NODE_MASGN: {
 	DECL_ANCHOR(anchor);
 	INIT_ANCHOR(anchor);
-	COMPILE_POPED(anchor, "nest masgn lhs", node);
-	REMOVE_ELEM(FIRST_ELEMENT(anchor));
+	CHECK(COMPILE_POPPED(anchor, "nest masgn lhs", node));
+	ELEM_REMOVE(FIRST_ELEMENT(anchor));
 	ADD_SEQ(ret, anchor);
 	break;
       }
       default: {
 	DECL_ANCHOR(anchor);
 	INIT_ANCHOR(anchor);
-	COMPILE_POPED(anchor, "masgn lhs", node);
-	REMOVE_ELEM(FIRST_ELEMENT(anchor));
+	CHECK(COMPILE_POPPED(anchor, "masgn lhs", node));
+	ELEM_REMOVE(FIRST_ELEMENT(anchor));
 	ADD_SEQ(ret, anchor);
       }
     }
@@ -2420,25 +4433,26 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
     return COMPILE_OK;
 }
 
-static void
-compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *lhsn)
+static int
+compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *lhsn)
 {
     if (lhsn) {
-	compile_massign_opt_lhs(iseq, ret, lhsn->nd_next);
-	compile_massign_lhs(iseq, ret, lhsn->nd_head);
+	CHECK(compile_massign_opt_lhs(iseq, ret, lhsn->nd_next));
+	CHECK(compile_massign_lhs(iseq, ret, lhsn->nd_head));
     }
+    return COMPILE_OK;
 }
 
 static int
-compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
-		    NODE *rhsn, NODE *orig_lhsn)
+compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
+		    const NODE *rhsn, const NODE *orig_lhsn)
 {
     VALUE mem[64];
     const int memsize = numberof(mem);
     int memindex = 0;
     int llen = 0, rlen = 0;
     int i;
-    NODE *lhsn = orig_lhsn;
+    const NODE *lhsn = orig_lhsn;
 
 #define MEMORY(v) { \
     int i; \
@@ -2449,12 +4463,12 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
     mem[memindex++] = (v); \
 }
 
-    if (rhsn == 0 || nd_type(rhsn) != NODE_ARRAY) {
+    if (rhsn == 0 || nd_type(rhsn) != NODE_LIST) {
 	return 0;
     }
 
     while (lhsn) {
-	NODE *ln = lhsn->nd_head;
+	const NODE *ln = lhsn->nd_head;
 	switch (nd_type(ln)) {
 	  case NODE_LASGN:
 	    MEMORY(ln->nd_vid);
@@ -2462,7 +4476,6 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 	  case NODE_DASGN:
 	  case NODE_DASGN_CURR:
 	  case NODE_IASGN:
-	  case NODE_IASGN2:
 	  case NODE_CVASGN:
 	    MEMORY(ln->nd_vid);
 	    break;
@@ -2475,10 +4488,10 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 
     while (rhsn) {
 	if (llen <= rlen) {
-	    COMPILE_POPED(ret, "masgn val (popped)", rhsn->nd_head);
+            NO_CHECK(COMPILE_POPPED(ret, "masgn val (popped)", rhsn->nd_head));
 	}
 	else {
-	    COMPILE(ret, "masgn val", rhsn->nd_head);
+            NO_CHECK(COMPILE(ret, "masgn val", rhsn->nd_head));
 	}
 	rhsn = rhsn->nd_next;
 	rlen++;
@@ -2494,58 +4507,96 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *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 *ret, NODE *node, int poped)
+compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
 {
-    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;
+    const NODE *rhsn = node->nd_value;
+    const NODE *splatn = node->nd_args;
+    const NODE *lhsn = node->nd_head;
+    int lhs_splat = (splatn && NODE_NAMED_REST_P(splatn)) ? 1 : 0;
 
-    if (!poped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) {
+    if (!popped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) {
 	int llen = 0;
+	int expand = 1;
 	DECL_ANCHOR(lhsseq);
 
 	INIT_ANCHOR(lhsseq);
 
 	while (lhsn) {
-	    compile_massign_lhs(iseq, lhsseq, lhsn->nd_head);
+	    CHECK(compile_massign_lhs(iseq, lhsseq, lhsn->nd_head));
 	    llen += 1;
 	    lhsn = lhsn->nd_next;
 	}
 
-	COMPILE(ret, "normal masgn rhs", rhsn);
+        NO_CHECK(COMPILE(ret, "normal masgn rhs", rhsn));
 
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN(ret, nd_line(node), dup);
 	}
-
-	ADD_INSN2(ret, nd_line(node), expandarray,
-		  INT2FIX(llen), INT2FIX(lhs_splat));
+	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_SEQ(ret, lhsseq);
 
 	if (lhs_splat) {
 	    if (nd_type(splatn) == NODE_POSTARG) {
 		/*a, b, *r, p1, p2 */
-		NODE *postn = splatn->nd_2nd;
-		NODE *restn = splatn->nd_1st;
+		const NODE *postn = splatn->nd_2nd;
+		const NODE *restn = splatn->nd_1st;
 		int num = (int)postn->nd_alen;
-		int flag = 0x02 | (((VALUE)restn == (VALUE)-1) ? 0x00 : 0x01);
+		int flag = 0x02 | (NODE_NAMED_REST_P(restn) ? 0x01 : 0x00);
 
 		ADD_INSN2(ret, nd_line(splatn), expandarray,
 			  INT2FIX(num), INT2FIX(flag));
 
-		if ((VALUE)restn != (VALUE)-1) {
-		    compile_massign_lhs(iseq, ret, restn);
+		if (NODE_NAMED_REST_P(restn)) {
+		    CHECK(compile_massign_lhs(iseq, ret, restn));
 		}
 		while (postn) {
-		    compile_massign_lhs(iseq, ret, postn->nd_head);
+		    CHECK(compile_massign_lhs(iseq, ret, postn->nd_head));
 		    postn = postn->nd_next;
 		}
 	    }
 	    else {
 		/* a, b, *r */
-		compile_massign_lhs(iseq, ret, splatn);
+		CHECK(compile_massign_lhs(iseq, ret, splatn));
 	    }
 	}
     }
@@ -2553,220 +4604,216 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped)
 }
 
 static int
-compile_colon2(rb_iseq_t *iseq, NODE * node,
-	       LINK_ANCHOR *pref, LINK_ANCHOR *body)
+compile_const_prefix(rb_iseq_t *iseq, const NODE *const node,
+		     LINK_ANCHOR *const pref, LINK_ANCHOR *const body)
 {
     switch (nd_type(node)) {
       case NODE_CONST:
-	debugi("compile_colon2 - colon", node->nd_vid);
-	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_vid));
+	debugi("compile_const_prefix - colon", node->nd_vid);
+        ADD_INSN1(body, nd_line(node), putobject, Qtrue);
+        ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_vid));
 	break;
       case NODE_COLON3:
-	debugi("compile_colon2 - colon3", node->nd_mid);
+	debugi("compile_const_prefix - colon3", node->nd_mid);
 	ADD_INSN(body, nd_line(node), pop);
 	ADD_INSN1(body, nd_line(node), putobject, rb_cObject);
-	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
+        ADD_INSN1(body, nd_line(node), putobject, Qtrue);
+        ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
 	break;
       case NODE_COLON2:
-	compile_colon2(iseq, node->nd_head, pref, body);
-	debugi("compile_colon2 - colon2", node->nd_mid);
-	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
+	CHECK(compile_const_prefix(iseq, node->nd_head, pref, body));
+	debugi("compile_const_prefix - colon2", node->nd_mid);
+        ADD_INSN1(body, nd_line(node), putobject, Qfalse);
+        ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
 	break;
       default:
-	COMPILE(pref, "const colon2 prefix", node);
+	CHECK(COMPILE(pref, "const colon2 prefix", node));
 	break;
     }
     return COMPILE_OK;
 }
 
-static VALUE
-compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath)
+static int
+compile_cpath(LINK_ANCHOR *const ret, rb_iseq_t *iseq, const NODE *cpath)
 {
     if (nd_type(cpath) == NODE_COLON3) {
 	/* toplevel class ::Foo */
 	ADD_INSN1(ret, nd_line(cpath), putobject, rb_cObject);
-	return Qfalse;
+	return VM_DEFINECLASS_FLAG_SCOPED;
     }
     else if (cpath->nd_head) {
 	/* Bar::Foo */
-	COMPILE(ret, "nd_else->nd_head", cpath->nd_head);
-	return Qfalse;
+        NO_CHECK(COMPILE(ret, "nd_else->nd_head", cpath->nd_head));
+	return VM_DEFINECLASS_FLAG_SCOPED;
     }
     else {
 	/* class at cbase Foo */
 	ADD_INSN1(ret, nd_line(cpath), putspecialobject,
 		  INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-	return Qtrue;
+	return 0;
     }
 }
 
-static int
-defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
-	     NODE *node, LABEL **lfinish, VALUE needstr)
+static inline int
+private_recv_p(const NODE *node)
+{
+    if (nd_type(node->nd_recv) == NODE_SELF) {
+        NODE *self = node->nd_recv;
+        return self->nd_state != 0;
+    }
+    return 0;
+}
+
+static void
+defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
+	     const NODE *const node, LABEL **lfinish, VALUE needstr);
+
+static void
+defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
+	      const NODE *const node, LABEL **lfinish, VALUE needstr)
 {
-    const char *estr = 0;
+    enum defined_type expr_type = DEFINED_NOT_DEFINED;
     enum node_type type;
+    const int line = nd_line(node);
 
     switch (type = nd_type(node)) {
 
 	/* easy literals */
       case NODE_NIL:
-	estr = "nil";
+	expr_type = DEFINED_NIL;
 	break;
       case NODE_SELF:
-	estr = "self";
+	expr_type = DEFINED_SELF;
 	break;
       case NODE_TRUE:
-	estr = "true";
+	expr_type = DEFINED_TRUE;
 	break;
       case NODE_FALSE:
-	estr = "false";
+	expr_type = DEFINED_FALSE;
 	break;
 
-      case NODE_ARRAY:{
-	NODE *vals = node;
+      case NODE_LIST:{
+	const NODE *vals = node;
 
 	do {
-	    defined_expr(iseq, ret, vals->nd_head, lfinish, Qfalse);
+	    defined_expr0(iseq, ret, vals->nd_head, lfinish, Qfalse);
 
 	    if (!lfinish[1]) {
-		lfinish[1] = NEW_LABEL(nd_line(node));
+                lfinish[1] = NEW_LABEL(line);
 	    }
-	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+            ADD_INSNL(ret, line, branchunless, lfinish[1]);
 	} while ((vals = vals->nd_next) != NULL);
       }
+        /* fall through */
       case NODE_STR:
       case NODE_LIT:
-      case NODE_ZARRAY:
+      case NODE_ZLIST:
       case NODE_AND:
       case NODE_OR:
       default:
-	estr = "expression";
+	expr_type = DEFINED_EXPR;
 	break;
 
 	/* variables */
       case NODE_LVAR:
       case NODE_DVAR:
-	estr = "local-variable";
+	expr_type = DEFINED_LVAR;
 	break;
 
       case NODE_IVAR:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_IVAR),
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_IVAR),
 		  ID2SYM(node->nd_vid), needstr);
-	return 1;
+        return;
 
       case NODE_GVAR:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_GVAR),
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_GVAR),
 		  ID2SYM(node->nd_entry->id), needstr);
-	return 1;
+        return;
 
       case NODE_CVAR:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CVAR),
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CVAR),
 		  ID2SYM(node->nd_vid), needstr);
-	return 1;
+        return;
 
       case NODE_CONST:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST),
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CONST),
 		  ID2SYM(node->nd_vid), needstr);
-	return 1;
+        return;
       case NODE_COLON2:
 	if (!lfinish[1]) {
-	    lfinish[1] = NEW_LABEL(nd_line(node));
+            lfinish[1] = NEW_LABEL(line);
 	}
-	defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
-	ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+	defined_expr0(iseq, ret, node->nd_head, lfinish, Qfalse);
+        ADD_INSNL(ret, line, branchunless, lfinish[1]);
+        NO_CHECK(COMPILE(ret, "defined/colon2#nd_head", node->nd_head));
 
-	if (rb_is_const_id(node->nd_mid)) {
-	    COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
-	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST),
-		      ID2SYM(node->nd_mid), needstr);
-	}
-	else {
-	    COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
-	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD),
-		      ID2SYM(node->nd_mid), needstr);
-	}
-	return 1;
+        ADD_INSN3(ret, line, defined,
+		  (rb_is_const_id(node->nd_mid) ?
+		   INT2FIX(DEFINED_CONST_FROM) : INT2FIX(DEFINED_METHOD)),
+		  ID2SYM(node->nd_mid), needstr);
+        return;
       case NODE_COLON3:
-	ADD_INSN1(ret, nd_line(node), putobject, rb_cObject);
-	ADD_INSN3(ret, nd_line(node), defined,
-		  INT2FIX(DEFINED_CONST), ID2SYM(node->nd_mid), needstr);
-	return 1;
+        ADD_INSN1(ret, line, putobject, rb_cObject);
+        ADD_INSN3(ret, line, defined,
+		  INT2FIX(DEFINED_CONST_FROM), ID2SYM(node->nd_mid), needstr);
+        return;
 
 	/* method dispatch */
       case NODE_CALL:
+      case NODE_OPCALL:
       case NODE_VCALL:
       case NODE_FCALL:
       case NODE_ATTRASGN:{
-	int self = TRUE;
+	const int explicit_receiver =
+	    (type == NODE_CALL || type == NODE_OPCALL ||
+	     (type == NODE_ATTRASGN && !private_recv_p(node)));
 
-	switch (type) {
-	  case NODE_ATTRASGN:
-	    if (node->nd_recv == (NODE *)1) break;
-	  case NODE_CALL:
-	    self = FALSE;
-	    break;
-	  default:
-	    /* through */;
-	}
-	if (!lfinish[1]) {
-	    lfinish[1] = NEW_LABEL(nd_line(node));
+	if (!lfinish[1] && (node->nd_args || explicit_receiver)) {
+            lfinish[1] = NEW_LABEL(line);
 	}
 	if (node->nd_args) {
-	    defined_expr(iseq, ret, node->nd_args, lfinish, Qfalse);
-	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
-	}
-	if (!self) {
-	    LABEL *lstart = NEW_LABEL(nd_line(node));
-	    LABEL *lend = NEW_LABEL(nd_line(node));
-	    VALUE rescue = NEW_CHILD_ISEQVAL(NEW_NIL(),
-					     rb_str_concat(rb_str_new2
-							   ("defined guard in "),
-							   iseq->name),
-					     ISEQ_TYPE_DEFINED_GUARD, 0);
-
-	    defined_expr(iseq, ret, node->nd_recv, lfinish, Qfalse);
-	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
-
-	    ADD_LABEL(ret, lstart);
-	    COMPILE(ret, "defined/recv", node->nd_recv);
-	    ADD_LABEL(ret, lend);
-	    ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
-	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD),
+	    defined_expr0(iseq, ret, node->nd_args, lfinish, Qfalse);
+            ADD_INSNL(ret, line, branchunless, lfinish[1]);
+	}
+	if (explicit_receiver) {
+	    defined_expr0(iseq, ret, node->nd_recv, lfinish, Qfalse);
+            ADD_INSNL(ret, line, branchunless, lfinish[1]);
+            NO_CHECK(COMPILE(ret, "defined/recv", node->nd_recv));
+            ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_METHOD),
 		      ID2SYM(node->nd_mid), needstr);
 	}
 	else {
-	    ADD_INSN(ret, nd_line(node), putself);
-	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_FUNC),
+            ADD_INSN(ret, line, putself);
+            ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_FUNC),
 		      ID2SYM(node->nd_mid), needstr);
 	}
-	return 1;
+        return;
       }
 
       case NODE_YIELD:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_YIELD), 0,
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_YIELD), 0,
 		  needstr);
-	return 1;
+        return;
 
       case NODE_BACK_REF:
       case NODE_NTH_REF:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_REF),
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_REF),
 		  INT2FIX((node->nd_nth << 1) | (type == NODE_BACK_REF)),
 		  needstr);
-	return 1;
+        return;
 
       case NODE_SUPER:
       case NODE_ZSUPER:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_ZSUPER), 0,
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_ZSUPER), 0,
 		  needstr);
-	return 1;
+        return;
 
       case NODE_OP_ASGN1:
       case NODE_OP_ASGN2:
@@ -2779,61 +4826,111 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
       case NODE_GASGN:
       case NODE_IASGN:
       case NODE_CDECL:
-      case NODE_CVDECL:
       case NODE_CVASGN:
-	estr = "assignment";
+	expr_type = DEFINED_ASGN;
 	break;
     }
 
-    if (estr != 0) {
-	if (needstr != Qfalse) {
-	    VALUE str = rb_str_new2(estr);
-	    hide_obj(str);
-	    ADD_INSN1(ret, nd_line(node), putstring, str);
-	    iseq_add_mark_object_compile_time(iseq, str);
-	}
-	else {
-	    ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
-	}
-	return 1;
+    assert(expr_type != DEFINED_NOT_DEFINED);
+
+    if (needstr != Qfalse) {
+        VALUE str = rb_iseq_defined_string(expr_type);
+        ADD_INSN1(ret, line, putobject, str);
+    }
+    else {
+        ADD_INSN1(ret, line, putobject, Qtrue);
     }
-    return 0;
 }
 
-#define BUFSIZE 0x100
+static void
+build_defined_rescue_iseq(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const void *unused)
+{
+    ADD_INSN(ret, 0, putnil);
+    iseq_set_exception_local_table(iseq);
+}
+
+static void
+defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
+	     const NODE *const node, LABEL **lfinish, VALUE needstr)
+{
+    LINK_ELEMENT *lcur = ret->last;
+    defined_expr0(iseq, ret, node, lfinish, needstr);
+    if (lfinish[1]) {
+	int line = nd_line(node);
+	LABEL *lstart = NEW_LABEL(line);
+	LABEL *lend = NEW_LABEL(line);
+	const rb_iseq_t *rescue;
+        struct rb_iseq_new_with_callback_callback_func *ifunc =
+            rb_iseq_new_with_callback_new_callback(build_defined_rescue_iseq, NULL);
+        rescue = new_child_iseq_with_callback(iseq, ifunc,
+				      rb_str_concat(rb_str_new2("defined guard in "),
+						    iseq->body->location.label),
+				      iseq, ISEQ_TYPE_RESCUE, 0);
+	lstart->rescued = LABEL_RESCUE_BEG;
+	lend->rescued = LABEL_RESCUE_END;
+	APPEND_LABEL(ret, lcur, lstart);
+	ADD_LABEL(ret, lend);
+	ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
+    }
+}
+
+static int
+compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, VALUE needstr)
+{
+    const int line = nd_line(node);
+    if (!node->nd_head) {
+	VALUE str = rb_iseq_defined_string(DEFINED_NIL);
+	ADD_INSN1(ret, line, putobject, str);
+    }
+    else {
+	LABEL *lfinish[2];
+	LINK_ELEMENT *last = ret->last;
+	lfinish[0] = NEW_LABEL(line);
+	lfinish[1] = 0;
+	defined_expr(iseq, ret, node->nd_head, lfinish, needstr);
+	if (lfinish[1]) {
+	    ELEM_INSERT_NEXT(last, &new_insn_body(iseq, line, BIN(putnil), 0)->link);
+	    ADD_INSN(ret, line, swap);
+	    ADD_INSN(ret, line, pop);
+	    ADD_LABEL(ret, lfinish[1]);
+	}
+	ADD_LABEL(ret, lfinish[0]);
+    }
+    return COMPILE_OK;
+}
 
 static VALUE
-make_name_for_block(rb_iseq_t *iseq)
+make_name_for_block(const rb_iseq_t *orig_iseq)
 {
     int level = 1;
-    rb_iseq_t *ip = iseq;
+    const rb_iseq_t *iseq = orig_iseq;
 
-    if (iseq->parent_iseq != 0) {
-	while (ip->local_iseq != ip) {
-	    if (ip->type == ISEQ_TYPE_BLOCK) {
+    if (orig_iseq->body->parent_iseq != 0) {
+	while (orig_iseq->body->local_iseq != iseq) {
+	    if (iseq->body->type == ISEQ_TYPE_BLOCK) {
 		level++;
 	    }
-	    ip = ip->parent_iseq;
+	    iseq = iseq->body->parent_iseq;
 	}
     }
 
     if (level == 1) {
-	return rb_sprintf("block in %s", RSTRING_PTR(ip->name));
+	return rb_sprintf("block in %"PRIsVALUE, iseq->body->location.label);
     }
     else {
-	return rb_sprintf("block (%d levels) in %s", level, RSTRING_PTR(ip->name));
+	return rb_sprintf("block (%d levels) in %"PRIsVALUE, level, iseq->body->location.label);
     }
 }
 
 static void
 push_ensure_entry(rb_iseq_t *iseq,
 		  struct iseq_compile_data_ensure_node_stack *enl,
-		  struct ensure_range *er, NODE *node)
+		  struct ensure_range *er, const NODE *const node)
 {
     enl->ensure_node = node;
-    enl->prev = iseq->compile_data->ensure_node_stack;	/* prev */
+    enl->prev = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;	/* prev */
     enl->erange = er;
-    iseq->compile_data->ensure_node_stack = enl;
+    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enl;
 }
 
 static void
@@ -2855,16 +4952,16 @@ add_ensure_range(rb_iseq_t *iseq, struct ensure_range *erange,
 }
 
 static void
-add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
+add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return)
 {
     struct iseq_compile_data_ensure_node_stack *enlp =
-	iseq->compile_data->ensure_node_stack;
+	ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;
     struct iseq_compile_data_ensure_node_stack *prev_enlp = enlp;
     DECL_ANCHOR(ensure);
 
     INIT_ANCHOR(ensure);
     while (enlp) {
-	if (enlp->erange != 0) {
+	if (enlp->erange != NULL) {
 	    DECL_ANCHOR(ensure_part);
 	    LABEL *lstart = NEW_LABEL(0);
 	    LABEL *lend = NEW_LABEL(0);
@@ -2872,9 +4969,9 @@ add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
 
 	    add_ensure_range(iseq, enlp->erange, lstart, lend);
 
-	    iseq->compile_data->ensure_node_stack = enlp->prev;
+	    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enlp->prev;
 	    ADD_LABEL(ensure_part, lstart);
-	    COMPILE_POPED(ensure_part, "ensure part", enlp->ensure_node);
+            NO_CHECK(COMPILE_POPPED(ensure_part, "ensure part", enlp->ensure_node));
 	    ADD_LABEL(ensure_part, lend);
 	    ADD_SEQ(ensure, ensure_part);
 	}
@@ -2885,896 +4982,2340 @@ add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
 	}
 	enlp = enlp->prev;
     }
-    iseq->compile_data->ensure_node_stack = prev_enlp;
+    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = prev_enlp;
     ADD_SEQ(ret, ensure);
 }
 
-static VALUE
-setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, VALUE *flag)
+static int
+check_keyword(const NODE *node)
 {
-    VALUE argc = INT2FIX(0);
-    int nsplat = 0;
-    DECL_ANCHOR(arg_block);
-    DECL_ANCHOR(args_splat);
+    /* This check is essentially a code clone of compile_keyword_arg. */
 
-    INIT_ANCHOR(arg_block);
-    INIT_ANCHOR(args_splat);
-    if (argn && nd_type(argn) == NODE_BLOCK_PASS) {
-	COMPILE(arg_block, "block", argn->nd_body);
-	*flag |= VM_CALL_ARGS_BLOCKARG_BIT;
-	argn = argn->nd_head;
+    if (nd_type(node) == NODE_LIST) {
+        while (node->nd_next) {
+            node = node->nd_next;
+        }
+        node = node->nd_head;
     }
 
-  setup_argn:
-    if (argn) {
-	switch (nd_type(argn)) {
-	  case NODE_SPLAT: {
-	    COMPILE(args, "args (splat)", argn->nd_head);
-	    argc = INT2FIX(1);
-	    nsplat++;
-	    *flag |= VM_CALL_ARGS_SPLAT_BIT;
-	    break;
-	  }
-	  case NODE_ARGSCAT:
-	  case NODE_ARGSPUSH: {
-	    int next_is_array = (nd_type(argn->nd_head) == NODE_ARRAY);
-	    DECL_ANCHOR(tmp);
-
-	    INIT_ANCHOR(tmp);
-	    COMPILE(tmp, "args (cat: splat)", argn->nd_body);
-	    if (next_is_array && nsplat == 0) {
-		/* none */
-	    }
-	    else {
-		if (nd_type(argn) == NODE_ARGSCAT) {
-		    ADD_INSN1(tmp, nd_line(argn), splatarray, Qfalse);
-		}
-		else {
-		    ADD_INSN1(tmp, nd_line(argn), newarray, INT2FIX(1));
-		}
-	    }
-	    INSERT_LIST(args_splat, tmp);
-	    nsplat++;
-	    *flag |= VM_CALL_ARGS_SPLAT_BIT;
-
-	    if (next_is_array) {
-		argc = INT2FIX(compile_array(iseq, args, argn->nd_head, Qfalse) + 1);
-		POP_ELEMENT(args);
-	    }
-	    else {
-		argn = argn->nd_head;
-		goto setup_argn;
-	    }
-	    break;
-	  }
-	  case NODE_ARRAY: {
-	    argc = INT2FIX(compile_array(iseq, args, argn, Qfalse));
-	    POP_ELEMENT(args);
-	    break;
-	  }
-	  default: {
-	    rb_bug("setup_arg: unknown node: %s\n", ruby_node_name(nd_type(argn)));
-	  }
-	}
-    }
+    return keyword_node_p(node);
+}
 
-    if (nsplat > 1) {
-	int i;
-	for (i=1; i<nsplat; i++) {
-	    ADD_INSN(args_splat, nd_line(args), concatarray);
-	}
+static VALUE
+setup_args_core(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
+                int dup_rest, unsigned int *flag, struct rb_call_info_kw_arg **keywords)
+{
+    if (argn) {
+        switch (nd_type(argn)) {
+          case NODE_SPLAT: {
+            NO_CHECK(COMPILE(args, "args (splat)", argn->nd_head));
+            ADD_INSN1(args, nd_line(argn), splatarray, dup_rest ? Qtrue : Qfalse);
+            if (flag) *flag |= VM_CALL_ARGS_SPLAT;
+            return INT2FIX(1);
+          }
+          case NODE_ARGSCAT:
+          case NODE_ARGSPUSH: {
+            int next_is_list = (nd_type(argn->nd_head) == NODE_LIST);
+            VALUE argc = setup_args_core(iseq, args, argn->nd_head, 1, NULL, NULL);
+            if (nd_type(argn->nd_body) == NODE_LIST) {
+                /* This branch is needed to avoid "newarraykwsplat" [Bug #16442] */
+                int rest_len = compile_args(iseq, args, argn->nd_body, NULL, NULL);
+                ADD_INSN1(args, nd_line(argn), newarray, INT2FIX(rest_len));
+            }
+            else {
+                NO_CHECK(COMPILE(args, "args (cat: splat)", argn->nd_body));
+            }
+            if (flag) {
+                *flag |= VM_CALL_ARGS_SPLAT;
+                /* This is a dirty hack.  It traverses the AST twice.
+                 * In a long term, it should be fixed by a redesign of keyword arguments */
+                if (check_keyword(argn->nd_body))
+                    *flag |= VM_CALL_KW_SPLAT;
+            }
+            if (nd_type(argn) == NODE_ARGSCAT) {
+                if (next_is_list) {
+                    ADD_INSN1(args, nd_line(argn), splatarray, Qtrue);
+                    return INT2FIX(FIX2INT(argc) + 1);
+                }
+                else {
+                    ADD_INSN1(args, nd_line(argn), splatarray, Qfalse);
+                    ADD_INSN(args, nd_line(argn), concatarray);
+                    return argc;
+                }
+            }
+            else {
+                ADD_INSN1(args, nd_line(argn), newarray, INT2FIX(1));
+                ADD_INSN(args, nd_line(argn), concatarray);
+                return argc;
+            }
+          }
+          case NODE_LIST: {
+            int len = compile_args(iseq, args, argn, keywords, flag);
+            return INT2FIX(len);
+          }
+          default: {
+            UNKNOWN_NODE("setup_arg", argn, Qnil);
+          }
+        }
     }
+    return INT2FIX(0);
+}
 
-    if (!LIST_SIZE_ZERO(args_splat)) {
-	ADD_SEQ(args, args_splat);
+static VALUE
+setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
+	   unsigned int *flag, struct rb_call_info_kw_arg **keywords)
+{
+    VALUE ret;
+    if (argn && nd_type(argn) == NODE_BLOCK_PASS) {
+        DECL_ANCHOR(arg_block);
+        INIT_ANCHOR(arg_block);
+        NO_CHECK(COMPILE(arg_block, "block", argn->nd_body));
+
+        *flag |= VM_CALL_ARGS_BLOCKARG;
+        ret = setup_args_core(iseq, args, argn->nd_head, 0, flag, keywords);
+
+        if (LIST_INSN_SIZE_ONE(arg_block)) {
+            LINK_ELEMENT *elem = FIRST_ELEMENT(arg_block);
+            if (elem->type == ISEQ_ELEMENT_INSN) {
+                INSN *iobj = (INSN *)elem;
+                if (iobj->insn_id == BIN(getblockparam)) {
+                    iobj->insn_id = BIN(getblockparamproxy);
+                }
+            }
+        }
+        ADD_SEQ(args, arg_block);
     }
-
-    if (*flag & VM_CALL_ARGS_BLOCKARG_BIT) {
-	ADD_SEQ(args, arg_block);
+    else {
+        ret = setup_args_core(iseq, args, argn, 0, flag, keywords);
     }
-    return argc;
+    return ret;
 }
 
+static void
+build_postexe_iseq(rb_iseq_t *iseq, LINK_ANCHOR *ret, const void *ptr)
+{
+    const NODE *body = ptr;
+    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);
 
-/**
-  compile each node
+    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+    ADD_CALL_WITH_BLOCK(ret, line, id_core_set_postexe, argc, block);
+    RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)block);
+    iseq_set_local_table(iseq, 0);
+}
 
-  self:  InstructionSequence
-  node:  Ruby compiled node
-  poped: This node will be poped
- */
-static int
-iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
+static void
+compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
 {
-    enum node_type type;
+    const NODE *vars;
+    LINK_ELEMENT *last;
+    int line = nd_line(node);
+    LABEL *fail_label = NEW_LABEL(line), *end_label = NEW_LABEL(line);
 
-    if (node == 0) {
-	if (!poped) {
-	    debugs("node: NODE_NIL(implicit)\n");
-	    ADD_INSN(ret, iseq->compile_data->last_line, putnil);
+#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;
+        NO_CHECK(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);
+	ELEM_INSERT_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;
 	}
-	return COMPILE_OK;
+#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;
+        NO_CHECK(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);
+}
 
-    iseq->compile_data->last_line = (int)nd_line(node);
-    debug_node_start(node);
+static int
+number_literal_p(const NODE *n)
+{
+    return (n && nd_type(n) == NODE_LIT && RB_INTEGER_TYPE_P(n->nd_lit));
+}
 
-    type = nd_type(node);
+static int
+compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped, const enum node_type type)
+{
+    struct rb_iseq_constant_body *const body = iseq->body;
+    const NODE *const node_body = type == NODE_IF ? node->nd_body : node->nd_else;
+    const NODE *const node_else = type == NODE_IF ? node->nd_else : node->nd_body;
+
+    const int line = nd_line(node);
+    const int lineno = nd_first_lineno(node);
+    const int column = nd_first_column(node);
+    const int last_lineno = nd_last_lineno(node);
+    const int last_column = nd_last_column(node);
+    DECL_ANCHOR(cond_seq);
+    DECL_ANCHOR(then_seq);
+    DECL_ANCHOR(else_seq);
+    LABEL *then_label, *else_label, *end_label;
+    VALUE branches = Qfalse;
+    int ci_size, ci_kw_size;
+    VALUE catch_table = ISEQ_COMPILE_DATA(iseq)->catch_table_ary;
+    long catch_table_size = NIL_P(catch_table) ? 0 : RARRAY_LEN(catch_table);
+
+    INIT_ANCHOR(cond_seq);
+    INIT_ANCHOR(then_seq);
+    INIT_ANCHOR(else_seq);
+    then_label = NEW_LABEL(line);
+    else_label = NEW_LABEL(line);
+    end_label = 0;
+
+    compile_branch_condition(iseq, cond_seq, node->nd_cond,
+			     then_label, else_label);
+
+    ci_size = body->ci_size;
+    ci_kw_size = body->ci_kw_size;
+    CHECK(COMPILE_(then_seq, "then", node_body, popped));
+    catch_table = ISEQ_COMPILE_DATA(iseq)->catch_table_ary;
+    if (!then_label->refcnt) {
+        body->ci_size = ci_size;
+        body->ci_kw_size = ci_kw_size;
+        if (!NIL_P(catch_table)) rb_ary_set_len(catch_table, catch_table_size);
+    }
+    else {
+        if (!NIL_P(catch_table)) catch_table_size = RARRAY_LEN(catch_table);
+    }
 
-    if (node->flags & NODE_FL_NEWLINE) {
-	ADD_TRACE(ret, nd_line(node), RUBY_EVENT_LINE);
+    ci_size = body->ci_size;
+    ci_kw_size = body->ci_kw_size;
+    CHECK(COMPILE_(else_seq, "else", node_else, popped));
+    catch_table = ISEQ_COMPILE_DATA(iseq)->catch_table_ary;
+    if (!else_label->refcnt) {
+        body->ci_size = ci_size;
+        body->ci_kw_size = ci_kw_size;
+        if (!NIL_P(catch_table)) rb_ary_set_len(catch_table, catch_table_size);
+    }
+    else {
+        if (!NIL_P(catch_table)) catch_table_size = RARRAY_LEN(catch_table);
     }
 
-    switch (type) {
-      case NODE_BLOCK:{
-	while (node && nd_type(node) == NODE_BLOCK) {
-	    COMPILE_(ret, "BLOCK body", node->nd_head,
-		     (node->nd_next == 0 && poped == 0) ? 0 : 1);
-	    node = node->nd_next;
-	}
-	if (node) {
-	    COMPILE_(ret, "BLOCK next", node->nd_next, poped);
-	}
-	break;
-      }
-      case NODE_IF:{
-	DECL_ANCHOR(cond_seq);
-	DECL_ANCHOR(then_seq);
-	DECL_ANCHOR(else_seq);
-	LABEL *then_label, *else_label, *end_label;
-
-	INIT_ANCHOR(cond_seq);
-	INIT_ANCHOR(then_seq);
-	INIT_ANCHOR(else_seq);
-	then_label = NEW_LABEL(nd_line(node));
-	else_label = NEW_LABEL(nd_line(node));
-	end_label = NEW_LABEL(nd_line(node));
-
-	compile_branch_condition(iseq, cond_seq, node->nd_cond,
-				 then_label, else_label);
-	COMPILE_(then_seq, "then", node->nd_body, poped);
-	COMPILE_(else_seq, "else", node->nd_else, poped);
-
-	ADD_SEQ(ret, cond_seq);
+    ADD_SEQ(ret, cond_seq);
+
+    if (then_label->refcnt && else_label->refcnt) {
+	DECL_BRANCH_BASE(branches, lineno, column, last_lineno, last_column, type == NODE_IF ? "if" : "unless");
+    }
 
+    if (then_label->refcnt) {
 	ADD_LABEL(ret, then_label);
+	if (else_label->refcnt) {
+	    ADD_TRACE_BRANCH_COVERAGE(
+		ret,
+		node_body ? nd_first_lineno(node_body) : lineno,
+		node_body ? nd_first_column(node_body) : column,
+		node_body ? nd_last_lineno(node_body) : last_lineno,
+		node_body ? nd_last_column(node_body) : last_column,
+		type == NODE_IF ? "then" : "else",
+		branches);
+	    end_label = NEW_LABEL(line);
+	    ADD_INSNL(then_seq, line, jump, end_label);
+	}
 	ADD_SEQ(ret, then_seq);
-	ADD_INSNL(ret, nd_line(node), jump, end_label);
+    }
 
+    if (else_label->refcnt) {
 	ADD_LABEL(ret, else_label);
+	if (then_label->refcnt) {
+	    ADD_TRACE_BRANCH_COVERAGE(
+		ret,
+		node_else ? nd_first_lineno(node_else) : lineno,
+		node_else ? nd_first_column(node_else) : column,
+		node_else ? nd_last_lineno(node_else) : last_lineno,
+		node_else ? nd_last_column(node_else) : last_column,
+		type == NODE_IF ? "else" : "then",
+		branches);
+	}
 	ADD_SEQ(ret, else_seq);
+    }
 
+    if (end_label) {
 	ADD_LABEL(ret, end_label);
+    }
 
-	break;
-      }
-      case NODE_CASE:{
-	NODE *vals;
-	NODE *tempnode = node;
-	LABEL *endlabel, *elselabel;
-	DECL_ANCHOR(head);
-	DECL_ANCHOR(body_seq);
-	DECL_ANCHOR(cond_seq);
-	VALUE special_literals = rb_ary_tmp_new(1);
-
-	INIT_ANCHOR(head);
-	INIT_ANCHOR(body_seq);
-	INIT_ANCHOR(cond_seq);
-	if (node->nd_head == 0) {
-	    COMPILE_(ret, "when", node->nd_body, poped);
-	    break;
-	}
-	COMPILE(head, "case base", node->nd_head);
-
-	node = node->nd_body;
-	type = nd_type(node);
-
-	if (type != NODE_WHEN) {
-	    COMPILE_ERROR((ERROR_ARGS "NODE_CASE: unexpected node. must be NODE_WHEN, but %s", ruby_node_name(type)));
-	}
+    return COMPILE_OK;
+}
 
-	endlabel = NEW_LABEL(nd_line(node));
-	elselabel = NEW_LABEL(nd_line(node));
+static int
+compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_node, int popped)
+{
+    const NODE *vals;
+    const NODE *node = orig_node;
+    LABEL *endlabel, *elselabel;
+    DECL_ANCHOR(head);
+    DECL_ANCHOR(body_seq);
+    DECL_ANCHOR(cond_seq);
+    int only_special_literals = 1;
+    VALUE literals = rb_hash_new();
+    int line, lineno, column, last_lineno, last_column;
+    enum node_type type;
+    VALUE branches = Qfalse;
 
-	ADD_SEQ(ret, head);	/* case VAL */
+    INIT_ANCHOR(head);
+    INIT_ANCHOR(body_seq);
+    INIT_ANCHOR(cond_seq);
 
-	while (type == NODE_WHEN) {
-	    LABEL *l1;
+    RHASH_TBL_RAW(literals)->type = &cdhash_type;
 
-	    l1 = NEW_LABEL(nd_line(node));
-	    ADD_LABEL(body_seq, l1);
-	    ADD_INSN(body_seq, nd_line(node), pop);
-	    COMPILE_(body_seq, "when body", node->nd_body, poped);
-	    ADD_INSNL(body_seq, nd_line(node), jump, endlabel);
+    CHECK(COMPILE(head, "case base", node->nd_head));
 
-	    vals = node->nd_head;
-	    if (vals) {
-		switch (nd_type(vals)) {
-		  case NODE_ARRAY:
-		    special_literals = when_vals(iseq, cond_seq, vals, l1, special_literals);
-		    break;
-		  case NODE_SPLAT:
-		  case NODE_ARGSCAT:
-		  case NODE_ARGSPUSH:
-		    special_literals = 0;
-		    COMPILE(cond_seq, "when/cond splat", vals);
-		    ADD_INSN1(cond_seq, nd_line(vals), checkincludearray, Qtrue);
-		    ADD_INSNL(cond_seq, nd_line(vals), branchif, l1);
-		    break;
-		  default:
-		    rb_bug("NODE_CASE: unknown node (%s)",
-			   ruby_node_name(nd_type(vals)));
-		}
-	    }
-	    else {
-		rb_bug("NODE_CASE: must be NODE_ARRAY, but 0");
-	    }
+    DECL_BRANCH_BASE(branches, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "case");
 
-	    node = node->nd_next;
-	    if (!node) {
+    node = node->nd_body;
+    EXPECT_NODE("NODE_CASE", node, NODE_WHEN, COMPILE_NG);
+    type = nd_type(node);
+    line = nd_line(node);
+    lineno = nd_first_lineno(node);
+    column = nd_first_column(node);
+    last_lineno = nd_last_lineno(node);
+    last_column = nd_last_column(node);
+
+    endlabel = NEW_LABEL(line);
+    elselabel = NEW_LABEL(line);
+
+    ADD_SEQ(ret, head);	/* case VAL */
+
+    while (type == NODE_WHEN) {
+	LABEL *l1;
+
+	l1 = NEW_LABEL(line);
+	ADD_LABEL(body_seq, l1);
+	ADD_INSN(body_seq, line, pop);
+	ADD_TRACE_BRANCH_COVERAGE(
+		body_seq,
+		node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
+		node->nd_body ? nd_first_column(node->nd_body) : column,
+		node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno,
+		node->nd_body ? nd_last_column(node->nd_body) : last_column,
+		"when",
+		branches);
+	CHECK(COMPILE_(body_seq, "when body", node->nd_body, popped));
+	ADD_INSNL(body_seq, line, jump, endlabel);
+
+	vals = node->nd_head;
+	if (vals) {
+	    switch (nd_type(vals)) {
+	      case NODE_LIST:
+		only_special_literals = when_vals(iseq, cond_seq, vals, l1, only_special_literals, literals);
+		if (only_special_literals < 0) return COMPILE_NG;
+		break;
+	      case NODE_SPLAT:
+	      case NODE_ARGSCAT:
+	      case NODE_ARGSPUSH:
+		only_special_literals = 0;
+		CHECK(when_splat_vals(iseq, cond_seq, vals, l1, only_special_literals, literals));
 		break;
+	      default:
+		UNKNOWN_NODE("NODE_CASE", vals, COMPILE_NG);
 	    }
-	    type = nd_type(node);
-	}
-	/* else */
-	if (node) {
-	    ADD_LABEL(cond_seq, elselabel);
-	    ADD_INSN(cond_seq, nd_line(node), pop);
-	    COMPILE_(cond_seq, "else", node, poped);
-	    ADD_INSNL(cond_seq, nd_line(node), jump, endlabel);
 	}
 	else {
-	    debugs("== else (implicit)\n");
-	    ADD_LABEL(cond_seq, elselabel);
-	    ADD_INSN(cond_seq, nd_line(tempnode), pop);
-	    if (!poped) {
-		ADD_INSN(cond_seq, nd_line(tempnode), putnil);
-	    }
-	    ADD_INSNL(cond_seq, nd_line(tempnode), jump, endlabel);
+	    EXPECT_NODE_NONULL("NODE_CASE", node, NODE_LIST, COMPILE_NG);
 	}
 
-	if (special_literals) {
-	    ADD_INSN(ret, nd_line(tempnode), dup);
-	    ADD_INSN2(ret, nd_line(tempnode), opt_case_dispatch,
-		      special_literals, elselabel);
-	    iseq_add_mark_object_compile_time(iseq, special_literals);
+	node = node->nd_next;
+	if (!node) {
+	    break;
 	}
+	type = nd_type(node);
+	line = nd_line(node);
+	lineno = nd_first_lineno(node);
+	column = nd_first_column(node);
+	last_lineno = nd_last_lineno(node);
+	last_column = nd_last_column(node);
+    }
+    /* else */
+    if (node) {
+	ADD_LABEL(cond_seq, elselabel);
+	ADD_INSN(cond_seq, line, pop);
+	ADD_TRACE_BRANCH_COVERAGE(cond_seq, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "else", branches);
+	CHECK(COMPILE_(cond_seq, "else", node, popped));
+	ADD_INSNL(cond_seq, line, jump, endlabel);
+    }
+    else {
+	debugs("== else (implicit)\n");
+	ADD_LABEL(cond_seq, elselabel);
+	ADD_INSN(cond_seq, nd_line(orig_node), pop);
+	ADD_TRACE_BRANCH_COVERAGE(cond_seq, nd_first_lineno(orig_node), nd_first_column(orig_node), nd_last_lineno(orig_node), nd_last_column(orig_node), "else", branches);
+	if (!popped) {
+	    ADD_INSN(cond_seq, nd_line(orig_node), putnil);
+	}
+	ADD_INSNL(cond_seq, nd_line(orig_node), jump, endlabel);
+    }
 
-	ADD_SEQ(ret, cond_seq);
-	ADD_SEQ(ret, body_seq);
-	ADD_LABEL(ret, endlabel);
-	break;
-      }
-      case NODE_WHEN:{
-	NODE *vals;
-	NODE *val;
-	NODE *orig_node = node;
-	LABEL *endlabel;
-	DECL_ANCHOR(body_seq);
-
-	INIT_ANCHOR(body_seq);
-	endlabel = NEW_LABEL(nd_line(node));
-
-	while (node && nd_type(node) == NODE_WHEN) {
-	    LABEL *l1 = NEW_LABEL(nd_line(node));
-	    ADD_LABEL(body_seq, l1);
-	    COMPILE_(body_seq, "when", node->nd_body, poped);
-	    ADD_INSNL(body_seq, nd_line(node), jump, endlabel);
-
-	    vals = node->nd_head;
-	    if (!vals) {
-		rb_bug("NODE_WHEN: must be NODE_ARRAY, but 0");
-	    }
-	    switch (nd_type(vals)) {
-	      case NODE_ARRAY:
-		while (vals) {
-		    val = vals->nd_head;
-		    COMPILE(ret, "when2", val);
-		    ADD_INSNL(ret, nd_line(val), branchif, l1);
-		    vals = vals->nd_next;
-		}
-		break;
-	      case NODE_SPLAT:
-	      case NODE_ARGSCAT:
-	      case NODE_ARGSPUSH:
-		ADD_INSN(ret, nd_line(vals), putnil);
-		COMPILE(ret, "when2/cond splat", vals);
-		ADD_INSN1(ret, nd_line(vals), checkincludearray, Qfalse);
-		ADD_INSN(ret, nd_line(vals), pop);
-		ADD_INSNL(ret, nd_line(vals), branchif, l1);
-		break;
-	      default:
-		rb_bug("NODE_WHEN: unknown node (%s)",
-		       ruby_node_name(nd_type(vals)));
+    if (only_special_literals && ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
+	ADD_INSN(ret, nd_line(orig_node), dup);
+	ADD_INSN2(ret, nd_line(orig_node), opt_case_dispatch, literals, elselabel);
+        RB_OBJ_WRITTEN(iseq, Qundef, literals);
+	LABEL_REF(elselabel);
+    }
+
+    ADD_SEQ(ret, cond_seq);
+    ADD_SEQ(ret, body_seq);
+    ADD_LABEL(ret, endlabel);
+    return COMPILE_OK;
+}
+
+static int
+compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_node, int popped)
+{
+    const NODE *vals;
+    const NODE *val;
+    const NODE *node = orig_node->nd_body;
+    LABEL *endlabel;
+    DECL_ANCHOR(body_seq);
+    VALUE branches = Qfalse;
+
+    DECL_BRANCH_BASE(branches, nd_first_lineno(orig_node), nd_first_column(orig_node), nd_last_lineno(orig_node), nd_last_column(orig_node), "case");
+
+    INIT_ANCHOR(body_seq);
+    endlabel = NEW_LABEL(nd_line(node));
+
+    while (node && nd_type(node) == NODE_WHEN) {
+	const int line = nd_line(node);
+	const int lineno = nd_first_lineno(node);
+	const int column = nd_first_column(node);
+	const int last_lineno = nd_last_lineno(node);
+	const int last_column = nd_last_column(node);
+	LABEL *l1 = NEW_LABEL(line);
+	ADD_LABEL(body_seq, l1);
+	ADD_TRACE_BRANCH_COVERAGE(
+		body_seq,
+		node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
+		node->nd_body ? nd_first_column(node->nd_body) : column,
+		node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno,
+		node->nd_body ? nd_last_column(node->nd_body) : last_column,
+		"when",
+		branches);
+	CHECK(COMPILE_(body_seq, "when", node->nd_body, popped));
+	ADD_INSNL(body_seq, line, jump, endlabel);
+
+	vals = node->nd_head;
+	if (!vals) {
+            EXPECT_NODE_NONULL("NODE_WHEN", node, NODE_LIST, COMPILE_NG);
+	}
+	switch (nd_type(vals)) {
+	  case NODE_LIST:
+	    while (vals) {
+		LABEL *lnext;
+		val = vals->nd_head;
+		lnext = NEW_LABEL(nd_line(val));
+		debug_compile("== when2\n", (void)0);
+		CHECK(compile_branch_condition(iseq, ret, val, l1, lnext));
+		ADD_LABEL(ret, lnext);
+		vals = vals->nd_next;
 	    }
-	    node = node->nd_next;
+	    break;
+	  case NODE_SPLAT:
+	  case NODE_ARGSCAT:
+	  case NODE_ARGSPUSH:
+	    ADD_INSN(ret, nd_line(vals), putnil);
+	    CHECK(COMPILE(ret, "when2/cond splat", vals));
+	    ADD_INSN1(ret, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_WHEN | VM_CHECKMATCH_ARRAY));
+	    ADD_INSNL(ret, nd_line(vals), branchif, l1);
+	    break;
+	  default:
+	    UNKNOWN_NODE("NODE_WHEN", vals, COMPILE_NG);
 	}
-	/* else */
-	COMPILE_(ret, "else", node, poped);
-	ADD_INSNL(ret, nd_line(orig_node), jump, endlabel);
+	node = node->nd_next;
+    }
+    /* else */
+    ADD_TRACE_BRANCH_COVERAGE(
+	ret,
+	node ? nd_first_lineno(node) : nd_first_lineno(orig_node),
+	node ? nd_first_column(node) : nd_first_column(orig_node),
+	node ? nd_last_lineno(node) : nd_last_lineno(orig_node),
+	node ? nd_last_column(node) : nd_last_column(orig_node),
+	"else",
+	branches);
+    CHECK(COMPILE_(ret, "else", node, popped));
+    ADD_INSNL(ret, nd_line(orig_node), jump, endlabel);
+
+    ADD_SEQ(ret, body_seq);
+    ADD_LABEL(ret, endlabel);
+    return COMPILE_OK;
+}
 
-	ADD_SEQ(ret, body_seq);
-	ADD_LABEL(ret, endlabel);
+static int
+iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int in_alt_pattern)
+{
+    const int line = nd_line(node);
 
-	break;
+    switch (nd_type(node)) {
+      case NODE_ARYPTN: {
+        /*
+         *   if pattern.use_rest_num?
+         *     rest_num = 0
+         *   end
+         *   if pattern.has_constant_node?
+         *     unless pattern.constant === obj
+         *       goto match_failed
+         *     end
+         *   end
+         *   unless obj.respond_to?(:deconstruct)
+         *     goto match_failed
+         *   end
+         *   d = obj.deconstruct
+         *   unless Array === d
+         *     goto type_error
+         *   end
+         *   min_argc = pattern.pre_args_num + pattern.post_args_num
+         *   if pattern.has_rest_arg?
+         *     unless d.length >= min_argc
+         *       goto match_failed
+         *     end
+         *   else
+         *     unless d.length == min_argc
+         *       goto match_failed
+         *     end
+         *   end
+         *   pattern.pre_args_num.each do |i|
+         *     unless pattern.pre_args[i].match?(d[i])
+         *       goto match_failed
+         *     end
+         *   end
+         *   if pattern.use_rest_num?
+         *     rest_num = d.length - min_argc
+         *     if pattern.has_rest_arg? && pattern.has_rest_arg_id # not `*`, but `*rest`
+         *       unless pattern.rest_arg.match?(d[pattern.pre_args_num, rest_num])
+         *         goto match_failed
+         *       end
+         *     end
+         *   end
+         *   pattern.post_args_num.each do |i|
+         *     j = pattern.pre_args_num + i
+         *     j += rest_num
+         *     unless pattern.post_args[i].match?(d[j])
+         *       goto match_failed
+         *     end
+         *   end
+         *   true
+         *   goto fin
+         * type_error:
+         *   FrozenCore.raise TypeError
+         * match_failed:
+         *   false
+         * fin:
+         */
+        struct rb_ary_pattern_info *apinfo = node->nd_apinfo;
+        const NODE *args = apinfo->pre_args;
+        const int pre_args_num = apinfo->pre_args ? rb_long2int(apinfo->pre_args->nd_alen) : 0;
+        const int post_args_num = apinfo->post_args ? rb_long2int(apinfo->post_args->nd_alen) : 0;
+
+        const int min_argc = pre_args_num + post_args_num;
+        const int use_rest_num = apinfo->rest_arg && (NODE_NAMED_REST_P(apinfo->rest_arg) ||
+                                                      (!NODE_NAMED_REST_P(apinfo->rest_arg) && post_args_num > 0));
+
+        LABEL *match_failed, *type_error, *fin;
+        int i;
+        match_failed = NEW_LABEL(line);
+        type_error = NEW_LABEL(line);
+        fin = NEW_LABEL(line);
+
+        if (use_rest_num) {
+            ADD_INSN1(ret, line, putobject, INT2FIX(0)); /* allocate stack for rest_num */
+            ADD_INSN(ret, line, swap);
+        }
+
+        if (node->nd_pconst) {
+            ADD_INSN(ret, line, dup);
+            CHECK(COMPILE(ret, "constant", node->nd_pconst));
+            ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+            ADD_INSNL(ret, line, branchunless, match_failed);
+        }
+
+        ADD_INSN(ret, line, dup);
+        ADD_INSN1(ret, line, putobject, ID2SYM(rb_intern("deconstruct")));
+        ADD_SEND(ret, line, idRespond_to, INT2FIX(1));
+        ADD_INSNL(ret, line, branchunless, match_failed);
+
+        ADD_SEND(ret, line, rb_intern("deconstruct"), INT2FIX(0));
+
+        ADD_INSN(ret, line, dup);
+        ADD_INSN1(ret, line, checktype, INT2FIX(T_ARRAY));
+        ADD_INSNL(ret, line, branchunless, type_error);
+
+        ADD_INSN(ret, line, dup);
+        ADD_SEND(ret, line, idLength, INT2FIX(0));
+        ADD_INSN1(ret, line, putobject, INT2FIX(min_argc));
+        ADD_SEND(ret, line, apinfo->rest_arg ? idGE : idEq, INT2FIX(1));
+        ADD_INSNL(ret, line, branchunless, match_failed);
+
+        for (i = 0; i < pre_args_num; i++) {
+            ADD_INSN(ret, line, dup);
+            ADD_INSN1(ret, line, putobject, INT2FIX(i));
+            ADD_SEND(ret, line, idAREF, INT2FIX(1));
+            iseq_compile_pattern_each(iseq, ret, args->nd_head, in_alt_pattern);
+            args = args->nd_next;
+            ADD_INSNL(ret, line, branchunless, match_failed);
+        }
+
+        if (apinfo->rest_arg) {
+            if (NODE_NAMED_REST_P(apinfo->rest_arg)) {
+                ADD_INSN(ret, line, dup);
+                ADD_INSN1(ret, line, putobject, INT2FIX(pre_args_num));
+                ADD_INSN1(ret, line, topn, INT2FIX(1));
+                ADD_SEND(ret, line, idLength, INT2FIX(0));
+                ADD_INSN1(ret, line, putobject, INT2FIX(min_argc));
+                ADD_SEND(ret, line, idMINUS, INT2FIX(1));
+                ADD_INSN1(ret, line, setn, INT2FIX(4));
+                ADD_SEND(ret, line, idAREF, INT2FIX(2));
+
+                iseq_compile_pattern_each(iseq, ret, apinfo->rest_arg, in_alt_pattern);
+                ADD_INSNL(ret, line, branchunless, match_failed);
+            }
+            else {
+                if (post_args_num > 0) {
+                    ADD_INSN(ret, line, dup);
+                    ADD_SEND(ret, line, idLength, INT2FIX(0));
+                    ADD_INSN1(ret, line, putobject, INT2FIX(min_argc));
+                    ADD_SEND(ret, line, idMINUS, INT2FIX(1));
+                    ADD_INSN1(ret, line, setn, INT2FIX(2));
+                    ADD_INSN(ret, line, pop);
+                }
+            }
+        }
+
+        args = apinfo->post_args;
+        for (i = 0; i < post_args_num; i++) {
+            ADD_INSN(ret, line, dup);
+
+            ADD_INSN1(ret, line, putobject, INT2FIX(pre_args_num + i));
+            ADD_INSN1(ret, line, topn, INT2FIX(3));
+            ADD_SEND(ret, line, idPLUS, INT2FIX(1));
+
+            ADD_SEND(ret, line, idAREF, INT2FIX(1));
+            iseq_compile_pattern_each(iseq, ret, args->nd_head, in_alt_pattern);
+            args = args->nd_next;
+            ADD_INSNL(ret, line, branchunless, match_failed);
+        }
+
+        ADD_INSN(ret, line, pop);
+        if (use_rest_num) {
+            ADD_INSN(ret, line, pop);
+        }
+        ADD_INSN1(ret, line, putobject, Qtrue);
+        ADD_INSNL(ret, line, jump, fin);
+
+        ADD_LABEL(ret, type_error);
+        ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        ADD_INSN1(ret, line, putobject, rb_eTypeError);
+        ADD_INSN1(ret, line, putobject, rb_fstring_lit("deconstruct must return Array"));
+        ADD_SEND(ret, line, id_core_raise, INT2FIX(2));
+
+        ADD_LABEL(ret, match_failed);
+        ADD_INSN(ret, line, pop);
+        if (use_rest_num) {
+            ADD_INSN(ret, line, pop);
+        }
+        ADD_INSN1(ret, line, putobject, Qfalse);
+        ADD_LABEL(ret, fin);
+
+        break;
       }
-      case NODE_OPT_N:
-      case NODE_WHILE:
-      case NODE_UNTIL:{
-	LABEL *prev_start_label = iseq->compile_data->start_label;
-	LABEL *prev_end_label = iseq->compile_data->end_label;
-	LABEL *prev_redo_label = iseq->compile_data->redo_label;
-	int prev_loopval_popped = iseq->compile_data->loopval_popped;
+      case NODE_HSHPTN: {
+        /*
+         *   keys = nil
+         *   if pattern.has_kw_args_node? && !pattern.has_kw_rest_arg_node?
+         *     keys = pattern.kw_args_node.keys
+         *   end
+         *   if pattern.has_constant_node?
+         *     unless pattern.constant === obj
+         *       goto match_failed
+         *     end
+         *   end
+         *   unless obj.respond_to?(:deconstruct_keys)
+         *     goto match_failed
+         *   end
+         *   d = obj.deconstruct_keys(keys)
+         *   unless Hash === d
+         *     goto type_error
+         *   end
+         *   if pattern.has_kw_rest_arg_node?
+         *     d = d.dup
+         *   end
+         *   if pattern.has_kw_args_node?
+         *     pattern.kw_args_node.each |k,|
+         *       unless d.key?(k)
+         *         goto match_failed
+         *       end
+         *     end
+         *     pattern.kw_args_node.each |k, pat|
+         *       if pattern.has_kw_rest_arg_node?
+         *         unless pat.match?(d.delete(k))
+         *           goto match_failed
+         *         end
+         *       else
+         *         unless pat.match?(d[k])
+         *           goto match_failed
+         *         end
+         *       end
+         *     end
+         *   else
+         *     unless d.empty?
+         *       goto match_failed
+         *     end
+         *   end
+         *   if pattern.has_kw_rest_arg_node?
+         *     if pattern.no_rest_keyword?
+         *       unless d.empty?
+         *         goto match_failed
+         *       end
+         *     else
+         *       unless pattern.kw_rest_arg_node.match?(d)
+         *         goto match_failed
+         *       end
+         *     end
+         *   end
+         *   true
+         *   goto fin
+         * type_error:
+         *   FrozenCore.raise TypeError
+         * match_failed:
+         *   false
+         * fin:
+         */
+        LABEL *match_failed, *type_error, *fin;
+        VALUE keys = Qnil;
+
+        match_failed = NEW_LABEL(line);
+        type_error = NEW_LABEL(line);
+        fin = NEW_LABEL(line);
+
+        if (node->nd_pkwargs && !node->nd_pkwrestarg) {
+            const NODE *kw_args = node->nd_pkwargs->nd_head;
+            keys = rb_ary_new_capa(kw_args ? kw_args->nd_alen/2 : 0);
+            while (kw_args) {
+                rb_ary_push(keys, kw_args->nd_head->nd_lit);
+                kw_args = kw_args->nd_next->nd_next;
+            }
+        }
+
+        if (node->nd_pconst) {
+            ADD_INSN(ret, line, dup);
+            CHECK(COMPILE(ret, "constant", node->nd_pconst));
+            ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+            ADD_INSNL(ret, line, branchunless, match_failed);
+        }
+
+        ADD_INSN(ret, line, dup);
+        ADD_INSN1(ret, line, putobject, ID2SYM(rb_intern("deconstruct_keys")));
+        ADD_SEND(ret, line, idRespond_to, INT2FIX(1));
+        ADD_INSNL(ret, line, branchunless, match_failed);
+
+        if (NIL_P(keys)) {
+            ADD_INSN(ret, line, putnil);
+        }
+        else {
+            ADD_INSN1(ret, line, duparray, keys);
+            RB_OBJ_WRITTEN(iseq, Qundef, rb_obj_hide(keys));
+        }
+        ADD_SEND(ret, line, rb_intern("deconstruct_keys"), INT2FIX(1));
+
+        ADD_INSN(ret, line, dup);
+        ADD_INSN1(ret, line, checktype, INT2FIX(T_HASH));
+        ADD_INSNL(ret, line, branchunless, type_error);
+
+        if (node->nd_pkwrestarg) {
+            ADD_SEND(ret, line, rb_intern("dup"), INT2FIX(0));
+        }
+
+        if (node->nd_pkwargs) {
+            int i;
+            int keys_num;
+            const NODE *args;
+            args = node->nd_pkwargs->nd_head;
+            if (args) {
+                DECL_ANCHOR(match_values);
+                INIT_ANCHOR(match_values);
+                keys_num = rb_long2int(args->nd_alen) / 2;
+                for (i = 0; i < keys_num; i++) {
+                    NODE *key_node = args->nd_head;
+                    NODE *value_node = args->nd_next->nd_head;
+                    VALUE key;
+
+                    if (nd_type(key_node) != NODE_LIT) {
+                        UNKNOWN_NODE("NODE_IN", key_node, COMPILE_NG);
+                    }
+                    key = key_node->nd_lit;
+
+                    ADD_INSN(ret, line, dup);
+                    ADD_INSN1(ret, line, putobject, key);
+                    ADD_SEND(ret, line, rb_intern("key?"), INT2FIX(1));
+                    ADD_INSNL(ret, line, branchunless, match_failed);
+
+                    ADD_INSN(match_values, line, dup);
+                    ADD_INSN1(match_values, line, putobject, key);
+                    ADD_SEND(match_values, line, node->nd_pkwrestarg ? rb_intern("delete") : idAREF, INT2FIX(1));
+                    iseq_compile_pattern_each(iseq, match_values, value_node, in_alt_pattern);
+                    ADD_INSNL(match_values, line, branchunless, match_failed);
+                    args = args->nd_next->nd_next;
+                }
+                ADD_SEQ(ret, match_values);
+            }
+        }
+        else {
+            ADD_INSN(ret, line, dup);
+            ADD_SEND(ret, line, idEmptyP, INT2FIX(0));
+            ADD_INSNL(ret, line, branchunless, match_failed);
+        }
+
+        if (node->nd_pkwrestarg) {
+            if (node->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD) {
+                ADD_INSN(ret, line, dup);
+                ADD_SEND(ret, line, idEmptyP, INT2FIX(0));
+                ADD_INSNL(ret, line, branchunless, match_failed);
+            }
+            else {
+                ADD_INSN(ret, line, dup);
+                iseq_compile_pattern_each(iseq, ret, node->nd_pkwrestarg, in_alt_pattern);
+                ADD_INSNL(ret, line, branchunless, match_failed);
+            }
+        }
+
+        ADD_INSN(ret, line, pop);
+        ADD_INSN1(ret, line, putobject, Qtrue);
+        ADD_INSNL(ret, line, jump, fin);
+
+        ADD_LABEL(ret, type_error);
+        ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        ADD_INSN1(ret, line, putobject, rb_eTypeError);
+        ADD_INSN1(ret, line, putobject, rb_fstring_lit("deconstruct_keys must return Hash"));
+        ADD_SEND(ret, line, id_core_raise, INT2FIX(2));
+
+        ADD_LABEL(ret, match_failed);
+        ADD_INSN(ret, line, pop);
+        ADD_INSN1(ret, line, putobject, Qfalse);
+
+        ADD_LABEL(ret, fin);
+        break;
+      }
+      case NODE_LIT:
+      case NODE_STR:
+      case NODE_XSTR:
+      case NODE_DSTR:
+      case NODE_DSYM:
+      case NODE_DREGX:
+      case NODE_LIST:
+      case NODE_ZLIST:
+      case NODE_LAMBDA:
+      case NODE_DOT2:
+      case NODE_DOT3:
+      case NODE_CONST:
+      case NODE_LVAR:
+      case NODE_DVAR:
+      case NODE_TRUE:
+      case NODE_FALSE:
+      case NODE_SELF:
+      case NODE_NIL:
+      case NODE_COLON2:
+      case NODE_COLON3:
+        CHECK(COMPILE(ret, "case in literal", node));
+        ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+        break;
+      case NODE_LASGN: {
+        struct rb_iseq_constant_body *const body = iseq->body;
+        ID id = node->nd_vid;
+        int idx = body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id);
+
+        if (in_alt_pattern) {
+            const char *name = rb_id2name(id);
+            if (name && strlen(name) > 0 && name[0] != '_') {
+                COMPILE_ERROR(ERROR_ARGS "illegal variable in alternative pattern (%"PRIsVALUE")",
+                              rb_id2str(id));
+                return COMPILE_NG;
+            }
+        }
+
+        ADD_SETLOCAL(ret, line, idx, get_lvar_level(iseq));
+        ADD_INSN1(ret, line, putobject, Qtrue);
+        break;
+      }
+      case NODE_DASGN:
+      case NODE_DASGN_CURR: {
+        int idx, lv, ls;
+        ID id = node->nd_vid;
+
+        idx = get_dyna_var_idx(iseq, id, &lv, &ls);
+
+        if (in_alt_pattern) {
+            const char *name = rb_id2name(id);
+            if (name && strlen(name) > 0 && name[0] != '_') {
+                COMPILE_ERROR(ERROR_ARGS "illegal variable in alternative pattern (%"PRIsVALUE")",
+                              rb_id2str(id));
+                return COMPILE_NG;
+            }
+        }
+
+        if (idx < 0) {
+            COMPILE_ERROR(ERROR_ARGS "NODE_DASGN(_CURR): unknown id (%"PRIsVALUE")",
+                          rb_id2str(id));
+            return COMPILE_NG;
+        }
+        ADD_SETLOCAL(ret, line, ls - idx, lv);
+        ADD_INSN1(ret, line, putobject, Qtrue);
+        break;
+      }
+      case NODE_IF:
+      case NODE_UNLESS: {
+        LABEL *match_failed, *fin;
+        match_failed = NEW_LABEL(line);
+        fin = NEW_LABEL(line);
+        iseq_compile_pattern_each(iseq, ret, node->nd_body, in_alt_pattern);
+        ADD_INSNL(ret, line, branchunless, match_failed);
+        CHECK(COMPILE(ret, "case in if", node->nd_cond));
+        if (nd_type(node) == NODE_IF) {
+            ADD_INSNL(ret, line, branchunless, match_failed);
+        }
+        else {
+            ADD_INSNL(ret, line, branchif, match_failed);
+        }
+        ADD_INSN1(ret, line, putobject, Qtrue);
+        ADD_INSNL(ret, line, jump, fin);
+
+        ADD_LABEL(ret, match_failed);
+        ADD_INSN1(ret, line, putobject, Qfalse);
+
+        ADD_LABEL(ret, fin);
+        break;
+      }
+      case NODE_HASH: {
+        NODE *n;
+        LABEL *match_failed, *fin;
+        match_failed = NEW_LABEL(line);
+        fin = NEW_LABEL(line);
+
+        n = node->nd_head;
+        if (! (nd_type(n) == NODE_LIST && n->nd_alen == 2)) {
+            COMPILE_ERROR(ERROR_ARGS "unexpected node");
+            return COMPILE_NG;
+        }
+
+        ADD_INSN(ret, line, dup);
+        iseq_compile_pattern_each(iseq, ret, n->nd_head, in_alt_pattern);
+        ADD_INSNL(ret, line, branchunless, match_failed);
+        iseq_compile_pattern_each(iseq, ret, n->nd_next->nd_head, in_alt_pattern);
+        ADD_INSNL(ret, line, jump, fin);
+
+        ADD_LABEL(ret, match_failed);
+        ADD_INSN(ret, line, pop);
+        ADD_INSN1(ret, line, putobject, Qfalse);
+
+        ADD_LABEL(ret, fin);
+        break;
+      }
+      case NODE_OR: {
+        LABEL *match_succeeded, *fin;
+        match_succeeded = NEW_LABEL(line);
+        fin = NEW_LABEL(line);
+
+        ADD_INSN(ret, line, dup);
+        iseq_compile_pattern_each(iseq, ret, node->nd_1st, TRUE);
+        ADD_INSNL(ret, line, branchif, match_succeeded);
+        iseq_compile_pattern_each(iseq, ret, node->nd_2nd, TRUE);
+        ADD_INSNL(ret, line, jump, fin);
+
+        ADD_LABEL(ret, match_succeeded);
+        ADD_INSN(ret, line, pop);
+        ADD_INSN1(ret, line, putobject, Qtrue);
+
+        ADD_LABEL(ret, fin);
+        break;
+      }
+      default:
+        UNKNOWN_NODE("NODE_IN", node, COMPILE_NG);
+    }
+    return COMPILE_OK;
+}
 
-	struct iseq_compile_data_ensure_node_stack enl;
+static int
+compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_node, int popped)
+{
+    const NODE *pattern;
+    const NODE *node = orig_node;
+    LABEL *endlabel, *elselabel;
+    DECL_ANCHOR(head);
+    DECL_ANCHOR(body_seq);
+    DECL_ANCHOR(cond_seq);
+    int line, lineno, column, last_lineno, last_column;
+    enum node_type type;
+    VALUE branches = 0;
 
-	LABEL *next_label = iseq->compile_data->start_label = NEW_LABEL(nd_line(node));	/* next  */
-	LABEL *redo_label = iseq->compile_data->redo_label = NEW_LABEL(nd_line(node));	/* redo  */
-	LABEL *break_label = iseq->compile_data->end_label = NEW_LABEL(nd_line(node));	/* break */
-	LABEL *end_label = NEW_LABEL(nd_line(node));
+    INIT_ANCHOR(head);
+    INIT_ANCHOR(body_seq);
+    INIT_ANCHOR(cond_seq);
 
-	LABEL *next_catch_label = NEW_LABEL(nd_line(node));
-	LABEL *tmp_label = NULL;
+    CHECK(COMPILE(head, "case base", node->nd_head));
 
-	iseq->compile_data->loopval_popped = 0;
-	push_ensure_entry(iseq, &enl, 0, 0);
+    DECL_BRANCH_BASE(branches, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "case");
 
-	if (type == NODE_OPT_N || node->nd_state == 1) {
-	    ADD_INSNL(ret, nd_line(node), jump, next_label);
-	}
-	else {
-	    tmp_label = NEW_LABEL(nd_line(node));
-	    ADD_INSNL(ret, nd_line(node), jump, tmp_label);
-	}
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_LABEL(ret, next_catch_label);
-	ADD_INSN(ret, nd_line(node), pop);
-	ADD_INSNL(ret, nd_line(node), jump, next_label);
-	if (tmp_label) ADD_LABEL(ret, tmp_label);
+    node = node->nd_body;
+    EXPECT_NODE("NODE_CASE3", node, NODE_IN, COMPILE_NG);
+    type = nd_type(node);
+    line = nd_line(node);
+    lineno = nd_first_lineno(node);
+    column = nd_first_column(node);
+    last_lineno = nd_last_lineno(node);
+    last_column = nd_last_column(node);
+
+    endlabel = NEW_LABEL(line);
+    elselabel = NEW_LABEL(line);
+
+    ADD_SEQ(ret, head);	/* case VAL */
+
+    while (type == NODE_IN) {
+        LABEL *l1;
+
+        l1 = NEW_LABEL(line);
+        ADD_LABEL(body_seq, l1);
+        ADD_INSN(body_seq, line, pop);
+        ADD_TRACE_BRANCH_COVERAGE(
+            body_seq,
+            node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
+            node->nd_body ? nd_first_column(node->nd_body) : column,
+            node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno,
+            node->nd_body ? nd_last_column(node->nd_body) : last_column,
+            "in",
+            branches);
+        CHECK(COMPILE_(body_seq, "in body", node->nd_body, popped));
+        ADD_INSNL(body_seq, line, jump, endlabel);
+
+        pattern = node->nd_head;
+        if (pattern) {
+            ADD_INSN (cond_seq, nd_line(pattern), dup);
+            iseq_compile_pattern_each(iseq, cond_seq, pattern, FALSE);
+            ADD_INSNL(cond_seq, nd_line(pattern), branchif, l1);
+        }
+        else {
+            COMPILE_ERROR(ERROR_ARGS "unexpected node");
+            return COMPILE_NG;
+        }
+
+        node = node->nd_next;
+        if (!node) {
+            break;
+        }
+        type = nd_type(node);
+        line = nd_line(node);
+        lineno = nd_first_lineno(node);
+        column = nd_first_column(node);
+        last_lineno = nd_last_lineno(node);
+        last_column = nd_last_column(node);
+    }
+    /* else */
+    if (node) {
+        ADD_LABEL(cond_seq, elselabel);
+        ADD_INSN(cond_seq, line, pop);
+        ADD_TRACE_BRANCH_COVERAGE(cond_seq, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "else", branches);
+        CHECK(COMPILE_(cond_seq, "else", node, popped));
+        ADD_INSNL(cond_seq, line, jump, endlabel);
+    }
+    else {
+        debugs("== else (implicit)\n");
+        ADD_LABEL(cond_seq, elselabel);
+        ADD_TRACE_BRANCH_COVERAGE(cond_seq, nd_first_lineno(orig_node), nd_first_column(orig_node), nd_last_lineno(orig_node), nd_last_column(orig_node), "else", branches);
+        ADD_INSN1(cond_seq, nd_line(orig_node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        ADD_INSN1(cond_seq, nd_line(orig_node), putobject, rb_eNoMatchingPatternError);
+        ADD_INSN1(cond_seq, nd_line(orig_node), topn, INT2FIX(2));
+        ADD_SEND(cond_seq, nd_line(orig_node), id_core_raise, INT2FIX(2));
+        ADD_INSN(cond_seq, nd_line(orig_node), pop);
+        ADD_INSN(cond_seq, nd_line(orig_node), pop);
+        if (!popped) {
+            ADD_INSN(cond_seq, nd_line(orig_node), putnil);
+        }
+        ADD_INSNL(cond_seq, nd_line(orig_node), jump, endlabel);
+    }
 
-	ADD_LABEL(ret, redo_label);
-	COMPILE_POPED(ret, "while body", node->nd_body);
-	ADD_LABEL(ret, next_label);	/* next */
+    ADD_SEQ(ret, cond_seq);
+    ADD_SEQ(ret, body_seq);
+    ADD_LABEL(ret, endlabel);
+    return COMPILE_OK;
+}
 
-	if (type == NODE_WHILE) {
-	    compile_branch_condition(iseq, ret, node->nd_cond,
-				     redo_label, end_label);
-	}
-	else if (type == NODE_UNTIL) {
-	    /* untile */
-	    compile_branch_condition(iseq, ret, node->nd_cond,
-				     end_label, redo_label);
-	}
-	else {
-	    ADD_CALL_RECEIVER(ret, nd_line(node));
-	    ADD_CALL(ret, nd_line(node), ID2SYM(idGets), INT2FIX(0));
-	    ADD_INSNL(ret, nd_line(node), branchif, redo_label);
-	    /* opt_n */
-	}
+static int
+compile_loop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped, const enum node_type type)
+{
+    const int line = (int)nd_line(node);
+    const int lineno = nd_first_lineno(node);
+    const int column = nd_first_column(node);
+    const int last_lineno = nd_last_lineno(node);
+    const int last_column = nd_last_column(node);
+    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;
+    VALUE branches = Qfalse;
+
+    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 *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;
+    push_ensure_entry(iseq, &enl, NULL, NULL);
+
+    if (node->nd_state == 1) {
+	ADD_INSNL(ret, line, jump, next_label);
+    }
+    else {
+	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);
+    ADD_INSNL(ret, line, jump, next_label);
+    if (tmp_label) ADD_LABEL(ret, tmp_label);
+
+    ADD_LABEL(ret, redo_label);
+    DECL_BRANCH_BASE(branches, lineno, column, last_lineno, last_column, type == NODE_WHILE ? "while" : "until");
+    ADD_TRACE_BRANCH_COVERAGE(
+	ret,
+	node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
+	node->nd_body ? nd_first_column(node->nd_body) : column,
+	node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno,
+	node->nd_body ? nd_last_column(node->nd_body) : last_column,
+	"body",
+	branches);
+    CHECK(COMPILE_POPPED(ret, "while body", node->nd_body));
+    ADD_LABEL(ret, next_label);	/* next */
+
+    if (type == NODE_WHILE) {
+	compile_branch_condition(iseq, ret, node->nd_cond,
+				 redo_label, end_label);
+    }
+    else {
+	/* until */
+	compile_branch_condition(iseq, ret, node->nd_cond,
+				 end_label, redo_label);
+    }
 
-	ADD_LABEL(ret, end_label);
+    ADD_LABEL(ret, end_label);
+    ADD_ADJUST_RESTORE(ret, adjust_label);
 
-	if (node->nd_state == Qundef) {
-	    /* ADD_INSN(ret, nd_line(node), putundef); */
-	    rb_bug("unsupported: putundef");
-	}
-	else {
-	    ADD_INSN(ret, nd_line(node), putnil);
-	}
+    if (node->nd_state == Qundef) {
+	/* ADD_INSN(ret, line, putundef); */
+	COMPILE_ERROR(ERROR_ARGS "unsupported: putundef");
+	return COMPILE_NG;
+    }
+    else {
+	ADD_INSN(ret, line, putnil);
+    }
 
-	ADD_LABEL(ret, break_label);	/* break */
+    ADD_LABEL(ret, break_label);	/* break */
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
+    if (popped) {
+	ADD_INSN(ret, line, pop);
+    }
 
-	ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, redo_label, break_label,
-			0, break_label);
-	ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, redo_label, break_label, 0,
-			next_catch_label);
-	ADD_CATCH_ENTRY(CATCH_TYPE_REDO, redo_label, break_label, 0,
-			iseq->compile_data->redo_label);
+    ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, redo_label, break_label, NULL,
+		    break_label);
+    ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, redo_label, break_label, NULL,
+		    next_catch_label);
+    ADD_CATCH_ENTRY(CATCH_TYPE_REDO, redo_label, break_label, NULL,
+		    ISEQ_COMPILE_DATA(iseq)->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;
+    return COMPILE_OK;
+}
 
-	iseq->compile_data->start_label = prev_start_label;
-	iseq->compile_data->end_label = prev_end_label;
-	iseq->compile_data->redo_label = prev_redo_label;
-	iseq->compile_data->loopval_popped = prev_loopval_popped;
-	iseq->compile_data->ensure_node_stack = iseq->compile_data->ensure_node_stack->prev;
-	break;
-      }
-      case NODE_ITER:
-      case NODE_FOR:{
-	VALUE prevblock = iseq->compile_data->current_block;
-	LABEL *retry_label = NEW_LABEL(nd_line(node));
-	LABEL *retry_end_l = NEW_LABEL(nd_line(node));
-	ID mid = 0;
+static int
+compile_iter(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+    const rb_iseq_t *prevblock = ISEQ_COMPILE_DATA(iseq)->current_block;
+    LABEL *retry_label = NEW_LABEL(line);
+    LABEL *retry_end_l = NEW_LABEL(line);
+    const rb_iseq_t *child_iseq;
+
+    ADD_LABEL(ret, retry_label);
+    if (nd_type(node) == NODE_FOR) {
+	CHECK(COMPILE(ret, "iter caller (for)", node->nd_iter));
+
+	ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq =
+	    NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
+			   ISEQ_TYPE_BLOCK, line);
+	ADD_SEND_WITH_BLOCK(ret, line, idEach, INT2FIX(0), child_iseq);
+    }
+    else {
+	ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq =
+	    NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
+			   ISEQ_TYPE_BLOCK, line);
+	CHECK(COMPILE(ret, "iter caller", node->nd_iter));
+    }
+    ADD_LABEL(ret, retry_end_l);
 
-	ADD_LABEL(ret, retry_label);
-	if (nd_type(node) == NODE_FOR) {
-	    COMPILE(ret, "iter caller (for)", node->nd_iter);
+    if (popped) {
+	ADD_INSN(ret, line, pop);
+    }
 
-	    iseq->compile_data->current_block =
-		NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
-				  ISEQ_TYPE_BLOCK, nd_line(node));
+    ISEQ_COMPILE_DATA(iseq)->current_block = prevblock;
+
+    ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, child_iseq, retry_end_l);
+    return COMPILE_OK;
+}
 
-	    mid = idEach;
-	    ADD_SEND_R(ret, nd_line(node), ID2SYM(idEach), INT2FIX(0),
-		       iseq->compile_data->current_block, INT2FIX(0));
+static int
+compile_for_masgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    /* massign to var in "for"
+     * (args.length == 1 && Array.try_convert(args[0])) || args
+     */
+    const int line = nd_line(node);
+    const NODE *var = node->nd_var;
+    LABEL *not_single = NEW_LABEL(nd_line(var));
+    LABEL *not_ary = NEW_LABEL(nd_line(var));
+    CHECK(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_INSN(ret, line, swap);
+    ADD_CALL(ret, line, rb_intern("try_convert"), INT2FIX(1));
+    ADD_INSN(ret, line, dup);
+    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);
+    return COMPILE_OK;
+}
+
+static int
+compile_break(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+    unsigned long throw_flag = 0;
+
+    if (ISEQ_COMPILE_DATA(iseq)->redo_label != 0) {
+	/* while/until */
+	LABEL *splabel = NEW_LABEL(0);
+	ADD_LABEL(ret, splabel);
+	ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->redo_label);
+	CHECK(COMPILE_(ret, "break val (while/until)", node->nd_stts,
+		       ISEQ_COMPILE_DATA(iseq)->loopval_popped));
+	add_ensure_iseq(ret, iseq, 0);
+	ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
+	ADD_ADJUST_RESTORE(ret, splabel);
+
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
 	}
-	else {
-	    iseq->compile_data->current_block =
-		NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
-				  ISEQ_TYPE_BLOCK, nd_line(node));
-	    COMPILE(ret, "iter caller", node->nd_iter);
+    }
+    else if (iseq->body->type == ISEQ_TYPE_BLOCK) {
+      break_by_insn:
+	/* escape from block */
+	CHECK(COMPILE(ret, "break val (block)", node->nd_stts));
+        ADD_INSN1(ret, line, throw, INT2FIX(throw_flag | TAG_BREAK));
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
-	ADD_LABEL(ret, retry_end_l);
+    }
+    else if (iseq->body->type == ISEQ_TYPE_EVAL) {
+      break_in_eval:
+	COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with break");
+	return COMPILE_NG;
+    }
+    else {
+	const rb_iseq_t *ip = iseq->body->parent_iseq;
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
+	while (ip) {
+	    if (!ISEQ_COMPILE_DATA(ip)) {
+		ip = 0;
+		break;
+	    }
 
-	iseq->compile_data->current_block = prevblock;
+	    if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+                throw_flag = VM_THROW_NO_ESCAPE_FLAG;
+		goto break_by_insn;
+	    }
+	    else if (ip->body->type == ISEQ_TYPE_BLOCK) {
+		goto break_by_insn;
+	    }
+	    else if (ip->body->type == ISEQ_TYPE_EVAL) {
+		goto break_in_eval;
+	    }
 
-	ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, 0, retry_end_l);
+	    ip = ip->body->parent_iseq;
+	}
+	COMPILE_ERROR(ERROR_ARGS "Invalid break");
+	return COMPILE_NG;
+    }
+    return COMPILE_OK;
+}
 
-	break;
-      }
-      case NODE_BREAK:{
-	unsigned long level = 0;
+static int
+compile_next(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+    unsigned long throw_flag = 0;
+
+    if (ISEQ_COMPILE_DATA(iseq)->redo_label != 0) {
+	LABEL *splabel = NEW_LABEL(0);
+	debugs("next in while loop\n");
+	ADD_LABEL(ret, splabel);
+	CHECK(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_RESTORE(ret, splabel);
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
+	}
+    }
+    else if (ISEQ_COMPILE_DATA(iseq)->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);
+	CHECK(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_ADJUST_RESTORE(ret, splabel);
+	splabel->unremovable = FALSE;
+
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
+	}
+    }
+    else if (iseq->body->type == ISEQ_TYPE_EVAL) {
+      next_in_eval:
+	COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with next");
+	return COMPILE_NG;
+    }
+    else {
+	const rb_iseq_t *ip = iseq;
 
-	if (iseq->compile_data->redo_label != 0) {
-	    /* while/until */
-	    LABEL *splabel = NEW_LABEL(0);
-	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
-	    COMPILE_(ret, "break val (while/until)", node->nd_stts, iseq->compile_data->loopval_popped);
-	    add_ensure_iseq(ret, iseq, 0);
-	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->end_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
+	while (ip) {
+	    if (!ISEQ_COMPILE_DATA(ip)) {
+		ip = 0;
+		break;
+	    }
 
-	    if (!poped) {
-		ADD_INSN(ret, nd_line(node), putnil);
+            throw_flag = VM_THROW_NO_ESCAPE_FLAG;
+	    if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+		/* while loop */
+		break;
 	    }
-	}
-	else if (iseq->type == ISEQ_TYPE_BLOCK) {
-	  break_by_insn:
-	    /* escape from block */
-	    COMPILE(ret, "break val (block)", node->nd_stts);
-	    ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x02) /* TAG_BREAK */ );
-	    if (poped) {
-		ADD_INSN(ret, nd_line(node), pop);
+	    else if (ip->body->type == ISEQ_TYPE_BLOCK) {
+		break;
 	    }
+	    else if (ip->body->type == ISEQ_TYPE_EVAL) {
+		goto next_in_eval;
+	    }
+
+	    ip = ip->body->parent_iseq;
 	}
-	else if (iseq->type == ISEQ_TYPE_EVAL) {
-	  break_in_eval:
-	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with break"));
+	if (ip != 0) {
+	    CHECK(COMPILE(ret, "next val", node->nd_stts));
+            ADD_INSN1(ret, line, throw, INT2FIX(throw_flag | TAG_NEXT));
+
+	    if (popped) {
+		ADD_INSN(ret, line, pop);
+	    }
 	}
 	else {
-	    rb_iseq_t *ip = iseq->parent_iseq;
-	    while (ip) {
-		if (!ip->compile_data) {
-		    ip = 0;
-		    break;
-		}
+	    COMPILE_ERROR(ERROR_ARGS "Invalid next");
+	    return COMPILE_NG;
+	}
+    }
+    return COMPILE_OK;
+}
 
-		level++;
-		if (ip->compile_data->redo_label != 0) {
-		    level = 0x8000;
-		    if (ip->compile_data->loopval_popped == 0) {
-			/* need value */
-			level |= 0x4000;
-		    }
-		    goto break_by_insn;
-		}
-		else if (ip->type == ISEQ_TYPE_BLOCK) {
-		    level <<= 16;
-		    goto break_by_insn;
-		}
-		else if (ip->type == ISEQ_TYPE_EVAL) {
-		    goto break_in_eval;
-		}
+static int
+compile_redo(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+
+    if (ISEQ_COMPILE_DATA(iseq)->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_ensure_iseq(ret, iseq, 0);
+	ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->redo_label);
+	ADD_ADJUST_RESTORE(ret, splabel);
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
+	}
+    }
+    else if (iseq->body->type == ISEQ_TYPE_EVAL) {
+      redo_in_eval:
+	COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with redo");
+	return COMPILE_NG;
+    }
+    else if (ISEQ_COMPILE_DATA(iseq)->start_label) {
+	LABEL *splabel = NEW_LABEL(0);
 
-		ip = ip->parent_iseq;
-	    }
-	    COMPILE_ERROR((ERROR_ARGS "Invalid break"));
+	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_RESTORE(ret, splabel);
+
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
 	}
-	break;
-      }
-      case NODE_NEXT:{
-	unsigned long level = 0;
+    }
+    else {
+	const rb_iseq_t *ip = iseq;
 
-	if (iseq->compile_data->redo_label != 0) {
-	    LABEL *splabel = NEW_LABEL(0);
-	    debugs("next in while loop\n");
-	    ADD_LABEL(ret, splabel);
-	    COMPILE(ret, "next val/valid syntax?", node->nd_stts);
-	    add_ensure_iseq(ret, iseq, 0);
-	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
-	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->start_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
-	    if (!poped) {
-		ADD_INSN(ret, nd_line(node), putnil);
+	while (ip) {
+	    if (!ISEQ_COMPILE_DATA(ip)) {
+		ip = 0;
+		break;
 	    }
-	}
-	else if (iseq->compile_data->end_label) {
-	    LABEL *splabel = NEW_LABEL(0);
-	    debugs("next in block\n");
-	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->start_label);
-	    COMPILE(ret, "next val", node->nd_stts);
-	    add_ensure_iseq(ret, iseq, 0);
-	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->end_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
 
-	    if (!poped) {
-		ADD_INSN(ret, nd_line(node), putnil);
+	    if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+		break;
+	    }
+	    else if (ip->body->type == ISEQ_TYPE_BLOCK) {
+		break;
 	    }
+	    else if (ip->body->type == ISEQ_TYPE_EVAL) {
+		goto redo_in_eval;
+	    }
+
+	    ip = ip->body->parent_iseq;
 	}
-	else if (iseq->type == ISEQ_TYPE_EVAL) {
-	  next_in_eval:
-	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with next"));
+	if (ip != 0) {
+	    ADD_INSN(ret, line, putnil);
+            ADD_INSN1(ret, line, throw, INT2FIX(VM_THROW_NO_ESCAPE_FLAG | TAG_REDO));
+
+	    if (popped) {
+		ADD_INSN(ret, line, pop);
+	    }
 	}
 	else {
-	    rb_iseq_t *ip;
-	    ip = iseq;
-	    while (ip) {
-		if (!ip->compile_data) {
-		    ip = 0;
-		    break;
-		}
+	    COMPILE_ERROR(ERROR_ARGS "Invalid redo");
+	    return COMPILE_NG;
+	}
+    }
+    return COMPILE_OK;
+}
 
-		level = 0x8000 | 0x4000;
-		if (ip->compile_data->redo_label != 0) {
-		    /* while loop */
-		    break;
-		}
-		else if (ip->type == ISEQ_TYPE_BLOCK) {
-		    break;
-		}
-		else if (ip->type == ISEQ_TYPE_EVAL) {
-		    goto next_in_eval;
-		}
+static int
+compile_retry(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
 
-		ip = ip->parent_iseq;
-	    }
-	    if (ip != 0) {
-		COMPILE(ret, "next val", node->nd_stts);
-		ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x03) /* TAG_NEXT */ );
+    if (iseq->body->type == ISEQ_TYPE_RESCUE) {
+	ADD_INSN(ret, line, putnil);
+	ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETRY));
 
-		if (poped) {
-		    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
+	}
+    }
+    else {
+	COMPILE_ERROR(ERROR_ARGS "Invalid retry");
+	return COMPILE_NG;
+    }
+    return COMPILE_OK;
+}
+
+static int
+compile_rescue(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+    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);
+
+    lstart->rescued = LABEL_RESCUE_BEG;
+    lend->rescued = LABEL_RESCUE_END;
+    ADD_LABEL(ret, lstart);
+    CHECK(COMPILE(ret, "rescue head", node->nd_head));
+    ADD_LABEL(ret, lend);
+    if (node->nd_else) {
+	ADD_INSN(ret, line, pop);
+	CHECK(COMPILE(ret, "rescue else", node->nd_else));
+    }
+    ADD_INSN(ret, line, nop);
+    ADD_LABEL(ret, lcont);
+
+    if (popped) {
+	ADD_INSN(ret, line, pop);
+    }
+
+    /* register catch entry */
+    ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lcont);
+    ADD_CATCH_ENTRY(CATCH_TYPE_RETRY, lend, lcont, NULL, lstart);
+    return COMPILE_OK;
+}
+
+static int
+compile_resbody(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+    const NODE *resq = node;
+    const NODE *narg;
+    LABEL *label_miss, *label_hit;
+
+    while (resq) {
+	label_miss = NEW_LABEL(line);
+	label_hit = NEW_LABEL(line);
+
+	narg = resq->nd_args;
+	if (narg) {
+	    switch (nd_type(narg)) {
+	      case NODE_LIST:
+		while (narg) {
+		    ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
+		    CHECK(COMPILE(ret, "rescue arg", narg->nd_head));
+		    ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
+		    ADD_INSNL(ret, line, branchif, label_hit);
+		    narg = narg->nd_next;
 		}
-	    }
-	    else {
-		COMPILE_ERROR((ERROR_ARGS "Invalid next"));
+		break;
+	      case NODE_SPLAT:
+	      case NODE_ARGSCAT:
+	      case NODE_ARGSPUSH:
+		ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
+		CHECK(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, COMPILE_NG);
 	    }
 	}
-	break;
-      }
-      case NODE_REDO:{
-	if (iseq->compile_data->redo_label) {
-	    LABEL *splabel = NEW_LABEL(0);
-	    debugs("redo in while");
-	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
-	    add_ensure_iseq(ret, iseq, 0);
-	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->redo_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
-	    if (!poped) {
-		ADD_INSN(ret, nd_line(node), putnil);
-	    }
+	else {
+	    ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 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);
+	}
+	ADD_INSNL(ret, line, jump, label_miss);
+	ADD_LABEL(ret, label_hit);
+	CHECK(COMPILE(ret, "resbody body", resq->nd_body));
+	if (ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization) {
+	    ADD_INSN(ret, line, nop);
+	}
+	ADD_INSN(ret, line, leave);
+	ADD_LABEL(ret, label_miss);
+	resq = resq->nd_head;
+    }
+    return COMPILE_OK;
+}
+
+static int
+compile_ensure(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+    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);
+    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);
+    CHECK(COMPILE_POPPED(ensr, "ensure ensr", node->nd_ensr));
+    last = ensr->last;
+    last_leave = last && IS_INSN(last) && IS_INSN_ID(last, leave);
+
+    er.begin = lstart;
+    er.end = lend;
+    er.next = 0;
+    push_ensure_entry(iseq, &enl, &er, node->nd_ensr);
+
+    ADD_LABEL(ret, lstart);
+    CHECK(COMPILE_(ret, "ensure head", node->nd_head, (popped | last_leave)));
+    ADD_LABEL(ret, lend);
+    ADD_SEQ(ret, ensr);
+    if (!popped && last_leave) ADD_INSN(ret, line, putnil);
+    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;
+	}
+    }
+
+    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enl.prev;
+    return COMPILE_OK;
+}
+
+static int
+compile_return(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+
+    if (iseq) {
+	enum iseq_type type = iseq->body->type;
+	const rb_iseq_t *is = iseq;
+	enum iseq_type t = type;
+	const NODE *retval = node->nd_stts;
+	LABEL *splabel = 0;
+
+	while (t == ISEQ_TYPE_RESCUE || t == ISEQ_TYPE_ENSURE) {
+	    if (!(is = is->body->parent_iseq)) break;
+	    t = is->body->type;
 	}
-	else if (iseq->type == ISEQ_TYPE_EVAL) {
-	  redo_in_eval:
-	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with redo"));
+	switch (t) {
+	  case ISEQ_TYPE_TOP:
+	  case ISEQ_TYPE_MAIN:
+            if (retval) {
+                rb_warn("argument of top-level return is ignored");
+            }
+	    if (is == iseq) {
+		/* plain top-level, leave directly */
+		type = ISEQ_TYPE_METHOD;
+	    }
+	    break;
+	  default:
+	    break;
 	}
-	else if (iseq->compile_data->start_label) {
-	    LABEL *splabel = NEW_LABEL(0);
 
-	    debugs("redo in block");
+	if (type == ISEQ_TYPE_METHOD) {
+	    splabel = NEW_LABEL(0);
 	    ADD_LABEL(ret, splabel);
-	    add_ensure_iseq(ret, iseq, 0);
-	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->start_label);
-	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->start_label);
+	    ADD_ADJUST(ret, line, 0);
+	}
+
+	CHECK(COMPILE(ret, "return nd_stts (return val)", retval));
+
+	if (type == ISEQ_TYPE_METHOD) {
+	    add_ensure_iseq(ret, iseq, 1);
+	    ADD_TRACE(ret, RUBY_EVENT_RETURN);
+	    ADD_INSN(ret, line, leave);
 	    ADD_ADJUST_RESTORE(ret, splabel);
 
-	    if (!poped) {
-		ADD_INSN(ret, nd_line(node), putnil);
+	    if (!popped) {
+		ADD_INSN(ret, line, putnil);
 	    }
 	}
 	else {
-	    rb_iseq_t *ip;
-	    unsigned long level;
-	    level = 0x8000 | 0x4000;
-	    ip = iseq;
-	    while (ip) {
-		if (!ip->compile_data) {
-		    ip = 0;
-		    break;
-		}
+	    ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETURN));
+	    if (popped) {
+		ADD_INSN(ret, line, pop);
+	    }
+	}
+    }
+    return COMPILE_OK;
+}
 
-		if (ip->compile_data->redo_label != 0) {
-		    break;
-		}
-		else if (ip->type == ISEQ_TYPE_BLOCK) {
-		    break;
-		}
-		else if (ip->type == ISEQ_TYPE_EVAL) {
-		    goto redo_in_eval;
-		}
+static int
+compile_evstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    CHECK(COMPILE_(ret, "nd_body", node, popped));
+
+    if (!popped && !all_string_result_p(node)) {
+	const int line = nd_line(node);
+	const unsigned int flag = VM_CALL_FCALL;
+	LABEL *isstr = NEW_LABEL(line);
+	ADD_INSN(ret, line, dup);
+	ADD_INSN1(ret, line, checktype, INT2FIX(T_STRING));
+	ADD_INSNL(ret, line, branchif, isstr);
+	ADD_INSN(ret, line, dup);
+	ADD_SEND_R(ret, line, idTo_s, INT2FIX(0), NULL, INT2FIX(flag), NULL);
+	ADD_INSN(ret, line, tostring);
+	ADD_LABEL(ret, isstr);
+    }
+    return COMPILE_OK;
+}
 
-		ip = ip->parent_iseq;
-	    }
-	    if (ip != 0) {
-		ADD_INSN(ret, nd_line(node), putnil);
-		ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x05) /* TAG_REDO */ );
+static LABEL *
+qcall_branch_start(rb_iseq_t *iseq, LINK_ANCHOR *const recv, VALUE *branches, const NODE *node, int line)
+{
+    LABEL *else_label = NEW_LABEL(line);
+    const int first_lineno = nd_first_lineno(node), first_column = nd_first_column(node);
+    const int last_lineno = nd_last_lineno(node), last_column = nd_last_column(node);
+    VALUE br = 0;
+
+    DECL_BRANCH_BASE(br, first_lineno, first_column, last_lineno, last_column, "&.");
+    *branches = br;
+    ADD_INSN(recv, line, dup);
+    ADD_INSNL(recv, line, branchnil, else_label);
+    ADD_TRACE_BRANCH_COVERAGE(recv, first_lineno, first_column, last_lineno, last_column, "then", br);
+    return else_label;
+}
 
-		if (poped) {
-		    ADD_INSN(ret, nd_line(node), pop);
-		}
-	    }
-	    else {
-		COMPILE_ERROR((ERROR_ARGS "Invalid redo"));
+static void
+qcall_branch_end(rb_iseq_t *iseq, LINK_ANCHOR *const ret, LABEL *else_label, VALUE branches, const NODE *node, int line)
+{
+    LABEL *end_label;
+    if (!else_label) return;
+    end_label = NEW_LABEL(line);
+    ADD_INSNL(ret, line, jump, end_label);
+    ADD_LABEL(ret, else_label);
+    ADD_TRACE_BRANCH_COVERAGE(ret, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node),
+                              "else", branches);
+    ADD_LABEL(ret, end_label);
+}
+
+static int
+compile_call_precheck_freeze(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int line, int popped)
+{
+    /* optimization shortcut
+     *   "literal".freeze -> opt_str_freeze("literal")
+     */
+    if (node->nd_recv && nd_type(node->nd_recv) == NODE_STR &&
+        (node->nd_mid == idFreeze || node->nd_mid == idUMinus) &&
+        node->nd_args == NULL &&
+        ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
+        ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
+        VALUE str = rb_fstring(node->nd_recv->nd_lit);
+        if (node->nd_mid == idUMinus) {
+            ADD_INSN2(ret, line, opt_str_uminus, str,
+                      new_callinfo(iseq, idUMinus, 0, 0, NULL, FALSE));
+        }
+        else {
+            ADD_INSN2(ret, line, opt_str_freeze, str,
+                      new_callinfo(iseq, idFreeze, 0, 0, NULL, FALSE));
+        }
+        RB_OBJ_WRITTEN(iseq, Qundef, str);
+        if (popped) {
+            ADD_INSN(ret, line, pop);
+        }
+        return TRUE;
+    }
+    /* optimization shortcut
+     *   obj["literal"] -> opt_aref_with(obj, "literal")
+     */
+    if (node->nd_mid == idAREF && !private_recv_p(node) && node->nd_args &&
+        nd_type(node->nd_args) == NODE_LIST && 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->frozen_string_literal &&
+        ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
+        VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
+        CHECK(COMPILE(ret, "recv", node->nd_recv));
+        ADD_INSN2(ret, line, opt_aref_with, str,
+                  new_callinfo(iseq, idAREF, 1, 0, NULL, FALSE));
+        RB_OBJ_WRITTEN(iseq, Qundef, str);
+        if (popped) {
+            ADD_INSN(ret, line, pop);
+        }
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static int
+iseq_has_builtin_function_table(const rb_iseq_t *iseq)
+{
+    return ISEQ_COMPILE_DATA(iseq)->builtin_function_table != NULL;
+}
+
+static const struct rb_builtin_function *
+iseq_builtin_function_lookup(const rb_iseq_t *iseq, const char *name)
+{
+    int i;
+    const struct rb_builtin_function *table = ISEQ_COMPILE_DATA(iseq)->builtin_function_table;
+    for (i=0; table[i].index != -1; i++) {
+        if (strcmp(table[i].name, name) == 0) {
+            return &table[i];
+        }
+    }
+    return NULL;
+}
+
+static const char *
+iseq_builtin_function_name(ID mid)
+{
+    const char *name = rb_id2name(mid);
+    static const char prefix[] = "__builtin_";
+    const size_t prefix_len = sizeof(prefix) - 1;
+
+    if (UNLIKELY(strncmp(prefix, name, prefix_len) == 0)) {
+        return &name[prefix_len];
+    }
+    else {
+        return NULL;
+    }
+}
+
+static int
+delegate_call_p(const rb_iseq_t *iseq, unsigned int argc, const LINK_ANCHOR *args, unsigned int *pstart_index)
+{
+
+    if (argc == 0) {
+        *pstart_index = 0;
+        return TRUE;
+    }
+    else if (argc <= iseq->body->local_table_size) {
+        unsigned int start=0;
+
+        // local_table: [p1, p2, p3, l1, l2, l3]
+        // arguments:           [p3, l1, l2]     -> 2
+        for (start = 0;
+             argc + start <= iseq->body->local_table_size;
+             start++) {
+            const LINK_ELEMENT *elem = FIRST_ELEMENT(args);
+
+            for (unsigned int i=start; i-start<argc; i++) {
+                if (elem->type == ISEQ_ELEMENT_INSN &&
+                    INSN_OF(elem) == BIN(getlocal)) {
+                    int local_index = FIX2INT(OPERAND_AT(elem, 0));
+                    int local_level = FIX2INT(OPERAND_AT(elem, 1));
+
+                    if (local_level == 0) {
+                        unsigned int index = iseq->body->local_table_size - (local_index - VM_ENV_DATA_SIZE + 1);
+                        if (0) { // for debug
+                            fprintf(stderr, "lvar:%s (%d), id:%s (%d) local_index:%d, local_size:%d\n",
+                                    rb_id2name(iseq->body->local_table[i]),     i,
+                                    rb_id2name(iseq->body->local_table[index]), index,
+                                    local_index, (int)iseq->body->local_table_size);
+                        }
+                        if (i == index) {
+                            elem = elem->next;
+                            continue; /* for */
+                        }
+                        else {
+                            goto next;
+                        }
+                    }
+                    else {
+                        goto fail; // level != 0 is unsupported
+                    }
+                }
+                else {
+                    goto fail; // insn is not a getlocal
+                }
+            }
+            goto success;
+          next:;
+        }
+      fail:
+        return FALSE;
+      success:
+        *pstart_index = start;
+        return TRUE;
+    }
+    else {
+        return FALSE;
+    }
+}
+
+static int
+compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int type, int line, int popped)
+{
+    /* call:  obj.method(...)
+     * fcall: func(...)
+     * vcall: func
+     */
+    DECL_ANCHOR(recv);
+    DECL_ANCHOR(args);
+    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;
+    LABEL *else_label = NULL;
+    VALUE branches = Qfalse;
+
+    ISEQ_COMPILE_DATA(iseq)->current_block = NULL;
+
+    INIT_ANCHOR(recv);
+    INIT_ANCHOR(args);
+#if OPT_SUPPORT_JOKE
+    if (nd_type(node) == NODE_VCALL) {
+        ID id_bitblt;
+        ID id_answer;
+
+        CONST_ID(id_bitblt, "bitblt");
+        CONST_ID(id_answer, "the_answer_to_life_the_universe_and_everything");
+
+        if (mid == id_bitblt) {
+            ADD_INSN(ret, line, bitblt);
+            return COMPILE_OK;
+        }
+        else if (mid == id_answer) {
+            ADD_INSN(ret, line, answer);
+            return COMPILE_OK;
+        }
+    }
+    /* only joke */
+    {
+        ID goto_id;
+        ID label_id;
+
+        CONST_ID(goto_id, "__goto__");
+        CONST_ID(label_id, "__label__");
+
+        if (nd_type(node) == NODE_FCALL &&
+            (mid == goto_id || mid == label_id)) {
+            LABEL *label;
+            st_data_t data;
+            st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table;
+            VALUE label_name;
+
+            if (!labels_table) {
+                labels_table = st_init_numtable();
+                ISEQ_COMPILE_DATA(iseq)->labels_table = labels_table;
+            }
+            if (nd_type(node->nd_args->nd_head) == NODE_LIT &&
+                SYMBOL_P(node->nd_args->nd_head->nd_lit)) {
+
+                label_name = node->nd_args->nd_head->nd_lit;
+                if (!st_lookup(labels_table, (st_data_t)label_name, &data)) {
+                    label = NEW_LABEL(line);
+                    label->position = line;
+                    st_insert(labels_table, (st_data_t)label_name, (st_data_t)label);
+                }
+                else {
+                    label = (LABEL *)data;
+                }
+            }
+            else {
+                COMPILE_ERROR(ERROR_ARGS "invalid goto/label format");
+                return COMPILE_NG;
+            }
+
+            if (mid == goto_id) {
+                ADD_INSNL(ret, line, jump, label);
+            }
+            else {
+                ADD_LABEL(ret, label);
+            }
+            return COMPILE_OK;
+        }
+    }
+#endif
+    const char *builtin_func;
+    NODE *args_node = node->nd_args;
+
+    if (UNLIKELY(iseq_has_builtin_function_table(iseq)) &&
+        (builtin_func = iseq_builtin_function_name(mid)) != NULL) {
+
+        if (parent_block != NULL) {
+            COMPILE_ERROR(iseq, line, "should not call builtins here.");
+            return COMPILE_NG;
+        }
+        else {
+            char inline_func[0x20];
+            bool cconst = false;
+          retry:;
+            const struct rb_builtin_function *bf = iseq_builtin_function_lookup(iseq, builtin_func);
+
+            if (bf == NULL) {
+                if (strcmp("cstmt!", builtin_func) == 0 ||
+                    strcmp("cexpr!", builtin_func) == 0) {
+                  inlinec:;
+                    int inline_index = GET_VM()->builtin_inline_index++;
+                    snprintf(inline_func, 0x20, "_bi%d", inline_index);
+                    builtin_func = inline_func;
+                    args_node = NULL;
+                    goto retry;
+                }
+                else if (strcmp("cconst!", builtin_func) == 0) {
+                    cconst = true;
+                    goto inlinec;
+                }
+                else if (strcmp("cinit!", builtin_func) == 0) {
+                    // ignore
+                    GET_VM()->builtin_inline_index++;
+                    return COMPILE_OK;
+                }
+
+                if (1) {
+                    rb_bug("can't find builtin function:%s", builtin_func);
+                }
+                else {
+                    COMPILE_ERROR(ERROR_ARGS "can't find builtin function:%s", builtin_func);
+                }
+                return COMPILE_NG;
+            }
+
+            if (cconst) {
+                typedef VALUE(*builtin_func0)(void *, VALUE);
+                VALUE const_val = (*(builtin_func0)bf->func_ptr)(NULL, Qnil);
+                ADD_INSN1(ret, line, putobject, const_val);
+                return COMPILE_OK;
+            }
+
+            // fprintf(stderr, "func_name:%s -> %p\n", builtin_func, bf->func_ptr);
+
+            argc = setup_args(iseq, args, args_node, &flag, &keywords);
+
+            if (FIX2INT(argc) != bf->argc) {
+                COMPILE_ERROR(ERROR_ARGS "argc is not match for builtin function:%s (expect %d but %d)",
+                              builtin_func, bf->argc, FIX2INT(argc));
+                return COMPILE_NG;
+            }
+
+            unsigned int start_index;
+            if (delegate_call_p(iseq, FIX2INT(argc), args, &start_index)) {
+                ADD_INSN2(ret, line, opt_invokebuiltin_delegate, bf, INT2FIX(start_index));
+            }
+            else {
+                ADD_SEQ(ret, args);
+                ADD_INSN1(ret,line, invokebuiltin, bf);
+            }
+
+            if (popped) ADD_INSN(ret, line, pop);
+            return COMPILE_OK;
+        }
+    }
+
+
+    /* receiver */
+    if (type == NODE_CALL || type == NODE_OPCALL || type == NODE_QCALL) {
+        int idx, level;
+
+        if (mid == idCall &&
+            nd_type(node->nd_recv) == NODE_LVAR &&
+            iseq_block_param_id_p(iseq, node->nd_recv->nd_vid, &idx, &level)) {
+            ADD_INSN2(recv, nd_line(node->nd_recv), getblockparamproxy, INT2FIX(idx + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+        }
+        else if (private_recv_p(node)) {
+            ADD_INSN(recv, nd_line(node), putself);
+            flag |= VM_CALL_FCALL;
+        }
+        else {
+            CHECK(COMPILE(recv, "recv", node->nd_recv));
+        }
+
+        if (type == NODE_QCALL) {
+            else_label = qcall_branch_start(iseq, recv, &branches, node, line);
+        }
+    }
+    else if (type == NODE_FCALL || type == NODE_VCALL) {
+        ADD_CALL_RECEIVER(recv, line);
+    }
+
+    /* args */
+    if (type != NODE_VCALL) {
+        argc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
+        CHECK(!NIL_P(argc));
+    }
+    else {
+        argc = INT2FIX(0);
+    }
+
+    ADD_SEQ(ret, recv);
+    ADD_SEQ(ret, args);
+
+    debugp_param("call args argc", argc);
+    debugp_param("call method", ID2SYM(mid));
+
+    switch ((int)type) {
+      case NODE_VCALL:
+        flag |= VM_CALL_VCALL;
+        /* VCALL is funcall, so fall through */
+      case NODE_FCALL:
+        flag |= VM_CALL_FCALL;
+    }
+
+    ADD_SEND_R(ret, line, mid, argc, parent_block, INT2FIX(flag), keywords);
+
+    qcall_branch_end(iseq, ret, else_label, branches, node, line);
+    if (popped) {
+        ADD_INSN(ret, line, pop);
+    }
+    return COMPILE_OK;
+}
+
+
+static int iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped);
+/**
+  compile each node
+
+  self:  InstructionSequence
+  node:  Ruby compiled node
+  popped: This node will be popped
+ */
+static int
+iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE *node, int popped)
+{
+    if (node == 0) {
+        if (!popped) {
+            int lineno = ISEQ_COMPILE_DATA(iseq)->last_line;
+            if (lineno == 0) lineno = FIX2INT(rb_iseq_first_lineno(iseq));
+            debugs("node: NODE_NIL(implicit)\n");
+            ADD_INSN(ret, lineno, putnil);
+        }
+        return COMPILE_OK;
+    }
+    return iseq_compile_each0(iseq, ret, node, popped);
+}
+
+static int
+check_yield_place(const rb_iseq_t *iseq, int line)
+{
+    VALUE file;
+    switch (iseq->body->local_iseq->body->type) {
+      case ISEQ_TYPE_TOP:
+      case ISEQ_TYPE_MAIN:
+        return FALSE;
+      case ISEQ_TYPE_CLASS:
+        file = rb_iseq_path(iseq);
+        if (rb_warning_category_enabled_p(RB_WARN_CATEGORY_DEPRECATED)) {
+            rb_compile_warn(RSTRING_PTR(file), line,
+                            "`yield' in class syntax will not be supported from Ruby 3.0. [Feature #15575]");
+        }
+        return TRUE;
+      default:
+        return TRUE;
+    }
+}
+
+static int
+iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped)
+{
+    const int line = (int)nd_line(node);
+    const enum node_type type = nd_type(node);
+    struct rb_iseq_constant_body *const body = iseq->body;
+
+    if (ISEQ_COMPILE_DATA(iseq)->last_line == line) {
+	/* ignore */
+    }
+    else {
+	if (node->flags & NODE_FL_NEWLINE) {
+	    int event = RUBY_EVENT_LINE;
+	    ISEQ_COMPILE_DATA(iseq)->last_line = line;
+	    if (ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
+		event |= RUBY_EVENT_COVERAGE_LINE;
 	    }
+	    ADD_TRACE(ret, event);
 	}
-	break;
-      }
-      case NODE_RETRY:{
-	if (iseq->type == ISEQ_TYPE_RESCUE) {
-	    ADD_INSN(ret, nd_line(node), putnil);
-	    ADD_INSN1(ret, nd_line(node), throw, INT2FIX(0x04) /* TAG_RETRY */ );
+    }
 
-	    if (poped) {
-		ADD_INSN(ret, nd_line(node), pop);
-	    }
+    debug_node_start(node);
+#undef BEFORE_RETURN
+#define BEFORE_RETURN debug_node_end()
+
+    switch (type) {
+      case NODE_BLOCK:{
+	while (node && nd_type(node) == NODE_BLOCK) {
+	    CHECK(COMPILE_(ret, "BLOCK body", node->nd_head,
+			   (node->nd_next ? 1 : popped)));
+	    node = node->nd_next;
 	}
-	else {
-	    COMPILE_ERROR((ERROR_ARGS "Invalid retry"));
+	if (node) {
+	    CHECK(COMPILE_(ret, "BLOCK next", node->nd_next, popped));
 	}
 	break;
       }
+      case NODE_IF:
+      case NODE_UNLESS:
+	CHECK(compile_if(iseq, ret, node, popped, type));
+	break;
+      case NODE_CASE:
+	CHECK(compile_case(iseq, ret, node, popped));
+	break;
+      case NODE_CASE2:
+	CHECK(compile_case2(iseq, ret, node, popped));
+	break;
+      case NODE_CASE3:
+        CHECK(compile_case3(iseq, ret, node, popped));
+        break;
+      case NODE_WHILE:
+      case NODE_UNTIL:
+	CHECK(compile_loop(iseq, ret, node, popped, type));
+	break;
+      case NODE_FOR:
+      case NODE_ITER:
+	CHECK(compile_iter(iseq, ret, node, popped));
+	break;
+      case NODE_FOR_MASGN:
+	CHECK(compile_for_masgn(iseq, ret, node, popped));
+	break;
+      case NODE_BREAK:
+	CHECK(compile_break(iseq, ret, node, popped));
+	break;
+      case NODE_NEXT:
+	CHECK(compile_next(iseq, ret, node, popped));
+	break;
+      case NODE_REDO:
+	CHECK(compile_redo(iseq, ret, node, popped));
+	break;
+      case NODE_RETRY:
+	CHECK(compile_retry(iseq, ret, node, popped));
+	break;
       case NODE_BEGIN:{
-	COMPILE_(ret, "NODE_BEGIN", node->nd_body, poped);
+	CHECK(COMPILE_(ret, "NODE_BEGIN", node->nd_body, popped));
 	break;
       }
-      case NODE_RESCUE:{
-	LABEL *lstart = NEW_LABEL(nd_line(node));
-	LABEL *lend = NEW_LABEL(nd_line(node));
-	LABEL *lcont = NEW_LABEL(nd_line(node));
-	VALUE rescue = NEW_CHILD_ISEQVAL(
-	    node->nd_resq,
-	    rb_str_concat(rb_str_new2("rescue in "), iseq->name),
-	    ISEQ_TYPE_RESCUE, nd_line(node));
-
-	ADD_LABEL(ret, lstart);
-	COMPILE(ret, "rescue head", node->nd_head);
-	ADD_LABEL(ret, lend);
-	if (node->nd_else) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	    COMPILE(ret, "rescue else", node->nd_else);
-	}
-	ADD_INSN(ret, nd_line(node), nop);
-	ADD_LABEL(ret, lcont);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-
-	/* register catch entry */
-	ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lcont);
-	ADD_CATCH_ENTRY(CATCH_TYPE_RETRY, lend, lcont, 0, lstart);
+      case NODE_RESCUE:
+	CHECK(compile_rescue(iseq, ret, node, popped));
 	break;
-      }
-      case NODE_RESBODY:{
-	NODE *resq = node;
-	NODE *narg;
-	LABEL *label_miss, *label_hit;
-
-	while (resq) {
-	    label_miss = NEW_LABEL(nd_line(node));
-	    label_hit = NEW_LABEL(nd_line(node));
-
-	    narg = resq->nd_args;
-	    if (narg) {
-		switch (nd_type(narg)) {
-		  case NODE_ARRAY:
-		    while (narg) {
-			COMPILE(ret, "rescue arg", narg->nd_head);
-			ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
-			ADD_SEND(ret, nd_line(node), ID2SYM(idEqq), INT2FIX(1));
-			ADD_INSNL(ret, nd_line(node), branchif, label_hit);
-			narg = narg->nd_next;
-		    }
-		    break;
-		  case NODE_SPLAT:
-		  case NODE_ARGSCAT:
-		  case NODE_ARGSPUSH:
-		    ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
-		    COMPILE(ret, "rescue/cond splat", narg);
-		    ADD_INSN1(ret, nd_line(node), checkincludearray, Qtrue);
-		    ADD_INSN(ret, nd_line(node), swap);
-		    ADD_INSN(ret, nd_line(node), pop);
-		    ADD_INSNL(ret, nd_line(node), branchif, label_hit);
-		    break;
-		  default:
-		    rb_bug("NODE_RESBODY: unknown node (%s)",
-			   ruby_node_name(nd_type(narg)));
-		}
-	    }
-	    else {
-		ADD_INSN1(ret, nd_line(node), putobject,
-			  rb_eStandardError);
-		ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
-		ADD_SEND(ret, nd_line(node), ID2SYM(idEqq), INT2FIX(1));
-		ADD_INSNL(ret, nd_line(node), branchif, label_hit);
-	    }
-	    ADD_INSNL(ret, nd_line(node), jump, label_miss);
-	    ADD_LABEL(ret, label_hit);
-	    COMPILE(ret, "resbody body", resq->nd_body);
-	    if (iseq->compile_data->option->tailcall_optimization) {
-		ADD_INSN(ret, nd_line(node), nop);
-	    }
-	    ADD_INSN(ret, nd_line(node), leave);
-	    ADD_LABEL(ret, label_miss);
-	    resq = resq->nd_head;
-	}
+      case NODE_RESBODY:
+	CHECK(compile_resbody(iseq, ret, node, popped));
 	break;
-      }
-      case NODE_ENSURE:{
-	DECL_ANCHOR(ensr);
-	VALUE ensure = NEW_CHILD_ISEQVAL(node->nd_ensr,
-					 rb_str_concat(rb_str_new2
-						       ("ensure in "),
-						       iseq->name),
-					 ISEQ_TYPE_ENSURE, nd_line(node));
-	LABEL *lstart = NEW_LABEL(nd_line(node));
-	LABEL *lend = NEW_LABEL(nd_line(node));
-	LABEL *lcont = NEW_LABEL(nd_line(node));
-	struct ensure_range er;
-	struct iseq_compile_data_ensure_node_stack enl;
-	struct ensure_range *erange;
-
-	INIT_ANCHOR(ensr);
-	COMPILE_POPED(ensr, "ensure ensr", node->nd_ensr);
-
-	er.begin = lstart;
-	er.end = lend;
-	er.next = 0;
-	push_ensure_entry(iseq, &enl, &er, node->nd_ensr);
-
-	ADD_LABEL(ret, lstart);
-	COMPILE_(ret, "ensure head", node->nd_head, poped);
-	ADD_LABEL(ret, lend);
-	if (ensr->anchor.next == 0) {
-	    ADD_INSN(ret, nd_line(node), nop);
-	}
-	else {
-	    ADD_SEQ(ret, ensr);
-	}
-	ADD_LABEL(ret, lcont);
-
-	erange = iseq->compile_data->ensure_node_stack->erange;
-	while (erange) {
-	    ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end,
-			    ensure, lcont);
-	    erange = erange->next;
-	}
-
-	iseq->compile_data->ensure_node_stack = enl.prev;
+      case NODE_ENSURE:
+	CHECK(compile_ensure(iseq, ret, node, popped));
 	break;
-      }
 
       case NODE_AND:
       case NODE_OR:{
-	LABEL *end_label = NEW_LABEL(nd_line(node));
-	COMPILE(ret, "nd_1st", node->nd_1st);
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
+	LABEL *end_label = NEW_LABEL(line);
+	CHECK(COMPILE(ret, "nd_1st", node->nd_1st));
+	if (!popped) {
+	    ADD_INSN(ret, line, dup);
 	}
 	if (type == NODE_AND) {
-	    ADD_INSNL(ret, nd_line(node), branchunless, end_label);
+	    ADD_INSNL(ret, line, branchunless, end_label);
 	}
 	else {
-	    ADD_INSNL(ret, nd_line(node), branchif, end_label);
+	    ADD_INSNL(ret, line, branchif, end_label);
 	}
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (!popped) {
+	    ADD_INSN(ret, line, pop);
 	}
-	COMPILE_(ret, "nd_2nd", node->nd_2nd, poped);
+	CHECK(COMPILE_(ret, "nd_2nd", node->nd_2nd, popped));
 	ADD_LABEL(ret, end_label);
 	break;
       }
 
       case NODE_MASGN:{
-	compile_massign(iseq, ret, node, poped);
+	compile_massign(iseq, ret, node, popped);
 	break;
       }
 
       case NODE_LASGN:{
 	ID id = node->nd_vid;
-	int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
+	int idx = body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id);
 
 	debugs("lvar: %s idx: %d\n", rb_id2name(id), idx);
-	COMPILE(ret, "rvalue", node->nd_value);
+	CHECK(COMPILE(ret, "rvalue", node->nd_value));
 
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
+	if (!popped) {
+	    ADD_INSN(ret, line, dup);
 	}
-	ADD_INSN1(ret, nd_line(node), setlocal, INT2FIX(idx));
-
+	ADD_SETLOCAL(ret, line, idx, get_lvar_level(iseq));
 	break;
       }
       case NODE_DASGN:
       case NODE_DASGN_CURR:{
 	int idx, lv, ls;
-	COMPILE(ret, "dvalue", node->nd_value);
-	debugp_param("dassn id", rb_str_new2(rb_id2name(node->nd_vid) ? rb_id2name(node->nd_vid) : "*"));
+	ID id = node->nd_vid;
+	CHECK(COMPILE(ret, "dvalue", node->nd_value));
+	debugi("dassn id", rb_id2str(id) ? id : '*');
 
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
+	if (!popped) {
+	    ADD_INSN(ret, line, dup);
 	}
 
-	idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
+	idx = get_dyna_var_idx(iseq, id, &lv, &ls);
 
 	if (idx < 0) {
-	    rb_bug("NODE_DASGN(_CURR): unknown id (%s)", rb_id2name(node->nd_vid));
+	    COMPILE_ERROR(ERROR_ARGS "NODE_DASGN(_CURR): unknown id (%"PRIsVALUE")",
+			  rb_id2str(id));
+	    goto ng;
 	}
-
-	ADD_INSN2(ret, nd_line(node), setdynamic,
-		  INT2FIX(ls - idx), INT2FIX(lv));
+	ADD_SETLOCAL(ret, line, ls - idx, lv);
 	break;
       }
       case NODE_GASGN:{
-	COMPILE(ret, "lvalue", node->nd_value);
+	CHECK(COMPILE(ret, "lvalue", node->nd_value));
 
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
+	if (!popped) {
+	    ADD_INSN(ret, line, dup);
 	}
-	ADD_INSN1(ret, nd_line(node), setglobal,
+	ADD_INSN1(ret, line, setglobal,
 		  ((VALUE)node->nd_entry | 1));
 	break;
       }
-      case NODE_IASGN:
-      case NODE_IASGN2:{
-	COMPILE(ret, "lvalue", node->nd_value);
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
-	}
-	ADD_INSN2(ret, nd_line(node), setinstancevariable,
-		  ID2SYM(node->nd_vid), INT2FIX(iseq->ic_size++));
+      case NODE_IASGN:{
+	CHECK(COMPILE(ret, "lvalue", node->nd_value));
+	if (!popped) {
+	    ADD_INSN(ret, line, dup);
+	}
+	ADD_INSN2(ret, line, setinstancevariable,
+		  ID2SYM(node->nd_vid),
+		  get_ivar_ic_value(iseq,node->nd_vid));
 	break;
       }
       case NODE_CDECL:{
-	COMPILE(ret, "lvalue", node->nd_value);
+        CHECK(COMPILE(ret, "lvalue", node->nd_value));
 
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
-	}
+        if (!popped) {
+            ADD_INSN(ret, line, dup);
+        }
 
 	if (node->nd_vid) {
-	    ADD_INSN1(ret, nd_line(node), putspecialobject,
+	    ADD_INSN1(ret, line, putspecialobject,
 		      INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-	    ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_vid));
+            ADD_INSN1(ret, line, setconstant, ID2SYM(node->nd_vid));
 	}
 	else {
 	    compile_cpath(ret, iseq, node->nd_else);
-	    ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_else->nd_mid));
+            ADD_INSN1(ret, line, setconstant, ID2SYM(node->nd_else->nd_mid));
 	}
 	break;
       }
       case NODE_CVASGN:{
-	COMPILE(ret, "cvasgn val", node->nd_value);
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
+	CHECK(COMPILE(ret, "cvasgn val", node->nd_value));
+	if (!popped) {
+	    ADD_INSN(ret, line, dup);
 	}
-	ADD_INSN1(ret, nd_line(node), setclassvariable,
+	ADD_INSN1(ret, line, setclassvariable,
 		  ID2SYM(node->nd_vid));
 	break;
       }
       case NODE_OP_ASGN1: {
-	DECL_ANCHOR(args);
 	VALUE argc;
-	VALUE flag = 0;
+	unsigned int flag = 0;
+	int asgnflag = 0;
 	ID id = node->nd_mid;
 	int boff = 0;
 
@@ -3801,27 +7342,28 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	 *              nd_mid
 	 */
 
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), putnil);
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
 	}
-	COMPILE(ret, "NODE_OP_ASGN1 recv", node->nd_recv);
+	asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN1 recv", node);
+        CHECK(asgnflag != -1);
 	switch (nd_type(node->nd_args->nd_head)) {
-	  case NODE_ZARRAY:
+	  case NODE_ZLIST:
 	    argc = INT2FIX(0);
 	    break;
 	  case NODE_BLOCK_PASS:
 	    boff = 1;
+            /* fall through */
 	  default:
-	    INIT_ANCHOR(args);
-	    argc = setup_args(iseq, args, node->nd_args->nd_head, &flag);
-	    ADD_SEQ(ret, args);
+	    argc = setup_args(iseq, ret, node->nd_args->nd_head, &flag, NULL);
+	    CHECK(!NIL_P(argc));
 	}
-	ADD_INSN1(ret, nd_line(node), dupn, FIXNUM_INC(argc, 1 + boff));
-	ADD_SEND_R(ret, nd_line(node), ID2SYM(idAREF), argc, Qfalse, LONG2FIX(flag));
+	ADD_INSN1(ret, line, dupn, FIXNUM_INC(argc, 1 + boff));
+        flag |= asgnflag;
+	ADD_SEND_WITH_FLAG(ret, line, idAREF, argc, INT2FIX(flag));
 
-	if (id == 0 || id == 1) {
-	    /* 0: or, 1: and
-	       a[x] ||= y
+	if (id == idOROP || id == idANDOP) {
+	    /* a[x] ||= y  or  a[x] &&= y
 
 	       unless/if a[x]
 	       a[x]= y
@@ -3829,92 +7371,89 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	       nil
 	       end
 	    */
-	    LABEL *label = NEW_LABEL(nd_line(node));
-	    LABEL *lfin = NEW_LABEL(nd_line(node));
+	    LABEL *label = NEW_LABEL(line);
+	    LABEL *lfin = NEW_LABEL(line);
 
-	    ADD_INSN(ret, nd_line(node), dup);
-	    if (id == 0) {
-		/* or */
-		ADD_INSNL(ret, nd_line(node), branchif, label);
+	    ADD_INSN(ret, line, dup);
+	    if (id == idOROP) {
+		ADD_INSNL(ret, line, branchif, label);
 	    }
-	    else {
-		/* and */
-		ADD_INSNL(ret, nd_line(node), branchunless, label);
+	    else { /* idANDOP */
+		ADD_INSNL(ret, line, branchunless, label);
 	    }
-	    ADD_INSN(ret, nd_line(node), pop);
+	    ADD_INSN(ret, line, pop);
 
-	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
-	    if (!poped) {
-		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2+boff));
+	    CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body));
+	    if (!popped) {
+		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
 	    }
-	    if (flag & VM_CALL_ARGS_SPLAT_BIT) {
-		ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
+	    if (flag & VM_CALL_ARGS_SPLAT) {
+		ADD_INSN1(ret, line, newarray, INT2FIX(1));
 		if (boff > 0) {
-		    ADD_INSN1(ret, nd_line(node), dupn, INT2FIX(3));
-		    ADD_INSN(ret, nd_line(node), swap);
-		    ADD_INSN(ret, nd_line(node), pop);
+		    ADD_INSN1(ret, line, dupn, INT2FIX(3));
+		    ADD_INSN(ret, line, swap);
+		    ADD_INSN(ret, line, pop);
 		}
-		ADD_INSN(ret, nd_line(node), concatarray);
+		ADD_INSN(ret, line, concatarray);
 		if (boff > 0) {
-		    ADD_INSN1(ret, nd_line(node), setn, INT2FIX(3));
-		    ADD_INSN(ret, nd_line(node), pop);
-		    ADD_INSN(ret, nd_line(node), pop);
+		    ADD_INSN1(ret, line, setn, INT2FIX(3));
+		    ADD_INSN(ret, line, pop);
+		    ADD_INSN(ret, line, pop);
 		}
-		ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
-			   argc, Qfalse, LONG2FIX(flag));
+		ADD_SEND_WITH_FLAG(ret, line, idASET, argc, INT2FIX(flag));
 	    }
 	    else {
 		if (boff > 0)
-		    ADD_INSN(ret, nd_line(node), swap);
-		ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
-			   FIXNUM_INC(argc, 1), Qfalse, LONG2FIX(flag));
+		    ADD_INSN(ret, line, swap);
+		ADD_SEND_WITH_FLAG(ret, line, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag));
 	    }
-	    ADD_INSN(ret, nd_line(node), pop);
-	    ADD_INSNL(ret, nd_line(node), jump, lfin);
+	    ADD_INSN(ret, line, pop);
+	    ADD_INSNL(ret, line, jump, lfin);
 	    ADD_LABEL(ret, label);
-	    if (!poped) {
-		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2+boff));
+	    if (!popped) {
+		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
 	    }
-	    ADD_INSN1(ret, nd_line(node), adjuststack, FIXNUM_INC(argc, 2+boff));
+	    ADD_INSN1(ret, line, adjuststack, FIXNUM_INC(argc, 2+boff));
 	    ADD_LABEL(ret, lfin);
 	}
 	else {
-	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
-	    ADD_SEND(ret, nd_line(node), ID2SYM(id), INT2FIX(1));
-	    if (!poped) {
-		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2+boff));
+	    CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body));
+	    ADD_SEND(ret, line, id, INT2FIX(1));
+	    if (!popped) {
+		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
 	    }
-	    if (flag & VM_CALL_ARGS_SPLAT_BIT) {
-		ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
+	    if (flag & VM_CALL_ARGS_SPLAT) {
+		ADD_INSN1(ret, line, newarray, INT2FIX(1));
 		if (boff > 0) {
-		    ADD_INSN1(ret, nd_line(node), dupn, INT2FIX(3));
-		    ADD_INSN(ret, nd_line(node), swap);
-		    ADD_INSN(ret, nd_line(node), pop);
+		    ADD_INSN1(ret, line, dupn, INT2FIX(3));
+		    ADD_INSN(ret, line, swap);
+		    ADD_INSN(ret, line, pop);
 		}
-		ADD_INSN(ret, nd_line(node), concatarray);
+		ADD_INSN(ret, line, concatarray);
 		if (boff > 0) {
-		    ADD_INSN1(ret, nd_line(node), setn, INT2FIX(3));
-		    ADD_INSN(ret, nd_line(node), pop);
-		    ADD_INSN(ret, nd_line(node), pop);
+		    ADD_INSN1(ret, line, setn, INT2FIX(3));
+		    ADD_INSN(ret, line, pop);
+		    ADD_INSN(ret, line, pop);
 		}
-		ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
-			   argc, Qfalse, LONG2FIX(flag));
+		ADD_SEND_WITH_FLAG(ret, line, idASET, argc, INT2FIX(flag));
 	    }
 	    else {
 		if (boff > 0)
-		    ADD_INSN(ret, nd_line(node), swap);
-		ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
-			   FIXNUM_INC(argc, 1), Qfalse, LONG2FIX(flag));
+		    ADD_INSN(ret, line, swap);
+		ADD_SEND_WITH_FLAG(ret, line, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag));
 	    }
-	    ADD_INSN(ret, nd_line(node), pop);
+	    ADD_INSN(ret, line, pop);
 	}
 
 	break;
       }
       case NODE_OP_ASGN2:{
 	ID atype = node->nd_next->nd_mid;
-	LABEL *lfin = NEW_LABEL(nd_line(node));
-	LABEL *lcfin = NEW_LABEL(nd_line(node));
+	ID vid = node->nd_next->nd_vid, aid = rb_id_attrset(vid);
+        int asgnflag;
+	LABEL *lfin = NEW_LABEL(line);
+	LABEL *lcfin = NEW_LABEL(line);
+	LABEL *lskip = 0;
 	/*
 	  class C; attr_accessor :c; end
 	  r = C.new
@@ -3957,54 +7496,132 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 
 	*/
 
-	COMPILE(ret, "NODE_OP_ASGN2#recv", node->nd_recv);
-	ADD_INSN(ret, nd_line(node), dup);
-	ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_vid),
-		 INT2FIX(0));
+	asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN2#recv", node);
+        CHECK(asgnflag != -1);
+	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_WITH_FLAG(ret, line, vid, INT2FIX(0), INT2FIX(asgnflag));
 
-	if (atype == 0 || atype == 1) {	/* 0: OR or 1: AND */
-	    ADD_INSN(ret, nd_line(node), dup);
-	    if (atype == 0) {
-		ADD_INSNL(ret, nd_line(node), branchif, lcfin);
+	if (atype == idOROP || atype == idANDOP) {
+	    ADD_INSN(ret, line, dup);
+	    if (atype == idOROP) {
+		ADD_INSNL(ret, line, branchif, lcfin);
 	    }
-	    else {
-		ADD_INSNL(ret, nd_line(node), branchunless, lcfin);
+	    else { /* idANDOP */
+		ADD_INSNL(ret, line, branchunless, lcfin);
 	    }
-	    ADD_INSN(ret, nd_line(node), pop);
-	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
-	    ADD_INSN(ret, nd_line(node), swap);
-	    ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
-	    ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid),
-		     INT2FIX(1));
-	    ADD_INSNL(ret, nd_line(node), jump, lfin);
+	    ADD_INSN(ret, line, pop);
+	    CHECK(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_INSNL(ret, line, jump, lfin);
 
 	    ADD_LABEL(ret, lcfin);
-	    ADD_INSN(ret, nd_line(node), swap);
+	    ADD_INSN(ret, line, swap);
 
 	    ADD_LABEL(ret, lfin);
-	    ADD_INSN(ret, nd_line(node), pop);
-	    if (poped) {
+	    ADD_INSN(ret, line, pop);
+	    if (lskip) {
+		ADD_LABEL(ret, lskip);
+	    }
+	    if (popped) {
 		/* we can apply more optimize */
-		ADD_INSN(ret, nd_line(node), pop);
+		ADD_INSN(ret, line, pop);
+	    }
+	}
+	else {
+	    CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value));
+	    ADD_SEND(ret, line, atype, INT2FIX(1));
+	    if (!popped) {
+		ADD_INSN(ret, line, swap);
+		ADD_INSN1(ret, line, topn, INT2FIX(1));
+	    }
+	    ADD_SEND_WITH_FLAG(ret, line, aid, INT2FIX(1), INT2FIX(asgnflag));
+	    if (lskip && popped) {
+		ADD_LABEL(ret, lskip);
+	    }
+	    ADD_INSN(ret, line, pop);
+	    if (lskip && !popped) {
+		ADD_LABEL(ret, lskip);
+	    }
+	}
+	break;
+      }
+      case NODE_OP_CDECL: {
+	LABEL *lfin = 0;
+	LABEL *lassign = 0;
+	ID mid;
+
+	switch (nd_type(node->nd_head)) {
+	  case NODE_COLON3:
+	    ADD_INSN1(ret, line, putobject, rb_cObject);
+	    break;
+	  case NODE_COLON2:
+	    CHECK(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)));
+	    goto ng;
+	}
+	mid = node->nd_head->nd_mid;
+	/* cref */
+	if (node->nd_aid == idOROP) {
+	    lassign = NEW_LABEL(line);
+	    ADD_INSN(ret, line, dup); /* cref cref */
+	    ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CONST_FROM),
+		      ID2SYM(mid), Qfalse); /* cref bool */
+	    ADD_INSNL(ret, line, branchunless, lassign); /* cref */
+	}
+	ADD_INSN(ret, line, dup); /* cref cref */
+        ADD_INSN1(ret, line, putobject, Qtrue);
+        ADD_INSN1(ret, line, getconstant, ID2SYM(mid)); /* cref obj */
+
+	if (node->nd_aid == idOROP || node->nd_aid == idANDOP) {
+	    lfin = NEW_LABEL(line);
+	    if (!popped) ADD_INSN(ret, line, dup); /* cref [obj] obj */
+	    if (node->nd_aid == idOROP)
+		ADD_INSNL(ret, line, branchif, lfin);
+	    else /* idANDOP */
+		ADD_INSNL(ret, line, branchunless, lfin);
+	    /* cref [obj] */
+	    if (!popped) ADD_INSN(ret, line, pop); /* cref */
+	    if (lassign) ADD_LABEL(ret, lassign);
+	    CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value));
+	    /* cref value */
+	    if (popped)
+		ADD_INSN1(ret, line, topn, INT2FIX(1)); /* cref value cref */
+	    else {
+		ADD_INSN1(ret, line, dupn, INT2FIX(2)); /* cref value cref value */
+		ADD_INSN(ret, line, swap); /* cref value value cref */
 	    }
+	    ADD_INSN1(ret, line, setconstant, ID2SYM(mid)); /* cref [value] */
+	    ADD_LABEL(ret, lfin);			    /* cref [value] */
+	    if (!popped) ADD_INSN(ret, line, swap); /* [value] cref */
+	    ADD_INSN(ret, line, pop); /* [value] */
 	}
 	else {
-	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
-	    ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_mid),
-		     INT2FIX(1));
-	    if (!poped) {
-		ADD_INSN(ret, nd_line(node), swap);
-		ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
+	    CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value));
+	    /* cref obj value */
+	    ADD_CALL(ret, line, node->nd_aid, INT2FIX(1));
+	    /* cref value */
+	    ADD_INSN(ret, line, swap); /* value cref */
+	    if (!popped) {
+		ADD_INSN1(ret, line, topn, INT2FIX(1)); /* value cref value */
+		ADD_INSN(ret, line, swap); /* value value cref */
 	    }
-	    ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid),
-		     INT2FIX(1));
-	    ADD_INSN(ret, nd_line(node), pop);
+	    ADD_INSN1(ret, line, setconstant, ID2SYM(mid));
 	}
 	break;
       }
       case NODE_OP_ASGN_AND:
       case NODE_OP_ASGN_OR:{
-	LABEL *lfin = NEW_LABEL(nd_line(node));
+	LABEL *lfin = NEW_LABEL(line);
 	LABEL *lassign;
 
 	if (nd_type(node) == NODE_OP_ASGN_OR) {
@@ -4014,423 +7631,321 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
 	    lassign = lfinish[1];
 	    if (!lassign) {
-		lassign = NEW_LABEL(nd_line(node));
+		lassign = NEW_LABEL(line);
 	    }
-	    ADD_INSNL(ret, nd_line(node), branchunless, lassign);
+	    ADD_INSNL(ret, line, branchunless, lassign);
 	}
 	else {
-	    lassign = NEW_LABEL(nd_line(node));
+	    lassign = NEW_LABEL(line);
 	}
 
-	COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head);
-	ADD_INSN(ret, nd_line(node), dup);
+	CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head));
+	ADD_INSN(ret, line, dup);
 
 	if (nd_type(node) == NODE_OP_ASGN_AND) {
-	    ADD_INSNL(ret, nd_line(node), branchunless, lfin);
+	    ADD_INSNL(ret, line, branchunless, lfin);
 	}
 	else {
-	    ADD_INSNL(ret, nd_line(node), branchif, lfin);
+	    ADD_INSNL(ret, line, branchif, lfin);
 	}
 
-	ADD_INSN(ret, nd_line(node), pop);
+	ADD_INSN(ret, line, pop);
 	ADD_LABEL(ret, lassign);
-	COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value);
+	CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value));
 	ADD_LABEL(ret, lfin);
 
-	if (poped) {
+	if (popped) {
 	    /* we can apply more optimize */
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_CALL:
-      case NODE_FCALL:
-      case NODE_VCALL:{		/* VCALL: variable or call */
-	/*
-	  call:  obj.method(...)
-	  fcall: func(...)
-	  vcall: func
-	*/
-	DECL_ANCHOR(recv);
-	DECL_ANCHOR(args);
-	ID mid = node->nd_mid;
-	VALUE argc;
-	VALUE flag = 0;
-	VALUE parent_block = iseq->compile_data->current_block;
-	iseq->compile_data->current_block = Qfalse;
-
-	INIT_ANCHOR(recv);
-	INIT_ANCHOR(args);
-#if SUPPORT_JOKE
-	if (nd_type(node) == NODE_VCALL) {
-	    if (mid == idBitblt) {
-		ADD_INSN(ret, nd_line(node), bitblt);
-		break;
-	    }
-	    else if (mid == idAnswer) {
-		ADD_INSN(ret, nd_line(node), answer);
-		break;
-	    }
-	}
-	/* only joke */
-	{
-	    ID goto_id;
-	    ID label_id;
-
-	    CONST_ID(goto_id, "__goto__");
-	    CONST_ID(label_id, "__label__");
-
-	    if (nd_type(node) == NODE_FCALL &&
-		(mid == goto_id || mid == label_id)) {
-		LABEL *label;
-		st_data_t data;
-		st_table *labels_table = iseq->compile_data->labels_table;
-		ID label_name;
-
-		if (!labels_table) {
-		    labels_table = st_init_numtable();
-		    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)) {
-
-		    label_name = SYM2ID(node->nd_args->nd_head->nd_lit);
-		    if (!st_lookup(labels_table, (st_data_t)label_name, &data)) {
-			label = NEW_LABEL(nd_line(node));
-			label->position = nd_line(node);
-			st_insert(labels_table, (st_data_t)label_name, (st_data_t)label);
-		    }
-		    else {
-			label = (LABEL *)data;
-		    }
-		}
-		else {
-		    COMPILE_ERROR((ERROR_ARGS "invalid goto/label format"));
-		}
-
-
-		if (mid == goto_id) {
-		    ADD_INSNL(ret, nd_line(node), jump, label);
-		}
-		else {
-		    ADD_LABEL(ret, label);
-		}
-		break;
-	    }
-	}
-#endif
-	/* receiver */
-	if (type == NODE_CALL) {
-	    COMPILE(recv, "recv", node->nd_recv);
-	}
-	else if (type == NODE_FCALL || type == NODE_VCALL) {
-	    ADD_CALL_RECEIVER(recv, nd_line(node));
-	}
-
-	/* args */
-	if (nd_type(node) != NODE_VCALL) {
-	    argc = setup_args(iseq, args, node->nd_args, &flag);
-	}
-	else {
-	    argc = INT2FIX(0);
-	}
-
-	ADD_SEQ(ret, recv);
-	ADD_SEQ(ret, args);
-
-	debugp_param("call args argc", argc);
-	debugp_param("call method", ID2SYM(mid));
-
-	switch (nd_type(node)) {
-	  case NODE_VCALL:
-	    flag |= VM_CALL_VCALL_BIT;
-	    /* VCALL is funcall, so fall through */
-	  case NODE_FCALL:
-	    flag |= VM_CALL_FCALL_BIT;
-	}
-
-	ADD_SEND_R(ret, nd_line(node), ID2SYM(mid),
-		   argc, parent_block, LONG2FIX(flag));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
+      case NODE_CALL:   /* obj.foo */
+      case NODE_OPCALL: /* foo[] */
+        if (compile_call_precheck_freeze(iseq, ret, node, line, popped) == TRUE) {
+            break;
+        }
+      case NODE_QCALL: /* obj&.foo */
+      case NODE_FCALL: /* foo() */
+      case NODE_VCALL: /* foo (variable or call) */
+        if (compile_call(iseq, ret, node, type, line, popped) == COMPILE_NG) {
+            goto ng;
+        }
+        break;
       case NODE_SUPER:
       case NODE_ZSUPER:{
 	DECL_ANCHOR(args);
-	VALUE argc;
-	VALUE flag = 0;
-	VALUE parent_block = iseq->compile_data->current_block;
+	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;
 
 	INIT_ANCHOR(args);
-	iseq->compile_data->current_block = Qfalse;
-	if (nd_type(node) == NODE_SUPER) {
-	    argc = setup_args(iseq, args, node->nd_args, &flag);
+	ISEQ_COMPILE_DATA(iseq)->current_block = NULL;
+	if (type == NODE_SUPER) {
+	    VALUE vargc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
+	    CHECK(!NIL_P(vargc));
+	    argc = FIX2INT(vargc);
 	}
 	else {
 	    /* NODE_ZSUPER */
 	    int i;
-	    rb_iseq_t *liseq = iseq->local_iseq;
+	    const rb_iseq_t *liseq = body->local_iseq;
+	    const struct rb_iseq_constant_body *const local_body = liseq->body;
+	    const struct rb_iseq_param_keyword *const local_kwd = local_body->param.keyword;
+	    int lvar_level = get_lvar_level(iseq);
 
-	    argc = INT2FIX(liseq->argc);
+	    argc = local_body->param.lead_num;
 
 	    /* normal arguments */
-	    for (i = 0; i < liseq->argc; i++) {
-		int idx = liseq->local_size - i;
-		ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
+	    for (i = 0; i < local_body->param.lead_num; i++) {
+		int idx = local_body->local_table_size - i;
+		ADD_GETLOCAL(args, line, idx, lvar_level);
 	    }
 
-	    if (!liseq->arg_simple) {
-		if (liseq->arg_opts) {
-		    /* optional arguments */
-		    int j;
-		    for (j = 0; j < liseq->arg_opts - 1; j++) {
-			int idx = liseq->local_size - (i + j);
-			ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
-		    }
-		    i += j;
-		    argc = INT2FIX(i);
+	    if (local_body->param.flags.has_opt) {
+		/* optional arguments */
+		int j;
+		for (j = 0; j < local_body->param.opt_num; j++) {
+		    int idx = local_body->local_table_size - (i + j);
+		    ADD_GETLOCAL(args, line, idx, lvar_level);
 		}
+		i += j;
+		argc = i;
+	    }
+	    if (local_body->param.flags.has_rest) {
+		/* rest argument */
+		int idx = local_body->local_table_size - local_body->param.rest_start;
 
-		if (liseq->arg_rest != -1) {
-		    /* rest argument */
-		    int idx = liseq->local_size - liseq->arg_rest;
-		    ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
-		    argc = INT2FIX(liseq->arg_rest + 1);
-		    flag |= VM_CALL_ARGS_SPLAT_BIT;
-		}
+		ADD_GETLOCAL(args, line, idx, lvar_level);
+		ADD_INSN1(args, line, splatarray, Qfalse);
 
-		if (liseq->arg_post_len) {
-		    /* post arguments */
-		    int post_len = liseq->arg_post_len;
-		    int post_start = liseq->arg_post_start;
+		argc = local_body->param.rest_start + 1;
+		flag |= VM_CALL_ARGS_SPLAT;
+	    }
+	    if (local_body->param.flags.has_post) {
+		/* post arguments */
+		int post_len = local_body->param.post_num;
+		int post_start = local_body->param.post_start;
 
-		    if (liseq->arg_rest != -1) {
-			int j;
-			for (j=0; j<post_len; j++) {
-			    int idx = liseq->local_size - (post_start + j);
-			    ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
-			}
-			ADD_INSN1(args, nd_line(node), newarray, INT2FIX(j));
-			ADD_INSN (args, nd_line(node), concatarray);
-			/* argc is setteled at above */
+		if (local_body->param.flags.has_rest) {
+		    int j;
+		    for (j=0; j<post_len; j++) {
+			int idx = local_body->local_table_size - (post_start + j);
+			ADD_GETLOCAL(args, line, idx, lvar_level);
 		    }
-		    else {
-			int j;
-			for (j=0; j<post_len; j++) {
-			    int idx = liseq->local_size - (post_start + j);
-			    ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
-			}
-			argc = INT2FIX(post_len + post_start);
+		    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 = local_body->local_table_size - (post_start + j);
+			ADD_GETLOCAL(args, line, idx, lvar_level);
 		    }
+		    argc = post_len + post_start;
 		}
 	    }
+
+	    if (local_body->param.flags.has_kw) { /* TODO: support keywords */
+		int local_size = local_body->local_table_size;
+		argc++;
+
+		ADD_INSN1(args, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+
+		if (local_body->param.flags.has_kwrest) {
+		    int idx = local_body->local_table_size - local_kwd->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 < local_kwd->num; ++i) {
+		    ID id = local_kwd->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 (local_body->param.flags.has_rest) {
+		    ADD_INSN1(args, line, newarray, INT2FIX(1));
+		    ADD_INSN (args, line, concatarray);
+		    --argc;
+		}
+		flag |= VM_CALL_KW_SPLAT;
+	    }
+	    else if (local_body->param.flags.has_kwrest) {
+		int idx = local_body->local_table_size - local_kwd->rest_start;
+		ADD_GETLOCAL(args, line, idx, lvar_level);
+
+		ADD_SEND (args, line, rb_intern("dup"), INT2FIX(0));
+		if (local_body->param.flags.has_rest) {
+		    ADD_INSN1(args, line, newarray, INT2FIX(1));
+		    ADD_INSN (args, line, concatarray);
+		}
+		else {
+		    argc++;
+		}
+		flag |= VM_CALL_KW_SPLAT;
+	    }
 	}
 
-	/* dummy receiver */
-	ADD_INSN1(ret, nd_line(node), putobject,
-		  nd_type(node) == NODE_ZSUPER ? Qfalse : Qtrue);
+	ADD_INSN(ret, line, putself);
 	ADD_SEQ(ret, args);
-	ADD_INSN3(ret, nd_line(node), invokesuper,
-		  argc, parent_block, LONG2FIX(flag));
+        ADD_INSN2(ret, line, invokesuper,
+                  new_callinfo(iseq, 0, argc, flag | VM_CALL_SUPER | (type == NODE_ZSUPER ? VM_CALL_ZSUPER : 0) | VM_CALL_FCALL, keywords, parent_block != NULL),
+		  parent_block);
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
-      case NODE_ARRAY:{
-	compile_array_(iseq, ret, node, Qtrue, poped);
+      case NODE_LIST:{
+        CHECK(compile_array(iseq, ret, node, popped) >= 0);
 	break;
       }
-      case NODE_ZARRAY:{
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(0));
+      case NODE_ZLIST:{
+	if (!popped) {
+	    ADD_INSN1(ret, line, newarray, INT2FIX(0));
 	}
 	break;
       }
       case NODE_VALUES:{
-	NODE *n = node;
+	const NODE *n = node;
+	if (popped) {
+	    COMPILE_ERROR(ERROR_ARGS "NODE_VALUES: must not be popped");
+	}
 	while (n) {
-	    COMPILE(ret, "values item", n->nd_head);
+	    CHECK(COMPILE(ret, "values item", n->nd_head));
 	    n = n->nd_next;
 	}
-	ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(node->nd_alen));
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
+	ADD_INSN1(ret, line, newarray, INT2FIX(node->nd_alen));
 	break;
       }
-      case NODE_HASH:{
-	DECL_ANCHOR(list);
-	VALUE size = 0;
-	int type = node->nd_head ? nd_type(node->nd_head) : NODE_ZARRAY;
-
-	INIT_ANCHOR(list);
-	switch (type) {
-	  case NODE_ARRAY:{
-	    compile_array(iseq, list, node->nd_head, Qfalse);
-	    size = OPERAND_AT(POP_ELEMENT(list), 0);
-	    ADD_SEQ(ret, list);
-	    break;
-	  }
-	  case NODE_ZARRAY:
-	    size = INT2FIX(0);
-	    break;
-
-	  default:
-	    rb_bug("can't make hash with this node: %s", ruby_node_name(type));
-	}
-
-	ADD_INSN1(ret, nd_line(node), newhash, size);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
+      case NODE_HASH:
+        CHECK(compile_hash(iseq, ret, node, popped) >= 0);
+        break;
+      case NODE_RETURN:
+	CHECK(compile_return(iseq, ret, node, popped));
 	break;
-      }
-      case NODE_RETURN:{
-	rb_iseq_t *is = iseq;
-
-	if (is) {
-	    if (is->type == ISEQ_TYPE_TOP) {
-		COMPILE_ERROR((ERROR_ARGS "Invalid return"));
-	    }
-	    else {
-		LABEL *splabel = 0;
-
-		if (is->type == ISEQ_TYPE_METHOD) {
-		    splabel = NEW_LABEL(0);
-		    ADD_LABEL(ret, splabel);
-		    ADD_ADJUST(ret, nd_line(node), 0);
-		}
-
-		COMPILE(ret, "return nd_stts (return val)", node->nd_stts);
-
-		if (is->type == ISEQ_TYPE_METHOD) {
-		    add_ensure_iseq(ret, iseq, 1);
-		    ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN);
-		    ADD_INSN(ret, nd_line(node), leave);
-		    ADD_ADJUST_RESTORE(ret, splabel);
-
-		    if (!poped) {
-			ADD_INSN(ret, nd_line(node), putnil);
-		    }
-		}
-		else {
-		    ADD_INSN1(ret, nd_line(node), throw, INT2FIX(0x01) /* TAG_RETURN */ );
-		    if (poped) {
-			ADD_INSN(ret, nd_line(node), pop);
-		    }
-		}
-	    }
-	}
-	break;
-      }
       case NODE_YIELD:{
 	DECL_ANCHOR(args);
 	VALUE argc;
-	VALUE flag = 0;
+	unsigned int flag = 0;
+	struct rb_call_info_kw_arg *keywords = NULL;
 
 	INIT_ANCHOR(args);
-	if (iseq->type == ISEQ_TYPE_TOP) {
-	    COMPILE_ERROR((ERROR_ARGS "Invalid yield"));
-	}
+
+        if (check_yield_place(iseq, line) == FALSE) {
+	    COMPILE_ERROR(ERROR_ARGS "Invalid yield");
+            goto ng;
+        }
 
 	if (node->nd_head) {
-	    argc = setup_args(iseq, args, node->nd_head, &flag);
+	    argc = setup_args(iseq, args, node->nd_head, &flag, &keywords);
+	    CHECK(!NIL_P(argc));
 	}
 	else {
 	    argc = INT2FIX(0);
 	}
 
 	ADD_SEQ(ret, args);
-	ADD_INSN2(ret, nd_line(node), invokeblock, argc, LONG2FIX(flag));
+	ADD_INSN1(ret, line, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), flag, keywords, FALSE));
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_LVAR:{
-	if (!poped) {
+	if (!popped) {
 	    ID id = node->nd_vid;
-	    int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
+	    int idx = body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id);
 
 	    debugs("id: %s idx: %d\n", rb_id2name(id), idx);
-	    ADD_INSN1(ret, nd_line(node), getlocal, INT2FIX(idx));
+	    ADD_GETLOCAL(ret, line, idx, get_lvar_level(iseq));
 	}
 	break;
       }
       case NODE_DVAR:{
 	int lv, idx, ls;
 	debugi("nd_vid", node->nd_vid);
-	if (!poped) {
+	if (!popped) {
 	    idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
 	    if (idx < 0) {
-		rb_bug("unknown dvar (%s)", rb_id2name(node->nd_vid));
+		COMPILE_ERROR(ERROR_ARGS "unknown dvar (%"PRIsVALUE")",
+			      rb_id2str(node->nd_vid));
+		goto ng;
 	    }
-	    ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(ls - idx), INT2FIX(lv));
+	    ADD_GETLOCAL(ret, line, ls - idx, lv);
 	}
 	break;
       }
       case NODE_GVAR:{
-	ADD_INSN1(ret, nd_line(node), getglobal,
+	ADD_INSN1(ret, line, getglobal,
 		  ((VALUE)node->nd_entry | 1));
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_IVAR:{
 	debugi("nd_vid", node->nd_vid);
-	if (!poped) {
-	    ADD_INSN2(ret, nd_line(node), getinstancevariable,
-		      ID2SYM(node->nd_vid), INT2FIX(iseq->ic_size++));
+	if (!popped) {
+	    ADD_INSN2(ret, line, getinstancevariable,
+		      ID2SYM(node->nd_vid),
+		      get_ivar_ic_value(iseq,node->nd_vid));
 	}
 	break;
       }
       case NODE_CONST:{
 	debugi("nd_vid", node->nd_vid);
 
-	if (iseq->compile_data->option->inline_const_cache) {
-	    LABEL *lend = NEW_LABEL(nd_line(node));
-	    int ic_index = iseq->ic_size++;
+	if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
+	    LABEL *lend = NEW_LABEL(line);
+	    int ic_index = body->is_size++;
 
-	    ADD_INSN2(ret, nd_line(node), getinlinecache, lend, INT2FIX(ic_index));
-	    ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_vid));
-	    ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
+            ADD_INSN2(ret, line, opt_getinlinecache, lend, INT2FIX(ic_index));
+            ADD_INSN1(ret, line, putobject, Qtrue);
+            ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
+            ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index));
 	    ADD_LABEL(ret, lend);
 	}
 	else {
-	    ADD_INSN(ret, nd_line(node), putnil);
-	    ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_vid));
+	    ADD_INSN(ret, line, putnil);
+            ADD_INSN1(ret, line, putobject, Qtrue);
+            ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
 	}
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_CVAR:{
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), getclassvariable,
+	if (!popped) {
+	    ADD_INSN1(ret, line, getclassvariable,
 		      ID2SYM(node->nd_vid));
 	}
 	break;
       }
       case NODE_NTH_REF:{
-        if (!poped) {
-	    ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(1) /* '~'  */,
+        if (!popped) {
+	    if (!node->nd_nth) {
+		ADD_INSN(ret, line, putnil);
+		break;
+	    }
+	    ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~'  */,
 		      INT2FIX(node->nd_nth << 1));
 	}
 	break;
       }
       case NODE_BACK_REF:{
-	if (!poped) {
-	    ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(1) /* '~' */,
+	if (!popped) {
+	    ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~' */,
 		      INT2FIX(0x01 | (node->nd_nth << 1)));
 	}
 	break;
@@ -4443,313 +7958,314 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 
 	INIT_ANCHOR(recv);
 	INIT_ANCHOR(val);
-	switch(nd_type(node)) {
+	switch (nd_type(node)) {
 	  case NODE_MATCH:
-	    ADD_INSN1(recv, nd_line(node), putobject, node->nd_lit);
-	    ADD_INSN2(val, nd_line(node), getspecial, INT2FIX(0),
+	    ADD_INSN1(recv, line, putobject, node->nd_lit);
+	    ADD_INSN2(val, line, getspecial, INT2FIX(0),
 		      INT2FIX(0));
 	    break;
 	  case NODE_MATCH2:
-	    COMPILE(recv, "receiver", node->nd_recv);
-	    COMPILE(val, "value", node->nd_value);
+	    CHECK(COMPILE(recv, "receiver", node->nd_recv));
+	    CHECK(COMPILE(val, "value", node->nd_value));
 	    break;
 	  case NODE_MATCH3:
-	    COMPILE(recv, "receiver", node->nd_value);
-	    COMPILE(val, "value", node->nd_recv);
+	    CHECK(COMPILE(recv, "receiver", node->nd_value));
+	    CHECK(COMPILE(val, "value", node->nd_recv));
 	    break;
 	}
 
-	if (iseq->compile_data->option->specialized_instruction) {
-	    /* TODO: detect by node */
-	    if (recv->last == recv->anchor.next &&
-		INSN_OF(recv->last) == BIN(putobject) &&
-		nd_type(node) == NODE_MATCH2) {
-		ADD_SEQ(ret, val);
-		ADD_INSN1(ret, nd_line(node), opt_regexpmatch1,
-			  OPERAND_AT(recv->last, 0));
-	    }
-	    else {
-		ADD_SEQ(ret, recv);
-		ADD_SEQ(ret, val);
-		ADD_INSN(ret, nd_line(node), opt_regexpmatch2);
-	    }
-	}
-	else {
-	    ADD_SEQ(ret, recv);
-	    ADD_SEQ(ret, val);
-	    ADD_SEND(ret, nd_line(node), ID2SYM(idEqTilde), INT2FIX(1));
+        ADD_SEQ(ret, recv);
+        ADD_SEQ(ret, val);
+        ADD_SEND(ret, line, idEqTilde, INT2FIX(1));
+
+	if (node->nd_args) {
+	    compile_named_capture_assign(iseq, ret, node->nd_args);
 	}
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_LIT:{
 	debugp_param("lit", node->nd_lit);
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
+	if (!popped) {
+	    ADD_INSN1(ret, line, putobject, node->nd_lit);
 	}
 	break;
       }
       case NODE_STR:{
 	debugp_param("nd_lit", node->nd_lit);
-	if (!poped) {
-	    OBJ_FREEZE(node->nd_lit);
-	    ADD_INSN1(ret, nd_line(node), putstring, node->nd_lit);
+	if (!popped) {
+	    VALUE lit = node->nd_lit;
+	    if (!ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
+		lit = rb_fstring(lit);
+		ADD_INSN1(ret, line, putstring, lit);
+                RB_OBJ_WRITTEN(iseq, Qundef, lit);
+	    }
+	    else {
+		if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
+		    VALUE debug_info = rb_ary_new_from_args(2, rb_iseq_path(iseq), INT2FIX(line));
+		    lit = rb_str_dup(lit);
+		    rb_ivar_set(lit, id_debug_created_info, rb_obj_freeze(debug_info));
+		    lit = rb_str_freeze(lit);
+		}
+		else {
+		    lit = rb_fstring(lit);
+		}
+		ADD_INSN1(ret, line, putobject, lit);
+                RB_OBJ_WRITTEN(iseq, Qundef, lit);
+	    }
 	}
 	break;
       }
       case NODE_DSTR:{
 	compile_dstr(iseq, ret, node);
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    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, rb_iseq_path(iseq), INT2FIX(line));
+		}
+		ADD_INSN1(ret, line, freezestring, debug_info);
+                if (!NIL_P(debug_info)) {
+                    RB_OBJ_WRITTEN(iseq, Qundef, rb_obj_freeze(debug_info));
+                }
+	    }
 	}
 	break;
       }
       case NODE_XSTR:{
-	OBJ_FREEZE(node->nd_lit);
-	ADD_CALL_RECEIVER(ret, nd_line(node));
-	ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
-	ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
+	ADD_CALL_RECEIVER(ret, line);
+        VALUE str = rb_fstring(node->nd_lit);
+	ADD_INSN1(ret, line, putobject, str);
+        RB_OBJ_WRITTEN(iseq, Qundef, str);
+	ADD_CALL(ret, line, idBackquote, INT2FIX(1));
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_DXSTR:{
-	ADD_CALL_RECEIVER(ret, nd_line(node));
+	ADD_CALL_RECEIVER(ret, line);
 	compile_dstr(iseq, ret, node);
-	ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
+	ADD_CALL(ret, line, idBackquote, INT2FIX(1));
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
-      case NODE_EVSTR:{
-	COMPILE(ret, "nd_body", node->nd_body);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	else {
-	    ADD_INSN(ret, nd_line(node), tostring);
-	}
+      case NODE_EVSTR:
+	CHECK(compile_evstr(iseq, ret, node->nd_body, popped));
 	break;
-      }
       case NODE_DREGX:{
 	compile_dregx(iseq, ret, node);
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
-      case NODE_DREGX_ONCE:{
-	/* TODO: once? */
-	LABEL *lend = NEW_LABEL(nd_line(node));
-	int ic_index = iseq->ic_size++;
+      case NODE_ONCE:{
+	int ic_index = body->is_size++;
+	const rb_iseq_t *block_iseq;
+	block_iseq = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_PLAIN, line);
 
-	ADD_INSN2(ret, nd_line(node), onceinlinecache, lend, INT2FIX(ic_index));
-	ADD_INSN(ret, nd_line(node), pop);
+	ADD_INSN2(ret, line, once, block_iseq, INT2FIX(ic_index));
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)block_iseq);
 
-	compile_dregx(iseq, ret, node);
-
-	ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
-	ADD_LABEL(ret, lend);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_ARGSCAT:{
-	if (poped) {
-	    COMPILE(ret, "argscat head", node->nd_head);
-	    ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
-	    ADD_INSN(ret, nd_line(node), pop);
-	    COMPILE(ret, "argscat body", node->nd_body);
-	    ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    CHECK(COMPILE(ret, "argscat head", node->nd_head));
+	    ADD_INSN1(ret, line, splatarray, Qfalse);
+	    ADD_INSN(ret, line, pop);
+	    CHECK(COMPILE(ret, "argscat body", node->nd_body));
+	    ADD_INSN1(ret, line, splatarray, Qfalse);
+	    ADD_INSN(ret, line, pop);
 	}
 	else {
-	    COMPILE(ret, "argscat head", node->nd_head);
-	    COMPILE(ret, "argscat body", node->nd_body);
-	    ADD_INSN(ret, nd_line(node), concatarray);
+	    CHECK(COMPILE(ret, "argscat head", node->nd_head));
+	    CHECK(COMPILE(ret, "argscat body", node->nd_body));
+	    ADD_INSN(ret, line, concatarray);
 	}
 	break;
       }
       case NODE_ARGSPUSH:{
-	if (poped) {
-	    COMPILE(ret, "arsgpush head", node->nd_head);
-	    ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
-	    ADD_INSN(ret, nd_line(node), pop);
-	    COMPILE_(ret, "argspush body", node->nd_body, poped);
+	if (popped) {
+	    CHECK(COMPILE(ret, "arsgpush head", node->nd_head));
+	    ADD_INSN1(ret, line, splatarray, Qfalse);
+	    ADD_INSN(ret, line, pop);
+	    CHECK(COMPILE_(ret, "argspush body", node->nd_body, popped));
 	}
 	else {
-	    COMPILE(ret, "arsgpush head", node->nd_head);
-	    COMPILE_(ret, "argspush body", node->nd_body, poped);
-	    ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
-	    ADD_INSN(ret, nd_line(node), concatarray);
+	    CHECK(COMPILE(ret, "arsgpush head", node->nd_head));
+	    CHECK(COMPILE_(ret, "argspush body", node->nd_body, popped));
+	    ADD_INSN1(ret, line, newarray, INT2FIX(1));
+	    ADD_INSN(ret, line, concatarray);
 	}
 	break;
       }
       case NODE_SPLAT:{
-	COMPILE(ret, "splat", node->nd_head);
-	ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
+	CHECK(COMPILE(ret, "splat", node->nd_head));
+	ADD_INSN1(ret, line, splatarray, Qtrue);
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_DEFN:{
-	VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
-				    rb_str_dup(rb_id2str(node->nd_mid)),
-				    ISEQ_TYPE_METHOD, nd_line(node));
-
-	debugp_param("defn/iseq", iseqval);
+        ID mid = node->nd_mid;
+	const rb_iseq_t *method_iseq = NEW_ISEQ(node->nd_defn,
+                                                rb_id2str(mid),
+						ISEQ_TYPE_METHOD, line);
 
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->nd_mid));
-	ADD_INSN1(ret, nd_line(node), putiseq, iseqval);
-	ADD_SEND (ret, nd_line(node), ID2SYM(id_core_define_method), INT2FIX(3));
+	debugp_param("defn/iseq", rb_iseqw_new(method_iseq));
+        ADD_INSN2(ret, line, definemethod, ID2SYM(mid), method_iseq);
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)method_iseq);
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+        if (!popped) {
+            ADD_INSN1(ret, line, putobject, ID2SYM(mid));
 	}
 
-	debugp_param("defn", iseqval);
 	break;
       }
       case NODE_DEFS:{
-	VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
-				    rb_str_dup(rb_id2str(node->nd_mid)),
-				    ISEQ_TYPE_METHOD, nd_line(node));
-
-	debugp_param("defs/iseq", iseqval);
-
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	COMPILE(ret, "defs: recv", node->nd_recv);
-	ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->nd_mid));
-	ADD_INSN1(ret, nd_line(node), putiseq, iseqval);
-	ADD_SEND (ret, nd_line(node), ID2SYM(id_core_define_singleton_method), INT2FIX(3));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
+        ID mid = node->nd_mid;
+        const rb_iseq_t * singleton_method_iseq = NEW_ISEQ(node->nd_defn,
+                                                           rb_id2str(mid),
+                                                           ISEQ_TYPE_METHOD, line);
+
+        debugp_param("defs/iseq", rb_iseqw_new(singleton_method_iseq));
+        CHECK(COMPILE(ret, "defs: recv", node->nd_recv));
+        ADD_INSN2(ret, line, definesmethod, ID2SYM(mid), singleton_method_iseq);
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)singleton_method_iseq);
+
+        if (!popped) {
+            ADD_INSN1(ret, line, putobject, ID2SYM(mid));
+        }
 	break;
       }
       case NODE_ALIAS:{
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	COMPILE(ret, "alias arg1", node->u1.node);
-	COMPILE(ret, "alias arg2", node->u2.node);
-	ADD_SEND(ret, nd_line(node), ID2SYM(id_core_set_method_alias), INT2FIX(3));
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+	CHECK(COMPILE(ret, "alias arg1", node->nd_1st));
+	CHECK(COMPILE(ret, "alias arg2", node->nd_2nd));
+	ADD_SEND(ret, line, id_core_set_method_alias, INT2FIX(3));
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_VALIAS:{
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->u1.id));
-	ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->u2.id));
-	ADD_SEND(ret, nd_line(node), ID2SYM(id_core_set_variable_alias), INT2FIX(2));
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_alias));
+	ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_orig));
+	ADD_SEND(ret, line, id_core_set_variable_alias, INT2FIX(2));
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_UNDEF:{
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	COMPILE(ret, "undef arg", node->u2.node);
-	ADD_SEND(ret, nd_line(node), ID2SYM(id_core_undef_method), INT2FIX(2));
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+	CHECK(COMPILE(ret, "undef arg", node->nd_undef));
+	ADD_SEND(ret, line, id_core_undef_method, INT2FIX(2));
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_CLASS:{
-	VALUE iseqval =
-	    NEW_CHILD_ISEQVAL(
-		node->nd_body,
-		rb_sprintf("<class:%s>", rb_id2name(node->nd_cpath->nd_mid)),
-		ISEQ_TYPE_CLASS, nd_line(node));
-	VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
-	COMPILE(ret, "super", node->nd_super);
-	ADD_INSN3(ret, nd_line(node), defineclass,
-		  ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(noscope ? 3 : 0));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	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);
+	const int flags = VM_DEFINECLASS_TYPE_CLASS |
+	    (node->nd_super ? VM_DEFINECLASS_FLAG_HAS_SUPERCLASS : 0) |
+	    compile_cpath(ret, iseq, node->nd_cpath);
+
+	CHECK(COMPILE(ret, "super", node->nd_super));
+	ADD_INSN3(ret, line, defineclass, ID2SYM(node->nd_cpath->nd_mid), class_iseq, INT2FIX(flags));
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)class_iseq);
+
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_MODULE:{
-	VALUE iseqval = NEW_CHILD_ISEQVAL(
-	    node->nd_body,
-	    rb_sprintf("<module:%s>", rb_id2name(node->nd_cpath->nd_mid)),
-	    ISEQ_TYPE_CLASS, nd_line(node));
-
-	VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
-	ADD_INSN (ret, nd_line(node), putnil); /* dummy */
-	ADD_INSN3(ret, nd_line(node), defineclass,
-		  ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(noscope ? 5 : 2));
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+        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);
+	const int flags = VM_DEFINECLASS_TYPE_MODULE |
+	    compile_cpath(ret, iseq, node->nd_cpath);
+
+	ADD_INSN (ret, line, putnil); /* dummy */
+	ADD_INSN3(ret, line, defineclass, ID2SYM(node->nd_cpath->nd_mid), module_iseq, INT2FIX(flags));
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)module_iseq);
+
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_SCLASS:{
 	ID singletonclass;
-	VALUE iseqval =
-	    NEW_ISEQVAL(node->nd_body, rb_str_new2("singletonclass"),
-			ISEQ_TYPE_CLASS, nd_line(node));
+	const rb_iseq_t *singleton_class = NEW_ISEQ(node->nd_body, rb_fstring_lit("singleton class"),
+						    ISEQ_TYPE_CLASS, line);
 
-	COMPILE(ret, "sclass#recv", node->nd_recv);
-	ADD_INSN (ret, nd_line(node), putnil);
+	CHECK(COMPILE(ret, "sclass#recv", node->nd_recv));
+	ADD_INSN (ret, line, putnil);
 	CONST_ID(singletonclass, "singletonclass");
-	ADD_INSN3(ret, nd_line(node), defineclass,
-		  ID2SYM(singletonclass), iseqval, INT2FIX(1));
+	ADD_INSN3(ret, line, defineclass,
+		  ID2SYM(singletonclass), singleton_class,
+		  INT2FIX(VM_DEFINECLASS_TYPE_SINGLETON_CLASS));
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)singleton_class);
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_COLON2:{
 	if (rb_is_const_id(node->nd_mid)) {
 	    /* constant */
-	    LABEL *lend = NEW_LABEL(nd_line(node));
-	    int ic_index = iseq->ic_size++;
+	    LABEL *lend = NEW_LABEL(line);
+	    int ic_index = body->is_size++;
 
 	    DECL_ANCHOR(pref);
 	    DECL_ANCHOR(body);
 
 	    INIT_ANCHOR(pref);
 	    INIT_ANCHOR(body);
-	    compile_colon2(iseq, node, pref, body);
-	    if (LIST_SIZE_ZERO(pref)) {
-		if (iseq->compile_data->option->inline_const_cache) {
-		    ADD_INSN2(ret, nd_line(node), getinlinecache, lend, INT2FIX(ic_index));
+	    CHECK(compile_const_prefix(iseq, node, pref, body));
+	    if (LIST_INSN_SIZE_ZERO(pref)) {
+		if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
+                    ADD_INSN2(ret, line, opt_getinlinecache, lend, INT2FIX(ic_index));
 		}
 		else {
-		    ADD_INSN(ret, nd_line(node), putnil);
+		    ADD_INSN(ret, line, putnil);
 		}
 
 		ADD_SEQ(ret, body);
 
-		if (iseq->compile_data->option->inline_const_cache) {
-		    ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
+		if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
+                    ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index));
 		    ADD_LABEL(ret, lend);
 		}
 	    }
@@ -4760,278 +8276,297 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	}
 	else {
 	    /* function call */
-	    ADD_CALL_RECEIVER(ret, nd_line(node));
-	    COMPILE(ret, "colon2#nd_head", node->nd_head);
-	    ADD_CALL(ret, nd_line(node), ID2SYM(node->nd_mid),
-		     INT2FIX(1));
+	    ADD_CALL_RECEIVER(ret, line);
+	    CHECK(COMPILE(ret, "colon2#nd_head", node->nd_head));
+	    ADD_CALL(ret, line, node->nd_mid, INT2FIX(1));
 	}
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_COLON3:{
-	LABEL *lend = NEW_LABEL(nd_line(node));
-	int ic_index = iseq->ic_size++;
+	LABEL *lend = NEW_LABEL(line);
+	int ic_index = body->is_size++;
 
-	  debugi("colon3#nd_mid", node->nd_mid);
+	debugi("colon3#nd_mid", node->nd_mid);
 
 	/* add cache insn */
-	if (iseq->compile_data->option->inline_const_cache) {
-	    ADD_INSN2(ret, nd_line(node), getinlinecache, lend, INT2FIX(ic_index));
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
+            ADD_INSN2(ret, line, opt_getinlinecache, lend, INT2FIX(ic_index));
+	    ADD_INSN(ret, line, pop);
 	}
 
-	ADD_INSN1(ret, nd_line(node), putobject, rb_cObject);
-	ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_mid));
+	ADD_INSN1(ret, line, putobject, rb_cObject);
+        ADD_INSN1(ret, line, putobject, Qtrue);
+        ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_mid));
 
-	if (iseq->compile_data->option->inline_const_cache) {
-	    ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
+	if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
+            ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index));
 	    ADD_LABEL(ret, lend);
 	}
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_DOT2:
       case NODE_DOT3:{
-	VALUE flag = type == NODE_DOT2 ? INT2FIX(0) : INT2FIX(1);
-	COMPILE(ret, "min", (NODE *) node->nd_beg);
-	COMPILE(ret, "max", (NODE *) node->nd_end);
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	    ADD_INSN(ret, nd_line(node), pop);
+	int excl = type == NODE_DOT3;
+	VALUE flag = INT2FIX(excl);
+	const NODE *b = node->nd_beg;
+	const 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);
+		ADD_INSN1(ret, line, putobject, val);
+                RB_OBJ_WRITTEN(iseq, Qundef, val);
+	    }
 	}
 	else {
-	    ADD_INSN1(ret, nd_line(node), newrange, flag);
+	    CHECK(COMPILE_(ret, "min", b, popped));
+	    CHECK(COMPILE_(ret, "max", e, popped));
+	    if (!popped) {
+		ADD_INSN1(ret, line, newrange, flag);
+	    }
 	}
 	break;
       }
       case NODE_FLIP2:
       case NODE_FLIP3:{
-	LABEL *lend = NEW_LABEL(nd_line(node));
-	LABEL *lfin = NEW_LABEL(nd_line(node));
-	LABEL *ltrue = NEW_LABEL(nd_line(node));
-	VALUE key = rb_sprintf("flipflag/%s-%p-%d",
-			       RSTRING_PTR(iseq->name), (void *)iseq,
-			       iseq->compile_data->flip_cnt++);
-
-	hide_obj(key);
-	iseq_add_mark_object_compile_time(iseq, key);
-	ADD_INSN2(ret, nd_line(node), getspecial, key, INT2FIX(0));
-	ADD_INSNL(ret, nd_line(node), branchif, lend);
-
-	/* *flip == 0 */
-	COMPILE(ret, "flip2 beg", node->nd_beg);
-	ADD_INSN(ret, nd_line(node), dup);
-	ADD_INSNL(ret, nd_line(node), branchunless, lfin);
-	if (nd_type(node) == NODE_FLIP3) {
-	    ADD_INSN(ret, nd_line(node), dup);
-	    ADD_INSN1(ret, nd_line(node), setspecial, key);
-	    ADD_INSNL(ret, nd_line(node), jump, lfin);
-	}
-	else {
-	    ADD_INSN1(ret, nd_line(node), setspecial, key);
-	}
-
-	/* *flip == 1 */
-	ADD_LABEL(ret, lend);
-	COMPILE(ret, "flip2 end", node->nd_end);
-	ADD_INSNL(ret, nd_line(node), branchunless, ltrue);
-	ADD_INSN1(ret, nd_line(node), putobject, Qfalse);
-	ADD_INSN1(ret, nd_line(node), setspecial, key);
-
+	LABEL *lend = NEW_LABEL(line);
+	LABEL *ltrue = NEW_LABEL(line);
+	LABEL *lfalse = NEW_LABEL(line);
+	CHECK(compile_flip_flop(iseq, ret, node, type == NODE_FLIP2,
+				ltrue, lfalse));
 	ADD_LABEL(ret, ltrue);
-	ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
-
-	ADD_LABEL(ret, lfin);
+	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);
 	break;
       }
       case NODE_SELF:{
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), putself);
+	if (!popped) {
+	    ADD_INSN(ret, line, putself);
 	}
 	break;
       }
       case NODE_NIL:{
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), putnil);
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
 	}
 	break;
       }
       case NODE_TRUE:{
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
+	if (!popped) {
+	    ADD_INSN1(ret, line, putobject, Qtrue);
 	}
 	break;
       }
       case NODE_FALSE:{
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), putobject, Qfalse);
+	if (!popped) {
+	    ADD_INSN1(ret, line, putobject, Qfalse);
 	}
 	break;
       }
       case NODE_ERRINFO:{
-	if (!poped) {
-	    if (iseq->type == ISEQ_TYPE_RESCUE) {
-		ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
+	if (!popped) {
+	    if (body->type == ISEQ_TYPE_RESCUE) {
+		ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
 	    }
 	    else {
-		rb_iseq_t *ip = iseq;
+		const rb_iseq_t *ip = iseq;
 		int level = 0;
 		while (ip) {
-		    if (ip->type == ISEQ_TYPE_RESCUE) {
+		    if (ip->body->type == ISEQ_TYPE_RESCUE) {
 			break;
 		    }
-		    ip = ip->parent_iseq;
+		    ip = ip->body->parent_iseq;
 		    level++;
 		}
 		if (ip) {
-		    ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(level));
+		    ADD_GETLOCAL(ret, line, LVAR_ERRINFO, level);
 		}
 		else {
-		    ADD_INSN(ret, nd_line(node), putnil);
+		    ADD_INSN(ret, line, putnil);
 		}
 	    }
 	}
 	break;
       }
-      case NODE_DEFINED:{
-	if (!poped) {
-	    LABEL *lfinish[2];
-	    lfinish[0] = NEW_LABEL(nd_line(node));
-	    lfinish[1] = 0;
-	    ADD_INSN(ret, nd_line(node), putnil);
-	    defined_expr(iseq, ret, node->nd_head, lfinish, Qtrue);
-	    ADD_INSN(ret, nd_line(node), swap);
-	    ADD_INSN(ret, nd_line(node), pop);
-	    if (lfinish[1]) {
-		ADD_LABEL(ret, lfinish[1]);
-	    }
-	    ADD_LABEL(ret, lfinish[0]);
+      case NODE_DEFINED:
+	if (!popped) {
+	    CHECK(compile_defined_expr(iseq, ret, node, Qtrue));
 	}
 	break;
-      }
       case NODE_POSTEXE:{
-	LABEL *lend = NEW_LABEL(nd_line(node));
-	VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, nd_line(node));
-	int ic_index = iseq->ic_size++;
-
-	ADD_INSN2(ret, nd_line(node), onceinlinecache, lend, INT2FIX(ic_index));
-	ADD_INSN(ret, nd_line(node), pop);
+	/* compiled to:
+	 *   ONCE{ rb_mRubyVMFrozenCore::core#set_postexe{ ... } }
+	 */
+	int is_index = body->is_size++;
+        struct rb_iseq_new_with_callback_callback_func *ifunc =
+            rb_iseq_new_with_callback_new_callback(build_postexe_iseq, node->nd_body);
+	const rb_iseq_t *once_iseq =
+            new_child_iseq_with_callback(iseq, ifunc,
+				 rb_fstring(make_name_for_block(iseq)), iseq, ISEQ_TYPE_BLOCK, line);
 
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, nd_line(node), putiseq, block);
-	ADD_SEND (ret, nd_line(node), ID2SYM(id_core_set_postexe), INT2FIX(1));
+	ADD_INSN2(ret, line, once, once_iseq, INT2FIX(is_index));
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)once_iseq);
 
-	ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
-	ADD_LABEL(ret, lend);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
+      case NODE_KW_ARG:
+	{
+	    LABEL *end_label = NEW_LABEL(nd_line(node));
+	    const NODE *default_value = node->nd_body->nd_value;
+
+            if (default_value == NODE_SPECIAL_REQUIRED_KEYWORD) {
+		/* required argument. do nothing */
+		COMPILE_ERROR(ERROR_ARGS "unreachable");
+		goto ng;
+	    }
+	    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_ERROR(ERROR_ARGS "unreachable");
+		goto ng;
+	    }
+	    else {
+		/* if keywordcheck(_kw_bits, nth_keyword)
+		 *   kw = default_value
+		 * end
+		 */
+		int kw_bits_idx = body->local_table_size - body->param.keyword->bits_start;
+		int keyword_idx = 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);
+		CHECK(COMPILE_POPPED(ret, "keyword default argument", node->nd_body));
+		ADD_LABEL(ret, end_label);
+	    }
+
+	    break;
+	}
       case NODE_DSYM:{
 	compile_dstr(iseq, ret, node);
-	if (!poped) {
-	    ADD_SEND(ret, nd_line(node), ID2SYM(idIntern), INT2FIX(0));
+	if (!popped) {
+	    ADD_INSN(ret, line, intern);
 	}
 	else {
-	    ADD_INSN(ret, nd_line(node), pop);
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_ATTRASGN:{
 	DECL_ANCHOR(recv);
 	DECL_ANCHOR(args);
-	VALUE flag = 0;
+	unsigned int flag = 0;
+	ID mid = node->nd_mid;
 	VALUE argc;
+        LABEL *else_label = NULL;
+        VALUE branches = Qfalse;
+
+	/* optimization shortcut
+	 *   obj["literal"] = value -> opt_aset_with(obj, "literal", value)
+	 */
+	if (mid == idASET && !private_recv_p(node) && node->nd_args &&
+	    nd_type(node->nd_args) == NODE_LIST && 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->frozen_string_literal &&
+	    ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction)
+	{
+	    VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
+	    CHECK(COMPILE(ret, "recv", node->nd_recv));
+	    CHECK(COMPILE(ret, "value", node->nd_args->nd_next->nd_head));
+	    if (!popped) {
+		ADD_INSN(ret, line, swap);
+		ADD_INSN1(ret, line, topn, INT2FIX(1));
+	    }
+            ADD_INSN2(ret, line, opt_aset_with, str,
+                      new_callinfo(iseq, idASET, 2, 0, NULL, FALSE));
+            RB_OBJ_WRITTEN(iseq, Qundef, str);
+	    ADD_INSN(ret, line, pop);
+	    break;
+	}
 
 	INIT_ANCHOR(recv);
 	INIT_ANCHOR(args);
-	argc = setup_args(iseq, args, node->nd_args, &flag);
+	argc = setup_args(iseq, args, node->nd_args, &flag, NULL);
+	CHECK(!NIL_P(argc));
 
-	if (node->nd_recv == (NODE *) 1) {
-	    flag |= VM_CALL_FCALL_BIT;
-	    ADD_INSN(recv, nd_line(node), putself);
-	}
-	else {
-	    COMPILE(recv, "recv", node->nd_recv);
-	}
+        int asgnflag = COMPILE_RECV(recv, "recv", node);
+        CHECK(asgnflag != -1);
+        flag |= (unsigned int)asgnflag;
 
 	debugp_param("argc", argc);
-	debugp_param("nd_mid", ID2SYM(node->nd_mid));
+	debugp_param("nd_mid", ID2SYM(mid));
 
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), putnil);
+	if (!rb_is_attrset_id(mid)) {
+	    /* safe nav attr */
+	    mid = rb_id_attrset(mid);
+            else_label = qcall_branch_start(iseq, recv, &branches, node, line);
+	}
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
 	    ADD_SEQ(ret, recv);
 	    ADD_SEQ(ret, args);
 
-	    if (flag & VM_CALL_ARGS_BLOCKARG_BIT) {
-		ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
-		if (flag & VM_CALL_ARGS_SPLAT_BIT) {
-		    ADD_INSN1(ret, nd_line(node), putobject, INT2FIX(-1));
-		    ADD_SEND(ret, nd_line(node), ID2SYM(idAREF), INT2FIX(1));
+	    if (flag & VM_CALL_ARGS_BLOCKARG) {
+		ADD_INSN1(ret, line, topn, INT2FIX(1));
+		if (flag & VM_CALL_ARGS_SPLAT) {
+		    ADD_INSN1(ret, line, putobject, INT2FIX(-1));
+                    ADD_SEND_WITH_FLAG(ret, line, idAREF, INT2FIX(1), INT2FIX(asgnflag));
 		}
-		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 3));
-		ADD_INSN (ret, nd_line(node), pop);
+		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 3));
+		ADD_INSN (ret, line, pop);
 	    }
-	    else if (flag & VM_CALL_ARGS_SPLAT_BIT) {
-		ADD_INSN(ret, nd_line(node), dup);
-		ADD_INSN1(ret, nd_line(node), putobject, INT2FIX(-1));
-		ADD_SEND(ret, nd_line(node), ID2SYM(idAREF), INT2FIX(1));
-		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2));
-		ADD_INSN (ret, nd_line(node), pop);
+	    else if (flag & VM_CALL_ARGS_SPLAT) {
+		ADD_INSN(ret, line, dup);
+		ADD_INSN1(ret, line, putobject, INT2FIX(-1));
+                ADD_SEND_WITH_FLAG(ret, line, idAREF, INT2FIX(1), INT2FIX(asgnflag));
+		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2));
+		ADD_INSN (ret, line, pop);
 	    }
 	    else {
-		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 1));
+		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 1));
 	    }
 	}
 	else {
 	    ADD_SEQ(ret, recv);
 	    ADD_SEQ(ret, args);
 	}
-	ADD_SEND_R(ret, nd_line(node), ID2SYM(node->nd_mid), argc, 0, LONG2FIX(flag));
-	ADD_INSN(ret, nd_line(node), pop);
+	ADD_SEND_WITH_FLAG(ret, line, mid, argc, INT2FIX(flag));
+        qcall_branch_end(iseq, ret, else_label, branches, node, line);
+	ADD_INSN(ret, line, pop);
 
 	break;
       }
-      case NODE_OPTBLOCK:{
-	/* for optimize */
-	LABEL *redo_label = NEW_LABEL(0);
-	LABEL *next_label = NEW_LABEL(0);
-
-	iseq->compile_data->start_label = next_label;
-	iseq->compile_data->redo_label = redo_label;
-
-	ADD_LABEL(ret, redo_label);
-	COMPILE_(ret, "optblock body", node->nd_head, 1 /* pop */ );
-	ADD_LABEL(ret, next_label);
-	ADD_INSN(ret, 0, opt_checkenv);
-	break;
-      }
-      case NODE_PRELUDE:{
-	COMPILE_POPED(ret, "prelude", node->nd_head);
-	COMPILE_(ret, "body", node->nd_body, poped);
-	break;
-      }
       case NODE_LAMBDA:{
 	/* compile same as lambda{...} */
-	VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, nd_line(node));
+	const rb_iseq_t *block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
 	VALUE argc = INT2FIX(0);
-	ADD_CALL_RECEIVER(ret, nd_line(node));
-	ADD_CALL_WITH_BLOCK(ret, nd_line(node), ID2SYM(idLambda), argc, block);
 
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_CALL_WITH_BLOCK(ret, line, idLambda, argc, block);
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)block);
+
+	if (popped) {
+	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       default:
-	rb_bug("iseq_compile_each: unknown node: %s", ruby_node_name(type));
+	UNKNOWN_NODE("iseq_compile_each", node, COMPILE_NG);
+      ng:
+	debug_node_end();
 	return COMPILE_NG;
     }
 
@@ -5052,19 +8587,32 @@ insn_data_length(INSN *iobj)
 static int
 calc_sp_depth(int depth, INSN *insn)
 {
-    return insn_stack_increase(depth, insn->insn_id, insn->operands);
+    return comptime_insn_stack_increase(depth, insn->insn_id, insn->operands);
 }
 
-static int
-insn_data_line_no(INSN *iobj)
+static VALUE
+opobj_inspect(VALUE obj)
 {
-    return insn_len(iobj->line_no);
+    struct RBasic *r = (struct RBasic *) obj;
+    if (!SPECIAL_CONST_P(r)  && r->klass == 0) {
+	switch (BUILTIN_TYPE(r)) {
+	  case T_STRING:
+	    obj = rb_str_new_cstr(RSTRING_PTR(obj));
+	    break;
+	  case T_ARRAY:
+	    obj = rb_ary_dup(obj);
+	    break;
+	}
+    }
+    return rb_inspect(obj);
 }
 
+
+
 static VALUE
 insn_data_to_s_detail(INSN *iobj)
 {
-    VALUE str = rb_sprintf("%-16s", insn_name(iobj->insn_id));
+    VALUE str = rb_sprintf("%-20s ", insn_name(iobj->insn_id));
 
     if (iobj->operands) {
 	const char *types = insn_op_types(iobj->insn_id);
@@ -5072,13 +8620,12 @@ insn_data_to_s_detail(INSN *iobj)
 
 	for (j = 0; types[j]; j++) {
 	    char type = types[j];
-	    printf("str: %"PRIxVALUE", type: %c\n", str, type);
 
 	    switch (type) {
 	      case TS_OFFSET:	/* label(destination position) */
 		{
 		    LABEL *lobj = (LABEL *)OPERAND_AT(iobj, j);
-		    rb_str_catf(str, "<L%03d>", lobj->label_no);
+		    rb_str_catf(str, LABEL_FORMAT, lobj->label_no);
 		    break;
 		}
 		break;
@@ -5086,33 +8633,62 @@ insn_data_to_s_detail(INSN *iobj)
 		{
 		    rb_iseq_t *iseq = (rb_iseq_t *)OPERAND_AT(iobj, j);
 		    VALUE val = Qnil;
-		    if (iseq) {
-			val = iseq->self;
+		    if (0 && iseq) { /* TODO: invalidate now */
+			val = (VALUE)iseq;
 		    }
-		    rb_str_concat(str, rb_inspect(val));
+		    rb_str_concat(str, opobj_inspect(val));
 		}
 		break;
 	      case TS_LINDEX:
-	      case TS_DINDEX:
 	      case TS_NUM:	/* ulong */
 	      case TS_VALUE:	/* VALUE */
-		rb_str_concat(str, rb_inspect(OPERAND_AT(iobj, j)));
-		break;
+		{
+		    VALUE v = OPERAND_AT(iobj, j);
+		    rb_str_concat(str, opobj_inspect(v));
+		    break;
+		}
 	      case TS_ID:	/* ID */
-		rb_str_concat(str, rb_inspect(OPERAND_AT(iobj, j)));
+		rb_str_concat(str, opobj_inspect(OPERAND_AT(iobj, j)));
 		break;
 	      case TS_GENTRY:
 		{
 		    struct rb_global_entry *entry = (struct rb_global_entry *)
 		      (OPERAND_AT(iobj, j) & (~1));
-		    rb_str_cat2(str, rb_id2name(entry->id));
+		    rb_str_append(str, rb_id2str(entry->id));
+		    break;
 		}
-	      case TS_IC:	/* method cache */
+	      case TS_IC:	/* inline cache */
+	      case TS_IVC:	/* inline ivar cache */
+	      case TS_ISE:	/* inline storage entry */
 		rb_str_catf(str, "<ic:%d>", FIX2INT(OPERAND_AT(iobj, j)));
 		break;
+              case TS_CALLDATA: /* we store these as call infos at compile time */
+		{
+                    const struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(iobj, j);
+                    rb_str_cat2(str, "<calldata:");
+                    if (ci->mid) rb_str_catf(str, "%"PRIsVALUE, rb_id2str(ci->mid));
+                    rb_str_catf(str, ", %d>", ci->orig_argc);
+		    break;
+		}
 	      case TS_CDHASH:	/* case/when condition cache */
 		rb_str_cat2(str, "<ch>");
 		break;
+	      case TS_FUNCPTR:
+		{
+		    void *func = (void *)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;
+              case TS_BUILTIN:
+                rb_bug("unsupported: TS_BUILTIN");
+                break;
 	      default:{
 		rb_raise(rb_eSyntaxError, "unknown operand type: %c", type);
 	      }
@@ -5126,7 +8702,13 @@ insn_data_to_s_detail(INSN *iobj)
 }
 
 static void
-dump_disasm_list(struct iseq_link_element *link)
+dump_disasm_list(const LINK_ELEMENT *link)
+{
+    dump_disasm_list_with_cursor(link, NULL, NULL);
+}
+
+static void
+dump_disasm_list_with_cursor(const LINK_ELEMENT *link, const LINK_ELEMENT *curr, const LABEL *dest)
 {
     int pos = 0;
     INSN *iobj;
@@ -5136,31 +8718,33 @@ dump_disasm_list(struct iseq_link_element *link)
     printf("-- raw disasm--------\n");
 
     while (link) {
+	if (curr) printf(curr == link ? "*" : " ");
 	switch (link->type) {
 	  case ISEQ_ELEMENT_INSN:
 	    {
 		iobj = (INSN *)link;
 		str = insn_data_to_s_detail(iobj);
-		printf("%04d %-65s(%4d)\n", pos, StringValueCStr(str),
-		       insn_data_line_no(iobj));
+		printf("%04d %-65s(%4u)\n", pos, StringValueCStr(str), iobj->insn_info.line_no);
 		pos += insn_data_length(iobj);
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
 	    {
 		lobj = (LABEL *)link;
-		printf("<L%03d>\n", lobj->label_no);
+		printf(LABEL_FORMAT" [sp: %d]%s\n", lobj->label_no, lobj->sp,
+		       dest == lobj ? " <---" : "");
 		break;
 	    }
-	  case ISEQ_ELEMENT_NONE:
+	  case ISEQ_ELEMENT_TRACE:
 	    {
-		printf("[none]\n");
+		TRACE *trace = (TRACE *)link;
+		printf("trace: %0x\n", trace->event);
 		break;
 	    }
 	  case ISEQ_ELEMENT_ADJUST:
 	    {
 		ADJUST *adjust = (ADJUST *)link;
-		printf("adjust: [label: %d]\n", adjust->label->label_no);
+		printf("adjust: [label: %d]\n", adjust->label ? adjust->label->label_no : -1);
 		break;
 	    }
 	  default:
@@ -5170,15 +8754,22 @@ dump_disasm_list(struct iseq_link_element *link)
 	link = link->next;
     }
     printf("---------------------\n");
+    fflush(stdout);
+}
+
+const char *
+rb_insns_name(int i)
+{
+    return insn_name(i);
 }
 
 VALUE
 rb_insns_name_array(void)
 {
-    VALUE ary = rb_ary_new();
+    VALUE ary = rb_ary_new_capa(VM_INSTRUCTION_SIZE);
     int i;
-    for (i = 0; i < numberof(insn_name_info); i++) {
-	rb_ary_push(ary, rb_obj_freeze(rb_str_new2(insn_name_info[i])));
+    for (i = 0; i < VM_INSTRUCTION_SIZE; i++) {
+	rb_ary_push(ary, rb_fstring_cstr(insn_name(i)));
     }
     return rb_obj_freeze(ary);
 }
@@ -5188,7 +8779,7 @@ register_label(rb_iseq_t *iseq, struct st_table *labels_table, VALUE obj)
 {
     LABEL *label = 0;
     st_data_t tmp;
-    obj = rb_convert_type(obj, T_SYMBOL, "Symbol", "to_sym");
+    obj = rb_to_symbol_type(obj);
 
     if (st_lookup(labels_table, obj, &tmp) == 0) {
 	label = NEW_LABEL(0);
@@ -5197,6 +8788,7 @@ register_label(rb_iseq_t *iseq, struct st_table *labels_table, VALUE obj)
     else {
 	label = (LABEL *)tmp;
     }
+    LABEL_REF(label);
     return label;
 }
 
@@ -5205,7 +8797,6 @@ 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;
 
@@ -5224,9 +8815,7 @@ 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;
-    sym_inspect = rb_inspect(sym);
-    rb_raise(rb_eSyntaxError, "invalid exception symbol: %s",
-	     StringValuePtr(sym_inspect));
+    rb_raise(rb_eSyntaxError, "invalid exception symbol: %+"PRIsVALUE, sym);
     return 0;
 }
 
@@ -5237,30 +8826,40 @@ iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table,
     int i;
 
     for (i=0; i<RARRAY_LEN(exception); i++) {
-	VALUE v, type, *ptr, eiseqval;
+	const rb_iseq_t *eiseq;
+	VALUE v, type;
 	LABEL *lstart, *lend, *lcont;
-	int sp;
+	unsigned int sp;
 
-	RB_GC_GUARD(v) = rb_convert_type(RARRAY_PTR(exception)[i], T_ARRAY,
-					 "Array", "to_ary");
+	v = rb_to_array_type(RARRAY_AREF(exception, i));
 	if (RARRAY_LEN(v) != 6) {
 	    rb_raise(rb_eSyntaxError, "wrong exception entry");
 	}
-	ptr  = RARRAY_PTR(v);
-	type = get_exception_sym2type(ptr[0]);
-	if (ptr[1] == Qnil) {
-	    eiseqval = 0;
+        type = get_exception_sym2type(RARRAY_AREF(v, 0));
+        if (RARRAY_AREF(v, 1) == Qnil) {
+	    eiseq = NULL;
 	}
 	else {
-	    eiseqval = rb_iseq_load(ptr[1], iseq->self, Qnil);
+            eiseq = rb_iseqw_to_iseq(rb_iseq_load(RARRAY_AREF(v, 1), (VALUE)iseq, Qnil));
+        }
+
+        lstart = register_label(iseq, labels_table, RARRAY_AREF(v, 2));
+        lend   = register_label(iseq, labels_table, RARRAY_AREF(v, 3));
+        lcont  = register_label(iseq, labels_table, RARRAY_AREF(v, 4));
+        sp     = NUM2UINT(RARRAY_AREF(v, 5));
+
+	/* TODO: Dirty Hack!  Fix me */
+	if (type == CATCH_TYPE_RESCUE ||
+	    type == CATCH_TYPE_BREAK ||
+	    type == CATCH_TYPE_NEXT) {
+	    ++sp;
 	}
 
-	lstart = register_label(iseq, labels_table, ptr[2]);
-	lend   = register_label(iseq, labels_table, ptr[3]);
-	lcont  = register_label(iseq, labels_table, ptr[4]);
-	sp     = NUM2INT(ptr[5]);
+	lcont->sp = sp;
 
-	ADD_CATCH_ENTRY(type, lstart, lend, eiseqval, lcont);
+	ADD_CATCH_ENTRY(type, lstart, lend, eiseq, lcont);
+
+	RB_GC_GUARD(v);
     }
     return COMPILE_OK;
 }
@@ -5270,7 +8869,7 @@ insn_make_insn_table(void)
 {
     struct st_table *table;
     int i;
-    table = st_init_numtable();
+    table = st_init_numtable_with_size(VM_INSTRUCTION_SIZE);
 
     for (i=0; i<VM_INSTRUCTION_SIZE; i++) {
 	st_insert(table, ID2SYM(rb_intern(insn_name(i))), i);
@@ -5279,15 +8878,88 @@ insn_make_insn_table(void)
     return table;
 }
 
+static const rb_iseq_t *
+iseq_build_load_iseq(const rb_iseq_t *iseq, VALUE op)
+{
+    VALUE iseqw;
+    const rb_iseq_t *loaded_iseq;
+
+    if (RB_TYPE_P(op, T_ARRAY)) {
+	iseqw = rb_iseq_load(op, (VALUE)iseq, Qnil);
+    }
+    else if (CLASS_OF(op) == rb_cISeq) {
+	iseqw = op;
+    }
+    else {
+	rb_raise(rb_eSyntaxError, "ISEQ is required");
+    }
+
+    loaded_iseq = rb_iseqw_to_iseq(iseqw);
+    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);
+}
+
+static rb_event_flag_t
+event_name_to_flag(VALUE sym)
+{
+#define CHECK_EVENT(ev) if (sym == ID2SYM(rb_intern(#ev))) return ev;
+		CHECK_EVENT(RUBY_EVENT_LINE);
+		CHECK_EVENT(RUBY_EVENT_CLASS);
+		CHECK_EVENT(RUBY_EVENT_END);
+		CHECK_EVENT(RUBY_EVENT_CALL);
+		CHECK_EVENT(RUBY_EVENT_RETURN);
+		CHECK_EVENT(RUBY_EVENT_B_CALL);
+		CHECK_EVENT(RUBY_EVENT_B_RETURN);
+#undef CHECK_EVENT
+    return RUBY_EVENT_NONE;
+}
+
 static int
-iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
-		VALUE body, struct st_table *labels_table)
+iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
+			 VALUE body, VALUE labels_wrapper)
 {
     /* TODO: body should be frozen */
-    VALUE *ptr = RARRAY_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
      */
@@ -5298,36 +8970,45 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
     }
 
     for (i=0; i<len; i++) {
-	VALUE obj = ptr[i];
+        VALUE obj = RARRAY_AREF(body, i);
 
 	if (SYMBOL_P(obj)) {
-	    LABEL *label = register_label(iseq, labels_table, obj);
-	    ADD_LABEL(anchor, label);
+	    rb_event_flag_t event;
+	    if ((event = event_name_to_flag(obj)) != RUBY_EVENT_NONE) {
+		ADD_TRACE(anchor, event);
+	    }
+	    else {
+		LABEL *label = register_label(iseq, labels_table, obj);
+		ADD_LABEL(anchor, label);
+	    }
 	}
 	else if (FIXNUM_P(obj)) {
 	    line_no = NUM2INT(obj);
 	}
-	else if (TYPE(obj) == T_ARRAY) {
+	else if (RB_TYPE_P(obj, T_ARRAY)) {
 	    VALUE *argv = 0;
 	    int argc = RARRAY_LENINT(obj) - 1;
 	    st_data_t insn_id;
 	    VALUE insn;
 
-	    insn = (argc < 0) ? Qnil : RARRAY_PTR(obj)[0];
+	    insn = (argc < 0) ? Qnil : RARRAY_AREF(obj, 0);
 	    if (st_lookup(insn_table, (st_data_t)insn, &insn_id) == 0) {
 		/* TODO: exception */
-		RB_GC_GUARD(insn) = rb_inspect(insn);
-		rb_compile_error(RSTRING_PTR(iseq->filename), line_no,
-				 "unknown instruction: %s", RSTRING_PTR(insn));
+		COMPILE_ERROR(iseq, line_no,
+			      "unknown instruction: %+"PRIsVALUE, insn);
+		ret = COMPILE_NG;
+		break;
 	    }
 
 	    if (argc != insn_len((VALUE)insn_id)-1) {
-		rb_compile_error(RSTRING_PTR(iseq->filename), line_no,
-				 "operand size mismatch");
+		COMPILE_ERROR(iseq, line_no,
+			      "operand size mismatch");
+		ret = COMPILE_NG;
+		break;
 	    }
 
 	    if (argc > 0) {
-		argv = compile_data_alloc(iseq, sizeof(VALUE) * argc);
+                argv = compile_data_alloc2(iseq, sizeof(VALUE), argc);
 		for (j=0; j<argc; j++) {
 		    VALUE op = rb_ary_entry(obj, j+1);
 		    switch (insn_op_type((VALUE)insn_id, j)) {
@@ -5337,28 +9018,20 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
 			break;
 		      }
 		      case TS_LINDEX:
-		      case TS_DINDEX:
 		      case TS_NUM:
 			(void)NUM2INT(op);
 			argv[j] = op;
 			break;
 		      case TS_VALUE:
 			argv[j] = op;
-			iseq_add_mark_object(iseq, op);
+			RB_OBJ_WRITTEN(iseq, Qundef, op);
 			break;
 		      case TS_ISEQ:
 			{
 			    if (op != Qnil) {
-				if (TYPE(op) == T_ARRAY) {
-				    argv[j] = rb_iseq_load(op, iseq->self, Qnil);
-				}
-				else if (CLASS_OF(op) == rb_cISeq) {
-				    argv[j] = op;
-				}
-				else {
-				    rb_raise(rb_eSyntaxError, "ISEQ is required");
-				}
-				iseq_add_mark_object(iseq, argv[j]);
+				VALUE v = (VALUE)iseq_build_load_iseq(iseq, op);
+				argv[j] = v;
+				RB_OBJ_WRITTEN(iseq, Qundef, v);
 			    }
 			    else {
 				argv[j] = 0;
@@ -5366,31 +9039,52 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
 			}
 			break;
 		      case TS_GENTRY:
-			op = rb_convert_type(op, T_SYMBOL, "Symbol", "to_sym");
+			op = rb_to_symbol_type(op);
 			argv[j] = (VALUE)rb_global_entry(SYM2ID(op));
 			break;
+		      case TS_ISE:
+			FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
+                        /* fall through */
 		      case TS_IC:
+                      case TS_IVC:  /* inline ivar cache */
 			argv[j] = op;
-			if (NUM2INT(op) >= iseq->ic_size)
-			    iseq->ic_size = NUM2INT(op) + 1;
+			if (NUM2UINT(op) >= iseq->body->is_size) {
+			    iseq->body->is_size = NUM2INT(op) + 1;
+			}
+			break;
+                      case TS_CALLDATA:
+			argv[j] = iseq_build_callinfo_from_hash(iseq, op);
 			break;
 		      case TS_ID:
-			argv[j] = rb_convert_type(op, T_SYMBOL,
-						  "Symbol", "to_sym");
+			argv[j] = rb_to_symbol_type(op);
 			break;
 		      case TS_CDHASH:
 			{
 			    int i;
-			    op = rb_convert_type(op, T_ARRAY, "Array", "to_ary");
-			    op = rb_ary_dup(op);
+			    VALUE map = rb_hash_new_with_size(RARRAY_LEN(op)/2);
+
+                            RHASH_TBL_RAW(map)->type = &cdhash_type;
+			    op = rb_to_array_type(op);
 			    for (i=0; i<RARRAY_LEN(op); i+=2) {
-				VALUE sym = rb_ary_entry(op, i+1);
+				VALUE key = RARRAY_AREF(op, i);
+				VALUE sym = RARRAY_AREF(op, i+1);
 				LABEL *label =
 				  register_label(iseq, labels_table, sym);
-				rb_ary_store(op, i+1, (VALUE)label | 1);
+				rb_hash_aset(map, key, (VALUE)label | 1);
 			    }
-			    argv[j] = op;
-			    iseq_add_mark_object_compile_time(iseq, op);
+			    RB_GC_GUARD(op);
+			    argv[j] = map;
+			    RB_OBJ_WRITTEN(iseq, Qundef, 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;
 			}
 			break;
 		      default:
@@ -5406,128 +9100,292 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
 	    rb_raise(rb_eTypeError, "unexpected object for instruction");
 	}
     }
+    DATA_PTR(labels_wrapper) = 0;
     validate_labels(iseq, labels_table);
-    st_free_table(labels_table);
-    iseq_setup(iseq, anchor);
-    return COMPILE_OK;
+    if (!ret) return ret;
+    return iseq_setup(iseq, anchor);
 }
 
-#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;}
+#define CHECK_ARRAY(v)   rb_to_array_type(v)
+#define CHECK_SYMBOL(v)  rb_to_symbol_type(v)
 
-VALUE
-rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
+static int
+int_param(int *dst, VALUE param, VALUE sym)
+{
+    VALUE val = rb_hash_aref(param, sym);
+    if (FIXNUM_P(val)) {
+	*dst = FIX2INT(val);
+	return TRUE;
+    }
+    else if (!NIL_P(val)) {
+	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 = (ID *)&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) {
+	keyword->table = ids;
+	return keyword;
+    }
+    else if (default_len < 0) {
+        UNREACHABLE;
+    }
+
+    dvs = ALLOC_N(VALUE, (unsigned int)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_mark_insn_storage(struct iseq_compile_data_storage *storage)
+{
+    INSN *iobj = 0;
+    size_t size = sizeof(INSN);
+    unsigned int pos = 0;
+
+    while (storage) {
+#ifdef STRICT_ALIGNMENT
+        size_t padding = calc_padding((void *)&storage->buff[pos], size);
+#else
+        const size_t padding = 0; /* expected to be optimized by compiler */
+#endif /* STRICT_ALIGNMENT */
+        size_t offset = pos + size + padding;
+        if (offset > storage->size || offset > storage->pos) {
+            pos = 0;
+            storage = storage->next;
+        }
+        else {
+#ifdef STRICT_ALIGNMENT
+            pos += (int)padding;
+#endif /* STRICT_ALIGNMENT */
+
+            iobj = (INSN *)&storage->buff[pos];
+
+            if (iobj->operands) {
+                int j;
+                const char *types = insn_op_types(iobj->insn_id);
+
+                for (j = 0; types[j]; j++) {
+                    char type = types[j];
+                    switch (type) {
+                      case TS_CDHASH:
+                      case TS_ISEQ:
+                      case TS_VALUE:
+                        {
+                            VALUE op = OPERAND_AT(iobj, j);
+                            if (!SPECIAL_CONST_P(op)) {
+                                rb_gc_mark(op);
+                            }
+                            break;
+                        }
+                      default:
+                        break;
+                    }
+                }
+            }
+            pos += (int)size;
+        }
+    }
+}
+
+void
+rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
 			 VALUE exception, VALUE body)
 {
-    int i;
+#define SYM(s) ID2SYM(rb_intern(#s))
+    int i, len;
+    unsigned int arg_size, local_size, stack_max;
     ID *tbl;
     struct st_table *labels_table = st_init_numtable();
+    VALUE labels_wrapper = Data_Wrap_Struct(0, rb_mark_set, 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);
 
-    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;
+    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;
 
-    for (i=0; i<RARRAY_LEN(locals); i++) {
-	VALUE lv = RARRAY_PTR(locals)[i];
-	tbl[i] = FIXNUM_P(lv) ? (ID)FIX2LONG(lv) : SYM2ID(CHECK_SYMBOL(lv));
-    }
+    for (i = 0; i < len; i++) {
+	VALUE lv = RARRAY_AREF(locals, i);
 
-    /* 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;
+	if (sym_arg_rest == lv) {
+	    tbl[i] = 0;
 	}
 	else {
-	    iseq->arg_size = iseq->argc + (iseq->arg_opts ? iseq->arg_opts - 1 : 0);
+	    tbl[i] = FIXNUM_P(lv) ? (ID)FIX2LONG(lv) : SYM2ID(CHECK_SYMBOL(lv));
 	}
+    }
 
-	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));
+#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
+    {
+#define INT_PARAM(F) F = (int_param(&x, misc, SYM(F)) ? (unsigned int)x : 0)
+	int x;
+	INT_PARAM(arg_size);
+	INT_PARAM(local_size);
+	INT_PARAM(stack_max);
+#undef INT_PARAM
+    }
+
+    if (RB_TYPE_P(arg_opt_labels, 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;
 	}
+    }
+    else if (!NIL_P(arg_opt_labels)) {
+	rb_raise(rb_eTypeError, ":opt param is not an array: %+"PRIsVALUE,
+		 arg_opt_labels);
+    }
+
+    if (RB_TYPE_P(keywords, T_ARRAY)) {
+	iseq->body->param.keyword = iseq_build_kw(iseq, params, keywords);
+    }
+    else if (!NIL_P(keywords)) {
+	rb_raise(rb_eTypeError, ":keywords param is not an array: %+"PRIsVALUE,
+		 keywords);
+    }
 
-	iseq->arg_simple = NUM2INT(arg_simple);
+    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;
+    }
+#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_table);
-    return iseq->self;
+    iseq_build_from_ary_body(iseq, anchor, body, labels_wrapper);
+
+    iseq->body->param.size = arg_size;
+    iseq->body->local_table_size = local_size;
+    iseq->body->stack_max = stack_max;
 }
 
 /* for parser */
 
 int
-rb_dvar_defined(ID id)
+rb_dvar_defined(ID id, const rb_iseq_t *iseq)
 {
-    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
+    if (iseq) {
+	const struct rb_iseq_constant_body *body = iseq->body;
+	while (body->type == ISEQ_TYPE_BLOCK ||
+	       body->type == ISEQ_TYPE_RESCUE ||
+	       body->type == ISEQ_TYPE_ENSURE ||
+	       body->type == ISEQ_TYPE_EVAL ||
+	       body->type == ISEQ_TYPE_MAIN
 	       ) {
-	    int i;
+	    unsigned int i;
 
-	    for (i = 0; i < iseq->local_table_size; i++) {
-		if (iseq->local_table[i] == id) {
+	    for (i = 0; i < body->local_table_size; i++) {
+		if (body->local_table[i] == id) {
 		    return 1;
 		}
 	    }
-	    iseq = iseq->parent_iseq;
+	    iseq = body->parent_iseq;
+	    body = iseq->body;
 	}
     }
     return 0;
 }
 
 int
-rb_local_defined(ID id)
+rb_local_defined(ID id, const rb_iseq_t *iseq)
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_iseq_t *iseq;
-
-    if (th->base_block && th->base_block->iseq) {
-	int i;
-	iseq = th->base_block->iseq->local_iseq;
+    if (iseq) {
+	unsigned int i;
+	const struct rb_iseq_constant_body *const body = iseq->body->local_iseq->body;
 
-	for (i=0; i<iseq->local_table_size; i++) {
-	    if (iseq->local_table[i] == id) {
+	for (i=0; i<body->local_table_size; i++) {
+	    if (body->local_table[i] == id) {
 		return 1;
 	    }
 	}
@@ -5535,14 +9393,2248 @@ rb_local_defined(ID id)
     return 0;
 }
 
-int
-rb_parse_in_eval(void)
+static int
+caller_location(VALUE *path, VALUE *realpath)
 {
-    return GET_THREAD()->parse_in_eval > 0;
+    const rb_execution_context_t *ec = GET_EC();
+    const rb_control_frame_t *const cfp =
+        rb_vm_get_ruby_level_next_cfp(ec, ec->cfp);
+
+    if (cfp) {
+	int line = rb_vm_get_sourceline(cfp);
+	*path = rb_iseq_path(cfp->iseq);
+	*realpath = rb_iseq_realpath(cfp->iseq);
+	return line;
+    }
+    else {
+	*path = rb_fstring_lit("<compiled>");
+	*realpath = *path;
+	return 1;
+    }
 }
 
-int
-rb_parse_in_main(void)
+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,
+                void (*build)(rb_iseq_t *, LINK_ANCHOR *, const void *))
+{
+    VALUE path, realpath;
+    accessor_args acc;
+
+    acc.arg = arg;
+    acc.func = func;
+    acc.line = caller_location(&path, &realpath);
+    struct rb_iseq_new_with_callback_callback_func *ifunc =
+        rb_iseq_new_with_callback_new_callback(build, &acc);
+    return rb_iseq_new_with_callback(ifunc,
+			     rb_sym2str(name), path, realpath,
+			     INT2FIX(acc.line), 0, ISEQ_TYPE_METHOD, 0);
+}
+
+static void
+for_self_aref(rb_iseq_t *iseq, LINK_ANCHOR *ret, const void *a)
+{
+    const accessor_args *const args = (void *)a;
+    const int line = args->line;
+    struct rb_iseq_constant_body *const body = iseq->body;
+
+    iseq_set_local_table(iseq, 0);
+    body->param.lead_num = 0;
+    body->param.size = 0;
+
+    ADD_INSN1(ret, line, putobject, args->arg);
+    ADD_INSN1(ret, line, opt_call_c_function, (VALUE)args->func);
+}
+
+static void
+for_self_aset(rb_iseq_t *iseq, LINK_ANCHOR *ret, const void *a)
+{
+    const accessor_args *const args = (void *)a;
+    const int line = args->line;
+    struct rb_iseq_constant_body *const body = iseq->body;
+    static const ID vars[] = {1, idUScore};
+
+    iseq_set_local_table(iseq, vars);
+    body->param.lead_num = 1;
+    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);
+}
+
+/*
+ * 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)
+{
+    return method_for_self(name, arg, func, for_self_aset);
+}
+
+/* ISeq binary format */
+
+#ifndef IBF_ISEQ_DEBUG
+#define IBF_ISEQ_DEBUG 0
+#endif
+
+#ifndef IBF_ISEQ_ENABLE_LOCAL_BUFFER
+#define IBF_ISEQ_ENABLE_LOCAL_BUFFER 0
+#endif
+
+typedef unsigned int ibf_offset_t;
+#define IBF_OFFSET(ptr) ((ibf_offset_t)(VALUE)(ptr))
+
+#define IBF_MAJOR_VERSION ISEQ_MAJOR_VERSION
+#if RUBY_DEVEL
+#define IBF_DEVEL_VERSION 2
+#define IBF_MINOR_VERSION (ISEQ_MINOR_VERSION * 10000 + IBF_DEVEL_VERSION)
+#else
+#define IBF_MINOR_VERSION ISEQ_MINOR_VERSION
+#endif
+
+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 global_object_list_size;
+    ibf_offset_t iseq_list_offset;
+    ibf_offset_t global_object_list_offset;
+};
+
+struct ibf_dump_buffer {
+    VALUE str;
+    VALUE obj_list;     /* [objs] */
+};
+
+struct ibf_dump {
+    VALUE iseq_list;      /* [iseqs] */
+    st_table *iseq_table; /* iseq -> iseq number */
+    struct ibf_dump_buffer global_buffer;
+    struct ibf_dump_buffer *current_buffer;
+};
+
+rb_iseq_t * iseq_alloc(void);
+
+struct ibf_load_buffer {
+    const char *buff;
+    ibf_offset_t size;
+
+    VALUE obj_list; /* [obj0, ...] */
+    unsigned int obj_list_size;
+    ibf_offset_t obj_list_offset;
+};
+
+struct ibf_load {
+    const struct ibf_header *header;
+    VALUE iseq_list;       /* [iseq0, ...] */
+    struct ibf_load_buffer global_buffer;
+    VALUE loader_obj;
+    rb_iseq_t *iseq;
+    VALUE str;
+    struct ibf_load_buffer *current_buffer;
+};
+
+static ibf_offset_t
+ibf_dump_pos(struct ibf_dump *dump)
+{
+    long pos = RSTRING_LEN(dump->current_buffer->str);
+#if SIZEOF_LONG > SIZEOF_INT
+    if (pos >= UINT_MAX) {
+        rb_raise(rb_eRuntimeError, "dump size exceeds");
+    }
+#endif
+    return (unsigned int)pos;
+}
+
+static void
+ibf_dump_align(struct ibf_dump *dump, size_t align)
+{
+    ibf_offset_t pos = ibf_dump_pos(dump);
+    if (pos % align) {
+        static const char padding[sizeof(VALUE)];
+        size_t size = align - ((size_t)pos % align);
+#if SIZEOF_LONG > SIZEOF_INT
+        if (pos + size >= UINT_MAX) {
+            rb_raise(rb_eRuntimeError, "dump size exceeds");
+        }
+#endif
+        for (; size > sizeof(padding); size -= sizeof(padding)) {
+            rb_str_cat(dump->current_buffer->str, padding, sizeof(padding));
+        }
+        rb_str_cat(dump->current_buffer->str, padding, size);
+    }
+}
+
+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->current_buffer->str, (const char *)buff, size);
+    /* TODO: overflow check */
+    return pos;
+}
+
+static ibf_offset_t
+ibf_dump_write_byte(struct ibf_dump *dump, unsigned char byte)
+{
+    return ibf_dump_write(dump, &byte, sizeof(unsigned char));
+}
+
+static void
+ibf_dump_overwrite(struct ibf_dump *dump, void *buff, unsigned int size, long offset)
+{
+    VALUE str = dump->current_buffer->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 const void *
+ibf_load_ptr(const struct ibf_load *load, ibf_offset_t *offset, int size)
+{
+    ibf_offset_t beg = *offset;
+    *offset += size;
+    return load->current_buffer->buff + beg;
+}
+
+static void *
+ibf_load_alloc(const struct ibf_load *load, ibf_offset_t offset, size_t x, size_t y)
+{
+    void *buff = ruby_xmalloc2(x, y);
+    size_t size = x * y;
+    memcpy(buff, load->current_buffer->buff + offset, size);
+    return buff;
+}
+
+#define IBF_W_ALIGN(type) (RUBY_ALIGNOF(type) > 1 ? ibf_dump_align(dump, RUBY_ALIGNOF(type)) : (void)0)
+
+#define IBF_W(b, type, n) (IBF_W_ALIGN(type), (type *)(VALUE)IBF_WP(b, 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))
+#define IBF_ZERO(variable) memset(&(variable), 0, sizeof(variable))
+
+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 void ibf_dump_object_list(struct ibf_dump *dump, ibf_offset_t *obj_list_offset, unsigned int *obj_list_size);
+
+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_list_new(void)
+{
+    VALUE obj_list = rb_ary_tmp_new(1);
+    rb_ary_push(obj_list, Qnil); /* 0th is nil */
+
+    return obj_list;
+}
+
+static VALUE
+ibf_dump_object(struct ibf_dump *dump, VALUE obj)
+{
+    VALUE obj_list = dump->current_buffer->obj_list;
+    long index = RARRAY_LEN(obj_list);
+    long i;
+    for (i=0; i<index; i++) {
+        if (RARRAY_AREF(obj_list, i) == obj) return (VALUE)i; /* dedup */
+    }
+    rb_ary_push(obj_list, obj);
+    return (VALUE)index;
+}
+
+static VALUE
+ibf_dump_id(struct ibf_dump *dump, ID id)
+{
+    if (id == 0 || rb_id2name(id) == NULL) {
+        return 0;
+    }
+    return ibf_dump_object(dump, rb_id2sym(id));
+}
+
+static ID
+ibf_load_id(const struct ibf_load *load, const ID id_index)
+{
+    if (id_index == 0) {
+        return 0;
+    }
+    VALUE sym = ibf_load_object(load, id_index);
+    return rb_sym2id(sym);
+}
+
+/* dump/load: code */
+
+static VALUE
+ibf_dump_calldata(struct ibf_dump *dump, const struct rb_call_data *cd)
+{
+    return (cd->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 int
+ibf_dump_iseq(struct ibf_dump *dump, const rb_iseq_t *iseq)
+{
+    if (iseq == NULL) {
+        return -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_push(dump->iseq_list, (VALUE)iseq);
+        }
+        return 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 unsigned char
+ibf_load_byte(const struct ibf_load *load, ibf_offset_t *offset)
+{
+    if (*offset >= load->current_buffer->size) { rb_raise(rb_eRuntimeError, "invalid bytecode"); }
+    return (unsigned char)load->current_buffer->buff[(*offset)++];
+}
+
+/*
+ * Small uint serialization
+ * 0x00000000_00000000 - 0x00000000_0000007f: 1byte | XXXX XXX1 |
+ * 0x00000000_00000080 - 0x00000000_00003fff: 2byte | XXXX XX10 | XXXX XXXX |
+ * 0x00000000_00004000 - 0x00000000_001fffff: 3byte | XXXX X100 | XXXX XXXX | XXXX XXXX |
+ * 0x00000000_00020000 - 0x00000000_0fffffff: 4byte | XXXX 1000 | XXXX XXXX | XXXX XXXX | XXXX XXXX |
+ * ...
+ * 0x00010000_00000000 - 0x00ffffff_ffffffff: 8byte | 1000 0000 | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX |
+ * 0x01000000_00000000 - 0xffffffff_ffffffff: 9byte | 0000 0000 | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX |
+ */
+static void
+ibf_dump_write_small_value(struct ibf_dump *dump, VALUE x)
+{
+    if (sizeof(VALUE) > 8 || CHAR_BIT != 8) {
+        ibf_dump_write(dump, &x, sizeof(VALUE));
+    }
+
+    enum { max_byte_length = sizeof(VALUE) + 1 };
+
+    unsigned char bytes[max_byte_length];
+    ibf_offset_t n;
+
+    for (n = 0; n < sizeof(VALUE) && (x >> (7 - n)); n++, x >>= 8) {
+        bytes[max_byte_length - 1 - n] = (unsigned char)x;
+    }
+
+    x <<= 1;
+    x |= 1;
+    x <<= n;
+    bytes[max_byte_length - 1 - n] = (unsigned char)x;
+    n++;
+
+    ibf_dump_write(dump, bytes + max_byte_length - n, n);
+}
+
+static VALUE
+ibf_load_small_value(const struct ibf_load *load, ibf_offset_t *offset)
+{
+    if (sizeof(VALUE) > 8 || CHAR_BIT != 8) {
+        union { char s[sizeof(VALUE)]; VALUE v; } x;
+
+        memcpy(x.s, load->current_buffer->buff + *offset, sizeof(VALUE));
+        *offset += sizeof(VALUE);
+
+        return x.v;
+    }
+
+    enum { max_byte_length = sizeof(VALUE) + 1 };
+
+    const unsigned char *buffer = (const unsigned char *)load->current_buffer->buff;
+    const unsigned char c = buffer[*offset];
+
+    ibf_offset_t n =
+        c & 1 ? 1 :
+        c == 0 ? 9 : ntz_int32(c) + 1;
+    VALUE x = (VALUE)c >> n;
+
+    if (*offset + n > load->current_buffer->size) {
+        rb_raise(rb_eRuntimeError, "invalid byte sequence");
+    }
+
+    ibf_offset_t i;
+    for (i = 1; i < n; i++) {
+        x <<= 8;
+        x |= (VALUE)buffer[*offset + i];
+    }
+
+    *offset += n;
+    return x;
+}
+
+static void
+ibf_dump_builtin(struct ibf_dump *dump, const struct rb_builtin_function *bf)
+{
+    // short: index
+    // short: name.length
+    // bytes: name
+    // // omit argc (only verify with name)
+    ibf_dump_write_small_value(dump, (VALUE)bf->index);
+
+    size_t len = strlen(bf->name);
+    ibf_dump_write_small_value(dump, (VALUE)len);
+    ibf_dump_write(dump, bf->name, len);
+}
+
+static const struct rb_builtin_function *
+ibf_load_builtin(const struct ibf_load *load, ibf_offset_t *offset)
+{
+    int i = (int)ibf_load_small_value(load, offset);
+    int len = (int)ibf_load_small_value(load, offset);
+    const char *name = (char *)ibf_load_ptr(load, offset, len);
+
+    if (0) {
+        for (int i=0; i<len; i++) fprintf(stderr, "%c", name[i]);
+        fprintf(stderr, "!!\n");
+    }
+
+    const struct rb_builtin_function *table = GET_VM()->builtin_function_table;
+    if (table == NULL) rb_bug("%s: table is not provided.", RUBY_FUNCTION_NAME_STRING);
+    if (strncmp(table[i].name, name, len) != 0) {
+        rb_bug("%s: index (%d) mismatch (expect %s but %s).", RUBY_FUNCTION_NAME_STRING, i, name, table[i].name);
+    }
+    // fprintf(stderr, "load-builtin: name:%s(%d)\n", table[i].name, table[i].argc);
+
+    return &table[i];
+}
+
+static ibf_offset_t
+ibf_dump_code(struct ibf_dump *dump, const rb_iseq_t *iseq)
+{
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    const int iseq_size = body->iseq_size;
+    int code_index;
+    const VALUE *orig_code = rb_iseq_original_iseq(iseq);
+
+    ibf_offset_t offset = ibf_dump_pos(dump);
+
+    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;
+
+        /* opcode */
+        if (insn >= 0x100) { rb_raise(rb_eRuntimeError, "invalid instruction"); }
+        ibf_dump_write_small_value(dump, insn);
+
+        /* operands */
+        for (op_index=0; types[op_index]; op_index++, code_index++) {
+            VALUE op = orig_code[code_index];
+            VALUE wv;
+
+            switch (types[op_index]) {
+              case TS_CDHASH:
+              case TS_VALUE:
+                wv = ibf_dump_object(dump, op);
+                break;
+              case TS_ISEQ:
+                wv = (VALUE)ibf_dump_iseq(dump, (const rb_iseq_t *)op);
+                break;
+              case TS_IC:
+              case TS_IVC:
+              case TS_ISE:
+                {
+                    unsigned int i;
+                    for (i=0; i<body->is_size; i++) {
+                        if (op == (VALUE)&body->is_entries[i]) {
+                            break;
+                        }
+                    }
+                    wv = (VALUE)i;
+                }
+                break;
+              case TS_CALLDATA:
+                {
+                    /* ibf_dump_calldata() always returns either Qtrue or Qfalse */
+                    char c = ibf_dump_calldata(dump, (const struct rb_call_data *)op) == Qtrue; // 1 or 0
+                    ibf_dump_write_byte(dump, c);
+                    goto skip_wv;
+                }
+              case TS_ID:
+                wv = ibf_dump_id(dump, (ID)op);
+                break;
+              case TS_GENTRY:
+                wv = ibf_dump_gentry(dump, (const struct rb_global_entry *)op);
+                break;
+              case TS_FUNCPTR:
+                rb_raise(rb_eRuntimeError, "TS_FUNCPTR is not supported");
+                goto skip_wv;
+              case TS_BUILTIN:
+                ibf_dump_builtin(dump, (const struct rb_builtin_function *)op);
+                goto skip_wv;
+              default:
+                wv = op;
+                break;
+            }
+            ibf_dump_write_small_value(dump, wv);
+          skip_wv:;
+        }
+        assert(insn_len(insn) == op_index+1);
+    }
+
+    return offset;
+}
+
+static VALUE *
+ibf_load_code(const struct ibf_load *load, const rb_iseq_t *iseq, ibf_offset_t bytecode_offset, ibf_offset_t bytecode_size, unsigned int iseq_size)
+{
+    unsigned int code_index;
+    ibf_offset_t reading_pos = bytecode_offset;
+    VALUE *code = ALLOC_N(VALUE, iseq_size);
+
+    struct rb_iseq_constant_body *load_body = iseq->body;
+    struct rb_call_data *cd_entries = load_body->call_data;
+    struct rb_kwarg_call_data *cd_kw_entries = (struct rb_kwarg_call_data *)&load_body->call_data[load_body->ci_size];
+    union iseq_inline_storage_entry *is_entries = load_body->is_entries;
+
+    for (code_index=0; code_index<iseq_size;) {
+        /* opcode */
+        const VALUE insn = code[code_index++] = ibf_load_small_value(load, &reading_pos);
+        const char *types = insn_op_types(insn);
+        int op_index;
+
+        /* operands */
+        for (op_index=0; types[op_index]; op_index++, code_index++) {
+            switch (types[op_index]) {
+              case TS_CDHASH:
+              case TS_VALUE:
+                {
+                    VALUE op = ibf_load_small_value(load, &reading_pos);
+                    VALUE v = ibf_load_object(load, op);
+                    code[code_index] = v;
+                    if (!SPECIAL_CONST_P(v)) {
+                        RB_OBJ_WRITTEN(iseq, Qundef, v);
+                        FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
+                    }
+                    break;
+                }
+              case TS_ISEQ:
+                {
+                    VALUE op = (VALUE)ibf_load_small_value(load, &reading_pos);
+                    VALUE v = (VALUE)ibf_load_iseq(load, (const rb_iseq_t *)op);
+                    code[code_index] = v;
+                    if (!SPECIAL_CONST_P(v)) {
+                        RB_OBJ_WRITTEN(iseq, Qundef, v);
+                        FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
+                    }
+                    break;
+                }
+              case TS_ISE:
+                FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
+                /* fall through */
+              case TS_IC:
+              case TS_IVC:
+                {
+                    VALUE op = ibf_load_small_value(load, &reading_pos);
+                    code[code_index] = (VALUE)&is_entries[op];
+                }
+                break;
+              case TS_CALLDATA:
+                {
+                    unsigned char op = ibf_load_byte(load, &reading_pos);
+                    code[code_index] = op ? (VALUE)cd_kw_entries++ : (VALUE)cd_entries++; /* op is 1 (kw) or 0 (!kw) */
+                }
+                break;
+              case TS_ID:
+                {
+                    VALUE op = ibf_load_small_value(load, &reading_pos);
+                    code[code_index] = ibf_load_id(load, (ID)(VALUE)op);
+                }
+                break;
+              case TS_GENTRY:
+                {
+                    VALUE op = ibf_load_small_value(load, &reading_pos);
+                    code[code_index] = ibf_load_gentry(load, (const struct rb_global_entry *)(VALUE)op);
+                }
+                break;
+              case TS_FUNCPTR:
+                rb_raise(rb_eRuntimeError, "TS_FUNCPTR is not supported");
+                break;
+              case TS_BUILTIN:
+                code[code_index] = (VALUE)ibf_load_builtin(load, &reading_pos);
+                break;
+              default:
+                code[code_index] = ibf_load_small_value(load, &reading_pos);
+                continue;
+            }
+        }
+        if (insn_len(insn) != op_index+1) {
+            rb_raise(rb_eRuntimeError, "operand size mismatch");
+        }
+    }
+    load_body->iseq_encoded = code;
+    load_body->iseq_size = code_index;
+
+    assert(code_index == iseq_size);
+    assert(reading_pos == bytecode_offset + bytecode_size);
+    return code;
+}
+
+static ibf_offset_t
+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) {
+        IBF_W_ALIGN(VALUE);
+        return ibf_dump_write(dump, iseq->body->param.opt_table, sizeof(VALUE) * (opt_num + 1));
+    }
+    else {
+        return ibf_dump_pos(dump);
+    }
+}
+
+static VALUE *
+ibf_load_param_opt_table(const struct ibf_load *load, ibf_offset_t opt_table_offset, int opt_num)
+{
+    if (opt_num > 0) {
+        VALUE *table = ALLOC_N(VALUE, opt_num+1);
+        MEMCPY(table, load->current_buffer->buff + opt_table_offset, VALUE, opt_num+1);
+        return table;
+    }
+    else {
+        return NULL;
+    }
+}
+
+static ibf_offset_t
+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);
+        IBF_W_ALIGN(struct rb_iseq_param_keyword);
+        return ibf_dump_write(dump, &dump_kw, sizeof(struct rb_iseq_param_keyword) * 1);
+    }
+    else {
+        return 0;
+    }
+}
+
+static const struct rb_iseq_param_keyword *
+ibf_load_param_keyword(const struct ibf_load *load, ibf_offset_t param_keyword_offset)
+{
+    if (param_keyword_offset) {
+        struct rb_iseq_param_keyword *kw = IBF_R(param_keyword_offset, 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);
+        int i;
+
+        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 ibf_offset_t
+ibf_dump_insns_info_body(struct ibf_dump *dump, const rb_iseq_t *iseq)
+{
+    ibf_offset_t offset = ibf_dump_pos(dump);
+    const struct iseq_insn_info_entry *entries = iseq->body->insns_info.body;
+
+    unsigned int i;
+    for (i = 0; i < iseq->body->insns_info.size; i++) {
+        ibf_dump_write_small_value(dump, entries[i].line_no);
+        ibf_dump_write_small_value(dump, entries[i].events);
+    }
+
+    return offset;
+}
+
+static struct iseq_insn_info_entry *
+ibf_load_insns_info_body(const struct ibf_load *load, ibf_offset_t body_offset, unsigned int size)
+{
+    ibf_offset_t reading_pos = body_offset;
+    struct iseq_insn_info_entry *entries = ALLOC_N(struct iseq_insn_info_entry, size);
+
+    unsigned int i;
+    for (i = 0; i < size; i++) {
+        entries[i].line_no = (int)ibf_load_small_value(load, &reading_pos);
+        entries[i].events = (rb_event_flag_t)ibf_load_small_value(load, &reading_pos);
+    }
+
+    return entries;
+}
+
+static ibf_offset_t
+ibf_dump_insns_info_positions(struct ibf_dump *dump, const unsigned int *positions, unsigned int size)
+{
+    ibf_offset_t offset = ibf_dump_pos(dump);
+
+    unsigned int last = 0;
+    unsigned int i;
+    for (i = 0; i < size; i++) {
+        ibf_dump_write_small_value(dump, positions[i] - last);
+        last = positions[i];
+    }
+
+    return offset;
+}
+
+static unsigned int *
+ibf_load_insns_info_positions(const struct ibf_load *load, ibf_offset_t positions_offset, unsigned int size)
+{
+    ibf_offset_t reading_pos = positions_offset;
+    unsigned int *positions = ALLOC_N(unsigned int, size);
+
+    unsigned int last = 0;
+    unsigned int i;
+    for (i = 0; i < size; i++) {
+        positions[i] = last + (unsigned int)ibf_load_small_value(load, &reading_pos);
+        last = positions[i];
+    }
+
+    return positions;
+}
+
+static ibf_offset_t
+ibf_dump_local_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
+{
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    const int size = body->local_table_size;
+    ID *table = ALLOCA_N(ID, size);
+    int i;
+
+    for (i=0; i<size; i++) {
+        table[i] = ibf_dump_id(dump, body->local_table[i]);
+    }
+
+    IBF_W_ALIGN(ID);
+    return ibf_dump_write(dump, table, sizeof(ID) * size);
+}
+
+static ID *
+ibf_load_local_table(const struct ibf_load *load, ibf_offset_t local_table_offset, int size)
+{
+    if (size > 0) {
+        ID *table = IBF_R(local_table_offset, ID, size);
+        int i;
+
+        for (i=0; i<size; i++) {
+            table[i] = ibf_load_id(load, table[i]);
+        }
+        return table;
+    }
+    else {
+        return NULL;
+    }
+}
+
+static ibf_offset_t
+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 *iseq_indices = ALLOCA_N(int, table->size);
+        unsigned int i;
+
+        for (i=0; i<table->size; i++) {
+            iseq_indices[i] = ibf_dump_iseq(dump, table->entries[i].iseq);
+        }
+
+        const ibf_offset_t offset = ibf_dump_pos(dump);
+
+        for (i=0; i<table->size; i++) {
+            ibf_dump_write_small_value(dump, iseq_indices[i]);
+            ibf_dump_write_small_value(dump, table->entries[i].type);
+            ibf_dump_write_small_value(dump, table->entries[i].start);
+            ibf_dump_write_small_value(dump, table->entries[i].end);
+            ibf_dump_write_small_value(dump, table->entries[i].cont);
+            ibf_dump_write_small_value(dump, table->entries[i].sp);
+        }
+        return offset;
+    }
+    else {
+        return ibf_dump_pos(dump);
+    }
+}
+
+static struct iseq_catch_table *
+ibf_load_catch_table(const struct ibf_load *load, ibf_offset_t catch_table_offset, unsigned int size)
+{
+    if (size) {
+        struct iseq_catch_table *table = ruby_xmalloc(iseq_catch_table_bytes(size));
+        table->size = size;
+
+        ibf_offset_t reading_pos = catch_table_offset;
+
+        unsigned int i;
+        for (i=0; i<table->size; i++) {
+            int iseq_index = (int)ibf_load_small_value(load, &reading_pos);
+            table->entries[i].type = (enum catch_type)ibf_load_small_value(load, &reading_pos);
+            table->entries[i].start = (unsigned int)ibf_load_small_value(load, &reading_pos);
+            table->entries[i].end = (unsigned int)ibf_load_small_value(load, &reading_pos);
+            table->entries[i].cont = (unsigned int)ibf_load_small_value(load, &reading_pos);
+            table->entries[i].sp = (unsigned int)ibf_load_small_value(load, &reading_pos);
+
+            table->entries[i].iseq = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)iseq_index);
+        }
+        return table;
+    }
+    else {
+        return NULL;
+    }
+}
+
+static ibf_offset_t
+ibf_dump_ci_entries(struct ibf_dump *dump, const rb_iseq_t *iseq)
+{
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    const unsigned int ci_size = body->ci_size;
+    const unsigned int ci_kw_size = body->ci_kw_size;
+    const struct rb_call_data *calls = body->call_data;
+    const struct rb_kwarg_call_data *kw_calls = (const struct rb_kwarg_call_data *)&body->call_data[ci_size];
+
+    ibf_offset_t offset = ibf_dump_pos(dump);
+
+    unsigned int i;
+
+    for (i = 0; i < ci_size; i++) {
+        VALUE mid = ibf_dump_id(dump, calls[i].ci.mid);
+
+        ibf_dump_write_small_value(dump, mid);
+        ibf_dump_write_small_value(dump, calls[i].ci.flag);
+        ibf_dump_write_small_value(dump, calls[i].ci.orig_argc);
+    }
+
+    for (i = 0; i < ci_kw_size; i++) {
+        const struct rb_call_info_kw_arg *kw_arg = kw_calls[i].ci_kw.kw_arg;
+
+        VALUE mid = ibf_dump_id(dump, kw_calls[i].ci_kw.ci.mid);
+
+        ibf_dump_write_small_value(dump, mid);
+        ibf_dump_write_small_value(dump, kw_calls[i].ci_kw.ci.flag);
+        ibf_dump_write_small_value(dump, kw_calls[i].ci_kw.ci.orig_argc);
+
+        ibf_dump_write_small_value(dump, kw_arg->keyword_len);
+
+        int j;
+        for (j = 0; j < kw_calls[i].ci_kw.kw_arg->keyword_len; j++) {
+            VALUE keyword = ibf_dump_object(dump, kw_arg->keywords[j]); /* kw_arg->keywords[n] is Symbol */
+
+            ibf_dump_write_small_value(dump, keyword);
+        }
+    }
+
+    return offset;
+}
+
+/* note that we dump out rb_call_info but load back rb_call_data */
+static struct rb_call_data *
+ibf_load_ci_entries(const struct ibf_load *load,
+                    ibf_offset_t ci_entries_offset,
+                    unsigned int ci_size,
+                    unsigned int ci_kw_size)
+{
+    ibf_offset_t reading_pos = ci_entries_offset;
+
+    unsigned int i;
+
+    struct rb_call_data *calls =
+        rb_xcalloc_mul_add_mul(
+            sizeof(struct rb_call_data), ci_size,
+            sizeof(struct rb_kwarg_call_data), ci_kw_size);
+    struct rb_kwarg_call_data *kw_calls = (struct rb_kwarg_call_data *)&calls[ci_size];
+
+    for (i = 0; i < ci_size; i++) {
+        VALUE mid_index = ibf_load_small_value(load, &reading_pos);
+
+        calls[i].ci.mid = ibf_load_id(load, mid_index);
+        calls[i].ci.flag = (unsigned int)ibf_load_small_value(load, &reading_pos);
+        calls[i].ci.orig_argc = (int)ibf_load_small_value(load, &reading_pos);
+    }
+
+    for (i = 0; i < ci_kw_size; i++) {
+        VALUE mid_index = ibf_load_small_value(load, &reading_pos);
+
+        kw_calls[i].ci_kw.ci.mid = ibf_load_id(load, mid_index);
+        kw_calls[i].ci_kw.ci.flag = (unsigned int)ibf_load_small_value(load, &reading_pos);
+        kw_calls[i].ci_kw.ci.orig_argc = (int)ibf_load_small_value(load, &reading_pos);
+
+        int keyword_len = (int)ibf_load_small_value(load, &reading_pos);
+
+        kw_calls[i].ci_kw.kw_arg =
+            rb_xmalloc_mul_add(keyword_len - 1, sizeof(VALUE), sizeof(struct rb_call_info_kw_arg));
+
+        kw_calls[i].ci_kw.kw_arg->keyword_len = keyword_len;
+
+        int j;
+        for (j = 0; j < kw_calls[i].ci_kw.kw_arg->keyword_len; j++) {
+            VALUE keyword = ibf_load_small_value(load, &reading_pos);
+
+            kw_calls[i].ci_kw.kw_arg->keywords[j] = ibf_load_object(load, keyword);
+        }
+    }
+
+    return calls;
+}
+
+static ibf_offset_t
+ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq)
+{
+    assert(dump->current_buffer == &dump->global_buffer);
+
+    unsigned int *positions;
+
+    const struct rb_iseq_constant_body *body = iseq->body;
+
+    const VALUE location_pathobj_index = ibf_dump_object(dump, body->location.pathobj); /* TODO: freeze */
+    const VALUE location_base_label_index = ibf_dump_object(dump, body->location.base_label);
+    const VALUE location_label_index = ibf_dump_object(dump, body->location.label);
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+    ibf_offset_t iseq_start = ibf_dump_pos(dump);
+
+    struct ibf_dump_buffer *saved_buffer = dump->current_buffer;
+    struct ibf_dump_buffer buffer;
+    buffer.str = rb_str_new(0, 0);
+    buffer.obj_list = ibf_dump_object_list_new();
+    dump->current_buffer = &buffer;
+#endif
+
+    const ibf_offset_t bytecode_offset =        ibf_dump_code(dump, iseq);
+    const ibf_offset_t bytecode_size =          ibf_dump_pos(dump) - bytecode_offset;
+    const ibf_offset_t param_opt_table_offset = ibf_dump_param_opt_table(dump, iseq);
+    const ibf_offset_t param_keyword_offset =   ibf_dump_param_keyword(dump, iseq);
+    const ibf_offset_t insns_info_body_offset = ibf_dump_insns_info_body(dump, iseq);
+
+    positions = rb_iseq_insns_info_decode_positions(iseq->body);
+    const ibf_offset_t insns_info_positions_offset = ibf_dump_insns_info_positions(dump, positions, body->insns_info.size);
+    ruby_xfree(positions);
+
+    const ibf_offset_t local_table_offset = ibf_dump_local_table(dump, iseq);
+    const unsigned int catch_table_size =   body->catch_table ? body->catch_table->size : 0;
+    const ibf_offset_t catch_table_offset = ibf_dump_catch_table(dump, iseq);
+    const int parent_iseq_index =           ibf_dump_iseq(dump, iseq->body->parent_iseq);
+    const int local_iseq_index =            ibf_dump_iseq(dump, iseq->body->local_iseq);
+    const ibf_offset_t ci_entries_offset =  ibf_dump_ci_entries(dump, iseq);
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+    ibf_offset_t local_obj_list_offset;
+    unsigned int local_obj_list_size;
+
+    ibf_dump_object_list(dump, &local_obj_list_offset, &local_obj_list_size);
+#endif
+
+    ibf_offset_t body_offset = ibf_dump_pos(dump);
+
+    /* dump the constant body */
+    unsigned int param_flags =
+        (body->param.flags.has_lead         << 0) |
+        (body->param.flags.has_opt          << 1) |
+        (body->param.flags.has_rest         << 2) |
+        (body->param.flags.has_post         << 3) |
+        (body->param.flags.has_kw           << 4) |
+        (body->param.flags.has_kwrest       << 5) |
+        (body->param.flags.has_block        << 6) |
+        (body->param.flags.ambiguous_param0 << 7) |
+        (body->param.flags.accepts_no_kwarg << 8) |
+        (body->param.flags.ruby2_keywords   << 9);
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+#  define IBF_BODY_OFFSET(x) (x)
+#else
+#  define IBF_BODY_OFFSET(x) (body_offset - (x))
+#endif
+
+    ibf_dump_write_small_value(dump, body->type);
+    ibf_dump_write_small_value(dump, body->iseq_size);
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(bytecode_offset));
+    ibf_dump_write_small_value(dump, bytecode_size);
+    ibf_dump_write_small_value(dump, param_flags);
+    ibf_dump_write_small_value(dump, body->param.size);
+    ibf_dump_write_small_value(dump, body->param.lead_num);
+    ibf_dump_write_small_value(dump, body->param.opt_num);
+    ibf_dump_write_small_value(dump, body->param.rest_start);
+    ibf_dump_write_small_value(dump, body->param.post_start);
+    ibf_dump_write_small_value(dump, body->param.post_num);
+    ibf_dump_write_small_value(dump, body->param.block_start);
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(param_opt_table_offset));
+    ibf_dump_write_small_value(dump, param_keyword_offset);
+    ibf_dump_write_small_value(dump, location_pathobj_index);
+    ibf_dump_write_small_value(dump, location_base_label_index);
+    ibf_dump_write_small_value(dump, location_label_index);
+    ibf_dump_write_small_value(dump, body->location.first_lineno);
+    ibf_dump_write_small_value(dump, body->location.node_id);
+    ibf_dump_write_small_value(dump, body->location.code_location.beg_pos.lineno);
+    ibf_dump_write_small_value(dump, body->location.code_location.beg_pos.column);
+    ibf_dump_write_small_value(dump, body->location.code_location.end_pos.lineno);
+    ibf_dump_write_small_value(dump, body->location.code_location.end_pos.column);
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(insns_info_body_offset));
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(insns_info_positions_offset));
+    ibf_dump_write_small_value(dump, body->insns_info.size);
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(local_table_offset));
+    ibf_dump_write_small_value(dump, catch_table_size);
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(catch_table_offset));
+    ibf_dump_write_small_value(dump, parent_iseq_index);
+    ibf_dump_write_small_value(dump, local_iseq_index);
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(ci_entries_offset));
+    ibf_dump_write_small_value(dump, body->variable.flip_count);
+    ibf_dump_write_small_value(dump, body->local_table_size);
+    ibf_dump_write_small_value(dump, body->is_size);
+    ibf_dump_write_small_value(dump, body->ci_size);
+    ibf_dump_write_small_value(dump, body->ci_kw_size);
+    ibf_dump_write_small_value(dump, body->stack_max);
+    ibf_dump_write_small_value(dump, body->catch_except_p);
+
+#undef IBF_BODY_OFFSET
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+    ibf_offset_t iseq_length_bytes = ibf_dump_pos(dump);
+
+    dump->current_buffer = saved_buffer;
+    ibf_dump_write(dump, RSTRING_PTR(buffer.str), iseq_length_bytes);
+
+    ibf_offset_t offset = ibf_dump_pos(dump);
+    ibf_dump_write_small_value(dump, iseq_start);
+    ibf_dump_write_small_value(dump, iseq_length_bytes);
+    ibf_dump_write_small_value(dump, body_offset);
+
+    ibf_dump_write_small_value(dump, local_obj_list_offset);
+    ibf_dump_write_small_value(dump, local_obj_list_size);
+
+    return offset;
+#else
+    return body_offset;
+#endif
+}
+
+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(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
+{
+    struct rb_iseq_constant_body *load_body = iseq->body = rb_iseq_constant_body_alloc();
+
+    ibf_offset_t reading_pos = offset;
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+    struct ibf_load_buffer *saved_buffer = load->current_buffer;
+    load->current_buffer = &load->global_buffer;
+
+    const ibf_offset_t iseq_start = ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t iseq_length_bytes = ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t body_offset = ibf_load_small_value(load, &reading_pos);
+
+    struct ibf_load_buffer buffer;
+    buffer.buff = load->global_buffer.buff + iseq_start;
+    buffer.size = iseq_length_bytes;
+    buffer.obj_list_offset = ibf_load_small_value(load, &reading_pos);
+    buffer.obj_list_size = ibf_load_small_value(load, &reading_pos);
+    buffer.obj_list = rb_ary_tmp_new(buffer.obj_list_size);
+    rb_ary_resize(buffer.obj_list, buffer.obj_list_size);
+
+    load->current_buffer = &buffer;
+    reading_pos = body_offset;
+#endif
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+#  define IBF_BODY_OFFSET(x) (x)
+#else
+#  define IBF_BODY_OFFSET(x) (offset - (x))
+#endif
+
+    const unsigned int type = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int iseq_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t bytecode_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const ibf_offset_t bytecode_size = (ibf_offset_t)ibf_load_small_value(load, &reading_pos);
+    const unsigned int param_flags = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int param_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const int param_lead_num = (int)ibf_load_small_value(load, &reading_pos);
+    const int param_opt_num = (int)ibf_load_small_value(load, &reading_pos);
+    const int param_rest_start = (int)ibf_load_small_value(load, &reading_pos);
+    const int param_post_start = (int)ibf_load_small_value(load, &reading_pos);
+    const int param_post_num = (int)ibf_load_small_value(load, &reading_pos);
+    const int param_block_start = (int)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t param_opt_table_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const ibf_offset_t param_keyword_offset = (ibf_offset_t)ibf_load_small_value(load, &reading_pos);
+    const VALUE location_pathobj_index = ibf_load_small_value(load, &reading_pos);
+    const VALUE location_base_label_index = ibf_load_small_value(load, &reading_pos);
+    const VALUE location_label_index = ibf_load_small_value(load, &reading_pos);
+    const VALUE location_first_lineno = ibf_load_small_value(load, &reading_pos);
+    const int location_node_id = (int)ibf_load_small_value(load, &reading_pos);
+    const int location_code_location_beg_pos_lineno = (int)ibf_load_small_value(load, &reading_pos);
+    const int location_code_location_beg_pos_column = (int)ibf_load_small_value(load, &reading_pos);
+    const int location_code_location_end_pos_lineno = (int)ibf_load_small_value(load, &reading_pos);
+    const int location_code_location_end_pos_column = (int)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t insns_info_body_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const ibf_offset_t insns_info_positions_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const unsigned int insns_info_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t local_table_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const unsigned int catch_table_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t catch_table_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const int parent_iseq_index = (int)ibf_load_small_value(load, &reading_pos);
+    const int local_iseq_index = (int)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t ci_entries_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const rb_snum_t variable_flip_count = (rb_snum_t)ibf_load_small_value(load, &reading_pos);
+    const unsigned int local_table_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int is_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int ci_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int ci_kw_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int stack_max = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const char catch_except_p = (char)ibf_load_small_value(load, &reading_pos);
+
+#undef IBF_BODY_OFFSET
+
+    load_body->type = type;
+    load_body->stack_max = stack_max;
+    load_body->param.flags.has_lead = (param_flags >> 0) & 1;
+    load_body->param.flags.has_opt = (param_flags >> 1) & 1;
+    load_body->param.flags.has_rest = (param_flags >> 2) & 1;
+    load_body->param.flags.has_post = (param_flags >> 3) & 1;
+    load_body->param.flags.has_kw = FALSE;
+    load_body->param.flags.has_kwrest = (param_flags >> 5) & 1;
+    load_body->param.flags.has_block = (param_flags >> 6) & 1;
+    load_body->param.flags.ambiguous_param0 = (param_flags >> 7) & 1;
+    load_body->param.flags.accepts_no_kwarg = (param_flags >> 8) & 1;
+    load_body->param.flags.ruby2_keywords = (param_flags >> 9) & 1;
+    load_body->param.size = param_size;
+    load_body->param.lead_num = param_lead_num;
+    load_body->param.opt_num = param_opt_num;
+    load_body->param.rest_start = param_rest_start;
+    load_body->param.post_start = param_post_start;
+    load_body->param.post_num = param_post_num;
+    load_body->param.block_start = param_block_start;
+    load_body->local_table_size = local_table_size;
+    load_body->is_size = is_size;
+    load_body->ci_size = ci_size;
+    load_body->ci_kw_size = ci_kw_size;
+    load_body->insns_info.size = insns_info_size;
+
+    ISEQ_COVERAGE_SET(iseq, Qnil);
+    ISEQ_ORIGINAL_ISEQ_CLEAR(iseq);
+    iseq->body->variable.flip_count = variable_flip_count;
+
+    load_body->location.first_lineno = location_first_lineno;
+    load_body->location.node_id = location_node_id;
+    load_body->location.code_location.beg_pos.lineno = location_code_location_beg_pos_lineno;
+    load_body->location.code_location.beg_pos.column = location_code_location_beg_pos_column;
+    load_body->location.code_location.end_pos.lineno = location_code_location_end_pos_lineno;
+    load_body->location.code_location.end_pos.column = location_code_location_end_pos_column;
+    load_body->catch_except_p = catch_except_p;
+
+    load_body->is_entries           = ZALLOC_N(union iseq_inline_storage_entry, is_size);
+    load_body->call_data            = ibf_load_ci_entries(load, ci_entries_offset, ci_size, ci_kw_size);
+    load_body->param.opt_table      = ibf_load_param_opt_table(load, param_opt_table_offset, param_opt_num);
+    load_body->param.keyword        = ibf_load_param_keyword(load, param_keyword_offset);
+    load_body->param.flags.has_kw   = (param_flags >> 4) & 1;
+    load_body->insns_info.body      = ibf_load_insns_info_body(load, insns_info_body_offset, insns_info_size);
+    load_body->insns_info.positions = ibf_load_insns_info_positions(load, insns_info_positions_offset, insns_info_size);
+    load_body->local_table          = ibf_load_local_table(load, local_table_offset, local_table_size);
+    load_body->catch_table          = ibf_load_catch_table(load, catch_table_offset, catch_table_size);
+    load_body->parent_iseq          = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)parent_iseq_index);
+    load_body->local_iseq           = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)local_iseq_index);
+
+    ibf_load_code(load, iseq, bytecode_offset, bytecode_size, iseq_size);
+#if VM_INSN_INFO_TABLE_IMPL == 2
+    rb_iseq_insns_info_encode_positions(iseq);
+#endif
+
+    rb_iseq_translate_threaded_code(iseq);
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+    load->current_buffer = &load->global_buffer;
+#endif
+
+    {
+        VALUE realpath = Qnil, path = ibf_load_object(load, location_pathobj_index);
+        if (RB_TYPE_P(path, T_STRING)) {
+            realpath = path = rb_fstring(path);
+        }
+        else if (RB_TYPE_P(path, T_ARRAY)) {
+            VALUE pathobj = path;
+            if (RARRAY_LEN(pathobj) != 2) {
+                rb_raise(rb_eRuntimeError, "path object size mismatch");
+            }
+            path = rb_fstring(RARRAY_AREF(pathobj, 0));
+            realpath = RARRAY_AREF(pathobj, 1);
+            if (!NIL_P(realpath)) {
+                if (!RB_TYPE_P(realpath, T_STRING)) {
+                    rb_raise(rb_eArgError, "unexpected realpath %"PRIxVALUE
+                             "(%x), path=%+"PRIsVALUE,
+                             realpath, TYPE(realpath), path);
+                }
+                realpath = rb_fstring(realpath);
+            }
+        }
+        else {
+            rb_raise(rb_eRuntimeError, "unexpected path object");
+        }
+        rb_iseq_pathobj_set(iseq, path, realpath);
+    }
+
+    RB_OBJ_WRITE(iseq, &load_body->location.base_label,    ibf_load_location_str(load, location_base_label_index));
+    RB_OBJ_WRITE(iseq, &load_body->location.label,         ibf_load_location_str(load, location_label_index));
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+    load->current_buffer = saved_buffer;
+#endif
+    verify_call_cache(iseq);
+}
+
+static void
+ibf_dump_iseq_list(struct ibf_dump *dump, struct ibf_header *header)
+{
+    VALUE list = rb_ary_tmp_new(RARRAY_LEN(dump->iseq_list));
+    long i;
+
+    for (i = 0; i < RARRAY_LEN(dump->iseq_list); i++) {
+        ibf_offset_t offset = ibf_dump_iseq_each(dump, (rb_iseq_t *)RARRAY_AREF(dump->iseq_list, i));
+        rb_ary_push(list, UINT2NUM(offset));
+    }
+
+    long size = RARRAY_LEN(dump->iseq_list);
+    ibf_offset_t *offsets = ALLOCA_N(ibf_offset_t, size);
+
+    for (i = 0; i < size; i++) {
+        offsets[i] = NUM2UINT(RARRAY_AREF(list, i));
+    }
+
+    ibf_dump_align(dump, sizeof(ibf_offset_t));
+    header->iseq_list_offset = ibf_dump_write(dump, offsets, sizeof(ibf_offset_t) * size);
+    header->iseq_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,
+    IBF_OBJECT_CLASS_NO_MATCHING_PATTERN_ERROR,
+    IBF_OBJECT_CLASS_TYPE_ERROR,
+};
+
+struct ibf_object_regexp {
+    long srcstr;
+    char option;
+};
+
+struct ibf_object_hash {
+    long len;
+    long keyval[FLEX_ARY_LEN];
+};
+
+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[FLEX_ARY_LEN];
+};
+
+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_ALIGNED_OFFSET(align, offset) /* offset > 0 */ \
+    ((((offset) - 1) / (align) + 1) * (align))
+#define IBF_OBJBODY(type, offset) (const type *)\
+    ibf_load_check_offset(load, IBF_ALIGNED_OFFSET(RUBY_ALIGNOF(type), offset))
+
+static const void *
+ibf_load_check_offset(const struct ibf_load *load, size_t offset)
+{
+    if (offset >= load->current_buffer->size) {
+	rb_raise(rb_eIndexError, "object offset out of range: %"PRIdSIZE, offset);
+    }
+    return load->current_buffer->buff + offset;
+}
+
+NORETURN(static void ibf_dump_object_unsupported(struct ibf_dump *dump, VALUE obj));
+
+static void
+ibf_dump_object_unsupported(struct ibf_dump *dump, VALUE obj)
+{
+    char buff[0x100];
+    rb_raw_obj_info(buff, sizeof(buff), obj);
+    rb_raise(rb_eNotImpError, "ibf_dump_object_unsupported: %s", buff);
+}
+
+static VALUE
+ibf_load_object_unsupported(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
+{
+    rb_raise(rb_eArgError, "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 if (obj == rb_eNoMatchingPatternError) {
+        cindex = IBF_OBJECT_CLASS_NO_MATCHING_PATTERN_ERROR;
+    }
+    else if (obj == rb_eTypeError) {
+        cindex = IBF_OBJECT_CLASS_TYPE_ERROR;
+    }
+    else {
+        rb_obj_info_dump(obj);
+        rb_p(obj);
+        rb_bug("unsupported class");
+    }
+    ibf_dump_write_small_value(dump, (VALUE)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 cindex = (enum ibf_object_class_index)ibf_load_small_value(load, &offset);
+
+    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;
+      case IBF_OBJECT_CLASS_NO_MATCHING_PATTERN_ERROR:
+        return rb_eNoMatchingPatternError;
+      case IBF_OBJECT_CLASS_TYPE_ERROR:
+        return rb_eTypeError;
+    }
+
+    rb_raise(rb_eArgError, "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);
+    (void)IBF_W(&dbl, double, 1);
+}
+
+static VALUE
+ibf_load_object_float(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
+{
+    const 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_dump_write_small_value(dump, encindex);
+    ibf_dump_write_small_value(dump, 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)
+{
+    ibf_offset_t reading_pos = offset;
+
+    int encindex = (int)ibf_load_small_value(load, &reading_pos);
+    const long len = (long)ibf_load_small_value(load, &reading_pos);
+    const char *ptr = load->current_buffer->buff + reading_pos;
+
+    VALUE str = rb_str_new(ptr, len);
+
+    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)
+{
+    VALUE srcstr = RREGEXP_SRC(obj);
+    struct ibf_object_regexp regexp;
+    regexp.option = (char)rb_reg_options(obj);
+    regexp.srcstr = (long)ibf_dump_object(dump, srcstr);
+
+    ibf_dump_write_byte(dump, (unsigned char)regexp.option);
+    ibf_dump_write_small_value(dump, regexp.srcstr);
+}
+
+static VALUE
+ibf_load_object_regexp(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
+{
+    struct ibf_object_regexp regexp;
+    regexp.option = ibf_load_byte(load, &offset);
+    regexp.srcstr = ibf_load_small_value(load, &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 = RARRAY_LEN(obj);
+    ibf_dump_write_small_value(dump, len);
+    for (i=0; i<len; i++) {
+        long index = (long)ibf_dump_object(dump, RARRAY_AREF(obj, i));
+        ibf_dump_write_small_value(dump, index);
+    }
+}
+
+static VALUE
+ibf_load_object_array(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
+{
+    ibf_offset_t reading_pos = offset;
+
+    const long len = (long)ibf_load_small_value(load, &reading_pos);
+
+    VALUE ary = rb_ary_new_capa(len);
+    int i;
+
+    for (i=0; i<len; i++) {
+        const VALUE index = ibf_load_small_value(load, &reading_pos);
+        rb_ary_push(ary, ibf_load_object(load, index));
+    }
+
+    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;
+
+    VALUE key_index = ibf_dump_object(dump, (VALUE)key);
+    VALUE val_index = ibf_dump_object(dump, (VALUE)val);
+
+    ibf_dump_write_small_value(dump, key_index);
+    ibf_dump_write_small_value(dump, val_index);
+    return ST_CONTINUE;
+}
+
+static void
+ibf_dump_object_hash(struct ibf_dump *dump, VALUE obj)
+{
+    long len = RHASH_SIZE(obj);
+    ibf_dump_write_small_value(dump, (VALUE)len);
+
+    if (len > 0) rb_hash_foreach(obj, ibf_dump_object_hash_i, (VALUE)dump);
+}
+
+static VALUE
+ibf_load_object_hash(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
+{
+    long len = (long)ibf_load_small_value(load, &offset);
+    VALUE obj = rb_hash_new_with_size(len);
+    int i;
+
+    for (i = 0; i < len; i++) {
+        VALUE key_index = ibf_load_small_value(load, &offset);
+        VALUE val_index = ibf_load_small_value(load, &offset);
+
+        VALUE key = ibf_load_object(load, key_index);
+        VALUE val = ibf_load_object(load, val_index);
+        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;
+        IBF_ZERO(range);
+        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_W_ALIGN(struct ibf_object_struct_range);
+        IBF_WV(range);
+    }
+    else {
+        rb_raise(rb_eNotImpError, "ibf_dump_object_struct: unsupported class %"PRIsVALUE,
+                 rb_class_name(CLASS_OF(obj)));
+    }
+}
+
+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);
+
+    (void)IBF_W(&slen, ssize_t, 1);
+    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);
+        long len = strlen(name) + 1;
+        long data[2];
+        data[0] = IBF_OBJECT_DATA_ENCODING;
+        data[1] = len;
+        (void)IBF_W(data, long, 2);
+        IBF_WP(name, char, len);
+    }
+    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 long *body = IBF_OBJBODY(long, offset);
+    const enum ibf_object_data_type type = (enum ibf_object_data_type)body[0];
+    /* const long len = body[1]; */
+    const char *data = (const char *)&body[2];
+
+    switch (type) {
+      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 data[2];
+    data[0] = (long)ibf_dump_object(dump, RCOMPLEX(obj)->real);
+    data[1] = (long)ibf_dump_object(dump, RCOMPLEX(obj)->imag);
+
+    (void)IBF_W(data, long, 2);
+}
+
+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);
+    VALUE str_index = ibf_dump_object(dump, str);
+
+    ibf_dump_write_small_value(dump, str_index);
+}
+
+static VALUE
+ibf_load_object_symbol(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
+{
+    VALUE str_index = ibf_load_small_value(load, &offset);
+    VALUE str = ibf_load_object(load, str_index);
+    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 void
+ibf_dump_object_object_header(struct ibf_dump *dump, const struct ibf_object_header header)
+{
+    unsigned char byte =
+        (header.type          << 0) |
+        (header.special_const << 5) |
+        (header.frozen        << 6) |
+        (header.internal      << 7);
+
+    IBF_WV(byte);
+}
+
+static struct ibf_object_header
+ibf_load_object_object_header(const struct ibf_load *load, ibf_offset_t *offset)
+{
+    unsigned char byte = ibf_load_byte(load, offset);
+
+    struct ibf_object_header header;
+    header.type          = (byte >> 0) & 0x1f;
+    header.special_const = (byte >> 5) & 0x01;
+    header.frozen        = (byte >> 6) & 0x01;
+    header.internal      = (byte >> 7) & 0x01;
+
+    return header;
+}
+
+static ibf_offset_t
+ibf_dump_object_object(struct ibf_dump *dump, VALUE obj_list, VALUE obj)
+{
+    struct ibf_object_header obj_header;
+    ibf_offset_t current_offset;
+    IBF_ZERO(obj_header);
+    obj_header.type = TYPE(obj);
+
+    IBF_W_ALIGN(ibf_offset_t);
+    current_offset = ibf_dump_pos(dump);
+
+    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_dump_object_object_header(dump, obj_header);
+        ibf_dump_write_small_value(dump, 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_dump_object_object_header(dump, 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 offset);
+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 >= (VALUE)RARRAY_LEN(load->current_buffer->obj_list)) {
+        rb_raise(rb_eIndexError, "object index out of range: %"PRIdVALUE, object_index);
+    }
+    else {
+        VALUE obj = rb_ary_entry(load->current_buffer->obj_list, (long)object_index);
+        if (obj == Qnil) { /* TODO: avoid multiple Qnil load */
+            ibf_offset_t *offsets = (ibf_offset_t *)(load->current_buffer->obj_list_offset + load->current_buffer->buff);
+            ibf_offset_t offset = offsets[object_index];
+            const struct ibf_object_header header = ibf_load_object_object_header(load, &offset);
+
+#if IBF_ISEQ_DEBUG
+            fprintf(stderr, "ibf_load_object: list=%#x offsets=%p offset=%#x\n",
+                    load->current_buffer->obj_list_offset, (void *)offsets, offset);
+            fprintf(stderr, "ibf_load_object: type=%#x special=%d frozen=%d internal=%d\n",
+                    header.type, header.special_const, header.frozen, header.internal);
+#endif
+            if (offset >= load->current_buffer->size) {
+                rb_raise(rb_eIndexError, "object offset out of range: %u", offset);
+            }
+
+            if (header.special_const) {
+                ibf_offset_t reading_pos = offset;
+
+                obj = ibf_load_small_value(load, &reading_pos);
+            }
+            else {
+                obj = (*load_object_functions[header.type])(load, &header, offset);
+            }
+
+            rb_ary_store(load->current_buffer->obj_list, (long)object_index, obj);
+        }
+#if IBF_ISEQ_DEBUG
+        fprintf(stderr, "ibf_load_object: index=%#"PRIxVALUE" obj=%#"PRIxVALUE"\n",
+                object_index, obj);
+#endif
+        return obj;
+    }
+}
+
+static void
+ibf_dump_object_list(struct ibf_dump *dump, ibf_offset_t *obj_list_offset, unsigned int *obj_list_size)
+{
+    VALUE obj_list = dump->current_buffer->obj_list;
+    VALUE list = rb_ary_tmp_new(RARRAY_LEN(obj_list));
+    int i, size;
+
+    for (i=0; i<RARRAY_LEN(obj_list); i++) {
+        VALUE obj = RARRAY_AREF(obj_list, i);
+        ibf_offset_t offset = ibf_dump_object_object(dump, obj_list, obj);
+        rb_ary_push(list, UINT2NUM(offset));
+    }
+    size = i;
+    IBF_W_ALIGN(ibf_offset_t);
+    *obj_list_offset = ibf_dump_pos(dump);
+
+    for (i=0; i<size; i++) {
+        ibf_offset_t offset = NUM2UINT(RARRAY_AREF(list, i));
+        IBF_WV(offset);
+    }
+
+    *obj_list_size = size;
+}
+
+static void
+ibf_dump_mark(void *ptr)
+{
+    struct ibf_dump *dump = (struct ibf_dump *)ptr;
+    rb_gc_mark(dump->global_buffer.str);
+    rb_gc_mark(dump->global_buffer.obj_list);
+    rb_gc_mark(dump->iseq_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;
+    }
+    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);
+    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->iseq_list, rb_ary_tmp_new(0));
+    RB_OBJ_WRITE(dumper_obj, &dump->global_buffer.obj_list, ibf_dump_object_list_new());
+    RB_OBJ_WRITE(dumper_obj, &dump->global_buffer.str, rb_str_new(0, 0));
+    dump->iseq_table = st_init_numtable(); /* need free */
+
+    dump->current_buffer = &dump->global_buffer;
+}
+
+VALUE
+rb_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 = IBF_MAJOR_VERSION;
+    header.minor_version = IBF_MINOR_VERSION;
+    ibf_dump_iseq_list(dump, &header);
+    ibf_dump_object_list(dump, &header.global_object_list_offset, &header.global_object_list_size);
+    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->global_buffer.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 (const ibf_offset_t *)(load->global_buffer.buff + load->header->iseq_list_offset);
+}
+
+void
+rb_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;
+    ibf_offset_t offset = ibf_iseq_list(load)[iseq->aux.loader.index];
+    load->iseq = iseq;
+#if IBF_ISEQ_DEBUG
+    fprintf(stderr, "rb_ibf_load_iseq_complete: index=%#x offset=%#x size=%#x\n",
+	    iseq->aux.loader.index, offset,
+	    load->header->size);
+#endif
+    ibf_load_iseq_each(load, iseq, offset);
+    ISEQ_COMPILE_DATA_CLEAR(iseq);
+    FL_UNSET(iseq, ISEQ_NOT_LOADED_YET);
+    rb_iseq_init_trace(iseq);
+    load->iseq = prev_src_iseq;
+}
+
+#if USE_LAZY_LOAD
+MJIT_FUNC_EXPORTED const rb_iseq_t *
+rb_iseq_complete(const rb_iseq_t *iseq)
+{
+    rb_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 IBF_ISEQ_DEBUG
+    fprintf(stderr, "ibf_load_iseq: index_iseq=%p iseq_list=%p\n",
+	    (void *)index_iseq, (void *)load->iseq_list);
+#endif
+    if (iseq_index == -1) {
+	return NULL;
+    }
+    else {
+	VALUE iseqv = rb_ary_entry(load->iseq_list, iseq_index);
+
+#if IBF_ISEQ_DEBUG
+	fprintf(stderr, "ibf_load_iseq: iseqv=%p\n", (void *)iseqv);
+#endif
+	if (iseqv != Qnil) {
+	    return (rb_iseq_t *)iseqv;
+	}
+	else {
+	    rb_iseq_t *iseq = iseq_imemo_alloc();
+#if IBF_ISEQ_DEBUG
+	    fprintf(stderr, "ibf_load_iseq: new iseq=%p\n", (void *)iseq);
+#endif
+	    FL_SET(iseq, ISEQ_NOT_LOADED_YET);
+	    iseq->aux.loader.obj = load->loader_obj;
+	    iseq->aux.loader.index = iseq_index;
+#if IBF_ISEQ_DEBUG
+	    fprintf(stderr, "ibf_load_iseq: iseq=%p loader_obj=%p index=%d\n",
+		    (void *)iseq, (void *)load->loader_obj, iseq_index);
+#endif
+	    rb_ary_store(load->iseq_list, iseq_index, (VALUE)iseq);
+
+#if !USE_LAZY_LOAD
+#if IBF_ISEQ_DEBUG
+	    fprintf(stderr, "ibf_load_iseq: loading iseq=%p\n", (void *)iseq);
+#endif
+            rb_ibf_load_iseq_complete(iseq);
+#else
+            if (GET_VM()->builtin_function_table) {
+                rb_ibf_load_iseq_complete(iseq);
+            }
+#endif /* !USE_LAZY_LOAD */
+
+#if IBF_ISEQ_DEBUG
+	    fprintf(stderr, "ibf_load_iseq: iseq=%p loaded %p\n",
+		    (void *)iseq, (void *)load->iseq);
+#endif
+	    return iseq;
+	}
+    }
+}
+
+static void
+ibf_load_setup_bytes(struct ibf_load *load, VALUE loader_obj, const char *bytes, size_t size)
+{
+    load->loader_obj = loader_obj;
+    load->global_buffer.buff = bytes;
+    load->header = (struct ibf_header *)load->global_buffer.buff;
+    load->global_buffer.size = load->header->size;
+    load->global_buffer.obj_list_offset = load->header->global_object_list_offset;
+    load->global_buffer.obj_list_size = load->header->global_object_list_size;
+    RB_OBJ_WRITE(loader_obj, &load->iseq_list, rb_ary_tmp_new(0));
+    RB_OBJ_WRITE(loader_obj, &load->global_buffer.obj_list, rb_ary_tmp_new(load->global_buffer.obj_list_size));
+    rb_ary_resize(load->global_buffer.obj_list, load->global_buffer.obj_list_size);
+    load->iseq = NULL;
+
+    load->current_buffer = &load->global_buffer;
+
+    if (size < 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 != IBF_MAJOR_VERSION ||
+	load->header->minor_version != IBF_MINOR_VERSION) {
+	rb_raise(rb_eRuntimeError, "unmatched version file (%u.%u for %u.%u)",
+		 load->header->major_version, load->header->minor_version, IBF_MAJOR_VERSION, IBF_MINOR_VERSION);
+    }
+    if (strcmp(load->global_buffer.buff + sizeof(struct ibf_header), RUBY_PLATFORM) != 0) {
+	rb_raise(rb_eRuntimeError, "unmatched platform");
+    }
+    if (load->header->iseq_list_offset % RUBY_ALIGNOF(ibf_offset_t)) {
+        rb_raise(rb_eArgError, "unaligned iseq list offset: %u",
+                 load->header->iseq_list_offset);
+    }
+    if (load->global_buffer.obj_list_offset % RUBY_ALIGNOF(ibf_offset_t)) {
+        rb_raise(rb_eArgError, "unaligned object list offset: %u",
+                 load->global_buffer.obj_list_offset);
+    }
+}
+
+static void
+ibf_load_setup(struct ibf_load *load, VALUE loader_obj, VALUE str)
+{
+    if (RSTRING_LENINT(str) < (int)sizeof(struct ibf_header)) {
+        rb_raise(rb_eRuntimeError, "broken binary format");
+    }
+
+#if USE_LAZY_LOAD
+    str = rb_str_new(RSTRING_PTR(str), RSTRING_LEN(str));
+#endif
+
+    ibf_load_setup_bytes(load, loader_obj, StringValuePtr(str), RSTRING_LEN(str));
+    RB_OBJ_WRITE(loader_obj, &load->str, str);
+}
+
+static void
+ibf_loader_mark(void *ptr)
+{
+    struct ibf_load *load = (struct ibf_load *)ptr;
+    rb_gc_mark(load->str);
+    rb_gc_mark(load->iseq_list);
+    rb_gc_mark(load->global_buffer.obj_list);
+}
+
+static void
+ibf_loader_free(void *ptr)
+{
+    struct ibf_load *load = (struct ibf_load *)ptr;
+    ruby_xfree(load);
+}
+
+static size_t
+ibf_loader_memsize(const void *ptr)
+{
+    return sizeof(struct ibf_load);
+}
+
+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 *
+rb_iseq_ibf_load(VALUE str)
+{
+    struct ibf_load *load;
+    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;
+}
+
+const rb_iseq_t *
+rb_iseq_ibf_load_bytes(const char *bytes, size_t size)
+{
+    struct ibf_load *load;
+    rb_iseq_t *iseq;
+    VALUE loader_obj = TypedData_Make_Struct(0, struct ibf_load, &ibf_load_type, load);
+
+    ibf_load_setup_bytes(load, loader_obj, bytes, size);
+    iseq = ibf_load_iseq(load, 0);
+
+    RB_GC_GUARD(loader_obj);
+    return iseq;
+}
+
+VALUE
+rb_iseq_ibf_load_extra_data(VALUE str)
 {
-    return GET_THREAD()->parse_in_eval < 0;
+    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->global_buffer.buff + load->header->size, load->header->extra_size);
+    RB_GC_GUARD(loader_obj);
+    return extra_str;
 }
diff --git a/complex.c b/complex.c
index a701129b73..cdd5edc50a 100644
--- a/complex.c
+++ b/complex.c
@@ -1,37 +1,52 @@
 /*
-  complex.c: Coded by Tadayoshi Funaba 2008-2011
+  complex.c: Coded by Tadayoshi Funaba 2008-2012
 
   This implementation is based on Keiju Ishitsuka's Complex library
   which is written in ruby.
 */
 
-#include "ruby.h"
-#include "internal.h"
+#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 "internal.h"
+#include "id.h"
 
 #define NDEBUG
-#include <assert.h>
+#include "ruby_assert.h"
 
 #define ZERO INT2FIX(0)
 #define ONE INT2FIX(1)
 #define TWO INT2FIX(2)
+#if USE_FLONUM
+#define RFLOAT_0 DBL2NUM(0)
+#else
+static VALUE RFLOAT_0;
+#endif
+#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \
+    !defined(signbit)
+extern int signbit(double);
+#endif
 
 VALUE rb_cComplex;
 
-static ID id_abs, id_abs2, id_arg, id_cmp, id_conj, id_convert,
-    id_denominator, id_divmod, id_eqeq_p, id_expt, id_fdiv,  id_floor,
-    id_idiv, id_imag, id_inspect, id_negate, id_numerator, id_quo,
-    id_real, id_real_p, id_to_f, id_to_i, id_to_r, id_to_s;
+static ID id_abs, id_arg,
+    id_denominator, id_numerator,
+    id_real_p, id_i_real, id_i_imag,
+    id_finite_p, id_infinite_p, id_rationalize,
+    id_PI;
+#define id_to_i idTo_i
+#define id_to_r idTo_r
+#define id_negate idUMinus
+#define id_expt idPow
+#define id_to_f idTo_f
+#define id_quo idQuo
+#define id_fdiv idFdiv
 
 #define f_boolcast(x) ((x) ? Qtrue : Qfalse)
 
-#define binop(n,op) \
-inline static VALUE \
-f_##n(VALUE x, VALUE y)\
-{\
-    return rb_funcall(x, (op), 1, y);\
-}
-
 #define fun1(n) \
 inline static VALUE \
 f_##n(VALUE x)\
@@ -46,277 +61,338 @@ f_##n(VALUE x, VALUE y)\
     return rb_funcall(x, id_##n, 1, y);\
 }
 
-#define math1(n) \
-inline static VALUE \
-m_##n(VALUE x)\
-{\
-    return rb_funcall(rb_mMath, id_##n, 1, x);\
-}
-
-#define math2(n) \
-inline static VALUE \
-m_##n(VALUE x, VALUE y)\
-{\
-    return rb_funcall(rb_mMath, id_##n, 2, x, y);\
-}
-
 #define PRESERVE_SIGNEDZERO
 
 inline static VALUE
 f_add(VALUE x, VALUE y)
 {
-#ifndef PRESERVE_SIGNEDZERO
-    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
-	return x;
-    else if (FIXNUM_P(x) && FIX2LONG(x) == 0)
-	return y;
-#endif
+    if (RB_INTEGER_TYPE_P(x) &&
+        LIKELY(rb_method_basic_definition_p(rb_cInteger, idPLUS))) {
+        if (FIXNUM_ZERO_P(x))
+            return y;
+        if (FIXNUM_ZERO_P(y))
+            return x;
+        return rb_int_plus(x, y);
+    }
+    else if (RB_FLOAT_TYPE_P(x) &&
+             LIKELY(rb_method_basic_definition_p(rb_cFloat, idPLUS))) {
+        if (FIXNUM_ZERO_P(y))
+            return x;
+        return rb_float_plus(x, y);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL) &&
+             LIKELY(rb_method_basic_definition_p(rb_cRational, idPLUS))) {
+        if (FIXNUM_ZERO_P(y))
+            return x;
+        return rb_rational_plus(x, y);
+    }
+
     return rb_funcall(x, '+', 1, y);
 }
 
 inline static VALUE
-f_cmp(VALUE x, VALUE y)
+f_div(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(y) && FIX2LONG(y) == 1)
+	return x;
+    return rb_funcall(x, '/', 1, y);
+}
+
+inline static int
+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));
+}
+
+inline static VALUE
+f_mul(VALUE x, VALUE y)
 {
-    if (FIXNUM_P(x) && FIXNUM_P(y)) {
-	long c = FIX2LONG(x) - FIX2LONG(y);
-	if (c > 0)
-	    c = 1;
-	else if (c < 0)
-	    c = -1;
-	return INT2FIX(c);
+    if (RB_INTEGER_TYPE_P(x) &&
+        LIKELY(rb_method_basic_definition_p(rb_cInteger, idMULT))) {
+        if (FIXNUM_ZERO_P(y))
+            return ZERO;
+        if (FIXNUM_ZERO_P(x) && RB_INTEGER_TYPE_P(y))
+            return ZERO;
+        if (x == ONE) return y;
+        if (y == ONE) return x;
+        return rb_int_mul(x, y);
+    }
+    else if (RB_FLOAT_TYPE_P(x) &&
+             LIKELY(rb_method_basic_definition_p(rb_cFloat, idMULT))) {
+        if (y == ONE) return x;
+        return rb_float_mul(x, y);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL) &&
+             LIKELY(rb_method_basic_definition_p(rb_cRational, idMULT))) {
+        if (y == ONE) return x;
+        return rb_rational_mul(x, y);
     }
-    return rb_funcall(x, id_cmp, 1, y);
+    else if (LIKELY(rb_method_basic_definition_p(CLASS_OF(x), idMULT))) {
+        if (y == ONE) return x;
+    }
+    return rb_funcall(x, '*', 1, y);
 }
 
 inline static VALUE
-f_div(VALUE x, VALUE y)
+f_sub(VALUE x, VALUE y)
 {
-    if (FIXNUM_P(y) && FIX2LONG(y) == 1)
+    if (FIXNUM_ZERO_P(y) &&
+        LIKELY(rb_method_basic_definition_p(CLASS_OF(x), idMINUS))) {
 	return x;
-    return rb_funcall(x, '/', 1, y);
+    }
+    return rb_funcall(x, '-', 1, y);
 }
 
 inline static VALUE
-f_gt_p(VALUE x, VALUE y)
+f_abs(VALUE x)
 {
-    if (FIXNUM_P(x) && FIXNUM_P(y))
-	return f_boolcast(FIX2LONG(x) > FIX2LONG(y));
-    return rb_funcall(x, '>', 1, y);
+    if (RB_INTEGER_TYPE_P(x)) {
+        return rb_int_abs(x);
+    }
+    else if (RB_FLOAT_TYPE_P(x)) {
+        return rb_float_abs(x);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+        return rb_rational_abs(x);
+    }
+    else if (RB_TYPE_P(x, T_COMPLEX)) {
+        return rb_complex_abs(x);
+    }
+    return rb_funcall(x, id_abs, 0);
 }
 
+static VALUE numeric_arg(VALUE self);
+static VALUE float_arg(VALUE self);
+
 inline static VALUE
-f_lt_p(VALUE x, VALUE y)
+f_arg(VALUE x)
 {
-    if (FIXNUM_P(x) && FIXNUM_P(y))
-	return f_boolcast(FIX2LONG(x) < FIX2LONG(y));
-    return rb_funcall(x, '<', 1, y);
+    if (RB_INTEGER_TYPE_P(x)) {
+        return numeric_arg(x);
+    }
+    else if (RB_FLOAT_TYPE_P(x)) {
+        return float_arg(x);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+        return numeric_arg(x);
+    }
+    else if (RB_TYPE_P(x, T_COMPLEX)) {
+        return rb_complex_arg(x);
+    }
+    return rb_funcall(x, id_arg, 0);
 }
 
-binop(mod, '%')
+inline static VALUE
+f_numerator(VALUE x)
+{
+    if (RB_TYPE_P(x, T_RATIONAL)) {
+        return RRATIONAL(x)->num;
+    }
+    if (RB_FLOAT_TYPE_P(x)) {
+        return rb_float_numerator(x);
+    }
+    return x;
+}
 
 inline static VALUE
-f_mul(VALUE x, VALUE y)
+f_denominator(VALUE x)
 {
-#ifndef PRESERVE_SIGNEDZERO
-    if (FIXNUM_P(y)) {
-	long iy = FIX2LONG(y);
-	if (iy == 0) {
-	    if (FIXNUM_P(x) || TYPE(x) == T_BIGNUM)
-		return ZERO;
-	}
-	else if (iy == 1)
-	    return x;
-    }
-    else if (FIXNUM_P(x)) {
-	long ix = FIX2LONG(x);
-	if (ix == 0) {
-	    if (FIXNUM_P(y) || TYPE(y) == T_BIGNUM)
-		return ZERO;
-	}
-	else if (ix == 1)
-	    return y;
+    if (RB_TYPE_P(x, T_RATIONAL)) {
+        return RRATIONAL(x)->den;
     }
-#endif
-    return rb_funcall(x, '*', 1, y);
+    if (RB_FLOAT_TYPE_P(x)) {
+        return rb_float_denominator(x);
+    }
+    return INT2FIX(1);
 }
 
 inline static VALUE
-f_sub(VALUE x, VALUE y)
+f_negate(VALUE x)
 {
-#ifndef PRESERVE_SIGNEDZERO
-    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
-	return x;
-#endif
-    return rb_funcall(x, '-', 1, y);
+    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 rb_complex_uminus(x);
+    }
+    return rb_funcall(x, id_negate, 0);
 }
 
-fun1(abs)
-fun1(abs2)
-fun1(arg)
-fun1(conj)
-fun1(denominator)
-fun1(floor)
-fun1(imag)
-fun1(inspect)
-fun1(negate)
-fun1(numerator)
-fun1(real)
-fun1(real_p)
+static bool nucomp_real_p(VALUE self);
+
+static inline bool
+f_real_p(VALUE x)
+{
+    if (RB_INTEGER_TYPE_P(x)) {
+        return true;
+    }
+    else if (RB_FLOAT_TYPE_P(x)) {
+        return true;
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+        return true;
+    }
+    else if (RB_TYPE_P(x, T_COMPLEX)) {
+        return nucomp_real_p(x);
+    }
+    return rb_funcall(x, id_real_p, 0);
+}
 
 inline static VALUE
 f_to_i(VALUE x)
 {
-    if (TYPE(x) == T_STRING)
+    if (RB_TYPE_P(x, T_STRING))
 	return rb_str_to_inum(x, 10, 0);
     return rb_funcall(x, id_to_i, 0);
 }
+
 inline static VALUE
 f_to_f(VALUE x)
 {
-    if (TYPE(x) == T_STRING)
+    if (RB_TYPE_P(x, T_STRING))
 	return DBL2NUM(rb_str_to_dbl(x, 0));
     return rb_funcall(x, id_to_f, 0);
 }
 
 fun1(to_r)
-fun1(to_s)
 
-fun2(divmod)
-
-inline static VALUE
+inline static int
 f_eqeq_p(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y))
-	return f_boolcast(FIX2LONG(x) == FIX2LONG(y));
-    return rb_funcall(x, id_eqeq_p, 1, y);
+	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);
 }
 
 fun2(expt)
 fun2(fdiv)
-fun2(idiv)
-fun2(quo)
 
-inline static VALUE
+static VALUE
+f_quo(VALUE x, VALUE y)
+{
+    if (RB_INTEGER_TYPE_P(x))
+        return rb_numeric_quo(x, y);
+    if (RB_FLOAT_TYPE_P(x))
+        return rb_float_div(x, y);
+    if (RB_TYPE_P(x, T_RATIONAL))
+        return rb_numeric_quo(x, y);
+
+    return rb_funcallv(x, id_quo, 1, &y);
+}
+
+inline static int
 f_negative_p(VALUE x)
 {
-    if (FIXNUM_P(x))
-	return f_boolcast(FIX2LONG(x) < 0);
-    return rb_funcall(x, '<', 1, ZERO);
+    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);
 }
 
 #define f_positive_p(x) (!f_negative_p(x))
 
-inline static VALUE
+inline static int
 f_zero_p(VALUE x)
 {
-    switch (TYPE(x)) {
-      case T_FIXNUM:
-	return f_boolcast(FIX2LONG(x) == 0);
-      case T_BIGNUM:
-	return Qfalse;
-      case T_RATIONAL:
-      {
-	  VALUE num = RRATIONAL(x)->num;
-
-	  return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 0);
-      }
+    if (RB_FLOAT_TYPE_P(x)) {
+        return FLOAT_ZERO_P(x);
+    }
+    else if (RB_INTEGER_TYPE_P(x)) {
+        return FIXNUM_ZERO_P(x);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+        const VALUE num = RRATIONAL(x)->num;
+        return FIXNUM_ZERO_P(num);
     }
-    return rb_funcall(x, id_eqeq_p, 1, ZERO);
+    return (int)rb_equal(x, ZERO);
 }
 
 #define f_nonzero_p(x) (!f_zero_p(x))
 
-inline static VALUE
-f_one_p(VALUE x)
+VALUE rb_flo_is_finite_p(VALUE num);
+inline static int
+f_finite_p(VALUE x)
 {
-    switch (TYPE(x)) {
-      case T_FIXNUM:
-	return f_boolcast(FIX2LONG(x) == 1);
-      case T_BIGNUM:
-	return Qfalse;
-      case T_RATIONAL:
-      {
-	  VALUE num = RRATIONAL(x)->num;
-	  VALUE den = RRATIONAL(x)->den;
-
-	  return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 1 &&
-			    FIXNUM_P(den) && FIX2LONG(den) == 1);
-      }
+    if (RB_INTEGER_TYPE_P(x)) {
+        return TRUE;
     }
-    return rb_funcall(x, id_eqeq_p, 1, ONE);
-}
-
-inline static VALUE
-f_kind_of_p(VALUE x, VALUE c)
-{
-    return rb_obj_is_kind_of(x, c);
-}
-
-inline static VALUE
-k_numeric_p(VALUE x)
-{
-    return f_kind_of_p(x, rb_cNumeric);
-}
-
-inline static VALUE
-k_integer_p(VALUE x)
-{
-    return f_kind_of_p(x, rb_cInteger);
-}
-
-inline static VALUE
-k_fixnum_p(VALUE x)
-{
-    return f_kind_of_p(x, rb_cFixnum);
-}
-
-inline static VALUE
-k_bignum_p(VALUE x)
-{
-    return f_kind_of_p(x, rb_cBignum);
+    else if (RB_FLOAT_TYPE_P(x)) {
+	return (int)rb_flo_is_finite_p(x);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+	return TRUE;
+    }
+    return RTEST(rb_funcallv(x, id_finite_p, 0, 0));
 }
 
+VALUE rb_flo_is_infinite_p(VALUE num);
 inline static VALUE
-k_float_p(VALUE x)
+f_infinite_p(VALUE x)
 {
-    return f_kind_of_p(x, rb_cFloat);
+    if (RB_INTEGER_TYPE_P(x)) {
+        return Qnil;
+    }
+    else if (RB_FLOAT_TYPE_P(x)) {
+	return rb_flo_is_infinite_p(x);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+        return Qnil;
+    }
+    return rb_funcallv(x, id_infinite_p, 0, 0);
 }
 
-inline static VALUE
-k_rational_p(VALUE x)
+inline static int
+f_kind_of_p(VALUE x, VALUE c)
 {
-    return f_kind_of_p(x, rb_cRational);
+    return (int)rb_obj_is_kind_of(x, c);
 }
 
-inline static VALUE
-k_complex_p(VALUE x)
+inline static int
+k_numeric_p(VALUE x)
 {
-    return f_kind_of_p(x, rb_cComplex);
+    return f_kind_of_p(x, rb_cNumeric);
 }
 
-#define k_exact_p(x) (!k_float_p(x))
-#define k_inexact_p(x) k_float_p(x)
+#define k_exact_p(x) (!RB_FLOAT_TYPE_P(x))
 
 #define k_exact_zero_p(x) (k_exact_p(x) && f_zero_p(x))
-#define k_exact_one_p(x) (k_exact_p(x) && f_one_p(x))
 
 #define get_dat1(x) \
-    struct RComplex *dat;\
-    dat = ((struct RComplex *)(x))
+    struct RComplex *dat = RCOMPLEX(x)
 
 #define get_dat2(x,y) \
-    struct RComplex *adat, *bdat;\
-    adat = ((struct RComplex *)(x));\
-    bdat = ((struct RComplex *)(y))
+    struct RComplex *adat = RCOMPLEX(x), *bdat = RCOMPLEX(y)
 
 inline static VALUE
 nucomp_s_new_internal(VALUE klass, VALUE real, VALUE imag)
 {
-    NEWOBJ(obj, struct RComplex);
-    OBJSETUP(obj, klass, T_COMPLEX);
+    NEWOBJ_OF(obj, struct RComplex, klass, T_COMPLEX | (RGENGC_WB_PROTECTED_COMPLEX ? FL_WB_PROTECTED : 0));
 
-    obj->real = real;
-    obj->imag = imag;
+    RCOMPLEX_SET_REAL(obj, real);
+    RCOMPLEX_SET_IMAG(obj, imag);
+    OBJ_FREEZE_RAW(obj);
 
     return (VALUE)obj;
 }
@@ -327,50 +403,22 @@ nucomp_s_alloc(VALUE klass)
     return nucomp_s_new_internal(klass, ZERO, ZERO);
 }
 
-#if 0
-static VALUE
-nucomp_s_new_bang(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE real, imag;
-
-    switch (rb_scan_args(argc, argv, "11", &real, &imag)) {
-      case 1:
-	if (!k_numeric_p(real))
-	    real = f_to_i(real);
-	imag = ZERO;
-	break;
-      default:
-	if (!k_numeric_p(real))
-	    real = f_to_i(real);
-	if (!k_numeric_p(imag))
-	    imag = f_to_i(imag);
-	break;
-    }
-
-    return nucomp_s_new_internal(klass, real, imag);
-}
-#endif
-
 inline static VALUE
 f_complex_new_bang1(VALUE klass, VALUE x)
 {
-    assert(!k_complex_p(x));
+    assert(!RB_TYPE_P(x, T_COMPLEX));
     return nucomp_s_new_internal(klass, x, ZERO);
 }
 
 inline static VALUE
 f_complex_new_bang2(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!k_complex_p(x));
-    assert(!k_complex_p(y));
+    assert(!RB_TYPE_P(x, T_COMPLEX));
+    assert(!RB_TYPE_P(y, T_COMPLEX));
     return nucomp_s_new_internal(klass, x, y);
 }
 
 #ifdef CANONICALIZATION_FOR_MATHN
-#define CANON
-#endif
-
-#ifdef CANON
 static int canonicalization = 0;
 
 RUBY_FUNC_EXPORTED void
@@ -378,18 +426,16 @@ nucomp_canonicalization(int f)
 {
     canonicalization = f;
 }
+#else
+#define canonicalization 0
 #endif
 
 inline static void
 nucomp_real_check(VALUE num)
 {
-    switch (TYPE(num)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-      case T_RATIONAL:
-	break;
-      default:
+    if (!RB_INTEGER_TYPE_P(num) &&
+	!RB_FLOAT_TYPE_P(num) &&
+	!RB_TYPE_P(num, T_RATIONAL)) {
 	if (!k_numeric_p(num) || !f_real_p(num))
 	    rb_raise(rb_eTypeError, "not a real");
     }
@@ -398,26 +444,24 @@ nucomp_real_check(VALUE num)
 inline static VALUE
 nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag)
 {
-#ifdef CANON
-#define CL_CANON
-#ifdef CL_CANON
+    int complex_r, complex_i;
+#ifdef CANONICALIZATION_FOR_MATHN
     if (k_exact_zero_p(imag) && canonicalization)
 	return real;
-#else
-    if (f_zero_p(imag) && canonicalization)
-	return real;
 #endif
-#endif
-    if (f_real_p(real) && f_real_p(imag))
+    complex_r = RB_TYPE_P(real, T_COMPLEX);
+    complex_i = RB_TYPE_P(imag, T_COMPLEX);
+    if (!complex_r && !complex_i) {
 	return nucomp_s_new_internal(klass, real, imag);
-    else if (f_real_p(real)) {
+    }
+    else if (!complex_r) {
 	get_dat1(imag);
 
 	return nucomp_s_new_internal(klass,
 				     f_sub(real, dat->imag),
 				     f_add(ZERO, dat->real));
     }
-    else if (f_real_p(imag)) {
+    else if (!complex_i) {
 	get_dat1(real);
 
 	return nucomp_s_new_internal(klass,
@@ -439,6 +483,8 @@ nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag)
  *    Complex.rectangular(real[, imag])  ->  complex
  *
  * Returns a complex object which denotes the given rectangular form.
+ *
+ *    Complex.rectangular(1, 2)  #=> (1+2i)
  */
 static VALUE
 nucomp_s_new(int argc, VALUE *argv, VALUE klass)
@@ -460,29 +506,67 @@ nucomp_s_new(int argc, VALUE *argv, VALUE klass)
 }
 
 inline static VALUE
-f_complex_new1(VALUE klass, VALUE x)
-{
-    assert(!k_complex_p(x));
-    return nucomp_s_canonicalize_internal(klass, x, ZERO);
-}
-
-inline static VALUE
 f_complex_new2(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!k_complex_p(x));
+    assert(!RB_TYPE_P(x, T_COMPLEX));
     return nucomp_s_canonicalize_internal(klass, x, y);
 }
 
+static VALUE nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise);
+static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
+
 /*
  * call-seq:
- *    Complex(x[, y])  ->  numeric
+ *    Complex(x[, y], exception: true)  ->  numeric or nil
  *
  * Returns x+i*y;
+ *
+ *    Complex(1, 2)    #=> (1+2i)
+ *    Complex('1+2i')  #=> (1+2i)
+ *    Complex(nil)     #=> TypeError
+ *    Complex(1, nil)  #=> TypeError
+ *
+ *    Complex(1, nil, exception: false)  #=> nil
+ *    Complex('1+2', exception: false)   #=> nil
+ *
+ * Syntax of string form:
+ *
+ *   string form = extra spaces , complex , extra spaces ;
+ *   complex = real part | [ sign ] , imaginary part
+ *           | real part , sign , imaginary part
+ *           | rational , "@" , rational ;
+ *   real part = rational ;
+ *   imaginary part = imaginary unit | unsigned rational , imaginary unit ;
+ *   rational = [ sign ] , unsigned rational ;
+ *   unsigned rational = numerator | numerator , "/" , denominator ;
+ *   numerator = integer part | fractional part | integer part , fractional part ;
+ *   denominator = digits ;
+ *   integer part = digits ;
+ *   fractional part = "." , digits , [ ( "e" | "E" ) , [ sign ] , digits ] ;
+ *   imaginary unit = "i" | "I" | "j" | "J" ;
+ *   sign = "-" | "+" ;
+ *   digits = digit , { digit | "_" , digit };
+ *   digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
+ *   extra spaces = ? \s* ? ;
+ *
+ * See String#to_c.
  */
 static VALUE
 nucomp_f_complex(int argc, VALUE *argv, VALUE klass)
 {
-    return rb_funcall2(rb_cComplex, id_convert, argc, argv);
+    VALUE a1, a2, opts = Qnil;
+    int raise = TRUE;
+
+    if (rb_scan_args(argc, argv, "11:", &a1, &a2, &opts) == 1) {
+        a2 = Qundef;
+    }
+    if (!NIL_P(opts)) {
+        raise = rb_opts_exception_p(opts, raise);
+    }
+    if (argc > 0 && CLASS_OF(a1) == rb_cComplex && a2 == Qundef) {
+        return a1;
+    }
+    return nucomp_convert(rb_cComplex, a1, a2, raise);
 }
 
 #define imp1(n) \
@@ -492,20 +576,9 @@ 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)
@@ -515,12 +588,11 @@ m_log_bang(VALUE x)
 
 imp1(sin)
 imp1(sinh)
-imp1(sqrt)
 
 static VALUE
 m_cos(VALUE x)
 {
-    if (f_real_p(x))
+    if (!RB_TYPE_P(x, T_COMPLEX))
 	return m_cos_bang(x);
     {
 	get_dat1(x);
@@ -535,7 +607,7 @@ m_cos(VALUE x)
 static VALUE
 m_sin(VALUE x)
 {
-    if (f_real_p(x))
+    if (!RB_TYPE_P(x, T_COMPLEX))
 	return m_sin_bang(x);
     {
 	get_dat1(x);
@@ -547,50 +619,81 @@ m_sin(VALUE x)
     }
 }
 
-#if 0
 static VALUE
-m_sqrt(VALUE x)
+f_complex_polar(VALUE klass, VALUE x, VALUE y)
 {
-    if (f_real_p(x)) {
-	if (f_positive_p(x))
-	    return m_sqrt_bang(x);
-	return f_complex_new2(rb_cComplex, ZERO, m_sqrt_bang(f_negate(x)));
+    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);
     }
-    else {
-	get_dat1(x);
-
-	if (f_negative_p(dat->imag))
-	    return f_conj(m_sqrt(f_conj(x)));
+    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 {
-	    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)));
+	    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);
     }
-}
-#endif
-
-inline static VALUE
-f_complex_polar(VALUE klass, VALUE x, VALUE y)
-{
-    assert(!k_complex_p(x));
-    assert(!k_complex_p(y));
     return nucomp_s_canonicalize_internal(klass,
 					  f_mul(x, m_cos(y)),
 					  f_mul(x, m_sin(y)));
 }
 
+/* returns a Complex or Float of ang*PI-rotated abs */
+VALUE
+rb_dbl_complex_new_polar_pi(double abs, double ang)
+{
+    double fi;
+    const double fr = modf(ang, &fi);
+    int pos = fr == +0.5;
+
+    if (pos || fr == -0.5) {
+	if ((modf(fi / 2.0, &fi) != fr) ^ pos) abs = -abs;
+	return rb_complex_new(RFLOAT_0, DBL2NUM(abs));
+    }
+    else if (fr == 0.0) {
+	if (modf(fi / 2.0, &fi) != 0.0) abs = -abs;
+	return DBL2NUM(abs);
+    }
+    else {
+	ang *= M_PI;
+	return rb_complex_new(DBL2NUM(abs * cos(ang)), DBL2NUM(abs * sin(ang)));
+    }
+}
+
 /*
  * call-seq:
  *    Complex.polar(abs[, arg])  ->  complex
  *
  * Returns a complex object which denotes the given polar form.
  *
- *   Complex.polar(3, 0)           #=> (3.0+0.0i)
- *   Complex.polar(3, Math::PI/2)  #=> (1.836909530733566e-16+3.0i)
- *   Complex.polar(3, Math::PI)    #=> (-3.0+3.673819061467132e-16i)
- *   Complex.polar(3, -Math::PI/2) #=> (1.836909530733566e-16-3.0i)
+ *    Complex.polar(3, 0)            #=> (3.0+0.0i)
+ *    Complex.polar(3, Math::PI/2)   #=> (1.836909530733566e-16+3.0i)
+ *    Complex.polar(3, Math::PI)     #=> (-3.0+3.673819061467132e-16i)
+ *    Complex.polar(3, -Math::PI/2)  #=> (1.836909530733566e-16-3.0i)
  */
 static VALUE
 nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
@@ -600,8 +703,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);
-	arg = ZERO;
-	break;
+	if (canonicalization) return abs;
+	return nucomp_s_new_internal(klass, abs, ZERO);
       default:
 	nucomp_real_check(abs);
 	nucomp_real_check(arg);
@@ -615,9 +718,12 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
  *    cmp.real  ->  real
  *
  * Returns the real part.
+ *
+ *    Complex(7).real      #=> 7
+ *    Complex(9, -4).real  #=> 9
  */
-static VALUE
-nucomp_real(VALUE self)
+VALUE
+rb_complex_real(VALUE self)
 {
     get_dat1(self);
     return dat->real;
@@ -629,9 +735,12 @@ nucomp_real(VALUE self)
  *    cmp.imaginary  ->  real
  *
  * Returns the imaginary part.
+ *
+ *    Complex(7).imaginary      #=> 0
+ *    Complex(9, -4).imaginary  #=> -4
  */
-static VALUE
-nucomp_imag(VALUE self)
+VALUE
+rb_complex_imag(VALUE self)
 {
     get_dat1(self);
     return dat->imag;
@@ -642,26 +751,39 @@ nucomp_imag(VALUE self)
  *    -cmp  ->  complex
  *
  * Returns negation of the value.
+ *
+ *    -Complex(1, 2)  #=> (-1-2i)
  */
-static VALUE
-nucomp_negate(VALUE self)
+VALUE
+rb_complex_uminus(VALUE self)
 {
-  get_dat1(self);
-  return f_complex_new2(CLASS_OF(self),
-			f_negate(dat->real), f_negate(dat->imag));
+    get_dat1(self);
+    return f_complex_new2(CLASS_OF(self),
+			  f_negate(dat->real), f_negate(dat->imag));
 }
 
-inline static VALUE
-f_addsub(VALUE self, VALUE other,
-	 VALUE (*func)(VALUE, VALUE), ID id)
+/*
+ * 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)
 {
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
 	VALUE real, imag;
 
 	get_dat2(self, other);
 
-	real = (*func)(adat->real, bdat->real);
-	imag = (*func)(adat->imag, bdat->imag);
+	real = f_add(adat->real, bdat->real);
+	imag = f_add(adat->imag, bdat->imag);
 
 	return f_complex_new2(CLASS_OF(self), real, imag);
     }
@@ -669,33 +791,69 @@ f_addsub(VALUE self, VALUE other,
 	get_dat1(self);
 
 	return f_complex_new2(CLASS_OF(self),
-			      (*func)(dat->real, other), dat->imag);
+			      f_add(dat->real, other), dat->imag);
     }
-    return rb_num_coerce_bin(self, other, id);
+    return rb_num_coerce_bin(self, other, '+');
 }
 
 /*
  * call-seq:
- *    cmp + numeric  ->  complex
+ *    cmp - numeric  ->  complex
  *
- * Performs addition.
+ * Performs subtraction.
+ *
+ *    Complex(2, 3)  - Complex(2, 3)   #=> (0+0i)
+ *    Complex(900)   - Complex(1)      #=> (899+0i)
+ *    Complex(-2, 9) - Complex(-9, 2)  #=> (7+7i)
+ *    Complex(9, 8)  - 4               #=> (5+8i)
+ *    Complex(20, 9) - 9.8             #=> (10.2+9i)
  */
-static VALUE
-nucomp_add(VALUE self, VALUE other)
+VALUE
+rb_complex_minus(VALUE self, VALUE other)
 {
-    return f_addsub(self, other, f_add, '+');
+    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, '-');
 }
 
-/*
- * call-seq:
- *    cmp - numeric  ->  complex
- *
- * Performs subtraction.
- */
 static VALUE
-nucomp_sub(VALUE self, VALUE other)
+safe_mul(VALUE a, VALUE b, int az, int bz)
 {
-    return f_addsub(self, other, f_sub, '-');
+    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);
+}
+
+static void
+comp_mul(VALUE areal, VALUE aimag, VALUE breal, VALUE bimag, VALUE *real, VALUE *imag)
+{
+    int arzero = f_zero_p(areal);
+    int aizero = f_zero_p(aimag);
+    int brzero = f_zero_p(breal);
+    int bizero = f_zero_p(bimag);
+    *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));
 }
 
 /*
@@ -703,19 +861,21 @@ nucomp_sub(VALUE self, VALUE other)
  *    cmp * numeric  ->  complex
  *
  * Performs multiplication.
+ *
+ *    Complex(2, 3)  * Complex(2, 3)   #=> (-5+12i)
+ *    Complex(900)   * Complex(1)      #=> (900+0i)
+ *    Complex(-2, 9) * Complex(-9, 2)  #=> (0-85i)
+ *    Complex(9, 8)  * 4               #=> (36+32i)
+ *    Complex(20, 9) * 9.8             #=> (196.0+88.2i)
  */
-static VALUE
-nucomp_mul(VALUE self, VALUE other)
+VALUE
+rb_complex_mul(VALUE self, VALUE other)
 {
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
 	VALUE real, imag;
-
 	get_dat2(self, other);
 
-	real = f_sub(f_mul(adat->real, bdat->real),
-		     f_mul(adat->imag, bdat->imag));
-	imag = f_add(f_mul(adat->real, bdat->imag),
-		     f_mul(adat->imag, bdat->real));
+        comp_mul(adat->real, adat->imag, bdat->real, bdat->imag, &real, &imag);
 
 	return f_complex_new2(CLASS_OF(self), real, imag);
     }
@@ -733,50 +893,38 @@ inline static VALUE
 f_divide(VALUE self, VALUE other,
 	 VALUE (*func)(VALUE, VALUE), ID id)
 {
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
+        VALUE r, n, x, y;
 	int flo;
 	get_dat2(self, other);
 
-	flo = (k_float_p(adat->real) || k_float_p(adat->imag) ||
-	       k_float_p(bdat->real) || k_float_p(bdat->imag));
+	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));
 
 	if (f_gt_p(f_abs(bdat->real), f_abs(bdat->imag))) {
-	    VALUE r, n;
-
 	    r = (*func)(bdat->imag, bdat->real);
 	    n = f_mul(bdat->real, f_add(ONE, f_mul(r, r)));
-	    if (flo)
-		return f_complex_new2(CLASS_OF(self),
-				      (*func)(self, n),
-				      (*func)(f_negate(f_mul(self, r)), n));
-	    return f_complex_new2(CLASS_OF(self),
-				  (*func)(f_add(adat->real,
-						f_mul(adat->imag, r)), n),
-				  (*func)(f_sub(adat->imag,
-						f_mul(adat->real, r)), n));
+            x = (*func)(f_add(adat->real, f_mul(adat->imag, r)), n);
+            y = (*func)(f_sub(adat->imag, f_mul(adat->real, r)), n);
 	}
 	else {
-	    VALUE r, n;
-
 	    r = (*func)(bdat->real, bdat->imag);
 	    n = f_mul(bdat->imag, f_add(ONE, f_mul(r, r)));
-	    if (flo)
-		return f_complex_new2(CLASS_OF(self),
-				      (*func)(f_mul(self, r), n),
-				      (*func)(f_negate(self), n));
-	    return f_complex_new2(CLASS_OF(self),
-				  (*func)(f_add(f_mul(adat->real, r),
-						adat->imag), n),
-				  (*func)(f_sub(f_mul(adat->imag, r),
-						adat->real), n));
+            x = (*func)(f_add(f_mul(adat->real, r), adat->imag), n);
+            y = (*func)(f_sub(f_mul(adat->imag, r), adat->real), n);
 	}
+        if (!flo) {
+            x = rb_rational_canonicalize(x);
+            y = rb_rational_canonicalize(y);
+        }
+        return f_complex_new2(CLASS_OF(self), x, y);
     }
     if (k_numeric_p(other) && f_real_p(other)) {
+        VALUE x, y;
 	get_dat1(self);
-
-	return f_complex_new2(CLASS_OF(self),
-			      (*func)(dat->real, other),
-			      (*func)(dat->imag, other));
+        x = rb_rational_canonicalize((*func)(dat->real, other));
+        y = rb_rational_canonicalize((*func)(dat->imag, other));
+        return f_complex_new2(CLASS_OF(self), x, y);
     }
     return rb_num_coerce_bin(self, other, id);
 }
@@ -790,18 +938,19 @@ f_divide(VALUE self, VALUE other,
  *
  * Performs division.
  *
- * For example:
- *
- *     Complex(10.0) / 3  #=> (3.3333333333333335+(0/1)*i)
- *     Complex(10)   / 3  #=> ((10/3)+(0/1)*i)  # not (3+0i)
+ *    Complex(2, 3)  / Complex(2, 3)   #=> ((1/1)+(0/1)*i)
+ *    Complex(900)   / Complex(1)      #=> ((900/1)+(0/1)*i)
+ *    Complex(-2, 9) / Complex(-9, 2)  #=> ((36/85)-(77/85)*i)
+ *    Complex(9, 8)  / 4               #=> ((9/4)+(2/1)*i)
+ *    Complex(20, 9) / 9.8             #=> (2.0408163265306123+0.9183673469387754i)
  */
-static VALUE
-nucomp_div(VALUE self, VALUE other)
+VALUE
+rb_complex_div(VALUE self, VALUE other)
 {
     return f_divide(self, other, f_quo, id_quo);
 }
 
-#define nucomp_quo nucomp_div
+#define nucomp_quo rb_complex_div
 
 /*
  * call-seq:
@@ -809,9 +958,7 @@ nucomp_div(VALUE self, VALUE other)
  *
  * Performs division as each part is a float, never returns a float.
  *
- * For example:
- *
- *     Complex(11,22).fdiv(3)  #=> (3.6666666666666665+7.333333333333333i)
+ *    Complex(11, 22).fdiv(3)  #=> (3.6666666666666665+7.333333333333333i)
  */
 static VALUE
 nucomp_fdiv(VALUE self, VALUE other)
@@ -831,28 +978,26 @@ f_reciprocal(VALUE x)
  *
  * Performs exponentiation.
  *
- * For example:
- *
- *     Complex('i') ** 2             #=> (-1+0i)
- *     Complex(-8) ** Rational(1,3)  #=> (1.0000000000000002+1.7320508075688772i)
+ *    Complex('i') ** 2              #=> (-1+0i)
+ *    Complex(-8) ** Rational(1, 3)  #=> (1.0000000000000002+1.7320508075688772i)
  */
-static VALUE
-nucomp_expt(VALUE self, VALUE other)
+VALUE
+rb_complex_pow(VALUE self, VALUE other)
 {
     if (k_numeric_p(other) && k_exact_zero_p(other))
 	return f_complex_new_bang1(CLASS_OF(self), ONE);
 
-    if (k_rational_p(other) && f_one_p(f_denominator(other)))
-	other = f_numerator(other); /* c14n */
+    if (RB_TYPE_P(other, T_RATIONAL) && RRATIONAL(other)->den == LONG2FIX(1))
+	other = RRATIONAL(other)->num; /* c14n */
 
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
 	get_dat1(other);
 
 	if (k_exact_zero_p(dat->imag))
 	    other = dat->real; /* c14n */
     }
 
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
 	VALUE r, theta, nr, ntheta;
 
 	get_dat1(other);
@@ -866,44 +1011,51 @@ nucomp_expt(VALUE self, VALUE other)
 		       f_mul(dat->imag, m_log_bang(r)));
 	return f_complex_polar(CLASS_OF(self), nr, ntheta);
     }
-    if (k_fixnum_p(other)) {
-	if (f_gt_p(other, ZERO)) {
-	    VALUE x, z;
-	    long n;
-
-	    x = self;
-	    z = x;
-	    n = FIX2LONG(other) - 1;
-
-	    while (n) {
-		long q, r;
-
-		while (1) {
-		    get_dat1(x);
-
-		    q = n / 2;
-		    r = n % 2;
-
-		    if (r)
-			break;
-
-		    x = f_complex_new2(CLASS_OF(self),
-				       f_sub(f_mul(dat->real, dat->real),
-					     f_mul(dat->imag, dat->imag)),
-				       f_mul(f_mul(TWO, dat->real), dat->imag));
-		    n = q;
-		}
-		z = f_mul(z, x);
-		n--;
-	    }
-	    return z;
+    if (FIXNUM_P(other)) {
+        long n = FIX2LONG(other);
+        if (n == 0) {
+            return nucomp_s_new_internal(CLASS_OF(self), ONE, ZERO);
+        }
+        if (n < 0) {
+            self = f_reciprocal(self);
+            other = rb_int_uminus(other);
+            n = -n;
+        }
+        {
+            get_dat1(self);
+            VALUE xr = dat->real, xi = dat->imag, zr = xr, zi = xi;
+
+            if (f_zero_p(xi)) {
+                zr = rb_num_pow(zr, other);
+            }
+            else if (f_zero_p(xr)) {
+                zi = rb_num_pow(zi, other);
+                if (n & 2) zi = f_negate(zi);
+                if (!(n & 1)) {
+                    VALUE tmp = zr;
+                    zr = zi;
+                    zi = tmp;
+                }
+            }
+            else {
+                while (--n) {
+                    long q, r;
+
+                    for (; q = n / 2, r = n % 2, r == 0; n = q) {
+                        VALUE tmp = f_sub(f_mul(xr, xr), f_mul(xi, xi));
+                        xi = f_mul(f_mul(TWO, xr), xi);
+                        xr = tmp;
+                    }
+                    comp_mul(zr, zi, xr, xi, &zr, &zi);
+                }
+            }
+            return nucomp_s_new_internal(CLASS_OF(self), zr, zi);
 	}
-	return f_expt(f_reciprocal(self), f_negate(other));
     }
     if (k_numeric_p(other) && f_real_p(other)) {
 	VALUE r, theta;
 
-	if (k_bignum_p(other))
+	if (RB_TYPE_P(other, T_BIGNUM))
 	    rb_warn("in a**b, b may be too big");
 
 	r = f_abs(self);
@@ -920,11 +1072,17 @@ nucomp_expt(VALUE self, VALUE other)
  *    cmp == object  ->  true or false
  *
  * Returns true if cmp equals object numerically.
+ *
+ *    Complex(2, 3)  == Complex(2, 3)   #=> true
+ *    Complex(5)     == 5               #=> true
+ *    Complex(0)     == 0.0             #=> true
+ *    Complex('1/3') == 0.33            #=> false
+ *    Complex('1/2') == '1/2'           #=> false
  */
 static VALUE
 nucomp_eqeq_p(VALUE self, VALUE other)
 {
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
 	get_dat2(self, other);
 
 	return f_boolcast(f_eqeq_p(adat->real, bdat->real) &&
@@ -935,20 +1093,57 @@ nucomp_eqeq_p(VALUE self, VALUE other)
 
 	return f_boolcast(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag));
     }
-    return f_eqeq_p(other, self);
+    return f_boolcast(f_eqeq_p(other, self));
+}
+
+static bool
+nucomp_real_p(VALUE self)
+{
+    get_dat1(self);
+    return(f_zero_p(dat->imag) ? true : false);
+}
+
+/*
+ * call-seq:
+ *    cmp <=> object  ->  0, 1, -1, or nil
+ *
+ * If +cmp+'s imaginary part is zero, and +object+ is also a
+ * real number (or a Complex number where the imaginary part is zero),
+ * compare the real part of +cmp+ to object.  Otherwise, return nil.
+ *
+ *    Complex(2, 3)  <=> Complex(2, 3)   #=> nil
+ *    Complex(2, 3)  <=> 1               #=> nil
+ *    Complex(2)     <=> 1               #=> 1
+ *    Complex(2)     <=> 2               #=> 0
+ *    Complex(2)     <=> 3               #=> -1
+ */
+static VALUE
+nucomp_cmp(VALUE self, VALUE other)
+{
+    if (nucomp_real_p(self) && k_numeric_p(other)) {
+        if (RB_TYPE_P(other, T_COMPLEX) && nucomp_real_p(other)) {
+            get_dat2(self, other);
+            return rb_funcall(adat->real, idCmp, 1, bdat->real);
+        }
+        else if (f_real_p(other)) {
+            get_dat1(self);
+            return rb_funcall(dat->real, idCmp, 1, other);
+        }
+    }
+    return Qnil;
 }
 
 /* :nodoc: */
 static VALUE
 nucomp_coerce(VALUE self, VALUE other)
 {
-    if (k_numeric_p(other) && f_real_p(other))
-	return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self);
-    if (TYPE(other) == T_COMPLEX)
+    if (RB_TYPE_P(other, T_COMPLEX))
 	return rb_assoc_new(other, self);
+    if (k_numeric_p(other) && f_real_p(other))
+        return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self);
 
-    rb_raise(rb_eTypeError, "%s can't be coerced into %s",
-	     rb_obj_classname(other), rb_obj_classname(self));
+    rb_raise(rb_eTypeError, "%"PRIsVALUE" can't be coerced into %"PRIsVALUE,
+	     rb_obj_class(other), rb_obj_class(self));
     return Qnil;
 }
 
@@ -958,25 +1153,28 @@ nucomp_coerce(VALUE self, VALUE other)
  *    cmp.magnitude  ->  real
  *
  * Returns the absolute part of its polar form.
+ *
+ *    Complex(-1).abs         #=> 1
+ *    Complex(3.0, -4.0).abs  #=> 5.0
  */
-static VALUE
-nucomp_abs(VALUE self)
+VALUE
+rb_complex_abs(VALUE self)
 {
     get_dat1(self);
 
     if (f_zero_p(dat->real)) {
 	VALUE a = f_abs(dat->imag);
-	if (k_float_p(dat->real) && !k_float_p(dat->imag))
+	if (RB_FLOAT_TYPE_P(dat->real) && !RB_FLOAT_TYPE_P(dat->imag))
 	    a = f_to_f(a);
 	return a;
     }
     if (f_zero_p(dat->imag)) {
 	VALUE a = f_abs(dat->real);
-	if (!k_float_p(dat->real) && k_float_p(dat->imag))
+	if (!RB_FLOAT_TYPE_P(dat->real) && RB_FLOAT_TYPE_P(dat->imag))
 	    a = f_to_f(a);
 	return a;
     }
-    return m_hypot(dat->real, dat->imag);
+    return rb_math_hypot(dat->real, dat->imag);
 }
 
 /*
@@ -984,6 +1182,9 @@ nucomp_abs(VALUE self)
  *    cmp.abs2  ->  real
  *
  * Returns square of the absolute value.
+ *
+ *    Complex(-1).abs2         #=> 1
+ *    Complex(3.0, -4.0).abs2  #=> 25.0
  */
 static VALUE
 nucomp_abs2(VALUE self)
@@ -1001,14 +1202,13 @@ nucomp_abs2(VALUE self)
  *
  * Returns the angle part of its polar form.
  *
- *   Complex.polar(3, Math::PI/2).arg #=> 1.5707963267948966
- *
+ *    Complex.polar(3, Math::PI/2).arg  #=> 1.5707963267948966
  */
-static VALUE
-nucomp_arg(VALUE self)
+VALUE
+rb_complex_arg(VALUE self)
 {
     get_dat1(self);
-    return m_atan2_bang(dat->imag, dat->real);
+    return rb_math_atan2(dat->imag, dat->real);
 }
 
 /*
@@ -1017,6 +1217,8 @@ nucomp_arg(VALUE self)
  *    cmp.rectangular  ->  array
  *
  * Returns an array; [cmp.real, cmp.imag].
+ *
+ *    Complex(1, 2).rectangular  #=> [1, 2]
  */
 static VALUE
 nucomp_rect(VALUE self)
@@ -1030,6 +1232,8 @@ nucomp_rect(VALUE self)
  *    cmp.polar  ->  array
  *
  * Returns an array; [cmp.abs, cmp.arg].
+ *
+ *    Complex(1, 2).polar  #=> [2.23606797749979, 1.1071487177940904]
  */
 static VALUE
 nucomp_polar(VALUE self)
@@ -1043,28 +1247,22 @@ nucomp_polar(VALUE self)
  *    cmp.conjugate  ->  complex
  *
  * Returns the complex conjugate.
+ *
+ *    Complex(1, 2).conjugate  #=> (1-2i)
  */
-static VALUE
-nucomp_conj(VALUE self)
+VALUE
+rb_complex_conjugate(VALUE self)
 {
     get_dat1(self);
     return f_complex_new2(CLASS_OF(self), dat->real, f_negate(dat->imag));
 }
 
-#if 0
-/* :nodoc: */
-static VALUE
-nucomp_true(VALUE self)
-{
-    return Qtrue;
-}
-#endif
-
 /*
  * call-seq:
- *    cmp.real?  ->  false
+ *    Complex(1).real?     ->  false
+ *    Complex(1, 2).real?  ->  false
  *
- * Returns false.
+ * Returns false, even if the complex number has no imaginary part.
  */
 static VALUE
 nucomp_false(VALUE self)
@@ -1072,23 +1270,6 @@ nucomp_false(VALUE self)
     return Qfalse;
 }
 
-#if 0
-/* :nodoc: */
-static VALUE
-nucomp_exact_p(VALUE self)
-{
-    get_dat1(self);
-    return f_boolcast(k_exact_p(dat->real) && k_exact_p(dat->imag));
-}
-
-/* :nodoc: */
-static VALUE
-nucomp_inexact_p(VALUE self)
-{
-    return f_boolcast(!nucomp_exact_p(self));
-}
-#endif
-
 /*
  * call-seq:
  *    cmp.denominator  ->  integer
@@ -1110,8 +1291,6 @@ nucomp_denominator(VALUE self)
  *
  * Returns the numerator.
  *
- * For example:
- *
  *        1   2       3+4i  <-  numerator
  *        - + -i  ->  ----
  *        2   3        6    <-  denominator
@@ -1131,7 +1310,7 @@ nucomp_numerator(VALUE self)
 
     get_dat1(self);
 
-    cd = f_denominator(self);
+    cd = nucomp_denominator(self);
     return f_complex_new2(CLASS_OF(self),
 			  f_mul(f_numerator(dat->real),
 				f_div(cd, f_denominator(dat->real))),
@@ -1152,14 +1331,14 @@ nucomp_hash(VALUE self)
     n = rb_hash(dat->imag);
     h[1] = NUM2LONG(n);
     v = rb_memhash(h, sizeof(h));
-    return LONG2FIX(v);
+    return ST2FIX(v);
 }
 
 /* :nodoc: */
 static VALUE
 nucomp_eql_p(VALUE self, VALUE other)
 {
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
 	get_dat2(self, other);
 
 	return f_boolcast((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) &&
@@ -1170,32 +1349,27 @@ nucomp_eql_p(VALUE self, VALUE other)
     return Qfalse;
 }
 
-inline static VALUE
+inline static int
 f_signbit(VALUE x)
 {
-#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun__) && \
-    !defined(signbit)
-    extern int signbit(double);
-#endif
-    switch (TYPE(x)) {
-      case T_FLOAT: {
+    if (RB_FLOAT_TYPE_P(x)) {
 	double f = RFLOAT_VALUE(x);
-	return f_boolcast(!isnan(f) && signbit(f));
-      }
+	return !isnan(f) && signbit(f);
     }
     return f_negative_p(x);
 }
 
-inline static VALUE
+inline static int
 f_tpositive_p(VALUE x)
 {
-    return f_boolcast(!f_signbit(x));
+    return !f_signbit(x);
 }
 
 static VALUE
 f_format(VALUE self, VALUE (*func)(VALUE))
 {
-    VALUE s, impos;
+    VALUE s;
+    int impos;
 
     get_dat1(self);
 
@@ -1217,11 +1391,17 @@ f_format(VALUE self, VALUE (*func)(VALUE))
  *    cmp.to_s  ->  string
  *
  * Returns the value as a string.
+ *
+ *    Complex(2).to_s                       #=> "2+0i"
+ *    Complex('-8/6').to_s                  #=> "-4/3+0i"
+ *    Complex('1/2i').to_s                  #=> "0+1/2i"
+ *    Complex(0, Float::INFINITY).to_s      #=> "0+Infinity*i"
+ *    Complex(Float::NAN, Float::NAN).to_s  #=> "NaN+NaN*i"
  */
 static VALUE
 nucomp_to_s(VALUE self)
 {
-    return f_format(self, f_to_s);
+    return f_format(self, rb_String);
 }
 
 /*
@@ -1229,6 +1409,12 @@ nucomp_to_s(VALUE self)
  *    cmp.inspect  ->  string
  *
  * Returns the value as a string for inspection.
+ *
+ *    Complex(2).inspect                       #=> "(2+0i)"
+ *    Complex('-8/6').inspect                  #=> "((-4/3)+0i)"
+ *    Complex('1/2i').inspect                  #=> "(0+(1/2)*i)"
+ *    Complex(0, Float::INFINITY).inspect      #=> "(0+Infinity*i)"
+ *    Complex(Float::NAN, Float::NAN).inspect  #=> "(NaN+NaN*i)"
  */
 static VALUE
 nucomp_inspect(VALUE self)
@@ -1236,12 +1422,75 @@ nucomp_inspect(VALUE self)
     VALUE s;
 
     s = rb_usascii_str_new2("(");
-    rb_str_concat(s, f_format(self, f_inspect));
+    rb_str_concat(s, f_format(self, rb_inspect));
     rb_str_cat2(s, ")");
 
     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 real and imaginary parts are both finite numbers,
+ * otherwise returns +false+.
+ */
+static VALUE
+rb_complex_finite_p(VALUE self)
+{
+    get_dat1(self);
+
+    if (f_finite_p(dat->real) && f_finite_p(dat->imag)) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *    cmp.infinite?  ->  nil or 1
+ *
+ * Returns +1+ if +cmp+'s real or imaginary part is an infinite number,
+ * otherwise returns +nil+.
+ *
+ *  For example:
+ *
+ *     (1+1i).infinite?                   #=> nil
+ *     (Float::INFINITY + 1i).infinite?   #=> 1
+ */
+static VALUE
+rb_complex_infinite_p(VALUE self)
+{
+    get_dat1(self);
+
+    if (NIL_P(f_infinite_p(dat->real)) && NIL_P(f_infinite_p(dat->imag))) {
+	return Qnil;
+    }
+    return ONE;
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_dumper(VALUE self)
+{
+    return self;
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_loader(VALUE self, VALUE a)
+{
+    get_dat1(self);
+
+    RCOMPLEX_SET_REAL(dat, rb_ivar_get(a, id_i_real));
+    RCOMPLEX_SET_IMAG(dat, rb_ivar_get(a, id_i_imag));
+    OBJ_FREEZE_RAW(self);
+
+    return self;
+}
+
 /* :nodoc: */
 static VALUE
 nucomp_marshal_dump(VALUE self)
@@ -1258,11 +1507,11 @@ nucomp_marshal_dump(VALUE self)
 static VALUE
 nucomp_marshal_load(VALUE self, VALUE a)
 {
-    get_dat1(self);
     Check_Type(a, T_ARRAY);
-    dat->real = RARRAY_PTR(a)[0];
-    dat->imag = RARRAY_PTR(a)[1];
-    rb_copy_generic_ivar(self, a);
+    if (RARRAY_LEN(a) != 2)
+	rb_raise(rb_eArgError, "marshaled complex must have an array whose length is 2 but %ld", RARRAY_LEN(a));
+    rb_ivar_set(self, id_i_real, RARRAY_AREF(a, 0));
+    rb_ivar_set(self, id_i_imag, RARRAY_AREF(a, 1));
     return self;
 }
 
@@ -1281,12 +1530,16 @@ rb_complex_new(VALUE x, VALUE y)
 }
 
 VALUE
-rb_complex_polar(VALUE x, VALUE y)
+rb_complex_new_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_polar(VALUE x, VALUE y)
+{
+    return rb_complex_new_polar(x, y);
+}
 
 VALUE
 rb_Complex(VALUE x, VALUE y)
@@ -1297,21 +1550,38 @@ rb_Complex(VALUE x, VALUE y)
     return nucomp_s_convert(2, a, rb_cComplex);
 }
 
+/*!
+ * Creates a Complex object.
+ *
+ * \param real    real part value
+ * \param imag    imaginary part value
+ * \return        a new Complex object
+ */
+VALUE
+rb_dbl_complex_new(double real, double imag)
+{
+    return rb_complex_raw(DBL2NUM(real), DBL2NUM(imag));
+}
+
 /*
  * call-seq:
  *    cmp.to_i  ->  integer
  *
- * Returns the value as an integer if possible.
+ * Returns the value as an integer if possible (the imaginary part
+ * should be exactly zero).
+ *
+ *    Complex(1, 0).to_i    #=> 1
+ *    Complex(1, 0.0).to_i  # RangeError
+ *    Complex(1, 2).to_i    # RangeError
  */
 static VALUE
 nucomp_to_i(VALUE self)
 {
     get_dat1(self);
 
-    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
-	VALUE s = f_to_s(self);
-	rb_raise(rb_eRangeError, "can't convert %s into Integer",
-		 StringValuePtr(s));
+    if (!k_exact_zero_p(dat->imag)) {
+	rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Integer",
+		 self);
     }
     return f_to_i(dat->real);
 }
@@ -1320,17 +1590,21 @@ nucomp_to_i(VALUE self)
  * call-seq:
  *    cmp.to_f  ->  float
  *
- * Returns the value as a float if possible.
+ * Returns the value as a float if possible (the imaginary part should
+ * be exactly zero).
+ *
+ *    Complex(1, 0).to_f    #=> 1.0
+ *    Complex(1, 0.0).to_f  # RangeError
+ *    Complex(1, 2).to_f    # RangeError
  */
 static VALUE
 nucomp_to_f(VALUE self)
 {
     get_dat1(self);
 
-    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
-	VALUE s = f_to_s(self);
-	rb_raise(rb_eRangeError, "can't convert %s into Float",
-		 StringValuePtr(s));
+    if (!k_exact_zero_p(dat->imag)) {
+	rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Float",
+		 self);
     }
     return f_to_f(dat->real);
 }
@@ -1339,18 +1613,23 @@ nucomp_to_f(VALUE self)
  * call-seq:
  *    cmp.to_r  ->  rational
  *
- * If the imaginary part is exactly 0, returns the real part as a Rational,
- * otherwise a RangeError is raised.
+ * Returns the value as a rational if possible (the imaginary part
+ * should be exactly zero).
+ *
+ *    Complex(1, 0).to_r    #=> (1/1)
+ *    Complex(1, 0.0).to_r  # RangeError
+ *    Complex(1, 2).to_r    # RangeError
+ *
+ * See rationalize.
  */
 static VALUE
 nucomp_to_r(VALUE self)
 {
     get_dat1(self);
 
-    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
-	VALUE s = f_to_s(self);
-	rb_raise(rb_eRangeError, "can't convert %s into Rational",
-		 StringValuePtr(s));
+    if (!k_exact_zero_p(dat->imag)) {
+	rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational",
+		 self);
     }
     return f_to_r(dat->real);
 }
@@ -1359,22 +1638,42 @@ nucomp_to_r(VALUE self)
  * call-seq:
  *    cmp.rationalize([eps])  ->  rational
  *
- * If the imaginary part is exactly 0, returns the real part as a Rational,
- * otherwise a RangeError is raised.
+ * Returns the value as a rational if possible (the imaginary part
+ * should be exactly zero).
+ *
+ *    Complex(1.0/3, 0).rationalize  #=> (1/3)
+ *    Complex(1, 0.0).rationalize    # RangeError
+ *    Complex(1, 2).rationalize      # RangeError
+ *
+ * See to_r.
  */
 static VALUE
 nucomp_rationalize(int argc, VALUE *argv, VALUE self)
 {
     get_dat1(self);
 
-    rb_scan_args(argc, argv, "01", NULL);
+    rb_check_arity(argc, 0, 1);
 
-    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
-       VALUE s = f_to_s(self);
-       rb_raise(rb_eRangeError, "can't convert %s into Rational",
-                StringValuePtr(s));
+    if (!k_exact_zero_p(dat->imag)) {
+       rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational",
+                self);
     }
-    return rb_funcall(dat->real, rb_intern("rationalize"), argc, argv);
+    return rb_funcallv(dat->real, id_rationalize, argc, argv);
+}
+
+/*
+ * call-seq:
+ *    complex.to_c  ->  self
+ *
+ * Returns self.
+ *
+ *    Complex(2).to_c      #=> (2+0i)
+ *    Complex(-8, 6).to_c  #=> (-8+6i)
+ */
+static VALUE
+nucomp_to_c(VALUE self)
+{
+    return self;
 }
 
 /*
@@ -1401,159 +1700,304 @@ numeric_to_c(VALUE self)
     return rb_complex_new1(self);
 }
 
-static VALUE comp_pat0, comp_pat1, comp_pat2, a_slash, a_dot_and_an_e,
-    null_string, underscores_pat, an_underscore;
+#include <ctype.h>
 
-#define WS "\\s*"
-#define DIGITS "(?:[0-9](?:_[0-9]|[0-9])*)"
-#define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?"
-#define DENOMINATOR DIGITS
-#define NUMBER "[-+]?" NUMERATOR "(?:\\/" DENOMINATOR ")?"
-#define NUMBERNOS NUMERATOR "(?:\\/" DENOMINATOR ")?"
-#define PATTERN0 "\\A" WS "(" NUMBER ")@(" NUMBER ")" WS
-#define PATTERN1 "\\A" WS "([-+])?(" NUMBER ")?[iIjJ]" WS
-#define PATTERN2 "\\A" WS "(" NUMBER ")(([-+])(" NUMBERNOS ")?[iIjJ])?" WS
+inline static int
+issign(int c)
+{
+    return (c == '-' || c == '+');
+}
 
-static void
-make_patterns(void)
+static int
+read_sign(const char **s,
+	  char **b)
 {
-    static const char comp_pat0_source[] = PATTERN0;
-    static const char comp_pat1_source[] = PATTERN1;
-    static const char comp_pat2_source[] = PATTERN2;
-    static const char underscores_pat_source[] = "_+";
+    int sign = '?';
 
-    if (comp_pat0) return;
+    if (issign(**s)) {
+	sign = **b = **s;
+	(*s)++;
+	(*b)++;
+    }
+    return sign;
+}
 
-    comp_pat0 = rb_reg_new(comp_pat0_source, sizeof comp_pat0_source - 1, 0);
-    rb_gc_register_mark_object(comp_pat0);
+inline static int
+isdecimal(int c)
+{
+    return isdigit((unsigned char)c);
+}
 
-    comp_pat1 = rb_reg_new(comp_pat1_source, sizeof comp_pat1_source - 1, 0);
-    rb_gc_register_mark_object(comp_pat1);
+static int
+read_digits(const char **s, int strict,
+	    char **b)
+{
+    int us = 1;
+
+    if (!isdecimal(**s))
+	return 0;
+
+    while (isdecimal(**s) || **s == '_') {
+	if (**s == '_') {
+	    if (strict) {
+		if (us)
+		    return 0;
+	    }
+	    us = 1;
+	}
+	else {
+	    **b = **s;
+	    (*b)++;
+	    us = 0;
+	}
+	(*s)++;
+    }
+    if (us)
+	do {
+	    (*s)--;
+	} while (**s == '_');
+    return 1;
+}
 
-    comp_pat2 = rb_reg_new(comp_pat2_source, sizeof comp_pat2_source - 1, 0);
-    rb_gc_register_mark_object(comp_pat2);
+inline static int
+islettere(int c)
+{
+    return (c == 'e' || c == 'E');
+}
 
-    a_slash = rb_usascii_str_new2("/");
-    rb_gc_register_mark_object(a_slash);
+static int
+read_num(const char **s, int strict,
+	 char **b)
+{
+    if (**s != '.') {
+	if (!read_digits(s, strict, b))
+	    return 0;
+    }
 
-    a_dot_and_an_e = rb_usascii_str_new2(".eE");
-    rb_gc_register_mark_object(a_dot_and_an_e);
+    if (**s == '.') {
+	**b = **s;
+	(*s)++;
+	(*b)++;
+	if (!read_digits(s, strict, b)) {
+	    (*b)--;
+	    return 0;
+	}
+    }
 
-    null_string = rb_usascii_str_new2("");
-    rb_gc_register_mark_object(null_string);
+    if (islettere(**s)) {
+	**b = **s;
+	(*s)++;
+	(*b)++;
+	read_sign(s, b);
+	if (!read_digits(s, strict, b)) {
+	    (*b)--;
+	    return 0;
+	}
+    }
+    return 1;
+}
 
-    underscores_pat = rb_reg_new(underscores_pat_source,
-				 sizeof underscores_pat_source - 1, 0);
-    rb_gc_register_mark_object(underscores_pat);
+inline static int
+read_den(const char **s, int strict,
+	 char **b)
+{
+    if (!read_digits(s, strict, b))
+	return 0;
+    return 1;
+}
 
-    an_underscore = rb_usascii_str_new2("_");
-    rb_gc_register_mark_object(an_underscore);
+static int
+read_rat_nos(const char **s, int strict,
+	     char **b)
+{
+    if (!read_num(s, strict, b))
+	return 0;
+    if (**s == '/') {
+	**b = **s;
+	(*s)++;
+	(*b)++;
+	if (!read_den(s, strict, b)) {
+	    (*b)--;
+	    return 0;
+	}
+    }
+    return 1;
 }
 
-#define id_match rb_intern("match")
-#define f_match(x,y) rb_funcall((x), id_match, 1, (y))
+static int
+read_rat(const char **s, int strict,
+	 char **b)
+{
+    read_sign(s, b);
+    if (!read_rat_nos(s, strict, b))
+	return 0;
+    return 1;
+}
 
-#define id_gsub_bang rb_intern("gsub!")
-#define f_gsub_bang(x,y,z) rb_funcall((x), id_gsub_bang, 2, (y), (z))
+inline static int
+isimagunit(int c)
+{
+    return (c == 'i' || c == 'I' ||
+	    c == 'j' || c == 'J');
+}
 
 static VALUE
-string_to_c_internal(VALUE self)
+str2num(char *s)
 {
-    VALUE s;
+    if (strchr(s, '/'))
+	return rb_cstr_to_rat(s, 0);
+    if (strpbrk(s, ".eE"))
+	return DBL2NUM(rb_cstr_to_dbl(s, 0));
+    return rb_cstr_to_inum(s, 10, 0);
+}
 
-    s = self;
+static int
+read_comp(const char **s, int strict,
+	  VALUE *ret, char **b)
+{
+    char *bb;
+    int sign;
+    VALUE num, num2;
 
-    if (RSTRING_LEN(s) == 0)
-	return rb_assoc_new(Qnil, self);
+    bb = *b;
 
-    {
-	VALUE m, sr, si, re, r, i;
-	int po;
-
-	m = f_match(comp_pat0, s);
-	if (!NIL_P(m)) {
-	    sr = rb_reg_nth_match(1, m);
-	    si = rb_reg_nth_match(2, m);
-	    re = rb_reg_match_post(m);
-	    po = 1;
-	}
-	if (NIL_P(m)) {
-	    m = f_match(comp_pat1, s);
-	    if (!NIL_P(m)) {
-		sr = Qnil;
-		si = rb_reg_nth_match(1, m);
-		if (NIL_P(si))
-		    si = rb_usascii_str_new2("");
-		{
-		    VALUE t;
-
-		    t = rb_reg_nth_match(2, m);
-		    if (NIL_P(t))
-			t = rb_usascii_str_new2("1");
-		    rb_str_concat(si, t);
-		}
-		re = rb_reg_match_post(m);
-		po = 0;
-	    }
+    sign = read_sign(s, b);
+
+    if (isimagunit(**s)) {
+	(*s)++;
+	num = INT2FIX((sign == '-') ? -1 : + 1);
+	*ret = rb_complex_new2(ZERO, num);
+	return 1; /* e.g. "i" */
+    }
+
+    if (!read_rat_nos(s, strict, b)) {
+	**b = '\0';
+	num = str2num(bb);
+	*ret = rb_complex_new2(num, ZERO);
+	return 0; /* e.g. "-" */
+    }
+    **b = '\0';
+    num = str2num(bb);
+
+    if (isimagunit(**s)) {
+	(*s)++;
+	*ret = rb_complex_new2(ZERO, num);
+	return 1; /* e.g. "3i" */
+    }
+
+    if (**s == '@') {
+	int st;
+
+	(*s)++;
+	bb = *b;
+	st = read_rat(s, strict, b);
+	**b = '\0';
+	if (strlen(bb) < 1 ||
+	    !isdecimal(*(bb + strlen(bb) - 1))) {
+	    *ret = rb_complex_new2(num, ZERO);
+	    return 0; /* e.g. "1@-" */
 	}
-	if (NIL_P(m)) {
-	    m = f_match(comp_pat2, s);
-	    if (NIL_P(m))
-		return rb_assoc_new(Qnil, self);
-	    sr = rb_reg_nth_match(1, m);
-	    if (NIL_P(rb_reg_nth_match(2, m)))
-		si = Qnil;
-	    else {
-		VALUE t;
-
-		si = rb_reg_nth_match(3, m);
-		t = rb_reg_nth_match(4, m);
-		if (NIL_P(t))
-		    t = rb_usascii_str_new2("1");
-		rb_str_concat(si, t);
+	num2 = str2num(bb);
+	*ret = rb_complex_new_polar(num, num2);
+	if (!st)
+	    return 0; /* e.g. "1@2." */
+	else
+	    return 1; /* e.g. "1@2" */
+    }
+
+    if (issign(**s)) {
+	bb = *b;
+	sign = read_sign(s, b);
+	if (isimagunit(**s))
+	    num2 = INT2FIX((sign == '-') ? -1 : + 1);
+	else {
+	    if (!read_rat_nos(s, strict, b)) {
+		*ret = rb_complex_new2(num, ZERO);
+		return 0; /* e.g. "1+xi" */
 	    }
-	    re = rb_reg_match_post(m);
-	    po = 0;
-	}
-	r = INT2FIX(0);
-	i = INT2FIX(0);
-	if (!NIL_P(sr)) {
-	    if (strchr(RSTRING_PTR(sr), '/'))
-		r = f_to_r(sr);
-	    else if (strpbrk(RSTRING_PTR(sr), ".eE"))
-		r = f_to_f(sr);
-	    else
-		r = f_to_i(sr);
+	    **b = '\0';
+	    num2 = str2num(bb);
 	}
-	if (!NIL_P(si)) {
-	    if (strchr(RSTRING_PTR(si), '/'))
-		i = f_to_r(si);
-	    else if (strpbrk(RSTRING_PTR(si), ".eE"))
-		i = f_to_f(si);
-	    else
-		i = f_to_i(si);
+	if (!isimagunit(**s)) {
+	    *ret = rb_complex_new2(num, ZERO);
+	    return 0; /* e.g. "1+3x" */
 	}
-	if (po)
-	    return rb_assoc_new(rb_complex_polar(r, i), re);
-	else
-	    return rb_assoc_new(rb_complex_new2(r, i), re);
+	(*s)++;
+	*ret = rb_complex_new2(num, num2);
+	return 1; /* e.g. "1+2i" */
+    }
+    /* !(@, - or +) */
+    {
+	*ret = rb_complex_new2(num, ZERO);
+	return 1; /* e.g. "3" */
     }
 }
 
-static VALUE
-string_to_c_strict(VALUE self)
+inline static void
+skip_ws(const char **s)
 {
-    VALUE a = string_to_c_internal(self);
-    if (NIL_P(RARRAY_PTR(a)[0]) || RSTRING_LEN(RARRAY_PTR(a)[1]) > 0) {
-	VALUE s = f_inspect(self);
-	rb_raise(rb_eArgError, "invalid value for convert(): %s",
-		 StringValuePtr(s));
+    while (isspace((unsigned char)**s))
+	(*s)++;
+}
+
+static int
+parse_comp(const char *s, int strict, VALUE *num)
+{
+    char *buf, *b;
+    VALUE tmp;
+    int ret = 1;
+
+    buf = ALLOCV_N(char, tmp, strlen(s) + 1);
+    b = buf;
+
+    skip_ws(&s);
+    if (!read_comp(&s, strict, num, &b)) {
+        ret = 0;
     }
-    return RARRAY_PTR(a)[0];
+    else {
+        skip_ws(&s);
+
+        if (strict)
+            if (*s != '\0')
+                ret = 0;
+    }
+    ALLOCV_END(tmp);
+
+    return ret;
 }
 
-#define id_gsub rb_intern("gsub")
-#define f_gsub(x,y,z) rb_funcall((x), id_gsub, 2, (y), (z))
+static VALUE
+string_to_c_strict(VALUE self, int raise)
+{
+    char *s;
+    VALUE num;
+
+    rb_must_asciicompat(self);
+
+    s = RSTRING_PTR(self);
+
+    if (!s || memchr(s, '\0', RSTRING_LEN(self))) {
+        if (!raise) return Qnil;
+	rb_raise(rb_eArgError, "string contains null byte");
+    }
+
+    if (s && s[RSTRING_LEN(self)]) {
+	rb_str_modify(self);
+	s = RSTRING_PTR(self);
+	s[RSTRING_LEN(self)] = '\0';
+    }
+
+    if (!s)
+	s = (char *)"";
+
+    if (!parse_comp(s, 1, &num)) {
+        if (!raise) return Qnil;
+	rb_raise(rb_eArgError, "invalid value for convert(): %+"PRIsVALUE,
+		 self);
+    }
+
+    return num;
+}
 
 /*
  * call-seq:
@@ -1564,8 +2008,6 @@ string_to_c_strict(VALUE self)
  * sequences can be separated by an underscore.  Returns zero for null
  * or garbage string.
  *
- * For example:
- *
  *    '9'.to_c           #=> (9+0i)
  *    '2.5'.to_c         #=> (2.5+0i)
  *    '2.5/1'.to_c       #=> ((5/2)+0i)
@@ -1577,62 +2019,58 @@ string_to_c_strict(VALUE self)
  *    '-0.0-0.0i'.to_c   #=> (-0.0-0.0i)
  *    '1/2+3/4i'.to_c    #=> ((1/2)+(3/4)*i)
  *    'ruby'.to_c        #=> (0+0i)
+ *
+ * See Kernel.Complex.
  */
 static VALUE
 string_to_c(VALUE self)
 {
-    VALUE s, a, backref;
+    char *s;
+    VALUE num;
 
-    backref = rb_backref_get();
-    rb_match_busy(backref);
+    rb_must_asciicompat(self);
 
-    s = f_gsub(self, underscores_pat, an_underscore);
-    a = string_to_c_internal(s);
+    s = RSTRING_PTR(self);
 
-    rb_backref_set(backref);
+    if (s && s[RSTRING_LEN(self)]) {
+	rb_str_modify(self);
+	s = RSTRING_PTR(self);
+	s[RSTRING_LEN(self)] = '\0';
+    }
 
-    if (!NIL_P(RARRAY_PTR(a)[0]))
-	return RARRAY_PTR(a)[0];
-    return rb_complex_new1(INT2FIX(0));
+    if (!s)
+	s = (char *)"";
+
+    (void)parse_comp(s, 0, &num);
+
+    return num;
 }
 
 static VALUE
-nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
+to_complex(VALUE val)
 {
-    VALUE a1, a2, backref;
-
-    rb_scan_args(argc, argv, "11", &a1, &a2);
+    return rb_convert_type(val, T_COMPLEX, "Complex", "to_c");
+}
 
-    if (NIL_P(a1) || (argc == 2 && NIL_P(a2)))
+static VALUE
+nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
+{
+    if (NIL_P(a1) || NIL_P(a2)) {
+        if (!raise) return Qnil;
 	rb_raise(rb_eTypeError, "can't convert nil into Complex");
-
-    backref = rb_backref_get();
-    rb_match_busy(backref);
-
-    switch (TYPE(a1)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-	break;
-      case T_STRING:
-	a1 = string_to_c_strict(a1);
-	break;
     }
 
-    switch (TYPE(a2)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-	break;
-      case T_STRING:
-	a2 = string_to_c_strict(a2);
-	break;
+    if (RB_TYPE_P(a1, T_STRING)) {
+	a1 = string_to_c_strict(a1, raise);
+        if (NIL_P(a1)) return Qnil;
     }
 
-    rb_backref_set(backref);
+    if (RB_TYPE_P(a2, T_STRING)) {
+	a2 = string_to_c_strict(a2, raise);
+        if (NIL_P(a2)) return Qnil;
+    }
 
-    switch (TYPE(a1)) {
-      case T_COMPLEX:
+    if (RB_TYPE_P(a1, T_COMPLEX)) {
 	{
 	    get_dat1(a1);
 
@@ -1641,8 +2079,7 @@ nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
 	}
     }
 
-    switch (TYPE(a2)) {
-      case T_COMPLEX:
+    if (RB_TYPE_P(a2, T_COMPLEX)) {
 	{
 	    get_dat1(a2);
 
@@ -1651,18 +2088,20 @@ nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
 	}
     }
 
-    switch (TYPE(a1)) {
-      case T_COMPLEX:
-	if (argc == 1 || (k_exact_zero_p(a2)))
+    if (RB_TYPE_P(a1, T_COMPLEX)) {
+	if (a2 == Qundef || (k_exact_zero_p(a2)))
 	    return a1;
     }
 
-    if (argc == 1) {
+    if (a2 == Qundef) {
 	if (k_numeric_p(a1) && !f_real_p(a1))
 	    return a1;
 	/* should raise exception for consistency */
-	if (!k_numeric_p(a1))
-	    return rb_convert_type(a1, T_COMPLEX, "Complex", "to_c");
+	if (!k_numeric_p(a1)) {
+            if (!raise)
+                return rb_protect(to_complex, a1, NULL);
+	    return to_complex(a1);
+        }
     }
     else {
 	if ((k_numeric_p(a1) && k_numeric_p(a2)) &&
@@ -1673,13 +2112,35 @@ nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
     }
 
     {
+        int argc;
 	VALUE argv2[2];
 	argv2[0] = a1;
-	argv2[1] = a2;
+        if (a2 == Qundef) {
+            argv2[1] = Qnil;
+            argc = 1;
+        }
+        else {
+            if (!raise && !RB_INTEGER_TYPE_P(a2) && !RB_FLOAT_TYPE_P(a2) && !RB_TYPE_P(a2, T_RATIONAL))
+                return Qnil;
+            argv2[1] = a2;
+            argc = 2;
+        }
 	return nucomp_s_new(argc, argv2, klass);
     }
 }
 
+static VALUE
+nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE a1, a2;
+
+    if (rb_scan_args(argc, argv, "11", &a1, &a2) == 1) {
+        a2 = Qundef;
+    }
+
+    return nucomp_convert(klass, a1, a2, TRUE);
+}
+
 /* --- */
 
 /*
@@ -1719,8 +2180,6 @@ numeric_abs2(VALUE self)
     return f_mul(self, self);
 }
 
-#define id_PI rb_intern("PI")
-
 /*
  * call-seq:
  *    num.arg    ->  0 or float
@@ -1733,13 +2192,14 @@ static VALUE
 numeric_arg(VALUE self)
 {
     if (f_positive_p(self))
-	return INT2FIX(0);
-    return rb_const_get(rb_mMath, id_PI);
+        return INT2FIX(0);
+    return DBL2NUM(M_PI);
 }
 
 /*
  * call-seq:
  *    num.rect  ->  array
+ *    num.rectangular  ->  array
  *
  * Returns an array; [num, 0].
  */
@@ -1749,6 +2209,8 @@ numeric_rect(VALUE self)
     return rb_assoc_new(self, INT2FIX(0));
 }
 
+static VALUE float_arg(VALUE self);
+
 /*
  * call-seq:
  *    num.polar  ->  array
@@ -1758,7 +2220,25 @@ numeric_rect(VALUE self)
 static VALUE
 numeric_polar(VALUE self)
 {
-    return rb_assoc_new(f_abs(self), f_arg(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);
 }
 
 /*
@@ -1798,9 +2278,10 @@ float_arg(VALUE self)
  * and i is imaginary unit.  Real a equals complex a+0i
  * mathematically.
  *
- * In ruby, you can create complex object with Complex, Complex::rect,
- * Complex::polar or to_c method.
+ * Complex object can be created as literal, and also by using
+ * Kernel#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)
@@ -1827,47 +2308,28 @@ float_arg(VALUE self)
 void
 Init_Complex(void)
 {
+    VALUE compat;
 #undef rb_intern
 #define rb_intern(str) rb_intern_const(str)
 
-    assert(fprintf(stderr, "assert() is now active\n"));
-
     id_abs = rb_intern("abs");
-    id_abs2 = rb_intern("abs2");
     id_arg = rb_intern("arg");
-    id_cmp = rb_intern("<=>");
-    id_conj = rb_intern("conj");
-    id_convert = rb_intern("convert");
     id_denominator = rb_intern("denominator");
-    id_divmod = rb_intern("divmod");
-    id_eqeq_p = rb_intern("==");
-    id_expt = rb_intern("**");
-    id_fdiv = rb_intern("fdiv");
-    id_floor = rb_intern("floor");
-    id_idiv = rb_intern("div");
-    id_imag = rb_intern("imag");
-    id_inspect = rb_intern("inspect");
-    id_negate = rb_intern("-@");
     id_numerator = rb_intern("numerator");
-    id_quo = rb_intern("quo");
-    id_real = rb_intern("real");
     id_real_p = rb_intern("real?");
-    id_to_f = rb_intern("to_f");
-    id_to_i = rb_intern("to_i");
-    id_to_r = rb_intern("to_r");
-    id_to_s = rb_intern("to_s");
+    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);
 
     rb_define_alloc_func(rb_cComplex, nucomp_s_alloc);
     rb_undef_method(CLASS_OF(rb_cComplex), "allocate");
 
-#if 0
-    rb_define_private_method(CLASS_OF(rb_cComplex), "new!", nucomp_s_new_bang, -1);
-    rb_define_private_method(CLASS_OF(rb_cComplex), "new", nucomp_s_new, -1);
-#else
     rb_undef_method(CLASS_OF(rb_cComplex), "new");
-#endif
 
     rb_define_singleton_method(rb_cComplex, "rectangular", nucomp_s_new, -1);
     rb_define_singleton_method(rb_cComplex, "rect", nucomp_s_new, -1);
@@ -1875,13 +2337,8 @@ 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");
@@ -1893,47 +2350,36 @@ 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, "real", rb_complex_real, 0);
+    rb_define_method(rb_cComplex, "imaginary", rb_complex_imag, 0);
+    rb_define_method(rb_cComplex, "imag", rb_complex_imag, 0);
 
-    rb_define_method(rb_cComplex, "-@", nucomp_negate, 0);
-    rb_define_method(rb_cComplex, "+", nucomp_add, 1);
-    rb_define_method(rb_cComplex, "-", nucomp_sub, 1);
-    rb_define_method(rb_cComplex, "*", nucomp_mul, 1);
-    rb_define_method(rb_cComplex, "/", nucomp_div, 1);
+    rb_define_method(rb_cComplex, "-@", rb_complex_uminus, 0);
+    rb_define_method(rb_cComplex, "+", rb_complex_plus, 1);
+    rb_define_method(rb_cComplex, "-", rb_complex_minus, 1);
+    rb_define_method(rb_cComplex, "*", rb_complex_mul, 1);
+    rb_define_method(rb_cComplex, "/", rb_complex_div, 1);
     rb_define_method(rb_cComplex, "quo", nucomp_quo, 1);
     rb_define_method(rb_cComplex, "fdiv", nucomp_fdiv, 1);
-    rb_define_method(rb_cComplex, "**", nucomp_expt, 1);
+    rb_define_method(rb_cComplex, "**", rb_complex_pow, 1);
 
     rb_define_method(rb_cComplex, "==", nucomp_eqeq_p, 1);
+    rb_define_method(rb_cComplex, "<=>", nucomp_cmp, 1);
     rb_define_method(rb_cComplex, "coerce", nucomp_coerce, 1);
 
-    rb_define_method(rb_cComplex, "abs", nucomp_abs, 0);
-    rb_define_method(rb_cComplex, "magnitude", nucomp_abs, 0);
+    rb_define_method(rb_cComplex, "abs", rb_complex_abs, 0);
+    rb_define_method(rb_cComplex, "magnitude", rb_complex_abs, 0);
     rb_define_method(rb_cComplex, "abs2", nucomp_abs2, 0);
-    rb_define_method(rb_cComplex, "arg", nucomp_arg, 0);
-    rb_define_method(rb_cComplex, "angle", nucomp_arg, 0);
-    rb_define_method(rb_cComplex, "phase", nucomp_arg, 0);
+    rb_define_method(rb_cComplex, "arg", rb_complex_arg, 0);
+    rb_define_method(rb_cComplex, "angle", rb_complex_arg, 0);
+    rb_define_method(rb_cComplex, "phase", rb_complex_arg, 0);
     rb_define_method(rb_cComplex, "rectangular", nucomp_rect, 0);
     rb_define_method(rb_cComplex, "rect", nucomp_rect, 0);
     rb_define_method(rb_cComplex, "polar", nucomp_polar, 0);
-    rb_define_method(rb_cComplex, "conjugate", nucomp_conj, 0);
-    rb_define_method(rb_cComplex, "conj", nucomp_conj, 0);
-#if 0
-    rb_define_method(rb_cComplex, "~", nucomp_conj, 0); /* gcc */
-#endif
+    rb_define_method(rb_cComplex, "conjugate", rb_complex_conjugate, 0);
+    rb_define_method(rb_cComplex, "conj", rb_complex_conjugate, 0);
 
     rb_define_method(rb_cComplex, "real?", nucomp_false, 0);
-#if 0
-    rb_define_method(rb_cComplex, "complex?", nucomp_true, 0);
-    rb_define_method(rb_cComplex, "exact?", nucomp_exact_p, 0);
-    rb_define_method(rb_cComplex, "inexact?", nucomp_inexact_p, 0);
-#endif
 
     rb_define_method(rb_cComplex, "numerator", nucomp_numerator, 0);
     rb_define_method(rb_cComplex, "denominator", nucomp_denominator, 0);
@@ -1944,8 +2390,17 @@ Init_Complex(void)
     rb_define_method(rb_cComplex, "to_s", nucomp_to_s, 0);
     rb_define_method(rb_cComplex, "inspect", nucomp_inspect, 0);
 
-    rb_define_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0);
-    rb_define_method(rb_cComplex, "marshal_load", nucomp_marshal_load, 1);
+    rb_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);
+    /* :nodoc: */
+    compat = rb_define_class_under(rb_cComplex, "compatible", rb_cObject);
+    rb_define_private_method(compat, "marshal_load", nucomp_marshal_load, 1);
+    rb_marshal_define_compat(rb_cComplex, compat, nucomp_dumper, nucomp_loader);
 
     /* --- */
 
@@ -1953,11 +2408,10 @@ Init_Complex(void)
     rb_define_method(rb_cComplex, "to_f", nucomp_to_f, 0);
     rb_define_method(rb_cComplex, "to_r", nucomp_to_r, 0);
     rb_define_method(rb_cComplex, "rationalize", nucomp_rationalize, -1);
+    rb_define_method(rb_cComplex, "to_c", nucomp_to_c, 0);
     rb_define_method(rb_cNilClass, "to_c", nilclass_to_c, 0);
     rb_define_method(rb_cNumeric, "to_c", numeric_to_c, 0);
 
-    make_patterns();
-
     rb_define_method(rb_cString, "to_c", string_to_c, 0);
 
     rb_define_private_method(CLASS_OF(rb_cComplex), "convert", nucomp_s_convert, -1);
@@ -1981,12 +2435,15 @@ Init_Complex(void)
     rb_define_method(rb_cFloat, "angle", float_arg, 0);
     rb_define_method(rb_cFloat, "phase", float_arg, 0);
 
+    /*
+     * The imaginary unit.
+     */
     rb_define_const(rb_cComplex, "I",
 		    f_complex_new_bang2(rb_cComplex, ZERO, ONE));
-}
 
-/*
-Local variables:
-c-file-style: "ruby"
-End:
-*/
+#if !USE_FLONUM
+    rb_gc_register_mark_object(RFLOAT_0 = DBL2NUM(0.0));
+#endif
+
+    rb_provide("complex.so");	/* for backward compatibility */
+}
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000000..f1ed36bb96
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,4089 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT()
+{
+AC_CONFIG_AUX_DIR(tool)
+AC_CONFIG_MACRO_DIRS(tool/m4)
+
+AC_PREREQ(2.67)
+
+dnl   override AC_CHECKING
+dnl   placed here due to aclocal(1)'s
+dnl   ignoring this definition in separate files
+AC_DEFUN([AC_CHECKING],[dnl
+AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
+AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])])dnl
+
+AC_DISABLE_OPTION_CHECKING
+
+AC_ARG_VAR([cflags], [additional CFLAGS (ignored when CFLAGS is given)])
+AC_ARG_VAR([cppflags], [additional CPPFLAGS (ignored when CPPFLAGS is given)])
+AC_ARG_VAR([cxxflags], [additional CXXFLAGS (ignored when CXXFLAGS is given)])
+
+: "environment section" && {
+HAVE_BASERUBY=yes
+BASERUBY_VERSION=
+AC_ARG_WITH(baseruby,
+	AS_HELP_STRING([--with-baseruby=RUBY], [use RUBY as baseruby; RUBY is the pathname of ruby]),
+	[AS_CASE(["$withval"],
+	    [*ruby*],[BASERUBY=$withval],
+	    [no],[HAVE_BASERUBY=no],
+	    [AC_MSG_ERROR(need ruby)])
+	],
+	[
+		AC_PATH_PROG([BASERUBY], [ruby], [false])
+	])
+AS_IF([test "$HAVE_BASERUBY" = yes -a "`RUBYOPT=- $BASERUBY -e 'print 42' 2>/dev/null`" = 42], [
+    AS_IF([test "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42' 2>/dev/null`" = 42], [
+	BASERUBY="$BASERUBY --disable=gems"
+        BASERUBY_VERSION=`$BASERUBY -v`
+    ])
+    $BASERUBY -C "$srcdir" tool/downloader.rb -d tool -e gnu config.guess config.sub >&AS_MESSAGE_FD
+], [
+    BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
+    HAVE_BASERUBY=no
+])
+AC_SUBST(BASERUBY)
+AC_SUBST(HAVE_BASERUBY)
+
+: ${GIT=git}
+HAVE_GIT=yes
+AC_ARG_WITH(git,
+	AS_HELP_STRING([--without-git], [never use git]),
+	[AS_CASE([$withval],
+	    [no],  [GIT=never-use HAVE_GIT=no],
+	    [yes], [],
+	    [GIT=$withval])])
+AS_IF([test x"$HAVE_GIT" = xyes], [command -v "$GIT" > /dev/null || HAVE_GIT=no])
+AC_SUBST(GIT)
+AC_SUBST(HAVE_GIT)
+
+eval `sed -n -e ['s/^@%:@define RUBY_[A-Z_]*VERSION_\([A-Z][A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)$/\1=\2/p'] \
+      -e ['s/^@%:@define \(RUBY_PATCHLEVEL\) \(.*\)/\1=\2/p'] \
+     $srcdir/include/ruby/version.h $srcdir/version.h`
+for v in MAJOR MINOR TEENY; do
+    AS_IF([eval "test \"\$$v\" = ''"], [
+	AC_MSG_ERROR(could not determine $v number from version.h)
+    ])
+done
+AC_SUBST(MAJOR)
+AC_SUBST(MINOR)
+AC_SUBST(TEENY)
+AC_SUBST(RUBY_API_VERSION, '$(MAJOR).$(MINOR)')
+AC_SUBST(RUBY_PROGRAM_VERSION, '$(MAJOR).$(MINOR).$(TEENY)')
+
+dnl checks for alternative programs
+AC_CANONICAL_BUILD
+RUBY_RM_RECURSIVE
+AC_ARG_WITH(gcc,
+	AS_HELP_STRING([--without-gcc], [never use gcc]),
+	[
+	AS_CASE([$withval],
+	    [no],  [: ${CC=cc}],
+	    [yes], [: ${CC=gcc}],
+	           [CC=$withval])])
+dnl If the user switches compilers, we can't believe the cache
+AS_IF([test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"], [
+  AC_MSG_ERROR(cached CC is different -- throw away $cache_file
+(it is also a good idea to do 'make clean' before compiling))
+])
+test -z "$CC" || ac_cv_prog_CC="$CC"
+
+AS_IF([test "$program_prefix" = NONE], [
+  program_prefix=
+])
+AS_IF([test "$prefix" -ef .], [
+  AC_MSG_ERROR(--prefix cannot be the current working directory.)
+])
+RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
+RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
+AC_SUBST(RUBY_BASE_NAME)
+AC_SUBST(RUBYW_BASE_NAME)
+AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}')
+
+AC_CANONICAL_TARGET
+test x"$target_alias" = x &&
+target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
+ac_install_sh='' # unusable for extension libraries.
+
+AC_ARG_WITH(os-version-style,
+	AS_HELP_STRING([--with-os-version-style=TYPE],
+		       [OS version number for target and target_os [[full]]]
+		       [(full|teeny|minor+0|minor|major+0|major|none)]),
+	[os_version_style=$withval],
+	[os_version_style=full
+	    AS_CASE($target_os, [[*[0-9].*]],
+		[AS_CASE([`/usr/bin/ruby -e 'puts RUBY_PLATFORM' 2>/dev/null`],
+		    [[*-*[0-9].*.0]], [os_version_style=minor+0],
+		    [[*-*[0-9].*.*]], [os_version_style=full],
+		    [[*-*[0-9].0]  ], [os_version_style=major+0],
+		    [[*-*[0-9].*]  ], [os_version_style=minor],
+		    [[*-*[0-9]]    ], [os_version_style=major],
+		)])
+	])
+os_version_style_transform=
+AS_CASE("${os_version_style}",
+	[full|teeny], [],
+	[minor+0], [os_version_style_transform=['s/\([0-9]\.[0-9][0-9]*\)\.[0-9][.0-9]*$/\1.0/']],
+	[minor],   [os_version_style_transform=['s/\([0-9]\.[0-9][0-9]*\)\.[0-9][.0-9]*$/\1/']],
+	[major+0], [os_version_style_transform=['s/\([0-9]\)\.[0-9][.0-9]*$/\1.0/']],
+	[major],   [os_version_style_transform=['s/\([0-9]\)\.[0-9][.0-9]*$/\1/']],
+	[none],    [os_version_style_transform=['s/[0-9]*\.[0-9][.0-9]*$//']],
+	[AC_MSG_ERROR(unknown --with-os-version-style: $withval)])
+AS_IF([test -z "$target_alias" -a -n "$os_version_style_transform"],
+	[
+	target=`echo ${target} | sed "$os_version_style_transform"`
+	target_os=`echo ${target_os} | sed "$os_version_style_transform"`
+	])
+
+AC_ARG_WITH(arch,
+	AS_HELP_STRING([--with-arch=ARCHS],
+		       [build an Apple/NeXT Multi Architecture Binary (MAB);
+                          ARCHS is a comma-delimited list of architectures for
+                          which to build; if this option is disabled or omitted
+			  entirely, then the package will be built only for the
+			  target platform]),
+       [target_archs="$withval"], [unset target_archs])
+
+AC_ARG_ENABLE(load-relative,
+       AS_HELP_STRING([--enable-load-relative], [resolve load paths at run time]),
+       [load_relative=$enableval])
+
+AC_ARG_PROGRAM
+
+dnl Checks for programs.
+
+cflagspat=
+test -z "$optflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${optflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+test -z "$debugflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${debugflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+test -z "$warnflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${warnflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+AS_IF([test -z "${CFLAGS+set}"], [
+    cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
+    orig_cflags="$cflags"
+    cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
+])
+dnl AS_IF([test -z "${CXXFLAGS+set}"], [
+dnl     cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
+dnl     orig_cxxflags="$cxxflags"
+dnl     cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
+dnl ])
+
+AS_CASE(["$host_os:$build_os"],
+[darwin*:darwin*], [
+    AC_CHECK_TOOLS(CC, [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)
+    # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)
+    AS_IF([! $CC -E -xc - <<SRC >/dev/null], [
+	@%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
+	@%:@error premature clang
+	@%:@endif
+SRC
+	AC_MSG_ERROR([clang version 3.0 or later is required])
+    ])],
+[openbsd*:openbsd*], [
+    AC_CHECK_TOOLS(CC, [cc])
+])
+AS_IF([test x"${build}" != x"${host}"], [
+  AC_CHECK_TOOL(CC, gcc)
+])
+
+AC_PROG_CC_C99
+AS_CASE([$CC],
+[gcc-*], [
+    gcc_prefix=gcc- gcc_suffix=`echo "$CC" | sed 's/^gcc//'`
+    AC_PROG_CXX(g++${gcc_suffix})],
+[clang-*|clang], [
+    gcc_prefix=clang- gcc_suffix=`echo "$CC" | sed 's/^clang//'`
+    AC_PROG_CXX(clang++${gcc_suffix})],
+[gcc_prefix= gcc_suffix=])
+
+dnl Select the appropriate C++ compiler in OS X
+AS_CASE(["$build_os:${CXX}"],
+    [darwin1*.*:], [
+        AC_MSG_CHECKING([CXX for $CC])
+        AS_CASE(["/$CC "],
+            [*@<:@\ /@:>@"gcc-4.2 "*], [pat='gcc-4\.2' CXX=g++-4.2],
+            [*@<:@\ /@:>@"gcc "*],     [pat=gcc CXX=g++],
+            [*@<:@\ /@:>@"cc "*],      [pat=cc CXX=c++],
+            [*@<:@\ /@:>@"icc "*],     [pat=icc CXX=icpc],
+            [*@<:@\ /@:>@"clang "*],   [pat=clang CXX=clang++])
+        AS_IF([test "${CXX}"], [
+            CXX=`echo "/$CC " | sed ["s:\([ /]\)${pat}:\1$CXX:; s:^/::; s: *$::"]`
+        ])
+        AC_MSG_RESULT([$CXX])],
+    [openbsd*:*], [
+        AC_CHECK_TOOLS(CXX, [c++])
+    ])
+test -z "$CXX" || ac_cv_prog_CXX="$CXX"
+
+AS_CASE(["$target_os"],
+[darwin*], [
+    AC_MSG_CHECKING(if minimum required OS X version is supported)
+    AC_TRY_CPP([@%:@include <AvailabilityMacros.h>
+	@%:@if MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_5
+	@%:@error pre OS X 10.5
+	[!<===== pre OS X 10.5 =====>]
+	@%:@endif
+	],
+	[macosx_min_required=yes],
+	[AC_MSG_RESULT(no)
+	AC_MSG_ERROR([Unsupported OS X version is required])])
+    AC_MSG_RESULT(${macosx_min_required})
+])
+
+AC_PROG_CXX
+RUBY_MINGW32
+AC_PROG_GCC_TRADITIONAL
+AC_SUBST(GCC)
+AS_CASE(["$target_os"],
+[solaris*], [AC_PATH_TOOL([LD], [ld], [/usr/ccs/bin/ld], [/usr/ccs/bin:$PATH])],
+[AC_CHECK_TOOL([LD], [ld], [ld])])
+AC_SUBST(LD)
+AS_IF([test "$GCC" = yes], [
+    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
+    icc_version=`echo =__ICC | $CC -E -xc - | sed '/^=/!d;s///;/^__ICC/d'`
+    test -n "$icc_version" || icc_version=0
+    # RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
+], [
+    linker_flag=
+])
+
+AS_IF([test "$GCC" = yes -a "$gcc_major" -lt 3 ], [
+    AC_MSG_ERROR([too old GCC])
+])
+
+RUBY_PROG_GNU_LD
+RUBY_CPPOUTFILE
+
+: ${OUTFLAG='-o '}
+: ${COUTFLAG=${OUTFLAG}}
+: ${CSRCFLAG=''}
+AC_SUBST(OUTFLAG)
+AC_SUBST(COUTFLAG)
+AC_SUBST(CSRCFLAG)
+
+: ${MJIT_CC=$CC}
+AS_IF([test "x$cross_compiling" = xno], [
+    AC_PATH_PROG([MJIT_CC], ${MJIT_CC})
+    AS_CASE([$target_os],
+	[*mingw*], [command -v cygpath > /dev/null && MJIT_CC=`cygpath -ma $MJIT_CC`])
+    shift 2
+    MJIT_CC="$MJIT_CC${1+ }$*"
+])
+
+AS_CASE(["$build_os"],
+  [darwin1*.*], [
+    # Xcode linker warns for deprecated architecture and wrongly
+    # installed TBD files.
+    CC_WRAPPER=""
+    echo 'int main(void) {return 0;}' > conftest.c
+    AS_IF([$CC -framework Foundation -o conftest conftest.c 2>&1 |
+	   grep '^ld: warning: text-based stub file' >/dev/null], [
+	CC_WRAPPER=`cd -P "$srcdir/tool" && pwd`/darwin-cc
+	CC="$CC_WRAPPER $CC"
+    ])
+    rm -fr conftest*
+  ])
+
+cc_version=
+for option in --version -v -V -qversion; do
+    cc_version_message=`$CC $option 2>&1`
+    cc_version_status=$?
+    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)
+
+: ${DLDFLAGS="$LDFLAGS"}
+
+RUBY_UNIVERSAL_ARCH
+AS_IF([test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "$universal_binary" = no], [
+    RUBY_DEFAULT_ARCH("$target_cpu")
+])
+
+AS_CASE(["$target_os"], [darwin*], [
+if libtool 2>&1 | grep no_warning_for_no_symbols > /dev/null; then
+  ac_cv_prog_ac_ct_RANLIB=:
+  ac_cv_prog_ac_ct_AR='libtool -static'
+  rb_cv_arflags='-no_warning_for_no_symbols -o'
+fi
+])
+AC_CHECK_TOOLS(RANLIB, [${gcc_prefix}ranlib${gcc_suffix} ranlib], :)
+AC_CHECK_TOOLS(AR, [${gcc_prefix}ar${gcc_suffix} ar])
+AS_IF([test -z "$AR"], [
+  AC_CHECK_PROGS(AR, aal, ar)
+])
+AC_CACHE_CHECK([for $AR flags], [rb_cv_arflags], [
+    AS_IF([$AR rcD conftest.a > /dev/null 2>&1 && rm conftest.a],
+	[rb_cv_arflags=rcD], [rb_cv_arflags=rcu])
+])
+AC_SUBST(ARFLAGS, ["$rb_cv_arflags "])
+
+AC_CHECK_TOOL(AS, as)
+ASFLAGS=$ASFLAGS
+AC_SUBST(ASFLAGS)
+
+AS_CASE(["$target_os"],[cygwin*|mingw*], [ac_cv_prog_ac_ct_OBJCOPY=":"])
+
+# BSD's ports and MacPorts prefix GNU binutils with 'g'
+AC_CHECK_TOOLS(OBJDUMP, [objdump gobjdump])
+AC_CHECK_TOOLS(OBJCOPY, [objcopy gobjcopy])
+
+AS_CASE(["$target_os"],
+[cygwin*|mingw*], [
+    AC_CHECK_TOOL(WINDRES, windres)
+    AC_CHECK_TOOL(DLLWRAP, dllwrap)
+    target=`echo $target | sed "s/^$target_cpu-/-/"`
+    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
+    target_cpu=`echo $target_cpu | sed s/i.86/i386/`
+    AS_CASE(["$target"], [-*], [ target="$target_cpu${target}"])
+    AS_CASE(["$target_alias"], [-*], [ target_alias="$target_cpu${target_alias}"])
+    AS_CASE(["$target_os"],
+    [mingw*], [
+	test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
+	AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
+	AC_TRY_LINK([@%:@include <stdio.h>],
+		    [FILE* volatile f = stdin; return 0;],
+		    [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
+				   tr A-Z a-z |
+				   sed -n '/^[[ 	]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
+		    [rb_cv_msvcrt=msvcrt])
+	test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
+	RT_VER=`echo "$rb_cv_msvcrt" | tr -cd [0-9]`
+	test "$RT_VER" = "" && RT_VER=60
+	AC_DEFINE_UNQUOTED(RUBY_MSVCRT_VERSION, $RT_VER)
+	sysconfdir=
+    ])
+    : ${enable_shared=yes}
+    ],
+[aix*],     [AC_CHECK_TOOL(NM, nm, /usr/ccs/bin/nm, /usr/ccs/bin:$PATH)],
+[hiuxmpp*], [AC_DEFINE(__HIUX_MPP__)])    # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
+AC_CHECK_TOOLS(NM, [${gcc_prefix}nm${gcc_suffix} nm])
+
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AC_PROG_MKDIR_P
+AS_IF([test "x$MKDIR_P" = "x -d"], [
+  AS_IF([test x"$as_mkdir_p" != xfalse], [
+    MKDIR_P='mkdir -p'
+    echo "use 'mkdir -p' as MKDIR_P"
+  ], [
+    AC_MSG_ERROR([mkdir -p is required])
+  ])
+])
+MAKEDIRS="$MKDIR_P"
+AC_SUBST(MAKEDIRS)
+
+AC_CHECK_PROG([DTRACE], [${ac_tool_prefix}dtrace], [${ac_tool_prefix}dtrace])
+AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"], [
+    AC_CHECK_PROG([DTRACE], [dtrace], [dtrace])
+])
+
+AC_CHECK_PROGS(DOT, dot)
+AC_CHECK_PROGS(DOXYGEN, doxygen)
+
+AC_CHECK_PROG(PKG_CONFIG, pkg-config, [pkg-config], [], [],
+    [`"$as_dir/$ac_word$ac_exec_ext" --print-errors --version > /dev/null 2>&1 || echo "$as_dir/$ac_word$ac_exec_ext"`])
+
+# checks for UNIX variants that set C preprocessor variables
+AC_USE_SYSTEM_EXTENSIONS
+
+AC_SUBST(RM, ['rm -f'])
+AC_SUBST(CP, ['cp'])
+RMDIRS='$(top_srcdir)/tool/rmdirs'
+RMDIR=rmdir
+mkdir "rmdirs_$$_test" "rmdirs_$$_test/a"
+rmdir --ignore-fail-on-non-empty "rmdirs_$$_test" 2>/dev/null &&
+RMDIR='rmdir --ignore-fail-on-non-empty'
+$RMDIR -p "rmdirs_$$_test/a" 2>/dev/null &&
+{ test -d "rmdirs_$$_test" || RMDIRS="$RMDIR -p"; }
+rmdir "rmdirs_$$_test/a" "rmdirs_$$_test" 2>/dev/null
+AC_SUBST(RMDIR)
+AC_SUBST(RMDIRS)
+AC_SUBST(RMALL, ['rm -fr'])
+
+AC_MSG_CHECKING([for cd using physical directory])
+rm -fr conf$$.dir
+mkdir conf$$.dir &&
+(cd conf$$.dir && mkdir src build && cd src &&
+$as_ln_s ../build . > /dev/null 2>&1 && cd build &&
+for chdir in 'cd -P' 'PWD= cd'; do
+    /bin/sh -c "$chdir ../src && echo '$chdir' > cdcmd" 2> /dev/null && break
+done)
+AS_IF([test -f conf$$.dir/src/cdcmd], [
+    read CHDIR < conf$$.dir/src/cdcmd 2> /dev/null
+], [
+    CHDIR=cd
+])
+rm -fr conf$$.dir
+AC_MSG_RESULT([$CHDIR])
+AC_SUBST(CHDIR)
+}
+
+: "compiler section" && {
+RUBY_WERROR_FLAG([
+    AC_MSG_CHECKING([whether CFLAGS is valid])
+    AC_TRY_COMPILE([], [],
+	[AC_MSG_RESULT(yes)],
+	[
+	AC_MSG_RESULT(no)
+	AC_MSG_ERROR([something wrong with CFLAGS="$CFLAGS"])
+	]
+    )
+
+    AC_MSG_CHECKING([whether LDFLAGS is valid])
+    {
+	mkdir tmp.$$.try_link &&
+	cd tmp.$$.try_link &&
+	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_TRY_LINK([], [],
+	[AC_MSG_RESULT(yes)],
+	[
+	cd .. && rm -fr tmp.$$.try_link
+	AC_MSG_RESULT(no)
+	AC_MSG_ERROR([something wrong with LDFLAGS="$LDFLAGS"])
+	]
+    )
+    cd .. && rm -fr tmp.$$.try_link
+])
+
+: ${RPATHFLAG=''}
+rpathflag=''
+AS_IF([test x"${RPATHFLAG}" = x], [
+    AS_CASE(["$target_os"],
+	[hpux*], [AS_IF([test "$rb_cv_prog_gnu_ld" = no], [rpathflag='+b '])],
+	[aix*], [rpathflag='-blibpath:'],
+	[for rpathflag in -R "-rpath "; do
+	    AS_CASE("$rpathflag",
+		    [*" "], [AS_CASE(["${linker_flag}"],
+				     [*,], [rpathflag=`echo "$rpathflag" | tr ' ' ,`])])
+	    rpathflag="${linker_flag}${rpathflag}"
+	    RUBY_TRY_LDFLAGS([${rpathflag}.], [], [rpathflag=])
+	    AS_IF([test "x${rpathflag}" != x], [])
+        done])
+], [
+    rpathflag=`echo "$RPATHFLAG" | sed 's/%.*//'`
+])
+
+AS_CASE([$RUBY_PATCHLEVEL], [-*],
+	[RUBY_DEVEL=yes], [RUBY_DEVEL=no])
+particular_werror_flags=$RUBY_DEVEL
+AC_ARG_ENABLE(werror,
+	AS_HELP_STRING([--disable-werror],
+		       [don't make warnings into errors
+		       even if a compiler support -Werror feature
+		       [[disabled by default unless development version]]]),
+	[particular_werror_flags=$enableval])
+
+rb_cv_warnflags="$warnflags"
+AS_CASE(["$GCC:${warnflags+set}:${extra_warnflags:+set}:"],
+[yes::*|yes:*:set:], [# GCC && (!warnflags || extra_warnflags)
+    AS_IF([test $gcc_major -ge 4], [
+	extra_warnflags="$extra_warnflags -Werror=extra-tokens"
+    ])
+    AS_IF([test $gcc_major -ge 5 -a $gcc_major -le 6], [
+	extra_warnflags="$extra_warnflags -Wno-maybe-uninitialized"
+    ])
+    # ICC doesn't support -Werror=
+    AS_IF([test $icc_version -gt 0], [
+	particular_werror_flags=no
+    ])
+    for wflag in \
+		 -Werror=deprecated-declarations \
+		 -Werror=division-by-zero \
+		 -Werror=duplicated-cond \
+		 -Werror=implicit-function-declaration \
+		 -Werror=implicit-int \
+		 -Werror=misleading-indentation \
+		 -Werror=pointer-arith \
+		 -Werror=shorten-64-to-32 \
+		 -Werror=write-strings \
+		 -Wimplicit-fallthrough=0 \
+		 -Wmissing-noreturn \
+		 -Wno-cast-function-type \
+		 -Wno-constant-logical-operand \
+		 -Wno-long-long \
+		 -Wno-missing-field-initializers \
+		 -Wno-overlength-strings \
+		 -Wno-packed-bitfield-compat \
+		 -Wno-parentheses-equality \
+		 -Wno-self-assign \
+		 -Wno-tautological-compare \
+		 -Wno-unused-parameter \
+		 -Wno-unused-value \
+		 -Wsuggest-attribute=format \
+		 -Wsuggest-attribute=noreturn \
+		 -Wunused-variable \
+		 -diag-disable=175,188,2259 \
+		 $extra_warnflags \
+		 ; do
+	AS_IF([test "$particular_werror_flags" != yes], [
+	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/;s/^x//'`
+	])
+	ok=no
+	RUBY_TRY_CFLAGS($wflag, [
+	    RUBY_APPEND_OPTIONS(warnflags, $wflag)
+	    ok=yes
+	])
+	AS_CASE([$ok:$wflag], [no:-Werror=*], [
+	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/'`
+	    RUBY_TRY_CFLAGS($wflag, [
+		RUBY_APPEND_OPTIONS(warnflags, $wflag)
+		particular_werror_flags=no
+	    ])
+	])
+    done
+    AS_CASE([" $warnflags "],[*" -Wno-missing-field-initializers "*], [wflag="-Wall -Wextra"],
+                             [wflag=-Wall])
+    RUBY_TRY_CFLAGS($wflag, [warnflags="$wflag${warnflags+ $warnflags}"])
+    # Disable warnflags while conftest. -Werror=* flags might make bad OS capability guess.
+    rb_cv_warnflags="$warnflags"
+    warnflags=
+])
+RUBY_TRY_CFLAGS(-Qunused-arguments, [RUBY_APPEND_OPTIONS(rb_cv_wsuppress_flags, -Qunused-arguments)])
+
+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=])
+
+AS_IF([test "$GCC" = yes], [
+    # -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.
+
+    # TODO: check if link succeeds with _FORTIFY_SOURCE=2.
+    AS_CASE(["$target_os"],
+    [mingw*], [
+	fortify_source=no
+    ])
+    AC_ARG_ENABLE(fortify_source,
+		  AS_HELP_STRING([--disable-fortify-source],
+				 [disable -D_FORTIFY_SOURCE=2 option, which causes link error on mingw]),
+		  [fortify_source=$enableval])
+    AS_IF([test "x$fortify_source" != xno], [
+    RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
+    ])
+
+    : ${MJIT_HEADER_FLAGS='-P -dD'}
+
+    # -fstack-protector
+    AS_CASE(["$target_os"],
+    [mingw*], [
+	stack_protector=no
+    ])
+    AS_IF([test -z "${stack_protector+set}"], [
+	AS_FOR(option, opt, [-fstack-protector-strong -fstack-protector], [
+	    RUBY_TRY_CFLAGS(option, [stack_protector=yes])
+	    AS_IF([test "x$stack_protector" = xyes], [
+		RUBY_TRY_LDFLAGS(option, [], [stack_protector=])
+	    ])
+	    AS_IF([test "x$stack_protector" = xyes], [stack_protector=option; break])
+	])
+    ])
+    AS_CASE(["$stack_protector"], [-*], [
+	RUBY_APPEND_OPTION(XCFLAGS, $stack_protector)
+	RUBY_APPEND_OPTION(XLDFLAGS, $stack_protector)
+	RUBY_APPEND_OPTION(LDFLAGS, $stack_protector)
+    ])
+
+    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])
+    ])
+    AS_IF([test "x$compress_debug_sections" != xno], [
+	RUBY_APPEND_OPTION(DLDFLAGS, ${linker_flag}--compress-debug-sections=$compress_debug_sections)
+    ])
+
+    AS_CASE(["$target_os"],[mingw*], [
+      # On  Windows  platforms,   system  provided  headers  are  VC++
+      # optimized.  That  is, C++  habits are often  contaminated into
+      # various  headers.  Most frequent  situation is  the use  of //
+      # comments.   We  bypass  ANSI   C  mode  for  them.   Otherwise
+      # extension libs cannot include those headers.
+
+      # Since math.h in some mingw64 wrongly declares frexp and modf
+      # to be pure, the variables pointed by the second arguments are
+      # considered uninitialized unexpectedly.
+      AC_CACHE_CHECK([whether frexp and modf are broken],
+	rb_cv_mingw64_broken_frexp_modf,
+	[
+	  save_CFLAGS="$CFLAGS"
+	  AS_IF([test "$particular_werror_flags" = "yes"], [
+	    CFLAGS="$CFLAGS -Werror=uninitialized"
+	  ], [
+	    CFLAGS="$CFLAGS -Werror -Wuninitialized"
+	  ])
+	  AC_TRY_COMPILE([@%:@include <math.h>
+	    int foo(double x)
+	    {
+	      int exp;
+	      frexp(x, &exp);
+	      return exp;
+	    }], [if (foo(0.0)) return 1;],
+	    [rb_cv_mingw64_broken_frexp_modf=no],
+	    [rb_cv_mingw64_broken_frexp_modf=yes])
+	  CFLAGS="$save_CFLAGS"
+	])
+      AS_IF([test "$rb_cv_mingw64_broken_frexp_modf" = yes], [
+	AC_DEFINE(RUBY_MINGW64_BROKEN_FREXP_MODF)
+      ])
+    ],
+    [cygwin*|darwin*|netbsd*], [
+      # need lgamma_r(), finite()
+    ])
+
+    # ANSI (no XCFLAGS because this is C only)
+    AS_CASE(["$target_os"],
+    [solaris*], [
+      # Because "-std=gnu99" affects existence of functions on Solaris,
+      # "-std=gnu99" will be appended to CPPFLAGS.
+	for ansi_options in -std=gnu99; do
+	    RUBY_TRY_CFLAGS(${ansi_options}, [
+		RUBY_APPEND_OPTIONS(CPPFLAGS, ${ansi_options})
+	    ], [ansi_options=])
+	    test "x${ansi_options}" = x || break
+	done
+    ],
+    [
+      # ANSI (no XCFLAGS because this is C only)
+      rb_tmp_std_check=`echo $CC $CFLAGS $optflags $warnflags $debugflags | fgrep std= | tr -d  '\015'`
+      AS_IF([test "x$rb_tmp_std_check" = "x"],
+      [
+	for ansi_options in -std=gnu99; do
+	    RUBY_TRY_CFLAGS(${ansi_options}, [
+		RUBY_APPEND_OPTIONS(warnflags, ${ansi_options})
+		RUBY_APPEND_OPTIONS(strict_warnflags, ${ansi_options})
+	    ], [ansi_options=])
+	    test "x${ansi_options}" = x || break
+	done
+      ])
+    ])
+
+    # suppress annoying -Wstrict-overflow warnings
+    RUBY_TRY_CFLAGS(-fno-strict-overflow, [RUBY_APPEND_OPTION(XCFLAGS, -fno-strict-overflow)])
+
+    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb3, [debugflags=-ggdb3])}
+    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb, [debugflags=-ggdb])}
+    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])}
+])
+test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
+AS_IF([test "x$RUBY_DEVEL" = xyes], [RUBY_APPEND_OPTION(XCFLAGS, -DRUBY_DEVEL=1)])
+
+AS_IF([test "$GCC" = ""], [
+    AS_CASE(["$target_os"],[aix*],[warnflags="$warnflags -qinfo=por" rb_cv_warnflags="$rb_cv_warnflags -qinfo=por"])
+])
+AS_IF([test "$GCC" = yes], [
+    AS_IF([test "$gcc_major" -ge 4], [
+	RUBY_TRY_CFLAGS(-fvisibility=hidden, [visibility_option=yes], [visibility_option=no])
+    ])
+    AC_SUBST(WERRORFLAG, "-Werror")
+    AS_IF([test "$visibility_option" = yes], [
+	RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)
+	AC_DEFINE(RUBY_SYMBOL_EXPORT_BEGIN, [_Pragma("GCC visibility push(default)")])
+	AC_DEFINE(RUBY_SYMBOL_EXPORT_END,   [_Pragma("GCC visibility pop")])
+    ], [
+	RUBY_TRY_LDFLAGS([-Wl,-unexported_symbol,_Init_*], [visibility_option=ld], [visibility_option=no])
+    ])
+    test "$visibility_option" = no || OBJCOPY=:
+])
+
+AS_IF([test "$GCC" = yes], [
+    # optflags
+
+    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])
+	AS_IF([test "$static_libgcc" = yes], [
+	    RUBY_APPEND_OPTION(EXTLDFLAGS, -static-libgcc)
+	])
+    ])
+
+    # disable fast-math
+    for oflag in -fno-fast-math; do
+	RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(CFLAGS, $oflag)])
+    done
+    for oflag in -fexcess-precision=standard -fp-model\ precise; do
+	RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(XCFLAGS, $oflag)])
+    done
+])
+
+AS_CASE(["$target_cpu"], [[i[3-6]86*]], [
+    AC_CACHE_CHECK([for __sync_val_compare_and_swap], [rb_cv_gcc_compiler_cas], [
+	AC_TRY_LINK([unsigned long atomic_var;],
+	    [__sync_val_compare_and_swap(&atomic_var, 0, 1);],
+	    [rb_cv_gcc_compiler_cas=yes],
+	    [
+	    save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -march=i486"
+	    AC_TRY_LINK([unsigned long atomic_var;],
+		[__sync_val_compare_and_swap(&atomic_var, 0, 1);],
+		[rb_cv_gcc_compiler_cas=i486],
+		[rb_cv_gcc_compiler_cas=no])
+	    CFLAGS="$save_CFLAGS"
+	    ])
+    ])
+    AS_IF([test "$rb_cv_gcc_compiler_cas" = i486], [ARCH_FLAG="-march=i486"])
+])
+
+AC_ARG_WITH(opt-dir,
+	AS_HELP_STRING([--with-opt-dir=DIR-LIST],
+		       [add optional headers and libraries directories separated by $PATH_SEPARATOR]),
+	[
+		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"`
+		CPPFLAGS="$CPPFLAGS $val"
+		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -L\1/lib${rpathflag:+ $rpathflag\\\\1/lib}|g;s/^ //"`
+		LDFLAGS="$LDFLAGS $val"
+		LDFLAGS_OPTDIR="$val"
+		OPT_DIR="$withval"
+	], [OPT_DIR=])
+
+test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
+test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
+}
+
+AC_CACHE_CHECK([whether compiler has statement and declarations in expressions],
+  rb_cv_have_stmt_and_decl_in_expr,
+  [AC_TRY_COMPILE([],[ __extension__ ({ int a = 0; a; }); ],
+  [rb_cv_have_stmt_and_decl_in_expr=yes],
+  [rb_cv_have_stmt_and_decl_in_expr=no])])
+AS_IF([test "$rb_cv_have_stmt_and_decl_in_expr" = yes], [
+  AC_DEFINE(HAVE_STMT_AND_DECL_IN_EXPR)
+])
+
+: "header and library section" && {
+AC_ARG_WITH(winnt-ver,
+  AS_HELP_STRING([--with-winnt-ver=0xXXXX], [target Windows NT version (default to 0x0600)]),
+  [with_winnt_ver="$withval"], [with_winnt_ver="0x0600"])
+AS_CASE(["$target_os"],
+[mingw*], [
+  RUBY_APPEND_OPTION(CPPFLAGS, -D_WIN32_WINNT=$with_winnt_ver)
+  RUBY_APPEND_OPTION(CPPFLAGS, -D__MINGW_USE_VC2005_COMPAT)
+])
+
+AS_CASE(["$target_os"],
+[freebsd*], [
+  AC_CACHE_CHECK([whether pthread should be enabled by default],
+    rb_cv_enable_pthread_default,
+    [AC_TRY_CPP([
+#include <osreldate.h>
+#if __FreeBSD_version < 502102
+#error pthread should be disabled on this platform
+#endif
+      ],
+      rb_cv_enable_pthread_default=yes,
+      rb_cv_enable_pthread_default=no)])
+  enable_pthread=$rb_cv_enable_pthread_default
+  ],
+[mingw*], [
+  enable_pthread=no
+  ],
+[
+  enable_pthread=yes
+  ])
+
+dnl Checks for libraries.
+AS_CASE(["$target_os"],[*bsd*|dragonfly*],[],[ac_cv_func_daemon=no])
+
+AS_UNSET(ORIG_LIBS)
+POSTLINK=:
+AC_SUBST(POSTLINK)
+AS_CASE(["$target_os"],
+[nextstep*], [	],
+[openstep*], [	],
+[rhapsody*], [	],
+[darwin*], [
+		ORIG_LIBS="$LIBS"
+		RUBY_PREPEND_OPTION(LIBS, -lobjc)
+		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT)
+		AC_CACHE_CHECK([whether syscall(2) is deprecated], rb_cv_syscall_deprecated,
+		    [RUBY_WERROR_FLAG([
+			AC_TRY_COMPILE([@%:@include <unistd.h>],
+				       [if (syscall(0)) return 1;],
+			    [rb_cv_syscall_deprecated=no],
+			    [rb_cv_syscall_deprecated=yes])])])
+		AS_IF([test $rb_cv_syscall_deprecated = yes], [
+		    ac_cv_func___syscall=no
+		    ac_cv_func_syscall=no
+		    ac_cv_header_sys_syscall_h=no
+		    ac_cv_header_syscall_h=no
+		])
+		ac_cv_func_getcontext=no
+		ac_cv_func_setcontext=no
+		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
+		AS_IF([test $gcc_major -lt 4 -o \( $gcc_major -eq 4 -a $gcc_minor -lt 3 \)], [
+		    ac_cv_func___builtin_setjmp=no
+		])
+		with_setjmp_type=sigsetjmp # to hijack SIGCHLD handler
+		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++) {
+	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);
+	    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)])
+		AS_IF([test "$rb_cv_broken_crypt" = yes], [
+		   AC_DEFINE(BROKEN_CRYPT, 1)
+		])
+		POSTLINK=""
+		AC_CHECK_PROGS(codesign, codesign)
+		AC_CHECK_PROGS(dsymutil, dsymutil)
+		AS_IF([test -n "$codesign"], [
+		    POSTLINK="{ test -z '\$(RUBY_CODESIGN)' || $codesign -s '\$(RUBY_CODESIGN)' -f \$@; }${POSTLINK:+; $POSTLINK}"
+		])
+		AS_IF([test -n "$dsymutil"], [
+		    POSTLINK="$dsymutil \$@${POSTLINK:+; $POSTLINK}"
+		])
+		AS_IF([test -n "${POSTLINK}"], [
+		    LINK_SO="$LINK_SO
+\$(POSTLINK)"
+		])
+		AC_CHECK_HEADERS(crt_externs.h, [], [], [
+		    #include <crt_externs.h>
+		])
+		],
+[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)
+		AS_IF([test $given_xopen_source = no], [
+		  AC_MSG_CHECKING(appropriate _XOPEN_SOURCE value to define)
+		  define_xopen_source=""
+		  for tmp_xpg in 7 6 5; do
+		    AS_IF([test x"$define_xopen_source" != x], [
+		      break
+		    ])
+		    RUBY_WERROR_FLAG([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
+		  AS_IF([test x"$define_xopen_source" = x], [
+		    define_xopen_source=no
+		  ])
+		  AC_MSG_RESULT($define_xopen_source)
+		  AS_IF([test x"$define_xopen_source" != xno], [
+		    RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source)
+		  ])
+		])
+		],
+[haiku*], [
+		LIBS="$LIBS" # m lib is include in root
+		],
+[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])
+		],
+[mingw*], [	LIBS="-lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi $LIBS"
+		ac_cv_header_a_out_h=no
+		ac_cv_header_pwd_h=no
+		ac_cv_header_utime_h=no
+		ac_cv_header_sys_ioctl_h=no
+		ac_cv_header_sys_param_h=no
+		ac_cv_header_sys_resource_h=no
+		ac_cv_header_sys_select_h=no
+		ac_cv_header_sys_time_h=no
+		ac_cv_header_sys_times_h=no
+		ac_cv_header_sys_socket_h=no
+		ac_cv_func_lstat=yes
+		ac_cv_func_times=yes
+		ac_cv_func_waitpid=yes
+		ac_cv_func_fsync=yes
+		ac_cv_func_seekdir=yes
+		ac_cv_func_telldir=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
+		ac_cv_lib_dl_dlopen=no
+		rb_cv_binary_elf=no
+		rb_cv_negative_time_t=no
+		ac_cv_func_fcntl=yes
+		ac_cv_func_flock=yes
+		ac_cv_func_gmtime_r=yes
+		rb_cv_large_fd_select=yes
+		ac_cv_type_struct_timeval=yes
+                ac_cv_func_clock_gettime=yes
+                ac_cv_func_clock_getres=yes
+		ac_cv_func_malloc_usable_size=no
+		ac_cv_type_off_t=yes
+		ac_cv_sizeof_off_t=8
+		AS_IF([test "$target_cpu" = x64], [
+		    ac_cv_func___builtin_setjmp=yes
+		    ac_cv_func_round=no
+		    rb_cv_coroutine=yes
+		])
+		ac_cv_func_tgamma=no
+		rb_cv_negative_time_t=yes
+		AC_CHECK_TYPE([NET_LUID], [], [],
+			      [@%:@include <winsock2.h>
+			      @%:@include <iphlpapi.h>])
+		AS_IF([test x"$ac_cv_type_NET_LUID" = xyes], [
+		    AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
+		])
+		AC_CHECK_FUNCS(_gmtime64_s)
+		AC_CHECK_FUNCS(_wfreopen_s)
+		AC_LIBOBJ([langinfo])
+		],
+[bsdi*], [	LIBS="-lm $LIBS"
+		AC_DEFINE(BROKEN_SETREUID, 1)
+		AC_DEFINE(BROKEN_SETREGID, 1)
+                ac_cv_sizeof_rlim_t=8],
+[freebsd*], [	LIBS="-lm $LIBS"
+		ac_cv_func_getpeername=no
+		ac_cv_func_getsockname=no
+		ac_cv_func_shutdown=no
+		ac_cv_func_close=no
+		],
+[netbsd*], [	LIBS="-lm $LIBS"
+		],
+[dragonfly*], [	LIBS="-lm $LIBS"
+		],
+[aix*],[	LIBS="-lm $LIBS"
+		ac_cv_func_round=no
+		ac_cv_func___builtin_setjmp=no
+		],
+[linux*],[	LIBS="-lm $LIBS"
+		# __builtin_longjmp in ppc64* Linux does not restore
+		# the TOC register (r2), which is problematic
+		# when a global exit happens from JITted .so code.
+		AS_CASE(["$target_cpu"], [powerpc64*], [
+			ac_cv_func___builtin_setjmp=no
+		])
+		# With gcc-8's -fcf-protection, MJIT's __builtin_longjmp fails.
+		AS_CASE(["$CC $CFLAGS "], [*" -fcf-protection "*], [cf_protection=yes], [cf_protection=no])
+		AS_IF([test "$cf_protection" = yes], [
+			ac_cv_func___builtin_setjmp=no
+		])
+		],
+[	LIBS="-lm $LIBS"])
+: ${ORIG_LIBS=$LIBS}
+
+AC_CHECK_LIB(crypt, crypt)      # glibc (GNU/Linux, GNU/Hurd, GNU/kFreeBSD)
+AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
+AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
+AC_CHECK_LIB(socket, shutdown)  # SunOS/Solaris
+
+dnl Checks for header files.
+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(copyfile.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(sanitizer/asan_interface.h)
+AC_CHECK_HEADERS(sanitizer/msan_interface.h)
+AC_CHECK_HEADERS(setjmpex.h)
+AC_CHECK_HEADERS(stdalign.h)
+AC_CHECK_HEADERS(sys/attr.h)
+AC_CHECK_HEADERS(sys/eventfd.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_ARG_WITH([gmp],
+  [AS_HELP_STRING([--without-gmp],
+    [disable GNU GMP to accelerate Bignum operations])],
+  [],
+  [with_gmp=yes])
+AS_IF([test "x$with_gmp" != xno],
+  [AC_CHECK_HEADERS(gmp.h)
+   AS_IF([test "x$ac_cv_header_gmp_h" != xno],
+     AC_SEARCH_LIBS([__gmpz_init], [gmp],
+       [AC_DEFINE(HAVE_LIBGMP, 1)]))])
+
+AC_ARG_WITH([jemalloc],
+  [AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])],
+  [with_jemalloc=$withval], [with_jemalloc=no])
+AS_IF([test "x$with_jemalloc" != xno],[
+  AC_SEARCH_LIBS([malloc_conf], [jemalloc],
+    [
+      AC_DEFINE(HAVE_LIBJEMALLOC, 1)
+      with_jemalloc=yes
+    ],
+    [test x$with_jemalloc = xyes && with_jemalloc=no])
+  AC_CHECK_HEADER(jemalloc/jemalloc.h, [
+    AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, [<jemalloc/jemalloc.h>])
+  ],
+  [test x$with_jemalloc = xyes && with_jemalloc=no])
+  AS_IF([test "x$with_jemalloc" != xyes], [
+    AC_CACHE_CHECK([for jemalloc with JEMALLOC_MANGLE], rb_cv_jemalloc_demangle,
+      [AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@define JEMALLOC_MANGLE 1
+      @%:@ifdef RUBY_ALTERNATIVE_MALLOC_HEADER
+      @%:@include RUBY_ALTERNATIVE_MALLOC_HEADER
+      @%:@else
+      @%:@include <jemalloc.h>
+      @%:@endif], [return !&malloc_conf])],
+      [rb_cv_jemalloc_demangle=yes],
+      [rb_cv_jemalloc_demangle=no])
+    ])
+  ])
+  AS_IF([test "x$rb_cv_jemalloc_demangle" = xyes], [
+    AC_DEFINE(JEMALLOC_MANGLE)
+    with_jemalloc=yes
+  ])
+  AS_CASE(["$with_jemalloc"],
+    [yes],
+    [
+      AC_DEFINE(HAVE_MALLOC_CONF)
+      ac_cv_func_malloc_usable_size=yes
+    ],
+    [no],
+    [AC_MSG_ERROR([jemalloc requested but not found])
+  ])
+])
+
+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.
+AS_IF([test x"$enable_largefile" != xno], [
+  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])])
+  ])
+])
+mv confdefs.h largefile.h
+mv confdefs1.h confdefs.h
+cat largefile.h >> confdefs.h
+
+AS_CASE(["$target_os"],
+    [aix*], [
+    AS_CASE(["$target_cpu:$ac_cv_sys_large_files"],
+	[ppc64:*|powerpc64:*], [],
+	[*:no|*:unknown], [],
+	[
+	    # AIX currently does not support a 32-bit call to posix_fadvise()
+	    # if _LARGE_FILES is defined.
+	    ac_cv_func_posix_fadvise=no
+	])
+    ])
+
+AC_C_BIGENDIAN
+AC_C_CONST
+AC_C_CHAR_UNSIGNED
+AC_C_INLINE
+AC_C_VOLATILE
+AC_C_TYPEOF
+AC_C_RESTRICT
+
+AS_CASE(":$ac_cv_c_const:$ac_cv_c_volatile:",
+    [*:no:*], [AC_MSG_ERROR(ANSI C-conforming const and volatile are mandatory)])
+
+AC_CHECK_TYPES([long long, off_t])
+
+AC_CACHE_CHECK([char bit], [rb_cv_char_bit],
+    [test "$universal_binary" = yes && cross_compiling=yes
+    AC_COMPUTE_INT([rb_cv_char_bit], [CHAR_BIT],
+	[AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8])
+    test "$universal_binary" = yes && cross_compiling=$real_cross_compiling])
+
+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(off_t)
+RUBY_CHECK_SIZEOF(void*, [int long "long long"], [ILP LP LLP])
+RUBY_CHECK_SIZEOF(float)
+RUBY_CHECK_SIZEOF(double)
+RUBY_CHECK_SIZEOF(time_t, [long "long long"], [], [@%:@include <time.h>])
+RUBY_CHECK_SIZEOF(clock_t, [], [], [@%:@include <time.h>])
+
+AC_CACHE_CHECK(packed struct attribute, rb_cv_packed_struct,
+    [rb_cv_packed_struct=no
+    for mac in \
+	"__pragma(pack(push, 1)) x __pragma(pack(pop))" \
+	"x __attribute__((packed))" \
+	; do
+	AC_TRY_COMPILE([@%:@define PACKED_STRUCT(x) $mac
+			PACKED_STRUCT(struct { int a; });], [],
+		[rb_cv_packed_struct=$mac; break])
+    done])
+AS_IF([test "$rb_cv_packed_struct" != no], [
+    AC_DEFINE_UNQUOTED([PACKED_STRUCT(x)], [$rb_cv_packed_struct])
+    RUBY_TRY_CFLAGS(-Wno-address-of-packed-member, [AC_DEFINE(USE_UNALIGNED_MEMBER_ACCESS)])
+], [
+    AC_DEFINE_UNQUOTED([PACKED_STRUCT(x)], x)
+])
+
+AS_IF([test "x$ac_cv_type_long_long" = xyes], [
+    RUBY_CHECK_PRINTF_PREFIX(long long, ll I64, LL)
+], [test "x$ac_cv_type___int64" = xyes], [
+    RUBY_CHECK_PRINTF_PREFIX(__int64, ll I64, LL)
+])
+
+RUBY_REPLACE_TYPE(pid_t, int, PIDT)
+RUBY_REPLACE_TYPE(uid_t, int, UIDT)
+RUBY_REPLACE_TYPE(gid_t, int, GIDT)
+RUBY_REPLACE_TYPE(time_t, [], TIMET, [@%:@include <time.h>])
+RUBY_REPLACE_TYPE(dev_t, [int long "long long"], DEVT)
+RUBY_REPLACE_TYPE(mode_t, ["unsigned short" "unsigned int" long], MODET, [@%:@include <sys/stat.h>])
+RUBY_REPLACE_TYPE(rlim_t, [int long "long long"], RLIM, [
+@%:@ifdef HAVE_SYS_TYPES_H
+@%:@include <sys/types.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TYPES_H
+@%:@include <sys/time.h>
+@%:@endif
+@%:@include <sys/resource.h>
+])
+RUBY_REPLACE_TYPE(off_t, [], OFFT)
+RUBY_REPLACE_TYPE(clockid_t, [], CLOCKID, [@%:@ifdef HAVE_TIME_H
+@%:@ include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@ include <sys/time.h>
+@%:@endif])
+
+AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
+  [AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
+	rb_cv_have_prototypes=yes,
+	rb_cv_have_prototypes=no)])
+AS_IF([test "$rb_cv_have_prototypes" = yes], [
+  AC_DEFINE(HAVE_PROTOTYPES)
+])
+
+AC_CACHE_CHECK(token paste string, rb_cv_tokenpaste,
+  [AC_TRY_COMPILE([@%:@define paste(a,b) a@%:@@%:@b],
+		  [int xy = 1; return paste(x,y);],
+		  rb_cv_tokenpaste=ansi,
+		  rb_cv_tokenpaste=knr)])
+AS_IF([test "$rb_cv_tokenpaste" = ansi], [
+  AC_DEFINE(TOKEN_PASTE(x,y),[x@%:@@%:@y])
+], [
+  AC_DEFINE(TOKEN_PASTE(x,y),[x/**/y])
+])
+
+AC_CACHE_CHECK(stringization, rb_cv_stringization, [
+  rb_cv_stringization=no
+  for string in "#expr" '"expr"'; do
+    AC_COMPILE_IFELSE([
+      AC_LANG_BOOL_COMPILE_TRY([
+#define STRINGIZE0(expr) $string
+#define STRINGIZE(expr) STRINGIZE0(expr)
+#undef real_test_for_stringization
+#define test_for_stringization -.real_test_for_stringization.-
+const char stringized[[]] = STRINGIZE(test_for_stringization);
+], [sizeof(stringized) == 32])],
+      [rb_cv_stringization="$string"; break],
+      [rb_cv_stringization=no])
+  done]
+)
+AC_DEFINE(STRINGIZE(expr),STRINGIZE0(expr))
+AS_IF([test x"$rb_cv_stringization" != xno -a "$rb_cv_stringization" != "#expr"], [
+  AC_DEFINE_UNQUOTED(STRINGIZE0(expr),$rb_cv_stringization)
+  AC_DEFINE(OLD_FASHIONED_STRINGIZATION,1)
+])
+
+AC_CACHE_CHECK([string literal concatenation],
+  rb_cv_string_literal_concatenation, [
+  AC_COMPILE_IFELSE([
+    AC_LANG_BOOL_COMPILE_TRY([
+const char concatenated_literal[[]] = "literals" "to"
+  "be" "concatenated.";
+], [sizeof(concatenated_literal) == 26])],
+    [rb_cv_string_literal_concatenation=yes],
+    [rb_cv_string_literal_concatenation=no])]
+)
+AS_IF([test "$rb_cv_string_literal_concatenation" = no], [
+  AC_MSG_ERROR([No string literal concatenation])
+])
+
+AC_CACHE_CHECK(for variable length prototypes and stdarg.h, rb_cv_stdarg,
+  [AC_TRY_COMPILE([
+#include <stdarg.h>
+int foo(int x, ...) {
+	va_list va;
+	va_start(va, x);
+	va_arg(va, int);
+	va_arg(va, char *);
+	va_arg(va, double);
+	return 0;
+}
+], [return foo(10, "", 3.14);],
+	rb_cv_stdarg=yes,
+	rb_cv_stdarg=no)])
+AS_IF([test "$rb_cv_stdarg" = yes], [
+  AC_DEFINE(HAVE_STDARG_PROTOTYPES)
+])
+
+AC_CACHE_CHECK(for variable length macro, rb_cv_va_args_macro,
+  [AC_TRY_COMPILE([
+int foo(int x, ...);
+@%:@define FOO(a, ...) foo(a, @%:@@%:@__VA_ARGS__)
+], [FOO(1);FOO(1,2);FOO(1,2,3);],
+  rb_cv_va_args_macro=yes,
+  rb_cv_va_args_macro=no)])
+AS_IF([test "$rb_cv_va_args_macro" = yes], [
+  AC_DEFINE(HAVE_VA_ARGS_MACRO)
+])
+
+AC_CACHE_CHECK([for alignas() syntax], rb_cv_have_alignas, [
+rb_cv_have_alignas=no
+RUBY_WERROR_FLAG([
+for attr in \
+    "_Alignas(x)" \
+    "alignas(x)" \
+    "@<:@@<:@alignas(x)@:>@@:>@" \
+    "__declspec(aligned(x))" \
+    "__attribute__((__aligned__(x)))" \
+;
+do
+    # C11 _Alignas and GCC __attribute__((__aligned__)) behave
+    # slightly differently.  What we want is GCC's.  Check that
+    # here by something C11 does not allow (`struct ALIGNAS ...`)
+    AC_TRY_COMPILE(
+	[@%:@define ALIGNAS(x) $attr
+	struct ALIGNAS(128) conftest_tag { int foo; } foo; ], [],
+        [rb_cv_have_alignas="$attr"; break], [])
+done
+])])
+AS_IF([test "$rb_cv_have_alignas" != no], [
+    AC_DEFINE_UNQUOTED([RUBY_ALIGNAS(x)], $rb_cv_have_alignas)
+])
+
+AC_CACHE_CHECK([for alignof() syntax], rb_cv_have_alignof,[
+rb_cv_have_alignof=no
+RUBY_WERROR_FLAG([
+for expr in \
+    "alignof" \
+    "_Alignof" \
+    "__alignof" \
+    "__alignof__" \
+;
+do
+    AC_TRY_COMPILE([
+    @%:@ifdef HAVE_STDALIGN_H
+    @%:@include <stdalign.h>
+    @%:@endif],[return (int)$expr(int);],
+        [rb_cv_have_alignof="$expr"; break], [])
+done
+])])
+AS_IF([test "$rb_cv_have_alignof" != no], [
+    AC_DEFINE_UNQUOTED(RUBY_ALIGNOF, $rb_cv_have_alignof)
+])
+
+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(__no_sanitize__(san), NO_SANITIZE(san, x), rb_cv_func_no_sanitize)
+RUBY_FUNC_ATTRIBUTE(__no_sanitize_address__, NO_SANITIZE_ADDRESS)
+RUBY_FUNC_ATTRIBUTE(__no_address_safety_analysis__, NO_ADDRESS_SAFETY_ANALYSIS)
+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)
+AS_IF([test "$rb_cv_func_weak" != x], [
+   AC_DEFINE(HAVE_FUNC_WEAK)
+])
+
+AC_CACHE_CHECK([for __attribute__((__depreacted__(msg))) in C++],
+  rb_cv_CentOS6_CXX_workaround,
+  RUBY_WERROR_FLAG([
+    AC_LANG_PUSH([C++])
+    AC_COMPILE_IFELSE(
+      [AC_LANG_PROGRAM(
+        [],
+        [__attribute__((__deprecated__("message"))) int conftest(...);])],
+      [rb_cv_CentOS6_CXX_workaround=yes],
+      [rb_cv_CentOS6_CXX_workaround=no])
+    AC_LANG_POP()]))
+AS_IF([test "$rb_cv_CentOS6_CXX_workaround" != no],[
+  AC_DEFINE([RUBY_CXX_DEPRECATED(msg)],
+    [__attribute__((__deprecated__(msg)))])])
+
+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)
+
+AS_IF([test "$GCC" = yes], [
+    AC_CACHE_CHECK([for function alias], [rb_cv_gcc_function_alias],
+	[rb_cv_gcc_function_alias=no
+	for a in alias weak,alias; do
+	    AC_TRY_LINK([void foo(void) {}
+		void bar(void) __attribute__(($a("foo")));], [bar()],
+		[rb_cv_gcc_function_alias=$a; break])
+	done])
+    AS_IF([test "$rb_cv_gcc_function_alias" != no], [
+	AC_DEFINE(HAVE_ATTRIBUTE_FUNCTION_ALIAS)
+	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args)],
+			   [type prot __attribute__(($rb_cv_gcc_function_alias(@%:@name)));])
+	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
+			   [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
+    ])
+
+    AC_CACHE_CHECK([for __atomic builtins], [rb_cv_gcc_atomic_builtins], [
+	AC_TRY_LINK([unsigned char atomic_var;],
+		    [
+			__atomic_exchange_n(&atomic_var, 0, __ATOMIC_SEQ_CST);
+			__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])])
+    AS_IF([test "$rb_cv_gcc_atomic_builtins" = yes], [
+	AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS)
+    ])
+
+    AC_CACHE_CHECK([for __sync builtins], [rb_cv_gcc_sync_builtins], [
+	AC_TRY_LINK([unsigned char atomic_var;],
+		    [
+			__sync_lock_test_and_set(&atomic_var, 0);
+			__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])])
+    AS_IF([test "$rb_cv_gcc_sync_builtins" = yes], [
+	AC_DEFINE(HAVE_GCC_SYNC_BUILTINS)
+    ])
+
+    AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable,
+    [RUBY_WERROR_FLAG(
+    [AC_TRY_LINK([volatile int zero;],
+	[if (zero) __builtin_unreachable();],
+	[rb_cv_func___builtin_unreachable=yes],
+	[rb_cv_func___builtin_unreachable=no])
+    ])
+    ])
+    AS_IF([test "$rb_cv_func___builtin_unreachable" = yes], [
+	AC_DEFINE_UNQUOTED(UNREACHABLE, [__builtin_unreachable()])
+    ])
+])
+
+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
+  AC_TRY_COMPILE([@%:@define RUBY_FUNC_EXPORTED $mac extern
+    RUBY_FUNC_EXPORTED void conftest_attribute_check(void);], [],
+    [rb_cv_func_exported="$mac"; break])
+done
+])])
+AS_IF([test "$rb_cv_func_exported" != no], [
+    AC_DEFINE_UNQUOTED(RUBY_FUNC_EXPORTED, [$rb_cv_func_exported extern])
+])
+RUBY_DECL_ATTRIBUTE([__nonnull__(n)], [RUBY_FUNC_NONNULL(n,x)], [rb_cv_func_nonnull],
+                    [], [function], [
+@%:@define x int conftest_attribute_check(void *p)
+@%:@define n 1
+])
+
+RUBY_APPEND_OPTION(XCFLAGS, -DRUBY_EXPORT)
+
+AC_ARG_ENABLE(mathn,
+    AS_HELP_STRING([--disable-mathn], [disable canonicalization for mathn]),
+    [mathn=$enableval], [mathn=yes])
+test "x$mathn" = xyes || mathn=
+AC_SUBST(MATHN, $mathn)
+
+AC_CACHE_CHECK(for function name string predefined identifier,
+    rb_cv_function_name_string,
+    [rb_cv_function_name_string=no
+    RUBY_WERROR_FLAG([
+	for func in __func__ __FUNCTION__; do
+	    AC_TRY_LINK([@%:@include <stdio.h>],
+			[puts($func);],
+			[rb_cv_function_name_string=$func
+			break])
+	done
+    ])]
+)
+AS_IF([test "$rb_cv_function_name_string" != no], [
+    AC_DEFINE_UNQUOTED(RUBY_FUNCTION_NAME_STRING, [$rb_cv_function_name_string])
+])
+
+AC_CACHE_CHECK(if enum over int is allowed, rb_cv_enum_over_int, [
+    rb_cv_enum_over_int=no
+    AS_IF([test "x$ac_cv_type_long_long" = xyes], [
+	type="unsigned long long" max="ULLONG_MAX"
+    ], [
+	type="unsigned long" max="ULONG_MAX"
+    ])
+    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]
+	)
+    ])
+])
+AS_IF([test $rb_cv_enum_over_int = yes], [
+    AC_DEFINE(ENUM_OVER_INT, 1)
+])
+
+dnl Check whether we need to define sys_nerr locally
+AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
+@%:@include <errno.h>])
+
+AC_CHECK_DECLS([getenv])
+
+AS_CASE(["$target_cpu"],
+[alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"],
+		[*::yes],  # gcc
+			[CFLAGS="-mieee $CFLAGS"],
+		[osf*],    # ccc
+			[CFLAGS="-ieee $CFLAGS"],
+		)],
+[sparc*], [AC_LIBOBJ([sparc])])
+
+ac_cv_header_net_socket_h=${ac_cv_header_net_socket_h=no}
+AS_IF([test "$ac_cv_header_net_socket_h" = yes], [
+    ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=no}
+], [
+    ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=yes}
+])
+
+
+AC_TYPE_SIZE_T
+RUBY_CHECK_SIGNEDNESS(size_t, [AC_MSG_ERROR(size_t is signed)], [],
+		      [@%:@include <sys/types.h>])
+RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>])
+RUBY_CHECK_SIZEOF(ptrdiff_t, size_t, [], [@%:@include <stddef.h>])
+RUBY_CHECK_PRINTF_PREFIX(size_t, z)
+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>])
+AS_IF([test "$ac_cv_member_struct_stat_st_blocks" = yes], [
+    RUBY_CHECK_SIZEOF([struct stat.st_blocks], [off_t int long "long long"], [], [@%:@include <sys/stat.h>])
+])
+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])
+AC_CHECK_MEMBERS([struct stat.st_mtim])
+AC_CHECK_MEMBERS([struct stat.st_mtimespec])
+AC_CHECK_MEMBERS([struct stat.st_mtimensec])
+AC_CHECK_MEMBERS([struct stat.st_ctim])
+AC_CHECK_MEMBERS([struct stat.st_ctimespec])
+AC_CHECK_MEMBERS([struct stat.st_ctimensec])
+AC_CHECK_MEMBERS([struct stat.st_birthtimespec])
+AS_IF([test "x$ac_cv_member_struct_stat_st_birthtimespec" != xyes],
+    [AC_CHECK_MEMBERS([struct statx.stx_btime])])
+
+AC_CHECK_TYPES([struct timeval], [], [], [@%:@ifdef HAVE_TIME_H
+@%:@include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@include <sys/time.h>
+@%:@endif])
+
+AS_IF([test "${ac_cv_type_struct_timeval}" = yes], [
+    RUBY_CHECK_SIZEOF([struct timeval.tv_sec], [time_t long "long long"], [],
+		      [@%:@ifdef HAVE_TIME_H
+@%:@include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@include <sys/time.h>
+@%:@endif])
+    AS_CASE(${ac_cv_sizeof_struct_timeval_tv_sec},
+	    [SIZEOF_INT], [t=int],
+	    [SIZEOF_LONG], [t=long],
+	    [SIZEOF_LONG_LONG], [t=LONG_LONG],
+	    [t=])
+    AS_IF([test "${t}" != ""], [
+	AC_DEFINE_UNQUOTED(TYPEOF_TIMEVAL_TV_SEC, [$t])
+    ])
+])
+
+AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
+@%:@include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@include <sys/time.h>
+@%:@endif])
+
+AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
+@%:@ include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@ include <sys/time.h>
+@%:@endif])
+
+AC_CACHE_VAL([rb_cv_large_fd_select],
+    [AC_CHECK_TYPE(fd_mask, [rb_cv_large_fd_select=yes], [rb_cv_large_fd_select=no], [AC_INCLUDES_DEFAULT([])
+@%:@ifdef HAVE_SYS_SELECT_H
+@%:@ include <sys/select.h>
+@%:@endif])])
+AS_IF([test "$rb_cv_large_fd_select" = yes], [
+    AC_DEFINE(HAVE_RB_FD_INIT, 1)
+])
+
+RUBY_DEFINT(int8_t, 1)
+RUBY_DEFINT(uint8_t, 1, unsigned)
+RUBY_DEFINT(int16_t, 2)
+RUBY_DEFINT(uint16_t, 2, unsigned)
+RUBY_DEFINT(int32_t, 4)
+RUBY_DEFINT(uint32_t, 4, unsigned)
+RUBY_DEFINT(int64_t, 8)
+RUBY_DEFINT(uint64_t, 8, unsigned)
+RUBY_DEFINT(int128_t, 16)
+RUBY_DEFINT(uint128_t, 16, unsigned)
+RUBY_DEFINT(intptr_t, void*)
+RUBY_DEFINT(uintptr_t, void*, unsigned)
+AS_IF([test "x$rb_cv_type_intptr_t" != xno], [
+    RUBY_CHECK_PRINTF_PREFIX(intptr_t, '' ll I64 l, PTR)
+])
+RUBY_DEFINT(ssize_t, size_t, [], [@%:@include <sys/types.h>])	dnl may differ from int, so not use AC_TYPE_SSIZE_T.
+AS_IF([test "x$rb_cv_type_int64_t" != xno], [
+    RUBY_CHECK_PRINTF_PREFIX(int64_t, ll I64 l, 64)
+])
+
+AC_CACHE_CHECK(for stack end address, rb_cv_stack_end_address,
+[rb_cv_stack_end_address=no
+  AC_TRY_LINK(
+    [extern void *__libc_stack_end;],
+    [if (!__libc_stack_end) return 1;],
+    [rb_cv_stack_end_address="__libc_stack_end"])
+])
+AS_IF([test $rb_cv_stack_end_address != no], [
+  AC_DEFINE_UNQUOTED(STACK_END_ADDRESS, $rb_cv_stack_end_address)
+])
+
+dnl Checks for library functions.
+AC_TYPE_GETGROUPS
+AC_TYPE_SIGNAL
+AS_CASE(["${target_cpu}-${target_os}:${target_archs}"],
+[powerpc-darwin*], [
+  AC_LIBSOURCES(alloca.c)
+  AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
+  AC_DEFINE(C_ALLOCA)
+  AC_DEFINE_UNQUOTED(alloca, alloca)
+  ],
+[universal-darwin*:*ppc*], [
+  AC_LIBSOURCES(alloca.c)
+  AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
+  RUBY_DEFINE_IF([defined __powerpc__], C_ALLOCA, 1)
+  RUBY_DEFINE_IF([defined __powerpc__], alloca, alloca)
+  ],
+[
+  AC_FUNC_ALLOCA
+  ])
+AS_IF([test "x$ALLOCA" = "x"], [
+    AC_CACHE_CHECK([for dynamic size alloca], rb_cv_dynamic_alloca, [
+    for chk in ok __chkstk; do
+	AC_TRY_LINK([
+	    @%:@ifdef HAVE_ALLOCA_H
+	    @%:@include <alloca.h>
+	    @%:@endif
+	    void $chk() {}
+	    int dynamic_alloca_test;
+	    int dynamic_alloca_result;],
+	    [dynamic_alloca_result = alloca(dynamic_alloca_test) != 0;],
+	    [rb_cv_dynamic_alloca=$chk; break])
+    done])
+    AS_IF([test "x$rb_cv_dynamic_alloca" = "x__chkstk"], [
+	AC_DEFINE_UNQUOTED(RUBY_ALLOCA_CHKSTK, _$rb_cv_dynamic_alloca)
+	AS_CASE("$target_cpu",
+	[x64|x86_64], [
+	    AC_SUBST([ALLOCA], [\${LIBOBJDIR}x86_64-chkstk.${ac_objext}])
+	],)
+    ])
+])
+AC_FUNC_MEMCMP
+
+AS_CASE(["$target_os"],[freebsd*],[
+	 AC_DEFINE(BROKEN_CLOSE)
+	 AC_REPLACE_FUNCS(close)
+	 ])
+
+AC_REPLACE_FUNCS(acosh)
+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(flock)
+AC_REPLACE_FUNCS(hypot)
+AC_REPLACE_FUNCS(lgamma_r)
+AC_REPLACE_FUNCS(memmove)
+AC_REPLACE_FUNCS(nan)
+AC_REPLACE_FUNCS(nextafter)
+AC_REPLACE_FUNCS(setproctitle)
+AC_REPLACE_FUNCS(strchr)
+AC_REPLACE_FUNCS(strerror)
+AC_REPLACE_FUNCS(strlcat)
+AC_REPLACE_FUNCS(strlcpy)
+AC_REPLACE_FUNCS(strstr)
+AC_REPLACE_FUNCS(tgamma)
+
+RUBY_REPLACE_FUNC([finite], [@%:@include <math.h>])
+RUBY_REPLACE_FUNC([isinf], [@%:@include <math.h>])
+RUBY_REPLACE_FUNC([isnan], [@%:@include <math.h>])
+
+# for missing/setproctitle.c
+AS_CASE(["$target_os"],
+[aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)],
+[hpux*], [AC_DEFINE(SPT_TYPE,SPT_PSTAT) ],
+[])
+AC_CHECK_HEADERS(sys/pstat.h)
+
+
+AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,
+  [AC_TRY_LINK([
+#include <math.h>
+], [int v = signbit(-0.0);],
+	rb_cv_have_signbit=yes,
+	rb_cv_have_signbit=no)])
+AS_IF([test "$rb_cv_have_signbit" = yes], [
+  AC_DEFINE(HAVE_SIGNBIT)
+], [
+  AC_LIBOBJ([signbit])
+])
+
+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(atan2l atan2f)
+AC_CHECK_FUNCS(chroot)
+AC_CHECK_FUNCS(chsize)
+AC_CHECK_FUNCS(clock_gettime)
+AC_CHECK_FUNCS(copy_file_range)
+AC_CHECK_FUNCS(cosh)
+AC_CHECK_FUNCS(crypt_r)
+AC_CHECK_FUNCS(daemon)
+AC_CHECK_FUNCS(dirfd)
+AC_CHECK_FUNCS(dl_iterate_phdr)
+AC_CHECK_FUNCS(dlopen)
+AC_CHECK_FUNCS(dladdr)
+AC_CHECK_FUNCS(dup)
+AC_CHECK_FUNCS(dup3)
+AC_CHECK_FUNCS(eaccess)
+AC_CHECK_FUNCS(endgrent)
+AC_CHECK_FUNCS(eventfd)
+AC_CHECK_FUNCS(explicit_memset)
+AC_CHECK_FUNCS(fcopyfile)
+AC_CHECK_FUNCS(fchmod)
+AC_CHECK_FUNCS(fchown)
+AC_CHECK_FUNCS(fcntl)
+AC_CHECK_FUNCS(fdatasync)
+AC_CHECK_FUNCS(fdopendir)
+AC_CHECK_FUNCS(fgetattrlist)
+AC_CHECK_FUNCS(fmod)
+AC_CHECK_FUNCS(fstatat)
+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)
+AC_CHECK_FUNCS(getpgrp)
+AC_CHECK_FUNCS(getpriority)
+AC_CHECK_FUNCS(getpwnam_r)
+AC_CHECK_FUNCS(getrandom)
+AC_CHECK_FUNCS(getresgid)
+AC_CHECK_FUNCS(getresuid)
+AC_CHECK_FUNCS(getrlimit)
+AC_CHECK_FUNCS(getsid)
+AC_CHECK_FUNCS(gettimeofday)		# for making ac_cv_func_gettimeofday
+AC_CHECK_FUNCS(getuidx)
+AC_CHECK_FUNCS(gmtime_r)
+AC_CHECK_FUNCS(grantpt)
+AC_CHECK_FUNCS(initgroups)
+AC_CHECK_FUNCS(ioctl)
+AC_CHECK_FUNCS(isfinite)
+AC_CHECK_FUNCS(issetugid)
+AC_CHECK_FUNCS(killpg)
+AC_CHECK_FUNCS(lchmod)
+AC_CHECK_FUNCS(lchown)
+AC_CHECK_FUNCS(link)
+AC_CHECK_FUNCS(llabs)
+AC_CHECK_FUNCS(lockf)
+AC_CHECK_FUNCS(log2)
+AC_CHECK_FUNCS(lstat)
+AC_CHECK_FUNCS(lutimes)
+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(openat)
+AC_CHECK_FUNCS(pipe2)
+AC_CHECK_FUNCS(poll)
+AC_CHECK_FUNCS(posix_fadvise)
+AC_CHECK_FUNCS(posix_memalign)
+AC_CHECK_FUNCS(ppoll)
+AC_CHECK_FUNCS(pread)
+AC_CHECK_FUNCS(pwrite)
+AC_CHECK_FUNCS(qsort_r)
+AC_CHECK_FUNCS(qsort_s)
+AC_CHECK_FUNCS(readlink)
+AC_CHECK_FUNCS(realpath)
+AC_CHECK_FUNCS(round)
+AC_CHECK_FUNCS(sched_getaffinity)
+AC_CHECK_FUNCS(seekdir)
+AC_CHECK_FUNCS(select_large_fdset)
+AC_CHECK_FUNCS(sendfile)
+AC_CHECK_FUNCS(setegid)
+AC_CHECK_FUNCS(setenv)
+AC_CHECK_FUNCS(seteuid)
+AC_CHECK_FUNCS(setgid)
+AC_CHECK_FUNCS(setgroups)
+AC_CHECK_FUNCS(setpgid)
+AC_CHECK_FUNCS(setpgrp)
+AC_CHECK_FUNCS(setregid)
+AC_CHECK_FUNCS(setresgid)
+AC_CHECK_FUNCS(setresuid)
+AC_CHECK_FUNCS(setreuid)
+AC_CHECK_FUNCS(setrgid)
+AC_CHECK_FUNCS(setrlimit)
+AC_CHECK_FUNCS(setruid)
+AC_CHECK_FUNCS(setsid)
+AC_CHECK_FUNCS(setuid)
+AC_CHECK_FUNCS(shutdown)
+AC_CHECK_FUNCS(sigaction)
+AC_CHECK_FUNCS(sigaltstack)
+AC_CHECK_FUNCS(sigprocmask)
+AC_CHECK_FUNCS(sinh)
+AC_CHECK_FUNCS(spawnv)
+AC_CHECK_FUNCS(symlink)
+AC_CHECK_FUNCS(syscall)
+AC_CHECK_FUNCS(sysconf)
+AC_CHECK_FUNCS(tanh)
+AC_CHECK_FUNCS(telldir)
+AC_CHECK_FUNCS(timegm)
+AC_CHECK_FUNCS(times)
+AC_CHECK_FUNCS(truncate)
+AC_CHECK_FUNCS(truncate64)		# used for Win32
+AC_CHECK_FUNCS(unsetenv)
+AC_CHECK_FUNCS(utimensat)
+AC_CHECK_FUNCS(utimes)
+AC_CHECK_FUNCS(wait4)
+AC_CHECK_FUNCS(waitpid)
+
+AS_IF([test "x$ac_cv_member_struct_statx_stx_btime" = xyes],
+    [AC_CHECK_FUNCS(statx)])
+
+AS_CASE(["$ac_cv_func_memset_s:$ac_cv_func_qsort_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([
+@%:@include <stddef.h>
+@%:@include <stdio.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)
+{
+    if (!getcwd(NULL, 0)) return EXIT_FAILURE;
+    return EXIT_SUCCESS;
+}
+],
+	    rb_cv_getcwd_malloc=yes,
+	    rb_cv_getcwd_malloc=no,
+	    AS_CASE($target_os,
+		[linux*|darwin*|*bsd|cygwin*|mingw*|mswin*],
+		[rb_cv_getcwd_malloc=yes],
+		[rb_cv_getcwd_malloc=no]))])
+    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>])])])
+
+RUBY_CHECK_BUILTIN_FUNC(__builtin_alloca_with_align, [__builtin_alloca_with_align(1, 4096)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_assume_aligned, [__builtin_assume_aligned((void*)32, 32)])
+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_add_overflow, [int x;__builtin_add_overflow(0,0,&x)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_sub_overflow, [int x;__builtin_sub_overflow(0,0,&x)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_mul_overflow, [int x;__builtin_mul_overflow(0,0,&x)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_mul_overflow_p, [__builtin_mul_overflow_p(0,0,(int)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))]];
+    ])
+AS_IF([test x$rb_cv_builtin___builtin_choose_expr = xyes], [
+    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))]];
+    ])
+])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_types_compatible_p, [__builtin_types_compatible_p(int, int)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_trap, [__builtin_trap()])
+
+AS_IF([test "$ac_cv_func_qsort_r" != no], [
+  AC_CACHE_CHECK(whether qsort_r is GNU version, rb_cv_gnu_qsort_r,
+    [AC_TRY_COMPILE([
+@%:@include <stdlib.h>
+void (qsort_r)(void *base, size_t nmemb, size_t size,
+	    int (*compar)(const void *, const void *, void *),
+	    void *arg);
+],[ ],
+      [rb_cv_gnu_qsort_r=yes],
+      [rb_cv_gnu_qsort_r=no])
+  ])
+  AC_CACHE_CHECK(whether qsort_r is BSD version, rb_cv_bsd_qsort_r,
+    [AC_TRY_COMPILE([
+@%:@include <stdlib.h>
+void (qsort_r)(void *base, size_t nmemb, size_t size,
+	     void *arg, int (*compar)(void *, const void *, const void *));
+],[ ],
+      [rb_cv_bsd_qsort_r=yes],
+      [rb_cv_bsd_qsort_r=no])
+  ])
+  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)
+  ])
+])
+
+AC_CACHE_CHECK(whether atan2 handles Inf as C99, rb_cv_atan2_inf_c99, [
+    AS_IF([test $ac_cv_func_atan2f:$ac_cv_func_atan2l = yes:yes], [
+	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)
+{
+    if (fabs(atan2(INFINITY, INFINITY) - M_PI_4) <= 0.01) return EXIT_SUCCESS;
+    return EXIT_FAILURE;
+}
+],
+	[rb_cv_atan2_inf_c99=yes],
+	[rb_cv_atan2_inf_c99=no],
+	[AS_CASE($target_os, [mingw*|mswin*], [rb_cv_atan2_inf_c99=no], [rb_cv_atan2_inf_c99=yes])]
+	)
+    ], [rb_cv_atan2_inf_c99=no])
+])
+AS_IF([test "x$rb_cv_atan2_inf_c99" = xyes], [AC_DEFINE(ATAN2_INF_C99)])
+
+# Some platform need -lrt for clock_gettime, but the other don't.
+AS_IF([test x"$ac_cv_func_clock_gettime" != xyes], [
+    # glibc 2.17 moves clock_* functions from librt to the main C library.
+    # http://sourceware.org/ml/libc-announce/2012/msg00001.html
+    AC_CHECK_LIB(rt, clock_gettime)
+    AS_IF([test x"$ac_cv_lib_rt_clock_gettime" = xyes], [
+	AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
+    ])
+])
+AC_CHECK_FUNCS(clock_getres) # clock_getres should be tested after clock_gettime test including librt test.
+AC_CHECK_LIB([rt], [timer_create])
+AC_CHECK_LIB([rt], [timer_settime])
+AS_IF([test x"$ac_cv_lib_rt_timer_create" = xyes], [
+    AC_DEFINE(HAVE_TIMER_CREATE, 1)
+])
+AS_IF([test x"$ac_cv_lib_rt_timer_settime" = xyes], [
+    AC_DEFINE(HAVE_TIMER_SETTIME, 1)
+])
+
+AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value,
+  [AC_TRY_COMPILE([
+#include <stdlib.h>
+], [int v = unsetenv("foo");],
+	rb_cv_unsetenv_return_value=yes,
+	rb_cv_unsetenv_return_value=no)])
+AS_IF([test "$rb_cv_unsetenv_return_value" = no], [
+  AC_DEFINE(VOID_UNSETENV)
+])
+
+# End of setjmp check.
+
+AC_ARG_ENABLE(setreuid,
+       AS_HELP_STRING([--enable-setreuid], [use setreuid()/setregid() according to need even if obsolete]),
+       [use_setreuid=$enableval])
+AS_IF([test "$use_setreuid" = yes], [
+    AC_DEFINE(USE_SETREUID)
+    AC_DEFINE(USE_SETREGID)
+])
+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>
+   ],
+    [struct tm t; t.tm_gmtoff = 3600;],
+  [rb_cv_member_struct_tm_tm_gmtoff=yes],
+  [rb_cv_member_struct_tm_tm_gmtoff=no])])
+AS_IF([test "$rb_cv_member_struct_tm_tm_gmtoff" = yes], [
+  AC_DEFINE(HAVE_STRUCT_TM_TM_GMTOFF)
+])
+AC_CACHE_CHECK(for external int daylight, rb_cv_have_daylight,
+  [AC_TRY_LINK([#include <time.h>
+  int i;],
+	[i = daylight;],
+	rb_cv_have_daylight=yes,
+	rb_cv_have_daylight=no)])
+AS_IF([test "$rb_cv_have_daylight" = yes], [
+  AC_DEFINE(HAVE_DAYLIGHT)
+])
+
+AC_CACHE_CHECK(for negative time_t for gmtime(3), rb_cv_negative_time_t,
+  [AC_TRY_RUN([
+#include <stdlib.h>
+#include <time.h>
+
+void
+check(tm, y, m, d, h, s)
+    struct tm *tm;
+    int y, m, d, h, s;
+{
+    if (!tm ||
+	tm->tm_year != y ||
+	tm->tm_mon  != m-1 ||
+	tm->tm_mday != d ||
+	tm->tm_hour != h ||
+	tm->tm_sec  != s) {
+	exit(1);
+    }
+}
+
+int
+main()
+{
+   time_t t = -1;
+   struct tm *tm;
+
+   check(gmtime(&t), 69, 12, 31, 23, 59);
+   t = ~(time_t)0 << 31;
+   check(gmtime(&t), 1, 12, 13, 20, 52);
+   return 0;
+}
+],
+	rb_cv_negative_time_t=yes,
+	rb_cv_negative_time_t=no,
+	rb_cv_negative_time_t=yes)])
+AS_IF([test "$rb_cv_negative_time_t" = yes], [
+  AC_DEFINE(NEGATIVE_TIME_T)
+])
+
+# [ruby-dev:40910] overflow of time on FreeBSD
+# http://www.freebsd.org/cgi/query-pr.cgi?pr=145341
+AC_CACHE_CHECK(for localtime(3) overflow correctly, rb_cv_localtime_overflow,
+  [AC_TRY_RUN([
+#include <stdlib.h>
+#include <time.h>
+
+void
+check(time_t t1)
+{
+    struct tm *tm;
+    time_t t2;
+    tm = localtime(&t1);
+    if (!tm)
+	return; /* overflow detected.  ok. */
+    t2 = mktime(tm);
+    if (t1 == t2)
+        return; /* round-trip.  ok. */
+    exit(1);
+}
+
+int
+main()
+{
+    time_t t;
+    if (~(time_t)0 <= 0) {
+        t = (((time_t)1) << (sizeof(time_t) * 8 - 2));
+        t |= t - 1;
+    }
+    else {
+        t = ~(time_t)0;
+    }
+    check(t);
+    return 0;
+}
+],
+	rb_cv_localtime_overflow=yes,
+	rb_cv_localtime_overflow=no,
+	rb_cv_localtime_overflow=no)])
+AS_IF([test "$rb_cv_localtime_overflow" = no], [
+  AC_DEFINE(LOCALTIME_OVERFLOW_PROBLEM)
+])
+
+AS_IF([test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes], [
+   AC_DEFINE(POSIX_SIGNAL)
+], [
+  AC_CHECK_FUNCS(sigsetmask)
+  AC_CACHE_CHECK(for BSD signal semantics, rb_cv_bsd_signal,
+    [AC_TRY_RUN([
+#include <stdio.h>
+#include <signal.h>
+
+void
+sig_handler(dummy)
+     int dummy;
+{
+}
+
+int
+main()
+{
+  signal(SIGINT, sig_handler);
+  kill(getpid(), SIGINT);
+  kill(getpid(), SIGINT);
+  return 0;
+}
+],
+	rb_cv_bsd_signal=yes,
+	rb_cv_bsd_signal=no,
+	rb_cv_bsd_signal=$ac_cv_func_sigsetmask)])
+  AS_IF([test "$rb_cv_bsd_signal" = yes], [
+    AC_DEFINE(BSD_SIGNAL)
+  ])
+])
+
+AC_CHECK_TYPES([sig_t],[],[],[@%:@include <signal.h>])
+
+AS_IF([test "$ac_cv_func_getpgid" = no], [
+  # AC_FUNC_GETPGRP fails when cross-compiling with old autoconf.
+  # autoconf is changed between 2.52d and 2.52f?
+  # http://lists.gnu.org/archive/html/bug-gnu-utils/2001-09/msg00181.html
+  # "autoconf cleanup for AC_FUNC_GETPGRP and GETPGRP_VOID"
+AC_FUNC_GETPGRP
+])
+AS_IF([test "$ac_cv_func_setpgid:$ac_cv_func_setpgrp" = no:yes], [
+  # AC_FUNC_SETPGRP fails when cross-compiling.  (until autoconf 2.69?)
+  # https://lists.gnu.org/archive/html/bug-autoconf/2013-02/msg00002.html
+  # "AC_FUNC_SETPGRP fails to work properly when cross-compiling"
+AC_FUNC_SETPGRP
+])
+
+AS_IF([test x"$ac_cv_func_dirfd" = xno], [
+  AS_CASE(["$target_os"],[solaris*],
+          [AC_CHECK_MEMBERS([DIR.d_fd, DIR.dd_fd],,,[
+#include <sys/types.h>
+#include <dirent.h>
+])])
+])
+
+AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
+    [AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([], [(-1==(-1>>1))])],
+	rb_cv_rshift_sign=yes,
+	rb_cv_rshift_sign=no)])
+AS_IF([test "$rb_cv_rshift_sign" = yes], [
+  AC_DEFINE(RSHIFT(x,y), ((x)>>(int)(y)))
+], [
+  AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>(int)(y)) : (x)>>(int)(y)))
+])
+
+AS_CASE(["$ac_cv_func_gettimeofday:$ac_cv_func_clock_gettime"],
+[*yes*], [],
+[
+    AC_MSG_ERROR(clock_gettime() or gettimeofday() must exist)
+])
+
+AS_IF([test "$ac_cv_func_sysconf" = yes], [
+  RUBY_CHECK_SYSCONF(CLK_TCK)
+])
+
+AS_IF([test "${universal_binary-no}" = yes ], [
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    save_CFLAGS="$CFLAGS" new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
+    save_LDFLAGS="$LDFLAGS" new_ldflags=`echo "$LDFLAGS" | sed "s|$archflagpat"'||'`
+    stack_dir=
+    for archs in ${universal_archnames}; do
+	archs=`echo $archs | sed 's/=.*//'`
+	CFLAGS="$new_cflags -arch $archs"
+	LDFLAGS="$new_ldflags -arch $archs"
+	RUBY_STACK_GROW_DIRECTION($archs, dir)
+	AS_IF([test x$stack_dir = x], [
+	    stack_dir=$dir
+	], [test x$stack_dir != x$dir], [
+	    stack_dir=no
+	])
+    done
+    CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS"
+    AS_IF([test x$stack_dir = xno], [
+	for archs in ${universal_archnames}; do
+	    archs=`echo $archs | sed 's/=.*//'`
+	    eval dir=\$[rb_cv_stack_grow_dir_]AS_TR_SH([$archs])
+	    RUBY_DEFINE_IF([defined __${archs}__], STACK_GROW_DIRECTION, $dir)
+	done
+    ], [
+	AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $stack_dir)
+    ])
+], [
+    RUBY_STACK_GROW_DIRECTION($target_cpu, dir)
+    AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $dir)
+])
+
+AC_ARG_WITH(coroutine,
+    AS_HELP_STRING([--with-coroutine=IMPLEMENTATION], [specify the coroutine implementation to use]),
+    [rb_cv_coroutine=$withval])
+AS_CASE([$rb_cv_coroutine], [yes|''], [
+    AC_MSG_CHECKING(native coroutine implementation for ${target_cpu}-${target_os})
+    AS_CASE(["$target_cpu-$target_os"],
+        [x*64-darwin*], [
+            rb_cv_coroutine=amd64
+        ],
+        [x*64-linux*], [
+            AS_CASE(["$ac_cv_sizeof_voidp"],
+                [8], [ rb_cv_coroutine=amd64 ],
+                [4], [ rb_cv_coroutine=x86 ],
+                [*], [ rb_cv_coroutine= ]
+            )
+        ],
+        [*86-linux*], [
+            rb_cv_coroutine=x86
+        ],
+        [x64-mingw32], [
+            rb_cv_coroutine=win64
+        ],
+        [*86-mingw32], [
+            rb_cv_coroutine=win32
+        ],
+        [armv7*-linux*], [
+            rb_cv_coroutine=ucontext
+        ],
+        [aarch64-linux*], [
+            rb_cv_coroutine=arm64
+        ],
+        [powerpc64le-linux*], [
+            rb_cv_coroutine=ppc64le
+        ],
+        [x86_64-openbsd*], [
+            rb_cv_coroutine=amd64
+        ],
+        [i386-openbsd*], [
+            rb_cv_coroutine=x86
+        ],
+        [*-openbsd*], [
+            rb_cv_coroutine=copy
+        ],
+        [*], [
+            rb_cv_coroutine=ucontext
+        ]
+    )
+    AC_MSG_RESULT(${rb_cv_coroutine})
+])
+COROUTINE_H=coroutine/$rb_cv_coroutine/Context.h
+AS_CASE([$rb_cv_coroutine],
+    [copy|ucontext], [
+        COROUTINE_SRC=coroutine/$rb_cv_coroutine/Context.c
+    ],
+    [*], [
+        COROUTINE_SRC=coroutine/$rb_cv_coroutine/Context.'$(ASMEXT)'
+    ],
+)
+AC_DEFINE_UNQUOTED(COROUTINE_H, ["$COROUTINE_H"])
+AC_SUBST(X_COROUTINE_H, [$COROUTINE_H])
+AC_SUBST(X_COROUTINE_SRC, [$COROUTINE_SRC])
+
+AS_IF([test x"$enable_pthread" = xyes], [
+    for pthread_lib in thr pthread pthreads c c_r root; do
+	AC_CHECK_LIB($pthread_lib, pthread_create,
+		     rb_with_pthread=yes, rb_with_pthread=no)
+	AS_IF([test "$rb_with_pthread" = "yes"], [break])
+    done
+    AS_IF([test x"$rb_with_pthread" = xyes], [
+	AC_DEFINE(_REENTRANT)
+	AC_DEFINE(_THREAD_SAFE)
+	AC_DEFINE(HAVE_LIBPTHREAD)
+	AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
+	AS_CASE(["$pthread_lib:$target_os"],
+		[c:*], [],
+		[root:*], [],
+		[c_r:*|*:openbsd*|*:mirbsd*],  [LIBS="-pthread $LIBS"],
+		[LIBS="-l$pthread_lib $LIBS"])
+    ], [
+	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
+    ])
+    AC_CACHE_CHECK([whether pthread_t is scalar type], [rb_cv_scalar_pthread_t], [
+	AC_TRY_COMPILE([
+	    @%:@include <pthread.h>
+	    ], [
+	    pthread_t thread_id;
+	    thread_id = 0;
+	    if (!thread_id) return 0;
+	    ], [rb_cv_scalar_pthread_t=yes], [rb_cv_scalar_pthread_t=no])
+    ])
+    AS_IF([test x"$rb_cv_scalar_pthread_t" = xyes], [
+	: # RUBY_CHECK_SIZEOF(pthread_t, [void* int long], [], [@%:@include <pthread.h>])
+    ], [
+	AC_DEFINE(NON_SCALAR_THREAD_ID)
+    ])
+    AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \
+	pthread_attr_get_np pthread_attr_getstack pthread_attr_getguardsize \
+	pthread_get_stackaddr_np pthread_get_stacksize_np \
+	thr_stksegment pthread_stackseg_np pthread_getthrds_np \
+	pthread_condattr_setclock \
+	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)])
+    set_current_thread_name=
+    AS_IF([test "$ac_cv_func_pthread_setname_np" = yes], [
+	AC_CACHE_CHECK([arguments of pthread_setname_np], [rb_cv_func_pthread_setname_np_arguments],
+	    [rb_cv_func_pthread_setname_np_arguments=
+	    # Linux,AIX,  (pthread_self(), name)
+	    # NetBSD (pthread_self(), name, \"%s\")
+	    # Darwin (name)
+	    for mac in \
+		"(pthread_self(), name)" \
+		"(pthread_self(), name, \"%s\")" \
+		"(name)" \
+		; do
+		AC_TRY_COMPILE([
+		    @%:@include <pthread.h>
+		    @%:@ifdef HAVE_PTHREAD_NP_H
+		    @%:@include <pthread_np.h>
+		    @%:@endif
+		    @%:@define SET_THREAD_NAME(name) pthread_setname_np${mac}
+		    ],
+		    [if (SET_THREAD_NAME("conftest")) return 1;],
+		    [rb_cv_func_pthread_setname_np_arguments="${mac}"
+		    break])
+	    done
+	    ]
+	)
+	AS_IF([test -n "${rb_cv_func_pthread_setname_np_arguments}"], [
+	    set_current_thread_name="pthread_setname_np${rb_cv_func_pthread_setname_np_arguments}"
+	])
+    ], [test "$ac_cv_func_pthread_set_name_np" = yes], [
+	set_current_thread_name="pthread_set_name_np(pthread_self(), name)"
+    ])
+    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)
+	    ])
+    ])
+])
+
+AS_IF([test x"$ac_cv_header_ucontext_h" = xno], [
+    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])])
+    AS_IF([test x"$rb_cv_ucontext_in_signal_h" = xyes], [
+	    AC_DEFINE_UNQUOTED(UCONTEXT_IN_SIGNAL_H, 1)
+    ])
+])
+AS_IF([test x"$ac_cv_header_ucontext_h" = xyes -o x"$rb_cv_ucontext_in_signal_h" = xyes], [
+    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])])
+    AS_IF([test x"$rb_cv_mcontext_t_ptr" = xyes], [
+	AC_DEFINE_UNQUOTED(DEFINE_MCONTEXT_PTR(mc, uc), mcontext_t mc = (uc)->uc_mcontext)
+    ], [
+	AC_DEFINE_UNQUOTED(DEFINE_MCONTEXT_PTR(mc, uc), mcontext_t *mc = &(uc)->uc_mcontext)
+    ])
+    AS_IF([test x"$rb_with_pthread" = xyes], [
+	AC_CHECK_FUNCS(getcontext setcontext)
+    ])
+])
+
+AS_IF([test "$ac_cv_func_fork_works" = "yes" -a "$rb_with_pthread" = "yes"], [
+    AC_CACHE_CHECK([if fork works with pthread], rb_cv_fork_with_pthread,
+	[AC_TRY_RUN([
+#include <stdlib.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+
+void *
+thread_func(void *dmy)
+{
+    return dmy;
+}
+
+int
+use_threads(void)
+{
+    pthread_t tid;
+    if (pthread_create(&tid, 0, thread_func, 0) != 0) {
+	return -1;
+    }
+    if (pthread_join(tid, 0) != 0) {
+	return -1;
+    }
+    return 0;
+}
+
+int
+main(int argc, char *argv[])
+{
+    pid_t pid;
+    if (use_threads()) return EXIT_FAILURE;
+    pid = fork();
+
+    if (pid) {
+	int loc;
+	sleep(1);
+	if (waitpid(pid, &loc, WNOHANG) == 0) {
+	    kill(pid, SIGKILL);
+	    return EXIT_FAILURE;
+	}
+        if (!WIFEXITED(loc) || WEXITSTATUS(loc) != EXIT_SUCCESS)
+           return EXIT_FAILURE;
+    }
+    else {
+	if (use_threads()) return EXIT_FAILURE;
+    }
+
+    return EXIT_SUCCESS;
+}],
+	rb_cv_fork_with_pthread=yes,
+	rb_cv_fork_with_pthread=no,
+	rb_cv_fork_with_pthread=yes)])
+    test x$rb_cv_fork_with_pthread = xyes || AC_DEFINE(CANNOT_FORK_WITH_PTHREAD)
+])
+}
+
+: "runtime section" && {
+dnl wheather use dln_a_out or not
+AC_ARG_WITH(dln-a-out,
+	AS_HELP_STRING([--with-dln-a-out], [use dln_a_out if possible]),
+	[
+	AS_CASE([$withval],
+	[yes], [
+	    AS_IF([test "$enable_shared" = yes], [
+		AC_MSG_ERROR(dln_a_out can not make shared library)
+	    ])
+	    with_dln_a_out=yes],
+	[
+	    with_dln_a_out=no])], [with_dln_a_out=no])
+
+AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
+[AC_TRY_LINK([],[], [
+AS_CASE(["`head -1 conftest$EXEEXT | tr -dc '\177ELF' | tr '\177' .`"],
+[.ELF*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
+rb_cv_binary_elf=no)])
+
+AS_IF([test "$rb_cv_binary_elf" = yes], [
+  AC_DEFINE(USE_ELF)
+  AS_IF([test "$with_dln_a_out" = yes], [
+    AC_MSG_ERROR(dln_a_out does not work with ELF)
+  ])
+  AC_CHECK_HEADERS([elf.h elf_abi.h])
+  AS_IF([test $ac_cv_header_elf_h = yes -o $ac_cv_header_elf_abi_h = yes], [
+    AC_LIBOBJ([addr2line])
+    AS_IF([test "x$compress_debug_sections" = xzlib], [
+      AC_CHECK_LIB([z], [uncompress])
+    ])
+  ])
+])
+
+AC_CHECK_HEADERS([mach-o/loader.h])
+AS_IF([test "$ac_cv_header_mach_o_loader_h" = yes], [
+  AC_LIBOBJ([addr2line])
+])
+
+AS_CASE(["$target_os"],
+[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu], [
+    AS_IF([test "$rb_cv_binary_elf" = no], [
+	with_dln_a_out=yes
+    ], [
+	LDFLAGS="$LDFLAGS -rdynamic"
+    ])])
+LIBEXT=a
+
+AC_SUBST(DLDFLAGS)dnl
+AC_SUBST(ARCH_FLAG)dnl
+AC_SUBST(MJIT_HEADER_FLAGS)dnl
+AC_SUBST(MJIT_HEADER_INSTALL_DIR)dnl
+AC_SUBST(MJIT_CC)dnl
+AS_IF([test "$GCC" = "yes"], [
+    AS_CASE(["$target_os"],[aix*],[mjit_std_cflag="-std=gnu99"])
+])
+AC_SUBST(MJIT_CFLAGS, [${MJIT_CFLAGS-"-w ${mjit_std_cflag} ${orig_cflags}"}])dnl
+AC_SUBST(MJIT_OPTFLAGS, [${MJIT_OPTFLAGS-'$(optflags)'}])dnl
+AC_SUBST(MJIT_DEBUGFLAGS, [${MJIT_DEBUGFLAGS-'$(debugflags)'}])dnl
+AC_SUBST(MJIT_LDSHARED)dnl
+
+AC_SUBST(STATIC)dnl
+AC_SUBST(CCDLFLAGS)dnl
+AC_SUBST(LDSHARED)dnl
+AC_SUBST(LDSHAREDXX)dnl
+AC_SUBST(DLEXT)dnl
+AC_SUBST(DLEXT2)dnl
+AC_SUBST(LIBEXT)dnl
+AC_SUBST(ASMEXT, S)dnl
+
+STATIC=
+
+AS_IF([test "$with_dln_a_out" != yes], [
+  rb_cv_dlopen=unknown
+  AC_MSG_CHECKING(whether OS depend dynamic link works)
+  AS_IF([test "$GCC" = yes], [
+    AS_CASE(["$target_os"],
+    [darwin*], [
+      # The -fno-common is needed if we wish to embed the Ruby interpreter
+      # into a plugin module of some project (as opposed to embedding it
+      # within the project's application).  The -I/usr/local/include is
+      # needed because CPP as discovered by configure (cc -E -traditional)
+      # fails to consult /usr/local/include by default.  This causes
+      # mkmf.rb's have_header() to fail if the desired resource happens to be
+      # installed in the /usr/local tree.
+      RUBY_APPEND_OPTION(CCDLFLAGS, -fno-common)],
+    [bsdi*|cygwin*|mingw*|aix*|interix*], [ ],
+    [
+      RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC)])
+  ], [
+    AS_CASE(["$target_os"],
+	[hpux*],          [CCDLFLAGS="$CCDLFLAGS +Z"],
+	[solaris*|irix*], [CCDLFLAGS="$CCDLFLAGS -KPIC"],
+	[sunos*],         [CCDLFLAGS="$CCDLFLAGS -PIC"],
+	[esix*|uxpds*],   [CCDLFLAGS="$CCDLFLAGS -KPIC"],
+	                  [: ${CCDLFLAGS=""}])
+  ])
+
+
+  AC_ARG_ENABLE(rpath,
+       AS_HELP_STRING([--enable-rpath], [embed run path into extension libraries.
+       enabled by default on ELF platforms]),
+       [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
+
+  AS_CASE(["$target_os"],
+	[hpux*], [	DLDFLAGS="$DLDFLAGS -E"
+			: ${LDSHARED='$(LD) -b'}
+			XLDFLAGS="$XLDFLAGS -Wl,-E"
+			: ${LIBPATHENV=SHLIB_PATH}
+			rb_cv_dlopen=yes],
+	[solaris*], [	AS_IF([test "$GCC" = yes], [
+			    : ${LDSHARED='$(CC) -shared'}
+			    AS_IF([test "$rb_cv_prog_gnu_ld" = yes], [
+				LDFLAGS="$LDFLAGS -Wl,-E"
+			    ])
+			], [
+			    : ${LDSHARED='$(CC) -G'}
+			])
+			AS_IF([test "$ac_cv_sizeof_voidp" = 8], [
+			    : ${LIBPATHENV=LD_LIBRARY_PATH_64}
+			    : ${PRELOADENV=LD_PRELOAD_64}
+			], [
+			    : ${LIBPATHENV=LD_LIBRARY_PATH_32}
+			    : ${PRELOADENV=LD_PRELOAD_32}
+			])
+			rb_cv_dlopen=yes],
+	[sunos*], [	: ${LDSHARED='$(LD) -assert nodefinitions'}
+			rb_cv_dlopen=yes],
+	[irix*], [	: ${LDSHARED='$(LD) -shared'}
+			rb_cv_dlopen=yes],
+	[sysv4*], [	: ${LDSHARED='$(LD) -G'}
+			rb_cv_dlopen=yes],
+	[nto-qnx*], [	: ${LDSHARED='$(CC) -shared'}
+			rb_cv_dlopen=yes],
+	[esix*|uxpds*], [ : ${LDSHARED='$(LD) -G'}
+			rb_cv_dlopen=yes],
+	[osf*], [	: ${LDSHARED='$(LD) -shared -expect_unresolved "*"'}
+			rb_cv_dlopen=yes],
+	[bsdi3*], [	AS_CASE(["$CC"],
+			[*shlicc*], [	: ${LDSHARED='$(CC) -r'}
+					rb_cv_dlopen=yes])],
+	[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [
+			: ${LDSHARED='$(CC) -shared'}
+			AS_IF([test "$rb_cv_binary_elf" = yes], [
+			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+			])
+			rb_cv_dlopen=yes],
+	[interix*], [	: ${LDSHARED='$(CC) -shared'}
+			XLDFLAGS="$XLDFLAGS -Wl,-E"
+			LIBPATHFLAG=" -L%1\$-s"
+			rb_cv_dlopen=yes],
+	[freebsd*|dragonfly*], [
+			: ${LDSHARED='$(CC) -shared'}
+			AS_IF([test "$rb_cv_binary_elf" = yes], [
+			    LDFLAGS="$LDFLAGS -rdynamic"
+			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
+			], [
+			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
+			])
+			rb_cv_dlopen=yes],
+	[openbsd*|mirbsd*], [	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
+			AS_IF([test "$rb_cv_binary_elf" = yes], [
+			    LDFLAGS="$LDFLAGS -Wl,-E"
+			])
+			rb_cv_dlopen=yes],
+	[darwin*], [	: ${LDSHARED='$(CC) -dynamic -bundle'}
+			: ${DLDSHARED='$(CC) -dynamiclib'}
+			: ${LDFLAGS=""}
+			: ${LIBPATHENV=DYLD_FALLBACK_LIBRARY_PATH}
+			: ${PRELOADENV=DYLD_INSERT_LIBRARIES}
+			rb_cv_dlopen=yes],
+        [aix*], [	: ${LDSHARED='$(CC)'}
+			AS_IF([test "$GCC" = yes], [
+			    LDSHARED="$LDSHARED ${linker_flag}-G -shared"
+			], [
+			    LDSHARED="$LDSHARED ${linker_flag}-G"
+			])
+			EXTDLDFLAGS='-e$(TARGET_ENTRY)'
+			XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
+			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
+			: ${ARCHFILE="ruby.imp"}
+                        TRY_LINK='$(CC) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
+                        TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(LOCAL_LIBS) $(LIBS)'
+			: ${LIBPATHENV=LIBPATH}
+			: ${PRELOADENV=LDR_PRELOAD}
+			rb_cv_dlopen=yes],
+	[nto-qnx*], [	DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
+			: ${LDSHARED='$(LD) -Bshareable -x'}
+			LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
+			rb_cv_dlopen=yes],
+	[cygwin*|mingw*], [
+			: ${LDSHARED='$(CC) -shared'}
+			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import"
+			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
+			: ${LIBPATHENV=PATH}
+			: ${PRELOADENV=""}
+			rb_cv_dlopen=yes],
+	[hiuxmpp], [	: ${LDSHARED='$(LD) -r'}],
+	[atheos*], [	: ${LDSHARED='$(CC) -shared'}
+			rb_cv_dlopen=yes],
+	[	: ${LDSHARED='$(LD)'}])
+  AC_MSG_RESULT($rb_cv_dlopen)
+
+  AS_IF([test "$rb_cv_dlopen" = yes], [
+    AS_CASE(["$target_os"],
+      [darwin*], [
+	for flag in \
+	  "-undefined dynamic_lookup" \
+	  "-multiply_defined suppress" \
+	  ; do
+	  test "x${linker_flag}" = x || flag="${linker_flag}`echo ${flag} | tr ' ' ,`"
+	  RUBY_TRY_LDFLAGS([$flag], [], [flag=])
+	  AS_IF([test "x$flag" != x], [
+	    RUBY_APPEND_OPTIONS(DLDFLAGS, [$flag])
+	  ])
+	done
+      ])
+  ])
+
+  AS_IF([test "$enable_rpath:${RPATHFLAG}" = yes:], [
+      AS_IF([test "x$rpathflag" != x], [
+	  RPATHFLAG=" ${rpathflag}%1\$-s"
+      ])
+  ])
+])
+AS_IF([test "${LDSHAREDXX}" = ""], [
+    AS_CASE(["${LDSHARED}"],
+	[*'$(CC)'*], [
+	    LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\$(CC)/$(CXX)/'`
+	    ],
+	[*'${CC}'*], [
+	    LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\${CC}/${CXX}/'`
+	    ],
+	[*$CC*], [
+	    LDSHAREDXX=`echo "${LDSHARED}" | sed "s|$CC|$CXX|"`
+	    ],
+	[ld" "*], [
+	    ])
+])
+AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}])
+
+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)
+
+AS_IF([test "x$OPT_DIR" != x], [
+    pat=`echo "${LDFLAGS_OPTDIR}" | sed ['s/[][\\.*|]/\\\\&/']`
+    LDFLAGS=`echo "${LDFLAGS}" | sed "s| ${pat}||"`
+    val=`IFS="$PATH_SEPARATOR"
+        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/ *$//'`
+    AS_IF([test x"$val" != x], [
+	test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS "
+	LDFLAGS="$LDFLAGS$val"
+	test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS "
+	DLDFLAGS="$DLDFLAGS$val"
+    ])
+    LDFLAGS_OPTDIR="$val"
+])
+
+AS_CASE(["$target_os"],
+[freebsd*], [
+    AC_CHECK_LIB([procstat], [procstat_open_sysctl])
+    AS_IF([test "x$ac_cv_lib_procstat_procstat_open_sysctl" = xyes], [
+	AC_CHECK_FUNCS(procstat_getvmmap)
+    ])
+    ])
+AS_CASE(["$target_cpu-$target_os"],
+[*-darwin*], [
+    AC_CHECK_HEADERS([libproc.h])
+    AC_CHECK_HEADERS([execinfo.h])
+    AS_IF([test "x$ac_cv_header_execinfo_h" = xyes], [
+	AC_CHECK_LIB([execinfo], [backtrace])
+	AC_CHECK_HEADERS([libunwind.h])
+    ])],
+[*-freebsd*|x86_64-netbsd*], [
+    AC_CHECK_HEADERS([execinfo.h])
+    AS_IF([test "x$ac_cv_header_execinfo_h" = xyes], [
+	AC_CHECK_LIB([execinfo], [backtrace])
+	AC_CHECK_LIB([unwind], [unw_backtrace])
+    ])])
+AC_CHECK_FUNCS(backtrace)
+
+AS_IF([test "x$ac_cv_func_backtrace" = xyes], [
+  AC_CACHE_CHECK(for broken backtrace, rb_cv_broken_backtrace,
+    [AC_TRY_RUN([
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <signal.h>
+#include <execinfo.h>
+
+#define TRACE_SIZE 256
+
+void sigsegv(int signum, siginfo_t *info, void *ctx){
+    void *trace[TRACE_SIZE];
+    int n = backtrace(trace, TRACE_SIZE);
+    if (n > 0) {
+	/*fprintf(stdout, "backtrace:%d\n",n);*/
+    } else {
+	_exit(EXIT_FAILURE);
+    }
+    _exit(EXIT_SUCCESS);
+}
+int
+main(void)
+{
+    volatile int *a = NULL;
+    stack_t ss;
+    struct sigaction sa;
+
+    ss.ss_sp = malloc(SIGSTKSZ);
+    if (ss.ss_sp == NULL) {
+	fprintf(stderr, "cannot allocate memory for sigaltstack\n");
+	return EXIT_FAILURE;
+    }
+    ss.ss_size = SIGSTKSZ;
+    ss.ss_flags = 0;
+    if (sigaltstack(&ss, NULL) == -1) {
+	fprintf(stderr, "sigaltstack failed\n");
+	return EXIT_FAILURE;
+    }
+    memset(&sa, 0, sizeof(struct sigaction));
+    sigemptyset(&sa.sa_mask);
+    sa.sa_sigaction = sigsegv;
+    sa.sa_flags |= SA_SIGINFO;
+    sa.sa_flags |= SA_ONSTACK;
+    sigaction(SIGSEGV, &sa, NULL);
+    a[0] = 1;
+    return EXIT_SUCCESS;
+}
+],
+	rb_cv_broken_backtrace=no,
+	rb_cv_broken_backtrace=yes,
+	rb_cv_broken_backtrace=no)])
+  AS_IF([test "$rb_cv_broken_backtrace" = yes], [
+    AC_DEFINE(BROKEN_BACKTRACE, 1)
+  ])
+])
+
+AC_ARG_WITH(valgrind,
+        AS_HELP_STRING([--without-valgrind],[disable valgrind memcheck support]),
+        [], with_valgrind=yes)
+AS_IF([test x$with_valgrind != xno],
+        [AC_CHECK_HEADERS(valgrind/memcheck.h)])
+
+dln_a_out_works=no
+AS_IF([test "$ac_cv_header_a_out_h" = yes], [
+  AS_IF([test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown], [
+    cat confdefs.h > config.h
+    AC_CACHE_CHECK(whether matz's dln works, rb_cv_dln_a_out,
+    [AC_TRY_COMPILE([
+#define USE_DLN_A_OUT
+#include "dln.c"
+],
+	[],
+	rb_cv_dln_a_out=yes,
+	rb_cv_dln_a_out=no)])
+    AS_IF([test "$rb_cv_dln_a_out" = yes], [
+      dln_a_out_works=yes
+      AC_DEFINE(USE_DLN_A_OUT)
+    ])
+  ])
+])
+
+AS_IF([test "$dln_a_out_works" = yes], [
+  AS_IF([test "$GCC" = yes], [
+    STATIC=-static
+  ], [
+    STATIC=-Bstatic
+  ])
+  DLEXT=so
+  CCDLFLAGS=
+], [
+  AS_CASE(["$target_os"],
+    [hpux*], [
+	DLEXT=sl],
+    [darwin*], [
+	SOEXT=dylib
+	DLEXT=bundle],
+    [cygwin*|mingw*|*djgpp*], [
+	LOAD_RELATIVE=1
+	SOEXT=dll
+	DLEXT=so],
+    [
+	DLEXT=so])
+])
+: ${SOEXT="${DLEXT}"}
+AC_SUBST(SOEXT)
+AS_IF([test "$rb_cv_dlopen:$load_relative" = yes:yes], [
+    AS_IF([test "$ac_cv_func_dladdr" = yes], [
+	LOAD_RELATIVE=1
+    ])
+])
+AS_IF([test x"$LOAD_RELATIVE" = x1], [
+    load_relative=yes
+], [
+    unset load_relative
+])
+
+len=2 # .rb
+n=`expr "$DLEXT"  : '.*'`; test "$n" -gt "$len" && len=$n
+n=`expr "$DLEXT2" : '.*'`; test "$n" -gt "$len" && len=$n
+AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`)
+test ".$DLEXT"  = "." || AC_DEFINE_UNQUOTED(DLEXT,  ".$DLEXT")
+test ".$DLEXT2" = "." || AC_DEFINE_UNQUOTED(DLEXT2, ".$DLEXT2")
+AC_SUBST(DLEXT)
+
+AS_IF([test "$with_dln_a_out" = yes], [
+  STRIP=true
+], [
+  AC_CHECK_TOOL(STRIP, strip, :)dnl
+])
+
+AS_CASE(["$target_os"],
+  [linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu], [
+	STRIP="$STRIP -S -x"],
+  [darwin*], [
+	STRIP="$STRIP -A -n"])
+
+AC_ARG_WITH(ext,
+            AC_HELP_STRING([--with-ext=EXTS],
+                           [pass to --with-ext option of extmk.rb]))
+AC_ARG_WITH(out-ext,
+            AC_HELP_STRING([--with-out-ext=EXTS],
+                           [pass to --without-ext option of extmk.rb]))
+EXTSTATIC=
+AC_SUBST(EXTSTATIC)dnl
+AC_ARG_WITH(static-linked-ext,
+	    AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
+            [AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static],[no],[],[EXTSTATIC="$withval"])])
+AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
+  ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
+  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])
+AS_IF([test -n "$setup"], [
+    AS_IF([! test -f "ext/$setup" -o -f "$srcdir/ext/$setup"], [
+	AC_MSG_ERROR(Setup file $setup not found under ext or $srcdir/ext)
+    ])
+], [test -f "$srcdir/ext/Setup.$target_os"], [
+    setup="Setup.$target_os"
+], [
+    setup=
+    for file in "$srcdir"/ext/Setup.*; do
+	AS_CASE(["$file"], [*~|*.bak|*.orig|*.rej|*.tmp], [continue])
+	setup=`basename "$file"`
+	AS_CASE(["$target_os"], [`expr "$setup" : 'Setup.\(.*\)'`*], [break])
+	platform=`sed '/^option  *platform  */!d;s///;s/|/*|/g;q' "$file"`
+	AS_IF([test "x$platform" != x], [
+	    eval "AS_CASE([\"\$target_os\"], [$platform*], [break])"
+	])
+	setup=
+    done
+    : ${setup:=Setup}
+])
+AC_SUBST(setup)
+
+rubylibprefix='${libdir}/${RUBY_BASE_NAME}'
+AC_ARG_WITH(rubylibprefix,
+	    AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_BASE_NAME]]]),
+	    [AS_IF([test "x$withval" = xno], [
+		AC_MSG_ERROR([No ruby, No libprefix])
+	    ])
+	    rubylibprefix="$withval"])
+AC_SUBST(rubylibprefix)
+
+AS_IF([test x"${exec_prefix}" != xNONE], [
+    RUBY_EXEC_PREFIX="$exec_prefix"
+], [test x"$prefix" != xNONE], [
+    RUBY_EXEC_PREFIX="$prefix"
+], [
+    RUBY_EXEC_PREFIX=$ac_default_prefix
+])
+pat=`echo "${RUBY_EXEC_PREFIX}" | tr -c '\012' .`'\(.*\)'
+for var in bindir libdir rubylibprefix; do
+    eval val='"$'$var'"'
+    AS_CASE(["$val"], ["${RUBY_EXEC_PREFIX}"*], [val='${exec_prefix}'"`expr \"$val\" : \"$pat\"`"])
+    eval $var='"$val"'
+done
+
+BTESTRUBY='$(MINIRUBY)'
+BOOTSTRAPRUBY='$(BASERUBY)'
+AS_IF([test x"$cross_compiling" = xyes], [
+  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I`$CHDIR .; pwd` "-r'$(arch)-fake'
+  XRUBY_LIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["libdir"]']`
+  XRUBY_RUBYLIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubylibdir"]']`
+  XRUBY_RUBYHDRDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubyhdrdir"]']`
+  AC_SUBST(XRUBY_LIBDIR)
+  AC_SUBST(XRUBY_RUBYLIBDIR)
+  AC_SUBST(XRUBY_RUBYHDRDIR)
+  PREP='$(arch)-fake.rb'
+  RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+  RUNRUBY='$(RUNRUBY_COMMAND)'
+  XRUBY='$(MINIRUBY)'
+  TEST_RUNNABLE=no
+  CROSS_COMPILING=yes
+  AC_DEFINE(CROSS_COMPILING, 1)
+], [
+  MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.'
+  MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common'
+  PREP='miniruby$(EXEEXT)'
+  RUNRUBY_COMMAND='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)'
+  RUNRUBY='$(RUNRUBY_COMMAND) --'
+  XRUBY='$(RUNRUBY)'
+  AS_CASE(["$HAVE_BASERUBY:$build_os"], [no:*|*:mingw*], [BOOTSTRAPRUBY='$(MINIRUBY)'])
+  TEST_RUNNABLE=yes
+  CROSS_COMPILING=no
+])
+AC_SUBST(TEST_RUNNABLE)
+AC_SUBST(CROSS_COMPILING)
+AC_SUBST(MINIRUBY)
+AC_SUBST(BTESTRUBY)
+AC_SUBST(PREP)
+AC_SUBST(RUNRUBY_COMMAND)
+AC_SUBST(RUNRUBY)
+AC_SUBST(XRUBY)
+AC_SUBST(BOOTSTRAPRUBY)
+AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
+
+FIRSTMAKEFILE=""
+LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
+LIBRUBY='$(LIBRUBY_A)'
+LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'
+LIBRUBYARG='$(LIBRUBYARG_STATIC)'
+SOLIBS='$(MAINLIBS)'
+
+AS_CASE(["$target_os"],
+  [cygwin*|mingw*|haiku*|darwin*], [
+    : ${DLDLIBS=""}
+    ],
+  [
+    DLDLIBS="$DLDLIBS -lc"
+    ])
+
+AC_ARG_ENABLE(multiarch,
+	      AS_HELP_STRING([--enable-multiarch], [enable multiarch compatible directories]),
+	      [multiarch=], [unset multiarch])
+AS_IF([test ${multiarch+set}], [
+   AC_DEFINE(ENABLE_MULTIARCH)
+   MJIT_HEADER_INSTALL_DIR=include/'${arch}/${RUBY_VERSION_NAME}'
+], [
+   MJIT_HEADER_INSTALL_DIR=include/'${RUBY_VERSION_NAME}/${arch}'
+])
+
+archlibdir='${libdir}/${arch}'
+sitearchlibdir='${libdir}/${sitearch}'
+archincludedir='${includedir}/${arch}'
+sitearchincludedir='${includedir}/${sitearch}'
+
+AC_ARG_WITH(soname,
+	AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]),
+	[RUBY_SO_NAME=$withval],
+	[
+	    AS_CASE(["$target_os"],
+	    [darwin*], [
+	        RUBY_SO_NAME='$(RUBY_BASE_NAME).$(RUBY_API_VERSION)'
+	    ],
+	    [cygwin*], [
+	        RUBY_SO_NAME='$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
+	    ],
+	    [mingw*], [
+		RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
+		AS_IF([test x"${target_cpu}" != xi386], [
+		    RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
+		])
+	    ],
+	    [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
+	])
+
+LIBRUBY_LDSHARED=${DLDSHARED=${LDSHARED}}
+LIBRUBY_DLDFLAGS=$DLDFLAGS
+LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_PROGRAM_VERSION)'
+LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_API_VERSION)'
+LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(SOEXT)'
+ENABLE_SHARED=no
+
+AC_ARG_ENABLE(shared,
+       AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]),
+       [enable_shared=$enableval])
+libprefix=${multiarch+'$(archlibdir)'}${multiarch-'$(libdir)'}
+LIBRUBY_RELATIVE=${load_relative-no}
+AS_CASE("$enable_shared", [yes], [
+  LIBRUBY='$(LIBRUBY_SO)'
+  LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
+  LIBRUBYARG='$(LIBRUBYARG_SHARED)'
+  LIBRUBY_RELATIVE=no
+  test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS"
+  ENABLE_SHARED=yes
+
+  # libdir can be overridden in config.site file (on OpenSUSE at least).
+  libdir_basename=lib
+  AS_IF([test "$bindir" = '${exec_prefix}/bin'], [
+    AS_CASE(["$libdir"], ['${exec_prefix}/'*], [libdir_basename=`basename "$libdir"`])
+  ])
+  AC_DEFINE_UNQUOTED(LIBDIR_BASENAME, ["${libdir_basename}"])
+  libdir_basename="${libdir_basename}"${multiarch+'/${arch}'}
+
+  AS_CASE(["$target_os"],
+    [freebsd*|dragonfly*], [],
+    [
+     AS_IF([test "$GCC" = yes], [
+       RUBY_TRY_LDFLAGS([${linker_flag}--no-undefined], [no_undefined=yes], [no_undefined=no])
+       AS_IF([test "no_undefined" = yes], [
+	  RUBY_APPEND_OPTION(EXTLDFLAGS, [${linker_flag}--no-undefined])
+       ])
+     ])
+    ])
+
+  AS_CASE(["$target_os"],
+    [sunos4*], [
+	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
+	],
+    [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*], [
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"])
+	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
+	AS_IF([test "$load_relative" = yes], [
+	    libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
+	    LIBRUBY_RPATHFLAGS="-Wl,-rpath,${libprefix}"
+	    LIBRUBY_RELATIVE=yes
+	])
+	],
+    [freebsd*|dragonfly*], [
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
+	LIBRUBY_SONAME='$(LIBRUBY_SO)'
+	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
+	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
+	    LIBRUBY_ALIASES=''
+	])
+	],
+    [netbsd*], [
+	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
+	LIBRUBY_SO="${LIBRUBY_SONAME}"'.$(TEENY)'
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"])
+	AS_IF([test "$rb_cv_binary_elf" = yes], [ # ELF platforms
+	   LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
+	], [	# a.out platforms
+	   LIBRUBY_ALIASES=""
+	])
+	],
+    [openbsd*|mirbsd*], [
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
+	],
+    [solaris*], [
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)'
+	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_PROGRAM_VERSION)'
+	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ["${linker_flag}-h${linker_flag:+,}"'$(@F)'])
+	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
+	],
+    [hpux*], [
+	XLDFLAGS="$XLDFLAGS "'-Wl,+s,+b,$(libdir)'
+	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
+	],
+    [aix*], [
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ["${linker_flag}-bnoentry" "$XLDFLAGS" "$LDFLAGS_OPTDIR"])
+	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
+	LIBS="$LIBS -lm -lc"
+	],
+    [darwin*], [
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)'
+	LIBRUBY_SONAME='$(LIBRUBY_SO)'
+	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
+	AS_IF([test "$load_relative" = yes], [
+	    libprefix="@executable_path/../${libdir_basename}"
+	    LIBRUBY_RELATIVE=yes
+	])
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS -install_name ${libprefix}"'/$(LIBRUBY_SONAME)'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(RUBY_API_VERSION)'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(RUBY_PROGRAM_VERSION)'
+	AS_IF([test "$visibility_option" = ld], [
+	    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_*'
+	])
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "' $(XLDFLAGS)'
+	],
+    [interix*], [
+	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
+	],
+    [mingw*|cygwin*|mswin*], [
+	LIBRUBY_RELATIVE=yes
+	])
+], [
+  LIBRUBYARG_SHARED=
+
+  # enable PIE if possible
+  AC_ARG_ENABLE(pie,
+          AS_HELP_STRING([--disable-pie], [disable PIE feature]),
+          [pie=$enableval], [pie=])
+  AS_IF([test "$GCC" = yes -a -z "$EXTSTATIC" -a "x$pie" != xno], [
+    RUBY_TRY_CFLAGS(-fPIE, [pie=yes], [pie=no])
+    AS_IF([test "$pie" = yes], [
+      # Use -fPIE when testing -pie.  RUBY_TRY_LDFLAGS sets
+      # $save_CFLAGS internally, so set other name here.
+      save_CFLAGS_before_pie="$CFLAGS"
+      CFLAGS="$CFLAGS -fPIE"
+
+      # gcc need -pie but clang need -Wl,-pie.
+      for pie in -pie -Wl,-pie; do
+	RUBY_TRY_LDFLAGS([$pie], [], [pie=])
+	AS_IF([test "x$pie" != x], [
+	  RUBY_APPEND_OPTION(XCFLAGS, -fPIE)
+	  RUBY_APPEND_OPTION(XLDFLAGS, $pie)
+	  break
+	])
+      done
+      CFLAGS="$save_CFLAGS_before_pie"
+    ])
+  ])
+])
+AS_IF([test "$enable_rpath" = yes], [
+    test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
+    rpathflag="${RPATHFLAG}"
+    AS_CASE(["${cross_compiling}${load_relative}"], [*yes*], [], [rpathflag="$RPATHFLAG$LIBPATHFLAG"])
+    rpathflag=`IFS="$PATH_SEPARATOR"
+        echo x "$rpathflag" |
+        sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g"
+    `
+    LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
+    LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
+    LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
+])
+AC_SUBST(LIBRUBY_RELATIVE)
+
+LDFLAGS="-L. $LDFLAGS"
+AC_SUBST(ARCHFILE)
+
+AS_IF([test "$EXEEXT" = .exe], [
+    EXECUTABLE_EXTS='".exe",".com",".cmd",".bat"'
+    AC_DEFINE_UNQUOTED(EXECUTABLE_EXTS, $EXECUTABLE_EXTS)
+    EXECUTABLE_EXTS=`echo $EXECUTABLE_EXTS | tr -d '"' | tr , ' '`
+    AC_SUBST(EXECUTABLE_EXTS)
+])
+
+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"' exe/$(PROGRAM)'
+	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])
+
+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"
+    ])
+    DTRACE_EXT=d
+], [dnl
+    enable_dtrace=no
+    DTRACE_EXT=dmyh
+])
+AC_SUBST(DTRACE_EXT)
+AC_SUBST(DTRACE_OBJ)
+AC_SUBST(DTRACE_REBUILD)
+AC_SUBST(DTRACE_OPT)
+AC_SUBST(LIBRUBY_A_OBJS)
+
+AC_ARG_ENABLE(gcov,
+       AS_HELP_STRING([--enable-gcov], [enable coverage measurement by gcov]),
+       [gcov=yes])
+AS_IF([test x"$gcov" = xyes], [
+    CFLAGS="$CFLAGS -coverage"
+    LDFLAGS="$LDFLAGS -coverage"
+])
+
+RUBY_SETJMP_TYPE
+}
+
+: "build section" && {
+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]),
+       [install_doc=$enableval], [install_doc=yes])
+AC_ARG_WITH(rdoc,
+      AS_HELP_STRING([--with-rdoc=ri,html], [comma/space separated list of RDoc formats to install]),
+      [install_rdoc=`echo ,$withval, | sed 'y/,/ /;s/ ri / rdoc /;s/^ *//;s/ *$//'`], [
+AC_ARG_ENABLE(install-rdoc,
+      AS_HELP_STRING([--disable-install-rdoc], [do not install rdoc indexes during install]),
+      [install_rdoc=$enableval], [install_rdoc=yes])
+])
+AC_ARG_ENABLE(install-capi,
+      AS_HELP_STRING([--disable-install-capi], [do not install C API documents during install]),
+      [install_capi=$enableval], [install_capi=no])
+
+AS_IF([test "$install_doc" != no], [
+    AS_CASE(["$install_rdoc"],
+    [yes], [
+	RDOCTARGET="rdoc"
+    ],
+    [all], [
+	RDOCTARGET="rdoc html"
+    ],
+    [no|''], [
+	RDOCTARGET="nodoc"
+    ],
+    [
+	RDOCTARGET="$install_rdoc"
+    ])
+    AS_IF([test "$install_capi" != no -a -n "$DOXYGEN"], [
+	CAPITARGET="capi"
+    ], [
+	CAPITARGET="nodoc"
+    ])
+], [
+    RDOCTARGET="nodoc"
+    CAPITARGET="nodoc"
+])
+
+AC_SUBST(RDOCTARGET)
+AC_SUBST(CAPITARGET)
+
+AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
+AC_SUBST(INSTALLDOC)
+
+AC_ARG_ENABLE(jit-support,
+        AS_HELP_STRING([--disable-jit-support], [disable JIT features]),
+        [MJIT_SUPPORT=$enableval
+         AS_IF([test x"$enable_jit_support" = "xyes"],
+                 [AC_DEFINE(USE_MJIT, 1)],
+                 [AC_DEFINE(USE_MJIT, 0)])],
+        [MJIT_SUPPORT=yes
+         AC_DEFINE(USE_MJIT, 1)])
+
+AC_SUBST(MJIT_SUPPORT)
+
+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)
+
+AS_IF([test "$rb_with_pthread" = "yes"], [
+    THREAD_MODEL=pthread
+])
+AC_CACHE_CHECK([for prefix of external symbols], rb_cv_symbol_prefix, [
+    AC_TRY_COMPILE([extern void conftest_external(void) {}], [], [
+	rb_cv_symbol_prefix=`$NM conftest.$ac_objext |
+			     sed -n ['/.*T[ 	]\([^ 	]*\)conftest_external.*/!d;s//\1/p;q']`
+	],
+	[rb_cv_symbol_prefix=''])
+    test -n "$rb_cv_symbol_prefix" || rb_cv_symbol_prefix=NONE
+])
+SYMBOL_PREFIX="$rb_cv_symbol_prefix"
+test "x$SYMBOL_PREFIX" = xNONE && SYMBOL_PREFIX=''
+DLNOBJ=dln.o
+AC_ARG_ENABLE(dln,
+	      AC_HELP_STRING([--disable-dln], [disable dynamic link feature]),
+	      [test "$enableval" = yes || DLNOBJ=dmydln.o])
+AC_SUBST(DLNOBJ)
+MINIDLNOBJ=dmydln.o
+
+AS_CASE(["$target_os"],
+    [linux*], [
+	],
+    [netbsd*], [
+	RUBY_APPEND_OPTION(CFLAGS, -pipe)
+	],
+    [darwin*], [
+	RUBY_APPEND_OPTION(CFLAGS, -pipe)
+	AC_COMPILE_IFELSE([
+	    AC_LANG_BOOL_COMPILE_TRY([@%:@include <AvailabilityMacros.h>],
+		[MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7])],
+	    [dnl
+		RUBY_APPEND_OPTION(XLDFLAGS, [-framework Security])
+		RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework Security])
+	    ]dnl
+	)
+	RUBY_APPEND_OPTION(XLDFLAGS, [-framework Foundation])
+	RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework Foundation])
+	],
+    [osf*], [
+	AS_IF([test "$GCC" != "yes" ], [
+	  # compile something small: taint.c is fine for this.
+	  # the main point is the '-v' flag of 'cc'.
+	  AS_CASE(["`cc -v -I. -c main.c -o /tmp/main.o 2>&1`"],
+	  [*/gemc_cc*], [   # we have the new DEC GEM CC
+                        CFLAGS="$CFLAGS -oldc"
+                        ],
+          [            # we have the old MIPS CC
+                        ])
+	  # cleanup
+	  rm -f /tmp/main.o
+	  CFLAGS="$CFLAGS -std"
+	])
+	],
+    [cygwin*|mingw*], [
+	LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
+	AS_CASE(["$target_os"],
+	[cygwin*], [
+	    AS_IF([test x"$enable_shared" = xyes], [
+		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'.dll
+		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
+	    ])
+	    ],
+	[mingw*], [
+	    AS_IF([test x"$enable_shared" = xyes], [
+		LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
+		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
+	    ])
+	    EXPORT_PREFIX=' '
+	    DLDFLAGS="${DLDFLAGS}"' $(DEFFILE)'
+	    AC_LIBOBJ([win32/win32])
+	    AC_LIBOBJ([win32/file])
+	    COMMON_LIBS=m
+#	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
+	    COMMON_HEADERS="winsock2.h windows.h"
+	    THREAD_MODEL=win32
+	    PLATFORM_DIR=win32
+	    ])
+	LIBRUBY_ALIASES=''
+	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
+	AS_IF([test x"$enable_shared" = xyes], [
+	    LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
+	], [
+	    LIBRUBY_SO=dummy
+	    LIBRUBY='lib$(RUBY_SO_NAME).a'
+	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
+	])
+	],
+    [hpux*], [
+	AS_CASE(["$YACC"],[*yacc*], [
+	    XCFLAGS="$XCFLAGS -DYYMAXDEPTH=300"
+	    YACC="$YACC -Nl40000 -Nm40000"
+	])
+])
+
+MINIOBJS="$MINIDLNOBJ"
+
+AS_CASE(["$THREAD_MODEL"],
+[pthread], [AC_CHECK_HEADERS(pthread.h)],
+[win32],   [],
+[""],      [AC_MSG_ERROR(thread model is missing)],
+           [AC_MSG_ERROR(unknown thread model $THREAD_MODEL)])
+
+AC_ARG_ENABLE(debug-env,
+       AS_HELP_STRING([--enable-debug-env], [enable RUBY_DEBUG environment variable]),
+       [AC_SUBST(ENABLE_DEBUG_ENV, yes)])
+
+AS_CASE(["$FIRSTMAKEFILE"], [*GNUmakefile:*], [gnumake=yes], [
+    AC_MSG_CHECKING([if ${MAKE-make} is GNU make])
+    mkdir conftest.dir
+    echo "all:; @echo yes" > conftest.dir/GNUmakefile
+    echo "all:; @echo no" > conftest.dir/Makefile
+    gnumake=`(cd conftest.dir; ${MAKE-make})`
+    rm -fr conftest.dir
+    AS_CASE(["$gnumake"],
+    [*yes*], [
+	FIRSTMAKEFILE=GNUmakefile:template/GNUmakefile.in
+	gnumake=yes],
+    [
+	gnumake=no])
+    AC_MSG_RESULT($gnumake)
+])
+AS_IF([test "$gnumake" = yes], [ NULLCMD=: ], [
+    AC_MSG_CHECKING([for safe null command for ${MAKE-make}])
+    mkdir conftest.dir
+    NULLCMD=
+    for cmd in : true; do
+	echo 'A=1' > conftest.dir/Makefile
+	echo 'B=$(A:1=@'$cmd')' >> conftest.dir/Makefile
+	echo 'all:; $B 1 2 3 4 5 6 7 8 9' >> conftest.dir/Makefile
+	AS_IF([(cd conftest.dir; ${MAKE-make} >/dev/null 2>/dev/null)], [
+	    NULLCMD=$cmd
+	    break
+	])
+    done
+    rm -fr conftest.dir
+    AS_IF([test -z "$NULLCMD"], [
+	AC_MSG_ERROR(no candidate for safe null command)
+    ])
+    AC_MSG_RESULT($NULLCMD)
+])
+AC_SUBST(NULLCMD)
+
+AS_IF([test "${universal_binary-no}" = yes ], [
+    AC_CACHE_CHECK([for architecture macros], rb_cv_architecture_macros, [
+    mv confdefs.h confdefs1.h
+    : > confdefs.h
+    AC_TRY_COMPILE([@%:@if defined __`echo ${universal_archnames} |
+    sed 's/=[^ ]*//g;s/ /__ || defined __/g'`__
+@%:@else
+@%:@error
+>>>>>><<<<<<
+@%:@endif], [],
+[
+    rb_cv_architecture_macros=yes
+    mv -f confdefs1.h confdefs.h
+], [
+    rb_cv_architecture_macros=no
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
+    for archs in ${universal_archnames}; do
+	cpu=${archs@%:@*=}
+	archs=${archs%=*}
+	CFLAGS="$new_cflags -arch $archs"
+	archs="__${archs}__"
+	AC_MSG_CHECKING([for macro ${archs} on ${cpu}])
+	AC_TRY_COMPILE([@%:@ifndef ${archs}
+@%:@error
+@%:@endif], [], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+    done
+    mv -f confdefs1.h confdefs.h
+    AC_MSG_ERROR([failed])
+    ])])
+    AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available,
+	AC_TRY_COMPILE([@%:@include <stdio.h>
+		const char arch[[]] = __ARCHITECTURE__;], [puts(arch);],
+		[rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
+])
+
+: ${MJIT_LDSHARED=`echo "$LDSHARED" | sed ['s|\$(LD)|'"${LD}"'|g;s|\$(CC)|$(MJIT_CC)|g']`}
+
+MAINLIBS="$LIBS"
+LIBS=$ORIG_LIBS
+AS_IF([test -n "${LIBS}"], [
+    libspat=`echo "${LIBS}" | sed 's/[[][|.*$^]]/\\&/g;s/^  */ /;s/^  *$/ /'`
+    MAINFLAGS=`echo " $MAINLIBS " | sed "s|$libspat"'||;s/^ *//;s/ *$//'`
+])
+LIBRUBYARG_STATIC="${LIBRUBYARG_STATIC} \$(MAINLIBS)"
+CPPFLAGS="$CPPFLAGS "'$(DEFS)'
+test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
+AS_IF([test -n "${cflags+set}"], [
+    cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`
+    CFLAGS=`echo " $CFLAGS " | sed "s|$cflagspat"'|${cflags}|;s/^ *//;s/ *$//'`
+])
+AS_IF([test -n "${cxxflags+set}"], [
+    cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`
+    CXXFLAGS=`echo " $CXXFLAGS " | sed "s|$cxxflagspat"'|${cxxflags}|;s/^ *//;s/ *$//'`
+])
+AS_IF([test "${ARCH_FLAG}"], [
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    CFLAGS=`echo "$CFLAGS" | sed "s| *$archflagpat"'||'`
+    CXXFLAGS=`echo "$CXXFLAGS" | sed "s| *$archflagpat"'||'`
+    LDFLAGS=`echo "$LDFLAGS" | sed "s| *$archflagpat"'||'`
+])
+rb_cv_warnflags=`echo "$rb_cv_warnflags" | sed 's/^ *//;s/ *$//'`
+warnflags="$rb_cv_warnflags"
+AC_SUBST(cppflags)dnl
+AC_SUBST(cflags, ["${orig_cflags:+$orig_cflags }"'${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(cxxflags)dnl
+AC_SUBST(optflags)dnl
+AC_SUBST(debugflags)dnl
+AC_SUBST(warnflags)dnl
+AC_SUBST(strict_warnflags)dnl
+AC_SUBST(XCFLAGS)dnl
+AC_SUBST(XLDFLAGS)dnl
+AC_SUBST(EXTLDFLAGS)dnl
+AC_SUBST(EXTDLDFLAGS)dnl
+AC_SUBST(LIBRUBY_LDSHARED)
+AC_SUBST(LIBRUBY_DLDFLAGS)
+AC_SUBST(RUBY_INSTALL_NAME)
+AC_SUBST(rubyw_install_name)
+AC_SUBST(RUBYW_INSTALL_NAME)
+AC_SUBST(RUBY_SO_NAME)
+AC_SUBST(LIBRUBY_A)
+AC_SUBST(LIBRUBY_SO)
+AC_SUBST(LIBRUBY_SONAME)
+AC_SUBST(LIBRUBY_ALIASES)
+AC_SUBST(LIBRUBY)
+AC_SUBST(LIBRUBYARG)
+AC_SUBST(LIBRUBYARG_STATIC)
+AC_SUBST(LIBRUBYARG_SHARED)
+AC_SUBST(SOLIBS)
+AC_SUBST(DLDLIBS)
+AC_SUBST(DLDSHARED)
+AC_SUBST(ENABLE_SHARED)
+AC_SUBST(MAINLIBS)
+AC_SUBST(COMMON_LIBS)
+AC_SUBST(COMMON_MACROS)
+AC_SUBST(COMMON_HEADERS)
+AC_SUBST(EXPORT_PREFIX)
+AC_SUBST(SYMBOL_PREFIX)
+AC_SUBST(MINIOBJS)
+AC_SUBST(THREAD_MODEL)
+AC_SUBST(PLATFORM_DIR)
+
+firstmf=`echo $FIRSTMAKEFILE | sed 's/:.*//'`
+firsttmpl=`echo $FIRSTMAKEFILE | sed 's/.*://'`
+MAKEFILES="Makefile $firstmf"
+MAKEFILES="`echo $MAKEFILES`"
+AC_SUBST(MAKEFILES)
+
+ri_prefix=
+test "$program_prefix" != NONE &&
+  ri_prefix=$program_prefix
+
+ri_suffix=
+test "$program_suffix" != NONE &&
+  ri_suffix=$program_suffix
+
+RUBY_INSTALL_NAME="${ri_prefix}"'$(RUBY_BASE_NAME)'"${ri_suffix}"
+AS_CASE(["$target_os"],
+  [cygwin*|mingw*], [
+    RUBYW_INSTALL_NAME="${ri_prefix}"'$(RUBYW_BASE_NAME)'"${ri_suffix}"
+    rubyw_install_name='$(RUBYW_INSTALL_NAME)'
+    ])
+
+rubylibdir='${rubylibprefix}/${ruby_version}'
+rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
+
+rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
+AC_ARG_WITH(rubyarchprefix,
+	    AS_HELP_STRING([--with-rubyarchprefix=DIR],
+			   [prefix for architecture dependent ruby libraries [[RUBYLIBPREFIX/ARCH]]]),
+	    [rubyarchprefix="$withval"])
+AC_SUBST(rubyarchprefix)
+
+rubysitearchprefix=${multiarch+'${sitearchlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${sitearch}'}
+AC_ARG_WITH(rubysitearchprefix,
+	    AS_HELP_STRING([--with-rubysitearchprefix=DIR],
+			   [prefix for architecture dependent site libraries [[RUBYLIBPREFIX/SITEARCH]]]),
+	    [rubysitearchprefix="$withval"])
+AC_SUBST(rubysitearchprefix)
+
+RI_BASE_NAME=`echo ${RUBY_BASE_NAME} | sed 's/ruby/ri/'`
+ridir='${datarootdir}/${RI_BASE_NAME}'
+AC_ARG_WITH(ridir,
+	    AS_HELP_STRING([--with-ridir=DIR], [ri documentation [[DATAROOTDIR/ri]]]),
+	    [ridir=$withval])
+AC_SUBST(ridir)
+AC_SUBST(RI_BASE_NAME)
+
+AC_ARG_WITH(ruby-version,
+	    AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|minor|STR)]),
+            [ruby_version=$withval],
+            [ruby_version=full])
+unset RUBY_LIB_VERSION
+unset RUBY_LIB_VERSION_STYLE
+AS_CASE(["$ruby_version"],
+  [full],  [RUBY_LIB_VERSION_STYLE='3	/* full */'],
+  [minor], [RUBY_LIB_VERSION_STYLE='2	/* minor */'])
+AS_IF([test ${RUBY_LIB_VERSION_STYLE+set}], [
+    {
+    echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
+    echo '#define STRINGIZE(x) x'
+    test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
+    echo '#include "version.h"'
+    echo 'ruby_version=RUBY_LIB_VERSION'
+    } > conftest.c
+    ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
+    eval $ruby_version
+], [test -z "${ruby_version}"], [
+    AC_MSG_ERROR([No ruby version, No place for bundled libraries])
+], [
+    RUBY_LIB_VERSION="${ruby_version}"
+])
+AC_SUBST(RUBY_LIB_VERSION_STYLE)
+AC_SUBST(RUBY_LIB_VERSION)
+
+AC_ARG_WITH(sitedir,
+	    AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
+            [sitedir=$withval],
+            [sitedir='${rubylibprefix}/site_ruby'])
+sitelibdir='${sitedir}/${ruby_version}'
+
+AC_ARG_WITH(sitearchdir,
+	    AS_HELP_STRING([--with-sitearchdir=DIR],
+			   [architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),
+            [sitearchdir=$withval],
+            [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])
+
+AC_ARG_WITH(vendordir,
+	    AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
+            [vendordir=$withval],
+            [vendordir='${rubylibprefix}/vendor_ruby'])
+vendorlibdir='${vendordir}/${ruby_version}'
+
+AC_ARG_WITH(vendorarchdir,
+	    AS_HELP_STRING([--with-vendorarchdir=DIR],
+			   [architecture dependent vendor libraries in DIR [[VENDORDIR/SITEARCH]], "no" to disable vendor directory]),
+            [vendorarchdir=$withval],
+            [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
+
+AS_IF([test "${LOAD_RELATIVE+set}"], [
+    AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
+    RUBY_EXEC_PREFIX=''
+])
+
+AC_SUBST(RUBY_EXEC_PREFIX)
+
+AC_SUBST(libdirname, ${multiarch+arch}libdir)
+AC_SUBST(archlibdir)dnl
+AC_SUBST(sitearchlibdir)dnl
+AC_SUBST(archincludedir)dnl
+AC_SUBST(sitearchincludedir)dnl
+AC_SUBST(arch)dnl
+AC_SUBST(sitearch)dnl
+AC_SUBST(ruby_version)dnl
+AC_SUBST(rubylibdir)dnl
+AC_SUBST(rubyarchdir)dnl
+AC_SUBST(sitedir)dnl
+AC_SUBST(sitelibdir)dnl
+AC_SUBST(sitearchdir)dnl
+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
+
+AS_IF([test "${universal_binary-no}" = yes ], [
+    arch="universal-${target_os}"
+    AS_IF([test "${rb_cv_architecture_available}" = yes], [
+	AC_DEFINE_UNQUOTED(RUBY_PLATFORM_CPU, __ARCHITECTURE__)
+    ], [
+	for archs in ${universal_archnames}; do
+	    cpu=`echo $archs | sed 's/.*=//'`
+	    archs=`echo $archs | sed 's/=.*//'`
+	    RUBY_DEFINE_IF([defined __${archs}__ &&! defined RUBY_PLATFORM_CPU], RUBY_PLATFORM_CPU, ["${cpu}"])
+	done
+    ])
+    ints='long int short'
+    test "$ac_cv_type_long_long" = yes && ints="'long long' $ints"
+    AC_SUBST(UNIVERSAL_ARCHNAMES, "${universal_archnames}")
+    AC_SUBST(UNIVERSAL_INTS, "${ints}")
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}")
+    AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-" RUBY_PLATFORM_OS)
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS)
+], [
+    arch="${target_cpu}-${target_os}"
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
+])
+
+unset sitearch
+AS_CASE(["$target_os"],[mingw*],[sitearch="$target_cpu-$rb_cv_msvcrt"])
+: ${sitearch='${arch}'}
+
+AC_ARG_WITH(search-path,
+		AS_HELP_STRING([--with-search-path=DIR], [specify the additional search path]),
+		[search_path=$withval])
+AS_IF([test "$search_path" != ""], [
+    AC_SUBST(RUBY_SEARCH_PATH, $search_path)
+])
+
+AC_ARG_WITH(rubyhdrdir,
+	    AS_HELP_STRING([--with-rubyhdrdir=DIR], [core headers in DIR [[INCLUDEDIR/RUBY_BASE_NAME-RUBY_VERSION]]]),
+	    [rubyhdrdir=$withval],
+	    [rubyhdrdir='${includedir}/${RUBY_VERSION_NAME}'])
+
+AC_ARG_WITH(rubyarchhdrdir,
+	    AS_HELP_STRING([--with-rubyarchhdrdir=DIR],
+			   [architecture dependent core headers in DIR [[$(rubyhdrdir)/$(arch)]]]),
+	    [rubyarchhdrdir=$withval],
+	    [rubyarchhdrdir=${multiarch+'${archincludedir}/${RUBY_VERSION_NAME}'}${multiarch-'${rubyhdrdir}/${arch}'}])
+
+AC_ARG_WITH(sitehdrdir,
+	    AS_HELP_STRING([--with-sitehdrdir=DIR], [core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
+	    [sitehdrdir=$withval],
+	    [sitehdrdir='${rubyhdrdir}/site_ruby'])
+
+AC_ARG_WITH(sitearchhdrdir,
+	    AS_HELP_STRING([--with-sitearchhdrdir=DIR],
+			   [architecture dependent core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
+	    [sitearchhdrdir=$withval],
+	    [sitearchhdrdir=${multiarch+'${sitearchincludedir}/${RUBY_VERSION_NAME}/site_ruby'}${multiarch-'${sitehdrdir}/${sitearch}'}])
+
+AC_ARG_WITH(vendorhdrdir,
+	    AS_HELP_STRING([--with-vendorhdrdir=DIR], [core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
+	    [vendorhdrdir=$withval],
+	    [vendorhdrdir='${rubyhdrdir}/vendor_ruby'])
+
+AC_ARG_WITH(vendorarchhdrdir,
+	    AS_HELP_STRING([--with-vendorarchhdrdir=DIR],
+			   [architecture dependent core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
+	    [vendorarchhdrdir=$withval],
+	    [vendorarchhdrdir=${multiarch+'${sitearchincludedir}/${RUBY_VERSION_NAME}/vendor_ruby'}${multiarch-'${vendorhdrdir}/${sitearch}'}])
+
+AC_SUBST(rubyhdrdir)dnl
+AC_SUBST(sitehdrdir)dnl
+AC_SUBST(vendorhdrdir)dnl
+AC_SUBST(rubyarchhdrdir)dnl
+AC_SUBST(sitearchhdrdir)dnl
+AC_SUBST(vendorarchhdrdir)dnl
+
+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],
+			[AC_MSG_ERROR(invalid man type: $withval)])
+		])
+AS_IF([test -z "$MANTYPE"], [
+	dnl Looks for nroff with -mdoc support.
+	AC_CACHE_VAL([ac_cv_path_NROFF], [
+		AC_PATH_PROGS_FEATURE_CHECK([NROFF],
+			[nroff awf mandoc],
+			[$ac_path_NROFF -mdoc ${srcdir}/man/ruby.1 \
+				>/dev/null 2>&1 &&
+				ac_cv_path_NROFF=$ac_path_NROFF \
+				ac_path_NROFF_found=:],
+			[], ["/usr/bin:/usr/ucb"]
+		)
+	])
+	AS_IF([test -n "$ac_cv_path_NROFF"], [
+		MANTYPE=doc
+	], [
+		MANTYPE=man
+	])
+])
+AC_SUBST(MANTYPE)
+
+AC_ARG_ENABLE(rubygems,
+	AS_HELP_STRING([--disable-rubygems], [disable rubygems by default]),
+	[enable_rubygems="$enableval"], [enable_rubygems=yes])
+AS_IF([test x"$enable_rubygems" = xno], [
+    USE_RUBYGEMS=no
+], [
+    USE_RUBYGEMS=yes
+])
+AC_SUBST(USE_RUBYGEMS)
+
+arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
+AS_MKDIR_P("${arch_hdrdir}")
+config_h="${arch_hdrdir}/config.h"
+guard=INCLUDE_RUBY_CONFIG_H
+{
+  echo "#ifndef $guard"
+  echo "#define $guard 1"
+  grep -v "^#define PACKAGE_" confdefs.h
+  echo "#endif /* $guard */"
+} | tr -d '\015' |
+(
+  AS_IF([test "x$CONFIGURE_TTY" = xyes], [color=--color], [color=])
+  exec ${srcdir}/tool/ifchange $color "${config_h}" -
+) >&AS_MESSAGE_FD || AC_MSG_ERROR([failed to create ${config_h}])
+tr -d '\015' < largefile.h > confdefs.h
+rm largefile.h
+
+BUILTIN_ENCS=["`sed -n -e '/^BUILTIN_ENCS[ 	]*=/{' \
+	-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
+	-e '}' "${srcdir}/enc/Makefile.in"`"]
+BUILTIN_ENCOBJS=
+for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS "`echo $e | sed 's/\.c$/.$(OBJEXT)/'`; done
+AC_SUBST(BUILTIN_ENCOBJS)
+
+BUILTIN_TRANSES=["`sed -n -e '/^BUILTIN_TRANSES[ 	]*=/{' \
+	-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
+	-e '}' "${srcdir}/enc/Makefile.in"`"]
+BUILTIN_TRANSSRCS=
+BUILTIN_TRANSOBJS=
+for e in $BUILTIN_TRANSES; do
+  BUILTIN_TRANSSRCS="$BUILTIN_TRANSSRCS "`echo $e | sed 's/\.trans$/.c/'`
+  BUILTIN_TRANSOBJS="$BUILTIN_TRANSOBJS "`echo $e | sed 's/\.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])
+
+AS_IF([test x"$CC_WRAPPER" != x], [
+    CC='$(CC_WRAPPER) '"${CC@%:@$CC_WRAPPER }"
+    CPP='$(CC_WRAPPER) '"${CPP@%:@$CC_WRAPPER }"
+    CC_WRAPPER='$(rubyarchdir)/darwin-cc'
+    XCC_WRAPPER='$(top_srcdir)/tool/darwin-cc'
+])
+AC_SUBST(CC_WRAPPER, '')
+AC_SUBST(XCC_WRAPPER)
+
+AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/  *$//'`])
+
+AS_IF([test x"$firstmf" != x], [
+    AC_CONFIG_FILES($firstmf:$firsttmpl, [], [firstmf="$firstmf" firsttmpl="$firsttmpl"])
+])
+AC_CONFIG_FILES(Makefile:template/Makefile.in, [
+    tmpmk=confmk$$.tmp
+    {
+	AS_IF([test ${VCS+set}], [
+	    :
+	], [git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`], [
+	    VCS='$(GIT)'
+	], [
+	    VCS='echo cannot'
+	])
+	AS_CASE("$VCS",
+		['$(GIT)'|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 '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
+	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
+	AS_IF([test "$gnumake" != yes], [
+	    echo ['$(MKFILES): $(srcdir)/common.mk']
+	    sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
+	], [
+	    echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
+	])
+    } > $tmpmk && AS_IF([! grep '^ruby:' $tmpmk > /dev/null], [
+	AS_IF([test "${gnumake}" = yes], [
+	    tmpgmk=confgmk$$.tmp
+	    {
+		echo "include $tmpmk"
+		echo "-include uncommon.mk"
+	    } > $tmpgmk
+	], [
+	    tmpgmk=$tmpmk
+	]) &&
+	test -z "`${MAKE-make} -f $tmpgmk info-program | grep '^PROGRAM=ruby$'`" &&
+	echo 'ruby: $(PROGRAM);' >> $tmpmk
+	test "$tmpmk" = "$tmpgmk" || rm -f "$tmpgmk"
+    ]) && mv -f $tmpmk Makefile],
+[EXEEXT='$EXEEXT' gnumake='$gnumake' GIT='$GIT'])
+
+AC_ARG_WITH([ruby-pc],
+	    AC_HELP_STRING([--with-ruby-pc=FILENAME], [pc file basename]),
+	    [ruby_pc="$withval"],
+	    [ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"])
+AC_SUBST(ruby_pc)
+AC_SUBST(exec, [exec])
+
+AC_ARG_WITH(destdir,
+	    AS_HELP_STRING([--with-destdir=DESTDIR], [specify default directory to install]),
+	    [DESTDIR="$withval"])
+AC_SUBST(DESTDIR)
+
+AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in,
+    [
+    AS_IF([sed ['s/\$(\([A-Za-z_][A-Za-z0-9_]*\))/${\1}/g;s/@[A-Za-z_][A-Za-z0-9_]*@//'] $ruby_pc > ruby.tmp.pc &&
+	{
+	    test -z "$PKG_CONFIG" ||
+	    PKG_CONFIG_PATH=. $PKG_CONFIG --print-errors ruby.tmp
+	}],
+    [
+	mv -f ruby.tmp.pc $ruby_pc
+    ], [
+	exit 1
+    ])
+    ],
+    [ruby_pc='$ruby_pc' PKG_CONFIG='$PKG_CONFIG'])
+
+AC_OUTPUT
+}
+}
+
+AS_IF([test "$silent" = yes], [], [
+AS_IF([${FOLD+:} false], [], [
+AS_IF([test "`echo abcdefg hijklmno | fold -s -w10 | sed 1d`" = hijklmno], [FOLD="fold"], [FOLD=])
+])
+fold_width=`expr $COLUMNS - 30 2>/dev/null` || fold_width=50
+AS_REQUIRE_SHELL_FN([config_summary],
+    [AS_FUNCTION_DESCRIBE([config_summary], [NAME, VAL], [configuration summary])],
+    [AS_IF([test -z "$2"], [], [
+	AS_ECHO_N(["   * $1:                     "]) | dd bs=1 count=26 2>/dev/null
+	AS_IF([test "$FOLD"], [
+	    echo "$2" | fold -s -w$fold_width |
+	    sed '1!s/^/                          /;$!s/$/\\/'
+	], [echo "$2"])
+    ])]
+)
+
+AS_IF([test $install_doc = yes],
+    [DOCTARGETS=`echo " $RDOCTARGET $CAPITARGET " | sed 's/ nodoc //g;s/^ *//;s/ *$//'`],
+    [DOCTARGETS=no])
+echo "---"
+echo "Configuration summary for $RUBY_BASE_NAME version $MAJOR.$MINOR.$TEENY"
+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 "with coroutine"      "$rb_cv_coroutine"
+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 "DLDFLAGS"            "$DLDFLAGS"
+config_summary "optflags"            "$optflags"
+config_summary "debugflags"          "$debugflags"
+config_summary "warnflags"           "$warnflags"
+config_summary "strip command"       "$STRIP"
+config_summary "install doc"         "$DOCTARGETS"
+config_summary "JIT support"         "$MJIT_SUPPORT"
+config_summary "man page type"       "$MANTYPE"
+config_summary "search path"         "$search_path"
+config_summary "static-linked-ext"   ${EXTSTATIC:+"yes"}
+config_summary "BASERUBY -v"         "$BASERUBY_VERSION"
+echo ""
+echo "---"
+])
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 73c87b708d..0000000000
--- a/configure.in
+++ /dev/null
@@ -1,3047 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl {
-AC_INIT()
-AC_CONFIG_AUX_DIR(tool)
-
-AC_PREREQ(2.60)
-
-AC_DEFUN([RUBY_PREREQ_AC],
-	[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [$1]), [-1],
-		AC_MSG_ERROR([Autoconf version ]$1[ or higher is required]$2))])
-
-dnl environment section {
-
-AC_ARG_WITH(baseruby,
-	AS_HELP_STRING([--with-baseruby=RUBY], [use RUBY as baseruby; RUBY is the pathname of ruby]),
-	[
-		AS_CASE(["$withval"],[*ruby*],[BASERUBY=$withval],[AC_MSG_ERROR(need ruby)])
-	],
-	[
-		BASERUBY="ruby"
-	])
-test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42 ||
-    BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
-AC_SUBST(BASERUBY)
-
-AC_DEFUN([RUBY_MINGW32],
-[AS_CASE(["$host_os"],
-[cygwin*], [
-AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
-[AC_TRY_CPP([
-#ifndef __MINGW32__
-# error
-#endif
-], rb_cv_mingw32=yes,rb_cv_mingw32=no)
-rm -f conftest*])
-test "$rb_cv_mingw32" = yes && target_os="mingw32"
-])
-AS_CASE(["$target_os"], [mingw*msvc], [
-target_os="`echo ${target_os} | sed 's/msvc$//'`"
-])
-AS_CASE(["$target_cpu-$target_os"], [x86_64-mingw*], [
-target_cpu=x64
-])
-])
-
-AC_DEFUN([RUBY_CPPOUTFILE],
-[AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
-[cppflags=$CPPFLAGS
-CPPFLAGS='-o conftest.i'
-AC_TRY_CPP([], rb_cv_cppoutfile=yes, rb_cv_cppoutfile=no)
-CPPFLAGS=$cppflags
-rm -f conftest*])
-if test "$rb_cv_cppoutfile" = yes; then
-  CPPOUTFILE='-o conftest.i'
-elif test "$rb_cv_cppoutfile" = no; then
-  CPPOUTFILE='> conftest.i'
-elif test -n "$rb_cv_cppoutfile"; then
-  CPPOUTFILE="$rb_cv_cppoutfile"
-fi
-AC_SUBST(CPPOUTFILE)])
-
-AC_DEFUN([RUBY_PROG_GNU_LD],
-[AC_CACHE_CHECK(whether the linker is GNU ld, rb_cv_prog_gnu_ld,
-[if `$CC $CFLAGS $CPPFLAGS $LDFLAGS --print-prog-name=ld 2>&1` -v 2>&1 | grep "GNU ld" > /dev/null; then
-  rb_cv_prog_gnu_ld=yes
-else
-  rb_cv_prog_gnu_ld=no
-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]*\)/\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
-AC_SUBST(MAJOR)
-AC_SUBST(MINOR)
-AC_SUBST(TEENY)
-RUBY_PROGRAM_VERSION=`sed -n 's/^#define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/version.h`
-AC_SUBST(RUBY_PROGRAM_VERSION)
-RUBY_RELEASE_DATE=`sed -n 's/^#define RUBY_RELEASE_DATE "\(.*\)"/\1/p' $srcdir/version.h`
-AC_SUBST(RUBY_RELEASE_DATE)
-if test "$MAJOR" = "1"; then
-  AC_DEFINE(CANONICALIZATION_FOR_MATHN)
-fi
-
-dnl checks for alternative programs
-AC_CANONICAL_BUILD
-AC_ARG_WITH(gcc,
-	AS_HELP_STRING([--without-gcc], [never use gcc]),
-	[
-	AS_CASE([$withval],
-	    [no],  [: ${CC=cc}],
-	    [yes], [: ${CC=gcc}],
-	           [CC=$withval])])
-dnl If the user switches compilers, we can't believe the cache
-if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
-then
-  AC_MSG_ERROR(cached CC is different -- throw away $cache_file
-(it is also a good idea to do 'make clean' before compiling))
-fi
-AS_CASE(["$build_os"],
-  [darwin11.*], [
-    : ${CC:=gcc-4.2}
-    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-4.2|x/usr/bin/cc-4.2],   [: ${CXX=c++-4.2}],
-      [xcc|x/usr/bin/cc],           [: ${CXX=c++}],
-      [xclang|x/usr/bin/clang],     [: ${CXX=clang++}])
-  ])
-test -z "$CC" || ac_cv_prog_CC="$CC"
-
-if test "$program_prefix" = NONE; then
-  program_prefix=
-fi
-RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
-RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
-AC_SUBST(RUBY_BASE_NAME)
-AC_SUBST(RUBYW_BASE_NAME)
-
-AC_CANONICAL_TARGET
-target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
-ac_install_sh='' # unusable for extension libraries.
-
-AC_DEFUN([RUBY_APPEND_OPTION],
-	[# RUBY_APPEND_OPTION($1, $2)
-	AS_CASE([" [$]{$1-} "],
-	[*' $2 '*], [], ['  '], [ $1="$2"], [ $1="[$]$1 $2"])])
-AC_DEFUN([RUBY_APPEND_OPTIONS],
-	[{ for rb_opt in $2; do # RUBY_APPEND_OPTIONS($1, $2)
-	AS_CASE([" [$]{$1-} "],
-	[*" [$]{rb_opt} "*], [], ['  '], [ $1="[$]{rb_opt}"], [ $1="[$]$1 [$]{rb_opt}"])
-	done; }])
-AC_DEFUN([RUBY_PREPEND_OPTION],
-	[# RUBY_PREPEND_OPTION($1, $2)
-	AS_CASE([" [$]{$1-} "],
-	[*' $2 '*], [], ['  '], [ $1="$2"], [ $1="$2 [$]$1"])])
-AC_DEFUN([RUBY_PREPEND_OPTIONS],
-	[{ unset rb_opts; for rb_opt in $2; do # RUBY_PREPEND_OPTIONS($1, $2)
-	AS_CASE([" [$]{rb_opts} [$]{$1-} "],
-	[*" [$]{rb_opt} "*], [], ['  '], [ $1="[$]{rb_opt}"], [ rb_opts="[$]{rb_opts}[$]{rb_opt} "])
-	done
-	$1="[$]{rb_opts}[$]$1"; }])
-
-AC_ARG_WITH(arch,
- 	AS_HELP_STRING([--with-arch=ARCHS],
-		       [build an Apple/NeXT Multi Architecture Binary (MAB);
-                          ARCHS is a comma-delimited list of architectures for
-                          which to build; if this option is disabled or omitted
-			  entirely, then the package will be built only for the
-			  target platform]),
-       [target_archs="$withval"], [unset target_archs])
-
-AC_DEFUN([RUBY_DEFAULT_ARCH], [
-AC_MSG_CHECKING([arch option])
-AS_CASE([$1],
-	[*64],        [ARCH_FLAG=-m64],
-	[[i[3-6]86]], [ARCH_FLAG=-m32],
-	[AC_MSG_ERROR(unknown target architecture: $target_archs)]
-	)
-AC_MSG_RESULT([$ARCH_FLAG])
-])
-
-AC_DEFUN([RUBY_UNIVERSAL_ARCH], [
-# RUBY_UNIVERSAL_ARCH begin
-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'`
-unset universal_binary universal_archnames
-if test ${target_archs+set}; then
-    AC_MSG_CHECKING([target architectures])
-    target_archs=`echo $target_archs | tr , ' '`
-    # /usr/lib/arch_tool -archify_list $TARGET_ARCHS
-    for archs in $target_archs
-    do
-	AS_CASE([",$universal_binary,"],[*",$archs,"*], [],[
-	    cpu=`$SHELL "$ac_aux_dir/config.sub" "${archs}-${target_os}" 2>&1` || {
-	        AC_MSG_RESULT([failed])
-		AC_MSG_ERROR([$cpu])
-	    }
-	    cpu=`echo $cpu | sed 's/-.*-.*//'`
-	    universal_binary="${universal_binary+$universal_binary,}$cpu"
-	    universal_archnames="${universal_archnames} ${archs}=${cpu}"
-	    ARCH_FLAG="${ARCH_FLAG+$ARCH_FLAG }-arch $archs"
-	    ])
-    done
-    target_archs="$universal_binary"
-    unset universal_binary
-    AS_CASE(["$target_archs"],
-      [*,*], [universal_binary=yes],
-             [unset universal_archnames])
-    AC_MSG_RESULT([$target_archs])
-
-    target=`echo $target | sed "s/^$target_cpu-/-/"`
-    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
-    if test "${universal_binary-no}" = yes; then
-	RUBY_PREREQ_AC(2.63, [ to compile universal binary])
-	AC_SUBST(try_header,try_compile)
-	target_cpu=universal
-	real_cross_compiling=$cross_compiling
-    else
-	if test x"$target_cpu" != x"${target_archs}"; then
-	    echo 'int main(){return 0;}' > conftest.c
-	    if $CC $CFLAGS $ARCH_FLAG -o conftest conftest.c > /dev/null 2>&1; then
-		rm -fr conftest.*
-	    else
-		RUBY_DEFAULT_ARCH("$target_archs")
-	    fi
-	fi
-	target_cpu=${target_archs}
-    fi
-    AS_CASE(["$target"], [-*], [ target="$target_cpu${target}"])
-    AS_CASE(["$target_alias"], [-*], [ target_alias="$target_cpu${target_alias}"])
-else
-    if test x"$target_alias" = x; then
-	AS_CASE(["$target_os"],
-	  [darwin*], [
-	    AC_MSG_CHECKING([for real target cpu])
-	    target=`echo $target | sed "s/^$target_cpu-/-/"`
-	    target_cpu=`$CC -E - 2>/dev/null <<EOF |
-#ifdef __x86_64__
-"processor-name=x86_64"
-#endif
-#ifdef __i386__
-"processor-name=i386"
-#endif
-#ifdef __ppc__
-"processor-name=powerpc"
-#endif
-#ifdef __ppc64__
-"processor-name=powerpc64"
-#endif
-EOF
-	    sed -n 's/^"processor-name=\(.*\)"/\1/p'`
-	    target="$target_cpu${target}"
-	    AC_MSG_RESULT([$target_cpu])
-	    ])
-    fi
-    target_archs="$target_cpu"
-fi
-if test "${target_archs}" != "${rb_cv_target_archs-${target_archs}}"; then
-    AC_MSG_ERROR([target arch(s) has changed from ${rb_cv_target_archs-nothing} to ${target_archs}])
-else
-    rb_cv_target_archs=${target_archs}
-fi
-if test "x${ARCH_FLAG}" != x; then
-    CFLAGS="$CFLAGS ${ARCH_FLAG}"
-    LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}"
-fi
-# RUBY_UNIVERSAL_ARCH end
-])
-
-AC_ARG_ENABLE(load-relative,
-       AS_HELP_STRING([--enable-load-relative], [resolve load paths at run time]),
-       [load_relative=$enableval])
-
-AC_ARG_PROGRAM
-
-dnl Checks for programs.
-
-cflagspat=
-test -z "$optflags" ||
-    cflagspat="$cflagspat;s|"`eval echo '"'"${optflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
-test -z "$debugflags" ||
-    cflagspat="$cflagspat;s|"`eval echo '"'"${debugflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
-test -z "warnflags" ||
-    cflagspat="$cflagspat;s|"`eval echo '"'"${warnflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
-if test -z "${CFLAGS+set}"; then
-    cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
-    orig_cflags="$cflags"
-    cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
-fi
-if test -z "${CXXFLAGS+set}"; then
-    cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
-    orig_cxxflags="$cxxflags"
-    cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
-fi
-
-if test x"${build}" != x"${host}"; then
-  AC_CHECK_TOOL(CC, gcc)
-fi
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_GCC_TRADITIONAL
-AC_SUBST(GCC)
-if test "$GCC" = yes; then
-    linker_flag=-Wl,
-    : ${optflags=-O3}
-    AS_CASE(["$target_os"], [linux*|darwin*], [: ${debugflags=-ggdb}])
-    RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
-else
-    linker_flag=
-fi
-test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
-
-RUBY_PROG_GNU_LD
-RUBY_CPPOUTFILE
-
-: ${OUTFLAG='-o '}
-: ${COUTFLAG=${OUTFLAG}}
-AC_SUBST(OUTFLAG)
-AC_SUBST(COUTFLAG)
-
-RUBY_MINGW32
-RUBY_UNIVERSAL_ARCH
-if test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "$universal_binary" = no; then
-    RUBY_DEFAULT_ARCH("$target_cpu")
-fi
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(AR, ar)
-if test -z "$AR"; then
-  AC_CHECK_PROGS(AR, aal, ar)
-fi
-
-AC_CHECK_TOOL(AS, as)
-ASFLAGS=$ASFLAGS
-AC_SUBST(ASFLAGS)
-
-AS_CASE(["$target_os"],[cygwin*|mingw*], [ac_cv_prog_ac_ct_OBJCOPY=":"])
-
-# BSD's ports and MacPorts prefix GNU binutils with 'g'
-AC_CHECK_TOOLS(OBJDUMP, [objdump gobjdump])
-AC_CHECK_TOOLS(OBJCOPY, [objcopy gobjcopy])
-
-AS_CASE(["$target_os"],
-[cygwin*|mingw*], [
-    AC_CHECK_TOOL(WINDRES, windres)
-    AC_CHECK_TOOL(DLLWRAP, dllwrap)
-    target=`echo $target | sed "s/^$target_cpu-/-/"`
-    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
-    target_cpu=`echo $target_cpu | sed s/i.86/i386/`
-    AS_CASE(["$target"], [-*], [ target="$target_cpu${target}"])
-    AS_CASE(["$target_alias"], [-*], [ target_alias="$target_cpu${target_alias}"])
-    AS_CASE(["$target_os"],
-    [mingw*], [
-	test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
-	AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
-	AC_TRY_LINK([@%:@include <stdio.h>],
-		    [FILE* volatile f = stdin; return 0;],
-		    [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
-				   tr A-Z a-z |
-				   sed -n '/^[[ 	]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
-		    [rb_cv_msvcrt=msvcrt])
-	test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
-    ])
-    : ${enable_shared=yes}
-    ],
-[aix*],     [AC_CHECK_TOOL(NM, nm, /usr/ccs/bin/nm, /usr/ccs/bin:$PATH)],
-[hiuxmpp*], [AC_DEFINE(__HIUX_MPP__)])    # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
-AC_CHECK_TOOL(NM, nm)
-
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-AC_PROG_MKDIR_P
-if test "x$MKDIR_P" = "x -d"; then
-  if test x"$as_mkdir_p" != xfalse; then
-    MKDIR_P='mkdir -p'
-    echo "use 'mkdir -p' as MKDIR_P"
-  else
-    AC_MSG_ERROR([mkdir -p is required])
-  fi
-fi
-MAKEDIRS="$MKDIR_P"
-AC_SUBST(MAKEDIRS)
-
-AC_CHECK_PROG(DOT, dot)
-AC_CHECK_PROG(DOXYGEN, doxygen)
-
-AC_CHECK_PROG(PKG_CONFIG, pkg-config, [], [], [],
-    [`$as_dir/$ac_word$ac_exec_ext --print-errors --version > /dev/null 2>&1 || continue`])
-
-# checks for UNIX variants that set C preprocessor variables
-AC_USE_SYSTEM_EXTENSIONS
-
-AC_SUBST(RM, ['rm -f'])
-AC_SUBST(CP, ['cp'])
-RMDIRS='$(top_srcdir)/tool/rmdirs'
-RMDIR=rmdir
-mkdir "rmdirs_$$_test" "rmdirs_$$_test/a"
-rmdir --ignore-fail-on-non-empty "rmdirs_$$_test" 2>/dev/null &&
-RMDIR='rmdir --ignore-fail-on-non-empty'
-$RMDIR -p "rmdirs_$$_test/a" 2>/dev/null &&
-{ test -d "rmdirs_$$_test" || RMDIRS="$RMDIR -p"; }
-rmdir "rmdirs_$$_test/a" "rmdirs_$$_test" 2>/dev/null
-AC_SUBST(RMDIR)
-AC_SUBST(RMDIRS)
-AC_SUBST(RMALL, ['rm -fr'])
-
-AC_MSG_CHECKING([for cd using physical directory])
-rm -fr conf$$.dir
-mkdir conf$$.dir &&
-(cd conf$$.dir && mkdir src build && cd src &&
-$as_ln_s ../build . > /dev/null 2>&1 && cd build &&
-for chdir in 'cd -P' 'PWD= cd'; do
-    /bin/sh -c "$chdir ../src && echo '$chdir' > cdcmd" 2> /dev/null && break
-done)
-if test -e conf$$.dir/src/cdcmd; then
-    read CHDIR < conf$$.dir/src/cdcmd 2> /dev/null
-else
-    CHDIR=cd
-fi
-rm -fr conf$$.dir
-AC_MSG_RESULT([$CHDIR])
-AC_SUBST(CHDIR)
-
-dnl }
-dnl compiler section {
-
-AC_DEFUN([RUBY_WERROR_FLAG], [dnl
-if test "${ac_c_werror_flag+set}"; then
-  rb_c_werror_flag="$ac_c_werror_flag"
-else
-  unset rb_c_werror_flag
-fi
-ac_c_werror_flag=yes
-$1
-if test "${rb_c_werror_flag+set}"; then
-  ac_c_werror_flag="$rb_c_werror_flag"
-else
-  unset ac_c_werror_flag
-fi])
-
-AC_DEFUN(RUBY_TRY_CFLAGS, [
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="[$]CFLAGS $1"
-    AC_MSG_CHECKING([whether ]$1[ is accepted])
-    RUBY_WERROR_FLAG([
-    AC_TRY_COMPILE([$4], [$5],
-	[$2
-	AC_MSG_RESULT(yes)],
-	[$3
-	AC_MSG_RESULT(no)])
-    ])
-    CFLAGS="$save_CFLAGS"
-    save_CFLAGS=
-])
-
-AC_DEFUN(RUBY_TRY_LDFLAGS, [
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="[$]LDFLAGS $1"
-    AC_MSG_CHECKING([whether $1 is accepted])
-    RUBY_WERROR_FLAG([
-    AC_TRY_LINK([$4], [$5],
-	[$2
-	AC_MSG_RESULT(yes)],
-	[$3
-	AC_MSG_RESULT(no)])
-    ])
-    LDFLAGS="$save_LDFLAGS"
-    save_LDFLAGS=
-])
-
-rb_cv_warnflags="$warnflags"
-if test "$GCC:${warnflags+set}:no" = yes::no; then
-    particular_werror_flags=yes
-    for wflag in -Wno-unused-parameter -Wno-parentheses -Wno-long-long \
-		 -Wno-missing-field-initializers \
-		 -Werror=pointer-arith \
-		 -Werror=write-strings \
-		 -Werror=declaration-after-statement \
-		 -Werror=shorten-64-to-32 \
-		 -Werror-implicit-function-declaration \
-		 ; do
-	if test "$particular_werror_flags" = yes; then
-	    wflag=`echo x$wflag | sed 's/^x-Werror-/-Werror=/;s/^x//'`
-	else
-	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/;s/^x//'`
-	fi
-	ok=no
-	RUBY_TRY_CFLAGS($wflag, [warnflags="${warnflags+$warnflags }$wflag" ok=yes])
-	AS_CASE([$ok:$wflag], [no:-Werror=*], [
-	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/'`
-	    RUBY_TRY_CFLAGS($wflag, [
-		warnflags="${warnflags+$warnflags }$wflag"
-		particular_werror_flags=no
-	    ])
-	])
-    done
-    AS_CASE([" $warnflags "],[*" -Wno-missing-field-initializers "*], [wflag=-Wextra],
-                             [wflag=-Wall])
-    RUBY_TRY_CFLAGS($wflag, [warnflags="$wflag${warnflags+ $warnflags}"])
-    # Disable warnflags while conftest. -Werror=* flags might make bad OS capability guess.
-    rb_cv_warnflags="$warnflags"
-    warnflags=
-fi
-if test "$GCC" = ""; then
-    AS_CASE(["$target_os"],[aix*],[warnflags="-qinfo=por"])
-fi
-if test "$GCC" = yes; then
-    RUBY_TRY_CFLAGS(-fvisibility=hidden, [RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)])
-    AC_SUBST(WERRORFLAG, "-Werror")
-    if test "$visibility_option" = yes; then
-	RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)
-    else
-	RUBY_TRY_LDFLAGS([-Wl,-unexported_symbol,_Init_*], [visibility_option=ld], [visibility_option=no])
-    fi
-    test "$visibility_option" = no || OBJCOPY=:
-fi
-
-test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
-test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
-
-dnl check for large file stuff
-mv confdefs.h confdefs1.h
-: > confdefs.h
-AC_SYS_LARGEFILE
-mv confdefs.h largefile.h
-mv confdefs1.h confdefs.h
-cat largefile.h >> confdefs.h
-
-AS_CASE(["$target_os"],[mingw*], [ac_cv_type_off_t=yes;ac_cv_sizeof_off_t=8])
-
-AC_C_BIGENDIAN
-AC_C_CONST
-AC_C_CHAR_UNSIGNED
-AC_C_INLINE
-AC_C_VOLATILE
-
-AS_CASE(":$ac_cv_c_const:$ac_cv_c_volatile:",
-    [*:no:*], [AC_MSG_ERROR(ANSI C-conforming const and volatile are mandatory)])
-
-AC_CHECK_TYPES([long long, off_t])
-
-AC_CACHE_CHECK([char bit], [rb_cv_char_bit],
-    [test "$universal_binary" = yes && cross_compiling=yes
-    AC_COMPUTE_INT([rb_cv_char_bit], [CHAR_BIT],
-	[AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8])
-    test "$universal_binary" = yes && cross_compiling=$real_cross_compiling])
-
-dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include]
-AC_DEFUN([RUBY_CHECK_SIZEOF],
-[m4_bmatch([$1], [\.], [], [if test "$universal_binary" = yes; then])
-AC_CACHE_CHECK([size of $1], [AS_TR_SH([ac_cv_sizeof_$1])], [
-    unset AS_TR_SH(ac_cv_sizeof_$1)
-    rbcv_var="
-typedef m4_bpatsubst([$1], [\..*]) ac__type_sizeof_;
-static ac__type_sizeof_ *rbcv_ptr;
-@%:@define AS_TR_CPP(SIZEOF_$1) sizeof((*rbcv_ptr)[]m4_bmatch([$1], [\.], .m4_bpatsubst([$1], [^[^.]*\.])))
-"
-    m4_ifval([$2], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && {
-    for t in $2; do
-	AC_COMPILE_IFELSE(
-	    [AC_LANG_BOOL_COMPILE_TRY(AC_INCLUDES_DEFAULT([$4]
-		[$rbcv_var]),
-		[AS_TR_CPP(SIZEOF_$1) == sizeof($t)])], [
-		AS_TR_SH(ac_cv_sizeof_$1)=AS_TR_CPP([SIZEOF_]$t)
-		break])
-    done
-    }])
-    unset cond
-    m4_ifval([$3], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && {
-    for s in 32 64 128; do
-	for t in $3; do
-	    cond="${cond}
-@%:@${cond+el}if defined(__${t}${s}__) || defined(__${t}${s}) || defined(_${t}${s}) || defined(${t}${s})"
-	    hdr="AC_INCLUDES_DEFAULT([$4
-@%:@if defined(__${t}${s}__) || defined(__${t}${s}) || defined(_${t}${s}) || defined(${t}${s})
-@%:@ define AS_TR_CPP(HAVE_$1) 1
-@%:@else
-@%:@ define AS_TR_CPP(HAVE_$1) 0
-@%:@endif])"
-	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr], [!AS_TR_CPP(HAVE_$1)])], [continue])
-	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr]
-				[$rbcv_var],
-				[AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == ([$[s / rb_cv_char_bit]]))])],
-		[AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}${s}"])
-	done
-    done
-    }])
-    m4_ifval([$2][$3], [case "${AS_TR_SH(ac_cv_sizeof_$1)}" in
-    #(
-    [SIZEOF_*]);;
-    #(
-    *)])
-    test "$universal_binary" = yes && cross_compiling=yes
-    AC_COMPUTE_INT([t], AS_TR_CPP(SIZEOF_$1), [AC_INCLUDES_DEFAULT([$4])]
-[${cond+$cond
-@%:@else}
-$rbcv_var
-${cond+@%:@endif}
-@%:@ifndef AS_TR_CPP(SIZEOF_$1)
-@%:@define AS_TR_CPP(SIZEOF_$1) 0
-@%:@endif], [t=0])
-    test "$universal_binary" = yes && cross_compiling=$real_cross_compiling
-    if test ${t-0} != 0; then
-	AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}"
-    fi
-    m4_ifval([$2][$3], [;; esac])
-    : ${AS_TR_SH(ac_cv_sizeof_$1)=0}
-])
-{
-    unset cond
-    for t in ${AS_TR_SH(ac_cv_sizeof_$1)-}; do
-	AS_CASE(["$t"],
-	[[[0-9]*|SIZEOF_*]], [
-	    ${cond+echo "@%:@else"}
-	    echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) [$t]"
-	    break
-	    ],
-	[
-	    s=`expr $t : ['.*[^0-9]\([0-9][0-9]*\)$']`
-	    echo "@%:@${cond+el}if defined(__${t}__) || defined(__${t}) || defined(_${t}) || defined($t)"
-	    echo "@%:@define AS_TR_CPP(SIZEOF_$1) [$[s / rb_cv_char_bit]]"
-	    cond=1
-	    ])
-    done
-    ${cond+echo "@%:@endif"}
-} >> confdefs.h
-m4_bmatch([$1], [\.], [], [else
-AC_CHECK_SIZEOF([$1], 0, [$4])
-fi])
-])
-
-RUBY_CHECK_SIZEOF(int, [], [ILP])
-RUBY_CHECK_SIZEOF(short)
-RUBY_CHECK_SIZEOF(long, [int], [ILP LP])
-RUBY_CHECK_SIZEOF(long long)
-RUBY_CHECK_SIZEOF(__int64)
-RUBY_CHECK_SIZEOF(off_t)
-RUBY_CHECK_SIZEOF(void*, [int long "long long"], [ILP LP LLP])
-RUBY_CHECK_SIZEOF(float)
-RUBY_CHECK_SIZEOF(double)
-RUBY_CHECK_SIZEOF(time_t, [long "long long"], [], [@%:@include <time.h>])
-
-AC_DEFUN([RUBY_CHECK_PRINTF_PREFIX], [
-AC_CACHE_CHECK([for printf prefix for $1], [rb_cv_pri_prefix_]AS_TR_SH($1),[
-    [rb_cv_pri_prefix_]AS_TR_SH($1)=[NONE]
-    RUBY_WERROR_FLAG(for pri in $2; do
-        AC_TRY_COMPILE(
-            [@%:@include <stdio.h>
-	    @%:@include <stddef.h>
-            @%:@ifdef __GNUC__
-            @%:@define PRINTF_ARGS(decl, string_index, first_to_check) \
-              decl __attribute__((format(printf, string_index, first_to_check)))
-            @%:@else
-            @%:@define PRINTF_ARGS(decl, string_index, first_to_check) decl
-            @%:@endif
-	    PRINTF_ARGS(void test_sprintf(const char*, ...), 1, 2);],
-            [printf("%]${pri}[d", (]$1[)42);
-            test_sprintf("%]${pri}[d", (]$1[)42);],
-            [rb_cv_pri_prefix_]AS_TR_SH($1)[=[$pri]; break])
-    done)])
-if test "[$rb_cv_pri_prefix_]AS_TR_SH($1)" != NONE; then
-    AC_DEFINE_UNQUOTED([PRI_]m4_ifval($3,$3,AS_TR_CPP(m4_bpatsubst([$1],[_t$])))[_PREFIX],
-        "[$rb_cv_pri_prefix_]AS_TR_SH($1)")
-fi
-])
-
-if test "x$ac_cv_type_long_long" = xyes; then
-    RUBY_CHECK_PRINTF_PREFIX(long long, ll I64, LL)
-elif test "x$ac_cv_type___int64" = xyes; then
-    RUBY_CHECK_PRINTF_PREFIX(__int64, ll I64, LL)
-fi
-
-dnl RUBY_REPLACE_TYPE [typename] [default type] [macro type] [included]
-AC_DEFUN([RUBY_REPLACE_TYPE], [dnl
-    AC_CHECK_TYPE([$1],
-		  [n="patsubst([$1],["],[\\"])"],
-		  [n="patsubst([$2],["],[\\"])"],
-		  [$4])
-    AC_CACHE_CHECK([for convertible type of [$1]], rb_cv_[$1]_convertible, [
-	u= t=
-	AS_CASE(["$n "],
-	  [*" signed "*], [ ],
-	  [*" unsigned "*], [
-	    u=U],
-	  [
-	    AC_COMPILE_IFELSE(
-		[AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([$4])], [($n)-1 > 0])],
-		[u=U])])
-	if test x"$t" = x; then
-	    for t in "long long" long int short; do
-		test -n "$u" && t="unsigned $t"
-		AC_COMPILE_IFELSE(
-		    [AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([$4])]
-			[typedef $n rbcv_conftest_target_type;
-			typedef $t rbcv_conftest_replace_type;
-			extern rbcv_conftest_target_type rbcv_conftest_var;
-			extern rbcv_conftest_replace_type rbcv_conftest_var;
-			extern rbcv_conftest_target_type rbcv_conftest_func(void);
-			extern rbcv_conftest_replace_type rbcv_conftest_func(void);
-			], [sizeof(rbcv_conftest_target_type) == sizeof(rbcv_conftest_replace_type)])],
-		    [n="$t"; break])
-	    done
-	fi
-	AS_CASE([" $n "],
-	  [*" long long "*], [
-	    t=LL],
-	  [*" long "*], [
-	    t=LONG],
-	  [
-	    t=INT])
-	rb_cv_[$1]_convertible=${u}${t}])
-    test "${AS_TR_SH(ac_cv_type_[$1])}" = "yes" && n="$1"
-    AC_DEFINE_UNQUOTED(rb_[$1], $n)
-    AC_DEFINE_UNQUOTED([$3]2NUM[(v)], [${rb_cv_[$1]_convertible}2NUM(v)])
-    AC_DEFINE_UNQUOTED(NUM2[$3][(v)], [NUM2${rb_cv_[$1]_convertible}(v)])
-    AC_DEFINE_UNQUOTED(PRI_[$3]_PREFIX,
-	[PRI_`echo ${rb_cv_[$1]_convertible} | sed ['s/^U//']`_PREFIX])
-])
-RUBY_REPLACE_TYPE(pid_t, int, PIDT)
-RUBY_REPLACE_TYPE(uid_t, int, UIDT)
-RUBY_REPLACE_TYPE(gid_t, int, GIDT)
-RUBY_REPLACE_TYPE(time_t, [], TIMET, [@%:@include <time.h>])
-RUBY_REPLACE_TYPE(dev_t, [int long "long long"], DEVT)
-RUBY_REPLACE_TYPE(mode_t, ["unsigned int" long], MODET, [@%:@include <sys/stat.h>])
-RUBY_REPLACE_TYPE(rlim_t, [int long "long long"], RLIM, [@%:@include <sys/resource.h>])
-
-AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
-  [AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
-	rb_cv_have_prototypes=yes,
-	rb_cv_have_prototypes=no)])
-if test "$rb_cv_have_prototypes" = yes; then
-  AC_DEFINE(HAVE_PROTOTYPES)
-fi
-
-AC_CACHE_CHECK(token paste string, rb_cv_tokenpaste,
-  [AC_TRY_COMPILE([#define paste(a,b) a##b],
-		  [int xy = 1; return paste(x,y);],
-		  rb_cv_tokenpaste=ansi,
-		  rb_cv_tokenpaste=knr)])
-if test "$rb_cv_tokenpaste" = ansi; then
-  AC_DEFINE(TOKEN_PASTE(x,y),[x##y])
-else
-  AC_DEFINE(TOKEN_PASTE(x,y),[x/**/y])
-fi
-
-AC_CACHE_CHECK(stringization, rb_cv_stringization, [
-  rb_cv_stringization=no
-  for string in "#expr" '"expr"'; do
-    AC_COMPILE_IFELSE([
-      AC_LANG_BOOL_COMPILE_TRY([
-#define STRINGIZE0(expr) $string
-#define STRINGIZE(expr) STRINGIZE0(expr)
-#undef real_test_for_stringization
-#define test_for_stringization -.real_test_for_stringization.-
-const char stringized[[]] = STRINGIZE(test_for_stringization);
-], [sizeof(stringized) == 32])],
-      [rb_cv_stringization="$string"; break],
-      [rb_cv_stringization=no])
-  done]
-)
-AC_DEFINE(STRINGIZE(expr),STRINGIZE0(expr))
-if test x"$rb_cv_stringization" != xno -a "$rb_cv_stringization" != "#expr"; then
-  AC_DEFINE_UNQUOTED(STRINGIZE0(expr),$rb_cv_stringization)
-  AC_DEFINE(OLD_FASHIONED_STRINGIZATION,1)
-fi
-
-AC_CACHE_CHECK([string literal concatenation],
-  rb_cv_string_literal_concatenation, [
-  AC_COMPILE_IFELSE([
-    AC_LANG_BOOL_COMPILE_TRY([
-const char concatenated_literal[[]] = "literals" "to"
-  "be" "concatenated.";
-], [sizeof(concatenated_literal) == 26])],
-    [rb_cv_string_literal_concatenation=yes],
-    [rb_cv_string_literal_concatenation=no])]
-)
-if test "$rb_cv_string_literal_concatenation" = no; then
-  AC_DEFINE(NO_STRING_LITERAL_CONCATENATION,1)
-fi
-
-AC_CACHE_CHECK(for variable length prototypes and stdarg.h, rb_cv_stdarg,
-  [AC_TRY_COMPILE([
-#include <stdarg.h>
-int foo(int x, ...) {
-	va_list va;
-	va_start(va, x);
-	va_arg(va, int);
-	va_arg(va, char *);
-	va_arg(va, double);
-	return 0;
-}
-], [return foo(10, "", 3.14);],
-	rb_cv_stdarg=yes,
-	rb_cv_stdarg=no)])
-if test "$rb_cv_stdarg" = yes; then
-  AC_DEFINE(HAVE_STDARG_PROTOTYPES)
-fi
-
-AC_CACHE_CHECK(for variable length macro, rb_cv_va_args_macro,
-  [AC_TRY_COMPILE([
-int foo(int x, ...);
-@%:@define FOO(a, ...) foo(a, @%:@@%:@__VA_ARGS__)
-], [FOO(1);FOO(1,2);FOO(1,2,3);],
-  rb_cv_va_args_macro=yes,
-  rb_cv_va_args_macro=no)])
-if test "$rb_cv_va_args_macro" = yes; then
-  AC_DEFINE(HAVE_VA_ARGS_MACRO)
-fi
-
-AC_DEFUN([RUBY_DEFINE_IF], [dnl
-    m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h
-@%:@if $1
-EOH
-])dnl
-AC_DEFINE_UNQUOTED($2, $3)
-    m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h
-@%:@endif /* $1 */
-EOH
-])dnl
-])dnl
-
-dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition)
-AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl
-m4_ifval([$2], 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_func_][$1])]dnl
-)dnl
-m4_ifval([$4], [rbcv_cond=[$4]; test "$rbcv_cond" || unset rbcv_cond])
-AC_CACHE_CHECK(for [$1] function attribute, rbcv,
-[rbcv=x
-RUBY_WERROR_FLAG([
-for mac in "__attribute__ (($1)) x" "x __attribute__ (($1))" "__declspec($1) x" x; do
-  m4_ifval([$4],mac="$mac"${rbcv_cond+" /* only if $rbcv_cond */"})
-  AC_TRY_COMPILE(
-    m4_ifval([$4],${rbcv_cond+[@%:@if ]$rbcv_cond})
-[@%:@define ]attrib[(x) $mac]
-m4_ifval([$4],${rbcv_cond+[@%:@else]}
-${rbcv_cond+[@%:@define ]attrib[(x) x]}
-${rbcv_cond+[@%:@endif]})
-    attrib[(void conftest_attribute_check(void));], [],
-    [rbcv="$mac"; break])
-done
-])])
-if test "$rbcv" != x; then
-    RUBY_DEFINE_IF([${rbcv_cond}], attrib[(x)], $rbcv)
-fi
-AS_VAR_POPDEF([attrib])
-AS_VAR_POPDEF([rbcv])
-])
-
-RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN)
-RUBY_FUNC_ATTRIBUTE(deprecated, DEPRECATED)
-RUBY_FUNC_ATTRIBUTE(noinline, NOINLINE)
-
-if_i386=${universal_binary+[defined __i386__]}
-RUBY_FUNC_ATTRIBUTE(stdcall,  [], [], ${if_i386})
-RUBY_FUNC_ATTRIBUTE(cdecl,    [], [], ${if_i386})
-RUBY_FUNC_ATTRIBUTE(fastcall, [], [], ${if_i386})
-
-if test "$GCC" = yes; then
-    AC_CACHE_CHECK([for function alias], [rb_cv_gcc_function_alias],
-	[rb_cv_gcc_function_alias=no
-	for a in alias weak,alias; do
-	    AC_TRY_LINK([void foo(void) {}
-		void bar(void) __attribute__(($a("foo")));], [bar()],
-		[rb_cv_gcc_function_alias=$a; break])
-	done])
-    if test "$rb_cv_gcc_function_alias" != no; then
-	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args)],
-			   [type prot __attribute__(($rb_cv_gcc_function_alias(@%:@name)));])
-	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
-			   [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
-    fi
-    AC_CACHE_CHECK([for atomic builtins], [rb_cv_gcc_atomic_builtins], [
-	AC_TRY_LINK([unsigned char atomic_var;],
-		    [
-			__sync_lock_test_and_set(&atomic_var, 0);
-			__sync_lock_test_and_set(&atomic_var, 1);
-			__sync_fetch_and_add(&atomic_var, 1);
-			__sync_fetch_and_sub(&atomic_var, 1);
-		    ],
-		    [rb_cv_gcc_atomic_builtins=yes],
-		    [rb_cv_gcc_atomic_builtins=no])])
-    if test "$rb_cv_gcc_atomic_builtins" = yes; then
-	AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS)
-    fi
-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
-  AC_TRY_COMPILE([@%:@define RUBY_FUNC_EXPORTED $mac extern
-    RUBY_FUNC_EXPORTED void conftest_attribute_check(void);], [],
-    [rb_cv_func_exported="$mac"; break])
-done
-])])
-if test "$rb_cv_func_exported" != no; then
-    AC_DEFINE_UNQUOTED(RUBY_FUNC_EXPORTED, [$rb_cv_func_exported extern])
-fi
-
-RUBY_APPEND_OPTION(XCFLAGS, -DRUBY_EXPORT)
-
-dnl }
-dnl header and library section {
-
-dnl Check whether we need to define sys_nerr locally
-AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
-#include <errno.h>])
-
-AC_ARG_ENABLE(win95,
-	AS_HELP_STRING([--enable-win95], [enable Windows 95 series support]),
-  [AS_CASE(["$enableval"],[yes|no],[enable_win95=$enableval],[unset enable_win95])])
-
-AS_CASE(["$target_os"],
-[freebsd*], [
-  AC_CACHE_CHECK([whether pthread should be enabled by default],
-    rb_cv_enable_pthread_default,
-    [AC_TRY_CPP([
-#include <osreldate.h>
-#if __FreeBSD_version < 502102
-#error pthread should be disabled on this platform
-#endif
-      ],
-      rb_cv_enable_pthread_default=yes,
-      rb_cv_enable_pthread_default=no)])
-  enable_pthread=$rb_cv_enable_pthread_default
-  ],
-[mingw*], [
-  enable_pthread=no
-  ],
-[
-  enable_pthread=yes
-  ])
-
-AC_ARG_ENABLE(pthread,
-       AS_HELP_STRING([--enable-pthread], [obsolete, and ignored]))
-
-dnl Checks for libraries.
-AS_CASE(["$target_os"],[*bsd*|dragonfly*],[],[ac_cv_func_daemon=no])
-
-AS_CASE(["$target_os"],
-[solaris*], [
-		AC_DEFINE(SIZEOF_STRUCT_DIRENT_TOO_SMALL, 1)
-		LIBS="-lm $LIBS"
-		],
-# GNU Hurd
-[gnu*], [
-		AC_DEFINE(SIZEOF_STRUCT_DIRENT_TOO_SMALL, 1)
-		LIBS="-lm $LIBS"
-		],
-[nextstep*], [	],
-[openstep*], [	],
-[rhapsody*], [	],
-[darwin*], [	RUBY_PREPEND_OPTION(LIBS, -lobjc)
-		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE)
-		AC_MSG_CHECKING(whether Mac OS X 10.5 or later)
-		AC_TRY_CPP([#include <AvailabilityMacros.h>
-		    #if MAC_OS_X_VERSION_MAX_ALLOWED <= 1040
-		    #error pre OS X 10.4
-		    [!<===== pre OS X 10.4 =====>]
-		    #endif
-		    ],
-		    [macosx_10_5=yes], [macosx_10_5=no])
-		AC_MSG_RESULT($macosx_10_5)
-		if test $macosx_10_5 = yes; then
-		    ac_cv_header_ucontext_h=no
-		else
-		    AC_DEFINE(BROKEN_SETREUID, 1)
-		    AC_DEFINE(BROKEN_SETREGID, 1)
-		fi
-		ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage
-		ac_cv_lib_crypt_crypt=no
-		ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync()
-                AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt,
-                    [AC_TRY_RUN([
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-
-int
-main()
-{
-    int i;
-    for (i = 0; i < 128*128; i++) {
-	char salt[2], buf[256], *s;
-	salt[0] = 0x80 | (i & 0x7f);
-	salt[1] = 0x80 | (i >> 7);
-	strcpy(buf, crypt("", salt));
-	if (strcmp(buf, s = crypt("", salt))) {
-#if 0
-	    printf("%.2x%.2x: %s -> %s\n", (unsigned char)salt[0], (unsigned char)salt[1],
-		   buf+2, s+2);
-#endif
-	    return 1;
-	}
-    }
-    return 0;
-}
-],
-	            rb_cv_broken_crypt=no,
-	            rb_cv_broken_crypt=yes,
-	            rb_cv_broken_crypt=yes)])
-                if test "$rb_cv_broken_crypt" = yes; then
-                  AC_DEFINE(BROKEN_CRYPT, 1)
-                fi
-		],
-[hpux*], [	LIBS="-lm $LIBS"
-		ac_cv_c_inline=no],
-[human*], [	ac_cv_func_getpgrp_void=yes
-		ac_cv_func_setitimer=no
-		AC_CHECK_LIB(signal, _harderr)
-		AC_CHECK_LIB(hmem, hmemset)
-		AC_CHECK_FUNCS(select)
-		AC_CACHE_CHECK(whether PD libc _dtos18 fail to convert big number,
-		   rb_cv_missing__dtos18,
-		[AC_TRY_RUN([
-#include <stdio.h>
-int
-main()
-{
-   char buf[256];
-   sprintf(buf, "%g", 1e+300);
-   return (strcmp (buf, "1e+300") ? 0 : 1);
-}
-],
-		rb_cv_missing__dtos18=yes, rb_cv_missing__dtos18=no, rb_cv_missing__dtos18=no)])
-		if test "$rb_cv_missing__dtos18" = yes; then
-		    AC_DEFINE(MISSING__DTOS18)
-		fi
-		AC_CACHE_CHECK(whether PD libc fconvert fail to round,
-			       rb_cv_missing_fconvert,
-		[AC_TRY_RUN([
-#include <stdio.h>
-#include <math.h>
-int
-main()
-{
-  char buf[256];
-  sprintf(buf, "%f", log(exp(1.0)));
-  return (strcmp (buf, "1.000000") ? 0 : 1);
-}
-],
-		rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no)])
-		if test "$rb_cv_missing_fconvert" = yes; then
-		    AC_DEFINE(MISSING_FCONVERT)
-		fi
-		],
-[beos*|haiku*], [
-		ac_cv_func_link=no
-		ac_cv_func_sched_yield=no
-		ac_cv_func_pthread_attr_setinheritsched=no
-		AS_CASE(["$target_os"],
-		[beos*], [ ac_cv_header_net_socket_h=yes],
-		[haiku*], [ ac_cv_func_shutdown=no])
-		LIBS="$LIBS" # m lib is include in root under BeOS/Haiku
-		],
-[cygwin*], [	ac_cv_header_langinfo_h=yes
-		AC_CHECK_FUNCS(cygwin_conv_path)
-		AC_LIBOBJ([langinfo])
-		],
-[mingw*], [	LIBS="-lshell32 -lws2_32 -limagehlp $LIBS"
-		ac_cv_header_a_out_h=no
-		ac_cv_header_pwd_h=no
-		ac_cv_header_utime_h=no
-		ac_cv_header_sys_ioctl_h=no
-		ac_cv_header_sys_param_h=no
-		ac_cv_header_sys_resource_h=no
-		ac_cv_header_sys_select_h=no
-		ac_cv_header_sys_time_h=no
-		ac_cv_header_sys_times_h=no
-		ac_cv_header_sys_socket_h=no
-		ac_cv_func_times=yes
-		ac_cv_func_waitpid=yes
-		ac_cv_func_fsync=yes
-		ac_cv_func_seekdir=yes
-		ac_cv_func_telldir=yes
-		ac_cv_func_isinf=yes
-		ac_cv_func_isnan=yes
-		ac_cv_func_finite=yes
-		ac_cv_func_link=yes
-		ac_cv_func_fseeko=yes
-		ac_cv_lib_crypt_crypt=no
-		ac_cv_func_getpgrp_void=no
-		ac_cv_func_memcmp_working=yes
-		ac_cv_lib_dl_dlopen=no
-		rb_cv_binary_elf=no
-		rb_cv_negative_time_t=no
-		ac_cv_func_fcntl=yes
-		ac_cv_func_flock=yes
-		rb_cv_large_fd_select=yes
-		AC_LIBOBJ([langinfo])
-		: ${enable_win95=maybe}
-		],
-[os2-emx*], [	LIBS="-lm $LIBS"
-		ac_cv_lib_dir_opendir=no],
-[msdosdjgpp*], [
-		LIBS="-lm $LIBS"
-		ac_cv_func_getpgrp_void=yes
-		ac_cv_func_setitimer=no
-		ac_cv_sizeof_rlim_t=4
-		ac_cv_func_fork=no
-		ac_cv_func_setrlimit=no
-		ac_cv_header_sys_socket_h=no
-		],
-[bsdi*], [	LIBS="-lm $LIBS"
-		AC_DEFINE(BROKEN_SETREUID, 1)
-		AC_DEFINE(BROKEN_SETREGID, 1)
-                ac_cv_sizeof_rlim_t=8],
-[freebsd*], [	LIBS="-lm $LIBS"
-		ac_cv_func_getpeername=no
-		ac_cv_func_getsockname=no
-		ac_cv_func_shutdown=no
-		ac_cv_func_close=no
-		],
-[dragonfly*], [	LIBS="-lm $LIBS"
-		],
-[bow], [	ac_cv_func_setitimer=no
-		],
-[superux*], [	ac_cv_func_setitimer=no
-		],
-[	LIBS="-lm $LIBS"])
-AC_CHECK_LIB(crypt, crypt)
-AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
-AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
-AC_CHECK_LIB(socket, socketpair)	# SunOS/Solaris
-AC_CHECK_LIB(rt, clock_gettime)	# GNU/Linux
-if test "${enable_win95}" = maybe; then
-    AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])
-fi
-if test "${enable_win95}" = yes; then
-    AC_DEFINE(WIN95)
-    LIBS="-lunicows $LIBS"
-fi
-
-AS_CASE(["$target_cpu"],
-[alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"],
-		[*::yes],  # gcc
-			[CFLAGS="-mieee $CFLAGS"],
-		[osf*],    # ccc
-			[CFLAGS="-ieee $CFLAGS"],
-		)])
-
-ac_cv_header_net_socket_h=${ac_cv_header_net_socket_h=no}
-if test "$ac_cv_header_net_socket_h" = yes; then
-    ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=no}
-else
-    ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=yes}
-fi
-
-dnl Checks for header files.
-AC_HEADER_DIRENT
-dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS
-AC_HEADER_STDBOOL
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(limits.h sys/file.h sys/ioctl.h sys/syscall.h\
-		 fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
-		 syscall.h pwd.h grp.h a.out.h utime.h direct.h sys/resource.h \
-		 sys/mkdev.h sys/utime.h xti.h netinet/in_systm.h float.h ieeefp.h \
-		 ucontext.h intrinsics.h langinfo.h locale.h sys/sendfile.h time.h \
-		 net/socket.h sys/socket.h process.h)
-
-AC_TYPE_SIZE_T
-RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>])
-RUBY_CHECK_SIZEOF(ptrdiff_t, size_t, [], [@%:@include <stddef.h>])
-RUBY_CHECK_PRINTF_PREFIX(size_t, z)
-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], [int long "long long"], [], [@%:@include <sys/stat.h>])
-if test "$ac_cv_member_struct_stat_st_blocks" = yes; then
-    RUBY_CHECK_SIZEOF([struct stat.st_blocks], [int long "long long"], [], [@%:@include <sys/stat.h>])
-fi
-AC_CHECK_MEMBERS([struct stat.st_atim])
-AC_CHECK_MEMBERS([struct stat.st_atimespec])
-AC_CHECK_MEMBERS([struct stat.st_atimensec])
-AC_CHECK_MEMBERS([struct stat.st_mtim])
-AC_CHECK_MEMBERS([struct stat.st_mtimespec])
-AC_CHECK_MEMBERS([struct stat.st_mtimensec])
-AC_CHECK_MEMBERS([struct stat.st_ctim])
-AC_CHECK_MEMBERS([struct stat.st_ctimespec])
-AC_CHECK_MEMBERS([struct stat.st_ctimensec])
-
-AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
-@%:@include <time.h>
-@%:@endif])
-
-AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
-@%:@ include <time.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TIME_H
-@%:@ include <sys/time.h>
-@%:@endif])
-
-AC_CHECK_TYPES([clockid_t], [], [], [@%:@ifdef HAVE_TIME_H
-@%:@ include <time.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TIME_H
-@%:@ include <sys/time.h>
-@%:@endif])
-
-AC_CACHE_VAL([rb_cv_large_fd_select],
-    [AC_CHECK_TYPE(fd_mask, [rb_cv_large_fd_select=yes], [rb_cv_large_fd_select=no])])
-if test "$rb_cv_large_fd_select" = yes; then
-    AC_DEFINE(HAVE_RB_FD_INIT, 1)
-fi
-
-dnl RUBY_DEFINT TYPENAME, SIZE, [SIGNED-OR-UNSIGNED], [INCLUDES = DEFAULT-INCLUDES]
-AC_DEFUN([RUBY_DEFINT], [dnl
-AC_CACHE_CHECK([for $1], [rb_cv_type_$1],
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])
-typedef $1 t; int s = sizeof(t) == 42;])],
-   [rb_cv_type_$1=yes],
-   [AS_CASE([m4_bmatch([$2], [^[1-9][0-9]*$], $2, [$ac_cv_sizeof_]AS_TR_SH($2))],
-    ["1"], [ rb_cv_type_$1="m4_if([$3], [], [signed ], [$3 ])char"],
-    ["$ac_cv_sizeof_short"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])short"],
-    ["$ac_cv_sizeof_int"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])int"],
-    ["$ac_cv_sizeof_long"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long"],
-    ["$ac_cv_sizeof_long_long"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long long"],
-    ["$ac_cv_sizeof___int64"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int64"],
-    [ rb_cv_type_$1=no])])])
-if test "${rb_cv_type_$1}" != no; then
-    AC_DEFINE([HAVE_]AS_TR_CPP($1), 1)
-    if test "${rb_cv_type_$1}" = yes; then
-	m4_bmatch([$2], [^[1-9][0-9]*$], [AC_CHECK_SIZEOF([$1], 0, [AC_INCLUDES_DEFAULT([$4])])],
-			[RUBY_CHECK_SIZEOF([$1], [$2], [], [AC_INCLUDES_DEFAULT([$4])])])
-    else
-	AC_DEFINE_UNQUOTED($1, [$rb_cv_type_$1])
-	AC_DEFINE_UNQUOTED([SIZEOF_]AS_TR_CPP($1), [SIZEOF_]AS_TR_CPP([$rb_cv_type_$1]))
-    fi
-fi
-])
-
-RUBY_DEFINT(int8_t, 1)
-RUBY_DEFINT(uint8_t, 1, unsigned)
-RUBY_DEFINT(int16_t, 2)
-RUBY_DEFINT(uint16_t, 2, unsigned)
-RUBY_DEFINT(int32_t, 4)
-RUBY_DEFINT(uint32_t, 4, unsigned)
-RUBY_DEFINT(int64_t, 8)
-RUBY_DEFINT(uint64_t, 8, unsigned)
-RUBY_DEFINT(int128_t, 16)
-RUBY_DEFINT(uint128_t, 16, unsigned)
-RUBY_DEFINT(intptr_t, void*)
-RUBY_DEFINT(uintptr_t, void*, unsigned)
-RUBY_DEFINT(ssize_t, size_t, [], [@%:@include <sys/types.h>])	dnl may differ from int, so not use AC_TYPE_SSIZE_T.
-
-AC_CACHE_CHECK(for stack end address, rb_cv_stack_end_address,
-[rb_cv_stack_end_address=no
-for addr in __libc_stack_end _SEND; do
-  AC_TRY_LINK(
-    [extern void *$addr;],
-    [if (!$addr) return 1;],
-    [rb_cv_stack_end_address="$addr"; break])
-done])
-if test $rb_cv_stack_end_address != no; then
-  AC_DEFINE_UNQUOTED(STACK_END_ADDRESS, $rb_cv_stack_end_address)
-fi
-
-AC_CACHE_CHECK(for gc_mark and gc_children stack frame approximate size(word), rb_cv_gc_mark_stackframe_word,
-[save_CFLAGS="$CFLAGS"
-CFLAGS="-O0"
-AC_TRY_RUN([
-int word;
-char *stack_start;
-
-void
-set_stackframe_word()
-{
-    int dumy = 42;
-    int diff;
-
-    if (stack_start < (char *)&dumy) {
-        diff = (int)((char *)&dumy - stack_start);
-    }
-    else {
-        diff = (int)(stack_start - (char *)&dumy);
-    }
-    word = (diff/sizeof(void *));
-    if ((diff % sizeof(void *)) != 0) {
-        word++;
-    }
-}
-
-void
-gc_mark_children(void *p1, void *p2, int lev)
-{
-    void *obj = p2;
-
-    set_stackframe_word(p1,p2,lev);
-}
-
-void
-gc_mark(void *p1, void *p2, int lev)
-{
-    void *obj = p2;
-
-    gc_mark_children(p1,p2,lev++);
-}
-
-int
-main() {
-  int dumy = 42;
-
-  stack_start = (char *)&dumy;
-  gc_mark(0, 0, 255);
-  return word;
-}
-],
-  [rb_cv_gc_mark_stackframe_word="$?"],
-  [rb_cv_gc_mark_stackframe_word="$?"],
-  [rb_cv_gc_mark_stackframe_word="30"])
-CFLAGS="$save_CFLAGS"])
-AC_DEFINE_UNQUOTED(GC_MARK_STACKFRAME_WORD, $rb_cv_gc_mark_stackframe_word)
-
-
-dnl Checks for library functions.
-AC_TYPE_GETGROUPS
-AC_TYPE_SIGNAL
-AS_CASE(["${target_cpu}-${target_os}:${target_archs}"],
-[powerpc-darwin*], [
-  AC_LIBSOURCES(alloca.c)
-  AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
-  AC_DEFINE(C_ALLOCA)
-  AC_DEFINE_UNQUOTED(alloca, alloca)
-  ],
-[universal-darwin*:*ppc*], [
-  AC_LIBSOURCES(alloca.c)
-  AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
-  RUBY_DEFINE_IF([defined __powerpc__], C_ALLOCA, 1)
-  RUBY_DEFINE_IF([defined __powerpc__], alloca, alloca)
-  ],
-[
-  AC_FUNC_ALLOCA
-  ])
-if test "x$ALLOCA" = "x"; then
-    AC_CACHE_CHECK([for dynamic size alloca], rb_cv_dynamic_alloca, [
-    for chk in ok __chkstk; do
-	AC_TRY_LINK([
-	    @%:@ifdef HAVE_ALLOCA_H
-	    @%:@include <alloca.h>
-	    @%:@endif
-	    void $chk() {}
-	    int dynamic_alloca_test;
-	    int dynamic_alloca_result;],
-	    [dynamic_alloca_result = alloca(dynamic_alloca_test) != 0;],
-	    [rb_cv_dynamic_alloca=$chk; break])
-    done])
-    if test "x$rb_cv_dynamic_alloca" = "x__chkstk"; then
-	AC_DEFINE_UNQUOTED(RUBY_ALLOCA_CHKSTK, _$rb_cv_dynamic_alloca)
-	AS_CASE("$target_cpu",
-	[x64|x86_64], [
-	    AC_SUBST([ALLOCA], [\${LIBOBJDIR}x86_64-chkstk.${ac_objext}])
-	],)
-    fi
-fi
-AC_FUNC_MEMCMP
-
-# http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
-# Debian GNU/Linux Etch's libc6.1 2.3.6.ds1-13etch5 has this problem.
-# Debian GNU/Linux Lenny's libc6.1 2.7-10 has no problem.
-AC_CACHE_CHECK(for broken erfc of glibc-2.3.6 on IA64, rb_cv_broken_glibc_ia64_erfc,
-  [AC_TRY_RUN([
-#include <math.h>
-int
-main()
-{
-   erfc(10000.0);
-   return 0;
-}
-],
-	rb_cv_broken_glibc_ia64_erfc=no,
-	rb_cv_broken_glibc_ia64_erfc=yes,
-	rb_cv_broken_glibc_ia64_erfc=no)])
-AS_CASE([$rb_cv_broken_glibc_ia64_erfc],[yes],[ac_cv_func_erf=no])
-
-AS_CASE(["$target_os"],[freebsd*],[
-	 AC_DEFINE(BROKEN_CLOSE)
-	 AC_REPLACE_FUNCS(close)
-	 ])
-AC_REPLACE_FUNCS(dup2 memmove strerror\
-		 strchr strstr crypt flock\
-		 isnan finite isinf hypot acosh erf tgamma lgamma_r cbrt \
-                 strlcpy strlcat ffs setproctitle)
-
-# for missing/setproctitle.c
-AS_CASE(["$target_os"],
-[aix* | k*bsd*-gnu | kopensolaris*-gnu | linux*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)],
-[hpux*], [AC_DEFINE(SPT_TYPE,SPT_PSTAT) ],
-[])
-
-
-AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,
-  [AC_TRY_LINK([
-#include <math.h>
-], [int v = signbit(-0.0);],
-	rb_cv_have_signbit=yes,
-	rb_cv_have_signbit=no)])
-if test "$rb_cv_have_signbit" = yes; then
-  AC_DEFINE(HAVE_SIGNBIT)
-else
-  AC_LIBOBJ([signbit])
-fi
-AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall __syscall chroot getcwd eaccess\
-	      truncate ftruncate ftello chsize times utimes utimensat fcntl lockf lstat\
-	      truncate64 ftruncate64 ftello64 fseeko fseeko64 \
-	      link symlink readlink readdir_r fsync fdatasync fchown posix_fadvise\
-	      setitimer setruid seteuid setreuid setresuid setproctitle socketpair\
-	      setrgid setegid setregid setresgid issetugid pause lchown lchmod\
-	      getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\
-	      getpriority getrlimit setrlimit sysconf close getgrnam_r\
-	      dlopen sigprocmask sigaction sigsetjmp _setjmp _longjmp\
-	      setsid telldir seekdir fchmod cosh sinh tanh log2 round\
-	      setuid setgid daemon select_large_fdset setenv unsetenv\
-              mktime timegm gmtime_r clock_gettime gettimeofday poll ppoll\
-              pread sendfile shutdown sigaltstack dl_iterate_phdr)
-
-AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value,
-  [AC_TRY_COMPILE([
-#include <stdlib.h>
-], [int v = unsetenv("foo");],
-	rb_cv_unsetenv_return_value=yes,
-	rb_cv_unsetenv_return_value=no)])
-if test "$rb_cv_unsetenv_return_value" = no; then
-  AC_DEFINE(VOID_UNSETENV)
-fi
-
-AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
-[AC_TRY_LINK([@%:@include <setjmp.h>
-    jmp_buf jb; void t(v) int v; {__builtin_longjmp(jb, v);}],
-    [__builtin_setjmp(jb);],
-    [ac_cv_func___builtin_setjmp=yes],
-    [ac_cv_func___builtin_setjmp=no])
-])
-
-test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
-
-AC_MSG_CHECKING(for setjmp type)
-AC_ARG_WITH(setjmp-type,
-	AS_HELP_STRING([--with-setjmp-type], [select setjmp type]),
-	[
-	AS_CASE([$withval],
-	[__builtin_setjmp], [ setjmp_prefix=__builtin_],
-	[_setjmp], [ setjmp_prefix=_],
-	[sigsetjmp], [ setjmp_prefix=sig],
-	[setjmp], [ setjmp_prefix=],
-	[''], [ unset setjmp_prefix],
-	[   AC_MSG_ERROR(invalid setjmp type: $withval)])], [unset setjmp_prefix])
-if test ${setjmp_prefix+set}; then
-    if test "${setjmp_prefix}" && eval test '$ac_cv_func_'${setjmp_prefix}setjmp = no; then
-	AC_MSG_ERROR(${setjmp_prefix}setjmp is not available)
-    fi
-elif test "$ac_cv_func___builtin_setjmp" = yes; then
-    setjmp_prefix=__builtin_
-elif test "$ac_cv_func__setjmp" = yes; then
-    setjmp_prefix=_
-elif test "$ac_cv_func_sigsetjmp" = yes; then
-    AS_CASE([$target_os],[solaris*|cygwin*],[setjmp_prefix=],[setjmp_prefix=sig])
-else
-    setjmp_prefix=
-fi
-if test x$setjmp_prefix = xsig; then
-    setjmp_sigmask=yes
-else
-    unset setjmp_sigmask
-fi
-AC_MSG_RESULT(${setjmp_prefix}setjmp)
-AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp(env${setjmp_sigmask+,0})])
-AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp(env,val)])
-AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)
-
-AC_ARG_ENABLE(setreuid,
-       AS_HELP_STRING([--enable-setreuid], [use setreuid()/setregid() according to need even if obsolete]),
-       [use_setreuid=$enableval])
-if test "$use_setreuid" = yes; then
-    AC_DEFINE(USE_SETREUID)
-    AC_DEFINE(USE_SETREGID)
-fi
-AC_STRUCT_TIMEZONE
-AC_CACHE_CHECK(for struct tm.tm_gmtoff, rb_cv_member_struct_tm_tm_gmtoff,
-  [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])])
-if test "$rb_cv_member_struct_tm_tm_gmtoff" = yes; then
-  AC_DEFINE(HAVE_STRUCT_TM_TM_GMTOFF)
-fi
-AC_CACHE_CHECK(for external int daylight, rb_cv_have_daylight,
-  [AC_TRY_LINK([#include <time.h>
-  int i;],
-	[i = daylight;],
-	rb_cv_have_daylight=yes,
-	rb_cv_have_daylight=no)])
-if test "$rb_cv_have_daylight" = yes; then
-  AC_DEFINE(HAVE_DAYLIGHT)
-fi
-AC_DEFUN([RUBY_CHECK_VARTYPE], [dnl
-AC_CACHE_CHECK([for external $1], AS_TR_SH(rb_cv_var_$1),
-  [AS_TR_SH(rb_cv_var_$1)=no
-  AC_TRY_COMPILE([
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 1
-#endif
-$2
-;
-const volatile void *volatile t;],
-    [t = &(&$1)[0];],
-    [for t in $3; do
-      AC_TRY_COMPILE([
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 1
-#endif
-$2
-;
-extern $t $1;
-const volatile void *volatile t;],
-        [t = &(&$1)[0];],
-        [AS_TR_SH(rb_cv_var_$1)=$t; break])
-    done])])
-if test "${AS_TR_SH(rb_cv_var_$1)}" != no; then
-  AC_DEFINE(AS_TR_CPP(HAVE_VAR_$1))
-  AC_DEFINE_UNQUOTED(AS_TR_CPP(TYPEOF_VAR_$1), ${AS_TR_SH(rb_cv_var_$1)})
-fi])
-RUBY_CHECK_VARTYPE(timezone, [@%:@include <time.h>], [long int])
-RUBY_CHECK_VARTYPE(altzone, [@%:@include <time.h>], [long int])
-AC_CHECK_FUNCS(timezone)
-if test "$ac_cv_func_timezone" = yes; then
-  AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
-    [AC_TRY_COMPILE([@%:@include <time.h>],
-      [(void)timezone(0, 0);],
-      [rb_cv_func_timezone_void=no],
-      [rb_cv_func_timezone_void=yes])]
-  )
-  if test $rb_cv_func_timezone_void = yes; then
-    AC_DEFINE(TIMEZONE_VOID)
-  fi
-fi
-
-AC_CACHE_CHECK(for negative time_t for gmtime(3), rb_cv_negative_time_t,
-  [AC_TRY_RUN([
-#include <stdlib.h>
-#include <time.h>
-
-void
-check(tm, y, m, d, h, s)
-    struct tm *tm;
-    int y, m, d, h, s;
-{
-    if (!tm ||
-	tm->tm_year != y ||
-	tm->tm_mon  != m-1 ||
-	tm->tm_mday != d ||
-	tm->tm_hour != h ||
-	tm->tm_sec  != s) {
-	exit(1);
-    }
-}
-
-int
-main()
-{
-   time_t t = -1;
-   struct tm *tm;
-
-   check(gmtime(&t), 69, 12, 31, 23, 59);
-   t = ~(time_t)0 << 31;
-   check(gmtime(&t), 1, 12, 13, 20, 52);
-   return 0;
-}
-],
-	rb_cv_negative_time_t=yes,
-	rb_cv_negative_time_t=no,
-	rb_cv_negative_time_t=yes)])
-if test "$rb_cv_negative_time_t" = yes; then
-  AC_DEFINE(NEGATIVE_TIME_T)
-fi
-
-# [ruby-dev:40910] overflow of time on FreeBSD
-# http://www.freebsd.org/cgi/query-pr.cgi?pr=145341
-AC_CACHE_CHECK(for localtime(3) overflow correctly, rb_cv_localtime_overflow,
-  [AC_TRY_RUN([
-#include <stdlib.h>
-#include <time.h>
-
-void
-check(time_t t1)
-{
-    struct tm *tm;
-    time_t t2;
-    tm = localtime(&t1);
-    if (!tm)
-	return; /* overflow detected.  ok. */
-    t2 = mktime(tm);
-    if (t1 == t2)
-        return; /* round-trip.  ok. */
-    exit(1);
-}
-
-int
-main()
-{
-    time_t t;
-    if (~(time_t)0 <= 0) {
-        t = (((time_t)1) << (sizeof(time_t) * 8 - 2));
-        t |= t - 1;
-    }
-    else {
-        t = ~(time_t)0;
-    }
-    check(t);
-    return 0;
-}
-],
-	rb_cv_localtime_overflow=yes,
-	rb_cv_localtime_overflow=no,
-	rb_cv_localtime_overflow=yes)])
-if test "$rb_cv_localtime_overflow" = no; then
-  AC_DEFINE(LOCALTIME_OVERFLOW_PROBLEM)
-fi
-
-if test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes; then
-   AC_DEFINE(POSIX_SIGNAL)
-else
-  AC_CHECK_FUNCS(sigsetmask)
-  AC_CACHE_CHECK(for BSD signal semantics, rb_cv_bsd_signal,
-    [AC_TRY_RUN([
-#include <stdio.h>
-#include <signal.h>
-
-void
-sig_handler(dummy)
-     int dummy;
-{
-}
-
-int
-main()
-{
-  signal(SIGINT, sig_handler);
-  kill(getpid(), SIGINT);
-  kill(getpid(), SIGINT);
-  return 0;
-}
-],
-	rb_cv_bsd_signal=yes,
-	rb_cv_bsd_signal=no,
-	rb_cv_bsd_signal=$ac_cv_func_sigsetmask)])
-  if test "$rb_cv_bsd_signal" = yes; then
-    AC_DEFINE(BSD_SIGNAL)
-  fi
-fi
-
-if test "$ac_cv_func_getpgid" = no; then
-AC_FUNC_GETPGRP
-fi
-if test "$ac_cv_func_setpgid:$ac_cv_func_setpgrp" = no:yes; then
-AC_FUNC_SETPGRP
-fi
-
-if test x"$target_cpu" = xia64; then
-    AC_LIBOBJ([ia64])
-    AC_CACHE_CHECK(for __libc_ia64_register_backing_store_base,
-                   rb_cv___libc_ia64_register_backing_store_base,
-    [rb_cv___libc_ia64_register_backing_store_base=no
-    AC_TRY_LINK(
-      [extern unsigned long __libc_ia64_register_backing_store_base;],
-      [unsigned long p = __libc_ia64_register_backing_store_base;
-       printf("%ld\n", p);],
-      [rb_cv___libc_ia64_register_backing_store_base=yes])])
-    if test $rb_cv___libc_ia64_register_backing_store_base = yes; then
-      AC_DEFINE(HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE)
-    fi
-fi
-
-AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
-    [AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([], [(-1==(-1>>1))])],
-	rb_cv_rshift_sign=yes,
-	rb_cv_rshift_sign=no)])
-if test "$rb_cv_rshift_sign" = yes; then
-  AC_DEFINE(RSHIFT(x,y), ((x)>>(int)(y)))
-else
-  AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>(int)(y)) : (x)>>(int)(y)))
-fi
-
-test "$rb_cv_fcnt" = "not found" && rb_cv_fcnt="not found (OK if using GNU libc)"
-AC_CACHE_CHECK([read count field in FILE structures], rb_cv_fcnt,
-[rb_cv_fcnt="not found (OK if using GNU libc)"
-for fcnt in	dnl
-     _cnt	dnl
-     __cnt	dnl
-     _r		dnl
-     readCount	dnl
-     _rcount	dnl for emx0.9c
-; do
-    AC_TRY_COMPILE([#include <stdio.h>
-],
-	[FILE *f = stdin; f->$fcnt = 0;],
-	[rb_cv_fcnt="$fcnt"; break])
-done])
-AS_CASE("$rb_cv_fcnt",
-	["not found"*], [rb_cv_fcnt="not found"],
- 	[AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt)])
-
-AC_CACHE_CHECK([read buffer ptr field in FILE structures], rb_cv_frptr,
-[for frptr in	dnl
-     _IO_read_ptr dnl
-     _ptr	dnl
-     __ptr	dnl
-     bufpos	dnl
-     _p	dnl
-     __bufpos	dnl
-; do
-    AC_TRY_COMPILE([#include <stdio.h>
-],
-	[FILE *f = stdin; char buf[256]; f->$frptr = buf;],
-	rb_cv_frptr="$frptr"; break,
-	rb_cv_frptr="not found")
-done])
-if test "$rb_cv_frptr" != "not found"; then
-  AC_DEFINE_UNQUOTED(FILE_READPTR, $rb_cv_frptr)
-
-  if test "$rb_cv_fcnt" = "not found"; then
-    AC_CACHE_CHECK([read buffer end field in FILE structures], rb_cv_frend,
-    [for frend in	dnl
-         _IO_read_end	dnl
-         bufread 	dnl
-         __bufread 	dnl
-    ; do
-        AC_TRY_COMPILE([#include <stdio.h>
-    ],
-	[FILE *f = stdin; char buf[256]; f->$frend = buf;],
-	rb_cv_frend="$frend"; break,
-	rb_cv_frend="not found")
-    done])
-    if test "$rb_cv_frend" != "not found"; then
-      AC_DEFINE_UNQUOTED(FILE_READEND, $rb_cv_frend)
-    fi
-  fi
-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),
-    [AC_TRY_COMPILE([#include <unistd.h>
-      ],
-      [_SC_$1 >= 0],
-      rb_cv_have_sc_[]m4_tolower($1)=yes,
-      rb_cv_have_sc_[]m4_tolower($1)=no)
-    ])
-  if test "$rb_cv_have_sc_[]m4_tolower($1)" = yes; then
-    AC_DEFINE(HAVE__SC_$1)
-  fi
-  ])
-  RUBY_CHECK_SYSCONF(CLK_TCK)
-fi
-
-AC_DEFUN(RUBY_STACK_GROW_DIRECTION, [
-    AC_CACHE_CHECK(stack growing direction on $1, rb_cv_stack_grow_dir_$1, [
-AS_CASE(["$1"],
-[m68*|x86*|x64|i?86|ia64|ppc*|sparc*|alpha*], [ $2=-1],
-[hppa*], [ $2=+1],
-[
-  AC_TRY_RUN([
-/* recurse to get rid of inlining */
-static int
-stack_growup_p(addr, n)
-    volatile int *addr, n;
-{
-    volatile int end;
-    if (n > 0)
-	return *addr = stack_growup_p(addr, n - 1);
-    else
-	return (&end > addr);
-}
-int main()
-{
-    int x;
-    return stack_growup_p(&x, 10);
-}
-], $2=-1, $2=+1, $2=0)
-  ])
-eval rb_cv_stack_grow_dir_$1=\$$2])
-eval $2=\$rb_cv_stack_grow_dir_$1])
-if test "${universal_binary-no}" = yes ; then
-    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
-    save_CFLAGS="$CFLAGS" new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
-    save_LDFLAGS="$LDFLAGS" new_ldflags=`echo "$LDFLAGS" | sed "s|$archflagpat"'||'`
-    stack_dir=
-    for archs in ${universal_archnames}; do
-	archs=`echo $archs | sed 's/=.*//'`
-	CFLAGS="$new_cflags -arch $archs"
-	LDFLAGS="$new_ldflags -arch $archs"
-	RUBY_STACK_GROW_DIRECTION($archs, dir)
-	if test x$stack_dir = x; then
-	    stack_dir=$dir
-	elif test x$stack_dir != x$dir; then
-	    stack_dir=no
-	fi
-    done
-    CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS"
-    if test x$stack_dir = xno; then
-	for archs in ${universal_archnames}; do
-	    archs=`echo $archs | sed 's/=.*//'`
-	    eval dir=\$rb_cv_stack_grow_dir_$archs
-	    RUBY_DEFINE_IF([defined __${archs}__], STACK_GROW_DIRECTION, $dir)
-	done
-    else
-	AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $stack_dir)
-    fi
-else
-    RUBY_STACK_GROW_DIRECTION($target_cpu, dir)
-    AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $dir)
-fi
-
-if test x"$enable_pthread" = xyes; then
-    for pthread_lib in thr pthread pthreads c c_r root; do
-	AC_CHECK_LIB($pthread_lib, pthread_kill,
-		     rb_with_pthread=yes, rb_with_pthread=no)
-	if test "$rb_with_pthread" = "yes"; then break; fi
-    done
-    if test x"$rb_with_pthread" = xyes; then
-	AC_DEFINE(_REENTRANT)
-	AC_DEFINE(_THREAD_SAFE)
-	AC_DEFINE(HAVE_LIBPTHREAD)
-	AC_CHECK_HEADERS(pthread_np.h)
-	AS_CASE([$pthread_lib],
-	[c],    [],
-	[root], [],
-	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
-	        [LIBS="-l$pthread_lib $LIBS"])
-    else
-	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
-    fi
-    AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \
-	pthread_getattr_np pthread_attr_get_np pthread_attr_getstack\
-	pthread_get_stackaddr_np pthread_get_stacksize_np \
-	thr_stksegment pthread_stackseg_np pthread_getthrds_np \
-	pthread_condattr_setclock pthread_sigmask)
-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
-fi
-
-if test "$ac_cv_func_fork" = "yes" -a "$rb_with_pthread" = "yes"; then
-    AC_CACHE_CHECK([if fork works with pthread], rb_cv_fork_with_pthread,
-	[AC_TRY_RUN([
-#include <stdlib.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-
-void *
-thread_func(void *dmy)
-{
-    return dmy;
-}
-
-int
-use_threads(void)
-{
-    pthread_t tid;
-    if (pthread_create(&tid, 0, thread_func, 0) != 0) {
-	return -1;
-    }
-    if (pthread_join(tid, 0) != 0) {
-	return -1;
-    }
-    return 0;
-}
-
-int
-main(int argc, char *argv[])
-{
-    pid_t pid;
-    if (use_threads()) return EXIT_FAILURE;
-    pid = fork();
-
-    if (pid) {
-	int loc;
-	sleep(1);
-	if (waitpid(pid, &loc, WNOHANG) == 0) {
-	    kill(pid, SIGKILL);
-	    return EXIT_FAILURE;
-	}
-        if (!WIFEXITED(loc) || WEXITSTATUS(loc) != EXIT_SUCCESS)
-           return EXIT_FAILURE;
-    }
-    else {
-	if (use_threads()) return EXIT_FAILURE;
-    }
-
-    return EXIT_SUCCESS;
-}],
-	rb_cv_fork_with_pthread=yes,
-	rb_cv_fork_with_pthread=no,
-	rb_cv_fork_with_pthread=yes)])
-    test x$rb_cv_fork_with_pthread = xyes || AC_DEFINE(CANNOT_FORK_WITH_PTHREAD)
-fi
-
-AS_CASE(["$target_os"],
-[freebsd*], [
-    AC_CHECK_HEADERS([/usr/local/include/execinfo.h])
-    if test "x$ac_cv_header__usr_local_include_execinfo_h" = xyes; then :
-	RUBY_APPEND_OPTION(CPPFLAGS, -I/usr/local/include)
-	LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
-	DLDFLAGS="${DLDFLAGS:+$DLDFLAGS }-L/usr/local/lib"
-	AC_CHECK_LIB([execinfo], [backtrace])
-    fi])
-AC_CHECK_FUNCS(backtrace)
-
-AC_ARG_WITH(valgrind,
-        AS_HELP_STRING([--without-valgrind],[disable valgrind memcheck support]),
-        [], with_valgrind=yes)
-AS_IF([test x$with_valgrind != xno],
-        [AC_CHECK_HEADERS(valgrind/memcheck.h)])
-
-dnl }
-dnl runtime section {
-
-dnl wheather use dln_a_out or not
-AC_ARG_WITH(dln-a-out,
-	AS_HELP_STRING([--with-dln-a-out], [use dln_a_out if possible]),
-	[
-	AS_CASE([$withval],
-	[yes], [
-	    if test "$enable_shared" = yes; then
-		AC_MSG_ERROR(dln_a_out can not make shared library)
-	    fi
-	    with_dln_a_out=yes],
-	[
-	    with_dln_a_out=no])], [with_dln_a_out=no])
-
-AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
-[AC_TRY_LINK([],[], [
-AS_CASE(["`head -1 conftest$EXEEXT | cat -e`"],
-['^?ELF'*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
-rb_cv_binary_elf=no)])
-
-if test "$rb_cv_binary_elf" = yes; then
-  AC_DEFINE(USE_ELF)
-  if test "$with_dln_a_out" = yes; then
-    AC_MSG_ERROR(dln_a_out does not work with ELF)
-  fi
-  AC_LIBOBJ([addr2line])
-fi
-
-AS_CASE(["$target_os"],
-[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu], [
-    if test "$rb_cv_binary_elf" = no; then
-	with_dln_a_out=yes
-    else
-	LDFLAGS="$LDFLAGS -rdynamic"
-    fi])
-LIBEXT=a
-
-AC_SUBST(DLDFLAGS)dnl
-AC_SUBST(ARCH_FLAG)dnl
-
-AC_SUBST(STATIC)dnl
-AC_SUBST(CCDLFLAGS)dnl
-AC_SUBST(LDSHARED)dnl
-AC_SUBST(LDSHAREDXX)dnl
-AC_SUBST(DLEXT)dnl
-AC_SUBST(DLEXT2)dnl
-AC_SUBST(LIBEXT)dnl
-
-STATIC=
-: ${PATHFLAG=''}
-
-if test "$with_dln_a_out" != yes; then
-  rb_cv_dlopen=unknown
-  AC_MSG_CHECKING(whether OS depend dynamic link works)
-  if test "$GCC" = yes; then
-    AS_CASE(["$target_os"],
-    [nextstep*|openstep*|rhapsody*|darwin*], [
-      # The -fno-common is needed if we wish to embed the Ruby interpreter
-      # into a plugin module of some project (as opposed to embedding it
-      # within the project's application).  The -I/usr/local/include is
-      # needed because CPP as discovered by configure (cc -E -traditional)
-      # fails to consult /usr/local/include by default.  This causes
-      # mkmf.rb's have_header() to fail if the desired resource happens to be
-      # installed in the /usr/local tree.
-      RUBY_APPEND_OPTION(CCDLFLAGS, -fno-common)],
-    [human*|bsdi*|beos*|haiku*|cygwin*|mingw*|aix*|interix*], [ ],
-    [
-      RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC)])
-  else
-    AS_CASE(["$target_os"],
-	[hpux*],          [CCDLFLAGS="$CCDLFLAGS +Z"],
-	[solaris*|irix*], [CCDLFLAGS="$CCDLFLAGS -KPIC"],
-	[sunos*],         [CCDLFLAGS="$CCDLFLAGS -PIC"],
-	[esix*|uxpds*],   [CCDLFLAGS="$CCDLFLAGS -KPIC"],
-	                  [: ${CCDLFLAGS=""}])
-  fi
-
-
-  AC_ARG_ENABLE(rpath,
-       AS_HELP_STRING([--disable-rpath], [embed run path into extension libraries]),
-       [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
-  if test "$enable_rpath" = yes; then
-    RPATHFLAG=" ${linker_flag}-R%1\$-s"
-  fi
-
-  AS_CASE(["$target_os"],
-	[hpux*], [	DLDFLAGS="$DLDFLAGS -E"
-			: ${LDSHARED='ld -b'}
-			XLDFLAGS="$XLDFLAGS -Wl,-E"
-			: ${LIBPATHENV=SHLIB_PATH}
-			if test "$rb_cv_prog_gnu_ld" = no; then
-			    RPATHFLAG=' +b %1$-s'
-			fi
-			rb_cv_dlopen=yes],
-	[solaris*], [ 	if test "$GCC" = yes; then
-			    : ${LDSHARED='$(CC) -shared'}
-			    if test "$rb_cv_prog_gnu_ld" = yes; then
-				LDFLAGS="$LDFLAGS -Wl,-E"
-			    fi
-			else
-			    : ${LDSHARED='$(CC) -G'}
-			fi
-			if test "$ac_cv_sizeof_voidp" = 8; then
-			    : ${LIBPATHENV=LD_LIBRARY_PATH_64}
-			fi
-			rb_cv_dlopen=yes],
-	[sunos*], [	: ${LDSHARED='ld -assert nodefinitions'}
-			rb_cv_dlopen=yes],
-	[irix*], [	: ${LDSHARED='ld -shared'}
-			rb_cv_dlopen=yes],
-	[sysv4*], [	: ${LDSHARED='ld -G'}
-			rb_cv_dlopen=yes],
-	[nto-qnx*], [	: ${LDSHARED='$(CC) -shared'}
-			rb_cv_dlopen=yes],
-	[esix*|uxpds*], [ : ${LDSHARED="ld -G"}
-			rb_cv_dlopen=yes],
-	[osf*], [	: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
-			rb_cv_dlopen=yes],
-	[bsdi3*], [	AS_CASE(["$CC"],
-			[*shlicc*], [	: ${LDSHARED='$(CC) -r'}
-					rb_cv_dlopen=yes])],
-	[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [
-			: ${LDSHARED='$(CC) -shared'}
-			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
-			fi
-			rb_cv_dlopen=yes],
-	[interix*], [	: ${LDSHARED='$(CC) -shared'}
-			XLDFLAGS="$XLDFLAGS -Wl,-E"
-			LIBPATHFLAG=" -L%1\$-s"
-			rb_cv_dlopen=yes],
-	[freebsd*|dragonfly*], [
-			: ${LDSHARED='$(CC) -shared'}
-			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -rdynamic"
-			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
-			else
-			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
-			fi
-			rb_cv_dlopen=yes],
-	[openbsd*], [	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
-			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -Wl,-E"
-			fi
-			rb_cv_dlopen=yes],
-	[nextstep*], [	: ${LDSHARED='$(CC) -r -nostdlib'}
-			LDFLAGS="$LDFLAGS -u libsys_s"
-			rb_cv_dlopen=yes],
-	[openstep*], [	: ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'}
-			: ${LDFLAGS=""}
-			rb_cv_dlopen=yes],
-	[rhapsody*], [	: ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'}
-			: ${LDFLAGS=""}
-			rb_cv_dlopen=yes],
-	[darwin*], [	: ${LDSHARED='$(CC) -dynamic -bundle'}
-			: ${DLDFLAGS="${linker_flag}-undefined${linker_flag:+,}dynamic_lookup ${linker_flag}-multiply_defined${linker_flag:+,}suppress ${linker_flag}-flat_namespace"}
-			: ${LDFLAGS=""}
-			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
-			# /usr/local/include is always searched for
-			# some reason, but /usr/local/lib is not.
-			hdr=`find /usr/local/include -name \*.h -type f | sed 's:^/usr/local/include/::;q'`
-			if test -n "$hdr" && $CC -E -include "$hdr" -xc /dev/null | fgrep -q "$hdr"; then
-			    $CC -print-search-dirs | grep -q '^libraries:.*:/usr/local/lib/*' ||
-			    echo " $LDFLAGS " | grep -q ' -L */usr/local/lib/* ' ||
-			    LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
-			fi
-			rb_cv_dlopen=yes],
-        [aix*], [	: ${LDSHARED='$(CC)'}
-			LDSHARED="$LDSHARED ${linker_flag}-G"
-			DLDFLAGS='-eInit_$(TARGET)'
-			XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
-			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
-			: ${ARCHFILE="ruby.imp"}
-                        TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
-                        TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
-			: ${LIBPATHENV=SHLIB_PATH}
-			RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
-			rb_cv_dlopen=yes],
-	[human*], [	: ${DLDFLAGS=''}
-			: ${LDSHARED=''}
-			: ${LDFLAGS=''}
-			: ${LINK_SO='ar cru $@ $(OBJS)'}
-			rb_cv_dlopen=yes],
-	[beos*], [	AS_CASE(["$target_cpu"],
-			  [powerpc*], [
-			    : ${LDSHARED="ld -xms"}
-			    DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
-			    LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot"
-			    ],
-			  [i586*], [
-			    : ${LDSHARED="ld -shared"}
-			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib \$(topdir)/_APP_ -lbe -lroot"
-			    LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lbe -lroot"
-			    ])
-			: ${LIBPATHENV=LIBRARY_PATH}
-			rb_cv_dlopen=yes],
-	[haiku*], [	AS_CASE(["$target_cpu"],
-			  [powerpc*], [
-			    : ${LDSHARED="ld -xms"}
-			    DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
-                            ],
-			  [i586*], [
-			    : ${LDSHARED="ld -shared"}
-			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
-			    ])
-			: ${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"
-			rb_cv_dlopen=yes],
-	[cygwin*|mingw*], [
-			: ${LDSHARED='$(CC) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)'}
-			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import"
-			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
-			: ${LIBPATHENV=""}
-			rb_cv_dlopen=yes],
-	[hiuxmpp], [	: ${LDSHARED='ld -r'}],
-	[atheos*], [	: ${LDSHARED='$(CC) -shared'}
-			rb_cv_dlopen=yes],
-	[os2-emx*], [	LDFLAGS="$LDFLAGS -Zomf"
-			],
-	[ 	: ${LDSHARED='ld'}])
-  AC_MSG_RESULT($rb_cv_dlopen)
-fi
-if test "${LDSHAREDXX}" = ""; then
-    AS_CASE(["${LDSHARED}"],
-	[*'$(CC)'*], [
-	    LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\$(CC)/$(CXX)/'`
-	    ],
-	[*'${CC}'*], [
-	    LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\${CC}/${CXX}/'`
-	    ],
-	[*$CC*], [
-	    LDSHAREDXX=`echo "${LDSHARED}" | sed "s|$CC|$CXX|"`
-	    ],
-	[ld" "*], [
-	    ])
-fi
-AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}])
-
-AC_SUBST(LINK_SO)
-AC_SUBST(LIBPATHFLAG)
-AC_SUBST(RPATHFLAG)
-AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}")
-AC_SUBST(TRY_LINK)
-
-dln_a_out_works=no
-if test "$ac_cv_header_a_out_h" = yes; then
-  if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then
-    cat confdefs.h > config.h
-    AC_CACHE_CHECK(whether matz's dln works, rb_cv_dln_a_out,
-    [AC_TRY_COMPILE([
-#define USE_DLN_A_OUT
-#include "dln.c"
-],
-	[],
-	rb_cv_dln_a_out=yes,
-	rb_cv_dln_a_out=no)])
-    if test "$rb_cv_dln_a_out" = yes; then
-      dln_a_out_works=yes
-      AC_DEFINE(USE_DLN_A_OUT)
-    fi
-  fi
-fi
-
-if test "$dln_a_out_works" = yes; then
-  if test "$GCC" = yes; then
-    STATIC=-static
-  else
-    STATIC=-Bstatic
-  fi
-  DLEXT=so
-  CCDLFLAGS=
-else
-  AS_CASE(["$target_os"],
-    [hpux*], [
-	DLEXT=sl],
-    [nextstep*|openstep*|rhapsody*|darwin*], [
-	RUBY_APPEND_OPTION(XLDFLAGS, [-Wl,-u,_objc_msgSend])
-	DLEXT=bundle],
-    [os2-emx*], [
-	LOAD_RELATIVE=1
-	DLEXT=dll],
-    [cygwin*|mingw*|*djgpp*], [
-	LOAD_RELATIVE=1
-	DLEXT=so],
-    [
-	DLEXT=so])
-fi
-if test "$rb_cv_dlopen:$load_relative" = yes:yes; then
-    AC_CHECK_FUNCS(dladdr)
-    if test "$ac_cv_func_dladdr" = yes; then
-	LOAD_RELATIVE=1
-    else
-	unset load_relative
-    fi
-fi
-
-len=2 # .rb
-n=`expr "$DLEXT"  : '.*'`; test "$n" -gt "$len" && len=$n
-n=`expr "$DLEXT2" : '.*'`; test "$n" -gt "$len" && len=$n
-AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`)
-test ".$DLEXT"  = "." || AC_DEFINE_UNQUOTED(DLEXT,  ".$DLEXT")
-test ".$DLEXT2" = "." || AC_DEFINE_UNQUOTED(DLEXT2, ".$DLEXT2")
-AC_SUBST(DLEXT)
-
-if test "$with_dln_a_out" = yes; then
-  STRIP=true
-else
-  AC_CHECK_TOOL(STRIP, strip, :)dnl
-fi
-
-AS_CASE(["$target_os"],
-  [linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu], [
-	STRIP="$STRIP -S -x"],
-  [nextstep* | openstep* | rhapsody* | darwin*], [
-	STRIP="$STRIP -A -n"])
-
-AC_ARG_WITH(ext,
-            AC_HELP_STRING([--with-ext=EXTS],
-                           [pass to --with-ext option of extmk.rb]))
-AC_ARG_WITH(out-ext,
-            AC_HELP_STRING([--with-out-ext=EXTS],
-                           [pass to --without-ext option of extmk.rb]))
-EXTSTATIC=
-AC_SUBST(EXTSTATIC)dnl
-AC_ARG_WITH(static-linked-ext,
-	    AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
-            [AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static])])
-
-AS_CASE(["$target_os"],
-  [human*], [
-    setup=Setup.x68
-    ],
-  dnl OS/2 environment w/ Autoconf 2.1x for EMX
-  [os2-emx], [
-    setup=Setup.emx
-    ],
-  [*djgpp*], [
-    setup=Setup.dj
-    ],
-  [
-    setup=Setup
-    ])
-
-AC_SUBST(setup)
-
-if test "$prefix" = NONE; then
-  prefix=$ac_default_prefix
-fi
-
-if test x"$cross_compiling" = xyes; then
-  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I`pwd` "-r'$(arch)-fake'
-  XRUBY_LIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["libdir"]']`
-  XRUBY_RUBYLIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubylibdir"]']`
-  XRUBY_RUBYHDRDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubyhdrdir"]']`
-  AC_SUBST(XRUBY_LIBDIR)
-  AC_SUBST(XRUBY_RUBYLIBDIR)
-  AC_SUBST(XRUBY_RUBYHDRDIR)
-  PREP='$(arch)-fake.rb'
-  RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
-  XRUBY='$(MINIRUBY)'
-  TEST_RUNNABLE=no
-else
-  MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.'
-  MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common'
-  PREP='miniruby$(EXEEXT)'
-  RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)'
-  XRUBY='$(RUNRUBY)'
-  TEST_RUNNABLE=yes
-fi
-AC_SUBST(TEST_RUNNABLE)
-AC_SUBST(MINIRUBY)
-AC_SUBST(PREP)
-AC_SUBST(RUNRUBY)
-AC_SUBST(XRUBY)
-AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
-
-FIRSTMAKEFILE=""
-LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
-LIBRUBY='$(LIBRUBY_A)'
-LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'
-LIBRUBYARG='$(LIBRUBYARG_STATIC)'
-SOLIBS=
-
-AS_CASE(["$target_os"],
-  [cygwin*|mingw*|beos*|haiku*|openstep*|nextstep*|rhapsody*|darwin*|os2-emx*], [
-    : ${DLDLIBS=""}
-    ],
-  [
-    DLDLIBS="$DLDLIBS -lc"
-    ])
-
-AC_ARG_WITH(soname,
-	AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]),
-	[RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
-
-LIBRUBY_LDSHARED=$LDSHARED
-LIBRUBY_DLDFLAGS=$DLDFLAGS
-LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
-LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so'
-ENABLE_SHARED=no
-
-AC_ARG_ENABLE(shared,
-       AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]),
-       [enable_shared=$enableval])
-libprefix='$(libdir)'
-LIBRUBY_RELATIVE=no
-AS_CASE("$enable_shared", [yes], [
-  LIBRUBY='$(LIBRUBY_SO)'
-  LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
-  LIBRUBYARG='$(LIBRUBYARG_SHARED)'
-  test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS"
-  ENABLE_SHARED=yes
-  if test "$rb_cv_binary_elf" = yes; then
-    SOLIBS='$(LIBS)'
-  fi
-  AS_CASE(["$target_os"],
-    [sunos4*], [
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
-	],
-    [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu], [
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
-	if test "$load_relative" = yes; then
-	    LIBRUBY_RPATHFLAGS="'-Wl,-rpath,\$\${ORIGIN}/../lib'"
-	    LIBRUBY_RELATIVE=yes
-	fi
-	],
-    [freebsd*|dragonfly*], [
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
-	if test "$rb_cv_binary_elf" != "yes" ; then
-	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
-	    LIBRUBY_ALIASES=''
-	fi
-	],
-    [netbsd*], [
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
-	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
-	   LIBRUBY_ALIASES=""
-	fi
-	],
-    [openbsd*], [
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-	],
-    [solaris*], [
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
-	if test "$GCC" = yes; then
-	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
-	else
-	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-h $(@F)'
-	fi
-	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
-	],
-    [hpux*], [
-	XLDFLAGS="$XLDFLAGS "'-Wl,+s,+b,$(libdir)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
-	],
-    [aix*], [
-	LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS"
-	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'
-	    ])
-	],
-    [darwin*], [
-	RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)'
-	LIBRUBY_LDSHARED='$(CC) -dynamiclib'
-	if test "$load_relative" = yes; then
-	    libprefix='@executable_path/../lib'
-	    LIBRUBY_RELATIVE=yes
-	fi
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(ruby_version)'
-	if test "$visibility_option" = ld; then
-	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_*'
-	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,*_threadptr_*'
-	fi
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "' $(XLDFLAGS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).dylib'
-	LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
-	],
-    [interix*], [
-	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
-	])
-], [
-  LIBRUBYARG_SHARED=
-])
-if test "$enable_rpath" = yes; then
-    test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
-    LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix} -L\$(libdir)"
-    LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-    LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
-fi
-AC_SUBST(LIBRUBY_RELATIVE)
-
-LDFLAGS="-L. $LDFLAGS"
-AC_SUBST(ARCHFILE)
-
-if test "$EXEEXT" = .exe; then
-    EXECUTABLE_EXTS='".exe",".com",".cmd",".bat"'
-    AC_DEFINE_UNQUOTED(EXECUTABLE_EXTS, $EXECUTABLE_EXTS)
-    EXECUTABLE_EXTS=`echo $EXECUTABLE_EXTS | tr -d '"' | tr , ' '`
-    AC_SUBST(EXECUTABLE_EXTS)
-fi
-
-dnl }
-dnl build section {
-
-dnl build rdoc index if requested
-RDOCTARGET=""
-CAPITARGET=""
-AC_ARG_ENABLE(install-doc,
-       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]),
-      [install_rdoc=$enableval], [install_rdoc=yes])
-AC_ARG_ENABLE(install-capi,
-      AS_HELP_STRING([--disable-install-capi], [do not install C API documents during install]),
-      [install_capi=$enableval], [install_capi=yes])
-
-if test "$install_doc" != no; then
-    if test "$install_rdoc" != no; then
-	RDOCTARGET="rdoc"
-    else
-	RDOCTARGET="nodoc"
-    fi
-    if test "$install_capi" != no -a -n "$DOXYGEN"; then
-	CAPITARGET="capi"
-    else
-	CAPITARGET="nodoc"
-    fi
-else
-    RDOCTARGET="nodoc"
-    CAPITARGET="nodoc"
-fi
-
-AC_SUBST(RDOCTARGET)
-AC_SUBST(CAPITARGET)
-
-AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
-AC_SUBST(INSTALLDOC)
-
-if test "$rb_with_pthread" = "yes"; then
-    THREAD_MODEL=pthread
-fi
-AC_CACHE_CHECK([for prefix of external symbols], rb_cv_symbol_prefix, [
-    AC_TRY_COMPILE([extern void conftest_external(void) {}], [], [
-	rb_cv_symbol_prefix=`$NM conftest.$ac_objext |
-			     sed -n ['/.*T[ 	]\([^ 	]*\)conftest_external.*/!d;s//\1/p;q']`
-	],
-	[rb_cv_symbol_prefix=''])
-    test -n "$rb_cv_symbol_prefix" || rb_cv_symbol_prefix=NONE
-])
-SYMBOL_PREFIX="$rb_cv_symbol_prefix"
-test "x$SYMBOL_PREFIX" = xNONE && SYMBOL_PREFIX=''
-MINIDLNOBJ=dmydln.o
-AS_CASE(["$target_os"],
-    [linux*], [
-	],
-    [netbsd*], [
-	RUBY_APPEND_OPTION(CFLAGS, -pipe)
-	],
-    [nextstep*|openstep*], [
-	RUBY_APPEND_OPTION(CPPFLAGS, -I/usr/local/include)
-	],
-    [rhapsody*], [
-	RUBY_APPEND_OPTIONS(CFLAGS, -pipe -no-precomp)
-	],
-    [darwin*], [
-	RUBY_APPEND_OPTION(CFLAGS, -pipe)
-	],
-    [human*], [
-	AC_LIBOBJ([x68.o])
-	CFLAGS="$CFLAGS -fansi-only"
-	XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
-	EXEEXT=.x
-	OBJEXT=o
-	],
-    [os2-emx], [
-	AC_LIBOBJ([os2])
-    	CFLAGS="$CFLAGS -DOS2"
-	LIBRUBY_A=`echo $LIBRUBY_A | sed 's/^lib//'`
-	LIBRUBY_SO=`echo $LIBRUBY_SO | sed 's/^lib//'`
-	LIBRUBY_ALIASES=`for i in $LIBRUBY_ALIASES; do echo "$i"; done | sed 's/^lib//'`
-	],
-    [osf*], [
-	if test "$GCC" != "yes" ; then
-	  # compile something small: taint.c is fine for this.
-	  # the main point is the '-v' flag of 'cc'.
-	  AS_CASE(["`cc -v -I. -c main.c -o /tmp/main.o 2>&1`"],
-	  [*/gemc_cc*], [   # we have the new DEC GEM CC
-                        CFLAGS="$CFLAGS -oldc"
-                        ],
-          [            # we have the old MIPS CC
-                        ])
-	  # cleanup
-	  rm -f /tmp/main.o
-	  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}${TEENY}"
-	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
-	AS_CASE(["$target_os"],
-	[cygwin*], [
-	    if test x"$enable_shared" = xyes; then
-		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'.dll
-		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
-	    fi
-	    ],
-	[mingw*], [
-	    RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}"
-	    if test x"${target_cpu}" != xi386; then
-		RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
-	    fi
-	    if test x"$enable_shared" = xyes; then
-		LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
-		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
-	    fi
-	    EXPORT_PREFIX=' '
-	    DLDFLAGS="${DLDFLAGS}"' $(DEFFILE)'
-	    AC_LIBOBJ([win32])
-	    COMMON_LIBS=m
-#	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
-	    COMMON_HEADERS="winsock2.h windows.h"
-	    THREAD_MODEL=win32
-	    ])
-	LIBRUBY_ALIASES=''
-	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
-	SOLIBS='$(LIBS)'
-	if test x"$enable_shared" = xyes; then
-	    LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
-	else
-	    LIBRUBY_SO=dummy
-	    LIBRUBY='lib$(RUBY_SO_NAME).a'
-	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
-	fi
-	],
-    [hpux*], [
-	AS_CASE(["$YACC"],[*yacc*], [
-	    XCFLAGS="$XCFLAGS -DYYMAXDEPTH=300"
-	    YACC="$YACC -Nl40000 -Nm40000"
-	])],
-    [*msdosdjgpp*], [
-	FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in
-	])
-MINIOBJS="$MINIDLNOBJ"
-
-AS_CASE(["$THREAD_MODEL"],
-[pthread], [AC_CHECK_HEADERS(pthread.h)],
-[win32],   [],
-[""],      [AC_MSG_ERROR(thread model is missing)],
-           [AC_MSG_ERROR(unknown thread model $THREAD_MODEL)])
-
-AC_ARG_ENABLE(debug-env,
-       AS_HELP_STRING([--enable-debug-env], [enable RUBY_DEBUG environment variable]),
-       [AC_DEFINE(RUBY_DEBUG_ENV)])
-
-AS_CASE(["$FIRSTMAKEFILE"], [*GNUmakefile:*], [gnumake=yes], [
-    AC_MSG_CHECKING([for if ${MAKE-make} is GNU make])
-    mkdir conftest.dir
-    echo "all:; @echo yes" > conftest.dir/GNUmakefile
-    echo "all:; @echo no" > conftest.dir/Makefile
-    gnumake=`(cd conftest.dir; ${MAKE-make})`
-    rm -fr conftest.dir
-    AS_CASE(["$gnumake"],
-    [*yes*], [
-	echo "include Makefile" > GNUmakefile
-	echo "-include uncommon.mk" >> GNUmakefile
-	gnumake=yes],
-    [
-	gnumake=no])
-    AC_MSG_RESULT($gnumake)
-])
-AS_IF([test "$gnumake" = yes], [ NULLCMD=: ], [
-    AC_MSG_CHECKING([for safe null command for ${MAKE-make}])
-    mkdir conftest.dir
-    echo 'A=1' > conftest.dir/Makefile
-    echo 'B=$(A:1=@:)' >> conftest.dir/Makefile
-    echo 'all:; $B 1 2 3 4 5 6 7 8 9' >> conftest.dir/Makefile
-    if (cd conftest.dir; ${MAKE-make} >/dev/null 2>/dev/null); then
-	NULLCMD=:
-    else
-	echo 'A=1' > conftest.dir/Makefile
-	echo 'B=$(A:1=@true)' >> conftest.dir/Makefile
-	echo 'all:; $B 1 2 3 4 5 6 7 8 9' >> conftest.dir/Makefile
-	if (cd conftest.dir; ${MAKE-make} >/dev/null 2>/dev/null); then
-	    NULLCMD=true
-	else
-	    AC_MSG_ERROR(no candidate for safe null command)
-	fi
-    fi
-    rm -fr conftest.dir
-    AC_MSG_RESULT($NULLCMD)
-])
-AC_SUBST(NULLCMD)
-
-if test "${universal_binary-no}" = yes ; then
-    AC_CACHE_CHECK([for architecture macros], rb_cv_architecture_macros, [
-    mv confdefs.h confdefs1.h
-    : > confdefs.h
-    AC_TRY_COMPILE([@%:@if defined __`echo ${universal_archnames} |
-    sed 's/=[^ ]*//g;s/ /__ || defined __/g'`__
-@%:@else
-@%:@error
->>>>>><<<<<<
-@%:@endif], [],
-[
-    rb_cv_architecture_macros=yes
-    mv -f confdefs1.h confdefs.h
-], [
-    rb_cv_architecture_macros=no
-    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
-    new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
-    for archs in ${universal_archnames}; do
-	cpu=${archs#*=}
-	archs=${archs%=*}
-	CFLAGS="$new_cflags -arch $archs"
-	archs="__${archs}__"
-	AC_MSG_CHECKING([for macro ${archs} on ${cpu}])
-	AC_TRY_COMPILE([@%:@ifndef ${archs}
-@%:@error
-@%:@endif], [], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
-    done
-    mv -f confdefs1.h confdefs.h
-    AC_MSG_ERROR([failed])
-    ])])
-fi
-
-CPPFLAGS="$CPPFLAGS "'$(DEFS)'
-test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
-if test -n "${cflags+set}"; then
-    cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`
-    CFLAGS=`echo " $CFLAGS " | sed "s|$cflagspat"'|${cflags}|;s/^ *//;s/ *$//'`
-fi
-if test -n "${cxxflags+set}"; then
-    cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`
-    CXXFLAGS=`echo " $CXXFLAGS " | sed "s|$cxxflagspat"'|${cxxflags}|;s/^ *//;s/ *$//'`
-fi
-if test "${ARCH_FLAG}"; then
-    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
-    CFLAGS=`echo "$CFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
-    CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
-    LDFLAGS=`echo "$LDFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
-fi
-warnflags="$rb_cv_warnflags"
-AC_SUBST(cppflags, [])dnl
-AC_SUBST(cflags, ["$orig_cflags "'${optflags} ${debugflags} ${warnflags}'])dnl
-AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl
-AC_SUBST(optflags)dnl
-AC_SUBST(debugflags)dnl
-AC_SUBST(warnflags)dnl
-AC_SUBST(XCFLAGS)dnl
-AC_SUBST(XLDFLAGS)dnl
-AC_SUBST(LIBRUBY_LDSHARED)
-AC_SUBST(LIBRUBY_DLDFLAGS)
-AC_SUBST(RUBY_INSTALL_NAME)
-AC_SUBST(rubyw_install_name)
-AC_SUBST(RUBYW_INSTALL_NAME)
-AC_SUBST(RUBY_SO_NAME)
-AC_SUBST(LIBRUBY_A)
-AC_SUBST(LIBRUBY_SO)
-AC_SUBST(LIBRUBY_ALIASES)
-AC_SUBST(LIBRUBY)
-AC_SUBST(LIBRUBYARG)
-AC_SUBST(LIBRUBYARG_STATIC)
-AC_SUBST(LIBRUBYARG_SHARED)
-AC_SUBST(SOLIBS)
-AC_SUBST(DLDLIBS)
-AC_SUBST(ENABLE_SHARED)
-AC_SUBST(MAINLIBS)
-AC_SUBST(COMMON_LIBS)
-AC_SUBST(COMMON_MACROS)
-AC_SUBST(COMMON_HEADERS)
-AC_SUBST(EXPORT_PREFIX)
-AC_SUBST(SYMBOL_PREFIX)
-AC_SUBST(MINIOBJS)
-AC_SUBST(THREAD_MODEL)
-
-MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
-MAKEFILES="`echo $MAKEFILES`"
-AC_SUBST(MAKEFILES)
-
-ri_prefix=
-test "$program_prefix" != NONE &&
-  ri_prefix=$program_prefix
-
-ri_suffix=
-test "$program_suffix" != NONE &&
-  ri_suffix=$program_suffix
-
-RUBY_INSTALL_NAME="${ri_prefix}"'$(RUBY_BASE_NAME)'"${ri_suffix}"
-AS_CASE(["$target_os"],
-  [cygwin*|mingw*], [
-    RUBYW_INSTALL_NAME="${ri_prefix}"'$(RUBYW_BASE_NAME)'"${ri_suffix}"
-    rubyw_install_name='$(RUBYW_INSTALL_NAME)'
-    ])
-
-rubylibprefix='${libdir}/${RUBY_BASE_NAME}'
-AC_ARG_WITH(rubylibprefix,
-	    AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_BASE_NAME]]]),
-	    [if test "x$withval" = xno; then
-		AC_MSG_ERROR([No ruby, No libprefix])
-	    fi
-	    rubylibprefix="$withval"])
-RUBY_LIB_PREFIX=`eval echo \\"${rubylibprefix}\\"`
-AC_SUBST(rubylibprefix)
-
-RI_BASE_NAME=`echo ${RUBY_BASE_NAME} | sed 's/ruby/ri/'`
-ridir='${datarootdir}/${RI_BASE_NAME}'
-AC_ARG_WITH(ridir,
-	    AS_HELP_STRING([--with-ridir=DIR], [ri documentation [[DATAROOTDIR/ri]]]),
-	    [ridir=$withval])
-RIDIR=`eval echo \\"${ridir}\\"`
-AC_SUBST(ridir)
-AC_SUBST(RI_BASE_NAME)
-
-AC_ARG_WITH(ruby-version,
-	    AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|minor|STR)]),
-            [ruby_version=$withval],
-            [ruby_version=full])
-unset RUBY_LIB_VERSION
-unset RUBY_LIB_VERSION_STYLE
-AS_CASE(["$ruby_version"],
-  [full],  [RUBY_LIB_VERSION_STYLE='3	/* full */'],
-  [minor], [RUBY_LIB_VERSION_STYLE='2	/* minor */'])
-if test ${RUBY_LIB_VERSION_STYLE+set}; then
-    {
-    echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
-    echo '#define STRINGIZE(x) x'
-    test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
-    echo '#include "version.h"'
-    echo 'ruby_version=RUBY_LIB_VERSION'
-    } > conftest.c
-    ruby_version="`$CPP -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
-    eval $ruby_version
-else
-    RUBY_LIB_VERSION="\"${ruby_version}\""
-fi
-
-AC_ARG_WITH(sitedir,
-	    AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]]]),
-            [sitedir=$withval],
-            [sitedir='${rubylibprefix}/site_ruby'])
-dir="${sitedir}"
-until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
-    dir="${SITE_DIR}"
-done
-
-AC_ARG_WITH(vendordir,
-	    AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]]]),
-            [vendordir=$withval],
-            [vendordir='${rubylibprefix}/vendor_ruby'])
-dir="${vendordir}"
-until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
-    dir="${VENDOR_DIR}"
-done
-
-if test "${LOAD_RELATIVE+set}"; then
-    AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
-    RUBY_EXEC_PREFIX=""
-    RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-    RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-    RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-else
-    RUBY_EXEC_PREFIX="`eval echo \\"$exec_prefix/\\" | sed 's|^NONE/|'"$prefix"'/|;s|/$||'`"
-    RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-    RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-    RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-fi
-
-pat=`echo "$RUBY_LIB_PREFIX/" | tr -c '\012' .`'\(.*\)'
-AS_CASE(["$RUBY_SITE_LIB_PATH"],
-  ["$RUBY_LIB_PREFIX/"*], [
-    RUBY_SITE_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_SITE_LIB_PATH\" : \"$pat\"`"'"'
-    ],
-  [
-    RUBY_SITE_LIB_PATH="\"${RUBY_SITE_LIB_PATH}\""
-    ])
-AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
-  ["$RUBY_LIB_PREFIX/"*], [
-    RUBY_VENDOR_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_VENDOR_LIB_PATH\" : \"$pat\"`"'"'
-    ],
-  [
-    RUBY_VENDOR_LIB_PATH="\"${RUBY_VENDOR_LIB_PATH}\""
-    ])
-pat=`echo "$RUBY_EXEC_PREFIX/" | tr -c '\012' .`'\(.*\)'
-AS_CASE(["$RUBY_LIB_PREFIX"],
-  ["$RUBY_EXEC_PREFIX/"*], [
-    RUBY_LIB_PREFIX='RUBY_EXEC_PREFIX"/'"`expr \"$RUBY_LIB_PREFIX\" : \"$pat\"`"'"'
-    ],
-  [
-    RUBY_LIB_PREFIX="\"${RUBY_LIB_PREFIX}\""
-    ])
-
-if test ${RUBY_LIB_VERSION_STYLE+set}; then
-    AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION_STYLE, $RUBY_LIB_VERSION_STYLE)
-else
-    AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION, [$RUBY_LIB_VERSION])
-fi
-AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, "${RUBY_EXEC_PREFIX}")
-AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, ${RUBY_LIB_PREFIX})
-if test "x$SITE_DIR" = xno; then
-    AC_DEFINE(NO_RUBY_SITE_LIB)
-else
-    AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH})
-fi
-if test "x$VENDOR_DIR" = xno; then
-    AC_DEFINE(NO_RUBY_VENDOR_LIB)
-else
-    AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB_PATH})
-fi
-
-AC_SUBST(arch)dnl
-AC_SUBST(sitearch)dnl
-AC_SUBST(ruby_version)dnl
-AC_SUBST(sitedir)dnl
-AC_SUBST(vendordir)dnl
-
-configure_args=$ac_configure_args
-AC_SUBST(configure_args)dnl
-
-if test "${universal_binary-no}" = yes ; then
-    arch="universal-${target_os}"
-    AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available,
-	AC_TRY_COMPILE([const char arch[] = __ARCHITECTURE__;], [puts(arch);],
-	     [rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
-    if test "${rb_cv_architecture_available}" = yes; then
-	AC_DEFINE_UNQUOTED(RUBY_PLATFORM_CPU, __ARCHITECTURE__)
-    else
-	for archs in ${universal_archnames}; do
-	    cpu=`echo $archs | sed 's/.*=//'`
-	    archs=`echo $archs | sed 's/=.*//'`
-	    RUBY_DEFINE_IF([defined __${archs}__], RUBY_PLATFORM_CPU, ["${cpu}"])
-	done
-    fi
-    ints='long int'
-    test "$ac_cv_type_long_long" = yes && ints="'long long' $ints"
-    AC_SUBST(UNIVERSAL_ARCHNAMES, "${universal_archnames}")
-    AC_SUBST(UNIVERSAL_INTS, "${ints}")
-    AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}")
-    AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-"RUBY_PLATFORM_OS)
-    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
-else
-    arch="${target_cpu}-${target_os}"
-    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}")
-fi
-
-unset sitearch
-AS_CASE(["$target_os"],[mingw*],[sitearch="$target_cpu-$rb_cv_msvcrt"])
-test ${sitearch+set} && AC_DEFINE_UNQUOTED(RUBY_SITEARCH, "${sitearch}")
-: ${sitearch='${arch}'}
-
-AC_ARG_WITH(search-path,
-		AS_HELP_STRING([--with-search-path=DIR], [specify the additional search path]),
-		[search_path=$withval])
-if test "$search_path" != ""; then
-    AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path")
-fi
-
-AC_ARG_WITH(rubyhdrdir,
-	    AS_HELP_STRING([--with-rubyhdrdir=DIR], [core headers in DIR [[INCLUDEDIR/RUBY_BASE_NAME-RUBY_VERSION]]]),
-	    [rubyhdrdir=$withval],
-	    [rubyhdrdir='${includedir}/${RUBY_BASE_NAME}-${ruby_version}'])
-
-AC_ARG_WITH(sitehdrdir,
-	    AS_HELP_STRING([--with-sitehdrdir=DIR], [core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
-	    [sitehdrdir=$withval],
-	    [sitehdrdir='${rubyhdrdir}/site_ruby'])
-
-AC_ARG_WITH(vendorhdrdir,
-	    AS_HELP_STRING([--with-vendorhdrdir=DIR], [core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
-	    [vendorhdrdir=$withval],
-	    [vendorhdrdir='${rubyhdrdir}/vendor_ruby'])
-
-AC_SUBST(rubyhdrdir)dnl
-AC_SUBST(sitehdrdir)dnl
-AC_SUBST(vendorhdrdir)dnl
-
-AC_ARG_WITH(opt-dir,
-	AS_HELP_STRING([--with-opt-dir=DIR], [add optional headers and libraries DIR]))
-
-AC_ARG_WITH(mantype,
-	AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),
-		[
-			AS_CASE(["$withval"],
-			[man|doc], [MANTYPE=$withval],
-			[AC_MSG_ERROR(invalid man type: $withval)])
-		])
-if test -z "$MANTYPE"; then
-	AC_PATH_PROGS(NROFF, nroff awf, /bin/false, "/usr/bin:/usr/ucb")
-	if ${NROFF} -mdoc ${srcdir}/man/ruby.1 >/dev/null 2>&1; then
-		MANTYPE=doc
-	else
-		MANTYPE=man
-	fi
-fi
-AC_SUBST(MANTYPE)
-
-AC_ARG_ENABLE(rubygems,
-	AS_HELP_STRING([--disable-rubygems], [disable rubygems by default]),
-	[enable_rubygems="$enableval"], [enable_rubygems=yes])
-if test x"$enable_rubygems" = xno; then
-    AC_DEFINE(DISABLE_RUBYGEMS, 1)
-    USE_RUBYGEMS=NO
-else
-    USE_RUBYGEMS=YES
-fi
-AC_SUBST(USE_RUBYGEMS)
-
-arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
-AS_MKDIR_P("${arch_hdrdir}")
-config_h="${arch_hdrdir}/config.h"
-guard=INCLUDE_RUBY_CONFIG_H
-{
-  echo "#ifndef $guard"
-  echo "#define $guard 1"
-  grep -v "^#define PACKAGE_" confdefs.h
-  echo "#endif /* $guard */"
-} | tr -d '\015' |
-${srcdir}/tool/ifchange "${config_h}" -
-tr -d '\015' < largefile.h > confdefs.h
-rm largefile.h
-
-BUILTIN_ENCS=["`sed -n -e '/^BUILTIN_ENCS[ 	]*=/{' \
-	-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
-	-e '}' "${srcdir}/enc/Makefile.in"`"]
-BUILTIN_ENCOBJS=
-for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS `basename $e .c`"'.$(OBJEXT)'; done
-AC_SUBST(BUILTIN_ENCOBJS)
-
-BUILTIN_TRANSES=["`sed -n -e '/^BUILTIN_TRANSES[ 	]*=/{' \
-	-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
-	-e '}' "${srcdir}/enc/Makefile.in"`"]
-BUILTIN_TRANSSRCS=
-BUILTIN_TRANSOBJS=
-for e in $BUILTIN_TRANSES; do
-  BUILTIN_TRANSSRCS="$BUILTIN_TRANSSRCS `basename $e .trans`"'.c';
-  BUILTIN_TRANSOBJS="$BUILTIN_TRANSOBJS `basename $e .trans`"'.$(OBJEXT)';
-done
-AC_SUBST(BUILTIN_TRANSSRCS)
-AC_SUBST(BUILTIN_TRANSOBJS)
-
-PACKAGE=$RUBY_BASE_NAME
-AC_SUBST(PACKAGE)
-AC_MSG_RESULT($PACKAGE library version = $ruby_version)
-
-AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/  *$//'`])
-
-AC_CONFIG_FILES($FIRSTMAKEFILE)
-AC_CONFIG_FILES(Makefile, [{
-	if test -d "$srcdir/.svn"; then
-	    VCS='svn'
-	    VCSUP='$(VCS) up $(SVNUPOPTIONS)'
-	elif test -d "$srcdir/.git/svn"; then
-	    VCS='git svn'
-	    VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'
-	elif test -d "$srcdir/.git"; then
-	    VCS='git'
-	    VCSUP='$(VCS) pull $(GITPULLOPTIONS)'
-	else
-	    VCS='echo cannot'
-	    VCSUP='$(VCS)'
-	fi
-	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
-	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
-	if test "$gnumake" != yes; then
-	    echo ['$(MKFILES): $(srcdir)/common.mk']
-	    sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
-	else
-	    echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
-	fi
-    } > confmk$$.tmp && mv -f confmk$$.tmp Makefile &&
-    {
-	grep '^ruby:' Makefile > /dev/null ||
-	${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null ||
-	echo 'ruby: $(PROGRAM);' >> Makefile
-    }],
-[EXEEXT='$EXEEXT' gnumake='$gnumake'])
-
-ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"
-AC_SUBST(ruby_pc)
-AC_SUBST(exec, [exec])
-
-AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in,
-    [
-    if sed ['s/\$(\([A-Za-z_][A-Za-z0-9_]*\))/${\1}/g;s/@[A-Za-z_][A-Za-z0-9_]*@//'] $ruby_pc > ruby.tmp.pc &&
-	{
-	    test -z "$PKG_CONFIG" ||
-	    PKG_CONFIG_PATH=. $PKG_CONFIG --print-errors ruby.tmp
-	}
-    then
-	mv -f ruby.tmp.pc $ruby_pc
-    else
-	exit 1
-    fi
-    ],
-    [ruby_pc='$ruby_pc' PKG_CONFIG='$PKG_CONFIG'])
-
-AC_OUTPUT
-dnl }
-dnl }
diff --git a/constant.h b/constant.h
index 8232910737..3f1418df17 100644
--- a/constant.h
+++ b/constant.h
@@ -12,23 +12,39 @@
 #define CONSTANT_H
 
 typedef enum {
+    CONST_DEPRECATED = 0x100,
+
+    CONST_VISIBILITY_MASK = 0xff,
     CONST_PUBLIC    = 0x00,
-    CONST_PRIVATE   = 0x01
+    CONST_PRIVATE,
+    CONST_VISIBILITY_MAX
 } 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;
     VALUE value;            /* should be mark */
+    VALUE file;             /* should be mark */
 } rb_const_entry_t;
 
-VALUE rb_mod_private_constant(int argc, VALUE *argv, VALUE obj);
-VALUE rb_mod_public_constant(int argc, VALUE *argv, VALUE obj);
-void rb_free_const_table(st_table *tbl);
-VALUE rb_public_const_get(VALUE klass, ID id);
+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);
 VALUE rb_public_const_get_at(VALUE klass, ID id);
 VALUE rb_public_const_get_from(VALUE klass, ID id);
-int rb_public_const_defined(VALUE klass, ID id);
-int rb_public_const_defined_at(VALUE klass, ID id);
 int rb_public_const_defined_from(VALUE klass, ID id);
+rb_const_entry_t *rb_const_lookup(VALUE klass, ID id);
+int rb_autoloading_value(VALUE mod, ID id, VALUE *value, rb_const_flag_t *flag);
+VALUE rb_const_source_location(VALUE, ID);
+VALUE rb_const_source_location_at(VALUE, ID);
 
 #endif /* CONSTANT_H */
diff --git a/cont.c b/cont.c
index 4f30e50831..793bce018b 100644
--- a/cont.c
+++ b/cont.c
@@ -9,224 +9,928 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
 #include "internal.h"
 #include "vm_core.h"
 #include "gc.h"
 #include "eval_intern.h"
+#include "mjit.h"
 
-#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || defined(HAVE_SETCONTEXT)) && !defined(__NetBSD__) && !defined(sun) && !defined(FIBER_USE_NATIVE)
-#define FIBER_USE_NATIVE 1
+#include COROUTINE_H
 
-/* FIBER_USE_NATIVE enables Fiber performance improvement using system
- * dependent method such as make/setcontext on POSIX system or
- * CreateFiber() API on Windows.
- * This hack make Fiber context switch faster (x2 or more).
- * However, it decrease maximum number of Fiber.  For example, on the
- * 32bit POSIX OS, ten or twenty thousands Fiber can be created.
- *
- * Details is reported in the paper "A Fast Fiber Implementation for Ruby 1.9"
- * in Proc. of 51th Programming Symposium, pp.21--28 (2010) (in Japanese).
- */
-
-/* On our experience, NetBSD doesn't support using setcontext() and pthread
- * simultaneously.  This is because pthread_self(), TLS and other information
- * are represented by stack pointer (higher bits of stack pointer).
- * TODO: check such constraint on configure.
- */
-#elif !defined(FIBER_USE_NATIVE)
-#define FIBER_USE_NATIVE 0
-#endif
-
-#if FIBER_USE_NATIVE
 #ifndef _WIN32
 #include <unistd.h>
 #include <sys/mman.h>
-#include <ucontext.h>
 #endif
+
+static const int DEBUG = 0;
+
 #define RB_PAGE_SIZE (pagesize)
 #define RB_PAGE_MASK (~(RB_PAGE_SIZE - 1))
 static long pagesize;
-#define FIBER_MACHINE_STACK_ALLOCATION_SIZE  (0x10000)
+
+static const rb_data_type_t cont_data_type, fiber_data_type;
+static VALUE rb_cContinuation;
+static VALUE rb_cFiber;
+static VALUE rb_eFiberError;
+#ifdef RB_EXPERIMENTAL_FIBER_POOL
+static VALUE rb_cFiberPool;
 #endif
 
 #define CAPTURE_JUST_VALID_VM_STACK 1
 
+// Defined in `coroutine/$arch/Context.h`:
+#ifdef COROUTINE_LIMITED_ADDRESS_SPACE
+#define FIBER_POOL_ALLOCATION_FREE
+#define FIBER_POOL_INITIAL_SIZE 8
+#define FIBER_POOL_ALLOCATION_MAXIMUM_SIZE 32
+#else
+#define FIBER_POOL_INITIAL_SIZE 32
+#define FIBER_POOL_ALLOCATION_MAXIMUM_SIZE 1024
+#endif
+
 enum context_type {
     CONTINUATION_CONTEXT = 0,
-    FIBER_CONTEXT = 1,
-    ROOT_FIBER_CONTEXT = 2
+    FIBER_CONTEXT = 1
+};
+
+struct cont_saved_vm_stack {
+    VALUE *ptr;
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+    size_t slen;  /* length of stack (head of ec->vm_stack) */
+    size_t clen;  /* length of control frames (tail of ec->vm_stack) */
+#endif
+};
+
+struct fiber_pool;
+
+// Represents a single stack.
+struct fiber_pool_stack {
+    // A pointer to the memory allocation (lowest address) for the stack.
+    void * base;
+
+    // The current stack pointer, taking into account the direction of the stack.
+    void * current;
+
+    // The size of the stack excluding any guard pages.
+    size_t size;
+
+    // The available stack capacity w.r.t. the current stack offset.
+    size_t available;
+
+    // The pool this stack should be allocated from.
+    struct fiber_pool * pool;
+
+    // If the stack is allocated, the allocation it came from.
+    struct fiber_pool_allocation * allocation;
+};
+
+// A linked list of vacant (unused) stacks.
+// This structure is stored in the first page of a stack if it is not in use.
+// @sa fiber_pool_vacancy_pointer
+struct fiber_pool_vacancy {
+    // Details about the vacant stack:
+    struct fiber_pool_stack stack;
+
+    // The vacancy linked list.
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    struct fiber_pool_vacancy * previous;
+#endif
+    struct fiber_pool_vacancy * next;
+};
+
+// Manages singly linked list of mapped regions of memory which contains 1 more more stack:
+//
+// base = +-------------------------------+-----------------------+  +
+//        |VM Stack       |VM Stack       |                       |  |
+//        |               |               |                       |  |
+//        |               |               |                       |  |
+//        +-------------------------------+                       |  |
+//        |Machine Stack  |Machine Stack  |                       |  |
+//        |               |               |                       |  |
+//        |               |               |                       |  |
+//        |               |               | .  .  .  .            |  |  size
+//        |               |               |                       |  |
+//        |               |               |                       |  |
+//        |               |               |                       |  |
+//        |               |               |                       |  |
+//        |               |               |                       |  |
+//        +-------------------------------+                       |  |
+//        |Guard Page     |Guard Page     |                       |  |
+//        +-------------------------------+-----------------------+  v
+//
+//        +------------------------------------------------------->
+//
+//                                  count
+//
+struct fiber_pool_allocation {
+    // A pointer to the memory mapped region.
+    void * base;
+
+    // The size of the individual stacks.
+    size_t size;
+
+    // The stride of individual stacks (including any guard pages or other accounting details).
+    size_t stride;
+
+    // The number of stacks that were allocated.
+    size_t count;
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    // The number of stacks used in this allocation.
+    size_t used;
+#endif
+
+    struct fiber_pool * pool;
+
+    // The allocation linked list.
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    struct fiber_pool_allocation * previous;
+#endif
+    struct fiber_pool_allocation * next;
+};
+
+// A fiber pool manages vacant stacks to reduce the overhead of creating fibers.
+struct fiber_pool {
+    // A singly-linked list of allocations which contain 1 or more stacks each.
+    struct fiber_pool_allocation * allocations;
+
+    // Provides O(1) stack "allocation":
+    struct fiber_pool_vacancy * vacancies;
+
+    // The size of the stack allocations (excluding any guard page).
+    size_t size;
+
+    // The total number of stacks that have been allocated in this pool.
+    size_t count;
+
+    // The initial number of stacks to allocate.
+    size_t initial_count;
+
+    // Whether to madvise(free) the stack or not:
+    int free_stacks;
+
+    // The number of stacks that have been used in this pool.
+    size_t used;
+
+    // The amount to allocate for the vm_stack:
+    size_t vm_stack_size;
 };
 
 typedef struct rb_context_struct {
     enum context_type type;
-    VALUE self;
     int argc;
+    int kw_splat;
+    VALUE self;
     VALUE value;
-    VALUE *vm_stack;
-#ifdef CAPTURE_JUST_VALID_VM_STACK
-    size_t vm_stack_slen;  /* length of stack (head of th->stack) */
-    size_t vm_stack_clen;  /* length of control frames (tail of th->stack) */
-#endif
-    VALUE *machine_stack;
-    VALUE *machine_stack_src;
-#ifdef __ia64
-    VALUE *machine_register_stack;
-    VALUE *machine_register_stack_src;
-    int machine_register_stack_size;
-#endif
-    rb_thread_t saved_thread;
+
+    struct cont_saved_vm_stack saved_vm_stack;
+
+    struct {
+        VALUE *stack;
+        VALUE *stack_src;
+        size_t stack_size;
+    } machine;
+    rb_execution_context_t saved_ec;
     rb_jmpbuf_t jmpbuf;
-    size_t machine_stack_size;
+    rb_ensure_entry_t *ensure_array;
+    /* Pointer to MJIT info about the continuation.  */
+    struct mjit_cont *mjit_cont;
 } rb_context_t;
 
+
+/*
+ * Fiber status:
+ *    [Fiber.new] ------> FIBER_CREATED
+ *                        | [Fiber#resume]
+ *                        v
+ *                   +--> FIBER_RESUMED ----+
+ *    [Fiber#resume] |    | [Fiber.yield]   |
+ *                   |    v                 |
+ *                   +-- FIBER_SUSPENDED    | [Terminate]
+ *                                          |
+ *                       FIBER_TERMINATED <-+
+ */
 enum fiber_status {
-    CREATED,
-    RUNNING,
-    TERMINATED
+    FIBER_CREATED,
+    FIBER_RESUMED,
+    FIBER_SUSPENDED,
+    FIBER_TERMINATED
 };
 
-#if FIBER_USE_NATIVE && !defined(_WIN32)
-#define MAX_MAHINE_STACK_CACHE  10
-static int machine_stack_cache_index = 0;
-typedef struct machine_stack_cache_struct {
-    void *ptr;
-    size_t size;
-} machine_stack_cache_t;
-static machine_stack_cache_t machine_stack_cache[MAX_MAHINE_STACK_CACHE];
-static machine_stack_cache_t terminated_machine_stack;
-#endif
+#define FIBER_CREATED_P(fiber)    ((fiber)->status == FIBER_CREATED)
+#define FIBER_RESUMED_P(fiber)    ((fiber)->status == FIBER_RESUMED)
+#define FIBER_SUSPENDED_P(fiber)  ((fiber)->status == FIBER_SUSPENDED)
+#define FIBER_TERMINATED_P(fiber) ((fiber)->status == FIBER_TERMINATED)
+#define FIBER_RUNNABLE_P(fiber)   (FIBER_CREATED_P(fiber) || FIBER_SUSPENDED_P(fiber))
 
-typedef struct rb_fiber_struct {
+struct rb_fiber_struct {
     rb_context_t cont;
-    VALUE prev;
-    enum fiber_status status;
-    struct rb_fiber_struct *prev_fiber;
-    struct rb_fiber_struct *next_fiber;
-#if FIBER_USE_NATIVE
+    VALUE first_proc;
+    struct rb_fiber_struct *prev;
+    BITFIELD(enum fiber_status, status, 2);
+    /* If a fiber invokes by "transfer",
+     * then this fiber can't be invoked by "resume" any more after that.
+     * You shouldn't mix "transfer" and "resume".
+     */
+    unsigned int transferred : 1;
+
+    struct coroutine_context context;
+    struct fiber_pool_stack stack;
+};
+
+static struct fiber_pool shared_fiber_pool = {NULL, NULL, 0, 0, 0, 0};
+
+/*
+ * FreeBSD require a first (i.e. addr) argument of mmap(2) is not NULL
+ * if MAP_STACK is passed.
+ * http://www.FreeBSD.org/cgi/query-pr.cgi?pr=158755
+ */
+#if defined(MAP_STACK) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_STACK)
+#else
+#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON)
+#endif
+
+#define ERRNOMSG strerror(errno)
+
+// Locates the stack vacancy details for the given stack.
+// Requires that fiber_pool_vacancy fits within one page.
+inline static struct fiber_pool_vacancy *
+fiber_pool_vacancy_pointer(void * base, size_t size)
+{
+    STACK_GROW_DIR_DETECTION;
+
+    return (struct fiber_pool_vacancy *)(
+        (char*)base + STACK_DIR_UPPER(0, size - RB_PAGE_SIZE)
+    );
+}
+
+// Reset the current stack pointer and available size of the given stack.
+inline static void
+fiber_pool_stack_reset(struct fiber_pool_stack * stack)
+{
+    STACK_GROW_DIR_DETECTION;
+
+    stack->current = (char*)stack->base + STACK_DIR_UPPER(0, stack->size);
+    stack->available = stack->size;
+}
+
+// A pointer to the base of the current unused portion of the stack.
+inline static void *
+fiber_pool_stack_base(struct fiber_pool_stack * stack)
+{
+    STACK_GROW_DIR_DETECTION;
+
+    VM_ASSERT(stack->current);
+
+    return STACK_DIR_UPPER(stack->current, (char*)stack->current - stack->available);
+}
+
+// Allocate some memory from the stack. Used to allocate vm_stack inline with machine stack.
+// @sa fiber_initialize_coroutine
+inline static void *
+fiber_pool_stack_alloca(struct fiber_pool_stack * stack, size_t offset)
+{
+    STACK_GROW_DIR_DETECTION;
+
+    if (DEBUG) fprintf(stderr, "fiber_pool_stack_alloca(%p): %"PRIuSIZE"/%"PRIuSIZE"\n", (void*)stack, offset, stack->available);
+    VM_ASSERT(stack->available >= offset);
+
+    // The pointer to the memory being allocated:
+    void * pointer = STACK_DIR_UPPER(stack->current, (char*)stack->current - offset);
+
+    // Move the stack pointer:
+    stack->current = STACK_DIR_UPPER((char*)stack->current + offset, (char*)stack->current - offset);
+    stack->available -= offset;
+
+    return pointer;
+}
+
+// Reset the current stack pointer and available size of the given stack.
+inline static void
+fiber_pool_vacancy_reset(struct fiber_pool_vacancy * vacancy)
+{
+    fiber_pool_stack_reset(&vacancy->stack);
+
+    // Consume one page of the stack because it's used for the vacancy list:
+    fiber_pool_stack_alloca(&vacancy->stack, RB_PAGE_SIZE);
+}
+
+inline static struct fiber_pool_vacancy *
+fiber_pool_vacancy_push(struct fiber_pool_vacancy * vacancy, struct fiber_pool_vacancy * head)
+{
+    vacancy->next = head;
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    if (head) {
+        head->previous = vacancy;
+    }
+#endif
+
+    return vacancy;
+}
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+static void
+fiber_pool_vacancy_remove(struct fiber_pool_vacancy * vacancy)
+{
+    if (vacancy->next) {
+        vacancy->next->previous = vacancy->previous;
+    }
+
+    if (vacancy->previous) {
+        vacancy->previous->next = vacancy->next;
+    }
+    else {
+        // It's the head of the list:
+        vacancy->stack.pool->vacancies = vacancy->next;
+    }
+}
+
+inline static struct fiber_pool_vacancy *
+fiber_pool_vacancy_pop(struct fiber_pool * pool)
+{
+    struct fiber_pool_vacancy * vacancy = pool->vacancies;
+
+    if (vacancy) {
+        fiber_pool_vacancy_remove(vacancy);
+    }
+
+    return vacancy;
+}
+#else
+inline static struct fiber_pool_vacancy *
+fiber_pool_vacancy_pop(struct fiber_pool * pool)
+{
+    struct fiber_pool_vacancy * vacancy = pool->vacancies;
+
+    if (vacancy) {
+        pool->vacancies = vacancy->next;
+    }
+
+    return vacancy;
+}
+#endif
+
+// Initialize the vacant stack. The [base, size] allocation should not include the guard page.
+// @param base The pointer to the lowest address of the allocated memory.
+// @param size The size of the allocated memory.
+inline static struct fiber_pool_vacancy *
+fiber_pool_vacancy_initialize(struct fiber_pool * fiber_pool, struct fiber_pool_vacancy * vacancies, void * base, size_t size)
+{
+    struct fiber_pool_vacancy * vacancy = fiber_pool_vacancy_pointer(base, size);
+
+    vacancy->stack.base = base;
+    vacancy->stack.size = size;
+
+    fiber_pool_vacancy_reset(vacancy);
+
+    vacancy->stack.pool = fiber_pool;
+
+    return fiber_pool_vacancy_push(vacancy, vacancies);
+}
+
+// Allocate a maximum of count stacks, size given by stride.
+// @param count the number of stacks to allocate / were allocated.
+// @param stride the size of the individual stacks.
+// @return [void *] the allocated memory or NULL if allocation failed.
+inline static void *
+fiber_pool_allocate_memory(size_t * count, size_t stride)
+{
+    // We use a divide-by-2 strategy to try and allocate memory. We are trying
+    // to allocate `count` stacks. In normal situation, this won't fail. But
+    // if we ran out of address space, or we are allocating more memory than
+    // the system would allow (e.g. overcommit * physical memory + swap), we
+    // divide count by two and try again. This condition should only be
+    // encountered in edge cases, but we handle it here gracefully.
+    while (*count > 1) {
+#if defined(_WIN32)
+        void * base = VirtualAlloc(0, (*count)*stride, MEM_COMMIT, PAGE_READWRITE);
+
+        if (!base) {
+            *count = (*count) >> 1;
+        }
+        else {
+            return base;
+        }
+#else
+        errno = 0;
+        void * base = mmap(NULL, (*count)*stride, PROT_READ | PROT_WRITE, FIBER_STACK_FLAGS, -1, 0);
+
+        if (base == MAP_FAILED) {
+            // If the allocation fails, count = count / 2, and try again.
+            *count = (*count) >> 1;
+        }
+        else {
+            return base;
+        }
+#endif
+    }
+
+    return NULL;
+}
+
+// Given an existing fiber pool, expand it by the specified number of stacks.
+// @param count the maximum number of stacks to allocate.
+// @return the allocated fiber pool.
+// @sa fiber_pool_allocation_free
+static struct fiber_pool_allocation *
+fiber_pool_expand(struct fiber_pool * fiber_pool, size_t count)
+{
+    STACK_GROW_DIR_DETECTION;
+
+    size_t size = fiber_pool->size;
+    size_t stride = size + RB_PAGE_SIZE;
+
+    // Allocate the memory required for the stacks:
+    void * base = fiber_pool_allocate_memory(&count, stride);
+
+    if (base == NULL) {
+        rb_raise(rb_eFiberError, "can't alloc machine stack to fiber (%"PRIuSIZE" x %"PRIuSIZE" bytes): %s", count, size, ERRNOMSG);
+    }
+
+    struct fiber_pool_vacancy * vacancies = fiber_pool->vacancies;
+    struct fiber_pool_allocation * allocation = RB_ALLOC(struct fiber_pool_allocation);
+
+    // Initialize fiber pool allocation:
+    allocation->base = base;
+    allocation->size = size;
+    allocation->stride = stride;
+    allocation->count = count;
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    allocation->used = 0;
+#endif
+    allocation->pool = fiber_pool;
+
+    if (DEBUG) {
+        fprintf(stderr, "fiber_pool_expand(%"PRIuSIZE"): %p, %"PRIuSIZE"/%"PRIuSIZE" x [%"PRIuSIZE":%"PRIuSIZE"]\n",
+                count, (void*)fiber_pool, fiber_pool->used, fiber_pool->count, size, fiber_pool->vm_stack_size);
+    }
+
+    // Iterate over all stacks, initializing the vacancy list:
+    for (size_t i = 0; i < count; i += 1) {
+        void * base = (char*)allocation->base + (stride * i);
+        void * page = (char*)base + STACK_DIR_UPPER(size, 0);
+
+#if defined(_WIN32)
+        DWORD old_protect;
+
+        if (!VirtualProtect(page, RB_PAGE_SIZE, PAGE_READWRITE | PAGE_GUARD, &old_protect)) {
+            VirtualFree(allocation->base, 0, MEM_RELEASE);
+            rb_raise(rb_eFiberError, "can't set a guard page: %s", ERRNOMSG);
+        }
+#else
+        if (mprotect(page, RB_PAGE_SIZE, PROT_NONE) < 0) {
+            munmap(allocation->base, count*stride);
+            rb_raise(rb_eFiberError, "can't set a guard page: %s", ERRNOMSG);
+        }
+#endif
+
+        vacancies = fiber_pool_vacancy_initialize(
+            fiber_pool, vacancies,
+            (char*)base + STACK_DIR_UPPER(0, RB_PAGE_SIZE),
+            size
+        );
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+        vacancies->stack.allocation = allocation;
+#endif
+    }
+
+    // Insert the allocation into the head of the pool:
+    allocation->next = fiber_pool->allocations;
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    if (allocation->next) {
+        allocation->next->previous = allocation;
+    }
+
+    allocation->previous = NULL;
+#endif
+
+    fiber_pool->allocations = allocation;
+    fiber_pool->vacancies = vacancies;
+    fiber_pool->count += count;
+
+    return allocation;
+}
+
+// Initialize the specified fiber pool with the given number of stacks.
+// @param vm_stack_size The size of the vm stack to allocate.
+static void
+fiber_pool_initialize(struct fiber_pool * fiber_pool, size_t size, size_t count, size_t vm_stack_size)
+{
+    VM_ASSERT(vm_stack_size < size);
+
+    fiber_pool->allocations = NULL;
+    fiber_pool->vacancies = NULL;
+    fiber_pool->size = ((size / RB_PAGE_SIZE) + 1) * RB_PAGE_SIZE;
+    fiber_pool->count = 0;
+    fiber_pool->initial_count = count;
+    fiber_pool->free_stacks = 1;
+    fiber_pool->used = 0;
+
+    fiber_pool->vm_stack_size = vm_stack_size;
+
+    fiber_pool_expand(fiber_pool, count);
+}
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+// Free the list of fiber pool allocations.
+static void
+fiber_pool_allocation_free(struct fiber_pool_allocation * allocation)
+{
+    STACK_GROW_DIR_DETECTION;
+
+    VM_ASSERT(allocation->used == 0);
+
+    if (DEBUG) fprintf(stderr, "fiber_pool_allocation_free: %p base=%p count=%"PRIuSIZE"\n", allocation, allocation->base, allocation->count);
+
+    size_t i;
+    for (i = 0; i < allocation->count; i += 1) {
+        void * base = (char*)allocation->base + (allocation->stride * i) + STACK_DIR_UPPER(0, RB_PAGE_SIZE);
+
+        struct fiber_pool_vacancy * vacancy = fiber_pool_vacancy_pointer(base, allocation->size);
+
+        // Pop the vacant stack off the free list:
+        fiber_pool_vacancy_remove(vacancy);
+    }
+
 #ifdef _WIN32
-    void *fib_handle;
+    VirtualFree(allocation->base, 0, MEM_RELEASE);
 #else
-    ucontext_t context;
+    munmap(allocation->base, allocation->stride * allocation->count);
 #endif
+
+    if (allocation->previous) {
+        allocation->previous->next = allocation->next;
+    }
+    else {
+        // We are the head of the list, so update the pool:
+        allocation->pool->allocations = allocation->next;
+    }
+
+    if (allocation->next) {
+        allocation->next->previous = allocation->previous;
+    }
+
+    allocation->pool->count -= allocation->count;
+
+    ruby_xfree(allocation);
+}
 #endif
-} rb_fiber_t;
 
-static const rb_data_type_t cont_data_type, fiber_data_type;
-static VALUE rb_cContinuation;
-static VALUE rb_cFiber;
-static VALUE rb_eFiberError;
+// Acquire a stack from the given fiber pool. If none are available, allocate more.
+static struct fiber_pool_stack
+fiber_pool_stack_acquire(struct fiber_pool * fiber_pool) {
+    struct fiber_pool_vacancy * vacancy = fiber_pool_vacancy_pop(fiber_pool);
+
+    if (DEBUG) fprintf(stderr, "fiber_pool_stack_acquire: %p used=%"PRIuSIZE"\n", (void*)fiber_pool->vacancies, fiber_pool->used);
+
+    if (!vacancy) {
+        const size_t maximum = FIBER_POOL_ALLOCATION_MAXIMUM_SIZE;
+        const size_t minimum = fiber_pool->initial_count;
+
+        size_t count = fiber_pool->count;
+        if (count > maximum) count = maximum;
+        if (count < minimum) count = minimum;
+
+        fiber_pool_expand(fiber_pool, count);
+
+        // The free list should now contain some stacks:
+        VM_ASSERT(fiber_pool->vacancies);
+
+        vacancy = fiber_pool_vacancy_pop(fiber_pool);
+    }
+
+    VM_ASSERT(vacancy);
+    VM_ASSERT(vacancy->stack.base);
+
+    // Take the top item from the free list:
+    fiber_pool->used += 1;
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    vacancy->stack.allocation->used += 1;
+#endif
+
+    fiber_pool_stack_reset(&vacancy->stack);
+
+    return vacancy->stack;
+}
+
+// We advise the operating system that the stack memory pages are no longer being used.
+// This introduce some performance overhead but allows system to relaim memory when there is pressure.
+static inline void
+fiber_pool_stack_free(struct fiber_pool_stack * stack)
+{
+    void * base = fiber_pool_stack_base(stack);
+    size_t size = stack->available;
+
+    // If this is not true, the vacancy information will almost certainly be destroyed:
+    VM_ASSERT(size <= (stack->size - RB_PAGE_SIZE));
+
+    if (DEBUG) fprintf(stderr, "fiber_pool_stack_free: %p+%"PRIuSIZE" [base=%p, size=%"PRIuSIZE"]\n", base, size, stack->base, stack->size);
+
+#if VM_CHECK_MODE > 0 && defined(MADV_DONTNEED)
+    // This immediately discards the pages and the memory is reset to zero.
+    madvise(base, size, MADV_DONTNEED);
+#elif defined(MADV_FREE_REUSABLE)
+    madvise(base, size, MADV_FREE_REUSABLE);
+#elif defined(MADV_FREE)
+    madvise(base, size, MADV_FREE);
+#elif defined(MADV_DONTNEED)
+    madvise(base, size, MADV_DONTNEED);
+#elif defined(_WIN32)
+    VirtualAlloc(base, size, MEM_RESET, PAGE_READWRITE);
+    // Not available in all versions of Windows.
+    //DiscardVirtualMemory(base, size);
+#endif
+}
+
+// Release and return a stack to the vacancy list.
+static void
+fiber_pool_stack_release(struct fiber_pool_stack * stack)
+{
+    struct fiber_pool * pool = stack->pool;
+    struct fiber_pool_vacancy * vacancy = fiber_pool_vacancy_pointer(stack->base, stack->size);
+
+    if (DEBUG) fprintf(stderr, "fiber_pool_stack_release: %p used=%"PRIuSIZE"\n", stack->base, stack->pool->used);
+
+    // Copy the stack details into the vacancy area:
+    vacancy->stack = *stack;
+    // After this point, be careful about updating/using state in stack, since it's copied to the vacancy area.
+
+    // Reset the stack pointers and reserve space for the vacancy data:
+    fiber_pool_vacancy_reset(vacancy);
+
+    // Push the vacancy into the vancancies list:
+    pool->vacancies = fiber_pool_vacancy_push(vacancy, stack->pool->vacancies);
+    pool->used -= 1;
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    struct fiber_pool_allocation * allocation = stack->allocation;
+
+    allocation->used -= 1;
+
+    // Release address space and/or dirty memory:
+    if (allocation->used == 0) {
+        fiber_pool_allocation_free(allocation);
+    }
+    else if (stack->pool->free_stacks) {
+        fiber_pool_stack_free(&vacancy->stack);
+    }
+#else
+    // This is entirely optional, but clears the dirty flag from the stack memory, so it won't get swapped to disk when there is memory pressure:
+    if (stack->pool->free_stacks) {
+        fiber_pool_stack_free(&vacancy->stack);
+    }
+#endif
+}
+
+static COROUTINE
+fiber_entry(struct coroutine_context * from, struct coroutine_context * to)
+{
+    rb_fiber_start();
+}
+
+// Initialize a fiber's coroutine's machine stack and vm stack.
+static VALUE *
+fiber_initialize_coroutine(rb_fiber_t *fiber, size_t * vm_stack_size)
+{
+    struct fiber_pool * fiber_pool = fiber->stack.pool;
+    rb_execution_context_t *sec = &fiber->cont.saved_ec;
+    void * vm_stack = NULL;
+
+    VM_ASSERT(fiber_pool != NULL);
+
+    fiber->stack = fiber_pool_stack_acquire(fiber_pool);
+    vm_stack = fiber_pool_stack_alloca(&fiber->stack, fiber_pool->vm_stack_size);
+    *vm_stack_size = fiber_pool->vm_stack_size;
+
+#ifdef COROUTINE_PRIVATE_STACK
+    coroutine_initialize(&fiber->context, fiber_entry, fiber_pool_stack_base(&fiber->stack), fiber->stack.available, sec->machine.stack_start);
+    // The stack for this execution context is still the main machine stack, so don't adjust it.
+    // If this is not managed correctly, you will fail in `rb_ec_stack_check`.
+
+    // We limit the machine stack usage to the fiber stack size.
+    if (sec->machine.stack_maxsize > fiber->stack.available) {
+        sec->machine.stack_maxsize = fiber->stack.available;
+    }
+#else
+    coroutine_initialize(&fiber->context, fiber_entry, fiber_pool_stack_base(&fiber->stack), fiber->stack.available);
+
+    // The stack for this execution context is the one we allocated:
+    sec->machine.stack_start = fiber->stack.current;
+    sec->machine.stack_maxsize = fiber->stack.available;
+#endif
+
+    return vm_stack;
+}
+
+// Release the stack from the fiber, it's execution context, and return it to the fiber pool.
+static void
+fiber_stack_release(rb_fiber_t * fiber)
+{
+    rb_execution_context_t *ec = &fiber->cont.saved_ec;
 
-#define GetContPtr(obj, ptr)  \
-    TypedData_Get_Struct((obj), rb_context_t, &cont_data_type, (ptr))
+    if (DEBUG) fprintf(stderr, "fiber_stack_release: %p, stack.base=%p\n", (void*)fiber, fiber->stack.base);
 
-#define GetFiberPtr(obj, ptr)  do {\
-    TypedData_Get_Struct((obj), rb_fiber_t, &fiber_data_type, (ptr)); \
-    if (!(ptr)) rb_raise(rb_eFiberError, "uninitialized fiber"); \
-} while(0)
+    // Return the stack back to the fiber pool if it wasn't already:
+    if (fiber->stack.base) {
+        fiber_pool_stack_release(&fiber->stack);
+        fiber->stack.base = NULL;
+    }
+
+    // The stack is no longer associated with this execution context:
+    rb_ec_clear_vm_stack(ec);
+}
+
+static const char *
+fiber_status_name(enum fiber_status s)
+{
+    switch (s) {
+      case FIBER_CREATED: return "created";
+      case FIBER_RESUMED: return "resumed";
+      case FIBER_SUSPENDED: return "suspended";
+      case FIBER_TERMINATED: return "terminated";
+    }
+    VM_UNREACHABLE(fiber_status_name);
+    return NULL;
+}
+
+static void
+fiber_verify(const rb_fiber_t *fiber)
+{
+#if VM_CHECK_MODE > 0
+    VM_ASSERT(fiber->cont.saved_ec.fiber_ptr == fiber);
+
+    switch (fiber->status) {
+      case FIBER_RESUMED:
+        VM_ASSERT(fiber->cont.saved_ec.vm_stack != NULL);
+        break;
+      case FIBER_SUSPENDED:
+        VM_ASSERT(fiber->cont.saved_ec.vm_stack != NULL);
+        break;
+      case FIBER_CREATED:
+      case FIBER_TERMINATED:
+        /* TODO */
+        break;
+      default:
+        VM_UNREACHABLE(fiber_verify);
+    }
+#endif
+}
+
+inline static void
+fiber_status_set(rb_fiber_t *fiber, enum fiber_status s)
+{
+    // if (DEBUG) fprintf(stderr, "fiber: %p, status: %s -> %s\n", (void *)fiber, fiber_status_name(fiber->status), fiber_status_name(s));
+    VM_ASSERT(!FIBER_TERMINATED_P(fiber));
+    VM_ASSERT(fiber->status != s);
+    fiber_verify(fiber);
+    fiber->status = s;
+}
+
+static inline void
+ec_switch(rb_thread_t *th, rb_fiber_t *fiber)
+{
+    rb_execution_context_t *ec = &fiber->cont.saved_ec;
+
+    ruby_current_execution_context_ptr = th->ec = ec;
+
+    /*
+     * timer-thread may set trap interrupt on previous th->ec at any time;
+     * ensure we do not delay (or lose) the trap interrupt handling.
+     */
+    if (th->vm->main_thread == th && rb_signal_buff_size() > 0) {
+        RUBY_VM_SET_TRAP_INTERRUPT(ec);
+    }
 
-NOINLINE(static VALUE cont_capture(volatile int *stat));
+    VM_ASSERT(ec->fiber_ptr->cont.self == 0 || ec->vm_stack != NULL);
+}
+
+static rb_context_t *
+cont_ptr(VALUE obj)
+{
+    rb_context_t *cont;
+
+    TypedData_Get_Struct(obj, rb_context_t, &cont_data_type, cont);
+
+    return cont;
+}
+
+static rb_fiber_t *
+fiber_ptr(VALUE obj)
+{
+    rb_fiber_t *fiber;
+
+    TypedData_Get_Struct(obj, rb_fiber_t, &fiber_data_type, fiber);
+    if (!fiber) rb_raise(rb_eFiberError, "uninitialized fiber");
+
+    return fiber;
+}
+
+NOINLINE(static VALUE cont_capture(volatile int *volatile stat));
 
 #define THREAD_MUST_BE_RUNNING(th) do { \
-	if (!(th)->tag) rb_raise(rb_eThreadError, "not running thread");	\
+        if (!(th)->ec->tag) rb_raise(rb_eThreadError, "not running thread"); \
     } while (0)
 
+static VALUE
+cont_thread_value(const rb_context_t *cont)
+{
+    return cont->saved_ec.thread_ptr->self;
+}
+
+static void
+cont_compact(void *ptr)
+{
+    rb_context_t *cont = ptr;
+
+    if (cont->self) {
+        cont->self = rb_gc_location(cont->self);
+    }
+    cont->value = rb_gc_location(cont->value);
+    rb_execution_context_update(&cont->saved_ec);
+}
+
 static void
 cont_mark(void *ptr)
 {
+    rb_context_t *cont = ptr;
+
     RUBY_MARK_ENTER("cont");
-    if (ptr) {
-	rb_context_t *cont = ptr;
-	rb_gc_mark(cont->value);
-	rb_thread_mark(&cont->saved_thread);
+    if (cont->self) {
+        rb_gc_mark_movable(cont->self);
+    }
+    rb_gc_mark_movable(cont->value);
 
-	if (cont->vm_stack) {
+    rb_execution_context_mark(&cont->saved_ec);
+    rb_gc_mark(cont_thread_value(cont));
+
+    if (cont->saved_vm_stack.ptr) {
 #ifdef CAPTURE_JUST_VALID_VM_STACK
-	    rb_gc_mark_locations(cont->vm_stack,
-				 cont->vm_stack + cont->vm_stack_slen + cont->vm_stack_clen);
+        rb_gc_mark_locations(cont->saved_vm_stack.ptr,
+                             cont->saved_vm_stack.ptr + cont->saved_vm_stack.slen + cont->saved_vm_stack.clen);
 #else
-	    rb_gc_mark_localtion(cont->vm_stack,
-				 cont->vm_stack, cont->saved_thread.stack_size);
+        rb_gc_mark_locations(cont->saved_vm_stack.ptr,
+                             cont->saved_vm_stack.ptr, cont->saved_ec.stack_size);
 #endif
-	}
+    }
 
-	if (cont->machine_stack) {
-	    if (cont->type == CONTINUATION_CONTEXT) {
-		/* cont */
-		rb_gc_mark_locations(cont->machine_stack,
-				     cont->machine_stack + cont->machine_stack_size);
+    if (cont->machine.stack) {
+        if (cont->type == CONTINUATION_CONTEXT) {
+            /* cont */
+            rb_gc_mark_locations(cont->machine.stack,
+                                 cont->machine.stack + cont->machine.stack_size);
+        }
+        else {
+            /* fiber */
+            const rb_fiber_t *fiber = (rb_fiber_t*)cont;
+
+            if (!FIBER_TERMINATED_P(fiber)) {
+                rb_gc_mark_locations(cont->machine.stack,
+                                     cont->machine.stack + cont->machine.stack_size);
             }
-            else {
-		/* fiber */
-		rb_thread_t *th;
-                rb_fiber_t *fib = (rb_fiber_t*)cont;
-		GetThreadPtr(cont->saved_thread.self, th);
-		if ((th->fiber != cont->self) && fib->status == RUNNING) {
-		    rb_gc_mark_locations(cont->machine_stack,
-					 cont->machine_stack + cont->machine_stack_size);
-		}
-	    }
-	}
-#ifdef __ia64
-	if (cont->machine_register_stack) {
-	    rb_gc_mark_locations(cont->machine_register_stack,
-				 cont->machine_register_stack + cont->machine_register_stack_size);
-	}
-#endif
+        }
     }
+
     RUBY_MARK_LEAVE("cont");
 }
 
+static int
+fiber_is_root_p(const rb_fiber_t *fiber)
+{
+    return fiber == fiber->cont.saved_ec.thread_ptr->root_fiber;
+}
+
 static void
 cont_free(void *ptr)
 {
+    rb_context_t *cont = ptr;
+
     RUBY_FREE_ENTER("cont");
-    if (ptr) {
-	rb_context_t *cont = ptr;
-	RUBY_FREE_UNLESS_NULL(cont->saved_thread.stack); fflush(stdout);
-#if FIBER_USE_NATIVE
-	if (cont->type == CONTINUATION_CONTEXT) {
-	    /* cont */
-	    RUBY_FREE_UNLESS_NULL(cont->machine_stack);
-	}
-	else {
-	    /* fiber */
-#ifdef _WIN32
-	    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 (GET_THREAD()->fiber != cont->self) {
-                rb_fiber_t *fib = (rb_fiber_t*)cont;
-                if (fib->context.uc_stack.ss_sp) {
-                    if (cont->type == ROOT_FIBER_CONTEXT) {
-			rb_bug("Illegal root fiber parameter");
-                    }
-		    munmap((void*)fib->context.uc_stack.ss_sp, fib->context.uc_stack.ss_size);
-		}
-	    }
-            else {
-		/* It may reached here when finalize */
-		/* TODO examine whether it is a bug */
-                /* rb_bug("cont_free: release self"); */
-            }
-#endif
-	}
-#else /* not FIBER_USE_NATIVE */
-	RUBY_FREE_UNLESS_NULL(cont->machine_stack);
-#endif
-#ifdef __ia64
-	RUBY_FREE_UNLESS_NULL(cont->machine_register_stack);
-#endif
-	RUBY_FREE_UNLESS_NULL(cont->vm_stack);
 
-	/* free rb_cont_t or rb_fiber_t */
-	ruby_xfree(ptr);
+    if (cont->type == CONTINUATION_CONTEXT) {
+        ruby_xfree(cont->saved_ec.vm_stack);
+        ruby_xfree(cont->ensure_array);
+        RUBY_FREE_UNLESS_NULL(cont->machine.stack);
+    }
+    else {
+        rb_fiber_t *fiber = (rb_fiber_t*)cont;
+        coroutine_destroy(&fiber->context);
+        if (!fiber_is_root_p(fiber)) {
+            fiber_stack_release(fiber);
+        }
+    }
+
+    RUBY_FREE_UNLESS_NULL(cont->saved_vm_stack.ptr);
+
+    if (mjit_enabled && cont->mjit_cont != NULL) {
+        mjit_cont_free(cont->mjit_cont);
     }
+    /* free rb_cont_t or rb_fiber_t */
+    ruby_xfree(ptr);
     RUBY_FREE_LEAVE("cont");
 }
 
@@ -235,156 +939,161 @@ cont_memsize(const void *ptr)
 {
     const rb_context_t *cont = ptr;
     size_t size = 0;
-    if (cont) {
-	size = sizeof(*cont);
-	if (cont->vm_stack) {
+
+    size = sizeof(*cont);
+    if (cont->saved_vm_stack.ptr) {
 #ifdef CAPTURE_JUST_VALID_VM_STACK
-	    size_t n = (cont->vm_stack_slen + cont->vm_stack_clen);
+        size_t n = (cont->saved_vm_stack.slen + cont->saved_vm_stack.clen);
 #else
-	    size_t n = cont->saved_thread.stack_size;
-#endif
-	    size += n * sizeof(*cont->vm_stack);
-	}
-
-	if (cont->machine_stack) {
-	    size += cont->machine_stack_size * sizeof(*cont->machine_stack);
-	}
-#ifdef __ia64
-	if (cont->machine_register_stack) {
-	    size += cont->machine_register_stack_size * sizeof(*cont->machine_register_stack);
-	}
+        size_t n = cont->saved_ec.vm_stack_size;
 #endif
+        size += n * sizeof(*cont->saved_vm_stack.ptr);
     }
+
+    if (cont->machine.stack) {
+        size += cont->machine.stack_size * sizeof(*cont->machine.stack);
+    }
+
     return size;
 }
 
-static void
-fiber_mark(void *ptr)
+void
+rb_fiber_update_self(rb_fiber_t *fiber)
 {
-    RUBY_MARK_ENTER("cont");
-    if (ptr) {
-	rb_fiber_t *fib = ptr;
-	rb_gc_mark(fib->prev);
-	cont_mark(&fib->cont);
+    if (fiber->cont.self) {
+        fiber->cont.self = rb_gc_location(fiber->cont.self);
+    }
+    else {
+        rb_execution_context_update(&fiber->cont.saved_ec);
+    }
+}
+
+void
+rb_fiber_mark_self(const rb_fiber_t *fiber)
+{
+    if (fiber->cont.self) {
+        rb_gc_mark_movable(fiber->cont.self);
+    }
+    else {
+        rb_execution_context_mark(&fiber->cont.saved_ec);
     }
-    RUBY_MARK_LEAVE("cont");
 }
 
 static void
-fiber_link_join(rb_fiber_t *fib)
+fiber_compact(void *ptr)
 {
-    VALUE current_fibval = rb_fiber_current();
-    rb_fiber_t *current_fib;
-    GetFiberPtr(current_fibval, current_fib);
+    rb_fiber_t *fiber = ptr;
+    fiber->first_proc = rb_gc_location(fiber->first_proc);
+
+    if (fiber->prev) rb_fiber_update_self(fiber->prev);
 
-    /* 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;
+    cont_compact(&fiber->cont);
+    fiber_verify(fiber);
 }
 
 static void
-fiber_link_remove(rb_fiber_t *fib)
+fiber_mark(void *ptr)
 {
-    fib->prev_fiber->next_fiber = fib->next_fiber;
-    fib->next_fiber->prev_fiber = fib->prev_fiber;
+    rb_fiber_t *fiber = ptr;
+    RUBY_MARK_ENTER("cont");
+    fiber_verify(fiber);
+    rb_gc_mark_movable(fiber->first_proc);
+    if (fiber->prev) rb_fiber_mark_self(fiber->prev);
+    cont_mark(&fiber->cont);
+    RUBY_MARK_LEAVE("cont");
 }
 
 static void
 fiber_free(void *ptr)
 {
+    rb_fiber_t *fiber = ptr;
     RUBY_FREE_ENTER("fiber");
-    if (ptr) {
-	rb_fiber_t *fib = ptr;
-	if (fib->cont.type != ROOT_FIBER_CONTEXT &&
-	    fib->cont.saved_thread.local_storage) {
-	    st_free_table(fib->cont.saved_thread.local_storage);
-	}
-	fiber_link_remove(fib);
 
-	cont_free(&fib->cont);
+    //if (DEBUG) fprintf(stderr, "fiber_free: %p[%p]\n", fiber, fiber->stack.base);
+
+    if (fiber->cont.saved_ec.local_storage) {
+        st_free_table(fiber->cont.saved_ec.local_storage);
     }
+
+    cont_free(&fiber->cont);
     RUBY_FREE_LEAVE("fiber");
 }
 
 static size_t
 fiber_memsize(const void *ptr)
 {
-    const rb_fiber_t *fib = ptr;
-    size_t size = 0;
-    if (ptr) {
-	size = sizeof(*fib);
-	if (fib->cont.type != ROOT_FIBER_CONTEXT) {
-	    size += st_memsize(fib->cont.saved_thread.local_storage);
-	}
-	size += cont_memsize(&fib->cont);
+    const rb_fiber_t *fiber = ptr;
+    size_t size = sizeof(*fiber);
+    const rb_execution_context_t *saved_ec = &fiber->cont.saved_ec;
+    const rb_thread_t *th = rb_ec_thread_ptr(saved_ec);
+
+    /*
+     * vm.c::thread_memsize already counts th->ec->local_storage
+     */
+    if (saved_ec->local_storage && fiber != th->root_fiber) {
+        size += st_memsize(saved_ec->local_storage);
     }
+    size += cont_memsize(&fiber->cont);
     return size;
 }
 
+VALUE
+rb_obj_is_fiber(VALUE obj)
+{
+    if (rb_typeddata_is_kind_of(obj, &fiber_data_type)) {
+        return Qtrue;
+    }
+    else {
+        return Qfalse;
+    }
+}
+
 static void
 cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
 {
     size_t size;
 
-    SET_MACHINE_STACK_END(&th->machine_stack_end);
-#ifdef __ia64
-    th->machine_register_stack_end = rb_ia64_bsp();
-#endif
+    SET_MACHINE_STACK_END(&th->ec->machine.stack_end);
 
-    if (th->machine_stack_start > th->machine_stack_end) {
-	size = cont->machine_stack_size = th->machine_stack_start - th->machine_stack_end;
-	cont->machine_stack_src = th->machine_stack_end;
+    if (th->ec->machine.stack_start > th->ec->machine.stack_end) {
+        size = cont->machine.stack_size = th->ec->machine.stack_start - th->ec->machine.stack_end;
+        cont->machine.stack_src = th->ec->machine.stack_end;
     }
     else {
-	size = cont->machine_stack_size = th->machine_stack_end - th->machine_stack_start;
-	cont->machine_stack_src = th->machine_stack_start;
+        size = cont->machine.stack_size = th->ec->machine.stack_end - th->ec->machine.stack_start;
+        cont->machine.stack_src = th->ec->machine.stack_start;
     }
 
-    if (cont->machine_stack) {
-	REALLOC_N(cont->machine_stack, VALUE, size);
+    if (cont->machine.stack) {
+        REALLOC_N(cont->machine.stack, VALUE, size);
     }
     else {
-	cont->machine_stack = ALLOC_N(VALUE, size);
+        cont->machine.stack = ALLOC_N(VALUE, size);
     }
 
     FLUSH_REGISTER_WINDOWS;
-    MEMCPY(cont->machine_stack, cont->machine_stack_src, VALUE, size);
-
-#ifdef __ia64
-    rb_ia64_flushrs();
-    size = cont->machine_register_stack_size = th->machine_register_stack_end - th->machine_register_stack_start;
-    cont->machine_register_stack_src = th->machine_register_stack_start;
-    if (cont->machine_register_stack) {
-	REALLOC_N(cont->machine_register_stack, VALUE, size);
-    }
-    else {
-	cont->machine_register_stack = ALLOC_N(VALUE, size);
-    }
-
-    MEMCPY(cont->machine_register_stack, cont->machine_register_stack_src, VALUE, size);
-#endif
+    MEMCPY(cont->machine.stack, cont->machine.stack_src, VALUE, size);
 }
 
 static const rb_data_type_t cont_data_type = {
     "continuation",
-    {cont_mark, cont_free, cont_memsize,},
+    {cont_mark, cont_free, cont_memsize, cont_compact},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
-static void
+static inline void
 cont_save_thread(rb_context_t *cont, rb_thread_t *th)
 {
+    rb_execution_context_t *sec = &cont->saved_ec;
+
+    VM_ASSERT(th->status == THREAD_RUNNABLE);
+
     /* save thread context */
-    cont->saved_thread = *th;
-    /* saved_thread->machine_stack_(start|end) should be NULL */
+    *sec = *th->ec;
+
+    /* saved_ec->machine.stack_end should be NULL */
     /* because it may happen GC afterward */
-    cont->saved_thread.machine_stack_start = 0;
-    cont->saved_thread.machine_stack_end = 0;
-#ifdef __ia64
-    cont->saved_thread.machine_register_stack_start = 0;
-    cont->saved_thread.machine_register_stack_end = 0;
-#endif
+    sec->machine.stack_end = NULL;
 }
 
 static void
@@ -392,7 +1101,13 @@ cont_init(rb_context_t *cont, rb_thread_t *th)
 {
     /* save thread context */
     cont_save_thread(cont, th);
-    cont->saved_thread.local_storage = 0;
+    cont->saved_ec.thread_ptr = th;
+    cont->saved_ec.local_storage = NULL;
+    cont->saved_ec.local_storage_recursive_hash = Qnil;
+    cont->saved_ec.local_storage_recursive_hash_for_trace = Qnil;
+    if (mjit_enabled) {
+        cont->mjit_cont = mjit_cont_new(&cont->saved_ec);
+    }
 }
 
 static rb_context_t *
@@ -409,247 +1124,204 @@ cont_new(VALUE klass)
     return cont;
 }
 
+#if 0
+void
+show_vm_stack(const rb_execution_context_t *ec)
+{
+    VALUE *p = ec->vm_stack;
+    while (p < ec->cfp->sp) {
+        fprintf(stderr, "%3d ", (int)(p - ec->vm_stack));
+        rb_obj_info_dump(*p);
+        p++;
+    }
+}
+
+void
+show_vm_pcs(const rb_control_frame_t *cfp,
+            const rb_control_frame_t *end_of_cfp)
+{
+    int i=0;
+    while (cfp != end_of_cfp) {
+        int pc = 0;
+        if (cfp->iseq) {
+            pc = cfp->pc - cfp->iseq->body->iseq_encoded;
+        }
+        fprintf(stderr, "%2d pc: %d\n", i++, pc);
+        cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+    }
+}
+#endif
+COMPILER_WARNING_PUSH
+#ifdef __clang__
+COMPILER_WARNING_IGNORED(-Wduplicate-decl-specifier)
+#endif
 static VALUE
-cont_capture(volatile int *stat)
+cont_capture(volatile int *volatile stat)
 {
-    rb_context_t *cont;
-    rb_thread_t *th = GET_THREAD(), *sth;
+    rb_context_t *volatile cont;
+    rb_thread_t *th = GET_THREAD();
     volatile VALUE contval;
+    const rb_execution_context_t *ec = th->ec;
 
     THREAD_MUST_BE_RUNNING(th);
-    rb_vm_stack_to_heap(th);
+    rb_vm_stack_to_heap(th->ec);
     cont = cont_new(rb_cContinuation);
     contval = cont->self;
-    sth = &cont->saved_thread;
 
 #ifdef CAPTURE_JUST_VALID_VM_STACK
-    cont->vm_stack_slen = th->cfp->sp + th->mark_stack_len - th->stack;
-    cont->vm_stack_clen = th->stack + th->stack_size - (VALUE*)th->cfp;
-    cont->vm_stack = ALLOC_N(VALUE, cont->vm_stack_slen + cont->vm_stack_clen);
-    MEMCPY(cont->vm_stack, th->stack, VALUE, cont->vm_stack_slen);
-    MEMCPY(cont->vm_stack + cont->vm_stack_slen, (VALUE*)th->cfp, VALUE, cont->vm_stack_clen);
+    cont->saved_vm_stack.slen = ec->cfp->sp - ec->vm_stack;
+    cont->saved_vm_stack.clen = ec->vm_stack + ec->vm_stack_size - (VALUE*)ec->cfp;
+    cont->saved_vm_stack.ptr = ALLOC_N(VALUE, cont->saved_vm_stack.slen + cont->saved_vm_stack.clen);
+    MEMCPY(cont->saved_vm_stack.ptr,
+           ec->vm_stack,
+           VALUE, cont->saved_vm_stack.slen);
+    MEMCPY(cont->saved_vm_stack.ptr + cont->saved_vm_stack.slen,
+           (VALUE*)ec->cfp,
+           VALUE,
+           cont->saved_vm_stack.clen);
 #else
-    cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
-    MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
+    cont->saved_vm_stack.ptr = ALLOC_N(VALUE, ec->vm_stack_size);
+    MEMCPY(cont->saved_vm_stack.ptr, ec->vm_stack, VALUE, ec->vm_stack_size);
 #endif
-    sth->stack = 0;
-
+    // At this point, `cfp` is valid but `vm_stack` should be cleared:
+    rb_ec_set_vm_stack(&cont->saved_ec, NULL, 0);
+    VM_ASSERT(cont->saved_ec.cfp != NULL);
     cont_save_machine_stack(th, cont);
 
-    if (ruby_setjmp(cont->jmpbuf)) {
-	volatile VALUE value;
+    /* backup ensure_list to array for search in another context */
+    {
+        rb_ensure_list_t *p;
+        int size = 0;
+        rb_ensure_entry_t *entry;
+        for (p=th->ec->ensure_list; p; p=p->next)
+            size++;
+        entry = cont->ensure_array = ALLOC_N(rb_ensure_entry_t,size+1);
+        for (p=th->ec->ensure_list; p; p=p->next) {
+            if (!p->entry.marker)
+                p->entry.marker = rb_ary_tmp_new(0); /* dummy object */
+            *entry++ = p->entry;
+        }
+        entry->marker = 0;
+    }
 
-	value = cont->value;
-	if (cont->argc == -1) rb_exc_raise(value);
-	cont->value = Qnil;
-	*stat = 1;
-	return value;
+    if (ruby_setjmp(cont->jmpbuf)) {
+        VALUE value;
+
+        VAR_INITIALIZED(cont);
+        value = cont->value;
+        if (cont->argc == -1) rb_exc_raise(value);
+        cont->value = Qnil;
+        *stat = 1;
+        return value;
     }
     else {
-	*stat = 0;
-	return cont->self;
+        *stat = 0;
+        return contval;
     }
 }
+COMPILER_WARNING_POP
 
-static void
+static inline void
+fiber_restore_thread(rb_thread_t *th, rb_fiber_t *fiber)
+{
+    ec_switch(th, fiber);
+    VM_ASSERT(th->ec->fiber_ptr == fiber);
+}
+
+static inline void
 cont_restore_thread(rb_context_t *cont)
 {
-    rb_thread_t *th = GET_THREAD(), *sth = &cont->saved_thread;
+    rb_thread_t *th = GET_THREAD();
 
     /* restore thread context */
     if (cont->type == CONTINUATION_CONTEXT) {
-	/* continuation */
-	VALUE fib;
-
-	th->fiber = sth->fiber;
-	fib = th->fiber ? th->fiber : th->root_fiber;
-
-	if (fib) {
-	    rb_fiber_t *fcont;
-	    GetFiberPtr(fib, fcont);
-	    th->stack_size = fcont->cont.saved_thread.stack_size;
-	    th->stack = fcont->cont.saved_thread.stack;
-	}
+        /* continuation */
+        rb_execution_context_t *sec = &cont->saved_ec;
+        rb_fiber_t *fiber = NULL;
+
+        if (sec->fiber_ptr != NULL) {
+            fiber = sec->fiber_ptr;
+        }
+        else if (th->root_fiber) {
+            fiber = th->root_fiber;
+        }
+
+        if (fiber && th->ec != &fiber->cont.saved_ec) {
+            ec_switch(th, fiber);
+        }
+
+        if (th->ec->trace_arg != sec->trace_arg) {
+            rb_raise(rb_eRuntimeError, "can't call across trace_func");
+        }
+
+        /* copy vm stack */
 #ifdef CAPTURE_JUST_VALID_VM_STACK
-	MEMCPY(th->stack, cont->vm_stack, VALUE, cont->vm_stack_slen);
-	MEMCPY(th->stack + sth->stack_size - cont->vm_stack_clen,
-	       cont->vm_stack + cont->vm_stack_slen, VALUE, cont->vm_stack_clen);
+        MEMCPY(th->ec->vm_stack,
+               cont->saved_vm_stack.ptr,
+               VALUE, cont->saved_vm_stack.slen);
+        MEMCPY(th->ec->vm_stack + th->ec->vm_stack_size - cont->saved_vm_stack.clen,
+               cont->saved_vm_stack.ptr + cont->saved_vm_stack.slen,
+               VALUE, cont->saved_vm_stack.clen);
 #else
-	MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size);
+        MEMCPY(th->ec->vm_stack, cont->saved_vm_stack.ptr, VALUE, sec->vm_stack_size);
 #endif
+        /* other members of ec */
+
+        th->ec->cfp = sec->cfp;
+        th->ec->raised_flag = sec->raised_flag;
+        th->ec->tag = sec->tag;
+        th->ec->protect_tag = sec->protect_tag;
+        th->ec->root_lep = sec->root_lep;
+        th->ec->root_svar = sec->root_svar;
+        th->ec->ensure_list = sec->ensure_list;
+        th->ec->errinfo = sec->errinfo;
+
+        VM_ASSERT(th->ec->vm_stack != NULL);
     }
     else {
-	/* fiber */
-	th->stack = sth->stack;
-	th->stack_size = sth->stack_size;
-	th->local_storage = sth->local_storage;
-	th->fiber = cont->self;
+        /* fiber */
+        fiber_restore_thread(th, (rb_fiber_t*)cont);
     }
-
-    th->cfp = sth->cfp;
-    th->safe_level = sth->safe_level;
-    th->raised_flag = sth->raised_flag;
-    th->state = sth->state;
-    th->status = sth->status;
-    th->tag = sth->tag;
-    th->protect_tag = sth->protect_tag;
-    th->errinfo = sth->errinfo;
-    th->first_proc = sth->first_proc;
 }
 
-#if FIBER_USE_NATIVE
-#ifdef _WIN32
+NOINLINE(static void fiber_setcontext(rb_fiber_t *new_fiber, rb_fiber_t *old_fiber));
+
 static void
-fiber_set_stack_location(void)
+fiber_setcontext(rb_fiber_t *new_fiber, rb_fiber_t *old_fiber)
 {
     rb_thread_t *th = GET_THREAD();
-    VALUE *ptr;
-
-    SET_MACHINE_STACK_END(&ptr);
-    th->machine_stack_start = (void*)(((VALUE)ptr & RB_PAGE_MASK) + STACK_UPPER((void *)&ptr, 0, RB_PAGE_SIZE));
-}
-
-static VOID CALLBACK
-fiber_entry(void *arg)
-{
-    fiber_set_stack_location();
-    rb_fiber_start();
-}
-#else /* _WIN32 */
-
-/*
- * FreeBSD require a first (i.e. addr) argument of mmap(2) is not NULL
- * if MAP_STACK is passed.
- * http://www.FreeBSD.org/cgi/query-pr.cgi?pr=158755
- */
-#if defined(MAP_STACK) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
-#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_STACK)
-#else
-#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON)
-#endif
-
-static char*
-fiber_machine_stack_alloc(size_t size)
-{
-    char *ptr;
-
-    if (machine_stack_cache_index > 0) {
-	if (machine_stack_cache[machine_stack_cache_index - 1].size == (size / sizeof(VALUE))) {
-	    ptr = machine_stack_cache[machine_stack_cache_index - 1].ptr;
-	    machine_stack_cache_index--;
-	    machine_stack_cache[machine_stack_cache_index].ptr = NULL;
-	    machine_stack_cache[machine_stack_cache_index].size = 0;
-	}
-	else{
-            /* TODO handle multiple machine stack size */
-	    rb_bug("machine_stack_cache size is not canonicalized");
-	}
-    }
-    else {
-	void *page;
-	STACK_GROW_DIR_DETECTION;
-
-	ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, FIBER_STACK_FLAGS, -1, 0);
-	if (ptr == MAP_FAILED) {
-	    rb_raise(rb_eFiberError, "can't alloc machine stack to fiber");
-	}
 
-	/* guard page setup */
-	page = ptr + STACK_DIR_UPPER(size - RB_PAGE_SIZE, 0);
-	if (mprotect(page, RB_PAGE_SIZE, PROT_NONE) < 0) {
-	    rb_raise(rb_eFiberError, "mprotect failed");
-	}
+    /* save old_fiber's machine stack - to ensure efficient garbage collection */
+    if (!FIBER_TERMINATED_P(old_fiber)) {
+        STACK_GROW_DIR_DETECTION;
+        SET_MACHINE_STACK_END(&th->ec->machine.stack_end);
+        if (STACK_DIR_UPPER(0, 1)) {
+            old_fiber->cont.machine.stack_size = th->ec->machine.stack_start - th->ec->machine.stack_end;
+            old_fiber->cont.machine.stack = th->ec->machine.stack_end;
+        }
+        else {
+            old_fiber->cont.machine.stack_size = th->ec->machine.stack_end - th->ec->machine.stack_start;
+            old_fiber->cont.machine.stack = th->ec->machine.stack_start;
+        }
     }
 
-    return ptr;
-}
-#endif
-
-static void
-fiber_initialize_machine_stack_context(rb_fiber_t *fib, size_t size)
-{
-    rb_thread_t *sth = &fib->cont.saved_thread;
-
-#ifdef _WIN32
-    fib->fib_handle = CreateFiberEx(size - 1, size, 0, fiber_entry, NULL);
-    if (!fib->fib_handle) {
-	/* try to release unnecessary fibers & retry to create */
-	rb_gc();
-	fib->fib_handle = CreateFiberEx(size - 1, size, 0, fiber_entry, NULL);
-	if (!fib->fib_handle) {
-	    rb_raise(rb_eFiberError, "can't create fiber");
-	}
-    }
-    sth->machine_stack_maxsize = size;
-#else /* not WIN32 */
-    ucontext_t *context = &fib->context;
-    char *ptr;
-    STACK_GROW_DIR_DETECTION;
-
-    getcontext(context);
-    ptr = fiber_machine_stack_alloc(size);
-    context->uc_link = NULL;
-    context->uc_stack.ss_sp = ptr;
-    context->uc_stack.ss_size = size;
-    makecontext(context, rb_fiber_start, 0);
-    sth->machine_stack_start = (VALUE*)(ptr + STACK_DIR_UPPER(0, size));
-    sth->machine_stack_maxsize = size - RB_PAGE_SIZE;
-#endif
-#ifdef __ia64
-    sth->machine_register_stack_maxsize = sth->machine_stack_maxsize;
-#endif
-}
+    /* exchange machine_stack_start between old_fiber and new_fiber */
+    old_fiber->cont.saved_ec.machine.stack_start = th->ec->machine.stack_start;
 
-NOINLINE(static void fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib));
-
-static void
-fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib)
-{
-    rb_thread_t *th = GET_THREAD(), *sth = &newfib->cont.saved_thread;
-
-    if (newfib->status != RUNNING) {
-	fiber_initialize_machine_stack_context(newfib, FIBER_MACHINE_STACK_ALLOCATION_SIZE);
-    }
+    /* old_fiber->machine.stack_end should be NULL */
+    old_fiber->cont.saved_ec.machine.stack_end = NULL;
 
     /* restore thread context */
-    cont_restore_thread(&newfib->cont);
-    th->machine_stack_maxsize = sth->machine_stack_maxsize;
-    if (sth->machine_stack_end && (newfib != oldfib)) {
-	rb_bug("fiber_setcontext: sth->machine_stack_end has non zero value");
-    }
-
-    /* save  oldfib's machine stack */
-    if (oldfib->status != TERMINATED) {
-	STACK_GROW_DIR_DETECTION;
-	SET_MACHINE_STACK_END(&th->machine_stack_end);
-	if (STACK_DIR_UPPER(0, 1)) {
-	    oldfib->cont.machine_stack_size = th->machine_stack_start - th->machine_stack_end;
-	    oldfib->cont.machine_stack = th->machine_stack_end;
-	}
-	else {
-	    oldfib->cont.machine_stack_size = th->machine_stack_end - th->machine_stack_start;
-	    oldfib->cont.machine_stack = th->machine_stack_start;
-	}
-    }
-    /* exchange machine_stack_start between oldfib and newfib */
-    oldfib->cont.saved_thread.machine_stack_start = th->machine_stack_start;
-    th->machine_stack_start = sth->machine_stack_start;
-    /* 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->cont.self) {
-	rb_bug("non_root_fiber->context.uc_stac.ss_sp should not be NULL");
-    }
-#endif
+    fiber_restore_thread(th, new_fiber);
+
+    // if (DEBUG) fprintf(stderr, "fiber_setcontext: %p[%p] -> %p[%p]\n", old_fiber, old_fiber->stack.base, new_fiber, new_fiber->stack.base);
 
     /* swap machine context */
-#ifdef _WIN32
-    SwitchToFiber(newfib->fib_handle);
-#else
-    swapcontext(&oldfib->context, &newfib->context);
-#endif
+    coroutine_transfer(&old_fiber->context, &new_fiber->context);
+
+    // It's possible to get here, and new_fiber is already freed.
+    // if (DEBUG) fprintf(stderr, "fiber_setcontext: %p[%p] <- %p[%p]\n", old_fiber, old_fiber->stack.base, new_fiber, new_fiber->stack.base);
 }
-#endif
 
 NOINLINE(NORETURN(static void cont_restore_1(rb_context_t *)));
 
@@ -661,127 +1333,81 @@ cont_restore_1(rb_context_t *cont)
     /* restore machine stack */
 #ifdef _M_AMD64
     {
-	/* workaround for x64 SEH */
-	jmp_buf buf;
-	setjmp(buf);
-	((_JUMP_BUFFER*)(&cont->jmpbuf))->Frame =
-	    ((_JUMP_BUFFER*)(&buf))->Frame;
+        /* workaround for x64 SEH */
+        jmp_buf buf;
+        setjmp(buf);
+        _JUMP_BUFFER *bp = (void*)&cont->jmpbuf;
+        bp->Frame = ((_JUMP_BUFFER*)((void*)&buf))->Frame;
     }
 #endif
-    if (cont->machine_stack_src) {
-	size_t i;
-	FLUSH_REGISTER_WINDOWS;
-	for (i = 0; i < cont->machine_stack_size; i++)
-	    cont->machine_stack_src[i] = cont->machine_stack[i];
+    if (cont->machine.stack_src) {
+        FLUSH_REGISTER_WINDOWS;
+        MEMCPY(cont->machine.stack_src, cont->machine.stack,
+               VALUE, cont->machine.stack_size);
     }
 
-#ifdef __ia64
-    if (cont->machine_register_stack_src) {
-	MEMCPY(cont->machine_register_stack_src, cont->machine_register_stack,
-	       VALUE, cont->machine_register_stack_size);
-    }
-#endif
-
     ruby_longjmp(cont->jmpbuf, 1);
 }
 
 NORETURN(NOINLINE(static void cont_restore_0(rb_context_t *, VALUE *)));
 
-#ifdef __ia64
-#define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4
-#define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4
-static volatile int C(a), C(b), C(c), C(d), C(e);
-static volatile int C(f), C(g), C(h), C(i), C(j);
-static volatile int C(k), C(l), C(m), C(n), C(o);
-static volatile int C(p), C(q), C(r), C(s), C(t);
-#if 0
-{/* the above lines make cc-mode.el confused so much */}
-#endif
-int rb_dummy_false = 0;
-NORETURN(NOINLINE(static void register_stack_extend(rb_context_t *, VALUE *, VALUE *)));
-static void
-register_stack_extend(rb_context_t *cont, VALUE *vp, VALUE *curr_bsp)
-{
-    if (rb_dummy_false) {
-        /* use registers as much as possible */
-        E(a) = E(b) = E(c) = E(d) = E(e) =
-        E(f) = E(g) = E(h) = E(i) = E(j) =
-        E(k) = E(l) = E(m) = E(n) = E(o) =
-        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
-        E(a) = E(b) = E(c) = E(d) = E(e) =
-        E(f) = E(g) = E(h) = E(i) = E(j) =
-        E(k) = E(l) = E(m) = E(n) = E(o) =
-        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
-    }
-    if (curr_bsp < cont->machine_register_stack_src+cont->machine_register_stack_size) {
-        register_stack_extend(cont, vp, (VALUE*)rb_ia64_bsp());
-    }
-    cont_restore_0(cont, vp);
-}
-#undef C
-#undef E
-#endif
-
 static void
 cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
 {
-    if (cont->machine_stack_src) {
+    if (cont->machine.stack_src) {
 #ifdef HAVE_ALLOCA
 #define STACK_PAD_SIZE 1
 #else
 #define STACK_PAD_SIZE 1024
 #endif
-	VALUE space[STACK_PAD_SIZE];
+        VALUE space[STACK_PAD_SIZE];
 
 #if !STACK_GROW_DIRECTION
-	if (addr_in_prev_frame > &space[0]) {
-	    /* Stack grows downward */
+        if (addr_in_prev_frame > &space[0]) {
+            /* Stack grows downward */
 #endif
 #if STACK_GROW_DIRECTION <= 0
-	    volatile VALUE *const end = cont->machine_stack_src;
-	    if (&space[0] > end) {
+            volatile VALUE *const end = cont->machine.stack_src;
+            if (&space[0] > end) {
 # ifdef HAVE_ALLOCA
-		volatile VALUE *sp = ALLOCA_N(VALUE, &space[0] - end);
-		(void)sp;
+                volatile VALUE *sp = ALLOCA_N(VALUE, &space[0] - end);
+                space[0] = *sp;
 # else
-		cont_restore_0(cont, &space[0]);
+                cont_restore_0(cont, &space[0]);
 # endif
-	    }
+            }
 #endif
 #if !STACK_GROW_DIRECTION
-	}
-	else {
-	    /* Stack grows upward */
+        }
+        else {
+            /* Stack grows upward */
 #endif
 #if STACK_GROW_DIRECTION >= 0
-	    volatile VALUE *const end = cont->machine_stack_src + cont->machine_stack_size;
-	    if (&space[STACK_PAD_SIZE] < end) {
+            volatile VALUE *const end = cont->machine.stack_src + cont->machine.stack_size;
+            if (&space[STACK_PAD_SIZE] < end) {
 # ifdef HAVE_ALLOCA
-		volatile VALUE *sp = ALLOCA_N(VALUE, end - &space[STACK_PAD_SIZE]);
-		(void)sp;
+                volatile VALUE *sp = ALLOCA_N(VALUE, end - &space[STACK_PAD_SIZE]);
+                space[0] = *sp;
 # else
-		cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
+                cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
 # endif
-	    }
+            }
 #endif
 #if !STACK_GROW_DIRECTION
-	}
+        }
 #endif
     }
     cont_restore_1(cont);
 }
-#ifdef __ia64
-#define cont_restore_0(cont, vp) register_stack_extend((cont), (vp), (VALUE*)rb_ia64_bsp());
-#endif
 
 /*
  *  Document-class: Continuation
  *
- *  Continuation objects are generated by <code>Kernel#callcc</code>,
- *  after having <code>require</code>d <i>continuation</i>. They hold
+ *  Continuation objects are generated by Kernel#callcc,
+ *  after having +require+d <i>continuation</i>. They hold
  *  a return address and execution context, allowing a nonlocal return
- *  to the end of the <code>callcc</code> block from anywhere within a
- *  program.  Continuations are somewhat analogous to a structured
+ *  to the end of the #callcc block from anywhere within a
+ *  program. Continuations are somewhat analogous to a structured
  *  version of C's <code>setjmp/longjmp</code> (although they contain
  *  more state, so you might consider them closer to threads).
  *
@@ -800,13 +1426,31 @@ 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:
  *
  *     require "continuation"
  *     callcc {|cont|
  *       for i in 0..4
- *         print "\n#{i}: "
+ *         print "#{i}: "
  *         for j in i*5...(i+1)*5
  *           cont.call() if j == 17
  *           printf "%3d", j
@@ -827,15 +1471,15 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
  *  call-seq:
  *     callcc {|cont| block }   ->  obj
  *
- *  Generates a <code>Continuation</code> object, which it passes to
+ *  Generates a Continuation object, which it passes to
  *  the associated block. You need to <code>require
  *  'continuation'</code> before using this method. Performing a
- *  <em>cont</em><code>.call</code> will cause the <code>callcc</code>
+ *  <em>cont</em><code>.call</code> will cause the #callcc
  *  to return (as will falling through the end of the block). The
- *  value returned by the <code>callcc</code> is the value of the
+ *  value returned by the #callcc is the value of the
  *  block, or the value passed to <em>cont</em><code>.call</code>. See
- *  class <code>Continuation</code> for more details. Also see
- *  <code>Kernel::throw</code> for an alternative mechanism for
+ *  class Continuation for more details. Also see
+ *  Kernel#throw for an alternative mechanism for
  *  unwinding a call stack.
  */
 
@@ -846,23 +1490,101 @@ rb_callcc(VALUE self)
     volatile VALUE val = cont_capture(&called);
 
     if (called) {
-	return val;
+        return val;
     }
     else {
-	return rb_yield(val);
+        return rb_yield(val);
     }
 }
 
 static VALUE
-make_passing_arg(int argc, VALUE *argv)
+make_passing_arg(int argc, const VALUE *argv)
 {
-    switch(argc) {
+    switch (argc) {
+      case -1:
+        return argv[0];
       case 0:
-	return Qnil;
+        return Qnil;
       case 1:
-	return argv[0];
+        return argv[0];
       default:
-	return rb_ary_new4(argc, argv);
+        return rb_ary_new4(argc, argv);
+    }
+}
+
+typedef VALUE e_proc(VALUE);
+
+/* CAUTION!! : Currently, error in rollback_func is not supported  */
+/* same as rb_protect if set rollback_func to NULL */
+void
+ruby_register_rollback_func_for_ensure(e_proc *ensure_func, e_proc *rollback_func)
+{
+    st_table **table_p = &GET_VM()->ensure_rollback_table;
+    if (UNLIKELY(*table_p == NULL)) {
+        *table_p = st_init_numtable();
+    }
+    st_insert(*table_p, (st_data_t)ensure_func, (st_data_t)rollback_func);
+}
+
+static inline e_proc *
+lookup_rollback_func(e_proc *ensure_func)
+{
+    st_table *table = GET_VM()->ensure_rollback_table;
+    st_data_t val;
+    if (table && st_lookup(table, (st_data_t)ensure_func, &val))
+        return (e_proc *) val;
+    return (e_proc *) Qundef;
+}
+
+
+static inline void
+rollback_ensure_stack(VALUE self,rb_ensure_list_t *current,rb_ensure_entry_t *target)
+{
+    rb_ensure_list_t *p;
+    rb_ensure_entry_t *entry;
+    size_t i, j;
+    size_t cur_size;
+    size_t target_size;
+    size_t base_point;
+    e_proc *func;
+
+    cur_size = 0;
+    for (p=current; p; p=p->next)
+        cur_size++;
+    target_size = 0;
+    for (entry=target; entry->marker; entry++)
+        target_size++;
+
+    /* search common stack point */
+    p = current;
+    base_point = cur_size;
+    while (base_point) {
+        if (target_size >= base_point &&
+            p->entry.marker == target[target_size - base_point].marker)
+            break;
+        base_point --;
+        p = p->next;
+    }
+
+    /* rollback function check */
+    for (i=0; i < target_size - base_point; i++) {
+        if (!lookup_rollback_func(target[i].e_proc)) {
+            rb_raise(rb_eRuntimeError, "continuation called from out of critical rb_ensure scope");
+        }
+    }
+    /* pop ensure stack */
+    while (cur_size > base_point) {
+        /* escape from ensure block */
+        (*current->entry.e_proc)(current->entry.data2);
+        current = current->next;
+        cur_size--;
+    }
+    /* push ensure stack */
+    for (j = 0; j < i; j++) {
+        func = lookup_rollback_func(target[i - j - 1].e_proc);
+        if ((VALUE)func != Qundef) {
+            (*func)(target[i - j - 1].data2);
+        }
     }
 }
 
@@ -871,11 +1593,10 @@ make_passing_arg(int argc, VALUE *argv)
  *     cont.call(args, ...)
  *     cont[args, ...]
  *
- *  Invokes the continuation. The program continues from the end of the
- *  <code>callcc</code> block. If no arguments are given, the original
- *  <code>callcc</code> returns <code>nil</code>. If one argument is
- *  given, <code>callcc</code> returns it. Otherwise, an array
- *  containing <i>args</i> is returned.
+ *  Invokes the continuation. The program continues from the end of
+ *  the #callcc block. If no arguments are given, the original #callcc
+ *  returns +nil+. If one argument is given, #callcc returns
+ *  it. Otherwise, an array containing <i>args</i> is returned.
  *
  *     callcc {|cont|  cont.call }           #=> nil
  *     callcc {|cont|  cont.call 1 }         #=> 1
@@ -885,24 +1606,21 @@ make_passing_arg(int argc, VALUE *argv)
 static VALUE
 rb_cont_call(int argc, VALUE *argv, VALUE contval)
 {
-    rb_context_t *cont;
+    rb_context_t *cont = cont_ptr(contval);
     rb_thread_t *th = GET_THREAD();
-    GetContPtr(contval, cont);
 
-    if (cont->saved_thread.self != th->self) {
-	rb_raise(rb_eRuntimeError, "continuation called across threads");
+    if (cont_thread_value(cont) != th->self) {
+        rb_raise(rb_eRuntimeError, "continuation called across threads");
     }
-    if (cont->saved_thread.protect_tag != th->protect_tag) {
-	rb_raise(rb_eRuntimeError, "continuation called across stack rewinding barrier");
+    if (cont->saved_ec.protect_tag != th->ec->protect_tag) {
+        rb_raise(rb_eRuntimeError, "continuation called across stack rewinding barrier");
     }
-    if (cont->saved_thread.fiber) {
-	rb_fiber_t *fcont;
-	GetFiberPtr(cont->saved_thread.fiber, fcont);
-
-	if (th->fiber != cont->saved_thread.fiber) {
-	    rb_raise(rb_eRuntimeError, "continuation called across fiber");
-	}
+    if (cont->saved_ec.fiber_ptr) {
+        if (th->ec->fiber_ptr != cont->saved_ec.fiber_ptr) {
+            rb_raise(rb_eRuntimeError, "continuation called across fiber");
+        }
     }
+    rollback_ensure_stack(contval, th->ec->ensure_list, cont->ensure_array);
 
     cont->argc = argc;
     cont->value = make_passing_arg(argc, argv);
@@ -925,14 +1643,15 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
  *  the programmer and not the VM.
  *
  *  As opposed to other stackless light weight concurrency models, each fiber
- *  comes with a small 4KB stack. This enables the fiber to be paused from deeply
- *  nested function calls within the fiber block.
+ *  comes with a stack.  This enables the fiber to be paused from deeply
+ *  nested function calls within the fiber block.  See the ruby(1)
+ *  manpage to configure the size of the fiber stack(s).
  *
- *  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.
+ *  When a fiber is created it will not run automatically. Rather it must
+ *  be explicitly asked to run using the Fiber#resume method.
  *  The code running inside the fiber can give up control by calling
- *  <code>Fiber.yield</code> in which case it yields control back to caller
- *  (the caller of the <code>Fiber#resume</code>).
+ *  Fiber.yield in which case it yields control back to caller (the
+ *  caller of the Fiber#resume).
  *
  *  Upon yielding or termination the Fiber returns the value of the last
  *  executed expression
@@ -954,10 +1673,10 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
  *    2
  *    FiberError: dead fiber called
  *
- *  The <code>Fiber#resume</code> method accepts an arbitrary number of
- *  parameters, if it is the first call to <code>resume</code> then they
- *  will be passed as block arguments. Otherwise they will be the return
- *  value of the call to <code>Fiber.yield</code>
+ *  The Fiber#resume method accepts an arbitrary number of parameters,
+ *  if it is the first call to #resume then they will be passed as
+ *  block arguments. Otherwise they will be the return value of the
+ *  call to Fiber.yield
  *
  *  Example:
  *
@@ -966,22 +1685,21 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
  *    end
  *
  *    puts fiber.resume 10
- *    puts fiber.resume 14
- *    puts fiber.resume 18
+ *    puts fiber.resume 1_000_000
+ *    puts fiber.resume "The fiber will be dead before I can cause trouble"
  *
  *  <em>produces</em>
  *
  *    12
- *    14
+ *    1000000
  *    FiberError: dead fiber called
  *
  */
 
-#define FIBER_VM_STACK_SIZE (4 * 1024)
-
 static const rb_data_type_t fiber_data_type = {
     "fiber",
-    {fiber_mark, fiber_free, fiber_memsize,},
+    {fiber_mark, fiber_free, fiber_memsize, fiber_compact,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
@@ -991,344 +1709,419 @@ fiber_alloc(VALUE klass)
 }
 
 static rb_fiber_t*
-fiber_t_alloc(VALUE fibval)
+fiber_t_alloc(VALUE fiber_value)
 {
-    rb_fiber_t *fib;
+    rb_fiber_t *fiber;
     rb_thread_t *th = GET_THREAD();
 
-    if (DATA_PTR(fibval) != 0) {
-	rb_raise(rb_eRuntimeError, "cannot initialize twice");
+    if (DATA_PTR(fiber_value) != 0) {
+        rb_raise(rb_eRuntimeError, "cannot initialize twice");
     }
 
     THREAD_MUST_BE_RUNNING(th);
-    fib = ALLOC(rb_fiber_t);
-    memset(fib, 0, sizeof(rb_fiber_t));
-    fib->cont.self = fibval;
-    fib->cont.type = FIBER_CONTEXT;
-    cont_init(&fib->cont, th);
-    fib->prev = Qnil;
-    fib->status = CREATED;
+    fiber = ZALLOC(rb_fiber_t);
+    fiber->cont.self = fiber_value;
+    fiber->cont.type = FIBER_CONTEXT;
+    cont_init(&fiber->cont, th);
+
+    fiber->cont.saved_ec.fiber_ptr = fiber;
+    rb_ec_clear_vm_stack(&fiber->cont.saved_ec);
+
+    fiber->prev = NULL;
 
-    DATA_PTR(fibval) = fib;
+    /* fiber->status == 0 == CREATED
+     * So that we don't need to set status: fiber_status_set(fiber, FIBER_CREATED); */
+    VM_ASSERT(FIBER_CREATED_P(fiber));
 
-    return fib;
+    DATA_PTR(fiber_value) = fiber;
+
+    return fiber;
 }
 
 static VALUE
-fiber_init(VALUE fibval, VALUE proc)
+fiber_initialize(VALUE self, VALUE proc, struct fiber_pool * fiber_pool)
 {
-    rb_fiber_t *fib = fiber_t_alloc(fibval);
-    rb_context_t *cont = &fib->cont;
-    rb_thread_t *th = &cont->saved_thread;
+    rb_fiber_t *fiber = fiber_t_alloc(self);
+
+    fiber->first_proc = proc;
+    fiber->stack.base = NULL;
+    fiber->stack.pool = fiber_pool;
+
+    return self;
+}
+
+static void
+fiber_prepare_stack(rb_fiber_t *fiber)
+{
+    rb_context_t *cont = &fiber->cont;
+    rb_execution_context_t *sec = &cont->saved_ec;
+
+    size_t vm_stack_size = 0;
+    VALUE *vm_stack = fiber_initialize_coroutine(fiber, &vm_stack_size);
 
     /* initialize cont */
-    cont->vm_stack = 0;
-
-    th->stack = 0;
-    th->stack_size = 0;
-
-    fiber_link_join(fib);
-
-    th->stack_size = FIBER_VM_STACK_SIZE;
-    th->stack = ALLOC_N(VALUE, th->stack_size);
-
-    th->cfp = (void *)(th->stack + th->stack_size);
-    th->cfp--;
-    th->cfp->pc = 0;
-    th->cfp->sp = th->stack + 1;
-    th->cfp->bp = 0;
-    th->cfp->lfp = th->stack;
-    *th->cfp->lfp = 0;
-    th->cfp->dfp = th->stack;
-    th->cfp->self = Qnil;
-    th->cfp->flag = 0;
-    th->cfp->iseq = 0;
-    th->cfp->proc = 0;
-    th->cfp->block_iseq = 0;
-    th->cfp->me = 0;
-    th->tag = 0;
-    th->local_storage = st_init_numtable();
-
-    th->first_proc = proc;
-
-#if !FIBER_USE_NATIVE
-    MEMCPY(&cont->jmpbuf, &th->root_jmpbuf, rb_jmpbuf_t, 1);
-#endif
+    cont->saved_vm_stack.ptr = NULL;
+    rb_ec_initialize_vm_stack(sec, vm_stack, vm_stack_size / sizeof(VALUE));
 
-    return fibval;
+    sec->tag = NULL;
+    sec->local_storage = NULL;
+    sec->local_storage_recursive_hash = Qnil;
+    sec->local_storage_recursive_hash_for_trace = Qnil;
 }
 
 /* :nodoc: */
 static VALUE
-rb_fiber_init(VALUE fibval)
+rb_fiber_initialize(int argc, VALUE* argv, VALUE self)
 {
-    return fiber_init(fibval, rb_block_proc());
+    return fiber_initialize(self, rb_block_proc(), &shared_fiber_pool);
 }
 
 VALUE
-rb_fiber_new(VALUE (*func)(ANYARGS), VALUE obj)
+rb_fiber_new(rb_block_call_func_t func, VALUE obj)
 {
-    return fiber_init(fiber_alloc(rb_cFiber), rb_proc_new(func, obj));
+    return fiber_initialize(fiber_alloc(rb_cFiber), rb_proc_new(func, obj), &shared_fiber_pool);
 }
 
-static VALUE
-return_fiber(void)
-{
-    rb_fiber_t *fib;
-    VALUE curr = rb_fiber_current();
-    GetFiberPtr(curr, fib);
+static void rb_fiber_terminate(rb_fiber_t *fiber, int need_interrupt);
 
-    if (fib->prev == Qnil) {
-	rb_thread_t *th = GET_THREAD();
+#define PASS_KW_SPLAT (rb_empty_keyword_given_p() ? RB_PASS_EMPTY_KEYWORDS : rb_keyword_given_p())
 
-	if (th->root_fiber != curr) {
-	    return th->root_fiber;
-	}
-	else {
-	    rb_raise(rb_eFiberError, "can't yield from root fiber");
-	}
+void
+rb_fiber_start(void)
+{
+    rb_thread_t * volatile th = GET_THREAD();
+    rb_fiber_t *fiber = th->ec->fiber_ptr;
+    rb_proc_t *proc;
+    enum ruby_tag_type state;
+    int need_interrupt = TRUE;
+
+    VM_ASSERT(th->ec == ruby_current_execution_context_ptr);
+    VM_ASSERT(FIBER_RESUMED_P(fiber));
+
+    EC_PUSH_TAG(th->ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+        rb_context_t *cont = &VAR_FROM_MEMORY(fiber)->cont;
+        int argc;
+        const VALUE *argv, args = cont->value;
+        int kw_splat = cont->kw_splat;
+        GetProcPtr(fiber->first_proc, proc);
+        argv = (argc = cont->argc) > 1 ? RARRAY_CONST_PTR(args) : &args;
+        cont->value = Qnil;
+        th->ec->errinfo = Qnil;
+        th->ec->root_lep = rb_vm_proc_local_ep(fiber->first_proc);
+        th->ec->root_svar = Qfalse;
+
+        EXEC_EVENT_HOOK(th->ec, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, 0, Qnil);
+        rb_adjust_argv_kw_splat(&argc, &argv, &kw_splat);
+        cont->value = rb_vm_invoke_proc(th->ec, proc, argc, argv, kw_splat, VM_BLOCK_HANDLER_NONE);
     }
-    else {
-	VALUE prev = fib->prev;
-	fib->prev = Qnil;
-	return prev;
+    EC_POP_TAG();
+
+    if (state) {
+        VALUE err = th->ec->errinfo;
+        VM_ASSERT(FIBER_RESUMED_P(fiber));
+
+        if (state == TAG_RAISE || state == TAG_FATAL) {
+            rb_threadptr_pending_interrupt_enque(th, err);
+        }
+        else {
+            err = rb_vm_make_jump_tag_but_local_jump(state, err);
+            if (!NIL_P(err)) {
+                rb_threadptr_pending_interrupt_enque(th, err);
+            }
+        }
+        need_interrupt = TRUE;
     }
+
+    rb_fiber_terminate(fiber, need_interrupt);
+    VM_UNREACHABLE(rb_fiber_start);
 }
 
-VALUE rb_fiber_transfer(VALUE fib, int argc, VALUE *argv);
+static rb_fiber_t *
+root_fiber_alloc(rb_thread_t *th)
+{
+    VALUE fiber_value = fiber_alloc(rb_cFiber);
+    rb_fiber_t *fiber = th->ec->fiber_ptr;
 
-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->context.uc_stack.ss_sp;
-    terminated_machine_stack.size = fib->context.uc_stack.ss_size / sizeof(VALUE);
-    fib->context.uc_stack.ss_sp = NULL;
-    fib->cont.machine_stack = NULL;
-    fib->cont.machine_stack_size = 0;
+    VM_ASSERT(DATA_PTR(fiber_value) == NULL);
+    VM_ASSERT(fiber->cont.type == FIBER_CONTEXT);
+    VM_ASSERT(fiber->status == FIBER_RESUMED);
+
+    th->root_fiber = fiber;
+    DATA_PTR(fiber_value) = fiber;
+    fiber->cont.self = fiber_value;
+
+#ifdef COROUTINE_PRIVATE_STACK
+    fiber->stack = fiber_pool_stack_acquire(&shared_fiber_pool);
+    coroutine_initialize_main(&fiber->context, fiber_pool_stack_base(&fiber->stack), fiber->stack.available, th->ec->machine.stack_start);
+#else
+    coroutine_initialize_main(&fiber->context);
 #endif
-    rb_fiber_transfer(return_fiber(), 1, &value);
+
+    return fiber;
 }
 
 void
-rb_fiber_start(void)
+rb_threadptr_root_fiber_setup(rb_thread_t *th)
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_fiber_t *fib;
-    rb_context_t *cont;
-    rb_proc_t *proc;
-    int state;
-
-    GetFiberPtr(th->fiber, fib);
-    cont = &fib->cont;
-
-    TH_PUSH_TAG(th);
-    if ((state = EXEC_TAG()) == 0) {
-	int argc;
-	VALUE *argv, args;
-	GetProcPtr(cont->saved_thread.first_proc, proc);
-	args = cont->value;
-	argv = (argc = cont->argc) > 1 ? RARRAY_PTR(args) : &args;
-	cont->value = Qnil;
-	th->errinfo = Qnil;
-	th->local_lfp = proc->block.lfp;
-	th->local_svar = Qnil;
-
-	fib->status = RUNNING;
-	cont->value = rb_vm_invoke_proc(th, proc, proc->block.self, argc, argv, 0);
+    rb_fiber_t *fiber = ruby_mimmalloc(sizeof(rb_fiber_t));
+    if (!fiber) {
+        rb_bug("%s", strerror(errno)); /* ... is it possible to call rb_bug here? */
     }
-    TH_POP_TAG();
+    MEMZERO(fiber, rb_fiber_t, 1);
+    fiber->cont.type = FIBER_CONTEXT;
+    fiber->cont.saved_ec.fiber_ptr = fiber;
+    fiber->cont.saved_ec.thread_ptr = th;
+    fiber_status_set(fiber, FIBER_RESUMED); /* skip CREATED */
+    th->ec = &fiber->cont.saved_ec;
+}
 
-    if (state) {
-	if (state == TAG_RAISE) {
-	    th->thrown_errinfo = th->errinfo;
-	}
-	else {
-	    th->thrown_errinfo =
-	      rb_vm_make_jump_tag_but_local_jump(state, th->errinfo);
-	}
-	RUBY_VM_SET_INTERRUPT(th);
+void
+rb_threadptr_root_fiber_release(rb_thread_t *th)
+{
+    if (th->root_fiber) {
+        /* ignore. A root fiber object will free th->ec */
+    }
+    else {
+        VM_ASSERT(th->ec->fiber_ptr->cont.type == FIBER_CONTEXT);
+        VM_ASSERT(th->ec->fiber_ptr->cont.self == 0);
+        fiber_free(th->ec->fiber_ptr);
+
+        if (th->ec == ruby_current_execution_context_ptr) {
+            ruby_current_execution_context_ptr = NULL;
+        }
+        th->ec = NULL;
     }
-
-    rb_fiber_terminate(fib);
-    rb_bug("rb_fiber_start: unreachable");
 }
 
-static rb_fiber_t *
-root_fiber_alloc(rb_thread_t *th)
+void
+rb_threadptr_root_fiber_terminate(rb_thread_t *th)
 {
-    rb_fiber_t *fib;
-    /* no need to allocate vm stack */
-    fib = fiber_t_alloc(fiber_alloc(rb_cFiber));
-    fib->cont.type = ROOT_FIBER_CONTEXT;
-#if FIBER_USE_NATIVE
-#ifdef _WIN32
-    fib->fib_handle = ConvertThreadToFiber(0);
-#endif
-#endif
-    fib->status = RUNNING;
-    fib->prev_fiber = fib->next_fiber = fib;
+    rb_fiber_t *fiber = th->ec->fiber_ptr;
+
+    fiber->status = FIBER_TERMINATED;
 
-    return fib;
+    // The vm_stack is `alloca`ed on the thread stack, so it's gone too:
+    rb_ec_clear_vm_stack(th->ec);
 }
 
-VALUE
-rb_fiber_current(void)
+static inline rb_fiber_t*
+fiber_current(void)
 {
-    rb_thread_t *th = GET_THREAD();
-    if (th->fiber == 0) {
-	/* save root */
-	rb_fiber_t *fib = root_fiber_alloc(th);
-	th->root_fiber = th->fiber = fib->cont.self;
+    rb_execution_context_t *ec = GET_EC();
+    if (ec->fiber_ptr->cont.self == 0) {
+        root_fiber_alloc(rb_ec_thread_ptr(ec));
     }
-    return th->fiber;
+    return ec->fiber_ptr;
 }
 
-static VALUE
-fiber_store(rb_fiber_t *next_fib)
+static inline rb_fiber_t*
+return_fiber(void)
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_fiber_t *fib;
+    rb_fiber_t *fiber = fiber_current();
+    rb_fiber_t *prev = fiber->prev;
+
+    if (!prev) {
+        rb_thread_t *th = GET_THREAD();
+        rb_fiber_t *root_fiber = th->root_fiber;
+
+        VM_ASSERT(root_fiber != NULL);
 
-    if (th->fiber) {
-	GetFiberPtr(th->fiber, fib);
-	cont_save_thread(&fib->cont, th);
+        if (root_fiber == fiber) {
+            rb_raise(rb_eFiberError, "can't yield from root fiber");
+        }
+        return root_fiber;
     }
     else {
-	/* create current fiber */
-	fib = root_fiber_alloc(th);
-	th->root_fiber = th->fiber = fib->cont.self;
+        fiber->prev = NULL;
+        return prev;
     }
+}
+
+VALUE
+rb_fiber_current(void)
+{
+    return fiber_current()->cont.self;
+}
 
-#if !FIBER_USE_NATIVE
-    cont_save_machine_stack(th, &fib->cont);
+// Prepare to execute next_fiber on the given thread.
+static inline VALUE
+fiber_store(rb_fiber_t *next_fiber, rb_thread_t *th)
+{
+    rb_fiber_t *fiber;
 
-    if (ruby_setjmp(fib->cont.jmpbuf)) {
-#else /* FIBER_USE_NATIVE */
-    {
-	fiber_setcontext(next_fib, fib);
-#ifndef _WIN32
-	if (terminated_machine_stack.ptr) {
-	    if (machine_stack_cache_index < MAX_MAHINE_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));
-		}
-		else {
-		    rb_bug("terminated fiber resumed");
-		}
-	    }
-	    terminated_machine_stack.ptr = NULL;
-	    terminated_machine_stack.size = 0;
-	}
-#endif
-#endif
-	/* restored */
-	GetFiberPtr(th->fiber, fib);
-	if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
-	return fib->cont.value;
+    if (th->ec->fiber_ptr != NULL) {
+        fiber = th->ec->fiber_ptr;
     }
-#if !FIBER_USE_NATIVE
     else {
-	return Qundef;
+        /* create root fiber */
+        fiber = root_fiber_alloc(th);
     }
-#endif
+
+    if (FIBER_CREATED_P(next_fiber)) {
+        fiber_prepare_stack(next_fiber);
+    }
+
+    VM_ASSERT(FIBER_RESUMED_P(fiber) || FIBER_TERMINATED_P(fiber));
+    VM_ASSERT(FIBER_RUNNABLE_P(next_fiber));
+
+    if (FIBER_RESUMED_P(fiber)) fiber_status_set(fiber, FIBER_SUSPENDED);
+
+    fiber_status_set(next_fiber, FIBER_RESUMED);
+    fiber_setcontext(next_fiber, fiber);
+
+    fiber = th->ec->fiber_ptr;
+
+    /* Raise an exception if that was the result of executing the fiber */
+    if (fiber->cont.argc == -1) rb_exc_raise(fiber->cont.value);
+
+    return fiber->cont.value;
 }
 
 static inline VALUE
-fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
+fiber_switch(rb_fiber_t *fiber, int argc, const VALUE *argv, int is_resume, int kw_splat)
 {
     VALUE value;
-    rb_fiber_t *fib;
-    rb_context_t *cont;
+    rb_context_t *cont = &fiber->cont;
     rb_thread_t *th = GET_THREAD();
 
-    GetFiberPtr(fibval, fib);
-    cont = &fib->cont;
-
-    if (cont->saved_thread.self != th->self) {
-	rb_raise(rb_eFiberError, "fiber called across threads");
-    }
-    else if (cont->saved_thread.protect_tag != th->protect_tag) {
-	rb_raise(rb_eFiberError, "fiber called across stack rewinding barrier");
-    }
-    else if (fib->status == TERMINATED) {
-	value = rb_exc_new2(rb_eFiberError, "dead fiber called");
-	if (th->fiber != fibval) {
-	    GetFiberPtr(th->fiber, fib);
-	    if (fib->status != TERMINATED) rb_exc_raise(value);
-	    fibval = th->root_fiber;
-	}
-	else {
-	    fibval = fib->prev;
-	    if (NIL_P(fibval)) fibval = th->root_fiber;
-	}
-	GetFiberPtr(fibval, fib);
-	cont = &fib->cont;
-	cont->argc = -1;
-	cont->value = value;
-#if FIBER_USE_NATIVE
-	{
-	    VALUE oldfibval;
-	    rb_fiber_t *oldfib;
-	    oldfibval = rb_fiber_current();
-	    GetFiberPtr(oldfibval, oldfib);
-	    fiber_setcontext(fib, oldfib);
-	}
-#else
-	cont_restore_0(cont, &value);
-#endif
+    /* make sure the root_fiber object is available */
+    if (th->root_fiber == NULL) root_fiber_alloc(th);
+
+    if (th->ec->fiber_ptr == fiber) {
+        /* ignore fiber context switch
+         * because destination fiber is same as current fiber
+         */
+        return make_passing_arg(argc, argv);
+    }
+
+    if (cont_thread_value(cont) != th->self) {
+        rb_raise(rb_eFiberError, "fiber called across threads");
+    }
+    else if (cont->saved_ec.protect_tag != th->ec->protect_tag) {
+        rb_raise(rb_eFiberError, "fiber called across stack rewinding barrier");
+    }
+    else if (FIBER_TERMINATED_P(fiber)) {
+        value = rb_exc_new2(rb_eFiberError, "dead fiber called");
+
+        if (!FIBER_TERMINATED_P(th->ec->fiber_ptr)) {
+            rb_exc_raise(value);
+            VM_UNREACHABLE(fiber_switch);
+        }
+        else {
+            /* th->ec->fiber_ptr 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) */
+            VM_ASSERT(FIBER_SUSPENDED_P(th->root_fiber));
+
+            cont = &th->root_fiber->cont;
+            cont->argc = -1;
+            cont->value = value;
+
+            fiber_setcontext(th->root_fiber, th->ec->fiber_ptr);
+
+            VM_UNREACHABLE(fiber_switch);
+        }
     }
 
     if (is_resume) {
-	fib->prev = rb_fiber_current();
+        fiber->prev = fiber_current();
     }
 
+    VM_ASSERT(FIBER_RUNNABLE_P(fiber));
+
     cont->argc = argc;
+    cont->kw_splat = kw_splat;
     cont->value = make_passing_arg(argc, argv);
 
-    value = fiber_store(fib);
-#if !FIBER_USE_NATIVE
-    if (value == Qundef) {
-	cont_restore_0(cont, &value);
-	rb_bug("rb_fiber_resume: unreachable");
+    value = fiber_store(fiber, th);
+
+    if (is_resume && FIBER_TERMINATED_P(fiber)) {
+        fiber_stack_release(fiber);
     }
-#endif
-    RUBY_VM_CHECK_INTS();
+
+    RUBY_VM_CHECK_INTS(th->ec);
+
+    EXEC_EVENT_HOOK(th->ec, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, 0, Qnil);
 
     return value;
 }
 
 VALUE
-rb_fiber_transfer(VALUE fib, int argc, VALUE *argv)
+rb_fiber_transfer(VALUE fiber_value, int argc, const VALUE *argv)
+{
+    return fiber_switch(fiber_ptr(fiber_value), argc, argv, 0, RB_NO_KEYWORDS);
+}
+
+void
+rb_fiber_close(rb_fiber_t *fiber)
 {
-    return fiber_switch(fib, argc, argv, 0);
+    fiber_status_set(fiber, FIBER_TERMINATED);
+}
+
+static void
+rb_fiber_terminate(rb_fiber_t *fiber, int need_interrupt)
+{
+    VALUE value = fiber->cont.value;
+    rb_fiber_t *next_fiber;
+
+    VM_ASSERT(FIBER_RESUMED_P(fiber));
+    rb_fiber_close(fiber);
+
+    coroutine_destroy(&fiber->context);
+
+    fiber->cont.machine.stack = NULL;
+    fiber->cont.machine.stack_size = 0;
+
+    next_fiber = return_fiber();
+    if (need_interrupt) RUBY_VM_SET_INTERRUPT(&next_fiber->cont.saved_ec);
+    fiber_switch(next_fiber, 1, &value, 0, RB_NO_KEYWORDS);
 }
 
 VALUE
-rb_fiber_resume(VALUE fibval, int argc, VALUE *argv)
+rb_fiber_resume_kw(VALUE fiber_value, int argc, const VALUE *argv, int kw_splat)
 {
-    rb_fiber_t *fib;
-    GetFiberPtr(fibval, fib);
+    rb_fiber_t *fiber = fiber_ptr(fiber_value);
+
+    if (argc == -1 && FIBER_CREATED_P(fiber)) {
+        rb_raise(rb_eFiberError, "cannot raise exception on unborn fiber");
+    }
+
+    if (fiber->prev != 0 || fiber_is_root_p(fiber)) {
+        rb_raise(rb_eFiberError, "double resume");
+    }
 
-    if (fib->prev != Qnil || fib->cont.type == ROOT_FIBER_CONTEXT) {
-	rb_raise(rb_eFiberError, "double resume");
+    if (fiber->transferred != 0) {
+        rb_raise(rb_eFiberError, "cannot resume transferred Fiber");
     }
 
-    return fiber_switch(fibval, argc, argv, 1);
+    return fiber_switch(fiber, argc, argv, 1, kw_splat);
+}
+
+VALUE
+rb_fiber_resume(VALUE fiber_value, int argc, const VALUE *argv)
+{
+    return rb_fiber_resume_kw(fiber_value, argc, argv, RB_NO_KEYWORDS);
 }
 
 VALUE
-rb_fiber_yield(int argc, VALUE *argv)
+rb_fiber_yield_kw(int argc, const VALUE *argv, int kw_splat)
 {
-    return rb_fiber_transfer(return_fiber(), argc, argv);
+    return fiber_switch(return_fiber(), argc, argv, 0, kw_splat);
+}
+
+VALUE
+rb_fiber_yield(int argc, const VALUE *argv)
+{
+    return fiber_switch(return_fiber(), argc, argv, 0, RB_NO_KEYWORDS);
+}
+
+void
+rb_fiber_reset_root_local_storage(rb_thread_t *th)
+{
+    if (th->root_fiber && th->root_fiber != th->ec->fiber_ptr) {
+        th->ec->local_storage = th->root_fiber->cont.saved_ec.local_storage;
+    }
 }
 
 /*
@@ -1341,32 +2134,56 @@ rb_fiber_yield(int argc, VALUE *argv)
  *  before using this method.
  */
 VALUE
-rb_fiber_alive_p(VALUE fibval)
+rb_fiber_alive_p(VALUE fiber_value)
 {
-    rb_fiber_t *fib;
-    GetFiberPtr(fibval, fib);
-    return fib->status != TERMINATED ? Qtrue : Qfalse;
+    return FIBER_TERMINATED_P(fiber_ptr(fiber_value)) ? Qfalse : Qtrue;
 }
 
 /*
  *  call-seq:
  *     fiber.resume(args, ...) -> obj
  *
- *  Resumes the fiber from the point at which the last <code>Fiber.yield</code>
- *  was called, or starts running it if it is the first call to
- *  <code>resume</code>. Arguments passed to resume will be the value of
- *  the <code>Fiber.yield</code> expression or will be passed as block
- *  parameters to the fiber's block if this is the first <code>resume</code>.
+ *  Resumes the fiber from the point at which the last Fiber.yield was
+ *  called, or starts running it if it is the first call to
+ *  #resume. Arguments passed to resume will be the value of the
+ *  Fiber.yield expression or will be passed as block parameters to
+ *  the fiber's block if this is the first #resume.
  *
  *  Alternatively, when resume is called it evaluates to the arguments passed
- *  to the next <code>Fiber.yield</code> statement inside the fiber's block
+ *  to the next Fiber.yield statement inside the fiber's block
  *  or to the block value if it runs to completion without any
- *  <code>Fiber.yield</code>
+ *  Fiber.yield
+ */
+static VALUE
+rb_fiber_m_resume(int argc, VALUE *argv, VALUE fiber)
+{
+    return rb_fiber_resume_kw(fiber, argc, argv, PASS_KW_SPLAT);
+}
+
+/*
+ *  call-seq:
+ *     fiber.raise                                 -> obj
+ *     fiber.raise(string)                         -> obj
+ *     fiber.raise(exception [, string [, array]]) -> obj
+ *
+ *  Raises an exception in the fiber at the point at which the last
+ *  Fiber.yield was called, or at the start if neither +resume+
+ *  nor +raise+ were called before.
+ *
+ *  With no arguments, raises a +RuntimeError+. With a single +String+
+ *  argument, raises a +RuntimeError+ with the string as a message.  Otherwise,
+ *  the first parameter should be the name of an +Exception+ class (or an
+ *  object that returns an +Exception+ object when sent an +exception+
+ *  message). The optional second parameter sets the message associated with
+ *  the exception, and the third parameter is an array of callback information.
+ *  Exceptions are caught by the +rescue+ clause of <code>begin...end</code>
+ *  blocks.
  */
 static VALUE
-rb_fiber_m_resume(int argc, VALUE *argv, VALUE fib)
+rb_fiber_raise(int argc, VALUE *argv, VALUE fiber)
 {
-    return rb_fiber_resume(fib, argc, argv);
+    VALUE exc = rb_make_exception(argc, argv);
+    return rb_fiber_resume_kw(fiber, -1, &exc, RB_NO_KEYWORDS);
 }
 
 /*
@@ -1376,21 +2193,57 @@ rb_fiber_m_resume(int argc, VALUE *argv, VALUE fib)
  *  Transfer control to another fiber, resuming it from where it last
  *  stopped or starting it if it was not resumed before. The calling
  *  fiber will be suspended much like in a call to
- *  <code>Fiber.yield</code>. You need to <code>require 'fiber'</code>
+ *  Fiber.yield. You need to <code>require 'fiber'</code>
  *  before using this method.
  *
  *  The fiber which receives the transfer call is treats it much like
  *  a resume call. Arguments passed to transfer are treated like those
  *  passed to resume.
  *
- *  You cannot resume a fiber that transferred control to another one.
- *  This will cause a double resume error. You need to transfer control
- *  back to this fiber before it can yield and resume.
+ *  You cannot call +resume+ on a fiber that has been transferred to.
+ *  If you call +transfer+ on a fiber, and later call +resume+ on the
+ *  the fiber, a +FiberError+ will be raised. Once you call +transfer+ on
+ *  a fiber, the only way to resume processing the fiber is to
+ *  call +transfer+ on it again.
+ *
+ *  Example:
+ *
+ *    fiber1 = Fiber.new do
+ *      puts "In Fiber 1"
+ *      Fiber.yield
+ *      puts "In Fiber 1 again"
+ *    end
+ *
+ *    fiber2 = Fiber.new do
+ *      puts "In Fiber 2"
+ *      fiber1.transfer
+ *      puts "Never see this message"
+ *    end
+ *
+ *    fiber3 = Fiber.new do
+ *      puts "In Fiber 3"
+ *    end
+ *
+ *    fiber2.resume
+ *    fiber3.resume
+ *    fiber1.resume rescue (p $!)
+ *    fiber1.transfer
+ *
+ *  <em>produces</em>
+ *
+ *    In Fiber 2
+ *    In Fiber 1
+ *    In Fiber 3
+ *    #<FiberError: cannot resume transferred Fiber>
+ *    In Fiber 1 again
+ *
  */
 static VALUE
-rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fib)
+rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fiber_value)
 {
-    return rb_fiber_transfer(fib, argc, argv);
+    rb_fiber_t *fiber = fiber_ptr(fiber_value);
+    fiber->transferred = 1;
+    return fiber_switch(fiber, argc, argv, 0, PASS_KW_SPLAT);
 }
 
 /*
@@ -1399,14 +2252,14 @@ rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fib)
  *
  *  Yields control back to the context that resumed the fiber, passing
  *  along any arguments that were passed to it. The fiber will resume
- *  processing at this point when <code>resume</code> is called next.
- *  Any arguments passed to the next <code>resume</code> will be the
- *  value that this <code>Fiber.yield</code> expression evaluates to.
+ *  processing at this point when #resume is called next.
+ *  Any arguments passed to the next #resume will be the value that
+ *  this Fiber.yield expression evaluates to.
  */
 static VALUE
 rb_fiber_s_yield(int argc, VALUE *argv, VALUE klass)
 {
-    return rb_fiber_yield(argc, argv);
+    return rb_fiber_yield_kw(argc, argv, PASS_KW_SPLAT);
 }
 
 /*
@@ -1423,7 +2276,119 @@ rb_fiber_s_current(VALUE klass)
     return rb_fiber_current();
 }
 
+/*
+ * call-seq:
+ *   fiber.to_s   -> string
+ *
+ * Returns fiber information string.
+ *
+ */
+
+static VALUE
+fiber_to_s(VALUE fiber_value)
+{
+    const rb_fiber_t *fiber = fiber_ptr(fiber_value);
+    const rb_proc_t *proc;
+    char status_info[0x20];
+
+    if (fiber->transferred) {
+        snprintf(status_info, 0x20, " (%s, transferred)", fiber_status_name(fiber->status));
+    }
+    else {
+        snprintf(status_info, 0x20, " (%s)", fiber_status_name(fiber->status));
+    }
+
+    if (!rb_obj_is_proc(fiber->first_proc)) {
+        VALUE str = rb_any_to_s(fiber_value);
+        strlcat(status_info, ">", sizeof(status_info));
+        rb_str_set_len(str, RSTRING_LEN(str)-1);
+        rb_str_cat_cstr(str, status_info);
+        return str;
+    }
+    GetProcPtr(fiber->first_proc, proc);
+    return rb_block_to_s(fiber_value, &proc->block, status_info);
+}
 
+#ifdef HAVE_WORKING_FORK
+void
+rb_fiber_atfork(rb_thread_t *th)
+{
+    if (th->root_fiber) {
+        if (&th->root_fiber->cont.saved_ec != th->ec) {
+            th->root_fiber = th->ec->fiber_ptr;
+        }
+        th->root_fiber->prev = 0;
+    }
+}
+#endif
+
+#ifdef RB_EXPERIMENTAL_FIBER_POOL
+static void
+fiber_pool_free(void *ptr)
+{
+    struct fiber_pool * fiber_pool = ptr;
+    RUBY_FREE_ENTER("fiber_pool");
+
+    fiber_pool_free_allocations(fiber_pool->allocations);
+    ruby_xfree(fiber_pool);
+
+    RUBY_FREE_LEAVE("fiber_pool");
+}
+
+static size_t
+fiber_pool_memsize(const void *ptr)
+{
+    const struct fiber_pool * fiber_pool = ptr;
+    size_t size = sizeof(*fiber_pool);
+
+    size += fiber_pool->count * fiber_pool->size;
+
+    return size;
+}
+
+static const rb_data_type_t FiberPoolDataType = {
+    "fiber_pool",
+    {NULL, fiber_pool_free, fiber_pool_memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE
+fiber_pool_alloc(VALUE klass)
+{
+    struct fiber_pool * fiber_pool = RB_ALLOC(struct fiber_pool);
+
+    return TypedData_Wrap_Struct(klass, &FiberPoolDataType, fiber_pool);
+}
+
+static VALUE
+rb_fiber_pool_initialize(int argc, VALUE* argv, VALUE self)
+{
+    rb_thread_t *th = GET_THREAD();
+    VALUE size = Qnil, count = Qnil, vm_stack_size = Qnil;
+    struct fiber_pool * fiber_pool = NULL;
+
+    // Maybe these should be keyword arguments.
+    rb_scan_args(argc, argv, "03", &size, &count, &vm_stack_size);
+
+    if (NIL_P(size)) {
+        size = INT2NUM(th->vm->default_params.fiber_machine_stack_size);
+    }
+
+    if (NIL_P(count)) {
+        count = INT2NUM(128);
+    }
+
+    if (NIL_P(vm_stack_size)) {
+        vm_stack_size = INT2NUM(th->vm->default_params.fiber_vm_stack_size);
+    }
+
+    TypedData_Get_Struct(self, struct fiber_pool, &FiberPoolDataType, fiber_pool);
+
+    fiber_pool_initialize(fiber_pool, NUM2SIZET(size), NUM2SIZET(count), NUM2SIZET(vm_stack_size));
+
+    return self;
+}
+#endif
 
 /*
  *  Document-class: FiberError
@@ -1441,8 +2406,10 @@ rb_fiber_s_current(VALUE klass)
 void
 Init_Cont(void)
 {
-#if FIBER_USE_NATIVE
     rb_thread_t *th = GET_THREAD();
+    size_t vm_stack_size = th->vm->default_params.fiber_vm_stack_size;
+    size_t machine_stack_size = th->vm->default_params.fiber_machine_stack_size;
+    size_t stack_size = machine_stack_size + vm_stack_size;
 
 #ifdef _WIN32
     SYSTEM_INFO info;
@@ -1451,20 +2418,33 @@ Init_Cont(void)
 #else /* not WIN32 */
     pagesize = sysconf(_SC_PAGESIZE);
 #endif
-    SET_MACHINE_STACK_END(&th->machine_stack_end);
-#endif
+    SET_MACHINE_STACK_END(&th->ec->machine.stack_end);
+
+    fiber_pool_initialize(&shared_fiber_pool, stack_size, FIBER_POOL_INITIAL_SIZE, vm_stack_size);
+
+    char * fiber_shared_fiber_pool_free_stacks = getenv("RUBY_SHARED_FIBER_POOL_FREE_STACKS");
+    if (fiber_shared_fiber_pool_free_stacks) {
+        shared_fiber_pool.free_stacks = atoi(fiber_shared_fiber_pool_free_stacks);
+    }
 
     rb_cFiber = rb_define_class("Fiber", rb_cObject);
     rb_define_alloc_func(rb_cFiber, fiber_alloc);
     rb_eFiberError = rb_define_class("FiberError", rb_eStandardError);
     rb_define_singleton_method(rb_cFiber, "yield", rb_fiber_s_yield, -1);
-    rb_define_method(rb_cFiber, "initialize", rb_fiber_init, 0);
+    rb_define_method(rb_cFiber, "initialize", rb_fiber_initialize, -1);
     rb_define_method(rb_cFiber, "resume", rb_fiber_m_resume, -1);
+    rb_define_method(rb_cFiber, "raise", rb_fiber_raise, -1);
+    rb_define_method(rb_cFiber, "to_s", fiber_to_s, 0);
+    rb_define_alias(rb_cFiber, "inspect", "to_s");
+
+#ifdef RB_EXPERIMENTAL_FIBER_POOL
+    rb_cFiberPool = rb_define_class("Pool", rb_cFiber);
+    rb_define_alloc_func(rb_cFiberPool, fiber_pool_alloc);
+    rb_define_method(rb_cFiberPool, "initialize", rb_fiber_pool_initialize, -1);
+#endif
 }
 
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
+RUBY_SYMBOL_EXPORT_BEGIN
 
 void
 ruby_Init_Continuation_body(void)
@@ -1485,6 +2465,4 @@ ruby_Init_Fiber_as_Coroutine(void)
     rb_define_singleton_method(rb_cFiber, "current", rb_fiber_s_current, 0);
 }
 
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
+RUBY_SYMBOL_EXPORT_END
diff --git a/coroutine/amd64/Context.S b/coroutine/amd64/Context.S
new file mode 100644
index 0000000000..ac986b2aa5
--- /dev/null
+++ b/coroutine/amd64/Context.S
@@ -0,0 +1,46 @@
+##
+##  This file is part of the "Coroutine" project and released under the MIT License.
+##
+##  Created by Samuel Williams on 10/5/2018.
+##  Copyright, 2018, by Samuel Williams. All rights reserved.
+##
+
+#define TOKEN_PASTE(x,y) x##y
+#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
+
+.text
+
+.globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
+PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+
+	# Save caller state
+	pushq %rbp
+	pushq %rbx
+	pushq %r12
+	pushq %r13
+	pushq %r14
+	pushq %r15
+
+	# Save caller stack pointer
+	movq %rsp, (%rdi)
+
+	# Restore callee stack pointer
+	movq (%rsi), %rsp
+
+	# Restore callee state
+	popq %r15
+	popq %r14
+	popq %r13
+	popq %r12
+	popq %rbx
+	popq %rbp
+
+	# Put the first argument into the return value
+	movq %rdi, %rax
+
+	# We pop the return address and jump to it
+	ret
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/coroutine/amd64/Context.h b/coroutine/amd64/Context.h
new file mode 100644
index 0000000000..8fe323c1a1
--- /dev/null
+++ b/coroutine/amd64/Context.h
@@ -0,0 +1,52 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 10/5/2018.
+ *  Copyright, 2018, by Samuel Williams. All rights reserved.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <string.h>
+
+#define COROUTINE __attribute__((noreturn)) void
+
+enum {COROUTINE_REGISTERS = 6};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    *--context->stack_pointer = NULL;
+    *--context->stack_pointer = (void*)start;
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+}
+
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+    context->stack_pointer = NULL;
+}
diff --git a/coroutine/arm32/Context.S b/coroutine/arm32/Context.S
new file mode 100644
index 0000000000..4308e1d1d2
--- /dev/null
+++ b/coroutine/arm32/Context.S
@@ -0,0 +1,22 @@
+##
+##  This file is part of the "Coroutine" project and released under the MIT License.
+##
+##  Created by Samuel Williams on 10/5/2018.
+##  Copyright, 2018, by Samuel Williams. All rights reserved.
+##
+
+.text
+
+.globl coroutine_transfer
+coroutine_transfer:
+	# Save caller state (8 registers + return address)
+	push {r4-r11,lr}
+	
+	# Save caller stack pointer
+	str sp, [r0]
+	
+	# Restore callee stack pointer
+	ldr sp, [r1]
+	
+	# Restore callee state (8 registers program counter)
+	pop {r4-r11,pc}
diff --git a/coroutine/arm32/Context.h b/coroutine/arm32/Context.h
new file mode 100644
index 0000000000..e29fe1bb63
--- /dev/null
+++ b/coroutine/arm32/Context.h
@@ -0,0 +1,51 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 10/5/2018.
+ *  Copyright, 2018, by Samuel Williams. All rights reserved.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <string.h>
+
+#define COROUTINE __attribute__((noreturn)) void
+#define COROUTINE_LIMITED_ADDRESS_SPACE
+
+enum {COROUTINE_REGISTERS = 8};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    *--context->stack_pointer = (void*)start;
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+}
+
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+}
diff --git a/coroutine/arm64/Context.S b/coroutine/arm64/Context.S
new file mode 100644
index 0000000000..f6e5f0a6bc
--- /dev/null
+++ b/coroutine/arm64/Context.S
@@ -0,0 +1,59 @@
+##
+##  This file is part of the "Coroutine" project and released under the MIT License.
+##
+##  Created by Samuel Williams on 10/5/2018.
+##  Copyright, 2018, by Samuel Williams. All rights reserved.
+##
+
+.text
+.align 2
+
+.global coroutine_transfer
+coroutine_transfer:
+
+	# Make space on the stack for caller registers
+	sub sp, sp, 0xb0
+	
+	# Save caller registers
+	stp d8, d9, [sp, 0x00]
+	stp d10, d11, [sp, 0x10]
+	stp d12, d13, [sp, 0x20]
+	stp d14, d15, [sp, 0x30]
+	stp x19, x20, [sp, 0x40]
+	stp x21, x22, [sp, 0x50]
+	stp x23, x24, [sp, 0x60]
+	stp x25, x26, [sp, 0x70]
+	stp x27, x28, [sp, 0x80]
+	stp x29, x30, [sp, 0x90]
+
+	# Save return address
+	str x30, [sp, 0xa0]
+
+	# Save stack pointer to x0 (first argument)
+	mov x2, sp
+	str x2, [x0, 0]
+
+	# Load stack pointer from x1 (second argument)
+	ldr x3, [x1, 0]
+	mov sp, x3
+
+	# Restore caller registers
+	ldp d8, d9, [sp, 0x00]
+	ldp d10, d11, [sp, 0x10]
+	ldp d12, d13, [sp, 0x20]
+	ldp d14, d15, [sp, 0x30]
+	ldp x19, x20, [sp, 0x40]
+	ldp x21, x22, [sp, 0x50]
+	ldp x23, x24, [sp, 0x60]
+	ldp x25, x26, [sp, 0x70]
+	ldp x27, x28, [sp, 0x80]
+	ldp x29, x30, [sp, 0x90]
+
+	# Load return address into x4
+	ldr x4, [sp, 0xa0]
+
+	# Pop stack frame
+	add sp, sp, 0xb0
+
+	# Jump to return address (in x4)
+	ret x4
diff --git a/coroutine/arm64/Context.h b/coroutine/arm64/Context.h
new file mode 100644
index 0000000000..a1ae921144
--- /dev/null
+++ b/coroutine/arm64/Context.h
@@ -0,0 +1,50 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 10/5/2018.
+ *  Copyright, 2018, by Samuel Williams. All rights reserved.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <string.h>
+
+#define COROUTINE __attribute__((noreturn)) void
+
+enum {COROUTINE_REGISTERS = 0xb0 / 8};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+
+    context->stack_pointer[0xa0 / 8] = (void*)start;
+}
+
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+}
diff --git a/coroutine/copy/Context.c b/coroutine/copy/Context.c
new file mode 100644
index 0000000000..a1b8a71200
--- /dev/null
+++ b/coroutine/copy/Context.c
@@ -0,0 +1,141 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 24/6/2019.
+ *  Copyright, 2019, by Samuel Williams. All rights reserved.
+*/
+
+#include "Context.h"
+
+// http://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html
+#ifndef __GNUC__
+#define __asm__ asm
+#endif
+
+#if defined(__sparc)
+__attribute__((noinline))
+// https://marc.info/?l=linux-sparc&m=131914569320660&w=2
+static void coroutine_flush_register_windows() {
+    __asm__
+#ifdef __GNUC__
+    __volatile__
+#endif
+#if defined(__sparcv9) || defined(__sparc_v9__) || defined(__arch64__)
+#ifdef __GNUC__
+    ("flushw" : : : "%o7")
+#else
+    ("flushw")
+#endif
+#else
+    ("ta 0x03")
+#endif
+    ;
+}
+#else
+static void coroutine_flush_register_windows() {}
+#endif
+
+int coroutine_save_stack(struct coroutine_context * context) {
+    void *stack_pointer = &stack_pointer;
+
+    assert(context->stack);
+    assert(context->base);
+
+    // At this point, you may need to ensure on architectures that use register windows, that all registers are flushed to the stack.
+    coroutine_flush_register_windows();
+
+    // Save stack to private area:
+    if (stack_pointer < context->base) {
+        size_t size = (char*)context->base - (char*)stack_pointer;
+        assert(size <= context->size);
+
+        memcpy(context->stack, stack_pointer, size);
+        context->used = size;
+    } else {
+        size_t size = (char*)stack_pointer - (char*)context->base;
+        assert(size <= context->size);
+
+        memcpy(context->stack, context->base, size);
+        context->used = size;
+    }
+
+    // Save registers / restore point:
+    return _setjmp(context->state);
+}
+
+__attribute__((noreturn, noinline))
+static void coroutine_restore_stack_padded(struct coroutine_context *context, void * buffer) {
+    void *stack_pointer = &stack_pointer;
+
+    assert(context->base);
+
+    // Restore stack from private area:
+    if (stack_pointer < context->base) {
+        void * bottom = (char*)context->base - context->used;
+        assert(bottom > stack_pointer);
+
+        memcpy(bottom, context->stack, context->used);
+    } else {
+        void * top = (char*)context->base + context->used;
+        assert(top < stack_pointer);
+
+        memcpy(context->base, context->stack, context->used);
+    }
+
+    // Restore registers:
+    // The `| (int)buffer` is to force the compiler NOT to elide he buffer and `alloca`.
+    _longjmp(context->state, 1 | (int)buffer);
+}
+
+static const size_t GAP = 128;
+
+// In order to swap between coroutines, we need to swap the stack and registers.
+// `setjmp` and `longjmp` are able to swap registers, but what about swapping stacks? You can use `memcpy` to copy the current stack to a private area and `memcpy` to copy the private stack of the next coroutine to the main stack.
+// But if the stack yop are copying in to the main stack is bigger than the currently executing stack, the `memcpy` will clobber the current stack frame (including the context argument). So we use `alloca` to push the current stack frame *beyond* the stack we are about to copy in. This ensures the current stack frame in `coroutine_restore_stack_padded` remains valid for calling `longjmp`.
+__attribute__((noreturn))
+void coroutine_restore_stack(struct coroutine_context *context) {
+    void *stack_pointer = &stack_pointer;
+    void *buffer = NULL;
+    ssize_t offset = 0;
+
+    // We must ensure that the next stack frame is BEYOND the stack we are restoring:
+    if (stack_pointer < context->base) {
+        offset = (char*)stack_pointer - ((char*)context->base - context->used) + GAP;
+        if (offset > 0) buffer = alloca(offset);
+    } else {
+        offset = ((char*)context->base + context->used) - (char*)stack_pointer + GAP;
+        if (offset > 0) buffer = alloca(offset);
+    }
+
+    assert(context->used > 0);
+
+    coroutine_restore_stack_padded(context, buffer);
+}
+
+struct coroutine_context *coroutine_transfer(struct coroutine_context *current, struct coroutine_context *target)
+{
+    struct coroutine_context *previous = target->from;
+
+    // In theory, either this condition holds true, or we should assign the base address to target:
+    assert(current->base == target->base);
+    // If you are trying to copy the coroutine to a different thread
+    // target->base = current->base
+
+    target->from = current;
+
+    assert(current != target);
+
+    // It's possible to come here, even thought the current fiber has been terminated. We are never going to return so we don't bother saving the stack.
+
+    if (current->stack) {
+      if (coroutine_save_stack(current) == 0) {
+          coroutine_restore_stack(target);
+      }
+    } else {
+        coroutine_restore_stack(target);
+    }
+
+    target->from = previous;
+
+    return target;
+}
diff --git a/coroutine/copy/Context.h b/coroutine/copy/Context.h
new file mode 100644
index 0000000000..1319f55d16
--- /dev/null
+++ b/coroutine/copy/Context.h
@@ -0,0 +1,86 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 27/6/2019.
+ *  Copyright, 2019, by Samuel Williams. All rights reserved.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <string.h>
+#include <stdlib.h>
+#include <alloca.h>
+
+#define COROUTINE __attribute__((noreturn)) void
+
+#if INTPTR_MAX <= INT32_MAX
+#define COROUTINE_LIMITED_ADDRESS_SPACE
+#endif
+
+// This stack copying implementation which uses a private stack for each coroutine, including the main one.
+#define COROUTINE_PRIVATE_STACK
+
+struct coroutine_context
+{
+    // Private stack:
+    void *stack;
+    size_t size, used;
+
+    // The top (or bottom) of the currently executing stack:
+    void *base;
+
+    jmp_buf state;
+
+    struct coroutine_context *from;
+};
+
+typedef COROUTINE(*coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+int coroutine_save_stack(struct coroutine_context * context);
+COROUTINE coroutine_restore_stack(struct coroutine_context *context);
+
+// @param stack The private stack area memory allocation (pointer to lowest address).
+// @param size The size of the private stack area.
+// @param base A stack pointer to the base of the main stack. On x86 hardware, this is the upper extent of the region that will be copied to the private stack.
+static inline void coroutine_initialize_main(struct coroutine_context *context, void *stack, size_t size, void *base) {
+    assert(stack);
+    assert(size >= 1024);
+
+    context->stack = stack;
+    context->size = size;
+    context->used = 0;
+
+    assert(base);
+    context->base = base;
+
+    context->from = NULL;
+}
+
+// @param start The start function to invoke.
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size,
+    void *base
+) {
+    assert(start);
+
+    coroutine_initialize_main(context, stack, size, base);
+
+    if (coroutine_save_stack(context)) {
+        start(context->from, context);
+    }
+}
+
+struct coroutine_context *coroutine_transfer(struct coroutine_context *current, register struct coroutine_context *target);
+
+static inline void coroutine_destroy(struct coroutine_context *context)
+{
+    context->stack = NULL;
+    context->size = 0;
+    context->from = NULL;
+}
diff --git a/coroutine/ppc64le/Context.S b/coroutine/ppc64le/Context.S
new file mode 100644
index 0000000000..1b39086f8f
--- /dev/null
+++ b/coroutine/ppc64le/Context.S
@@ -0,0 +1,72 @@
+.text
+.align 2
+
+.globl coroutine_transfer
+.type   coroutine_transfer, @function
+coroutine_transfer:
+	# Make space on the stack for caller registers
+	addi 1,1,-152
+
+	# Save caller registers
+	std 14,0(1)
+	std 15,8(1)
+	std 16,16(1)
+	std 17,24(1)
+	std 18,32(1)
+	std 19,40(1)
+	std 20,48(1)
+	std 21,56(1)
+	std 22,64(1)
+	std 23,72(1)
+	std 24,80(1)
+	std 25,88(1)
+	std 26,96(1)
+	std 27,104(1)
+	std 28,112(1)
+	std 29,120(1)
+	std 30,128(1)
+	std 31,136(1)
+
+	# Save return address
+	mflr 0
+	std 0,144(1)
+
+	# Save stack pointer to first argument
+	std 1,0(3)
+
+	# Load stack pointer from second argument
+	ld 1,0(4)
+
+	# Restore caller registers
+	ld 14,0(1)
+	ld 15,8(1)
+	ld 16,16(1)
+	ld 17,24(1)
+	ld 18,32(1)
+	ld 19,40(1)
+	ld 20,48(1)
+	ld 21,56(1)
+	ld 22,64(1)
+	ld 23,72(1)
+	ld 24,80(1)
+	ld 25,88(1)
+	ld 26,96(1)
+	ld 27,104(1)
+	ld 28,112(1)
+	ld 29,120(1)
+	ld 30,128(1)
+	ld 31,136(1)
+
+	# Load return address
+	ld 0,144(1)
+	mtlr 0
+
+	# Pop stack frame
+	addi 1,1,152
+
+	# Jump to return address
+	blr
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/coroutine/ppc64le/Context.h b/coroutine/ppc64le/Context.h
new file mode 100644
index 0000000000..adf21b4fd9
--- /dev/null
+++ b/coroutine/ppc64le/Context.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include <assert.h>
+#include <string.h>
+
+#define COROUTINE __attribute__((noreturn)) void
+
+enum {
+  COROUTINE_REGISTERS =
+  19  /* 18 general purpose registers (r14-r31) and 1 return address */
+  + 4  /* space for fiber_entry() to store the link register */
+};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+
+    /* Skip a global prologue that sets the TOC register */
+    context->stack_pointer[18] = ((char*)start) + 8;
+}
+
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+    context->stack_pointer = NULL;
+}
diff --git a/coroutine/ucontext/Context.c b/coroutine/ucontext/Context.c
new file mode 100644
index 0000000000..eec4ef3956
--- /dev/null
+++ b/coroutine/ucontext/Context.c
@@ -0,0 +1,22 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 24/6/2019.
+ *  Copyright, 2019, by Samuel Williams. All rights reserved.
+*/
+
+/* According to Solaris' ucontext.h, makecontext, etc. are removed in SUSv4.
+ * To enable the prototype declarations, we need to define __EXTENSIONS__.
+ */
+#if defined(__sun) && !defined(__EXTENSIONS__)
+#define __EXTENSIONS__
+#endif
+#include "Context.h"
+
+void coroutine_trampoline(void * _start, void * _context)
+{
+    coroutine_start start = _start;
+    struct coroutine_context * context = _context;
+
+    start(context->from, context);
+}
diff --git a/coroutine/ucontext/Context.h b/coroutine/ucontext/Context.h
new file mode 100644
index 0000000000..6cf16c8604
--- /dev/null
+++ b/coroutine/ucontext/Context.h
@@ -0,0 +1,70 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 24/6/2019.
+ *  Copyright, 2019, by Samuel Williams. All rights reserved.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <stddef.h>
+#include <ucontext.h>
+
+#define COROUTINE __attribute__((noreturn)) void
+
+#if INTPTR_MAX <= INT32_MAX
+#define COROUTINE_LIMITED_ADDRESS_SPACE
+#endif
+
+struct coroutine_context
+{
+    ucontext_t state;
+    struct coroutine_context * from;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+COROUTINE coroutine_trampoline(void * _start, void * _context);
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->from = NULL;
+    getcontext(&context->state);
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    coroutine_initialize_main(context);
+
+    context->state.uc_stack.ss_size = size;
+    // Despite what it's called, this is not actually a stack pointer. It points to the address of the stack allocation (the lowest address).
+    context->state.uc_stack.ss_sp = (char*)stack;
+    context->state.uc_stack.ss_flags = 0;
+    context->state.uc_link = NULL;
+
+    makecontext(&context->state, (void(*)(void))coroutine_trampoline, 2, (void*)start, (void*)context);
+}
+
+static inline struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target)
+{
+    struct coroutine_context * previous = target->from;
+
+    target->from = current;
+    swapcontext(&current->state, &target->state);
+    target->from = previous;
+
+    return target;
+}
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+    context->state.uc_stack.ss_sp = NULL;
+    context->state.uc_stack.ss_size = 0;
+    context->from = NULL;
+}
diff --git a/coroutine/win32/Context.S b/coroutine/win32/Context.S
new file mode 100644
index 0000000000..d14bf435e8
--- /dev/null
+++ b/coroutine/win32/Context.S
@@ -0,0 +1,47 @@
+##
+##  This file is part of the "Coroutine" project and released under the MIT License.
+##
+##  Created by Lars Kanis on 06/06/2019.
+##
+
+.text
+
+# Using fastcall is a big win (and it's the same as how x64 works).
+# In coroutine transfer, the arguments are passed in ecx and edx. We don't need
+# to touch these in order to pass them to the destination coroutine.
+
+.globl @coroutine_transfer@8
+@coroutine_transfer@8:
+	# Save the thread information block:
+	pushl %fs:0
+	pushl %fs:4
+	pushl %fs:8
+
+	# Save caller registers:
+	pushl %ebp
+	pushl %ebx
+	pushl %edi
+	pushl %esi
+
+	# Save caller stack pointer:
+	movl %esp, (%ecx)
+
+	# Restore callee stack pointer:
+	movl (%edx), %esp
+
+	# Restore callee stack:
+	popl %esi
+	popl %edi
+	popl %ebx
+	popl %ebp
+
+	# Restore the thread information block:
+	popl %fs:8
+	popl %fs:4
+	popl %fs:0
+
+	# Save the first argument as the return value:
+	movl %ecx, %eax
+
+	# Jump to the address on the stack:
+	ret
diff --git a/coroutine/win32/Context.asm b/coroutine/win32/Context.asm
new file mode 100644
index 0000000000..2647ea4bc4
--- /dev/null
+++ b/coroutine/win32/Context.asm
@@ -0,0 +1,55 @@
+;;
+;;  This file is part of the "Coroutine" project and released under the MIT License.
+;;
+;;  Created by Samuel Williams on 10/5/2018.
+;;  Copyright, 2018, by Samuel Williams. All rights reserved.
+;;
+
+.386
+.model flat
+
+.code
+
+assume fs:nothing
+
+; Using fastcall is a big win (and it's the same has how x64 works).
+; In coroutine transfer, the arguments are passed in ecx and edx. We don't need
+; to touch these in order to pass them to the destination coroutine.
+
+@coroutine_transfer@8 proc
+	; Save the thread information block:
+	push fs:[0]
+	push fs:[4]
+	push fs:[8]
+
+	; Save caller registers:
+	push ebp
+	push ebx
+	push edi
+	push esi
+
+	; Save caller stack pointer:
+	mov dword ptr [ecx], esp
+
+	; Restore callee stack pointer:
+	mov esp, dword ptr [edx]
+
+	; Restore callee stack:
+	pop esi
+	pop edi
+	pop ebx
+	pop ebp
+
+	; Restore the thread information block:
+	pop fs:[8]
+	pop fs:[4]
+	pop fs:[0]
+
+	; Save the first argument as the return value:
+	mov eax, dword ptr ecx
+
+	; Jump to the address on the stack:
+	ret
+@coroutine_transfer@8 endp
+
+end
diff --git a/coroutine/win32/Context.h b/coroutine/win32/Context.h
new file mode 100644
index 0000000000..299515ed92
--- /dev/null
+++ b/coroutine/win32/Context.h
@@ -0,0 +1,57 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 10/5/2018.
+ *  Copyright, 2018, by Samuel Williams. All rights reserved.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <string.h>
+
+#define COROUTINE __declspec(noreturn) void __fastcall
+#define COROUTINE_LIMITED_ADDRESS_SPACE
+
+/* This doesn't include thread information block */
+enum {COROUTINE_REGISTERS = 4};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef void(__fastcall * coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    *--context->stack_pointer = (void*)start;
+
+    /* Windows Thread Information Block */
+    *--context->stack_pointer = (void*)0xFFFFFFFF; /* fs:[0] */
+    *--context->stack_pointer = (void*)top; /* fs:[4] */
+    *--context->stack_pointer = (void*)stack;  /* fs:[8] */
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+}
+
+struct coroutine_context * __fastcall coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+}
diff --git a/coroutine/win64/Context.S b/coroutine/win64/Context.S
new file mode 100644
index 0000000000..4b16e0ce8c
--- /dev/null
+++ b/coroutine/win64/Context.S
@@ -0,0 +1,77 @@
+##
+##  This file is part of the "Coroutine" project and released under the MIT License.
+##
+##  Created by Samuel Williams on 4/11/2018.
+##  Copyright, 2018, by Samuel Williams. All rights reserved.
+##
+
+.text
+
+.globl coroutine_transfer
+coroutine_transfer:
+	# Save the thread information block:
+	pushq %gs:8
+	pushq %gs:16
+
+	# Save caller registers:
+	pushq %rbp
+	pushq %rbx
+	pushq %rdi
+	pushq %rsi
+	pushq %r12
+	pushq %r13
+	pushq %r14
+	pushq %r15
+
+	movaps %xmm15, -168(%rsp)
+	movaps %xmm14, -152(%rsp)
+	movaps %xmm13, -136(%rsp)
+	movaps %xmm12, -120(%rsp)
+	movaps %xmm11, -104(%rsp)
+	movaps %xmm10, -88(%rsp)
+	movaps %xmm9, -72(%rsp)
+	movaps %xmm8, -56(%rsp)
+	movaps %xmm7, -40(%rsp)
+	movaps %xmm6, -24(%rsp)
+
+	# Save caller stack pointer:
+	mov %rsp, (%rcx)
+
+	# Restore callee stack pointer:
+	mov (%rdx), %rsp
+
+	movaps -24(%rsp), %xmm6
+	movaps -40(%rsp), %xmm7
+	movaps -56(%rsp), %xmm8
+	movaps -72(%rsp), %xmm9
+	movaps -88(%rsp), %xmm10
+	movaps -104(%rsp), %xmm11
+	movaps -120(%rsp), %xmm12
+	movaps -136(%rsp), %xmm13
+	movaps -152(%rsp), %xmm14
+	movaps -168(%rsp), %xmm15
+
+	# Restore callee stack:
+	popq %r15
+	popq %r14
+	popq %r13
+	popq %r12
+	popq %rsi
+	popq %rdi
+	popq %rbx
+	popq %rbp
+
+	# Restore the thread information block:
+	popq %gs:16
+	popq %gs:8
+
+	# Put the first argument into the return value:
+	mov %rcx, %rax
+
+	# We pop the return address and jump to it:
+	ret
+
+.globl coroutine_trampoline
+coroutine_trampoline:
+	# Do not remove this. This forces 16-byte alignment when entering the coroutine.
+	ret
diff --git a/coroutine/win64/Context.asm b/coroutine/win64/Context.asm
new file mode 100644
index 0000000000..59673ffa3e
--- /dev/null
+++ b/coroutine/win64/Context.asm
@@ -0,0 +1,79 @@
+;;
+;;  This file is part of the "Coroutine" project and released under the MIT License.
+;;
+;;  Created by Samuel Williams on 10/5/2018.
+;;  Copyright, 2018, by Samuel Williams. All rights reserved.
+;;
+
+.code
+
+coroutine_transfer proc
+	; Save the thread information block:
+	push qword ptr gs:[8]
+	push qword ptr gs:[16]
+
+	; Save caller registers:
+	push rbp
+	push rbx
+	push rdi
+	push rsi
+	push r12
+	push r13
+	push r14
+	push r15
+
+	movaps [rsp - 24], xmm6
+	movaps [rsp - 40], xmm7
+	movaps [rsp - 56], xmm8
+	movaps [rsp - 72], xmm9
+	movaps [rsp - 88], xmm10
+	movaps [rsp - 104], xmm11
+	movaps [rsp - 120], xmm12
+	movaps [rsp - 136], xmm13
+	movaps [rsp - 152], xmm14
+	movaps [rsp - 168], xmm15
+
+	; Save caller stack pointer:
+	mov [rcx], rsp
+
+	; Restore callee stack pointer:
+	mov rsp, [rdx]
+
+	movaps xmm15, [rsp - 168]
+	movaps xmm14, [rsp - 152]
+	movaps xmm13, [rsp - 136]
+	movaps xmm12, [rsp - 120]
+	movaps xmm11, [rsp - 104]
+	movaps xmm10, [rsp - 88]
+	movaps xmm9, [rsp - 72]
+	movaps xmm8, [rsp - 56]
+	movaps xmm7, [rsp - 40]
+	movaps xmm6, [rsp - 24]
+
+	; Restore callee stack:
+	pop r15
+	pop r14
+	pop r13
+	pop r12
+	pop rsi
+	pop rdi
+	pop rbx
+	pop rbp
+
+	; Restore the thread information block:
+	pop qword ptr gs:[16]
+	pop qword ptr gs:[8]
+
+	; Put the first argument into the return value:
+	mov rax, rcx
+
+	; We pop the return address and jump to it:
+	ret
+coroutine_transfer endp
+
+coroutine_trampoline proc
+	; Do not remove this. This forces 16-byte alignment when entering the coroutine.
+	ret
+coroutine_trampoline endp
+
+end
diff --git a/coroutine/win64/Context.h b/coroutine/win64/Context.h
new file mode 100644
index 0000000000..6bf2dc5b35
--- /dev/null
+++ b/coroutine/win64/Context.h
@@ -0,0 +1,67 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 10/5/2018.
+ *  Copyright, 2018, by Samuel Williams. All rights reserved.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <string.h>
+
+#define COROUTINE __declspec(noreturn) void
+
+enum {
+    COROUTINE_REGISTERS = 8,
+    COROUTINE_XMM_REGISTERS = 1+10*2,
+};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef void(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+void coroutine_trampoline();
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    /* Win64 ABI requires space for arguments */
+    context->stack_pointer -= 4;
+
+    /* Return address */
+    *--context->stack_pointer = 0;
+    *--context->stack_pointer = (void*)start;
+    *--context->stack_pointer = (void*)coroutine_trampoline;
+
+    /* Windows Thread Information Block */
+    /* *--context->stack_pointer = 0; */ /* gs:[0x00] is not used */
+    *--context->stack_pointer = (void*)top; /* gs:[0x08] */
+    *--context->stack_pointer = (void*)stack;  /* gs:[0x10] */
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+    memset(context->stack_pointer - COROUTINE_XMM_REGISTERS, 0, sizeof(void*) * COROUTINE_XMM_REGISTERS);
+}
+
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+}
diff --git a/coroutine/x86/Context.S b/coroutine/x86/Context.S
new file mode 100644
index 0000000000..001b699a30
--- /dev/null
+++ b/coroutine/x86/Context.S
@@ -0,0 +1,42 @@
+##
+##  This file is part of the "Coroutine" project and released under the MIT License.
+##
+##  Created by Samuel Williams on 3/11/2018.
+##  Copyright, 2018, by Samuel Williams. All rights reserved.
+##
+
+#define TOKEN_PASTE(x,y) x##y
+#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
+
+.text
+
+.globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
+PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+
+	# Save caller registers
+	pushl %ebp
+	pushl %ebx
+	pushl %edi
+	pushl %esi
+
+	# Save caller stack pointer
+	movl %esp, (%ecx)
+
+	# Restore callee stack pointer
+	movl (%edx), %esp
+
+	# Restore callee stack
+	popl %esi
+	popl %edi
+	popl %ebx
+	popl %ebp
+
+	# Save the first argument as the return value
+	movl %ecx, %eax
+
+	# Jump to the address on the stack
+	ret
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/coroutine/x86/Context.h b/coroutine/x86/Context.h
new file mode 100644
index 0000000000..6d3a56eaa6
--- /dev/null
+++ b/coroutine/x86/Context.h
@@ -0,0 +1,53 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 3/11/2018.
+ *  Copyright, 2018, by Samuel Williams. All rights reserved.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <string.h>
+
+#define COROUTINE __attribute__((noreturn, fastcall)) void
+#define COROUTINE_LIMITED_ADDRESS_SPACE
+
+enum {COROUTINE_REGISTERS = 4};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self) __attribute__((fastcall));
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    *--context->stack_pointer = NULL;
+    *--context->stack_pointer = (void*)start;
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+}
+
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target) __attribute__((fastcall));
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+    context->stack_pointer = NULL;
+}
diff --git a/coverage/README b/coverage/README
new file mode 100644
index 0000000000..78a01826aa
--- /dev/null
+++ b/coverage/README
@@ -0,0 +1,17 @@
+Usage
+
+The make task `update-coverage' retrieves simplecov for coverage report.
+
+COVERAGE=1 make test-all TESTS=test/cgi
+
+it generates test coverage to coverage directory.
+
+Limitation
+
+ * test_coverage.rb and test_process.rb broke test suit with SimpleCov
+ * some tests failed randomly.
+
+TODO
+
+ * more reduce bundled simplecov(additional configuration, formatter, etc)
+ * measure rubyspec coverage
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 19d1727dd7..192cf43b37 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,9 +1,9 @@
 include Makefile
--include uncommon.mk
 
 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=)
@@ -11,9 +11,6 @@ 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)
@@ -30,20 +27,18 @@ else
 endif
 
 WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
+
+-include uncommon.mk
+
+include $(srcdir)/defs/gmake.mk
+
 SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
-EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
+override 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@
@@ -52,11 +47,11 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
 	$(ECHO) compiling $@
 	$(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+%.rc: $(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) \
+	  -so_name=$(DLL_BASE_NAME) -output=$(*F) \
 	  . $(icondirs) $(srcdir)/win32
 
 $(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
@@ -65,11 +60,7 @@ $(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@ stub.@OBJEXT@
-	@rm -f $@
-	$(ECHO) linking $@
-	$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) \
-	  stub.@OBJEXT@ $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
+$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
 
 $(RUBY_EXP): $(LIBRUBY_A)
 	$(ECHO) creating $@
@@ -84,7 +75,15 @@ GNUmakefile:	$(srcdir)/cygwin/GNUmakefile.in
 ifeq (@target_os@,mingw32)
 $(OBJS) $(MAINOBJ): win32.h
 
-dir.$(OBJEXT) win32.$(OBJEXT): win32/dir.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)
+
 endif
 
 $(LIBRUBY_SO): $(RUBYDEF)
@@ -97,7 +96,7 @@ clean-local::
 	@$(RM) $(RUBYDEF)
 
 ifeq (@target_os@,cygwin)
-cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) $(RUBYDEF)
+cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)0.dll: $(LIBRUBY_A) $(RUBYDEF)
 	$(ECHO) generating $@
 	$(Q) @DLLWRAP@ -s --def=$(RUBYDEF) -o $@
 endif
diff --git a/debug.c b/debug.c
index dcc710bc4a..a54be27152 100644
--- a/debug.c
+++ b/debug.c
@@ -11,10 +11,12 @@
 
 #include "ruby/ruby.h"
 #include "ruby/encoding.h"
+#include "ruby/io.h"
 #include "ruby/util.h"
-#include "debug.h"
+#include "vm_debug.h"
 #include "eval_intern.h"
 #include "vm_core.h"
+#include "symbol.h"
 #include "id.h"
 
 /* for gdb */
@@ -24,52 +26,49 @@ const union {
     enum ruby_tag_type          tag_type;
     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_robject_flags     robject_flags;
+    enum ruby_rmodule_flags     rmodule_flags;
+    enum ruby_rstring_flags     rstring_flags;
+    enum ruby_rarray_flags      rarray_flags;
     enum {
-        RUBY_ENCODING_INLINE_MAX = ENCODING_INLINE_MAX,
-        RUBY_ENCODING_SHIFT = ENCODING_SHIFT,
-        RUBY_ENC_CODERANGE_MASK    = ENC_CODERANGE_MASK,
-        RUBY_ENC_CODERANGE_UNKNOWN = ENC_CODERANGE_UNKNOWN,
-        RUBY_ENC_CODERANGE_7BIT    = ENC_CODERANGE_7BIT,
-        RUBY_ENC_CODERANGE_VALID   = ENC_CODERANGE_VALID,
-        RUBY_ENC_CODERANGE_BROKEN  = ENC_CODERANGE_BROKEN,
-        RUBY_FL_MARK        = FL_MARK,
-        RUBY_FL_RESERVED    = FL_RESERVED,
-        RUBY_FL_FINALIZE    = FL_FINALIZE,
-        RUBY_FL_TAINT       = FL_TAINT,
-        RUBY_FL_UNTRUSTED   = FL_UNTRUSTED,
-        RUBY_FL_EXIVAR      = FL_EXIVAR,
-        RUBY_FL_FREEZE      = FL_FREEZE,
-        RUBY_FL_SINGLETON   = FL_SINGLETON,
-        RUBY_FL_USER0       = FL_USER0,
-        RUBY_FL_USER1       = FL_USER1,
-        RUBY_FL_USER2       = FL_USER2,
-        RUBY_FL_USER3       = FL_USER3,
-        RUBY_FL_USER4       = FL_USER4,
-        RUBY_FL_USER5       = FL_USER5,
-        RUBY_FL_USER6       = FL_USER6,
-        RUBY_FL_USER7       = FL_USER7,
-        RUBY_FL_USER8       = FL_USER8,
-        RUBY_FL_USER9       = FL_USER9,
-        RUBY_FL_USER10      = FL_USER10,
-        RUBY_FL_USER11      = FL_USER11,
-        RUBY_FL_USER12      = FL_USER12,
-        RUBY_FL_USER13      = FL_USER13,
-        RUBY_FL_USER14      = FL_USER14,
-        RUBY_FL_USER15      = FL_USER15,
-        RUBY_FL_USER16      = FL_USER16,
-        RUBY_FL_USER17      = FL_USER17,
-        RUBY_FL_USER18      = FL_USER18,
-        RUBY_FL_USHIFT      = FL_USHIFT,
+	RUBY_FMODE_READABLE		= FMODE_READABLE,
+	RUBY_FMODE_WRITABLE		= FMODE_WRITABLE,
+	RUBY_FMODE_READWRITE		= FMODE_READWRITE,
+	RUBY_FMODE_BINMODE		= FMODE_BINMODE,
+	RUBY_FMODE_SYNC 		= FMODE_SYNC,
+	RUBY_FMODE_TTY			= FMODE_TTY,
+	RUBY_FMODE_DUPLEX		= FMODE_DUPLEX,
+	RUBY_FMODE_APPEND		= FMODE_APPEND,
+	RUBY_FMODE_CREATE		= FMODE_CREATE,
+	RUBY_FMODE_NOREVLOOKUP		= 0x00000100,
+	RUBY_FMODE_TRUNC		= FMODE_TRUNC,
+	RUBY_FMODE_TEXTMODE		= FMODE_TEXTMODE,
+	RUBY_FMODE_PREP 		= 0x00010000,
+	RUBY_FMODE_SETENC_BY_BOM	= FMODE_SETENC_BY_BOM,
+	RUBY_FMODE_UNIX 		= 0x00200000,
+	RUBY_FMODE_INET 		= 0x00400000,
+	RUBY_FMODE_INET6		= 0x00800000,
+
         RUBY_NODE_TYPESHIFT = NODE_TYPESHIFT,
         RUBY_NODE_TYPEMASK  = NODE_TYPEMASK,
         RUBY_NODE_LSHIFT    = NODE_LSHIFT,
         RUBY_NODE_FL_NEWLINE   = NODE_FL_NEWLINE
     } various;
+    union {
+	enum imemo_type                     types;
+	enum {RUBY_IMEMO_MASK = IMEMO_MASK} mask;
+	struct RIMemo                      *ptr;
+    } imemo;
+    struct RSymbol *symbol_ptr;
+    enum vm_call_flag_bits vm_call_flags;
 } 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)
@@ -91,14 +90,16 @@ 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) {
-	VALUE str;
-	str = rb_inspect(obj);
-	fprintf(stderr, "DBG> %s: %s\n", header,
-		obj == (VALUE)(SIGNED_VALUE)-1 ? "" : StringValueCStr(str));
+	char buff[0x100];
+	rb_raw_obj_info(buff, 0x100, obj);
+
+	fprintf(stderr, "DBG> %s: %s\n", header, buff);
 	fflush(stderr);
     }
     return obj;
@@ -136,23 +137,89 @@ ruby_debug_breakpoint(void)
     /* */
 }
 
-static void
-set_debug_option(const char *str, int len, void *arg)
+#if defined _WIN32
+# if RUBY_MSVCRT_VERSION >= 80
+extern int ruby_w32_rtc_error;
+# endif
+#endif
+#if defined _WIN32 || defined __CYGWIN__
+#include <windows.h>
+UINT ruby_w32_codepage[2];
+#endif
+extern int ruby_rgengc_debug;
+extern int ruby_on_ci;
+
+int
+ruby_env_debug_option(const char *str, int len, void *arg)
 {
-#define SET_WHEN(name, var) do {	    \
+    int ov;
+    size_t retlen;
+    unsigned long n;
+#define SET_WHEN(name, var, val) do {	    \
 	if (len == sizeof(name) - 1 &&	    \
 	    strncmp(str, (name), len) == 0) { \
-	    extern int var;	    \
-	    var = 1;		    \
-	    return;			    \
+	    (var) = (val);		    \
+	    return 1;			    \
 	}				    \
     } while (0)
-    SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr);
-    SET_WHEN("core", ruby_enable_coredump);
-#if defined _WIN32 && defined _MSC_VER && _MSC_VER >= 1400
-    SET_WHEN("rtc_error", ruby_w32_rtc_error);
+#define NAME_MATCH_VALUE(name)				\
+    ((size_t)len >= sizeof(name)-1 &&			\
+     strncmp(str, (name), sizeof(name)-1) == 0 &&	\
+     ((len == sizeof(name)-1 && !(len = 0)) ||		\
+      (str[sizeof(name)-1] == '=' &&			\
+       (str += sizeof(name), len -= sizeof(name), 1))))
+#define SET_UINT(val) do { \
+	n = ruby_scan_digits(str, len, 10, &retlen, &ov); \
+	if (!ov && retlen) { \
+	    val = (unsigned int)n; \
+	} \
+	str += retlen; \
+	len -= retlen; \
+    } while (0)
+#define SET_UINT_LIST(name, vals, num) do { \
+	int i; \
+	for (i = 0; i < (num); ++i) { \
+	    SET_UINT((vals)[i]); \
+	    if (!len || *str != ':') break; \
+	    ++str; \
+	    --len; \
+	} \
+	if (len > 0) { \
+	    fprintf(stderr, "ignored "name" option: `%.*s'\n", len, str); \
+	} \
+    } while (0)
+#define SET_WHEN_UINT(name, vals, num, req) \
+    if (NAME_MATCH_VALUE(name)) SET_UINT_LIST(name, vals, num);
+
+    SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr, Qtrue);
+    SET_WHEN("core", ruby_enable_coredump, 1);
+    SET_WHEN("ci", ruby_on_ci, 1);
+    if (NAME_MATCH_VALUE("rgengc")) {
+	if (!len) ruby_rgengc_debug = 1;
+	else SET_UINT_LIST("rgengc", &ruby_rgengc_debug, 1);
+	return 1;
+    }
+#if defined _WIN32
+# if RUBY_MSVCRT_VERSION >= 80
+    SET_WHEN("rtc_error", ruby_w32_rtc_error, 1);
+# endif
 #endif
-    fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
+#if defined _WIN32 || defined __CYGWIN__
+    if (NAME_MATCH_VALUE("codepage")) {
+	if (!len) fprintf(stderr, "missing codepage argument");
+	else SET_UINT_LIST("codepage", ruby_w32_codepage, numberof(ruby_w32_codepage));
+	return 1;
+    }
+#endif
+    return 0;
+}
+
+static void
+set_debug_option(const char *str, int len, void *arg)
+{
+    if (!ruby_env_debug_option(str, len, arg)) {
+	fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
+    }
 }
 
 void
diff --git a/debug.h b/debug.h
deleted file mode 100644
index f1d11304f0..0000000000
--- a/debug.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**********************************************************************
-
-  debug.h - YARV Debug function interface
-
-  $Author$
-  created at: 04/08/25 02:33:49 JST
-
-  Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#ifndef RUBY_DEBUG_H
-#define RUBY_DEBUG_H
-
-#include "ruby/ruby.h"
-#include "node.h"
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
-#define dpv(h,v) ruby_debug_print_value(-1, 0, (h), (v))
-#define dp(v)    ruby_debug_print_value(-1, 0, "", (v))
-#define dpi(i)   ruby_debug_print_id(-1, 0, "", (i))
-#define dpn(n)   ruby_debug_print_node(-1, 0, "", (n))
-
-#define bp()     ruby_debug_breakpoint()
-
-VALUE ruby_debug_print_value(int level, int debug_level, const char *header, VALUE v);
-ID    ruby_debug_print_id(int level, int debug_level, const char *header, ID id);
-NODE *ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node);
-int   ruby_debug_print_indent(int level, int debug_level, int indent_level);
-void  ruby_debug_breakpoint(void);
-void  ruby_debug_gc_check_func(void);
-void ruby_set_debug_option(const char *str);
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
-#endif /* RUBY_DEBUG_H */
diff --git a/debug_counter.c b/debug_counter.c
new file mode 100644
index 0000000000..11ec57a961
--- /dev/null
+++ b/debug_counter.c
@@ -0,0 +1,135 @@
+/**********************************************************************
+
+  debug_counter.c -
+
+  created at: Tue Feb 21 16:51:18 2017
+
+  Copyright (C) 2017 Koichi Sasada
+
+**********************************************************************/
+
+#include "internal.h"
+#include "debug_counter.h"
+#include <stdio.h>
+#include <locale.h>
+
+#if USE_DEBUG_COUNTER
+static const char *const debug_counter_names[] = {
+    ""
+#define RB_DEBUG_COUNTER(name) #name,
+#include "debug_counter.h"
+#undef RB_DEBUG_COUNTER
+};
+
+MJIT_SYMBOL_EXPORT_BEGIN
+size_t rb_debug_counter[numberof(debug_counter_names)];
+MJIT_SYMBOL_EXPORT_END
+
+int debug_counter_disable_show_at_exit = 0;
+
+// note that this operation is not atomic.
+void
+ruby_debug_counter_reset(void)
+{
+    for (int i = 0; i < RB_DEBUG_COUNTER_MAX; i++) {
+        switch (i) {
+          case RB_DEBUG_COUNTER_mjit_length_unit_queue:
+          case RB_DEBUG_COUNTER_mjit_length_active_units:
+          case RB_DEBUG_COUNTER_mjit_length_compact_units:
+          case RB_DEBUG_COUNTER_mjit_length_stale_units:
+            // These counters may be decreased and should not be reset.
+            break;
+          default:
+            rb_debug_counter[i] = 0;
+            break;
+        }
+    }
+}
+
+// note that this operation is not atomic.
+size_t
+ruby_debug_counter_get(const char **names_ptr, size_t *counters_ptr)
+{
+    int i;
+    if (names_ptr != NULL) {
+        for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
+            names_ptr[i] = debug_counter_names[i];
+        }
+    }
+    if (counters_ptr != NULL) {
+        for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
+            counters_ptr[i] = rb_debug_counter[i];
+        }
+    }
+
+    return RB_DEBUG_COUNTER_MAX;
+}
+
+void
+ruby_debug_counter_show_at_exit(int enable)
+{
+    debug_counter_disable_show_at_exit = !enable;
+}
+
+void
+rb_debug_counter_show_results(const char *msg)
+{
+    const char *env = getenv("RUBY_DEBUG_COUNTER_DISABLE");
+
+    setlocale(LC_NUMERIC, "");
+
+    if (env == NULL || strcmp("1", env) != 0) {
+	int i;
+        fprintf(stderr, "[RUBY_DEBUG_COUNTER]\t%d %s\n", getpid(), msg);
+	for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
+            fprintf(stderr, "[RUBY_DEBUG_COUNTER]\t%-30s\t%'14"PRIuSIZE"\n",
+		    debug_counter_names[i],
+		    rb_debug_counter[i]);
+	}
+    }
+}
+
+VALUE
+rb_debug_counter_show(RB_UNUSED_VAR(VALUE klass))
+{
+    rb_debug_counter_show_results("method call");
+    return Qnil;
+}
+
+VALUE
+rb_debug_counter_reset(RB_UNUSED_VAR(VALUE klass))
+{
+    ruby_debug_counter_reset();
+    return Qnil;
+}
+
+__attribute__((destructor))
+static void
+debug_counter_show_results_at_exit(void)
+{
+    if (debug_counter_disable_show_at_exit == 0) {
+        rb_debug_counter_show_results("normal exit.");
+    }
+}
+#else
+void
+rb_debug_counter_show_results(const char *msg)
+{
+}
+
+size_t
+ruby_debug_counter_get(const char **names_ptr, size_t *counters_ptr)
+{
+    return 0;
+}
+void
+ruby_debug_counter_reset(void)
+{
+}
+
+void
+ruby_debug_counter_show_at_exit(int enable)
+{
+}
+
+#endif /* USE_DEBUG_COUNTER */
diff --git a/debug_counter.h b/debug_counter.h
new file mode 100644
index 0000000000..066533d1d1
--- /dev/null
+++ b/debug_counter.h
@@ -0,0 +1,390 @@
+/**********************************************************************
+
+  debug_counter.h -
+
+  created at: Tue Feb 21 16:51:18 2017
+
+  Copyright (C) 2017 Koichi Sasada
+
+**********************************************************************/
+
+#ifndef USE_DEBUG_COUNTER
+#define USE_DEBUG_COUNTER 0
+#endif
+
+#ifdef RB_DEBUG_COUNTER
+
+/*
+ * method cache (mc) counts.
+ *
+ * * mc_inline_hit/miss: inline mc hit/miss counts (VM send insn)
+ * * mc_global_hit/miss: global method cache hit/miss counts
+ *                       two types: (1) inline cache miss (VM send insn)
+ *                                  (2) called from C (rb_funcall).
+ * * mc_global_state_miss: inline mc miss by global_state miss.
+ * * mc_class_serial_miss:            ... by mc_class_serial_miss
+ * * mc_cme_complement: callable_method_entry complement counts.
+ * * mc_cme_complement_hit: callable_method_entry cache hit counts.
+ * * mc_search_super: search_method() call counts.
+ * * mc_miss_by_nome: inline mc miss by no ment.
+ * * mc_miss_by_distinct:        ... by distinct ment.
+ * * mc_miss_by_refine:          ... by ment being refined.
+ * * mc_miss_by_visi:            ... by visibility change.
+ * * mc_miss_spurious: spurious inline mc misshit.
+ * * mc_miss_reuse_call: count of reuse of cc->call.
+ */
+RB_DEBUG_COUNTER(mc_inline_hit)
+RB_DEBUG_COUNTER(mc_inline_miss)
+RB_DEBUG_COUNTER(mc_global_hit)
+RB_DEBUG_COUNTER(mc_global_miss)
+RB_DEBUG_COUNTER(mc_global_state_miss)
+RB_DEBUG_COUNTER(mc_class_serial_miss)
+RB_DEBUG_COUNTER(mc_cme_complement)
+RB_DEBUG_COUNTER(mc_cme_complement_hit)
+RB_DEBUG_COUNTER(mc_search_super)
+RB_DEBUG_COUNTER(mc_miss_by_nome)
+RB_DEBUG_COUNTER(mc_miss_by_distinct)
+RB_DEBUG_COUNTER(mc_miss_by_refine)
+RB_DEBUG_COUNTER(mc_miss_by_visi)
+RB_DEBUG_COUNTER(mc_miss_spurious)
+RB_DEBUG_COUNTER(mc_miss_reuse_call)
+
+/*
+ * call cache fastpath usage
+ */
+RB_DEBUG_COUNTER(ccf_general)
+RB_DEBUG_COUNTER(ccf_iseq_setup)
+RB_DEBUG_COUNTER(ccf_iseq_setup_0start)
+RB_DEBUG_COUNTER(ccf_iseq_setup_tailcall_0start)
+RB_DEBUG_COUNTER(ccf_iseq_fix) /* several functions created with tool/mk_call_iseq_optimized.rb */
+RB_DEBUG_COUNTER(ccf_iseq_opt) /* has_opt == TRUE (has optional parameters), but other flags are FALSE */
+RB_DEBUG_COUNTER(ccf_iseq_kw1) /* vm_call_iseq_setup_kwparm_kwarg() */
+RB_DEBUG_COUNTER(ccf_iseq_kw2) /* vm_call_iseq_setup_kwparm_nokwarg() */
+RB_DEBUG_COUNTER(ccf_cfunc)
+RB_DEBUG_COUNTER(ccf_ivar) /* attr_reader */
+RB_DEBUG_COUNTER(ccf_attrset) /* attr_writer */
+RB_DEBUG_COUNTER(ccf_method_missing)
+RB_DEBUG_COUNTER(ccf_zsuper)
+RB_DEBUG_COUNTER(ccf_bmethod)
+RB_DEBUG_COUNTER(ccf_opt_send)
+RB_DEBUG_COUNTER(ccf_opt_call)
+RB_DEBUG_COUNTER(ccf_opt_block_call)
+RB_DEBUG_COUNTER(ccf_super_method)
+
+/*
+ * control frame push counts.
+ *
+ * * frame_push: frame push counts.
+ * * frame_push_*: frame push counts per each type.
+ * * frame_R2R: Ruby frame to Ruby frame
+ * * frame_R2C: Ruby frame to C frame
+ * * frame_C2C: C frame to C frame
+ * * frame_C2R: C frame to Ruby frame
+ */
+RB_DEBUG_COUNTER(frame_push)
+RB_DEBUG_COUNTER(frame_push_method)
+RB_DEBUG_COUNTER(frame_push_block)
+RB_DEBUG_COUNTER(frame_push_class)
+RB_DEBUG_COUNTER(frame_push_top)
+RB_DEBUG_COUNTER(frame_push_cfunc)
+RB_DEBUG_COUNTER(frame_push_ifunc)
+RB_DEBUG_COUNTER(frame_push_eval)
+RB_DEBUG_COUNTER(frame_push_rescue)
+RB_DEBUG_COUNTER(frame_push_dummy)
+
+RB_DEBUG_COUNTER(frame_R2R)
+RB_DEBUG_COUNTER(frame_R2C)
+RB_DEBUG_COUNTER(frame_C2C)
+RB_DEBUG_COUNTER(frame_C2R)
+
+/* instance variable counts
+ *
+ * * ivar_get_ic_hit/miss: ivar_get inline cache (ic) hit/miss counts (VM insn)
+ * * ivar_get_ic_miss_serial: ivar_get ic miss reason by serial (VM insn)
+ * * ivar_get_ic_miss_unset:                      ... by unset (VM insn)
+ * * ivar_get_ic_miss_noobject:                   ... by "not T_OBJECT" (VM insn)
+ * * ivar_set_...: same counts with ivar_set (VM insn)
+ * * ivar_get/set_base: call counts of "rb_ivar_get/set()".
+ *                      because of (1) ic miss.
+ *                                 (2) direct call by C extensions.
+ */
+RB_DEBUG_COUNTER(ivar_get_ic_hit)
+RB_DEBUG_COUNTER(ivar_get_ic_miss)
+RB_DEBUG_COUNTER(ivar_get_ic_miss_serial)
+RB_DEBUG_COUNTER(ivar_get_ic_miss_unset)
+RB_DEBUG_COUNTER(ivar_get_ic_miss_noobject)
+RB_DEBUG_COUNTER(ivar_set_ic_hit)
+RB_DEBUG_COUNTER(ivar_set_ic_miss)
+RB_DEBUG_COUNTER(ivar_set_ic_miss_serial)
+RB_DEBUG_COUNTER(ivar_set_ic_miss_unset)
+RB_DEBUG_COUNTER(ivar_set_ic_miss_oorange)
+RB_DEBUG_COUNTER(ivar_set_ic_miss_noobject)
+RB_DEBUG_COUNTER(ivar_get_base)
+RB_DEBUG_COUNTER(ivar_set_base)
+
+/* local variable counts
+ *
+ * * lvar_get: total lvar get counts (VM insn)
+ * * lvar_get_dynamic: lvar get counts if accessing upper env (VM insn)
+ * * lvar_set*: same as "get"
+ * * lvar_set_slowpath: counts using vm_env_write_slowpath()
+ */
+RB_DEBUG_COUNTER(lvar_get)
+RB_DEBUG_COUNTER(lvar_get_dynamic)
+RB_DEBUG_COUNTER(lvar_set)
+RB_DEBUG_COUNTER(lvar_set_dynamic)
+RB_DEBUG_COUNTER(lvar_set_slowpath)
+
+/* GC counts:
+ *
+ * * count: simple count
+ * * _minor: minor gc
+ * * _major: major gc
+ * * other suffix is corresponding to last_gc_info or
+ *   gc_profile_record_flag in gc.c.
+ */
+RB_DEBUG_COUNTER(gc_count)
+RB_DEBUG_COUNTER(gc_minor_newobj)
+RB_DEBUG_COUNTER(gc_minor_malloc)
+RB_DEBUG_COUNTER(gc_minor_method)
+RB_DEBUG_COUNTER(gc_minor_capi)
+RB_DEBUG_COUNTER(gc_minor_stress)
+RB_DEBUG_COUNTER(gc_major_nofree)
+RB_DEBUG_COUNTER(gc_major_oldgen)
+RB_DEBUG_COUNTER(gc_major_shady)
+RB_DEBUG_COUNTER(gc_major_force)
+RB_DEBUG_COUNTER(gc_major_oldmalloc)
+
+RB_DEBUG_COUNTER(gc_isptr_trial)
+RB_DEBUG_COUNTER(gc_isptr_range)
+RB_DEBUG_COUNTER(gc_isptr_align)
+RB_DEBUG_COUNTER(gc_isptr_maybe)
+
+/* object allocation counts:
+ *
+ * * obj_newobj: newobj counts
+ * * obj_newobj_slowpath: newobj with slowpath counts
+ * * obj_newobj_wb_unprotected: newobj for wb_unprotecte.
+ * * obj_free: obj_free() counts
+ * * obj_promote: promoted counts (oldgen)
+ * * obj_wb_unprotect: wb unprotect counts
+ *
+ * * obj_[type]_[attr]: *free'ed counts* for each type.
+ *                      Note that it is not a allocated counts.
+ * * [type]
+ *   * _obj: T_OBJECT
+ *   * _str: T_STRING
+ *   * _ary: T_ARRAY
+ *   * _xxx: T_XXX (hash, struct, ...)
+ *
+ * * [attr]
+ *   * _ptr: R?? is not embed.
+ *   * _embed: R?? is embed.
+ *   * _transient: R?? uses transient heap.
+ * * type specific attr.
+ *   * str_shared: str is shared.
+ *   * str_nofree:        nofree
+ *   * str_fstr:          fstr
+ *   * hash_empty: hash is empty
+ *   * hash_1_4:       has 1 to 4 entries
+ *   * hash_5_8:       has 5 to 8 entries
+ *   * hash_g8:        has n entries (n>8)
+ *   * match_under4:    has under 4 oniguruma regions allocated
+ *   * match_ge4:       has n regions allocated (4<=n<8)
+ *   * match_ge8:       has n regions allocated (8<=n)
+ *   * data_empty: T_DATA but no memory free.
+ *   * data_xfree:        free'ed by xfree().
+ *   * data_imm_free:     free'ed immediately.
+ *   * data_zombie:       free'ed with zombie.
+ *   * imemo_*: T_IMEMO with each type.
+ */
+RB_DEBUG_COUNTER(obj_newobj)
+RB_DEBUG_COUNTER(obj_newobj_slowpath)
+RB_DEBUG_COUNTER(obj_newobj_wb_unprotected)
+RB_DEBUG_COUNTER(obj_free)
+RB_DEBUG_COUNTER(obj_promote)
+RB_DEBUG_COUNTER(obj_wb_unprotect)
+
+RB_DEBUG_COUNTER(obj_obj_embed)
+RB_DEBUG_COUNTER(obj_obj_transient)
+RB_DEBUG_COUNTER(obj_obj_ptr)
+
+RB_DEBUG_COUNTER(obj_str_ptr)
+RB_DEBUG_COUNTER(obj_str_embed)
+RB_DEBUG_COUNTER(obj_str_shared)
+RB_DEBUG_COUNTER(obj_str_nofree)
+RB_DEBUG_COUNTER(obj_str_fstr)
+
+RB_DEBUG_COUNTER(obj_ary_embed)
+RB_DEBUG_COUNTER(obj_ary_transient)
+RB_DEBUG_COUNTER(obj_ary_ptr)
+RB_DEBUG_COUNTER(obj_ary_extracapa)
+/*
+  ary_shared_create: shared ary by Array#dup and so on.
+  ary_shared: finished in shard.
+  ary_shared_root_occupied: shared_root but has only 1 refcnt.
+    The number (ary_shared - ary_shared_root_occupied) is meaningful.
+ */
+RB_DEBUG_COUNTER(obj_ary_shared_create)
+RB_DEBUG_COUNTER(obj_ary_shared)
+RB_DEBUG_COUNTER(obj_ary_shared_root_occupied)
+
+RB_DEBUG_COUNTER(obj_hash_empty)
+RB_DEBUG_COUNTER(obj_hash_1)
+RB_DEBUG_COUNTER(obj_hash_2)
+RB_DEBUG_COUNTER(obj_hash_3)
+RB_DEBUG_COUNTER(obj_hash_4)
+RB_DEBUG_COUNTER(obj_hash_5_8)
+RB_DEBUG_COUNTER(obj_hash_g8)
+
+RB_DEBUG_COUNTER(obj_hash_null)
+RB_DEBUG_COUNTER(obj_hash_ar)
+RB_DEBUG_COUNTER(obj_hash_st)
+RB_DEBUG_COUNTER(obj_hash_transient)
+RB_DEBUG_COUNTER(obj_hash_force_convert)
+
+RB_DEBUG_COUNTER(obj_struct_embed)
+RB_DEBUG_COUNTER(obj_struct_transient)
+RB_DEBUG_COUNTER(obj_struct_ptr)
+
+RB_DEBUG_COUNTER(obj_data_empty)
+RB_DEBUG_COUNTER(obj_data_xfree)
+RB_DEBUG_COUNTER(obj_data_imm_free)
+RB_DEBUG_COUNTER(obj_data_zombie)
+
+RB_DEBUG_COUNTER(obj_match_under4)
+RB_DEBUG_COUNTER(obj_match_ge4)
+RB_DEBUG_COUNTER(obj_match_ge8)
+RB_DEBUG_COUNTER(obj_match_ptr)
+
+RB_DEBUG_COUNTER(obj_iclass_ptr)
+RB_DEBUG_COUNTER(obj_class_ptr)
+RB_DEBUG_COUNTER(obj_module_ptr)
+
+RB_DEBUG_COUNTER(obj_bignum_ptr)
+RB_DEBUG_COUNTER(obj_bignum_embed)
+RB_DEBUG_COUNTER(obj_float)
+RB_DEBUG_COUNTER(obj_complex)
+RB_DEBUG_COUNTER(obj_rational)
+
+RB_DEBUG_COUNTER(obj_regexp_ptr)
+RB_DEBUG_COUNTER(obj_file_ptr)
+RB_DEBUG_COUNTER(obj_symbol)
+
+RB_DEBUG_COUNTER(obj_imemo_ment)
+RB_DEBUG_COUNTER(obj_imemo_iseq)
+RB_DEBUG_COUNTER(obj_imemo_env)
+RB_DEBUG_COUNTER(obj_imemo_tmpbuf)
+RB_DEBUG_COUNTER(obj_imemo_ast)
+RB_DEBUG_COUNTER(obj_imemo_cref)
+RB_DEBUG_COUNTER(obj_imemo_svar)
+RB_DEBUG_COUNTER(obj_imemo_throw_data)
+RB_DEBUG_COUNTER(obj_imemo_ifunc)
+RB_DEBUG_COUNTER(obj_imemo_memo)
+RB_DEBUG_COUNTER(obj_imemo_parser_strterm)
+
+/* ar_table */
+RB_DEBUG_COUNTER(artable_hint_hit)
+RB_DEBUG_COUNTER(artable_hint_miss)
+RB_DEBUG_COUNTER(artable_hint_notfound)
+
+/* heap function counts
+ *
+ * * heap_xmalloc/realloc/xfree: call counts
+ */
+RB_DEBUG_COUNTER(heap_xmalloc)
+RB_DEBUG_COUNTER(heap_xrealloc)
+RB_DEBUG_COUNTER(heap_xfree)
+
+/* transient_heap */
+RB_DEBUG_COUNTER(theap_alloc)
+RB_DEBUG_COUNTER(theap_alloc_fail)
+RB_DEBUG_COUNTER(theap_evacuate)
+
+/* mjit_exec() counts */
+RB_DEBUG_COUNTER(mjit_exec)
+RB_DEBUG_COUNTER(mjit_exec_not_added)
+RB_DEBUG_COUNTER(mjit_exec_not_added_add_iseq)
+RB_DEBUG_COUNTER(mjit_exec_not_ready)
+RB_DEBUG_COUNTER(mjit_exec_not_compiled)
+RB_DEBUG_COUNTER(mjit_exec_call_func)
+
+/* MJIT <-> VM frame push counts */
+RB_DEBUG_COUNTER(mjit_frame_VM2VM)
+RB_DEBUG_COUNTER(mjit_frame_VM2JT)
+RB_DEBUG_COUNTER(mjit_frame_JT2JT)
+RB_DEBUG_COUNTER(mjit_frame_JT2VM)
+
+/* MJIT cancel counters */
+RB_DEBUG_COUNTER(mjit_cancel)
+RB_DEBUG_COUNTER(mjit_cancel_ivar_inline)
+RB_DEBUG_COUNTER(mjit_cancel_send_inline)
+RB_DEBUG_COUNTER(mjit_cancel_opt_insn) /* CALL_SIMPLE_METHOD */
+RB_DEBUG_COUNTER(mjit_cancel_invalidate_all)
+
+/* rb_mjit_unit_list length */
+RB_DEBUG_COUNTER(mjit_length_unit_queue)
+RB_DEBUG_COUNTER(mjit_length_active_units)
+RB_DEBUG_COUNTER(mjit_length_compact_units)
+RB_DEBUG_COUNTER(mjit_length_stale_units)
+
+/* Other MJIT counters */
+RB_DEBUG_COUNTER(mjit_compile_failures)
+
+/* load (not implemented yet) */
+/*
+RB_DEBUG_COUNTER(load_files)
+RB_DEBUG_COUNTER(load_path_is_not_realpath)
+*/
+#endif
+
+#ifndef RUBY_DEBUG_COUNTER_H
+#define RUBY_DEBUG_COUNTER_H 1
+
+#if !defined(__GNUC__) && USE_DEBUG_COUNTER
+#error "USE_DEBUG_COUNTER is not supported by other than __GNUC__"
+#endif
+
+enum rb_debug_counter_type {
+#define RB_DEBUG_COUNTER(name) RB_DEBUG_COUNTER_##name,
+#include __FILE__
+    RB_DEBUG_COUNTER_MAX
+#undef RB_DEBUG_COUNTER
+};
+
+#if USE_DEBUG_COUNTER
+extern size_t rb_debug_counter[];
+
+inline static int
+rb_debug_counter_add(enum rb_debug_counter_type type, int add, int cond)
+{
+    if (cond) {
+	rb_debug_counter[(int)type] += add;
+    }
+    return cond;
+}
+
+VALUE rb_debug_counter_reset(VALUE klass);
+VALUE rb_debug_counter_show(VALUE klass);
+
+#define RB_DEBUG_COUNTER_INC(type)                rb_debug_counter_add(RB_DEBUG_COUNTER_##type, 1, 1)
+#define RB_DEBUG_COUNTER_INC_UNLESS(type, cond) (!rb_debug_counter_add(RB_DEBUG_COUNTER_##type, 1, !(cond)))
+#define RB_DEBUG_COUNTER_INC_IF(type, cond)       rb_debug_counter_add(RB_DEBUG_COUNTER_##type, 1, (cond))
+
+#else
+#define RB_DEBUG_COUNTER_INC(type)              ((void)0)
+#define RB_DEBUG_COUNTER_INC_UNLESS(type, cond) (cond)
+#define RB_DEBUG_COUNTER_INC_IF(type, cond)     (cond)
+#endif
+
+void rb_debug_counter_show_results(const char *msg);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+
+size_t ruby_debug_counter_get(const char **names_ptr, size_t *counters_ptr);
+void ruby_debug_counter_reset(void);
+void ruby_debug_counter_show_at_exit(int enable);
+
+RUBY_SYMBOL_EXPORT_END
+
+#endif /* RUBY_DEBUG_COUNTER_H */
diff --git a/defs/default_gems b/defs/default_gems
deleted file mode 100644
index 030d84f6f5..0000000000
--- a/defs/default_gems
+++ /dev/null
@@ -1,7 +0,0 @@
-# gem		versioning file			[executable files under bin]
-rake		lib/rake/version.rb		[rake]
-rdoc		lib/rdoc.rb			[rdoc ri]
-minitest	lib/minitest/unit.rb
-json		ext/json/lib/json/version.rb
-io-console	ext/io/console/io-console.gemspec
-bigdecimal	ext/bigdecimal/bigdecimal.gemspec
diff --git a/defs/gmake.mk b/defs/gmake.mk
new file mode 100644
index 0000000000..226e1066a5
--- /dev/null
+++ b/defs/gmake.mk
@@ -0,0 +1,350 @@
+# -*- mode: makefile-gmake; indent-tabs-mode: t -*-
+
+gnumake = yes
+override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+)
+override mflags := $(filter-out -j%,$(MFLAGS))
+MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j)
+
+CHECK_TARGETS := great exam love check test check% test% btest%
+# expand test targets, and those dependents
+TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS))
+TEST_DEPENDS := $(filter-out commit $(TEST_TARGETS),$(MAKECMDGOALS))
+TEST_TARGETS := $(patsubst great,exam,$(TEST_TARGETS))
+TEST_DEPENDS := $(filter-out great $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_TARGETS := $(patsubst exam,check,$(TEST_TARGETS))
+TEST_TARGETS := $(patsubst check,test-spec test-all test-tool test-short,$(TEST_TARGETS))
+TEST_TARGETS := $(patsubst test-rubyspec,test-spec,$(TEST_TARGETS))
+TEST_DEPENDS := $(filter-out exam check test-spec $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_TARGETS := $(patsubst love,check,$(TEST_TARGETS))
+TEST_DEPENDS := $(filter-out love $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_TARGETS := $(patsubst test-almost,test-all,$(patsubst check-%,test test-%,$(TEST_TARGETS)))
+TEST_DEPENDS := $(filter-out test-all $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_TARGETS := $(patsubst test,test-short,$(TEST_TARGETS))
+TEST_DEPENDS := $(filter-out test $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_TARGETS := $(patsubst test-short,btest-ruby test-knownbug test-basic,$(TEST_TARGETS))
+TEST_DEPENDS := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts)
+
+in-srcdir := $(if $(filter-out .,$(srcdir)),$(CHDIR) $(srcdir) &&)
+
+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
+	@$$(ECHO) translating $$< with $(2)
+	$$(Q) $$(CC) $$(CFLAGS_NO_ARCH) $(2) $$(XCFLAGS) $$(CPPFLAGS) $$(COUTFLAG)$$@ -S $$<
+
+%.S: %.$(1).S
+
+%.$(1).i: %.c
+	@$$(ECHO) preprocessing $$< with $(2)
+	$$(Q) $$(CPP) $$(warnflags) $(2) $$(XCFLAGS) $$(CPPFLAGS) $$(COUTFLAG)$$@ -E $$< > $$@
+
+%.i: %.$(1).i
+endef
+
+$(foreach arch,$(arch_flags),\
+	$(eval $(call archcmd,$(patsubst -arch=%,%,$(value arch)),$(patsubst -arch=%,-arch %,$(value arch)))))
+endif
+
+.PHONY: $(addprefix yes-,$(TEST_TARGETS))
+
+ifneq ($(filter-out btest%,$(TEST_TARGETS)),)
+$(addprefix yes-,$(TEST_TARGETS)): $(TEST_DEPENDS)
+endif
+
+ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \
+	btest-ruby test-knownbug test-basic \
+	test-testframework test-tool test-ruby test-all \
+	test-spec test-bundler-prepare test-bundler \
+	)
+prev_test := $(if $(filter test-spec,$(ORDERED_TEST_TARGETS)),test-spec-precheck)
+$(foreach test,$(ORDERED_TEST_TARGETS), \
+	$(eval yes-$(value test) no-$(value test): $(value prev_test)); \
+	$(eval prev_test := $(value test)))
+
+ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),)
+install-targets := $(filter install uninstall,$(MAKECMDGOALS))
+$(word 1,$(install-targets)): $(word 0,$(install-targets))
+endif
+
+ifneq ($(filter reinstall,$(MAKECMDGOALS)),)
+install-prereq: uninstall
+uninstall sudo-precheck: all $(if $(filter all,$(INSTALLDOC)),docs)
+endif
+
+ifneq ($(filter love,$(MAKECMDGOALS)),)
+showflags: up
+sudo-precheck: test yes-test-testframework no-test-testframework
+install-prereq: sudo-precheck
+yes-test-all no-test-all: install
+endif
+# Cross reference needs to parse all files at once
+love install reinstall: RDOCFLAGS = --force-update
+
+$(srcdir)/missing/des_tables.c: $(srcdir)/missing/crypt.c
+ifeq ($(if $(filter yes,$(CROSS_COMPILING)),,$(CC)),)
+	touch $@
+else
+	@$(ECHO) building make_des_table
+	$(CC) $(INCFLAGS) $(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)/libexec/*)))))
+
+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 > $@
+
+.PHONY: commit
+commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS))) up
+	@$(BASERUBY) -C "$(srcdir)" -I./tool/lib -rvcs -e 'VCS.detect(".").commit'
+	+$(Q) \
+	{ \
+	  $(in-srcdir) \
+	  exec sed -f tool/prereq.status defs/gmake.mk template/Makefile.in common.mk; \
+	} | \
+	$(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \
+		BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" \
+		VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY CONFIGURE="$(CONFIGURE)" -f - \
+		update-src srcs all-incs
+
+GITHUB_RUBY_URL = https://github.com/ruby/ruby
+PR =
+
+COMMIT_GPG_SIGN = $(shell git -C "$(srcdir)" config commit.gpgsign)
+REMOTE_GITHUB_URL = $(shell git -C "$(srcdir)" config remote.github.url)
+COMMITS_NOTES = commits
+
+.PHONY: fetch-github
+fetch-github:
+	$(call fetch-github,$(PR))
+
+define fetch-github
+	$(if $(1),,\
+	  echo "usage:"; echo "  make $@ PR=1234"; \
+	  exit 1; \
+	)
+	$(eval REMOTE_GITHUB_URL := $(REMOTE_GITHUB_URL))
+	$(if $(REMOTE_GITHUB_URL),, \
+	  echo adding $(GITHUB_RUBY_URL) as remote github; \
+	  git -C "$(srcdir)" remote add github $(GITHUB_RUBY_URL); \
+	  git -C "$(srcdir)" config --add remote.github.fetch +refs/notes/$(COMMITS_NOTES):refs/notes/$(COMMITS_NOTES)
+	  $(eval REMOTE_GITHUB_URL := $(GITHUB_RUBY_URL)) \
+	)
+	$(if $(git -C "$(srcdir)" rev-parse "github/pull/$(1)/head" -- 2> /dev/null), \
+	    git -C "$(srcdir)" branch -f "gh-$(1)" "github/pull/$(1)/head", \
+	    git -C "$(srcdir)" fetch -f github "pull/$(1)/head:gh-$(1)" \
+	)
+endef
+
+.PHONY: checkout-github
+checkout-github: fetch-github
+	git -C "$(srcdir)" checkout "gh-$(PR)"
+
+.PHONY: update-github
+update-github: fetch-github
+	$(eval PULL_REQUEST_API := https://api.github.com/repos/ruby/ruby/pulls/$(PR))
+	$(eval PULL_REQUEST_FORK_BRANCH := $(shell \
+	  curl -s $(if $(GITHUB_TOKEN),-H "Authorization: bearer $(GITHUB_TOKEN)") $(PULL_REQUEST_API) | \
+	  $(BASERUBY) -rjson -e 'JSON.parse(STDIN.read)["head"].tap { |h| print "#{h["repo"]["full_name"]} #{h["ref"]}" }' \
+	))
+	$(eval FORK_REPO := $(word 1,$(PULL_REQUEST_FORK_BRANCH)))
+	$(eval PR_BRANCH := $(word 2,$(PULL_REQUEST_FORK_BRANCH)))
+
+	$(eval GITHUB_UPDATE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(PR)-XXXXXX"))
+	git -C "$(srcdir)" worktree add $(notdir $(GITHUB_UPDATE_WORKTREE)) "gh-$(PR)"
+	git -C "$(GITHUB_UPDATE_WORKTREE)" merge master --no-edit
+	@$(BASERUBY) -e 'print "Are you sure to push this to PR=$(PR)? [Y/n]: "; exit(gets.chomp != "n")'
+	git -C "$(srcdir)" remote add fork-$(PR) git@github.com:$(FORK_REPO).git
+	git -C "$(GITHUB_UPDATE_WORKTREE)" push fork-$(PR) gh-$(PR):$(PR_BRANCH)
+	git -C "$(srcdir)" remote rm fork-$(PR)
+	git -C "$(srcdir)" worktree remove $(notdir $(GITHUB_UPDATE_WORKTREE))
+	git -C "$(srcdir)" branch -D gh-$(PR)
+
+.PHONY: pull-github
+pull-github: fetch-github
+	$(call pull-github,$(PR))
+
+define pull-github
+	$(eval GITHUB_MERGE_BASE := $(shell git -C "$(srcdir)" log -1 --format=format:%H))
+	$(eval GITHUB_MERGE_BRANCH := $(shell git -C "$(srcdir)" symbolic-ref --short HEAD))
+	$(eval GITHUB_MERGE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(1)-XXXXXX"))
+	git -C "$(srcdir)" worktree add $(notdir $(GITHUB_MERGE_WORKTREE)) "gh-$(1)"
+	git -C "$(GITHUB_MERGE_WORKTREE)" rebase $(GITHUB_MERGE_BRANCH)
+	$(eval COMMIT_GPG_SIGN := $(COMMIT_GPG_SIGN))
+	$(if $(filter true,$(COMMIT_GPG_SIGN)), \
+	  git -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "git commit --amend --no-edit -S" "$(GITHUB_MERGE_BASE)"; \
+	)
+	git -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "git notes add --message 'Merged: $(GITHUB_RUBY_URL)/pull/$(1)'" "$(GITHUB_MERGE_BASE)"
+endef
+
+.PHONY: fetch-github-%
+fetch-github-%:
+	$(call fetch-github,$*)
+
+.PHONY: checkout-github-%
+checkout-github-%: fetch-github-%
+	git -C "$(srcdir)" checkout "gh-$*"
+
+.PHONY: pr-% pull-github-%
+pr-% pull-github-%: fetch-github-%
+	$(call pull-github,$*)
+
+HELP_EXTRA_TASKS = \
+	"  checkout-github:     checkout GitHub Pull Request [PR=1234]" \
+	"  pull-github:         rebase GitHub Pull Request to new worktree [PR=1234]" \
+	"  update-github:       merge master branch and push it to Pull Request [PR=1234]" \
+	""
+
+ifneq ($(filter refresh-gems,$(MAKECMDGOALS)),)
+extract-gems: update-gems
+update-gems: update-bundled_gems
+endif
+ifneq ($(filter extract-gems,$(MAKECMDGOALS)),)
+extract-gems: $(filter update-gems update-bundled_gems,$(MAKECMDGOALS))
+endif
+ifneq ($(filter update-gems,$(MAKECMDGOALS)),)
+update-gems: $(filter update-bundled_gems,$(MAKECMDGOALS))
+endif
+
+ifeq ($(filter 0 1,$(words $(arch_flags))),)
+$(foreach x,$(patsubst -arch=%,%,$(arch_flags)), \
+	  $(eval $$(MJIT_HEADER:.h=)-$(value x).h \
+		 $$(MJIT_MIN_HEADER:.h=)-$(value x).h \
+		 $$(TIMESTAMPDIR)/$$(MJIT_HEADER:.h=)-$(value x).time \
+		 : ARCH_FLAG := -arch $(value x)))
+
+$(foreach x,$(patsubst -arch=%,%,$(arch_flags)), \
+	$(eval $$(MJIT_HEADER:.h=)-$(value x).h: \
+		$$(TIMESTAMPDIR)/$$(MJIT_HEADER:.h=)-$(value x).time))
+
+mjit_min_headers := $(patsubst -arch=%,$(MJIT_MIN_HEADER:.h=-%.h),$(arch_flags))
+$(MJIT_MIN_HEADER): $(mjit_min_headers) $(PREP)
+	@ set -e; set $(patsubst -arch=%,%,$(arch_flags)); \
+	cd $(@D); h=$(@F:.h=); \
+	exec > $(@F).new; \
+	echo '#if 0'; \
+	for arch; do\
+	  echo "#elif defined __$${arch}__"; \
+	  echo "# include \"$$h-$$arch.h\""; \
+	done; \
+	echo "#else"; echo "# error unsupported platform"; echo "#endif"
+	$(IFCHANGE) $@ $@.new
+	$(Q) $(MAKEDIRS) $(MJIT_HEADER_INSTALL_DIR)
+	$(Q) $(MAKE_LINK) $@ $(MJIT_HEADER_INSTALL_DIR)/$(@F)
+
+endif
+
+ifeq ($(if $(wildcard $(filter-out .,$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES))),,\
+	   $(wildcard $(srcdir)/lib/unicode_normalize/tables.rb)),)
+# Needs the dependency when any Unicode data file exists, or
+# normalization tables script doesn't.  Otherwise, when the target
+# only exists, use it as-is.
+.PHONY: $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time
+UNICODE_TABLES_TIMESTAMP =
+$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: \
+	$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
+endif
+
+REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(srcdir)/revision.h 2>/dev/null)
+REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && git log -1 --format=%H 2>/dev/null)
+ifneq ($(REVISION_IN_HEADER),$(REVISION_LATEST))
+# GNU make treat the target as unmodified when its dependents get
+# updated but it is not updated, while others may not.
+$(srcdir)/revision.h: $(REVISION_H)
+endif
+
+# Query on the generated rdoc
+#
+#   $ make rdoc:Integer#+
+rdoc\:%: PHONY
+	$(Q)$(RUNRUBY) $(srcdir)/libexec/ri --no-standard-docs --doc-dir=$(RDOCOUT) $(patsubst rdoc:%,%,$@)
+
+test_%.rb test/%: programs PHONY
+	+$(Q)$(exec) $(RUNRUBY) "$(TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) -- $(patsubst test/%,%,$@)
+
+spec/bundler/%: PHONY
+	+$(Q)$(exec) $(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec --require spec_helper $(RSPECOPTS) $@
+
+spec/%: programs exts PHONY
+	+$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec-run -B $(srcdir)/spec/default.mspec $(SPECOPTS) $(patsubst %,$(srcdir)/%,$@)
+
+benchmark/%: miniruby$(EXEEXT) update-benchmark-driver PHONY
+	$(Q)$(BASERUBY) -rrubygems -I$(srcdir)/benchmark/lib $(srcdir)/benchmark/benchmark-driver/exe/benchmark-driver \
+	            --executables="compare-ruby::$(COMPARE_RUBY) -I$(EXTOUT)/common --disable-gem" \
+	            --executables="built-ruby::$(BENCH_RUBY) --disable-gem" \
+	            $(srcdir)/$@ $(OPTS)
+
+clean-srcs-ext::
+	$(Q)$(RM) $(patsubst $(srcdir)/%,%,$(EXT_SRCS))
+
+clean-srcs-extra::
+	$(Q)$(RM) $(patsubst $(srcdir)/%,%,$(EXTRA_SRCS))
+
+ifneq ($(filter $(VCS),git),)
+update-src::
+	@$(BASERUBY) $(srcdir)/tool/lib/colorize.rb pass "Latest commit hash = $(shell $(filter-out svn,$(VCS)) -C $(srcdir) rev-parse --short=10 HEAD)"
+endif
+
+# Update dependencies and commit the updates to the current branch.
+update-deps:
+	$(eval update_deps := $(shell date +update-deps-%Y%m%d))
+	$(eval deps_dir := $(shell mktemp -d)/$(update_deps))
+	$(eval GIT_DIR := $(shell git -C $(srcdir) rev-parse --absolute-git-dir))
+	git --git-dir=$(GIT_DIR) worktree add $(deps_dir)
+	cp $(srcdir)/tool/config.guess $(srcdir)/tool/config.sub $(deps_dir)/tool
+	[ -f config.status ] && cp config.status $(deps_dir)
+	cd $(deps_dir) && autoconf && \
+	exec ./configure -q -C --enable-load-relative --disable-install-doc --disable-rubygems 'optflags=-O0' 'debugflags=-save-temps=obj -g'
+	$(RUNRUBY) -C $(deps_dir) tool/update-deps --fix
+	git -C $(deps_dir) diff --no-ext-diff --ignore-submodules --exit-code || \
+	    git -C $(deps_dir) commit --all --message='Update dependencies'
+	git --git-dir=$(GIT_DIR) worktree remove $(deps_dir)
+	$(RMDIR) $(dir $(deps_dir))
+	git --git-dir=$(GIT_DIR) merge --no-edit --ff-only $(update_deps)
+	git --git-dir=$(GIT_DIR) branch --delete $(update_deps)
diff --git a/defs/id.def b/defs/id.def
new file mode 100644
index 0000000000..fc7a04ffbc
--- /dev/null
+++ b/defs/id.def
@@ -0,0 +1,206 @@
+# -*- mode: ruby; coding: us-ascii -*-
+firstline, predefined = __LINE__+1, %[\
+  max
+  min
+  freeze
+  nil?
+  inspect
+  intern
+  object_id
+  const_missing
+  method_missing                                        MethodMissing
+  method_added
+  singleton_method_added
+  method_removed
+  singleton_method_removed
+  method_undefined
+  singleton_method_undefined
+  length
+  size
+  gets
+  succ
+  each
+  proc
+  lambda
+  send
+  __send__
+  __attached__
+  initialize
+  initialize_copy
+  initialize_clone
+  initialize_dup
+  to_int
+  to_ary
+  to_str
+  to_sym
+  to_hash
+  to_proc
+  to_io
+  to_a
+  to_s
+  to_i
+  to_f
+  to_r
+  bt
+  bt_locations
+  call
+  mesg
+  exception
+  locals
+  not                                                   NOT
+  and                                                   AND
+  or                                                    OR
+  div
+  divmod
+  fdiv
+  quo
+  name
+  nil
+
+  _                                                     UScore
+
+  # MUST be successive
+  _1  NUMPARAM_1
+  _2  NUMPARAM_2
+  _3  NUMPARAM_3
+  _4  NUMPARAM_4
+  _5  NUMPARAM_5
+  _6  NUMPARAM_6
+  _7  NUMPARAM_7
+  _8  NUMPARAM_8
+  _9  NUMPARAM_9
+
+  "/*NULL*/"                                            NULL
+  empty?
+  eql?
+  respond_to?                                           Respond_to
+  respond_to_missing?                                   Respond_to_missing
+  <IFUNC>
+  <CFUNC>
+  core#set_method_alias
+  core#set_variable_alias
+  core#undef_method
+  core#define_method
+  core#define_singleton_method
+  core#set_postexe
+  core#hash_merge_ptr
+  core#hash_merge_kwd
+  core#raise
+
+  -                                                     debug#created_info
+
+  $_                                                    LASTLINE
+  $~                                                    BACKREF
+  $!                                                    ERROR_INFO
+]
+
+# VM ID         OP      Parser Token
+token_ops = %[\
+  Dot2          ..      DOT2
+  Dot3          ...     DOT3
+  BDot2         ..      BDOT2
+  BDot3         ...     BDOT3
+  UPlus         +@      UPLUS
+  UMinus        -@      UMINUS
+  Pow           **      POW
+  Cmp           <=>     CMP
+  PLUS          +
+  MINUS         -
+  MULT          *
+  DIV           /
+  MOD           %
+  LTLT          <<      LSHFT
+  GTGT          >>      RSHFT
+  LT            <
+  LE            <=      LEQ
+  GT            >
+  GE            >=      GEQ
+  Eq            ==      EQ
+  Eqq           ===     EQQ
+  Neq           !=      NEQ
+  Not           !
+  And           &
+  Or            |
+  Backquote     `
+  EqTilde       =~      MATCH
+  NeqTilde      !~      NMATCH
+  AREF          []
+  ASET          []=
+  COLON2        ::
+  ANDOP         &&
+  OROP          ||
+  ANDDOT        &.
+]
+
+class KeywordError < RuntimeError
+  def self.raise(mesg, line)
+    super(self, mesg, ["#{__FILE__}:#{line}", *caller])
+  end
+end
+
+predefined_ids = {}
+preserved_ids = []
+local_ids = []
+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
+  line.sub!(/\s+#.*/, '')
+  name, token = line.split
+  next unless name
+  token ||= name
+  if /#/ =~ token
+    token = "_#{token.gsub(/\W+/, '_')}"
+  else
+    token = token.sub(/\?/, 'P').sub(/\A[a-z]/) {$&.upcase}
+    token.sub!(/\A\$/, "_G_")
+    token.sub!(/\A@@/, "_C_")
+    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
+  if prev = predefined_ids[token]
+    KeywordError.raise("#{token} is already used for #{prev} at line #{names[prev]+firstline}", firstline+num)
+  end
+  names[name] = 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)\w+\z/; class_ids
+  when /\A@(?!\d)\w+\z/; instance_ids
+  when /\A((?!\d)\w+)=\z/; attrset_ids
+  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 1b5719aa85..fc30ec2d15 100644
--- a/defs/keywords
+++ b/defs/keywords
@@ -1,8 +1,8 @@
 %{
-struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
+struct kwtable {short name, id[2], state;};
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 #ifndef RIPPER
-static const struct kwtable *reserved_word(const char *, unsigned int);
+static const struct kwtable *reserved_word(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
 #define rb_reserved_word(str, len) reserved_word(str, len)
 %}
 
@@ -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
+alias, {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM
 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
+undef, {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM
 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 3cebe90a8e..e9694cfbda 100644
--- a/defs/known_errors.def
+++ b/defs/known_errors.def
@@ -1,145 +1,157 @@
-EPERM
-ENOENT
-ESRCH
-EINTR
-EIO
-ENXIO
 E2BIG
-ENOEXEC
-EBADF
-ECHILD
-EAGAIN
-ENOMEM
 EACCES
-EFAULT
-ENOTBLK
-EBUSY
-EEXIST
-EXDEV
-ENODEV
-ENOTDIR
-EISDIR
-EINVAL
-ENFILE
-EMFILE
-ENOTTY
-ETXTBSY
-EFBIG
-ENOSPC
-ESPIPE
-EROFS
-EMLINK
-EPIPE
-EDOM
-ERANGE
-EDEADLK
-ENAMETOOLONG
-ENOLCK
-ENOSYS
-ENOTEMPTY
-ELOOP
-EWOULDBLOCK
-ENOMSG
-EIDRM
-ECHRNG
-EL2NSYNC
-EL3HLT
-EL3RST
-ELNRNG
-EUNATCH
-ENOCSI
-EL2HLT
+EADDRINUSE
+EADDRNOTAVAIL
+EADV
+EAFNOSUPPORT
+EAGAIN
+EALREADY
+EAUTH
+EBADARCH
 EBADE
+EBADEXEC
+EBADF
+EBADFD
+EBADMACHO
+EBADMSG
 EBADR
-EXFULL
-ENOANO
+EBADRPC
 EBADRQC
 EBADSLT
-EDEADLOCK
 EBFONT
-ENOSTR
-ENODATA
-ETIME
-ENOSR
-ENONET
-ENOPKG
-EREMOTE
-ENOLINK
-EADV
-ESRMNT
+EBUSY
+ECANCELED
+ECAPMODE
+ECHILD
+ECHRNG
 ECOMM
-EPROTO
-EMULTIHOP
-EDOTDOT
-EBADMSG
-EOVERFLOW
-ENOTUNIQ
-EBADFD
-EREMCHG
-ELIBACC
-ELIBBAD
-ELIBSCN
-ELIBMAX
-ELIBEXEC
-EILSEQ
-ERESTART
-ESTRPIPE
-EUSERS
-ENOTSOCK
-EDESTADDRREQ
-EMSGSIZE
-EPROTOTYPE
-ENOPROTOOPT
-EPROTONOSUPPORT
-ESOCKTNOSUPPORT
-EOPNOTSUPP
-EPFNOSUPPORT
-EAFNOSUPPORT
-EADDRINUSE
-EADDRNOTAVAIL
-ENETDOWN
-ENETUNREACH
-ENETRESET
 ECONNABORTED
-ECONNRESET
-ENOBUFS
-EISCONN
-ENOTCONN
-ESHUTDOWN
-ETOOMANYREFS
-ETIMEDOUT
 ECONNREFUSED
+ECONNRESET
+EDEADLK
+EDEADLOCK
+EDESTADDRREQ
+EDEVERR
+EDOM
+EDOOFUS
+EDOTDOT
+EDQUOT
+EEXIST
+EFAULT
+EFBIG
+EFTYPE
 EHOSTDOWN
 EHOSTUNREACH
-EALREADY
+EHWPOISON
+EIDRM
+EILSEQ
 EINPROGRESS
-ESTALE
-EUCLEAN
-ENOTNAM
-ENAVAIL
+EINTR
+EINVAL
+EIO
+EIPSEC
+EISCONN
+EISDIR
 EISNAM
-EREMOTEIO
-EDQUOT
-ECANCELED
 EKEYEXPIRED
 EKEYREJECTED
 EKEYREVOKED
+EL2HLT
+EL2NSYNC
+EL3HLT
+EL3RST
+ELAST
+ELIBACC
+ELIBBAD
+ELIBEXEC
+ELIBMAX
+ELIBSCN
+ELNRNG
+ELOOP
 EMEDIUMTYPE
+EMFILE
+EMLINK
+EMSGSIZE
+EMULTIHOP
+ENAMETOOLONG
+ENAVAIL
+ENEEDAUTH
+ENETDOWN
+ENETRESET
+ENETUNREACH
+ENFILE
+ENOANO
+ENOATTR
+ENOBUFS
+ENOCSI
+ENODATA
+ENODEV
+ENOENT
+ENOEXEC
 ENOKEY
+ENOLCK
+ENOLINK
 ENOMEDIUM
+ENOMEM
+ENOMSG
+ENONET
+ENOPKG
+ENOPOLICY
+ENOPROTOOPT
+ENOSPC
+ENOSR
+ENOSTR
+ENOSYS
+ENOTBLK
+ENOTCAPABLE
+ENOTCONN
+ENOTDIR
+ENOTEMPTY
+ENOTNAM
 ENOTRECOVERABLE
-EOWNERDEAD
-ERFKILL
-EAUTH
-EBADRPC
-EDOOFUS
-EFTYPE
-ENEEDAUTH
-ENOATTR
+ENOTSOCK
 ENOTSUP
+ENOTTY
+ENOTUNIQ
+ENXIO
+EOPNOTSUPP
+EOVERFLOW
+EOWNERDEAD
+EPERM
+EPFNOSUPPORT
+EPIPE
 EPROCLIM
 EPROCUNAVAIL
 EPROGMISMATCH
 EPROGUNAVAIL
+EPROTO
+EPROTONOSUPPORT
+EPROTOTYPE
+EPWROFF
+EQFULL
+ERANGE
+EREMCHG
+EREMOTE
+EREMOTEIO
+ERESTART
+ERFKILL
+EROFS
 ERPCMISMATCH
-EIPSEC
+ESHLIBVERS
+ESHUTDOWN
+ESOCKTNOSUPPORT
+ESPIPE
+ESRCH
+ESRMNT
+ESTALE
+ESTRPIPE
+ETIME
+ETIMEDOUT
+ETOOMANYREFS
+ETXTBSY
+EUCLEAN
+EUNATCH
+EUSERS
+EWOULDBLOCK
+EXDEV
+EXFULL
diff --git a/defs/lex.c.src b/defs/lex.c.src
index 1b5719aa85..fc30ec2d15 100644
--- a/defs/lex.c.src
+++ b/defs/lex.c.src
@@ -1,8 +1,8 @@
 %{
-struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
+struct kwtable {short name, id[2], state;};
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 #ifndef RIPPER
-static const struct kwtable *reserved_word(const char *, unsigned int);
+static const struct kwtable *reserved_word(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
 #define rb_reserved_word(str, len) reserved_word(str, len)
 %}
 
@@ -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
+alias, {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM
 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
+undef, {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM
 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 1ac613dbea..31ae2eb6a1 100644
--- a/defs/opt_insn_unif.def
+++ b/defs/opt_insn_unif.def
@@ -8,12 +8,10 @@ __END__
 putobject putobject
 putobject putstring
 putobject setlocal
-putobject setdynamic
 
 putstring putstring
 putstring putobject
 putstring setlocal
-putstring setdynamic
 
 # putnil end
 
diff --git a/defs/opt_operand.def b/defs/opt_operand.def
index 5ca1d74028..887e3da49a 100644
--- a/defs/opt_operand.def
+++ b/defs/opt_operand.def
@@ -1,5 +1,5 @@
 #
-# configration file for operand union optimization
+# configuration file for operand union optimization
 #
 # format:
 #   [insn name] op1, op2 ...
@@ -7,53 +7,16 @@
 #  wildcard: *
 #
 
-__END__
-
-getlocal 2
-getlocal 3
-getlocal 4
-
-setlocal 2
-setlocal 3
-setlocal 4
-
-getdynamic *, 0
-getdynamic 1, 0
-getdynamic 2, 0
-getdynamic 3, 0
-getdynamic 4, 0
-
-setdynamic *, 0
-setdynamic 1, 0
-setdynamic 2, 0
-setdynamic 3, 0
-setdynamic 4, 0
+getlocal *, 0
+getlocal *, 1
+setlocal *, 0
+setlocal *, 1
 
 putobject INT2FIX(0)
 putobject INT2FIX(1)
-putobject Qtrue
-putobject Qfalse
-
-# CALL
-send *, *, Qfalse, 0, *
-send *, 0, Qfalse, 0, *
-send *, 1, Qfalse, 0, *
-send *, 2, Qfalse, 0, *
-send *, 3, Qfalse, 0, *
-
-# FCALL
-send *, *, Qfalse, 0x04, *
-send *, 0, Qfalse, 0x04, *
-send *, 1, Qfalse, 0x04, *
-send *, 2, Qfalse, 0x04, *
-send *, 3, Qfalse, 0x04, *
-
-# VCALL
-send *, 0, Qfalse, 0x0c, *
-
 
 __END__
 
-
-
+putobject Qtrue
+putobject Qfalse
 
diff --git a/defs/separated_version.mk b/defs/separated_version.mk
new file mode 100644
index 0000000000..72ee093da7
--- /dev/null
+++ b/defs/separated_version.mk
@@ -0,0 +1,38 @@
+# ******** FOR DEVELEPERS ONLY ********
+# Separate version.o into a shared library which varies every
+# revisions, in order to make the rest shareable.
+
+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/defs/universal.mk b/defs/universal.mk
new file mode 100644
index 0000000000..c34a31b356
--- /dev/null
+++ b/defs/universal.mk
@@ -0,0 +1,5 @@
+arch_flags := $(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG)))
+ifeq ($(filter 0 1,$(words $(arch_flags))),)
+override MJIT_HEADER_SUFFIX = -%
+override MJIT_HEADER_ARCH = -$(word 2,$(ARCH_FLAG))
+endif
diff --git a/dir.c b/dir.c
index 128e2c8c8f..6a926f438c 100644
--- a/dir.c
+++ b/dir.c
@@ -11,9 +11,11 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
 #include "ruby/encoding.h"
+#include "ruby/thread.h"
 #include "internal.h"
+#include "id.h"
+#include "encindex.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -22,6 +24,26 @@
 #include <unistd.h>
 #endif
 
+#ifndef O_CLOEXEC
+#  define O_CLOEXEC 0
+#endif
+
+#ifndef USE_OPENDIR_AT
+# if defined(HAVE_FDOPENDIR) && defined(HAVE_DIRFD) && \
+    defined(HAVE_OPENAT) && defined(HAVE_FSTATAT)
+#   define USE_OPENDIR_AT 1
+# else
+#   define USE_OPENDIR_AT 0
+# endif
+#endif
+#if USE_OPENDIR_AT
+# include <fcntl.h>
+#endif
+#ifndef AT_FDCWD
+# define AT_FDCWD -1
+#endif
+
+#undef HAVE_DIRENT_NAMLEN
 #if defined HAVE_DIRENT_H && !defined _WIN32
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)
@@ -30,12 +52,8 @@
 # define NAMLEN(dirent) strlen((dirent)->d_name)
 #else
 # define dirent direct
-# if !defined __NeXT__
-#  define NAMLEN(dirent) (dirent)->d_namlen
-# else
-#  /* On some versions of NextStep, d_namlen is always zero, so avoid it. */
-#  define NAMLEN(dirent) strlen((dirent)->d_name)
-# endif
+# define NAMLEN(dirent) (dirent)->d_namlen
+# define HAVE_DIRENT_NAMLEN 1
 # if HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
 # endif
@@ -64,9 +82,7 @@ char *strchr(char*,char);
 
 #include "ruby/util.h"
 
-#if !defined HAVE_LSTAT && !defined lstat
-#define lstat stat
-#endif
+#define vm_initialized rb_cThread
 
 /* define system APIs */
 #ifdef _WIN32
@@ -78,17 +94,123 @@ char *strchr(char*,char);
 #define rmdir(p) rb_w32_urmdir(p)
 #undef opendir
 #define opendir(p) rb_w32_uopendir(p)
+#define ruby_getcwd() rb_w32_ugetcwd(NULL, 0)
+#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
+#else
+# define NORMALIZE_UTF8PATH 0
+#endif
+
+#if NORMALIZE_UTF8PATH
+#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;
+	}
+    }
+# endif
+    return FALSE;
+}
+
+static inline int
+has_nonascii(const char *ptr, size_t len)
+{
+    while (len > 0) {
+	if (!ISASCII(*ptr)) return 1;
+	ptr++;
+	--len;
+    }
+    return 0;
+}
+
+# define IF_NORMALIZE_UTF8PATH(something) something
+#else
+# define IF_NORMALIZE_UTF8PATH(something) /* nothing */
+#endif
+
+#ifndef IFTODT
+# define IFTODT(m)	(((m) & S_IFMT) / ((~S_IFMT & (S_IFMT-1)) + 1))
+#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
 #define FNM_CASEFOLD	0x08
+#define FNM_EXTGLOB	0x10
 #if CASEFOLD_FILESYSTEM
 #define FNM_SYSCASE	FNM_CASEFOLD
 #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
@@ -135,7 +257,7 @@ bracket(
 	    p = t2 + (r2 = rb_enc_mbclen(t2, pend, enc));
 	    if (ok) continue;
 	    if ((r <= (send-s) && memcmp(t1, s, r) == 0) ||
-		(r2 <= (send-s) && memcmp(t2, s, r) == 0)) {
+		(r2 <= (send-s) && memcmp(t2, s, r2) == 0)) {
 		ok = 1;
 		continue;
 	    }
@@ -165,7 +287,7 @@ bracket(
     return ok == not ? NULL : (char *)p + 1;
 }
 
-/* If FNM_PATHNAME is set, only path element will be matched. (upto '/' or '\0')
+/* If FNM_PATHNAME is set, only path element will be matched. (up to '/' or '\0')
    Otherwise, entire string will be matched.
    End marker itself won't be compared.
    And if function succeeds, *pcur reaches end marker.
@@ -320,7 +442,7 @@ VALUE rb_cDir;
 
 struct dir_data {
     DIR *dir;
-    VALUE path;
+    const VALUE path;
     rb_encoding *enc;
 };
 
@@ -335,34 +457,25 @@ static void
 dir_free(void *ptr)
 {
     struct dir_data *dir = ptr;
-    if (dir) {
-	if (dir->dir) closedir(dir->dir);
-    }
+
+    if (dir->dir) closedir(dir->dir);
     xfree(dir);
 }
 
 static size_t
 dir_memsize(const void *ptr)
 {
-    return ptr ? sizeof(struct dir_data) : 0;
+    return sizeof(struct dir_data);
 }
 
 static const rb_data_type_t dir_data_type = {
     "dir",
     {dir_mark, dir_free, dir_memsize,},
+    0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE dir_close(VALUE);
 
-#define GlobPathValue(str, safe) \
-    /* can contain null bytes as separators */	\
-    (!RB_TYPE_P((str), T_STRING) ?		\
-     (void)FilePathValue(str) :			\
-     (void)(check_safe_glob((str), (safe)),		\
-      check_glob_encoding(str), (str)))
-#define check_safe_glob(str, safe) ((safe) ? rb_check_safe_obj(str) : (void)0)
-#define check_glob_encoding(str) rb_enc_check((str), rb_enc_from_encoding(rb_usascii_encoding()))
-
 static VALUE
 dir_s_alloc(VALUE klass)
 {
@@ -370,59 +483,101 @@ dir_s_alloc(VALUE klass)
     VALUE obj = TypedData_Make_Struct(klass, struct dir_data, &dir_data_type, dirp);
 
     dirp->dir = NULL;
-    dirp->path = Qnil;
+    RB_OBJ_WRITE(obj, &dirp->path, Qnil);
     dirp->enc = NULL;
 
     return obj;
 }
 
+static void *
+nogvl_opendir(void *ptr)
+{
+    const char *path = ptr;
+
+    return (void *)opendir(path);
+}
+
+static DIR *
+opendir_without_gvl(const char *path)
+{
+    if (vm_initialized) {
+	union { const void *in; void *out; } u;
+
+	u.in = path;
+
+	return rb_thread_call_without_gvl(nogvl_opendir, u.out, RUBY_UBF_IO, 0);
+    }
+    else
+	return opendir(path);
+}
+
 /*
  *  call-seq:
  *     Dir.new( string ) -> aDir
+ *     Dir.new( string, encoding: enc ) -> aDir
  *
  *  Returns a new directory object for the named directory.
+ *
+ *  The optional <i>encoding</i> keyword argument specifies the encoding of the directory.
+ *  If not specified, the filesystem encoding is used.
  */
 static VALUE
 dir_initialize(int argc, VALUE *argv, VALUE dir)
 {
     struct dir_data *dp;
     rb_encoding  *fsenc;
-    VALUE dirname, opt;
-    static VALUE sym_enc;
+    VALUE dirname, opt, orig;
+    static ID keyword_ids[1];
+    const char *path;
 
-    if (!sym_enc) {
-	sym_enc = ID2SYM(rb_intern("encoding"));
+    if (!keyword_ids[0]) {
+	keyword_ids[0] = rb_id_encoding();
     }
+
     fsenc = rb_filesystem_encoding();
 
-    argc = rb_scan_args(argc, argv, "1:", &dirname, &opt);
+    rb_scan_args(argc, argv, "1:", &dirname, &opt);
 
     if (!NIL_P(opt)) {
-	VALUE enc = rb_hash_aref(opt, sym_enc);
-	if (!NIL_P(enc)) {
+	VALUE enc;
+	rb_get_kwargs(opt, keyword_ids, 0, 1, &enc);
+	if (enc != Qundef && !NIL_P(enc)) {
 	    fsenc = rb_to_encoding(enc);
 	}
     }
 
-    GlobPathValue(dirname, FALSE);
+    FilePathValue(dirname);
+    orig = rb_str_dup_frozen(dirname);
     dirname = rb_str_encode_ospath(dirname);
+    dirname = rb_str_dup_frozen(dirname);
 
     TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dp);
     if (dp->dir) closedir(dp->dir);
     dp->dir = NULL;
-    dp->path = Qnil;
+    RB_OBJ_WRITE(dir, &dp->path, Qnil);
     dp->enc = fsenc;
-    dp->dir = opendir(RSTRING_PTR(dirname));
+    path = RSTRING_PTR(dirname);
+    dp->dir = opendir_without_gvl(path);
     if (dp->dir == NULL) {
-	if (errno == EMFILE || errno == ENFILE) {
-	    rb_gc();
-	    dp->dir = opendir(RSTRING_PTR(dirname));
+	int e = errno;
+	if (rb_gc_for_fd(e)) {
+	    dp->dir = opendir_without_gvl(path);
 	}
+#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_without_gvl(path);
+	    }
+	}
+#endif
 	if (dp->dir == NULL) {
-	    rb_sys_fail(RSTRING_PTR(dirname));
+	    RB_GC_GUARD(dirname);
+	    rb_syserr_fail_path(e, orig);
 	}
     }
-    dp->path = rb_str_dup_frozen(dirname);
+    RB_OBJ_WRITE(dir, &dp->path, orig);
 
     return dir;
 }
@@ -430,13 +585,17 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
 /*
  *  call-seq:
  *     Dir.open( string ) -> aDir
+ *     Dir.open( string, encoding: enc ) -> aDir
  *     Dir.open( string ) {| aDir | block } -> anObject
+ *     Dir.open( string, encoding: enc ) {| aDir | block } -> anObject
  *
- *  With no block, <code>open</code> is a synonym for
- *  <code>Dir::new</code>. If a block is present, it is passed
- *  <i>aDir</i> as a parameter. The directory is closed at the end of
- *  the block, and <code>Dir::open</code> returns the value of the
- *  block.
+ *  The optional <i>encoding</i> keyword argument specifies the encoding of the directory.
+ *  If not specified, the filesystem encoding is used.
+ *
+ *  With no block, <code>open</code> is a synonym for Dir::new. If a
+ *  block is present, it is passed <i>aDir</i> as a parameter. The
+ *  directory is closed at the end of the block, and Dir::open returns
+ *  the value of the block.
  */
 static VALUE
 dir_s_open(int argc, VALUE *argv, VALUE klass)
@@ -452,6 +611,8 @@ dir_s_open(int argc, VALUE *argv, VALUE klass)
     return dir;
 }
 
+NORETURN(static void dir_closed(void));
+
 static void
 dir_closed(void)
 {
@@ -459,13 +620,16 @@ dir_closed(void)
 }
 
 static struct dir_data *
-dir_check(VALUE dir)
+dir_get(VALUE dir)
 {
-    struct dir_data *dirp;
-    if (!OBJ_UNTRUSTED(dir) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: operation on trusted Dir");
     rb_check_frozen(dir);
-    dirp = rb_check_typeddata(dir, &dir_data_type);
+    return rb_check_typeddata(dir, &dir_data_type);
+}
+
+static struct dir_data *
+dir_check(VALUE dir)
+{
+    struct dir_data *dirp = dir_get(dir);
     if (!dirp->dir) dir_closed();
     return dirp;
 }
@@ -486,15 +650,64 @@ dir_inspect(VALUE dir)
 
     TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp);
     if (!NIL_P(dirp->path)) {
-	const char *c = rb_obj_classname(dir);
-	return rb_sprintf("#<%s:%s>", c, RSTRING_PTR(dirp->path));
+	VALUE str = rb_str_new_cstr("#<");
+	rb_str_append(str, rb_class_name(CLASS_OF(dir)));
+	rb_str_cat2(str, ":");
+	rb_str_append(str, dirp->path);
+	rb_str_cat2(str, ">");
+	return str;
     }
-    return rb_funcall(dir, rb_intern("to_s"), 0, 0);
+    return rb_funcallv(dir, idTo_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:
+ *     dir.fileno -> integer
+ *
+ *  Returns the file descriptor used in <em>dir</em>.
+ *
+ *     d = Dir.new("..")
+ *     d.fileno   #=> 8
+ *
+ *  This method uses dirfd() function defined by POSIX 2008.
+ *  NotImplementedError is raised on other platforms, such as Windows,
+ *  which doesn't provide the function.
+ *
+ */
+static VALUE
+dir_fileno(VALUE dir)
+{
+    struct dir_data *dirp;
+    int fd;
+
+    GetDIR(dir, dirp);
+    fd = dirfd(dirp->dir);
+    if (fd == -1)
+	rb_sys_fail("dirfd");
+    return INT2NUM(fd);
+}
+#else
+#define dir_fileno rb_f_notimplement
+#endif
+
 /*
  *  call-seq:
  *     dir.path -> string or nil
+ *     dir.to_path -> string or nil
  *
  *  Returns the path parameter passed to <em>dir</em>'s constructor.
  *
@@ -511,51 +724,46 @@ dir_path(VALUE dir)
     return rb_str_dup(dirp->path);
 }
 
-#if defined HAVE_READDIR_R
-# define READDIR(dir, enc, entry, dp) (readdir_r((dir), (entry), &(dp)) == 0 && (dp) != 0)
-#elif defined _WIN32
-# define READDIR(dir, enc, entry, dp) (((dp) = rb_w32_readdir_with_enc((dir), (enc))) != 0)
-#else
-# define READDIR(dir, enc, entry, dp) (((dp) = readdir(dir)) != 0)
-#endif
-#if defined HAVE_READDIR_R
-# define IF_HAVE_READDIR_R(something) something
+#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 IF_HAVE_READDIR_R(something) /* nothing */
+# define READDIR(dir, enc) readdir((dir))
 #endif
 
-#if defined SIZEOF_STRUCT_DIRENT_TOO_SMALL
-# include <limits.h>
-# define NAME_MAX_FOR_STRUCT_DIRENT 255
-# if defined NAME_MAX
-#  if NAME_MAX_FOR_STRUCT_DIRENT < NAME_MAX
-#   undef  NAME_MAX_FOR_STRUCT_DIRENT
-#   define NAME_MAX_FOR_STRUCT_DIRENT NAME_MAX
-#  endif
-# endif
-# if defined _POSIX_NAME_MAX
-#  if NAME_MAX_FOR_STRUCT_DIRENT < _POSIX_NAME_MAX
-#   undef  NAME_MAX_FOR_STRUCT_DIRENT
-#   define NAME_MAX_FOR_STRUCT_DIRENT _POSIX_NAME_MAX
-#  endif
-# endif
-# if defined _XOPEN_NAME_MAX
-#  if NAME_MAX_FOR_STRUCT_DIRENT < _XOPEN_NAME_MAX
-#   undef  NAME_MAX_FOR_STRUCT_DIRENT
-#   define NAME_MAX_FOR_STRUCT_DIRENT _XOPEN_NAME_MAX
-#  endif
-# endif
-# define DEFINE_STRUCT_DIRENT \
-  union { \
-    struct dirent dirent; \
-    char dummy[offsetof(struct dirent, d_name) + \
-	       NAME_MAX_FOR_STRUCT_DIRENT + 1]; \
-  }
-# define STRUCT_DIRENT(entry) ((entry).dirent)
+/* safe to use without GVL */
+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
-# define DEFINE_STRUCT_DIRENT struct dirent
-# define STRUCT_DIRENT(entry) (entry)
+    if (!name[1]) return TRUE;
+    if (name[1] != '.') return FALSE;
+    if (!name[2]) return TRUE;
 #endif
+    return FALSE;
+}
 
 /*
  *  call-seq:
@@ -574,20 +782,25 @@ dir_read(VALUE dir)
 {
     struct dir_data *dirp;
     struct dirent *dp;
-    IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
 
     GetDIR(dir, dirp);
     errno = 0;
-    if (READDIR(dirp->dir, dirp->enc, &STRUCT_DIRENT(entry), dp)) {
+    if ((dp = READDIR(dirp->dir, dirp->enc)) != NULL) {
 	return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
     }
-    else if (errno == 0) {	/* end of stream */
-	return Qnil;
-    }
     else {
-	rb_sys_fail(0);
+	int e = errno;
+	if (e != 0) rb_syserr_fail(e, 0);
+	return Qnil;		/* end of stream */
     }
-    return Qnil;		/* not reached */
+}
+
+static VALUE dir_each_entry(VALUE, VALUE (*)(VALUE, VALUE), VALUE, int);
+
+static VALUE
+dir_yield(VALUE arg, VALUE path)
+{
+    return rb_yield(path);
 }
 
 /*
@@ -613,16 +826,38 @@ dir_read(VALUE dir)
 static VALUE
 dir_each(VALUE dir)
 {
+    RETURN_ENUMERATOR(dir, 0, 0);
+    return dir_each_entry(dir, dir_yield, Qnil, FALSE);
+}
+
+static VALUE
+dir_each_entry(VALUE dir, VALUE (*each)(VALUE, VALUE), VALUE arg, int children_only)
+{
     struct dir_data *dirp;
     struct dirent *dp;
-    IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
+    IF_NORMALIZE_UTF8PATH(int norm_p);
 
-    RETURN_ENUMERATOR(dir, 0, 0);
     GetDIR(dir, dirp);
     rewinddir(dirp->dir);
-    while (READDIR(dirp->dir, dirp->enc, &STRUCT_DIRENT(entry), dp)) {
-	rb_yield(rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc));
-	if (dirp->dir == NULL) dir_closed();
+    IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp->dir, RSTRING_PTR(dirp->path)));
+    while ((dp = READDIR(dirp->dir, dirp->enc)) != NULL) {
+	const char *name = dp->d_name;
+	size_t namlen = NAMLEN(dp);
+	VALUE path;
+
+	if (children_only && name[0] == '.') {
+	    if (namlen == 1) continue; /* current directory */
+	    if (namlen == 2 && name[1] == '.') continue; /* parent directory */
+	}
+#if NORMALIZE_UTF8PATH
+	if (norm_p && has_nonascii(name, namlen) &&
+	    !NIL_P(path = rb_str_normalize_ospath(name, namlen))) {
+	    path = rb_external_str_with_enc(path, dirp->enc);
+	}
+	else
+#endif
+	path = rb_external_str_new_with_enc(name, namlen, dirp->enc);
+	(*each)(arg, path);
     }
     return dir;
 }
@@ -633,8 +868,7 @@ dir_each(VALUE dir)
  *     dir.pos -> integer
  *     dir.tell -> integer
  *
- *  Returns the current position in <em>dir</em>. See also
- *  <code>Dir#seek</code>.
+ *  Returns the current position in <em>dir</em>. See also Dir#seek.
  *
  *     d = Dir.new("testdir")
  *     d.tell   #=> 0
@@ -661,7 +895,7 @@ dir_tell(VALUE dir)
  *     dir.seek( integer ) -> dir
  *
  *  Seeks to a particular location in <em>dir</em>. <i>integer</i>
- *  must be a value returned by <code>Dir#tell</code>.
+ *  must be a value returned by Dir#tell.
  *
  *     d = Dir.new("testdir")   #=> #<Dir:0x401b3c40>
  *     d.read                   #=> "."
@@ -684,12 +918,12 @@ dir_seek(VALUE dir, VALUE pos)
 #define dir_seek rb_f_notimplement
 #endif
 
+#ifdef HAVE_SEEKDIR
 /*
  *  call-seq:
- *     dir.pos( integer ) -> integer
+ *     dir.pos = integer  -> integer
  *
- *  Synonym for <code>Dir#seek</code>, but returns the position
- *  parameter.
+ *  Synonym for Dir#seek, but returns the position parameter.
  *
  *     d = Dir.new("testdir")   #=> #<Dir:0x401b3c40>
  *     d.read                   #=> "."
@@ -704,6 +938,9 @@ dir_set_pos(VALUE dir, VALUE pos)
     dir_seek(dir, pos);
     return pos;
 }
+#else
+#define dir_set_pos rb_f_notimplement
+#endif
 
 /*
  *  call-seq:
@@ -721,9 +958,6 @@ dir_rewind(VALUE dir)
 {
     struct dir_data *dirp;
 
-    if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(dir)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close");
-    }
     GetDIR(dir, dirp);
     rewinddir(dirp->dir);
     return dir;
@@ -733,8 +967,8 @@ dir_rewind(VALUE dir)
  *  call-seq:
  *     dir.close -> nil
  *
- *  Closes the directory stream. Any further attempts to access
- *  <em>dir</em> will raise an <code>IOError</code>.
+ *  Closes the directory stream.
+ *  Calling this method on closed Dir object is ignored since Ruby 2.3.
  *
  *     d = Dir.new("testdir")
  *     d.close   #=> nil
@@ -744,19 +978,27 @@ dir_close(VALUE dir)
 {
     struct dir_data *dirp;
 
-    GetDIR(dir, dirp);
+    dirp = dir_get(dir);
+    if (!dirp->dir) return Qnil;
     closedir(dirp->dir);
     dirp->dir = NULL;
 
     return Qnil;
 }
 
+static void *
+nogvl_chdir(void *ptr)
+{
+    const char *path = ptr;
+
+    return (void *)(VALUE)chdir(path);
+}
+
 static void
 dir_chdir(VALUE path)
 {
-    path = rb_str_encode_ospath(path);
     if (chdir(RSTRING_PTR(path)) < 0)
-	rb_sys_fail(RSTRING_PTR(path));
+	rb_sys_fail_path(path);
 }
 
 static int chdir_blocking = 0;
@@ -768,8 +1010,9 @@ struct chdir_data {
 };
 
 static VALUE
-chdir_yield(struct chdir_data *args)
+chdir_yield(VALUE v)
 {
+    struct chdir_data *args = (void *)v;
     dir_chdir(args->new_path);
     args->done = TRUE;
     chdir_blocking++;
@@ -779,8 +1022,9 @@ chdir_yield(struct chdir_data *args)
 }
 
 static VALUE
-chdir_restore(struct chdir_data *args)
+chdir_restore(VALUE v)
 {
+    struct chdir_data *args = (void *)v;
     if (args->done) {
 	chdir_blocking--;
 	if (chdir_blocking == 0)
@@ -798,8 +1042,8 @@ chdir_restore(struct chdir_data *args)
  *  Changes the current working directory of the process to the given
  *  string. When called without an argument, changes the directory to
  *  the value of the environment variable <code>HOME</code>, or
- *  <code>LOGDIR</code>. <code>SystemCallError</code> (probably
- *  <code>Errno::ENOENT</code>) if the target directory does not exist.
+ *  <code>LOGDIR</code>. SystemCallError (probably Errno::ENOENT) if
+ *  the target directory does not exist.
  *
  *  If a block is given, it is passed the name of the new current
  *  directory, and the block is executed with that as the current
@@ -834,9 +1078,8 @@ 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);
+    if (rb_check_arity(argc, 0, 1) == 1) {
+        path = rb_str_encode_ospath(rb_get_path(argv[0]));
     }
     else {
 	const char *dist = getenv("HOME");
@@ -854,32 +1097,67 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
 
     if (rb_block_given_p()) {
 	struct chdir_data args;
-	char *cwd = my_getcwd();
 
-	args.old_path = rb_tainted_str_new2(cwd); xfree(cwd);
+	args.old_path = rb_str_encode_ospath(rb_dir_getwd());
 	args.new_path = path;
 	args.done = FALSE;
 	return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
     }
-    dir_chdir(path);
+    else {
+	char *p = RSTRING_PTR(path);
+	int r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_chdir, p,
+							RUBY_UBF_IO, 0);
+	if (r < 0)
+	    rb_sys_fail_path(path);
+    }
 
     return INT2FIX(0);
 }
 
+#ifndef _WIN32
 VALUE
-rb_dir_getwd(void)
+rb_dir_getwd_ospath(void)
 {
     char *path;
     VALUE cwd;
-
-    rb_secure(4);
-    path = my_getcwd();
-    cwd = rb_tainted_str_new2(path);
-    rb_enc_associate(cwd, rb_filesystem_encoding());
+    VALUE path_guard;
+
+#undef RUBY_UNTYPED_DATA_WARNING
+#define RUBY_UNTYPED_DATA_WARNING 0
+    path_guard = Data_Wrap_Struct((VALUE)0, NULL, RUBY_DEFAULT_FREE, NULL);
+    path = ruby_getcwd();
+    DATA_PTR(path_guard) = path;
+#ifdef __APPLE__
+    cwd = rb_str_normalize_ospath(path, strlen(path));
+#else
+    cwd = rb_str_new2(path);
+#endif
+    DATA_PTR(path_guard) = 0;
 
     xfree(path);
     return cwd;
 }
+#endif
+
+VALUE
+rb_dir_getwd(void)
+{
+    rb_encoding *fs = rb_filesystem_encoding();
+    int fsenc = rb_enc_to_index(fs);
+    VALUE cwd = rb_dir_getwd_ospath();
+
+    switch (fsenc) {
+      case ENCINDEX_US_ASCII:
+	fsenc = ENCINDEX_ASCII;
+      case ENCINDEX_ASCII:
+	break;
+#if defined _WIN32 || defined __APPLE__
+      default:
+	return rb_str_conv_enc(cwd, NULL, fs);
+#endif
+    }
+    return rb_enc_associate_index(cwd, fsenc);
+}
 
 /*
  *  call-seq:
@@ -891,6 +1169,7 @@ rb_dir_getwd(void)
  *
  *     Dir.chdir("/tmp")   #=> 0
  *     Dir.getwd           #=> "/tmp"
+ *     Dir.pwd             #=> "/tmp"
  */
 static VALUE
 dir_s_getwd(VALUE dir)
@@ -898,17 +1177,24 @@ dir_s_getwd(VALUE dir)
     return rb_dir_getwd();
 }
 
-static void
-check_dirname(volatile VALUE *dir)
+static VALUE
+check_dirname(VALUE dir)
 {
+    VALUE d = dir;
     char *path, *pend;
+    long len;
+    rb_encoding *enc;
 
-    rb_secure(2);
-    FilePathValue(*dir);
-    path = RSTRING_PTR(*dir);
-    if (path && *(pend = rb_path_end(rb_path_skip_prefix(path)))) {
-	*dir = rb_str_new(path, pend - path);
+    FilePathValue(d);
+    enc = rb_enc_get(d);
+    RSTRING_GETMEM(d, path, len);
+    pend = path + len;
+    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);
 }
 
 #if defined(HAVE_CHROOT)
@@ -924,11 +1210,9 @@ check_dirname(volatile VALUE *dir)
 static VALUE
 dir_s_chroot(VALUE dir, VALUE path)
 {
-    check_dirname(&path);
-
-    path = rb_str_encode_ospath(path);
+    path = check_dirname(path);
     if (chroot(RSTRING_PTR(path)) == -1)
-	rb_sys_fail(RSTRING_PTR(path));
+	rb_sys_fail_path(path);
 
     return INT2FIX(0);
 }
@@ -936,17 +1220,29 @@ dir_s_chroot(VALUE dir, VALUE path)
 #define dir_s_chroot rb_f_notimplement
 #endif
 
+struct mkdir_arg {
+    const char *path;
+    mode_t mode;
+};
+
+static void *
+nogvl_mkdir(void *ptr)
+{
+    struct mkdir_arg *m = ptr;
+
+    return (void *)(VALUE)mkdir(m->path, m->mode);
+}
+
 /*
  *  call-seq:
  *     Dir.mkdir( string [, integer] ) -> 0
  *
  *  Makes a new directory named by <i>string</i>, with permissions
  *  specified by the optional parameter <i>anInteger</i>. The
- *  permissions may be modified by the value of
- *  <code>File::umask</code>, and are ignored on NT. Raises a
- *  <code>SystemCallError</code> if the directory cannot be created. See
- *  also the discussion of permissions in the class documentation for
- *  <code>File</code>.
+ *  permissions may be modified by the value of File::umask, and are
+ *  ignored on NT. Raises a SystemCallError if the directory cannot be
+ *  created. See also the discussion of permissions in the class
+ *  documentation for File.
  *
  *    Dir.mkdir(File.join(Dir.home, ".foo"), 0700) #=> 0
  *
@@ -954,57 +1250,113 @@ dir_s_chroot(VALUE dir, VALUE path)
 static VALUE
 dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
 {
+    struct mkdir_arg m;
     VALUE path, vmode;
-    int mode;
+    int r;
 
     if (rb_scan_args(argc, argv, "11", &path, &vmode) == 2) {
-	mode = NUM2INT(vmode);
+	m.mode = NUM2MODET(vmode);
     }
     else {
-	mode = 0777;
+	m.mode = 0777;
     }
 
-    check_dirname(&path);
-    path = rb_str_encode_ospath(path);
-    if (mkdir(RSTRING_PTR(path), mode) == -1)
-	rb_sys_fail(RSTRING_PTR(path));
+    path = check_dirname(path);
+    m.path = RSTRING_PTR(path);
+    r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_mkdir, &m, RUBY_UBF_IO, 0);
+    if (r < 0)
+	rb_sys_fail_path(path);
 
     return INT2FIX(0);
 }
 
+static void *
+nogvl_rmdir(void *ptr)
+{
+    const char *path = ptr;
+
+    return (void *)(VALUE)rmdir(path);
+}
+
 /*
  *  call-seq:
  *     Dir.delete( string ) -> 0
  *     Dir.rmdir( string ) -> 0
  *     Dir.unlink( string ) -> 0
  *
- *  Deletes the named directory. Raises a subclass of
- *  <code>SystemCallError</code> if the directory isn't empty.
+ *  Deletes the named directory. Raises a subclass of SystemCallError
+ *  if the directory isn't empty.
  */
 static VALUE
 dir_s_rmdir(VALUE obj, VALUE dir)
 {
-    check_dirname(&dir);
-    dir = rb_str_encode_ospath(dir);
-    if (rmdir(RSTRING_PTR(dir)) < 0)
-	rb_sys_fail(RSTRING_PTR(dir));
+    const char *p;
+    int r;
+
+    dir = check_dirname(dir);
+    p = RSTRING_PTR(dir);
+    r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_rmdir, (void *)p, RUBY_UBF_IO, 0);
+    if (r < 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)
 {
-    rb_sys_warning("%s:%s", strerror(errno), (const char *)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
     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) \
-    (void)((flags & GLOB_VERBOSE) && rb_protect(sys_warning_1, (VALUE)(val), 0))
+#define sys_warning(val, enc) \
+    ((flags & GLOB_VERBOSE) ? sys_enc_warning_in(RUBY_FUNCTION_NAME_STRING, (val), (enc)) :(void)0)
+
+static inline void *
+glob_alloc_n(size_t x, size_t y)
+{
+    size_t z;
+    if (rb_mul_size_overflow(x, y, SSIZE_MAX, &z)) {
+        rb_memerror();          /* or...? */
+    }
+    else {
+        return malloc(z);
+    }
+}
 
 #define GLOB_ALLOC(type) ((type *)malloc(sizeof(type)))
-#define GLOB_ALLOC_N(type, n) ((type *)malloc(sizeof(type) * (n)))
+#define GLOB_ALLOC_N(type, n) ((type *)glob_alloc_n(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))
 
@@ -1012,81 +1364,230 @@ sys_warning_1(VALUE mesg)
  * ENOTDIR can be returned by stat(2) if a non-leaf element of the path
  * is not a directory.
  */
-#define to_be_ignored(e) ((e) == ENOENT || (e) == ENOTDIR)
+ALWAYS_INLINE(static int to_be_ignored(int e));
+static inline int
+to_be_ignored(int e)
+{
+    return e == ENOENT || e == ENOTDIR;
+}
+
+#ifdef _WIN32
+#define STAT(p, s)	rb_w32_ustati128((p), (s))
+#undef lstat
+#define lstat(p, s)	rb_w32_ulstati128((p), (s))
+#else
+#define STAT(p, s)	stat((p), (s))
+#endif
+
+typedef int ruby_glob_errfunc(const char*, VALUE, const void*, int);
+typedef struct {
+    ruby_glob_func *match;
+    ruby_glob_errfunc *error;
+} ruby_glob_funcs_t;
+
+static const char *
+at_subpath(int fd, size_t baselen, const char *path)
+{
+#if USE_OPENDIR_AT
+    if (fd != (int)AT_FDCWD && baselen > 0) {
+	path += baselen;
+	if (*path == '/') ++path;
+    }
+#endif
+    return *path ? path : ".";
+}
 
 /* System call with warning */
 static int
-do_stat(const char *path, struct stat *pst, int flags)
-
+do_stat(int fd, size_t baselen, const char *path, struct stat *pst, int flags, rb_encoding *enc)
 {
-    int ret = stat(path, pst);
+#if USE_OPENDIR_AT
+    int ret = fstatat(fd, at_subpath(fd, baselen, path), pst, 0);
+#else
+    int ret = STAT(path, pst);
+#endif
     if (ret < 0 && !to_be_ignored(errno))
-	sys_warning(path);
+	sys_warning(path, enc);
 
     return ret;
 }
 
+#if defined HAVE_LSTAT || defined lstat || USE_OPENDIR_AT
 static int
-do_lstat(const char *path, struct stat *pst, int flags)
+do_lstat(int fd, size_t baselen, const char *path, struct stat *pst, int flags, rb_encoding *enc)
 {
+#if USE_OPENDIR_AT
+    int ret = fstatat(fd, at_subpath(fd, baselen, path), pst, AT_SYMLINK_NOFOLLOW);
+#else
     int ret = lstat(path, pst);
+#endif
     if (ret < 0 && !to_be_ignored(errno))
-	sys_warning(path);
+	sys_warning(path, enc);
 
     return ret;
 }
+#else
+#define do_lstat do_stat
+#endif
+
+struct opendir_at_arg {
+    int basefd;
+    const char *path;
+};
+
+static void *
+with_gvl_gc_for_fd(void *ptr)
+{
+    int *e = ptr;
+
+    return (void *)(rb_gc_for_fd(*e) ? Qtrue : Qfalse);
+}
+
+static int
+gc_for_fd_with_gvl(int e)
+{
+    if (vm_initialized)
+	return (int)(VALUE)rb_thread_call_with_gvl(with_gvl_gc_for_fd, &e);
+    else
+	return rb_gc_for_fd(e) ? Qtrue : Qfalse;
+}
+
+static void *
+nogvl_opendir_at(void *ptr)
+{
+    const struct opendir_at_arg *oaa = ptr;
+    DIR *dirp;
+
+#if USE_OPENDIR_AT
+    const int opendir_flags = (O_RDONLY|O_CLOEXEC|
+#  ifdef O_DIRECTORY
+			       O_DIRECTORY|
+#  endif /* O_DIRECTORY */
+			       0);
+    int fd = openat(oaa->basefd, oaa->path, opendir_flags);
+
+    dirp = fd >= 0 ? fdopendir(fd) : 0;
+    if (!dirp) {
+	int e = errno;
+
+	switch (gc_for_fd_with_gvl(e)) {
+	  default:
+	    if (fd < 0) fd = openat(oaa->basefd, oaa->path, opendir_flags);
+	    if (fd >= 0) dirp = fdopendir(fd);
+	    if (dirp) return dirp;
+
+	    e = errno;
+	    /* fallthrough*/
+	  case 0:
+	    if (fd >= 0) close(fd);
+	    errno = e;
+	}
+    }
+#else  /* !USE_OPENDIR_AT */
+    dirp = opendir(oaa->path);
+    if (!dirp && gc_for_fd_with_gvl(errno))
+	dirp = opendir(oaa->path);
+#endif /* !USE_OPENDIR_AT */
+
+    return dirp;
+}
+
+static DIR *
+opendir_at(int basefd, const char *path)
+{
+    struct opendir_at_arg oaa;
+
+    oaa.basefd = basefd;
+    oaa.path = path;
+
+    if (vm_initialized)
+	return rb_thread_call_without_gvl(nogvl_opendir_at, &oaa, RUBY_UBF_IO, 0);
+    else
+	return nogvl_opendir_at(&oaa);
+}
 
 static DIR *
-do_opendir(const char *path, int flags, rb_encoding *enc)
+do_opendir(const int basefd, size_t baselen, const char *path, int flags, rb_encoding *enc,
+	   ruby_glob_errfunc *errfunc, VALUE arg, int *status)
 {
     DIR *dirp;
 #ifdef _WIN32
-    volatile VALUE tmp;
-    if (enc != rb_usascii_encoding() &&
-	enc != rb_ascii8bit_encoding() &&
-	enc != rb_utf8_encoding()) {
+    VALUE tmp = 0;
+    if (!fundamental_encoding_p(enc)) {
 	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 == NULL && !to_be_ignored(errno))
-	sys_warning(path);
+    dirp = opendir_at(basefd, at_subpath(basefd, baselen, path));
+    if (!dirp) {
+	int e = errno;
+
+	*status = 0;
+	if (!to_be_ignored(e)) {
+	    if (errfunc) {
+		*status = (*errfunc)(path, arg, enc, e);
+	    }
+	    else {
+		sys_warning(path, enc);
+	    }
+	}
+    }
+#ifdef _WIN32
+    if (tmp) rb_str_resize(tmp, 0); /* GC guard */
+#endif
 
     return dirp;
 }
 
+/* Globing pattern */
+enum glob_pattern_type { PLAIN, ALPHA, BRACE, MAGICAL, RECURSIVE, MATCH_ALL, MATCH_DIR };
+
 /* Return nonzero if S has any special globbing chars in it.  */
-static int
+static enum glob_pattern_type
 has_magic(const char *p, const char *pend, int flags, rb_encoding *enc)
 {
     const int escape = !(flags & FNM_NOESCAPE);
-    const int nocase = flags & FNM_CASEFOLD;
+    int hasalpha = 0;
+    int hasmagical = 0;
 
     register char c;
 
     while (p < pend && (c = *p++) != 0) {
 	switch (c) {
+	  case '{':
+	    return BRACE;
+
 	  case '*':
 	  case '?':
 	  case '[':
-	    return 1;
+	    hasmagical = 1;
+	    break;
 
 	  case '\\':
-	    if (escape && !(c = *p++))
-		return 0;
-	    continue;
+	    if (escape && p++ >= pend)
+		continue;
+	    break;
 
+#ifdef _WIN32
+	  case '.':
+	    break;
+
+	  case '~':
+	    hasalpha = 1;
+	    break;
+#endif
 	  default:
-	    if (!FNM_SYSCASE && ISALPHA(c) && nocase)
-		return 1;
+	    if (IS_WIN32 || ISALPHA(c)) {
+		hasalpha = 1;
+	    }
+	    break;
 	}
 
 	p = Next(p-1, pend, enc);
     }
 
-    return 0;
+    return hasmagical ? MAGICAL : hasalpha ? ALPHA : PLAIN;
 }
 
 /* Find separator in globbing pattern. */
@@ -1107,6 +1608,13 @@ find_dirsep(const char *p, const char *pend, int flags, rb_encoding *enc)
 	    open = 0;
 	    continue;
 
+	  case '{':
+	    open = 1;
+	    continue;
+	  case '}':
+	    open = 0;
+	    continue;
+
 	  case '/':
 	    if (!open)
 		return (char *)p-1;
@@ -1125,10 +1633,9 @@ find_dirsep(const char *p, const char *pend, int flags, rb_encoding *enc)
 }
 
 /* Remove escaping backslashes */
-static void
-remove_backslashes(char *p, rb_encoding *enc)
+static char *
+remove_backslashes(char *p, register const char *pend, rb_encoding *enc)
 {
-    register const char *pend = p + strlen(p);
     char *t = p;
     char *s = p;
 
@@ -1147,10 +1654,9 @@ remove_backslashes(char *p, rb_encoding *enc)
 
     if (t != s)
 	memmove(t, s, p - s); /* move '\0' too */
-}
 
-/* Globing pattern */
-enum glob_pattern_type { PLAIN, MAGICAL, RECURSIVE, MATCH_ALL, MATCH_DIR };
+    return p;
+}
 
 struct glob_pattern {
     char *str;
@@ -1165,25 +1671,28 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
 {
     struct glob_pattern *list, *tmp, **tail = &list;
     int dirsep = 0; /* pattern is terminated with '/' */
+    int recursive = 0;
 
     while (p < e && *p) {
 	tmp = GLOB_ALLOC(struct glob_pattern);
 	if (!tmp) goto error;
-	if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
+	if (p + 2 < e && p[0] == '*' && p[1] == '*' && p[2] == '/') {
 	    /* fold continuous RECURSIVEs (needed in glob_helper) */
 	    do { p += 3; while (*p == '/') p++; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
 	    tmp->type = RECURSIVE;
 	    tmp->str = 0;
 	    dirsep = 1;
+	    recursive = 1;
 	}
 	else {
 	    const char *m = find_dirsep(p, e, flags, enc);
-	    int magic = has_magic(p, m, 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;
 	    char *buf;
 
-	    if (!magic && *m) {
+	    if (!(FNM_SYSCASE || magic > non_magic) && !recursive && *m) {
 		const char *m2;
-		while (!has_magic(m+1, m2 = find_dirsep(m+1, e, flags, enc), flags, enc) &&
+		while (has_magic(m+1, m2 = find_dirsep(m+1, e, flags, enc), flags, enc) <= non_magic &&
 		       *m2) {
 		    m = m2;
 		}
@@ -1195,7 +1704,7 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
 	    }
 	    memcpy(buf, p, m-p);
 	    buf[m-p] = '\0';
-	    tmp->type = magic ? MAGICAL : PLAIN;
+	    tmp->type = magic > MAGICAL ? MAGICAL : magic > non_magic ? magic : PLAIN;
 	    tmp->str = buf;
 	    if (*m) {
 		dirsep = 1;
@@ -1238,23 +1747,179 @@ glob_free_pattern(struct glob_pattern *list)
 }
 
 static char *
-join_path(const char *path, int dirsep, const char *name)
+join_path(const char *path, size_t len, int dirsep, const char *name, size_t namlen)
 {
-    long len = strlen(path);
-    long len2 = strlen(name)+(dirsep?1:0)+1;
-    char *buf = GLOB_ALLOC_N(char, len+len2);
+    char *buf = GLOB_ALLOC_N(char, len+namlen+(dirsep?1:0)+1);
 
     if (!buf) return 0;
     memcpy(buf, path, len);
     if (dirsep) {
 	buf[len++] = '/';
     }
-    buf[len] = '\0';
-    strlcat(buf+len, name, len2);
+    memcpy(buf+len, name, namlen);
+    buf[len+namlen] = '\0';
     return buf;
 }
 
-enum answer { YES, NO, UNKNOWN };
+#ifdef HAVE_GETATTRLIST
+# if defined HAVE_FGETATTRLIST
+#   define is_case_sensitive(dirp, path) is_case_sensitive(dirp)
+# else
+#   define is_case_sensitive(dirp, path) is_case_sensitive(path)
+# endif
+static int
+is_case_sensitive(DIR *dirp, const char *path)
+{
+    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 defined HAVE_FGETATTRLIST
+    if (fgetattrlist(dirfd(dirp), &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))
+	return -1;
+#   else
+    if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))
+	return -1;
+#   endif
+    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
 
 #ifndef S_ISDIR
 #   define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
@@ -1271,39 +1936,188 @@ enum answer { YES, NO, UNKNOWN };
 struct glob_args {
     void (*func)(const char *, VALUE, void *);
     const char *path;
+    const char *base;
+    size_t baselen;
     VALUE value;
     rb_encoding *enc;
 };
 
+#define glob_call_func(func, path, arg, enc) (*(func))((path), (arg), (void *)(enc))
+
 static VALUE
 glob_func_caller(VALUE val)
 {
     struct glob_args *args = (struct glob_args *)val;
 
-    (*args->func)(args->path, args->value, args->enc);
+    glob_call_func(args->func, args->path, args->value, args->enc);
+    return Qnil;
+}
+
+struct glob_error_args {
+    const char *path;
+    rb_encoding *enc;
+    int error;
+};
+
+static VALUE
+glob_func_warning(VALUE val)
+{
+    struct glob_error_args *arg = (struct glob_error_args *)val;
+    rb_syserr_enc_warning(arg->error, arg->enc, "%s", arg->path);
+    return Qnil;
+}
+
+#if 0
+static int
+rb_glob_warning(const char *path, VALUE a, const void *enc, int error)
+{
+    int status;
+    struct glob_error_args args;
+
+    args.path = path;
+    args.enc = enc;
+    args.error = error;
+    rb_protect(glob_func_warning, (VALUE)&args, &status);
+    return status;
+}
+#endif
+
+static VALUE
+glob_func_error(VALUE val)
+{
+    struct glob_error_args *arg = (struct glob_error_args *)val;
+    VALUE path = rb_enc_str_new_cstr(arg->path, arg->enc);
+    rb_syserr_fail_str(arg->error, path);
     return Qnil;
 }
 
-#define glob_call_func(func, path, arg, enc) (*(func))((path), (arg), (enc))
+static int
+rb_glob_error(const char *path, VALUE a, const void *enc, int error)
+{
+    int status;
+    struct glob_error_args args;
+    VALUE (*errfunc)(VALUE) = glob_func_error;
+
+    if (error == EACCES) {
+	errfunc = glob_func_warning;
+    }
+    args.path = path;
+    args.enc = enc;
+    args.error = error;
+    rb_protect(errfunc, (VALUE)&args, &status);
+    return status;
+}
+
+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;
+}
+
+struct push_glob_args {
+    int fd;
+    const char *path;
+    size_t baselen;
+    size_t namelen;
+    int dirsep; /* '/' should be placed before appending child entry's name to 'path'. */
+    rb_pathtype_t pathtype; /* type of 'path' */
+    int flags;
+    const ruby_glob_funcs_t *funcs;
+    VALUE arg;
+};
+
+struct dirent_brace_args {
+    const char *name;
+    const struct dirent *dp;
+    int flags;
+};
+
+static int
+dirent_match_brace(const char *pattern, VALUE val, void *enc)
+{
+    struct dirent_brace_args *arg = (struct dirent_brace_args *)val;
+
+    return dirent_match(pattern, enc, arg->name, arg->dp, arg->flags);
+}
+
+/* join paths from pattern list of glob_make_pattern() */
+static char*
+join_path_from_pattern(struct glob_pattern **beg)
+{
+    struct glob_pattern *p;
+    char *path = NULL;
+    size_t path_len = 0;
+
+    for (p = *beg; p; p = p->next) {
+	const char *str;
+	switch (p->type) {
+	  case RECURSIVE:
+	    str = "**";
+	    break;
+	  case MATCH_DIR:
+	    /* append last slash */
+	    str = "";
+	    break;
+	  default:
+	    str = p->str;
+	    if (!str) continue;
+	}
+	if (!path) {
+	    path_len = strlen(str);
+	    path = GLOB_ALLOC_N(char, path_len + 1);
+            if (path) {
+                memcpy(path, str, path_len);
+                path[path_len] = '\0';
+            }
+        }
+        else {
+	    size_t len = strlen(str);
+	    char *tmp;
+	    tmp = GLOB_REALLOC(path, path_len + len + 2);
+	    if (tmp) {
+		path = tmp;
+		path[path_len++] = '/';
+		memcpy(path + path_len, str, len);
+		path_len += len;
+		path[path_len] = '\0';
+	    }
+	}
+    }
+    return path;
+}
+
+static int push_caller(const char *path, VALUE val, void *enc);
+
+static int ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
+			     rb_encoding *enc, VALUE var);
 
 static int
 glob_helper(
+    int fd,
     const char *path,
+    size_t baselen,
+    size_t namelen,
     int dirsep, /* '/' should be placed before appending child entry's name to 'path'. */
-    enum answer exist, /* Does 'path' indicate an existing entry? */
-    enum answer isdir, /* Does 'path' indicate a directory or a symlink to a directory? */
+    rb_pathtype_t pathtype, /* type of 'path' */
     struct glob_pattern **beg,
     struct glob_pattern **end,
     int flags,
-    ruby_glob_func *func,
+    const ruby_glob_funcs_t *funcs,
     VALUE arg,
     rb_encoding *enc)
 {
     struct stat st;
     int status = 0;
     struct glob_pattern **cur, **new_beg, **new_end;
-    int plain = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0;
+    int plain = 0, brace = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0;
     int escape = !(flags & FNM_NOESCAPE);
+    size_t pathlen = baselen + namelen;
 
     for (cur = beg; cur < end; ++cur) {
 	struct glob_pattern *p = *cur;
@@ -1315,8 +2129,20 @@ glob_helper(
 	  case PLAIN:
 	    plain = 1;
 	    break;
-	  case MAGICAL:
+	  case ALPHA:
+#if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME
+	    plain = 1;
+#else
 	    magical = 1;
+#endif
+	    break;
+	  case BRACE:
+	    if (!recursive) {
+		brace = 1;
+	    }
+	    break;
+	  case MAGICAL:
+	    magical = 2;
 	    break;
 	  case MATCH_ALL:
 	    match_all = 1;
@@ -1329,67 +2155,150 @@ glob_helper(
 	}
     }
 
+    if (brace) {
+	struct push_glob_args args;
+	char* brace_path = join_path_from_pattern(beg);
+	if (!brace_path) return -1;
+	args.fd = fd;
+	args.path = path;
+	args.baselen = baselen;
+	args.namelen = namelen;
+	args.dirsep = dirsep;
+	args.pathtype = pathtype;
+	args.flags = flags;
+	args.funcs = funcs;
+	args.arg = arg;
+	status = ruby_brace_expand(brace_path, flags, push_caller, (VALUE)&args, enc, Qfalse);
+	GLOB_FREE(brace_path);
+	return status;
+    }
+
     if (*path) {
-	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;
+	if (match_all && pathtype == path_unknown) {
+	    if (do_lstat(fd, baselen, path, &st, flags, enc) == 0) {
+		pathtype = IFTODT(st.st_mode);
 	    }
 	    else {
-		exist = NO;
-		isdir = NO;
+		pathtype = path_noent;
 	    }
 	}
-	if (match_dir && isdir == UNKNOWN) {
-	    if (do_stat(path, &st, flags) == 0) {
-		exist = YES;
-		isdir = S_ISDIR(st.st_mode) ? YES : NO;
+	if (match_dir && (pathtype == path_unknown || pathtype == path_symlink)) {
+	    if (do_stat(fd, baselen, path, &st, flags, enc) == 0) {
+		pathtype = IFTODT(st.st_mode);
 	    }
 	    else {
-		exist = NO;
-		isdir = NO;
+		pathtype = path_noent;
 	    }
 	}
-	if (match_all && exist == YES) {
-	    status = glob_call_func(func, path, arg, enc);
+	if (match_all && pathtype > path_noent) {
+	    const char *subpath = path + baselen + (baselen && path[baselen] == '/');
+	    status = glob_call_func(funcs->match, subpath, arg, enc);
 	    if (status) return status;
 	}
-	if (match_dir && isdir == YES) {
-	    char *tmp = join_path(path, dirsep, "");
+	if (match_dir && pathtype == path_directory) {
+	    int seplen = (baselen && path[baselen] == '/');
+	    const char *subpath = path + baselen + seplen;
+	    char *tmp = join_path(subpath, namelen - seplen, dirsep, "", 0);
 	    if (!tmp) return -1;
-	    status = glob_call_func(func, tmp, arg, enc);
+	    status = glob_call_func(funcs->match, tmp, arg, enc);
 	    GLOB_FREE(tmp);
 	    if (status) return status;
 	}
     }
 
-    if (exist == NO || isdir == NO) return 0;
+    if (pathtype == path_noent) return 0;
 
     if (magical || recursive) {
 	struct dirent *dp;
 	DIR *dirp;
-	IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
-	dirp = do_opendir(*path ? path : ".", flags, enc);
-	if (dirp == NULL) return 0;
+# if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH
+	char *plainname = 0;
+# endif
+	IF_NORMALIZE_UTF8PATH(int norm_p);
+# if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH
+	if (cur + 1 == end && (*cur)->type <= ALPHA) {
+	    plainname = join_path(path, pathlen, dirsep, (*cur)->str, strlen((*cur)->str));
+	    if (!plainname) return -1;
+	    dirp = do_opendir(fd, basename, plainname, flags, enc, funcs->error, arg, &status);
+	    GLOB_FREE(plainname);
+	}
+	else
+# else
+	    ;
+# endif
+	dirp = do_opendir(fd, baselen, path, flags, enc, funcs->error, arg, &status);
+	if (dirp == NULL) {
+# if FNM_SYSCASE || NORMALIZE_UTF8PATH
+	    if ((magical < 2) && !recursive && (errno == EACCES)) {
+		/* no read permission, fallback */
+		goto literally;
+	    }
+# endif
+	    return status;
+	}
+	IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp, *path ? path : "."));
 
-	while (READDIR(dirp, enc, &STRUCT_DIRENT(entry), dp)) {
-	    char *buf = join_path(path, dirsep, dp->d_name);
-	    enum answer new_isdir = UNKNOWN;
+# if NORMALIZE_UTF8PATH
+	if (!(norm_p || magical || recursive)) {
+	    closedir(dirp);
+	    goto literally;
+	}
+# endif
+# ifdef HAVE_GETATTRLIST
+	if (is_case_sensitive(dirp, path) == 0)
+	    flags |= FNM_CASEFOLD;
+# endif
+	while ((dp = READDIR(dirp, enc)) != NULL) {
+	    char *buf;
+	    rb_pathtype_t new_pathtype = path_unknown;
+	    const char *name;
+	    size_t namlen;
+	    int dotfile = 0;
+	    IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil);
+
+	    name = dp->d_name;
+	    namlen = NAMLEN(dp);
+	    if (recursive && name[0] == '.') {
+		++dotfile;
+		if (namlen == 1) {
+		    /* unless DOTMATCH, skip current directories not to recurse infinitely */
+		    if (!(flags & FNM_DOTMATCH)) continue;
+		    ++dotfile;
+		    new_pathtype = path_directory; /* force to skip stat/lstat */
+		}
+		else if (namlen == 2 && name[1] == '.') {
+		    /* always skip parent directories not to recurse infinitely */
+		    continue;
+		}
+	    }
 
+# if NORMALIZE_UTF8PATH
+	    if (norm_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 (!buf) {
 		status = -1;
 		break;
 	    }
-	    if (recursive && strcmp(dp->d_name, ".") != 0 && strcmp(dp->d_name, "..") != 0
-		&& fnmatch("*", rb_usascii_encoding(), dp->d_name, flags) == 0) {
-#ifndef _WIN32
-		if (do_lstat(buf, &st, flags) == 0)
-		    new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
-		else
-		    new_isdir = NO;
-#else
-		new_isdir = dp->d_isdir ? (!dp->d_isrep ? YES : UNKNOWN) : NO;
+	    name = buf + pathlen + (dirsep != 0);
+#ifdef DT_UNKNOWN
+	    if (dp->d_type != DT_UNKNOWN) {
+		/* Got it. We need no more lstat. */
+		new_pathtype = dp->d_type;
+	    }
 #endif
+	    if (recursive && dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1) &&
+		new_pathtype == path_unknown) {
+		/* RECURSIVE never match dot files unless FNM_DOTMATCH is set */
+		if (do_lstat(fd, baselen, buf, &st, flags, enc) == 0)
+		    new_pathtype = IFTODT(st.st_mode);
+		else
+		    new_pathtype = path_noent;
 	    }
 
 	    new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2);
@@ -1401,19 +2310,43 @@ glob_helper(
 
 	    for (cur = beg; cur < end; ++cur) {
 		struct glob_pattern *p = *cur;
+		struct dirent_brace_args args;
 		if (p->type == RECURSIVE) {
-		    if (new_isdir == YES) /* not symlink but real directory */
-			*new_end++ = p; /* append recursive pattern */
+		    if (new_pathtype == path_directory || /* not symlink but real directory */
+			new_pathtype == path_exist) {
+			if (dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1))
+			    *new_end++ = p; /* append recursive pattern */
+		    }
 		    p = p->next; /* 0 times recursion */
 		}
-		if (p->type == PLAIN || p->type == MAGICAL) {
-		    if (fnmatch(p->str, enc, dp->d_name, flags) == 0)
+		switch (p->type) {
+		  case BRACE:
+		    args.name = name;
+		    args.dp = dp;
+		    args.flags = flags;
+		    if (ruby_brace_expand(p->str, flags, dirent_match_brace,
+					  (VALUE)&args, enc, Qfalse) > 0)
+			*new_end++ = p->next;
+		    break;
+		  case ALPHA:
+# if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH
+		    if (plainname) {
 			*new_end++ = p->next;
+			break;
+		    }
+# endif
+		  case PLAIN:
+		  case MAGICAL:
+		    if (dirent_match(p->str, enc, name, dp, flags))
+			*new_end++ = p->next;
+		  default:
+		    break;
 		}
 	    }
 
-	    status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end,
-				 flags, func, arg, enc);
+	    status = glob_helper(fd, buf, baselen, name - buf - baselen + namlen, 1,
+				 new_pathtype, new_beg, new_end,
+				 flags, funcs, arg, enc);
 	    GLOB_FREE(buf);
 	    GLOB_FREE(new_beg);
 	    if (status) break;
@@ -1424,13 +2357,17 @@ glob_helper(
     else if (plain) {
 	struct glob_pattern **copy_beg, **copy_end, **cur2;
 
+# if FNM_SYSCASE || NORMALIZE_UTF8PATH
+      literally:
+# endif
 	copy_beg = copy_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
 	if (!copy_beg) return -1;
 	for (cur = beg; cur < end; ++cur)
-	    *copy_end++ = (*cur)->type == PLAIN ? *cur : 0;
+	    *copy_end++ = (*cur)->type <= ALPHA ? *cur : 0;
 
 	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;
@@ -1440,7 +2377,8 @@ glob_helper(
 		    break;
 		}
 		memcpy(name, (*cur)->str, len);
-		if (escape) remove_backslashes(name, enc);
+		if (escape)
+		    len = remove_backslashes(name, name+len-1, enc) - name;
 
 		new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
 		if (!new_beg) {
@@ -1456,15 +2394,25 @@ glob_helper(
 		    }
 		}
 
-		buf = join_path(path, dirsep, name);
+		buf = join_path(path, pathlen, dirsep, name, len);
 		GLOB_FREE(name);
 		if (!buf) {
 		    GLOB_FREE(new_beg);
 		    status = -1;
 		    break;
 		}
-		status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg,
-				     new_end, flags, func, arg, enc);
+#if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME
+		if ((*cur)->type == ALPHA) {
+		    buf = replace_real_basename(buf, pathlen + (dirsep != 0), enc,
+						IF_NORMALIZE_UTF8PATH(1)+0,
+						flags, &new_pathtype);
+		    if (!buf) break;
+		}
+#endif
+		status = glob_helper(fd, buf, baselen,
+				     namelen + strlen(buf + pathlen), 1,
+				     new_pathtype, new_beg, new_end,
+				     flags, funcs, arg, enc);
 		GLOB_FREE(buf);
 		GLOB_FREE(new_beg);
 		if (status) break;
@@ -1478,23 +2426,78 @@ glob_helper(
 }
 
 static int
-ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
+push_caller(const char *path, VALUE val, void *enc)
+{
+    struct push_glob_args *arg = (struct push_glob_args *)val;
+    struct glob_pattern *list;
+    int status;
+
+    list = glob_make_pattern(path, path + strlen(path), arg->flags, enc);
+    if (!list) {
+	return -1;
+    }
+    status = glob_helper(arg->fd, arg->path, arg->baselen, arg->namelen, arg->dirsep,
+			 arg->pathtype, &list, &list + 1, arg->flags, arg->funcs,
+			 arg->arg, enc);
+    glob_free_pattern(list);
+    return status;
+}
+
+static int ruby_glob0(const char *path, int fd, const char *base, int flags,
+                      const ruby_glob_funcs_t *funcs, VALUE arg, rb_encoding *enc);
+
+struct push_glob0_args {
+    int fd;
+    const char *base;
+    int flags;
+    const ruby_glob_funcs_t *funcs;
+    VALUE arg;
+};
+
+static int
+push_glob0_caller(const char *path, VALUE val, void *enc)
+{
+    struct push_glob0_args *arg = (struct push_glob0_args *)val;
+    return ruby_glob0(path, arg->fd, arg->base, arg->flags, arg->funcs, arg->arg, enc);
+}
+
+static int
+ruby_glob0(const char *path, int fd, const char *base, int flags,
+	   const ruby_glob_funcs_t *funcs, VALUE arg,
+	   rb_encoding *enc)
 {
     struct glob_pattern *list;
     const char *root, *start;
     char *buf;
-    size_t n;
-    int status;
+    size_t n, baselen = 0;
+    int status, dirsep = FALSE;
 
     start = root = path;
+
+    if (*root == '{') {
+        struct push_glob0_args args;
+        args.fd = fd;
+        args.base = base;
+        args.flags = flags;
+        args.funcs = funcs;
+        args.arg = arg;
+        return ruby_brace_expand(path, flags, push_glob0_caller, (VALUE)&args, enc, Qfalse);
+    }
+
     flags |= FNM_SYSCASE;
 #if defined DOSISH
-    root = rb_path_skip_prefix(root);
+    root = rb_enc_path_skip_prefix(root, root + strlen(root), enc);
 #endif
 
-    if (root && *root == '/') root++;
+    if (*root == '/') root++;
 
     n = root - start;
+    if (!n && base) {
+	n = strlen(base);
+	baselen = n;
+	start = base;
+	dirsep = TRUE;
+    }
     buf = GLOB_ALLOC_N(char, n + 1);
     if (!buf) return -1;
     MEMCPY(buf, start, char, n);
@@ -1505,7 +2508,9 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco
 	GLOB_FREE(buf);
 	return -1;
     }
-    status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg, enc);
+    status = glob_helper(fd, buf, baselen, n-baselen, dirsep,
+			 path_unknown, &list, &list + 1,
+			 flags, funcs, arg, enc);
     glob_free_pattern(list);
     GLOB_FREE(buf);
 
@@ -1515,8 +2520,11 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco
 int
 ruby_glob(const char *path, int flags, ruby_glob_func *func, VALUE arg)
 {
-    return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg,
-		      rb_ascii8bit_encoding());
+    ruby_glob_funcs_t funcs;
+    funcs.match = func;
+    funcs.error = NULL;
+    return ruby_glob0(path, AT_FDCWD, 0, flags & ~GLOB_VERBOSE,
+		      &funcs, arg, rb_ascii8bit_encoding());
 }
 
 static int
@@ -1530,41 +2538,41 @@ rb_glob_caller(const char *path, VALUE a, void *enc)
     return status;
 }
 
-static int
-rb_glob2(const char *path, int flags,
-	 void (*func)(const char *, VALUE, void *), VALUE arg,
-	 rb_encoding* enc)
+static const ruby_glob_funcs_t rb_glob_funcs = {
+    rb_glob_caller, rb_glob_error,
+};
+
+void
+rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
 {
     struct glob_args args;
+    int status;
 
     args.func = func;
     args.value = arg;
-    args.enc = enc;
-
-    if (flags & FNM_SYSCASE) {
-	rb_warning("Dir.glob() ignores File::FNM_CASEFOLD");
-    }
+    args.enc = rb_ascii8bit_encoding();
 
-    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());
+    status = ruby_glob0(path, AT_FDCWD, 0, GLOB_VERBOSE, &rb_glob_funcs,
+			(VALUE)&args, args.enc);
     if (status) GLOB_JUMP_TAG(status);
 }
 
 static void
 push_pattern(const char *path, VALUE ary, void *enc)
 {
-    rb_ary_push(ary, rb_external_str_new_with_enc(path, strlen(path), enc));
+#if defined _WIN32 || defined __APPLE__
+    VALUE name = rb_utf8_str_new_cstr(path);
+    rb_encoding *eenc = rb_default_internal_encoding();
+    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);
 }
 
 static int
 ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
-		  rb_encoding *enc)
+		  rb_encoding *enc, VALUE var)
 {
     const int escape = !(flags & FNM_NOESCAPE);
     const char *p = str;
@@ -1577,7 +2585,7 @@ ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
 	if (*p == '{' && nest++ == 0) {
 	    lbrace = p;
 	}
-	if (*p == '}' && --nest <= 0) {
+	if (*p == '}' && lbrace && --nest == 0) {
 	    rbrace = p;
 	    break;
 	}
@@ -1609,20 +2617,21 @@ ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
 	    }
 	    memcpy(buf+shift, t, p-t);
 	    strlcpy(buf+shift+(p-t), rbrace+1, len-(shift+(p-t)));
-	    status = ruby_brace_expand(buf, flags, func, arg, enc);
+	    status = ruby_brace_expand(buf, flags, func, arg, enc, var);
 	    if (status) break;
 	}
 	GLOB_FREE(buf);
     }
     else if (!lbrace && !rbrace) {
-	status = (*func)(s, arg, enc);
+	status = glob_call_func(func, s, arg, enc);
     }
 
+    RB_GC_GUARD(var);
     return status;
 }
 
 struct brace_args {
-    ruby_glob_func *func;
+    ruby_glob_funcs_t funcs;
     VALUE value;
     int flags;
 };
@@ -1632,79 +2641,94 @@ glob_brace(const char *path, VALUE val, void *enc)
 {
     struct brace_args *arg = (struct brace_args *)val;
 
-    return ruby_glob0(path, arg->flags, arg->func, arg->value, enc);
+    return ruby_glob0(path, AT_FDCWD, 0, arg->flags, &arg->funcs, arg->value, enc);
 }
 
-static int
-ruby_brace_glob0(const char *str, int flags, ruby_glob_func *func, VALUE arg,
-		 rb_encoding* enc)
+int
+ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
 {
     struct brace_args args;
 
-    args.func = func;
+    flags &= ~GLOB_VERBOSE;
+    args.funcs.match = func;
+    args.funcs.error = NULL;
     args.value = arg;
     args.flags = flags;
-    return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args, enc);
+    return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args, enc, Qfalse);
 }
 
 int
 ruby_brace_glob(const char *str, int flags, ruby_glob_func *func, VALUE arg)
 {
-    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg,
-			    rb_ascii8bit_encoding());
-}
-
-int
-ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
-{
-    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg, enc);
+    return ruby_brace_glob_with_enc(str, flags, func, arg, rb_ascii8bit_encoding());
 }
 
 static int
-push_glob(VALUE ary, VALUE str, int flags)
+push_glob(VALUE ary, VALUE str, VALUE base, int flags)
 {
     struct glob_args args;
+    int fd;
     rb_encoding *enc = rb_enc_get(str);
 
-    if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding();
+#if defined _WIN32 || defined __APPLE__
+    str = rb_str_encode_ospath(str);
+#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.func = push_pattern;
     args.value = ary;
     args.enc = enc;
+    args.base = 0;
+    fd = AT_FDCWD;
+    if (!NIL_P(base)) {
+	if (!RB_TYPE_P(base, T_STRING) || !rb_enc_check(str, base)) {
+	    struct dir_data *dirp = DATA_PTR(base);
+	    if (!dirp->dir) dir_closed();
+#ifdef HAVE_DIRFD
+	    if ((fd = dirfd(dirp->dir)) == -1)
+		rb_sys_fail_path(dir_inspect(base));
+#endif
+	    base = dirp->path;
+	}
+	args.base = RSTRING_PTR(base);
+    }
+#if defined _WIN32 || defined __APPLE__
+    enc = rb_utf8_encoding();
+#endif
 
-    RB_GC_GUARD(str);
-    return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE,
-			    rb_glob_caller, (VALUE)&args, enc);
+    return ruby_glob0(RSTRING_PTR(str), fd, args.base, flags, &rb_glob_funcs,
+		      (VALUE)&args, enc);
 }
 
 static VALUE
-rb_push_glob(VALUE str, int flags) /* '\0' is delimiter */
+rb_push_glob(VALUE str, VALUE base, int flags) /* '\0' is delimiter */
 {
-    long offset = 0;
     VALUE ary;
+    int status;
 
-    GlobPathValue(str, TRUE);
+    /* can contain null bytes as separators */
+    if (!RB_TYPE_P(str, T_STRING)) {
+	FilePathValue(str);
+    }
+    else if (!rb_str_to_cstr(str)) {
+        rb_raise(rb_eArgError, "nul-separated glob pattern is deprecated");
+    }
+    else {
+	rb_enc_check(str, rb_enc_from_encoding(rb_usascii_encoding()));
+    }
     ary = rb_ary_new();
 
-    while (offset < RSTRING_LEN(str)) {
-	char *p, *pend;
-	int status;
-	p = RSTRING_PTR(str) + offset;
-	status = push_glob(ary, rb_enc_str_new(p, strlen(p), rb_enc_get(str)),
-			   flags);
-	if (status) GLOB_JUMP_TAG(status);
-	if (offset >= RSTRING_LEN(str)) break;
-	p += strlen(p) + 1;
-	pend = RSTRING_PTR(str) + RSTRING_LEN(str);
-	while (p < pend && !*p)
-	    p++;
-	offset = p - RSTRING_PTR(str);
-    }
+    status = push_glob(ary, str, base, flags);
+    if (status) GLOB_JUMP_TAG(status);
 
     return ary;
 }
 
 static VALUE
-dir_globs(long argc, VALUE *argv, int flags)
+dir_globs(long argc, const VALUE *argv, VALUE base, int flags)
 {
     VALUE ary = rb_ary_new();
     long i;
@@ -1712,77 +2736,120 @@ dir_globs(long argc, VALUE *argv, int flags)
     for (i = 0; i < argc; ++i) {
 	int status;
 	VALUE str = argv[i];
-	GlobPathValue(str, TRUE);
-	status = push_glob(ary, str, flags);
+	FilePathValue(str);
+	status = push_glob(ary, str, base, flags);
 	if (status) GLOB_JUMP_TAG(status);
     }
 
     return ary;
 }
 
+static void
+dir_glob_options(VALUE opt, VALUE *base, int *flags)
+{
+    ID kw[2];
+    VALUE args[2];
+    kw[0] = rb_intern("base");
+    if (flags) kw[1] = rb_intern("flags");
+    rb_get_kwargs(opt, kw, 0, flags ? 2 : 1, args);
+    if (args[0] == Qundef || NIL_P(args[0])) {
+	*base = Qnil;
+    }
+#if USE_OPENDIR_AT
+    else if (rb_typeddata_is_kind_of(args[0], &dir_data_type)) {
+	*base = args[0];
+    }
+#endif
+    else {
+	FilePathValue(args[0]);
+	if (!RSTRING_LEN(args[0])) args[0] = Qnil;
+	*base = args[0];
+    }
+    if (flags && args[1] != Qundef) {
+	*flags = NUM2INT(args[1]);
+    }
+}
+
 /*
  *  call-seq:
- *     Dir[ array ]                 -> array
- *     Dir[ string [, string ...] ] -> array
+ *     Dir[ string [, string ...] [, base: path] ] -> 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>.
+ *  <code>Dir.glob([</code><i>string,...</i><code>], 0)</code>.
  *
  */
 static VALUE
 dir_s_aref(int argc, VALUE *argv, VALUE obj)
 {
+    VALUE opts, base;
+    argc = rb_scan_args(argc, argv, "*:", NULL, &opts);
+    dir_glob_options(opts, &base, NULL);
     if (argc == 1) {
-	return rb_push_glob(argv[0], 0);
+	return rb_push_glob(argv[0], base, 0);
     }
-    return dir_globs(argc, argv, 0);
+    return dir_globs(argc, argv, base, 0);
 }
 
 /*
  *  call-seq:
- *     Dir.glob( pattern, [flags] ) -> array
- *     Dir.glob( pattern, [flags] ) {| filename | block }  -> nil
- *
- *  Returns the filenames found by expanding <i>pattern</i> which is
- *  an +Array+ of the patterns or the pattern +String+, either as an
- *  <i>array</i> or as parameters to the block. Note that this pattern
- *  is not a regexp (it's closer to a shell glob). See
- *  <code>File::fnmatch</code> for the meaning of the <i>flags</i>
- *  parameter. Note that case sensitivity depends on your system (so
- *  <code>File::FNM_CASEFOLD</code> is ignored), as does the order
- *  in which the results are returned.
- *
- *  <code>*</code>::        Matches any file. Can be restricted by
- *                          other values in the glob. <code>*</code>
- *                          will match all files; <code>c*</code> will
- *                          match all files beginning with
- *                          <code>c</code>; <code>*c</code> will match
- *                          all files ending with <code>c</code>; and
- *                          <code>\*c\*</code> will match all files that
- *                          have <code>c</code> in them (including at
- *                          the beginning or end). Equivalent to
- *                          <code>/ .* /x</code> in regexp. Note, this
- *                          will not match Unix-like hidden files (dotfiles).
- *                          In order to include those in the match results,
- *                          you must use something like "{*,.*}".
- *  <code>**</code>::       Matches directories recursively.
- *  <code>?</code>::        Matches any one character. Equivalent to
- *                          <code>/.{1}/</code> in regexp.
- *  <code>[set]</code>::    Matches any one character in +set+.
- *                          Behaves exactly like character sets in
- *                          Regexp, including set negation
- *                          (<code>[^a-z]</code>).
- *  <code>{p,q}</code>::    Matches either literal <code>p</code> or
- *                          literal <code>q</code>. Matching literals
- *                          may be more than one character in length.
- *                          More than two literals may be specified.
- *                          Equivalent to pattern alternation in
- *                          regexp.
- *  <code>\</code>::        Escapes the next metacharacter.
- *                          Note that this means you cannot use backslash in windows
- *                          as part of a glob, i.e. Dir["c:\\foo*"] will not work
- *                          use Dir["c:/foo*"] instead
+ *     Dir.glob( pattern, [flags], [base: path] )                       -> array
+ *     Dir.glob( pattern, [flags], [base: path] ) { |filename| block }  -> nil
+ *
+ *  Expands +pattern+, which is a pattern string or an Array of pattern
+ *  strings, and returns an array containing the matching filenames.
+ *  If a block is given, calls the block once for each matching filename,
+ *  passing the filename as a parameter to the block.
+ *
+ *  The optional +base+ keyword argument specifies the base directory for
+ *  interpreting relative pathnames instead of the current working directory.
+ *  As the results are not prefixed with the base directory name in this
+ *  case, you will need to prepend the base directory name if you want real
+ *  paths.
+ *
+ *  Note that the pattern is not a regexp, it's closer to a shell glob.
+ *  See File::fnmatch for the meaning of the +flags+ parameter.
+ *  Case sensitivity depends on your system (File::FNM_CASEFOLD is ignored),
+ *  as does the order in which the results are returned.
+ *
+ *  <code>*</code>::
+ *    Matches any file. Can be restricted by other values in the glob.
+ *    Equivalent to <code>/ .* /mx</code> in regexp.
+ *
+ *    <code>*</code>::     Matches all files
+ *    <code>c*</code>::    Matches all files beginning with <code>c</code>
+ *    <code>*c</code>::    Matches all files ending with <code>c</code>
+ *    <code>\*c\*</code>:: Match all files that have <code>c</code> in them
+ *                         (including at the beginning or end).
+ *
+ *    Note, this will not match Unix-like hidden files (dotfiles).  In order
+ *    to include those in the match results, you must use the
+ *    File::FNM_DOTMATCH flag or something like <code>"{*,.*}"</code>.
+ *
+ *  <code>**</code>::
+ *    Matches directories recursively.
+ *
+ *  <code>?</code>::
+ *    Matches any one character. Equivalent to <code>/.{1}/</code> in regexp.
+ *
+ *  <code>[set]</code>::
+ *    Matches any one character in +set+.  Behaves exactly like character sets
+ *    in Regexp, including set negation (<code>[^a-z]</code>).
+ *
+ *  <code>{p,q}</code>::
+ *    Matches either literal <code>p</code> or literal <code>q</code>.
+ *    Equivalent to pattern alternation in regexp.
+ *
+ *    Matching literals may be more than one character in length.  More than
+ *    two literals may be specified.
+ *
+ *  <code> \\ </code>::
+ *    Escapes the next metacharacter.
+ *
+ *    Note that this means you cannot use backslash on windows as part of a
+ *    glob, i.e.  <code>Dir["c:\\foo*"]</code> will not work, use
+ *    <code>Dir["c:/foo*"]</code> instead.
+ *
+ *  Examples:
  *
  *     Dir["config.?"]                     #=> ["config.h"]
  *     Dir.glob("config.?")                #=> ["config.h"]
@@ -1791,11 +2858,16 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
  *     Dir.glob("*.{rb,h}")                #=> ["main.rb", "config.h"]
  *     Dir.glob("*")                       #=> ["config.h", "main.rb"]
  *     Dir.glob("*", File::FNM_DOTMATCH)   #=> [".", "..", "config.h", "main.rb"]
+ *     Dir.glob(["*.rb", "*.h"])           #=> ["main.rb", "config.h"]
  *
  *     rbfiles = File.join("**", "*.rb")
  *     Dir.glob(rbfiles)                   #=> ["main.rb",
  *                                         #    "lib/song.rb",
  *                                         #    "lib/song/karaoke.rb"]
+ *
+ *     Dir.glob(rbfiles, base: "lib")      #=> ["song.rb",
+ *                                         #    "song/karaoke.rb"]
+ *
  *     libdirs = File.join("**", "lib")
  *     Dir.glob(libdirs)                   #=> ["lib"]
  *
@@ -1809,21 +2881,24 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
 static VALUE
 dir_s_glob(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE str, rflags, ary;
+    VALUE str, rflags, ary, opts, base;
     int flags;
 
-    if (rb_scan_args(argc, argv, "11", &str, &rflags) == 2)
+    argc = rb_scan_args(argc, argv, "11:", &str, &rflags, &opts);
+    if (argc == 2)
 	flags = NUM2INT(rflags);
     else
 	flags = 0;
+    dir_glob_options(opts, &base, &flags);
 
     ary = rb_check_array_type(str);
     if (NIL_P(ary)) {
-	ary = rb_push_glob(str, flags);
+	ary = rb_push_glob(str, base, flags);
     }
     else {
-	volatile VALUE v = ary;
-	ary = dir_globs(RARRAY_LEN(v), RARRAY_PTR(v), flags);
+	VALUE v = ary;
+	ary = dir_globs(RARRAY_LEN(v), RARRAY_CONST_PTR(v), base, flags);
+	RB_GC_GUARD(v);
     }
 
     if (rb_block_given_p()) {
@@ -1836,18 +2911,19 @@ dir_s_glob(int argc, VALUE *argv, VALUE obj)
 static VALUE
 dir_open_dir(int argc, VALUE *argv)
 {
-    VALUE dir = rb_funcall2(rb_cDir, rb_intern("open"), argc, argv);
-    struct dir_data *dirp;
+    VALUE dir = rb_funcallv_kw(rb_cDir, rb_intern("open"), argc, argv, RB_PASS_CALLED_KEYWORDS);
 
-    TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp);
+    rb_check_typeddata(dir, &dir_data_type);
     return dir;
 }
 
 
 /*
  *  call-seq:
- *     Dir.foreach( dirname ) {| filename | block }  -> nil
- *     Dir.foreach( dirname )                        -> an_enumerator
+ *     Dir.foreach( dirname ) {| filename | block }                 -> nil
+ *     Dir.foreach( dirname, encoding: enc ) {| filename | block }  -> nil
+ *     Dir.foreach( dirname )                                       -> an_enumerator
+ *     Dir.foreach( dirname, encoding: enc )                        -> an_enumerator
  *
  *  Calls the block once for each entry in the named directory, passing
  *  the filename of each entry as a parameter to the block.
@@ -1875,13 +2951,25 @@ dir_foreach(int argc, VALUE *argv, VALUE io)
     return Qnil;
 }
 
+static VALUE
+dir_collect(VALUE dir)
+{
+    VALUE ary = rb_ary_new();
+    dir_each_entry(dir, rb_ary_push, ary, FALSE);
+    return ary;
+}
+
 /*
  *  call-seq:
- *     Dir.entries( dirname ) -> array
+ *     Dir.entries( dirname )                -> array
+ *     Dir.entries( dirname, encoding: enc ) -> array
  *
  *  Returns an array containing all of the filenames in the given
- *  directory. Will raise a <code>SystemCallError</code> if the named
- *  directory doesn't exist.
+ *  directory. Will raise a SystemCallError if the named directory
+ *  doesn't exist.
+ *
+ *  The optional <i>encoding</i> keyword argument specifies the encoding of the
+ *  directory. If not specified, the filesystem encoding is used.
  *
  *     Dir.entries("testdir")   #=> [".", "..", "config.h", "main.rb"]
  *
@@ -1892,7 +2980,141 @@ dir_entries(int argc, VALUE *argv, VALUE io)
     VALUE dir;
 
     dir = dir_open_dir(argc, argv);
-    return rb_ensure(rb_Array, dir, dir_close, dir);
+    return rb_ensure(dir_collect, dir, dir_close, dir);
+}
+
+static VALUE
+dir_each_child(VALUE dir)
+{
+    return dir_each_entry(dir, dir_yield, Qnil, TRUE);
+}
+
+/*
+ *  call-seq:
+ *     Dir.each_child( dirname ) {| filename | block }                 -> nil
+ *     Dir.each_child( dirname, encoding: enc ) {| filename | block }  -> nil
+ *     Dir.each_child( dirname )                                       -> an_enumerator
+ *     Dir.each_child( dirname, encoding: enc )                        -> an_enumerator
+ *
+ *  Calls the block once for each entry except for "." and ".." in the
+ *  named directory, passing the filename of each entry as a parameter
+ *  to the block.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     Dir.each_child("testdir") {|x| puts "Got #{x}" }
+ *
+ *  <em>produces:</em>
+ *
+ *     Got config.h
+ *     Got main.rb
+ *
+ */
+static VALUE
+dir_s_each_child(int argc, VALUE *argv, VALUE io)
+{
+    VALUE dir;
+
+    RETURN_ENUMERATOR(io, argc, argv);
+    dir = dir_open_dir(argc, argv);
+    rb_ensure(dir_each_child, dir, dir_close, dir);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     dir.each_child {| filename | block }  -> nil
+ *     dir.each_child                        -> an_enumerator
+ *
+ *  Calls the block once for each entry except for "." and ".." in
+ *  this directory, passing the filename of each entry as a parameter
+ *  to the block.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     d = Dir.new("testdir")
+ *     d.each_child  {|x| puts "Got #{x}" }
+ *
+ *  <em>produces:</em>
+ *
+ *     Got config.h
+ *     Got main.rb
+ *
+ */
+static VALUE
+dir_each_child_m(VALUE dir)
+{
+    RETURN_ENUMERATOR(dir, 0, 0);
+    return dir_each_entry(dir, dir_yield, Qnil, TRUE);
+}
+
+/*
+ *  call-seq:
+ *     dir.children  -> array
+ *
+ *  Returns an array containing all of the filenames except for "."
+ *  and ".." in this directory.
+ *
+ *     d = Dir.new("testdir")
+ *     d.children   #=> ["config.h", "main.rb"]
+ *
+ */
+static VALUE
+dir_collect_children(VALUE dir)
+{
+    VALUE ary = rb_ary_new();
+    dir_each_entry(dir, rb_ary_push, ary, TRUE);
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     Dir.children( dirname )                -> array
+ *     Dir.children( dirname, encoding: enc ) -> array
+ *
+ *  Returns an array containing all of the filenames except for "."
+ *  and ".." in the given directory. Will raise a SystemCallError if
+ *  the named directory doesn't exist.
+ *
+ *  The optional <i>encoding</i> keyword argument specifies the encoding of the
+ *  directory. If not specified, the filesystem encoding is used.
+ *
+ *     Dir.children("testdir")   #=> ["config.h", "main.rb"]
+ *
+ */
+static VALUE
+dir_s_children(int argc, VALUE *argv, VALUE io)
+{
+    VALUE dir;
+
+    dir = dir_open_dir(argc, argv);
+    return rb_ensure(dir_collect_children, dir, dir_close, dir);
+}
+
+static int
+fnmatch_brace(const char *pattern, VALUE val, void *enc)
+{
+    struct brace_args *arg = (struct brace_args *)val;
+    VALUE path = arg->value;
+    rb_encoding *enc_pattern = enc;
+    rb_encoding *enc_path = rb_enc_get(path);
+
+    if (enc_pattern != enc_path) {
+	if (!rb_enc_asciicompat(enc_pattern))
+	    return FNM_NOMATCH;
+	if (!rb_enc_asciicompat(enc_path))
+	    return FNM_NOMATCH;
+	if (!rb_enc_str_asciionly_p(path)) {
+	    int cr = ENC_CODERANGE_7BIT;
+	    long len = strlen(pattern);
+	    if (rb_str_coderange_scan_restartable(pattern, pattern + len,
+						  enc_pattern, &cr) != len)
+		return FNM_NOMATCH;
+	    if (cr != ENC_CODERANGE_7BIT)
+		return FNM_NOMATCH;
+	}
+    }
+    return (fnmatch(pattern, enc, RSTRING_PTR(path), arg->flags) == 0);
 }
 
 /*
@@ -1900,38 +3122,50 @@ dir_entries(int argc, VALUE *argv, VALUE io)
  *     File.fnmatch( pattern, path, [flags] ) -> (true or false)
  *     File.fnmatch?( pattern, path, [flags] ) -> (true or false)
  *
- *  Returns true if <i>path</i> matches against <i>pattern</i> The
- *  pattern is not a regular expression; instead it follows rules
- *  similar to shell filename globbing. It may contain the following
- *  metacharacters:
- *
- *  <code>*</code>::        Matches any file. Can be restricted by
- *                          other values in the glob. <code>*</code>
- *                          will match all files; <code>c*</code> will
- *                          match all files beginning with
- *                          <code>c</code>; <code>*c</code> will match
- *                          all files ending with <code>c</code>; and
- *                          <code>*c*</code> will match all files that
- *                          have <code>c</code> in them (including at
- *                          the beginning or end). Equivalent to
- *                          <code>/ .* /x</code> in regexp.
- *  <code>**</code>::       Matches directories recursively or files
- *                          expansively.
- *  <code>?</code>::        Matches any one character. Equivalent to
- *                          <code>/.{1}/</code> in regexp.
- *  <code>[set]</code>::    Matches any one character in +set+.
- *                          Behaves exactly like character sets in
- *                          Regexp, including set negation
- *                          (<code>[^a-z]</code>).
- *  <code>\</code>::        Escapes the next metacharacter.
- *
- *  <i>flags</i> is a bitwise OR of the <code>FNM_xxx</code>
- *  parameters. The same glob pattern and flags are used by
- *  <code>Dir::glob</code>.
+ *  Returns true if +path+ matches against +pattern+.  The pattern is not a
+ *  regular expression; instead it follows rules similar to shell filename
+ *  globbing.  It may contain the following metacharacters:
+ *
+ *  <code>*</code>::
+ *    Matches any file. Can be restricted by other values in the glob.
+ *    Equivalent to <code>/ .* /x</code> in regexp.
+ *
+ *    <code>*</code>::    Matches all files regular files
+ *    <code>c*</code>::   Matches all files beginning with <code>c</code>
+ *    <code>*c</code>::   Matches all files ending with <code>c</code>
+ *    <code>\*c*</code>:: Matches all files that have <code>c</code> in them
+ *                        (including at the beginning or end).
+ *
+ *    To match hidden files (that start with a <code>.</code> set the
+ *    File::FNM_DOTMATCH flag.
+ *
+ *  <code>**</code>::
+ *    Matches directories recursively or files expansively.
+ *
+ *  <code>?</code>::
+ *    Matches any one character. Equivalent to <code>/.{1}/</code> in regexp.
+ *
+ *  <code>[set]</code>::
+ *    Matches any one character in +set+.  Behaves exactly like character sets
+ *    in Regexp, including set negation (<code>[^a-z]</code>).
+ *
+ *  <code> \ </code>::
+ *    Escapes the next metacharacter.
+ *
+ *  <code>{a,b}</code>::
+ *    Matches pattern a and pattern b if File::FNM_EXTGLOB flag is enabled.
+ *    Behaves like a Regexp union (<code>(?:a|b)</code>).
+ *
+ *  +flags+ is a bitwise OR of the <code>FNM_XXX</code> constants. The same
+ *  glob pattern and flags are used by Dir::glob.
+ *
+ *  Examples:
  *
  *     File.fnmatch('cat',       'cat')        #=> true  # match entire string
  *     File.fnmatch('cat',       'category')   #=> false # only match partial string
- *     File.fnmatch('c{at,ub}s', 'cats')       #=> false # { } isn't supported
+ *
+ *     File.fnmatch('c{at,ub}s', 'cats')                    #=> false # { } isn't supported by default
+ *     File.fnmatch('c{at,ub}s', 'cats', File::FNM_EXTGLOB) #=> true  # { } is supported on FNM_EXTGLOB
  *
  *     File.fnmatch('c?t',     'cat')          #=> true  # '?' match only 1 character
  *     File.fnmatch('c??t',    'cat')          #=> false # ditto
@@ -1942,6 +3176,7 @@ dir_entries(int argc, VALUE *argv, VALUE io)
  *
  *     File.fnmatch('cat', 'CAT')                     #=> false # case sensitive
  *     File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true  # case insensitive
+ *     File.fnmatch('cat', 'CAT', File::FNM_SYSCASE)  #=> true or false # depends on the system default
  *
  *     File.fnmatch('?',   '/', File::FNM_PATHNAME)  #=> false # wildcard doesn't match '/' on FNM_PATHNAME
  *     File.fnmatch('*',   '/', File::FNM_PATHNAME)  #=> false # ditto
@@ -1949,7 +3184,7 @@ dir_entries(int argc, VALUE *argv, VALUE io)
  *
  *     File.fnmatch('\?',   '?')                       #=> true  # escaped wildcard becomes ordinary
  *     File.fnmatch('\a',   'a')                       #=> true  # escaped ordinary remains ordinary
- *     File.fnmatch('\a',   '\a', File::FNM_NOESCAPE)  #=> true  # FNM_NOESACPE makes '\' ordinary
+ *     File.fnmatch('\a',   '\a', File::FNM_NOESCAPE)  #=> true  # FNM_NOESCAPE makes '\' ordinary
  *     File.fnmatch('[\?]', '?')                       #=> true  # can escape inside bracket expression
  *
  *     File.fnmatch('*',   '.profile')                      #=> false # wildcard doesn't match leading
@@ -1988,12 +3223,25 @@ file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
     else
 	flags = 0;
 
-    StringValue(pattern);
+    StringValueCStr(pattern);
     FilePathStringValue(path);
 
-    if (fnmatch(RSTRING_PTR(pattern), rb_enc_get(pattern), RSTRING_PTR(path),
-		flags) == 0)
-	return Qtrue;
+    if (flags & FNM_EXTGLOB) {
+	struct brace_args args;
+
+	args.value = path;
+	args.flags = flags;
+	if (ruby_brace_expand(RSTRING_PTR(pattern), flags, fnmatch_brace,
+			      (VALUE)&args, rb_enc_get(pattern), pattern) > 0)
+	    return Qtrue;
+    }
+    else {
+	rb_encoding *enc = rb_enc_compatible(pattern, path);
+	if (!enc) return Qfalse;
+	if (fnmatch(RSTRING_PTR(pattern), enc, RSTRING_PTR(path), flags) == 0)
+	    return Qtrue;
+    }
+    RB_GC_GUARD(pattern);
 
     return Qfalse;
 }
@@ -2012,19 +3260,131 @@ dir_s_home(int argc, VALUE *argv, VALUE obj)
     VALUE user;
     const char *u = 0;
 
-    rb_scan_args(argc, argv, "01", &user);
+    rb_check_arity(argc, 0, 1);
+    user = (argc > 0) ? argv[0] : Qnil;
     if (!NIL_P(user)) {
 	SafeStringValue(user);
+	rb_must_asciicompat(user);
 	u = StringValueCStr(user);
+	if (*u) {
+	    return rb_home_dir_of(user, rb_str_new(0, 0));
+	}
     }
-    return rb_home_dir(u, rb_str_new(0, 0));
+    return rb_default_home_dir(rb_str_new(0, 0));
+
 }
 
+#if 0
 /*
- *  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
- *  <code>File</code>.
+ * call-seq:
+ *   Dir.exist?(file_name)   ->  true or false
+ *
+ * Returns <code>true</code> if the named file is a directory,
+ * <code>false</code> otherwise.
+ *
+ */
+VALUE
+rb_file_directory_p(void)
+{
+}
+#endif
+
+/*
+ * call-seq:
+ *   Dir.exists?(file_name)  ->  true or false
+ *
+ * Deprecated method. Don't use.
+ */
+static VALUE
+rb_dir_exists_p(VALUE obj, VALUE fname)
+{
+    rb_warning("Dir.exists? is a deprecated name, use Dir.exist? instead");
+    return rb_file_directory_p(obj, fname);
+}
+
+static void *
+nogvl_dir_empty_p(void *ptr)
+{
+    const char *path = ptr;
+    DIR *dir = opendir(path);
+    struct dirent *dp;
+    VALUE result = Qtrue;
+
+    if (!dir) {
+	int e = errno;
+	switch (gc_for_fd_with_gvl(e)) {
+	  default:
+	    dir = opendir(path);
+	    if (dir) break;
+	    e = errno;
+	    /* fall through */
+	  case 0:
+	    if (e == ENOTDIR) return (void *)Qfalse;
+	    errno = e; /* for rb_sys_fail_path */
+	    return (void *)Qundef;
+	}
+    }
+    while ((dp = READDIR(dir, NULL)) != NULL) {
+	if (!to_be_skipped(dp)) {
+	    result = Qfalse;
+	    break;
+	}
+    }
+    closedir(dir);
+    return (void *)result;
+}
+
+/*
+ * 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)
+{
+    VALUE result, orig;
+    const char *path;
+    enum {false_on_notdir = 1};
+
+    FilePathValue(dirname);
+    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
+
+    result = (VALUE)rb_thread_call_without_gvl(nogvl_dir_empty_p, (void *)path,
+					    RUBY_UBF_IO, 0);
+    if (result == Qundef) {
+	rb_sys_fail_path(orig);
+    }
+    return result;
+}
+
+/*
+ *  Objects of class Dir are directory streams representing
+ *  directories in the underlying file system. They provide a variety
+ *  of ways to list directories and their contents. See also File.
  *
  *  The directory used in these examples contains the two regular files
  *  (<code>config.h</code> and <code>main.rb</code>), the parent
@@ -2042,13 +3402,18 @@ Init_Dir(void)
     rb_define_singleton_method(rb_cDir, "open", dir_s_open, -1);
     rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, -1);
     rb_define_singleton_method(rb_cDir, "entries", dir_entries, -1);
+    rb_define_singleton_method(rb_cDir, "each_child", dir_s_each_child, -1);
+    rb_define_singleton_method(rb_cDir, "children", dir_s_children, -1);
 
     rb_define_method(rb_cDir,"initialize", dir_initialize, -1);
+    rb_define_method(rb_cDir,"fileno", dir_fileno, 0);
     rb_define_method(rb_cDir,"path", dir_path, 0);
     rb_define_method(rb_cDir,"to_path", dir_path, 0);
     rb_define_method(rb_cDir,"inspect", dir_inspect, 0);
     rb_define_method(rb_cDir,"read", dir_read, 0);
     rb_define_method(rb_cDir,"each", dir_each, 0);
+    rb_define_method(rb_cDir,"each_child", dir_each_child_m, 0);
+    rb_define_method(rb_cDir,"children", dir_collect_children, 0);
     rb_define_method(rb_cDir,"rewind", dir_rewind, 0);
     rb_define_method(rb_cDir,"tell", dir_tell, 0);
     rb_define_method(rb_cDir,"seek", dir_seek, 1);
@@ -2068,15 +3433,57 @@ Init_Dir(void)
 
     rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, -1);
     rb_define_singleton_method(rb_cDir,"[]", dir_s_aref, -1);
-    rb_define_singleton_method(rb_cDir,"exist?", rb_file_directory_p, 1); /* in file.c */
-    rb_define_singleton_method(rb_cDir,"exists?", rb_file_directory_p, 1); /* in file.c */
+    rb_define_singleton_method(rb_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);
 
+    /*  Document-const: File::Constants::FNM_NOESCAPE
+     *
+     *  Disables escapes in File.fnmatch and Dir.glob patterns
+     */
     rb_file_const("FNM_NOESCAPE", INT2FIX(FNM_NOESCAPE));
+
+    /*  Document-const: File::Constants::FNM_PATHNAME
+     *
+     *  Wildcards in File.fnmatch and Dir.glob patterns do not match directory
+     *  separators
+     */
     rb_file_const("FNM_PATHNAME", INT2FIX(FNM_PATHNAME));
+
+    /*  Document-const: File::Constants::FNM_DOTMATCH
+     *
+     *  The '*' wildcard matches filenames starting with "." in File.fnmatch
+     *  and Dir.glob patterns
+     */
     rb_file_const("FNM_DOTMATCH", INT2FIX(FNM_DOTMATCH));
+
+    /*  Document-const: File::Constants::FNM_CASEFOLD
+     *
+     *  Makes File.fnmatch patterns case insensitive (but not Dir.glob
+     *  patterns).
+     */
     rb_file_const("FNM_CASEFOLD", INT2FIX(FNM_CASEFOLD));
+
+    /*  Document-const: File::Constants::FNM_EXTGLOB
+     *
+     *  Allows file globbing through "{a,b}" in File.fnmatch patterns.
+     */
+    rb_file_const("FNM_EXTGLOB", INT2FIX(FNM_EXTGLOB));
+
+    /*  Document-const: File::Constants::FNM_SYSCASE
+     *
+     *  System default case insensitiveness, equals to FNM_CASEFOLD or
+     *  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 961592d7b0..c40cbfc6ac 100644
--- a/dln.c
+++ b/dln.c
@@ -22,6 +22,7 @@
 static void dln_loaderror(const char *format, ...);
 #endif
 #include "dln.h"
+#include "internal.h"
 
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
@@ -47,6 +48,7 @@ void *xcalloc();
 void *xrealloc();
 #endif
 
+#undef free
 #define free(x) xfree(x)
 
 #include <stdio.h>
@@ -75,7 +77,7 @@ void *xrealloc();
 char *getenv();
 #endif
 
-#if defined(__APPLE__) && defined(__MACH__)   /* Mac OS X */
+#ifdef __APPLE__
 # if defined(HAVE_DLOPEN)
    /* Mac OS X with dlopen (10.3 or later) */
 #  define MACOSX_DLOPEN
@@ -84,10 +86,6 @@ char *getenv();
 # endif
 #endif
 
-#if defined(__BEOS__) || defined(__HAIKU__)
-# include <image.h>
-#endif
-
 #ifndef dln_loaderror
 static void
 dln_loaderror(const char *format, ...)
@@ -105,13 +103,12 @@ dln_loaderror(const char *format, ...)
 # define USE_DLN_DLOPEN
 #endif
 
-#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
+#if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(NeXT) || defined(MACOSX_DYLD)
+# define EXTERNAL_PREFIX "_"
+#else
+# define EXTERNAL_PREFIX ""
 #endif
+#define FUNCNAME_PREFIX EXTERNAL_PREFIX"Init_"
 
 #if defined __CYGWIN__ || defined DOSISH
 #define isdirsep(x) ((x) == '/' || (x) == '\\')
@@ -228,20 +225,20 @@ load_header(int fd, struct exec *hdrp, long disp)
 #define RELOC_TARGET_SIZE(r)		((r)->r_length)
 #endif
 
-#if defined(sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
 /* Sparc (Sun 4) macros */
 #  undef relocation_info
 #  define relocation_info reloc_info_sparc
 #  define R_RIGHTSHIFT(r)	(reloc_r_rightshift[(r)->r_type])
 #  define R_BITSIZE(r) 		(reloc_r_bitsize[(r)->r_type])
 #  define R_LENGTH(r)		(reloc_r_length[(r)->r_type])
-static int reloc_r_rightshift[] = {
+static const int reloc_r_rightshift[] = {
   0, 0, 0, 0, 0, 0, 2, 2, 10, 0, 0, 0, 0, 0, 0,
 };
-static int reloc_r_bitsize[] = {
+static const int reloc_r_bitsize[] = {
   8, 16, 32, 8, 16, 32, 30, 22, 22, 22, 13, 10, 32, 32, 16,
 };
-static int reloc_r_length[] = {
+static const int reloc_r_length[] = {
   0, 1, 2, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
 };
 #  define R_PCREL(r) \
@@ -530,7 +527,7 @@ reloc_undef(int no, struct undef *undef, struct reloc_arg *arg)
 {
     int datum;
     char *address;
-#if defined(sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
     unsigned int mask = 0;
 #endif
 
@@ -539,7 +536,7 @@ reloc_undef(int no, struct undef *undef, struct reloc_arg *arg)
     datum = arg->value;
 
     if (R_PCREL(&(undef->reloc))) datum -= undef->base;
-#if defined(sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
     datum += undef->reloc.r_addend;
     datum >>= R_RIGHTSHIFT(&(undef->reloc));
     mask = (1 << R_BITSIZE(&(undef->reloc))) - 1;
@@ -763,11 +760,11 @@ load_1(int fd, long disp, const char *need_init)
 	while (rel < rel_end) {
 	    char *address = (char*)(rel->r_address + block);
 	    long datum = 0;
-#if defined(sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
 	    unsigned int mask = 0;
 #endif
 
-	    if(rel >= rel_beg)
+	    if (rel >= rel_beg)
 		address += hdr.a_text;
 
 	    if (rel->r_extern) { /* Look it up in symbol-table */
@@ -798,7 +795,7 @@ load_1(int fd, long disp, const char *need_init)
 	    } /* end .. is static */
 	    if (R_PCREL(rel)) datum -= block;
 
-#if defined(sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
 	    datum += rel->r_addend;
 	    datum >>= R_RIGHTSHIFT(rel);
 	    mask = (1 << R_BITSIZE(rel)) - 1;
@@ -1117,12 +1114,12 @@ dln_sym(const char *name)
 #endif
 #endif
 
-#if defined _WIN32 && !defined __CYGWIN__
+#ifdef _WIN32
 #include <windows.h>
 #include <imagehlp.h>
 #endif
 
-#if defined _WIN32 && !defined __CYGWIN__
+#ifdef _WIN32
 static const char *
 dln_strerror(char *message, size_t size)
 {
@@ -1174,29 +1171,30 @@ dln_strerror(void)
 }
 #endif
 
-#if defined(_AIX) && ! defined(_IA64)
+#if defined(_AIX)
 static void
 aix_loaderror(const char *pathname)
 {
-  char *message[1024], errbuf[1024];
-  int i;
-#define ERRBUF_APPEND(s) strncat(errbuf, (s), sizeof(errbuf)-strlen(errbuf)-1)
-  snprintf(errbuf, sizeof(errbuf), "load failed - %s. ", pathname);
-
-  if (loadquery(L_GETMESSAGES, &message[0], sizeof(message)) != -1) {
-    ERRBUF_APPEND("Please issue below command for detailed reasons:\n\t");
-    ERRBUF_APPEND("/usr/sbin/execerror ruby ");
-    for (i=0; message[i]; i++) {
-      ERRBUF_APPEND("\"");
-      ERRBUF_APPEND(message[i]);
-      ERRBUF_APPEND("\" ");
+    char *message[1024], errbuf[1024];
+    int i;
+#define ERRBUF_APPEND(s) strlcat(errbuf, (s), sizeof(errbuf))
+    snprintf(errbuf, sizeof(errbuf), "load failed - %s. ", pathname);
+
+    if (loadquery(L_GETMESSAGES, &message[0], sizeof(message)) != -1) {
+	ERRBUF_APPEND("Please issue below command for detailed reasons:\n\t");
+	ERRBUF_APPEND("/usr/sbin/execerror ruby ");
+	for (i=0; message[i]; i++) {
+	    ERRBUF_APPEND("\"");
+	    ERRBUF_APPEND(message[i]);
+	    ERRBUF_APPEND("\" ");
+	}
+	ERRBUF_APPEND("\n");
+    }
+    else {
+	ERRBUF_APPEND(strerror(errno));
+	ERRBUF_APPEND("[loadquery failed]");
     }
-    ERRBUF_APPEND("\n");
-  } else {
-    ERRBUF_APPEND(strerror(errno));
-    ERRBUF_APPEND("[loadquery failed]");
-  }
-  dln_loaderror("%s", errbuf);
+    dln_loaderror("%s", errbuf);
 }
 #endif
 
@@ -1214,16 +1212,18 @@ rb_w32_check_imported(HMODULE ext, HMODULE mine)
     while (desc->Name) {
 	PIMAGE_THUNK_DATA pint = (PIMAGE_THUNK_DATA)((char *)ext + desc->Characteristics);
 	PIMAGE_THUNK_DATA piat = (PIMAGE_THUNK_DATA)((char *)ext + desc->FirstThunk);
-	while (piat->u1.Function) {
-	    PIMAGE_IMPORT_BY_NAME pii = (PIMAGE_IMPORT_BY_NAME)((char *)ext + (size_t)pint->u1.AddressOfData);
+	for (; piat->u1.Function; piat++, pint++) {
 	    static const char prefix[] = "rb_";
-	    const char *name = (const char *)pii->Name;
+	    PIMAGE_IMPORT_BY_NAME pii;
+	    const char *name;
+
+	    if (IMAGE_SNAP_BY_ORDINAL(pint->u1.Ordinal)) continue;
+	    pii = (PIMAGE_IMPORT_BY_NAME)((char *)ext + (size_t)pint->u1.AddressOfData);
+	    name = (const char *)pii->Name;
 	    if (strncmp(name, prefix, sizeof(prefix) - 1) == 0) {
 		FARPROC addr = GetProcAddress(mine, name);
 		if (addr) return (FARPROC)piat->u1.Function == addr;
 	    }
-	    piat++;
-	    pint++;
 	}
 	desc++;
     }
@@ -1243,30 +1243,51 @@ rb_w32_check_imported(HMODULE ext, HMODULE mine)
 #define translit_separator(str) (void)(str)
 #endif
 
+#ifdef USE_DLN_DLOPEN
+COMPILER_WARNING_PUSH
+#if defined(__clang__) || GCC_VERSION_SINCE(4, 2, 0)
+COMPILER_WARNING_IGNORED(-Wpedantic)
+#endif
+static bool
+dln_incompatible_library_p(void *handle)
+{
+    void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc");
+    return ex && ex != ruby_xmalloc;
+}
+COMPILER_WARNING_POP
+#endif
+
 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 && !defined __CYGWIN__
+#if defined _WIN32
     HINSTANCE handle;
-    char winfile[MAXPATHLEN];
+    WCHAR *winfile;
     char message[1024];
     void (*init_fct)();
     char *buf;
 
-    if (strlen(file) >= MAXPATHLEN) dln_loaderror("filename too long");
-
     /* Load the file as an object one */
     init_funcname(&buf, file);
 
-    strlcpy(winfile, file, sizeof(winfile));
+    /* Convert the file path to wide char */
+    winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);
+    if (!winfile) {
+	dln_memerror();
+    }
 
     /* Load file */
-    if ((handle = LoadLibrary(winfile)) == NULL) {
+    handle = LoadLibraryW(winfile);
+    free(winfile);
+
+    if (!handle) {
 	error = dln_strerror();
 	goto failed;
     }
@@ -1274,7 +1295,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 library version";
+	error = incompatible;
 	goto failed;
     }
 #endif
@@ -1321,15 +1342,28 @@ dln_load(const char *file)
 	    error = dln_strerror();
 	    goto failed;
 	}
+# if defined RUBY_EXPORT
+	{
+	    if (dln_incompatible_library_p(handle)) {
+
+#   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);
-#if defined __SYMBIAN32__
 	if (init_fct == NULL) {
-	    init_fct = (void(*)())dlsym(handle, "1"); /* Some Symbian versions do not support symbol table in DLL, ordinal numbers only */
-	}
-#endif
-	if (init_fct == NULL) {
-	    error = DLN_ERROR();
+	    const size_t errlen = strlen(error = dln_strerror()) + 1;
+	    error = memcpy(ALLOCA_N(char, errlen), error, errlen);
 	    dlclose(handle);
 	    goto failed;
 	}
@@ -1366,7 +1400,7 @@ dln_load(const char *file)
     }
 #endif /* hpux */
 
-#if defined(_AIX) && ! defined(_IA64)
+#if defined(_AIX)
 #define DLN_DEFINED
     {
 	void (*init_fct)();
@@ -1383,7 +1417,7 @@ dln_load(const char *file)
     }
 #endif /* _AIX */
 
-#if defined(NeXT) || defined(MACOSX_DYLD)
+#if defined(MACOSX_DYLD)
 #define DLN_DEFINED
 /*----------------------------------------------------
    By SHIROYAMA Takayuki Psi@fortune.nest.or.jp
@@ -1394,43 +1428,6 @@ dln_load(const char *file)
     sunshine@sunshineco.com,
     and... Miss ARAI Akino(^^;)
  ----------------------------------------------------*/
-#if defined(NeXT) && (NS_TARGET_MAJOR < 4)/* NeXTSTEP rld functions */
-
-    {
-        NXStream* s;
-	unsigned long init_address;
-	char *object_files[2] = {NULL, NULL};
-
-	void (*init_fct)();
-
-	object_files[0] = (char*)file;
-
-	s = NXOpenFile(2,NX_WRITEONLY);
-
-	/* Load object file, if return value ==0 ,  load failed*/
-	if(rld_load(s, NULL, object_files, NULL) == 0) {
-	    NXFlush(s);
-	    NXClose(s);
-	    dln_loaderror("Failed to load %.200s", file);
-	}
-
-	/* lookup the initial function */
-	if(rld_lookup(s, buf, &init_address) == 0) {
-	    NXFlush(s);
-	    NXClose(s);
-	    dln_loaderror("Failed to lookup Init function %.200s", file);
-	}
-
-	NXFlush(s);
-	NXClose(s);
-
-	/* Cannot call *init_address directory, so copy this value to
-	   function pointer */
-	init_fct = (void(*)())init_address;
-	(*init_fct)();
-	return (void*)init_address;
-    }
-#else/* OPENSTEP dyld functions */
     {
 	int dyld_result;
 	NSObjectFileImage obj_file; /* handle, but not use it */
@@ -1449,7 +1446,7 @@ dln_load(const char *file)
 	NSLinkModule(obj_file, file, NSLINKMODULE_OPTION_BINDNOW);
 
 	/* lookup the initial function */
-	if(!NSIsSymbolNameDefined(buf)) {
+	if (!NSIsSymbolNameDefined(buf)) {
 	    dln_loaderror("Failed to lookup Init function %.200s",file);
 	}
 	init_fct = NSAddressOfSymbol(NSLookupAndBindSymbol(buf));
@@ -1457,57 +1454,8 @@ dln_load(const char *file)
 
 	return (void*)init_fct;
     }
-#endif /* rld or dyld */
 #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.h b/dln.h
index abbd6d85a3..d98b2607e2 100644
--- a/dln.h
+++ b/dln.h
@@ -28,14 +28,17 @@
 # define _(args) ()
 #endif
 
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
+RUBY_SYMBOL_EXPORT_BEGIN
+
+#ifndef DLN_FIND_EXTRA_ARG
+#define DLN_FIND_EXTRA_ARG
+#endif
+#ifndef DLN_FIND_EXTRA_ARG_DECL
+#define DLN_FIND_EXTRA_ARG_DECL
 #endif
 
-DEPRECATED(char *dln_find_exe(const char*,const char*));
-DEPRECATED(char *dln_find_file(const char*,const char*));
-char *dln_find_exe_r(const char*,const char*,char*,size_t);
-char *dln_find_file_r(const char*,const char*,char*,size_t);
+char *dln_find_exe_r(const char*,const char*,char*,size_t DLN_FIND_EXTRA_ARG_DECL);
+char *dln_find_file_r(const char*,const char*,char*,size_t DLN_FIND_EXTRA_ARG_DECL);
 
 #ifdef USE_DLN_A_OUT
 extern char *dln_argv0;
@@ -43,8 +46,6 @@ extern char *dln_argv0;
 
 void *dln_load(const char*);
 
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
+RUBY_SYMBOL_EXPORT_END
 
 #endif
diff --git a/dln_find.c b/dln_find.c
index 7ce3a957ed..b08612764e 100644
--- a/dln_find.c
+++ b/dln_find.c
@@ -11,19 +11,11 @@
 
 #ifdef RUBY_EXPORT
 #include "ruby/ruby.h"
-#define dln_notimplement rb_notimplement
-#define dln_memerror rb_memerror
-#define dln_exit rb_exit
-#define dln_loaderror rb_loaderror
 #define dln_warning rb_warning
 #define dln_warning_arg
 #else
-#define dln_notimplement --->>> dln not implemented <<<---
-#define dln_memerror abort
-#define dln_exit exit
 #define dln_warning fprintf
 #define dln_warning_arg stderr,
-static void dln_loaderror(const char *format, ...);
 #endif
 #include "dln.h"
 
@@ -45,14 +37,6 @@ char *dln_argv0;
 # include <strings.h>
 #endif
 
-#ifndef xmalloc
-void *xmalloc();
-void *xcalloc();
-void *xrealloc();
-#endif
-
-#define free(x) xfree(x)
-
 #include <stdio.h>
 #if defined(_WIN32)
 #include "missing/file.h"
@@ -64,25 +48,20 @@ void *xrealloc();
 #   define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-#ifndef MAXPATHLEN
-# define MAXPATHLEN 1024
-#endif
-
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
-#ifndef _WIN32
+#if !defined(_WIN32) && !HAVE_DECL_GETENV
 char *getenv();
 #endif
 
-static char *dln_find_1(const char *fname, const char *path, char *buf, size_t size, int exe_flag);
+static char *dln_find_1(const char *fname, const char *path, char *buf, size_t size, int exe_flag
+			DLN_FIND_EXTRA_ARG_DECL);
 
 char *
-dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size)
+dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size
+	       DLN_FIND_EXTRA_ARG_DECL)
 {
     char *envpath = 0;
 
@@ -92,41 +71,30 @@ dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size)
     }
 
     if (!path) {
-#if defined(_WIN32)
-	path = "/usr/local/bin;/usr/ucb;/usr/bin;/bin;.";
-#else
-	path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
-#endif
+	path =
+	    "/usr/local/bin" PATH_SEP
+	    "/usr/ucb" PATH_SEP
+	    "/usr/bin" PATH_SEP
+	    "/bin" PATH_SEP
+	    ".";
     }
-    buf = dln_find_1(fname, path, buf, size, 1);
+    buf = dln_find_1(fname, path, buf, size, 1 DLN_FIND_EXTRA_ARG);
     if (envpath) free(envpath);
     return buf;
 }
 
 char *
-dln_find_file_r(const char *fname, const char *path, char *buf, size_t size)
+dln_find_file_r(const char *fname, const char *path, char *buf, size_t size
+		DLN_FIND_EXTRA_ARG_DECL)
 {
     if (!path) path = ".";
-    return dln_find_1(fname, path, buf, size, 0);
-}
-
-static char fbuf[MAXPATHLEN];
-
-char *
-dln_find_exe(const char *fname, const char *path)
-{
-    return dln_find_exe_r(fname, path, fbuf, sizeof(fbuf));
-}
-
-char *
-dln_find_file(const char *fname, const char *path)
-{
-    return dln_find_file_r(fname, path, fbuf, sizeof(fbuf));
+    return dln_find_1(fname, path, buf, size, 0 DLN_FIND_EXTRA_ARG);
 }
 
 static char *
 dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
-	   int exe_flag /* non 0 if looking for executable. */)
+	   int exe_flag /* non 0 if looking for executable. */
+	   DLN_FIND_EXTRA_ARG_DECL)
 {
     register const char *dp;
     register const char *ep;
@@ -301,13 +269,15 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
 	    }
 	    goto next;
 	}
-#endif /* _WIN32 or __EMX__ */
+#endif
 
-	if (stat(fbuf, &st) == 0) {
+#ifndef S_ISREG
+# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+#endif
+	if (stat(fbuf, &st) == 0 && S_ISREG(st.st_mode)) {
 	    if (exe_flag == 0) return fbuf;
 	    /* looking for executable */
-	    if (!S_ISDIR(st.st_mode) && eaccess(fbuf, X_OK) == 0)
-		return fbuf;
+	    if (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 2c8aacc06a..d05cda0b8e 100644
--- a/dmydln.c
+++ b/dmydln.c
@@ -1,7 +1,10 @@
 #include "ruby/ruby.h"
 
+NORETURN(void *dln_load(const char *));
 void*
 dln_load(const char *file)
 {
     rb_loaderror("this executable file can't load extension libraries");
+
+    UNREACHABLE_RETURN(NULL);
 }
diff --git a/dmyenc.c b/dmyenc.c
new file mode 100644
index 0000000000..7e006e826c
--- /dev/null
+++ b/dmyenc.c
@@ -0,0 +1,10 @@
+#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/dmyencoding.c b/dmyencoding.c
deleted file mode 100644
index 1bd1106e69..0000000000
--- a/dmyencoding.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define NO_LOCALE_CHARMAP 1
-#include "encoding.c"
diff --git a/dmyversion.c b/dmyversion.c
deleted file mode 100644
index 279c6ea95a..0000000000
--- a/dmyversion.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define NO_INITIAL_LOAD_PATH 1
-#include "version.c"
diff --git a/doc/.document b/doc/.document
new file mode 100644
index 0000000000..d739c9f6bc
--- /dev/null
+++ b/doc/.document
@@ -0,0 +1,3 @@
+*.rdoc
+NEWS-*
+syntax
diff --git a/doc/ChangeLog-0.06_to_0.52 b/doc/ChangeLog-0.06_to_0.52
new file mode 100644
index 0000000000..63826081b3
--- /dev/null
+++ b/doc/ChangeLog-0.06_to_0.52
@@ -0,0 +1,1147 @@
+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
new file mode 100644
index 0000000000..5f5b03ff40
--- /dev/null
+++ b/doc/ChangeLog-0.50_to_0.60
@@ -0,0 +1,462 @@
+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
new file mode 100644
index 0000000000..bd5f140dc3
--- /dev/null
+++ b/doc/ChangeLog-0.60_to_1.1
@@ -0,0 +1,3955 @@
+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 e16c7f4f20..6d9453d011 100644
--- a/doc/ChangeLog-1.8.0
+++ b/doc/ChangeLog-1.8.0
@@ -42,7 +42,7 @@ Sun Aug  3 23:56:50 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Sun Aug  3 22:07:47 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tkentry.rb: support 'validatecommand' option of 
+	* ext/tk/lib/tkentry.rb: support 'validatecommand' option of
 	  TkEntry/TkSpinbox widget
 
 	* ext/tk/sample/{demos-en,demos-jp}/spin.rb: add
@@ -60,7 +60,7 @@ Sun Aug  3 18:03:44 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 Sun Aug  3 08:53:06 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/sample/{demos-en,demos-jp}/image3.rb: add 
+	* ext/tk/sample/{demos-en,demos-jp}/image3.rb: add
 
 	* ext/tk/lib/tkcanvas.rb: bug fix on Tk object ID management
 
@@ -84,7 +84,7 @@ Sat Aug  2 23:51:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Sat Aug  2 09:58:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: bug fix --- TkGrid failed to treat 
+	* ext/tk/lib/tk.rb: bug fix --- TkGrid failed to treat
 	  RELATIVE PLACEMENT
 
 	* ext/tk/sample/demos-en/, demos-jp/: add or modify some
@@ -122,7 +122,7 @@ Sat Aug  2 14:02:39 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Sat Aug  2 09:58:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: bug fix --- forgot to entry a widget class 
+	* ext/tk/lib/tk.rb: bug fix --- forgot to entry a widget class
 	  name of 'labelframe' widget
 
 	* ext/tk/sample/{demos-en,demos-jp}/{labelframe.rb,paned1.rb,
@@ -238,7 +238,7 @@ Fri Aug  1 09:54:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Fri Aug  1 04:58:55 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: bug fix --- forget to eval given block to 
+	* ext/tk/lib/tk.rb: bug fix --- forget to eval given block to
 	  TkRoot.new method
 
 	* ext/tk/sample/tkoptdb-safeTk.rb: new sample script
@@ -255,13 +255,13 @@ Thu Jul 31 23:44:00 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 Thu Jul 31 23:04:45 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/sample/resource.en, ext/tk/sample/resource.jp: 
+	* ext/tk/sample/resource.en, ext/tk/sample/resource.jp:
 	  wrong resource file format
 
-	* ext/tk/lib/tk.rb: add Tk::Encoding.{encoding_convertfrom, 
+	* ext/tk/lib/tk.rb: add Tk::Encoding.{encoding_convertfrom,
 	  encoding_convertto}
 
-	* ext/tk/lib/tk.rb: add TkOptionDB.read_with_encoding to read 
+	* ext/tk/lib/tk.rb: add TkOptionDB.read_with_encoding to read
 	  non-utf8 resource file
 
 Thu Jul 31 23:02:47 2003  NAKAMURA Usaku <usa@ruby-lang.org>
@@ -274,15 +274,15 @@ Thu Jul 31 20:52:40 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk.rb: (IMPORTANT BUG FIX) scan of event keywords
 	  doesn't work on recent versions of Tck/Tk
 
-	* ext/tk/lib/tk.rb: initialize error of instance variable on 
+	* ext/tk/lib/tk.rb: initialize error of instance variable on
 	  TkComposite
 
-	* ext/tk/lib/multi-tk.rb: initialize error on encoding-system on 
+	* ext/tk/lib/multi-tk.rb: initialize error on encoding-system on
 	  MultiTkIp
 
 	* ext/tk/lib/tk.rb: trouble on destroying widgets
 
-	* ext/tk/sample/demos-en/, demos-jp/: add JP and EN version of 
+	* ext/tk/sample/demos-en/, demos-jp/: add JP and EN version of
 	  Ruby/Tk widget demos
 
 Thu Jul 31 15:25:12 2003  NAKAMURA Usaku <usa@ruby-lang.org>
@@ -311,13 +311,13 @@ Thu Jul 31 08:18:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
 
 Thu Jul 31 07:59:18 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: wrap the command-proc of TkScale --- pass 
+	* ext/tk/lib/tk.rb: wrap the command-proc of TkScale --- pass
 	  the numeric object to the proc
 
-	* ext/tk/lib/tk.rb: better support for widgets created on 
+	* ext/tk/lib/tk.rb: better support for widgets created on
 	  Tk interpreter (without Ruby)
 
-	* ext/tk/lib/multi-tk.rb: a little more stable on Multiple Tk 
+	* ext/tk/lib/multi-tk.rb: a little more stable on Multiple Tk
 	  interpreters running
 
 Thu Jul 31 00:17:19 2003  Shugo Maeda  <shugo@ruby-lang.org>
@@ -411,17 +411,17 @@ Wed Jul 30 07:23:14 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkentry.rb: fix lack of methods for TkEntry
 
-	* ext/tk/lib/multi-tk.rb, ext/tk/lib/tk.rb, 
-	  ext/tk/lib/tkdialog.rb, ext/tk/lib/tkentry.rb, 
+	* ext/tk/lib/multi-tk.rb, ext/tk/lib/tk.rb,
+	  ext/tk/lib/tkdialog.rb, ext/tk/lib/tkentry.rb,
 	  ext/tk/sample/safe-tk.rb, ext/tk/sample/tktimer2.rb: bug fix
 
-	* ext/tk/lib/multi-tk.rb: MultiTkIp.new_* accept a block to 
+	* ext/tk/lib/multi-tk.rb: MultiTkIp.new_* accept a block to
 	  eval under the new interpreter
 
 Wed Jul 30 04:36:30 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c, 
-	  ext/tk/lib/tk.rb, ext/tk/lib/tkafter.rb: additional check of 
+	* ext/tcltklib/tcltklib.c,
+	  ext/tk/lib/tk.rb, ext/tk/lib/tkafter.rb: additional check of
 	  Tk interpreters' status for a little more safety
 
 Wed Jul 30 02:37:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -514,14 +514,14 @@ Mon Jul 28 22:57:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Tue Jul 29 16:20:36 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: bug fix and 
+	* ext/tcltklib/tcltklib.c: bug fix and
 	  change mainloop_abort_on_no_widget_cmd => mainloop_abort_on_exception
 	  ( to avoid thread timing trouble on accessing destroyed widgets )
 
-	* ext/tk/lib/multi-tk.rb: change default mode of 
+	* ext/tk/lib/multi-tk.rb: change default mode of
 	  mainloop_abort_on_exception on multi-tk.rb
 
-	* ext/tk/lib/multi-tk.rb: fix a bug of the procedure for 
+	* ext/tk/lib/multi-tk.rb: fix a bug of the procedure for
 	  'Delete' button on the safe-Tk frmae
 
 Tue Jul 29 12:22:28 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
@@ -541,8 +541,8 @@ Tue Jul 29 12:15:37 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 Tue Jul 29 08:05:30 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb, ext/tk/lib/tkdialog.rb, ext/tk/lib/tktext.rb, 
-	  ext/tk/sample/tkbiff.rb, ext/tk/sample/tkdialog.rb, 
+	* ext/tk/lib/tk.rb, ext/tk/lib/tkdialog.rb, ext/tk/lib/tktext.rb,
+	  ext/tk/sample/tkbiff.rb, ext/tk/sample/tkdialog.rb,
 	  ext/tk/sample/tkform.rb: bug fix ( tested with Ruby/Tk widget demo )
 
 Tue Jul 29 04:22:08 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
@@ -571,7 +571,7 @@ Tue Jul 29 01:24:32 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/multi-tk.rb: bug fix and pack options are pssed
 	  to the safeTk container
 
-	* ext/tk/sample/safe-tk.rb: add example for pack options of 
+	* ext/tk/sample/safe-tk.rb: add example for pack options of
 	  safeTk container
 
 Mon Jul 28 23:23:08 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
@@ -643,7 +643,7 @@ Sun Jul 27 19:35:06 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	* ext/tcltklib/tcltklib.c: add some methods to support
 	  multiple interpreters (low level)
 
-	* ext/tk/lib/multi-tk.rb: new library to support multiple Tk 
+	* ext/tk/lib/multi-tk.rb: new library to support multiple Tk
 	  interpreters (high level)
 
 	* ext/tcltklib/demo/safeTk.rb: new sample of safeTk interpreter
@@ -732,12 +732,12 @@ Fri Jul 26 00:04:25 2003  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 Fri Jul 25 16:43:03 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: add TclTkIp#create_slave, 
+	* ext/tcltklib/tcltklib.c: add TclTkIp#create_slave,
 	  TclTkIp#_make_safe and TclTkIp#safe?
 
 	* ext/tcltklib/MANUAL.euc: modify descriptions
 
-	* ext/tk/lib/tk.rb: bug fix [ruby-talk:76980] and modify to 
+	* ext/tk/lib/tk.rb: bug fix [ruby-talk:76980] and modify to
 	  support multi Tk IPs
 
 	* ext/tk/lib/tkafter.rb: modify to support multi Tk IPs
@@ -747,10 +747,10 @@ Fri Jul 25 15:47:39 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/extconf.rb: add check for BN_rand_range() and
 	  BN_pseudo_rand_range().
 
-	* ext/openssl/ossl_bn.c (ossl_bn_s_rand_range): should raise 
+	* ext/openssl/ossl_bn.c (ossl_bn_s_rand_range): should raise
 	  NotImplementedError if BN_rand_range() wan not defined.
 
-	* ext/openssl/ossl_bn.c (ossl_bn_s_pseudo_rand_range): should raise 
+	* ext/openssl/ossl_bn.c (ossl_bn_s_pseudo_rand_range): should raise
 	  NotImplementedError if BN_pseudo_rand_range() wan not defined.
 
 	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_s_encrypt): avoid compiler
@@ -1110,7 +1110,7 @@ Thu Jul 17 13:42:53 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 Thu Jul 17 06:40:28 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: recover and fix typo : Tk.chooseDirectory 
+	* ext/tk/lib/tk.rb: recover and fix typo : Tk.chooseDirectory
 	  (Tk8.4 feature)
 
 Wed Jul 16 16:23:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -1139,7 +1139,7 @@ Tue Jul 15 14:38:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Tue Jul 15 03:30:41 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
 
-	* ext/syck/rubyext.c (syck_mark_emitter): forgot to rb_gc_mark the 
+	* ext/syck/rubyext.c (syck_mark_emitter): forgot to rb_gc_mark the
 	  outgoing IO object.
 
 Sun Jul 13 14:55:36 2003  Koji Arai  <jca02266@nifty.ne.jp>
@@ -1196,7 +1196,7 @@ Fri Jul 11 16:09:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Fri Jul 11 07:17:47 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: not create a Tcl/Tk interpreter if already 
+	* ext/tk/lib/tk.rb: not create a Tcl/Tk interpreter if already
 	  defined TkCore::INTERP
 
 	* ext/tk/lib/tk.rb: bugfix on TkWindow#configure
@@ -1306,7 +1306,7 @@ Thu Jul  3 14:22:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Thu Jul  3 12:13:05 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/mkmf.rb (VPATH): convert from Windows form to Unix form on 
+	* lib/mkmf.rb (VPATH): convert from Windows form to Unix form on
 	  MinGW.  This fixes the build with GNU make 3.80-1 for Cygwin.
 
 Wed Jul  2 23:27:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -1454,16 +1454,16 @@ 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
-	  arguement type mismatch, and inline method_list().
+	  argument type mismatch, and inline method_list().
 	  [ruby-core:01198]
 
 Wed Jun 25 14:40:33 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: add and modify methods --- 
-	  TkWidget.database_class, TkWidget.database_classname, 
-          TkWidget#database_class, TkWidget#database_classname 
+	* ext/tk/lib/tk.rb: add and modify methods ---
+	  TkWidget.database_class, TkWidget.database_classname,
+          TkWidget#database_class, TkWidget#database_classname
 
-	* ext/tk/lib/tk.rb: instances of a subclass of TkToplevel or 
+	* ext/tk/lib/tk.rb: instances of a subclass of TkToplevel or
 	  TkFrame are created with ":class=>subclass" option as default.
 
 	* ext/tk/sample/tkoptdb.rb: add a new part
@@ -1478,7 +1478,7 @@ Wed Jun 25 05:49:10 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: add widget destroy hook binding to TkBindTag::ALL
 
-	* ext/tk/lib/tkcanvas.rb: Although requiring manual control of GC, 
+	* ext/tk/lib/tkcanvas.rb: Although requiring manual control of GC,
 	  memory eating problem of TkCanvas Items is fixed.
 
 	* ext/tk/lib/tktext.rb: add some methods and bug fix
@@ -1493,10 +1493,10 @@ Tue Jun 24 16:46:07 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk.rb: bug fix on TkToplevel, TkFrame,
 	  TkPanedwindow, TkOptionDB
 
-	* ext/tk/lib/tk.rb: TkOptionDB --- make it more secure to use procs 
+	* ext/tk/lib/tk.rb: TkOptionDB --- make it more secure to use procs
 	  defined on resourceDB
 
-	* ext/tk/sample/tkoptdb.rb, resource.ja, resource.en: 
+	* ext/tk/sample/tkoptdb.rb, resource.ja, resource.en:
 	  sample script how to use TkOptionDB.
 
 Tue Jun 24 14:22:41 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
@@ -1610,14 +1610,14 @@ Sun Jun 22 23:42:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 Sun Jun 22 16:17:02 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm 
+	* ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm
 	  commands as elements
 
 	* ext/tk/lib/tk.rb: TkMenu --- add some methods
 
 	* ext/tk/lib/tk.rb: TkOptionMenubutton --- bug fix
 
-	* ext/tk/sample/tkmenubutton.rb: sample of TkMenubutton and 
+	* ext/tk/sample/tkmenubutton.rb: sample of TkMenubutton and
 	  TkOptionMenubutton
 
 Sat Jun 21 23:15:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -1625,7 +1625,7 @@ Sat Jun 21 23:15:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (proc_invoke): should not propagate distination tag if
 	  tag is already handled in this level. (ruby-bugs-ja PR#501)
 
-	* object.c (str_to_id): check for empty string before intern. 
+	* object.c (str_to_id): check for empty string before intern.
 	  [ruby-talk:74006]
 
 Sat Jun 21 13:56:09 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
@@ -1636,10 +1636,10 @@ Sat Jun 21 13:56:09 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
 
 Sat Jun 21 12:55:17 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm commands 
-	  as elements of a hash argument. 
+	* ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm commands
+	  as elements of a hash argument.
 
-	* ext/tk/sample/tktimer2.rb: add comments about the usage of a 
+	* ext/tk/sample/tktimer2.rb: add comments about the usage of a
 	  TkTimer object.
 
 Sat Jun 21 08:47:22 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -1647,10 +1647,10 @@ Sat Jun 21 08:47:22 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk*.rb: remove direct-accesses to TkComm::INTERP and
 	  TkComm::INITIALIZE_TARGETS
 
-	* ext/tk/lib/tk*.rb: use TkINTERP_SETUP_SCRIPTS constant for setting 
+	* ext/tk/lib/tk*.rb: use TkINTERP_SETUP_SCRIPTS constant for setting
 	  up the interpreter
 
-	* ext/tcltklib/tcltklib.c: support to create a safe interpreter 
+	* ext/tcltklib/tcltklib.c: support to create a safe interpreter
 	  with safe-Tk
 
 Fri Jun 20 23:28:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -1660,7 +1660,7 @@ Fri Jun 20 23:28:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Fri Jun 20 15:04:28 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* defines.h (PATH_ENV): name of PATH environment. [new]. 
+	* defines.h (PATH_ENV): name of PATH environment. [new].
 
 	* defines.h (ENV_IGNORECASE): define for case insensitive platforms
 	  to access environment variables.
@@ -1678,7 +1678,7 @@ Fri Jun 20 14:52:46 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 Fri Jun 20 03:09:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* parse.y (new_yield): distinguish "yield 1,2" and "yield [1,2]". 
+	* parse.y (new_yield): distinguish "yield 1,2" and "yield [1,2]".
 	  [ruby-dev:20360]
 
 	* eval.c (rb_eval): support new_yield() change.
@@ -1688,7 +1688,7 @@ Fri Jun 20 03:09:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  [ruby-list:36935]
 
 	* parse.y (no_blockarg): separate no block argument check and
-	  ret_args argument processing. 
+	  ret_args argument processing.
 
 Fri Jun 20 00:45:19 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>
 
@@ -1696,9 +1696,9 @@ Fri Jun 20 00:45:19 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>
 
 Thu Jun 19 22:51:41 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* lib/drb.rb, lib/drb/drb.rb, lib/drb/eq.rb, 
-	  lib/drb/extserv.rb, lib/drb/extservm.rb, lib/drb/gw.rb, 
-	  lib/drb/invokemethod.rb, lib/drb/observer.rb, 
+	* lib/drb.rb, lib/drb/drb.rb, lib/drb/eq.rb,
+	  lib/drb/extserv.rb, lib/drb/extservm.rb, lib/drb/gw.rb,
+	  lib/drb/invokemethod.rb, lib/drb/observer.rb,
 	  lib/drb/timeridconv.rb, lib/drb/unix.rb: import drb-2.0.4b3
 
 Thu Jun 19 16:14:43 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -1710,17 +1710,17 @@ Thu Jun 19 16:14:43 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: add TclTkLib::EventFlag::NONE ( == 0 )
 
-	* ext/tcltklib/tcltklib.c: add set_no_event_wait() and 
+	* ext/tcltklib/tcltklib.c: add set_no_event_wait() and
 	  get_no_event_wait()
 
 	* ext/tcltklib/MANUAL.euc: modify
 
 	* ext/tcltklib/README.euc: ditto
 
-	* ext/tk/lib/tk.rb: change default value of TkCore.do_one_event 
+	* ext/tk/lib/tk.rb: change default value of TkCore.do_one_event
 	  argument
 
-	* ext/tk/lib/tk.rb: add TkCore.set_no_event_wait(wait) and 
+	* ext/tk/lib/tk.rb: add TkCore.set_no_event_wait(wait) and
 	  TkCore.get_no_event_wait
 
 	* ext/tk/lib/tk.rb: add Tk.exit ( == destroy root widget )
@@ -1730,7 +1730,7 @@ Thu Jun 19 16:14:43 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkafter.rb: set_callback returns self
 
-	* ext/tk/lib/tkafter.rb: continue() raises an exception, if already 
+	* ext/tk/lib/tkafter.rb: continue() raises an exception, if already
 	  running or no procedure.
 
 	* ext/tk/lib/tkafter.rb: skip() raises an exception, if not running.
@@ -1768,15 +1768,15 @@ Wed Jun 18 19:46:21 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: rename 'no_create' option to 'without_creating'
 
-	* ext/tk/lib/tk.rb: add TkWindow#pack_in, TkWindow#grid_in, 
+	* ext/tk/lib/tk.rb: add TkWindow#pack_in, TkWindow#grid_in,
 	  TkWindow#place_in
 
 	* ext/tk/lib/tk.rb: add TkWindow#bind_class and TkWindow#database_class
 
-	* ext/tk/lib/tk.rb: add TkBindTag.new_by_name and TkDatabaseClass 
+	* ext/tk/lib/tk.rb: add TkBindTag.new_by_name and TkDatabaseClass
 	  for binding to database class
 
-	* ext/tk/lib/tk.rb: check varname whether already exsist or not. 
+	* ext/tk/lib/tk.rb: check varname whether already exsist or not.
 	  (TkVarAccess.new)
 
 	* ext/tk/lib/tk.rb: TkTextWin#bbox returns an array of four numbers
@@ -1788,21 +1788,21 @@ Wed Jun 18 19:46:21 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: TkBindTag.new accepts a block
 
-	* ext/tk/lib/tk.rb: If given taglist, TkWindow#bindtags(taglist) 
+	* ext/tk/lib/tk.rb: If given taglist, TkWindow#bindtags(taglist)
 	  returns taglist
 
 	* ext/tk/lib/tk.rb: add TkWindow#bindtags=(taglist)
 
-	* ext/tk/lib/tk.rb: Tk.focue and Tk.focus_lastfor return nil 
+	* ext/tk/lib/tk.rb: Tk.focue and Tk.focus_lastfor return nil
 	  if there is no target widget.
 
-	* ext/tk/lib/tk.rb: Tk::Wm.client returns the argument string 
+	* ext/tk/lib/tk.rb: Tk::Wm.client returns the argument string
 	  when setting name
 
-	* ext/tk/lib/tk.rb: TkGrid.columnconfiginfo and rowconfiginfo 
+	* ext/tk/lib/tk.rb: TkGrid.columnconfiginfo and rowconfiginfo
 	  given a slot return a number.
 
-	* ext/tk/lib/tk.rb: TkWindow.grid_columnconfiginfo and 
+	* ext/tk/lib/tk.rb: TkWindow.grid_columnconfiginfo and
 	  grid_rowconfiginfo --- ditto
 
 	* ext/tk/lib/tk.rb: rename and define alias :: TkOption ==> TkOptionDB
@@ -1813,10 +1813,10 @@ Wed Jun 18 19:46:21 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: some TkComm methods change to module functions
 
-	* ext/tk/lib/tk.rb: add support for -displayof option to some 
+	* ext/tk/lib/tk.rb: add support for -displayof option to some
 	  TkWinfo methods
 
-	* ext/tk/lib/tk.rb: bind, bind_append and bind_remove --- 
+	* ext/tk/lib/tk.rb: bind, bind_append and bind_remove ---
 	  returns the target of event-binding
 
 	* ext/tk/lib/tk.rb: add Tk8.4 features
@@ -1837,7 +1837,7 @@ Wed Jun 18 19:46:21 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkentry.rb: TkEntry#bbox returns an array of four numbers
 
-	* ext/tk/lib/tkentry.rb: scan validatecommand arguments and 
+	* ext/tk/lib/tkentry.rb: scan validatecommand arguments and
 	  convert to proper type
 
 	* ext/tk/lib/tkbgerror.rb: support to define a error handler by user
@@ -1932,7 +1932,7 @@ Fri Jun 13 09:24:39 2003  Shugo Maeda  <shugo@ruby-lang.org>
 Thu Jun 12 22:13:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb : add 'no_create' option to widget
-	  initialize method. 
+	  initialize method.
 
 	* ext/tk/MANIFEST : forgot to commit when added tkmacpkg.rb
 	  and tkwinpkg.rb
@@ -1947,7 +1947,7 @@ Thu Jun 12 21:14:11 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tkmacpkg.rb : Mac resource (not new but not
 	  included until now)
 
-	* ext/tk/lib/tkwinpkg.rb : Win DDE and registry (not new but not 
+	* ext/tk/lib/tkwinpkg.rb : Win DDE and registry (not new but not
 	  included until now)
 
 Tue Jun 10 14:26:30 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
@@ -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 accidentaly removed.
+	* lib/net/pop.rb: Exception line was accidentally 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 reciever's type.
+	  really a module, whose methods must be safe for receiver's type.
 
 	* eval.c (rb_eval): nosuper should not be inherited unless the
 	  overwritten method is an undef placeholder.
@@ -8346,7 +8346,7 @@ Tue Jun  4 07:03:33 2002  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkfont.rb:  Fix bugs on TkFont.init_widget_font for Tk8.x.
 
-	* ext/tk/lib/tkafter.rb: Add self to 1st argument of interval- 
+	* ext/tk/lib/tkafter.rb: Add self to 1st argument of interval-
 	  and loop-proc
 	  TkAfter#current_interval returns an interval (sleep) time value
 	  TkAfter#current_args returns an array of arguments
@@ -8354,7 +8354,7 @@ Tue Jun  4 07:03:33 2002  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk*.rb: Allow to use Symbols for parameters.
 
-	* ext/tk/lib/tkcanvas.rb: (TkcItem) Add 'coords' parameter to the 
+	* ext/tk/lib/tkcanvas.rb: (TkcItem) Add 'coords' parameter to the
 	  canvas item constructor (for new notation of constructor).
 
 	* ext/tcltklib/tcltklib.c: New 'mainloop' and 'mainloop_watchdog'.
@@ -8363,7 +8363,7 @@ Tue Jun  4 07:03:33 2002  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	  'use' parameter.
 
 	* ext/tk/lib/tk.rb: Add new parameter 'widgetname' to the widget
-	  constructor to support effective use of Resource Database. 
+	  constructor to support effective use of Resource Database.
 
 	* ext/tk/lib/tk.rb: TkOption::get always returns a tainted string.
 
@@ -13020,7 +13020,7 @@ Tue Jun 12 00:41:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Mon Jun 11 14:29:41 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* confgure.in: add RUBY_CANONICAL_BUILD.
+	* configure.in: add RUBY_CANONICAL_BUILD.
 
 Sun Jun 10 17:31:47 2001  Guy Decoux  <decoux@moulon.inra.fr>
 
@@ -13763,7 +13763,7 @@ Tue Apr 17 17:33:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (handle_rescue): use === to compare exception match.
 
-	* error.c (syserr_eqq): comparison between SytemCallErrors should
+	* error.c (syserr_eqq): comparison between SystemCallErrors should
 	  based on their error numbers.
 
 Tue Apr 17 16:54:39 2001  K.Kosako  <kosako@sofnec.co.jp>
@@ -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 obtained from rb_eval_string_protect()/rb_load_protect().
+	  can be 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 ef10d65db0..eecfc44325 100644
--- a/doc/ChangeLog-1.9.3
+++ b/doc/ChangeLog-1.9.3
@@ -1,3 +1,12154 @@
+Sun Jul 10 22:50:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (rmpd_power_by_big_decimal): fix
+	  precision treatment errors.
+
+	* test/bigdecimal/test_bigdecimal.rb: add tests for the above change.
+	  fix precision treatment errors.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_power): precision argument
+	  should be optional for its compatibility.
+
+Sun Jul 10 22:38:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (var_ref): distinguish vcall from local variable
+	  references.  based on a patch by Michael Edgar michael.j.edgar
+	  AT dartmouth.edu.  Bug #5002
+
+Sun Jul 10 21:51:29 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* internal.h: add comments (cautions).
+
+Sun Jul 10 20:59:38 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb: Add new class variable `@@testfile_prefix`.
+	  This is for changing test name prefix. (For testing)
+
+	* test/testunit/tests_for_parallel/ptest_first.rb: Renamed from
+	  test_first.rb
+
+	* test/testunit/tests_for_parallel/ptest_second.rb: Renamed from
+	  test_second.rb
+
+	* test/testunit/tests_for_parallel/ptest_third.rb: Renamed from
+	  test_third.rb
+
+	* test/testunit/tests_for_parallel/ptest_forth.rb: Renamed from
+	  test_forth.rb
+
+	* test/testunit/tests_for_parallel/runner.rb: Remove misc.rb
+
+	* test/testunit/tests_for_parallel/ptest_first.rb: ditto.
+
+	* test/testunit/tests_for_parallel/ptest_second.rb: ditto.
+
+	* test/testunit/tests_for_parallel/ptest_third.rb: ditto.
+
+	* test/testunit/tests_for_parallel/ptest_forth.rb: ditto.
+
+	* test/testunit/tests_for_parallel/misc.rb: Removed because no longer
+	  needed.
+
+	* test/testunit/test_parallel.rb: Fix assertions for above.
+
+Sun Jul 10 16:57:08 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_throw): check a class frame.
+	  Fixes Bug #4648.
+	  The patch is contributed by Kazuki Tsujimoto.
+
+	* bootstraptest/test_proc.rb: add tests for above.
+
+Sun Jul 10 17:28:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (mutex_debug): use exit(EXIT_FAILURE) instead of
+	  exit(1).
+	* thread_pthread.c (add_signal_thread_list): ditto.
+	* thread.c (rb_thread_call_with_gvl): ditto.
+	* util.c (Bug): ditto.
+
+Sun Jul 10 15:58:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd).
+	  [Bug #4700]
+
+Sun Jul 10 16:41:32 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_core.h (typedef struct rb_vm_struct): create a new
+	  'inhibit_thread_creation' field.
+	* thread.c (rb_thread_terminate_all): set inhibit_thread_creation.
+	* thread.c (thread_s_new): don't permit to create new thread
+	  if the VM is under destruction. Otherwise evil finalizer code
+	  can make SEGV. [Bug #4992][ruby-core:37858]
+
+	* bootstraptest/test_objectspace.rb: new test for this fix.
+
+Sun Jul 10 16:06:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (sigsegv): use abort() instead of exit() when nested
+	  SEGV was happen. Because unnested SEGV use abort().
+	  [Bug #5013][ruby-dev:44078]
+
+Sun Jul 10 15:30:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* load.c (rb_f_autoload): prevent to autoload for singleton
+	  classes.  fixes [Bug #4886] [ruby-dev:43816]
+
+	* bootstraptest/test_autoload.rb: add tests for the above change.
+
+Sun Jul 10 15:09:17 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit/assertions.rb: Import documentation patch by Justin
+	  Collins. [ruby-core:37225] [Feature #4903]
+
+Sun Jul 10 14:57:36 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: canonicalizes nth and sf.
+
+Sun Jul 10 14:13:50 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* internal.h (rb_thread_call_with_gvl, rb_thread_call_without_gvl):
+	  make them visible as experimental C APIs.  fixes Feature #4328.
+
+Sun Jul 10 12:18:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_power): support non-integral
+	  exponent.  fixes [Bug #3271]
+
+	* ext/bigdecimal/bigdecimal.c (rmpd_power_by_big_decimal): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_power_op): add a function to
+	  only use for "**" operator.
+
+	* test/bigdecimal/test_bigdecimal.rb: add a bunch of tests for the
+	  above changes.
+
+	* ext/bigdecimal/bigdecimal.c (is_integer): add an utility function.
+
+	* ext/bigdecimal/bigdecimal.c (is_negative): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (is_positive): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (is_zero): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (is_one): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (is_even): ditto.
+
+Sun Jul 10 12:08:39 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (when_vals): when a string literal is written on when
+	  clause, skip string creation to make it faster.  [ruby-dev:44068]
+	  [Feature #5000]
+
+Sun Jul 10 11:35:29 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (reduce_nodes_gen): NODE_RETURN in rescue body must not be
+	  reduced when there is an else clause.  This caused bizarre behavior
+	  in [Bug #4473] [ruby-core:35629] [ruby-core:37884].
+
+Sun Jul 10 09:46:14 2011  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* range.c (range_max): fix behavior with excluded end value.
+	  [Bug #4591]
+
+Sun Jul 10 09:13:18 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* NEWS:  Fix RubyGems version.  [Ruby 1.9 - Bug #5004]
+
+Sat Jul  9 20:01:59 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* internal.h: rb_rational_reciprocal is defined in rational.c.
+
+Sat Jul  9 19:48:31 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* internal.h: added declarations.
+	* complex.c: followed the above change.
+
+Sat Jul  9 17:24:41 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* NEWS: bigdecimal is not a builtin.
+
+Sat Jul  9 17:17:53 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: some improvements for performance.
+
+Sat Jul  9 16:56:01 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* atomic.h (ATOMIC_OR): _InterlockedOr is unavailable in VC6.
+
+	* numeric.c (ULLONG_MAX): fallback definition.
+
+Sat Jul  9 15:59:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_{read,write}): should be signed.
+	  Bug #5001
+
+Sat Jul  9 14:02:20 2011  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb: fix multipart form parsing bug. [Bug #3866]
+
+Sat Jul  9 11:41:03 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Add Vector#normalize [ruby-dev:43829]
+
+Sat Jul  9 09:25:06 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* enumerator.c:  Remove "enumeration sequenced by".
+	  [Ruby 1.9 - Bug #4757]
+
+Sat Jul  9 09:14:56 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* io.c:  Note that methods other than IO#gets may increase IO#lineno.
+	  [Ruby 1.9 - Bug #4902]
+
+Sat Jul  9 08:39:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (RUN_OPT): disable gems.
+
+Sat Jul  9 08:37:05 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_close): close(2) on a fd which is being read by
+	  another thread causes deadlock on Mac OS X 10.5
+
+Fri Jul  8 21:20:39 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c: use USE_ELF instead of __ELF__ because Solaris
+	  doesn't define it. USE_ELF is already provided by configure.
+	  patched by Naohisa Goto. [ruby-dev:44066] [Bug #4998]
+
+	* addr2line.h: ditto.
+
+	* vm_dump.c: ditto.
+
+Fri Jul  8 16:40:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/json/parser/parser.rl (convert_encoding): should not modify
+	  the argument.
+
+	* ext/json/parser/parser.rl (convert_encoding): no needs to use
+	  force_encoding.
+
+Fri Jul  8 15:53:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_bug): get rid of segfault after all threads
+	  disposed.
+
+Fri Jul  8 15:01:06 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/ossl.h: include openssl/e_os2.h before checking the
+	  definition of OPENSSL_SYS_WIN32.
+
+Fri Jul  8 14:40:39 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (wunlink): reverted a part of r32426. it was mistakenly
+	  mixed.
+
+Fri Jul  8 14:29:47 2011  Narihiro Nakamura  <authornari@gmail.com>
+
+	* configure.in: can't subtract void *.
+
+Fri Jul  8 14:33:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): define GC_MARK_STACKFRAME_WORD.
+	  fixed build problem of r32438.  the value (30) is temporary value.
+	  maybe it's enough by 20~24 according to my observation.
+
+Fri Jul  8 13:47:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_mutex_unlock_all): folded into
+	  rb_threadptr_unlock_all_locking_mutexes.
+	* thread.c (rb_threadptr_unlock_all_locking_mutexes) ditto.
+
+Fri Jul  8 13:36:02 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_unlock_all_locking_mutexes): rename to
+	  rb_threadptr_unlock_all_locking_mutexes and remove static.
+	* vm_core.h: add rb_threadptr_unlock_all_locking_mutexes declaration.
+	* thread.c (thread_start_func_2): adjust the above rename.
+
+	* eval.c (ruby_cleanup): call rb_threadptr_unlock_all_locking_mutexes
+	  again after finalizer. [Bug #4988] [ruby-dev:44049]
+
+Fri Jul  8 13:06:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* cont.c (FIBER_MACHINE_STACK_ALLOCATION_SIZE): Fiber stack size
+	  don't need to keep multiple number of sizeof(VALUE).
+
+Fri Jul  8 11:39:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (sudo-precheck): true command is not standard on
+	  Windows.
+
+Fri Jul  8 10:39:52 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (gvl_destroy): fix cond_t leak.
+
+Fri Jul  8 09:17:59 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* gc.c:  Improve documentation
+
+Thu Jul  7 23:35:31 2011  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: change water_mark value that may call
+	  gc_mark(lev <= GC_LEVEL_MAX) in gc_mark().
+	  In ruby_stack_check(), water_mark is a value that may call some
+	  C function. Fixes Bug #3781
+
+	* configure.in: define GC_MARK_STACKFRAME_WORD that approximate
+	  size of gc_mark() and gc_mark_children() stackframes.
+
+Thu Jul  7 17:55:05 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/testunit/test_parallel.rb (TestParallelWorker#teardown): wait
+	  the child process even if the communication pipe is broken.
+
+Thu Jul  7 15:44:42 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_set_index, rb_enc_associate_index): should
+	  check if frozen.
+
+	* parse.y (rb_intern3), ruby.c (process_options, ruby_script):
+	  defer freezing after associating encodings.
+
+Thu Jul  7 15:16:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (rb_num2ull): use own switch sentence.
+	  Current implementation can't convert 18446744073709551615.
+
+Thu Jul  7 06:56:15 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* cont.c (FIBER_STACK_FLAGS): workaround fix for r32420 on FreeBSD.
+
+Thu Jul  7 06:46:12 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* benchmark/driver.rb:  Add difference column to report that averages
+	  across all runs of a benchmark.  [Ruby 1.9 - Feature #4982]
+
+Thu Jul  7 06:19:38 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Reduce requires to improve `make benchmark`.
+	  [#4962]
+	* lib/rubygems/specification.rb:  Delay initialization of rubygems
+	  until require is called.
+
+Thu Jul  7 04:31:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (arg): rescue_mod is in inverse order from other
+	  modifiers.  patched by michael.j.edgar AT dartmouth.edu at
+	  [ruby-core:36248].  fixed #4716.
+
+Thu Jul  7 00:40:16 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (kill): check that the process exited or not before
+	  terminating it. [Bug #4943]
+
+Wed Jul  6 23:13:19 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (opt_call_args): allow trailing comma after assoc
+	  argument e.g. 'foo(bar:1,)'.  fixed #3456
+
+Wed Jul  6 22:11:12 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Validate date in
+	  "Date:" header
+
+Wed Jul  6 21:29:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* cont.c (fiber_machine_stack_alloc): cleanup pointer arithmetic.
+	  "size/sizeof(VALUE)" is ugly and easy confusing.
+	* cont.c (fiber_initialize_machine_stack_context): ditto.
+
+Wed Jul  6 21:24:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* cont.c (fiber_machine_stack_alloc): fix mprotect misuse. A stack
+	  guard page should have PROT_NONE.
+	* cont.c (fiber_initialize_machine_stack_context):
+	  th->machine_stack_maxsize shouldn't be included guard pages size.
+	  [Bug #4983][ruby-dev:44043]
+
+Wed Jul  6 21:23:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* cont.c (fiber_machine_stack_alloc): use MAP_STACK if it's provided.
+
+Wed Jul  6 21:22:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* cont.c (fiber_machine_stack_alloc): use MAP_FAILED instead of -1.
+
+Wed Jul  6 21:21:05 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* cont.c (fiber_machine_stack_alloc): remove unnecessary cast.
+
+Wed Jul  6 18:10:13 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Adding space after
+	  comma.
+
+	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Remove variable
+	  `now`. Suppress warning.
+
+Wed Jul  6 12:18:09 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Fix bug depends to
+	  time. The test fails if time past 1 second in line 136-145
+
+Tue Jul  5 15:28:04 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_here_document): should dispatch heredoc_end
+	  scanner event on an empty here document.  fixed Bug#4543.
+
+Tue Jul  5 13:49:26 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* addr2line.c: fix r32407 to check HAVE_ALLOCA_H.
+
+Tue Jul  5 14:05:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/httpauth/digestauth.rb (_authenticate):
+	  Literal texts in HTTP ABNF is case-insensitive (RFC2616 2.1),
+	  and a sample implementation in RFC2617 also ignores the case
+	  of algorithms. So now this ignores those cases.
+	  [ruby-dev:43965] [Feature #4936]
+
+	* lib/webrick/httpauth/digestauth.rb (initialize):
+	  Because of above, opera_hack is useless and removed.
+
+Tue Jul  5 01:30:01 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread_pthread.c (native_sleep): cut the waiting time up to
+	  100,000,000 because Solaris cond_timedwait() return EINVAL if an
+	  argument is greater than current_time + 100,000,000.  This is
+	  considered as a kind of spurious wakeup.  The caller to native_sleep
+	  should care about spurious wakeup.
+
+Tue Jul  5 01:24:26 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* cont.c: disable FIBER_USE_NATIVE on Solaris because resuming any
+	  Fiber caused SEGV.  I haven't follow up the issue deeply, but it
+	  works when disabling the feature.
+
+Tue Jul  5 01:22:46 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* addr2line.c: include <alloca.h> to fix a build issue on Solaris.
+
+Tue Jul  5 00:49:05 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* ext/coverage/coverage.c: resurrect r32071 + add GC guard for
+	  rb_coverages. [ruby-core:37352] [Bug #4927]
+	  [ruby-core:36539] [Feature #4796]
+
+	* test/coverage/test_coverage.rb resurrect r32071.
+
+Mon Jul  4 22:24:46 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (get_stack): For NetBSD/FreeBSD, use
+	  pthread_attr_getstack() if possible. and, remove an assumption
+	  of stack growing direction.
+
+Mon Jul  4 20:42:31 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/coverage/coverage.c: revert r32071.  The commit caused SEGV on
+	  some minor nonfree OS.  I have no means of debugging the bug.  My
+	  personal opinion is that such OS should be unsupported unless there
+	  is an active maintainer.  [ruby-core:37352]
+
+	* test/coverage/test_coverage.rb: ditto.
+
+Mon Jul  4 07:14:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c (get_stack): the return address of get_stack
+	  must be the highest address of the current thread's stack.
+
+Mon Jul  4 06:37:22 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/intern.h, thread_pthread.c (rb_reserved_fd_p,
+	  RB_RESERVED_FD_P): added.  This C API is to limit to access
+	  fds which are used by RubyVM internal.  In this version of
+	  CRuby, return 1 if fd is communication pipe.
+	  If your application needs to close all file descriptors to
+	  present resource leak, skip internal fds using this C API.
+	  We also define a macro RB_RESERVED_FD_P(fd).  So you can write
+	    #ifndef RB_RESERVED_FD_P
+	    #define RB_RESERVED_FD_P(fd) 0
+	    #endif
+	  for Ruby 1.9.2 or previous version to write compatible extensions.
+	  See [ruby-core:37727]
+
+	* thread_win32.c (rb_reserved_fd_p): added (return 0 for any fds).
+
+	* io.c (rb_io_initialize): raise ArgumentError if given fd is reserved by Ruby.
+
+Sun Jul  3 23:43:56 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/extmk.rb (extmake): suppresses outputs from extconf.rb.
+	  (extmake) warns a failure in extconf.rb.
+
+Sun Jul  3 13:44:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_reject_bang): should not remove elements which are
+	  not yielded.  [Bug #2545]
+
+Sun Jul  3 06:10:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (get_stack): pthread_attr_getstack() doesn't
+	  return stack start address, but stack base address. Thus,
+	  we need to add stack size for getting stack start address.
+	  And, we don't have to decrease guard size twice.
+	* thread_pthread.c (thread_start_func_1): don't use inaccurate
+	  stack start guess if native_thread_init_stack() can be used.
+	  [Bug #1813] [ruby-core:24540]
+
+Sun Jul  3 04:50:08 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (get_stack): add to a care of guard page on Mac
+	  OS X. [Bug #1813] [ruby-core:24540]
+	* signal.c (ruby_signal): SIGBUS use alternative stack too.
+	* signal.c (sigbus): On Mac, thread stack overflow makes SIGBUS
+	  instead of SIGSEGV. thus, added stackoverflow check.
+	* signal.c (default_handler): get rid of compilation warning.
+	* signal.c (Init_signal): ditto.
+
+Sat Jul 02 08:59:20 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_ocsp.rb
+	* test/openssl/test_x509_cert.rb: Perform SHA-256 tests only if
+	  supported by the available OpenSSL version. Versions < 0.9.8 don't
+	  support it. [ruby-core:37724]
+
+Sat Jul  2 07:17:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_reject_bang, rb_ary_delete_if): rejected
+	  elements should be removed.  fixed [Bug #2545]
+
+Sat Jul  2 01:57:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* NEWS: remove a description of Kernel#respond_to? because it has
+	  been reverted at revision 28564.
+
+Sat Jul  2 00:58:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* NEWS: describe a change of multiplication of Bignum.
+
+Fri Jul  1 18:52:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* benchmark/bm_app_erb.rb: increase loop count. too short
+	  measurement time makes less accuracy.
+	* benchmark/bm_app_factorial.rb: ditto.
+	* benchmark/bm_app_mandelbrot.rb: ditto.
+	* benchmark/bm_app_strconcat.rb: ditto.
+
+	* benchmark/bm_io_file_create.rb: ditto.
+	* benchmark/bm_io_file_read.rb: ditto.
+	* benchmark/bm_io_file_write.rb: ditto.
+
+	* benchmark/bm_so_concatenate.rb: ditto.
+	* benchmark/bm_so_lists.rb: ditto.
+	* benchmark/bm_so_matrix.rb: ditto.
+	* benchmark/bm_so_random.rb: ditto.
+	* benchmark/bm_so_sieve.rb: ditto.
+
+	* benchmark/bm_vm_thread_mutex1.rb: ditto.
+	* benchmark/bm_vm_thread_mutex2.rb: ditto.
+	* benchmark/bm_vm_thread_mutex3.rb: ditto.
+
+	* benchmark/bm_vm1_block.rb: cleanup.
+	* benchmark/bm_vm1_const.rb: cleanup.
+	* benchmark/bm_vm1_ensure.rb: cleanup.
+	* benchmark/bm_vm1_ivar.rb: cleanup.
+	* benchmark/bm_vm1_length.rb: cleanup.
+	* benchmark/bm_vm1_neq.rb: cleanup.
+	* benchmark/bm_vm1_not.rb: cleanup.
+	* benchmark/bm_vm1_rescue.rb: cleanup.
+	* benchmark/bm_vm1_simplereturn.rb: cleanup.
+	* benchmark/bm_vm1_swap.rb: cleanup.
+
+	* benchmark/bm_vm2_array.rb: cleanup.
+	* benchmark/bm_vm2_case.rb: cleanup.
+	* benchmark/bm_vm2_defined_method.rb: cleanup.
+	* benchmark/bm_vm2_eval.rb: cleanup.
+	* benchmark/bm_vm2_method.rb: cleanup.
+	* benchmark/bm_vm2_mutex.rb: cleanup.
+	* benchmark/bm_vm2_poly_method.rb: cleanup.
+	* benchmark/bm_vm2_poly_method_ov.rb: cleanup.
+	* benchmark/bm_vm2_proc.rb: cleanup.
+	* benchmark/bm_vm2_regexp.rb: cleanup.
+	* benchmark/bm_vm2_send.rb: cleanup.
+	* benchmark/bm_vm2_super.rb: cleanup.
+	* benchmark/bm_vm2_unif1.rb: cleanup.
+	* benchmark/bm_vm2_zsuper.rb: cleanup.
+
+	* benchmark/bm_vm_thread_alive_check1.rb: cleanup.
+
+Fri Jul  1 15:23:00 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix: Add LUP decomposition
+
+Fri Jul  1 15:21:14 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Allow non integer exponents for Matrix#**
+
+Fri Jul  1 15:13:25 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix: Add Eigenvalue Decomposition
+
+Fri Jul  1 15:10:22 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix: Add Matrix#round
+
+Fri Jul  1 11:41:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (tr_trans): free heap ptr when the str is not embedded.
+	  patched by Eric Wong. [Bug #4956] [ruby-core:37708]
+
+Fri Jul  1 11:07:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (do_select): fix memory leak.
+	  Patch by Eric Wong. Thank you! [Bug #4953] [ruby-core:37702]
+
+Fri Jul  1 08:21:28 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_getivar): check vm state version
+	  to invalidate inline cache (ivar index).
+	  fixes Bug #4926.
+
+	* vm_insnhelper.c (vm_setivar): ditto.
+
+Fri Jul  1 08:03:15 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c, thread_pthread.c (WRITE_CONST): suppress warnings
+	  `ignoring return value'.
+
+Fri Jul  1 06:41:36 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_threadptr_check_signal): only wake up main thread.
+
+	* thread.c (rb_threadptr_execute_interrupts_common): check signal
+	  delivery if it is main thread.
+	  fixes [ruby-dev:44005] [Ruby 1.9 - Bug #4950]
+
+	* bootstraptest/test_fork.rb: add a test for above.
+
+	* signal.c (rb_get_next_signal): skip if signal_buff is empty.
+	  (check signal_buff.size first)
+
+	* vm_core.h: remove unused variable rb_thread_t::exec_signal.
+
+	* thread.c (rb_thread_check_trap_pending): check
+	  rb_signal_buff_size() because rb_thread_t::exec_signal
+	  is no longer available.
+
+Fri Jul  1 03:28:25 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (Init_class_hierarchy): should name BasicObject
+	  explicitly.
+
+	* variable.c (rb_const_defined_0): should not check for
+	  superclasses as const_get.
+
+Fri Jul  1 03:24:03 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: mathn is still alive (should die soon).
+
+Thu Jun 30 23:50:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* misc/ruby-mode.el (ruby-indent-beg-re): Fix broken regular
+	  expression.  Fixes #4546
+
+Thu Jun 30 23:43:30 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl.c/.h: Added ossl_x509_name_sk2ary.
+	* ext/openssl/ossl.c: Replaced ossl_x509_ary2k by generic macro to
+	  simplify future conversions.
+	* ext/openssl/ossl_ssl.c: Implement SSLSocket#client_ca.
+	* test/openssl/test_ssl.rb: Add test for SSLSocket#client_ca.
+	  Thanks to Ippei Obayashi for providing the patch!
+	  [ Ruby 1.9 - Feature #4481 ] [ruby-core:35461]
+
+Thu Jun 30 22:38:58 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm2_defined_method.rb: added to measure performance of
+	  bmethod (method defined by define_method()).
+
+Thu Jun 30 22:17:04 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_bmethod): fix to hook call/return event
+	  for methods defined by define_method().  fixes Bug #4613.
+
+	* thread.c (call_trace_proc): Fix to skip if class is not given (0).
+	  Note that ID and Class object are passed for call/return event
+	  if the called method was defined by define_method().
+	  If you are author of tracer/profiler/debugger, this may be an
+	  important change.  You should check passed class as zero or
+	  non-zero instead of checking the event type.
+
+	* test/ruby/test_settracefunc.rb: add a test for above.
+
+Thu Jun 30 21:18:35 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* configure.in: Add warnflags for XL/C on AIX during configure
+	  to avoid [Bug #3971]. See [ruby-core:32859]
+
+Thu Jun 30 21:16:04 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (m_ajd): refers a constant.
+
+Thu Jun 30 20:54:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	  * ext/io/console/io-console.gemspec: spin-off gem for 1.9.2.
+
+Thu Jun 30 20:36:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: trivial changes.
+
+Thu Jun 30 20:12:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_module.rb: tests for [Bug #3422] and [Bug #3423].
+
+Thu Jun 30 20:03:39 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: modified doc.
+
+Thu Jun 30 19:09:19 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (thread_timer): ignore unknown errno.
+	  (we observed that select(2) was canceled by errno=514 on
+	  boron == Linux/Xen environment)
+
+Thu Jun 30 17:33:25 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c (ObjectSpace.count_tdata_objects):
+	  Fix rdoc.  Fixes Bug #3892.
+
+	* ext/objspace/objspace.c (ObjectSpace.count_tdata_objects):
+	  Change key type if the klass of a object is zero (internal object).
+	  Read rdoc for details.
+
+	* internal.h: export rb_objspace_data_type_name().
+
+Thu Jun 30 17:25:08 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (ping_signal_thread_list, thread_timer):
+	  fix to keep polling state if there are any ping-tasks.
+
+Thu Jun 30 12:25:34 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): allocate
+	  machine stack for the timer thread at least 12KB.  FreeBSD 8.2
+	  AMD64 causes machine stack overflow (SIGSEGV) only with
+	  PTHREAD_STACK_MIN (maybe defined as 2KB).
+
+Thu Jun 30 09:36:37 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/weakref.rb:  Attach documentation to WeakRef and add missing
+	  documentation
+
+Thu Jun 30 09:30:14 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/yaml.rb:  Document toplevel YAML and YAML::ENGINE to describe
+	  Psych vs Syck engines.
+
+Thu Jun 30 09:21:52 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/cmath.rb:  Hide handle_no_method_error from RDoc.
+	* error.c:  Document or hide undocumented error classes.
+
+Thu Jun 30 07:49:04 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* hash.c:  Document ENV
+
+Thu Jun 30 06:37:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe): ensure RUBYLIB_PREFIX stored
+	  before RUBYLIB, even if MANGLED_PATH is enabled.  fixed #1679.
+	  MANGLED_PATH is disabled by the default and will be removed
+	  completely in the future.
+
+Thu Jun 30 06:32:21 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/drb/drb.rb:  Hide deprecated toplevel DRb constants.
+
+Thu Jun 30 06:17:02 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/cmath.rb (CMath.log): second argument: b can be nil.
+
+Thu Jun 30 06:23:28 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* thread.c (ruby_thread_s_pass):  Fix typo.
+
+Thu Jun 30 06:16:53 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc 3.8 which contains fixes for documentation
+	  in trunk.
+
+Thu Jun 30 02:53:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_threadptr_execute_interrupts_common): remove
+	  meaningless native_thread_yield(). It never close a race.
+
+Thu Jun 30 02:41:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_schedule_limits): minor optimization.
+	  eliminate machine context saving when running time is enough small.
+
+Thu Jun 30 02:28:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_schedule_rec): move interrupt_flag check to
+	  rb_thread_schedule().
+	  And also rename to rb_thread_schedule_limits() and remove
+	  sched_depth argument. It's no longer called recursive.
+	* thread.c (rb_thread_schedule): add to check interrupt_flag as
+	  above explained.
+
+	* thread.c (rb_threadptr_execute_interrupts_rec): rename to
+	  rb_threadptr_execute_interrupts_common() and remove sched_depth
+	  argument. It's no longer called recursive.
+
+	* thread.c (rb_thread_sleep): adapt the renaming.
+	* thread.c (rb_threadptr_execute_interrupts): ditto.
+	* thread.c (rb_thread_execute_interrupts): ditto.
+
+Thu Jun 30 01:31:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_s_pass): change RDoc description and remove
+	  a sample code. The actual implementation never behave as explained by
+	  an example. It's a documentation bug.
+
+Thu Jun 30 00:54:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_stop): change RDoc sample code. The old
+	  example is buggy and may cause deadlock. The patch is
+	  suggested by Heesob Park <phasis@gmail.com>. Thank you!
+	  [Bug #3606][ruby-core:31454]
+
+Thu Jun 30 00:49:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_wakeup): change RDoc sample code. The old
+	  example is buggy and may not display anything by a race.
+	  The patch is suggested by Heesob Park <phasis@gmail.com>.
+	  Thank you! [Bug #3606][ruby-core:31454]
+
+Thu Jun 30 00:43:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_run): change RDoc. The old example is buggy
+	  and may cause deadlock. The patch is suggested by Heesob Park
+	  <phasis@gmail.com>. Thank you! [Bug #3606][ruby-core:31454]
+
+Thu Jun 30 00:30:15 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/cmath.rb: make same exception for Math. fix [Bug #3137].
+
+Thu Jun 30 00:03:20 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/completion.rb: complement correctly string literal. fix
+	  [Bug #1145].
+
+Wed Jun 29 23:42:51 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: avoided using timev.
+	* ext/date/date_strftime.c: ditto.
+	* ext/date/date_tmx.h: ditto.
+
+Wed Jun 29 23:17:57 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
+
+Wed Jun 29 23:09:14 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.
+
+Wed Jun 29 22:49:10 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/cmd/help.rb: support RDoc 3.7. fix [Bug #3760].
+
+Wed Jun 29 22:04:14 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* lib/tracer.rb: Tracer.on only if required by -r command-line option.
+	  and consider --disable-gems option.
+	* test/test_tracer.rb: add tests for it.
+
+Wed Jun 29 13:55:36 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_const_get_0): should not look for superclasses if
+	  the second optional argument is given for #const_get().
+	  fix [Bug #3422] [Bug #3423]
+
+Wed Jun 29 12:07:27 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* math.c:  Attach documentation for Math.
+	* object.c:  Document NIL, TRUE, FALSE.
+	* io.c:  Improve grammar in ARGF comment.  Document STDIN/OUT/ERR.
+	  Document ARGF global constant.
+	* lib/rake:  Hide deprecated toplevel constants from RDoc (import from
+	  rake trunk).
+	* lib/thwait.rb:  Document ThWait.
+	* lib/mathn.rb:  Hide Math redefinition from RDoc
+	* lib/sync.rb:  Add a basic comment for Sync_m, Synchronizer_m, Sync,
+	  Synchronizer.
+	* parse.y:  Document SCRIPT_LINES__.
+	* hash.c:  Document ENV class and global constant.
+	* vm.c:  Document TOPLEVEL_BINDING.
+	* version.c:  Document RUBY_* constants.
+	* ruby.c:  Document DATA and ARGV.
+
+Wed Jun 29 10:13:12 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Matrix.zero can build rectangular matrices.
+	  Vector#r should be called #magnitude
+
+Wed Jun 29 10:11:08 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Add Matrix#diagonal?, hermitian?, normal?,
+	  orthogonal?
+	  permutation?, symmetric?, {lower|upper}triangular?, unitary?, zero?
+
+Wed Jun 29 10:09:35 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Specialize Matrix#find_index to return [row, col]
+	  and accept the same optional argument as #each
+
+Wed Jun 29 10:07:32 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Matrix#each{_with_index} can iterate over a subset
+	  of the Matrix
+
+Wed Jun 29 06:21:02 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (native_stop_timer_thread): skip to close
+	  communication pipe to avoid timing bug (process termination timing).
+	  The communication pipe will closed by OS.
+
+Wed Jun 29 06:09:54 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* error.c (rb_async_bug_errno): async-safe bug report function.
+	  In timer thread, signal handler should use it.
+	  The patch is contributed by Eric Wong <normalperson@yhbt.net>.
+	  Refs: [ruby-core:37644] and [ruby-core:37647]
+
+	* thread_pthread.c: use rb_async_bug_errno().
+	  And replace all fprintf() to write().
+
+	* internal.h (rb_async_bug_errno): add decl. of above func.
+
+Tue Jun 28 23:46:08 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/tracer.rb: count only non-internal libraries in stack trace,
+	  ignoring custom_require.
+
+Tue Jun 28 21:44:58 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ruby-lex.rb: recognize '\char' in ruby statement.
+
+Tue Jun 28 20:39:29 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* lib/debug.rb (var_list): Command 'var *' did not work on 1.9(!).
+	  global_variables, local_variables, and instance_variables returns
+	  Symbols from 1.9 and need to stringify before evaling it.
+	  See #4931.
+
+Tue Jun 28 19:23:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c: Now, USE_TRAP_SIGMASK depend on HAVE_PTHREAD_SIGMASK.
+	  The code have already depended on pthread_sigmask since r27464.
+
+Tue Jun 28 15:09:21 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/benchmark.rb: merge eregon/benchmark.
+	  https://github.com/eregon/ruby/tree/benchmark
+	  patched by Benoit Daloze. [ruby-core:37593] [Bug #4940]
+
+	* lib/benchmark (Benchmark#bmbm): bmbm should be consistent with bm
+	  for the return value.
+
+	* test/benchmark: remove preemptive test instead of skipping
+	  I removed the preemptive test I wrote for Feature #4197.
+	  I'll add it back when the implementation will be able to satisfy it.
+
+	* lib/benchmark (Benchmark#bmbm): remove useless explicit call,
+	  #format is an alias of #to_s test/benchmark: add a test for
+	  format of long time.
+
+	* lib/benchmark: fix label width: always add 1 to ensure there is a
+	  space delimiter even with times over 100s
+	  When I asked for Feature #4197, I wanted to make delimiting spaces
+	  consistent for #bm and #bmbm.
+	  But with times over 100s, the output contains no space between the
+	  label and the first time (user).
+	  Now both ensure there is always a space, even if that means 3 spaces
+	  with times under 10s (because it is formatted as %10.6f)
+
+	* test/benchmark: let labels be a constant
+	  lib/benchmark (Benchmark#realtime): avoid creating an unused Proc
+	  lib/benchmark (Benchmark#benchmark): use ensure clause to restore
+	  STDOUT.sync, as in #bmbm
+
+Tue Jun 28 13:41:51 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (native_stop_timer_thread): fixed commit miss of
+	  r32244.  grep sources before changing the signature of a function.
+
+Tue Jun 28 11:49:14 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (consume_communication_pipe):
+	  Make "buff" as static.  (Maybe) "buff" can be shared between
+	  any caller (any threads) because no one use the read values.
+	  "buff" (1024 byte) on stack may cause stack overflow on
+	  several environment (we found a crash on FreeBSD).
+	  And remove const value "buff_size", and define CCP_READ_BUFF_SIZE
+	  macro.
+
+Tue Jun 28 11:45:30 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rake:  Update rake to fix some bugs and hide deprecated features
+	  from RDoc.
+	* lib/rake/version.rb:  Bump version to 0.9.2.1 to distinguish it from
+	  the released version.
+	* NEWS:  ditto
+
+Tue Jun 28 11:17:28 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc 3.7 (final)
+	* NEWS:  ditto
+
+Tue Jun 28 10:18:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c (rb_daemon): fix wrong #endif position.
+
+Tue Jun 28 07:50:32 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c (Init_Object):  Teach RDoc what Init_class_hierarchy does to
+	  hook up ri for BasicObject, Object, Module and Class.
+
+Tue Jun 28 05:03:32 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* thread.c (rb_thread_local_aref): RDoc fix. Thread#[] example
+	  had a race. See #4480.
+
+Tue Jun 28 01:22:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_log): move BigMath.log from
+	  bigdecimal/math.rb.
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb: ditto.
+
+	* test/bigdecimal/test_bigdecimal.rb: move test for BigMath.log from
+	  test/bigdecimal/test_bigmath.rb.
+
+	* test/bigdecimal/test_bigmath.rb: ditto.
+
+Tue Jun 28 01:19:52 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ruby-lex.rb: fix [Bug #4232].
+
+Tue Jun 28 00:14:13 2011  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: fix [Bug #4409]. add DRbServer#here?.
+
+	* test/drb/test_drb.rb: ditto.
+
+	* test/drb/drbtest.rb: ditto.
+
+	* test/drb/ut_eq.rb: ditto.
+
+Tue Jun 28 00:08:43 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/workspace.rb: fix BUG#4793.
+
+Mon Jun 27 22:06:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (consume_communication_pipe): don't use C99
+	  style variable length array.
+
+Mon Jun 27 22:04:27 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (consume_communication_pipe): change return
+	  type to void. caller doesn't use it.
+
+Mon Jun 27 21:29:50 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.h (rb_global_vm_lock_struct): add volatile to
+	  gvl->waiting. now thread_timer() access it w/o lock.
+
+Mon Jun 27 21:16:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c: s/__gvl_acquire/gvl_acquire_common/ and
+	  s/__gvl_release/gvl_release_common/.
+
+Mon Jun 27 11:41:47 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c (rb_thread_create_timer_thread):
+	  the type of return value of write(2) is ssize_t.
+
+Mon Jun 27 09:57:02 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (rb_thread_create_timer_thread):
+	  Fixes missing initialization of oflags.
+
+Mon Jun 27 09:07:42 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c: Stop polling in the timer thread when there are
+	  no waiting thread.  If there are 2 or more runnable threads,
+	  the timer thread does polling.  Avoid polling makes power save
+	  for several computers (0.2W per a Ruby process, when I measured).
+	  If outside-event such as signal or Thread#kill was occurred
+	  when the timer thread does not do polling, then wake-up
+	  the timer thread using communication-pipe (the timer thread
+	  waits this communication-pipe with select(2)).
+	  The discussion about this modification can be found from the post
+	  [ruby-core:33456] and other related posts.
+	  Note that Eric Wong and KOSAKI Motohiro give us the huge
+	  contributions for this modification.  Thanks.
+
+	* thread_pthread.c (rb_thread_wakeup_timer_thread): add a function.
+	  This function wakes up the timer thread using communication-pipe.
+
+	* thread.c (rb_thread_stop_timer_thread): add a parameter which
+	  specify closing communication-pipe or not.
+
+	* thread.c (rb_thread_terminate_all): do not stop timer thread here
+	  (ruby_cleanup() terminate timer thread).
+
+	* signal.c: wake up timer thread using
+	  rb_thread_wakeup_timer_thread() from signal handler.
+
+	* eval.c (ruby_cleanup): use rb_thread_stop_timer_thread(1).
+
+	* process.c: use rb_thread_stop_timer_thread(0)
+	  (reuse communication-pipe).
+
+	* thread_win32.c (rb_thread_wakeup_timer_thread): add a dummy
+	  function.
+
+	* vm_core.h: add and fix decl. of functions.
+
+Mon Jun 27 08:01:19 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c: should use ALLOCA_N.
+
+Mon Jun 27 01:34:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries
+	  start with + sign, which means NIS.  these are returned in the
+	  case that passwd and group entries in /etc/nsswitch.conf are set
+	  to use "nis" explicitly on Debian.  fixed #3683
+
+Mon Jun 27 00:44:53 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (rb_parser_end_seen_p): fix documentation about return
+	  value. patched by Sho Hashimoto. [Bug #4511]
+
+Mon Jun 27 00:40:47 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* hash.c (rb_hash_reject): add documentation that Hash#reject
+	  without block returns enumerator.
+	  patched by Michael Edgar [Bug #4847] [ruby-core:36800]
+
+Sun Jun 26 23:49:21 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/test_switch_hitter.rb: added a test.
+
+ Sun Jun 26 22:21:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: refactoring.
+
+Sun Jun 26 18:03:30 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* parse.y: comma at the end of line is no longer allowed.
+	  A patch from Yukihiro Matsumoto  <matz AT ruby-lang.org>.
+	  (fixed #3456).
+
+Sun Jun 26 13:35:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_dump.c (rb_vm_bugreport): change CrashReporter suggestion messages
+	  on Mac. It should be placed after "-- C level backtrace" line.
+	  Suggested by Endoh-san.
+
+	  <before>
+	  -- See Crash Report log file under ~/Library/Logs/CrashReporter or ---------
+	  -- /Library/Logs/CrashReporter, for the more detail of ---------------------
+	  -- C level backtrace information -------------------------------------------
+
+	<after>
+	  -- C level backtrace information -------------------------------------------
+
+	     See Crash Report log file under ~/Library/Logs/CrashReporter or
+	     /Library/Logs/CrashReporter, for the more detail of.
+
+Sun Jun 26 10:08:28 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/extconf.rb
+	* ext/openssl/ossl_missing.h/.c: add ASN1_put_eoc if missing.
+
+	* ext/openssl/ossl_asn1.c: introduce ossl_asn1_object_size and
+	  ossl_asn1_put_object to wrap functionality depending on OpenSSL
+	  version in use.
+	  Fixes	[ Ruby 1.9 - Bug #4916 ] reported by Hiroshi Nakamura.
+	  [ruby-core:37286]
+
+Sun Jun 26 01:00:15 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (date_strftime_internal): removed meaningless braces.
+	* ext/date/date_core.c (gengo): the value should be int.
+
+Sat Jun 25 23:45:30 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* vm_insnhelper.c (vm_search_superclass): avoid control frame
+	  stack overrun. currently super() in Proc created in a method
+	  defined by Module#define_method raise NoMethodError. [Bug #4881]
+	* test/ruby/test_method.rb t_super_in_proc_from_define_method):
+	  add test for it.
+
+Sat Jun 25 23:23:14 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* thread.c (sleep_forever): now Kernel#sleep don't wakeup by
+	  signal handler execution. [Bug #4072]
+
+Sat Jun 25 23:14:47 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* thread.c (rb_threadptr_check_signal): remove unnecessary th->status
+	  backup. fix race condition which may results unexpected main thread's
+	  status transition. see #4072
+
+Fri Jun 24 19:57:30 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* lib/webrick/httprequest.rb (setup_forwarded_info): Parsing request
+	  header failed when the request is from 2 or more Apache reverse
+	  proxies. It's said that all X-Forwarded-* headers will contain more
+	  than one (comma-separated) value if the original request already
+	  contained one of these headers.  Since we could use these values as
+	  Host header, we choose the initial(first) value. See #4922.
+
+	* test/webrick/test_httprequest.rb (test_forwarded): Test it.
+
+Fri Jun 24 17:06:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_daemon): should not start timer thread
+	  twice.  fixed Bug#4920.
+
+Fri Jun 24 15:54:14 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): Try to shutdown SSL
+	  connection more gracefully. Call SSL_shutdown() max 4 times until it
+	  returns 1 (success). Bi-directional SSL close has several states but
+	  SSL_shutdown() kicks only 1 transition per call. Max 4 is from
+	  mod_ssl.c of Apache httpd that says 'max 2x pending + 2x data = 4'.
+	  See #4237.
+
+Fri Jun 24 07:24:37 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rake/version.rb:  Fixed VERSION to work with tool/rbinstall.rb
+	* bin/rake:  Import bin/rake from 0.9.2
+	* tool/rbinstall.rb (install):  Rake::VERSION is now in
+	  lib/rake/version.rb.  Fixes `make install`
+
+Fri Jun 24 07:11:37 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rake: Import Rake 0.9.2
+
+Fri Jun 24 00:44:15 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (c_valid_{julian,gregorian}_p): fixed the range of month.
+
+Fri Jun 24 00:14:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: trivial changes on text.
+
+Thu Jun 23 22:46:57 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_x509name.c: Add X509::Name#hash_old as a wrapper
+	  for X509_NAME_hash_old in OpenSSL 1.0.0. See #4805
+
+	* test/openssl/test_x509name.rb (test_hash): Make test pass with
+	  OpenSSL 1.0.0.
+
+	* NEWS: Add it.
+
+Thu Jun 23 19:30:53 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_time): Check
+	  argument type with NUM2LONG if the arg is not a Time object.
+	  See #4919.
+
+	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_timeout): Check
+	  type with NUM2LONG. Time as an arg is not allowed. See #4919.
+
+	* test/openssl/test_ssl_session.rb (test_session_time,
+	  test_session_timeout): Test it.
+
+Wed Jun 23 13:30:30 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* signal.c(ruby_atomic_exchange): Fix definition style.
+
+Wed Jun 22 22:34:05 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_session_new_cb): Return 0 to
+	  OpenSSL from the callback for SSL_CTX_sess_set_get_cb().
+	  Returning 0 means to OpenSSL that the session is still valid
+	  (since we created Ruby Session object) and was not freed by us with
+	  SSL_SESSION_free(). Call SSLContext#remove_session(sess) in
+	  session_get_cb block if you don't want OpenSSL to cache the session
+	  internally.
+	  This potential issue was pointed by Ippei Obayashi. See #4416.
+
+	* test/openssl/test_ssl_session.rb (test_ctx_server_session_cb): Test
+	  it.
+
+Wed Jun 22 22:21:17 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_ssl_session.c: Respect T_BIGNUM time values. Patch by
+	  Tomoyuki Chikanaga.
+	  [ Ruby 1.9 - Bug #4919 ] [ruby-dev:43869]
+
+Wed Jun 22 21:29:25 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/socket/depend (SOCK_HEADERS): use $(top_srcdir) instead of
+	  $(topdir). sorry!
+
+Wed Jun 22 19:47:03 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* cont.c (cont_capture): add volatile.
+	  On clang -O, it is needed to avoid the optimization.
+	  With this and llvm/clang's recent fix, clang 3.0 can
+	  build ruby-trunk with -O option.
+
+	* cont.c (cont_capture): use for-loop.
+
+	* array.c (rb_ary_each): add volatile and use it.
+
+	* vm_insnhelper.c (vm_call_cfunc): ditto.
+
+Wed Jun 22 18:20:46 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_session_remove_cb):
+	  OpenSSL::SSL::SSLContext#session_remove_cb was broken. It wrongly
+	  tried to call the session_*new*_cb callback.
+
+	* test/openssl/test_ssl_session.rb (class OpenSSL): Test it.
+
+Wed Jun 22 17:37:49 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl.h: Introduced OSSL_BIO_reset macro for PEM/DER
+	  fallback scenarios.
+
+	* ext/openssl/ossl_pkey_dsa.c
+	* ext/openssl/ossl_x509req.c
+	* ext/openssl/ossl_pkey_rsa.c
+	* ext/openssl/ossl_pkey_ec.c
+	* ext/openssl/ossl_ssl_session.c
+	* ext/openssl/ossl_x509crl.c
+	* ext/openssl/ossl_pkey.c
+	* ext/openssl/ossl_pkey_dh.c
+	* ext/openssl/ossl_x509cert.c
+	* ext/openssl/ossl_pkcs7.c: Use OSSL_BIO_reset.
+
+	* ext/openssl/ossl_ssl.c
+	* ext/openssl/ossl_cipher.c
+	* ext/openssl/ossl_pkey_ec.c
+	* ext/openssl/ossl_pkcs12.c
+	* ext/openssl/ossl_ssl_session.c: Replace rb_raise occurrences by
+	  ossl_raise. This automatically flushes OpenSSL's error queue.
+
+	* ext/openssl/ossl_pkcs7.c: Raise error if DER fallback for parsing
+	  fails.
+
+	* test/openssl/test_pkey_ec.rb
+	* test/openssl/test_pkey_dsa.rb
+	* test/openssl/test_pkey_rsa.rb: Add assertions that OpenSSL.errors is
+	  empty.
+
+	* test/openssl/test_pkey_rsa.rb: Remove initial OpenSSL.errors call in
+	  test_new.
+	  [ Ruby 1.9 - Bug #4885 ] [ruby-core:37134]
+
+Wed Jun 22 15:01:24 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_ssl.c: Use SSL_MODE_RELEASE_BUFFERS if available.
+	  Thanks, Eric Wong, for providing the patch.
+	  [ Ruby 1.9 - Feature #4672 ] [ruby-core:36127]
+
+Wed Jun 22 14:47:53 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_buffering.rb
+	* test/openssl/test_pkcs12.rb: Inherit from Test::Unit::TestCase
+	  instead of MiniTest::Unit::TestCase. [ruby-core:37275]
+
+Wed Jun 22 12:41:03 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der):
+	  OpenSSL::SSL::Session#to_der was broken. Fix buffer handling.
+
+	* test/openssl/test_ssl_session.rb (test_session): Test it.
+
+Wed Jun 22 12:38:52 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* test/openssl/test_ssl_session.rb: Split out SSL::Session related
+	  tests from test_ssl.rb
+
+Wed Jun 22 03:20:52 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: Fix cyclic references of
+	  objects.  Thanks to CvX for reporting the bug and a test case.
+	* test/psych/test_object.rb: test for cyclic object references.
+
+Wed Jun 22 02:39:54 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP.post_form): Do not ignore query part of
+	  the given URI to post. See #655.
+
+	* test/net/http/test_http.rb, test/net/http/utils.rb: Test it.
+
+Wed Jun 22 01:28:13 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* test/openssl/test_x509store.rb (test_set_errors): Redhat is
+	  distributing a patched version of OpenSSL that allows multiple CRL
+	  for a key (multi-crl.patch.) Make test pass on such env. See #4122,
+	  #4554.
+
+Tue Jun 21 21:50:37 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* lib/webrick/httpresponse.rb (HTTPResponse#setup_header): Close
+	  HTTP/1.1 connection when returning an IO object as response body
+	  without setting HTTPResponse#chunked to true. See #855 no.1.
+
+	* test/webrick/test_httpserver.rb: Test it.
+
+Tue Jun 21 21:27:34 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* internal.h: move rb_thread_io_blocking_region() declaration
+	  from intern.h to internal.h. It's still experimental API and
+	  need more discussion. [ruby-dev:43698]
+	* include/ruby/intern.h: ditto.
+
+	* ext/socket/rubysocket.h: include internal.h.
+	* ext/socket/depend: add internal.h dependency.
+	* ext/socket/extconf.rb: add $INCFLAGS to topdir.
+
+Tue Jun 21 20:38:47 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (datetime_s_*): canonicalize 24 o'clock.
+
+Tue Jun 21 19:46:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_thread.rb (TestThread#test_priority): enable
+	  this test again. Current GVL respect thread priority rather
+	  than past.
+
+Tue Jun 21 13:25:35 2011  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/readline.c (readline_getc): applied a patch in
+	  #3827 by by Akio Tajima <artonx AT yahoo.co.jp>. (see #3827)
+
+Tue Jun 21 13:16:31 2011  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/extconf.rb: fixed bug, specify --disable-libedit
+	  then disable libedit, does not specify then check readline and
+	  libedit if failed checking readline. (fixes #3375)
+
+Mon Jun 20 22:52:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (before_exec): use sig_do_nothing instead of SIG_DFL
+	  for avoiding a race.
+	* process.c (sig_do_nothing): new function.
+
+Mon Jun 20 21:31:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (thread_timer): rename timeout_10ms to
+	  time_quantum. it's no longer 10ms.
+
+Mon Jun 20 18:46:02 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_cipher.c, ext/openssl/lib/openssl/cipher.rb:
+	  Documentation fix by Ippei Obayashi. See #4419.
+
+Mon Jun 20 15:41:33 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* lib/webrick/cookie.rb (WEBrick::Cookie.parse): Revert r31228.
+	  r31228 was for allowing the 'Cookie:' header which did not have no
+	  SP after ';' for separating cookie-pairs but RFC6265 requires single
+	  SP after ';' there.  We allow multiple SPs here for compatibility
+	  with older WEBrick version.
+
+	* test/webrick/test_cookie.rb: Test it.
+
+Sun Jun 19 13:31:26 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* NEWS: Introduce --hide-skip on test/unit.
+
+Sun Jun 19 10:05:16 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit/parallel.rb: Override Test::Unit::TestCase#on_parallel_worker?
+	  only when $0 == __FILE__.
+
+	* lib/test/unit/parallel.rb: Run Test::Unit::Worker.run only when
+	  $0 == __FILE__.
+
+Sat Jun 18 23:59:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (fill_cbuf): finish reading at EOF, and the readconv has
+	  been cleared by another thread while io_fillbuf() is waiting at
+	  select().  a patch in [ruby-core:37197] by Hiroshi Shirosaki
+	  <h.shirosaki AT gmail.com>.  fixed #3840
+
+Sat Jun 18 21:36:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c: remove GVL_DEBUG
+
+Sat Jun 18 21:32:02 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm.c, vm_core.h (rb_vm_stack_to_heap): remove const.
+	  It makes compilations warnings.
+
+Sat Jun 18 18:54:15 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, vm_core.h (rb_vm_stack_to_heap): fix "const" place.
+
+Sat Jun 18 17:23:38 2011  Tanaka Akira  <akr@fsij.org>
+
+	* eval.c, hash.c, load.c, proc.c, range.c, thread.c, time.c: don't
+	  declare internal functions.
+
+	* internal.h, vm_core.h: declare internal functions.
+
+	* array.c: include internal.h.
+
+	* common.mk: update dependency for array.o.
+
+Sat Jun 18 13:39:33 2011  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h: declarations declared in include/ruby/*.h removed.
+
+Sat Jun 18 12:42:17 2011  Tanaka Akira  <akr@fsij.org>
+
+	* method.h, internal.h iseq.h: declare internal functions.
+
+	* compile.c, eval.c, iseq.c, object.c, parse.y, proc.c, process.c,
+	  thread.c, vm.c, vm_eval.c, vm_insnhelper.c, vm_method.c: don't
+	  declare internal functions.
+
+	  Note that rb_method_entry_eq() is defined in vm_method.c but
+	  there was a declaration in proc.c with different const-ness.
+	  Now it is declared in method.h with same const-ness to the
+	  definition.
+
+	* object.c (rb_mod_module_exec): don't declare functions declared in
+	  include/ruby/intern.h.
+
+Sat Jun 18 12:05:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/backward/classext.h: for evil gems.  fixed #4803
+
+Sat Jun 18 11:12:13 2011  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: update dependencies.
+
+Sat Jun 18 11:09:03 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: suppress warnings.
+
+Sat Jun 18 10:22:39 2011  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h: declare more internal functions.
+
+	* iseq.h (rb_method_get_iseq): declared.
+
+	* compile.c, eval.c, eval_error.c, iseq.c, parse.y, proc.c, range.c,
+	  ruby.c, time.c, util.c, vm.c: don't declare internal functions.
+
+	* eval.c, parse.y, thread_pthread.c: non-existing function declarations
+	  removed.
+
+Sat Jun 18 08:12:54 2011  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: dependencies updated.
+
+	* tool/update-deps: new file to assist update dependencies in
+	  common.mk.
+
+Sat Jun 18 07:27:27 2011  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h: declare internal functions here.
+
+	* node.h: declare NODE dependent internal functions here.
+
+	* iseq.h: declare rb_iseq_t dependent internal functions here.
+
+	* vm_core.h: declare rb_thread_t dependent internal functions here.
+
+	* bignum.c, class.c, compile.c, complex.c, cont.c, dir.c, encoding.c,
+	  enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c, io.c,
+	  iseq.c, load.c, marshal.c, math.c, numeric.c, object.c, parse.y,
+	  proc.c, process.c, range.c, rational.c, re.c, ruby.c, string.c,
+	  thread.c, time.c, transcode.c, variable.c, vm.c,
+	  tool/compile_prelude.rb: don't declare internal functions declared
+	  in above headers.  include above headers if required.
+
+	  Note that rb_thread_mark() was declared as
+	  void rb_thread_mark(rb_thread_t *th) in cont.c but defined as
+	  void rb_thread_mark(void *ptr) in vm.c.  Now it is declared as
+	  the later in internal.h.
+
+Sat Jun 18 02:36:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VpNewRbClass): fix type of the 2nd
+	  argument.
+
+	* ext/bigdecimal/bigdecimal.h: ditto.
+
+Sat Jun 18 02:30:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): move BigMath.exp from
+	  bigdecimal/math.rb.
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb: ditto.
+
+	* test/bigdecimal/test_bigdecimal.rb: move test for BigMath.exp from
+	  test/bigdecimal/test_bigmath.rb.
+
+	* test/bigdecimal/test_bigmath.rb: ditto.
+
+Sat Jun 18 00:20:54 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: do not define wnum[01].
+
+Fri Jun 17 18:57:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): fix return value of obj[a,*b]=c.
+
+Fri Jun 17 13:09:45 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/curses/curses.c:  Clean up documentation.
+
+Fri Jun 17 09:25:14 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/curses/curses.c:  Document curses constants.  Patch by Vincent
+	  Batts.  [Ruby 1.9 - Bug #4880]
+
+Fri Jun 17 09:11:05 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c:  Document Module#method_added and #method_removed.
+	  Patch by Bryce Kerley.  [Ruby 1.9 - Feature #4867]
+
+Fri Jun 17 08:50:16 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* io.c:  Improve documentation of IO and File open and new.
+	  Patch by Roger Pack.  [Ruby 1.9 - Bug #4790]
+
+Fri Jun 17 07:53:50 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/csv.rb:  Document #raw_encoding.  Patch by David Czarnecki.
+	  [Ruby 1.9 - Bug #4874]
+
+Fri Jun 17 07:46:50 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/benchmark.rb:  Document Benchmark::Tms#memberwise.  Patch by
+	  David Czarnecki.  [Ruby 1.9 - Bug #4873]
+
+Fri Jun 17 07:38:31 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/prettyprint.rb:  Improve documentation.  Patch by Ysiad
+	  Ferreiras.  [#4834]
+
+Fri Jun 17 07:23:03 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* array.c (rb_ary_drop):  Improve documentation.  Patch by Caley Woods.
+	  [Ruby 1.9 - Bug #4858]
+
+Fri Jun 17 06:11:31 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick/log.rb:  Improve documentation of BasicLog and Log.
+	  Patch by Olivier Brisse.  [Ruby 1.9 - Bug #4833]
+	* lib/webrick/httpstatus.rb:  Improve documentation of
+	  WEBrick::HTTPStatus.  Patch by Olivier Brisse.
+	  [Ruby 1.9 - Bug #4833]
+
+Fri Jun 17 04:48:22 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c, thread_pthread.h: remove unused variables.
+	  (native_thread_data_t::gvl_cond, native_thread_data_t::gvl_next)
+
+Thu Jun 16 14:32:31 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (rb_time_new): prevent overflow by "* 1000".
+
+Fri Jun 17 03:07:36 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm4_thread_create_join.rb,
+	  benchmark/bm_vm4_thread_mutex[1-3].rb: renamed to
+	  bm_thread_* (fix last rename).
+
+Fri Jun 17 02:26:47 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (native_thread_create): fix debug message.
+	  (add last newline)
+
+Thu Jun 16 23:40:49 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_schedule_rec): fix {UN,}LIKELY macro misuse.
+	* gc.c (rb_newobj): ditto.
+	* vm_insnhelper.c (vm_method_search): ditto.
+
+Thu Jun 16 20:06:15 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/testunit/test_parallel.rb: Fix Regexp for test.
+
+	* test/testunit/tests_for_parallel/test_third.rb: Use
+	  Test::Unit::TestCase#on_parallel_worker? for detecting worker.
+
+	* lib/test/unit/testcase.rb(Test::Unit::TestCase#on_parallel_worker?):
+	  New Method Test::Unit::TestCase#on_parallel_worker? returns true
+	  when a testcase is running on parallel worker.
+	* lib/test/unit/parallel.rb(Test::Unit::TestCase#on_parallel_worker?):
+	  ditto.
+
+Thu Jun 16 19:27:12 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* test/test_securerandom.rb: Add testcase.  This testcase does NOT aim
+	  to test cryptographically strongness and randomness.  It includes
+	  the test for PID recycle issue of OpenSSL described in #4579 but
+	  it's disabled by default.
+
+Thu Jun 16 17:55:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_io.rb (TestIO#test_copy_stream_socket): fix
+	  test hanging up issue. Patch by CHIKANAGA Tomoyuki.
+
+Thu Jun 16 15:17:39 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* variable.c (const_missing):  Add simple example of const_missing.
+	  Patch by Anuj Dutta.  [Ruby 1.9 - Bug #4794]
+
+Thu Jun 16 15:09:29 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/monitor.rb:  Improve documentation.  Patch by Sandor Szucs.
+	  [Ruby 1.9 - Bug #4823]
+
+Thu Jun 16 14:54:09 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick/utils.rb: Document WEBrick::Utils.  Patch by Olivier
+	  Brisse.  [Ruby 1.9 - Bug #4819]
+
+Thu Jun 16 14:26:46 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick/httpservlet/erbhandler.rb:  Allow the ERB document to
+	  alter the content-type of the response.  [Ruby 1.9 - Bug #4685]
+
+Thu Jun 16 14:15:47 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/timeout.rb: Clarify timeout duration types.  Patch by Alf Mikula.
+	  [Ruby 1.9 - Bug #4791]
+	* lib/net/http.rb: ditto
+
+Thu Jun 16 13:25:25 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc*:  Import RDoc 3.7 release candidate
+
+Thu Jun 16 11:35:09 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (search_response): parses SEARCH responses from
+	  the Yahoo IMAP server correctly.  patched by Mark Nadig.  [Bug #4509]
+
+Thu Jun 16 09:12:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* fix for build on solaris 10.
+
+Thu Jun 16 09:08:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/io/console/test_io_console.rb (TestIO_Console#test_sync):
+	  fix for daemon process.
+
+Thu Jun 16 07:58:01 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/testunit/test_parallel.rb(test_ignore_tzero): Test for r32109.
+
+	* test/testunit/tests_for_parallel/test_third.rb: Use another way to
+	  detect that test is running on worker. This fixes sometimes
+	  TestParallel failing.
+
+Thu Jun 16 07:20:06 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb(Test::Unit::Runner#_run_parallel): Ignore -j0
+	  because it makes blocking forever by IO.select.
+
+Thu Jun 16 03:08:11 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/testunit/test_parallel.rb (TestParallel::TestParallelWorker#
+	  setup): now can run on Windows, probably.
+
+	* test/testunit/test_parallel.rb (TestParallel::TestParallel#setup):
+	  ditto.
+
+Thu Jun 16 03:00:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (do_select): Windows: no need to poll if select(2) is
+	  cancelable.
+
+	* thread_win32.c (native_fd_select): new function to make select(2)
+	  cancelable.
+
+	* thread_win32.c (rb_w32_check_interrupt): new function for checking
+	  interrupt.
+
+	* win32/win32.c (rb_w32_select_with_thread): new function. cancelable
+	  select(2).
+
+	* win32/win32.c (rb_w32_select): use above function internally.
+
+Wed Jun 15 23:30:45 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* gc.c: fix a regression by r31690 on AIX because AIX malloc
+	  return NULL if it's passed 0. But some caller don't expect it.
+	  patch by Yutaka Kanemoto. [ruby-dev:43779]
+	(vm_malloc_prepare): return calculated size.
+	(vm_xmalloc): use above result.
+	(vm_xcalloc): ditto.
+
+Wed Jun 15 23:11:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c: remove BLOCKING_REGION_CORE() macro. It's no longer used
+	  since r32022.
+
+Wed Jun 15 21:00:47 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_config.rb: execute based on the existence of the
+	  OpenSSL module.
+
+Wed Jun 15 12:35:11 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io.rb (test_copy_stream_socket): wait a child process
+	  before SIGUSR1 handler is removed.
+
+	* test/pathname/test_pathname.rb (define_assertion): use line number
+	  for test method names.
+
+Wed Jun 15 10:37:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (rb_stat_rdev): use DEVT2NUM.
+
+	* file.c (rb_stat_rdev_major): ditto.
+
+	* file.c (rb_stat_rdev_minor): ditto.
+
+Wed Jun 15 05:12:59 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c (lib_eventloop_core): revert the last change (it's
+	  the part for ruby_1_8), and use rb_thread_check_ints() when RUBY_VM
+	  is defined.
+
+Wed Jun 15 04:42:47 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm3_thread_*.rb: renamed bm_vm3_thread_*.rb to
+	  benchmark/bm_vm_thread_*.rb.
+
+Wed Jun 15 04:28:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* benchmark/bm_vm4_thread_pass.rb: rename bm_vm4* to
+	  bm_vm_thread_*. suggested by ko1.
+	* benchmark/bm_vm4_pipe.rb: ditto.
+	* benchmark/bm_vm4_alive_check1.rb: ditto.
+	* benchmark/bm_vm4_pass_flood.rb: ditto.
+
+Wed Jun 15 03:52:50 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* benchmark/bm_vm4_pass_flood.rb: new benchmark for GVL fairness.
+	* benchmark/bm_vm4_alive_check1.rb: ditto.
+
+Wed Jun 15 01:27:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (gvl_yield): fix live lock issue on 1-2 cpus
+	  system. It's additional fix for r32021.
+	* thread_pthread.c (gvl_init): add switch_wait_cond.
+	* thread_pthread.h (typedef struct rb_global_vm_lock_struct): ditto.
+
+Tue Jun 14 23:16:22 2011  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (show_progress): refine verbose mode.
+	  (exec_test): ditto.
+
+Tue Jun 14 23:02:36 2011  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb (show_progress): extracted from assert_check.
+	  (assert_check): use show_progress.
+	  (assert_normal_exit): ditto.
+	  (assert_finish): ditto.
+	  (flunk): ditto.
+
+Tue Jun 14 22:51:42 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/test_*.rb: added tests.
+
+Tue Jun 14 22:09:58 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: renamed some functions.
+	* ext/date/date_core.c: modified doc.
+
+Tue Jun 14 21:26:01 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* cont.c (cont_save_thread): add new utility function.
+	  rb_context_t::saved_thread.machine_stack_start and
+	  machine_stack_end should be cleared immediately after a snapshot of
+	  current thread is stored to saved_thread. [ruby-dev:43680] [Bug #4855]
+	  this change aims to get rid of unnecessary GC mark at machine stack.
+
+Tue Jun 14 19:50:49 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_autoload.rb: remove temporary directory.
+
+Tue Jun 14 11:05:03 2011  Narihiro Nakamura  <narihiro@netlab.jp>
+
+	* gc.c (rb_gc_set_params): call initial_expand_heap if
+	  initial_heap_min_slots is set.
+
+Tue Jun 14 11:02:08 2011  Narihiro Nakamura  <narihiro@netlab.jp>
+
+	* gc.c: use size_t.
+
+Tue Jun 14 01:10:38 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/coverage/test_coverage.rb: add a test for restart.  a patch
+	  from Xavier Shay.  [ruby-core:36745]
+
+Tue Jun 14 01:05:10 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/coverage/coverage.c: make it restartable.  [ruby-core:36539]
+
+Mon Jun 13 23:55:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_schedule_rec): call gvl_yield() unconditionally.
+	* thread_pthread.c: remove HAVE_GVL_YIELD macro.
+	* thread_win32.c (gvl_yield): new. this fallback logic was moved from
+	  rb_thread_schedule_rec().
+
+Mon Jun 13 23:50:25 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/io/console/console.c (console_dev): typo.
+
+Mon Jun 13 23:38:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_parse_string): flush delayed token.  based on a
+	  patch by Masaya Tarui in [ruby-dev:43762].  Bug #4544
+
+	* parse.y (yylex): revert r24557.  delayed token at the end of
+	  string should be flushed already by the above change.
+
+Mon Jun 13 23:33:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (console_dev): console should be
+	  unbuffered.
+
+	* ext/io/console/console.c (console_dev): take care of no-ctty
+	  case.
+
+Mon Jun 13 23:06:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c: rewrite GVL completely. This fix improve some
+	  benchmark dramatically (e.g. vm3_thread_mutex result changed
+	  form 120.601sec to 3.426sec).
+	* thread_win32.c: ditto.
+	* thread_pthread.h: ditto.
+	* vm_core.h: ditto.
+	* thread.c: ditto.
+
+Mon Jun 13 23:11:52 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_unix.rb: don't use Thread.abort_on_exception.
+
+Mon Jun 13 23:05:01 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/unixsocket.c (unix_send_io): race condition fixed.
+	  (unix_recv_io): ditto.
+	  fixed by Eric Wong.  [ruby-core:35574]
+
+	* test/socket/test_unix.rb: test added for above problem.
+
+Mon Jun 13 21:41:05 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_win32.c (native_cond_signal): remove unnecessary rb_bug().
+	  It's additional fix for r32021. [Bug #4696]
+
+Mon Jun 13 20:50:49 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_ec.rb
+	  test/openssl/test_pkey_ec.rb: merge both files into test_pkey_ec.rb.
+	  Removed redundant group instantiation from PKey tests.
+	* test/openssl/utils.rb: only create TEST_PKEY_EC_P256V1 if EC is
+	  defined.
+
+Mon Jun 13 20:28:24 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/digest.rb: remove MDC2 from test, it is not available
+	  by default in an OpenSSL installation.
+
+Mon Jun 13 20:18:55 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h, vm_insnhelper.h: move decl. of
+	  ruby_vm_global_state_version and related macros
+	  from vm_core.h to vm_insnhelper.h.
+
+	* vm.c (vm_clear_all_cache): added.  This function is called
+	  when ruby_vm_global_state_version overflows.
+	  TODO: vm_clear_all_inline_method_cache() is only place holder.
+	        We need to implement it ASAP.
+
+	* vm_method.c (vm_clear_global_method_cache): added.
+
+Mon Jun 13 19:46:21 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/cmath.rb: add new method Object#real?. fix #3137
+
+Mon Jun 13 18:52:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (is_kind_of_BigDecimal): new function to
+	  examine the whether the object is kind of BigDecimal.
+
+Mon Jun 13 18:49:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimalCmp): use GetVpValueWithPrec
+	  for Float and Rational arguments.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_new, test_cmp, test_power):
+	  add and modify tests for the above change.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimalCmp): modify coding style to
+	  match ruby's standard.
+
+Mon Jun 13 18:33:04 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb (SecureRandom.random_bytes): modify PRNG state
+	  to prevent random number sequence repetition at forked child
+	  process which has same pid.
+	  reported by Eric Wong.  [ruby-core:35765]
+
+Mon Jun 13 17:02:34 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP#use_ssl?): require 'openssl' only when
+	  https is needed. fixes r31933.
+
+Mon Jun 13 14:35:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* lib/cmath.rb (CMath.cbrt): returns the principal value of the cube
+	  root of the argument.  fix #3676
+
+	* test/test_cmath.rb (test_cbrt_returns_principal_value_of_cube_root):
+	  test for the above change.
+
+Mon Jun 13 14:17:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* lib/test/unit.rb (Test::Unit::GlobOption#non_options): fix typo.
+
+Mon Jun 13 13:04:20 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_digest.c: fix error for digests that have no oid
+	(e.g. DSS1).
+	* test/openssl/test_digest.c: add tests for this.
+
+Mon Jun 13 12:51:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/yaml.rb: load psych only when syck is not loaded.
+
+Mon Jun 13 12:23:39 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+Mon Jun 13 12:23:39 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/psych/lib/psych/deprecated.rb (Object#to_yaml_properties):
+	  undef to_yaml_properties before redefine it.
+
+	* ext/syck/lib/syck/rubytypes.rb: ditto.
+
+Mon Jun 13 11:30:10 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_digest.c: allow Digests to be created by sn, ln or
+	  oid.
+	* test/openssl/test_digest.rb: add tests for this.
+	  [Ruby 1.9 - Feature #4412] [ruby-core:35319]
+
+Mon Jun 13 10:54:03 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/pkey_dh.c: corrected documentation.
+	* test/openssl/utils.rb: add test key for DH.
+	* test/openssl/test_pkey_dh.rb: add tests.
+
+Mon Jun 13 10:13:08 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/pkey_dh.c: clarify difference between DH#public_key and
+	DH#pub_key in documentation.
+
+Mon Jun 13 05:50:43 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* NEWS: introduce PKey.read.
+
+Mon Jun 13 05:17:29 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_pkey.c: added PKey.read module function that allows
+	  reading arbitrary public/private keys from DER-/PEM-encoded File or
+	  string instances.
+	* ext/openssl/ossl_pkey_dh.c: improved documentation.
+	* test/openssl/utils.rb: added EC test key.
+	* test/openssl/test_pkey_rsa.rb
+	  test/openssl/test_pkey_dsa.rb: Test PKey.read. Reuse keys from
+	  OpenSSL::TestUtils.
+	* test/openssl/test_pkey_ec.rb: Created test file for EC tests.
+	  Test PKey.read.
+	  [Ruby 1.9 - Feature #4424] [ruby-core:35330]
+
+Mon Jun 13 04:42:24 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c (total_i): fix to skip no ruby objects.
+
+Mon Jun 13 03:07:38 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/benchmark/test_benchmark.rb (capture_output):
+	  replace '-' as space. On NetBSD, subtract between two Process.times
+	  after and before the short process may return negative value like:
+	  t0=Process.times; yield; t1=Process.times; p t1.utime-t0.utime
+
+Mon Jun 13 02:40:23 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_pkey_dsa.rb: Test for DSA#syssign/sysverify.
+
+Mon Jun 13 01:59:19 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_pkey_dh.c: completed documentation.
+	* ext/openssl/ossl_pkey_dsa.c: corrected examples. Improved parameter
+	  sections.
+
+Mon Jun 13 00:25:10 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_pkey_dsa.c: completed documentation.
+
+Sun Jun 12 23:36:46 2011  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (kill_sub_thread): remove the method. [ruby-core:34185]
+
+Sun Jun 12 21:01:56 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (d_lite_marshal_load): should give converted value.
+
+Sun Jun 12 20:36:30 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: edited doc.
+
+Sun Jun 12 18:12:07 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm3_clearmethodcache.rb: added.
+
+Sun Jun 12 17:40:29 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_method.c (rb_clear_cache*): update only vm state version.
+
+	* vm_method.c (rb_method_entry_get_without_cache, rb_method_entry):
+	  Fill method cache entry with vm state version, and
+	  check current vm state version for method (cache) look up.
+	  This modification speed-up invalidating of global method cache table.
+	  [Ruby 1.9 - Feature #3905] [ruby-core:36908]
+
+Sun Jun 12 16:19:48 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: fail on Mac OS X. [Bug #4853][ruby-dev:43655]
+
+Sun Jun 12 15:56:08 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c: remove th->transition_for_lock. It's thread unsafe.
+	  [Bug #4723][ruby-dev:43563]
+
+Sun Jun 12 15:47:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c: introduce spurious wakeup safe deadlock check.
+	  [Bug #4696][ruby-dev:43554]
+
+Sun Jun 12 13:33:52 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm3_thread_mutex.rb: remove it.
+
+	* benchmark/bm_vm3_thread_mutex[1-3].rb: added 3 benchmarks.
+	    1: one thread with one mutex (no contention).
+	    2: two threads with one mutex (contention).
+	    3: 1000 threads with one mutex (huge number of contention)
+	  Above removed benchmark was type 3.
+	  Therefore, this commit adds type 1 and 2 benchmark.
+
+Sun Jun 12 11:16:59 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: use select() appropriately for sendfile().
+	  Fixed by Eric Wong.  [ruby-core:36150]
+	  (maygvl_copy_stream_wait_readwrite): removed.
+	  (nogvl_copy_stream_sendfile): use nogvl_copy_stream_wait_write and
+	  maygvl_copy_stream_wait_read instead of
+	  maygvl_copy_stream_wait_readwrite.
+
+Sun Jun 12 09:32:13 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* atomic.h (ATOMIC_OR): _InterlockedOr is not available on mingw.h
+	* gc.c (rb_gc_set_params): VM_OBJSPACE is disabled on mingw.
+
+Sun Jun 12 01:07:09 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: edited doc.
+
+Sat Jun 11 23:18:00 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_core.h (RUBY_VM_SET_TIMER_INTERRUPT, RUBY_VM_SET_INTERRUPT,
+	  RUBY_VM_SET_FINALIZER_INTERRUPT): use atomic ops for preventing
+	  interrupt_flag bit lost. [Bug #4770][ruby-dev:43467]
+	* thread.c (rb_threadptr_execute_interrupts_rec): ditto.
+	* vm_core.h (typedef struct rb_thread_struct): change type of
+	  interrupt_flag to rb_atomic_t.
+	* atomic.h: move atomic ops definition from signal.c.
+	* signal.c: remove atomic ops definition.
+	* common.mk (gc, signal, thread, cont): add to dependency to atomic.h.
+
+Sat Jun 11 23:23:52 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: edited doc.
+
+Sat Jun 11 23:02:36 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/buffering.rb (module OpenSSL):
+	  Buffering#each_byte should return String in accordance with IO in
+	  1.9.
+
+	* test/openssl/test_buffering.rb (class OpenSSL): add tests for getc
+	  and each_byte.
+
+Sat Jun 11 22:41:37 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* time.c: a correction of doc for strftime (%v).
+
+Sat Jun 11 22:30:53 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: replaced doc for strftime based on Time's one.
+
+Sat Jun 11 22:07:56 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (datetime_s_{iso8601,rfc3339,xmlschema,rfc2822,httpdate}):
+	  do not take argument comp.
+
+Sat Jun 11 21:58:31 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: added examples.
+
+Sat Jun 11 19:40:45 2011  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: expand heap if initial_heap_min_slots is bigger than
+	  HEAP_MIN_SLOTS.
+
+Sat Jun 11 19:42:50 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ChangeLog (vim): set shiftwidth to 2.
+
+Sat Jun 11 19:27:06 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_x509req.c: raise RequestError instead of
+	  CertificateError when Request#to_der gets an error from OpenSSL.
+	  Patch from Ippei Obayashi, see #4420. I cannot write a test for
+	  this... Request does not allow to create broken bytes...
+
+Sat Jun 11 19:34:51 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (Date::(ABBR_)?(MONTH|DAY)NAMES): should be usascii.
+
+Sat Jun 11 19:24:33 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: rewrote doc.
+
+Sat Jun 11 19:04:15 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::GlobOption#non_options): should run
+	  with 1.8.
+
+Sat Jun 11 18:05:57 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* bootstraptest/runner.rb: should initialize $stress to avoid warnings.
+
+Sat Jun 11 18:02:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_getc): should be 7bit if ascii.  fixes #4557
+
+Sat Jun 11 16:52:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (rb_enc_uint_chr): fix message format. Bug#4869
+
+Sat Jun 11 16:28:25 2011  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/formatters/pretty.rb
+	  (REXML::Formatters::Pretty#write_text),
+	  test/rexml/test_core.rb
+	  (Tester#test_pretty_format_long_text_finite): don't ignore
+	  'width' parameter in pretty formatter. fixes #4498
+	  Reported by Michael Frasca. Thanks!!!
+
+Sat Jun 11 16:11:36 2011  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_core.rb
+	  (Tester#test_pretty_format_long_text_finite): remove needless
+	  assert_nothing_raised.
+
+Sat Jun 11 16:04:03 2011  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/xpathparser.rb
+	  (REXML::Parsers::XPathParser#parse),
+	  test/rexml/test_elements.rb
+	  (ElementsTester#test_each_with_frozen_condition):
+	  don't modify original XPath. fixes #4161
+	  Reported by Pavel Shved. Thanks!!!
+
+Sat Jun 11 15:53:27 2011  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_elements.rb (ElementsTester): remove needless
+	  prefix from test name.
+
+Sat Jun 11 15:36:36 2011  Martin Duerst  <duerst@it.aoyama.ac.jp>
+	* common.mk: fixed a grammatical error
+
+Sat Jun 11 14:20:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm.c (thread_memsize): don't ignore size of th->local_storage.
+
+Sat Jun 11 10:32:46 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: should quote arch_hdrdir and libpath for the case
+	  installed prefix contains spaces.
+
+Sat Jun 11 10:20:52 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (native_cond_timeout): wrap conditionally used
+	  label.
+
+	* thread_pthread.c (native_sleep): remove unused variable.
+
+Sat Jun 11 10:15:50 2011  Tanaka Akira  <akr@fsij.org>
+
+	* thread.c (rb_thread_execute_interrupts): use GetThreadPtr to extract
+	  rb_thread_t from VALUE.
+	  reported by Motohiro KOSAKI.  [ruby-dev:43700]
+
+Sat Jun 11 10:00:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_process_options): add missing return type.
+
+Fri Jun 10 23:18:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/tk/tcltklib.c (lib_eventloop_core): replace CHECK_INTS with
+	  rb_thread_check_ints(). Because current code can't be compiled.
+
+Fri Jun 10 16:38:13 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_locale_charmap): When ruby process is run as Windows
+	  Service the console codepage is not set, GetConsoleCP returns 0.
+	  So on such environment, use GetACP().
+	  http://blogs.msdn.com/b/michkap/archive/2005/02/08/369197.aspx
+	  patched by Rafal Bigaj [ruby-core:36832] [Bug #4854]
+
+Fri Jun 10 14:34:24 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: restore TESTRUN_SCRIPT to "$(srcdir)/test.rb".
+	  TESTRUN_SCRIPT is used by "make run", "make gdb" and so on.
+
+Fri Jun 10 13:01:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_module.rb (TestModule#remove_rake_mixins): remove all
+	  module related to Rake.
+
+Fri Jun 10 09:52:38 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* encoding.c:  Mention that Encoding.compatible? can work with more
+	  than just Strings.
+
+Fri Jun 10 02:25:53 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: updating version to match released gem.
+
+Fri Jun 10 01:06:29 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/bigdecimal (BigDecimal_to_i): Integer#** may return flonum.
+
+Fri Jun 10 00:35:12 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (string_to_c_internal): uses rb_reg_nth_match;
+	* rational.c (string_to_r_internal): ditto.
+
+Fri Jun 10 00:25:03 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* gc.c: remove an unused declaration.
+
+Fri Jun 10 00:24:04 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (string_to_r): Rational#** may return flonum.
+
+Thu Jun  9 23:57:53 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: fix IO.copy_stream interrupt handling.
+	  based on the patch by Eric Wong.  [ruby-core:36156]
+
+	* vm_core.h (rb_thread_call_with_gvl): don't declare here.
+
+	* thread.c: include internal.h.
+	  (rb_thread_execute_interrupts): new function.
+
+	* internal.h (rb_thread_execute_interrupts): declared.
+	  (rb_thread_call_with_gvl): declared.
+
+Thu Jun  9 23:34:01 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* gc.c (rb_objspace_call_finalizer): use rb_typeddata_is_kind_of() for
+	  type check to get rid of a double free when main Thread has singleton
+	  class. [ruby-core:36741] [Bug #4828]
+	* thread.c (rb_obj_is_mutex): add a new utility function.
+	* vm.c (rb_obj_is_thread): ditto.
+
+Thu Jun  9 22:53:49 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/ruby/test_thread.rb (TestThread#test_kill_thread_subclass):
+	  add test for Thread.kill with Thread subclass instance.
+
+Thu Jun  9 22:31:47 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/ruby/test_thread.rb (TestThread#test_kill_wrong_argument):
+	  test for [ruby-core:35086].
+	  partially forward porting r31402 from ruby_1_9_2 branch.
+
+Thu Jun  9 18:36:00 2011  Kenta Murata <mrkn@mrkn.jp>
+
+	* string.c: Fix the ambiguous description of the behavior of
+	  rb_str_aref_m with a range.  It returns nil when the beginning of
+	  the range is greater than the end of the string rather than the range.
+
+Thu Jun  9 10:57:03 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: Hash subclasses can be read
+	  from YAML files.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: Hash subclasses can be
+	  dumped to YAML files.
+	* test/psych/test_hash.rb: corresponding test.
+
+Thu Jun  9 09:18:51 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: Ruby modules can be loaded
+	  from YAML files.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby modules can be
+	  dumped to YAML files.
+	* test/psych/test_class.rb: corresponding test.
+
+Thu Jun  9 09:05:04 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: Ruby classes can be loaded
+	  from YAML files.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby classes can be
+	  dumped to YAML files.
+	* test/psych/test_class.rb: corresponding test.
+
+Wed Jun  8 21:38:57 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* cont.c (root_fiber_alloc): set root fiber's status RUNNING.
+	  in cont_mark() only RUNNING fiber's machine stack is marked.
+	  root fiber's status should be RUNNING at the beginning regardless of
+	  FIBER_USE_NATIVE. [ruby-core:36735] fixes #4827
+
+Tue Jun  7 20:50:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* doc/irb/irb.rd: fix typo. patch by Nobuhiro IMAI.
+	  [Bug #4843] [ruby-dev:43639]
+	* doc/irb/irb.rd.ja: ditto.
+	* doc/ChangeLog-YARV: ditto.
+
+Tue Jun  7 18:52:55 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rubygems/user_interaction.rb (Gem::StreamUI#tty?): IO#tty? of
+	  Windows has been fixed at r29969.
+
+	* test/rubygems/test_gem_stream_ui.rb: now can run tests.
+
+Tue Jun  7 18:36:41 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rubygems/test_gem.rb (TestGem#{test_self_user_home_userprofile,
+	  test_self_user_home_user_drive_and_path}): should simply ignore
+	  meaningless tests instead of skipping them.
+
+Tue Jun  7 18:15:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
+	  should show some messages when skipping tests.
+
+Tue Jun  7 13:59:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/date/date_core.c (date_s_today, datetime_s_now): check the
+	  result of localtime_r().
+
+Tue Jun  7 13:36:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of
+	  command line escape issues on Windows.  fixed #4835.
+
+Tue Jun  7 03:18:45 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_io.rb (TestIO#test_s_{,bin}write): do not create a
+	  file under /tmp. [Bug #4846]
+
+Mon Jun  6 22:51:43 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* cont.c: use #if FIBER_USE_NATIVE instead of #ifdef.
+	  you can suppress use of setcontext for Fiber with compile option
+	  -DFIBER_USE_NATIVE=0
+
+Mon Jun  6 21:59:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/test_switch_hitter.rb: added a test.
+
+Mon Jun  6 21:37:45 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: added notes.
+
+Mon Jun  6 21:02:12 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: flattened format to strftimev.
+	* ext/date/date_core.c (date_strftime_internal): taints run.
+
+Mon Jun  6 15:10:17 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/{defines,missing}.h (rb_infinity, rb_nan): move from
+	  defines.h to missing.h.  (couldn't use RUBY_EXTERN there.)
+
+Mon Jun  6 14:35:48 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rdoc/test_rdoc_markup_pre_process.rb (TestRDocMarkupPreProcess#
+	  {test_include_file,test_include_file_encoding_incompatible}): no
+	  need to write such workaround.  don't hide the bug of ruby. (and the
+	  bug is already fixed.)
+
+Mon Jun  6 14:11:11 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/date/date_core.c (valid_jd_sub): need to convert from VALUE to
+	  double.
+
+	* ext/date/date_core.c (offset_to_sec): get rid of a compiler warning.
+
+Mon Jun  6 14:09:08 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/defines.h (rb_infinity, rb_nan): export for Windows.
+
+Mon Jun  6 10:54:45 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb(Test::Unit::Runner#puke):
+	  Add overriding from MiniTest::Unit#puke. This reverts minitest's fix
+	  that skip messages are hidden when not verbose mode (-v option).
+	  To hide skip messages, use --hide-skip option instead.
+
+Mon Jun  6 10:52:13 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb: don't use autoload.
+
+Mon Jun  6 09:39:43 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (parse): release event objects to plug memory
+	leak.  Thanks Mark J. Titorenko!
+
+Sun Jun  5 23:26:15 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* eval.c: remove rb_thread_stop_timer_thread function declaration.
+	  Instead, include vm_core.h.
+	* process.c: ditto.
+
+Sun Jun  5 21:38:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (thread_timer): add to care a spurious wakeup.
+	  When native_cond_timedwait() return 0 by spurious wakeup, we
+	  don't have to neither 1) call timer_thread_function and 2)
+	  exit the timer thread.
+
+Sun Jun  5 17:50:01 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (m_real_cwyear): new.  derived from m_cwyear.
+	* ext/date/date_strftime.c: trivial changes.
+
+Sun Jun  5 17:22:01 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/config_list.in: add new options for tcltklib.
+
+Sun Jun  5 10:06:50 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_tmx.h: now does not place decoded data.  allows to
+	  access indirectly via functions on demand.
+	* ext/date/date_strftime.c: ditto.
+	* ext/date/date_core.c: ditto.
+	* ext/date/date_core.c ({d|dt}_lite_to_s): use strftime.
+
+Sun Jun  5 06:22:02 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* NEWS: wrote about changes of date.
+
+Sat Jun  4 16:59:26 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (d_lite_inspect): changed the format.
+	* ext/date/date_core.c: refactoring and fixing some bugs.
+
+Sat Jun  4 11:30:57 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (check_mix_method_i, do_mix_method_i): not mix methods
+	  renamed as nil.
+
+Sat Jun  4 04:04:41 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/rubygems/test_gem_commands_which_command.rb:
+	  "missing" exists on ruby's top source directory. [Bug #4815]
+
+Fri Jun  3 21:48:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rubygems/test_case.rb: Refix for test-all in separate directory.
+	  r31147 + r31151.
+
+Fri Jun  3 20:58:47 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/date/date_core.c (d_lite_plus): get rid of compiler warnings.
+
+Fri Jun  3 20:56:40 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/missing.h, numeric.c (round): moved prototype of round()
+	  from numeric.c to missing.h.  (note: round() is C99 feature, so ruby
+	  provides it if not exist in C runtime.)
+
+Fri Jun  3 20:42:04 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit/parallel.rb: Keep $stdin, $stdout before run testcase
+	  and restore after run. Because some test break $stdin, $stdout.
+	  Fixes [Bug #4433] [ruby-core:35353]
+
+Fri Jun  3 19:58:14 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (io_fflush): windows -- call fsync() only when the FD is tied to
+	  file, because if the FD is pipe, it blocks.
+
+Fri Jun  3 09:27:31 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (URI::HTTP#request_uri): return nil when the uri
+	  is path-rootless form. Bug #4759
+
+Thu Jun  2 23:51:03 2011  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb: Improve the line ending detection algorithm
+	  patch by Alexey).
+
+Thu Jun  2 20:05:57 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_s_write, rb_io_s_binwrite): return!!!
+
+Thu Jun  2 16:29:34 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* io.c: Add File.write, File.binwrite. [Feature #1081] [ruby-core:21701]
+
+	* test/ruby/test_io.rb: Test for File.write, File.binwrite.
+
+	* NEWS: News for above.
+
+Thu Jun  2 12:33:09 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (io_fflush, rb_io_flush): need to fsync() when ruby calls
+	  internal flush. [ruby-core:36670] [Bug #4813]
+
+Thu Jun  2 07:56:24 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: reduce CPU power required by an eventloop.
+
+Tue May 31 21:28:33 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring):
+	  redirect stderr to null device.
+
+Thu Jun  2 00:45:26 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: fix for uninitialized global variables.
+	  [Ruby 1.9 - Bug #4811]
+
+Wed Jun  1 21:57:08 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (native_sleep): fix 1000times calculation error.
+	  this is a regression since r31457. [Bug #4808] [ruby-dev:43606]
+
+Wed Jun  1 17:19:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c: remove unused macro.
+
+Wed Jun  1 15:42:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (peek_n): new macro to see next nth char.
+
+Wed Jun  1 15:40:46 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (gem): fix for rubygems change.
+
+Wed Jun  1 14:07:57 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 2.2.2 (r6281)
+	* test/minitest/*: ditto
+
+Wed Jun  1 12:35:50 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/rubygems*: Import rubygems 1.8.5 (released @ 137c80f)
+	* test/rubygems: Ditto
+
+Wed Jun  1 12:34:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* NEWS: add new features of bigdecimal.
+
+Wed Jun  1 09:41:14 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/cgi/util.rb:  Improve documentation.  Patch by Kuba Fietkiewicz.
+	  [Ruby 1.9 - Bug #4775]
+	* lib/cgi/core.rb:  ditto
+
+Wed Jun  1 09:26:05 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/mathn.rb:  Improve documentation and attach it to Numeric.
+	  Modified from patch by Anil V.  [Ruby 1.9 - Bug #4762]
+
+Wed Jun  1 09:21:30 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/prime.rb:  Indent examples enough to appear as code sections.
+	  Note that Prime is Enumerable.  [#4762]
+
+Wed Jun  1 07:34:57 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* hash.c (key_i):  Change rdoc from "the first occurrence" to "an
+	  occurrence" since first occurrence is not a specification of
+	  Hash#key.  [Ruby 1.9 - Bug #4760]
+
+Wed Jun  1 07:26:19 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/pty/pty.c (pty_check):  Restore "not reached" comment.
+	  [Ruby 1.9 - Bug #4756]
+
+Wed Jun  1 07:21:40 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c:  Fix document-method declarations for set_sync and
+	  set_comment.  [Ruby 1.9 - Bug #4695]
+
+Wed Jun  1 06:43:13 2011  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* load.c (loaded_feature_path): cut nonsense loop execution to fix
+	  performance bug.
+
+Wed Jun  1 01:16:02 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_mix_module): implement Module#mix.
+
+Wed Jun  1 01:15:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_encoding_set): should honor already set ecflags since it
+	  might be set by mode option.  fixed #4804
+
+Wed Jun  1 00:34:04 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): remove unused
+	  variable.
+
+Wed Jun  1 00:32:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): support instantiation from
+	  a Float through Rational.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_new): ditto.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_global_new_float): add a test for
+	  the above changes.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_new_with_float): ditto.
+
+Wed Jun  1 00:07:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_coerce): support coerce with a
+	  Rational.  The precision used for instantiate a BigDecimal from the
+	  given Rational is obtained from the receiver BigDecimal.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_coerce): add a test for the
+	  above change.
+
+Tue May 31 23:49:08 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (offset_to_sec): fixed invalid validation.
+
+Tue May 31 23:43:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): replace the algorithm for
+	  coercing from a Rational to stop requiring "bigdecimal/util.rb".
+	  [ruby-core:34318]
+
+	* ext/bigdecimal/bigdecimal.c (GetVpValue): refactoring.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_new): support instantiation from a
+	  Rational.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_global_new_with_rational): add a
+	  test for the above change.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_new_with_rational): ditto.
+
+Tue May 31 22:44:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_new): support instantiation a
+	  BigDecimal object from an Integer.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_new_with_integer):
+	  add for testing the above change.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_global_new): replace its body
+	  with a BigDecimal_new call.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_global_new_with_integer):
+	  add for testing the above change.
+
+Tue May 31 22:24:39 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: use simple/complex mode instead of light/right mode.
+	* test/date/*.rb: followed the above changes.
+
+Tue May 31 21:28:33 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring):
+	  initialize SIGINT handler.
+
+Tue May 31 17:03:24 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* lib/net/http.rb, lib/net/protocol.rb: Allow to configure to wait
+	  server returning '100 continue' response before sending HTTP request
+	  body. See NEWS for more detail. See #3622.
+	  Original patch is made by Eric Hodel <drbrain@segment7.net>.
+
+	* test/net/http/test_http.rb: test it.
+
+	* NEWS: Add new feature.
+
+Tue May 31 14:17:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_s_pipe): potential bug. the mode of read IO is set as
+	  DEFAULT_TEXTMODE in call of io_set_encoding(), and of write IO is
+	  also set as it in call of io_new_instance() via rb_protect().
+	  so, if DEFAULT_TEXTMODE is not 0, we should check the result of
+	  extract_binmode() and avoid crush of default IO mode and the result.
+
+Tue May 31 13:00:17 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* strftime.c (rb_strftime_with_timespec): improved style consistency.
+	  constified some variables.
+
+	* test/test_time.rb (TestTime#test_huge_precision): test for #4456.
+
+Tue May 31 12:53:10 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/io/wait/test_io_wait.rb (TestIOWait#{test_nread,test_ready?,
+	  test_wait}: give system some time to process the written data.
+
+Tue May 31 12:40:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#test_open_mode): MUST release resources
+	  explicitly. fix problem of r31671
+
+Tue May 31 10:49:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_exec.c: remove conditions for clang
+	  because clang version 3.0 (trunk 132165) doesn't need them.
+
+Mon May 30 22:19:33 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring): don't
+	  close stderr.
+
+Mon May 30 20:22:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring): small
+	  but critical typo of r31642.  sorry...
+	  [Bug #4798] [ruby-core:36550]
+
+Mon May 30 15:44:16 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* insns.def (opt_mult): as r31805, volatile it.
+	  Without this, clang -O fails calculation.
+
+	* numeric.c (fix_mul): ditto.
+
+	* rational.c (f_imul): ditto.
+
+Mon May 30 10:26:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (int_pow): make sure to assign the result of x * z.
+	  If xz is optimized out, the value won't overflow.
+
+Sun May 29 23:17:29 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_match): fix rdoc of Regexp#=~.
+	  patched by Tsuyoshi Sawada. [Bug #4781]
+
+Sun May 29 23:10:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/https.rb (WEBrick::HTTPRequest#parse_uri):
+	  keep parse_uri as private. patched by okkez. [Bug #4773]
+
+Sun May 29 17:53:03 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* numeric.c: add #include "internal.h" for rb_big_uminus() prototype.
+
+Sun May 29 15:09:05 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_round): fix for negative value.
+
+Sun May 29 02:16:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/net/http/utils.rb (TestNetHTTPUtils#teardown): add nil check.
+
+Sun May 29 00:22:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (before_exec, after_exec): change from macro to function.
+
+Sat May 28 19:30:17 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (before_exec, after_exec): change SIGPIPE handler to SIG_DFL
+	  before calling execve(). Because r31760 reintroduced an issue that
+	  system() may hang up (i.e. [ruby-dev:12261]).
+	* process.c (save_sigpipe, restore_sigpipe): new.
+
+Sat May 28 16:08:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (Init_signal, default_handler): change default SIGPIPE handler
+	  from empty function to SIG_IGN. [ruby-dev:43215]
+	* signal.c (sigpipe): removed.
+
+Sat May 28 03:04:27 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (fill_cbuf): return MORE_CHAR_SUSPENDED when cbuf is not empty.
+
+Sat May 28 02:22:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* string.c (rb_str_bytesize): rb_str_bytesize() should use LONG2NUM().
+	  Patch by Nikolai Weibull. [Bug #4789] [ruby-core:36511]
+
+Sat May 28 02:06:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (fill_cbuf): Fix test-all crash.
+
+Sat May 28 00:58:40 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/ostruct.rb (method_missing): Handle [] and []= correctly.
+	  Based on a patch by Caius Durling, bug #4179 [ruby-core:33792]
+
+Fri May 27 23:56:54 2011  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_core.rb (Tester::test_text_frozen): split frozen
+	  string test. refs #4783
+
+Fri May 27 22:46:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (gem): install gemspec of json.  fixed #4784
+
+Fri May 27 22:45:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (validate_enc_binmode): do not clear textmode flag if
+	  default.  fixed #4732
+
+	* io.c (fill_cbuf): finish reading at EOF.
+
+Fri May 27 11:31:51 2011  misfo <tedwardo2@gmail.com>
+
+	* lib/rexml/text.rb (REXML::Text#initialize): prevent an error
+	  when passing a frozen string to REXML::Text.new
+
+	  dup the string passed in instead of cloning so that it's frozen
+	  state is ignored
+
+Fri May 27 08:47:26 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* thread.c (ppoll): typo bug fix.
+
+Fri May 27 08:35:04 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: hang-up at exit before calling Tk.mainloop.
+
+	* ext/tk/lib/tk/extconf.rb: cannot make on MinGW [Ruby 1.9 - Bug #4141].
+
+Thu May 27 00:34:07 2011  James Edward Gray II  <jeg2@ruby-lang.org>
+
+    * lib/csv.rb: Enhance each() to support Enumerator.
+
+Thu May 26 10:32:11 2011  James Edward Gray II  <jeg2@ruby-lang.org>
+
+    * lib/csv.rb: Documentation improvements from Ysiad Ferreiras.
+      [Ruby 1.9 - Bug #4785]
+
+Thu May 26 15:42:02 2011  Cezary Baginski <cezary.baginski@gmail.com>
+
+	* lib/xmlrpc/parser.rb (FaultException): fix to_s and inspect
+
+	* test/xmlrpc/parser.rb: test for the above
+
+Wed May 25 11:54:31 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/curses/curses.c:  Remove color constants block.
+	  [Ruby 1.9 - Bug #4748]
+
+Wed May 25 09:56:45 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/curses/curses.c:  Add missing documentation for button state, MIN
+	  and MAX comments.  Add Curses. to TABSIZE= and ESCDELAY= methods.
+	  [Ruby 1.9 - Bug #4747]
+
+Wed May 25 09:35:31 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/benchmark.rb:  Restore nodoc for Benchmark::Job and
+	  Benchmark::Report.  [Ruby 1.9 - Bug #4726]
+
+Wed May 25 09:29:38 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/pop.rb:  Hide implementation details from RDoc.
+	  [Ruby 1.9 - Bug #4711]
+
+Wed May 25 09:26:29 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/ftp.rb:  Add :nodoc: for private methods.
+	  [Ruby 1.9 - Bug #4710]
+
+Wed May 25 09:19:17 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c:  Fix Document-method declarations.  Improve
+	  Zlib::GzipFile's method catalog.  [Ruby 1.9 - Bug #4695]
+
+Wed May 25 08:22:12 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/erb.rb:  Hide documentation for implementation details of ERB.
+	  [Ruby 1.9 - Bug #4694]
+
+Wed May 25 07:58:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile.{mkdir,rmdir}): revert for backward
+	  compatibility.
+
+Wed May 25 07:13:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* spec/README: update the description.
+
+Wed May 25 07:12:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile.{lock,unlock}_tempfile): refactor.
+
+Tue May 24 17:30:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* spec/README: fix typo.
+	  patched by bowsersenior. https://github.com/ruby/ruby/pull/24
+
+Tue May 24 07:06:34 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: fail to start Tk.mainloop (exit immediately) on
+	  some environment (reported on [ruby-talk:381444]).
+
+	* ext/tk/lib/tk/canvas.rb: support creating a canvas item object from
+	  an item ID number.
+
+	* ext/tk/lib/tk/image.rb: import documents which are pull-requested.
+	  [Ruby 1.9 - Feature #4595]
+
+	* ext/tk/lib/tk/extconf.rb: search directories for 64bit library (e.g.
+	  /usr/lib64), add some new configure options (see README.tcltklib),
+	  and bug fix.
+
+	* ext/tk/lib/tk/README.tcltklib: modify docs for some new configure
+	  options.
+
+Tue May 24 04:01:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/yaml.rb: switch default YAML engine to Psych, old syck engine
+	  may be enabled via YAML::ENGINE.yamler = "syck". [ruby-core:36374]
+
+Mon May 23 09:45:26 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* include/ruby/defines.h (CASEFOLD_FILESYSTEM): Revert r30508. Forgot to
+	  include this file in the commit r31692. __APPLE__ is not
+	  CASEFOLD_FILESYSTEM again, from this time.
+
+Mon May 23 10:01:02 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c: Do not parse zero-tagged values as EOC. Do
+	  not let current length become negative for infinite length constructed
+	  values. Support constructed values of length zero. Added tests.
+
+Mon May 23 09:19:53 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/smtp.rb:  Document Net::SMTP::Response.  Patch by J.R. Garcia.
+	  [Ruby 1.9 - Bug #4768]
+
+Mon May 23 09:03:52 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit/parallel.rb: Never Ignore SIGINT. When received
+	Interrupt, immediately puts result and exit. [ruby-dev:43571]
+
+	* lib/test/unit.rb: When received Interrupt, wait results from workers
+	and collect them. [ruby-dev:43571]
+
+Mon May 23 09:08:07 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/mathn.rb:  Improve documentation.  Patch by Sandor Szucs.
+	  [Ruby 1.9 - Bug #4767]
+
+Mon May 23 08:45:55 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/ostruct.rb:  Improve documentation.  Patch by Franklin Webber.
+	  [Ruby 1.9 - Bug #4761]
+
+Mon May 23 08:35:24 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* hash.c:  Improve documentation of Hash#key.  Patch by Utkarsh
+	  Kukreti.  [Ruby 1.9 - Bug #4760]
+
+Mon May 23 08:32:59 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* enumerator.c:  Improve documentation.  Patch by Dave Copeland.
+	  [Ruby 1.9 - Bug #4757]
+
+Mon May 23 07:19:45 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* NEWS (openssl): Infinite length support. Different behavior of
+	  Constructive and Primitive constructors.
+
+Mon May 23 06:58:33 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c: Forbid Constructives whose value is not an
+	  Array to prevent segfault. Added test.
+
+Mon May 23 06:33:17 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c: Forbid Constructive without infinite
+	  length. This also prevents a segfault. Added test and improved
+	  documentation.
+
+Mon May 23 05:58:14 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c: Fix decoding of infinite length values.
+	  Simplified ossl_asn1_decode0 by splitting it into three separate
+	  functions. Add tests.
+	  [Ruby 1.9 - Bug #4374][ruby-core:35123]
+
+Mon May 23 04:03:46 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_initialize): Allow creation of
+	  Constructives with an explicit tag_class parameter without
+	  automatically setting tagging to :EXPLICIT. Fixes a bug when encoding
+	  infinite length primitive values.
+
+Mon May 23 04:03:46 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_cons_to_der): Add an additional
+	  EOC for infinite length Constructives that are supposed to be encoded
+	  with explicit tagging. Also tabify method correctly.
+
+Mon May 23 03:44:39 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1data_to_der): Remove redundant
+	  flag tmp_cons.
+
+Mon May 23 00:35:00 2001  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (dump_bignum, bigmul1_balance, big_split, biglsh_bang),
+	  (bigrsh_bang, big_split3, bigmul1_toom3, bigmul0): implement Toom3 (Toom-Cook)
+	  multiplication.
+
+	* include/ruby/defines.h: add format prefixes for BDIGIT and BDIGIT_DBL.
+
+Sun May 22 23:24:02 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c: Instead of rb_intern use static symbols to
+	  improve performance.
+
+Sun May 22 21:56:51 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c: Use OpenSSL constants V_ASN1_xxx instead of
+	  hardcoded numbers for initializing class_tag_map.
+
+Sun May 22 21:29:29 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* include/ruby/defines.h (CASEFOLD_FILESYSTEM): Revert r30508. See #4255.
+	  Now __APPLE__ is not CASEFOLD_FILESYSTEM again.
+
+	* load.c (loaded_feature_path, rb_feature_p, load_lock): Revert r30508.
+	  See #4255. Make $LOADED_FEATURES scanning case-sensitive again.
+
+Sun May 22 18:59:27 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_asn1.c(ossl_asn1_default_tag): avoid using RCLASS_SUPER
+	  to make it compilable. Plus, tabify and change variable definition style.
+
+Sun May 22 18:26:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (vm_xcalloc): use calloc provided by platforms.
+	  fixes #4754
+
+Sun May 22 11:44:53 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/pty/pty.c:  Improve documentation.  Patch by David Copeland.
+	  [Ruby 1.9 - Bug #4756]
+
+Sun May 22 11:26:39 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/timeout.rb:  Improve documentation.  Patch by David Copeland.
+	  [Ruby 1.9 - Bug #4755]
+
+Sun May 22 11:21:41 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/ipaddr.rb:  Improve documentation.  Patch by Sandor Szucs.
+	  [Ruby 1.9 - Bug #4753]
+
+Sun May 22 11:14:40 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/forwardable.rb:  Document def_delegator.  Patch by Sandor Szucs.
+	  [Ruby 1.9 - Bug #4752]
+
+Sun May 22 11:11:41 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/fileutils.rb:  Document block behavior of FileUtils.cd.  Patch by
+	  Bil Kleb.  [Ruby 1.9 - Bug #4751]
+
+Sun May 22 11:07:47 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/curses/curses.c:  Complete documentation.  Patch by Vincent
+	  Batts.  [Ruby 1.9 - Bug #4748]
+
+Sun May 22 09:29:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
+	  use spawn. it prevent that other tests inherit renamed $0.
+
+Sun May 22 08:57:13 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c: Default tag lookup in constant time via hash
+	  instead of previous linear algorithm.
+	  [Ruby 1.9 - Feature #4309][ruby-core:34813]
+
+Sun May 22 07:54:16 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_digest.c: Explain DSS and DSS1 in documentation.
+
+Sun May 22 07:10:25 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_pkey_dsa.rb: Add tests for sign/verify.
+
+Sun May 22 06:07:17 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_x509cert.rb: Merge DSA-related tests from ruby_1_8
+	  branch.
+
+Sun May 22 04:11:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (Init_Thread): add a code comment why the meaningless
+	  line is necessary.
+
+Sun May 22 01:35:12 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: modified documentation.
+
+Sat May 21 22:46:26 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strftime(date_strftime_with_tmx): "%v" means "%e-%b-%Y".
+
+Sat May 21 22:14:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_extract_modeenc): accept combination hash and
+	  File::Constants. (eg. File.open('yo', :mode => File::WRONLY))
+	  [Feature #4742][ruby-core:36338]
+	* test/ruby/test_io.rb (TestIO#test_open_mode): new test.
+
+Sat May 21 21:44:14 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/test_switch_hitter.rb: new.
+
+Sat May 21 21:18:29 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_{core,parse}.c: moved nearly all core code from ext/date/lib.
+	* ext/date/lib/{date,date/format}.rb: removed nearly all code.
+
+Sat May 21 02:58:46 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/.document:  Add curses to documented extensions.
+	* ext/curses/curses.c:  Improve documentation.  Patch by Vincent Batts.
+	  [Ruby 1.9 - Bug #4747]
+
+Sat May 21 02:51:01 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/bigdecimal/lib/bigdecimal/util.rb:  Improve documentation.  Patch
+	  by Pete Higgins.  [Ruby 1.9 - Bug #4746]
+
+Sat May 21 02:44:10 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/bigdecimal/lib/bigdecimal/jacobian.rb:  Document isEqual.  Patch
+	  by Kuba Fietkiewicz.  [Ruby 1.9 - Bug #4744]
+
+Sat May 21 02:22:34 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/date/lib/date/format.rb:  Document date formats.  Patch by
+	  Clinton Nixon.  [Ruby 1.9 - Bug #4743]
+
+Fri May 20 05:15:19 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
+
+	* gc.c: Fix build on m68k by 'error: too few arguments to
+	  function 'mark_locations_array''.
+
+Fri May 20 04:23:42 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/scanf.rb:  Improve documentation.  Patch by Gabe McArthur.
+	  [Ruby 1.9 - Bug #4735]
+
+Fri May 20 00:58:01 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/trans/ibm737-tbl.rb: greek code page.  fixes #4738
+
+Thu May 19 14:44:05 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_signal.rb (test_signal_requiring): skip on Windows.
+	  we can send SIGINT only to pid 0 and the process itself.
+
+Thu May 19 09:07:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib: revert r31635-r31638 and untabify with expand(1).
+
+Thu May 19 07:47:26 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_pkey_rsa.rb: Add tests for sign/verify.
+
+Thu May 19 07:19:16 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_pkey.c: Add documentation.
+
+Thu May 19 07:06:56 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/benchmark.rb:  Fix indentation.
+	* lib/net/imap.rb:  Fix indentation of regular expressions.
+
+Thu May 19 06:36:11 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/imap.rb:  Fix indentation of EOF for heredoc.
+	* lib/debug.rb (Commands):  Fix indentation of EOHELP for heredoc.
+
+Thu May 19 06:30:38 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/mkmf.rb:  Fix indentation of EOM for heredoc.
+
+Thu May 19 06:16:41 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib:  Convert tabs to spaces for ruby files per
+	  https://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style
+	  Patch by Steve Klabnik [Ruby 1.9 - Bug #4730]
+	  Patch by Jason Dew [Ruby 1.9 - Feature #4718]
+
+Thu May 19 06:06:07 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/cgi/util.rb:  Improve documentation.  Patch by Clinton Nixon.
+	  [Ruby 1.9 - Bug #4733]
+	* lib/cgi/core.rb:  ditto
+	* lib/cgi/cookie.rb:  ditto
+
+Thu May 19 06:02:21 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/tempfile.rb:  Document Dir.mkdir and Dir.rmdir.  Patch by Clinton
+	  Nixon.  [Ruby 1.9 - Bug #4728]
+
+Thu May 19 05:57:52 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* encoding.c:  Improve documentation for Encoding#default_external and
+	  Encoding#default_internal.
+
+Wed May 18 22:45:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/lib/console/size.rb (IO#console_size): new
+	  method.  (EXPERIMENTAL)
+
+Wed May 18 22:41:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h: add for internal use only.
+
+Wed May 18 22:36:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (setup_exception): internal exception should be hidden
+
+Wed May 18 20:25:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/timeout.rb (Timeout#timeout): don't leak "execution expired"
+	  exception. [Bug #4283] [ruby-core:34534].
+
+Wed May 18 06:09:24 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/cmath.rb:  Add some examples and improve documentation.  Patch by
+	  Sandor Szucs.  [Ruby 1.9 - Bug #4727]
+
+Wed May 18 05:40:31 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/benchmark.rb:  Remove nodoc from Benchmark::Job and
+	  Benchmark::Report.  Patch by Sandor Szucs.  [Ruby 1.9 - Bug #4726]
+
+Wed May 18 05:29:26 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick/compat.rb:  Improve documentation.  Patch by Sandor
+	  Szucs.  [Ruby 1.9 - Bug #4725]
+
+Wed May 18 05:10:35 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/tracer.rb:  Improve documentation.  Patch by Richard Ramsden.
+	  [Ruby 1.9 - Feature #4720]
+
+Wed May 18 04:53:41 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/cmath.rb:  Improve documentation.  Patch by Jason Dew.
+	  [Ruby 1.9 - Feature #4717]
+
+Wed May 18 04:50:24 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/ftp.rb:  Improve documentation.  Patch by Vincent Batts.
+	  [Ruby 1.9 - Bug #4710]
+
+Wed May 18 03:14:49 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* test/test_singleton.rb:  Add tests from lib/singleton.rb.  Patch by
+	  Pete Higgins.  [Ruby 1.9 - Bug #4715]
+
+Wed May 18 03:03:07 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/singleton.rb:  Improve documentation.  Patch by Pete Higgins.
+	  [Ruby 1.9 - Bug #4709]
+
+Tue May 17 21:24:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_mutex_lock): remove remove_signal_thread_list() call.
+	  It's meaningless because lock_interrupt doesn't call
+	  add_signal_thread_list().
+
+Tue May 17 20:20:49 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_core.h (rb_thread_struct): add volatile to
+	  transition_for_lock because it is not protected by lock.
+
+Tue May 17 20:08:53 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* LEGAL (missing/{elf,tgamma,lgamma_r}.c): they've been replaced by
+	  public domain implementations.
+
+	* LEGAL (vsnprintf.c): it has moved to srcdir from missing/.
+
+	* LEGAL (missing/crypt.c): list its original license.
+
+Tue May 17 19:54:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* LEGAL (configure): add missing/setproctitle.c
+
+Tue May 17 19:35:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	Fix FreeBSD test failure.
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
+	  use ps -o command instead of ps -o cmd. FreeBSD doesn't support
+	  -o cmd option.
+
+Tue May 17 08:04:26 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_digest.c: Add documentation.
+
+Tue May 17 07:14:58 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Improve documentation of proxy configuration
+	  methods.  Patch by Alf Mikula.  [Ruby 1.9 - Bug #4714]
+
+Tue May 17 07:09:01 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/pop.rb:  Improve documentation.  Patch by Vincent Batts.
+	  [Ruby 1.9 - Bug #4711]
+	* lib/net/telnet.rb:  ditto
+
+Tue May 17 07:00:41 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Fix nodoc for Net::HTTP::version_1_1?.  Patch by
+	  Alf Mikula.  [Ruby 1.9 - Bug #4713]
+
+Tue May 17 06:56:26 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/optparse.rb:  Add link to make_switch to improve documentation.
+	  Patch by David Copeland.  [Ruby 1.9 - Bug #4708]
+
+Tue May 17 06:50:40 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/observer.rb:  Improve documentation.  Patch by David Copeland.
+	  [Ruby 1.9 - Bug #4707]
+
+Tue May 17 06:42:53 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/logger.rb:  Improve documentation.  Patch by David Copeland.
+	  [Ruby 1.9 - Bug #4706]
+
+Tue May 17 06:28:14 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/gserver.rb:  Improve documentation.  Patch by David Copeland.
+	  [Ruby 1.9 - Bug #4705]
+
+Tue May 17 06:21:15 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/cgi.rb: Add toplevel documentation to class CGI
+	* lib/cgi/session.rb: Add overview documentation to CGI::Cookie
+	* lib/cgi/html.rb:  Don't add CGI::TagMaker documentation to CGI.
+	  Patch by David Copeland.  [Ruby 1.9 - Bug #4704]
+	* lib/cgi/core.rb:  Clean up CGI documentation.  Patch by David
+	  Copeland.  [Ruby 1.9 - Bug #4704]
+	* lib/cgi/cookie.rb:  Clean up CGI::Cookie documentation.  Patch by
+	  David Copeland.  [Ruby 1.9 - Bug #4704]
+
+Tue May 17 05:52:30 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/digest: Improve documentation of Digest, Digest::HMAC and
+	  Digest::SHA2.  Patch by Pete Higgins.  [Ruby 1.9 - Bug #4702]
+
+Tue May 17 03:51:42 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/abbrev.rb:  Hide copyright and revision information from RDoc.
+	  Inspired by patch from David Copeland, bug #4703.
+
+Tue May 17 03:33:21 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/timeout.rb (module Timeout):  Hide internal constants.  Patch by
+	  Pete Higgins.  [Ruby 1.9 - Bug #4701]
+
+Mon May 16 11:21:09 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* configure.in, win32/Makefile.sub (RUBY_SO_NAME): add CPU as prefix
+	  of RUBY_SO_NAME on x64/ia64 mswin/mingw.
+	  [Feature #4602]
+
+Mon May 16 08:00:05 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc.rb:  Update to RDoc 3.6.1, allows OpenSSL::Digest to be
+	  found.
+
+Mon May 16 05:49:54 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/drb/acl.rb:  Add documentation.
+
+Mon May 16 05:13:20 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c: Add documentation.
+
+Mon May 16 00:32:05 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_signal.rb (TestSignal#test_signal_process_group):
+	  skip if the platform doesn't have :pgroup capability. (i.e. skip
+	  if mswin32)
+
+Sun May 15 23:53:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/intern.h: resurrect old rb_fd_copy().
+	* thread.c (rb_fd_copy): ditto.
+
+Sun May 15 23:45:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/intern.h: remove rb_fd_copy() to rb_fd_dup() and
+	  rb_w32_fdcopy() to rb_w32_fd_dup().
+	* win32/win32.c: ditto.
+	* thread.c: ditto.
+
+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
+	* test/ruby/test_signal.rb (test_signal_process_group): add a test
+	  for send signal to process group.
+
+Sun May 15 21:22:35 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* cont.c (cont_init): clear macihne_stack_start/end of saved thread to
+	  prevent mark machine stack of GC'ed Thread. root Fiber is not
+	  initialized by fiber_init().
+	  based on a patch by Serge Balyuk [ruby-core:35891] fixes #4612
+	* test/ruby/test_fiber.rb (test_gc_root_fiber): add test for it.
+
+Sun May 15 21:04:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (econv_init): revert r31353.  [ruby-dev:43512]
+
+Sun May 15 03:39:35 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c:  Improve documentation.  Patch by Vincent Batts.
+	  [Ruby 1.9 - Bug #4695]
+
+Sun May 15 03:23:46 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/erb.rb:  Document ERB::Compiler.  Patch by Simon Chiang.
+	  [Ruby 1.9 - Bug #4694]
+
+Sun May 15 00:58:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	fix mswin32 build error.
+
+	* missing/setproctitle.c: add #ifdef HAVE_UNISTD_H.
+	* win32/Makefile.sub (MISSING): add setproctitle.obj
+
+Sat May 14 22:45:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* missing/setproctitle.c: add to include "ruby/util.h".
+
+Sat May 14 19:52:22 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
+	  add for $0 test.
+
+Sat May 14 19:50:46 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* missing/setproctitle.c (compat_init_setproctitle): use
+	  ruby_strdup() instead of strdup().
+
+Sat May 14 19:37:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/missing.h: add setproctitle() declaration.
+	* missing/setproctitle.c: added.
+	* configure.in: add check for missing/setproctitle.c.
+
+	* ruby.c (ruby_process_options): add to call compat_init_setproctitle().
+	* ruby.c (set_arg0): remove all platform specific code. it's
+	  moved to missing/setproctitle.c.
+	* ruby.c (origarg): remove len field. It's no longer used.
+	* ruby.c (get_arglen): removed.
+
+	This patch makes a lot of cleanup set_arg0 related code and fixes
+	[Feature #4689].
+
+Sat May 14 17:42:21 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* process.c (rb_proc_times): improve documentation.
+	  [ruby-core:35785] fixes #4581, reported by Andrew Grimm.
+
+Sat May 14 12:12:54 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_pkey_dsa.rb: Add basic tests and tests that
+	  ensure new public key PEM encoding behavior and ensure backward
+	  compatibility.
+	  [Ruby 1.9 - Bug #4422] [ruby-core:35328]
+	* test/openssl/test_pkey_rsa.rb: Remove line with 'puts'.
+
+Sat May 14 12:06:49 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/context.rb (class RDoc):  Fix infinite loop caused by
+	  re-encountering BasicObject.
+
+Sat May 14 10:32:36 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_pkey_rsa.rb: Add tests that ensure new public key
+	  encoding behavior and also ensure backward compatibility.
+	  [Ruby 1.9 - Bug #4421] [ruby-core:35327]
+
+Sat May 14 09:50:10 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/yaml/dbm.rb:  Add documentation.  Patch by Justin Collins.
+	  [Ruby 1.9 - Bug #4693]
+	* lib/yaml/store.rb:  ditto
+
+Sat May 14 09:31:43 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc.rb: Updated to RDoc 3.6
+
+Sat May 14 07:30:29 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: released a new gem, so increasing version.
+
+Sat May 14 05:08:32 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_digest.c
+	* ext/openssl/ossl_pkey.c
+	* ext/openssl/ossl_pkey.h
+	* test/openssl/pkey/test_pkey_rsa.rb
+	  Reverted premature commit. Sorry for the noise!
+
+Sat May 14 05:02:58 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/uri.rb:  Add toplevel documentation.  Patch by Vincent Batts.
+	  [Ruby 1.9 - Bug #4690]
+
+Sat May 14 04:19:06 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* NEWS: Describe altered behaviour for RSA and DSA public key
+	  encoding. [Ruby 1.9 - Bug #4421, Bug #4422]
+	  [ruby-core:35327,35328]
+
+Sat May 14 02:57:52 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/ipaddr.rb (unless Socket):  Document valid*? methods.  Patch by
+	  Sebastian Martinez.  [Ruby 1.9 - Feature #4687]
+
+Sat May 14 02:54:04 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rexml/functions.rb:  Add some documentation for REXML::Functions.
+	  Patch by Sebastian Martinez.  [Ruby 1.9 - Feature #4688]
+
+Sat May 14 02:51:42 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/resolv.rb:  Hide private method and state-tracking constants from
+	  RDoc.  Patch by Mark Turner.  [Ruby 1.9 - Feature #4691]
+
+Fri May 13 19:23:21 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* numeric.c (flo_coerce): Add #flo_coerce documentation.
+	  Patch by Sebastian Martinez.
+	  https://github.com/ruby/ruby/pull/21
+
+Fri May 13 18:42:22 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* README.EXT: fix typo.  Patch by William Blackerby.
+	  https://github.com/ruby/ruby/pull/19
+
+	* README.EXT.ja: ditto.
+
+Fri May 13 15:22:34 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_select): check invalid handle before doing
+	  select operations.  see [ruby-dev:43513], [ruby-dev:43535]
+
+Fri May 13 08:34:00 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/rdoc.rb:  Output summary after documentation report.
+	* lib/rdoc/stats/normal.rb:  Don't output information for users when
+	  we're not on a TTY
+
+Fri May 13 07:49:02 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/fileutils.rb:  Hide internal methods from RDoc.  Patch by Darragh
+	  Curran.  [Ruby 1.9 - Bug #4684]
+
+Fri May 13 07:36:23 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick/httpservlet/erbhandler.rb:  Add documentation.
+
+Fri May 13 07:04:33 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/mathn.rb:  Fix indentation.  Patch by Jason Dew.
+	  [Ruby 1.9 - Feature #4682]
+
+Fri May 13 06:50:43 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/mathn.rb:  Add documentation.  Patch by Jason Dew.  [Ruby 1.9 -
+	  Feature #4667]
+
+Fri May 13 05:44:19 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/logger.rb (class Logger):  Document Logger#datetime_format.
+	  Patch by Sergio Gil Perez de la Manga.  [Ruby 1.9 - Bug #4678]
+
+Fri May 13 05:39:11 2011  Eric Hodel <drbrain@segment7.net>
+
+	* re.c (Init_Regexp): Document option constants.  Patch by Vincent
+	  Batts.  [Ruby 1.9 - Bug #4677]
+	* lib/uri/common.rb (module URI):  Documentation for URI.  Patch by
+	  Vincent Batts.  [Ruby 1.9- Bug #4677]
+	* lib/uri/ftp.rb (module URI):  ditto
+	* lib/uri/generic.rb (module URI):  ditto
+	* lib/uri/http.rb (module URI):  ditto
+	* lib/uri/https.rb (module URI):  ditto
+	* lib/uri/ldap.rb (module URI):  ditto
+	* lib/uri/ldaps.rb (module URI):  ditto
+	* lib/uri/mailto.rb (module URI):  ditto
+	* process.c (Init_process):  Document Process constants.  Patch by
+	  Vincent Batts.  [Ruby 1.9- Bug #4677]
+
+Fri May 13 05:16:38 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rss/atom.rb (module RSS):  Document URIs.  Patch by Mark Turner.
+	  [Ruby 1.9 - #4671]
+	* lib/rss/rss.rb (module RSS):  Document exception classes.  Patch by
+	  Mark Turner.  [Ruby 1.9 - #4671]
+
+Fri May 13 02:15:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (select_internal): remove unused variable (interrupt_flag).
+
+Thu May 12 18:24:34 2011  Kouhei Sutou  <kou@clear-code.com>
+
+	* configure.in: limit to "T" type for prefix of external symbols
+	  because x86_64-w64-mingw32-gcc on Debian GNU/Linux generates the
+	  following symbol:
+	    0000000068483390 D _GLOBAL__F__conftest_external
+
+	  Approved by nobu.
+
+Thu May 12 14:50:52 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/dl/test_base.rb (Fiddle::LIBC_SO): its always msvc*.dll on
+	  mswin/mingw.
+
+Thu May 12 14:47:53 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (Logging.postpone): copy only when temporary logfile
+	  exists.
+
+Thu May 12 12:24:22 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
+
+	* ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is
+	  executed.
+	  However, the problem is not revised in this.
+	  This adds the control of using function of SSLv2 in made macro by
+	  function check.
+
+Thu May 12 08:10:46 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/set.rb (class Set):  Add nodoc to internal-use methods.  Patch
+	  by Pete Higgins.  [Ruby 1.9 - Bug #4665]
+
+Thu May 12 08:01:14 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_pkey_ec.c: Allow encryption when PEM-encoding
+	  Elliptic Curve private keys.
+	  [ruby-core:35329] [Bug #4423]
+
+Thu May 12 07:54:59 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c (rb_obj_equal):  Add documentation.  Patch by Vincent Batts.
+	  [Ruby 1.9 - Bug #4664]
+	* lib/rexml:  ditto
+	* lib/mkmf.rb:  ditto
+	* ext/socket/lib/socket.rb:  ditto
+
+Thu May 12 07:30:08 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* Various .document files: Update .document files to match files which
+	  have documentation.
+
+Thu May 12 07:18:45 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_pkey_dsa.c: Use generic X.509 SubjectPublicKeyInfo
+	  format for PEM-encoding DSA public keys.
+	  [ruby-core:35328] [Bug #4422]
+
+Thu May 12 06:27:31 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_pkey_rsa.c: Use generic X.509 SubjectPublicKeyInfo
+	  format for encoding RSA public keys.
+	  [ruby-core:35327] [Bug #4421]
+
+Wed May 11 19:45:27 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/forwardable.rb: support 'delegate :foo => :bar' for to meet
+	  by specification of RDOC.
+
+Wed May 11 08:36:38 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick: Add documentation for WEBrick::HTTPAuth
+
+Wed May 11 03:06:35 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rss.rb: Add documentation for RSS.  Patch by Steve Klabnik.
+	  [Ruby 1.9 - Bug #4663]
+
+Tue May 10 14:50:32 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb: Add option for hiding skip messages when test
+	  ends. #4657
+
+	* test/testunit/test_hideskip.rb, test/testunit/test4test_hideskip.rb:
+	  test for above.
+
+Tue May 10 10:53:04 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* common.mk (rdoc): Add rdoc-coverage rule
+
+Tue May 10 09:13:21 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick: Add Documentation
+
+Tue May 10 04:22:09  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick/log.rb: Hide copyright info from ri
+	* lib/webrick/httpstatus.rb: ditto
+	* lib/webrick/htmlutils.rb: ditto
+	* lib/webrick/httpversion.rb: ditto
+	* lib/webrick/version.rb: ditto
+	* lib/webrick/httpauth/userdb.rb: ditto
+	* lib/webrick/httpauth/authenticator.rb: ditto
+	* lib/webrick/accesslog.rb: ditto
+
+Mon May  9 20:57:13 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/ruby/test_{complex,rational}.rb: added tests.
+
+Mon May  9 20:29:44 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (string_to_c_internal): a refactoring.
+
+Mon May  9 18:33:05 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c: Improve documentation for String#start_with? and
+	  String#end_with?. fixes #4652
+	  patched by Andrew Grimm <andrew.j.grimm at gmail.com>
+
+Mon May  9 13:49:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* complex.c (string_to_c_internal): support scientific notation.
+	  patched by Tinco Andringa. https://github.com/ruby/ruby/pull/16
+	  [ruby-core:36046][Bug #4655]
+
+Mon May  9 11:52:48 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (int_ord): remove K&R style.
+	  patched by Daehyub Kim. https://github.com/ruby/ruby/pull/17
+
+Sun May  8 22:17:24 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/ruby/test_{complex2,complexrational}.rb: use skip.
+	* test/date/*.rb: ditto.
+
+Sun May  8 21:02:31 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/ruby/test_{complex2,complexrational}.rb: NEVER SKIP.
+
+Sun May  8 21:01:21 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/test_date_base.rb: fixed.
+
+Sun May  8 20:54:11 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/*.rb: NEVER SKIP.
+
+Sun May  8 20:37:33 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/*.rb: reverted 31432.
+
+Sun May  8 20:32:43 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/*.rb: reverted 31483.
+
+Sun May  8 19:39:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (native_cond_timedwait): add to care EINTR.
+	* thread_pthread.c (thread_timer): remove EINTR check.
+
+Sun May  8 19:04:15 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/time.rb (xmlschema): avoid passing any negative numbers.
+
+Sun May  8 18:40:03 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_{parse,strptime}.c: introduced some macros.
+
+Sun May  8 17:17:13 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/*.rb: use skip /w messages.
+
+Sun May  8 17:04:55 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/lib/date/format.rb (_httpdate): omitted to call zone_to_diff.
+
+Sun May  8 16:56:19 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (date_s_test_*): use macros.
+
+Sun May  8 10:24:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c: cleanup signal_thread_list related ifdef.
+	  1) we don't have to use #ifdef FOO-PLATFORM directly 2) About
+	  half #ifdef didn't care symbian properly.
+
+Sun May  8 05:19:37 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/io/wait/test_io_wait.rb: Linux socketpair(2) only support
+	  AF_UNIX, but windows socketpair doesn't support it. we can't
+	  avoid platform check. sigh!
+
+Sun May  8 00:13:05 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/io/wait/test_io_wait.rb: use Socket.pair instead of pipe.
+	  Windows can only treat a socket.
+
+Sat May  7 22:43:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_fd_zero): remove redundant zero fill.
+
+Sat May  7 22:38:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_fd_init): remove volatile qualifier.
+
+Sat May  7 22:34:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_fd_init_copy): new internal api. It provide efficient
+	  copy constructor semantics.
+	* thread.c (do_select): use rb_fd_init_copy().
+
+Sat May  7 15:18:06 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	fix incorrect native_cond_signal call when deadlock was detected.
+
+	* thread.c (lock_func): decrement cond_waiting if timeout was happen.
+
+Sat May  7 18:28:37 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (USE_MONOTONIC_COND): check the availability
+	  more strictly.
+
+	* thread_pthread.h (rb_thread_cond_t): ditto.
+
+Sat May  7 15:15:10 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	fix win32 native_cond_timedwait() makes SIGSEGV.
+
+	* thread_win32.h (rb_thread_cond_struct): add prev field instead of
+	  last. (ie cond_event_entry is now using double linked list instead of
+	  single)
+	* thread_win32.c (cond_event_entry): add prev field.
+
+	* thread_win32.c (__cond_timedwait): remove entry properly if timeout
+	  was happen.
+
+	* thread_win32.c (native_cond_signal): change for double linked list.
+	* thread_win32.c (native_cond_broadcast): ditto.
+	* thread_win32.c (native_cond_initialize): ditto.
+
+Sat May  7 12:41:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	fix mutex deadlock test hang-up.
+
+	* thread_win32.c (abs_timespec_to_timeout_ms): fix 1000x calculation
+	  mistake. (ie fix hang-up native_cond_timedwait())
+
+Sat May  7 03:14:13 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	sleep_cond use monotonic time if possible.
+
+	* thread_pthread.c (native_thread_init): change sleep_cond
+	  attribute to monotonic.
+	* thread_pthread.c (native_sleep): use native_cond_timeout().
+
+	* thread_pthread.c (native_cond_timeout): add overflow care.
+	* thread_win32.c (native_cond_timeout): ditto.
+
+Sat May  7 02:49:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	  fix win32 compile error.
+
+	* thread_win32.c (RB_CONDATTR_CLOCK_MONOTONIC): define
+	  RB_CONDATTR_CLOCK_MONOTONIC always.
+	* thread_pthread.c (RB_CONDATTR_CLOCK_MONOTONIC): ditto.
+
+Sat May  7 02:29:41 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	  mutex: deadlock check timeout use monotonic time.
+
+	* thread_pthread.c (native_cond_timeout): new internal api.
+	  it calculate a proper time for argument of native_cond_timedwait().
+	* thread_win32.c (native_cond_timeout): ditto.
+
+	* thread_pthread.c (thread_timer): use native_cond_timeout()
+	  instead of get_ts.
+	* thread.c (lock_func): ditto.
+
+	* thread_pthread.c (get_ts): removed. use native_cond_timeout().
+	* thread.c (init_lock_timeout): ditto.
+
+Sat May  7 01:54:21 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (get_ts): add monotonic clock capability.
+	* thread_pthread.c (rb_thread_create_timer_thread): use monotonic
+	  clock if possible.
+
+Sat May  7 01:43:37 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.h (rb_thread_cond_t): add clockid field. it's
+	  no longer an alias of pthread_cond_t.
+	* thread_pthread.c: adapt new rb_thread_cond_t type.
+	* thread.c (mutex_alloc): ditto.
+	* thread_win32.c (native_cond_initialize): ditto.
+	* configure.in: add check for pthread_cond_attr_setclock() and
+	  clockid_t type.
+
+Fri May  6 23:29:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_wait_for_single_fd): use ppoll() instead of poll()
+	  if possible. based on a patch from Eric Wong. [ruby-core:36003].
+
+Fri May  6 23:13:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: remove nanosleep check. we no longer use it.
+	  r20124 removed last usage.
+
+Fri May  6 22:35:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/rubyext.c (mktime_do): extra digits are not used.
+
+Fri May  6 17:43:07 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/syck/rubyext.c (mktime_do): remove unused variable offset.
+
+	* ext/syck/syck.h: use #ifdef instead of #if DEBUG.
+
+Fri May  6 16:27:33 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/date/date_core.c (DAY_IN_NANOSECONDS): refix: 31438.
+	  check with LONG_MAX and cast as long; without this the calculation
+	  will be done as int and overflow.
+
+Fri May  6 15:01:11 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* ext/syck/rubyext.c (mktime_do): avoid buffer overrun, by
+	  silently ignoring lesser significant digits.  Required buffer
+	  length can be computable so you might at first think of
+	  allocating enough memory space on the fly using alloca().  That
+	  is a wrong idea because when using alloca there is always risk
+	  of integer overflow.  A function that accepts outer-process
+	  resources like this should not blindly trust its inputs.  In
+	  this particular case we just want to generate milliseconds
+	  resolution by strtod() so the string in question needs no more
+	  length than what we originally have.  Ignoring lesser
+	  significant digits should suffice I believe.
+
+Fri May  6 14:25:53 2011  Tinco Andringa <mail@tinco.nl>
+
+	* ext/syck/rubyext.c (mktime_do): YAML.load time correctly parse
+	  usecs smaller than 1 fixes #4571
+
+Thu May  5 22:23:34 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (native_mutex_reinitialize_atfork): removed
+	  unused macro.
+	* thread_win32.c (native_mutex_reinitialize_atfork): ditto.
+
+Thu May  5 22:09:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/date/date_core.c (DAY_IN_NANOSECONDS): long long int is not
+	  available on all platforms.
+
+Thu May  5 17:36:31 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* eval.c (frame_func_id): store result of method_entry_of_iseq() to
+	  cfp->me because method_entry_of_iseq() might become expensive.
+
+Thu May  5 15:03:51 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* eval.c (frame_func_id): __method__ return different name from
+	  methods defined by Module#define_method with a same block.
+	  [ruby-core:35386] fixes #4606
+	* eval.c (method_entry_of_iseq): new helper function. search control
+	  frame stack for a method entry which has given iseq.
+	* test/ruby/test_method.rb: add tests for #4606
+
+Wed May  4 22:13:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* benchmark/bm_vm4_pipe.rb: Reduced iterations. Too slow benchmark
+	  is bad.
+	* benchmark/bm_vm4_thread_pass.rb: ditto.
+
+Wed May  4 22:08:22 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/date/test_date_base.rb: don't use no message skip().
+
+Wed May  4 21:11:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* benchmark/bm_io_select2.rb: reduce number of using file
+	  descriptors. because gdb need some fds.
+
+Wed May  4 19:00:59 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_wait_for_single_fd): Fix wrong return value.
+	* test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb
+	  (TestWaitForSingleFD#test_wait_for_closed_pipe): test for it.
+
+Wed May  4 18:46:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/-test-/wait_for_single_fd: New. for testing
+	  rb_wait_for_single_fd() internal function.
+	  The patch was written by Eric Wong. [ruby-core:35991]
+
+	* test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb: ditto.
+
+Wed May  4 12:46:25 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_wait_for_single_fd): Added POLLNVAL check.
+	  based on a patch from Eric Wong at [ruby-core:35991].
+
+Wed May  4 11:51:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_f_select): remove useless ifdef.
+
+Wed May  4 11:42:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/socket/init.c (wait_connectable): fix error handling code.
+	  RB_WAITFD_OUT is turned on even though an error occur.
+
+Wed May  4 10:12:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/readline/readline.c (readline_event): use rb_wait_for_single_fd().
+	The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
+
+Wed May  4 10:10:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/socket/init.c (wait_connectable): use rb_wait_for_single_fd().
+	  The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
+
+	* ext/socket/init.c (try_wait_connectable, wait_connectable_ensure):
+	  removed.
+
+Wed May  4 10:07:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/io/wait/wait.c (io_wait): use rb_wait_for_single_fd().
+	  The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
+
+Wed May  4 10:01:27 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_wait_for_single_fd): new. poll(2) based backend for
+	  rb_wait_for_single_fd().
+	  Now only Linux uses it.
+
+	The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
+
+Wed May  4 09:56:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_wait_for_single_fd): new.
+	* thread.c (select_single): select(2) based backend for
+	  rb_wait_for_single_fd().
+
+	* io.c (make_writeconv): use rb_wait_for_single_fd() instead of
+	  rb_thread_fd_select().
+	* io.c (rb_io_wait_readable): ditto.
+	* thread.c (rb_thread_wait_fd_rw): ditto.
+
+	* io.c (wait_readable): removed.
+	* thread.c (init_set_fd): new helper function.
+	* include/ruby/io.h (RB_WAITFD_IN, RB_WAITFD_PRI, RB_WAITFD_OUT):
+	  new constant for rb_single_wait_fd().
+
+	The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
+
+Wed May  4 08:04:59 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix time dumping so that
+	  Syck can load UTC times that Psych dumps.
+
+Wed May  4 07:33:00 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_fd_copy): fix wrong argument.This issue was pointed
+	  out by Eric Wong. [ruby-core:35982]
+
+Tue May  3 20:29:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_symbol_mode):
+	  Skip sticky bit test if the platform is FreeBSD. It doesn't allow to
+	  change sticky bit if a target is regular file.
+
+Tue May  3 18:23:57 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/date/test_date.rb (TestDate#test_coerce):
+	  test for [ruby-core:35127].
+
+Tue May  3 04:27:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_select): preserve errno if no error
+	  occurred.
+
+Tue May  3 03:57:04 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_w32_fdcopy): add prototype.  fixes
+	  #4640
+
+Mon May  2 01:02:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/fileutils.rb (FileUtils#chmod): accept symbolic mode argument.
+	  The patch was written by takkanm. [ruby-core:26029][Feature #2190]
+
+	* lib/fileutils.rb (FileUtils#fu_mode): new helper function.
+	* lib/fileutils.rb (FileUtils#symbolic_modes_to_i): ditto.
+	* lib/fileutils.rb (FileUtils#mode_mask): ditto.
+	* lib/fileutils.rb (FileUtils#user_mask): ditto.
+
+	* test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_symbol_mode):
+	  new test for the above symbolic mode.
+	* test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_R): ditto.
+
+Mon May  2 00:36:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/socket/init.c (rsock_connect): add to care EINTR. based
+	  on a patch from Eric Wong at [ruby-core:35621][Bug #4555]
+
+Sun May  1 01:06:24 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_select): release GVL while waiting select().
+
+Sat Apr 30 23:10:15 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/win32.c (rb_w32_fdcopy): New. This can copy even though
+	  fdset size exceed FD_SETSIZE.
+	* include/ruby/intern.h (rb_fd_copy): use rb_w32_fdcopy()
+
+Sat Apr 30 20:18:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (do_select): Change argument type to rb_fdset_t.
+	  Now do_select() is free from unexpected hangup if
+	  HAVE_RB_FD_INIT=1 [Bug #4636]
+
+	* thread.c (rb_thread_fd_select, rb_thread_wait_fd_rw):
+	  adapt new argument type.
+
+	* thread.c (rb_thread_select): make dummy implementation.
+
+Sat Apr 30 20:16:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_fd_copy): Change function argument. Now
+	  rb_fd_copy() has fully copy semantics.
+	* include/ruby/intern.h: ditto.
+
+Sat Apr 30 20:11:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/intern.h (rb_thread_select): mark as deprecated.
+
+	* ext/io/wait/wait.c (wait_readable): use rb_thread_fd_select
+	  instead of rb_thread_select.
+	* ext/socket/init.c (wait_connectable0): ditto.
+	* ext/readline/readline.c (readline_event): ditto.
+	* io.c (rb_io_wait_readable, wait_readable, rb_io_wait_writable,
+	  wait_writable): ditto.
+
+Sat Apr 30 20:06:36 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (do_select): remove useless ifdef. time calculation
+	  is not heavy weight.
+
+Sat Apr 30 16:48:36 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* benchmark/bm_io_select3.rb: New.
+
+Sat Apr 30 16:27:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (copy_stream_body, rb_io_s_copy_stream): move rb_fd_init()
+	  from copy_stream_body to rb_io_s_copy_stream. fds of passing
+	  rb_fd_term() have to be guaranteed initialized.
+
+Sat Apr 30 16:13:17 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* benchmark/bm_io_select.rb, benchmark/bm_io_select2.rb: New.
+	  based on a patch from Eric Wong at [Feature #4531]
+
+Sat Apr 30 03:25:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/io/wait/test_io_wait.rb: New. for testing ext/io/wait.
+	  the patch was written by Eric Wong. [Feature #4531]
+
+Sat Apr 30 00:34:56 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/win32.h: remove redundant declaration of
+	  rb_w32_time_subtract().
+
+Sat Apr 30 00:16:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (gvl_init): fix hangup if GVL_SIMPLE_LOCK=1.
+	  We don't have to call mutex_unlock() before initialize it!
+
+Fri Apr 29 13:15:15 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_win32.c (native_cond_timedwait): New. r31373 caused
+	  win32 build failure.
+
+	* thread_win32.c (__cond_timedwait, abs_timespec_to_timeout_ms):
+	  New helper functions.
+
+	* win32/win32.c (rb_w32_time_subtract): rename from subtract and
+	  remove static.
+
+Fri Apr 29 10:43:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* benchmark/bm_vm4_pipe.rb: Add two new benchmark for GVL
+	  performance. They was written by Koichi Sasada.
+	* benchmark/bm_vm4_thread_pass.rb: ditto.
+
+Fri Apr 29 10:25:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_method.c (rb_clear_cache_by_class): Revert r29673. It made
+	  a segmentation fault regression. [Bug #4289][ruby-core:34554].
+
+Fri Apr 29 10:24:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (make_writeconv): do not add textmode newline decorator if any
+	  newline decorator is set already.  fixes #4618, fixes #4619
+
+Fri Apr 29 10:17:42 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (lock_func): small cleanup.
+
+Fri Apr 29 10:07:13 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_mutex_lock, lock_func): Avoid busy loop and
+	  performance regression. bm_vm3_thread_mutex.rb performance
+	  change from 109.064sec to 16.331sec. [Feature #4607]
+
+	* thread.c (init_lock_timeout): New helper function.
+
+Thu Apr 28 16:15:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{win32.c,dir.h} (rb_w32_uopendir): new API to pass UTF-8 path.
+
+	* win32/win32.c (opendir_internal, rb_w32_opendir): extract and merge
+	  common part of rb_w32_opendir() and rb_w32_uopendir().
+
+	* dir.c (do_opendir, glob_helper): encoding.
+
+	* dir.c (dir_initialize, do_opendir): convert path to UTF-8 and call
+	  rb_w32_uopendir() instead of rb_w32_opendir() on Windows.
+	  fixes #4491, reported by Joey Zhou.
+
+Thu Apr 28 15:32:53 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on
+	  mswin/mingw.
+
+Thu Apr 28 06:07:06 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/csv.rb (CSV::open): suppress universal newline decorator.
+	  fixes #4603
+
+	* lib/csv.rb (CSV.read): no mode is needed.
+
+Thu Apr 28 06:06:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_extract_modeenc, rb_f_backquote): set default text
+	  mode.  fixes #4619
+
+	* io.c (pipe_open): set universal newline decorator if needed.
+
+Wed Apr 27 11:33:08 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/emoji_iso2022_kddi.trans: ISO-2022-JP-KDDI doesn't have
+	  CP932 UDA. Another reason is emacs-mule: the implementation of
+	  stateless-iso-2022-jp doesn't support beyond 94x94 (0x7fxx);
+	  but CP932 UDA is in 7Fxx-92xx.
+
+Wed Apr 27 07:42:44 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (STRIP): use proper toolchain.  based on a patch
+	  from Jon Forums at [ruby-core:35909].  fixes #4617
+
+Wed Apr 27 01:20:59 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (date_zone_to_diff): renamed.
+	* ext/date/date_parse.c: ditto.
+	* ext/date/date_strptime.c: ditto.
+
+Wed Apr 27 01:16:59 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_find): accept Encoding objects.
+
+Wed Apr 27 00:55:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (econv_opts): add newline option.
+
+	* io.c (validate_enc_binmode, rb_io_extract_modeenc): set newline
+	  decorator according to open mode.
+
+	* transcode.c (rb_econv_prepare_options): new function, to prepare
+	  econv options with newline flags.
+
+	* include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_MASK): add.
+
+Wed Apr 27 00:51:01 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_truncate): fix function.
+
+	* include/ruby/win32.h (ftruncate, truncate, ftello, fseeko): non-64
+	  versions on mingw are useless because they use int32_t.  fixes #4564
+
+Wed Apr 27 00:50:33 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: modified validation methods.
+	* ext/date/lib/date.rb: ditto.
+
+Wed Apr 27 00:00:37 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (dt_lite_set_tmx): should get df value.
+
+Tue Apr 26 22:34:04 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/lib/date/format.rb (_iso8601): allowed day only civil
+	  date.  disallowed separatorless day only ordinal date.
+
+Mon Apr 25 21:31:36 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
+
+	* ext/openssl/extconf.rb: Should check SSLv2_*method.
+	  openssl compiled with "no-ssl2" the extconf don't fail
+	  when running `make' having this compilation errors.
+	  Patched by Laurent Arnoud. fixes #4562, #4556
+
+Mon Apr 25 20:53:32 2011  Tajima, Akio <artonx@yahoo.co.jp>
+
+	* win32/win32.c (kill): accept 0 only sig is SIGINT #4596
+
+Mon Apr 25 19:59:47 2011  Tajima, Akio <artonx@yahoo.co.jp>
+
+	* win32/win32.c (kill): accept 0 as pid, fixes #4596
+
+Mon Apr 25 16:43:45 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* random.c (random_rand): remove unused variables.
+
+	* struct.c (rb_struct_define_without_accessor): ditto.
+
+	* strftime.c (rb_strftime_with_timespec): ditto.
+
+	* sprintf.c: ditto.
+
+	* time.c (time_asctime): remove useless GetTimeval().
+
+	* thread_pthread.c: cast to (void *) for %p.
+
+Mon Apr 25 11:02:11 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/ripper/lib/ripper/sexp.rb: fix rdoc around sexp.
+	  patched by Sho Hashimoto. fixes #4599
+
+Mon Apr 25 08:24:04 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* random.c (rb_f_rand, random_s_rand): RDocs for them.
+
+Mon Apr 25 07:18:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* random.c (random_s_rand, Init_Random): Random.rand should behave as
+	  Random::DEFAULT.rand rather than Kernel#rand.
+
+	* random.c (rand_range, random_rand): rand_range function extracted
+	  from random_rand function.
+
+	* random.c (rb_f_rand): accept a Range argument as Random#rand
+	  [ruby-dev:43427] #4605
+
+Mon Apr 25 03:31:06 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/time.rb: require 'date'.
+	* ext/date/lib/date/format.rb: removed require line.
+
+Mon Apr 25 03:08:39 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/lib/date/format.rb: require 'date'.
+
+Mon Apr 25 03:04:16 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/lib/date/format.rb (_iso8601): added a pattern.
+
+Mon Apr 25 02:51:22 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/date/lib/date/format.rb: require 'date_core.so'.
+	  date/format needs methods which are now in date_core.so.
+	  This breaks make rdoc which uses Date._parse from time.rb.
+
+Mon Apr 25 02:47:46 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/lib/date/format.rb (_iso8601): fixed a bug of regex.
+
+Mon Apr 25 02:12:26 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/lib/date/format.rb: an adjustment of regex.
+
+Mon Apr 25 01:58:50 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/lib/date/format.rb: omitted to call _parse.
+
+Mon Apr 25 01:03:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* string.c (rb_to_id): remove unused variable.
+
+Sun Apr 24 22:19:05 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c, rational.c: omitted some method calls.
+
+Sun Apr 24 02:57:27 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c (n2i): takes long.
+
+Sun Apr 24 02:51:06 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c: reverted.
+
+Sun Apr 24 02:25:23 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/intern.h: pcc can't use __builtin_constant_p.
+
+	* vm_exec.c: change condition.
+
+Sun Apr 24 01:58:01 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/date/date_core.c (leap_p): suppress warning: parentheses.
+
+	* ext/date/date_core.c (date_s__parse_internal): remove unused
+	  variable "str".
+
+	* ext/date/date_parse.c (parse_ddd_cb): use RSTRING_LENINT.
+
+	* ext/date/date_strftime.c (date_strftime_with_tmx): remove unused
+	  variable.
+
+Sun Apr 24 00:34:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c: removed some unused macros.  use strchr()
+	  instead of index().
+
+Sat Apr 23 21:29:42 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: replacement of implementation of
+	  _parse.  [experimental]
+	* ext/date/date_parse.c: new.
+	* ext/date/lib/date/format.rb: removed ruby version of _parse.
+
+Fri Apr 22 12:04:15 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (rb_ary_sort_bang): fix rdoc.
+	  patched by burningTyger. https://github.com/ruby/ruby/pull/11
+
+Fri Apr 22 11:49:49 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/xmlrpc/create.rb (XMLRPC::Create#conv2value):
+	  XML-RPC's int is 32bit int, and Fixnum also may be beyond 32bit.
+
+	* lib/xmlrpc/create.rb (XMLRPC::Create#conv2value):
+	  XML-RPC doesn't allow Infinity and NaN.
+	  http://www.xmlrpc.com/spec
+
+Fri Apr 22 04:16:14 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (parse): strings from psych have proper taint
+	  markings.
+
+	* test/psych/test_tainted.rb: test for string taint
+
+Thu Apr 21 01:30:02 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* random.c (rb_f_srand): fix rdoc: srand(0)'s 0 is a seed.
+	  [ruby-core:35833] fixes #4590
+
+Thu Apr 21 01:01:28 2011  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): maximum length of lpCommandLine is
+	  32,768 characters, including the Unicode terminating null character.
+
+Wed Apr 20 21:32:11 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strptime.c (date__strptime_internal): do not
+	  overwrite local variables.
+
+Wed Apr 20 14:41:28 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_each_line): check string's length when compare
+	  separator and string. [ruby-core:35815] fixes #4586
+
+Wed Apr 20 00:02:13 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-parse-partial): use position of open paren.
+
+Tue Apr 19 01:00:21 2011  Tajima Akio <artonx@yahoo.co.jp>
+
+	* test/ruby/test_io.rb (TestIO#test_cross_thread_close_fd):
+	  skip cross thread pipe close if windows
+
+Mon Apr 18 12:15:46 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
+	  avoid float error. [ruby-core:35804]
+
+Sun Apr 17 00:20:14 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_{core,strftime}.c: use struct tmx instead of vtm.
+	* ext/date/date_tmx.h: new.
+
+Sat Apr 16 22:23:52 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strftime.c (date_strftime_wo_timespec): changed
+	  the way of validation of locale modifiers.
+
+Sat Apr 16 21:55:12 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: replacement of implementation of
+	  _strptime.  [experimental]
+	* ext/date/date_strptime.c: new.
+	* ext/date/lib/date/format.rb: removed ruby version of _strptime.
+
+Sat Apr 16 10:18:30 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* vm.c (Init_VM): suppress warning: "OPT_BASIC_OPERATIONS" is not
+	  defined.
+
+Fri Apr 15 23:41:18 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ruby.c (proc_options): suppress warning:
+	  "ALLOW_DEFAULT_SOURCE_ENCODING" is not defined.
+
+Fri Apr 15 15:10:29 2011  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/uri/generic.rb (#route_from_path): Fix a bug where
+	  URI('http://h/b/').route_to('http://h/b') wrongly returned './'
+	  (should be '../b'). [Bug #4476]
+
+Fri Apr 15 14:58:06 2011  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/fileutils.rb (FileUtils#touch): Fix corrupted output when
+	  mtime is specified in addition to nocreate (and verbose).
+	  ref [ruby-dev:43401]
+
+Thu Apr 14 23:43:43 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (ruby_float_step): wrong loop condition.
+	  fixes [ruby-core:35753], reported by Joey Zhou.
+
+	* test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
+	  test above change.
+
+Thu Apr 14 22:48:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Options#setup_options): set possible
+	  values for completion. no conversion is needed.
+
+	* lib/test/unit.rb (Test::Unit::Runner::Worker#initialize): use
+	  positional arguments instead of keyword arguments.
+
+	* lib/test/unit.rb (Test::Unit::Runner#jobs_status): io/console may
+	  not be available. use 80 as the last resort if IO#winsize and
+	  COLUMNS are unavailable.
+
+	* lib/test/unit.rb (Test::Unit::Runner::Worker#died): rename using a
+	  verb.
+
+	* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): check if worker
+	  is signaled and use its exit status.
+
+	* lib/test/unit.rb (Test::Unit::Runner::Worker#dead): no longer @in
+	  and @out are separated.
+
+Thu Apr 14 21:23:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_autoload_p): search superclasses as same as actual
+	  loading.  fixes [ruby-core:35679]
+
+Thu Apr 14 21:21:06 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (frexp, modf): wrongly declared as pure in
+	  mingw math.h.
+
+	* include/ruby/win32.h (ftruncate, truncate): mingw64 misses
+	  prototypes.
+
+	* win32/win32.c (rb_w32_read): suppress warning.
+
+Thu Apr 14 19:55:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/fileutils.rb (FileUtils#touch): fix corrupted output when
+	  FileUtils.touch(:nocreate => true, :verbose => true) case.
+	  The patch was written by Hiroyuki Iwatsuki. [ruby-dev:43401]
+
+Thu Apr 14 16:01:45 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* io.c (rb_f_syscall): suppress warning: "HAVE___SYSCALL" is not
+	  defined.
+
+Thu Apr 14 00:41:09 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* thread.c (thread_fd_close_i): IOError exception should be assigned
+	  to rb_thread_t::thrown_errinfo.
+
+Wed Apr 13 20:12:26 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* io.c (rb_io_fdatasync): remove unused variable.
+
+Tue Apr 12 20:54:12 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/st.h: parenthesize macro arguments.
+
+Tue Apr 12 19:19:50 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb: avoid race condition. fixes #4572
+
+Tue Apr 12 18:07:13 2011  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/extconf.rb: --disable-libedit to disable
+	  libedit. fixes #4550
+
+Tue Apr 12 10:37:39 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h: VC doesn't have ftruncate() and others, but
+	  ruby needs HAVE_ macros to use our emulation functions.
+	  (fix the problem of 31262)
+
+Tue Apr 12 01:33:00 2011  Luis Lavena  <luislavena@gmail.com>
+
+	* configure.in: properly evaluate existence of truncate, ftruncate
+	  and ftello for MinGW. [ruby-core:35678]
+	* win32/win32.c: rename truncate, ftruncate and ftello to avoid
+	  redefinitions.
+	* win32/win32.h: ditto.
+
+Mon Apr 11 21:51:52 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c: revert r31230. Because it made a regression.
+	  [ruby-core:35631]
+
+Mon Apr 11 21:49:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_io.rb: Added TestIO#test_cross_thread_close_stdio
+	  and TestIO#test_cross_thread_close_fd.
+	  The patch was written by Eric Wong. [ruby-core:35669]
+
+Mon Apr 11 21:15:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* file.c (rb_group_member): kill 256K of stack usage.
+	  the patch was written by Eric Wong. [ruby-core:35699]
+
+Mon Apr 11 07:24:13 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl.c:  Fix typo, document version constants.
+
+Sun Apr 10 22:23:45 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h: parenthesize macro arguments.
+
+Sat Apr  9 23:31:47 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* ext/stringio/stringio.c (strio_each, strio_readlines):
+	  Use `NUM2LONG` instead of `FIX2INT`. Fixes [ruby-dev:43395].
+
+Sat Apr  9 23:22:27 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* ext/stringio/stringio.c (strio_each):
+	  Fix exception message and don't raise immediately if block is not
+	  given.
+	  Fixes [ruby-dev:43394].
+
+	* test/stringio/test_stringio.rb (test_each_line_limit_0):
+	  Fix test for above.
+
+Sat Apr  9 21:54:15 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* ext/stringio/stringio.c (strio_each, strio_readlines):
+	  limit must not be zero. Fixes [ruby-dev:43392].
+
+	* test/stringio/test_stringio.rb: Add tests for above.
+
+Sat Apr  9 18:01:36 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/util.h: parenthesize macro arguments.
+
+Fri Apr  8 16:01:56 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_getline): check whether str is
+	  a string when str and lim are given.
+	  https://twitter.com/watson1978/status/56225052152168449
+
+Thu Apr  7 20:03:52 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h: parenthesize macro arguments.
+
+Wed Apr  6 21:08:31 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h: parenthesize macro arguments.
+
+Wed Apr  6 15:12:40 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize):
+	  pop pushed error after each try of reading. fixes #4550
+
+	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_initialize): ditto.
+
+Wed Apr  6 11:36:44 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize):
+	  pop pushed error after each try of reading. fixes #4550
+
+Tue Apr  5 20:33:43 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/encoding.h: parenthesize macro arguments.
+
+Mon Apr  4 22:02:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/io/nonblock/nonblock.c (io_nonblock_set): Avoid F_SETFL if
+	  we're not changing the O_NONBLOCK bit. F_SETFL is an expensive
+	  operation since it needs to affect all processes with the same
+	  file object.
+	  The patch is written by Eric Wong. [ruby-core:35556]
+
+Mon Apr  4 21:41:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_syswrite): While local FS writes are usually
+	  buffered, the buffers can be full or the file opened with
+	  O_SYNC. IO#syswrite can also be used on blocking IOs
+	  (pipe/socket) just like IO#write.
+	  The patch is written by Eric Wong. [ruby-core:35554]
+
+Mon Apr  4 11:50:40 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/test_tempfile.rb: simply ignore platform dependent testcases
+	  instead of skipping.
+
+Sun Apr  3 22:52:22 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* ext/syslog/syslog.c: improve rdoc.
+	  a patch by Jonas Pfenniger. [ruby-core:35592] fixes #4545
+
+Sun Apr  3 22:10:09 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/zlib/zlib.c: parenthesize macro arguments.
+
+Sun Apr  3 21:33:58 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: disable fdatasync again on Mac OS X.
+	  [ruby-core:35493][Bug #4500]
+
+Sun Apr  3 21:16:20 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (io_reopen): IO#close releases GVL if possible.
+	  close() may block for certain file types (NFS, SO_LINGER
+	  sockets, inotify), so let other threads run. The patch was
+	  created by Eric Wong [ruby-core:35555][Bug #4527]
+
+	* io.c (fptr_finalize): ditto.
+
+	* io.c (maygvl_fclose): new.
+	* io.c (nogvl_fclose): ditto.
+	* io.c (maygvl_close): ditto.
+	* io.c (nogvl_close): ditto.
+
+Fri Apr  1 22:25:50 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/syslog/syslog.c: parenthesize macro arguments.
+
+Fri Apr 1 18:53:06 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/webrick/cookie.rb (WEBrick::Cookie.parse): 'white space is
+	  permitted between tokens' according to RFC2965. Though 'Netscape
+	  spec' does not define the syntax clearly, make it tolerant as a
+	  server. As a real-world example, rest-client gem sends
+	  'Cookie: foo=1;bar=2'
+
+	* test/webrick/test_cookie.rb (test_parse_non_whitespace): test it.
+
+Fri Apr  1 13:19:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (RUBY_VM_CHECK_INTS_TH): merge a patch by ko1
+	  in [ruby-dev:43373].
+
+Thu Mar 31 23:15:46 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-brace-to-do-end, ruby-do-end-to-brace):
+	  adjust space between block beginning and block arguments
+
+Thu Mar 31 20:42:05 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/strscan/strscan.c:  parenthesize macro arguments.
+
+Thu Mar 31 18:06:12 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_get_ev_const): should ignore crefs with
+	  the NODE_FL_CREF_PUSHED_BY_EVAL flag.
+
+Thu Mar 31 16:49:56 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_get_ev_const): search root cref properly.
+	  [ruby-dev:43365]
+
+Thu Mar 31 14:50:25 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_s_constants): should ignore crefs with
+	  the NODE_FL_CREF_PUSHED_BY_EVAL flag.
+
+Wed Mar 30 22:55:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-toggle-block): toggle do/end and {}.
+
+	* misc/ruby-mode.el (ruby-move-to-block): move to opening of
+	  block.
+
+Wed Mar 30 14:35:15 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.h (COPY_CREF): should copy
+	  the NODE_FL_CREF_PUSHED_BY_EVAL flag to hide constants from
+	  methods defined by class_eval.  [ruby-dev:43365]
+
+Wed Mar 30 00:24:53 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/stringio/stringio.c: parenthesize macro arguments.
+
+Tue Mar 29 21:51:31 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* object.c (rb_String): Kernel#String should call to_str before to_s.
+
+Tue Mar 29 10:28:08 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/webrick/test_filehandler.rb
+	  (WEBrick::TestFileHandler#test_short_filename): the cgi doesn't exist
+	  on current directory.
+
+Tue Mar 29 05:19:57 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c: parenthesize macro arguments.
+
+Tue Mar 29 00:03:51 2011 Tajima Akio <artonx@yahoo.co.jp>
+
+	* test/webrick/test_filehandler.rb (test_short_filename):
+	  read real short filename by cmd because smb mounted files
+	  have different naming convention.
+
+Mon Mar 28 11:38:08 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/date/date_core.c (date_s_today): use int for year.
+
+	* ext/date/date_core.c (datetime_s_now): ditto.
+
+Mon Mar 28 11:07:41 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/extmk.rb: set MFLAGS from MAKEFLAGS when using nmake.
+
+Mon Mar 28 11:07:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (love): all you need is love.
+
+Sun Mar 27 23:16:31 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ipsocket.c: parenthesize macro arguments.
+
+Sun Mar 27 16:55:34 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-mode-map): remove unnecessary
+	  binding. fixes
+	  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468952
+
+	* misc/ruby-mode.el: suppress warnings at byte compile.  fixes
+	  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502926
+
+Sun Mar 27 11:18:35 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: removed unused variables.
+
+Sat Mar 26 15:16:09 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/getaddrinfo.c: parenthesize macro arguments.
+
+Sat Mar 26 05:27:34 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/date/lib/date/format.rb (DateTime#strftime): removed because
+	  date_core defines it.
+
+Fri Mar 25 21:59:45 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: should not force cast with macros.
+
+Fri Mar 25 21:56:10 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/sdbm/init.c: parenthesize macro arguments.
+
+Fri Mar 25 19:39:40 2011  Ben Walton <bwalton@artsci.utoronto.ca>
+
+	* test/test_syslog.rb:
+	  Skip syslog tests that rely on LOG_PERROR unless it's defined
+
+	  Instead of checking looking at the platform to determine if the tests
+	  relying on LOG_PERROR should be run, look for the definition of the
+	  constant as this will be robust against all platforms as long as the
+	  underlying syslog.c code sets it up correctly.
+
+	  This specifically addresses failures on Solaris 9.
+
+	  Use LOG_PID instead of LOG_PERROR in Syslog.open test
+
+	  LOG_PERROR isn't a POSIX option for syslog, so it fails on platforms
+	  that don't define it.  Solaris 9 and 10 are examples of this.
+
+	  Use LOG_PID instead.
+
+Fri Mar 25 15:42:17 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/sdbm/_sdbm.c (sdbm_open): use size_t.
+
+	* ext/syck/bytecode.c: ditto.
+
+	* ext/sdbm/_sdbm.c (delpair): use ptrdiff_t.
+
+	* ext/sdbm/init.c: use RSTRING_LENINT.
+
+	* ext/dl/handle.c: suppress warning: shorten-64-to-32.
+
+	* ext/strscan/strscan.c: ditto.
+
+	* ext/syck/emitter.c: ditto.
+
+	* ext/syck/implicit.c: ditto.
+
+	* ext/syck/syck.c: ditto.
+
+	* ext/syck/token.c: ditto.
+
+Fri Mar 25 12:14:58 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: import nkf 7f18e30.
+
+Fri Mar 25 11:49:29 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_process.rb (TestProcess#test_no_curdir): skip silently
+	  on Windows, because this tests a platform specific feature and it'll
+	  never be supported on ruby on Windows.
+
+	* test/ruby/test_dir_m17n.rb
+	  (TestDir_M17N#test_filename_extutf8_invalid,
+	  TestDir_M17N#test_filename_as_bytes_extutf8): ditto.
+
+	* test/open-uri/test_open-uri.rb
+	  (TestOpenURI#test_find_proxy_case_sensitive_env): ditto.
+
+	* test/dl/test_handle.rb (DL::TestHandle#test_NEXT,
+	  DL::TestHandle#test_DEFAULT): ditto.
+
+Thu Mar 24 23:06:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_get_ev_const): should not autoload in
+	  defined? mode.
+
+	* variable.c (rb_const_defined_0): fix autoloading base.
+	  [ruby-core:35509]
+
+Thu Mar 24 22:48:43 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/sdbm/_sdbm.c: parenthesize macro arguments.
+
+Thu Mar 24 14:45:57 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl.c: suppress warning: shorten-64-to-32.
+
+	* ext/openssl/ossl.h: ditto.
+
+	* ext/openssl/ossl_asn1.c: ditto.
+
+	* ext/openssl/ossl_bio.c: ditto.
+
+	* ext/openssl/ossl_bn.c: ditto.
+
+	* ext/openssl/ossl_cipher.c: ditto.
+
+	* ext/openssl/ossl_hmac.c: ditto.
+
+	* ext/openssl/ossl_ns_spki.c: ditto.
+
+	* ext/openssl/ossl_ocsp.c: ditto.
+
+	* ext/openssl/ossl_pkcs5.c: ditto.
+
+	* ext/openssl/ossl_pkey.c: ditto.
+
+	* ext/openssl/ossl_pkey_dh.c: ditto.
+
+	* ext/openssl/ossl_pkey_dsa.c: ditto.
+
+	* ext/openssl/ossl_pkey_ec.c: ditto.
+
+	* ext/openssl/ossl_pkey_rsa.c: ditto.
+
+	* ext/openssl/ossl_rand.c: ditto.
+
+	* ext/openssl/ossl_ssl.c: ditto.
+
+	* ext/openssl/ossl_x509ext.c: ditto.
+
+	* ext/openssl/ossl_x509name.c: ditto.
+
+Thu Mar 24 11:48:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_rand.c (ossl_rand_egd_bytes): use NUM2INT because
+	  the result is used with functions whose argument is int.
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): ditto.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_set_purpose): ditto.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_set_trust): ditto.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_purpose): ditto.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_trust): ditto.
+
+Thu Mar 24 11:36:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_x509name.c: id_aref's type is ID.
+
+Thu Mar 24 10:04:35 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/io/console/console.c (console_set_winsize):
+	  suppress warning: shorten-64-to-32.
+
+Thu Mar 24 09:56:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify): flags is VALUE,
+	  so it should use NUM2INT.
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): ditto.
+
+Wed Mar 23 21:09:29 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/readline/readline.c: parenthesize macro arguments.
+
+Wed Mar 23 08:07:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_round): fix inaccurate results.
+
+Wed Mar 23 00:12:16 2011  Tajima Akio <artonx@yahoo.co.jp>
+
+	* win32/win32.c: wait process real termination after reading
+	  exit code. fixes #4518
+
+Tue Mar 22 21:20:10 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rubygems/test_case.rb: save current dir to @current_dir
+	  before Dir.chdir.
+
+Tue Mar 22 20:10:04 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/psych/parser.c: parenthesize macro arguments.
+
+Tue Mar 22 20:10:01 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ruby_missing.h: parenthesize macro arguments.
+
+Tue Mar 22 13:33:22 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/buffering.rb: removed circular require of
+	  openssl.rb.
+
+	* ext/openssl/lib/openssl/*: removed following comment for transition
+	  measures of avoiding circular require. No one claimed about this as
+	  far as I know.
+	  ##
+	  # Should we care what if somebody require this file directly?
+	  # require "openssl"
+
+Tue Mar 22 10:57:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/runner.rb: set Gem::TestCase's @@project_dir.
+
+	* lib/rubygems/test_case.rb: set Gem::TestCase's @@project_dir only
+	  when it is not defined.
+
+Tue Mar 22 09:38:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (flo_round): use pow instead of while-loop. fixes #4510
+	  patched by Alex Young [ruby-core:35526]
+
+Tue Mar 22 06:47:46 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/date/date_strftime.c (date_strftime_wo_timespec):
+	  suppress warning: shorten-64-to-32.
+
+Tue Mar 22 06:42:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/date/date_core.c: suppress warning: shorten-64-to-32.
+
+Tue Mar 22 06:41:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/test/unit/parallel.rb: remove unused variable.
+
+Tue Mar 22 06:19:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/utf_16le.c: suppress warning: shorten-64-to-32.
+
+	* ext/dbm/dbm.c: ditto.
+
+	* ext/gdbm/gdbm.c: ditto.
+
+	* parse.y (Init_ripper): suppress warning: unused value.
+
+Mon Mar 21 11:21:32 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb: Refactoring. Unified if and elsif.
+
+Sun Mar 20 23:09:34 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strftime.c: checks duplicated modifiers.
+
+Sun Mar 20 22:32:30 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strftime.c: removed unused code and arguments.
+
+Sun Mar 20 21:34:49 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: replacement of implementation of
+	  strftime. It has some limitations that is same as Time's
+	  one.  [experimental]
+	* ext/date/date_strftime.c: new.
+	* ext/date/lib/date/format.rb: removed ruby version of strftime.
+
+Sun Mar 20 12:43:12 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_x509store.c: parenthesize macro arguments.
+
+Sun Mar 20 01:39:48 2011  Tajima Akio <artonx@yahoo.co.jp>
+
+	* hash.c (ruby_setenv): check env process block size with OS ver.
+	* win32/win32.c: export rb_w32_osver for above patch.
+	* include/ruby/win32.h: declare rb_w32_osver for Win32 Libs.
+
+Sat Mar 19 18:35:05 2011  Tajima Akio <artonx@yahoo.co.jp>
+
+	* hash.c (ruby_setenv): calculate total env block size for win32.
+	* test/ruby/test_env.rb: add test for above patch.
+
+Sat Mar 19 17:14:46 2011  Tajima Akio <artonx@yahoo.co.jp>
+
+	* hash.c (ruby_setenv): checking with max process environment
+	  block size for Win32. 32767 for 2000/XP, 2003. if failed to
+	  read the block, then checking with 5120 for earlier Windows.
+
+Sat Mar 19 12:30:25 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_x509revoked.c: parenthesize macro arguments.
+
+Fri Mar 18 20:44:36 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_x509req.c: parenthesize macro arguments.
+
+Fri Mar 18 08:48:06 2011  Oleg Shaldybin  <oleg.shaldybin@gmail.com>
+
+	* lib/fileutils.rb (FileUtils::Entry_#copy_file): updated FileUtils.cp
+	  to still copy file permissions when :preserve is false (as cp does
+	  this even when -p isn't set).
+
+Fri Mar 18 00:59:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32ole/extconf.rb (create_docfile): removed.  should not
+	  modify source directory unnecessarily, platform dependent
+	  documentation should be dealt with by rdoc.  [ruby-core:35495]
+
+Fri Mar 18 00:54:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_funcall_passing_block): add prototype.
+	  a patch by James M. Lawrence at [ruby-core:35501]
+
+Wed Mar 17 06:23:31 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_x509name.c: parenthesize macro arguments.
+
+Wed Mar 16 20:36:56 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ipsocket.c (init_inetsock_internal): raise an error on
+	  listen(2) failure.
+	  reported by Xavier Shay.  [ruby-core:35505]
+
+Wed Mar 16 15:06:21 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/lib/openssl/buffering.rb (module OpenSSL): #flush should
+	  not change sync mode on exception.
+	* test/openssl/test_buffering.rb: added
+
+Wed Mar 16 13:45:28 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/lib/openssl/buffering.rb: de-nest Buffering module
+
+	* ext/openssl/lib/openssl/buffering.rb: add RDoc
+
+Wed Mar 16 08:40:39 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_x509ext.c: parenthesize macro arguments.
+
+Tue Mar 15 18:34:27 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_x509crl.c: parenthesize macro arguments.
+
+Tue Mar 15 09:49:03 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/misc/test_ruby_mode.rb (test_singleton_class): Skip for Pending.
+
+Mon Mar 14 21:20:44 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/ruby/test_require.rb (test_require_too_long_filename):
+	  increase path length, because MAXPATHLEN is defined as 4096 on linux.
+
+	* test/ruby/test_require.rb (test_require_path_home_1): ditto.
+
+	* test/ruby/test_require.rb (test_require_path_home_2): ditto.
+
+Mon Mar 14 19:54:37 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_x509cert.c: parenthesize macro arguments.
+
+Sun Mar 13 18:11:28 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_x509attr.c: parenthesize macro arguments.
+
+Sun Mar 13 16:07:58 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/pstore.rb: Fix don't raise "nested transaction" when thread_safe
+	  is true. Patch by Masaki Matsushita (Glass_saga). [ruby-dev:43337]
+
+	* test/test_pstore.rb: Test for above.
+	  Patch by Masaki Matsushita (Glass_saga) [ruby-dev:43337]
+
+Sat Mar 12 04:12:41 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_ssl_session.c: parenthesize macro arguments.
+
+Sat Mar 12 02:27:07 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c ({d,dt}_lite_marshal_load): checks the given
+	  argument.
+
+Sat Mar 12 01:26:24 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: changed some directives.
+
+Sat Mar 12 01:16:02 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c, ext/date/lib/*: moved rdoc descriptions.
+
+Sat Mar 12 00:06:24 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/lib: moved from lib.
+
+Fri Mar 11 23:32:38 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/delta*: removed undocumented delta.
+
+Fri Mar 11 18:42:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (find_executable0): should exclude directories.
+
+Fri Mar 11 01:40:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (proc_getmaxgroups, proc_setmaxgroups): Process#maxgroups
+	  and Process#maxgroups= now raise NotImplementedError if the
+	  platform don't support supplementary groups concept.
+
+Fri Mar 11 01:25:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (get_sc_ngroups_max): return -1 if platform don't
+	  support NGROUPS_MAX.
+
+Thu Mar 10 22:28:15 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_ssl.h: parenthesize macro arguments.
+
+Thu Mar 10 21:59:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (parser_encode_length): add exception as UTF8-MAC for
+	  magic comment's emacs newline specifier
+	  patched by James M. Lawrence [ruby-core:35476] fixes #4489
+
+Thu Mar 10 16:00:22 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (parser_encode_length): fix typo: the length of
+	  "-dos" and "-mac" is not 5 but 4.
+	  patched by James M. Lawrence [ruby-core:35476] fixes #4489
+
+Thu Mar 10 10:52:01 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_require.rb: setting too long string to ENV causes
+	  Errno::EINVAL on Windows.  long path name errors may causes over
+	  about 1024 bytes, then limit it about 4000 bytes.
+
+Thu Mar 10 10:09:35 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner::Worker#read): fix for the case
+	  when IO#read or IO#gets returns nil.
+
+Thu Mar 10 07:12:03 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/rubygems*: Import rubygems 1.6.2 (release candidate @ 2026fbb5)
+	* test/rubygems: Ditto
+	* test/runner.rb: Added test to load path to fix test requires.
+
+Thu Mar 10 03:00:43 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_ssl.c: parenthesize macro arguments.
+
+Wed Mar  9 23:51:26 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/ruby/test_io_m17n.rb (test_io_new_enc): "sjis" is now an alias
+	  of Windows-31J.
+
+Wed Mar  9 23:06:13 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-parse-partial): fix indent after aref.
+
+Wed Mar  9 12:50:24 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: Rescue exceptions when
+	  people implement the method method. Thanks Lin Jen-Shin.
+	  [ruby-core:35255]
+
+	* test/psych/visitors/test_yaml_tree.rb: test for implementation of
+	  method method.
+
+Wed Mar  9 11:53:31 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/shift_jis.c: Change SJIS as an alias of Windows-31J.
+	  [ruby-dev:43027] fixes #4280
+
+	* enc/shift_jis.c: Add PCK as an alias of Windows-31J.
+
+Wed Mar  9 00:45:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: nmake substitutes all occurrences in macro.
+
+	* ext/extmk.rb: workaround for nmake.
+
+Tue Mar  8 23:49:45 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (proc_setgroups): cleanup.
+
+Tue Mar  8 23:40:30 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/misc/test_ruby_mode.rb: test for ruby-mode.el.
+
+Tue Mar  8 23:27:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (get_sc_ngroups_max): try to use NGROUPS_MAX at first if
+	  _SC_NGROUP_MAX is not defined.
+
+Tue Mar  8 23:10:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-parse-partial): fix for array in block.
+
+Tue Mar  8 21:44:49 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_rand.c: parenthesize macro arguments.
+
+Tue Mar  8 16:45:31 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* hash.c (ruby_setenv): MSDN says that Windows XP or earlier limits
+	  the total size of environment block to 5,120 chars.  and on such
+	  OS, putenv() causes SEGV.  So, ruby should limit the size of an
+	  environment variable to 5,120 bytes for workaround.
+
+Tue Mar  8 15:57:20 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rubygems/test_gem_spec_fetcher.rb
+	  (TestGemSpecFetcher#test_cache_dir_escapes_windows_paths): cache_dir
+	  may have driveletter and `:' for base of cache_dir itself, so need
+	  to skip it for checking.
+
+Tue Mar  8 12:30:06 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-deep-indent-paren-p, ruby-calculate-indent):
+	  do not apply deep-indent inside parens at the beginning of
+	  expressions.
+
+Tue Mar  8 09:32:48 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (configure-ext, build-ext), ext/extmk.rb (extmake):
+	  support parallel-make under ext.
+
+Tue Mar  8 09:25:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_setgroups): use getgrnam() if getgrnam_r() is
+	  not available.
+
+	* process.c: RARRAY_LEN() returns long int.
+
+Tue Mar  8 09:07:03 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_REPLACE_TYPE): enclose in quotes for multiple
+	  type names.
+
+Tue Mar  8 01:43:11 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c (get_sc_ngroups_max): define to wrap sysconf(3).
+	  this also supports Windows which doesn't have sysconf(3).
+
+	* process.c (maxgroups): use get_sc_ngroups_max.
+
+	* process.c (proc_setmaxgroups): ditto.
+
+Tue Mar  8 01:16:49 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c (rb_objspace): an initializer must be a constant.
+
+Tue Mar  8 01:11:44 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c (maxgroups): cast because sysconf(3)'s return value is long.
+
+	* process.c (proc_setmaxgroups): ditto.
+
+	* process.c (proc_setgroups): cast because RARRAY_LEN() is long.
+
+Tue Mar  8 00:02:47 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_pkey_rsa.c: parenthesize macro arguments.
+
+Mon Mar  7 22:59:39 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/pstore.rb: Delete variable @transaction and fix #4474. Patch by
+	  Masaki Matsushita (Glass_saga).
+
+	* test/test_pstore.rb(test_thread_safe): Add test for #4474.
+
+Mon Mar  7 21:31:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (proc_setgroups): replace getgrnam() with getgrnam_r()
+	  because getgrnam() isn't thread safe.
+
+Mon Mar  7 20:49:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (proc_getmaxgroups, proc_setmaxgroups): reflect
+	  platform maxgroups limitation by default instead hardcoded 65536.
+
+Mon Mar  7 17:13:00 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_gc_set_params): allow GC parameter configuration by
+	  environment variables.  based on a patch from funny-falcon at
+	  https://gist.github.com/856296, but honors safe level.
+
+Mon Mar  7 09:05:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c: NUM2RLIM is defined but no getrlimit and setrlimit on
+	  mingw.
+
+Mon Mar  7 08:38:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/date/date_core.c (DateTimeData): should not use bare 'long long'
+	  and 'long double', which are not defined by C89.
+
+	* ext/date/date_core.c (dt_lite_plus): get rid of overflow at casting
+	  down double to integer.
+
+Mon Mar  7 00:21:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (proc_getgroups): get rid of maxgroups dependency.
+	  ngroups can be calculated dynamically.
+
+Sun Mar  6 23:45:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: rlim_t use standard RUBY_REPLACE_TYPE mechanism.
+
+Sun Mar  6 23:26:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (proc_setmaxgroups): added negative value check.
+	  This was suggested by Daniel Berger. Thanks Daniel!
+	  [ruby-core:35426][Bug#4467]
+
+Sun Mar  6 23:18:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (maxgroups, proc_setmaxgroups): increase max groups
+	  limitation up to 65536.
+
+Sun Mar  6 22:20:59 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_pkey_ec.c: parenthesize macro arguments.
+
+Sun Mar  6 21:49:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* sample/list.rb (MyElem#initialize): initialize @head
+	  explicitly. Otherwise -W2 option makes following warning.
+	  "warning: instance variable @head not initialized".
+	  This issue was founded by Andrew Grimm. Thanks Andrew!
+	  [ruby-core:35435][Bug#4471]
+
+Sun Mar  6 05:21:41 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* class.c: fix camelCase to snake_case in documentation code examples.
+	  patched by Andrew Grimm. fixes Bug #4469
+
+	* marshal.c: ditto.
+
+	* proc.c: ditto.
+
+	* sample/biorhythm.rb: ditto.
+
+	* vm_eval.c: ditto.
+
+	* vm_method.c: ditto.
+
+
+Sun Mar  6 03:22:27 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (io_cntl): use rb_thread_io_blocking_region() instead
+	  rb_thread_blocking_region().
+
+Sat Mar  5 22:54:36 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* include/ruby/intern.h: fix a typo of prototype declaration.
+	  rb_mutex_try_lock -> rb_mutex_trylock [ruby-dev:43213]
+
+Sat Mar  5 19:44:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_io.rb (TestIO#test_fcntl_lock): small clean up.
+
+Sat Mar  5 01:33:46 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (io_cntl, nogvl_io_cntl): IO.fcntl() and IO.ioctl()
+	  release GVL during calling kernel interface.
+	  Suggested by Eric Wong. [ruby-core:35417][Bug #4463]
+
+	* test/ruby/test_io.rb (TestIO#test_fcntl_lock): add new test for
+	  IO.fcntl().
+
+Fri Mar  4 23:09:12 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/testunit/test_parallel.rb
+	  (test_should_run_all_without_any_leaks): consider that the order of
+	  testcase could change. [ruby-dev:43300] [Bug #4466]
+
+Fri Mar  4 22:01:14 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (io_cntl): change 'cmd' type to int. ioctl and fcntl need to
+	  be passed int.
+	* io.c (rb_io_ctl): ditto.
+
+Fri Mar  4 21:10:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: save warnflags. the patch is created by Eric Wong.
+	  [Bug #4465]
+
+Wed Mar  2 21:15:00 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_pkey_dsa.c: parenthesize macro arguments.
+
+Thu Mar  3 22:10:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (check_exec_redirect_fd, check_exec_redirect): raise
+	  ArgumentError if fd >= 3 on Windows because the feature is not
+	  supported.
+
+	* test/ruby/test_process.rb (test_execopts_redirect): remove meaningless
+	  argument.
+
+Thu Mar  3 21:21:42 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_process.rb (test_execopts_redirect): redirecting fd
+	  >= 3 is not supported on Windows, so should not specify such options
+	  when calling spawn or others.
+
+Thu Mar  3 18:59:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_slice_bang): raise error when the string is frozen.
+
+Thu Mar  3 14:25:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* strftime.c (STRFTIME): return 0 and ERANGE when precision is too
+	  large. [ruby-dev:43284] fixes #4456
+
+Thu Mar  3 00:46:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (uleb128): cast the value to unsigned long.
+
+	* addr2line.c (fill_lines): print error when lseek fails.
+
+Thu Mar  3 00:36:29 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rexml/encoding.rb (REXML::Encoding#encoding=): store @encoding
+	  a String which means the name of the encoding.
+	  this partially revert r29646.
+
+	* lib/rexml/document.rb: follow above.
+
+	* lib/rexml/output.rb: ditto.
+
+	* lib/rexml/parsers/baseparser.rb: ditto.
+
+	* lib/rexml/source.rb: ditto.
+
+	* lib/rexml/xmldecl.rb: ditto.
+
+Wed Mar  2 23:19:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_byte_substr): return nil for negative length.
+
+Wed Mar  2 21:15:00 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_pkey_dh.c: parenthesize macro arguments.
+
+Wed Mar  2 14:24:04 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit/parallel.rb: Fix name from `inclement_io` to
+	  `increment_io`.
+
+Wed Mar  2 14:06:01 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_slice_bang): move treatments which is only needed
+	  when the result is not nil.
+
+Wed Mar  2 14:02:29 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/testunit/test_parallel.rb(TestParallel#spawn_runner):
+	  Fix outputing empty line in running test.
+
+	* test/testunit/tests_for_parallel/test_third.rb: Remove `sleep`
+
+Tue Mar  1 22:29:10 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_pkey.h: parenthesize macro arguments.
+
+Tue Mar  1 22:02:35 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit/parallel.rb: Fix number.
+
+Tue Mar  1 21:48:22 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit/parallel.rb: For Windows.
+
+	* test/testunit/test_parallel.rb(TestParallelWorker#test_quit_in_test):
+	  Fix for above specification change.
+	* test/testunit/test_parallel.rb(TestParallel#spawn_runner):
+	  Fix outputing empty line in running test.
+
+Tue Mar  1 20:51:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_system.rb (TestSystem#test_system_at):
+	  remove tests for [bug#4396]. because we decided to reject this
+	  ticket.
+
+Tue Mar  1 19:46:19 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/{test_date.rb,test_date_attr.rb}: [ruby-dev:43280]
+
+Tue Mar  1 18:40:38 2011  Ryan Davis  <ryan@YPCMC09457>
+
+	* lib/rubygems*: Import rubygems 1.6.0 (released version @ 58d8a0b9)
+	* test/rubygems: Ditto
+
+Tue Mar  1 16:22:22 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c: revert r30987 because it causes some failures in
+	  test-all, especially webrick.
+
+Tue Mar  1 15:59:53 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_byteslice): the resulted encoding should keep
+	  original encoding. this also fixes the encoding when the result
+	  shares internal string. [ruby-core:35376]
+
+Tue Mar  1 13:25:00 2011  Kenta Murata <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VpMemAlloc): CVE-2011-0188.
+	  Fixes a bug reported by Drew Yao <ayao at apple.com>
+
+Tue Mar  1 10:34:39 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_byteslice): Add String#byteslice. [ruby-core:35376]
+
+Tue Mar  1 00:12:49 2011  Tajima Akio <artonx@yahoo.co.jp>
+
+	* include/ruby/win32.h: define WIN32 if neither _WIN64 nor WIN32
+	  defined. it forces to use push/pop for pack(4) pragma.
+
+Mon Feb 28 23:52:13 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/testunit/test_rake_integration.rb (test_with_rake_runner):
+	  use assert_in_out_err for suppress messages.
+
+Mon Feb 28 22:48:56 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/win32.c (rb_w32_spawn): use shell if a commandline contain
+	  double-quote character.
+	* win32/win32.c (is_internal_cmd): similar, use shell if a commandline
+	  contain caret character.
+
+	* test/ruby/test_system.rb (TestSystem#test_system_at): fix
+	  wrong test case. if system() invoke a command by using shell,
+	  system() never return nil. Also, "" quotation must not appear
+	  twice in a command line.
+
+Mon Feb 28 17:36:57 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_pkcs7.c: parenthesize macro arguments.
+
+Mon Feb 28 16:48:42 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_pkcs12.c: parenthesize macro arguments.
+
+Mon Feb 28 16:28:15 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (tr_trans): when the hash for multibyte repl is empty,
+	  tr is inverse mode, and a character doesn't much the table, the
+	  character should be replaced by last replacement. Bug #4449
+
+Mon Feb 28 16:38:56 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_ocsp.c: parenthesize macro arguments.
+
+Mon Feb 28 13:02:15 2011  Danial Pearce <github@tigris.id.au>
+
+	* lib/tempfile.rb: Fix example file paths in docs for tempfile.
+	  https://github.com/ruby/ruby/pull/5
+
+Mon Feb 28 12:56:18 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_init): typo fix.
+	  https://github.com/ruby/ruby/pull/8
+
+Mon Feb 28 12:28:13 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/date/date_core.c (datetime_s_now): localtime() and localtime_r()
+	  required time_t pointer as 1st parameter, and tv_sec member of struct
+	  timeval is long.
+
+Mon Feb 28 11:57:40 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/testunit/test_parallel.rb: Temporally disable test on Windows.
+
+Mon Feb 28 07:28:35 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb(Test::Unit::Runner#after_worker_quit):
+	  method name more be natural English.
+
+	* lib/test/unit.rb(Test::Unit::Runner::Worker.launch):
+	  IO.sync doesn't need. Should use "b" for mode.
+
+Sun Feb 27 21:59:37 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_system.rb (TestSystem#test_system_redirect_win):
+	  add test for system().
+
+Sun Feb 27 18:00:09 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb: Refactoring; Worker never use Hash for internal
+	  storage.
+
+	* lib/test/unit.rb: Never use Kernel#spawn. Use IO.popen instead.
+
+Sun Feb 27 13:16:48 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_ns_spki.c: parenthesize macro arguments.
+
+Sat Feb 26 17:07:53 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: [Feature #4257]
+
+	* ext/date/extconf.rb: new
+
+	* ext/date/date_core.c: new
+
+Sat Feb 26 16:10:23 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb: --jobs-status won't puts over 2 lines.
+
+	* test/testunit/test_parallel.rb: Fix test for above.
+
+	* lib/test/*: refactoring.
+
+Sat Feb 26 07:10:05 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: fix parsing timezone's whose
+	  whose format is (+/-)hhmm.  Thanks Goncalo Silva!
+
+	* test/psych/test_scalar_scanner.rb: test for bug.
+
+Thu Feb 24 23:02:55 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_hmac.c: parenthesize macro arguments.
+
+Thu Feb 24 22:53:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (love): for the birthday.
+
+Thu Feb 24 22:51:54 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (ruby_vm_destruct): run vm exit hooks after all objects are
+	  destructed.
+
+Thu Feb 24 14:40:33 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* ChangeLog (vim): Modeline for vim
+
+Thu Feb 24 13:39:25 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* common.mk: Use $RUNRUBY for worker process.
+
+	* lib/test/unit.rb: Fix bug.
+
+	* lib/test/unit.rb: @options[:ruby](@opts[:ruby]) is now Array.
+
+	* test/testunit/parallel.rb: Fix for above.
+
+Thu Feb 24 10:05:55 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/testunit/tests_for_parallel/misc.rb: Fix bug in r30947.
+
+	* lib/test/unit.rb, lib/test/unit/assertions.rb: For this test.
+
+Wed Feb 23 23:07:38 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/testunit/test_parallel.rb, test/testunit/parallel/*:
+	  Test for r30939.
+
+	* lib/test/unit.rb: For test.
+
+	* lib/test/parallel.rb: For test.
+
+	* lib/test/unit/testcase.rb: For test.
+
+Wed Feb 23 22:05:13 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_engine.c: parenthesize macro arguments.
+
+Tue Feb 22 23:15:17 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb: Fix --ruby option doesn't effect.
+
+	* lib/test/unit.rb: Fix typo.
+
+Tue Feb 22 21:39:28 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_digest.c: parenthesize macro arguments.
+
+Tue Feb 22 14:34:26 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb: Fix merging miss.
+
+Tue Feb 22 12:27:26 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb: Add new options; --jobs,-j,--ruby,--jobs-status,
+	  --no-retry.
+	  [Feature #4415] [ruby-dev:43226],[ruby-dev:43222],[ruby-core:35294]
+
+	* lib/test/unit/parallel.rb: Used at test/unit --jobs(-j) option.
+
+	* test/csv/test_serialization.rb: test/unit parallel running ready.
+
+	* test/rake/test_file_task.rb: test/unit parallel running ready.
+
+Tue Feb 22 06:09:10 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/syslog/syslog.c: Apply documentation patch from mathew murphy.
+	  [Bug #4149]
+
+Tue Feb 22 03:09:10 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: increase Psych to 1.1.0 for help with
+	  debugging.
+
+Tue Feb 22 03:04:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/streaming.rb: refactor streaming methods to a
+	  module.
+	* ext/psych/lib/psych/stream.rb: extracted streaming specific methods
+	  to a module.
+	* ext/psych/lib/psych/json/stream.rb: JSON stream inherits from
+	  JSONTree and includes streaming methods.
+	* ext/psych/lib/psych/visitors/json_tree.rb: JSON does not support
+	  object references, so remove object reference testing when building
+	  JSON trees.
+
+Tue Feb 22 02:41:51 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb (accept): use Hash#key?
+	  when looking up object references to err on the side of cache
+	  misses.
+
+Mon Feb 21 10:58:39 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/json/yaml_events.rb: refactoring JSON event
+	  handling methods to a module for reuse.
+	* ext/psych/lib/psych/json/tree_builder.rb: AST builder uses JSON
+	  event methods.
+	* ext/psych/lib/psych/json/stream.rb: stream emitter uses JSON event
+	  methods.
+
+Mon Feb 21 10:54:29 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/json/stream.rb: do not emit custom tags in maps
+	  or sequences when emitting JSON.
+	* ext/psych/lib/psych/json/tree_builder.rb: do not emit custom tags in
+	  sequences when emitting JSON.
+	* test/psych/json/test_stream.rb: tests for custom stream emits.
+	* test/psych/test_json_tree.rb: tests for JSON emits.
+
+Mon Feb 21 10:05:10 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/json/ruby_events.rb: DRY up ruby event handling
+	  for JSON.
+	* ext/psych/lib/psych/visitors/json_tree.rb: use ruby events module
+	* ext/psych/lib/psych/json/stream.rb: ditto
+
+Mon Feb 21 10:01:01 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/json/stream.rb: fix JSON stream emits to use
+	  double quotes during stream.
+	* test/psych/json/test_stream.rb: tests to reflect changes.
+
+Mon Feb 21 00:38:56 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_system.rb (TestSystem#test_system_at):
+	  add testcase for bug4396.
+
+Sun Feb 20 19:59:32 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_cipher.c: parenthesize macro arguments.
+
+Sun Feb 20 16:26:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (exec_recursive): prevent temporary objects from GC.
+
+	* prevent temporary objects from GC, and should not use
+	  RSTRING_PTR() for function calls since it evaluates the argument
+	  a couple of times.
+
+Sun Feb 20 16:22:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_flock): use rb_thread_io_blocking_region for the
+	  time being.
+
+Sun Feb 20 05:33:17 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 2.0.2 r6207.
+	* test/minitest/*: ditto
+
+Sun Feb 20 02:14:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (sig_trap): avoid pthread_sigmask(xx, &mask, &mask) usage
+	  because FreeBSD don't permit it. If it's used, it behave as
+	  pthread_sigmask(xx, NULL, &mask).
+
+	* signal.c (init_sigchld): ditto.
+
+Sun Feb 20 00:46:51 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_bn.c: parenthesize macro arguments.
+
+Sat Feb 19 22:37:42 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* vm_insnhelper.c (vm_check_if_namespace): guard temporary object
+	  from GC.
+
+Sat Feb 19 06:36:27 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/test/unit.rb: partial revert of r30849. [ruby-core:32864]
+
+	* test/testunit/test_rake_integration.rb: adding an integration test
+	  with the rake loader to prevent regressions.
+
+Fri Feb 18 19:31:31 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::remove_entry_secure): there is a
+	  race condition in the case where the given path is a directory,
+	  and some other user can move that directory, and create a
+	  symlink while this method is executing.
+	  Reported by: Nicholas Jefferson <nicholas at pythonic.com.au>
+
+Fri Feb 18 00:28:39 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* compile.c (get_exception_sym2type): guard temporary object from GC.
+
+Thu Feb 17 23:54:29 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* iseq.c (prepare_iseq_build): initialize iseq_compile_data::err_info
+	  with nil. this fix exception in rb_iseq_load().
+
+Thu Feb 17 22:32:35 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/ruby/test_marshal.rb (test_marshal_dump_extra_iv):
+	  fix a typo of local variable. [Bug #3720] [ruby-dev:42083]
+
+Thu Feb 17 21:32:53 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl.h: parenthesize macro arguments.
+
+Wed Feb 16 20:37:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* eval_jump.c (rb_exec_end_proc): changed at_exit and END proc
+	  evaluation order. [Bug #4400] [ruby-core:35237]
+	* eval_jump.c (rb_mark_end_proc): ditto.
+
+	* test/ruby/test_beginendblock.rb (TestBeginEndBlock#test_nested_at_exit):
+	  added a test for nested at_exit.
+	* test/ruby/test_beginendblock.rb (TestBeginEndBlock#test_beginendblock):
+	  changed the test to adopt new spec.
+
+Wed Feb 16 20:17:06 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/openssl_missing.h: parenthesize macro arguments.
+
+Tue Feb 15 21:37:45 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/gdbm/gdbm.c: parenthesize macro arguments.
+
+Tue Feb 15 20:34:53 2011  Tanaka Akira  <akr@fsij.org>
+
+	* array.c (ary_join_1): fix array size.
+
+Tue Feb 15 19:43:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: fix and resubmit r30621. [ruby-dev:43203]
+
+Tue Feb 15 15:41:30 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (array_join): copy the encoding of the first element as
+	  an initial encoding.
+
+	* array.c (array_join_0): ditto.
+
+	* array.c (array_join_1): ditto.
+
+	* array.c (inspect_ary): ditto.
+
+	* array.c (array_join_1): add an argument to check the appending is
+	  first one or not.
+
+Tue Feb 15 15:40:53 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* hash.c (inspect_i): copy the encoding of the first key as
+	  an initial encoding.
+
+Mon Feb 14 15:00:16 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (inspect_ary): don't taint the inspected result of a
+	  recursive array.
+
+Tue Feb 15 15:43:29 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): change the rule for empty strings:
+	  remove the special treatment of the US-ASCII encoded empty string.
+	  Now Encoding.compatible? usually respect the encoding of the
+	  receiver.
+
+Tue Feb 15 15:39:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_enc_cr_str_buf_cat): remove special treatment of
+	  ASCII-8BIT receivers.
+
+	* string.c (str_gsub): set initial encoding of the buffer as the
+	  same of the receiver. [ruby-core:35141]
+
+Tue Feb 15 09:49:33 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_system.rb (TestSystem#test_system_at): use findstr
+	  command instead of find command, because the latter is confusing
+	  another famous Unix command.
+
+Mon Feb 14 23:01:19 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* thread.c (rb_thread_io_blocking_region): reset th->waiting_fd
+	  after blocking region, because remaining waiting_fd might
+	  cause unnecessary IOError.
+
+Mon Feb 14 21:06:50 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* configure.in: revert r30621.  That revision introduced mkmf test
+	  failures and it turned out to be OK to revert. [ruby-dev:43203]
+
+Mon Feb 14 21:04:01 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/fiddle/conversions.h: parenthesize macro arguments.
+
+Mon Feb 14 18:41:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/setup.mak (USE_RUBYGEMS): fixed r30835. It didn't work on
+	  mswin32 port. If you changed win32/configure.bat, you should change
+	  setup.mak too.
+
+Mon Feb 14 17:28:34 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_system.rb (TestSystem#test_system_at):
+	  added test. [ruby-core:35218] (#4393)
+
+Mon Feb 14 13:15:35 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (is_internal_cmd): if the first char of prog is '@',
+	  execute it via shell.  [ruby-core:35218] (#4393)
+
+Mon Feb 14 10:33:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit.rb: revert r30863, because it causes too many noise.
+
+Mon Feb 14 07:34:55 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/curses.c: parenthesize macro arguments.
+
+Sun Feb 13 19:41:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::RequireFiles#non_options): skip
+	  test suites failed to load instead of mere messages.
+
+Sun Feb 13 09:56:44 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/openssl/test_config.rb (OpenSSL#test_freeze): fix error
+	  message assertion.
+
+	* test/io/nonblock/test_flush.rb (TestIONonblock#flush_test):
+	  return true to finish the test.
+
+	* test/syck/test_string.rb (Syck::TestString#test_non_binary_string):
+	  use assert_not instead of refute, unless required minitest
+	  explicitly.
+
+	* test/test_prime.rb (TestPrime::sieve.Integer): ditto.
+
+	* test/xmlrpc/webrick_testing.rb (WEBrick_Testing#start_server):
+	  catch IOError when server socket was closed.
+
+Sun Feb 13 07:39:51 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_inject): typo fixed. a patch from Gaku Ueda in
+	  [ruby-core:35216].
+
+Sun Feb 13 00:48:47 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (Date#===): [ruby-core:35127]
+
+Sun Feb 13 00:29:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Options#process_args): always
+	  return options.
+
+	* lib/test/unit.rb (Test::Unit::RequireFiles#non_options): return
+	  if any test case get loaded.
+
+	* lib/test/unit.rb (Test::Unit::AutoRunner#initialize): do not add
+	  default directory if it is nil.
+
+	* lib/test/unit.rb (Test::Unit::AutoRunner#process_args): return
+	  true if any test cases to run.
+
+Sat Feb 12 23:17:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (assert_include): add alias.
+
+Sat Feb 12 14:44:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_io_blocking_region): new function to run
+	  blocking region with GIL released, for fd.
+
+	* thread.c (rb_thread_fd_close): implement.  [ruby-core:35203]
+
+	* vm.c (th_init): rename from th_init2.
+
+Sat Feb 12 14:41:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::AutoRunner#initialize): use
+	  default_dir if no test case given.
+
+	* lib/test/unit.rb (Test::Unit::Runner): rename from Test::Unit::Mini.
+
+	* lib/test/unit.rb (Test::Unit::GlobOption#non_options): run tests
+	  under base directory if no argument given.
+
+Sat Feb 12 08:03:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_settracefunc.rb (TestSetTraceFunc): ensure to use
+	  method_added hook defined in Module.
+
+Sat Feb 12 01:04:02 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): enable rubygems if --gem option is given.
+
+	* ruby.c (process_options): load rubygems if it is disabled but
+	  --gem option is given.
+
+Fri Feb 11 23:27:50 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ruby.c (proc_options): add --gem=enabled as an alias of
+	  --enable=gems and --gem=disabled as an alias of --disable=gems.
+	  Gem named "enabled" or "disabled" has already been reserved
+	  legitimately for this purpose.
+
+Fri Feb 11 23:17:04 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dl/cfunc.c: parenthesize macro arguments.
+
+Fri Feb 11 21:41:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bin/testrb, test/runner.rb, lib/test/unit.rb: improve backward
+	  compatibility.
+
+Fri Feb 11 19:45:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): use rb_ary_free to free internal object.
+
+	* gc.h (RUBY_FREE_UNLESS_NULL): get rid of double free.
+	  [ruby-core:35192]
+
+Fri Feb 11 16:57:03 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_transcode.rb (test_from_cp50221): fix wrong
+	  assertion and move back.
+
+Fri Feb 11 14:33:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (assert_no_match): alias for
+	  backward compatibility.
+
+Fri Feb 11 12:06:48 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (add_gems, require_libraries, proc_options): add
+	  --require and --gem options.
+
+Fri Feb 11 12:03:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rubygems): add --disable-rubygems option.
+
+Fri Feb 11 11:39:03 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/fake.rb.in (CROSS_COMPILING): get rid of NameError.
+
+Thu Feb 10 23:12:34 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dl/dl.h: parenthesize macro arguments.
+
+Wed Feb  9 23:11:27 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c: parenthesize macro arguments.
+
+Tue Feb  8 11:47:11 2011  Loren Sands-Ramshaw  <lorensr@gmail.com>
+
+	* array.c: documentation clarification in rotate, rotate!,
+	  index, and rindex. [ruby-core:35144]
+
+Wed Feb  9 09:45:43 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rdoc/test_rdoc_encoding.rb: remove unnecessary (and wrong)
+	  platform-dependent hacks.
+
+Wed Feb  9 00:47:18 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/etc/etc.c: parenthesize macro arguments.
+
+Tue Feb  8 19:38:00 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-expr-beg): fix for invalid nest errors.
+
+Tue Feb  8 19:22:59 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in (AC_MSG_CHECKING): fixed typo. the patch is
+	  created by Benoit Daloze. Thanks a lot. [Bug #4384][ruby-core:35148]
+
+Tue Feb  8 16:04:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_s_sysopen): use NUM2MODET() instead NUM2UINT().
+
+Tue Feb  8 15:59:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (rb_run_exec_options_err): use MODET2NUM() instead
+	  LONG2NUM().
+
+Tue Feb  8 13:59:56 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: revert r30725. Now we have proper runtime fallback.
+	  Therefore, no need compile time disabling. (see r30762).
+
+Tue Feb  8 01:00:21 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* process.c (proc_setgroups): add GC guard to prevent intermediate
+	  variable from GC.
+
+Tue Feb  8 00:56:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-expr-beg, ruby-in-here-doc-p): tell
+	  singleton class definitions from here documents.
+
+	* misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial): keyword
+	  followed by colon is label.
+
+Mon Feb  7 22:56:16 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of
+	  Object#tap to restore STDOUT.sync.
+
+Mon Feb  7 22:34:20 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/net/http.rb (Net::HTTP#connect): support SNI (Server Name
+	  Indication) for HTTPS.  [ruby-dev:43164]
+	  http://stackoverflow.com/questions/4685736/openssl-server-name-indication-support-in-ruby
+
+Mon Feb  7 16:05:32 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc: Upgrade to RDoc 3.5.3  Fixes [Bug #4376]
+
+Mon Feb  7 11:46:59 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (rdoc): add --encoding=UTF-8; ruby's rdoc must be UTF-8.
+
+Mon Feb  7 10:21:50 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rdoc/test_rdoc_options.rb (TestRDocOptions#test_check_files):
+	  there is no easy way to create owner unreadable file on Windows.
+	  So, skip the test.
+
+Sun Feb  6 13:48:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/json/lib/json/common.rb (JSON::MissingUnicodeSupport.iconv):
+	  should not drop rest of the result.  use Iconv.conv instead.
+
+Sun Feb  6 12:46:02 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* string.c (gsub): Ensure result encoding is the same as input
+	  encoding.  [Bug #4340].
+
+Sun Feb  6 12:18:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (words, qwords): dispatch array events.  based on a
+	  patch from Michael Edgar.  [Bug #4365].
+
+Sun Feb  6 12:12:59 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/fileutils/fileasserts.rb (FileAssertions): separate module.
+
+Sun Feb  6 11:29:23 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/dbm.c: parenthesize macro arguments.
+
+Sat Feb  5 22:01:59 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+	  revert r30796. r30797 and r30798 are an alternative fix.
+	  [ruby-dev:43174]
+
+Sat Feb  5 21:47:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (mlhs_basic): include mlhs_post for ripper.  a patch
+	  from Michael Edgar at [ruby-core:35078].
+
+Sat Feb  5 21:22:21 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (assert_block): move from
+	  test/fileutils/fileasserts.rb.
+
+	* test/fileutils/fileasserts.rb (assert_block): pass arguments
+	  as-is.  [ruby-dev:43174]
+
+Sat Feb  5 16:47:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+	  msg can be passed nil. [Bug #4371] [ruby-dev:43174]
+
+Sat Feb  5 15:18:25 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc: Upgrade to RDoc 3.5.2
+
+Sat Feb  5 12:05:27 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/rubyext.c (syck_node_init_copy): SyckNode is not
+	  copiable.  [ruby-core:35094]
+
+Sat Feb  5 11:48:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_alloc): leave data ptr
+	  NULL.
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_new, ossl_cipher_initialize):
+	  allocate internal structure.  [ruby-core:35094]
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_copy): ditto.
+
+Sat Feb  5 11:29:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/json/parser/parser.h (GET_PARSER): raise TypeError.
+
+	* ext/json/parser/parser.rl (cParser_initialize): ditto.
+
+	* ext/json/parser/parser.h (GET_PARSER): check if initialized.
+	  [ruby-core:35079]
+
+	* ext/json/parser/parser.rl (cParser_initialize): ditto.
+
+Sat Feb  5 10:09:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_get_expanded_load_path): always expand load paths.
+
+Sat Feb  5 09:38:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (encoded_dup): extract.
+
+Sat Feb  5 03:37:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::LowMethods): make low level methods
+	  in NoWrite and DryRun to do nothing.  [ruby-dev:43129]
+
+	* test/fileutils/fileasserts.rb: add message arguments.
+
+	* test/fileutils/fileasserts.rb (Test::Unit::Assertions#assert_block):
+	  show the given message.
+
+Sat Feb  5 02:09:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lex_getline, parser_set_encode): set encoding of lines
+	  in SCRIPT_LINES__ as source encoding.  [ruby-dev:43168]
+
+Sat Feb  5 02:08:37 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (ruby_thread_data_type): add prefix.
+
+Sat Feb  5 00:59:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_core.h (GetThreadPtr): use TypedData_Get_Struct() instead
+	  CoreDataFromValue() because we need type check. Otherwise,
+	  type mismatch can cause segmentation fault crash.
+	  [ruby-core:35086] [Ruby 1.9-Bug#4367]
+
+	* vm.c (thread_data_type): remove static.
+
+Fri Feb  4 19:14:27 2011  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/utf8_mac.trans: parenthesize macro arguments.
+
+Fri Feb  4 12:11:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* string.c (str_utf8_nth): fixed a condition of optimized lead
+	  byte counting. [Bug #4366][ruby-dev:43170]
+
+Fri Feb  4 01:50:13 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* string.c (count_utf8_lead_bytes_with_word): wrote function
+	  comments.
+
+Fri Feb  4 00:14:55 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzfile_reader_get_unused): no need to dup
+	  before rb_str_resurrect.
+
+Thu Feb  3 20:04:44 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/curses.c (CHECK): unused macro removed.
+
+Thu Feb  3 18:33:26 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_resurrect
+	  because gz->z.input is hidden string. [ruby-core:35057]
+
+Thu Feb  3 16:34:10 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/shift_jis.c (code_to_mbc): cast as int from the subtraction of
+	  pointers.
+
+	* enc/utf_16le.c (utf16le_mbc_enc_len): use ptrdiff_t.
+
+	* enc/utf_32be.c (utf32be_left_adjust_char_head): ditto.
+
+	* enc/utf_32le.c (utf32le_left_adjust_char_head): ditto.
+
+Thu Feb  3 16:31:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/missing.h: don't use HAVE_STDDEF_H because it never
+	  defined by configure though configure.bat defines it.
+
+	* include/ruby/ruby.h: move include stddef.h to defines.h
+
+	* include/ruby/defines.h: ditto.
+
+Wed Feb  2 20:25:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/encoding.h (rb_enc_step_back): cast 4th argument 'n'
+	  as int because Ruby usually treats length value as long but
+	  onigenc_step_back's 4th argument is int.
+
+Thu Feb  3 07:20:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: use Regexp::NOENCODING
+	  rather than magic number.
+
+	* ext/syck/lib/syck/rubytypes.rb: ditto
+
+Thu Feb  3 07:16:11 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* re.c (Init_Regexp): added a constant for ARG_ENCODING_NONE
+	  [ruby-core:35054]
+
+	* test/ruby/test_regexp.rb: corresponding test.
+
+Thu Feb  3 07:02:16 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: ARG_ENCODING_NONE regular
+	  expressions can round trip. [ruby-core:34969]
+
+	* test/psych/test_yaml.rb: test for ARG_ENCODING_NONE regex
+
+	* ext/sych/lib/syck/rubytypes.rb: ARG_ENCODING_NONE regular
+	  expressions can round trip.
+
+	* test/syck/test_yaml.rb: test for ARG_ENCODING_NONE regex
+
+Wed Feb  2 17:09:22 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_fdatasync): Use fsync(2) if the underlying
+	  operating system does not support fdatasync(2).
+
+Wed Feb  2 14:51:08 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/markup/to_tt_only.rb: commit miss
+	* test/rdoc/test_rdoc_markup_to_tt_only.rb: ditto
+	* test/rdoc/test_rdoc_single_class.rb: ditto
+
+Wed Feb  2 09:27:53 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc: Upgrade to RDoc 3.5.1
+
+Wed Feb  2 00:30:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/st.h (st_table): Added comment why we need __extension__.
+
+Tue Feb  1 20:45:44 2011  Tanaka Akira  <akr@fsij.org>
+
+	* enc/encdb.c: parenthesize macro arguments.
+
+Tue Feb  1 15:12:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_require.rb (TestRequire#test_require_with_unc):
+	  use ``127.0.0.1'' instead of ``localhost'' as host name, because
+	  XP or earlier cannot resolv it as NBT hostname.
+
+Tue Feb  1 13:20:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/benchmark/test_benchmark.rb (#capture_bench_output):
+	  Added explicit sleep. Windows have imprecise time support.
+	  Thus Tms.new.Add!{} may be or may be not equal 0. The
+	  test failure started since r30747.
+
+Tue Feb  1 11:03:47 2011  Ryan Davis  <ryan@lust.local>
+
+	* lib/rubygems*: Import rubygems 1.5.0 (released version @ 1fb59d0)
+	* test/rubygems: Ditto
+
+Tue Feb  1 08:01:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (console_set_winsize): new method to set
+	  console size.  [EXPERIMENTAL]
+
+	* ext/io/console/console.c (console_winsize): use GetWriteFD.
+
+Tue Feb  1 02:28:14 2011  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* include/ruby/win32.h, win32/win32.c: add rb_w32_inet_ntop.
+	  inet_ntop's minimum supported client is Vista.
+
+Tue Feb  1 00:10:30 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/benchmark.rb: fix benchmark to work with current ruby.
+	  patched by Benoit Daloze [ruby-core:33846] [ruby-dev:43143]
+	  merged from https://github.com/eregon/ruby/commits/benchmark
+
+	*  lib/benchmark (Report#width): update documentation
+	*  lib/benchmark: document the return value of #benchmark and the
+	   :list attribute in Report
+	*  lib/benchmark (Tms#format): rename variables, use String#%
+	   instead of Kernel.format
+	*  lib/benchmark: remove undocumented Benchmark::times (an alias
+	   of Process::times used twice)
+	*  lib/benchmark (#benchmark): use label_width for the caption
+	*  lib/benchmark (Tms#initialize): rename variables
+	*  lib/benchmark: allow title to not be a String and call #to_s
+	*  lib/benchmark (Benchmark#bm): return an Array of the times with
+	   the labels
+	*  lib/benchmark: correct output for Benchmark#bmbm
+	   (remove the extra space)
+	*  lib/benchmark: add a few tests for Benchmark::Tms output
+	*  lib/benchmark: improve style (enumerators, ljust, unused vars)
+	*  lib/benchmark: add spec about output and return value
+	*  lib/benchmark: improve basic style and consistency
+	   no parenthesis for print and use interpolation instead of printf
+	*  lib/benchmark: remove unnecessary conversions and variables
+	*  lib/benchmark: correct indentation
+	*  lib/benchmark: rename the FMTSTR constant and variable to FORMAT
+	*  lib/benchmark: remove useless exception
+
+	*  test/benchmark: remove unused variable warnings
+
+Mon Jan 31 23:27:23 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* node.c (add_id): remove duplicated rb_id2str() call.
+
+Sun Jan 30 17:19:46 2011  Tanaka Akira  <akr@fsij.org>
+
+	* missing/langinfo.c: parenthesize macro arguments.
+
+Mon Jan 31 21:57:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: revert r30698.
+
+Mon Jan 31 21:32:44 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* thread.c (thread_start_func_2): check deadlock condition before
+	  release thread stack. fix memory violation when deadlock detected.
+	  reported by Max Aller. [Bug #4009] [ruby-core:32982]
+
+Mon Jan 31 14:45:47 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/irb/locale.rb (IRB::Locale::#search_file):
+	  Gem might be undefined if --disable-gems. [ruby-core:34990]
+
+Mon Jan 31 12:26:14 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c: suppressed shorten-64-to-32 warnings.
+	* regcomp.c: ditto.
+	* regexec.c: ditto.
+	* regint.h: ditto.
+	* regparse.c: ditto.
+	* regparse.h: ditto.
+	* time.c: ditto.
+	* variable.c: ditto.
+
+Mon Jan 31 04:45:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before
+	  ary_resize_capa because ary_resize_capa expects resized length is
+	  smaller than current array length. call rb_ary_unshare before
+	  ary_resize_capa because ary_resize_capa lost the reference to
+	  original shared array. [ruby-core:34997]
+
+Sun Jan 30 17:19:46 2011  Tanaka Akira  <akr@fsij.org>
+
+	* missing/crypt.c: parenthesize macro arguments.
+
+Sun Jan 30 16:40:27 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rubygems/test_gem_security.rb (TestGemSecurity): valid only
+	  if OpenSSL is available.
+
+	* test/dl/test_dl2.rb (TestDL#test_sin): math functions do not
+	  work on x86_64 due to the design of DL2.
+
+	* test/dl/test_func.rb (DL::TestFunc#test_{sinf,sin): ditto.
+
+Sun Jan 30 16:09:22 2011  Tanaka Akira  <akr@fsij.org>
+
+	* strftime.c (rb_strftime_with_timespec): %G produces 4 digits.
+
+Sun Jan 30 15:13:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/emacs_mule.c (emacsmule_islead): 7bit range is also leading
+	  byte.
+
+Sun Jan 30 13:03:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_fetch_m): use useful message for longer key, not a
+	  nonsense id value.
+
+	* string.c (rb_str_ellipsize): new function to ellipsize a string.
+
+	* include/ruby/encoding.h (rb_enc_step_back): new function to step
+	  back n characters.
+
+Sun Jan 30 12:53:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/emacs_mule.c (emacsmule_islead): fix inverse condition.
+
+Sun Jan 30 09:37:25 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* io.c (struct argf): char behaves like an unsigned char
+	  by default on AIX.
+
+Sun Jan 30 08:02:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: Mac OS X wrongly reports it has fdatasync(3).
+
+Sun Jan 30 03:29:47 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_bn.c (GetBNPtr): add missing nil case.
+	  patched by Martin Bosslet. [ruby-core:34987]
+
+Sun Jan 30 01:02:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/ruby.h: Added NUM2MODET() and MODET2NUM() default
+	  definition.
+	  Because r30686 introduced win32 build failure.
+
+Sat Jan 29 22:16:26 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (rb_ary_join): [].join.encoding must be US-ASCII.
+	  [ruby-list:47790]
+
+Sat Jan 29 20:22:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* benchmark/driver.rb (BenchmarkDriver#measure): Show command line
+	  when abnormal exiting occur.
+
+Sat Jan 29 10:53:16 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_insnhelper.c (vm_get_ev_const): no-scope reference to toplevel
+	  private constant has been prohibited incorrectly.
+
+	* test/ruby/test_module.rb (test_toplevel_private_constant): add a
+	  test for above.
+
+Sat Jan 29 08:43:23 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/rubygems*: Import rubygems 1.5.0 (release candidate @ 09893d9)
+	* test/rubygems: Ditto
+
+Sat Jan 29 02:02:37 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* variable.c (rb_mod_const_of, sv_i): Module#constant should exclude
+	  private constants.  see [ruby-core:32912].
+
+	* test/ruby/test_module.rb (test_constants_with_private_constant): add
+	  a test for above.
+
+Sat Jan 29 01:36:41 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* variable.c (rb_const_set): const_set should preserve constant
+	  visibility.  see [ruby-core:32912].
+
+	* test/ruby/test_module.rb: add a test for above.
+
+Sat Jan 29 01:24:57 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (NODE_CLASS, NODE_MODULE), insns.def (defineclass): raise
+	  an exception when "class Foo::Bar" is evaluated and Foo::Bar is
+	  private.  To implement this, define_type of "defineclass" is added
+	  so that the instruction can distinguish whether the class definition
+	  is scoped (class Foo::Bar) or not (class Bar).
+
+	* test/ruby/test_class.rb (test_redefine_private_class),
+	  test/ruby/test_module.rb
+	  (test_define_module_under_private_constant): add tests for above.
+
+Sat Jan 29 01:19:17 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* constant.h, variable.c: to ensure compatibility, rb_const_get_* must
+	  not raise an exception even when the constant is private.  Instead,
+	  rb_public_const_get_* and rb_public_const_defined_* are introduced,
+	  which raise an exception when the referring constant is private.
+	  see [ruby-core:32912].
+
+	* vm_insnhelper.c (vm_get_ev_const): use rb_public_const_get_* instead
+	  of rb_const_get_* to follow the constant visibility when user code
+	  refers a constant.
+
+	* test/ruby/test_marshal.rb (test_marshal_private_class): add a test.
+	  This test had failed because of incompatibility of rb_const_get.
+
+Sat Jan 29 00:30:44 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* variable.c (set_const_visibility): fix typo.  a patch from Tomoyuki
+	  Chikanaga in [ruby-core:32919].
+
+Fri Jan 28 23:20:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create,
+	  TestGDBM2#test_writer_open_notexist): We only need to skip libgdbm
+	  1.8.0, not all 1.8.x. 1.8.1 or later don't have GDBM_WRITER sickness.
+
+Fri Jan 28 21:56:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/dbm/extconf.rb: Added new header places for Fedora13.
+
+Fri Jan 28 21:49:30 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/zlib/zlib.c: parenthesize macro arguments.
+
+Fri Jan 28 17:47:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/gdbm/test_gdbm.rb (TestGDBM2#test_writer_open_notexist):
+	  gdbm 1.8.x changed GDBM::WRITER behavior. Thus our testcase need
+	  to be changed too.
+
+Fri Jan 28 17:33:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create): skip
+	  the test if gdbm version is 1.8.x.
+
+Fri Jan 28 16:30:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_require.rb (TestRequire#test_require_too_long_filename):
+	  Added -w option because too long path error don't output a message
+	  by default since r30660. [Bug #4336] [ruby-dev:43134]
+
+Fri Jan 28 16:19:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_require.rb (TestRequire#test_require_path_home_{1,2}):
+	  Added -w option because too long path error don't output a message
+	  by default since r30660. [Bug #4336] [ruby-dev:43134]
+
+Fri Jan 28 16:04:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_require.rb (TestRequire#test_require_path_home_{1,2,3}):
+	  split from test_require_path_home.
+
+Fri Jan 28 13:04:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in (--with-valgrind): Fixed r29683. Now this option
+	  is really default on.
+
+Fri Jan 28 12:05:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: Add #include<sys/stat.h> when struct stat is
+	  tested. Otherwise, incomplete type dereference error will occur.
+
+Fri Jan 28 11:53:19 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: redundant variable names made strange conftest
+	  error. Fixed it.
+
+Fri Jan 28 11:47:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_process.rb (TestProcess#test_too_long_path{,2}):
+	  should handle Errno::E2BIG, because this test checks crash of ruby,
+	  not the error type system.
+
+Fri Jan 28 11:23:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_open): Use NUM2MODET() instead NUM2UINT().
+	* io.c (rb_scan_open_args): ditto.
+
+Fri Jan 28 10:58:20 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: Added mode_t type checking.
+	* process.c (rb_exec_arg_addopt): Use NUM2MODET() instead
+	  NUM2LONG because clang makes compile error by this narrowing
+	  conversion.
+	* process.c (rb_run_exec_options_err): ditto.
+
+Fri Jan 28 02:37:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* re.c (rb_reg_raise): add GC guard to prevent intermediate
+	  variable from GC.
+
+Fri Jan 28 02:35:41 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* hash.c (rb_hash_fetch_m): add GC guard to prevent intermediate
+	  variable from GC.
+
+Fri Jan 28 01:33:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_process.rb (TestProcess#test_too_long_path)
+	  TestProcess#test_too_long_path): Reduced string size from 100MB
+	  to 10MB. 100MB may cause no memory error. It isn't intended.
+
+Fri Jan 28 01:27:42 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_process.rb (TestProcess#test_too_long_path2):
+	  Factored out from test_too_long_path. A test should only do
+	  one test.
+
+Thu Jan 27 23:29:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (st_foreach): check if unpacked.
+
+Thu Jan 27 23:14:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-mode-map): remove deprecated binding.
+	  use M-; instead.
+
+Thu Jan 27 21:58:32 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* bignum.c (rb_str_to_inum): get rid of too huge alloca().
+
+Thu Jan 27 21:43:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* object.c (rb_str_to_dbl): rewrite again. use ALLOCV instead
+	  rb_str_tmp_new().
+
+Thu Jan 27 21:41:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/win32.c: get rid of STRNDUPA(). It's dangerous API.
+
+Thu Jan 27 21:31:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/win32.c (rb_w32_aspawn): get rid of too huge alloca().
+	  [Bug #4330] [ruby-core:34898]
+
+Thu Jan 27 20:30:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/win32.c (rb_w32_spawn): get rid of too huge alloca().
+
+Thu Jan 27 18:49:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/win32.c (open_dir_handle): get rid of too huge alloca().
+
+Thu Jan 27 18:34:58 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* file.c (w32_io_info): get rid of too huge alloca().
+	  [Bug #4313] [ruby-core:34830]
+
+Thu Jan 27 18:19:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/win32.c (wstati64): get rid of too huge alloca().
+	  [Bug #4316] [ruby-core:34834]
+
+Thu Jan 27 15:11:52 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): get rid of too huge
+	  alloca(). this is the real fix of [ruby-core:34833].
+
+Thu Jan 27 12:46:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (ALLOC_ARGV_WITH_STR): fix void pointer arithmetic.
+
+Thu Jan 27 08:41:40 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_exec_v, rb_proc_exec_n, rb_proc_exec)
+	  (proc_spawn_n, proc_spawn): get rid of too huge alloca().
+	  [ruby-core:34827], [ruby-core:34833]
+
+Thu Jan 27 08:32:17 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (ALLOCV): new API for exception-safe
+	  temporary buffer.  [ruby-core:34844]
+
+	* string.c (rb_alloc_tmp_buffer, rb_free_tmp_buffer):
+	  implementation of the API.
+
+Thu Jan 27 08:22:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln_find.c (dln_find_1): use rb_warning and return immediately
+	  if fname is longer than buffer.
+
+Wed Jan 26 22:57:30 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* class.c (clone_method): add GC guard to prevent intermediate
+	  variable from GC. [Bug #4321] [ruby-dev:43107]
+
+Wed Jan 26 22:45:16 2011  Tanaka Akira  <akr@fsij.org>
+
+	* template/id.h.tmpl: parenthesize macro arguments.
+
+Wed Jan 26 22:28:49 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* vm_eval.c (rb_throw_obj): add GC guard to prevent intermediate
+	  variable from GC. [Bug #4322] [ruby-dev:43108]
+
+Wed Jan 26 17:08:59 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): OpenSSL::ASN1.decode
+	  should reject indefinite length primitive encodings as that is
+	  illegal. Patch by Martin Bosslet. See #4324.
+
+Wed Jan 26 10:36:28 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (=~): documentation fix; the return value is nil when
+	  it doesn't match. patched by Andrei Kulakov [ruby-core:34562]
+
+Tue Jan 25 08:41:58 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln_find.c (dln_find_1): omit too long pathnames.
+
+Tue Jan 25 08:28:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_resize): get rid of out-of-bound access.
+
+Tue Jan 25 07:48:22 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_thread.rb: remove unused variables.
+
+Tue Jan 25 07:45:44 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_thread.rb (TestThread#test_condvar_nolock_2): get
+	  rid of method redefined.
+
+Tue Jan 25 07:00:52 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_string_value_cstr): rb_str_modify can change
+	  RSTRING_PTR.
+
+Tue Jan 25 03:24:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_thread.rb: Added various ConditionVariable tests.
+
+Mon Jan 24 22:26:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* object.c (rb_str_to_dbl): Fix again. use rb_str_tmp_new()
+	  instead ALLOC_N.
+
+Mon Jan 24 21:50:48 2011  Tanaka Akira  <akr@fsij.org>
+
+	* vm_insnhelper.h: parenthesize macro arguments.
+
+Mon Jan 24 21:28:34 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* object.c (rb_str_to_dbl): use ALLOC_N instead ALLOCA_N because
+	  ALLOC_N may cause stack overflow.
+
+Mon Jan 24 21:04:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_invalid_str): prevent intermediate variable from GC.
+	  [ruby-core:34820]
+
+Sun Jan 23 23:01:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/io/console/test_io_console.rb: Don't run test if the system
+	  don't support io/console.
+
+Sun Jan 23 22:17:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/fiddle/test_fiddle.rb: Don't run test if the system don't support
+	  fiddle.
+
+	* test/fiddle/test_function.rb: ditto.
+	* test/fiddle/test_closure.rb: ditto.
+
+Sun Jan 23 11:39:18 2011  Tanaka Akira  <akr@fsij.org>
+
+	* vm_exec.h: parenthesize macro arguments.
+
+Sun Jan 23 10:33:02 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/fake.rb.in (ruby): suppress warnings.
+
+Sun Jan 23 08:00:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_nth_len, str_utf8_nth): return the rest length together.
+
+	* string.c (rb_str_substr): get rid of measure the length always
+	  to improve performance for huge string.  [ruby-core:34648]
+
+Sun Jan 23 00:40:10 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/test_syslog.rb: Fix to make a lot of test failure if
+	  the platform doesn't support syslog.
+
+Sat Jan 22 11:49:55 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support
+	  when multiple merge keys are specified.
+
+	* test/psych/test_merge_keys.rb: tests for multi-merge key support
+
+Sat Jan 22 11:33:04 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually
+	  part of YAML 1.1, so they should be supported.  Remove warning and
+	  merge keys to parent.  [ruby-core:34679]
+
+	* test/psych/test_merge_keys.rb: test for merge keys
+
+Sat Jan 22 10:25:19 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (parse): add the file name to the exception when
+	  parse errors occur.
+
+	* test/psych/test_parser.rb: test for parse error file name
+
+Sat Jan 22 10:12:30 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (parse): fix assertion error when reusing a
+	  parser after an exception has been raised
+
+	* test/psych/test_parser.rb: test for assertion error
+
+Sat Jan 22 04:09:22 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/nodes/node.rb: Make Psych::Nodes::Node
+	  enumerable.
+
+	* ext/psych/lib/psych/visitors/depth_first.rb: Add a depth-first
+	  visitor to enumerate over a YAML AST in a depth-first fashion
+
+	* test/psych/nodes/test_enumerable.rb: test for enumerating nodes
+
+	* test/psych/visitors/test_depth_first.rb: test for depth-first
+	  visitor
+
+Sat Jan 22 00:53:42 2011  Tanaka Akira  <akr@fsij.org>
+
+	* vm_core.h: parenthesize macro arguments.
+
+Fri Jan 21 18:15:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: should not use -Werror=* flags while conftests.
+
+Fri Jan 21 09:17:00 2011  Luis Lavena  <luislavena@gmail.com>
+
+	* configure.in: Fix incorrectly detected x86_64-w64-mingw32 due
+	  canonalization of target_os. Bug #3889 [ruby-core:32634]
+
+Thu Jan 20 23:44:00 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: Fix rb_cv_va_args_macro was broken. We are using
+	  -Werror=implicit-function-declaration compile option. therefore
+	  we need a function declaration explicitly.
+
+Thu Jan 20 23:58:02 2011  Tanaka Akira  <akr@fsij.org>
+
+	* node.h: parenthesize macro arguments.
+
+Thu Jan 20 23:25:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: Add '#include <stdlib.h>' to
+	  rb_cv_localtime_overflow test too. It's reported by Tomoyuki
+	  Chikanaga. Thanks.
+
+Thu Jan 20 16:11:00 2011  Kenta Murata <mrkn@mrkn.jp>
+
+	* README.EXT, README.EXT.ja: You shouldn't choose ``conftest.c'' as a
+	  name of a source file.
+
+Thu Jan 20 12:15:44 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: Add stdlib.h inclusion into rb_cv_negative_time_t
+	  test because it's required for exit(3). The patch is
+	  created by Tomoyuki Chikanaga. [Bug #4287] [ruby-dev:43060]
+
+Thu Jan 20 11:39:41 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/webrick/utils.rb (TestWEBrick::RubyBin): test CGI does not need
+	  to load rubygems.  if it activated, ruby raises LoadError about
+	  rbconfig.rb.
+
+Thu Jan 20 09:19:42 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/json_tree.rb: Fix JSON emit for
+	  DateTime and Time classes.
+
+	* test/psych/test_json_tree.rb: test for JSON emit
+
+Thu Jan 20 08:02:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/coder.rb (represent_object): arbitrary objects
+	  may be passed to the Psych::Coder object.
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: support for visiting
+	  arbitrary objects set on the coder.
+
+	* test/psych/test_coder.rb: supporting test case.
+
+Thu Jan 20 06:03:17 2011  Tanaka Akira  <akr@fsij.org>
+
+	* method.h: parenthesize macro arguments.
+
+Wed Jan 19 13:16:05 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/sources_command.rb: Finish removing code,
+	  (fixes sources command test).
+
+Wed Jan 19 13:04:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* proc.c (proc_call): Add gc guard to avoid segfault. The fix
+	  is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963]
+
+Wed Jan 19 12:31:28 2011  Eric Hodel <drbrain@segment7.net>
+
+	* lib/rubygems.rb: Since gem_prelude requires rubygems, enable
+	  custom_require always.
+
+Wed Jan 19 12:08:08 2011  Eric Hodel <drbrain@segment7.net>
+
+	* lib/rubygems/commands/dependency_command.rb: Remove require of
+	  deleted file.
+	* lib/rubygems/commands/fetch_command.rb: ditto
+	* lib/rubygems/commands/setup_command.rb: ditto
+	* lib/rubygems/commands/sources_command.rb: ditto
+	* lib/rubygems/commands/specification_command.rb: ditto
+
+Wed Jan 19 08:13:59 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/rubygems*: Import rubygems 1.5.0 (release candidate)
+	* test/rubygems: Ditto
+
+Tue Jan 18 23:31:01 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y: avoid NULL reference.  [ruby-dev:43067]
+
+Wed Jan 19 02:54:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vsnprintf.c (cvt): set first byte of buf to NUL for the case when
+	  no bytes are written to the buf. [ruby-dev:43062]
+
+Tue Jan 18 23:04:51 2011  Tanaka Akira  <akr@fsij.org>
+
+	* gc.h: parenthesize macro arguments.
+
+Tue Jan 18 18:31:14 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/completion.rb: Irb tab completion support for XX::method
+	  forms.
+
+Tue Jan 18 15:05:55 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb: added RDoc document for logging message escape
+	  by Hal Brodigan. See #3869
+
+Tue Jan 18 07:53:52 2011  Tanaka Akira  <akr@fsij.org>
+
+	* eval_intern.h: parenthesize macro arguments.
+
+Tue Jan 18 04:42:44 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/parser.rb (Mark): Adding a class to wrap
+	  marker information
+
+	* ext/psych/parser.c (mark): Add a method to return the mark object
+	  for the parser
+
+	* test/psych/test_parser.rb: tests for the Mark class.
+
+Tue Jan 18 02:46:55 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/json_tree.rb (visit_String): JSON
+	  strings should be dumped with double quotes. [ruby-core:34186]
+
+	* test/psych/test_json_tree.rb: test for double quotes
+
+Mon Jan 17 23:36:33 2011  Tanaka Akira  <akr@fsij.org>
+
+	* array.c (rb_ary_times): less MEMCPY calls.
+
+Mon Jan 17 22:54:33 2011  Tanaka Akira  <akr@fsij.org>
+
+	* debug.h: parenthesize macro arguments.
+
+Mon Jan 17 21:40:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): revert r30549.
+
+Sun Jan 16 20:55:45 2011  Tanaka Akira  <akr@fsij.org>
+
+	* vsnprintf.c: parenthesize macro arguments.
+
+Sat Jan 15 11:57:30 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (warnflags): add -Werror=implicit-function-declaration
+	  if available.
+
+	* lib/mkmf.rb (init_mkmf): ignore warnings in mkmf tests.
+
+	* test/mkmf/base.rb (setup, teardown): restore config values.
+
+	* test/mkmf/test_flags.rb: split from test_find_executable.rb.
+
+Sat Jan 15 10:04:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): autoload rubygems.
+
+	* tool/compile_prelude.rb (Prelude#initialize): ignore empty
+	  preludes.
+
+	* ruby.c (ruby_init_prelude): get rid of global namespace
+	  pollution.
+
+Sat Jan 15 09:42:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/io.h: missing prototypes.
+
+Fri Jan 14 23:25:55 2011  Tanaka Akira  <akr@fsij.org>
+
+	* vm_method.c: parenthesize macro arguments.
+
+Fri Jan 14 15:32:29 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/net/imap/test_imap.rb: call neither logout nor disconnect
+	  unless connected.  patch by Kazuhiro NISHIYAMA.  [ruby-dev:42860]
+
+Fri Jan 14 14:56:57 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/imap.rb: use bytesize for binary strings.
+	  patched by Yoshimasa Niwa. [ruby-core:34222]
+
+Fri Jan 14 14:01:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* pack.c (pack_unpack): the resulted string of unpack('M') must have
+	  ASCII-8BIT encoding (and ENC_CODERANGE_VALID). [ruby-core:34482]
+
+Fri Jan 14 13:38:58 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in
+	  gzip's header is the size of uncompressed input data modulo 2^32.
+	  [ruby-core:34481] http://www.ietf.org/rfc/rfc1952.txt
+
+Fri Jan 14 11:36:25 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* configure.in, win32/Makefile.sub (RUNRUBY): require path should
+	  include "." because rbconfig.rb is there.
+
+Fri Jan 14 10:40:11 2011  Ryan Davis  <ryan@lust.local>
+
+	* gem_prelude.rb: Just require rubygems. Fixes rubygems 1.4.
+	* lib/rubygems.rb: removed all Gem::Quickloader code.
+	* ruby.c: renamed ruby_init_gems to ruby_init_prelude. Set
+	  $disable_rubygems since there is no fine grained mechanism to
+	  skip parts of the prelude. Open to suggestions on how to do this
+	  better.
+	* test/*.rb: Load path isn't set up correctly, so add
+	  --disable-gems as needed to failing tests that are explicitly
+	  testing stderr w/ ==.
+
+Fri Jan 14 07:30:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_next_argv): go advance when the next file cannot be
+	  read.  [ruby-core:34446]
+
+Thu Jan 13 20:49:19 2011  Tanaka Akira  <akr@fsij.org>
+
+	* vm_insnhelper.c: parenthesize macro arguments.
+
+Thu Jan 13 13:21:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* vm_dump.c: delete dashes to make lines 80 chars, Patched by
+	  Shota Fukumori (sora_h).  [Bug #4275] [ruby-dev:43021]
+
+Thu Jan 13 13:21:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* vm_dump.c: fix misspelling of CrashReporter, Patched by Shota
+	  Fukumori (sora_h).  [Bug #4275] [ruby-dev:43021]
+
+Thu Jan 13 06:27:29 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* error.c: Exception#to_s should actually call to_s.
+
+Thu Jan 13 00:32:54 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (get_nth_dirname): decrement the directory index
+	  because the index specifies the index of given included_directories
+	  which is separated by NUL and its index is begun from 1.
+	  Note that 0 specifies the current directory of the compilation.
+	  see also http://www.dwarfstd.org/doc/dwarf-2.0.0.pdf
+
+Thu Jan 13 00:06:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_f_syscall): Add warning messages. [ruby-core:34062]
+
+Thu Jan 13 00:00:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_f_syscall): Some syscall return unsigned or pointer value.
+	  Therefore we should only check the result is -1 or not.
+	  [ruby-core:34062]
+
+Wed Jan 12 23:55:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_f_syscall): Add 64bit Linux support. Some syscall takes
+	  long type arguments.
+
+Wed Jan 12 19:37:10 2011  Tanaka Akira  <akr@fsij.org>
+
+	* vm_dump.c: parenthesize macro arguments.
+
+Wed Jan 12 19:28:23 2011  Tanaka Akira  <akr@fsij.org>
+
+	* vm.c (thread_free): reset ruby_current_thread if it points the
+	  thread to free.
+	* gc.c (slot_sweep): don't call RUBY_VM_SET_FINALIZER_INTERRUPT if
+	  there is no current thread.
+	  [ruby-dev:43000]
+
+Wed Jan 12 19:09:29 2011  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (sort_by_i): reenter check more strictly.
+	  (sort_by_cmp): ditto.
+	  [ruby-dev:43003] reported by Usaku NAKAMURA.
+
+Wed Jan 12 16:25:12 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/net/http.rb (Net::HTTP#connect): makes it timeout during
+	  SSL handshake too. [ruby-core:34203]
+	  Patch by Marc Slemko.
+
+	* test/net/http/test_http.rb (TestNetHTTP_v1_2#test_timeout_during_HTTP_session):
+	  test for [ruby-core:34203]
+
+	* test/net/http/test_https.rb (TestNetHTTPS#test_timeout_during_SSL_handshake):
+	  ditto.
+
+Wed Jan 12 16:24:53 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/readline/extconf.rb: new checks for RL_PROMPT_START_IGNORE
+	  and RL_PROMPT_END_IGNORE. [ruby-core:34331]
+
+	* ext/readline/readline.c: enables USE_INSERT_IGNORE_ESCAPE only if
+	  RL_PROMPT_{START,END}_IGNORE are available to get rid of compilation
+	  error with libedit.
+
+Wed Jan 12 15:53:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* README.EXT.ja (rb_ensure): typo.
+
+Wed Jan 12 11:33:46 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c: OpenBSD uses the elf_abi.h header file instead of the
+	  elf.h header file. patched by Jeremy Evans [ruby-core:34384]
+
+Wed Jan 12 03:59:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/webrick/test_cgi.rb: Removes usage of deprecated
+	  :RequestHandler option.
+	  patched by Peter Weldon [ruby-core:34010]
+
+	* test/webrick/test_httpproxy.rb: ditto.
+
+	* test/webrick/test_httpserver.rb: Add a test of the deprecation
+	  behaviour.
+
+Wed Jan 12 08:37:07 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (hash_i): return different values for inverse hash.
+	  [ruby-core:34334]
+
+Tue Jan 11 20:32:59 2011  Tanaka Akira  <akr@fsij.org>
+
+	* variable.c: parenthesize macro arguments.
+
+Tue Jan 11 13:06:38 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* array.c (rb_ary_resize): should care of embeded array when extending
+	  the array.
+
+	* array.c (rb_ary_resize): need to set capa when changing the real
+	  size of the array.
+	  these are latent bugs.
+
+Mon Jan 10 22:46:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/defines.h (CASEFOLD_FILESYSTEM): HFS+ is case
+	  insensitive.
+
+	* load.c (loaded_feature_path, rb_feature_p, load_lock): on a
+	  case-insensitive filesystem, loaded features search should
+	  ignore case.  [ruby-core:34297]
+
+Mon Jan 10 21:34:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (showflags): show LD commands.
+
+Mon Jan 10 14:32:55 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_method.rb (TestMethod#test_define_method): method
+	  transplanting between class and module is impossible.
+
+Mon Jan 10 13:51:17 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/rdoc-mode.el (rdoc-mode): show trailing whitespace.
+
+Mon Jan 10 11:22:02 2011  Tanaka Akira  <akr@fsij.org>
+
+	* util.c: parenthesize macro arguments.
+
+Mon Jan 10 07:41:31 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* misc/README: mention rdoc-mode.el and ruby-style.el.
+
+Sun Jan  9 20:37:21 2011  Tanaka Akira  <akr@fsij.org>
+
+	* transcode.c: parenthesize macro arguments.
+
+Sun Jan  9 16:31:53 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* io.c (Kernel.#syscall): implemented on LP64/LLP64 environments too.
+	  also uses __syscall if available for *BSD on 64bit architecture.
+	  [ruby-core:34062]
+
+Sun Jan  9 16:31:34 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/irb/locale.rb (IRB::Locale::LOCALE_NAME_RE):
+	  some platform has a locale without territory but with
+	  encoding.
+	  (#each_sub_locale): ditto.
+
+Sun Jan  9 14:47:50 2011  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/readline.c: apply a patch from Nobuyoshi Nakada.
+	  fixed #3616 [ruby-core:31484] IRB + readline incorrectly counts
+	  non-printing characters in prompt
+
+Sat Jan  8 21:47:26 2011  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_sort_by): use rb_ary_resize.
+	  (ary_cutoff): removed.
+
+Sat Jan  8 21:24:17 2011  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (swapf): compilation condition simplified.
+	  (swapd): ditto.
+
+Sat Jan  8 20:51:25 2011  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (swapd): remove duplicated code.
+
+Sat Jan  8 19:28:55 2011  Tanaka Akira  <akr@fsij.org>
+
+	* thread.c: parenthesize macro arguments.
+
+Fri Jan  7 23:07:40 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (configuration): backref needs to capture.
+
+Fri Jan  7 21:57:22 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-mode-variables), misc/ruby-style.el:
+	  show trailing whitespace.
+
+	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): highlight
+	  regexp after open bracket.  [ruby-core:34183]
+
+Fri Jan  7 00:37:35 2011  Tanaka Akira  <akr@fsij.org>
+
+	* string.c: parenthesize macro arguments.
+
+Thu Jan  6 22:42:02 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigmul1_karatsuba): avoid overflow that make assertion
+	  fail in certain case.  this patch is contributed from Ray Chason
+	  <chasonr at gmail.com> in personal communication.
+
+Thu Jan  6 20:55:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): ignore rest from first dot from
+	  TARGET to generate init function name.
+	  this is followup of r30464.
+
+Thu Jan  6 11:27:01 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags
+	  should not be included in JSON mapping
+
+Thu Jan  6 09:23:33 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/net/protocol.rb (eof?): BufferedIO should proxy eof? to the
+	  underlying IO object.
+
+Thu Jan  6 09:12:31 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/mkmf.rb (configuration): fixing gsub when multiple error flags
+	  are passed to GCC.
+
+Thu Jan  6 05:25:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_modify): export.
+
+Thu Jan  6 05:14:41 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (get_strio, strio_set_string)
+	  (strio_reopen): check if frozen.  [ruby-core:33648]
+
+Thu Jan  6 05:10:58 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_resize): new utility function.  [ruby-dev:42912]
+
+Thu Jan  6 05:03:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (init_funcname_len): ignore rest from first dot.
+	  [ruby-dev:41774]
+
+Thu Jan  6 02:55:48 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: use YAML 1.0 output
+	  format for serializing nil values.  Thanks Eric Hodel!
+
+	* test/psych/test_nil.rb: test for nil values
+
+Wed Jan  5 14:21:34 2011  Mark Dodwell  <hi@mkdynamic.co.uk>
+
+	* string.c: fix rdoc typo.
+	  https://github.com/shyouhei/ruby/pull/3
+
+Wed Jan  5 14:06:01 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rdoc/test_rdoc_options.rb (TestRDocOptions#test_check_files):
+	  skip on Windows because chmod 0 doesn't mean unreadable by owner.
+
+Wed Jan  5 13:56:54 2011  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/net/http.rb (Net::HTTP#get): A header hash given should not
+	  be modified.
+
+Wed Jan  5 12:10:08 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/dl/{cfunc.c,dl.h,handle.c}, ext/fiddle/fiddle.{h,c}: Use _WIN32
+	  rather than checking for windows.h.  Thanks Jon Forums!
+	  [ruby-core:33977]
+
+Sat Jan  1 17:02:50 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/irb/locale.rb (IRB::Locale#search_file): make it possible
+	  to load a localization from a gem.
+	  (IRB::Locale#lc_path): obsoleted because of the change of #search_file
+	  (IRB::Locale#each_localized_path): new private method, based on
+	  lc_path
+	  (IRB::Locale#find): follows the change of #search_file.
+	  (IRB::Locale#load): removed duplicate with #find.
+
+Sat Jan  1 11:44:42 2011  Tanaka Akira  <akr@fsij.org>
+
+	* strftime.c: parenthesize macro arguments.
+
+Sat Jan  1 11:10:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/zlib.c: take care of platforms where long is bigger
+	  than int.
+
+Sat Jan  1 11:03:58 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* NEWS (optparse): shell completion support.
+
+	* misc/README (rb_optparse.{bash,zsh}): for shell completion.
+
+	* include/ruby/intern.h (VALUE rb_ary_print_on): I have never seen
+	  this function anywhere.
+
+Sat Jan  1 04:20:11 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_write_console): don't raise exception when
+	  the conversion is for writing to console.
+	  Patched by Heesob Park [ruby-core:33999]
+
+Fri Dec 31 12:02:06 2010  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_sort_by): use less temporary objects.
+
+Fri Dec 31 11:46:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (warnflags), lib/mkmf.rb (configuration): turn
+	  warnings into errors only for bundled extensions.
+	  [ruby-core:33815]
+
+Fri Dec 31 11:15:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/zlib.c (sizeof): zlib.h mistakenly assumes the result
+	  of sizeof to be int, not size_t.
+
+Fri Dec 31 10:27:34 2010  Tanaka Akira  <akr@fsij.org>
+
+	* st.c: parenthesize macro arguments.
+
+Fri Dec 31 03:23:26 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vsnprintf.c (BSD__uqtoa): Fix overflow when long != quad_t.
+	  patched by Peter Weldon <peter.weldon AT null.net>
+	  [ruby-core:33985]
+
+Fri Dec 31 03:00:34 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* Makefile.in: remove unnecessary semicolons.
+
+Thu Dec 30 23:09:47 2010  wanabe  <s.wanabe@gmail.com>
+
+	* vm.c (vm_define_method): guard iseq from GC while method definition.
+	  [ruby-dev:42832]
+
+Thu Dec 30 20:18:32 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/Makefile.sub: ditto.
+
+Thu Dec 30 20:57:09 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* Makefile.in: Check V=1 argument if run "make clean" or similar.
+
+Thu Dec 30 20:41:50 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* Makefile.in: Kill ugly line continuation.
+
+Thu Dec 30 11:49:40 2010  Tanaka Akira  <akr@fsij.org>
+
+	* sprintf.c: parenthesize macro arguments.
+
+Wed Dec 29 21:20:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (maygvl_copy_stream_wait_readwrite): define if USE_SENDFILE
+
+Wed Dec 29 20:37:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: strip current directory prefix.
+
+	* enc/depend (clean): remove name2ctype.h when out-of-place build.
+
+	* win32/Makefile.sub (clean-enc): pass V to inferior make.
+
+Wed Dec 29 18:23:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* re.c (rb_reg_expr_str): need to escape if the coderange is invalid.
+
+Wed Dec 29 10:06:51 2010  Tanaka Akira  <akr@fsij.org>
+
+	* signal.c: parenthesize macro arguments.
+
+Wed Dec 29 07:22:15 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rake/rdoctask.rb: Deprecate in favor of rdoc/task.
+
+Wed Dec 29 07:07:06 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc: Import RDoc 3.1
+
+Tue Dec 28 18:36:38 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* error.c, include/ruby/intern.h (rb_compile_error_with_enc): new
+	  function to raise syntax error, with source encoding'ed message.
+
+	* parse.y (compile_error): use above function.
+	  [ruby-core:33951] (#4217)
+
+Tue Dec 28 07:37:38 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ruby.c: parenthesize macro arguments.
+
+Tue Dec 28 07:17:11 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: add ARGF.write and so on.
+
+Tue Dec 28 07:12:38 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: add new magic-comment. (warn-indent) [ruby-core:25442]
+
+Tue Dec 28 04:32:37 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/extconf.rb: check for windows.h while building fiddle.
+	  Thanks Jon Forums! [ruby-core:33923]
+
+Tue Dec 28 01:45:12 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: Add Zlib.deflate and Zlib.inflate.
+	  [ruby-dev:42833]
+
+Mon Dec 27 21:22:33 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/configure.bat: Remove obsoleted coding rule. Now, we
+	  don't support to build on Windows 95/98 and Me.
+
+Mon Dec 27 18:27:13 2010  Tanaka Akira  <akr@fsij.org>
+
+	* re.c: parenthesize macro arguments.
+
+Mon Dec 27 15:22:23 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/README.win32: note to need NT based OS to build ruby.
+
+Mon Dec 27 12:14:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (EXTMK_ARGS): specify to pass macro V, because nmake
+	  doesn't pass it via MAKEFLAGS.
+
+Mon Dec 27 10:33:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/zlib/zlib.c (Init_zlib): Add Zlib.deflate and Zlib.inflate.
+	  [ruby-dev:42833]
+
+Mon Dec 27 07:38:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* misc/rb_optparse.zsh: add compdef for generator.
+
+Mon Dec 27 07:32:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/optparse.rb (OptionParser#compsys): escape brackets too.
+	  [ruby-dev:42754]
+
+Mon Dec 27 01:30:08 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: add IF_NAMESIZE.
+	  add a default for INET6_ADDRSTRLEN.
+
+Sun Dec 26 23:49:47 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* win32/Makefile.sub: suppress a strange error message when RMALL
+	  found no such file.
+	* win32/rmall.bat: new.
+
+Sun Dec 26 21:23:23 2010    <kosaki.motohiro@gmail.com>
+
+	* win32/Makefile.sub: fix 'nmake clean-enc' breakage since r28322.
+
+Sun Dec 26 22:25:07 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/ripper/depend (ripper.y): fix messages with nmake.
+	  [ruby-dev:42896]
+
+Sun Dec 26 22:24:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): get rid of warnings caused by
+	  -Wdeclaration-after-statement on cygwin.
+
+Sun Dec 26 20:28:34 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (before_exec): add small comment.
+
+Sun Dec 26 20:52:21 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: define INET_ADDRSTRLEN as 16 if not
+	  available.  fix compilation error on mswin32-60.  reported by nobu.
+
+Sun Dec 26 19:37:37 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c: define IFNAMSIZ if not available.
+	  fix compilation error on mingw32.  reported by nobu.
+
+Sun Dec 26 12:16:29 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/ri/paths.rb (RDoc::RI::Paths::HOMEDIR): no exception if
+	  HOME is not set.  [ruby-core:33867]
+
+Sun Dec 26 11:39:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt): missing ripper rule.  i.e., `a::B ||= c 1'.
+	  http://twitter.com/#!/wannabe53/status/18797576396472321
+	  http://twitter.com/#!/wannabe53/status/18798416150663168
+
+Sun Dec 26 11:15:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/with_different_ofs.rb (DifferentOFS): should not affect
+	  original classes.
+
+Sun Dec 26 09:35:07 2010  Tanaka Akira  <akr@fsij.org>
+
+	* rational.c: parenthesize macro arguments.
+
+Sun Dec 26 09:22:19 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (rb_if_indextoname): new function to abstract
+	  environments without if_indextoname.
+	  (inspect_ipv6_multicast_if): new function to inspect
+	  IPV6_MULTICAST_IF.
+	  Socket::Option.new(:INET6, :IPV6, :MULTICAST_IF,
+	  [2].pack("I!")).inspect is
+	  "#<Socket::Option: INET6 IPV6 MULTICAST_IF eth0>".
+
+Sun Dec 26 04:31:15 2010  Luis Lavena  <luislavena@gmail.com>
+
+	* ext/dl/win32/registry.rb: Corrected RegCreateKeyExA signature.
+	  Patch by Rafal Michalski [ruby-core:33874] [Ruby 1.9-Bug#4203]
+
+Sun Dec 26 02:31:58 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (advice_arg_check): Change argument check.
+	  Now, an unsupported advice makes NotImplementedError.
+	  [ruby-dev:42887] [Ruby 1.9-Feature#4204]
+
+Sun Dec 26 03:00:53 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/socket/extconf.rb: Fix build error which was introduced r30372.
+
+Sun Dec 26 01:37:10 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb: check the existence of if_indextoname().
+
+	* ext/socket/option.c: yesterday's akr's commits destroyed the build of
+	  some unrelated platforms (such as Windows).
+
+Sat Dec 25 23:29:11 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_ipv4_add_drop_membership): new function
+	  to inspect struct ip_mreq and struct ip_mreqn for
+	  IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP.
+	  Socket::Option.new(:INET, :IP, :ADD_MEMBERSHIP,
+	  [239,255,99,81, 0,0,0,0].pack("CCCCCCCC")).inspect is now
+	  "#<Socket::Option: INET IP ADD_MEMBERSHIP 239.255.99.81 0.0.0.0>".
+	  (inspect_ipv4_multicast_if): new function to inspect struct in_addr
+	  and struct ip_mreqn for IP_MULTICAST_IF.
+	  Socket::Option.new(:INET, :IP, :MULTICAST_IF,
+	  [192,168,0,7].pack("CCCC")).inspect is now
+	  "#<Socket::Option: INET IP MULTICAST_IF 192.168.0.7>".
+
+	* ext/socket/extconf.rb: check struct ip_mreq and struct ip_mreqn.
+
+Sat Dec 25 22:49:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/csv: DifferentOFS needs to be include in each classes.
+
+	* test/digest/test_digest_extend.rb (TestDigestExtend#setup):
+	  should not depend on the result of previous tests
+
+	* test/with_different_ofs.rb (DifferentOFS::WithDifferentOFS): give
+	  name.
+
+	* test/with_different_ofs.rb (DifferentOFS): test suite for test
+	  suites affected by $,.
+
+	* test/digest/test_digest_extend.rb (TestDigestExtend): should not
+	  assume $, invariant.
+
+	* test/csv/test_data_converters.rb, test/csv/test_table.rb: don't
+	  call setup within tests.
+
+Sat Dec 25 20:01:40 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (pipe_open): Added rb_thread_atfork(). We must reinitialize
+	  GVL at new process creation.
+
+Sat Dec 25 18:26:55 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_ipv6_mreq): new function to inspect
+	  struct ipv6_mreq for IPV6_JOIN_GROUP and IPV6_LEAVE_GROUP.
+	  Socket::Option.new(:INET6, :IPV6, :JOIN_GROUP,
+	  [0xff12,0,0,0,0,0,0,1, 2].pack("nnnnnnnnI!")).inspect is now
+	  "#<Socket::Option: INET6 IPV6 JOIN_GROUP ff12::1 eth0>".
+
+	* ext/socket/extconf.rb: check struct ipv6_mreq.
+
+Sat Dec 25 18:04:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/csv.rb (CSV.foreach): 'rb' mode is defaulted in open.
+
+	* lib/csv.rb (CSV#init_separators): cannonicalize encoding options
+	  as Encoding objects.
+
+Sat Dec 25 18:30:34 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_atfork): Add small comment why we need
+	  reset random seed.
+
+Sat Dec 25 17:33:55 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/csv/base.rb (TestCSV.with_different_ofs): give name to
+	  anonymous classes.
+
+	* lib/csv.rb (CSV#init_separators): use IO#gets with length
+	  parameter to get rid of wrong conversion.
+
+	* lib/csv.rb (CSV::foreach, CSV#initialize): directly use encoding
+
+	* lib/csv.rb, test/csv: should not assume $, invariant.
+
+Sat Dec 25 16:08:06 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c: change rb_atomic_t definition from uchar to uint.
+
+Sat Dec 25 15:04:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
+	  suite writing to the source directory.
+
+Sat Dec 25 15:08:08 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec().
+	  We must reinitialize GVL at new process creation. Otherwise
+	  we may meet an insane deadlock. [Bug#4121][ruby-dev:42686]
+
+Sat Dec 25 14:27:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_extract_encoding_option): accept Encoding object as
+	  encoding: optional argument.  [ruby-dev:42884]
+
+Sat Dec 25 13:37:55 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 2.0.2 r6093.
+
+Sat Dec 25 13:05:59 2010  Tanaka Akira  <akr@fsij.org>
+
+	* random.c: parenthesize macro arguments.
+
+Sat Dec 25 12:48:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_f_require_relative): don't omit return type.
+
+Sat Dec 25 11:06:00 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* load.c (rb_f_require_relative): Add documentation.
+
+Sat Dec 25 11:02:52 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzreader_gets): support optional length
+	  parameter.
+
+	* ext/zlib/zlib.c (gzfile_read, gzfile_readpartial): length should
+	  be long.
+
+Sat Dec 25 10:51:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/json/generator/generator.{c,h} (fbuffer_free_only_buffer):
+	  unused.
+
+	* ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): add casts.
+
+Fri Dec 24 08:46:04 2010  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: parenthesize macro arguments.
+
+Thu Dec 23 19:17:14 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/net/imap/cacert.pem: updated because it has been expired.
+
+	* test/net/imap/server.crt: signed again because CA cert was expired.
+
+Thu Dec 23 11:16:52 2010  Tanaka Akira  <akr@fsij.org>
+
+	* parse.y: parenthesize macro arguments.
+
+Thu Dec 23 11:00:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_check_type): check for type from extensions for ruby
+	  1.8.  see [ruby-core:33797].
+
+Thu Dec 23 08:12:59 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/net/smtp.rb: refactoring Net::SMTP#esmtp= to use an
+	  attr_accessor
+
+Thu Dec 23 06:35:41 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/net/smtp.rb: Net::SMTP should close the SSL connection if the
+	  connection verification fails.
+
+Thu Dec 23 01:47:58 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: remove #object_id. [ruby-dev:42840]
+
+Wed Dec 22 08:56:39 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: add Module#private_constant and Module#public_constant.
+	  [ruby-dev:39685][ruby-core:32698]
+
+Wed Dec 22 07:59:23 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: add IO#advise. [ruby-core:33110] [Ruby 1.9-Feature#4038]
+
+Tue Dec 21 23:45:31 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (Init_GC): move back object_id to Kernel. [ruby-dev:42840]
+
+Tue Dec 21 12:45:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (target_archs): remove temporary objects.
+
+	* enc/Makefile.in, enc/depend (clean): remove work directories.
+
+Tue Dec 21 07:39:12 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c: parenthesize macro arguments.
+
+Tue Dec 21 06:25:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rexml/test_contrib.rb (ContribTester#test_pos): should not
+	  use fixed path name for tests.  [ruby-dev:42827]
+
+	* test/rexml/test_sax.rb (SAX2Tester#test_socket): should not use
+	  fixed port for tests.  [ruby-dev:42828]
+
+Tue Dec 21 06:10:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (setup_args), vm.c (invoke_block_from_c),
+	  vm_insnhelper.c (caller_setup_args): reverted r30241 and r30243
+	  except for the test.
+
+Tue Dec 21 01:41:42 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* io.c : add an extra byte to buffer for the specification of read
+	  in Windows. see [ruby-core:33460] and r29980. and, we have to
+	  discuss how to do this one byte.
+
+Tue Dec 21 01:18:06 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* error.c: Fix build error for win32. This regression was
+	  introduced by r30271.
+
+Tue Dec 21 00:59:40 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_cleanup_func): Moved interrupted_lock
+	  destroying code from native_thread_destroy() to
+	  thread_cleanup_func() because it's platform independent logic.
+
+	* thread_win32.c (native_thread_destroy): ditto.
+	* thread_pthread.c (native_thread_destroy): ditto.
+
+Tue Dec 21 00:46:20 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_cleanup_func): Don't touch native threading
+	  resource at fork. Sadly this is purely bandaid. We need to
+	  implement proper fix later. [Bug #4169] [ruby-core:33767]
+
+Tue Dec 21 00:22:44 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* error.c (exit_success_p): Check status code more carefully.
+	  status code may have garbage in upper bit.
+
+Mon Dec 20 23:12:37 2010  Tanaka Akira  <akr@fsij.org>
+
+	* node.c: parenthesize macro arguments.
+
+Mon Dec 20 20:04:41 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: add #__id__ and #object_id. [ruby-dev:42778]
+
+Mon Dec 20 20:03:21 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (native_thread_destroy): Fixed gvl_cond leak.
+
+Mon Dec 20 13:49:05 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* NEWS: Add item for RDoc 3.0.1
+
+	* lib/rdoc: Import RDoc 3.0.1, remove require for perl parser.
+
+Mon Dec 20 12:15:32 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc: Import RDoc 3.0.
+
+Mon Dec 20 01:55:03 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (Init_IO): Added O_DIRECT. This feature was proposed by
+	  Run Paint Run Run.
+	  [Feature #4015] [ruby-core:33018]
+
+Sun Dec 19 19:15:23 2010  Tanaka Akira  <akr@fsij.org>
+
+	* marshal.c: parenthesize macro arguments.
+
+Sat Dec 18 21:52:37 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* vsnprintf.c (BSD_vfprintf): suppress warning: "_WIN32" is not
+	  defined.
+
+Sat Dec 18 16:02:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (setup_args), vm.c (invoke_block_from_c),
+	  vm_insnhelper.c (caller_setup_args): fix of r30241. lambda block
+	  should check argument number.
+
+Sat Dec 18 14:42:29 2010  Tanaka Akira  <akr@fsij.org>
+
+	* load.c: parenthesize macro arguments.
+
+Sat Dec 18 10:07:04 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (setup_args, iseq_compile_each): optimize AMPER LAMBDA
+	  combination as block.
+
+Fri Dec 17 22:07:16 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (Init_GC): move #__id__ and #object_id to BasicObject.
+	  [ruby-dev:42778]
+
+Fri Dec 17 19:35:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/mkmf/base.rb (TestMkmf::FakeLog): capture output from mkmf.
+
+	* test/mkmf/test_find_executable.rb (test_find_executable):
+	  suppress meaningless differences for chkbuild.
+
+Fri Dec 17 13:26:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/setup.mak (BASERUBY): quit with an error when BASERUBY was not
+	  able to set, just like configure.in does. [ruby-dev:42782]
+
+Fri Dec 17 07:04:09 2010  Tanaka Akira  <akr@fsij.org>
+
+	* iseq.c: parenthesize macro arguments.
+
+Fri Dec 17 04:18:37 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* transcode.c (str_encode): Alter comment for better wording and ri
+	  output.
+
+Fri Dec 17 00:05:40 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_advise): New API. IO#advise() allows to tell the
+	  ruby runtime how it expects to use a file handle. This feature
+	  can be improved a performance some situations.
+	  Note: This feature is mainly developed by Run Paint Run Run.
+	  Thank you! [ruby-core:33110] [Ruby 1.9-Feature#4038]
+
+	* io.c (do_io_advise): Helper function.
+	* io.c (io_advise_sym_to_const): ditto.
+
+Thu Dec 16 23:29:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (bin-comm): use transformed name.
+	  [ruby-dev:42777]
+
+Thu Dec 16 21:52:07 2010  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: parenthesize macro arguments.
+
+Thu Dec 16 21:46:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkconfig.rb (RbConfig): honor ARCHFLAGS and RC_ARCHS to
+	  override embedded ARCH_FLAG value on universal-darwin.
+
+Thu Dec 16 19:50:12 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{configure.bat,setup.mak,Makefile.sub} (PROGRAM_PREFIX,
+	  PROGRAM_SUFFIX): unite the differences of the names of macros of
+	  prefix and suffix.
+	  reported by HANEDA Norikatsu. [ruby-dev:42775]
+
+Thu Dec 16 08:04:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.h (RNode): match the type of flags to RBasic, and renamed
+	  nd_file as nd_reserved.
+
+	* iseq.c (set_relation), vm_insnhelper.c (vm_cref_push): nd_file
+	  is always zero-cleared.
+
+Thu Dec 16 07:22:30 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/unit.rb: Imported minitest 2.0.1 r6079.
+
+Wed Dec 15 20:45:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit.rb (process_args): need to setup @help to print options.
+
+Wed Dec 15 11:19:33 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/zlib/test_zlib.rb (test_to_io): forgotten to fix with r30201.
+
+Wed Dec 15 11:07:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (simple_sendfile): enable on Mac OS X.
+
+	* io.c (nogvl_copy_stream_sendfile): moved precheck of copy length.
+
+	* io.c (nogvl_copy_stream_sendfile): should wait for both of
+	  read/write fds.
+
+Wed Dec 15 07:11:55 2010  Tanaka Akira  <akr@fsij.org>
+
+	* hash.c: parenthesize macro arguments.
+
+Wed Dec 15 04:02:00 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
+	  fix compile error when !HAVE_X509V3_SET_NCONF. Thanks
+	  Chikanaga-san. [ruby-dev:42761] [Ruby 1.9-Bug#4158]
+
+Wed Dec 15 03:41:31 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ripper/test_parser_events.rb (TestRipper#test_block_variables):
+	  Limit address space 100MB instead 100KB. Quite frankly, This
+	  margin is too narrow to contain ruby. [ruby-dev:42763] [Bug#4159]
+
+Tue Dec 14 23:53:52 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (simple_sendfile): improve linux compatibility on FreeBSD,
+	  and now it works. But without cpuset -l 0, it still gets stuck.
+
+Tue Dec 14 20:31:33 2010  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c: parenthesize macro arguments.
+
+Tue Dec 14 18:31:48 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit.rb: help messages.
+
+Tue Dec 14 18:19:03 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (help): there is no reason to use the abbreviation for here.
+
+Tue Dec 14 15:03:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (test_reopen, test_reinitialize): should close
+	  the temporary files.
+
+Tue Dec 14 14:24:15 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (make_tempfile): change the prefix from 'foo'
+	  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.
+
+Tue Dec 14 13:52:19 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (test_flush_in_finalizer[12]): should close
+	  temporary file because it's only used for taking pathname and
+	  unlinking the file after the end of the test (in GC phase).
+
+Tue Dec 14 13:34:33 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzfile_s_open): should close the IO if some error
+	  occurs in initializing.
+
+Tue Dec 14 13:04:16 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTPRequest#send_request_body_data):
+	  set binmode to tempfile.
+
+Tue Dec 14 12:55:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/zlib/test_zlib.rb (*): should close files associated with zlib.
+
+Tue Dec 14 11:30:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_argf.rb (test_inplace_rename_impossible): unlink
+	  the renamed temporary file on no_safe_rename platforms.
+
+	* test/ruby/test_argf.rb (test_readlines_limit_0,
+	  test_each_line_limit_0): should close argf because the associated
+	  Tempfile object cannot unlink the temporary file when it's gc'ed
+	  on some platforms (Windows, etc.)
+
+Tue Dec 14 11:27:07 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/minitest/unit.rb (Minitest::Unit#_run_suite): split test
+	  name and its time. Thiw allows to know test's name when you are
+	  running tests and meet a test which spends long time at realtime.
+
+Tue Dec 14 11:25:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: Add -Werror=declaration-after-statement to default
+	  warning flag. If you are using GCC, this flag is useful to
+	  prevent breaking VC build.
+
+Tue Dec 14 10:25:57 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): how many gcc-c99isms
+	  must a man mend; before he can build with VC? r30178
+
+Mon Dec 13 21:26:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (simple_sendfile): disable the use of sendfile(2) on
+	  FreeBSD. It blocks on TestIO#test_copy_stream_socket.
+
+Mon Dec 13 18:35:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c: define USE_SENDFILE on FreeBSD or DragonFly BSD.
+	  Remove Mac OS X because its argument is different from them.
+
+Mon Dec 13 12:00:09 2010  Tanaka Akira  <akr@fsij.org>
+
+	* file.c: parenthesize macro arguments.
+
+Mon Dec 13 11:21:14 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (simple_sendfile): added for BSD version of sendfile(2).
+
+Mon Dec 13 09:50:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTPRequest#set_form): Added to support
+	  both application/x-www-form-urlencoded and multipart/form-data.
+	  There is a similar API, Net::HTTPRequest#set_form_data, but
+	  to keep its compatibility this is newly added. [ruby-dev:42729]
+
+Sun Dec 12 23:45:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): fix for __goto__ and __label__
+	  where were totally broken.
+
+Sun Dec 12 22:45:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (ID_H_INCLUDES): now id.h depends on vm_opts.h.
+
+Sun Dec 12 20:42:47 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* template/id.h.tmpl: suppress all warning: "SUPPORT_JOKE" is not
+	  defined.  [ruby-dev:42730]
+
+Sun Dec 12 20:35:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* misc/rb_optparse.zsh: update how to install.
+
+	* misc/rb_optparse.zsh: avoid error when setopt noclobber.
+
+	* lib/optparse.rb: fix typo. pointed out at
+	  <http://d.hatena.ne.jp/nagachika/20101207>.
+
+Sun Dec 12 13:27:35 2010  Tanaka Akira  <akr@fsij.org>
+
+	* eval_error.c: parenthesize macro arguments.
+
+Sun Dec 12 11:53:24 2010  Tanaka Akira  <akr@fsij.org>
+
+	* error.c: parenthesize macro arguments.
+
+Sun Dec 12 04:01:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): fix: extra back slash is added when
+	  the string is dummy encoding and includes \x22 or \x5C.
+
+Sun Dec 12 02:42:24 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/openssl/ossl_asn1.c: indefinite length BER to DER encoding is
+	  properly supported.  Thanks Martin Bosslet! [ruby-core:33082]
+
+Sat Dec 11 17:43:34 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/bigdecimal/bigdecimal.h: suppress "warning: 'VPrint' declared
+	  'static' but never defined".
+
+Sat Dec 11 09:24:57 2010  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c: parenthesize macro arguments.
+
+Sat Dec 11 08:12:48 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl.c, ext/openssl/ossl_pkey_rsa.c: Document RSA, RSA
+	  encryption/decryption and PKCS #5 encryption/decryption.
+
+Sat Dec 11 06:23:41 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl_x509name.c: include Comparable to provide #==.
+	  Document OpenSSL::X509::Name#<=>.  [Ruby 1.9-Feature#4116]
+
+Sat Dec 11 05:48:28 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: infinite loop on method_missing at loading.
+	  [ruby-dev:42716] [Ruby 1.9-Bug#4129]
+
+	* ext/tk/lib/multi-tk.rb: when no eventloop is running, ruby freezes at
+	  exit.
+
+Sat Dec 11 02:23:15 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/openssl/extconf.rb: try pkgconfig first, then fall back to
+	  normal have_library, etc.  Thanks Erik Hollensbe. [ruby-core:32406]
+
+Fri Dec 10 22:33:39 2010  Tanaka Akira  <akr@fsij.org>
+
+	* dln_find.c: parenthesize macro arguments.
+
+Fri Dec 10 20:05:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/id.h.tmpl (ruby_method_ids): suppress warnings.
+	  [ruby-dev:42730]
+
+Fri Dec 10 18:29:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe): relatively called non-shared
+	  binary cannot be found in PATH, so use given pathname.
+
+Fri Dec 10 18:28:40 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (SCRIPTPROGRAMS): ignore backup files and etc.
+
+	* cygwin/GNUmakefile.in (scriptbin): set executable bit.
+
+	* tool/rbinstall.rb (install_recursive): always skip default ignored
+	  files.  if block is given, call it instead of calling install.
+
+	* tool/rbinstall.rb (bin-comm): use install_recursive.
+
+Fri Dec 10 18:12:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/mkmf/base.rb (TestMkmf#config_value): extract macro value from
+	  config.h.
+
+	* test/mkmf/test_sizeof.rb (TestMkmf::TestSizeof#test_sizeof_builtin),
+	  (TestMkmf::TestSizeof#test_sizeof_struct): more tests.
+
+	* lib/mkmf.rb (check_signedness): should use the prelude code.
+	  [ruby-dev:42731]
+
+	* lib/mkmf.rb (Logging.log_close): separate from Logging.logfile.
+
+	* test/mkmf/base.rb (TestMkmf::MKMFLOG): show mkmf.log at failures.
+
+	* test/mkmf/base.rb (TestMkmf#teardown): close log file for each tests.
+
+Fri Dec 10 11:36:43 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* compile.c (enum): remove a comma at end of enumerator list.
+
+	* constant.h (rb_const_flag_t): ditto.
+
+	* iseq.h (enum catch_type): ditto.
+
+	* iseq.h (enum defined_type): ditto.
+
+	* vm_core.h (enum iseq_type): ditto.
+
+	* vm_core.h (enum vm_special_object_type): ditto.
+
+Fri Dec 10 10:47:53 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* sprintf.c (_HAVE_SANE_QUAD_): Don't forget LP64, r30156.
+
+Fri Dec 10 10:37:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* sprintf.c (_HAVE_SANE_QUAD_): if a certain platform has LONG_LONG in
+	  8 byte, it might be sane quad. [ruby-core:33634]
+
+Fri Dec 10 10:07:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb: remove version 1.1 features.
+
+Fri Dec 10 02:18:02 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/openssl/ossl_x509store.c (ossl_x509stctx_cleanup): removing C
+	  implementation of `cleanup`.
+
+	* ext/openssl/lib/openssl/x509.rb: adding ruby implementation of
+	  `cleanup`.  OpenSSL::X509::StoreContext#cleanup is deprecated since
+	  reusing the underlying struct doesn't make sense. [ruby-dev:42546]
+
+Thu Dec  9 20:14:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lvar_defined_gen, shadowing_lvar_gen, dvar_defined): no
+	  warnings for unused method and block arguments.
+	  [ruby-dev:42718] [ruby-dev:42724]
+
+Thu Dec  9 19:25:49 2010  Tanaka Akira  <akr@fsij.org>
+
+	* dln.c: parenthesize macro arguments.
+
+Thu Dec  9 18:51:06 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/accesslog.rb (WEBrick::AccessLog#format): support
+	  %{remote}p for logging remote (client) port number.
+	  [ruby-dev:42670]
+
+Thu Dec  9 11:00:30 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_dup): should copy contents only.  no instance
+	  variable, no class would be copied.  it would affect methods
+	  #sort, #reject, #transpose, #uniq, #compact, and #shuffle.
+	  [ruby-core:33640]
+
+	* array.c (rb_ary_reverse_m): ditto.
+
+	* array.c (rb_ary_rotate_m): ditto.
+
+Wed Dec  8 21:38:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/dl/lib/dl/struct.rb: clean a warning: assigned but unused
+	  variable. patched by Kouhei Yanagita. [ruby-dev:42722]
+
+	* ext/dl/lib/dl/import.rb: ditto.
+
+Wed Dec  8 21:36:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (shadowing_lvar_gen): fix line number.  [ruby-dev:42718]
+
+Wed Dec  8 20:37:11 2010  Tanaka Akira  <akr@fsij.org>
+
+	* dir.c: parenthesize macro arguments.
+
+Tue Dec  7 22:37:15 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* io.c (io_read): duplicate string if shared. [ruby-dev:42719]
+
+Tue Dec  7 22:31:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::Officious): separate completion
+	  options from --help.  [ruby-dev:42690]
+
+	* lib/optparse.rb (OptionParser::Completion#candidate),
+	  (OptionParser::Switch#compsys): remove unused variables.
+
+Tue Dec  7 22:05:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (transcode_loop): call default handler of the given
+	  hash, method, proc or [] method as fallback.  [ruby-dev:42692]
+
+Tue Dec  7 21:59:37 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/light/node.rb: remove circular require.
+
+Tue Dec  7 21:56:01 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_light.rb: really suppress a warning.
+
+Tue Dec  7 21:51:57 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_light.rb: suppress a warning.
+
+Tue Dec  7 21:14:03 2010  Tanaka Akira  <akr@fsij.org>
+
+	* debug.c: parenthesize macro arguments.
+
+Tue Dec  7 21:06:38 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/doctype.rb, test/rexml/test_doctype.rb: suppress warnings.
+	  [ruby-core:33305]
+	  Reported by Aaron Patterson. Thanks!!!
+
+Tue Dec  7 18:56:52 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc.
+	  patched by Kouhei Yanagita [ruby-dev:42696]
+
+Tue Dec  7 20:32:11 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_doctype.rb: add Accessor to test case name.
+
+Tue Dec  7 20:31:02 2010  Kouhei Sutou  <kou@clear-code.com>
+
+	* test/rexml/test_doctype.rb: Doctype -> DocType.
+
+Tue Dec  7 20:29:23 2010  Kouhei Sutou  <kou@clear-code.com>
+
+	* test/rexml/test_doctype_mixin.rb: rename to ...
+	* test/rexml/test_doctype.rb: ... this to remove needless name.
+
+Tue Dec  7 17:03:16 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (xlist): supported the XLIST command, which is an
+	  extension by Apple and Google.  patch by Geoff Youngs.
+	  [ruby-core:33521]
+
+Tue Dec  7 08:00:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, win32/Makefile.sub (WERRORFLAG): flag to treat
+	  warnings as errors.
+
+	* lib/mkmf.rb (Logging.postpone): yield log file object.
+
+	* lib/mkmf.rb (xsystem): add options, :werror only right now.
+
+	* lib/mkmf.rb (with_werror): check as if warnings are errors.
+
+	* lib/mkmf.rb (convertible_int): make declaration conflict
+	  warnings errors not to pass wrong type.  [ruby-dev:42684]
+
+	* lib/mkmf.rb (COMMON_MACROS): get rid of conflicts.
+
+	* win32/Makefile.sub (WARNFLAGS): make declaration conflict
+	  warnings errors if possible.
+
+Sun Dec  7 21:16:10 2010  Tanaka Akira  <akr@fsij.org>
+
+	* cont.c: parenthesize macro arguments.
+
+Tue Dec  7 00:27:14 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+
+	* win32/win32.c (rb_w32_read): fixed more for readline,
+	  and so on. [ruby-core:33511]
+
+Mon Dec  6 23:18:22 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/mkmf/base.rb (TestMkmf#setup): run quietly.
+
+	* test/mkmf/test_find_executable.rb (test_find_executable): use
+	  configured results.
+
+	* common.mk (test-build): test for build process.
+
+Mon Dec  6 22:47:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#candidate): skip separators.
+
+	* sample/optparse/opttest.rb: should not override --help.
+	  [ruby-dev:42690]
+
+Mon Dec  6 19:00:48 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* misc/rb_optparse.zsh: fix typos.
+
+Mon Dec  6 18:59:04 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: add new encodings.
+
+Mon Dec  6 18:56:42 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_string.rb (TestString#test_scan): add a test for
+	  [ruby-core:33338] #4087.
+
+Mon Dec  6 18:55:36 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/uri/test_common.rb (TestCommon#test_encode_www_form): add
+	  tests for r30015.
+
+Mon Dec  6 10:39:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI::Parser#initialize_pattern):
+	  refix for restrict the pattern.
+
+Mon Dec  6 09:45:11 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl (OpenSSL): add toplevel documentation
+	* ext/openssl/ossl_ssl.c (SSLContext, SSLSocket: add additional
+	  documentation
+	* ext/openssl: move "let rdoc know about mOSSL" comments so they don't
+	  show up in output
+
+Mon Dec  6 09:16:46 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI::Parser#initialize_pattern):
+	  workaround fix pattern of hostname for RFC 3986. [ruby-dev:42672]
+
+Mon Dec  6 09:14:38 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/mkmf.rb (check_signedness): rename unused variable prelude.
+
+Sun Dec  5 17:56:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (make_metaclass): fix probable typo.  builtin type flag
+	  cannot be used with FL_TEST.
+
+Sun Dec  5 12:09:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]
+
+Sun Dec  5 11:27:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file_internal): decrement for ungotten line.
+	  [ruby-dev:42680]
+
+Sun Dec  5 10:32:11 2010  Tanaka Akira  <akr@fsij.org>
+
+	* complex.c: parenthesize macro arguments.
+
+Sat Dec  4 11:39:17 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl_x509ext.c (initialize): add documentation.
+
+Sat Dec  4 11:21:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_update_by): new API for Hash#update.
+
+Sat Dec  4 11:18:10 2010  Tanaka Akira  <akr@fsij.org>
+
+	* class.c: parenthesize macro arguments.
+
+Sat Dec  4 11:07:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_vm_inc_const_missing_count): missing prototype.
+
+Sat Dec  4 08:50:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (Init_iconv): no warnings if $VERBOSE is nil.
+
+Sat Dec  4 08:25:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): revert r30064 and r30071,
+	  because of [ruby-core:26761]. Bug#4106 rejected.
+
+Sat Dec  4 07:46:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (String#tr_cpp): substitute * with P like as
+	  autoconf.
+
+Fri Dec  3 22:36:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): protected methods should be
+	  checked against the real class.
+
+Fri Dec  3 20:23:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (convertible_int): define printf format prefix too.
+
+	* lib/mkmf.rb (convertible_int): detect convertible integer type.
+	  port RUBY_REPLACE_INT from configure.in.
+
+	* lib/mkmf.rb (check_sizeof): should return integer always.
+
+Fri Dec  3 12:54:48 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (RCFLAGS): VC10 and after only. fixed the problem
+	  of r30015. [ruby-core:33530]
+
+Fri Dec  3 12:41:52 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* gc.c (rb_objspace_free): With our "lazy-sweep" GC engine, it is
+	  possible for an object to survive until its surrounding object
+	  space is about to be freed.  Those objects, if any, remains
+	  leaked for the rest of a process life.  This is problematic
+	  because for instance a T_DATA object may have its own destructor
+	  to terminate something.
+
+	* vm.c (ruby_vm_destruct): ruby_current_vm termination should be
+	  somewhere after rb_objspace_free for above reason.
+
+Fri Dec  3 12:17:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): protected singleton methods should
+	  be visible from same real class methods.  [ruby-core:33506]
+
+Fri Dec  3 07:08:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_getline): round upto next char
+	  boundary.  [ruby-dev:42674]
+
+Fri Dec  3 06:52:46 2010  Tanaka Akira  <akr@fsij.org>
+
+	* compile.c: parenthesize macro arguments.
+
+Fri Dec  3 04:08:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_alias_internal): use st_insert2 and change return
+	  value to int.
+
+	* encoding.c (enc_alias): follow enc_alias_internal.
+
+Fri Dec  3 01:52:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_alias_internal): use xfree instead of free.
+
+Thu Dec  2 23:52:26 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* NEWS: entry for ruby_vm_at_exit().
+
+	* eval.c (ruby_cleanup): bug fix around at_exit (1) timing was
+	  wrong. (2) execution order was opposite.
+
+Thu Dec  2 23:05:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (RCFLAGS): -nologo switch is only available in
+	  newer versions of rc.exe. fixed the problem of r30012.
+
+Thu Dec  2 21:28:07 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/lib/json/add/rails.rb: removed.
+
+Thu Dec  2 21:22:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (enc_alias_internal): free the copied key and
+	  return NULL when given key is already registered.
+
+	* encoding.c (enc_alias): call set_encoding_const only when the
+	  alias is not registered yet.
+
+Thu Dec  2 19:58:24 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* vm.c (ruby_vm_at_exit): new API.  This enables extension libs to
+	  hook a VM termination.  Right now, because the VM we have is
+	  process global, most extensions do not deallocate resources and
+	  leave them to Operating System's reaping userland processes.  But
+	  in a future we plan to have multiple VMs to run simultaneously in
+	  a single process (MVM project).  At that stage we can no longer
+	  rely on OSes and have to manage every resources to be reclaimed
+	  properly.  So it is.  For a forward-compatibility reason this API
+	  is introduced now, encouraging you to be as gentle as you can for
+	  your resources; that is, tidy up your room.
+
+	* include/ruby/vm.h: ditto.
+
+	* vm_core.h (rb_vm_struct): new field.
+
+	* vm.c (vm_init2): initialize above new field.
+
+	* eval.c (ruby_cleanup): trigger those hooks.
+
+Thu Dec  2 17:00:44 2010  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: parenthesize macro arguments.
+
+Thu Dec  2 15:31:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): more fix. [ruby-core:33513]
+
+Thu Dec  2 13:41:43 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): workaround for console reading troubles.
+	  fixed [ruby-core:33511]
+
+Thu Dec  2 13:10:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI.encode_www_form):
+	  split key-value when the value is Array like object.
+
+Thu Dec  2 10:39:39 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP#set_form_data):
+	  use URI.encode_www_form for application/x-www-form-urlencoded.
+
+Thu Dec  2 10:38:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/extmk.rb: remove $makeflags.defined?, it should be $mflags.
+
+Thu Dec  2 10:19:47 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (rc): suppress meaningless message.
+
+Thu Dec  2 10:09:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/generator/extconf.rb: remove the lines which set -O3
+	  when -O option is not set.
+	  Note that -O3 doesn't always exist.
+
+	* ext/json/parser/extconf.rb: ditto.
+
+Thu Dec  2 10:01:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/extmk.rb: define $makeflags.defined? like $mflags.
+
+Thu Dec  2 07:20:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::GCStressOption): --gc-stress
+	  option.
+
+	* lib/test/unit.rb (Test::Unit::Mini#_run_suites): show the result
+	  even when interrupted on the way.
+
+Thu Dec  2 07:08:38 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (setattr): should retry on EINTR.
+	  [ruby-dev:42666]
+
+Thu Dec  2 02:30:50 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb: fixed positional wording to match revised order.
+
+Thu Dec  2 01:24:39 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/lib/json/common.rb: don't use iconv on 1.9.
+	  patched by Shota Fukumori [ruby-core:33164]
+
+Thu Dec  2 01:02:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: Update github/flori/json from 1.4.2+ to
+	  e22b2f2bdfe6a9b0. this fixes some bugs.
+
+Thu Dec  2 00:05:44 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb: improve rdoc.
+	  This change the order of chapter because such overview should
+	  begin with simple examples.
+	  patched by Eric Hodel [ruby-core:33469]
+
+Wed Dec  1 22:01:49 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (Init_Numeric): fixed a potential bug when using bccwin32
+	  ruby with Microsoft's dll, though we already gave up of supporting
+	  bccwin32. [ruby-core:33503]
+
+Wed Dec  1 21:43:21 2010  Tanaka Akira  <akr@fsij.org>
+
+	* array.c: parenthesize macro arguments.
+
+Wed Dec  1 21:41:57 2010  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_addrinfo.rb: extract Errno::EADDRINUSE as a method.
+
+	* test/socket/test_socket.rb: ditto.
+
+Wed Dec  1 15:08:32 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/openssl/test_ssl.rb (test_not_started_session): non socket
+	  argument of SSLSocket.new is not supported on Windows.
+
+Wed Dec  1 14:36:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_memhash): zero-filled strings should return
+	  different values.  [ruby-core:33500]
+
+Wed Dec  1 14:27:49 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 2.0.0 r5952.
+	* test/minitest/*.rb: ditto.
+	* lib/test/unit.rb: Compatibility fix for minitest changes.
+
+Wed Dec  1 10:16:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): fix typo (not 0xFD but 0xFE).
+
+Wed Dec  1 09:28:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c: Follow .gnu_debuglink section.
+	  A user of distribution provided ruby will see line
+	  info if s/he has a debug package for ruby.
+	  patched by Shinichiro Hamaji [ruby-dev:42655]
+
+Wed Dec  1 01:29:15 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): inspect as a dummy encoding string
+	  when a UTF-16/32 (not BE/LE) string does not have a BOM.
+	  Unicode and some RFCs say that a string labeled as UTF-16/32
+	  doesn't have a BOM, it should be considered big endian.
+	  But many Windows programs generates little endian UTF-16
+	  strings without a BOM. So String#inspect treats a string
+	  labeled UTF-16/32 without a BOM as a dummy encoding string.
+	  patched by Martin Duerst. [ruby-core:33461]
+
+Tue Nov 30 17:04:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (parse_debug_line_cu): ignore DW_LNE_set_discriminator.
+	  To ignore, it needs to read a single unsigned LEB128 integer.
+
+Tue Nov 30 16:29:19 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_dump.c: undef HAVE_BACKTRACE when the OS is FreeBSD (in other
+	  words backtrace() is libexecinfo) and it is optimized.
+	  This temporary hack may be also applied to other libexecinfo
+	  environments.
+
+Tue Nov 30 16:23:23 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb: improve rdoc.
+	  patched by Eric Hodel ref #4100
+
+Tue Nov 30 12:23:52 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): read only 1 byte at once on console.
+	  workaround of Windows bug. see [ruby-core:33460].
+	  this is not the final solution.
+
+Tue Nov 30 11:39:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb: improve rdoc.
+	  patched by mathew murphy [ruby-core:33472] ref #4100
+
+Tue Nov 30 05:03:44 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/uri/common.rb (encode_www_form, encode_www_form_component):
+	  Improve English in documentation.
+
+	* ext/openssl/ossl_ssl.c (ssl_version=, ciphers=): Document
+	  #ssl_version=, add documentation for #ciphers=.
+
+Mon Nov 29 22:55:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/uri/common.rb (URI::WFKV_): get rid of backtrack explosion
+	  by nested repeat operators.  [ruby-core:33464]
+
+Mon Nov 29 22:53:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (scriptbin.mk): fix generated rules.
+
+	* win32/win32.c (rb_w32_write_console): fix argument type.
+
+Mon Nov 29 21:12:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-forward-sexp): stop after literal hash
+	  key labels.
+
+	* misc/ruby-mode.el (ruby-font-lock-keywords): highlight literal
+	  hash key labels as symbols.
+
+Mon Nov 29 18:31:31 2010  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
+	  - Removed commented-out options that are no longer under discussion.
+	  - Added two more tests for forthcomming clarifications.
+
+Mon Nov 29 14:31:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_isatty): use GetConsoleMode() to determine the
+	  fd is console or not, just like rb_w32_write_console(). [experimental]
+
+Mon Nov 29 14:19:40 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h (rb_w32_write_console): wrong prototype.
+
+Mon Nov 29 14:10:55 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_write_console): fixed indentation.
+
+Sun Nov 28 22:13:39 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (NATIVE_MUTEX_LOCK_DEBUG): move and use it.
+
+	* ChangeLog: fix my timezone.
+
+Mon Nov 28 21:58:58 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c: remove pthread_atfork().
+
+Mon Nov 28 21:54:22 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (native_cond_*): Check return code.
+	  (Some OSes except Linux return error code).
+
+Sun Nov 28 21:46:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (thread_start_func_1): initialize native thread
+	  data immediately before starting.
+
+Sun Nov 28 14:56:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (struct argf): make lineno long, and reorder members.
+
+Sun Nov 28 14:55:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_win32.c (gvl_release, gvl_init): suppress warnings.
+
+Sun Nov 28 14:48:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (gvl_release, gvl_init): suppress warnings.
+
+	* vm_core.h (rb_vm_gvl_destroy): add prototype.
+
+Sun Nov 28 14:46:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (gvl_reinit): register atfork handler only in
+	  the parent process, to get rid of dead lock.
+
+Sun Nov 28 12:23:57 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c, vm_core.h: make gvl_acquire/release/init/destruct
+	  APIs to modularize GVL implementation.
+
+	* thread_pthread.c, thread_pthread.h: Two GVL implementations.
+	  (1) Simple locking GVL which is same as existing GVL.
+	  (2) Wake-up queued threads.  The wake-up order is simple FIFO.
+	     (We can make several queues to support exact priorities, however
+	      this causes some issues such as priority inversion and so on.)
+	      This impl. prevents spin-loop (*1) caused on SMP environments.
+	  *1: Only one Ruby thread acquires GVL again and again.
+	      Bug #2359 [ruby-core:26694]
+
+	* thread_win32.c, thread_win32.h: Using simple lock
+	  not by CRITICAL_SECTION but by Mutex.
+	  Bug #3890 [ruby-dev:42315]
+
+	* vm.c (ruby_vm_destruct): ditto.
+
+Sun Nov 28 04:40:00 2010  Luis Lavena  <luislavena@gmail.com>
+
+	* io.c (io_fwrite): use rb_w32_write_console under Windows.
+
+	* win32/win32.c (rb_w32_write_console): added to write to write
+	  Unicode using WriteConsoleW for stdout/stderr. [ruby-core:33166]
+
+Sun Nov 28 03:58:47 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb: improve rdoc.
+	  patched by Mike Perham [ruby-core:33433]
+
+Sat Nov 27 19:12:10 2010  Tanaka Akira  <akr@fsij.org>
+
+	* time.c: parenthesize macro arguments.
+
+Sat Nov 27 18:08:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (leap_year_v_p): fixed typo.  [ruby-dev:42631]
+
+Sat Nov 27 17:57:08 2010  Tanaka Akira  <akr@fsij.org>
+
+	* resolv.rb (Resolv::DNS): use the same DNS server when retry using
+	  TCP.  reported by Julian Mehnle.  [ruby-core:32970]
+
+Sat Nov 27 15:45:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_dump.c (rb_vm_bugreport): see CrashReport log on Mac OS X.
+
+	* configure.in: link addr2line only for ELF.
+
+Sat Nov 27 13:58:55 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#candidate): : was missing.  Thanks,
+	  Shota Fukumori.  [ruby-dev:42634]
+
+Sat Nov 27 12:07:05 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* man/ruby.1: Ruby man page from Arthur Gunn in [ruby-core:33412]
+
+Sat Nov 27 11:29:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#candidate): get rid of 1.9 syntax
+	  so that BASERUBY can be 1.8.
+
+Sat Nov 27 08:16:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* addr2line.c (rb_dump_backtrace_with_lines): should close fd on
+	  edge case.
+
+Fri Nov 26 13:33:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c: apply a patch from shinichiro.h.
+
+Fri Nov 26 12:21:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c: added to show source filename and line number of
+	  functions in backtrace. [ruby-dev:42625]
+	  a patch from shinichiro.h <shinichiro.hamaji AT gmail.com>
+
+	* addr2line.h: ditto.
+
+	* common.mk: add addr2line.$(OBJEXT).
+
+	* configure.in: check dl_iterate_phdr.
+
+	* vm_dump.c (rb_vm_bugreport): use rb_dump_backtrace_with_lines in
+	  addr2line.c when the binary is ELF.
+
+Fri Nov 26 12:12:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (setup_tree): restart setup_tree() for a node whose
+	  AnchorNode's type is ANCHOR_PREC_BEHIND or ANCHOR_PREC_BEHIND_NOT
+	  and divide_look_behind_alternatives() divided it to NT_ALT or
+	  NT_LIST. [ruby-core:33370]
+
+Fri Nov 26 11:40:11 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vm_dump.c (dump_thread): get only required rights of the target
+	  thread because THREAD_ALL_ACCESS causes an access error on XP.
+	  reported by Masaya TARUI via IRC.
+
+Fri Nov 26 11:09:07 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vm_dump.c (dump_thread): show the displacement from the beginning
+	  of the symbol.
+
+Fri Nov 26 10:48:23 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vm_dump.c (dump_thread): follow the output of glibc.
+	  see [ruby-dev:42627]
+
+Fri Nov 26 09:48:45 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* re.c (rb_reg_initialize_str): should succeed the taint status from
+	  the origin. [ruby-core:33338]
+
+Fri Nov 26 09:32:37 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vm_dump.c (dump_thread): seems to be necessary the 3rd argument of
+	  SymGetLineFromAddr64(), even though MSDN says it can be zero.
+
+Fri Nov 26 09:03:38 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (onig_is_prelude): added to check whether ruby is still
+	  in prelude (or other boot processes) or not.
+
+	* regcomp.c (optimize_node_left): use onig_is_prelude for printing.
+
+	* regcomp.c (set_optimize_info_from_tree): ditto.
+
+	* regcomp.c (onig_compile): ditto.
+
+	* regcomp.c (print_compiled_byte_code_list): print its address.
+
+	* regcomp.c (print_indent_tree): print its contents tree of
+	    ANCHOR_PREC_READ(_NOT) and ANCHOR_PREC_BEHIND(_NOT).
+
+Thu Nov 25 23:10:49 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (print_distance_range): use PRIuSIZE.
+
+	* regcomp.c (print_optimize_info): use %ld because the type of
+	  calculated value of integers is long.
+
+	* regexec.c (onig_print_compiled_byte_code): add prototype.
+
+	* regexec.c (match_at): add 2nd argument.
+
+Thu Nov 25 10:29:55 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/callback/mkcallback.rb (gencallback): shouldn't assume that
+	  VALUE is the same size with long.
+
+Thu Nov 25 10:03:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/win32ole/test_err_in_callback.rb (teardown): remove tmp file
+	  only when it exists.
+
+Thu Nov 25 01:38:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/big5-hkscs-tbl.rb: Update table as HKSCS-2008.
+	  patched by oCameLo oTnTh [ruby-core:33256]
+
+	* enc/big5.c: add alias Big5-HKSCS:2008 to Big5-HKSCS.
+
+Wed Nov 24 15:18:07 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vsnprintf (BSD_vfprintf): use QUADINT macro only when _HAVE_SANE_QUAD_
+	  macro is defined.
+
+Wed Nov 24 12:47:16 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vsnprintf (BSD_vfprintf): added VC++ compatible size specifications
+	  (I, I32, I64).
+
+Wed Nov 24 11:19:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): treat UTF-16 and UTF-32 as BE or LE.
+
+Wed Nov 24 06:35:32 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/utf_16_32.trans: add the UTF-32 converter.
+
+Wed Nov 24 05:40:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+Wed Nov 24 06:13:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (filecp, wstr_to_mbstr, mbstr_to_wstr):
+	  refactored.
+
+Wed Nov 24 05:40:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/utf_16_32.trans: add a converter from UTF-8 to UTF-16.
+
+Wed Nov 24 03:21:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/utf_16_32.trans: raise error on unpaired upper
+	  surrogates.
+
+Wed Nov 24 01:40:23 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/utf_16_32.h: add UTF-16 and UTF-32 as a dummy encoding.
+
+	* enc/trans/utf_16_32.trans: add a converter from UTF-16 to UTF-8.
+
+Tue Nov 23 21:59:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (wlink, rb_w32_getppid): use typedef instead of
+	  repeating complicated function prototypes.
+
+Tue Nov 23 18:54:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_thread_mark): should mark self in control
+	  frames.  [ruby-core:33289]
+
+Tue Nov 23 07:57:31 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/delta/parser.{ry,rb}: fixed a bug of token scanner.
+
+Tue Nov 23 07:29:24 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c, rational.c ({nucomp,nurat}_expt): added a check.
+
+Tue Nov 23 07:27:27 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (daynum): should be private.
+
+Tue Nov 23 07:22:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ChangeLog (change-log-indent-text): hanging indent.
+
+Tue Nov 23 06:30:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (SITE_DIR, VENDOR_DIR),
+	  version.c (ruby_initial_load_paths): exclude directories that
+	  are configured without them from $LOAD_PATH. [ruby-core:33267]
+
+	* configure.in (rubylibprefix): No ruby, No libprefix.
+
+Tue Nov 23 01:05:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): don't output floating point
+	  when the precision is 0. [ruby-dev:42615]
+
+Mon Nov 22 21:30:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_inspect): fix for ascii-compatible external
+	  encoding and different encoding string.  [ruby-core:33283]
+
+Mon Nov 22 18:45:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): should not duplicate rules.
+	  bug fix of r29842.
+
+Mon Nov 22 18:04:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/big5.c: split CP950 from Big5.
+
+	* enc/big5.c: split CP951 from Big5-HKSCS.
+
+	* enc/trans/big5.trans: import conversion table of Big5, Big5-HKSCS,
+	  CP950, and CP951 from ICU. they need fallback conversions.
+	  ref [ruby-core:33256]
+	  http://source.icu-project.org/repos/icu/data/trunk/charset/data/ucm/
+
+	* tool/transcode-tblgen.rb (import_ucm): add to import ucm files.
+
+Mon Nov 22 18:33:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_inspect): append for each chars instead of bulk
+	  copy if encoding conversion is needed.  [ruby-core:33283]
+
+Mon Nov 22 14:22:45 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (time_zone): use rb_locale_str_new_cstr to set encoding
+	  as locale and convert its content to internal encoding.
+	  [ruby-core:33278]
+
+Mon Nov 22 11:58:11 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_concat): set ENC_CODERANGE_VALID when the
+	  receiver is 7BIT and the argument is non ASCII.
+
+Mon Nov 22 01:48:58 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: some improvements for performance.
+
+Sat Nov 20 07:45:50 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/mkmf.rb: adding compilation support for ObjC/ObjC++ extensions.
+	  Thanks Scott Gonyea! [ruby-core:33260]
+
+Sat Nov 20 01:57:55 2010  Akio Tajima  <artonx@yahoo.co.jp>
+
+	* common.mk: add dependency(insns.inc) to compile.obj
+
+Fri Nov 19 23:05:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (insns_rules.mk): remove extra backslash.
+
+	* cygwin/GNUmakefile.in, win32/Makefile.sub (clean): rc files are
+	  made at compile time, so should be removed by clean.
+
+Fri Nov 19 22:09:46 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_core.rb
+	  (Tester#test_pretty_format_long_text_finite): skip a test that
+	  uses long string on small memory system. [ruby-dev:42599]
+
+Fri Nov 19 21:07:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb: shell completion support for zsh.  based on
+	  <http://d.hatena.ne.jp/rubikitch/20071002/zshcomplete>
+
+	* lib/optparse.rb: shell completion support for bash.
+
+Fri Nov 19 00:00:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (SCRIPTPROGRAMS): no needs on cygwin.
+
+	* win32/Makefile.sub (scriptbin): create script binaries.
+
+Thu Nov 18 23:21:23 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/formatters/pretty.rb (REXML::Formatters::Pretty#wrap):
+	  REXML::Formatters::Pretty#wrap used a recursive method call to
+	  format text.  This switches it to use an iterative approach.
+	  [ruby-core:33245]
+	  Patch by Jeremy Evans. Thanks!!!
+
+	* test/rexml/test_core.rb: add a test for it.
+
+Thu Nov 18 22:58:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/io.h (rb_io_buffer_t): extract from rb_io_t.
+
+Thu Nov 18 07:37:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (reconfig): force reconfigure with previous options.
+
+	* common.mk (showconfig): show configure flags, like as
+	  `config.status --config' generated by recent autoconf.
+
+Thu Nov 18 07:16:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/langinfo.c (strncasecmp): get rid of redefinition.
+
+Thu Nov 18 00:02:17 2010  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb: Upgrading output encoding with ASCII content
+	  as needed.  [ruby-core:33229]
+
+Wed Nov 17 23:19:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/configure.bat: remove quotes from arguments to be quoted.
+
+	* lib/mkmf.rb (create_makefile): use forward slashes in messages.
+
+	* lib/mkmf.rb (create_makefile): make extension libraries messages
+	  brief.
+
+	* win32/Makefile.sub (MAKEDIRS): should not include silent flag.
+
+	* common.mk (ext/ripper/ripper.c, ext/json/parser/parser.c): pass
+	  Q and ECHO.  [ruby-core:33226]
+
+Wed Nov 17 16:09:52 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/test_tracer.rb: new test case.
+	  minimal regression test for r29280.
+
+Wed Nov 17 16:04:23 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/ruby/envutil.rb (Test::Unit::Assersions#assert_warn):
+	  new assertion to assert that a particular warning message is
+	  displayed.
+	  forward port from branches/ruby_1_9_2@29795.
+
+Wed Nov 17 15:16:48 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regint.h (OnigOpInfoType): constify name.
+
+	* regcomp.c (op2name): constify return value.
+
+	* regcomp.c (onig_print_compiled_byte_code): use PRIuPTR and
+	  uintptr_t to clean warnings.
+
+	* regcomp.c (print_indent_tree): use PRIxPTR and intptr_t.
+
+	* regexec.c (match_at): use PRIdPTR and intptr_t.
+
+Wed Nov 17 09:49:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/shift_jis.c (property_name_to_ctype): fix memory leak.
+
+	* enc/euc_jp.c (property_name_to_ctype): ditto.
+
+Wed Nov 17 08:54:04 2010  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb: Upgrading output encoding as needed.  [ruby-core:33135]
+
+Tue Nov 16 22:30:39 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_insnhelper.c (vm_throw): remove fear of undefined behavior :-)
+	  Coverity Scan found this bug.
+
+Tue Nov 16 09:33:00 2010  Kenta Murata <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/lib/bigdecimal/util.rb (to_digits): avoid unused
+	  variables warning, reported by Aaron Patterson.
+
+Tue Nov 16 06:39:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (PACK_ITEM_ADJUST): return nil not result array and yield
+	  values if block is given.  [ruby-core:33193]
+
+Tue Nov 16 00:21:20 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* regparse.c (and_cclass, or_cclass): fix memory leak.  Coverity Scan
+	  found this bug.  [ruby-dev:42579]
+
+Tue Nov 16 00:07:32 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* gc.c (assign_heap_slot): fix fear of memory leak and memory
+	  violation.  Coverity Scan found this bug.
+
+Mon Nov 15 23:54:45 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* eval_intern.h (CHECK_STACK_OVERFLOW): it was not intended to add
+	  size_t to a pointer typed VALUE*.  Coverity Scan found this defect.
+
+Mon Nov 15 23:41:21 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (iseq_set_exception_local_table, iseq_set_local_table,
+	  rb_iseq_build_from_ary): fix type inconsistency (which is benign
+	  because sizeof(ID) == sizeof(ID*), though).  Coverity Scan found
+	  these bugs.
+
+Mon Nov 15 22:47:27 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (rb_funcall): ensure va_end after va_init_list.  Coverity
+	  Scan found this bug.
+
+Mon Nov 15 08:36:12 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/racc/parser.rb (do_parse, yyparse): using class eval to define
+	  method and avoid __send__.
+
+Mon Nov 15 06:43:48 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
+	  pointer is invalid.  Thanks Ippei Obayashi! [ruby-dev:42573]
+
+Sun Nov 14 17:57:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/Makefile.in (distclean): should not remove sources which are
+	  distributed in tarball.
+
+Sun Nov 14 16:48:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_set_token_info): turn on/off with directives.
+	  [ruby-core:25442]
+
+Sun Nov 14 12:05:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_readlines): forward to current_file for arguments
+	  check.  http://twitter.com/nagachika/status/3634254856589312
+
+Sun Nov 14 08:48:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/setup.mak (-basic-vars-, -runtime-): suppress trailing
+	  space and compiler command line.
+
+Sun Nov 14 04:22:32 2010  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+
+	* symbian/setup (config.h): Added HAVE_LABS and HAVE_LLABS to config.h.
+
+	* symbian/configure.bat: Changed packaging version in line with API
+	  style 3 versioning.
+
+Sat Nov 13 16:37:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (showflags, help): emit messages at once.
+
+	* win32/Makefile.sub (MSG, EOM): remove surrounding quotes by %~I.
+
+Sat Nov 13 01:31:30 2010  Akio Tajima <artonx@yahoo.co.jp>
+
+	* win32/Makefile.sub: reorder variable End Of Message (don't display it)
+
+Fri Nov 12 20:52:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (showflags, help): use caret to quote leading spaces on
+	  Windows.
+
+	* Makefile.in, common.mk, cygwin/GNUmakefile.in, enc/depend,
+	  ext/ripper/depend, lib/mkmf.rb, win32/Makefile.sub: caddle up.
+
+Fri Nov 12 16:35:31 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: support C level backtrace information on FreeBSD.
+	  When devel/libexecinfo is installed on FreeBSD, now ruby
+	  can show C level backtrace information.
+	  http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/libexecinfo/
+
+Fri Nov 12 09:58:30 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/setup.mak: use findstr.exe instead of find.exe, because all
+	  target build platforms should have findstr.exe, and, find.exe often
+	  means another command such as cygwin's.
+
+Fri Nov 12 00:30:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): need PRI_LL_PREFIX.
+
+Thu Nov 11 23:38:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: ANSI C-conforming const and volatile are mandatory
+
+	* configure.in (AC_C_CONST, AC_C_INLINE, AC_C_VOLATILE): check
+	  before used in other checks.
+
+	* configure.in (RUBY_CHECK_PRINTF_PREFIX): should not break from
+	  RUBY_WERROR_FLAG, so that ac_c_werror_flag gets restored.
+
+Thu Nov 11 23:04:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (warn_deprecated): show caller position.
+
+Thu Nov 11 23:03:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_close): untie tied io before closing.
+
+	* io.c (argf_write): add ARGF.write and so on.
+
+	* io.c (argf_read_nonblock): add ARGF.read_nonblock.
+
+Thu Nov 11 21:49:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/stats.rb (RDoc#print): get rid of NaN.
+
+Thu Nov 11 21:47:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (SHOWFLAGS): show compile flags.
+
+	* common.mk: hide long command lines by default.  verbose-mode is
+	  turned on by V=1 as before.
+	  http://jarp.does.notwork.org/diary/200605b.html#200605121
+
+Thu Nov 11 21:32:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_func): accept variable address.
+
+	* ext/win32ole/extconf.rb: libuuid is needed on cygwin.
+
+Thu Nov 11 21:24:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): use cygwin_conv_path on cygwin 1.7 or
+	  later.
+
+	* ruby.c (push_include_cygwin): ditto.
+
+Thu Nov 11 20:49:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (PRI_LL_PREFIX): format type specifier for
+	  LONG_LONG may vary on platforms.
+
+Thu Nov 11 20:45:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (SYMBOL_PREFIX): separate from EXPORT_PREFIX.
+
+	* win32/mkexports.rb (Exports#each_export): use SYMBOL_PREFIX.
+
+Wed Nov 10 07:20:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (scriptbin): make executable file from
+	  scripts with stub.
+
+	* ruby.c (load_file_internal): assume xflag for exe file as well
+	  as no-shebang file.
+
+	* tool/rbinstall.rb: install script programs.
+
+	* win32/mkexports.rb (Exports#initialize): alias ruby_sysinit for
+	  stub.
+
+	* win32/stub.c: stub for scripts.  [EXPERIMENTAL]
+
+Tue Nov  9 21:57:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (init_funcname): allocate and build initialization
+	  funciton name at once.
+
+Tue Nov  9 21:14:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (AC_FUNC_GETPGRP, AC_FUNC_SETPGRP): no need when
+	  not used.
+
+	* configure.in (EXPORT_PREFIX): check generic prefix.
+
+Tue Nov  9 13:24:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regenc.c (onigenc_minimum_property_name_to_ctype):
+	  \p{...} should be case insensitive. [ruby-core:33000]
+
+	* regenc.c (onigenc_property_list_add_property):
+	  ditto.
+
+	* enc/euc_jp.c (init_property_list, property_name_to_ctype):
+	  to lowercase property names.
+
+	* enc/shift_jis.c (init_property_list, property_name_to_ctype):
+	  ditto.
+
+Tue Nov  9 13:29:36 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (overlapped_socket_io): get rid of a warning of 64bit
+	  mingw.
+
+Tue Nov  9 10:44:19 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* util.c (ruby_strtod): this code uses FPU's rounding system.
+	  But x86's FPU calculates double precision floating-point
+	  numbers in 80bit precision, so it fails to round the value.
+	  So ensure the value is assigned a variable. [ruby-dev:42551]
+	  see also [ruby-math:00802]
+	  http://www.shudo.net/java-grandprix99/strictfp/
+
+Tue Nov  9 07:30:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_syserr_new): new function to make SystemCallError
+	  instance without errno.  [EXPERIMENTAL]
+
+	* error.c (rb_syserr_fail, rb_mod_syserr_fail): ditto.
+
+Tue Nov  9 05:54:57 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/*.rb: Remove unused variable warnings.
+	  Patch by Run Paint [ruby-core:30991]
+
+	* lib/rubygems/*, lib/rdoc/*.rb, lib/rake/*.rb: ditto
+
+Mon Nov  8 18:26:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* util.c (ruby_hdtoa): fix type cast and bufsize.
+
+Mon Nov  8 15:40:56 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): fix precision specifier doesn't
+	  work well on %f. [ruby-dev:42552]
+
+Mon Nov  8 14:41:40 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (get_wsa_extension_function): typos.
+
+Mon Nov  8 13:41:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/enc-unicode.rb,
+	  enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+	  Add Age property to regexp. [ruby-core:33019]
+	  patched by Ammar Ali, tested by Run Paint Run Run
+
+Mon Nov  8 12:16:39 2010  Ben Walton  <bwalton@artsci.utoronto.ca>
+
+	* configure.in: support -h for solaris linker when gcc not used
+
+Mon Nov  8 11:47:39 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (finish_overlapped_socket): refactoring.
+
+Mon Nov  8 11:02:21 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (get_proc_address): refactoring.
+
+	* win32/win32.c (get_wsa_exetinsion_function): refactoring.
+
+Mon Nov  8 09:45:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/gbk-tbl.rb: Add euro sign. [ruby-core:33094]
+	  CP936, which is de facto definition of GBK, has it.
+	  http://msdn.microsoft.com/en-us/goglobal/cc305153.aspx
+
+Mon Nov  8 07:26:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check only the first symbol to get rid of
+	  duplication.  [ruby-core:33084] #4031
+
+Sun Nov  7 10:13:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (NM): check on all platforms.  #4031
+
+Sun Nov  7 06:16:33 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* test/openssl/test_ocsp.rb: adding test for r29699.  Thanks Elise
+	  Huard! [ruby-core:32460]
+
+Sat Nov  6 07:33:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_export_prefix): check for prefixed
+	  underscore of exported symbols
+
+	* tool/rbinstall.rb (bin-comm): prepend prolog shell script if
+	  necessary.
+
+	* configure.in (LIBRUBY_RELATIVE): use rpath token expansion.
+
+Sat Nov  6 07:24:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/ruby.pc.in (arch, sitearch): reordered.
+
+	* configure.in: keep failed file.
+
+Sat Nov  6 07:03:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_fork_err): save errinfo before fdopen.
+
+Sat Nov  6 00:43:58 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspcid_initialize): an optional
+	  parameter may be used to specify the OpenSSL::OCSP::CertificateId on
+	  initialization.  Thanks Elise Huard! [ruby-core:32460]
+
+Fri Nov  5 12:23:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_{process,system}.rb (test_fallback_to_sh):
+	  meaningless and wrong tests where /bin/sh does not exist.
+
+	* process.c (proc_spawn_v): should spawn, not exec.
+
+Fri Nov  5 01:21:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_exec_v, proc_spawn_v): try to execute with sh if
+	  no shebang.  [ruby-core:32745] [EXPERIMENTAL]
+
+Fri Nov  5 00:39:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_readlines, rb_io_each_line): limit must not be zero.
+	  a patch from Tomoyuki Chikanaga at [ruby-dev:42538].  #4024
+
+Fri Nov  5 00:14:15 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/extconf.rb: fixing ffi library location on windows.
+	  Thanks Usa! [ruby-core:32930]
+
+Thu Nov  4 20:04:44 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_newobj): force garbage_collect() if GC.stress == true.
+
+Thu Nov  4 19:48:22 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* ChangeLog: missed to write a last ChangeLog.
+
+	* gc.c (gc_finalize_deferred): removed.
+
+	* gc.c (rb_gc_finalize_deferred): Do not invoke a free_unused_heaps().
+
+Thu Nov  4 19:45:27 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (run_final): do not need argument obj.
+
+Thu Nov  4 19:26:10 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (before_gc_sweep): fix commit miss.
+
+Thu Nov  4 19:20:46 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (after_gc_sweep, before_gc_sweep):
+	  invoke rb_sweep_method_entry() as soon as possible.
+
+Thu Nov  4 19:13:58 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (after_gc_sweep, slot_sweep): finalizers should be invoked
+	  as soon as possible.
+
+Thu Nov  4 10:30:40 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* configure.in (--with-valgrind): Now this option is default on.
+	  You can still explicitly disable this feature by specifying
+	  --without-valgrind.
+
+Thu Nov  4 02:06:16 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* cont.c (fiber_t_alloc): raise an error when fiber is going to be
+	  initialized twice.  [ruby-dev:42524]
+
+Thu Nov  4 02:04:25 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* cont.c (rb_fiber_resume): raise an "double resume" error when root
+	  fiber is going to be resumed.  [ruby-dev:42523]
+
+Wed Nov  3 14:17:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/ostruct.rb (OpenStruct#delete_field): also undefine
+	  accessor methods.  [ruby-core:33010]
+
+Wed Nov  3 14:13:46 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_enc_cr_str_buf_cat): concatenation of valid
+	  encoding string and invalid encoding string should result
+	  invalid encoding.  [ruby-core:33027]
+
+Wed Nov  3 08:58:59 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c, vm.c, vm_core.h: remove USE_VALUE_CACHE option.
+
+Wed Nov  3 07:47:25 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple
+	  regex options.  a patch from Heesob Park in [ruby-core:32988].
+
+Wed Nov  3 07:33:57 2010  Tanaka Akira  <akr@fsij.org>
+
+	* vm_method.c (rb_clear_cache_by_class): just return if the class has
+	  no method.  reported by Eric Wong.  [ruby-core:32689]
+
+Tue Nov  2 22:50:25 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/visitor.rb (initialize): push accessor
+	  methods to subclass that actually uses them.
+
+Tue Nov  2 22:47:08 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/visitor.rb (accept): switch to
+	  a dispatch cache rather than case / when statement.
+
+Tue Nov  2 21:46:52 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* NEWS: fix a typo.
+
+Tue Nov  2 20:10:32 2010  Tajima Akio <artonx@yahoo.co.jp>
+
+	* test/rake/test_tasks.rb: clear env var which is used by the test.
+	  [ruby-dev:42508]
+
+Tue Nov  2 00:25:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb: win64 is just same with win32 about socket.
+	  notice: but wince is not same.
+
+Mon Nov  1 21:25:57 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* main.c: <stdlib.h> is needed, to introduce the getenv(3)
+	  prototype declaration.  Without it a C compiler shall infer
+	  the getenv type as "int getenv(...);", but this is totally
+	  wrong, especially when your machine's sizeof(int) and
+	  sizeof(char*) differs.  On such environment a return value
+	  of getenv(3), which is in fact a char*, might first casted
+	  into a int (loses data here), and then casted back to char*
+	  by automatic integral promotion to fit to the prototype of
+	  ruby_set_debug_option().
+
+Sun Oct 31 23:27:09 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (finalizer_table, objspace->final.table):
+	  Create finalizer_table at Init_heap().
+	  Remove all null checks of finalizer_table.
+
+	* gc.c (mark_tbl): skip if no table entries.
+
+	* gc.c (slot_swee): remove useless need_call_final check.
+
+Sun Oct 31 22:32:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_objspace_free): finalizers should be called separately
+	  from freeing objspace.  [ruby-dev:42479]
+
+Sun Oct 31 22:24:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): free current VM and its objspace even
+	  when exiting by SystemExit.
+
+Sun Oct 31 22:10:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (new_child_iseq): adjust argument types.
+
+	* iseq.c (prepare_iseq_build, rb_iseq_new),
+	  (rb_iseq_new_with_bopt_and_opt, rb_iseq_new_with_opt),
+	  (rb_iseq_new_with_bopt): ditto.
+
+	* compile.c (iseq_set_exception_table): suppress warnings.
+
+	* insns.def (putspecialobject, defined): ditto.
+
+	* iseq.c (iseq_load): ditto.
+
+Sun Oct 31 09:30:51 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: some refactoring.
+	  - move decl. of rb_compile_option_struct to iseq.h.
+	  - define enum iseq_type.
+	  - define enum vm_special_object_type.
+
+	* compile.c: some refactoring.
+	  - apply above changes.
+	  - (struct iseq_link_element): change value of type.
+	  - remove unused decl.
+	  - fix comment.
+	  - rename iseq_build_body and iseq_build_exception to
+	    iseq_build_from_ary_body and iseq_build_from_ary_exception.
+
+	* iseq.h: define enum catch_type and enum defined_type.
+
+	* insns.def: apply above changes.
+
+	* iseq.c: define ISEQ_MAJOR_VERSION and ISEQ_MINOR_VERSION.
+
+Sat Oct 30 23:38:59 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/encoding.rb: untabify.
+
+Sat Oct 30 21:06:37 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/encoding.rb: use Ruby native encoding mechanism.
+	  [ruby-dev:42464]
+	* lib/rexml/encodings/: remove.
+
+	* lib/rexml/document.rb, lib/rexml/formatters/default.rb,
+	  lib/rexml/output.rb, lib/rexml/parseexception.rb,
+	  lib/rexml/parsers/baseparser.rb, lib/rexml/source.rb,
+	  lib/rexml/xmldecl.rb: use Ruby's native Encoding object.
+
+	* test/rexml/, test/rss/: follow the above encoding changes.
+
+	* NEWS: add REXML's incompatible change about encoding.
+
+Sat Oct 30 17:23:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_strtod): get rid of overflow/underflow as possible.
+
+Sat Oct 30 14:37:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ruby_pc): erase runtime-defined variables and
+	  check if generated pc file is valid.
+
+	* template/ruby.pc.in (DEFFILE): need for mingw.
+
+	* template/ruby.pc.in (LIBRUBY): fix the order.
+
+Sat Oct 30 11:33:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (ruby_pc): ignore missing variables.
+
+	* template/ruby.pc.in: add missing variables for mswin.
+
+Sat Oct 30 10:24:35 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* object.c: Make BasicObject.new accept no parameter.
+	  Revert of r26135 [ruby-core:27080], as per [ruby-core:32952].
+
+Sat Oct 30 09:40:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c: use constants in id.h.
+
+Sat Oct 30 09:08:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/fiddle/closure.c (fiddle_closure): embed cif not reference
+	  so that the content surely get initialized.  [ruby-dev:42480]
+
+Sat Oct 30 07:01:53 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv-replace.rb: suppress warning.
+
+	* lib/open-uri.rb: ditto.
+
+Sat Oct 30 06:32:52 2010  Tanaka Akira  <akr@fsij.org>
+
+	* test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the
+	  group of the created file is inherited from the parent
+	  directory on BSDs and MacOS X.  Linux also inherit the group if
+	  the setgid bit of the directory is set.  It causes the test fail.
+	  fixed by Shota Fukumori.  [ruby-dev:42458]
+
+Sat Oct 30 05:58:54 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb: retry via TCP if UDP reply is truncated.
+	  fixed by Julian Mehnle.  [ruby-core:32407]
+
+Sat Oct 30 00:35:13 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (iseq_s_compile): fix optional argument.
+	  a patch from Yutaka HARA [ruby-core:32953] [Ruby 1.9-Bug#4001]
+
+Sat Oct 30 00:24:42 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c (memsize_of): take care of
+	  T_CLASS/const_tbl.
+	  a patch from nagachika <nagachika00@gmail.com> [ruby-dev:42490]
+
+Fri Oct 29 23:32:36 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* test/profile_test_all.rb: added.
+	  You can use test-all profiler with the following command:
+	    RUBY_TEST_ALL_PROFILE=true make test-all
+	  This command generates ./test_all_profile and you can analyze
+	  which tests consume memories.
+
+	* test/runner.rb: ditto.
+
+Fri Oct 29 10:02:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/enc-unicode.rb,
+	  enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+	  Add 'Unknown' Script.
+	  patched by Run Paint Run Run. [ruby-core:32937] #3998
+
+Fri Oct 29 05:13:34 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c (ObjectSpace.memsize_of_all): rename
+	  ObjectSpace.total_memsize_of_all_objects() to
+	  ObjectSpace.memsize_of_all([klass]).
+	  Accept Class object to filter the objects.
+
+	* test/objspace/test_objspace.rb: fix test for above change.
+
+Fri Oct 29 03:04:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_dump): fix expected length. [ruby-core:32935]
+
+Thu Oct 28 23:31:39 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (before_gc_sweep, run_final): fix decrement timing of final_num.
+
+Thu Oct 28 20:11:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/enc-unicode.rb,
+	  enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+	  Update Oniguruma for Unicode 6.
+	  patched by Run Paint Run Run. [ruby-core:32923] #3989
+
+Thu Oct 28 20:06:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/oniguruma.h (ONIGENC_CTYPE_SPECIAL_MASK):
+	  change mask from 128 to 256. [ruby-core:32931]
+
+Thu Oct 28 12:06:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/httprequest.rb (read_request_line): extend max
+	  length to 2083. This is from Internet Explorer's max uri
+	  length. http://support.microsoft.com/kb/208427 [ruby-core:32924]
+
+Thu Oct 28 04:00:08 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (GC.stat): added.  [ruby-dev:38607]
+
+	* test/ruby/test_gc.rb: add a test for above.
+
+Thu Oct 28 03:13:06 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c (memsize_of): fix rdoc.
+
+	* ext/objspace/objspace.c (total_memsize_of_all_objects): added.
+
+	* test/objspace/test_objspace.rb:
+	  - add a test for ObjectSpace.total_memsize_of_all_objects.
+	  - add two tests for ObjectSpace.memsize_of (for nil and Fixnum).
+
+Wed Oct 27 23:55:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (Init_iconv): warn deprecated use.
+
+Wed Oct 27 18:50:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bignum.c (rb_big2long, rb_big2ulong): rb2ulong() returns VALUE, but
+	  its real range is ulong. So, if the size of VALUE is bigger than
+	  ulong, upper bits are always zero even if the actual value is
+	  negative.
+	  fixed #3490
+
+Wed Oct 27 18:27:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#pipe): should close write end of pipe
+	  before closing read end, to get rid of timing problem.
+
+	* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
+
+Wed Oct 27 18:14:27 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_getppid): support Win64.
+
+Wed Oct 27 15:07:19 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (w32_error): should get error no only once, because
+	  the result of the second getting will indicate the error of the
+	  first FormatMessage() call.
+
+Wed Oct 27 13:51:25 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#pipe): need to propagate exceptions
+	  in read/write thread. fix r29541.
+
+	* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
+
+Wed Oct 27 12:05:40 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* class.c (clone_const): need to return value. fix r29602.
+
+Wed Oct 27 11:58:58 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/ruby.h (NUM2LONG_internal): add cast to get rid of a
+	  non GCC compiler warning. this is intentional type conversion.
+
+Wed Oct 27 09:25:46 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* cont.c: apply documentation patch by Run Paint Run Run.
+	  [ruby-core:32915]
+
+Wed Oct 27 02:12:10 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* object.c (Init_Object), constant.h, variable.c
+	  (rb_mod_private_constant, rb_mod_public_constant,
+	  set_const_visibility, rb_const_get_0): add Module#public_constant
+	  and private_constant.  [ruby-dev:39685][ruby-core:32698]
+
+	* test/ruby/test_module.rb: add tests for above.
+
+Wed Oct 27 02:02:54 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* class.c, constant.h, gc.c, method.h, object.c, variable.c,
+	  vm_insnhelper.c: use struct rb_constant_entry_t as entry of
+	  RCLASS_CONST_TBL.  RCLASS_CONST_TBL has contained VALUE of constant
+	  directly.  Now instead rb_const_entry_t is contained in
+	  RCLASS_CONST_TBL,  rb_const_entry_t is managed by malloc, and
+	  have not only the value itself but also visibility flag.
+	  This is another preparation for private constant (see
+	  [ruby-dev:39685][ruby-core:32698]).
+
+Wed Oct 27 01:56:34 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* class.c, gc.c, object.c, variable.c, vm_insnhelper.c,
+	  include/ruby/ruby.h: separate RCLASS_CONST_TBL from RCLASS_IV_TBL.
+	  RCLASS_IV_TBL has contained not only instance variable table but
+	  also constant table.  Now the two table are separated to
+	  RCLASS_CONST_TBL and RCLASS_IV_TBL.  This is a preparation for
+	  private constant (see [ruby-dev:39685][ruby-core:32698]).
+
+Tue Oct 26 18:51:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/scanf.rb (extract_float): allow 2.e+2 style.
+	  [ruby-dev:42452] #3978
+
+Tue Oct 26 18:09:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (ASFLAGS): needs INCFLAGS.
+
+	* configure.in (rb_cv_dynamic_alloca): check if extra source for
+	  dynamic size alloca.
+
+	* missing/x86_64-chkstk.s (___chkstk): necessary for alloca of
+	  amd64-mingw32msvc-gcc on Ubuntu.
+
+	* thread_win32.c (ruby_alloca_chkstk): check stack overflow
+
+Tue Oct 26 18:04:53 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/ruby.pc.in (Libs): needs DLDFLAGS.
+
+Tue Oct 26 12:47:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (pkgconfig-data): moved from Makefile.in.
+
+	* tool/rbinstall.rb: install pc file only if non-empty.
+	  [ruby-core:32901] #3983
+
+	* win32/Makefile.sub (ruby_pc): create pc file.
+
+Tue Oct 26 09:13:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_gcc_atomic_builtins): check for atomic
+	  builtins, all are not available in Apple derivative gcc.
+
+Tue Oct 26 00:29:26 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (pkgconfig-data): create pkg-config metadata file.
+
+	* tool/rbinstall.rb: install pkg-config metadata file.
+
+	* template/ruby.pc.in: template of pkg-config metadata file.
+
+Mon Oct 25 16:38:07 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* signal.c  (rb_atomic_t): GCC (of  at least  recent versions)
+	  has  ubiquitous  support  for  atomic operations.   On  that
+	  compiler a C program can  issue a memory barrier using these
+	  dedicated  instructions.  According to  the GCC  manual they
+	  cargo culted  this feature form  the Itanium ABI  so chances
+	  are that  other compilers  could also support  this feature.
+	  But so far GCC is the  only compiler that I know to have it.
+	  Also note that this works on non-Itanium machines.
+
+Mon Oct 25 06:21:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): prec digits fractal part should be
+	  appended to 0 if prec is given.  [ruby-dev:42453] #3979
+
+Mon Oct 25 02:57:21 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk (run.gdb): Quit gdb on 'make gdb' when
+	  no signals are received.
+
+Mon Oct 25 00:25:23 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: some corrections of documentation.
+
+Sun Oct 24 17:14:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c, gc.c, hash.c, object.c, string.c, struct.c,
+	  transcode.c, variable.c, vm.c, vm_insnhelper.c, vm_method.c:
+	  replace calls to rb_error_frozen() with rb_check_frozen().  a
+	  patch from Run Paint Run Run at [ruby-core:32014]
+
+	* include/ruby/intern.h (rb_check_frozen): optimize.
+	  [ruby-core:32878]
+
+Sun Oct 24 15:16:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Mini#run): abort if interrupted.
+
+	* lib/test/unit.rb (Test::Unit::Mini#run_test_suites): show the
+	  result even when interrupted on the way.
+
+	* lib/test/unit.rb (Test::Unit::Mini#run_test_suites): ensure
+	  output sync mode to be restored.
+
+Sun Oct 24 14:11:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_define_method): defined method is run with the default
+	  public visibility regardless the visibility context of definition.
+	  [ruby-core:30638]
+
+Sun Oct 24 12:08:54 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/test/unit.rb: make test/unit play nicely with the rake test
+	  loader. [ruby-core:32864]
+
+Sun Oct 24 00:25:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_rubyoptions.rb (test_segv_test): follow up the
+	  change at r29556.
+
+Sat Oct 23 14:39:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: $extmk should be true for test/runner.
+
+Sat Oct 23 10:55:37 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_dump.c (rb_vm_bugreport): fix to add bug outputs.
+	  - loaded script ($0)
+	  - loaded features ($")
+	  - process memory map on Linux (/proc/self/maps)
+
+	* vm_dump.c (rb_vmdebug_stack_dump_raw): fix header message.
+
+Fri Oct 22 14:50:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+	  assertion message must not be nil.
+
+Fri Oct 22 13:59:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+	  treat nil case. Please run test-all before commit such change.
+
+Thu Oct 21 23:58:14 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_lazy_sweep): Variable declarations should be at
+	  the head of block.
+
+Thu Oct 21 23:56:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (objspace_each_objects, rb_objspace_each_objects): use
+	  struct.
+
+	* gc.c (objspace_each_objects): fix return with no value.
+
+Thu Oct 21 23:47:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_initialize): remove useless intermediate variable.
+
+Thu Oct 21 16:07:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_f_select): change rdoc.
+	  patched by Eito Katagiri [ruby-core:31805]
+
+Thu Oct 21 15:55:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/httpauth/digestauth.rb
+	  (WEBrick::HTTPAuth::ProxyDigestAuth#check_uri): privated.
+	  [ruby-dev:42344]
+
+Thu Oct 21 15:50:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_f_select): add correct rdoc.
+	  patched by Dave Thomas [ruby-core:32467]
+
+Thu Oct 21 15:42:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/telnet.rb (Net::Telnet#close): added.
+	  patched by Erik Hollensbe [ruby-dev:42260] #3830
+
+Thu Oct 21 13:08:00 2010  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (rb_objspace_each_objects): don't lazy sweep in
+	  rb_objspace_each_objects. [Bug #3940] [ruby-dev:42369]
+
+Thu Oct 21 00:05:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#pipe): get rid of deadlock on pipe.
+	  a patch from Tomoyuki Chikanaga at [ruby-dev:42435].  #3970
+
+	* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
+
+Wed Oct 20 23:54:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dbm/dbm.c: rdoc based on a patch by mathew meta AT
+	  pobox.com, at [ruby-core:32853].
+
+Wed Oct 20 10:47:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* util.c (ruby_strtod): reject 0x1.p+0. [ruby-dev:42432] #3966
+
+Wed Oct 20 10:00:57 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): print floating point on "%#a".
+	  [ruby-dev:42431] Bug#3965
+
+Tue Oct 19 19:30:11 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): clear ALT flag for %a.
+	  [ruby-core:32841] [ruby-core:32848]
+
+Tue Oct 19 12:19:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): fix over-count of field size.
+
+Tue Oct 19 03:08:52 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): use HEXPREFIX flag for prefix of %a.
+	  [ruby-core:32841]
+
+Mon Oct 18 13:18:01 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_class_init): Define
+	  Digest::Class.new(). [Feature #3954]
+
+Mon Oct 18 12:58:40 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (pack_pack): refine the document.  [ruby-dev:42397]
+	  (pack_unpack): ditto.
+
+Mon Oct 18 10:19:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (transport_request): @socket may be nil.
+	  patched by Egbert Eich [ruby-core:32829]
+
+Mon Oct 18 09:57:28 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* sprintf.c (BSD_vfprintf): wrong padding around prefix and
+	  floating point with %a. [ruby-dev:42403] Bug #3956
+
+Sun Oct 17 22:36:33 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/delta.rb: added an rdoc tag.
+
+Sun Oct 17 10:47:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_mod_remove_const): update rdoc.
+	  [ruby-core:31957]
+
+Sun Oct 17 10:40:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_define_{class,module}_id_under): register to be
+	  marked, which probably are defined and used internally.
+
+Sat Oct 16 11:10:55 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_encoding2cp): set codepage 20936
+	  according to GB2312. [Bug #3937] [ruby-core:32758]
+
+Sat Oct 16 10:54:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (CPP): already used in .c.i rule.
+
+	* cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and
+	  --preprocessor options explicitly.  [ruby-core:32776]
+
+Sat Oct 16 10:06:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/sdbm/_sdbm.c (SEEDUPS, BADMESS): make settable using command
+	  line options.
+
+	* ext/sdbm/_sdbm.c (makroom): suppress unused result warning.
+
+	* ext/sdbm/extconf.rb: disable BADMESS, a library should not emit
+	  messages directly.
+
+Sat Oct 16 08:39:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (dln_strerror): get English message first, instead of
+	  system default. see [ruby-dev:42358].
+
+Sat Oct 16 00:08:00 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* hash.c (rb_hash_aref): skip calling "default" method
+	  if it is not needed, for speed-up.
+
+Fri Oct 15 23:36:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (NUM2DEVT, DEVT2NUM, PRI_DEVT_PREFIX): fallback to
+	  unsigned int.
+
+Fri Oct 15 22:54:46 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_hresult2msg): get English message first,
+	  instead of system default. [ruby-core:32765]
+
+Fri Oct 15 22:47:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (VALUE): prefer long over uintptr_t,
+	  FIX2LONG expects VALUE to be long at least.
+
+	* include/ruby/ruby.h (FIX2LONG): parenthesize the argument.
+
+Fri Oct 15 20:30:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (dev_t): use RUBY_REPLACE_TYPE.
+
+	* file.c (rb_stat_inspect): use PRI_DEVT_PREFIX.
+
+Fri Oct 15 17:26:57 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* pack.c (pack_pack): simplify comparison of explicit_endian
+	  as pointed by nobu.
+
+	* pack.c (pack_unpack): ditto.
+
+Fri Oct 15 16:40:37 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* pack.c (pack_pack): fix more than one modifiers appear in the
+	  format string. [ruby-core:32793]
+
+	* pack.c (pack_unpack): ditto.
+
+Thu Oct 14 23:20:42 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_folderitem2_invokeverb.rb: refactoring.
+
+Thu Oct 14 22:18:29 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def, iseq.c, vm_insnhelper.c: rename variable name
+	  (ip -> iseq).
+
+Thu Oct 14 20:41:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* pack.c (pack_pack): support endian modifiers: < and >.
+	  [ruby-dev:42376] Feature #3491
+
+	* pack.c (pack_unpack): ditto.
+
+Thu Oct 14 20:50:51 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (reg_get_val): expand environment in
+	  the pathname. [Bug #3907]
+
+Thu Oct 14 07:35:07 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (DEVT2NUM): added. Size of dev_t is depend on the
+	  environment even if POSIX defines dev_t as unsigned integer.
+	  For example, OpenVMS, 64bit Solaris 9, and NetBSD 6 defines
+	  dev_t as 64bit unsigned integer.
+
+	* file.c (rb_stat_dev): use DEVT2NUM.
+
+	* file.c (rb_stat_dev_major): dev_t is not long. major(3)'s return
+	  value is int.
+
+	* file.c (rb_stat_dev_minor): dev_t is not long. minor(3)'s return
+	  value is int.
+
+	* configure.in: check size of dev_t.
+
+Thu Oct 14 07:22:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_and, rb_ary_or), class.c (rb_mod_init_copy),
+	  gc.c (undefine_final), time.c (time_mload): get rid of
+	  type-punning casts.
+
+Thu Oct 14 04:16:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (ruby_float_step): fix Numeric#step with infinity unit
+	  doesn't works well. [ruby-core:32779]
+
+Wed Oct 13 23:16:46 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/enc-unicode.rb: get rid of lots of warnings.
+
+	* iseq.c (insn_operand_intern, rb_iseq_disasm): fix format specifiers.
+
+	* vm.c (thread_free): ditto.
+
+	* numeric.c (check_uint): get rid of overflow on LLP64 platforms.
+
+	* insns.def (opt_case_dispatch): use st_data_t.
+
+Wed Oct 13 22:32:34 2010  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/util.rb (CGI::unescape): bugfix to unescape the multibyte
+	  string. Thanks nobu and tDiary dev members. [Bug #3909]
+
+Wed Oct 13 21:13:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (int_chr): raise error when the value is negative.
+
+Wed Oct 13 19:24:08 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* vm.c (ruby_vm_destruct): This function type was wrong; correct to the prototype.
+
+Wed Oct 13 14:58:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (rb_num_to_uint): fix 32bit logic.
+
+Wed Oct 13 12:53:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (rb_num_to_uint): added to check the range of arguments.
+	  Mainly for negative value with NUM2UINT on 32bit environment.
+
+	* string.c (rb_str_concat): use rb_num_to_uint.
+
+Wed Oct 13 12:10:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (w32_error): get English message first, instead
+	  of system default. see [ruby-core:32765].
+	  [experimental]
+
+Wed Oct 13 11:04:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* debug.c (ruby_set_debug_option): define always for binary
+	  compatibility with debug env enabled binary.
+
+	* signal.c (ruby_enable_coredump): ditto.
+
+Wed Oct 13 10:52:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (ruby_executable_node): missing prototype.
+
+Wed Oct 13 05:23:04 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* missing/strchr.c: add strlen's prototype.
+
+	* missing/strstr.c: ditto.
+
+Wed Oct 13 00:21:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/rubyext.c (struct mktime_arg): constified.
+
+	* ext/syck/rubyext.c (mktime_do, mktime_r, rb_syck_mktime): fix
+	  function signatures.
+
+Wed Oct 13 00:18:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (MurmurMagic): get rid of literal overflow.
+
+	* configure.in (RUBY_CHECK_PRINTF_PREFIX): check for printf format
+	  specifier if possible.
+
+Tue Oct 12 23:58:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_open_osfhandle, rb_w32_wopen, rb_w32_pipe):
+	  use uintptr_t instead of long for win64.
+
+	* win32/win32.c (socketpair_internal): suppress warnings.
+
+	* win32/win32.c (ftruncate): use HANDLE instead of long for win64.
+
+	* vsnprintf.c (BSD_vfprintf): fix cast.
+
+	* numeric.c (rb_num2fix): result of rb_num2long is SIGNED_VALUE.
+
+	* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
+	  (syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
+	  (run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
+	  (rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
+	  iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
+	  thread.c (rb_thread_local_aref),
+	  variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
+	  (rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
+	  vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
+	  ext/iconv/iconv.c (map_charset): use st_data_t.
+
+	* compile.c (iseq_build_body), insns.def (getglobal, setglobal),
+	  iseq.c (iseq_load, iseq_data_to_ary), util.c (valid_filename):
+	  use VALUE.
+
+	* gc.c (obj_free, rb_objspace_call_finalizer): fix truncating
+	  cast.
+
+	* gc.c (mark_current_machine_context): suppress warnings.
+
+	* compile.c (iseq_compile_each): fix truncating cast.
+
+	* cont.c (fiber_setcontext): missing variable definition.
+
+Tue Oct 12 19:25:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* error.c (exc_to_s): use OBJ_INFECT.
+
+	* error.c (name_err_to_s): ditto.
+
+	* error.c (name_err_mesg_to_str): ditto.
+
+	* error.c (syserr_initialize): ditto.
+
+Tue Oct 12 19:07:55 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* error.c (syserr_initialize): taint message if mesg is given
+	  and it is tainted.
+
+Tue Oct 12 18:25:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_ungetc): always see Bignum. On 32bit valid value
+	  may be a Bignum. On 64bit for errors. [ruby-dev:42366]
+
+Tue Oct 12 18:25:04 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_concat): use unsigned int for GB18030.
+
+Tue Oct 12 17:53:49 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric (check_uint): the mask must refer to VALUE.
+
+Tue Oct 12 17:47:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric (check_uint): set MSB for negative value.
+
+	* numeric (rb_num2uint): return value's type of rb_num2ulong
+	  is VALUE.
+
+	* numeric (int_chr): variable i can't be negative.
+
+Tue Oct 12 16:04:37 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_strerror): get English message first, instead
+	  of system default. see [ruby-dev:42358].
+	  [experimental]
+
+Tue Oct 12 15:52:35 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_strerror): unmap some range of errno for
+	  workaround of VC10's strerror() and sys_nerr problem.
+	  based on a patch from Akio Tajima, [ruby-dev:42355].
+
+Tue Oct 12 15:36:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_ungetc): use unsigned int for GB18030.
+
+Tue Oct 12 15:14:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_putc): support multibyte characters.
+	  [ruby-core:30697]
+
+Tue Oct 12 15:10:31 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (rb_enc_uint_chr): split from int_chr.
+
+	* numeric.c (int_chr): use rb_enc_uint_chr.
+
+	* include/ruby/encoding.h (rb_enc_uint_chr): added.
+
+Tue Oct 12 14:04:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (int_chr): a codepoint of Ruby M17N must be 32bit
+	  unsigned int; GB18030 uses MSB. Also note that OnigCodePoint
+	  is defined as unsigned int.
+
+Tue Oct 12 12:20:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vm_dump.c (dump_thread): foolish mistake.
+
+Tue Oct 12 10:39:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_MINGW32): canonicalize only on mingw.
+
+Mon Oct 11 20:20:23 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (HTTP.get): specify ASCII-8BIT as the result
+	  encoding of Zlib::GzipReader.
+	  http://hibari.2ch.net/test/read.cgi/tech/1281473294/271
+
+Mon Oct 11 17:42:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* error.c (syserr_initialize): use mesg's encoding when locale
+	  encoding is US-ASCII. If locale encoding is not US-ASCII,
+	  assume err has non ASCII characters. [ruby-dev:42358]
+
+Mon Oct 11 14:03:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* error.c (syserr_initialize): set the encoding of Errno::*#message
+	  as locale. [ruby-dev:42358]
+
+Mon Oct 11 06:38:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_set_encoding):
+	  StringIO#set_encoding can get 2nd argument and optional hash
+	  for API compatibility to IO. [ruby-dev:42356]
+
+Mon Oct 11 06:11:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_set_encoding): use rb_funcall2 when the io is not
+	  a T_FILE. [ruby-dev:42356]
+
+Sun Oct 10 18:42:23 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#replace): Apply a bit of optimization.
+
+Sun Oct 10 10:20:07 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_MINGW32): canonicalize as like mswin version.
+
+Sun Oct 10 05:33:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_signal_buff_size, rb_signal_exec): moved
+	  declarations from thread.c.
+
+Sat Oct  9 16:54:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RSHIFT): quote to get rid of argument expansion
+	  for autoconf 2.68.
+
+Sat Oct  9 11:00:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_reset_event_flags, exec_event_hooks): ignore
+	  hooks marked as removed.
+
+	* thread.c (thread_exec_event_hooks): remove hooks to be removed.
+
+	* thread.c (rb_threadptr_remove_event_hook, rb_remove_event_hook):
+	  defer removing hooks if running the hooks.  [ruby-dev:42350]
+
+Sat Oct  9 10:51:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_threadptr_exec_event_hooks): suppress each event
+	  hooks separately.
+
+	* thread.c (thread_suppress_tracing): split from
+	  ruby_suppress_tracing, accepting thread pointer and event mask.
+
+Sat Oct  9 08:16:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_threadptr_remove_event_hook): fix typo.
+
+Fri Oct  8 10:52:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (RBCONFIG): depends on version.h due to
+	  RUBY_PATCHLEVEL.  [ruby-core:32709]
+
+Fri Oct  8 00:24:54 2010  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv.rb: Fixing documentation typos.  [ruby-core:32712]
+
+Thu Oct  7 09:14:28 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_exec.c (vm_exec_core):  Treat clang as non gcc on this
+	  context: It has __asm__ but doesn't works well.
+
+Wed Oct  6 12:28:22 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/uri/generic.rb (URI::Generic#hostname): new method.
+	  (URI::Generic#hostname=): ditto.
+
+	* lib/open-uri.rb: use URI#hostname
+
+	* lib/net/http.rb: ditto.
+
+	  reported by Adam Majer.  [ruby-core:32056]
+
+Wed Oct  6 11:52:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (fptr_finalize): write_mutex might have been destroyed
+	  already in finalization phase, as the order of finalizers is not
+	  guaranteed.  rb_mutex_t should be used in place of Mutex object
+	  in the future.
+
+Tue Oct  5 22:17:02 2010  wanabe  <s.wanabe@gmail.com>
+
+	* win32/mkexports.rb: revert r29320 and r29402.
+
+Mon Oct  4 12:43:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (regexp): dregexp has literal string only at the head
+	  and successors are array.  [ruby-core:32682]
+
+Mon Oct  4 10:22:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* random.c (rand_init): This checks the value is in 32bit or not,
+	  so use int32_t, not int.
+
+Mon Oct  4 09:47:39 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* random.c (rand_init): remove useless assignment.
+
+	* re.c (update_char_offset): remove unused variable.
+
+	* re.c (read_escaped_byte): ditto.
+
+Mon Oct  4 09:30:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/bn.rb (Integer#to_bn): OpenSSL::BN.new
+	  accepts only Strings, so call Integer#to_s(16).
+	  16 is for an optimization. [ruby-dev:42336]
+
+Mon Oct  4 07:57:51 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* cont.c (fiber_memsize): Return size.
+	  Before this change, fiber_memsize always returns 0.
+
+Mon Oct  4 07:16:55 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/unicode.c (onigenc_unicode_property_name_to_ctype):
+	  remove useless assignment.
+
+	* vm.c (vm_make_proc_from_block): ditto.
+
+	* variable.c (rb_ivar_count): ditto.
+
+Mon Oct  4 06:40:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Makefile.in (clean-rdoc): Don't use \ in variable expansion.
+	  BSD make treats it as an escape character.
+
+Mon Oct  4 00:01:53 2010  wanabe  <s.wanabe@gmail.com>
+
+	* tool/config.sub: revert r29320, r29324, r29347, r29354, r29365
+	  to automake-1.11.1. [ruby-core:32634]
+
+	* win32/mkexports.rb: no longer use 'mingw64'. a patch from Luis Lavena
+	  at [ruby-core:32678].
+
+Sun Oct  3 20:36:37 2010  Akio Tajima (arton)  <artonx@yahoo.co.jp>
+
+	* test/win32ole/test_folderitem2_invokeverb.rb: Change creating
+	  shortcut verb to 'Link' [Bug #3339]
+
+Sun Oct  3 19:44:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (Makefile): get rid of duplicated ruby target when
+	  already there it was.
+
+Sat Oct  2 22:59:32 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_thread.rb: add for win32ole with Thread.
+
+Fri Oct  1 17:03:00 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/webrick/test_httpproxy.rb (TestWEBrickHTTPProxy::test_upstream_proxy):
+	  My machine fails this test at this line, saying 503 service unavailable.
+
+Thu Sep 30 16:11:08 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_getenv): should return NULL if specified name
+	  is empty. a patch from Heesob Park at [ruby-core:32650]
+
+Thu Sep 30 15:18:23 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (command_asgn): allow command_call to be right hand side
+	  expression of chained assignment.  [ruby-dev:42313]
+
+Thu Sep 30 10:55:38 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* hash.c (ruby_setenv): workaround for old Windows. a patch from
+	  Heesob Park. [ruby-core:32353]
+
+Thu Sep 30 09:29:06 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI.encode_www_form): change treatment of
+	  undefined value in given array as latest internet draft for
+	  application/www-form-urlencoded.
+	  http://tools.ietf.org/html/draft-hoehrmann-urlencoded-01
+
+Thu Sep 30 09:34:03 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vm_dump.c (dump_thread): fixed wrong type of return value of
+	  SymGetModuleBase64(). [ruby-dev:42306]
+
+Wed Sep 29 21:04:05 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions::test_script_from_stdin):
+	  As usual, PTY is not always available.
+
+Wed Sep 29 18:38:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/config.sub (x64): regularize only for pc vendor, and strip
+	  useless 64 suffix.
+
+Wed Sep 29 17:53:02 2010  Kenta Murata <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BIGDECIMAL_ENABLE_VPRINT):
+	  VPrint is usually disabled.  It's only used in debugging.
+
+Wed Sep 29 17:41:34 2010  Kenta Murata <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_save_limit):
+	  return the result of a block.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_save_limit):
+	  add a test for the above change.
+
+Wed Sep 29 16:18:03 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vm_dump.c (dump_thread): remove unused optional arguments.
+
+Wed Sep 29 13:26:30 2010  Kenta Murata <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_save_rounding_mode):
+	  return the result of a block.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_save_rounding_mode):
+	  add a test for the above change.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_save_exception_mode):
+	  add a test for the return value of BigDecimal.save_exception_mode.
+
+Wed Sep 29 12:45:30 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_div2, BigDecimal_add2,
+	  BigDecimal_sub2, BigDecimal_mult2, VpLimitRound): remove meaningless
+	  casts to get rid of compiler warnings.
+
+Wed Sep 29 12:35:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (VPrint, VpToString): fix format.
+
+Wed Sep 29 12:31:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/known_classes.rb (RDoc::KNOWN_CLASSES): add Encoding.
+
+Tue Sep 28 20:50:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/config.sub (x64): regularize same as mswin.
+
+Tue Sep 28 20:06:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vm_dump.c (rb_vm_bugreport): add windows support.
+	  based on patches from Peter Weldon at [ruby-core:32551]
+
+Mon Sep 27 23:30:34 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (opt_case_dispatch), vm_insnhelper.c:
+	  execute the procedures of "when" clauses by bytecode
+	  instead of st_foreach() when the object does not hit
+	  prepared hash.  [ruby-dev:42304]
+
+Mon Sep 27 15:54:03 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/net/http/test_https.rb: As always, localhost is not
+	  guaranteed to be resolved as 127.0.0.1.  But a SSL
+	  certificate needs a socket to listen on a specific address
+	  where a CN resolves to.  On situations where localhost is
+	  not 127.0.0.1, these tests are not possible.
+
+Mon Sep 27 15:25:05 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/net/imap/test_imap.rb: resurrection of r29259.
+	  this change depends on minitest 1.7.1.
+
+	* lib/test/unit/assertions.rb: ditto.
+
+Sun Sep 26 22:59:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/config.sub (x86_64-pc-mingw64): regularize.
+
+Sun Sep 26 22:21:07 2010  wanabe  <s.wanabe@gmail.com>
+
+	* ext/openssl/ossl_hmac.c (ossl_hmac_hexdigest, ossl_hmac_s_hexdigest),
+	  ext/openssl/ossl_pkey_ec.c (ossl_ec_group_set_seed),
+	  ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der),
+	  ext/openssl/ossl_pkcs7.c (numberof): suppress warnings.
+	  [ruby-core:31932]
+
+Sun Sep 26 10:25:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/config.{guess,sub}: updated to automake-1.11.1.
+
+Sat Sep 25 22:48:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBRUBY_DLDFLAGS): fix quoting.
+
+Sat Sep 25 10:30:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBRUBY_DLDFLAGS): use -unexported_symbol only
+	  when available.  http://trac.macports.org/ticket/26341
+
+Sat Sep 25 10:05:49 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: Always add -mieee for Renesas SH4.
+	  Thanks, Nobuhiro Iwamatsu. [Feature #3874] [ruby-core:32548]
+
+Sat Sep 25 01:34:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (install-cross): target to install cross-compiling
+	  stuff.
+
+Fri Sep 24 23:44:59 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (sym_call), vm.c (invoke_block_from_c),
+	  vm_insnhelper.c (vm_yield_with_cfunc): pass given block.
+	  [ruby-core:32075]
+
+	* vm_eval.c (rb_funcall_passing_block): new function to call
+	  method with passing given block.
+
+Fri Sep 24 15:50:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_to_i): fix rdoc: String#to_i raises an
+	  exception when base is invalid. [ruby-core:31685]
+
+Fri Sep 24 15:28:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_rindex): use rb_enc_prev_char instead of repeated
+	  str_nth.
+	  patched by Michael Selig [ruby-core:32498]
+
+Fri Sep 24 14:19:12 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/test_pty.rb: Same as 229281; existence of PTY class do not
+	  guarantee a successful pty operation.
+
+Fri Sep 24 06:25:55 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 1.7.2 r5879.
+	* test/minitest/*.rb: ditto.
+
+Thu Sep 23 23:09:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_get_cref0): cref is stacked only in normal
+	  iseqs, so check if it is the case first.
+
+Thu Sep 23 23:08:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/config.sub: mingw64 should use x86_64.  [ruby-core:32514]
+
+Thu Sep 23 21:40:40 2010  wanabe  <s.wanabe@gmail.com>
+
+	* ext/socket/raddrinfo.c (init_addrinfo, inspect_sockaddr): suppress
+	  warnings.  see [ruby-core:31932].
+
+Thu Sep 23 19:27:57 2010  wanabe  <s.wanabe@gmail.com>
+
+	* thread_win32.c (w32_wait_events, w32_close_handle): suppress warnings.
+	  see [ruby-core:31932].
+
+Thu Sep 23 18:54:39 2010  wanabe  <s.wanabe@gmail.com>
+
+	* tool/config.sub: add mingw64.
+
+	* win32/mkexports.rb (Exports::Mingw64): added.
+
+	* win32/mkexports.rb (Exports::Mingw32): renamed from Exports::Mingw.
+
+Thu Sep 23 09:01:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_cref_push): no outer cref is needed for proc
+	  from method.  Bug #3786, Bug #3860, [ruby-core:32501]
+
+Wed Sep 22 17:12:01 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/openssl/utils.rb (OpenSSL#silent): always restore $VERBOSE.
+	  [ruby-dev:42285]
+
+Wed Sep 22 16:59:40 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/test_prime.rb (TestPrime#test_new): the warning expected have
+	  not been displayed when $VERBOSE == nil. Patch by Shota Fukumori
+	  a.k.a. sora_h. [ruby-dev:42272]
+	  Recovers $stderr even if StringIO.new fails. Reported by unak.
+
+Wed Sep 22 01:55:48 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_method.rb: fix last commit.
+
+Wed Sep 22 01:49:52 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_method.rb: add a test for [ruby-core:30534].
+
+Wed Sep 22 00:52:44 2010  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/rdoc/ri/store.rb (save_cache): remove duplicate entries.
+
+Wed Sep 22 00:00:05 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_f_pathname): Pathname() translated
+	  from pathname.rb.
+
+Tue Sep 21 22:18:30 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/mkconfig.rb: fixed build problem on mswin64 introduced in r29278.
+
+Tue Sep 21 02:42:35 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/pathname/test_pathname.rb (TestPathname#test_mkdir): fix typo.
+
+Mon Sep 20 23:23:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (bracket): get rid of scanning at the end of the pattern
+	  string, not to raise an exception while globbing command line.
+	  [ruby-core:32478]
+
+Mon Sep 20 11:25:49 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (Init_pathname): Pathname#=~ undefinition
+	  translated from pathname.rb.
+
+Mon Sep 20 02:34:11 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (check_rounding_mode, BigDecimal_mode):
+	  raise ArgumentError instead of TypeError passing invalid modes.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_mode, test_round):
+	  change against the above modifications.
+
+Sun Sep 19 22:08:39 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/mkmf.rb (try_link): rdoc
+	  (try_compile): ditto
+	  (try_cpp): ditto
+	  (try_func): ditto
+	  (try_var): ditto
+	  (try_run): ditto
+	  (egrep_cpp): ditto
+
+Sun Sep 19 20:43:33 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* configure.in (--disable-install-doc): disables capi too, in addition
+	  to rdoc.
+	  (--disable-install-rdoc): a new option for disabling only rdoc.
+	  (--disable-install-capi): a new option for disabling only capi.
+
+Sun Sep 19 20:37:45 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (clean): removes all documents on cleaning.o
+	  (CAPIOUT): new variable.
+	  (clean-capi, distclean-capi, realclean-capi): new targets
+
+	* Makefile.in (clean-capi, distclean-capi, realclean-capi): ditto.
+
+	* win32/Makefile.sub (clean-capi, distclean-capi, realclean-capi):
+	  ditto.
+
+Sun Sep 19 13:44:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBRUBY_SO): fix an oversight of replace
+	  RUBY_INSTALL_NAME with RUBY_SO_NAME.  a patch from Jeremy Evans
+	  at [ruby-core:32474].
+
+Sun Sep 19 07:48:20 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_unlink): Pathname#unlink and
+	  Pathname#delete translated from pathname.rb.
+
+Sun Sep 19 06:06:07 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (check_rounding_mode): added for
+	  converting symbol to rounding mode number.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_mode, BigDecimal_round):
+	  support to specify rounding mode by symbol.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_mode, test_round):
+	  add tests for above changes.
+
+Sun Sep 19 05:14:35 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c: fix rounding algorithms for half-down
+	  and half-even.  This change is based on the patch created by Matthew
+	  Willson, the reporter of this bug.  [Bug #3803] [ruby-core:32136]
+
+	* test/bigdecimal/test_bigdecimal.rb: add tests for above changes.
+
+Sat Sep 18 20:09:51 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_each_entry): Pathname#each_entry
+	  translated from pathname.rb.
+
+Fri Sep 17 23:44:07 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/xpath_parser.rb, test/rexml/test_xpath.rb:
+	  add missing method availability check. [ruby-core:32447]
+	  Reported by Wiebe Cazemier. Thanks!!!
+
+Fri Sep 17 23:23:26 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_sax.rb: don't use thread and sleep to avoid slow test.
+
+Fri Sep 17 23:10:44 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_core.rb: enable.
+
+Fri Sep 17 22:46:02 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/: untabify.
+
+Fri Sep 17 22:29:56 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/: fix fixture data path. All REXML tests are worked.
+
+Fri Sep 17 22:15:15 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_listener.rb: remove needless codes.
+
+Fri Sep 17 22:12:23 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/: import REXML tests from
+	  http://www.germane-software.com/repos/rexml/trunk/test/.
+	  Many tests are failed temporary. I'll fix them quickly. Sorry.
+
+Fri Sep 17 16:48:49 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/io/console/test_io_console.rb (TestIO_Console::helper):
+	  PTY.open is not guaranteed to work.  On my machine opening a
+	  pty is prohibited via process control group.  On those cases
+	  exceptions shall occur, and that doesn't mean our fault.
+	  Skip those tests on such situations.
+
+Fri Sep 17 08:30:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tracer.rb: count only non-internal libraries in stack trace,
+	  ignoring custom_require.  [ruby-core:31858]
+
+Fri Sep 17 02:18:41 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* tool/mkconfig.rb: Fix build with m4 1.4.15 generating duplicate
+	  lines in config.status.  According to nobu, the mswin32 port may
+	  depend on the piece of code in question, so the behavior is left
+	  unchanged on mswin32.
+
+Thu Sep 16 23:47:59 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_opendir): Pathname#opendir translated
+	  from pathname.rb.
+
+Thu Sep 16 21:40:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::GlobOption): merged RejectOption.
+
+	* test/runner.rb: utilize GlobOption.
+
+Thu Sep 16 21:31:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/ri/driver.rb (RDoc::RI::Driver.setup_options)
+	  (RDoc::RI::Driver.fixup_options): split from process_args.
+	  libraries should not parse ARGV inside, since it's a task of
+	  applications, not libraries.
+
+Thu Sep 16 21:02:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/ri/paths.rb (RDoc::RI::Paths.each): HOMEDIR can be nil
+	  if $HOME is unset.
+
+Thu Sep 16 14:50:42 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/ruby/test_file_exhaustive.rb (TestFileExhaustive::test_expand_path):
+	  ENV["HOME"] might not be set.  On those cases without it an
+	  exception raises here, which effectively disables later
+	  tests on this method.
+
+Thu Sep 16 08:30:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): fix rdoc.  pointed out by Tomoyuki
+	  Chikanaga at [ruby-core:32395], and a patch from Daniel
+	  Bovensiepen at [ruby-core:32403].
+
+Thu Sep 16 08:27:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.
+	  [ruby-core:32394]
+
+Thu Sep 16 06:07:24 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_rmdir): Pathname#rmdir translated
+	  from pathname.rb.
+
+Thu Sep 16 00:36:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/extconf.rb: Remove Readline 6 check because
+	  Ruby's license is now GPLv3 compatible. [ruby-core:28736]
+
+Thu Sep 16 00:26:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* COPYING: change Ruby's License from a dual license with GPLv2
+	  to a dual license with 2-clause BSDL.
+	  [ruby-dev:42166] [ruby-core:31971]
+	  [ruby-dev:39167] [ruby-core:25272]
+
+	* COPYING.ja: ditto.
+
+	* BSDL: added. this is from The FreeBSD License.
+
+Wed Sep 15 21:07:06 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_mkdir): Pathname#mkdir translated
+	  from pathname.rb.
+
+Wed Sep 15 13:37:00 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/net/imap/test_imap.rb: "localhost" not guaranteed to
+	  resolve to "127.0.0.1".  On my machine it is "::1" instead.
+	  The problem is, you have to connect to the imaps server via
+	  the canonical name written in a server certificate, and that
+	  of the server.cert is "localhost".  So you have to listen to
+	  the address of what "localhost" resolves to.  I think this
+	  situation cannot be resolved in a handy manner because the
+	  test "test_imaps_post_connection_check" is actually
+	  expecting to connect to a server via an address other than
+	  the CN.  On my machine several assertions won't pass because
+	  the test cannot connect to the server.
+
+Wed Sep 15 09:12:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_puts): fix for wide char encoding strings.
+	  [ruby-dev:42212]
+
+Wed Sep 15 07:27:52 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_format_m): mentioned about Hash argument.  a patch
+	  from Daniel Bovensiepen at [ruby-core:32386].
+
+	* sprintf.c (get_hash): ditto, and fix typo.
+
+Wed Sep 15 07:22:20 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_entries): Pathname#entries translated
+	  from pathname.rb.
+
+Wed Sep 15 02:13:44 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/closure.c : Don't use FFI closure alloc on OpenBSD.
+	  Thanks Jeremy Evans! [ruby-core:32384]
+
+Tue Sep 14 20:17:48 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_s_getwd): Pathname.getwd and
+	  Pathname.pwd translated from pathname.rb.
+
+Tue Sep 14 05:13:04 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_s_glob): Pathname.glob translated
+	  from pathname.rb.
+
+Tue Sep 14 01:24:51 2010  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (ruby_getaddrinfo__aix): suppress a
+	  warning.
+
+Mon Sep 13 20:48:30 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_zero_p): Pathname#zero? translated
+	  from pathname.rb.
+
+Mon Sep 13 19:56:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/rubysocket.h (__DARWIN_ALIGNBYTES): workaround of a
+	  bug in system header of darwin 9.  [ruby-core:32341]
+
+Mon Sep 13 18:11:55 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_do): fix typo.  a patch from Peter Weldon
+	  at [ruby-core:32327].
+
+Mon Sep 13 10:12:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* util.c (ruby_strtod): reject Float('0x0.').
+	  [ruby-dev:42239] Bug #3820
+
+Mon Sep 13 09:23:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_bn.c (ossl_bn_is_prime): fix comparison
+	  with rb_scan_args. Before this fix, OpenSSL::BN#prime?
+	  is fully broken. [ruby-dev:42225]
+
+Mon Sep 13 06:45:24 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_writable_real_p):
+	  Pathname#writable_real? translated from pathname.rb.
+
+Sun Sep 12 21:21:50 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: [ruby-core:32096]  Thanks Colin Bartlett.
+
+Sun Sep 12 19:30:27 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_world_writable_p):
+	  Pathname#world_writable? translated from pathname.rb.
+
+Sun Sep 12 09:16:06 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_writable_p): Pathname#writable?
+	  translated from pathname.rb.
+
+Sun Sep 12 08:36:15 2010  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rlimit_resource_name2int): support more limits:
+	  RLIMIT_MSGQUEUE, RLIMIT_NICE, RLIMIT_RTPRIO, RLIMIT_RTTIME and
+	  RLIMIT_SIGPENDING.
+	  (Init_process): ditto.
+	  patch by Run Paint Run Run.  [ruby-core:32262]
+
+Sun Sep 12 04:27:13 2010  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rlimit_resource_name2int): use STRCASECMP to avoid
+	  ALLOCA_N.
+
+Sat Sep 11 16:47:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (ruby_setenv): raise if putenv and SetEnvironmentVariable
+	  failed, because of the restriction of the size on Windows.
+	  based on a patch from Peter Weldon at [ruby-core:32304].  fix:
+	  Bug#3812, [ruby-core:32250]
+
+Sat Sep 11 15:19:57 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick/httpauth/digestauth.rb (WEBrick::Config::DigestAuth):
+	  Add documentation
+
+	* lib/webrick/config.rb (WEBrick::Config::DigestAuth): Add
+	  documentation
+
+Sat Sep 11 12:32:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_set_kcode, rb_get_kcode): removed
+	  zombie prototype declarations.  a patch from Eric Hodel
+	  at [ruby-core:32305].
+
+Sat Sep 11 06:53:12 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_symlink_p): Pathname#symlink?
+	  translated from pathname.rb.
+
+Fri Sep 10 23:03:43 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_sticky_p): Pathname#sticky? translated
+	  from pathname.rb.
+
+Fri Sep 10 19:11:13 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#continue): add
+	  method for generating HTTP/1.1 100 continue response if the client
+	  expects it, otherwise does nothing.  Patch by Brian Candler.
+	  ref #855.
+
+	* test/webrick/test_httprequest.rb: test added.
+
+Fri Sep 10 17:49:34 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/x509-internal.rb: removed unused local
+	  variable.
+
+	* test/openssl/*: less warnings while test running with -w.
+
+Fri Sep 10 16:49:20 2010  Akinori MUSHA  <knu@iDaemons.org>
+
+	* class.c (rb_scan_args): Add support for optional keyword
+	  argument hash. [ruby-dev:42221] [ruby-dev:38048]
+
+	* README.EXT, README.EXT.ja: Update documentation accordingly.
+
+	* dir.c (dir_initialize): Make use of the new rb_scan_args()
+	  feature.
+
+	* io.c (rb_io_s_popen, rb_scan_open_args, rb_io_initialize)
+	  (rb_io_s_pipe, open_key_args, io_s_foreach, io_s_readlines)
+	  (rb_io_s_read, rb_io_set_encoding): Ditto.
+
+	* transcode.c (str_transcode, econv_args)
+	  (econv_primitive_convert): Ditto.
+
+	* ext/zlib/zlib.c (rb_gzreader_initialize): Ditto.
+
+Fri Sep 10 10:33:18 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* random.c (rb_genrand_ulong_limited): renamed from
+	  rb_rand_internal and now this is public API.
+
+	* include/ruby/ruby.h (rb_genrand_ulong_limited): added.
+
+	* bignum.c (big_sparse_p): use rb_genrand_ulong_limited.
+
+Fri Sep 10 13:07:22 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* ext/digest/lib/digest.rb: removed unused exception variable
+	  assignment to avoid a warning.
+
+Fri Sep 10 07:29:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_systmpdir): assume system default tmpdir
+	  safe.  [ruby-dev:42089]
+
+Fri Sep 10 07:03:23 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_size_p): Pathname#size? translated from
+	  pathname.rb.
+
+Fri Sep 10 02:15:29 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_peercred): support OpenBSD-current.
+	  patch by Jeremy Evans.  [ruby-core:32240]
+
+Thu Sep  9 23:25:53 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_backtrace_each): skip allocator frames which have no
+	  name.  [ruby-core:32231]
+
+Thu Sep  9 22:39:08 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_size): Pathname#size translated from
+	  pathname.rb.
+
+Thu Sep  9 22:34:48 2010  wanabe  <s.wanabe@gmail.com>
+
+	* compile.c (case_when_optimizable_literal): When float value can be
+	  treated as integer, add to table hash of case that way.
+	  based on a patch from Ikuo KOBORI. [ruby-dev:42038]
+
+	* insns.def (opt_case_dispatch): ditto.
+
+	* test/ruby/test_case.rb: add tests.
+
+Thu Sep  9 17:15:15 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/net/http/test_https.rb (test_identity_verify_failure): follows
+	  the SSL hostname check error message of openssl.
+
+Thu Sep  9 10:44:46 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_env.rb (test_aset): OpenBSD acts like NetBSD in
+	  that it ignores characters after = in ENV.
+	  patched by Jeremy Evans [ruby-core:32184]
+
+Thu Sep  9 09:02:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/rbinstall.rb (install?): gemspec filename should include
+	  its version. patched by Luis Lavena [ruby-core:32165]
+
+Wed Sep  8 22:46:31 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was
+	  blocked on Windows while blocking call for SSLSocket.  Need to
+	  convert errno for letting rb_io_wait_readable detect EWOULDBLOCK.
+	  Patch by arton. ref #3794.
+
+Wed Sep  8 20:56:57 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_setgid_p): Pathname#setgid? translated
+	  from pathname.rb.
+
+Wed Sep  8 06:25:41 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_setuid_p): Pathname#setuid? translated
+	  from pathname.rb.
+
+Tue Sep  7 21:03:35 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_readable_real_p):
+	  Pathname#readable_real?  translated from pathname.rb.
+
+Mon Sep  6 23:07:25 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_world_readable_p):
+	  Pathname#world_readable?  translated from pathname.rb.
+
+Mon Sep  6 11:03:13 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* Fixed wrong check of missing functions. Patch by Adrian Quark.
+	  ref #3400
+	  The patch contains following comment:
+	    This patch should avoid unnecessary incompatibility with future
+	    versions of Openssl.  Changes suggested by bmaher_at_amazon.com.
+
+Mon Sep  6 10:46:55 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* Fixed exception message for SSL post connection check failure. Patch
+	  by Paul Betteridge. ref [Bug #3704]
+
+Mon Sep  6 10:31:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_s_get_line_buffer):
+	  Readline.line_buffer should return locale string.
+	  [ruby-dev:42184] #3791
+
+Mon Sep  6 09:47:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* util.c (ruby_strtod): check there is at least 1 digit after
+	  "0x" before ".". [ruby-dev:42183] #3790
+
+Mon Sep  6 09:44:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* util.c (ruby_strtod): check integer overflow.
+	  [ruby-dev:42180] #3789
+
+Mon Sep  6 06:17:21 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_readable_p): Pathname#readable?
+	  translated from pathname.rb.
+
+Sun Sep  5 23:02:34 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_owned_p): Pathname#owned?
+	  translated from pathname.rb.
+
+Sat Sep  4 23:48:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_readlink): symlink target should be in
+	  filesystem encoding.
+
+Sat Sep  4 10:40:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (ruby_init_ext): export for golfers.
+
+	* vm_core.h (rb_iseq_eval, rb_iseq_compile_with_option): ditto.
+
+Sun May 23 17:29:41 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (capi): uses a timestamp file to get rid of
+	  generating twice.
+
+Fri Jun 18 01:33:21 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* enc/Makefile.in (realclean): has been missing. necessary
+	  for make realclean-enc.
+
+Fri Sep  3 23:51:26 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_socket_p): Pathname#socket?
+	  translated from pathname.rb.
+
+Fri Sep  3 06:40:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/pty/pty.c (chfunc): pass through exceptions.
+
+	* io.c (rb_io_bufwrite, rb_io_bufread): added.
+
+	* process.c (rb_fork_err): protect from exceptions.
+
+Fri Sep  3 06:16:07 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_pipe_p): Pathname#pipe?
+	  translated from pathname.rb.
+
+Fri Sep  3 06:14:40 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/pty/pty.c (chfunc): restore errno from SystemCallError and
+	  propagate proper exception to the parent.  [ruby-dev:41965]
+
+Thu Sep  2 22:10:38 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_file_p): Pathname#file?
+	  translated from pathname.rb.
+
+Thu Sep  2 09:12:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): don't forget to free
+	  memory.
+
+Thu Sep  2 09:01:13 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): unicodize.
+
+	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): convert arguments of
+	  CreateChild() from ACP to WideChar.
+
+Thu Sep  2 06:53:43 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_directory_p): Pathname#directory?
+	  translated from pathname.rb.
+
+Wed Sep  1 22:03:41 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_grpowned_p): Pathname#grpowned?
+	  translated from pathname.rb.
+
+Wed Sep  1 17:39:02 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*.rb: Imported minitest 1.7.1 r5835.
+	* test/minitest/*.rb: ditto.
+
+Wed Sep  1 16:50:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (tr_setup_table): optimized. don't create hash objects
+	  when given pattern is ASCII only.
+
+	* string.c (tr_find): ditto.
+
+Wed Sep  1 14:35:29 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (rb_ary_rotate_m): fix typo of rdoc.
+	  patched by Andrei Kulakov [ruby-core:31975]
+
+Wed Sep  1 14:33:36 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enum.c (enum_zip): fix typo of rdoc.
+	  patched by Andrei Kulakov [ruby-core:31974]
+
+Wed Sep  1 12:56:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (ruby_suppress_tracing): restore the state and invoke
+	  the func with normal state.  a patch from Satoshi Shiba <shiba
+	  AT rvm.jp> at [ruby-dev:42162].  [ruby-core:31783]
+
+Tue Aug 31 21:10:23 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_exist_p): Pathname#exist? translated
+	  from pathname.rb.
+
+Tue Aug 31 17:32:34 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk with enabling
+	  stubs". Thanks, Akio Tajima [ruby-dev:42159].
+
+Tue Aug 31 03:42:14 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (tr_setup_table): fix bug in r29146.
+	  Initialize table even if cflag is 0; tr_find see whether
+	  del is empty or not.
+
+	* string.c (tr_find): nodel can't be NULL; if NULL, it means
+	  it is not specified.
+
+Mon Aug 30 21:29:21 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_executable_real_p):
+	  Pathname#executable_real? translated from pathname.rb.
+
+Mon Aug 30 15:00:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (tr_setup_table): initialize negating table when
+	  negating string is given. [ruby-core:31851]
+
+	* string.c (tr_find): add a sentence for the time when
+	  target characters include negating one.
+
+	* string.c (rb_str_count): move definition.
+
+Mon Aug 30 07:32:41 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_executable_p): Pathname#executable?
+	  translated from pathname.rb.
+
+Sun Aug 29 23:54:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parser/ruby.rb (RDoc#parse_call_parameters): don't
+	  include assignment.  [Bug #3759], [ruby-dev:42154]
+
+	* lib/rdoc/parser/ruby.rb (RDoc#parse_class): ignore non-constant
+	  name singleton class.  [Bug #3759], [ruby-dev:42154]
+
+Sun Aug 29 23:25:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_get_path_check): clarify error message for
+	  ASCII-incompatible path name.
+
+Sun Aug 29 16:02:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (node_name.inc): remove command option -n and give
+	  file as stdin, because IronRuby 1.1 still doesn't support it.
+	  So now we can use ir.exe as BASERUBY.
+
+	* tool/node_name.rb: read stdin with while gets.
+
+Sun Aug 29 13:22:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_thread_method_id_and_class): curried proc has no
+	  method.  [ruby-core:31871]
+
+Sun Aug 29 12:51:33 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_provide_feature): clarify error message for frozen
+	  $LOADED_FEATURES.  based on a patch from Run Paint Run Run at
+	  [ruby-core:31913].
+
+Sun Aug 29 12:19:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (load_failed): should honor encoding.  [ruby-core:31915]
+
+Sun Aug 29 09:35:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (clean): exclude *.inc. [ruby-dev:41931]
+
+	* common.mk (distclean): include *.inc.
+
+	* common.mk (help): change description about clean and distclean.
+
+Sat Aug 29 06:34:52 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_chardev_p): Pathname#chardev?
+	  translated from pathname.rb.
+
+Sat Aug 28 17:39:33 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_save_exception_mode,
+	  BigDecimal_save_rounding_mode, BigDecimal_save_limit): added.
+
+	* test/bigdecimal/test_bigdecimal.rb: added tests for the above
+	  features.
+
+Sat Aug 28 08:11:05 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_blockdev_p): Pathname#blockdev?
+	  translated from pathname.rb.
+
+Fri Aug 27 16:20:01 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* string.c (rb_str_prepend): new method by Shota Fukumori (sora_h)
+	  [Feature #3765]
+
+Fri Aug 27 15:24:20 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* math.c (math_atan2): you should know that M_PI is not the feature
+	  of C90.
+	  fixed build failure caused by r29115.
+
+Fri Aug 27 15:26:33 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (null_device): move from io.c.
+
+Fri Aug 27 12:47:44 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* math.c (math_atan2): change the behavior when x and y are zero.
+	  [ruby-dev:42090] [Bug #3736] [ruby-dev:42116]
+
+	* test/ruby/test_math.rb (test_atan2): add tests for the above
+	  changes.
+
+Fri Aug 27 12:26:23 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* object.c (rb_obj_class): remove mention of obsolete method.
+	  a patch from Run Paint Run Run at [ruby-core:31842].
+
+Fri Aug 27 12:25:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (null_device): the name of null device.  [ruby-dev:41791]
+
+Fri Aug 27 07:57:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_shuffle_bang): bail out from modification during
+	  shuffle.
+
+	* array.c (rb_ary_sample): ditto.
+
+Fri Aug 27 05:11:51 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_sysopen): Pathname#sysopen translated
+	  from pathname.rb.
+
+Thu Aug 26 22:53:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_shuffle): rdoc fix.  argument name was missing.
+	  a patch from Run Paint Run Run at [ruby-core:31848].
+
+Thu Aug 26 21:49:46 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_readlines): Pathname#readlines
+	  translated from pathname.rb.
+
+Thu Aug 26 10:37:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regint.h (OnigStackIndex): the type should be intptr_t.
+	  Original Oniguruma assumes the size of long and that of void *
+	  are equal, but it's not true on LLP64 platform: mswin64.
+	  originally patched by shintaro kuwamoto [ruby-dev:42133]
+
+Thu Aug 26 10:38:11 2010  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* test/dl/test_base.rb: AIX does not have dynamically loadable lib[cm].
+
+	* test/fiddle/helper.rb: AIX does not have dynamically loadable lib[cm].
+
+Thu Aug 26 09:49:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_shuffle_bang): check number of argument.
+
+Tue Aug 26 09:11:40 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
+	  rmpd_set_thread_local_exception_mode, VpGetException,
+	  VpSetException): thread-local exception mode.
+
+	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
+	  rmpd_set_thread_local_precision_limit, VpGetPrecLimit,
+	  VpSetPrecLimit): thread-local precision limit.
+
+	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
+	  rmpd_set_thread_local_rounding_mode, VpGetRoundMode,
+	  VpSetRoundMode, VpException, VpInternalRound):
+	  thread-local rounding mode.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_mode, BigDecimal_round,
+	  VpIsRoundMode, VpGetRoundMode, VpSetRoundMode, VpActiveRound,
+	  VpMidRound, VpLeftRound), ext/bigdecimal/bigdecimal.h:
+	  use unsigned short for rounding mode.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_mode): add test for
+	  setting rounding mode.
+
+	* test/bigdecimal/test_bigdecimal.rb (test_thread_local_mode):
+	  add test for setting mode thread-locally.
+
+Thu Aug 26 07:29:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_{shuffle_bang,sample}): use Random class object.
+
+	* random.c (try_get_rnd): use default_rand for Random as same as
+	  singleton methods.
+
+	* random.c (rb_random_real): check the range of result.
+
+Wed Aug 25 22:11:11 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_binread): Pathname#binread translated
+	  from pathname.rb.
+
+Wed Aug 25 03:42:43 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): workaround for VC9 for x64.
+	  reported by kuwamoto shintaro in [ruby-dev:42125].
+
+Tue Aug 24 23:28:50 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* .gitignore: updated.
+
+Tue Aug 24 22:07:28 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_read): Pathname#read translated from
+	  pathname.rb.
+
+Tue Aug 24 10:11:04 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: read API version from include/ruby/version.h.
+
+	* {bcc,win}32/setup.mak (-version-): ditto.
+
+	* version.h (RUBY_LIB_VERSION): use API version numbers.
+
+Tue Aug 24 07:07:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_shuffle_bang, rb_ary_sample): add optional
+	  argument random.  [ruby-dev:41923] [EXPERIMENTAL]
+
+	* random.c (rb_random_{int32,real,bytes}): fallback to normal
+	  method invocation.
+
+Tue Aug 24 06:08:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/version.h (RUBY_API_VERSION_*): renamed and moved
+	  from version.h.  [ruby-dev:42103]
+
+Tue Aug 24 05:58:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ChangeLog: flushed.  [ruby-dev:42050]
+
 Tue Aug 24 01:14:58 2010  Kenta Murata <mrkn@mrkn.jp>
 
 	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): to_f must underflow
@@ -663,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 poped is true.  [ruby-dev:41933], [Bug #3658]
+	  results when popped 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>
@@ -2146,7 +14297,7 @@ Thu Jun 10 09:10:08 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Wed Jun  9 22:51:50 2010  Tanaka Akira  <akr@fsij.org>
 
-	* time.c (find_time_t): always outerpolate from past.
+	* time.c (find_time_t): always extrapolate from past.
 	  [ruby-core:30672] reported by Benoit Daloze.
 
 Wed Jun  9 22:13:08 2010  Tanaka Akira  <akr@fsij.org>
@@ -10212,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-convertion encoding.
+	* io.c (rb_scan_open_args): add UTF8-MAC to no-conversion encoding.
 
 Tue Sep 29 21:21:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -21561,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.
-	  (commited at r20981)
+	  (committed at r20981)
 
 Thu Dec 25 13:28:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
@@ -59623,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: commited magic for reducing RVALUE size on windows. (24->20byte)
+	* gc.c: committed magic for reducing RVALUE size on windows. (24->20byte)
 	  [ruby-core:7474]
 
 Thu Mar  2 14:12:26 2006  Tanaka Akira  <akr@m17n.org>
@@ -61610,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
-	  accidently HAVE_CLOSESOCKET is defined on windows again because
+	  accidentally HAVE_CLOSESOCKET is defined on windows again because
 	  it has it)
 
 	* ext/socket/{getaddrinfo.c,socket.c}: ditto.
@@ -61619,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): convertion from `int' to `char' discards
+	* bignum.c (bignew_1): conversion 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)
@@ -62786,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 convertion.
+	* dln.c: avoid warning of const to non-const conversion.
 	  [ruby-dev:27041]
 
 	* eval.c, io.c, ruby.c: ditto.
@@ -64766,7 +76917,7 @@ Tue May 31 15:52:45 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  break the loop if the socket reached to EOF. [ruby-talk:142285]
 
 	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): send response
-	  without reading the whole request body if keep-alive is diabled.
+	  without reading the whole request body if keep-alive is disabled.
 	  [experimental]
 
 Mon May 30 23:48:29 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
@@ -64788,7 +76939,7 @@ Sat May 28 16:39:21 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 Sat May 28 05:15:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_time): should
-	  not set internal flag directry.
+	  not set internal flag directory.
 
 Sat May 28 02:00:11 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
@@ -65011,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#intialize):
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#initialize):
 	  should initialize session id context. [ruby-core:4663]
 
 	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): add session id support.
@@ -69282,7 +81433,7 @@ Mon Nov  8 22:20:19 2004  Dave Thomas  <dave@pragprog.com>
 
 Mon Nov  8 00:14:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* configure.in: add setup for mignw32 cross compiling.
+	* configure.in: add setup for mingw32 cross compiling.
 	  [ruby-talk:119413]
 
 Sun Nov  7 23:49:26 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
@@ -70450,7 +82601,7 @@ Sat Sep 18 14:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (dir_s_chdir): avoid memory leak and unnecessary chdir to
 	  the original directory when exception has caused in changing
-	  direcotry or within block.  thanks to Johan Holmberg
+	  directory or within block.  thanks to Johan Holmberg
 	  <holmberg@iar.se> [ruby-core:03446]
 
 Fri Sep 17 20:29:33 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
@@ -71004,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 infomation.
+	* ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion information.
 
 	* ext/tk/lib/menu.rb: typo bug.
 
@@ -71433,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 ommitted. [ruby-dev:23883]
+	  "-I.FE-X" which both "I" and "F" are omitted. [ruby-dev:23883]
 
 	* test/ruby/test_float.rb (test_strtod): add test for bug fix.
 
@@ -72147,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) controll Tk interpreters
+	* ext/tk/lib/remote-tk.rb: (NEW library) control Tk interpreters
 	  on the other processes by Tcl/Tk's 'send' command
 
 Fri May 21 09:22:05 2004  Dave Thomas  <dave@pragprog.com>
@@ -73456,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 compatiblity)
+	  (Rev1.112 lost compatibility)
 
 	* dir.c (fnmatch_helper): File.fnmatch('\/', '/', File::FNM_PATHNAME)
-	  should return true. (Rev1.112 lost compatiblity)
+	  should return true. (Rev1.112 lost compatibility)
 
 	* dir.c (fnmatch): File.fnmatch('**/.boo', '.foo/.boo',
 	  File::FNM_PATHNAME) should return false because of leading period.
@@ -74283,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. (refering to mingw)
+	* bcc32/Makefile.sub: show more warnings. (referring to mingw)
 
 	* bcc32/setup.mak: ditto.
 
@@ -74341,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 achived by calling downcase() for single-byte
+	  in Win32. This is achieved 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>
@@ -74410,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: slighly improved documentation (sync with 1.8)
+	* lib/fileutils.rb: slightly improved documentation (sync with 1.8)
 
 Fri Feb 13 19:57:01 2004  Kouhei Sutou  <kou@cozmixng.org>
 
@@ -74726,7 +86877,7 @@ Sun Feb  1 18:21:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 Sun Feb  1 05:30:06 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/open-uri.rb (URI::Generic#find_proxy): warn HTTP_PROXY.
-	 raise an errror on non-http proxy URI.
+	 raise an error on non-http proxy URI.
 	 (OpenURI::Buffer#<<): make a tempfile binmode.  [ruby-talk:90793]
 
 Sun Feb  1 00:57:41 2004  Kouhei Sutou  <kou@cozmixng.org>
@@ -77028,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 recieves the exception of the callback.
+	  TkTimer#wait receives 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.0.0 b/doc/ChangeLog-2.0.0
new file mode 100644
index 0000000000..a1a79b8dca
--- /dev/null
+++ b/doc/ChangeLog-2.0.0
@@ -0,0 +1,24015 @@
+Fri Feb  8 19:56:54 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* array.c (rb_ary_dup): reverted r39004.  see [Bug #7768], and
+	  release manager finally decided to revert it.
+
+Fri Feb  8 16:09:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_ensure): preserve errinfo across ensure proc before
+	  JUMP_TAG().  [ruby-core:52022] [Bug #7802]
+
+Fri Feb  8 16:08:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (assert_separately): check also terminating
+	  signal not only if core dumped.
+
+Fri Feb  8 13:12:04 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/generator/darkfish.rb:  Set encoding on output template to
+	  user-specified encoding.
+	* test/rdoc/test_rdoc_generator_darkfish.rb:  Test for above.
+
+	* lib/rdoc.rb:  Bump version
+
+Fri Feb  8 11:53:33 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/security/policy.rb:  Raise proper exceptions when
+	  verifying unsigned gems (instead of crashing).
+	* test/rubygems/test_gem_security_policy.rb:  Tests for the above.
+
+Fri Feb  8 10:44:44 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rubygems/test_gem_dependency_installer.rb:  Improve coverage of
+	  --install-dir feature of gem install.
+
+Fri Feb  8 10:11:09 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/config_file.rb:  Add missing require for
+	  user_interaction.rb
+
+	* lib/rubygems/dependency_installer.rb:  Minor refactor for clarity.
+
+Fri Feb  8 09:35:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#configuration): set all ruby names.
+	  hdrdir now needs RUBY_VERSION_NAME.
+
+Fri Feb  8 08:58:26 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package/old.rb:  Fix loading old format gems on ruby
+	  1.8.  This commit is only so trunk and rubygems master have the same
+	  code.
+
+Fri Feb  8 08:53:27 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: fixing string quotation
+	  when dumping Ruby strings. Thanks Ingy
+
+	* test/psych/test_psych.rb: appropriate tests.
+
+	* test/psych/test_yaml.rb: ditto
+
+Fri Feb  8 08:50:42 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: change output reference
+	  ids to be sequential numbers.
+
+Fri Feb  8 07:47:56 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package/old.rb:  Disallow installation of old-format
+	  gems when a security policy is active.
+	* test/rubygems/test_gem_package_old.rb:  Test for above.
+
+Fri Feb  8 07:34:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/net/http.rb (HTTP.post_form): Fix module scope in documentation
+	  Patch by David Albert [Bug #7794] [ruby-core:51955]
+
+Fri Feb  8 07:33:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* compar.c (cmp_equal): Document ignored exception and return false
+	  By Makoto Kishimoto [Bug #7790] [ruby-dev:46925] [ruby-dev:46910]
+
+Fri Feb  8 07:17:00 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_installer.rb:  Only install local gems if
+	  they end in '.gem'.  Fixes github rubygems issue #407.
+	* test/rubygems/test_gem_dependency_installer.rb:  Test for the above.
+
+Fri Feb  8 00:02:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (obj2gid): use getgrnam_r() only if getgrnam_r() and
+	  _SC_GETGR_R_SIZE_MAX is available.
+	  MirOS BSD (MirBSD 10 GENERIC#1382 i386) have getgrnam_r() but
+	  no _SC_GETGR_R_SIZE_MAX.
+	  (obj2uid): use getpwnam_r() only if getpwnam_r() and
+	  _SC_GETPW_R_SIZE_MAX is available.
+	  This is consistency for obj2gid.
+	  MirOS BSD have neither getpwnam_r() nor _SC_GETPW_R_SIZE_MAX.
+
+Thu Feb  7 22:01:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: define linker for shared library on MirOS BSD.
+
+Thu Feb  7 21:09:23 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rubygems/test_gem_config_file.rb
+	  (TestGemConfigFile#test_check_credentials_permissions): skip on
+	  Windows. see [Bug #7784] [ruby-core:51864] and r39070.
+
+Thu Feb  7 20:52:40 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): added variables which were
+	  missing at r39130.
+
+Thu Feb  7 15:33:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#merge_libs): insert following reversal
+	  ordered elements just after the duplicated element, not overwriting
+	  successive elements.  [ruby-core:50314] [Bug #7467]
+
+Thu Feb  7 14:56:15 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package.rb:  Ensure digests are generated for signing.
+	* test/rubygems/test_gem_package.rb:  Test for the above.
+
+	* lib/rubygems/security/policy.rb:  Ensure digests are present when
+	  verifying a gem and match the number of signatures bidirectionally.
+	* test/rubygems/test_gem_security_policy.rb:  Test for the above.
+
+	* lib/rubygems.rb:  Documentation improvements (by zzak)
+
+Thu Feb  7 05:52:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/pty/README: Remove static documentation file
+	* ext/pty/pty.c: Add License to PTY module overview
+
+Thu Feb  7 02:31:10 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* vm_insnhelper.c: attr_writer should return its argument [Bug #7773]
+
+	* test/ruby/test_basicinstructions.rb: Test for above
+
+Thu Feb  7 01:35:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/security.rdoc: Link to japanese version of CVE page patch by
+	  nagachika
+
+Wed Feb  6 23:30:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/pty/README.expect: Removed static documentation file
+	* ext/pty/lib/expect.rb: Documentation for IO#expect
+
+Wed Feb  6 22:25:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* hash.c (env_reject_bang): hide keys array from ObjectSpace
+	* hash.c (env_select_bang): ditto
+
+Wed Feb  6 17:33:01 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (multiarch): add option to move architecture dependent
+	  directories.  [Feature #6111]
+
+	* template/ruby.pc.in: add arch dependent paths.
+
+	* configure.in (rubyarchhdrdir, sitearchhdrdir, vendorarchhdrdir): add
+	  options to customize architecture dependent header directories.
+
+	* configure.in (rubyarchprefix, sitearchdir, vendorarchdir): add
+	  options to customize architecture dependent library directories.
+
+	* template/ruby.pc.in, tool/mkconfig.rb, tool/rbinstall.rb: use
+	  configured values.
+
+	* tool/mkconfig.rb: expand rubyarchdir to extract prefix.
+
+	* configure.in (RUBY_VERSION_NAME), template/ruby.pc.in: add
+	  substitution and define.
+
+	* configure.in, version.c: parametric architecture name for paths.
+
+	* configure.in (shvar_to_cpp): convert sh variable references
+	  by replacing with string literal forms in cpp.
+
+Wed Feb  6 17:05:26 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Import RDoc 4.0.0.rc.2
+
+Mon Feb  4 02:22:49 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_process.rb (test_setsid): ensure to call
+	  Process.wait(). Reported by George Koehler. Thanks.
+
+Mon Feb  4 02:18:00 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_process.rb (test_setsid): skip when platform is
+	  OpenBSD. Contributed from George Koehler.
+	  [Bug #7789] [ruby-core:51889]
+
+Wed Feb  6 13:35:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_method_entry_location, rb_{mod,obj}_method_location): new
+	  functions to obtain source location of method definition.
+
+	* vm_method.c (rb_obj_respond_to): show the location of old style
+	  respond_to? method.
+
+Wed Feb  6 13:03:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/security.rdoc: Add link to CVEs on ruby-lang.org/en/security
+
+Wed Feb  6 12:49:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* NEWS: Add note about removal of CSV::load and CSV::dump from r39077
+
+Wed Feb  6 05:57:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/racc/parser.rb: Hide copyright notice from Racc doc
+
+Wed Feb  6 05:50:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/rubygems/*: Removed outdated documentation files
+	* lib/rubygems/LICENSE.txt: Include license file
+	* lib/rubygems.rb: Move Gem module documentation so rdoc can parse it
+	  and link to LICENSE.txt
+	* lib/rubygems/*: Hide useless documentation from Gem module rdoc
+
+Wed Feb  6 03:45:19 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/security.rdoc: Remove documentation for unsafe CSV.load which
+	  was deleted in r39077
+
+Wed Feb  6 03:27:19 2013  James Edward Gray II  <james@graysoftinc.com>
+
+	* lib/csv.rb: Remove the dangerous serialization feature.
+
+Wed Feb  6 00:56:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/irb.rb: Remove example from restrictions, it works [Github #246]
+	  Based on patch by Ryunosuke SATO
+
+Wed Feb  6 00:46:53 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c (rb_vm_stack_to_heap): call rb_vm_get_binding_creatable_next_cfp
+	  instead of rb_vm_get_ruby_level_next_cfp to prevent a segfault by
+	  calling Kernel#callcc. See r39067 for more details.
+	  [ruby-dev:46908] [ruby-trunk - Bug #7774]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+Tue Feb  5 18:48:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* doc/security.rdoc: add regex, eval and drb sections
+
+Tue Feb  5 17:24:02 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/servlet.rb:  Fixed root search paths, filesystem paths
+	  instead of HTTP paths were returned.
+	* test/rdoc/test_rdoc_servlet.rb:  Test for above.
+
+Tue Feb  5 16:37:00 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/config_file.rb:  Ignore permissions check on windows.
+	  Windows writes 0600 file as 0644 permissions making the check
+	  useless.
+
+Tue Feb  5 16:25:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_obj_respond_to): drop optional include_all flag if
+	  respond_to? method is defined in old style.  [Bug #7722]
+
+Tue Feb 05 15:04:34 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (rb_binding_new_with_cfp): permit to create binding object
+	  of IFUNC frame.
+	  When `rb_binding_new_with_cfp()' is called, VM finds out the first
+	  normal (has iseq) frame and create a binding object of this frame
+	  and create Env objects. `ep's of related frames are updated
+	  (`ep's point Env object managed spaces).
+	  However, `ep' of skipped IFUNC frame was not updated and
+	  old invalid `ep' was remained. It causes serious problems.
+	  To solve this issue, permit IFUNC to create binding.
+	  (Maybe there is no problem on it)
+	  [ruby-dev:46908] [ruby-trunk - Bug #7774]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+	* vm.c (rb_vm_get_binding_creatable_next_cfp), vm_core.h: added.
+
+	* vm_trace.c: fix to use `rb_vm_get_binding_creatable_next_cfp()'.
+
+Tue Feb  5 14:43:15 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Fix error message, patch by pypypy [Bug #7777]
+
+Tue Feb  5 14:36:04 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* numeric.c (fix_pow): Handle special cases when base is 0, -1 or +1
+	  [Bug #5713] [Bug #5715]
+
+	* rational.c (nurat_expt): ditto
+
+Tue Feb  5 13:27:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (rawmode_opt): use default values by `stty
+	  raw`.
+
+Tue Feb  5 12:50:47 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* range.c: Use div instead of / for bsearch
+
+	* test/ruby/test_range.rb: Test showing bug when requiring mathn
+
+Tue Feb  5 12:48:38 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* enumerator.c: Use to_enum for Enumerable methods returning
+	  Enumerators.
+	  This makes Lazy#cycle no longer needed, so it was removed.
+	  Make Enumerator#chunk and slice_before return lazy Enumerators.
+	  [Bug #7715]
+
+	* internal.h: Remove ref to rb_enum_cycle_size; no longer needed
+
+	* enum.c: Make enum_cycle_size static.
+
+	* test/ruby/test_lazy_enumerator.rb: Test for above
+
+Tue Feb  5 12:48:10 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* enumerator.c: Finalize and document Lazy.new. [Bug #7248]
+	  Add Lazy#to_enum and simplify Lazy#size.
+
+	* test/ruby/test_lazy_enumerator.rb: tests for above
+
+Tue Feb  5 11:35:35 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/push_command.rb:  Fixed credential download for
+	  `gem push --host`
+	* lib/rubygems/gemcutter_utilities.rb:  ditto.
+	* test/rubygems/test_gem_commands_push_command.rb:  Test for the above.
+	* test/rubygems/test_gem_gemcutter_utilities.rb:  ditto.
+
+	* lib/rubygems/config_file.rb:  Abort if the `gem push` credentials
+	  file has insecure permissions.
+	* test/rubygems/test_gem_config_file.rb:  Test for the above.
+
+	* lib/rubygems/ext/builder.rb:  Do not look for Gemfile, Isolate, etc.
+	  while building gem extensions.
+
+	* lib/rubygems/package.rb:  Unset spec and files list if a gem's
+	  signatures cannot be verified.
+	* test/rubygems/test_gem_package.rb:  Test for the above.
+
+	* lib/rubygems/specification.rb:  Reduce use of eval.
+	* lib/rubygems/test_case.rb:  ditto.
+
+	* test/rubygems/test_gem_specification.rb:  Test setting
+	  specification_version for legacy gems.  Dup Gem.ruby before
+	  untainting in case it's frozen.
+
+	* lib/rubygems.rb:  Reduce use of eval.  Only read files when looking
+	  for Gemfile, Isolate, etc.
+	* test/rubygems/test_gem.rb:  Test for the above.
+
+Tue Feb  5 10:15:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/security.rdoc: Wrap security guide at 80 columns
+
+Tue Feb  5 10:15:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/security.rdoc: Grammatical error on security guide
+	  Patch by Josh Bassett [Github fixes #245]
+
+Tue Feb  5 10:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/racc/parser.rb: Update #do_parse and #yyparse from upstream
+	  See [Github tenderlove/racc@7d954b5]
+
+Tue Feb  5 09:55:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/racc: Merge Racc documentation downstream, add grammar ref file
+
+Tue Feb  5 08:03:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/irb.rb, lib/irb/ext/save-history.rb: Add documentation on how to
+	  enabled irb history [ruby-core:51347] [Bug #7679]
+
+Tue Feb  5 07:35:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/irb.rb, lib/irb/context.rb: Add documentation on how to enable
+	  auto-indentation and autocompletion using irbrc and irb_context
+	  [ruby-core:51209] [Bug #7642] and [ruby-core:51348] [Bug #7680]
+
+Tue Feb  5 05:20:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/standard_library.rdoc: Document list of libraries and extensions
+	  and their purpose or short description
+	* lib/README: Remove lib/README in favor of doc/standard_library.rdoc
+
+Tue Feb  5 04:40:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/json/lib/json.rb: Move module overview definition for rdoc
+
+Tue Feb  5 03:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/tracer.rb: Move class overview definition and reformat
+
+Mon Feb  4 15:10:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (rawmode_opt): initialize options for the
+	  case all options are not given.
+
+Mon Feb  4 12:44:13 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_dump.c (control_frame_dump): capitalize prefix of `ep'
+	  if `ep' points an env object.
+
+Mon Feb  4 04:20:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/English.rb: Add English module for RDoc to parse, then
+	  remove_const to avoid confusion. Include full list of aliases and
+	  their associated global variable.
+
+Mon Feb  4 02:40:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/yaml.rb (YAML::EngineManager): Documentation for #yamler and
+	  #yamler= for using the removed Syck gem as the YAML::ENGINE
+
+Sun Feb  3 16:54:27 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/io-console.gemspec: bump.  [Bug #7762]
+
+	* test/io/console/test_io_console.rb (test_stringio_getch): use more
+	  descriptive assertions.
+
+	* ext/io/console/console.c (rawmode_opt): min is minimum characters,
+	  not tenths.
+
+Sun Feb  3 16:13:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* doc/security.rdoc: add first cut at a Ruby security document
+
+Sun Feb  3 10:25:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* random.c: Document range argument for Kernel#rand.
+	  [ruby-core:51794] [Bug #7770]
+
+Sun Feb  3 10:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* numeric.c: Document Float constants [ruby-core:51484] [Bug #7709]
+
+Sun Feb  3 09:38:44 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/profiler.rb (PROFILE_CALL_PROC, PROFILE_RETURN_PROC): add b_call
+	  and b_return to profile block calls.
+
+	* lib/profiler.rb (PROFILE_CALL_PROC, PROFILE_RETURN_PROC): split
+	  PROFILE_PROC for call and return events.
+
+Sat Feb  2 14:32:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/minitest/mock.rb, lib/minitest/hell.rb: nodoc top-level module
+
+Sat Feb  2 14:05:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/debug.rb: Documentation for DEBUGGER__ class methods based on
+	  patch by Vincent Batts [ruby-core:51253]
+
+Sat Feb  2 13:37:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/net/smtp.rb: Fix rdoc title for Net::SMTP
+
+Sat Feb  2 13:32:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/net/pop.rb: Fix rdoc title for Net::POP3
+
+Sat Feb  2 13:00:11 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/gserver.rb (GServer#start): fix a timing issue.  patch from
+	  Charles Nutter.  [Bug #7081]
+
+Sat Feb  2 12:36:54 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/fileutils.rb (copy_entry, wrap_traverse): preserve attributes of
+	  directories on FileUtils.cp_r.  The fix was proposed by Jan
+	  Wedekind.  [Bug #7246]
+
+	* test/fileutils/test_fileutils.rb: add a test for above.
+
+Sat Feb  2 12:30:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/uri/ftp.rb (URI::FTP.new2): nodoc method from r39013 [Bug #7301]
+
+Sat Feb  2 12:15:36 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/uri/ftp.rb (URI::FTP.new2): remove the rdoc because it is not
+	  well tested yet.  [Bug #7301]
+
+Sat Feb  2 12:07:41 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ChangeLog: Forgot to add a reference to the ChangeLog of the
+	  previous commit.
+
+Sat Feb  2 12:05:18 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/fileutils.rb: chmod/chmod_R with a string mode (e.g., "+x")
+	  caused error in verbose mode.  [Bug #7373]
+
+	* test/fileutils/test_fileutils.rb: add a test for above.
+
+Sat Feb  2 11:44:42 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/English.rb: Remove some confusing words from rdoc.  [Bug #7406]
+
+Sat Feb  2 10:17:12 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* NEWS: add keyword arguments.
+
+Sat Feb  2 07:45:44 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* proc.c (proc_curry): Fix arity check [Bug #5747]
+
+	* test/ruby/test_proc.rb: Test for above
+
+Sat Feb  2 07:44:15 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* proc.c: Add {*}_min_max_arity and refactor.
+	  [Bug #7765]
+
+	* test/ruby/test_proc.rb: Fix wrong test
+
+Fri Feb  2 00:46:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* marshal.c: add security considerations to marshal overview, refer to
+	  overview from Marshal.load documentation [#7759]
+
+Fri Feb  1 23:04:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* array.c (rb_ary_dup): make returned array the same class as the original
+	  array [Bug #7768] [ruby-core:51792]
+	* test/ruby/test_array.rb (class TestArray): add test
+
+Fri Feb  1 16:35:34 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): prohibit setting instance variables of
+	  existing class/module.
+
+Fri Feb  1 14:34:29 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/readline/extconf.rb, ext/readline/readline.c: check
+	  RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE directly in
+	  readline.c.  Patch by Zachary Scott.  [Bug #7397] [ruby-core:49561]
+
+Thu Jan 31 21:55:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* marshal.c (marshal_load): Add documentation warning against using
+	  Marshal.load on untrusted data [Bug #7759] [ruby-core:51765]
+
+Thu Jan 31 16:33:27 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (local_push_gen): no assigned but unused variable warnings
+	  in eval as well as -e.  [Feature #7730] [ruby-core:51580]
+
+Wed Jan 30 12:30:08 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_signal.rb (test_trap_puts): Fix typo. "sync"
+	  should be "STDOUT.sync".
+
+Thu Jan 31 15:39:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* string.c (rb_str_aset_m): Documentation for String#[]= fix
+	  Raises an IndexError if Regexp match is out of range.
+	  Github fixes #243 Patch by Dmtiriy Budnik
+
+Thu Jan 31 13:54:44 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (rsock_unix_sockaddr_len): return
+	  sizeof(sa_family_t) if path is empty.  see "Autobind Feature" in
+	  unix(7) for details.
+
+	* ext/socket/lib/socket.rb (unix_socket_abstract_name?): treat an
+	  empty path as an abstract name.
+
+	* test/socket/test_unix.rb: related test.
+
+Wed Jan 30 20:58:50 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/basicsocket.c (bsock_getsockname): ignore truncated
+	  part of socket address.
+	  (bsock_getpeername): ditto.
+	  (bsock_local_address): ditto.
+	  (bsock_remote_address): ditto.
+
+	* ext/socket/unixsocket.c (unix_path): ditto.
+	  (unix_addr): ditto.
+	  (unix_peeraddr): ditto.
+
+	* ext/socket/init.c (cloexec_accept): ditto.
+
+Wed Jan 30 17:08:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (fstat): revert r37337, which uses _fstati64()
+	  instead of fstati64() on mingw32.  [Bug #7276]
+
+Wed Jan 30 15:26:37 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/socket/unixsocket.c (rsock_init_unixsock): use rb_inspect()
+	  because rb_sys_fail_str() fails if its argument contains NUL.
+
+	* test/socket/test_unix.rb: related test.
+
+Wed Jan 30 15:21:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_dump.c (rb_vm_bugreport): show the most important message, Crash
+	  Report log information, first.
+
+Wed Jan 30 15:00:05 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* array.c (rb_ary_bsearch): Raise TypeError on bad return from block
+
+	* range.c (range_bsearch): ditto
+
+	* test/ruby/test_array.rb (class): Test for above
+
+	* test/ruby/test_range.rb (class): ditto
+
+Wed Jan 30 14:46:28 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* range.c: Restrict bsearch to integers [#7728]
+
+	* test/ruby/test_range.rb: Test for above
+
+Wed Jan 30 14:10:52 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* array.c (rb_ary_bsearch): Return enumerator if no block [#7725]
+
+	* range.c (range_bsearch): ditto
+
+	* test/ruby/test_array.rb: Test for above
+
+	* test/ruby/test_range.rb: ditto
+
+Wed Jan 30 13:53:43 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Take conjugate for inner product
+	  [rubyspec:5a01ad5719f2] [ruby-dev:46101]
+
+Wed Jan 30 13:22:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (local_push_gen): warn assigned but unused variables also in
+	  toplevel, except for -e option.  [Feature #7730] [ruby-core:51580]
+
+Wed Jan 30 13:17:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (cont_restore_thread): svar should be separate per fibers.
+	  [ruby-core:51331] [Bug #7678]
+
+Wed Jan 30 07:15:04 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* re.c (reg_operand): Simplify and reuse error handling [Bug #7539]
+
+	* test/ruby/test_regexp.rb: Test for above
+
+Wed Jan 30 07:00:16 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* object.c: Improve error for failed implicit conversions [Bug #7539]
+
+	* error.c: Adapt rdoc
+
+	* test/ruby/test_object.rb: Test for above
+
+Tue Jan 29 21:40:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/net/http/generic_request.rb (encode_multipart_form_data): remove
+	  tempfile explicitly.
+
+Tue Jan 29 19:27:18 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* array.c: Improve documentation about
+	  comparison by hash for concerned methods. [ruby-core:51266]
+
+Tue Jan 29 17:03:28 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c: fix issue of rb_debug_inspector_open().
+	  The order of making binding should be stack (frame) top to bottom.
+	  [Bug #7635]
+	  And also fix issue of collecting klass. Collecting klass is same
+	  as TracePoint#defined_class.
+	  (previous version, it returns T_ICLASS (internal objects).
+
+	* test/-ext-/debug/test_debug.rb: add a test.
+
+	* ext/-test-/debug/extconf.rb, init.c, inspector.c: ditto.
+
+	* vm_backtrace.c: remove magic number and add enum CALLER_BINDING_*.
+
+	* vm_backtrace.c, include/ruby/debug.h: add new C api (experimental)
+	  rb_debug_inspector_frame_self_get().
+
+	* vm.c, vm_core.h, vm_trace.c: move decl. of
+	  rb_vm_control_frame_id_and_class() and constify first parameter.
+
+Tue Jan 29 16:50:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_trace.c (rb_tracepoint_enable, rb_tracepoint_disable): check safe
+	  level as well as set_trace_func.
+
+	* vm_trace.c (set_trace_func, thread_{add,set}_trace_func_m): check
+	  safe level as well as 1.8.
+
+Tue Jan 29 16:49:19 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_mod_method_arity): return original arity of the method if
+	  aliased because of visibility change, like as Method#arity.
+
+Tue Jan 29 12:05:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_marshal.rb: remove temporally files early.
+
+	* test/ruby/test_process.rb: ditto.
+
+	* test/psych/test_exception.rb: ditto.
+
+Tue Jan 29 09:26:20 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_s_pack_sockaddr_un): calculate the
+	  correct address length of an abstract socket.
+
+	* test/socket/test_unix.rb: related test.
+
+Mon Jan 28 18:02:16 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_backtrace.c (rb_debug_inspector_frame_{class,binding,iseq}_get):
+	  use long as index as well as RARRAY_LEN().
+
+Mon Jan 28 17:51:38 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (assert_separately): imply no core dump.
+
+Mon Jan 28 12:32:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/fcntl/fcntl.c: update document.  use "file descriptor" instead
+	  of "file handle" because it is not used other Ruby documents and
+	  it is confusing with Windows file handle.
+	  correct F_DUPFD behavior.
+
+Sat Jan 26 22:39:12 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object): dump instance variables of the result of
+	  marshal_dump not the original object.  [ruby-core:51163] [Bug #7627]
+
+	* complex.c (nucomp_marshal_dump): need to copy instance variables.
+
+	* rational.c (nurat_marshal_dump): ditto.
+
+Sat Jan 26 13:35:56 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/fcntl/fcntl.c:  Document Fcntl constants
+
+Sat Jan 26 12:54:40 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* hash.c (rb_env_size):  Restored documentation for ENV.size
+
+	* lib/drb/drb.rb:  Documented DRb::DRb#run.
+
+	* lib/erb.rb (class ERB):  Improved documentation of ERb.
+
+	* transcode.c:  Documented Encoding::Converter constants.
+
+Sat Jan 26 10:09:57 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick/accesslog.rb:  Improved WEBrick documentation.
+	* lib/webrick/cgi.rb:  ditto.
+	* lib/webrick/config.rb:  ditto.
+	* lib/webrick/cookie.rb:  ditto.
+	* lib/webrick/httpauth/authenticator.rb:  ditto.
+	* lib/webrick/httpauth/basicauth.rb:  ditto.
+	* lib/webrick/httpauth/digestauth.rb:  ditto.
+	* lib/webrick/httpproxy.rb:  ditto.
+	* lib/webrick/httprequest.rb:  ditto.
+	* lib/webrick/httpresponse.rb:  ditto.
+	* lib/webrick/https.rb:  ditto.
+	* lib/webrick/httpserver.rb:  ditto.
+	* lib/webrick/httpservlet/cgihandler.rb:  ditto.
+	* lib/webrick/httpservlet/filehandler.rb:  ditto.
+	* lib/webrick/httpservlet/prochandler.rb:  ditto.
+	* lib/webrick/httputils.rb:  ditto.
+	* lib/webrick/httpversion.rb:  ditto.
+	* lib/webrick/log.rb:  ditto.
+	* lib/webrick/server.rb:  ditto.
+	* lib/webrick/ssl.rb:  ditto.
+	* lib/webrick/utils.rb:  ditto.
+	* lib/webrick/version.rb:  ditto.
+
+Sat Jan 26 08:29:33 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/socket/raddrinfo (rsock_unix_sockaddr_len): renamed from
+	  rsock_unixpath_len, because it returns not the length of the path,
+	  but the length of a socket address for the path.
+
+Sat Jan 26 01:12:23 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_io.rb (test_ioctl_linux): skip if a platform is
+	  not x86 because linux ioctl request number depend on cpu arch.
+	  At least, alpha, mips, sparc and ppc have a different number.
+	  [Bug #7718] [ruby-core:51544]
+
+Fri Jan 25 19:14:24 2013  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: use TlsAlloc instead of __declspec(thread)
+	  to avoid SEGV if win32ole.so loaded with LoadLibrary in Windows
+	  XP or earlier.
+
+Fri Jan 25 16:47:31 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (rsock_unixpath_len, init_unix_addrinfo),
+	  ext/socket/unixsocket.c (unixsock_connect_internal,
+	  rsock_init_unixsock): calculate the correct address length of
+	  an abstract socket.  Without this fix, sizeof(struct sockaddr_un)
+	  is specified as the length of an abstract socket for bind(2) or
+	  connect(2), so the address of the socket is filled with extra NUL
+	  characters.  See unix(7) for details.
+
+	* ext/socket/lib/socket.rb (unix_server_socket): don't access the
+	  file system if the platform is Linux and path starts with NUL,
+	  which means that the socket is an abstract socket.
+
+	* test/socket/test_unix.rb: related test.
+
+Fri Jan 25 13:02:27 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/drb/drb.rb:  Updated documentation based on patch from Vincent
+	  Batts.  [ruby-trunk - Bug #7714]
+	* lib/drb/ssl.rb:  ditto.
+
+Fri Jan 25 12:23:29 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/drb/drb.rb:  Improved documentation by adding or hiding methods.
+	* lib/drb/eq.rb:  ditto.
+	* lib/drb/extserv.rb:  ditto.
+	* lib/drb/gw.rb:  ditto.
+	* lib/drb/invokemethod.rb:  ditto.
+	* lib/drb/observer.rb:  ditto.
+	* lib/drb/ssl.rb:  ditto.
+	* lib/drb/timeridconv.rb:  ditto.
+	* lib/drb/unix.rb:  ditto.
+
+	* sample/drb/gw_cu.rb:  Fixed bug in DRb gateway sample.
+
+Fri Jan 25 12:01:56 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: modify a comment about rb_iseq_t::local_size.
+	  A patch by davidbalbert (David Albert) [Bug #6750]
+
+Fri Jan 25 10:36:31 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/mkmf.rb:  Documented MakeMakefile constants.  Hide implementation
+	  details from RDoc
+
+Fri Jan 25 10:04:07 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/compatibility.rb:  Hide compatibility shims from RDoc
+
+	* lib/rubygems/config_file.rb:  Hide RbConfig use from RDoc
+
+	* lib/rubygems/test_case.rb:  Added note to use realpath when 1.8
+	  support is dropped.
+
+Fri Jan 25 09:14:43 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/generator/darkfish.rb:  Fixed debug message.  RDoc bug #174
+	  by Thomas Leitner.
+
+	* lib/rdoc/store.rb:  Fixed deletion of ri attribute data when a class
+	  was loaded then saved.  RDoc bug #171 by Thomas Leitner.
+	* test/rdoc/test_rdoc_store.rb:  Test for above.
+
+Thu Jan 24 19:55:25 2013  Shota Fukumori  <her@sorah.jp>
+
+	* NEWS (yaml): Write about bundled libyaml.
+
+Thu Jan 24 16:54:34 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/calling_methods.rdoc:  Added a Method Lookup section.
+	* doc/syntax/refinements.rdoc (Method Lookup):  Clarified that
+	  refinement methods are looked up in classes, not instances.
+
+Thu Jan 24 16:49:17 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* enum.c (enum_zip): Fix error message
+
+	* array.c (take_items): Same, for Array#zip
+
+Thu Jan 24 16:47:26 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* enumerator.c (lazy_zip): raise error for bad arguments
+	  [Bug #7706]
+
+Thu Jan 24 16:05:08 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* enumerator.c: Optimize Lazy#zip when passed only arrays
+	  [Bug #7706]
+
+Thu Jan 24 15:21:17 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* enumerator.c: Fix state handling for Lazy#zip,{drop_take}{_while}
+	  [bug #7696] [bug #7691]
+
+Thu Jan 24 11:43:47 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* eval.c (f_current_dirname): Add documentation about "__dir__
+	  returns always an absolute path". [Bug #7729]
+
+Thu Jan 24 10:28:30 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* NEWS (RDoc):  Added mention of page support and markdown support.
+
+Thu Jan 24 09:40:13 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/refinements.rdoc:  Added refinements document based on
+	  the specification from the wiki.
+	* doc/syntax.rdoc:  Added link to refinements document.
+
+Wed Jan 23 16:29:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn_flags): fix missing
+	  initialization.  pointed out by phasis68 (Heesob Park) at
+	  [ruby-core:51579].  [Bug #7721]
+
+Wed Jan 23 16:18:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#try_constant): fix for large unsigned.
+
+	* lib/mkmf.rb (MakeMakefile#try_constant): fix for larger constants.
+
+	* test/mkmf/test_constant.rb: tests for try_constant.
+	  TODO: define check_constant and use it.
+
+Wed Jan 23 13:35:37 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (ruby_init_stack): ignore `STACK_END_ADDRESS'
+	  if Ruby interpreter is running on co-routine.
+	  [Feature #2294]
+	  https://bugs.ruby-lang.org/issues/2294#note-18
+
+Wed Jan 23 12:28:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn_flags): check the results
+	  of acp_to_wstr() which can return NULL.  [ruby-core:51557] [Bug #7721]
+
+Wed Jan 23 10:40:49 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/assignment.rdoc (Implicit Array Assignment):  Clarify
+	  that "left-hand side" means "of the assignment".  Suggested by Jorge
+	  Dias.
+	* doc/syntax/assignment.rdoc (Multiple Assignment):  ditto.
+
+Wed Jan 23 10:34:47 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/assignment.rdoc (Local Variables and Methods):  Fixed
+	  example showing caching of a method's results into a local variable.
+	  Added not about using an explicit receiver to call a method that
+	  matches a local variable.  Suggested by markov_twain on twitter.
+
+Wed Jan 23 10:20:08 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/README:  Fixed typo.  Patch by Pradeep Sahoo.
+	  Fixes #240 on github
+
+Wed Jan 23 09:53:39 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/servlet.rb:  Fixed display of site and home documentation.
+	  Fixes rdoc issue #170 by Thomas Leitner.
+	* test/rdoc/test_rdoc_servlet.rb:  Test for above.
+
+	* lib/rdoc/code_object.rb:  Split #initialize_visibility from
+	  #initialize for reuse when loading a stored object.
+	  Fixes rdoc issue #171 by Thomas Leitner.
+
+	* lib/rdoc/any_method.rb:  Initialize visibility for #display?  For
+	  rdoc issue #171
+	* lib/rdoc/attr.rb:  ditto.
+	* lib/rdoc/class_module.rb:  ditto.
+	* lib/rdoc/top_level.rb:  ditto.
+	* test/rdoc/test_rdoc_any_method.rb:  Test for above.
+	* test/rdoc/test_rdoc_attr.rb:  ditto.
+	* test/rdoc/test_rdoc_class_module.rb:  ditto.
+	* test/rdoc/test_rdoc_constant.rb:  ditto.
+	* test/rdoc/test_rdoc_top_level.rb:  ditto.
+
+Wed Jan 23 06:43:26 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/test_case.rb:  Use Dir.tmpdir for rubygems tests instead
+	  of ./tmp/test.  Fixes [ruby-trunk - Bug #7717]
+
+Tue Jan 22 22:58:03 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el (ruby-electric-curlies): Fix the bug where
+	  an open curly inserted in a string is always replaced with a
+	  hash sign.
+
+Mon Jan 21 15:41:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkconfig.rb: BASERUBY is transient at core build.
+
+Mon Jan 21 13:51:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb ($extmk): traverse parent directories for the case
+	  srcdir is a symlink.
+
+Sun Jan 20 23:55:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object, r_object0): separate respond_to checks and
+	  calling, and get back to the old behavior for 2.0.  [Bug #7564]
+
+Sun Jan 20 22:24:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/vpath.rb (VPath#def_options): hack for msys make, which
+	  converts a command line argument to non-msys command seems like a
+	  path list automagically.  [Bug #7710] [ruby-core:51489]
+
+Sat Jan 19 11:35:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* struct.c (Struct.new): Document Struct.new with block
+	  Patch by Hiroyuki Iwatsuki [Bug #7674]
+
+Sat Jan 19 09:52:46 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/miscellaneous.rdoc:  Added section on defined?
+
+Sat Jan 19 09:27:31 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/assignment.rdoc (Local Variables and Methods):  Made it
+	  more clear that local variables are created by the parser, not
+	  execution.  Thanks to John Hawthorn.
+
+Sat Jan 19 09:15:58 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/assignment.rdoc:  Improved links
+	* doc/syntax/methods.rdoc:  ditto.
+
+	* doc/syntax.rdoc:  Added link to assignment document
+
+Sat Jan 19 08:47:33 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/assignment.rdoc:  Added a syntax document on assignment.
+
+Fri Jan 18 14:11:01 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/methods.rdoc:  Added Array Decomposition.
+
+Fri Jan 18 12:54:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (gem): Gem.ensure_gem_subdirectories makes
+	  subdirectories group-writable, so make them with $dir_mode.
+
+Fri Jan 18 11:24:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c (ole_initialize): uninitialize OLE at thread
+	  ends.  [Bug #2618] [ruby-core:27634]
+
+	* ext/win32ole/win32ole.c (ole_initialize): initialize OLE for each
+	  threads.  [Bug #2618] [ruby-core:27634]
+
+Thu Jan 17 22:10:35 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make): Remove
+	  .time dependency from *.rb install target. It causes needless
+	  *.rb install. [Bug #7698] [ruby-core:51437]
+	  Reported by Tadashi Saito. Thanks!!!
+	* test/rubygems/test_gem_installer.rb
+	  (TestGemInstaller#test_install_extension_and_script): Add a test
+	  for the above change.
+
+Thu Jan 17 21:08:20 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* eval.c: Fix a typo in ruby_finalize() documentation.
+
+Thu Jan 17 20:28:18 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* object.c: Typo in Kernel#hash documentation.
+	  Patch by zed_0xff [Github Fixes #237]
+
+Thu Jan 17 10:48:56 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: use constants rather than
+	  calculating Inf and NaN.
+
+Thu Jan 17 10:21:05 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/miscellaneous.rdoc:  Added Ending an Expression and
+	  indentation.
+
+Thu Jan 17 09:30:21 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Untaint string when checking output
+	  for $SAFE=1
+
+	* lib/rubygems/specification.rb:  Keep previously loaded specs as
+	  active.  This prevents double loading when refreshing the gem list.
+	* test/rubygems/test_gem.rb:  Test for above
+
+	* lib/rubygems.rb:  Bump version to 2.0.0.rc.2
+
+Thu Jan 17 09:08:37 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/control_expressions.rdoc:  Added ? : ternary if
+
+Thu Jan 17 08:36:04 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/miscellaneous.rdoc:  Added documentation for alias, undef,
+	  BEGIN, END.
+	* doc/syntax/modules_and_classes.rdoc (Constants):  Fixed unwrapped
+	  paragraph with trailing whitespace.
+	* doc/syntax/modules_and_classes.rdoc (Scope):  Added section pointing
+	  to alias and undef documentation.
+	* doc/syntax.rdoc:  Added link to miscellaneous section.
+
+Thu Jan 17 07:50:26 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/control_expressions.rdoc (Flip-Flop):  Added a section on
+	  the flip-flop.
+
+Thu Jan 17 06:59:51 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/control_expressions.rdoc (if Expressions):  Fixed markup
+	  error.  Fixes #235 on github by FlyingFoX.
+
+Thu Jan 17 06:53:58 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/literals.rdoc (Strings):  Fixed typo.  Fixes #236 on
+	  github by Doug Yun.
+
+Wed Jan 16 18:45:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32ole/lib/win32ole.rb: use TracePoint to hook all thread
+	  creation not only by Thread.new and to get rid of interference with
+	  svar scope.  [Bug #7681] [ruby-core:51365]
+
+Wed Jan 16 09:35:53 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* .document:  Removed extra space
+	* lib/irb/lc/.document:  Hide help-message
+	* lib/minitest/.document:  Hide README.txt
+	* lib/rake/lib/.document:  Hide project.rake
+	* lib/rdoc/generator/template/json_index/.document:  Hide JavaScript
+	  files
+	* lib/rubygems/ssl_certs/.document:  Hide PEM files.
+
+Wed Jan 16 03:54:28 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/control_expressions.rdoc:  Omit optional "then" for if and
+	  unless expressions.  Improved description of "a if a = 0.zero?"
+	  NameError.  Note that "do" for for loop is optional.
+
+Wed Jan 16 03:28:47 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/calling_methods.rdoc:  Link to defining methods.
+	* doc/syntax/methods.rdoc:  Link to calling methods, fixed typo.
+
+Wed Jan 16 03:15:00 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/methods.rdoc:  Fixed link
+	* doc/syntax/modules_and_classes.rdoc:  Fixed link
+	* doc/syntax.rdoc:  Updated with links to the recently added pages
+
+Wed Jan 16 03:05:50 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/control_expressions.rdoc (redo Statement):  Added note
+	  about retry.
+	* doc/syntax/exceptions.rdoc:  Added retry statement
+
+Tue Jan 15 23:12:34 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/vpath.rb (VPath#list): default separator to PATH_SEPARATOR from
+	  configure.in for make, not same name constant of File for use in ruby.
+
+Tue Jan 15 22:30:04 2013  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ext/save-history.rb: identify rightly a status of a
+	  history file that already exists [Bug #7694]. Thanks Nobuhiro IMAI
+	  for this patch.
+
+Tue Jan 15 15:55:28 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/control_expressions.rdoc:  Added description of control
+	  expressions in ruby.
+
+Tue Jan 15 13:33:00 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/methods.rdoc (Method Names):  Added method names including
+	  operator methods.
+	* doc/syntax/methods.rdoc (Return Values):  Added note that assignment
+	  methods ignore return values.
+	* doc/syntax/precedence.rdoc:  Added document describing precedence.
+
+Tue Jan 15 11:49:31 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/methods.rdoc (Block Argument):  Added section on block
+	  argument.  Thanks to Andy Lindeman.
+
+Tue Jan 15 10:54:59 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/calling_methods.rdoc (Arguments):  Added improved
+	  introduction to arguments including passing style and lazy
+	  evaluation.  Thanks to Matt Aimonetti.
+	* doc/syntax/calling_methods.rdoc (Positional Arguments):  Added
+	  description for sending a message to a method with *arguments
+	* doc/syntax/calling_methods.rdoc (Default Positional Arguments):
+	  Added description.  Thanks to Andy Lindeman.
+	* doc/syntax/calling_methods.rdoc (Block Local Arguments):
+	  Added description of block locals.  Thanks to Justin Collins.
+	* doc/syntax/calling_methods.rdoc (Hash to Keyword Arguments):  Added
+	  section describing ** operator.  Thanks  to Justin Collins.
+
+Tue Jan 15 10:40:18 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* test_lazy_enumerator: Test that map & flat_map also require a block
+
+Tue Jan 15 09:22:47 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (gvl_init): Reset gvl.wait_yield explicitly when
+	  fork()ing. Patch by Apollon Oikonomopoulos. Thanks!
+	  [Bug #7693][ruby-core:51424]
+
+Tue Jan 15 09:27:56 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/calling_methods.rdoc (Receiver):  Added :: as pointed out
+	  by Tony Arcieri
+	* doc/syntax/calling_methods.rdoc (Block Argument):  Fixed { } block
+	  examples as pointed out by David Copeland.
+
+Tue Jan 15 09:10:29 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/methods.rdoc (Array/Hash Argument):  Moved above Keyword
+	  Arguments
+	* doc/syntax/methods.rdoc (Keyword Arguments):  Described ** for
+	  gathering arbitrary keyword arguments.
+
+Tue Jan 15 08:56:37 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/calling_methods.rdoc:  Added document describing method
+	  calls.
+
+Tue Jan 15 07:39:21 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/top_level.rb:  Fixed extension trimming for page names in
+	  RDoc HTML output.  [ruby-trunk - Bug #7673]
+	* test/rdoc/test_rdoc_top_level.rb:  Test for above.
+
+Mon Jan 14 23:06:41 2013  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ext/save-history.rb: outputs its history to
+	  owner-only-readable file and change the permission of a file that
+	  already exists [Bug #7694]. Thanks Nobuhiro IMAI for bug reports.
+
+Mon Jan 14 17:12:48 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (lazy_flat_map_func): flat_map should call each only
+	  when the value of a block returns a forcable object.
+	  [ruby-core:51401] [Bug #7690]
+
+	* enumerator.c (lazy_flat_map): add documentation.
+
+	* test/ruby/test_lazy_enumerator.rb: related test.
+
+Mon Jan 14 16:42:28 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* enumerator.c: Require block for Lazy#{take|drop}_while [Bug #7692]
+
+Mon Jan 14 14:41:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_s): use CRuby style.
+
+Mon Jan 14 14:39:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c: use `RB_TYPE_P(x, t)` instead of
+	  `TYPE(x) == t`.
+
+Mon Jan 14 10:18:56 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* enumerator.c: Fix size for Enumerator::Lazy#flat_map
+
+Mon Jan 14 07:12:52 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix/lup_decomposition: Fix bugs with LUP Decomposition of
+	  rectangular matrices. [rubyspec:ba849801a85]
+
+Mon Jan 14 06:46:53 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (add_ctype_to_cc): don't check dup warn on adding
+	  negative ctype to cclass. [Bug #7471] [ruby-core:50344]
+
+Mon Jan 14 06:06:03 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix/eigenvalue_decomposition: Backport bugfix of Jama 1.0.3
+	  [rubyspec:df87040be371]
+
+Sun Jan 13 16:45:00 2013  Zachary Scott <zachary@zacharyscott.net>
+
+	* ext/psych/yaml/scanner.c: Fix typos, patch by James Dabbs
+	  [Github tenderlove/psych#118]
+
+Sun Jan 13 15:00:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_sub):
+	  need to specify precision for converting Rational and Float.
+	  [ruby-dev:46544] [Bug #7404]
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_mult): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_divide): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_divremain): ditto.
+
+	* test/bigdecimal/test_bigdecimal.rb: add tests for the above fixes.
+
+Sun Jan 13 14:48:55 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix/eigenvalue_decomposition: Fix eigensystem with complex
+	  eigenvectors. Patch by pypypy567.
+	  [Bug #7208] [ruby-dev:46251] [rubyspec:242f8e55bd]
+
+	* lib/matrix/lup_decomposition.rb: Fix error for rectangular matrices
+	  [bug#7620] [ruby-core:51118] [rubyspec:41f833ee2]
+
+Sun Jan 13 14:06:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/irb.rb, lib/prime.rb: Typos in overview
+	  Patch by Ershad K [Github Fixes #234]
+
+Sun Jan 13 13:40:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/open3.rb : Typo in Open3 overview. Patch by zed_0xff
+	  [Github Fixes #233]
+
+Sat Jan 12 17:42:00 2013  Kenta Murata  <mrkn@cookpad.com>
+
+	* numeric.c (do_coerce): fix for the exceptions which the coerce
+	  method raises.  The optimization done by r38756 is preserved.
+	  [Bug #7645] [ruby-core:51213]
+
+Sat Jan 12 16:12:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/setup.mak (-runtime-): see msvcrt from link header on mswin
+	  instead of running testing executable file, for cross compiling.
+
+Sat Jan 12 08:58:47 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: merge key values that
+	  contain something besides a hash should be left in tact.
+
+	* test/psych/test_merge_keys.rb: test for change
+
+Sat Jan 12 07:52:47 2013  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_set_byref): support VT_UI8|VT_BYREF,
+	  VT_I8|VT_BYREF in cygwin and mingw.
+
+	* ext/win32ole/win32ole.c (ole_variant2val): ditto.
+
+	* test/win32ole/test_win32ole_variant.rb (test_s_new_with_i8_byref):
+	  ditto.
+
+	* test/win32ole/test_win32ole_variant.rb (test_s_new_with_ui8_byref):
+	  ditto.
+
+Sat Jan 12 02:45:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* man/ruby.1 (options): include --*-encoding from r38784
+
+Fri Jan 11 23:34:48 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ruby.c (usage): sort --*-encoding in help. (same order of -E)
+
+Fri Jan 11 16:56:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkconfig.rb: use configured libdir value to fix
+	  --enable-load-relative on systems where libdir is not default value,
+	  overridden in config.site files.  [ruby-core:47267] [Bug #6903]
+
+Fri Jan 11 11:59:32 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (dispose_string): use rb_str_free for freeing string in
+	  parse.y. by Sokolov Yura <funny.falcon@gmail.com>
+	  https://github.com/ruby/ruby/pull/87 fix GH-87
+
+Fri Jan 11 09:56:22 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* insns.def (defineclass): private constants should not be accessed
+	  by scoped module definitions.  The bug was introduced in r38495.
+
+	* test/ruby/test_module.rb: related test.
+
+Fri Jan 11 02:11:59 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/rbconfig/obsolete.rb (respond_to_missing?): use send because
+	  RbConfig.respond_to_missing? is now private.
+
+Thu Jan 10 22:00:58 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h (VM_DEBUG_BP_CHECK): set 0 as default.
+	  This flag specifies checking BP consistency on each frame popping.
+	  Now, we don't have any trouble on it, so I remove it.
+	  If you feel any bugs about VM execution, then set it to 1.
+
+Thu Jan 10 21:03:05 2013 TAKANO `takano32' Mitsuhiro <tak@no32.tk>
+
+	* cont.c: define FIBER_USE_NATIVE as 0 in ia64.
+
+Thu Jan 10 19:39:05 2013  TAKANO `takano32' Mitsuhiro <tak@no32.tk>
+
+	* thread.c: fix RB_GC_SAVE_MACHINE_REGISTER_STACK define for ia64.
+
+Thu Jan 10 17:45:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, win32/Makefile.sub ($(MKFILES)): continue if Makefile
+	  unchanged.
+
+Thu Jan 10 16:31:20 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_search_super_method): raise a TypeError
+	  instead of a NotImplementedError if self is not an instance of the
+	  current class.  [ruby-dev:39772] [Bug #2402]
+
+Thu Jan 10 16:47:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/extconf.rb (find_tcltk_header): use have_header instead of
+	  try_cpp, which is incredibly slow with VC.
+
+Thu Jan 10 15:55:28 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* numeric.c (do_coerce): remove an unused variable.
+
+Thu Jan 10 15:35:55 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* tool/gen_dummy_probes.rb: remove comments in probes.d to fix the
+	  compilation error introduced by r38755.
+
+Thu Jan 10 11:15:04 2013  Kenta Murata  <mrkn@cookpad.com>
+
+	* numeric.c (do_coerce): speed optimization by using rb_check_funcall
+	  instead of rb_rescue + rb_funcall.
+	  This fix is based on the patch by Benoit Daloze.
+	  [Bug #7645] [ruby-core:51213]
+
+Thu Jan 10 11:15:04 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* probes.d: updating probes to be more symmetrical, adding
+	  documentation.
+
+	* load.c: ditto
+
+Thu Jan 10 04:23:07 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: strip trailing dots from
+	  floats so that Float() will not raise an exception.
+
+	* test/psych/test_numeric.rb: test to ensure "1." can be loaded
+
+	* test/psych/test_string.rb: make sure "1." can round trip
+
+Thu Jan 10 03:38:40 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: ascii only binary strings
+	  will be dumped as unicode.  Thanks Paul Kunysch!
+
+	* test/psych/test_string.rb: appropriate test
+
+Thu Jan 10 03:29:55 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (compile_array_): modify wrong optimization.
+	  A script "[print(1)]; print(2)" should output "12".
+	  However, the compiler had eliminated "[print(1)]" expression
+	  because it is void expression (unused array).
+	  Of course, side-effect should be remained.
+	  This issue is reported by Masaya Tarui.
+
+	* bootstraptest/test_literal.rb: add a test.
+
+Wed Jan  9 22:07:42 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* load.c (load_lock): if thread shield is destroyed and there is no
+	  waiting thread, insert new thread shield into load_table.
+	  [Bug #7530] [ruby-core:50645]
+
+Wed Jan  9 21:43:32 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* load.c (load_lock): revert r38744. it should acquire new thread
+	  shield.
+
+Wed Jan  9 15:40:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (th_init, ruby_thread_init): initialize root_svar with Qnil,
+	  since lep_svar_place() expects uninitialized svar to be nil, not 0.
+
+Wed Jan  9 13:20:23 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* test/ruby/test_require.rb: improve test for r38744.
+	  fix to use Tempfile instead of temporary file in current directory.
+	  the patch is from nobu (Nobuyoshi Nakada).
+
+Wed Jan  9 09:53:23 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* load.c (load_lock): fix not to delete thread shield twice.
+	  it may break the shield locked by another thread.
+	  [Bug #7530] [ruby-core:50645]
+
+	* test/ruby/test_require.rb: a test for above.
+
+Wed Jan  9 02:13:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RBasic): to be aligned on a VALUE size
+	  boundary.  [Bug #7647]
+
+Tue Jan  8 14:41:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_iseq_t): move flip_cnt from struct iseq_compile_data,
+	  because it has same life span as enclosing iseq.  [Bug #7671]
+	  [ruby-core:51296]
+
+Mon Jan  7 23:43:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (rmpd_power_by_big_decimal):
+	  add RB_GC_GUARD to prevent the intermediate object is GCed too early.
+	  This patch was made by Yusuke Endoh.  [Bug #7044] [ruby-core:47632]
+
+	* test/bigdecimal/test_bigdecimal.rb: add a reproduction test for
+	  the issue [Bug #7044]
+
+Mon Jan  7 21:40:36 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (Init_eval_method): main.public and main.private
+	  should be private.
+
+	* proc.c (Init_Proc): main.define_method should be private.
+
+	* test/ruby/test_module.rb: related test.
+
+Mon Jan  7 20:48:47 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (Init_eval): main.include should be private.
+	  [ruby-core:51293] [Bug #7670]
+
+	* test/ruby/test_module.rb (test_top_include_is_private): a new test
+	  for the above change.
+
+Mon Jan  7 20:29:50 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* NEWS: remove description about `require "refinement"'.
+
+Mon Jan  7 20:15:49 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (Init_eval): enable Refinements by default.
+	  [ruby-core:51286] [Bug #7667]
+
+	* eval.c (rb_mod_refine, top_using): show a warning when
+	  Module#refine or main.using is called at the first time.
+
+	* ext/refinement/*: removed the extension library "refinement".
+
+	* test/ruby/test_refinement.rb: fix for the above changes.
+
+Mon Jan  7 17:34:22 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h (RUBY_EVENT_SPECIFIED_LINE): make it special.
+	  This flag is not contained by RUBY_EVENT_TRACEPOINT_ALL.
+	  This event is experimental one. It is possible to remove/rename
+	  flag name after 2.0.1.
+
+	* vm_trace.c (get_event_id): return :line if SPECIFIED_LINE was
+	  occurred. `:specified_line' never been returned.
+
+Mon Jan  7 15:42:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_kwrest): allow bare kwrest_mark as valid syntax.  its
+	  semantics is still undefined.  [Bug #7662] [ruby-core:51269]
+
+Mon Jan  7 15:31:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_kwrest): reject duplicated kwrest argument name.
+
+Mon Jan  7 15:24:10 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (rb_threadptr_exec_event_hooks_orig): pop tag before
+	  JUMP_TAG() if frame is `finish' frame.
+	  Without this patch, there is an inconsistency between control
+	  frame stack and tags stack.
+	  [Bug #7668]
+
+	* test/ruby/test_settracefunc.rb: add a test for above.
+
+Mon Jan  7 15:21:48 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* Makefile.in, common.mk (fake, yes-fake, no-make): these dependencies
+	  are not platform dependent.
+
+	* win32/Makefile.sub ($(arch)-fake.rb): workaround.
+
+Mon Jan  7 12:09:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_callee_setup_arg_complex, vm_yield_setup_block_args):
+	  set keyrest hash after making rest array, so that the last element
+	  will not be overwritten.  [ruby-core:51278] [Bug #7665]
+
+Mon Jan  7 09:37:24 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* NEWS: add a NEWS entry about RubyVM.
+
+Sun Jan  6 19:06:57 2013  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* win32/Makefile.sub: Fix build with VC.
+	  Patch by Charlie Savage. Fixes [ruby-core:51261]
+
+Sun Jan  6 18:43:48 2013  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* bootstraptest/test_io.rb: add a test for [ruby-dev:46834].
+
+	* io.c (rb_cloexec_fcntl_dupfd) Use an emulation with dup(2) when
+	  fcntl(2) and/or F_DUPFD is unavailable.
+	  Suggested by akr.
+
+	* configure.in (HAVE_FCNTL): NativeClient does not provide fcntl(2).
+
+Sun Jan  6 11:11:26 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/modules_and_classes.rdoc:  Fixed typo.
+
+Sun Jan  6 05:35:18 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/modules_and_classes.rdoc:  Added singleton classes
+	  documentation.
+
+Sun Jan  6 02:22:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/webrick/httpservlet/abstract.rb (WEBrick::HTTPServlet): Typo in
+	  example. Patch by shlensky [Fixes #232 on github]
+
+Sat Jan  5 21:15:10 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/generic_request.rb:
+	  Amazon ECA API and GTE/1.3 disallow requests whose host has port
+	  number if its port number equals to default port number of the
+	  scheme. [Bug #7650]
+
+Sat Jan  5 13:58:59 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/modules_and_classes.rdoc:  Improved description of methods
+	  on a module or class as suggested by Tobias Buhlmann
+
+Sat Jan  5 13:38:07 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* string.c (rb_str_enumerate_lines): fix invalid byte sequence error
+	  when a separator is passed. The patch is from yoshidam (Yoshida
+	  Masato).
+	  [Bug #7646] [ruby-dev:46827]
+
+	* test/ruby/test_string.rb: a test for above.
+
+Sat Jan  5 12:25:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err):
+	  check stdout and stderr both.
+
+Sat Jan  5 10:21:54 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/modules_and_classes.rdoc:  Added documentation of syntax
+	  for Modules and Classes.
+	* doc/syntax/methods.rdoc:  Moved some text to the Modules and
+	  Classes syntax document.
+
+Sat Jan  5 08:38:27 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/methods.rdoc:  Added return values and scope sections,
+	  slightly modified from the original patch.  Fixes #227 from github by
+	  Dave Brown.
+
+Sat Jan  5 08:21:41 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_cloexec_fcntl_dupfd): improve #ifdef condition.
+	* io.c (rb_maygvl_fd_fix_cloexec): ditto.
+
+Sat Jan  5 07:54:59 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/cleanup_command.rb:  Clean all possible gems
+	  using multiple passes.  Fixes RubyGems bug #422.  Refactored for
+	  maintainability.
+	* test/rubygems/test_gem_commands_cleanup_command.rb:  Test for above.
+
+Sat Jan  5 05:04:39 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* gc.c (vm_xrealloc): add a few comment why we avoid realloc(ptr,0).
+
+Fri Jan  4 20:17:06 2013  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* Makefile.in (RBCONFIG): Moved from common.mk in order to use the
+	  variable in Makefile.in.
+
+	* win32/Makefile.sub (RBCONFIG): Ditto.
+
+Fri Jan  4 19:45:50 2013  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* common.mk (run, parse): Use BTESTRUBY instead of MINIRUBY to handle
+	  cross-compiling cases, e.g. NativeClient.
+
+Fri Jan  4 17:58:16 2013  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* common.mk (yes-btest): btest depends on also $(arch)-fake.rb and
+	  rbconfig.rb on building for NativeClient.
+
+	* Makefile.in (fake): Avoid generating $(arch)-fake.rb unless cross
+	  compiling.
+
+	* configure.in (CROSS_COMPILING): New substitution.
+
+Fri Jan  4 16:26:45 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/doctor.rb:  Process directories in order in case the
+	  filesystem doesn't.  [ruby-trunk - Bug #7618]
+
+	  Process specifications before other directories in case of bugs.
+	* test/rubygems/test_gem_doctor.rb:  Test for above.
+
+	* lib/rubygems.rb:  Updated version.
+
+	* test/rubygems/test_require.rb:  Fixed double require of
+	  benchmark.rb.  RubyGems bug #420.
+
+	* test/rubygems/test_gem_commands_check_command.rb:  Fixed unused
+	  variable warnings.
+	* test/rubygems/test_gem_commands_query_command.rb:  ditto
+	* test/rubygems/test_gem_installer.rb:  ditto
+
+Fri Jan  4 15:05:25 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/cross_reference.rb:  Fixed matching of C#=== or #===.  RDoc
+	  bug #164
+	* test/rdoc/test_rdoc_cross_reference.rb:  Test for above.
+
+	* lib/rdoc/parser/changelog.rb:  Fixed parsing of dates.  RDoc bug #165
+	* test/rdoc/test_rdoc_parser_changelog.rb:  Test for above.
+
+	* lib/rdoc/parser.rb:  Fixed parsing multibyte files with incomplete
+	  characters at byte 1024.  [ruby-trunk - Bug #6393]
+	  Fixed handling of -E.  [ruby-trunk - Bug #6392]
+	* test/rdoc/test_rdoc_options.rb:  Test for above.
+	* test/rdoc/test_rdoc_parser.rb:  ditto.
+	* test/rdoc/test_rdoc_parser_c.rb:  ditto.
+	* test/rdoc/test_rdoc_parser_changelog.rb:  ditto.
+	* test/rdoc/test_rdoc_parser_markdown.rb:  ditto.
+	* test/rdoc/test_rdoc_parser_rd.rb:  ditto.
+	* test/rdoc/test_rdoc_rdoc.rb:  ditto.
+
+	* lib/rdoc/tom_doc.rb:  Fixed parsing of [] in TomDoc arguments list.
+	  RDoc bug #167
+	* test/rdoc/test_rdoc_tom_doc.rb:  Test for above.
+
+	* lib/rdoc.rb:  Update version.
+
+Fri Jan  4 11:51:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/forwardable.rb: Fix rdoc parameters for ::def_single_delegator.
+	  Patch by Vladimir Andrijevik [Github Fixes #230]
+
+Fri Jan  4 00:35:11 2013  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	Fix failures on btest for NativeClient.
+	* bootstraptest/runner.rb (nacl?): New method to distinguish NaCl
+	  cross build.
+
+	* bootstraptest/test_io.rb: Skip unsupported operations.
+
+	* bootstraptest/test_literal.rb: ditto.
+
+Fri Jan  4 00:29:40 2013  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* io.c (rb_cloexec_fcntl_dupfd): Fix failures in
+	  bootstrap_test/test_io.rb.  NativeClient does not support F_DUPFD
+	  but supports dup2(2).
+
+Thu Jan  3 17:46:50 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/element.rb (REXML::Elements#add): Remove too much
+	  "elements" in document. Sorry...
+
+Thu Jan  3 17:42:32 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/element.rb (REXML::Elements#each): Add missing
+	  "elements" in document. [ruby-talk:402713]
+	  Reported by Wesley Rishel. Thanks!!!
+
+Thu Jan  3 15:13:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/psych/lib/psych.rb (Psych.load): Return value of
+	  Psych::SyntaxError.message should be same as example.
+	  Patch by Ippei Obayashi [ruby-core:51193] [Bug #7636]
+
+Thu Jan  3 14:58:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/forwardable.rb (SingleForwardable): Fix example in overview
+	  Patch by Vladimir Andrijevik [Github Fixes #231]
+
+Thu Jan  3 14:32:47 2013  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* configure.in (OBJCOPY):  Fixes build error for NativeClient.
+	  Avoid disabling OBJCOPY for NativeClient.
+
+	* thread_pthread.c (rb_reserved_fd_p): USE_SLEEPY_TIMER_THREAD is
+	  always defined.  Fixes compilation error for NativeClient.
+
+Wed Jan 02 03:09:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/zlib/zlib.c (Zlib::GzipReader): Fix typo by zed_0xff
+	  [Fixes Github #229]
+
+Wed Jan 02 02:29:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* hash.c (rb_hash_update): Revert documentation from r38672
+	  See: https://github.com/ruby/ruby/pull/228#issuecomment-11791013
+
+Wed Jan 02 02:16:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* hash.c (rb_hash_update): Documentation for Hash#merge and shallow
+	  copies Patch by Yorick Peterse [Fixes Github #228]
+
+Mon Dec 31 15:10:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* vm_backtrace.c: Add documentation for Kernel#caller_locations,
+	  Kernel#caller, and Thread::Backtrace::Location
+
+Mon Dec 31 13:05:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* test/ruby/test_backtrace.rb: Add test for r37957 [Feature #7434]
+
+Sun Dec 30 23:33:36 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (simple_re_meta): escaped closing parenthesis has different
+	  meaning.  [Bug #7610] [ruby-core:51088]
+
+Sun Dec 30 12:09:47 2012  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* configure.in: use 4 argument form of AC_CHECK_HEADERS to force
+	  autoconf to use compiler's result
+
+Sun Dec 30 10:58:04 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* test/ruby/test_keyword.rb: add a test for passing hash
+	  as a last argument. [ruby-dev:46712] [Bug #7529]
+
+Sun Dec 30 10:51:29 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_insnhelper.c: set keyword hash on Proc/block calls.
+	  [ruby-core:51172] [Bug #7630]
+
+	* test/ruby/test_keyword.rb: add tests for above.
+
+Sat Dec 29 21:57:11 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/completion.rb: treat rightly completion for symbol on irb
+	  [Bug #7632].
+
+Sat Dec 29 21:51:30 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/curses/curses.c (window_cury, window_curx, window_maxy,
+	  window_maxx, window_begy, window_begx): use RB_UNUSED_VAR()
+	  to suppress unused-but-set-variable warnings.
+
+Sat Dec 29 16:45:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* iseq.c (RubyVM::InstructionSequence): rdoc formatting
+
+Sat Dec 29 15:28:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* iseq.c (RubyVM::InstructionSequence):	Add rdoc for new iseq features
+	  added from r38085, this includes ::of, #path, #absolute_path,
+	  #label, #base_label, #first_lineno, and #inspect
+
+Sat Dec 29 14:06:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* iseq.c (rb_iseq_line_trace_all, rb_iseq_line_trace_specify): Add
+	  rdoc for experimental C level api of iseq, from r38076
+
+Sat Dec 29 11:37:36 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_obj_clone): attach clone to its singleton class during
+	  cloning singleton class so that singleton_method_added will be called
+	  on it.  based on the patch by shiba (satoshi shiba)[Bug #5283] in
+	  [ruby-dev:44477].  [Bug #5283]
+
+Sat Dec 29 10:10:39 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (crt_externs.h): use standard macro AC_CHECK_HEADERS.
+
+Fri Dec 28 23:12:44 2012  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* configure.in: check for the whether crt_externs.h is present when compiling
+	  for darwin (this header is missing in the iOS SDK)
+	* eval_intern.h: check HAVE_CRT_EXTERNS_H before including crt_externs.h, if
+	  not defined, include missing/crt_externs.h instead
+	* hash.c: ditto
+	* missing/setproctitle.c: ditto
+	* missing/crt_externs.h: declare _NSGetEnviron() function and define environ
+	  for iOS
+
+Fri Dec 28 21:40:36 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/context.rb: IRB::Context#new: Check from JobManager
+	  inside IRB namespace [Bug #7628]. Thanks rafaelfranca for bug
+	  report and its patch.
+
+Fri Dec 28 17:06:17 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el (ruby-electric-curlies): Automatically
+	  indent closing curly brackets when
+	  ruby-electric-newline-before-closing-bracket is true.
+
+Fri Dec 28 11:50:42 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_yield_setup_block_args): pass single argument to
+	  single optional parameter unchanged without splatting.  [Bug #7621]
+	  [ruby-dev:46801]
+
+Fri Dec 28 11:17:47 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* proc.c (method_eq): fix the documentation to refer to owner.
+	  [ruby-core:51105] [Bug #7613]
+
+	* test/ruby/test_method.rb (test_alias_onwer): new test to confirm
+	  that `a == b' returns false if owners of a and b are different.
+
+Fri Dec 28 07:07:43 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* def/id.def: use split(/^/) instead of String#lines to support
+	  Ruby 1.8.5 as BASERUBY.
+
+Thu Dec 27 21:56:56 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* variable.c (rb_mod_remove_const): fix segv caused by r38558.
+
+Tue Dec 28 01:13:48 2012  James Edward Gray II  <james@graysoftinc.com>
+
+	* lib/csv.rb: Added more Hash methods to CSV::Row.
+
+Thu Dec 27 23:27:15 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ruby-lex.rb: make lex_state to EXPR_END when next token
+	  is an operator after SYMBEG [Bug #6378].
+
+Thu Dec 27 21:30:21 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ruby-lex.rb: allow to handle recursive heredocs on
+	  irb[Bug #5648].
+
+Thu Dec 27 20:45:29 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* ext/stringio/stringio.c (strio_getline): fix not to raise TypeError
+	  when limit is nil.
+	  [Bug #7232] [ruby-core:48531]
+
+	* test/stringio/test_stringio.rb: a test for above.
+
+Thu Dec 27 21:08:23 2012  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* vm_core.h (VM_DEFINECLASS_TYPE): explicit cast to enum type to avoid 64->32
+	  shorten warning
+
+Thu Dec 27 20:11:29 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* ext/stringio/stringio.c (strio_ungetc): raise IOError instead of RuntimeError
+	  if the string is frozen.
+	  [Bug #7231] [ruby-core:48530]
+
+	* ext/stringio/stringio.c (strio_ungetbyte): ditto.
+
+	* test/stringio/test_stringio.rb: a test for above.
+
+Wed Dec 26 23:55:18 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/context.rb: fix IRB::Inspector#keys_with_inspector [Bug #7598]
+
+Wed Dec 26 23:26:15 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/context.rb: IRB::Context#use_readline= has been obsolete
+	  [Bug #6339].
+
+Wed Dec 26 21:32:46 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/context.rb: make a correct prompt from
+	  IRB.conf[:IRB_NAME] on irb [Bug #6338]. Patched by sho-h.
+
+Wed Dec 26 21:09:19 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ext/math-mode.rb: make not able to change math-mode
+	  after irb starting [Bug #6302]. Patched by sho-h.
+
+Wed Dec 26 12:52:36 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/init.rb: change default debug level for
+	  irb[ruby-dev:46805], [Bug #6301].
+
+Wed Dec 26 11:54:11 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: enable -fPIE when checking -pie for fixing
+	  OpenBSD build error. Patch by George Koehler. Thank you!
+	  [Bug #7606] [ruby-core:51082]
+
+Wed Dec 26 07:31:24 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_enc_cr_str_copy_for_substr): empty string is always
+	  valid or 7bit.
+
+	* string.c (rb_str_enumerate_lines, rb_str_chop): reduce duplicated
+	  code.
+
+	* string.c (rb_str_enumerate_chars): prevent shared copy from GC.
+
+Wed Dec 26 01:31:16 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/init.rb, lib/irb/context.rb: fix conf.debug_level=
+	  [Bug #6301] and fix irb command option: -- irb_debug_level for irb.
+
+Wed Dec 26 00:59:18 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ruby-lex.rb: improve RubyLex performance for large files
+	  [Bug #5202]. Patch by ryanmelt.
+
+Tue Dec 25 22:21:06 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/output-method.rb: raise right exception when
+	  IRB::OutputMethod#print don't defined [Bug #6657].
+
+Tue Dec 25 22:06:33 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (rb_threadptr_exec_event_hooks_and_pop_frame):
+	  pop a frame before JUMP_TAG() if exception occurred.
+	  This change fix bug of Ruby 1.9.
+	  [ruby-core:51128] [ruby-trunk - Bug #7624]
+
+	* vm_core.h (EXEC_EVENT_HOOK_AND_POP_FRAME): add to use
+	  `rb_threadptr_exec_event_hooks_and_pop_frame()'.
+
+	* vm.c (vm_exec): use EXEC_EVENT_HOOK_AND_POP_FRAME() while
+	  exception handling. While exception handling, if an exception
+	  is raised in hooks, need to pop current frame and raise this
+	  raised exception by hook.
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+Tue Dec 25 21:08:53 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/init.rb, lib/irb/lc/ja/error.rb, lib/irb/lc/error.rb:
+	  raise exception when illegal RC_NAME_GENERATOR defined [Bug #6455].
+
+Tue Dec 25 19:22:17 2012  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/workspace.rb: define method to private on top-level irb
+	  [Bug #5776]. Patch by davidbalbert.
+
+Tue Dec 25 19:09:51 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bignum.c, include/ruby/intern.h (rb_big_eql): exported.
+
+	* thread.c (recursive_check): object_id maybe a Bignum, not Fixnum on
+	  LLP64.  see also r38493 and r38548.
+	  reported by Heesob Park at [ruby-core:51083] [Bug #7607], and patched
+	  by shirosaki at [ruby-core:51095]
+
+Tue Dec 25 18:53:35 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h, eval_intern.h (CHECK_STACK_OVERFLOW): move
+	  CHECK_STACK_OVERFLOW() to vm_core.h and rename to
+	  CHECK_VM_STACK_OVERFLOW().
+	  This change is only move and rename.
+
+	* tool/instruction.rb: catch up above changes.
+
+	* vm.c, vm_insnhelper.c: ditto.
+
+	* vm_insnhelper.c (vm_stackoverflow): add a function to unify
+	  raising vm stackoverflow exception.
+
+Tue Dec 25 16:16:54 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h (RUBY_VM_THREAD_VM_STACK_SIZE): change default
+	  VM stack size (128 KB or  256 KB -> 512 KB or 1024 KB).
+	  This re-sizing corrects smaller value introduced at r38478.
+	  Newer value is same VM stack size of Ruby 1.9.
+	  [ruby-dev:46797] [ruby-trunk - Bug #7603]
+
+Tue Dec 25 13:38:12 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (compile_err_append, compile_warn_print, warn_print): use
+	  rb_write_error_str() instead of writing to rb_stderr directly.
+
+	* io.c (rb_write_error_str): a stopgap measure not to unblock GVL.
+	  warning from require seems to still have race condition errors.
+
+Tue Dec 25 00:59:29 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.h (NODE_OP_CDECL), compile.c (iseq_compile_each),
+	  parse.y (stmt, arg): allow scoped constant op-assignment.
+	  [ruby-core:40154] [Bug #5449]
+
+Mon Dec 24 04:56:48 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/generic_request.rb (Net::HTTPGenericRequest):
+	  set content-length to zero on empty post requests
+	  by Gregory Ostermayr <gregory.ostermayr@gmail.com>
+	  https://github.com/ruby/ruby/pull/201 fix GH-201
+
+Sun Dec 23 19:09:16 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c: rename methods:
+	    from Thread.async_interrupt_timing to Thread.handle_interrupt,
+	    from Thread.async_interrupted? to Thread.pending_interrupt?.
+	  Also rename option from `defer' to `never'.
+	  [ruby-core:51074] [ruby-trunk - Feature #6762]
+
+	* vm_core.c, thread.c: rename functions and data structure
+	  `async_errinfo' to `pending_interrupt'.
+
+	* thread.c: add global variables sym_immediate, sym_on_blocking and
+	  sym_never.
+
+	* cont.c, process.c, vm.c, signal.c: ditto.
+
+	* lib/sync.rb, lib/thread.rb: catch up this renaming.
+
+	* test/ruby/test_thread.rb: ditto.
+
+Sun Dec 23 17:57:30 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/profiler.rb (Profiler__::PROFILE_PROC, print_profile): store
+	  profile data per threads for concurrent-execution.
+	  [ruby-core:22046] [Bug #1152]
+
+	* lib/profiler.rb (Profiler__::Wrapper): support calling singleton
+	  methods of an instance of BasicObject.
+
+	* lib/profiler.rb (Profiler__::PROFILE_PROC): use TracePoint.
+
+Sun Dec 23 16:13:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/erb.rb: typos for ERB::new link
+
+Sun Dec 23 16:06:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/erb.rb: Document ERB::new trim_mode '-' for lines ending in -%>
+	  [ruby-core:51084] [Bug #7608]
+
+Sun Dec 23 15:25:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/irb/ruby-lex.rb: Add handling for %i and %I quoting to irb
+	  Patch by flori [ruby-core:49550] [Bug #7392] [Github Issue #157]
+
+Sun Dec 23 15:05:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_check_funcall_with_hook): rb_check_funcall with hook
+	  which is called before calling method_missing or target method.
+
+	* marshal.c (w_object, r_object0): use rb_check_funcall_with_hook
+	  instead of respond_to? and call.
+
+Sun Dec 23 14:52:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* re.c (rb_reg_eqq): doc: #=== is not a synonym for #=~, added example
+	  [ruby-dev:46746] [Bug #7571]
+
+Sun Dec 23 14:35:13 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (BLOCKING_REGION): if fail_if_interrupted is false ignore
+	  the result of blocking_region_begin(), since it always is true in
+	  that case.  suppress "uninitialized" warnings.
+
+Sun Dec 23 09:34:07 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/check_command.rb:  Added --doctor and --dry-run
+	  options to clean up after failed uninstallation.
+	* test/rubygems/test_gem_commands_check_command.rb:  Test for above.
+
+	* lib/rubygems/commands/push_command.rb:  Allow pushes from RubyGems
+	  2.0.0.preview3
+
+	* lib/rubygems/commands/update_command.rb:  Use Gem.ruby_version
+
+	* lib/rubygems/dependency.rb:  Update style.
+
+	* lib/rubygems/installer.rb:  Ensure installed gem specifications will
+	  be useable.  Refactor.
+	* test/rubygems/test_gem_installer.rb:  ditto.
+
+	* lib/rubygems/validator.rb:  Fixed bug with unreadable files.
+
+	* lib/rubygems.rb:  Fixed broken methods.
+	* test/rubygems/test_gem.rb:  Test for above.
+
+	* test/rubygems/test_gem_commands_push_command.rb:  Fixed overridden
+	  Gem.latest_rubygems_version
+
+Sun Dec 23 01:52:01 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* io.c (rb_io_lines, rb_io_bytes, rb_io_chars, rb_io_codepoints):
+	  Deprecate IO#{lines,bytes,chars,codepoints} and those of ARGF.
+	  [Feature #6670]
+
+	* ext/stringio/stringio.c (strio_lines, strio_bytes, strio_chars)
+	  (strio_codepoints): Deprecate
+	  StringIO#{lines,bytes,chars,codepoints}. [Feature #6670]
+
+	* ext/zlib/zlib.c (rb_gzreader_lines, rb_gzreader_bytes):
+	  Deprecate Zlib::GzipReader#{lines,bytes}. [Feature #6670]
+
+Sat Dec 23 01:35:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/optparse.rb: Documentation for OptionParser to remove 'shadowed
+	  outer local variable' from example and make obvious ARGV with
+	  non-option arguments.
+	  Patch by Marcus Stollsteimer [ruby-core:47460] [Bug #6997]
+
+Sat Dec 23 00:08:00 2012  Kenta Murata  <mrkn@mrkn.jp>
+
+	* include/ruby/intern.h: add the prototype declaration of
+	  rb_num_coerce_bit.
+
+	* numeric.c (rb_num_coerce_bit): the new coerce function for bitwise
+	  binary operation.
+
+	* bignum.c (rb_big_and): use coerce to convert the argument, which isn't
+	  a Fixnum nor a Bignum, to the corresponding Integer object so that
+	  bitwise operations can support Integer-mimic objects.
+	  [Bug #1792] [ruby-core:39491]
+
+	* bignum.c (rb_big_or): ditto.
+
+	* bignum.c (rb_big_xor): ditto.
+
+	* numeric.c (bit_coerce): ditto.
+
+	* numeric.c (fix_and): ditto.
+
+	* numeric.c (fix_or): ditto.
+
+	* numeric.c (fix_xor): ditto.
+
+	* test/ruby/test_integer.rb: add tests for the above changes.
+
+	* test/ruby/test_bignum.rb: ditto.
+
+Sun Dec 23 00:04:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (QUOTE, QUOTE_ID): quote unprintable chars in strings and
+	  IDs. [Bug #7574] [ruby-dev:46749]
+
+	* string.c (rb_str_quote_unprintable): ditto.
+
+Sat Dec 22 23:59:18 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_compile_error, rb_compile_warn, rb_compile_warning),
+	  (rb_warn, rb_warning): support PRIsVALUE.
+
+Sat Dec 22 22:04:58 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* cont.c (rb_fiber_start): unify conditions.
+
+Sat Dec 22 21:47:55 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_wait_writable): use rb_thread_check_ints() instead
+	  of rb_thread_fd_writable().
+	* io.c (rb_io_wait_readable): ditto.
+
+Sat Dec 22 20:31:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_const_get): symbol cannot be nested constant name.
+
+Sat Dec 22 19:26:35 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_const_get): check more strictly.  [ruby-dev:46748]
+	  [Bug #7573]
+
+Wed Dec 19 02:34:48 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* cont.c (rb_fiber_start): in case of jump with TAG_FATAL,
+	  enqueue error into async_errinfo_queue, because you cannot call
+	  TH_TAG_JUMP() in this function. [ruby-dev:45218]  [Bug #5993]
+
+	* thread.c (rb_threadptr_execute_interrupts): now INT2FIX(TAG_FATAL)
+	  can be popped from async_errinfo_queue.
+
+	* vm.c (rb_vm_make_jump_tag_but_local_jump): revert r38441.
+	  rb_vm_make_jump_tag_but_local_jump() shouldn't return exception
+	  in case of state == TAG_FATAL.
+
+	* test/ruby/test_fiber.rb (test_exit_in_fiber): fix a test to illuminate
+	  Thread.exit should terminate current Thread.
+
+Sat Dec 22 13:15:08 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* gc.c (obj_id_to_ref): add a macro to treat Bignum object id.
+	  This follows the change r38493.
+
+	* gc.c (id2ref): fix for working fine with Bignum object id on x64
+	  Windows.
+	* gc.c (wmap_finalize): ditto.
+
+Sat Dec 22 11:30:21 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* struct.c (make_struct): remove junk ID check to allow members who
+	  have junk name like "foo\000".
+	* test/ruby/test_struct.rb: Test for above.
+	  [Bug #7575] [ruby-dev:46750]
+
+Sat Dec 22 05:34:54 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Requests may be created with a URI which sets the
+	  Host header.  Responses contain the requested URI for easier redirect
+	  following.  [ruby-trunk - Feature #6482]
+	* lib/net/http/generic_request.rb:  ditto.
+	* lib/net/http/response.rb:  ditto.
+	* NEWS (net/http):  Updated for above.
+	* test/net/http/test_http.rb:  Tests for above.
+	* test/net/http/test_http.rb:  ditto.
+	* test/net/http/test_httpresponse.rb:  ditto.
+
+Sat Dec 22 02:35:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/irb/slex.rb(#match): Typo, should be D_DETAIL
+	  [ruby-core:51071] [Bug#7600]
+
+Sat Dec 22 02:29:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/irb/input-method.rb, lib/irb.rb: Typo in
+	  InputMethod#readable_atfer_eof? to #readable_after_eof?
+	  [ruby-core:51069] [Bug #7599]
+
+Sat Dec 22 02:19:38 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_dump.c (rb_vm_bugreport): revert r38533.
+	* addr2line.c (fill_lines): add ELF sanity check.
+	  [Bug #7597] [ruby-dev:46786]
+
+Sat Dec 22 02:05:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/irb/inspector.rb, lib/irb/context.rb: Move IRB::INSPECTORS and
+	  class methods to IRB::Inspector [ruby-core:51067][Bug #7598]
+
+Sat Dec 22 00:28:46 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* object.c (rb_obj_hash): shouldn't assume object_id can be long.
+	  based on a patch by Heesob Park at [ruby-core:51060].
+	  cf. [Backport #7454]
+
+Fri Dec 21 23:15:25 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/fiddle/lib/fiddle/struct.rb (Fiddle::CStructEntity#set_ctypes):
+	  CPtr -> Pointer.
+	* test/fiddle/test_c_struct_entry.rb
+	  (Fiddle::TestCStructEntity#test_aref_pointer):
+	  Added the test for the above.
+
+Fri Dec 21 23:12:05 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/fiddle/lib/fiddle/struct.rb (Fiddle::CStructEntity#set_ctypes):
+	  CPtr -> Pointer.
+	* test/fiddle/test_c_struct_entry.rb
+	  (Fiddle::TestCStructEntity#test_aref_pointer_array):
+	  Added the test for the above.
+
+Fri Dec 21 22:43:36 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/fiddle/lib/fiddle/import.rb (Fiddle::Importer#sizeof):
+	  CPtr -> Pointer.
+	* test/fiddle/test_import.rb (Fiddle::TestImport#test_sizeof):
+	  Added the test for the above.
+
+Fri Dec 21 22:34:17 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_iseq.rb: disable a test which checks features
+	  removed at r38532.
+
+Fri Dec 21 22:02:00 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{dir.h,win32.c} (rb_w32_readdir): removed old rb_w32_readdir()
+	  and renamed from rb_w32_readdir_with_enc().
+	  [ruby-core:24864] [Feature #1927]
+
+	* dir.c (READDIR): follow above change.
+
+Fri Dec 21 21:12:54 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* vm_dump.c (rb_vm_bugreport): commentout addr2line call temporarily
+	  in order to avoid segv. anyone can fix addr2line?
+	  [Bug #7597] [ruby-dev:46786]
+
+Fri Dec 21 20:38:28 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (Init_ISeq): remove definition of the following methods:
+	  ISeq#line_trace_all and ISeq#line_trace_specify because they are
+	  half baked.
+	  C APIs are remained as experimental. These functions will be
+	  renamed, removed their parameters may be changed.
+	  You can use these methods by C exts. Please give us your comments.
+
+Fri Dec 21 20:21:04 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (tracepoint_new): add code to support specified thread.
+	  But not tested and this feature is not supported officially.
+
+Fri Dec 21 19:37:15 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* ruby.c (process_options): need to acquire env from TOPLEVEL_BINDING
+	  each time.
+	  `bind->env' may update after `eval()'.
+	   [Bug #7536]
+
+Fri Dec 21 18:46:50 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/debug.h, vm_core.h: define rb_trace_arg_t at
+	  include/ruby/debug.h (move from vm_core.h).
+
+Fri Dec 21 17:48:15 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h, vm_trace.c: fix multi-threading bug for tracing.
+	  Move `trace_arg' from rb_tp_t::trace_arg to rb_thread_t::trace_arg.
+	  `trace_arg' may changed by multiple threads.
+	  rb_thread_t::trace_arg can represent rb_thread_t::trace_running
+	  (null or non-null) and rb_thread_t::trace_running is removed.
+	  After that, `rb_tp_t' is not needed to check tracing or not
+	  (A running thread knows tracing or not). This is why I remove
+	  tp_attr_check_active() and make new function get_trace_arg().
+
+	  And this modification disable to work the following code:
+	    TracePoint.trace{|tp|
+	      Thread.new{p tp.event} # access `tp' from other threads.
+	    }
+	  I believe nobody mix threads at trace procedure.
+	  This is current limitation.
+	  [Bug #7590]
+
+	* cont.c (fiber_switch, rb_cont_call): use rb_thread_t::trace_arg
+	  instead of rb_thread_t::trace_running.
+
+	* test/ruby/test_settracefunc.rb: add a multi-threading test.
+
+Fri Dec 21 16:38:08 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/id.h.tmpl (ID2ATTRSET): compile time constant macro for
+	  ID_ATTRSET.
+
+	* defs/id.def (KeywordError): check duplication.
+
+	* defs/id.def: support for other scope IDs,
+	  ID_{INSTANCE,GLOBAL,CONST,CLASS}.
+
+Fri Dec 21 14:45:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/irb.rb, lib/irb/*: Documentation for IRB
+
+Fri Dec 21 11:31:02 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rake/*:  Updated to rake 0.9.6
+	* doc/rake/*:  ditto
+	* test/rake/*:  ditto
+
+Fri Dec 21 08:56:34 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* vm_trace.c (rb_suppress_tracing): remove unused variable 'vm_tracing'
+
+Fri Dec 21 01:01:45 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* lib/irb/completion.rb (CompletionProc): support completion of
+	  instance variables. [ruby-dev:46710] [Bug #7520]
+
+Thu Dec 20 20:58:25 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* vm_trace.c (rb_suppress_tracing): bugfix for vm->trace_running
+	  counter. And if tracing is already true, vm_trace_running ops is
+	  skipped to control overflow.
+
+Thu Dec 20 18:29:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RTEST, NIL_P): make bare expressions without
+	  outermost parentheses.
+
+Thu Dec 20 17:29:00 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* NEWS: fix the description for Refinements.
+
+Thu Dec 20 16:53:59 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_core.h (rb_vm_defineclass_type_t),
+	  compile.c (iseq_compile_each), insns.def (defineclass): change the
+	  meaning of the third operand of defineclass as follows:
+	    lower 3bits: the type of the defineclass
+	                   0 = class, 1 = singleton class, 2 = module
+	    4th bit: a flag represents whether the defineclass is scoped
+	               0 = not scoped (e.g., class Foo)
+		       1 = scoped (e.g., class Bar::Baz)
+	    5th bit: a flag represents whether the superclass is specified
+	               0 = not specified (e.g., class Foo)
+	               1 = specified (e.g., class Bar < Foo)
+	  If the superclass is specified and is not a class, a TypeError
+	  should be raised.  [ruby-dev:46747] [Bug #7572]
+
+	* test/ruby/test_class.rb: related test.
+
+Thu Dec 20 16:52:37 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* NEWS: announce AEAD encryption support in the OpenSSL extension.
+
+Thu Dec 20 16:40:13 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c (nonspecial_obj_id): VALUE is not compatible with Fixnum on
+	  LLP64 platform, such as 64bit Windows.
+	  reported by Heesob Park at [ruby-core:50255] [Bug #7454], and the
+	  fix is suggested by akr.
+
+Thu Dec 20 16:39:04 2012  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* ext/openssl/ossl_cipher.c: fix errors for installations that do not
+	  feature Authenticated Encryption.
+	* ext/openssl/extconf.rb: detect presence of EVP_CTRL_GCM_GET_TAG to
+	  determine whether Authenticated Encryption can be used.
+	  [Feature #6980] [ruby-core:47426]
+
+Thu Dec 20 15:55:46 2012  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* ext/openssl/ossl.c: do not use FIPS_mode_set if not available.
+	* test/openssl/utils.rb: revise comment about setting FIPS mode to
+	  false.
+	* test/openssl/test_fips.rb: remove tests that cause errors on
+	  ruby-ci.
+	  [Feature #6946] [ruby-core:47345]
+
+Thu Dec 20 15:22:59 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parser/ruby.rb:  Ignore methods defined on constants to
+	  prevent modules with the names of constants from appearing in the
+	  documentation.
+	* test/rdoc/test_rdoc_parser_ruby.rb:  Test for the above.
+
+Thu Dec 20 15:00:33 2012  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* ext/openssl/ossl_cipher.c: add support for Authenticated Encryption
+	  with Associated Data (AEAD) for OpenSSL versions that support the
+	  GCM encryption mode. It's the only mode supported for now by OpenSSL
+	  itself. Add Cipher#authenticated? to detect whether a chosen mode
+	  does support Authenticated Encryption.
+	* test/openssl/test_cipher.rb: add tests for Authenticated Encryption.
+	  [Feature #6980] [ruby-core:47426] Thank you, Stephen Touset for
+	  providing a patch!
+
+Thu Dec 20 12:56:53 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/markup/to_html.rb (class RDoc):  Added current heading and
+	  top links to headings.
+	* lib/rdoc/generator/template/darkfish/rdoc.css:  ditto
+	* test/rdoc/test_rdoc_generator_markup.rb:  Test for above
+	* test/rdoc/test_rdoc_markup_to_html.rb:  ditto
+
+	* test/rdoc/test_rdoc_comment.rb:  Removed trailing whitespace.
+
+Thu Dec 20 11:05:26 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (assert_valid_syntax): move from
+	  test_syntax.rb.
+
+	* test/ruby/envutil.rb (assert_normal_exit): validate syntax before
+	  running because this assertion passes even if the code fails by
+	  SyntaxError.
+
+Thu Dec 20 10:29:58 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_pkey_dh.rb: revert special treatment of
+	  FIPS-capable installations since FIPS mode is now disabled for the
+	  tests.
+
+Thu Dec 20 10:23:12 2012  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* ext/openssl/ossl.c: add OpenSSL.fips_mode= to allow enabling FIPS
+	  mode manually.
+	* test/openssl/utils.rb: turn off FIPS mode for tests. This prevents
+	  OpenSSL installations with FIPS mode enabled by default from raising
+	  FIPS-related errors during the tests.
+	* test/openssl/test_fips.rb: add tests for FIPS-capable OpenSSL
+	  installations.
+	  [Feature #6946] [ruby-core:47345]
+
+Thu Dec 20 06:59:52 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c: support variable VM/Machine stack sizes.
+	  Specified by the following environment variables:
+	    - RUBY_THREAD_VM_STACK_SIZE: vm stack size used at thread creation.
+	      default: 128KB (32bit CPU) or 256KB (64bit CPU).
+	    - RUBY_THREAD_MACHINE_STACK_SIZE: machine stack size used at thread
+	      creation. default: 512KB or 1024KB.
+	    - RUBY_FIBER_VM_STACK_SIZE: vm stack size used at fiber creation.
+	      default: 64KB or 128KB.
+	    - RUBY_FIBER_MACHINE_STACK_SIZE: machine stack size used at fiber
+	      creation. default: 256KB or 256KB.
+	  This values are specified at launched timing. You can not change
+	  these values at running time.
+	  Environ variables are only *hints* because:
+	    - They are aligned to 4KB.
+	    - They have minimum values (depend on OSs).
+	    - Machine stack settings are ignored by some OSs.
+	  Default values especially fiber stack sizes are increased.
+	  This change affect Fiber's behavior:
+	    (1) You can run more complex program on a Fiber.
+	    (2) You can not make many (thousands) Fibers because of
+	        lack of address space (on 32bit CPU).
+	  If (2) bothers you,
+	    (a) Use 64bit CPU with big memory, or
+	    (b) Specify RUBY_FIBER_(VM|MACHINE)_STACK_SIZE correctly.
+	  You need to choose correct stack size carefully. These values
+	  are completely rely on systems (OS/compiler and so on).
+	  [Feature #4614], [Bug #7212]
+
+	* vm_core.h (rb_vm_t::default_params): add to record above settings.
+
+	* vm.c (RubyVM::DEFAULT_PARAMS): add new constant to see
+	  above setting.
+
+	* thread_pthread.c: support RUBY_THREAD_MACHINE_STACK_SIZE.
+
+	* cont.c: support RUBY_FIBER_(VM|MACHINE)_STACK_SIZE.
+
+	* test/ruby/test_fiber.rb: add tests for above.
+
+	* test/ruby/test_thread.rb: ditto.
+
+Thu Dec 20 06:25:44 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_fiber.rb: remove a strange single quote character.
+	  With this character, this script exits by SyntaxError.
+
+Thu Dec 20 01:03:00 2012  Zachary Scott  <zachary@zacharyscott>
+
+	* ext/.document: Add missing ext modules to .document
+	  Patch by Ryunosuke SATO [Fixes Github #224]
+
+Wed Dec 19 23:52:16 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (load_file_internal): use original C string as the filename
+	  for parser.
+	  reported by whiteleaf at [ruby-list:49085] [ruby-dev:46738]
+	  [Bug #7562]
+
+Wed Dec 19 23:36:12 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* marshal.c (marshal_dump, marshal_load): fix SEGV during make rdoc
+	  and test failure in TestMarshal#test_gc and test_context_switch
+	  on SPARC Solaris 10 compiled with Oracle Solaris Studio 12.3.
+	  [Bug #7591] [ruby-dev:46772]
+
+Wed Dec 19 19:34:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_const_get): nul byte is invalid as constant name.
+
+Wed Dec 19 17:54:18 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* vm_trace.c (rb_threadptr_exec_event_hooks): get rid of race
+	  condition. [Bug #7589] [ruby-dev:46763]
+
+Wed Dec 19 16:30:28 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/literals.rdoc:  Added 0d decimal format.  Thanks Nobu!
+
+Wed Dec 19 16:19:36 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/methods.rdoc:  Fixed typo.  Thanks to Josh Susser.
+
+Wed Dec 19 16:18:22 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/query_command.rb:  Refactored to improve
+	  maintainability.
+	* test/rubygems/test_gem_commands_query_command.rb:  Note default gems
+	  in gem list details.
+
+	* lib/rubygems/uninstaller.rb:  Detect all gems for uninstallation.
+	  This allows duplicate installs of default gems to be removed.
+	* lib/rubygems/specification.rb:  Allow use of ::each_spec.
+	* lib/rubygems/test_case.rb:  Added install_default_gems.
+	* test/rubygems/test_gem_commands_uninstall_command.rb:  Moved test
+	  down to the uninstaller tests.
+	* test/rubygems/test_gem_uninstaller.rb:  Test for uninstallation of
+	  default gems and duplicate default gems.
+
+Wed Dec 19 15:23:50 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/methods.rdoc:  Add () around keyword arguments example for
+	  consistency.  Thanks to Josh Susser.
+
+Wed Dec 19 01:51:24 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* vm.c (rb_vm_jump_tag_but_local_jump): remove unnecessary 2nd
+	  argument.
+
+	* load.c (rb_load_internal): ditto.
+
+	* eval_intern.h (rb_vm_jump_tag_but_local_jump): ditto.
+
+Tue Dec 18 18:57:58 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_wait_writable): don't use rb_thread_wait_fd()
+	  because it is for waiting until io readable.
+
+	* io.c (rb_io_wait_writable): always use rb_thread_fd_writable()
+	  instead of bare rb_wait_for_single_fd(). we shouldn't ignore
+	  return value.
+	* io.c (rb_io_wait_readable): ditto. always use rb_thread_wait_fd().
+
+Tue Dec 18 18:55:33 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_wait_fd_rw): fix infinite loop bug.
+	  rb_wait_for_single_fd() never return positive number.
+
+Tue Dec 18 17:24:40 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/encoding.rb:  Do not remove #! line from document when
+	  setting encoding.  This allows ruby executables to be parsed as ruby
+	  files.
+	* test/rdoc/test_rdoc_encoding.rb:  Test for above.
+
+	* lib/rdoc/parser.rb:  Set the parser file name of ruby executables
+	  correctly.
+	* test/rdoc/test_rdoc_parser.rb:  Test for above.
+
+Tue Dec 18 16:46:15 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/literals.rdoc:  Used simplified heredoc example that
+	  doesn't include method definition.  Added heredoc with backticks.
+
+Tue Dec 18 16:38:51 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/store.rb:  Work around RDoc stores from older versions of
+	  RDoc.
+	* test/rdoc/test_rdoc_store.rb:  Test for above.
+
+Tue Dec 18 16:31:20 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/ruby_lex.rb:  Return a TkHEREDOC instead of a TkSTRING when
+	  the heredoc identifier is followed by a line-end.  This allows proper
+	  display of some HEREDOCs in source view.
+	* lib/rdoc/ruby_token.rb:  Added TkHEREDOC
+	* test/rdoc/test_rdoc_ruby_lex.rb:  Test for above.
+
+Tue Dec 18 09:45:14 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* vm.c (rb_vm_make_jump_tag_but_local_jump): take care of the case
+	  TAG_JUMP() with TAG_FATAL (ex. rb_fatal()). [ruby-core:50917]
+	  [Bug #7570]
+
+	* test/ruby/test_fiber.rb (test_fatal_in_fiber): add a test for above.
+
+	* ext/-test-/fatal/extconf.rb, ext/-test-/fatal/rb_fatal.c: ditto.
+
+Tue Dec 18 13:17:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* vm_trace.c (tracepoint_attr_defined_class): Clean up rdoc for
+	  TracePoint#defined_class
+
+Tue Dec 18 12:15:59 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Fixed ruby output of requirements
+	  with multiple version specifiers.
+	* test/rubygems/test_gem_ext_cmake_builder.rb:  Only look for specific
+	  lines in cmake output.  Should fix [ruby-trunk - Bug #7579]
+
+Tue Dec 18 11:45:26 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/literals.rdoc:  Added 0o octal integers.
+
+Tue Dec 18 12:28:52 2012  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* test/openssl/test_ssl.rb: Use :TLSv1_2_client explicitly in
+	  test_tls_v1_2 to prevent upstream bug.
+	  [Bug #7197] [ruby-dev:46240]
+
+Tue Dec 18 11:52:34 2012  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* ext/openssl/lib/ssl.rb: Enable insertion of empty fragments as a
+	  countermeasure for the BEAST attack by default. The default options
+	  of OpenSSL::SSL:SSLContext are now:
+	  OpenSSL::SSL::OP_ALL & ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
+	  [Bug #5353] [ruby-core:39673]
+
+	* test/openssl/test_ssl.rb: Adapt tests to new SSLContext default.
+
+	* NEWS: Announce the new default.
+
+Tue Dec 18 06:36:12 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* method.h: remove `VM_METHOD_TYPE_CFUNC_FRAMELESS' method type.
+	  This method type is for optimized CFUNC such as Fixnum#+ and so on.
+	  This feature is half-baked and no way to use them.
+	  [Background]
+	  Now, VM has opt_plus instructions to optimize `+' methods for
+	  some Classes (such as Fixnum, Float (flonum)). We call this
+	  type of instructions as `specialized instructions'.
+	  This simple technique improve simple program dramatically.
+	  However, we can make specialized instructions for only several
+	  types (classes) and selectors (method names) because a large
+	  instruction will be slow. In other words, this technique has no
+	  extensibility.
+	  To overcome this problem, VM_METHOD_TYPE_CFUNC_FRAMELESS was
+	  introduced (r37198). This type is a variant of CFUNC, but called
+	  their functions directly without building a method frame.
+	  Any CFUNC method can be defined as frameless methods if a method
+	  is not needed to make method frame. Frameless methods are faster
+	  as specialized instructions (a bit slower, but no need to care).
+	  No problem described at
+	  http://charlie.bz/blog/why-do-singleton-methods-make-ruby-slow
+	  because this technique doesn't see class, but see method body
+	  itself. Alias is also no problem.
+	  [Problem]
+	  However, we can't set frameless method type for polymorphic methods
+	  such as Array#[]. Necessity for method frame depends on which
+	  parameter type. For example, Fixnum#+ needs method frame if
+	  coerce is needed. Current VM_METHOD_TYPE_CFUNC_FRAMELESS is not
+	  flexible and need more tuning to introduce it.
+	  Expected behavior of frameless method type may be:
+	    result = optimized_cfunc(params); /* call optimized cfunc */
+	    if (result == Qundef) { result = normal_cfunc(); }
+	  This is why I say this feature is half-baked.
+	  We need to learn primitive method in Smalltalk more.
+	  (I heard this name at RubyConf Taiwan this month. Thanks!)
+	  [Conclusion]
+	  I remove this feature and consider again.
+	  This feature goes to next minor (2.1?).
+	  Nobody may use this feature and there is no compatibility issue.
+
+	* proc.c (rb_method_entry_arity): ditto.
+
+	* vm_eval.c, vm_insnhelper.c, vm_method.c: ditto.
+
+Tue Dec 18 04:58:22 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (fill_id_and_klass): TracePoint#defined_class returns
+	  singleton class. `set_trace_func' passed attached class (which is
+	  attached/modified by singleton class) by 6th block parameter if it
+	  is singleton class. Previous behavior follows this spec.
+	  However, this method named `defined_class' should return singleton
+	  class directly because singleton methods are defined in singleton
+	  class. There are no compatible issue because TracePoint is introduced
+	  after 2.0.
+	  But compatibility with `set_trace_func' is broken. This means that
+	  you can not replace all `set_trace_func' code with TracePoint
+	  without consideration of this behavior.
+	  [Bug #7554]
+
+	* test/ruby/test_settracefunc.rb: change a test to catch up
+	  an above change.
+
+Tue Dec 18 03:03:10 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: speed up node mapping so
+	  common cases are evaluated first.  Thanks Kevin Menard!
+
+Tue Dec 18 02:35:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/optparse.rb: Remove 'developer documentation' section from rdoc
+	  Patch by Marcus Stollsteimer [ruby-core:50526][Bug #7504]
+
+Tue Dec 18 02:35:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/matrix.rb (#lup): typo in example [ruby-core:50946][Bug #7582]
+
+Mon Dec 17 18:03:34 2012  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* class.c (rewrite_cref_stack, clone_method): rewrite a method's cref
+	  stack when cloning into a new class to allow lexical const lookup to
+	  work as expected [ruby-core:47834] [Bug #7107]
+	* test/ruby/test_class.rb (class TestClass): related test
+
+Mon Dec 17 13:56:55 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (io_flush_buffer_sync2): avoid to return 0. because
+	  rb_thread_call_without_gvl2 uses 0 internally.
+	* io.c (io_flush_buffer_async2): adapt the above.
+
+Mon Dec 17 12:05:32 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/methods.rdoc:  Added a description of singleton methods.
+
+Mon Dec 17 11:35:57 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/.document:  Added doc/syntax
+
+Mon Dec 17 11:25:32 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax.rdoc:  Added syntax guide table of contents
+	* doc/syntax/exceptions.rdoc:  Syntax guide for exceptions
+	* doc/syntax/literals.rdoc:  Syntax guide for literals
+	* doc/syntax/methods.rdoc:  Syntax guide for methods
+
+Mon Dec 17 07:59:40 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Updated VERSION
+
+	* test/rubygems/test_gem_installer.rb:  Fixed ambiguous first argument
+	  warning.
+
+	* test/rubygems/test_gem_rdoc.rb:  RDoc generation depends on installed
+	  version of RDoc.
+
+Sun Dec 16 02:04:41 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (rb_sigaltstack_size): cast sysconf() return value
+	  explicitly. Fix compile error on Mac OS X.
+
+Sun Dec 16 00:39:43 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* cont.c (rb_fiber_start): don't enqueue Qnil to async_errinfo_queue.
+	  rb_vm_make_jump_tag_but_local_jump() could return Qnil (ex. when
+	  finished by Thread.exit). [ruby-dev:45218] [Bug #5993]
+
+	* test/ruby/test_fiber.rb (test_exit_in_fiber): add test for it.
+
+Sat Dec 15 23:56:51 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/fiddle/pointer.c (rb_fiddle_ptr2cptr): fix error message
+	  forgotten to be changed from DL to Fiddle.
+
+Sat Dec 15 23:14:32 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (default_handler): remove rb_register_sigaltstack()
+	  call. sigaltstack was already registered when creating threads.
+
+Sat Dec 15 23:08:56 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (rb_sigaltstack_size): new. calculate stack size for
+	  sigsegv handler. enlarge value when x86 or x86_64 on Linux.
+	  Linux has very small MINSIGSTKSZ size (2048 bytes) and
+	  our sigsegv routine need 5KiB at least. [Bug #7141]
+	* internal.h: add declaration of rb_sigaltstack_size().
+	* vm_core.h: remove ALT_STACK_SIZE definition.
+
+	* signal.c (rb_register_sigaltstack): replace ALT_STACK_SIZE with
+	  rb_sigaltstack_size();
+	* gc.c (Init_heap): ditto.
+	* vm.c (th_init): ditto.
+
+Sat Dec 15 18:24:21 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (f_round_common): should check overflow.
+
+Sat Dec 15 18:00:00 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (float_rationalize): reduced.
+
+Sat Dec 15 14:18:44 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (finish_writeconv): uses rb_write_internal2 if
+	  fptr->write_lock have.
+
+Sat Dec 15 13:57:08 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_mutex_owned_p): remove static.
+	* io.c (io_flush_buffer): don't hold mutex if already have.
+	  Now recursive lock may occur when following scenario.
+	  fptr_finalize -> finish_writeconv_sync -> finish_writeconv
+	  -> io_fflush.
+
+Sat Dec 15 13:38:30 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (io_flush_buffer): uses io_flush_buffer_async2 instead of
+	  io_flush_buffer_async.
+	* io.c (io_flush_buffer_async2): new helper function for
+	  io_flush_buffer. It uses rb_thread_call_without_gvl2() instead
+	  of rb_thread_io_blocking_region.
+	* io.c (io_flush_buffer_sync2): new helper function for
+	  io_flush_buffer_async2.
+
+Sat Dec 15 13:04:26 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (internal_write_func2): new helper function for rb_write_internal2().
+	* io.c (rb_write_internal2): new function. it uses
+	  rb_thread_call_without_gvl2() instead of rb_thread_io_blocking_region().
+	* io.c (rb_binwrite_string): uses rb_write_internal2 instead of
+	  rb_write_internal. [Bug #7134]
+
+Sat Dec 15 12:55:29 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_wait_writable): add to call rb_thread_wait_fd()
+	  likes rb_io_wait_readable.
+
+Sat Dec 15 11:54:50 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_wait_writable): don't call rb_thread_fd_writable()
+	  when EINTR. EINTR mean signal interrupt was happen. We don't
+	  need any wait.
+
+Sat Dec 15 11:53:36 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_wait_fd_rw): remove silly rb_thread_alone()
+	  check.
+
+Sat Dec 15 10:22:38 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_polling): revert but deprecate.
+
+	* include/ruby/intern.h (rb_thread_polling): deprecate.
+
+Sat Dec 15 08:37:01 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* test/rubygems/test_gem_ext_cmake_builder.rb (test_self_build):
+	  get rid of false positive.
+
+Sat Dec 15 08:05:56 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_thread.rb (test_uninitialized, test_backtrace,
+	test_thread_timer_and_interrupt, test_thread_join_in_trap,
+	test_thread_join_current, test_thread_join_main_thread,
+	test_main_thread_status_at_exit, test_thread_status_in_trap,
+	test_thread_status_raise_after_kill, test_mutex_owned,
+	test_mutex_owned2): move these tests from TestThreadGroup class
+	  to TestThread because they are not thread group tests.
+
+	* test/ruby/test_thread.rb (test_thread_status_raise_after_kill):
+	  add t.join.
+
+	* test/ruby/test_threadgroup.rb: new file. moved ThreadGroup test
+	  from test_thread.rb.
+
+Sat Dec 15 08:02:11 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_thread.rb (TestThread::Thread::new.): remove
+	  th.abort_on_exception change. Test template shouldn't change
+	  global flag. It prevent to test a normal case.
+
+Sat Dec 15 06:15:14 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* configure.in (HAVE_GCC_ATOMIC_BUILTINS):  Set -march=i486 to enable
+	  __sync_val_compare_and_swap.  Patch by KOSAKI Motohiro.
+	  [ruby-trunk - Bug #7485]
+
+Sat Dec 15 03:42:34 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/.document: add fiddle/pointer.c, fiddle/handle.c, and
+	  fiddle/win32/lib as documentation.
+
+Sat Dec 15 03:06:40 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* file.c (rb_file_flock): use rb_thread_wait_for() instead of
+	  rb_thread_polling(). When getting EAGAIN, we need to wait a
+	  while even if no multi threading.
+	* thread.c (sleep_for_polling, rb_thread_polling) removed.
+
+Sat Dec 15 00:03:31 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (rb_f_kill): remove rb_thread_polling() because this
+	  has no good effect and makes meaningless 100ms delay. 1)
+	  when sending signal to another process, waiting has just silly.
+	  2) when sending signal to current process, 100ms is often not
+	  enough time to wait. It depend on kernel behavior. And,
+	  rb_thread_polling() doesn't make sense anyway. When rb_thread_alone()
+	  is true, it doesn't wait at all and Process.kill() users don't
+	  expect threading changes Process.kill() behavior. [Bug #7560]
+
+Fri Dec 14 17:10:57 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_params): parser_tokline to track the line number at
+	  which token started.  [ruby-dev:46737] [Bug #7559]
+
+	* parse.y (fcall): operation with starting line number.
+
+	* parse.y (command, primary, method_call): point method name line.
+
+	* parse.y (gettable_gen): return token line for __LINE__.
+
+Fri Dec 14 16:56:59 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_super_method): remove volatile introduced
+	  in r38365.
+
+	* vm_insnhelper.c (vm_call_method): use __forceinline to prevent
+	  VC++ to make vm_call_general and vm_call_super_method as the same
+	  method.  Thanks, Heesob Park.  [Bug #7556] [ruby-core:50867]
+
+Fri Dec 14 14:59:14 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
+	  take file and line by using caller_locations if not given.
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
+	  count assertions in separated tests.
+
+Fri Dec 14 14:16:42 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/rubygems_hook.rb:  Fixed generation of documentation.
+	  Disabled rdoc generation by default to match RubyGems defaults.
+	  Reduced diff with RubyGems::RDoc.
+	* test/rdoc/test_rdoc_rubygems_hook.rb:  Tests for the above.
+	* test/rubygems/test_gem_rdoc.rb:  ditto.
+
+	* lib/rdoc/store.rb:  Removed useless variable assignment
+
+Fri Dec 14 13:58:40 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/rdoc_command.rb:  When overwriting
+	  documentation, remove existing documentation first.
+
+	* lib/rubygems/server.rb:  Fixed documentation links.
+	* test/rubygems/test_gem_server.rb:  Test for the above.
+
+	* lib/rubygems/rdoc.rb:  Reduced diff with RDoc::RubyGemsHook
+	* test/rubygems/test_gem_rdoc.rb:  ditto
+
+Fri Dec 14 04:08:05 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
+	  added to execute given test source on separate process,
+	  catch its resulted exception and raise it on main process.
+
+Fri Dec 14 07:43:44 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: quote strings that begin
+	  with non-word characters.  Thanks Alex Tambellini!
+	* test/psych/test_yaml.rb: appropriate test case
+
+Thu Dec 13 23:14:17 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_super_method): a workaround for the
+	  failure of TestRefinement#test_refine_recursion in Windows.
+	  See [ruby-core:50871] for details.
+
+Thu Dec 13 23:10:52  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* object.c (Init_Object): use rb_mod_init_copy for Class#initialize_copy
+	* class.c (rb_class_init_copy): rename to class_init_copy_check, performs type
+	  checks on arguments to prevent reinitialization of initialized class
+	  [ruby-core:50869] [Bug #7557]
+	* class.c (rb_mod_init_copy): use class_init_copy_check if receiver is T_CLASS
+	* test/ruby/test_class.rb (class TestClass): related test
+
+Thu Dec 13 16:53:10 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/class_module.rb:  Fixed duplicate comments for classes and
+	  modules from C.
+	* test/rdoc/test_rdoc_class_module.rb:  Test for the above.
+
+	* lib/rdoc/parser/c.rb:  Reload C variable names to allow proper
+	  updates of an ri store for C files.
+	* lib/rdoc/rdoc.rb:  ditto.
+	* lib/rdoc/store.rb:  ditto.
+	* test/rdoc/test_rdoc_parser_c.rb:  Test for the above.
+	* test/rdoc/test_rdoc_store.rb:  ditto.
+
+Thu Dec 13 14:20:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/irb*: merge doc from doc/irb/ird.rd and improve overall
+	  documentation of IRB
+	* doc/irb/irb.rd: remove stale documentation
+
+Thu Dec 13 14:10:00 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* marshal.c (r_entry0): don't taint classes and modules because
+	  Marshal.load just returns the dumped classes and modules.
+	  [Bug #7325] [ruby-core:49198]
+
+	* test/ruby/test_marshal.rb: related test.
+
+Thu Dec 13 14:10:13 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_require.rb (TestRequire#test_loaded_features_encoding):
+	  need to check compatibility, not equality of encodings.
+
+Thu Dec 13 14:02:15 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_file_join): check encoding compatibility before joining
+	  strings.
+
+Thu Dec 13 13:06:27 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (umethod_bind): allow another form of method transplanting
+	  from a module via UnboundMethod.  [ruby-core:34267][Feature #4254]
+
+Thu Dec 13 12:07:25 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* include/ruby/ruby.h (RB_UNUSED_VAR): new macro to suppress
+	  warnings for unused variables.
+
+	* ext/bigdecimal/bigdecimal.c (ENTER): use RB_UNUSED_VAR() to
+	  suppress annoying warnings by -Wunused-but-set-variable in gcc 4.6.
+
+Thu Dec 13 11:22:33 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* method.h: remove "VM_METHOD_TYPE__MAX" from rb_method_type_t.
+	  rb_method_type_t is not a number and "_MAX" causes misunderstanding.
+
+	* proc.c (rb_method_entry_arity): ditto.
+
+	* vm_eval.c (vm_call0_body): ditto.
+
+	* vm_insnhelper.c (vm_call_method): ditto.
+
+Wed Dec 12 21:40:45 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tmpdir.rb (Dir::Tmpname#create): deal with a prefix name which
+	  starts with tilde as a plain name, not expanding as home directory.
+	  [ruby-core:50793] [Bug #7547]
+
+Wed Dec 12 19:48:59 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: merge JSON 1.7.5.
+	  fix tests and other fixes.
+
+Wed Dec 12 18:30:29 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* class.c (rb_prepend_module): move refined methods from the origin
+	  of a class to the class, because refinements should have priority
+	  over prepended modules.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Wed Dec 12 18:27:09 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (zone_str): lookup or insert by using st_update() at once.
+
+Wed Dec 12 15:30:11 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: add -fno-omit-frame-pointer if libexecinfo is used.
+	  At least on FreeBSD ruby will crash on getting C backtrace
+	  when it is compiled with other than -O0.
+
+	* vm_dump.c: enable backtrace on FreeBSD even if with optimizations.
+
+Wed Dec 12 16:08:04 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rdoc/test_rdoc_rdoc.rb (TestRDocRDoc#test_normalized_file_list_non_file_directory):
+	  use File::NULL for portability if possible.
+
+Wed Dec 12 16:07:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* method.h (rb_method_flag_t): name a magic number for NOEX_SAFE and
+	  NOEX_WITH as NOEX_SAFE_SHIFT_OFFSET.
+
+	* method.h (rb_method_type_t, method_optimized_type): C89 forbids a
+	  comma after the last element in enum.
+
+	* proc.c (rb_method_entry_arity), vm_eval.c (vm_call0_body),
+	  vm_insnhelper.c (vm_call_method): add VM_METHOD_TYPE__MAX case.
+
+Wed Dec 12 14:16:35 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/class_module.rb:  Added RDoc::ClassModule#documented? which
+	  checks comment_location.  Hide RDoc::ClassModule#comment=.
+	* test/rdoc/test_rdoc_class_module.rb:  Test for above.
+
+	* lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml:
+	  Fix display of the table of contents in the sidebar.
+
+	* lib/rdoc/generator/template/darkfish/table_of_contents.rhtml:
+	  Use #comment_location when displaying classes or modules.
+
+	* test/rdoc/test_rdoc_store.rb:  Use comment_location.
+
+Wed Dec 12 13:40:52 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_getivar): no uninitialized instance variables
+	  warnings for non-object if attr method.
+
+Wed Dec 12 06:43:37 2012  Benoit Daloze  <eregontp@gmail.com>
+
+	* iseq.c (rb_iseq_parameters): fix limit for optional arguments.
+
+	* test/ruby/test_keyword.rb: tests for above.
+
+	* vm_core.h (struct rb_iseq_struct): update documentation
+	  with keyword arguments. [Bug #7540] [ruby-core:50735]
+
+Wed Dec 12 03:45:41 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_exec): pass exceptions while handling an exception.
+
+	* vm_trace.c (rb_threadptr_exec_event_hooks): propagate exceptions.
+	  revert r38293 partially.
+
+Wed Dec 12 03:09:05 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sample/test.rb (Progress#initialize): add --verbose option and show
+	  messages in one line unless --verbose is given.
+
+Wed Dec 12 01:47:02 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_using_refinement): make the method table of an iclass
+	  for a refinement that of the refinement, not that of the origin of
+	  the refinement, which is set by rb_include_class_new().  This
+	  change is needed to make module prepend into a refinement work
+	  properly.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Wed Dec 12 01:05:04 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/make-snapshot: add --disable-rubygem to both MINIRUBY and RUBY.
+	  On making miniprelude.c, it seems use MINIRUBY. this fixes #7541
+	  but rubygems also needs to be fixed for older rubies.
+
+Wed Dec 12 00:32:11 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* test/dl/test_func.rb (test_name_with_block, test_bind, test_qsort1):
+	  call unbind to release the callback closure because maximum number
+	  of callbacks is limited to DL::MAX_CALLBACK (== 5) with pure DL
+	  without Fiddle.
+
+Wed Dec 12 00:13:34 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/dl/lib/dl/func.rb (DL::Function#unbind, #bound?): suppress
+	  NoMethodError when Fiddle is available. [ruby-core:50756] [Bug #7543]
+	* test/dl/test_func.rb (test_bound*, test_unbind*): tests for the above.
+
+Tue Dec 11 19:38:37 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/fiddle/function.c (Fiddle::Function.new): new keyword argument
+	  :name to set the name attribute.
+	* ext/fiddle/lib/fiddle/import.rb (import_function, bind_function):
+	  set function name by using the :name keyword argument.
+	  Re-fixes r38243. [ruby-core:50566]
+	* test/fiddle/test_function.rb (test_name): test for the :name keyword
+	  argument and Fiddle::Function#name.
+
+Tue Dec 11 16:57:33 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* common.mk:  Added --pages-dir to rdoc creation.  Now doc/ items show
+	  up at top-level.
+	* .document:  Moved doc/* entries to doc/.document
+	* doc/.document:  ditto
+
+Tue Dec 11 16:44:37 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/options.rb:  Added --page-dir option for moving pages in
+	  doc/ to the top-level.
+	* lib/rdoc/rdoc.rb:  ditto.
+	* test/rdoc/test_rdoc_options.rb:  Test for the above.
+	* test/rdoc/test_rdoc_rdoc.rb:  ditto.
+
+Tue Dec 11 15:24:05 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/pathname/lib/pathname.rb:  Hide private methods from RDoc.
+
+Tue Dec 11 15:11:29 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/make-snapshot (BASERUBY): add --disable-gem to avoid load gems.
+	  [Bug #7541] [ruby-core:50736]
+
+Tue Dec 11 12:00:19 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/dl/win32/extconf.rb: Fix typo
+	  by Santiago Pastorino <santiago@wyeworks.com>
+	  https://github.com/ruby/ruby/pull/221 fix GH-221
+
+Tue Dec 11 01:53:37 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix: alias {row|column}_size to {row|column}_count and use
+	  the latter.
+	  [Bug #7369] [ruby-core:49409]
+
+Tue Dec 11 00:26:58 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* fix the behavior when a module is included into a refinement.
+	  This change is a little tricky, so it might be better to prohibit
+	  module inclusion to refinements.
+
+	* include/ruby/ruby.h (RMODULE_INCLUDED_INTO_REFINEMENT): new flag
+	  to represent that a module (iclass) is included into a refinement.
+
+	* class.c (include_modules_at): set RMODULE_INCLUDED_INTO_REFINEMENT
+	  if klass is a refinement.
+
+	* eval.c (rb_mod_refine): set the superclass of a refinement to the
+	  refined class for super.
+
+	* eval.c (rb_using_refinement): skip the above superclass (the
+	  refined class) when creating iclasses for refinements.  Otherwise,
+	  `using Refinement1; using Refinement2' creates iclasses:
+	  <Refinement2> -> <RefinedClass> -> <Refinement1> -> RefinedClass,
+	  where <Module> is an iclass for Module, so RefinedClass is
+	  searched before Refinement1.  The correct iclasses should be
+	  <Refinement2> -> <Refinement1> -> RefinedClass.
+
+	* vm_insnhelper.c (vm_search_normal_superclass): if klass is an
+	  iclass for a refinement, use the refinement's superclass instead
+	  of the iclass's superclass.  Otherwise, multiple refinements are
+	  searched by super.  For example, if a refinement Refinement2
+	  includes a module M (i.e., Refinement2 -> <M> -> RefinedClass,
+	  and if refinements iclasses are <Refinement2> -> <M>' ->
+	  <Refinement1> -> RefinedClass, then super in <Refinement2> should
+	  use Refinement2's superclass <M> instead of <Refinement2>'s
+	  superclass <M>'.
+
+	* vm_insnhelper.c (vm_search_super_method): do not raise a
+	  NotImplementError if current_defined_class is a module included
+	  into a refinement.  Because of the change of
+	  vm_search_normal_superclass(), the receiver might not be an
+	  instance of the module('s iclass).
+
+	* test/ruby/test_refinement.rb: related test.
+
+Mon Dec 10 18:35:25 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (rb_method_entry_without_refinements): use
+	  rb_resolve_refined_method() to search superclasses if
+	  me->def->orig_me is 0.  This change fixes make test-all
+	  TESTS="json ruby/test_refinement.rb".
+
+	* test/ruby/test_refinement.rb: related test.
+
+Mon Dec 10 17:59:07 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/fiddle/win32/*: library ports from DL to Fiddle.
+
+	* ext/dl/win32/extconf.rb: check fiddle.  often case dl compiled prior
+	  to fiddle, so this change is no meaning.  in most cases, simply
+	  fiddle/win32 overwrite dl/win32.
+
+Mon Dec 10 15:23:35 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_trace.c (rb_threadptr_exec_event_hooks): exceptions in event
+	  hooks should not propagate outside.
+
+Mon Dec 10 15:11:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): count flip-flop state in local iseq
+	  not in each iseqs, so that the keys can be other than hidden
+	  strings.  [ruby-core:47253] [Bug #6899]
+
+	* vm_insnhelper.c (lep_svar_get, lep_svar_set, vm_getspecial): store
+	  flip-flop states in an array instead of a hash.
+
+	* iseq.c (set_relation): main iseq also can has local scope.
+
+Mon Dec 10 10:36:12 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* lib/irb/magic-file.rb: set a encoding, which is detected from
+	  the file to read, to the internal encoding.
+	  [Bug #4281][ruby-dev:43036]
+
+Mon Dec 10 09:40:19 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/ext/cmake_builder.rb:  Added a builder for cmake.
+	* lib/rubygems/ext.rb:  ditto.
+	* lib/rubygems/installer.rb:  ditto.
+	* test/rubygems/test_gem_ext_cmake_builder.rb:  Test for above.
+
+Mon Dec 10 09:13:08 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package.rb:  Omit directories when packaging gems like
+	  RubyGems 1.8.x
+	* test/rubygems/test_gem_package.rb:  Test for above.
+
+Sun Dec  9 17:36:59 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_opt_send): Kernel#send should not use
+	  refinements.
+
+	* proc.c (mnew): Kernel#method, Kernel#public_method,
+	  Module#instance_method, and Module#public_instance_method should
+	  not use refinements.
+
+	* vm_method.c (rb_method_boundp): Kernel#respond_to? should not use
+	  refinements.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Sun Dec  9 06:19:04 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/markdown/entities.rb:  Added documentation.
+
+	* lib/rdoc/parser/ruby.rb:  Updated style
+
+	* lib/rdoc/ruby_lex.rb:  Parse characters up to \u{FFFFF}
+	* test/rdoc/test_rdoc_ruby_lex.rb:  Test for above.
+
+Sat Dec  8 22:38:35 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_refine): don't override Module#include.  It's
+	  unnecessary now because refinements are activated only in refine
+	  blocks.
+
+Sat Dec  8 22:33:26 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c: remove Module#refinements.
+
+	* test/ruby/test_refinement.rb: remove tests for Module#refinements.
+
+Sat Dec  8 13:17:55 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (top_using): raise a RuntimeError if using is called in a
+	  module definition or a method definition.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Sat Dec  8 15:01:35 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/cleanup_command.rb:  Skip default gems when
+	  cleaning up.
+	* test/rubygems/test_gem_commands_cleanup_command.rb:  Test for above.
+
+	* lib/rubygems/commands/query_command.rb:  Fixed listing remote gems.
+
+	* lib/rubygems/dependency_installer.rb:  Ignore non-files when looking
+	  for local gems.
+	* test/rubygems/test_gem_dependency_installer.rb:  Test for above.
+
+	* lib/rubygems/uninstaller.rb:  The user must confirm uninstalling gems
+	  that have dependencies.
+	* test/rubygems/test_gem_uninstaller.rb:  Test for above.
+
+	* lib/rubygems.rb (module Gem):  Updated version.
+
+	* test/rubygems/*.pem:  Updated to run in FIPS mode.
+	* test/rubygems/test_gem_security.rb:  ditto.
+	* test/rubygems/test_gem_security_signer.rb:  ditto.
+
+Sat Dec  8 12:34:01 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_search_normal_superclass): super in a
+	  refinement always uses the refined class as its superclass.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Sat Dec  8 11:59:59 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_refine): raise an ArgumentError if a given
+	  block is of a Proc object.
+
+	* vm_insnhelper.c (vm_call_method): store refined methods in inline
+	  cache to improve performance.  It's safe now because blocks cannot
+	  be yielded with different refinements in the new specification.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Sat Dec  8 11:17:53 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_refine), vm_eval.c (rb_yield_refine_block):
+	  Module#refine activates all refinements defined in that module
+	  only in a given block.
+
+	* string.c (sym_to_proc, sym_call): don't use refinements.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Sat Dec  8 09:24:42 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl_x509name.c:  Completed documentation for
+	  OpenSSL::X509::Name.
+
+Sat Dec  8 07:57:12 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c (iow_size): return size of internal object
+	  for ObjectSpace.memsize_of().
+
+	* test/objspace/test_objspace.rb: add a test.
+
+Tue Dec 08 02:39:23 2012  James Edward Gray II  <james@graysoftinc.com>
+
+	* lib/csv.rb: A fix for row comparison by Stephen Wattam.  [Bug #7528]
+
+Sat Dec  8 01:27:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): no need to
+	  check all reports.
+
+Sat Dec  8 00:10:34 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_eval.c (yield_under, eval_under): do not activate refinements
+	  of the receiver in module_eval and instance_eval.
+
+	* eval.c (ruby_Init_refinement): undef Class#refine.
+
+	* eval.c (ruby_Init_refinement): remove Module#using.
+
+	* eval.c (ruby_Init_refinement): main.using should be private.
+
+	* eval.c (rb_mod_refine): the argument of Module#refine should not
+	  be a module.
+
+	* insns.def (defineclass): do not activate refinements in a class or
+	  module.
+
+Fri Dec  7 23:42:11 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/refinement/refinement.c: include ruby/ruby.h instead of the
+	  declaration of rb_warn().
+
+Fri Dec  7 16:07:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/etc.rd: Removed stale documentation file
+	* ext/etc/etc.c:  Merged documentation from doc/etc.rd and updated
+	  rdoc, added documentation for Etc::Passwd and Etc::Group
+
+Fri Dec  7 16:00:57 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): no need to
+	  retry skipped test.  this fix makes 40% faster the whole test-all
+	  with -j5 on Windows.
+
+Fri Dec  7 14:22:29 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/markup/to_joined_paragraph.rb:  Completed documentation
+	* lib/rdoc/parser/c.rb:  ditto
+	* lib/rdoc/parser/changelog.rb:  ditto
+	* lib/rdoc/servlet.rb:  ditto
+	* lib/rdoc/store.rb:  ditto
+
+	* lib/rdoc/store.rb:  Improved HTML error page.  Completed
+	  documentation
+
+	* lib/rdoc/parser/ruby.rb:  Fixed bug attaching a comment to A::B = 42
+	* test/rdoc/test_rdoc_parser_ruby.rb:  Test for above
+
+	* test/rdoc/test_rdoc_comment.rb:  Removed garbage
+
+Fri Dec  7 14:03:59 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/timeout.rb (Timeout#timeout): since async_interrupt_timing
+	  re-raises a deferred exception, replace the timeout exception with
+	  Timeout::Error after it.  [Bug #7503]
+
+Fri Dec  7 13:07:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/forwardable.rd: Remove stale documentation file
+	* lib/forwardable.rb: Merge documentation from doc/forwardable.rd
+
+Fri Dec  7 09:47:35 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (time_mdump): dump timezone string to private instance variable
+	  on marshaling.
+
+	* time.c (time_mload): load timezone string from private instance
+	  variable named 'zone'.
+
+Fri Dec  7 01:15:07 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/fiddle/lib/fiddle/function.rb (Fiddle::Function#name): new
+	  attribute needed to switch Win32::Registry from DL to Fiddle.
+
+	* ext/fiddle/lib/fiddle/import.rb (import_function, bind_function):
+	  set function name to the returned Fiddle::Function object.
+
+Fri Dec  7 00:11:44 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_refinement.rb: fix some tests to use neither
+	  Module#using nor Module#module_eval.
+
+Thu Dec  6 23:27:50 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (ruby_Init_refinement): a new function to enable
+	  Refinements with a warning "Refinements are experimental...".
+
+	* ext/refinement/refinement.c, ext/refinement/extconf.rb: a new
+	  extension library to enable Refinements.
+
+Thu Dec  6 18:23:05 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* revised r37993 to avoid SEGV/ILL in tests.  In r37993, a method
+	  entry with VM_METHOD_TYPE_REFINED holds only the original method
+	  definition, so ci->me is set to a method entry allocated in the
+	  stack, and it causes SEGV/ILL.  In this commit, a method entry
+	  with VM_METHOD_TYPE_REFINED holds the whole original method entry.
+	  Furthermore, rb_thread_mark() is changed to mark cfp->klass to
+	  avoid GC for iclasses created by copy_refinement_iclass().
+
+	* vm_method.c (rb_method_entry_make): add a method entry with
+	  VM_METHOD_TYPE_REFINED to the class refined by the refinement if
+	  the target module is a refinement.  When a method entry with
+	  VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
+	  the same name is searched in refinements.  If such a method is
+	  found, the method is invoked.  Otherwise, the original method in
+	  the refined class (rb_method_definition_t::body.orig_me) is
+	  invoked.  This change is made to simplify the normal method lookup
+	  and to improve the performance of normal method calls.
+
+	* vm_method.c (EXPR1, search_method, rb_method_entry),
+	  vm_eval.c (rb_call0, rb_search_method_entry): do not use
+	  refinements for method lookup.
+
+	* vm_insnhelper.c (vm_call_method): search methods in refinements if
+	  ci->me is VM_METHOD_TYPE_REFINED.  If the method is called by
+	  super (i.e., ci->call == vm_call_super_method), skip the same
+	  method entry as the current method to avoid infinite call of the
+	  same method.
+
+	* class.c (include_modules_at): add a refined method entry for each
+	  method defined in a module included in a refinement.
+
+	* class.c (rb_prepend_module): set an empty table to
+	  RCLASS_M_TBL(klass) to add refined method entries, because
+	  refinements should have priority over prepended modules.
+
+	* proc.c (mnew): use rb_method_entry_with_refinements() to get
+	  a refined method.
+
+	* vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
+	  copy_refinement_iclass().
+
+	* vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
+
+	* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
+	  the test because it should pass successfully.
+
+	* test/ruby/test_refinement.rb (test_redefine_refined_method): new
+	  test for the case a refined method is redefined.
+
+Thu Dec  6 17:29:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_here_document): flush string content between new
+	  line and :string_embexpr.  [ruby-core:48703] [Bug #7255]
+
+Thu Dec  6 16:35:21 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rake/helper.rb:  Load envutil correctly.  Removed useless rescue
+	  for signal propagation tests
+	* lib/rake/file_utils.rb:  Prefer the built ruby.
+	* test/rake/test_rake_functional.rb:  ditto
+
+Thu Dec  6 15:20:34 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/context.rb:  Don't warn for duplicate methods while loading.
+	* test/rdoc/test_rdoc_context.rb:  Test for above.
+
+Thu Dec  6 14:26:22 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/command_manager.rb:  Removed string concatenation
+	  syntax.  [Bug #6265]
+	* lib/rubygems/commands/install_command.rb:  ditto
+	* lib/rubygems/commands/uninstall_command.rb:  ditto
+	* lib/rubygems/indexer.rb:  ditto
+	* lib/rubygems/security/policy.rb:  ditto
+	* lib/rubygems/security.rb:  ditto
+	* lib/rubygems/uninstaller.rb:  ditto
+	* test/rubygems/test_gem_commands_cert_command.rb:  ditto
+	* test/rubygems/test_gem_package.rb:  ditto
+	* test/rubygems/test_gem_security.rb:  ditto
+	* test/rubygems/test_gem_security_policy.rb:  ditto
+
+Thu Dec  6 14:10:08 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package.rb:  Set rubygems_version before validation.
+	  Fixes issue with bundler.
+	* test/rubygems/test_gem_package.rb:  Test for above.
+
+	* lib/rubygems/remote_fetcher.rb:  Only update the cache when we have
+	  permission.  [ruby-trunk - Bug #7509]
+	* lib/rubygems/source.rb (class Gem):  ditto
+	* test/rubygems/test_gem_remote_fetcher.rb:  Test for above.
+	* lib/rubygems/test_utilities.rb:  ditto
+
+	* lib/rubygems/specification.rb:  Derive base_dir properly for default
+	  gems.  [ruby-trunk - Bug #7496]
+	* test/rubygems/test_gem_specification.rb:  Test for above.
+
+	* lib/rubygems.rb:  Untaint Dir.pwd when searching for gemdeps files
+	  for operation under $SAFE=1
+
+Thu Dec 06 12:07:11 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: TracePoint#enable should not cause an error
+	  when it is already enabled. TracePoint#disable is too.
+	  [ruby-core:50561] [ruby-trunk - Bug #7513]
+
+	* test/ruby/test_settracefunc.rb: add tests.
+
+Thu Dec  6 07:19:58 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc*:  Improved display of ChangeLog files as HTML.
+	* test/rdoc*:  Test for above.
+
+Thu Dec  6 04:34:19 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_uninterruptible): helper function for providing
+	  temporary async_interrupt_timing(Object => :defer)
+
+	* io.c (rb_f_p): use rb_uninterruptible.
+	* io.c (rb_f_p_internal): helper function for rb_f_p().
+	* io.c (struct rb_f_p_arg): new struct for rb_f_p_internal.
+
+	* test/ruby/test_thread.rb (test_async_interrupt_and_p): test for
+	  the above.
+
+Thu Dec  6 04:27:10 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (io_binwrite): check interrupt before io issue.
+	* test/ruby/test_thread.rb (test_async_interrupt_and_io):
+	  test for the above.
+
+Thu Dec  6 01:10:36 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_method_call_status): use Qundef as no self instead of
+	  the current self.
+
+	* vm_eval.c (send_internal): public_send does not consider how it is
+	  called, as mentioned in r14173.  patched by charliesome (Charlie
+	  Somerville).  [ruby-core:50489] [Bug #7499]
+
+Wed Dec  5 23:50:23 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (getrusage_time): uses clock_gettime() with
+	  CLOCK_PROCESS_CPUTIME_ID when available, which provides a 1ns
+	  precision on linux. [ruby-core:50495] [Bug #7500]
+	  patched by Aman Gupta.
+
+Wed Dec  5 22:46:02 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_vm_make_proc): save the proc made from the given block so
+	  that it will not get collected.  [ruby-core:50545] [Bug #7507]
+
+Wed Dec  5 22:13:57 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/dl/lib/dl/func.rb (DL::Function#bind): When Fiddle is used,
+	  @ptr should be updated. This fixes SEGV raised in DL::Function#call
+	  after calling DL::Function#bind. [Bug #7516] [ruby-dev:46708]
+
+	* test/dl/test_func.rb (test_bind): test for the above
+
+Wed Dec  5 18:53:00 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* thread.c (rb_thread_s_async_interrupt_timing): have to check ints
+	  before jumping out.
+	* test/ruby/test_thread.rb (test_async_interrupt_with_return): add test
+	  rescue has to catch a queued async exception at the time of return.
+	* test/ruby/test_thread.rb (test_async_interrupt_with_break): add test
+	  rescue has to catch a queued async exception at the time of break.
+
+Wed Dec  5 16:54:28 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/memory_status.rb: suppress warning.
+	  A patch from NAKAMURA Usaku.
+
+Wed Dec  5 16:06:54 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parser/changelog.rb:  Parse more ChangeLog file variations.
+	* test/rdoc/test_rdoc_parser_changelog.rb:  Test for above.
+
+Wed Dec  5 12:17:11 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/dl/lib/dl/func.rb (DL::Function#initialize, DL::Function#bind):
+	  ABI should be set by using CFunc#calltype even when Fiddle is used.
+	  When Fiddle is used and a block is given, name should not be ignored.
+	  [ruby-core:50562] [Bug #7514]
+
+	* ext/dl/lib/dl/import.rb (DL::Importer#bind_function): should respect
+	  abi and name when Fiddle is used.
+
+	* test/dl/test_func.rb (test_name_with_block): test for "name" method
+	  with giving a block.
+
+Wed Dec  5 11:55:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/shell.rd, doc/shell.rd.ja: Removed stale doc files
+	* lib/shell.rb, lib/shell/*: Merge and updates docs from doc/shell.rd*
+
+Wed Dec  5 11:42:38 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_settracefunc.rb: disable trace.
+
+Wed Dec  5 11:37:37 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#macro_defined?): use clearly different
+	  strings from conflict markers.
+
+Wed Dec  5 04:25:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/README: Add rdoc modeline directive and formatting libs
+
+Wed Dec  5 04:04:02 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* test/ruby/test_thread.rb (test_async_interrupt_blocking): bugfix
+	  about deferred check
+
+Wed Dec  5 03:35:37 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* vm_core.h (RUBY_VM_CHECK_INTS_BLOCKING): check async queue everytime.
+	* thread.c (sleep_forever): check RUBY_VM_CHECK_INTS_BLOCKING first.
+	* thread.c (sleep_timeval): ditto.
+	* test/ruby/test_thread.rb (test_async_interrupt_blocking): add a test
+	  exceptions are correctly deferred and raised on :on_blocking context.
+
+Wed Dec  5 02:36:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk, defs/id.def, template/id.c.tmpl: generate id.c as well as id.h.
+
+Wed Dec  5 00:56:21 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_mutex_owned_p): new method that return current
+	  thread have the target mutex or not. [Feature #7505] [ruby-dev:46697]
+	* test/ruby/test_thread.rb (test_mutex_owned, test_mutex_owned2):
+	  test for the above.
+	* NEWS: new for the above.
+
+Wed Dec  5 00:05:47 2012  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/erb.rb (make_compiler, add_put_cmd, add_insert_cmd): extract
+	  methods.
+
+Tue Dec  4 18:21:04 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* test/ruby/memory_status.rb (Memory): use fiddle/types if available.
+
+	* test/ruby/memory_status.rb (Memory::Win32): :stdcall is needed on
+	  x86 WIN32. This commit partly reverts r38054.
+
+Tue Dec  4 18:05:58 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/fiddle/lib/fiddle/types.rb: copied from ext/dl/lib/dl/types.rb
+	  and modified for Fiddle, needed for migration from DL to Fiddle.
+
+Tue Dec  4 17:57:09 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/fiddle/lib/fiddle/import.rb (import_function, bind_function):
+	  should respect call_type for migration from DL to Fiddle.
+	  [Bug #7484] [ruby-core:50405]
+
+Tue Dec  4 16:54:00 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* .document:  Added ChangeLog and doc/ChangeLog-* as documentation
+
+Tue Dec  4 16:47:46 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parser/changelog.rb:  Added a ChangeLog parser to RDoc.
+	* lib/rdoc/parser.rb:  ditto
+	* test/rdoc/test_rdoc_parser_changelog.rb:  Test for above.
+
+Tue Dec  4 16:23:32 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (path2class, path2module): use PRIsVALUE.
+
+	* marshal.c (w_object, marshal_dump, marshal_load): use
+	  rb_check_funcall if possible.
+
+	* marshal.c (w_object, marshal_dump, r_object0, marshal_load): use
+	  RB_GC_GUARD() (directly or indirectly) instead of volatile.
+
+	* variable.c (rb_path_to_class): prevent the argument from GC.
+
+Tue Dec 04 13:55:07 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_opts.h: enable optimization - operand unification.
+	  Operand unification technique enable to combine
+	  an instruction and specific operands and make new
+	  instruction.
+
+	* defs/opt_operand.def: add several configuration
+	  of operand unification.
+
+	* insns.def: use `int' instead to suppress warning.
+
+Mon Dec  3 17:58:53 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y: replace parser->enc with current_enc.
+
+Tue Dec  4 08:33:46 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* README.EXT:  Converted to RDoc format
+	* README.EXT.ja:  ditto
+
+Tue Dec  4 08:32:10 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/ri/driver.rb:  Fixed ri page display for files with
+	  extensions.
+	* test/rdoc/test_rdoc_ri_driver.rb:  Test for above
+
+Tue Dec  4 04:11:50 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* .document:  Add NEWS for `ri ruby:NEWS`
+	* NEWS:  Set format as rdoc
+	* doc/NEWS-1.8.7:  ditto
+	* doc/NEWS-1.9.1:  ditto
+	* doc/NEWS-1.9.2:  ditto
+	* doc/NEWS-1.9.3:  ditto
+
+Mon Dec  3 20:37:22 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_exec.c: check VM_COLLECT_USAGE_DETAILS.
+
+Mon Dec  3 20:28:02 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_specialized_instruction):
+	  change condition of using `opt_send_simple'.
+	  More method invocations can be simple.
+
+Mon Dec  3 20:03:38 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_objectspace.rb: skip RuntimeError
+	  which says a message "can't modify frozen File".
+	  Is that correct behavior?
+
+Mon Dec 03 20:00:19 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_exec.c: vm_analysis_insn should be static.
+
+Mon Dec  3 19:10:12 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (Init_Random), rational.c (Init_Rational): make marshal
+	  methods private.  [Feature #6539]
+
+Mon Dec  3 18:29:27 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.h: iseq_catch_table_entry::catch_type should be
+	  Fixnum because they are pushed into Array in a compiler.
+	  [Bug #7502]
+
+	* test/ruby/test_objectspace.rb: add a test of this issue.
+
+Mon Dec  3 18:25:16 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/id.h.tmpl (preserved_ids): "empty?" is not an attribute name.
+
+Mon Dec  3 16:23:09 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c (vm_backtrace_to_ary): check negative size (2nd arg).
+
+Mon Dec  3 15:50:33 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-additional.el (ruby-mode-set-encoding): Unbreak by
+	  fixing a typo, s/set/setq/.
+
+Mon Dec  3 14:14:19 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): joke shouldn't use id.h defined ids.
+
+	* id.c (Init_id): ditto.
+
+	* common.mk: fix dependency.
+
+Mon Dec  3 12:43:35 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-block-end-re, ruby-delimiter)
+	  (ruby-mode-syntax-table, ruby-parse-partial, ruby-beginning-of-indent):
+	  merge from Emacs.
+
+	* misc/ruby-mode.el (ruby-calculate-indent): fix indentation of
+	  argument lines in parentheses.  [Bug #5140]
+
+Mon Dec  3 07:52:41 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parser.rb:  Improved modeline support.  Patch by nobu.
+	* test/rdoc/test_rdoc_parser.rb:  Test for above.
+
+Sun Dec  3 00:06:00 2012  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_new): stop checking string
+	  taintness.  [Bug #5508] [ruby-core:40510]
+
+Sun Dec  2 19:26:47 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* thread.c (RB_GC_SAVE_MACHINE_CONTEXT, rb_gc_save_machine_context):
+	  extract rb_gc_save_machine_context to RB_GC_SAVE_MACHINE_CONTEXT.
+	  NOTE: machine_regs and machine_stack_end must be set in current scope.
+
+Sun Dec  2 18:46:24 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c, enum.c, insns.def, io.c, numeric.c, parse.y, process.c,
+	  range.c: use prepared IDs.
+	  A patch from charliesome (Charlie Somerville).
+	  [Bug #7495]
+
+	* common.mk: add dependency to id.h.
+
+	* common.mk: replace ID_H_INCLUDES with id.h.
+
+Sun Dec  2 16:48:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/weakref.rb (rdoc): Clean up usage, add example,
+	  note ArgumentError on WeakRef.new
+
+Sun Dec  2 16:45:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* gc.c (WeakMap): Add doc for internal reference, use lib/weakref.rb
+
+Sun Dec  2 07:24:23 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parser.rb:  Parse files with a -*- rdoc -*- modeline
+	* test/rdoc/test_rdoc_parser.rb:  Test for above
+
+Sun Dec  2 06:02:00 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* gc.h (SET_MACHINE_STACK_END): add volatile for preventing
+	  harmful optimization.  [ruby-dev:46665] [Bug #7468]
+
+Sun Dec  2 05:01:58 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (rb_iseq_line_trace_each): iterate `line' event only.
+
+	* test/ruby/test_iseq.rb: add a test for this change.
+
+Sun Dec  2 02:46:04 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: add TracePoint#inspect.
+
+	* test/ruby/test_settracefunc.rb: add a test for this change.
+
+Sat Dec  1 21:18:19 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_backtrace.rb: add a test for
+	  Thread::Backtrace::Location#inspect.
+	  BTW, tests for `caller_locations' are not enough.
+	  Any volunteers are welcome.
+
+Sat Dec  1 21:06:58 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c (location_inspect_m): add
+	  Thread::Backtrace::Location#inspect.
+	  It same as loc_obj.to_s.inspect.
+
+Sat Dec  1 19:24:09 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_puts): recurse for the argument itself, not converted
+	  array elements.  [ruby-core:42444] [Bug #5986]
+
+Sat Dec  1 19:01:36 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object, r_object0): call private marshal methods.
+	  [Feature #6539]
+
+Sat Dec  1 18:52:22 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/cleanup_command.rb:  Fix cleanup command for
+	  multiple gems.  [ruby-trunk - #7481] by Kouhei Sutou
+	* test/rubygems/test_gem_commands_cleanup_command.rb:  Test for above.
+	* lib/rubygems.rb:  Autoload Gem::Source to prevent test failures
+
+Sat Dec  1 18:17:00 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* complex.c (Init_Complex), time.c (Init_Time): make marshal methods
+	  private.  [Feature #6539]
+
+	* object.c (Init_Object): make remove_instance_variable public.
+	  [Feature #6539]
+
+	* id.c (Init_id), template/id.h.tmpl: add initialize_{copy,clone,dup}
+	  and respond_to_missing?.
+
+	* vm_method.c (rb_method_entry_make): make above methods private.
+	  [Feature #6539]
+
+Sat Dec  1 16:40:22 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_thread.rb: move ConditionVariable related test
+	  into test/thread/test_cv.rb.
+	* test/thread/test_cv.rb: new file.
+	* test/thread/test_cv.rb (test_condvar_empty_signal): new tests.
+	* test/thread/test_cv.rb (test_condvar_empty_broadcast): ditto.
+
+Sat Dec  1 15:14:25 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_thread.rb (test_cv_wait_deadlock): enable
+	  cv deadlock test.
+
+Sat Dec  1 14:23:33 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/thread.rb (ConditionVariable): use hash instead of array for
+	  @waiters.
+	* test/thread/test_queue.rb (test_sized_queue_and_wakeup): remove
+	  a test because @waiters no longer have a chance to duplicated. Now it's
+	  a hash.
+
+Sat Dec  1 17:16:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-electric.el (ruby-electric-curlies): use kill-region
+	  instead of interactive command delete-backward-char.
+
+Sat Dec  1 17:12:55 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/inf-ruby.el (inferior-ruby-mode): fix the
+	  compilation-shell-minor-mode configuration.  a patch by
+	  j2petkov (Jean-Christophe Petkovich) in [ruby-core:46518].
+	  [Bug #6742]
+
+Sat Dec  1 15:05:30 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): use NAMLEN() to tell the length of d_name
+	  instead of strlen(), which can access beyond the boundary.
+
+Sat Dec  1 13:48:13 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Don't add default gems to $LOAD_PATH
+	  as they are already there.
+
+Sat Dec  1 12:22:17 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* re-added r38053 that is reverted by r38061. Problems by r38053
+	  are resolved by r38096. r38096 removed GEM_SKIP configuration.
+
+	  The below is ChangeLog of r38053:
+
+	* defs/default_gems: Add base directory column.
+
+	* tool/rbinstall.rb:
+	  - Install .gemspecs of default gem to
+	    #{GEM_HOME}/specifications/default/.
+	  - Update files parameter of .gemspecs by relative path from
+	    library directory.
+
+Sat Dec  1 11:09:12 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* variable.c (rb_class_path_no_cache): add a function to get the class
+	  path without caching the computed path. Some classes are frozen, and
+	  will raise an exception without this.
+
+	* probes.d (cmethod-entry, cmethod-return): separate cmethods from
+	  regular methods to match set trace func.
+
+	* probes_helper.h: refactor macros.  Fix probes to avoid calling
+	  #inspect when profiling.
+
+	* insns.def: update for use with new macros.
+
+	* vm_eval.c: ditto
+
+	* vm_insnhelper.c: ditto
+
+	* test/dtrace/test_singleton_function.rb: fix test for new output.
+
+	* test/dtrace/test_cmethod.rb: test the cmethod probes.
+
+Sat Dec  1 09:44:16 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rdoc/test_rdoc_options.rb:  Windows drive letters are
+	  case-insensitive.
+
+Sat Dec  1 09:42:13 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Search for gem deps file up the directory tree.
+	* test/rubygems/test_gem.rb:  Test for above.
+
+Sat Dec  1 09:33:32 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* test/runner.rb:  Set GEM_HOME, GEM_PATH and GEM_SKIP to empty set.
+	  With default_gem support in RubyGems GEM_SKIP prevents loading of
+	  built-in gems.
+
+Sat Dec  1 07:16:17 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* compile.c (ADD_CATCH_ENTRY): add a cast to fix SEGV with x64 mingw
+	  on Windows 8. Without cast, 0 might be non zero value at higher bits
+	  in rb_ary_new3().
+	  [ruby-core:50258] [Bug #7456]
+
+Sat Dec  1 04:07:57 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (parser.utf8): remove unused property.
+
+	* parse.y (UTF8_ENC): remove unused macro.
+
+	* parse.y (parser_tokadd_utf8): use rb_utf8_encoding() directly.
+
+Sat Dec  1 03:49:45 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/sync.rb (Sync_m#sync_synchronize): add Thread.async_interrupt_timing
+	  for protecting from async interrupt.
+	* lib/sync.rb (Sync_m#sync_lock): ditto.
+
+Sat Dec  1 03:38:04 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/thread.rb (ConditionVariable#broadcast): s/RuntimeError/StandardError/
+	* lib/thread.rb (ConditionVariable#signal): ditto.
+
+Sat Dec  1 03:29:52 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/thread.rb (SizedQueue#pop): rewrite by using ConditionVariable.
+	* lib/thread.rb (SizedQueue#push): ditto.
+	* lib/thread.rb (SizedQueue#max): ditto.
+	* lib/thread.rb (Queue#pop): ditto.
+	* lib/thread.rb (Queue#push): ditto.
+
+	* lib/thread.rb (SizedQueue#num_waiting): adopt the above changes.
+	* lib/thread.rb (SizedQueue#initialize): ditto.
+	* lib/thread.rb (Queue#num_waiting): ditto.
+	* lib/thread.rb (Queue#initialize): ditto.
+	* test/thread/test_queue.rb (test_sized_queue_and_wakeup): ditto.
+
+Sat Dec  1 03:45:47 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (Thread.async_interrupt_timing): fix RDoc.
+	  :never is not used any more.
+
+Sat Dec  1 02:56:19 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c: add RubyVM::InstructionSequence (ISeq) inspection methods.
+	  * ISeq#path returns path of this ISeq written.
+	  * ISeq#absolute_path returns absolute path.
+	  * ISeq#label returns label (method name and so on).
+	  * ISeq#base_label returns base label (see Thread::Backtrace::Location).
+	  * ISeq#first_lineno returns first line number of this ISeq.
+	  * ISeq.of(obj) returns ISeq object which obj (Proc or Method)
+	    is contains.
+
+	* test/ruby/test_iseq.rb: add tests.
+
+Sat Dec  1 02:58:51 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* include/ruby/ruby.h (rb_event_flag_t):  Maintain integer precision
+	  for clang error (VALUE aka unsigned long vs unsigned int)
+
+Sat Dec  1 02:53:18 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rubygems/test_gem_dependency_installer.rb:  Use Gem.read_binary
+	  instead of File.binread for ruby 1.8 compatibility in the rubygems
+	  source repository.  Updates r38075
+
+Sat Dec  1 02:33:20 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_threadptr_interrupt_mask, async_interrupt_timing_func):
+	  merge into them into rb_thread_s_async_interrupt_timing.
+	* thread.c (rb_thread_s_async_interrupt_timing): ditto.
+
+Sat Dec  1 02:11:47 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_threadptr_interrupt_mask): add argument check.
+	* thread.c (async_interrupt_timing_arg_check_i): helper function
+	  for the above.
+	* test/ruby/test_thread.rb (test_async_interrupt_timing_invalid_argument):
+	  test for the above.
+
+Sat Dec  1 01:19:34 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/thread.rb (ConditionVariable#broadcast): protect from
+	  async interrupt by using Thread.async_interrupt_timing.
+	* lib/thread.rb (ConditionVariable#signal): ditto.
+	* lib/thread.rb (ConditionVariable#wait): ditto.
+
+Sat Dec  1 02:04:23 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err):
+	  raise if assert_in_out_err misused.
+
+Sat Dec  1 02:08:16 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rdoc/test_rdoc_rubygems_hook.rb
+	  (TestRDocRubygemsHook#test_setup_unwritable): 1. check the existence
+	  of the file(directory) before touch it.  2. remove test
+	  file(directory) after the test.  see [ruby-core:50388].
+
+Sat Dec  1 01:51:06 2012  Koichi Sasada  <ko1@atdot.net>
+
+	[EXPERIMENTAL]
+	* iseq.c: add following two methods.
+	  * ISeq#line_trace_all returns all line traces (line numbers)
+	  * ISeq#line_trace_specify(pos, set) set `pos'th line event to
+	    specified_line event (if set is true).
+	  These features are introduced for debuggers (mainly to make
+	  breakpoint).
+
+	* iseq.h: add decl. of C APIs.
+
+	* test/ruby/test_iseq.rb: add tests.
+
+	* vm_trace.c: add `specified_line' event.
+
+	* include/ruby/ruby.h: ditto.
+
+Sat Dec  1 01:49:52 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rubygems/test_gem_dependency_installer.rb: gems are of course
+	  binary files, so use a binary reading method when reading it.
+	  see [ruby-core:50388].
+
+Sat Dec  1 01:21:07 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rubygems/command.rb (Gem::Command#get_all_gem_names_and_versions):
+	  who assumes that the pathname of a gem never contains ':' ?
+	  yes, on Unixen pathnames can contain ':', and on Windows they almost
+	  certainly contain ':'.  see [ruby-core:50388].
+
+	* lib/rubygems/requirement.rb (Gem::Requirement::PATTERN_RAW): extract
+	  the regexp to match the version specifier from PATTERN to use in
+	  above method.
+
+Sat Dec  1 00:48:19 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/fiddle/extconf.rb, ext/fiddle/function.c
+	  (Fiddle::Function::STDCALL): FFI_STDCALL is not a macro, but an
+	  enumeration. [ruby-core:50398] [Bug #7483]
+
+Sat Dec  1 00:08:55 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rubygems/test_gem_installer.rb
+	  (TestGemInstaller#test_check_executable_overwrite_other_non_gem):
+	  on Windows, rubygems always generate a wrapper .bat file when
+	  installing a file into bin, so testing no-overwrite a wrapper file
+	  and a non-wrapper file is nonsense.  see [ruby-core:50388].
+
+Fri Nov 30 23:39:58 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rubygems/test_gem_installer.rb
+	  (TestGemInstaller#test_check_executable_overwrite_default_bin_dir):
+	  if the executable to be overwritten was generated by rubygems, the
+	  error message differs from the only copied one's.
+	  see [ruby-core:50388].
+
+Fri Nov 30 23:27:26 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rubygems/test_gem_ext_ext_conf_builder.rb
+	  (TestGemExtExtConfBuilder::test_class_make): reading with binary mode
+	  of course introduce \r on Windows.  see [ruby-core:50388].
+
+Fri Nov 30 23:11:37 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rubygems/specification.rb
+	  (Gem::Specification.validate_permissions): don't check executability
+	  of the source on Windows.  they will be wrapped to .bat files when
+	  installing.  see [ruby-core:50388].
+
+Fri Nov 30 22:44:14 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_core.h (rb_vm_struct): add thread_destruct_lock field.
+	* thread.c (Init_Thread): ditto.
+	* thread.c (rb_vm_gvl_destroy): ditto.
+
+	* thread.c (thread_start_func_2): make sure vm->running_thread
+	  don't point to dead thread.
+	* thread.c (timer_thread_function): close a race against thread
+	  destruction. [Bug #4911][ruby-dev:43859]
+
+	* vm_core.h (rb_thread_set_current): reset running time of
+	  current thread instead of previous thread. We no longer
+	  assume previous running thread still live.
+
+Fri Nov 30 21:57:43 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* revert r38053 because it causes too many test failures.
+	  if you've already installed r38053 or later, remove the installed
+	  lib/ruby/gems/2.0.0 directory and reinstall this revision or later.
+
+Fri Nov 30 21:07:56 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit/parallel.rb (Test::Unit::Worker.run): wrap LoadError
+	  because it's Gem::LoadError sometimes.  see [Bug #6882]
+
+Fri Nov 30 20:47:44 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c: TracePoint#self returns invoking/exiting thread object
+	  at thread_begin/end event.
+
+	* test/ruby/test_settracefunc.rb: fix test.
+
+Fri Nov 30 19:55:17 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/memory_status.rb (Memory::Win32): use fiddle instead of dl,
+	  but I doubt fiddle is not compatible with dl. (if you are interested,
+	  see the diff.)  [ruby-core:50194] [Bug #7443]
+
+Fri Nov 30 19:37:44 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* defs/default_gems: Add base directory column.
+
+	* tool/rbinstall.rb:
+	  - Install .gemspecs of default gem to
+	    #{GEM_HOME}/specifications/default/.
+	  - Update files parameter of .gemspecs by relative path from
+	    library directory.
+
+Fri Nov 30 19:30:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* vm_trace.c:
+	  tracepoint_attr_return_value (TracePoint#return_value):
+	    include `:b_return` for method doc
+	  tracepoint_enable_m, tracepoint_disable_m (#enable/#disable):
+	    don't have block argument, document block scope
+
+Fri Nov 30 18:52:56 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (tracepoint_disable_m, tracepoint_enable_m):
+	  fix block parameter.
+	  No argument should be given to a block which is passed
+	  to TracePoint#enable (and disable).
+
+Fri Nov 30 18:23:26 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c: rename Thread.control_interrupt
+	  to Thread.async_interrupt_timing.
+	  The option name `:never' is also changed to  `:defer'.
+	  [ruby-core:50375] [ruby-trunk - Feature #6762]
+
+	* thread.c: remove Thread.check_interrupt.
+	  This method is difficult to understand by name.
+
+	* thread.c: add Thread.async_interrupted?.
+	  This method check any deferred async interrupts.
+
+	* test/ruby/test_thread.rb: change tests for above.
+
+Fri Nov 30 18:24:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* vm_trace.c: Documentation for TracePoint API
+	  [ruby-core:47243] [Feature #6895]
+
+Fri Nov 30 17:43:50 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_cmp_m): try to compare with to_str result if
+	  possible before calling <=> method.  [ruby-core:49279] [Bug #7342]
+
+	* string.c (rb_str_cmp_m): use rb_check_funcall instead of respond_to
+	  and call.
+
+	* string.c (rb_str_cmp_m): return fixed value, one of -1,0,+1 always.
+
+Fri Nov 30 16:19:14 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_dump.c (rb_vm_bugreport): get rid of calling methods in sigsegv
+	  handler.  based on a patch by charliesome (Charlie Somerville)
+	  [ruby-core:49573] [Bug #7402]
+
+Fri Nov 30 16:05:44 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* NEWS:  Added RubyGems 2.0.0
+
+Fri Nov 30 15:24:37 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): fix false usage of local variable, it cannot
+	  appear in fname state [ruby-core:49659] [Bug #7408]
+
+Fri Nov 30 15:20:12 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package.rb:  Load YAML for building gems.
+	* test/rubygems/test_gem_commands_contents_command.rb:  Sort expected
+	  output of default gem contents.  Re-fixes r38004 and r38005.
+
+Fri Nov 30 15:15:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* vm_trace.c (set_trace_func): Formatting of params and events
+
+Fri Nov 30 14:45:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/net/http.rb: Net::HTTP::Patch to list of HTTP Request Classes
+	  Patch by Ryunosuke SATO [Fixes #217 on github]
+
+Fri Nov 30 14:05:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/cgi.rb: CGI example for HTML generation
+	  Patch by Marcus Stollsteimer [ruby-core:50303] [Bug #7465]
+
+Fri Nov 30 13:52:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* time.c: Documentation improvements, grammar and formatting
+	  Patch by Bernd Homuth [ruby-core:49203] [Bug #7326]
+
+Fri Nov 30 13:48:33 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc.rb:  Set version to 4.0.0.preview2
+	* lib/rubygems.rb:  Set version to 2.0.0.preview2
+
+Fri Nov 30 13:11:53 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/setup_command.rb:  Remove old files on install
+	  of RubyGems.  (not by rbinstall.rb).
+	* test/rubygems/test_gem_commands_setup_command.rb:  Test for above.
+
+Fri Nov 30 12:47:59 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/abbrev.rb (Abbrev#abbrev): A fixed string prefix pattern
+	  should only match the beginning of each word, not the beginning
+	  of every line in it.
+
+	* lib/abbrev.rb (Abbrev#abbrev): Stop using a regexp that causes a
+	  false warning. [Bug #7471]
+
+Fri Nov 30 12:30:55 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/test_abbrev.rb: Add tests for lib/abbrev.rb.
+
+Fri Nov 30 12:27:51 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/spec_fetcher.rb:  Allow prerelease spec fetching to fail
+	  for bundler.
+	* test/rubygems/test_gem_spec_fetcher.rb:  Test for above.
+
+Fri Nov 30 12:20:53 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rake/backtrace.rb:  Removed duplication in
+	  Rake::Backtrace::SUPPRESSED_PATHS
+	* test/rake/test_rake_backtrace.rb:  Skip tests when tmpdir is in the
+	  suppressed pattern.
+
+Fri Nov 30 11:07:45 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* revert r37993 to avoid SEGV in tests.
+
+Fri Nov 30 10:38:54 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/ri/driver.rb:  Relaxed matching for pages to be more
+	  user-friendly.
+	* test/rdoc/test_rdoc_ri_driver.rb:   Test for above.
+
+Fri Nov 30 09:50:16 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/markdown.rb:  Fixed warnings with -w
+
+Fri Nov 30 09:38:22 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RB_GC_GUARD_PTR): add note.
+
+	* vm_backtrace.c (backtrace_to_str_ary): use RB_GC_GUARD() instead of
+	  RB_GC_GUARD_PTR() which has no effect.
+	  (backtrace_to_location_ary): ditto.
+	  (vm_backtrace_to_ary): ditto.
+
+Fri Nov 30 09:22:52 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/contents_command.rb:  Sort output from command.
+	  Replaces r38004, r38005
+	* test/rubygems/test_gem_commands_contents_command.rb:  ditto.
+
+	* lib/rubygems/defaults.rb:  Use Gem.path_separator for jruby support.
+	* lib/rubygems/path_support.rb:  ditto
+
+Fri Nov 30 08:34:03 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/generator/darkfish.rb:  Silenced warning
+	* test/rdoc/test_rdoc_rdoc.rb:  ditto
+
+	* lib/rdoc/markup/parser.rb:  Use byteslice when available for
+	  performance
+	* test/rdoc/test_rdoc_markup_parser.rb:  Test for above
+	* lib/rdoc/test_case.rb:  ditto
+
+	* lib/rdoc/parser/ruby.rb:  Fixed bug parsing yield({})
+	* test/rdoc/test_rdoc_parser_ruby.rb (end):
+
+	* lib/rdoc/rubygems_hook.rb:  Skip default gems.  Display generator
+	  name properly.
+	* test/rdoc/test_rdoc_rubygems_hook.rb:  Test for above
+
+	* lib/rdoc/servlet.rb:  Fixed typo.
+
+Fri Nov 30 08:09:56 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c : remove a unused function.
+
+Fri Nov 30 07:46:42 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (rb_objspace_call_finalizer): finalize_deferred may free up
+	  a object which is reachable from a part after this function,
+	  e.g. ruby_vm_destruct(). [ruby-dev:46647] [Bug #7452]
+
+	* test/ruby/test_gc.rb (test_finalizing_main_thread): add a test
+	  for above.
+
+Fri Nov 30 07:43:44 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_interrupted): avoid warning of
+	  implicit conversion.
+
+	* thread.c (rb_threadptr_execute_interrupts): ditto.
+
+Fri Nov 30 07:34:28 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c: add GC guards.
+
+Fri Nov 30 07:21:33 2012  Koichi Sasada  <ko1@atdot.net>
+
+	[EXPERIMENTAL: NEED DISCUSS]
+	* vm_trace.c: add events
+	  * :thread_begin - hook at thread beginning.
+	  * :thread_end - hook at thread ending.
+	  * :b_call - hook at block enter.
+	  * :b_return - hook at block leave.
+	  This change slow down block invocation.
+	  Please try and give us feedback until 2.0 code freeze.
+
+	* include/ruby/ruby.h: ditto.
+
+	* compile.c (rb_iseq_compile_node): ditto.
+
+	* insns.def: ditto.
+
+	* thread.c: ditto.
+
+	* vm.c: ditto.
+
+	* include/ruby/debug.h: add a comment.
+
+	* test/ruby/test_settracefunc.rb: add a tests.
+
+Fri Nov 30 06:56:30 2012  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* test/minitest/*: Imported minitest 4.3.2 (r8027)
+
+Fri Nov 30 04:16:29 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rake/*:  Updated to rake 0.9.5
+	* test/rake/*:  ditto.
+	* NEWS:  ditto.
+
+Fri Nov 30 02:53:47 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* vm.c: add a return hook when a method raises an exception.
+
+	* probes_helper.h: look up klass and method if none are provided.
+
+	* eval.c: update macro usage.
+
+	* vm_eval.c: ditto.
+
+	* vm_insnhelper.c: ditto.
+
+	* test/dtrace/test_function_entry.rb: test for change.
+
+Fri Nov 30 02:27:12 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* compile.c (compile_array_): refix r37991 remove assertion:
+	  it is true only if type == COMPILE_ARRAY_TYPE_HASH.
+	  [ruby-dev:46658] [Bug #7466]
+
+	* vm.c (m_core_hash_from_ary): add assertion instead of above.
+
+	* vm.c (m_core_hash_merge_ary): ditto.
+
+Thu Nov 29 19:15:14 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (compile_array_): hash elements must be paired even for
+	  literal elements.  [ruby-dev:46658] [Bug #7466]
+
+Thu Nov 29 22:39:35 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/openssl/ossl_ssl.c (ssl_npn_encode_protocol_i): fix byte order
+	  issue on big-endian architecture [ruby-core:50292] [Bug #7463]
+
+Thu Nov 29 22:23:31 2012  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* test/openssl/test_cipher.rb (test_ctr_if_exists): add CTR mode test
+	  if underlying OpenSSL supports it. See #4408
+
+Thu Nov 29 21:42:16 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (rb_method_entry_make): add a method entry with
+	  VM_METHOD_TYPE_REFINED to the class refined by the refinement if
+	  the target module is a refinement.  When a method entry with
+	  VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
+	  the same name is searched in refinements.  If such a method is
+	  found, the method is invoked.  Otherwise, the original method in
+	  the refined class (rb_method_definition_t::body.orig_def) is
+	  invoked.  This change is made to simplify the normal method lookup
+	  and to improve the performance of normal method calls.
+
+	* vm_method.c (EXPR1, search_method, rb_method_entry),
+	  vm_eval.c (rb_call0, rb_search_method_entry): do not use
+	  refinements for method lookup.
+
+	* vm_insnhelper.c (vm_call_method): search methods in refinements if
+	  ci->me is VM_METHOD_TYPE_REFINED.  If the method is called by
+	  super (i.e., ci->call == vm_call_super_method), skip the same
+	  method entry as the current method to avoid infinite call of the
+	  same method.
+
+	* class.c (include_modules_at): add a refined method entry for each
+	  method defined in a module included in a refinement.
+
+	* class.c (rb_prepend_module): set an empty table to
+	  RCLASS_M_TBL(klass) to add refined method entries, because
+	  refinements should have priority over prepended modules.
+
+	* proc.c (mnew): use rb_method_entry_with_refinements() to get
+	  a refined method.
+
+	* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
+	  the test because it should pass successfully.
+
+	* test/ruby/test_refinement.rb (test_redefine_refined_method): new
+	  test for the case a refined method is redefined.
+
+Thu Nov 29 17:45:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_const_set): show namespace in warning messages.
+	  [Feature #7190]
+
+Thu Nov 29 17:31:53 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rubygems.rb (Gem.load_yaml): return if Kernel#gem is not defined
+	  yet. This causes crash if test-all requires libraries in a certain
+	  order. A simple reproducible code is
+	  ruby --disable-gem -e'require"yaml";require"minitest/autorun"'
+
+Thu Nov 29 17:19:26 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/tracer.rb:  Updated to match removal of custom_require from
+	  RubyGems.
+	* test/test_tracer.rb:  ditto.  Improved failure message if the test
+	  fails
+
+Thu Nov 29 17:15:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* gc.c: Documentation for GC, GC::Profiler, ObjectSpace, and
+	  ObjectSpace::WeakMap [ruby-core:50245] [Bug #7449]
+
+Thu Nov 29 17:12:26 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/generic_erb.rb, tool/id2token.rb: add --path-separator option
+	  for mingw where make and built ruby live in different world.
+
+	* tool/vpath.rb: extract from tool/instruction.rb.
+
+Thu Nov 29 17:11:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/io/wait/test_io_wait.rb (TestIOWait#fill_pipe):
+	  Errno::EWOULDBLOCK may not be the same as Errno::EAGAIN.  patch by
+	  phasis68 (Heesob Park) at [ruby-core:49894].  [Bug #7420]
+
+Thu Nov 29 17:03:38 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/test_case.rb:  Determine path to certificates to avoid
+	  build-dir problems.
+	* test/rubygems/test_gem_security_signer.rb:  Use predetermined paths
+	  to avoid build-dir problems.
+
+Thu Nov 29 16:18:14 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/test_case.rb:  Disable loading of keys and certificates
+	  outside rubygems or ruby tests as the files are not available (or
+	  necessary).
+
+Thu Nov 29 16:14:41 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c (rb_debug_inspector_open): use RARRAY_LENINT() for
+	  int variable.
+
+Thu Nov 29 15:59:55 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/debug.h: add rb_debug_inspector_* APIs.
+
+	* vm_backtrace.c: ditto.
+
+	* common.mk: add dependency from vm_backtrace.o to
+	  include/ruby/debug.h.
+
+	* proc.c (rb_binding_new_with_cfp): constify.
+
+	* vm.c (rb_vm_get_ruby_level_next_cfp): constify.
+
+	* vm_core.h, vm_trace.c: move decls.
+
+Thu Nov 29 15:56:14 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rdoc/test_case.rb (RDoc::TestCase#verbose_capture_io):
+	  defined for asserts of warnings.
+
+	* test/rdoc: use verbose_capture_io on asserts of warnings.
+	  they failed when tests was run with RUBYOPT=-W0.
+
+Thu Nov 29 15:53:38 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/psych/extconf.rb: added --enable-bundled-libyaml option.  this
+	  enforces using bundled libyaml.
+
+Thu Nov 29 15:51:54 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems*:  Updated to RubyGems 2.0
+	* test/rubygems*:  ditto.
+
+	* common.mk (prelude):  Updated for RubyGems 2.0 source rearrangement.
+
+	* tool/change_maker.rb:  Allow invalid UTF-8 characters in source
+	  files.
+
+Thu Nov 29 15:38:14 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/debug.h: provide rb_tracearg_*() APIs,
+	  instead of rb_tracepoint_attr_*().
+	  These APIs are for debuggers/profilers.
+	  They will be explained in another docs sometime.
+
+	* vm_trace.c: ditto.
+
+Thu Nov 29 15:10:45 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/minitest/test_minitest_unit.rb: restore orig_verbose only
+	  if it is set. This broke rdoc's tests.
+	  http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20121129T050102Z.diff.html.gz
+
+Thu Nov 29 14:56:30 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (rb_tracepoint_attr_method_id):
+	  rename TracePoint#id to TracePoint#method_id.
+
+	* include/ruby/debug.h: ditto.
+
+	* test/ruby/test_settracefunc.rb: ditto,
+
+Thu Nov 29 14:49:10 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (rb_tracepoint_attr_defined_class):
+	  rename TracePoint#klass to TracePoint#defined_class.
+	  [ruby-core:50187] Re: [ruby-trunk - Feature #6895]
+
+	* include/ruby/debug.h: ditto.
+
+	* test/ruby/test_settracefunc.rb: ditto.
+
+Thu Nov 29 14:27:57 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat): prepare Symbol objects at first time
+	  to make it fast.
+
+Thu Nov 29 14:02:15 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat): GC.stat supports new information
+	  * total_allocated_object: total allocated object number.
+	  * total_freed_object: total freed object number.
+	  Above two numbers are only accumulated and they will
+	  overflow (return to 0). Please use them as a hint.
+
+Thu Nov 29 12:13:54 2012  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 4.3.2 (r8026)
+	* test/minitest/*: ditto
+
+Thu Nov 29 11:06:06 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_start_func_2): remove unused code. When
+	  th->safe_level == 4, th->errinfo never be thrown. So, to
+	  create new exception makes no sense.
+
+Thu Nov 29 10:29:53 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c: same as a last patch.
+
+Thu Nov 29 10:24:25 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c: use `long' for return values of `NUM2LONG()'.
+
+Thu Nov 29 09:52:08 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread.c (do_select): suppress warning (uninitialized value warning)
+	  with UNINITIALIZED_VAR().
+
+Thu Nov 29 09:36:09 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (ruby_cleanup): delay THREAD_KILLED timing.
+	  It should be located just before rb_thread_terminate_all().
+
+Thu Nov 29 09:10:17 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c (vm_backtrace_to_ary): support range argument
+	  like Array#[].
+	  [ruby-core:50092] [ruby-trunk - Feature #7434]
+	  Test and document is not available. Please help us.
+
+Thu Nov 29 06:46:33 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_start_func_2): small cleanups.
+
+Thu Nov 29 06:37:08 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_start_func_2): remove unused code.
+	  this function never be used for main thread.
+
+Thu Nov 29 06:27:55 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_start_func_2): remove unused code.
+	  errinfo = th->errinfo; and errinfo = rb_errinfo(); are
+	  the same.
+
+Thu Nov 29 05:26:32 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c (backtrace_to_str_ary2): rename to backtrace_to_str_ary.
+
+	* vm_backtrace.c (rb_backtrace_to_str_ary): use `backtrace_to_str_ary()'.
+
+	* vm_backtrace.c (backtrace_to_frame_ary): rename to
+	  backtrace_to_location_ary.
+
+Thu Nov 29 05:19:25 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* probes.d: Change function-entry probe to method-entry.
+	* insns.def: ditto
+	* probes_helper.h: ditto
+	* test/dtrace/test_function_entry.rb: ditto
+	* test/dtrace/test_singleton_function.rb: ditto
+	* vm.c: ditto
+	* vm_eval.c: ditto
+	* vm_insnhelper.c: ditto
+
+Thu Nov 29 04:45:17 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c: rename Class name from
+	  ::RubyVM::Backtrace and ::RubyVM::Backtrace::Location
+	  to ::Thread::Backtrace and ::Thread::Backtrace::Location.
+
+Wed Nov 28 23:52:02 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* NEWS (Thread) remove incompatible changes about trap.
+
+Wed Nov 28 23:39:01 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_mutex_sleep): fix to allow spurious wakeup.
+	  [ruby-dev:46654] [ruby-trunk - Bug #7455]
+
+	* NEWS: write about spurious wakeup.
+
+Wed Nov 28 22:57:23 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_win32.c: catch up latest change of BLOCKING_REGION.
+
+Wed Nov 28 22:54:21 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_method): fix undefined behavior.
+	  Should not access scope local variable from outer scope.
+
+Wed Nov 28 22:20:55 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* test/ruby/test_thread.rb (test_thread_status_in_trap): change test for
+	  thread status in trap. now can accept Thread#join and Thread#value in trap.
+
+Wed Nov 28 21:58:47 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/thread.h (rb_thread_call_without_gvl2): change
+	  meaning of function.
+	  This function is called with same parameters of
+	  `rb_thread_call_without_gvl()'.
+	  However, if interrupts are detected, then return immediately.
+
+	* thread.c: implement `rb_thread_call_without_gvl2()'.
+
+Wed Nov 28 21:31:21 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* thread.c (thread_join_sleep): check spurious wakeup by itself for
+	corresponding status change in trap context.
+	* vm_core.h (struct rb_thread_struct): add rb_thread_list_t and use as join_list for
+	reentry by trap context.
+	* thread.c (thread_start_func_2): ditto.
+	* thread.c (remove_from_join_list): ditto.
+	* thread.c (rb_thread_atfork): ditto.
+	* thread.c (thread_join): ditto. & remove trap handler check.
+	* thread.c (sleep_forever): add argument : spurious_check.
+	* thread.c (sleep_timeval): ditto.
+	* thread.c (rb_thread_sleep_forever): set spurious_check.
+	* thread.c (rb_thread_sleep_deadly): ditto.
+	* thread.c (sleep_for_polling): ditto.
+	* thread.c (rb_thread_wait_for): ditto.
+	* thread.c (sleep_wait_for_interrupt): bypass spurious_check.
+
+Wed Nov 28 21:23:18 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/psych/yaml/emitter.c (yaml_emitter_write_indicator): constify.
+
+	* ext/psych/yaml/emitter.c (yaml_emitter_write_block_scalar_hints):
+	  ditto.
+
+	* ext/psych/extconf.rb: mingw32 also needs macros for win32, not
+	  only mswin32.
+
+	* ext/psych/extconf.rb: compile sources in the source directory
+	  without copying by using VPATH.
+
+Wed Nov 28 21:18:57 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#each_compile_rules): splat $(*VPATH*) for
+	  each VPATH elements.
+
+Wed Nov 28 16:40:14 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_core.h (enum rb_thread_status): remove THREAD_TO_KILL
+	* vm_core.h (struct rb_thread_struct): add to_kill field
+	* thread.c (terminate_i): convert THREAD_TO_KILL to to_kill.
+	* thread.c (rb_threadptr_to_kill): ditto.
+	* thread.c (rb_thread_kill): ditto.
+	* thread.c (rb_thread_wakeup_alive): ditto.
+	* thread.c (thread_list_i): ditto.
+	* thread.c (static const char): ditto.
+	* thread.c (thread_status_name): ditto.
+	* thread.c (rb_thread_status): ditto.
+	* thread.c (rb_thread_inspect): ditto.
+	* vm_backtrace.c (thread_backtrace_to_ary): ditto.
+
+	* thread.c (rb_threadptr_execute_interrupts): fix thread status
+	  overwritten issue. [Bug #7450] [ruby-core:50249]
+
+	* test/ruby/test_thread.rb (test_hread_status_raise_after_kill):
+	  test for the above.
+	* test/ruby/test_thread.rb (test_thread_status_in_trap): test for
+	  thread status in trap.
+	* test/ruby/test_thread.rb (test_status_and_stop_p): remove
+	  Thread.control_interrupt unsafe test. Thread#kill no longer
+	  changes thread status. Instead of, Thread#kill receiver changes
+	  their own status when receiving kill signal.
+
+Wed Nov 28 16:21:46 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (struct rb_mutex_struct): add allow_trap field.
+	* internal.h (rb_mutex_allow_trap): added.
+	* thread.c (rb_mutex_lock, rb_mutex_unlock): check mutex->allow_trap.
+	* thread.c (mutex_sleep): remove trap check because it uses
+	  rb_mutex_lock and rb_mutex_unlock internally.
+	* thread.c (rb_mutex_allow_trap): new helper function for the above.
+
+	* io.c (io_binwrite): mark fptr->write_lock as writable in trap.
+
+	* test/ruby/test_signal.rb (test_trap_puts): test for the above.
+
+Wed Nov 28 16:59:12 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c: remove Proc#== and Proc#eql?.
+	  Proc objects compared with their object ids.
+	  [Bug #4559]
+
+	* test/ruby/test_proc.rb: remove related test.
+
+Wed Nov 28 16:41:04 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/servlet.rb:  Add support for serving documentation from a
+	  subdirectory.
+	* lib/rdoc/generator/darkfish.rb:  ditto
+	* test/rdoc/test_rdoc_servlet.rb:  Test for above
+	* test/rdoc/test_rdoc_servlet.rb:  ditto
+
+Wed Nov 28 15:37:17 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: fix r37924: run only on i[3-6]86-linux.
+
+Wed Nov 28 15:31:11 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (FMODE_SYNCWRITE): removed unused macro.
+
+Wed Nov 28 15:19:25 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* configure.in: revert r37911, r37906 and r37904 which break build
+	  with non-gcc and/or non-IA32 compilers, e.g. Solaris Studio,
+	  Fujitsu C Compiler. [ruby-dev:46646] [Bug #7451]
+
+Wed Nov 28 14:50:55 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/psych/extconf.rb: copy sources into build directory,
+	  not into srcdir.
+
+Wed Nov 28 14:34:06 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_mutex_lock): moved trap context check from
+	  rb_mutex_trylock because try_lock have no change to make
+	  a deadlock.
+	* thread.c (rb_mutex_trylock): ditto.
+	* NEWS: news for the above.
+
+Wed Nov 28 13:39:54 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_s_new): uses main_thread->status instead of
+	  th->inhibit_thread_creation for preventing thread creation.
+	* vm_core.h (rb_vm_struct): remove inhibit_thread_creation field.
+	* thread.c (rb_thread_terminate_all): ditto.
+
+Wed Nov 28 13:27:29 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/extconf.rb: use embedded libyaml if no system libyaml is
+	  found. [ruby-core:49463]
+	* ext/psych/lib/psych.rb: updating to psych 2.0.0
+	* ext/psych/lib/psych/deprecated.rb: updated docs
+	* ext/psych/psych.gemspec: updated to psych 2.0.0
+	* ext/psych/psych.h: fixing header file include for rename
+	* ext/psych/psych_emitter.c: renamed to avoid libyaml conflict.
+	* ext/psych/psych_emitter.h: ditto
+	* ext/psych/psych_parser.c: ditto
+	* ext/psych/psych_parser.h: ditto
+	* ext/psych/psych_to_ruby.c: ditto
+	* ext/psych/psych_to_ruby.h: ditto
+	* ext/psych/psych_yaml_tree.c: ditto
+	* ext/psych/psych_yaml_tree.h: ditto
+	* ext/psych/yaml/LICENSE: embedding libyaml 0.1.4
+	* ext/psych/yaml/api.c: ditto
+	* ext/psych/yaml/config.h: ditto
+	* ext/psych/yaml/dumper.c: ditto
+	* ext/psych/yaml/emitter.c: ditto
+	* 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.h: ditto
+	* ext/psych/yaml/yaml_private.h: ditto
+
+Wed Nov 28 12:54:59 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_join): A trap handler check was moved from
+	  thread_join_m because Thread#value should be raised an exception
+	  too.
+	* thread.c (thread_join_m): remove trap handler check.
+	* test/ruby/test_thread.rb (test_thread_join_in_trap): add test
+	  for thread#value.
+	* NEWS: documentation fix for the above.
+
+Wed Nov 28 11:07:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/fiddle/closure.c: Documentation for Fiddle
+	* ext/fiddle/lib/fiddle/import.rb: ditto
+	* ext/fiddle/lib/fiddle/value.rb: ditto
+	* ext/fiddle/lib/fiddle/pack.rb: ditto
+	* ext/fiddle/lib/fiddle/cparser.rb: ditto
+	* ext/fiddle/lib/fiddle/struct.rb: ditto
+	* ext/fiddle/lib/fiddle/function.rb: ditto
+
+Wed Nov 28 09:15:51 2012  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* ext/strscan/strscan.c: Added #charpos for multibyte string position.
+	* test/strscan/test_stringscanner.rb: ditto
+
+Wed Nov 28 09:00:34 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/fiddle.c: adding alignment constants for compatibility
+	  with DL.
+	* ext/fiddle/fiddle.h: ditto
+	* ext/fiddle/lib/fiddle/cparser.rb: importing the C parser for DL
+	  backwards compatibility.
+	* ext/fiddle/lib/fiddle/import.rb: importing the import DSL for DL
+	  backwards compatibility.
+	* ext/fiddle/lib/fiddle/pack.rb: importing structure pack for DL
+	  backwards compatibility.
+	* ext/fiddle/lib/fiddle/value.rb: ditto
+	* ext/fiddle/lib/fiddle/struct.rb: importing struct DSL for DL backwards
+	  compatibility.
+	* test/dl/test_c_struct_entry.rb: importing tests
+	* test/dl/test_c_union_entity.rb: ditto
+	* test/dl/test_cparser.rb: ditto
+	* test/dl/test_import.rb: ditto
+	* test/fiddle/test_c_struct_entry.rb: ditto
+	* test/fiddle/test_c_union_entity.rb: ditto
+	* test/fiddle/test_cparser.rb: ditto
+	* test/fiddle/test_import.rb: ditto
+
+Wed Nov 28 08:56:00 2012  Zachary Scott <zachary@zacharyscott.net>
+
+	* doc/globals.rdoc: Add documentation file for magic globals
+	[ruby-core:29048] [Bug #3022]
+
+Wed Nov 28 08:55:00 2012  Zachary Scott <zachary@zacharyscott.net>
+
+	* .document: Add README's to be included with docs
+
+Wed Nov 28 08:26:00 2012  Zachary Scott <zachary@zacharyscott.net>
+
+	* ext/dl/lib/dl.rb: Deprecation notice for DL
+
+Wed Nov 28 08:25:00 2012  Zachary Scott <zachary@zacharyscott.net>
+
+	* ext/fiddle/closure.c: Documentation for Fiddle
+	* ext/fiddle/pointer.c: ditto
+	* ext/fiddle/function.c: ditto
+	* ext/fiddle/lib/fiddle.rb: ditto
+	* ext/fiddle/fiddle.c: ditto
+	* ext/fiddle/handle.c: ditto
+
+Wed Nov 28 04:53:40 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/handle.c: Make Fiddle independent of DL, copy DL::Handle
+	  to Fiddle::Handle.
+	* ext/fiddle/pointer.c: Make Fiddle independent of DL, copy
+	  DL::Pointer to Fiddle::Pointer.
+	* test/fiddle/test_func.rb: relevant tests
+	* test/fiddle/test_handle.rb: ditto
+	* test/fiddle/test_pointer.rb: ditto
+	* ext/dl/lib/dl/struct.rb: use Fiddle::Pointer if available
+	* ext/fiddle/extconf.rb: check for dlfcn.h
+	* ext/fiddle/fiddle.c: add constants for sizeof() things
+	* ext/fiddle/fiddle.h: include dlfcn.h
+	* ext/fiddle/function.c: expose a C function for creating new
+	  Fiddle::Function objects.
+	* ext/fiddle/lib/fiddle.rb: include constants for dl backwards compat
+	* ext/fiddle/lib/fiddle/function.rb: read the pointer from the
+	  function for dl backwards compat.
+	* test/dl/test_callback.rb: check the addresses of the pointers rather
+	  than their types.
+	* test/fiddle/helper.rb: remove dependency on dl
+	* test/fiddle/test_closure.rb: ditto
+	* test/fiddle/test_fiddle.rb: ditto
+
+Wed Nov 28 03:03:28 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (opt-dir): don't use non portable flag -E of sed.
+
+Wed Nov 28 02:55:35 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (ARCH_FLAG): __sync_val_compare_and_swap_4 needs
+	  -march=$target_cpu on at least linux gcc 4.1.
+	  patched by KOSAKI Motohiro
+
+Tue Nov 27 22:03:09 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* string.c (rb_str_enumerate_chars, rb_str_enumerate_codepoints)
+	  (rb_str_enumerate_lines): Dummy initialization of ary has been
+	  replaced with UNINITIALIZED_VAR().
+
+Tue Nov 27 21:29:00 2012  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (bigdivrem): optimize the way to retry calculation of
+	  bigdivrem so that the calculation is started from the point where
+	  the last interruption was occurred.
+
+	* bignum.c (bigdivrem1): ditto.
+
+	* test/ruby/test_bignum.rb: add a test case for rb_bigdivrem in the
+	  case that an interruption is occurred during bigdivrem1 is running.
+
+Tue Nov 27 19:56:43 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (rb_vm_make_env_object): make Proc object if Env is possible
+	  to point block.
+	  [ruby-core:41038] [ruby-trunk - Bug #5634]
+
+	* vm.c (rb_vm_make_proc): No need to make Proc object here.
+
+	* bootstraptest/test_proc.rb: add tests.
+
+Tue Nov 27 18:51:06 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ruby_atomic.h (ATOMIC_CAS): added for Solaris and other platforms.
+	* ruby_atomic.h, signal.c (NEED_RUBY_ATOMIC_OPS): renamed from
+	  NEED_RUBY_ATOMIC_EXCHANGE.
+	* signal.c (ruby_atomic_compare_and_swap): naive, non-atomic
+	  compare-and-swap implementation only used for platforms without
+	  valid support for atomic operations.
+
+Tue Nov 27 17:43:46 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/*:  Added --root option for building documentation outside
+	  the source directory.
+	* test/rdoc/*:  ditto
+	* common.mk (rdoc):  Added --root to rdoc rule
+
+Tue Nov 27 16:24:45 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rdoc/test_rdoc_ri_paths.rb:  Fixed duplicate path bug which
+	  caused windows failures.
+
+Tue Nov 27 16:06:00 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rdoc/test_rdoc_generator_darkfish.rb:  Updated tests for windows
+	* test/rdoc/test_rdoc_options.rb:  ditto
+	* test/rdoc/test_rdoc_parser.rb:  ditto
+	* test/rdoc/test_rdoc_rdoc.rb:  ditto
+	* test/rdoc/test_rdoc_ri_driver.rb:  ditto
+	* test/rdoc/test_rdoc_servlet.rb:  ditto
+
+Tue Nov 27 15:13:51 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* common.mk (rdoc):  Set --debug for rdoc generation in case of bugs
+
+Tue Nov 27 14:56:45 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/rubygems_hook.rb:  Updated for (upcoming) RubyGems 2
+	  import.
+	* test/rdoc/test_rdoc_rubygems_hook.rb:  ditto
+
+Tue Nov 27 13:59:29 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* NEWS: add improvements of the garbage collector.
+
+Tue Nov 27 13:27:46 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc*:  Updated to RDoc 4.0 (pre-release)
+	* bin/rdoc:  ditto
+	* test/rdoc*:  ditto
+	* NEWS:  Updated with RDoc 4.0 information
+
+Tue Nov 27 12:17:11 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_terminate_all): retry broadcast only when
+	  an exception is raised.
+
+Tue Nov 27 12:02:25 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_terminate_all): broadcast terminate event
+	  not only an interrupt exception but any exceptions.
+
+Tue Nov 27 10:55:09 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* eval.c (ruby_cleanup): set thread status to THREAD_KILLED
+	  for preventing thr.raise.
+	* test/ruby/test_thread.rb (test_main_thread_status_at_exit):
+	  test for the above.
+
+Tue Nov 27 10:31:29 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_terminate_all): suppress a warning.
+
+Tue Nov 27 09:29:11 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_join): raises ThreadError if target thread
+	  is a main thread.
+	* test/ruby/test_thread.rb (test_thread_join_main_thread):
+	  test for the above.
+	* NEWS: news for the above.
+
+Tue Nov 27 09:24:47 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_join): raises ThreadError if target thread
+	  is a current thread.
+	* test/ruby/test_thread.rb (test_thread_join_current):
+	  test for the above.
+	* NEWS: news for the above.
+
+Tue Nov 27 09:59:16 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): close mkmf.log for each libraries so that
+	  failure messages are not mixed.
+
+Tue Nov 27 09:58:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/digest/*/extconf.rb, ext/openssl/extconf.rb: get git rid of
+	  post-1.8 feature require_relative for cross compilation.
+	  [ruby-core:50160] [Bug #7439]
+
+Tue Nov 27 09:17:59 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* NEWS: add TracePoint.
+
+Tue Nov 27 08:16:03 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: rename TracePoint#file and TracePoint#line
+	  to TracePoint#path and TracePoint#lineno respectively.
+	  They are consistent to RubyVM::Backtrace::Location.
+
+	* include/ruby/debug.h: ditto.
+
+	* vm_core.h: ditto.
+
+	* test/ruby/test_settracefunc.rb: ditto.
+
+Tue Nov 27 08:04:26 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_terminate_all): broadcast eTerminateSignal
+	  again when Ctrl-C was pressed. [Feature #1952] [ruby-dev:39107]
+
+Tue Nov 27 07:58:03 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: add members to rb_trace_arg_t:
+	  * `klass_solved' represents klass and id is checked.
+	  * `line' represents line calculated from cfp.
+	  * `file' represents line calculated from cfp.
+
+	* vm_trace.c: fix to use above data structures.
+	  No need to calculate klass and id, line and file
+	  pairs for each trace points.
+
+Tue Nov 27 07:47:09 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_terminate_all): add RUBY_VM_CHECK_INTS_BLOCKING().
+	  Otherwise the loop in this function behave as busy loop because
+	  native_sleep() return immediately when RUBY_VM_INTERRUPTED() is true.
+
+Tue Nov 27 04:12:49 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): git rid of post-1.8 features for cross
+	  compilation.  [ruby-core:50160] [Bug #7439]
+
+Tue Nov 27 00:13:41 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_mutex_trylock, rb_mutex_unlock, mutex_sleep):
+	  raises ThreadError if called from trap handler as Thread#join.
+	* NEWS: news for the above.
+
+Mon Nov 26 23:55:33 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* NEWS: update for Thread#join incompatible change.
+
+Mon Nov 26 22:44:24 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_terminate_all): use native_sleep() instead
+	  of rb_thread_schedule(). Otherwise, it consume 100% cpu meaninglessly.
+	  [Bug #5368] [ruby-dev:44546]
+	* thread.c (thread_start_func_2): last sub-thread wakes up main thread.
+
+Mon Nov 26 21:16:04 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_core.h (RUBY_VM_SET_TIMER_INTERRUPT, RUBY_VM_SET_INTERRUPT)
+	(RUBY_VM_SET_FINALIZER_INTERRUPT, RUBY_VM_SET_TRAP_INTERRUPT)
+	(RUBY_VM_INTERRUPTED): use enum symbol instead of immediate value.
+	* thread.c (thread_join_m, rb_threadptr_execute_interrupts): ditto.
+	* signal.c (signal_exec): ditto.
+
+Mon Nov 26 20:23:20 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_join_m): use th->interrupt_mask instead of
+	  th->in_trap.
+
+	* vm_core.h (struct rb_thread_struct): remove in_trap member.
+	* signal.c (signal_exec): ditto.
+	* thread.c (thread_create_core): ditto.
+	* thread.c (Init_Thread): ditto.
+
+Mon Nov 26 20:23:49 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_argf.rb (TestArgf#test_chars): since marshal data is
+	  binary, shouldn't pass via text mode.  use base64 encoded data.
+
+Mon Nov 26 19:45:18 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ruby_atomic.h (ATOMIC_CAS): new macro for compare-and-exchange.
+
+	* vm_core.h (struct rb_thread_struct): add interrupt_mask member.
+	* thread.c (thread_create_core, Init_Thread): initialize
+	  th->thread_mask.
+
+	* vm_core.h (RUBY_VM_INTERRUPTED_ANY): new macro for avoiding
+	  bare th->interrupt_flag.
+	* vm_core.h (RUBY_VM_INTERRUPTED, RUBY_VM_INTERRUPTED): check
+	  th->interrupt_mask.
+	* thread.c (set_unblock_function, rb_thread_schedule): replace
+	  th->interrupt_flag with RUBY_VM_INTERRUPTED_ANY()
+
+	* signal.c (signal_exec): set up thread->interrupt_mask for
+	  preventing recursive trap handler.
+	* vm_core.h (RUBY_VM_CHECK_INTS, RUBY_VM_CHECK_INTS_BLOCKING): ditto.
+
+	* thread.c (rb_threadptr_execute_interrupts):
+	  don't process interrupt if it is masked.
+	  [Bug #6009] [ruby-core:42524]
+
+Mon Nov 26 19:43:42 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (make_compile_option_value): add trace_instruction option.
+	  a patch by davidbalbert (David Albert).
+	  [Bug #6786]
+
+Mon Nov 26 19:10:53 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_thread.rb: try to `join' each 100
+	  threads.
+	  This benchmark seems consuming long time on travis-ci
+	  several times (and make `failure').
+
+Mon Nov 26 18:22:56 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: specify label `built-ruby'.
+
+	* benchmark/driver.rb: quote path.
+
+Mon Nov 26 18:26:28 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (signal_exec): add volatile to make sure setjmp safe.
+
+Mon Nov 26 18:19:47 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (signal_exec): suppress "warning: variable 'signum'
+	  might be clobbered by 'longjmp' or 'vfork'" warning.
+
+Mon Nov 26 18:15:47 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: accept multiple `-e'.
+	  You don't need to use `;' separation character.
+	  [ruby-core:50139] [ruby-trunk - Bug #7380]
+
+Mon Nov 26 17:10:04 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* string.c (rb_str_enumerate_chars, rb_str_enumerate_codepoints)
+	(rb_str_enumerate_lines): suppress "may be used uninitialized in
+	  this function" warning.
+
+Mon Nov 26 17:00:12 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_core.h (rb_thread_struct): added 'in_trap' member for marking
+	  running trap handler.
+	* signal.c (signal_exec): turn on in_trap when running trap.
+	* thread.c (Init_Thread, thread_create_core): initialize in_trap
+	  when creating new threads.
+	* thread.c (thread_join_m): raise ThreadError when running trap
+	  handler.Bug [#6416][ruby-core:44956]
+	* test/ruby/test_thread.rb (test_thread_join_in_trap): new test
+	  for the above.
+
+Mon Nov 26 16:36:13 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (argf_each_codepoint): add missing ARGF#codepoints [Bug #7438]
+
+Mon Nov 26 15:50:29 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* bignum.c (bigdivrem): restart calculation when bigdivrem1 was
+	  interrupted by signal. Otherwise, ruby script may see a garbage
+	  value.
+
+Mon Nov 26 15:33:02 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* bignum.c (big_div_struct): added volatile to 'stop' member.
+	  Otherwise, "if (bds->stop)" check in bigdivrem1 don't read
+	  memory and ignore interrupt.
+	* bignum.c (bigdivrem, rb_big_stop): ditto.
+
+Mon Nov 26 12:11:09 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (DLNOBJ): missing in r37821.
+
+Mon Nov 26 10:50:19 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_process.rb (test_setsid): added a few wait for
+	  preventing that Process.getsid(io.pid) makes Errno::ESRCH.
+
+Sun Nov 25 22:34:00 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* array.c (ary_resize_smaller): new function to resize array.
+
+	* array.c (rb_ary_delete): refactoring to extract a function.
+
+	* array.c (rb_ary_delete_same): refactoring.
+	  It renames function, reduces duplicated code and removes unused
+	  code.
+
+	* gc.c (wmap_final_func): follow the above change.
+
+	* internal.h (rb_ary_delete_same): ditto.
+
+Sun Nov 25 22:27:33 2012  Benoit Daloze  <eregontp@gmail.com>
+
+	* array.c: fixes for the updated documentation in r35858:
+	  Typos and #take/#drop accept to take/drop 0 elements.
+
+Sun Nov 25 19:43:29 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* NEWS: add a news about iconv.
+
+Sun Nov 25 03:49:23 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb, test/test_set.rb: Move tests embedded in lib/set.rb
+	  to test/test_set.rb.
+
+Sun Nov 25 03:44:50 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* string.c (rb_str_each_line, rb_str_lines): String#lines now
+	  returns an array instead of an enumerator.  Passing a block is
+	  deprecated but still supported for backwards compatibility.
+	  Based on the patch by yhara. [Feature #6670]
+
+	* string.c (rb_str_each_char, rb_str_chars): Ditto for
+	  String#chars.
+
+	* string.c (rb_str_each_codepoint, rb_str_codepoints): Ditto for
+	  String#codepoints.
+
+	* string.c (rb_str_each_byte, rb_str_bytes): Ditto for
+	  String#bytes.
+
+	* NEWS: Add notes for the above changes.
+
+Sun Nov 25 02:07:37 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_warning)
+	  (Test::Unit::Assertions#assert_warn), test/ruby/envutil.rb,
+	  test/ruby/test_enumerator.rb, test/ruby/test_io_m17n.rb,
+	  test/ruby/test_regexp.rb, test/ruby/test_syntax.rb:
+	  assert_warn() and assert_warning() are reversed.
+
+Sat Nov 24 21:08:50 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* gc.c (wmap_final_func): rename variables to clarify the meaning.
+	  In wmap2obj the key is WeakRef and the value is referenced object.
+	  In obj2wmap the key is referenced object and the value is an array
+	  of WeakRef.
+
+	* gc.c (wmap_finalize): ditto.
+	  [ruby-core:49044] [Bug #7304]
+
+Sat Nov 24 21:01:55 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* array.c (rb_ary_delete_same_obj): new function for WeakRef.
+	  This deletes same objects as item argument in the array.
+
+	* internal.h (rb_ary_delete_same_obj): add a declaration.
+
+	* gc.c (wmap_final_func): remove WeakRef object reference from the
+	  array. rb_ary_delete() is not usable because it uses rb_equal() to
+	  compare object references.
+
+	* gc.c (wmap_finalize): remove recycled object references from weak
+	  map hash properly. How to get object reference from object id was
+	  wrong. st_delete() doesn't work properly if key and value arguments
+	  are same. The key of obj2wmap is referenced object and the value of
+	  obj2wmap is WeakRef array.
+
+	* gc.c (wmap_aset): obj2wmap should contain WeakRef array in the
+	  definition.
+
+	* test/test_weakref.rb
+	  (TestWeakRef#test_not_reference_different_object,
+	   TestWeakRef#test_weakref_finalize): add tests for above.
+	  [ruby-core:49044] [Bug #7304]
+
+Sat Nov 24 19:44:41 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (unicode_iconv_combine): returning flags are
+	  nkf_char.
+
+Sat Nov 24 19:29:18 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/ruby/test_rubyoptions.rb (test_usage, test_usage_long):
+	  reduced, renamed.
+
+Sat Nov 24 13:10:14 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (rb_tracepoint_attr_raised_exception): should not check
+	  value before event checking.
+
+	* vm_trace.c (rb_tracepoint_attr_return_value): ditto.
+
+	* test/ruby/test_settracefunc.rb: add tests for TracePoint#return_value
+	  and TracePoint#raised_exception.
+
+Sat Nov 24 12:47:27 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/test_process.rb (TestProcess#test_setsid): "./ruby-trunk"
+	  doesn't work on all environments. EnvUtil.rubybin would be suitable.
+
+Sat Nov 24 12:28:04 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* array.c (rb_ary_aref): fix Segmentation fault at TestArray#test_aref
+	  on x64 mingw. Variable argument of rb_scan_args() should be a pointer
+	  (VALUE *), but 0 of variable argument seems not equal to null pointer
+	  on x64 mingw.
+
+Sat Nov 24 11:47:14 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (proc_getsid): adds new method for getting session id.
+	  Contributed from fumiyas (Fumiyasu SATOH). Thank you!
+	  [Feature #6757] [ruby-dev:45977]
+	* configure.in: adds getsid check.
+	* test/ruby/test_process.rb (TestProcess#test_setsid): new test
+	  for the above.
+	* NEWS: news for the above.
+
+Sat Nov 24 10:59:14 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (thread_create_core): don't use th->thread_id before
+	  initialized.
+
+Sat Nov 24 00:00:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options, process_options, ruby_process_options): take
+	  care of the case argc is 0, and check if argv has NULL.
+	  [ruby-core:49889] [Bug #7423]
+
+Sat Nov 24 00:00:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (--disable-dln): option to disable dynamic linking
+	  feature.  [ruby-core:37676] [Feature #4946]
+
+Fri Nov 23 23:44:41 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#pkg_config): strip all white spaces for
+	  mingw64+MSYS pkg-config which erroneously emits extra newlines.
+	  [ruby-core:47998] [Bug #7163]
+
+Fri Nov 23 17:31:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (usage): wrap description lines if options are too long.
+
+Fri Nov 23 11:13:46 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_usage2): refine
+	  assertion.
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_usage2): now
+	  --help option is for modern terminals.
+
+Fri Nov 23 10:45:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/socket/ipsocket.c (IPSocket#peeraddr): Fix example
+	  [ruby-core:46429] [Bug #6732]
+
+Fri Nov 23 02:40:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/cgi/core.rb: Documentation for CGI#header alias
+	  Based on a patch by Marcus Stollsteimer
+	  [ruby-core:49585] [Bug #7405]
+
+Thu Nov 22 23:48:10 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (is_swept_object): extract from is_dead_object().
+
+	* gc.c (rb_gcdebug_print_obj_condition): add the function for debug.
+	  This function shows some conditions of given object (e.g.,
+	  marked, in heap, swept).
+
+	* gc.c (rb_gcdebug_sentinel): add the function for debug.
+	  This function allow check to inadvertently free up an object.
+
+Thu Nov 22 23:45:18 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* array.c (rb_ary_shared_with_p): fix cache validity check.
+	  If #pop or #shift has been called against $: or $", the array will
+	  be still shared with the snapshot. We check array length for cache
+	  validity.
+	  [ruby-core:49518] [Bug #7383]
+
+	* test/ruby/test_require.rb
+	  (TestRequire#test_require_with_array_pop,
+	   TestRequire#test_require_with_array_shift): add tests for above.
+
+Thu Nov 22 21:48:48 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk, win32/Makefile.sub (probes.dmyh): now be made in current
+	  (=build) directory if build from the repository.
+
+Thu Nov 22 21:34:51 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/ruby/test_rubyoptions.rb: added a test.
+
+Thu Nov 22 20:32:07 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (string_to_c_strict, string_to_c): check NUL.
+	* rational.c (string_to_r_strict, string_to_r): ditto.
+
+Thu Nov 22 20:21:45 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* Makefile.in (.dmyh.h): removed $(VPATH). GNU make don't
+	  recognize suffix rule with VPATH.
+
+Thu Nov 22 18:11:27 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk, Makefile.in, win32/Makefile.sub (.dmyh.h): nmake merges
+	  explicit rules for same target, but not merges explicit rules and
+	  implicit rules -- always explicit rules win.  So, need to add an
+	  explicit rule for probes.h.  [Bug #7421] [ruby-core:49839]
+
+Thu Nov 22 18:01:28 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Makefile.in (probes.o): add -C to ignore #include in probes.d.
+
+	* probes.d: include vm_opts.h instead of vm_core.h.
+
+	* vm_opts.h (VM_COLLECT_USAGE_DETAILS): move definition from vm_core.h.
+
+Thu Nov 22 17:45:17 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8: Merge b0a6577a521d1bba5e19853f95d5c4b9be1072b5.
+	  Support JIS X 0213 and some bugfixes.
+
+Thu Nov 22 17:39:37 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* tool/gen_dummy_probes.rb: don't change #include, #if and #endif
+	  lines. [Bug #7370]
+
+Thu Nov 22 16:58:26 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* Makefile.in: run preprocessor when making probe.h
+	* probes.d: define probe insn and insn__operand only when
+	  VM_COLLECT_USAGE_DETAILS is 1. [Bug #7370]
+
+Thu Nov 22 16:20:49 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm.c: Don't define vm_collect_usage_operand() and
+	  static void vm_collect_usage_insn() when disabling
+	  VM_COLLECT_USAGE_DETAILS. (refix r37796)
+
+Thu Nov 22 15:26:02 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_insnhelper.h: partly revert r37631 (DTrace support).
+	  "vm usage information is always collected, so uncomment the
+	  functions." causes performance impact. [Bug #7370]
+	  Off course this revert disables related probes.
+
+Thu Nov 22 14:14:36 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* re.c (rb_memsearch_ss): Apply performance improvement to short
+	  byte array search for platforms without memmem(3).
+	  [Feature #6311] [ruby-dev:45530]
+
+Thu Nov 22 12:52:19 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/ruby/test_string.rb (TestString#test_index): Add some
+	  corner cases to tests for String#index, which might fail if ruby
+	  directly used a buggy memmem(3) implementation.
+
+Thu Nov 22 08:06:42 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* test/ruby/test_gc.rb (test_profiler_clear): fix wrong method
+	  calls [Bug #7419] [ruby-core:49828].
+
+Thu Nov 22 02:22:33 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* NEWS: edited (order etc).
+
+Wed Nov 21 22:52:59 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/wait/wait.c (io_wait_readable): add alias wait_readable.
+
+	* ext/io/wait/wait.c (io_wait_writable): this is easier to use than
+	  IO.select for a single IO object and is immune to the
+	  limitations/inefficiency of select() on platforms where poll/ppoll
+	  is available.  patched by Eric Wong.  [Feature #4646]
+
+Wed Nov 21 22:27:52 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (garbage_collect): remove a duplicative probe.
+
+Wed Nov 21 22:08:48 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (gc_profile_clear): realloc profile records if its size is
+	  higher than the threshold, GC_PROFILE_RECORD_DEFAULT_SIZE * 2.
+
+Wed Nov 21 21:53:29 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_to_c): added.
+
+Wed Nov 21 21:35:38 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* include/ruby/util.h: removed extra semicolon in definition of
+	  macro.
+	* compile.c: ditto.
+	* cont.c: ditto.
+	* math.c: ditto.
+	* node.c: ditto.
+	* parse.y: ditto.
+
+Wed Nov 21 18:46:37 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (read_digits): due to a bit tighter rb_cstr_to_inum().
+
+Wed Nov 21 16:13:37 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_so_nsieve_bits.rb: add an encoding pragma because
+	  this benchmark using strings (literals) as binary sequence.
+	  Now, they are UTF-8 strings. [ruby-dev:46578]
+
+Wed Nov 21 00:57:43 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* file.c (Init_File): null device definition uses rb_define_const
+	  instead of rb_file_const.
+
+Wed Nov 21 00:28:18 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_m17n_comb.rb (test_str_crypt): Use RbConfig to get
+	  libc's directory. Patched by Vit Ondruch [ruby-core:49763] [Bug #7312]
+
+Tue Nov 20 23:28:26 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* marshal.c: add marshal readahead. marshalized Array, Hash and Struct
+	  have size at least number of its elements, marshal readahead will
+	  read the certain readable length and buffer when it needs more bytes.
+	  marshal readahead prevents many calls to IO#getbyte and IO#read,
+	  then it enables performance improvement.
+	  [ruby-dev:45637] [Feature #6440]
+
+Tue Nov 20 22:35:02 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Makefile.in (.d.h): replace char * to const char * because somehow
+	  current dtrace removes const of function declaration in probes.d.
+
+Tue Nov 20 21:41:04 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/debug.h: introduced.
+	  Debugging/profiling features will be located.
+
+	* vm_trace.c: expose C-level TracePoint APIs.
+	  Note that they are experimental.
+
+	* vm_trace.c, include/ruby/debug.h: rename `rb_hook_flag_t'
+	  to `rb_event_hook_flag_t'.
+	  Macro names `RUBY_HOOK_FLAG_*' are also renamed to
+	  `RUBY_EVENT_HOOK_FLAG_*'.
+
+	* debug.h, vm_debug.h: rename debug.h to vm_debug.h.
+
+	* common.mk: ditto.
+
+	* debug.c, main.c, vm_core.h: ditto.
+
+Tue Nov 20 21:12:37 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (RUBY_DTRACE_AVAILABLE): only check dtrace availability.
+
+	* configure.in (RUBY_DTRACE_POSTPROCESS): restore.
+
+Tue Nov 20 21:22:44 2012  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_type.rb (test_implemented_ole_types):
+	  IShellDispatch6 bundled in Windows 8. Thanks to phasis68 (Heesob
+	  Park).  [ruby-core:49580][Bug #7403]
+
+Tue Nov 20 21:06:41 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: some improvements.
+	* rational.c: ditto.
+
+Tue Nov 20 21:01:16 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (incs): BSD make cannot deal with non-prefixed dependency
+	  and prefixed target.
+
+Tue Nov 20 20:10:23 2012  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* array.c (rb_ary_bsearch): fix rdoc bug (O(n log n) -> O(log n)).
+	  Patch by Charlie Somerville.  [ruby-core:49661] [Bug #7409]
+
+	* range.c (range_bsearch): ditto.
+
+Tue Nov 20 19:02:44 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: rename and add TracePoint APIs.
+	  (1) TracePoint.new(...){...} creates a new trace point
+	      but does not make it enable.
+	  (2) TracePoint.trace(...){...} creates a new trace point
+	      and enable it (same as old behavior).
+	  (3) TracePoint#enable make it enable (renamed from TracePoint#retrace).
+	      If block given, when enable only in block.
+	  (4) TracePoint#disable make it disable (renamed from TracePoint#untrace).
+	      If block given, when disable only in block.
+	  (5) TracePoint#enabled? returns this trace is enable or not.
+	  [Feature #6895]
+
+	* test/ruby/test_settracefunc.rb: add tests.
+
+Tue Nov 20 18:35:05 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: add two methods:
+	  (1) TracePoint#return_value which returns return
+	      value on the :return and :c_return event.
+	  (2) TracePoint#raised_exception which returns raised exception
+	      value on the :raise event.
+	  Each methods raise RuntimeError if it is called at unsupported
+	  event.
+	  Please review and give us feedback until next preview
+	  release (Dec/2012) of Ruby 2.0.0.
+	  [Feature #6895]
+
+	* insns.def, vm.c, vm_eval.c, vm_insnhelper.c, eval.c, thread.c:
+	  ditto.
+
+	* vm_trace.c, vm_core.h: move definition of rb_trace_arg_t from
+	  vm_trace.c to vm_core.h.
+	  Caller fills rb_trace_arg_t and pass the pointer of this variable.
+
+	* test/ruby/test_settracefunc.rb: fix tests to test this change.
+
+Tue Nov 20 17:31:12 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: fix dtrace didn't work on darwin.
+
+	* configure.in (RUBY_DTRACE_AVAILABLE): unify RUBY_DTRACE_POSTPROCESS
+	  and RUBY_DTRACE_BSD_BROKEN.
+
+Tue Nov 20 15:20:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* file.c (File.extname): Documentation for extname on dotfiles and
+	files ending with a dot. Also, added example for this.
+	[ruby-core:47852] [Bug #7112]
+
+Tue Nov 20 14:19:20 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_signal.rb (TestSignal#test_signame): fix windows
+	  test failure. Process.kill on windows can't send a signal to
+	  another process.
+
+Tue Nov 20 13:58:11 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (Init_IO): moved all rb_file_const() into file.c.
+	* file.c (Init_File): replace with rb_file_const() with
+	  rb_define_const() because RDoc don't care rb_file_const.
+	  [Bug #5530]
+
+Tue Nov 20 12:35:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ruby.c (usage_msg): Fix typo [ruby-core:49205] [Bug #7327]
+
+Tue Nov 20 12:35:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* file.c (File::NULL): Document File::NULL constant
+	  [ruby-core:49384] [Bug #7365]
+
+Tue Nov 20 12:05:15 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): Windows 8 fixed one of a bug of console
+	  API.
+	  based on the patch by Heesob Park at [ruby-core:49479] [Bug #7379]
+
+Tue Nov 20 11:14:33 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (--enable-dtrace): always call RUBY_DTRACE_BSD_BROKEN
+	  for portability.
+	  As the note, FreeBSD 8 has DTrace as the optional
+	  feature (it is enabled by the build option), but doesn't have USDT.
+	  FreeBSD 9 has USDT but they are still optional. FreeBSD 10 will
+	  enable them by default.
+	  The variable $rb_cv_prog_dtrace_g is "yes" only on FreeBSD 9 with
+	  optional DTrace or FreeBSD 10. If it is "no", you cannot know
+	  whether it doesn't need -G or DTrace is disabled. (by checking
+	  error code, you can know)
+
+Mon Nov 19 22:55:48 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* configure.in (--enable-dtrace): change help message
+
+Tue Nov 20 11:05:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/tracer.rb (Tracer.trace_func): printf to stdout
+	  Patch by Michal Fojtik [ruby-core:45219] [Bug #6490]
+
+Mon Nov 19 21:24:18 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* vm_dump.c: not to include probes.h because the code does not depend
+	  on it.
+	* common.mk (vm_dump.$(OBJEXT)): remove dependency on probes.h
+
+Tue Nov 20 10:14:22 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_s_check_interrupt): removed redundant
+	  GET_THREAD().
+
+Tue Nov 20 10:12:46 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_threadptr_async_errinfo_active_p): added a small
+	  comment.
+
+Tue Nov 20 10:05:56 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_blocking_region_end): replaced GET_THREAD()
+	  with ruby_thread_from_native(). We don't have GVL here.
+
+Tue Nov 20 09:56:15 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_threadptr_execute_interrupts) removed.
+	* thread.c (rb_threadptr_execute_interrupts_common) renamed to
+	  rb_threadptr_execute_interrupts. I.e. unified
+	  rb_threadptr_execute_interrupts and rb_threadptr_execute_interrupts_common.
+	* thread.c (rb_thread_schedule, rb_thread_execute_interrupts) s/_common//.
+
+Tue Nov 20 09:48:34 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (rb_get_next_signal): removed pointless signal
+	  disabling. pthread_sigmask() only changes current thread
+	  mask.
+
+Tue Nov 20 09:36:55 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (install_sighandler): added comments why we need
+	  rb_disable_interrupt().
+
+Tue Nov 20 09:31:33 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (rb_disable_interrupt, rb_enable_interrupt): removed
+	  USE_TRAP_MASK.
+	* signal.c (trap_arg, trap_ensure): removed.
+	* signal.c (trap, sig_trap): removed pointless signal disabling.
+	  We don't need it because we no longer run trap handler on signal
+	  handler context.
+
+Tue Nov 20 09:20:49 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* prelude.rb: Moved Mutex#synchronize to
+	* thread.c (rb_mutex_synchronize_m): here. [Bug #4266]
+
+Tue Nov 20 08:36:15 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (sig_signame): implements Signal.signame method
+	[Feature #5613]
+	* test/ruby/test_signal.rb (test_signame): adds test for above
+	* NEWS: add an item about above
+
+Mon Nov 19 16:30:59 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (rb_struct_each_pair): yield associated pairs so that
+	  an unsplat argument can get both, for consistency with Hash,
+	  OpenStruct, and etc.  [ruby-dev:46533] [Bug #7382]
+
+Mon Nov 19 16:17:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBS): libelf is need on only FreeBSD.
+
+Mon Nov 19 16:08:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (RUBYLIB): purelib option in runruby.rb is deprecated
+	  since r28841, so set to an empty list to get rid of a bogus path in
+	  child processes, which caused an insecure operation exception in
+	  test/ruby/test_encoding.rb:test_unsafe.
+
+Mon Nov 19 15:40:50 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* .travis.yml (script): add OPTS=-v, requested by @_ko1.
+
+Mon Nov 19 15:09:07 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: fix didn't enable_dtrace=yes on auto.
+
+	* configure.in: see enable_dtrace for adding libelf on FreeBSD.
+
+	* common.mk: VPATH is not needed.
+
+Mon Nov 19 14:55:51 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c: add `Thread#backtrace_locations' method.
+	  This method is similar to `caller_locations' method for
+	  specific method.
+	  And fix to accept `level' and `n' parameters for `Thread#backtrace'
+	  and `Thread#backtrace_locations'.
+	  `caller' (and `caller_locations') do not return `caller' method
+	  frame.
+	  However, `Thread#backtrace' (and `Thread#backtrace_locations')
+	  return `Thread#backtrace' method frame itself
+	  if `Thread.current.backtrace' was called.
+
+	* vm_backtrace.c: ditto.
+
+	* internal.h: ditto.
+
+	* test/ruby/test_backtrace.rb: add tests.
+
+Mon Nov 19 14:54:32 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* Makefile.in, common.mk (probes.h): moved to common.mk and changed to
+	  see $(srcdir).
+
+	* common.mk (probes.dmyh): now created it on $(srcdir) always.
+
+	* win32/Makefile.sub (.SUFFIXES): removed common suffix.
+
+Mon Nov 19 10:00:10 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Makefile.in (.SUFFIX): bsdmake needs .SUFFIX is defined before use.
+
+	* common.mk: fix path of probes.dmyh.
+
+	* common.mk (vm_dump.o): depend probes.h.
+
+	* configure.in: FreeBSD's USDT requires libelf.
+
+Mon Nov 19 01:11:59 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* vm_core.h, probes_helper.h (RUBY_DTRACE_FUNC_ENTRY_HOOK,
+	  RUBY_DTRACE_FUNC_RETURN_HOOK): move from vm_core.h to new file
+	  probes_helper.h for narrowing dependency to probes.h.
+	* common.mk (VM_CORE_H_INCLUDES): remove dependency to probes.h.
+	* common.mk (vm.$(OBJEXT)): add dependency to probes_helper.h.
+	* vm.c, vm_insnhelper.c: include probes_helper.h.
+
+Sun Nov 18 16:33:00 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* configure.in, Makefile.in, common.mk: support DTrace on Solaris 10,
+	  based on r26235 by Yugui. On Solaris 10, low optimization level
+	  may also be needed, e.g. optflags="-xO1" or "-xO0" with Oracle
+	  SolarisStudio 12.3 cc.
+
+	* configure.in (--enable-dtrace): new option to enable/disable
+	  DTrace support. By default, trying to enable if dtrace command
+	  is found on the system. It is disabled when cross compiling.
+
+	* configure.in (RUBY_DTRACE_POSTPROCESS): new macro. checks whether
+	  the dtrace on the system needs postprocessing with "dtrace -G".
+	  The postprocessing is needed on Solaris 10 and other platforms.
+
+	* configure.in (RUBY_DTRACE_BSD_BROKEN): new macro. checks whether
+	  the dtrace supports USDT.
+
+	* configure.in (DTRACE): move after RUBY_DTRACE_POSTPROCESS.
+
+	* configure.in (LD): On Solaris, /usr/ccs/bin/ld is preferred.
+
+	* configure.in, Makefile.in, common.mk (DTRACE_OBJ): new macro for
+	  DTrace probe object generated by postprocessing with "dtrace -G".
+
+	* Makefile.in, common.mk (probes.$(OBJEXT)): DTrace probe object
+	  generated by the postprocessing. New file probes.stamp is for
+	  rebuilding related objects that may be modified by "dtrace -G".
+
+	* configure.in, Makefile.in, common.mk (DTRACE_GLOMMED_OBJ): new
+	  macro for DTrace static library hacks.
+
+	* configure.in, Makefile.in (LIBRUBY_A_OBJS): ditto.
+
+	* Makefile.in, common.mk (ruby-glommed.$(OBJEXT)): new target with
+	  rule for DTrace static library hacks.
+
+	* common.mk (DTRACE_DEPENDENT_OBJS): objects depended on probes.h.
+
+Sun Nov 18 09:31:47 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (read_comp): mathn compliant.
+	* rational.c (read_num): ditto.
+
+Sun Nov 18 02:50:12 2012  Luis Lavena <luislavena@gmail.com>
+
+	* win32/file.c (replace_to_long_name): correct logic around wildcard
+	  characters detection and ensure wide-chars are used as pattern.
+	  [ruby-core:49451] [Bug #7374]
+
+Sun Nov 18 02:02:46 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (read_comp): modified handling of polar form.
+
+Sun Nov 18 00:50:44 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (read_comp): fixed handling of polar form.
+
+Sun Nov 18 00:14:46 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (string_to_c_strict, string_to_c): rewrote without regexp.
+	* rational.c (string_to_r_strict, string_to_r): ditto.
+
+Sat Nov 17 23:53:05 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (make_patterns): should not accept extra sign.
+
+Sat Nov 17 21:45:12  Luis Lavena  <luislavena@gmail.com>
+
+	* win32/file.c (replace_to_long_name): skip expansion for all wildcard
+	  characters.
+	  [ruby-core:49451] [Bug #7374]
+
+	* test/ruby/test_file_exhaustive.rb: add more assertions to test.
+
+Sat Nov 17 12:14:50 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: use literal YAML style
+	  when emitting multi-line strings. Thanks @atambo
+
+	* test/psych/test_yaml.rb: test for change.
+
+Sat Nov 17 12:03:41 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: avoid raising exceptions when
+	  parsing Floats and Integers. Thanks riffraff [ruby-core:44426]
+	* test/psych/test_numeric.rb: associated test
+
+Sat Nov 17 11:34:31 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* st.c (st_update): pass the key in st_table so that we can free
+	  memory of the key in st_table when deleting.
+	  [ruby-core:49220] [Bug #7330]
+
+	* test/-ext-/st/test_update.rb
+	  (Bug::StTable#test_pass_objects_in_st_table): add a test.
+
+Sat Nov 17 11:26:36 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/core_ext.rb: move Kernel#y so that it can
+	  manually be required as 'psych/y'.
+
+	* ext/psych/lib/psych/y.rb: ditto
+
+Sat Nov 17 08:13:48 2012  Benoit Daloze  <eregontp@gmail.com>
+
+	* lib/abbrev.rb: fix r37113. Correct examples, fix style
+	  and show explicit dependency (require 'abbrev').
+
+Sat Nov 17 07:35:15 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* win32/file.c (replace_to_long_name): skip automatic path expansion
+	  when wildcard character is used.  [ruby-core:49451] [Bug #7374]
+
+	* test/ruby/test_file_exhaustive.rb: add a test for above.
+
+Sat Nov 17 00:50:23 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* marshal.c (w_object): add flonum to arg->data to keep reference index
+	  consistency. [ruby-core:49323] [Bug #7348]
+
+	* test/ruby/test_marshal.rb: add a test for above.
+
+Sat Nov 17 00:40:25 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (incs): dist files need probes.dmyh.
+
+	* common.mk (probes.dmyh): depends on generator script.
+
+	* Makefile.in, common.mk, configure.in, win32/Makefile.sub (probes.h):
+	  select generating with dtrace or copying dummy file by suffix rules.
+
+Fri Nov 16 19:24:10 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_call_without_gvl2): change the parameter of
+	  `func' from `int *skip_interrupt' to `VALUE *flags'.
+	  If (flags & RUBY_CALL_WO_GVL_FLAG_SKIP_CHECK_INTS) is not zero,
+	  then skip checking interrupt.
+	  [ruby-core:46547]
+
+	* include/ruby/thread.h: ditto.
+
+Fri Nov 16 18:59:05 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Makefile.in (no-dtrace-probes.h): dmyprobes.h is in srcdir.
+
+	* common.mk (dmyprobes.h): ditto.
+
+Fri Nov 16 17:57:15 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (probes.h): split build commands for dtrace-available
+	  and unavailable platforms.
+
+	* Makefile.in (incs): probes.h is a platform dependent file, so it
+	  cannot be a part of prereq target.  move it to all-incs.
+
+	* configure.in (DTRACE): move after AC_PROG_CC since cross_compiling
+	  is set in it.
+
+	* configure.in (DTRACE): ignore non-prefixed version if
+	  cross-compiling.
+
+	* Makefile.in, win32/Makefile.sub (probes.h): fix copying dmyprobes.h
+	  path when outplace-build.
+
+Fri Nov 16 15:27:36 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* lib/net/pop.rb (POP3.certs): fix typo in comment.
+	  patch from no6v (Nobuhiro IMAI) <nov@yo.rim.or.jp>.
+	  [ruby-dev:46519] [Bug #7355]
+
+Fri Nov 16 12:36:47 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/rake/helper.rb (Rake::TestCase#setup): revert r37669.
+	  @orig_PWD should be the original pwd.
+
+	* test/rake/test_*.rb: don't use @orig_PWD to load libraries.
+	  It should be specified with relative path from the file.
+
+Fri Nov 16 10:22:52 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/rake/helper.rb (Rake::TestCase#setup): @orig_PWD shouldn't be
+	  Dir.pwd when the build directory is different from source directory.
+
+Fri Nov 16 09:41:08 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rake/version.rb:  workaround fix to build. see #7366
+	  [ruby-dev:46522]
+
+Fri Nov 16 07:23:18 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rake*:  Updated to rake 0.9.4
+	  http://rake.rubyforge.org/doc/release_notes/rake-0_9_4_rdoc.html for
+	  a list of changes in 0.9.4.
+
+	* test/rake*:  ditto
+
+	* NEWS:  ditto
+
+Fri Nov 16 06:58:52 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rake*:  Updated to rake 0.9.3.  See
+	  http://rake.rubyforge.org/doc/release_notes/rake-0_9_3_rdoc.html for
+	  a list of changes in 0.9.3.
+
+	* test/rake*:  ditto
+
+	* bin/rake:  ditto
+
+	* NEWS:  ditto
+
+Thu Nov 15 22:39:32 2012  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* range.c (range_bsearch): fix some bugs: a documentation bug, a wrong
+	  condition, missed break in switch/case, and workaround for GCC
+	  optimization. See [ruby-core:49364] in detail.  A great patch from
+	  Heesob Park. [Bug #7352] [Feature #4766]
+
+	* array.c (rb_ary_bsearch): fix similar bug (missed break).
+
+	* test/ruby/test_range.rb: add two test cases for above.
+
+Thu Nov 15 22:41:57 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_exec.h (GENTRY): GENTRY should be pointer size.
+	  A patch by yoshidam (Yoshida Masato) [Bug #7332].
+
+Thu Nov 15 13:20:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* man/erb.1: Fix grammar and copyright dates
+	* man/goruby.1: ditto
+	* man/irb.1: ditto
+	* man/rake.1: ditto
+	* man/ri.1: ditto
+	* man/ruby.1: ditto
+	  Patch by Arthur Gunn
+	  [Fixes Github #210]
+
+Thu Nov 15 11:35:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* man/ruby.1: Grammar edits for man page
+	  Based on a patch by Michael Endsley [Fixes Github #183]
+
+Thu Nov 15 00:47:20 2012  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* array.c (rb_ary_bsearch): add Array#bsearch for binary search.
+	  [ruby-core:36390] [Feature #4766]
+
+	* test/ruby/test_array.rb: add a test for above.
+
+	* range.c (range_bsearch): add Range#bsearch for binary search.
+	  [ruby-core:36390] [Feature #4766]
+
+	* test/ruby/test_range.rb: add a test for above
+
+	* NEWS: added the two new methods.
+
+Wed Nov 14 13:25:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/fileutils.rb (chmod): Add "X" to modes, convert format to table
+	  [ruby-core:48965] [Bug #7288]
+
+Wed Nov 14 11:51:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/csv.rb (init_comments): Document private method #init_comments.
+	  Based on a patch from Vincent Batts [ruby-core:49172] [Bug #7319]
+
+Wed Nov 14 00:54:00 2012  Kenta Murata  <mrkn@mrkn.jp>
+
+	* Makefile.in (probes.h): create from probes.d
+
+Tue Nov 13 18:44:01 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_cfunc_with_frame): don't use ci after
+	  EXEC_EVENT_HOOK because ci can be overridden.
+
+	* vm_eval.c: ditto.
+
+	* method.h: change invoker's parameters types.
+
+	* vm_method.c (call_cfunc_invoker_func): ditto.
+
+Tue Nov 13 18:01:54 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_using): raise an ArgumentError if cyclic using is
+	  detected.  based on the patch by Charlie Somerville.
+	  [ruby-core:49092] Bug #7308
+
+	* test/ruby/test_refinement.rb: related test.
+
+Tue Nov 13 17:40:04 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (vm_insnhelper.c): this target is useless and causes
+	  ruby always need rebuild.
+
+Tue Nov 13 17:35:49 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (insn_data_to_s_detail): remove debug lines.
+
+Tue Nov 13 17:28:47 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_caller_setup_args): save and restore
+	  ci->argc and ci->blockptr before and after method invocations
+	  because these method dispatches can override call_info.
+
+	* bootstraptest/test_method.rb: add tests for this fix.
+
+Tue Nov 13 16:38:02 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (dmyprobes.h): always create for make dist.
+
+	* Makefile.in (probes.h): create or copy dmyprobes.h
+
+	* win32/Makefile.sub: only do copy dmyprobes.h.
+
+Tue Nov 13 15:37:21 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Makefile.in (.SUFFIX): .SUFFIX is needed here for .d.h on bsd make.
+
+Tue Nov 13 15:34:35 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk Makefile.in win32/Makefile.sub (.d.h): it's not common.
+
+Tue Nov 13 12:27:11 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: disable dtrace because it doesn't work on FreeBSD.
+
+	* common.mk (clean-local): rm probes.h.
+
+	* common.mk (parse.o): depend $(PROBES_H_INCLUDES).
+
+	* common.mk (.d.h): moved from Makefile.in and use BASERUBY.
+
+	* tool/gen_dummy_probes.rb: reimplemented with ruby because sed is not
+	  available on Windows Microsoft VC++ environment.
+
+Tue Nov 13 12:30:26 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/README.win32: added mention about build directory.  currently
+	  we can not build ruby in win32 directory.  this problem is reported
+	  by Masahiro Kitajima <katonbo@katontech.com>.
+
+Tue Nov 13 11:03:47 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* re.c (rb_memsearch_ss): performance improvement by using memmem(3) if
+	  possible. [ruby-dev:45530] [Feature #6311]
+
+	* configure.in: check existence of memmem(3) and that it is not broken.
+
+Tue Nov 13 06:50:02 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* probes.d: add DTrace probe declarations. [ruby-core:27448]
+
+	* array.c (empty_ary_alloc, ary_new): added array create DTrace probe.
+
+	* compile.c (rb_insns_name): allowing DTrace probes to access
+	  instruction sequence name.
+
+	* Makefile.in: translate probes.d file to appropriate header file.
+
+	* common.mk: declare dependencies on the DTrace header.
+
+	* configure.in: add a test for existence of DTrace.
+
+	* eval.c (setup_exception): add a probe for when an exception is
+	  raised.
+
+	* gc.c: Add DTrace probes for mark begin and end, and sweep begin and
+	  end.
+
+	* hash.c (empty_hash_alloc): Add a probe for hash allocation.
+
+	* insns.def: Add probes for function entry and return.
+
+	* internal.h: function declaration for compile.c change.
+
+	* load.c (rb_f_load): add probes for `load` entry and exit, require
+	  entry and exit, and wrapping search_required for load path search.
+
+	* object.c (rb_obj_alloc): added a probe for general object creation.
+
+	* parse.y (yycompile0): added a probe around parse and compile phase.
+
+	* string.c (empty_str_alloc, str_new): DTrace probes for string
+	  allocation.
+
+	* test/dtrace/*: tests for DTrace probes.
+
+	* vm.c (vm_invoke_proc): add probes for function return on exception
+	  raise, hash create, and instruction sequence execution.
+
+	* vm_core.h: add probe declarations for function entry and exit.
+
+	* vm_dump.c: add probes header file.
+
+	* vm_eval.c (vm_call0_cfunc, vm_call0_cfunc_with_frame): add probe on
+	  function entry and return.
+
+	* vm_exec.c: expose instruction number to instruction name function.
+
+	* vm_insnhelper.c: add function entry and exit probes for cfunc
+	  methods.
+
+	* vm_insnhelper.h: vm usage information is always collected, so
+	  uncomment the functions.
+
+Mon Nov 12 19:14:50 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in (isinf, isnan): isinf() and isnan() are macros on
+	  DragonFly which cannot be found by AC_REPLACE_FUNCS().  This
+	  workaround enforces the fact that they exist on DragonFly.
+
+Mon Nov 12 15:59:38 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_core.h (rb_call_info_t::refinements), compile.c (new_callinfo),
+	  vm_insnhelper.c (vm_search_method): revert r37616 because it's too
+	  slow.  [ruby-dev:46477]
+
+	* test/ruby/test_refinement.rb (test_inline_method_cache): skip
+	  the test until the bug is fixed efficiently.
+
+Mon Nov 12 14:28:01 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/mkexports.rb (each_export): skip garbage generated by VS2012's
+	  nmake.
+	  reported and patched by Yoshida Masato at [Bug #7333] [ruby-dev:46484]
+
+Sun Nov 11 18:58:55 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/test_date_{parse,strptime}.rb: changed the format of
+	  some extra messages.
+
+Sun Nov 11 18:41:34 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c (date__parse): revised the tight parser
+	  (about handling of apostrophes).
+
+Sun Nov 11 15:39:04 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_s_create): just warn for wrong elements now.
+	  [ruby-dev:46440] [Bug #7300]
+
+	* hash.c (rb_hash_s_create): refine error messages.
+
+	* error.c (rb_builtin_class_name): share for above.
+
+Sun Nov 11 15:12:18 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (top_using): remove Kernel#using, and add main.using instead.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Sun Nov 11 13:41:01 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_using_refinement, rb_mod_using, f_using): clear method
+	  cache only when using is called explicitly.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Sun Nov 11 12:56:34 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* lib/pstore.rb (PStore): fix not to replace ThreadError raised in
+	  #transaction block with PStore::Error.
+	  [ruby-core:39238] [Bug #5269]
+
+Sun Nov 11 11:36:19 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_core.h (rb_call_info_t::refinements), compile.c (new_callinfo):
+	  add a new field for inline method cache.
+
+	* vm_insnhelper.c (vm_search_method): check rb_call_info_t::refinements
+	  not to confuse inline method cache when module_eval is used with
+	  refinements.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Sun Nov 11 08:45:45 2012  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* ruby.c: removed a comma before "before"
+
+Sat Nov 10 23:02:31 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: move immutable fields from struct heaps_slot and struct
+	  sorted_heaps_slot into struct heaps_header.
+	  Based on a patch from Sokolov Yura [Feature #6199][ruby-core:43592]
+
+Sat Nov 10 19:28:16 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: modified doc.
+	* rational.c: ditto.
+
+Sat Nov 10 18:20:10 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c: edited about era.
+
+Sat Nov 10 12:13:41 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* tool/rbinstall.rb: Don't install *.gemspec under lib/.
+	  [ruby-core:48966] [Bug #7289]
+	  Reported by Vit Ondruch. Thanks!!!
+
+Sat Nov 10 00:49:26 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ruby_atomic.h: renamed from atomic.h to avoid header file name
+	  conflict on Solaris 10. [ruby-dev:46414] [Bug #7287]
+
+	* gc.c, signal.c, vm_core.h, common.mk: reflect the rename from
+	  atomic.h to ruby_atomic.h.
+
+Sat Nov 10 00:46:57 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* atomic.h: Revert r37491 which is a temporary workaround.
+
+Sat Nov 10 00:33:31 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* siphash.h: check configure macros before include newer headers.
+
+Fri Nov  9 23:33:05 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/erb.rb (ERB#run, ERB#result): eval under isolated bindings for
+	  safe concurrent use.  [ruby-core:47638] [Bug #7046]
+
+Fri Nov  9 23:05:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (BYTE_ORDER): define using configured WORDS_BIGENDIAN.
+
+	* siphash.c (sip_init_state): use union to suppress warnings by gcc
+	  4.7.
+
+Fri Nov  9 19:40:03 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (rb_ary_splice): fix r37583 doesn't consider the case when
+	  beg > array length.
+
+Fri Nov  9 16:11:58 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rb_memhash): use siphash.
+
+Fri Nov  9 16:08:46 2012  Sokolov Yura funny-falcon  <funny.falcon@gmail.com>
+
+	* array.c: speedup Array#unshift by using space in shared array.
+	  [Feature #6638]
+	  - when array owns its shared array (ARY_SHARED_NUM == 1), and there
+	    is enough space then try unshift values directly into shared
+	    array.
+	  - when resulting array is big (~>64 items) then make it shared with
+	    enough room for future #unshifts, and then insert into shared
+	    array.
+
+	* array.c (rb_ary_splice): use shared array in rb_ary_slice.
+	  [Feature #6638]
+	  - use ary_ensure_room_for_push when rb_ary_slice used to add at the
+	    end of array, cause rb_ary_concat use rb_ary_slice.
+
+	* array.c (ary_ensure_room_for_push): make array really suitable for
+	  queue.  [Feature #6638]
+	  when array is shared (which happens after Array#shift), and
+	  ARY_SHARED_NUM == 1 (which is very often when array used as queue),
+	  then make rb_ary_push push directly into shared array.
+
+	* array.c (rb_ary_modify): steal shared array's container when
+	  ARY_SHARED_NUM == 1.  [Feature #6638]
+	  - Do not allocate new memory in rb_ary_modify when ARY_SHARED_NUM == 1
+	    and length almost same.
+	  - Store ARY_CAPA instead of RARRAY_LEN in ary_make_shared, to make
+	    it useful.
+	  - Fix rb_ary_sort_bang accordantly.
+
+Fri Nov  9 16:00:00 2012  Zachary Scott  <zzak@zacharyscott.net>
+
+	* ext/bigdecimal/bigdecimal.c: Documentation for BigDecimal
+	  Based on a patch from Vincent Batts [ruby-core:49047] [Bug #7305]
+
+Fri Nov  9 15:25:42 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/shellwords.rb (Shellwords#shellescape): Add back my original
+	  real world example with some enhancement.
+
+	* lib/shellwords.rb (Shellwords#shelljoin): Undo part of the
+	  previous rdoc change.  This new example using a string-only
+	  array was not in line with the description.
+
+Fri Nov  9 12:58:13 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_crypt): crypt(3) may return NULL.
+	  Latest glibc (2.16?) crypt(3) actually returns NULL. [Bug #7312]
+
+Fri Nov  9 12:07:06 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* include/ruby/ruby.h (alloca), eval_intern.h (alloca), gc.c
+	  (alloca): Make alloca() globally available by moving the
+	  ultimate ifdef's to ruby/ruby.h.  Gcc hides its builtin alloca()
+	  when compiling with -ansi, and linking thus fails on platforms
+	  that lack their own alloca() implementation in libc, which
+	  include OpenBSD and some ports of NetBSD.  We use alloca()
+	  everywhere including from within third party C extensions, so
+	  alloca() must be made globally available. [Bug #7307]
+
+	* addr2line.c (alloca): Replace the alloca() part with the
+	  ultimate ifdef's. [Bug #7307]
+
+Fri Nov  9 09:30:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* io.c (IO#new):
+	  Fix indentation from r37444
+	  [ruby-core:48052] [Bug #7179]
+
+Fri Nov  9 07:36:00 2012  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (bigmul0): enable big_mul_toom3.
+	  [ruby-core:48552] [Bug #7242]
+
+	* bignum.c (bigmul1_toom3): fix incorrect calculation.
+	  the patch is made by Heesob Park.
+	  [ruby-core:48552] [Bug #7242]
+
+Fri Nov  9 05:33:00 2012  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (bigmul0): disable big_mul_toom3 temporarily.
+	  [ruby-core:48552] [Bug #7242]
+
+	* test/ruby/test_bignum.rb (test_mul_large_numbers):
+	  add a test for bigmul1_toom3 suggested in [Bug #7242].
+
+Thu Nov  8 21:57:59 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* re.c (rb_memsearch): performance improvement by using memchr().
+	  [ruby-dev:45397] [Feature #6173]
+
+Thu Nov  8 19:02:50 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/protocol.rb (Net::InternetMessageIO#each_crlf_line):
+	  treat \r as newline as mame pointed. [ruby-dev:46425] [Bug #7278]
+
+Thu Nov  8 11:32:11 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in (--with-opt-dir): Avoid nesting of double quotes
+	  inside backquotes, since some traditional shells like PD KSH
+	  (which OpenBSD's /bin/sh bases on) fail to parse them.
+
+Thu Nov  8 09:34:00 2012  Kenta Murata  <mrkn@cookpad.com>
+
+	* numeric.c: Add a caution that the results of the comparing
+	  operations of two NaNs are undefined.
+	  [#1720] [ruby-dev:38725] [ruby-core:36966]
+
+Thu Nov  8 04:45:21 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* include/ruby/intern.h: Restore rb_enumeratorize as it was before
+	  r37497 and introduce rb_enumeratorize_with_size instead. [#7302]
+
+	* enumerator.c: ditto.
+
+Wed Nov  7 15:22:37 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (ruby_float_step): fix r37514: it yielded with NaN
+	  if the unit is infinity.
+
+Wed Nov  7 15:46:12 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/webrick.rb: fix typo. reported by Rohit Arondekar.
+	  https://github.com/ruby/ruby/pull/211
+
+Wed Nov  7 15:34:12 2012  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb: alias CGI#http_header to CGI#header.
+
+Wed Nov  7 12:49:39 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_refine): set RMODULE_IS_REFINEMENT to a created
+	  refinement module, and don't override method_added.
+
+	* vm_method.c (rb_method_entry_make): check redefinition of
+	  optimized methods when a method is added to a refinement module.
+	  [ruby-core:48970] [Bug #7290]
+
+	* test/ruby/test_refinement.rb: related test.
+
+Wed Nov  7 11:48:14 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-additional.el (ruby-mode-set-encoding): now encoding needs
+	  to be set always explicitly actually.  [Feature #6679]
+
+Wed Nov  7 09:15:58 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_const_get): avoid inadvertent symbol creation.
+
+Wed Nov  7 07:52:50 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (rb_enum_cycle_size): prefix with rb.
+
+Wed Nov  7 04:32:15 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* test/ruby/test_file_exhaustive.rb: Remove FIXME skip on Windows
+	  specific test because the test in question was already fixed.
+
+Wed Nov  7 03:45:12 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* ext/zlib/extconf.rb: Recognize zlibwapi as linking library.
+	  Patch by Daniel Berger.
+
+	  [ruby-core:44979] [Feature #6421]
+
+Wed Nov  7 02:06:40 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* enumerator.c: New method #size; constructor accepts size.
+	                Have #to_enum accept a block
+	                Warn when using deprecated form of constructor
+	                Support #size for enumerators created from enumerators
+	                Support for lazy.{map|flat_map|...}.size.
+
+	* include/ruby/intern.h: RETURN_SIZED_ENUMERATOR for support of
+	  sized enumerators.
+
+	* array.c: Support for various enumerator.size.
+
+	* enum.c: ditto.
+
+	* hash.c: ditto.
+
+	* numeric.c: ditto.
+
+	* range.c: ditto.
+
+	* string.c: ditto.
+
+	* struct.c: ditto.
+
+	* vm_eval.c: ditto.
+
+Tue Nov  6 20:40:28 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* object.c (rb_mod_const_get): Fix constant missing exception class
+	  and message to maintain backwards compatibility. Constant search
+	  should start at Object when constant starts with '::'
+
+	* test/ruby/test_module.rb: test for fixes
+
+Tue Nov  6 16:50:00 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* lib/tempfile.rb (Tempfile#inspect): fix confusing #inspect.
+	  previous Tempfile#inspect says it is a File, but actually
+	  it is not a File.
+
+	    t = Tempfile.new("foo") #=> #<File:/tmp/foo20121106-31970-1ffbum0>
+	    t.is_a? File #=> false
+
+	  now Tempfile#inspect returns like:
+
+	    t = Tempfile.new("foo")
+	    #=> #<Tempfile:/tmp/foo20121106-31970-1ffbum0>
+
+	  [ruby-core:47544] [Bug #7027]
+
+Tue Nov  6 16:22:30 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* atomic.h: add #include <sys/atomic.h> for the workaround of
+	  header file name conflict of atomic.h with /usr/include/atomic.h
+	  on Solaris 10. [ruby-dev:46414] [Bug #7287]
+
+Tue Nov  6 14:38:00 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/win32ole/test_win32ole.rb: now source encoding is UTF-8, so
+	  binary strings in old scripts are dangerous.
+
+Tue Nov  6 14:25:09 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/protocol.rb (Net::InternetMessageIO#each_crlf_line):
+	  don't use /n in universal regexp. [ruby-dev:46394] [Bug #7278]
+
+Tue Nov  6 09:42:26 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_b): Add String#b, returning a copied string
+	  whose encoding is ASCII-8BIT. [ruby-dev:45992] [Feature #6767]
+
+Tue Nov  6 09:37:57 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (load_file_internal): set default source encoding as
+	  UTF-8 instead of US-ASCII. [ruby-core:46021] [Feature #6679]
+
+	* parse.y (parser_initialize): set default parser encoding as
+	  UTF-8 instead of US-ASCII.
+
+Tue Nov  6 05:48:06 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/test_require.rb
+	  (TestRequire#test_require_to_path_redefined_in_load_path,
+	   TestRequire#test_require_to_str_redefined_in_load_path):
+	  Suppress method redefined warning when test-all with RUBYOPT=-w.
+
+Thu Nov  8 00:24:14 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/curses/view.rb: Do not fail if the file to view is shorter
+	  than the screen height.
+
+Mon Nov  5 11:40:00 2012  Mark Somerville  <mark@scottishclmibs.com>
+
+	* thread_pthread.c (rb_reserved_fd_p): fix typo in macro check
+	  that prevented the ifdef ever being true.
+	  [Bug #7281] [ruby-core:48940]
+
+Mon Nov  5 23:28:57 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* file.c (rb_get_path_check_to_string): extract from
+	  rb_get_path_check(). We change the spec not to call to_path of
+	  String object.
+
+	* file.c (rb_get_path_check_convert): extract from rb_get_path_check().
+
+	* file.c (rb_get_path_check): follow the above change.
+
+	* file.c (rb_file_expand_path_fast): remove check_expand_path_args().
+	  Instead we call it in load.c.
+
+	* file.c (rb_find_file_ext_safe): use rb_get_expanded_load_path() to
+	  reduce expand cost.
+
+	* file.c (rb_find_file_safe): ditto.
+
+	* internal.h (rb_get_expanded_load_path): add a declaration.
+
+	* internal.h (rb_get_path_check_to_string, rb_get_path_check_convert):
+	  add declarations.
+
+	* load.c (rb_construct_expanded_load_path): fix for compatibility.
+	  Same checks in rb_get_path_check() are added. We don't replace
+	  $LOAD_PATH and ensure that String object of $LOAD_PATH are frozen.
+	  We don't freeze non String object and expand it every time. We add
+	  arguments for expanding load path partially and checking if load path
+	  have relative paths or non String objects.
+
+	* load.c (load_path_getcwd): get current working directory for checking
+	  if it's changed when getting load path.
+
+	* load.c (rb_get_expanded_load_path): fix for rebuilding cache properly.
+	  We check if current working directory is changed and rebuild expanded
+	  load path cache. We expand paths which start with ~ (User HOME) and
+	  non String objects every time for compatibility. We make this
+	  accessible from other source files.
+
+	* load.c (rb_feature_provided): call rb_get_path() since we changed
+	  rb_file_expand_path_fast() not to call it.
+
+	* load.c (Init_load): initialize vm->load_path_check_cache.
+
+	* vm.c (rb_vm_mark): mark vm->load_path_check_cache for GC.
+
+	* vm_core.h (rb_vm_struct): add vm->load_path_check_cache to store data
+	  to check load path cache validity.
+
+	* test/ruby/test_require.rb (TestRequire): add tests for require
+	  compatibility related to cached expanded load path.
+	  [ruby-core:47970] [Bug #7158]
+
+Mon Nov  5 23:26:05 2012  Greg Price  <price@mit.edu>
+
+	* load.c (rb_get_expanded_load_path): cache the expanded load
+	  path.  This saves 4KB of allocation and some stats for every
+	  element of the load path (so nearly a MB in my Rails app)
+	  on every require.
+
+	* load.c (rb_construct_expanded_load_path): ensure that $LOAD_PATH
+	  entries are frozen strings.  The user must mutate $LOAD_PATH
+	  itself rather than its individual entries.
+
+	* vm_core.h (rb_vm_struct): add fields.
+
+	* vm.c (rb_vm_mark): mark new fields.
+
+	* ruby.c (process_options): modify $LOAD_PATH directly rather than
+	  its elements.
+	  Patch by Greg Price.
+	  [ruby-core:47970] [Bug #7158]
+
+Mon Nov  5 23:24:42 2012  Greg Price  <price@mit.edu>
+
+	* load.c (rb_feature_p, rb_provide_feature): index $LOADED_FEATURES
+	  so that require isn't so slow.
+
+	* load.c (rb_provide_feature, get_loaded_features_index): ensure
+	  that $LOADED_FEATURES entries are frozen strings.  The user
+	  must mutate $LOADED_FEATURES itself rather than its individual
+	  entries.
+
+	* load.c (reset_loaded_features_snapshot): add a new function to reset
+	  vm->loaded_features_snapshot.
+
+	* load.c (get_loaded_features_index_raw): add a new function to get
+	  the loaded-features index.
+
+	* load.c (features_index_add_single): add a new function to add to the
+	  loaded-features index a single feature.
+
+	* load.c (features_index_add): add a new function to add to the
+	  loaded-features index all the required entries for `feature`.
+
+	* vm_core.h (rb_vm_struct): add fields.
+
+	* vm.c (rb_vm_mark): mark new fields.
+
+	* include/ruby/intern.h (rb_hash_clear): declare function.
+
+	* hash.c (rb_hash_clear): make function non-static.
+	  Patch by Greg Price.
+	  [ruby-core:47970] [Bug #7158]
+
+Mon Nov  5 23:23:51 2012  Greg Price  <price@mit.edu>
+
+	* array.c (rb_ary_shared_with_p): new function.
+	  Expose whether two arrays are shared (read-only, C only).
+
+	* include/ruby/intern.h (rb_ary_shared_with_p): declare.
+	  Patch by Greg Price.
+	  [ruby-core:47970] [Bug #7158]
+
+Mon Nov  5 23:21:14 2012  Greg Price  <price@mit.edu>
+
+	* load.c (loaded_feature_path): clarify and briefly comment
+	  function.  These clarifications have no effect on the behavior
+	  of the function.
+
+	* load.c (rb_feature_p): explain the search loop.  Especially
+	  useful because the logic is complicated as described in the
+	  second paragraph.
+	  Patch by Greg Price.
+	  [ruby-core:47970] [Bug #7158]
+
+Mon Nov  5 22:45:03 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* ext/dl/win32/lib/Win32API.rb (Win32API#call): use 64bit pointer for x64
+	  Windows. This would fix
+	  TestSecureRandom#test_s_random_bytes_without_openssl error.
+	  [ruby-core:47451] [Bug #6990]
+
+Mon Nov  5 22:09:26 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* cygwin/GNUmakefile.in (uncommon.mk): link *.res.o.
+	  EXTOBJES is defined in uncommon.mk. *.res.o setting should be below
+	  uncommon.mk.
+	  [ruby-core:48858] [Bug #7277]
+
+Mon Nov  5 11:35:11 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (native_thread_init, native_thread_destroy):
+	  removed HAVE_PTHREAD_CONDATTR_INIT check because this silly
+	  #ifdef makes use-uninitialized-var issue and (2) native_cond_initialize()
+	  already have a right platform and caller don't need any additional care.
+	  [Bug #6825]
+
+Mon Nov  5 10:57:59 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/cgi/core.rb: check if Tempfile is defined before use it.
+
+	* lib/cgi/core.rb: remove tempfiles only if tempfiles exist
+
+Mon Nov  5 12:17:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/uri/http.rb (URI::HTTP.build): Fix example
+	  Patch by Carina C. Zona
+	  [Fixes #209 Github]
+
+Mon Nov  5 09:55:05 2012  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb: remove tempfile more early.
+
+Sun Nov  4 20:29:46 2012  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi.rb, lib/cgi/*/rb: rename CGI#header to CGI#http_header,
+	  add and update HTML5 tag generator.  [Bug #7110]
+	  Patch provided by Marcus Stollsteimer, thank you !
+
+Sun Nov  4 11:47:39 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* lib/fileutils.rb (module FileUtils): repatch [ruby-core:39622]
+	  [Feature #5337]. improve performance of FileUtils.compare_stream.
+	  [ruby-core:47545] [Feature #7028]
+
+Sun Nov  4 11:27:54 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (recursive_equal): fix to return true when self and other
+	  are resized to same size and the current index become out of
+	  range.
+
+	* test/ruby/test_array.rb: add a test for the above.
+
+Sun Nov  4 10:19:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (file_s_fnmatch): match with expanding braces if FNM_EXTGLOB
+	  is set.  [ruby-core:40037] [Feature #5422]
+
+Sat Nov  3 23:38:15 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: modified doc.
+	* rational.c: ditto.
+
+Sat Nov  3 22:38:55 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: modified doc.
+
+Sat Nov  3 18:35:55 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c (rb_vm_rewrite_ep_in_errinfo, vm_rewrite_ep_in_errinfo):
+	  merge code and remove `rb_vm_rewrite_ep_in_errinfo'.
+
+Sat Nov  3 18:15:24 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c, proc.c: avoid unnecessary `rb_vm_rewrite_ep_in_errinfo'
+	  calls.
+
+Sat Nov  3 17:53:43 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* bin/testrb: Use only Test::Unit::AutoRunner in test-unit gem
+	  compatible API to be available by both test/unit bundled in Ruby
+	  and test-unit gem.
+	* lib/test/unit.rb (Test::Unit::AutoRunner): Move codes from testrb.
+
+Sat Nov  3 14:56:21 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c (parse_eu): should capture apostrophe too.
+
+Sat Nov  3 14:46:15 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c (date__parse): revised the tight parser.
+
+Sat Nov  3 14:43:42 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/xmldecl.rb (REXML::XMLDecl#content): Add missing \A
+	  and \z.
+
+Sat Nov  3 14:42:55 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/output.rb (REXML::Output#initialize): Use normalized
+	  encoding name.
+
+Sat Nov  3 14:41:17 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/output.rb (REXML::Output): Don't output BOM in middle
+	  of the output string.
+	* test/rexml/test_document.rb: Add a test for the above change.
+
+Sat Nov  3 14:09:55 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* NEWS: Add an item about REXML::Document#write.
+
+Sat Nov  3 13:46:49 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb: Fix tests that expect encoding name
+	  isn't normalized.
+
+Sat Nov  3 13:26:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* dir.c (Dir#glob):
+	  Documentation for pattern section, backslash subsection
+	  Patch by Eric Bouchut
+	  [ruby-core:48528] [Bug #7230]
+
+Sat Nov  3 13:26:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* io.c (IO#new):
+	  Documentation for IO#open modes and formatting
+	  [ruby-core:48052] [Bug #7179]
+
+Sat Nov  3 13:01:02 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_encoding.rb (EncodingTester#test_in_different_out):
+	  Fix a test that expects encoding in XML declaration is changed by
+	  Output's encoding. It is dropped feature.
+
+Sat Nov  3 12:49:45 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/document.rb (REXML::Document#write): Document encoding
+	  option. Now different encoding between XML file's encoding and
+	  XML declaration's encoding is support.
+	  [Feature #4872] (work in progress)
+	* lib/rexml/xmldecl.rb (REXML::XMLDecl#write): Always use XMLDecl's
+	  encoding.
+	* test/rexml/test_document.rb: Update tests for the above change.
+
+Sat Nov  3 12:18:35 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (recursive_equal): fix not to make invalid pointers when
+	  self and other are resized to same size in #== of their elements.
+	  [ruby-dev:46373] [Feature #6177]
+
+Sat Nov  3 12:06:15 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_xml_declaration.rb (TestXmlDeclaration#test_*):
+	  Remove needless prefix from test names.
+
+Sat Nov  3 12:04:52 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_xml_declaration_parent_child.rb: Rename to ...
+	* test/rexml/test_xml_declaration.rb: ... this.
+
+Sat Nov  3 11:43:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* hash.c (rb_hash_delete): Correct grammar
+	  Patch by Glenn Oppegard
+	  [Fixes #208 Github]
+
+Sat Nov  3 11:28:28 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* NEWS: add a news about GC::Profiler.raw_data.
+
+Sat Nov  3 11:01:32 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* NEWS: add a news about rb_newobj_of() and NEWOBJ_OF().
+
+Sat Nov  3 10:17:41 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* eval.c (f_current_dirname): add the new method for Kernel.
+	  This method almost same as File.dirname(__FILE__). One
+	  different behavior is it returns nil when __FILE__ returns nil.
+	  [Feature #3346]
+
+	* NEWS:  ditto
+
+	* test/ruby/test_method.rb: related test.
+
+Sat Nov  3 09:03:34 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_refinement.rb (test_new_method_by_send,
+	  test_new_method_by_method_object): add tests for Kernel#send and
+	  Kernel#method with refinements.
+
+	* test/ruby/test_refinement.rb (test_symbol_to_proc): add a test
+	  calling a proc created by Symbol#to_proc outside the scope where
+	  a refinement is closed over.
+
+Sat Nov  3 04:14:19 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_vm_rewrite_ep_in_errinfo): rewrite all catch points in
+	  errinfo, not only the topmost frame.  based on the patch by
+	  ktsj (Kazuki Tsujimoto) in [ruby-dev:45656]. [Bug #6460]
+
+Fri Nov  2 20:11:17 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#timestamp_file): remove @ which looks like
+	  configure variables.
+
+	* lib/mkmf.rb (MakeMakefile#timestamp_file): use .-. instead of !, a
+	  special character of NMAKE and BSD make.  [Bug #7265]
+
+Fri Nov  2 17:55:39 2012  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb (_run_parallel): Delete status line before showing
+	  results. Patch by Hiroshi Shirosaki. [Bug #6897] [ruby-core:47250]
+
+	* lib/test/unit.rb (_run_parallel): Fix strange result when disabled retrying.
+	  Patch by Hiroshi Shirosaki. [Bug #6897] [ruby-core:47250]
+
+Fri Nov  2 17:52:12 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* object.c (rb_mod_to_s): Module#{to_s,inspect}, when invoked on
+	  a refinement, returns a string in the format #<refinement:C@M>,
+	  where C is a refined class and M is a module at which the refinement
+	  is defined.
+
+	* eval.c (rb_mod_refine): store information on a refinement for the
+	  above change.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Fri Nov  2 16:57:52 2012  Shota Fukumori  <sorah@tubusu.net>
+
+	* vm_dump.c (rb_vm_bugreport): Because of many log directories,
+	  making directory lists readable.
+
+Fri Nov  2 16:44:00 2012  Kenta Murata  <mrkn@mrkn.jp>
+
+	* vm_dump.c (rb_vm_bugreport): add ~/Library/Logs/DiagnosticReports
+	  in the locations list of crash reports.
+
+Fri Nov  2 14:52:52 2012  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (recursive_equal): performance improvement by avoiding
+	  overhead to call rb_ary_elt().
+	  [ruby-dev:45412] [Feature #6177]
+
+Fri Nov  2 14:47:53 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* string.c (sym_to_proc, sym_call): A Proc created by Symbol#to_proc
+	  should close over the current refinements.
+	  [ruby-dev:46345] [Bug #7261]
+
+	* vm_eval.c (rb_call0, rb_search_method_entry,
+	  rb_funcall_passing_block_with_refinements): add a new argument
+	  `refinements' for the above changes.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Fri Nov  2 08:24:28 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (top_define_method): new method, main.define_method.
+	  [ruby-core:45715] [Feature #6609]
+
+	* eval.c (top_include): fix a warning message, main is not a class or
+	  module.
+
+Fri Nov  2 04:41:33 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#timestamp_file): use ! instead of %, a GNU
+	  make special character.
+
+Fri Nov  2 04:40:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_process.rb (test_execopts_preserve_env_on_exec_failure):
+	  use never existing file in the current temporary directory.
+
+Fri Nov  2 04:23:20 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: add feature to tag preview/rc.
+
+Fri Nov  2 03:23:37 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/mkmf.rb: fix for if config["libdir"] is nil.
+
+Thu Nov  1 23:06:01 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/make-snapshot: fix wrong regexp for releasing preview.
+	  patched by mame.
+
+Thu Nov  1 22:27:11 2012  Koichi Sasada <ko1@atdot.net>
+
+	* NEWS: add a news about objspace,
+	  ObjectSpace.reachable_objects_from.
+
+Thu Nov  1 21:57:00 2012  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_new),
+	  test/bigdecimal/test_bigdecimal.rb:
+	  Fix exception message of BigDecimal constructor with a Float.
+
+Thu Nov  1 21:52:20 2012  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_add),
+	  test/bigdecimal/test_bigdecimal.rb:
+	  need to specify precision for converting Rational and Float.
+	  [ruby-core:48045] [Bug #7176]
+
+Thu Nov  1 21:42:20 2012  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_process.rb: Revert r37404.  My ubuntu box has
+	  actually the directory named "/nonexistent"...  Sorry.
+
+Thu Nov  1 21:28:28 2012  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_process.rb: Process.exec raised EACCES on Linux
+	  3.5.0-17-generic.  This is a temporal fix to rescue that exception.
+	  Needs kosaki's review.
+
+Thu Nov  1 21:19:56 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (set_relation): parent_iseq need to be set regardless iseq
+	  type.  fix r37397.
+
+Thu Nov  1 19:47:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (RUBY_STACK_MIN): may not a compile time constant.
+	  fix r37079.  [ruby-dev:46322] [Bug #7247]
+
+Thu Nov  1 16:44:36 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* NEWS: add note for Module#refine, Module#refinements,
+	  Module#using, and Kernel#using.
+
+Thu Nov  1 14:41:47 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_using_module): using should be used indirectly.
+	  [ruby-dev:46326] [Feature #7251]
+
+Wed Oct 31 18:17:38 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (gc_profile_record): don't define unused variables when
+	  GC_PROFILE_MORE_DETAIL is 0.
+
+Wed Oct 31 18:10:53 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (gc_prof_mark_timer_stop): count is not initialized.
+
+Wed Oct 31 09:28:24 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* thread.c (rb_thread_call_without_gvl2):  Note that ubf() may or may
+	  not be called with the GVL.  Hinted that rb_thread_call_with_gvl()
+	  can be used to access ruby functionality.
+
+Wed Oct 31 09:06:54 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* thread.c (rb_thread_call_without_gvl2):  Update documentation to
+	  natural English.
+	* thread.c (rb_thread_call_with_gvl):  ditto.
+
+Wed Oct 31 02:53:07 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/dl/lib/dl/struct.rb: fix strange require order. [ruby-dev:45702]
+
+	* ext/dl/lib/dl/value.rb: ditto
+
+	* test/dl/test_c_struct_entry.rb: remove strange require order from
+	  tests.
+
+	* test/dl/test_c_union_entity.rb: ditto
+
+Tue Oct 30 23:59:32 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_refine): fix the error message when no block is
+	  given.  [ruby-dev:46319] [Bug #7244]
+
+	* test/ruby/test_refinement.rb: related test.
+
+Tue Oct 30 19:27:48 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (redirect_dup2): set standard handles when new fd is stdio,
+	  because if there is no allocated console at the moment Windows does
+	  not automatically associate it for child process's standard handle.
+	  this is adhoc workaround.
+	  reported by Martin Thiede at [ruby-core:48542] [Bug #7239].
+
+	* io.c (rb_cloexec_dup2): ditto.
+
+Tue Oct 30 03:08:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rbconfig/obsolete.rb (Config): re-introduce warnings for a
+	  lame-duck.  [ruby-core:46836] [Bug #6809]
+
+Tue Oct 30 02:20:10 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* thread.c: added Thread#thread_variable_(get|set),
+	  Thread#thread_variable?, and Thread#thread_variables for operating
+	  on variables that are local to threads. [ruby-core:47790]
+
+	* vm.c: ditto
+
+	* test/ruby/test_thread.rb: tests for thread variables.
+
+Mon Oct 29 18:22:58 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_close): close separately per each
+	  instances, as well as IO.
+
+Mon Oct 29 10:22:00 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/handlers/recorder.rb: added a class for
+	  recording YAML parse and emit events.
+
+	* ext/psych/lib/psych/handler.rb: adding a list of events so that
+	  handler classes can more easily be meta-programmed.
+
+	* test/psych/handlers/test_recorder.rb: tests for the change.
+
+Mon Oct 29 05:48:52 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/ostruct.rb: Add [] and []=, base on a patch by Thomas Sawyer.
+	  Also accept {Open}Struct as argument to new.
+	  Add #eql?, #hash & #each_pair
+	  Protect new_ostruct_member
+
+Mon Oct 29 03:20:58 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Fix determinant_e [ruby-dev:46305] [Bug #7228]
+
+Sun Oct 28 23:52:25 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb: Add tests for parsing XML encoded
+	  by UTF-8 with BOM.
+
+Sun Oct 28 23:47:09 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/source.rb: Move encoding detection code to base class.
+	* lib/rexml/encoding.rb: Remove needless encoding detection code.
+
+Sun Oct 28 21:40:13 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb: Fix a bug that UTF-8 is used
+	  for UTF-16XX encoded XML that doesn't have encoding="UTF-16" in
+	  XML declaration.
+	* test/rexml/test_document.rb: Add tests for the above change.
+
+Sun Oct 28 21:37:34 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb: Group tests that they parse
+	  UTF-16XX encoded XML that has encoding="UTF-16" in XML declaration.
+
+Sun Oct 28 21:25:11 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/source.rb (REXML::IOSource#initialize): Reduce
+	  @line_break initialize code. It should be done only in #encoding=.
+	* lib/rexml/parsers/baseparser.rb: Don't set UTF-16 encoding to
+	  source by encoding="UTF-16" in XML declaration because UTF-16XX
+	  source encoding should be set in Source#initialize or
+	  IOSource#initialize. They should handle BOM. Parser should not
+	  consider about it.
+
+Sun Oct 28 21:18:37 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb: Add tests for parsing XML encoded
+	  by UTF-16 with BOM.
+
+Sun Oct 28 19:12:11 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c (iso8601_{ext,bas}_time): should not match
+	  empty string.
+
+Sun Oct 28 18:51:33 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c (date__parse): revised the tight parser.
+
+Sun Oct 28 15:41:50 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/document.rb (REXML::Document#write): Add :encoding option
+	  to support custom XML encoding.
+	  [Feature #4872] (work in progress)
+	* test/rexml/test_document.rb: Add tests for the above change.
+
+Sun Oct 28 15:00:19 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/document.rb (REXML::Document#write): Remove needless
+	  indent in document.
+
+Sun Oct 28 14:59:14 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/document.rb (REXML::Document#write): Accept options
+	  Hash as argument.
+	* test/rexml/test_document.rb: Add tests for the above change.
+
+Sun Oct 28 14:09:44 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/document.rb (REXML::Document#write): Fix wrong usage
+	  in document.
+
+Sun Oct 28 14:03:48 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/document.rb (REXML::Document#write): Fix wrong method
+	  names in document.
+
+Sun Oct 28 10:12:15 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: `tree` should return the
+	  same thing on every call.
+
+	* test/psych/visitors/test_yaml_tree.rb: related test.
+
+Sun Oct 28 10:05:03 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: YAML Tree object should
+	  be able to take an emitter object as it's output.
+
+	* test/psych/visitors/test_yaml_tree.rb: related test.
+
+Sun Oct 28 08:23:16 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* bignum.c (bignew_1): Bignum instances are frozen.
+	  Feature #3222
+
+	* include/ruby/ruby.h: Fixnum instances are also frozen.
+
+	* class.c (singleton_class_of): check Bignum before
+	  singleton checking.
+
+	* test/ruby/test_bignum.rb: add a test.
+
+	* test/ruby/test_fixnum.rb: ditto.
+
+	* test/ruby/marshaltestlib.rb, test/ruby/test_eval.rb,
+	  test/ruby/test_object.rb: catch up above changes.
+
+Sun Oct 28 04:38:06 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (vm_define_method): remove type and frozen checking.
+	  Checking is done in `rb_singleton_class()'.
+
+Sun Oct 28 00:49:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assign_in_cond): warn for static content object assignments
+	  in conditional statements.  [ruby-dev:43083] [Feature #4299]
+
+Sat Oct 27 23:33:41 2012  Benoit Daloze  <eregontp@gmail.com>
+
+	* gc.c (gc_profile_result, gc_profile_report): use internal structures
+	  to avoid allocations and progressively print the output for #report.
+	  [ruby-core:47163] [Bug #6865]
+
+Sat Oct 27 11:01:10 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* numeric.c (rb_float_new_in_heap), include/ruby/ruby.h:
+	  make all Float objects frozen.
+	  [ruby-dev:46081] [ruby-trunk - Feature #6936]
+	  Most part of patch by NARUSE, Yui  <naruse@ruby-lang.org>.
+
+	* class.c (singleton_class_of): raise TypeError when
+	  trying to define a singleton method on Float objects.
+
+	* vm.c (vm_define_method): ditto.
+
+	* test/ruby/marshaltestlib.rb: catch up above changes.
+
+	* test/ruby/test_class.rb: ditto.
+
+	* test/test_pp.rb: ditto.
+
+Sat Oct 27 10:50:53 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* object.c (rb_mod_const_get): make sure the constant name is
+	  converted to a string before searching. [ruby-core:48405]
+
+Sat Oct 27 10:12:13 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* iseq.c (rb_iseq_compile_with_option): Instead of testing
+	  respond_to, just check if the argument is actually a file,
+	  because by calling user-defined gets something weired can
+	  happen.  Patch by Glass_saga. [ruby-dev:40202] [Bug #2861]
+
+	* parse.y (ripper_initialize): ditto.
+
+Sat Oct 27 10:07:57 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (enum lex_state_e): [EXPERIMENTAL] lex_state as bit field /
+	  IS_lex_state() macro.  based on the patch by Dave B in
+	  [ruby-core:23503].  [Feature #1493]
+
+Sat Oct 27 10:05:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (fstat): use _fstati64() instead of fstati64()
+	  on mingw32.
+
+Sat Oct 27 06:28:33 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* object.c (rb_mod_const_get): const_get accepts qualified constant
+	  strings.  e.g. Object.const_get("Foo::Bar::Baz") [ruby-core:41404]
+
+	* test/ruby/test_module.rb: tests for new behavior
+
+Fri Oct 26 13:24:20 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (literal_concat_gen): merge fixed strings across
+	  concatenated literals, after an interpolation.
+
+Thu Oct 25 17:48:54 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (has_redirection): should use shell (cmd.exe) when
+	  the commandline contains '&'.
+	  reported by Roger Pack at [ruby-core:47912] [Bug #7143], and
+	  patched by Heesob Park at [ruby-core:47931].
+
+Thu Oct 25 15:00:08 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h, class.c: remove (revert)
+	  `rb_add_method_cfunc_frameless()' API.
+	  This API is not mature to become an official API.
+	  For example, we can not use this API with
+	  `rb_define_private_method()'.
+
+	* method.h, vm_method.c (rb_add_method_cfunc_frameless): removed.
+
+Thu Oct 25 13:35:07 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/mkconfig.rb: remove string literal concatenation.
+
+Wed Oct 24 18:49:16 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/objspace/objspace.c (type2sym, count_objects_size): use enum
+	  instead of size_t which may be larger than actual values.
+
+Wed Oct 24 17:41:24 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: add `-x' or `--exclude' option
+	  to specify exclude benchmark name pattern.
+	  You can specify "-x foo" if you want to exclude the benchmarks
+	  if the name of benchmark contains `foo'.
+
+Wed Oct 24 11:57:24 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (gc_prepare_free_objects): rename to match the behavior of
+	  this function.
+
+Wed Oct 24 11:55:19 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c (reachable_object_from_i): change data
+	  structure of the result of reachable objects. Keys of table
+	  contains object_id of each reachable objects. Value of table
+	  is an object itself or an instance of InternalObjectWrapper.
+	  To avoid duplication, we use st_table and object_id keys.
+
+	* ext/objspace/objspace.c (type2sym): bug fix.
+	  Should use `i' instead of `type'.
+
+Wed Oct 24 10:33:09 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (garbage_collect, gc_marks): move the location of
+	  clear and restore rb_objspace_t::mark_func_data
+	  from garbage_collect() to gc_marks().
+
+Wed Oct 24 10:17:45 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c (Init_objspace): add a new method
+	  `ObjectSpace::InternalObjectWrapper#internal_object_id' which returns
+	  an object id of a wrapped internal object.
+
+Wed Oct 24 08:55:04 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c (ObjectSpace.reachable_objects_from):
+	  internal object support.
+	  If given object `obj' has references to internal objects
+	  (such as T_NODE objects), then this method returns instances of
+	  `ObjectSpace::InternalObjectWrapper' instead of that internal objects.
+	  This instance contains a reference to an internal object and you can
+	  check the type of internal object using
+	  `ObjectSpace::InternalObjectWrapper#type' method.
+	  Rdoc of `InternalObjectWrapper' is not prepared yet.
+
+	* gc.c (rb_objspace_reachable_objects_from), gc.h: change
+	  an interface of 'rb_objspace_reachable_objects_from()'
+
+	* gc.c, gc.h: add two APIs
+	  - rb_objspace_markable_object_p(obj): check markable or not.
+	  - rb_objspace_internal_object_p(obj): check internal or not.
+
+Wed Oct 24 05:52:36 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_method): remove `default' and
+	  add a case for `VM_METHOD_TYPE_UNDEF'.
+
+Wed Oct 24 05:41:18 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_error.c (error_print), vm_eval.c (eval_string_with_cref),
+	  vm_trace.c (rb_suppress_tracing): use TH_PUSH_TAG() instead of
+	  PUSH_TAG().
+
+Wed Oct 24 05:17:52 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c (vm_call0_body): remove RUBY_VM_CHECK_INTS()
+	  after method invocation using rb_call0().
+
+	* vm_eval.c (vm_call0_body): remove default section on top of
+	  switch statement and add cases for `VM_METHOD_TYPE_CFUNC_FRAMELESS'
+	  and `VM_METHOD_TYPE_UNDEF'.
+
+	* vm_eval.c (vm_call0_body): remove useless brackets.
+
+Tue Oct 23 22:34:49 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (thread_raise_m):  check interrupts after Thread#raise
+	  if a target thread is the current thread because the behavior
+	  of Thread.current.raise is expected to perform same as
+	  Kernel.raise (by rubyspec).
+
+Tue Oct 23 17:08:39 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (usage, process_options): show more info in --help.
+	  [EXPERIMENTAL] [ruby-core:48072] [Bug #7184]
+
+Tue Oct 23 14:20:43 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-electric.el using variable `last-command-event' instead of
+	  obsolete `last-command-char', so that work with Emacs trunk.
+	  a patch by Victor Deryagin <vderyagin AT gmail.com>.
+
+Tue Oct 23 14:06:47 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (visibility_option): visibility attribute is not
+	  available before GCC 4, so do not use -fvisibility option in that
+	  case.  [ruby-core:48147] [Bug #7205]
+
+Tue Oct 23 12:57:29 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME):
+	  add a new optimization and its macro `OPT_CALL_CFUNC_WITHOUT_FRAME'.
+	  This optimization makes all cfunc method calls `frameless', which
+	  is faster than ordinal cfunc method call.
+	  If `frame' is needed (for example, it calls another method with
+	  `rb_funcall()'), then build a frame. In other words, this
+	  optimization delays frame building.
+	  However, to delay the frame building, we need additional overheads:
+	    (1) Store the last call information.
+	    (2) Check the delayed frame building before the frame is needed.
+	    (3) Overhead to build a delayed frame.
+	  rb_thread_t::passed_ci is storage of delayed cfunc call information.
+	  (1) is lightweight because it is only 1 assignment to `passed_ci'.
+	  To achieve (2), we modify GET_THREAD() to check `passed_ci' every
+	  time. It causes 10% overhead on my environment.
+	  This optimization only works for cfunc methods which do not need
+	  their `frame'.
+	  After evaluation on my environment, this optimization does not
+	  effective every time. Because of this evaluation results, this
+	  optimization is disabled at default.
+
+	* vm_insnhelper.c, vm.c: add VM_PROFILE* macros to measure behaviour
+	  of VM internals. I will extend this feature.
+
+	* vm_method.c, method.h: change parameters of the `invoker' function.
+	  Receive `func' pointer as the first parameter.
+
+Tue Oct 23 06:21:05 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c: just get the constant defined in Ruby.
+
+	* ext/psych/lib/psych/syntax_error.rb: Psych::SyntaxError now inherits
+	  from StandardError rather than SyntaxError.  Thanks Eric Hodel!
+
+	* test/psych/test_exception.rb: tests for change.
+
+Tue Oct 23 06:17:36 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: Cache symbols while
+	  tokenizing.  Thanks Kevin Menard!
+
+Tue Oct 23 06:15:40 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: Updated the RegExp to catch
+	  Strings earlier in the tokenization process.  Thanks Kevin Menard!
+
+Tue Oct 23 06:12:39 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: Handle nil tags specially
+	  to avoid slow method_missing calls.  Thanks Kevin Menard!
+
+Tue Oct 23 06:07:57 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: Ignore bad timestamps.  If
+	  something looks like a timestamp but has an invalid component, treat
+	  it as a string instead of throwing an ArgumentError.
+	  Thanks Rhett Sutphin!
+
+	* test/psych/test_scalar_scanner.rb: appropriate tests.
+
+Tue Oct 23 06:04:07 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: Fix scalar_scanner to
+	  understand strings starting with an underscore and containing only
+	  digits.  Thanks Kelley Reynolds.
+
+	* test/psych/test_scalar_scanner.rb: test for fix
+
+Tue Oct 23 06:00:41 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: Changed comment in psych.rb to update new
+	  home page for libyaml.  Thanks to Carolyn Ann.
+
+Sun Oct 21 19:12:59 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_core.h (rb_vm_t::trace_running): add a new field
+	  `trace_running' to store vm global tracing status.
+
+	* vm_trace.c: fix SEGV bug. event_hook was free'd
+	  even when the hook is still used in another thread.
+	  [ruby-dev:46141] [Bug #7032]
+
+Sun Oct 21 19:12:42 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_core.h (rb_vm_t::trace_flag): remove `trace_flag'
+	  which is no longer used.
+
+Sun Oct 21 18:34:27 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c (date__parse): uses more tight parser if
+	  defined TIGHT_PARSER.  now inactivated; because it introduces
+	  incompatibilities and it is a bit slow.
+
+Sat Oct 20 15:35:06 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* include/ruby/ruby.h: add C APIs.
+	  VALUE rb_newobj_of(VALUE klass, VALUE flags)
+	  #define NEWOBJ_OF(obj,type,klass,flags)
+	  These allow to change a allocation strategy depending on klass
+	  or flags.
+
+	* gc.c: ditto
+
+	* array.c: use new C API.
+	* bignum.c: ditto
+	* class.c: ditto
+	* complex.c: ditto
+	* ext/socket/ancdata.c: ditto
+	* ext/socket/option.c: ditto
+	* hash.c: ditto
+	* io.c: ditto
+	* marshal.c: ditto
+	* numeric.c: ditto
+	* object.c: ditto
+	* random.c: ditto
+	* range.c: ditto
+	* rational.c: ditto
+	* re.c: ditto
+	* string.c: ditto
+	* struct.c: ditto
+	  [Feature #7177][Feature #7047]
+
+Sat Oct 20 12:50:00 2012  Zachary Scott	<zachary@zacharyscott.net>
+
+	* ext/socket/socket.c: Documentation for Socket
+	  Based on a patch by David Albert
+	  [Bug #7105] [ruby-core:47828]
+
+Sat Oct 20 11:00:00 2012  Zachary Scott	<zachary@zacharyscott.net>
+
+	* lib/open-uri.rb: Documentation for OpenURI
+
+Sat Oct 20 06:18:34 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* hash.c (initialize_copy): unset the default proc if there isn't one
+	  for the target hash, call to_hash, check frozen status.
+
+Fri Oct 19 22:22:01 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_vm_jump_tag_but_local_jump): pass through thrown objects.
+	  [ruby-dev:46234] [Bug #7185]
+
+	* vm_eval.c (rb_eval_cmd): if state is non-zero, val should be nil and
+	  rb_vm_jump_tag_but_local_jump() just jump tag.
+
+Fri Oct 19 22:11:55 2012  Benoit Daloze  <eregontp@gmail.com>
+
+	* pack.c (pack_unpack): set encoding of the
+	  'H','h','B' and 'B' modifiers to US-ASCII.
+
+	* test/ruby/test_pack.rb: tests for the above.
+	  [ruby-core:47653][Bug #7050]
+
+	* test/test_securerandom.rb: tests for SecureRandom.hex
+	  from tenderlove. [ruby-core:46792][Bug #6799]
+
+Fri Oct 19 19:29:11 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* method.h (rb_method_cfunc_t::invoker): add new field (func ptr)
+	  `invoker'. `invoker' function invoke cfunc body
+	  (rb_method_cfunc_t::func).
+	  `invoker' is set at method definition timing.
+	  With this change, the big `switch' (branch) in `call_cfunc()'
+	  is no longer needed.
+	  However, the performance benefit is only a bit.
+
+	* vm_core.h (rb_call_info_t::aux::func): add a new field to store
+	  cfunc body function pointer.
+
+	* vm_method.c (call_cfunc_invoker_func): add a new function which
+	  returns a suitable invoke function.
+
+	* vm_method.c (setup_method_cfunc_struct): added.
+
+	* vm_method.c (rb_add_method): fix to set `invoker'.
+
+	* vm_eval.c (vm_call0_body): catch up above changes.
+
+	* vm_insnhelper.c (call_cfunc): removed.
+
+	* vm_insnhelper.c (vm_call_cfunc): fix to call cfunc body
+	  with `invoker' function.
+
+Fri Oct 19 16:55:58 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c, vm_eval.c: use TH_PUSH_TAG() instead of PUSH_TAG().
+
+Fri Oct 19 11:13:55 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: remove unexpected `output'.
+	  (commit miss)
+
+Fri Oct 19 10:24:03 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_search_method): remove needless local variable.
+
+Fri Oct 19 10:22:26 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bmx_temp.rb: removed.
+	  This file should not be in repository.
+
+Fri Oct 19 10:20:10 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: add new option `--ruby-arg [ARG]'
+	  which is passed as a launch parameter for each ruby's execution.
+	  ($ ruby [ARG] [File])
+
+Thu Oct 18 18:42:35 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (opt_send_simple): move the location of
+	  `opt_send_simple' to the place near `send' definition.
+	  (to take care about icache locality).
+
+Thu Oct 18 18:29:25 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (send): remove unused condition.
+	  This condition will be true after r37258.
+
+	* vm_insnhelper.c (vm_caller_setup_args): remove `UNLIKELY' on
+	  checking blockiseq (it seems `LIKELY').
+
+Thu Oct 18 17:31:58 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (opt_send_simple): introduce new instruction used
+	  when no need to care about block and splat.
+
+	* compile.c: use the `opt_send_simple' instruction.
+
+Thu Oct 18 16:44:07 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_add_method_cfunc, rb_add_method_cfunc_frameless):
+	  check arity earlier at definition time.
+
+Thu Oct 18 15:11:31 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c: add `inline' keyword to several functions.
+	  Compilers (gcc) are conservative than I expected.
+
+Thu Oct 18 15:01:15 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: add a decl. of
+	  `rb_define_frameless_method()'.
+
+Thu Oct 18 14:31:17 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (new_callinfo): set a temporary index of callinfo
+	  (used in `iseq_set_sequence()') to rb_call_info_t::aux::index.
+	  rb_call_info_t::argc is initialized by same value of
+	  rb_call_info_t::orig_argc.
+
+Thu Oct 18 14:11:08 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c (rb_define_frameless_method): rename from
+	  rb_define_method_fast(). Defined method with this C API
+	  does not make a method frame. It is bit lightweight than
+	  ordinal C functions. Now only 0 or 1 argc are permitted.
+
+	* method.h (VM_METHOD_TYPE_CFUNC_FRAMELESS): rename macro name
+	  from VM_METHOD_TYPE_CFUNC_FAST.
+
+	* vm_insnhelper.c, vm_method.c: rename related functions.
+
+	* proc.c (rb_method_entry_arity): catch up above changes.
+
+Thu Oct 18 10:30:34 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assignable_gen): fail if yyerror occurred.  fix a bug in
+	  r36973.
+
+Thu Oct 18 09:23:03 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* hash.c (initialize_copy): duping should rehash the hash.
+
+	* test/ruby/test_hash.rb: added a test to ensure rehash.
+
+Wed Oct 17 21:16:47 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* common.mk (WPROGRAM): need same dependencies as PROGRAM.
+
+	* cygwin/GNUmakefile.in (uncommon.mk): move include position
+	  below WPROGRAM definition to be defined in uncommon.mk.
+
+	* ext/extmk.rb (all, static): fix make rubyw.exe failure with make -jN.
+	  If make of ruby.exe and rubyw.exe run in parallel, link dll and link
+	  exe run in parallel, which causes link failure on mingw. To fix this,
+	  we make ruby.exe and rubyw.exe in one make process.
+	  [ruby-core:48007] [Bug #7165]
+
+Wed Oct 17 16:25:34 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm2_method_missing.rb: add a benchmark to measure
+	  performance of invoking `method_missing'.
+
+Wed Oct 17 16:23:17 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_getivar): fix to use `aux.index' instead of
+	  `aux.opt_pc'.
+
+Wed Oct 17 16:03:54 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_method_missing): make a refactoring
+	  about method_missing process. Use `vm_call_method()' to invoke
+	  `method_missing' method instead of `rb_funcall2()'.
+	  In `vm_call_method()', set fastpath to `vm_call_method_missing()'
+	  if it can be cached.
+
+	* vm_core.h (rb_call_info_t): add new field
+	  `rb_call_info_t::aux::missing_reason' to pass the reason to
+	  `vm_call_method_missing()'.
+
+Wed Oct 17 15:33:12 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (opt-dir): allow multiple directories separated by
+	  $PATH_SEPARATOR as well as dir_config in mkmf.rb. [ruby-core:47868]
+	  [Bug #7120]
+
+Wed Oct 17 15:08:13 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: fix Net::IMAP::ResponseParser to accept
+	  message/delivery-status ([ruby-core:47920] [Bug #7146]),
+	  message/rfc822 attachments ([ruby-core:47921] [Bug #7147]), and
+	  (BODY ("MIXED")) ([ruby-core:47951] [Bug #7153]).
+	  patched by Tony Arkles.
+
+	* test/net/imap/test_imap_response_parser.rb: related test.
+
+Wed Oct 17 11:04:48 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_hash.rb (TestHash#test_dup_equality): added a new test
+	  to show the problem of r37232.
+
+Wed Oct 17 10:48:40 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_search_method): fix a build error that occurs
+	  when OPT_INLINE_METHOD_CACHE is 0.
+
+Wed Oct 17 08:46:47 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm2_dstr.rb: add a benchmark to measure
+	  performance of dynamic generated string ("foo#{bar}baz").
+
+Wed Oct 17 08:32:46 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (compile_dstr_fragments): use `putobject' instead of
+	  `putstring' for all of strings used by NODE_DSTR because
+	  ruby users can not grab this string.
+	  For example, the string object of "baz" in "foo#{bar}baz"
+	  is located by `putobject' (users can not touch "baz" object
+	  directly). This change reduces GC pressure.
+	  This improvement is suggested by Aaron Patterson.
+
+Wed Oct 17 08:02:57 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_threadptr_interrupt_mask): fix to check interrupt
+	  after interrupt_mask changed.
+
+Wed Oct 17 06:42:47 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_method): fix to return value immediately.
+	  Remove CHECK_INTS() after that method dispatch.
+
+Wed Oct 17 06:25:56 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* hash.c (initialize_copy): copy the underlying st_table on dup,
+	  rather than copying the hash key by key. [ruby-core:48009]
+
+	* test/ruby/test_hash.rb: relevant tests for initialize_copy
+
+Wed Oct 17 06:17:44 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_iseq_setup_2): separate tailcall and normal
+	  method frame setup functions.
+	  Add checking interrupts at the tailcall setup function.
+
+Wed Oct 17 05:35:37 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm1_yield.rb: add a benchmark to measure `yield'
+	  (invoke empty block) performance.
+
+	* benchmark/bm_vm2_method_with_block.rb: add a benchmark to measure
+	  method invocation with empty block.
+
+Wed Oct 17 05:05:07 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_invoke_block): vm_caller_setup_args() can skip
+	  when splat flag is not set.
+
+Wed Oct 17 01:53:47 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_getivar, vm_setivar): support index inline cache
+	  with rb_call_info_t to speedup `attr' getter and setter.
+	  Cached index is stored in rb_call_info_t::aux::index.
+	  `index' == 0 means not cached. `index' > 0 means cached and cached
+	  index is `index - 1'.
+
+	* insns.def ((get|set)instancevariable): use new wrapper functions
+	  vm_(get|set)instancevariable() defined in vm_insnhelper.c.
+
+	* vm_core.h (rb_call_info_t::aux): introduce new union data because
+	  opt_pc can share with index.
+
+Tue Oct 16 22:24:44 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb (show_results): Show speedup ratio
+	  with first executables score at last of results
+	  if two or more executables are given.
+
+Tue Oct 16 21:59:01 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: some refactoring.
+	  (1) Remove `average differential'.
+	      In this benchmark driver, We should not care about `average'.
+	      We use fastest score because this score should not include
+	      any disturbances (affections of background process, etc).
+	      If you care about timing affect, I recommend `median'
+	      score with more than 5 examinations rather than simple
+	      `average' score (`average' score was affected by error scores).
+	  (2) Show log file name.
+	  (3) Change default directory from './' to driver's directory.
+
+Tue Oct 16 14:56:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_join): need to check again after any conversion run.
+	  [ruby-core:48012] [Bug #7168]
+
+Tue Oct 16 12:52:14 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_file):
+	  rename from file_assertion.
+
+Tue Oct 16 11:30:18 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_join): hide the result under construction until
+	  return.
+
+	* file.c (rb_file_join): check nul-byte only for strings, since
+	  FilePathStringValue() does it.  [ruby-core:48012] [Bug #7168]
+
+	* file.c (rb_file_join): path names must be ASCII-compatible.
+	  [ruby-core:48012] [Bug #7168]
+
+	* file.c (check_path_encoding): new function to ensure path name
+	  encoding to be ASCII-compatible.
+
+Tue Oct 16 09:40:04 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_regexp.rb
+	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): use
+	  Regexp.new instead of literal to ignore a parser warning.
+
+Tue Oct 16 09:30:30 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_regexp.rb
+	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): ignoring
+	  warnings are already set in setup method.
+
+Tue Oct 16 06:44:06 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (VM_CALLEE_SETUP_ARG): fix wrong condition.
+
+Tue Oct 16 06:29:18 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_method): disable CI_SET_FASTPATH() if
+	  this method call needs splat argument because cached functions
+	  (vm_call_attrset, vm_call_ivar, vm_call_cfunc_fast_(unary|binary))
+	  do not check an arity.
+
+	* bootstraptest/test_method.rb: add a test to check an above issue.
+
+Tue Oct 16 06:15:44 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* method.h: introduce new method type VM_METHOD_TYPE_CFUNC_FAST.
+	  This method is similar to VM_METHOD_TYPE_CFUNC methods, but
+	  called cfunc without building new frame (does not push new control
+	  frame). If error is occurred in cfunc, the backtrace only shows
+	  caller frame and upper.
+	  This kind of methods can be added by rb_define_method_fast().
+	  This feature is similar to specialized instructions (opt_plus, etc),
+	  but more flexible (but a bit slower).
+
+	* class.c (rb_define_method_fast): added.
+	  Maybe it will be renamed soon.
+
+	* vm_insnhelper.c (vm_call_method): support method type
+	  VM_METHOD_TYPE_CFUNC_FAST.
+
+	* proc.c (rb_method_entry_arity): catch up new method type.
+
+	* vm_method.c (rb_add_method_cfunc_fast): added.
+
+Tue Oct 16 02:32:29 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.h (CI_SET_FASTPATH): add new parameter `enabled'.
+	  If `enable' is 0 then CI_SET_FASTPATH() doesn't work.
+	  And add new configuration option OPT_CALL_FASTPATH. If this macro
+	  was defined by 0, then CI_SET_FASTPATH() doesn't work any more.
+
+	* vm_insnhelper.c (vm_call_method): Pass `0' for `enabled' parameter
+	  of CI_SET_FASTPATH if this method is protected.
+
+Tue Oct 16 02:17:35 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h (VM_CALL_*): rename VM_CALL_*_BIT
+	  to VM_CALL_* (remove `_BIT' suffix).
+	  Add comments on each macros.
+	  Remove unused macro VM_CALL_TAILRECURSION_BIT.
+
+	* compile.c, iseq.c, insns.def, vm_insnhelper.c: ditto.
+
+Mon Oct 15 22:14:44 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#file_assertion):
+	  rewrite file assertions.
+
+Mon Oct 15 09:41:17 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (VM_CALLEE_SETUP_ARG): skip CI_SET_FASTPATH() if
+	  it was called from vm_yield_setup_args().
+
+Mon Oct 15 05:20:13 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.h CI_SET_FASTPATH: introduce new macro
+	  `CI_SET_FASTPATH(ci, func)'. This macro set `ci->call' as `func'.
+	  `func' (ci->call) is called at the last of `send'
+	  (and `invokesuper') instruction.
+	  `CI_SET_FASTPATH' does not set `ci->call' when the method
+	  (stored in `ci->me') is `protected'.
+
+	* vm_insnhelper.c (vm_call_method): use `CI_SET_FASTPATH'.
+	  After several checking (visibility, argc checking), the result of
+	  checking can be reused until re-definition of this method
+	  with inline method cache.
+
+	  Note that this optimization is now experimental.
+	  If you find any problem about it, please tell us.
+
+Mon Oct 15 04:51:55 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c: refactoring.
+	  - move all `call' related functions to the last of file.
+	  - make functions for respective method types in vm_call_method().
+	    (all functions have same function parameters)
+
+	* vm_core.h: add `opt_pc' field in `rb_call_info_t'
+	  as temporal variable.
+
+	* vm_eval.c (vm_call0_body): catch up above changes.
+
+Mon Oct 15 03:51:46 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm1_attr_ivar(_set).rb: added (for method dispatch speed).
+
+	* benchmark/bm_vm1_float_simple.rb: added (for flonum/float).
+
+Mon Oct 15 02:51:16 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c (vm_call0_body): add new function.
+	  `vm_call0()' makes call_info struct and calls `vm_call0_body()'
+	  with this struct. In near future, `vm_call0()' will be removed
+	  because all of `vm_call0()' users setup call_info struct by itself.
+
+Mon Oct 15 01:38:06 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (send, invokesuper, invokeblock, opt_*), vm_core.h:
+	  use only a `ci' (rb_call_info_t) parameter instead of using
+	  parameters such as `op_id', 'op_argc', `blockiseq' and flag.
+	  These information are stored in rb_call_info_t at the compile
+	  time.
+	  This technique simplifies parameter passing at related
+	  function calls (~10% speedups for simple method invocation at
+	  my machine).
+	  `rb_call_info_t' also has new function pointer variable `call'.
+	  This `call' variable enables to customize method (block)
+	  invocation process for each place. However, it always call
+	  `vm_call_general()' at this changes.
+	  `rb_call_info_t' also has temporary variables for method
+	  (block) invocation.
+
+	* vm_core.h, compile.c, insns.def: introduce VM_CALL_ARGS_SKIP_SETUP
+	  VM_CALL macro.  This flag indicates that this call can skip
+	  caller_setup (block arg and splat arg).
+
+	* compile.c: catch up above changes.
+
+	* iseq.c: catch up above changes (especially for TS_CALLINFO).
+
+	* tool/instruction.rb: catch up above changes.
+
+	* vm_insnhelper.c, vm_insnhelper.h: ditto. Macros and functions
+	  parameters are changed.
+
+	* vm_eval.c (vm_call0): ditto (it will be rewritten soon).
+
+Sun Oct 14 12:30:44 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (rb_f_sub, rb_f_gsub): pass the given block.
+	  [ruby-core:47967] [Bug #7157]
+
+Sat Oct 13 23:15:39 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* regparse.c (parse_char_class): should match with a hyphen after a
+	  range in a character class.
+
+	* test/ruby/test_regexp.rb (TestRegexp#test_char_class): fixed wrong
+	  test.
+
+	* test/ruby/test_regexp.rb (TestRegexp#check): now can accept the
+	  error message.
+
+	* test/ruby/test_regexp.rb
+	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): renamed
+	  because the previous name was wrong.
+
+	* test/ruby/test_regexp.rb
+	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): added
+	  more test pattern.
+
+Sat Oct 13 03:01:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (realpath_rec): prevent link from GC while link_names refers
+	  the content.
+
+Sat Oct 13 01:37:48 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_regexp.rb
+	  (TestRegexp#test_raw_hyphen_and_type_char_after_range): added new
+	  test. ref [ruby-core:47115] [Backport #6853]
+
+Fri Oct 12 21:55:08 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* include/ruby/win32.h (rb_w32_pow): set floating point precision
+	  for mingw-w64 x86 pow(). This improves the precision of pow() on
+	  Windows XP for TestFloat#test_round_with_precision failure.
+	  [ruby-core:47911] [Bug #7142]
+
+Fri Oct 12 21:37:25 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/webrick/test_cgi.rb (TestWEBrickCGI#test_cgi): skip a test
+	  depending on locale on Windows. ENV[] doesn't work properly if
+	  console code page is not equal to file system encoding.
+	  [ruby-core:47910] [Bug #7140]
+
+Fri Oct 12 20:40:29 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (posix_sh_cmds): the command name of colon is ":".
+
+Fri Oct 12 18:18:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_get_path_check): path name must not contain NUL bytes.
+
+Fri Oct 12 16:06:20 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/merger.rb: now can merge revision(s) without --ticket again.
+
+Fri Oct 12 14:10:41 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (dir_config, init_mkmf): use configured libdir value as
+	  default library path.  [ruby-core:43726] [Bug #6207]
+
+Fri Oct 12 05:25:00 2012  Zachary Scott	<zzak@ruby-lang.org>
+
+	* lib/timeout.rb (timeout):
+	  Remove paragraph on wrong implementation detail.
+	  [ruby-core:47739] [Bug #7088]
+
+Thu Oct 11 23:09:46 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_sub{seq,pos,str}, rb_str_each_{line,codepoint}):
+	  prevent String copies from GC.  [ruby-core:47881] [Bug #7135]
+
+Thu Oct 11 07:40:50 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* iseq.c (insn_operand_intern): cast op to rb_call_info_t* before
+	  compare with iseq->callinfo_entries whose type is rb_call_info_t*.
+
+Thu Oct 11 03:37:08 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_block.rb: add tests for block with super.
+
+Thu Oct 11 02:54:07 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_dump.c: fix debug prints to catch up recent changes
+	  such as VM data structures.
+
+Thu Oct 11 02:50:34 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (insn_operand_intern): add support disasm TS_CALLINFO
+	  operands.
+
+Wed Oct 10 15:12:48 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_process.rb (TestProcess#test_execopts_gid): skip on
+	  windows because the platform does not have Process.group method.
+	  patched by Jon Forums in [ruby-core:47878] [Bug #7133].
+
+Tue Oct  9 23:18:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (assert_file, assert_file_not): more
+	  descriptive assertions for File predicates.
+
+Tue Oct  9 18:01:37 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sample): use rb_random_ulong_limited, since
+	  precision of long may be larger than double.
+
+	* random.c (rb_random_ulong_limited): new function to return a random
+	  value from 0 upto limit as unsigned long, similarly to
+	  rb_genrand_ulong_limited but with arbitrary RNG object.
+
+Tue Oct  9 17:13:27 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_execarg_addopt, rb_execarg_run_options): add :uid and
+	  :gid options.  [ruby-core:47414] [Feature #6975]
+
+Tue Oct  9 14:36:11 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (iseq_free): fix memory leak.
+	  rb_iseq_t::callinfo_entries should be freed.
+
+Tue Oct  9 14:28:18 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h (rb_call_info_t): add new type `rb_call_info_t'.
+	  This data structure contains information including inline method
+	  cache. After that, `struct iseq_inline_cache_entry' does not
+	  need to contain inline cache for method invocation.
+	  Other information will be added to this data structure.
+
+	* vm_core.h (rb_iseq_t): add `callinfo_entries' and `callinfo_size'
+	  members to `rb_iseq_t'.
+
+	* insns.def, compile.c: Use CALL_INFO instead of IC.
+
+	* tool/instruction.rb: support CALL_INFO as operand type.
+
+	* vm_insnhelper.c, vm_insnhelper.h: ditto.
+
+Sun Oct  7 23:54:33 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/zlib/zlib.c (zstream_run_func): don't call inflate() when
+	  z->stream.avail_in == 0. it return Z_BUF_ERROR.
+	  but deflate() could be called with z->stream->avail_in == 0 because
+	  it has hidden buffer in z->stream->state (opaque structure).
+	  fix for gem install error. [ruby-dev:46149] [Bug #7040]
+
+Mon Oct  8 23:55:41 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_refinements): new method Module#refinements.
+
+	* test/ruby/test_refinement.rb: add new tests for the above changes.
+
+Mon Oct  8 23:02:19 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c, gc.c, iseq.c, node.h, vm_insnhelper.c, vm_insnhelper.h,
+	  vm_method.c: rename omod and overlaid modules to refinements.
+
+	* eval.c (hidden_identity_hash_new): renamed from identity_hash_new.
+
+Sun Oct  7 04:50:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* lib/abbrev.rb: Documentation examples for Abbrev.
+	  [ruby-core:47442] [Bug #6985]
+
+Sun Oct  7 04:50:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* thread.c (rb_thread_aref):
+	  Grammar in Thread documentation.
+	  Patch by Steve Klabnik [ruby-core:47799] [Bug #7099]
+
+Sun Oct  7 04:37:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* string.c (rb_str_match):
+	  Clarify behavior for captured strings and local variable assignment
+	  Patch by Marcus Stollsteimer [ruby-core:47668] [Bug #7062]
+
+Sat Oct  6 18:31:36 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_opts.h (OPT_GLOBAL_METHOD_CACHE): new build option to
+	  enable/disable global method caching. [ruby-dev:46203] [Bug #7111]
+
+	* vm_method.c (rb_method_entry_get_with_omod): don't use global
+	  method cache if OPT_GLOBAL_METHOD_CACHE is 0.
+
+Sat Oct  6 16:32:04 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (search_method): check omod only once for performance.
+
+Sat Oct  6 09:42:04 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/encdb.c, enc/utf_16_32.h (ENC_DUMMY_UNICODE): endian-less wide
+	  UTF encodings are dummy but Unicode.
+
+	* encoding.c (rb_encdb_set_unicode): set Unicode flag.
+
+	* template/encdb.h.tmpl: allow ENC_DUMMY variants.
+
+	* encoding.c (rb_enc_unicode_p): oniguruma provides Unicode flag.
+
+Fri Oct  5 17:18:42 JST 2012  TAKANO Mitsuhiro  <tak@no32.tk>
+
+	* template/Doxyfile.tmpl: remove SHOW_DIRECTORIES and
+	  HTML_ALIGN_MEMBERS lines. They have been obsolete in
+	  Doxygen version 1.8.2.
+
+Fri Oct  5 15:26:18 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c: add ObjectSpace#reachable_objects_from.
+	  This method returns an array of objects referenced by given object.
+	  If given object is special objects such as true/false/nil/Fixnum etc
+	  then it returns nil. See rdoc for details.
+	  [ruby-core:39772]
+
+	* test/objspace/test_objspace.rb: add a test for this method.
+
+	* gc.c: add rb_objspace_reachable_objects_from().
+	  To make this function, add several member `mark_func_data'
+	  to rb_objspace_t.  If mark_func_data is not null, then
+	  gc_mark() calls mark_func_data::mark_func.
+
+	* gc.h: export rb_objspace_reachable_objects_from().
+
+Thu Oct  4 23:40:04 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (init_heap): call init_mark_stack before to allocate
+	  altstack. This change avoid the stack overflow at the signal
+	  handler on 32bit, but I don't understand reason... [Feature #7095]
+
+Thu Oct  4 22:39:27 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (getlocal, setlocal): remove old getlocal/setlocal
+	  instructions and rename getdaynmic/setdynamic instructions
+	  to getlocal/setlocal.
+
+	* compile.c: ditto.
+
+	* iseq.c: remove TS_DINDEX.
+
+	* vm_exec.h (dindex_t): remove type definition of `dindex_t'.
+
+	* tool/instruction.rb: ditto.
+
+Thu Oct  4 21:44:17 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (vm_analysis_insn|operand|register): use st_insert
+	  instead of using rb_hash_aset() because rb_hash_aset()
+	  check $SAFE.
+
+Thu Oct  4 21:15:26 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (VM_COLLECT_USAGE_DETAILS): make new VM usage analysis
+	  hooks (old macro name is COLLECT_USAGE_ANALYSIS).
+	  This feature is only for VM developers.  (I'm not sure I can use
+	  `VM developers' (the plural form) in this sentence).
+	  If VM_COLLECT_USAGE_DETAILS is not 0, VM enables the following
+	  usage collection features:
+	    (1) instruction: collect instruction usages.
+	    (2) operand: collect operand usages.
+	    (3) register: collect register usages.
+	  The results are stored in
+	    RubyVM::USAGE_ANALYSIS_INSN for (1, 2),
+	    RubyVM::USAGE_ANALYSIS_INSN_BIGRAM for (1) and
+	    RubyVM::USAGE_ANALYSIS_REGS for (3).
+	  You can stop collecting usages with
+	    RubyVM::USAGE_ANALYSIS_INSN_STOP(),
+	    RubyVM::USAGE_ANALYSIS_OPERAND_STOP(),
+	    RubyVM::USAGE_ANALYSIS_REGISTER_STOP()
+	  for (1), (2), (3) respectively.
+	  You can also change the hook functions by setting
+	  C level global variables
+	    `ruby_vm_collect_usage_func_(insn|operand|register)'
+	  for (1), (2), (3) respectively.
+	  See codes for more details.
+
+	* tool/instruction.rb: fix macro names.
+
+	* iseq.c (insn_operand_intern): make it export (used in vm.c).
+	  fix to skip several processes if not needed (pointer is 0).
+
+	* vm_dump.c: move codes for collection features to vm.c.
+
+	* vm_exec.h: rename macro and function names.
+
+	* vm_insnhelper.h: ditto.
+
+Thu Oct  4 18:59:14 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_settracefunc.rb (test_tracepoint):
+	  remove unused test case.
+	  (this test case is redefined by newer tests)
+
+Thu Oct  4 17:24:51 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (rb_objspace_call_finalizer): call gc_mark_stacked_objects
+	  at suitable point.
+
+Thu Oct  4 16:31:29 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_objspace_call_finalizer): mark self-referencing finalizers
+	  before run finalizers, to fix SEGV from btest on 32bit.
+
+	* gc.c (gc_mark_stacked_objects): extract from gc_marks().
+
+Thu Oct  4 11:43:28 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (ruby_init_stack): round stack limit to page size
+	  boundary to calculate stack size more precisely.  [ruby-dev:46174]
+	  [Bug #7084]
+
+Wed Oct  3 19:51:57 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: Use the non-recursive marking instead of recursion. The
+	  recursion marking of CRuby needs checking stack overflow and the
+	  fail-safe system, but these systems not good at partial points,
+	  for example, marking deep tree structures. [ruby-dev:46184]
+	  [Feature #7095]
+
+	* configure.in (GC_MARK_STACKFRAME_WORD): removed. It's used by
+	  checking stack overflow of marking.
+
+	* win32/Makefile.sub (GC_MARK_STACKFRAME_WORD): ditto.
+
+Wed Oct  3 15:33:02 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (ruby_init_stack): use getrlimit() for the main
+	  thread on Mac OS X, since pthread_get_stack{addr,size}_np()
+	  return the default value always, but not the ulimit value.
+	  [ruby-dev:46174] [Bug #7084]
+
+Wed Oct  3 11:43:15 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_reopen): improvement to accept optional arguments.
+	  a patch by Glass_saga (Masaki Matsushita) in [ruby-core:47806].
+	  [Feature #7103]
+
+Wed Oct  3 04:36:11 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_add_file):  Added
+	  documentation
+	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
+	  ditto
+	* ext/openssl/ossl_x509store.c (ossl_x509store_add_cert):  ditto
+
+Wed Oct  3 02:23:37 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* error.c (exc_to_s, name_err_to_s, name_err_mesg_to_str): do not
+	  taint messages.
+
+Tue Oct  2 16:47:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (identity_hash_new): hide internal hashes for refinements.
+
+	* eval.c (rb_mod_refine): no default value.
+
+Mon Oct  1 22:54:02 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (identity_hash_new): new function to create a new identity
+	  hash.
+
+	* eval.c (rb_overlay_module, rb_mod_using, rb_mod_refine): use
+	  identity_hash_new().
+
+Mon Oct  1 02:34:53 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in (--with-opt-dir): Make this also work on DLDFLAGS
+	  so LIBRUBY_SO links fine with libexecinfo installed in a
+	  non-system directory.
+
+Sun Sep 30 23:32:00 2012  Kenta Murata  <mrkn@mrkn.jp>
+
+	* vm_dump.c (rb_vm_bugreport): add /Library/Logs/DiagnosticReports
+	  in the list of locations of crash reports.
+
+Sun Sep 30 21:18:03 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_concat): use memcpy to copy a string which contains
+	  NUL characters. [ruby-core:47751] [Bug #7090]
+
+Sat Sep 29 19:41:53 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/envutil.rb (EnvUtil#invoke_ruby): kill child process
+	  before Timeout::Error is raised. rmdir of mktmpdir fails with
+	  EACCES if child process is alive on Windows.
+
+	* test/thread/test_queue.rb (TestQueue): increase timeout.
+	  This test takes long time on Windows XP.
+
+Sat Sep 29 19:41:33 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/net/http/test_http.rb (TestNetHTTP#test_proxy_address):
+	  clear environment variables. If http_proxy environment variable was
+	  set, the test failed.
+
+	* test/net/http/test_http.rb (TestNetHTTP#test_proxy_port): ditto.
+
+Sat Sep 29 19:41:11 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/drb/drbtest.rb (DRbCore#teardown):
+	  Use Process.kill :KILL on Windows because Process.kill :INT silently
+	  fails on Windows 7 and raises EINVAL on Windows XP for spawned
+	  process with new_pgroup: false.
+
+	* test/drb/drbtest.rb (DRbAry#teardown): ditto.
+
+Sat Sep 29 19:40:32 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/test_unicode_escape.rb (TestUnicodeEscape#test_basic):
+	  set script encoding to work with LANG=C. It would work on both
+	  Windows and Unix. Refix of r37051.
+
+Sat Sep 29 11:21:06 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (rb_vm_using_modules): use using_modules before
+	  klass to fix method lookup order, and use klass even if klass is
+	  not a module to make refinements in class_eval invoked on classes
+	  work.
+
+	* eval.c (rb_using_module): accept a class as the second argument.
+
+	* eval.c (rb_mod_using, f_using): raise a TypeError if the argument
+	  is not a module.
+
+	* test/ruby/test_refinement.rb: add new tests for the above changes.
+
+Sat Sep 29 02:18:57 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/test_unicode_escape.rb (TestUnicodeEscape#test_basic):
+	  Use ruby only on Windows since the test fails on Unix with LANG=C.
+	  [ruby-core:47709] [Bug #7076]
+
+Fri Sep 28 22:19:31 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/test_unicode_escape.rb (TestUnicodeEscape#test_basic):
+	  echo command doesn't work properly against non-ascii character on
+	  Windows with chcp 437. Instead we use ruby.
+	  [ruby-core:47709] [Bug #7076]
+
+Fri Sep 28 17:54:31 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_setup_method): refactoring.
+	  Remove src_argc and use iseq->arg_size directly.
+
+Fri Sep 28 17:26:27 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rubygems/installer.rb (check_that_user_bin_dir_is_in_path):
+	  test_generate_bin_bindir_with_user_install_warning(TestGemInstaller)
+	  fails on Windows with msys bash. It makes comparing paths
+	  case-insensitive.
+	  pick from upstream to fix a failure of test-all [ruby-core:47711]
+	 https://github.com/rubygems/rubygems/commit/c474edb2f3704206f04da1c8c6cf9fb079d84abe
+
+Fri Sep 28 15:44:45 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (search_method): copy refinement iclasses to search
+	  superclasses correctly.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Fri Sep 28 15:15:41 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (opt_checkenv): remove unused instruction `opt_checkenv'.
+
+	* compile.c (iseq_compile_each): ditto.
+
+	* node.h: remove unused node `NODE_OPTBLOCK'.
+
+	* ext/objspace/objspace.c, gc.c (gc_mark_children): ditto.
+
+Fri Sep 28 13:14:34 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: now VM_DEBUG_BP_CHECK should be 1.
+
+Fri Sep 28 12:51:54 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: remove rb_control_frame_t::bp (bp: base pointer).
+	  `bp' can be calculate by `sp' (stack pointer) of previous frame.
+	  Now, `bp_check' field is remained for debug.  You can eliminate
+	  this field by setting  VM_DEBUG_BP_CHECK as 0.
+
+	* vm_insnhelper.c (vm_base_ptr): add `vm_base_ptr(cfp).
+	  This function calculates base pointer from cfp.
+
+	* vm_insnhelper.c (vm_setup_method): push `recv' value on top of
+	  value stack (before method parameters).
+	  This change is for keeping consistency with normal method dispatch.
+
+	* insns.def: fix to use vm_base_ptr().
+
+	* vm.c (vm_exec): ditto.
+
+	* vm_dump.c: remove `bp' related dumps.
+
+	* cont.c (fiber_init): fix to check VM_DEBUG_BP_CHECK.
+
+Fri Sep 28 10:40:51 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_reopen): accept File::Constants as well as mode string.
+	  based on the patch by Glass_saga (Masaki Matsushita) in
+	  [ruby-core:47694].  [Feature #7067]
+
+Thu Sep 27 18:36:51 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_overlay_module, rb_mod_refine): accept a module as the
+	  argument of Module#refine.
+
+	* vm_method.c (search_method): if klass is an iclass, lookup the
+	  original module of the iclass in omod in order to allow
+	  refinements of modules.
+
+	* test/ruby/test_refinement.rb: add tests for the above changes.
+
+Thu Sep 27 18:12:20 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/syslog/lib/syslog/logger.rb: add a formatter to the
+	  Syslog::Logger object. [Bug #7065]
+	* test/syslog/test_syslog_logger.rb: ditto.
+
+Wed Sep 26 16:39:57 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def: add new instruction `opt_empty_p' for optimize `empty?'
+	  method.  Apply a patch proposed at [ruby-dev:46120]
+	  [ruby-trunk - Feature #6972] by Glass_saga (Masaki Matsushita).
+
+	* compile.c (iseq_specialized_instruction), vm.c, vm_insnhelper.h:
+	  ditto.
+
+	* id.c, template/id.h.tmpl: ditto.
+
+	* test/ruby/test_optimization.rb: test for this changes.
+
+Tue Sep 25 09:59:26 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (invokesuper): klass in cfp is not valid in at_exit and
+	  END blocks.  [ruby-core:47680] [Bug #7064]
+
+Tue Sep 25 08:11:11 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* iseq.c (rb_iseq_defined_string): the index of defined_strings must
+	  be the value of type - 1.
+
+Mon Sep 24 17:36:51 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (defined_expr), insns.def (defined): share single frozen
+	  strings.  [EXPERIMENTAL] [ruby-core:47558][Feature #7035]
+
+	* iseq.c (rb_iseq_defined_string): make expression strings.
+
+Mon Sep 24 11:22:36 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: add --ticket option to add ticket number.
+
+Sun Sep 23 21:51:59 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (String#unspace): unescape with backslashes.  normal
+	  makes need to escape spaces with backslashes.  nmake is not the
+	  case.  [Bug #7036]
+
+	* lib/mkmf.rb (create_makefile): use timestamp file dependencies for
+	  directories.
+
+	* lib/mkmf.rb: unexpand macros.
+
+	* lib/mkmf.rb (LIBPATHFLAG): no needs to escape library path here.
+
+	* lib/mkmf.rb (MakeMakefile#configuration): make prefix paths
+	  internal to deal with in Makefile.
+
+	* lib/mkmf.rb (MakeMakefile#mkintpath): not a global function now.
+
+Sun Sep 23 02:33:37 2012  Benoit Daloze  <eregontp@gmail.com>
+
+	* complex.c: Fix examples of r36993.
+	  Keep the simple definition, mathematics define the result.
+	  Based on patch by Robin Dupret. Fixes #188 on github.
+
+Sat Sep 22 07:15:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* ext/ripper/lib/ripper.rb:
+	  Match sample output to Ripper.sexp from current trunk version.
+	  [Bug #6929]
+
+Thu Sep 20 23:05:11 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (native_cond_initialize): destroy condattr
+	  after using it. Patch by Stanislav Sedov. Thank you.
+	  [Bug #7041] [ruby-core:47619]
+
+Thu Sep 20 22:53:02 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (native_cond_initialize): clean up #ifdef condition.
+
+Thu Sep 20 16:42:44 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/drb/ssl.rb (DRb::DRbSSLSocket::SSLConfig::DEFAULT): add
+	  SSLTmpDhCallback for configuration option.
+
+	* lib/drb/ssl.rb (setup_ssl_context): copy the value of tmp_dh_callback.
+
+	* test/drb/ut_array_drbssl.rb: set tmp_dh_callback to suppress warning.
+
+	* test/drb/ut_drb_drbssl.rb: ditto.
+
+Thu Sep 20 10:56:08 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/drb/ut_drb.rb: revert a part of r36987, and get rid of a warning
+	  with another method.  if the substitution is removed, the ExtSrv
+	  object will be GC'ed and some tests will be blocked.
+
+Thu Sep 20 07:20:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* complex.c: Examples for Complex Documentation.
+	  Patch by Robin Dupret.
+	  Fixes #184 on github.
+
+Thu Sep 20 07:15:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* ext/ripper/lib/ripper.rb: Documentation for Ripper.
+	  +:void_stmt+ is meaningless
+	  [Bug #6929] [ruby-core:47507]
+
+Thu Sep 20 07:05:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* lib/csv.rb (Object#CSV, Array#to_csv, String#parse_csv):
+	  Examples and documentation for CSV.
+	  [Bug #6880] [ruby-core:47218]
+
+Thu Sep 20 00:42:20 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (take_items), enum.c (enum_zip): raise TypeError at
+	  non-enumerable objects, not NoMethodError.  [ruby-dev:46145]
+	  [Bug #7038]
+
+	* vm_eval.c (rb_check_block_call): check_funcall variant with block
+	  function.
+
+Tue Sep 18 17:51:29 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_attrs): add npn_select_db to
+	  suppress warning: instance variable @npn_select_cb not initialized
+
+Sun Sep 16 17:47:00 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* tool/change_maker.rb:  Update svn detection for subversion 1.7's
+	  single .svn directory.
+
+Sun Sep 16 11:39:12 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_set_read_length): if the read length equals to the buffer
+	  string size then nothing to do.  or ensure the string modifiable
+	  before setting the length only when the former is shorter.  based on
+	  the patch in [ruby-core:47541] by Hiroshi Shirosaki.
+	  [ruby-core:46586] [Bug #6764]
+
+Sun Sep 16 08:57:52 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (strict_warnflags): separate strict flags from
+	  warnflags only for core.  [ruby-dev:46105]
+
+Sun Sep 16 08:16:05 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* .editorconfig: add.  [ruby-core:47548] [Feature #7030]
+
+Sat Sep 15 01:56:40 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: Merge upstream: 50a383c84.
+	  [ruby-dev:46128] [Bug #7005]
+
+Sat Sep 15 00:20:04 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c (rb_nkf_convert): suppress warning.
+
+Fri Sep 14 04:05:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* array.c (rb_ary_diff, rb_ary_uniq):
+	  Enhance documentation for array uniqueness
+	  Based on a patch by Robin Dupret
+	  [Bug #6872] [ruby-core:47209]
+
+Fri Sep 14 03:30:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* array.c (rb_ary_select):
+	  Update documentation for Array#select
+	* enum.c (enum_find_all, enum_reject):
+	  Update documentation for Enumerable#find_all and Enumerable#reject
+	  Based on a patch by Jeff Saracco
+	  [Bug #6908] [ruby-core:47285] [Fixes #166 on github]
+
+Fri Sep 14 00:20:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* signal.c (rb_f_kill):
+	  Update documentation for Process.kill to reflect kill(2)
+	  Patch by Richo Healey
+
+Thu Sep 13 21:40:49 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* lib/securerandom.rb (SecureRandom.random_bytes):
+	  Use 64bit value as pointer for Windows x64 to fix SystemCallError.
+
+	* lib/securerandom.rb (SecureRandom.lastWin32ErrorMessage):
+	  Set proper encoding to avoid invalid byte sequence error.
+	  [ruby-core:47451] [Bug #6990]
+
+Thu Sep 13 11:20:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* lib/optparse.rb: Remove unreachable email address from documentation
+	  [Bug #6996] [ruby-core:47459]
+
+Thu Sep 13 11:20:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* lib/xmlrpc.rb: Documentation for XMLRPC
+	* lib/xmlrpc/datetime.rb: ditto.
+	* lib/xmlrpc/parser.rb: ditto.
+	* lib/xmlrpc/client.rb: ditto.
+	* lib/xmlrpc/utils.rb: ditto.
+	* lib/xmlrpc/README.rdoc: ditto.
+	* lib/xmlrpc/create.rb: ditto.
+	* lib/xmlrpc/base64.rb: ditto.
+	* lib/xmlrpc/config.rb: ditto.
+	* lib/xmlrpc/httpserver.rb: ditto.
+	* lib/xmlrpc/server.rb: ditto.
+	* lib/xmlrpc/marshal.rb: ditto.
+	* lib/xmlrpc/README.txt: ditto.
+	  [Bug #6909] [ruby-core:47286]
+
+Thu Sep 13 10:22:11 2012  Takashi Toyoshima  <toyoshim@gmail.com>
+
+	* configure.in: Don't use PIE on Haiku because loader support is not
+	  enough.
+
+Thu Sep 13 08:20:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* lib/shellwords.rb: Documentation for Shellwords.
+
+Thu Sep 13 08:00:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* ext/ripper/lib/ripper.rb: Documentation for Ripper.
+	* ext/ripper/lib/ripper/lexer.rb: ditto.
+	* ext/ripper/lib/ripper/sexp.rb: ditto.
+	* ext/ripper/lib/ripper/filter.rb: ditto.
+	* ext/ripper/lib/ripper/core.rb: ditto.
+	  [Bug #6929] [ruby-core:47309]
+
+Wed Sep 12 22:59:07 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_method_missing, vm_call_method): reuse arguments
+	  on the VM stack and get rid of ALLOCA.
+
+Wed Sep 12 22:45::00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* ext/pathname/lib/pathname.rb: Documentation for Pathname.
+	* ext/pathname/pathname.c: ditto.
+	  [Bug #6947] [ruby-core:47354]
+
+Mon Sep 10 10:19:34 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/depend: fixed wrong change in a part of r34802.
+
+Sun Sep  9 22:02:50 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/socket/basicsocket.c (rsock_bsock_send):
+	  avoid unnecessary select() calls before doing I/O
+	  Patch by Eric Wong. [Feature #4538] [ruby-core:35586]
+	* ext/socket/init.c (rsock_s_recvfrom): ditto.
+	* ext/socket/init.c (rsock_s_accept): ditto.
+	* ext/socket/udpsocket.c (udp_send): ditto.
+	* io.c (io_fflush): ditto.
+	* io.c (io_binwrite): ditto.
+	* io.c (rb_io_syswrite): ditto.
+
+Mon Sep 10 01:38:51 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (nogvl_close, maygvl_close, nogvl_fclose, maygvl_fclose):
+	  suppress integer <-> pointer cast warnings.
+	  [Feature #4570] [ruby-core:35711]
+
+Mon Sep 10 01:36:00 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_close): notify fd close before releasing gvl.
+	* io.c (fptr_finalize): modify fptr->mode before releasing gvl.
+	  remove unnecessary rb_thread_fd_close().
+	  [Feature #4570] [ruby-core:35711]
+
+Mon Sep 10 00:16:34 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c: exec() requires to be single threaded also on Haiku.
+	  by Takashi Toyoshima <toyoshim@gmail.com>
+	  https://github.com/ruby/ruby/pull/178
+
+Sun Sep  9 21:21:15 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/thread.rb (Queue#pop): Fixed double registration issue when
+	  mutex.sleep is interrupted. [Bug #5258] [ruby-dev:44448]
+	* lib/thread.rb (SizedQueue#push): ditto.
+
+	* test/thread/test_queue.rb (test_sized_queue_and_wakeup,
+	test_queue_pop_interrupt, test_sized_queue_pop_interrupt,
+	test_sized_queue_push_interrupt): new tests.
+
+Sun Sep  9 20:20:31 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/sync.rb (Sync_m#sync_lock): Fixed wakeup/raise unsafe code.
+	  Patched by Masaki Matsushita. [Bug #5355] [ruby-dev:44521]
+
+	* test/thread/test_sync.rb (test_sync_lock_and_wakeup,
+	  test_sync_upgrade_and_wakeup, test_sync_lock_and_raise):
+	  new test.
+
+Sun Sep  9 18:39:46 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/intern.h (rb_thread_blocking_region): Added
+	  a comment of recommended alternative way.
+
+Sun Sep  9 18:37:05 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/sync.rb (Sync_m): Removed RCS_ID.
+
+Sun Sep  9 18:21:03 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_io.rb (test_advise_pipe): new test to check
+	  io.advise() against anonymous io object don't make crash.
+	  made by Eric Wong. [Bug #6081] [ruby-core:42880]
+
+Sun Sep  9 16:47:12 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (nogvl_close, maygvl_close, nogvl_fclose, maygvl_fclose):
+	  new functions.
+	* io.c (fptr_finalize): release GVL if possible.
+	  Patched by Eric Wong. [Feature #4570] [ruby-core:35711]
+
+Sun Sep  9 16:08:48 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (io_bufread): removed unnecessary rb_thread_wait_fd().
+	  Patch by Eric Wong. [Bug #6629] [ruby-core:45789]
+	* io.c (rb_io_sysread): ditto.
+	* io.c (copy_stream_fallback_body): ditto.
+
+Sun Sep  9 15:21:52 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_mutex_lock): stop multiple threads use
+	  pthread_cond_timedwait() concurrently. [Bug #6278] [ruby-core:44275]
+
+Sat Sep  8 18:52:22 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (struct rb_classext_struct): move allocator function into
+	  rb_classext_t from ordinary method table.  [ruby-dev:46121]
+	  [Feature #6993]
+
+	* object.c (rb_obj_alloc): call allocator function directly.
+
+	* vm_method.c (rb_define_alloc_func, rb_undef_alloc_func)
+	  (rb_get_alloc_func): use allocator function in rb_classext_t.
+
+Fri Sep  7 01:21:51 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake), lib/mkmf.rb (have_framework): fix splitting
+	  options with an argument, not using NUL as special character.
+	  [ruby-core:47447] [Bug #6987]
+
+Thu Sep  6 14:49:49 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* .gdbinit (rp): FLONUM support.
+
+	* include/ruby/ruby.h (ruby_special_consts): define FLONUM constants
+	  always, so that they are available from gdb.
+
+	* include/ruby/ruby.h (RB_FLOAT_TYPE_P): merge FLONUM and non-FLONUM
+	  versions.  inline TYPE() comparison and FLONUM_P() should be
+	  optimized away on non-FLONUM.
+
+Thu Sep  6 08:20:55 2012  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 3.4.0 (r7762)
+	* test/minitest/*: ditto
+
+Wed Sep  5 19:20:53 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (rb_warn4S): renamed from rb_warn4(), because the case in
+	  r36911 takes a string.
+
+	* parse.y (rb_warn4S): use ripper_warnS() for ripper.
+
+	* parse.y (ripper_warnS): now it is used.
+
+Wed Sep  5 15:51:52 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* .travis.yml (notifications): [experimental] update notification
+	  template.
+
+Wed Sep  5 15:21:12 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (rb_warn4): added as a rb_warn variant to warn with explicit
+	  source file name and line in parse.y.
+
+	* parse.y (warn_unused_var): use rb_warn4 to suppress warning on ripper.
+
+Wed Sep  5 13:30:04 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_make_pattern): names under recursive need to be single
+	  basenames to match for each name.  [ruby-core:47418] [Bug #6977]
+
+Tue Sep  4 20:55:17 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/envutil.rb (EnvUtil#invoke_ruby): show Timeout::Error
+	  instead of IOError if the timeout has expired.
+
+	* test/test_pstore.rb
+	  (PStoreTest#test_pstore_files_are_accessed_as_binary_files):
+	  increase timeout because this test is slow on Windows.
+	  [ruby-core:47402] [Bug #6965]
+
+Tue Sep  4 11:28:57 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* vm_eval.c (ruby_eval_string_from_file_protect): initializer
+	  element is not computable at load time.
+
+Tue Sep  4 07:48:35 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_asn1_rb:
+	  test/openssl/test_ssl_session.rb:
+	  test/openssl/test_x509name.rb:
+	  test/openssl/test_buffering.rb:
+	  test/openssl/test_x509cert.rb:
+	  test/openssl/test_ssl.rb: Refactor code that leads to warnings on
+	  Ruby CI.
+
+Tue Sep  4 07:02:56 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/utils.rb: Use DSS1 as DSA signature digest for all
+	  OpenSSL versions < 1.0.0.
+	  [Feature #6946] [ruby-core:47405]
+
+Mon Sep  3 21:22:37 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_float_value): suppress warnings.
+	  [ruby-core:47406][Bug #6971]
+
+Mon Sep  3 14:49:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/matrix.rb (Vector#magnitude): accumulate squares of absolute
+	  values to fix for complex vector.  [ruby-dev:46100] [Bug #6966]
+
+Mon Sep  3 10:09:36 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/extconf.rb: Detect OpenSSL_FIPS macro
+	  ext/openssl/ossl.c: Expose OpenSSL::OPENSSL_FIPS constant to
+	  indicate whether OpenSSL runs in FIPS mode.
+	  test/openssl/test_pkey_dh.rb: Generate 256 bit keys for
+	  non-FIPS installations to improve test performance (e.g. for
+	  rubyci).
+	  test/openssl/utils.rb: Replace DSS1 as certificate signature
+	  digest with SHA1 for FIPS installations when using DSA by
+	  introducing TestUtils::DSA_SIGNATURE_DIGEST.
+	  test/openssl/test_x509cert.rb:
+	  test/openssl/test_x509crl.rb:
+	  test/openssl/test_x509req.rb: Use DSA_SIGNATURE_DIGEST
+	  NEWS: Introduce OpenSSL::OPENSSL_FIPS
+
+	  These changes allow running the OpenSSL tests in FIPS mode
+	  while keeping a high performance for non-FIPS installations.
+	  Introduction of OpenSSL::OPENSSL_FIPS allows for applications
+	  to react to special requirements when using OpenSSL in FIPS mode.
+	  [Feature #6946] [ruby-core:47345]
+
+Sun Sep  2 21:46:28 2012  Martin Bosslet <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/utils.rb: Use a cached DH key instead of generating a
+	  new one each time.
+
+Sun Sep  2 05:41:28 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/ssl.rb (WEBrick::Config::SSL): add new key
+	  SSLTmpDhCallback to set SSLContext#tmp_dh_callback.
+
+	* lib/webrick/ssl.rb (WEBrick::GenericServer#setup_ssl_context):
+	  follow above.
+
+Sat Sep  1 18:50:50 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (#initialize_copy, #eql): Use instance_variable_get
+	  instead of instance_eval.
+
+Fri Aug 31 21:47:56 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/test/unit/test-unit.gemspec: Make test/unit default gem.
+	  [Feature #6875] [ruby-dev:46051]
+
+Fri Aug 31 18:35:02 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/extconf.rb: Check existence of OPENSSL_NPN_NEGOTIATED.
+	  ext/ossl_ssl.c: Support Next Protocol Negotiation. Protocols to be
+	  advertised by the server can be set in the SSLContext by using
+	  SSLContext#npn_protocols=, protocol selection on the client is
+	  supported by providing a selection callback with
+	  SSLContext#npn_select_cb. The protocol that was finally negotiated
+	  is available through SSL#npn_protocol.
+	  test/openssl/test_ssl.rb: Add tests for Next Protocol Negotiation.
+	  NEWS: add news about NPN support.
+	  [Feature #6503] [ruby-core:45272]
+
+Fri Aug 31 17:38:43 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#{each,reject!,select!}, SortedSet#each): Pass
+	  the original block through instead of creating one that only
+	  yields the passed argument.
+
+Fri Aug 31 16:23:20 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/ipaddr.rb: Introduce several new error classes where only
+	  ArgumentError and StandardError were used.  IPAddr::Error is
+	  their common ancestor class that inherits from ArgumentError for
+	  backward compatibility.  Submitted by Jon Daniel.  Fixes #173 on
+	  GitHub.
+
+Fri Aug 31 14:51:27 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/bigdecimal/test_bigdecimal.rb (TestBigDecimal#test_to_f): added
+	  for previous commit.
+
+Fri Aug 31 14:32:05 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): use self's sign to
+	  determine 0.0 and Inf's sign instead of internal double value's.
+	  Reported by phasis68 (Heesob Park) at [ruby-core:47381] [Bug #6955]
+
+Fri Aug 31 14:31:17 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/id.h.tmpl, tool/id2token.rb: make id.h independent from
+	  parse.h, and make parse.c dependent on it instead.
+
+Fri Aug 31 14:27:39 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): fix race conditions at install-ext.
+	  target files need to depend on destination directory timestamp
+	  files, not phony targets.
+
+Fri Aug 31 14:03:45 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_trace.c (clean_hooks): do not access freed memory.
+
+	* vm_trace.c (rb_threadptr_exec_event_hooks): fix uninitialized state
+	  when no events is executed.
+
+Thu Aug 30 18:21:51 2012  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_close): call rb_last_status_clear.
+
+Thu Aug 30 16:17:52 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): check underflow since
+	  strtod() sets errno to ERANGE at underflow too.  [ruby-core:47342]
+	  [Bug #6944]
+
+Thu Aug 30 12:44:43 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#{<,>,<=,>=}): Define comparison operators as
+	  shorthand for the {proper_}{subset?,superset?} methods (finally).
+	  Given a push by Alexander E. Fischer.
+
+Thu Aug 30 09:21:01 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/ftp.rb (URI::FTP#initialize): raise InvalidURIError if "//"
+	  is not present [ruby-core:47344] [Bug #6945]
+
+Thu Aug 30 07:45:12 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* test/ruby/test_file_exhaustive.rb: fix test introduced in r36811 for
+	  posix environments where HOME is not defined.  [ruby-core:47322]
+
+Wed Aug 29 23:42:59 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_last_status_clear): declared.
+
+	* process.c (rb_last_status_clear): exported.
+	  (rb_f_system): call rb_last_status_clear.
+
+	* io.c (rb_f_backquote): call rb_last_status_clear.
+
+Wed Aug 29 22:01:15 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_f_system): check failures of waitpid.
+	  [ruby-talk:398687]
+
+Wed Aug 29 15:03:04 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBDIR_BASENAME): use configured libdir value to fix
+	  --enable-load-relative on systems where libdir is not default value,
+	  overridden in config.site files.  [ruby-core:47267] [Bug #6903]
+
+	* ruby.c (ruby_init_loadpath_safe): ditto.
+
+Wed Aug 29 14:34:41 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c: SIZE_MAX is defined in stdint.h, so r36755 breaks
+	  32bit FreeBSD. [ruby-core:47360] [Bug #6948]
+
+Wed Aug 29 04:50:04 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/utils.rb
+	  test/openssl/test_pair.rb
+	  test/openssl/test_pkey_dh.rb: Use 1024 bit DH parameters to satisfy
+	  OpenSSL FIPS requirements. Patch by Vit Ondruch.
+	  [Bug #6938] [ruby-core:47326]
+
+Tue Aug 28 22:31:49 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* insns.def (checkmatch): suppress warnings. [ruby-core:47339]
+	  [Bug #6930]
+
+Tue Aug 28 20:03:54 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: Fixing Haiku R1/alpha3 build with gcc-4.4.4.
+	  - omit ANSI standard flags to compile socket extension where
+	    anonymous union is required.
+	  - remove redundant -be flags.
+	  by Takashi Toyoshima <toyoshim@gmail.com>
+	  https://github.com/ruby/ruby/pull/168
+
+Tue Aug 28 11:32:37 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* nacl/GNUmakefile.in (.rbconfig.time): r36828 was incomplete.
+	  It did not run correctly on clean build.
+
+Tue Aug 28 09:25:20 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (Makefile): make to depend on common.mk, to
+	  stop and force to re-run make process when common.mk is changed.
+
+Mon Aug 27 20:19:49 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/etc/test_etc.rb (TestEtc#test_getgrgid): fix for non unique GID.
+	  No unixen systems guarantee that GID is unique. Etc.getgrgid would
+	  not return the first entry in the order of Etc.group for shared GID.
+	  [ruby-core:47312] [Bug #6935]
+
+Mon Aug 27 18:19:36 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h (rb_float_value): optimize it.
+	  This technique was pointed by shinichiro.hamaji
+	  <http://shinh.skr.jp/m/?date=20120825#p02>.
+
+Mon Aug 27 15:08:25 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* common.mk (vm_trace.o): Added a missing dependency.
+
+Sun Aug 26 09:29:32 2012  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* nacl/GNUmakefile.in (package): make package should install
+	  example.html for nacl build
+
+	Patch by Takashi Toyoshima <toyoshim AT gmail.com>.
+
+Sun Aug 26 09:22:33 2012  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* nacl/GNUmakefile.in (CC, LD, NM, AR, AS, RANLIB, OBJDUMP, OBJCOPY)
+	  Rewrites these variables instead of PATH.
+	  NaCl port uses a toolchain which is specified by NACL_SDK_ROOT
+	  environment variable. Originally, NaCl build added the toolchain
+	  under the NACL_SDK_ROOT to the PATH. But updating PATH doesn't work
+	  on Mac.
+	  (RBCONFIG): Replaces configs with the variable updates above.
+
+	* configure.in: Thus it is no longer necessary to check $PATH.
+
+	Based on a patch by Takashi Toyoshima <toyoshim AT gmail.com>.
+
+Sun Aug 26 16:53:00 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (checkmatch): suppress warnings.  [ruby-core:47310]
+	  [Bug #6930]
+
+	* vm_core.h (VM_FRAME_TYPE_FINISH_P): ditto.
+
+Fri Aug 24 15:42:28 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): use timestamp for destination
+	  directories to make them before making or copying files there.
+	  [ruby-dev:46067] [Bug #6904]
+
+Fri Aug 24 12:40:15 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* configure.in (mingw): add shlwapi to the list of dependency
+	  libs for Windows.
+	* win32/Makefile.sub (EXTSOLIBS): ditto.
+
+	* internal.h: declare internal functions rb_w32_init_file,
+	  rb_file_expand_path_internal and rb_file_expand_path_fast.
+
+	* file.c (Init_File): invoke Windows initialization rb_w32_init_file
+
+	* win32/file.c (rb_file_load_path_internal): new function.
+	  Windows-specific implementation that replaces file_expand_path.
+	  [Bug #6836][ruby-core:46996]
+
+	* win32/file.c (rb_w32_init_file): new function. Initialize codepage
+	  cache for faster conversion encodings lookup.
+
+	* file.c (file_expand_path): rename to rb_file_expand_path_internal.
+	  Conditionally exclude from Windows.
+
+	* file.c (rb_file_expand_path_fast): new function. delegates to
+	  rb_file_expand_path_internal without performing a hit to the
+	  filesystem.
+
+	* file.c (file_expand_path_1): use rb_file_expand_path_internal without
+	  path expansion (used by require).
+	* file.c (rb_find_file_ext_safe): ditto.
+	* file.c (rb_find_file_safe): ditto.
+
+	* load.c (rb_get_expanded_load_path): use rb_file_expand_path_fast.
+	* load.c (rb_feature_provided): ditto.
+
+	* file.c (rb_file_expand_path): use rb_file_expand_path_internal with
+	  path expansion.
+	* file.c (rb_file_absolute_path): ditto.
+
+	* test/ruby/test_file_exhaustive.rb: new tests to exercise
+	  rb_file_expand_path_internal implementation and compliance with
+	  existing behaviors.
+
+Fri Aug 24 07:35:24 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http/backward.rb (class Net):  Restored Net::HTTPSession to
+	  fix backwards-compatibility with ancient Net::HTTP.  [Bug #6889]
+
+Thu Aug 23 20:58:55 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* common.mk: support `make id.h` without `rm .id.h.time` after
+	  `rm id.h`.
+
+Thu Aug 23 20:48:45 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_fixnum.rb (TestFixnum#test_singleton_method): new test.
+
+	* test/ruby/test_bignum.rb (TestBignum#test_singleton_method): ditto.
+
+	* test/ruby/test_float.rb (TestFloat#test_singleton_method): ditto.
+
+	* test/ruby/test_symbol.rb (TestSymbol#test_singleton_method): ditto.
+
+Thu Aug 23 20:34:32 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* class.c (singleton_class_of): flonum can't have singleton class.
+
+	* vm.c (vm_define_method): flonum can't have singleton method.
+
+Thu Aug 23 19:18:33 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (win32/*): macro RUBY_H_INCLUDES is not defined there,
+	  so need to move dependency rules under the definition of it.
+
+Thu Aug 23 19:16:20 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub: refactoring.  remove unused rules, and update
+	  some rules which are not used usually to fit current macros.
+
+Thu Aug 23 16:46:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_find_file_ext_safe, rb_find_file_safe): default to
+	  US-ASCII for encdb and transdb.
+
+	* load.c (search_required): keep encoding of feature name.  set
+	  loading path to filesystem encoding.  [Bug #6377][ruby-core:44750]
+
+	* ruby.c (add_modules, require_libraries): assume default external
+	  encoding as well as ARGV.
+
+Thu Aug 23 16:20:04 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: introduce flonum technique for
+	  64bit CPU environment (sizeof(double) == sizeof(VALUE)).
+	  flonum technique enables to avoid double object creation
+	  if the double value d is in range about between
+	  1.72723e-77 < |d| <= 1.15792e+77 or 0.0.
+	  flonum Float value is immediate and their lowest two bits
+	  are b10.
+	  If flonum is activated, then USE_FLONUM macro is 1.
+	  I'll write detailed in this technique on
+	  https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/Flonum_tech
+
+	* benchmark/bmx_temp.rb: add an benchmark for simple
+	  Float calculation.
+
+	* gc.c (id2ref, rb_obj_id): add flonum Float support.
+
+	* include/ruby/intern.h: move decl of rb_float_new(double)
+	  to include/ruby/ruby.h.
+
+	* insns.def, vm.c, vm_insnhelper.c: add flonum optimization
+	  and simplify source code.
+
+	* vm_insnhelper.h (FLONUM_2_P): added.
+
+	* marshal.c: support flonum output.
+
+	* numeric.c (rb_float_new_in_heap): added.
+
+	* parse.y: support flonum.
+
+	* random.c: ditto.
+
+Thu Aug 23 16:12:40 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): add dependency to header files when
+	  depend files don't exist.  now we can remove simple (and often
+	  wrong) depend files in most cases.
+
+Thu Aug 23 16:02:20 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/date/depend: add dependency to $(ruby_headers).
+
+Thu Aug 23 12:51:39 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* insns.def (invokesuper): reverted r36640 partially to make super
+	  in a thread work correctly. [ruby-core:47284] [Bug #6907]
+
+	* test/ruby/test_super.rb: related test.
+
+Thu Aug 23 12:30:20 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/configure.bat: support --with(out)?-ext(ensions) options.
+
+Thu Aug 23 11:52:04 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: Fixing Haiku build.
+	  - -lbe is not required for linking
+	  - stack protector doesn't work for now because of the default gcc's
+	    bug
+	  by Takashi Toyoshima <toyoshim@gmail.com>
+	  https://github.com/ruby/ruby/pull/167
+
+	* signal.c (ruby_signal): haiku doesn't have SIGBUS.
+
+Thu Aug 23 11:32:44 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/open-uri/test_open-uri.rb (TestOpenURI#test_read_timeout): this
+	  test expects that the server thread will be killed in sleep, but 0.01
+	  sec is too short to reach there.
+
+Thu Aug 23 10:49:28 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: use the value of --with-opt-dir on building ruby
+	  itself. [ruby-dev:46064] [Bug #6900]
+
+Thu Aug 23 10:36:35 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (ID_H_TARGET): revert a part of r36724 and r36751.  they
+	  break mswin build from clean source.
+
+Thu Aug 23 02:37:35 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/syck: removed. Fixes [ruby-core:43360]
+
+	* test/syck: removed.
+
+	* lib/yaml.rb: only require psych, show a warning if people try to set
+	  the engine to syck.
+
+Thu Aug 23 01:46:53 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* insns.def: search up the cf stack for an object that is an instance
+	  of the recipient class.  Fixes [ruby-core:47186]
+
+	* test/ruby/test_super.rb: related test.
+
+Wed Aug 22 19:46:24 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: [ruby-core:47266].
+
+Wed Aug 22 19:41:19 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: [ruby-core:47226].
+
+Wed Aug 22 16:57:04 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (configuration): extract least ruby headers list as
+	  ruby_headers, so depend files can use default dependency
+	  explicitly.
+
+Wed Aug 22 15:27:50 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_setup_method): fix last commit of
+	  vm_insnhelper.c (r36771). [ruby-dev:46065] [Bug #6901]
+	  Should not disable tail call opt on FINISH_FRAME.
+	  This flag should be propagated correctly.
+
+Wed Aug 22 14:05:23 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: support TracePoint. [ruby-trunk - Feature #6895]
+
+	* test/ruby/test_settracefunc.rb: add tests for above.
+
+	* proc.c (rb_binding_new_with_cfp): add an internal function.
+
+	* vm.c (rb_vm_control_frame_id_and_class): add an internal function.
+
+	* vm_trace.c: add rb_add_event_hook2() and rb_thread_add_event_hook2().
+	  Give us the good name for them!
+
+Wed Aug 22 11:38:16 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* .travis.yml (before_script): Turned out that make -j is broken.
+
+Wed Aug 22 11:23:35 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_setup_method): should not enable tail call
+	  optimization for frames with VM_FRAME_FLAG_FINISH.
+	  [ruby-dev:46065] [Bug #6901]
+
+Wed Aug 22 11:20:47 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rubygems/test_case.rb: run test with psych if exist.
+
+Thu Aug 16 12:09:51 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* nacl/pepper_main.c (init_loadpath): Pushes the correct load path on
+	  other architectures than x86_64. Fixes #6873.
+
+Wed Aug 15 19:37:33 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* configure.in (ac_cv_func_shutdown): shutdown(2) has a dummy
+	  implementation but has no declaration and does not work in
+	  NativeClient SDK pepper_20.
+
+Wed Aug 15 19:29:29 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* common.mk (vm_backtrace.o): Added missing dependencies.
+
+	* ext/nkf/depend (nkf.o): ditto.
+
+	* ext/ripper/depend (ripper.o) ditto.
+
+Wed Aug 22 07:27:00 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/cgi/util.rb (CGI.escapeHTML): use &#39;
+	  [ruby-core:47221] [Bug #6861]
+
+Tue Aug 21 21:59:22 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/observer.rb: fix typo. https://github.com/ruby/ruby/pull/162 by
+	  unsymbol (Philip Cunningham).
+
+Tue Aug 21 20:30:06 2012  Benoit Daloze  <eregontp@gmail.com>
+
+	* test/fileutils/test_fileutils.rb (TestFileUtils#teardown):
+	  do not assume cwd is TMPROOT and never remove current directory.
+	  [ruby-core:47224][Bug #6884]
+
+Tue Aug 21 17:29:56 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* addr2line.c (fill_lines): need check and cast of the file size of
+	  target binary because there are some platforms which off_t > size_t.
+
+Tue Aug 21 17:07:58 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* .travis.yml (compiler): [experimental] clang support.
+
+Tue Aug 21 15:44:27 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/lib/dl/func.rb (DL::Function#bind): fixes an error in
+	  test/dl/test_import.rb (DL::TestImport#test_carried_function)
+	  introduced by r36718.
+	  the instance of the anonymous class which wraps the block should have
+	  same methods and instance variables of self.
+
+Tue Aug 21 14:29:22 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (scriptbin.mk): no need to include twice.
+
+Tue Aug 21 10:52:08 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/unit/test.rb (Test::Unit::ProxyError): new exception class to
+	  wrap exceptions raised in workers in parallel test mode.
+
+	* test/unit/parallel.rb (Test::Unit::Worker#puke): use above wrapper
+	  exception.
+	  [Bug #6882] [ruby-dev:46054]
+
+Tue Aug 21 10:40:06 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* test_continuation.rb (tracing_with_thread_set_trace_func):
+	  fix to use Thread#set_trace_func(nil), not set_trace_func(nil).
+
+Tue Aug 21 09:32:41 2012  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 3.3.0 (r7676)
+	* test/minitest/*: ditto
+
+Tue Aug 21 09:05:32 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/testunit/tests_for_parallel/ptest_forth.rb: added a test case
+	  which causes an error.
+
+	* test/testunit/test_parallel.rb: follow above change.
+	  see [Bug #6882]
+
+Tue Aug 21 05:43:00 2012  James Edward Gray II  <james@graysoftinc.com>
+
+	* lib/csv.rb: Fixes #161 on github
+	* lib/csv.rb: You can now specify a pattern for :skip_lines.
+	  Matching lines will not be passed to the CSV parser.
+	* lib/csv.rb: Patch by Christian Schwartz.
+
+Tue Aug 21 05:25:41 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* re.c (rb_reg_initialize_m): Forgot to update output for or'd-options
+	  example.
+
+Tue Aug 21 05:18:03 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* re.c (rb_reg_initialize_m): Update example to show that regexp
+	  options use | an not || to avoid confusion.
+
+Mon Aug 20 23:02:27 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y: more descriptive token names in syntax error messages.
+
+Mon Aug 20 20:36:30 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): follow iclasses as klass in cfp
+	  but not included modules.  [ruby-core:47241] [Bug #6891]
+
+	* vm_insnhelper.c (vm_call_bmethod): pass defined_class to follow
+	  proper ancestors.  [ruby-core:47241] [Bug #6891]
+
+Mon Aug 20 11:40:27 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* common.mk: fix failed to make with -j2.
+	  https://gist.github.com/3397935
+
+Mon Aug 20 10:51:01 2012  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb, lib/test/unit/parallel.rb:
+	  generate error message (String) in parallel.rb instead of
+	  marshalling Exception. Fixes [Bug #6882] [ruby-dev:46054]
+
+Sun Aug 19 01:24:32 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* enum.c: fix docs. https://github.com/ruby/ruby/pull/129 by
+	  richardkmichael (Richard Michael).
+
+Sun Aug 19 00:47:26 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/fileutils.rb: fix typo.
+	  https://github.com/ruby/ruby/pull/155 by simonc (Simon COURTOIS).
+
+Sat Aug 18 09:57:46 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend: fix inplace-build condition.  enc.mk is generated with
+	  setting $srcdir to enc, but pwd is still top build directory.
+	  [ruby-core:47236] [Bug #6888]
+
+Fri Aug 17 23:28:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_any_to_s, rb_obj_inspect): preserve encodings of class
+	  name and instance variable names.
+
+Fri Aug 17 12:39:33 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/lib/dl/func.rb (DL::Function#bind): allow to return/break from
+	  the callback method. (Fiddle already allows it.)
+	  [Bug #6389] [ruby-dev:45604]
+
+Thu Aug 16 19:54:24 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c, vm_core.h: simplify tracing mechanism.
+
+	  (1) add rb_hook_list_t data structure which includes
+	      hooks, events (flag) and `need_clean' flag.
+	      If the last flag is true, then clean the hooks list.
+	      In other words, deleted hooks are contained by `hooks'.
+	      Cleanup process should run before traversing the list.
+	  (2) Change check mechanism
+	      See EXEC_EVENT_HOOK() in vm_core.h.
+	  (3) Add `raw' hooks APIs
+	      Normal hooks are guarded from exception by rb_protect().
+	      However, this protection is overhead for too simple
+	      functions which never cause exceptions.  `raw' hooks
+	      are executed without protection and faster.
+	      Now, we only provide registration APIs.  All `raw'
+	      hooks are kicked under protection (same as normal hooks).
+
+	* include/ruby/ruby.h: remove internal data definition and
+	  macros.
+
+	* internal.h (ruby_suppress_tracing), vm_trace.c: rename
+	  ruby_suppress_tracing() to rb_suppress_tracing()
+	  and remove unused function parameter.
+
+	* parse.y: fix to use renamed rb_suppress_tracing().
+
+	* thread.c (thread_create_core): no need to set RUBY_VM_VM.
+
+	* vm.c (mark_event_hooks): move definition to vm_trace.c.
+
+	* vm.c (ruby_vm_event_flags): add a global variable.
+	  This global variable represents all of Threads and VM's
+	  event masks (T1#events | T2#events | ... | VM#events).
+	  You can check the possibility kick trace func or not
+	  with ruby_vm_event_flags.
+	  ruby_vm_event_flags is maintained by vm_trace.c.
+
+	* cont.c (fiber_switch, rb_cont_call): restore tracing status.
+	  [Feature #4347]
+
+	* test/ruby/test_continuation.rb: ditto.
+
+Thu Aug 16 19:15:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_class_initialize): forbid inheriting uninitialized
+	  class.  another class tree not based on BasicObject cannot exist.
+	  [ruby-core:47148][Bug #6863]
+
+Thu Aug 16 11:52:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/-ext-/test_printf.rb (Test_SPrintf#test_{taint,untrust}): use
+	  plain object so that the results of to_s and inspect are infected.
+	  [ruby-dev:46053] [Bug #6881]
+
+Thu Aug 16 09:46:07 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c: remove unnecessary macros to check traditional C.
+	  https://github.com/ruby/ruby/pull/46 by lateau (Daehyub Kim).
+
+	* vsnprintf.c: remove K&R.
+
+Wed Aug 15 20:47:49 2012  Benoit Daloze  <eregontp@gmail.com>
+
+	* object.c (rb_obj_inspect): Kernel#inspect: do not call #to_s. A class
+	  can now benefit from the nice default #inspect even if it defines #to_s.
+	  Also, there is no more unexpected change in #inspect result.
+
+	* NEWS: Add note about the change.
+
+	* bignum.c, io.c, numeric.c, object.c, proc.c, vm.c (Init_*):
+	  Adapt internal structures (by aliasing #inspect to #to_s) so they
+	  don't rely on the removed behavior (#inspect calling overridden #to_s).
+
+	* test/ruby/test_object.rb (test_inspect): add tests for Kernel#inspect.
+
+	* lib/pp.rb (class PP): do not call #to_s anymore, as #inspect
+	  no more does (mame).
+
+	* test/test_pp.rb (class PPInspectTest): remove related assertion (mame).
+	  [ruby-core:43238][Feature #6130]
+
+	* test/drb/drbtest.rb (DRbCore#teardown, DRbAry#teardown):
+	  adapt DRb tests with the new change (shirosaki).
+	  [ruby-core:47182][Bug #6866]
+
+Wed Aug 15 18:05:37 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#failed): need to delete the
+	  status line if the status is skipped and -q is specified.
+
+Wed Aug 15 16:26:52 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (ruby__sfvextra): the result should be infected by the
+	  given strings.
+
+	* sprintf.c (ruby__sfvwrite): set buffer length and exclude
+	  uninitialized garbage to get correct coderange.
+
+Wed Aug 15 16:20:09 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (ID_H_TARGET): make timestamp file of id.h so that the
+	  header will not be remade repetitively.
+
+Wed Aug 15 11:39:53 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: separate trace_func related functions from
+	  thread.c.
+
+	* thread.c: ditto.
+
+	* common.mk: add vm_trace.o.
+
+	* inits.c: call Init_vm_trace().
+
+Tue Aug 14 16:25:46 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/erb/test_erb.rb (test_html_escape): add assertions for the
+	  cases where the argument is not a String.
+
+Tue Aug 14 16:03:31 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (check_valid_dir): reject "..." as directory name.
+	  [Bug #6851]
+
+Tue Aug 14 16:02:51 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_file_exhaustive.rb
+	  (TestFileExhaustive#test_stat_dotted_prefix): added.
+
+Tue Aug 14 15:39:09 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_file_exhaustive.rb
+	  (TestFileExhaustive#test_stat_drive_root): added.
+
+Tue Aug 14 10:38:17 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/erb.rb (ERB::Util.html_escape): fix r36687: call to_s before
+	  passing it to CGI.escapeHTML.
+
+Mon Aug 13 13:13:19 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/erb.rb (ERB::Util.html_escape): use CGI.escapeHTML to escape
+	  single quotes. [ruby-core:47138] [Bug #6861]
+
+Sun Aug 12 11:57:20 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c (invoke_block_from_c): fix unintentional block passing.
+	  [ruby-dev:45071] [Bug #5832]
+
+Fri Aug 10 08:41:28 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* gc.c (gc_malloc_allocated_size):  RDoc does not process macros, so
+	  mention this method is only available when ruby is built with
+	  CALC_EXACT_MALLOC_SIZE
+	* gc.c (gc_malloc_allocations):  ditto
+
+Thu Aug  9 23:46:51 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkrunnable.rb: see build_os instead of target arch for
+	  cross-compiling.
+
+	* configure.in (MINIRUBY): use real path for include path.
+
+	* template/fake.rb.in (builddir): remove duplications
+
+Thu Aug  9 20:03:11 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/test_file_exhaustive.rb
+	  (TestFileExhaustive#test_stat_special_file): add a test.
+	  GetFileAttributesExW fails to get attributes of special files
+	  such as pagefile.sys.
+
+	* win32/win32.c (check_valid_dir): for performance, check the path
+	  by FindFirstFileW only if the path contains "..."
+
+	* win32/win32.c (winnt_stat): use GetFileAttributesExW instead of
+	  FindFirstFileW since GetFileAttributesExW is faster.
+	  Based on the patch by Dusan D. Majkic.
+	  [ruby-core:47083] [Feature #6845]
+
+Thu Aug  9 18:33:46 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): show version only once even if -v and
+	  --version are given together.
+	  http://twitter.com/d6rkaiz/status/233491797085671424
+
+Thu Aug  9 12:37:22 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/openssl/test_config.rb (OpenSSL#test_constants): skip this
+	  test if platform is Mac OS X or Windows. [Bug #6830]
+
+Wed Aug  8 22:51:30 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (eval_under): singletons other than special constants
+	  don't need cref-scope hack.
+
+Wed Aug  8 22:45:38 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (.y.h): split from .y.c rule to manage dependency on
+	  parse.h.  [ruby-core:46741] [Bug #6789]
+
+	* common.mk (id.h): keep old file unless changed.
+
+Wed Aug  8 17:11:20 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (ADD_INSNL): make ADD_INSNL as alias of ADD_INSN1.
+
+Wed Aug  8 17:08:14 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstrap/test_exception.rb: fix a last committed test.
+
+Wed Aug  8 16:27:58 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c, insns.def (checkmatch):
+	  remove checkincludearray instruction and
+	  add new instruction checkmatch.
+	  This change is to solve
+	  [Bug #4438] "rescue args type check omitted".
+
+	* iseq.c: increment ISEQ_MAJOR_VERSION because removal of
+	  checkincludearray instruction.
+
+	* vm_core.h: add several definitions for
+	  the checkmatch instruction.
+
+	* vm_insnhelper.c (check_match): added.
+
+	* bootstraptest/test_exception.rb: add a test.
+
+	* test/ruby/test_exception.rb: ditto.
+
+Wed Aug  8 05:51:20 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* proc.c (method_clone):  Added documentation.  Patch by Robin Dupret.
+	  Fixes #152 on github.
+
+Tue Aug  7 20:19:29 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (Init_readline): rl_catch_signals=0 returns
+	  back. Without this, on FreeBSD9 and readline 6.2 irb can't catch ^C.
+	  [Bug #5423]
+
+Tue Aug  7 20:12:39 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_exec.c, insns.def (leave): solve problems on
+	  OPT_CALL_THREADED_CODE.
+	  Catch up finish frame structure on OPT_CALL_THREADED_CODE.
+
+	* vm_core.h: add rb_thread_t#retval for temporary space on
+	  OPT_CALL_THREADED_CODE.
+
+	* vm.c (th_init): clear rb_thread_t#retval as Qundef.
+
+	* vm_dump.c (rb_vmdebug_debug_print_pre): fix debug print format.
+
+Tue Aug  7 11:58:27 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_require.rb (TestRequire#test_require_twice): added.
+
+Tue Aug  7 11:35:37 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (rb_redefine_opt_method): use RCLASS_ORIGIN to avoid
+	  SEGV when a module-prepended class is refined.
+
+Tue Aug  7 10:46:37 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_file_exhaustive.rb
+	  (TestFileExhaustive#test_expand_path*): refactoring.  split the method
+	  into some chunks of the same kind of tests.
+
+Tue Aug  7 00:31:09 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_special_singleton_class_of): utility function.
+
+	* vm_eval.c (eval_under): special deal for class variable scope with
+	  instance_eval.
+
+	* vm_eval.c (rb_obj_instance_eval, rb_obj_instance_exec): allow method
+	  definition in instance_eval of special constants.  [ruby-core:28324]
+	  [Bug #2788]
+
+Tue Aug  7 00:23:58 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (CVAR_LOOKUP): split into helper functions.
+
+Mon Aug  6 19:15:11 2012  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_variant.rb: setting WIN32OLE.locale
+	  to pass some assertion.  Thanks to Hiroshi Shirosaki.
+	  [ruby-core:46873][Bug #6814]
+
+Mon Aug  6 15:54:50 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* internal.h, class.c, eval.c, insns.def: find the appropriate
+	  receiver for super called in instance_eval.  If such a receiver is
+	  not found, raise NoMethodError. [ruby-dev:39772] [Bug #2402]
+
+Mon Aug  6 14:54:38 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* include/ruby/ruby.h, eval.c, vm_insnhelper.c: fix typo.
+
+Mon Aug  6 13:13:58 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (vm_call_super): since cfp->klass is always class or
+	  iclass, no search from method entry.
+
+	* insns.def (defined): now should use klass in the current control
+	  frame to search superclass, not me->klass.  reported by naruse.
+
+Mon Aug  6 11:19:19 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/etc/test_etc.rb (TestEtc#test_getpwuid): `s' is never set to nil.
+
+Mon Aug  6 11:08:48 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/syslog/test_syslog_logger.rb: skip unless Syslog module is
+	  available.
+
+Mon Aug  6 00:40:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_log): fix format specifier.
+
+Mon Aug  6 00:39:24 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (NUM2ULONG): optimize by inline as well as
+	  NUM2LONG, and cast to unsigned long explicitly for the platforms
+	  where SIZEOF_VALUE is larger than SIZEOF_LONG.
+
+	* include/ruby/ruby.h (NUM2SSIZET): fix type to cast.
+
+Sun Aug  5 21:10:36 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c : if ENABLE_VM_OBJSPACE is 1, rest_sweep is not defined.
+	  remove unused declarations. [ruby-core:47004] [Bug #6837]
+
+Sun Aug  5 19:31:57 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: just move functions and so on. I don't touch any internal
+	  implementation.
+
+Sun Aug  5 13:22:29 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: use gcc-4.2 prior to clang, gcc, and cc if exist for
+	  the use of Snow Leopard's old clang. see also r36594, r36610, r36611.
+
+Sun Aug  5 06:55:10 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_{core,strftime}.c: [ruby-core:46990].
+
+Sat Aug  4 22:56:20 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: use inline functions instead of macros, and close up
+	  related codes for the profiler.
+
+Sat Aug  4 20:37:56 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (gc_mark_children): use gc_mark_ptr instead of marking
+	  a object directly.
+
+Sat Aug  4 10:02:03 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_alias.rb (test_super_in_aliased_module_method):
+	  add a test case for [ruby-dev:46028], which fails in 1.8.
+
+Sat Aug  4 01:56:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_search_normal_superclass): no longer needs
+	  receiver, klass is always unique in the ancestors now.
+
+Sat Aug  4 01:27:40 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* insns.def (invokesuper): reverted r36612 so that super in an
+	  aliased method will not call the same method.
+
+Fri Aug  3 19:26:10 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* insns.def (invokesuper): don't skip the same class.  instead, use
+	  rb_method_entry_get_with_omod() to avoid infinite loop when
+	  super is used with refinements. [ruby-core:30450] [Bug #3351]
+
+Fri Aug  3 19:21:19 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: use clang prior to gcc only when self-compiling on
+	  darwin.  search default compilers on other platforms.  [Bug #6816]
+
+Fri Aug  3 17:25:49 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: move RUBY_MINGW32 after AC_PROG_CC.
+	  RUBY_MINGW32 uses AC_TRY_CPP and it sets CC and CPP. [Bug #6816]
+
+	* configure.in: don't use AC_PROG_CC in AS_CASE.
+
+Fri Aug  3 17:21:52 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/runner.rb: get rid of loading previously installed gems.
+	  [ruby-dev:46025]
+
+Fri Aug  3 16:40:01 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* .travis.yml (notifications): [experimental] IRC notifications.
+
+Thu Aug  2 20:32:29 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_using): new method Module#using. [experimental]
+
+	* eval.c (rb_mod_refine): new method Module#refine. [experimental]
+
+	* eval.c (f_using): new method Kernel#using. [experimental]
+
+Thu Aug  2 20:08:02 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* class.c, insns.def, method.h, proc.c, vm.c, vm_core.h, vm_eval.c,
+	  vm_insnhelper.c, vm_insnhelper.h, vm_method.c: add klass to
+	  rb_control_frame_t to implement super correctly.
+
+Thu Aug  2 13:23:08 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (AC_PROG_CC): AC_PROG_CC tries clang at first on
+	  darwin. [Bug #6816]
+
+Thu Aug  2 11:39:25 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: return true or false. Patch by Dirkjan Bussink. [Bug #6821]
+
+	* test/ruby/test_gc.rb: add test-case for this bug.
+
+Thu Aug  2 10:51:12 2012  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* ext/openssl/lib/openssl/digest.rb
+	  test/openssl/test_digest.rb: Add Digest module function to OpenSSL
+	  module and test it. Patch provided by Eric Hodel.
+	  [ruby-core:46908][Feature #6819]
+
+Wed Aug  1 22:29:12 2012  Benoit Daloze  <eregontp@gmail.com>
+
+	* ext/digest/digest.c (hexencode_str_new): return an ASCII string
+
+	* test/digest: tests for all kind of digests encodings
+	  [ruby-core:46792][Bug #6799]
+
+Wed Aug  1 05:50:53 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_encoding):
+	  Fix test_encoding failure on Windows.
+	  With chcp 65001, 1252 and 437, test_encoding failed. Test result
+	  depends on locale because LANG environment variable doesn't affect
+	  locale on Windows.
+	  [ruby-core:46872] [Bug #6813]
+
+Wed Aug  1 00:33:19 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (include_class_new): fix duplication of prepended module.
+	  since m_tbl of prepended module is always zero, copy from its
+	  copy iclass of original.
+
+Tue Jul 31 18:22:34 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (classname): tell if found name is permanent.  search
+	  tmp_classpath only if class id is set.  [ruby-core:42865][Bug #6078]
+
+	* variable.c (rb_class_path): duplicate found temporary path.
+
+	* variable.c (rb_set_class_path_string, rb_set_class_path): set class
+	  id to find classpath.
+
+Tue Jul 31 10:36:12 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: updated to released version.
+
+	* ext/psych/psych.gemspec: ditto
+
+Tue Jul 31 06:18:06 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* time.c (time_sec):  Remove extra wording about leap seconds and refer
+	  directly to Wikipedia's leap second page for further information.
+	  [Bug #6749]
+
+Mon Jul 30 23:01:47 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rubygems/platform.rb (Gem::Platform#initialize): Support pattern
+	  like x86_64-netbsd6.99.7.
+
+Mon Jul 30 21:00:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (find_class_path): no retry when preferred is given.
+
+	* variable.c (classname): if classid is set try it to find full
+	  qualified class path, and then try arbitrary class path.  try
+	  tmp_classpath at last even if enclosing namespace is anonymous.
+	  fix r36574.  [ruby-core:42865][Bug #6078]
+
+	* variable.c (rb_set_class_path_string, rb_set_class_path): set
+	  tmp_classpath instead of classpath if the name is not permanent.
+
+Mon Jul 30 14:24:20 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c: store anonymous class path in tmp_classpath but not in
+	  classpath.  [ruby-core:42865][Bug #6078]
+
+Mon Jul 30 13:11:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (DLDFLAGS): on Darwin, deprecate -flat_namespace to get
+	  rid of huge imported symbols table.
+
+	* configure.in (LIBRUBY_RELATIVE): libruby_so is not made when
+	  disable-shared, so no absolute path is used for it and executable
+	  file is runnable anywhere.
+
+Mon Jul 30 01:30:10 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* common.mk: add a dependency. [ruby-core:46741] [Bug #6789]
+
+Sun Jul 29 15:44:47 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* thread.c (thread_create_core): hide th->async_errinfo_mask_stack from
+	  ObjectSpace.each_object. refix of r36539.
+
+Sun Jul 29 23:57:27 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/option.c (inet_ntop): use rb_w32_inet_ntop, instead of
+	  inet_ntop directly, which is unavailable on older version Windows.
+
+	* win32/win32.c (rb_w32_inet_ntop): type should be const.
+
+Sun Jul 29 14:20:34 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* thread.c (Init_Thread): does not need to set klass
+	  explicitly.
+
+Sun Jul 29 06:21:04 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* win32/win32.c: suppress warning redeclared on mingw64.
+	  *_s functions are declared if MINGW_HAS_SECURE_API is defined.
+	  Follow up r36556.
+
+Sun Jul 29 00:28:46 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: remove unused initialization.
+
+Sat Jul 28 16:26:09 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* win32/win32.c (gmtime_r): use _gmtime64_s() with x86_64-w64-mingw32.
+
+	* win32/win32.c (localtime_r): use _localtime64_s() with
+	  x86_64-w64-mingw32. Since FileTimeToSystemTime() seems not work with
+	  large value under x64. Mingw-w64 doesn't have these declaration.
+	  [ruby-core:46780] [Bug #6794]
+
+Fri Jul 27 18:25:51 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_check_io): make public.
+
+	* process.c (check_exec_redirect): try conversion to IO on redirect
+	  parameters.  [ruby-core:44181] [Bug #6269]
+
+Fri Jul 27 17:58:12 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CPPOUTFILE): get rid of variable conflict so
+	  CPPFLAGS is not duplicated.  [ruby-core:43097] [Bug #6119]
+
+Fri Jul 27 12:12:36 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/mkexports.rb: should not export DllMain().
+	  reported by luis at [ruby-core:46743] [Bug #6790], solved by
+	  Heesob Park, and confirmed by nobu.
+
+Thu Jul 26 14:51:29 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/net/http/test_https.rb (TestNetHTTPS#test_session_reuse):
+	  localhost is not (always) 127.0.0.1.  Don't expect that.
+
+Thu Jul 26 07:18:38 2012    <kanemoto@ruby-lang.org>
+
+	* ext/json/fbuffer/fbuffer.h: avoid compilation error on AIX by
+	   -ansi -std=iso9899:199409 (r36038). [ruby-core:46744] [Bug #6791].
+
+Thu Jul 26 00:42:23 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* thread.c (thread_create_core, Init_Thread): hide
+	  th->async_errinfo_queue and th->async_errinfo_mask_stack from
+	  ObjectSpace.each_object.
+
+Wed Jul 25 17:41:05 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* complex.c, rational.c: compatible marshal loader for compatibilities
+	  with 1.8.  [ruby-core:45775] [Bug #6625]
+
+Wed Jul 25 17:17:05 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* atomic.h: prefer GCC atomic builtins than Windows APIs, if possible,
+	  since they are generic.
+
+Wed Jul 25 11:16:57 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/.document:  Removed.  All files in net/ should be included in
+	  RDoc.
+
+Wed Jul 25 10:00:23 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/testunit/test_redefinition.rb: broken class/method names.
+
+Wed Jul 25 09:26:32 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/cgi/html.rb: Use << instead of +=.
+	  `a += b` is syntax sugar of `a = a + b`; it creates a new string
+	  object. `a << b` is concatenation and doesn't create new object.
+
+Wed Jul 25 09:16:26 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/cgi/html.rb (element_init): suppress redefine warning.
+	  Don't define methods if they are already defined.
+
+Wed Jul 25 09:05:38 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Added SSL session reuse across connections for a
+	  single instance to speed up connection.  [Feature #5341]
+	* NEWS:  ditto
+	* test/net/http/test_https.rb:  Tests for #5341
+
+Wed Jul 25 06:54:24 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/re.rdoc:  Fix spelling
+
+Wed Jul 25 06:49:12 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* re.c (rb_reg_s_last_match):  Update $~ to reference Regexp
+	  documentation about "special global variables".  [Bug #6723]
+
+Wed Jul 25 06:28:56 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* iseq.c:  Added documentation.  Patch by David Albert.  [Bug #6785]
+
+Wed Jul 25 03:05:06 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* parse.y: added symbols and qsymbols productions for %i and %I
+	  support. %i{ .. } returns a list of symbols without interpolation,
+	  %I{ .. } returns a list of symbols with interpolation.  Thanks to
+	  Josh Susser for inspiration of this feature. [Feature #4985]
+
+	* ext/ripper/eventids2.c: added ripper events for %i and %I.
+
+	* test/ripper/test_parser_events.rb: ripper tests
+
+	* test/ripper/test_scanner_events.rb: ditto
+
+	* test/ruby/test_array.rb: test for %i and %I behavior
+
+Tue Jul 24 23:34:43 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* include/ruby/win32.h (rb_w32_pow): add new function.
+	  We use powl() instead of broken pow() for x64-mingw32. This workaround
+	  fixes test failures related to floating point numeric.
+	  [ruby-core:46686] [Bug #6784]
+
+Tue Jul 24 15:01:24 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_socket, rb_w32_socketpair): remember the family
+	  in the high word of socklist value.
+
+	* win32/win32.c (overlapped_socket_io, recvmsg, sendmsg, setfl): follow
+	  above changes.
+
+	* win32/win32.c (rb_w32_getsockname): set remembered family to the
+	  argument when OS's function fails.
+
+Tue Jul 24 12:35:13 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_dir_m17n.rb: remove a garbage.
+
+	* test/ruby/test_dir_m17n.rb: convert from ascii-8bit to other encoding
+	  with 8bit bytes always fails.
+
+Tue Jul 24 12:32:18 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_dir_m17n.rb: sorry, typo.
+
+Tue Jul 24 12:13:26 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_dir_m17n.rb: refactoring. RE should be in the left side
+	  of the =~ operator, and compare the result with nil is meaningless.
+
+Tue Jul 24 11:35:20 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_pack.rb (test_pack_unpack_M): was redefined
+	  accidentally.
+
+Tue Jul 24 09:31:18 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Updated to RubyGems 1.8.24, a bugfix release.
+
+Tue Jul 24 08:30:15 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* test/ruby/test_dir_m17n.rb (create_and_check_raw_file_name): add new
+	  helper method to ease encoding testing. Patch by Oleg Sukhodolsky.
+	  [ruby-core:46589][Bug #6765]
+
+	* test/ruby/test_dir_m17n.rb (test_filename_extutf8): use filesystem
+	  encoding when reading entries and comparing.
+
+	* test/ruby/test_dir_m17n.rb (test_filename_utf8_raw_name): removed.
+
+	* test/ruby/test_dir_m17n.rb (test_filename_utf8_raw_jp_name): split test.
+
+Tue Jul 24 08:09:30 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* test/win32ole/test_win32ole_method.rb (is_ruby64?): Correct platform
+	  used to identify mingw-w64 (x64-mingw32). Patch by Hiroshi Shirosaki.
+	  [ruby-core:46651][Bug #6782]
+
+Tue Jul 24 07:22:58 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* time.c (time_sec):  Updated description of leap seconds for accuracy.
+	  Based on patch by Marcus Stollsteimer.  [Bug #6749]
+
+Tue Jul 24 07:03:11 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* string.c (rb_str_sub):  Fixed wording of documentation to match the
+	  replacement operation.  Minor cleanup of markup.  [Bug #6719]
+	* string.c (rb_str_sub_bang):  Minor wording change for clarity, minor
+	  cleanup of markup.
+
+Mon Jul 23 23:58:40 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/Makefile.in (TARGET_NAME, TARGET_ENTRY): needed for EXTDLDFLAGS
+	  on some platforms.  [ruby-core:46600] [Bug #6768]
+
+	* enc/depend: no longer needs tweaking DLDFLAGS for TARGET names.
+
+Mon Jul 23 22:48:19 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb: use respond_to? to test Tempfile.
+	  [ruby-dev:45995] [Bug #6781] reported by hsbt (Hiroshi SHIBATA).
+
+Mon Jul 23 14:43:34 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBPATHENV): LIBPATH is used on AIX, but not
+	  SHLIB_PATH which was carelessly copied from HP/UX.  suggested by
+	  Perry Smith at [ruby-core:46397].  [Bug #6728]
+
+Mon Jul 23 01:55:08 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/uri/test_generic.rb (URI#test_find_proxy): add tests with
+	  empty *_proxy env variables.
+
+Mon Jul 23 01:47:26 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/uri/test_generic.rb (URI#with_env): unset proxy related env
+	  variables.  [Bug #6774]
+
+	* test/uri/test_generic.rb (URI#test_find_proxy): fix failures
+	  when proxy related env variables already set.  [Bug #6774]
+
+Sun Jul 22 23:58:48 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread.c (rb_threadptr_execute_interrupts_common): increase
+	  running_time_us on THREAD_TO_KILL like on THREAD_RUNNABLE.
+	  This cause not to switch from a thread which is to be killed
+	  on FreeBSD and Mac OS X. see also the test.
+	  This issue maybe exist for long time but happens after r36430.
+
+Sat Jul 21 06:21:45 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb: fixes for r36476. [Feature #6546]
+	 http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120720T030101Z.diff.html.gz
+
+	* lib/net/http.rb (Net::HTTP.newobj): return back for compatibility.
+
+	* lib/net/http.rb (Net::HTTP.new): set default_port if proxy port is
+	  not given.
+
+	* lib/net/http.rb (Net::HTTP#initialize): ditto.
+
+	* lib/net/http.rb (Net::HTTP#proxy?): return true or false.
+
+	* lib/net/http.rb (Net::HTTP#proxy_address): check proxy_uri is not nil.
+
+	* lib/net/http.rb (Net::HTTP#proxy_port): ditto.
+
+Sat Jul 21 23:12:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (ruby_init_stack): STACK_GROW_DIR_DETECTION is
+	  necessary on platforms with unknown stack direction.  [Bug #6761]
+
+Sat Jul 21 15:13:42 2012  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit/testcase.rb (method_added): refactoring.
+
+Sat Jul 21 14:06:41 2012  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit/testcase.rb: warn when test_* method is redefined.
+	  Patch by mame (Yusuke Endoh). [Feature #2643] [ruby-core:27790]
+
+	* test/testunit/test_redefinition.rb: Test for above.
+
+	* test/testunit/test4test_redefinition.rb: Ditto.
+
+Sat Jul 21 08:41:14 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/logger.rb:  Updated example in Logger comment to match other
+	  examples and fixed a bug.  Patch by Marcus Stollsteimer.
+	  [Bug #6759]
+
+Fri Jul 20 17:20:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rb_random_real): refine error message.
+
+Fri Jul 20 11:03:17 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* NEWS:  Updated net/http for automatic proxy detection (#6546) and
+	  automatic gzip and deflate compression (#6492, #6494).
+
+Fri Jul 20 10:55:38 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Net::HTTP now automatically detects and uses
+	  proxies from the environment.  A proxy may also be specified as
+	  before.
+
+	  Net::HTTP::Proxy still creates anonymous classes, but these classes
+	  are only used to store configuration information.  When an HTTP
+	  instance is created the configuration is now copied.
+
+	  Additionally, Net::HTTP::ProxyDelta is no longer used by Net::HTTP
+
+	  [Feature #6546]
+	* lib/open-uri.rb:  Moved URI::Generic#find_proxy to uri/generic.
+	* lib/uri/generic.rb:  Imported find_proxy from open-uri.
+	* test/open-uri/test_open-uri.rb:  Moved proxy-discovery tests to URI.
+	* test/uri/test_generic.rb:  Imported proxy-discovery tests from
+	  open-uri.
+	* test/net/http/test_http.rb:  Added tests for proxy behavior.
+
+Fri Jul 20 09:34:11 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* test/socket/test_socket.rb:  Ignore IPv6 unique local addresses on OS
+	  X (iCloud Back to my Mac addresses) for test_udp_socket since they do
+	  not act as loopback addresses.  [Bug #6692]
+
+Fri Jul 20 09:32:14 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/socket/raddrinfo.c (addrinfo_ipv6_unique_local_p):  Added
+	  Addrinfo#ipv6_unique_local? to detect RFC 4193 unique local
+	  addresses.  Part of #6692
+	* ext/socket/rubysocket.h:  Add IN6_IS_ADDR_UNIQUE_LOCAL macro if
+	  missing.
+	* test/socket/test_addrinfo.rb:  Test for ipv6_unique_local?
+
+Fri Jul 20 07:40:32 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http/response.rb:  Automatically inflate gzip and
+	  deflate-encoded response bodies.  [Feature #6942]
+	* lib/net/http/generic_request.rb:  Automatically accept gzip and
+	  deflate content-encoding for requests.  [Feature #6494]
+	* lib/net/http/request.rb:  Updated documentation for #6494.
+	* lib/net/http.rb:  Updated documentation for #6492 and #6494, removed
+	  Content-Encoding handling now present in Net::HTTPResponse.
+	* test/net/http/test_httpresponse.rb:  Tests for #6492
+	* test/net/http/test_http_request.rb:  Tests for #6494
+	* test/open-uri/test_open-uri.rb (test_content_encoding):  Updated test
+	  for automatic content-encoding handling.
+
+Fri Jul 20 03:42:54 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c: use #ifdef, not #if.
+
+Thu Jul 19 15:08:40 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_s_control_interrupt,
+	            rb_thread_s_check_interrupt): added for
+	  Thread.control_interrupt and Thread.check_interrupt.
+	  See details on rdoc.
+	  I'll make an ticket for this feature.
+
+	* test/ruby/test_thread.rb: add a test for Thread.control_interrupt.
+
+	* thread.c (rb_threadptr_raise): make a new exception object
+	  even if argc is 0.
+
+	* thread.c (rb_thread_kill): kill thread immediately if target thread
+	  is current thread.
+
+	* vm_core.h (RUBY_VM_CHECK_INTS_BLOCKING): added.
+	  CHECK_INTS while/after blocking operation.
+
+	* vm_core.h (RUBY_VM_CHECK_INTS): require rb_thread_t ptr.
+
+	* cont.c (fiber_switch): use replaced RUBY_VM_CHECK_INTS().
+
+	* eval.c (ruby_cleanup): ditto.
+
+	* insns.def: ditto.
+
+	* process.c (rb_waitpid): ditto.
+
+	* vm_eval.c (vm_call0): ditto.
+
+	* vm_insnhelper.c (vm_call_method): ditto.
+
+Thu Jul 19 22:46:48 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io.rb: remove temporally files early.
+
+Thu Jul 19 15:38:35 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* variable.c (rb_mod_class_variables): return inherited variables
+	  except when the optional argument is set to false.
+	  [ruby-dev:44034] [Bug #4971]
+
+	* variable.c (rb_mod_constants): fix typo in documentation.
+
+Thu Jul 19 14:30:43 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h: move mark function declarations that should be private.
+
+Thu Jul 19 14:18:22 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/init.c (rsock_init_sock): need to update max fd on all
+	  platforms.
+
+Thu Jul 19 14:15:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_gc_mark_threads): remove deprecated function.
+
+Thu Jul 19 13:28:03 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/net/http/test_http.rb (TestNetHTTPLocalBind#test_bind_to_local*):
+	  re-enable the tests because now it's OK on windows.
+
+Thu Jul 19 13:26:25 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb: now enable IPv6 by default on mswin.
+
+Thu Jul 19 09:33:46 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/emitter.c (initialize): allow a configuration object to be
+	  passed to the constructor so that mutation isn't required after
+	  instantiation.
+
+	* ext/psych/lib/psych/handler.rb: add configuration object
+
+	* ext/psych/lib/psych/visitors/emitter.rb: use configuration object if
+	  extra configuration is present.
+
+Thu Jul 19 08:20:25 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_file.rb: remove temporally files early.
+
+Thu Jul 19 07:37:41 2012  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/drbtest.rb: fixed: can't delete unix domain sockets problem.
+
+Thu Jul 19 03:41:20 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* bignum.c: Added #include <strings.h> for ffs(). Patch by Perry
+	  Smith. Thank you. [Bug #6748]
+
+Thu Jul 19 01:56:02 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/intern.h (rb_num_zerodiv): Added NORETURN.
+	  Patched by Xi Wang. [Bug #6736]
+
+Wed Jul 18 23:57:38 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (pack_pack): round down too long uuencode width.  folding
+	  width in uuencode format cannot be longer than 63 bytes.
+
+Wed Jul 18 23:04:18 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/dbm/dbm.c (fdbm_empty_p): fix wrong condition introduced in r36438.
+
+	* ext/sdbm/init.c (fsdbm_empty_p): ditto.
+
+Wed Jul 18 23:08:57 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_beginendblock.rb: remove temporally files early.
+
+Wed Jul 18 22:43:02 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_autoload.rb: remove temporally files early.
+
+Wed Jul 18 21:59:46 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_argf.rb: use temporally directory.
+
+Wed Jul 18 19:41:19 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl/test_config.rb: remove temporally files early.
+
+Wed Jul 18 17:45:26 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_builtin_type_name): map by index.
+
+Wed Jul 18 16:17:40 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (have_framework): get rid of separating -framework
+	  option and its argument and dealing with the argument as a library
+	  or an object name.  if $LDFLAGS were an array...
+
+Wed Jul 18 16:09:10 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/curses/extconf.rb: support PDCurses.  patched by Luis Lavena.
+	  [ruby-core:46485] [Feature #6735]
+
+Wed Jul 18 15:50:25 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* parse.y (primary): allow an empty grouped expression as the
+	  operand of the not operator (e.g., not ()).
+	  [ruby-core:45976] [Bug #6674]
+
+	* parse.y (parser_yylex): show no warning for a grouped expression
+	  as the operand of the not operator (e.g., not (a)) or as an
+	  argument of a method call without parentheses (e.g., foo (a)).
+	  [ruby-core:39050] [Bug #5214]
+
+Wed Jul 18 15:33:21 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_call_without_gvl2): added.
+	  it can skip last CHECK_INTS.  See document for more details.
+	  Document about it was updated a bit.
+
+	* include/ruby/thread.h (decl. of rb_thread_call_without_gvl2): added.
+
+	* thread.c (rb_thread_call_with_gvl): remove "EXPERIMENTAL!"
+	  warning from a document.
+
+Wed Jul 18 14:53:21 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (EXTDLDFLAGS): split options for each extension
+	  libraries, and unused in ruby.pc.  [Bug #6734]
+
+	* lib/mkmf.rb (MakeMakefile#configuration): add EXTDLDFLAGS.
+
+Wed Jul 18 14:47:23 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c: fix last commit miss.
+
+Wed Jul 18 14:16:51 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_threadptr_async_errinfo_*): manage async errors queue.
+	  Async events such as an exception throwed by Thread#raise,
+	  Thread#kill and thread termination (after main thread termination)
+	  will be queued to th->async_errinfo_queue.
+	  - clear: clear the queue.
+	  - enque: enque err object into queue.
+	  - deque: deque err object from queue.
+	  - active_p: return 1 if the queue should be checked.
+	  rb_thread_t#thrown_errinfo was removed.
+
+	* vm_core.h: add declarations of rb_threadptr_async_errinfo_*.
+	  remove rb_thread_t#thrown_errinfo field and
+	  add rb_thread_t#async_errinfo_queue (queue body: Array),
+	      rb_thread_t#async_errinfo_queue_checked (flag),
+	      rb_thread_t#async_errinfo_mask_stack(Array, not used yet).
+
+	* vm.c (rb_thread_mark): fix a mark function.
+
+	* cont.c (rb_fiber_start): enque an error.
+
+	* process.c (after_fork): clear async errinfo queue.
+
+Wed Jul 18 14:25:55 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* pack.c: (ditto) bitwise operations are not char.  Apply explicit
+	  casts on them.
+
+Wed Jul 18 12:59:50 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* encoding.c (load_encoding): explicit cast  to suppress  warning.
+	  Though the  cast truncates some bits, from  heuristic analysis I
+	  believe it is OK to do so here.
+
+	* bignum.c (rb_cstr_to_inum): ditto.
+
+Wed Jul 18 12:55:54 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/benchmark.rb: Fix Benchmark.benchmark output with an empty
+	  caption.  patched by Benoit Daloze. [ruby-core:45719] [Bug #6610]
+
+Wed Jul 18 10:00:54 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/debug.rb:  Added toplevel documentation.  Based on patch by Oscar
+	  Del Ben.  [Bug #6743], fixes #146 on github.
+
+Wed Jul 18 09:33:59 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/win32ole/test_win32ole_event.rb (TestWIN32OLE_EVENT): use
+	  standard skip method to skip tests.
+
+Wed Jul 18 09:26:45 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/logger.rb:  Updated typos and output to match modern Logger
+	  output.  Patch by Marcus Stollsteimer.  [Bug #6738]
+
+Wed Jul 18 07:59:29 2012  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/util.rb (CGI.escapeHTML,unescapeHTML): Add &apos; for HTML5
+	  escaping.
+	  [Feature #6620]
+
+Tue Jul 17 22:17:13 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb: call io.close! for Tempfile.
+
+Tue Jul 17 16:41:32 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* proc.c (rb_proc_arity): return normal value (not -n-1) if it is not
+	  a labmda, or it is a labmda and no arg_opts. [Bug #5694]
+
+Tue Jul 17 03:56:34 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: strings with YAML anchors
+	  are properly referenced. Patched by Joe Rafaniello via Github:
+	    https://github.com/tenderlove/psych/pull/69
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
+	* test/psych/test_alias_and_anchor.rb: test for change
+
+Mon Jul 16 23:20:24 2012  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_float_cmp): use FIXNUM_MIN and FIXNUM_MAX,
+	  instead of LONG_MIN and LONG_MAX.
+
+Mon Jul 16 22:50:41 2012  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (flo_to_s): use the exponential form if the integer part
+	  is longer than or equal DBL_DIG.
+	  [ruby-dev:45960] [ruby-trunk - Bug #6741]
+
+Mon Jul 16 22:01:00 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* ext/readline/readline.c: fixed docs. [Bug #6740][ruby-core:46501]
+	  patched by Nobuhiro IMAI.
+
+Mon Jul 16 19:24:01 2012  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_float_eq): new function.
+	  (rb_big_eq): use rb_integer_float_eq.
+
+	* internal.h (rb_integer_float_eq): declared.
+
+	* numeric.c (flo_eq): use rb_integer_float_eq.
+	  (fix_equal): ditto.
+
+Mon Jul 16 19:02:31 2012  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_float_cmp): rename a local variable.
+
+Mon Jul 16 18:40:26 2012  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_float_cmp): renamed from rb_big_float_cmp.
+
+	* internal.h: follow the above change.
+
+	* numeric.c: ditto.
+
+Mon Jul 16 17:57:54 2012  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_float_cmp): compare an integer and float precisely.
+	  [ruby-core:31376] [Bug #3589] reported by Tomasz Wegrzanowski.
+
+Mon Jul 16 17:29:45 2012  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_float_cmp): support fixnum for argument x.
+
+	* numeric.c (fix_equal): use rb_big_float_cmp.
+	  (fix_cmp): ditto.
+	  (fix_gt): ditto.
+	  (fix_ge): ditto.
+	  (fix_lt): ditto.
+	  (fix_le): ditto.
+	  (flo_eq): ditto.
+	  (flo_cmp): use rb_big_float_cmp for fixnum argument.
+	  (flo_gt): ditto.
+	  (flo_ge): ditto.
+	  (flo_lt): ditto.
+	  (flo_le): ditto.
+
+Mon Jul 16 17:05:53 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/fileutils/test_fileutils.rb: add test for FileUtils#uptodate?
+
+Mon Jul 16 16:56:12 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/fileutils.rb (FileUtils.uptodate?): remove useless parameter.
+	  patched by Oscar Del Ben.[Bug #6708][ruby-core:46256]
+
+Mon Jul 16 15:37:56 2012  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_eq): use rb_big_float_cmp.
+
+Mon Jul 16 15:00:45 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_big_float_cmp): declared.
+
+	* bignum.c (rb_big_float_cmp): extracted from rb_big_cmp and big_op.
+	  (rb_big_cmp): use rb_big_float_cmp.
+	  (big_op): ditto.
+
+	* numeric.c (flo_cmp): use rb_big_float_cmp.
+	  (flo_gt): ditto.
+	  (flo_ge): ditto.
+	  (flo_lt): ditto.
+	  (flo_le): ditto.
+
+Mon Jul 16 14:14:21 2012  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (enum big_op_t): new type.
+	  (big_op): use enum big_op_t.
+	  (big_gt): ditto.
+	  (big_ge): ditto.
+	  (big_lt): ditto.
+	  (big_le): ditto.
+
+Sat Jul 14 18:18:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_get_values_at): fill with nil out of range.
+	  [ruby-core:43678] [Bug #6203]
+
+Sat Jul 14 17:17:55 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* cont.c (cont_restore_0): improve docs. [Bug #6706][ruby-core:46243]
+	  patched by Oscar Del Ben via https://github.com/ruby/ruby/pull/140
+
+Sat Jul 14 17:08:13 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_s_create): raise an exception, when input elements
+	  are not one or two elements arrays.  [ruby-core:39945] [Bug #5406]
+
+Sat Jul 14 16:16:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): use
+	  Array#uniq!.
+
+	* lib/test/unit.rb (Test::Unit::Runner#deal): deal tasks to workers.
+
+	* lib/test/unit.rb (Test::Unit::Runner#quit_workers): close and kill
+	  all workers.
+
+	* lib/test/unit.rb (Test::Unit::Runner#delete_worker): delete dead
+	  worker from working set.
+
+	* lib/test/unit.rb (Test::Unit::Runner#launch_worker): add new worker
+	  to working set.
+
+	* lib/test/unit.rb (Test::Unit::Runner#launch_worker): extract.
+
+	* lib/test/unit.rb (Test::Unit::Runner#start_watchdog): extract.
+
+	* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): move
+	  initializations with nothing to release outside begin/ensure.
+
+Sat Jul 14 16:04:24 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_join): should not infected by separator if it is not
+	  used.  [ruby-core:42161][Bug #5902]
+
+Sat Jul 14 02:31:55 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_thread_blocking_region): fix declarations
+	  prototypes without arguments in C++ have different meanings than C.
+
+Thu Jul 12 12:32:26 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/runner.rb: skip default gems to get rid of loading old versions
+	  before installation.
+
+Thu Jul 12 11:44:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_new_frozen): since the result object should have
+	  same tainted/untrusted bits with the original object, return new
+	  object if the shared object unmatch.  [ruby-core:39745][Bug #5374]
+
+Thu Jul 12 10:46:39 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/net/http/test_http.rb (TestNetHTTPLocalBind#test_bind_to_local*):
+	  cannot cross between network interfaces on Windows, so skip this test
+	  until we find better test.
+
+Thu Jul 12 08:48:33 2012  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 3.2.0 (r7598)
+	* test/minitest/*: ditto
+
+Thu Jul 12 05:11:41 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (defined): use method entry and id in cfp for proper
+	  superclass, since klass in iseq is shared by dynamically defined
+	  methods from the same block.  [ruby-core:45831][Bug #6644]
+
+Thu Jul 12 01:49:07 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP#connect): use local_host and local_port
+	  if specified. patched by Ricardo Amorim [Feature #6617]
+
+Wed Jul 11 17:36:39 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: append ENCOBJS to DLDOBJS but not EXTSOLIBS which is
+	  not a target, to compile enc/encinit.c.
+
+Wed Jul 11 12:38:20 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): nonstatic initializer
+	  of an aggregate type is a C99ism.
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): get rid of VC++
+	  warnings.
+
+Mon Jul  9 16:11:30 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* vm_eval.c (rb_eval_string_from_file,
+	  rb_eval_string_from_file_protect): new functions to replace
+	  rb_compile_main_from_string() and ruby_eval_main().
+
+	* nacl/pepper_ruby.c: Follows the change in vm_eval.c
+
+Mon Jul  9 14:05:42 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	Reverts a half of r36079. As we discussed on ruby-dev@ and IRC,
+	we do not need to disclose intermediate representation of program.
+	The program embedding CRuby should use rb_eval_string family.
+	* include/ruby/ruby.h (ruby_opaque_t): removed.
+	  (ruby_compile_main_from_file, ruby_compile_main_from_string,
+	   ruby_eval_main): removed.
+
+	* eval.c (ruby_eval_main_internal): became ruby_exec_internal() again.
+	  (ruby_eval_main): removed.
+
+	* ruby.c (PREPARE_PARSE_MAIN) reverted.
+	  (parse_and_compile_main, ruby_compile_main_from_file,
+	   ruby_compile_main_from_string): removed
+
+Wed Jul 11 10:16:38 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby.h (HAVE_RUBY_THREAD_H): to show ruby/thread.h to be
+	  available.  fixup of r36355.
+
+Wed Jul 11 03:26:47 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c:  Added streaming support to inflate processing.
+	  This allows zlib streams to be processed without huge memory growth.
+	  [Feature #6612]
+	* NEWS:  ditto
+	* ext/zlib/zlib.c (zstream_expand_buffer):  Uses rb_yield when a block
+	  is given for streaming support.  Refactored to use
+	  zstream_expand_buffer_into to remove duplicate code.
+	* ext/zlib/zlib.c (zstream_expand_buffer_protect):  Added wrapper
+	  function to pass jump state back through GVL-free section to allow
+	  zstream clean-up before terminating the ruby call.
+	* ext/zlib/zlib.c (zstream_expand_buffer_without_gvl):  Acquire GVL to
+	  yield processed chunk of output stream.
+	* ext/zlib/zlib.c (zstream_detach_buffer):  When a block is given,
+	  returns Qnil mid-stream and yields the output buffer at the end of
+	  the stream.
+	* test/zlib/test_zlib.rb:  Updated tests
+
+Tue Jul 10 22:57:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/thread.h: new header file for thread stuff.
+
+	* thread.c (rb_thread_call_without_gvl): export.  [Feature#4328]
+	  returns void* instead of VALUE.  [Feature #5543]
+
+	* thread.c (rb_thread_blocking_region): deprecate.  [ruby-core:46295]
+
+Tue Jul 10 10:48:59 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h (NT, NtInitialize): removed unused old macros.
+
+Tue Jul 10 10:43:37 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* configure.in: removed --enable/disable-win95 options. (see r36342)
+
+Tue Jul 10 00:44:41 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/ruby.h: Removed RUBY_GLOBAL_SETUP completely. It is
+	  no meaning definition since r24894.
+	* main.c: ditto.
+	* nacl/pepper_main.c: ditto.
+
+Mon Jul  9 23:59:36 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* dln.c: Simplify and make consistent an ifdef for Mac OS X.
+	* ext/socket/rubysocket.h: ditto.
+	* ext/tk/stubs.c: ditto.
+	* io.c: ditto.
+	* process.c: ditto.
+	* signal.c: ditto.
+	* vm_dump.c: ditto.
+
+Mon Jul  9 17:37:35 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (win95_stat): removed unnecessary macro.
+
+Mon Jul  9 17:22:16 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/configure.bat, win32/setup.mak, win32/Makefile.sub: omitted
+	  Win9x support.  removed --enable/disable-win95 options.
+
+	* include/ruby/win32.h, file.c, win32/win32.c: ditto.
+
+	* win32/README.win32: ditto.
+
+Mon Jul  9 13:28:34 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (DLDFLAGS): use TARGET_ENTRY to specify an entry point
+	  instead of TARGET which may contain non-identifier characters.
+
+	* lib/mkmf.rb (create_makefile): add TARGET_NAME which is the first
+	  part consists of only word characters.  [ruby-core:46248][Bug #6709]
+
+Sun Jul  8 07:36:19 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (shadowing_lvar_gen, warn_unused_var): no warnings for
+	  variables starting with _.  [ruby-core:46160][Feature #6693]
+
+Sat Jul  7 23:07:30 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* test/csv/test_features.rb: add require for Tempfile.
+	* test/csv/test_serialization.rb: ditto.
+
+Fri Jul  6 06:49:50 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* array.c (rb_ary_aref):  Added a description of the behavior of
+	  index positioning.  [Bug #6680]
+	* array.c (rb_ary_aset):  ditto.  Reordered sentences for clarity.
+	* string.c (rb_str_aref_m):  Added a description of the behavior of
+	  index positioning
+
+Fri Jul  6 05:38:44 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* string.c (rb_str_bytesize):  Improve documentation.  Patch by Oscar
+	  Del Ben from github issue #138.
+	* string.c (rb_str_empty):  ditto.
+	* string.c (rb_str_times):  ditto.
+	* string.c (rb_str_dump):  ditto.
+	* string.c (rb_str_center):  ditto.
+
+Fri Jul  6 04:05:59 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c (zstream_expand_buffer_without_gvl):  Use
+	  ruby_xrealloc() to avoid crash with CALC_EXACT_MALLOC_SIZE.
+
+Thu Jul  5 17:32:19 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h: move ThreadShield declarations from intern.h.
+
+Thu Jul  5 16:00:24 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (ThreadShield): rename from Barrier.
+
+Thu Jul  5 15:14:50 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/runner.rb (show_progress): refine error output. do not
+	  count non-empty error message, but just warn.
+
+	* bootstraptest/runner.rb (error): show errors immediately if tty.
+
+Thu Jul  5 12:28:11 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/net/http/test_httpresponses.rb: Add a test file for
+	  Net::HTTPResponses and put a test case for the previous bug.
+
+Thu Jul  5 06:33:52 2012  Mark Dodwell <mark@mkdynamic.co.uk>
+
+	* lib/net/http/responses.rb: Fix 4xx classes to inherit correctly
+	  from Net::HTTPClientError. [Bug #6700]
+
+Wed Jul  4 21:55:35 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (proc_options): warn only if -K and -w option is specified.
+	  see also r36274 [Feature #5206]
+
+Wed Jul  4 21:41:44 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* gc.c, atomic.h (ATOMIC_SIZE_*): moved from gc.c to atomic.h
+	  [ruby-dev:45909]
+
+Wed Jul  4 19:13:15 2012  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole.rb (test_s_codepage_changed):
+	  FileSystemObject only supports ANSI or UTF-16LE encoding.
+	  Patch by h.shirosaki (Hiroshi Shirosaki) [ruby-trunk - Bug #6650]
+
+Wed Jul  4 11:52:12 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c (ATOMIC_SIZE_*): 64bit Windows support.
+
+Wed Jul  4 11:11:28 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_frame_callee, rb_f_callee_name): fix to return the
+	  called id.  this longstanding bug has been caused and blocked by
+	  the structure of old rb_control_frame_t and rb_iseq_t.
+
+	* vm_insnhelper.c (vm_push_frame): set proper method entry.
+
+Wed Jul  4 08:29:31 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* array.c (rb_ary_aref):  Updated documentation to indicate the
+	  starting index is an index into the array or string.  Updated
+	  examples to show behavior of indexes at the end of an array or
+	  string.  Based on patch by Marcus Stollsteimer.  [Bug #6680]
+	* array.c (rb_ary_aset):  ditto.
+	* string.c (rb_str_aref):  ditto.  Also added descriptive argument
+	  names to call-seq section.
+
+Wed Jul  4 07:05:59 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* test/zlib/test_zlib.rb (test_inflate_partial_input):  Added test for
+	  inflating incomplete zlib streams.
+
+Tue Jul  3 23:14:16 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* gc.c (ATOMIC_SIZE_EXCHANGE): fix function name on Solaris [Bug #6689]
+	  [ruby-dev:45904]
+
+Tue Jul  3 16:07:49 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (vm_malloc_fixup, vm_xrealloc, vm_xfree, after_gc_sweep): use
+	  atomic operations to update malloc_params.
+
+Tue Jul  3 14:50:16 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c (zstream_run_func):  Don't exit run loop for buffer
+	  error.  [Feature #6615]
+	* ext/zlib/zlib.c:  Fix style to match existing functions.
+
+Tue Jul  3 12:05:51 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): also needed the workaround for VC8
+	  for x64.  [ruby-dev:45875] [Bug #6676]
+	  reported by aves_ramphastos (Seigo Ishigane)
+
+Tue Jul  3 11:56:46 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c (zstream_detach_buffer):  Refactored tainting of
+	  output string, moving it from the callee to zstream_detach_buffer.
+	* ext/zlib/zlib.c (rb_zstream_finish):  ditto
+	* ext/zlib/zlib.c (rb_zstream_flush_next_out):  ditto
+	* ext/zlib/zlib.c (rb_deflate_deflate):  ditto
+	* ext/zlib/zlib.c (rb_deflate_flush):  ditto
+	* ext/zlib/zlib.c (rb_inflate_inflate):  ditto
+
+Tue Jul  3 11:16:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (runnable): make symbolic links to run in build directory.
+
+Tue Jul  3 10:46:06 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (proc_options): warn if -K option is specified. [Feature #5206]
+
+Tue Jul  3 06:12:13 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c (Init_Object):  Added RDoc location pointers for
+	  Kernel#methods, Kernel#protected_methods, Kernel#private_methods and
+	  Kernel#public_methods.  [Bug #6666]
+
+Tue Jul  3 06:02:54 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c (zstream_run):  Process zlib streams without GVL.
+	  [Feature #6615]
+	* NEWS:  ditto.
+
+Mon Jul  2 22:13:04 2012  Tanaka Akira  <akr@fsij.org>
+
+	* thread.c (rb_thread_aref): add explanation for why Thread#[] and
+	  Thread#[]= are fiber-local and not thread-local.
+	  reported by Julien A.  [ruby-core:41606] [ruby-trunk - Bug #5750]
+
+Mon Jul  2 21:25:55 2012  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (timew_out_of_timet_range): specialization for
+	  SIZEOF_TIME_T == SIZEOF_INT64_T.
+
+Mon Jul  2 17:06:32 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_include_module): include modules after the origin.
+
+	* class.c (include_modules_at): skip prepended modules.
+
+	* class.c (rb_prepend_module): now basic.klass in ICLASS refers the
+	  old original class/module.  [ruby-dev:45868][Bug #6662]
+
+	* class.c (rb_mod_ancestors): ditto.
+
+	* vm_method.c (search_method): search method entry from the origin
+	  iclass.
+
+Mon Jul  2 05:54:58 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: [ruby-core:46058].
+
+Mon Jul  2 05:35:43 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (d_lite_marshal_load): accepts old dump.
+
+Mon Jul  2 03:21:53 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* README.EXT.ja: fixed args of have_struct_member() ,
+	  create_makefile() same as r35977. however, mkmf.rb include
+	  no Japanese-docs, so Appendix C was not removed. [Bug #6597]
+
+Fri Jun 29 05:08:41 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/test/unit/parallel.rb: workaround fix for rubygems.
+	  RubyGems can't find rake if the source directory is not equal to
+	  the directory which is running the test. [Bug #6604]
+
+Thu Jun 28 20:33:15 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* test/win32ole/test_win32ole.rb (test_s_codepage_changed):
+	  FileSystemObject only supports ANSI or UTF-16LE encoding.
+	  Patch by bosko (Bosko Ivanisevic) [ruby-trunk - Bug #6650]
+
+Thu Jun 28 09:27:09 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* class.c (class_instance_method_list): consider prepended Class/Module
+	  when recur != 0. [ruby-dev:45863] [Bug #6660]
+
+	* test/ruby/test_module.rb (test_prepend_instance_methods_false): add
+	  a test for it.
+
+
+Thu Jun 28 06:12:42 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_mod_ancestors): fix ancestors order.
+	  [ruby-core:45919][Bug #6658] [ruby-dev:45861][Bug #6659]
+
+Wed Jun 27 21:28:59 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/racc/parser.rb: NotImplementError is not exist.
+
+	* lib/irb/output-method.rb (IRB::OutputMethod#print): ditto.
+
+Wed Jun 27 21:31:13 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_prepend_module): ancestors of prepending module also
+	  should be included.  [ruby-core:45914][Bug #6654]
+
+Wed Jun 27 21:01:32 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (class_instance_method_list): m_tbl in prepended
+	  class/module is NULL.  [ruby-core:45915][Bug #6655]
+
+Wed Jun 27 16:48:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_prepend_module): prepend module into another module.
+
+	* eval.c (rb_mod_prepend): new method Module#prepend.  [Feature #1102]
+
+Wed Jun 27 09:15:46 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (is_popen_fork): check if fork and raise NotImplementedError if
+	  unavailable.
+
+	* io.c (rb_io_s_popen): allow environment variables hash and exec
+	  options as flat parameters, not in an array arguments.
+	  [Feature#6651] [EXPERIMENTAL]
+
+	* process.c (rb_execarg_extract_options): extract exec options, but no
+	  exceptions on non-exec options and returns them as a Hash.
+
+	* process.c (rb_execarg_setenv): set environment variables.
+
+Tue Jun 26 16:57:14 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (register_cached_thread_and_wait):
+	  return immediately if malloc() failed.
+	  [ruby-core:43960] [ruby-trunk - Bug #6235]
+
+	* thread_pthread.c (USE_THREAD_CACHE): check already defined or not.
+
+Tue Jun 26 10:01:56 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_s_popen): revert r36213 "popen: shell commands with
+	  envvar" because it disabled to let single command bypass shell.
+
+Mon Jun 25 17:49:28 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_mix_module): revert Module#mix.
+
+Mon Jun 25 16:57:38 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_mod_define_method): allow method transplanting from a
+	  module to either class or module.  [ruby-core:34267][Feature #4254]
+
+Mon Jun 25 11:34:45 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* internal.h: use rb_pid_t instead of pid_t because of there is no
+	  definition of pid_t here on Windows.
+
+Mon Jun 25 00:25:01 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in (for stack end address): remove human68k specific
+	  check. It is no longer supported.
+
+Sun Jun 24 23:02:17 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (pipe_open): merge win32 code using spawnv().
+
+Sun Jun 24 22:53:42 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (check_exec_fds): separate check_exec_fds_1() since
+	  nonstatic initializer of an aggregate type is not allowed by C89.
+
+Sun Jun 24 07:47:17 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_execarg): options field removed.
+
+	* process.c: follow the rb_execarg change.
+
+Sat Jun 23 23:48:21 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (proc_spawn_cmd): unused variable removed to suppress a
+	  warning.
+	  (save_env): ditto.
+
+	  [ruby-core:45797] reported by Luis Lavena.
+
+Sat Jun 23 23:19:31 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_execarg): add new_pgroup_given and new_pgroup_flag
+	  fields.
+
+	* process.c (EXEC_OPTION_NEW_PGROUP): removed.
+	  (proc_spawn_cmd): take a struct rb_execarg argument.
+	  use the new fields.
+	  (rb_execarg_addopt): use the new fields.
+	  (rb_spawn_process): follow the proc_spawn_cmd change.
+
+	  [ruby-core:45794] [ruby-trunk - Bug #6633] reported by Luis Lavena.
+
+Sat Jun 23 20:26:36 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_execarg): add fd_dup2, fd_close, fd_open,
+	  fd_dup2_child fields.
+
+	* process.c (EXEC_OPTION_DUP2): removed.
+	  (EXEC_OPTION_CLOSE): removed.
+	  (EXEC_OPTION_OPEN): removed.
+	  (EXEC_OPTION_DUP2_CHILD): removed.
+	  (mark_exec_arg): mark the new fields.
+	  (check_exec_redirect1): change condition for default option.
+	  (check_exec_redirect): take a struct rb_execarg argument.
+	  use the new fields.
+	  (rb_execarg_addopt): follow the check_exec_redirect change.
+	  (check_exec_fds): use the new fields.
+	  (save_redirect_fd): ditto.
+
+Sat Jun 23 19:01:18 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_execarg_fixup): fix envopts condition.
+
+Sat Jun 23 18:44:13 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (check_exec_redirect1): extracted from
+	  check_exec_redirect.
+
+Sat Jun 23 17:22:02 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (save_env): don't use EXEC_OPTION_UNSETENV_OTHERS.
+	  (rb_execarg_run_options): ditto.
+
+Sat Jun 23 17:04:08 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_execarg): add env_modification field.
+
+	* process.c (EXEC_OPTION_ENV): removed.
+	  (mark_exec_arg): mark env_modification field.
+	  (rb_exec_fillarg): update the new field, instead of options array.
+	  (rb_execarg_fixup): use the new field.
+	  (save_env): ditto.
+	  (rb_execarg_run_options): ditto.
+
+Sat Jun 23 16:27:01 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_execarg): add rlimit_limits field.
+
+	* process.c (EXEC_OPTION_RLIMIT): removed.
+	  (mark_exec_arg): mark rlimit_limits field.
+	  (rb_execarg_addopt): update the new fields, instead of options array.
+	  (run_exec_rlimit): use the new field.
+	  (rb_execarg_run_options): clear sarg using MEMZERO.  use the new
+	  field.
+
+Sat Jun 23 14:29:25 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_execarg): add chdir_given and chdir_dir fields.
+
+	* process.c (EXEC_OPTION_CHDIR): removed.
+	  (mark_exec_arg): mark chdir_dir field.
+	  (rb_execarg_addopt): update the new fields, instead of options array.
+	  (rb_execarg_run_options): use the new fields.
+
+Sat Jun 23 13:20:47 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_execarg): add close_others_given, close_others_do and
+	  close_others_maxhint fields.
+
+	* process.c (EXEC_OPTION_CLOSE_OTHERS): removed.
+	  (rb_execarg_addopt): update the new fields, instead of options array.
+	  (check_exec_fds): take eargp as an argument.  update the
+	  close_others_maxhint field.
+	  (rb_execarg_fixup): follow the argument change of check_exec_fds.
+	  (rb_execarg_run_options): use the new fields.
+
+Sat Jun 23 10:41:59 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_execarg): add unsetenv_others_given and
+	  unsetenv_others_do fields.
+
+	* process.c (EXEC_OPTION_UNSETENV_OTHERS): removed.
+	  (rb_execarg_addopt): update the new fields, instead of options array.
+	  (rb_execarg_fixup): use the new fields.
+
+Sat Jun 23 09:35:47 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: use the variable name "soptions" for sargp->options.
+
+Sat Jun 23 09:17:49 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: use the name "sargp" for struct rb_execarg variables
+	  consistently for saving process attributes.
+
+	* io.c: ditto.
+
+Sat Jun 23 07:59:57 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: use the name "eargp" for struct rb_execarg variables
+	  consistently except for saving process attributes.
+
+	* io.c: ditto.
+
+	* ext/pty/pty.c: ditto.
+
+Wed Jun 20 18:27:03 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* common.mk: Add missing dependencies.
+
+Fri Jun 22 20:27:39 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_execarg): add pgroup_given and pgroup_pgid fields.
+
+	* process.c (EXEC_OPTION_PGROUP): removed.
+	  (rb_execarg_addopt): update the new fields, instead of options array.
+	  (run_exec_pgroup): take a struct rb_execarg argument.  refer the new
+	  fields.
+	  (rb_execarg_run_options): follow run_exec_pgroup change.
+
+Fri Jun 22 18:48:51 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* README.EXT, README.EXT.ja: use "sval" for the third argument
+	  name of Data_Wrap_Struct().
+	  Suggested by @satoh_fumiyasu. Thanks!!!
+
+Fri Jun 22 18:04:26 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c, vm_eval.c: set th->base_block properly.
+	  th->base_block is information for (a) parsing, (b) compiling
+	  and (c) setting up the frame to execute the program passed by
+	  `eval' method.  For example, (1) parser need to know up-level
+	  variables to detect it is variable or method without paren.
+	  Befor (a), (b) and (c), VM set th->base_block by passed bindng
+	  (or previous frame information).  After execute (a), (b) and (c),
+	  VM should clear th->base_block.  However, if (a), (b) or (c)
+	  raises an exception, then th->base_block is not cleared.
+	  Problem is that the uncleared value th->balo_block is used for
+	  irrelevant iseq compilation.  It causes SEGV or critical error.
+	  I tried to solve this problem: to clear them before exception,
+	  but finally I found out that it is difficult to do it (Ruby
+	  program can be run in many places).
+	  Because of this background, I set th->base_block before
+	  compiling iseq and restore it after compiling.
+	  Basically, th->base_block is dirty hack (similar to global
+	  variable) and this patch is also dirty.
+
+	* bootstraptest/test_eval.rb: add a test for above.
+
+	* internal.h: remove unused decl.
+
+	* iseq.c (rb_iseq_compile_with_option): add base_block parameter.
+	  set th->base_block before compilation and restore it after
+	  compilation.
+
+	* ruby.c (require_libraries): pass 0 as base_block instead of
+	  setting th->base_block
+
+	* tool/compile_prelude.rb (prelude_eval): apply above changes.
+
+	* vm.c, vm_eval.c: ditto.
+
+	* vm_core.h: add comments.
+
+Fri Jun 22 18:19:38 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: pass struct rb_execarg value instead of its options
+	  field for saving process attribute changing functions.
+	  (save_redirect_fd): take a struct rb_execarg argument.
+	  (run_exec_dup2): ditto.
+	  (run_exec_close): ditto.
+	  (run_exec_open): ditto.
+	  (run_exec_dup2_child): ditto.
+	  (run_exec_pgroup): ditto.
+	  (run_exec_rlimit): ditto.
+	  (save_env): ditto.
+	  (rb_execarg_run_options): follow the above functions change.
+
+Fri Jun 22 17:55:48 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_backtrace.rb: decrease recursion depth
+	  to reduce consuming stack size.
+
+Fri Jun 22 13:36:50 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (random_init, random_load): cannot initialize frozen object
+	  again, nor with tainted/untrusted object.  [Bug #6540]
+
+Fri Jun 22 13:32:33 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_check_copyable): new function, to ensure the target is
+	  not frozen and the source is not tainted nor untrusted.
+
+Fri Jun 22 05:55:20 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* eval.c (ruby_cleanup):  Fixed typo.  Patch by Trever Dawe.
+	  Fixes #131 (github).  [ruby-trunk - Bug #6619]
+
+Thu Jun 21 21:16:58 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_execarg_addopt): take a VALUE argument instead of
+	  struct rb_execarg.
+	  (rb_exec_arg_addopt): follow the rb_execarg_addopt change.
+	  (check_exec_options_i): ditto.
+
+	* io.c (pipe_open): follow the rb_execarg_addopt change.
+
+	* internal.h (rb_execarg_addopt): follow the definition change.
+
+Thu Jun 21 20:34:19 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_fillarg): take a VALUE argument instead of
+	  struct rb_execarg.
+	  (rb_check_exec_options): ditto.
+	  (check_exec_options_i): ditto.
+
+Thu Jun 21 19:48:05 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_async_signal_safe): use rb_execarg_run_options
+	  instead of rb_run_exec_options_err.
+	  (rb_spawn_process): ditto.
+
+Thu Jun 21 19:02:43 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_fillarg): take a VALUE argument instead of
+	  struct rb_execarg.
+	  (rb_execarg_init): follow the rb_exec_fillarg change.
+
+Thu Jun 21 18:36:43 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_execarg_init): take a VALUE argument instead of
+	  struct rb_execarg.
+	  (rb_execarg_new): follow the rb_execarg_init change.
+	  (rb_exec_arg_init): ditto.
+
+	* internal.h (rb_execarg_init): follow the definition change.
+
+Thu Jun 21 17:20:44 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (new_args_tail_gen): fix GC problem of keyword rest
+	  argument.  the wrapped struct should be bound to the wrapping node
+	  before assignment of child nodes, to get rid of the case the
+	  children are referred by only the struct pointer which is not a
+	  subject of GC.  [ruby-core:45744]
+
+Thu Jun 21 07:06:52 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* error.c (err_append): rename err_append() to compile_err_append()
+	  and move definition body.  err_append() is used only by compiling.
+
+Thu Jun 21 06:21:54 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_execarg_fixup): take a VALUE argument instead of
+	  struct rb_execarg.
+
+	* internal.h (rb_execarg_fixup): follow the definition change.
+
+	* io.c (pipe_open): follow rb_execarg_fixup change.
+
+	* ext/pty/pty.c (establishShell): ditto.
+
+Wed Jun 20 21:25:37 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (struct rb_execarg): add umask_given and umask_mask
+	  fields.
+
+	* process.c (STATIC_ASSERT): removed.
+	  (rb_execarg_addopt): follow the rb_execarg change.
+	  (rb_execarg_run_options): ditto.
+
+Wed Jun 20 20:38:23 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (struct rb_execarg) moved and renamed from
+	  struct rb_exec_arg in intern.h.
+
+	* include/ruby/intern.h (struct rb_exec_arg): refer Data object which
+	  contains struct rb_execarg.
+
+	* process.c: use struct rb_execarg instead of struct rb_exec_arg
+	  except functions declared in intern.h.
+	  (rb_exec_arg_addopt): extract a pointer to struct rb_execarg from
+	  struct rb_exec_arg.
+	  (rb_exec_arg_init): ditto.
+	  (rb_exec_arg_fixup): ditto.
+	  (rb_run_exec_options_err): ditto.
+	  (rb_run_exec_options): ditto.
+	  (rb_exec_err): ditto.
+	  (rb_exec): ditto.
+
+	* io.c: use struct rb_execarg instead of struct rb_exec_arg.
+
+	* ext/pty/pty.c: ditto.
+
+Wed Jun 20 19:13:25 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_execarg_new): declared.
+	  (rb_execarg_get): ditto.
+
+	* process.c (mark_exec_arg): new function.
+	  (free_exec_arg): ditto.
+	  (memsize_exec_arg): ditto.
+	  (exec_arg_data_type): defined.
+	  (rb_execarg_new): new function.
+	  (rb_execarg_get): ditto.
+	  (rb_f_exec): use rb_execarg_new.
+	  (rb_spawn_internal): ditto.
+	  (rb_f_spawn): ditto.
+
+	* io.c (pipe_open_v): use rb_execarg_new.
+	  (pipe_open_s): ditto.
+
+	* ext/pty/pty.c (establishShell): use rb_execarg_new.
+
+Wed Jun 20 16:36:14 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/setproctitle.c (environ): use (*_NSGetEnviron()) instead of
+	  environ on Darwin for namespace cleanness, same as [ruby-core:00537].
+	  [ruby-core:45615] [Bug #6576]
+
+Wed Jun 20 11:33:04 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_execarg_addopt): always make Fixnum, and ignore higher
+	  bits in too large umask value.
+
+Wed Jun 20 11:24:35 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): deal with
+	  sudden-death of workers.
+
+Mon Jun 18 20:34:20 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* time.c (init_leap_second_info): fix non-ANSI function declaration.
+
+Mon Jun 18 20:29:04 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ruby.c (rb_f_sub): use ansi style declaration.
+	* ruby.c (rb_f_gsub): ditto.
+	* ruby.c (rb_f_chomp): ditto.
+
+Mon Jun 18 20:26:23 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* random.c (rb_random_int32): get rid of "warning: constant 0x100000000
+	  is so big it is long" warning.
+
+Mon Jun 18 20:07:23 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* dir.c (dir_initialize): get rid of "unused return: argc = rb_scan_args()"
+	  warning.
+
+Mon Jun 18 19:31:20 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/missing.h: include math.h before checking INFINITY
+	  and NAN. Otherwise, strange macro redefinition will occur.
+
+Mon Jun 18 19:12:37 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* array.c (ary_reverse): use ansi style declaration.
+
+Tue Jun 19 18:43:50 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/backward/rubysig.h: fix visibility.  [Bug #6607]
+
+Tue Jun 19 17:51:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_execarg_run_options): do not call any methods in the
+	  async-signal-safe function.  mask has been checked with NUM2MODET()
+	  already and converted with LONG2NUM().
+
+Tue Jun 19 11:59:56 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (Init_readline): don't set 0 to
+	  rl_catch_signals and rl_catch_sigwinch. [Bug #5423]
+
+Tue Jun 19 11:52:59 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_s_get_special_prefixes): suppress
+	  warning: uninitialized instance variable.
+
+Tue Jun 19 11:43:16 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_getc): fix editline compatibility
+	  broken by r36123. [Bug #6601]
+
+Mon Jun 18 17:10:08 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_subpos): split from rb_str_substr.  returns
+	  adjusted position for substring.
+
+Mon Jun 18 10:42:57 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_getc): deal with ESC just followed
+	  by ASCII as meta prefix in incremental search mode.  based on the
+	  patch from rctay (Tay Ray Chuan) at [ruby-core:45682].  [Bug #6601]
+
+Sun Jun 17 22:23:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (rb_file_directory_p): move documentation for Dir.exist? from
+	  file.c so that the proper description will be shown instead of the
+	  documentation of File.directory?.  [ruby-core:45685]
+
+Sun Jun 17 16:21:01 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_win32.h (rb_thread_lock_t): make a union for USE_WIN32_MUTEX.
+	  this internal is used only in thread_win32.c, but has to be complete
+	  to define rb_thread_t.
+
+	* thread_win32.c (native_mutex_lock, native_mutex_destroy): fix for
+	  USE_WIN32_MUTEX.
+
+	* thread_win32.c (native_cond_timedwait_ms): rename reserved pattern
+	  name.  user defined symbols should not start with __.
+
+Sat Jun 16 19:24:01 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: define date_sg_t.
+
+Sat Jun 16 18:46:57 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_tmx.h: offset in struct tmx_funcs is now int.
+	* ext/date/date_strftime.c: ditto.
+	* ext/date/date_core.c: ditto.
+
+Sat Jun 16 18:31:46 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_setup): set running state in the normal case before
+	  popping a tag.
+
+Sat Jun 16 07:46:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): format workers
+	  results in the parent.
+
+Sat Jun 16 07:12:56 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/runruby.rb (File.realpath): return real path of expanded path.
+	  [Bug #6598]
+
+Sat Jun 16 07:12:28 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/runner.rb (main): ignore -j option for compatibility
+	  with test/unit.
+
+Sat Jun 16 07:11:52 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#puke): modify only result and
+	  drop useless reports, not override entirely.
+
+	* lib/test/unit/parallel.rb (Test::Unit::Worker#_run_suite): report
+	  unformatted results.  formatting messages is not a workers task.
+
+	* lib/test/unit/parallel.rb (Test::Unit::Worker#puke): store raw
+	  results.
+
+Sat Jun 16 01:27:14 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: bumping psych to 1.3.3
+	* ext/psych/psych.gemspec: ditto
+
+Fri Jun 15 20:54:28 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* vm_backtrace.c (backtrace_collect): rename from backtreace_collect.
+
+Fri Jun 15 19:22:13 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: remove VM_FRAME_MAGIC_FINISH (finish frame type).
+	  Before this commit:
+	    `finish frame' was place holder which indicates that VM loop
+	    needs to return function.
+	    If a C method calls a Ruby methods (a method written by Ruby),
+	    then VM loop will be (re-)invoked.  When the Ruby method returns,
+	    then also VM loop should be escaped.  `finish frame' has only
+	    one instruction `finish', which returns VM loop function.
+	    VM loop function executes `finish' instruction, then VM loop
+	    function returns itself.
+	    With such mechanism, `leave' instruction (which returns one
+	    frame from current scope) doesn't need to check that this `leave'
+	    should also return from VM loop function.
+	    Strictly, one branch can be removed from `leave' instruction.
+	  Consideration:
+	    However, pushing the `finish frame' needs costs because
+	    it needs several memory accesses.  The number of pushing
+	    `finish frame' is greater than I had assumed.  Of course,
+	    pushing `finish frame' consumes additional control frame.
+	    Moreover, recent processors has good branch prediction,
+	    with which we can ignore such trivial checking.
+	  After this commit:
+	    Finally, I decide to remove `finish frame' and `finish'
+	    instruction.  Some parts of VM depend on `finish frame',
+	    so the new frame flag VM_FRAME_FLAG_FINISH is introduced.
+	    If this frame should escape from VM function loop, then
+	    the result of VM_FRAME_TYPE_FINISH_P(cfp) is true.
+	    `leave' instruction checks this flag every time.
+	    I measured performance on it.  However on my environments,
+	    it improves some benchmarks and slows some benchmarks down.
+	    Maybe it is because of C compiler optimization parameters.
+	    I'll re-visit here if this cause problems.
+
+	* insns.def (leave, finish): remove finish instruction.
+
+	* vm.c, vm_eval.c, vm_exec.c, vm_backtrace.c, vm_dump.c:
+	  apply above changes.
+
+Fri Jun 15 19:11:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#puke): always add skipped
+	  results to the report for parallel test.  [Bug #6595]
+
+Fri Jun 15 09:01:35 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* nacl/pepper_main.c: Removed an unnecessary and erroneous inclusion.
+
+Thu Jun 14 22:59:56 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CPPOUTFILE): check if output is really sent to
+	  specified file to tell if -o option works.  [ruby-dev:45742]
+	  [Bug#6591]
+
+	* configure.in (RUBY_CPPOUTFILE): check if output file is actually
+	  created.  [ruby-dev:45742] [Bug#6591]
+
+Thu Jun 14 22:10:50 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (proc_exec_sh): don't strip leading spaces of the script.
+
+Thu Jun 14 15:54:02 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_file_s_basename, rb_file_s_dirname): documentation fix.
+	  File.basename and File.dirname support File::ALT_SEPARATOR.
+
+Thu Jun 14 11:10:10 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* nacl/pepper_main.c: Applies the new embedding API to pepper_ruby.
+
+Thu Jun 14 10:44:41 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* include/ruby/ruby.h: Grouped APIs for embedding CRuby interpreter.
+	  (ruby_setup, ruby_compile_main_from_file,
+	  ruby_compile_main_from_string, ruby_eval_main,
+	  ruby_set_script_name): new APIs to embed CRuby.
+	  (ruby_opaque_t) Opaque pointer to an internal data, to NODE or iseq
+	  in particular.
+
+	* eval.c (ruby_setup): Similar to ruby_init but returns an error code
+	  instead of exit(3) on error.
+	  (ruby_eval_main): Similar to ruby_exec_node but returns the
+	  evaluation result.
+	  (ruby_eval_main_internal): renamed from ruby_exec_internal.
+
+	* ruby.c (toplevel_context): new helper function.
+	  (PREPARE_EVAL_MAIN): moved.
+	  (process_options): refactored with new functions.
+	  (parse_and_compile_main) new helper function.
+	  (ruby_compile_main_from_file, ruby_compile_main_from_string) new API
+	  (ruby_set_script_name): new API.
+
+
+Thu Jun 14 10:39:48 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* eval.c: Add doxygen comments.
+
+	* ruby.c: ditto.
+
+	* thread_pthread.c: ditto
+
+	* version.c: ditto.
+
+	* vm_core.h: ditto.
+
+Thu Jun 14 10:16:07 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: revert r36071 and add NetBSD to blacklist of -ansi.
+
+Thu Jun 14 07:59:12 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c (get_stack): Linux is the only OS which includes
+	  the size of guard page into the stack size.
+
+Thu Jun 14 06:21:00 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/drb/drb.rb:  Replace broken links to the English DRb book.
+	  Patch by Zachary Scott.  [ruby-trunk - Bug #6544]
+
+Thu Jun 14 06:17:47 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/observer.rb:  Update broken link to the Programming Ruby book.
+	  Patch by Zachary Scott.  [ruby-trunk - Bug #6536]
+	* lib/drb/drb.rb:  ditto.
+
+Thu Jun 14 05:23:05 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (PFETCH_READY): suppress Wunused-but-set-variable.
+
+	* regparse.c (is_onechar_cclass): restructured to clarify that c is
+	  used iff found == 1.
+
+Thu Jun 14 02:54:17 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: use -fbuiltin with -ansi -std=iso9899:199409.
+	  This prevents errors introduced by disabling builtin functions,
+	  which is the sub-effect of -ansi/-std.
+	  Now NetBSD can use -ansi -std=iso9899:199409.
+	  Maybe mingw, cygwin and darwin can also.
+
+Thu Jun 14 02:53:30 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Makefile.in: don't remove macros. now name2ctype uses macros.
+
+	* tool/enc-unicode.rb: add comment why it uses Hash#index.
+
+	* enc/unicode/{name2ctype.kwd,name2ctype.src,name2ctype.h.blt}:
+	  update to follow the current name2ctype.h.
+	  FYI current Unicode version is 6.1.
+
+Thu Jun 14 00:16:59 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/net/http/responses.rb, lib/webrick/httpstatus.rb: Add HTTP
+	  response codes added in RFCs 2817 and 4918.  [ruby-core:45547]
+	  [Feature #6569]
+
+	* lib/net/http/responses.rb: Rename Net::HTTPMultipleChoice to
+	  Net::HTTPMultipleChoices, leaving the former as alias to the
+	  latter for backward compatibility.  [ruby-core:45547]
+	  [Feature #6569]
+
+	* lib/net/http/responses.rb: Add comments about unused,
+	  still-in-draft and private extension response codes.
+	  [ruby-core:45547] [Feature #6569]
+
+Wed Jun 13 22:44:32 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* test/dl/test_func.rb (test_qsort1, test_qsort2): use TYPE_SIZE_T
+	  for size_t variables. [ruby-dev:45733] [Bug #6584]
+
+Wed Jun 13 22:18:01 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: remove -ansi and -std options for lgamma_r() and
+	  finite().
+
+Wed Jun 13 21:46:34 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: cygwin does not provide some declarations in strict
+	  ANSI mode.
+
+Wed Jun 13 20:19:59 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork_internal): move a variable declaration.
+
+Wed Jun 13 17:54:38 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* regparse.c (PFETCH_READY):  this  line was to  suppress warning,
+	  but  did emit  warnings if  -Wuninitialized was  set.  Assigning
+	  NULL instead if pfetch_prev should suffice the situation.
+
+Wed Jun 13 17:51:05 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: cygwin needs C99 for some stuff, e.g.,
+	  pthread_attr_setstacksize, sched_yield.
+
+Wed Jun 13 17:50:43 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (.c.i): add warnflags to make the result consistent with
+	  compilation.
+
+Wed Jun 13 15:12:07 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* configure.in: On Windows  platforms, system provided headers are
+	  VC++ optimized.  That is, C++ habits are often contaminated into
+	  various  headers.  Most  frequent  situation is  the  use of  //
+	  comments.  We bypass ANSI  C mode for them.  Otherwise extension
+	  libs cannot include those headers.
+
+Wed Jun 13 13:39:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h: get rid of C99 style one line comments.
+
+Wed Jun 13 13:39:04 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_alias_internal): use strdup defined as macro.
+
+Wed Jun 13 10:20:27 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_exec_fillarg): get rid of SIZE_T_MAX which may need
+	  more headers.
+
+	* process.c (rb_exec_fillarg): fix array element size.  "continue" and
+	  "readonly" exceeded the size.
+
+	* process.c (rb_exec_fillarg): use shell if the first word is reserved
+	  or special built-in name.
+	 http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
+
+	* process.c (rb_exec_fillarg): treat '=' only in the first word.  if
+	  the first word does not contain '=', it is the command name and
+	  environment assignments cannot be anymore.
+
+Tue Jun 12 23:45:36 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/mkmf.rb: add dummy clean-static target to prevent errors for the
+	  case real clean-static target doesn't exist.
+
+Tue Jun 12 22:49:42 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* process.c (rb_exec_arg_fixup): fix compile error
+
+Tue Jun 12 21:40:13 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_fillarg): treat '=' character as a meta
+	  character to detect assignments preceding command name.
+
+Tue Jun 12 20:29:19 2012  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_exec_arg_init): deprecated.
+	  (rb_exec_arg_addopt): ditto.
+	  (rb_exec_arg_fixup): ditto.
+	  (rb_run_exec_options): ditto.
+	  (rb_run_exec_options_err): ditto.
+
+	* internal.h (rb_execarg_init): declared.
+	  (rb_execarg_addopt): ditto.
+	  (rb_execarg_fixup): ditto.
+	  (rb_execarg_run_options): ditto.
+
+	* process.c: call rb_execarg_addopt, rb_execarg_fixup,
+	  rb_execarg_run_options, rb_execarg_init.
+	  (rb_execarg_addopt): renamed from rb_exec_arg_addopt.
+	  (rb_exec_arg_addopt): stub to call rb_execarg_addopt.
+	  (rb_execarg_init): renamed from rb_exec_arg_init.
+	  (rb_exec_arg_init): stub to call rb_execarg_init.
+	  (rb_execarg_fixup): renamed from rb_exec_arg_fixup.
+	  (rb_exec_arg_fixup): stub to call rb_execarg_fixup.
+	  (rb_execarg_run_options): renamed from rb_run_exec_options_err.
+	  (rb_run_exec_options_err): stub to call rb_execarg_run_options.
+	  (rb_run_exec_options): call rb_execarg_run_options.
+
+	* io.c: call rb_execarg_addopt, rb_execarg_fixup,
+	  rb_execarg_run_options, rb_execarg_init.
+
+	* ext/pty/pty.c (establishShell): call rb_execarg_init and
+	  rb_execarg_fixup.
+
+Tue Jun 12 18:39:59 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* configure.in: enable strict ANSI mode by default in case of GCC,
+	  requested by _ko1.
+
+Tue Jun 12 06:40:23 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_fillarg): detect '#' as a meta character.
+
+Mon Jun 11 22:15:44 2012  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_proc_exec_n): deprecated.
+	  (rb_exec): ditto.
+	  (rb_exec_err): ditto.
+	  (rb_fork): ditto.
+	  (rb_fork_err): ditto.
+
+Mon Jun 11 18:49:52 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: on checking libexecinfo, don't specify /use/local.
+	  On FreeBSD people must specify --with-opt-dir or --with-execinfo-dir.
+
+Mon Jun 11 12:14:37 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: remove lfp (local frame pointer) and rename
+	  dfp (dynamic frame pointer) to ep (environment pointer).
+	  This change make VM `normal' (similar to other interpreters).
+	  Before this commit:
+	    Each frame has two env pointers lfp and dfp.  lfp points
+	    local environment which is method/class/toplevel frame.
+	    lfp[0] is block pointer.
+	    dfp is block local frame. dfp[0] points previous (parent)
+	    environment pointer.
+	    lfp == dfp when frame is method/class/toplevel.
+	    You can get lfp from dfp by traversing previous environment
+	    pointers.
+	  After this commit:
+	    Each frame has only `ep' to point respective environment.
+	    If there is parent environment, then ep[0] points parent
+	    environment (as dfp).  If there are no more environment,
+	    then ep[0] points block pointer (as lfp).  We call such ep
+	    as `LEP' (local EP).  We add some macros to get LEP and to
+	    detect LEP or not.
+	    In short, we replace dfp and lfp with ep and LEP.
+	  rb_block_t and rb_binding_t member `lfp' and `dfp' are removed
+	  and member `ep' is added.
+	  rename rb_thread_t's member `local_lfp' and `local_svar' to
+	  `root_lep' and `root_svar'.
+	  (VM_EP_PREV_EP(ep)): get previous environment pointer.  This macro
+	    assume that ep is not LEP.
+	  (VM_EP_BLOCK_PTR(ep)): get block pointer.  This macro assume
+	    that ep is LEP.
+	  (VM_EP_LEP_P(ep)): detect ep is LEP or not.
+	  (VM_ENVVAL_BLOCK_PTR(ptr)): make block pointer.
+	  (VM_ENVVAL_BLOCK_PTR_P(v)): detect v is block pointer.
+	  (VM_ENVVAL_PREV_EP_PTR(ptr)): make prev environment pointer.
+	  (VM_ENVVAL_PREV_EP_PTR_P(v)): detect v is prev env pointer.
+
+	* vm.c: apply above changes.
+	  (VM_EP_LEP(ep)): get LEP.
+	  (VM_CF_LEP(cfp)): get LEP of cfp->ep.
+	  (VM_CF_PREV_EP(cfp)): utility function VM_EP_PREV_EP(cfp->ep).
+	  (VM_CF_BLOCK_PTR(cfp)): utility function VM_EP_BLOCK_PTR(cfp->ep).
+
+	* vm.c, vm_eval.c, vm_insnhelper.c, vm_insnhelper.h, insns.def:
+	  apply above changes.
+
+	* cont.c: ditto.
+
+	* eval.c, eval_intern.h: ditto.
+
+	* proc.c: ditto.
+
+	* thread.c: ditto.
+
+	* vm_dump.c: ditto.
+
+	* vm_exec.h: fix function name (on vm debug mode).
+
+Mon Jun 11 11:52:18 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* compile.c (iseq_set_sequence): nonstatic initializer of an
+	  aggregate type is a C99ism.
+
+	* compile.c (enum compile_array_type_t): comma at the end of enum
+	  list is a C99ism.
+
+	* vm_backtrace.c (enum LOCATION_TYPE): ditto.
+
+Mon Jun 11 06:31:33 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_proc_exec_n): revert the function removed at r35889.
+
+Mon Jun 11 06:20:50 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): assign return
+	  value to the variable err.
+
+Mon Jun 11 06:17:06 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c (native_cond_initialize): fix typo in r36022.
+	  this cause a failure on FreeBSD 8.2 amd64.
+	 http://fbsd.rubyci.org/~chkbuild/ruby-trunk/log/20120610T130201Z.diff.html.gz
+
+Mon Jun 11 05:21:57 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* .gdbinit (SDR): add SDR function.  It's only for VM debugging.
+
+Sun Jun 10 21:50:45 2012  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* nacl/nacl_config.rb: Fixed for 32bit hosts.
+
+Sun Jun 10 20:23:14 2012  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	Fixes threading on NativeClient.
+
+	* thread_pthread.c (timer_thread_sleep): Extracted out a function from
+	  thread_timer(). Added an alternative implementation for platforms
+	  that lacks select(2) or pipe(2).
+	  (rb_thread_create_timer_thread, native_cond_initialize,
+	  native_cond_destroy): Replaced wrong HAVE_XXX checks.
+
+	* configure.in (pthread_attr_init): New check.
+
+Sun Jun 10 21:30:11 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_without_timer_thread): renamed from rb_exec_err.
+	  (rb_exec_err): new stub function to call
+	  rb_exec_without_timer_thread.
+	  (rb_f_exec): call rb_exec_without_timer_thread.
+	  (rb_exec): call rb_exec_without_timer_thread.
+
+Sun Jun 10 21:13:10 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork): call rb_fork_internal instead of rb_fork_err.
+
+Sun Jun 10 20:55:59 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork_ruby): call rb_fork_internal directly.
+
+Sun Jun 10 20:19:40 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork_ruby): new function.
+	  (rb_f_fork): use rb_fork_ruby instead of rb_fork.
+	  (rb_daemon): ditto.
+
+	* io.c (pipe_open): use rb_fork_ruby instead of rb_fork.
+
+	* internal.h (rb_fork_ruby): declared.
+
+Sun Jun 10 18:58:16 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/net/http/response.rb: Remove a duplicated rdoc and leave a
+	  pointer.
+
+	* lib/net/http/responses.rb: Add RFC numbers to base on.
+
+Sun Jun 10 18:31:42 2012  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* configure.in (RUBY_NACL): Warns if $PATH does not contain the path
+	  to NativeClient SDK. PATH variable redefinition in GNUmakefile does
+	  not work for GNU make 3.81.
+
+Sun Jun 10 17:54:36 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.h (IS_STACK_DIR_UPPER): utility macro.
+
+	* thread_pthread.c (get_stack): seems stack size does not include
+	  guard size on Mac OS X.
+
+	* thread_pthread.c (ruby_init_stack): adjust stack size for offset of
+	  addr from the bottom.
+
+Sun Jun 10 15:49:47 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (retry_fork): call after_fork except in a child process.
+	  (rb_fork_internal): restrict after_fork call condition.
+
+Sun Jun 10 14:19:33 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: NetBSD 6 adds libexecinfo but it only works on amd64.
+	 http://www.mail-archive.com/source-changes-full@netbsd.org/msg38729.html
+
+Sun Jun 10 12:43:23 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_f_exec): call rb_exec_async_signal_safe except on
+	  Mac OS X.  cf. the comment in before_exec_non_async_signal_safe.
+
+Sun Jun 10 12:15:18 2012  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (popen_exec): don't call rb_thread_atfork_before_exec.  use
+	  rb_exec_async_signal_safe instead of rb_exec_err.
+	  (pipe_open): use rb_fork_async_signal_safe instead of rb_fork_err.
+
+Sun Jun 10 11:44:57 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork_internal): call after_fork only unless
+	  chfunc_is_async_signal_safe.
+
+Sun Jun 10 11:33:01 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_pkey_ec.c
+	  test/openssl/test_pkey_ec.rb: Add support for EC_POINT_mul.
+	  Patch provided by Sambasiva Suda. Thanks!
+	  [ruby-core:44408][ruby-trunk - Feature #6310]
+
+Sun Jun 10 10:48:15 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* lib/openssl/ssl.rb: Use a simple random number to generate the
+	  session id. MD5, as was used before, causes problems when
+	  using a FIPS version of OpenSSL. Issue was found by Jared
+	  Jennings, thank you!
+	  [ruby-trunk - Bug #6137]
+
+Sun Jun 10 10:27:34 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* NEWS: Add note about the new private key export behavior.
+
+Sun Jun 10 10:24:51 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_async_signal_safe): exported.
+
+	* ext/pty/extconf.rb: modify $INCFLAGS to include internal.h
+
+	* ext/pty/pty.c: include internal.h.
+	  (chfunc): don't call rb_thread_atfork_before_exec.  use
+	  rb_exec_async_signal_safe instead of rb_f_exec.
+	  (establishShell): set up earg.  use rb_fork_async_signal_safe
+	  instead of rb_fork_err.
+
+	* internal.h (rb_exec_async_signal_safe): declared.
+	  (rb_fork_async_signal_safe): declared.
+
+Sun Jun 10 10:21:37 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl.c
+	  ext/openssl/ossl_pkey_rsa.c
+	  ext/openssl/ossl_pkey_dsa.c
+	  ext/openssl/ossl_pkey_ec.c: Forbid export passwords that are less
+	  than four characters long, as OpenSSL itself does not allow this.
+	  Issue found by Eric Hodel.
+	* ext/openssl/ossl_pkey_ec.c: Add export as an alias of to_pem,
+	  following the PKey interface contract.
+	* test/openssl/test_pkey_dsa.rb
+	  test/openssl/test_pkey_rsa.rb
+	  test/openssl/test_pkey_ec.rb: Add tests that assert correct
+	  behaviour when dealing with passwords that are less than four
+	  characters long.
+	  [ruby-core: 42281][ruby-trunk - Bug #5951]
+
+Sun Jun 10 10:14:26 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_f_exec): use rb_exec_arg_prepare.
+
+Sun Jun 10 06:43:51 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: split after_exec into async-signal-safe part and rest.
+	  (after_exec_async_signal_safe): extracted from after_exec.
+	  (after_exec_non_async_signal_safe): ditto.
+	  (after_exec): call them.
+	  (rb_exec_async_signal_safe): call after_exec_async_signal_safe.
+	  (rb_exec_err): call after_exec_non_async_signal_safe instead of
+	  after_exec.
+
+Sun Jun 10 06:21:10 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* NEWS: document new features of Ruby OpenSSL.
+
+Sun Jun 10 03:09:41 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl.c: Fix error in example. Patch by David Albert.
+
+	  Add/extend existing documentation. Examples now also cover RSA
+	  signatures and PBKDF2.
+	  [ruby-core: 45154][ruby-trunk - Bug #6475]
+
+
+Sun Jun 10 01:41:45 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_ssl.c: Introduce SSLContext#renegotiation_cb and
+	  remove SSLContext#disable_client_renegotiation and related
+	  functionality introduced in r35797. The new callback approach
+	  gives clients maximum flexibility to decide on their own what to
+	  do on renegotiation attempts.
+	  Add documentation for SSL module and SSLError.
+	* test/openssl/test_ssl.rb: Add a test for
+	  SSLContext#renegotiation_cb.
+
+Sun Jun 10 01:37:18 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork_internal): initialize exc.
+
+Sun Jun 10 00:19:25 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: don't use non async-signal-safe functions in a child
+	  process before exec, for invoking a command.
+	  (rb_exec_atfork): call rb_exec_async_signal_safe only.
+	  (retry_fork): take chfunc_is_async_signal_safe argument.  call
+	  before_fork and after_fork only unless chfunc_is_async_signal_safe.
+	  (send_child_error): take chfunc_is_async_signal_safe argument.
+	  send an exception only unless chfunc_is_async_signal_safe.
+	  (recv_child_error): take chfunc_is_async_signal_safe argument.
+	  receive an exception only unless chfunc_is_async_signal_safe.
+	  (rb_fork_internal): renamed from rb_fork_err and take
+	  chfunc_is_async_signal_safe argument.
+	  use rb_protect only unless chfunc_is_async_signal_safe.
+	  (rb_fork_err): call rb_fork_internal with false as
+	  chfunc_is_async_signal_safe.
+	  (rb_fork_async_signal_safe): call rb_fork_internal with true as
+	  chfunc_is_async_signal_safe.
+	  (rb_spawn_process): call rb_fork_async_signal_safe instead of
+	  rb_fork_err.
+
+Sat Jun  9 23:57:03 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork_err): rewrite a complex "if" statement.
+
+Sat Jun  9 23:44:29 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (before_exec_async_signal_safe): extracted from
+	  before_exec.
+	  (before_exec_non_async_signal_safe): ditto.
+	  (before_exec): call before_exec_async_signal_safe and
+	  before_exec_non_async_signal_safe.
+	  (rb_exec_async_signal_safe): call before_exec_async_signal_safe.
+	  (rb_exec_err): call before_exec_non_async_signal_safe instead of
+	  before_exec.
+
+Sat Jun  9 23:36:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (iseq_load, insn_operand_intern, rb_iseq_disasm)
+	  (rb_iseq_parameters): use rb_id2str() instead of rb_id2name() to
+	  keep encoding.
+
+	* string.c (rb_str_symname_p): new function that checks if the string
+	  is valid as a symbol name.  split from sym_inspect().
+
+Sat Jun  9 22:27:05 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (retry_fork): rewrite a complex "for" statement by
+	  simple statements.
+
+Sat Jun  9 21:50:04 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (retry_fork): extracted from rb_fork_err.
+	  (send_child_error): ditto.
+	  (recv_child_error): ditto.
+
+Sat Jun  9 17:21:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (iseq_load): type is a symbol, and invalid as ID in common.
+
+Sat Jun  9 10:57:14 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_async_signal_safe): extracted from rb_exec_err.
+
+Sat Jun  9 09:31:07 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: simplified because close_others option is always
+	  enabled by default.
+	  (rb_f_exec): don't need to set the option.
+	  (rb_exec_arg_prepare): don't need to set the option.  don't need
+	  default_close_others argument.
+	  (rb_spawn_internal): don't need to give default_close_others
+	  argument for rb_exec_arg_prepare.  don't need default_close_others
+	  argument.
+	  (rb_spawn_err): don't need to give default_close_others
+	  argument for rb_spawn_internal.
+	  (rb_spawn): don't need to give default_close_others
+	  argument for rb_spawn_internal.
+	  (rb_f_system): don't need to give default_close_others argument for
+	  rb_spawn_internal.
+	  (rb_f_spawn): don't need to give default_close_others argument for
+	  rb_exec_arg_prepare.
+
+Sat Jun  9 09:00:58 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_proc_exec): call before_exec() here addition to
+	  rb_exec_err.
+
+Sat Jun  9 08:30:52 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (ruby_init_stack): use stack info if possible.
+
+Sat Jun  9 08:21:32 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* README.EXT (prepare extconf.rb):  Added note to see MakeMakefile for
+	  documentation of extconf.rb functions.  Patch by Zachary Scott.
+	  [ruby-trunk - Feature #6522]
+	* README.EXT (Appendix C):  Removed in favor of MakeMakefile.
+	  Patch by Zachary Scott.
+	* lib/mkmf.rb:  Merged documentation from README.EXT Appendix C.  Patch
+	  by Zachary Scott.
+
+Sat Jun  9 08:16:47 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/re.rdoc:  Completed wording in the description of the =~ operator.
+	  [ruby-trunk - Bug #6529]
+
+Sat Jun  9 08:09:38 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* string.c (rb_str_start_with):  Removed "p" from start_with? examples
+	  to match other String method examples.  [ruby-trunk - Bug #6553]
+	* string.c (rb_str_end_with):  Updated end_with? to use code markup
+	  instead of italic.
+
+Sat Jun  9 07:56:03 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/benchmark.rb:  Updated formatting of Benchmark documentation for
+	  consistency.  [ruby-trunk - Bug #6533]
+
+Sat Jun  9 07:46:26 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/delegate.rb:  Added documentation for Delegator#!.  Patch by
+	  Zachary Scott.  [ruby-trunk - Feature #6534]
+
+Sat Jun  9 07:39:50 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http/responses.rb:  Add RFC 6585 response codes.  Patch by
+	  Sangil Jung.  [ruby-trunk - Feature #6480]
+	* lib/net/http/response.rb:  ditto
+	* lib/net/http.rb:  ditto
+	* lib/webrick/httpstatus.rb:  ditto
+
+Sat Jun  9 01:24:28 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_err): before_exec() call moved from proc_exec_cmd
+	  and proc_exec_sh.
+	  (rb_proc_exec): ditto.
+
+Sat Jun  9 01:11:07 2012  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_exec_arg_init): declaration changed to
+	  return a value.
+
+	* process.c (rb_exec_arg_init): return a value.
+
+Fri Jun  8 23:44:14 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: don't check the availability of FD_CLOEXEC.  It should
+	  be available if fork() is available.
+
+	* io.c: ditto.
+
+Fri Jun  8 22:39:32 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork_err): revert r35955.  The condition needs !chfunc
+	  to close ep[0] and ep[1].  The catched exception is re-raised
+	  immediately after that if status is not NULL.
+
+Fri Jun  8 19:43:33 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_err): after_exec() call moved from proc_exec_cmd
+	  and proc_exec_sh.
+	  (rb_proc_exec): ditto.
+
+Fri Jun  8 19:00:59 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (ARGV_COUNT): unused macro removed.
+	  (ARGV_SIZE): ditto.
+	  (ALLOC_ARGV): ditto.
+	  (ALLOC_ARGV_WITH_STR): ditto.
+
+Fri Jun  8 16:19:33 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/runner.rb (src_testdir): expand real path so that
+	  TestGem#test_self_find_files does not fail by aliased load path when
+	  srcdir contains a symbolic link.
+
+	* tool/runruby.rb (srcdir): ditto.
+
+Fri Jun  8 12:04:39 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_fork_err): error state in the child process is prior
+	  to exceptions in proc_syswait().
+
+	* process.c (rb_fork_err): determine status on errors.
+
+	* ext/pty/pty.c (establishShell): reraise exception if something
+	  raised during sleep.
+
+	* ext/pty/pty.c (establishShell): now needs status to protect from
+	  exceptions in rb_fork_err().
+
+Thu Jun  7 22:13:05 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork_err): Fix the condition to use rb_protect.
+
+Thu Jun  7 20:29:12 2012  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h: rb_exec_arg and related stuff moved back from
+	  internal.h
+
+Thu Jun  7 15:53:03 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* .gdbinit: add function `trace_machine_instructions' to trace
+	  in native machine assemble.
+	  See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/MachineInstructionsTraceWithGDB
+	  for more details.
+
+Wed Jun  6 21:31:21 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (proc_exec_cmd) renamed from proc_exec_v.
+	  (proc_exec_sh): renamed from rb_proc_exec_e.
+	  (proc_spawn_cmd_internal): renamed from proc_spawn_v.
+	  (proc_spawn_cmd): renamed from proc_spawn_n.
+	  (proc_spawn_sh): renamed from proc_spawn.
+
+Wed Jun  6 21:18:47 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (try_with_sh): please take care of the macro defined by
+	  you.
+
+Wed Jun  6 20:45:08 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (proc_exec_v): don't call dln_find_exe_r here because it
+	  is not async-signal-safe and proc_exec_v is called in a child
+	  process.
+	  command_abspath field of rb_exec_arg.
+	  (rb_exec_fillarg): call dln_find_exe_r and set command_abspath.
+	  (rb_exec_err): Give the absolute path of the invoking command for
+	  proc_exec_v, instead of the command name.
+
+	* internal.h: add command_abspath field for rb_exec_arg.
+
+Wed Jun  6 20:08:01 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (try_with_sh): take envp argument.
+	  (exec_with_sh): ditto.  use it for execve.
+	  (proc_exec_v): provide envp for try_with_sh.
+
+Wed Jun  6 13:25:04 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (rb_w32_wrap_io_handle): new API.
+	  this API wraps an I/O handle (HANDLE or SOCKET) and returns fd.
+	  the second parameter should be combination of O_*, for example,
+	  O_RDWR | O_BINARY | O_NOINHERIT.
+
+	* win32/win32.c, include/ruby/win32.h (rb_w32_unwrap_io_handle): new
+	  API.  this API unwraps an I/O handle and close the fd (not closes
+	  the handle itself).
+
+	[Feature #4906] [ruby-core:37227]
+
+Wed Jun  6 13:18:26 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_close): of course, console handle is not socket.
+
+Wed Jun  6 12:37:43 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (rb_run_exec_options_err): allocate a temporary buffer for
+	  run_exec_dup2() for restoring fds on non-fork environments.
+
+Wed Jun  6 09:45:21 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/dl/test_c_{struct_entry,union_entity}.rb: sorry, typos.
+
+Wed Jun  6 05:27:54 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_fillarg): check use_shell field before accessing
+	  a union field.
+
+Wed Jun  6 04:58:44 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_spawn_process): prog variable is not used for Unix.
+
+Wed Jun  6 00:20:37 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_exec_arg_init): change return type to void.
+
+	* process.c (rb_exec_arg_init): don't return a value.
+	  (rb_exec_arg_prepare): ditto.
+	  (rb_spawn_process): don't take the prog argument.  extract the
+	  information from earg.
+	  (rb_spawn_internal): follow rb_spawn_process change.
+	  (rb_f_spawn): ditto.
+
+	* io.c (pipe_open): don't take the prog argument.  extract the
+	  information from eargp.
+	  (pipe_open_v): follow pipe_open change.
+	  (pipe_open_s): ditto.
+
+Tue Jun  5 23:51:33 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_exec_arg): use union to represent command invocation
+	  with/without shell.
+
+	* process.c: follow the rb_exec_arg change.
+
+	* io.c (pipe_open): ditto.
+
+Tue Jun  5 22:28:46 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h: rb_exec_arg and related stuff moved from intern.h
+
+	* include/ruby/intern.h (rb_proc_exec_n): removed.
+
+Tue Jun  5 21:57:22 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_arg_fixup): allocate a temporary buffer for
+	  run_exec_dup2 here because it should be async-signal-safe.
+	  (run_exec_dup2): use the temporary buffer.
+	  (run_exec_dup2_tmpbuf_size): new function.
+
+	* include/ruby/intern.h (rb_exec_arg): add dup2_tmpbuf field.
+
+Tue Jun  5 20:13:15 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_obj_init_copy): should check if trusted too.
+
+Tue Jun  5 19:59:13 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (strtok): declaration removed because it is not used.
+
+Tue Jun  5 19:33:51 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (proc_spawn): don't detect simple command line here
+	  because rb_exec_fillarg already did.
+
+Tue Jun  5 19:21:10 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_fillarg): bail out a loop eagerly.
+
+Tue Jun  5 19:15:14 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: add comments about async-signal-safe.
+
+	* io.c: ditto.
+
+Tue Jun  5 09:25:10 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* io.c:  Edited documentation for IO and File open and new and
+	  Kernel#open for consistency and clarity.
+
+Mon Jun  4 21:53:56 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_sysinit): let the system not display the
+	  critical-error-handler message box and the Windows Error Reporting
+	  dialog.  [ruby-core:45389] [Bug #6535]
+
+Mon Jun  4 19:36:25 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_fillarg): allocate one more element before
+	  beginning in argv_str for try_with_sh.
+
+	* internal.h (ARGVSTR2ARGC): adjust for the above change.
+	  (ARGVSTR2ARGV): ditto.
+
+Mon Jun  4 19:17:06 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (ARGVSTR2ARGC): defined.
+	  (ARGVSTR2ARGV): defined.
+
+	* process.c (proc_exec_v): use ARGVSTR2ARGV.
+	  (rb_spawn_process): use ARGVSTR2ARGC and ARGVSTR2ARGV.
+
+	* io.c (pipe_open): use ARGVSTR2ARGV.
+
+Mon Jun  4 16:13:00 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.h: remove magical code "lfp[0] & 0x02".
+	  Current VM doesn't use this bit.
+
+	* vm_core.h (RUBY_VM_GET_BLOCK_PTR): added.
+
+	* eval.c (rb_block_given_p): use RUBY_VM_GET_BLOCK_PTR().
+
+	* vm_eval.c (rb_f_block_given_p): ditto.
+
+Mon Jun  4 15:39:33 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (constat_apply): apply VT100 functions.
+	  [ruby-core:44958] [Feature #6418]
+
+	* win32/win32.c (constat_parse): parse some VT100 escape sequence.
+
+Mon Jun  4 14:06:12 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (rb_exec_err): should preserve errno.
+
+Mon Jun  4 13:10:11 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/dl/test_c_{struct_entry,union_entity}.rb: broken require.
+
+Mon Jun  4 12:01:21 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_backtrace.rb: fix test.
+	  Windows path includes `:' character.
+
+Mon Jun  4 11:42:39 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h (rb_location_t): fix type and field name.
+	  (1) rename rb_location_t to rb_iseq_location_t.
+	  (2) rename field names of rb_iseq_location_t to adjust
+	      RubyVM::Backtrace::Location methods.
+	      (2-1) filename -> path
+	      (2-2) filepath -> absolute_path
+	      (2-3) basename -> base_label
+	      (2-4) name -> label
+	  (3) rename filed name rb_iseq_location_t#line_no to
+	      rb_iseq_location_t#first_lineno to clear purpose of this field.
+	  (4) The field names rb_binding_t#(filename|line_no) are also renamed
+	      to rb_binding_t#(path|first_lineno).
+
+	* compile.c: apply above changes.
+
+	* iseq.c: ditto.
+
+	* proc.c: ditto.
+
+	* vm*.c: ditto.
+
+Mon Jun  4 11:40:28 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): also load TYPE_USRMARSHAL, TYPE_DATA using
+	  compatible loader.
+
+Mon Jun  4 11:33:42 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (rb_run_exec_options_err): restore save_env() call for
+	  non-fork environments.
+
+	* process.c (rb_exec_err): restore environments after the failure of
+	  exec to fix [ruby-core:44093] [Bug #6249] on non-fork environments
+
+Mon Jun  4 10:42:04 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (pipe_open): follow up changes in r35889.
+
+	* process.c (proc_spawn_n): now uses char ** instead of VALUE *.
+
+	* process.c (rb_spawn_process): prog is now VALUE of String, not char *.
+
+Mon Jun  4 06:12:43 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): remove old warning for _alloc.
+
+Mon Jun  4 04:24:06 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* marshal.c: experimental test aborted.
+	* complex.c: ditto.
+	* rational.c: ditto.
+	* include/ruby/intern.h: ditto.
+
+Mon Jun  4 00:45:18 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_spawn_process): fix for Windows.  not tested.
+
+Mon Jun  4 00:11:51 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_proc_exec_e): don't use ISSPACE().  \f, \r and \v
+	  are not word separator in Bourne shell.
+
+Sun Jun  3 23:47:30 2012  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_exec_arg): remove argc and argv fields.
+	  add use_shell, argv_str and argv_buf fields.
+
+	* process.c (rb_proc_exec_e): don't split shell command line arguments
+	  here to avoid memory allocation in a child process.
+	  (rb_exec_fillarg): split shell command line arguments here.
+	  (proc_exec_v): takes argv_str argument instead of argv.
+	  (rb_proc_exec_ne): removed.
+	  (rb_proc_exec_n): removed.
+	  (rb_run_exec_options_err): don't initialize the removed fields.
+	  (rb_exec_err): don't initialize the removed fields.
+	  call proc_exec_v directly instead of rb_proc_exec_ne.
+	  (rb_spawn_process): use use_shell field.
+
+Sun Jun  3 21:53:00 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* GPL: update text of GPLv2. [ruby-core:44488] [Bug #6328]
+	  http://www.gnu.org/licenses/gpl-2.0.txt
+
+Sun Jun  3 21:22:52 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_exec_getargs): remove rb_exec_arg argument.
+
+Sun Jun  3 21:14:26 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* marshal.c: calls directly rb_{Complex,Rational}_marshal_load().
+	  But now disabled. [experimental]
+	* complex.c: followed the above.
+	* rational.c: ditto.
+	* include/ruby/intern.h: ditto.
+
+Sun Jun  3 21:18:17 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_check_argv): use rb_str_new_frozen instead of
+	  rb_str_new4.
+
+Sun Jun  3 20:10:52 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_proc_exec_e): extended version of rb_proc_exec() to
+	  call execle().
+	  (rb_proc_exec): use rb_proc_exec_e().
+	  (rb_exec_err): use rb_proc_exec_e().
+
+Sun Jun  3 19:47:18 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread.c (vm_living_thread_num): suppress a warning.
+
+Sun Jun  3 17:23:52 2012  Tanaka Akira  <akr@fsij.org>
+
+	* use execve() to preserve environment variables when exec method is
+	  failed.  [ruby-core:44093] [ruby-trunk - Bug #6249]
+
+	* include/ruby/intern.h (rb_exec_arg): add envp_str and envp_buf field
+	  to store envp of execve().
+
+	* process.c (proc_exec_v): takes envp_str as an argument and use it
+	  for execve().
+	  (rb_proc_exec_ne): extended version of rb_proc_exec_n().
+	  (rb_proc_exec_n): use rb_proc_exec_ne().
+	  (rb_proc_exec): follow proc_exec_v() change.
+	  (fill_envp_buf_i): new function.
+	  (rb_exec_arg_fixup): set up envp_str and envp_buf.
+	  (save_env_i): removed.
+	  (save_env): removed.
+	  (rb_run_exec_options_err): don't modify environment variables.
+	  (rb_exec_err): use rb_proc_exec_ne().
+
+Sun Jun  3 16:33:58 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c: revert r35879 "now marshal_{load|dump} are external."
+
+	* complex.c (nucomp_marshal__{dump,load}): should use rb_marshal_{dump,load}.
+
+	* rational.c (nurat_marshal__{dump,load}): ditto.
+
+Sun Jun  3 14:13:58 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: checks whether the object is frozen or not.
+
+Sun Jun  3 14:00:51 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: wrote Complex#_dump and Complex::load.  But now
+	  disabled (due to compatibility) [experimental].
+
+	* rational.c: wrote Rational#_dump and Rational::load. ditto.
+
+Sun Jun  3 10:23:32 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_marshal_load): [ruby-core:45394]
+	* rational.c (nurat_marshal_load): ditto.
+
+Sun Jun  3 03:15:46 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (onig_number_of_names): suppress a warning.
+
+Sun Jun  3 01:36:52 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c: change names.
+	  (1) Class name: RubyVM::FrameInfo -> RubyVM::Backtrace::Location.
+	  (2) Method name: RubyVM::FrameInfo.caller ->
+	      Kernel.caller_locations.
+	  (3) Instance methods of
+	      RubyVM::FrameInfo (RubyVM::Backtrace::Location)
+	      (3-1) name -> label
+	      (3-2) basename -> base_label (basename is confusing with
+		    File.basename)
+	      (3-3) line_no -> lineno (We have already similar name
+		    File#lineno, commented by kou [ruby-dev:45686]).
+	      (3-4) filename -> path.
+	      (3-5) filepath -> absolute_path.
+	      (3-5) iseq -> removed (we will make other APIs to access iseq
+		    and other information of frame for debugging).
+
+	* test/ruby/test_backtrace.rb: apply above changes.
+	  And apply comment from kou [ruby-dev:45686].
+
+Sun Jun  3 00:49:11 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: fix to build vm_backtrace.c only itself (vm_backtrace.c
+	  is no longer included from vm.c).  I hope this separation reduce
+	  compile time of vm.c.
+
+	* internal.h: ditto.
+
+	* vm.c, vm_core.h, vm_dump.c, vm_eval.c: ditto.
+
+	* vm_eval.c: some functions (callee, etc) moved to vm_backtrace.c.
+
+Sun Jun  3 00:20:53 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c: added.  Separate backtrace related functions to
+	  this file.
+
+	* vm.c, common.mk: ditto.
+
+Sat Jun  2 18:09:02 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/ipaddr.rb: Inhibit zero-filled octets in an IPv4 address in
+	  all platforms. [ruby-dev:45671]
+
+	* lib/ipaddr.rb: Allow the x:x:x:x:x:x:d.d.d.d form not limited to
+	  IPv4 mapped/compatible addresses.  This change also makes it
+	  possible for the parser to understand IPv4 mapped and compatible
+	  IPv6 addresses in non-compressed form.
+
+	* lib/ipaddr.rb: Stop exposing IPSocket.valid*? methods which were
+	  only usable on non-IPv6-ready platforms.
+
+Sat Jun  2 16:59:00 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_enc_cr_str_buf_cat): don't reset coderange as unknown.
+	  the condition 'ptr_a8 && str_cr != ENC_CODERANGE_7BIT' means not
+	  unknown, str is also ASCII-8BIT because str_encindex == ptr_encindex,
+	  and nont (str_cr == ENC_CODERANGE_UNKNOWN) and
+	  str_cr != ENC_CODERANGE_7BIT means str_cr is valid because ASCII-8BIT
+	  can't be broken. [ruby-dev:45688] [Bug #6509]
+
+Sat Jun  2 07:04:48 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/re.rdoc (Performance):  Replaced incorrect example of reducing
+	  backtracking through anchoring with reduced backtracking through a
+	  range.  [ruby-trunk - Bug #6525]
+
+Sat Jun  2 06:34:15 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/re.rdoc (Performance):  Removed useless sample output from final
+	  performance example and switched from #match to #=~ for consistency.
+	  [ruby-trunk - Bug #6524]
+
+Fri Jun  1 09:30:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (class_or_module_required): extract check for class or
+	  module.
+
+Fri Jun  1 08:50:47 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* array.c:  Updated Array documentation formatting.  Patch by Zachary
+	  Scott.  [ruby-trunk - Feature #6517]
+
+Fri Jun  1 06:57:10 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/dl/lib/dl/struct.rb (DL::CStructEntity#set_ctypes):  Refactored
+	  #set_ctypes using newer ruby features to simplify its implementation.
+	* test/dl/test_c_struct_entry.rb (class DL):  Test to verify
+	  refactoring.
+
+Fri Jun  1 06:40:25 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c (Init_Object):  Restored Kernel documentation based on
+	  Pickaxe book documentation.  Patch by Zachary Scott.
+	  [ruby-trunk - Feature #6521]
+
+Fri Jun  1 06:29:42 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c (rb_equal):  Let Object be a link in #=== documentation.
+	  Patch by Zachary Scott.  [ruby-trunk - Feature #6518]
+
+Thu May 31 09:27:06 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/dl/lib/dl/struct.rb (DL::CStructEntity::size):  Refactored ::size
+	  to remove unused variables and simplify using newer ruby features.
+	* test/dl/test_c_struct_entry.rb:  Test to validate refactoring
+
+Thu May 31 08:40:34 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/dl/lib/dl/struct.rb (DL::CUnionEntity#set_ctypes):  Refactored
+	  #set_types to reuse DL::CUnionEntity::size
+	* test/dl/test_c_union_entity.rb:  Added test
+
+Thu May 31 08:20:14 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/dl/lib/dl/struct.rb (DL::CUnionEntity::size):  Fixed ::size to
+	  return the size of the union.
+	* test/dl/test_c_union_entity.rb:  Test for DL::CUnionEntity::size
+
+Thu May 31 07:45:43 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/dl:  Added documentation.  Patch by Vincent Batts.
+	  [ruby-trunk - Bug #6496]
+
+Wed May 30 16:30:00 2012  Kenta Murata  <mrkn@cookpad.com>
+
+	* ext/bigdecimal/lib/bigdecimal/jacobian.rb,
+	  ext/bigdecimal/lib/bigdecimal/newton.rb:
+	  fix documentation comments.
+	  Patch by alperakgun from github.com/shyouhei/ruby/pull/8
+
+Wed May 30 16:20:00 2012  Kenta Murata  <mrkn@cookpad.com>
+
+	* ext/bigdecimal/lib/bigdecimal/jacobian.rb (Jacobian#dfdxi):
+	  fix jacobian to get stuck in an infinite loop when a solution is not
+	  found due to forget to increment nRetry counter.
+	  Patch by alperakgun from github.com/shyouhei/ruby/pull/8
+
+Wed May 30 10:58:31 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (utc_offset_arg): utc offset can be precision in seconds.
+	  e.g. old Europe/Lisbon (c.f. [ruby-dev:40066])
+
+Wed May 30 06:20:29 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* error.c (exc_set_backtrace):  Updated documentation to indicate
+	  set_backtrace allows a string as well as an array of strings.
+	  [ruby-trunk - Bug #6501]
+
+Tue May 29 17:28:20 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (rb_strftime_with_timespec): support GNU extension triple
+	  colons modifier.  [EXPERIMENTAL]
+
+	* strftime.c (rb_strftime_with_timespec): check conversion with locale
+	  modifier.
+
+	* strftime.c (rb_strftime_with_timespec): colons are valid only for
+	  'z' and must come just before it.
+
+Mon May 28 16:56:55 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#_prepare_run): StatusLineOutput
+	  needs job_status to be :replace.
+
+Mon May 28 13:35:33 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (do-install-*): fix dependencies.  based on the patch by
+	  nagachika at [ruby-dev:45683].  [Bug #6506]
+
+Mon May 28 12:03:04 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (obj_free): doesn't free a method table if it doesn't
+	  exist. [ruby-dev:44436]
+	* test/ruby/test_gc.rb (class TestGc): added the test case for
+	  this issue.
+
+Sun May 27 23:37:48 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm1_lvar_init.rb: added.
+	  This benchmark measures a initialize time of non-used variable.
+
+	* benchmark/bm_vm1_lvar_set.rb: added.
+	  This benchmark measures a local variables initialization time.
+
+	* benchmark/bm_vm2_bigarray.rb: added.
+	  This benchmark mesures a big array literal creation time.
+
+	* benchmark/bm_vm2_bighash.rb: added.
+	  This benchmark mesures a big hash literal creation time.
+
+	* benchmark/bm*: change notation "i=0" to "i = 0".
+
+Sun May 27 13:33:26 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: fix to continue benchmarks when
+	  an error is occurred.
+
+Sun May 27 11:27:50 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#_prepare_run): fix operator
+	  precedence, so that platform and TERM should be counted.
+
+Sun May 27 10:02:33 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strftime.c: allows %Ok and %Ol.
+
+Sun May 27 09:29:20 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: modified doc.
+
+Sat May 26 19:04:34 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: added description.
+
+Sat May 26 18:14:57 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strftime.c: reduced the code.
+
+Sat May 26 18:08:59 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* time.c: modified doc.
+	* ext/date/date_core.c: ditto.
+
+Sat May 26 17:05:45 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (backtrace_*): change type of lev and n from size_t to int.
+	  Also set type of rb_backtrace_t#backtrace_size to int.
+	  A patch from nobu.
+
+	* vm_eval.c: ditto.
+
+Sat May 26 16:26:30 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (realpath_rec): UNC prefix does not end with path separator,
+	  so new separator is needed after it.
+
+Sat May 26 15:29:22 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_backtrace.rb (test_caller_lev):
+	  decrease recursion size.
+
+Sat May 26 13:50:48 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* NEWS: add Kernel#caller's second argument.
+
+Sat May 26 13:40:29 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (RubyVM::FrameInfo): add a class to access each frame
+	  information.  You don't need to parse strings from caller().
+	  FrameInfo has the following methods:
+	    FrameInfo#name: method name, class name, etc with decorations.
+	    FrameInfo#basename: name without decorations.
+	    FrameInfo#line_no: line number.
+	    FrameInfo#filename: file name.
+	    FrameInfo#filepath: full filepath.
+	    FrameInfo#iseq: iseq if it is iseq frame (defined by ruby script)
+	    FrameInfo#to_s: return caller() method style string.
+	  RubyVM::FrameInfo.caller(n, lev) returns array of FrameInfo objects.
+	  The name "RubyVM::FrameInfo.caller" is long and ambiguous (it is
+	  confusing with Kernel::caller() method), we need to change the name
+	  before Ruby 2.0 release. Good names or comments are welcome.
+
+	* test/ruby/test_backtrace.rb: add a test for above change.
+
+Sat May 26 12:18:09 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (frame_info_to_str): add `break'.
+
+	* vm.c (backtrace_object): remove lev and n parameter.
+	  backtrace_object always returns all of backtrace information.
+
+	* vm.c (rb_backtrace_to_str_ary): fix to use backtrace_object().
+	  This change improve performance of caller(lev, n).
+
+	* benchmark/bm_vm3_backtrace.rb: added to check above improvement.
+	  FYI: measurement on my laptop, 1.9.3p229 needs 5.125 sec,
+	  and current trunk only needs 0.299sec.
+
+Sat May 26 11:05:09 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (rb_frame_info_t): keep previous ISEQ frame info for CFUNC
+	  frame info.  And fix to cache a calculated line_no of ISEQ frame
+	  info.
+
+Sat May 26 09:54:53 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_ssl.c: Allow disabling client-side renegotiation.
+	* test/openssl/test_ssl.rb: Simple tests for this.
+
+	  Client-side renegotiation is still considered problematic, even
+	  when used in the context of secure renegotiation (RI, RFC 5746).
+	  The changes allow users to either completely disable client
+	  renegotiation on the server, or to specify a maximum number of
+	  handshakes allowed in total. The number of total handshakes is
+	  counted in a callback set as SSL_set_info_callback. If the
+	  maximum number of handshakes is exceeded an error will be raised
+	  We do not support renegotiation in the OpenSSL extension, therefore
+	  this feature can only be tested externally.
+	  The feature is opt-in, the default setting will be to allow
+	  unlimited client renegotiation, as was the case before.
+
+Fri May 25 23:38:58 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_ssl.rb: Clarify the intention of errors to be
+	  expected. Two errors are possible when connection is refused due
+	  to a protocol version that was explicitly disallowed,
+	  OpenSSL::SSL::SSLError or Errno::ECONNRESET, depending on the
+	  OpenSSL version in use.
+
+Fri May 25 22:19:40 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_ssl.c: Revert r35583
+	* test/openssl/test_ssl.rb: Handle ECONNRESET in code instead to avoid
+	  the test failing in Ruby CI [1]
+
+	[1] http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120507T190102Z.log.html.gz#test-all
+
+Fri May 25 19:51:36 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c (rb_f_caller): caller() method accepts second optional
+	  argument `n' which specify how many frames should return.
+	  For example, `caller(0, 1)' returns only one frame information
+	  which calls caller() method.  If there are less than n frame
+	  information, then all frame information are returned.  If n is 0,
+	  then always return [].
+	  This fix is part of [ruby-dev:42345] [Ruby 1.9-Feature#3917].
+	  However, performance and features are not enough.
+	  RDoc is also not available.
+
+	* test/ruby/test_backtrace.rb: add a test for above.
+
+Fri May 25 17:05:07 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (oldbt_init, vm_backtrace_str_ary): arg->data should
+	  be initialized before calling `backtrace_each()'.
+
+Fri May 25 16:11:27 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* trunk/ext/-test-/printf/printf.c: change function names because of
+	  conflict with msvcrt.  fixed build error of mswin.
+
+Fri May 25 10:52:52 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c: refactoring backtrace related functions.
+	  (1) unify similar functions (rb_backtrace_each() and
+	      backtrace_object()).  backtrace_each() is a unified function.
+	      variation:
+	      a) backtrace_object(): create backtrace object.
+	      b) vm_backtrace_str_ary(): create bt as an array of string.
+	      c) vm_backtrace_print(): print backtrace to specified file.
+	      d) rb_backtrace_print_as_bugreport(): print backtrace on
+	                                            bugreport style.
+	  (2) remove rb_backtrace_each().  Use backtrace_each() instead.
+	  (3) change the type of lev parameter to size_t.
+	      a) lev == 0 means current frame (exception, etc use it).
+	      b) lev == 1 means upper frame (caller(0) use it).
+
+	* vm_core.h, vm_dump.c, vm_eval.c: ditto.
+
+	* vm.c (backtrace_object(), vm_backtrace_str_ary()): fix to return a
+	  correct size of caller(lev) array.
+	  Let n be a "caller(0).size" then ln as caller(lev).size should be
+	  (n - lev).  However, the previous implementation returns a wrong
+	  size array (ln > n - lev).  [ruby-dev:45673]
+
+	* test/ruby/test_backtrace.rb: add tests for backtrace.
+
+Fri May 25 08:51:39 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* enum.c (enum_count):  Enumerable#count no longer uses #size when
+	  counting elements.  Patch by Nobuhiro IMAI.  [ruby-trunk - Bug #6473]
+
+Fri May 25 01:15:39 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (ruby__sfvextra): [EXPERIMENTAL] use inspect instead of
+	  to_s if plus flag is given.
+
+	* vsnprintf.c (BSD_vfprintf): pass sign flag.
+
+Fri May 25 00:37:22 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rubygems/test_gem_indexer.rb (setup, teardown): save @tempdir
+	  to remove it properly.  [Bug #5348]
+
+Thu May 24 23:36:51 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): [EXPERIMENTAL] object representation in
+	  rb_enc_vsprintf(). [Feature #5896]
+
+Thu May 24 15:33:01 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_method.c (rb_method_defined_by): removed.
+	  nobu pointed out that rb_method_basic_definition_p() is enough
+	  for last commit.
+
+	* error.c, eval_error.c: change for above.
+
+Thu May 24 14:30:13 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c: add RubyVM::Backtrace object (btobj).
+	  Backtrace information contains an array consists of location
+	  information for each frames by string.
+	  RubyVM::Backtrace object is lightweight backtrace information,
+	  which contains complete information to generate traditional style
+	  backtrace (an array of strings) with faster generation.
+	  If someone accesses to backtrace information via
+	  Exception#backtrace, then convert a RubyVM::Backtrace object to
+	  traditional style backtrace.
+	  This change causes incompatibility on marshal dumped binary
+	  of Exception.  If you have any trouble on it, please tell us
+	  before Ruby 2.0 release.
+	  Note that RubyVM::Backtrace object should not expose Ruby level.
+
+	* error.c, eval.c, vm_eval.c: ditto.
+
+	* internal.h: ditto.
+
+	* eval_error.c: fix to skip "set_backtrace" method invocation in
+	  creating an exception object if it call a normal set_backtrace
+	  method (defined by core).
+
+	* test/ruby/test_settracefunc.rb: fix for above change.
+
+	* vm_method.c (rb_method_defined_by): added.  This function
+	  checks that the given object responds with the given method
+	  by the given cfunc.
+
+	* benchmark/bm_vm2_raise1.rb, benchmark/bm_vm2_raise2.rb:
+	  add to measure exception creation speed. raise1 create
+	  exception objects from shallow stack frame.  raise2 create
+	  exception objects from deep stack frame.
+
+Thu May 24 12:07:46 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_strip_bom): check EOF.  [Bug #6487][ruby-core:45203]
+
+Wed May 23 22:06:14 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/header.rb (Net::HTTPHeader#range): fix broken parser of
+	  HTTP Range request. Old one can't parse invalid specs and multiple
+	  specs correctly.
+
+Wed May 23 10:18:54 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (finish_overlapped_socket, overlapped_socket_io):
+	  replace ECONNABORTED to EPIPE in send, sendto and sendmsg to improve
+	  BSD socket compatibility.  this change removes a failure on the test
+	  of net/ftp.
+
+Wed May 23 05:35:58 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Broke up Net::HTTP into individual files.
+	  [ruby-trunk - Feature #6435]
+	* lib/net/http/backward.rb:  ditto.
+	* lib/net/http/response.rb:  ditto.
+	* lib/net/http/exceptions.rb:  ditto.
+	* lib/net/http/responses.rb:  ditto.
+	* lib/net/http/generic_request.rb:  ditto.
+	* lib/net/http/header.rb:  ditto.
+	* lib/net/http/request.rb:  ditto.
+	* lib/net/http/proxy_delta.rb:  ditto.
+	* lib/net/http/requests.rb:  ditto.
+
+Wed May 23 05:15:11 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* class.c (rb_mod_init_copy):  Clear the cached inspect string of a
+	  dup'd anonymous module or class.  [ruby-trunk - Bug #6454]
+	* test/ruby/test_module.rb (class TestModule):  ditto
+
+Tue May 22 16:49:15 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: add a data type rb_location_t to store iseq location
+	  information.
+	  rb_location_t#filename, filepath, name and line_no was moved from
+	  rb_iseq_t.  rb_location_t#basename is a new field which is
+	  similar to `name' field without any decoration.
+	  `name' field contains some decoration such as `block in foo'.
+	  `basename' only contains `foo'.
+	  rb_iseq_t contains memory object of rb_location_t.
+
+	* iseq.c: setup rb_location_t for each rb_iseq_t memory objects.
+
+	* compile.c, proc.c, vm.c, vm_dump.c, vm_eval.c, vm_insnhelper.c,
+	  vm_method.c: support about it.
+
+Tue May 22 00:45:05 2012  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* struct.c (rb_struct_members): Refactoring.  As Struct#members had
+	  returned an array of String, the old code was needed to convert
+	  Symbols to Strings.  But it is almost unnecessary because the
+	  method now returns an array of Symbols.  A patch by Masaki
+	  Matsushita <glass.saga at gmail dot com>  [Feature #6218]
+	  [ruby-dev:45451]
+
+Mon May 21 19:20:25 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/ftp.rb (Net::FTP#retrbinary): close only if conn is not nil
+	  because transfercmd may fail and return nil.
+
+	* lib/net/ftp.rb (Net::FTP#retrlines): ditto.
+
+Mon May 21 15:10:28 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/syslog.c: Classify constants and macros into several
+	  sub-modules. (Syslog::Priority, Syslog::Level, Syslog::Option
+	  and Syslog::Macros)
+
+	* ext/syslog/syslog.c (mSyslog_inspect): Use rb_sprintf().
+
+	* ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a
+	  module before calling rb_class2name().
+
+Mon May 21 12:44:11 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* .travis.yml (install): It seems tcl/tk is skipped in Travis
+	  CI. Trying to fix the situation.
+
+Mon May 21 12:11:25 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend (ENCOBJS): add dependencies.
+
+	* enc/make_encmake.rb (target_encodings): extract dependencies.
+
+Mon May 21 11:26:17 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/ftp.rb (Net::FTP#transfercmd): rescue shutdown.
+
+Sun May 20 23:00:11 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): reopen $stdout to NULL, since setting
+	  $stdout cannot affect child processes.
+
+Sun May 20 21:36:39 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/shift_jis.c (code_to_mbclen): return
+	  ONIGERR_INVALID_CODE_POINT_VALUE if the code is invalid.
+
+	* string.c (tr_next): increment character until the code
+	  is a valid character. [ruby-dev:45652] [Bug #6450]
+
+Sun May 20 12:25:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (LIBRUBY_SO): link EXTSOLIBS too.
+
+	* ext/extmk.rb (mf.macro): use EXTSOLIBS instead of SOLIBS to get rid
+	  of discard libraries needed by default.  [Bug #6462]
+
+Sat May 19 19:04:38 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (command_output): ENCOBJS is needed for all linked
+	  ruby, if --disable-shared and --with-static-linked-ext.
+
+	* ext/extmk.rb (command_output): dmyext is needed as DLDOBJS if no
+	  static linked extensions.
+
+	* Makefile.in, common.mk (PROGRAM): no extension libraries.
+
+	* common.mk (build-ext): pass macros for libruby.so.
+
+	* ext/extmk.rb (command_output): link extension libraries and encoding
+	  libraries into libruby.so, not ruby executable.
+
+	* ext/extmk.rb (command_output): fold long macro lines.
+
+	* Makefile.in (LIBEXT): add macro.
+
+	* configure.in (ENCOBJS, EXTOBJS): use LIBEXT, not hardcoded suffix.
+
+	* Makefile.in (LIBRUBY_A): fix typo.  re-applying r35242.
+
+Sat May 19 04:46:53 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/openssl/extconf.rb: Use Logging::message instead of message.
+	* ext/zlib/extconf.rb: ditto.
+
+Fri May 18 18:13:44 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#configuration): keep space at end of
+	  OUTFLAG and COUTFLAG.  [ruby-dev:45650]
+
+Fri May 18 17:39:42 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): Added error
+	  check when failing fcntl(). [Bug #6147] [ruby-dev:45364]
+
+Fri May 18 17:41:00 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): link archives only, skip script only
+	  extension libraries.
+
+Fri May 18 17:25:33 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* cont.c: bump up fiber machine stack size when running on 64bit
+	  arch. [Bug #6344] [ruby-dev:45554]
+
+Fri May 18 15:20:56 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic.build): duplicate args before adding
+	  new items. (don't change arguments)
+
+	* lib/uri/generic.rb (URI::Generic.build): use URI::Generic::COMPONENT
+	  if this method is called from URI::Generic.
+
+	* lib/uri/generic.rb (URI::Generic.build2): escape only if the item is
+	  a String.
+
+	* lib/uri/generic.rb (URI::Generic.build2): use DEFAULT_PARSER because
+	  it doesn't have parser method. [Bug #6420]
+
+Fri May 18 15:54:07 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/zlib/extconf.rb: Use an exception instead of bare puts.
+
+Fri May 18 15:53:05 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/psych/extconf.rb: Use an exception instead of bare abort.
+
+Fri May 18 15:51:32 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/fiddle/extconf.rb: Use an exception instead of bare abort.
+
+Fri May 18 15:49:35 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/readline/extconf.rb: Use an exception instead of bare exit.
+
+Fri May 18 15:38:11 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/ripper/extconf.rb: Use an exception instead of bare
+	  Logging.message.
+
+Fri May 18 15:23:06 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/openssl/extconf.rb: Clarify a message when hit Apple
+	  OpenSSL issue.
+
+Fri May 18 15:14:32 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/extmk.rb: Show a message when extconf.rb raised an exception.
+	* ext/openssl/extconf.rb: Use exception raising instead of message
+	  and/or abort. We want to display error message to console _and_
+	  logging into mkmf.log.
+
+Fri May 18 06:14:07 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/syslog/lib/syslog/logger.rb:  Added Syslog::Logger which was
+	  ported from the SyslogLogger gem.  [ruby-trunk - Feature #5096]
+	* NEWS:  ditto.
+	* test/syslog/test_syslog_logger.rb:  ditto.
+
+Fri May 18 01:28:21 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (transcode_string): fix encoding index names.
+	  Thanks markizko for reporting.
+
+Thu May 17 23:03:58 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: fix function name to be checked, to initialize
+	  rb_thread_cond_t properly.
+
+	* thread_pthread.c (native_cond_initialize, native_cond_destroy):
+	  fix macro name.
+
+Thu May 17 12:53:07 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* thread.c, thread_pthread.c: Moved pthread-specific preprocessor
+	  hacks to thread_pthread.c
+
+Thu May 17 12:18:47 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* io.c: Fix a mistake on merging the patch in the previous commit.
+
+Thu May 17 11:33:07 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	Imports Ruby's port to NativeClient (a.k.a NaCl).
+	Patch by Google Inc. [ruby-core:45073].
+
+	* configure.in (RUBY_NACL): New M4 func to configure variables for
+	  NaCl.
+	  (RUBY_NACL_CHECK_PEPPER_TYPES): New M4 func to check the old names
+	  of Pepper interface types.
+	  (BTESTRUBY): New variable to specify which ruby should be run on
+	  "make btest". NaCl can run the built binary by sel_ldr, but it need
+	  rbconfig.rb. So this variable is distinguished from $MINIRUBY.
+
+	* thread_pthread.c: Disabled some features on NaCl.
+
+	* io.c: ditto.
+
+	* process.c: ditto.
+
+	* signal.c: ditto.
+
+	* file.c: ditto.
+
+	* missing/flock.c: ditto.
+
+	* nacl/pepper_main.c: An example implementation of Pepper application
+	  that embeds Ruby.
+
+	* nacl/example.html: An example of web page that uses the Pepper
+	  application.
+
+	* nacl/nacl-config.rb: Detects variants of NaCl SDK.
+
+	* nacl/GNUmakefile.in: Makefile template for NaCl specific build
+	  process.
+
+	* nacl/package.rb: script for packaging a NaCl-Ruby embedding
+	  application.
+
+	* nacl/reate_nmf.rb: Wrapper script of create_nmf.py
+
+	* dln.c (dln_load): Added a hack to call on NaCl.
+
+	* util.c (ruby_getcwd): Path to the current directory is not available
+	  on NaCl.
+
+Thu May 17 10:54:58 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/extconf.rb: add -l options to $libs not $LDFLAGS,
+	  to be passed to EXTLIBS in exts.mk.
+
+	* enc/encinit.c.erb: use %-lines to adjust indent in the generated file.
+
+	* lib/mkmf.rb (MakeMakefile#have_framework): combine -framework option
+	  and its argument with an equal sign not to be separated in merge_libs.
+
+	* ext/tk/extconf.rb: ditto.
+
+	* ext/extmk.rb: EXTLDFLAGS also needs to be passed.
+
+Wed May 16 15:44:22 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* configure.in: Fix an unbalanced quote.
+
+Wed May 16 15:43:10 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/extmk.rb (exts.mk): use double quotes instead of single quotes
+	  for commandline because it's not recognized as quotes on Windows.
+
+Wed May 16 15:15:55 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LD): enclose with single quotes but not double quotes
+	  not to expand command substitution.
+
+Wed May 16 14:19:51 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	Supports static linking of extensions and encodings again.
+	Fixes --with-static-linked-ext.
+
+	Patch by Google Inc. [ruby-core:45073].
+
+	* Makefile.in (ENCOBJS, EXTOBJS): New variables to specify static
+	  linked libraries. Also reintroduces extinit.o, introduces encinit.o
+	  introduces encinit.o
+
+	* common.mk: Builds static libraries rather than shared objects if
+	  specified.
+
+	* configure.in (LD): new substitution.
+
+	* enc/depend: Supports static linked libraries
+	  (libencs, libenc, libtrans): New target.
+
+	* enc/encinit.c.erb: new template to generate the initialization of
+	  statically linked encodings.
+
+	* enc/make_encmake.rb (--module): new flag to specify whether static
+	  or dynamic.
+
+	* transcode_data.h (TRANS_INIT): New macro to get rid of the name
+	  collision of encoding initializers and transcoder initializers.
+
+	* ext/extmk.rb: Fixes the behavior on $extstatic is true.
+
+	* lib/mkmf.rb (clean-static): new target to clean up static linked
+	  libraries.
+
+	* ruby.c (process_options): New initializes statically linked
+	  encodings here.
+
+Wed May 16 14:30:43 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c: fixed a merge mistake of r33878, reported by nobu via IRC.
+
+Wed May 16 06:59:41 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strftime.c: should also be aware of flags on
+	  complex specifier.
+
+Wed May 16 05:11:29 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: fix a bug with string
+	  subclass dumping and loading.
+
+	* test/psych/test_array.rb: pertinent tests
+
+	* test/psych/test_string.rb: ditto
+
+Wed May 16 01:31:21 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: convert omap tagged maps to
+	  Psych::Omap objects rather than hashes. [Bug #6425]
+
+	* test/psych/test_omap.rb: pertinent test.
+
+Wed May 16 01:15:45 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: keep a reference to
+	  custom coders so that GC does not impact dumped yaml reference ids.
+
+Tue May 15 23:59:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Options#setup_options): add --color option.
+
+	* lib/test/unit.rb (Test::Unit::Runner#_prepare_run): defer color code
+	  initialization to regard --color option.
+
+Mon May 14 16:28:36 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_arglist): should reset lexical states after empty
+	  argument list with no parenthesis as well as parenthesized list,
+	  so that reserved name method definition work.  [ruby-dev:45626]
+	  [Bug #6403]
+
+Mon May 14 00:14:24 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* enumerator.c (lazy_take_func, lazy_take): multiple calls of
+	  force/to_a method to Enumerator::Lazy#take should return same
+	  results. [ruby-dev:45634] [Bug #6428]
+
+	* test/ruby/test_lazy_enumerator.rb (test_take_recycle): add test for
+	  above.
+
+Sun May 13 23:38:31 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* test/ruby/test_io.rb (test_flush_in_finalizer1): don't use IO.for_fd
+	  to close IO objects. it create IO object with already closed fd, and
+	  cause occasional Errno::EBADF in following tests. [ruby-core:45020]
+	  [Bug #6228]
+
+Sun May 13 23:32:16 2012  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO): revert r35631. it broke the intent of
+	  test_flush_in_finalizer1.  [ruby-core:43951] [Bug #6228]
+
+Sun May 13 22:46:36 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/etc/etc.c (passwd_ensure): move endpwent() call from
+	  passwd_iterate to close /etc/passwd on exception.
+	  (group_ensure): move endgrent() call from group_iterate to close
+	  /etc/group on exception.
+
+Sun May 13 18:10:43 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strftime.c: removed unused code and changed the style.
+
+Sun May 13 17:37:56 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strftime.c: refactored.
+
+Sun May 13 06:40:12 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* test/ruby/test_io.rb (class TestIO):  Disable GC during IO tests to
+	  avoid file descriptors being GC'ed. Suggestion by Tomoyuki Chikanaga
+	  [ruby-core:43951][Bug #6228]
+
+Sat May 12 07:00:16 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/sdbm/init.c:  Added documentation.  Patch by Justin Collins,
+	  cleanup by Zachary Scott.  [ruby-trunk - #6410]
+
+Sat May 12 06:02:03 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/fileutils.rb (cp_r):  Fixed cp_r example.  Patch by TJ Koblentz
+	  from pull request #114.  [ruby-trunk - Bug #6411]
+
+Sat May 12 05:23:06 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread.c (rb_threadptr_execute_interrupts_common):
+	  test_signal_requiring of test/ruby/test_signal.rb fail if the sub
+	  process is killed on waiting IO in lex_io_gets in rb_load_file in
+	  rb_load_internal in require.
+	  This is because
+	  (1) the process receive the killing signal in
+	      rb_thread_io_blocking_region in rb_read_internal in lex_io_gets.
+	  (2) set th->errinfo as INT2FIX(TAG_FATAL) at
+	      rb_threadptr_execute_interrupts_common.
+	  (3) escape rb_load_file in rb_load_internal and jump to EXEC_TAG()
+	      without set loaded as TRUE.
+	  (4) call first rb_exc_raise(GET_THREAD()->errinfo); because loaded
+	      is FALSE as above. this errinfo should be an exception object
+	      but this is INT2FIX(TAG_FATAL).
+	  Don't call first rb_exc_raise if GET_THREAD()->errinfo is Fixnum.
+
+Fri May 11 14:23:11 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (primary): begin/end block should be isolated from outside.
+	  [ruby-dev:45631][Bug #6419]
+
+Fri May 11 14:09:47 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (PUSH): to prevent VALUE from GC,
+	  must not cast it to unsigned long, which may be shorter than
+	  VALUE, and the result can be mere garbage.
+
+Fri May 11 09:51:07 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#failed): no unnecessary
+	  newlines if no reports to be displayed.
+
+Thu May 10 10:55:35 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/minitest/test_minitest_mock.rb: Correct requiring path to
+	  metametameta.rb.
+
+	* test/minitest/test_minitest_unit.rb: Correct requiring path to
+	  metametameta.rb.
+
+Thu May 10 10:18:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lex_state_name): returns name for lex_state_e, for debug
+	  use.
+
+Wed May  9 16:36:01 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#pkg_config): check if libs resulted from
+	  pkg-config works actually.
+
+Wed May  9 16:01:38 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (decode_utf7, encode_utf7): refactored by
+	  Nobuyoshi Nakada, to use String#encode.
+
+Wed May  9 13:26:25 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rubygems/test_gem_remote_fetcher.rb: skip OpenSSL dependent
+	  tests if not available.
+
+Wed May  9 08:09:38 2012  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 3.0.0 (r7435)
+	* test/minitest/*: ditto
+	* test/rubygems/*: Imported fixes for buggy use of assert_match
+	  and deprecated assert_block
+	UNBUNCH YOUR PANTIES. THE TESTS DO NOT RUN CLEAN ON OSX.
+
+Wed May  9 06:28:59 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* re.c (rb_reg_equal):  Removed incorrect example for Regexp#== with
+	  "n" option.  [ruby-talk - Bug #6415]
+
+Wed May  9 06:23:33 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: reverted.
+
+Wed May  9 04:31:26 2012  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/ring.rb (lookup_ring_any): fix Rinda::RingFinger.primary
+	  hungs forever. [ruby-talk:395364]
+
+Tue May  8 21:09:00 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* include/ruby/win32.h (FD_SET): change function to macro.
+	  To avoid buffer overflow when smaller FD_SETSIZE is used in ext
+	  libraries.
+
+	* win32/win32.c (rb_w32_fdset): this function is not used anymore.
+	  But we leave this for compatibility.
+
+	* win32/win32.c (rb_w32_select_with_thread): fix SEGV when smaller
+	  FD_SETSIZE is used in ext libraries. Dereference of fd_set pointer
+	  causes SEGV.
+
+	* test/-ext-/win32/test_fd_setsize.rb(TestFdSetSize): add tests for
+	  above.
+	* ext/-test-/win32/fd_setsize/depend: ditto.
+	* ext/-test-/win32/fd_setsize/extconf.rb: ditto.
+	* ext/-test-/win32/fd_setsize/fd_setsize.c: ditto.
+
+	  [ruby-core:44588] [Bug #6352]
+
+Tue May  8 20:44:46 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* io.c (io_unread): fix IO#pos with mode 'r' bug on Windows.
+	  If the end of reading buffer is CR, io_unread() needs to unread one
+	  more byte.
+	  [ruby-core:44874] [Bug #6401]
+
+	* test/ruby/test_io_m17n.rb (TestIO_M17N#test_pos_with_buffer_end_cr):
+	  add a test for above.
+
+Tue May  8 13:38:17 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* ext/date/date_core.c: improving introduction in Date/DateTime
+	  documentation. patched by Daniel Kaufman via Github.
+		https://github.com/ruby/ruby/pull/110
+
+Tue May  8 13:36:02 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (POSTLINK): default to : command to get rid of flag
+	  only command, since BSD make does not work with it.
+
+Tue May  8 13:35:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (MiniTest#run_test): remove exact trace and get rid
+	  of IndexError, which could caused by modified $@ sometimes.
+
+Tue May  8 11:21:27 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/minitest/metametameta.rb (MetaMetaMetaTestCase#assert_report):
+	  support drive letter on Windows.  yes, the original code is metameta.
+
+Tue May  8 08:54:48 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/abbrev.rb:  Fixed typo in abbrev pattern documentation.  Based on
+	  patch by Mark Rushakoff.  [ruby-trunk - #6346]
+
+Tue May  8 07:44:18 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_start_ssl): remove useless rb_sys_fail
+	  before ossl_raise. this cause a test failure on Linux.
+	 http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120507T190102Z.log.html.gz
+
+Tue May  8 05:35:18 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c (Init_Object):  Added reference to variable.c where
+	  public_constant and private_constant documentation lives.  [#6381]
+
+Tue May  8 04:47:44 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#output): prefer local output to
+	  get rid of unexpected side effect in test/minitest/metametameta.rb.
+
+	* lib/test/unit.rb (MiniTest#run_test): show the running test in $0.
+
+	* lib/test/unit.rb (Test::Unit::StatusLineOutput): new class to output
+	  in status line.
+
+	* test/testunit/test_hideskip.rb (TestHideSkip#test_hideskip):
+	  MiniTest#puke now reports Skipped messages only if verbose mode.
+
+	* test/testunit/test_sorting.rb (TestTestUnitSorting#test_sorting):
+	  ditto.
+
+	* lib/test/unit.rb (Test::Unit::Runner#puke): modify only result and
+	  drop useless reports, not override entirely.
+
+	* bootstraptest/runner.rb (exec_test, show_progress): show rotators
+	  and pass/fail counts.
+
+	* sample/test.rb (PROGRESS): refine output.
+
+Tue May  8 02:34:26 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/minitest/unit.rb (assert_match): refix of r35563.
+	  r35563 breaks the intention of the original change.
+	 https://github.com/seattlerb/minitest/commit/68858105b2eb11c85105ffac5f32b662c59397f3
+	* lib/minitest/unit.rb (refute_match): ditto.
+
+Mon May  7 21:19:17 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: Merge JSON 1.7.1.
+	 https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac
+
+Mon May  7 22:54:22 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_ssl.c: add support for option flags
+	  OpenSSL::SSL::OP_NO_TLSv1_1
+	  OpenSSL::SSL::OP_NO_TLSv1_2
+	  to allow blocking specific TLS versions. Thanks to Justin Guyett for
+	  pointing this out to me.
+	* test/openssl/test_ssl.rb: add tests to assert correct behavior when
+	  blocking certain versions of TLS/SSL both on server and client side.
+	  Also refactored tests to reduce boilerplate code a little.
+	* test/openssl/utils.rb: rescue Errno::ECONNRESET for tests where
+	  client rejects the connection because a forbidden protocol version
+	  was used.
+
+Mon May  7 20:14:15 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb (random_bytes): call to_int method for the
+	  argument at first.
+
+Mon May  7 17:54:12 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/minitest/unit.rb (assert_match): replace matcher only if both
+	  matcher and obj are String. fix r35541. [Bug #6405]
+	  DON'T COMMIT IF YOU CAN'T RUN TEST.
+	  FIX AS SOON AS POSSIBLE YOU BREAK TESTS.
+	  patched by ayumin.
+	  https://github.com/seattlerb/minitest/pull/124
+
+	* lib/minitest/unit.rb (refute_match): ditto.
+
+Mon May  7 13:41:00 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (PROGRAM), configure.in (POSTLINK): sign built program
+	  using RUBY_CODESIGN identity.
+
+Mon May  7 13:03:55 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (body_type_attachment): parse body type
+	  "ATTACHMENT". [ruby-core:44849] [Bug #6397]
+
+Mon May  7 10:49:36 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal): define IDs before
+	  they are used. [ruby-core:44900] [Bug #6406]
+
+Mon May  7 10:27:56 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/digest/rmd160/rmd160.c (RMD160_Update): fix for huge data.
+
+Mon May  7 10:23:04 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/fileutils/fileasserts.rb: use assert_equal, assert_match, and so on.
+
+	* test/ruby/enc/test_utf16.rb, test/ruby/enc/test_utf32.rb,
+	  test/ruby/test_io_m17n.rb (assert_str_equal): ditto.
+
+	* test/rubygems/test_gem_remote_fetcher.rb
+	  (assert_data_from_{server,proxy}): ditto.
+
+	* test/test_pstore.rb (test_thread_safe): ditto.
+
+Mon May  7 10:16:30 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rubygems/test_gem_installer.rb (TestGemInstaller#test_dir): fix
+	  argument order.  expected value must come first.
+
+Mon May  7 09:14:11 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_ssl.c: support TLSv1.1 & TLSv1.2. Add
+	  SSLContext#version to inspect the version that was negotiated for
+	  a given connection.
+	* ext/openssl/extconf.rb: detect TLS 1.1 & 1.2 support.
+	* test/openssl/test_ssl.rb: add tests for TLS 1.1 & 1.2 given they
+	  are supported by the native OpenSSL being used.
+
+Sun May  6 21:34:29 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (io_encoding_set): suppress warnings. [ruby-dev:45627]
+	  this tmp1 is not required after r35538.
+
+	* addr2line.c: suppress warnings.
+
+Sun May  6 18:39:39 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): remove unused variable `size'.
+
+Sun May  6 14:50:03 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb: show actual read length in an error message.
+
+Sat May  5 06:43:10 2012  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 2.12.1 (r7323)
+	* test/minitest/*: ditto
+
+Sat May  5 01:47:33 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/zlib/test_zlib.rb (test_inflate): add a test for Zlib.inflate.
+	  patched by headius (Charles Nutter). [ruby-core:44859] [Bug #6398]
+
+	* test/zlib/test_zlib.rb (test_deflate): add a test for Zlib.deflate.
+
+Sat May  5 00:53:55 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (parse_mode_enc): remove warnings 'Ignoring internal encoding'.
+	  [ruby-core:44455] [Bug #6324]
+
+	* io.c (io_encoding_set): ditto.
+
+Fri May  4 07:19:02 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rdoc/parser.rb (RDoc.binary?): fix wrong regexp.
+	  [ruby-core:44798] [Bug #6393]
+
+Fri May  4 01:33:20 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parser.rb (RDoc.alias_extension): a real file is irrelevant
+	  to aliasing.  [ruby-core:44796][Bug #6392]
+
+	* lib/rdoc/parser.rb (RDoc.zip?): non-existent file will not be a zip
+	  file.
+
+	* lib/rdoc/parser.rb (RDoc.can_parse_by_name): accept aliased
+	  extension file names.
+
+	* lib/rdoc/parser.rb (RDoc.binary?): binary read data may have
+	  incomplete multibyte sequence.  [ruby-core:44798][Bug #6393]
+
+Wed May  2 23:55:51 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::RequireFiles#non_options): expand
+	  real path to get rid of loading same files via symlinks.
+
+Wed May  2 23:26:04 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* cont.c (rb_fiber_m_transfer): improve sample code in Fiber#transfer
+	  documentation. emphasize the difference between transfer and resume.
+
+Wed May  2 23:21:20 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): allow spaces between lambda arrow and
+	  parenthesis.  [ruby-dev:45605][Feature #6390]
+
+Wed May  2 19:06:30 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* cont.c (rb_fiber_m_transfer): Improved Fiber documentation.
+	  patched by Anuj Dutta. [ruby-core:44540][Bug #6343]
+
+Wed May  2 13:06:37 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README, README.ja: reformatted using rdoc markup.  based on the
+	  patches by zzak (Zachary Scott) in [Feature #6388].
+
+	* README, README.ja: updated the author's mail address.
+
+Wed May  2 09:46:09 2012  Kouji Takao  <kouji@takao7.net>
+
+	* ext/readline/readline.c (Readline.special_prefixes=)
+	  (Readline.special_prefixes): new function. An original patch was
+	  created by nagachika. [Feature #5784]
+
+Tue May  1 22:18:45 2012  Kouji Takao  <kouji@takao7.net>
+
+	* ext/readline/readline.c (Readline.pre_input_hook)
+	  (Readline.insert_text, Readline.redisplay): new function. An
+	  original patch was created by nagachika. [Feature #5785]
+
+Tue May  1 15:46:48 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: "$(Q)-..." doesn't work on nmake.
+
+Tue May  1 15:32:10 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: replace '@' prefix to '$(Q)' to control build
+	  process outputs.
+
+Tue May  1 14:17:59 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/deprecation.rb (OpenSSL.check_func): check if header is
+	  available for macro compatibility.
+
+Tue May  1 10:53:54 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_settracefunc.rb: ignore traces from another threads
+	  because Kernel.set_trace_func affects other threads.
+
+Tue May  1 06:04:14 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/digest/sha2/sha2.c (REVERSE32): explicitly cast since unsigned
+	  long may be larger than sha2_word32.
+
+	* ext/digest/sha2/sha2.c (SHA{256,512,384}_{Final,End}): should clear
+	  whole content, not pointer size.
+
+	* ext/digest/*/extconf.rb: use pkg_config to use same library with
+	  openssl.  [ruby-core:44755][Bug #6379]
+
+	* ext/openssl/deprecation.rb: extract check for broken Apple OpenSSL.
+
+Tue May  1 05:02:30 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (optflags): disable unsafe optimizations.
+	  [ruby-core:44679][Bug #6370]
+
+Mon Apr 30 23:36:49 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/fileutils.rb (copy_metadata): use File.lchown and File.lchmod to
+	  update meta data of symlinks.
+
+Mon Apr 30 23:05:53 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/ruby/test_continuation.rb (tracing_with_set_trace_func): don't
+	  call Continuation from other threads. [ruby-dev:45596] [Bug #6382]
+
+Mon Apr 30 20:10:04 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/zlib/extconf.rb: detect z_crc_t type which will be defined
+	  since zlib-1.2.7.
+
+	* ext/zlib/zlib.c (rb_zlib_crc_table): use z_crc_t if available.
+
+Mon Apr 30 09:02:15 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* ext/openssl/lib/openssl/ssl.rb: add hostname to "hostname does not
+	  match server cert." error. patched by Wes Morgan via Github.
+	  https://github.com/ruby/ruby/pull/122
+
+Mon Apr 30 04:43:53 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/json/yaml_events.rb: implicit styles should not
+	  be changeable for JSON events.
+
+Sun Apr 29 06:12:02 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assoc, parser_yylex): add syntax to splat keyword hash.
+	  [ruby-core:44591][Feature #6353]
+
+	* compile.c (compile_array_): generate keyword splat insns.
+
+	* vm.c (m_core_hash_merge_kwd): merge keyword hash into intermediate
+	  hash.  leftward argument is prior currently.
+
+Fri Apr 27 12:34:23 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): should convert a Bignum value to
+	  unsigned long long on Win64.
+	  [ruby-core:44636][Bug #6364] reported by raylinn@gmail.com (ray linn)
+
+Fri Apr 27 10:58:17 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/readline/test_readline.rb (setup): avoid affected by user's
+	  inputrc file.  [ruby-dev:45584][Bug #6357]
+
+Fri Apr 27 01:45:05 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread.c (rb_threadptr_execute_interrupts_common):
+	  handle timer_interrupt only on the first loop for the case to avoid
+	  the infinite loop like following case:
+	  * there is 2 Ruby threads (3 pthreads)
+	  (1) main thread is waiting at gvl_yield:112 (native_cond_wait)
+	  (2) sub thread works
+	  (3) sub thread waits at gvl_yield:133 (native_mutex_unlock)
+	  (4) main thread works
+	  (5) main thread goes to gvl_acquire_common
+	  (6) main thread call rb_wakeup_timer_thread
+	  (7) timer thread set timer interrupt to the main thread
+	  (8) main thread works
+	  (9) main thread waits at gvl_acquire_common:64 (native_cond_wait)
+	  (10) sub tread works
+	  (11) set sub thread as the current thread
+	  (12) run Ruby thread
+	  (13) ...100ms
+	  (14) sub thread goes to rb_threadptr_execute_interrupts_common
+	  (15) sub thread call rb_thread_schedule_limits
+	  (16) sub thread call gvl_release_common
+	  (17) sub threads waits at gvl_yield:121 (native_cond_wait)
+	  (18) main threads works
+	  (19) main thread back to gvl_yield
+	  (20) set main thread as the current thread
+	  (21) main thread call gvl_yield
+	  (22) main thread waits at gvl_yield:112 (native_cond_wait)
+	  As described above, the main thread can't escape from
+	  rb_threadptr_execute_interrupts_common.
+	  See extended memo: http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/R35480_ExtendedMemo
+
+Fri Apr 27 07:15:07 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_s_pack_sockaddr_un): support the longest
+	  path in sockaddr_un, really.
+	  reported by nagachika.
+	 http://d.hatena.ne.jp/nagachika/20120426/ruby_trunk_changes_35474_35476
+
+Thu Apr 26 12:28:06 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (init_unix_addrinfo): support the longest
+	  path in sockaddr_un.
+	  (inspect_sockaddr): ditto.
+	  (addrinfo_mdump): ditto.
+	  (addrinfo_mload): ditto.
+	  (rsock_unixpath_str): new function.
+	  (rsock_unixpath): removed.
+	  (rsock_unixaddr): use rsock_unixpath_str.
+
+	* ext/socket/socket.c (sock_s_pack_sockaddr_un): support the longest
+	  path in sockaddr_un.
+	  (sock_s_unpack_sockaddr_un): ditto.
+	  (sock_s_gethostbyaddr): unused variable removed.
+
+	* ext/socket/unixsocket.c (rsock_init_unixsock): support the longest
+	  path in sockaddr_un.
+
+	* ext/socket/rubysocket.h (rsock_unixpath_str): declared.
+	  (rsock_unixpath): removed.
+
+	* test/socket/test_unix.rb: comment out test_nul because abstract unix
+	  sockets may contain NULs.
+
+Thu Apr 26 01:32:33 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/optparse/test_summary.rb (test_summary_containing_space): add
+	  test for r35467. OptionParser#to_a shouldn't split banner by spaces.
+
+Wed Apr 25 23:02:46 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (init_unix_addrinfo): refine error message
+	  format.
+	  (addrinfo_mload): show more information on "too long AF_UNIX path"
+	  error.
+	  (addrinfo_unix_path): ditto for "too short AF_UNIX address" and
+	  "too long AF_UNIX address" error.
+
+Wed Apr 25 05:46:12 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#to_a): split for each lines.
+	  [ruby-dev:45568][Bug #6348]
+
+Tue Apr 24 21:57:53 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (init_unix_addrinfo): show actual path length
+	  when it is too long for Unix socket.
+
+	* ext/socket/unixsocket.c (rsock_init_unixsock): ditto.
+
+	* ext/socket/socket.c (sock_s_pack_sockaddr_un): ditto.
+
+Tue Apr 24 21:43:58 2012  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/net/smtp.rb (check_continue): raise an error with an explanatory
+	  message.  [ruby-core:35854] [Feature #4598]
+
+Tue Apr 24 21:11:31 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#to_a): should split by end-of-line,
+	  and MUST TEST IT, MUST RUN THE TEST, MUST VERIFY BEFORE BACKPORT.
+	  [ruby-dev:45568][Bug #6348]
+
+Tue Apr 24 19:59:31 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/euc_jp.c: added EUC-JP-2004 and its alias EUC-JISX0213.
+	  [ruby-dev:45571] [Feature #6349]
+	  Requested by Kyouhei Yanagita <yanagi@shakenbu.org>.
+
+	* enc/trans/japanese_euc.trans: ditto.
+
+	* enc/trans/JIS/JISX0213-[12]%UCS@{BMP,SIP}.src: JIS X 0213:2004 ->
+	  Unicode mapping table from NetBSD.
+
+	* enc/trans/JIS/UCS@{BMP,SIP}%JISX0213-[12].src: Unicode -> JIS X
+	  0213:2004 mapping table from NetBSD.
+
+	* tool/transcode-tblgen.rb: added SIP support.
+
+	* test/ruby/test_transcode.rb: tests of above changes.
+
+Tue Apr 24 18:12:13 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c: fix to output warning when the same literals
+	  are available as a condition of same case clause.
+	  And remove information ('#n') because we can find duplicated
+	  condition with explicit line numbers.
+	  [ruby-core:38343] [Ruby 1.9 - Bug #5068]
+
+	* test/ruby/test_syntax.rb: add a test for above.
+
+Tue Apr 24 17:03:51 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (waitpid): need to check the return value of
+	  FindChildSlotByHandle() before passing poll_child_status().
+	  this fixed a SEGV in test-all.  reported by ko1 via IRC.
+
+Tue Apr 24 16:04:39 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): EXPR_BEG by keywords is a start point of
+	  commands.  [ruby-dev:45563][Bug #6347]
+
+	* parse.y (superclass): ditto for superclass.
+
+	* parse.y (parser_parse_string, parser_here_document): ditto for
+	  string interpolation.
+
+	* parse.y (parser_yylex): ditto for singleton class.
+
+Tue Apr 24 15:51:41 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#to_a): should split by end-of-line
+	  [ruby-dev:45568][Bug #6348]
+
+	* lib/optparse.rb (OptionParser#to_a): String#to_a is no longer
+	  defined.  [ruby-dev:45568][Bug #6348]
+
+Tue Apr 24 12:46:50 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* hash.c, object.c, struct.c, lib/ostruct.rb: add to_h methods.
+	  [Feature #6276]
+
+Tue Apr 24 10:54:34 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/drb/drbtest.rb ({DRbCore,DRbAry}#teardown): cannot pass SIGTERM
+	  to another process on Windows, so use SIGINT instead.
+
+Tue Apr 24 00:25:39 2012  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (rb_check_deadlock): refine an error message of deadlock
+	  detection.  [ruby-core:44336] [Bug #6288]
+
+Tue Apr 24 00:14:42 2012  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (primary): remove wrong "fixpos" that caused incorrect
+	  source_location of blocks.  [ruby-core:42232] [Bug #5930]
+
+	* test/ruby/test_proc.rb: add a test for above.
+
+Mon Apr 23 22:56:08 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv: deprecated.  [Feature #6322]
+
+Mon Apr 23 22:07:00 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_unix.rb (bound_unix_socket): make temporary
+	  filename shorter for less possibility of Unix socket path over
+	  107 bytes when TMPDIR has long path.
+
+Mon Apr 23 20:35:49 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (szInternalCmds, internal_match, internal_cmd_match):
+	  get rid of a segmentation fault with GCC 4.7.0.
+	  reported by raylinn@gmail.com (ray linn) at [ruby-core:44505]
+	  [Bug #6333], and patched by mame.
+
+	* test/ruby/test_system.rb (TestSystem#test_system): test for it.
+
+Mon Apr 23 20:11:02 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/drb/ssl.rb: generate 1024 bits RSA key instead of 512 bits.
+	  OpenSSL 1.0.1 rejects 512 bits RSA key for TLS1.2 with SHA512.
+	 http://rt.openssl.org/Ticket/Display.html?id=2769&user=guest&pass=guest
+	  reported by Bohuslav Kabrda.
+	  [ruby-core:43844] [ruby-trunk - Bug #6221]
+
+Mon Apr 23 19:54:33 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill.
+	  reported by NARUSE, Yui.  [ruby-dev:45551]
+
+Mon Apr 23 14:16:45 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* .gdbinit (rb_ps_vm): follow st_table's packing change.
+
+Mon Apr 23 10:43:30 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: disable rubygems not to load rbconfig.rb before
+	  fake.rb.  [ruby-core:44492][Bug #6329]
+
+Sun Apr 22 20:26:06 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/drb/extservm.rb (DRb::ExtServManager): don't use /bin/sh to
+	  invoke service subprocess.  mark detach threads for clean up.
+
+	* test/drb/drbtest.rb: clean up the service subprocess in teardown.
+
+	* test/drb/test_drb.rb: set @service_name for teardown.
+
+	* test/drb/test_drbunix.rb: ditto.
+
+	* test/drb/test_drbssl.rb: ditto.
+
+	[ruby-dev:45547]
+
+Sun Apr 22 07:51:29 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/drb/ssl.rb: close accepted TCP socket if SSL accept is failed.
+	  [ruby-dev:45541]
+
+Sat Apr 21 14:36:49 2012  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_rinda.rb: fix sticks on some tests problem
+	  [Bug #6272]
+
+Fri Apr 20 12:24:04 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem:  Removed to avoid
+	  conflict with ca-bundle.pem
+	* lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem:
+	  ditto.
+	* lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem:
+	  ditto.
+
+Fri Apr 20 08:07:06 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 1.8.23 which contains security
+	  fixes:
+
+	  RubyGems now disallows redirection from HTTPS to HTTP.
+
+	  RubyGems now verifies SSL connections.
+
+	  See https://github.com/rubygems/rubygems/blob/1.8/History.txt for
+	  changes since 1.8.22.
+	* test/rubygems:  ditto.
+
+Thu Apr 19 16:33:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (rb_strftime_with_timespec): fix carry-up bug and
+	  overwrite '+' with '-' if negative offset less than a hour.
+	  [ruby-core:44447][Bug #6323]
+
+Thu Apr 19 09:39:57 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/-test-/win32/dln/extconf.rb: need import library for ordinal
+	  entry even on mingw.  [ruby-core:44441][Bug #6320]
+
+Thu Apr 19 09:35:15 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* random.c (random_init):  Clarify that the default seed is
+	  Random.new_seed, not zero.  Based on patch by Roger Pack.
+	  [ruby-trunk - Bug #6313]
+	* random.c (rb_f_srand):  ditto.
+
+Thu Apr 19 08:59:02 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/curses/curses.c (window_nodelay):  Fixed call-seq of nodelay to
+	  include the '='.
+
+	  Improved description window.nodelay=.
+
+Thu Apr 19 08:47:54 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* io.c (io_readpartial):  Document the output buffer parameter is
+	  overwritten with the read contents even when non-empty.
+	  Patch by yu nobuoka.  [ruby-trunk - Bug #6285]
+	* io.c (io_read_nonblock):  ditto.
+	* io.c (io_read):  ditto.
+	* io.c (rb_io_sysread):  ditto.
+	* io.c (argf_read):  ditto.
+	* io.c (argf_readpartial):  ditto.
+	* ext/stringio/stringio.c (strio_read):  ditto.
+	* test/ruby/test_argf.rb (class TestArgf):  Add test for existing
+	  behavior of read outbuf.
+	* test/ruby/test_io.rb (class TestIO):  ditto.
+	* test/stringio/test_stringio.rb (class TestStringIO):  ditto.
+
+Wed Apr 18 22:58:55 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (DOT, DOXYGEN): use AC_CHECK_PROGS instead of
+	  AC_CHECK_PROG which needs the third argument.  [ruby-core:44433]
+	  [Bug #6316]
+
+	* configure.in (PKG_CONFIG): fix condition to skip older version
+	  of pkg-config.  continue in backticks does not affect outside.
+
+Wed Apr 18 13:59:40 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/file.c (INVALID_FILE_ATTRIBUTES): define for old SDK.
+
+Wed Apr 18 10:22:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (rb_strftime_with_timespec): add an interim digit for
+	  the timezone offset which is less than an hour.
+
+Wed Apr 18 09:58:29 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/version.rb:  Fixed init_with warning by calling into
+	  yaml_initialize (for syck) from psych's init_with
+
+Wed Apr 18 09:03:43 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 1.8.22 plus r33517 and r35337 which
+	  were ported to the rubygems git repository.
+
+	  See https://github.com/rubygems/rubygems/blob/1.8/History.txt for
+	  changes since 1.8.11.
+
+	* test/rubygems:  ditto.
+
+Tue Apr 17 22:18:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (rb_strftime_with_timespec): fix padding of time zone
+	  offset.  [ruby-dev:43287][Bug #4458]
+
+Tue Apr 17 13:11:14 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (rb_w32_check_imported): skip ordinal entries.  based on a
+	  patch by phasis68 (Heesob Park) at [ruby-core:44381].
+	  [ruby-core:44371][Bug #6303]
+
+Mon Apr 16 18:22:14 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* spec/default.mspec: expand relative path for ruby_exe which uses
+	  them with Dir.chdir; it breaks relative paths, for example
+	  core/kernel/exec_spec.rb.
+
+Mon Apr 16 16:22:40 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (gmtime_r, localtime_r): POSIX compliant reentrant
+	  versions.
+
+	* configure.in (RUBY_MSVCRT_VERSION): define on mingw too.
+
+	* win32/Makefile.sub (config.h): prefix RT_VER with RUBY and make
+	  more descriptive to get rid of potential conflict.
+
+Mon Apr 16 15:19:39 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (NO_RUBY_VENDOR_LIB): fix missing comma.
+
+Mon Apr 16 12:17:12 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb (hermitian?): Bug fix, patch by George Koehler
+	  [Bug #6290] [rubyspec:4b9573d7613]
+
+Mon Apr 16 09:42:50 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rubygems/remote_fetcher.rb (Gem::RemoteFetcher#download): should
+	  use File.identical? to check the identity of the files.
+	  this fixed an error of a test on Windows.
+
+Sat Apr 14 12:55:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (UNREACHABLE): gcc 4.4 eliminates unreachable code
+	  if -O3 is given.
+
+	* win32/win32.c (child_result): dropped colon.
+
+Sat Apr 14 10:45:18 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#start):
+	  partially revert r35315.
+
+	* test/webrick/test_server.rb (test_start_exception):
+	  received signal is delivered to the main thread, so it is needed to
+	  emulate it. patched by Eric Hodel. [ruby-core:44348] [Feature #6236]
+
+Sat Apr 14 09:35:45 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* variable.c (trace_ev):  Removed "not reached" comment as this line is
+	  reached.
+	* variable.c (rb_obj_remove_instance_variable):  Replaced "not reached"
+	  comment with the UNREACHABLE macro.
+	* variable.c (rb_mod_const_missing):  ditto.
+	* variable.c (rb_mod_remove_cvar):  ditto.
+	* enum.c (first_i):  ditto.
+	* string.c (rb_str_aref):  ditto.
+	* string.c (str_byte_aref):  ditto.
+	* string.c (rb_to_id):  ditto.
+	* io.c (rb_io_fmode_modestr):  ditto.
+	* io.c (rb_io_oflags_modestr):  ditto.
+	* pack.c (num2i32):  ditto.
+	* vm_eval.c (rb_method_missing):  ditto.
+	* vm_eval.c (rb_f_throw):  ditto.
+	* dir.c (dir_read):  ditto.
+	* win32/win32.c (child_result):  ditto.
+	* struct.c (rb_struct_getmember):  ditto.
+	* struct.c (rb_struct_set):  ditto.
+	* struct.c (rb_struct_aref_id):  ditto.
+	* eval.c (rb_f_raise):  ditto.
+	* process.c (rb_f_exit_bang):  ditto.
+	* process.c (rb_f_exit):  ditto.
+	* process.c (rb_f_abort):  ditto.
+	* ext/-test-/iter/break.c (iter_break_value):  ditto.
+	* ext/pty/pty.c (pty_check):  ditto.
+	* ext/openssl/ossl_pkey.c (ossl_pkey_new):  ditto.
+	* ext/readline/readline.c (rb_remove_history):  ditto.
+	* ext/stringio/stringio.c (strio_unimpl):  ditto.
+	* numeric.c (num_sadded):  ditto.
+	* numeric.c (num_init_copy):  ditto.
+	* numeric.c (rb_num2ll):  ditto.
+	* numeric.c (rb_num2ull):  ditto.
+	* vm_insnhelper.c (call_cfunc):  ditto.
+	* ruby.c (opt_W_getter):  ditto.
+	* bignum.c (rb_big_coerce):  ditto.
+	* file.c (rb_f_test):  ditto.
+
+Sat Apr 14 08:38:20 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* encoding.c (rb_enc_codepoint_len):  Use UNREACHABLE to avoid "control
+	  reaches end of non-void function" warnings.  [ruby-trunk - Bug #6066]
+	* re.c (name_to_backref_number):  ditto.
+	* object.c (rb_Float):  ditto.
+	* io.c (io_readpartial):  ditto.
+	* io.c (io_read_nonblock):  ditto.
+	* pack.c (rb_uv_to_utf8):  ditto.
+	* proc.c (rb_method_entry_arity):  ditto.
+	* vm_method.c (rb_f_notimplement):  ditto.
+	* struct.c (rb_struct_aset_id):  ditto.
+	* class.c (rb_scan_args):  ditto.
+	* process.c (rlimit_resource_type):  ditto.
+	* process.c (rlimit_resource_value):  ditto.
+	* process.c (p_uid_switch):  ditto.
+	* process.c (p_gid_switch):  ditto.
+	* ext/digest/digest.c (rb_digest_instance_update):  ditto.
+	* ext/digest/digest.c (rb_digest_instance_finish):  ditto.
+	* ext/digest/digest.c (rb_digest_instance_reset):  ditto.
+	* ext/digest/digest.c (rb_digest_instance_block_length):  ditto.
+	* ext/bigdecimal/bigdecimal.c (BigDecimalCmp):  ditto.
+	* ext/dl/handle.c (rb_dlhandle_close):  ditto.
+	* ext/tk/tcltklib.c (pending_exception_check0):  ditto.
+	* ext/tk/tcltklib.c (pending_exception_check1):  ditto.
+	* ext/tk/tcltklib.c (ip_cancel_eval_core):  ditto.
+	* ext/tk/tcltklib.c (lib_get_reltype_name):  ditto.
+	* ext/tk/tcltklib.c (create_dummy_encoding_for_tk_core):  ditto.
+	* ext/tk/tkutil/tkutil.c (tk_hash_kv):  ditto.
+	* ext/openssl/ossl_ssl.c (ossl_ssl_session_reused):  ditto.
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_dsa_verify_asn1):  ditto.
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_is_at_infinit):  ditto.
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_is_on_curve):  ditto.
+	* ext/fiddle/conversions.c (generic_to_value):  ditto.
+	* ext/socket/raddrinfo.c (rsock_io_socket_addrinfo):  ditto.
+	* ext/socket/socket.c (sock_s_getnameinfo):  ditto.
+	* ext/ripper/eventids2.c (ripper_token2eventid):  ditto.
+	* cont.c (return_fiber):  ditto.
+	* dmydln.c (dln_load):  ditto.
+	* vm_insnhelper.c (vm_search_normal_superclass):  ditto.
+	* bignum.c (big_fdiv):  ditto.
+	* marshal.c (r_symlink):  ditto.
+	* marshal.c (r_symbol):  ditto.
+
+Fri Apr 13 17:12:09 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* hash.c (inspect_i): keep string's coderange.
+
+Fri Apr 13 15:26:51 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_aset, rb_hash_update, rb_hash_update_by): use
+	  st_update() to reduce evaluation of hash values.
+
+Fri Apr 13 15:17:36 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#stop): fix r35303;
+	  this method is to deny new connections, not shutdown yet.
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#start):
+	  re-raise exception only when the exception is Interrupt (^C).
+
+Thu Apr 12 19:51:45 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: added some notes.
+
+Wed Apr 11 17:16:49 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (compile_array, compile_array_):
+	  Divide big array (or hash) literals into several blocks and
+	  concatenate them.  There was a problem that a big array (hash)
+	  literal causes SystemStackError exception (stack overflow)
+	  because VM push all contents of the literal onto VM stack to
+	  make an array (or hash).  To solve this issue, we make several
+	  arrays (hashes) and concatenate them to make a big array (hash)
+	  object.  [ruby-dev:37701] [Bug #982]
+
+	* compile.c (iseq_compile_each, setup_args): use modified
+	  compile_array.
+
+	* vm.c (m_core_hash_from_ary, m_core_hash_merge_ary,
+	  m_core_hash_merge_ptr): added for above change.
+
+	* id.c (Init_id), parse.y: add core method ids.
+
+	* bootstraptest/test_literal.rb: add simple tests.
+
+	* bootstraptest/test_eval.rb: remove rescue clause to catch
+	  SystemStackError exception.
+
+	* test/ruby/test_literal.rb: add tests to check no stack overflow.
+
+Thu Apr 12 07:10:37 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/uri/generic.rb (module URI):  URI now downcases the scheme to
+	  follow RFC 2396 section 3.1.  [ruby-trunk - Feature #4551]
+	* test/uri/test_generic.rb (class URI):  Test for above
+
+Thu Apr 12 06:15:44 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/protocol.rb (module Net):  Added ReadTimeout to match
+	  OpenTimeout.  ReadTimeout is now raised by rbuf_fill instead of
+	  Timeout::Error to help users distinguish what type of timeout
+	  occurred.  [ruby-trunk - Feature #6088]
+	* lib/net/pop.rb (module Net):  Updated documentation for ReadTimeout
+	  and OpenTimeout.
+	* lib/net/http.rb (module Net):  ditto
+	* lib/net/smtp.rb (module Net):  ditto
+	* lib/net/telnet.rb (module Net):  Net::ReadTimeout is now raised in
+	  waitfor to match Net::Protocol.
+	* test/net/http/test_http.rb:  Updated Timeout::Error expectation to
+	  Net::ReadTimeout.
+	* test/net/ftp/test_ftp.rb:  ditto
+
+Thu Apr 12 05:27:01 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick/server.rb (module WEBrick::GenericServer):  A server
+	  will now continue only when a StandardError subclass is raised.  For
+	  other exception types the error will be logged at the fatal level and
+	  the server will safely stop.  Based on a patch by Alex Young.
+	  [ruby-trunk - Feature #6236]
+	* test/webrick/test_server.rb:  Test for new exception handling
+	  behavior.  Join the server thread instead of busy-waiting for it to
+	  shut down to remove race conditions.
+
+Thu Apr 12 03:50:44 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit:Runner::Worker#_run_suites):
+	  call GC.start before running the test suites.
+
+Wed Apr 11 22:31:19 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_check_id_cstr): new function to check if ID is
+	  registered with NUL-terminated C string.
+
+	* sprintf.c (rb_str_format): avoid inadvertent symbol creation.
+
+Wed Apr 11 20:28:36 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* io.c (rb_io_eof): use eof() instead of io_fillbuf(). It's because
+	  io_unread() doesn't work properly when reading CRLF with read(length)
+	  and mode 'r'.
+	  [ruby-core:44189][Bug #6271]
+
+	* test/ruby/test_io_m17n.rb (TestIO_M17N#test_read_crlf_and_eof):
+	  test for above.
+
+Wed Apr 11 07:38:33 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/digest/sha2/lib/sha2.rb (Digest#block_length):  Fixed method name
+	  in documentation examples.  Patch by naleski via
+	  https://github.com/ruby/ruby/pull/115
+
+Wed Apr 11 07:33:13 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* pack.c (pack_pack):  Warn when an invalid character is found in the
+	  format string when $VERBOSE is true.  [ruby-trunk - Feature #5219]
+	* pack.c (pack_unpack):  ditto
+	* test/ruby/test_pack.rb (class TestPack):  Test for warnings on
+	  invalid format characters.
+
+Wed Apr 11 06:11:10 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* string.c (rb_str_tr):  Documented use of \ to escape characters.
+	  [ruby-trunk - Bug #6161]
+	* string.c (rb_str_count):  ditto
+
+Wed Apr 11 05:14:51 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/abbrev.rb:  Clarified that Abbrev.abbrev returns a Hash instead
+	  of an Array.  Patch by Andrei Bocan.  [ruby-trunk - Bug #6107]
+
+Wed Apr 11 03:02:24 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* ext/ripper/lib/ripper/sexp.rb: fix spelling. patched by
+	  Jonathan Hinkle via https://github.com/ruby/ruby/pull/116
+
+Tue Apr 10 19:07:04 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_enc_raise): new function to raise an exception with
+	  the message in the given encoding.  patched by now (Nikolai
+	  Weibull) at [ruby-core:41160].  [Feature #5650]
+
+Tue Apr 10 18:19:32 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP#send_request_with_body_stream):
+	  use IO.copy_stream for requests using body_stream.
+	  patched by Eric Wong. [ruby-core:40898] [Feature #5605]
+
+Tue Apr 10 16:53:21 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c: add prototype declarations for older Mac OS X.
+	  [ruby-core:43376][Bug #6170]
+
+Tue Apr 10 15:35:21 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_set_sequence): show a hint if there are duplicated
+	  "when" clauses.  [ruby-core:41502] [ruby-trunk - Feature #5716]
+
+Tue Apr 10 09:57:00 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* string.c (rb_str_split_m):  Documented behavior of split on the empty
+	  string.  [ruby-trunk - Feature #3575]
+
+Tue Apr 10 09:48:31 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c (rb_deflate_s_deflate):  Fixed ruby example replacing
+	  NO_FLUSH with FINISH.  [ruby-trunk - Bug #6273]
+
+Mon Apr  9 23:10:26 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (isUNCRoot, winnt_stat): support long UNC.
+	  [ruby-core:30623][Feature #3399]
+
+Mon Apr  9 15:16:01 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (string_content, parser_yylex): count brace nesting to
+	  dispatch embexpr_end.  [ruby-core:43775][Bug #6211]
+
+Mon Apr  9 13:06:58 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* hash.c (rb_hash_set_default_proc): Accept nil, patch by Run Paint
+	  [Feature #4234]
+
+	* test/ruby/test_hash.rb: test for above.
+
+Mon Apr  9 08:01:15 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strftime.c: gets the value with range() consistently.
+	* ext/date/date_strftime.c (range): now just replaces the given item.
+
+Mon Apr  9 06:58:01 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c (nucomp_expt): [ruby-core:44170].
+
+Mon Apr  9 02:52:03 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* complex.c (nucomp_expt): the result of f_complex_new2 may be a fixnum
+	  with mathn. [ruby-core:44170] [Bug #6267]
+
+Sun Apr  8 22:46:01 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/generator/generator.c (generate_json_bignum):
+	  add RB_GC_GUARD.
+	 http://fb.rubyci.org/~chkbuild/ruby-trunk/log/20120407T210301Z.diff.html.gz
+
+Sun Apr  8 07:26:40 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler): get keys
+	  and fetch values from it to prevent @timeout_info's error
+	  "can't add a new key into hash during iteration".
+
+Sun Apr  8 06:51:57 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (io_unread): cast as long the value for extra_max.
+	  [ruby-core:44137] [Bug #6257]
+
+Sun Apr  8 06:46:48 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#send_body_io):
+	  use readpartial to get data even if the response is streaming data and
+	  each data is smaller than @buffer_size.
+	  patched by yu nobuoka. [ruby-dev:45471] [Bug #6230]
+
+Sat Apr  7 22:35:36 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* include/ruby/win32.h (rb_w32_aspawn_flags): add the declaration of
+	  new function.
+
+	* process.c (enum): add EXEC_OPTION_PGROUP and move the position
+	  above for the usage in proc_spawn_n().
+
+	* process.c (proc_spawn_n): add an argument to pass new option
+	  `new_pgroup`. The option specifies CREATE_NEW_PROCESS_GROUP flag to
+	  CreateProcessW(). This flag is necessary for the usage of
+	  Process.kill on the subprocess on Windows.
+
+	* process.c (rb_exec_arg_addopt): ditto.
+
+	* process.c (rb_spawn_process): ditto.
+
+	* process.c (documentation for rb_f_spawn): add documentation for new
+	  option `new_pgroup` of spawn.
+
+	* test/ruby/test_process.rb (TestProcess#test_execopts_new_pgroup):
+	  add tests for option `new_pgroup`.
+
+	* test/ruby/test_thread.rb
+	  (TestThreadGroup#test_thread_timer_and_interrupt):
+	  add option `new_pgroup: true` to spawn on Windows. It's needed for
+	  Process.kill on a subprocess.
+
+	* win32/win32.c (CreateChild): add an argument to pass
+	  dwCreationFlags of CreateProcessW().
+
+	* win32/win32.c (rb_w32_spawn): ditto.
+
+	* win32/win32.c (rb_w32_aspawn_flags): add new function to pass
+	  dwCreationFlags.
+
+	* win32/win32.c (rb_w32_aspawn): refactor to move the content to
+	  rb_w32_aspawn_flags().
+	  [ruby-core:43245][Bug #6131]
+
+Sat Apr  7 22:32:00 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/test_thread.rb
+	  (TestThreadGroup#test_thread_timer_and_interrupt): skip on Windows.
+	  Process.kill cannot kill a subprocess if CREATE_NEW_PROCESS_GROUP
+	  flag is not specified in a call to CreateProcessW().
+
+	* win32/win32.c (CreateChild): revert the usage of
+	  CREATE_NEW_PROCESS_GROUP flag for compatibility.
+	  [ruby-core:43245][Bug #6131]
+
+Sat Apr  7 10:28:40 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: bumping up psych version to match release.
+	* ext/psych/psych.gemspec: ditto
+
+Sat Apr  7 02:07:00 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c: fall back to any encoding if the external
+	  encoding is wrong.  [ruby-core:44163]
+	* test/psych/test_encoding.rb: fix test
+
+Fri Apr  6 16:24:24 2012  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* struct.c (documentation for rb_struct_members_m):
+	  fix 'array of strings' to 'array of symbols'
+	  [ruby-core:44152][Bug #6264]
+
+Fri Apr  6 14:27:04 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* Makefile.in ($(LIBRUBY_A)): fix typo.
+
+Thu Apr  5 13:26:15 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/alloca.c (xmalloc, xfree): use ruby version, not
+	  depending on RUBY_LIB_PREFIX.  [ruby-dev:45492][Bug #6255]
+
+Wed Apr  4 13:06:39 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/ftp/ftp.rb (Net::FTP#close): restore original read_timeout.
+
+Wed Apr  4 10:33:31 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/ftp/ftp.rb (Net::FTP#close): ignore exceptions from shutdown and
+	  read on closing.
+
+Wed Apr  4 01:48:35 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/ftp/ftp.rb (Net::FTP#close): close socket more gracefully.
+
+	* lib/ftp/ftp.rb (Net::BufferedSocket#shutdown): added.
+
+	* test/net/ftp/test_ftp.rb (FTPTest#create_ftp_server): wait socket
+	  with shutdown and read.
+
+Tue Apr  3 19:00:52 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/net/ftp/test_ftp.rb (FTPTest#create_ftp_server): should wait
+	  a little before closing socket because if the client call
+	  Net::FTP#getmultiline the socket is suddenly closed by the server in
+	  the getline loop.
+
+Tue Apr  3 18:33:38 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (setreuid, setregid): suppress warnings.
+	  [ruby-core:43374][Bug #6169]
+
+Tue Apr  3 10:18:27 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (inspect_enumerator): suppress uninitialized
+	  instance variable warnings.  [ruby-dev:45449][Bug #6214]
+	  patched by no6v (Nobuhiro IMAI).
+
+Mon Apr  2 13:25:08 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse/ac.rb: autoconf-like options.
+
+Mon Apr  2 10:34:00 2012  eregon  <eregontp@gmail.com>
+
+	* string.c (rb_str_start_with, rb_str_end_with): raise an error if
+	  an argument is not convertible to a String.
+	  [ruby-core:40623][Bug #5536]
+
+Mon Apr  2 03:35:25 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/server.rb (WEBrick::GenericServer): close socket only if
+	  the socket is not closed yet.
+
+Sun Apr  1 23:03:18 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/ftp.rb (Net::BufferedSocket): should delegate send() to @io
+	  for Net::FTP#abort and Net::FTP#status.
+
+Sun Apr  1 00:41:56 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb: fixed the domain name in examples.
+
+Sat Mar 31 21:39:45 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler): dup to prevent
+	  @timeout_info's "can't add a new key into hash during iteration".
+
+Sat Mar 31 14:22:59 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (hash_default_value): extract from rb_hash_aref(), to be
+	  shared with rb_hash_shift(), so that overriding Hash#default
+	  will be respected.
+
+Sat Mar 31 14:16:02 2012  Sokolov Yura (funny-falcon)  <funny.falcon@gmail.com>
+
+	* hash.c: do not allocate st_table when it is not necessary.
+
+Sat Mar 31 13:42:39 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (read_timeout=, open_timeout=): supported timeout.
+
+Sat Mar 31 13:20:40 2012  Sokolov Yura (funny-falcon)  <funny.falcon@gmail.com>
+
+	* hash.c: remove unnecessary checks for Qundef in hash iterations.
+	  since hash use st_foreach_check for iterations, such checks are
+	  needless.
+
+Sat Mar 31 12:05:01 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_x509cert.c: Fix doc typo.
+
+Sat Mar 31 10:13:24 2012  Sokolov Yura (funny-falcon)  <funny.falcon@gmail.com>
+
+	* st.c (st_foreach_check, st_foreach): remove ancient check.  This
+	  check are from initial ordered hash commit when first entry were
+	  created with entry->fore = entry->back = entry.
+
+	* st.c (st_delete): use real_entries in st_delete for packed tables
+
+Sat Mar 31 07:53:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (st_foreach_check): remove the entry by replacing with never
+	  when ST_DELETE.
+
+	* hash.c (st_foreach_safe): since table is not for VALUE, Qundef is
+	  not special value, so use 0 instead.  therefore this function can be
+	  applied to only st_table which 0 is invalid as keys, e.g., IDs.
+
+	* hash.c: Qundef cannot be passed from st_foreach_check().
+
+	* hash.c, marshal.c, object.c, variable.c: fix callback argument types
+	  of iterators.
+
+Thu Mar 29 23:50:15 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (st_update): pass pointer to key to the callback function.
+
+Thu Mar 29 16:36:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (st_update): add existing parameter to the callback function.
+
+Thu Mar 29 16:35:32 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (terminal_width, del_status_line, put_status):
+	  extract as methods.
+
+Thu Mar 29 10:20:18 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_pkcs7.c: fix crash when parsing garbage data.
+	* test/openssl/test_pkcs7.rb: assert correct behavior for it.
+	  Thanks to Matt Venables for reporting the issue.
+	  [ruby-core:43250][Bug #6134]
+
+Thu Mar 29 10:16:05 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (TIME_QUANTUM_USEC): 10ms(= old setting) [experimental]
+	  cf. [Bug #6098]
+
+Thu Mar 29 10:12:12 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (rb_threadptr_execute_interrupts_common): use defined
+	  TIME_QUANTUM_USEC instead of a magic number.  there is no meanings
+	  to use different values for checking interval of interruption and
+	  thread switching limits.
+	  cf. [Bug #6098]
+
+Thu Mar 29 09:26:17 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_x509cert.rb: exclude test that fails when issuing
+	  a certificate with RSA signature and DSS1 digest for earlier
+	  OpenSSL versions when used in conjunction with OpenSSL 1.0.1.
+	  Thanks, Vit Ondruch, for reporting the issue.
+	  [ruby-core:42949][Bug #6089]
+
+Thu Mar 29 08:25:35 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* NEWS: add note about unified behavior of encoding nil values in
+	  instances of OpenSSL::ASN1::ASN1Data.
+
+Thu Mar 29 07:45:36 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c: raise TypeError when trying to encode nil
+	  values for Primitive instances.
+	* test/openssl/test_asn1.rb: Assert consistent behavior when
+	  encoding nil values: Primitives raise TypeError, Constructives
+	  raise NoMethodError.
+	  Fixes [ruby-core:43009][Bug #6102]
+
+Wed Mar 28 16:39:59 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (obj2uid, obj2gid): allow strings as input user/group id.
+	  [ruby-core:40923][Feature #5610]
+
+Wed Mar 28 15:06:18 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_symreal): default to ASCII-8BIT for non-ascii symbols,
+	  otherwise it should be converted to US-ASCII in rb_intern_str() if
+	  possible.  [ruby-core:43762][Bug #6209]
+
+Wed Mar 28 08:44:24 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: updating version to match gem
+	* ext/psych/psych.gemspec: ditto
+	* ext/psych/lib/psych/visitors/to_ruby.rb: fixing deprecation warning
+
+Tue Mar 27 23:44:11 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (io_unread): fixed memory leak.  report by nagachika via IRC.
+
+Tue Mar 27 22:44:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (verconf.h): separate load path specific stuff from
+	  config.h.
+
+Tue Mar 27 22:43:40 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub: fix config.h path to include.
+
+Tue Mar 27 17:08:08 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* win32/win32.c (check_if_dir): fix memory leak.
+
+Tue Mar 27 13:13:51 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_new_empty): should copy also the encoding as an
+	  empty substring.  [ruby-dev:45441][Bug #6206]
+
+Mon Mar 26 23:43:04 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (parse227, parse228, parse229): don't use $~.
+
+Mon Mar 26 23:34:40 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (parse227, parse228, parse229): don't use local
+	  variables defined by named capture for other Ruby implementations
+	  such as Rubinius.
+
+Mon Mar 26 23:19:03 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (parse_pasv_port): refactored.
+
+Mon Mar 26 19:49:49 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/net/ftp/test_ftp.rb: add the test, which was forgotten in the
+	  previous commit.
+
+Mon Mar 26 19:37:27 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (parse227, parse228, parse229): refactored.
+
+Mon Mar 26 11:46:23 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (inspect_enumerator): show method arguments of
+	  lazy enumerators correctly.
+
+Mon Mar 26 13:51:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (check_if_dir, check_if_wdir): fix for Visual C++
+	  not to use S_ISDIR().  [Feature #2408][ruby-core:26925]
+
+	* ruby.c (load_file_internal): ditto.
+
+Mon Mar 26 11:46:01 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file_internal): bail out if the script is a directory.
+	  [Feature #2408][ruby-core:26925]
+
+	* win32/win32.c (rb_w32_open, rb_w32_wopen): check if the file is a
+	  directory when access denied, to set errno to EISDIR.
+
+Sun Mar 25 18:13:14 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (tr_setup_table): fix multiple non latin argument for
+	  non latin (over 256 characters) tr-like methods.
+	  [ruby-core:43371] [Bug #6167]
+
+Sun Mar 25 00:46:06 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator (lazy_initialize): set the instance variable "receiver"
+	  to include the receiver to the return value of inspect on a lazy
+	  enumerator directly created by Enumerator::Lazy.new.
+
+	* enumerator (RETURN_LAZY): don't set the instance variable "receiver".
+
+Sat Mar 24 23:59:00 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator (enumerator_inspect): include the original receiver and
+	  method name of Enumerator::Lazy in the result of inspect.
+	  [ruby-core:43345] [Bug #6159]
+
+	* enumerator (InitVM_Enumerator): don't use rb_define_alias for
+	  some methods such as collect in order to make rb_frame_this_func()
+	  return the correct method names.
+
+Sat Mar 24 22:22:18 2012  Sambasiva Rao Suda  <sambasivarao@gmail.org>
+
+	* time.c (time_init_1): Time.new will accept seconds as string or
+	  int.  [ruby-core:43569][Bug #6193]
+
+Fri Mar 23 15:12:12 2012  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c (documentation for str_encode): Explain
+	  that transcoding to the same encoding is a no-op
+	  (i.e. no exceptions, no replacements,...).
+	  [ruby-core:43557][Bug #6190]
+
+Fri Mar 23 13:19:20 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_str_to_inum): must be ASCII compatible encoding as
+	  well as String#hex and String#oct.  [ruby-core:43566][Bug #6192]
+
+	* string.c (rb_must_asciicompat): check if ASCII compatible.
+
+Thu Mar 22 23:14:36 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (str_encode_bang, encoded_dup): if nothing was
+	  transcoded, just set encoding but leave coderange unchanged as
+	  force_encoding.  [ruby-core:43557][Bug #6190]
+
+Thu Mar 22 22:30:44 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* io.c (static int io_fflush): add the definition.
+	  Use it in set_binary_mode_with_seek_cur().
+
+	* io.c (set_binary_mode_with_seek_cur): refactoring to split the
+	  content into io_unread(). Fix the possibility of buffer overflow.
+
+	* io.c (io_unread): add new implementation for Windows. Previous one
+	  caused invalid cursor position using IO#pos with OS text mode. New
+	  one fixes the bug.
+
+	* test/ruby/test_io_m17n.rb
+	  (TestIO_M17N#test_pos_dont_move_cursor_position): add a test for
+	  above bug.
+	  [ruby-core:43497] [Bug #6179]
+
+Thu Mar 22 19:55:08 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_fstat, rb_w32_fstati64): convert FILETIME
+	  to time_t directly, not to be affected by TZ unnecessarily.
+
+	* win32/win32.c (unixtime_to_filetime): convert time_t to FILETIME
+	  simply.
+
+Thu Mar 22 13:43:31 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_pkey_rsa.c (rsa_generate): fix argument type.
+	  [Bug #6094]
+
+Thu Mar 22 11:14:10 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#test_pos_with_getc): updated.
+	  see [ruby-core:43550]
+
+Wed Mar 21 17:57:57 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c: Merge Onigmo 3d855b30d574536d3ae600260208c6624ae4791c.
+	  [Bug#6143] [Bug#6144] [Bug#6145]
+
+Wed Mar 21 17:01:55 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#test_pos_with_getc): added.
+	  see [Bug #6179][ruby-core:43518]
+
+Mon Mar 19 17:18:51 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (lazy_flat_map_func): convert the block value to
+	  Array if it doesn't respond to each.  [ruby-core:43334]
+	  [Bug #6155]
+
+Mon Mar 19 16:34:14 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enum.c (zip_i): variadic argument needs explicit cast on the
+	  platforms where VALUE is longer than int.
+
+Mon Mar 19 15:36:41 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (enumerable_lazy): add an example of take and first
+	  to the documentation.  [ruby-core:43344] [Bug #6158]
+	  add the description of the behavior when a block is given to zip
+	  or cycle.
+
+Mon Mar 19 15:20:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_specialized_instruction): DRY and replace chain
+	  of if-else with switch for special instructions.  based on a
+	  patch by Vasfed.  https://github.com/ruby/ruby/pull/105
+
+Mon Mar 19 15:05:54 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/test_pty.rb: same as r29280, skip tests when PTY allocation
+	  failed (that's not our fault).
+
+Sun Mar 18 23:21:17 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (aligned_free): fix condition for free.  memalign() and
+	  posix_memalign() are not defined together normally.
+
+Sun Mar 18 18:31:45 2012  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* gc.c (aligned_malloc, aligned_free): added fallback implementations
+	  for platforms like OSX Leopard.
+
+Sun Mar 18 17:17:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_pow): estimate result bit size more precisely.
+	  [ruby-core:30735][Feature #3429]
+
+Sun Mar 18 17:17:36 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (free_method_entry_i): method entry may be in
+	  unlinked_method_entry_list.  [ruby-core:43383][Bug #6171]
+
+Sun Mar 18 15:27:31 2012  Tanaka Akira  <akr@fsij.org>
+
+	* compile.c: typo fix by Run Paint Run Run.
+	  [ruby-core:28368] [Bug #2824]
+
+Sun Mar 18 10:01:02 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/profiler.rb: support calling singleton methods of
+	  an instance of BasicObject.
+
+Sat Mar 17 06:56:58 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c:  Fix indentation of Class#inherited example.
+
+Sat Mar 17 01:46:05 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* string.c (trnext): fix bug with string ending with '\\'.
+	  [ruby-dev:45374][Bug #6160]
+
+	* test/ruby/test_string.rb (TestString#test_delete): test for
+	  above.
+
+Fri Mar 16 20:06:24 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (trnext): should advance char-wise.
+	  [ruby-core:43335][Bug #6156]
+
+Fri Mar 16 17:42:05 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (block_append_gen): fix unreachable warning line number.
+	  should warn at the code, not jump.
+
+Fri Mar 16 17:33:08 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_take): allocate buffer array before iteration, as well
+	  as enum_first did.
+
+	* enum.c (enum_first): remove duplication.
+
+Fri Mar 16 14:43:18 2012  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* load.c (ruby_init_ext): don't free the given pointer itself.
+	  It is not guaranteed even that the pointer is on heap.
+
+Fri Mar 16 14:37:57 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_eval.c (rb_mod_module_eval): fix the documentation of
+	  class_eval to mention class variable lookup.  [ruby-core:40649]
+	  [Bug #5544]
+
+Fri Mar 16 14:27:11 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_eval.c (rb_mod_module_eval): fix the documentation of
+	  class_eval to mention constant lookup.  [ruby-core:41718]
+	  [Bug #5777]
+
+Fri Mar 16 14:10:45 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (initialize): raise Net::IMAP::Error when the
+	  connection is closed without a greeting response.
+	  [ruby-core:40938] [Bug #5616]
+
+Fri Mar 16 13:50:12 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (rfc822_text): ignore [] after RFC822.
+	  [ruby-core:40945] [Bug #5620]
+
+Fri Mar 16 12:00:42 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (argument_error): use line number at the beginning
+	  of lambda, not the first code of its body.
+	  [ruby-core:43314][Bug #6151]
+
+	* iseq.c (rb_iseq_first_lineno): constified.
+
+Fri Mar 16 11:20:07 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (lazy_take): don't enumerate an extra value.
+	  [ruby-dev:45370] [Bug #6152]
+
+Fri Mar 16 06:30:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (lazy_zip_func): variadic argument needs explicit cast
+	  on the platforms where VALUE is longer than int.
+
+	* enumerator.c (lazy_init_iterator): no need to check overflow twice.
+
+Fri Mar 16 05:47:09 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* enumerator.c (lazy_init_iterator):  Fix type error (int vs long).
+
+Thu Mar 15 23:13:36 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enum.c (rb_enum_values_pack): rename from enum_values_pack, and
+	  remove static.
+
+	* enumerator.c (lazy_init_iterator, lazy_init_yielder,
+	  lazy_select_func, lazy_reject_func, lazy_grep_func): handle
+	  multiple values correctly.
+
+	* enumerator.c (lazy_grep): change the behavior when a block is
+	  given, to be consistent with Enumerable#grep.
+
+Thu Mar 15 19:12:31 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (lazy_zip): rescue StopIteration returned by
+	  Enumerator#next.
+
+Thu Mar 15 18:19:53 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (lazy_zip, lazy_cycle): Enumerator::Lazy#{zip,cycle}
+	  should be eager when a block is given, to be consistent with
+	  Enumerable#{zip,cycle}.
+
+Thu Mar 15 17:45:27 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (InitVM_Enumerator): renamed Enumerable::Lazy to
+	  Enumerator::Lazy.
+
+Thu Mar 15 16:37:38 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (enumerable_lazy): added cycle to the documentation.
+
+Thu Mar 15 15:37:42 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): fix warning line number.
+
+Thu Mar 15 15:19:38 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (lazy_cycle): check argument number overflow before
+	  creating temporary array.
+
+Thu Mar 15 15:04:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_strtod): no need to check same digit for hexdigit
+	  twice.  [ruby-dev:45363][Bug #6146]
+
+	* parse.y (sym_check_asciionly): check ascii compatibility before
+	  scanning for code range.
+
+	* parse.y (intern_str): set to us-ascii if ascii only.
+	  [ruby-dev:45363][Bug #6146]
+
+	* file.c (ruby_enc_find_basename): allow NULL as alllen.
+	  [ruby-dev:45363][Bug #6146]
+
+Thu Mar 15 14:49:31 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_conv_enc_opts): default to original encoding.
+
+Thu Mar 15 13:47:17 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* hash.c (env_str_new, rb_f_getenv, env_fetch): use rb_str_conv_enc()
+	  instead of rb_str_encode() to simplify the code.
+
+Thu Mar 15 12:44:50 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (rb_w32_ugetenv): new API to
+	  accept and to return UTF-8 strings.
+
+	* win32/win32.c (rb_w32_getenv): follow above change.
+
+	* win32/win32.c (rb_w32_get_environ): returns UTF-8 environment area.
+
+	* hash.c (env_str_new, rb_f_getenv, env_fetch): follow above changes.
+	  [Bug #5570] [ruby-core:40737]
+
+Thu Mar 15 10:57:27 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (lazy_cycle): add Enumerable::Lazy#cycle.
+
+Thu Mar 15 10:31:40 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_arity.rb (TestArity#err_mess): use assert_raise.
+
+Thu Mar 15 07:03:52 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* vm_eval.c (check_funcall):  Raise ArgumentError if respond_to?
+	  requires more than three arguments. [Bug #6000]
+
+	* test/ruby/test_object.rb (class TestObject):  Test for respond_to?
+	  requiring more than three arguments.
+
+Thu Mar 15 06:08:06 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* include/ruby/intern.h: Add rb_check_arity, rb_error_arity [#6085]
+
+	* array.c: Use rb_check_arity / rb_error_arity
+
+	* class.c: ditto
+
+	* enumerator.c: ditto
+
+	* eval.c: ditto
+
+	* file.c: ditto
+
+	* hash.c: ditto
+
+	* numeric.c: ditto
+
+	* proc.c: ditto
+
+	* process.c: ditto
+
+	* random.c: ditto
+
+	* re.c: ditto
+
+	* signal.c: ditto
+
+	* string.c: ditto
+
+	* struct.c: ditto
+
+	* transcode.c: ditto
+
+	* vm_eval.c: ditto
+
+	* vm_insnhelper.c: ditto & implementation of rb_error_arity
+
+	* test/ruby/test_arity.rb: tests for above
+
+Thu Mar 15 06:08:05 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* vm_insnhelper.c: improve number of arguments error in case of
+	  optional parameters (issue #6085)
+
+	* include/ruby/intern.h: define UNLIMITED_ARGUMENTS
+
+	* test/ruby/test_arity.rb:  test for above
+
+Thu Mar 15 00:58:04 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (enumerable_lazy): fix the documentation of
+	  Enumerable#lazy.
+
+Wed Mar 14 22:01:06 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (lazy_init_iterator): break when Qundef is returned
+	  to make obj.drop(3).take(2) work properly.
+
+	* enumerator.c (lazy_take_while): add Enumerable::Lazy#take_while.
+
+	* enumerator.c (lazy_drop): add Enumerable::Lazy#drop.
+
+	* enumerator.c (lazy_drop_while): add Enumerable::Lazy#drop_while.
+
+	* enumerator.c (InitVM_Enumerator): add Enumerable::Lazy#force as an
+	  alias of to_a.
+
+Wed Mar 14 19:28:40 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (lazy_take): add Enumerable::Lazy#take.
+
+Wed Mar 14 18:40:36 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c: use long for array indices.
+
+Wed Mar 14 18:25:18 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c: moved the comment of StopIteration.
+
+Wed Mar 14 17:55:29 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (flodivmod): must go through the same pass if HAVE_FMOD or
+	  not.  this is a bugfix of r35013.
+
+Wed Mar 14 16:41:55 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/test_tmpdir.rb (TestTmpdir#test_world_writable): skip on Windows.
+
+Wed Mar 14 15:09:23 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* numeric.c: fix flodivmod for cornercases [Bug #6044]
+	  add ruby_float_mod
+
+	* insns.def (opt_mod): use ruby_float_mod
+
+	* internal.h: declare ruby_float_mod
+
+	* test/ruby/test_float.rb: tests for above
+
+	* test/ruby/envutil.rb: create helper assert_is_minus_zero
+
+Wed Mar 14 10:44:35 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (lazy_grep_func): should use === instead of =~, as
+	  well as Enumerable#grep
+
+Wed Mar 14 08:15:54 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (lazy_flat_map_func): use each for non-Array objects.
+
+Wed Mar 14 08:06:35 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (lazy_zip): add Enumerable::Lazy#zip.
+
+	* enumerator.c (lazy_lazy): just returns self.
+
+Wed Mar 14 07:48:36 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (datetime_s_now): [ruby-core:43256].
+
+Tue Mar 13 22:00:14 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_set_arguments): keyword rest arg without keyword args.
+
+	* node.c (dump_node): dump kw_rest_arg too.
+
+	* parse.y (block_param, f_arg): more kwrest patterns.
+	  [ruby-core:42455][Bug #5989]
+
+	* parse.y (new_args_gen): no extra kw_rest_arg if no keyword rest arg.
+
+Tue Mar 13 15:17:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (block_param, f_args): add rules for the case arguments
+	  begin with kwrest.  [ruby-core:42455][Bug #5989]
+
+Tue Mar 13 12:37:53 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (io_encoding_set): always warn if external encoding and internal
+	  encoding are identical. [ruby-core:40727] [Bug #5568]
+
+Tue Mar 13 12:37:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c: add ObjectSpace::WeakMap.  [ruby-dev:44565][Bug #5350]
+
+	* lib/weakref.rb: use WeakMap instead of _id2ref.
+
+Tue Mar 13 10:59:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (prepare): skip if basedir is not defined.
+	  [ruby-core:39135][Bug #5238]
+
+	* tool/rbinstall.rb (CONFIG.[]): check for mandatory
+	  configurations.
+
+Tue Mar 13 00:09:18 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (enumerable_lazy): added documentation.
+
+Mon Mar 12 20:19:25 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tmpdir.rb (Dir::tmpdir): test the current directory suitable for
+	  temporary directory.
+
+Mon Mar 12 20:08:16 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/fileutils.rb (fu_have_symlink?): specify TypeError for rescue
+	  clause.
+
+Mon Mar 12 19:23:13 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_find_encoding): new function find encoding from
+	  arbitrary object as a pointer to rb_encoding, and return NULL if
+	  not found.
+
+	* io.c (io_encoding_set): just warn unsupported encodings, but not
+	  exception.  [ruby-core:40726] [Bug #5567]
+
+Mon Mar 12 19:03:32 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (Init_eval_method): respond_to? and
+	  respond_to_missing? are public.
+
+Mon Mar 12 14:56:52 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.h (NEW_YIELD), parse.y (new_yield_gen): array-values flags
+	  has been already obsolete.  patch by Thomas Enebo.
+	  [ruby-core:41929][Bug #5847]
+
+Mon Mar 12 12:44:33 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (Init_eval_method): copy basic methods to Exception.
+	  [ruby-core:40287][Bug #5473]
+
+Mon Mar 12 10:13:36 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_jump.c (rb_exec_end_proc): remember the latest exit status.
+	  [ruby-core:43173][Bug #5218]
+
+Mon Mar 12 07:33:12 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tmpdir.rb: update document for changing
+	  FileUtils.remove_entry_secure to FileUtils.remove_entry.
+
+	* NEWS: add incompatibility note for lib/tmpdir.rb.
+
+Mon Mar 12 07:19:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tmpdir.rb (Dir.tmpdir): should not use world-writable but
+	  non-sticky directory.
+
+	* lib/tmpdir.rb (Dir.mktmpdir): check the parent directory.
+
+Mon Mar 12 07:04:11 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (Init_Random): removed rb_Random_DEFAULT and register as
+	  mark-object instead of global variable.
+
+Mon Mar 12 07:03:32 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (random_s_rand): ensure default PRNG is re-initialized
+	  after fork.  patched by Eric Wong.  [ruby-core:41209][Bug #5661]
+
+Sun Mar 11 23:57:29 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* pack.c (pack_unpack): when unpack('M') occurs an illegal byte
+	  sequence, output the "=" character and the following character in
+	  the decoded data without any transformation.
+	  [ruby-dev:44875] [Bug #5635]
+
+Sun Mar 11 22:32:43 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: Merge 164a75c8bd2007d32c4d7665d53140d8fc126dcd.
+	  [ruby-core:41917] [Bug #5846]
+
+Sun Mar 11 17:10:04 2012  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb: Put error message into STDERR if failed to launch
+	  worker (job) process. [ruby-dev:44802] [Bug #5577]
+
+	* lib/test/unit/parallel.rb: If failed to increment_io, exit with code
+	  2. [ruby-dev:44802] [Bug #5577]
+
+Sun Mar 11 15:46:45 2012  Shota Fukumori  <sorah@tubusu.net>
+
+	* io.c: fix rdoc of `IO.binwrite` to show same as `IO.write` except
+	  it opens file with mode "wb:ASCII-8BIT". [Bug #5782] [ruby-core:42592]
+
+Sat Mar 10 23:52:28 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c: pack tables also generic keys.  patched by Sokolov Yura at
+	  https://github.com/ruby/ruby/pull/84
+
+	* st.c: add st_foreach_check for fixing iteration over packed table
+	  and st_delete_safe.  patched by Sokolov Yura at
+	  https://github.com/ruby/ruby/pull/84
+
+	* st.c: fix packed num_entries on delete_safe.  patched by Sokolov
+	  Yura at https://github.com/ruby/ruby/pull/84
+
+Fri Mar  9 14:29:32 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enumerator.c (lazy_flat_map): add Enumerable::Lazy#flat_map.
+
+Fri Mar  9 06:29:22 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb (load, parse): stop parsing or loading after
+	  the first document has been parsed.
+
+	* test/psych/test_stream.rb: pertinent tests.
+
+Fri Mar  9 06:17:05 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb (parse_stream, load_stream): if a block is
+	  given, documents will be yielded to the block as they are parsed.
+	  [ruby-core:42404] [Bug #5978]
+
+	* ext/psych/lib/psych/handlers/document_stream.rb: add a handler that
+	  yields documents as they are parsed
+
+	* test/psych/test_stream.rb: corresponding tests.
+
+Fri Mar  9 00:35:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (lazy_initialize, enumerable_lazy): no additional
+	  arguments.
+
+Fri Mar  9 00:30:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c: add Enumerable#lazy. based on the patch by
+	  Innokenty Mikhailov at <https://github.com/ruby/ruby/pull/101>
+	  [ruby-core:37164] [Feature #4890]
+
+Fri Mar  9 00:25:59 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (enumerator_each, generator_each): pass arguments to
+	  the block with yielder.
+
+Fri Mar  9 00:25:02 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_cat): new function to concat objects into array.
+
+Thu Mar  8 16:44:02 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* .gdbinit (rb_numtable_entry): update for recent refactoring of
+	  st_table.
+
+Wed Mar  7 22:41:50 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* lib/xmlrpc/client.rb (module XMLRPC): fix typo.
+
+	* test/xmlrpc/test_client.rb (test_async_call): add test for
+	  XMLRPC::Client#call_async to check above fix.
+
+Wed Mar  7 16:30:24 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_load_fail): should honor encoding.
+
+	* load.c (load_failed): ditto.
+
+Wed Mar  7 12:26:25 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_load_fail): use path as a string, not char*.
+
+	* internal.h: (rb_load_fail): moved from ruby/intern.h.
+
+	* ruby.c (load_file_internal): fname cannot be NULL.
+
+Wed Mar  7 08:32:43 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* error.c (rb_loaderror_with_path): Adding the missing file as an
+	  instance variable to the LoadError exception.
+	  [ruby-core:39079]
+
+	* load.c: call rb_loaderror_with_path so that the missing path is
+	  added to the exception.
+
+	* ruby.c: call rb_loaderror rather than raising our own LoadError
+	  exception.
+
+	* include/ruby/intern.h: add declaration for rb_loaderror_with_path.
+
+	* test/ruby/test_require.rb: add supporting test for LoadError#path
+	  method.
+
+Wed Mar  7 08:28:00 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/xmlrpc/parser.rb: support i8 types. Thanks Stas Kelvich!
+	  [ruby-core:29246] [Feature #3090]
+
+	* test/xmlrpc/test_client.rb: supporting test
+
+Wed Mar  7 07:43:29 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/xmlrpc/client.rb: assume servers that do not send a Content-Type
+	  header are sending 'text/xml'. Thanks Nathan Leavitt!
+	  [ruby-core:41204] [Bug #5660]
+
+	* test/xmlrpc/test_client.rb: supporting test
+
+Wed Mar  7 07:39:28 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* test/xmlrpc/test_client.rb: adding a test for performing an XMLRPC
+	  call.
+	* test/xmlrpc/data/blog.xml: supporting XML document for the response.
+
+Tue Mar  6 16:24:01 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_tokadd_string): escape simple regexp meta
+	  character terminators.
+
+Tue Mar  6 10:11:43 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (set_rawmode): clear ECHOE and ECHOK
+	  bits too.
+
+	* ext/io/console/console.c (echo_p): ignore ECHOE and ECHOK bits.
+	  [ruby-dev:45309] [Bug #6116]
+
+	* ext/io/console/console.c (console_raw): fix rdoc.
+
+	* ext/io/console/console.c (console_set_echo): mentioned about
+	  platform dependency.
+
+Tue Mar  6 07:18:10 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/xmlrpc/client.rb: switch net/http post2 calls to modern
+	  `request_post` methods.
+
+Tue Mar  6 02:31:20 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/core_ext.rb: only extend Kernel if IRB is loaded
+	  in order to stop method pollution.
+
+Tue Mar  6 01:34:19 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (block_call): rules for block_call after block_call.
+	  based on a patch by pasberth https://github.com/ruby/ruby/pull/102
+	  [ruby-dev:45308][Bug #6115]
+
+Tue Mar  6 01:24:13 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (block_command, block_call): simplified rules.
+
+Mon Mar  5 18:28:35 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_regexp.rb (TestRegexp#test_source): fix typo.
+	* test/ruby/test_regexp.rb (TestRegexp#test_equal): ditto.
+
+Mon Mar  5 17:11:44 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/lib/syck/rubytypes.rb (Exception.yaml_new): fix bug
+	  that causes YAML serialization problem for Exception.
+	  Exception#initialize doesn't use visible instance variable for
+	  the exception message, so call the method with the message.
+	  patched by Jingwen Owen Ou <jingweno AT gmail.com>.
+	  http://github.com/ruby/ruby/pull/41
+
+Mon Mar  5 16:50:22 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_sleep.rb (TestSleep#test_sleep_5sec): syntax error.
+
+	* test/ruby/test_sleep.rb (TestSleep#test_sleep_5sec): call uname
+	  only on linux because it's a workaround for linux only.
+
+Mon Mar  5 12:44:12 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (unpack_entries): chain entries directly.  based on a patch
+	  by Sokolov Yura <funny.falcon AT gmail.com>.
+
+	* st.c (unpack_entries): use union instead of casted pointer.
+	  patched by Sokolov Yura <funny.falcon AT gmail.com>.
+
+	* st.c: use PACKED_ENT and FIND_ENTRY.  patched by Sokolov
+	  Yura <funny.falcon AT gmail.com>.
+
+	* st.c (unpack_entries): reallocate bins if packed array size
+	  is not same as initial bins size.  based on a patch by
+	  Sokolov Yura <funny.falcon AT gmail.com>.
+
+Mon Mar  5 11:51:48 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb: remove description about
+	  BigMath#log. patched by Sho Hashimoto [ruby-dev:45307] [Bug #6112]
+
+	* string.c (str_byteslice): fix typo.
+
+Sun Mar  4 23:21:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_tokadd_string): regexp engine doesn't need
+	  terminators to be escaped.  [ruby-core:40364][Bug #5484]
+
+Sat Mar  3 22:51:46 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_run_exec_options_err): chdir at last to interpret
+	  relative pathnames from the current directory of the parent process.
+
+Sat Mar  3 12:20:44 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strftime.c: reassigned some variables.
+
+Sat Mar  3 12:12:16 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_{parse,strptime}.c: [ruby-dev:45303].
+
+Sat Mar  3 10:09:21 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/xmlrpc/client.rb (initialize): net/http defaults to 1_2 in 1.8+,
+	  so we can safely remove the call to enable it.
+
+Sat Mar  3 08:42:25 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/xmlrpc/client.rb (new2): use URI for uri parsing.
+	* test/xmlrpc/test_client.rb: test that query params are passed to the
+	  client constructor.
+
+Sat Mar  3 08:20:10 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/xmlrpc/client.rb (new2): raises an ArgumentError on bad
+	  arguments.
+	* test/xmlrpc/test_client.rb: tests for bad uris
+
+Sat Mar  3 08:08:11 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/xmlrpc/client.rb (new2): fix custom port specification when an
+	  SSL uri is used.
+	* test/xmlrpc/test_client.rb: tests for XMLRPC::Client.new2
+
+Sat Mar  3 08:03:29 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/rubyext.c (mktime_do): use ISDIGIT().
+	  [ruby-core:43060] [Bug #6108]
+
+	* ext/syck/token.c (sycklex_yaml_utf8): cast as unsigned char.
+	  [ruby-core:43060] [Bug #6108]
+
+Sat Mar  3 06:57:14 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ruby_pc): make configurable.  [Bug #6051]
+
+Fri Mar  2 17:49:03 2012  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* .travis.yml (branches): Enable TravisCI for ruby_1_9_3.
+
+Fri Mar  2 17:13:33 2012  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* test/ruby/test_array.rb (test_combination2): Make the test case for
+	  [ruby-core:29240] more descriptive.
+	  cf. http://bugs.jruby.org/6518
+
+Fri Mar  2 16:37:11 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): use wcscasecmp().
+
+Fri Mar  2 16:36:31 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (native_cond_timeout): cast explicitly to suppress
+	  a warning.
+
+Fri Mar  2 16:35:56 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (pipe_open): cmd is no longer used if fork is available.
+
+Thu Mar  1 16:13:18 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (rb_file_const, rb_file_load_ok): moved functions for
+	  internal use only.
+
+Thu Mar  1 15:40:05 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/makedirs.bat: new command to make intermediate
+	  directories, and not to report any errors if the directory
+	  already exists.
+
+	* win32/Makefile.sub (MAKEDIRS): enable command extensions.
+
+Thu Mar  1 01:25:43 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (is_onechar_cclass): optimize character class
+	  Merge Onigmo 27278c12e6674043cc8affca6507e20e119a86ee.
+
+	* regparse.c (is_onechar_cclass): [bug] unexpected match occurs when a
+	  char class contains no char
+
+	* enc/unicode.c (init_case_fold_table): define the sizes of case
+	  folding tables in casefold.h
+
+Wed Feb 29 16:11:34 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (MAKEDIRS): use mkdir of cmd.exe instead of ruby.
+	  [Bug #6103] [ruby-core:43012]
+
+	* win32/README.win32: added a notice about command extension of cmd.exe.
+
+Wed Feb 29 15:39:39 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#test_readpartial_locktmp): skip on
+	  windows because of the platform restriction.
+
+Wed Feb 29 15:38:50 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/memory_status.rb (Memory): syntax error.
+
+Wed Feb 29 13:06:42 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/memory_status.rb: use /proc/self/status if it is in
+	  the expected format.
+
+Wed Feb 29 06:14:51 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: reverted r34825.
+
+Tue Feb 28 23:20:01 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* Makefile.in (PLATFORM_DIR): add a variable for `win32` directory.
+	* Makefile.in (clean-platform): add new target.
+	  It cleans `win32` directory.
+
+	* common.mk (clean): add a dependency for `win32` directory.
+	* common.mk (distclean): ditto.
+	* common.mk (distclean-platform): add new target.
+	  It cleans `win32` directory.
+	* common.mk ($(PLATFORM_D)): add new target to make `win32` directory.
+	* common.mk (win32/win32.$(OBJEXT)): move win32.o into `win32`
+	  directory.
+	* common.mk (win32/file.$(OBJEXT)): add new target for win32/file.c.
+
+	* configure.in: move win32.o into `win32` directory and add
+	  win32/file.o to MISSING.
+
+	* file.c (file_load_ok, rb_file_load_ok): replace static
+	  file_load_ok() with public rb_file_load_ok().
+	  It's to link Windows implementation in win32/file.c.
+	* file.c (rb_find_file_ext_safe): ditto.
+	* file.c (rb_find_file_safe): ditto.
+
+	* win32/file.c (rb_file_load_ok): new file. Add Windows specific
+	  optimized implementation of rb_file_load_ok(). We created a
+	  separated file to avoid too many #ifdef macro which is unreadable.
+
+	* win32/Makefile.sub (PLATFORM_DIR): add a variable for `win32`
+	  directory.
+	* win32/Makefile.sub (MISSING): move win32.obj into `win32`
+	  directory and add win32/file.obj to MISSING.
+	* win32/Makefile.sub (MAKEDIRS): replace MINIRUBY with BASERUBY.
+	  It's because miniruby doesn't exist when making `win32` directory.
+	* win32/Makefile.sub (clean-platform): add new target to clean `win32`
+	  directory.
+	* win32/Makefile.sub ({$(srcdir)}.c{}.obj): make it not match
+	  win32/file.c to build properly.
+	* win32/Makefile.sub (win32/win32.$(OBJEXT)): move win32.obj into
+	 `win32` directory.
+
+	  Patch created with Luis Lavena.
+	  [ruby-core:42480] [Feature #5999]
+
+Tue Feb 28 20:27:25 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: [ruby-core:42998]
+
+Tue Feb 28 18:47:44 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_binwrite, rb_io_syswrite): use shared frozen source
+	  strings.
+
+	* io.c (io_fread, io_getpartial, rb_io_sysread): set buffer size
+	  after check if readable, which can cause thread switch.
+	  [ruby-dev:45297][Bug #6099]
+
+Tue Feb 28 17:16:01 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/time.rb (Time#xmlschema): use strftime specifiers instead of
+	  fractional exponential calculation which yields undesirable
+	  result.  [ruby-core:42997][Bug #6100]
+
+Tue Feb 28 14:15:29 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/protocol.rb: Add OpenTimeout subclass of Timeout::Error
+	* lib/net/pop.rb:  Modernize Timeout usage.  Patch by Eric Wong.
+	  Use Net::OpenTimeout instead of Timeout::Error.  [Bug #5765]
+	* lib/net/http.rb:  ditto
+	* lib/net/smtp.rb:  ditto
+	* lib/net/telnet.rb:  ditto
+
+Tue Feb 28 13:51:12 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Retry HTTP requests for additional network errors.
+	  Introduce OpenTimeout subclass of Timeout::Error.  [Bug #6001]
+	* test/net/http/test_http.rb:  Reduce timeout to 0.01s for faster test
+	* test/net/http/test_https.rb:  ditto
+
+Tue Feb 28 11:44:49 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (debugflags): check if -ggdb is accepted.
+	  [ruby-core:42875][Bug #6080]
+
+Tue Feb 28 10:28:51 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: default open YAML files with utf8 external
+	  encoding. [ruby-core:42967]
+	* test/psych/test_tainted.rb: ditto
+
+Mon Feb 27 23:46:09 2012  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (opt_bv_decl): allow newline at the end.  [ruby-dev:45292]
+
+Mon Feb 27 20:43:05 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_set_pos): add rdoc about textmode.
+
+	* test/ruby/test_io.rb (TestIO#test_setpos): use binmode.
+
+Mon Feb 27 17:00:15 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* string.c (rb_str_crypt): Update rdoc and state that this
+	  function is system dependent.  Reviewed by nobu, thanks to
+	  @takai.
+
+Mon Feb 27 17:03:20 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): since methods
+	  can be overridden, so should not make an assumption on the type
+	  of results.  [ruby-core:42969][Bug #6093]
+
+Mon Feb 27 10:54:20 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): replace the
+	  target flags if the given flag is accepted.
+
+Mon Feb 27 10:53:44 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rubygems/test_gem_specification.rb (test_self_from_yaml_syck_default_key_bug):
+	  ignore the test for too old versions.
+
+Mon Feb 27 10:53:12 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#puke): skips with no
+	  messages should be trivial.
+
+Mon Feb 27 10:50:23 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c, process.c, time.c, ext: use rb_sys_fail_str instead of
+	  rb_sys_fail.
+
+Mon Feb 27 10:48:49 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/extconf.rb: suppress useless deprecation warnings
+	  from OpenSSL added by Apple.
+
+Sun Feb 26 23:29:49 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (add_code_range_to_buf0): wrong condition of duplicated
+	  warnings.
+
+Sun Feb 26 11:26:44 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): call on special object instead of
+	  self.  since stabby lambda is a syntax, so it should not be
+	  affected by the context.  [ruby-core:42349][Bug #5966]
+
+	* insns.def (send): no special deal for FCALL.  self should be put
+	  on TOS instead.
+
+Sun Feb 26 05:35:43 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* error.c (report_bug): use buf and snprintf to avoid consuming stack.
+	  [ruby-dev:45272] [Bug #6058]
+
+Sat Feb 25 17:41:19 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb (headers): try ambiguous headers at last.
+
+Sat Feb 25 17:07:15 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/fileutils.rb: use chomp(?/) instead of sub to optimize and avoid
+	  to regexping invalid string.
+
+Sat Feb 25 16:18:24 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* complex.c (nucomp_marshal_load): raise error on invalid data.
+	  reported by John Firebaugh [ruby-core:42860] [Bug #6076]
+
+Sat Feb 25 14:46:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/dl.c (Init_dl): support intrinsic types, size_t, ptrdiff_t
+	  and intptr_t.  [ruby-core:42460][Feature #5992]
+
+	* ext/fiddle/fiddle.c (Init_fiddle): ditto.
+
+	* ext/dl/lib/dl/cparser.rb (DL::CParser#parse_ctype): ditto.
+
+Sat Feb 25 11:08:28 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/curses.c (Init_curses): use rb_define_const once for
+	  Curses::VERSION.
+
+	* ext/dbm/dbm.c (Init_dbm): ditto for DBM::VERSION.
+
+Sat Feb 25 10:34:22 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/curses.c (Init_curses): make Curses::VERSION
+	  understandable without context.
+
+	* ext/dbm/dbm.c (Init_dbm): ditto for DBM::VERSION.
+
+Sat Feb 25 07:53:58 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_tokadd_string): insert a backslash only if
+	  quoted by single quotes.  [ruby-dev:45281] [Bug #6069]
+
+Sat Feb 25 07:53:49 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_inspect), io.c (rb_io_inspect): keep encoding of path.
+	  [Bug #6072]
+
+Sat Feb 25 07:53:40 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_initialize): keep path in original encoding.
+
+	* error.c (syserr_initialize): prefer the encoding of message over
+	  locale.  [ruby-dev:45279][Bug #6071]
+
+Sat Feb 25 06:55:29 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (utime_internal): fix a variable missed to replace.
+	  [ruby-core:42864] [Bug #6077]
+
+Fri Feb 24 18:21:55 2012  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* test/zlib/test_zlib.rb (TestZlibGzipReader#test_encoding): Add
+	  encoding testcases for GzipReader#read.  read() emits
+	  Encoding.default_external in contrast to read(size) emits BINARY.
+	  See also: http://bugs.jruby.org/6208
+
+Fri Feb 24 17:56:39 2012  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/ruby/test_literal.rb (TestRubyLiteral#test_special_const):
+	  test for https://bugs.php.net/bug.php?id=61095
+
+Fri Feb 24 16:48:29 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c, file.c, io.c (rb_sys_fail_path): use rb_sys_fail_str.
+
+	* error.c: new functions to deal exceptions with string instances.
+
+	* dir.c, file.c, io.c: use rb_sys_fail_path.
+
+Fri Feb 24 15:49:07 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (__builtin_unreachable): check for clang.
+	  [ruby-core:42849]
+
+	* include/ruby/ruby.h (UNREACHABLE): fallback definition.
+
+Fri Feb 24 13:54:33 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c: prevent a memory leak by protecting calls to
+	  handler callbacks.
+	* test/psych/test_parser.rb: test to demonstrate leak.
+
+Fri Feb 24 12:07:34 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/net/http.rb: Fix documentation. Patched from Florian Mhun
+	  via http://github.com/ruby/ruby/pull/96
+
+Fri Feb 24 11:48:07 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* string.c (rb_str_prepend): Fix documentation for String#prepend.
+	  Patched from Franck Verrot via http://github.com/ruby/ruby/pull/98
+	  and Andrew Horsman via http://github.com/ruby/ruby/pull/55
+
+Fri Feb 24 10:08:33 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb (Net::HTTP#transport_request):  Fix infinite loop
+	  upon EOFError or Errno::ECONNRESET where count is reset to 0.
+	* test/net/http/test_http.rb (class TestNetHTTPKeepAlive):  Test for
+	  above.
+
+Fri Feb 24 09:05:40 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* complex.c (Init_Complex):  Document Complex::I.  Patch by Sylvain
+	  Daubert.  [Feature #5623]
+
+Fri Feb 24 08:52:09 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_tokadd_string, parser_yylex): insert a backslash
+	  if the next character is non-ascii.  [ruby-dev:45278] [Bug #6069]
+
+Fri Feb 24 08:13:20 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/profiler.rb:  Add Profiler documentation by Gonzalo Rodriguez.
+	  [Bug #5816]
+
+Fri Feb 24 08:08:38 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c: set parser encoding based on the YAML input
+	  rather than user configuration.
+	* test/psych/test_encoding.rb: corresponding tests.
+	* test/psych/test_parser.rb: ditto
+	* test/psych/test_tainted.rb: ditto
+
+Fri Feb 24 08:02:52 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* hash.c (Init_Hash):  Add section on how objects are used as Hash keys
+	  and how to use custom classes as Hash keys.
+
+Fri Feb 24 07:36:11 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c (rb_obj_eql):  Improve equality documentation by adding an
+	  example of equal? vs == and recommending eql? be aliased to == when
+	  overridden.
+
+Fri Feb 24 07:21:15 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c (rb_obj_hash):  Added note that the hash value is not
+	  deterministic on Marc-Andre's suggestion.  Expanded description of
+	  the purpose of the hash method.  [Bug #6068]
+
+Thu Feb 23 23:01:21 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: unused macro removed.
+
+Thu Feb 23 22:26:53 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/test_curses.rb: new file.
+
+Thu Feb 23 19:57:56 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/rain.rb: trap SIGHUP, SIGINT, SIGQUIT and SIGTERM only.
+
+Thu Feb 23 19:56:48 2012  Tanaka Akira  <akr@fsij.org>
+
+	* signal.c (sig_trap): show signal name on error.
+
+Thu Feb 23 12:21:48 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: use DBM_SUFFIX only to detect header of
+	  Berkeley DB.
+
+Thu Feb 23 10:00:18 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* io.c (rb_io_f_sync):  Fix double-negative typo.  [ruby-trunk - #5837]
+
+Thu Feb 23 09:57:21 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* load.c (rb_f_require):  Add note to require for scope of items in the
+	  loaded file.  [ruby-trunk - #5910]
+
+Thu Feb 23 03:58:08 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/ostruct.rb (delete_field): Bug fix so previous value is
+	  returned. Patch by Nick Recobra [Bug #6063]
+
+Thu Feb 23 02:33:00 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_extract_modeenc): fail only if conflicting
+	  text/binary modes given explicitly.  [ruby-dev:45268][Bug #6055]
+
+Wed Feb 22 23:27:08 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/iconv/test_option.rb: enabled.  [ruby-core:42802][Bug #6061]
+
+Wed Feb 22 21:45:56 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/curses.c: use defined() to suppress a warning.
+
+Wed Feb 22 21:44:29 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/extconf.rb: refactored.
+
+Wed Feb 22 20:42:28 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/extconf.rb: try to distinguish curses_version is a
+	  function or variable.
+
+	* ext/curses/curses.c (Init_curses): refine Curses::VERSION.
+
+Wed Feb 22 19:47:03 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/extconf.rb: show the chosen header and library.
+
+Wed Feb 22 19:22:31 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* reverted 34739 for test/date.
+
+Wed Feb 22 19:08:55 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/extconf.rb: refactored.
+
+Wed Feb 22 18:44:41 2012  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb (setup_options): add option "--retry" as opposite
+	  for "--no-retry"
+
+Wed Feb 22 18:34:02 2012  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb (setup_options): add option "--show-skip" to
+	  cancel "--hide-skip" (-q)
+
+Wed Feb 22 17:36:22 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_s_foreach): argument check before making Enumerator.
+	  [ruby-dev:31525]
+
+Wed Feb 22 17:07:35 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_s_foreach): return enumerator including keyword
+	  arguments.  [ruby-dev:45267][Bug #6054]
+
+Wed Feb 22 12:15:16 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: allow llvm-gcc because it work fine with r34278.
+
+Wed Feb 22 10:57:08 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (fetch_token): don't use // comment.
+
+Wed Feb 22 10:32:11 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/mkmf/test_framework.rb: try CoreFoundation framework, than
+	  Cocoa which is dependent on QuickTime SDK which has separated
+	  since Xcode 4.3.
+
+Wed Feb 22 10:18:05 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (test-all, test-ruby): more dependencies.
+
+Wed Feb 22 06:48:55 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* file.c (rb_f_test):  Fix formatting of Kernel#test rdoc.
+
+Wed Feb 22 06:12:15 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: check DBM_SUFFIX for Mac OS X.
+	  Its ndbm.h doesn't include db.h.
+
+Wed Feb 22 06:02:42 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/dbm.c (fdbm_initialize): disable Berkeley DB error messages.
+
+	* ext/dbm/extconf.rb: check DBC type for above.
+
+	[ruby-dev:45269]
+
+Tue Feb 21 20:23:47 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_any_hash): treat Qundef like as other special constants.
+
+	* hash.c (hash_foreach_iter): fix signature.
+
+Tue Feb 21 19:39:34 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/curses.c (Init_curses): use curses_version() for
+	  Curses::VERSION.
+
+Tue Feb 21 18:21:25 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c : remove gc_clear_mark_on_sweep_slots() and use
+	  rest_sweep() instead of it, because some dead objects might be
+	  marked in next the mark phase by false pointers.
+	  [ruby-core:42672]
+
+Tue Feb 21 16:08:17 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_hash_proc): get wrapped pointer properly.  [Bug #6048]
+
+Tue Feb 21 14:41:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/ruby.pc.in: added rubylibprefix, {rubylib,vendor,site}dir
+	  and {ruby,vendor,site}archdir.  [ruby-core:42766][Feature #6052]
+
+Tue Feb 21 09:13:25 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* proc.c (method_hash, proc_hash): Fix {Unbound}Method#hash
+	  [Bug #6048]. Isolate hash computation for proc
+
+	* internal.h: Declaration for above
+
+	* vm_method.c (rb_method_definition_hash): Computation for
+	  hash part of a method definition
+
+	* method.h: Declaration for above
+
+	* test/ruby/test_method.rb: Test for above
+
+Tue Feb 21 02:56:15 2012  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enumerator.c (enumerator_rewind): update the documentation.
+	  fixed: #6053
+
+Mon Feb 20 23:38:35 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/depend: ignore mktable.c because it's not encoding library.
+	  [ruby-core:42760] [Bug #6049]
+
+Mon Feb 20 21:40:53 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/extconf.rb: fold too long lines.
+
+Mon Feb 20 21:16:48 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* lib/fileutils.rb: revert a line modified accidentally at r34669.
+	  This fixes mingw test errors in TestDir_M17N.
+	  [ruby-core:42728] [Feature #4970]
+
+Mon Feb 20 21:09:27 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/curses.c (Init_curses): define Curses::VERSION.
+
+Mon Feb 20 21:08:00 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/extconf.rb: restore $libs and $defs for each
+	  header/library choice.
+
+Mon Feb 20 19:57:26 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: weaken header/library consistency check if db is
+	  "ndbm".  It seems several (possibly historical) distributions
+	  provide libndbm.  However the content of libndbm vary: Berkeley DB,
+	  GDBM or even 4.3BSD NDBM.  (Mandriva, Tru64 UNIX, OpenSuSE,
+	  SCO OpenServer, ...)
+	  "ndbm" is not searched automatically now (dblib doesn't contain it)
+	  but configure --with-dbm-type=ndbm choose libndbm and ndbm.h.
+
+Mon Feb 20 19:15:57 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: refine variable names.
+
+Mon Feb 20 15:50:33 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check if -fstack-protector is really available.
+
+Sun Feb 19 23:43:38 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: show header and library found.
+
+Sun Feb 19 23:01:01 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/dbm.c (Init_dbm): refine DBM::VERSION definition.
+
+	* ext/dbm/extconf.rb: provide RUBYDBM_GDBM_HEADER macro.
+
+Sun Feb 19 17:07:27 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/dbm/test_dbm.rb (test_dbmfile_suffix): check pag and dir is
+	  empty for 4.3BSD ndbm.
+
+Sun Feb 19 03:00:30 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/dbm/test_dbm.rb (test_dbmfile_suffix): check magic numbers.
+
+Sun Feb 19 01:05:41 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: detect GDBM's ndbm.h by testing dbm_clearerr is
+	  an empty macro.
+
+Sun Feb 19 00:25:55 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: don't choose 'dbm' if _GDB_H_ is defined which
+	  is available since GDBM 1.9 because 'gdbm_compat' is appropriate
+	  choice since GDBM 1.8.1.
+
+Sat Feb 18 23:27:00 2012  Kenta Murata  <mrkn@mrkn.jp>
+
+	* random.c: remove a duplicated comment.
+
+Sat Feb 18 18:43:13 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb (dblib): prefer recent GDBM over older GDBM.
+	  (have_declared_libvar): new function to check a declared variable
+	  exists in a library.
+	  (have_undeclared_libvar): renamed from renamed from have_libvar.
+	  (headers.db_check2): check that GDBM version variable if GDBM header
+	  is chosen.
+
+	* ext/dbm/dbm.c (Init_dbm): use HAVE_DECLARED_LIBVAR_GDBM_VERSION and
+	  HAVE_UNDECLARED_LIBVAR_GDBM_VERSION macro.
+
+Sat Feb 18 13:53:01 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/dbm/test_dbm.rb (test_dbmfile_suffix): DBM::VERSION should
+	  be Berkeley DB if foo.db is created by DBM.open.
+
+Sat Feb 18 13:40:37 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/dbm/test_dbm.rb (test_dbmfile_suffix): test dbm file suffix.
+
+Sat Feb 18 12:50:59 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/dbm.c (DBM::VERSION): define it by detecting _GDBM_H_ or
+	  _DBM_IOERR.
+
+Sat Feb 18 07:52:45 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/enc-unicode.rb: don't use 1.9 feature on tools.
+
+Sat Feb 18 02:48:39 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/fileutils.rb: refactored FileUtil methods to use the
+	  `define_command` API.  Patch from 7rans <transfire@gmail.com>
+	* test/fileutils/test_dryrun.rb: corresponding test refactoring
+	* test/fileutils/test_nowrite.rb: ditto
+	* test/fileutils/test_verbose.rb: ditto
+
+Fri Feb 17 21:39:36 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: remove dbm.
+
+Fri Feb 17 21:18:39 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: refine header/library mismatch detection.
+	  check only for ndbm.h except libc.  check _GDBM_H_ for gdbm.
+	  check _DBM_IOERR for the original ndbm.
+
+Fri Feb 17 20:30:44 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: don't check libdbm.  It is not a ndbm
+	  implementation.  (libdbm in Version 7 Unix is database library
+	  for single database per process.)
+
+Fri Feb 17 15:38:53 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Merge Onigmo-5.13.1. [ruby-dev:45057] [Feature #5820]
+	  https://github.com/k-takata/Onigmo
+	  cp reg{comp,enc,error,exec,parse,syntax}.c reg{enc,int,parse}.h
+	  cp oniguruma.h
+	  cp tool/enc-unicode.rb
+	  cp -r enc/
+
+Fri Feb 17 15:20:30 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_each_slice): arrays to be yielded can be newly
+	  created in the block.
+
+	* enum.c: move work variables to objects not to let called blocks
+	  access stack area out of scope.  [Bug #5801]
+
+Fri Feb 17 12:35:55 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: remove borders from the commit message which is used
+	  when the commit doesn't change ChangeLog.
+
+Fri Feb 17 11:50:11 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (btest, btest-ruby, test-sample test-knownbugs)
+	  (test-all, test-ruby): depend on prog.
+
+Fri Feb 17 09:56:22 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_header): log the content of header.
+
+Fri Feb 17 09:44:55 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/transcode-tblgen.rb (import_ucm): don't use \h because the
+	  script should work with ruby 1.8.
+
+	* tool/enc-unicode.rb: ditto.
+
+Fri Feb 17 07:33:29 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (id_lshift): use constant ID.
+
+Fri Feb 17 07:30:53 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: refactored to split too long conditions.
+
+Fri Feb 17 00:23:25 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/dbm/test_dbm.rb: fix skip condition for libgdbm 1.8.0 or prior.
+	  reported by Bohuslav Kabrda.
+	  [ruby-core:42685] [ruby-trunk - Bug #6036]
+
+Fri Feb 17 00:04:21 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: check _DB_H_ macro unavailable except
+	  Berkeley DB library.
+
+Thu Feb 16 05:41:35 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (splatarray): make new array if flag is set.
+
+	* compile.c (iseq_compile_each): make new array with
+	  splat. [ruby-core:21901][Feature #1125]
+
+Thu Feb 16 00:14:04 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/abbrev.rb (Array#abbrev): add missing '"' in documentation.
+
+Wed Feb 15 22:20:19 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* cont.c (rb_fiber_reset_root_local_storage): add a new function to
+	  restore rb_thread_t::local_storage.
+
+	* cont.c (rb_obj_is_fiber): add a new function to tell finalizer to
+	  prevent fibers from destroy.
+
+	* gc.c (rb_objspace_call_finalizer): don't sweep fibers at finalizing
+	  objspace.
+
+	* internal.h (rb_fiber_reset_root_local_storage, rb_obj_is_fiber):
+	  add prototypes.
+
+	* vm.c (ruby_vm_destruct): reset main thread's local_storage before
+	  free main thread. rb_thread_t::local_storage is replaced by fiber's
+	  local storage when forked from fiber, and it should be already freed
+	  when the fiber was destroyed. [ruby-core:41456] [Bug #5700]
+
+	* test/ruby/test_fiber.rb (test_fork_from_fiber): add test for fork
+	  from fiber.
+
+Wed Feb 15 19:57:02 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/fiddle/closure.c (callback): deal with unsigned integers.
+	  [ruby-core:42458][Bug #5991][Bug #6022]
+
+	* ext/fiddle/conversions.c (value_to_generic, generic_to_value):
+	  ditto.
+
+	* ext/fiddle/closure.c (callback): same as r34506.
+
+Wed Feb 15 17:41:31 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (io_strsetbuf): call rb_str_modify to make str independent
+	  before calling rb_str_set_len for r34580.
+
+Wed Feb 15 12:30:10 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c (Init_zlib):  Added Zlib::TEXT and note that
+	  Zlib::ASCII is deprecated in zlib 1.2.3 and newer.
+
+Wed Feb 15 12:24:40 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c:  Move constant descriptions to constants.  Remove
+	  extra comment block at the top of Init_zlib().
+
+Wed Feb 15 12:30:46 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/ostruct.rb: Create getters and setters after dup.
+	  [Bug #6028] [rubyspecs:0380bcc]
+
+Wed Feb 15 10:59:52 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (HEAP_BITMAP_LIMIT): HEAP_BITMAP_LIMIT is computed on the
+	  basis of HEAP_SIZE because it must covers a whole heap block.
+	  [ruby-trunk - Bug #6006]
+
+Wed Feb 15 09:27:45 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c (Init_zlib):  Added Zlib::FIXED and Zlib::RLE
+	  strategies.
+	* NEWS:  Add note about the new Zlib constants.
+
+Wed Feb 15 09:11:36 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c:  Improve documentation.  [ruby-trunk - Bug #5948]
+
+Wed Feb 15 07:28:54 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* encoding.c (Init_Encoding):  Add IO example of internal and external
+	  encoding.  Fixed a typo in the force_encoding example.  [#5949]
+
+Wed Feb 15 06:58:21 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* encoding.c (Init_Encoding):  Add Encoding documentation.
+	  [ruby-trunk - Bug #5949]
+	* encoding.c (rb_set_default_external):  Fix typo in documentation.
+
+Tue Feb 14 20:22:11 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (CEILDIV): rename to a appropriate name.
+
+Tue Feb 14 18:07:20 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (assign_heap_slot): SEGV happens cause on 64-bit platform
+	  sometime there should be `objs-=2` instead of `objs--`.
+	  [Bug #6006]
+	  patched by Sokolov Yura. https://github.com/ruby/ruby/pull/92
+
+Tue Feb 14 16:00:30 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_setstrbuf): cut down the buffer if longer.
+
+Tue Feb 14 15:06:37 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (build_message): skip escaped
+	  question marks.
+
+Tue Feb 14 12:10:04 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (autoload_const_set, autoload_require): fix
+	  signatures.
+
+Tue Feb 14 05:23:40 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* process.c (proc_wait):  Change typo "SystemError" to
+	  "SystemCallError".  [ruby-trunk - Bug #5962]
+	* process.c (proc_wait2):  ditto
+
+Tue Feb 14 05:18:24 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* enumerator.c:  Document use of Enumerator.new for creating a lazy
+	  enumeration for filtering/chaining.  [ruby-trunk - Feature #707]
+
+Mon Feb 13 23:01:50 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* vm_method.c (rb_method_boundp):
+	  obj.respond_to?(:a_protected_method) should return false because
+	  calling a protected method may cause NoMethodError if called
+	  from outside the class inheritance tree.  Kernel#respond_to? is
+	  mostly used to test if it is safe to call a method, so the false
+	  positive should be avoided. [ruby-dev:40461] [ruby-dev:41739]
+	  [ruby-dev:41837]
+
+Mon Feb 13 21:52:06 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (HEAP_OBJ_LIMIT, HEAP_BITMAP_LIMIT): HEAP_OBJ_LIMIT used
+	  `sizeof(struct heaps_slot)` while heap is currently allocated
+	  with `struct heaps_header`.
+	  HEAP_BITMAP_LIMIT were calculated from
+	  `HEAP_OBJ_LIMIT/sizeof(uintptr_t)` - one Byte for each object,
+	  not one Bit. [Bug #6006]
+	  patched by Sokolov Yura. https://github.com/ruby/ruby/pull/92
+
+Mon Feb 13 18:30:32 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_setstrbuf): defer resizing buffer string until data is
+	  read actually.
+
+Mon Feb 13 10:24:39 2012  Loren Segal  <lsegal@soen.ca>
+
+	* io.c (Init_IO): use directive hack to make ARGF documentable
+	  in other tools.  [ruby-core:42515][Bug #6007]
+
+Sun Feb 12 20:43:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_event_hook_func_t): add argument names.
+
+Sun Feb 12 16:30:23 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* tool/merger.rb (#default_merge_branch): Add support for
+	  Subversion 1.7 which adopted a whole new working directory
+	  structure.
+
+Sun Feb 12 15:14:41 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* benchmark/driver.rb: suppress unused/shadowing variable warnings.
+
+Sun Feb 12 03:14:40 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* vm_eval.c (check_funcall):  Call respond_to? with matching arity for
+	  legacy single-argument implementations.  [ruby-trunk - Bug #6000]
+
+Sat Feb 11 12:04:05 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (defined_expr): guard the whole expression.
+	  [ruby-dev:45021][Bug#5786]
+
+Sat Feb 11 08:34:42 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c (rb_inflate_add_dictionary):  Added
+	  Zlib::Inflate#add_dictionary to allow users to pre-specify
+	  for using during #inflate.  [ruby-trunk - Feature #5937]
+
+Sat Feb 11 08:23:02 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c (do_inflate):  Inflate more data if buffered data
+	  exists.  Allows Zlib::Inflate#set_dictionary to work.
+	  [ruby-trunk - Bug #5929]
+
+Sat Feb 11 06:00:48 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dir.c (fnmatch): The * needs to be escaped to avoid formatting in
+	  fnmatch comment.
+	  patched by @dalton. https://github.com/ruby/ruby/pull/91
+
+Fri Feb 10 03:41:31 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c: removed external encoding setter, allow parser
+	  to be reused.
+	* ext/psych/lib/psych/parser.rb: added external encoding setter.
+	* test/psych/test_parser.rb: test parser reuse
+
+Fri Feb 10 01:30:41 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/dl.h (ALIGN_OF): use offsetof().
+
+	* ext/dl/dl.h (DLALIGN): round up at once and get rid of overflow.
+
+Fri Feb 10 00:47:07 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (assert_no_memory_leak): new assertion to
+	  check memory leak by invoking child ruby process and watch its
+	  memory size.
+
+Thu Feb  9 23:41:44 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/pathname/test_pathname.rb (test_binread): add assertion to
+	  check encoding.
+
+Thu Feb  9 16:48:19 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/dl.c (Init_dl): fix mangled document.
+
+Thu Feb  9 16:10:34 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/memory_status.rb (Memory::Win32): 64bit support.
+
+Thu Feb  9 16:08:55 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/lib/value.rb (DL::ValueUtil.{unsigned_value,signed_value}):
+	  currently pack/unpack does not accept "q!" and "Q!".
+
+Thu Feb  9 16:01:29 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/fiddle/conversions.c (value_to_generic): src is not guaranteed as
+	  a Bignum if the type is LONG_LONG.  it may be a Fixnum if the value
+	  is small.
+
+Thu Feb  9 11:32:36 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/lib/types.rb: Win64 support.
+
+Thu Feb  9 04:12:29 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/pathname/test_pathname.rb: not read but binread.
+	  patched by Benoit Daloze, [ruby-core:42440] [Bug #5984]
+
+Wed Feb  8 22:29:59 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_modify_expand): fix memory leak.
+
+Wed Feb  8 14:06:59 2012  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c: Add SSL constants and allow to unset SSL
+	  option to prevent BEAST attack. See [Bug #5353].
+
+	  In OpenSSL, OP_DONT_INSERT_EMPTY_FRAGMENTS is used to prevent
+	  TLS-CBC-IV vulnerability described at
+	  http://www.openssl.org/~bodo/tls-cbc.txt
+	  It's known issue of TLSv1/SSLv3 but it attracts lots of attention
+	  these days as BEAST attack. (CVE-2011-3389)
+
+	  Until now ossl sets OP_ALL at SSLContext allocation and call
+	  SSL_CTX_set_options at connection.  SSL_CTX_set_options updates the
+	  value by using |= so bits set by OP_ALL cannot be unset afterwards.
+
+	  This commit changes to call SSL_CTX_set_options only 1 time for each
+	  SSLContext. It sets the specified value if SSLContext#options= are
+	  called and sets OP_ALL if not.
+
+	  To help users to unset bits in OP_ALL, this commit also adds several
+	  constant to SSL such as
+	  OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS.  These constants were
+	  not exposed in Ruby because there's no way to unset bits in OP_ALL
+	  before.
+
+	  Following is an example to enable 0/n split for BEAST prevention.
+
+	    ctx.options = OP_ALL & ~OP_DONT_INSERT_EMPTY_FRAGMENTS
+
+	* test/openssl/test_ssl.rb: Test above option exists.
+
+Wed Feb 8 13:12:02 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_x509name.c: Use the numerical representation of
+	  unrecognized OIDs instead of the sn "UNDEF".
+
+	* test/openssl/test_x509name.rb: Add tests for the fixed behavior.
+
+	  Patch provided by Paul Kehrer, thank you!
+	  [ruby-core:41769] [Feature #5787]
+
+Wed Feb  8 09:49:58 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: don't abort, update first.
+
+Wed Feb 8 09:47:33 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c: Call INT2NUM only once for GeneralString.
+	  Thanks to Mantas Mikulenas for noticing and providing a patch!
+	  [ruby-core:42358] [Bug #5972]
+
+Wed Feb 8 09:19:00 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_cipher.c: Add warning about key as IV.
+
+Tue Feb  7 20:08:12 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* error.c (exc_inspect): Fix typo. patch from Trent Ogren
+	  via https://github.com/ruby/ruby/pull/90
+
+Tue Feb  7 19:37:35 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c: refactor packed entries using structs.
+
+Tue Feb  7 14:52:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (st_update): table can be unpacked in the callback.
+
+	* st.c (st_foreach): should not yield same pair when checking
+	  after unpacking.
+
+Mon Feb  6 21:55:13 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: abort if the working directory is dirty.
+
+	* tool/merger.rb: update the working directory after commit.
+
+Mon Feb  6 00:16:27 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string
+	  is ascii only string. [ruby-core:42354] [Bug #5968]
+
+Fri Feb  3 07:16:47 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick.rb:  Moved proxy rewriting to WEBrick::HTTPProxy.
+	* lib/webrick/httpproxy.rb:  Add examples of creating a proxy server
+	  and response rewriting using HTTPProxy.
+
+Fri Feb  3 06:53:22 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl_x509store.c:  Add class documentation for
+	  OpenSSL::X509::Store
+
+Thu Feb  2 22:28:13 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/net/http/test_https_proxy.rb
+	  (HTTPSProxyTest#test_https_proxy_authentication):
+	  add workaround to avoid to hang up without openssl.
+	  see [ruby-dev:45021][Bug #5786]
+
+	* test/resolv/test_dns.rb (TestResolvDNS#test_query_ipv4_address):
+	  ditto.
+
+Thu Feb  2 21:48:18 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb: use meaningful names.
+
+Thu Feb  2 21:38:52 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb, test/rexml/test_namespace.rb:
+	  fix the default xml namespace URI validation.
+	  [ruby-dev:45169] [Bug #5956]
+	  Reported by Miho Hiramatsu. Thanks!!!
+
+Thu Feb  2 17:51:02 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (argf_next_argv): reset ARGF.next_p on ARGV.replace.
+	  r34409 breaks replacing ARGV.
+	  [ruby-dev:45160] [Bug #5952]
+
+Thu Feb  2 16:21:01 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/net/http/test_http.rb (TestNetHTTPKeepAlive#*): remove debug
+	  output.
+
+Thu Feb  2 01:24:34 2012  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (debug_lines, coverage): set file path encoding for coverage
+	  result.  [ruby-dev:44950]
+
+Wed Feb  1 14:38:31 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/tempfile.rb (Tempfile#unlink, Tempfile::Remover#call): Just
+	  call File.unlink and ignore ENOENT because existence check
+	  before unlinking does not help in terms of race condition.
+
+	* lib/tempfile.rb (Tempfile#unlink, Tempfile::Remover#call): My
+	  comment about thread safeness is obsolete.
+
+Wed Feb  1 09:50:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/re.rdoc (Repetition): fix typo.  reported by Ori Avtalion
+	  and patched by Zachary Scott.  [Bug #5947]
+
+Wed Feb  1 06:38:54 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_close): skip stdin, which should be readable again.
+	  [ruby-dev:45160] [Bug #5952]
+
+	* io.c (argf_readlines): reinitialize after all read to be
+	  readable again.
+
+Tue Jan 31 21:27:43 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* configure.in (HEAP_ALIGN_LOG): HEAP_ALIGN_LOG should be page
+	  size in OpenBSD. [ruby-core:42158][Bug #5901]
+
+	* gc.c : avoid to redefine.
+
+Tue Jan 31 14:27:22 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (EnvUtil.invoke_ruby): yield also child pid
+	  in block form.
+
+Mon Jan 30 19:08:19 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (vm_call0): should pass block to enumerators.  patched
+	  by Kazuki Tsujimoto.  [ruby-dev:44961][Bug #5731]
+
+	* vm_eval.c (method_missing), vm_insnhelper.c (vm_call_method):
+	  ditto.  patched by satoshi shiba.
+
+Mon Jan 30 12:31:05 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (append_fspath): need to set the encoding to result always.
+
+Mon Jan 30 10:38:37 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/irb/test_completion.rb: skip if cannot load irb/completion
+	  (maybe readline does not exist).
+
+Sun Jan 29 22:47:19 2012  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* tool/config.{guess,sub}: updated to automake-1.11.2.
+
+Sun Jan 29 12:17:56 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_attempted_completion_function):
+	  respect encodings.  [Bug #5941]
+
+Sat Jan 28 09:33:33 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* win32/win32.c (rb_w32_read): fix an issue that $stdin.read doesn't
+	  terminate by CTRL-C on Windows.
+	  [ruby-dev:45149] [Bug #5812]
+
+Sat Jan 28 08:18:11 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/test_thread.rb
+	  (TestThreadGroup#test_thread_timer_and_interrupt): skip exit status
+	  assertion because we cannot get signal status on Windows.
+
+	* win32/win32.c (CreateChild): create process group to receive the
+	  signal by GenerateConsoleCtrlEvent().
+
+	* win32/win32.c (kill): use CTRL_BREAK_EVENT instead of CTRL_C_EVENT
+	  if a process group is specified. CTRL_C_EVENT signal cannot be
+	  generated for process groups for the specification.
+	  [ruby-dev:45149] [Bug #5812]
+
+Sat Jan 28 07:46:03 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* thread_win32.c (rb_w32_wait_events_blocking): use
+	  ruby_thread_from_native() instead of GET_THREAD() because
+	  GET_THREAD() doesn't always return the current thread and
+	  WaitForMultipleObjects() at rb_w32_read() doesn't return by
+	  Thread#kill. This fixes TestQueue#test_thr_kill failure on
+	  Windows.
+
+	* thread_win32.c (rb_w32_wait_events): use ruby_thread_from_native()
+	  instead of GET_THREAD() for consistency with the above change.
+
+	* thread_win32.c (rb_w32_sleep): ditto.
+
+	* thread_win32.c (rb_w32_Sleep): ditto.
+	  [ruby-dev:45149] [Bug #5812]
+
+Sat Jan 28 07:28:48 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/zlib/test_zlib.rb (TestZlibGzipReader#test_reader_wrap): set
+	  binmode explicitly for fixing test error on Windows. This is consistent
+	  with r34243.
+	  [ruby-dev:45149] [Bug #5812]
+
+Sat Jan 28 05:53:34 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/irb/completion.rb (IRB::InputCompletor::CompletionProc):
+	  ignore non-string name modules.  [ruby-core:42244][Bug #5938]
+
+Fri Jan 27 16:31:45 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (HEAP_ALIGN, HEAP_ALIGN_MASK): DRY, let compiler calculate
+	  from HEAP_ALIGN_LOG.
+
+Thu Jan 26 11:03:37 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/matrix.rb:  Clean up extra whitespace in output documentation.
+
+Thu Jan 26 03:24:02 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (io_getch): default delegating method
+	  for StringIO.  https://github.com/nobu/io-console/issues/4
+
+	* ext/stringio/stringio.c: moved some methods to hidden modules.
+
+Wed Jan 25 13:27:42 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_basename): ignore non-ascii extension in
+	  different encoding, which cannot match.
+
+	* file.c (rmext): no extension to strip if empty string.
+
+	* file.c (rb_enc_path_next, rb_enc_path_skip_prefix)
+	  (rb_enc_path_last_separator, rb_enc_path_end)
+	  (ruby_enc_find_basename, ruby_enc_find_extname): encoding-aware
+	  path handling functions.
+
+	* file.c (rb_home_dir, file_expand_path, rb_realpath_internal)
+	  (rb_file_s_basename, rb_file_dirname, rb_file_s_extname)
+	  (rb_file_join): should respect the encodings of arguments than
+	  file system encoding.  [ruby-dev:45145] [Bug #5919]
+
+	* dir.c (check_dirname, ruby_glob0): ditto.
+
+	* ext/pathname/pathname.c (path_sub_ext): ditto.
+
+Tue Jan 24 14:20:42 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_iter_break_value): new function to break a block with
+	  the value.  [ruby-dev:45132] [Feature #5895]
+
+Tue Jan 24 12:58:41 2012  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_Hash): add Kernel#Hash conversion method like
+	  Array() or Float().  a patch from Run Paint Run Run.  Fix #3131
+
+Tue Jan 24 11:38:05 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI.encode_www_form_component): initialize on
+	  requiring to support JRuby, which runs parallel multithreads.
+	  [ruby-core:42222] [Bug #5925]
+
+	* lib/uri/common.rb (URI.decode_www_form_component): initialize on
+
+Mon Jan 23 20:33:11 2012  Jason Kay  <geniture@me.com>
+
+	* lib/net/http.rb (Net::HTTP#connect): Writing entire packet at
+	  once to avoid incomplete transmission.  Current code using
+	  writeline was causing sub-optimal conversing with a proxy due to
+	  the connect tunnel request headers being split over multiple
+	  packets. The modification I made allows the connect request to
+	  be written as one packet, avoiding problems and optimizing the
+	  conversation.
+
+	  https://github.com/ruby/ruby/pull/72
+	  [Feature #5460]
+
+Mon Jan 23 17:06:17 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/mailto.rb (URI::MailTo.build): follow Array#to_s change of
+	  Ruby 1.9; use Array#join. [Bug #5840]
+
+Mon Jan 23 16:42:28 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (extract_binmode): raise an exception if binmode/textmode
+	  is specified with both vmode and opthash.
+	  [ruby-core:42199] [Bug #5918]
+
+Mon Jan 23 16:35:27 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_extract_modeenc): set ASCII-8BIT if binmode is specified
+	  with opthash. [ruby-core:42197] [Bug #5917]
+
+Mon Jan 23 10:08:00 2012  Kenta Murata  <mrkn@cookpad.com>
+
+	* test/cgi/test_cgi_util.rb (test_cgi_escape_preserve_encoding):
+	  add a test for CGI::escape to preserve encoding.
+
+	* test/cgi/test_cgi_util.rb (test_cgi_unescape_preserve_encoding):
+	  add a test for CGI::unescape to preserve encoding.
+
+Mon Jan 23 00:45:34 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/rdoc-mode.el (rdoc-imenu-create-index): Add imenu support
+	  to rdoc-mode.
+
+	* misc/rdoc-mode.el (rdoc-mode): Fix regexp patterns containing
+	  "\s " where CR/LF is not supposed to match.
+
+Sun Jan 22 15:41:26 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_intern3): split to registration check and new
+	  registration.
+
+	* parse.y (rb_intern_str): make interned string shared with the
+	  given string.
+
+	* parse.y (rb_intern3, rb_intern_str): check the coderange first.
+
+Sat Jan 21 22:21:07 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (FIXNUM_P): simple flag should be int.
+
+Sat Jan 21 21:51:19 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): fix segv on symbols.
+	  [ruby-core:42204] [Bug #5921]
+
+Sat Jan 21 11:43:45 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_chdir, check_dirname): get rid of optimization-out.
+
+Fri Jan 20 20:47:37 2012  Kenta Murata  <mrkn@cookpad.com>
+
+	* lib/cgi/util.rb (CGI.escape): support a string with invalid byte
+	  sequence.  [Bug #5913]
+
+	* test/cgi/test_cgi_util.rb
+	  (test_cgi_escape_with_invalid_byte_sequence): test for the above
+	  change.
+
+Fri Jan 20 17:37:37 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm.c (vm_exec): remove workaround for LLVM because r34278 fixes it.
+
+	* vm_insnhelper.c (vm_call_cfunc): ditto.
+
+Fri Jan 20 14:31:43 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP#transport_request): retry a idempotent
+	  request automatically. [ruby-dev:45030] [Bug #5790]
+	  [ruby-core:41821] [Bug #5813]
+
+	* lib/net/http.rb (Net::HTTP#keep_alive_timeout=): added to specify
+	  the second to reconnect the TCP connection on Keep-Alive.
+	  The default value is 2 second because current servers uses 2 sec.
+	  http://ftp-admin.blogspot.com/2009/09/keepalivetimeout2.html
+
+	* lib/net/http.rb (Net::HTTP#begin_transport): reconnect TCP
+	  connection on keep-alive timeout.
+
+Thu Jan 19 07:53:09 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strptime.c: moved detector of leftover.
+
+Thu Jan 19 07:10:47 2012  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c: [ruby-core:42173].
+
+Wed Jan 18 18:11:02 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/rdoc-mode.el (rdoc-mode): Add provide so that requiring
+	  this library succeeds.
+
+Wed Jan 18 18:06:45 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/curses/curses.c (cWindow, cMouseEvent): made typed data.
+
+Wed Jan 18 12:49:15 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: Added support for loading
+	  subclasses of String with ivars
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: Added support for dumping
+	  subclasses of String with ivars
+	* test/psych/test_string.rb: corresponding tests
+
+Wed Jan 18 10:39:47 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: Added ability to load array
+	  subclasses with ivars.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: Added ability to dump
+	  array subclasses with ivars.
+	* test/psych/test_array.rb: corresponding tests
+
+Tue Jan 17 17:18:41 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (SPT_TYPE): enable as SPT_REUSEARGV on Darwin.
+
+	* missing/setproctitle.c (ruby_init_setproctitle): changed prefix.
+
+Tue Jan 17 12:32:46 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (aligned_malloc, aligned_free): covered missing defined
+	  operators and fixes for cygwin.
+
+Tue Jan 17 10:54:46 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (do_hash): it's the time to remove cast to unsigned int.
+
+Tue Jan 17 07:30:12 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* st.c (unpack_entries): Fix r34310: on unpacking, the position of
+	  a hash must be do_hash-ed value.
+
+	* st.c (add_packed_direct): ditto.
+
+Mon Jan 16 16:41:53 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (Regexp): fix incorrect options when casting to
+	  a Regexp, and suppress encoding option warnings.
+	  https://github.com/ruby/ruby/pull/82
+
+Mon Jan 16 11:22:38 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_chsize): no need to get the current file size.
+
+Mon Jan 16 00:41:33 2012  Sokolov Yura  <funny.falcon@gmail.com>
+
+	* st.c: st use function instead of macro.  In my current
+	  environment (Ubuntu 11.04 32bit gcc-4.5.2) it gives 4%
+	  performance improvement.
+
+	  https://github.com/ruby/ruby/pull/77
+
+Sun Jan 15 14:09:48 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* object.c (rb_inspect): raise the result is not compatible with
+	  the default external encoding. [ruby-core:42095] [Bug #5848]
+	  If the default external encoding is ASCII compatible, the encoding of
+	  inspected result must be compatible with it.
+	  If the default external encoding is ASCII incompatible,
+	  the result must be ASCII only.
+
+Sun Jan 15 13:21:50 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/parser/parser.rl (json_string_unescape): workaround fix
+	  for over optimization of GCC 4.7. [ruby-core:42085] [Bug #5888]
+	  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51862
+
+Sat Jan 14 22:24:09 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/callback/mkcallback.rb (gencallback): suppress unused
+	  variables.
+
+Sat Jan 14 21:56:43 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (iseq_data_to_ary): check line info table boundary.  line
+	  number 0 means no line number info is needed.  [ruby-dev:45130]
+	  [Bug #5894]
+
+Sat Jan 14 18:24:13 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* error.c (exc_equal): clear rb_thread_t::errinfo when ignore
+	  an exception under rb_protect(). [ruby-core:41979] [Bug #5865]
+
+Sat Jan 14 12:02:55 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_enc_vsprintf): relaxed the restriction.  since the
+	  implementation deeply depends on plain char, so wchar_t based
+	  encodings are not supported.
+
+Sat Jan 14 12:00:20 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (exc_equal): ignore exceptions during implicit
+	  conversion.  [ruby-core:41979] [Bug #5865]
+
+Sat Jan 14 05:58:54 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* io.c (rb_io_s_read):  Fix formatting of open_args comment.  Reported
+	  by Adam Prescott.
+
+Fri Jan 13 18:41:19 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_enc_vsprintf): can be used for ASCII compatible
+	  encodings only.
+
+Fri Jan 13 18:29:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_mutex_unlock_th): simplified.
+
+	* thread.c (rb_barrier_waiting): fix potential overflows.
+
+Fri Jan 13 17:23:38 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (load_unlock): update loading table at once.
+
+Fri Jan 13 16:44:45 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (exc_equal): try implicit conversion for delegator.
+	  [ruby-core:41979] [Bug #5865]
+
+Fri Jan 13 03:46:53 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/shellwords.rb (Shellwords#shellescape): shellescape() now
+	  stringifies the given object using to_s.
+
+	* lib/shellwords.rb (Shellwords#shelljoin): shelljoin() accepts
+	  non-string objects in the given array, each of which is
+	  stringified using to_s.
+
+	* lib/shellwords.rb: Fix rdoc markups.
+
+Fri Jan 13 03:38:36 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/shellwords.rb (Shellwords#shellsplit): Fix a bug where
+	  consecutive backslashes in double quotes are all removed except
+	  the one at the tail.
+
+Fri Jan 13 03:28:00 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* ext/socket/extconf.rb (if ipv6): only define _WIN32_WINNT if was not
+	  previously defined. This solve warnings with multiple defines in
+	  command line with GCC 4.6.1
+
+Thu Jan 12 18:44:31 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: fix r33904 and revert r33905.  initialize global
+	  variables with init_mkmf before initializing constants.
+	  [ruby-dev:45124] [Bug #5879]
+
+Thu Jan 12 13:51:00 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* cont.c (cont_restore_0): prevent optimizing out `sp'. sp is used for
+	  reserving a memory space with ALLOCA_N for restoring machine stack
+	  stored in cont->machine_stack, but clang optimized out it (and
+	  maybe #5851 is also caused by this).
+	  This affected TestContinuation#test_check_localvars.
+
+	* cont.c (cont_restore_1): revert workaround introduced in r32201.
+
+Thu Jan 12 02:14:43 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* object.c: Added examples for Object#is_a? and
+	  Object#instance_of? patched from Manoj Kumar.
+	  [Bug #5880] [ruby-core:42057]
+
+Thu Jan 12 00:57:48 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/mkmf.rb: verbose-mode can use by RM, RMDIRS, etc.
+	  (e.g. make V=1 realclean)
+
+Wed Jan 11 23:40:21 2012  Naohisa Goto  <ngoto@gen-info.osaka-u.ac.jp>
+
+	* string.c (rb_str_concat): set array element after definition
+	  to fix compile error with Fujitsu C Compiler 5.6 on Solaris 10
+	  on Sparc.  [Bug #5878] [ruby-dev:45123]
+
+Wed Jan 11 22:52:51 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* gc.c (ruby_mimmalloc): don't set allocated size to header.
+	  ruby_mimmalloc() doesn't increment allocated_size/allocations and
+	  decrement them in ruby_xfree() cause inconsistency.
+
+	* gc.c (ruby_xfree): don't decrement allocated_size/allocations if
+	  allocated size record is 0.
+
+Wed Jan 11 22:36:43 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/readline/test_readline.rb (test_completion_proc_empty_result):
+	  ensure clearance of Readline's line_buffer after the test.
+
+Tue Jan 10 21:57:38 2012  Hiroshi Shirosaki <h.shirosaki@gmail.com>
+
+	* ext/dbm/dbm.c (Init_dbm): fix a build error on mswin32.
+	  use `extern __declspec(dllimport)` for dll link with VC.
+	  [ruby-core:41996] [Bug #5869]
+
+Tue Jan 10 15:31:55 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm.c (vm_exec): refix r34162; suppress warning and add description.
+
+Tue Jan 10 15:13:58 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_attempted_completion_function):
+	  use rb_memerror().
+
+Tue Jan 10 12:49:42 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c: in fact, i686-linux doesn't need to define _XOPEN_SOURCE 600.
+
+Tue Jan 10 12:44:11 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c (ruby_mimmalloc): defined for objects need not rb_objspace,
+	  but should return pointer suitable for ruby_xfree;
+	  main vm and main thread.
+	  patched by Sokolov Yura. https://github.com/ruby/ruby/pull/79
+
+	* internal.h: ditto.
+
+	* vm.c (Init_BareVM): use ruby_mimmalloc.
+
+	* ext/dl/cfunc.c: #include <ruby/util.h>.
+
+	* ext/syslog/syslog.c: use xfree because it is allocated by
+	  ruby_strdup.
+
+Tue Jan 10 12:13:56 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/readline/readline.c (readline_attempted_completion_function):
+	  fix compile error.
+
+Tue Jan 10 10:41:11 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_attempted_completion_function):
+	  empty completion result does not mean memory error.
+
+Tue Jan 10 02:19:22 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/ruby/test_io.rb (test_autoclose_true_closed_by_finalizer,
+	  test_autoclose_true_closed_by_finalizer): skip if IO objects are
+	  not recycled yet. [ruby-dev:45098] [Bug #5850]
+
+Tue Jan 10 00:41:28 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* lib/tempfile.rb (Tempfile#_close): clear @tempfile and @data[1] even
+	  when exception is raised at @tempfile.close. [ruby-dev:45113]
+
+	* lib/tempfile.rb (Tempfile#unlink): fix a typo.
+
+Tue Jan 10 00:32:17 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore
+	  an exception under rb_protect(). [ruby-dev:45113]
+
+Mon Jan  9 23:37:43 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* ext/readline/readline.c (readline_attempted_completion_function):
+	  fix typos.
+
+Mon Jan  9 20:55:34 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c : don't embed struct heaps_slot to a heap block because it
+	  can causes copy-on-write of memory page on heap block when its
+	  free_next is rewritten.
+
+Mon Jan  9 20:26:33 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_entries): add document suggested by
+	  the thread [ruby-core:41959] [Bug #5859].
+
+Mon Jan  9 20:14:13 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (family_addrinfo): don't require protocol
+	  equality.  For example, protocol 0 and IPPROTO_TCP is not problem
+	  for TCP.
+
+Mon Jan  9 20:08:52 2012  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (family_addrinfo): return the given
+	  addrinfo object.
+	  Patch by Ippei Obayashi.  [ruby-dev:45095] [Bug #5845]
+
+Mon Jan  9 19:40:20 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/zlib/test_zlib.rb (TestZlibGzipWriter#test_writer_wrap): set
+	  binmode explicitly.
+
+Mon Jan  9 14:42:41 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: free_slots is changed Singly linked list. clear
+	  free_slots before sweep.
+
+Mon Jan  9 07:46:17 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c: i686-linux needs to define _XOPEN_SOURCE 600 for posix_memalign.
+
+Mon Jan  9 04:24:59 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c (rb_objspace_free): global_List is allocated with xmalloc.
+	  patched by Sokolov Yura.  https://github.com/ruby/ruby/pull/78
+
+	* dln_find.c: remove useless replacement of free.
+
+	* ext/readline/readline.c (readline_attempted_completion_function):
+	  strings for readline must allocated with malloc.
+
+	* process.c (run_exec_dup2): use free; see also r20950.
+
+	* re.c (onig_new_with_source): use malloc for oniguruma.
+
+	* vm.c (ruby_vm_destruct): use free for VMs.
+
+	* vm.c (thread_free): use free for threads.
+
+Mon Jan  9 04:24:59 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* dln_find.c: remove useless replacement of free.
+
+	* ext/readline/readline.c (filename_completion_proc_call):
+	  matches should use xfree.
+
+	* ext/readline/readline.c (username_completion_proc_call): ditto.
+
+Mon Jan  9 01:12:35 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (rb_enc_uint_char): raise RangeError when added codepoint
+	  is invalid. [Feature #5855] [Bug #5863] [Bug #5864]
+
+	* string.c (rb_str_concat): ditto.
+
+	* string.c (rb_str_concat): set encoding as ASCII-8BIT when the string
+	  is US-ASCII and the argument is an integer greater than 127.
+
+	* regenc.c (onigenc_mb2_code_to_mbclen): rearrange error code.
+
+	* enc/euc_jp.c (code_to_mbclen): ditto.
+
+	* enc/shift_jis.c (code_to_mbclen): ditto.
+
+Sun Jan  8 20:31:45 2012  Narihiro Nakamura  <narihiro@netlab.jp>
+
+	* gc.c : consider header bytes which are used by malloc.
+
+Sun Jan  8 11:54:43 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (aligned_free): support MinGW. Patch by Hiroshi Shirosaki.
+
+Sun Jan  8 11:43:05 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (slot_sweep): add a assertion instead of a debug print.
+
+Sun Jan  8 01:18:19 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/-ext-/old_thread_select/test_old_thread_select.rb:
+	  avoid platform bug. [Bug #5858] [ruby-dev:45108]
+
+Sun Jan  8 00:46:34 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* gc.c: get rid of implicit narrowing conversion.
+
+Sun Jan  8 00:10:10 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: check posix_memalign(3) and memalign(3).
+
+	* gc.c (aligned_malloc): use configure's result instead of
+	  _POSIX_C_SOURCE and _XOPEN_SOURCE because they can't be used
+	  to check availability at least on FreeBSD.
+
+Sat Jan  7 22:25:50 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: use Bitmap Marking algorithm to avoid copy-on-write of
+	  memory pages. See [ruby-dev:45085] [Feature #5839]
+	  [ruby-core:41916].
+
+	* include/ruby/ruby.h : FL_MARK rename to FL_RESERVED1.
+
+	* node.h : ditto.
+
+	* debug.c : ditto.
+
+	* object.c (rb_obj_clone): FL_MARK move to a bitmap.
+
+	* class.c (rb_singleton_class_clone): ditto.
+
+Sat Jan  7 00:47:07 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* configure.in: always define CANONICALIZATION_FOR_MATHN.
+	  [ruby-dev:45100] [Bug #5852]
+
+Fri Jan  6 23:11:20 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* include/ruby/version.h: RUBY_API_VERSION 2.0.0
+
+Fri Jan  6 12:24:11 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* object.c (rb_inspect): raises Encoding::CompatibilityError if the
+	  result is incompatible with the default external encoding.
+	  [ruby-core:41931] [Bug #5848]
+
+Thu Jan  5 15:26:15 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (check_valid_dir): strict checking of root.
+	  GetDriveType() succeeds with non root directory as the argument,
+	  even if MSDN says that the API needs the root directory.
+	  this patch fixes a failure of test/ruby/test_file_exhaustive.rb.
+
+Thu Jan  5 12:15:55 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (rb_file_join): separator is appended by array length - 1
+	  times. patched by Benoit Daloze [ruby-core:41901] [Bug #5841]
+
+Thu Jan  5 11:47:54 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI::Parser#initialize_regexp):
+	  use \A \z instead of ^ $. [Bug #5843]
+
+Wed Jan  4 17:55:53 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* array.c (rb_ary_sample): add example for Array#sample
+	  based on patch from https://github.com/ruby/ruby/pull/74
+
+Wed Jan  4 14:24:33 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_nth_len): count ascii-only run at the end.  this
+	  bug appears only when single-byte-optimization is disabled due
+	  to unknown coderange.  [ruby-core:41896] [Bug #5836]
+
+Wed Jan  4 11:32:07 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (check_valid_dir): special case for a root directory.
+	  Reported by Masateru OKAMOTO at [Bug #5819].
+
+Wed Jan  4 00:19:54 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb: use private instead of _xxx
+	  method name. This is Ruby code not Python code.
+	  refs #5696
+
+Tue Jan  3 23:57:37 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/rexml/parsers/baseparser.rb: rexml BaseParser uses
+	  instance_eval unnecessarily on listener add.
+	  patch from Charles Nutter. [Bug #5696] [ruby-core:41437]
+
+Tue Jan  3 20:44:13 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* README: add comment for Git user. patch from Arun Agrawal.
+	* README.ja: ditto.
+
+Tue Jan  3 15:58:22 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* thread.c: changed documentation for "thread-local" variables.
+	  patch from Julien Ammous.
+
+Tue Jan  3 15:50:12 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* process.c: Fix typo. patch from Aviv Ben-Yosef.
+
+Tue Jan  3 13:43:37 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* tool/merger.rb: allow r0123 style revision number.
+
+Tue Jan  3 11:17:55 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* tool/merger.rb (#version_up): version.h date should be Japanese
+	  locale date.
+
+Mon Jan  2 22:08:00 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* tool/file2lastrev.rb (VCS::detect): Add support for Subversion
+	  1.7 which adopted a whole new working directory structure.
+
+	* tool/file2lastrev.rb (VCS::detect): Simply use .each instead of
+	  .sort.reverse_each which looks too arbitrary.  If you want SVN
+	  to be tried first, then you just have to register it first as it
+	  is right now.
+
+Mon Jan  2 20:53:36 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb (random_bytes): use IO#read instead of
+	  IO#readpartial to make the intent more clear.
+
+Mon Jan  2 15:26:39 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* test/ruby/test_object.rb (test_send_with_block): add a normal case.
+
+Mon Jan  2 15:18:54 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* test/ruby/test_object.rb (test_send_with_block): moved from
+	  bootstraptest/test_flow.rb.
+
+Mon Jan  2 15:10:11 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/test/unit/parallel.rb: use pack("m0") instead of
+	  pack("m").gsub("\n","").
+	* lib/test/unit.rb (Test::Unit::Runner::Worker#run): ditto.
+
+Mon Jan  2 15:05:09 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/test/unit.rb (Test::Unit::Runner::Worker#run): use
+	  File.basename with suffix instead of gsub.
+
+Mon Jan  2 14:55:28 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): find may
+	  return nil and nil can not dup.
+
+Sun Jan  1 12:23:10 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/shellwords.rb (Shellwords#shellescape): Drop the //n flag
+	  that only causes warnings with no real effect.  [Bug #5637]
+
+Sat Dec 31 06:28:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread.c (rb_barrier_waiting): save the number of waiting threads
+	  in RBASIC()->flags. [ruby-dev:45002] [Bug #5768]
+
+	* thread.c (rb_barrier_wait): increment and decrement around
+	  rb_mutex_lock, and use rb_barrier_waiting().
+
+	* thread.c (rb_barrier_release): use rb_barrier_waiting().
+
+	* thread.c (rb_barrier_destroy): ditto.
+
+Mon Dec 26 17:20:10 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm.c (vm_exec): add guard to prevent optimization for LLVM clang.
+
+Fri Dec 30 17:01:12 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* vm_eval.c (rb_f_send): fix obj.send() documentation issue.
+	 [Bug #5125] [ruby-core:38633]
+
+Thu Dec 29 22:36:16 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* lib/test/unit.rb (Test::Unit::Runner::Worker#_run_parallels): fix
+	  premature exit when all workers' status are :ready or :prepare.
+	  [ruby-dev:45061] [Bug #5822]
+
+Thu Dec 29 01:51:13 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* include/ruby/ruby.h: fix #error pragma. LLP64 platform is supported.
+
+	* include/ruby/st.h: ditto.
+
+Wed Dec 28 11:22:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::Entry_#entries): use utility method
+	  instead of typoed regexp.  [ruby-core:41829] [Bug #5817]
+
+Wed Dec 28 02:08:04 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* vm_insnhelper.c (unknown_keyword_error): add GC guard to prevent
+	  intermediate object from GC.
+
+Tue Dec 27 22:34:54 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb (Worker#close): "closing IO if IO is closed"
+	  should be "closing IO if IO isn't closed"
+
+Tue Dec 27 22:04:27 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c (st_update): new function to lookup the given key and
+	  update the value.  [ruby-dev:44998]
+
+Tue Dec 27 21:17:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.h (rb_args_info): change pre_args_num and post_args_num as
+	  int, to match with rb_iseq_t.
+
+	* parse.y (new_args_gen): check overflow.
+
+Mon Dec 26 22:38:35 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_insnhelper.c (unknown_keyword_error): make it kind a error
+	  message when unknown keyword is given.  It require more work.
+	  See [ruby-core:40518] and [ruby-core:40541] in detail.
+
+Mon Dec 26 22:31:07 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_core.h (struct rb_iseq_struct), compile.c (iseq_set_arguments),
+	  iseq.c (rb_iseq_parameters), vm_insnhelper.c
+	  (vm_callee_setup_arg_complex): support Method#parameters for keyword
+	  arguments.  The provisional spec is what Benoit Daloze proposed.
+	  [ruby-core:40541]
+
+	* test/ruby/test_keyword.rb: add a test for above.
+
+Mon Dec 26 22:15:27 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_core.h (struct rb_iseq_struct), compile.c (iseq_set_arguments,
+	  iseq_compile_each), vm_insnhelper.c (vm_callee_setup_arg_complex):
+	  implement keyword arguments.  See [ruby-core:40290]
+	  The feature is promised to be included in 2.0, but the detail spec
+	  is still under discussion; this commit is a springboard for further
+	  discussion.  Please try it and give us feedback.
+	  This commit includes fixes for some problems reported by Benoit
+	  Daloze <eregontp AT gmail.com> [ruby-core:40518] and Marc-Andre
+	  Lafortune <ruby-core-mailing-list AT marc-andre.ca>
+	  [ruby-core:41772].
+
+	* iseq.c (iseq_free, prepare_iseq_build): bookkeeping.
+
+	* test/ruby/test_keyword.rb: add tests for keyword arguments.
+
+	* test/ripper/dummyparser.rb (class DummyParser): temporal fix for
+	  ripper test.
+
+Mon Dec 26 22:00:17 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* node.h, node.c, parse.y: implement a parser part for keyword
+	  arguments.
+	  This is a preparation for keyword argument (see [ruby-core:40290]).
+
+	* gc.c (gc_mark_children): bookkeeping.
+
+Mon Dec 26 21:03:18 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* node.h, parse.y (new_args_gen), compile.c (iseq_set_arguments): use
+	  struct rb_args_info instead of NODEs.
+	  This is a preparation for keyword argument (see [ruby-core:40290]).
+
+	* node.c (dump_node), gc.c (gc_mark_children, obj_free): bookkeeping.
+
+Mon Dec 26 20:59:51 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* node.h, parse.y (lambda, f_larglist): remove NEW_LAMBDA hack.
+	  This is a preparation for keyword argument (see [ruby-core:40290]).
+
+Mon Dec 26 22:01:19 2011  Hiroshi Shirosaki <h.shirosaki@gmail.com>
+
+	* io.c (rb_sys_fail_path): move the definition.
+	  Move above for using it in set_binary_mode_with_seek_cur().
+
+	* io.c (set_binary_mode_with_seek_cur): fix improper seek cursor.
+	  Seeking file cursor with setting binary mode has possibility to
+	  cause infinite loop. Fixed the bug and refined error handling.
+	  Introduced at r34043.
+
+	  And cleanups as below.
+	  Remove unnecessary parentheses of `fptr`.
+	  Use return value of setmode().
+
+	* test/ruby/test_io_m17n.rb
+	  (TestIO_M17N#test_seek_with_setting_binmode): add a test for above.
+	  [ruby-core:41671] [Bug #5714]
+
+Mon Dec 26 17:01:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (LIBRUBY_A): depends on main.o since r33774.
+	  [ruby-core:41786] [Bug #5796]
+
+Mon Dec 26 13:07:08 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#test_autoclose): Tempfile.new doesn't
+	  accept the block argument.
+
+Mon Dec 26 13:06:52 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb: Avoid zombie processes on "--separate" option
+	  added at r34121.
+
+Mon Dec 26 04:01:23 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_cipher.c: Update and complete documentation.
+
+Sun Dec 25 23:16:11 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/testunit/test_parallel.rb (test_separate): Test for "--separate"
+	  option (r34121)
+
+Sun Dec 25 22:39:49 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb (_run_parallel):
+	  New option "--separate" for test/unit; when running tests with this
+	  option, a job process will be restarted after one test file has done.
+	  This means all test files will run with separated process.
+
+	* lib/test/unit/parallel.rb: Fix for above. Now parallel.rb puts
+	  "ready!" for first ready, "ready" for afters.
+
+Sun Dec 25 00:02:15 2011  Luis Lavena  <luislavena@gmail.com>
+
+	* configure.in: change --with-ntver to --with-winnt-ver to be more
+	  descriptive in the context. [ruby-core:41794]
+
+Sat Dec 24 23:25:15 2011  Luis Lavena  <luislavena@gmail.com>
+
+	* configure.in: add --with-ntver option to match win32/configure.bat
+	  functionality. Set 0x0501 as default. [ruby-core:35010]
+	  [ruby-core:35035]
+
+Sat Dec 24 12:38:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (proc_call): get rid of optimization-out by clang.
+
+	* proc.c (rb_proc_call, rb_proc_call_with_block): ditto.
+
+Sat Dec 24 10:56:32 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_readline): check if outstream
+	  is closed to get rid of a bug of readline 6.  [ruby-dev:45043]
+	  [Bug #5803]
+
+Sat Dec 24 06:59:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/readline/test_readline.rb (test_line_buffer__point): use
+	  lambda not to exit entire method by "return".  or "next" for
+	  proc.  [ruby-dev:45042] [Bug #5802]
+
+Sat Dec 24 01:20:39 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_eval.c (send_internal): PASS_PASSED_BLOCK_TH must be placed
+	  just before calling rb_call0.
+
+	* bootstraptest/test_flow.rb: add a test for above.
+
+Sat Dec 24 00:55:16 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tempfile.rb (Tempfile#initialize): warn if a block is given.
+
+Fri Dec 23 16:14:30 2011  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/readline.c (readline_attempted_completion_function):
+	  in Readline module with GNU Readline 6 case, Readline module
+	  resets completion_append_character to " ", after it executes
+	  completion. So, Readline module stores
+	  completion_append_character, and Readline module always sets it
+	  after Readline module executes completion. [ruby-dev:43456]
+	  [Feature #4635]
+
+Fri Dec 23 15:59:05 2011  TAKAO Kouji  <kouji@takao7.net>
+
+	* ext/readline/readline.c (Init_readline): libedit check
+	  rl_getc_function only when rl_initialize() is called, and
+	  using_history() call rl_initialize(). This assignment should be
+	  placed before using_history(). [ruby-core:40641] [Bug #5539]
+
+Fri Dec 23 10:14:47 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/thread/test_queue.rb (test_thr_kill): show the number of loop
+	  run when the test failed.
+
+Fri Dec 23 09:23:48 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/test_pty.rb (test_pty_check_default): call PTY.check until
+	  "cat" command is finished.
+
+Fri Dec 23 06:03:00 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* common.mk: add "check succeeded" message.
+
+	* README, README.ja: follow above change.
+
+Fri Dec 23 06:00:39 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/bigdecimal/bigdecimal.h: add satisfy cc-mode comment.
+	* util.c: ditto.
+
+Fri Dec 23 00:08:25 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/test_pty.rb (test_pty_check_default): "cat" may not terminated
+	  in the 0.1 second.
+
+Thu Dec 22 23:37:25 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_thread.rb (test_condvar_timed_wait): don't test the
+	  maximum sleep time.  Ruby is not a real-time system.
+
+Thu Dec 22 22:37:45 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* thread_pthread.c (ping_signal_thread_list): remove return value.
+	* thread_pthread.c (check_signal_thread_list): add a new function to
+	  check if signal thread list is empty.
+	* thread_pthread.c (thread_timer): check signal thread list after
+	  timer_thread_function(). main thread might be added into signal thread
+	  list during timer_thread_function().
+
+Thu Dec 22 00:40:24 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* ext/bigdecimal/bigdecimal.c (VpMult, VpCtoV, VpSqrt): remove assigned
+	  but unused variables.
+
+Wed Dec 21 18:28:22 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (newline.c, miniprelude.c): revert r33949 because the change
+	  broke mswin build, and the changer said no reason about the change.
+	  [ruby-dev:45016] [Bug #5783]
+
+Wed Dec 21 12:35:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_s_allocate): follow
+	  Allocation Framework.  [Bug #5775]
+
+Wed Dec 21 02:25:36 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/emitter.c: fixing clang warnings. Thanks Joey!
+
+Wed Dec 21 01:06:00 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/bigdecimal/README: Update redmine.ruby-lang.org to bugs.ruby-lang.org
+	* ext/socket/ancdata.c: ditto
+	* test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb: ditto
+	* test/syck/test_yaml.rb: ditto
+	* doc/ChangeLog-1.9.3: ditto
+
+Tue Dec 20 23:50:12 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* PStore content update perf optimization. Patch by Masaki Matsushita.
+	  See #5248.
+
+	* lib/pstore.rb (save_data):
+
+	  * Delete inadequate Marshal check.
+
+	  * Deferred file truncation: when writing the new content, truncate
+	    the saved file to the data size after writing the data, instead of
+	    truncating whole bytes before writing data.
+
+	  * Deferred MD5 calculation: when comparing MD5 hash to check the
+	    content modification, calculate MD5 hash of new data iif the
+	    content length is differ from the old one.
+
+	  * Compare content size with String#bytesize instead of String#size.
+
+Tue Dec 20 21:00:30 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: uses to_integer instead.
+	* test/date/test_switch_hitter.rb: added a test.
+
+Tue Dec 20 15:04:18 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* Make sure to clear $! when ignoring an exception
+
+	* ext/openssl/ossl.c (ossl_pem_passwd_cb0, ossl_verify_cb):
+	  pem_passwd_cb and verify_cb ignores the exception raised in a
+	  callback proc so it should clear $! for subsequent execution.
+
+	  That's said, both subsequent processes for pem_passwd_cb and
+	  verify_cb raises another exception before leaking $! to Ruby world.
+	  We cannot test this fix in Ruby land.
+
+	* test/openssl/test_pkey_rsa.rb
+	  (test_read_private_key_pem_pw_exception): Test for pem_passwd_cb +
+	  exception.
+
+Tue Dec 20 11:49:13 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/date/test_date_base.rb (test_jd): tests for
+	  [ruby-dev:45008].
+
+Tue Dec 20 10:20:48 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/date/date_core.c (wholenum): fix the type of the return value.
+
+Tue Dec 20 05:03:24 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* README.ja:  Update redmine.ruby-lang.org to bugs.ruby-lang.org
+	* README:  ditto
+	* common.mk:  ditto
+	* man/erb.1:  ditto
+	* man/irb.1:  ditto
+	* man/ri.1:  ditto
+	* man/ruby.1:  ditto
+	* sparc.c:  ditto
+	* tool/install-sh:  ditto
+
+Tue Dec 20 02:15:18 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c:  [ruby-dev:45008].
+
+Sun Dec 18 18:52:37 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* vm.c (vm_define_method): improve guard of iseq from GC.  Fix
+	  failure or segmentation fault in test_singleton_method(TestGc)
+	  on sparc Solaris10 compiled with Oracle Solaris Studio 12.2.
+	  [Bug #5762] [ruby-dev:45000] [Bug #4178]
+
+Sun Dec 18 14:34:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal): does not follow
+	  allocation framework right now.  [ruby-core:41710] [Bug #5773]
+
+Sun Dec 18 12:42:48 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: BigDecimals can be restored
+	  from YAML.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: BigDecimals can be dumped
+	  to YAML.
+	* test/psych/test_numeric.rb: tests for BigDecimal serialization
+
+Sun Dec 18 12:03:13 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: Strings that look like dates
+	  should be treated as strings and not dates.
+
+	* test/psych/test_scalar_scanner.rb: corresponding tests.
+
+Sun Dec 18 09:43:21 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/thread/test_queue.rb (test_thr_kill): extend timeout.
+	  this test takes a long time at slow machine.
+
+Sun Dec 18 09:36:51 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/ruby/envutil.rb (invoke_ruby): remove :timeout option before
+	  pass it to Kernel#spawn.
+
+Fri Dec 16 17:18:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README, README.ja: 'make check' is preferable to 'make test'.
+
+Thu Dec 15 23:16:13 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* error.c (builtin_type_name): don't return pointer to the buffer of
+	  temporary String object.
+
+Thu Dec 15 17:56:58 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_type): make typed data.
+
+Thu Dec 15 17:40:28 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_check_type): fix typo.
+
+Thu Dec 15 14:48:35 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/strscan/strscan.c: use typed data with
+	  onig_region_memsize().
+
+Thu Dec 15 14:33:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_check_typeddata): refine error message with
+	  including expected struct name.
+
+Thu Dec 15 13:15:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regcomp.c (onig_region_memsize): implemented for memsize_of().
+
+	* ext/objspace/objspace.c (memsize_of): use it.
+
+Thu Dec 15 10:44:54 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_reject_bang, rb_ary_delete_if): update rdoc.
+	  documentation from Thomas Leitner <t_leitner AT gmx.at> in
+	  [ruby-core:41616].  [Bug #5752]
+
+Thu Dec 15 10:10:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_require.rb (test_race_exception): get rid of
+	  not-guaranteed timing issue.  [ruby-core:41655] [Bug #5754]
+
+Wed Dec 14 21:58:42 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io_m17n.rb
+	  (TestIO_M17N#test_{read_with_binmode_and_get[cs]}): only for Windows.
+
+Wed Dec 14 19:57:23 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk,Makefile.in,win32/Makefile.sub (ECHO1): move platform
+	  specific hack from common.mk to Makefile.in (and win32/Makefile.sub).
+	  [Bug #5711]
+
+	* lib/mkmf.rb: we can generate Makefile as we like.
+
+Wed Dec 14 19:22:33 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (rb_w32_fd_is_text): new function.
+
+	* win32/win32.c (init_stdhandle): set default mode of stdin as binmode.
+
+	* io.c (set_binary_mode_with_seek_cur): new function to replace
+	  SET_BINARY_MODE_WITH_SEEK_CUR macro.  now returns previous mode of the
+	  fd and take care of LF in rbuf.
+
+	* io.c (do_writeconv): set text mode when needed.
+
+	* io.c (io_read): need to change the mode of the IO to binmode
+	  temporally when the length for IO#read, because IO#read with length
+	  must behave so.
+
+	* test/ruby/test_io_m17n.rb (TestIO_M17N#test_{read_with_length,
+	  read_with_length_binmode,get[cs]_and_read_with_binmode,
+	  read_with_binmode_and_get[cs],read_write_with_binmode}): tests for
+	  above changes.
+
+	all patches are written by Hiroshi Shirosaki. [ruby-core:41496]
+	[Feature #5714]
+
+Wed Dec 14 15:28:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (str_encode): about the extension of :fallback
+	  option since 1.9.3.
+
+Wed Dec 14 12:19:59 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (load_unlock): release loading barrier and then remove it
+	  from loading_table if it is not in-use.  [Bug #5754]
+
+	* thread.c (rb_barrier_release, rb_barrier_destroy): return
+	  whether any other threads are waiting on it.
+
+Wed Dec 14 11:23:45 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c (ubf_select): call rb_thread_wakeup_timer_thread()
+	  only when it is not timer_thread. [Bug #5757] [ruby-dev:44985]
+	  patched by Tomoyuki Chikanaga.
+
+Wed Dec 14 10:20:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (load_lock): delete the loading barrier if it has been
+	  destroyed.
+
+	* thread.c (rb_barrier_wait): return nil for recursive lock
+	  instead of false, to distinguish it from destroyed barrier.
+
+Wed Dec 14 01:24:55 2011  okkez  <okkez000@gmail.com>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): fix memory
+	  leak. [ruby-dev:44904] [Bug #5688]
+
+Wed Dec 14 00:01:15 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (primary): point method name line.  [ruby-core:40936]
+	  [Bug #5614]
+
+Tue Dec 13 23:43:48 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* error.c (name_err_mesg_to_str): clear rb_thread_t::errinfo when
+	  ignore exception under rb_protect(). [ruby-core:41612] [Bug #5755]
+
+	* test/ruby/test_exception.rb (test_exception_in_name_error_to_str):
+	  add a corresponding test.
+
+Tue Dec 13 16:13:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (load_unlock): all threads requiring one file should
+	  share same loading barrier, so it must be kept alive while those
+	  are waiting on it.  [ruby-core:41618] [Bug #5754]
+
+Tue Dec 13 07:30:14 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/webrick/httpresponse.rb (setup_header): 1xx responses
+	  are allowed to have Keep-Alive connections.
+
+	* test/webrick/test_httpresponse.rb: corresponding test.
+
+Tue Dec 13 07:13:28 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/webrick/httpresponse.rb (setup_header): 204 and 304 responses
+	  are allowed to have a Keep-Alive connection. [ruby-core:41581]
+
+	* test/webrick/test_httpresponse.rb: corresponding test.
+
+Tue Dec 13 06:29:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_magic_comment): should pass the proper value.
+	  [ruby-dev:44984][Bug #5753]
+
+Tue Dec 13 05:50:07 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_yield_setup_block_args): splat single
+	  argument if optional arguments are defined not only mandatory or
+	  post arguments.  [ruby-core:41557] [Bug #5730]
+
+Mon Dec 12 22:35:39 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* parse.y (stmt_or_begin): changed the error message for BEGIN not
+	  at toplevel.  [ruby-dev:44963] [Bug #5738]
+
+Mon Dec 12 17:29:01 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* README: Fixed SupportedPlatforms URL in the README.
+	  patched by eMxyzptlk. https://github.com/ruby/ruby/pull/62
+
+Mon Dec 12 17:26:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_feature_p): lazy assigned load_path searched in
+	  loading_table were not expanded, but all features, pushed to
+	  loading table, are expanded.  a patch by Yura Sokolov
+	  <funny.falcon AT gmail.com> in [ruby-core:41545]. [Bug #5727]
+
+Mon Dec 12 15:41:03 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_truncate): fix typo.  patched by
+	  Nick Howard <ndh AT baroquebobcat.com>.
+	  https://github.com/ruby/ruby/pull/65
+
+Sun Dec 11 12:19:17 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: includes the sequence number of UID in a error
+	  message.  suggested by art lussos.
+	  [ruby-core:41413] [Feature #5692]
+
+Sun Dec 11 11:42:10 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/syslog/syslog.c: fix a typo. [ruby-core:41585] [Bug #5740]
+
+Sun Dec 11 10:48:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (exit_initialize): deal with true and false as well as
+	  Kernel#exit.  [ruby-dev:44951] [Bug #5728]
+
+Sun Dec 11 10:37:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_check_to_int): new function to convert a VALUE to
+	  an Integer if possible, but returns nil instead of raising an
+	  exception otherwise.
+
+Sun Dec 11 10:34:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_exit_status_code): extract from rb_f_exit_bang and
+	  rb_f_exit.  assume 0 to be success in Kernel#exit! too.
+
+Fri Dec  9 19:24:31 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/iso-8859-16-tbl.rb: add ISO-8859-16 converter.
+
+	* enc/trans/single_byte.trans: ditto.
+
+Fri Dec  9 14:28:40 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (file_path_convert): don't convert it when the path string is
+	  ascii only. [ruby-core:41556] [Bug #5733]
+	  tests are contributed by nobu.
+
+Fri Dec  9 08:00:15 2011  Luis Lavena  <luislavena@gmail.com>
+
+	* include/ruby/win32.h: undef stat to silence mingw-w64 stat
+	  redefinition warnings (GCC 4.6.3).
+
+Thu Dec  8 23:38:24 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* variable.c (set_const_visibility): clear inline-cache when constant's
+	  visibility is modified. [ruby-dev:44929]
+
+	* test/ruby/test_module.rb (test_private_constants_clear_inlinecache):
+	  add test for it.
+
+Thu Dec  8 23:26:11 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/extmk.rb (extract_makefile): should sort after map, not before
+	  it.  in this case there is no difference, but we should write better
+	  code.  this bad smell was caught by nagachika.
+
+Thu Dec  8 22:31:13 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/extmk.rb (extract_makefile): need to sort the array of current
+	  srcs before comparing to the sorted old srcs.
+	  fixed the problem that the configuring stage of exts were always
+	  run, introduced at r33801.
+
+Thu Dec  8 13:26:24 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rexml/test_order.rb (OrderTester#test_more_ordering): use
+	  Zlib::GzipReader.open instead of Zlib::GzipReader.new with File.new.
+	  fixed a test error on Windows introduced at r33946.
+
+Thu Dec  8 13:11:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_process.rb (TestProcess#test_sete[gu]id): silently
+	  skip if not implemented such functions (such as, on Windows).
+	  fixed test errors on Windows introduced at r33953.
+
+Thu Dec  8 12:57:50 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb: forgotten to define HAVE_SOCKETPAIR for
+	  windows.
+	  fixed test errors on Windows introduced at r33947.
+
+Thu Dec  8 12:11:06 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_WERROR_FLAG): append all warning flags which
+	  are enabled to compile, so that printf format modifiers properly
+	  fail.  [ruby-core:41351] [Bug #5679]
+
+Thu Dec  8 07:20:15 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/re.rdoc:  Document difference between match and =~, options with
+	  Regexp.new and global variables.  Patch by Sylvain Daubert.
+	  [Ruby 1.9 - Bug #5709]
+
+Thu Dec  8 06:53:10 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/re.rdoc:  Fix example code to match documentation.  Patch by
+	  Jarno Lamberg.  [Ruby 1.9 - Bug #5624]
+
+Wed Dec  7 19:04:22 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rpath): fix typo in the help string.  a patch from
+	  Yuji Yamano <yyamano AT kt.rim.or.jp> in [ruby-list:48568].
+
+Wed Dec  7 18:55:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_set_top_stack, vm_set_eval_stack): check for stack
+	  overflow with stack_max before push new frame. [ruby-core:41520]
+	  [Bug #5720]
+
+	* vm.c (vm_set_main_stack): no stack overflow chances after
+	  vm_set_eval_stack().
+
+Wed Dec  7 09:58:15 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/bigdecimal/bigdecimal.c:  Document +@, -@, hash, INFINITY, Nan.
+	  Patch by Sylvain Daubert.  [Ruby 1.9 - Feature #5622]
+
+Wed Dec  7 09:48:00 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* io.c (Init_IO):  Mention io/console methods.  [Ruby 1.9 - Bug #5602]
+	* ext/io/console/console.c:  Mention that io/console must be required
+	  similar to lib/time.rb
+
+Wed Dec  7 08:04:31 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb (module Psych): parse and load methods take
+	  an optional file name that is used when raising Psych::SyntaxError
+	  exceptions
+	* ext/psych/lib/psych/syntax_error.rb (module Psych): allow nil file
+	  names and handle nil file names in the exception message
+	* test/psych/test_exception.rb (module Psych): Tests for changes.
+
+Tue Dec  6 18:26:33 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/dbm.c: use db_version() instead of DB_VERSION_STRING to
+	  detect runtime Berkeley DB version.
+	  use dpversion instead of _QDBM_VERSION to detect runtime QDBM
+	  version.
+	  [ruby-dev:44948]
+
+Tue Dec  6 12:30:41 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: detect gdbm_version in libgdbm.
+
+	* ext/dbm/dbm.c: make DBM::VERSION more informative for gdbm, qdbm and
+	  Berkeley DB 1.x.  [ruby-dev:44944]
+
+Tue Dec  6 07:26:37 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* range.c:  Improve documentation for Range.  Patch by Chris Zetter.
+	  [Ruby 1.9 - Bug #5656]
+
+Mon Dec  5 19:08:04 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regparse.c (PFETCH_READY): separate gcc specific trick.
+
+Mon Dec  5 19:01:59 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_seteuid_m): fix argument.
+
+	* test/ruby/test_process.rb (test_geteuid): fix typo.
+
+	* test/ruby/test_process.rb (test_getegid, test_set[eg]uid): add.
+
+Mon Dec  5 18:56:55 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (big_rshift), compile.c (validate_label,
+	  iseq_build_from_ary_exception), cont.c (cont_capture), dir.c
+	  (dir_open_dir), gc.c (objspace_each_objects), io.c (pipe_open)
+	  (rb_io_advise), parse.y (parser_compile_string)
+	  (rb_parser_compile_file), proc.c (binding_free), process.c
+	  (rb_proc_exec_n, rb_seteuid_core, proc_setegid, rb_setegid_core)
+	  (p_uid_exchange, p_gid_exchange), regparse.c (strdup_with_null),
+	  signal.c (sig_dfl), vm.c (rb_iseq_eval, rb_iseq_eval_main),
+	  vm_insnhelper.c (vm_expandarray): suppress
+	  unused-but-set-variable warnings.
+
+	* class.c (rb_obj_methods), compile.c (iseq_compile_each),
+	  iseq.c(iseq_load, rb_iseq_parameters), pack.c (pack_pack),
+	  regcomp.c (is_not_included, update_string_node_case_fold),
+	  transcode.c (rb_econv_open0, make_replacement),
+	  vm_eval.c (raise_method_missing): remove unused variable.
+
+	* signal.c (reserved_signal_p): static.
+
+Mon Dec  5 14:27:23 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/{subst.h,win32.h}, ext/socket/rubysocket.h: revert
+	  r33876.  [ruby-core:41475] [Bug #5706]
+
+	* ext/socket/extconf.rb: the alternative hack for [Bug #5675].
+
+Mon Dec  5 10:18:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/zlib/zlib.c (rb_gzreader_initialize): revert a part of r33937.
+	  1st, to change the mode of an IO is very sensitive problem, so
+	  the maintainer of this library should judge it.
+	  2nd, usually Zlib::GzipReader.new is not called directly.  #initialize
+	  is called via .open, and in the method the I/O is opened in binary
+	  mode, so there is no problem without changing the mode in #initialize.
+
+Sun Dec  4 22:53:12 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tempfile.rb: don't use lock directory.  [ruby-dev:39197]
+
+Sun Dec  4 22:34:43 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tempfile.rb (Tempfile::MAX_TRY): remove unused constant.
+
+Sun Dec  4 12:11:28 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/pp.rb: fix rdoc.
+
+Sun Dec  4 12:03:16 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator#methods): Kernel#methods receives
+	  zero or one argument. [ruby-core:37118] [Bug #4882]
+
+Sun Dec  4 10:15:00 2011  Luis Lavena  <luislavena@gmail.com>
+
+	* ext/zlib/zlib.c (rb_gzreader_initialize): use binary mode by default
+	  under Windows. Patch by Hiroshi Shirosaki. [ruby-core:40706]
+	  [Feature #5562]
+
+	* include/ruby/encoding.h (void rb_econv_binmode): define NEWLINE
+	  decorator.
+
+	* io.c (rb_cloexec_fcntl_dupfd): Introduce NEED_READCONV and
+	  NEED_WRITECONV to replace universal newline decorator by CRLF only
+	  when required to improve file reading and writing under Windows.
+	  Patch by Hiroshi Shirosaki. [ruby-core:40706] [Feature #5562]
+	* io.c (do_writeconv): adjust binary mode if required.
+	* io.c (read_all, appendline, swallow, rb_io_getline_1): ditto.
+	* io.c (io_getc, rb_io_each_codepoint, rb_io_ungetc): ditto.
+	* io.c (rb_io_binmode, rb_io_ascii8bit_binmode): ditto.
+	* io.c (rb_io_extract_modeenc, rb_sysopen): ditto.
+	* io.c (pipe_open, prep_stdio, io_encoding_set): ditto.
+	* io.c (rb_io_s_pipe, copy_stream_body): ditto.
+
+	* test/ruby/test_io_m17n.rb (EOT): add test for pipe and stdin in
+	  binary mode.
+
+	* win32/win32.c (init_stdhandle): remove O_BINARY from stdhandle
+	  initialization.
+	* win32/win32.c (rb_w32_write): use FTEXT mode accordingly.
+
+Sat Dec  3 20:49:16 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* variable.c (set_const_visibility): print a warning when no argument
+	  is passwd to Module#private_constant.  [ruby-list:48558]
+
+	* vm_method.c (set_method_visibility): ditto for
+	  Module#private_class_method.
+
+Sat Dec  3 20:43:14 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* variable.c (set_const_visibility): Module#private_constant has
+	  changed the visibility of only the first argument.  Now it changes
+	  all of them.  [ruby-list:48558]
+
+	* test/ruby/test_module.rb: add a test for above.
+
+Sat Dec  3 07:17:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (CFLAGS): append ARCH_FLAG.
+
+	* configure.in (ARCH_FLAG): exclude from CFLAGS.
+
+	* configure.in (UNIVERSAL_INTS): include short int.  fix for
+	  test/mkmf.
+
+Fri Dec  2 15:48:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (VpAllocReal): reduce extra frac.
+
+Fri Dec  2 15:41:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check whether -pie or -Wl,-pie is valid as
+	  LDFLAGS.  [ruby-core:41438] [Bug#5697]
+
+	* configure.in: use $linker_flag for LDFLAGS option which is not
+	  limited to particular platforms.
+
+Thu Dec  1 23:21:58 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* thread_pthread.c (thread_timer): call prctl(PR_SET_NAME) only if
+	  PR_SET_NAME is available.
+
+Thu Dec  1 22:31:16 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (linux_get_maxfd): change local variable name.
+
+Thu Dec  1 16:59:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/extconf.rb: add arguments for macro calls.
+	  [ruby-core:41370] [Bug#5681]
+
+Thu Dec  1 16:20:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#try_func): fix broken patch at r33834.
+
+Thu Dec  1 14:43:17 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.h (Real): suppress false warning from
+	  clang.  [ruby-core:41418] [Bug#5693]
+
+Thu Dec  1 10:31:55 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LDFLAGS): -fstack-protector is always needed to
+	  link static library created with it.  [ruby-core:41387]
+	  [Bug#5686]
+
+Thu Dec  1 07:03:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: add sys/prctl.h test.
+	* thread_pthread.c (thread_timer): call prctl(PR_SET_NAME) to change
+	  thread name. It may help to debug.
+
+Wed Nov 30 23:35:45 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* variable.c (rb_path2class): don't raise NameError when the middle
+	  constant of the path is not defined but defined on toplevel.
+	  [ruby-core:41410] [Bug #5691]
+
+Wed Nov 30 20:02:02 2011  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* transcode.c: Simplified rb_econv_binmode, avoided a warning on cygwin.
+
+Wed Nov 30 08:57:07 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/mkmf.rb:  Use MakeMakefile's rm_f to avoid conflict with Rake or
+	  FileUtils.
+	* test/ruby/test_module.rb:  Hide MakeMakefile's inclusion in Object
+
+Wed Nov 30 09:12:43 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rdoc/encoding.rb (RDoc::Encoding.read_file): fixup newline chars
+	  on Windows.
+	  see https://github.com/rdoc/rdoc/issues/87
+
+	* test/rdoc/test_rdoc_markup_pre_process.rb
+	  (TestRDocMarkupPreProcess#test_include_file,
+	  TestRDocMarkupPreProcess#test_include_file_encoding_incompatible):
+	  follow above change.
+
+Wed Nov 30 09:09:37 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (parse): parse method can take an option file
+	  name for use in exception messages.
+	* test/psych/test_parser.rb: corresponding tests.
+
+Tue Nov 29 09:07:59 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/mkmf.rb:  Fix indentations of constants at end of module.
+	  Document some constants.
+
+Tue Nov 29 09:58:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_write_error2): suppress unused variable warning.
+
+Tue Nov 29 07:45:26 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/mkmf.rb:  Wrap comments to 78 columns and clean up formatting.
+
+Tue Nov 29 05:54:18 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/mkmf.rb:  Wrap mkmf.rb in module MakeMakefile to clean up Object
+	  documentation.  [Ruby 1.9 - Feature #5658]
+	* ext/extmk.rb:  Use MakeMakefile::CONFIG instead of Object::CONFIG
+	* test/mkmf/base.rb:  ditto
+
+Tue Nov 29 00:08:57 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (INSTRUBY_ARGS): added --mantype to apply mdoc2man.rb
+	  to man pages.  Fixes #5598.
+	  (do-install-nodoc, do-install-local, do-install-man,
+	  dont-install-nodoc, dont-install-local, dont-install-man):
+	  No longer needs --mantype.
+
+	  Reported by Rainer Orth <ro AT cebitec.uni-bielefeld.de>,
+	  patch by George Koehler <xkernigh AT netscape.net>.
+
+Mon Nov 28 22:26:31 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rake/test_rake_directory_task.rb
+	  (TestRakeDirectoryTask#test_directory_win32): shouldn't create any
+	  file/directory on root directory.  create on @tempdir (= Dir.pwd).
+	  see https://github.com/jimweirich/rake/issues/91
+
+Mon Nov 28 12:57:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_write_error2): fwrite() returns ssize_t.
+
+Mon Nov 28 12:47:19 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (nodetype, nodeline): static.  these functions are for
+	  debugging, and not intend to be public.
+
+Mon Nov 28 12:37:54 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c (initial_params): static.  it seems to be forgotten at r33501.
+
+Mon Nov 28 12:32:24 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h, win32/win32.c (GetCurrentThreadHandle): remove
+	  unused old API.
+
+Mon Nov 28 12:29:20 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/mkexports.rb (Exports#initialize): remove old symbol name.
+
+Mon Nov 28 12:15:28 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/mkexports.rb (Exports#read_substitution): need to read
+	  from subst.h too.  [Bug #5675]
+
+Mon Nov 28 11:46:35 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_flush): release GVL during fsync() on Windows.
+
+Mon Nov 28 11:00:25 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/subst.h: typo of r33876.
+
+Mon Nov 28 10:36:00 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/subst.h: moved Windows specific substitutions from
+	  win32.h.
+
+	* ext/socket/rubysocket.h: include ruby/subst.h.  [Bug #5675]
+
+Mon Nov 28 10:20:58 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{Makeilfe.sub,win32.c} (FILE_COUNT, FILE_READPTR): move the
+	  definitions from config.h to win32.c.  I dared to have left such
+	  macros, for other future compiler support.
+	  [ruby-core:41313] [Bug #5674]
+
+Mon Nov 28 09:28:30 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_uchmod): typo.  [Bug#5671] [ruby-dev:44898]
+
+	* test/ruby/test_file.rb (TestFile#test_chmod_m17n): test of above bug.
+
+Sun Nov 27 21:25:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: added -fno-strict-overflow. it suppress annoying
+	  -Wstrict-overflow warning.
+
+Sun Nov 27 20:58:02 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_write_error2): get rid of warning on linux. fwrite
+	  of glibc is tagged __attribute__ ((__warn_unused_result__))
+	  if _FORTIFY_SOURCE != 0.
+	* vm_dump.c (rb_vm_bugreport): ditto.
+
+Sun Nov 27 19:09:02 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (stack_protector): disable on mingw.  [Bug#5676]
+
+	* Makefile.in (DLDFLAGS): also needs -fstack-protector.
+	  [Bug#5676]
+
+Sun Nov 27 14:13:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: add -fstack-protector into XLDFLAGS as well as
+	  XCFLAGS if stack-protector is used.
+
+Sun Nov 27 13:09:25 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: workaround to avoid MacOS X build error.
+	  Maybe autoconf 2.61 is slightly buggy. [ruby-core:41316]
+
+Sun Nov 27 04:57:11 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (--no-undefined): r33840 breaks FreeBSD and DragonFly
+	  with gcc 4.4 or later. Their environ is in /usr/libexec/ld-elf.so.1,
+	  so it will be false negative.
+
+Sun Nov 27 04:55:45 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP::SSL_IVNAMES): rerefix 33701.
+	  SSL_ATTRIBUTES stores names for set_params, they are symbol.
+	  SSL_IVNAMES stores instance variable names.
+
+Sun Nov 27 00:16:07 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (copy_stream_body): use 0666 for permission argument for open.
+	  [ruby-core:40865]
+
+Sat Nov 26 23:01:38 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_engine.rb: remove side effect of generic engine
+	  load by explicitly loading software-based "openssl" engine for
+	  all tests.
+
+Sat Nov 26 20:41:48 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP.get_response): enable use_ssl
+	  if given URI object is https.
+	  patched by Mark Ferlatte [ruby-core:40665] [Bug #5545]
+
+	* lib/net/http.rb (Net::HTTP.post_form): ditto.
+
+Sat Nov 26 20:01:18 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP::SSL_ATTRIBUTES): refix 33701.
+	  store instance variable symbol names.
+
+Sat Nov 26 15:40:25 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* .travis.yml (script): should be ./configure
+
+Sat Nov 26 15:39:18 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* .travis.yml (before_script): wrong name, sorry.
+
+Sat Nov 26 15:31:34 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* .travis.yml (before-script): autoconf required.
+
+Sat Nov 26 15:24:05 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* .travis.yml: Travis enable.
+
+Sat Nov 26 10:47:50 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/extconf.rb: remove checks for available functions.
+	* ext/openssl/missing.h: ditto.
+	  Thanks, Tim Mooney for reporting this!
+	  [Bug #5432] [ruby-core:40088]
+
+Sat Nov 26 10:22:28 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_ssl.c: add comment on where to find implementation
+	  of OpenSSL::SSL::SSLSocket#session.
+
+Sat Nov 26 05:00:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (--no-undefined): RUBY_TRY_CFLAGS does nothing for
+	  linker flags.  use RUBY_TRY_LDFLAGS.
+
+Fri Nov 25 11:37:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (ioctl_narg_len, linux_iocparm_len): reinstantiate linux
+	  specific narg length calculation.
+	* test/ruby/test_io.rb (test_ioctl_linux2): add new test for old and
+	  unstructured ioctl.
+
+Fri Nov 25 10:39:14 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* Makefile.in (EXTLDFLAGS): export it.
+	* configure.in: add --no-undefined if --enable-shared is specified.
+	  Gentoo enabled this option long time. Also, export EXTLDFALGS.
+
+Fri Nov 25 08:48:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: turn on PIE if --enable-shared is not specified.
+
+Fri Nov 25 08:05:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: add -fstack-protector. It help to protect us from
+	  stack smashing attack.
+
+Fri Nov 25 08:03:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: add -D_FORTIFY_SOURCE=2. It provide some compile
+	  time and runtime check for security.
+
+Fri Nov 25 08:00:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/mkmf.rb: get rid of warnings of mkmf.rb if -Wmissing-declarations
+	  and/or -Wold-style-definition warnings if specified.
+	  Patch by Nikolai Weibull. Thank you! [Bug #5459] [ruby-core:40200]
+
+Fri Nov 25 07:46:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: add -Wall always.
+
+Thu Nov 24 20:02:40 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl/test_engine.rb: use IO#reopen to restore stderr.
+
+Thu Nov 24 19:59:56 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_reopen): re-initialize buffering mode for stdout and
+	  stderr.
+
+Thu Nov 24 11:12:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_io_fsync,rb_io_fdatasync): release GVL during fsync().
+	  fsync() and fdatasync() may take a long time on slow disks and/or
+	  if there is much dirty data.
+	  Patch by Eric Wong. [Feature #5665] [ruby-core:41247]
+
+Thu Nov 24 10:05:02 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_engine.rb: Suppress output from 'openssl'
+	  engine's RC4 cipher.
+	  [Bug #5633] [ruby-core:41026]
+
+Thu Nov 24 08:05:02 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_pkey_dsa.c: remove redundant colon from error
+	  message.
+	* ext/openssl/ossl_ssl.c: ditto.
+	* ext/openssl/ossl_pkey_rsa: ditto.
+	  patched by Eric Hodel [Bug #5604] [ruby-core:40896]
+
+Wed Nov 23 20:03:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (ioctl_narg_len): don't use _IOC_SIZE macro on Linux.
+	  On Linux some constants for ioctl(2) doesn't include the size of
+	  its return value and 16bit value; for example FIONREAD 0x541B.
+	  Moreover the manual, ioctl_list(2),  says "Note  that  the  size
+	  bits  are  very unreliable: in lots of cases they are wrong,
+	  either because of buggy macros using sizeof(sizeof(struct)),
+	  or because of legacy values."
+	  So we shouldn't use it.
+
+Tue Nov 22 18:07:32 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (_pioinfo): need to declare _pioinfo() before using
+	  _osfhnd and other macros which uses _pioinfo() internally.
+
+Tue Nov 22 17:49:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (_pioinfo): make an inline function.
+
+Tue Nov 22 11:26:08 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+Tue Nov 22 11:33:58 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (dupfd): argument of _osfhnd and so on should not
+	  have side effect.
+
+Tue Nov 22 11:26:08 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* bignum.c (rb_big_divide): refix of r33536. Don't change behavior of Bignum#/.
+	  [ruby-core:40429] [Bug #5490]
+
+Tue Nov 22 10:46:57 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (ruby_float_step): improve floating point calculations.
+	  [ruby-core:35753] [Bug #4576]
+
+	* numeric.c (ruby_float_step): correct the error of floating point
+	  numbers on the excluding case.
+	  patched by Masahiro Tanaka [ruby-core:39608]
+
+	* numeric.c (ruby_float_step): use the end value when the current
+	  value is greater than or equal to the end value.
+	  patched by Akira Tanaka [ruby-core:39612]
+
+Tue Nov 22 06:59:21 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io.rb (test_fcntl_dupfd): there is no known platform
+	  which don't have F_DUPFD.  [ruby-dev:44874]
+
+Tue Nov 22 04:46:22 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: remove autoload from psych
+	* ext/psych/lib/psych/json.rb: ditto
+
+Tue Nov 22 00:44:59 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io.rb (test_fcntl_dupfd): the argument of F_DUPFD is
+	  minimum file descriptor.
+
+Tue Nov 22 00:25:17 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (linux_get_maxfd): get rid of a warning.
+
+Mon Nov 21 23:39:14 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (linux_get_maxfd): new function to find maximum fd on Linux.
+	  (rb_close_before_exec): use linux_get_maxfd.
+
+Mon Nov 21 06:16:24 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* cont.c (fiber_switch): ignore fiber context switch
+	  because destination fiber is same as current fiber.
+	  With out this, it may segv on FreeBSD 9.
+	  patched by Koichi Sasada.
+
+Sun Nov 20 23:22:42 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extract_makefile, extmake): regenerate makefiles
+	  if globbed source file list is changed.
+
+	* lib/mkmf.rb (create_makefile): store ORIG_SRCS.
+
+Sun Nov 20 22:43:03 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/unicode.c (PROPERTY_NAME_MAX_SIZE): +1.
+	  reported by Ken Takata. [ruby-dev:44894][Bug #5652]
+
+Sun Nov 20 11:01:28 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/set.rb (SortedSet.setup): remove old_init after initialize
+	  method is redefined.  The remove before redefinition makes the
+	  warning prevention fragile.  [ruby-dev:44892]
+
+Sun Nov 20 04:01:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (enc/unicode/name2ctype.h): remove duplicated
+	  ifdefs.
+
+Sat Nov 19 19:31:47 2011  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (TIME_COPY_GMT): copy vtm.utc_offset and vtm.zone too.
+	  patch by Tomoyuki Chikanaga.
+	  [ruby-dev:44827] [Bug #5586]
+
+Sat Nov 19 16:36:57 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/net/http/test_http.rb: remove temporally files in ensure clause.
+
+Sat Nov 19 08:18:41 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/net/http/test_http.rb: remove temporally files.
+
+Fri Nov 18 17:18:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (console_raw, console_set_raw)
+	  (console_getch): optional parameters.  [EXPERIMENTAL]
+
+Fri Nov 18 16:12:11 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (console_cooked, console_set_cooked):
+	  new methods to reset cooked mode.  [EXPERIMENTAL]
+
+Fri Nov 18 13:20:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/unit/assertions.rb (MINI_DIR): quick dirty hack to get rid of
+	  warnings when using assert/assert_respond_to.
+
+Fri Nov 18 13:03:38 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_cloexec_open): set O_NOINHERIT instead of O_CLOEXEC if it is
+	  available (for Windows).
+
+	* win32/win32.c (fcntl): on F_DUPFD, determine the inheritance of the
+	  new handle by O_NOINHERIT flag of original fd.
+
+Fri Nov 18 08:00:41 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 2.8.1 (r6750)
+	* test/minitest/*: ditto
+	* configure.in: Improved gcc-llvm error message to help people migrate.
+
+Thu Nov 17 20:43:34 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: revert a part of the patch in [ruby-dev:41531].
+	  don't use db.h with other headers.  [ruby-dev:44884].
+
+Thu Nov 17 20:23:03 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* benchmark/bm_io_select[23].rb: use Process::RLIMIT_NOFILE only when
+	  it is defined.  if it is not defined, assume 64 as the max of fds.
+
+Thu Nov 17 10:36:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb (load_file): make sure opened yaml files are
+	  also closed. [ruby-core:41088]
+
+Wed Nov 16 18:13:52 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (LIBRUBY_A): check if generated linked library is
+	  valid for extconf.
+
+Wed Nov 16 13:51:40 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bignum.c (rb_big2ulong): need to calc in unsigned long, because
+	  the range of VALUE is larger than it on LLP64 platform, such as Win64.
+	  this change fixes the failures of test/-ext-/num2int.
+
+Wed Nov 16 12:02:47 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/webrick/test_cgi.rb (TestWEBrickCGI#start_cgi_server): there are
+	  no guarantee of existence of RbConfig::CONFIG['LIBPATHENV'].
+	  it only exists in Unix-like environments.
+
+	* test/webrick/test_filehandler.rb
+	  (WEBrick::TestFileHandler#test_script_disclosure): ditto.
+
+Wed Nov 16 11:34:20 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (argf_next_argv): wrong timing of setting ecflags.
+	  fixed the failure of TestArgf#test_textmode introduced at r33662.
+
+Wed Nov 16 10:45:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/-test-/num2int/num2int.c: remove an unnecessary and wrong decl
+	  of rb_stdout.  it's declared in ruby.h correctly.
+
+Wed Nov 16 10:26:41 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bignum.c (rb_big2ull): add a cast to get rid of a VC++ warning.
+
+Wed Nov 16 09:39:27 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/minitest/unit.rb (assert_raises): experimental fix to run
+	  correctly on chkbuild over 64bit linux. call exception_details only
+	  when the detail is really needed to avoid create needless inspect
+	  under ulimit-ed environment.
+
+Wed Nov 16 06:34:30 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_thread.rb (test_condvar_timed_wait): use
+	  assert_operator.
+
+Tue Nov 15 21:56:25 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_sleep.rb (test_sleep_5sec): 0.1sec tolerance is too
+	  small for busy environment.
+
+Tue Nov 15 20:08:55 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c, thread.c, ext/pty/pty.c, ext/fiddle/closure.c: use
+	  __linux__ macro for consistency.
+
+Tue Nov 15 14:45:15 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/ruby.h(NUM2LONG, NUM2INT, NUM2SHORT, NUM2LL,
+	  INT2NUM, UINT2NUM, LONG2NUM, ULONG2NUM, NUM2CHR): wrap by
+	  macros.
+
+Tue Nov 15 13:38:14 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* include/ruby/defines.h (FLUSH_REGISTER_WINDOWS): move sparc asm code
+	  to a separate file sparc.c for preventing inlining optimization.
+	  Patched by Jurij Smakov. [Bug #5244] [ruby-core:40685]
+	* sparc.c (rb_sparc_flush_register_windows): ditto.
+	* configure.in: ditto.
+
+Tue Nov 15 13:11:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/ruby.h: get rid of gcc specific rb_long2int(),
+	  NUM2LONG(), NUM2INT(), NUM2SHORT(), NUM2LL(), INT2NUM(),
+	  UINT2NUM(), LONG2NUM(), ULONG2NUM() and NUM2CHR()
+	  implementation. Because 1) They don't make any better code
+	  at all. 2) Inline function have a better debugger supoort.
+
+Tue Nov 15 09:58:25 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_io.rb (TestIO#test_fcntl_dupfd): fix OpenBSD test
+	  failure. [ruby-dev:44872]
+
+Tue Nov 15 09:50:21 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (print_indent_tree): fix double printing of ENCLOSE_OPTION
+	  children bug. patched by Suraj Kurapati. [ruby-core:40964]
+
+Tue Nov 15 01:53:48 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/ruby/test_io.rb (test_fcntl_dupfd): fix test error on
+	  SnowLeopard. Pointed out by CHIKANAGA Tomoyuki. [ruby-dev:44866]
+
+Mon Nov 14 22:06:02 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_pkey.c (ossl_pkey_new_from_file): set close-on-exec
+	  flag.
+
+	* ext/openssl/ossl_x509cert.c (rb_fd_fix_cloexec): ditto.
+
+Mon Nov 14 14:54:17 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* bignum.c (rb_big2ull): fix 32bit platform breakage. we must
+	  not assume sizeof(VALUE) == sizeof(LONG_LONG).
+	* test/-ext-/num2int/test_num2int.rb (class TestNum2int):
+	  fix false assumption on 32bit platform.
+
+Mon Nov 14 14:52:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* numeric.c (rb_fix2ushort): fix typo. use num rb_num2ushort()
+	  instead of num2uint().
+
+Sun Nov 13 10:31:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/ruby.h: add #ifdef comment.
+
+Sun Nov 13 10:28:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/ruby.h: add NUM2SHORT(), NUM2USHORT() macros.
+	* numeric.c: ditto.
+
+	* test/-ext-/num2int/test_num2int.rb: add testcases for NUM2SHORT().
+	* ext/-test-/num2int/num2int.c: ditto.
+
+Sun Nov 13 10:23:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* bignum.c (rb_big2ull): fix off-by-twice bug of NUM2ULL.
+	* test/-ext-/num2int/test_num2int.rb (class TestNum2int):
+	  fix a testcase too.
+
+Sun Nov 13 10:22:44 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/-ext-/num2int/test_num2int.rb (class TestNum2int):
+	  add FIXNUM tests.
+
+Sun Nov 13 09:57:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* numeric.c (check_uint): fix off-by-one bug of NUM2UINT.
+	* bignum.c (rb_big2ulong): fix off-by-one bug of NUM2ULONG.
+
+	* test/-ext-/num2int/test_num2int.rb: add a testcase for NUM2INT()
+	  NUM2UINT(), NUM2LONG(), NUM2ULONG(), NUM2LL and NUM2ULL().
+	* ext/-test-/num2int/depend: ditto.
+	* ext/-test-/num2int/extconf.rb: ditto.
+	* ext/-test-/num2int/num2int.c: ditto.
+
+Sun Nov 13 23:47:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dbm/extconf.rb: use convertible_int.
+
+Sun Nov 13 23:45:57 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (checking_for): should not modify the result.
+
+	* lib/mkmf.rb (have_struct_member): accept compiler options.
+
+	* lib/mkmf.rb (convertible_int): add restricted support of struct
+	  member, and TYPEOF_ macro.
+
+Sun Nov 13 23:21:24 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/gdbm/gdbm.c (fgdbm_reorganize): set close-on-exec flag after
+	  gdbm_reorganize().  gdbm_reorganize() opens a new database internally.
+
+Sun Nov 13 19:57:18 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: rollback for each headers for each libraries.
+
+Sun Nov 13 16:24:48 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: treat libc as a choice for a library which
+	  provide ndbm API.
+
+Sun Nov 13 15:40:43 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: duplicate $libs and $defs when save them.
+
+Sun Nov 13 12:43:48 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: rollback $libs and $defs when db detection is
+	  failed.  It fixes -lgdbm -lqdbm when the system has qdbm and gdbm
+	  without gdbm_compat.
+
+Sat Nov 12 21:14:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/webrick/test_cgi.rb (class TestWEBrickCGI): respect
+	  RbConfig::CONFIG["LIBPATHENV"]. [Bug #5135] [ruby-core:38653]
+	* test/webrick/test_filehandler.rb (class WEBrick): ditto.
+
+Sat Nov 12 20:57:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_io.rb (test_fcntl_dupfd): skip if Fcntl::DUPFD
+	  is not defined. Pointed out by CHIKANAGA Tomoyuki. Thanks.
+
+Sat Nov 12 17:26:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (do_ioctl, ioctl_narg_len, setup_narg, rb_ioctl): use
+	  ioctl_req_t.
+
+Sat Nov 12 17:01:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dbm/extconf.rb (headers.db_check): reduce duplicated code.
+
+Sat Nov 12 15:59:42 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: dbm_clearerr should be available in all ndbm
+	  implementation.  If it is not available, it is caused by
+	  header/library mismatch such that Berkeley DB header & gdbm library.
+
+	* ext/dbm/dbm.c (fdbm_store): use dbm_clearerr() unconditionally.
+	  gdbm 1.9 provides it as a real function instead of a empty macro.
+
+Sat Nov 12 13:35:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* bootstraptest/runner.rb: don't suppress SIGINT.
+	  [Feature #5612] [ruby-dev:44856]
+
+Sat Nov 12 11:20:36 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (fcntl_narg_len): introduce narg calculation for fcntl instead
+	  of hard coded 256.
+	* io.c (setup_narg): ditto.
+
+Sat Nov 12 11:19:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_io.rb (test_fcntl_dupfd): add another fcntl test.
+
+Sat Nov 12 11:18:17 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_io.rb (test_fcntl_lock_freebsd): add a testcase
+	  of fcntl lock for freebsd.
+
+Sat Nov 12 11:16:32 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (ioctl_narg_len): Linux doesn't have IOCPARM_LEN macro, but
+	  has _IOC_SIZE. support it.
+
+Sat Nov 12 11:13:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_ioctl): don't expose our sanity check value to ruby script.
+	  It may change string value meaning if the value is string.
+	  (e.g. MacOS X has F_GETPATH ioctl)
+	* io.c (rb_fcntl): ditto.
+
+Sat Nov 12 11:06:02 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (ioctl_req_t): Type of req argument of ioctl() depend on platform.
+	  Moreover almost all linux ioctl can't be represented by 32bit integer
+	  (i.e. MSB is 1). We need wrap ioctl argument type.
+	  [Bug #5429] [ruby-dev:44589]
+	* io.c (struct ioctl_arg): ditto.
+	* io.c (rb_ioctl): ditto.
+	* test/ruby/test_io.rb (test_ioctl_linux): add a testcase for ioctl
+
+Sat Nov 12 11:00:42 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (struct io_cntl_arg): remove io_p member.
+	* io.c (nogvl_fcntl, do_fcntl, rb_fcntl): separated from ioctl functions.
+	* io.c (nogvl_io_cntl): remove fcntl depended logic.
+	* io.c (io_cntl): ditto.
+	* io.c (rb_io_ctl): ditto.
+	* io.c (rb_io_ioctl): ditto.
+
+Sat Nov 12 10:59:49 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (setup_narg): fix off by one bug.
+
+Sat Nov 12 10:56:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (+setup_narg): factor out length calculation logic.
+	* io.c (rb_io_ctl): ditto.
+
+Sat Nov 12 10:52:17 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (+ioctl_narg_len) new helper function.
+	* io.c (rb_io_ctl): don't use ioctl specific length check
+	  if caller is fcntl.
+
+Fri Nov 11 23:00:46 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: db_prefix is not required now.
+
+Fri Nov 11 21:13:30 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/gdbm/gdbm.c (fgdbm_initialize): use GDBM_CLOEXEC if available.
+
+Fri Nov 11 21:00:05 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: fix dbm_pagfno and dbm_dirfno detection with
+	  Berkeley DB.  Macro definitions needs arguments to detect correctly.
+	  SIZEOF_DSIZE needs -DDB_DBM_HSEARCH because db.h defines datum type
+	  only if DB_DBM_HSEARCH is defined.
+
+Fri Nov 11 18:41:57 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_seteuid): separate an internal wrapper function
+	  from the method implementation.
+
+Fri Nov 11 17:21:15 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (have_library, find_library, have_func): allow
+	  arguments of function to be checked.
+
+Fri Nov 11 17:09:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_dump.c (HAVE_BACKTRACE): fallback to 0.
+
+	* vm_dump.c (rb_vm_bugreport): show "Other runtime information"
+	  header only when available.
+
+	* vm_dump.c (rb_vm_bugreport): get rid of modifying the content of
+	  VM directly.
+
+	* vm_dump.c (rb_vm_bugreport): check if vm is non-null.
+	  Pointed out by Ikegami Daisuke <ikegami.da@gmail.com>.
+	  Thank you.
+
+Fri Nov 11 12:36:37 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (pipe_open): Remove fflush(stdin). it's no effect.
+	  Pointed out by Ikegami Daisuke <ikegami.da@gmail.com>.
+	  Thank you.
+
+Fri Nov 11 07:33:30 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb (Net::HTTP::SSL_ATTRIBUTES):  Use symbol keys instead
+	  of string keys to avoid duplicating parameters in
+	  OpenSSL::SSL:SSLContext#set_params.
+
+Thu Nov 10 15:02:37 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (have_library, have_func, have_var, have_header):
+	  add compiler option parameter.
+
+Thu Nov 10 07:45:16 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/lib/openssl/ssl.rb (class OpenSSL::SSL::SSLContext):
+	  Document #set_params.
+
+Wed Nov  9 11:36:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (gvl_yield): don't prevent concurrent sched_yield().
+	  [Bug #5130] [ruby-core:38647]
+
+Wed Nov  9 23:20:22 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_update_max_fd): fstat(2) can fail with other than
+	  EBADF.  [ruby-dev:44837] [Bug #5593].  Cf.
+	  http://pubs.opengroup.org/onlinepubs/9699919799/functions/fstat.html
+
+	* io.c (rb_sysopen): max fd is updated in rb_sysopen_internal()
+	  already.
+
+Wed Nov  9 22:13:38 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_file.rb (TestFile#test_utime_with_minus_time_segv):
+	  fixed previous commit.
+
+Wed Nov  9 19:53:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_file.rb (TestFile#test_utime_with_minus_time_segv):
+	  add test for r33685.
+
+Wed Nov  9 19:00:44 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_fiber.rb: add tests for r33684 (Fiber#resume).
+
+Wed Nov  9 16:40:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (unixtime_to_filetime): should check the return value
+	  of localtime().  reported by snowjail at gmail.com.
+	  [ruby-dev:44838] [Bug #5596]
+
+Thu Nov  9 13:17:25 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (rb_fiber_m_transfer, rb_fiber_resume): prohibit using
+	  "resume" after "transfer" method are used.  You should not mix
+	  "resume" fiber and "transfer" fiber.
+	  [Bug #5526]
+
+	* NEWS: add information about this change.
+
+Wed Nov  9 11:40:37 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/Doxyfile.tmpl (INCLUDE_PATH): add srcdir and include.
+	  [ruby-core:40843] [Bug #5597]
+
+Wed Nov  9 11:02:54 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread.c (do_select): fix cast, tv_sec is time_t.
+
+Wed Nov  9 10:32:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: should not use test -e for portability.
+	  [ruby-core:40841] [Bug #5594]
+
+Wed Nov  9 04:52:16 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/tree_builder.rb: dump complex numbers,
+	  rationals, etc with reference ids.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
+	* ext/psych/lib/psych/visitors/to_ruby.rb: loading complex numbers,
+	  rationals, etc with reference ids.
+	* test/psych/test_object_references.rb: corresponding tests
+
+Tue Nov  8 23:34:37 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dbm/dbm.c (fdbm_fetch, fdbm_key, fdbm_delete, fdbm_store)
+	  (fdbm_has_key, fdbm_has_value): get rid of overflow.
+
+	* ext/gdbm/gdbm.c (rb_gdbm_fetch2, rb_gdbm_nextkey)
+	  (rb_gdbm_delete, fgdbm_store, fgdbm_has_key): ditto.
+
+	* ext/dbm/dbm.c (fdbm_delete_if): hide intermediate objects.
+
+	* ext/gdbm/gdbm.c (fgdbm_delete_if): ditto.
+
+	* ext/dbm/extconf.rb: check size of datum.dsize to get rid of
+	  overflow.
+
+Tue Nov  8 23:30:21 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (PATH_MAX): define if not defined. [ruby-core:40840]
+
+Tue Nov  8 23:26:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/tcltklib.c (rb_thread_critical): fix type.
+
+	* ext/tk/tcltklib.c (eventloop_sleep, lib_eventloop_core): int is
+	  enough for micro seconds.  may need to check overflow in the
+	  setter though.
+
+	* ext/tk/tcltklib.c (RSTRING_LENINT): check overflow if necessary.
+
+	* ext/tk/tcltklib.c (RbTk_ALLOC_N): wrapper for ckalloc() which
+	  takes an int.
+
+	* ext/tk/tcltklib.c (ip_ruby_cmd_receiver_get, tcltklib_compile_info):
+	  get rid overflow.
+
+	* ext/tk/tcltklib.c (tcltklib_compile_info): constified.
+
+Tue Nov  8 20:50:45 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/dbm/test_dbm.rb: split tests for read only database.
+
+	* test/gdbm/test_gdbm.rb: ditto.
+
+Tue Nov  8 18:59:07 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (MasterDevice): define only when used.
+	  (SlaveDevice): ditto.
+	  (deviceNo): ditto.
+
+Tue Nov  8 17:59:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_long2int): define as a macro always, so
+	  that cpp conditionals can tell if it is provided.
+
+Tue Nov  8 17:30:50 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (cpp_command): remove multiple -arch flags since cpp
+	  cannot work.
+
+Tue Nov  8 14:50:55 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (io_fwrite): call rb_w32_write_console() only if FMODE_TTY is
+	  set.  this is the one of the reason of IO writing slowness of Windows
+	  in 1.9.3 or later.
+
+Tue Nov  8 11:01:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/pty/pty.c (get_device_once): FreeBSD 8 supported O_CLOEXEC flag
+	  for posix_openpt, but FreeBSD 9's posix_openpt doesn't support
+	  O_CLOEXEC and fails if specified.
+
+Tue Nov  8 02:36:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_READ_MASK,
+	  ECONV_NEWLINE_DECORATOR_WRITE_MASK): new macro.
+
+	* io.c (rb_io_extract_modeenc, pipe_open, prep_stdio, argf_next_argv):
+	  set TEXTMODE_NEWLINE_DECORATOR_ON_WRITE for textmode on creating IO
+	  if the flag is available.
+
+	* io.c (make_writeconv): drop decorators for reading.
+
+	* io.c (make_readconv): drop decorators for writing.
+
+	* io.c (do_writeconv): existing writeconv is not the condition to raise
+	  ArgumentError.  should check textmode or not.
+
+	* test/ruby/test_io_m17n.rb
+	  (TestIO_M17N#test_{cr,lf,crlf}_decorator_on_stdout): test above
+	  changes.
+
+Mon Nov  7 22:03:47 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/gdbm/gdbm.c (fgdbm_initialize): set close-on-exec flag.
+
+Mon Nov  7 20:31:52 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: make sure strings that look
+	  like base 60 numbers are serialized as quoted strings.
+	* test/psych/test_string.rb: test for change.
+
+Mon Nov  7 20:26:37 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* test/psych/test_yamlstore.rb: make test case inherit from MiniTest,
+	  load psych/helper so that psych is loaded.
+
+Mon Nov  7 20:18:29 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* test/psych/test_yamldbm.rb: Test case should inherit from MiniTest,
+	  load psych/helper so that psych and friends are loaded.
+
+Mon Nov  7 20:15:44 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/extconf.rb: check dbm_pagfno() and dbm_dirfno().
+
+	* ext/dbm/dbm.c: use above to set close-on-exec flag.
+
+Mon Nov  7 20:05:16 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (io_fflush): remove fsync().
+
+	* io.c (rb_io_flush, rb_io_rewind): fsync() here.
+
+	these changes reduces fsync() calls to improve performance.
+	first reported at [ruby-list:48515] by ak7 at mail.goo.ne.jp .
+	[Bug #5585]
+
+Mon Nov  7 19:43:10 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_close_before_exec): use F_MAXFD if available.
+	  F_MAXFD is available on NetBSD since NetBSD 2.0.
+
+Mon Nov  7 19:25:16 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io_m17n.rb
+	  (TestIO_M17N#test_default_stdout_stderr_mode): new test for
+	  r33627-33629.  see [backport #5565]
+
+Mon Nov  7 01:14:22 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/debug.rb: add help for 'pp' and 'r[estart]'. patch
+	  from Sho Hashimoto. [Bug #5093] [ruby-dev:44222]
+
+Sun Nov  6 14:49:58 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h (rsock_recvmsg): declared.
+
+	* ext/socket/ancdata.c (rsock_recvmsg): extracted from
+	  nogvl_recvmsg_func.
+	  (nogvl_recvmsg_func): use rsock_recvmsg.
+
+	* ext/socket/unixsocket.c (recvmsg_blocking): use rsock_recvmsg.
+
+Sun Nov  6 03:22:36 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_engine.rb: add test for engine cipher. RC4 is used
+	  because AES is not supported by the "openssl" engine currently.
+
+Sun Nov  6 00:11:52 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit.rb (Test::Unit::Options#non_options): options[:ruby]
+	  should be an array.  This fixes
+	  "./ruby test/runner.rb test/testunit/test_parallel.rb"
+	  [ruby-dev:44782]
+
+Sat Nov  5 20:30:30 2011  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* insns.def: Some fixes and tweaks to English explanations
+
+Sat Nov  5 19:11:50 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_cloexec_fcntl_dupfd): don't clear try_dupfd_cloexec if
+	  fcntl(F_DUPFD) failed as fcntl(F_DUPFD_CLOEXEC).
+
+Sat Nov  5 18:05:12 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rsock_socketpair0): refactored.
+
+Sat Nov  5 17:55:52 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/init.c (rsock_socket0): don't clear try_sock_cloexec if
+	  SOCK_CLOEXEC is not a reason for EINVAL.
+
+Sat Nov  5 16:27:52 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/pathname/lib/pathname.rb, ext/tk/lib/multi-tk.rb,
+	  ext/tk/sample/demos-en/widget, lib/benchmark.rb, lib/irb/cmd/fork.rb,
+	  lib/mkmf.rb, lib/net/ftp.rb, lib/net/smtp.rb, lib/open3.rb,
+	  lib/pstore.rb, lib/rexml/element.rb, lib/rexml/light/node.rb,
+	  lib/rinda/tuplespace.rb, lib/rss/maker/base.rb,
+	  lib/rss/maker/entry.rb, lib/scanf.rb, lib/set.rb, lib/shell.rb,
+	  lib/shell/command-processor.rb, lib/shell/process-controller.rb,
+	  lib/shell/system-command.rb, lib/uri/common.rb: remove unused block
+	  arguments to avoid creating Proc objects.
+
+Sat Nov  5 15:45:04 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/init.c (rsock_socket0): extract single socket() call with
+	  CLOEXEC handling from rsock_socket.
+
+Sat Nov  5 13:49:40 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/pathname.rb (Pathname#find): return an enumerator if
+	  no block is given.
+
+	* test/pathname/test_pathname.rb: add tests for above.
+
+	[ruby-dev:44797] [Feature #5572]
+
+Sat Nov  5 11:18:12 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rsock_socketpair0): don't clear
+	  try_sock_cloexec if SOCK_CLOEXEC is not a reason for EINVAL.
+
+Fri Nov  4 14:08:19 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_pkey_rsa.c (rsa_generate): [SECURITY] Set RSA
+	  exponent value correctly.  Awful bug.  This bug caused exponent of
+	  generated key to be always '1'.  By default, and regardless of e
+	  given as a parameter.
+
+	  !!! Keys generated by this code (trunk after 2011-09-01) must be
+	  re-generated !!! (ruby_1_9_3 is safe)
+
+	* test/openssl/test_pkey_rsa.rb: Add tests for default exponent and
+	  specifying exponent by a parameter.
+
+Fri Nov  4 01:31:25 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_engine.rb: add first tests for builtin "openssl"
+	  engine.
+
+Fri Nov  4 08:41:26 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/extconf.rb:
+	* ext/openssl/ossl_engine.c: add some missing OpenSSL engines.
+	  Thanks, Yui Naruse, for providing the patch!
+	  [Bug #5548] [ruby-core:40670]
+
+Fri Nov  4 04:54:10 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/configure.bat: disable delayed expansion of enironment variable.
+	  [Bug #5517] [ruby-core:40531]
+
+Fri Nov  4 03:45:22 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (make_writeconv): fixed typo of previous commit.
+
+Fri Nov  4 01:56:30 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (make_writeconv): unversal_newline converter is for reading.
+	  so, if the io is text mode and has ECONV_UNIVERSAL_NEWLINE_DECORATOR
+	  flag, use crlf_newline converter for writing.
+	  this change fixes the problem about the luck of CR up Kernel.p and
+	  Kernel.puts to stdout/stderr on Windows.
+
+Fri Nov  4 01:04:48 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (Init_readline): like r18313, libedit's
+	  replace_history_entry may use offset instead of which.
+	  so introduce history_replace_offset_func and initialize it.
+
+	* ext/readline/readline.c (hist_set): use history_replace_offset_func.
+
+Fri Nov  4 00:53:35 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (Init_readline): fix wrong condition.
+
+Thu Nov  3 23:53:04 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* encoding.c (rb_locale_charmap): ignore calling nl_langinfo_codeset()
+	  on Windows except cygwin. [experimental]
+
+Thu Nov  3 22:45:09 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rsock_socketpair0): extracted from
+	  rsock_socketpair to set close-on-exec flag for each socketpair()
+	  call.
+
+Thu Nov  3 22:12:41 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* ext/socket/init.c (rsock_socket): set close-on-exec flag when
+	  SOCK_CLOEXEC is not available.
+
+Thu Nov  3 08:36:00 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_engine.rb: call Engine::cleanup on exit.
+	  Patch provided by Yui Naruse, thanks!
+	  [Bug #5547] [ruby-core:40669]
+
+Wed Nov  2 21:36:00 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* complex.c (nucomp_rationalize): fix function.  [ruby-core:40667]
+	  [Bug #5546]
+
+Wed Nov  2 08:16:45 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/utils.rb: fix fcntl call.
+
+	* lib/drb/unix.rb: ditto.
+
+Wed Nov  2 00:43:59 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/psych/test_yamldbm.rb: avoid platform dependency.
+	  patch by Naohisa Goto. [ruby-dev:44763] [Bug #5535]
+	* test/syck/test_yamldbm.rb: ditto.
+
+Wed Nov  2 00:14:15 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_marshal.rb: renamed methods duplicated with those
+	  of marshaltestlib.rb.
+
+Tue Nov  1 22:08:27 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: reject llvm-gcc.
+
+Tue Nov  1 21:39:00 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_cloexec_pipe): remove workaround of r33587.
+	  The bug of NetBSD is fixed on Mon Oct 31 21:31:29 UTC 2011.
+	  http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=45545
+
+Tue Nov  1 19:49:08 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_reopen): call rb_fd_fix_cloexec instead of
+	  rb_maygvl_fd_fix_cloexec.
+
+Tue Nov  1 19:00:30 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_reopen): call rb_maygvl_fd_fix_cloexec after freopen().
+
+Tue Nov  1 17:17:26 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (file_expand_path): reset coderange after expanding path.
+
+Tue Nov  1 14:55:29 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (nogvl_io_cntl): rb_cloexec_fcntl_dupfd's 2nd argument is int.
+
+	* process.c (move_fds_to_avoid_crash): ditto.
+
+Tue Nov  1 13:14:33 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): support 'll' prefix.
+
+	* vsnprintf.c (__sfeof): rename to avoid the collision with NetBSD's
+	  one.
+
+	* vsnprintf.c (__sferror): ditto.
+
+	* vsnprintf.c (__sclearerr): ditto.
+
+	* vsnprintf.c (__sfileno): ditto.
+
+Tue Nov  1 12:36:16 2011  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_maygvl_fd_fix_cloexec): change the visibility for
+	  ext/socket.
+
+Tue Nov  1 12:00:53 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_maygvl_fd_fix_cloexec): renamed from fd_set_cloexec.
+
+	* internal.h (rb_maygvl_fd_fix_cloexec): declared.
+
+	* ext/socket/init.c (cloexec_accept): use rb_maygvl_fd_fix_cloexec.
+	  (rsock_s_accept_nonblock): use rb_update_max_fd.
+	  (rsock_s_accept): use rb_update_max_fd.
+
+Tue Nov  1 08:24:40 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/init.c (cloexec_accept): new function to use accept4 if
+	  available.
+	  (rsock_s_accept_nonblock): use cloexec_accept.
+	  (accept_blocking): ditto.
+
+	* ext/socket/extconf.rb: check accept4.
+
+Tue Nov  1 07:31:55 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (nogvl_recvmsg_func): use MSG_CMSG_CLOEXEC if
+	  available.
+
+	* ext/socket/unixsocket.c (recvmsg_blocking): ditto.
+
+Tue Nov  1 05:59:41 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rsock_socketpair): use SOCK_CLOEXEC if
+	  available.
+
+Tue Nov  1 02:56:17 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (load_file_internal): convert the encoding of load path if
+	  needed by platform.  calling open() was replaced by rb_cloexec_open()
+	  at r33549, but the function expected UTF-8 pathname on Windows.
+	  (open() expected "locale" pathname.)
+	  reported by taco via IRC.
+
+	* ruby.c (load_file): change the type of the 2nd parameter to pass its
+	  encoding to load_file_internal().
+
+	* ruby.c (process_options, rb_load_file): follow above change.
+	  NOTE: we should pass encoding information to rb_load_file().
+
+Mon Oct 31 23:49:38 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rsock_socketpair): extracted from
+	  rsock_sock_s_socketpair.
+
+Mon Oct 31 23:31:53 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/init.c (rsock_socket): use SOCK_CLOEXEC if available.
+
+Mon Oct 31 21:47:44 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_cloexec_pipe): NetBSD 6.0 will support pipe2(2),
+	  but its return value is -1 or larger than 0.
+
+Mon Oct 31 22:04:54 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dbm/dbm.c (fdbm_initialize): use O_CLOEXEC if available.
+
+Mon Oct 31 21:47:48 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_fd_fix_cloexec): renamed from
+	  rb_fd_set_cloexec.
+
+	* io.c: follow the above renaming.
+
+	* ext/pty/pty.c: ditto.
+
+	* ext/socket/init.c: ditto.
+
+	* ext/socket/socket.c: ditto.
+
+	* ext/socket/ancdata.c: ditto.
+
+	* ext/socket/unixsocket.c: ditto.
+
+Mon Oct 31 21:02:43 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS): retry IO.select for premature wakeup.
+
+Mon Oct 31 20:14:22 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (fd_set_cloexec): clear CLOEXEC flag for standard file
+	  descriptors.
+	  (rb_cloexec_dup): use rb_cloexec_fcntl_dupfd.
+	  (rb_cloexec_fcntl_dupfd): use F_DUPFD_CLOEXEC if available.
+
+Mon Oct 31 19:14:11 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/resolv/test_dns.rb: don't check maximum slept time.
+	  ruby doesn't guarantee the maximum time because it is not a
+	  realtime application.
+
+Mon Oct 31 13:10:06 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (setfl): extract from fcntl().
+
+	* win32/win32.c (dupfd): new function to support F_DUPFD. based on a
+	  patch written by akr.
+
+	* win32/win32.c (fcntl): use above functions.
+
+	* include/ruby/win32.h (F_DUPFD): define. [experimental]
+
+	* include/ruby/win32.h (F_SETFL): change the value to correspond with
+	  other platforms.
+
+Mon Oct 31 12:37:50 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (get_device_once): use O_CLOEXEC for posix_openpt if
+	  available.
+
+Mon Oct 31 12:05:24 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_cloexec_dup2): check oldfd == newfd at first.
+	  pointed by KOSAKI Motohiro.  [ruby-dev:44713]
+
+Mon Oct 31 10:50:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_cloexec_fcntl_dupfd): this function needs F_DUPFD.
+
+	* io.c (nogvl_io_cntl): use rb_cloexec_fcntl_dupfd() only if the
+	  platform has F_DUPFD.
+
+Mon Oct 31 00:50:00 2011  Luis Lavena  <luislavena@gmail.com>
+
+	* configure.in: check -fno-omit-frame-pointer acceptance and usage
+	  under MinGW. [ruby-core:39957] [Bug #5407]
+
+Mon Oct 31 00:16:11 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_cloexec_fcntl_dupfd): declared.
+
+	* io.c (rb_cloexec_fcntl_dupfd): new function.
+	  (nogvl_io_cntl): use rb_cloexec_fcntl_dupfd.
+
+	* process.c (move_fds_to_avoid_crash): use rb_cloexec_fcntl_dupfd.
+
+Sun Oct 30 22:46:46 2011  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: check pipe2.
+
+	* io.c (rb_cloexec_pipe): use pipe2 if available.
+
+Sun Oct 30 22:32:44 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ruby.c (fill_standard_fds): use fstat() instead of fcntl(F_GETFD)
+	  for MinGW.  reported by Luis Lavena.  [ruby-core:40526] [Bug #5516]
+
+Sun Oct 30 21:12:47 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_cloexec_pipe): declared.
+
+	* io.c (rb_cloexec_pipe): new function.
+	  (rb_pipe): use rb_cloexec_pipe.
+
+	* thread_pthread.c (rb_thread_create_timer_thread): use
+	  rb_cloexec_pipe.
+
+Sun Oct 30 20:06:07 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_cloexec_dup): refine control flow.
+	  (rb_cloexec_dup2): ditto.
+
+Sun Oct 30 18:45:50 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ruby.c (fill_standard_fds): new function to open closed standard
+	  file descriptors.
+	  (ruby_sysinit): call fill_standard_fds.
+
+Sun Oct 30 10:50:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (install_recursive, bin-comm): split mere
+	  string not path name.  [ruby-core:40462] [Bug #5492]
+
+Sun Oct 30 10:47:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_cloexec_dup, rb_cloexec_dup2): CLOEXEC has been set if
+	  dup3 succeeded.
+
+Sun Oct 30 09:58:48 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_cloexec_dup): don't allocate standard file descriptors.
+
+Sun Oct 30 08:29:51 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_cloexec_dup2): don't set CLOEXEC for standard file
+	  descriptors.
+
+Sun Oct 30 07:47:10 2011  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: check dup3.
+
+	* io.c (rb_cloexec_dup2): use dup3 if available.
+
+Sat Oct 29 22:06:37 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_cloexec_dup2): declared.
+
+	* io.c (rb_cloexec_dup2): new function.
+	  (io_reopen): use rb_cloexec_dup2.
+
+Sat Oct 20 21:08:18 2011  Tajima Akio <artonx@yahoo.co.jp>
+
+	* win32/Makefile.sub (CONFIG_H): have stdint.h if VC2010.
+	  [Bug #5243]
+
+Sat Oct 29 20:59:08 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_cloexec_dup): use F_DUPFD_CLOEXEC if available.
+
+Sat Oct 29 20:00:26 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_cloexec_dup): declared.
+
+	* io.c (rb_cloexec_dup): new function.
+	  (ruby_dup): use rb_cloexec_dup.
+
+	* ext/pty/pty.c (pty_getpty): use rb_cloexec_dup.
+
+	* ext/openssl/ossl_bio.c (ossl_obj2bio): ditto.
+
+Sat Oct 29 16:11:34 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/sdbm/_sdbm.c (sdbm_prep): use O_CLOEXEC if available.
+
+Sat Oct 29 14:26:56 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_cloexec_open): use O_CLOEXEC if available.
+
+Sat Oct 29 12:57:15 2011  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (ruby_setsid): use rb_cloexec_open.
+	  (rb_daemon): ditto.
+
+	* ruby.c (load_file_internal): ditto.
+
+	* file.c (rb_file_s_truncate): ditto.
+	  (file_load_ok): ditto.
+
+	* random.c (fill_random_seed): ditto.
+
+	* ext/pty/pty.c (chfunc): ditto.
+	  (get_device_once): ditto.
+
+	* ext/io/console/console.c (console_dev): ditto.
+
+Sat Oct 29 10:40:19 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_cloexec_open): declared.
+
+	* io.c (fd_set_cloexec): extracted from rb_fd_set_cloexec.
+	  (rb_cloexec_open): new function.
+	  (sysopen_func): use rb_cloexec_open.
+	  (rb_sysopen_internal): use rb_update_max_fd instead of
+	  rb_fd_set_cloexec.
+
+Sat Oct 29 09:05:07 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.h: no Structured Exception Handling like macros.
+	  [ruby-core:40432] [Bug #5491]
+
+Fri Oct 28 22:05:34 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/sdbm/_sdbm.c: RCS $Id$ removed.
+
+Thu Oct 27 18:58:00 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (parser_nextc): set encoding for the buffer of ripper.
+
+Fri Oct 28 06:06:08 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/sdbm/_sdbm.c (sdbm_prep): set FD_CLOEXEC flags for file
+	  descriptors.
+	  (fd_set_cloexec): new function.
+
+Fri Oct 28 03:01:27 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* vm_insnhelper.c (vm_call_cfunc): adding back useless hack.  For some
+	  reason, this fixes CFP errors on OS X 10.7.
+
+Fri Oct 28 00:09:31 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/sdbm/_sdbm.c (sdbm_prep): refactored for less nesting.
+
+Thu Oct 27 18:28:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_DEFINE_IF): revert r33534 partially to get
+	  rid of AS_ECHO which is not available in autoconf 2.61.
+	  [ruby-dev:44702]
+
+Thu Oct 27 16:10:46 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_divide): raise ZeroDivisionError if divisor is
+	  zero, as well as Fixnum.  [ruby-core:40429] [Bug #5490]
+
+Thu Oct 27 14:56:22 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_FUNC_ATTRIBUTE): unset temporary variable.
+
+	* configure.in (RUBY_STACK_GROW_DIRECTION): substitute CPU name as
+	  shell variable name.  based on the patch by The Written Word Inc. at
+	  [ruby-core:40421].  [Bug #5488]
+
+Thu Oct 27 09:57:56 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/ruby.h (SIZE_MAX): define SIZE_MAX if not defined.
+	  patched by The Written Word Inc. [ruby-core:40422] [Bug #5489]
+
+Thu Oct 27 08:47:38 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/psych/parser.c: remove unused variable.
+
+Thu Oct 27 08:38:41 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/extconf.rb: add -Wall flag by default when compiler is
+	  GCC.
+
+Wed Oct 26 15:24:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_join): honor input encodings than ASCII-8BIT.
+	  [ruby-core:40338] [Bug #5483]
+
+Tue Oct 25 21:52:31 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/defines.h: use "__sparc" instead of "sparc" and
+	  "__sparc__".
+
+	* dln.c: ditto.
+
+	  [ruby-dev:44694]
+
+Tue Oct 25 06:34:39 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* re.c (match_aref):  Use <code> around indexing examples to prevent
+	  hyperlinks.  [ruby-talk:389396]
+
+Mon Oct 24 23:55:31 2011  Tanaka Akira  <akr@fsij.org>
+
+	* complex.c: use "__sun" instead of "__sun__" to detect SunOS.
+
+	* math.c: ditto.
+
+	* hash.c: ditto.
+
+	* atomic.h: ditto.
+
+	* ext/io/wait/wait.c: ditto.
+
+	[ruby-dev:44693]
+
+Mon Oct 24 22:45:37 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: use "__sun" instead of "sun" to detect SunOS.
+
+	* dln.c: ditto.
+
+	* cont.c: ditto.
+
+	* ext/sdbm/_sdbm.c: ditto.
+
+	[ruby-dev:44693]
+
+Mon Oct 24 22:38:08 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (get_device_once): delay rb_fd_set_cloexec() until
+	  grantpt() on Solaris.  grantpt() doesn't work with CLOEXEC on
+	  Solaris 10.
+	  reported by Naohisa GOTO.  [ruby-dev:44688] [Bug #5475]
+
+Mon Oct 24 08:18:14 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (copy_stream_fallback_body): check nil for EOF of read method.
+	  patch by Eric Wong.  [ruby-core:39134] [Bug #5237]
+
+Sun Oct 23 18:21:23 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/tk/MANUAL_tcltklib.eng: fix typo.
+
+Sun Oct 23 18:03:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (rb_infinity, rb_nan): aggregated member initializers
+	  need braces.
+
+Sun Oct 23 16:43:43 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/io/wait/wait.c: ioctl(2) is declared in unistd.h on Solaris.
+
+Sun Oct 23 16:33:35 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* ext/tk/MANUAL_tcltklib.eng: fix typo. reported by Mimura-san.
+	  [ruby-dev:44683] [Bug #5471]
+
+Sun Oct 23 08:01:29 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_fd_set_cloexec): set close-on-exec flag only if F_GETFD is
+	  defined.  reported by Luis Lavena.  [ruby-core:40281] [Bug #5470]
+
+Sat Oct 22 19:48:50 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl/test_ssl.rb (test_multibyte_read_write): start server
+	  for each length to avoid race condition.
+
+Sat Oct 22 18:49:24 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_fd_set_cloexec): declared.
+
+	* io.c (rb_fd_set_cloexec): new function.
+	  (ruby_dup): call rb_fd_set_cloexec to set close-on-exec flag.
+	  (rb_sysopen_internal): ditto.
+	  (rb_pipe): ditto.
+	  (io_reopen): ditto.
+	  (io_cntl): ditto.
+
+	* process.c (rb_f_exec): change the default :close_others option to
+	  true.
+	  (rb_f_system): ditto.
+	  (move_fds_to_avoid_crash): call rb_fd_set_cloexec to set
+	  close-on-exec flag.
+	  (ruby_setsid): ditto.
+	  (rb_daemon): ditto.
+
+	* thread_pthread.c (rb_thread_create_timer_thread): call
+	  rb_fd_set_cloexec to set close-on-exec flag.
+
+	* ruby.c (load_file_internal): ditto.
+
+	* file.c (rb_file_s_truncate): ditto.
+	  (file_load_ok): ditto.
+
+	* random.c (fill_random_seed): ditto.
+
+	* ext/pty/pty.c (chfunc): ditto.
+	  (get_device_once): ditto.
+
+	* ext/openssl/ossl_bio.c (ossl_obj2bio): ditto.
+
+	* ext/socket/init.c (rsock_socket): ditto.
+	  (rsock_s_accept_nonblock): ditto.
+	  (rsock_s_accept): ditto.
+
+	* ext/socket/socket.c (rsock_sock_s_socketpair): ditto.
+
+	* ext/socket/ancdata.c (discard_cmsg): ditto.
+	  (make_io_for_unix_rights): ditto.
+
+	* ext/socket/unixsocket.c (unix_recv_io): ditto.
+
+	* ext/io/console/console.c (console_dev): ditto.
+
+	[ruby-core:38140] [Feature #5041]
+
+Sat Oct 22 17:46:27 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb: fix a exception name in previous patch.
+
+Sat Oct 22 17:43:33 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb: make timeout configurable for DNS query.
+	  patch by Eric Wong.  [ruby-core:38533] [Feature #5100]
+
+Sat Oct 22 02:07:48 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* numeric.c (rb_infinity, rb_nan): use union to prevent bus error
+	  caused by misalignment.  [Bug #5469] [ruby-dev:44657]
+
+	* include/ruby/missing.h (INFINITY, NAN): ditto
+
+Fri Oct 21 22:02:17 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (initial_params): pack in a struct.
+
+	* gc.c (rb_gc_set_params): set parameters always.
+	  [ruby-dev:44648] [Bug #5467]
+
+Fri Oct 21 12:10:20 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* atomic.h: change Solaris checking macro because atomic_ops can work
+	  not only with Sun Studio but also with Fujitsu C Compiler.
+
+Fri Oct 21 02:11:00 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_ns_spki.c: Complete documentation.
+	* test/openssl/test_ns_spki.rb: Integrate SPKI#to_text.
+
+Thu Oct 20 22:47:28 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (socklist_insert, socklist_lookup, socklist_delete):
+	  new functions to wrap of st_insert(), st_lookup() and st_delete() to
+	  socklist.
+	  allocating socklist is deferred until it is really needed.
+
+	* win32/win32.c (exit_handler): delete socklist only if it is
+	  initialized.
+
+	* win32/win32.c (rb_w32_sysinit, StartSockets): refactoring: move
+	  initialization of select_mutex to StartSockets().
+
+	* win32/win32.c (exit_handler): refactoring: delete select_mutex only
+	  if winsock is used.
+
+Thu Oct 20 22:38:53 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_pkcs5.c: add note on timing attacks and general
+	  documentation.
+
+Thu Oct 20 21:19:15 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* vm_eval.c (check_funcall): set array elements one-by-one to fix
+	  compile error with Fujitsu C Compiler 5.6 on Solaris 10 on Sparc.
+	  [Bug #5464] [ruby-dev:44632]
+
+Thu Oct 20 13:09:35 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/defines.h (flush_register_windows): use software
+	  trap on Debian Sparc 32-bit userspace.  [Bug #5244]
+
+Thu Oct 20 12:28:22 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_pkcs5.rb: add RFC 6070 tests for PBKDF2 with
+	  HMAC-SHA1
+
+Thu Oct 20 11:42:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (mmprepare): fix for fragmental size.
+
+	* util.c (mmswap_, mmrot3_): portability improvement.
+
+Thu Oct 20 05:58:02 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl_ns_spki.c (Init_ossl_ns_spki):  Stub documentation
+	  for Netscape SPKI.
+
+Thu Oct 20 05:13:39 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 2.6.2 (r6712)
+	* test/minitest/*: ditto
+
+Thu Oct 20 06:55:32 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* lib/openssl/buffering.rb: Force multi-byte strings to be treated as
+	  binary data.
+	* test/openssl/test_ssl.rb: Add test for it.
+
+	Thanks to Niklas Baumstark for reporting the issue!
+
+	[Ruby 1.9 - Bug #5233] [ruby-core:39120]
+
+Wed Oct 19 17:06:54 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* version.h (RUBY_VERSION): finally declare start of 2.0 work!
+
+Wed Oct 19 11:48:44 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* error.c (Init_Exception):  Document $! and $@.  Provide
+	  recommendations for creating exceptions for a library.
+
+Wed Oct 19 11:25:46 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* error.c (Init_Exception):  Add hierarchy of Exception subclasses.
+	  Based on patch by Sylvain Daubert.  [Ruby 1.9 - Bug #5438]
+
+Wed Oct 19 11:04:47 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* enum.c: Reformat block args to a single standard, { |args| ... }.
+	  Patch by b t.  [Ruby 1.9 - Bug #5393]
+
+Wed Oct 19 12:11:26 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_ssl.c: Remove set, but unused variables.
+	  ext/openssl/ossl_pkey.c: ditto
+
+	* ext/openssl/ossl_pkey_dh.c: Make functions passed to
+	  rb_thread_blocking_region return VALUE instead of void.
+	  ext/openssl/ossl_pkey_dsa.c: ditto
+	  ext/openssl/ossl_pkey_rsa.c: ditto
+
+Tue Oct 18 23:28:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (identhash): share with type_numhash.
+
+	* st.c (st_hashtype_num): rename from type_numhash.
+
+Tue Oct 18 23:07:30 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (ruby_current_thread): probeprofiler has been removed
+	  long ago.
+
+Tue Oct 18 23:05:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/ripper/eventids2.c (ripper_init_eventids2): separate
+	  initializations of IDs and objects.
+
+	* ext/ripper/tools/generate.rb (generate_eventids1): ditto.
+
+	* parse.y (Init_ripper, InitVM_ripper): fix inversed roles.
+
+Sun Oct 16 19:46:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.gemspec (files): fixed typo, and
+	  removed nonexistent file.
+
+	* ext/bigdecimal/bigdecimal.gemspec (homepage): added.
+
+	* ext/io/console/io-console.gemspec (homepage): ditto.
+
+Fri Oct 14 12:13:57 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/pty/pty.c (pty_check): should return nil until the child
+	  terminates or stops.  [ruby-dev:44600] [Bug #2642]
+
+Fri Oct 14 11:19:37 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_ary_rotate): export.
+
+Fri Oct 14 05:58:05 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* atomic.h (ATOMIC_INC, ATOMIC_DEC): return old values.
+	  [ruby-dev:44596] [Bug #5439]
+
+	* signal.c (ruby_atomic_exchange): no needs to define on the
+	  platforms where atomic.h is available.
+
+Thu Oct 13 19:29:40 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* atomic.h (ATOMIC_*): use atomic_ops(3C) when SunStudio on Solaris.
+	  [ruby-dev:44596] [Bug #5439]
+
+Thu Oct 13 18:13:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* atomic.h(ATOMIC_SET): add cast to void to prevent misuse.
+	  [ruby-dev:44596] [Bug #5439]
+
+Thu Oct 13 18:04:27 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_gc_finalize_deferred, rb_objspace_call_finalizer):
+	  should use ATOMIC_EXCHANGE() to check the previous value.
+	  [ruby-dev:44596] [Bug #5439]
+
+Wed Oct 12 23:39:58 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* test/openssl/test_ssl.rb: Move duplicated tests for SSL::Session to
+	  test_ssl_session.rb
+
+Tue Oct 11 08:49:40 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* array.c (rb_ary_initialize):  Improve explanation of Array.new
+	  parameters.  Patch by Alvaro Pereyra Rabanal.  [Ruby 1.9 - Bug #5425]
+	* array.c (rb_ary_s_try_convert):  Fix typo (try => tries)
+	* array.c (rb_ary_rindex):  Add spacing for block.
+	* array.c (rb_ary_uniq_bang):  Describe block
+	* array.c (rb_ary_uniq):  ditto
+
+Tue Oct 11 07:55:38 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* array.c:  Add a description to Array, minor cleanups.  Patch by
+	  Andrea Singh.  [Ruby 1.9 - Bug #5412]
+
+Tue Oct 11 06:09:52 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/pp.rb:  Move PP documentation to top of class PP.  Patch by
+	  Sylvain Daubert.  [Ruby 1.9 - Bug #5430]
+
+Tue Oct 11 06:06:29 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/coverage/coverage.c (Init_coverage):  Change list format and
+	  describe Coverage.result output.  Patch by Sylvain Daubert.
+	  [Ruby 1.9 - Bug #5428]
+
+Tue Oct 11 05:53:23 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c (Init_Object):  Add reference to BasicObject, brief
+	  explanation of constant lookup.  Based on patch by Alvaro Pereyra
+	  Rabanal.
+	  [Ruby 1.9 - Bug #5426]
+
+Sun Oct  9 11:06:52 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* test/psych/test_yamldbm.rb: don't run test if the system
+	  don't support yaml/dbm.
+
+	* test/syck/test_yamldbm.rb: ditto.
+
+Sat Oct  8 08:54:56 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* enum.c (group_by):  Improve group_by description.  Patch by b t.
+	  [#5411]
+
+Sat Oct  8 03:17:51 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/shell.rb:  Document some methods of Shell.  Patch by Carol
+	  Nichols.  [Ruby 1.9 - Bug #5417]
+
+Fri Oct  7 17:54:28 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (assert_send, assert_not_send):
+	  parenthesize non-empty arguments.
+
+Fri Oct  7 06:35:50 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* array.c:  Use + for arguments described in documentation to allow
+	  rdoc -C2 to work better.  Remove <code> from method references to
+	  allow cross-references in HTML documentation.
+
+Thu Oct  6 18:46:23 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* vm_eval.c (make_no_method_exception): fix typo.
+
+	* vm_insnhelper.c, vm_insnhelper.h: ditto.
+
+Thu Oct  6 16:29:30 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (make_no_method_execption): extract from
+	  raise_method_missing().
+
+	* vm_eval.c (send_internal): remove inadvertent symbol creation
+	  from public_send.  based on a patch by Jeremy Evans <code AT
+	  jeremyevans.net> in [ruby-core:38576]. [Feature #5112]
+
+	* vm_insnhelper.c (vm_call_method): remove inadvertent symbol
+	  creation from send and __send__, too.
+
+Thu Oct  6 14:59:11 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/time.rb:  Clean up Time documentation.  Patch by Jake Goulding.
+	  [Ruby 1.9 - Bug #5416]
+
+Thu Oct  6 10:00:54 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* enum.c (group_by):  Improve documentation based on patch by b t.
+
+Thu Oct  6 09:56:30 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* enum.c:  Clean up wording in Enumerable documentation.  Patch by b t.
+	  [Ruby 1.9 - Bug #5411]
+
+Thu Oct  6 09:17:18 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* time.c (Init_Time):  Remove editorial comments from Time
+	  documentation, fix link.
+
+Thu Oct  6 09:14:20 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* time.c (Init_Time):  Improve Time documentation.  Patch by Shane
+	  Emmons.  [Ruby 1.9 - Bug #5404]
+	* lib/time.rb:  Improve time.rb documentation including Time.strptime.
+	  Patch by Shane Emmons.  [Ruby 1.9 - Bug #5402]
+
+Thu Oct  6 08:54:05 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* random.c:  Improve documentation of Random.  Patch by Gregory
+	  Parkhurst.  [Ruby 1.9 - Bug #5410]
+
+Thu Oct  6 01:44:51 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* cont.c (cont_mark): mark original Thread object from saved_thread.
+	  [ruby-dev:44571] [Bug #5386]
+
+Wed Oct  5 16:33:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_cfunc): remove useless hack.
+
+Wed Oct  5 05:56:39 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* hash.c (Init_Hash):  Improve Hash documentation.  Patch by Alvaro
+	  Pereyra Rabanal.  [Ruby 1.9 - Bug #5405]
+
+Wed Oct  5 05:47:59 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* random.c (Init_Random):  Add a top-level comment for Random.  Patch
+	  by Brett Bim.  [Ruby 1.9 - Bug #5403]
+
+Wed Oct  5 02:50:27 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/syntax_error.rb: Add file, line, offset, and
+	  message attributes during parse failure.
+	* ext/psych/parser.c: Update parser to raise exception with correct
+	  values.
+	* test/psych/test_exception.rb: corresponding tests.
+
+Wed Oct  5 01:52:16 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (parse): Use context_mark for indicating error
+	  line and column.
+
+Wed Oct  5 01:22:08 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: use normal begin / rescue
+	  since postfix rescue cannot receive the exception class. Thanks
+	  nagachika!
+
+Tue Oct  4 21:10:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (class_alloc): allocate extra memory after containing
+	  object setup to get rid of rare-but-potential memory leak.
+
+	* gc.c (gc_mark_children): skip marking extended members if ptr is
+	  NULL.
+
+Tue Oct  4 16:17:50 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/time.rb (Time.strptime): use Time.at if d[:seconds] is set.
+	  Reported by Christopher Eberz. [ruby-core:39903] Bug #5399
+
+Tue Oct  4 11:44:10 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c (rb_gc_set_params): ruby_verbose can be Qnil, so use RTEST.
+
+Tue Oct  4 08:33:41 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/etc/etc.c:  Document Etc, Etc.sysconfdir, Etc.systmpdir.  Patch
+	  by mathew murphy.  [Ruby 1.9 - Bug #5396]
+
+Tue Oct  4 08:21:51 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/shellwords.rb:  Update toplevel comment with an example.  Patch
+	  by Samnang Chhun.  [Ruby 1.9 - Bug #5388]
+
+Tue Oct  4 08:15:50 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* proc.c (proc_call):  Update documentation to match argument handling
+	  of proc/Proc.new/lambda/->()
+
+Tue Oct  4 07:59:16 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* proc.c (proc_call):  Fix documentation of Proc#call vs Proc#===.
+	  [Ruby 1.9 - Bug #5349]
+
+Tue Oct  4 07:43:18 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* array.c (rb_ary_initialize):  Make Array.new description match
+	  call-seq.  Patch by Henry Maddocks.  [Ruby 1.9 - Bug #5344]
+
+Tue Oct  4 07:35:23 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* array.c (rb_ary_initialize):  Add output for examples.  Patch by
+	  Jonathan Mukai.  [Ruby 1.9 - Bug #5216]
+
+Tue Oct  4 07:30:50 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* array.c (rb_ary_s_create):  Add example results for Array::[].  Patch
+	  by Jonathan Mukai.  [Ruby 1.9 - Bug #5215]
+
+Tue Oct  4 07:15:17 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 1.8.11.  Move Deprecate into the
+	  Gem namespace.
+
+Tue Oct  4 06:43:47 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: update psych version.
+	* ext/psych/psych.gemspec: generate new gemspec for new version.
+
+Tue Oct  4 06:29:55 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: calling `yaml` rather than `to_yaml`.
+	* ext/psych/lib/psych/nodes/node.rb: Rename `to_yaml` to just `yaml`
+	  in order to avoid YAML::ENGINE switching from replacing this method.
+	* test/psych/helper.rb: fix tests for method name change.
+	* test/psych/test_document.rb: ditto
+	* test/psych/visitors/test_emitter.rb: ditto
+
+Tue Oct  4 06:20:19 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: Match values against the
+	  floating point spec defined in YAML to avoid erroneous parses.
+	* test/psych/test_numeric.rb: corresponding test.
+
+Tue Oct  4 05:59:24 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: ToRuby visitor can be
+	  constructed with a ScalarScanner.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: ScalarScanner can be
+	  passed to the YAMLTree visitor.
+
+Tue Oct  4 05:47:23 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: Define Regexp::NOENCODING
+	  for 1.9.2 backwards compatibility.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: Fix Date string
+	  generation for 1.9.2 backwards compatibility.
+
+Mon Oct  3 23:56:39 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* gc.c (rb_gc_set_params): output GC parameter change messages only
+	  if -w/-v options are specified. these messages are output to stderr,
+	  not to stdout. [ruby-core:39795] [Bug #5380]
+
+	* test/ruby/test_gc.rb (test_gc_parameter): add test for it.
+
+Sun Oct  2 20:05:32 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c (rb_thread_mark), cont.c (cont_mark): revert r33369 and r33371
+	  that may cause SEGV in certain environments.
+
+Sun Oct  2 12:14:06 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/psych/test_yamldbm.rb: add test case.
+	* test/syck/test_yamldbm.rb: ditto.
+
+Sun Oct  2 11:28:09 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/yaml/store.rb: make initialize method signature match the
+	  superclass signature.
+
+Sun Oct  2 10:44:01 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* io.c: fix documentation of ARGF.lineno=.
+
+Sat Oct  1 20:03:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (have_framework): try as Objective-C.
+	  https://twitter.com/nagachika/status/120294447660539904
+
+Sun Oct  2 08:43:25 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c (rb_thread_mark), cont.c (cont_mark): self pointer should not
+	  be marked by itself. Patch by Koichi Sasada.
+	  [ruby-dev:44567] [Bug #5386]
+
+Sun Oct  2 00:42:14 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c (rb_thread_mark): rb_thread_t needs self to be marked.
+	  [ruby-dev:44566] [Bug #5386]
+
+Sat Oct  1 09:48:53 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* gc.c (add_heap_slots, init_heap): reset heaps_inc zero when
+	  heap slots are expanded by environment variable RUBY_HEAP_MIN_SLOTS.
+	  [ruby-core:39777] [Bug #5380]
+
+	* test/ruby/test_gc.rb (test_gc_parameter): add test for it.
+
+	* test/ruby/envutil.rb (assert_normal_exit): add :child_env option to
+	  enable pass environment variables to child process.
+
+Thu Sep 29 13:17:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_join_1): should not copy the encoding of non-string
+	  element after string element.  [ruby-core:39776] [Bug #5379]
+
+Thu Sep 29 11:53:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (slot_sweep, rb_gc_finalize_deferred)
+	  (rb_objspace_call_finalizer, rb_gc): run finalizers
+	  sequentially.  [ruby-dev:44562]
+
+Thu Sep 29 20:37:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/gdbm/gdbm.c (rb_gdbm_fatal): adjust argument type.
+
+Thu Sep 29 20:10:42 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (is_id_value, is_live_object): extract from id2ref().
+
+	* gc.c (run_finalizer): use object instead of object id.
+
+Thu Sep 29 20:07:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* use RB_TYPE_P which is optimized for constant types, instead of
+	  comparison with TYPE.
+
+Wed Sep 28 09:20:37 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (pthread_np.h): needs pthread.h to be included
+	  previously on OpenBSD.  a patch by George Koehler <xkernigh AT
+	  netscape.net> at [ruby-core:39752].  [Bug #5376]
+
+Wed Sep 28 04:41:35 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/psych/test_yamlstore.rb: use tmpdir for tmpfile.
+	* test/syck/test_yamlstore.rb: ditto.
+
+Wed Sep 28 04:10:46 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* ext/bigdecimal/README: update report to.
+
+Tue Sep 28 04:05:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal_en.html: removed because this file isn't
+	  maintained now.
+
+	* ext/bigdecimal/bigdecimal_ja.html: ditto.
+
+Tue Sep 27 09:55:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c: make native_fd_select().
+	* thread.c (do_select): remove #ifdef _WIN32. Instead, use
+	  native_fd_select() always.
+
+Tue Sep 27 09:44:59 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (do_select): remove cygwin specific hack. It's layer
+	  violation and too large hack.
+	* thread.c (cmp_tv, subtract_tv): removed.
+
+Tue Sep 27 03:50:19 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/rexml/test_sax.rb: add require 'rexml/document'.
+
+Tue Sep 27 03:32:27 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/psych/test_yamldbm.rb: fix #setup and #teardown.
+	  [Bug #5370] [ruby-core:39730]
+	* test/syck/test_yamldbm.rb: ditto.
+
+Mon Sep 26 11:27:38 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/httputils.rb: Add MIME Type definition of .js and .svg.
+	  patched by Hal Brodigan. [ruby-core:39704] [Bug #5365]
+
+Mon Sep 26 09:20:44 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: remove DJGPP support. It's not longer supported
+	  since ruby 1.9.0.
+
+Mon Sep 26 09:07:46 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/defines.h: remove NextStep, OpenStep, Rhapsody
+	  support. Last activity of their OSes are 7 years ago.
+	* configure.in: ditto.
+	* dir.c: ditto.
+	* ext/tk/extconf.rb: ditto.
+
+Mon Sep 26 09:02:49 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: remove a code for human68k. it's no longer
+	  supported since r19677.
+
+Sun Sep 25 23:43:32 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c: fix int_ossl_asn1_decode0_cons when being
+	  fed arbitrary string values.
+	  Clearly distinguish between the cases "universal, infinite and
+	  not a SEQUENCE or SET" and "universal SEQUENCE or SET, possibly
+	  infinite". Raise error for universal tags that are not infinite.
+	* test/openssl/test_asn1.rb: add a test for this.
+
+	  Thanks to Hiroshi Yoshida for reporting this bug.
+	  [Bug #5363] [ruby-dev:44542]
+
+Sun Sep 25 20:57:18 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/syck/test/yamldbm.rb: add test for Syck::DBM.
+	* test/psych/test_yamldbm.rb: add test for Psych::DBM.
+	* test/psych/test_yamlstore.rb: add test for Psych::PStore.
+
+Sun Sep 25 20:54:10 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/yaml/dbm/dbm.rb: fix #update, add #key for using instead #index.
+	  [Bug #5305][ruby-dev:44485]
+
+Sun Sep 25 16:54:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (require_enc): reject only loading from untrusted
+	  load paths.  [ruby-dev:44541] [Bug #5279]
+
+	* transcode.c (load_transcoder_entry): ditto.
+
+Sun Sep 25 16:45:05 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: ignore all warnings from an arbitrary
+	  header in /usr/local/include.
+
+Sun Sep 25 03:43:03 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enum.c (slice_before_i): use rb_attr_get to suppress wrong warning
+	  for internal instance variable slicebefore_initial_state.
+
+Fri Sep 23 14:20:14 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_asn1.c: remove unused variable.
+
+Fri Sep 23 13:46:59 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_ssl_session.rb: execute test_session_exts_read
+	  only for OpenSSL versions >= 0.9.8k. Thanks, Eric Wong, for
+	  reporting this.
+	  [Bug #4961] [ruby-core:37726]
+
+Fri Sep 23 11:59:08 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_ssl_session.rb: ensure server calls callbacks in
+	  test_ctx_server_session_cb. Thanks to Eric Wong for the patch.
+	  [Bug #5336] [ruby-core:39619]
+
+Thu Sep 22 02:53:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_cfunc): suppress a warning.  note that
+	  `volatile type *var' doesn't make var itself volatile.
+
+Thu Sep 22 01:52:48 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* thread_pthread.c (ubf_select): activate timer thread when interrupt
+	  blocking thread.
+	  A patch created by Koichi Sasada. [ruby-core:39634] [Bug #5343]
+	  to cover race condition, timer thread periodically send SIGVTARLM to
+	  threads in signal thread list. so you should activate timer thread
+	  when interrupt a thread.
+
+Wed Sep 21 16:55:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/io/wait/test_io_wait.rb (TestIOWait#setup): of course, the
+	  behavior of mingw is just same with mswin.
+
+Tue Sep 20 18:08:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_get_cvar_base): reduce duplicated checks and
+	  move a warning outside the loop.
+
+Mon Sep 19 18:55:51 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/fileutils.rb (module FileUtils): improve performance of
+	  FileUtils.compare_stream. a patch by Masaki Matsushita.
+	  [Feature #5337] [ruby-core:39622]
+
+Mon Sep 19 18:42:58 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/-ext-/old_thread_select/test_old_thread_select.rb:
+	  select() with timeout may return early in old Linux kernels
+	  with 250 Hz tickrate and no dynticks, so skip everything older
+	  than 2.6.32 (which has long term support).
+	  And, Make the timing assertions consistently use assert_operator with
+	  timing difference in error message
+	  Patch by Eric Wong. [Bug #5335] [ruby-core:39618]
+
+Mon Sep 19 09:28:06 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* test/openssl/test_ssl.rb (class OpenSSL):  Test
+	  OpenSSL::SSL::SSLSocket#session and #session=.
+
+Mon Sep 19 07:54:17 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_obj_clone): singleton class should be attached
+	  singleton object to.  a patch by Satoshi Shiba <shiba AT rvm.jp>
+	  at [ruby-dev:44460].  [Bug #5274]
+
+Sat Sep 17 23:34:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_data_type): inherit the core type in ripper so
+	  that checks in core would work.  [ruby-core:39591] [Bug #5331]
+
+Sat Sep 17 12:44:04 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/find.rb (Find.find): add documentation that Find.find
+	  without block returns an enumerator.
+
+Thu Sep 15 11:39:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (mark_entry, mark_key, mark_keyvalue): adjust callback
+	  argument types.
+
+Thu Sep 15 01:44:10 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* ext/tk/*: Change encoding from EUC-JP to UTF-8
+
+Wed Sep 14 11:43:37 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_fd_rcopy): added an argument guard.
+	  Patch by NAKAMURA Usaku. [Bug #5306] [ruby-core:39435]
+
+Tue Sep 13 20:21:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pstore.rb, test/test_pstore.rb: suppress warnings with -v.
+
+	* lib/pstore.rb (PStore): always open in binary mode even if
+	  default encodings are set.  [Bug #5311] [ruby-core:39503]
+
+Tue Sep 13 05:37:15 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (Init_IO): update BINARY comment.  it should not change the
+	  encoding of the result to ASCII-8BIT.  [ruby-talk:387719]
+
+Mon Sep 12 19:55:00 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_select): fix to ignore an argument
+	  modification of rb_thread_fd_select().
+	  based on a patch by Eric Wong. [Bug #5306] [ruby-core:39435]
+	* thread.c (rb_fd_rcopy): New. for reverse fd copy.
+
+	* test/-ext-/old_thread_select/test_old_thread_select.rb
+	(test_old_select_false_positive): test for bug5306.
+
+	* ext/-test-/old_thread_select/old_thread_select.c (fdset2array):
+	  New. convert fdsets to array.
+	* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
+	  return 'read', 'write', 'except' argument of rb_thread_select()
+	  to ruby script.
+
+Mon Sep 12 13:38:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.EXT, README.EXT.ja (2.2.2), parse.y (rb_check_id): add
+	  documents for rb_check_id().
+
+Mon Sep 12 12:53:39 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rake/file_list.rb (Rake::FileList#egrep): there is no need to
+	  open files in binary mode.
+	  see more details in https://github.com/jimweirich/rake/issues/74
+
+Mon Sep 12 12:42:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_exception.rb (TestException#test_exit_success_p):
+	  assert also the cases when exiting with true and false.
+
+	* lib/test/unit/assertions.rb (assert_send): make arguments in
+	  the default message clearer.
+
+Sun Sep 11 05:23:14 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Deal with subclasses of Matrix [redmine #5307]
+
+Sat Sep 10 13:38:20 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* dir.c (dir_s_aref):
+	* dir.c (dir_entries): Two small documentation fixes.
+	  A patch from Aaron Lerch. [Bug #5302] [ruby-core:39404]
+
+Sat Sep 10 08:30:03 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (GC_PROFILE_MORE_DETAIL, CALC_EXACT_MALLOC_SIZE):
+	  define macros only if they are not defined.
+	  fixes: [Ruby 1.9 - Feature #5291]
+
+Sat Sep 10 08:25:47 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (bv_decls): parse.y relies on $$ = $1 before action
+	  routines.  a patch from Michael Edgar.  [Bug #5303]
+	  [ruby-core:39429]
+
+Sat Sep 10 01:37:55 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* sample/drb/dhasenc.rb: coding cookie of Emacs is coding,
+	  not encoding.
+
+	* sample/mine.rb: ditto.
+
+Fri Sep  9 21:56:40 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_sqrt): Fix comment.
+	  BigDecimal#sqrt requires argument. Reported by Makoto Kishimoto.
+	  Thanks for your contribution. [Bug #5267] [ruby-dev:44452]
+
+Fri Sep  9 11:00:55 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/rubygems/test_gem_commands_help_command.rb: Add one
+	  `require` because if run test-all with test/unit parallel
+	  running, sometimes this test fails by some constants not found.
+	  The error reason is some worker doesn't require the file needed by
+	  this test. This issue is related to [ruby-core:36168].
+
+Fri Sep  9 10:22:03 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_select): fix a typo to initialize efds
+	  properly.  [Bug #5299] [ruby-core:39380]
+
+Fri Sep  9 02:02:09 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* template/yarvarch.ja:
+	  Change encoding from Shift_JIS to UTF-8
+
+Thu Sep  9 01:14:00 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* sample/drb/README.rd.ja:
+	* sample/drb/dhasenc.rb:
+	* sample/mine.rb:
+	  Change encoding from EUC-JP to UTF-8
+
+Thu Sep  8 21:03:22 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: import nkf 2.1.2 (be9c280)
+	  Bump version number/release date only.
+
+Thu Sep  8 12:43:18 2011  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (Init_GC): defined GC::Profiler.raw_data. based on the
+	  patch by Eric Hodel. [ruby-core:37857] [Bug #4991]
+
+Thu Sep  8 09:02:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (id2ref): objects which are unmarked but not in sweep_slots
+	  are not dead.
+
+Thu Sep  8 07:44:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (rb_declare_transcoder, load_transcoder_entry): no
+	  longer need to limit the length of transcoder library name.
+
+Thu Sep  8 07:36:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/syck/lib/syck/types.rb: use toplevel Syck.
+	  for the case someone define Syck::Syck (or YAML::Syck).
+
+Thu Sep  8 07:33:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (id2ref): unmarked object is already dead while lazy
+	  sweeping, and to it cannot come back since other objects
+	  referred from it might have been freed already.
+
+Wed Sep  8 03:48:00 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* ext/readline/README.ja:
+	  Change encoding from EUC-JP to UTF-8
+
+Wed Sep  8 02:59:00 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/rexml/test_encoding.rb:
+	  Add require 'require 'rexml/document'
+
+Wed Sep  8 02:53:00 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* ext/nkf/nkf-utf8/nkf.c:
+	  Change encoding from ISO-2022 to UTF-8
+
+Wed Sep  7 23:41:24 2011  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb, test/rexml/test_comment.rb:
+	  allow a single hyphen in comment. [Bug #5278] [ruby-core:39289]
+	  Reported by Thomas Fritzsche. Thanks!!!
+
+Wed Sep  7 17:27:18 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/yaml.rb: explicitly specify ::Object to avoid the collision with
+	  Syck::Object.
+
+Tue Sep  6 21:06:49 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb (_run_suites): Now reports are written the
+	  following order: Skip, Failure, Error. [Feature #5282]
+
+	* test_sorting.rb: test for above.
+
+	* test4test_sorting.rb: Ditto.
+
+	* lib/test/unit.rb (run): Put RUBY_DESCRIPTION before quitting.
+	  [Feature #5282]
+
+Tue Sep  6 21:13:47 2011  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* win32/Makefile.sub (INSNS): change command line option -Ks to -Ku
+	  for generate *.inc. because insns.def encoding has been changed SJIS
+	  to UTF-8. if $BASERUBY is 1.9, -Ks cause an error. [Feature #5128]
+	  (same as r33194)
+
+Tue Sep  6 15:55:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (load_transcoder_entry): concatenate paths directly.
+
+	* encoding.c (load_encoding): predefined encoding names are safe.
+	  [ruby-dev:44469] [Bug #5279]
+
+	* transcode.c (load_transcoder_entry): ditto.
+
+Tue Sep  6 12:07:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c: enabled econv newline option.
+
+Tue Sep  6 06:44:57 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* numeric.c (dbl2ival): Fix Float#divmod and #round for 32 bit
+	  platform. part 1 of [bug #5276]
+
+Tue Sep  6 06:44:25 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* numeric.c (flo_round): Fix criteria for 32 bits platform
+	  part 2 of [bug #5276]
+
+Tue Sep  6 05:37:11 2011  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_rinda.rb (test_core_03_notify): Fixed test failures
+	  [ruby-dev:44430] [Ruby 1.9 - Bug #372]
+
+Mon Sep  5 20:59:30 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* insns.def: change encoding pragma for emacs (shift_jis to utf-8).
+
+Mon Sep  5 19:32:15 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* Makefile.in (INSNS): change command line option -Ks to -Ku for
+	  generate *.inc. because insns.def encoding has been changed SJIS to
+	  UTF-8. if $BASERUBY is 1.9, -Ks cause an error. [Feature #5128]
+
+Mon Sep  5 18:10:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (rb_econv_binmode): newline decorators are
+	  exclusive.
+
+Mon Sep  5 15:03:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/rubygems/test_gem_security.rb
+	  (test_class_build_self_signed_cert): reset opt[:trust_dir] to apply
+	  temporary Gem.user_home.
+
+Mon Sep  5 10:04:35 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* README.ja, README.EXT.ja: resolve conflicts. [ruby-dev:44459]
+
+Mon Sep  5 05:13:22 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* numeric.c (flo_round): Make Float#round round big values [bug
+	  #5272]
+
+Mon Sep  5 04:28:25 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* numeric.c (int_round): Integer#round always returns an Integer [Bug
+	  #5271]
+
+Sun Sep  4 22:28:50 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (default_port, default_imap_port,
+	  default_tls_port, default_ssl_port, default_imaps_port):
+	  added methods for consistency with Net::POP.
+	  based on the patch by art lussos.  [ruby-core:38997] [Bug #5198]
+
+Sun Sep  4 21:19:19 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* Change encoding from EUC-JP to UTF-8. [Feature #5128]
+
+Sun Sep  4 00:47:39 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* test/ruby/test_fiber.rb (TestFiber#test_no_valid_cfp):
+	  add a test. Unlike TestThread#test_no_valid_cfp,
+	  this test succeeds even if win32ole is required (see r33153).
+
+Sun Sep  4 00:11:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_const_set): show the previous definition
+	  location.  [EXPERIMENTAL]
+
+Sat Sep  3 23:56:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (sizeof_struct_dirent_too_small): check if struct
+	  dirent.d_name is too small.
+
+	* configure.in (RUBY_MINGW32): take tool prefix from CC.
+
+Sat Sep  3 23:52:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_next_argv): open in default text mode.
+	  [ruby-core:39234] [Bug #5268]
+
+Sat Sep  3 18:40:57 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* lib/thread.rb (SizedQueue#max=): raise ArgumentError if max is not
+	  positive number. patch by Masaki Matsushita.
+	  [ruby-dev:44449] [Bug #5259]
+
+	* test/thread/test_queue.rb (test_sized_queue_initialize,
+	  test_sized_queue_assign_max): add tests for it.
+
+Fri Sep  2 21:11:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (validate_enc_binmode, prep_stdio): default to text mode on
+	  dosish platforms.  [ruby-core:38822] [Bug #5164]
+
+	* transcode.c (rb_econv_prepare_options): keep default ecflags
+	  unchanged if no options.
+
+Fri Sep  2 14:36:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_search_const_defined_class): search
+	  ancestors only when global scope.  [ruby-core:39227] [Bug #5264]
+
+Fri Sep  2 09:58:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_tokadd_string, parser_yylex): ignore a backslash
+	  which prefixes an non-ascii character, which has no escape
+	  syntax.  [ruby-core:39222] [Ruby 1.9 - Bug #5262]
+
+Fri Sep  2 04:05:25 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: emit strings tagged as
+	  ascii-8bit as binary in YAML.
+	* test/psych/test_string.rb: corresponding test.
+
+Fri Sep  2 01:07:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_round): substitute machine dependent magic number.
+
+Thu Sep  1 17:31:22 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (defineclass), vm_insnhelper.c (vm_get_cvar_base): see
+	  also inherited constants for classes without superclass and
+	  modules.  [ruby-core:37698] [Bug #3423]
+
+Thu Sep  1 16:18:44 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* Release GVL while OpenSSL's public key generation.
+
+	    t = Thread.new { print "."; sleep 0.1 }
+	    key = OpenSSL::PKey::RSA.new(2048)
+	    #=> Thread t works in parallel with public key generation if
+		OS/machine allows it.
+
+	  This works with OpenSSL >= 0.9.8. From this version, it has new
+	  public key generation function which allows us to interrupt the
+	  execution while pkey generation iterations.
+
+	* ext/openssl/extconf.rb: Check existence of OpenSSL's new public key
+	  generation function. (DH_generate_parameters_ex,
+	  DSA_generate_parameters_ex and RSA_generate_key_ex.
+
+	* ext/openssl/ossl_pkey.{h,c} (ossl_generate_cb_2,
+	  ossl_generate_cb_stop): Added new callback function for OpenSSL pkey
+	  generation which handles Thread interruption by Ruby.
+	  ossl_generate_cb_stop is the unblock function(ubf) for Ruby which
+	  sets a stop flag. New pkey generation callback ossl_generate_cb_2
+	  checks the stop flag at each iterations of OpenSSL and interrupts
+	  pkey generation when the flag is set.
+
+	* ext/openssl/ossl_pkey_dsa.c (dsa_generate): Call
+	  rb_thread_blocking_region with the above unblock function to release
+	  GVL while pkey generation.
+
+	* ext/openssl/ossl_pkey_rsa.c (rsa_generate): ditto.
+
+	* ext/openssl/ossl_pkey_dh.c (dh_generate): ditto.
+
+	* test/openssl/test_pkey_{dh,dsa,rsa}.rb: Test it.
+
+Thu Sep  1 14:06:54 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_thread.rb (TestThread#test_no_valid_cfp): skip when
+	  win32ole is required.  in such case, win32ole redefines
+	  Thread#initialize, and the block argument becomes to be not the top
+	  of the thread, then this testcase always fails.
+
+Thu Sep  1 10:20:50 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io_m17n.rb (TestIO_M17N#test_{default_mode_on_dosish,
+	  default_mode_on_unix,text_mode,binary_mode}): sorry for wrong test
+	  committed in r33144.  I'd misunderstood the spec of ruby's universal
+	  newline.
+
+Thu Sep  1 09:27:57 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* variable.c (rb_autoloading_value): Fix the order of definitions.
+	  It is used by autoload_defined_p.
+
+Wed Aug 31 17:28:23 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* variable.c (rb_autoload): There was a chance to run GC (from
+	  rb_str_new2()) before finishing autoload_data_i construction. It
+	  caused SEGV at rb_gc_mark() at autoload_i_mark.
+
+	* variable.c (rb_autoload_load): Move RB_GC_GUARD() to proper
+	  position based on suggestion by CHIKANAGA Tomoyuki at
+	 http://d.hatena.ne.jp/nagachika/20110826/ruby_trunk_changes_33070_33078
+
+	* variable.c (autoload_defined_p): Fix incompatible autoload behavior
+	  that causes Rails crash. Class definition instruction defined in
+	  'defineclass' in insns.def always invokes rb_autoload_load for a
+	  constant. It's invoked for every class definition regardless of
+	  existence of autoload definition. rb_autoload_load checks if a
+	  constant is defined as autoloaded, but new thread-safe autoload
+	  returned different value if the constant is under autoloading.
+
+Wed Aug 31 17:20:56 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* Re-apply r33078, thread-safe autoload which is reverted at r33093.
+
+Wed Aug 31 16:28:04 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io_m17n.rb (TestIO_M17N#test_{default_mode_on_dosish,
+	  default_mode_on_unix,text_mode,binary_mode}): tests for [Bug #5164].
+
+Wed Aug 31 15:54:11 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).
+
+Wed Aug 31 13:09:41 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* numeric.c (flo_round): Avoid overflow by optimizing for trivial
+	  cases [Bug #5227]
+
+Wed Aug 31 00:50:01 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_select_with_thread): and my typo. we all must
+	  be more careful.
+
+Wed Aug 31 00:48:38 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (rb_thread_select): critical typo in r33117.
+
+Wed Aug 31 00:30:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/-ext-/old_thread_select/test_old_thread_select.rb
+	  (TestOldThreadSelect#test_old_select_read_timeout): if the machine
+	  is fast enough, the time used by code around IO.select may be smaller
+	  than Time implement threshold.
+
+Wed Aug 31 00:04:38 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
+	  typo.
+
+	* test/-ext-/old_thread_select/test_old_thread_select.rb
+	  (TestOldThreadSelect#test_old_select_signal_safe): use SIGINT instead
+	  of SIGUSR1 because the former is general and the latter is platform
+	  dependent.
+
+Tue Aug 30 23:59:36 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/intern.h (rb_w32_fd_copy): implement
+	  for rb_thread_select() in thread.c.  the use of rb_fd_copy() is
+	  introduced in r33117.
+	  [Bug #5251] [ruby-core:39195]
+
+	* thread.c (rb_thread_select): must call rb_fd_init() before using
+	  rb_fdset_t.  see the implementations of rb_fd_init()s if you want to
+	  know the reason.
+
+Tue Aug 30 22:34:45 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/dl/test_callback.rb (test_callback_with_string): prevents
+	  temporary string from GC.
+
+Tue Aug 30 22:25:38 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_cfunc): revert r33112.  RB_GC_GUARD macro
+	  protect a VALUE from GC.  It's not for general anti-optimizing
+	  purpose.
+
+Tue Aug 30 11:06:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1).
+	  [Bug #5173] [ruby-core:38866]
+
+Tue Aug 30 09:57:50 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/thread.rb (Queue#pop): fix a race against Thread.wakeup.
+	  Patch by Masaki Matsushita <glass.saga at gmail dot com>
+	  [Bug #5195] [ruby-dev:44400]
+
+Tue Aug 30 09:48:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* cont.c (fiber_entry): fix stack allocation failure on Debian
+	  GNU/kFreeBSD.
+	  Patch by Lucas Nussbaum <lucas at lucas-nussbaum dot net>.
+	  [Bug #5241] [ruby-core:39147]
+
+Tue Aug 30 09:28:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_select): rewrite by using
+	  rb_thread_fd_select(). old one is EINTR unsafe.
+	  Patch by Eric Wong. [Bug #5229] [ruby-core:39102]
+
+	* test/-ext-/old_thread_select/test_old_thread_select.rb:
+	  a testcase for rb_thread_select().
+	* ext/-test-/old_thread_select/old_thread_select.c: ditto.
+	* ext/-test-/old_thread_select/depend: ditto.
+	* ext/-test-/old_thread_select/extconf.rb: ditto.
+
+Tue Aug 30 09:08:22 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: fix a build failure on GNU Hurd.
+	  Patch by Samuel Thibault <sthibault at debian dot org>. Thank you!
+	  [Bug #5250] [ruby-core:39185]
+
+Sun Aug 29 23:22:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* test/ruby/test_numeric.rb (test_num2long): modify a test against the
+	  change by r33108.
+
+Sun Aug 29 09:58:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* numeric.c (bit_coerce): A Fixnum and a Bignum are only permitted for
+	 bitwise arithmetic with a Fixnum.  #1792
+
+	* test/ruby/test_fixnum.rb: add tests for the above change.
+
+	* bignum.c (bit_coerce): A Fixnum and a Bignum are only permitted for
+	 bitwise arithmetic with a Bignum.  #1792
+
+	* test/ruby/test_bignum.rb: add tests for the above change.
+
+Sun Aug 28 15:38:17 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* ext/date/date_parse.c (date_zone_to_diff): keep a temporary string
+	  stored in variable while the contents buffer is being used.
+
+	* ext/date/date_parse.c (date_zone_to_diff): get rid of out of bounds
+	  memory read. [ruby-dev:44409] [Bug #5213]
+
+Sun Aug 28 05:29:50 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 2.5.1 (r6596)
+	* test/minitest/*: ditto
+
+Sat Aug 27 20:46:05 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c (rb_vm_rewrite_dfp_in_errinfo): change return type
+	  to suppress a warning.
+
+	* vm_core.h: ditto.
+
+Sat Aug 27 19:04:06 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* internal.h (rb_strftime_timespec): moved from time.c and define only
+	  if ruby/encoding.h is included.
+
+	* internal.h (rb_strftime): ditto.
+
+Sat Aug 27 18:53:51 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* proc.c (proc_new): force to rewrite errinfo when calling Proc.new in ensure.
+	  [Bug #5234] [ruby-core:39125]
+	  This code will be removed after changing throw mechanism (see r33064).
+
+	* vm.c (rb_vm_rewrite_dfp_in_errinfo): new function.
+
+	* vm.c (vm_make_env_each): changed accordingly.
+
+	* vm_core.h: ditto.
+
+	* bootstraptest/test_flow.rb: add tests for above.
+
+Sat Aug 27 18:44:06 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* internal.h (rb_strftime_timespec): move to time.c because it depends
+	  encoding.h.
+
+Sat Aug 27 18:17:58 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* strftime.c (rb_strftime_with_timespec): get enc argument to specify
+	  the encoding of the format. On Windows (at least Japanese Windows),
+	  Time#strftime("%Z") includes non ASCII in locale encoding (CP932).
+	  So convert locale to default internal. [ruby-core:39092] [Bug #5226]
+
+	* strftime.c (rb_strftime): ditto.
+
+	* strftime.c (rb_strftime_timespec): ditto.
+
+	* internal.h (rb_strftime_timespec): follow above.
+
+	* time.c (rb_strftime_alloc): ditto.
+
+	* time.c (strftimev): ditto.
+
+	* time.c (time_strftime): ditto.
+
+	* time.c (time_to_s): the resulted string of Time#to_s is always
+	  ascii only, so this should be US-ASCII.
+
+	* time.c (time_asctime): ditto.
+
+Sat Aug 27 11:18:12 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* Revert r33078. It caused a Rails application NoMethodError.
+
+	 /home/nahi/git/emptyApp/ruby/1.9.1/gems/rack-mount-0.6.14/lib/rack/mount/utils.rb:157: warning: toplevel constant ScanError referenced by Regin::Parser::ScanError
+	 /home/nahi/git/emptyApp/ruby/1.9.1/gems/rack-mount-0.6.14/lib/rack/mount/vendor/regin/regin/parser.rb:17:in `parse_regexp': undefined method `scan_str' for #<Regin::Parser:0x00000002344548> (NoMethodError)
+
+Sat Aug 27 08:44:58 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Import RDoc 3.9.4.  Typo and grammar fixes by Luke Gruber.
+	  [Ruby 1.9 - Bug #5203]
+
+Sat Aug 27 07:53:34 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/open-uri.rb:  Fix indentation of OpenURI::OpenRead#open.  Use ++
+	  instead of `' for method arguments in open-uri.rb
+
+Sat Aug 27 07:22:07 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/pathname/lib/pathname.rb:  Fix typos and grammar mistakes.  Patch
+	  by Luke Gruber.  [#5203]
+	* ext/pty/lib/expect.rb:  ditto
+	* lib/mathn.rb:  ditto
+	* lib/net/http.rb:  ditto
+	* lib/open-uri.rb:  ditto
+	* lib/ostruct.rb:  ditto
+	* lib/tempfile.rb:  ditto
+	* lib/thread.rb:  ditto
+	* lib/weakref.rb:  ditto
+	* sample/webrick/httpproxy.rb:  ditto
+
+Sat Aug 27 04:03:18 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (iseq_data_to_ary): fix type of variable
+	  (long -> unsigned long) to suppress a warning.
+
+Sat Aug 27 04:02:11 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: add a decl. of rb_autoloading_value().
+
+Fri Aug 26 19:12:08 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* variable.c: Make autoload thread-safe. See #921.
+
+	  What's the problem?
+	    autoload is thread unsafe. When we define a constant to be
+	    autoloaded, we expect the constant construction is invariant. But
+	    current autoload implementation allows other threads to access the
+	    constant while the first thread is loading a file.
+
+	  What's happening inside?
+	    The current implementation uses Qundef as a marker of autoload in
+	    Constant table. Once the first thread find Qundef as a value at
+	    constant lookup, it starts loading a defined feature. Generally a
+	    loaded file overrides the Qundef in Constant table by module/class
+	    declaration at very beginning lines of the file, so other threads
+	    can see the new Module/Class object before feature loading is
+	    finished. It breaks invariant construction.
+
+	  How to solve?
+	    To ensure invariant constant construction, we need to override
+	    Qundef with defined Object after the feature loading. For keeping
+	    Qundef in Constant table, I expanded autoload_data struct in
+	    Module to have a slot for keeping the defined object while feature
+	    loading. And changed Module's constant lookup/update logic a
+	    little so that the slot is only visible from the thread which
+	    invokes feature loading. (== the first thread which accessed the
+	    autoload constant)
+
+	  Evaluation?
+	    All test passes (bootstrap test, test-all and RubySpec) and added
+	    8 tests for threading behavior. Extra logics are executed only
+	    when Qundef is found, so no perf drop should happen except
+	    autoloading.
+
+	* variable.c (rb_autoload): Prepare new autoload_data struct.
+
+	* variable.c (rb_autoload_load): Load feature and update Constant
+	  table after feature loading is finished.
+
+	* variable.c (rb_const_get_0): When the fetched constant is under
+	  autoloading, it returns the object only for the thread which starts
+	  autoloading.
+
+	* variable.c (rb_const_defined_0): Ditto.
+
+	* variable.c (rb_const_set): When the specified constant is under
+	  autoloading, it sets the object only for the thread which starts
+	  autoloading. Otherwise, simply overrides Qundef with constant
+	  override warning.
+
+	* vm_insnhelper.c (vm_get_ev_const): Apply same change as
+	  rb_const_get_0 in variable.c.
+
+	* test/ruby/test_autoload.rb: Added tests for threading behavior.
+
+Fri Aug 26 10:10:37 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 1.8.10.  Fixes security issue in
+	  creating ruby-format gemspecs.  Fixes Gem.dir not being at the front
+	  of Gem.path to fix uninstall and cleanup commands.  Fixes gem
+	  uninstall stopping on the first missing gem.
+
+Fri Aug 26 08:21:10 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* time.c (strftimev): Make Time#to_s default to US-ASCII encoding but
+	  respect Encoding.default_internal. [ruby-core:39092]
+	* test/ruby/test_time.rb (class TestTime): Corresponding test.
+
+Thu Aug 25 09:43:16 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/lib/openssl/bn.rb:  Hide copyright info from RDoc.
+	* ext/openssl/lib/openssl/digest.rb:  ditto
+	* ext/openssl/lib/openssl/x509.rb:  ditto
+	* ext/openssl/lib/openssl/cipher.rb:  ditto
+
+Thu Aug 25 09:25:48 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl_digest.c:  Document OpenSSL::Digest::digest and add
+	  an example to OpenSSL::Digest.  Patch by Sylvain Daubert.
+	  [Ruby 1.9 - Bug #5166]
+	* ext/openssl/lib/openssl/digest.rb (module OpenSSL):  ditto
+
+Thu Aug 25 08:19:43 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (vm_make_env_each): work around to solve Bug #2729.
+	  fixes: Bug #2729
+	  a patch from Kazuki Tsujimoto <kazuki@callcc.net>
+	  This problem is caused by changing dfp (dynamic env pointer)
+	  from saved dfp.  Saved dfp is pointed env in VM stack.  However,
+	  the dfp can be moved because VM copies env from VM stack to
+	  the heap.  At this copying, dfp was also changed.  To solve this
+	  problem, I'll try to change throw mechanism (not save target dfp,
+	  but save target cfp).
+
+	* bootstraptest/test_flow.rb: add a test for above.
+
+Thu Aug 25 07:57:33 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* numeric.c (int_round): Fix Integer#round [ruby-core:39096]
+
+Thu Aug 25 07:00:00 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.h, vm_insnhelper.c, vm.c, vm_method.c, insns.def:
+	  Manage a redefinition of special methods for each classes.
+	  A patch from Joel Gouly <joel.gouly@gmail.com>.  Thanks!
+
+Thu Aug 25 06:51:08 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: Fixing psych version number.
+	* ext/psych/psych.gemspec: updating the gemspec.
+
+Thu Aug 25 06:11:35 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/nodes/node.rb: default `to_yaml` encoding to be
+	  UTF-8.
+	* test/psych/test_encoding.rb: test yaml dump encoding.
+
+Thu Aug 25 01:24:33 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* test/fileutils/test_fileutils.rb (test_chmod_symbol_mode): Solaris
+	  seems to behave the same as FreeBSD.
+
+Thu Aug 25 01:11:36 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* test/ruby/test_rubyoptions.rb (test_script_from_stdin): slave pty
+	  should be manipulated because master pty may not be a tty on some
+	  environment (e.g. Solaris). [Bug:#5222] [ruby-dev:44420]
+
+Wed Aug 24 15:13:56 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.h, iseq.c, compile.c: Change the line number data structure
+	  to solve an issue reported at [ruby-dev:44413] [Ruby 1.9 - Bug #5217].
+	  Before this fix, each instruction has an information including
+	  line number (iseq::iseq_insn_info_table).  Instead of this data
+	  structure, recording only line number changing places
+	  (iseq::iseq_line_info_table).
+	  The order of entries in iseq_line_info_table is ascending order of
+	  iseq_line_info_table_entry::position.  You can get a line number
+	  by an iseq and a program counter with this data structure.
+	  This fix reduces memory consumption of iseq (bytecode).
+	  On my measurement, a rails application consumes 21.8MB for
+	  iseq with this fix on the 32bit CPU.  Without this fix, it
+	  consumes 24.7MB for iseq [ruby-dev:44415].
+
+	* proc.c: ditto.
+
+	* vm_insnhelper.c: ditto.
+
+	* vm_method.c: ditto.
+
+	* vm.c (rb_vm_get_sourceline): change to use rb_iseq_line_no().
+
+Wed Aug 24 09:49:10 2011  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (defined): fix to checking class variable.
+	  A patch by Magnus Holm <judofyr@gmail.com>.  Thanks!
+
+	* test/ruby/test_variable.rb: add a test for above.
+
+Wed Aug 24 08:53:06 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc 3.9.3.  Fixes RDoc with `ruby -Ku`.  Allows
+	  HTTPS image paths to be turned into <img> tags.  Prevents special
+	  markup inside <tt> from being processed.
+
+Wed Aug 24 07:57:43 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 1.8.9.  Fixes uninstalling multiple
+	  gems and gem cleanup.
+
+Wed Aug 24 06:45:20 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 2.5.0 (r6557)
+	* test/minitest/*: ditto
+
+Wed Aug 24 00:38:22 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (update_coverage): skip coverage count up if the current
+	  line is out of the way.  rb_sourceline() is unreliable when source
+	  code is big.  [ruby-dev:44413]
+
+	* test/coverage/test_coverage.rb: add a test for above.
+
+Tue Aug 23 15:23:56 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* load.c (rb_f_require):  Improve documentation of Kernel#require.
+	  [Ruby 1.9 - Bug #5210]
+
+Tue Aug 23 11:27:26 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzfile_read_header): Ensure that each section of
+	  gzip header is readable to avoid SEGV.
+
+	* test/zlib/test_zlib.rb (test_corrupted_header): Test it.
+
+Mon Aug 22 23:43:33 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* sprintf.c (rb_str_format): add RB_GC_GUARD to prevent temporary
+	  strings from GC.
+
+Sun Aug 21 17:49:53 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* iseq.c (iseq_s_disasm): remove variable which is no longer used
+	  since r33013.
+
+Sun Aug 21 14:20:58 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* configure.in: use LD_LIBRARY_PATH_64 on 64-bit Solaris.
+
+Sat Aug 20 13:19:52 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* iseq.c (iseq_s_disasm): fix a bug that may cause SEGV.
+
+	* test/ruby/test_method.rb (test_body): add a test for the above change.
+
+Sat Aug 20 10:43:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_read): return new string if nil
+	  is explicitly given as a buffer ([Bug #5207]), otherwise set the
+	  encoding.  also removed dead code.
+
+Fri Aug 19 14:25:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_spawn_v, proc_spawn): should not wait the
+	  spawned process.
+
+	* process.c (proc_spawn_v): fix missing argument, and try with
+	  /bin/sh only if failed with ENOEXEC.
+
+Fri Aug 19 14:12:57 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (idle): raises a Net::IMAP::Error when the
+	  connection is closed.  based on the patch by Hugo Barauna.
+	  [Bug #5190] [ruby-core:38930]
+
+Fri Aug 19 13:18:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* configure.in: defines _DARWIN_UNLIMITED_SELECT if the target_os
+	  is darwin.
+
+Fri Aug 19 13:14:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* thread.c: add a description for the behavior of select(2) on
+	  Mac OS X 10.7 (Lion).
+
+Fri Aug 19 11:28:58 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (msg_att): accepts extra space before ')'.
+	  based on the patch by art lussos.  [Bug #5163] [ruby-core:38820]
+
+Wed Aug 17 23:01:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (cannot_be_coerced_into_BigDecimal):
+	  remove duplication.
+
+Wed Aug 17 15:27:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (cannot_be_coerced_into_BigDecimal):
+	  add a new function for raising error when an object cannot coerce
+	  into BigDecimal.  [Bug #5172]
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimalValueWithPrec): use
+	  cannot_be_coerced_into_BigDecimal function.
+
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_log): ditto.
+
+	* test/bigdecimal/test_bigdecimal.rb: test for the above changes.
+
+	* test/bigdecimal/testbase.rb (under_gc_stress): add a new utility
+	  method to run tests under the condition of GC.stress = true.
+
+Wed Aug 17 10:16:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* rational.c (nurat_coerce): Rational#coerce should converts itself
+	  into Complex if the argument is a Complex with non-zero imaginary
+	  part.  [Bug #5020] [ruby-dev:44088]
+
+	* test/ruby/test_rational.rb (test_coerce): test for the above change.
+
+Wed Aug 17 06:33:19 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_x509cert.c: Add class documentation for
+	  OpenSSL::X509::Certificate.
+
+Wed Aug 17 04:54:25 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_pkey.c: corrected docs, OpenSSL::PKey::DH does
+	  *not* support #sign/verify.
+
+Tue Aug 16 18:56:54 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (ruby_threadptr_data_type): rename to hide.
+	  [ruby-core:38972]
+
+Tue Aug 16 18:52:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/mkexports.rb (Exports::Mswin#each_export): exclude Init_
+	  and _threadptr_ functions, as well as mingw.
+
+Tue Aug 16 09:31:44 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/dl:  Add documentation.  Patch by Vincent Batts.
+	  [Ruby 1.9 - Bug #5192]
+
+Tue Aug 16 08:48:26 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/.document (fiddle):  Remove duplicate entry
+	* ext/fiddle:  Complete documentation of Fiddle.  Patch by Vincent
+	  Batts.  [#5192]
+
+Tue Aug 16 08:00:15 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/socket:  Make Socket documentation appear.  Add documentation for
+	  Socket, TCPServer, SOCKSSocket.  Patch by Sylvain Daubert.
+	  [Ruby 1.9 - Feature #5182]
+
+Mon Aug 15 09:58:55 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_ssl.c: Support disabling OpenSSL compression.
+
+	* test/openssl/test_ssl.rb: Add a test for it.
+	  Thanks to Eric Wong for the patch.
+	  [Ruby 1.9 - Feature #5183] [ruby-core:38911]
+
+Sun Aug 14 05:57:01 2011  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_socket.rb (test_connect_timeout): added a test
+	  based on a patch by Eric Wong.  [ruby-core:38910]
+
+Sat Aug 13 22:17:27 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkconfig.rb: do not make the entries related to sitedir and
+	  verdordir if disabled by --without options.  [ruby-core:38922]
+	  [Bug #5187]
+
+Sat Aug 13 17:03:22 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: [ruby-core:38861]
+
+Sat Aug 13 09:39:07 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* test/date/test_*.rb: added tests.
+
+Sat Aug 13 09:36:19 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* ext/date/date_parse.c (parse_ddd_cb): fix r32896. RB_GC_GUARD
+	  insertion position was mistaken. [ruby-dev:44337] [Bug #5152]
+
+Sat Aug 13 09:26:24 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/core_ext.rb: Make Kernel#y private.
+	  [ruby-core:38913]
+
+	* test/psych/test_yaml.rb: corresponding test.
+
+Sat Aug 13 09:05:16 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (date_strftime_alloc): followed the change
+	  of r32885.
+
+	* doc/NEWS-1.9.3: followed the above change.
+
+Sat Aug 13 08:55:38 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: Only consider strings
+	  with fewer than 2 dots to be numbers. [ruby-core:38915]
+
+Sat Aug 13 08:47:20 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: [ruby-core:38855].
+
+Sat Aug 13 03:41:37 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/uri/common.rb:  Fix documentation of URI::Parser.new.  Patch by
+	  Steve Klabnik.  [Ruby 1.9 - Bug #5177]
+
+Sat Aug 13 02:19:57 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/digest/digest.c:  Add documentation for the Digest module.  Patch
+	  by Sylvain Daubert.  [Ruby 1.9 - Bug #5167]
+
+Sat Aug 13 01:56:11 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rake:  Update to Rake 0.9.2.2.  Prevent pollution of toplevel
+	  namespace by Commands.  Remove unused variable and debugging
+	  statement in tests.
+
+Fri Aug 12 11:39:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: Describe "no" configure option for site_ruby
+	  and vendor_ruby. Patch by Vit Ondruch. [Bug #5187][ruby-core:38921]
+
+Fri Aug 12 09:00:24 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Import RubyGems 1.8.8.  Fixes encoding of YAML gemspec
+	  from gems.  Github Issue #149
+
+Fri Aug 12 08:17:46 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ipsocket.c (init_inetsock_internal): use SOMAXCONN for
+	  listen backlog.
+
+	* ext/socket/unixsocket.c (rsock_init_unixsock): ditto.
+
+	* ext/socket/lib/socket.rb (Addrinfo#listen): ditto.
+	  (Socket.tcp_server_sockets_port0): ditto.
+
+	* ext/socket/mkconstants.rb: define SOMAXCONN as 5 if not available.
+
+	[ruby-core:38493]
+
+Fri Aug 12 03:24:35 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Import RDoc 3.9.2.  Fixes TIDYLINK for HTML output.
+
+Thu Aug 11 15:37:42 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* variable.c (autoload_delete): An autoload entry is still in a
+	  RCLASS_IV_TBL, not in a RCLASS_CONST_TBL, so take back the table
+	  changed in r29600. And an autoload entry keeps not a
+	  rb_const_entry_t but a NODE so remove rb_const_entry_t thing added
+	  in r29602.
+
+Thu Aug 11 15:07:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (link_command): use LIBRUBYARG in rbconfig for
+	  unbundled extensions.  [ruby-core:38802] [Bug #5147]
+
+	* lib/mkmf.rb (init_mkmf): revert r32902.  [ruby-core:38903]
+
+Wed Aug 10 23:03:55 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb: fix argument check in the previous commit.
+
+Wed Aug 10 22:12:28 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Socket.tcp): add :connect_timeout option.
+	  (Addrinfo#connect_from): add :timeout option.
+	  (Addrinfo#connect): ditto.
+	  (Addrinfo#connect_to): ditto.
+	  [ruby-core:38538]
+
+Wed Aug 10 21:27:19 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/net/pop.rb: fix typo in document.
+
+	* lib/net/http.rb: ditto.
+
+	* lib/net/imap.rb: ditto.
+
+Wed Aug 10 19:30:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* complex.c (nucomp_rationalize): calls rationalize of real part if
+	  imaginary part is exactly zero.  The patch is made by Marc-Andre
+	  Lafortune.  fixes [Bug #5178] [ruby-core:38885]
+
+	* test/ruby/test_complex.rb (test_rationalize): add a test for the
+	  above change.
+
+	* complex.c (nucomp_to_r): fix RDoc comment.  The patch is made by
+	  Marc-Andre Lafortune.
+
+Wed Aug 10 14:11:07 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (init_mkmf): set $LIBRUBYARG regardless of shared
+	  option.  [ruby-core:38802] [Bug #5147]
+
+Wed Aug 10 02:53:27 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb: come back autoload. OpenSSL constant is used
+	  some places, so it leads mistakes like HTTP.start.
+
+Tue Aug  9 22:57:45 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* ext/date/date_parse.c (date_zone_to_diff): add RB_GC_GUARD.
+	  [ruby-dev:44337] [Bug #5152]
+
+	* ext/date/data_parse.c (parse_ddd_cb): ditto.
+
+Tue Aug  9 14:25:47 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/fiddle/conversions.c (generic_to_value): ffi_arg and ffi_sarg
+	  should be used to handle shorter return value. fix [Bug #3861]
+	  [ruby-core:32504]
+
+	* ext/fiddle/closure.c (callback): ditto
+
+	* ext/fiddle/conversions.h (fiddle_generic): ditto
+
+	* ext/fiddle/conversions.c (value_to_generic): char, short and int
+	  are strictly distinguished on big-endian CPU, e.g. sparc64.
+
+Tue Aug  9 11:21:08 2011  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (gc_lazy_sweep): if sweep target slots are not found, we
+	  try heap_increment() because it might be able to expand the
+	  heap. [Bug #5127] [ruby-dev:44285]
+
+	* gc.c (gc_clear_mark_on_sweep_slots): if a sweeping was
+	  interrupted, we expand the heap if at all possible.
+
+Tue Aug  9 12:20:33 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* test/fiddle/helper.rb (libc_so, libm_so): Solaris support added.
+	  [ruby-core:38853] [Bug #5168]
+
+	* test/dl/test_base.rb (libc_so, libm_so): on Solaris, remove libc
+	  and libm version numbers for detecting default libc and libm.
+
+Tue Aug  9 09:18:04 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c (gzfile_wrap):  Document encoding options.
+
+	* ext/zlib/zlib.c (rb_gzwriter_s_open): ditto
+
+	* ext/zlib/zlib.c (rb_gzreader_s_open): ditto
+
+Sun Aug  7 23:31:32 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* time.c (rb_strftime_alloc): raise ERANGE if width is too large.
+	  Patch by Nobuyoshi Nakada. [Bug #4457] [ruby-dev:43285]
+
+	* test/ruby/test_time.rb (class TestTime): add a test for the
+	  above change.
+
+Sun Aug  7 22:51:45 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/openssl/ossl_asn1.c (decode_eoc): remove unused variables.
+	  Patch by Eric Wong. [Feature #5157] [ruby-core:38798]
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.
+
+	* ext/openssl/ossl_pkey.c (ossl_pkey_new_from_data): ditto.
+
+Sun Aug  7 22:37:08 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: add -Wunused-variable to default CFLAGS.
+	  Patch by Eric Wong. [Feature #5157] [ruby-core:38798]
+
+Sun Aug  7 15:37:35 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/digest/sha2/sha2ossl.c: use original SHA384_Final on DragonFly.
+
+Sun Aug  7 14:08:16 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/objspace/objspace.c: fix typos in a document.
+
+Sun Aug  7 07:14:57 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* cont.c (HAVE_GETCONTEXT): see getcontext(3) because DragonFly BSD
+	  x64 port doesn't have it.
+
+Sun Aug  7 00:42:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/tk/lib/tk/wm.rb (Tk::Wm.command): Add the missing receiver
+	  before calling epath. patched by flori
+	 https://github.com/flori/ruby/commit/aa9474d32e5f2c57f8b0e2e0c528a03f06a4d433
+
+Sat Aug  6 07:06:34 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* marshal.c (w_object):  Fix exception message when _dump_data is not
+	  defined on a T_DATA object.
+
+Fri Aug  5 22:16:20 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* numeric.c (rb_infinity, rb_nan): use WORDS_BIGENDIAN to get endian.
+	  fix [Bug #5160] [ruby-dev:44356]
+
+Fri Aug  5 17:14:11 2011  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/test_syslog.rb (TestSyslog#test_log): Do not be too
+	  specific about the log line format.  Fixes #5081.
+
+Fri Aug  5 15:57:10 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* complex.c (f_signbit): fix compile error in gcc4 on Solaris with
+	  CFLAGS="-std=gnu99".  [ruby-dev:44355] fix [Bug #5159]
+
+	* math.c: ditto.
+
+Fri Aug  5 15:55:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_object.rb: tests that respond_to? returns false.
+
+Fri Aug  5 13:32:43 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/xmlrpc/client.rb, lib/xmlrpc/server.rb: should use
+	  String#bytesize instead of String#size.
+
+Fri Aug  5 12:18:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (check_funcall): try respond_to? first if redefined.
+	  [Bug #5158]
+
+Fri Aug  5 09:48:22 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Import RubyGems 1.8.7:
+	  Added missing require for `gem uninstall --format-executable`.
+
+	  The correct name of the executable being uninstalled is now displayed
+	  with --format-executable.
+
+	  Fixed `gem unpack uninstalled_gem` default version picker.
+
+	  RubyGems no longer claims a nonexistent gem can be uninstalled.
+
+	  `gem which` no longer claims directories are requirable files.
+
+	  `gem cleanup` continues cleaning up gems if one can't be uninstalled
+	  due to permissions.  Issue #82.
+
+	  Gem repository directories are no longer created world-writable.
+	  Patch by Sakuro OZAWA.  [Ruby 1.9 - Bug #4930]
+
+Fri Aug  5 07:00:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/io/console/test_io_console.rb (test_noctty): daemon() on
+	  Fedora Rawhide seems not to detach the controlling terminal,
+	  when the argument noclose is non-zero.  ref: [Bug #5135]
+
+Thu Aug  4 23:48:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* thread_pthread.c (native_cond_signal): retry to call pthread_cond_signal
+	  and pthread_cond_broadcast if they return EAGAIN in
+	  native_cond_signal and native_cond_broadcast, respectively.
+	  It is for the pthread implementation of Mac OS X 10.7 (Lion).
+	  fixes #5155.  [ruby-dev:44342].
+
+	* thread_pthread.c (native_cond_broadcast): ditto.
+
+	* thread_pthread.c (struct cached_thread_entry): stop using
+	  pthread_cond_t and its functions directly.
+
+	* thread_pthread.c (register_cached_thread_and_wait): ditto.
+
+	* thread_pthread.c (use_cached_thread): ditto.
+
+Thu Aug  4 20:29:41 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* configure.in: when Solaris cc, use $(CC) to link shared libs.
+
+Thu Aug  4 20:19:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* error.c (report_bug): use a small message buffer instead of BUFSIZ.
+	  It is needed for avoiding nested SIGSEGV on Linux.
+	  Note: BUFSIZ is not proper buffer size. It's unrelated with maximum
+	  filename length. :-/
+	  [Bug #5139] [ruby-dev:44315]
+
+Thu Aug  4 16:08:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (gem): install all gemspecs under lib and ext.
+
+	* tool/rbinstall.rb (Gem::Specification): may not be defined when
+	  cross-compiling and BASERUBY is 1.8.
+
+Thu Aug  4 11:30:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/missing.h: define __syscall on OpenBSD as r32702.
+
+Thu Aug  4 03:02:54 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* tool/rbinstall.rb: use rubygems to load gemspecs, copy actual
+	  gemspecs on install rather than generate fake ones for all gems.
+
+Thu Aug  4 02:45:10 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* configure.in: set CXX variable to the C++ compiler that matches the
+	  C compiler specified by CC variable (e.g. use g++-4.2 for gcc-4.2).
+
+Thu Aug  4 02:21:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (link_command): use static library only for bundled
+	  extensions.  [Bug #5147]
+
+Thu Aug  4 02:02:10 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/psych.gemspec: installing psych as a gem.
+
+Wed Aug  3 16:01:35 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* util.c, include/ruby/util.h (ruby_add_suffix): remove the function.
+	  [Bug #5153] [ruby-core:38736]
+
+	* io.c (argf_next_argv): remove the call of above function.
+
+	* ext/-test-/add_suffix, test/-ext-/test_add_suffix.rb: remove the test
+	  extension module because this is only for testing ruby_add_suffix().
+
+	* LEGAL: remove the mention about a part of util.c, because now we
+	  removed the part.
+
+	* io.c (argf_next_argv): now the new filename is not guaranteed to
+	  use, so should check the return value of rename(2).
+
+	* test/ruby/test_argf.rb (TestArgf#test_inplace_rename_impossible):
+	  now we expect same result with other platforms on no_safe_rename
+	  platforms (=Windows).
+
+Wed Aug  3 09:18:08 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/xmlrpc/webrick_testing.rb (WEBrick_Testing#start_server):
+	  Like r32795, bind address should be specified.
+
+Wed Aug  3 07:46:30 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_find): mistakenly remained !.  [Bug #5150]
+
+Wed Aug  3 00:11:08 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/prettyprint.rb: update document.  [ruby-core:36776]
+
+Tue Aug  2 22:04:46 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c (init_heap): allocate sigaltstack after heaps are allocated.
+	  [ruby-dev:44315] [Bug #5139]
+
+	* vm.c (thread_free): use free because objspace is not ready.
+
+	* vm.c (th_init): use malloc because objspace is not ready.
+
+Tue Aug  2 20:10:16 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* test/testunit/test_parallel.rb: pass "--ruby" option to
+	  test/testunit/tests_for_parallel/runner.rb. [Bug #5132] [ruby-dev:44303]
+
+Tue Aug  2 15:53:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (str_to_encoding): rename from to_encoding and
+	  use str_to_encindex.
+
+	* encoding.c (str_to_encindex): split from to_encoding.
+
+	* encoding.c (rb_to_encoding): use str_to_encoding.
+
+	* encoding.c (rb_obj_encoding): don't bypass rb_encoding*.
+	  If it uses rb_encoding*, it bypass encindex. If it uses encindex,
+	  it doesn't bypass.
+
+	* encoding.c (enc_find): add shortcut for encoding object, use
+	  str_to_encindex, and avoid bypass rb_encoding*.
+
+Tue Aug  2 12:03:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (recursive_hash): hash value of emptied hash should be
+	  equal to an empty hash.  [ruby-core:38650]
+
+Tue Aug  2 11:42:15 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_enc_symname2_p): :! is valid symbol.  [Bug #5136]
+
+Tue Aug  2 07:33:29 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/net/http/test_http.rb (TestNetHTTP_version_1_1_methods#test_timeout_during_HTTP_session):
+	  If you connect to localhost, you should listen localhost.
+
+	* test/net/http/test_https.rb (TestNetHTTPS#test_timeout_during_SSL_handshake):
+	  ditto.
+
+Tue Aug  2 06:18:15 2011  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems/installer.rb (class Gem): Correct path check on Windows
+	  Possible fix for [Ruby 1.9 - Bug #5111]
+	* test/rubygems/test_gem_installer.rb (load Gem): ditto
+
+Mon Aug  1 20:12:03 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_process.rb (TestProcess#windows?): new method.
+
+	* test/ruby/test_process.rb (TestProcess#*): use above method.
+
+	* test/ruby/test_process.rb (TestProcess#test_execopts_redirect):
+	  windows doesn't support FD_CLOEXEC.
+
+Mon Aug  1 15:45:23 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rake/test_rake_functional.rb:  Don't assume the binary name of
+	  ruby is "ruby".  [Ruby 1.9 - Bug #5114]
+	* test/rake/helper.rb:  ditto
+
+Mon Aug  1 15:31:14 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/io/console/test_io_console.rb (TestIO_Console#test_sync):
+	  Skip when PTY allocation failed (that's not our fault).
+
+Mon Aug  1 15:04:12 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* test/xmlrpc/test_webrick_server.rb (Test_Webrick#setup_http_server):
+	  XMLRPC::Client.new3(), when called without host: argument, tries
+	  to  connect to  a host  where "localhost"  resolves to.   On the
+	  other  hand  a  WEBrick::HTTPServer.new(), when  called  without
+	  BindAddress:  argument, tries  to listen  all the  address where
+	  getaddrinfo(AF_UNSPEC) resolves to.   This is a mismatch because
+	  "localhost" might not resolve to one of those listening sockets.
+	  We  would  better explicitly  specify  "localhost"  here and  if
+	  failed, just skip the whole test.
+
+Mon Aug  1 14:24:56 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc.rb:  Import RDoc 3.9.1.  Fixes bugs in the RDoc::Markup
+	  parser.
+
+Mon Aug  1 12:00:35 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* insns.def (concatstrings): don't use initial ASCII-8BIT string.
+	  [ruby-core:38635] [Bug #5126]
+
+Sun Jul 31 22:57:16 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* enc/Makefile.in (ECHO1): Same as the recent fix in common.mk.
+	  ":" in a make variable replacement cause a syntax error with
+	  /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.
+
+Sun Jul 31 21:16:02 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* complex.c (f_signbit): gcc4 on Solaris DOES have signbit but does
+	  not have it on header.
+
+	* math.c: ditto.
+
+Sun Jul 31 21:09:04 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (node_name.inc): Use $(Q) for consistency.
+
+	* Makefile.in (INSNS): ditto.
+
+Sun Jul 31 21:19:51 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/mkmf.rb (configuration:ECHO1): Same as the recent fix in
+	  common.mk.
+	  ":" in a make variable replacement cause a syntax error with
+	  /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.
+
+Sun Jul 31 20:39:12 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (ECHO1): nmake does not allow parenthesis in make variable
+	  replacement.
+
+Sun Jul 31 23:06:57 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c (check_env): print debug messages to stderr.
+	[Feature #4871] [ruby-dev:43743]
+
+Sun Jul 31 22:50:23 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c (vm_make_env_each): don't save prev env value.
+	It is no longer used. [Feature #4871] [ruby-dev:43743]
+
+	* vm.c (check_env): changed accordingly.
+
+Sun Jul 31 20:21:36 2011  "Yuki Sonoda (Yugui)"  <yugui@yugui.jp>
+
+	* common.mk (ECHO1): ":" in a make variable replacement cause a syntax
+	  error with /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.
+
+	* configure.in (NULLCMD): new check.
+
+	* Makefile.in (NULLCMD): Reflects checking in configure.
+
+	* win32/Makefile.sub (NULLCMD): new assignment.
+
+Sun Jul 31 18:58:59 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_pipe): pipe on cygwin can succeed half but fail
+	  half.
+
+Sun Jul 31 11:31:07 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c: check if cfp is valid. [Bug #5083] [ruby-dev:44208]
+
+Sun Jul 31 09:18:28 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc 3.9.  Fixed `ri []`, stopdoc creating an
+	  object reference, nodoc for class aliases, verbatim === lines.
+
+Sun Jul 31 01:29:08 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_each_byte): remove unused variable e.
+
+Sat Jul 31 01:23:45 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* test/bigdecimal/test_bigdecimal.rb (test_version): removed.
+
+Sat Jul 30 23:19:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* defs/default_gems: separate from tool/rbinstall.rb.
+
+Sat Jul 30 23:14:44 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_each_byte): rbuf can be refreshed during yield.
+	  [Bug #5119]
+
+Sat Jul 30 22:35:50 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* strftime.c (NEEDS): avoid SEGV due to integer overflow in
+	  sparc-solaris2.10 and i686-linux.  fix [Bug #4456] [ruby-dev:43284]
+
+Sat Jul 30 17:26:26 2011  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_variant.rb: use skip method to skip the test.
+
+	* test/win32ole/test_win32ole_variant_outarg.rb: ditto.
+
+Sat Jul 30 14:27:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_version): version 1.1.0.
+
+	* ext/bigdecimal/bigdecimal.gemspec: turn into a default gem.
+
+	* tool/rbinstall.rb: ditto.
+
+Sat Jul 30 11:21:55 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_core.h (ALT_STACK_SIZE): use MINSIGSTKSZ*2 instead of SIGSTKSZ*2.
+	  [ruby-core:38607]
+
+Sat Jul 30 10:39:14 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm.c (th_init): preallocate alternative stack.
+	  NoMemoryError is better than rb_bug, of course.
+	  Patch by Eric Wong. [ruby-core:38572][ruby-core:38594].
+
+	* signal.c (rb_register_sigaltstack): ditto.
+
+	* vm_core.h: moved ALT_STACK_SIZE definition from signal.c.
+	* vm.c (thread_free): use xfree() instead of free().
+
+Sat Jul 30 07:20:49 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (udp_server_sockets): unused variable
+	  removed.
+	  patch by Jeremy Evans.  [ruby-core:38600]
+
+Fri Jul 29 23:56:32 2011  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb: call OpenSSL::Random.seed at the
+	  SecureRandom.random_bytes call.
+	  based on the patch by Masahiro Tomita.  [ruby-dev:44270]
+
+Fri Jul 29 23:53:48 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_set_len): new function to set array length.
+
+	* vm_eval.c (method_missing): set the length of argv array, to mark
+	  arguments.
+
+	* vm_eval.c (rb_apply): get rid of too large alloca.
+
+Fri Jul 29 20:48:39 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: fix typos.
+
+Fri Jul 29 20:28:56 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: use whitespaces as a separator.
+
+Fri Jul 29 18:59:07 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: add documents for constants.
+	  patch by Eric Hodel.  [ruby-core:37853] [Bug #4989]
+
+Fri Jul 29 16:00:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (enable_pthread): use -pthread on OpenBSD without
+	  explicit option. patched by Jeremy Evans. [ruby-core:38572]
+
+Thu Jul 28 23:36:28 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* ext/fiddle/closure.c (callback): use rb_ary_tmp_new() instead of
+	  xmalloc() to allocate an array for arguments of callback procedure,
+	  to prevent arguments from being swept by GC. [ruby-core:38546]
+	  [Bug #4929]
+
+Thu Jul 28 22:36:06 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_initialize): Avoid possible
+	  SEGV from AES encryption/decryption. Processing data by
+	  Cipher#update without initializing key (meaningless usage of Cipher
+	  object since we don't offer a way to export a key) could cause SEGV.
+
+	  In OpenSSL, 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. See
+	  #2768.
+
+	* test/openssl/test_cipher.rb: test it.
+
+Thu Jul 28 14:25:08 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rubygems/user_interaction.rb (Gem::StreamUI#tty?): typo.
+
+Thu Jul 28 12:32:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/callback/mkcallback.rb (gencallback): use PTR2NUM.
+
+	* ext/dl/cptr.c (rb_dlptr_aref, rb_dlptr_aset): check NULL pointer
+	  dereference.
+
+	* ext/dl/cptr.c (rb_dlptr_s_to_ptr): use rb_check_funcall.
+
+	* ext/dl/cptr.c (rb_dlptr_s_to_ptr): fix wrapping condition.
+
+Thu Jul 28 04:53:31 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/delegate.rb:  Move file-level documentation to the appropriate
+	  classes.
+
+Thu Jul 28 02:15:04 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/cfunc.c (dlcfunc_mark), ext/dl/cptr.c (dlptr_mark):
+	  workaround to mark wrapped object.  this is not a true fix,
+	  because [Bug #4929] is caused by the interface design of DL.
+
+Thu Jul 28 00:28:15 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/fileutils/test_fileutils.rb: add OpenBSD case.
+	  patched by Jeremy Evans [ruby-core:38530] see #5097
+
+	* test/ruby/test_process.rb: ditto.
+
+Wed Jul 27 22:46:59 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/rinda/test_rinda.rb (test_remote_array_and_hash):
+	  add local variables to protect objects from GC. [ruby-dev:44253]
+	  [Bug #5104]
+
+Wed Jul 27 17:55:54 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/missing.h: define __syscall if the platform has
+	  __syscall in the library but doesn't define it in headers
+	  for example Mac OS X.
+
+Wed Jul 27 15:39:14 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c:  Add usage documentation for BasicObject.  Based on patch
+	  by Thomas Sawyer.  [Ruby 1.9 - Bug #5067]
+
+Wed Jul 27 12:24:17 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/uninstaller.rb:  Add missing require and update
+	  messaging to avoid confusion with uninstall --format-executable.
+	  [Ruby 1.9 - Bug #4062]
+
+Wed Jul 27 09:34:24 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 1.8.6.1.
+
+Wed Jul 27 09:27:59 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_pkcs12.rb: Add test and intermediate certificates.
+	  [ Ruby 1.9 - Feature #3793 ] [ruby-core:32088]
+
+Wed Jul 27 01:05:32 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_error.c (rb_print_undef_str): new function to raise
+	  NameError for undefined method.
+
+	* load.c (rb_mod_autoload_p), object.c (rb_mod_const_get),
+	  variable.c (rb_f_untrace_var, set_const_visibility), vm_method.c
+	  (rb_mod_{remove,undef,alias}_method, set_method_visibility):
+	  remove inadvertent symbol creation.  based on the first patch by
+	  Jeremy Evans at [ruby-core:38447].  [Feature #5089]
+
+	* vm_method.c (obj_respond_to): fix the respond_to_missing? override
+	  case.  based on the patch by Jeremy Evans at [ruby-core:38417].
+	  [Feature #5072]
+
+	* parse.y (rb_check_id): make the given name a symbol or a string.
+	  based on the second patch by Jeremy Evans at [ruby-core:38447]
+
+Wed Jul 27 00:50:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/lib/bigdecimal/util.rb (Rational#to_d):
+	  zero or negative precision is error.  fixes #5098.
+	  [ruby-dev:44210]
+
+	* test/bigdecimal/test_bigdecimal_util.rb: add test for the above
+	  change.
+
+Wed Jul 27 00:48:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/lib/bigdecimal/util.rb (Float#to_d): modified for
+	  specifying precision.  fixes #5098.  [ruby-dev:44210]
+
+	* test/bigdecimal/test_bigdecimal_util.rb: add test for the above
+	  change.
+
+Wed Jul 27 00:45:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/lib/bigdecimal/util.rb (Integer#to_d): added
+	  for symmetry to BigDecimal() function with an Integer.
+	  fixes #5098.  [ruby-dev:44210]
+
+	* test/bigdecimal/test_bigdecimal_util.rb: add test for the above
+	  change.
+
+Wed Jul 27 00:30:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/lib/bigdecimal/util.rb (BigDecimal#to_d): added
+	  for adapting other Numeric subclasses.  [ruby-dev:44245]
+
+	* test/bigdecimal/test_bigdecimal_util.rb: test for the above change.
+
+Wed Jul 27 00:27:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bigdecimal/bigdecimal.c (VpDup) a new function for duplicating
+	  a BigDecimal.
+
+	* bigdecimal/bigdecimal.c (BigDecimal_new): support generating a new
+	  BigDecimal from another BigDecimal using BigDecimal global function
+	  or constructor.  [ruby-dev:44245]
+
+Tue Jul 26 23:33:24 2011  Igor Zubkov  <igor.zubkov@gmail.com>
+
+	* array.c: Fix typo. https://github.com/ruby/ruby/pull/36
+
+Mon Jul 25 23:51:01 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c: pre-allocate the unlinked_method_entry_list_entry struct to
+	  avoid memory allocation during GC.  based on a patch from Eric Wong.
+	  [ruby-core:38498]
+
+Mon Jul 25 23:39:33 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rake/test_rake_directory_task.rb (TestRakeDirectoryTask#
+	  test_directory_win32): fixed wrong test.
+
+Mon Jul 25 22:36:11 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (struct METHOD), gc.c (gc_marks), vm_method.c
+	  (rb_gc_mark_unlinked_live_method_entries): fix SEGV bug.
+	  rb_method_entry_t was free'd even when the method is still on the
+	  stack if it is BMETHOD (i.e., Method#call).  This is because
+	  rb_method_entry_t is embedded in struct METHOD.  This commit
+	  separates them and marks the live method entries.
+	  See [ruby-core:38449] in detail.  fix [Bug #5047] [ruby-core:38171]
+
+Mon Jul 25 22:14:37 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* lib/xmlrpc/client.rb: Fix possible HTTP header formatting failure by
+	  'Basic' header. Long username caused the base64 String truncation in
+	  HTTP header which is not allowed. See #5046.
+
+	* test/xmlrpc/test_webrick_server.rb: test it.
+
+Mon Jul 25 15:04:33 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/lib/openssl.rb: End of transition period introduced by
+	  [ruby-dev:38018]. From the next version of 1.9.3, you should use
+	    require "openssl"
+	  instead of
+	    require "openssl/ssl"
+	  and
+	    require "openssl/x509"
+
+Mon Jul 25 13:46:38 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/x509.rb: Cosmetic change: move definition
+	  introduced in r30152 to x509-internal.rb.
+
+Mon Jul 25 13:09:42 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): Avoid randomly generated
+	  SSLError from SSLSocket just after invoking SSLSocket#close.
+	  OpenSSL's SSL_shutdown could try to send alert packet and it might
+	  set SSLerr(global error stack) as the result. It causes the next
+	  SSL read/write operation to fail by unrelated reason.
+
+	  By design, we're ignoring any error at SSL_shutdown() so we clear
+	  global error stack after SSL_shutdown is called. See #5039.
+
+Sun Jul 24 20:29:53 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: refine the recvmsg test.
+
+Sun Jul 24 20:02:31 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: fix the recvmsg test.
+
+Sun Jul 24 08:42:51 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: test recvmsg allocates file descriptors for
+	  fd passing even with MSG_PEEK.
+
+	* ext/socket/ancdata.c: use the above test result.
+
+Sun Jul 24 01:04:50 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Restore behavior of
+	  Gem::Specification#loaded.  [Ruby 1.9 - Bug #5032]
+
+Sun Jul 24 00:05:00 2011  Jeremy Evans  <merch-redmine@jeremyevans.net>
+
+	* error.c (rb_name_error_str): new function to raise NameError
+	  with the name string but not ID.
+
+	* object.c, proc.c, variable.c: more removal of inadvertent symbol
+	  creation.  [Feature #5079]
+
+Sat Jul 23 21:14:00 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/cmath.rb (cbrt): should return a real number if possible.
+
+Sat Jul 23 20:12:52 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/rake/test_rake_functional.rb (setup): Use __FILE__ for the base
+	  directory. Current directory is not the top source directory when
+	  the building process runs on other than there.
+
+	* test/rake/test_rake_rake_test_loader.rb: ditto.
+
+	* test/rake/test_rake_task_argument_parsing.rb
+	  (test_terminal_width_using_hardcoded_80): hardcoded 80 is used
+	  when app.unix? is false.
+
+Sat Jul 23 20:11:50 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: an issue that is same as  [ruby-dev:44071].
+	* ext/date/date_strftime.c: identical to [ruby-dev:44112].
+
+Sat Jul 23 19:12:53 2011  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_err_in_callback.rb (test_err_in_callback):
+	  skip test if ADODB.connection is not available.
+
+Sat Jul 23 15:37:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (rb_enc_symname_type): :$a!, @a! and so on are not
+	  valid symbols, so they should be inspected with quotes.
+
+Sat Jul 23 17:06:25 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_update_max_fd): validate fd.
+
+	* ext/socket/rubysocket.h (rsock_discard_cmsg_resource): add
+	  msg_peek_p argument for the declaration.
+
+	* ext/socket/ancdata.c (discard_cmsg): add msg_peek_p argument.
+	  assume FreeBSD, NetBSD and MacOS X doesn't generate passed fd
+	  when MSG_PEEK.
+	  (rsock_discard_cmsg_resource): add msg_peek_p argument.
+	  (bsock_recvmsg_internal): call rsock_discard_cmsg_resource with
+	  msg_peek_p argument.
+
+	* ext/socket/unixsocket.c (unix_recv_io): call
+	  rsock_discard_cmsg_resource with msg_peek_p argument.
+
+Sat Jul 23 14:38:28 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rake*: Remove dependencies on flexmock and session gems.
+	  [Ruby 1.9 - Bug #4987]
+
+Sat Jul 23 12:19:04 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_check_id): take care of attrset ID created
+	  implicitly by local ID.  [Bug #5084]
+
+	* parse.y (rb_check_id): conversion condition was inverse.
+	  [Bug #5084]
+
+Fri Jul 22 21:46:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_insnhelper.c (vm_call_cfunc): added volatile for a workaround
+	  of cfp consistency error problem on OS X 10.7 (Lion). It's
+	  suspected llvm optimization bug.
+	  [Bug #5074] [ruby-dev:44185]
+
+Fri Jul 22 21:18:20 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (WFKV_): unroll the loop of regexp.
+
+	* lib/uri/generic.rb (URI.decode_www_form_component): ditto.
+
+Fri Jul 22 21:06:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_{const,cvar}_defined, rb_obj_ivar_defined):
+	  avoid inadvertent symbol creation in reflection methods.  based
+	  on a patch by Jeremy Evans at [ruby-core:38367].  [Feature #5072]
+
+	* vm_method.c (rb_mod_method_defined)
+	  (rb_mod_{public,private,protected}_method_defined)
+	  (obj_respond_to): ditto.
+
+	* parse.y (rb_check_id): new function returns already interned ID
+	  or 0.
+
+Fri Jul 22 20:44:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_is_global_id, rb_is_attrset_id): add missing
+	  predicates.
+
+Fri Jul 22 20:24:38 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_object.rb (TestObject#test_respond_to_missing):
+	  2nd argument of respond_to_missing? is not optional.
+
+Fri Jul 22 19:05:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_enc_symname2_p): get rid of potential out-of-bound
+	  access.
+
+Fri Jul 22 13:55:59 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Net::HTTP#finish is used to manually close
+	  connections.  [Ruby 1.9 - Bug #5045]
+
+Fri Jul 22 13:51:29 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/readline/readline.c:  Add examples for Readline.completion_proc=.
+	  [Ruby 1.9 - Bug #5057]
+
+Fri Jul 22 13:03:12 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_hmac.c: Revert checking return type of
+	  HMAC_Init_ex as it is not compatible with OpenSSL < 1.0.0.
+
+Fri Jul 22 12:10:21 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* tool/rbinstall.rb (default gems):  Install executables into the fake
+	  gem dir for Gem.bin_path.  [#4485]
+
+Fri Jul 22 11:20:20 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_digest.c: Check return value of EVP_DigestInit_ex.
+	* ext/openssl/ossl_hmac.c: Check return value of HMAC_Init_ex.
+	  Thanks, Jared Jennings, for the patch.
+	  [ Ruby 1.9 - Bug #4944 ] [ruby-core:37670]
+
+Fri Jul 22 09:09:43 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_engine.c: Avoid double free of ENGINE reference.
+	* test/openssl/test_engine.rb: Add a test for it.
+	  Thanks to Ippei Obayashi for providing the patch.
+	  [ Ruby 1.9 - Bug #5062 ] [ruby-dev:44173]
+
+Fri Jul 22 06:37:13 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/csv.rb: Do not modify CSV.generate's argument [ruby-core:38356]
+
+Thu Jul 21 20:59:59 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (discard_cmsg): workaround for MacOS X Lion.
+
+Thu Jul 21 20:02:11 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (set_trace_func, thread_set_trace_func_m): reset tracing
+	  state when set_trace_func hook is removed.  This is workaround patch
+	  to force to reset tracing state that is broken by continuation call.
+	  a patch from James M. Lawrence.  [Feature #4347] [ruby-core:34998]
+
+	* test/ruby/test_continuation.rb (class TestContinuation): add a test
+	  for above.  a patch from James M. Lawrence.
+
+Thu Jul 21 19:27:19 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* node.c (dump_node): add today's knowledge.  "init arguments (m)" and
+	  "init arguments (p)" of compile.c indicates a Ruby code that
+	  evaluates multiple assignments that is in method or block
+	  parameters:  def foo((m1,m2), (m3,m4), *r, (p1,p2), (p3,p4)); end
+	  The former (init arguments (m)) evaluates the multiple assignments
+	  before rest argument, that are (m1,m2) and (m3,m4).  The letter
+	  (init arguments (p)) does ones after rest argument, that are
+	  (p1,p2) and (p3, p4).
+
+Thu Jul 21 18:11:07 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enum.c (enum_inject): remove empty line to notify rdoc
+	  Enumerable#reduce is alias. patched by milki@github.
+	  https://github.com/ruby/ruby/pull/26
+
+Thu Jul 21 17:30:21 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (rb_ary_delete_at_m): use simple array literal in rdoc.
+	  patched by samuel tonini. [ruby-core:38310] [Bug #5066]
+
+Thu Jul 21 17:14:21 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#each):
+	  Allow HTTP/0.9 request which doesn't has any header or body.
+	  patched by Felix Jodoin. [ruby-core:38040] [Bug #5022]
+
+Wed Jul 20 23:02:18 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* io.c (rb_update_max_fd): remove parentheses. they are not in
+	  macro.
+
+Wed Jul 20 22:22:23 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_update_max_fd): declaration moved from
+	  internal.h.
+
+	* file.c: ditto.
+
+	* io.c: call rb_update_max_fd for each new fds.
+
+	* process.c: ditto.
+
+	* random.c: ditto.
+
+	* ruby.c: ditto.
+
+	* ext/io/console/console.c: ditto.
+
+	* ext/openssl/ossl_bio.c: ditto.
+
+	* ext/pty/pty.c: ditto.
+
+	* ext/socket/init.c: ditto.
+
+	* ext/socket/socket.c: ditto.
+
+	* ext/socket/ancdata.c: ditto.
+
+	* ext/socket/unixsocket.c: ditto.
+
+Wed Jul 20 15:16:22 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/dl/handle.c (dlhandle_sym): clear previous error with dlerror()
+	  before calling dlsym(). [ruby-dev:44091] [Bug #5021]
+
+Wed Jul 20 07:16:26 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: mention Kernel#warn.  [ruby-core:38119] [Feature #5029]
+
+Tue Jul 19 16:40:45 2011  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+
+	* cont.c (cont_save_thread): fix missing semicolon.
+
+Tue Jul 19 16:25:15 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (UPDATE_MAXFD): removed.
+
+Tue Jul 19 16:07:45 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_update_max_fd): new function.
+
+	* internal.h (rb_update_max_fd): declare rb_update_max_fd.
+
+	* thread_pthread.c (rb_thread_create_timer_thread): update max fd when
+	  timer thread pipe is created.
+
+Mon Jul 18 13:36:47 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: define a new BadAlias error class.
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: raise an exception when
+	  deserializing an alias that does not exist.
+
+	* test/psych/test_merge_keys.rb: corresponding test.
+
+Mon Jul 18 00:00:46 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/curses/curses.c: added the new class Curses::Pad, which
+	  supports scrolling.  patch by Eric Hodel.  [Feature #4896]
+	  [ruby-core:37206]
+
+Sun Jul 17 16:26:40 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_check_trusted): new function to check an object is
+	  trusted.
+
+	* struct.c (rb_struct_modify), time.c (time_modify): check by the
+	  above function to show proper class names.  [Bug #5036]
+
+Sun Jul 17 15:30:04 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_warn_m): accept multiple args in like puts.  rdoc
+	  patch by Erik Price at [ruby-core:38119].  [Feature #5029]
+
+Sun Jul 17 07:56:31 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_ssl_session.rb: add PEM SSL session without TLS
+	  extensions. Use this as the default for the tests to ensure
+	  compatibility with OpenSSL 0.9.7.
+	  [ Ruby 1.9 - Bug #4961 ] [ruby-core:37726]
+
+Sat Jul 16 17:29:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_UNIVERSAL_ARCH): restore arch flag.
+	  Bug #4977
+
+Sat Jul 16 06:27:51 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/uri/common.rb (module): Remove optional parser argument to
+	  Kernel#URI
+	  [ruby-core:38061]
+
+	* lib/uri/generic.rb (module): ditto
+
+Sat Jul 16 03:19:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (is_socket, is_console): add prototypes to fix compile
+	  problem with gcc introduced at r32549.
+	  reported by Jon Forums. [Bug #5030] [ruby-core:38079]
+
+Sat Jul 16 00:55:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* time.c (time_dup): used rb_obj_class() instead of CLASS_OF().
+	  The patch is made by Kazuki Tsujimoto. [Bug #5012] [ruby-dev:44071]
+
+	* test/ruby/test_time.rb (TestTime#test_getlocal_dont_share_eigenclass):
+	  added a new test for eigenclass of time object.
+
+Fri Jul 15 19:11:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (bigsub_int): add RB_GC_GUARD.  This patch is made by
+	  Makoto Kishimoto.  fixes #4223 [ruby-dev:42907]
+
+	* bignum.c (bigadd_int): ditto.
+
+Fri Jul 15 14:27:53 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (rb_w32_io_cancelable_p): renamed
+	  from rb_w32_has_cancel_io().  now it takes a parameter as fd to check
+	  the fd is console or not, because we cannot cancel console input even
+	  if we have cancel_io function.
+
+	* io.c (WAIT_FD_IN_WIN32): call above function instead of the old one,
+	  so now we can kill the thread which calls STDIN.gets.
+	  the problem was reported by ko1 via IRC.
+
+Fri Jul 15 09:10:41 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/digest/sha2/sha2.c (SHA256_Update, SHA512_Update): avoid Bus
+	  Error caused by unalignment access on Sparc-Solaris (and possibly on
+	  other similar environment.) This patch just do memcpy always instead
+	  of checking architecture. I see no perf drop on my 64bit env. For
+	  more details, see #4320.
+
+	* test/digest/test_digest.rb: add test for unalignment access.
+
+Fri Jul 15 01:51:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): Power PC does not
+	  allow unaligned word access.
+
+	* st.c (UNALIGNED_WORD_ACCESS): x86_64 allows unaligned word
+	  access as well as i386.
+
+Thu Jul 14 12:19:34 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* ext/openssl/ossl.c (ossl_verify_cb): trap the exception from
+	  verify callback of SSLContext and X509Store and make the
+	  verification fail normally. Raising exception directly from callback
+	  causes orphan resources in OpenSSL stack. Patched by Ippei Obayashi.
+	  See #4445.
+
+	* test/openssl/test_ssl.rb
+	  (test_exception_in_verify_callback_is_ignored): test it.
+
+Tue Jul 12 23:41:49 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* NEWS: add a description of Signal.trap change.
+
+Tue Jul 12 20:02:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (reserved_signal_p): reverted a part of r32523.
+	  chikanaga noticed trap(:CHLD) has some realworld usecase.
+	* test/ruby/test_signal.rb (TestSignal#test_reserved_signal):
+	  ditto.
+
+Tue Jul 12 17:12:45 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* vm_method.c (rb_add_method): should not call method_added hook
+	  for undef operation. [Bug #5015]
+
+Tue Jul 12 16:58:44 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb(Test::Unit::Options#process_args): Fix bug.
+	  Fix process_args didn't return `@option` after r30939.
+
+Tue Jul 12 14:07:46 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (install_sighandler): fixed a race.
+
+Tue Jul 12 13:49:32 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (sig_trap): don't permit to change a signal handler which
+	  the interpreter reserved.
+	* signal.c (reserved_signal_p): ditto.
+	  [Bug #2616] [ruby-core:27625]
+
+	* test/ruby/test_signal.rb (TestSignal#test_reserved_signal):
+	  added a test for reserved signal.
+
+Tue Jul 12 11:58:28 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/setup.mak: support x86-amd64 cross compile environment.
+
+Mon Jul 11 23:22:28 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* time.c: can't compile time.c on AIX due to missing declaration for
+	  ffs(). It is declared in strings.h on AIX.
+
+Mon Jul 11 15:54:24 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c: removed signal() macro. It's no longer used.
+
+Mon Jul 11 15:02:24 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (rb_num2ull): use FIX2LONG instead of FIX2ULONG. see
+	  rb_num2ulong(). fixed the problem of ObjectSpace._id2ref of IL32LLP64
+	  platforms, introduced at r32433.
+
+Mon Jul 11 05:38:05 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* thread_pthread.c (get_stack): need to adjust stack addr for
+	  [Bug #1813] on AIX.
+
+Mon Jul 11 01:16:27 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): removed
+	  rb_disable_interrupt()/rb_enable_interrupt().
+	* vm_core.h: ditto.
+	* process.c (static void before_exec): ditto.
+	* process.c (static void after_exec): ditto.
+	  [Bug #4765] [ruby-dev:43571]
+
+	* eval_intern.h: removed rb_trap_restore_mask().
+	* vm_eval.c (rb_throw_obj): ditto.
+	* eval.c (setup_exception): ditto.
+
+	* signal.c: removed trap_last_mask.
+	* signal.c (trap_restore_mask): removed.
+	* signal.c (init_sigchld): comment clarification why signal block
+	  is needed. and removed trap_last_mask operation.
+	* signal.c (trap_ensure): removed trap_last_mask operation.
+
+	* signal.c (rb_disable_interrupt, rb_enable_interrupt): made
+	  static and removed sigdelset(SIGVTALRM) and sigdelset(SIGSEGV).
+
+	* process.c (rb_syswait): removed implicit signal handler change.
+
+Sun Jul 10 23:49:12 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* docs/NEWS-1.9.3: moved from NEWS.
+
+	* docs/ChangeLog-1.9.3: merged ChangeLog for 1.9.3.
+
+	* NEWS: NEWS for 1.9.4 that describes changes since 1.9.3
+
+	* ChangeLog: new ChangeLog for 1.9.4.
+
+Sun Jul 10 23:30:52 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* version.h (RUBY_VERSION): ruby_1_9_3 branch was forked.
+
+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.1.0 b/doc/ChangeLog-2.1.0
new file mode 100644
index 0000000000..76edfd3ce7
--- /dev/null
+++ b/doc/ChangeLog-2.1.0
@@ -0,0 +1,18060 @@
+Fri Dec 20 17:52:50 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_method.c: check definition of
+	  GLOBAL_METHOD_CACHE_SIZE and GLOBAL_METHOD_CACHE_MASK.
+
+Fri Dec 20 17:03:10 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: rename OBJ_WRITE and OBJ_WRITTEN into
+	  RB_OBJ_WRITE and RB_OBJ_WRITTEN.
+
+	* array.c, class.c, compile.c, hash.c, internal.h, iseq.c,
+	  proc.c, process.c, re.c, string.c, variable.c, vm.c,
+	  vm_eval.c, vm_insnhelper.c, vm_insnhelper.h,
+	  vm_method.c: catch up this change.
+
+Fri Dec 20 16:01:35 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: add a comment for WB interfaces.
+
+Fri Dec 20 16:00:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: DLDFLAGS is defined in --with-opt-dir handler, so
+	  ${DLDFLAGS=} does not work now.  use RUBY_APPEND_OPTIONS instead.
+	  [ruby-dev:47855] [Bug #9256]
+
+Fri Dec 20 14:19:12 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (AC_ARG_WITH): use withval directly.
+	  fix failure on FreeBSD.
+	  http://fb32.rubyci.org/~chkbuild/ruby-trunk/log/20131217T070301Z.diff.html.gz
+
+Fri Dec 20 14:00:01 2013  Aman Gupta <ruby@tmm1.net>
+
+	* include/ruby/ruby.h (struct RClass): add super, remove iv_index_tbl.
+	  since RCLASS_SUPER() is commonly used inside while loops, we move it
+	  back inside struct RClass to improve cache hits. this provides a
+	  small improvement (1%) in hotspots like rb_obj_is_kind_of()
+	* internal.h (struct rb_classext_struct): remove super, add
+	  iv_index_table
+	* internal.h (RCLASS_SUPER): update for new location
+	* internal.h (RCLASS_SET_SUPER): ditto
+	* internal.h (RCLASS_IV_INDEX_TBL): ditto
+	* object.c (rb_class_get_superclass): ditto
+	* include/ruby/backward/classext.h (RCLASS_SUPER): ditto
+
+Fri Dec 20 07:07:35 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 03d6ae7.  Changes include:
+
+	  * Fixed typos.
+
+	  * Relaxed Gem.ruby test for ruby packagers that do not use `ruby`.
+
+	* test/rubygems:  ditto.
+
+Thu Dec 19 14:03:04 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (heap_get_freeobj): improve hot path performance.
+
+	* gc.c (heap_get_freeobj_from_next_freepage): replace with
+	  heap_get_freepage(). It returns freeobj instead of freepage.
+	  This is not on hot path.
+
+Thu Dec 19 12:05:17 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master af60443.  Changes include:
+
+	  * Improved speed of `gem install --ignore-dependencies`.
+
+	  * Open read-write for exclusive flock.  [ruby-trunk - Bug #9257]
+
+	  * Remove specification before install to prevent infinite loop.
+
+Thu Dec 19 11:23:49 2013  Aman Gupta <ruby@tmm1.net>
+
+	* vm_insnhelper.c (vm_call_iseq_setup_normal): simple for loop
+	  condition optimization. this area shows up as a hotspot in VM
+	  profiles.
+
+Thu Dec 19 10:50:13 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (newobj_of): don't need to RBASIC_SET_CLASS() which includes WB
+	  here because created obj is always YOUNG/INFANT.
+
+Thu Dec 19 10:48:37 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/gc/gcbench.rb: check GC::OPTS availability
+	  for not MRI 2.1.0.
+
+Thu Dec 19 03:10:30 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (heap_get_freeobj): remove redundant assignment. heap->freelist
+	  is set after the while() loop already.
+
+Thu Dec 19 01:54:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/runner.rb: fix commit miss on r44278.
+
+Thu Dec 19 00:26:11 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (garbage_collect_body): lazy_sweep setting should work
+	  without USE_RGENGC.
+
+Wed Dec 18 23:31:04 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_profile_dump_major_reason): fix this function because major_reason
+	  can be OR of multiple reasons.
+
+	* gc.c (gc_profile_dump_on): ditto.
+
+Wed Dec 18 17:03:00 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_profile_record_get): should return an empty array
+	  when profiling is active.
+
+Wed Dec 18 16:49:40 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_profile_clear, gc_profile_enable): remove rest_sweep().
+
+	* gc.c: check objspace->profile.current_record before inserting
+	  profiling record by new macro gc_prof_enabled().
+
+Wed Dec 18 14:32:06 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_exec.h (VM_DEBUG_STACKOVERFLOW): added.
+	  disable stack overflow check for every stack pushing as default.
+
+	* vm_exec.c (vm_stack_overflow_for_insn): ditto.
+
+Wed Dec 18 10:00:22 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master d8f12e2.  This increases the
+	  speed of `gem install --ignore-dependencies` which helps bundler
+	  tests.
+	* test/rubygems:  ditto.
+
+Wed Dec 18 09:00:17 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb (test_expand_heap): allow +/-1 diff.
+
+Tue Dec 17 23:44:15 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* test/ruby/test_io.rb: fix duplicated test name.
+
+Tue Dec 17 20:15:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_reject): revert to deprecated behavior, with
+	  warnings, due to compatibility for HashWithDifferentAccess.
+	  [ruby-core:59154] [Bug #9223]
+
+Tue Dec 17 17:30:56 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el: Import version 2.1.1 from
+	  https://github.com/knu/ruby-electric.el.
+
+	  * ruby-electric-delete-backward-char: Enable support for number
+	    prefix.
+
+	  * ruby-electric-curlies: Fix electric operation after an open
+	    curly.
+
+Tue Dec 17 16:19:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_trace.c (rb_postponed_job_flush): isolate exceptions in
+	  postponed jobs and restore outer ones.  based on a patch by
+	  tarui.  [ruby-core:58652] [Bug #9168]
+
+Tue Dec 17 10:48:04 2013  Aman Gupta <ruby@tmm1.net>
+
+	* configure.in (RUBY_DTRACE_POSTPROCESS): Fix compatibility with
+	  systemtap on linux. stap requires `dtrace -G` post-processing, but
+	  the dtrace compatibility wrapper is very strict about probes.d
+	  syntax.
+
+Tue Dec 17 05:18:17 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 1c5f4b3.  Allows rubygems
+	  repackagers to disable backward-compatible shared gem directory
+	  behavior.
+	* test/rubygems:  ditto.
+
+Tue Dec 17 05:14:35 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* NEWS (RDoc):  Update version number so I don't have to change it
+	  for the final release.
+
+Mon Dec 16 19:19:19 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_markable_object_p): should check special_const_p
+	  first (by is_markable_object()).
+
+Mon Dec 16 19:12:54 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c (reachable_object_from_root_i): use
+	  compare_by_identity hash to avoid hash modify problem
+	  during iteration.
+	  [Bug #9252]
+
+	* ext/objspace/objspace.c (reachable_objects_from_root): ditto.
+
+Mon Dec 16 18:16:28 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_verify_internal_consistency): should not use
+	  rb_objspace_each_objects() because it call rest_sweep().
+
+Mon Dec 16 18:07:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_markable_object_p): fix last commit (build error).
+
+Mon Dec 16 18:04:28 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_markable_object_p): it should be live objects.
+
+Mon Dec 16 18:00:51 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep
+	  flag in nested case.
+
+Mon Dec 16 16:40:35 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_method.c (rb_method_entry_make): fix WB miss.
+	  Note that rb_method_entry_t::klass is not constified.
+	  We may  constify this field.
+
+	* test/ruby/test_alias.rb: add a test.
+
+Mon Dec 16 14:14:22 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: use gc_verify_internal_consistency() instead of
+	  gc_check_before_marks_i() for check consistency
+	  on RGENGC_CHECK_MODE >= 2.
+
+Mon Dec 16 14:01:48 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c (make_clock_result): add :second as a unit for
+	  Process.clock_gettime.
+
+Mon Dec 16 13:10:54 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: introduce GC.verify_internal_consistency method to verify GC
+	  internal data structure.
+
+	  Now this method only checks generation (old/young) consistency.
+
+Mon Dec 16 11:49:26 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (gc_info_decode): Fix build errors when compiled with
+	  RGENGC_ESTIMATE_OLDMALLOC=0
+	* gc.c (objspace_malloc_increase): ditto
+
+Sun Dec 15 13:38:29 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c (reachable_object_from_root_i):
+	  reachable objects should not include categories and
+	  category_objects because it is noisy information.
+
+	  In fact, objects created after calling
+	  ObjectSpace.reachable_objects_from_root should not be included
+	  as a returning hash objects. Currently, mswin64 platform has a
+	  problem because of this behavior. Should we trace new objects?
+
+Sun Dec 15 07:09:28 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc master 263a9e5.  This improves the
+	  accessibility of the search box.
+
+Sat Dec 14 17:39:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_callee_setup_arg_complex): count post
+	  arguments as mandatory arguments.  [ruby-core:57706] [Bug #8993]
+
+	* vm_insnhelper.c (vm_yield_setup_block_args): ditto.
+
+Sat Dec 14 16:26:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rubylibprefix): replace exec_prefix as well as
+	  bindir and libdir.  a patch by kimuraw (Wataru Kimura) at
+	  [ruby-dev:47852].  [Bug #9160]
+
+Sat Dec 14 14:42:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/logger.rb (lock_shift_log): no need to rotate the log file
+	  if it has been rotated by another process.  based on the patch
+	  by no6v (Nobuhiro IMAI) in [ruby-core:58620].  [Bug #9133]
+
+Sat Dec 14 13:01:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (mnew_from_me): method by respond_to_missing? should be
+	  owned by the original class.
+
+Sat Dec 14 11:55:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/scanf.rb (IO#scanf): fix mistaken use of rescue modifier.
+	  a patch by Mon_Ouie at [ruby-core:52813].  [Bug #7940]
+
+Sat Dec 14 11:44:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_qsort): fix potential stack overflow on a large
+	  machine.  based on the patch by Conrad Irwin <conrad.irwin AT
+	  gmail.com> at [ruby-core:51816].  [Bug #7772]
+
+Sat Dec 14 11:25:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_const_defined): support nested class path as
+	  well as const_get.  [Feature #7414]
+
+Sat Dec 14 01:31:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_rescue2): reuse tags pushed for body proc to protect
+	  rescue proc too.
+
+Sat Dec 14 01:15:51 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (wmap_final_func): Bugfix. Should update *value to new pointer.
+
+Sat Dec 14 01:05:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb: Don't test $! in "ensure" clause because
+	  it may be set before the body.
+	  Reported by ko1 and mrkn.  [ruby-core:59088] [Bug #9247]
+
+	* lib/cgi/core.rb: Ditto.
+
+	* lib/drb/ssl.rb: Ditto.
+
+Sat Dec 14 00:34:31 2013  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* internal.h (ruby_sized_xrealloc2): fix typo introduced in r44117,
+	  which cause compile error on Solaris.
+
+Sat Dec 14 00:22:16 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c: (exec_recursive): use rb_catch_protect() instead of
+	  rb_catch_obj() and PUSH_TAG(), and reduce pushing tags and
+	  machine stack usage.
+
+Sat Dec 14 00:18:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (mnew_from_me): achieve the original defined_class from
+	  prepended iclass, to fix inherited owner.
+
+	* proc.c (method_owner): return the defined class, but not the
+	  class which the method object is created from.
+
+Fri Dec 13 22:29:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (method_owner): return the class where alias is defined, not
+	  the class original method is defined.
+
+	* vm_method.c (rb_method_entry_make, rb_alias): store the originally
+	  defined class in me.  [Bug #7993] [Bug #7842] [Bug #9236]
+
+	* vm_method.c (rb_method_entry_get_without_cache): cache included
+	  module but not iclass.
+
+Fri Dec 13 16:27:17 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (gc_info_decode): Use :major_by=>:nofree as fallback reason
+	  when other trigger conditions are present.
+
+Fri Dec 13 13:25:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* error.c: add Exception#backtrace_locations.
+	  Now, there are no setter and independent from Exception#backtrace.
+	  [Feature #8960]
+
+	* eval.c (setup_exception): set backtrace locations for `bt_location'
+	  special attribute.
+
+	* vm_backtrace.c (rb_backtrace_to_location_ary): added.
+
+	* internal.h: ditto.
+
+	* test/ruby/test_backtrace.rb: add a test for
+	  Exception#backtrace_locations.
+
+Fri Dec 13 12:01:07 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (garbage_collect_body): use rb_bug() and explicit error message
+	  instead of using assert().
+	  [Bug #9222]
+
+Fri Dec 13 11:52:41 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c: fix comment to remove the word "shady".
+
+	* variable.c: ditto.
+
+Fri Dec 13 11:33:55 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename *shady* func/macros.
+	  * RVALUE_RAW_SHADY()   -> RVALUE_WB_PROTECTED_RAW()
+	  * RVALUE_SHADY()       -> RVALUE_RAW_SHADY()
+	  * rgengc_check_shady() -> rgengc_check_relation().
+	  And fix some messages using "shady" to "non-WB-protected".
+
+Fri Dec 13 10:04:23 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/request_set/lockfile.rb:  Import RubyGems master a8d0669
+	  with a 1.8.7 compatibility fix.
+	* test/rubygems/test_gem_request_set_lockfile.rb:  ditto.
+
+Fri Dec 13 09:50:49 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master ddac51f.  Changes:
+
+	  * Allow override for the shared gem installation directory for
+	    rubygems packagers.
+
+	  * Lock gem cache files for read and write to improve thread safety.
+
+	  * Use io/console when available.
+
+	  * Minor cleanup.
+
+	* test/rubygems:  ditto.
+
+Fri Dec 13 08:15:31 2013  Aman Gupta <ruby@tmm1.net>
+
+	* class.c (include_modules_at): use RCLASS_M_TBL_WRAPPER for
+	  equality checks. this avoids an unnecessary deference inside a tight
+	  loop, fixing a performance regression from r43973.
+	* object.c (rb_obj_is_kind_of): ditto.
+	* object.c (rb_class_inherited_p): ditto.
+
+Wed Dec 13 02:00:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VpSetPTR): fix for limitation of the resulting
+	  precision.
+	  [ruby-core:50269] [Bug #7458]
+
+	* test/bigdecimal/test_bigdecimal.rb (test_limit): add tests for the above
+	  change.
+
+Wed Dec 13 01:56:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VpAddAbs): put out a conditional branch from
+	  the inside of while-loop.
+
+	* ext/bigdecimal/bigdecimal.c (VpSubAbs): ditto.
+
+Wed Dec 13 01:53:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VPrint): be a static function, support another
+	  dump formats, and add more information of the given bigdecimal.
+
+	* ext/bigdecimal/bigdecimal.h: ditto.
+
+Wed Dec 11 16:45:58 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (rb_raise_jump): call c_return hook immediately after
+	  popping `raise' frame.
+	  Patches by deivid (David Rodriguez). [Bug #8886]
+
+	* test/ruby/test_settracefunc.rb: catch up this fix.
+
+Wed Dec 11 16:01:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_reject): return a plain hash, without copying
+	  the class, default value, instance variables, and taintedness.
+	  they had been copied just by accident.
+	  [ruby-core:59045] [Bug #9223]
+
+Wed Dec 11 15:36:15 2013  Aman Gupta <ruby@tmm1.net>
+
+	* compile.c (iseq_specialized_instruction): emit opt_aset instruction
+	  to optimize Hash#[]= and Array#[]= when called with Fixnum argument.
+	  [Bug #9227] [ruby-core:58956]
+
+Wed Dec 11 04:54:03 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master ec8ed22.  Notable changes
+	  include:
+
+	  * Renamed extension_install_dir to extension_dir (backwards
+	    compatible).
+
+	  * Fixed creation of gem.deps.rb.lock file from
+	    TestGemRequestSet#test_install_from_gemdeps_install_dir
+
+	  * Fixed a typo and some documentation.
+
+	* test/rubygems:  ditto.
+
+Wed Dec 11 03:18:08 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* insns.def: Fix optimization bug of Float#/ [Bug #9238]
+
+Tue Dec 10 23:58:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/date/date_strptime.c (date__strptime_internal): unset
+	  case-insensitive flag for [:alpha:], which already implies both
+	  cases, to get rid of backtrack explosion.  [ruby-core:58984]
+	  [Bug #9221]
+
+Tue Dec 10 23:44:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_hash): add salt to differentiate false and empty
+	  array.  [ruby-core:58993] [Bug #9231]
+
+	* hash.c (rb_any_hash, rb_hash_hash): ditto.
+
+Tue Dec 10 18:16:09 2013  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* man/ruby.1: [DOC] Use www.ruby-toolbox.com instead of RAA.
+
+Tue Dec 10 17:21:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (wmap_finalize, wmap_aset_update): use simple malloced array
+	  instead of T_ARRAY, to reduce GC pressure.
+
+Tue Dec 10 15:56:48 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (reflist_add): revert changes from r44109. it is unnecessary
+	  after r44113
+	* gc.c (allrefs_i): fix whitespace
+	* gc.c (allrefs_roots_i): fix whitespace
+
+Tue Dec 10 15:46:03 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (allrefs_add): push obj only if allrefs table doesn't have
+	  obj.
+
+	* gc.c (allrefs_roots_i): ditto.
+
+Tue Dec 10 15:28:10 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (RGENGC_CHECK_MODE): separate checkers to different modes.
+	  * 2: enable generational bits check (for debugging)
+	  * 3: enable livness check
+	  * 4: show all references
+
+Tue Dec 10 15:15:37 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_marks_check): disable GC during checking and
+	  restore malloc_increase info.
+
+Tue Dec 10 14:41:53 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (reflist_add): return 0 if reference already exists
+	* gc.c (allrefs_add): return 1 on newly added references
+	* gc.c (allrefs_i): follow references to construct complete object
+	  graph. before this patch, RGENGC_CHECK could fail to verify some WB
+	  miss issues. [Bug #9226] [ruby-core:58959]
+
+Tue Dec 10 11:20:56 2013  Aman Gupta <ruby@tmm1.net>
+
+	* ext/objspace/objspace_dump.c (dump_object): include fstring flag on
+	  strings. include gc flags (old, remembered, wb_protected) on all objects.
+	* ext/objspace/objspace_dump.c (Init_objspace_dump): initialize lazy
+	  IDs before first use.
+	* gc.c (rb_obj_gc_flags): new function to retrieve object flags
+	* internal.h (RB_OBJ_GC_FLAGS_MAX): maximum flags allowed for one obj
+	* test/objspace/test_objspace.rb (test_dump_flags): test for above
+	* test/objspace/test_objspace.rb (test_trace_object_allocations):
+	  resolve name before dump (for rb_class_path_cached)
+
+Tue Dec 10 07:48:29 2013  Aman Gupta <ruby@tmm1.net>
+
+	* vm_method.c (rb_clear_method_cache_by_class): fire
+	  ruby::method-cache-clear probe on global or klass-level method cache
+	  clear [Bug #9190]
+	* probes.d (provider ruby): new dtrace probe
+	* doc/dtrace_probes.rdoc: docs for new probe
+	* test/dtrace/test_method_cache.rb: test for new probe
+
+Tue Dec 10 06:14:11 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/.document:  Remove curses from documentable directories.
+
+Tue Dec 10 04:55:36 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/lib/openssl/digest.rb: Deprecate OpenSSL::Digest::Digest
+	  [Fixes GH-446] https://github.com/ruby/ruby/pull/446
+
+Tue Dec 10 00:41:42 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/thread/thread.c: [DOC] add call-seq alias for Queue#enq, #<<, etc.
+
+	* ext/thread/thread.c (Init_thread): use rb_define_alias instead of
+	  rb_alias to document alias.
+
+Mon Dec  9 20:00:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* internal.h (RCLASS_SERIAL): Add RCLASS_SERIAL as a convenience
+	  accessor for RCLASS_EXT(klass)->class_serial.
+
+	* class.c, vm_insnhelper.c, vm_method.c: Use RCLASS_SERIAL
+
+Mon Dec  9 19:50:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* compile.c, insns.def, test/ruby/test_rubyvm.rb, vm.c, vm_core.h,
+	  vm_insnhelper.c, vm_insnhelper.h, vm_method.c: Rename method_serial
+	  to global_method_state and constant_serial to global_constant_state
+	  after discussion with ko1.
+
+Mon Dec  9 18:50:43 2013  Aman Gupta <ruby@tmm1.net>
+
+	* hash.c (rb_hash_replace): fix segv on `{}.replace({})` introduced
+	  in r44060 [Bug #9230] [ruby-core:58991]
+	* test/ruby/test_hash.rb: regression test for above
+
+Mon Dec  9 18:10:10 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (vm_stat): renamed from ruby_vm_stat.
+	  Should not use ruby_ prefix here.
+
+Mon Dec  9 16:13:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (wmap_size): add ObjectSpace::WeakMap#size and #length.
+
+Mon Dec  9 15:26:17 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/test_curses.rb: removed.
+
+Mon Dec  9 13:36:55 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/curses, sample/curses: removed curses.
+
+	* NEWS: added an entry for the above change.
+
+Mon Dec  9 12:26:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/objspace/object_tracing.c (newobj_i): use cached class path
+	  only to get rid object allocation during NEWOBJ hook.
+	  [ruby-core:58853] [Bug #9212]
+
+	* variable.c (rb_class_path_cached): returns cached class path
+	  only, without searching and allocating new class path string.
+
+Mon Dec  9 11:14:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/date/date_parse.c (parse_time): unset case-insensitive flag
+	  for [:alpha:], which already implies both cases, to get rid of
+	  backtrack explosion.  [ruby-core:58876] [Bug #9221]
+
+Mon Dec  9 08:40:40 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master bf37240.  Fixes useless
+	  error message with `gem install -g` with no gem dependencies file.
+	* test/rubygems:  ditto.
+
+Mon Dec  9 04:52:25 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* NEWS:  Update RubyGems entry with notable features.
+
+Mon Dec  9 04:43:54 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/.document:  Add syslog/lib and thread/thread.c to documentable
+	  items.  [ruby-trunk - Bug #9228]
+
+Mon Dec  9 04:28:50 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 096db36.  Changes include
+	  support for PATH in Gemfile.lock and a typo fix from Akira Matsuda.
+	* test/rubygems:  ditto.
+
+Mon Dec  9 02:10:32 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/responses.rb:
+	  Add `HTTPIMUsed`, as it is also supported by rack/rails.
+	  RFC - http://tools.ietf.org/html/rfc3229
+	  by Vipul A M <vipulnsward@gmail.com>
+	  https://github.com/ruby/ruby/pull/447 fix GH-447
+
+Sun Dec  8 20:47:35 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_get_kwargs): when values is non-null, remove
+	  extracted keywords from the rest keyword argument.
+
+Sun Dec  8 20:26:54 2013  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* common.mk (ruby.imp): avoid circular dependency on AIX
+
+Sun Dec  8 20:21:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bigdecimal.c (BigDecimal_coerce): convert a Float to a BigDecimal instead
+	  of converting the receiver to a Float.  The reason is there are BigDecimal
+	  instances with precisions that is smaller than the Float's precision.
+	  [ruby-core:58756] [Bug #9192]
+
+	* test/bigdecimal/test_bigdecimal.rb: add tests for the above change.
+
+Sun Dec  8 18:28:20 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* NEWS: [DOC] update NEWS about GC.
+
+Sun Dec  8 17:52:24 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* object.c: [DOC] document Module#singleton_class?.
+
+Sun Dec  8 16:19:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_get_kwargs): if optional is negative, unknown
+	  keywords are allowed.
+
+	* vm_insnhelper.c (vm_callee_setup_keyword_arg): check unknown
+	  keywords.
+
+Sun Dec  8 14:55:12 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* array.c (rb_ary_shuffle_bang, rb_ary_sample): rename local variables.
+
+Sun Dec  8 13:59:38 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* array.c (rb_ary_shuffle_bang, rb_ary_sample): check
+	  unknown keywords.
+
+	* test/ruby/test_array.rb (test_shuffle, test_sample): tests for
+	  the above.
+
+Sun Dec  8 13:01:11 2013  Aman Gupta <ruby@tmm1.net>
+
+	* vm.c (ruby_vm_stat): add RubyVM.stat() for access to internal cache
+	  counters. this methods behaves like GC.stat, accepting an optional
+	  hash or symbol argument. [Bug #9190] [ruby-core:58750]
+	* test/ruby/test_rubyvm.rb: test for new method
+
+Sun Dec  8 11:59:40 2013  Aman Gupta <ruby@tmm1.net>
+
+	* hash.c (rb_hash_replace): add a write barrier to fix GC mark miss on
+	  hashes using Hash#replace [Bug #9226] [ruby-core:58948]
+
+Sun Dec  8 11:21:00 2013  Aman Gupta <ruby@tmm1.net>
+
+	* include/ruby/ruby.h: add RGENGC_WB_PROTECTED_NODE_CREF setting
+	  In a large app, this reduces the size of
+	  remembered_shady_object_count by 80%. [Bug #9225] [ruby-core:58947]
+	* gc.c (rb_node_newnode): add FL_WB_PROTECTED flag to NODE_CREF
+	* class.c (rewrite_cref_stack): insert OBJ_WRITE for NODE_CREF
+	* iseq.c (set_relation): ditto
+	* iseq.c (rb_iseq_clone): ditto
+	* vm_eval.c (rb_yield_refine_block): ditto
+	* vm_insnhelper.c (vm_cref_push): ditto
+	* vm_insnhelper.h (COPY_CREF): ditto
+
+Sun Dec  8 10:45:05 2013  Aman Gupta <ruby@tmm1.net>
+
+	* hash.c (hash_aset_str): revert r43870 due to performance issue
+	  [Bug #9188] [ruby-core:58730]
+	* parse.y (assoc): convert literal string hash keys to fstrings
+	* test/ruby/test_hash.rb (class TestHash): expand test
+
+Sun Dec  8 10:22:38 2013  Aman Gupta <ruby@tmm1.net>
+
+	* parse.y (register_symid_str): use fstrings in symbol table
+	  [Bug #9171] [ruby-core:58656]
+	* parse.y (rb_id2str): ditto
+	* string.c (rb_fstring): create frozen_strings on first usage. this
+	  allows rb_fstring() calls from the parser (before cString is created)
+	* string.c (fstring_set_class_i): set klass on fstrings generated
+	  before cString was defined
+	* string.c (Init_String): convert frozen_strings table to String
+	  objects after boot
+	* ext/-test-/symbol/type.c (bug_sym_id2str): expose rb_id2str()
+	* test/-ext-/symbol/test_type.rb (module Test_Symbol): verify symbol
+	  table entries are fstrings
+
+Sun Dec  8 10:24:20 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Update version for upcoming ruby 2.1.0 RC.
+
+Sun Dec  8 10:21:36 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 14749ce.  This fixes bugs
+	  handling of gem dependencies lockfiles (Gemfile.lock).
+
+	* test/rubygems:  ditto.
+
+Sun Dec  8 09:40:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* array.c (rb_ary_or): use RHASH_TBL_RAW instead of RHASH_TBL
+
+	* process.c (rb_execarg_fixup): use RHASH_TBL_RAW and insert write
+	  barriers where appropriate
+
+	* vm.c (kwmerge_i): use RHASH_TBL_RAW
+
+	* vm.c (HASH_ASET): use rb_hash_aset instead of calling directly into
+	  st_insert
+
+Sat Dec  7 11:15:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_reject): copy unrejected elements only to new hash,
+	  so that the change on the original receiver can affect.
+	  [ruby-core:58914] [Bug #9223]
+
+Sat Dec  7 08:25:00 2013  Richo Healey  <richo@psych0tik.net>
+
+	* test/ruby/test_struct.rb: Add regression test for question marks and
+	  bangs in struct members. [Closes GH-468]
+
+Fri Dec  6 19:33:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_extract_keywords, rb_get_kwargs): move from
+	  vm_insnhelper.c.
+
+Fri Dec  6 19:18:02 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change oldmalloc meaning.
+	  Increase oldmalloc_increase with malloc_increase
+	  instead of using obj_memsize_of().
+
+	  This change will avoid the danger of memory full without major GC.
+
+Fri Dec  6 19:08:48 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (atomic_sub_nounderflow): not 0 but val itself.
+
+Fri Dec  6 18:37:11 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_alloc, Init_heap): initialize
+	  oldmalloc_increase_limit at Init_heap.
+
+	  rb_objspace_alloc() is not called on some platforms.
+
+Fri Dec  6 18:33:39 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (garbage_collect_body): bug fix.
+	  initialize after recording.
+
+Fri Dec  6 17:49:46 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (atomic_sub_nounderflow): added to simplify atomic sub with
+	  care about underflow.
+
+	* gc.c (objspace_malloc_increase): use it.
+
+Fri Dec  6 17:10:44 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (rb_get_kwargs): get keyword argument values from an
+	  option hash, not only checking keys.
+
+	* dir.c (dir_initialize): use rb_get_kwargs.
+
+	* gc.c (gc_start_internal): ditto.
+
+Fri Dec  6 16:47:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-brace-to-do-end): split single line block.
+
+	* misc/ruby-mode.el (ruby-do-end-to-brace): shrink single line block
+	  to one line.
+
+Fri Dec  6 16:16:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_start_internal): do not use rb_gc_start() and rb_gc().
+
+Fri Dec  6 15:24:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_start_internal, rb_gc): do not need
+	  heap_pages_free_unused_pages() here.
+	  It was done in after_sweep().
+
+	* gc.c (rb_gc): The reason is now GPR_FLAG_CAPI.
+
+Fri Dec  6 14:05:19 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (gc_start_internal): GC.start() now accepts two optional
+	  keyword arguments. These can be used to disable full_mark (minor
+	  mark only) or disable immediate_sweep (use lazy sweep). These new
+	  options are useful for benchmarking GC behavior, or performing minor
+	  GC out-of-band.
+	* test/ruby/test_gc.rb (class TestGc): tests for new options.
+
+Fri Dec  6 11:51:28 2013  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/erb.rb: [DOC] fix broken link, Use rubygems.org and www.ruby-toolbox.com instead of RAA.
+	  [Bug #9197]
+
+Fri Dec  6 10:50:54 2013  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/webrick/httprequest.rb: [DOC] Fix broken link of CGI specification by @udzura [fix GH-466]
+
+Thu Dec  6 01:27:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec):
+	  treat 0.0 and -0.0 of floating-point numbers specially for an optimization
+	  and to correctly propagate its signbit to the result.
+	  [Bug #9214] [ruby-core:58858]
+
+	* test/bigdecimal/test_bigdecimal.rb: add tests case for the above change.
+
+	* test/bigdecimal/test_bigdecimal_util.rb: ditto.
+
+Thu Dec  5 22:18:01 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (configuration): strip destdir part from prefix to get
+	  rid of duplication.  a patch by arton at [ruby-core:58859].
+	  [ruby-core:58856] [Bug #9213]
+
+Thu Dec  5 21:53:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_or): lhs elements are preferred, so should not
+	  replace with rhs elements.
+
+	* test/ruby/test_array.rb (test_OR_in_order): import the test failed
+	  by r43969 from rubyspec/core/array/union_spec.rb.
+
+Thu Dec  5 21:05:42 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_info_decode): fix to avoid syntax error on VS2012.
+
+Thu Dec  5 19:35:35 2013  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* st.c: tweaked comment
+
+Thu Dec  5 19:21:10 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (struct rb_objspace): rename internal last_collection_flags to
+	  latest_gc_info
+	* gc.c (gc_latest_collection_info): add GC.latest_gc_info() with similar
+	  behavior to GC.stat()
+	* gc.c (rb_gc_latest_gc_info): new c-api for above
+	* gc.c (gc_stat_internal): remove :last_collection_flags from GC.stat
+	* gc.c (gc_profile_decode_flags): remove GC::Profiler.decode_flags
+	* include/ruby/intern.h (rb_gc_latest_gc_info): export new c-api
+	* test/ruby/test_gc.rb (class TestGc): test for new behavior
+	* NEWS: note about new api
+
+	* gc.c (gc_stat_internal): raise TypeError on wrong type
+	* gc.c (gc_stat): fix error message
+
+Thu Dec  5 18:18:08 2013  Aman Gupta <ruby@tmm1.net>
+
+	* ext/objspace/gc_hook.c: remove this file
+	* ext/-test-/tracepoint/gc_hook.c: new filename for above
+	* ext/objspace/objspace.c: remove ObjectSpace.after_gc_start_hook=
+	* test/objspace/test_objspace.rb: remove test
+	* test/-ext-/tracepoint/test_tracepoint.rb: add above test for
+	  tracepoint re-entry
+
+Thu Dec  5 17:44:53 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change function names vm_ prefix to objspace_ prefix.
+	  They are objspace_ functionality.
+
+Thu Dec  5 16:11:04 2013  Aman Gupta <ruby@tmm1.net>
+
+	* include/ruby/intern.h: add rb_gc_stat() for access to GC.stat
+	  variables from c-api
+	* gc.c (rb_gc_stat): new c-api method. accepts either VALUE hash like
+	  GC.stat, or VALUE symbol key and returns size_t directly. the second
+	  form is useful to avoid allocations, i.e. for usage inside
+	  INTERNAL_EVENT_GC tracepoints.
+	* gc.c (gc_stat): add GC.stat(:key) to return single value instead of hash
+	* gc.c (gc_stat_internal): helper method to retrieve single or all stat values
+	* test/ruby/test_gc.rb (class TestGc): test for new behavior
+	* NEWS: note about this new api
+
+Thu Dec  5 14:40:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash): revert r43981 and bail out to the outermost frame
+	  when recursion is detected.
+
+Thu Dec  5 13:47:15 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (vm_malloc_size): added.
+	  return malloc_usable_size() if possible.
+
+	* gc.c (MALLOC_ALLOCATED_SIZE): add new setting macro to enable
+	  GC.allocated_size.
+	  If platform supports `malloc_usable_size()' (or similar one),
+	  GC.allocated_size can be implemented with this function.
+	  Default is 0.
+
+	* gc.c (vm_xmalloc, vm_xrealloc, vm_xfree): use vm_malloc_size()
+	  to detect collect allocated size.
+
+	* gc.c (vm_malloc_increase): refactoring.
+
+Thu Dec  5 13:19:03 2013  Aman Gupta <ruby@tmm1.net>
+
+	* include/ruby/ruby.h: remove INTERNAL_EVENT_GC_END and replace with
+	  two new events: GC_END_MARK and GC_END_SWEEP
+	* gc.c (gc_after_sweep): emit GC_END_SWEEP after lazy sweep is done
+	* gc.c (gc_marks_body): emit GC_END_MARK at end of minor/major mark
+	* ext/-test-/tracepoint/tracepoint.c (struct tracepoint_track): tests
+	  for new events.
+	* test/-ext-/tracepoint/test_tracepoint.rb (class TestTracepointObj):
+	  ditto.
+	* NEWS: remove ObjectSpace.after_gc_*_hook. These are only a sample,
+	  and will be removed before ruby 2.1.
+	* ext/objspace/gc_hook.c: remove ObjectSpace.after_gc_end_hook=
+
+Thu Dec  5 10:47:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby_atomic.h (ATOMIC_PTR_EXCHANGE): atomic exchange function for
+	  a generic pointer.
+
+Thu Dec  5 10:47:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (finalize_deferred): flush all deferred finalizers while other
+	  finalizers can get ready to run newly by lazy sweep.
+	  [ruby-core:58833] [Bug #9205]
+
+Thu Dec  5 09:07:59 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (ruby_gc_set_params): Accept safe_level argument so GC tuning
+	  settings can be applied before rb_safe_level() is available.
+	* internal.h (rb_gc_set_params): ditto.
+	* ruby.c (process_options): Apply GC tuning early during boot process
+	  so boot-time allocations can benefit. This also benefits any code
+	  loaded in via `ruby -r`.
+
+Wed Dec  4 13:02:13 2013  Aman Gupta <ruby@tmm1.net>
+
+	* vm_trace.c (rb_suppress_tracing): Fix initialization of stack
+	  allocated rb_trace_arg_t structure. Without this patch, sometimes
+	  INTERNAL_EVENT_GC would be skipped accidentally inside
+	  rb_threadptr_exec_event_hooks_orig().
+
+Wed Dec  4 12:57:24 2013  Aman Gupta <ruby@tmm1.net>
+
+	* string.c (fstr_update_callback): Improve implementation in r43968
+	  based on feedback from @nagachika. In the existing case, we can
+	  return ST_STOP to prevent any hash modification. In the !existing
+	  case, set both key and value to the fstr.
+
+Wed Dec  4 12:47:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator#method_missing): ignore the target if not
+	  set, and delegate to global methods.  [ruby-core:58572] [Bug #9155]
+
+	* lib/delegate.rb (Delegator#respond_to_missing): ditto.
+
+	* lib/delegate.rb (SimpleDelegator#__getobj__): yield and return if
+	  not delegated but a block is given, like as Hash#fetch.
+
+	* lib/delegate.rb (DelegateClass#__getobj__): ditto.
+
+Tue Dec  3 23:48:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check malloc_size() availability.
+
+	* gc.c: use malloc_size() with malloc/malloc.h if available.
+
+Tue Dec  3 23:06:20 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* object.c (rb_obj_clone): don't copy FL_WB_PROTECTED of a
+	  original object.
+
+Tue Dec  3 22:32:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_recursive): make similar (recursive) constructs
+	  return same hash value.  execute recursively, and rewind to the
+	  topmost frame with an object which .eql? to the recursive
+	  object, if recursion is detected.
+
+	* hash.c (rb_hash): detect recursion for all `hash' methods.  each
+	  `hash' methods no longer need to use rb_exec_recursive().
+
+Tue Dec  3 21:53:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_catch_protect): new function similar to
+	  rb_catch_obj(), but protect from all global jumps like as
+	  rb_load_protect(), rb_protect(), etc.
+
+Tue Dec  3 20:18:46 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* object.c (rb_obj_clone): Protect FL_PROMOTED and FL_WB_PROTECTED
+	  flags of a destination object.
+
+Tue Dec  3 20:16:38 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_hash_rehash): use hash_alloc() instead of rb_hash_new(),
+	  to hide temporary object from ObjectSpace.  [Bug #9187]
+
+Tue Dec  3 17:11:47 2013  Aman Gupta <ruby@tmm1.net>
+
+	* load.c (features_index_add_single): Move loaded_features_index array values off
+	  the ruby heap. [Bug #9201] [ruby-core:58805]
+	* load.c (loaded_features_index_clear_i): Clean up off-heap array structure.
+	* vm.c (rb_vm_mark): Remove unnecessary mark_tbl for loaded_features_index.
+	  This improves minor GC time by 15% in a large application.
+
+Tue Dec  3 17:01:45 2013  Aman Gupta <ruby@tmm1.net>
+
+	* include/ruby/ruby.h (struct RClass): Add wrapper struct around
+	  RClass->m_tbl with serial. This prevents double marking method
+	  tables, since many classes/modules can share the same method table.
+	  This improves minor mark time in a large application by 30%.
+	* internal.h (struct method_table_wrapper): Define new
+	  wrapper struct with additional serial.
+	* internal.h (RCLASS_M_TBL_INIT): New macro for initializing method
+	  table wrapper and st_table.
+	* method.h (void rb_sweep_method_entry): Rename rb_free_m_table to
+	  rb_free_m_tbl for consistency
+	* .gdbinit (define rb_method_entry): Update rb_method_entry gdb helper
+	  for new method table structure.
+	* class.c: Use RCLASS_M_TBL_WRAPPER and
+	  RCLASS_M_TBL_INIT macros.
+	* class.c (rb_include_class_new): Share WRAPPER between module and
+	  iclass, so serial can prevent double marking.
+	* eval.c (rb_prepend_module): ditto.
+	* eval.c (rb_using_refinement): ditto.
+	* gc.c: Mark and free new wrapper struct.
+	* gc.c (obj_memsize_of): Count size of additional wrapper struct.
+
+Tue Dec  3 14:05:49 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_uniq_bang): remove duplicate code.
+
+Tue Dec  3 13:40:42 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (ary_add_hash): set and return values because string keys
+	  will be frozen. [ruby-core:58809] [Bug #9202]
+
+	* array.c (rb_ary_uniq_bang): ditto.
+
+	* array.c (rb_ary_or): ditto.
+
+	* array.c (rb_ary_uniq): ditto.
+
+	* test/ruby/test_array.rb: tests for above.
+
+	The patch is from normalperson (Eric Wong).
+
+Tue Dec  3 12:20:21 2013  Aman Gupta <ruby@tmm1.net>
+
+	* string.c (rb_fstring): Use st_update instead of st_lookup +
+	  st_insert.
+	* string.c (fstr_update_callback): New callback for st_update.
+
+Tue Dec  3 12:17:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/constant.rb (RDoc::Constant#documented?): workaround for
+	  NoMethodError when the original of alias is not found.
+
+Tue Dec  3 10:43:58 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/lib/openssl/buffering.rb:  Return ASCII-8BIT strings from
+	  SSLSocket methods.  [ruby-trunk - Bug #9028]
+	* test/openssl/test_ssl.rb:  Test for the above.
+
+Tue Dec  3 09:42:27 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc master 900de99.  Changes include:
+
+	  Fixed documentation display of constants
+
+	  Fixed handling of unknown parsers
+
+	* test/rdoc:  ditto.
+
+Mon Dec  2 22:30:10 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* hash.c (getenv): fixed test failures introduced by r43950.
+	  [ruby-core:58774] [Bug #9195] reported by phasis68 (Heesob Park).
+
+Mon Dec  2 21:49:19 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_rehash): make temporary st_table under the control
+	  of GC. [Bug #9187]
+
+	* test/ruby/test_hash.rb: add a test for above.
+
+Mon Dec  2 17:23:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* variable.c (rb_mod_constants): when calling Module#constants with
+	  inherit=false, there is no need to use a hashtable to deduplicate
+	  constant names. [Feature #9196] [ruby-core:58786]
+
+Mon Dec  2 14:16:52 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/smtp.rb (Net::SMTP#critical):  Always return a
+	  Net::SMTP::Response.  Patch by Pawel Veselov.
+	  [ruby-trunk - Bug #9125]
+	* test/net/smtp/test_smtp.rb:  Test for the above.
+
+Mon Dec  2 05:52:33 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master baa965b.  Notable changes:
+
+	  Copy directories to lib/ when installing extensions.  This completes
+	  the fix for [ruby-trunk - Bug #9106]
+
+	* test/rubygems:  ditto.
+
+Mon Dec  2 02:03:47 2013  Shota Fukumori  <her@sorah.jp>
+
+	* test/ruby/test_case.rb (test_nomethoderror):
+	  Add test related to r43913, r43914
+
+Mon Dec  2 00:53:01 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* hash.c (getenv): use ANSI codepage version of getenv() for miniruby
+	  on Windows.
+	  [ruby-core:58732] [Bug #9189] reported by phasis68 (Heesob Park).
+
+Sun Dec  1 22:14:27 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/contributors.rdoc: [DOC] Import contributors from redmine wiki
+	  Many wiki pages have become outdated and spam-ridden, we will import
+	  these to trunk and begin maintaining them in ruby-trunk. This will
+	  also allow new contributors to easily contribute patches to update
+	  these pages, where previously a redmine account with wiki access was
+	  required. Another bonus is having a contributors file to show thanks
+	  to all of the people who have submitted a patch to Ruby.
+
+Sun Dec  1 18:03:26 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/maintainers.rdoc: [DOC] Current maintainers of Ruby
+
+Sun Dec  1 17:17:36 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/contributing.rdoc: [DOC] Current branch maintainers
+
+Sun Dec  1 17:16:36 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/contributing.rdoc: [DOC] Reporting other (ruby-lang.org) issues
+
+Sun Dec  1 17:15:51 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/contributing.rdoc: [DOC] Current platform maintainers
+
+Sun Dec  1 17:14:55 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/contributing.rdoc: [DOC] Reporting downstream distro issues
+
+Sun Dec  1 14:37:20 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_to_a): specify array capa.
+
+Sun Dec  1 14:15:36 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_rehash): fix to free new st_table when exception
+	  is raised in do_hash(). [Bug #9187]
+
+Sun Dec  1 11:57:59 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/lib/openssl/buffering.rb: Fix warning in copyright
+
+Sun Dec  1 08:27:28 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 66e5c39.  Notable changes:
+
+	  Implement gem.deps.rb (Gemfile) .lock support
+
+	  Fixed `gem uninstall` for a relative directory in GEM_HOME.
+
+	* test/rubygems:  ditto.
+
+Sun Dec  1 06:00:49 2013  Aman Gupta <ruby@tmm1.net>
+
+	* test/ruby/test_gc.rb (test_gc_reason): Force minor GC by consuming
+	  free slots to fix test.
+
+Sat Nov 30 21:22:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_initialize): check unknown keywords.  [ruby-dev:47152]
+	  [Bug #8060]
+
+Sat Nov 30 18:05:38 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c (hash2named_arg): correct declaration to fix
+	  build failure.  a patch by phasis68 (Heesob Park) at
+	  [ruby-core:58710].  [Bug #9184]
+
+Sat Nov 30 17:46:35 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): determine exit status and signal to terminate
+	  before finalization, to get rid of access destroyed T_DATA exception
+	  object.  [ruby-core:58643] [Bug #9167]
+
+Sat Nov 30 16:25:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (enumerator_with_index): should not store local variable
+	  address to memoize the arguments.  it is invalidated after the return.
+	  [ruby-core:58692] [Bug #9178]
+
+Sat Nov 30 13:28:13 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* siphash.c (sip_hash24): fix for aligned word access little endian
+	  platforms.  [ruby-core:58658] [Bug #9172]
+
+Sat Nov 30 13:21:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_yield_block): implement non-nil block argument.
+
+Fri Nov 29 20:59:39 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* vm_dump.c (rb_vmdebug_debug_print_pre): Bugfix. Get PC directly.
+	  PC is cached into local stack and cfp->pc is incorrect at next of
+	  branch or jump.
+	* vm_exec.h (DEBUG_ENTER_INSN): catch up this change.
+	* vm_core.h: update signature of rb_vmdebug_debug_print_pre.
+
+Fri Nov 29 20:43:57 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* compile.c: Bugsfix for dump_disasm_list.
+	  rb_inspect denies a hidden object. So, insert wrapper that creates
+	  the unhidden one.
+	  adjust->label is null sometimes.
+	  insn_data_line_no makes no sense at all.
+
+Fri Nov 29 18:06:45 2013  Shota Fukumori  <her@sorah.jp>
+
+	* test/ruby/test_case.rb (test_method_missing): Test for r43913.
+
+Fri Nov 29 17:53:22 2013  Shota Fukumori  <her@sorah.jp>
+
+	* vm_insnhelper.c (check_match): Fix SEGV with VM_CHECKMATCH_TYPE_CASE
+	  and class of `pattern` has `method_missing`
+	  [Bug #8872] [ruby-core:58606]
+
+Fri Nov 29 17:06:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_yield_block): yield block with rb_block_call_func
+	  arguments.
+
+	* range.c (range_each): use rb_yield_block.
+
+	* include/ruby/ruby.h (RB_BLOCK_CALL_FUNC_ARGLIST): constify argv.
+
+	* enum.c (rb_enum_values_pack): ditto.
+
+	* vm_eval.c (rb_block_call, rb_check_block_call): ditto.
+
+	* include/ruby/ruby.h (RB_BLOCK_CALL_FUNC_ARGLIST): for declaration
+	  argument list of rb_block_call_func.
+
+Fri Nov 29 11:26:43 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_block_call_func): add blockarg.  block
+	  function can take block argument, e.g., proc {|&blockarg| ...}.
+
+Thu Nov 28 21:43:48 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/dtrace_probes.rdoc: [DOC] Import dtrace probes doc from wiki
+
+Thu Nov 28 21:17:32 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/contributing.rdoc: [DOC] Add heading above ChangeLog tips to
+	  setup entry for commits, its not required. Actually easier if
+	  contributors don't include a ChangeLog entry.
+
+Thu Nov 28 21:16:18 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/contributing.rdoc: [DOC] Add coding style heading for patch
+	  rules
+
+Thu Nov 28 21:15:45 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/contributing.rdoc: [DOC] Add notes about deciding what to patch
+
+Thu Nov 28 19:43:45 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* benchmark/bm_hash_flatten.rb: added. r43896 is about 4 times faster
+	  than 2.0.0p353.
+
+	* benchmark/bm_hash_keys.rb: added. r43896 is about 5 times faster
+	  than 2.0.0p353.
+
+	* benchmark/bm_hash_values.rb: added. r43896 is about 5 times faster
+	  than 2.0.0p353.
+
+Thu Nov 28 19:29:04 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/contributing.rdoc: [DOC] Add notes about slideshow proposals
+	  from wiki page: HowToRequestFeatures
+
+Thu Nov 28 17:34:42 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* st.c: add st_values() and st_values_check().
+
+	* include/ruby/st.h: add prototypes for above.
+
+	* hash.c (rb_hash_values): use st_values_check() for performance
+	  improvement if VALUE and st_data_t are compatible.
+
+Thu Nov 28 17:14:14 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* st.c (st_keys): fix not to use Qundef in st.c.
+
+	* include/ruby/st.h: define modified prototype.
+
+	* hash.c (rb_hash_keys): use modified st_keys().
+
+Thu Nov 28 16:34:43 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c: Expose details about last garbage collection via GC.stat.
+	* gc.c (gc_stat): Add :last_collection_flags for reason/trigger/type of
+	  last GC run.
+	* gc.c (gc_prof_sweep_timer_stop): Record HAVE_FINALIZE GPR even
+	  without GC_PROFILE_MORE_DETAIL.
+	* gc.c (gc_profile_flags): Add GC::Profiler.decode_flags to make sense
+	  of GC.stat[:last_collection_flags]
+	* test/ruby/test_gc.rb (class TestGc): Test for above.
+
+Thu Nov 28 16:15:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_dup2): extract from rb_cloexec_dup2() and
+	  redirect_dup2().
+
+Tue Nov 28 14:40:00 2013  Akira Matsuda  <ronnie@dio.jp>
+
+	* lib/drb/ssl.rb:  [Doc] Fix typo
+
+Thu Nov 28 13:56:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (Doxyfile): tool/file2lastrev.rb needs running with
+	  BASERUBY since r43617.  [ruby-dev:47823] [Bug #9169]
+
+Thu Nov 28 09:18:39 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (rb_fstring): fstrings should be ELTS_SHARED.
+	  If we resurrect dying objects (non-marked, but not swept yet),
+	  pointing shared string can be collected.
+	  To avoid such issue, fstrings (recorded to fstring_table)
+	  should not be ELTS_SHARED (should not have a shared string).
+
+Thu Nov 28 01:35:08 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* st.c (st_keys): fix to use st_index_t for size of hash.
+
+Thu Nov 28 00:36:52 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* st.c (st_keys): define st_keys(). it writes each key to buffer.
+
+	* hash.c (rb_hash_keys): use st_keys() for performance improvement
+	  if st_data_t and VALUE are compatible.
+
+	* include/ruby/st.h: define macro ST_DATA_COMPATIBLE_P() to predicate
+	  whether st_data_t and passed type are compatible.
+
+	* configure.in: check existence of builtin function to use in
+	  ST_DATA_COMPATIBLE_P().
+
+Thu Nov 28 00:07:28 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* ruby_atomic.h: remove duplicate definitions between ATOMIC_XXX
+	  and ATOMIC_SIZE_XXX.
+
+Wed Nov 27 23:55:50 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* ruby_atomic.h: define ATOMIC_SIZE_CAS() with
+	  __atomic_compare_exchange_n() and refactoring.
+
+Tue Nov 27 21:43:00 2013  Akira Matsuda  <ronnie@dio.jp>
+
+	* lib/irb/notifier.rb:  [Doc] Fix typo
+	* ext/json/lib/json/common.rb:  Ditto.
+
+Tue Nov 27 18:04:57 2013  Akira Matsuda  <ronnie@dio.jp>
+
+	* lib/irb/notifier.rb:  Fix typo
+
+Wed Nov 27 17:54:57 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_stacked_objects): check only when check_mode > 0.
+
+Wed Nov 27 16:07:19 2013  Aman Gupta <ruby@tmm1.net>
+
+	* test/ruby/test_gc.rb (class TestGc): Fix warning in
+	  test_expand_heap.
+
+Wed Nov 27 15:55:52 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (Init_GC): Add new GC::INTERNAL_CONSTANTS for information about
+	  GC heap/page/slot sizing.
+	* test/ruby/test_gc.rb (class TestGc): test for above.
+
+Wed Nov 27 15:21:17 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (gc_page_sweep): Fix compile warning from last commit.
+	* hash.c (hash_aset_str): Re-use existing variable to avoid
+	  unnecessary pointer dereferencing.
+
+Wed Nov 27 15:12:55 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_page_sweep): disable debug print.
+
+Wed Nov 27 15:05:59 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat): add new information heap_eden_page_length and
+	  heap_tomb_page_length.
+
+	* test/ruby/test_gc.rb: fix to use GC.stat[:heap_eden_page_length]
+	  instead of GC.stat[:heap_length].
+	  This test expects `heap_eden_page_length' (used pages size).
+
+Wed Nov 27 15:02:53 2013  Aman Gupta <ruby@tmm1.net>
+
+	* test/ruby/test_eval.rb (class TestEval): Use assert_same instead of
+	  assert_equal.
+	* test/ruby/test_hash.rb (class TestHash): ditto.
+	* test/ruby/test_iseq.rb (class TestISeq): ditto.
+
+Wed Nov 27 14:50:02 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rinda/ring.rb:  Announce RingServer for the same process.
+	  [ruby-trunk - Bug #9163]
+	* test/rinda/test_rinda.rb:  Tests for the above.
+
+Wed Nov 27 14:37:33 2013  Aman Gupta <ruby@tmm1.net>
+
+	* test/ruby/test_eval.rb (class TestEval): Add test for shared eval
+	  filenames via rb_fstring().
+	* test/ruby/test_iseq.rb (class TestISeq): Add test for shared
+	  iseq labels via rb_fstring(). [Bug #9159]
+
+Wed Nov 27 14:24:55 2013  Aman Gupta <ruby@tmm1.net>
+
+	* hash.c (hash_aset_str): Use rb_fstring() to de-duplicate hash string
+	  keys. Patch by Eric Wong. [Bug #8998] [ruby-core:57727]
+	* test/ruby/test_hash.rb (class TestHash): test for above.
+
+Wed Nov 27 10:39:39 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c: Rename rb_heap_t members:
+	    used -> page_length
+	    limit -> total_slots
+
+Wed Nov 27 08:24:49 2013  Aman Gupta <ruby@tmm1.net>
+
+	* compile.c: Use rb_fstring() to de-duplicate string literals in code.
+	  [ruby-core:58599] [Bug #9159] [ruby-core:54405]
+	* iseq.c (prepare_iseq_build): De-duplicate iseq labels and source
+	  locations.
+	* re.c (rb_reg_initialize): Use rb_fstring() for regex string.
+	* string.c (rb_fstring): Handle non-string and already-fstr arguments.
+	* vm_eval.c (eval_string_with_cref): De-duplicate eval source
+	  filename.
+
+Wed Nov 27 07:13:54 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: psych version 2.0.2
+	* ext/psych/psych.gemspec: ditto
+
+Wed Nov 27 06:40:18 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: fix support for negative
+	  years.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
+	* test/psych/test_date_time.rb: test for change.
+	  Fixes: https://github.com/tenderlove/psych/issues/168
+
+Wed Nov 27 04:46:55 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: fix regexp for matching TIME
+	  strings.
+	* test/psych/test_date_time.rb: test for change.
+	  Fixes: https://github.com/tenderlove/psych/issues/171
+
+Wed Nov 27 02:26:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_new4): copy the original capacity so that memsize of
+	  frozen shared string returns correct size.
+
+Wed Nov 27 02:20:13 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_hash): should not ignore the rest of recursive
+	  constructs.
+
+	* hash.c (rb_hash_hash): ditto.
+
+	* range.c (range_hash): ditto.
+
+	* struct.c (rb_struct_hash): ditto.
+
+	* test/-ext-/test_recursion.rb (TestRecursion): separate from
+	  test/ruby/test_thread.rb.
+
+Tue Nov 26 22:43:36 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash): cut off if recursion detected to get rid of stack
+	  overflow.  [ruby-core:58567] [Bug #9151]
+
+Tue Nov 26 20:02:39 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_settracefunc.rb: add tests for a_call/a_return
+	  by Brandur <brandur@mutelight.org> [Feature #9120]
+
+Tue Nov 26 19:29:52 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: add useful config "set breakpoint pending on"
+	  for run.gdb.
+
+Tue Nov 26 19:17:47 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/object_tracing.c (newobj_i): skip class_path if class
+	  is frozen.
+
+	  rb_class_path() can modify frozen classes (and causes errors).
+	  This patch is temporary. We need no-modification/no-allocation
+	  class path function.
+
+Tue Nov 26 18:12:13 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: skip "exception check" and "reentrant check (only normal
+	  events)  for internal events.
+
+	  Reentrant check for internal events are remaining.
+
+Tue Nov 26 17:38:16 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: prohibit to specify normal events and internal events
+	  simultaneously.
+	  I will introduce special care for internal events later.
+
+	* ext/-test-/tracepoint/tracepoint.c: test this behavior.
+
+	* test/-ext-/tracepoint/test_tracepoint.rb: ditto.
+
+Tue Nov 26 16:30:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_readlink): fix buffer overflow on a long symlink. since
+	  rb_str_modify_expand() expands from its length but not its capacity,
+	  need to set the length properly for each expansion.
+	  [ruby-core:58592] [Bug #9157]
+
+Tue Nov 26 14:23:17 2013  Aman Gupta <ruby@tmm1.net>
+
+	* ext/objspace/objspace_dump.c (dump_append_string_value): Escape
+	  control characters for strict json parsers.
+	* ext/objspace/objspace_dump.c (objspace_dump): Document File/IO
+	  output option.
+
+Tue Nov 26 11:43:19 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* ruby_atomic.h: use __atomic builtin functions supported by GCC.
+	  __sync family are legacy functions now and it is recommended
+	  that new code use the __atomic functions.
+	  http://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html
+
+	* configure.in: check existence of __atomic functions.
+
+Tue Nov 26 10:57:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.gemspec: revert Gem::Specification#date
+	  for snapshot/release tarballs.
+
+Tue Nov 26 06:42:50 2013  Aman Gupta <ruby@tmm1.net>
+
+	* NEWS: Add ObjectSpace.after_gc_{start,end}_hook=
+	* ext/objspace/objspace_dump.c: [DOC] catch up dump/dump_all to r43679
+
+Tue Nov 26 04:12:10 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 612f85a.  Notable changes:
+
+	  Fixed installation and activation of git: and path: gems via
+	  Gem.use_gemdeps
+
+	  Improved documentation coverage
+
+	* test/rubygems:  ditto.
+
+Mon Nov 25 22:23:03 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/xmlrpc.rb: [DOC] Fix link to xmlrpc4r site [Bug #9148]
+	  Patch by Giorgos Tsiftsis
+
+Mon Nov 25 19:48:10 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/uri/common.rb: [DOC] typo fixes by @vipulnsward [Fixes GH-456]
+	  https://github.com/ruby/ruby/pull/456
+	* lib/uri/generic.rb: [DOC] ditto.
+
+Mon Nov 25 14:34:42 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/bigdecimal/bigdecimal.gemspec: bump BigDecimal to 1.2.3 for
+	  proper release date in RubyGems
+
+Mon Nov 25 14:25:08 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/bigdecimal/bigdecimal.gemspec: Remove Gem::Specification#date
+	  We should rely on rubygems to create the date the gem was released
+	  for each version.
+
+Mon Nov 25 06:53:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* internal.h: do not use ruby_sized_xrealloc() and ruby_sized_xfree()
+	  if HAVE_MALLOC_USABLE_SIZE (or _WIN32) is defined.
+
+	  We don't need these function if malloc_usable_size() is available.
+
+	* gc.c: catch up this change.
+
+	* gc.c: define HAVE_MALLOC_USABLE_SIZE on _WIN32.
+
+	* array.c (ary_resize_capa): do not use ruby_sized_xfree() with
+	  local variable to avoid "unused local variable" warning.
+	  This change only has few impact.
+
+	* string.c (rb_str_resize): ditto.
+
+Mon Nov 25 05:05:04 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/-ext-/tracepoint/test_tracepoint.rb: catch up GC.stat changes
+	  at r43835.
+
+Mon Nov 25 04:45:59 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: continue to change OLDSPACE -> OLDMALLOC.
+	  RGENGC_ESTIMATE_OLDSPACE -> RGENGC_ESTIMATE_OLDMALLOC.
+
+	* gc.c: add a new major GC reason GPR_FLAG_MAJOR_BY_OLDMALLOC.
+
+Mon Nov 25 04:16:09 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change terminology "..._num" to "..._slots" about slot operation.
+	  * final_num -> final_slots
+	  * objspace_live_num() -> objspace_live_slots()
+	  * objspace_limit_num() -> objspace_limit_slots()
+	  * objspace_free_num() -> objspace_free_slots()
+
+Mon Nov 25 04:03:12 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat): add internal information.
+	  * heap_swept_slot
+	  * malloc_increase
+	  * malloc_limit
+	  * remembered_shady_object
+	  * remembered_shady_object_limit
+	  * old_object
+	  * old_object_limit
+	  * oldmalloc_increase
+	  * oldmalloc_limit
+
+	* gc.c (gc_stat): rename names.
+	  * heap_live_num -> heap_live_slot
+	  * heap_free_num -> heap_free_slot
+	  * heap_final_slot -> heap_final_slot
+
+	  Quote from RDoc of GC.stat():
+	    "The contents of the hash are implementation specific and may
+	    be changed in the future."
+
+	* test/ruby/test_gc.rb: catch up this change.
+
+Mon Nov 25 03:59:45 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb: catch up last commit.
+	  Now RUBY_GC_OLDSPACE_LIMIT(...) is RUBY_GC_OLDMALLOC_LIMIT(...).
+
+Mon Nov 25 03:10:46 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change terminology OLDSPACE -> OLDMALLOC.
+	  (oldspace -> oldmalloc for variable names)
+
+	  OLDSPACE is confusing because it is not includes slots.
+	  To more clearly, rename such as (oldspace_limit -> oldmalloc_limit).
+	  It is clear that it measures (estimates) malloc()'ed size.
+
+Mon Nov 25 00:50:03 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* internal.h: use __builtin_bswap16() if possible.
+
+	* configure.in: check existence of __builtin_bswap16().
+
+Sun Nov 24 22:24:19 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigxor_int): Apply BIGLO for long in a BDIGIT expression.
+	  (bigor_int): Ditto.
+	  (bigand_int): Ditto.
+
+Sun Nov 24 18:13:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/defines.h (SIZEOF_ACTUAL_BDIGIT): Defined.
+
+	* include/ruby/ruby.h (RBIGNUM_EMBED_LEN_MAX): Use
+	  SIZEOF_ACTUAL_BDIGIT instead of SIZEOF_BDIGITS.
+	  SIZEOF_BDIGITS can be different to sizeof(BDIGIT).
+
+Sun Nov 24 13:49:08 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/defines.h: Don't use int128_t for Bignum.
+	  It's not always faster.
+
+	* bignum.c: Ditto.
+
+Sun Nov 24 10:18:15 2013  Aman Gupta <ruby@tmm1.net>
+
+	* NEWS: Add details about new debugging features and APIs.
+
+Sun Nov 24 09:37:20 2013  Andrew Vit  <andrew@avit.ca>
+
+	* lib/csv.rb: Optimize header hashes by freezing string keys.
+	  [ruby-core:58510]
+
+Sun Nov 24 09:18:06 2013  Aman Gupta <ruby@tmm1.net>
+
+	* ext/objspace/objspace_dump.c (dump_object): Use PRIuSIZE to print
+	  size_t for better win32 compatibility.
+	* test/objspace/test_objspace.rb (test_dump_all): Hold reference to
+	  test string to avoid failure due to GC. Reduce size of failure message
+	  using grep(/TEST STRING/).
+
+Sun Nov 24 08:38:00 2013  Kyle Stevens  <kstevens715@gmail.com>
+
+	* lib/csv.rb: If skip_lines is set to a String, convert it to a Regexp
+	  to prevent the alternative, which is that each line in the CSV gets
+	  converted to a Regexp when calling skip_lines#match.
+
+Sun Nov 24 01:03:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_power): Use FIX2LONG instead
+	  of FIX2INT to avoid conversion error.
+
+Sun Nov 24 00:44:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RBIGNUM_EMBED_LEN_MAX): define by macros
+	  defined in defines.h, instead of complex and repeated expression.
+
+Sat Nov 23 22:22:26 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (RBIGNUM_EMBED_LEN_MAX): Limit the value to
+	  less than 8.
+
+Sat Nov 23 19:52:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb (BigMath.E): Use BigMath.exp.
+	  [Feature #6857] [ruby-core:47130]
+
+Sat Nov 23 19:46:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Optimize the
+	  calculation algorithm to reduce the number of divisions.
+	  This optimization was proposed by Rafal Michalski.
+	  [Feature #6857] [ruby-core:47130]
+
+Sat Nov 23 19:20:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_div2): The signature was
+	  changed to allow us to pass arguments directly.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_div3): Added for the role of
+	  the old BigDecimal_div2.
+
+Sat Nov 23 12:31:00 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix global variable name.
+	  Now we have following environments (and related variable names).
+
+	  * RUBY_GC_HEAP_INIT_SLOTS
+	  * RUBY_GC_HEAP_FREE_SLOTS
+	  * RUBY_GC_HEAP_GROWTH_FACTOR (new from 2.1)
+	  * RUBY_GC_HEAP_GROWTH_MAX_SLOTS (new from 2.1)
+
+	  * obsolete
+	    * RUBY_FREE_MIN       -> RUBY_GC_HEAP_FREE_SLOTS (from 2.1)
+	    * RUBY_HEAP_MIN_SLOTS -> RUBY_GC_HEAP_INIT_SLOTS (from 2.1)
+
+	  * RUBY_GC_MALLOC_LIMIT
+	  * RUBY_GC_MALLOC_LIMIT_MAX (new from 2.1)
+	  * RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR (new from 2.1)
+
+	  * RUBY_GC_OLDSPACE_LIMIT (new from 2.1)
+	  * RUBY_GC_OLDSPACE_LIMIT_MAX (new from 2.1)
+	  * RUBY_GC_OLDSPACE_LIMIT_GROWTH_FACTOR (new from 2.1)
+
+	* test/ruby/test_gc.rb: catch up this change.
+
+Sat Nov 23 09:45:49 2013  Aman Gupta <ruby@tmm1.net>
+
+	* marshal.c (w_object): Use HASH_PROC_DEFAULT directly from internal.h
+
+Sat Nov 23 08:43:23 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c: Rename heap_pages_swept_num to heap_pages_swept_slots to
+	  clarify meaning (number of slots, not pages).
+
+Sat Nov 23 08:23:23 2013  Aman Gupta <ruby@tmm1.net>
+
+	* lib/set.rb (class SortedSet): Fix source_location for methods
+	  defined via eval.
+
+Sat Nov 23 03:44:03 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master dcce4ff.  Important changes
+	  in this commit:
+
+	  Remove automatic detection of gem dependencies files.  This prevents a
+	  security hole as described in [ruby-core:58490]
+
+	  Fixed bugs for installing git gems.
+
+	* test/rubygems:  ditto.
+
+Fri Nov 22 22:30:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_power):
+	  Round the result value only if the precision is given.
+
+Fri Nov 22 17:20:50 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* transcode.c (str_transcode0): don't scrub invalid chars if
+	  str.encode doesn't have explicit invalid: :replace.
+	  workaround fix for see #8995
+
+Fri Nov 22 17:11:26 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* include/ruby/intern.h, internal.h: Expose rb_gc_count().
+
+Fri Nov 22 17:07:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.gemspec: version 1.2.2.
+
+Fri Nov 22 17:04:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_data_type):
+	  Use RUBY_TYPED_FREE_IMMEDIATELY only if it is available.
+
+Fri Nov 22 16:49:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_power): Round the result value.
+	  [Bug #8818] [ruby-core:56802]
+
+	* test/bigdecimal/test_bigdecimal.rb: Add a test for the above fix.
+
+Fri Nov 22 16:25:43 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (heap_set_increment): accept minimum additional page number.
+
+	* gc.c (gc_after_sweep): allocate pages to allocate at least
+	   RUBY_HEAP_MIN_SLOTS.
+	   [Bug #9137]
+
+Fri Nov 22 16:19:52 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* include/ruby/intern.h (rb_gc_set_params): Deprecate
+	  rb_gc_set_params because it's only used in ruby internal.
+
+	* internal.h (ruby_gc_set_params): Declare rb_gc_set_params's
+	  alias function.
+
+	* gc.c: ditto.
+
+	* ruby.c: use ruby_gc_set_params.
+
+Fri Nov 22 14:55:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Insert rb_thread_check_ints.
+
+Fri Nov 22 14:35:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Fix the inserting points
+	  of RB_GC_GUARDs.
+
+Fri Nov 22 14:31:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c: Fix indentation.
+
+Fri Nov 22 14:03:00 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf: merge nkf 2.1.3 2a2f2c5.
+
+Fri Nov 22 12:43:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_strtod): ignore too long fraction part, which does not
+	  affect the result.
+
+Fri Nov 22 12:17:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#initialize):
+	  initialize of a module should pass arguments to super.
+
+Fri Nov 22 12:02:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_settracefunc.rb: Ignore events from other threads.
+
+Fri Nov 22 10:35:57 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (ruby_vm_destruct): do not use ruby_xfree() after freeing
+	  objspace.
+
+	* gc.c (ruby_mimfree): added. It is similar to ruby_mimmalloc().
+
+	* internal.h: ditto.
+
+Fri Nov 22 09:42:35 2013  Zachary Scott  <e@zzak.io>
+
+	* test/digest/test_digest.rb: Reverse order of assert_equal
+	  Reported by @splattael
+
+Fri Nov 22 09:03:16 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c: fix build failure on FreeBSD introduced by r43763.
+	  malloc_usable_size() is defined by malloc_np.h on FreeBSD.
+
+	* configure.in: check malloc.h and malloc_np.h.
+
+Fri Nov 22 08:27:13 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 50a8210.  Important changes
+	  in this commit:
+
+	  RubyGems now automatically checks for gem.deps.rb or Gemfile when
+	  running ruby executables.  This behavior is similar to `bundle exec
+	  rake`.  This change may be reverted before Ruby 2.1.0 if too many bugs
+	  are found.
+
+	* test/rubygems:  ditto.
+
+Thu Nov 21 22:33:59 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: RGENGC_CHECK_MODE should be 0.
+
+Thu Nov 21 21:40:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (VpAlloc): Fix the expr to adjust the size
+	  of the digit array.
+
+Thu Nov 21 21:36:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_sqrt): Fix the precision of
+	  the result BigDecimal of sqrt.
+	  [Bug #5266] [ruby-dev:44450]
+
+	* test/bigdecimal/test_bigdecimal.rb: add tests for the above changes.
+
+Thu Nov 21 18:49:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (vm_xrealloc, vm_xfree): use malloc_usable_size() to obtain old
+	  size if available.
+
+Thu Nov 21 18:47:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/delegate.rb (SimpleDelegator#__getobj__): target object must be set.
+
+	* lib/delegate.rb (DelegateClass#__getobj__): ditto.
+
+Thu Nov 21 18:28:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#initialize): use class method to get rid
+	  of warnings when $VERBOSE.
+
+Thu Nov 21 17:43:29 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename initial_xxx variables to gc_params.xxx.
+	  They are not only used initial values.
+
+	  Chikanaga-san: Congratulations on RubyPrize!
+
+Thu Nov 21 17:16:00 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: enable "RGENGC_ESTIMATE_OLDSPACE" option as default.
+	  Without this option, some application consumes huge memory.
+	  (and there are only a few performance down)
+
+	  Introduced new environment variables:
+	  * RUBY_GC_HEAP_OLDSPACE (default 16MB)
+	  * RUBY_GC_HEAP_OLDSPACE_MAX (default 128 MB)
+	  * RUBY_GC_HEAP_OLDSPACE_GROWTH_FACTOR (default 1.2)
+
+	* gc.c (initial_malloc_limit): rename to initial_malloc_limit_min.
+
+Thu Nov 21 16:51:34 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/digest/bubblebabble/bubblebabble.c: Teach RDoc digest/bubblebabble
+
+Thu Nov 21 16:50:16 2013  Zachary Scott  <e@zzak.io>
+
+	* test/digest/test_digest.rb: Add more tests for digest/bubblebabble
+
+Thu Nov 21 16:32:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator#method_missing): try private methods defined in
+	  Kernel after the target.  [Fixes GH-449]
+
+Thu Nov 21 16:25:08 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/uri/test_generic.rb (URI#test_merge): Test uri + URI(path)
+	  in addition to uri + path.
+
+Thu Nov 21 15:36:08 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/lib/openssl/buffering.rb: [DOC] Fix HEREDOC comment for
+	  OpenSSL::Buffering which breaks overview because of RDoc bug
+
+Thu Nov 21 14:46:57 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval_intern.h (SAVE_ROOT_JMPBUF): workaround for the failure of
+	  test/ruby/test_exception.rb on Windows.
+	  wrap by __try and __exception statements on mswin to raise SIGSEGV
+	  when EXCEPTION_STACK_OVERFLOW is occurred, because MSVCRT doesn't
+	  handle the exception.
+	  however, (1) mingw-gcc doesn't support __try and __exception
+	  statements, and (2) we cannot retry SystemStackError after this
+	  change yet (maybe crashed) because SEH and longjmp() are too
+	  uncongenial.
+
+	* signal.c (check_stack_overflow, CHECK_STACK_OVERFLOW): now defined on
+	  Windows, too.
+
+	* thread_win32.c (ruby_stack_overflowed_p): ditto.
+
+Thu Nov 21 14:18:24 2013  Zachary Scott  <e@zzak.io>
+
+	* object.c: [DOC] Clarify Object#dup vs #clone [Bug #9128]
+	  Moving existing doc for this comparison to separate section of #dup
+	  Adding examples to document behavior of #dup with Module#extend.
+	  Based on a patch by stevegoobermanhill
+
+Thu Nov 21 14:06:02 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_marks_check): do not dump all refs.
+
+	* gc.c (allrefs_dump_i): fix output format.
+
+Thu Nov 21 13:43:07 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change RGENGC_CHECK_MODE (>= 2) logic.
+	  Basically, make an object graph of all of living objects before and
+	  after marking and check status.
+
+	  [Before marking: check WB sanity]
+	  If there is a non-old object `obj' pointed from old object
+	  (`parent') then `parent' or `obj' should be remembered.
+
+	  [After marking: check marking miss]
+	  Traversible objects with the object graph should be marked.
+	  (However, this alert about objects pointed by machine context
+	   can be false positive. We only display alert.)
+
+	  [Implementation memo]
+	  objspace_allrefs() creates an object graph.
+	  The object graph is represented by st_table, key is object (VALUE)
+	  and value is referring objects. Referring objects are stored by
+	  "struct reflist".
+
+	* gc.c (init_mark_stack): do not use push_mark_stack_chunk() at init.
+	  This pre-allocation causes failure on is_mark_stack_empty()
+	  without any pushing.
+
+Thu Nov 21 13:40:20 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/observer.rb: [DOC] Clarify default observer method.
+	  By @edward [Fixes GH-450] https://github.com/ruby/ruby/pull/450
+
+Thu Nov 21 13:32:53 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_engine.c: [DOC] Documentation for OpenSSL::Engine
+	  This patch is based off work by @vbatts in GH-436 completing the
+	  documentation for this class and its methods.
+	  https://github.com/ruby/ruby/pull/436
+
+Thu Nov 21 10:45:22 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/lib/openssl/buffering.rb: Remove unused arguments from
+	  OpenSSL::Buffering.new [Fixes GH-445]
+
+Thu Nov 21 10:30:47 2013  Zachary Scott  <e@zzak.io>
+
+	* test/digest/test_digest.rb: Add test for Digest::SHA256.bubblebabble
+
+Wed Nov 20 20:54:01 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* tool/instruction.rb : fix typo.
+
+Wed Nov 20 19:45:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (rand_init): Make it possible to specify arbitrary array
+	  for init_genrand().
+
+Wed Nov 20 17:34:13 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (rb_gc_mark_symbols): set global_symbols.minor_marked only
+	  when full_mark is 0.
+	  rb_gc_mark_symbols() (with full_mark == 1) can be called by other
+	  than GC (such as rb_objspace_reachable_objects_from_root()).
+
+Wed Nov 20 11:46:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: merge JSON 1.8.1.
+	  https://github.com/nurse/json/compare/002ac2771ce32776b32ccd2d06e5604de6c36dcd...e09ffc0d7da25d0393873936c118c188c78dbac3
+	* Remove Rubinius exception since transcoding should be working now.
+	* Fix https://github.com/flori/json/issues/162 reported by Marc-Andre
+	  Lafortune <github_rocks@marc-andre.ca>. Thanks!
+	* Applied patches by Yui NARUSE <naruse@airemix.jp> to suppress
+	  warning with -Wchar-subscripts and better validate UTF-8 strings.
+	* Applied patch by ginriki@github to remove unnecessary if.
+	* Add load/dump interface to JSON::GenericObject to make
+	  serialize :some_attribute, JSON::GenericObject
+	  work in Rails active models for convenient
+	  SomeModel#some_attribute.foo.bar access to serialised JSON data.
+
+Wed Nov 20 01:39:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/constant.rb (RDoc::Constant#documented?): workaround for
+	  NoMethodError when the original of alias is not found.
+
+Tue Nov 19 23:38:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (--with-os-version-style): option to transform target
+	  OS version string.
+
+Tue Nov 19 21:27:33 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/net/http/utils.rb (spawn_server): Specify zero for port to
+	  avoid reusing an allocated port.
+
+	* test/net/http/test_http.rb: Don't specify port here.
+
+	* test/net/http/test_https.rb: Ditto.
+
+Tue Nov 19 18:52:10 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (heap_is_swept_object): use heap_page::before_sweep flag.
+
+Tue Nov 19 18:49:32 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_reachable_objects_from_root): do major marking.
+
+Tue Nov 19 18:45:40 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_resurrect): added.
+	  rb_fstring() used rb_gc_mark() to avoid freeing used string.
+	  However, rb_gc_mark() set mark bit *and* pushes mark_stack.
+	  rb_gc_resurrect() does only set mark bit if it is before sweeping.
+
+	* string.c (rb_fstring): use rb_gc_resurrect.
+
+	* internal.h: add decl.
+
+Tue Nov 19 09:47:02 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc master a1195ce.  Changes include:
+
+	  Improved accessibility of the main sidebar navigation.
+
+	  Fixed handling of regexp options in HTML source highlighting.
+
+	* test/rdoc:  ditto.
+
+Tue Nov 19 09:33:52 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 6a3d9f9.  Changes include:
+
+	  Compatibly renamed Gem::DependencyResolver to Gem::Resolver.
+
+	  Added support for git gems in gem.deps.rb and Gemfile.
+
+	  Fixed resolver bugs.
+
+	* test/rubygems: ditto.
+
+	* lib/rubygems/LICENSE.txt:  Updated to license from RubyGems trunk.
+	  [ruby-trunk - Bug #9086]
+
+	* lib/rubygems/commands/which_command.rb:  RubyGems now indicates
+	  failure when any file is missing.  [ruby-trunk - Bug #9004]
+
+	* lib/rubygems/ext/builder:  Extensions are now installed into the
+	  extension install directory and the first directory in the require
+	  path from the gem.  This allows backwards compatibility with msgpack
+	  and other gems that calculate full require paths.
+	  [ruby-trunk - Bug #9106]
+
+
+Tue Nov 19 07:21:56 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (LOCALTIME_OVERFLOW_PROBLEM): Define it for cross
+	  compiling.
+	  [ruby-core:58391] [Bug #9119] Reported by Luis Lavena.
+	  Analyzed by Heesob Park.
+
+Tue Nov 19 05:55:05 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/rubygems_hook.rb:  Remove debugging puts committed by
+	  accident.
+
+Mon Nov 18 22:47:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_intern.h (TH_PUSH_TAG, TH_EXEC_TAG): refine stack overflow
+	  detection.  chain local tag after setjmp() successed on it, because
+	  calling setjmp() also can overflow the stack.
+	  [ruby-dev:47804] [Bug #9109]
+
+	* vm_eval.c (rb_catch_obj): now th->tag points previous tag until
+	  TH_EXEC_TAG().
+
+	* thread_pthread.c (ruby_init_stack): set stack_start properly by
+	  get_main_stack() if possible.
+
+Mon Nov 18 22:45:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_jump.c (rb_exec_end_proc): unlink and free procs data before
+	  calling for each procs.  [Bug #9110]
+
+Sun Nov 17 06:33:32 2013  Shota Fukumori  <her@sorah.jp>
+
+	* configure.in: Use $LIBS for base of $SOLIBS, also in darwin.
+	  By this fix, environment that libgmp is located in $LIBS can build
+	  ruby.
+
+Sun Nov 17 01:56:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): Show error
+	  message instead of error number.
+	  (thread_create_core): Ditto.
+
+	* cont.c (fiber_machine_stack_alloc): Ditto.
+
+Sat Nov 16 18:28:08 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/ultralightparser.rb
+	  (REXML::Parsers::UltraLightParser#parse): Fix wrong :start_doctype
+	  position.
+	  [Bug #9061] [ruby-dev:47778]
+	  Patch by Ippei Obayashi. Thanks!!!
+
+	* test/rexml/parser/test_ultra_light.rb: Add a test for this case.
+
+Sat Nov 16 02:13:56 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* cont.c : Introduce ensure rollback mechanism. Please see below.
+
+	* internal.h (ruby_register_rollback_func_for_ensure): catch up above change.
+	  Add rollback mechanism API.
+
+	* vm_core.h (typedef struct rb_vm_struct): catch up above change.
+	  Introduce ensure-rollback relation table.
+
+	* vm_core.h (typedef struct rb_thread_struct): catch up above change.
+	  Introduce ensure stack.
+
+	* eval.c (rb_ensure): catch up above change.
+	  Introduce ensure stack.
+
+	* hash.c : New function for rollback ensure, and register it to
+	  ensure-rollback relation table. [ruby-dev:47803] [Bug #9105]
+
+	Ensure Rollback Mechanism:
+	A rollback's function is a function to rollback a state before ensure's
+	function execution.
+	When the jump of callcc is across the scope of rb_ensure,
+	ensure's functions and rollback's functions are executed appropriately
+	for keeping consistency.
+
+	Current API is unstable, and only internal use.
+
+	ruby_register_rollback_func_for_ensure(ensure_func,rollback_func)
+	This API create relation ensure's function to rollback's function.
+	By registered rollback's function, it is executed When jumping into
+	corresponding rb_ensure scope.
+
+Sat Nov 16 00:18:36 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* eval_jump.c (rb_exec_end_proc): fix double free or corruption error
+	  when reentering by callcc. [ruby-core:58329] [Bug #9110]
+
+	* test/ruby/test_beginendblock.rb: test for above.
+
+Fri Nov 15 01:06:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/objspace/objspace_dump.c (dump_output): allow IO object as
+	  output, and use Tempfile.create and return open file instead of
+	  mkstemp() and path name for :file output.
+	  [ruby-core:58266] [Bug #9102]
+
+	* test/objspace/test_objspace.rb (TestObjSpace#dump_my_heap_please):
+	  remove temporary output file.
+
+Thu Nov 14 23:39:00 2013  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] remove example of
+	  Rational#to_d without argument. [Bug #8958]
+
+Thu Nov 14 20:24:15 2013  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ruby_atomic.h (ATOMIC_SIZE_CAS): fix compile error on Solaris
+	  since r43460.
+
+Thu Nov 14 19:53:00 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl/test_cipher.rb (test_aes_gcm_wrong_tag): Don't use
+	  String#succ because it can make modified (wrong) auth_tag longer
+	  than 16 bytes.  The longer auth_tag makes that
+	  EVP_CIPHER_CTX_ctrl (and internally aes_gcm_ctrl) fail.
+	  [ruby-core:55143] [Bug #8439] reported by Vit Ondruch.
+
+Thu Nov 14 11:33:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (foreach_safe_i, hash_foreach_iter): deal with error detected
+	  by ST_CHECK.
+
+	* st.c (st_foreach_check): call with non-error argument in normal case.
+
+Thu Nov 14 02:37:14 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/thread/thread.c: [DOC] This patch accomplishes the following:
+
+	  - Teach RDoc about ConditionVariable
+	  - Teach RDoc about Queue
+	  - Teach RDoc about SizedQueue
+	  - Use fully-qualified namespace for Document-method
+	    This is necessary to separate definitions between classes
+	  - Fix rdoc bug in call_seq vs. call-seq
+	  - Correct doc for SizedQueue#pop patch by @jackdanger [Bug #8988]
+
+Thu Nov 14 01:11:54 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] +precision+ is required
+
+Wed Nov 13 19:21:36 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] Document the required
+	  +precision+ argument for Rational#to_d [Bug #8958]
+
+Wed Nov 13 19:02:05 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/digest/*: [DOC] Fix several typos and broken http links.
+	  Improved examples for Digest overview and fixed a broken example in
+	  Digest::HMAC overview. This patch also adds a description of
+	  Digest::SHA256.bubblebabble to the Digest overview.
+
+	  Patched by @stomar [Bug #9027]
+
+Wed Nov 13 18:32:12 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_config.c: [DOC] Document the following:
+
+	  - OpenSSL::ConfigError
+	  - OpenSSL::Config::DEFAULT_CONFIG_FILE
+
+	  Patched by @vbatts via GH-436
+	  https://github.com/ruby/ruby/pull/436
+
+Wed Nov 13 18:03:00 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_asn1.c: [DOC] Document parts of
+	  OpenSSL::ASN1::ObjectId included a fix for the class overview, which
+	  previously showed the documentation for Constructive due to missing
+	  ObjectId overview. This patch also includes a note for Primitive.
+
+	  Based on a patch by @vbatts via GH-436
+	  https://github.com/ruby/ruby/pull/436
+
+Wed Nov 13 17:19:36 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/lib/openssl/config.rb: In #parse use +string+ for +str+
+
+Wed Nov 13 17:09:45 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/lib/openssl/*.rb: [DOC] Document the following:
+
+	  - Integer#to_bn
+	  - OpenSSL::Buffering module
+	  - Deprecated OpenSSL::Digest::Digest compatibility class
+	  - OpenSSL::Config
+
+	  These changes were based on a patch by @vbatts via GH-436
+	  https://github.com/ruby/ruby/pull/436
+
+Wed Nov 13 10:55:43 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/regexp.rdoc: [DOC] Fix typo in Special global variables section.
+	  Reported by Alex Johnson on ruby-doc.org
+
+Wed Nov 13 10:43:19 2013  Zachary Scott  <e@zzak.io>
+
+	* hash.c: [DOC] Adds an example for Hash#store
+
+Wed Nov 13 09:03:40 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/regexp.rdoc: [DOC] add note about Bug #4044 as suggested by
+	  duerst-san in [ruby-core:43612] [Fixes GH-443] Patched by @rosenfeld
+	  https://github.com/ruby/ruby/pull/443
+
+Tue Nov 12 10:15:14 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rubygems/insure_session.rb:  Remove unused test file.
+
+Tue Nov 12 09:16:24 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master b9213d7.  Changes include:
+
+	  Fixed tests on Windows (I hope) by forcing platform for
+	  platform-dependent tests.
+
+	  Fixed File.exists? warnings.
+
+	  Improved testing infrastructure.
+
+	* test/rubygems:  ditto.
+
+	* test/rdoc/test_rdoc_rubygems_hook.rb:  Switch to util_spec like
+	  RubyGems.
+
+Mon Nov 11 18:31:12 2013  Aman Gupta <ruby@tmm1.net>
+
+	* internal.h: move common string/hash flags to include file.
+	* ext/objspace/objspace_dump.c: remove flags shared above.
+	* hash.c: ditto.
+	* string.c: ditto.
+
+Mon Nov 11 04:36:14 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Include 2.2.0.preview.2 when checking
+	  if extensions should be built.  Fixes a ruby-ci failure.
+	* test/rubygems/test_gem_specification.rb:  Test for the above.
+
+Mon Nov 11 03:15:56 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (symbol2event_flag): add secret feature.
+	  add a_call/a_return events.
+	  a_call is call | b_call | c_call, and same as a_return.
+
+Mon Nov 11 02:51:17 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems: Update to RubyGems master 4bdc4f2.  Important changes
+	  in this commit:
+
+	  RubyGems now chooses the test server port reliably.  Patch by akr.
+
+	  Partial implementation of bundler's Gemfile format.
+
+	  Refactorings to improve the new resolver.
+
+	  Fixes bugs in the resolver.
+
+	* test/rubygems:  Tests for the above.
+
+Mon Nov 11 01:02:06 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/timeout.rb: [DOC] Add note about change from #8730 [Fixes GH-440]
+	* NEWS: [DOC] Improve grammar on change to Timeout
+	  Patched by @srawlins in https://github.com/ruby/ruby/pull/440
+
+Sun Nov 10 23:47:05 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* gc.c (rb_gcdebug_print_obj_condition): catch up recent changes
+	  to compile on GC_DEBUG.
+
+Sun Nov 10 22:16:19 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (exc_cause): captured previous exception.
+
+	* eval.c (make_exception): capture previous exception automagically.
+	  [Feature #8257]
+
+Sun Nov 10 08:37:20 2013  Zachary Scott  <e@zzak.io>
+
+	* thread.c: [DOC] Remove duplicate reference
+
+Sun Nov 10 08:09:29 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/drb/drb.rb: [DOC] promote better windows-safe filename regular
+	  expression in DRb Logger example. Reported by Chris Pheonix
+	  [Bug #9074]
+
+Sun Nov 10 08:03:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_define_finalizer, rb_undefine_finalizer): rename and export
+	  finalizer functions.
+
+Sun Nov 10 07:41:22 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/weakref.rb: [DOC] fix typos by @xaviershay [Fixes GH-439]
+	  https://github.com/ruby/ruby/pull/439
+
+Sun Nov 10 06:14:39 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): emit opt_str_freeze if the #freeze
+	  method is called on a static string literal with no arguments.
+
+	* defs/id.def (firstline): add freeze so idFreeze is available
+
+	* insns.def (opt_str_freeze): add opt_str_freeze instruction which
+	  pushes a frozen string literal without allocating a new object if
+	  String#freeze is not overridden
+
+	* string.c (Init_String): define String#freeze
+
+	* vm.c (vm_init_redefined_flag): define BOP_FREEZE on String class as
+	  a basic operation
+
+	* vm_insnhelper.h: ditto
+
+	[Feature #8992] [ruby-core:57705]
+
+Sun Nov 10 01:34:14 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (vm_malloc_increase): sweep immediately on GC due to malloc().
+	  To reduce memory usage, sweep as soon as possible.
+	  This behavior is same as Ruby 2.0.0 and before.
+
+Sun Nov 10 00:39:26 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/gc/gcbench.rb: output version description and GC::OPTS.
+
+Sun Nov 10 00:36:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (should_be_callable): allow private call since rb_eval_cmd
+	  calls even private methods.
+
+Sun Nov 10 00:33:17 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/racc/rdoc/grammar.en.rdoc: [DOC] fix typo by Tsuyoshi Sawada
+	  [Bug #9077]
+
+Sat Nov  9 22:35:35 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (Gem::Specification.load): obtain spec date from
+	  VCS for the case using git, RUBY_RELEASE_DATE is the last resort.
+	  probably fixes [Bug #9085].
+
+Sat Nov  9 20:56:12 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* ext/objspace/object_tracing.c: use declarations in internal.h.
+
+	* ext/objspace/objspace.c: ditto
+
+Sat Nov  9 20:32:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/objspace/test_objspace.rb (test_dump_all): Make the test string
+	  shorter to be an embedded string on 32bit environment as well as
+	  64bit environment.
+
+Sat Nov  9 15:00:16 2013  Zachary Scott  <e@zzak.io>
+
+	* io.c: [DOC] ARGF.gets may return nil [Bug #9029] patch by znz
+
+Sat Nov  9 14:54:52 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rss/*: [DOC] document various constants @steveklabnik [Bug #8812]
+
+Sat Nov  9 14:50:09 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rss/rss.rb: [DOC] document Time#w3cdtf by @steveklabnik
+	  [Bug #8821]
+
+Sat Nov  9 14:29:04 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/dl/cfunc.c: [DOC] fix typo in example [Bug #8944]
+	  Patched by Heesob Park
+
+Sat Nov  9 13:59:58 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/test/unit/assertions.rb: [DOC] better example for assert_send()
+	  Patch by Andrew Grimm [Bug #8975]
+
+Sat Nov  9 12:45:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* insns.def: unify ic_constant_serial and ic_class_serial into one field
+	  ic_serial. This is possible because these fields are only ever used
+	  exclusively with each other.
+
+	* insns.def: ditto
+	* vm_core.h: ditto
+	* vm_insnhelper.c: ditto
+
+Sat Nov  9 12:31:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* class.c: unify names of vm state version counters to 'serial'.
+	  This includes renaming 'vm_state_version_t' to 'rb_serial_t',
+	  'method_state' to 'method_serial', 'seq' to 'class_serial',
+	  'vmstat' to 'constant_serial', etc.
+
+	* insns.def: ditto
+	* internal.h: ditto
+	* vm.c: ditto
+	* vm_core.h: ditto
+	* vm_insnhelper.c: ditto
+	* vm_insnhelper.h: ditto
+	* vm_method.c: ditto
+
+Sat Nov  9 09:22:29 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (gc_page_sweep, rgengc_rememberset_mark): Refactoring.
+	  Get bitmaps directly.
+
+Sat Nov  9 09:16:36 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (RVALUE_PROMOTE_INFANT): Refactoring. Remove duplicated nonsense
+	  code.
+
+Sat Nov  9 09:04:48 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (gc_marks_test): Bugfix. Fix a struct member name for build
+	  with RGENGC_CHECK_MODE.
+
+Sat Nov  9 08:58:23 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c : Add GC_PROFILE_DETAIL_MEMORY option.
+	  If GC_PROFILE_MORE_DETAIL && GC_PROFILE_DETAIL_MEMORY,
+	  maxrss, minflt and majflt are added to each profile record.
+
+Sat Nov  9 07:41:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (rb_vm_backtrace_object, rb_gc_count): make prototype
+	  declarations, not old-K&R style.
+
+Sat Nov  9 06:11:14 2013  vo.x (Vit Ondruch)  <vondruch@redhat.com>
+
+	* tool/rbinstall.rb (Gem::Specification#collect): make stable
+	  Gem::Specification.files in default .gemspecs the different order of
+	  "files" in .gemspec files makes them different therefore possibly
+	  conflicting in multilib scenario.  patch by vo.x (Vit Ondruch) at
+	  [ruby-core:57544] [Bug #8623].
+
+Sat Nov  9 01:59:18 2013  Aman Gupta <ruby@tmm1.net>
+
+	* ext/objspace/objspace_dump.c: Add experimental methods to
+	  dump objectspace as json: ObjectSpace.dump_all and
+	  ObjectSpace.dump(obj). These methods are useful for debugging
+	  reference leaks and memory growth in large ruby applications.
+	  [Bug #9026] [ruby-core:57893] [Fixes GH-423]
+	* test/objspace/test_objspace.rb: tests for above.
+
+Sat Nov  9 00:26:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (GetLastError): already defined in windows.h on nowadays
+	  cygwin, and caused the confliction with the system provided
+	  definition on cygwin64.  by @kou1okada [Fixes GH-433].
+
+Fri Nov  8 18:35:31 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* lib/open3.rb: receive arguments as keyword arguments.
+
+Fri Nov  8 13:19:26 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* io.c (rb_io_open_with_args): use RARRAY_CONST_PTR().
+
+	* io.c (rb_scan_open_args): use const qualifier for above.
+
+	* io.c (rb_open_file): ditto.
+
+	* io.c (rb_io_open_with_args): ditto.
+
+Fri Nov  8 11:35:06 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* dir.c, pack.c, ruby.c, struct.c, vm_eval.c: use RARRAY_CONST_PTR().
+
+Fri Nov  8 10:58:02 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* compile.c (iseq_build_from_ary_exception): use RARRAY_CONST_PTR().
+
+	* compile.c (iseq_build_from_ary_body): ditto.
+
+Fri Nov  8 10:49:34 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* enumerator.c (append_method): use RARRAY_CONST_PTR().
+
+	* enumerator.c (lazy_init_iterator): ditto.
+
+Fri Nov  8 02:44:29 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (vm_malloc_increase): check GVL before gc_rest_sweep().
+	  vm_malloc_increase() can be called without GVL.
+	  However, gc_rest_sweep() assumes acquiring GVL.
+	  To avoid this problem, check GVL before gc_rest_sweep().
+	  [Bug #9090]
+
+	  This workaround introduces possibility to set malloc_limit as
+	  wrong value (*1). However, this may be rare case. So I commit it.
+
+	  *1: Without rest_sweep() here, gc_rest_sweep() can decrease
+	      malloc_increase due to ruby_sized_xfree().
+
+Fri Nov  8 02:50:25 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/securerandom.rb: [DOC] specify arguments passed to ::random_bytes
+	  By @chastell [Fixes GH-412] https://github.com/ruby/ruby/pull/412
+
+Fri Nov  8 02:43:01 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/objspace/object_tracing.c: [DOC] trace_object_allocations_stop
+	  By @srawlins [Fixes GH-421] https://github.com/ruby/ruby/pull/421
+
+Fri Nov  8 02:34:20 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/net/ftp.rb: [DOC] Document Net::FTP.mdtm and .set_socket and fix
+	  spelling typo, based on patch by @artfuldodger [Fixes GH-426]
+	  https://github.com/ruby/ruby/pull/426
+
+Fri Nov  8 02:14:37 2013  Zachary Scott  <e@zzak.io>
+
+	* array.c: [DOC] Add note about negative indices in Array overview
+	  By @ckaenzig [Fixes GH-427] https://github.com/ruby/ruby/pull/427
+
+Fri Nov  8 02:09:12 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/csv.rb: [DOC] Fix typo in CSV.parse_line by @funky-bibimbap
+	  [Fixes GH-430] https://github.com/ruby/ruby/pull/430
+
+Fri Nov  8 01:01:54 2013  Zachary Scott  <e@zzak.io>
+
+	* golf_prelude.rb: syntax formatting for whitespace [Fixes GH-425]
+	  Patch by @edward https://github.com/ruby/ruby/pull/425
+
+Thu Nov  7 19:36:09 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: modify malloc_limit strategy.
+
+	  * fix default values:
+	    GC_MALLOC_LIMIT_GROWTH_FACTOR
+	    GC_MALLOC_LIMIT: 8MB -> 16MB
+	    GC_MALLOC_LIMIT_MAX: 384MB -> 32MB
+
+	  * algorithm of malloc_limit increment.
+	    if (malloc_increase < malloc_limit) {
+	      next_malloc_limit = malloc_limit * factor
+	      if (malloc_limit > malloc_limit_max) {
+	        malloc_limit = malloc_increase
+	      }
+	    }
+	    This algorithm change malloc_limit from
+	    16MB -> 32MB slowly.
+	    If malloc_limit exceeds malloc_limit_max, then
+	    increase with malloc_increase.
+
+Thu Nov  7 11:06:05 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_shuffle_bang): use RARRAY_PTR_USE() without WB
+	  because there are not new relations.
+
+Thu Nov  7 10:34:12 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_sample): use rb_ary_dup().
+
+Thu Nov  7 09:39:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_trace.c (rb_threadptr_exec_event_hooks_orig): errinfo should not
+	  be propagated to trace blocks so that no argument raise does not
+	  throw internal objects.  [ruby-dev:47793] [Bug #9088]
+
+Wed Nov  6 21:30:55 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (gc_before_sweep): Change algorithm of malloc_limit to
+	  conservative for closing to memory consumption of ruby 2.0.
+
+	* gc.c (GC_MALLOC_LIMIT, GC_MALLOC_LIMIT_GROWTH_FACTOR):
+	  Adjust parameters for new algorithm.
+
+Wed Nov  6 21:16:51 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_shift_m): use RARRAY_PTR_USE() without WB because
+	  there are not new relations.
+
+Wed Nov  6 21:05:20 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_reverse): use RARRAY_PTR_USE().
+
+Wed Nov  6 19:30:44 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* common.mk (help): add texts about gcbench.
+
+Wed Nov  6 16:32:32 2013  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/open3.rb: tweaked grammar in comments
+
+Wed Nov  6 11:46:36 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_sample): use RARRAY_AREF() and RARRAY_PTR_USE()
+	  instead of RARRAY_PTR().
+
+Wed Nov  6 10:37:07 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_and): defer hash creation and some refactoring.
+
+Wed Nov  6 09:14:31 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm1_gc_short_lived.rb: added.
+	  These GC benchmarks do not reflect practical applications.
+	  They are only for tuning.
+
+	* benchmark/bm_vm1_gc_short_with_complex_long.rb: added.
+
+	* benchmark/bm_vm1_gc_short_with_long.rb: added.
+
+	* benchmark/bm_vm1_gc_short_with_symbol.rb: added.
+
+	* benchmark/bm_vm1_gc_wb_ary.rb: added.
+
+	* benchmark/bm_vm1_gc_wb_obj.rb: added.
+
+	* benchmark/bm_vm_thread_queue.rb: added.
+	  This benchmark is added to know how fast C version of thread.so.
+
+Wed Nov  6 09:13:32 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: define RGENGC_ESTIMATE_OLDSPACE == 0 if USE_RGENGC is 0.
+
+Wed Nov  6 07:13:18 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (Init_GC): add GC::OPTS to show options.
+
+Wed Nov  6 07:12:17 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/gc/gcbench.rb: add some options to make quiet.
+
+Wed Nov  6 04:14:25 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: process merge keys before
+	  reviving objects. Fixes GH psych #168
+	* test/psych/test_merge_keys.rb: test for change
+	  https://github.com/tenderlove/psych/issues/168
+
+Tue Nov  5 21:21:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_thread.rb (test_thread_join_in_trap):
+	  Run the test in a different process.
+
+Tue Nov  5 20:14:32 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (is_live_object): A hidden object may be a live object.
+	  [ruby-dev:47788] [Bug #9072]
+
+Tue Nov  5 13:37:19 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add support to estimate increase of oldspace memory usage.
+	  This is another approach to solve an issue discussed at r43530.
+	  This feature is disabled as default.
+
+	  This feature measures an increment of memory consumption by oldgen
+	  objects. It measures memory consumption for each objects when
+	  the object is promoted. However, measurement of memory consumption
+	  is not accurate now. So that this measurement is `estimation'.
+
+	  To implement this feature, move memsize_of() function from
+	  ext/objspace/objspace.c and expose rb_obj_memsize_of().
+
+	  Some memsize() functions for T_DATA (T_TYPEDDATA) have problem to
+	  measure memory size, so that we ignores T_DATA objects now.
+	  For example, some functions skip NULL check for pointer.
+
+	  The macro RGENGC_ESTIMATE_OLDSPACE enables/disables this feature,
+	  and turned off as default.
+
+	  We need to compare 3gen GC and this feature carefully.
+	  (it is possible to enable both feature)
+	  We need a help to compare them.
+
+	* internal.h: expose rb_obj_memsize_of().
+
+	* ext/objspace/objspace.c: use rb_obj_memsize_of() function.
+
+	* cont.c (fiber_memsize): fix to check NULL.
+
+	* variable.c (autoload_memsize): ditto.
+
+	* vm.c (vm_memsize): ditto.
+
+Tue Nov  5 04:03:07 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (GC_MALLOC_LIMIT_MAX): fix default value 512MB -> 384MB.
+	  512MB is huge.
+
+Tue Nov  5 03:31:23 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add 3gen GC patch, but disabled as default.
+
+	  RGenGC is designed as 2 generational GC, young and old generation.
+	  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
+	  objects accidentally and not freed until major GC.
+	  Major GC is not frequently so short-lived but accidentally becoming
+	  old objects are not freed.
+
+	  For example, the program "loop{Array.new(1_000_000)}" consumes huge
+	  memories because short lived objects (an array which has 1M
+	  elements) are promoted while GC and they are not freed before major
+	  GC.
+
+	  To solve this problem, generational GC with more generations
+	  technique is known. This patch implements three generations gen GC.
+
+	  At first, newly created objects are "Infant" objects.
+	  After surviving one GC, "Infant" objects are promoted to "Young"
+	  objects.
+	  "Young" objects are promoted to "Old" objects after surviving
+	  next GC.
+	  "Infant" and "Young" objects are collected if it is not marked
+	  while minor GC. So that this technique solves this problem.
+
+	  Representation of generations:
+	  * Infant: !FL_PROMOTED and !oldgen_bitmap [00]
+	  * Young :  FL_PROMOTED and !oldgen_bitmap [10]
+	  * Old   :  FL_PROMOTED and  oldgen_bitmap [11]
+
+	  The macro "RGENGC_THREEGEN" enables/disables this feature, and
+	  turned off as default because there are several problems.
+	  (1) Failed sometimes (Heisenbugs).
+	  (2) Performance down.
+	      Especially on write barriers. We need to detect Young or Old
+	      object by oldgen_bitmap. It is slower than checking flags.
+
+	  To evaluate this feature on more applications, I commit this patch.
+	  Reports are very welcome.
+
+	  This patch includes some refactoring (renaming names, etc).
+
+	* include/ruby/ruby.h: catch up 3gen GC.
+
+	* .gdbinit: fix to show a prompt "[PROMOTED]" for promoted objects.
+
+Tue Nov  5 00:05:51 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* node.h: catch up comments for last commit.
+
+Tue Nov  5 00:02:00 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: rename FL_OLDGEN to FL_PROMOTED.
+	  This flag represents that "this object is promoted at least once."
+
+	* gc.c, debug.c, object.c: catch up this change.
+
+Mon Nov  4 22:20:16 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/xmlrpc: Don't use fixed ports: 8070 and 8071.
+
+Mon Nov  4 15:25:52 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/xmlrpc/webrick_testing.rb (start_server): Initialize the server
+	  at main thread to fail early.
+
+Mon Nov  4 10:08:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_intern.h (TH_EXEC_TAG, TH_JUMP_TAG): get rid of undefined
+	  behavior of setjmp() in rhs of assignment expression.
+	  [ISO/IEC 9899:1999] 7.13.1.1
+
+Sun Nov  3 23:06:51 2013  Tanaka Akira  <akr@fsij.org>
+
+	* sample/test.rb: Make temporary file names unique.
+
+Sun Nov  3 20:41:17 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/xmlrpc: Wrap definitions by TestXMLRPC module.
+
+Sun Nov  3 20:23:38 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/xmlrpc/webrick_testing.rb (stop_server): Don't try to shutdown
+	  the server if the server is not started.
+
+Sun Nov  3 09:35:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_feature_p): deal with default loadable suffixes.
+
+	* load.c (load_lock): initialize statically linked extensions.
+
+	* load.c (search_required, rb_require_safe): deal with statically
+	  linked extensions.
+
+	* load.c (ruby_init_ext): defer initialization of statically linked
+	  extensions until required actually.  [Bug #8883]
+
+Sat Nov  2 15:14:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/logger.rb (Logger::LogDevice::LogDeviceMutex#lock_shift_log):
+	  open file can't be removed or renamed on Windows.  [ruby-dev:47790]
+	  [Bug #9046]
+
+	* test/logger/test_logger.rb (TestLogDevice#run_children): don't use
+	  fork.
+
+Sat Nov  2 07:08:43 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/logger.rb: Inter-process locking for log rotation
+	  Current implementation fails log rotation on multi process env.
+	  by sonots <sonots@gmail.com>
+	  https://github.com/ruby/ruby/pull/428 fix GH-428 [Bug #9046]
+
+Fri Nov  1 23:24:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (wmap_mark_map): mark live objects only, but delete zombies.
+	  [ruby-dev:47787] [Bug #9069]
+
+Fri Nov  1 22:45:54 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (struct heap_page, gc_page_sweep, gc_sweep): Refactoring for
+	  performance. Add before_sweep condition to heap_page structure.
+
+	* gc.c (rb_gc_force_recycle): Use before_sweep member.
+
+	* gc.c (heap_is_before_sweep, is_before_sweep): Remove. They have not
+	  already been used.
+
+Fri Nov  1 22:20:28 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (make_deferred): Refactoring. Collect codes which should be
+	  atomic.
+
+	* gc.c (make_io_deferred, obj_free, rb_objspace_call_finalizer,
+	  gc_page_sweep): Correspond to the above.
+
+Fri Nov  1 21:40:35 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (typedef struct rb_objspace): Refactoring. Move some members
+	  into profile member.
+
+	* gc.c (newobj_of): Correspond to the above.
+
+	* gc.c (finalize_list): Ditto.
+
+	* gc.c (objspace_live_num): Ditto.
+
+	* gc.c (gc_page_sweep): Ditto.
+
+	* gc.c (rb_gc_force_recycle): Ditto.
+
+	* gc.c (garbage_collect_body): Ditto.
+
+	* gc.c (rb_gc_count): Ditto.
+
+	* gc.c (gc_stat): Ditto.
+
+	* gc.c (gc_prof_set_heap_info): Ditto.
+
+	* gc.c (gc_profile_dump_on): Ditto.
+
+Fri Nov  1 20:53:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_scrub): fix typo, should yield invalid byte
+	  sequence to be scrubbed.  reported by znz at IRC.
+
+Fri Nov  1 17:25:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (is_live_object): finalizer may not run because of lazy-sweep.
+	  [ruby-dev:47786] [Bug #9069]
+
+Fri Nov  1 16:55:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_scrub): export with fixed length arguments, and
+	  allow nil as replacement string instead of omitting.
+
+Fri Nov  1 06:20:44 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_mutex_struct): reduce rb_mutex_t size by 8 bytes
+	  on 64bit platform. Patch by Eric Wong. [Feature #9068][ruby-core:58114]
+
+Fri Nov  1 01:08:33 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/gc/gcbench.rb: print HWM (high water mark) if possible.
+
+Thu Oct 31 21:48:31 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/streamparser.rb: Add dependency file require.
+	  [Bug #9062] [ruby-dev:47779]
+	  Reported by Ippei Obayashi. Thanks!!!
+
+Thu Oct 31 14:09:32 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_method.c (rb_method_entry_make): fix to pass an ISeq value.
+	  OBJ_WRITTEN() accepts only VALUE.
+
+Wed Oct 30 19:07:57 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-additional.el (ruby-brace-to-do-end)
+	  (ruby-do-end-to-brace, ruby-toggle-block): Remove functions that
+	  are already in the latest released version of Emacs (24.3).
+	  [Bug #7565]
+
+Wed Oct 30 12:44:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): add missing variables,
+	  PLATFORM_DIR and THREAD_MODEL.
+
+Wed Oct 30 12:20:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (v2w): Normalize a rational value to an integer if possible.
+	  [ruby-core:58070] [Bug #9059] reported by Isaac Schwabacher.
+
+Wed Oct 30 12:08:41 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_uniq_bang): use rb_ary_modify_check() instead of
+	  rb_ary_modify() because the array will be unshared soon.
+
+Wed Oct 30 03:25:10 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: make less garbage when
+	  testing if a string is binary.
+
+Wed Oct 30 03:08:24 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: string subclasses should
+	  not be considered to be binary.  Fixes Psych / GH 166
+	  https://github.com/tenderlove/psych/issues/166
+
+	* test/psych/test_string.rb: test for fix
+
+Tue Oct 29 23:01:18 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_zip): some refactoring.
+
+Tue Oct 29 22:11:37 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_uniq_bang): use st_foreach() instead of for loop.
+
+Tue Oct 29 20:01:58 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* add RUBY_TYPED_FREE_IMMEDIATELY to data types which only use
+	  safe functions during garbage collection such as xfree().
+
+	  On default, T_DATA objects are freed at same points as finalizers.
+	  This approach protects issues such as reported by [ruby-dev:35578].
+	  However, freeing T_DATA objects immediately helps heap usage.
+
+	  Most of T_DATA (in other words, most of dfree functions) are safe.
+	  However, we turned off RUBY_TYPED_FREE_IMMEDIATELY by default
+	  for safety.
+
+	* cont.c: ditto.
+
+	* dir.c: ditto.
+
+	* encoding.c: ditto.
+
+	* enumerator.c: ditto.
+
+	* error.c: ditto.
+
+	* file.c: ditto.
+
+	* gc.c: ditto.
+
+	* io.c: ditto.
+
+	* iseq.c: ditto.
+
+	* marshal.c: ditto.
+
+	* parse.y: ditto.
+
+	* proc.c: ditto.
+
+	* process.c: ditto.
+
+	* random.c: ditto.
+
+	* thread.c: ditto.
+
+	* time.c: ditto.
+
+	* transcode.c: ditto.
+
+	* variable.c: ditto.
+
+	* vm.c: ditto.
+
+	* vm_backtrace.c: ditto.
+
+	* vm_trace.c: ditto.
+
+	* ext/bigdecimal/bigdecimal.c: ditto.
+
+	* ext/objspace/objspace.c: ditto.
+
+	* ext/stringio/stringio.c: ditto.
+
+	* ext/strscan/strscan.c: ditto.
+
+Tue Oct 29 19:48:33 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: fix typo (FL_WB_PROTECT -> FL_WB_PROTECTED).
+
+Tue Oct 29 18:45:08 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (tp_free): removed because empty free function.
+	  Use RUBY_TYPED_NEVER_FREE instead.
+
+Tue Oct 29 18:37:33 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: introduce new flags for T_TYPEDDATA.
+	  * RUBY_TYPED_FREE_IMMEDIATELY: free the data given by DATA_PTR()
+	    with dfree function immediately.  Otherwise (default), the data
+	    freed at finalization point.
+	  * RUBY_TYPED_WB_PROTECTED: make this object with FL_WB_PROTECT
+	    (not shady).
+
+	* gc.c (obj_free): support RUBY_TYPED_FREE_IMMEDIATELY.
+
+Tue Oct 29 16:49:03 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (vm_malloc_increase): decrease it more carefully.
+
+Tue Oct 29 16:24:52 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (heap_page_resurrect): return a page in tomb heap even if
+	  freelist is NULL.
+
+Tue Oct 29 15:46:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby_atomic.h (ATOMIC_SIZE_CAS): new macro, compare and swap size_t.
+
+Tue Oct 29 12:08:05 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/readline/readline.c (readline_getc): Consider
+	  NULL as input.
+
+Tue Oct 29 11:10:08 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (gc_profile_total_time): fix off-by-one error in
+	  GC::Profiler.total_time.
+	* test/ruby/test_gc.rb (class TestGc): test for above.
+
+Tue Oct 29 09:53:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* insns.def, vm.c, vm_insnhelper.c, vm_insnhelper.h, vm_method.c: split
+	  ruby_vm_global_state_version into two separate counters - one for the
+	  global method state and one for the global constant state. This means
+	  changes to constants do not affect method caches, and changes to
+	  methods do not affect constant caches. In particular, this means
+	  inclusions of modules containing constants no longer globally
+	  invalidate the method cache.
+
+	* class.c, eval.c, include/ruby/intern.h, insns.def, vm.c, vm_method.c:
+	  rename rb_clear_cache_by_class to rb_clear_method_cache_by_class
+
+	* class.c, include/ruby/intern.h, variable.c, vm_method.c: add
+	  rb_clear_constant_cache
+
+	* compile.c, vm_core.h, vm_insnhelper.c: rename vmstat field in
+	  rb_call_info_struct to method_state
+
+	* vm_method.c: rename vmstat field in struct cache_entry to method_state
+
+Mon Oct 28 23:26:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/readline/test_readline.rb (teardown): Clear Readline.input and
+	  Readline.output.
+
+Mon Oct 28 21:35:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/-test-/file/depend, ext/-test-/postponed_job/depend,
+	  ext/-test-/tracepoint/depend: New files for dependencies.
+
+Mon Oct 28 15:32:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/depend (ossl.o): work around of dependency of
+	  thread_native.h, which depends on headers by THREAD_MODEL.
+	  [ruby-dev:47777]
+
+	* ext/openssl/extconf.rb: need THREAD_MODEL.
+
+Mon Oct 28 14:57:01 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (ruby_init_ext): share feature names between frame name and
+	  provided features.
+
+Mon Oct 28 14:41:27 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el: Import ruby-electric.el 2.1 from
+	  https://github.com/knu/ruby-electric.el.
+
+	  * Hitting the newline-and-indent key within a comment fires
+	    comment-indent-new-line.
+
+	  * Introduce a new feature
+	    `ruby-electric-autoindent-on-closing-char`.
+
+	  * Fix fallback behavior of ruby-electric-space/return that
+	    caused error with auto-complete.
+
+Mon Oct 28 13:17:17 2013  Or Cohen  <orc@fewbytes.com>
+
+	* error.c (name_err_to_s): remove no longer needed overriding, since
+	  r30455 which made exc_to_s almost same.  Fixes [GH-413].
+
+Mon Oct 28 12:42:11 2013  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk, ext/objspace/depend, ext/coverage/depend,
+	  ext/-test-/debug/depend, ext/date/depend: Update dependencies.
+
+Mon Oct 28 09:29:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* vm.c: vm_clear_all_cache is not necessary now we use a 64 bit counter
+	  for global state version.
+
+	* vm_insnhelper.h: ruby_vm_global_state_version overflow is unnecessary
+
+Mon Oct 28 07:47:32 2013  Aman Gupta <ruby@tmm1.net>
+
+	* vm_backtrace.c (rb_profile_frame_classpath): do not use rb_inspect
+	  directly, since it might have a custom implementation or show ivars.
+
+Mon Oct 28 04:10:41 2013  Aman Gupta <ruby@tmm1.net>
+
+	* vm_backtrace.c (rb_profile_frame_classpath): handle singleton
+	  methods defined directly on an object.
+	* test/-ext-/debug/test_profile_frames.rb: test for above.
+
+Mon Oct 28 00:52:36 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (new_struct): fix warning message, class name and encoding.
+
+Sun Oct 27 20:53:08 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/readline/readline.c: Include ruby/thread.h for
+	  rb_thread_call_without_gvl2.
+	  (readline_rl_instream, readline_rl_outstream): Record FILE
+	  structures allocated by this extension.
+	  (getc_body): New function extracted from readline_getc.
+	  (getc_func): New function.
+	  (readline_getc): Use rb_thread_call_without_gvl2 to invoke getc_func.
+	  [ruby-dev:47033] [Bug #8749]
+	  (clear_rl_instream, clear_rl_outstream): Close FILE structure
+	  allocated by this extension reliably.  [ruby-core:57951] [Bug #9040]
+	  (readline_readline): Use clear_rl_instream and clear_rl_outstream.
+	  (readline_s_set_input): Set readline_rl_instream.
+	  (readline_s_set_output): Set readline_rl_outstream.
+	  (Init_readline): Don't call readline_s_set_input because
+	  readline_getc doesn't block other threads for any FILE structure now.
+
+	  [ruby-dev:47033] [Bug #8749] reported by Nobuhiro IMAI.
+	  [ruby-core:57951] [Bug #9040] reported by Eamonn Webster.
+
+Sat Oct 26 19:31:28 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* gc.c: catch up recent changes to compile on GC_DEBUG,
+	  RGENGC_CHECK_MODE.
+
+Sat Oct 26 19:08:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (range_initialize_copy): disallow to modify after
+	  initialized.
+
+Sat Oct 26 17:48:54 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (meta_add_field): : Re-implemented.
+	   [ruby-core:58017] [Bug #9051] patch by Eamonn Webster.
+
+Sat Oct 26 14:35:09 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_profile_dump_on): use "Page" terminology.
+
+Sat Oct 26 13:25:45 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_sweep, gc_heap_lazy_sweep): fix measurement code.
+	  We only need one sweep time measurement without lazy sweep.
+
+Sat Oct 26 11:59:13 2013  Tanaka Akira  <akr@fsij.org>
+
+	* addr2line.c: Include ELF header after system headers (especially
+	  sys/types.h) to avoid compilation failure,
+	  "usr/include/sh3/elf_machdep.h:4:2: error: #error Define _BYTE_ORDER!",
+	  on NetBSD/sh3 (dreamcast, hpcsh, landisk, mmeye).
+
+Sat Oct 26 11:35:22 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: tuning parameters.
+
+	* gc.c (GC_MALLOC_LIMIT): change default value to 16MB.
+
+	* gc.c (GC_MALLOC_LIMIT_GROWTH_FACTOR): change default value to 2.0.
+
+	* gc.c (gc_before_sweep): change decrease ratio of `malloc_limit'
+	  from 1/4 to 1/10.
+
+Sat Oct 26 11:30:07 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (vm_malloc_increase): do gc_rest_sweep() before GC.
+	  gc_rest_sweep() can reduce malloc_increase, so try it before GC.
+	  Otherwise, malloc_increase can be less than malloc_limit at
+	  gc_before_sweep(). This means that re-calculation of malloc_limit
+	  may be wrong value.
+
+Sat Oct 26 06:35:41 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (gc_before_heap_sweep): Restructure code to mean clearly.
+	  heap->freelist is connected to end of list.
+
+Sat Oct 26 04:01:35 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_before_heap_sweep): fix freelist management.
+	  After rb_gc_force_recycle() for a object belonging to heap->freelist,
+	  `heap->using_page->freelist' is not null.
+
+Thu Oct 24 21:57:24 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* parse.y: Remove +(binary) and -(binary) special cases
+	  [Feature #9048]
+
+Thu Oct 24 12:45:53 2013  Zachary Scott  <e@zzak.io>
+
+	* object.c: [DOC] Document first argument also takes string for:
+
+	  rb_mod_const_get, rb_mod_const_set, rb_mod_const_defined
+
+	  Also added note about NameError exception for invalid constant name
+
+Thu Oct 24 12:23:58 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_terminate_all): add a comment why we need
+	  state check and call terminate_i again.
+
+Thu Oct 24 12:15:02 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_terminate_all): add a comment why infinite
+	  sleep is safe.
+
+Thu Oct 24 07:41:42 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c: add new initial_growth_max tuning parameter.
+	  [ruby-core:57928] [Bug #9035]
+	* gc.c (heap_set_increment): when initial_growth_max is set,
+	  do not grow number of slots by more than growth_max at a time.
+	* gc.c (rb_gc_set_params): load optional new tuning value from
+	  RUBY_HEAP_SLOTS_GROWTH_MAX environment variable.
+	* test/ruby/test_gc.rb (class TestGc): test for above.
+
+Thu Oct 24 01:34:12 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (rb_infinity_float): suppress overflow in
+	  constant arithmetic warnings.  [ruby-core:57981] [Bug #9044]
+
+Thu Oct 24 00:11:24 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/ostruct.rb: raise NoMethodError with a #name and #args.
+	  Raise RuntimeError when modifying frozen instances
+	  instead of TypeError.
+	  (OpenStruct#each_pair): Return an enumerator with size
+	  (OpenStruct#delete): Use the converted argument.
+	  Patches by Kenichi Kamiya. [Fixes GH-383]
+
+	* test/ostruct/test_ostruct.rb: Added tests for above.
+
+Thu Oct 24 00:10:22 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* array.c: Add Array#to_h [Feature #7292]
+
+	* enum.c: Add Enumerable#to_h
+
+Wed Oct 23 23:48:28 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c: Rename free_min to min_free_slots and free_min_page to
+	  max_free_slots. The algorithm for heap growth is:
+	    if (swept_slots < min_free_slots) pages++
+	    if (swept_slots > max_free_slots) pages--
+
+Wed Oct 23 22:51:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): VC 2013 supports C99 mathematics
+	  functions.  [ruby-core:57981] [Bug #9044]
+
+Wed Oct 23 19:13:18 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: move increment from heap to heap_pages.
+	  Share `increment' information with heaps.
+
+	* gc.c: change ratio of heap_pages_free_min_page
+	  to 0.80.
+	  This change means slow down page freeing speed.
+
+Wed Oct 23 17:52:03 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (heap_pages_free_unused_pages): cast to (int) for size_t
+	  variable `i'.
+
+Wed Oct 23 17:39:35 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: introduce tomb heap.
+	  Tomb heap is where zombie objects and ghost (freed slot) lived in.
+	  Separate from other heaps (now there is only eden heap) at sweeping
+	  helps freeing pages more efficiently.
+	  Before this patch, even if there is an empty page at former phase
+	  of sweeping, we can't free it.
+
+	  Algorithm:
+	    (1) Sweeping all pages in a heap and move empty pages from the
+	        heap to tomb_heap.
+	    (2) Check all existing pages and free a page
+	        if all slots of this page are empty and
+	           there is enough empty slots (checking by swept_num)
+
+	  To introduce this patch, there are several tuning of GC parameters.
+
+Wed Oct 23 14:20:56 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_prof_sweep_timer_stop): catch up recent changes
+	  to compile on GC_PROFILE_MORE_DETAIL=1.
+
+Wed Oct 23 11:43:27 2013  Zachary Scott  <e@zzak.io>
+
+	* file.c: [DOC] fix rdoc format of File#expand_path from r43386
+
+Tue Oct 22 21:58:28 2013  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* vm_core.h (enum): avoid syntax error.
+
+	* method.h: ditto.
+
+	* internal.h: ditto.
+
+Tue Oct 22 19:53:16 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (Init_heap): move logics from heap_pages_init() and remove
+	  heap_pages_init().
+
+Tue Oct 22 19:19:05 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: allow multiple heaps.
+	  Now, objects are managed by page. And a set of pages is called heap.
+	  This commit supports multiple heaps in the object space.
+
+	  * Functions heap_* and rb_heap_t manages heap data structure.
+	  * Functions heap_page_* and struct heap_page manage page data
+	    structure.
+	  * Functions heap_pages_* and struct rb_objspace_t::heap_pages
+	    maintains all pages.
+	    For example, pages are allocated from the heap_pages.
+
+	  See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/GC_design
+	  and https://bugs.ruby-lang.org/attachments/4015/data-heap_structure_with_multiple_heaps.png
+	  for more details.
+
+	  Now, there is only one heap called `eden', which is a space for all
+	  new generated objects.
+
+Tue Oct 22 18:26:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pp.rb (object_address_group): Use Kernel#to_s to obtain the class
+	  name and object address.
+	  This fix a problem caused by %p in C generates variable length
+	  address.
+	  Reported by ko1 via IRC.
+
+Tue Oct 22 16:57:48 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* file.c (File#expand_path): [DOC] improve documentation of File#expand_path.
+	  Based on patch by Prathamesh Sonpatki. [ruby-core:57734] [Bug #9002]
+
+Tue Oct 22 15:59:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): don't skip current directories if FNM_DOTMATCH
+	  is given.  [ruby-core:53108] [Bug #8006]
+
+Tue Oct 22 14:53:11 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: exterminate Zombies.
+	  There is a bug that T_ZOMBIE objects are not collected.
+	  Because there is a pass to miss finalizer postponed job
+	  with multi-threading. This patch solve this issue.
+
+	* vm_trace.c (rb_postponed_job_register_one): set
+	  RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(th) if another same job
+	  is registered.
+	  There is a possibility to remain a postponed job without
+	  interrupt flag.
+
+	* vm_trace.c (rb_postponed_job_register_one): check interrupt
+	  carefully.
+
+	* vm_trace.c (rb_postponed_job_register_one): use additional space
+	  to avoid buffer full.
+
+	* gc.c (gc_finalize_deferred_register): check failure.
+
+	* thread.c (rb_threadptr_execute_interrupts): check
+	  `postponed_job_interrupt' immediately.  There is a possibility
+	  to miss this flag.
+
+Tue Oct 22 12:11:16 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check if the given CFLAGS and LDFLAGS are working, and
+	  bail out early if not.
+
+Tue Oct 22 00:06:57 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_exists_p): warn deprecated name.  [Bug #9041]
+
+Mon Oct 21 23:57:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (load_encoding): should preserve outer errinfo, so that
+	  expected exception may not be lost.  [ruby-core:57949] [Bug #9038]
+
+Sun Oct 20 15:41:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_reopen): create a new, temporary FD via rb_sysopen and
+	  call rb_cloexec_dup2 on it to atomically replace the file fptr->fd
+	  points to.  This leaves no possible window where fptr->fd is invalid
+	  to userspace (even for any threads running w/o GVL).  based on the
+	  patch by Eric Wong <normalperson@yhbt.net> at [ruby-core:57943].
+	  [Bug #9036]
+
+Sun Oct 20 15:29:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_syserr_fail_path_in): new function split from
+	  rb_sys_fail_path_in to raise SystemCallError without errno.
+
+	* internal.h (rb_syserr_fail_path): like rb_sys_fail_path but without
+	  errno.
+
+Sun Oct 20 13:58:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_obj_wb_unprotect, rb_obj_written),
+	  (rb_obj_write): suppress unused-parameter warnings.
+
+Sun Oct 20 10:32:48 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update RubyGems to master 0886307.  This commit
+	  improves documentation and should bring ruby above 75% documented on
+	  rubyci.
+
+Sun Oct 20 09:30:56 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 3de7e0f.  Changes:
+
+	  Only attempt to build extensions for newly-installed gems.  This
+	  prevents compilation attempts at gem activation time for gems that
+	  already have extensions built.
+
+	  Fix crash in the dependency resolver for dependencies that cannot be
+	  resolved.
+
+	* test/rubygems:  ditto.
+
+Sun Oct 20 05:24:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_class2name): should return real class name, not
+	  singleton class or iclass.
+
+Sun Oct 20 04:18:48 2013  Aman Gupta <ruby@tmm1.net>
+
+	* variable.c (rb_class2name): call rb_tmp_class_path() directly to
+	  avoid extra rb_str_dup() from rb_class_name().
+
+Sat Oct 19 19:59:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/file.c (code_page): use simple array instead of st_table.
+
+	* encoding.c (rb_locale_encindex): defer initialization of win32 code
+	  page table until encoding db loaded.
+
+Sat Oct 19 08:25:05 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix rb_objspace_t.
+	  * make "struct heap" and move most of variables
+	    in rb_objspace_t::heap.
+	  * rename rb_objspace_t::heap::sorted to
+	    rb_objspace_t::heap_sorted_pages
+	    and make a macro heap_sorted_pages.
+	  * rename rb_objspace_t::heap::range to
+	    rb_objspace_t::heap_range and rename macros
+	    lomem/himem to heap_lomem/heap_himem.
+
+Sat Oct 19 07:14:40 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 42543b6.  Changes:
+
+	  Fix `gem update` for gems with multiple platforms.
+
+	* test/rubygems:  ditto.
+
+Sat Oct 19 06:55:52 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 0a3814b.  Changes:
+
+	  Fixed extension directory in Gem::Specification#require_paths.
+
+	  Allow installation of gems when $HOME is nonexistent or unwritable.
+
+	  Use proper API in InstallCommand.
+
+	  Improve support for path option in gem dependency files.
+
+	  Remove warnings.
+
+	* test/rubygems:  ditto.
+
+Fri Oct 18 15:23:34 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change terminology of heap.
+	  Change "slot" to "page". "Slot" is a space of RVALUE.
+	  1. "Heap" consists of a set of "heap_page"s (pages).
+	  2. Each "heap_page" has "heap_page_body".
+	  3. "heap_page_body" has RVALUE (a.k.a. "slot") spaces.
+	  4. "sorted" is a sorted array of "heap_page"s, sorted
+	     by address of heap_page_body (for "is_pointer_to_heap").
+
+	  See https://bugs.ruby-lang.org/attachments/4008/data-heap_structure.png.
+
+Fri Oct 18 09:40:43 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master cee6788.  Changes:
+
+	  Fix test failure on vc10-x64 Server on rubyci.org due to attempting
+	  to File.chmod where it is not supported.
+
+	  Continuing work on improved gem dependencies file (Gemfile) support.
+
+	* test:  ditto.
+
+Fri Oct 18 06:02:49 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master f738c67.  Changes:
+
+	  Fixed test bug for ruby with ENABLE_SHARED = no
+
+	* test/rubygems:  ditto.
+
+Fri Oct 18 00:57:07 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tsort.rb (TSort.tsort): Extracted from TSort#tsort.
+	  (TSort.tsort_each): Extracted from TSort#tsort_each.
+	  (TSort.strongly_connected_components): Extracted from
+	  TSort#strongly_connected_components.
+	  (TSort.each_strongly_connected_component): Extracted from
+	  TSort#each_strongly_connected_component.
+
+Thu Oct 17 18:50:08 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (CALC_EXACT_MALLOC_SIZE_CHECK_OLD_SIZE): introduced.
+	  This macro enable checker compare with allocated memory and
+	  declared old_size of sized_xfree and sized_xrealloc.
+
+Thu Oct 17 18:45:41 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (STR_HEAP_SIZE): includes TERM_LEN(str).
+
+	* string.c (rb_str_memsize): use STR_HEAP_SIZE().
+
+Thu Oct 17 17:43:00 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): set ci->me to 0 when the
+	  original method of a refined method is undef to avoid SEGV.
+
+	* vm_method.c (rb_method_entry_without_refinements): return 0 when
+	  the original method of a refined method is undef to avoid SEGV.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Thu Oct 17 17:38:36 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c, internal.h: rename ruby_xsizefree/realloc to
+	  rb_sized_free/realloc.
+
+	* array.c: catch up these changes.
+
+	* string.c: ditto.
+
+Thu Oct 17 17:32:51 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c, string.c: use ruby_xsizedfree() and ruby_xsizedrealloc().
+
+	* internal.h (SIZED_REALLOC_N): define a macro as REALLOC_N().
+
+Thu Oct 17 17:11:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (console_emulator_p): check by comparison between
+	  module handle of WriteConsoleW and kernel32.dll.
+
+	* configure.in, win32/Makefile.sub, win32/setup.mak: no longer need
+	  psapi.lib.
+
+Thu Oct 17 16:53:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c, internal.h: add new internal memory management functions.
+	  * void *ruby_xsizedrealloc(void *ptr, size_t new_size, size_t old_size)
+	  * void ruby_xsizedfree(void *x, size_t size)
+	  These functions accept additional size parameter to calculate more
+	  accurate malloc_increase parameter which control GC timing.
+	  [Feature #8985]
+
+Thu Oct 17 14:21:34 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/file.c (rb_file_expand_path_internal): fix memory leaks at
+	  a non-absolute home exception.
+
+Thu Oct 17 14:06:39 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/object_tracing.c (newobj_i): fix memory leak.
+	  There is possibility to remain info due to missing FREEOBJ event.
+	  FREEOBJ events are skipped while suppress_tracing state, for example,
+	  during trace events are invoking.
+
+Thu Oct 17 12:30:16 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tsort.rb (TSort.each_strongly_connected_component_from):
+	  Extracted from TSort#each_strongly_connected_component_from.
+
+Thu Oct 17 11:07:06 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 941c21a.  Changes:
+
+	  Restored method bundler wants to remove for compatibility.
+
+	  Improvements to Gemfile compatibility.
+
+	* test/rubygems:  ditto.
+
+Thu Oct 17 08:08:11 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/object_tracing.c (newobj_i): add workaround.
+	  some bugs hits this check.
+
+	* ext/objspace/object_tracing.c (object_allocations_reporter_i): cast as pointer.
+
+Thu Oct 17 07:36:53 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 2abce58.  Changes:
+
+	  Fixed documentation generation when sdoc and json are installed as
+	  gems.
+
+	  Added some missing documentation.
+
+Thu Oct 17 07:10:26 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/curses/curses.c: [DOC] Cleaned up formatting consistency of rdoc
+	  comments for Curses, including period spacing and column width.
+
+	  This patch also fixed some typos. Thanks to @postmodern for the patch!
+	  [Fixes GH-420] https://github.com/ruby/ruby/pull/420
+
+Thu Oct 17 06:58:42 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/date/date_core.c: [DOC] plural grammar fixed by @scott113341
+	  Contributed via documenting-ruby.org: documenting-ruby/ruby#16
+	  https://github.com/documenting-ruby/ruby/pull/16
+
+Thu Oct 17 05:52:31 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/io/nonblock/nonblock.c: [DOC] Document io/nonblock by reprah
+	  [Fixes GH-418] https://github.com/ruby/ruby/pull/418 based on the
+	  original discussion from documenting-ruby/ruby#18
+
+Thu Oct 17 05:40:33 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (objspace_each_objects): do not skip empty RVALUEs.
+
+Thu Oct 17 05:31:31 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* error.c (rb_bug_reporter_add): return simply 0 if failed.
+	  Please check return value.
+
+Thu Oct 17 05:17:33 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/object_tracing.c: add new method
+	  ObjectSpace.trace_object_allocations_debug_start for GC debugging.
+	  If you encounter the BUG "... is T_NONE" (and so on) on your
+	  application, please try this method at the beginning of your app.
+
+Wed Oct 16 22:35:27 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/io/nonblock/nonblock.c: use rb_cIO instead of VALUE
+
+Wed Oct 16 17:45:13 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/runner.rb: check nil before calling `signal?'
+	  for a process status.
+
+Wed Oct 16 17:37:17 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* error.c, internal.h (rb_bug_reporter_add): add a new C-API.
+	  rb_bug_reporter_add() allows to register a function which
+	  is called at rb_bug() called.
+
+	* ext/-test-/bug_reporter/bug_reporter.c: add a test for this C-API.
+
+	* ext/-test-/bug_reporter/extconf.rb: ditto.
+
+	* test/-ext-/bug_reporter/test_bug_reporter.rb: ditto.
+
+Wed Oct 16 15:14:21 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* NEWS: add a line into NEWS for last commit.
+
+Wed Oct 16 15:09:14 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c: add a new method `reachable_objects_from_root'.
+	  ObjectSpace.reachable_objects_from_root returns all objects referred
+	  from root (called "root objects").
+	  This feature is for deep object analysis.
+
+	* test/objspace/test_objspace.rb: add a test.
+
+Wed Oct 16 15:00:21 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master b955554.  Changes:
+
+	  Fixed NameError for Gem::Ext due to re-entering file lookup in
+	  RubyGems' overridden require.  Bug by Koichi Sasada.
+
+	  Fixed possible circular require warning in tests.
+
+	  Used existing constant for `gem install -g` dependency file list.
+
+	* test/rubygems:  ditto.
+
+Wed Oct 16 09:42:42 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 278d00d.  Changes:
+
+	  Fixes building extensions without a "clean" make rule
+
+	  Adds gem dependency file autodetection to "gem install -g"
+
+	* test/rubygems:  Tests for the above.
+
+Wed Oct 16 09:12:23 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master commit 2a74263.  This fixes
+	  several bugs in RubyGems 2.2.0.preview.1.
+
+	* test/rubygems:  ditto.
+
+Wed Oct 16 07:25:02 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (gc_mark_roots): rename roots to be categories
+	  instead of function names.
+
+Tue Oct 15 19:18:13 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.h (rb_objspace_reachable_objects_from_root): added.
+	  This API provides information which objects are root objects.
+	  `category' shows what kind of root objects.
+
+	* gc.c (gc_mark_roots): separate from gc_marks_body().
+
+Tue Oct 15 17:47:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: Fix a typo.  MacOS X doesn't have ENOTSUPP.
+
+Mon Oct 14 12:32:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): load statically linked extensions before
+	  rubygems, because of ext/thread.
+
+	* ruby.c (process_options): use gem_prelude instead of requiring
+	  rubygems directly when --enable=gems is given.
+
+	* Makefile.in (DEFAULT_PRELUDES): always use gem_prelude regardless of
+	  --disable-rubygems.
+
+Mon Oct 14 11:07:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (have_framework): should append framework options to
+	  $LIBS, not $LDFLAGS.  The former is propagated to exts.mk when
+	  enable-static-linked-ext.
+
+	* lib/mkmf.rb (create_makefile): ranlib on static library, not DLLIB.
+
+Sun Oct 13 23:53:40 2013  Andrew Grimm  <andrew.j.grimm@gmail.com>
+
+	* vsnprintf.c: Fix spelling from compliment to complement.
+	  Patch by @agrimm.
+
+	* include/ruby/ruby.h: ditto
+
+Sun Oct 13 20:59:27 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (Init_BareVM): initialize defined_module_hash here,
+	  Init_top_self() is too late to register core classes/modules.
+
+	* compile.c (compile_array_): no hash to merge if it is empty.
+
+	* vm.c (m_core_hash_merge_kwd): just check keys if only one argument
+	  is given, without merging.
+
+Sat Oct 12 06:35:01 2013-10-11  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rake:  Update to rake 10.1.0
+	* bin/rake:  ditto.
+	* test/rake:  ditto.
+
+	* NEWS:  Update NEWS to include rake 10.1.0 and links to release notes.
+
+Sat Oct 12 03:26:04 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c, variable.c, gc.c (rb_class_tbl): removed.
+
+	* vm.c, vm_core.h (rb_vm_add_root_module): added to register as a
+	  defined root module or class.
+	  This guard helps mark miss from defined classes/modules they are
+	  only referred from C's global variables in C-exts.
+	  Basically, it is extension's bug.
+	  Register to hash object VM has.
+	  Marking a hash objects allows generational GC supports.
+
+	* gc.c (RGENGC_PRINT_TICK): disable (revert).
+
+Sat Oct 12 03:24:49 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_method.c (rb_gc_mark_unlinked_live_method_entries):
+	  revert last commit to introduce debug prints.
+
+Fri Oct 11 21:05:19 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* internal.h, parse.y: use `full_mark' instead of `full_marking'.
+
+Fri Oct 11 20:58:16 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: use terminology `full_mark' instead of `minor_gc'
+	  in mark functions.
+
+Fri Oct 11 20:46:09 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: use __GNUC__ instead of __GCC__.
+
+Fri Oct 11 20:35:59 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c, parse.y: support generational Symbol related marking.
+	  Each symbols has String objects respectively to represent
+	  Symbols.
+	  These objects are marked only when:
+	  * full marking
+	  * new symbols are added
+	  This hack reduce symbols (related strings) marking time.
+	  For example, on my Linux environment, the following code
+	    "20_000_000.times{''}"
+	  with 40k symbols (similar symbol number on Rails 3.2.14 app,
+	  @jugyo tells me) boosts, from 7.3sec to 4.2sec.
+
+	* internal.h: change prototype of rb_gc_mark_symbols().
+
+Fri Oct 11 19:27:22 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el: Import ruby-electric.el 2.0.1 which fixes
+	  a bug and a flaw with auto-end introduced in the revamp.
+
+	  * ruby-forward-sexp is inappropriate here because it moves the
+	    cursor past the keyword.
+
+	  * Fix a reversed looking-back check in
+	    ruby-electric--block-beg-keyword-at-point-p.
+
+	  * Do not add end again if space or return is hit repeatedly
+	    after a block beginning keyword.
+
+Fri Oct 11 18:12:47 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/gc_hook.c: prohibit reentrant.
+
+Fri Oct 11 18:11:34 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (rb_postponed_job_flush): fix bit operation.
+
+Fri Oct 11 17:33:24 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el: Import ruby-electric.el 2.0 from
+	  https://github.com/knu/ruby-electric.el which integrates changes
+	  from another fork by @qoobaa.
+
+	  * Allow ruby-electric-mode to be disabled by introducing a
+	    dedicated key map.  Electric key bindings are now defined in
+	    ruby-electric-mode-map instead of overwriting ruby-mode-map.
+
+	  * Add ruby-electric-mode-hook.
+
+	  * Use a remap in binding ruby-electric-delete-backward-char.
+
+	  * Totally revamp electric keywords and then introduce electric
+	    return.  Modifier keywords are now properly detected making
+	    use of ruby-mode's indentation level calculator, and
+
+	  * block-mid keywords (then, else, elsif, when, rescue and
+	    ensure) also become electric with automatic reindentation.
+
+	  * Add standardized comments for ELPA integration.
+
+	  * Fix interaction with smartparens-mode by disabling its end
+	    keyword completion, since ruby-electric has become more clever
+	    at it.
+
+	  * The custom variable `ruby-electric-keywords` is changed to
+	    `ruby-electric-keywords-alist`, allowing user to fine-grained
+	    configuration.
+
+Fri Oct 11 16:53:28 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (rb_postponed_job_flush): simplify.
+
+Fri Oct 11 03:36:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_threadptr_execute_interrupts): flush postponed job only
+	  once at last.
+
+	* vm_trace.c (rb_postponed_job_flush): defer calling postponed jobs
+	  registered while flushing to get rid of infinite reentrance of
+	  ObjectSpace.after_gc_start_hook.  [ruby-dev:47400] [Bug #8492]
+
+Thu Oct 10 23:04:00 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_or): remove unused variables.
+
+Thu Oct 10 23:01:16 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_or): use rb_hash_keys().
+
+Thu Oct 10 21:36:16 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_compact_bang): use ary_resize_smaller().
+
+Thu Oct 10 17:25:28 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (vm_exec): support :b_return event for "lambda{return}.call".
+	  [Bug #8622]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+Thu Oct 10 13:52:37 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (postponed_job): use preallocated buffer.
+	  Pre-allocate MAX_POSTPONED_JOB (1024) sized buffer
+	  and use it.
+	  If rb_postponed_job_register() cause overflow, simply it
+	  fails and returns 0.
+	  And maybe rb_postponed_job_register() is signal safe.
+
+	* vm_core.h: change data structure.
+
+Thu Oct 10 11:11:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (Init_VM): hide also the singleton class of frozen-core, not
+	  only frozen-core itself.
+
+Thu Oct 10 06:02:08 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_rand.rb: fix r43224. local variable `e' is
+	  no longer available.
+
+Thu Oct 10 00:02:35 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* numeric.c (fix_aref): avoid a possible undefined behavior.
+	  1L << 63 on 64-bit platform is undefined, at least, according to
+	  ISO/IEC 9899 (C99) 6.5.7.
+
+Wed Oct  9 23:57:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (id_for_attr): avoid inadvertent symbol creation.
+
+Wed Oct  9 18:03:01 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_attr): preserve encoding of the attribute ID in
+	  error message.
+
+Wed Oct  9 17:40:16 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_fstring): because of lazy sweep, str may be unmarked
+	  already and swept at next time, so mark it for the time being.
+	  [ruby-core:57756]
+
+Wed Oct  9 13:53:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compar.c (cmp_eq): fail if recursion.  [ruby-core:57736] [Bug #9003]
+
+	* thread.c (rb_exec_recursive_paired_outer): new function which is
+	  combination of paired and outer variants.
+
+Wed Oct  9 09:18:14 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/debug.h,
+	  vm_backtrace.c (rb_profile_frame_full_label): add new C API
+	  rb_profile_frame_full_label() which returns label with
+	  qualified method name.
+	  Note that in future version of Ruby label() may return
+	  same return value of full_label().
+
+	* ext/-test-/debug/profile_frames.c,
+	  test/-ext-/debug/test_profile_frames.rb: fix a test for this change.
+
+
+Wed Oct  9 00:55:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (load_lock): display backtrace to $stderr at circular
+	  require.
+
+	* vm_backtrace.c (rb_backtrace_print_to): new function to print
+	  backtrace to the given output.
+
+Tue Oct  8 21:03:35 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c, include/ruby/debug.h: add new APIs
+	  * VALUE rb_profile_frame_method_name(VALUE frame)
+	  * VALUE rb_profile_frame_qualified_method_name(VALUE frame)
+
+	* iseq.c (rb_iseq_klass), internal.h: add new internal function
+	  rb_iseq_method_name().
+
+	* ext/-test-/debug/profile_frames.c (profile_frames),
+	  test/-ext-/debug/test_profile_frames.rb: add a test.
+
+Tue Oct  8 16:11:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_uniq): use rb_hash_values(), as well as the case no
+	  block is given.
+
+	* internal.h: define rb_hash_values() as internal API.
+
+Tue Oct  8 13:53:21 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_uniq): use rb_hash_keys().
+
+	* internal.h: define rb_hash_keys() as internal API.
+
+	* hash.c (rb_hash_keys): ditto.
+
+Tue Oct  8 10:56:39 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* cont.c: disable FIBER_USE_NATIVE on GNU/Hurd because it doesn't
+	  support a combination getcontext() and threads. Patch by
+	  Gabriele Giacone (1o5g4r8o@gmail.com). [Bug #8990][ruby-core:57685]
+
+Tue Oct  8 05:58:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.strptime): Time.strptime('0', '%s') returns local
+	  time Time object as Ruby 2.0 and before.
+
+Tue Oct  8 05:40:37 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* .travis.yml:  Rebuild Travis CI's "ruby-head" version on successful
+	  build.  Patch by Konstantin Haase.  [Fixes GH-417]
+	  https://github.com/ruby/ruby/pull/417
+
+Tue Oct  8 04:28:25 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-mode.el: Use preceding-char/following-char
+	  (returning 0 at BOF/EOF) instead of char-before/char-after
+	  (returning nil at BOF/EOF) to avoid error from char-syntax when
+	  at BOF/EOF.
+
+Tue Oct  8 04:12:45 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-additional.el (ruby-mode-set-encoding): Add a missing
+	  else clause to unbreak with `cp932`, etc.
+
+	* misc/ruby-mode.el (ruby-mode-set-encoding): Ditto.
+
+Tue Oct  8 03:57:34 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-additional.el (ruby-mode-set-encoding): Use
+	  `default-buffer-file-coding-system` if the :prefer-utf-8
+	  property is not available.
+
+	* misc/ruby-mode.el (ruby-mode-set-encoding): Ditto.
+
+	* misc/ruby-additional.el (ruby-encoding-map): Override the
+	  default value.
+
+Tue Oct  8 03:19:19 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-additional.el (ruby-mode-set-encoding): Add support
+	  for `prefer-utf-8` which was introduced in Emacs trunk.
+
+	* misc/ruby-additional.el (ruby-encoding-map): Add a mapping from
+	  `japanese-cp932` to `cp932` to fix the problem where saving a
+	  source file written in Shift_JIS twice would end up having
+	  `coding: japanese-cp932` which Ruby could not recognize.
+
+	* misc/ruby-additional.el (ruby-mode-set-encoding): Add support
+	  for encodings mapped to nil in `ruby-encoding-map`.
+
+	* misc/ruby-additional.el (ruby-encoding-map): Map `us-ascii` and
+	  `utf-8` to nil by default, meaning they need not be explicitly
+	  declared in magic comment.
+
+	* misc/ruby-additional.el (ruby-encoding-map): Add type
+	  declaration for better customize UI.
+
+	* misc/ruby-mode.el: Ditto for the above.
+
+Tue Oct  8 00:14:53 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-additional.el: Add a standard header and footer,
+	  including (provide 'ruby-additional).
+
+Mon Oct  7 22:52:45 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el (ruby-electric-space-can-be-expanded-p):
+	  Return nil to avoid "end" insertion when in smartparens-mode
+	  that is configured to insert "end" for the same keyword.
+
+	* misc/ruby-electric.el (ruby-electric-keywords): New custom
+	  variable to replace `ruby-electric-simple-keywords-re` with.
+
+Mon Oct  7 22:52:16 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-additional.el: Use preceding-char/following-char
+	  (returning 0 at BOF/EOF) instead of char-before/char-after
+	  (returning nil at BOF/EOF) to avoid error from char-syntax when
+	  at BOF/EOF.
+
+Mon Oct  7 22:45:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (FIBER_USE_NATIVE): split long conditions.
+
+Mon Oct  7 20:29:31 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/time.rb: [DOC] typo in Time.rb overview by @srt32 [Fixes GH-416]
+	  https://github.com/ruby/ruby/pull/416
+
+Mon Oct  7 20:07:20 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.strptime): Use :offset.
+	  Patch by Felipe Contreras.  [ruby-core:57694]
+
+Mon Oct  7 16:47:27 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/-ext-/debug/test_profile_frames.rb: rename class C to
+	  something long name because one test depends on absence of
+	  class ::C.
+
+Mon Oct  7 16:33:10 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/-test-/debug/profile_frames.c:
+	  test/-ext-/debug/test_profile_frames.rb: add a test for new C-APIs.
+
+Mon Oct  7 16:12:36 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/debug.h: add backtrace collecting APIs for profiler.
+	  * int rb_profile_frames(int start, int limit, VALUE *buff, int *lines);
+	    Collect information of frame information.
+
+	  * VALUE rb_profile_frame_path(VALUE frame);
+	  * VALUE rb_profile_frame_absolute_path(VALUE frame);
+	  * VALUE rb_profile_frame_label(VALUE frame);
+	  * VALUE rb_profile_frame_base_label(VALUE frame);
+	  * VALUE rb_profile_frame_first_lineno(VALUE frame);
+	  * VALUE rb_profile_frame_classpath(VALUE frame);
+	  * VALUE rb_profile_frame_singleton_method_p(VALUE frame);
+	    Get information about each frame.
+
+	  These APIs are designed for profilers, for example, no object allocation,
+	  and enough information for profilers.
+	  In this version, this API collects only Ruby level frames.
+	  This issue will be fixed after Ruby 2.1.
+
+	* vm_backtrace.c: implement above APIs.
+
+	* iseq.c (rb_iseq_klass): return local_iseq's class.
+
+Mon Oct  7 14:26:01 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c: catch up last commit.
+	  Type of return value of rb_iseq_first_lineno() is now VALUE.
+
+	* vm_insnhelper.c (argument_error): ditto.
+
+	* vm_method.c (rb_method_entry_make): ditto.
+
+Mon Oct  7 14:07:45 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c, internal.h: change to public (but internal) functions
+	  * VALUE rb_iseq_path(VALUE iseqval);
+	  * VALUE rb_iseq_absolute_path(VALUE iseqval);
+	  * VALUE rb_iseq_label(VALUE iseqval);
+	  * VALUE rb_iseq_base_label(VALUE iseqval);
+	  * VALUE rb_iseq_first_lineno(VALUE iseqval);
+	  And new (temporary) function:
+	  * VALUE rb_iseq_klass(VALUE iseqval);
+
+	* iseq.c. vm_core.h (int rb_iseq_first_lineno): remove
+	  function `int rb_iseq_first_lineno(const rb_iseq_t *iseq)'.
+	  Use `VALUE rb_iseq_first_lineno(VALUE iseqval)' instead.
+
+	* proc.c. vm_insnhelper.c, vm_method.c: catch up this change.
+
+Sun Oct  6 08:37:39 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/webrick.rb: [DOC] fix grammar in WEBrick overview [Fixes GH-413]
+	  Based on patch by @chastell https://github.com/ruby/ruby/pull/413
+
+Sat Oct  5 11:21:01 2013  Aaron Pfeifer  <aaron.pfeifer@gmail.com>
+
+	* thread.c (terminate_atfork_i): fix locking mutexes not unlocked in
+	  forks when not tracked in thread.  [ruby-core:55102] [Bug #8433]
+
+Fri Oct  4 19:54:09 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/dbm/dbm.c: [DOC] Fix wrong constant name in DBM by @edward
+	  [Fixes GH-409] https://github.com/ruby/ruby/pull/409
+
+Fri Oct  4 19:49:42 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c: rename heap.free_num as heap.swept_num to clarify meaning and
+	  avoid confusion with objspace_free_num().
+
+Fri Oct  4 19:02:01 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (objspace_free_num): new method for available/free slots on
+	  heap. [ruby-core:57633] [Bug #8983]
+	* gc.c (gc_stat): change heap_free_num definition to use new method.
+	* test/ruby/test_gc.rb: test for above.
+
+Fri Oct  4 18:53:42 2013  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c: add rb_objspace.limit to keep accurate count of total heap
+	  slots [ruby-core:57633] [Bug #8983]
+
+Fri Oct  4 09:32:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/csv.rb (CSV.foreach): support enumerator.  based on a patch by
+	  Hanmac (Hans Mackowiak) at [ruby-core:57643].  [ruby-core:57283]
+	  [Feature #8929]
+
+Thu Oct  3 18:20:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (console_emulator_p, constat_handle): disable built-in
+	  console colorizing when console-emulator-like DLL is injected.
+	  [Feature #8201]
+
+Thu Oct  3 18:01:44 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: define gc_profile_record::allocated_size if
+	  CALC_EXACT_MALLOC_SIZE is true.
+
+Thu Oct  3 13:42:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (yes-test-sample): use RUNRUBY instead of MINIRUBY to set
+	  runtime library path and run the built ruby.  [Bug #8971]
+
+Thu Oct  3 00:17:15 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-additional.el: Properly quote the body.  An unquoted
+	  body given to eval-after-load is evaluated immediately!
+
+Wed Oct  2 21:38:30 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/socket/ifaddr.c (rsock_getifaddrs): fix possible memory leak.
+	  When a system had no interface, this function used xmalloc for root
+	  but did not return any reference to it.  This patch fixes it by
+	  immediately returning an empty array if no interface is found.
+	  Coverity Scan found this bug.
+
+Wed Oct  2 21:37:04 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* random.c (make_seed_value): a local array declaration was accessed
+	  out of scope.  Coverity Scan found this bug.
+
+Wed Oct  2 18:52:40 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: relax GC condition due to malloc_limit.
+
+	* gc.c (GC_MALLOC_LIMIT_MAX): change default value
+	  (256MB -> 512MB) and permit zero to ignore max value.
+
+	* gc.c (vm_malloc_increase, vm_xrealloc): do not cause GC on realloc.
+
+	* gc.c (gc_before_sweep): change debug messages.
+
+Wed Oct  2 16:26:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_close_read): duplex IO should wait its child process
+	  even after close_read.
+
+Wed Oct  2 15:39:13 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_core.h: use __has_attribute() instead of __clang__major__ because
+	  clang says "Note that marketing version numbers should not be used
+	  to check for language features, as different vendors use different
+	  numbering schemes. Instead, use the Feature Checking Macros."
+	  http://clang.llvm.org/docs/LanguageExtensions.html
+
+Wed Oct  2 14:19:57 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_close_write): detach tied IO for writing before closing
+	  to get rid of race condition.  [ruby-list:49598]
+
+	* io.c (rb_io_close_read): keep fptr in write_io to be discarded, to
+	  fix freed pointer access when it is in use by other threads, and get
+	  rid of potential memory/fd leak.
+
+Tue Oct  1 23:44:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* vm_core.h: use __attribute__((unused)) in UNINITIALIZED_VAR on clang
+	  4.0+ instead of just on 4.2. Clang has supported the unused attribute
+	  since before version 4, so this should be safe.
+
+Tue Oct  1 22:03:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#unlink): finalizer is no longer needed
+	  after unlinking.  patched by by normalperson (Eric Wong) at
+	  [ruby-core:56521] [Bug #8768]
+
+Tue Oct  1 20:54:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (stat_new_0): constify.
+
+	* file.c (rb_stat_new): constify and export.  based on a patch by
+	  Hanmac (Hans Mackowiak) at [ruby-core:53225].  [Feature #8050]
+
+Tue Oct  1 16:03:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (ruby_safe_level_4_warning): needed by extension
+	  libraries which check safe level 4.  [ruby-dev:47517] [Bug #8652]
+
+Mon Sep 30 23:14:36 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/objspace/objspace.c: [DOC] Cleaned up many rdoc formatting
+	  issues and several duplicate grammar bugs.
+
+Mon Sep 30 23:01:01 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/objspace/object_tracing.c: [DOC] Adjust rdoc formatting and fix
+	  small grammar typo
+
+Mon Sep 30 17:28:39 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/object_tracing.c: [DOC] add some notes for
+	  ObjectSpace::trace_object_allocations.
+
+Mon Sep 30 16:46:58 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/object_tracing.c: add new 3 methods to control tracing.
+	  * ObjectSpace::trace_object_allocations_start
+	  * ObjectSpace::trace_object_allocations_stop
+	  * ObjectSpace::trace_object_allocations_clear
+	  And some refactoring.
+
+	* test/objspace/test_objspace.rb: add a test for new methods.
+
+	* NEWS: add a description for new methods.
+
+Mon Sep 30 11:18:04 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_disable): do rest_sweep() before disable GC.
+	  This fix may solve a failure of
+	  TestTracepointObj#test_tracks_objspace_events
+	  [test/-ext-/tracepoint/test_tracepoint.rb:43].
+
+Mon Sep 30 10:40:20 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (rb_undef): raise a NameError if the original method
+	  of a refined method is not defined.
+
+	* vm_insnhelper.c (rb_method_entry_eq): added NULL check to avoid SEGV.
+
+	* test/ruby/test_refinement.rb: related test.
+
+Sun Sep 29 23:45:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_id_attrset, intern_str): allow junk attrset ID for
+	  Struct.
+
+	* parse.y (rb_id_attrset): fix inconsistency with literals, allow
+	  ID_ATTRSET and return it itself, but ID_JUNK cannot make ID_ATTRSET.
+	  and raise a NameError instead of rb_bug() for invalid argument.
+
+Sun Sep 29 18:45:05 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_insnhelper.c (vm_callee_setup_arg_complex, vm_yield_setup_block_args):
+	  clear keyword arguments to prevent GC bug which occurs
+	  while marking VM stack.
+	  [ruby-dev:47729] [Bug #8964]
+
+	* test/ruby/test_keyword.rb: tests for the above.
+
+Sat Sep 28 23:25:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* math.c (math_log, math_log2, math_log10): fix for Bignum argument.
+	  numbits should be add only when right shifted.
+
+Sat Sep 28 14:30:29 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/dl/test_base.rb: {libc, libm} detection now handle GNU/Hurd
+	  correctly. Patch by Gabriele Giacone (1o5g4r8o@gmail.com).
+	  [Bug #8937][ruby-core:57311]
+	* test/fiddle/helper.rb: ditto.
+
+Sat Sep 28 00:19:41 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/curses/extconf.rb: check the size of chtype.
+
+	* ext/curses/curses.c (NUM2CH, CH2NUM): use proper macros for
+	  the size of chtype.
+
+	[ruby-core:56090] [Bug #8659]
+
+Fri Sep 27 18:33:23 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add two GC tuning environment variables.
+	  RUBY_GC_MALLOC_LIMIT_MAX and RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR.
+	  See r43067 for details.
+
+	* gc.c (rb_gc_set_params): refactoring. And change verbose notation.
+	  Mostly duplicated functions get_envparam_int/double is not cool.
+	  Please rewrite it.
+
+	* test/ruby/test_gc.rb: fix a test for this change.
+
+Fri Sep 27 17:44:41 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (GC_MALLOC_LIMIT): 8,000,000 -> 8 * 1,024 * 1,024.
+
+Fri Sep 27 17:19:39 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_before_sweep): cast to size_t to suppress warnings.
+
+Fri Sep 27 17:07:55 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add some fine-grained profiling codes to tuning marking phase.
+	  If you enable RGENGC_PRINT_TICK to 1, then profiling results by RDTSC
+	  (on x86/amd64 environment) are printed at last.
+	  Thanks Yoshii-san.
+
+Fri Sep 27 16:32:27 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: simplify threshold of GC caused by malloc_increase.
+	  Now, malloc_limit is increased/decreased by mysterious logic.
+	  This fix simplify malloc_limit increase/decrease logic such as:
+	    if (malloc_increase > malloc_limit) /* so many malloc */
+	      malloc_limit += malloc_limit * (GC_MALLOC_LIMIT_FACTOR-1);
+	    else
+	      malloc_limit -= malloc_limit * (GC_MALLOC_LIMIT_FACTOR-1)/4;
+	  Default value of GC_MALLOC_LIMIT_FACTOR is 1.8.
+	  malloc_limit is bounded by GC_MALLOC_LIMIT_MAX (256MB by default).
+	  This logic runs at gc_before_sweep(). So there are no effect from
+	  caused by lazy sweep. And we can remove malloc_increase2.
+
+	* gc.c (HEAP_MIN_SLOTS, FREE_MIN, HEAP_GROWTH_FACTOR): rename to
+	  GC_HEAP_MIN_SLOTS, GC_FREE_MIN, GC_HEAP_GROWTH_FACTOR respectively.
+	  Check them by `#ifndef' so you can specify these values outside gc.c.
+
+	* gc.c (ruby_gc_params_t): add initial_malloc_limit_factor and
+	  initial_malloc_limit_max.
+
+	* gc.c (vm_malloc_prepare, vm_xrealloc): use vm_malloc_increase to
+	  add and check malloc_increase.
+
+Fri Sep 27 01:05:00 2013  Zachary Scott  <e@zzak.io>
+
+	* re.c: [DOC] arguments of Regexp::union receive #to_regexp [Bug #8205]
+
+Fri Sep 27 00:39:27 2013  Zachary Scott  <e@zzak.io>
+
+	* struct.c: [DOC] grammar of ArgumentError in Struct.new [Bug #8936]
+	  Patch by Prathamesh Sonpatki
+
+Thu Sep 26 22:11:56 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/bigdecimal/bigdecimal.c: [DOC] several fixes by @chastell
+	  This includes fixing the capitalization of Infinity, return value of
+	  example "BigDecimal.new('NaN') == 0.0", and code style in example.
+	  [Fixes GH-398] https://github.com/ruby/ruby/pull/398
+
+Thu Sep 26 22:08:11 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/observer.rb: [DOC] syntax improvement in example by @chastell
+	  [Fixes GH-400] https://github.com/ruby/ruby/pull/400
+
+Thu Sep 26 22:03:15 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/digest/digest.c: [DOC] typo in overview by @chastell
+	  [Fixes GH-399] https://github.com/ruby/ruby/pull/399
+
+Thu Sep 26 22:00:42 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl.c: [DOC] typo in example by @zoranzaric
+	  [Fixes GH-401] https://github.com/ruby/ruby/pull/401
+
+Thu Sep 26 21:07:49 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el (ruby-electric-delete-backward-char): Add
+	  support for smartparens-mode.
+
+	* misc/ruby-electric.el (ruby-electric-cua-replace-region-maybe)
+	  (ruby-electric-cua-delete-region-maybe): New functions that
+	  combine `ruby-electric-cua-*-region` with
+	  `ruby-electric-cua-*-region-p`, using a slightly better way to
+	  detect if it is in cua-mode.
+
+Thu Sep 26 16:51:00 2013  Shota Fukumori  <her@sorah.jp>
+
+	* insns.def (opt_regexpmatch2): Check String#=~ hasn't overridden
+	  before calling rb_reg_match().
+
+	* test/ruby/test_string.rb: Test for above.
+
+	* vm.c (vm_init_redefined_flag): Add BOP flag for String#=~
+
+	[ruby-core:57385] [Bug #8953]
+
+Thu Sep 26 16:43:42 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el: Avoid use of the interactive function
+	  `self-insert-command` which fires `post-self-insert-hook` and
+	  `post-command-hook`, to make the ruby-electric commands work
+	  nicely with those minor modes that make use of them to do
+	  similar input assistance, such as electric-pair-mode,
+	  autopair-mode and smartparens-mode.
+
+Thu Sep 26 16:24:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* insns.def (opt_regexpmatch1): check Regexp#=~ is not defined before
+	  calling rb_reg_match()
+
+	* test/ruby/test_regexp.rb: add test
+
+	* vm.c (ruby_vm_redefined_flag): change type to short[]
+
+	* vm.c (vm_redefinition_check_flag): return REGEXP_REDEFINED_OP_FLAG if
+	  klass == rb_cRegexp
+
+	* vm.c (vm_init_redefined_flag): setup BOP flag for Regexp#=~
+
+	* vm_insnhelper.h: add REGEXP_REDEFINED_OP_FLAG
+
+	[ruby-core:57385] [Bug #8953]
+
+Thu Sep 26 14:46:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (mark_locations_array): disable AddressSanitizer.  based on a
+	  patch by halfie (Ruby Guy) at [ruby-core:57372].
+	  [ruby-core:56155] [Bug #8680]
+
+Wed Sep 25 17:41:29 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* README.EXT, README.EXT.ja: remove description of RARRAY_PTR()
+	  and add a caution of accessing internal data structure directly.
+	  Also add a description of rb_ary_store().
+	  [Bug #8399]
+
+Wed Sep 25 17:12:08 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: rename RARRAY_RAWPTR() to RARRAY_CONST_PTR().
+	  RARRAY_RAWPTR(ary) returns (const VALUE *) type pointer and
+	  usecase of this macro is not acquire raw pointer, but acquire
+	  read-only pointer. So we rename to better name.
+	  RSTRUCT_RAWPTR() is also renamed to RSTRUCT_CONST_PTR()
+	  (I expect that nobody use it).
+
+	* array.c, compile.c, cont.c, enumerator.c, gc.c, proc.c, random.c,
+	  string.c, struct.c, thread.c, vm_eval.c, vm_insnhelper.c:
+	  catch up this change.
+
+Wed Sep 25 16:58:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (rb_float_value, rb_float_new): move inline functions
+	  from ruby/ruby.h.
+
+	* numeric.c (rb_float_value, rb_float_new): define external functions
+	  for extension libraries.
+
+Wed Sep 25 15:37:02 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/rdoc/test_rdoc_generator_darkfish.rb: add a guard for windows.
+
+Wed Sep 25 09:53:11 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Fix CVE-2013-4363.  Miscellaneous minor improvements.
+
+	* test/rubygems:  Tests for the above.
+
+Tue Sep 24 17:38:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_inspect): get rid of out-of-bound access.
+
+	* string.c (rb_str_inspect): when a UTF-16/32 string doesn't have a
+	  BOM, inspect as a dummy encoding string.
+
+Tue Sep 24 17:15:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/encdb.c (ENC_DUMMY_UNICODE): make BOM-encodings dummy.
+
+	* encoding.c (enc_autoload): keep dummy encodings dummy.
+
+Tue Sep 24 16:41:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry#write): data size
+	  is in bytes, not chars.  terminators should be placed automatically.
+
+Tue Sep 24 16:39:36 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry#each_value): encode
+	  name.
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry#each_key): ditto.
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry#export_string):
+	  encode to locale encoding if default internal is not set.
+
+Tue Sep 24 16:35:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry::API#EnumKey):
+	  size of the name is in WCHARs, not in bytes.
+
+Tue Sep 24 14:07:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* gc.c (free_method_cache_entry_i): unused function
+
+	* gc.c (rb_free_mc_table): ditto
+
+	* internal.h (method_cache_entry_t): unused struct
+
+	* vm_method.c (verify_method_cache): remove unused variable
+
+	* vm_method.c (rb_method_entry): ditto
+
+Tue Sep 24 14:01:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* class.c (class_alloc): remove mc_tbl
+
+	* gc.c (obj_free): ditto
+
+	* internal.h (struct rb_classext_struct): ditto
+
+	* method.h (rb_method_entry): remove ent param
+
+	* vm_method.c: restore the global method cache. Per class cache tables
+	  turned out to be far too slow.
+
+	  [ruby-core:57289] [Bug #8930]
+
+Tue Sep 24 12:51:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry::API): need
+	  Constants.
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry::API#EnumValue):
+	  size of the name is in WCHARs, not in bytes.
+
+Mon Sep 23 22:16:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/encdb.c, enc/utf_16_32.h (ENC_DUMMY_UNICODE): Unicode with BOM
+	  must be based on big endian variants, so that actual encodings would
+	  work.  [ruby-core:57318] [Bug #8940]
+
+Mon Sep 23 12:11:26 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (env_each_pair): do not call rb_assoc_new() if
+	  it isn't needed.
+
+Mon Sep 23 10:42:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_module.rb (TestModule#test_include_toplevel): test
+	  for top level main.include.  based on a part of the patch by
+	  kyrylo at [GH-395].
+
+Mon Sep 23 05:07:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_ary_cat): move from internal.h, since it
+	  is described in README.EXT.
+
+Sun Sep 22 20:55:20 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_insnhelper.c (vm_make_proc_with_iseq): fix bug message.
+	  This is follow up to changes in r42637.
+
+Sun Sep 22 20:35:38 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/-test-/tracepoint/tracepoint.c (Init_tracepoint): prevent from GC.
+
+Sun Sep 22 19:00:28 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* benchmark/bm_app_answer.rb: revert r42990, benchmark scripts should
+	  be self-contained and avoid dependencies, especially such small one.
+	  See https://github.com/ruby/ruby/pull/393#issuecomment-24861301.
+
+Sat Sep 21 20:11:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_fork_internal): remove cloexec setting on pipes
+	  created by rb_cloexec_pipe.  patch by normalperson (Eric Wong) at
+	  [ruby-core:56523].  [Bug #8769]
+
+Sat Sep 21 01:04:25 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/benchmark.rb: [DOC] grammar of Benchmark#bm [Bug #8888]
+	  Patch by Prathamesh Sonpatki
+
+Sat Sep 21 00:50:02 2013  Zachary Scott  <e@zzak.io>
+
+	* enumerator.c: [DOC] Enumerator#each arguments documentation [GH-388]
+	  Patch by @kachick  https://github.com/ruby/ruby/pull/388
+
+Sat Sep 21 00:49:16 2013  Zachary Scott  <e@zzak.io>
+
+	* enum.c: [DOC] Enumerable#to_a accepts arguments [GH-388]
+	  Patch by @kachick https://github.com/ruby/ruby/pull/388
+
+Sat Sep 21 00:47:44 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_conv_enc_opts): make sure to scan coderange to get
+	  rid of unnecessary conversion.
+
+Sat Sep 21 00:21:08 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/lib/openssl/ssl.rb: [DOC] Document OpenSSL::SSLServer
+	  Based on a patch by Rafal Lisowski [Bug #8758]
+
+Fri Sep 20 23:54:03 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/gserver.rb: [DOC] correct gserver.rb license [Bug #8913]
+
+Fri Sep 20 23:48:34 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/psych/yaml/yaml.h: [DOC] merge upstream typo fix by @GreenGeorge
+	  https://github.com/tenderlove/psych/pull/161
+
+Fri Sep 20 23:37:40 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/securerandom.rb: [DOC] SecureRandom.hex length argument
+	  [Fixes GH-394] Patch by @avdi https://github.com/ruby/ruby/pull/394
+
+Fri Sep 20 23:34:48 2013  Zachary Scott  <e@zzak.io>
+
+	* benchmark/bm_app_answer.rb: removed duplicate code [Fixes GH-393]
+	  Patch by @gouravtiwari https://github.com/ruby/ruby/pull/393
+
+Fri Sep 20 23:24:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (btest, btest-ruby, test-knownbug): add $(RUN_OPTS) to
+	  ruby to be run, so that tests are runnable before making exts.
+
+	* common.mk (test-sample): ditto, and use $(MINIRUBY) as rubytest.rb
+	  does not need extension libraries.
+
+	* tool/rubytest.rb: pass $(RUN_OPTS) to testing ruby using --run-opt.
+
+Fri Sep 20 15:01:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (intern_str): sigil only names are junk, at least one
+	  identifier character is needed.  [ruby-dev:47723] [Bug #8928]
+
+	* parse.y (rb_enc_symname_type): fix out of bound access.
+
+Fri Sep 20 14:14:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/-test-/printf/printf.c (printf_test_call): Fix an end of buffer
+	  argument.
+
+Thu Sep 19 16:59:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lambda): adjust position to the beginning of the block.
+
+Thu Sep 19 16:25:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): initialize cp so that size is 0 in the
+	  commented case.  fix an accidental bug at r16716.
+
+Thu Sep 19 14:33:14 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* NEWS: add a news for r42974.
+
+Thu Sep 19 14:12:02 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: make Symbol objects frozen.
+	  [Feature #8906]
+	  I want to freeze this good day, too.
+
+	* test/ruby/test_eval.rb: catch up this change.
+
+	* test/ruby/test_symbol.rb: add a test to check frozen symbols.
+
+Thu Sep 19 09:11:33 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* NEWS:  Update for RDoc 4.1.0.preview.1 and RubyGems 2.2.0.preview.1
+
+Thu Sep 19 08:59:41 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/markdown/literals_1_9.rb:  Fix trailing whitespace.
+
+	  Previously kpeg (which generates this file) added trailing
+	  whitespace, but this bug is now fixed.
+
+	* lib/rdoc/markdown.rb:  ditto.
+
+Thu Sep 19 08:33:14 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc 4.1.0.preview.1
+
+	  RDoc 4.1.0 contains a number of enhancements including a new default
+	  style and accessibility support.  You can see the changelog here:
+
+	  https://github.com/rdoc/rdoc/blob/v4.1.0.preview.1/History.rdoc
+
+	* test/rdoc:  ditto.
+
+Thu Sep 19 07:16:26 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: updating Psych version
+
+	* ext/psych/psych.gemspec: ditto
+
+Thu Sep 19 06:39:40 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_resolver.rb:  Switch the iterative resolver
+	  algorithm from recursive to iterative to avoid possible
+	  SystemStackError.
+
+Thu Sep 19 06:29:30 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 2.2.0.preview.1
+
+	  This brings several new features to RubyGems summarized here:
+
+	  https://github.com/rubygems/rubygems/blob/v2.2.0.preview.1/History.txt
+
+	* test/rubygems:  ditto.
+
+Wed Sep 18 23:14:58 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* string.c (rb_str_enumerate_lines): make String#each_line and
+	  #lines not raise invalid byte sequence error when it is called
+	  with an argument. The patch also causes performance improvement.
+	  [ruby-dev:47549] [Bug #8698]
+
+	* test/ruby/test_m17n_comb.rb (test_str_each_line): remove
+	  assertions which check that String#each_line and #lines will
+	  raise an error if the receiver includes invalid byte sequence.
+
+Wed Sep 18 16:32:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (mnew_from_me): allocate structs after allocated wrapper
+	  object successfully, to get rid of potential memory leak.
+
+Tue Sep 17 15:54:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/shell/command-processor.rb (Shell::CommandProcessor#find_system_command):
+	  return executable file only, should ignore directories and
+	  unexecutable files.  [ruby-core:57235] [Bug #8918]
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert_throw):
+	  assertion for throw.  MiniTest::Assertions#assert_throws discards
+	  the caught value.
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert_nothing_thrown):
+	  returns the result of the given block.
+
+Tue Sep 17 12:55:58 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/regexp.rdoc:  [DOC] Replace paragraphs in verbatim sections with
+	  plain paragraphs to improve readability as ri and HTML.
+
+Mon Sep 16 07:32:35 2013  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: removed meaningless lines.
+	* rational.c: ditto.
+
+Mon Sep 16 00:44:23 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* ext/socket/mkconstants.rb: define MSG_FASTOPEN.
+	  [ruby-core:57138] [Feature #8897]
+
+Sun Sep 15 13:31:23 2013  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_div): reverted r28844, r28886 and r28887.
+	  REASON: Nobuyoshi Nakada  <nobu@ruby-lang.org>'s commits are buggy.
+	  So Rational#/ may produce exact number with inexact number.
+	  Moreover, without reducing.
+	  REALLY NONSENSE COMMITS.
+	  A bug report by me [ruby-dev:44710] is also caused by this behavior.
+	  Kenta Murata  <mrkn@mrkn.jp> patched it up.
+	  But he did not fix the origin.
+	  Today, the bug is still alive in ruby 1.9.3 and 2.0.0.
+
+Sat Sep 14 06:08:10 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* dir.c (dir_s_glob):  [DOC] Improve wording and layout.
+
+	* dir.c (file_s_fnmatch):  ditto.
+
+	* dir.c (Init_Dir):  [DOC] Document File::Constants::FNM_XXX
+	  constants.  (These won't show up in RDoc until a new RDoc is
+	  imported.)
+
+Thu Sep 12 14:58:58 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic.find_proxy): return nil if
+	  http_proxy environment variable is empty string.
+	  [ruby-core:57140] [Bug #8898]
+
+Fri Sep 13 10:40:28 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 2.1.3
+
+	  Fixed installing platform gems
+
+	  Restored concurrent requires
+
+	  Fixed installing gems with extensions with --install-dir
+
+	  Fixed `gem fetch -v` to install the latest version
+
+	  Fixed installing gems with "./" in their files entries
+
+	* test/rubygems/test_gem_package.rb:  Tests for the above.
+
+	* NEWS:  Updated for RubyGems 2.1.3
+
+Thu Sep 12 22:40:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SIGNEDNESS): macro to check signedness of a
+	  type.
+
+	* configure.in (size_t): must be unsigned.
+	  [ruby-core:57149] [Feature #8890]
+
+Thu Sep 12 22:37:08 2013  Anton Ovchinnikov  <revolver112@gmail.com>
+
+	* ext/bigdecimal/bigdecimal.c, ext/digest/md5/md5.c,
+	  ext/json/fbuffer/fbuffer.h, ext/json/generator/generator.c:
+	  Eliminate less-than-zero checks for unsigned variables.
+	  According to section 4.1.5 of C89 standard, size_t is an unsigned
+	  type.  These checks were found with 'cppcheck' static analysis tool.
+	  [ruby-core:57117] [Feature #8890]
+
+Thu Sep 12 21:35:46 2013  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* Makefile.in (libruby-static.a): change LDFLAGS order. LDFLAGS may
+	  include library path that should be specified before LIBS.
+	  [ruby-dev:47707] [Bug #8901]
+
+Thu Sep 12 20:07:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vsnprintf.c (MAXEXP, MAXFRACT): calculate depending on constants in
+	  float.h.
+
+	* vsnprintf.c (BSD_vfprintf): limit length for cvt() to get rid of
+	  buffer overflow.  [ruby-core:57023] [Bug #8864]
+
+	* vsnprintf.c (exponent): make expbuf size more precise.
+
+Wed Sep 11 17:30:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUNRUBY): append -- only after runruby.rb, not
+	  cross-compiling baseruby, so that $(RUN_OPT) can be command line
+	  options.  [ruby-dev:47703] [Bug #8893]
+
+Wed Sep 11 07:55:17 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_mutex_unlock): Mutex#unlock no longer raise
+	  an exception even if uses on trap. [Bug #8891]
+
+Tue Sep 10 14:37:01 2013  Shota Fukumori  <sorah@tubusu.net>
+
+	* vm_backtrace.c (vm_backtrace_to_ary): Ignore the second argument if
+	  it is nil. [Bug #8884] [ruby-core:57094]
+
+	* test/ruby/test_backtrace.rb (test_caller_with_nil_length):
+	  Test for above.
+
+Tue Sep 10 12:39:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (method_entry_i): should exclude refined methods from
+	  instance method list.  [ruby-core:57080] [Bug #8881]
+
+Tue Sep 10 12:05:04 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* io.c (rb_f_printf): [DOC] add missing parenthesis in rdoc.
+
+Tue Sep 10 10:08:00 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: Update RubyGems note.
+
+Tue Sep 10 09:51:22 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 2.1.0.  Fixes CVE-2013-4287.
+
+	  See http://rubygems.rubyforge.org/rubygems-update/CVE-2013-4287_txt.html
+	  for CVE information.
+
+	  See http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.1.0+%2F+2013-09-09
+	  for release notes.
+
+	* test/rubygems:  Tests for the above.
+
+Mon Sep  9 21:31:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: Remove spaces between SI prefix and unit to follow
+	  SI brochure.
+	  http://www.bipm.org/en/si/si_brochure/
+	  https://www.nmij.jp/library/units/si/
+
+	* time.c: Ditto.
+
+	* ext/socket/ancdata.c: Ditto.
+
+Mon Sep  9 16:55:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_add_refined_method_entry): clear cache in the
+	  refined class since refining a method entry is modifying the class.
+	  [ruby-core:57079] [Bug #8880]
+
+Mon Sep  9 09:14:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (Gem::Specification#initialize): default date to
+	  RUBY_RELEASE_DATE.  [ruby-core:57072] [Bug #8878]
+
+	* tool/rbinstall.rb (Gem::Specification#to_ruby): add date.
+
+Sun Sep  8 16:01:54 2013  Tanaka Akira  <akr@fsij.org>
+
+	* rational.c (f_gcd): Relax the condition to use GMP.
+
+Sun Sep  8 13:56:38 2013  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (folevariant_initialize): check type of
+	  element of array.
+
+	* test/win32ole/test_win32ole_variant.rb (test_s_new_ary): ditto.
+
+Sat Sep  7 21:33:10 2013  Tanaka Akira  <akr@fsij.org>
+
+	* math.c (math_log): Test the sign for bignums.
+	  (math_log2): Ditto.
+	  (math_log10): Ditto.
+
+Sat Sep  7 20:25:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* math.c (math_log): Support bignums bigger than 2**1024.
+	  (math_log2): Ditto.
+	  (math_log10): Ditto.
+
+Sat Sep  7 15:36:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* vm_eval.c (vm_call0): fix prototype, the id parameter should be of
+	  type ID, not VALUE
+
+	* vm_insnhelper.c (check_match): the rb_funcall family of functions
+	  does not care about refinements. We need to use
+	  rb_method_entry_with_refinements instead to call === with
+	  refinements. Thanks to Jon Conley for reporting this bug.
+	  [ruby-core:57051] [Bug #8872]
+
+	* test/ruby/test_refinement.rb: add test
+
+Sat Sep  7 13:49:40 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* variable.c (classname): the name of class that has
+	  non class id should not be nil. This bug was introduced
+	  in r36577.
+
+	* test/thread/test_cv.rb: test for change.
+
+Sat Sep  7 13:29:22 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/find.rb (Find.find): respect the encodings of arguments.
+	  [ruby-dev:47530] [Feature #8657]
+
+	* test/test_find.rb: add tests.
+
+Sat Sep  7 10:40:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb (TCP_FASTOPEN): Defined for TCP fast open.
+	  [ruby-core:57048] [Feature #8871] patch by Masaki Matsushita.
+
+Fri Sep  6 23:53:31 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* common.mk: use RUNRUBY instead of MINIRUBY because MINIRUBY can't
+	  require extension libraries. The patch is from nobu
+	  (Nobuyoshi Nakada).
+
+	* ext/thread/extconf.rb: for build ext/thread/thread.c.
+
+	* include/ruby/intern.h: ditto.
+
+	* thread.c: ditto.
+
+	* lib/thread.rb: removed and replaced by ext/thread/thread.c.
+
+	* ext/thread/thread.c: Queue, SizedQueue and ConditionVariable
+	  implementations in C. This patch is based on patches from panaggio
+	  (Ricardo Panaggio) and funny_falcon (Yura Sokolov) and  ko1
+	  (Koichi Sasada). [ruby-core:31513] [Feature #3620]
+
+	* test/thread/test_queue.rb (test_queue_thread_raise): add a test for
+	  ensuring that killed thread should be removed from waiting threads.
+	  It is based on a code by ko1 (Koichi Sasada). [ruby-core:45950]
+
+Fri Sep  6 22:47:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Define ac_cv_func_clock_getres to yes for mingw*.
+
+Fri Sep  6 21:04:10 2013  Tanaka Akira  <akr@fsij.org>
+
+	* rational.c: Include gmp.h if GMP is used.
+	  (GMP_GCD_DIGITS): New macro.
+	  (rb_gcd_gmp): New function.
+	  (f_gcd_normal): Renamed from f_gcd.
+	  (rb_gcd_normal): New function.
+	  (f_gcd): Invoke rb_gcd_gmp or f_gcd_normal.
+
+	* internal.h (rb_gcd_normal): Declared.
+	  (rb_gcd_gmp): Ditto.
+
+	* ext/-test-/rational: New directory.
+
+	* test/-ext-/rational: New directory.
+
+Fri Sep  6 14:23:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (clock_getres): required as well as clock_gettime().
+	  [ruby-dev:47699] [Bug #8869]
+
+Fri Sep  6 11:45:27 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (rb_econv_append): new function to append a string data
+	  with converting its encoding.  split from rb_econv_substr_append.
+
+Fri Sep  6 02:37:22 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: use double quotes when
+	  strings start with special characters.
+	  https://github.com/tenderlove/psych/issues/157
+
+	* test/psych/test_string.rb: test for change.
+
+Fri Sep  6 00:05:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rewrite_cref_stack): remove recursion.
+
+Thu Sep  5 18:05:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* string.c (fstring_cmp): take string encoding into account when
+	  comparing fstrings [ruby-core:57037] [Bug #8866]
+
+	* test/ruby/test_string.rb: add test
+
+Thu Sep  5 17:25:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_fstring, rb_str_free): use st_data_t instead of VALUE.
+
+	* string.c (rb_fstring): get rid of duplicating already frozen object.
+
+Thu Sep  5 14:01:22 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/optparse.rb:  The Integer acceptable now allows binary and
+	  hexadecimal numbers per the documentation.  [ruby-trunk - Bug #8865]
+
+	  DecimalInteger, OctalInteger, DecimalNumeric now validate their input
+	  before converting to a number.  [ruby-trunk - Bug #8865]
+
+	* test/optparse/test_acceptable.rb:  Tests for the above, tests for all
+	  numeric acceptables for existing behavior.
+
+Thu Sep  5 13:49:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* include/ruby/ruby.h: add RSTRING_FSTR flag
+
+	* internal.h: add rb_fstring() prototype
+
+	* string.c (rb_fstring): deduplicate frozen string literals
+
+	* string.c (rb_str_free): delete fstrings from frozen_strings table when
+	  they are GC'd
+
+	* string.c (Init_String): initialize frozen_strings table
+
+Thu Sep  5 12:48:00 2013  Kenta Murata  <mrkn@cookpad.com>
+
+	* configure.in (with_gmp): set with_gmp no if it is empty.
+
+Thu Sep  5 10:41:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_getivar): use class sequence to check class
+	  identity, instead of pointer + vm state
+
+	* vm_insnhelper.c (vm_setivar): ditto
+
+Thu Sep  5 08:20:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (GMP_DIV_DIGITS): New macro.
+	  (bary_divmod_gmp): New function.
+	  (rb_big_divrem_gmp): Ditto.
+	  (bary_divmod_branch): Ditto.
+	  (bary_divmod): Use bary_divmod_branch.
+	  (bigdivrem): Ditto.
+
+	* internal.h (rb_big_divrem_gmp): Declared.
+
+Thu Sep  5 06:22:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_divmod_normal): Reduce temporary array allocations.
+
+Thu Sep  5 02:17:06 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_divrem_normal): Add GC guards.
+
+Thu Sep  5 00:38:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_divrem_normal): New function.
+
+	* internal.h (rb_big_divrem_normal): Declared.
+
+	* ext/-test-/bignum/div.c: New file.
+
+	* test/-ext-/bignum/test_div.rb: New file.
+
+Thu Sep  5 00:08:44 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem_normal): Removed.
+	  (bary_divmod_normal): New function.
+	  (bary_divmod): Use bary_divmod_normal.
+	  (bigdivrem): Use bary_divmod_normal.
+
+Wed Sep  4 23:02:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem): Useless declaration removed.
+
+Wed Sep  4 22:56:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (NUM_STEP_GET_INF): split from NUM_STEP_SCAN_ARGS(), since
+	  inf is not used in num_step_size().
+
+Wed Sep  4 20:22:43 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem_normal): Add assertions.
+
+Wed Sep  4 19:18:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (vm_state_version_t): prefer LONG_LONG to uint64_t.
+
+Wed Sep  4 16:28:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (vm_state_version_t): use uint64_t when it is larger than
+	  LONG_LONG, and fallback to unsigned long.
+
+Wed Sep  4 15:37:05 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/utf8_mac-tbl.rb: fix r42789.
+	  Fix conversion table and logic. [ruby-dev:47680]
+
+Wed Sep  4 14:08:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* class.c, compile.c, eval.c, gc.h, insns.def, internal.h, method.h,
+	  variable.c, vm.c, vm_core.c, vm_insnhelper.c, vm_insnhelper.h,
+	  vm_method.c: Implement class hierarchy method cache invalidation.
+
+	  [ruby-core:55053] [Feature #8426] [GH-387]
+
+Wed Sep  4 11:13:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_gsub): use BEG(0) for whole matched position not
+	  return value from rb_reg_search(), for \K matching.
+	  [ruby-dev:47694] [Bug #8856]
+
+Wed Sep  4 11:11:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (SOLIBS): LIBRUBY_SO also needs linking with gmp, to
+	  run worker processes in test-all on non-ELF platforms.
+
+Tue Sep  3 23:01:41 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/parser/test_tree.rb
+	  (TestTreeParser::TestInvalid#test_unmatched_close_tag):
+	  Compute expected value from test value.
+
+Tue Sep  3 22:59:58 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/treeparser.rb (REXML::Parsers::TreeParser#parse):
+	  Add source information to parse exception on no close tag error.
+	  [Bug #8844]  [ruby-dev:47672]
+	  Patch by Ippei Obayashi. Thanks!!!
+	* test/rexml/parser/test_tree.rb: Add a test for the above case.
+
+Tue Sep  3 22:57:57 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/parser/test_tree.rb: Fix test name to describe test
+	  content.
+
+Tue Sep  3 22:54:46 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/treeparser.rb (REXML::Parsers::TreeParser#parse):
+	  Remove needless nested parse exception information.
+	  [Bug #8844]  [ruby-dev:47672]
+	  Reported by Ippei Obayashi. Thanks!!!
+	* test/rexml/parser/test_tree.rb: Add a test for the above case.
+
+Tue Sep  3 22:03:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_enc_str_new_cstr): new function to create a string from
+	  the C-string pointer with the specified encoding.
+
+Tue Sep  3 21:41:37 2013  Akira Matsuda  <ronnie@dio.jp>
+
+	* eval.c (Init_eval): Make Module#include and Module#prepend public
+	  [Feature #8846]
+
+	* test/ruby/test_module.rb (class TestModule): Test for above
+
+Tue Sep  3 21:35:19 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (sys/dyntune.h): for gettune().
+
+	* thread_pthread.c (hpux_attr_getstackaddr): fix missing *.
+	  [ruby-core:56983] [Feature #8793]
+
+Tue Sep  3 20:12:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (GMP_STR2BIG_DIGITS): New macro.
+	  (str2big_gmp): New function.
+	  (rb_cstr_to_inum): Use str2big_gmp for big bignums.
+	  (rb_str2big_gmp): New function.
+
+	* internal.h (rb_str2big_gmp): Declared.
+
+Tue Sep  3 19:44:40 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry#values): added.
+	  [Feature #7763] [ruby-core:51783]
+
+Tue Sep  3 18:26:00 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/inf-ruby.el (inf-ruby-keys, run-ruby): Add magic autoload
+	  comments.
+
+	* misc/rdoc-mode.el (rdoc-mode): Ditto.
+
+	* misc/ruby-electric.el (ruby-electric-mode): Ditto.
+
+	* misc/ruby-style.el (ruby-style-c-mode): Ditto.
+
+Tue Sep  3 17:06:15 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_rubyoptions.rb
+	  (TestRubyOptions::SEGVTest::ExpectedStderr): the URL was changed at
+	  r42800.
+
+Tue Sep  3 14:48:25 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/thread.rb: [DOC] CV#wait typo by @avdi [Fixes GH-386]
+	  https://github.com/ruby/ruby/pull/386
+
+Tue Sep  3 14:37:53 2013  Zachary Scott  <e@zzak.io>
+
+	* error.c: [DOC] Update bug tracker url by @ScotterC [Fixes GH-390]
+	  https://github.com/ruby/ruby/pull/390
+
+Tue Sep  3 12:45:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_str2big_poweroftwo): New function.
+	  (rb_str2big_normal): Ditto.
+	  (rb_str2big_karatsuba): Ditto.
+
+	* internal.h (rb_str2big_poweroftwo): Declared.
+	  (rb_str2big_normal): Ditto.
+	  (rb_str2big_karatsuba): Ditto.
+
+	* ext/-test-/bignum/str2big.c: New file.
+
+	* test/-ext-/bignum/test_str2big.rb: New file.
+
+	* ext/-test-/bignum/depend: Add the dependency for str2big.c.
+
+Tue Sep  3 12:09:08 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_clock_gettime): Support times() based monotonic clock.
+	  (rb_clock_getres): Ditto.
+
+Tue Sep  3 12:03:02 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (str2big_scan_digits): Extracted from rb_cstr_to_inum.
+
+Tue Sep  3 11:23:57 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_select_with_thread): rounding up the fraction of
+	  tv_usec instead of rounding down.
+	  this change is an experiment to get rid of failures on vc10-x64 CI.
+
+Tue Sep  3 11:00:28 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (do_select): constify timeout.
+
+	* win32/win32.c (rb_w32_select_with_thread): constify 10ms wait and
+	  0ms wait structs.
+
+Tue Sep  3 10:03:42 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/openssl/test_pair.rb
+	  (OpenSSL::TestPair#test_write_nonblock_no_exceptions): on some CIs
+	  such as Debian 6.0, Ubuntu 10.04, CentOS and vc10-x64 (maybe depend
+	  on OpenSSL version), writing to SSLSocket after SSL_ERROR_WANT_WRITE
+	  causes SSL_ERROR_SSL "bad write retry".
+
+Tue Sep  3 08:20:46 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/utf8_mac-tbl.rb: update conversion table to recent OS X.
+	  Previous table is used on Mac OS X 10.1 or prior.
+	  This table is used on 10.2 or later. [ruby-dev:47680]
+
+Tue Sep  3 07:49:25 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* numeric.c (NUM_STEP_SCAN_ARGS): On second thought, keep
+	  Numeric#step backward compatible in that it raises TypeError
+	  when nil is given as second argument.
+
+	* test/ruby/test_float.rb (TestFloat#test_num2dbl): Revert.
+
+	* test/ruby/test_numeric.rb (TestNumeric#test_step): Fix test
+	  cases for the above change.
+
+Tue Sep  3 07:39:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bytes_2comp): Define it only for little endian
+	  environment.
+
+Tue Sep  3 07:31:29 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* numeric.c (NUM_STEP_SCAN_ARGS): Numeric#step should raise
+	  TypeError if a non-numeric parameter is given.
+
+	* test/ruby/test_float.rb (TestFloat#test_num2dbl): Allow nil as
+	  step, as with the keyword argument.
+
+	* test/ruby/test_numeric.rb (TestNumeric#test_step): Add tests for
+	  nil as step or limit.
+
+Tue Sep  3 07:28:49 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (bit_length): Add casts to fix compilation error with
+	  clang 3.0 -Werror,-Wshorten-64-to-32.
+	  [ruby-dev:47687] reported by SASADA Koichi.
+
+Tue Sep  3 03:17:26 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_search_super_method): use ci->argc instead of
+	  ci->orig_argc. ci->argc can be changed by splat arguments.
+	  [ruby-list:49575]
+	  This fix should be applied to Ruby 2.0.0 series.
+
+	* test/ruby/test_super.rb: add a test for above.
+
+Mon Sep  2 23:46:29 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* numeric.c (num_step): Default the limit argument to infinity and
+	  allow it to be omitted.  Keyword arguments (by: and to:) are
+	  introduced for ease of use. [Feature #8838] [ruby-dev:47662]
+	  [ruby-dev:42194]
+
+	* numeric.c (num_step): Optimize for infinite loop.
+
+Mon Sep  2 22:55:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (ISDIGIT): Unused macro removed.
+
+Mon Sep  2 22:49:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (str2big_poweroftwo): Extracted from rb_cstr_to_inum.
+	  (str2big_normal): Ditto.
+	  (str2big_karatsuba): Ditto.
+
+Mon Sep  2 14:39:29 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ruby.c (Process#setproctitle): [DOC] Fix and improve rdoc.
+
+	* ruby.c (Process#argv0): [DOC] Improve rdoc.
+
+Mon Sep  2 14:15:00 2013  Kenta Murata  <mrkn@cookpad.com>
+
+	* NEWS: fix description of number literal suffixes.
+
+Mon Sep  2 14:01:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* test/rake/test_rake_rules.rb: add space after string literal to
+	  prevent conflict with string options syntax "foo"opts
+
+	* test/rss/rss-assertions.rb: ditto
+
+Mon Sep  2 12:28:38 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_bignum.rb (test_interrupt_during_to_s): Disable it
+	  when GMP is used.
+
+Mon Sep  2 07:02:10 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (Init_Bignum): Define Bignum::GMP_VERSION when GMP is used.
+
+Mon Sep  2 01:46:14 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_generic): Reduce arguments.
+	  (big2str_gmp): Ditto.
+	  (rb_big2str1): Follow the above change.
+
+Mon Sep  2 00:08:08 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (get_mach_timebase_info): Extracted from rb_clock_gettime.
+	  (rb_clock_gettime): Use get_mach_timebase_info.
+	  (rb_clock_getres): Support MACH_ABSOLUTE_TIME_BASED_CLOCK_MONOTONIC.
+
+Sun Sep  1 23:30:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (GMP_BIG2STR_DIGITS): New constant.
+	  (big2str_gmp): New function.
+	  (rb_big2str1): Use big2str_gmp for big bignums.
+
+	* internal.h (rb_big2str_gmp): Declared.
+
+	* ext/-test-/bignum/big2str.c (big2str_gmp): New method.
+
+Sun Sep  1 22:37:51 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul_gmp): Use mpz_init and mpz_clear instead of
+	  mpz_inits and mpz_clears.
+	  Older GMP don't have them.
+
+Sun Sep  1 21:17:54 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/net/http/test_http.rb (test_bind_to_local_port): Choose an open
+	  port more reliably.
+
+Sun Sep  1 20:32:40 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_base_poweroftwo): Renamed from
+	  big2str_base_powerof2.
+	  (rb_big2str_poweroftwo): New function for test.
+	  (big2str_generic): Extracted from rb_big2str1.
+	  (rb_big2str_generic): New function for test.
+
+	* internal.h (rb_big2str_poweroftwo): Declared.
+	  (rb_big2str_generic): Ditto.
+
+	* ext/-test-/bignum/big2str.c: New file.
+
+	* test/-ext-/bignum/test_big2str.rb: New file.
+
+Sun Sep  1 15:21:21 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_2bdigits): Renamed from big2str_orig.
+
+Sun Sep  1 13:02:24 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: Remove BITSPERDIG >= INT_MAX test.  The static assertion,
+	  SIZEOF_BDIGITS <= sizeof(BDIGIT) is enough.
+
+Sun Sep  1 11:38:26 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (maxpow_in_bdigit): Removed.
+
+Sun Sep  1 10:30:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_fix_bit_length): Moved from bignum.c.
+
+Sun Sep  1 09:55:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (bit_length): Moved from bignum.c.
+	  (nlz_int): Ditto.
+	  (nlz_long): Ditto.
+	  (nlz_long_long): Ditto.
+	  (nlz_int128): Ditto.
+
+Sun Sep  1 03:32:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bit_length): Renamed from bitsize.
+
+Sun Sep  1 00:07:09 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_bit_length): New method.
+	  (rb_fix_bit_length): Ditto.
+	  [ruby-core:56247] [Feature #8700]
+
+Sat Aug 31 22:18:29 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_clock_getres): New method.
+	  (timetick2dblnum_reciprocal): New function.
+
+	* configure.in: Check clock_getres.
+
+	[ruby-core:56780] [Feature #8809] accepted as a CRuby feature at
+	DevelopersMeeting20130831Japan
+	https://bugs.ruby-lang.org/projects/ruby/wiki/DevelopersMeeting20130831Japan
+
+Sat Aug 31 21:02:07 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: Use GMP to accelerate big Bignum multiplication.
+	  (bary_mul_gmp): New function.
+	  (bary_mul): Use bary_mul_gmp.
+	  (bigsq): Use different threshold with GMP.
+
+	* configure.in: Detect GMP.
+
+	[ruby-core:56658] [Feature #8796]
+
+Sat Aug 31 15:03:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* compile.c (NODE_MATCH3): pass CALL_INFO to opt_regexpmatch2
+
+	* insns.def (opt_regexpmatch2): use CALL_SIMPLE_METHOD to call =~ if
+	  the receiver is not a T_STRING [Bug #8847] [ruby-core:56916]
+
+Sat Aug 31 14:07:11 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb (random_bytes): Use Process.clock_gettime.
+
+Sat Aug 31 00:25:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h (rb_{ascii8bit,utf8,usascii}_encindex): get
+	  rid of conflict with macros defined in internal.h.
+
+Fri Aug 30 22:37:57 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (native_thread_init_stack): wait the creator thread
+	  to fill machine stack info, if get_stack_of() is available.
+
+	* thread_pthread.c (native_thread_create): fill the created thread
+	  stack info after starting, if get_stack_of() is available.
+
+	* thread_pthread.c (native_thread_create): define attr only if it is
+	  used, and merge pthread_create() calls.
+
+	* thread_pthread.c (get_main_stack): separate function to get stack of
+	  main thread.
+
+Thu Aug 29 18:05:33 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* struct.c (rb_struct_define_without_accessor_under): added.
+	  This function is similar to rb_define_class_under() against
+	  rb_define_class().
+
+	* include/ruby/intern.h: add a declaration of this function.
+
+Thu Aug 29 17:03:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): a method entry refers the based
+	  class/module, so should search superclass from the origin i-class
+	  where the entry belongs to, to get rid of infinite loop when zsuper
+	  in a prepended class/module.  [ruby-core:54105] [Bug #8238]
+
+Thu Aug 29 05:35:58 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c (zstream_run):  Fix handling of deflate streams that
+	  need a dictionary but are being decompressed by Zlib::Inflate.inflate
+	  (which has no option to set a dictionary).  Now Zlib::NeedDict is
+	  raised instead of crashing.  [ruby-trunk - Bug #8829]
+	* test/zlib/test_zlib.rb (TestZlibInflate):  Test for the above.
+
+Thu Aug 29 02:40:45 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: invalid floats should be
+	  treated as strings.
+	  https://github.com/tenderlove/psych/issues/156
+
+	* test/psych/test_string.rb: test for change
+
+Wed Aug 28 17:20:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (hpux_attr_getstackaddr): basic support for the
+	  get_stack() under HP-UX.  based on the patch by michal@rokos.cz
+	  (Michal Rokos) at [ruby-core:56645].  [Feature #8793]
+
+Wed Aug 28 11:24:20 2013  Michal Rokos  <michal@rokos.cz>
+
+	* configure.in (sys/pstat.h): fix missing header check for
+	  missing/setproctitle.c on HP-UX.  [ruby-core:56644] [Bug #8792]
+
+Wed Aug 28 04:54:33 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read):  Replace duplicate
+	  wait_writable with wait_readable.
+
+Tue Aug 27 17:18:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/timeout.rb (Timeout#timeout): skip rescue clause only when no
+	  exception class is given.
+
+Tue Aug 27 17:02:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (copy_stream_body): should write in binary mode.  based on a
+	  patch by godfat (Lin Jen-Shin) at [ruby-core:56556].
+	  [ruby-core:56518] [Bug #8767]
+
+Tue Aug 27 17:02:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (copy_stream_body): move common open flags.
+
+Tue Aug 27 16:56:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (enumerator_size): use rb_check_funcall() instead of
+	  respond_to? and call.
+
+	* enumerator.c (enumerator_each): ensure that argument array size
+	  does not overflow at appending.
+
+Tue Aug 27 16:46:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_index, rb_ary_rindex): use optimized equality to
+	  improve performance.  [Feature #8820]
+
+	* vm_insnhelper.c (rb_equal_opt): optimized equality function.
+
+Tue Aug 27 16:11:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (opt_eq_func): use RBASIC_CLASS() instead of HEAP_CLASS_OF().
+
+	* insns.def (opt_plus, opt_minus, opt_mult, opt_div, opt_mod, opt_lt),
+	  (opt_gt, opt_ltlt, opt_aref, opt_aset, opt_length, opt_size),
+	  (opt_empty_p, opt_succ): ditto.
+
+Tue Aug 27 16:08:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_check_funcall, rb_check_funcall_with_hook): constify
+	  argv.
+
+Tue Aug 27 13:03:33 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/stringio/stringio.c (strio_read_nonblock): declare local
+	  variables at the first of function.
+
+Tue Aug 27 11:51:37 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* enumerator.c: Allow Enumerator size argument to be any callable.
+	  Patch by Avdi Grimm. [bug #8641] [ruby-core:56032] [fix GH-362]
+
+	* test/ruby/test_enumerator.rb: Test for above
+
+Tue Aug 27 11:46:31 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_profile_clear): do rest_sweep() before clearing
+	  profile.current_record.
+
+Tue Aug 27 07:35:05 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* io.c (io_read_nonblock): support non-blocking reads without raising
+	  exceptions. As in: `io.read_nonblock(size, exception: false)`
+	  [ruby-core:38666] [Feature #5138]
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read_internal): ditto
+	* ext/stringio/stringio.c (strio_sysread): ditto
+	* io.c (rb_io_write_nonblock): support non-blocking writes without
+	  raising an exception.
+	* ext/openssl/ossl_ssl.c (ossl_ssl_write_internal): ditto
+	* test/openssl/test_pair.rb (class OpenSSL): tests
+	* test/ruby/test_io.rb (class TestIO): ditto
+	* test/socket/test_nonblock.rb (class TestSocketNonblock): ditto
+	* test/stringio/test_stringio.rb (class TestStringIO): ditto
+
+Tue Aug 27 05:24:34 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Import RubyGems 2.1.0 Release Candidate
+	* test/rubygems:  ditto.
+
+Mon Aug 26 16:24:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_nextc): warn carriage return in middle of line.
+	  [ruby-core:56240] [Feature #8699]
+
+Mon Aug 26 15:27:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/timeout.rb (Timeout#timeout): should not be caught by rescue
+	  clause.  [Bug #8730]
+
+Mon Aug 26 14:44:26 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (rb_ary_splice): use RARRAY_PTR_USE() without WB because
+	  there are not new relations.
+
+	* enum.c (enum_sort_by): ditto.
+
+	* struct.c (setup_struct): use RARRAY_RAWPTR().
+
+	* vm_eval.c (yield_under): ditto.
+
+	* ext/pathname/pathname.c (path_entries): use RARRAY_AREF().
+
+	* ext/pathname/pathname.c (path_s_glob): ditto.
+
+Mon Aug 26 13:11:10 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* array.c (ary_ensure_room_for_push): fix typo in r42658.
+
+Mon Aug 26 12:37:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/sizes.c.tmpl: generate automatically by extracting
+	  RUBY_CHECK_SIZEOF from configure.in.
+
+Mon Aug 26 10:16:59 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* process.c (gcd_timetick_int): Renamed from gcd_timtick_int.
+
+Sun Aug 25 21:02:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* sizes.c (Init_sizes): Define the size of clock_t.
+
+Sun Aug 25 01:47:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (BARY_SHORT_MUL): Renamed from BARY_MUL1.
+	  (bary_short_mul): Renamed from bary_mul1.
+
+Sat Aug 24 10:35:09 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_clock_gettime): The emulated clock names changed.
+
+Fri Aug 23 22:22:07 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_clock_gettime): Add a cast to fix compile error by
+	  -Werror,-Wshorten-64-to-32.
+
+Fri Aug 23 22:12:13 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_intern): no symbol cache while initialization.
+
+Fri Aug 23 22:07:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (clock_t): needs time.h.
+
+Fri Aug 23 21:37:28 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (reduce_factors): New function.
+	  (timetick2dblnum): Use reduce_factors.
+	  (timetick2integer): Ditto.
+	  (make_clock_result): Follow the above change.
+	  (rb_clock_gettime): Ditto.
+
+Fri Aug 23 21:00:55 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (timetick_int_t): Renamed from timetick_giga_count_t.
+	  (gcd_timtick_int): Renamed from gcd_ul and make the arguments
+	  timetick_giga_count_t.
+	  (reduce_fraction): Make the arguments timetick_int_t.
+	  (timetick2integer): Ditto.
+	  (make_clock_result): Ditto.
+	  (timetick2dblnum): Fix the return type.
+	  (rb_clock_gettime): Use timetick_int_t.
+
+Fri Aug 23 20:50:40 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (gcd_ul): New function.
+	  (reduce_fraction): Ditto.
+	  (reduce_fraction): Ditto.
+	  (timetick2dblnum): Ditto.
+	  (timetick2integer): Ditto.
+	  (make_clock_result): Use timetick2dblnum and timetick2integer.
+	  (rb_clock_gettime): Follow the make_clock_result change.
+
+Fri Aug 23 18:39:04 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ary_make_shared): shared ary as shady. Need more effort to
+	  make it normal object.
+
+	* array.c (rb_ary_modify): use RARRAY_PTR_USE() without WB because
+	  there are not new relations.
+
+	* array.c (ary_ensure_room_for_unshift): use RARRAY_RAWPTR() because
+	  there are not new relations.
+
+Fri Aug 23 11:25:57 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c: introduce ARY_SHARED_OCCUPIED(shared).
+
+Fri Aug 23 11:07:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): now SIZEOF_CLOCK_T is needed for
+	  unsigned_clock_t.
+
+Thu Aug 22 22:01:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_clock_gettime): Strip "s" from unit names.
+
+Thu Aug 22 20:14:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (unsigned_clock_t): Defined.
+	  (rb_clock_gettime): Consider clock_t overflow for
+	  ISO_C_CLOCK_BASED_CLOCK_PROCESS_CPUTIME_ID.
+
+	* configure.in: Check the size of clock_t.
+
+Thu Aug 22 16:22:48 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (build_postexe_iseq): fix to setup the local table.
+
+Thu Aug 22 15:42:43 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (rb_iseq_compile_node): accept NODE_IFUNC to support
+	  custom compilation.
+
+	* compile.c (NODE_POSTEXE): compile to
+	  "ONCE{ VMFrozenCore::core#set_postexe{...} }" with a new custom
+	  compiler `build_postexe_iseq()'.
+
+	* vm.c (m_core_set_postexe): remove parameters (passed by a block).
+
+Thu Aug 22 06:54:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_clock_gettime): Change emulation symbols for
+	  Process.clock_gettime.
+
+Thu Aug 22 06:24:54 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (make_clock_result): Extracted from rb_clock_gettime.
+
+Wed Aug 21 22:30:51 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_clock_gettime): clock() based CLOCK_PROCESS_CPUTIME_ID
+	  emulation implemented.
+
+Wed Aug 21 21:02:37 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_proc_times): Use RB_GC_GUARD to guard objects from GC.
+
+Wed Aug 21 20:33:01 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (get_clk_tck): Extracted from rb_proc_times.
+	  (rb_clock_gettime): times() based CLOCK_PROCESS_CPUTIME_ID emulation
+	  is implemented.
+
+Wed Aug 21 19:31:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: POSIX_GETTIMEOFDAY_CLOCK_REALTIME is renamed to
+	  SUS_GETTIMEOFDAY_CLOCK_REALTIME.
+
+Wed Aug 21 19:17:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_clock_gettime): CLOCK_PROCESS_CPUTIME_ID emulation
+	  using getrusage is implemented.
+
+Wed Aug 21 17:34:27 2013  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (getrusage_time): Fallback clock_gettime to getrusage when
+	  clock_gettime fails.
+	  Reported by Eric Saxby.  [ruby-core:56762] [Bug #8805]
+
+Wed Aug 21 02:32:32 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def: fix regexp's once option behavior.
+	  fix [ruby-trunk - Bug #6701]
+
+	* insns.def: remove `onceinlinecache' and introduce `once' instruction.
+	  `once' doesn't use `setinlinecache' insn any more.
+
+	* vm_core.h: `union iseq_inline_storage_entry' to store once data.
+
+	* compile.c: catch up above changes.
+
+	* iseq.c: ditto.
+
+	* vm.c, vm_insnhelper.c: ditto. fix `m_core_set_postexe()' which
+	  is depend on `onceinlinecache' insn.
+
+	* test/ruby/test_regexp.rb: add tests.
+
+	* iseq.c: ISEQ_MINOR_VERSION to 1 (should increment major?)
+
+Wed Aug 21 02:30:15 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gcdebug_print_obj_condition): add printing information.
+
+Tue Aug 20 13:38:00 2013  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* test/gdbm/test_gdbm.rb: skip TestGDBM#test_s_open_lock on Solaris.
+	  On Solaris (and platforms which do not have flock and have lockf),
+	  with GDBM 1.10, gdbm_open(3) blocks when opening already locked
+	  gdbm file. [Bug #8790] [ruby-dev:47631]
+
+Tue Aug 20 02:32:52 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/test/: [DOC] Document Test::Unit, hide most submodules and
+	  classes from rdoc. Since lib/test is only present as a compatibility
+	  layer with the legacy test suite many test/unit users will be using
+	  minitest or the test/unit gem instead. It is recommended to use one
+	  of these alternatives for writing new tests.
+
+	  This patch was based on a patch submitted by Steve Klabnik.
+	  [ruby-core:56694] [Bug #8778]
+
+Tue Aug 20 02:10:19 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rss/rss.rb: [DOC] Document for constants by Steve Klabnik
+	  [ruby-core:56705] [Bug #8798]
+
+Tue Aug 20 02:01:10 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rss/xmlparser.rb: [DOC] Hide legacy constant from rdoc
+	  Patch by Steve Klabnik [ruby-core:56708] [Bug #8799]
+
+Tue Aug 20 01:52:05 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/socket/unixserver.c: [DOC] Document #accept
+	* ext/socket/tcpserver.c: ditto
+	* ext/socket/udpsocket.c: [DOC] Fix indentation of documentation
+	* ext/socket/socket.c: ditto
+	  Patches by David Rodr'iguez [ruby-core:56734] [Bug #8802]
+
+Tue Aug 20 01:19:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Define ac_cv_func_clock_gettime to yes for mingw*.
+
+Mon Aug 19 21:31:35 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/defines.h: Fix a compilation error with
+	  i586-mingw32msvc-gcc of gcc-mingw32 package on Debian squeeze.
+	  ruby/missing.h should be included before include/ruby/win32.h
+	  because struct timespec, used in the clock_gettime declaration in
+	  include/ruby/win32.h, is defined in ruby/missing.h instead of
+	  system headers.
+
+Mon Aug 19 20:55:12 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix around GC_DEBUG.
+
+	* gc.c (RVALUE::line): should be VALUE. On some environment
+	  (such as mswin64), `int' introduces alignment mismatch.
+
+	* gc.c (newobj_of): add an assertion to check VALUE alignment.
+
+	* gc.c (aligned_malloc): `&' is low priority than `=='.
+
+	* gc.c: define GC_DEBUG everytime and use it as value 0 or 1.
+
+Mon Aug 19 17:43:44 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_fiber.rb: collect garbage fibers immediately.
+
+Mon Aug 19 17:41:49 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/profile_test_all.rb: add `failed?' information.
+
+Mon Aug 19 17:00:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (retry_fork): retry with GC if ENOMEM occurred, to free
+	  swap/kernel space.
+
+Mon Aug 19 13:28:47 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h (CLOCK_MONOTONIC): typo.
+
+	* win32/win32.c: removed duplicated declarations.
+
+Mon Aug 19 13:03:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (clock_gettime): should not overwrite cache variable
+	  with different condition.  otherwise -lrt is not linked and the link
+	  fails, after reconfig.
+
+Mon Aug 19 12:56:49 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (Init_process): Add constants: CLOCK_REALTIME_ALARM and
+	  CLOCK_BOOTTIME_ALARM.
+
+Sun Aug 18 20:17:41 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* variable.c, vm_method.c: remove dead code.
+
+	* test/ruby/test_fiber.rb, test/ruby/test_thread.rb:
+	  change accordingly.
+
+Sun Aug 18 19:32:26 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* error.c, file.c, gc.c, hash.c, thread.c, variable.c, vm_eval.c, bin/erb:
+	  $SAFE=4 is obsolete.
+
+Sun Aug 18 14:30:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_clock_gettime): Rename POSIX_TIME_CLOCK_REALTIME to
+	  ISO_C_TIME_CLOCK_REALTIME.
+
+Sun Aug 18 14:22:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Revert r42604.  It causes linking librt on systems
+	  with newer glibc uselessly.
+
+Sun Aug 18 13:18:38 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (Init_process): Add constants: CLOCK_REALTIME_COARSE,
+	  CLOCK_MONOTONIC_COARSE and CLOCK_BOOTTIME.
+
+Sun Aug 18 12:41:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (clock_gettime): need to check with -lrt prior to check
+	  for the function only.  otherwise -lrt is not linked and the link
+	  fails, when ac_cv_func_clock_gettime is cached as yes.
+
+Sun Aug 18 10:05:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big2str1): Make an expression more explicit.
+
+Sun Aug 18 03:18:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big2str1): Use power_level instead of bitsize(xn).
+
+Sun Aug 18 00:44:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (BIGDIVREM_EXTRA_WORDS): Redefine to 1.
+	  (bigdivrem_num_extra_words): Removed.
+	  (bigdivrem_normal): Simplified.
+	  (big2str_karatsuba): Ditto.
+
+Sat Aug 17 23:25:19 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* test/ruby/test_time.rb: use the in_timezone() helper
+	  and define it at the top with other helpers.
+
+Sat Aug 17 22:20:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_mload): ignore auxiliary data, offset and zone, if
+	  invalid.  [ruby-core:56648] [Bug #8795]
+
+Sat Aug 17 20:11:49 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* process.c: [DOC] MACH_ABSOLUTE_TIME_CLOCK_MONOTONIC is an
+	  available emulation for a monotonic clock on Darwin.
+	  https://developer.apple.com/library/mac/qa/qa1398/_index.html
+
+Fri Aug 16 18:12:05 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/profile_test_all.rb: fix typo.
+
+Fri Aug 16 18:09:20 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/profile_test_all.rb: remove space characters from test names.
+
+Fri Aug 16 17:32:02 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/profile_test_all.rb: refactoring memory profiling tool for
+	  test-all.
+	  Add profiling targets /proc/meminfo and /proc/self/status.
+
+	* test/runner.rb: accept other than 'true'.
+
+Fri Aug 16 11:23:35 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_file_size, rb_file_flock): improve performance of Windows.
+
+	* file.c (rb_file_truncate): removed unnecessary #ifdef.
+
+	* test/test_file.rb (TestFile#test_truncate_size): added an assertion
+	  for File#size.
+
+Fri Aug 16 10:07:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem_single1): Renamed from bigdivrem_single.  Add
+	  x_higher_bdigit argument.
+	  (bigdivrem_single): Just call bigdivrem_single1.
+	  (bigdivrem_restoring): Use bigdivrem_single1 to avoid memmove.
+
+Fri Aug 16 09:17:00 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_small_rshift): Specify the higher BDIGIT instead of
+	  sign bit.
+	  (big_shift3): Follow the above change.
+
+Fri Aug 16 02:20:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul_toom3): Reduce a branch.
+
+Fri Aug 16 02:14:09 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c (rb_clock_gettime): add CLOCK_MONOTONIC support on OS X.
+	  http://developer.apple.com/library/mac/qa/qa1398/_index.html
+	  [Feature #8658]
+
+Fri Aug 16 01:37:43 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem_single): Use shift when y is a power of two.
+
+Fri Aug 16 01:09:33 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem_restoring): Use bigdivrem_single if non-topmost
+	  BDIGITs of y are zero.
+
+Fri Aug 16 00:33:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big2str1): Truncate topmost zeros of x.
+
+Fri Aug 16 00:00:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_divmod): Simplify an expression.
+
+Thu Aug 15 23:26:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem_normal): Remove a local variable.
+
+Thu Aug 15 23:08:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_karatsuba): Use bigdivrem_restoring directly to
+	  reduce working buffer and memory copy.
+	  (rb_big2str1): Allocate working buffer for big2str_karatsuba here.
+
+Thu Aug 15 20:51:29 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c, internal.h (rb_io_flush_raw): new function to select calling
+	  fsync() (on Windows).
+
+	* io.c (rb_io_flush_raw): use above function.
+
+	* file.c (rb_file_truncate): use above function.
+
+	* test/ruby/test_file.rb (TestFile#test_truncate_size): test for
+	  above changes.
+
+Thu Aug 15 18:39:31 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (clock_gettime): improve precision when freq is less
+	  than and nearly equals 10**9.
+
+Thu Aug 15 17:43:15 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_lazy_sweep): remove heap_increment() here because heap_inc
+	  may be 0.
+
+Thu Aug 15 16:59:56 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_rewind): remove fsync() for Windows to improve the
+	  performance.
+
+Thu Aug 15 16:30:23 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/fileutils/test_fileutils.rb (TestFileUtils#test_rmdir):
+	  FileUtils.rmdir ignores Errno::ENOTEMPTY, so, in such cases, this
+	  assertion is nonsense.
+
+Thu Aug 15 15:49:35 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_clock_gettime): [DOC] FreeBSD 7.1 supports
+	  CLOCK_THREAD_CPUTIME_ID.
+	  http://www.freebsd.org/releases/7.1R/relnotes.html
+
+Thu Aug 15 14:30:23 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h, win32/Makefile.sub, win32/win32.c
+	  (clock_gettime): [experimental] emulates clock_gettime(2) of posix.
+
+Thu Aug 15 02:32:40 2013  Zachary Scott  <e@zzak.io>
+
+	* hash.c (rb_hash_aset): [DOC] Document key dup patch by @kachick
+	  [Fixes GH-382] https://github.com/ruby/ruby/pull/382
+
+Wed Aug 14 14:28:39 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* proc.c (rb_mod_define_method): now they return the symbols of the
+	  defined methods, not the methods/procs themselves.
+	  [ruby-dev:42151] [Feature #3753]
+
+	* NEWS: documents about above change and def-expr (see r42337).
+
+	* test/ruby/test_module.rb: tests about above change.
+
+Wed Aug 14 00:51:14 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem_restoring): xn argument removed.
+	  (bigdivrem_normal): Follow the above change.
+
+Wed Aug 14 00:18:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big_div_struct): Remove xn and j field.  Add zn field.
+	  (bigdivrem1): Follow the above change.
+	  (bigdivrem_restoring): Ditto.
+
+Tue Aug 13 23:38:17 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big_div_struct): ynzero field removed.
+	  (bigdivrem1): Follow the above change.
+	  (bigdivrem_restoring): Ditto.
+
+Tue Aug 13 23:01:16 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem_restoring): Extracted from bigdivrem_normal.
+
+Tue Aug 13 22:12:59 2013  Kenichi Kamiya  <kachick1@gmail.com>
+
+	* random.c (rb_random_ulong_limited): coerce before check negative.
+	  [Fixes GH-379]
+
+Tue Aug 13 21:52:15 2013  Kenichi Kamiya  <kachick1@gmail.com>
+
+	* object.c (Init_Object): undef Module#prepend_features on Class, as
+	  well as Module#append_features.  [Fixes GH-376]
+
+	* test_class.rb: Added test for above. And ensure type checking
+	  on similar methods as module_function.
+
+Tue Aug 13 08:52:18 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/syntax/literals.rdoc: [DOC] String literal concat by @cknadler
+	  [Fixes GH-380] https://github.com/ruby/ruby/pull/380
+
+Mon Aug 12 23:07:21 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (gc_marks_test): inhibit gc for st's operation.
+
+Mon Aug 12 15:59:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_whole_match_p): treat CR in middle of a line as a
+	  mere whitespace.
+
+Mon Aug 12 15:16:58 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c (rb_prepend_module): make T_ICLASS object shady because
+	  this T_ICLASS object seems to share method table with other class
+	  objects. It was causes WB miss.
+	  TODO: need to know the data structure.
+
+	* test/ruby/test_module.rb: add a test for WB miss.
+
+Mon Aug 12 13:47:54 2013  Zachary Scott  <e@zzak.io>
+
+	* process.c: [DOC] RDoc formatting of Process.clock_gettime
+
+Mon Aug 12 13:29:09 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/yaml/dbm.rb: [DOC] Document call-seq for YAML::DBM
+
+Mon Aug 12 12:57:26 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/dbm/extconf.rb: [DOC] Hide from RDoc
+	  Some libraries might want to document extconf.rb so RDoc treats it
+	  like any other ruby program. However, DBM users shouldn't care about
+	  these methods.
+
+Mon Aug 12 12:53:39 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/dbm/dbm.c: [DOC] Reformat headings of DBM class
+
+Mon Aug 12 12:46:31 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/yaml.rb, lib/yaml/: [DOC] Document YAML::DBM#key and add
+	  references to similar methods with more detail. This patch brings
+	  lib/yaml to 100% documentation coverage.
+
+Mon Aug 12 02:51:32 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_s_set_input): on OS X with editline,
+	  Readline.readline doesn't work because readline_get doesn't use
+	  rl_getc. The difference is introduced by r42402 [ruby-dev:47509]
+	  [Bug #8644]. Before it rb_io_stdio_file set ifp->stdio_file.
+	  Therefore add manually setting the value.
+
+	* ext/readline/readline.c (readline_s_set_output): ditto.
+
+Sun Aug 11 23:27:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_str_encode_ospath): OS path encoding on Mac OS X is also
+	  fixed.
+
+Sun Aug 11 22:57:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_require.rb (assert_require_nonascii_path): OS path
+	  encoding on Windows is fixed, so encoding of __FILE__ should be it.
+	  [ruby-core:56498] [Bug #8764]
+
+Sun Aug 11 19:11:45 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/parser/test_sax2.rb: Expand abbreviated class name.
+
+Sun Aug 11 19:06:03 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/sax2listener.rb (REXML::SAX2Listener#notationdecl): Fix
+	  wrong number of arguments in the template listener.
+	  [Bug #8731] [ruby-dev:47582]
+	  Reported by Ippei Obayashi.
+	* test/rexml/parser/test_sax2.rb: Add tests for parsing notation
+	  declarations with SAX2 API.
+
+Sun Aug 11 18:44:04 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/sax2listener.rb (REXML::SAX2Listener#elementdecl): Fix wrong
+	  examples. [Bug #8731] [ruby-dev:47582]
+	  Reported by Ippei Obayashi.
+
+Sun Aug 11 18:42:13 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/sax2parser.rb
+	  (REXML::Parsers::SAX2Parser#handle_entitydecl): Extract.
+
+Sun Aug 11 18:40:25 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/sax2parser.rb (REXML::Parsers::SAX2Parser#parse):
+	  Fix wrong "%" position in parameter entity declaration event argument.
+	* test/rexml/parser/test_sax2.rb: Add tests for the above case.
+
+Sun Aug 11 18:08:40 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/sax2parser.rb (REXML::Parsers::SAX2Parser#parse):
+	  Support NDATA in external ID entity declaration.
+	* test/rexml/parser/test_sax2.rb: Add tests for the above case.
+
+Sun Aug 11 18:07:39 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb
+	  (REXML::Parsers::BaseParser#pull_event): Support optional NDATA
+	  in external ID entity declaration.
+
+Sun Aug 11 17:54:07 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* NEWS (REXML::Parsers::SAX2Parser): Add about this change.
+	* lib/rexml/parsers/sax2parser.rb (REXML::Parsers::SAX2Parser#parse):
+	  Fix wrong number of arguments. Document says "an array of the
+	  entity declaration" but it passes two or more arguments.
+	  This is a bug but it break backward compatibility.
+	  Reported by Ippei Obayashi. [Bug #8731] [ruby-dev:47582]
+	* lib/rexml/sax2listener.rb (REXML::SAX2Listener#entitydecl): ditto.
+	  The listener template accepted two arguments.
+	* test/rexml/parser/test_sax2.rb: Add tests for external ID case.
+
+Sun Aug 11 17:41:41 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/parser/test_sax2.rb: Add SAX2 API test.
+
+Sun Aug 11 15:10:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_enc_symname_type): allow ID_ATTRSET for ID_INSTANCE,
+	  ID_GLOBAL, ID_CLASS, ID_JUNK too.  [Bug #8756]
+
+Sun Aug 11 13:17:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* include/ruby/encoding.h: Reduce ENCODING_INLINE_MAX to 127 as this
+	  should be sufficient to represent all the encodings Ruby supports.
+
+Sun Aug 11 11:54:38 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_clock_gettime): New method.
+	  This is accepted in the meeting:
+	  https://bugs.ruby-lang.org/projects/ruby/wiki/DevelopersMeeting20130809
+	  This method is accepted as a CRuby feature.
+	  I.e. Other Ruby implementations don't need to implement it.
+	  [ruby-core:56087] [Feature #8658]
+
+Sun Aug 11 10:40:48 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/time.rb: [DOC] Correcting rdoc visibility of time.rb constants
+	  Reported by Tanaka Akira [ruby-core:56517]
+
+Sun Aug 11 04:48:14 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (rb_str_normalize_ospath):
+	  HFS Plus (Mac OS Extended) uses a variant of Normal Form D in which
+	  U+2000 through U+2FFF, U+F900 through U+FAFF, and U+2F800 through
+	  U+2FAFF are not decomposed (this avoids problems with round trip
+	  conversions from old Mac text encodings).
+	  http://developer.apple.com/library/mac/qa/qa1173/_index.html
+	  Therefore fix r42457 to exclude the range.
+
+Sun Aug 11 03:26:07 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bitsize): Fix a conditional expression.
+
+Sun Aug 11 02:44:03 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/time.rb: [DOC] Document constants by @markijbema [Fixes GH-377]
+	  https://github.com/ruby/ruby/pull/377
+
+Sun Aug 11 01:28:52 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Revert r42458.
+	  It removes the HAVE_CLOCK_GETTIME from config.h.
+	  http://www.rubyist.net/~akr/chkbuild/debian/ruby-trunk/log/20130809T044800Z.diff.html.gz
+
+Sat Aug 10 13:53:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_id_attrset): allow other than ID_ATTRSET.
+
+	* parse.y (intern_str): ditto.  try stem ID for ID_INSTANCE,
+	  ID_GLOBAL, ID_CLASS, ID_JUNK too.  [Bug #8756]
+
+Sat Aug 10 12:49:50 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb
+	  (REXML::Parsers::BaseParser::CDATA_END): Use "\A" instead of "^".
+	  It is not an used constant but I fix it. (Or should I remove it?)
+
+Sat Aug 10 12:47:19 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser):
+	  Fix wrong constant name. "]>" pattern match is the same but
+	  it is used for "<!DOCTYPE" end mark not "<![CDATA[" end mark.
+
+Sat Aug 10 12:43:15 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser):
+	  Use "\A" instead of "^" in document type declaration patterns
+	  because they are used as the head match in content not the head
+	  match in line. They don't cause any problems in the current code
+	  but it should be fixed.
+
+Sat Aug 10 12:39:00 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/parse/test_document_type_declaration.rb: Add tests for
+	  parsing document type declaration.
+
+Sat Aug 10 12:00:45 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::SYSTEM):
+	  Fix loose "head" match regular expression. It doesn't cause any
+	  problem in the current code but it should be fixed because readers
+	  may confuse it.
+	  Patch by Ippei Obayashi. Thanks!!!
+
+Sat Aug 10 11:58:24 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/parse/test_notation_declaration.rb (#test_system_public):
+	  Add a test for PUBLIC notation and SYSTEM notation order case.
+
+Sat Aug 10 11:31:35 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::PUBLIC):
+	  Fix loose "head" match regular expression.
+	  [Bug #8701] [ruby-dev:47551]
+	  Patch by Ippei Obayashi. Thanks!!!
+	* test/rexml/parse/test_notation_declaration.rb (#test_system_public):
+	  Add a test for the above case.
+
+Sat Aug 10 09:20:21 2013  Zachary Scott  <e@zzak.io>
+
+	* NEWS: [DOC] typo in example reported by @moretea
+	  https://github.com/ruby/ruby/commit/a39e724#commitcomment-3831489
+
+Sat Aug 10 09:19:04 2013  Zachary Scott  <e@zzak.io>
+
+	* proc.c: [DOC] rdoc code formatting
+
+Sat Aug 10 09:12:01 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_id_attrset): check if the argument is valid type as an
+	  attribute.
+
+Sat Aug 10 05:44:08 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rss/trackback.rb: [DOC] Hide RSS::Trackback from rdoc
+	  Patch by Steve Klabnik [Bug #8755] [ruby-core:56456]
+
+Sat Aug 10 04:52:21 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big_div_struct): Use size_t.
+	  (bigdivrem1): Ditto.
+	  (bigdivrem_num_extra_words): Ditto.
+	  (bigdivrem_single): Ditto.
+	  (bigdivrem_normal): Ditto.
+	  (bary_divmod): Ditto.
+
+Fri Aug  9 23:47:15 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rexmlparser.rb: Remove needless REXML version check.
+	  Both RSS Parser and REXML are bundled in Ruby. RSS Parser can
+	  always use the latest REXML. [Bug #8754] [ruby-core:56454]
+	  Patch by Steve Klabnik. Thanks!!!
+
+Fri Aug  9 22:51:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (XLDFLAGS, LIBRUBYARG_STATIC): CoreFoundation framework
+	  option is now needed always, regardless enable-shared.
+	  [ruby-core:56467] [Bug #8759]
+
+Fri Aug  9 22:20:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file_internal): use rb_parser_compile_string_path and
+	  rb_parser_compile_file_path, String path name versions.  [Bug #8753]
+
+Fri Aug  9 07:16:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* ext/io/console/console.c: delete redefinition of rb_cloexec_open.
+	  drop support for 1.8 and 1.9 from the next release of io-console gem.
+
+Fri Aug  9 19:13:54 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* NEWS: update about new methods for Binding.
+
+Fri Aug  9 18:48:09 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c: add Binding#local_variable_get/set/defined?
+	  to access local variables which a binding contains.
+	  Most part of implementation by nobu.
+
+	* test/ruby/test_proc.rb: add a tests for above.
+
+	* vm.c, vm_core.h (rb_binding_add_dynavars): add a new function
+	  to add a new environment to create space for new local variables.
+
+Fri Aug  9 14:02:01 2013  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* tool/make-snapshot: Fix order of priority for option parameter.
+
+Fri Aug  9 12:06:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_str_normalize_ospath): normalize to Normalization Form C
+	  using CFString.
+
+Fri Aug  9 10:53:57 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* time.c (get_timeval, get_new_timeval): use rb_obj_class()
+	  instead of CLASS_OF() because CLASS_OF() may return
+	  a singleton class.
+
+Fri Aug  9 10:42:11 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_insnhelper.c (vm_invoke_block): returning from lambda proc
+	  now always exits from the Proc. [ruby-core:56193] [Feature #8693]
+
+	* NEWS, test/ruby/test_lambda.rb: ditto. Patch by nobu.
+
+Fri Aug  9 00:10:32 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (lazy_zip_func): fix non-single argument.  fix
+	  out-of-bound access and pack multiple yielded values.
+	  [ruby-core:56383] [Bug #8735]
+
+Thu Aug  8 23:01:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_singleton_p): new method Module#singleton_class? to
+	  return whether the receiver is a singleton class or not.
+	  [ruby-core:51087] [Feature #7609]
+
+Thu Aug  8 21:56:44 2013  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_overflow_p): Avoid signed integer overflow.
+	  (rb_time_new): Fix overflow condition.
+
+Thu Aug  8 19:58:02 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_threadptr_pending_interrupt_check_mask):
+	  use RARRAY_RAWPTR() instead of RARRAY_PTR() because
+	  there is no new reference.
+
+Thu Aug  8 19:56:52 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (rb_str_format_m): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR() because there is no new reference.
+
+Thu Aug  8 19:55:51 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: define USE_RGENGC_LOGGING_WB_UNPROTECT.
+
+Thu Aug  8 16:44:25 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: add old macro name `RUBY_EVENT_SWITCH'.
+	  This macro name is obsolete because it is renamed to
+	  RUBY_INTERNAL_EVENT_SWITCH, but it has compatibility problem
+	  using this macro name like ruby-prof.
+	  I want to remove this macro after ruby 2.1.
+
+Thu Aug  8 15:37:53 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/coverage/test_coverage.rb (TestCoverage#test_big_code): use `1'
+	  instead of `p' to get rid of a side effect.
+	  Kernel#p without any argument seems to do nothing, but flushes stdout.
+	  and, if stdout is redirected to file, fsync() will be called on
+	  Windows.  so, when running test-all on Windows with redirection, such
+	  as CI environment, this test took a lot of time.
+
+Thu Aug  8 14:54:18 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* NEWS: add description of incompatibility introduced by r42396.
+	  [ruby-core:56329] [Bug #8722]
+
+Thu Aug  8 14:50:36 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (mini): portable target to build miniruby
+
+	* common.mk (bisect): run git-bisect with miniruby
+
+	* common.mk (bisect-ruby): run git-bisect with ruby
+
+	* tool/bisect.sh: script for git-bisect
+
+Thu Aug  8 12:11:43 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/webrick/test_httpresponse.rb (test_send_body_*_chunked): these
+	  expectations assumes that the IOs are binmode.  fixed test failures
+	  introduced at r42427 on Windows.
+
+Thu Aug  8 10:27:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (range_last): revert r42400.  [Bug #8739]
+
+Thu Aug  8 10:26:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_str_normalize_ospath): extract and move from dir.c.
+
+Thu Aug  8 05:59:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* test/openssl/test_ssl.rb: Fix test for CVE-2013-4073.
+	  Patch by Antonio Terceiro. [Bug #8750] [ruby-core:56437]
+
+Thu Aug  8 03:37:38 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/webrick/httpresponse.rb:  Allow #body to be an IO-like object
+	  that responds to #readpartial and #read.
+	  [ruby-trunk - Feature #8155]
+	* NEWS:  NEWS for above
+	* test/webrick/test_httpresponse.rb:  Tests for above.
+
+Wed Aug  7 23:06:26 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ruby.c (Process.argv0): New method to return the original value
+	  of $0. [Feature #8696]
+
+Wed Aug  7 23:05:55 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ruby.c (Process.setproctitle): New method to change the title of
+	  the running process that is shown in ps(1). [Feature #8696]
+
+Wed Aug  7 20:05:38 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_odd_p): Check the bignum length.
+	  (rb_big_even_p): Ditto.
+
+Wed Aug  7 19:29:26 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (dbl2big): A condition simplified.
+
+Wed Aug  7 16:34:30 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/webrick/test_cgi.rb (TestWEBrickCGI#{start_cgi_server,test_cgi}):
+	  mswin is not only mswin32 but also mswin64. [Bug #8746]
+
+Wed Aug  7 16:19:12 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (rb_fiber_start): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR() because there is no new reference.
+
+	* proc.c (curry): ditto.
+
+	* proc.c (rb_proc_call): remove line break.
+
+Wed Aug  7 13:20:12 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* random.c (random_load): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR() because there is no new reference.
+
+Wed Aug  7 12:58:23 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (thread_start_func_2): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR() because there is no new reference.
+
+Wed Aug  7 09:00:24 2013  Zachary Scott  <e@zzak.io>
+
+	* string.c: [DOC] Description of rb_str_equal [Fixes GH-375]
+	  Based on a patch by @markijbema
+	  https://github.com/ruby/ruby/pull/375
+
+Wed Aug  7 08:30:38 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_hmac.c: [DOC] Documentation for OpenSSL::HMAC
+	  based on a patch by @repah documenting-ruby/ruby#14
+	  https://github.com/documenting-ruby/ruby/pull/14
+
+Wed Aug  7 07:46:23 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rss/utils.rb: [DOC] RSS::Utils by Steve Klabnik [Bug #8745]
+
+Wed Aug  7 07:38:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (nlz16): Removed.
+	  (nlz32): Ditto.
+	  (nlz64): Ditto.
+	  (nlz128): Ditto.
+	  (nlz_int): New function.
+	  (nlz_long): New function.
+	  (nlz_long_long): New function.
+	  (nlz_int128): New function.
+	  (nlz): Follow above changes.
+	  (bitsize): Follow above changes.
+
+Tue Aug  6 22:38:15 2013  Zachary Scott  <e@zzak.io>
+
+	* time.c: [DOC] Typo in Time overview by @sparr [Fixes GH-374]
+	  https://github.com/ruby/ruby/pull/374
+
+Tue Aug  6 22:35:32 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rss/1.0.rb: [DOC] Document RSS10 by Steve Klabnik [Bug #8740]
+
+Tue Aug  6 22:14:11 2013  Kouji Takao  <kouji.takao@gmail.com>
+
+	* ext/readline/readline.c (readline_s_delete_text): remove
+	  checking "$SAFE == 4".
+
+	* ext/readline/readline.c: fix rdoc, remove "Raises SecurityError"
+	  and add "Raises NotImplementedError".
+
+Tue Aug  6 22:04:38 2013  Kouji Takao  <kouji.takao@gmail.com>
+
+	* ext/readline/readline.c, test/readline/test_readline.rb: fix
+	  indent.
+
+Tue Aug  6 21:59:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (range_last): return nil for empty range, or in the case the
+	  predecessor is smaller than the begin.  [Bug #8739]
+
+Tue Aug  6 21:48:31 2013  Kouji Takao  <kouji.takao@gmail.com>
+
+	* ext/readline/readline.c (readline_s_set_point, Init_readline):
+	  add Readline.point=(pos). Patched by naruse.  [ruby-dev:47535]
+	  [Feature #8675]
+
+Tue Aug  6 21:14:11 2013  Kouji Takao  <kouji.takao@gmail.com>
+
+	* ext/readline/readline.c (Init_readline, readline_s_set_output)
+	(clear_rl_outstream, readline_s_set_input, clear_rl_instream)
+	(readline_readline): fix causing SEGV if closed IO object that is
+	  set Readline.input or Readline.output. Patched by akr
+	  [ruby-dev:47509] [Bug #8644]
+
+Tue Aug  6 17:56:40 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_push_frame): change type of stack_max to size_t.
+
+Tue Aug  6 17:42:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (range_last): exclude the last number of the exclusive range
+	  if the end is Numeric.  [ruby-dev:47587] [Bug #8739]
+
+Tue Aug  6 17:42:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_conv_from_wchar): converted string to CP_UTF8
+	  should have UTF-8 encoding.  otherwise no conversion takes place
+	  later.
+
+Tue Aug  6 17:21:38 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_push_frame): fix stack overflow check codes.
+	  Stack overflow check should be done *after* pushing a stack frame.
+	  However, some stack overflow checking codes checked *before*
+	  pushing a stack frame with iseq->stack_max.
+	  To solve this problem, add a new parameter `stack_max' to specify
+	  a possible consuming stack size.
+
+	* vm_core.h (CHECK_VM_STACK_OVERFLOW0): add to share the stack overflow
+	  checking code.
+
+	* insns.def: catch up this change.
+
+	* vm.c, vm_eval.c: ditto.
+
+	* test/ruby/test_exception.rb: add a stack overflow test.
+	  This code is reported by nobu.
+
+Tue Aug  6 17:02:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_conv_from_wchar): use WideCharToMultiByte(),
+	  as like as mbstr_to_wstr(), in the first step of the conversion from
+	  WCHAR.
+
+Tue Aug  6 16:14:32 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_eval.c (eval_string_with_cref): copy cref to limit the scope of
+	  refinements in the eval string. [ruby-core:56329] [Bug #8722]
+
+	* test/ruby/test_refinement.rb: related test.
+
+Tue Aug  6 12:23:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_realloc): Use VALGRIND_MAKE_MEM_UNDEFINED to
+	  declare undefined memory area.
+	  (bignew_1): Ditto.
+
+	* internal.h (VALGRIND_MAKE_MEM_DEFINED): Moved from gc.c
+	  (VALGRIND_MAKE_MEM_UNDEFINED): Ditto.
+
+Tue Aug  6 01:40:37 2013  Zachary Scott  <e@zzak.io>
+
+	* process.c: [DOC] Document caveats of command form of Process.spawn
+	  with regard to the shell and OS. Patched by Steve Klabnik [Bug #8550]
+
+Tue Aug  6 01:28:35 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rss/0.9.rb: [DOC] Typo in example [Bug #8732]
+
+Tue Aug  6 01:22:37 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rss/2.0.rb: [DOC] Document RSS::Rss by Steve Klabnik #8740
+	* lib/rss/atom.rb: [DOC] Typo in rdoc by Steve Klabnik
+
+Mon Aug  5 23:47:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: Rename local variables.
+
+Mon Aug  5 22:23:59 2013  Zachary Scott  <e@zzak.io>
+
+	* vm_trace.c: [DOC] Fix TracePoint return values in examples
+	  Based on a patch by @sho-h [Fixes GH-373]
+	  https://github.com/ruby/ruby/pull/373
+
+Mon Aug  5 17:38:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_write_console): use MultiByteToWideChar() for
+	  the last step of conversion to WCHAR, to get rid of warnings from
+	  rb_enc_find() in miniruby.  [ruby-dev:47584] [Bug #8733]
+
+	* win32/win32.c (wstr_to_mbstr, mbstr_to_wstr): fix wrong trimming.
+	  WideCharToMultiByte() and MultiByteToWideChar() do not count
+	  NUL-terminator in the size for conversion result, unless the input
+	  length is -1.
+
+Mon Aug  5 11:51:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* include/ruby/encoding.h: document which user flags are used by
+	  ENCODING_MASK for better greppability
+
+Mon Aug  5 10:01:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* object.c (rb_class_inherited_p): allow iclasses to be tested for
+	  inheritance. [Bug #8686] [ruby-core:56174]
+
+	* test/ruby/test_method.rb: add test
+
+Mon Aug  5 06:13:48 2013  Zachary Scott  <e@zzak.io>
+
+	* enumerator.c: [DOC] Remove reference to Enumerator::Lazy#cycle
+	  Patch by @kachick [Fixes GH-372]
+	  https://github.com/ruby/ruby/pull/372
+
+Mon Aug  5 03:57:16 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rss/0.9.rb: [DOC] Document RSS09 by Steve Klabnik [Bug #8732]
+
+Mon Aug  5 03:35:11 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rexml/attribute.rb: [DOC] Update example for #namespace
+	  Patch by Ippei Obayashi [Bug #8685] [ruby-core:56173]
+
+Sun Aug  4 21:08:29 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_zip): performance implement by using
+	  ALLOCA_N() to allocate tmp buffer.
+
+Sun Aug  4 07:14:49 2013  Tanaka Akira  <akr@fsij.org>
+
+	* README.EXT, README.EXT.ja: Mention rb_integer_pack and
+	  rb_integer_unpack.
+
+Sun Aug  4 01:54:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (BARY_TRUNC): New macro.
+	  (bary_cmp): Use BARY_TRUNC.
+	  (bary_mul_toom3): Ditto.
+	  (bary_divmod): Ditto.
+	  (abs2twocomp): Ditto.
+	  (bigfixize): Ditto.
+	  (rb_cstr_to_inum): Ditto.
+	  (big2str_karatsuba): Ditto.
+	  (bigdivrem): Ditto.
+
+Sun Aug  4 00:57:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_karatsuba): Don't allocate new temporary buffer
+	  if the buffer is enough for current invocation.
+
+Sun Aug  4 00:22:34 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary2bdigitdbl): New function.
+	  (bdigitdbl2bary): Ditto.
+	  (bary_mul_single): Use bdigitdbl2bary.
+	  (power_cache_get_power): Ditto.
+	  (bary_divmod): Use bary2bdigitdbl.
+	  (big2str_orig): Ditto.
+	  (bigdivrem): Ditto.
+
+Sat Aug  3 22:47:11 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: The branch condition of selecting multiplication
+	  algorithms should check smaller argument because Karatsuba and Toom3
+	  is effective only if both arguments are big.
+	  (bary_mul_toom3_branch): Compare the smaller argument to
+	  TOOM3_MUL_DIGITS.
+	  (bary_mul): Compare the smaller argument to KARATSUBA_MUL_DIGITS.
+
+Sat Aug  3 22:23:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_orig): Receive the number to stringize as
+	  BDIGIT array and size.
+	  (big2str_karatsuba): Receive the number to stringize as BDIGIT array
+	  and size.  Use an temporary array of BDIGIT.
+	  (rb_big2str1): Follow the above change.
+
+Sat Aug  3 13:30:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (MAX_BASE36_POWER_TABLE_ENTRIES): Renamed from
+	  MAX_BIG2STR_TABLE_ENTRIES.
+	  (base36_power_cache): Renamed from big2str_power_cache.
+	  (base36_numdigits_cache): Renamed from big2str_numdigits_cache.
+
+Sat Aug  3 10:33:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_set_integer_literal): use rb_rational_raw1() for
+	  integral rational because no reduction is needed with 1.
+
+Sat Aug  3 09:46:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (setup_passwd, setup_group): set proper encodings to
+	  string members.
+
+Sat Aug  3 09:30:57 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (rb_struct_define_under): new function to define Struct
+	  under the given namespace, not under Struct.  [Feature #8264]
+
+	* ext/etc/etc.c: use rb_struct_define_under.
+
+Sat Aug  3 06:55:29 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (value_expr_gen): now NODE_DEFN and NODE_DEFS are not void
+	  value expressions.  get rid of wrong warning with -w, and make to
+	  pass tests with chkbuild.  ref. [Feature #3753]
+
+Sat Aug  3 04:23:48 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/refinements.rdoc:  Remove mention of instance_eval and
+	  module_eval from scope section per:
+	  http://twitter.com/shugomaeda/status/363219951336693761
+
+Sat Aug  3 02:22:05 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_orig): Refactored.
+
+Sat Aug  3 01:20:19 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigadd_core): Removed.
+	  (bigadd): Use bary_add instead of bigadd_core.
+
+Sat Aug  3 00:52:43 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big2str1): Simplify power_level calculation.
+
+Sat Aug  3 00:34:20 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_zip): use rb_ary_new2() to create buffer
+	  if rb_block_arity() > 1.
+
+Sat Aug  3 00:12:00 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* NEWS: Add the description that IO#seek supports SEEK_DATA
+	  and SEEK_HOLE.
+
+Fri Aug  2 23:57:57 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* vm.c (m_core_define_method, m_core_define_singleton_method): now
+	  the value of def-expr is the Symbol of the name of the method, not
+	  nil.
+	  ref. [ruby-dev:42151] [Feature #3753]
+
+	* test/ruby/test_syntax.rb (TestSyntax#test_value_of_def): test for
+	  above changes.
+
+Fri Aug  2 23:54:11 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_zip): performance improvement by avoiding
+	  array creation if rb_block_arity() > 1.
+
+Fri Aug  2 23:50:53 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (power_cache_get_power): Apply bigtrunc to the result of
+	  bigsq.
+	  (big2str_karatsuba): Fix number of leading zero characters.
+
+Fri Aug  2 23:48:36 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): calculate denominator directly as powers of
+	  ten, not parsing string.
+
+	* parse.y (parser_number_literal_suffix): return bit set of found
+	  suffixes.
+
+	* parse.y (parser_set_number_literal, parser_set_integer_literal):
+	  split from parser_number_literal_suffix to set yylval.
+
+	* parse.y (parser_yylex): parse rational number literal with decimal
+	  point precisely.
+
+	* parse.y (simple_numeric): integrate numeric literals and simplify
+	  numeric rules.
+
+	* ext/ripper/eventids2.c (ripper_init_eventids2): ripper support for
+	  new literals, tRATIONAL and tIMAGINARY.
+
+Fri Aug  2 18:33:28 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_karatsuba): Reduce power_level more than one at
+	  recursion, if possible.
+	  (rb_big2str1): Follow the above change.
+
+Fri Aug  2 12:25:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul): Swap x and y for bary_mul1 if x is longer than y.
+	  [ruby-dev:47565] [Bug #8719] Reported by Narihiro Nakamura.
+
+Fri Aug  2 10:39:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* parse.y (negate_lit): add T_RATIONAL and T_COMPLEX to the switch
+	  statement, and call rb_bug() if an unknown type is passed to
+	  negate_lit(). [ruby-core:56316] [Bug #8717]
+
+	* bootstraptest/test_literal_suffix.rb (assert_equal): add test
+
+Fri Aug  2 09:14:47 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/syntax/refinements.rdoc:  Improve description of where you may
+	  activate refinements.
+
+Fri Aug  2 07:45:55 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_orig): Remove len argument.
+	  (big2str_karatsuba): Ditto.
+	  (rb_big2str1): Follow above change.
+
+Thu Aug  2 02:32:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* NEWS: Add the description of number literal suffixes.
+
+Thu Aug  2 00:02:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bootstraptest/test_literal_suffix.rb: add two test cases to
+	  examine that "1if true" and "1rescue nil" are recognized as 1.
+
+Thu Aug  1 23:45:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* rational.c (rb_flt_rationalize_with_prec): new public C function
+	  to rationalize a Float instance with a precision.
+
+	* rational.c (rb_flt_rationalize): new public C function to
+	 rationalize a Float instance.  A precision is calculated from
+	 the given float number.
+
+	* include/ruby/intern.h: Add rb_flt_rationalize_with_prec and
+	  rb_flt_rationalize.
+
+	* parse.y: implement number literal suffixes, 'r' and 'i'.
+	  [ruby-core:55096] [Feature #8430]
+
+	* bootstraptest/test_literal_suffix.rb: add tests for parser to scan
+	  number literals with the above tsuffixes.
+
+Thu Aug  1 23:55:08 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big2str1): Remove a local variable.
+
+Thu Aug  1 23:33:01 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_cstr_to_inum): Use power_cache_get_power.
+
+Thu Aug  1 21:02:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big2str1): Raise an error for too big number.
+
+Thu Aug  1 20:46:29 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (power_cache_get_power): Hide cached Bignum objects.
+
+Thu Aug  1 19:15:05 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big2str1): Remove non-trim mode.
+	  (rb_big2str0): Non-trim mode implemented here.
+	  (big2str_find_n1): Change the result type to long again.
+	  (big2str_base_powerof2): Don't take arguments: len and trim.
+	  (rb_big2str): Follow above change.
+
+Thu Aug  1 12:37:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_alloc): New function to allocate the result string.
+	  It is called after actual length is calculated.
+	  (big2str_struct): Add fields: negative, result and ptr.
+	  (big2str_orig): Write out the result via b2s->ptr.
+	  (big2str_orig): Ditto.
+	  (rb_big2str1): Don't allocate the result string at beginning.
+
+Thu Aug  1 07:36:27 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_orig): Use temporary buffer when trim mode.
+
+Thu Aug  1 06:28:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_orig): Simplified because RBIGNUM_LEN(x) <= 2 now.
+	  (big2str_struct): Two fields added: hbase2, hbase2_numdigits.
+	  (rb_big2str1): Initialize above fields.
+
+Thu Aug  1 04:06:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/options.rb (RDoc#finish): include root path in include
+	  paths, to work in another directory than the source directory.
+	  [ruby-core:56282] [Bug #8712]
+
+	* test/test_rdoc_markup_pre_process.rb (TestRDocMarkupPreProcess#setup):
+	  fix input_file_name, as the test script is not pre-processed.
+
+Thu Aug  1 01:45:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_karatsuba): Fix a condition of power_level.
+
+Thu Aug  1 01:09:02 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (LOG2_KARATSUBA_BIG2STR_DIGITS): Removed.
+	  (KARATSUBA_BIG2STR_DIGITS): Removed.
+	  (big2str_numdigits_cache): New variable.
+	  (power_cache_get_power): Merged with power_cache_get_power0.
+	  This function returns maxpow_in_bdigit_dbl(base)**(2**power_level).
+	  (rb_big2str1): use power_cache_get_power.
+
+Wed Jul 31 23:59:28 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_find_n1): Change the return type to size_t.
+	  (big2str_orig): Ditto.
+	  (big2str_karatsuba): Ditto.
+	  (rb_big2str1): Follow the above changes.
+
+Wed Jul 31 23:19:06 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (power_cache_get_power): Change numdigits_ret to size_t *.
+	  (big2str_orig): Change len argument to size_t.
+	  (big2str_karatsuba): Ditto.
+	  (rb_big2str1): Follow the above changes.
+
+Wed Jul 31 22:59:47 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/parse/test_notation_declaration.rb: Change class
+	  name to follow file name change.
+
+Wed Jul 31 22:57:50 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_notationdecl_parsetest.rb: Rename to ...
+	* test/rexml/parse/test_notation_declaration.rb: ... this.
+
+Wed Jul 31 22:54:39 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_notationdecl_mixin.rb: Remove duplicated tests.
+
+Wed Jul 31 22:52:55 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_notationdecl_parsetest.rb: Fix typos in expected
+	  value.
+	  pubilc ->
+	  public
+	     ^^
+
+Wed Jul 31 22:50:51 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_notationdecl_parsetest.rb: Add tests that focus
+	  system literal in external ID system notation declaration.
+
+Wed Jul 31 22:36:21 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_cmp): Extracted from rb_big_cmp.
+	  (power_cache_get_power): Change n1 argument (number of digits) to
+	  power_level which is just passed to power_cache_get_power0.
+	  (big2str_karatsuba): Ditto.
+	  (rb_big2str1): Calculate the initial power_level.
+
+Wed Jul 31 22:04:36 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_notationdecl_parsetest.rb: Fix a typo.
+	  Extern  ID ->
+	  ExternalID
+	        ^^
+
+Wed Jul 31 22:01:36 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_notationdecl_parsetest.rb: Add tests that focus
+	  public ID in external ID notation declaration.
+
+Wed Jul 31 22:01:24 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* parse.y: fix build error with bison-3.0.
+
+Wed Jul 31 21:58:53 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_notationdecl_parsetest.rb: Split test patterns.
+
+Wed Jul 31 21:42:33 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_notationdecl_parsetest.rb: Group tests.
+
+Wed Jul 31 21:37:51 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_notationdecl_mixin.rb (TestNotationDecl#test_name):
+	  Move to ...
+	* test/rexml/test_notationdecl_parsetest.rb
+	  (TestNotationDecl#test_name): ... here.
+
+Wed Jul 31 21:37:47 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+Wed Jul 31 21:31:49 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_notationdecl_parsetest.rb: Remove setup because it
+	  doesn't share anything with other tests.
+
+Wed Jul 31 21:24:55 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_attributes_mixin.rb: Remove a needless shebang.
+	* test/rexml/test_notationdecl_mixin.rb: ditto.
+	* test/rexml/test_doctype.rb: ditto.
+	* test/rexml/test_xml_declaration.rb: ditto.
+	* test/rexml/test_changing_encoding.rb: ditto.
+
+Wed Jul 31 21:20:08 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_notationdecl_parsetest.rb: remove a needless shebang.
+
+Wed Jul 31 20:11:01 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* string.c (rb_str_rindex): fix bug introduced in r42269.
+	  "".rindex("") should return 0.
+	  (str_rindex): ditto.
+
+Wed Jul 31 19:55:33 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (MAX_BIG2STR_TABLE_ENTRIES): Use SIZEOF_SIZE_T.
+	  (power_cache_get_power0): Add rb_bug call for too bit i argument.
+	  (power_cache_get_power): Simplified.
+
+Wed Jul 31 18:32:25 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/uri/common.rb (URI.decode_www_form_component): Use String#b.
+
+Wed Jul 31 18:24:02 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_refine, mod_using, top_using): don't show
+	  warnings because Refinements are no longer experimental.
+	  [ruby-core:55993] [Feature #8632]
+
+	* test/ruby/test_refinement.rb: related test.
+
+	* NEWS: fixes for the above change.
+
+Wed Jul 31 17:55:55 2013  Shota Fukumori  <her@sorah.jp>
+
+	* lib/uri/common.rb (URI.decode_www_form_component):
+	  Don't raise error when str includes multibyte characters.
+
+Wed Jul 31 17:45:39 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* string.c (rb_str_rindex): performance improvement by using
+	  memrchr(3).
+
+Wed Jul 31 16:43:30 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* string.c (rb_str_rindex): refactoring and avoid to call str_nth() if
+	  pos == 0.
+
+Wed Jul 31 14:41:36 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb: [DOC] Add a couple of notes on Hash as storage.
+	  ref. [Feature #6589]
+
+Wed Jul 31 14:38:52 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb: [DOC] Fix example result.  Hash is now ordered.
+
+Wed Jul 31 14:38:10 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb: [DOC] Use the term "sorted" instead of "ordered"
+	  when mentioning SortSet.
+
+Wed Jul 31 12:18:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_struct): New structure.
+	  (big2str_orig): Use big2str_struct.
+	  (big2str_karatsuba): Ditto.
+	  (rb_big2str1): Ditto.
+
+Wed Jul 31 12:02:16 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rubygems.rb: [DOC] typo in url patch by @Red54 [Fixes #369]
+	  https://github.com/ruby/ruby/pull/369
+
+Wed Jul 31 07:09:07 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Import RubyGems from master as of commit 523551c
+	* test/rubygems:  ditto.
+
+Tue Jul 30 22:21:54 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* test/ruby/test_hash.rb: add a test for enumeration order of Hash.
+
+Tue Jul 30 18:52:27 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#intersect?, Set#disjoint?): Add new methods for
+	  testing if two sets have any element in common.
+	  [ruby-core:45641] [Feature #6588] Based on the code by marcandre.
+
+Tue Jul 30 17:16:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (ruby__sfvextra): add QUOTE flag to escape unprintable
+	  characters.
+
+Tue Jul 30 11:00:52 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/curses/extconf.rb: [DOC] nodoc to reduce Object pollution
+
+Tue Jul 30 08:19:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* sizes.c (Init_sizes): Define sizes only if the type actually exists.
+
+Mon Jul 29 22:55:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sizes.c (Init_sizes): define RbConfig::SIZEOF.  [Feature #8568]
+
+Mon Jul 29 22:25:20 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/curses/curses.c: [DOC] Update location of samples
+	* samples/curses/*: Move Curses samples and refactor from mixin
+	  The samples are included in rdoc for module and use of mixin is
+	  confusing
+
+Mon Jul 29 22:16:11 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (LOG2_KARATSUBA_BIG2STR_DIGITS): Renamed from
+	  LOG2_KARATSUBA_DIGITS.
+	  (KARATSUBA_BIG2STR_DIGITS): Renamed from KARATSUBA_DIGITS.
+
+Mon Jul 29 22:04:45 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_compare_by_id): add function prototype.
+
+Mon Jul 29 21:53:41 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_compare_by_id): don't call rb_hash_rehash()
+	  if self.compare_by_identity? == true.
+
+Mon Jul 29 21:29:48 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_assoc): performance improvement by replacing
+	  compare function in RHASH(hash)->ntbl->type temporarily like r42224.
+	  it falls back to rb_hash_foreach() if st_lookup() doesn't find the key.
+
+	* test/ruby/test_hash.rb: add a test for above.
+
+Mon Jul 29 21:15:30 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/ruby/test_lazy_enumerator.rb
+	  (TestLazyEnumerator#test_initialize): Make sure
+	  Enumerator::Lazy#initialize raises error if the object is
+	  frozen.  The check was performed by rb_ivar_set() before
+	  rb_check_frozen() was added to enumerator_init().
+
+Mon Jul 29 21:06:42 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (enumerator_init): Add a frozenness check to
+	  prevent a frozen Enumerator object from being reinitialized with
+	  a different enumerable object.  This is the least we should do,
+	  and more fixes will follow. [Fixes GH-368] Patch by Kenichi
+	  Kamiya.
+
+	* enumerator.c (generator_init): Ditto.
+
+Mon Jul 29 20:14:24 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_assoc): revert r42224. table->type->compare is
+	  called only if hashes are matched.
+
+	* test/ruby/test_hash.rb: add a test to check using #== to compare.
+
+Mon Jul 29 17:00:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (yycompile): store file name as String to keep the encoding.
+
+	* parse.y (rb_parser_compile_string_path, rb_parser_compile_file_path):
+	  new functions to pass file name as a String.
+
+	* parse.y (gettable_gen): return a copy of the original file name, not
+	  a copy in filesystem encoding.
+
+	* vm_eval.c (eval_string_with_cref): use Qundef instead of "(eval)".
+
+Mon Jul 29 16:53:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_initialize_copy): copy st_table type even if empty.
+	  [ruby-core:56256] [Bug #8703]
+
+Mon Jul 29 16:34:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_initialize_copy): clear old table before copy new
+	  table.
+
+Mon Jul 29 16:34:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_assoc): aggregate object can be initialized only
+	  with link time constants.
+
+Mon Jul 29 14:54:44 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_assoc): performance improvement by replacing
+	  compare function in RHASH(hash)->ntbl->type temporarily.
+
+Mon Jul 29 14:52:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (xsystem): expand environment variable in all macros not
+	  expanded with RbConfig.  [Bug #8702]
+
+	* test/mkmf/test_framework.rb (create_framework): replace all $@ not
+	  only once.
+
+Mon Jul 29 06:54:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_pipe): use enum for compile time constants,
+	  instead of const int for debugging.
+
+Mon Jul 29 00:11:49 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem): Specialized implementation added for
+	  nx == 2 && ny == 2
+
+Sun Jul 28 20:28:41 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* io.c (io_getpartial): use rb_str_locktmp_ensure().
+	  [ruby-core:56121] [Bug #8669]
+
+	* io.c (rb_io_sysread): ditto.
+
+	* test/ruby/test_io.rb: add tests for above.
+
+Sun Jul 28 20:10:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): should make static libraries for extensions
+	  to be statically linked.  [Bug #7948]
+
+Sun Jul 28 17:38:32 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* string.c: add internal API rb_str_locktmp_ensure().
+
+	* io.c (io_fread): use rb_str_locktmp_ensure().
+	  [ruby-core:56121] [Bug #8669]
+
+	* test/ruby/test_io.rb: add a test for above.
+
+Sun Jul 28 13:04:39 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* io.c (interpret_seek_whence): support SEEK_DATA and SEEK_HOLE.
+	  These are whences for lseek(2) supported by Linux since version 3.1.
+	  [ruby-core:56123] [Feature #8671]
+
+	* test/ruby/test_io.rb: Add tests for above.
+
+Sun Jul 28 12:41:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (absint_numwords_generic): The char_bit variable changed
+	  to static constant.
+
+Sun Jul 28 12:03:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: Constify bary_* functions.
+
+Sun Jul 28 11:12:07 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_absint_size): Declaration moved from
+	  internal.h to calculate required buffer size to pack integers.
+	  (rb_absint_numwords): Ditto.
+	  (rb_absint_singlebit_p): Ditto.
+	  [ruby-core:42813] [Feature #6065]
+
+Sun Jul 28 10:54:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_pipe): fix pipe name formatting.  as "%x" may
+	  not contain '0' at all, fill at fixed position instead.
+
+Sun Jul 28 00:35:14 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_size): Return the bignum "bytewise" size.
+	  [ruby-core:55578] [Feature #8553]
+	  This is accepted by matz on DevelopersMeeting20130727Japan.
+
+Sun Jul 28 00:07:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_integer_pack): Declaration moved from
+	  internal.h.
+	  (rb_integer_unpack): Ditto.
+	  [ruby-core:42813] [Feature #6065]
+
+Fri Jul 26 23:18:13 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* NEWS: Add a new feature that REXML::Parsers::StreamParser
+	  supports "entity" event.
+
+Fri Jul 26 23:14:31 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/streamparser.rb
+	  (REXML::Parsers::StreamParser#parse): Add "entity" event support to
+	  listener. [Bug #8689] [ruby-dev:47542]
+	  Reported by Ippei Obayashi.
+	* test/rexml/test_stream.rb (StreamTester#entity): Add a test for
+	  the above case.
+
+Fri Jul 26 23:05:27 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): separate numeric literal from succeeding
+	  token, and treat 'e' as floating point number only if followed by
+	  exponent part.
+
+Fri Jul 26 22:14:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_exec.h (CHECK_VM_STACK_OVERFLOW_FOR_INSN): surround with
+	  do/while (0), and remove unnecessary casts.
+
+Fri Jul 26 20:12:07 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/lib/syslog/logger.rb (Syslog::Logger): Add facility
+	  to Syslog::Logger. [Fixes GH-305] patch by Max Shytikov
+	  https://github.com/ruby/ruby/pull/305
+
+Fri Jul 26 19:25:17 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_exec.h, tool/instruction.rb: not an error, but a BUG if stack
+	  overflow checking failed just before/after the beginning of an
+	  instruction. It should be treated as a BUG.
+	  Please tell us if your code cause BUG with this problem.
+	  This check will removed soon (for performance).
+
+Fri Jul 26 18:30:14 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ary_memcpy): cast to int to suppress a warning.
+
+Fri Jul 26 18:21:58 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ary_memcpy): try to enable optimization.
+	  At least on my environments, I don't see any errors
+	  with many trials. Please tell us if you find any GC bugs.
+
+Fri Jul 26 17:49:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/file.c (fix_string_encoding): fix target encoding.  the
+	  parameter `encoding' is not the target encoding but the original
+	  encoding.
+
+Fri Jul 26 14:05:19 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/fiddle/*: [DOC] More doc on dlopen and RTLD_DEFAULT from r42184
+
+Fri Jul 26 13:08:53 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/fiddle/lib/fiddle.rb: [DOC] Document Fiddle.dlopen(nil)
+	* ext/fiddle/handle.c: [DOC] Document Fiddle::Handle.new(nil)
+
+Fri Jul 26 13:04:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_load_internal): use rb_load_file_str() to keep path
+	  encoding.
+
+	* load.c (rb_require_safe): search in OS path encoding for Windows.
+
+	* ruby.c (rb_load_file_str): load file with keeping path encoding.
+
+	* win32/file.c (rb_file_load_ok): use WCHAR type API assuming incoming
+	  path is encoded in UTF-8.  [ruby-core:56136] [Bug #8676]
+
+	* file.c (rb_str_encode_ospath): simplify using rb_str_conv_enc().
+
+	* win32/file.c (fix_string_encoding): simplify with rb_str_conv_enc().
+
+	* win32/file.c (convert_mb_to_wchar): use bare pointer instead of
+	  VALUE, and remove useless argument.
+
+Fri Jul 26 11:42:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* rational.c (f_round_common): Rational is expected to be returned by
+	  Rational#*, but mathn.rb breaks that assumption.  [ruby-core:56177]
+	  [Bug #8687]
+
+Fri Jul 26 01:37:45 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/ruby.h: check defined(USE_RGENGC_LOGGING_WB_UNPROTECT)
+
+Fri Jul 26 01:21:41 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (rb_file_expand_path_internal): fix r42160; skip '~'.
+
+Thu Jul 25 17:53:18 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP#connect): disable Nagle's algorithm on
+	  HTTP connection. [ruby-core:56158] [Feature #8681]
+
+Thu Jul 25 17:49:42 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_to_s): convert closing parenthesis to the target encoding
+	  if it is ASCII incompatible encoding. [ruby-core:56063] [Bug #8650]
+
+Thu Jul 25 17:21:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (is_obj_encoding): new macro to check if obj is an
+	  Encoding.  obj can be any type while is_data_encoding expects T_DATA
+	  only.
+
+Thu Jul 25 17:17:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_expand_path_internal): should clear coderange after
+	  copying user name as binary data.
+
+Thu Jul 25 16:17:55 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* encoding.c (check_encoding): Check T_DATA or not.
+	  is_data_encoding(obj) assumes that `obj' is T_DATA.
+
+Thu Jul 25 13:06:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_s_home): use rb_home_dir_of and rb_default_home_dir.
+
+	* file.c (rb_home_dir_of): split from rb_home_dir() for the home
+	  directry of the given user, and the user name is a VALUE, not a bare
+	  pointer.  should raise if the user does not exist.
+
+	* file.c (rb_default_home_dir): split from rb_home_dir() for the home
+	  directry of the current user.
+
+Thu Jul 25 12:32:11 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/openssl/ossl.c: support additional three thread synchronization
+	  functions. [ruby-trunk - Bug #8386]
+
+Thu Jul 25 07:15:58 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Import RubyGems from master as of commit 4ff70cc
+	* test/rubygems:  ditto.
+
+Wed Jul 24 20:57:44 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_set_arguments): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR() because there is no new reference.
+
+	* compile.c (iseq_set_exception_table): ditto.
+
+Wed Jul 24 19:49:54 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (find_proxy): raise BadURIError if the URI is
+	  a relative URI. [Bug #8645]
+
+Wed Jul 24 18:56:06 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_expandarray): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR() because there is no new reference.
+
+	* vm_insnhelper.c (vm_caller_setup_args): ditto.
+
+	* vm_insnhelper.c (vm_yield_setup_block_args): ditto.
+
+Wed Jul 24 18:40:11 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c, gc.c: move ary_unprotect_logging() into
+	  rb_gc_unprotect_logging() which is general version
+
+	* include/ruby/ruby.h: add USE_RGENGC_LOGGING_WB_UNPROTECT
+	  to enable.
+
+Wed Jul 24 17:37:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_expand_path_internal): preserve the file name
+	  encoding in an exception message.
+
+Wed Jul 24 08:04:49 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/-ext-/tracepoint/test_tracepoint.rb: add GC on/off to count
+	  GC events strictly.
+
+Tue Jul 23 23:19:24 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/extconf.rb (CRYPTO_THREADID): check exist or not.
+
+	* ext/openssl/ossl.c (ossl_thread_id): use rb_nativethread_self()
+	  implemented at r42137 to allow threads which doesn't associated with
+	  Ruby thread to use openssl functions.
+
+	* ext/openssl/ossl.c (Init_ossl_locks): If CRYPTO_THREADID is defined
+	  (OpenSSL 1.0.0 or later has it) use CRYPTO_THREADID_set_callback()
+	  instead of CRYPTO_set_id_callback() because its argument is
+	  unsigned long; it may cause id collision on mswin64
+	  whose sizeof(unsigned long) < sizeof(void*).
+	  http://www.openssl.org/docs/crypto/threads.html
+
+	* ext/openssl/ossl.c (ossl_threadid_func): defined for above.
+
+Tue Jul 23 20:47:36 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: Move functions.
+
+Tue Jul 23 20:14:55 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_divmod): Add special cases for x < y easily detected
+	  and nx == 2 && ny == 2.
+
+Tue Jul 23 19:48:38 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_(pthread|win32).h: rename rb_thread_cond_t to
+	  rb_nativethread_cond_t.
+
+	* thread.c, thread_pthread.c, thread_win32.c, vm_core.h: catch up
+	  renaming.
+
+Tue Jul 23 19:44:32 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_native.h: add rb_nativethread_self() which returns
+	  current running native thread identifier.
+
+	* thread_[pthread|win32].c: implement rb_nativethread_self().
+
+Tue Jul 23 19:34:11 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.h, thread_win32.h: rename rb_thread_id_t to
+	  rb_nativethread_id_t.
+
+	* thread_pthread.c, vm_core.h: use rb_nativethread_id_t.
+
+Tue Jul 23 18:56:11 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/openssl/ossl.c: use system native (system provided)
+	  thread locking APIs added by last commit.
+	  This patch fixes [Bug #8386].
+	  "rb_mutex_*" APIs control only "Ruby" threads.
+	  Not for native threads.
+
+Tue Jul 23 18:44:15 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_native.h: added.
+	  Move native thread related lines from vm_core.h.
+	  And declare several functions "rb_nativethread_lock_*",
+	  manipulate locking.
+
+	* common.mk: add thread_native.h.
+
+	* thread.c: add functions "rb_nativethread_lock_*".
+
+	* thread.c, thread_[pthread,win32].[ch]: rename rb_thread_lock_t
+	  to rb_nativethread_lock_t to make it clear that this lock is for
+	  native threads, not for ruby threads.
+
+Tue Jul 23 16:14:57 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_before_sweep): fix spacing.
+
+Tue Jul 23 15:57:11 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (heap_get_freeobj): clear slot->freelist here.
+	  This means that this slot doesn't have any free objects.
+	  And store this slot with objspace->heap.using_slot.
+
+	* gc.c (gc_before_sweep): restore objspace->freelist
+	  into objspace->heap.using_slot->freelist.
+	  This means that using_slot has free objects which are
+	  pointed from objspace->freelist.
+
+	* gc.c (gc_slot_sweep): do not need to clear slot->freelist.
+
+Tue Jul 23 09:34:49 2013  Zachary Scott  <e@zzak.io>
+
+	* sample/drb/README*.rdoc: [DOC] migrate DRb sample READMEs to rdoc
+
+Tue Jul 23 09:28:05 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/drb/invokemethod.rb: [DOC] nodoc InvokeMethod18Mixin
+
+Tue Jul 23 08:44:37 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl_asn1.c (asn1time_to_time):  Implement YYMMDDhhmmZ
+	  format for ASN.1 UTCTime.  [ruby-trunk - Bug #8664]
+	* test/openssl/test_asn1.rb:  Test for the above.
+
+Tue Jul 23 08:11:32 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rexml/streamlistener.rb: [DOC] Fix examples in
+	  REXML::StreamListener#entitydecl patch by Ippei Obayashi [Bug #8665]
+
+Tue Jul 23 07:44:59 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Import RubyGems from master as of commit b165260
+	* test/rubygems:  ditto.
+
+Tue Jul 23 07:14:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mulsub_1xN): New function.
+	  (bary_mul_toom3): Use bary_mulsub_1xN.
+
+Tue Jul 23 03:32:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (KARATSUBA_BALANCED): New macro.
+	  (TOOM3_BALANCED): Ditto.
+	  (bary_mul_balance_with_mulfunc): Use KARATSUBA_BALANCED and
+	  TOOM3_BALANCED.
+	  (rb_big_mul_balance): Relax a condition.
+	  (rb_big_mul_karatsuba): Use KARATSUBA_BALANCED.
+	  (rb_big_mul_toom3): Use TOOM3_BALANCED.
+	  (bary_mul_karatsuba_branch): Use KARATSUBA_BALANCED.
+	  (bary_mul_toom3_branch): Use TOOM3_BALANCED.
+
+Tue Jul 23 01:34:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem_mulsub): Extracted from bigdivrem1.
+	  (bigdivrem1): Use bary_add.
+
+Mon Jul 22 18:39:52 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* string.c (rb_str_enumerate_chars): specify array capa
+	  with str_strlen().
+
+	* string.c (rb_str_enumerate_codepoints): ditto.
+
+Mon Jul 22 18:01:33 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* string.c (rb_str_enumerate_chars): specify array capa.
+
+Mon Jul 22 17:24:14 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* string.c (rb_str_each_char_size): performance improvement by
+	  using rb_str_length().
+
+Mon Jul 22 16:32:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (eval_string_with_cref): check by Check_TypedStruct
+	  instead of rb_obj_is_kind_of.
+
+Mon Jul 22 13:19:22 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ary_resize_capa): use RARRAY_RAWPTR() because
+	  this code creates no new references.
+
+Mon Jul 22 12:58:18 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ary_memfill): added.
+
+	* array.c (rb_ary_initialize): use ary_memfill().
+
+	* array.c (rb_ary_fill): ditto.
+
+	* array.c (rb_ary_slice_bang): use RARRAY_RAWPTR() because
+	  this code creates no new references.
+
+Mon Jul 22 10:09:46 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_slot_sweep): need to add empty RVALUE as freeobj.
+
+Mon Jul 22 09:48:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (eval_string_with_cref): use the given file name unless
+	  eval even if scope is given.  additional fix for [Bug #8436].
+	  based on the patch by srawlins at [ruby-core:56099] [Bug #8662].
+
+Mon Jul 22 09:24:19 2013  Kouji Takao  <kouji@takao7.net>
+
+	* ext/readline/readline.c (Init_readline): added
+	  Readline.delete_text. [ruby-dev:45789] [Feature #6626]
+	* ext/readline/extconf.rb: check for rl_delete_text() in Readline library.
+
+	  Thanks, Nobuyoshi Nakada, for the patch.
+
+Mon Jul 22 03:15:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/date/date_parse.c (rfc2822_cb): check if wday is given, since it
+	  can be omitted.
+
+Mon Jul 22 00:15:20 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_sq_fast): Refine expressions.
+
+Sun Jul 21 21:08:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul): Use simple multiplication if yl is small.
+	  (rb_cstr_to_inum): Invoke bigsq instead of bigmul0.
+	  (bigsq): Re-implemented.
+	  (bigmul0): Invoke bigsq if two arguments are identical.
+
+Sun Jul 21 09:58:19 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul_toom3): New function based on bigmul1_toom3.
+	  (bary_mul_toom3_branch): Call bary_mul_toom3.
+	  (rb_big_mul_toom3): Ditto.
+	  (bigmul1_toom3): Removed.
+	  (big_real_len): Ditto.
+	  (big_split): Ditto.
+	  (big_split3): Ditto.
+
+Sun Jul 21 08:12:16 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* proc.c (proc_to_s): use PRIsVALUE to preserve the result encoding.
+
+Sun Jul 21 03:36:18 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* hash.c (rb_hash_flatten): use NUM2INT to raise TypeError on 32bit
+	  platform. it's introduced by r42039
+
+Sun Jul 21 01:07:45 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* common.mk (help): Fix environment variable name and argument.
+	  Actually it can also be a directory or any argument for
+	  test/unit runner. [Fixes GH-363]
+
+Sat Jul 20 22:44:50 2013  Zachary Scott  <e@zzak.io>
+
+	* common.mk: Document running a single test [Fixes GH-363]
+	  Patch by Avdi Grimm https://github.com/ruby/ruby/pull/363
+
+Sat Jul 20 22:39:56 2013  Zachary Scott  <e@zzak.io>
+
+	* sample/*: whitespace patch by Sergio Campama [Fixes GH-364]
+	  https://github.com/ruby/ruby/pull/364
+
+Sat Jul 20 22:33:13 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/regexp.rdoc: [DOC] Fix typo in example [Fixes GH-365]
+	  Patch by Juanito Fatas https://github.com/ruby/ruby/pull/365
+
+Sat Jul 20 17:46:03 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_succ): add missing case NEIGHBOR_WRAPPED.
+	  r42078 caused buggy behavior like "\xFF".b -> "\x01\xFF".b
+
+Sat Jul 20 15:22:38 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (rb_ary_resize): use simple memcpy because there are no new
+	  references.
+
+Sat Jul 20 15:02:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* safe.c (ruby_safe_level_4_warning): define for old extension
+	  libraries.  [Bug #8652]
+
+Sat Jul 20 14:38:00 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ary_make_shared): make shared array shady.
+	  Making non-shady shared array causes SEGV (see rubyci).
+	  It seems a bug around shared array.
+
+Sat Jul 20 12:14:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (enc_succ_char, enc_pred_char): consider wchar case.
+	  [ruby-core:56071] [Bug #8653]
+
+	* string.c (rb_str_succ): do not replace with invalid char.
+
+	* encoding.c (rb_enc_code_to_mbclen): add new function which returns
+	  mbclen from codepoint like as rb_enc_codelen() but 0 for invalid
+	  char.
+
+	* include/ruby/encoding.h (rb_enc_code_to_mbclen): declaration and
+	  shortcut macro.
+
+Fri Jul 19 21:59:12 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: declare type_name() at the beginning of file.
+
+Fri Jul 19 21:35:09 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c: reduce shady operations.
+
+	* array.c (rb_ary_modify, ary_make_partial, rb_ary_splice,
+	  rb_ary_replace, rb_ary_eql, rb_ary_compact_bang):
+	  use RARRAY_RAWPTR() instead of RARRAY_PTR().
+
+	* array.c (rb_ary_shift): use RARRAY_PTR_USE() without WB because
+	  there are not new relations.
+
+	* array.c (ary_ensure_room_for_unshift): ditto.
+
+	* array.c (rb_ary_sort_bang): ditto.
+
+	* array.c (rb_ary_delete_at): ditto.
+
+	* array.c (rb_ary_reverse_m): use RARRAY_RAWPTR() because
+	  there are not new relations.
+
+Fri Jul 19 20:58:20 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c: reduce shade operations.
+
+	* array.c (rb_ary_modify): use RARRAY_RAWPTR().
+
+	* array.c (ary_make_substitution, rb_ary_s_create, ary_make_partial,
+	  rb_ary_splice, rb_ary_resize, rb_ary_rotate_m, rb_ary_times):
+	  use ary_memcpy().
+
+Fri Jul 19 19:55:28 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ary_mem_clear): added. This operation doesn't need WB
+	  because this operation creates a reference to Qnil.
+
+	* array.c (ary_make_shared, rb_ary_store, rb_ary_shift_m,
+	  rb_ary_splice, rb_ary_resize, rb_ary_fill): use ary_mem_clear()
+	  instead of rb_mem_clear().
+
+	* array.c (ary_make_shared): use RARRAY_RAWPTR() instead of RARRAY_PTR().
+
+Fri Jul 19 19:18:51 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c: fix commit miss.
+	  RGENGC_UNPROTECT_LOGGING should be 0.
+
+Fri Jul 19 19:15:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (rb_ary_resurrect): use RARRAY_RAWPTR() because there is no
+	  writing.
+
+	* array.c (rb_ary_new_from_values): use ary_memcpy().
+
+Fri Jul 19 19:07:31 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ary_memcpy): add a function to copy VALUEs into ary
+	  with write barrier. If ary is promoted, use write barrier correctly.
+
+	* array.c (rb_ary_cat, rb_ary_unshift_m, rb_ary_dup,
+	  rb_ary_sort_bang, rb_ary_replace, rb_ary_plus): use ary_memcpy().
+
+Fri Jul 19 15:32:57 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (rb_ary_store): use RARRAY_PTR_USE() instead of RARRAY_PTR().
+	  Clearing memory space doesn't need WBs.
+
+Fri Jul 19 15:19:37 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ary_ensure_room_for_push): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR. In this code, there are no "write" operation.
+
+	* array.c (rb_ary_equal): ditto.
+
+	* array.c (recursive_equal): ditto.
+
+Fri Jul 19 15:09:22 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c, internal.h (rb_gc_writebarrier_remember_promoted): add a new
+	  function to remember an specified object. This api is only
+	  experimental (strongly depend on WB/rgengc strategy).
+
+Fri Jul 19 14:56:00 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ary_unprotect_logging): use (void *) for first parameter
+	  because VALUE is not defined before including ruby/ruby.h.
+
+Fri Jul 19 14:19:48 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/pathname/pathname.c (path_inspect): use PRIsVALUE to preserve
+	  the result encoding.
+
+Fri Jul 19 12:35:41 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_tcp.rb (test_initialize_failure): Use EADDRNOTAVAIL
+	  to test an error message generated by bind() failure.
+
+Fri Jul 19 11:27:38 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/racc/parser.rb: [DOC] Capitalize "Ruby" in documentation
+	  Patch by Dave Worth https://github.com/ruby/ruby/pull/341
+
+Fri Jul 19 11:26:28 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/psych/lib/psych*: [DOC] Capitalize "Ruby" in documentation
+	  Patch by Dave Worth https://github.com/ruby/ruby/pull/341
+
+Fri Jul 19 11:25:12 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rdoc/*: [DOC] Capitalize "Ruby" in documentation
+	  Patch by Dave Worth https://github.com/ruby/ruby/pull/341
+
+Fri Jul 19 11:23:55 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rubygems*: [DOC] Capitalize "Ruby" in documentation
+	  Patch by Dave Worth https://github.com/ruby/ruby/pull/341
+
+Fri Jul 19 11:16:54 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#to_set): Define Set#to_set so that aSet.to_set
+	  returns self. [Fixes GH-359]
+
+Fri Jul 19 11:10:23 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rake/*: [DOC] Capitalize "Ruby" in documentation
+	  Patch by Dave Worth https://github.com/ruby/ruby/pull/341
+
+Fri Jul 19 01:04:14 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/-test-/bignum/intpack.c: Renamed from ext/-test-/bignum/pack.c.
+	  (Init_intpack): Renamed from Init_pack.
+	  Reported by Naohisa Goto.  [ruby-dev:47526] [Bug #8655]
+
+Fri Jul 19 00:54:27 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* test/ruby/test_array.rb (test_count): add a test case for #count
+	  with an argument. See Bug #8654.
+
+Thu Jul 18 23:45:06 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_eql): compare RARRAY_PTR() for performance
+	  improvement in case of that self and other are shared.
+
+Thu Jul 18 22:46:42 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/cgi.rb: [DOC] Capitalize "Ruby" in documentation [Fixes GH-341]
+	  Patch by Dave Worth https://github.com/ruby/ruby/pull/341
+	* lib/webrick.rb: ditto
+	* lib/scanf.rb: ditto
+	* lib/xmlrpc/config.rb: ditto
+	* lib/resolv.rb: ditto
+	* lib/e2mmap.rb: ditto
+	* lib/fileutils.rb: ditto
+	* lib/mkmf.rb: ditto
+	* lib/cgi/session.rb: ditto
+	* lib/yaml.rb: ditto
+	* lib/erb.rb: ditto
+	* lib/irb.rb: ditto
+	* lib/tracer.rb: ditto
+	* lib/net/http.rb: ditto
+	* ext/syslog/lib/syslog/logger.rb: ditto
+	* sample/pty/expect_sample.rb: ditto
+
+Thu Jul 18 21:30:50 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_sq_fast): Specialize the last iteration of the
+	  outer loop.
+	  (bigfixize): A condition simplified.
+
+Thu Jul 18 21:15:41 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_equal): compare RARRAY_PTR() for performance
+	  improvement in case of that self and other are shared.
+
+Thu Jul 18 20:44:51 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_fill): use memfill().
+
+Thu Jul 18 20:35:14 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* array.c (rb_ary_count): check length to avoid SEGV
+	  while iterating. Remove other pointer loop when arg is given.
+
+	* test/ruby/test_array.rb (test_count): add test for bug.
+	  [ruby-core:56072] [Bug #8654]
+
+Thu Jul 18 18:14:36 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_count): iterate items appropriately.
+	  [Bug #8654]
+
+Thu Jul 18 17:35:41 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_flatten): performance improvement by not using
+	  rb_hash_to_a() to avoid array creation with rb_assoc_new().
+
+Thu Jul 18 16:16:17 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c: add logging feature for RGenGC's write barrier unprotect
+	  event.
+
+Thu Jul 18 15:45:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RUBY_SAFE_LEVEL_CHECK): make only
+	  rb_set_safe_level(4) an error always but make rb_secure(4) an error
+	  only in the core.  [ruby-dev:47517] [Bug #8652]
+
+Thu Jul 18 15:42:01 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: fix spell miss.
+
+Thu Jul 18 15:11:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (ruby_safe_level_4): get rid of special
+	  character.  [ruby-dev:47512] [misc #8646]
+
+Thu Jul 18 14:51:39 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ary_alloc): slim setup process.
+
+Thu Jul 18 14:37:57 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (str_alloc): no need to clear RString (already cleared).
+
+Thu Jul 18 12:57:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (BDIGITS_ZERO): Defined.
+	  (bary_pack): Use BDIGITS_ZERO.
+	  (bary_unpack): Ditto.
+	  (bary_mul_single): Ditto.
+	  (bary_mul_normal): Ditto.
+	  (bary_sq_fast): Ditto.
+	  (bary_mul_balance_with_mulfunc): Ditto.
+	  (bary_mul_precheck): Ditto.
+	  (bary_mul_toom3_branch): Ditto.
+	  (rb_cstr_to_inum): Ditto.
+	  (big_shift3): Ditto.
+	  (bigmul1_toom3): Ditto.
+	  (bary_divmod): Ditto.
+
+Thu Jul 18 06:30:02 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename gc related functions with prefix "gc_".
+	  * before_gc_sweep() -> gc_before_sweep().
+	  * after_gc_sweep()  -> gc_after_sweep().
+	  * lazy_sweep()      -> gc_lazy_sweep().
+	  * rest_sweep()      -> gc_rest_sweep().
+	  * slot_sweep()      -> gc_slot_sweep().
+
+	* gc.c: rename a heap management function with prefix "heap_".
+	  * get_freeobj() -> heap_get_freeobj().
+
+	* gc.c: rename markable_object_p() to is_markable_object().
+
+Wed Jul 17 22:57:40 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (delete_if_i): use ST_DELETE.
+
+Wed Jul 17 22:34:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: An static assertion for relation of SIZEOF_LONG and
+	  SIZEOF_BDIGITS is added.
+	  (bary_mul_precheck): Reduce comparisons.
+	  (bary_mul): Invoke bary_sq_fast or bary_mul1 if the bignum size is
+	  small.
+	  (bigfixize): Resize the argument bignum here.
+	  (bignorm): Don't call bigtrunc after bigfixize.
+
+Wed Jul 17 22:13:26 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_replace): performance improvement by using
+	  st_copy().
+
+Wed Jul 17 17:19:54 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename heap management functions with prefix "heap_".
+	  * allocate_sorted_array() -> heap_allocate_sorted_array().
+	  * slot_add_freeobj()      -> heap_slot_add_freeobj().
+	  * assign_heap_slot()      -> heap_assign_slot().
+	  * add_heap_slots()        -> heap_add_slots().
+	  * init_heap()             -> heap_init().
+	  * set_heap_increment()    -> heap_set_increment().
+
+	* gc.c (initial_expand_heap): inlined in rb_gc_set_params().
+
+Wed Jul 17 17:12:23 2013  Matthew M. Boedicker  <matthewm@boedicker.org>
+
+	* hash.c (env_fetch): Add key name to message on ENV.fetch KeyError,
+	  as well as Hash#fetch.  [ruby-core:56062] [Feature #8649]
+
+Wed Jul 17 15:59:33 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: catch up last changes for debugging/checking mode.
+
+Wed Jul 17 15:50:10 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_free): free slot itself.
+
+	* gc.c (objspace_each_objects): fix condition.
+	  Use slot->body instead of slot.
+
+	* gc.c (count_objects): use "slot" variable.
+
+Wed Jul 17 15:21:10 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (unlink_heap_slot): fix memory leak.
+	  free slot itself at free_heap_slot().
+
+	  Reproduce-able code is here:
+	    N1 = 100_000; N2 = 1_000_000
+	    N1.times{ary = []; N2.times{ary << ''}}
+	  Maybe this problem is remaining in Ruby 2.0.0.
+
+	* gc.c (unlink_heap_slot): remove not working code.
+
+Wed Jul 17 14:31:13 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: re-design the heap structure.
+
+	  (1) The heap is consists of a set of slots.
+	  (2) Each "slot" has a "slot_body".
+	      slot::start and slot::limit specify RVALUE beginning address
+	      and number of RVALUE in a "slot_body".
+	  (3) "slot_body" contains a pointer to slot (slot_body::header::slot)
+	      and an array of RVALUE.
+	  (4) heap::sorted is an array of "slots", sorted by an address of
+	      slot::body.
+
+	  See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/GC_design
+	  for more details (figure).
+
+	* gc.c: Avoid "heaps" terminology. It is ambiguous.
+
+Wed Jul 17 13:29:16 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix heaps_header and heaps_slot to reduce memory consumption.
+	  (1) move heaps_header::start and limit to  heaps_slot.
+	  (2) remove heaps_header::end which can be calculated by start+limit.
+
+	* gc.c: catch up above change.
+
+Wed Jul 17 12:30:05 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/st.h (st_strcasecmp): Macro defined for compatibility.
+	  (st_strncasecmp): Ditto.
+
+Wed Jul 17 11:57:45 2013  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/util.rb (CGI::Util#escape, unescape): Avoid use of regexp
+	  special global variable. [Feature #8648] Thanks to fotos.
+
+Wed Jul 17 11:57:10 2013  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/erb.rb (ERB::Util#url_encode): Avoid use of regexp special global
+	  variable. [Feature #8648] Thanks to fotos.
+
+Wed Jul 17 08:12:41 2013  Tanaka Akira  <akr@fsij.org>
+
+	* st.c (st_locale_insensitive_strcasecmp): Renamed from st_strcasecmp.
+	  (st_locale_insensitive_strncasecmp): Renamed from st_strncasecmp.
+
+	* include/ruby/st.h: Follow above changes.
+
+	* include/ruby/ruby.h: Ditto.
+
+Wed Jul 17 00:14:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigmul1_toom3): Use bigdivrem_single instead of bigdivrem.
+	  (big_three): Removed.
+	  (Init_Bignum): Don't initialize big_three.
+
+Tue Jul 16 21:46:03 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* configure.in: revert r42008. strcasecmp() uses the current locale.
+
+	* include/ruby/ruby.h: ditto.
+
+	* st.c (st_strcasecmp): ditto.
+
+Tue Jul 16 21:07:04 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* configure.in: check strcasecmp().
+
+	* include/ruby/ruby.h: use strcasecmp() as st_strcasecmp() if it
+	  exists.
+
+	* st.c (st_strcasecmp): define the function only if strcasecmp()
+	  doesn't exist.
+
+Tue Jul 16 20:21:28 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigsq): Renamed from bigsqr.
+
+Tue Jul 16 19:42:08 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (USHORT): Unused macro removed.
+
+Tue Jul 16 19:18:51 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: slim a path of newobj_of().
+
+	* gc.c (objspace): add a new field objspace::freelist, which contains
+	  available RVALUEs.
+
+	* gc.c (newobj_of): simply call new function `get_freeobj()'.
+	  get_freeobj() returns objspace::freelist. If  objspace::freelist
+	  is not available, refill objspace::freelist with a slot pointed by
+	  objspace::heap::free_slots.
+
+	* gc.c (before_gc_sweep): clear objspace::freelist.
+
+	* gc.c (slot_sweep): clear slot::freelist.
+
+	* gc.c (heaps_prepare_freeslot): renamed to heaps_prepare_freeslot.
+
+	* gc.c (unlink_free_heap_slot): remove unused function.
+
+	* gc.c (rb_free_const_table): remove unused function.
+
+Tue Jul 16 19:05:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big_shift3): Big shift width is not a problem for right
+	  shift.
+
+Tue Jul 16 18:50:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_count): [DOC] fix typo.  Array#count uses ==, not
+	  ===.  a question at asakusa.rb ML.
+
+Tue Jul 16 18:35:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul_karatsuba): Avoid duplicate calculation when
+	  squaring.
+	  (bary_mul_toom3_branch): Ditto.
+
+Tue Jul 16 17:43:22 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (link_free_heap_slot): removed.
+
+	* gc.c (slot_sweep): use `heaps_add_freeslot' instead of
+	  `link_free_heap_slot'.
+
+	* gc.c (assign_heap_slot): use local variable `slot' instead of
+	  `heaps'.
+
+Tue Jul 16 17:21:39 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (assign_heap_slot): refactoring variable names.
+
+	* gc.c (slot_add_freeobj): added.
+
+	* gc.c (heaps_add_freeslot): added.
+
+	* gc.c (finalize_list, rb_gc_force_recycle, slot_sweep): use
+	  `slot_add_freeobj' instead of modifying linked list directly.
+
+Tue Jul 16 16:30:58 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (lazy_sweep): refactoring.
+
+Tue Jul 16 13:32:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_set_index): since r41967, old terminator is dealt
+	  with in str_fill_term().  should not consider it here because this
+	  function is called before any encoding is set.
+
+Tue Jul 16 11:12:03 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* proc.c (rb_block_arity): raise ArgumentError if no block given.
+
+Tue Jul 16 08:15:22 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] document top-level
+	  classes from BigDecimal utils native extensions
+
+Tue Jul 16 03:23:03 2013  Zachary Scott  <e@zzak.io>
+
+	* numeric.c: [DOC] improve rdoc formatting for parameters and links
+
+Mon Jul 15 14:40:00 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h (rb_big2str0): Deprecated.
+
+	* bignum.c (rb_big2str1): Renamed from rb_big2str0.
+	  (rb_big2str0): Deprecated wrapper for rb_big2str1.
+	  (rb_big2str): Invoke rb_big2str1 instead of rb_big2str0.
+
+Mon Jul 15 14:13:02 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* struct.c (rb_struct_each_pair): use rb_yield_values(2, key, value)
+	  instead of rb_yield(rb_assoc_new(key, value)) if rb_block_arity()
+	  is greater than 1.
+
+Mon Jul 15 13:46:26 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: Add static assertions.
+
+Mon Jul 15 13:36:02 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_each_pair): performance improvement by using
+	  rb_block_arity().
+
+Mon Jul 15 13:15:37 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* proc.c (rb_block_arity): create internal API rb_block_arity().
+	  it returns arity of given block.
+
+Mon Jul 15 13:07:27 2013  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* lib/prime.rb (Prime::EratosthenesGenerator,
+	  Prime::EratosthenesSieve): New implementation by
+	  robertjlooby <robertjlooby AT gmail.com>.
+
+	* test/test_prime.rb: updated with new method name
+
+Mon Jul 15 11:32:46 2013  Zachary Scott  <e@zzak.io>
+
+	* numeric.c (rb_cNumeric): [DOC] Added comment for Numeric to fix doc
+
+Mon Jul 15 11:24:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (maxpow_in_bdigit_dbl): Useless #if removed.
+
+Mon Jul 15 11:10:46 2013  Zachary Scott  <e@zzak.io>
+
+	* bignum.c (rb_big_coerce): [DOC] Add docs for Bignum#coerce
+	  Based on patch by Juanito Fatas [Fixes GH-360]
+	  https://github.com/ruby/ruby/pull/360
+
+Mon Jul 15 10:56:01 2013  Zachary Scott  <e@zzak.io>
+
+	* thread.c (mutex_sleep): [DOC] Awake thread will reacquire lock
+	  By Tim Abdulla [Fixes GH-342] https://github.com/ruby/ruby/pull/342
+
+Mon Jul 15 10:45:09 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (nlz16): Use __builtin_clz if possible.
+	  (nlz32): Use __builtin_clz or __builtin_clzl if possible.
+	  (nlz64): Use __builtin_clzl or __builtin_clzll if possible.
+	  (nlz128): Use __builtin_clzll if possible.
+
+	* configure.in: Check __builtin_clz, __builtin_clzl and
+	  __builtin_clzll.
+
+Mon Jul 15 09:39:07 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (power_cache_get_power): Use bitsize instead of ceil_log2.
+	  (ones): Removed.
+	  (next_pow2): Removed.
+	  (floor_log2): Removed.
+	  (ceil_log2): Removed.
+
+	* configure.in (__builtin_popcountl): Don't check.
+
+Mon Jul 15 02:47:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* localeinit.c (rb_locale_charmap, Init_enc_set_filesystem_encoding):
+	  move from encoding.c.
+
+	* miniinit.c (rb_locale_charmap, Init_enc_set_filesystem_encoding):
+	  define miniruby specific functions only.
+
+Mon Jul 15 02:32:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_init): no longer needs NO_PRESERVED_ENCODING.
+
+	* encoding.c (enc_inspect): defer loading autoloaded encoding.
+
+	* encoding.c (enc_check_encoding): use is_data_encoding() to check
+	  type consistently.
+
+	* encoding.c (must_encoding): return rb_encoding* instead of encoding
+	  index.
+
+	* encoding.c (enc_check_encoding): use is_data_encoding() to check
+	  type consistently.
+
+	* encoding.c (must_encoding): return rb_encoding* instead of encoding
+	  index.
+
+Mon Jul 15 02:21:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_fill_term): consider old terminator length, and should
+	  not use rb_enc_ascget since it depends on the current encoding which
+	  may not be compatible with the new terminator.  [Bug #8634]
+
+	* encoding.c (enc_inspect): use PRIsVALUE to preserve the result
+	  encoding.
+
+Sun Jul 14 23:21:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Check __builtin_popcountl, __builtin_bswap32 and
+	  __builtin_bswap64.
+
+	* internal.h (swap32): Use the configure result for the condition to
+	  use __builtin_bswap32.
+	  (swap64): Use the configure result for the condition to use
+	  __builtin_bswap64.
+
+	* bignum.c (ones): Use the configure result for the condition to use
+	  __builtin_popcountl.
+	  (bary_unpack_internal): Use appropriate types for swap argument.
+
+Sun Jul 14 22:21:11 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_subb): Support xn < yn.
+	  (bigsub_core): Removed.
+	  (bigsub): Don't compare before subtraction.  Just subtract and
+	  get the two's complement if the subtraction causes a borrow.
+
+Sun Jul 14 00:36:03 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (DIGSPERLONG): Unused macro removed.
+	  (DIGSPERLL): Ditto.
+
+Sun Jul 14 00:32:51 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_aref): Less scan when the number is negative.
+
+Sun Jul 14 00:17:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big_shift): Avoid signed integer overflow.
+
+Sun Jul 14 00:14:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul_precheck): Use bary_small_lshift or
+	  bary_mul_normal if xl is 1.
+
+Sat Jul 13 22:58:16 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big_shift3): New function.
+	  big_lshift and big_rshift are merged.
+	  (big_shift2): New function.
+	  (big_lshift): Use big_shift3.
+	  (big_rshift): Ditto.
+	  (check_shiftdown): Removed.
+	  (rb_big_lshift): Use big_shift2 and big_shift3.
+	  (rb_big_rshift): Ditto.
+	  (big_lshift): Removed.
+	  (big_rshift): Ditto.
+
+Sat Jul 13 15:51:38 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_small_lshift): Use size_t instead of long.
+	  (bary_small_rshift): Ditto.
+
+Sat Jul 13 15:33:33 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_small_lshift): Functions moved to remove
+	  declaration.
+	  (bary_small_rshift): Ditto.
+
+Sat Jul 13 12:27:34 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_associate_index): fill new terminator length, not
+	  old one.
+
+Sat Jul 13 12:24:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32: move from ext/dl and ext/fiddle.  since ext/extmk.rb
+	  builds extensions in alphabetical order, compiled?('fiddle') under
+	  ext/dl makes no sense.
+
+Sat Jul 13 09:26:09 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (biglsh_bang): Removed.
+	  (bigrsh_bang): Ditto.
+	  (bigmul1_toom3): Use bary_small_lshift and bary_small_rshift.
+
+Sat Jul 13 01:04:43 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/rubygems/psych_additions.rb: Ignore Psych docs here
+
+Fri Jul 12 18:10:46 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/fiddle/win32/lib/win32/registry.rb
+	  (Win32::Registry::API#make_wstr): same as r41922.
+
+Fri Jul 12 16:28:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_associate_index): refill the terminator if it
+	  becomes longer than before.  [ruby-dev:47500] [Bug #8624]
+
+	* string.c (str_null_char, str_fill_term): get rid of out of bound
+	  access.
+
+	* string.c (rb_str_fill_terminator): add a parameter for the length of
+	  new terminator.
+
+Fri Jul 12 11:26:25 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_reject_bang): do not call rb_hash_foreach() if RHash
+	  has ntbl and it is empty.
+
+Fri Jul 12 11:17:41 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (recursive_hash): use RHASH_SIZE() to check hash size.
+
+Fri Jul 12 00:20:00 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_size): use RHASH_SIZE().
+
+Fri Jul 12 00:08:24 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_values): set array capa to RHASH_SIZE().
+
+Thu Jul 11 23:54:45 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_keys): set array capa to RHASH_SIZE().
+
+Thu Jul 11 21:30:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_pow): undef pow to get rid of infinite
+	  recursive call.  re-fix [Bug #8495].  [ruby-core:55923] [Bug #8621]
+
+Thu Jul 11 20:18:13 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/win32/lib/win32/registry.rb (Win32::Registry::API#make_wstr):
+	  remove workaround to append WCHAR terminator.
+
+	* transcode.c (str_encode_associate): fill terminator after conversion.
+
+	* string.c (rb_enc_str_new, rb_str_set_len, rb_str_resize): fill
+	  minimum length of the encoding as the terminator.
+
+	* string.c (str_buf_cat, rb_str_buf_append, rb_str_splice_0): ditto.
+
+	* string.c (str_make_independent_expand, rb_str_modify_expand): make
+	  the capacity enough for multi-byte terminator.
+
+	* string.c (rb_string_value_cstr): fill minimum length of the encoding
+	  as the terminator.
+
+	* string.c (rb_string_value_cstr): check null char in char, not in
+	  byte.
+
+Thu Jul 11 14:48:35 2013  Zachary Scott  <e@zzak.io>
+
+	* array.c: Replace confusing example for #reverse_each in overview
+	  Patch by Earl St Sauver [Fixes documenting-ruby/ruby-12]
+	  https://github.com/documenting-ruby/ruby/pull/12
+
+Thu Jul 11 14:22:37 2013  Zachary Scott  <e@zzak.io>
+
+	* test/drb/ut_eq.rb: Use localhost for drb tests [Bug #7311]
+	  Patch by Vit Ondruch [ruby-core:49101]
+	* test/drb/ut_array.rb: ditto
+	* test/drb/ut_array_drbssl.rb: ditto
+
+Thu Jul 11 13:48:03 2013  Zachary Scott  <e@zzak.io>
+
+	* sprintf.c: Fix typo patch by @hynkle [Fixes GH-357]
+	  https://github.com/ruby/ruby/pull/357
+
+Thu Jul 11 13:00:34 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/securerandom.rb: Refactor conditions by Rafal Chmiel
+	  [Fixes GH-326] https://github.com/ruby/ruby/pull/326
+
+Thu Jul 11 12:04:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: Don't use toom3 after once karatsuba is chosen.
+	  (mulfunc_t): New type.
+	  (bary_mul_toom3_start): Renamed from bary_mul.
+	  (bary_mul_karatsuba_start): Renamed from bary_mul.
+	  (bary_mul_balance_with_mulfunc): Renamed from bary_mul_balance and
+	  new argument, mulfunc, is added.
+	  (rb_big_mul_balance): Invoke bary_mul_balance_with_mulfunc with
+	  bary_mul_toom3_start.
+	  (bary_mul_karatsuba): Invoke bary_mul_karatsuba_start instead of
+	  bary_mul.
+	  (bary_mul_precheck): Extracted from bary_mul.
+	  (bary_mul_karatsuba_branch): Extracted from bary_mul.
+	  (bary_mul_karatsuba_start): New function to call bary_mul_precheck
+	  and bary_mul_karatsuba_branch.
+	  (bary_mul_toom3_branch): Extracted from bary_mul.
+	  (bary_mul_toom3_start): New function to call bary_mul_precheck and
+	  bary_mul_toom3_branch.
+	  (bary_mul): Just call bary_mul_toom3_start.
+	  Arguments for work memory are removed.
+	  (rb_cstr_to_inum): Follow the bary_mul change.
+	  (bigmul0): Ditto.
+
+Thu Jul 11 10:46:38 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/probes_to_wiki.rb: fix usage comment.  use Enumerable#grep
+	  which yields each elements to reduce unnecessary array.
+
+Thu Jul 11 10:09:18 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c (rb_daemon): daemon(3) is implemented with fork(2).
+	  Therefore it needs rb_thread_atfork(). (and revert r41903)
+
+Thu Jul 11 03:22:10 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* tool/probes_to_wiki.rb: adding a script to convert probes.d to wiki
+	  format for easy wiki updates.
+
+Thu Jul 11 00:54:07 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* man/ri.1: Incorrect use of .Dd macro [Bug #8620] by Tristan Hill
+
+Thu Jul 11 00:48:29 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/delegate.rb: Add example for __setobj__ and __getobj__
+	  [Bug #8615] Patch by Caleb Thompson
+
+Wed Jul 10 23:29:22 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/logger.rb: Use :call-seq: for method signature rdoc
+
+Wed Jul 10 23:23:18 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/logger.rb (#add): Remove incorrect rdoc for return value
+	  [Bug #8567] Reported by Tim Pease.
+
+Wed Jul 10 23:12:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_subpos): make public function.
+
+Wed Jul 10 22:44:19 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: Add a static assertion for RBIGNUM_EMBED_LEN_MAX.
+
+Wed Jul 10 22:31:25 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* string.c (rb_str_index): cache single byte flag and some
+	  cosmetic changes.
+
+Wed Jul 10 22:03:27 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_2comp): Don't use bary_plus_one.
+	  (bary_add_one): Replaced by the implementation of bary_plus_one.
+
+Wed Jul 10 20:48:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (sizeof_bdigit_dbl): check sizeof(BDIGIT_DBL).
+
+	* internal.h (STATIC_ASSERT): move from enum.c.
+
+Wed Jul 10 20:08:21 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (SIZEOF_BDIGIT_DBL): Add a ifdef guard for test.
+
+Wed Jul 10 14:18:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (fork_daemon): kill the other threads all and abandon the
+	  kept mutexes.
+
+Wed Jul 10 11:35:36 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/net/http/test_http.rb (TestNetHTTP_v1_2#test_get,
+	  TestNetHTTP_v1_2_chunked#test_get): shouldn't check
+	  HttpResponse#decode_content if Zlib is not available.
+	  ko1 complained via IRC.
+
+Wed Jul 10 10:20:07 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/rbinstall.rb: always require rubygems to stabilize rubygems
+	  related status like whether Gem::Specification is defined or not.
+
+	* tool/rbinstall.rb (Gem::Specification.unresolved_deps): define stub.
+
+Wed Jul 10 08:21:15 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Import RubyGems 2.1
+	* test/rubygems:  Ditto.
+
+Wed Jul 10 07:34:34 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/ext/ext_conf_builder.rb:  Remove siteconf file after
+	  building the gem.
+	* test/rubygems/test_gem_ext_ext_conf_builder.rb:  Test for the above.
+
+	* lib/rubygems/psych_tree.rb (module Gem):  Add backward compatibility
+	  for r41148
+
+	* test/rubygems/test_gem_package.rb:  Add backward compatibility for
+	  double-slash elimination.
+
+Wed Jul 10 06:22:27 2013  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_parse.c (date_zone_to_diff): [ruby-core:55831].
+
+Wed Jul 10 00:41:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul): x*1 is x.
+
+Tue Jul  9 22:24:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul1): No need to invoke MEMZERO at last.
+	  (bary_mul_single): Invoke MEMZERO here.
+
+Tue Jul  9 21:40:01 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_text.rb: Add missing tests for Text#<<.
+	  Reported by nagachika. Thanks!!!
+
+Tue Jul  9 18:02:38 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/fileutils.rb (FileUtils#chown_R): Do not skip traversal even
+	  if user and group are both nil, to be consistent with #chown and
+	  other commands.
+
+Tue Jul  9 17:58:26 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/fileutils/test_fileutils.rb
+	  (TestFileUtils#assert_output_lines): New utility assertion
+	  method for testing verbose output.
+
+Tue Jul  9 17:43:57 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/test_tracer.rb: catch up recent rubygems changes.
+
+Tue Jul  9 16:58:30 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb: hope that the final
+	  resolution to fix the failure of test-all.  and includes Win64
+	  support (fixed a potential bug).
+
+Tue Jul  9 15:57:20 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* object.c: Fix rdoc for Kernel#<=>. [Fixes GH-352]
+
+Tue Jul  9 15:53:51 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/fileutils.rb (FileUtils#mode_to_s): Define mode_to_s() also
+	  as singleton method, or FileUtils.chmod fails in verbose mode.
+
+Tue Jul  9 15:16:02 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/fileutils/fileasserts.rb
+	  (Test::Unit::FileAssertions#assert_not_symlink): Add a missing
+	  optional argument "message".
+
+Tue Jul  9 15:03:24 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): If user
+	  and group are both nil, print ":".
+
+Tue Jul  9 12:47:08 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* io.c (appendline): use READ_CHAR_PENDING_XXX macros and
+	  RSTRING_END().
+
+	* io.c (rb_io_getline_1): rewrite nested if statement into one
+	  statement.
+
+Tue Jul  9 11:04:35 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb (Win32::Registry#check):
+	  should report the position of the error.
+
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb
+	  (Win32::Registry#QueryValue): workaround for test-all crash.
+
+Tue Jul  9 10:27:56 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb
+	  (Win32::Registry.expand_environ): use suitable encoding for the
+	  string.
+
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb (Win32::Registry#read):
+	  should return REG_SZ, REG_EXPAND_SZ and REG_MULTI_SZ values with
+	  the expected encoding -- assumed as the same encoding of name.
+
+Tue Jul  9 10:02:45 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb
+	  (Win32::Registry::Error#initialize): use suitable encoding for the
+	  string.
+
+Tue Jul  9 09:46:53 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/win32/lib/win32/registry.rb (Win32::Registry.expand_environ):
+	  use suitable encoding for the string.  fixed a test-all error of
+	  r41838.
+
+	* ext/fiddle/win32/lib/win32/registry.rb: same changes of r41838 and
+	  this revision of dl's win32/registry.rb.
+
+Tue Jul  9 07:39:45 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 2.0.4.  See
+	  https://github.com/rubygems/rubygems/blob/2.0/History.txt for changes
+
+Tue Jul  9 01:47:16 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (biglsh_bang): Don't shift a BDIGIT with BITSPERDIG bits.
+	  (bigrsh_bang): Ditto.
+
+Tue Jul  9 01:17:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigrsh_bang): Fix bignum digits overrun.
+
+Tue Jul  9 00:46:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (biglsh_bang): Fix bignum digits under-run.
+
+Mon Jul  8 23:36:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/win32/lib/win32/registry.rb (Error, API): use WCHAR
+	  interfaces.  c.f. [Bug #8508]
+
+Mon Jul  8 23:13:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_pow): move from win32.h and disable strict
+	  ANSI mode macro to let _controlfp() stuff defined.
+	  [ruby-core:55312] [Bug #8495]
+
+	* numeric.c (finite): add declaration for strict ANSI.
+	  [ruby-core:55312] [Bug #8495]
+
+	* thread_win32.c (w32_thread_start_func, thread_start_func_1),
+	  (timer_thread_func): use __stdcall instead of _stdcall which is
+	  unavailable in strict ANSI mode.  [ruby-core:55312] [Bug #8495]
+
+	* win32/win32.c (gettimeofday): use __cdecl instead of _cdecl.
+
+Mon Jul  8 22:41:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul): Arguments for work memory added.
+	  (bary_mul_balance): Ditto.
+	  (bary_mul_karatsuba): Ditto.
+
+Mon Jul  8 22:03:30 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_sq_fast): New function for testing.
+	  (rb_big_mul_toom3): Ditto.
+
+	* internal.h (rb_big_sq_fast): Declared.
+	  (rb_big_mul_toom3): Ditto.
+
+Mon Jul  8 21:59:34 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul_balance): Initialize a local variable to suppress
+	  a warning.
+
+Mon Jul  8 20:55:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul_balance): Reduce work memory.
+
+Mon Jul  8 08:26:15 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* test/openssl/test_pkey_ec.rb: Skip tests for "Oakley" curves as
+	  they are not suitable for ECDSA.
+	  [ruby-core:54881] [Bug #8384]
+
+Mon Jul  8 08:03:01 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul): Add a RB_GC_GUARD.
+
+Sun Jul  7 23:56:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul_karatsuba): Unreachable code removed.  Remove
+	  several branches.
+
+Sun Jul  7 22:59:06 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_big_mul_normal): Declared.
+	  (rb_big_mul_balance): Ditto.
+	  (rb_big_mul_karatsuba): Ditto.
+
+	* bignum.c (rb_big_mul_normal): New function for tests.
+	  (rb_big_mul_balance): Ditto.
+	  (rb_big_mul_karatsuba): Ditto.
+
+Sun Jul  7 19:21:30 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: Reorder functions to decrease forward reference.
+
+Sun Jul  7 14:41:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: (bigsub_core): Use bary_sub.
+	  (bary_sub): Returns a borrow flag.  Use bary_subb.
+	  (bary_subb): New function for actually calculating subtraction with
+	  borrow.
+	  (bary_sub_one): New function.
+	  (bigadd_core): Use bary_add.
+	  (bary_add): Returns a carry flag.  Use bary_addc.
+	  (bary_addc): New function for actually calculating addition with
+	  carry.
+	  (bary_add_one): New function.
+	  (bary_muladd_1xN): Extracted from bary_mul_normal.
+	  (bigmul1_normal): Removed.
+	  (bary_mul_karatsuba): New function.
+	  (bary_mul1): Invoke rb_thread_check_ints after bary_mul_normal.
+	  (bary_mul): Remove most and least significant zeros before actual
+	  multiplication.  Use bary_sq_fast, bary_mul_balance,
+	  bary_mul_karatsuba and bigmul1_toom3 as bigmul0.
+	  (bigmul1_balance): Removed.
+	  (bigmul1_karatsuba): Removed.
+	  (bigsqr_fast): Removed.
+	  (bary_sparse_p): Extracted from big_sparse_p.
+	  (big_sparse_p): Removed.
+	  (bigmul0): Use bary_mul.
+
+Sun Jul  7 11:54:33 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* NEWS: Add REXML::Text#<< related updates.
+
+Sun Jul  7 11:49:19 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/text.rb (REXML::Text#<<): Support appending in not
+	  "raw" mode. [Bug #8602] [ruby-dev:47482]
+	  Reported by Ippei Obayashi. Thanks!!!
+
+Sun Jul  7 11:43:13 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/text.rb (REXML::Text#<<): Support method chain use by "<<"
+	  like other objects.
+
+Sun Jul  7 11:34:18 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/text.rb (REXML::Text#clear_cache): Extract common
+	  cache clear code.
+
+Sun Jul  7 11:01:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_DTRACE_POSTPROCESS): dtrace version SUN D 1.11
+	  introduces a check in the dtrace compiler to ensure that probes
+	  actually exist. If there are no probes, then the -G step will
+	  fail. As this test is only being used to determine whether -G is
+	  necessary (for instance, on OSX it is not), adding a real probe to
+	  the conftest allows it to succeed on newer versions of dtrace.
+	  Patch by Eric Saxby <sax AT livinginthepast.org> at
+	  [ruby-core:55826].  [Fixes GH-351], [Bug #8606].
+
+Sun Jul  7 10:07:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_sq_fast): Extracted from bigsqr_fast and
+	  ensure not to access zds[2*xn].
+	  (bigsqr_fast): Allocate the result bignum with 2*xn words.
+
+Sat Jul  6 07:37:43 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* ext/openssl/ossl_pkey_ec.c: Ensure compatibility to builds of
+	  OpenSSL with OPENSSL_NO_EC2M defined, but OPENSSL_NO_EC not
+	  defined.
+	* test/openssl/test_pkey_ec.rb: Iterate over built-in curves
+	  (and assert their non-emptiness!) instead of hard-coding them, as
+	  this may cause problems with respect to the different availability
+	  of individual curves in individual OpenSSL builds.
+	  [ruby-core:54881] [Bug #8384]
+
+	  Thanks to Vit Ondruch for providing the patch!
+
+Sat Jul  6 07:12:39 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* test/openssl/test_x509crl.rb: Remove unused variable.
+	  [ruby-core:53501] [Bug #8114]
+
+	  Thanks, Vipul Amler, for pointing this out!
+
+Sat Jul  6 06:37:10 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* ext/openssl/ossl.c: Provide CRYPTO_set_locking_callback() and
+	  CRYPTO_set_id_callback() callback functions ossl_thread_id and
+	  ossl_lock_callback to ensure the OpenSSL extension is usable in
+	  multi-threaded environments.
+	  [ruby-core:54900] [Bug #8386]
+
+	  Thanks, Dirkjan Bussink, for the patch!
+
+Sat Jul  6 06:06:16 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* lib/openssl/ssl.rb: Fix SSL client connection crash for SAN marked
+	  critical.
+	  The patch for CVE-2013-4073 caused SSL crash when a SSL server returns
+	  the certificate that has critical SAN value.  X509 extension could
+	  include 2 or 3 elements in it:
+
+	  [id, criticality, octet_string] if critical,
+	  [id, octet_string] if not.
+
+	  Making sure to pick the last element of X509 extension and use it as
+	  SAN value.
+	  [ruby-core:55685] [Bug #8575]
+
+	  Thank you @nahi for providing the patch!
+
+Sat Jul  6 04:49:38 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: register time objects so
+	  they are referenced as ids during output.
+	* test/psych/test_date_time.rb: corresponding test.
+
+Fri Jul  5 20:46:39 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_unicode_escape.rb (TestUnicodeEscape#test_basic): this
+	  assertion doesn't seems to be checking the unicode string on command
+	  line, but seems to be checking how to treat the unicode string from
+	  stdin.  so, should escape '\' before 'u'.  this fixes a test failure
+	  on Windows.
+
+Fri Jul  5 19:05:40 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): Fix the
+	  wrong output message when user is nil, which should be "chown
+	  :group file" instead of "chown group file".
+
+Fri Jul  5 16:21:56 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/ruby/test_regexp.rb
+	  (TestRegexp#test_options_in_look_behind)
+	  (TestRegexp#assert_match_at): Add tests for another problem
+	  fixed in Onigmo 5.13.5.  Previously Onigmo did not allow option
+	  enclosures in look-behind, which makes it impossible to
+	  interpolate a regexp into another in the middle of a look-behind
+	  pattern.  cf. https://github.com/k-takata/Onigmo/pull/17
+
+	* test/ruby/test_regexp.rb
+	  (TestRegexp#test_options_in_look_behind)
+	  (TestRegexp#assert_match_at): Parse regexps in run time rather
+	  than in compile time.
+
+Fri Jul  5 12:14:40 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_notfound): after
+	  r41710, the path of command uses backslash as the separator on
+	  Windows.
+
+Fri Jul  5 11:29:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (assert_raise_with_message): move from
+	  test/fileutils/test_fileutils.rb.  this is still experimental and
+	  the interface may be changed.
+
+Fri Jul  5 11:08:00 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (w32_spawn): r41710 made that if the command starts with
+	  a quote and includes slash, removed the top quote and NOT removed the
+	  last quote.
+	  this fixes test failures on test/ruby/test_process.rb and
+	  test/webrick.
+
+Fri Jul  5 09:53:15 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/mkmf.rb (CONFIG['CPPOUTFILE']): fix r41769; CONFIG['CPPOUTFILE']
+	  may be nil.
+
+Fri Jul  5 05:39:53 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (BARY_MUL1): Renamed from BARY_MUL.
+	  (bary_mul1): Renamed from bary_mul.
+	  (bary_mul): Renamed from bary_mul2.
+
+Fri Jul  5 04:58:05 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul_balance): Extracted from bigmul1_balance and
+	  use bary_mul2 and bary_add to decrease allocations.
+
+Fri Jul  5 02:14:00 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/fileutils.rb (FileUtils#symbolic_modes_to_i): Fix the wrong
+	  character class [+-=], which happened to match all desired
+	  characters but also match undesired characters.
+
+	* lib/fileutils.rb (FileUtils.chmod{,_R}): Enhance the symbolic
+	  mode parser to support the permission symbols u/g/o and multiple
+	  actions as defined in SUS, so that chmod("g=o+w", file) works as
+	  expected.  Invalid symbolic modes are now rejected with
+	  ArgumentError.
+
+Fri Jul  5 00:25:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (have_framework): allow header file to check.
+	  [ruby-core:55745] [Bug #8593]
+
+Thu Jul  4 22:31:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* object.c (rb_obj_equal): Fixed an rb_obj_equal documentation typo
+	  where "a" was used instead of "obj".
+	  Fixes GH-349. Patch by @adnandoric
+
+Thu Jul  4 20:39:20 2013  Tanaka Akira  <akr@fsij.org>
+
+	* tool/make-snapshot: Exit with EXIT_FAILURE when it fails.
+
+Thu Jul  4 20:20:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (maxpow_in_bdigit_dbl): Use tables if available.
+	  (maxpow_in_bdigit): Ditto.
+	  (U16): New macro.
+	  (U32): Ditto.
+	  (U64): Ditto.
+	  (U128): Ditto.
+	  (maxpow16_exp): New table.
+	  (maxpow16_num): New table.
+	  (maxpow32_exp): New table.
+	  (maxpow32_num): New table.
+	  (maxpow64_exp): New table.
+	  (maxpow64_num): New table.
+	  (maxpow128_exp): New table.
+	  (maxpow128_num): New table.
+
+Thu Jul  4 18:25:25 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_cstr_to_inum): Avoid temporary buffer allocation except
+	  very big base non-power-of-2 numbers.
+
+Thu Jul  4 15:51:56 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_succ): use ONIGENC_MBCLEN_CHARFOUND_P correctly.
+
+	* string.c (rb_str_dump): ditto.
+
+Thu Jul  4 10:04:11 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (): Merge Onigmo 5.13.5 23b523076d6f1161.
+
+	  * [bug]  (thanks Akinori MUSHA and Ippei Obayashi)
+	           Fix a renumbering bug in condition regexp with a named
+	           capture. [Bug #8583]
+	  * [spec] (thanks Akinori MUSHA)
+	    Allow ENCLOSE_OPTION in look-behind.
+
+Thu Jul  4 00:36:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (SIGNED_INTEGER_MAX): suppress warning C4146 on VC6.
+	  seems a logical ORed expression becomes unsigned.
+
+Thu Jul  4 00:13:01 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby_atomic.h (rb_w32_atomic_cas): call InterlockedCompareExchange
+	  directly.
+
+	* ruby_atomic.h (ATOMIC_CAS): fix missing function call.
+
+Wed Jul  3 23:47:35 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby_atomic.h (ATOMIC_CAS): suppress C4022 and C4047 warnings in
+	  VC6.  only InterlockedCompareExchange is declared using PVOID.
+
+Wed Jul  3 22:29:20 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (ruby_digit36_to_number_table): Declared.
+
+	* util.c (ruby_digit36_to_number_table): Moved from scan_digits.
+
+	* bignum.c (conv_digit): Use ruby_digit36_to_number_table.
+
+	* pack.c (hex2num): Ditto.
+
+Wed Jul  3 18:12:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (install_dirs): revert DESTDIR prefix by r39841, since
+	  it is fixed by r41648.  [ruby-core:55760] [Bug #8115]
+
+Wed Jul  3 14:15:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (do_stat): use rb_w32_ustati64() in win32.c to get rid of
+	  mysterious behavior of FindFirstFile() Windows API which treat "<"
+	  and ">" like as wildcard characters.  [ruby-core:55764] [Bug #8597]
+
+Wed Jul  3 12:06:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (maxpow_in_bdigit): Renamed from calc_hbase and return
+	  maxpow.
+
+Tue Jul  2 23:47:50 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (roomof): Cast to long.
+	  (rb_ull2big): Fix bignew arguments.
+
+Tue Jul  2 21:17:37 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_cstr_to_inum): Merge two temporary buffers.
+
+Tue Jul  2 20:25:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_cstr_to_inum): Use BDIGIT_DBL to collect adjacent digits.
+	  (BDIGIT_DBL_MAX): New macro.
+	  (maxpow_in_bdigit_dbl): New function.
+
+Tue Jul  2 17:23:33 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* doc/syntax/refinements.rdoc: add description of Module#using and
+	  refinement inheritance by module inclusion.
+
+Tue Jul  2 17:22:44 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h: add EUC-JP and Windows-31J.
+
+	* re.c (rb_char_to_option_kcode): use built-in encoding indexes in
+	  internal.h.
+
+	* internal.h: add UTF8-MAC.
+
+	* dir.c (rb_utf8mac_encoding): use built-in encoding indexes in
+	  internal.h.
+
+	* internal.h: add UTF-{16,32} dummy encodings.
+
+	* string.c (rb_str_inspect, str_scrub0): use built-in encoding indexes
+	  in internal.h.
+
+	* internal.h: add UTF-{16,32}{BE,LE}.
+
+	* io.c (io_strip_bom): use built-in encoding indexes in internal.h.
+
+	* internal.h (rb_{ascii8bit,utf8,usascii}_encindex): use built-in
+	  encoding indexes for optimization.
+
+	* encoding.c (enc_inspect, rb_locale_encindex),
+	  (enc_set_filesystem_encoding, rb_filesystem_encindex): use built-in
+	  encoding indexes directly.
+
+	* encoding.c (rb_enc_set_index, rb_enc_associate_index): validate
+	  argument encoding index.
+
+	* include/ruby/encoding.h (ENCODING_SET): use rb_enc_set_index()
+	  instead of setting inlined bits directly.
+
+	* encoding.c (rb_enc_init): register preserved indexes.
+
+	* internal.h (ruby_preserved_encindex): move from encoding.c.
+
+Tue Jul  2 11:14:36 2013  Shota Fukumori  <sorah@cookpad.com>
+
+	* lib/mkmf.rb (try_config): Fix to not replace $LDFLAGS with $libs
+	  (1.9.3 behavior) [ruby-core:55752] [Bug #8595]
+
+Tue Jul  2 00:39:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ipsocket.c (init_inetsock_internal): Don't try mismatched
+	  address family if already failed.
+
+Mon Jul  1 23:07:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* template/encdb.h.tmpl: define encoding index macros to use the index
+	  statically from C source.
+
+Mon Jul  1 22:57:19 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul2): New function.
+	  (rb_cstr_to_inum): Use a better algorithm to compose the result
+	  if input length is very long.
+
+Mon Jul  1 20:22:00 2013  Kenta Murata  <mrkn@cookpad.com>
+
+	* ext/bigdecimal/bigdecimal.h (RB_UNUSED_VAR, UNREACHABLE):
+	  import macros from ruby.h for 1.9.3.
+	  [Bug #8588] [ruby-core:55730]
+
+	* ext/bigdecimal/bigdecimal.gemspec: Bump version to 1.2.1.
+
+Mon Jul  1 20:03:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ipsocket.c (init_inetsock_internal): Use an address
+	  family for local address which is different to the remote
+	  address if no other choice.
+
+Mon Jul  1 15:05:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/csv.rb (CSV#<<): use StringIO#set_encoding instead of creating
+	  new StringIO instance with String#force_encoding, forcing encoding
+	  discards the cached coderange bits and can make further operations
+	  very slow.  [ruby-core:55714] [Bug #8585]
+
+	* ext/stringio/stringio.c (strio_write): keep coderange of
+	  ptr->string.
+
+	* string.c (rb_enc_cr_str_buf_cat, rb_str_append): consider an empty
+	  string 7bit-clean and should not discard cached coderange of string
+	  to be appended.
+
+Mon Jul  1 12:56:41 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_using_module): activate refinements in the ancestors of
+	  the argument module to support refinement inheritance by
+	  Module#include.  [ruby-core:55671] [Feature #8571]
+
+	* test/ruby/test_refinement.rb: related test.
+
+Mon Jul  1 12:02:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_cstr_to_inum): Skip leading zeros.
+
+Mon Jul  1 00:59:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (nlz16): New function.
+	  (nlz32): Ditto.
+	  (nlz64): Ditto.
+	  (nlz128): Ditto.
+	  (nlz): Redefined using an above function.
+	  (bitsize): New macro.
+	  (rb_cstr_to_inum): Use bitsize instead of nlz.
+
+Sun Jun 30 22:40:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* lib/prime.rb: Corrected a few comments. Patch by @Nullset14.
+	  Fixes GH-346.
+
+Sun Jun 30 21:53:38 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_cstr_to_inum): Use rb_integer_unpack if base is a power
+	  of 2.
+
+Sun Jun 30 10:59:23 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (join_argv): use backslash instead of slash in program
+	  path, otherwise cannot invoke "./c\u{1ee7}a.exe" for some reason.
+	  [ruby-core:24309] [Bug #1771]
+
+	* io.c (spawnv, spawn): use UTF-8 spawn family.  [Bug #1771]
+
+	* process.c (proc_exec_sh, proc_spawn_cmd, proc_spawn_sh): ditto.
+
+	* win32/win32.c (translate_char, join_argv, has_redirection): make
+	  codepage aware.
+
+	* win32/win32.c (rb_w32_udln_find_exe_r, rb_w32_udln_find_file_r):
+	  codepage independent versions.
+
+	* win32/win32.c (w32_spawn): extract codepage aware code from
+	  rb_w32_spawn().
+
+	* win32/win32.c (rb_w32_uspawn): add UTF-8 version function.
+
+	* win32/win32.c (w32_aspawn_flags): extract codepage aware code from
+	  rb_w32_aspawn_flags().
+
+	* win32/win32.c (rb_w32_uaspawn_flags, rb_w32_uaspawn_flags): add
+	  UTF-8 version functions.
+
+	* win32/win32.c (w32_getenv): extract codepage aware code from
+	  rb_w32_ugetenv() and rb_w32_getenv().
+
+	* win32/win32.c (w32_stati64): extract codepage aware code from
+	  rb_w32_ustati64() and rb_w32_stati64().
+
+	* dln.h (DLN_FIND_EXTRA_ARG, DLN_FIND_EXTRA_ARG_DECL): allow extra
+	  arguments to dln_find_{exe,file}_r().
+
+	* dln_find.c (dln_find_exe_r, dln_find_file_r): add extract arguments.
+
+	* process.c (EXPORT_STR, EXPORT_DUP): convert to default process
+	  encoding if defined.
+
+	* process.c (check_exec_env_i): convert environment variables too.
+
+	* process.c (rb_exec_fillarg): convert program path and arguments too.
+
+Sun Jun 30 01:57:08 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big_rshift): Use abs2twocomp and twocomp2abs_bang.
+
+Sun Jun 30 00:14:20 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (RBIGNUM_SET_NEGATIVE_SIGN): New macro.
+	  (RBIGNUM_SET_POSITIVE_SIGN): Ditto.
+	  (rb_big_neg): Inline get2comp to avoid double negation.
+
+Sat Jun 29 23:26:41 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_neg): Extracted from bary_2comp.
+	  (bary_plus_one): Extracted from bary_2comp.
+	  (bary_2comp): Use bary_neg and bary_plus_one.
+	  (big_extend_carry): Extracted from get2comp.
+	  (get2comp): Use big_extend_carry.
+	  (rb_integer_unpack): Use big_extend_carry.
+	  (rb_big_neg): Use bary_neg.
+
+Sat Jun 29 22:31:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_2comp): Simplified.
+
+Sat Jun 29 09:33:53 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigor_int): Return -1 if y == -1.
+
+Sat Jun 29 09:07:16 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigor_int): Use RB_GC_GUARD.
+	  (bigxor_int): Take xn and hibitsx arguments.  Use twocomp2abs_bang.
+	  (rb_big_xor): Use abs2twocomp and twocomp2abs_bang.
+
+Sat Jun 29 08:19:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigand_int): Don't apply bitwise and for BDIGIT and long.
+	  (bigor_int): Take xn and hibitsx arguments.  Use twocomp2abs_bang.
+	  (rb_big_or): Use abs2twocomp and twocomp2abs_bang.
+
+Fri Jun 29 01:08:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* numeric.c (fix_mul): remove FIT_SQRT_LONG test as it was causing
+	  fix_mul to return an incorrect result for -2147483648*-2147483648
+	  on 64 bit platforms
+
+	* test/ruby/test_integer_comb.rb (class TestIntegerComb): add test case
+
+Fri Jun 28 12:26:53 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_and): Allocate new bignum with same size to shorter
+	  argument if it's high bits are zero.
+
+Fri Jun 28 12:14:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ipsocket.c (init_inetsock_internal): Don't use local
+	  addresses which address family is different to remote address.
+
+Fri Jun 28 08:06:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigand_int): Add arguments, xn and hibitsx.
+	  Use twocomp2abs_bang.
+
+Thu Jun 27 23:58:13 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (abs2twocomp_bang): Removed.
+	  (abs2twocomp): Take n_ret argument to return actual length.
+	  (rb_big_and): Follow above change.
+
+Thu Jun 27 22:52:19 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (get2comp): Use bary_2comp.
+	  (abs2twocomp_bang): New function.
+	  (abs2twocomp): New function.
+	  (twocomp2abs_bang): New function.
+	  (rb_big_and): Use abs2twocomp and twocomp2abs_bang.
+
+Thu Jun 27 20:03:13 2013  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (verify_certificate_identity): fix
+	  hostname verification. Patched by nahi.
+
+	* test/openssl/test_ssl.rb (test_verify_certificate_identity): test for
+	  above.
+
+
+Thu Jun 27 00:23:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_pow): Retry if y is a Bignum and it is
+	  representable as a Fixnum.
+	  Use rb_absint_numwords.
+
+Wed Jun 26 23:53:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_save_rounding_mode): fix typo.
+	  Fixes GH-343. Patch by @jgarber.
+
+Wed Jun 26 23:22:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (rb_enumeratorize_with_size): use strict definition
+	  rb_enumerator_size_func.
+
+Wed Jun 26 23:11:14 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* gc.c (is_before_sweep): Add a missing space before a parenthesis.
+	* gc.c (rb_gc_force_recycle): Add a missing space around a parenthesis.
+
+Wed Jun 26 22:44:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_enumeratorize_with_size): cast for
+	  backward compatibility.
+
+	* include/ruby/intern.h (rb_enumerator_size_func): define strict
+	  function declaration for rb_enumeratorize_with_size().
+
+Wed Jun 26 21:01:22 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/test_io.rb (TestIO#test_write_32bit_boundary): skip if
+	  writing a file is slow.
+	  [ruby-core:55541] [Bug #8519]
+
+Wed Jun 26 16:42:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: should use expanded values for header directories
+	  unless extmk.  patch by vo.x (Vit Ondruch) at [ruby-core:55653]
+	  [Bug #8115], rhbz#921650.
+
+Wed Jun 26 12:48:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigxor_int): Fix a buffer over read.
+
+Wed Jun 26 12:13:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigand_int): Consider negative values.
+	  (bigor_int): The allocated bignum should have enough size
+	  to store long.
+	  This fixes (bignum fits in a BDIGIT) | (fixnum bigger than BDIGIT)
+	  on platforms which SIZEOF_BDIGITS < SIZEOF_LONG,
+	  such as LP64 with 32bit BDIGIT (no int128).
+
+Wed Jun 26 12:08:51 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_udp.rb: Close sockets explicitly.
+	  Don't use fixed port number.
+
+Wed Jun 26 07:27:17 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigand_int): Fix a buffer over read.
+
+Wed Jun 26 06:48:07 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigadd_int): Fix a buffer over read.
+
+Wed Jun 26 01:18:13 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (is_before_sweep): Add new helper function that check the object
+	  is before sweep?
+	* gc.c (rb_gc_force_recycle): Have to clear mark bit if object's slot
+	  already ready to minor sweep.
+
+Wed Jun 26 01:17:29 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigsub_int): Fix a buffer over read.
+
+Tue Jun 25 22:45:43 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_absint_singlebit_p): Use POW2_P.
+	  (bary_pack): Ditto.
+	  (rb_big2str0): Ditto.
+	  (POW2_P): Moved to top.
+
+Tue Jun 25 22:28:07 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make): Pass
+	  DESTDIR via command line to override what's in MAKEFLAGS.  This
+	  fixes an installation problem under a package building
+	  environment where DESTDIR is specified in the (parent) command
+	  line. [Fixes GH-327]
+
+Tue Jun 25 21:43:13 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2dbl): Use (BDIGIT)1 instead of 1UL.
+	  (bary_mul_normal): Remove a useless cast.
+
+Tue Jun 25 21:26:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Fix for the cases when
+	  the argument x is not a BigDecimal.
+	  This change is based on the patch made by Heesob Park and Garth Snyder.
+	  [Bug #6862] [ruby-core:47145]
+	  [Fixes GH-332] https://github.com/ruby/ruby/pull/332
+
+Tue Jun 25 20:36:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2ulong): "check" argument removed.
+	  (rb_big2ulong): Follow above change.
+	  (rb_big2long): Ditto.
+	  (rb_big_rshift): Ditto.
+	  (rb_big_aref): Ditto.
+
+Tue Jun 25 20:08:29 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big2ulong_pack): Use rb_integer_pack.
+	  (rb_big_aref): Call big2ulong with TRUE for "check" argument.
+	  It should be non-effective.
+
+Tue Jun 25 19:07:33 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (LSHIFTX): Revert r41611.
+	  The redundant expression suppresses a warning, C4293, by Visual
+	  Studio.
+	  http://ruby-mswin.cloudapp.net/vc10-x64/ruby-trunk/log/20130625T072854Z.log.html.gz#miniruby
+
+Tue Jun 25 19:03:00 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2ulong): Add a cast.
+	  (big2ull): Add a specialized code for SIZEOF_LONG_LONG <=
+	  SIZEOF_BDIGITS.
+
+Tue Jun 25 12:42:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (integer_unpack_single_bdigit): Use "1 + ~u" instead of
+	  "-u" to suppress warning (C4146) by Visual Studio.
+	  Reported by ko1 via IRC.
+
+Tue Jun 25 12:28:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2ulong): Add code specialized for SIZEOF_LONG <=
+	  SIZEOF_BDIGITS.
+	  This prevents shift width warning from "num <<= BITSPERDIG".
+
+Tue Jun 25 12:23:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix oldgen/remembered_shady counting algorithm.
+
+	* gc.c (rgengc_check_shady): increment
+	  `objspace->rgengc.remembered_shady_object_count' here.
+
+	* gc.c (rgengc_remember): return FALSE if obj is already remembered.
+
+	* gc.c (rgengc_rememberset_mark): make it void.
+
+	* gc.c (gc_mark_children): fix to double counting oldgen_object_count
+	  at minor GC.
+
+Tue Jun 25 12:07:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (MSB): Removed.
+	  (BDIGIT_MSB): Defined using BIGRAD_HALF.
+	  (bary_2comp): Apply BIGLO after possible over flow of BDIGIT.
+	  (get2comp): Ditto.
+	  (bary_unpack_internal): Use BDIGIT_MSB.
+	  Apply BIGLO after possible over flow of BDIGIT.
+	  (rb_integer_unpack): Use BDIGIT_MSB.
+	  (calc_hbase): Use BDIGMAX.
+	  (big2dbl): Use BDIGMAX.
+	  Apply BIGLO after possible over flow of BDIGIT.
+	  (rb_big_neg): Apply BIGLO after possible over flow of BDIGIT.
+	  (biglsh_bang): Ditto.
+	  (bigrsh_bang): Ditto.
+	  (bary_divmod): Use BDIGIT_MSB.
+	  (bigdivrem): Ditto.
+	  (bigxor_int): Apply BIGLO after possible over flow of BDIGIT.
+
+	* marshal.c (shortlen): Use SIZEOF_BDIGITS instead of sizeof(BDIGIT).
+
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): Use SIZEOF_BDIGITS
+	  instead of sizeof(BDIGIT).
+
+Tue Jun 25 11:40:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (big2ulong): suppress shorten-64-to-32 warning.  BDIGIT can
+	  be bigger than long now.
+
+	* bignum.c (LSHIFTX): remove redundant never-true expression.
+
+Tue Jun 25 00:55:54 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (typedef struct rb_objspace): Change members for monitor objects.
+	* gc.c (gc_marks_test): Check all WriteBarrier Errors and track them in obj-tree.
+	* gc.c (rgengc_check_shady): Ditto.
+	* gc.c (gc_marks): Move 2 function calls to gc_marks_test for test initialize.
+
+Mon Jun 24 23:30:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (integer_unpack_single_bdigit): Refine code to filling
+	  higher bits and use BIGLO.
+
+Mon Jun 24 22:26:31 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/rinda/test_rinda.rb (RingIPv6#prepare_ipv6):
+	  ifindex() function may not be implemented on Windows. We use another
+	  check for the case.
+
+Mon Jun 24 22:11:37 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_nolock):
+	  skip a failing test on Windows because flock() implementation is
+	  different from Unix.
+
+Mon Jun 24 22:06:14 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/rubygems/test_gem_installer.rb (test_install_extension_flat):
+	  use ruby in build directory in case ruby is not installed.
+	  [ruby-core:53265] [Bug #8058]
+
+Mon Jun 24 22:04:02 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): fix conversion from Bignum to
+	  pointer. sizeof(DLSTACK_TYPE) is larger than sizeof(long) on
+	  Windows x64 and higher bits over sizeof(long) of DLSTACK_TYPE was
+	  zero even if a pointer value was over 32 bits which causes SEGV on
+	  DL::TestCPtr#test_to_ptr_io. Adding a cast solves the bug.
+
+Mon Jun 24 22:04:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* eval_error.c (warn_printf): use rb_vsprintf instead so ruby specific
+	  extensions like PRIsVALUE can be used in format strings
+	* eval_error.c (error_print): use warn_print_str (alias for
+	  rb_write_error_str) to print a string value instead of using
+	  RSTRING_PTR and RSTRING_LEN manually
+	* eval.c (setup_exception): use PRIsVALUE instead of %s and RSTRING_PTR
+
+Mon Jun 24 20:31:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* compile.c (make_name_for_block): use PRIsVALUE in format string
+	  instead of %s and RSTRING_PTR to protect objects from being garbage
+	  collected too soon
+	* encoding.c (str_to_encindex): ditto
+	* hash.c (rb_hash_fetch_m): ditto
+	* io.c (rb_io_reopen): ditto
+	* parse.y (reg_fragment_check_gen): ditto
+	* parse.y (reg_compile_gen): ditto
+	* parse.y (ripper_assert_Qundef): ditto
+	* re.c (rb_reg_raise): ditto
+	* ruby.c (set_option_encoding_once): ditto
+	* vm_eval.c (rb_throw_obj): ditto
+
+Mon Jun 24 07:57:18 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (after_gc_sweep): Have to record malloc info before reset.
+	* gc.c (gc_prof_timer_start): Pick out part of new record creation as gc_prof_setup_new_record.
+	* gc.c (gc_prof_set_malloc_info): Move point of recording allocation size to front of mark.
+
+Mon Jun 24 02:53:09 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* array.c: Return value in Array overview example found by @PragTob
+	  [Fixes GH-336] https://github.com/ruby/ruby/pull/336
+
+Mon Jun 24 02:45:51 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* array.c (rb_ary_zip): typo by @PragTob [Fixes GH-337]
+	  https://github.com/ruby/ruby/pull/337
+
+Mon Jun 24 02:42:01 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* win32/README.win32: grammar typo by @blankenshipz [Fixes GH-334]
+	  https://github.com/ruby/ruby/pull/334
+
+Mon Jun 24 00:59:35 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (BIGUP): Use LSHIFTX and avoid cast to consider the type
+	  of x is bigger than BDIGIT_DBL.
+	  (big2ulong): Use unsigned long to store the result.
+	  (big2ull): Use unsigned LONG_LONG to store the result.
+	  (bigand_int): Use long for num to avoid data loss.
+	  (bigor_int): Ditto.
+	  (bigxor_int): Ditto.
+
+Sun Jun 23 23:05:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/defines.h (BDIGIT): Define it only if it is not defined
+	  yet.  This eases tests and debug.
+	  (SIZEOF_BDIGITS): Ditto.
+	  (BDIGIT_DBL): Ditto.
+	  (BDIGIT_DBL_SIGNED): Ditto.
+	  (PRI_BDIGIT_PREFIX): Ditto.
+	  (PRI_BDIGIT_DBL_PREFIX): Ditto.
+	  (PRIdBDIGIT): Define it only if PRI_BDIGIT_PREFIX is defined.
+	  (PRIiBDIGIT): Ditto.
+	  (PRIoBDIGIT): Ditto.
+	  (PRIuBDIGIT): Ditto.
+	  (PRIxBDIGIT): Ditto.
+	  (PRIXBDIGIT): Ditto.
+	  (PRIdBDIGIT_DBL): Ditto.
+	  (PRIiBDIGIT_DBL): Ditto.
+	  (PRIoBDIGIT_DBL): Ditto.
+	  (PRIuBDIGIT_DBL): Ditto.
+	  (PRIxBDIGIT_DBL): Ditto.
+	  (PRIXBDIGIT_DBL): Ditto.
+
+	* include/ruby/ruby.h (RBIGNUM_EMBED_LEN_MAX): Define it only if it is
+	  not defined yet.
+
+Sun Jun 23 17:29:51 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (integer_unpack_single_bdigit): Use a cast.
+
+Sun Jun 23 15:38:07 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_thread.rb: rescue resource limitation errors.
+
+Sun Jun 23 08:19:27 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (integer_unpack_single_bdigit): Extracted from
+	  bary_unpack_internal.
+
+Sun Jun 23 07:41:52 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_unpack_internal): Suppress warnings (C4146) on Visual Studio.
+	  Reported by ko1 via IRC.
+
+Sun Jun 23 06:49:28 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h, gc.c: rename macros and functions:
+	  OBJ_WB_GIVEUP() -> OBJ_WB_UNPROTECT(),
+	  rb_obj_wb_giveup() -> rb_obj_wb_unprotect(),
+	  rb_gc_giveup_promoted_writebarrier() ->
+	  rb_gc_writebarrier_unprotect_promoted(),
+
+	* class.c, eval.c, hash.c: use OBJ_WB_UNPROTECT().
+
+Sun Jun 23 05:41:32 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c (rb_include_class_new), eval.c (rb_using_refinement):
+	  make classes/modules (who share method table) shady.
+	  If module `a' and `b' shares method table m_tbl and new method
+	  with iseq is added, then write barrier is applied only `a' or `b'.
+	  To avoid this issue, shade such classes/modules.
+
+	* vm_method.c (rb_method_entry_make): add write barriers.
+
+Sun Jun 23 01:27:54 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bytes_zero_p): Removed.
+	  (bary_pack): Don't call bytes_zero_p.
+
+Sun Jun 23 00:51:29 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bytes_zero_p): Extracted from bary_pack.
+	  (bary_pack): Use bytes_zero_p.
+
+Sun Jun 23 00:16:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (MSB): New macro.
+	  (bary_unpack_internal): Use MSB.
+	  (bary_divmod): Ditto.
+	  (bigdivrem): Ditto.
+
+Sat Jun 22 23:45:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_swap): New function.
+	  (bary_pack): Use bary_swap.
+	  (bary_unpack_internal): Ditto.
+
+Sat Jun 22 23:18:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bytes_2comp): Renamed from quad_buf_complement.
+	  (bary_pack): Use bytes_2comp.
+	  (rb_quad_pack): Use rb_integer_pack.
+	  (rb_quad_unpack): Use rb_integer_unpack.
+
+Sat Jun 22 21:46:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_unpack): Don't allocate a Bignum if possible.
+
+Sat Jun 22 21:03:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (pack_unpack): Remove specialized unpackers for integers.
+
+Sat Jun 22 20:36:50 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_unpack_internal): Specialized unpacker implemented.
+	  (bary_unpack): Support INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION.
+	  (rb_integer_unpack): Support INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION.
+
+Sat Jun 22 18:53:10 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_pack): Support
+	  INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION flag.
+	  Fix byte order and word order handling in code specialized for
+	  wordsize % SIZEOF_BDIGITS == 0.
+
+	* internal.h (INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION): Defined.
+
+Sat Jun 22 15:41:25 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rgengc_check_shady): add new WB miss checking
+	  on RGENGC_CHECK_MODE >= 2.
+
+	    (1) Save bitmaps before marking
+	    (2) Run full marking
+	    (3) On each traceable object,
+	      (a) object        was not oldgen (== newly or shady object) &&
+	      (b) parent object was     oldgen &&
+	      (c) parent object was not remembered &&
+	      (d) object        was not remembered
+	      then, it should be WB miss.
+
+	  This idea of this checker is by Masaya Tarui <tarui@ruby-lang.org>.
+
+Sat Jun 22 15:25:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* ext/etc/etc.c (setup_passwd): revert r41560, unnecessary
+
+Sat Jun 22 14:39:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* ext/etc/etc.c (Init_etc): omit 'passwd' from definition of Etc::Passwd
+	  if HAVE_STRUCT_PASSWD_PW_PASSWD is not defined to prevent mismatch of
+	  fields and values in setup_passwd
+
+Sat Jun 22 14:35:40 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): Use rb_big_pack instead of
+	  rb_big2ulong_pack and rb_big2ull.
+
+	* include/ruby/intern.h (rb_big2ulong_pack): Deprecated.
+
+Sat Jun 22 14:31:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* ext/etc/etc.c (setup_passwd): pass 0 as VALUE to rb_struct_new to
+	  prevent segfault if the compiler passes it as a 32 bit integer on
+	  a 64 bit ruby
+
+Sat Jun 22 13:47:13 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_pack): MEMZERO can be used even if nails is not zero.
+
+Sat Jun 22 13:43:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_getpwnam): use PRIsVALUE in format string instead
+	  of %s and RSTRING_PTR
+
+	* ext/etc/etc.c (etc_getgrnam): ditto
+
+Sat Jun 22 13:07:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (CLEAR_LOWBITS): Rewritten without RSHIFTX.
+	  (RSHIFTX): Removed.
+
+Sat Jun 22 10:38:03 2013  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (num2i32): Removed.
+	  (pack_pack): Don't use num2i32.
+
+Sat Jun 22 09:55:13 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (LSHIFTX): Defined to suppress a warning.
+	  (RSHIFTX): Ditto.
+	  (CLEAR_LOWBITS): Use LSHIFTX and RSHIFTX.
+	  (FILL_LOWBITS): Use LSHIFTX.
+	  Reported by ko1 via IRC.
+
+Sat Jun 22 09:11:33 2013  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 4.7.5 (r8724)
+	* test/minitest/*: ditto
+
+Sat Jun 22 07:20:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_prof_set_heap_info, after_gc_sweep): call
+	  gc_prof_set_heap_info() just after sweeping to calculate
+	  live object number correctly.
+	  (live object number = total generated number (before marking) -
+	                        total freed number (after sweeping))
+
+	* gc.c (gc_marks): record `oldgen_object_count' into current profile`
+	  record directly.
+
+	* gc.c (rgengc_rememberset_mark): same for remembered_normal_objects
+	  and remembered_shady_objects.
+
+Sat Jun 22 06:46:04 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace::profile): rename rb_objspace::profile::record to
+	  records (because it points a set of records) and add a field
+	  rb_objspace::profile::current_record to point a current profiling
+	  record.
+
+	* gc.c: use above fields.
+
+Sat Jun 22 06:05:36 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_giveup_promoted_writebarrier): remove `rest_sweep()'
+	  because all of remembered objects are called for gc_mark_children().
+
+Sat Jun 22 05:08:03 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rgengc_rememberset_mark): call gc_mark_children() for
+	  remembered objects directly instead of pushing on the mark stack.
+
+Sat Jun 22 04:48:53 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h (OBJ_WRITE): cast to (VALUE *) for second
+	  parameter `slot'. You don't need to write a cast (VALUE *) any more.
+
+	* class.c, compile.c, hash.c, iseq.c, proc.c, re.c, variable.c,
+	  vm.c, vm_method.c: remove cast expressions for OBJ_WRITE().
+
+Sat Jun 22 04:37:08 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (slot_sweep_body): rename to slot_sweep().
+	  No need to separate major/minor GC.
+
+	* gc.c (gc_setup_mark_bits): remove gc_clear_mark_bits() and unify to
+	  this function.
+
+Sat Jun 22 04:20:21 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (check_bitmap_consistency): add to check flag and bitmap consistency.
+	  Use this function in several places.
+
+Sat Jun 22 02:18:07 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_pack): Specialized packers implemented.
+	  (HOST_BIGENDIAN_P): New macro.
+	  (ALIGNOF): New macro.
+	  (CLEAR_LOWBITS): New macro.
+	  (FILL_LOWBITS): New macro.
+	  (swap_bdigit): New macro.
+	  (bary_2comp): Returns an int.
+
+	* internal.h (swap16): Moved from pack.c
+	  (swap32): Ditto.
+	  (swap64): Ditto.
+
+Fri Jun 21 21:29:49 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (typedef enum): Introduce flags of major gc reason.
+	* gc.c (garbage_collect_body): Ditto.
+	* gc.c (gc_profile_flags): Ditto.
+	* gc.c (gc_profile_dump_on): Ditto.
+
+Fri Jun 21 21:11:53 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (allocate_sorted_heaps): remove unused variable `add'.
+
+Fri Jun 21 20:50:32 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: constify RArray::as::ary and RArray::heap::ptr.
+	  Use RARRAY_ASET() or RARRAY_PTR_USE() to modify Array objects.
+
+	* array.c, gc.c: catch up above changes.
+
+Fri Jun 21 20:32:13 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c (eval_string_with_cref): fix WB miss.
+
+Fri Jun 21 20:15:49 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: support write barrier protection for T_STRUCT.
+	  Introduce the following C APIs:
+	    * RSTRUCT_RAWPTR(st) returns pointer (do WB on your risk).
+	      The type of returned pointer is (const VALUE *).
+	    * RSTRUCT_GET(st, idx) returns idx-th value of struct.
+	    * RSTRUCT_SET(st, idx, v) set idx-th value by v with WB.
+	  And
+	    * RSTRUCT_PTR(st) returns pointer with shady operation.
+	      The type of returned pointer is (VALUE *).
+
+	* struct.c, re.c, gc.c, marshal.c: rewrite with above APIs.
+
+Fri Jun 21 19:38:37 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (BDIGMAX): Use BIGRAD.
+	  (BIGLO): Use BDIGMAX.
+	  (bigdivrem1): Ditto.
+	  (bigor_int): Ditto.
+	  (rb_big_or): Ditto.
+
+Fri Jun 21 19:18:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (pack_pack): Move the implementation for 'c' directive after
+	  pack_integer label.
+
+Fri Jun 21 19:11:56 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h, re.c: support write barrier for T_REGEXP.
+
+	   Note: T_MATCH object is also easy to support write barriers.
+	         However, most of T_MATCH objects are short-lived objects.
+	         So I skipped to support non-shady T_MATCH.
+
+Fri Jun 21 18:56:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigsub_int): Use bdigit_roomof.
+	  (bigadd_int): Ditto.
+	  (bigand_int): Ditto.
+	  (bigor_int): Ditto.
+	  (bigxor_int): Ditto.
+
+Fri Jun 21 17:56:25 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/gc/gcbench.rb: fix summary of benchmark result notation.
+
+Fri Jun 21 16:38:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* ext/openssl/ossl_x509attr.c: change OSSL_X509ATTR_IS_SINGLE and
+	  OSSL_X509ATTR_SET_SINGLE macros to use ->value.set rather than
+	  ->set to fix compile failure
+
+Fri Jun 21 15:26:45 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_sweep): profile sweep time correctly when LAZY_SWEEP is
+	  disabled.
+
+	* gc.c (gc_marks_test): store oldgen count and shady count
+	  before test marking and restore them after marking.
+
+Fri Jun 21 15:07:42 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: enable lazy sweep (commit miss).
+
+Fri Jun 21 14:31:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (ruby_setenv): refine error message so include the variable
+	  name.
+
+Fri Jun 21 14:15:08 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix to use total_allocated_object_num and heaps_used
+	  at the GC time for profiler.
+
+Fri Jun 21 12:35:35 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: RGENGC_CHECK_MODE should be 0.
+
+Fri Jun 21 11:18:25 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_marks_body): fix to get `th' in this function.
+
+Fri Jun 21 10:21:44 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (heaps_header/heaps_slot): embed bitmaps into heaps_slot.
+	  no need to maintain allocation/free bitmaps.
+
+Fri Jun 21 09:22:16 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (slot_sweep_body): add counters at a time.
+
+	* gc.c (gc_profile_dump_on): fix line break position.
+
+Fri Jun 21 08:14:00 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c: refactoring bitmaps. introduce bits_t type and some Consts.
+
+Fri Jun 21 08:04:32 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix to support USE_RGENGC == 0 (disable RGenGC).
+	  If USE_RGENGC==0, it caused compilation error.
+
+Fri Jun 21 08:08:11 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (lazy_sweep): Use is_lazy_sweeping()
+	* gc.c (rest_sweep): Ditto.
+	* gc.c (gc_prepare_free_objects): Ditto.
+
+Fri Jun 21 07:34:47 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_profile_record::oldgen_objects): added.
+
+	* gc.c (gc_profile_dump_on): print the following information:
+	  * Living object counts
+	  * Free object counts
+	  If RGENGC_PROFILE > 0 then
+	  * Oldgen object counts
+	  * Remembered normal object counts
+	  * Remembered shady object counts
+
+Fri Jun 21 06:43:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_ull2big): Refactored.
+	  (rb_uint2big): Useless code removed.
+
+Fri Jun 21 05:37:39 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_prof_sweep_timer_stop): accumulate sweep time only when
+	  record->gc_time > 0.
+
+Fri Jun 21 00:37:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/bigdecimal: Workaround fix for bigdecimal test failures caused
+	  by [ruby-dev:47413] [Feature #8509]
+
+	* ext/bigdecimal/bigdecimal.h (BDIGIT): Make it independent from the
+	  definition for bignum.c.
+	  (SIZEOF_BDIGITS): Ditto.
+	  (BDIGIT_DBL): Ditto.
+	  (BDIGIT_DBL_SIGNED): Ditto.
+	  (PRI_BDIGIT_PREFIX): Undefine the definition.
+	  (PRI_BDIGIT_DBL_PREFIX): Ditto.
+
+	* ext/bigdecimal/bigdecimal.c (RBIGNUM_ZERO_P): Use rb_bigzero_p.
+	  (bigzero_p): Removed.
+	  (is_even): Use rb_big_pack.
+
+Thu Jun 20 22:52:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigmul1_toom3): Don't call bignorm twice.
+
+Thu Jun 20 22:49:27 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bignorm): Don't call bigtrunc if the result is a fixnum.
+
+Thu Jun 20 22:29:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_uint2big): Refactored.
+
+Thu Jun 20 22:24:41 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (dump_bignum): Use SIZEOF_BDIGITS.
+
+Thu Jun 20 22:22:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2ulong): Change the return type to unsigned long.
+	  (rb_big2ulong_pack): Follow the above change.
+	  (rb_big2long): Ditto.
+	  (rb_big_lshift): Ditto.
+	  (rb_big_rshift): Ditto.
+	  (rb_big_aref): Ditto.
+
+Thu Jun 20 22:02:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_unpack_internal): Return -2 when negative overflow.
+	  (bary_unpack): Set the overflowed bit if an extra BDIGIT exists.
+	  (rb_integer_unpack): Set the overflowed bit.
+
+Thu Jun 20 21:17:19 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rgengc_rememberset_mark): record
+	  (1) normal objects count in remember set
+	  (2) shady objects count in remember set
+	  each GC timing.
+
+	* gc.c (gc_profile_record_get): enable to access above information
+	  and REMOVING_OBJECTS, EMPTY_OBJECTS.
+
+Thu Jun 20 18:29:26 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/gc/gcbench.rb: Do not use GC::Profiler::disable because
+	  GC::Profiler::disable prohibit to access profiling data. It should
+	  be spec bug.
+
+	  Skip GC::Profiler::report if RUBY_VERSION < '2.0.0'
+
+Thu Jun 20 17:59:08 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/gc/gcbench.rb: stop GC::Profiler before output results.
+	  Generating GC::Profiler result under profiling causes infinite loop.
+
+Thu Jun 20 17:24:24 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/gc/gcbench.rb: don't use __dir__ to make compatible
+	  with ruby 1.9.3.
+
+Thu Jun 20 16:57:19 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_app_aobench.rb: use attr_accessor/reader instead of
+	  defining methods.
+
+Thu Jun 20 16:46:46 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_app_aobench.rb: added.
+
+	* benchmark/gc/aobench.rb: added.
+
+Thu Jun 20 16:28:33 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_so_binary_trees.rb: disable `puts' method
+	  and change iteration parameter to increase execution time.
+
+	* benchmark/gc/binarytree.rb: added.
+
+Thu Jun 20 16:06:37 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/gc/pentomino.rb: added.
+	  Simply load pentomino puzzle in the benchmark/ directory.
+
+Thu Jun 20 15:32:56 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/gc/redblack.rb: import red black tree benchmark from
+	  https://github.com/jruby/rubybench/blob/master/time/bench_red_black.rb
+
+	* benchmark/gc/ring.rb: add a benchmark. This benchmark create many
+	  old objects.
+
+Thu Jun 20 15:14:00 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/gc: create a directory to store GC related benchmark.
+
+	* benchmark/gc/gcbench.rb: moved from tool/gcbench.rb.
+
+	* benchmark/gc/hash(1|2).rb: ditto.
+
+	* benchmark/gc/rdoc.rb: ditto.
+
+	* benchmark/gc/null.rb: added.
+
+	* common.mk: fix rule.
+
+Thu Jun 20 14:09:54 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* tool/hashbench1.rb: fix parameter too. Increase temporary objects.
+
+Thu Jun 20 14:01:35 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* tool/hashbench1.rb: fix parameters.
+
+Thu Jun 20 14:00:34 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: remove dependency from ruby.
+
+Thu Jun 20 13:14:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_check_backtrace): evaluate RARRAY_AREF only once.
+	  the first argument of RB_TYPE_P is expanded twice for non-immediate
+	  types.
+
+Thu Jun 20 08:09:29 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* tool/gcbench.rb: Summary in one line.
+
+	* common.mk: separate gcbench-hash to gcbench-hash1 and gcbench-hash2.
+
+Thu Jun 20 08:07:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (BIGSIZE): New macro.
+	  (bigfixize): Use BIGSIZE.
+	  (big2ulong): Ditto.
+	  (check_shiftdown): Ditto.
+	  (rb_big_aref): Ditto.
+
+Thu Jun 20 07:46:48 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (rb_gc_writebarrier): give up rescan A and register B directly
+	  if A has huge number of children.
+
+Thu Jun 20 07:30:35 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: add new rules `gcbench-rdoc', `gcbench-hash'.
+
+	* tool/gcbench.rb: separate GC bench framework and process.
+
+	* tool/hashbench1.rb, tool/hashbench2.rb: add two types GC bench.
+	  hashbench1: many temporal objects (GC by newobj)
+	  hashbench2: hash size becomes bigger and bigger (GC by malloc)
+	  Two benches are executed by `gcbench-hash' rule.
+
+	* tool/rdocbench.rb: separated.
+
+Thu Jun 20 06:25:39 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* tool/rdocbench.rb: add summary.
+
+Thu Jun 20 06:18:01 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_profile_total_time): check objspace->profile.next_index > 0.
+
+Thu Jun 20 05:47:41 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_prof_sweep_timer_start): fix merge miss.
+
+	* gc.c (GC_PROFILE_MORE_DETAIL): set it 0.
+
+Thu Jun 20 05:38:56 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: Accumulate sweep time to GC time.
+	  Now [GC time] is [mark time] + [sweep time] + [misc].
+	  ([GC time] >= [mark time] + [sweep time])
+
+	* gc.c (gc_prof_sweep_slot_timer_start/stop): rename to
+	  gc_prof_sweep_timer_start/stop and locate at lazy_sweep().
+
+	* gc.c (elapsed_time_from): add a utility function.
+
+Thu Jun 20 05:08:53 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_marks): fix wrong option. FALSE means major/full GC.
+	  It should be TRUE (minor marking).
+
+Thu Jun 20 02:44:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (waitpid): should not return 0 but wait until exit
+	  unless WNOHANG is given.  waiting huge process may return while
+	  active, for some reason.
+
+Thu Jun 20 01:34:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bdigit_roomof): Use SIZEOF_BDIGITS.
+	  (bigfixize): Refine an ifdef condition.
+	  (rb_absint_size): Use bdigit_roomof.
+	  (rb_absint_singlebit_p): Ditto.
+	  (rb_integer_pack): Ditto.
+	  (integer_pack_fill_dd): Use BITSPERDIG.
+	  (integer_unpack_push_bits): Use BITSPERDIG, BIGLO and BIGDN.
+
+Thu Jun 20 01:07:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (MARKED_IN_BITMAP, FL_TEST2): return boolean value since always
+	  used as boolean value.
+
+	* gc.c (MARK_IN_BITMAP, CLEAR_IN_BITMAP): evaluate bits once.
+
+Thu Jun 20 00:05:07 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (RVALUE_PROMOTED): fix type.
+
+Wed Jun 19 23:39:01 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_marks_test): rewrite checking code.
+	  When RGENGC_CHECK_MODE >= 2, all minor marking, run normal minor
+	  marking *and* major/full marking. After that, compare the results
+	  and shows BUG if a object living with major/full marking but dead
+	  with minor marking.
+	  After detecting bugs, print references information.
+	  (RGENGC_CHECK_MODE == 2, show references to dead object)
+	  (RGENGC_CHECK_MODE == 3, show all references)
+
+Wed Jun 19 23:51:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigfixize): Use rb_absint_size.
+	  (check_shiftdown): Ditto.
+	  (big2ulong): Use bdigit_roomof.
+
+Wed Jun 19 23:32:23 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (RVALUE_PROMOTED): check consistency between oldgen flag and
+	  oldgen bitmap if RGENGC_CHECK_MODE > 0.
+
+Wed Jun 19 23:29:29 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_force_recycle): clear oldgen bitmap, too.
+
+Wed Jun 19 21:02:13 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_uint2big): Consider environments BDIGIT is bigger than
+	  long.
+	  (big2ulong): Ditto.
+	  (rb_big_aref): Ditto.
+	  (rb_big_pack): Just call rb_integer_pack.
+	  (rb_big_unpack): Just call rb_integer_unpack.
+
+Wed Jun 19 20:51:21 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* gc.c (gc_stress_get): GC.stress can be Fixnum.
+
+Wed Jun 19 19:31:30 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (DIGSPERLONG): Don't define if BDIGIT is bigger than long.
+	  (DIGSPERLL): Don't define if BDIGIT is bigger than LONG_LONG
+	  (rb_absint_size): Consider environments BDIGIT is bigger than long.
+	  Use BIGLO and BIGDN.
+	  (rb_absint_singlebit_p): Ditto.
+	  (rb_integer_pack): Ditto.
+	  (bigsub_int): Consider environments BDIGIT is bigger than long.
+	  Use SIZEOF_BDIGITS instead of sizeof(BDIGIT).
+	  (bigadd_int): Ditto.
+	  (bigand_int): Ditto.
+	  (bigor_int): Ditto.
+	  (bigxor_int): Ditto.
+
+Wed Jun 19 15:14:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h (struct rb_data_type_struct), gc.c: add
+	  rb_data_type_struct::flags. Now, this flags is passed
+	  at T_DATA object creation. You can specify FL_WB_PROTECTED
+	  on this flag.
+
+	* iseq.c: making non-shady iseq objects.
+
+	* class.c, compile.c, proc.c, vm.c: add WB for iseq objects.
+
+	* vm_core.h, iseq.h: constify fields to detect WB insertion.
+
+Wed Jun 19 15:11:13 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (gc_mark_children): show more info for broken object.
+
+Wed Jun 19 14:04:41 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/envutil.rb (EnvUtil#rubybin): remove unnecessary
+	  unless expression.
+
+Wed Jun 19 07:47:48 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (garbage_collect_body): use FIX2INT for ruby_gc_stress.
+
+Wed Jun 19 07:44:31 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace::gc_stress): int -> VALUE to store Fixnum object.
+
+Wed Jun 19 07:25:35 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (make_deferred): clear flags to T_ZOMBIE.
+
+	* gc.c (slot_sweep_body): fix indent.
+
+Wed Jun 19 07:18:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_aref): Apply BIGLO to ~xds[i] for environment which
+	  BDIGIT is 16bit.
+
+Wed Jun 19 07:09:26 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rgengc_remember): fix output level.
+
+	* gc.c (rgengc_rememberset_mark): fix to output clear count.
+	  (shady_object_count + clear_count = count of remembered objects)
+
+Wed Jun 19 07:06:21 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rgengc_remember): check T_NONE and T_ZOMBIE
+	  if RGENGC_CHECK_MODE > 0.
+
+Wed Jun 19 07:02:19 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (RGENGC_CHECK_MODE): add new check mode `3'.
+	  In this mode, show all references if there is
+	  a miss-corrected object.
+
+Wed Jun 19 06:31:08 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stress_set): add special option of GC.stress.
+	  `GC.stress=(flag)' accepts integer to control behavior of GC.
+	  See code for details. Of course, this feature is only for MRI.
+
+	  You can debug RGenGC (WB) using `GC.stress = 1'.
+	  Using this option, do minor marking at all possible places.
+
+	  GC::STRESS_MINOR_MARK = 1 and GC::STRESS_LAZY_SWEEP = 2
+	  seem good to add.
+
+Wed Jun 19 06:29:31 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (kwmerge_i): add WB.
+
+Wed Jun 19 06:26:49 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* hash.c: `st_update()' also has same issue of last fix.
+	  write barriers at callback function are too early.
+	  All write barriers are executed after `st_update()'
+
+Wed Jun 19 04:33:22 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* variable.c (rb_const_set): fix WB miss.
+
+	  WBs had located before creating reference between a klass
+	  and constant value. It causes GC bug.
+
+	    # pseudo code:
+	    WB(klass, value); # WB and remember klass
+	    st_insert(klass->const_table, const_id, value);
+
+	  `st_insert()' can cause GC before inserting `value' and
+	  forget `klass' from the remember set. After that, relationship
+	  between `klass' and `value' are created with constant table.
+	  Now, `value' can be young (shady) object and `klass' can be old
+	  object, without remembering `klass' object.
+	  At the next GC, old `klass' object will be skipped and
+	  young (shady) `value' will be miss-collected. -> GC bug
+
+	  Lesson: The place of a WB is important.
+
+Tue Jun 18 22:01:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): ensure methods of type
+	  VM_METHOD_TYPE_ATTR_SET are called with 1 argument
+
+	* test/ruby/test_module.rb
+	  (TestModule#test_attr_writer_with_no_arguments): add test
+	  [ruby-core:55543] [Bug #8540]
+
+Tue Jun 18 22:36:23 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (gc_profile_record_flag): fix typo.
+
+Tue Jun 18 22:08:53 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/objspace/object_tracing.c: Return for ::allocation_generation
+
+Tue Jun 18 22:04:35 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/objspace/object_tracing.c: Document object_tracing methods.
+
+Tue Jun 18 21:58:17 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* gc.c: Rename rb_mObSpace -> rb_mObjSpace
+
+Tue Jun 18 20:55:05 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/objspace/objspace.c: Document ObjectSpace::InternalObjectWrapper.
+
+Tue Jun 18 20:39:04 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/objspace/object_tracing.c: Teach rdoc object_tracing.c [Bug #8537]
+
+Tue Jun 18 20:29:47 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/.document: add object_tracing.c to document file
+
+Tue Jun 18 20:20:27 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/objspace/objspace.c: rdoc on require to overview from r41355
+
+Tue Jun 18 18:39:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Check __int128.
+
+	* include/ruby/defines.h (BDIGIT_DBL): Use uint128_t if it is available.
+	  (BDIGIT): Use uint64_t if uint128_t is available.
+	  (SIZEOF_BDIGITS): Defined for above case.
+	  (BDIGIT_DBL_SIGNED): Ditto.
+	  (PRI_BDIGIT_PREFIX): Ditto.
+
+	* include/ruby/ruby.h (PRI_64_PREFIX): Defined.
+
+	* bignum.c (rb_big_pow): Don't use BITSPERDIG for the condition which
+	  rb_big_pow returns Float or Bignum.
+
+	[ruby-dev:47413] [Feature #8509]
+
+Tue Jun 18 16:43:44 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_heredoc_restore): clear lex_strterm always to get
+	  rid of marking recycled node.  this bug is revealed by r41372 with
+	  GC.stress=true.
+
+Tue Jun 18 12:53:25 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (nlz): Cast the result explicitly.
+	  (big2dbl): Don't assign BDIGIT values to int variable.
+
+Tue Jun 18 12:25:16 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_xor): Non-effective code removed.
+
+Tue Jun 18 11:26:05 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat): add `generated_normal_object_count_types' for
+	  RGENGC_PROFILE >= 2.
+
+Tue Jun 18 11:02:18 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_maybe): check to skip T_NONE.
+
+	* gc.c (markable_object_p): do not need to check (flags == 0) here.
+
+Tue Jun 18 10:17:37 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* variable.c (rb_autoload): fix WB miss.
+
+Tue Jun 18 04:20:18 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_children): don't need to care about T_ZOMBIE here.
+
+Mon Jun 17 22:16:02 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* test/ruby/test_proc.rb (TestProc#test_block_given_method_to_proc):
+	  run test for r41359.
+
+Mon Jun 17 21:42:18 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* include/ruby/ruby.h, vm_eval.c (rb_funcall_with_block):
+	  new function to invoke a method with a block passed
+	  as an argument.
+
+	* string.c (sym_call): use the above function to avoid
+	  a block sharing. [ruby-dev:47438] [Bug #8531]
+
+	* vm_insnhelper.c (vm_yield_with_cfunc): don't set block
+	  in the frame.
+
+	* test/ruby/test_symbol.rb (TestSymbol#test_block_given_to_proc):
+	  run related tests.
+
+Mon Jun 17 21:33:27 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* include/ruby/intern.h, proc.c (rb_method_call_with_block):
+	  new function to invoke a Method object with a block passed
+	  as an argument.
+
+	* proc.c (bmcall): use the above function to avoid a block sharing.
+	  [ruby-core:54626] [Bug #8341]
+
+	* test/ruby/test_proc.rb (TestProc#test_block_persist_between_calls):
+	  run related tests.
+
+Mon Jun 17 20:53:21 2013  Tanaka Akira  <akr@fsij.org>
+
+	* loadpath.c (RUBY_REVISION): Defined to suppress revision.h
+	  inclusion actually.  r41352 removes the dependency.
+
+Mon Jun 17 18:15:57 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* ext/objspace/objspace.c: let rdoc know about objspace methods.
+	  Specify 'objspace' should be required. See #8537.
+
+Mon Jun 17 17:44:31 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* gc.c (ObjectSpace): is a module not a class.
+
+	* ext/objspace/objspace.c: try to include overview in rdoc,
+	  see #8537.
+
+Mon Jun 17 17:38:24 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* gc.c: fix example of ObjectSpace.define_finalizer in overview
+
+Mon Jun 17 16:59:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/tkutil/tkutil.c: use rb_sprintf(), rb_id2str(), and
+	  rb_intern_str() instead of rb_intern() and RSTRING_PTR() with
+	  RB_GC_GUARD(), to prevent temporary objects from GC.
+	  [ruby-core:39000] [Bug #5199]
+
+Mon Jun 17 14:27:54 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1
+
+Mon Jun 17 13:04:01 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* tool/ifchange (until): Fix the condition, although harmless in
+	  this case.
+
+Mon Jun 17 11:50:29 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_maybe): added. check `is_pointer_to_heap()' and
+	  type is not T_ZOMBIE.
+
+	* gc.c: use `gc_mark_maybe()'. T_ZOMBIE objects should not be pushed
+	  to the mark stack.
+
+Mon Jun 17 07:56:24 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_small_lshift): Renamed from bdigs_small_lshift.
+	  (bary_small_rshift): Renamed from bdigs_small_rshift.
+
+Mon Jun 17 07:38:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (absint_numwords_bytes): Removed.
+	  (rb_absint_numwords): Don't call absint_numwords_bytes.
+
+Sun Jun 16 23:14:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (BARY_ADD): New macro.
+	  (BARY_SUB): Ditto.
+	  (BARY_MUL): Ditto.
+	  (BARY_DIVMOD): Ditto.
+	  (BARY_ZERO_P): Ditto.
+	  (absint_numwords_generic): Use these macros.
+
+Sun Jun 16 21:41:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_2comp): Extracted from get2comp.
+	  (integer_unpack_num_bdigits): Extracted from
+	  rb_integer_unpack_internal.
+	  (bary_unpack_internal): Renamed from bary_unpack and support
+	  INTEGER_PACK_2COMP.
+	  (bary_unpack): New function to validate arguments and invoke
+	  bary_unpack_internal.
+	  (rb_integer_unpack_internal): Removed.
+	  (rb_integer_unpack): Invoke bary_unpack_internal.
+	  (rb_integer_unpack_2comp): Removed.
+
+	* internal.h (rb_integer_unpack_2comp): Removed.
+
+	* pack.c: Follow the above change.
+
+Sun Jun 16 18:41:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (INTEGER_PACK_2COMP): Defined.
+	  (rb_integer_pack_2comp): Removed.
+
+	* bignum.c (bary_pack): Support INTEGER_PACK_2COMP.
+	  (rb_integer_pack): Invoke bary_pack directly.
+	  (rb_integer_pack_2comp): Removed.
+	  (rb_integer_pack_internal): Ditto.
+	  (absint_numwords_generic): Follow the above change.
+
+	* pack.c (pack_pack): Ditto.
+
+	* sprintf.c (rb_str_format): Ditto.
+
+Sun Jun 16 17:48:14 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (absint_numwords_generic): rb_funcall invocations removed.
+
+Sun Jun 16 16:04:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/config_files.rb: use URI.read to allow it runs with Ruby 1.8.5.
+
+Sun Jun 16 14:32:25 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_pack) Extracted from rb_integer_pack_internal.
+	  (absint_numwords_generic): Use bary_pack.
+
+Sun Jun 16 11:01:57 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* NEWS (XMLRPC::Client#http): Add.
+	  [ruby-core:55197] [Feature #8461]
+
+Sun Jun 16 10:38:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_add): New function.
+	  (bary_zero_p): Extracted from bigzero_p.
+	  (absint_numwords_generic): Use bary_zero_p and bary_add.
+	  (bary_mul): Fix an argument for bary_mul_single.
+	  (bary_divmod): Use size_t for arguments.
+
+Sun Jun 16 08:55:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem): Use a BDIGIT variable to store the return
+	  value of bigdivrem_single.
+
+Sun Jun 16 08:43:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_divmod): New function.
+	  (absint_numwords_generic): Use bary_divmod.
+	  (bigdivrem_num_extra_words): Extracted from bigdivrem.
+	  (bigdivrem_single): Ditto.
+	  (bigdivrem_normal): Ditto.
+	  (BIGDIVREM_EXTRA_WORDS): Defined.
+
+Sun Jun 16 05:51:51 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c: Fixup around GC by MALLOC.
+	  Add allocate size to malloc_increase before GC
+	  for updating limit in after_gc_sweep.
+	  Reset malloc_increase into garbage_collect()
+	  for preventing GC again soon.
+
+Sun Jun 16 05:15:36 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c: Add some columns to more detail profile.
+	  new columns: Allocated size, Prepare Time, Removing Objects, Empty Objects
+
+Sun Jun 16 02:04:40 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (gc_prof_timer_stop): Merge function codes of GC_PROFILE_MORE_DETAIL and !GC_PROFILE_MORE_DETAIL.
+	* gc.c (gc_prof_mark_timer_start): Ditto.
+	* gc.c (gc_prof_mark_timer_stop): Ditto.
+	* gc.c (gc_prof_sweep_slot_timer_start): Ditto.
+	* gc.c (gc_prof_sweep_slot_timer_stop): Ditto.
+	* gc.c (gc_prof_set_malloc_info): Ditto.
+	* gc.c (gc_prof_set_heap_info): Ditto.
+
+Sat Jun 15 23:50:24 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_sub): New function.
+	  (absint_numwords_generic): Use bary_sub.
+	  (bigsub_core): Skip unnecessary copy.
+
+Sat Jun 15 22:05:30 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul): New function.
+	  (absint_numwords_generic): Use bary_mul.
+	  (bary_mul_single): Extracted from bigmul1_single.
+	  (bary_mul_normal): Extracted from bigmul1_normal.
+
+Sat Jun 15 20:13:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_unpack): Extracted from rb_integer_unpack_internal.
+	  (absint_numwords_generic): Use bary_unpack.
+	  (roomof): Defined.
+	  (bdigit_roomof): Defined.
+	  (BARY_ARGS): Defined.
+	  (bary_unpack): Declared.
+
+Sat Jun 15 19:35:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (absint_numwords_bytes): Make it static.
+	  (absint_numwords_small): Ditto.
+	  (absint_numwords_generic): Ditto.
+
+Sat Jun 15 17:14:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigmul1_normal): Shrink the result Bignum length.
+
+Sat Jun 15 10:19:42 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/bigdecimal/bigdecimal.c: Update overview formatting of headers
+
+Sat Jun 15 10:19:06 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/bigdecimal/bigdecimal.gemspec: Update authors
+
+Sat Jun 15 10:02:26 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bdigs_small_rshift): Extracted from big_rshift.
+	  (bigdivrem): Use bdigs_small_rshift.
+
+Sat Jun 15 08:37:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (eval_string_with_cref): propagate absolute path from the
+	  binding if it is given explicitly.  patch by Gat (Dawid Janczak) at
+	  [ruby-core:55123]. [Bug #8436]
+
+Sat Jun 15 02:40:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bdigs_small_lshift): Extracted from big_lshift.
+	  (bigdivrem): Use bdigs_small_lshift.
+
+Fri Jun 14 20:47:41 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem): Reduce number of digits before bignew() for div.
+
+Fri Jun 14 20:12:37 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem): Use bignew when ny == 1.
+
+Fri Jun 14 18:52:51 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (rb_iseq_compile_node): fix location of a `trace'
+	  instruction (b_return event).
+	  [ruby-core:55305] [ruby-trunk - Bug #8489]
+	  (need a backport to 2.0.0?)
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+Fri Jun 14 18:18:07 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c, include/ruby/ruby.h: add write barriers for T_CLASS,
+	  T_MODULE, T_ICLASS.
+
+	* constant.h: constify rb_const_entry_t::value and file to detect
+	  assignment.
+
+	* variable.c, internal.h (rb_st_insert_id_and_value, rb_st_copy):
+	  added. update table with write barrier.
+
+	* method.h: constify some variables to detect assignment.
+
+	* object.c (init_copy): add WBs.
+
+	* variable.c: ditto.
+
+	* vm_method.c (rb_add_method): ditto.
+
+Fri Jun 14 14:33:47 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* NEWS: add a note for Module#using.
+
+Fri Jun 14 13:40:27 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* .travis.yml (before_script): update config files.
+
+	* common.mk ($(srcdir)/tool/config.{guess,sub}): use get-config_files.
+
+	* tool/config_files.rb: split get-config_files.
+
+	* common.mk (update-config_files): rule to download config files.
+
+	* tool/config.guess, tool/config.sub: remove and download from the
+	  upstream.
+
+	* tool/config_files.rb: download config files from GNU.
+
+Fri Jun 14 12:21:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RUBY_SAFE_LEVEL_CHECK): suppress warnings
+	  "left-hand operand of comma expression has no effect", on gcc 4.4.
+
+Fri Jun 14 09:48:48 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* NEWS: add notes for $SAFE.
+
+	* doc/security.rdoc: remove the description of $SAFE=4.
+
+Fri Jun 14 00:14:29 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem): Zero test condition simplified.
+
+Thu Jun 13 23:43:11 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/bigdecimal/*: improve documentation, nodoc samples with @mrkn
+
+Thu Jun 13 23:02:14 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/xmlrpc/client.rb (XMLRPC::Client#http): Add reader for raw
+	  Net::HTTP. [ruby-core:55197] [Feature #8461]
+	  Reported by Herwin Weststrate. Thanks!!!
+
+Thu Jun 13 22:44:52 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/xmlrpc/client.rb (XMLRPC::Client#parse_set_cookies): Support
+	  multiple names in a response. [ruby-core:41711] [Bug #5774]
+	  Reported by Roman Riha. Thanks!!!
+	* test/xmlrpc/test_client.rb (XMLRPC::ClientTest#test_cookie_override):
+	  Add a test of the above case.
+
+Thu Jun 13 22:35:50 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/xmlrpc/client.rb (XMLRPC::Client#parse_set_cookies): Use
+	  guard style.
+
+Thu Jun 13 22:12:32 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils#rmdir): fix traversal loop, not trying
+	  remove same directory only.
+
+Thu Jun 13 21:30:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (opt-dir), tool/ifchange: get rid of "alternate value"
+	  expansion for legacy sh.  [ruby-dev:47420] [Bug #8524]
+
+Thu Jun 13 21:24:09 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem): Refactored to use ALLOCV_N for temporary
+	  buffers.
+
+Thu Jun 13 18:54:11 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bignum.c (integer_unpack_num_bdigits_generic): reorder terms (but not
+	  changed the intention of the expression) because VC++ reports a
+	  warning for it.  reported by ko1 via IRC.
+
+Thu Jun 13 18:53:14 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_thread.rb (test_thread_local_security): Don't create
+	  an unused thread.
+
+Thu Jun 13 18:34:20 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bigdivrem): Use nlz.
+
+Thu Jun 13 14:51:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RUBY_SAFE_LEVEL_CHECK): check constant safe
+	  level at compile time.
+
+Thu Jun 13 14:39:08 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/-ext-/test_printf.rb, test/rss/test_parser.rb,
+	  test/ruby/test_array.rb, test/ruby/test_hash.rb,
+	  test/ruby/test_m17n.rb, test/ruby/test_marshal.rb,
+	  test/ruby/test_object.rb, test/ruby/test_string.rb: don't use
+	  untrusted?, untrust, and trust to avoid warnings in case $VERBOSE is
+	  true.
+
+Thu Jun 13 10:47:16 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* bootstraptest/test_autoload.rb, bootstraptest/test_method.rb:
+	  remove tests for $SAFE=4.
+
+	* lib/pp.rb: use taint instead of untrust to avoid warnings when
+	  $VERBOSE is set to true.
+
+Thu Jun 13 06:12:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (integer_unpack_num_bdigits_small): Fix a compile error on
+	  clang -Werror,-Wshorten-64-to-32
+	  Reported by Eric Hodel.  [ruby-core:55467] [Bug #8522]
+
+Thu Jun 13 05:32:13 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/socket/extconf.rb:  Enable RFC 3542 IPV6 socket options for OS X
+	  10.7+.  [ruby-trunk - Bug #8517]
+
+Thu Jun 13 00:17:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_unpack_2comp): New function.
+	  (rb_integer_unpack_internal): Extracted from rb_integer_unpack and
+	  nlp_bits_ret argument added.
+	  (integer_unpack_num_bdigits_small): nlp_bits_ret argument added to
+	  return number of leading padding bits.
+	  (integer_unpack_num_bdigits_generic): Ditto.
+
+	* internal.h (rb_integer_unpack_2comp): Declared.
+
+	* pack.c (pack_unpack): Use rb_integer_unpack_2comp and
+	  rb_integer_unpack.
+
+Wed Jun 12 23:27:03 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (mod_using): new method Module#using, which activates
+	  refinements of the specified module only in the current class or
+	  module definition.  [ruby-core:55273] [Feature #8481]
+
+	* test/ruby/test_refinement.rb: related test.
+
+Wed Jun 12 22:58:48 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* safe.c (rb_set_safe_level, safe_setter): raise an ArgumentError
+	  when $SAFE is set to 4.  $SAFE=4 is now obsolete.
+	  [ruby-core:55222] [Feature #8468]
+
+	* object.c (rb_obj_untrusted, rb_obj_untrust, rb_obj_trust):
+	  Kernel#untrusted?, untrust, and trust are now deprecated.
+	  Their behavior is same as tainted?, taint, and untaint,
+	  respectively.
+
+	* include/ruby/ruby.h (OBJ_UNTRUSTED, OBJ_UNTRUST): OBJ_UNTRUSTED()
+	  and OBJ_UNTRUST() are aliases of OBJ_TAINTED() and OBJ_TAINT(),
+	  respectively.
+
+	* array.c, class.c, debug.c, dir.c, encoding.c, error.c, eval.c,
+	  ext/curses/curses.c, ext/dbm/dbm.c, ext/dl/cfunc.c,
+	  ext/dl/cptr.c, ext/dl/dl.c, ext/etc/etc.c, ext/fiddle/fiddle.c,
+	  ext/fiddle/pointer.c, ext/gdbm/gdbm.c, ext/readline/readline.c,
+	  ext/sdbm/init.c, ext/socket/ancdata.c, ext/socket/basicsocket.c,
+	  ext/socket/socket.c, ext/socket/udpsocket.c,
+	  ext/stringio/stringio.c, ext/syslog/syslog.c, ext/tk/tcltklib.c,
+	  ext/win32ole/win32ole.c, file.c, gc.c, hash.c, io.c, iseq.c,
+	  load.c, marshal.c, object.c, proc.c, process.c, random.c, re.c,
+	  safe.c, string.c, thread.c, transcode.c, variable.c,
+	  vm_insnhelper.c, vm_method.c, vm_trace.c: remove code for
+	  $SAFE=4.
+
+	* test/dl/test_dl2.rb, test/erb/test_erb.rb,
+	  test/readline/test_readline.rb,
+	  test/readline/test_readline_history.rb, test/ruby/test_alias.rb,
+	  test/ruby/test_array.rb, test/ruby/test_dir.rb,
+	  test/ruby/test_encoding.rb, test/ruby/test_env.rb,
+	  test/ruby/test_eval.rb, test/ruby/test_exception.rb,
+	  test/ruby/test_file_exhaustive.rb, test/ruby/test_hash.rb,
+	  test/ruby/test_io.rb, test/ruby/test_method.rb,
+	  test/ruby/test_module.rb, test/ruby/test_object.rb,
+	  test/ruby/test_pack.rb, test/ruby/test_rand.rb,
+	  test/ruby/test_regexp.rb, test/ruby/test_settracefunc.rb,
+	  test/ruby/test_struct.rb, test/ruby/test_thread.rb,
+	  test/ruby/test_time.rb: remove tests for $SAFE=4.
+
+Wed Jun 12 22:18:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (integer_unpack_num_bdigits_generic): Rewritten without
+	  rb_funcall.
+	  (integer_unpack_num_bdigits_bytes): Removed.
+	  (rb_integer_unpack): integer_unpack_num_bdigits_bytes invocation
+	  removed.
+
+Wed Jun 12 20:18:03 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/xmlrpc/client.rb (XMLRPC::Client#parse_set_cookies): Extract.
+
+Wed Jun 12 18:19:41 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (validate_integer_pack_format): supported_flags argument
+	  added and validate given flags.
+	  (rb_integer_pack_internal): Specify supported_flags.
+	  (rb_integer_unpack): Ditto.
+
+Wed Jun 12 16:41:38 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sort_bang): remove duplicated assertions.
+	  ARY_HEAP_PTR() implies ary not to be embedded.  [ruby-dev:47419]
+	  [Bug #8518]
+
+Wed Jun 12 12:44:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_getc): fix 7bit coderange condition, check if ascii read
+	  data instead of read length. [ruby-core:55444] [Bug #8516]
+
+Wed Jun 12 12:35:13 2013  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (pack_pack): Use rb_integer_pack_2comp.
+
+Wed Jun 12 12:07:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* sprintf.c (rb_str_format): Fix a dynamic format string.
+
+Wed Jun 12 12:04:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_uniq_bang): must not be modified once frozen even in
+	  a callback method.
+
+Wed Jun 12 12:03:43 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sort_bang): must not be modified once frozen even in
+	  a callback method.
+
+Wed Jun 12 12:00:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (FL_SET_EMBED): shared object is frozen even when get
+	  unshared.
+
+	* array.c (rb_ary_modify): ARY_SET_CAPA needs unshared array.
+
+Wed Jun 12 07:32:01 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (rand_int): Use rb_big_uminus.
+
+Wed Jun 12 07:12:54 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* struct.c:  Improve documentation: replace "instance variable" with
+	  "member", recommend the use of a block to customize structs, note
+	  that member accessors are created, general cleanup.
+
+Wed Jun 12 06:35:01 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (INTEGER_PACK_NEGATIVE): Defined.
+	  (rb_integer_unpack): sign argument removed.
+
+	* bignum.c (rb_integer_unpack): sign argument removed.
+	  Non-negative integers generated by default.
+	  INTEGER_PACK_NEGATIVE flag is used to generate non-positive integers.
+
+	* pack.c (pack_unpack): Follow the above change.
+
+	* random.c (int_pair_to_real_inclusive): Ditto.
+	  (make_seed_value): Ditto.
+	  (mt_state): Ditto.
+	  (limited_big_rand): Ditto.
+
+	* marshal.c (r_object0): Ditto.
+
+Wed Jun 12 00:07:46 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/xmlrpc/test_client.rb (XMLRPC::ClientTest#test_cookie_simple):
+	  Add a test for the extracted method.
+
+Tue Jun 11 23:56:24 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/xmlrpc/test_client.rb (XMLRPC::ClientTest::Fake::HTTP#started):
+	  Add a missing empty line.
+
+Tue Jun 11 23:37:19 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (validate_integer_pack_format): Don't require a word order
+	  flag if numwords is 1 or less.
+	  (absint_numwords_generic): Don't specify a word order for
+	  rb_integer_pack.
+
+	* hash.c (rb_hash): Ditto.
+
+	* time.c (v2w_bignum): Ditto.
+
+Tue Jun 11 23:01:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (validate_integer_pack_format): Refine error messages.
+
+Tue Jun 11 22:25:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (validate_integer_pack_format): numwords argument added.
+	  Move a varidation from rb_integer_pack_internal and rb_integer_unpack.
+	  (rb_integer_pack_internal): Follow above change.
+	  (rb_integer_unpack): Ditto.
+
+Tue Jun 11 20:52:43 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_pack_internal): Renamed from rb_integer_pack
+	  and overflow_2comp argument added.
+	  (rb_integer_pack): Just call rb_integer_pack_internal.
+	  (rb_integer_pack_2comp): New function.
+
+	* internal.h (rb_integer_pack_2comp): Declared.
+
+	* sprintf.c (rb_str_format): Use rb_integer_pack and
+	  rb_integer_pack_2comp to format binary/octal/hexadecimal integers.
+	  (ruby_digitmap): Declared.
+	  (remove_sign_bits): Removed.
+	  (BITSPERDIG): Ditto.
+	  (EXTENDSIGN): Ditto.
+
+Tue Jun 11 16:15:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_shrink_capa): shrink the capacity so it fits just with
+	  the length.
+
+	* array.c (ary_make_shared): release never used elements from frozen
+	  array to be shared.  [ruby-dev:47416] [Bug #8510]
+
+Tue Jun 11 12:49:01 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/re.rdoc: Rename to doc/regexp.rdoc
+	* re.c: Update rdoc include for rename of file
+
+Tue Jun 11 07:13:13 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* eval_error.c (error_print): keep that errat is non-shady object.
+	  and guard errat from GC.
+
+Tue Jun 11 05:04:25 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* ext/racc/cparse/cparse.c: use rb_ary_entry() and
+	  rb_ary_subseq() instead of RARRAY_PTR.
+	  Based on a patch by Dirkjan Bussink. See Bug #8399.
+
+Mon Jun 10 23:51:51 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* array.c (rb_ary_new_from_values): fix a typo. pointed out by
+	  nagachika.
+	  http://d.hatena.ne.jp/nagachika/20130610/ruby_trunk_changes_41199_41220
+
+Mon Jun 10 21:51:03 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/socket/raddrinfo.c (nogvl_getaddrinfo): Fix indent.
+
+Mon Jun 10 21:49:43 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/socket/raddrinfo.c (nogvl_getaddrinfo): Add missing return
+	  value assignment.
+
+Mon Jun 10 20:58:11 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (nogvl_getaddrinfo): work around for Ubuntu
+	  13.04's getaddrinfo issue with mdns4. [ruby-list:49420]
+
+Mon Jun 10 19:34:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_pack): Returns sign instead of words.
+	  (absint_numwords_generic): Follow the above change.
+	  (big2str_base_powerof2): Follow the above change.
+
+	* internal.h: Ditto.
+
+	* hash.c (rb_hash): Ditto.
+
+	* pack.c (pack_pack): Ditto.
+
+	* random.c (int_pair_to_real_inclusive): Ditto.
+	  (rand_init): Ditto.
+	  (random_load): Ditto.
+	  (limited_big_rand): Ditto.
+
+	* time.c (v2w_bignum): Ditto.
+
+Mon Jun 10 17:20:01 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rgengc_remember): permit promoted object.
+	  (rb_gc_writebarrier -> remember)
+
+Mon Jun 10 17:14:01 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (RVALUE_PROMOTE): fix parameter name (`x' to `obj')
+	  and make it inline function (like RVALUE_PROMOTE).
+
+Mon Jun 10 16:22:50 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (rb_ary_new_from_values): add assertion
+	  (ary should be young object).
+
+Mon Jun 10 16:05:59 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (wmap_mark): check allocation of `w->obj2wmap'.
+	  (no-allocation `w->obj2wmap' will be NULL pointer reference)
+
+Mon Jun 10 15:36:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_error.c (error_print): use checking functions instead of
+	  catching exceptions.
+
+	* eval_error.c (error_print): restore errinfo for the case new
+	  exception raised while printing the message.  [ruby-core:55365]
+	  [Bug #8501]
+
+	* eval_error.c (error_print): reduce calling setjmp.
+
+Mon Jun 10 12:10:06 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (integer_unpack_num_bdigits_small: Extracted from
+	  rb_integer_unpack.
+	  (integer_unpack_num_bdigits_generic): Ditto.
+	  (integer_unpack_num_bdigits_bytes): New function.
+	  (rb_integer_unpack): Use above functions.
+	  Return a Bignum for INTEGER_PACK_FORCE_BIGNUM even when the result
+	  is zero.
+
+Mon Jun 10 05:38:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (absint_numwords_small): New function.
+	  (absint_numwords_generic): Use absint_numwords_small if possible.
+
+Mon Jun 10 01:07:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (absint_numwords_bytes): New function.
+	  (absint_numwords_generic): Extracted from rb_absint_numwords.
+	  (rb_absint_numwords): Use absint_numwords_bytes if possible.
+
+Sun Jun  9 21:33:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_absint_numwords): Return (size_t)-1 when overflow.
+	  Refine variable names.
+	  (rb_absint_size): Refine variable names.
+
+	* internal.h (rb_absint_size): Refine an argument name.
+	  (rb_absint_numwords): Ditto.
+
+Sun Jun  9 16:51:41 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_absint_numwords): Renamed from rb_absint_size_in_word.
+
+	* internal.h (rb_absint_numwords): Follow the above change.
+
+	* pack.c (pack_pack): Ditto.
+
+	* random.c (rand_init): Ditto.
+	  (limited_big_rand): Ditto.
+
+Sun Jun  9 14:41:05 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_pack): numwords_allocated argument removed.
+
+	* internal.h (rb_integer_pack): Follow the above change.
+
+	* hash.c (rb_hash): Ditto.
+
+	* time.c (v2w_bignum): Ditto.
+
+	* pack.c (pack_pack): Ditto.
+
+	* random.c (int_pair_to_real_inclusive): Ditto.
+	  (rand_init): Ditto.
+	  (random_load): Ditto.
+	  (limited_big_rand): Ditto.
+
+Sun Jun  9 09:34:44 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big2str_base_powerof2): New function.
+	  (rb_big2str0): Use big2str_base_powerof2 if base is 2, 4, 8, 16 or 32.
+
+Sun Jun  9 00:59:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* hash.c (rb_hash): Use rb_integer_pack to obtain least significant
+	  long integer.
+
+Sat Jun  8 23:56:00 2013  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_num_to_uint): Use rb_absint_size instead of
+	  RBIGNUM_LEN.
+
+Sat Jun  8 22:53:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* marshal.c (r_object0): Use rb_integer_unpack.
+
+Sat Jun  8 22:18:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (v2w): Use rb_absint_size instead of RBIGNUM_LEN.
+
+Sat Jun  8 21:47:33 2013  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (v2w_bignum): Simplified using rb_integer_pack.
+	  (rb_big_abs_find_maxbit): Removed.
+
+Sat Jun  8 21:03:40 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_absint_singlebit_p): New function.
+
+	* internal.h (rb_absint_singlebit_p): Declared.
+
+	* time.c (v2w_bignum): Use rb_absint_singlebit_p instead of
+	  rb_big_abs_find_minbit.
+	  (rb_big_abs_find_minbit): Removed.
+
+Sat Jun  8 20:24:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (rb_big_abs_find_maxbit): Use rb_absint_size.
+	  (bdigit_find_maxbit): Removed.
+
+Sat Jun  8 19:47:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* class.c (include_modules_at): invalidate method cache if included
+	  module contains constants
+
+	* test/ruby/test_module.rb: add test
+
+Sat Jun  8 19:31:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* random.c (limited_big_rand): declare rnd, lim and mask as uint32_t
+	  to avoid 64 bit to 32 bit shorten warnings.
+
+Sat Jun  8 19:23:53 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* win32/Makefile.sub: r41163 changed win32/win32.c and configure.in
+	  but it didn't treat about mswin32/mswin64, so fix it.
+	  NOTE: this needs a review by usa whether additional condition is
+	  required or not.
+
+Sat Jun  8 19:06:26 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c: Unused RBignum internal accessing macros removed.
+
+Sat Jun  8 19:04:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (limited_big_rand): The argument, limit, is changed to
+	  VALUE.  Use rb_integer_pack and rb_integer_unpack.
+
+Sat Jun  8 17:15:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (make_seed_value): Fix the length given for
+	  rb_integer_unpack.
+
+Sat Jun  8 16:38:02 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_unpack): Don't use rb_funcall if possible.
+
+	* random.c: Use uint32_t for elements of seed.
+	  (make_seed_value): Use rb_integer_unpack.
+
+Sat Jun  8 15:58:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (rand_init): Add a cast to fix clang compile error:
+	  random.c:410:32: error: implicit conversion loses integer precision:
+	  'size_t' (aka 'unsigned long') to 'int' [-Werror,-Wshorten-64-to-32]
+	  This cast doesn't cause a problem because len is not bigger than
+	  MT_MAX_STATE.
+
+Sat Jun  8 15:30:03 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (rand_init): Use rb_integer_pack.
+	  (roomof): Removed.
+
+Sat Jun  8 14:58:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (INTEGER_PACK_FORCE_BIGNUM): New flag constant.
+
+	* bignum.c (rb_integer_unpack): Support INTEGER_PACK_FORCE_BIGNUM.
+
+	* random.c (int_pair_to_real_inclusive): Use
+	  INTEGER_PACK_FORCE_BIGNUM to use rb_big_mul instead of rb_funcall.
+
+Sat Jun  8 14:17:01 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check for NET_LUID.  header macro varies across
+	  compiler versions.
+
+	* win32/win32.c: use configured macro.
+
+Sat Jun  8 11:59:55 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (int_pair_to_real_inclusive): Use rb_funcall instead of
+	  rb_big_mul because rb_integer_unpack can return a Fixnum.
+
+Sat Jun  8 11:17:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (int_pair_to_real_inclusive): Use rb_integer_pack.
+
+Sat Jun  8 09:49:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (int_pair_to_real_inclusive): Use rb_integer_unpack.
+
+Sat Jun  8 08:12:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (random_load): Use rb_integer_pack.
+
+Sat Jun  8 06:15:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (numberof): Removed.
+
+Sat Jun  8 06:00:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c: include internal.h.
+	  (mt_state): Use rb_integer_unpack.
+
+Sat Jun  8 00:55:51 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (integer_pack_loop_setup): word_num_nailbytes_ret argument
+	  removed.
+	  (rb_integer_pack): Follow the above change.
+	  (rb_integer_unpack): Follow the above change.
+
+Sat Jun  8 00:37:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (validate_integer_pack_format): Renamed from
+	  validate_integer_format.
+	  (integer_pack_loop_setup): Renamed from integer_format_loop_setup.
+	  (integer_pack_fill_dd): Renamed from int_export_fill_dd.
+	  (integer_pack_take_lowbits): Renamed from int_export_take_lowbits.
+	  (integer_unpack_push_bits): Renamed from int_import_push_bits.
+
+Fri Jun  7 23:58:06 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_pack): Arguments changed.  Use flags to
+	  specify word order and byte order.
+	  (rb_integer_unpack): Ditto.
+	  (validate_integer_format): Follow the above change.
+	  (integer_format_loop_setup): Ditto.
+
+	* pack.c: Ditto.
+
+	* internal.h: Ditto.
+	  (INTEGER_PACK_MSWORD_FIRST): Defined.
+	  (INTEGER_PACK_LSWORD_FIRST): Ditto.
+	  (INTEGER_PACK_MSBYTE_FIRST): Ditto.
+	  (INTEGER_PACK_LSBYTE_FIRST): Ditto.
+	  (INTEGER_PACK_NATIVE_BYTE_ORDER): Ditto.
+	  (INTEGER_PACK_LITTLE_ENDIAN): Ditto.
+	  (INTEGER_PACK_BIG_ENDIAN): Ditto.
+
+Fri Jun  7 22:10:50 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rubygems/specification.rb (Gem::Specification#to_yaml):
+	  use Gem::NoAliasYAMLTree.create instead of Gem::NoAliasYAMLTree.new
+	  to suppress deprecated warnings.
+
+Fri Jun  7 21:39:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_pack): Renamed from rb_int_export.
+	  (rb_integer_unpack): Renamed from rb_int_import.
+
+	* internal.h, pack.c: Follow the above change.
+
+Fri Jun  7 21:05:26 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (integer_format_loop_setup): Extracted from rb_int_export
+	  and rb_int_import.
+
+Fri Jun  7 19:48:38 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (validate_integer_format): Extracted from rb_int_export and
+	  rb_int_import.
+
+Fri Jun  7 19:23:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_absint_size): Use numberof.
+	  (rb_int_export): Ditto.
+
+Fri Jun  7 18:58:56 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (numberof): Gathered from various files.
+
+	* array.c, math.c, thread_pthread.c, iseq.c, enum.c, string.c, io.c,
+	  load.c, compile.c, struct.c, eval.c, gc.c, parse.y, process.c,
+	  error.c, ruby.c: Remove the definitions of numberof.
+
+Fri Jun  7 18:24:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_absint_size): Declare a variable, i, just before used
+	  to suppress a warning.
+	  (rb_int_export): Ditto.
+
+Fri Jun  7 17:41:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* bignum.c (rb_absint_size): explicit cast to BDIGIT to avoid implicit
+	  64 bit to 32 bit shortening warning
+	* bignum.c (rb_int_export): ditto
+	* bignum.c (int_import_push_bits): ditto
+
+Fri Jun  7 17:31:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* internal.h (RCLASS_SUPER): use descriptive variable name
+	* internal.h (RCLASS_SET_SUPER): ditto
+
+Fri Jun  7 13:25:27 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/fbuffer/fbuffer.h (fbuffer_append_str): change the place of
+	  RB_GC_GUARD. it should be after the object is used.
+
+Fri Jun  7 13:22:43 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c (before_gc_sweep): noinline can also avoid the segv instead of
+	  -O0 of r41084. this way is expected less slow.
+
+Fri Jun  7 11:45:42 2013  Kenta Murata  <mrkn@cookpad.com>
+
+	* rational.c (numeric_quo): move num_quo in numeric.c to numeric_quo
+	  in rational.c to refer canonicalization state for mathn support.
+	  [ruby-core:41575] [Bug #5736]
+
+	* numeric.c (num_quo): ditto.
+
+	* test/test_mathn.rb: add a test for the change at r41109.
+
+Fri Jun  7 11:41:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: revert r41106.  size_t may not be unsigned
+
+	* bignum.c (rb_absint_size_in_word, rb_int_export, rb_int_import): use
+	  NUM2SIZET() and SIZET2NUM() already defined in ruby/ruby.h.
+
+Fri Jun  7 11:28:37 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c: use oldgen bitmap as initial mark bitmap when major gc.
+	  so can skip oldgen bitmap check around mark & sweep.
+	* gc.c (slot_sweep_body): change scan algorithm for performance:
+	  from object's pointer base to bitmap one.
+
+Fri Jun  7 11:25:56 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c: introduce oldgen bitmap for preparing performance tuning.
+
+Fri Jun  7 11:20:57 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (MARKED_IN_BITMAP, MARK_IN_BITMAP, CLEAR_IN_BITMAP): bring
+	  bitmap macros in one place, and introduce BITMAP_BIT.
+
+Fri Jun  7 11:18:35 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* array.c (ary_new): change order of allocation in order
+	  to remove FL_OLDGEN operation.
+
+Fri Jun  7 11:16:28 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* tool/rdocbench.rb: add gc total time information.
+
+Fri Jun  7 10:12:01 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: remove "Sunny" terminology.
+	  "Sunny" doesn't mean antonym of "Shady" (questionable, doubtful, etc).
+	  Instead of "Sunny", use "non-shady" or "normal".
+
+Fri Jun  7 09:29:33 2013  Kenta Murata  <mrkn@cookpad.com>
+
+	* bignum.c (rb_int_import): explicitly casting BDIGIT_DBL to BDIGIT
+	  to prevent warning.
+
+Fri Jun  7 07:29:33 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_int_export): countp argument is split into
+	  wordcount_allocated and wordcount.
+
+	* bignum.c (rb_int_export): Follow the above change.
+
+	* pack.c (pack_pack): Ditto.
+
+Fri Jun  7 07:17:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* NEWS: describe a compatibility issue of Numeric#quo
+	  introduced at r41109.
+
+Fri Jun  7 07:15:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* NEWS: fix style.
+
+Fri Jun  7 06:48:17 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* numeric.c: remove unused ID id_to_r introduced in r41109.
+
+Fri Jun  7 06:15:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_int_import): New function.
+	  (int_import_push_bits): Ditto.
+
+	* internal.h (rb_int_import): Declared.
+
+	* pack.c (pack_unpack): Use rb_int_import for BER compressed integer.
+
+Thu Jun  6 22:24:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* numeric.c (num_quo): Use to_r method to convert the receiver to
+	  rational.  [ruby-core:41575] [Bug #5736]
+
+	* test/ruby/test_numeric.rb: add a test for the above change.
+
+Thu Jun  6 20:40:17 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Invoke RUBY_REPLACE_TYPE for size_t.
+	  Don't invoke RUBY_CHECK_PRINTF_PREFIX for size_t to avoid conflict
+	  with RUBY_REPLACE_TYPE.
+
+	* internal.h (rb_absint_size): Declared.
+	  (rb_absint_size_in_word): Ditto.
+	  (rb_int_export): Ditto.
+
+	* bignum.c (rb_absint_size): New function.
+	  (rb_absint_size_in_word): Ditto.
+	  (int_export_fill_dd): Ditto.
+	  (int_export_take_lowbits): Ditto.
+	  (rb_int_export): Ditto.
+
+	* pack.c (pack_pack): Use rb_int_export for BER compressed integer.
+
+Thu Jun  6 19:31:33 2013  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: fixed coding error [ruby-core:55337].
+	  reported by Riley Lynch.
+
+Thu Jun  6 14:16:37 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* ext/objspace/object_tracing.c: rename allocation_info to
+	  lookup_allocation_info. At times I confused "struct
+	  allocation_info" with "function allocation_info".
+
+Thu Jun  6 13:57:06 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* ext/objspace/object_tracing.c: allocation_info function isn't
+	  called by any other file.
+
+Thu Jun  6 09:41:00 2013  Kenta Murata  <mrkn@cookpad.com>
+
+	* numeric.c (num_quo): should return a Float for a Float argument.
+	  [ruby-dev:44710] [Bug #5515]
+
+	* test/ruby/test_fixnum.rb: Add an assertion for the above change.
+
+	* test/ruby/test_bignum.rb: ditto.
+
+Thu Jun  6 00:59:44 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (gc_mark): get rid of pushing useless objects.
+	* gc.c (rgengc_rememberset_mark): bypass gc_mark() in order to push
+	  sunny old object at minor gc.
+	* gc.c (gc_mark_children): move sunny old check to gc_mark().
+	* gc.c (rgengc_check_shady): remove DEMOTE that already unnecessary.
+	* gc.c (rb_gc_writebarrier): ditto.
+
+	  change sunny old check point in order to save mark stack and
+	  remove unnatural rest_sweep & demote.
+
+Thu Jun  6 00:52:42 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (rgengc_rememberset_mark): change scan algorithm for performance:
+	  from object's pointer base to bitmap one.
+
+Thu Jun  6 00:30:04 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* win32/win32.c (NET_LUID): define it on MinGW32.
+	  mingw-w64 has NET_LUID but mingw32 (mingw.org) still doesn't have
+	  NET_LUID. reported by taco on IRC
+
+Thu Jun  6 00:05:08 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* string.c (String#b): Allow code range scan to happen later so
+	  ascii_only? on a result string returns the correct value.
+	  [ruby-core:55315] [Bug #8496]
+
+Wed Jun  5 22:40:42 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (capability_response): should ignore trailing
+	  spaces.  Thanks, Peter Kovacs.  [ruby-core:55024] [Bug #8415]
+
+	* test/net/imap/test_imap_response_parser.rb: related test.
+
+Wed Jun  5 21:17:08 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (big_fdiv): Use nlz() instead of bdigbitsize().
+	  (bdigbitsize): Removed.
+
+Wed Jun  5 20:32:00 2013  Kenta Murata  <mrkn@cookpad.com>
+
+	* include/ruby/ruby.h: fix alignment in comment.
+
+Wed Jun  5 20:05:29 2013  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (int_pair_to_real_inclusive): Add a cast to BDIGIT.
+	  (random_load): Fix shift width for fixnums.
+	  Re-implement bignum extraction without ifdefs.
+
+Wed Jun  5 15:26:10 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c (before_gc_sweep): don't optimize it to avoid segv on Ubuntu
+	  10.04 gcc 4.4.
+	  http://u32.rubyci.org/~chkbuild/ruby-trunk/log/20130527T190301Z.diff.html.gz
+
+Wed Jun  5 09:46:46 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/fileutils/test_fileutils.rb (TestFileUtils#test_mkdir): add
+	  EACCES for Windows.
+
+Wed Jun  5 08:13:37 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_pow): Don't need to multiply SIZEOF_BDIGITS.
+	  Use nlz instead of bitlength_bdigit.
+	  (bitlength_bdigit): Removed.
+
+Wed Jun  5 07:14:18 2013  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (d_lite_cmp, d_lite_equal): simplified.
+
+Wed Jun  5 07:07:01 2013  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: fixed a bug [ruby-core:55295].  reported
+	  by Riley Lynch.
+
+Wed Jun  5 06:44:08 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 2.0.3
+
+	* test/rubygems:  Tests for the above.
+
+	* NEWS:  Added RubyGems 2.0.3 note.
+
+Wed Jun  5 06:35:15 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/marshal.rdoc:  Add description of Marshal format.
+
+Wed Jun  5 01:16:09 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* array.c (Array#+): fix documentation example.
+	  Patch by Logan Serman. [Fixes GH-324]
+
+Wed Jun  5 00:21:54 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/irb/lc/ja/help-message: update help messages.
+	  following r41028. [ruby-dev:46707] [Feature #7510]
+
+Wed Jun  5 00:09:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* marshal.c (r_object0): Generalize a round up expression.
+	  Use BDIGIT instead of int.
+
+Tue Jun  4 23:44:02 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* object.c (rb_Hash): fix docs. patched by Stefan Sch"ussler.
+	  [ruby-core:55299] [Bug #8487]
+
+Tue Jun  4 23:16:49 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* lib/irb/completion.rb: Use %w literal construction for long lists.
+	  Patch by Dave Goodchild. [Fixes GH-299]
+
+Tue Jun  4 23:08:42 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* ext/objspace/objspace.c: improve wording and remove duplicated comment.
+	  Based on a patch by Dave Goodchild. [Fixes GH-299]
+
+Tue Jun  4 18:41:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bitlength_bdigit): Fix an off-by-one error.
+
+Tue Jun  4 15:30:00 2013  Kenta Murata  <mrkn@cookpad.com>
+
+	* ext/bigdecimal/lib/bigdecimal/util.rb (Float#to_d): fix the number
+	  of figures.  Patch by Vipul A M <vipulnsward@gmail.com>.
+	  https://github.com/ruby/ruby/pull/323  fix GH-323
+
+	* test/bigdecimal/test_bigdecimal_util.rb: fix for the above change.
+
+Tue Jun  4 00:44:27 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/fileutils/test_fileutils.rb (TestFileUtils#test_mkdir): add
+	  EEXIST for Linux. (suggested by nurse)
+
+Mon Jun  3 23:58:19 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/fileutils.rb (FileUtils.rmdir): use remove_tailing_slash.
+	* test/fileutils/test_fileutils.rb: test for above.
+
+Mon Jun  3 23:47:55 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bitlength_bdigit): New function.
+	  (rb_big_pow): Use bitlength_bdigit instead of ffs.
+
+Mon Jun  3 23:11:19 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/fileutils.rb: fix behavior when mkdir/mkdir_p accepted "/".
+	* test/fileutils/test_fileutils.rb: add test for above change.
+	  Patched by Mitsunori Komatsu. [GH-319]
+
+Mon Jun  3 19:02:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (is_hfs): use the file descriptor instead of a path.
+
+Mon Jun  3 07:15:17 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: removes AC_CHECK_FUNCS(readdir_r). readdir_r()
+	  is only used from dir.c and it doesn't need readdir_r().
+	* configure.in (SIZEOF_STRUCT_DIRENT_TOO_SMALL): removed. It is
+	  only used for readdir_r.
+	* dir.c: removes NAME_MAX_FOR_STRUCT_DIRENT. It is not right way
+	  to detect maximum length of path len. POSIX require to use
+	  fpathconf(). IOW, it might have lead to make a vulnerability
+	  using stack smashing. Moreover, readdir() works enough for our
+	  usage.
+	* dir.c (READDIR): removes an implementation which uses
+	  readdir_r() and parenthesize in a macro body correctly.
+	* dir.c (dir_read): removes IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT
+	  entry), it is used only for readdir_r().
+	* dir.c (dir_each): ditto.
+	* dir.c (glob_helper): ditto.
+
+	* dir.c (READDIR): removes entry and dp argument.
+	* dir.c (dir_read): adjust for the above change.
+	* dir.c (dir_each): ditto.
+	* dir.c (glob_helper): ditto.
+
+Mon Jun  3 03:40:29 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_yield_setup_block_args): partially revert r41019.
+	  The code is not useless.
+
+Mon Jun  3 01:25:25 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/socket/test_sockopt.rb: change test name. follow r41037.
+
+Mon Jun  3 01:08:43 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/rinda/test_rinda.rb: rename functions introduced in r41009.
+
+Sun Jun  2 23:33:42 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* enc/trans/japanese_euc.trans, test/ruby/test_transcode.rb,
+	  tool/transcode-tblgen.rb: change EUC-JP-2004 to EUC-JIS-2004.
+	  This is follow up to changes in r41024.
+
+Sun Jun  2 22:44:42 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/socket/option.c: rename functions introduced in r41009
+	  s/ip/ipv4/g because they are ipv4 functions.
+	  (there's a policy that the name "ip" is for methods which supports
+	   both ipv4 and ipv6)
+
+Sun Jun  2 16:15:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln_find.c (dln_find_exe, dln_find_file): remove deprecated
+	  non-reentrant functions.
+
+Sun Jun  2 15:04:35 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/cgi/util.rb, lib/erb.rb: Use String#b [Feature #8394] by znz
+
+Sun Jun  2 14:10:21 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/irb/lc/help-message: Apply english updates for irb --help #7510
+
+Sun Jun  2 12:03:58 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* range.c: Fix rdoc on Range#bsearch [Bug #8242] [ruby-core:54143]
+
+Sun Jun  2 02:08:37 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/euc_jp.c: fix typo: the name of EUC-JIS-2004.
+
+Sat Jun  1 23:17:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* vm_eval.c (rb_mod_module_eval): mention in docs that arguments passed
+	  to the method are passed to the block
+
+Sat Jun  1 17:58:13 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#freeze, taint, untaint): Save a "self" by
+	  utilizing super returning self, and add tests while at it.
+
+Sat Jun  1 17:24:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_set_arguments): not a simple single argument if any
+	  keyword arguments exist.  [ruby-core:55203] [Bug #8463]
+
+	* vm_insnhelper.c (vm_yield_setup_block_args): split single parameter
+	  if any keyword arguments exist, and then extract keyword arguments.
+	  [ruby-core:55203] [Bug #8463]
+
+Sat Jun  1 11:16:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_exc_new_cstr): rename from rb_exc_new2.
+
+	* error.c (rb_exc_new_str): rename from rb_exc_new3.
+
+Sat Jun  1 10:13:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_new[2-5], rb_{tainted,usascii}_str_new2),
+	  (rb_str_buf_new2): remove old interfaces.
+
+Sat Jun  1 08:00:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzfile_read, gzfile_read_all, gzfile_getc),
+	  (gzreader_gets): check EOF.  [ruby-core:55220] [Bug #8467]
+
+Sat Jun  1 07:32:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: Use BDIGIT type for hbase.
+
+Sat Jun  1 02:37:35 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/socket/option.c (sockopt_s_byte): constructor of the sockopt
+	  whose value's is byte.
+
+	* ext/socket/option.c (sockopt_byte): getter for above.
+
+	* ext/socket/option.c (inspect_byte): inspect for above.
+
+	* ext/socket/option.c (sockopt_s_ip_multicast_loop): constructor of
+	  the sockopt whose optname is IP_MULTICAST_LOOP.
+
+	* ext/socket/option.c (sockopt_ip_multicast_loop): getter for above.
+
+	* ext/socket/option.c (sockopt_s_ip_multicast_ttl): constructor of
+	  the sockopt whose optname is IP_MULTICAST_TTL.
+
+	* ext/socket/option.c (sockopt_ip_multicast_ttl): getter for above.
+
+	* ext/socket/option.c (sockopt_inspect): use above.
+
+Sat Jun 01 01:50:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_power): use rb_dbl2big
+	  to convert a double value to a Bignum.
+
+Sat Jun  1 00:19:50 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (calc_hbase): Make hbase the maximum power of base
+	  representable in BDIGIT.
+
+Fri May 31 23:56:13 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (calc_hbase): Extracted from rb_big2str0.
+
+Fri May 31 23:22:24 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c: Don't hard code SIZEOF_BDIGITS for log_base(hbase).
+	  (big2str_orig): hbase_numdigits argument added.
+	  (big2str_karatsuba): Ditto.
+	  (rb_big2str0): Calculate hbase_numdigits.
+
+Fri May 31 17:57:21 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* process.c: Improve Process::exec documentation
+
+Fri May 31 17:26:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_funcallv): add better names of rb_funcall2.
+
+	* vm_eval.c (rb_funcallv_public): ditto for rb_funcall3.
+
+Fri May 31 17:04:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_new_capa): add better names of rb_ary_new2.
+
+	* array.c (rb_ary_new_from_args): ditto for rb_ary_new3.
+
+	* array.c (rb_ary_new_from_values): ditto for rb_ary_new4.
+
+Fri May 31 16:35:44 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (HAVE_ATTRIBUTE_FUNCTION_ALIAS): define to tell if
+	  alias attribute is available.
+
+Fri May 31 16:03:23 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* object.c, proc.c: s/call_seq/call-seq in rdoc. [Fixes GH-322]
+
+Fri May 31 15:56:36 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/openssl/ossl_ssl.c: Add missing paren in rdoc [Fixes GH-321]
+
+Fri May 31 11:58:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (set_visibility): extract from rb_mod_public(),
+	  rb_mod_protected() and rb_mod_private().
+
+Thu May 30 19:47:42 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_insnhelper.c (vm_callee_setup_keyword_arg,
+	  vm_callee_setup_arg_complex): consider a hash argument for keyword
+	  only when the number of arguments is more than the expected
+	  mandatory parameters.  [ruby-core:53199] [ruby-trunk - Bug #8040]
+
+	* test/ruby/test_keyword.rb: update a test for above.
+
+Thu May 30 17:55:04 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* process.c: RDoc on Process.spawn
+
+Thu May 30 00:08:14 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_profile_enable): rest_sweep() to finish last GC.
+	  Profiling record is allocated at first of marking phase.
+	  Enable at lazy sweeping may cause an error (SEGV).
+
+Wed May 29 10:33:27 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* hash.c: fix WB bug.
+	  (1) Hash's key also needs WB.
+	  (2) callback parameter *key and *value of st_update() is not a
+	      storage of st_table itself (only local variable). So that
+	      OBJ_WRITE() is not suitable, especially for `!existing'.
+	      OBJ_WRITTEN() is used instead of OBJ_WRITE().
+
+Tue May 28 12:31:21 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/object_tracing.c: fix a bug reported at
+	  "[ruby-core:55182] [ruby-trunk - Bug #8456][Open] Sugfault in Ruby Head"
+	  Care about the case TracePoint#path #=> `nil'.
+
+	* ext/objspace/object_tracing.c: add two new methods:
+	  * ObjectSpace.allocation_class_path(o)
+	  * ObjectSpace.allocation_method_id(o)
+	  They are not useful for Object.new because they are always
+	  "Class" and :new.
+	  To trace more useful information, we need to maintain call-tree
+	  using call/return hooks, which is implemented by
+	  ll-prof <http://sunagae.net/wiki/doku.php?id=software:llprof>
+
+	* test/objspace/test_objspace.rb: add a test.
+
+Tue May 28 11:30:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): leave makefiles untouched if the content is
+	  not changed, to get rid of unnecessary re-linking.
+
+Tue May 28 03:11:02 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/gc_hook.c, ext/objspace/objspace.c: add new methods to
+	  hook GC invocation.
+	  * ObjectSpace.after_gc_start_hook=(proc)
+	  * ObjectSpace.after_gc_end_hook=(proc)
+
+	  Note that hooks are not kicked immediately. Procs are kicked
+	  at postponed_job.
+
+	  This feature is a sample of new internal event and
+	  rb_postponed_job API.
+
+Tue May 28 02:56:15 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat): remove wrong rest_sweep().
+
+Tue May 28 02:44:23 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (garbage_collect_body): fix GC_ENABLE_LAZY_SWEEP condition.
+
+	* gc.c (GC_NOTIFY): move debug print location and use stderr instead
+	  of stdout.
+
+Tue May 28 02:07:21 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (rb_postponed_job_register_one): fix iteration bug.
+
+	* ext/-test-/postponed_job/postponed_job.c,
+	  test/-ext-/postponed_job/test_postponed_job.rb: add a test.
+
+Tue May 28 00:34:23 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h, gc.c: add new internal event
+	  RUBY_INTERNAL_EVENT_GC_END. This event invokes at the end of
+	  after_sweep().
+	  Time chart with lazy sweep is:
+	    (1) Kick RUBY_INTERNAL_EVENT_GC_START
+	    (2) [gc_marks()]
+	    (3) [lazy_sweep()]
+	    (4) [... run Ruby program (mutator) with lazy_sweep() ...]
+	    (5) [after_sweep()]
+	    (6) Kick RUBY_INTERNAL_EVENT_GC_END
+	    (7) [... run Ruby program (mutator), and go to (1) ...]
+	  Time chart without lazy sweep (GC.start, etc) is:
+	    (1) Kick RUBY_INTERNAL_EVENT_GC_START
+	    (2) [gc_marks()]
+	    (3) [gc_sweep()]
+	    (4) [after_sweep()]
+	    (5) Kick RUBY_INTERNAL_EVENT_GC_END
+	    (6) [... run Ruby program (mutator), and go to (1) ...]
+
+	* ext/-test-/tracepoint/tracepoint.c,
+	  test/-ext-/tracepoint/test_tracepoint.rb: modify a test.
+
+Tue May 28 00:18:57 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (rb_postponed_job_flush): remove a wrong comment.
+
+Mon May 27 22:09:33 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (RHASH_SIZE): Add a cast to suppress a
+	  warning, comparison between signed and unsigned integer
+	  expressions [-Wsign-compare], on ILP32.
+
+Mon May 27 19:25:47 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: rename RUBY_INTERNAL_EVENT_FREE to
+	  RUBY_INTERNAL_EVENT_FREEOBJ.
+
+	* ext/-test-/tracepoint/tracepoint.c,
+	  ext/objspace/object_tracing.c,
+	  gc.c, vm_trace.c: catch up this change.
+
+Mon May 27 18:57:28 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c: support ObjectSpace.trace_object_allocations.
+	  Read the following test to know HOWTO.
+	  This feature is a sample of RUBY_INTERNAL_EVENT.
+
+	* test/objspace/test_objspace.rb: add a test.
+
+	* ext/objspace/object_tracing.c: ditto.
+
+	* gc.c (rb_gc_count): add. This function returns GC count.
+
+	* internal.h: add decl. of rb_gc_count(). Same as `GC.count'.
+
+Mon May 27 17:33:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (install_recursive): add maxdepth option.
+
+	* tool/rbinstall.rb (bin-comm): limit depth of bindir and reject empty
+	  files.  [ruby-core:55101] [Bug #8432]
+
+Mon May 27 16:16:18 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (rb_postponed_job_flush, rb_postponed_job_register): use
+	  ruby_xmalloc/xfree. It is safe during GC.
+
+Mon May 27 09:24:03 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* test/-ext-/postponed_job/test_postponed_job.rb: fix typo and class name.
+
+Mon May 27 09:05:17 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h, gc.c, vm_trace.c: add internal events.
+	  * RUBY_INTERNAL_EVENT_NEWOBJ: object created.
+	  * RUBY_INTERNAL_EVENT_FREE: object freed.
+	  * RUBY_INTERNAL_EVENT_GC_START: GC started.
+	  And rename `RUBY_EVENT_SWITCH' to `RUBY_INTERNAL_EVENT_SWITCH'.
+
+	  Internal events can not invoke any Ruby program because the tracing
+	  timing may be critical (under huge restriction).
+	  These events can be hooked only by C-extensions.
+	  We recommend to use rb_postponed_job_register() API to call Ruby
+	  program safely.
+
+	  This change is mostly written by Aman Gupta (tmm1).
+	  https://bugs.ruby-lang.org/issues/8107#note-12
+	  [Feature #8107]
+
+	* include/ruby/debug.h, vm_trace.c: added two new APIs.
+	  * rb_tracearg_event_flag() returns rb_event_flag_t of this event.
+	  * rb_tracearg_object() returns created/freed object.
+
+	* ext/-test-/tracepoint/extconf.rb,
+	  ext/-test-/tracepoint/tracepoint.c,
+	  test/-ext-/tracepoint/test_tracepoint.rb: add a test.
+
+Mon May 27 08:38:21 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/-test-/postponed_job/postponed_job.c: fix `init' function name.
+
+Mon May 27 06:22:41 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/debug.h, vm_trace.c: add rb_postponed_job API.
+	  Postponed jobs are registered with this API. Registered jobs
+	  are invoked at `ruby-running-safe-point' as soon as possible.
+	  This timing is completely same as finalizer timing.
+
+	  There are two APIs:
+	  * rb_postponed_job_register(flags, func, data): register a
+	    postponed job with data. flags are reserved.
+	  * rb_postponed_job_register_one(flags, func, data): same as
+	    `rb_postponed_job_register', but only one `func' job is
+	    registered (skip if `func' is already registered).
+
+	  This change is mostly written by Aman Gupta (tmm1).
+	  https://bugs.ruby-lang.org/issues/8107#note-15
+	  [Feature #8107]
+
+	* gc.c: use postponed job API for finalizer.
+
+	* common.mk: add dependency from vm_trace.c to debug.h.
+
+	* ext/-test-/postponed_job/extconf.rb, postponed_job.c,
+	  test/-ext-/postponed_job/test_postponed_job.rb: add a test.
+
+	* thread.c: implement postponed API.
+
+	* vm_core.h: ditto.
+
+Mon May 27 02:26:02 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat): collect promote_operation_count and
+	  types (RGENGC_PROFILE >= 2).
+
+Mon May 27 01:40:58 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat): collect shade_operation_count,
+	  remembered_sunny_object_count and remembered_shady_object_count
+	  for each types when RGENGC_PROFILE >= 2.
+	  They are informative for optimization.
+
+Mon May 27 01:15:22 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* hash.c (rb_hash_tbl_raw), internal.h: added.
+	  Returns st_table without shading hash.
+
+	* array.c: use rb_hash_tbl_raw() for read-only purpose.
+
+	* compile.c (iseq_compile_each): ditto.
+
+	* gc.c (count_objects): ditto.
+
+	* insns.def: ditto.
+
+	* process.c: ditto.
+
+	* thread.c (clear_coverage): ditto.
+
+	* vm_insnhelper.c: ditto.
+
+Mon May 27 00:31:09 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/make-snapshot: use ENV["AUTOCONF"] instead of directly using
+	  literal "autoconf".
+
+Sun May 26 21:31:46 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* hash.c, include/ruby/ruby.h: support WB protected hash.
+	  * constify RHash::ifnone and make new macro RHASH_SET_IFNONE().
+	  * insert write barrier for st_update().
+
+	* include/ruby/intern.h: declare rb_hash_set_ifnone(hash, ifnone).
+
+	* marshal.c (r_object0): use RHASH_SET_IFNONE().
+
+	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): ditto.
+
+Sat May 25 23:22:38 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* test/fiddle/test_c_struct_entry.rb,
+	  test/fiddle/test_c_union_entity.rb,
+	  test/fiddle/test_cparser.rb, test/fiddle/test_func.rb,
+	  test/fiddle/test_handle.rb, test/fiddle/test_import.rb,
+	  test/fiddle/test_pointer.rb: don't run test if the system
+	  don't support fiddle.
+
+Sat May 25 21:29:34 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/pty/pty.c (get_device_once): FreeBSD 10-current and 9-stable
+	  added O_CLOEXEC support to posix_openpt, so assume FreeBSD 9.2 or
+	  later supports it.
+	  http://www.freebsd.org/cgi/query-pr.cgi?pr=162374
+
+Sat May 25 18:46:23 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (rb_method_entry_min_max_arity): fix missing break in switch.
+	  This was introduced in r38236, which is not intentional apparently.
+	  This has caused no actual harm because VM_METHOD_TYPE_OPTIMIZED is
+	  not used except for OPTIMIZED_METHOD_TYPE_SEND, but may do in
+	  future.  Coverity Scan found this inadequacy.
+
+Sat May 25 18:08:06 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* dir.c (bracket): fix copy-paste error.  When the first and last
+	  characters of fnmatch range have different length, fnmatch may
+	  have wrongly matched a path that does not really match.
+	  Coverity Scan found this bug.
+
+Sat May 25 17:06:25 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (after_gc_sweep): reduce full GC timing.
+
+Sat May 25 11:28:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (set_const_visibility): return without clearing method
+	  cache if no arguments.
+
+	* vm_method.c (set_method_visibility): ditto.
+
+Sat May 25 11:27:32 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (set_method_visibility): quote unprintable method name.
+
+Sat May 25 11:24:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_frame_callee): returns the called name of the current
+	  frame, not the previous frame.
+
+	* eval.c (prev_frame_callee, prev_frame_func): rename and make static,
+	  as these are used by rb_f_method_name() and rb_f_callee_name() only.
+
+	* variable.c (set_const_visibility): use the called name.
+
+Sat May 25 08:58:23 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_quote_unprintable): check if argument is a string.
+
+Fri May 24 19:32:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* variable.c (set_const_visibility): use rb_frame_this_func() instead
+	  of rb_frame_callee() for getting the name of the called method
+
+	* test/ruby/test_module.rb: add test for private_constant with no args
+
+Fri May 24 18:53:10 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: do major/full GC when:
+	  * number of oldgen object is bigger than twice of
+	    number of oldgen object at last full GC.
+	  * number of remembered shady object is bigger than twice of
+	    number of remembered shady object at last full GC.
+	  * number of oldgen object and remembered shady object is bigger
+	    than half of total object space.
+	  (please fix my English!)
+
+Fri May 24 17:07:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* intern.h: remove dangling rb_class_init_copy declaration
+	  [ruby-core:55120] [Bug #8434]
+
+Fri May 24 16:31:23 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/strscan/strscan.c (strscan_aref): raise error if given
+	  name reference is not found.
+
+Fri May 24 15:48:18 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (after_gc_sweep, garbage_collect_body): do major GC (full GC)
+	  before extending heaps.
+	  TODO: do major GC when there are many old (promoted) objects.
+
+	* gc.c (after_gc_sweep): remove TODO comments.
+
+Fri May 24 11:04:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBRUBY_RPATHFLAGS): do not append -L option with
+	  runtime library directory if cross compiling, but only -R option.
+	  runtime path makes no sense on the host system.  [ruby-dev:47363]
+	  [Bug #8443]
+
+Fri May 24 02:57:17 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* object.c (rb_obj_clone): should not propagate OLDGEN status.
+	  This propagation had caused WB miss for class.
+
+Thu May 23 17:35:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (loaded_feature_path): fix invalid read by index underflow.
+	  the beginning of name is also a boundary as well as just after '/'.
+
+Thu May 23 17:21:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (gc_profile_dump_on): revert r40898.  ok to show the record
+	  accumulating while lazy_sweep().
+
+Wed May 22 16:50:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (gc_profile_dump_on): use size_t to get rid of overflow and
+	  show the header when next_index > 0, instead of next_index != 1.
+
+Wed May 22 15:18:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (setup_overlapped): check the error code in addition
+	  to the result of SetFilePointer() to determine if an error occurred,
+	  because INVALID_SET_FILE_POINTER is a valid value.
+	  [ruby-core:55098] [Bug #8431]
+
+	* win32/win32.c (setup_overlapped, finish_overlapped): extract from
+	  rb_w32_read() and rb_w32_write().
+
+Wed May 22 14:19:56 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_prepare_free_objects, rest_sweep, lazy_sweep): fix position
+	  of `during_gc' setting.
+
+Wed May 22 07:36:08 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (garbage_collect): all GC is start from garbage_collect()
+	  (or garbage_collect_body()). `garbage_collect()' accept additional
+	  two parameters `full_mark' and `immediate_sweep'.
+	  If `full_mark' is TRUE, then force it full gc (major gc), otherwise,
+	  it depends on status of object space. Now, it will be minor gc.
+	  If `immediate_sweep' is TRUE, then disable lazy sweep.
+	  To allocate free memory, `full_mark' and `immediate_sweep' should be
+	  TRUE. Otherwise, they should be FALSE.
+
+	* gc.c (gc_prepare_free_objects): use `garbage_collect_body()'.
+
+	* gc.c (slot_sweep, before_gc_sweep, after_gc_sweep): add logging code.
+
+Tue May 21 22:47:06 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/strscan/strscan.c (strscan_aref): support named captures.
+	  patched by Konstantin Haase [ruby-core:54664] [Feature #8343]
+
+Tue May 21 21:48:44 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/ruby/test_dir_m17n.rb (TestDir_M17N#test_entries_compose):
+	  Use #each instead of #map just for iteration.
+
+Tue May 21 19:57:22 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest.rb (Digest::Class.file): Take optional
+	  arguments that are passed to the constructor of the digest
+	  class.
+
+Tue May 21 17:21:12 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: remove gc_profile_record::is_marked. always true.
+
+Tue May 21 17:13:40 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix to collect additional information for GC::Profiler.
+	  * major/minor GC
+	  * trigger reason of GC
+
+	* gc.c (gc_profile_dump_on): change reporting format with
+	  added information.
+
+	* gc.c (gc_profile_record_get): return added information by
+	  :GC_FLAGS => array.
+
+Tue May 21 16:45:31 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: GC::Profiler's sweeping time is accumulated all slot
+	  sweeping time. At lazy GC, GC::Profiler makes new record entry
+	  for each lazy_sweep(). In this change, accumulating all
+	  slot_sweep() time.
+	  And change indentation.
+
+Tue May 21 16:29:09 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk (rdoc-bench): add a benchmark rule
+	  using RDoc. Generate all rdoc related files
+	  (same as `make rdoc') in temporary directory
+	  and remove them. Execution time, GC::Profiler
+	  and results of GC.stat are printed.
+
+	* tool/rdocbench.rb: added for `rdoc-bench'.
+
+Tue May 21 16:25:05 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_profile_dump_on): `count' should be (int) because it
+	  can be negative number.
+	  And use pointer for `record' (don't copy).
+
+Tue May 21 03:11:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_each): compose HFS file names from
+	  UTF8-MAC. [ruby-core:48745] [Bug #7267]
+
+Tue May 21 03:08:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (assert_separately): require envutil in the
+	  child process too.
+
+Tue May 21 03:07:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_conv_enc_opts): should infect.
+
+Mon May 20 22:24:45 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#delete_if, Set#keep_if): Avoid blockless call of
+	  proc, which is not portable to JRuby.  Replace &method() with
+	  faster and simpler literal blocks while at it.
+
+Mon May 20 22:00:31 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/e2mmap.rb: Format of E2MM documentation
+
+Mon May 20 21:41:15 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/extmk.rb: nodoc this file
+
+Mon May 20 20:43:32 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/cmath.rb: Remove duplicate RDoc heading from overview
+
+Mon May 20 20:36:19 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/securerandom.rb: Update position of overview for RDoc
+
+Mon May 20 19:33:55 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* math.c: improve and fix documentation of sin, tan and log
+
+Mon May 20 19:31:49 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* lib/logger.rb (Logger::Application): show namespace in documentation
+
+Mon May 20 11:50:12 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/pp.rb: Revert part of r40834 and nodoc PP::ObjectMixin
+	  [ruby-core:55068]
+
+Mon May 20 10:40:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/webrick/htmlutils.rb (WEBrick::HTMLUtils#escape): replace HTML
+	  meta chars even in non-ascii string.  [Bug #8425] [ruby-core:55052]
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils#{_escape,_unescape}):
+	  fix %-escape encodings.  [Bug #8425] [ruby-core:55052]
+
+	* lib/webrick/httpservlet/filehandler.rb (set_dir_list): revert r20152
+	  partially and fix misuse of bytesize and regexp repetition operator.
+
+Mon May 20 08:03:51 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/profiler.rb: Document Profiler__ methods
+
+Mon May 20 08:02:13 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/tempfile.rb: nodoc Tempfile#inspect
+
+Mon May 20 07:48:24 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/stringio/stringio.c: Correct position of method rdoc
+
+Mon May 20 07:27:41 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* math.c: RDoc formatting of Math core docs with domains and codomains
+	  Patch by @eLobato [Fixes GH-309]
+
+Mon May 20 05:58:12 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/bigdecimal/bigdecimal.c: Formatting for BigMath [Fixes GH-306]
+	  Based on a patch by @eLobato.
+	* ext/bigdecimal/lib/bigdecimal/math.rb: ditto
+
+Mon May 20 04:56:59 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/forwardable.rb: Forwardable examples in overview were broken
+	  Based on patch by @joem [Fixes GH-303] [Bug #8392]
+
+Mon May 20 03:35:26 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/optparse.rb: nodoc OptionParser::Version and SPLAT_PROC
+
+Mon May 20 03:16:52 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/pp.rb: Document PP::ObjectMixin [Fixes GH-312]
+
+Sun May 19 23:52:22 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/webrick/test_htmlutils.rb: add test for WEBrick::HTMLUtils.
+
+Sun May 19 23:12:07 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* encoding.c: document fix, change default script encoding.
+	  patched by @windwiny [Fixes GH-310]
+
+Sun May 19 17:29:07 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#delete_if, Set#keep_if): Add comments.
+
+Sun May 19 11:37:36 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/fiddle/extconf.rb: ignore rc version of libffi to fix build failure.
+
+Sun May 19 10:38:50 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el (ruby-electric-delete-backward-char): Use
+	  delete-char instead of delete-backward-char, which is an
+	  interactive function.
+
+Sun May 19 03:59:29 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (str_scrub0): added for refactoring.
+
+Sun May 19 03:48:26 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI.decode_www_form): scrub string if decoded
+	  bytes are invalid for the encoding.
+
+Sun May 19 02:46:32 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#delete_if, Set#keep_if): Make Set#delete_if and
+	  Set#keep_if more space and time efficient by avoiding to_a.
+
+Sun May 19 02:33:09 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el (ruby-electric-setup-keymap): Make
+	  backquotes electric as well.  It was listed in
+	  ruby-electric-expand-delimiters-list but not activated.
+
+	* misc/ruby-electric.el (ruby-electric-delete-backward-char):
+	  Introduce electric DEL that deletes what the previous electric
+	  command has input.
+
+	* misc/ruby-electric.el (ruby-electric-matching-char): Make
+	  electric quotes work again at the end of buffer.
+
+Sun May 19 01:39:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (setjmp-type): check if setjmpex() is really available.
+	  workaround for i686-w64-mingw32 which declares it but lacks its
+	  definition.
+
+	* include/ruby/defines.h: include setjmpex.h only if also setjmpex()
+	  is available.
+
+Sat May 18 23:57:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (setjmp-type): use setjmpex() on w64-mingw32 to get rid
+	  of -Wclobbered warnings.
+
+	* include/ruby/defines.h: include setjmpex.h here becase setjmp.h is
+	  included from win32.h via intrin.h, winnt.h, and so on.
+
+Sat May 18 20:28:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb (INTEGER2NUM): Make less comparisons.
+
+Sat May 18 20:15:28 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (str_scrub_bang): add String#scrub!. [Feature #8414]
+
+Sat May 18 16:59:52 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb (INTEGER2NUM): Renamed from INTEGER2VALUE.
+
+Sat May 18 16:57:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb (INTEGER2VALUE): Suppress a warning:
+	  comparison between signed and unsigned integer expressions
+
+Sat May 18 16:38:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): forward anonymous and first keyword
+	  rest argument one.  [ruby-core:55033] [Bug #8416].
+
+Sat May 18 15:49:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_vm_tag): move jmpbuf between tag and prev so ensure to
+	  be accessible.
+
+Sat May 18 11:05:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (inspect_enumerator): use VALUE instead of mere char*
+	  by using rb_sprintf() and rb_id2str().
+
+	* enumerator.c (append_method): extract from inspect_enumerator().
+
+Sat May 18 09:00:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb (INTEGER2VALUE): Use LONG2FIX if possible.
+
+Sat May 18 00:38:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: Convert integer constants bigger than int
+	  correctly.
+
+Fri May 17 22:02:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ifaddr.c: Use unsigned LONG_LONG to represent flags
+	  because SunOS 5.11 (OpenIndiana) defines ifa_flags as uint64_t.
+
+Fri May 17 21:47:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* cont.c: Typo in constant MAX_MACHINE_STACK_CACHE from '..MAHINE..'
+	  patch by @schmurfy [Fixes GH-307]
+
+Fri May 17 19:18:24 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el (ruby-electric-matching-char): Do not put
+	  a closing quote when the quote typed does not start a string, as
+	  in $', ?\' or ?\".
+
+Fri May 17 18:06:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Consider error messages to find out version option of
+	  C compiler.
+	  The C compiler of Sun Studio C emits "Warning: Option -qversion
+	  passed to ld, if ld is invoked, ignored otherwise" and exit
+	  successfully.
+
+Fri May 17 17:34:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_gc_guarded_ptr): unoptimize on other compilers than gcc and
+	  msvc.
+
+Fri May 17 11:06:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_intern.h (TH_PUSH_TAG): ensure jmpbuf to be accessible before
+	  pushing tag to get rid of unaccessible tag by stack overflow.
+
+Thu May 16 17:15:32 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_eval.c (rb_catch_obj): add volatile to tag to prevent crash
+	  experimentally.
+	  http://www.rubyist.net/~akr/chkbuild/debian/ruby-trunk/log/20130515T133500Z.log.html.gz
+
+Thu May 16 16:19:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (verconf.in): no longer used.
+
+	* win32/Makefile.sub (config.status): fix typo.
+
+	* configure.in, template/verconf.h.in (RUBY_EXEC_PREFIX): fix for
+	  default prefix.
+
+Thu May 16 13:12:27 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/verconf.h.in: generate verconf.h from the template and
+	  rbconfig.rb.
+
+Thu May 16 05:47:18 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix syntax error.
+	  Thanks @spastorino! [ruby-core:55011]
+
+Thu May 16 03:05:45 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_node_newnode): use newobj_of() instead of rb_newobj().
+
+Thu May 16 02:03:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/depend: Add a dependency for ifaddr.o.
+
+Thu May 16 01:44:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (verconf.h): $< cannot be used in explicit rules with
+	  nmake.
+
+	* win32/Makefile.sub (CONFIG_H): create verconf.in instead of
+	  verconf.h.
+
+Thu May 16 01:25:07 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: only emit warnings when
+	  -w is enabled.
+
+Wed May 15 18:58:17 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (newobj): rename to `newobj_of' and accept additional
+	  three parameters v1, v2, v3. newobj_of() do OBJSETUP() and
+	  fill values with v1, v2, v3.
+
+	* gc.c (rb_data_object_alloc, rb_data_typed_object_alloc):
+	  use newobj_of().
+
+Wed May 15 17:55:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_PLATFORM): move to config.h as needed by
+	  version.c.
+
+Wed May 15 17:04:11 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add an additional RGENGC_PROFILE mode (2).
+	  Profiling result can be check by GC.stat.
+
+	* gc.c (type_name): separate from obj_type_name().
+
+Wed May 15 16:58:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: save configured load path values into verconf.in.
+
+	* common.mk (verconf.h): create from verconf.in with shvar_to_cpp.rb.
+
+	* tool/shvar_to_cpp.rb: turn shell variables into C macros.
+	  [Bug #7959]
+
+	* loadpath.c: split load path staffs from version.c.
+
+	* dmyloadpath.c: miniruby has no builtin load paths, so verconf.h is
+	  not needed.
+
+Wed May 15 03:56:09 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: adding backwards
+	  compatible YAMLTree.new method
+
+Wed May 15 02:22:16 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: Adding Psych.safe_load for loading a user
+	  defined, restricted subset of Ruby object types.
+	* ext/psych/lib/psych/class_loader.rb: A class loader for
+	  encapsulating the logic for which objects are allowed to be
+	  deserialized.
+	* ext/psych/lib/psych/deprecated.rb: Changes to use the class loader
+	* ext/psych/lib/psych/exception.rb: ditto
+	* ext/psych/lib/psych/json/stream.rb: ditto
+	* ext/psych/lib/psych/nodes/node.rb: ditto
+	* ext/psych/lib/psych/scalar_scanner.rb: ditto
+	* ext/psych/lib/psych/stream.rb: ditto
+	* ext/psych/lib/psych/streaming.rb: ditto
+	* ext/psych/lib/psych/visitors/json_tree.rb: ditto
+	* ext/psych/lib/psych/visitors/to_ruby.rb: ditto
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
+	* ext/psych/psych_to_ruby.c: ditto
+	* test/psych/helper.rb: ditto
+	* test/psych/test_safe_load.rb: tests for restricted subset.
+	* test/psych/test_scalar_scanner.rb: ditto
+	* test/psych/visitors/test_to_ruby.rb: ditto
+	* test/psych/visitors/test_yaml_tree.rb: ditto
+
+Wed May 15 02:06:35 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* test/psych/helper.rb: envutil is not available outside Ruby, so
+	  port the functions from envutil to the test helper.
+
+	* test/psych/test_deprecated.rb: ditto
+
+	* test/psych/test_encoding.rb: ditto
+
+Wed May 15 00:42:54 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* signal.c: need to include unistd.h for write(2).
+	  unistd.h is now included via ruby/defines.h, but should explicitly
+	  include here.  (suggested by kosaki)
+
+Tue May 14 23:43:05 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/.document: Add ifaddr.c.
+
+Tue May 14 23:24:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/extconf.rb: check for if_nametoindex() for
+	  i686-w64-mingw32, and check for declarations of if_indextoname() and
+	  if_nametoindex().
+
+	* ext/socket/ifaddr.c (ifaddr_ifindex): not-implement unless
+	  if_nametoindex() is available.
+
+	* ext/socket/rubysocket.h: declare if_indextoname() and
+	  if_nametoindex() if available but not declared.
+
+Tue May 14 19:58:17 2013  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/dl/lib/dl/func.rb (DL::Function#call): check tainted when
+	  $SAFE > 0.
+	* ext/fiddle/function.c (function_call): check tainted when $SAFE > 0.
+	* test/fiddle/test_func.rb (module Fiddle): add test for above.
+
+
+Tue May 14 14:51:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (INTPTR_MAX, INTPTR_MIN, UINTPTR_MAX): split
+	  from intptr_t and uintptr_t, since VC9 defines the latter only in
+	  crtdefs.h.
+
+Tue May 14 12:21:28 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (NET_LUID): mingw may have NET_LUID and not defined
+	  _IFDEF_.
+
+Tue May 14 03:33:17 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (rb_str_new_frozen): remove debug print.
+
+Tue May 14 03:22:51 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: enable to generate write barrier protected
+	  arrays (T_ARRAY).
+
+Tue May 14 03:21:42 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: enable to generate write barrier protected
+	  strings (T_STRING).
+
+Tue May 14 03:19:59 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: enable to generate write barrier protected
+	  objects (T_OBJECT).
+
+Tue May 14 03:17:15 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: enable to generate write barrier protected
+	  objects for numeric types (Float, Complex, Rational, Bignum).
+
+Tue May 14 03:10:59 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: enable RGENGC (USE_RGENGC)
+	  but no type creates write protected (sunny) objects
+	  (RGENGC_WB_PROTECTED_* == 0).
+
+Tue May 14 02:47:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: support RGENGC. [ruby-trunk - Feature #8339]
+	  See this ticket about RGENGC.
+
+	* gc.c: Add several flags:
+	  * RGENGC_DEBUG: if >0, then prints debug information.
+	  * RGENGC_CHECK_MODE: if >0, add assertions.
+	  * RGENGC_PROFILE: if >0, add profiling features.
+	    check GC.stat and GC::Profiler.
+
+	* include/ruby/ruby.h: disable RGENGC by default (USE_RGENGC == 0).
+
+	* array.c: add write barriers for T_ARRAY and generate sunny objects.
+
+	* include/ruby/ruby.h (RARRAY_PTR_USE): added. Use this macro if
+	  you want to access raw pointers. If you modify the contents which
+	  pointer pointed, then you need to care write barrier.
+
+	* bignum.c, marshal.c, random.c: generate T_BIGNUM sunny objects.
+
+	* complex.c, include/ruby/ruby.h: add write barriers for T_COMPLEX
+	  and generate sunny objects.
+
+	* rational.c (nurat_s_new_internal), include/ruby/ruby.h: add write
+	  barriers for T_RATIONAL and generate sunny objects.
+
+	* internal.h: add write barriers for RBasic::klass.
+
+	* numeric.c (rb_float_new_in_heap): generate sunny T_FLOAT objects.
+
+	* object.c (rb_class_allocate_instance), range.c:
+	  generate sunny T_OBJECT objects.
+
+	* string.c: add write barriers for T_STRING and generate sunny objects.
+
+	* variable.c: add write barriers for ivars.
+
+	* vm_insnhelper.c (vm_setivar): ditto.
+
+	* include/ruby/ruby.h, debug.c: use two flags
+	  FL_WB_PROTECTED and FL_OLDGEN.
+
+	* node.h (NODE_FL_CREF_PUSHED_BY_EVAL, NODE_FL_CREF_OMOD_SHARED):
+	  move flag bits.
+
+Tue May 14 01:54:48 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: remove rb_objspace_t::marked_num.
+	  We can use `objspace_live_num()' instead of removed `marked_num'
+	  if it is after `after_gc_sweep()' function call.
+
+	* gc.c (after_gc_sweep): use objspace_live_num() instead of removed
+	  rb_objspace_t::marked_num.
+
+	* gc.c (gc_mark_ptr, gc_marks): remove rb_objspace_t::marked_num code.
+
+	* gc.c (gc_prepare_free_objects): do not call set_heaps_increment()
+	  with checking objspace->heap.marked_num. At this point, we only
+	  need to check availability of free-cell.
+
+	* gc.c (lazy_sweep): call after_gc_sweep() if there are no sweep_able entry.
+
+	* gc.c (rest_sweep, gc_prepare_free_objects): remove after_gc_sweep() call.
+
+Tue May 14 01:50:41 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: disable GC_PROFILE_MORE_DETAIL (fix last commit).
+
+	* gc.c (gc_prof_set_malloc_info): fix "objspace->heap.live_num" to
+	  "objspace_live_num(objspace)". There is no such member variable.
+
+Tue May 14 01:25:55 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: refactoring GC::Profiler.
+
+	* gc.c (gc_prof_sweep_timer_start/stop): removed because
+	  they doesn't support lazy sweep.
+
+	* gc.c (gc_prof_sweep_slot_timer_start/stop): added.
+	  redefine `sweeping time' to accumulated time of all of
+	  slot_sweep().
+
+	* gc.c (rb_objspace_t::profile::count): renamed to
+	  rb_objspace_t::profile::next_index. `counter' seems ambiguous.
+	  increment it when next record is acquired.
+
+Tue May 14 00:48:55 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: constify RRational::(num,den) and
+	  RComplex::(real,imag).
+	  Add macro to set these values:
+	    * RRATIONAL_SET_NUM()
+	    * RRATIONAL_SET_DEN()
+	    * RCOMPLEX_SET_REAL()
+	    * RCOMPLEX_SET_IMAG()
+	  This change is a part of RGENGC branch [ruby-trunk - Feature #8339].
+
+	  TODO: API design. RRATIONAL_SET(rat,num,den) is enough?
+	  TODO: Setting constify variable with cast has same issue of r40691.
+
+	* complex.c, rational.c: use above macros.
+
+Mon May 13 21:49:17 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Check socketpair again.
+	  It is required on Unix.
+
+Mon May 13 21:20:32 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (getipaddrs): use alternative interface name if
+	  available, because if_nametoindex() requires them.
+
+Mon May 13 20:23:24 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (getipaddrs): [experimental]
+	  emulate getipaddrs(3) on Unix.
+
+	* win32/Makefile.sub, configure.in (LIBS): need iphlpapi.lib for above
+	  function.
+
+	* include/ruby/win32.h (socketpair): rb_w32_socketpair() doesn't
+	  substitute for any function, so use non-prefixed name.
+
+	* ext/socket/extconf.rb (socketpair); follow above change.
+
+Mon May 13 20:11:06 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (prepare_iseq_build): remove additional line break.
+
+Mon May 13 19:29:54 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: constify RBasic::klass and add
+	  RBASIC_CLASS(obj) macro which returns a class of `obj'.
+	  This change is a part of RGENGC branch [ruby-trunk - Feature #8339].
+
+	* object.c: add new function rb_obj_reveal().
+	  This function reveal internal (hidden) object by rb_obj_hide().
+	  Note that do not change class before and after hiding.
+	  Only permitted example is:
+	    klass = RBASIC_CLASS(obj);
+	    rb_obj_hide(obj);
+	    ....
+	    rb_obj_reveal(obj, klass);
+
+	  TODO: API design. rb_obj_reveal() should be replaced with others.
+
+	  TODO: modify constified variables using cast may be harmful for
+	        compiler's analysis and optimization.
+	        Any idea to prohibit inserting RBasic::klass directly?
+	        If rename RBasic::klass and force to use RBASIC_CLASS(obj),
+	        then all codes such as `RBASIC(obj)->klass' will be
+	        compilation error. Is it acceptable? (We have similar
+	        experience at Ruby 1.9,
+	        for example "RARRAY(ary)->ptr" to "RARRAY_PTR(ary)".
+
+	* internal.h: add some macros.
+	  * RBASIC_CLEAR_CLASS(obj) clear RBasic::klass to make it internal
+	    object.
+	  * RBASIC_SET_CLASS(obj, cls) set RBasic::klass.
+	  * RBASIC_SET_CLASS_RAW(obj, cls) same as RBASIC_SET_CLASS
+	    without write barrier (planned).
+	  * RCLASS_SET_SUPER(a, b) set super class of a.
+
+	* array.c, class.c, compile.c, encoding.c, enum.c, error.c, eval.c,
+	  file.c, gc.c, hash.c, io.c, iseq.c, marshal.c, object.c,
+	  parse.y, proc.c, process.c, random.c, ruby.c, sprintf.c,
+	  string.c, thread.c, transcode.c, vm.c, vm_eval.c, win32/file.c:
+	  Use above macros and functions to access RBasic::klass.
+
+	* ext/coverage/coverage.c, ext/readline/readline.c,
+	  ext/socket/ancdata.c, ext/socket/init.c,
+	* ext/zlib/zlib.c: ditto.
+
+Mon May 13 18:44:14 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* *.c, parse.y, insns.def: use RARRAY_AREF/ASET macro
+	  instead of using RARRAY_PTR().
+
+Mon May 13 16:53:53 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: add new utility macros to access
+	  Array's element.
+	  * RARRAY_AREF(a, i) returns i-th element of an array `a'
+	  * RARRAY_ASET(a, i, v) set i-th element of `a' to `v'
+	  This change is a part of RGENGC branch [ruby-trunk - Feature #8339].
+
+Mon May 13 15:31:10 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* object.c (rb_obj_setup): added.
+
+	* include/ruby/ruby.h (OBJSETUP): use rb_obj_setup() instead of
+	  a macro.
+
+Mon May 13 15:24:16 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_data_object_alloc): check klass only if klass is not 0.
+	  klass==0 means internal object.
+
+Mon May 13 14:57:28 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_data_object_alloc, rb_data_typed_object_alloc):
+	  use NEWOBJ_OF() instead of NEWOBJ().
+
+Mon May 13 14:51:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_obj_singleton_method): new method Kernel#singleton_method
+	  which returns a Method object of the singleton method.
+	  non-singleton method causes NameError, but not aliased or zsuper
+	  method, right now.
+	  [ruby-core:54914] [Feature #8391]
+
+	* vm_method.c (rb_method_entry_at): return the method entry for id at
+	  klass, without ancestors.
+
+	* class.c (rb_singleton_class_get): get the singleton class if exists,
+	  or nil.
+
+Mon May 13 10:20:59 2013  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* ext/openssl/ossl_ssl.c: Disabled OpenSSL::SSL::SSLSocket if
+	  defined(OPENSSL_NO_SOCK).
+
+	  This fixes a linkage error on platforms which do not have socket.
+	  OpenSSL itself is still useful as a set of cryptographic functions
+	  even on such platforms.
+
+Mon May 13 10:30:04 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* hash.c: Hash[] and {} are not equivalent by @eam [Fixes GH-301]
+
+Mon May 13 10:04:22 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* random.c: Document Random::DEFAULT by @eLobato [Fixes GH-304]
+
+Sun May 12 21:12:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (OFFT2NUM): RUBY_REPLACE_TYPE also defines macro
+	  to convert int type to VALUE if found.
+
+Wed May  8 13:46:52 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/intern.h (rb_iv_set, rb_iv_get): removed. Because
+	  ruby.h has a declaration for that.
+
+Wed May  8 13:49:06 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/intern.h (rb_uint2big, rb_int2big, rb_uint2inum)
+	(rb_int2inum, rb_ll2inum, rb_ull2inum): removed because ruby.h
+	  has a declaration for these.
+
+Sun May 12 17:52:23 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: removes 'ac_cv_func_fseeko=yes' form MinGW
+	  specific definitions.
+
+Sun May 12 17:25:46 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* file.c (rb_file_s_truncate): use correct type. chsize takes
+	  a long.
+
+Sun May 12 17:18:46 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c: move '#define HAVE_SPAWNV 1' to win32/Makefile.sub.
+	* win32/Makefile.sub: see above.
+
+Sun May 12 17:13:32 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: removes AC_CHECK_FUNCS(setitimer) because it's
+	  unused.
+
+Sun May 12 17:08:16 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: removes AC_CHECK_FUNCS(pause) because it's unused.
+
+Sun May 12 17:05:18 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (rb_f_kill): fixes typo. s/HAS_KILLPG/HAVE_KILLPG/.
+
+Sun May 12 17:03:27 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: abort if gettimeofday doesn't exist.
+
+Sun May 12 16:31:27 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: adds RUBY_REPLACE_TYPE(off_t) for creating
+	  NUM2OFFT.
+	* file.c (rb_file_truncate): use correct type. chsize() take
+	  a long.
+	* include/ruby/ruby.h (NUM2OFFT): use a definition created by
+	  a configure script by default.
+
+Sun May 12 16:03:41 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: removes AC_CHECK_FUNC(fseeko, fseeko64, ftello,
+	  ftello64). They are not used from anywhere.
+
+	* win32/win32.c (fseeko): removes.
+	* win32/win32.c (rb_w32_ftello): removes.
+	* include/ruby/win32.h: removes declarations of rb_w32_ftello and
+	  rb_w32_fseeko.
+	* win32/Makefile.sub: removes '#define HAVE_FTELLO 1'.
+
+Sun May 12 15:51:47 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: remove AC_CHECK_FUNC(close). It is not used from
+	  anywhere.
+
+Sun May 12 15:50:45 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: adds comments for setjmp check.
+
+Sun May 12 15:38:09 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: move clock_gettime() check into regular place.
+
+Wed May  8 13:45:53 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: add getenv() declaration check.
+	* dln_find.c: add HAVE_DECL_GETENV test.
+
+Sun May 12 15:33:18 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: sorts AC_CHECK_FUNCS()s as alphabetical order.
+
+Wed May  8 13:41:57 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* bignum.c: remove redundant decl for big_lshift() big_rshift().
+
+Sun May 12 16:06:43 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/socket/rubysocket.h (rsock_inspect_sockaddr): as r40646
+	  check HAVE_TYPE_STRUCT_SOCKADDR_DL.
+
+Sat May 11 23:01:58 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/socket/rubysocket.h (HAVE_TYPE_STRUCT_SOCKADDR_DL):
+	  MSVC has struct sockaddr_dl, but its content is broken.
+	  http://ruby-mswin.cloudapp.net/vc10-x64/ruby-trunk/log/20130511T103938Z.log.html.gz
+
+Sat May 11 22:07:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/rinda/test_rinda.rb: Socket.getifaddrs may returns an interface
+	  which #addr method returns nil for venet0 in OpenVZ.
+
+Sat May 11 21:56:34 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (rsock_inspect_sockaddr): Add casts to
+	  suppress warnings.
+
+Sat May 11 17:28:51 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: New method, Socket.getifaddrs, implemented.
+	  [ruby-core:54777] [Feature #8368]
+
+Sat May 11 00:47:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* gc.h (SET_MACHINE_STACK_END): Add !defined(_ILP32) to a defining
+	  condition to avoid compilation error on x32.
+	  https://sites.google.com/site/x32abi/
+
+Fri May 10 23:56:34 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_peek_variable_name): treat invalid global, class,
+	  and instance variable names as mere strings rather than errors.
+	  [ruby-core:54885] [Bug #8375]
+
+Fri May 10 20:22:40 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Move library checks into "Checks for libraries." part.
+
+Fri May 10 19:32:01 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Reformat arguments of AC_CHECK_HEADERS and
+	  AC_CHECK_FUNCS to track modifications easily.
+
+Fri May 10 12:01:36 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Don't link librt if clock_gettime is available in
+	  the main C library.
+	  glibc 2.17 moves clock_* from librt to the main C library.
+	  http://sourceware.org/ml/libc-announce/2012/msg00001.html
+
+Thu May  9 22:00:35 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_sendmsg_internal): controls_num should
+	  not be negative.
+
+Thu May  9 21:09:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* file.c, ext/etc/etc.c, ext/socket/unixsocket.c,
+	  ext/openssl/ossl.h, ext/openssl/openssl_missing.c: Use
+	  HAVE_AGGREGATE_MEMBER instead of HAVE_ST_MEMBER.
+
+Thu May  9 20:43:41 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_sendmsg_internal): Always set
+	  controls_num to raise NotImplementedError appropriately.
+	  (bsock_recvmsg_internal): Raise NotImplementedError if
+	  :scm_rights=>true is given on platforms which don't have
+	  4.4BSD style control message.
+
+Thu May  9 12:06:07 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h, ext/socket/unixsocket.c,
+	  ext/socket/ancdata.c: Use HAVE_STRUCT_MSGHDR_MSG_CONTROL instead
+	  of HAVE_ST_MSG_CONTROL.
+
+Thu May  9 11:30:02 2013  Zachary Scott	 <zachary@zacharyscott.net>
+
+	* string.c: Add call-seq alias for String#=== [Bug #8381]
+
+Thu May  9 11:14:18 2013  Zachary Scott	 <zachary@zacharyscott.net>
+
+	* doc/contributing.rdoc: Add guide for contributing to CRuby
+
+Thu May  9 04:55:49 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Check socket library again.  shutdown() is used in
+	  io.c.
+
+Thu May  9 01:52:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Don't check socketpair.  socketpair is not used in
+	  ruby command itself.
+
+Thu May  9 01:05:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_mod_included_modules): should not include non-modules.
+	  [ruby-core:53158] [Bug #8025]
+
+Wed May  8 22:46:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_mod_included_modules): should not include the original
+	  module itself.  [ruby-core:53158] [Bug #8025]
+
+Wed May  8 17:43:55 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_io_ext_int_to_encs): ignore internal encoding if external
+	  encoding is ASCII-8BIT. [Bug #8342]
+
+Wed May  8 13:49:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/generator/generator.c (isArrayOrObject): cast char to
+	  unsigned char. [Bug #8378]
+
+Wed May  8 13:46:10 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/generator/depend: fix dependencies [Bug #8379]
+
+	* ext/json/parser/depend: ditto.
+
+Wed May  8 13:07:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): fail if $, @, @@ are not followed by a valid
+	  name character.  [ruby-core:54846] [Bug #8375].
+
+Wed May  8 13:06:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (ISGRAPH): add missing macro.
+
+Wed May  8 06:42:56 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/socket/socket.c (socket_s_ip_address_list): fix wrongly filled
+	  sin6_scope_id on KAME introduced by r40593 for OpenIndiana.
+	  KAME uses fe80:<scope_id>::<interface id> for link-local address
+	  internally.
+	  Setting sin6_scope_id causes it leaked.
+	  see also comments of sockaddr_obj().
+
+Tue May  7 22:12:34 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/readline/readline.c (insert_ignore_escape): Add a cast to
+	  unsigned char * before dereference.
+	  This suppress a warning on Cygwin.
+
+Tue May  7 12:15:24 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): Add a cast to
+	  suppress warning.
+	  Bionic defines socklen_t as int.
+	  Bionic defines msg_controllen as unsigned int (__kernel_size_t)
+	  instead of socklen_t as POSIX.
+
+Tue May  7 12:12:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_inspect): Don't call
+	  anc_inspect_ipv6_pktinfo if !HAVE_TYPE_STRUCT_IN6_PKTINFO.
+	  anc_inspect_ipv6_pktinfo is not defined in the case.
+
+Tue May  7 12:10:52 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (socket_s_ip_address_list): Cast EXTRA_SPACE as
+	  int.  This suppress a warning.
+
+Tue May  7 12:09:29 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Set close_fds false for Cygwin.
+	  Cygwin doesn't support fd passing.
+	  This enables socket extension library cross-compilable by default.
+
+Tue May  7 12:07:35 2013  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (swap32): Don't redefine it if it is already defined.
+	  Bionic defines it.
+	  (swap64): Ditto.
+
+Mon May  6 20:50:37 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (socket_s_ip_address_list): Fill sin6_scope_id
+	  if getifaddrs() returns an IPv6 link local address which
+	  sin6_scope_id is zero, such as on OpenIndiana SunOS 5.11.
+
+Sun May  5 18:56:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (defined): use vm_search_superclass() like as normal super
+	  call.  based on a patch <https://gist.github.com/wanabe/5520026> by
+	  wanabe.
+
+	* vm_insnhelper.c (vm_search_superclass): return error but not raise
+	  exceptions.
+
+	* vm_insnhelper.c (vm_search_super_method): check the result of
+	  vm_search_superclass and raise exceptions on error.
+
+Sun May  5 16:29:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (defined): get method entry from the method top level
+	  frame, not block frame.  [ruby-core:54769] [Bug #8367]
+
+Sun May  5 13:28:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/ruby.pc.in (Cflags): use rubyarchhdrdir for multiarch.
+	  [Bug #7874]
+
+Sat May  4 07:20:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/security.rdoc: Add note about reporting security vulns
+
+Sat May  4 04:13:27 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/defines.h (RUBY_ATTR_ALLOC_SIZE): New for
+	  attribute((alloc_size(params))).
+
+	* include/ruby/defines.h (xmalloc, xmalloc2, xcalloc)
+	(xrealloc, xrealloc2): Annotated by RUBY_ATTR_ALLOC_SIZE.
+	* include/ruby/ruby.h (rb_alloc_tmp_buffer): ditto.
+
+Fri May  3 19:32:13 2013  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/util.rb: All class methods modulized.
+	  We can use these methods like a function when "include CGI::Util".
+	  [Feature #8354]
+
+Fri May  3 14:09:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Make default_ipv6 true for Cygwin.
+	  Cygwin supports IPv6 since Cygwin 1.7.1 (2009-12).
+	  http://cygwin.com/ml/cygwin-announce/2009-12/msg00027.html
+
+Fri May  3 13:35:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/{getaddrinfo,getnameinfo}.c: define socklen_t if not
+	  defined, e.g., older VC.
+
+Fri May  3 13:29:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (INTPTR_MAX, INTPTR_MIN, UINTPTR_MAX): also
+	  should be defined when defining intptr_t and uintptr_t.
+	  bigdecimal.c requires the former two now.
+
+Fri May  3 13:22:12 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (poll_child_status): fix build error on older mingw.
+
+Fri May  3 00:15:58 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* common.mk: remove timestamps in distclean-ext realclean-ext.
+
+Thu May  2 23:23:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_obj_is_kind_of): skip prepending modules.
+	  [ruby-core:54742] [Bug #8357]
+
+	* object.c (rb_class_inherited_p): ditto.
+	  [ruby-core:54736] [Bug #8357]
+
+Thu May  2 22:11:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bin/irb: remove dead code from sample/irb.rb.
+
+Thu May  2 17:32:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (copy_ivar_i): get rid of overwriting already copied
+	  instance variables.  c.f. [Bug #8276]
+
+Thu May  2 16:55:43 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (id_locals): use cached ID.
+
+	* vm.c (ruby_thread_init): ditto.
+
+	* defs/id.def: add more predefined IDs used in core.
+
+Thu May  2 13:42:42 2013  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/*: Imported minitest 4.7.4 (r8483)
+	* test/minitest/*: ditto
+
+Thu May  2 11:32:22 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (poll_child_status): [experimental] set the cause of
+	  a child's death to status if its exitcode seems to be an error.
+
+	* test/ruby/test_process.rb (TestProcess#test_no_curdir): maybe now
+	  we can test it.
+
+	* test/ruby/test_thread.rb (TestThread#test_thread_timer_and_interrupt):
+	  ditto.
+
+Thu May  2 11:24:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/yaml.rb: nodoc EngineManager, add History doc #8344
+
+Wed May  1 21:11:17 2013  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (localtime_with_gmtoff_zone): musl libc may return NULL for
+	  tm_zone.
+
+Wed May  1 18:59:36 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* enum.c (Enumerable#chunk): fix grammar of error message
+	  for symbols beginning with an underscore [Bug #8351]
+
+Wed May  1 16:47:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/curses/extconf.rb (curses_version): try once for each tests, a
+	  function or a variable.  fallback to variable for old SVR4.
+
+Wed May  1 16:17:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): extensions not to be installed should not
+	  make static libraries, but make dynamic libraries always.
+
+Wed May  1 12:20:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/rake/version.rb: Fix RDoc warning with  :include: [Bug #8347]
+
+Wed May  1 11:40:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* defs/id.def (predefined): add "idProc".
+
+	* eval.c (frame_func_id): use predefined IDs.
+
+	* proc.c (mnew, mproc, mlambda): use predefined IDs.
+
+	* vm.c (rb_vm_control_frame_id_and_class): ditto.
+
+	* vm.c (Init_VM): ditto.
+
+Tue Apr 30 23:18:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/benchmark.rb: Update Benchmark results on newer CPU
+
+Tue Apr 30 12:31:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (mproc, mlambda): use frozen core methods instead of plain
+	  global methods, so that methods cannot be overridden.
+	  [ruby-core:54687] [Bug #8345]
+
+	* vm.c (Init_VM): define proc and lambda on the frozen core object.
+
+	* include/ruby/intern.h (rb_block_lambda): add declaration instead of
+	  deprecated rb_f_lambda.
+
+Mon Apr 29 17:02:30 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.h: Bionic libc doesn't have locale.
+	  [Feature #8338]
+
+
+Mon Apr 29 06:58:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): no need of alloca for
+	  small fixed size array.
+
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): check overflow first,
+	  and use alloca for small size input.
+
+Mon Apr 29 00:40:13 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* lib/yaml.rb: Clarify documentation about YAML being always Psych.
+	  Give a tip about using Syck. See #8344.
+
+Sun Apr 28 23:34:01 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* lib/yaml.rb: Use another trick to define the YAML module.
+	  https://twitter.com/n0kada/status/328342207511801856
+
+Sun Apr 28 23:19:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/pp.rb: Update PP module overview by @geopet
+
+Sun Apr 28 22:04:37 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): fix buffer overflow on
+	  x64 Windows and memory leak when initializing with integer.
+	  [ruby-core:54615] [Bug #8337]
+
+Sun Apr 28 12:38:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.EXT: correct method name to be used.  [Bug #7982]
+
+	* README.EXT.ja: add notes too.
+
+Sun Apr 28 10:35:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* object.c: With feedback from Steve Klabnik, reverted a change to
+	  #untrusted? and #tainted?. Also adjusted grammar for $SAFE levels
+
+Sun Apr 28 10:10:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/yaml.rb: Disable setting YAML const twice [ruby-core:54642]
+
+Sun Apr 28 09:50:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* object.c: Documentation for taint and trust [Bug #8162]
+
+Sun Apr 28 09:40:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* README.EXT: Copy note from r40505 for rb_sprintf() [Bug #7982]
+
+Sun Apr 28 08:28:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/curses/curses.c: Update Curses::Window example for nicer output
+	  Patch by Michal Suchanek [Bug #8121] [ruby-core:53520]
+
+Sun Apr 28 08:10:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* README.EXT: Update note from r40504, by Jeremy Evans [Bug #7982]
+
+Sun Apr 28 08:02:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* README.EXT: Add note to warn use of %i in Exceptions [Bug #7982]
+
+Sun Apr 28 02:41:05 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Fix a typo.  Should check endgrent() instead of
+	  endgrnam().
+
+Sun Apr 28 00:35:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (obj2gid): Don't call endgrent() if not exist.
+	  Bionic (Android's libc) don't have endgrent().
+
+	* configure.in: Check endgrnam function.
+
+Sat Apr 27 23:53:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* lib/yaml.rb: add security warning to YAML documentation
+
+Sat Apr 27 23:25:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/yaml.rb: Documentation for YAML module [Bug #8213]
+
+Sat Apr 27 20:19:21 2013  Tanaka Akira  <akr@fsij.org>
+
+	* thread_pthread.c (ruby_init_stack): Add STACK_GROW_DIR_DETECTION.
+	  This fixes a compilation failure while cross-compiling for Tensilica
+	  Xtensa Processor.
+
+Sat Apr 27 19:32:44 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* thread.c: fix typos and documentation
+
+Sat Apr 27 19:04:55 2013  Tanaka Akira  <akr@fsij.org>
+
+	* sparc.c: Use __asm__ instead of asm for gcc.
+	  gcc doesn't provide asm keyword if -ansi option is given.
+	  http://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html
+
+Sat Apr 27 17:22:50 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Redundant test removed.
+
+Sat Apr 27 16:00:10 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb (test_recvmsg_with_msg_peek_creates_fds):
+	  Extracted.
+
+Sat Apr 27 15:50:40 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (SIGNED_INTEGER_TYPE_P): New macro.
+	  (SIGNED_INTEGER_MAX): Ditto.
+	  (SIGNED_INTEGER_MIN): Ditto.
+	  (UNSIGNED_INTEGER_MAX): Ditto.
+	  (TIMET_MAX): Use SIGNED_INTEGER_MAX and UNSIGNED_INTEGER_MAX.
+	  (TIMET_MIN): Use SIGNED_INTEGER_MIN.
+
+	* thread.c (TIMEVAL_SEC_MAX): Use SIGNED_INTEGER_MAX.
+	  (TIMEVAL_SEC_MIN): Use SIGNED_INTEGER_MIN.
+
+Sat Apr 27 10:52:52 2013  Tanaka Akira  <akr@fsij.org>
+
+	* thread.c (TIMEVAL_SEC_MAX, TIMEVAL_SEC_MIN): Consider environments,
+	  sizeof(time_t) is smaller than sizeof(tv_sec), such as
+	  OpenBSD 5.2 (amd64).
+
+Fri Apr 26 23:34:59 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/text.rb (REXML::Text.normalize): Fix a bug that all
+	  entity filters are ignored. [ruby-dev:47278] [Bug #8302]
+	  Patch by Ippei Obayashi. Thanks!!!
+	* test/rexml/test_entity.rb (EntityTester#test_entity_filter): Add
+	  a test of the above change.
+
+Fri Apr 26 22:53:55 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/element.rb (REXML::Attributes#to_a): Support
+	  namespaced attributes. [ruby-dev:47277] [Bug #8301]
+	  Patch by Ippei Obayashi. Thanks!!!
+	* test/rexml/test_attributes.rb
+	  (AttributesTester#test_to_a_with_namespaces): Add a test of the
+	  above change.
+
+Fri Apr 26 21:48:29 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/atom.rb (RSS::Atom::Entry): Fix indent of document comment.
+
+Fri Apr 26 21:21:17 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker.rb (RSS::Maker): Fix indent of document comment.
+
+Fri Apr 26 18:41:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Use a block of enable_config() for
+	  --{enable,disable}-close-fds-by-recvmsg-with-peek configure option
+
+Fri Apr 26 18:08:08 2013  Tanaka Akira  <akr@fsij.org>
+
+	* dir.c (dir_set_pos): Fix a compilation error when seekdir() is not
+	  exist.
+
+Fri Apr 26 17:41:17 2013  Tanaka Akira  <akr@fsij.org>
+
+	* thread_pthread.c (ruby_init_stack): Add STACK_GROW_DIR_DETECTION.
+	  This fixes a compilation failure while cross-compiling for ARM.
+
+Fri Apr 26 14:35:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/rss/atom.rb: Documentation for RSS::Atom based on a patch by
+	  Michael Denomy
+	* lib/rss/maker.rb: Documentation for RSS::Maker also by @mdenomy
+
+Fri Apr 26 12:41:22 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/extconf.rb: Test linkability of curses_version at first.
+
+	* ext/socket/extconf.rb: Test the behavior of fd passing with MSG_PEEK
+	  only if recvmsg(), msg_control member, AF_UNIX and SCM_RIGHTS are
+	  available.
+
+Fri Apr 26 00:07:52 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* lib/rinda/ring.rb (Rinda::RingServer#initialize): accept array
+	  arguments of address to specify multicast interface.
+
+	* lib/rinda/ring.rb (Rinda::RingServer#make_socket): add optional
+	  arguments for multicast interface.
+
+	* test/rinda/test_rinda.rb
+	  (TestRingFinger#test_ring_server_ipv4_multicast,
+	   TestRingFinger#test_ring_server_ipv6_multicast): add tests for
+	  above change.
+
+	* test/rinda/test_rinda.rb
+	  (TestRingServer#test_make_socket_ipv4_multicast,
+	   TestRingServer#test_make_socket_ipv6_multicast): change bound
+	  interface address because multicast address is not allowed on Linux
+	  or Windows.
+	  [ruby-core:53692] [Bug #8159]
+
+Thu Apr 25 23:45:02 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* lib/rinda/ring.rb (Rinda::RingServer#initialize): add a socket
+	  to @sockets in make_socket() to close sockets on shutdown even if
+	  make_socket() is called after initialize.
+
+	* lib/rinda/ring.rb (Rinda::RingServer#make_socket): ditto.
+
+Thu Apr 25 23:39:42 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/rinda/test_rinda.rb (TupleSpaceProxyTest#test_take_bug_8215):
+	  use KILL on Windows since TERM doen't work and ruby process remains
+	  after test-all on Windows.
+
+Thu Apr 25 23:16:28 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/extconf.rb: Implement
+	  --with-curses-version={function,variable} configure option for
+	  cross-compiling.
+
+Thu Apr 25 18:15:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Don't use WIDE getaddrinfo by default.
+
+Thu Apr 25 17:56:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Remove obsolete options: ---with-ipv6-lib and
+	  --with-ipv6-libdir.
+
+Thu Apr 25 17:43:49 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Implement
+	  --{enable,disable}-close-fds-by-recvmsg-with-peek configure option
+	  for cross-compiling.
+	  Make --{enable,disable}-wide-getaddrinfo configure option
+	  cross-compiling friendly.
+
+Thu Apr 25 16:11:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_ext_int_to_encs, parse_mode_enc): bom-prefixed name is
+	  not a real encoding name, just a fallback.  so the proper conversion
+	  should take place even if if the internal encoding is equal to the
+	  bom-prefixed name, unless actual encoding is equal to the internal
+	  encoding.  [ruby-core:54563] [Bug #8323]
+
+	* io.c (io_set_encoding_by_bom): reset extenal encoding if no BOM
+	  found.  [ruby-core:54569]
+
+Thu Apr 25 14:35:01 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): allow Fixnum and Bignum.
+	  [ruby-core:53986] [Feature #8217]
+
+Thu Apr 25 14:26:32 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI.decode_www_form): follow current URL Standard.
+	  It gets encoding argument to specify the character encoding.
+	  It now allows loose percent encoded strings, but denies ;-separator.
+	  [ruby-core:53475] [Bug #8103]
+
+	* lib/uri/common.rb (URI.decode_www_form): follow current URL Standard.
+	  It gets encoding argument to convert before percent encode.
+	  Now UTF-16 strings aren't converted to UTF-8 before percent encode
+	  by default.
+
+Wed Apr 25 14:26:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* benchmark/bm_hash_shift.rb: add benchmark for Hash#shift
+
+	* hash.c (rb_hash_shift): use st_shift if hash is not being iterated to
+	  delete element without iterating the whole hash.
+
+	* hash.c (shift_i): remove function
+
+	* include/ruby/st.h (st_shift): add st_shift function
+
+	* st.c (st_shift): ditto
+
+	[Bug #8312] [ruby-core:54524] Patch by funny-falcon
+
+Thu Apr 25 12:03:38 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Extract C programs as toplevel constants.
+
+Thu Apr 25 02:23:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_RM_RECURSIVE): this hack is needed by only
+	  autoconf 2.69 or earlier on darwin.
+
+Thu Apr 25 01:22:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tracer.rb (get_line): simply read by File.readlines.
+
+	* lib/debug.rb (script_lines): get source lines from SCRIPT_LINES__ or
+	  read from the file.
+
+	* lib/debug.rb (display_list): use script_lines instead of recursion.
+	  [Bug #8318]
+
+	* lib/debug.rb (line_at): use script_lines same as display_list.
+
+	* lib/debug.rb (display_list): Fix debug listing when called from the
+	  same file it has been required.  patch by Dario Bertini <berdario AT
+	  gmail.com> [Bug #8318] [fix GH-280]
+
+Wed Apr 24 21:51:13 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Check mblen().
+	  mblen() is optional in uClibc.
+
+	* eval_intern.h (CharNext): Don't use mblen() is not available.
+
+Wed Apr 24 15:55:06 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_fd_fix_cloexec): use rb_update_max_fd().
+
+Wed Apr 24 14:08:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* numeric.c: Fix wiki link on Float imprecision in overview, patched
+	  by Makoto Kishimoto [Bug #8304] [ruby-dev:47280]
+
+Wed Apr 24 14:03:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): disallow $- without following identifier
+	  character.  [ruby-talk:406969]
+
+	* parse.y (is_special_global_name): mere $- is not a valid global
+	  variable name.
+
+Wed Apr 24 13:54:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* string.c: Document String#setbyte return value by @gjmurakami-10gen
+	  [Fixes GH-294]
+
+Wed Apr 24 13:45:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* class.c: Example of Object#methods by @windwiny [Fixes GH-293]
+	* ruby.c: Document return values of Kernel #sub, #gsub, and #chop
+
+Wed Apr 24 12:54:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/socket/lib/socket.rb: Doc typos by @vipulnsward [Fixes GH-292]
+
+
+Wed Apr 24 12:54:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/socket/lib/socket.rb: Doc typos by @vipulnsward [Fixes GH-292]
+
+Wed Apr 24 12:27:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* array.c: Fix documentation for Array#index and #replace aliases
+	  Based on a patch by @phiggins [Fixes GH-282]
+
+Tue Apr 23 21:14:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_inspect): refix r40413, on Ruby 1.9 usual character
+	  escape uses hex/Unicode escapes, so fix to use Unicode escape on
+	  Unicode strings and hex on others. [ruby-core:54458] [Bug #8290]
+
+Tue Apr 23 20:10:02 2013  Tanaka Akira  <akr@fsij.org>
+
+	* missing/isnan.c (isnan): Don't define if isnan() macro is defined.
+	  This fixes a compilation failure on uClibc based Gentoo system.
+
+Tue Apr 23 17:40:40 2013  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/rexml/document.rb, lib/rexml/element.rb,
+	  lib/rexml/formatters/pretty.rb: remove opinionated
+	  language in documentation. [Bug #8309],
+	  reported by Charles Beckmann
+
+Tue Apr 23 14:04:44 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (getacl_response): parse the mailbox of an ACL
+	  response correctly.  [ruby-core:54365] [Bug #8281]
+
+Tue Apr 23 11:58:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_scrub): fix for UTF-32.  strlen() on strings
+	  contain NUL returns wrong result, use sizeof operator instead.
+	  [ruby-dev:45975] [Feature #6752]
+
+Tue Apr 23 10:26:50 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/ruby/test_module.rb
+	  (TestModule#test_const_get_invalid_name)
+	  (test_const_defined_invalid_name): Fix expected values.
+
+Tue Apr 23 09:51:26 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* string.c (rb_str_inspect): NUL should not be represented as "\0"
+	  when octal digits may follow.  [ruby-core:54458] [Bug #8290]
+
+Mon Apr 22 22:54:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* insns.def (opt_mod): Use % operator if both operands are positive for
+	  a significant performance improvement. Thanks to @samsaffron.
+
+Mon Apr 22 17:09:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): copy all instance variables not only generic
+	  ivars, before calling post proc.  [ruby-core:51163] [Bug #7627]
+
+Mon Apr 22 10:25:21 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* util.c (ruby_hdtoa): revert r29729.
+	  If you want ruby to behave as before on x86, specify to use SSE like
+	  -msse2 -mfpmath=sse for gcc.
+
+Sun Apr 21 23:19:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* configure.in: Revert using sigsetjmp by default due to performance
+	  problems on some systems (eg. older Linux)
+
+Sun Apr 21 21:35:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
+
+	* configure.in: Use sigsetjmp by default so jumping out of signal
+	  handlers properly restores the signal mask and SS_ONSTACK flag.
+	  [ruby-core:54175] [Bug #8254]
+
+	* configure.in: Manually check for presence of sigsetjmp. It is not a
+	  function on some systems, so AC_CHECK_FUNCS cannot be used.
+
+Sun Apr 21 08:00:55 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/csv/test_features.rb, test/logger/test_logger.rb
+	  test/mkmf/test_have_macro.rb, test/net/http/test_http.rb,
+	  test/openssl/test_config.rb, test/psych/test_encoding.rb,
+	  test/psych/test_exception.rb, test/psych/test_psych.rb,
+	  test/psych/test_tainted.rb, test/readline/test_readline.rb,
+	  test/rexml/test_contrib.rb, test/ruby/test_autoload.rb,
+	  test/ruby/test_beginendblock.rb, test/ruby/test_exception.rb,
+	  test/ruby/test_file.rb, test/ruby/test_io.rb,
+	  test/ruby/test_marshal.rb, test/ruby/test_process.rb,
+	  test/ruby/test_require.rb, test/ruby/test_rubyoptions.rb,
+	  test/syslog/test_syslog_logger.rb, test/webrick/test_httpauth.rb,
+	  test/zlib/test_zlib.rb: Use Tempfile.create.
+
+Sun Apr 21 00:15:36 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tempfile.rb (Tempfile.create): Close when the block exits.
+
+Sat Apr 20 23:38:14 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/httpauth/htpasswd.rb: Use Tempfile.create to avoid
+	  unintentional unlink() by the finalizer.
+	  lib/webrick/httpauth/htdigest.rb: Ditto.
+
+Sat Apr 20 22:47:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tempfile.rb (Tempfile.create): New method.
+	  The method name is proposed by Shugo Maeda.  [ruby-dev:47220]
+	  [ruby-core:41478] [Feature #5707]
+
+Sat Apr 20 14:22:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object): dump no ivars to the original by marshal_dump.
+	  [ruby-core:54334] [Bug #8276]
+
+	* marshal.c (r_object0): copy all ivars of marshal_dump data to the
+	  result object instead.  [ruby-core:51163] [Bug #7627]
+
+Sat Apr 20 02:33:27 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (str_scrub): add ruby method String#scrub which verify and
+	  fix invalid byte sequence. [ruby-dev:45975] [Feature #6752]
+
+	* string.c (str_compat_and_valid): check given string is compatible
+	  and valid with given encoding.
+
+	* transcode.c (str_transcode0): If invalid: :replace is specified for
+	  String#encode, replace invalid byte sequence even if the destination
+	  encoding equals to the source encoding.
+
+Fri Apr 19 21:55:40 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* README.EXT.ja (Data_Wrap_Struct): Remove a description about
+	  orphan argument. Oh, I renamed the argument name without
+	  changing description at r36180... Sorry....
+	  Patch by Makoto Kishimoto. Thanks!!! [ruby-dev:47269] [Bug #8292]
+	* README.EXT.ja (Data_Make_Struct): Add a sample code that describes
+	  how it works.
+	  Patch by Makoto Kishimoto. Thanks!!! [ruby-dev:47269] [Bug #8292]
+
+Fri Apr 19 17:54:57 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (body_type_msg): should accept
+	  message/delivery-status with extra data.
+	  [ruby-core:53741] [Bug #8167]
+
+	* test/net/imap/test_imap_response_parser.rb: related test.
+
+Fri Apr 19 13:03:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object): do not dump encoding which is dumped with
+	  marshal_dump data.  [ruby-core:54334] [Bug #8276]
+
+Fri Apr 19 11:36:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (stack_protector): control use of -fstack-protector.
+
+	* configure.in (debugflags): let -fstack-protector precede and disable
+	  debugflags, because they can't work together on SmartOS.  [Bug #8268]
+
+Fri Apr 19 07:43:52 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/openssl/test_cipher.rb: Correct a typo
+	  by jgls <joerg@joergleis.com>
+	  https://github.com/ruby/ruby/pull/291 fix GH-291
+
+Thu Apr 18 16:58:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_mod_public_method): fix visibility on anonymous
+	  module. set visibility of singleton method, not method in base
+	  class.  [ruby-core:54404] [Bug #8284]
+
+Thu Apr 18 16:20:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): should skip dot directories only for recursion,
+	  but should not if matching to the given pattern.  [ruby-core:54387]
+	  [Bug #8283]
+
+Thu Apr 18 16:20:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (pack_unpack): increase buffer size to fix buffer overflow,
+	  and fix garbage just after unpacking without missing paddings.
+	  [Bug #8286]
+
+Thu Apr 18 13:35:54 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* pack.c (pack_unpack): output characters even if the input doesn't
+	  have paddings. [Bug #8286]
+
+Thu Apr 18 08:20:48 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (clean-ext): remove timestamps.
+
+Wed Apr 17 22:07:50 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h (SOCKLEN_MAX): Expression simplified.
+
+Wed Apr 17 20:09:19 2013  Aman Gupta  <ruby@tmm1.net>
+
+	* compile.c (iseq_add_mark_object): Use new rb_iseq_add_mark_object().
+
+	* insns.def (setinlinecache): Ditto.
+
+	* iseq.c (rb_iseq_add_mark_object): New function to allocate
+	  iseq->mark_ary on demand. [Bug #8142]
+
+	* iseq.h (rb_iseq_add_mark_object): Ditto.
+
+	* iseq.c (prepare_iseq_build): Avoid allocating mark_ary until needed.
+
+	* iseq.c (rb_iseq_build_for_ruby2cext): Ditto.
+
+Wed Apr 17 20:00:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h (SOCKLEN_MAX): Defined.
+
+	* ext/socket/raddrinfo.c (ext/socket/raddrinfo.c): Reject too long
+	  Linux abstract socket name.
+
+Wed Apr 17 19:45:27 2013  Aman Gupta  <tmm1@ruby-lang.org>
+
+	* iseq.c (iseq_location_setup): re-use existing string when iseq has
+	  the same path and absolute_path. [Bug #8149]
+
+Wed Apr 17 11:38:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+	  UNASSIGNED is not a valid message.
+
+Wed Apr 17 10:58:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (sleep_timeval): get rid of overflow on Windows where
+	  timeval.tv_sec is not time_t but mere long.
+
+Tue Apr 16 23:07:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/unixsocket.c (unix_send_io): Suppress a warning by clang.
+	  (unix_recv_io): Ditto.
+
+Tue Apr 16 12:27:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/sdbm/init.c: Fix comment indentation, by windwiny [Fixes GH-277]
+
+Tue Apr 16 12:25:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/socket/option.c: Document synonymous methods, by windwiny [GH-277]
+	* ext/stringio/stringio.c: ditto
+	* ext/io/wait/wait.c: ditto
+	* ext/gdbm/gdbm.c: ditto
+	* ext/dl/cfunc.c: ditto
+	* ext/zlib/zlib.c: ditto
+	* ext/win32ole/win32ole.c: ditto
+	* ext/dbm/dbm.c: ditto
+	* ext/json/generator/generator.c: ditto
+	* ext/date/date_core.c: ditto
+
+Tue Apr 16 11:23:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/openssl/*: Document synonymous methods, by windwiny [GH-277]
+
+Mon Apr 15 22:21:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/fiddle/depend: New file.
+
+Mon Apr 15 22:01:02 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el (ruby-electric-insert): Check
+	  ruby-electric-is-last-command-char-expandable-punct-p here.
+
+	* misc/ruby-electric.el (ruby-electric-closing-char): New
+	  interactive function bound to closing characters.  Typing one of
+	  those closing characters right after the matching counterpart
+	  cancels the effect of automatic closing.  For example, typing
+	  "{" followed by "}" simply makes "{}" instead of "{ } }".
+
+Mon Apr 15 12:54:42 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* ext/openssl/ossl_ssl.c: Correct shutdown behavior w.r.t GC.
+
+	* test/openssl/test_ssl.rb: Add tests to verify correct behavior.
+
+	[Bug #8240] Patch provided by Shugo Maeda. Thanks!
+
+Mon Apr 15 10:23:39 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/coverage/depend: fix id.h place as r40283.
+
+	* ext/coverage/extconf.rb: add topdir and topsrcdir to VPATH.
+
+Sun Apr 14 19:46:14 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/-test-/debug/depend: New file.
+
+	* ext/-test-/exception/depend: Ditto.
+
+	* ext/-test-/printf/depend: Ditto.
+
+	* ext/-test-/string/depend: Ditto.
+
+	* ext/coverage/depend: Ditto.
+
+	* ext/io/console/depend: Ditto.
+
+	* ext/io/nonblock/depend: Ditto.
+
+	* ext/io/wait/depend: Ditto.
+
+	* ext/openssl/depend: Ditto.
+
+	* ext/pathname/depend: Ditto.
+
+	* ext/psych/depend: Ditto.
+
+	* ext/zlib/depend: Ditto.
+
+Sun Apr 14 02:46:50 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#create_makefile): remove {$(VPATH)} other
+	  than nmake.
+
+	* ext/ripper/depend: use VPATH expecting removed by above.
+
+Sat Apr 13 23:06:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (timestamp_file): gather timestamp files in one
+	  directory from each extension directories.
+
+Sat Apr 13 21:09:02 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#create_makefile): output new macro
+	  disthdrdir to specify the path of id.h, parse.h and etc.
+
+	* ext/ripper/depend: use above macro.
+
+Sat Apr 13 20:28:08 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Merge Onigmo 5.13.4 f22cf2e566712cace60d17f84d63119d7c5764ee.
+	  [bug] fix problem with optimization of \z (Issue #16) [Bug #8210]
+
+Sat Apr 13 18:56:15 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/ripper/depend: parse.h and id.h may be created on topdir.
+
+Sat Apr 13 12:08:16 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Add Vector#cross_product, patch by Luis Ezcurdia
+	  [fix GH-276] [rubyspec:81eec89a124]
+
+Sat Apr 13 10:20:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (rb_struct_define_without_accessor, rb_struct_define),
+	  (rb_struct_s_def): hide member names array.
+
+	* struct.c (anonymous_struct, new_struct, setup_struct): split
+	  make_struct() for each purpose.
+
+Sat Apr 13 09:34:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/mkmf.rb: Add ruby/ruby.h, ruby/missing.h, ruby/intern.h,
+	  ruby/st.h and ruby/subst.h for ruby_headers in generated Makefile.
+
+	* ext/-test-/old_thread_select/depend: Update dependencies.
+
+	* ext/-test-/wait_for_single_fd/depend: Ditto.
+
+	* ext/bigdecimal/depend: Ditto.
+
+	* ext/curses/depend: Ditto.
+
+	* ext/digest/bubblebabble/depend: Ditto.
+
+	* ext/digest/depend: Ditto.
+
+	* ext/digest/md5/depend: Ditto.
+
+	* ext/digest/rmd160/depend: Ditto.
+
+	* ext/digest/sha1/depend: Ditto.
+
+	* ext/digest/sha2/depend: Ditto.
+
+	* ext/dl/callback/depend: Ditto.
+
+	* ext/dl/depend: Ditto.
+
+	* ext/etc/depend: Ditto.
+
+	* ext/nkf/depend: Ditto.
+
+	* ext/objspace/depend: Ditto.
+
+	* ext/pty/depend: Ditto.
+
+	* ext/readline/depend: Ditto.
+
+	* ext/ripper/depend: Ditto.
+
+	* ext/sdbm/depend: Ditto.
+
+	* ext/socket/depend: Ditto.
+
+	* ext/stringio/depend: Ditto.
+
+	* ext/strscan/depend: Ditto.
+
+	* ext/syslog/depend: Ditto.
+
+	* ext/-test-/num2int/depend: Removed.
+
+	* ext/dbm/depend: Ditto.
+
+	* ext/fcntl/depend: Ditto.
+
+	* ext/gdbm/depend: Ditto.
+
+	* ext/racc/cparse/depend: Ditto.
+
+Sat Apr 13 00:15:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (Init_etc): move Passwd and Group under Etc namespace
+	  as primary names.
+
+Fri Apr 12 21:06:55 2013  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: pack.o depends on internal.h.
+
+Fri Apr 12 20:59:24 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (ones): Use __builtin_popcountl if available.
+
+	* internal.h (GCC_VERSION_SINCE): Macro moved from pack.c.
+
+	* pack.c: Include internal.h for GCC_VERSION_SINCE.
+
+Fri Apr 12 18:29:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: version.o depends on $(srcdir)/include/ruby/version.h
+	  instead of {$(VPATH)}version.h to avoid confusion by VPATH between
+	  top level version.h and include/ruby/version.h for build in-place.
+	  [ruby-dev:47249] [Bug #8256]
+
+Fri Apr 12 15:21:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_callee_setup_keyword_arg): non-symbol key is not
+	  a keyword argument, keep it as a positional argument.
+
+Fri Apr 12 11:58:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* array.c: Document synonymous methods, by windwiny [GH-277]
+	* bignum.c: ditto
+	* complex.c: ditto
+	* dir.c: ditto
+	* encoding.c: ditto
+	* enumerator.c: ditto
+	* numeric.c: ditto
+	* proc.c: ditto
+	* re.c: ditto
+	* string.c: ditto
+
+Thu Apr 11 23:41:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: Add dependencies for include/ruby.h
+
+	* tool/update-deps: Use "make -p all miniruby ruby golf" to extract
+	  dependencies in makefiles.
+
+Thu Apr 11 23:21:17 2013  Tanaka Akira  <akr@fsij.org>
+
+	* tool/update-deps: Use "make -p all golf" to extract dependencies in
+	  makefiles.
+
+Thu Apr 11 21:02:19 2013  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: Dependency updated.
+
+	* tool/update-deps: Rewritten.
+
+Thu Apr 11 19:59:48 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk: partially revert r40183, which breaks building on
+	  other than source directory. (its commit log also says the same
+	  thing, but such failure is not reproducible on my environment
+	  and the commit breaks build on my environment)
+
+Thu Apr 11 16:10:01 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/fiddle/closure.c (USE_FFI_CLOSURE_ALLOC): define 0 on
+	  Mac OS X and Linux [Bug #3371]
+
+Thu Apr 11 13:19:22 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/drb/drbtest.rb (Drb{Core,Ary}#teardown): retry Process.kill
+	  if it fails with Errno::EPERM on Windows (workaround).
+	  [ruby-dev:47245] [Bug #8251]
+
+Thu Apr 11 11:11:38 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* dir.c: Fix a typo.
+
+Thu Apr 11 10:39:34 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/fiddle/closure.c (USE_FFI_CLOSURE_ALLOC): add missing case:
+	  RUBY_LIBFFI_MODVERSION is not defined (usually on Windows).
+
+Thu Apr 11 09:27:04 2013  Konstantin Haase  <me@rkh.im>
+
+	* dir.c (file_s_fnmatch): Document File::FNM_EXTGLOB flag.
+
+Thu Apr 11 09:17:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* README: Fix typo by Benjamin Winkler [Fixes GH-281]
+
+Thu Apr 11 06:15:51 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regint.h: fix typo: _M_AMD86 -> _M_AMD64.
+
+	* siphash.c: ditto.
+
+	* st.c: ditto.
+
+Thu Apr 11 06:09:57 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/fiddle/extconf.rb: define RUBY_LIBFFI_MODVERSION macro.
+
+	* ext/fiddle/closure.c (USE_FFI_CLOSURE_ALLOC): define 0 or 1
+	  with platform and libffi's version. [Bug #3371]
+
+Thu Apr 11 05:30:43 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/mkmf.rb (pkg_config): Add optional argument "option".
+	  If it is given, it returns the result of
+	  `pkg-config --<option> <pkgname>`.
+
+Thu Apr 11 03:33:05 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/fiddle/closure.c (initialize): check mprotect's return value.
+	  If mprotect is failed because of PaX or something, its function call
+	  will cause SEGV.
+	  http://c5664.rubyci.org/~chkbuild/ruby-trunk/log/20130401T210301Z.diff.html.gz
+
+Wed Apr 10 17:39:13 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/bigdecimal/bigdecimal.c (VpCtoV): Initialize a local variable
+	  even when overflow.
+
+Wed Apr 10 12:32:37 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_ll2big): Don't overflow on signed integer negation.
+
+	* ext/bigdecimal/bigdecimal.c (MUL_OVERFLOW_SIGNED_VALUE_P): New
+	  macro.
+	  (AddExponent): Don't overflow on signed integer multiplication.
+	  (VpCtoV): Don't overflow on signed integer arithmetic.
+	  (VpCtoV): Don't overflow on signed integer arithmetic.
+
+Wed Apr 10 06:32:12 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (MUL_OVERFLOW_INT_P): New macro.
+
+	* sprintf.c (GETNUM): Don't overflow on signed integer multiplication.
+
+Tue Apr  9 20:38:20 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (MUL_OVERFLOW_SIGNED_INTEGER_P): New macro.
+	  (MUL_OVERFLOW_FIXNUM_P): Ditto.
+	  (MUL_OVERFLOW_LONG_P): Ditto.
+
+	* array.c (rb_ary_product): Don't overflow on signed integer
+	  multiplication.
+
+	* numeric.c (fix_mul): Ditto.
+	  (int_pow): Ditto.
+
+	* rational.c (f_imul): Ditto.
+
+	* insns.def (opt_mult): Ditto.
+
+	* thread.c (sleep_timeval): Don't overflow on signed integer addition.
+
+	* bignum.c (rb_int2big): Don't overflow on signed integer negation.
+	  (rb_big2ulong): Ditto.
+	  (rb_big2long): Ditto.
+	  (rb_big2ull): Ditto.
+	  (rb_big2ll): Ditto.
+
+Tue Apr  9 19:45:44 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb: Support multiple fields with same field
+	  name (like Set-Cookie).
+	  (OpenURI::Meta#metas): New accessor to obtain fields as a Hash from
+	  field name (string) to field values (array of strings).
+	  [ruby-core:37734] [Bug #4964] reported by ren li.
+
+Tue Apr  9 15:26:12 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): append keyword hash to argument array
+	  to splat if needed.  [ruby-core:54094] [Bug #8236]
+
+Tue Apr  9 10:02:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (timestamp_file): gather timestamp files in one
+	  directory from each extension directories, with considering
+	  target_prefix.
+
+Tue Apr  9 04:57:59 JST 2013  Charles Oliver Nutter  <headius@headius.com>
+
+	* error.c: Capture EAGAIN, EWOULDBLOCK, EINPROGRESS exceptions and
+	  export them for use in WaitReadable/Writable exceptions.
+	* io.c: Create versions of EAGAIN, EWOULDBLOCK, EINPROGRESS that
+	  include WaitReadable and WaitWritable. Add rb_readwrite_sys_fail
+	  for nonblocking failures using those exceptions. Use that
+	  function in io_getpartial and io_write_nonblock instead of
+	  rb_mod_sys_fail
+	* ext/openssl/ossl_ssl.c: Add new SSLError subclasses that include
+	  WaitReadable and WaitWritable. Use those classes for
+	  write_would_block and read_would_block instead of rb_mod_sys_fail.
+	* ext/socket/ancdata.c: Use rb_readwrite_sys_fail instead of
+	  rb_mod_sys_fail in bsock_sendmsg_internal and
+	  bsock_recvmsg_internal.
+	* ext/socket/init.c: Use rb_readwrite_sys_fail instead of
+	  rb_mod_sys_fail in rsock_s_recvfrom_nonblock and
+	  rsock_s_connect_nonblock.
+	* ext/socket/socket.c: Use rb_readwrite_sys_fail instead of
+	  rb_mod_sys_fail in sock_connect_nonblock.
+	* include/ruby/ruby.h: Export rb_readwrite_sys_fail for use instead
+	  of rb_mod_sys_fail. Introduce new constants RB_IO_WAIT_READABLE and
+	  RB_IO_WAIT_WRITABLE for first arg to rb_readwrite_sys_fail.
+
+Tue Apr  9 02:44:32 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/extconf.rb: $defs needs -D or -U.  nothing is added
+	  otherwize.
+
+	* ext/socket/extconf.rb: check struct in_addr6, which is defined in
+	  VC6 instead of in6_addr.
+
+	* ext/socket/option.c (optname_to_sym): fix macro name.
+
+	* ext/socket/constants.c (rsock_cmsg_type_arg): fix macro name.
+
+Mon Apr  8 23:57:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (id_for_setter): extract common code from const, class
+	  variable, instance variable setters.
+
+Mon Apr  8 23:55:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/depend (ENCOBJS, TRANSOBJS): use explicit path to ruby.h for
+	  nmake.
+
+	* ext/depend (ENCOBJS, TRANSOBJS): fix header dependency, VPATH has
+	  $(srcdir)/include/ruby but not $(srcdir)/include, so cannot find out
+	  ruby/ruby.h.  use ruby.h instead and ../ruby for include/ruby.h.
+
+Mon Apr  8 20:30:37 2013  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* ext/depend (ENCOBJS, TRANSOBJS): Add missing dependencies.
+
+Mon Apr  8 17:19:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c (fole_missing): should check actual argument
+	  count before accessing.
+
+Mon Apr  8 16:03:55 2013  Yuki Yugui Sonoda  <yugui@google.com>
+
+	Fixes a build failure of ext/ripper/ripper.c on building out of place.
+	* common.mk (id.h, id.c): Always generated in $(srcdir).
+	(ext/ripper/ripper.c): Passes $(PATH_SEPARATOR) too to the sub make.
+
+Mon Apr  8 12:05:02 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* object.c (rb_obj_ivar_set): call to_str for string only once.
+	  to_str was called from rb_is_const_name and rb_to_id before.
+
+	* object.c (rb_mod_const_set): ditto.
+
+	* object.c (rb_mod_cvar_set): ditto.
+
+Sun Apr  7 13:56:16 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
+	  RUBY_PLATFORM should escape as Regexp,
+	  because RUBY_PLATFORM may contain '.'.
+
+Sun Apr  7 10:44:01 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/defines.h: Simplify the logic to include sys/select.h.
+	  This fixes a compilation error on Haiku (gcc2 and gcc4).
+
+	* configure.in: Use shared linker as $(CC) for Haiku.
+	  This fixes a build error on Haiku (gcc2).
+
+Sun Apr  7 10:41:30 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (MDNSOneShot#sender): Delete an unused variable.
+
+Sun Apr  7 03:24:36 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c: use more generic type:
+	  * u_char -> unsigned char
+	  * u_short -> unsigned short
+	  * u_int -> unsigned int
+	  * u_long -> unsigned long
+	  * quad_t -> int64_t
+	  * u_quad_t -> uint64_t
+
+	* addr2line.c (imax): inline is defined by configure.
+
+Sun Apr  7 01:40:39 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el (ruby-electric-hash): New electric
+	  function that expands a hash sign inside a string or regexp to
+	  "#{}".
+
+	* misc/ruby-electric.el (ruby-electric-curlies): Do not insert
+	  spaces inside when the curly brace is a delimiter of %r, %w,
+	  etc.
+
+	* misc/ruby-electric.el (ruby-electric-curlies): Insert another
+	  space before a closing curly brace when
+	  ruby-electric-newline-before-closing-bracket is nil.
+
+Sun Apr  7 01:01:26 2013  Tanaka Akira  <akr@fsij.org>
+
+	* strftime.c (rb_strftime_with_timespec): Test yday range.
+	  [ruby-core:44088] [Bug #6247] reported by Ruby Submit.
+
+Sat Apr  6 23:46:54 2013  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* configure.in (AC_CHECK_HEADERS): atomic.h for Solaris atomic_ops.
+
+	* ruby_atomic.h: Skip using Solaris10 atomic_ops on Solaris 9 or
+	  earlier if atomic.h is not available. [ruby-dev:47229] [Bug #8228]
+
+Sat Apr  6 23:40:40 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb: Support LOC resources.
+	  [ruby-core:23361] [Feature #1436] by JB Smith.
+
+Sat Apr  6 23:38:09 2013  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* addr2line.c: quad_t and u_quad_t is not available on Solaris.
+	  __inline is not available with old compilers on Solaris.
+	  [ruby-dev:47229] [Bug #8227]
+
+Sat Apr  6 23:31:38 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb: Add one-shot multicast DNS support.
+	  [ruby-core:53387] [Feature #8089] by Eric Hodel.
+
+Sat Apr  6 22:12:01 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS.fetch_resource): New method to obtain
+	  full result.
+	  [ruby-dev:43587] [Feature #4788] proposed by Makoto Kishimoto.
+
+Sat Apr  6 20:17:51 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rsock_sys_fail_raddrinfo): Renamed from
+	  rsock_sys_fail_addrinfo.
+	  (rsock_sys_fail_raddrinfo_or_sockaddr): Renamed from
+	  rsock_sys_fail_addrinfo_or_sockaddr.
+
+	* ext/socket/rubysocket.h: Follow the above change.
+
+Sat Apr  6 19:24:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rsock_sys_fail_sockaddr): Takes struct sockaddr
+	  and socklen_t instead of String object.
+	  (rsock_sys_fail_addrinfo_or_sockaddr): Follow the above change.
+
+	* ext/socket/rubysocket.h (rsock_sys_fail_sockaddr): Follow the above
+	  change.
+
+Sat Apr  6 14:28:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h (SockAddrStringValueWithAddrinfo): New macro.
+	  (rsock_sockaddr_string_value_with_addrinfo): New declaration.
+	  (rsock_addrinfo_inspect_sockaddr): Ditto.
+	  (rsock_sys_fail_addrinfo): Ditto.
+	  (rsock_sys_fail_sockaddr_or_addrinfo): Ditto.
+
+	* ext/socket/raddrinfo.c (rsock_addrinfo_inspect_sockaddr): Renamed
+	  from addrinfo_inspect_sockaddr and exported.
+	  (rsock_sockaddr_string_value_with_addrinfo): New function to obtain
+	  string and possibly addrinfo object.
+
+	* ext/socket/socket.c (rsock_sys_fail_sockaddr): Don't use
+	  rsock_sys_fail_host_port which is IP dependent.  Invoke
+	  rsock_sys_fail_addrinfo.
+	  (rsock_sys_fail_addrinfo): New function using
+	  rsock_addrinfo_inspect_sockaddr.
+	  (rsock_sys_fail_addrinfo_or_sockaddr): New function.
+	  (sock_connect): Use SockAddrStringValueWithAddrinfo and
+	  rsock_sys_fail_addrinfo_or_sockaddr.
+	  (sock_connect_nonblock): Ditto.
+	  (sock_bind): Ditto.
+
+Sat Apr  6 13:34:20 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rsock_sys_fail_sockaddr): Delete 2nd argument.
+
+	* ext/socket/rubysocket.h (rsock_sys_fail_sockaddr): Follow above
+	  change.
+
+Sat Apr  6 13:13:39 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rsock_sys_fail_path): Use rb_str_inspect only
+	  for String to avoid SEGV.
+
+Sat Apr  6 12:40:16 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h (rsock_sys_fail_host_port): Wrap by NORETURN.
+	  (rsock_sys_fail_path): Ditto.
+	  (rsock_sys_fail_sockaddr): Ditto.
+
+Sat Apr  6 11:49:35 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (rsock_sys_fail_path): Use rb_str_inspect if the
+	  path contains a NUL.
+
+Sat Apr  6 11:39:19 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: Improve socket exception message to show socket address.
+	  [ruby-core:45617] [Feature #6583] proposed Eric Hodel.
+
+	* ext/socket/rubysocket.h (rsock_sys_fail_host_port): Declared.
+	  (rsock_sys_fail_path): Ditto.
+	  (rsock_sys_fail_sockaddr): Ditto.
+
+	* ext/socket/udpsocket.c (udp_connect): Use rsock_sys_fail_host_port.
+	  (udp_bind): Ditto.
+	  (udp_send): Ditto.
+
+	* ext/socket/init.c (rsock_init_sock): Specify a string for rb_sys_fail
+	  argument.
+	  (make_fd_nonblock): Ditto.
+	  (rsock_s_accept): Ditto.
+
+	* ext/socket/ipsocket.c (init_inetsock_internal): Use
+	  rsock_sys_fail_host_port.
+
+	* ext/socket/socket.c (rsock_sys_fail_host_port): Defined.
+	  (rsock_sys_fail_path): Ditto.
+	  (rsock_sys_fail_sockaddr): Ditto.
+	  (setup_domain_and_type): Use rsock_sys_fail_sockaddr.
+	  (sock_connect_nonblock): Ditto.
+	  (sock_bind): Ditto.
+	  (sock_gethostname): Specify a string for rb_sys_fail argument.
+	  (socket_s_ip_address_list): Ditto.
+
+	* ext/socket/basicsocket.c (bsock_shutdown): Specify a string for
+	  rb_sys_fail argument.
+	  (bsock_setsockopt): Use rsock_sys_fail_path.
+	  (bsock_getsockopt): Ditto.
+	  (bsock_getpeereid): Refine the argument for rb_sys_fail.
+
+	* ext/socket/unixsocket.c (rsock_init_unixsock): Use
+	  rsock_sys_fail_path.
+	  (unix_path): Ditto.
+	  (unix_send_io): Ditto.
+	  (unix_recv_io): Ditto.
+	  (unix_addr): Ditto.
+	  (unix_peeraddr): Ditto.
+
+Sat Apr  6 11:23:18 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
+	  fix load path for encoding to run the test as stand-alone.
+
+Sat Apr  6 09:54:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (NATINT_LEN): fix definition order, must be after
+	  NATINT_PACK.
+
+Sat Apr  6 03:11:07 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix symbol keys in coder
+	  emission.  Thanks @tjwallace
+	* test/psych/test_coder.rb: test for change
+
+Sat Apr  6 02:54:08 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/exception.rb: there should be only one exception
+	  base class. Fixes tenderlove/psych #125
+	* ext/psych/lib/psych.rb: require the correct exception class
+	* ext/psych/lib/psych/syntax_error.rb: ditto
+	* ext/psych/lib/psych/visitors/to_ruby.rb: ditto
+
+Sat Apr  6 02:30:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (new_defined): remove all extra parentheses, and return
+	  "nil" for defined? with empty expression.
+	  [ruby-core:54024] [Bug #8224]
+
+Sat Apr  6 02:06:04 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: correctly register
+	  self-referential strings. Fixes tenderlove/psych #135
+
+	* test/psych/test_string.rb: appropriate test.
+
+Sat Apr  6 01:21:56 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/init.c (cloexec_accept): Fix a compile error on
+	  Debian GNU/kFreeBSD.  Consider HAVE_ACCEPT4 is defined
+	  but SOCK_CLOEXEC is not defined.
+
+Sat Apr  6 00:19:30 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* load.c (features_index_add): use rb_str_subseq() to specify C string
+	  position properly to fix require non ascii path.
+	  [ruby-core:53733] [Bug #8165]
+
+	* test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
+	  a test for the above.
+
+Fri Apr  5 20:41:49 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/defines.h (HAVE_TRUE_LONG_LONG): Defined to distinguish
+	  availability of long long and availability of 64bit integer type.
+
+	* pack.c: Use HAVE_TRUE_LONG_LONG to distinguish q! and Q! support.
+
+Fri Apr  5 20:19:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* addr2line.c: Include ruby/missing.h to fix compile error on Debian.
+
+Fri Apr  5 19:39:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): fix of defined? with empty
+	  expression.  [ruby-core:53999] [Bug #8220]
+
+Fri Apr  5 13:22:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/curses/curses.c (Init_curses): fix implementation function,
+	  crmode should be same as cbreak.  [ruby-core:54013] [Bug #8222]
+
+Fri Apr  5 12:06:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/curses/hello.rb: Typo in Curses example by Drew Blas
+	  [Fixes GH-273]
+
+Thu Apr  4 23:45:13 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (bind_random_port): Rescue EACCES for SunOS.
+	  bind() on SunOS for port 2049 (nfs) and 4045 (lockd) causes
+	  EACCES with unprivileged process.  cf. PRIV_SYS_NFS in privileges(5)
+	  [ruby-core:48064] [Bug #7183] reported by Frank Meier.
+
+Thu Apr  4 23:24:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Remove condition for bcc.
+
+Thu Apr  4 22:53:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (FIX2LONG): Parenthesize the macro body.
+
+Thu Apr  4 22:32:32 2013  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_strftime): Describe %L and %N truncates digits under
+	  the specified length.
+	  [ruby-core:52130] [Bug #7829]
+
+Thu Apr  4 22:08:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* object.c (rb_mod_cvar_set): Reverted "avoid inadvertent
+	  symbol creation" to avoid SEGV by
+	  Class.new.class_variable_set(1, 2).
+
+Thu Apr  4 20:07:19 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_write): New method.
+	  (path_binwrite): Ditto.
+	  [ruby-core:49468] [Feature #7378]
+
+Thu Apr  4 16:51:29 2013  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* thread_pthread.c: Fixes wrong scopes of #if USE_SLEEPY_TIMER_THREAD
+	  .. #endif sections.  This fixes a build error on NativeClient.
+
+Wed Apr  3 17:25:31 2013  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* thread_pthread.c (ruby_init_stack): Avoid using uninitialized value.
+	  stackaddr and size are not set if get_stack() fails.
+
+Thu Apr  4 16:55:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (make_struct): avoid inadvertent symbol creation.
+	  (rb_struct_aref): ditto.
+	  (rb_struct_aset): ditto.
+
+Thu Apr  4 16:54:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_const_set): avoid inadvertent symbol creation.
+	  (rb_obj_ivar_set): ditto.
+	  (rb_mod_cvar_set): ditto.
+
+Thu Apr  4 15:46:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_inject): avoid inadvertent symbol creation.
+
+Thu Apr  4 14:37:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_aref): avoid inadvertent symbol creation.
+	  (rb_thread_variable_get): ditto.
+	  (rb_thread_key_p): ditto.
+	  (rb_thread_variable_p): ditto.
+
+Thu Apr  4 11:33:57 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_bn.c (ossl_bn_to_i): Use bn2hex to speed up.
+	  In general, binary to/from decimal needs extra cost.
+
+Thu Apr  4 07:24:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Specify arguments to test functions.
+
+Thu Apr  4 03:25:09 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): fix can't create from bn.
+
+Wed Apr  3 22:09:25 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Test functions and libraries after headers.
+
+Wed Apr  3 21:23:29 2013  Tanaka Akira  <akr@fsij.org>
+
+	 * io.c (rb_io_seek_m): Accept :CUR, :END, :SET as "whence" argument.
+	   (interpret_seek_whence): New function.
+	   [ruby-dev:45818] [Feature #6643]
+
+Wed Apr  3 20:52:49 2013  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: Describe the behavior which Ruby invokes a commandline
+	  directly without shell if the commandline is simple enough.
+	  [ruby-core:50459] [Bug #7489]
+
+Wed Apr  3 20:27:37 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/extmk.rb (extmake): Invoke Logging::log_close in a ensure
+	  clause.
+
+Wed Apr  3 18:53:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/extmk.rb (extmake): Use Logging.open to switch stdout and
+	  stderr.  Delay Logging::log_close until the failure message is
+	  written.  Write the failure message only if log file is opened.
+
+	* lib/mkmf.rb (Logging.log_opened?): New method.
+
+	  [ruby-dev:47215] [Bug #8209]
+
+Wed Apr  3 17:11:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (constat_apply): pass through unknown sequence which
+	  starts with ESC but is not followed by a bracket.  [ruby-core:53879]
+	  [Bug #8201]
+
+Wed Apr  3 16:35:32 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_eq): hide intermediate Bignums not just freeing
+	  memory.  [ruby-core:53893] [Bug #8204]
+
+	* object.c (rb_obj_hide): hide an object by clearing klass.
+
+	* bignum.c (rb_big_eq): test as Fixnum if possible and get rid of zero
+	  length Bignum.  [ruby-core:53893] [Bug #8204]
+
+Tue Apr  2 23:56:03 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb (SecureRandom.random_bytes): Use
+	  OpenSSL::Random.random_add instead of OpenSSL::Random.seed and
+	  specify 0.0 as the entropy.
+	  [ruby-core:47308] [Bug #6928]
+
+Tue Apr  2 20:24:52 2013  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c: Support Q! and q! for long long.
+	  (natstr): Moved to toplevel.  Add q and Q if there is long long type.
+	  (endstr): Moved to toplevel.
+	  (NATINT_PACK): Consider long long.
+	  (NATINT_LEN_Q): New macro.
+	  (pack_pack): Support Q! and q!.
+	  (pack_unpack): Ditto.
+	  [ruby-dev:43970] [Feature #3946]
+
+Tue Apr  2 19:24:26 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/-test-/num2int/num2int.c: Define utility methods
+	  as module methods of Num2int.
+
+	* test/-ext-/num2int/test_num2int.rb: Follow the above change.
+
+Tue Apr  2 18:49:01 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/securerandom.rb: Don't use Array#to_s.
+	   [ruby-core:52058] [Bug #7811] fixed by zzak (Zachary Scott).
+
+Tue Apr  2 17:38:20 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_to_s): suppress duplicated charclass warning.
+	  Regexp#to_s suppress extra its whole regexp options by calling
+	  onig_new with its source, but it doesn't call rb_reg_preprocess.
+	  Therefore its Unicode escapes (\u{XXXX}) are given as is,
+	  and it may cause duplicated charclass warning for example
+	  "[\u{33}]" (3 is duplicated) or "[\u{a}\u{b}]" (u is duplicated).
+	  [ruby-core:53649] [Bug #8151]
+
+Tue Apr  2 16:00:06 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_dump.c (rb_print_backtrace): separate to ease showing C backtrace.
+
+	* internal.h (rb_print_backtrace): ditto.
+
+Tue Apr  2 15:22:09 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/envutil.rb (assert_separately): stop_auto_run of
+	  Test::Unit::Runner to prevent auto runner use ARGV.
+
+	* test/ruby/envutil.rb (assert_separately): add $: to separate process.
+
+	* test/ruby/envutil.rb (assert_separately): fail if stderr is not
+	  empty and ignore_stderr is false.
+
+Tue Apr  2 06:46:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/-test-/num2int/num2int.c: Rename utility methods
+	  to global functions to ease manual experiments.
+
+	* test/-ext-/num2int/test_num2int.rb: Follow the above change.
+
+Mon Apr  1 22:26:17 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/zlib/zlib.c (rb_gzfile_set_mtime): Use NUM2UINT.
+	  The old logic doesn't work well on LP64 platforms as:
+	  .. -2**63-1 => error,
+	  -2**63 .. -2**62-1 => success,
+	  -2**62 .. -2**31-1 => error,
+	  -2**31 .. 2**31-1 => success,
+	  2**31 .. 2**62-1 => error,
+	  2**62 .. 2**64-1 => success,
+	  2**64 ..  => error.
+
+Mon Apr  1 22:08:02 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* ext/zlib/zlib.c (Zlib::Inflate.new):
+	  Fix documentation syntax and naming errors.
+	  Based on patch by Robin Dupret. Fix GH-271.
+
+Mon Apr  1 21:22:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/-ext-/num2int/test_num2int.rb: Test small bignums.
+
+Mon Apr  1 21:10:56 2013  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_num2ulong_internal): Don't cast a negative double value
+	  into unsigned long, which is undefined behavior.
+	  (rb_num2ull): Don't cast a value bigger than LLONG_MAX into
+	  long long, which is undefined behavior.
+
+Mon Apr  1 20:57:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/-test-/num2int/num2int.c: Return string for result, instead of
+	  printing.
+
+	* test/-ext-/num2int/test_num2int.rb: updated to follow above change.
+
+Mon Apr  1 20:08:07 2013  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_num2long): Don't use SIGNED_VALUE uselessly.
+	  (check_int): Ditto.
+	  (check_short): Ditto.
+	  (rb_num2fix): Ditto.
+	  (rb_num2ulong_internal): Add a cast.
+
+Mon Apr  1 18:41:35 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: skip autoconf 2.64 and 2.66, 2.67 seems short-lived
+	  but stick on it for Debian Squeeze.
+
+Mon Apr  1 14:22:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check clang version by predefined macro values.
+	  [Bug #8192]
+
+Mon Apr  1 12:05:15 2013  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (check_uint): Take the 1st argument as unsigned long,
+	  instead of VALUE.  Refine the validity test conditions.
+	  (check_ushort): Ditto.
+
+Mon Apr  1 07:15:03 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* configure.in: use quadrigraph to put '[' or ']'. [Bug #8192]
+
+Mon Apr  1 04:16:41 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: kick old clang. [ruby-dev:47204] [Bug #8192]
+
+Mon Apr  1 01:12:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (FIX2ULONG): Make it consistent with NUM2ULONG.
+
+	* ext/-test-/num2int/num2int.c: Add utility methods for FIX2XXX tests.
+
+	* test/-ext-/num2int/test_num2int.rb: Add tests for FIX2XXX.
+
+Sun Mar 31 17:17:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_mod_define_method): consider visibility in define_method.
+	  patch by mashiro <mail AT mashiro.org>.  fix GH-268.
+
+Sun Mar 31 15:40:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/configure.bat: try to fix option arguments split by commas and
+	  equals here.  this batch file no longer run with old command.com.
+
+	* tool/mkconfig.rb: no hacks for cmd.exe.
+
+Sun Mar 31 13:47:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_num2ulong_internal): New function similar to
+	  rb_num2ulong but integer wrap around flag is also returned.
+	  (rb_num2ulong): Use rb_num2ulong_internal.
+	  (rb_num2uint): Use rb_num2ulong_internal and the wrap around flag is
+	  used instead of negative_int_p(val).
+	  (rb_num2ushort): ditto.
+
+Sun Mar 31 06:27:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (HAVE_METACLASS_P): should check FL_SINGLETON flag before get
+	  instance variable to get rid of wrong warning about __attached__.
+	  [ruby-core:53839] [Bug #8188]
+
+Sat Mar 30 14:11:28 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* bcc32: removed. agreed at
+	  http://bugs.ruby-lang.org/projects/ruby/wiki/DevelopersMeeting20130223Japan
+
+Sat Mar 30 03:58:00 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/file.c (code_page): use cp1252 instead of cp20127 as US-ASCII.
+	  fix [ruby-core:53079] [Bug #7996]
+	  reported and patched by mmeltner (Michael Meltner).
+
+Sat Mar 30 03:49:21 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (wrename): use MoveFileExW instead of MoveFileW,
+	  because the latter fails on cross device file move of some
+	  environments.
+	  fix [ruby-core:53492] [Bug #8109]
+	  reported by mitchellh (Mitchell Hashimoto).
+
+Fri Mar 29 22:09:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_mutex_synchronize_m): yield no block params.  patch by
+	  splattael (Peter Suschlik) in [ruby-core:53773] [Bug #8097].
+	  fix GH-266.
+
+Fri Mar 29 16:51:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_next_argv): set init flag if succeeded to forward, after
+	  skipping.
+
+	* io.c (argf_block_call_i, argf_block_call): no more forwarding if
+	  forwarded after skipping.  [ruby-list:49185]
+
+	* io.c (argf_close): deal with init flag.
+
+	* io.c (argf_block_call_i, argf_block_call): forward next file if
+	  skipped while iteration, to get rid of IOError.  [ruby-list:49185]
+
+Fri Mar 29 11:09:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (configuration): not include all CFLAGS in CXXFLAGS, to
+	  use different set than C for C++.  [ruby-core:45273] [Bug #6504]
+
+Fri Mar 29 10:24:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/io.h: undef POSIX compliant names on AIX, which are no
+	  longer needed.  patch suggested by edelsohn (David Edelsohn) in
+	  [ruby-core:53815].  [Bug #8174]
+
+Fri Mar 29 06:39:42 2013  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_num2ull): Cast double to unsigned LONG_LONG via
+	  LONG_LONG instead of double to unsigned LONG_LONG directly.
+	  This is a challenge to fix a test_num2ull(TestNum2int)
+	  failure (NUM2ULL(-1.0) should be "18446744073709551615" but was "0")
+	  on Mac OS X with 32bit clang.
+	  http://a.mrkn.jp/~mrkn/chkbuild/mountain_lion/ruby-trunk-m32-o0/log/20130328T191100Z.diff.html.gz
+
+Fri Mar 29 00:54:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MAIN_DOES_NOTHING): ensure symbols for tests to be
+	  preserved.  [ruby-core:53745] [Bug #8169]
+
+Thu Mar 28 23:11:25 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb: Test Windows platform by detecting LoadError when
+	  require 'win32/resolv' suggested by Nobuyoshi Nakada [ruby-core:53389].
+	  [ruby-core:53388] [Feature #8090] Reported by Charles Nutter.
+
+Thu Mar 28 23:10:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/io.h: rename SVR3,4 member names as POSIX compliant,
+	  to get rid of conflict on AIX.  [ruby-core:53765] [Bug #8174]
+
+Thu Mar 28 18:22:21 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/-ext-/num2int/test_num2int.rb: extract
+	  assert_num2i_success_internal and assert_num2i_error_internal and
+	  provide assertion messages as "NUM2XXX(NNN)".
+
+Thu Mar 28 07:05:25 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h: Delete redundant inclusions caused by
+	  AC_INCLUDES_DEFAULT in defines.h.
+
+	* include/ruby/defines.h: Ditto.
+
+	* include/ruby/ruby.h: Ditto.
+
+	* include/ruby/st.h: Ditto.
+
+Thu Mar 28 06:51:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/defines.h: Fix a compilation error on NetBSD,
+	  "type of formal parameter 1 is incomplete" for the rb_thread_wait_for
+	  invocation in rb_file_flock, by including header files as
+	  AC_INCLUDES_DEFAULT of autoconf.
+
+Wed Mar 27 22:09:14 2013  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (LONG_MIN_MINUS_ONE_IS_LESS_THAN): New macro.
+	  (LLONG_MIN_MINUS_ONE_IS_LESS_THAN): Ditto.
+	  (rb_num2long): Use LONG_MIN_MINUS_ONE_IS_LESS_THAN.
+	  (rb_num2ulong): Ditto.
+	  (rb_num2ll): Use LLONG_MIN_MINUS_ONE_IS_LESS_THAN.
+	  (rb_num2ull): Ditto.
+
+	* test/-ext-/num2int/test_num2int.rb (assert_num2i_success): Test the
+	  value converted into a Float if Float can represent the value
+	  exactly.
+	  (assert_num2i_error): Ditto.
+
+Wed Mar 27 20:59:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/-ext-/num2int/test_num2int.rb (assert_num2i_success): New
+	  utility method.
+	  (assert_num2i_error): Ditto.
+
+Wed Mar 27 20:37:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (num_exact): Use to_r method only if to_int method is
+	  available.
+	  [ruby-core:53764] [Bug #8173] Reported by Hiro Asari.
+
+Wed Mar 27 12:07:40 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/-ext-/num2int/test_num2int.rb (test_num2ll): test LLONG_MIN,
+	  not LONG_MIN.
+
+Wed Mar 27 12:02:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (TIMET_MAX_PLUS_ONE): definition simplified.
+
+Wed Mar 27 06:39:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MAIN_DOES_NOTHING): force to refer symbols for tests
+	  to be preserved.  [ruby-core:53745] [Bug #8169]
+
+Wed Mar 27 05:15:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_REPLACE_TYPE): define SIGNEDNESS_OF_type same as
+	  check_signedness of mkmf.rb.
+
+	* internal.h (TIMET_MAX, TIMET_MIN, TIMET_MAX_PLUS_ONE): use
+	  SIGNEDNESS_OF_TIME_T.
+
+Wed Mar 27 00:28:45 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (TIMET_MAX_PLUS_ONE): Defined.
+
+	* thread.c (double2timeval): Saturate out-of-range values.
+
+Tue Mar 26 23:41:18 2013  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h: Define TIMET_MAX and TIMET_MIN here.
+
+	* time.c: Remove TIMET_MAX and TIMET_MIN definitions.
+
+	* thread.c: Ditto.
+
+	* thread_pthread.c: Remove TIMET_MAX definition.
+
+	* thread_win32.c: Ditto.
+
+Tue Mar 26 22:31:10 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sockaddr_len): return the shortest length for
+	  unknown socket address.
+
+Tue Mar 26 22:14:46 2013  Tanaka Akira  <akr@fsij.org>
+
+	* thread.c (double2timeval): convert the infinity to TIME_MAX to avoid
+	  SEGV by Thread.new {}.join(Float::INFINITY) on
+	  Debian GNU/Linux (amd64).
+
+Mon Mar 25 07:09:20 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rinda/tuplespace.rb:  Only return tuple entry once on move,
+	  either through port or regular return, not both.  This results in a
+	  120% speedup when combined with #8125.  Patch by Joel VanderWerf.
+	  [ruby-trunk - Feature #8119]
+
+Mon Mar 25 06:59:01 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rinda/test_rinda.rb:  Skip IPv6 tests if no IPv6 addresses
+	  exist.  Skip fork-dependent test if fork is not available.
+	  [ruby-trunk - Bug #8159]
+
+Sun Mar 24 10:38:24 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* addr2line.c (putce): suppress unused return value warning.
+
+Mon Mar 25 02:01:03 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* proc.c (bm_free): need to clean up the mark flag of a free and
+	  unlinked method entry. [Bug #8100] [ruby-core:53439]
+
+Sun Mar 24 22:13:51 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_rpartition): revert r39903, and convert byte offset
+	  to char offset; the return value of rb_reg_search is byte offset,
+	  but other than it of rb_str_rpartition expects char offset.
+	  [Bug #8138] [ruby-dev:47183]
+
+Sun Mar 24 18:29:46 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* string.c (rb_str_rpartition): Fix String#rpartition(/re/)
+	  against a multibyte string. [Bug #8138] [ruby-dev:47183]
+
+Sun Mar 24 13:42:24 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (GC_ENABLE_LAZY_SWEEP): new macro to switch lazy sweeping
+	  for debugging. [Feature #8024] [ruby-dev:47135]
+
+Sun Mar 24 12:55:47 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: We have no chance to expand the heap when lazy sweeping is
+	  restricted. So collecting is often invoked if there is not
+	  enough free space in the heap. Try to expand heap when this is
+	  the case.
+
+Sun Mar 24 11:03:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_require.rb: Remove temporally files in the tests.
+
+	* test/ruby/test_rubyoptions.rb: Ditto.
+
+	* test/logger/test_logger.rb: Ditto.
+
+	* test/psych/test_psych.rb: Ditto.
+
+	* test/readline/test_readline.rb: Ditto.
+
+	* test/syslog/test_syslog_logger.rb: Ditto.
+
+	* test/webrick/test_httpauth.rb: Ditto.
+
+	* test/zlib/test_zlib.rb: Ditto.
+
+Sun Mar 24 05:36:29 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rinda/ring.rb:  Added documentation for multicast support.
+
+	* NEWS:  Point to above documentation.
+
+Sun Mar 24 05:32:39 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rinda/test_rinda.rb:  Restore tests commented out while fixing
+	  test slowdown bug before r39895.
+
+Sun Mar 24 05:03:36 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rinda/ring.rb:  Add multicast support to Rinda::RingFinger and
+	  Rinda::RingServer.  [ruby-trunk - Bug #8073]
+	* test/rinda/test_rinda.rb:  Test for the above.
+
+	* NEWS: Update with Rinda multicast support
+
+Sun Mar 24 04:13:27 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rinda/test_rinda.rb:  Fixed test failures in r39890 and r39891
+	  due to stopping DRb service.
+
+Sun Mar 24 03:34:02 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rinda/rinda.rb:  Fixed loss of tuple when remote is alive but the
+	  call stack was unwound.  Patch by Joel VanderWerf.
+	  [ruby-trunk - Bug #8125]
+	* test/rinda/test_rinda.rb:  Test for the above.
+
+Sun Mar 24 02:14:53 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/mkmf/test_have_macro.rb: remove temporally files in the tests.
+
+Sat Mar 23 23:50:04 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (kprintf): added from FreeBSD libstand's printf.
+	  this is consided as async signal safe function.
+
+	* addr2line.c (rb_dump_backtrace_with_lines): use kfprintf.
+	  [Bug #8144] [ruby-core:53632]
+
+Sat Mar 23 23:28:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_divide): Use Qnil and NIL_P
+	  instead of (VALUE)0 as a return value.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_div): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_divremain): ditto.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_remainder): ditto.
+
+Sat Mar 23 17:39:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (check_funcall_respond_to): preserve passed_block, which
+	  is modified in vm_call0_body() via vm_call0(), and caused a bug of
+	  rb_check_funcall() by false negative result of rb_block_given_p().
+	  re-fix [ruby-core:53650] [Bug #8153].
+	  [ruby-core:53653] [Bug #8154]
+
+Fri Mar 22 17:48:34 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/forwardable.rb (Forwardable::FILE_REGEXP): create regexp object
+	  outside sources for eval, to reduce allocations in def_delegators
+	  wrappers.  //o option does not make each regexps shared.  patch by
+	  tmm1 (Aman Gupta) in [ruby-core:53620] [Bug #8143].
+
+Fri Mar 22 17:38:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_feature_p), vm_core.h (rb_vm_struct): turn
+	  loaded_features_index into st_table.  patches by tmm1 (Aman Gupta)
+	  in [ruby-core:53251] and [ruby-core:53274] [Bug #8048]
+
+Fri Mar 22 10:29:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c: Fix style.
+
+Fri Mar 22 05:30:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (ambiguous_operator): refine warning message, since this
+	  warning is shown after literal too.
+
+Fri Mar 22 04:51:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_callee_setup_keyword_arg): should check required
+	  keyword arguments even if rest hash is defined.  [ruby-core:53608]
+	  [Bug #8139]
+
+Fri Mar 22 01:00:17 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* process.c (rb_execarg_addopt, run_exec_pgroup): use rb_pid_t
+	  instead of pid_t.
+
+	* ext/pty/pty.c (raise_from_check, pty_check): ditto.
+
+Fri Mar 22 00:04:15 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (rb_dump_backtrace_with_lines): output line at once.
+
+Thu Mar 21 23:17:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (ruby_kill): get rid of deadlock on signal 0.
+	  [ruby-dev:47182] [Bug #8137]
+
+Thu Mar 21 22:39:46 2013  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* marshal.c (marshal_dump, marshal_load): workaround for segv on
+	  Intel Solaris compiled with Oracle SolarisStudio 12.3.
+	  Partly revert r38174. [ruby-core:52042] [Bug #7805]
+
+Thu Mar 21 16:48:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (simple_re_meta): escape all closing characters, not only
+	  round parenthesis.  [ruby-core:53578] [Bug #8133]
+
+Thu Mar 21 13:50:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (UNINITIALIZED_VAR): suppress warnings by clang 4.2.
+	  [ruby-core:51742] [Bug #7756]
+
+Thu Mar 21 07:34:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/date/date_core.c: Typo in Date::MONTHNAMES by Matt Gauger
+	  [GH fixes #261]
+
+Wed Mar 20 22:53:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (find_library): fix to format message.
+	  [ruby-core:53568] [Bug #8130]
+
+Wed Mar 20 22:52:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (install_dirs, with_destdir): prefix with DESTDIR
+	  directories to install only unless bundled extension libraries.
+	  [ruby-core:53502] [Bug #8115]
+
+Wed Mar 20 17:47:53 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup):
+	  allow using different root for source and build directories.
+	  this may fixes a minor problem of r39834.
+
+Wed Mar 20 16:40:48 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/ruby/test_signal.rb (test_hup_me): skip if HUP isn't supported.
+	  On Windows this test causes ArgumentError.
+
+Wed Mar 20 16:24:12 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/rubygems/test_gem_installer.rb (test_install_extension_flat):
+	  use ruby in build directory in case ruby is not installed.
+	  [ruby-core:53265] [Bug #8058]
+
+Wed Mar 20 15:22:07 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup): use
+	  relative path to get rid of "too long commandline" error.
+
+Wed Mar 20 04:27:42 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/rinda/test_rinda.rb: remove unused variables.
+	  patched by Vipul A M <vipulnsward@gmail.com>
+
+Wed Mar 20 04:15:32 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* ext/bigdecimal/bigdecimal.c: fixed typo.
+	  patched by Vipul A M <vipulnsward@gmail.com>
+
+Sat Mar 16 03:40:49 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_signal.rb (test_hup_me): added a few comments.
+
+Sat Mar 16 03:39:38 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (ruby_kill): added a few comments.
+
+Sat Mar 16 03:36:56 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (ruby_kill): release GVL while waiting signal delivered.
+
+Tue Mar 19 19:50:48 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby_kill (internal.h, thread.c): use rb_pid_t instead of pid_t.
+	  this fixes the build failure of mswin introduced at r39819.
+
+Tue Mar 19 17:09:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_conv_enc_opts): convert with one converter, instead
+	  of re-creating converters for each buffer expansion.
+
+Tue Mar 19 17:06:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): compose HFS file names from UTF8-MAC.
+	  [ruby-core:48745] [Bug #7267]
+
+Sat Mar 16 01:44:29 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* internal.h: added a declaration of ruby_kill().
+	* thread.c (ruby_kill): helper function of kill().
+
+	* signal.c (rb_f_kill): use ruby_kill() instead of kill().
+	* signal.c (rb_f_kill): call rb_thread_execute_interrupts()
+	  to ensure that make SignalException if sent a signal
+	  to myself. [Bug #7951] [ruby-core:52864]
+
+	* vm_core.h (typedef struct rb_thread_struct): added
+	  th->interrupt_cond.
+	* thread.c (rb_threadptr_interrupt_common): added to
+	  initialization of th->interrupt_cond.
+	* thread.c (thread_create_core): ditto.
+
+	* test/ruby/test_signal.rb (TestSignal#test_hup_me): test for
+	  the above.
+
+Sat Mar 16 00:42:39 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (linux_iocparm_len): enable only exist _IOC_SIZE().
+	  Because musl libc doesn't have it. [Bug #8051] [ruby-core:53229]
+
+Tue Mar 19 10:05:04 2013  Shota Fukumori  <her@sorah.jp>
+
+	* ext/objspace/objspace.c: Fix typo in doc. Patch by Sho Hashimoto.
+	  [Bug #8116] [ruby-dev:47177]
+
+Tue Mar 19 02:13:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* configure.in: set ac_cv_prog_cxx if CXX is supplied.
+
+Tue Mar 19 01:18:00 2013  Kenta Murata  <mrkn@mrkn.jp>
+
+	* configure.in: Fix c++ compiler auto-selection not only for
+	  Darwin 11.x, but also the other versions of Darwin.
+
+Tue Mar 19 00:26:22 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: Improve accuracy of objspace_live_num() and
+	  allocated/freed counters. patched by tmm1(Aman Gupta).
+	  [Bug #8092] [ruby-core:53392]
+
+Mon Mar 18 21:42:48 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: Avoid unnecessary heap growth. patched by tmm1(Aman Gupta).
+	  [Bug #8093] [ruby-core:53393]
+
+Mon Mar 18 17:58:36 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: Fix unlimited memory growth with large values of
+	  RUBY_FREE_MIN. patched by tmm1(Aman Gupta).
+	  [Bug #8095] [ruby-core:53405]
+
+Mon Mar 18 14:46:19 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/win32ole/test_err_in_callback.rb
+	  (TestErrInCallBack#test_err_in_callback): shouldn't create a file in
+	  the top of build directory.
+
+Mon Mar 18 13:29:52 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_dump.c (backtrace): on darwin use custom backtrace() to trace
+	  beyond _sigtramp. darwin's backtrace can't trace beyond signal
+	  trampoline with sigaltstack.
+
+	* configure.in: check execinfo.h on darwin.
+
+Mon Mar 18 11:03:23 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_exec.h (END_INSN): revert r39517 because the segv seems fixed by
+	  r39806.
+
+Mon Mar 18 10:41:06 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_exec.c: Correct predefined macro name. This typo is introduced by
+	  r36534 and should be backported to ruby_2_0_0.
+
+Mon Mar 18 03:18:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* array.c: Typo in Array#delete by Timo Sand [GH fixes #258]
+
+Mon Mar 18 01:14:56 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (io_fillbuf): show fd number on failure to debug.
+	  http://c5632.rubyci.org/~chkbuild/ruby-trunk/log/20130316T050302Z.diff.html.gz
+
+Sun Mar 17 02:38:21 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/date/date_core.c: include sys/time.h for avoiding implicit
+	  declaration of gettimeofday().
+
+Sun Mar 17 00:55:31 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/missing.h: removed __linux__. it's unnecessary.
+
+Fri Mar 15 14:57:16 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c: disabled _FORTIFY_SOURCE for avoid to hit glibc bug.
+	  [Bug #8080] [ruby-core:53349]
+	* test/ruby/test_io.rb (TestIO#test_io_select_with_many_files):
+	  test for the above.
+
+Wed Mar 13 15:16:35 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/missing.h (__syscall): moved to...
+	* io.c: here. because __syscall() is only used from io.c.
+
+	* include/ruby/missing.h: move "#include <sys/type.h>" to ....
+	* include/ruby/intern.h: here. because it was introduced for
+	  fixing NFDBITS issue. [ruby-core:05179].
+
+Wed Mar 13 14:38:53 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/missing.h (struct timespec): include <sys/time.h>
+
+Wed Mar 13 13:54:45 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in: check struct timeval exist or not.
+	* include/ruby/missing.h (struct timeval): check HAVE_STRUCT_TIMEVAL
+	  properly. and don't include sys/time.h if struct timeval exist.
+
+	* file.c: include sys/time.h explicitly.
+	* random.c: ditto.
+	* thread_pthread.c: ditto.
+	* time.c: ditto.
+	* ext/date/date_strftime.c: ditto.
+
+Fri Mar 15 14:45:02 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* configure.in (_FORTIFY_SOURCE): added a few comments.
+
+Fri Mar 15 14:17:55 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (numberof): renamed from ARRAY_SIZE() because
+	  other all files use numberof().
+
+Say Mar 15 01:33:00 2013  Charles Oliver Nutter <headius@headius.com>
+
+	* test/ruby/test_lazy_enumerator.rb (TestLazyEnumerator#test_drop_while):
+	  Modify while condition to show dropping remains off after first false
+	  value. This change was made in 39711.
+
+Fri Mar 15 23:06:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (GetTimeval): check if already initialized instance.
+
+	* time.c (GetNewTimeval): check if newly created instance.
+
+	* time.c (time_init_0, time_init_1, time_init_copy, time_mload): must
+	  be newly created instance.  [ruby-core:53436] [Bug #8099]
+
+Fri Mar 15 14:51:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_sys_fail_path_with_func): share same function, and path
+	  may be nil.
+
+Fri Mar 15 08:24:51 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (rb_sys_fail_path): define & use rb_sys_fail_path0 like r39752
+
+Fri Mar 15 04:08:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* proc.c: Typo in Proc.arity found by Jack Nagel [Bug #8094]
+
+Thu Mar 14 16:59:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_function_name_string): macro for function name
+	  string predefined identifier, __func__ in C99, or __FUNCTION__ in
+	  gcc.
+
+	* file.c (rb_sys_fail_path): use RUBY_FUNCTION_NAME_STRING.
+
+Thu Mar 14 14:12:34 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (rb_sys_fail_path): use rb_sys_fail_path0 only on GCC.
+	  __func__ is C99 feature.
+
+Thu Mar 14 12:59:59 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (rb_sys_fail_path0): add to append the name of called function
+	  to ease debugging for example blow umask_spec failure.
+	  http://fbsd.rubyci.org/~chkbuild/ruby-trunk/log/20130309T010202Z.diff.html.gz
+
+	* file.c (rb_sys_fail_path): use rb_sys_fail_path0.
+
+Thu Mar 14 12:53:15 2013  Luis Lavena  <luislavena@gmail.com>
+
+	* win32/file.c (get_user_from_path):  add internal function that retrieves
+	  username from supplied path (refactored).
+	* win32/file.c (rb_file_expand_path_internal):  refactor expansion of user
+	  home to use get_user_from_path and cover dir_string corner cases.
+	  [ruby-core:53168] [Bug #8034]
+
+Thu Mar 14 11:53:01 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* NEWS: describe RUBY_HEAP_SLOTS_GROWTH_FACTOR.
+
+Thu Mar 14 10:01:12 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/globals.rdoc:  $? is thread-local
+
+Wed Mar 13 23:25:59 2013  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: allow to tune growth of heap by environment variable
+	  RUBY_HEAP_SLOTS_GROWTH_FACTOR. patched by tmm1(Aman Gupta).
+	  [Feature #8015] [ruby-core:53131]
+
+Wed Mar 13 19:43:46 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* doc/irb/irb.rd.ja: fix typo
+
+	* ext/tk/MANUAL_tcltklib.eng: fix typos
+
+	* ext/tk/sample/tktextframe.rb (Tk#component_delegates): fix typo
+
+Wed Mar 13 15:13:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_obj_singleton_methods): collect methods from the origin
+	  class.  [ruby-core:53207] [Bug #8044]
+
+Wed Mar 13 14:51:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_export_method): directly override the flag of method
+	  defined in prepending class too, not adding zsuper entry.
+	  [ruby-core:53106] [Bug #8005]
+
+Wed Mar 13 13:06:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rm, shvar_to_cpp, unexpand_shvar): local is not
+	  available on old shells.
+
+	* configure.in (shvar_to_cpp): escape quotes for old shells.
+	  [Bug #7959] [Bug #8071]
+
+Wed Mar 13 11:11:07 2013  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* object.c (Init_Object): remove Module#used, which has been
+	  introduced in Ruby 2.0 by mistake.  [Bug #7916] [ruby-core:52719]
+
+Wed Mar 13 05:49:29 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/irb.rb:  Fix typo
+
+Tue Mar 12 22:20:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_set_arguments, iseq_compile_each): support required
+	  keyword arguments.   [ruby-core:51454] [Feature #7701]
+
+	* iseq.c (rb_iseq_parameters): ditto.
+
+	* parse.y (f_kw, f_block_kw): ditto.  this syntax is still
+	  experimental, the notation may change.
+
+	* vm_core.h (rb_iseq_struct): ditto.
+
+	* vm_insnhelper.c (vm_callee_setup_keyword_arg): ditto.
+
+Tue Mar 12 17:02:53 2013  TAKANO Mitsuhiro <tak@no32.tk>
+
+	* date_core.c: clearly specify operator precedence.
+
+Tue Mar 12 17:00:45 2013  TAKANO Mitsuhiro <tak@no32.tk>
+
+	* insns.def: fix condition.
+
+Tue Mar 12 16:48:19 2013  TAKANO Mitsuhiro <tak@no32.tk>
+
+	* rational.c: fix dangling if, else-if and else.
+
+Tue Mar 12 06:27:59 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/setup_command.rb:  Don't delete non-rubygems
+	  files when installing RubyGems.
+	* test/rubygems/test_gem_commands_setup_command.rb:  Test for the
+	  above.
+
+	* lib/rubygems/ext/ext_conf_builder.rb:  Use full path to siteconf.rb
+	  in case the extconf.rb changes directories (like memcached does).
+
+	* lib/rubygems/package.rb:  Remove double slash from path.
+	* test/rubygems/test_gem_package.rb:  Test for the above.
+	* test/rubygems/test_gem_package_old.rb:  ditto.
+
+	* lib/rubygems/source.rb:  Revert automatic HTTPS upgrade
+	* lib/rubygems/spec_fetcher.rb:  ditto.
+	* test/rubygems/test_gem_remote_fetcher.rb:  ditto.
+	* test/rubygems/test_gem_source.rb:  ditto.
+	* test/rubygems/test_gem_spec_fetcher.rb:  ditto.
+
+Tue Mar 12 02:25:19 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/smtp.rb:  Added Net::SMTP#rset method to implement the SMTP
+	  RSET command.  [ruby-trunk - Feature #5373]
+	* NEWS:  ditto.
+	* test/net/smtp/test_smtp.rb:  Test for the above.
+
+Mon Mar 11 22:44:57 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd
+	  argument only if non-nil value is given.
+	  [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by
+	  mrkn.
+
+Mon Mar 11 19:22:54 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/mkmf/base.rb: class name conflict.
+
+Mon Mar 11 18:45:09 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enumerator.c (enumerator_with_index): try to convert given offset to
+	  integer. fix bug introduced in r39594.
+
+Mon Mar 11 17:27:57 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/envutil.rb (EnvUtil.with_default_external): add for
+	  changing Encoding.default_external without warnings.
+
+	* test/ruby/envutil.rb (EnvUtil.with_default_internal): ditto.
+
+	* test/ruby/test_io_m17n.rb: use above with_default_external.
+
+Mon Mar 11 16:57:00 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* io.c (extract_binmode): raise error even if binmode and textmode
+	  don't conflict. [Bug #5918] [ruby-core:42199]
+
+Mon Mar 11 12:25:12 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Merge Onigmo d4bad41e16e3eccd97ccce6f1f96712e557c4518.
+	  fix lookbehind assertion fails with /m mode enabled. [Bug #8023]
+	  fix \Z matches where it shouldn't. [Bug #8001]
+
+Mon Mar 11 11:53:35 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#dir_config, MakeMakefile#_libdir_basename):
+	  defer use of instance variable until needed.  [Bug #8074]
+
+Thu Mar  7 10:42:28 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/thread.rb (Queue#clear): return self.
+	  Patch by Cubing Cube. Thank you! [Bug #7947] [ruby-dev:47098]
+	* lib/thread.rb (Queue#push): ditto.
+	* lib/thread.rb (SizedQueue#push): ditto.
+	* test/thread/test_queue.rb: add tests for the above.
+
+Thu Mar  7 10:40:49 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* tool/change_maker.rb (#diff2index): check Encoding::BINARY.
+	  BASERUBY may still be 1.8.x.
+
+Thu Mar  7 08:47:42 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* NEWS (Mutex#owned?): no longer experimental.
+
+Sun Mar 10 23:38:15 2013  Luis Lavena  <luislavena@gmail.com>
+
+	* win32/file.c (rb_file_expand_path_internal):  Expand home directory when
+	  used as second parameter (dir_string).  [ruby-core:53168] [Bug #8034]
+	* test/ruby/test_file_exhaustive.rb: add test to verify.
+
+Sun Mar 10 23:27:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  it is impossible to predict which file will be installed to where,
+	  by the arguments, so use intermediate destination directory always.
+	  [Bug #7698]
+
+Sun Mar 10 17:00:22 2013  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: edited rdoc.
+	* rational.c: ditto.
+
+Sun Mar 10 15:02:39 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (setup_communication_pipe): remove unused function.
+	  it was unintentionally added r39683.
+
+Wed Mar  6 00:30:40 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* tool/gen_ruby_tapset.rb: add tapset generator.
+
+Wed Mar  6 03:27:43 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* probes.d (symbol-create): change argument name `string' to
+	  `str'. `string' is a keyword for systemtap.
+
+Tue Mar  5 22:23:01 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* probes.d: added argument name
+
+Thu Mar  7 01:17:00 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/thread/test_queue.rb (TestQueue#test_thr_kill): reduce
+	  iterations from 2000 to 250. When running on uniprocessor
+	  systems, every th.kill needs TIME_QUANTUM_USEC time (i.e.
+	  100msec on posix systems). Because, "r.read 1" is 3 steps
+	  operations that 1) release GVL 2) read 3) acquire gvl and
+	  (1) invoke context switch to main thread. and then, main
+	  thread's th.kill resume (1), but not (2). Thus read interrupt
+	  need TIME_QUANTUM_USEC. Then maximum iteration is 30sec/100msec
+	  = 300.
+
+Thu Mar  7 00:14:51 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_update_max_fd): use ATOMIC_CAS because this function
+	  is used from timer thread too.
+
+Wed Mar  6 23:30:21 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (ARRAY_SIZE): new.
+	* thread_pthread.c (gvl_acquire_common): use low priority
+	  notification for avoiding timer thread interval confusion.
+	  If we use timer_thread_pipe[1], every gvl_yield() request
+	  one more gvl_yield(). It lead to thread starvation.
+	  [Bug #7999] [ruby-core:53095]
+	* thread_pthread.c (rb_reserved_fd_p): adds timer_thread_pipe_low
+	  to reserved fds.
+
+Wed Mar  6 22:36:19 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (rb_thread_wakeup_timer_thread_fd): add fd
+	  argument and remove hardcoded dependency of timer_thread_pipe[1].
+	* thread_pthread.c (consume_communication_pipe): add fd argument.
+	* thread_pthread.c (close_communication_pipe): ditto.
+
+	* thread_pthread.c (timer_thread_sleep): adjust the above changes.
+
+	* thread_pthread.c (setup_communication_pipe_internal): factor
+	  out pipe initialize logic.
+
+Wed Mar  6 22:56:14 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (ubf_select): add to small comments why we
+	  need to call rb_thread_wakeup_timer_thread().
+
+Wed Mar  6 21:42:24 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): factor out
+	  creating communication pipe logic into separate function.
+	* thread_pthread.c (setup_communication_pipe): new helper function.
+	* thread_pthread.c (set_nonblock): moves a definition before
+	  setup_communication_pipe.
+
+Sun Mar  3 02:42:29 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (consume_communication_pipe): retry when
+	  read returned CCP_READ_BUFF_SIZE.
+
+Wed Mar  6 21:31:35 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (timer_thread_sleep): use poll() instead of
+	  select(). select doesn't work if timer_thread_pipe[0] is
+	  greater than FD_SETSIZE.
+	* thread_pthread.c (USE_SLEEPY_TIMER_THREAD): add a dependency
+	  against poll.
+
+Wed Mar  6 21:00:23 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (USE_SLEEPY_TIMER_THREAD): use more accurate
+	  ifdef conditions.
+
+Sun Mar  3 02:30:36 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread_pthread.c (set_nonblock): new helper function for set
+	  O_NONBLOCK.
+	* thread_pthread.c (rb_thread_create_timer_thread): set O_NONBLOCK
+	  to timer_thread_pipe[0] too.
+
+Sun Mar 10 09:12:51 2013  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* complex.c: described syntax of string form.
+	* rational.c: ditto.
+
+Sat Mar  9 11:58:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_extended): check for prepended object.
+	  [ruby-core:53206] [Bug #8043]
+
+Sat Mar  9 08:36:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (features_index_add_single, rb_feature_p): store single index
+	  as Fixnum to reduce the number of arrays for the indexes.  based on
+	  the patch by tmm1 (Aman Gupta) in [ruby-core:53216] [Bug #8048].
+
+Sat Mar  9 00:25:57 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): load prepended objects.  treat the class of
+	  extended object in the included modules as prepended singleton
+	  class. [ruby-core:53202] [Bug #8041]
+
+Fri Mar  8 19:44:00 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* man/rake.1, man/ruby.1: Use the Pa macro to make URLs stand out.
+
+Fri Mar  8 13:20:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/pathname/pathname.c (path_f_pathname): rdoc for Pathname()
+
+Fri Mar  8 12:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* man/rake.1: Document ENVIRONMENT variables on RAKE(1) manpage
+
+Fri Mar  8 10:44:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/webrick/httpproxy.rb: Fix typos in HTTPProxyServer [Bug #8013]
+	  Patch by Nobuhiro IMAI [ruby-core:53127]
+
+Fri Mar  8 03:16:15 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* class.c (rb_mod_ancestors): Include singleton_class in ancestors
+	  list [Feature #8035]
+
+	* test/ruby/test_module.rb (class): test for above
+
+	* test/ruby/marshaltestlib.rb (module): adapt test
+
+	* NEWS: list change
+
+Thu Mar  7 14:21:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): pass keyword arguments to zsuper,
+	  with current values.  [ruby-core:53114] [Bug #8008]
+
+Thu Mar  7 12:53:47 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/setup_command.rb:  Install .pem files.
+	* test/rubygems/test_gem_commands_setup_command.rb:  Test for the
+	  above.
+
+	* lib/rubygems/spec_fetcher.rb:  Test HTTPS upgrade with URI::HTTPS,
+	  not URI::HTTP.  Fixes bug in automatic HTTPS upgrade.
+	* test/rubygems/test_gem_spec_fetcher.rb:  Test for the above.
+
+	* lib/rubygems.rb:  Version 2.0.2
+
+	* lib/rubygems/test_utilities.rb:  Ensure scheme and uri class match.
+
+Thu Mar  7 10:39:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (gem): Gem.ensure_gem_subdirectories now has mode
+	  option since r39607.  refix of r38870.
+
+Wed Mar  6 13:14:28 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rubygems/test_gem_spec_fetcher.rb:  Removed unused variable.
+
+Wed Mar  6 08:10:15 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rubygems/test_require.rb:  Fix tests when 'a.rb' exists.
+	  [ruby-trunk - Bug #7749]
+
+Wed Mar  6 08:00:59 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Allow specification of directory permissions.
+	  [ruby-trunk - Bug #7713]
+	* test/rubygems/test_gem.rb:  Test for the above.
+
+Wed Mar  6 07:40:21 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/query_command.rb:  Only fetch remote specs when
+	  showing details.  [ruby-trunk - Bug #8019]  RubyGems bug #487
+	* lib/rubygems/remote_fetcher.rb:  ditto.
+	* lib/rubygems/security/policy.rb:  ditto.
+	* test/rubygems/test_gem_commands_query_command.rb:  Test for the
+	  above.
+
+	* lib/rubygems/security.rb:  Make OpenSSL optional for RubyGems.
+	* lib/rubygems/commands/cert_command.rb:  ditto.
+
+	* lib/rubygems/config_file.rb:  Display file with YAML error, not
+	  ~/.gemrc
+
+	* lib/rubygems/remote_fetcher.rb:  Only create gem subdirectories when
+	  installing gems.
+	* lib/rubygems/dependency_resolver.rb:  ditto.
+	* lib/rubygems/test_utilities.rb:  ditto.
+	* test/rubygems/test_gem_commands_fetch_command.rb:  Test for the
+	  above.
+
+	* lib/rubygems/spec_fetcher.rb:  Only try to upgrade
+	  http://rubygems.org to HTTPS
+	* test/rubygems/test_gem_spec_fetcher.rb:  Test for the above.
+
+	* lib/rubygems.rb:  Update win_platform? check for JRuby compatibility.
+
+	* test/rubygems/test_gem_installer.rb:  Update for Ruby 1.9.2
+	  compatibility
+
+Wed Mar  6 01:19:28 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* enumerator.c (enumerator_with_index, lazy_take): use INT2FIX(0)
+	  instead of INT2NUM(0).
+
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): ditto.
+
+	* ext/fiddle/function.c (function_call): ditto.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): ditto.
+
+	* process.c (proc_getsid): ditto.
+
+	* transcode.c (econv_finish): ditto.
+
+Tue Mar  5 21:36:43 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_prepend_module): check redefinition of built-in optimized
+	  methods.  [ruby-dev:47124] [Bug #7983]
+
+	* vm.c (rb_vm_check_redefinition_by_prepend): ditto.
+
+Tue Mar  5 20:29:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (mnew): revert r39224.  [ruby-core:53038] [Bug #7988]
+
+Tue Mar  5 20:23:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_check_arity): make a static inline
+	  function so it can be used as an expression and argc would be
+	  evaluated only once.
+
+Tue Mar  5 12:30:55 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Bump version to 2.0.1 for upcoming bugfix release
+
+	* lib/rubygems/ext/ext_conf_builder.rb:  Restore ruby 1.8 compatibility
+	  for [Bug #7698]
+	* test/rubygems/test_gem_installer.rb:  Ditto.
+
+	* lib/rubygems/package.rb:  Restore ruby 1.8 compatibility.
+
+	* test/rubygems/test_gem_dependency_installer.rb:  Fix warnings
+
+Tue Mar  5 12:24:23 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* enumerator.c (enumerator_with_index):  Restore handling of a nil memo
+	  from r39594.
+
+Tue Mar  5 10:40:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/objspace/objspace.c (count_nodes): count also newly added nodes,
+	  and fix key for unknown node.  patch by tmm1 (Aman Gupta) in
+	  [ruby-core:53130] [Bug #8014]
+
+Tue Mar  5 10:20:16 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (enumerator_with_index_i): allow Bignum as offset, to
+	  get rid of conversion exception and integer overflow.
+	  [ruby-dev:47131] [Bug #8010]
+
+	* numeric.c (rb_int_succ, rb_int_pred): shortcut optimization for
+	  Bignum.
+
+Tue Mar  5 10:02:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  clear DESTDIR so RUBYARCHDIR and RUBYLIBDIR are not be overridden.
+	  [Bug #7698]
+
+Mon Mar  4 15:33:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  fix for unusual cases again.  install to a temporary directory once
+	  and move installed files to the destination directory, if it is same
+	  as the current directory.  [Bug #7698]
+
+Mon Mar  4 14:13:36 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (miniruby, ruby): move MAINLIBC because linker arguments
+	  must appear after object files with newer versions of gcc.  patch by
+	  tmm1 (Aman Gupta) in [ruby-core:53121] [Bug #8009]
+
+Mon Mar  4 10:23:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* encoding.c: Typo in Encoding overview by Tom Wardrop [GH fixes #255]
+
+Sun Mar  3 12:35:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#libpath_env): set runtime library path for
+	  the case rpath is disabled.
+
+Sun Mar  3 12:17:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/ext/ext_conf_builder.rb
+	  (Gem::Ext::ExtConfBuilder.hack_for_obsolete_style_gems): remove
+	  circular dependencies in install-so too.  [ruby-core:52882]
+	  [Bug #7698]
+
+Sun Mar  3 07:33:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/socket/tcpserver.c: Grammar for TCPServer.new from r39554
+
+Sun Mar  3 01:17:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/ext/ext_conf_builder.rb
+	  (Gem::Ext::ExtConfBuilder.hack_for_obsolete_style_gems): remove
+	  circular dependencies for old style gems which locate extconf.rb on
+	  the toplevel.  [ruby-core:53059] [ruby-trunk - Bug #7698]
+
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  use RUBYOPT instead of -r option, and revert some tests.  [Bug #7698]
+
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  revert use of temporary directory for build, to work some buggy
+	  extconf.rb which cannot build outside the source directory.
+	  [ruby-core:53056] [Bug #7698]
+
+Sun Mar  3 00:04:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend (CPPFLAGS), lib/mkmf.rb (MakeMakefile#create_makefile):
+	  define RUBY_EXPORT for static-linked-ext mswin.  [Bug #7960]
+
+Sat Mar  2 22:49:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (ENCOBJS, EXTOBJS, config.h): definitions for
+	  static-linked-ext.  [Bug #7960]
+
+Sat Mar  2 17:34:19 2013  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/utils.rb: use Socket.tcp_server_sockets to create server
+	  sockets.
+	  fix [Bug #7100] https://bugs.ruby-lang.org/issues/7100
+	  reported by sho-h (Sho Hashimoto).
+
+Sat Mar  2 02:45:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* array.c: typo in comment patch by Nami-Doc [Github fixes #253]
+
+Sat Mar  2 01:33:17 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Merge Onigmo 0fe387da2fee089254f6b04990541c731a26757f
+	  v5.13.3 [Bug#7972] [Bug#7974]
+
+Fri Mar  1 11:09:06 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/fileutils.rb:  Revert r34669 which altered the way
+	  metaprogramming in FileUtils occurred.  [ruby-trunk - Bug #7958]
+
+	* test/fileutils/visibility_tests.rb:  Refactored tests of FileUtils
+	  options modules to expose bug found in #7958
+	* test/fileutils/test_dryrun.rb:  ditto.
+	* test/fileutils/test_nowrite.rb:  ditto.
+	* test/fileutils/test_verbose.rb:  ditto.
+
+Fri Mar  1 09:18:00 2013  Zachary Scott <zachary@zacharyscott.net>
+
+	* lib/psych.rb: specify in rdoc what object is returned in parser
+	  By Adam Stankiewicz [Github tenderlove/psych#133]
+
+Fri Mar  1 07:21:41 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/ext/builder.rb:  Fix incompatibilities when installing
+	  extensions.  Patch by Nobu.
+	  [ruby-trunk - Bug #7698] [ruby-trunk - Bug #7971]
+	* lib/rubygems/ext/ext_conf_builder.rb:  ditto.
+	* lib/rubygems/installer.rb:  ditto.
+	* test/rubygems/test_gem_ext_ext_conf_builder.rb:  Test for the above.
+	* test/rubygems/test_gem_installer.rb:  ditto.
+
+	* lib/rubygems/commands/sources_command.rb:  Prefer HTTPS over HTTP.
+	* lib/rubygems/defaults.rb:  ditto
+	* lib/rubygems/dependency_resolver.rb:  Ditto.
+	* lib/rubygems/source.rb:  ditto.
+	* lib/rubygems/spec_fetcher.rb:  ditto.
+	* lib/rubygems/specification.rb:  ditto.
+	* lib/rubygems/test_utilities.rb:  ditto.
+	* test/rubygems/test_gem.rb:  Test for the above.
+	* test/rubygems/test_gem_commands_sources_command.rb:  ditto.
+	* test/rubygems/test_gem_dependency_resolver_api_set.rb:  ditto.
+	* test/rubygems/test_gem_remote_fetcher.rb:  ditto.
+	* test/rubygems/test_gem_source.rb:  ditto.
+	* test/rubygems/test_gem_spec_fetcher.rb:  ditto.
+
+Fri Mar 1 03:25:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/psych/lib/psych.rb: rdoc for Psych overview by Adam Stankiewicz
+	  [Github tenderlove/psych#134]
+
+Thu Feb 28 22:57:48 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): remove redundant trace(line)
+	  instruction. for example, at the following script
+	    def m()
+	      p:xyzzy
+	      1
+	      2
+	    end
+	  compiler ignores `1' because there is no effect. However,
+	  `trace(line)' instruction remains in bytecode.
+	  This modification removes such redundant trace(line) instruction.
+
+	* test/ruby/test_iseq.rb: add a test.
+
+Thu Feb 28 22:23:27 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (inspect_sockaddr): don't show that Unix
+	  domain socket filename is bigger than sizeof(sun_path).
+	  This limit is not rigid on some platforms such as Darwin and SunOS.
+
+Thu Feb 28 21:33:01 2013  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in(AC_DISABLE_OPTION_CHECKING): avoid warning "WARNING:
+	  Unrecognized options: --with-PACKAGE".
+
+Thu Feb 28 20:22:04 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (iseq_data_to_ary): fix condition.
+	  r34303 introduces a bug to avoid all line information from
+	  a result of ISeq#to_a. This is a regression problem from 2.0.0p0.
+
+	* test/ruby/test_iseq.rb: add a test of lines after ISeq#to_a.
+
+Thu Feb 28 08:20:33 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/available_set.rb:  Undent for style
+
+	* lib/rubygems/dependency_installer.rb:  Pick latest prerelease gem to
+	  install.  Fixes RubyGems bug #468.
+	* test/rubygems/test_gem_dependency_installer.rb:  Test for the above.
+
+	* lib/rubygems/dependency_installer.rb:  Don't display "Done installing
+	  documentation" if documentation will not be installed.
+	* lib/rubygems/rdoc.rb:  ditto
+
+	* lib/rubygems/dependency_list.rb:  Use Array#concat for Ruby 1.x
+	  performance.
+
+	* lib/rubygems/installer.rb:  Use formatted program name when comparing
+	  executables.  RubyGems pull request #471
+	* test/rubygems/test_gem_installer.rb:  Test for the above.
+
+	* lib/rubygems/package.rb:  Use more explicit feature check to work
+	  around JRuby bug #552
+
+	* lib/rubygems/ssl_certs/GeoTrust_Global_CA.pem:  Added GeoTrust root
+	  certificate.
+
+	* test/rubygems/test_gem_source_list.rb:  Use "example" instead of real
+	  hostname
+
+Thu Feb 28 05:57:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* thread.c: rdoc formatting for Thread, ThreadGroup, and ThreadError
+
+Thu Feb 28 02:42:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* vm.c: Typo in overview for example of Thread#status returning false
+	  Reported by Lee Jarvis
+
+Wed Feb 27 22:54:27 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/rubysocket.h (union_sockaddr): make it longer for SunOS
+	  and Darwin.
+
+Wed Feb 27 21:14:34 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/security.rb (REXML::Security): create.
+	* lib/rexml/rexml.rb: move entity_expansion_limit and
+	  entity_expansion_text_limit accessors to ...
+	* lib/rexml/security.rb: ... here.
+	* lib/rexml/document.rb: use REXML::Security.
+	* lib/rexml/text.rb: use REXML::Security.
+	* test/rexml/test_document.rb: use REXML::Security.
+
+Wed Feb 27 19:53:32 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* vm.c (Thread): fix typos in overview
+
+Wed Feb 27 13:21:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* vm.c (Thread): Typo in overview, swap setting and getting
+
+Wed Feb 27 13:02:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* vm.c (Thread): Documentation overview of Thread class
+
+Wed Feb 27 12:57:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* thread.c (rb_thread_wakeup): rdoc formatting
+
+Wed Feb 27 12:53:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* thread.c (rb_thread_group): rdoc formatting
+
+Wed Feb 27 12:33:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/ostruct.rb: Typo in OpenStruct overview [Github Fixes #251]
+	  Patch by Chun-wei Kuo
+
+Wed Feb 27 12:13:32 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_exec.h (END_INSN): llvm-gcc may optimize out reg_cfp and cause
+	  Stack/cfp consistency error when the instruction doesn't use reg_cfp.
+	  Usually instructions use PUSH() but for example trace doesn't.
+	  This hack cause speed down but you shouldn't use llvm-gcc, use clang.
+	  [Bug #7938]
+
+Wed Feb 27 10:23:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* thread.c (thread_raise_m): rdoc formatting
+
+Tue Feb 26 23:32:44 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/document.rb: move entity_expansion_limit accessor to ...
+	* lib/rexml/rexml.rb: ... here for consistency.
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_limit):
+	  deprecated.
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_limit=):
+	  deprecated.
+
+Tue Feb 26 23:26:13 2013  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/document.rb: move entity_expansion_text_limit accessor to ...
+	* lib/rexml/rexml.rb: ... here to make rexml/text independent from
+	  REXML::Document. It causes circular require.
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
+	  deprecated.
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit=):
+	  deprecated.
+	* lib/rexml/text.rb: add missing require "rexml/rexml" for
+	  REXML.entity_expansion_text_limit.
+	  Reported by Robert Ulejczyk. Thanks!!! [ruby-core:52895] [Bug #7961]
+
+Tue Feb 26 15:12:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkconfig.rb: reconstruct comma separated list values.  a
+	  command line to Windows batch file is split not only by spaces
+	  and equal signs but also by commas and semicolons.
+
+Tue Feb 26 15:04:19 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (unexpand_shvar): get rid of non-portable shell
+	  behavior on OpenBSD, so no extra quotes.  [Bug #7959]
+
+Tue Feb 26 10:24:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (IS_LABEL_POSSIBLE): allow labels for keyword arguments just
+	  after method definition without a parenthesis.  [ruby-core:52820]
+	  [Bug #7942]
+
+Tue Feb 26 04:50:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* error.c: clarify reason for sleep in SignalException example
+
+Tue Feb 26 03:47:00 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* error.c: clarify a document of SignalException. Process.kill()
+	  doesn't have any guarantee when signal will be delivered.
+	  [Bug #7951] [ruby-core:52864]
+
+Mon Feb 25 23:51:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/version.h: bump RUBY_API_VERSION same as RUBY_VERSION.
+
+Mon Feb 25 21:03:34 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (str_byte_substr): don't set coderange if it's not known.
+	  [Bug #7954] [ruby-dev:47108]
+
+Mon Feb 25 16:47:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (realclean-local): miniprelude.c is made by srcs, so it
+	  should not removed by distclean but by realclean.  [Bug #6807]
+
+Mon Feb 25 16:30:30 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/config_file.rb:  Lazily load .gem/credentials to only
+	  check permissions when necessary.  RubyGems bug #465
+	* test/rubygems/test_gem_config_file.rb:  Test for the above.
+
+	* test/rubygems/test_gem_commands_push_command.rb:  Remove duplicated
+	  test.
+
+Mon Feb 25 15:47:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend (ARFLAGS): VisualC++ linker does not allow spaces between
+	  output option and the output file name.  [Bug #7950]
+
+	* enc/depend (RANLIB): set default command to do nothing, or make the
+	  entire line a label on Windows.
+
+Mon Feb 25 14:41:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#init_mkmf): default libdirname to libdir.
+
+	* tool/rbinstall.rb: ditto.
+
+Mon Feb 25 13:12:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (setup): find Setup file from target_os 1. by
+	  suffix (e.g. Setup.nacl, Setup.atheos), 2. by "platform"
+	  option (e.g. Setup.nt, Setup.emx), and 3. default Setup.  And
+	  Setup.dj had been removed.
+
+Mon Feb 25 12:48:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* thread.c: Document Thread::new, clean up ::fork and mention calling
+	  super if subclassing Thread
+
+Mon Feb 25 12:38:50 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: don't test ss_family and ss_len member of
+	  struct sockaddr_storage.  They are not used now except SunOS
+	  specific code.
+
+Mon Feb 25 11:03:38 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in (unexpand_shvar): Use the numeric comparison
+	  operator instead of '==' which is a ksh extension. [Bug #7941]
+
+Mon Feb 25 02:37:56 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: define and use union_sockaddr instead of struct
+	  sockaddr_storage for less casts.
+
+	* ext/socket/rubysocket.h (union_sockaddr): defined.
+
+	* ext/socket/socket.c (sock_accept): use union_sockaddr.
+	  (sock_accept_nonblock): ditto.
+	  (sock_sysaccept): ditto.
+	  (sock_s_getnameinfo): ditto.
+
+	* ext/socket/basicsocket.c (bsock_getsockname): ditto.
+	  (bsock_getpeername): ditto.
+	  (bsock_local_address): ditto.
+	  (bsock_remote_address): ditto.
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): ditto.
+
+	* ext/socket/init.c (recvfrom_arg): ditto.
+	  (recvfrom_blocking): ditto.
+	  (rsock_s_recvfrom): ditto.
+	  (rsock_s_recvfrom_nonblock): ditto.
+	  (rsock_getfamily): ditto.
+
+	* ext/socket/raddrinfo.c (rb_addrinfo_t): ditto.
+	  (ai_get_afamily): ditto.
+	  (inspect_sockaddr): ditto.
+	  (addrinfo_mdump): ditto.
+	  (addrinfo_mload): ditto.
+	  (addrinfo_getnameinfo): ditto.
+	  (addrinfo_ip_port): ditto.
+	  (extract_in_addr): ditto.
+	  (addrinfo_ipv6_to_ipv4): ditto.
+	  (addrinfo_unix_path): ditto.
+
+	* ext/socket/tcpserver.c (tcp_accept): ditto.
+	  (tcp_accept_nonblock): ditto.
+	  (tcp_sysaccept): ditto.
+
+	* ext/socket/ipsocket.c (ip_addr): ditto.
+	  (ip_peeraddr): ditto.
+	  (ip_s_getaddress): ditto.
+
+Sun Feb 24 21:15:05 2013  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c: [ruby-core:52303]
+
+Sun Feb 24 15:33:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rb_random_ulong_limited): limit is inclusive, but generic
+	  rand method should return a number less than it, so increase for the
+	  difference.  [ruby-core:52779] [Bug #7935]
+
+Sun Feb 24 15:32:36 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rb_random_ulong_limited): limit is inclusive, but generic
+	  rand method should return a number less than it, so increase for the
+	  difference.  [ruby-core:52779] [Bug #7935]
+
+Sun Feb 24 15:14:43 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Removed duplicate Accept-Encoding in Net::HTTP#get.
+	  [ruby-trunk - Bug #7924]
+	* test/net/http/test_http.rb:  Test for the above.
+
+Wed Feb 20 14:28:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* thread.c: Document ThreadGroup::Default
+
+Wed Feb 20 14:23:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* thread.c: Grammar for #backtrace_locations and ::handle_interrupt
+
+Sun Feb 24 13:35:57 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): block level control frame does not
+	  have method entry, so obtain the method entry from method top-level
+	  control frame to be compared with refined method entry.
+	  [ruby-core:52750] [Bug #7925]
+
+Wed Feb 20 13:23:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* object.c: Document methods receiving string and convert to symbol
+	  Patch by Stefan Rusterholz
+	* vm_eval.c: ditto
+	* vm_method.c: ditto
+
+Wed Feb 20 07:20:56 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (sigsegv): suppress unused result warning. Because
+	  write(2) is marked __warn_unused_result__ on Linux glibc.
+
+Sun Feb 24 07:50:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_set_arguments): no keyword check if any keyword rest
+	  argument exists, even unnamed.  [ruby-core:52744] [Bug #7922]
+
+Sat Feb 23 16:51:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* thread.c: Documentation for Thread#backtrace_locations
+
+Sat Feb 23 16:05:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* vm.c: Typo in ObjectSpace::WeakMap overview
+
+Sat Feb 23 16:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* thread.c: Improved rdoc for ::handle_interrupt, ::pending_interrupt?
+	  and #pending_interrupt?
+
+Sat Feb 23 12:26:43 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el (ruby-electric-curlies)
+	  (ruby-electric-matching-char, ruby-electric-bar): Avoid electric
+	  insertion when there is a prefix argument.
+
+	* misc/ruby-electric.el (ruby-electric-insert)
+	  (ruby-electric-cua-replace-region-p)
+	  (ruby-electric-cua-replace-region): Avoid electric insertion and
+	  fall back when cua-mode is enabled and a region is active.
+
+Sat Feb 23 12:35:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* array.c: Document #<=> return values and formatting
+	* bignum.c: ditto
+	* file.c: ditto
+	* object.c: ditto
+	* numeric.c: ditto
+	* rational.c: ditto
+	* string.c: ditto
+	* time.c: ditto
+
+Sat Feb 23 10:50:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* array.c (rb_ary_diff, rb_ary_and, rb_ary_or): Document return order
+	  [RubySpec #7803]
+
+Sat Feb 23 10:17:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* object.c (rb_obj_comp): Documenting Object#<=> return values
+	  Patch by Stefan Rusterholz
+
+Sat Feb 23 09:48:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (file_s_fnmatch, fnmatch_brace): encoding-incompatible pattern
+	  and string do not match, instead of exception.  [ruby-dev:47069]
+	  [Bug #7911]
+
+Sat Feb 23 08:57:46 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* doc/NEWS-*: Update NEWS from their respective branches
+
+Sat Feb 23 08:14:43 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* NEWS: many additions for Ruby 2.0.0
+
+	* object.c: Add doc for Module.prepended
+
+Sat Feb 23 07:52:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/ruby.pc.in: reorder library flags which may refer library
+	  names.  [Bug #7913]
+
+Fri Feb 22 23:46:20 2013  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
+	  fix a typo in comment in r39384.
+
+Fri Feb 22 18:31:46 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
+	  new attribute to read/write entity expansion text limit.  the default
+	  limit is 10Kb.
+
+	* lib/rexml/text.rb (REXML::Text.unnormalize): check above attribute.
+
+Fri Feb 22 17:36:23 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/test_rbconfig.rb (TestRbConfig): fix r39372.
+	  It must see RbConfig::CONFIG instead of CONFIG.
+
+Fri Feb 22 14:55:41 2013  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* signal.c (ruby_abort): fix typo in r39354 [Bug #5014]
+
+Fri Feb 22 12:46:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rb_random_ulong_limited): fix error message for negative
+	  value.  [ruby-dev:47061] [Bug #7903]
+
+Fri Feb 22 11:36:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/test_rbconfig.rb (TestRbConfig): skip user defined values by
+	  configuration options.  [Bug #7902]
+
+Fri Feb 22 11:33:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#init_mkmf): adjust default library path
+	  for multiarch.  [Bug #7874]
+
+Fri Feb 22 11:10:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* enum.c (Enumerable#chunk: Improved examples, grammar, and formatting
+	  Patch by Dan Bernier and Rich Bruchal of newhaven.rb
+	  [Github documenting-ruby/ruby#8]
+
+Fri Feb 22 11:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* numeric.c: Examples and formatting for Numeric and Float
+	  Based on a patch by Zach Morek and Oren K of newhaven.rb
+	  [Github documenting-ruby/ruby#5]
+
+Fri Feb 22 07:04:41 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb (build_extensions):  Create extension
+	  install destination before building extension.  Patch by Kenta Murata.
+	  [ruby-trunk - Bug #7897]
+	* test/rubygems/test_gem_installer.rb:  Test for the above.
+
+Fri Feb 22 06:30:57 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/globals.rdoc:  Document what setting $DEBUG does.
+
+	* doc/globals.rdoc:  Added pointer to $-d for full documentation.
+
+Fri Feb 22 06:27:07 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/globals.rdoc:  Document what setting $VERBOSE does.  [Bug #7899]
+
+	* doc/globals.rdoc:  Added pointer to $-w and $-v for full
+	  documentation.
+
+Fri Feb 22 02:33:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/abbrev.rb: Add words parameter to Abbrev::abbrev
+	  Patch by Devin Weaver [Github documenting-ruby/ruby#7]
+
+Thu Feb 21 17:28:14 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: add interaction when only ChangeLog is modified.
+
+Thu Feb 21 16:34:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (check_stack_overflow): extract duplicated code and get rid
+	  of declaration-after-statement.  [Bug #5014]
+
+Thu Feb 21 14:14:13 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (sigsegv): avoid to use async signal unsafe functions
+	  when nested sigsegv is happen.
+	  [Bug #5014] [ruby-dev:44082]
+
+Thu Feb 21 13:47:59 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* file.c (rb_group_member): added an error check. SUS says,
+	  getgroups(small_value) may return EINVAL.
+
+Thu Feb 21 13:37:07 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* process.c (RB_MAX_GROUPS): moved to
+	* internal.h (RB_MAX_GROUPS): here.
+
+	* file.c (rb_group_member): use RB_MAX_GROUPS instead of
+	  RUBY_GROUP_MAX. They are the same.
+
+Thu Feb 21 13:15:40 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* file.c (access_internal): removed.
+	* file.c (rb_file_readable_real): use access() instead of
+	  access_internal().
+	* file.c (rb_file_writable_real): ditto.
+	* file.c (rb_file_executable_real): ditto.
+
+Thu Feb 21 13:04:59 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* file.c (eaccess): use access() when not using setuid nor setgid.
+	  This is minor optimization.
+
+Thu Feb 21 12:56:19 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* file.c (rb_group_member): get rid of NGROUPS dependency.
+	  [Bug #7886] [ruby-core:52537]
+
+Thu Feb 21 12:45:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe): try two levels upper for stripping
+	  libdir name.  [Bug #7874]
+
+	* configure.in (libdir_basename): expand with multiarch in configure,
+	  not to defer the expansion till ruby.pc.in and mkmf.rb.  [Bug #7874]
+
+	* configure.in (libdir_basename): also -rpath and -install_name flags
+	  are affected when libruby directory changes.  [Bug #7874]
+
+Wed Feb 20 19:27:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (HAVE_RB_SCAN_ARGS_OPTIONAL_HASH): for
+	  rb_scan_args() optional hash feature.  [Bug #7861]
+
+Wed Feb 20 18:02:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (target_os): do not strip -gnu suffix on Linux if
+	  --target is given explicitly.  [Bug #7874]
+
+	* configure.in (libdirname): adjust library path name which libruby
+	  files will be installed.  [Bug #7874]
+
+	* tool/rbinstall.rb (libdir): ditto.
+
+Wed Feb 20 13:37:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/pty/pty.c: Documentation for the PTY module
+
+Wed Feb 20 12:18:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* object.c: Document Data class [Bug #7890] [ruby-core:52549]
+	  Patch by Matthew Mongeau
+
+Wed Feb 20 11:50:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/mutex_m.rb: Add rdoc for Mutex_m module
+
+Wed Feb 20 09:34:43 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/update_command.rb:  Create the installer after
+	  options are processed.  [ruby-trunk - Bug #7779]
+	* test/rubygems/test_gem_commands_update_command.rb:  Test for the
+	  above.
+
+Wed Feb 20 07:51:19 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Use gsub instead of gsub! to avoid
+	  altering @bin_dir.  Fixes tests on windows.  [ruby-trunk - Bug #7885]
+
+Tue Feb 19 20:50:00 2013  Kenta MURATA  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.gemspec: bump to 1.2.0.
+	  [ruby-core:51777] [Bug #7761]
+
+Tue Feb 19 13:07:25 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/syslog.c (Init_syslog): Define inspect as a singleton
+	  method and remove it as an instance method. [Bug #6502]
+
+Tue Feb 19 12:30:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* object.c: rdoc formatting for Kernel#Array()
+	* array.c: Add rdoc for Array() method to Creating Arrays section
+
+Tue Feb 19 10:35:52 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl.c (class OpenSSL):  Use only inner parenthesis in
+	  create_extension examples.
+
+Tue Feb 19 10:27:12 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl.c (class OpenSSL):  Fixed ExtensionFactory example.
+	  Patch by Richard Bradley.  [ruby-trunk - Bug #7551]
+
+Tue Feb 19 08:32:11 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c (vm_call0_body): check interrupts after method dispatch
+	  from C methods. [Bug #7878]
+
+Tue Feb 19 08:14:40 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Fixed placement of executables with
+	  --user-install.  [ruby-trunk - Bug #7779]
+	* test/rubygems/test_gem_installer.rb:  Test for above.
+
+Tue Feb 19 06:04:06 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_dump: FreeBSD ports' libexecinfo's backtrace(3) can't trace
+	  beyond signal trampoline, and as described in r38342 it can't
+	  trace on -O because it see stack frame pointers.
+	  libunwind unw_backtrace see dwarf information in the binary
+	  and it works with -O (without frame pointers).
+
+	* configure.in: remove r38342's hack and check libunwind.
+
+Tue Feb 19 04:26:29 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: check whether backtrace(3) works well or not.
+
+	* vm_dump.c: set HAVE_BACKTRACE 0 if BROKEN_BACKTRACE.
+
+Mon Feb 18 16:30:18 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/ipaddr.rb (IPAddr#in6_addr): Fix a typo with the closing
+	  parenthesis.
+
+Mon Feb 18 12:32:24 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/ipaddr.rb (IPAddr#in6_addr): Fix the parser so that it can
+	  recognize IPv6 addresses with only one edge 16-bit piece
+	  compressed, like [::2:3:4:5:6:7:8] or [1:2:3:4:5:6:7::].
+	  [Bug #7477]
+
+Mon Feb 18 10:09:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (unexpand_shvar): regularize a shell variable by
+	  unexpanding shell variables in it.
+
+Sun Feb 17 20:55:44 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compar.c (rb_invcmp): compare by inversed comparison, with preventing
+	  from infinite recursion.  [ruby-core:52305] [Bug #7870]
+
+	* string.c (rb_str_cmp_m), time.c (time_cmp): get rid of infinite
+	  recursion.
+
+Sun Feb 17 17:23:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: remove extra topdir in VPATH, which was in
+	  win32/Makefile.sub for some reason and moved from there.
+	  [ruby-dev:46998] [Bug #7864]
+
+Sun Feb 17 01:19:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz
+	  [Github tenderlove/psych#127]
+
+Sun Feb 17 00:52:14 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/mkconfig.rb: remove prefix from rubyarchdir.
+	  r39267 expands variables, it changes expansion timing,
+	  breaks RbConfig::CONFIG["includedir"] and building
+	  extension libraries with installed ruby.
+
+Sat Feb 16 20:51:17 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c (ENV_IN_HEAP_P): fix off-by-one error.
+
+Sat Feb 16 20:47:16 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in (LIBRUBY_DLDFLAGS): Fix a bug where --with-opt-dir
+	  options given were not reflected to LIBRUBY_DLDFLAGS on many
+	  platforms including Linux and other GNU-based systems, NetBSD,
+	  AIX and BeOS.
+
+Sat Feb 16 20:43:20 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (rsock_recvmsg): ignore truncated part of
+	  socket address returned from recvmsg().
+
+	* ext/socket/init.c (recvfrom_blocking): ignore truncated part of
+	  socket address returned from recvfrom().
+	  (rsock_s_recvfrom_nonblock): ditto.
+
+Sat Feb 16 20:05:26 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/ruby/test_thread.rb: fixed typo
+	  patched by Hiroki Matsue via https://github.com/ruby/ruby/pull/248
+
+Sat Feb 16 16:08:35 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (rb_thread_mark): mark a working Proc of bmethod
+	  (a method defined by define_method) even if the method was removed.
+	  We could not trace working Proc object which represents the body
+	  of bmethod if the method was removed (alias/undef/overridden).
+	  Simply, it was mark miss.
+	  This patch by Kazuki Tsujimoto. [Bug #7825]
+
+	  NOTE: We can brush up this marking because we do not need to mark
+	  `me' on each living control frame. We need to mark `me's
+	  only if `me' was free'ed. This is future work after Ruby 2.0.0.
+
+	* test/ruby/test_method.rb: add a test.
+
+Sat Feb 16 15:45:56 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (rb_binding_new_with_cfp): create binding object even if
+	  the frame is IFUNC. But return a ruby-level binding to keep
+	  compatibility.
+	  This patch fix degradation introduced from r39067.
+	  [Bug #7774] [ruby-dev:46960]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+Sat Feb 16 13:40:13 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (shvar_to_cpp): do not substitute exec_prefix itself
+	  with RUBY_EXEC_PREFIX, which cause recursive definition.
+	  [ruby-core:52296] [Bug #7860]
+
+Sat Feb 16 13:13:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/io-console.gemspec: bump to 0.4.2.  now explicitly
+	  requires ruby 1.9.3 or later.  [Bug #7847]
+
+	* ext/io/console/console.c (console_dev): compatibility with ruby 1.8.
+
+	* ext/io/console/console.c (rawmode_opt, console_dev): compatibility
+	  with ruby 1.9.  [ruby-core:52220] [Bug #7847]
+
+Sat Feb 16 12:45:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: unexpand arch sitearch and exec_prefix values, so
+	  directly specified bindir, libdir, rubyprefix, etc can be properly
+	  substituted.  [ruby-core:52296] [Bug #7860]
+
+Sat Feb 16 12:15:20 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* parse.y: add dtrace probe for symbol create.
+
+	* probes.d: ditto
+
+Sat Feb 16 09:27:37 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: don't test sys/feature_tests.h which is not
+	  used now.
+	  It was included in r7901 as "bug of gcc 3.0 on Solaris 8 ?".
+
+Sat Feb 16 09:24:37 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: reorder header tests to consider inclusion
+	  order in rubysocket.h.
+
+Sat Feb 16 08:42:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in, ext/socket/extconf.rb: test netinet/in_systm.h in
+	  ext/socket/extconf.rb instead of configure.in.
+
+	  Originally, netinet/in_systm.h is included for NextStep, OpenStep,
+	  and Rhapsody.  [ruby-core:1596]
+
+Sat Feb 16 07:55:40 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: don't test xti.h here.
+
+	* ext/socket/extconf.rb: test xti.h here.
+
+	  Originally, xti.h is included for IRIX [ruby-core:14447].
+
+Sat Feb 16 07:16:49 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: test struct sockaddr_un and its member,
+	  sun_len.
+
+	* ext/socket/sockport.h (INIT_SOCKADDR_UN): new macro defined.
+
+	* ext/socket/socket.c (sock_s_pack_sockaddr_un): use INIT_SOCKADDR_UN.
+
+	* ext/socket/unixsocket.c (rsock_init_unixsock): ditto.
+
+	* ext/socket/raddrinfo.c (init_unix_addrinfo): ditto.
+	  (addrinfo_mload): ditto.
+
+Sat Feb 16 07:05:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/sockport.h (INIT_SOCKADDR_IN): don't need family
+	  argument.  it is always AF_INET.
+
+	* ext/socket/raddrinfo.c (make_inetaddr): follow INIT_SOCKADDR_IN
+	  change.
+	  (addrinfo_ipv6_to_ipv4): ditto.
+
+Sat Feb 16 04:21:07 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb: workaround for mswin/mingw build problem.
+	  sendmsg emulation in win32/win32.c is not enough.
+
+Sat Feb 16 00:19:20 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: use all all tested available headers for
+	  have_func.
+
+Fri Feb 15 22:21:37 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in: Fix a bug introduced in r38342 that the cflagspat
+	  substitution is messed up by the way CFLAGS and optflags are
+	  modified, which affected FreeBSD and NetBSD/amd64 when
+	  configured to use libexecinfo.  This bug resulted in CFLAGS and
+	  CXXFLAGS in RbConfig::CONFIG having warnflags expanded in them,
+	  forcing third-party C/C++ extensions to follow what warnflags
+	  demands, like ANSI/ISO-C90 conformance.  ref [Bug #7101]
+
+Fri Feb 15 20:29:11 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/sockport.h (SET_SIN_LEN): defined for strict-aliasing
+	  rule.
+	  (INIT_SOCKADDR_IN): ditto.
+
+	* ext/socket/raddrinfo.c (make_inetaddr): use INIT_SOCKADDR_IN.
+	  (addrinfo_ipv6_to_ipv4): ditto.
+
+Fri Feb 15 18:24:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#try_run): bail out explicitly if cross
+	  compiling, because it cannot work of course.
+
+Fri Feb 15 12:34:58 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: test struct sockaddr_storage directly.
+
+	* ext/socket/rubysocket.h: use HAVE_TYPE_STRUCT_SOCKADDR_STORAGE.
+
+Fri Feb 15 12:26:13 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/getaddrinfo.c (GET_AI): don't cast 1st argument for
+	  INIT_SOCKADDR.
+
+Fri Feb 15 08:12:11 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/sockport.h (SET_SS_LEN): removed.
+	  (SET_SIN_LEN): removed.
+	  (INIT_SOCKADDR): new macro.
+
+	* ext/socket/ancdata.c (extract_ipv6_pktinfo): use INIT_SOCKADDR.
+
+	* ext/socket/raddrinfo.c (make_inetaddr): use INIT_SOCKADDR.
+	  (addrinfo_ipv6_to_ipv4): ditto.
+
+	* ext/socket/getaddrinfo.c (GET_AI): use INIT_SOCKADDR.
+
+Fri Feb 15 07:49:27 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc.rb:  Update to release version of 4.0.0
+
+	* lib/rubygems.rb:  Update to release version of 2.0.0
+
+Fri Feb 15 07:07:27 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/sockport.h (SA_LEN): removed because unused now.
+	  (SS_LEN): ditto.
+	  (SIN_LEN): ditto.
+
+Thu Feb 14 10:45:31 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_process.rb (test_setsid): Added a workaround for
+	  MacOS X. Patch by nagachika. [Bug #7826] [ruby-core:52126]
+
+Fri Feb 15 00:15:31 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/sockport.h (VALIDATE_SOCKLEN): new macro to validate
+	  sa_len member of 4.4BSD socket address.
+
+	* ext/socket/getnameinfo.c (getnameinfo): use VALIDATE_SOCKLEN,
+	  instead of SA_LEN.
+
+	* ext/socket/socket.c (sock_s_getnameinfo): use VALIDATE_SOCKLEN
+	  instead of SS_LEN.
+
+Thu Feb 14 22:25:54 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sockaddr_len): extracted from sockaddr_obj.
+	  (sockaddr_obj): add an argument to length of socket address.
+	  (socket_s_ip_address_list): call sockaddr_obj with actual socket
+	  address length if given, use sockaddr_len otherwise.
+
+Thu Feb 14 20:11:23 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: always operate length of socket address companion with
+	  socket address.
+
+	* ext/socket/rubysocket.h (rsock_make_ipaddr): add an argument for
+	  socket address length.
+	  (rsock_ipaddr): ditto.
+
+	* ext/socket/ipsocket.c (ip_addr): pass length to rsock_ipaddr.
+	  (ip_peeraddr): ditto.
+	  (ip_s_getaddress): pass length to rsock_make_ipaddr.
+
+	* ext/socket/socket.c (make_addrinfo): pass length to rsock_ipaddr.
+	  (sock_s_getnameinfo): pass actual address length to rb_getnameinfo.
+	  (sock_s_unpack_sockaddr_in): pass length to rsock_make_ipaddr.
+
+	* ext/socket/init.c (rsock_s_recvfrom): pass length to rsock_ipaddr.
+	  (rsock_s_recvfrom_nonblock): ditto.
+
+	* ext/socket/tcpsocket.c (tcp_sockaddr): pass length to
+	  rsock_make_ipaddr.
+
+	* ext/socket/raddrinfo.c (make_ipaddr0): add an argument for socket
+	  address length.  pass the length to rb_getnameinfo.
+	  (rsock_ipaddr): ditto.
+	  (rsock_make_ipaddr): add an argument for socket address length.
+	  pass the length to make_ipaddr0.
+	  (make_inetaddr): pass length to make_ipaddr0.
+	  a local variable renamed.
+	  (host_str): a local variable renamed.
+	  (port_str): ditto.
+
+Thu Feb 14 14:31:43 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Removed OpenSSL dependency from Net::HTTP.
+
+	* test/net/http/test_http.rb:  Remove Zlib dependency from tests.
+	* test/net/http/test_http_request.rb:  ditto.
+
+Thu Feb 14 11:08:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (include_modules_at): detect cyclic prepend with original
+	  method table.  [ruby-core:52205] [Bug #7841]
+
+Thu Feb 14 10:30:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c: call method_removed hook on called class, not on
+	  prepending iclass.  [ruby-core:52207] [Bug #7843]
+
+Thu Feb 14 10:05:57 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http:  Do not handle Content-Encoding when the user sets
+	  Accept-Encoding.  This allows users to handle Content-Encoding for
+	  themselves.  This restores backwards-compatibility with Ruby 1.x.
+	  [ruby-trunk - Bug #7831]
+	* lib/net/http/generic_request.rb:  ditto.
+	* lib/net/http/response.rb:  ditto
+	* test/net/http/test_http.rb:  Test for the above.
+	* test/net/http/test_http_request.rb:  ditto.
+	* test/net/http/test_httpresponse.rb:  ditto.
+
+Thu Feb 14 08:18:47 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: don't define HAVE_SA_LEN and HAVE_SA_LEN.
+	  use HAVE_STRUCT_SOCKADDR_SA_LEN and HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+	  instead.
+
+Wed Feb 13 20:59:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: don't define socklen_t here, just test.
+
+	* ext/socket/rubysocket.h: define socklen_t if not available.
+
+Wed Feb 13 18:37:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (mnew): skip prepending modules and return the method bound
+	  on the given class.  [ruby-core:52160] [Bug #7836]
+
+Wed Feb 13 18:11:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (method_original_name): new methods Method#original_name and
+	  UnboundMethod#original_name.  [ruby-core:52048] [Bug #7806]
+	  [EXPERIMENTAL]
+
+	* proc.c (method_inspect): show the given name primarily, and
+	  original_id if aliased.  [ruby-core:52048] [Bug #7806]
+
+Wed Feb 13 17:56:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (warnflags): disable -Werror by default unless
+	  development.  [ruby-core:52131] [Bug #7830]
+
+Wed Feb 13 06:05:52 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Return BINARY strings from Gem.gzip and Gem.gunzip.
+	  Fixes intermittent test failures.  RubyGems issue #450 by Jeremey
+	  Kemper.
+	* test/rubygems/test_gem.rb:  Test for the above.
+
+Wed Feb 13 05:49:21 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: test functions just after struct members.
+
+Tue Feb 12 12:02:35 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: merge JSON 1.7.7.
+	  This includes security fix. [CVE-2013-0269]
+	  https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2
+	  https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion
+
+Mon Feb 11 23:08:48 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: enable rb_cv_page_size_log test for MirOS BSD.
+
+Mon Feb 11 20:06:38 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: use -pthread on mirbsd*.
+
+Mon Feb 11 16:07:09 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: add SOLIBS and LIBRUBY_SO definition for mirbsd*.
+
+Mon Feb 11 13:17:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rubysitearchprefix): sitearchdir and vendorarchdir
+	  should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]
+
+	* win32/Makefile.sub (config.status): site and vendor directories
+	  should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]
+
+Mon Feb 11 12:31:25 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: move OS specific header/function knowledge before
+	  automatic header tests.
+
+Mon Feb 11 11:04:29 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: move the test for -march=i486 just after
+	  RUBY_UNIVERSAL_ARCH/RUBY_DEFAULT_ARCH.
+
+Sun Feb 10 23:42:26 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: test structure members just after types test.
+
+Sun Feb 10 20:58:17 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: test types just after headers test.
+
+Sun Feb  10 16:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/rake/doc/MIT-LICENSE: Add license file from upstream
+	* lib/rake/doc/README.rdoc: Link to license file from Rake README
+	* lib/rake/version.rb: Include README rdoc for Rake module overview
+
+Sun Feb  10 15:26:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/rake/doc/*: Sync Rake rdoc files from upstream
+
+Sun Feb 10 15:50:02 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm_exec.h (DISPATCH_ARCH_DEPEND_WAY): use __asm__ __volatile__
+	  instead of asm volatile.
+
+Sun Feb 10 15:50:02 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* gc.h (SET_MACHINE_STACK_END): use __volatile__ instead of volatile.
+
+Sun Feb 10 14:25:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/rake/, lib/rake/doc/: Move Rake rdoc files to lib/rake
+
+Sun Feb 10 12:10:25 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: test headers at first.
+
+Sun Feb  10 12:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* doc/rake/*: Removed stale Rake static files
+
+Sun Feb  10 09:10:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/pp.rb, lib/prettyprint.rb: Documentation for PP and PrettyPrint
+	  Based on a patch by Vincent Batts [ruby-core:51253] [Bug #7656]
+
+Sat Feb  9 21:11:21 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: move header files check to the beginning of
+	  "header and library section".
+	  test rlim_t with sys/types.h and sys/time.h for MirOS BSD.
+	  sys/types.h and sys/time.h is guarded by #ifdef and the above
+	  move is required for this change.
+
+Sat Feb  9 17:45:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, version.c: prevent duplicated load paths by empty
+	  version string, it does not work right now.
+
+Sat Feb  9 17:38:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: fix arch parameters in help message.  [Bug #7804]
+
+Sat Feb  9 13:13:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* vm_trace.c: Note about TracePoint events set, and comment on
+	  Kernel#set_trace_func to prefer new TracePoint API
+
+Sat Feb  9 10:07:47 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* BSDL: update copyright notice for 2013.
+
+Sat Feb  9 09:24:38 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package/old.rb:  Fix behavior only on ruby 1.8.
+
+	* lib/rubygems/package.rb:  Include checksums.yaml.gz signatures for
+	  verification.
+	* test/rubygems/test_gem_package.rb:  Test for the above.
+
+Sat Feb  9 01:23:24 2013  Tanaka Akira  <akr@fsij.org>
+
+	* test/fiddle/helper.rb: specify libc and libm locations for MirOS BSD.
+
+	* test/dl/test_base.rb: ditto.
+
+Fri Feb  8 23:25:33 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: change CFLAGS temporally to test
+	  ARCH_FLAG="-march=i486".
+
+Fri Feb  8 21:19:41 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: don't define ARCH_FLAG="-march=i486" if it causes
+	  compilation problem.
+
+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.2.0 b/doc/ChangeLog-2.2.0
new file mode 100644
index 0000000000..5a7dbf826d
--- /dev/null
+++ b/doc/ChangeLog-2.2.0
@@ -0,0 +1,12157 @@
+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
new file mode 100644
index 0000000000..7f3c4e672a
--- /dev/null
+++ b/doc/ChangeLog-2.3.0
@@ -0,0 +1,12187 @@
+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
new file mode 100644
index 0000000000..96b5ecb077
--- /dev/null
+++ b/doc/ChangeLog-2.4.0
@@ -0,0 +1,9492 @@
+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 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-YARV b/doc/ChangeLog-YARV
index cbc51c5593..a8b999dff2 100644
--- a/doc/ChangeLog-YARV
+++ b/doc/ChangeLog-YARV
@@ -86,7 +86,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 	* blockinlining.c, compile.c, compile.h, debug.c, debug.h,
 	insnhelper.h, insns.def, iseq.c, thread.c, thread_pthread.ci,
 	thread_pthread.h, thread_win32.ci, thread_win32.h, vm.c, vm.h,
-	vm_dump.c, vm_evalbody.ci,  vm_opts.h.base,  yarv.h, 
+	vm_dump.c, vm_evalbody.ci,  vm_opts.h.base,  yarv.h,
 	yarv_version.h, yarvcore.c, yarvcore.h :
 	add a header includes copyright
 
@@ -110,7 +110,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* signal.c : ditto
 
-	* test/ruby/test_signal.rb : 
+	* test/ruby/test_signal.rb :
 
 	* thread_pthread.ci : rename timer thread functions
 
@@ -203,7 +203,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* ext/dbm, dl, gdbm, iconv, io, pty, sdbm : added
 
-	* test/dbm, gdbm, io, logger, net, readline, sdbm, soap, 
+	* test/dbm, gdbm, io, logger, net, readline, sdbm, soap,
 	  webrick, win32ole, wsdl, xsd : added
 
 
@@ -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 initilize routine order ([yarv-dev:1067])
+	* eval.c : change initialize routine order ([yarv-dev:1067])
 
 	* yarvcore.c (Init_yarv) : init th->machine_stack_start
 
@@ -652,7 +652,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
         * vm.c : ditto
 
-        * yarvcore.c : prohibit tail call optimization to mark 
+        * yarvcore.c : prohibit tail call optimization to mark
 	iseq object
 
         * yarvcore.h : add some allocator function declaration
@@ -906,7 +906,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* yarvcore.h : disable to use get/setcontext
 
-	* lib/webrick/server.rb : add experimental implementation 
+	* lib/webrick/server.rb : add experimental implementation
 	using thraeds pool
 
 
@@ -1447,7 +1447,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* insns.def : ditto
 
-	* vm_dump.c : 
+	* vm_dump.c :
 
 	* intern.h : change rb_thread_signal_raise/exit interface
 
@@ -2060,7 +2060,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 2006-02-15(Wed) 17:39:16 +0900  Koichi Sasada  <ko1@atdot.net>
 
-	* eval_intern.h : 
+	* eval_intern.h :
 
 	* eval_jump.h, vm.c : localjump_error() and jump_tag_but_local_jump()
 	move to th_localjump_error and th_jump_tag_but_local_jump at vm.c
@@ -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 deafult
+	* configure.in : enable pthread by default
 
 	* 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 refering klass.
+	  break'ing, check it before referring 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 positon
+	* error.c : fix include file position
 
 	* test/ruby/test_signal.rb : skip test_exit_action on cygwin
 
@@ -2618,123 +2618,123 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* array.c : revert last commit
 
-	* ascii.c : ditto 
+	* ascii.c : ditto
 
-	* bignum.c : ditto 
+	* bignum.c : ditto
 
-	* class.c : ditto 
+	* class.c : ditto
 
-	* compar.c : ditto 
+	* compar.c : ditto
 
-	* defines.h : ditto 
+	* defines.h : ditto
 
-	* dir.c : ditto 
+	* dir.c : ditto
 
-	* dln.c : ditto 
+	* dln.c : ditto
 
-	* dln.h : ditto 
+	* dln.h : ditto
 
-	* enum.c : ditto 
+	* enum.c : ditto
 
-	* enumerator.c : ditto 
+	* enumerator.c : ditto
 
-	* error.c : ditto 
+	* error.c : ditto
 
-	* euc_jp.c : ditto 
+	* euc_jp.c : ditto
 
-	* file.c : ditto 
+	* file.c : ditto
 
-	* gc.c : ditto 
+	* gc.c : ditto
 
-	* hash.c : ditto 
+	* hash.c : ditto
 
-	* intern.h : ditto 
+	* intern.h : ditto
 
-	* io.c : ditto 
+	* io.c : ditto
 
-	* lex.c : ditto 
+	* lex.c : ditto
 
-	* main.c : ditto 
+	* main.c : ditto
 
-	* marshal.c : ditto 
+	* marshal.c : ditto
 
-	* math.c : ditto 
+	* math.c : ditto
 
-	* missing.h : ditto 
+	* missing.h : ditto
 
-	* node.h : ditto 
+	* node.h : ditto
 
-	* numeric.c : ditto 
+	* numeric.c : ditto
 
-	* object.c : ditto 
+	* object.c : ditto
 
-	* oniguruma.h : ditto 
+	* oniguruma.h : ditto
 
-	* pack.c : ditto 
+	* pack.c : ditto
 
-	* prec.c : ditto 
+	* prec.c : ditto
 
-	* process.c : ditto 
+	* process.c : ditto
 
-	* random.c : ditto 
+	* random.c : ditto
 
-	* range.c : ditto 
+	* range.c : ditto
 
-	* rb/mklog.rb : ditto 
+	* rb/mklog.rb : ditto
 
-	* re.c : ditto 
+	* re.c : ditto
 
-	* regcomp.c : ditto 
+	* regcomp.c : ditto
 
-	* regenc.c : ditto 
+	* regenc.c : ditto
 
-	* regenc.h : ditto 
+	* regenc.h : ditto
 
-	* regerror.c : ditto 
+	* regerror.c : ditto
 
-	* regex.h : ditto 
+	* regex.h : ditto
 
-	* regexec.c : ditto 
+	* regexec.c : ditto
 
-	* regint.h : ditto 
+	* regint.h : ditto
 
-	* regparse.c : ditto 
+	* regparse.c : ditto
 
-	* regparse.h : ditto 
+	* regparse.h : ditto
 
-	* ruby.c : ditto 
+	* ruby.c : ditto
 
-	* ruby.h : ditto 
+	* ruby.h : ditto
 
-	* rubyio.h : ditto 
+	* rubyio.h : ditto
 
-	* rubysig.h : ditto 
+	* rubysig.h : ditto
 
-	* signal.c : ditto 
+	* signal.c : ditto
 
-	* sjis.c : ditto 
+	* sjis.c : ditto
 
-	* sprintf.c : ditto 
+	* sprintf.c : ditto
 
-	* st.c : ditto 
+	* st.c : ditto
 
-	* st.h : ditto 
+	* st.h : ditto
 
-	* string.c : ditto 
+	* string.c : ditto
 
-	* struct.c : ditto 
+	* struct.c : ditto
 
-	* time.c : ditto 
+	* time.c : ditto
 
-	* utf8.c : ditto 
+	* utf8.c : ditto
 
-	* util.c : ditto 
+	* util.c : ditto
 
-	* util.h : ditto 
+	* util.h : ditto
 
-	* variable.c : ditto 
+	* variable.c : ditto
 
-	* version.c : ditto 
+	* version.c : ditto
 
 
 2006-02-12(Sun) 21:33:10 +0900  Koichi Sasada  <ko1@atdot.net>
@@ -3151,7 +3151,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 2006-02-12(Sun) 05:05:02 +0900  Koichi Sasada  <ko1@atdot.net>
 
 	* eval.c, eval_intern.h, eval_load.c, eval_proc.c, node.h,
-	insnhelper.h, insns.def, vm.c, yarvcore.c, yarvcore.h : 
+	insnhelper.h, insns.def, vm.c, yarvcore.c, yarvcore.h :
 	change cref data structure and unify ruby_class and ruby_cbase
 	and some refoctoring
 
@@ -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 runnning threads
+	current running threads
 
 	* vm.c (th_invoke_proc) : jump with JUMP_TAG() if some exception
-	occurres
+	occurs
 
 	* yarv.h : add yarv_set_current_running_thread_raw() for bootstrap
 
@@ -3810,7 +3810,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* yarvtest/test_eval.rb : added
 
-	* yarvtest/test_proc.rb : 
+	* yarvtest/test_proc.rb :
 
 
 2005-12-29(Thu) 12:27:12 +0900  Koichi Sasada  <ko1@atdot.net>
@@ -4091,7 +4091,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 2005-12-25(Sun) 01:45:55 +0900  Koichi Sasada  <ko1@atdot.net>
 
-	* insns.def, compile.c, rb/insns2vm.rb, template/insns_info.inc.tmpl : 
+	* insns.def, compile.c, rb/insns2vm.rb, template/insns_info.inc.tmpl :
 	trace stack depth at compile time
 	and use it  as cont_sp for exception handling
 
@@ -4167,7 +4167,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* compile.c, yarvcore.h : support all defined?() syntax
 
-	* compile.c : fix NODE_COLON2 
+	* compile.c : fix NODE_COLON2
 
 	* yarvtest/test_bin.rb : add or fix tests for above
 
@@ -4278,7 +4278,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* insns.def : remove logic for zsuper
 
-	* template/optinsn.inc.tmpl : 
+	* template/optinsn.inc.tmpl :
 
 	* vm.c : remove thread_yield_light_prepare, thread_yield_light_invoke
 
@@ -4292,7 +4292,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 	* array.c, numeric.c, range.c : add prototype of
 	block inlining function
 
-	* blockinlining.c, vm_opts.h.base : add block inlining flag 
+	* blockinlining.c, vm_opts.h.base : add block inlining flag
 
 	* common.mk, debug.h, debug.c : add debug_breakpoint() for gdb
 
@@ -4328,7 +4328,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* vm.c : fix to skip pushing value at "next"
 
-	* yarvcore.h : move definision of 
+	* yarvcore.h : move definition of
 	"struct iseq_compile_data_ensure_node_stack" to compile.c
 
 	* compile.c : fix ensure catch table creation
@@ -4390,7 +4390,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 2005-11-29(Tue) 16:39:07 +0900  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c, eval_proc.c, vm.c, vm_macro.def : 
+	* eval.c, eval_proc.c, vm.c, vm_macro.def :
 	support define_method and invoke NODE_BMETHOD method
 
 
@@ -4478,7 +4478,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 	* debug.c : add debug_v() and change to use only printf
 	on debug_id()
 
-	* sample/test.rb : 
+	* sample/test.rb :
 
 	* vm.c : fix make_proc_from_block
 
@@ -4539,7 +4539,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* eval.c : support rb_frame_pop() and rb_frame_callee(),
 	add rb_sourcefile(), rb_sourceline(),
-	
+
 
 	* compile.c : support postposition while/until,
 	fix block parameter index
@@ -4582,7 +4582,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* benchmark/other-lang/eval.rb : fix path
 
-	* lib/English.rb, lib/cgi.rb, lib/complex.rb, lib/delegate.rb : 
+	* lib/English.rb, lib/cgi.rb, lib/complex.rb, lib/delegate.rb :
 	added
 
 
@@ -4712,7 +4712,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 2005-10-05(Wed) 21:20:13 +0900  Koichi Sasada  <ko1@atdot.net>
 
-	* eva.c, eval_thread.c, ruby.h, eval_error.h, eval_jump.h, 
+	* eva.c, eval_thread.c, ruby.h, eval_error.h, eval_jump.h,
 	eval_load.c, thread.c, error.c, compile.h : remove ruby_errinfo
 
 	* thread_win32.h, thread_pthread.h : set stack size to 4KB
@@ -4795,7 +4795,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* thread.c, common.mk : add thread.c
 
-	* thread.c, gc.c, eval_thread.c, yarvcore.c, yarvcore.h : 
+	* thread.c, gc.c, eval_thread.c, yarvcore.c, yarvcore.h :
 	support native thread (on pthread)
 
 	* insns.def : add YARV_CHECK_INTS() check
@@ -5322,7 +5322,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* yarvcore.c, yarvcore.h : remove cYarvThrowObject (unused)
 
-	* yarvcore.c, yarvcore.h, insns.def : 
+	* yarvcore.c, yarvcore.h, insns.def :
 	thread_object#stack_mark_poinetr
 
 	* depend, rb/eval.rb : BOPT, TOPT -> OPT
@@ -5394,7 +5394,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* tmpl/vmtc.inc.tmpl : add const prefix
 
-	* /rb/asm_parse.rb, extconf.rb : added and make assembler analised output 
+	* /rb/asm_parse.rb, extconf.rb : added and make assembler analised output
 
 	* opt_operand.def : add send operands unification
 
@@ -5493,7 +5493,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* depend : adde reconf rule
 
-	* insnhelper.h : 
+	* insnhelper.h :
 
 	* vm_evalbody.inc : rename to vm_evalbody.h
 
@@ -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 betweeen target name and colon
+	* depend : remove space between target name and colon
 
 
 2005-03-04(Fri) 15:55:51 +0900  Koichi Sasada  <ko1@atdot.net>
@@ -5711,7 +5711,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* yarvcore.h : make type "struct iseq_compile_data"
 
-	* yarvcore.h : iseq_object#insn_info_ary to iseq_object#insn_info_tbl 
+	* yarvcore.h : iseq_object#insn_info_ary to iseq_object#insn_info_tbl
 
 
 2005-02-21(Mon) 05:24:01 +0900  Koichi Sasada  <ko1@atdot.net>
@@ -5736,7 +5736,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* test/test_method.rb : add tests for above
 
-	* insns.def : opt_ltlt and 
+	* insns.def : opt_ltlt and
 
 
 2005-02-18(Fri) 08:54:40 +0900  Koichi Sasada  <ko1@atdot.net>
@@ -5770,7 +5770,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* yarvcore.h, insns.def, compile.c : support defined? expression (limited)
 
-	* test/test_syn.rb : tests for above is added 
+	* test/test_syn.rb : tests for above is added
 
 	* compile.c, insns.def : support block passed method dispatch
 
@@ -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 'poped'
+	* compile.c : NODE_SUPER, NODE_ZSUPER check 'popped'
 	and NODE_RETURN check outer type
 	and NODE_DREGX_ONCE supported (temporarily)
 
@@ -6002,7 +6002,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* vm.c (thread_dump_regs) : added
 
-	* vm.c (thread_call0, thread_call0_cfunc, thread_invoke_yield, 
+	* vm.c (thread_call0, thread_call0_cfunc, thread_invoke_yield,
 	thread_invoke_yield_cfunc), insns.def (yield, send) :
 	fixed, added to support IFUNC
 
@@ -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 unnecesary each
+	* rb/insns2vm.rb : remove unnecessary each
 
 
 2004-12-17(Fri) 18:56:38 +0900  Koichi Sasada  <ko1@atdot.net>
@@ -6322,7 +6322,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 2004-12-02(Thu) 13:20:41 +0900  Koichi Sasada  <ko1@atdot.net>
 
 	* yarvcore.c, vm.h, vm.c, insns.def, insnhelper.h, yarvutil.rb :
-	add usage analisys framework 
+	add usage analisys framework
 
 	* disasm.c : insn_operand_intern to separate function
 
@@ -6397,7 +6397,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* vm.c : fix stack dump routine
 
-	* vm.c : impliment thread_funcall (temporarily)
+	* vm.c : implement thread_funcall (temporarily)
 
 	* yarv.h : add IS_YARV_WORKING(), SET_YARV_START(), SET_YARV_STOP()
 
@@ -6433,7 +6433,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* yarv.h : added
 
-	* yarvcore.c, yarv.h : support yarv_is_working, yarv_block_given_p, 
+	* yarvcore.c, yarv.h : support yarv_is_working, yarv_block_given_p,
 	yarv_yield, yarv_funcall (only dummy function)
 
 	* vm.c : thread_eval_body changed return value
@@ -6488,7 +6488,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 2004-11-01(Mon) 04:45:54 +0900  Koichi Sasada  <ko1@atdot.net>
 
-	* yarvcore.h, compile.c, debug.c, version.h : 
+	* yarvcore.h, compile.c, debug.c, version.h :
 	redesgin gc debug scheme (GC_CHECK())
 
 	* yarvcore.c : mark iseqobj->current_block on GC
@@ -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(imcomplete)
+	next, redo, return(incomplete)
 
 
 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 460a7c9328..5da39ff265 100644
--- a/doc/NEWS-1.8.7
+++ b/doc/NEWS-1.8.7
@@ -1,4 +1,6 @@
-= NEWS
+# -*- rdoc -*-
+
+= NEWS for Ruby 1.8.7
 
 This document is a list of user visible feature changes made between
 releases except for bug fixes.
@@ -52,7 +54,7 @@ with all sufficient information, see the ChangeLog file.
   * Array#flatten
   * Array#flatten!
 
-    Take an optional argument that determines the level of recursion
+    Takes an optional argument that determines the level of recursion
     to flatten.
 
   * Array#eql?
@@ -75,6 +77,7 @@ with all sufficient information, see the ChangeLog file.
   * Array#reject
   * Array#reject!
   * Array#delete_if
+  * Array#select
 
     Return an enumerator if no block is given.
 
@@ -159,6 +162,10 @@ with all sufficient information, see the ChangeLog file.
 
     New alias to #inject.
 
+  * Enumerable#to_a
+
+    Can take optional arguments and pass them to #each.
+
   * Hash#eql?
   * Hash#hash
   * Hash#==
@@ -223,7 +230,7 @@ with all sufficient information, see the ChangeLog file.
   * ARGF.lines
   * ARGF.readbyte
 
-    New methods. 
+    New methods.
 
   * Method#name
   * Method#owner
@@ -260,12 +267,17 @@ with all sufficient information, see the ChangeLog file.
 
   * Regexp.union accepts an array of patterns.
 
+  * String#bytes
+
+    New method
+
   * String#bytesize
 
     New method, returning the size in bytes. (alias length and size)
 
   * String#chars
   * String#each_char
+  * String#lines
   * String#partition
   * String#rpartition
   * String#start_with?
@@ -405,7 +417,7 @@ with all sufficient information, see the ChangeLog file.
     * FTP
       * URI('ftp://example.com/foo').path #=> 'foo'
       * URI('ftp://example.com/%2Ffoo').path #=> '/foo'
-      * URI::FTP.build([nil, 'example.com', nil, '/foo', 'i').to_s #=> 'ftp://example.com/%2Ffoo;type=i'
+      * URI::FTP.build([nil, 'example.com', nil, '/foo', 'i']).to_s #=> 'ftp://example.com/%2Ffoo;type=i'
     * URI merge
       * URI('http://a/b/c/d;p?q').merge('?y') == URI('http://a/b/c/d;p?y')
       * URI('http://a/b/c/d;p?q').merge('/./g') == URI('http://a/g')
@@ -499,6 +511,15 @@ with all sufficient information, see the ChangeLog file.
     always use Date.strptime() when you know what you are dealing
     with.
 
+* REXML
+
+  * REXML::Document.entity_expansion_limit=
+
+    New method to set the entity expansion limit. By default the limit is
+    set to 10000.  See the following URL for details.
+
+    https://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
+
 * stringio
 
   * StringIO#each_byte
@@ -617,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-1.9.1 b/doc/NEWS-1.9.1
index f2afa00bdc..fb11026d60 100644
--- a/doc/NEWS-1.9.1
+++ b/doc/NEWS-1.9.1
@@ -1,4 +1,6 @@
-= NEWS
+# -*- rdoc -*-
+
+= NEWS for Ruby 1.9.1
 
 This document is a list of user visible feature changes made between
 releases except for bug fixes.
@@ -31,18 +33,18 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
 * builtin classes and objects
 
     * Kernel and Object
-          o Kernel#methods and #singleton_methods used to return an 
+          o Kernel#methods and #singleton_methods used to return an
             array of strings but now they return an array of symbols.
     * Class and Module
           o Module#attr works as Module#attr_reader by default.
 	    Optional boolean argument is obsolete.
           o Module#instance_methods, #private_instance_methods and
-            #public_instance_methods used to return an array of 
+            #public_instance_methods used to return an array of
             strings but now they return an array of symbols.
           o Extra subclassing check when binding UnboundMethods
-            
+
     * Exceptions
-          o Exceptions are equal to each other if they belong to 
+          o Exceptions are equal to each other if they belong to
             the same class and have the same message and backtrace.
           o SystemStackError used to be a subclass of StandardError
             but not it is a direct subclass of Exception.
@@ -71,7 +73,7 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
           o Most of the changes in Hash apply to hash like interfaces
             such as ENV and *DBM.
     * IO operations
-          o Many methods used to act byte-wise but now some of those act 
+          o Many methods used to act byte-wise but now some of those act
             character-wise. You can use alternate byte-wise methods.
           o IO#getc
           o Non-blocking IO
@@ -94,7 +96,7 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
           o IO#internal_encoding, IO#external_encoding,
             IO#set_encoding
           o IO.pipe takes encoding option
-          o Directive %u behaves like %d for negative values in 
+          o Directive %u behaves like %d for negative values in
             printf-style formatting.
     * File and Dir operations
           o #to_path is called as necessary in File.path, File.chmod,
@@ -168,7 +170,7 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
     * Pathname
           o No longer has #to_str nor #=~.
     * time and date
-          o Time.parse and Date.parse interprets slashed numerical dates 
+          o Time.parse and Date.parse interprets slashed numerical dates
 	    as "dd/mm/yyyy".
     * Readline
           o If Readline uses libedit, Readline::HISTORY[0] returns the
@@ -209,15 +211,15 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
     * New syntax and semantics
           o Magic comments to declare in which encoding your source
             code is written
-          o New literal hash syntax and new syntax for hash style 
-	    arguments 
+          o New literal hash syntax and new syntax for hash style
+	    arguments
           o New syntax for lambdas
           o .() and calling Procs without #call/#[]
           o Block in block arguments
           o Block local variables
           o Mandatory arguments after optional arguments allowed
           o Multiple splats allowed
-          o #[] can take splatted arguments, hash style arguments 
+          o #[] can take splatted arguments, hash style arguments
             and a block.
           o New directives in printf-style formatted strings (%).
           o Newlines allowed before ternary colon operator (:) and
@@ -263,7 +265,7 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
 
     * Enumerable and Enumerator
           o Enumerator#enum_cons and Enumerator#enum_slice are
-            removed.  Use #each_cons and #each_slice without a block.            
+            removed.  Use #each_cons and #each_slice without a block.
           o Enumerable#each_with_index can take optional arguments
             and passes them to #each.
           o Enumerable#each_with_object
@@ -333,6 +335,11 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
           o Numeric#upto, #downto, #times, #step
           o Numeric#real?, Complex#real?
           o Numeric#magnitude
+          o Numeric#round
+    * Float
+          o Float#round
+    * Integer
+          o Integer#round
     * Rational / Complex
           o They are in the core library now
     * Math
@@ -386,7 +393,7 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
           o Readline.emacs_editing_mode?
           o Readline::HISTORY.clear
     * Tk
-          o TkXXX widget classes are removed and redefined as aliases of 
+          o TkXXX widget classes are removed and redefined as aliases of
             Tk::XXX classes.
     * RDoc
           o Updated to version 2.2.2.  See:
diff --git a/doc/NEWS-1.9.2 b/doc/NEWS-1.9.2
index 11e5c82c58..430c6cc4f5 100644
--- a/doc/NEWS-1.9.2
+++ b/doc/NEWS-1.9.2
@@ -1,5 +1,5 @@
-# -*- rd -*-
-= NEWS
+# -*- rdoc -*-
+= NEWS for Ruby 1.9.2
 
 This document is a list of user visible feature changes made between
 releases except for bug fixes.
@@ -14,7 +14,7 @@ with all sufficient information, see the ChangeLog file.
 * builtin classes
 
   * Array
-    * new method:
+    * new methods:
       * Array#keep_if
       * Array#repeated_combination
       * Array#repeated_permutation
@@ -23,11 +23,11 @@ with all sufficient information, see the ChangeLog file.
       * Array#select!
       * Array#sort_by!
 
-    * extended methods:
+    * extended method:
       * Array#{uniq,uniq!,product} can take a block.
 
   * Complex
-    * new methods:
+    * new method:
       * Complex#rationalize
 
   * Dir
@@ -50,7 +50,7 @@ with all sufficient information, see the ChangeLog file.
       * ascii_compatible?
 
   * Enumerable
-    * New methods:
+    * new methods:
       * Enumerable#chunk
       * Enumerable#collect_concat
       * Enumerable#each_entry
@@ -65,7 +65,7 @@ with all sufficient information, see the ChangeLog file.
       * Enumerator#feed
       * StopIteration#result
 
-    * extended methods:
+    * extended method:
       * #with_index accepts an optional argument that specifies the
         index number to start with, defaulted to 0.
 
@@ -85,14 +85,13 @@ with all sufficient information, see the ChangeLog file.
     * new constants:
       * Float::INFINITY
       * Float::NAN
-    * new methods:
+    * new method:
       * Float#rationalize
 
   * File
     * new methods:
       * File.realpath
       * File.realdirpath
-      * File#size
 
   * GC::Profiler
     * new method:
@@ -104,14 +103,14 @@ with all sufficient information, see the ChangeLog file.
       * Hash#select!
 
   * IO
-    * new method:
+    * new methods:
       * IO#autoclose=
       * IO#autoclose?
       * IO#fdatasync
       * IO#codepoints
       * IO#each_codepoint
 
-    * extended methods:
+    * extended method:
       * IO.pipe can take a block.
 
     * new modules:
@@ -120,7 +119,7 @@ with all sufficient information, see the ChangeLog file.
         They are used to extend non-blocking exceptions.
 
   * Integer
-    * new methods:
+    * new method:
       * Integer#rationalize
 
   * Kernel
@@ -129,7 +128,7 @@ with all sufficient information, see the ChangeLog file.
       * Kernel#singleton_class
       * Kernel#require_relative
 
-    * extended methods:
+    * extended method:
       * Kernel#respond_to? can be used to detect methods not implemented.
         For example, Process.respond_to?(:fork) returns false on Windows.
 
@@ -147,11 +146,15 @@ with all sufficient information, see the ChangeLog file.
         platforms.
 
   * MatchData
-    * New method:
+    * new method:
       * MatchData#==
 
+  * Method
+    * new method:
+      * Method#parameters
+
   * NilClass
-    * new methods:
+    * new method:
       * NilClass#rationalize
 
   * Object
@@ -160,18 +163,20 @@ with all sufficient information, see the ChangeLog file.
       * printf() supports %a/%A format.
 
   * Proc
+    * new method:
+      * Proc#parameters
     * extended method:
       * Proc#source_location returns location even if receiver is a method
         defined by attr_reader / attr_writer / attr_accessor.
 
   * Process
-    * extended methods:
+    * extended method:
       * Process.spawn accepts [:child, FD] for a redirect target.
 
   * Random (new class to generate pseudo-random numbers)
 
   * Rational
-    * new methods:
+    * new method:
       * Rational#rationalize
 
   * String
@@ -184,22 +189,27 @@ with all sufficient information, see the ChangeLog file.
       * Thread#set_trace_func
 
   * Time
-    * extended feature:
+    * extended features:
       * time_t restriction is removed to represent before 1901 and after 2038.
         Proleptic Gregorian calendar is used for old dates.
       * Time.new have optional arguments to specify date with time offset.
       * Time#getlocal, Time#localtime have optional time offset argument.
 
-    * new method:
+    * new methods:
       * Time#to_r
       * Time#subsec
       * Time#round
 
-    * incompatible changes:
+    * incompatible change:
       * The year argument of Time.{utc,gm,local,mktime} is now interpreted as
         the value itself.  For example, Time.utc(99) means the year 99 AD,
         not 1999 AD.
 
+  * UnboundMethod
+    * new method:
+      * UnboundMethod#parameters
+
+
 * digest
   * new methods:
     * Digest::Class.base64digest
@@ -230,7 +240,7 @@ with all sufficient information, see the ChangeLog file.
     * new alias of item.guid.isPermaLink=
 
 * DL
-  * Now uses libffi as a backend if avaiable.
+  * Now uses libffi as a backend if available.
     It means DL works fine on more platforms.
 
 * Fiddle
@@ -253,7 +263,7 @@ with all sufficient information, see the ChangeLog file.
     New method to set the entity expansion limit. By default the limit is
     set to 10000.  See the following URL for details.
 
-    http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
+    https://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
 
 * RDoc
 
diff --git a/doc/NEWS-1.9.3 b/doc/NEWS-1.9.3
new file mode 100644
index 0000000000..484660f420
--- /dev/null
+++ b/doc/NEWS-1.9.3
@@ -0,0 +1,341 @@
+# -*- rdoc -*-
+= NEWS for Ruby 1.9.3
+
+This document is a list of user visible feature changes made between
+releases except for bug fixes.
+
+Note that each entry is kept so brief that no reason behind or
+reference information is supplied with.  For a full list of changes
+with all sufficient information, see the ChangeLog file.
+
+== Changes since the 1.9.2 release
+=== License
+
+* Ruby's License is changed from a dual license with GPLv2
+  to a dual license with 2-clause BSDL.
+
+=== Known platform dependent issues
+==== OS X Lion
+
+* You have to configure ruby with '--with-gcc=gcc-4.2' if you're using
+  Xcode 4.1, or, if you're using Xcode 4.2, you have to configure ruby
+  with '--with-gcc=clang'.
+
+=== C API updates
+
+* rb_scan_args() is enhanced with support for option hash argument
+  extraction.
+
+* ruby_vm_at_exit() added.  This enables extension libs to hook a VM
+  termination.
+
+* rb_reserved_fd_p() added.  If you want to close all file descriptors,
+  check using this API.  [ruby-core:37759]
+
+=== Library updates (outstanding ones only)
+
+* builtin classes
+
+  * ARGF
+    * new methods:
+      * ARGF.print
+      * ARGF.printf
+      * ARGF.putc
+      * ARGF.puts
+      * ARGF.read_nonblock
+      * ARGF.to_write_io
+      * ARGF.write
+
+  * Array
+    * extended method:
+      * Array#pack supports endian modifiers
+
+  * Bignum
+    * Multiplication algorithm for Bignums with a large number of digits over
+      150 BDIGITs is changed in order to reduce its calculation time.
+      Now such large Bignums are multiplied by using Toom-3 algorithm.
+
+  * Encoding
+    * new encodings:
+      * CP950
+      * CP951
+      * UTF-16
+      * UTF-32
+    * change alias:
+      * SJIS is Windows-31J
+
+  * File
+    * new constant:
+      * File::NULL
+        name of NULL device.
+      * File::DIRECT
+        name of O_DIRECT.
+
+  * IO
+    * extended method:
+      * IO#putc supports multibyte characters
+    * new methods:
+      * IO#advise
+      * IO.write(name, string, [offset] )
+        Write `string` to file `name`.
+        Opposite with File.read.
+      * IO.binwrite(name, string, [offset] )
+        binary version of IO.write.
+
+  * Kernel
+    * move #__id__ to BasicObject.
+    * extended method:
+      * Kernel#rand supports range argument
+
+  * Module
+    * new methods:
+      * Module#private_constant
+      * Module#public_constant
+
+  * Random
+    * extended method:
+      * Random.rand supports range argument
+
+  * String
+    * extended method:
+      * String#unpack supports endian modifiers
+    * new method:
+      * String#prepend
+      * String#byteslice
+
+  * Time
+    * extended method:
+      * Time#strftime supports %:z and %::z.
+
+  * Process
+    * Process#maxgroups and Process#maxgroups= now raise NotImplementedError if
+      the platform don't support supplementary groups concept.
+
+* bigdecimal
+
+  * BigDecimal#power and BigDecimal#** support non-integral exponent.
+
+  * Kernel.BigDecimal and BigDecimal.new now accept instances of Integer,
+    Rational, Float, and BigDecimal.  If you pass a Rational or a Float to
+    them, you must specify the precision to produce the digits of a BigDecimal.
+
+  * The behavior of BigDecimal#coerce with a Rational is changed.  It uses
+    the precision of the receiver BigDecimal to produce the digits of a
+    BigDecimal from the given Rational.
+
+* bigdecimal/util
+
+  * BigDecimal#to_d and Integer#to_d are added.
+
+  * Float#to_d accepts a precision.
+
+  * Rational#to_d raises ArgumentError when passing zero or negative
+    precision.
+
+  * Rational#to_d
+
+    * Zero and an implicit precision is deprecated.
+      This feature is removed at the next release of bigdecimal.
+
+    * A negative precision isn't supported.
+      Be careful it is an incompatible change.
+
+* date
+
+  * Accepts flonum explicitly with limitations.
+    * If the given offset is flonum, DateTime assumes its precision is
+      at most second.
+
+      DateTime.new(2001,2,3,0,0,0,3.0/24) ==
+      DateTime.new(2001,2,3,0,0,0,'+03:00')
+        #=> true
+
+    * If the given operand for -/+ is flonum, DateTime assumes its
+      precision is at most nanosecond.
+
+      DateTime.new(2001,2,3) + 0.5 == DateTime.new(2001,2,3,12)
+        #=> true
+
+    * Precision of offset is always at most second.
+
+      Rational('0.5') == Rational('0.500001')  #=> false
+      DateTime.new(2001,2,3,0,0,0,Rational('0.5')) ==
+      DateTime.new(2001,2,3,0,0,0,Rational('0.500001'))
+        #=> true
+
+  * Ignores long offset and far reform day (with warning).
+
+    * Now accepts only:
+
+      -1<=offset<=1 (-24:00..+24:00)
+      2298874<=start<=2426355 or -/+oo
+        (proleptic Gregorian/Julian mean -/+oo)
+
+  * A method strftime cannot produce huge output (same as Time's one).
+
+    * Even though Date/DateTime can handle far dates, the following causes
+      an exception.
+
+      DateTime.new(1<<10000).strftime('%Y')  # Errno::ERANGE
+
+  * Changed the format of inspect.
+  * Changed the format of marshal (but, can load old dumps).
+
+* io/console
+  * new methods:
+    * IO#noecho {|io| }
+    * IO#echo=
+    * IO#echo?
+    * IO#raw {|io| }
+    * IO#raw!
+    * IO#getch
+    * IO#winsize
+    * IO.console
+
+* json
+  * updated to v1.5.4.
+
+* matrix
+  * new classes:
+    * Matrix::EigenvalueDecomposition
+    * Matrix::LUPDecomposition
+  * new methods:
+    * Matrix#diagonal?
+    * Matrix#eigen
+    * Matrix#eigensystem
+    * Matrix#hermitian?
+    * Matrix#lower_triangular?
+    * Matrix#lup
+    * Matrix#lup_decomposition
+    * Matrix#normal?
+    * Matrix#orthogonal?
+    * Matrix#permutation?
+    * Matrix#round
+    * Matrix#symmetric?
+    * Matrix#unitary?
+    * Matrix#upper_triangular?
+    * Matrix#zero?
+    * Vector#magnitude, #norm
+    * Vector#normalize
+  * extended methods:
+    * Matrix#each and #each_with_index can iterate on a subset of the elements
+    * Matrix#find_index returns [row, column] and can iterate on a subset
+      of the elements
+    * Matrix#** implements Numeric exponents (using the eigensystem)
+    * Matrix.zero can build rectangular matrices
+
+* minitest
+  * Minitest has been updated to version 2.2.2.
+  * For full details, see https://github.com/seattlerb/minitest/blob/master/History.txt
+
+* net/http
+  * SNI (Server Name Indication) supported for HTTPS.
+
+  * Allow to configure to wait server returning '100 continue' response
+    before sending HTTP request body. Set Net::HTTP#continue_timeout AND pass
+    'expect' => '100-continue' to a extra HTTP header.
+
+    For example, the following code sends HTTP header and waits for getting
+    '100 continue' response before sending HTTP request body. When 0.5 [sec]
+    timeout occurs or the server send '100 continue', the client sends HTTP
+    request body.
+      http.continue_timeout = 0.5
+      http.request_post('/continue', 'body=BODY', 'expect' => '100-continue')
+
+  * new method:
+    * Net::HTTPRequest#set_form): Added to support
+      both application/x-www-form-urlencoded and multipart/form-data.
+
+* objspace
+  * new method:
+    * ObjectSpace::memsize_of_all
+
+* openssl
+  * PKey::RSA and PKey::DSA now use the generic X.509 encoding scheme
+    (e.g. used in a X.509 certificate's Subject Public Key Info) when
+    exporting public keys to DER or PEM. Backward compatibility is
+    ensured by (already existing) fallbacks during creation.
+  * OpenSSL::ASN1::Constructive#new and OpenSSL::ASN1::Primitive#new
+    (and the constructors of their sub-classes) will no longer force
+    tagging to be set to :EXPLICIT when tag and/or tag_class are passed
+    as parameters. tagging must be set explicitly.
+  * Support for infinite length encodings via infinite_length attribute.
+  * OpenSSL::PKey.read( file | string [, pwd] ) allows to read arbitrary
+    public/private keys in DER-/PEM-encoded form with an optional password
+    for encrypted PEM encodings.
+  * Add new method OpenSSL::X509::Name#hash_old as a wrapper of
+    X509_NAME_hash_old() defined from OpenSSL 1.0.0. It returns OpenSSL 0.9.8
+    compatible hash value.
+
+* optparse
+  * support for bash/zsh completion.
+
+* Rake
+  * Rake has been upgraded from 0.8.7 to 0.9.2.2.  For full release notes see
+    https://github.com/jimweirich/rake/blob/master/CHANGES
+
+* RDoc
+  * RDoc has been upgraded to version 3.9.4.  For full release notes see
+    http://docs.seattlerb.org/rdoc/History_txt.html
+
+* rexml
+  * Support Ruby native encoding mechanism and iconv dependency is dropped.
+
+* RubyGems
+  * RubyGems has been upgraded to version 1.8.10. For full release notes see
+    http://rubygems.rubyforge.org/rubygems-update/History_txt.html
+
+* stringio
+  * extended method:
+    * StringIO#set_encoding can get 2nd argument and optional hash.
+
+* test/unit
+  * New arguments:
+    * -j N, --jobs=N: Allow run N testcases at once.
+    * --jobs-status: Show status of jobs when parallel running.
+    * --no-retry: Don't retry testcases which failed when parallel running.
+    * --ruby=RUBY: path to ruby for job(worker) process. optional.
+    * --hide-skip: Hide skip messages. You'll see the number of skips at end of
+      test result.
+
+* uri
+  * new methods:
+    * URI::Generic#hostname
+    * URI::Generic#hostname=
+
+* webrick
+  * new method:
+    * WEBrick::HTTPRequest#continue for generating '100 continue' response.
+  * new logging directive:
+    * %{remote}p for remote (client) port number.
+
+* yaml
+  * The default YAML engine is now Psych. You may downgrade to syck by setting
+    YAML::ENGINE.yamler = 'syck'.
+
+* zlib
+  * new methods:
+    * Zlib.deflate
+    * Zlib.inflate
+
+* FileUtils
+  * extended method:
+    * FileUtils#chmod supports symbolic mode argument.
+
+=== Language changes
+
+* Regexps now support Unicode 6.0. (new characters and scripts)
+
+* [experimental] Regexps now support Age property.
+  Unlike Perl, current implementation takes interpretation of the
+  interpretation of UTS #18.
+  http://www.unicode.org/reports/tr18/
+
+* Turning on/off indentation warnings with directives.
+  ("# -*- warn-indent: true -*-" / "# -*- warn-indent: false -*-")
+
+=== Compatibility issues (excluding feature bug fixes)
+
+  * Rational#to_d
+
+    See above.
diff --git a/doc/NEWS-2.0.0 b/doc/NEWS-2.0.0
new file mode 100644
index 0000000000..414789dcd1
--- /dev/null
+++ b/doc/NEWS-2.0.0
@@ -0,0 +1,530 @@
+# -*- rdoc -*-
+
+= NEWS for Ruby 2.0.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 1.9.3 release
+
+=== Language changes
+
+* Added keyword arguments.
+
+* Added %i and %I for symbol list creation (similar to %w and %W).
+
+* Default source encoding is changed to UTF-8. (was US-ASCII)
+
+* No warning for unused variables starting with '_'
+
+=== Core classes updates (outstanding ones only)
+
+* ARGF
+  * added method:
+    * added ARGF#codepoints and ARGF#each_codepoint, like the corresponding
+      methods for IO.
+
+* Array
+  * added method:
+    * added Array#bsearch for binary search.
+  * incompatible changes:
+    * random parameter of Array#shuffle! and Array#sample now
+      will be called with one argument, maximum value.
+    * when given Range arguments, Array#values_at now returns nil for each
+      value that is out-of-range.
+
+* Enumerable
+  * added method:
+    * added Enumerable#lazy method for lazy enumeration.
+
+* Enumerator
+  * added method:
+    * added Enumerator#size for lazy size evaluation.
+  * extended method:
+    * Enumerator.new accept an argument for lazy size evaluation.
+  * new class Enumerator::Lazy for lazy enumeration
+
+* ENV
+  * aliased method:
+    * ENV.to_h is a new alias for ENV.to_hash
+
+* Fiber
+  * incompatible changes:
+    * Fiber#resume cannot resume a fiber which invokes "Fiber#transfer".
+
+* File
+  * extended method:
+    * File.fnmatch? now expands braces in the pattern if
+      File::FNM_EXTGLOB option is given.
+
+* GC
+  * improvements:
+    * introduced the bitmap marking which suppresses to copy a memory page
+      with Copy-on-Write.
+    * introduced the non-recursive marking which avoids unexpected stack overflow.
+
+* GC::Profiler
+  * added method:
+    * added GC::Profiler.raw_data which returns raw profile data for GC.
+
+* Hash
+  * added method:
+    * added Hash#to_h as explicit conversion method, like Array#to_a.
+  * extended method:
+    * Hash#default_proc= can be passed nil to clear the default proc.
+
+* IO
+  * deprecated methods:
+    * IO#lines, #bytes, #chars and #codepoints are deprecated.
+
+* Kernel
+  * added method:
+    * added Kernel#Hash conversion method like Array() or Float().
+    * added Kernel#__dir__ which returns the absolute path of the
+      directory of the file from which this method is called.
+    * added Kernel#caller_locations which returns an array of
+      frame information objects.
+  * extended method:
+    * Kernel#warn accepts multiple args in like puts.
+    * Kernel#caller accepts second optional argument `n' which specify
+      required caller size.
+    * Kernel#to_enum and enum_for accept a block for lazy size evaluation.
+  * incompatible changes:
+    * system() and exec() close non-standard file descriptors
+      (The default of :close_others option is changed to true by default.)
+    * respond_to? against a protected method now returns false unless
+      the second argument is true.
+    * __callee__ has returned to the original behavior, and now
+      returns the called name but not the original name in an
+      aliased method.
+    * Kernel#inspect does not call #to_s anymore
+      (it used to call redefined #to_s).
+
+* LoadError
+  * added method:
+    * added LoadError#path method to return the file name that could not be
+      loaded.
+
+* Module
+  * added method:
+    * added Module#prepend which is similar to Module#include,
+      however a method in the prepended module overrides the
+      corresponding method in the prepending module.
+    * added Module.prepended and Module.prepend_features, similar
+      to included and append_features.
+    * added Module#refine, which extends a class or module locally.
+      [experimental]
+  * extended method:
+    * Module#define_method accepts a UnboundMethod from a Module.
+    * Module#const_get accepts a qualified constant string, e.g.
+      Object.const_get("Foo::Bar::Baz")
+
+* Mutex
+  * added method:
+    * added Mutex#owned? which returns the mutex is held by current
+      thread or not. [experimental]
+  * incompatible changes:
+    * Mutex#lock, Mutex#unlock, Mutex#try_lock, Mutex#synchronize
+      and Mutex#sleep are no longer allowed to be used from trap handler
+      and raise a ThreadError in such case.
+    * Mutex#sleep may spurious wakeup. Check after wakeup.
+
+* NilClass
+  * added method:
+    * added nil.to_h which returns {}
+
+* ObjectSpace::WeakMap
+  * new low level class to hold weak references to objects.
+
+* Proc
+  * incompatible change:
+    * removed Proc#== and #eql? so two procs are == only when they are
+      the same object.
+
+* Process
+  * added method:
+    * added getsid for getting session id (unix only).
+
+* Range
+  * added method:
+    * added Range#size for lazy size evaluation.
+    * added Range#bsearch for binary search.
+
+* RubyVM (MRI specific)
+  * added RubyVM::InstructionSequence.of to get the instruction sequence
+    from a method or a block.
+  * added RubyVM::InstructionSequence#path, #absolute_path, #label,
+    #base_label and #first_lineno to retrieve information from where
+    the instruction sequence was defined.
+  * added Environment variables to specify stack usage:
+    * RUBY_THREAD_VM_STACK_SIZE: vm stack size used at thread creation.
+      default: 128KB (32bit CPU) or 256KB (64bit CPU).
+    * RUBY_THREAD_MACHINE_STACK_SIZE: machine stack size used at thread
+      creation. default: 512KB or 1024KB.
+    * RUBY_FIBER_VM_STACK_SIZE: vm stack size used at fiber creation.
+      default: 64KB or 128KB.
+    * RUBY_FIBER_MACHINE_STACK_SIZE: machine stack size used at fiber
+      creation. default: 256KB or 512KB.
+    These variables are checked only at launched time.
+  * added constant DEFAULT_PARAMS to get above default parameters.
+
+* Signal
+  * added method:
+    * added Signal.signame which returns signal name
+
+  * incompatible changes:
+    * Signal.trap raises ArgumentError when :SEGV, :BUS, :ILL, :FPE, :VTALRM
+      are specified.
+
+* String
+  * added method:
+    * added String#b returning a copied string whose encoding is ASCII-8BIT.
+  * change return value:
+    * String#lines now returns an array instead of an enumerator.
+    * String#chars now returns an array instead of an enumerator.
+    * String#codepoints now returns an array instead of an enumerator.
+    * String#bytes now returns an array instead of an enumerator.
+
+* Struct
+  * added method:
+    * added Struct#to_h returning values with keys corresponding to the
+      instance variable names.
+
+* Thread
+  * added method:
+    * added Thread#thread_variable_get for getting thread local variables
+      (these are different than Fiber local variables).
+    * added Thread#thread_variable_set for setting thread local variables.
+    * added Thread#thread_variables for getting a list of the thread local
+      variable keys.
+    * added Thread#thread_variable? for testing to see if a particular thread
+      variable has been set.
+    * added Thread.handle_interrupt as well as instance and singleton methods
+      pending_interrupt? for asynchronous handling of exceptions
+    * added Thread#backtrace_locations which returns similar information of
+      Kernel#caller_locations.
+  * new class Thread::Backtrace::Location to hold backtrace location
+    information. These are returned by Thread#backtrace_locations and
+    Kernel#caller_locations.
+  * incompatible changes:
+    * Thread#join and Thread#value now raises a ThreadError if target thread
+      is the current or main thread.
+
+* Time
+  * change return value:
+    * Time#to_s now returns US-ASCII encoding instead of BINARY.
+
+* TracePoint
+  * new class. This class is replacement of set_trace_func.
+    Easy to use and efficient implementation.
+
+* toplevel
+  * added method:
+    * added main.define_method which defines a global function.
+    * added main.using, which imports refinements into the current file or
+      eval string. [experimental]
+
+=== Core classes compatibility issues (excluding feature bug fixes)
+
+* Array#values_at
+
+  See above.
+
+* String#lines
+* String#chars
+* String#codepoints
+* String#bytes
+
+  These methods no longer return an Enumerator, although passing a
+  block is still supported for backwards compatibility.
+
+  Code like str.lines.with_index(1) { |line, lineno| ... } no longer
+  works because str.lines returns an array.  Replace lines with
+  each_line in such cases.
+
+* IO#lines
+* IO#chars
+* IO#codepoints
+* IO#bytes
+* ARGF#lines
+* ARGF#chars
+* ARGF#bytes
+* StringIO#lines
+* StringIO#chars
+* StringIO#codepoints
+* StringIO#bytes
+* Zlib::GzipReader#lines
+* Zlib::GzipReader#bytes
+
+  These methods are deprecated in favor of each_line, each_byte,
+  each_char and each_codepoint.
+
+* Proc#==
+* Proc#eql?
+
+  These methods were removed. Two procs are == only when they are
+  the same object.
+
+* Fixnum
+* Bignum
+* Float
+
+  Fixnums, Bignums and Floats are frozen.
+
+* Signal.trap
+
+  See above.
+
+* Merge Onigmo.
+  https://github.com/k-takata/Onigmo
+
+* The :close_others option is true by default for system() and exec().
+  Also, the close-on-exec flag is set by default for all new file descriptors.
+  This means file descriptors doesn't inherit to spawned process unless
+  explicitly requested such as system(..., fd=>fd).
+
+* Kernel#respond_to? against a protected method now returns false
+  unless the second argument is true.
+
+* Kernel#respond_to_missing?
+* Kernel#initialize_clone
+* Kernel#initialize_dup
+
+  These methods are now private.
+
+* Thread#join, Thread#value
+
+  See above.
+
+* Mutex#lock, Mutex#unlock, Mutex#try_lock, Mutex#synchronize and Mutex#sleep
+
+  See above.
+
+=== Stdlib updates (outstanding ones only)
+
+* cgi
+  * Add HTML5 tag maker.
+  * CGI#header has been renamed to CGI#http_header and
+    aliased to CGI#header.
+  * When HTML5 tagmaker called, overwrite CGI#header,
+    CGI#header function is to create a <header> element.
+
+* CSV
+  * Removed CSV::dump and CSV::load to protect users from dangerous
+    serialization vulnerability
+
+* iconv
+  * Iconv has been removed. Use String#encode instead.
+
+* io/console
+  * new methods:
+    * added IO#cooked which sets the terminal to cooked mode within the given block.
+    * added IO#cooked! which sets the terminal to cooked.
+  * extended method:
+    * IO#raw, IO#raw!, and IO#getch accept keyword arguments, :min and :time.
+
+* io/wait
+  * new features:
+    * added IO#wait_writable method.
+    * added IO#wait_readable method as alias of IO#wait.
+
+* json
+  * updated to 1.7.7.
+
+* net/http
+  * new features:
+    * Proxies are now automatically detected from the http_proxy environment
+      variable.  See Net::HTTP::new for details.
+    * gzip and deflate compression are now requested for all requests by
+      default.  See Net::HTTP for details.
+    * SSL sessions are now reused across connections for a single instance.
+      This speeds up connection by using a previously negotiated session.
+    * Requests may be created from a URI which sets the request_uri and host
+      header of the request (but does not change the host connected to).
+    * Responses contain the URI requested which allows easier implementation of
+      redirect following.
+  * new methods:
+    * Net::HTTP#local_host
+    * Net::HTTP#local_host=
+    * Net::HTTP#local_port
+    * Net::HTTP#local_port=
+  * extended method:
+    * Net::HTTP#connect uses local_host and local_port if specified.
+
+* net/imap
+  * new methods:
+    * Net::IMAP.default_port
+    * Net::IMAP.default_imap_port
+    * Net::IMAP.default_tls_port
+    * Net::IMAP.default_ssl_port
+    * Net::IMAP.default_imaps_port
+
+* objspace
+  * new method:
+    * ObjectSpace.reachable_objects_from(obj)
+
+* openssl
+  * Consistently raise an error when trying to encode nil values. All instances
+    of OpenSSL::ASN1::Primitive now raise TypeError when calling to_der on an
+    instance whose value is nil. All instances of OpenSSL::ASN1::Constructive
+    raise NoMethodError in the same case. Constructing such values is still
+    permitted.
+  * TLS 1.1 & 1.2 support by setting OpenSSL::SSL::SSLContext#ssl_version to
+    :TLSv1_2, :TLSv1_2_server, :TLSv1_2_client or :TLSv1_1, :TLSv1_1_server
+    :TLSv1_1_client. The version being effectively used can be queried
+    with OpenSSL::SSL#ssl_version. Furthermore, it is also possible to
+    blacklist the new TLS versions with OpenSSL::SSL:OP_NO_TLSv1_1 and
+    OpenSSL::SSL::OP_NO_TLSv1_2.
+  * Added OpenSSL::SSL::SSLContext#renegotiation_cb. A user-defined callback
+    may be set which gets called whenever a new handshake is negotiated. This
+    also allows to programmatically decline (client) renegotiation attempts.
+  * Support for "0/n" splitting of records as BEAST mitigation via
+    OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS.
+  * The default options for OpenSSL::SSL::SSLContext have changed to
+    OpenSSL::SSL::OP_ALL & ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
+    instead of OpenSSL::SSL::OP_ALL only. This enables the countermeasure for
+    the BEAST attack by default.
+  * OpenSSL requires passwords for decrypting PEM-encoded files to be at least
+    four characters long. This led to awkward situations where an export with
+    a password with fewer than four characters was possible, but accessing the
+    file afterwards failed. OpenSSL::PKey::RSA, OpenSSL::PKey::DSA and
+    OpenSSL::PKey::EC therefore now enforce the same check when exporting a
+    private key to PEM with a password - it has to be at least four characters
+    long.
+  * SSL/TLS support for the Next Protocol Negotiation extension. Supported
+    with OpenSSL 1.0.1 and higher.
+  * OpenSSL::OPENSSL_FIPS allows client applications to detect whether OpenSSL
+    is FIPS-enabled. OpenSSL.fips_mode= allows turning on and off FIPS mode
+    manually in order to adapt to situations where FIPS mode would be an
+    explicit requirement.
+  * Authenticated Encryption with Associated Data (AEAD) is supported via
+    Cipher#auth_data= and Cipher#auth_tag/Cipher#auth_tag=.
+    Currently (OpenSSL 1.0.1c), only GCM mode is supported.
+
+* ostruct
+  * new methods:
+    * OpenStruct#[], []=
+    * OpenStruct#each_pair
+    * OpenStruct#eql?
+    * OpenStruct#hash
+    * OpenStruct#to_h converts the struct to a hash.
+  * extended method:
+    * OpenStruct.new also accepts an OpenStruct / Struct.
+
+* pathname
+  * extended method:
+    * Pathname#find returns an enumerator if no block is given.
+
+* rake
+  * rake has been updated to version 0.9.5.
+
+    This version is backwards-compatible with previous rake versions and
+    contains many bug fixes.
+
+    See
+    http://rake.rubyforge.org/doc/release_notes/rake-0_9_5_rdoc.html for a list
+    of changes in rake 0.9.3, 0.9.4 and 0.9.5.
+
+* RDoc
+  * RDoc has been updated to version 4.0
+
+    This version is largely backwards-compatible with previous rdoc versions.
+    The most notable change is an update to the ri data format (ri data must
+    be regenerated for gems shared across rdoc versions).  Further API changes
+    are internal and won't affect most users.
+
+    Notable changes include:
+
+    * Page support for ri.  Try `ri ruby:` for a list of pages in ruby or
+      `ri ruby:syntax/literals` for the syntax documentation for literals.
+
+      This also works for gems such as `ri rspec:README` for the rspec gem's
+      README file.
+    * Markdown support.  See ri RDoc::Markdown for details.
+
+    See https://github.com/rdoc/rdoc/blob/master/History.rdoc for a full list
+    of changes in rdoc 4.0.
+
+* resolv
+  * new methods:
+    * Resolv::DNS#timeouts=
+    * Resolv::DNS::Config#timeouts=
+
+* rexml
+  * REXML::Document#write supports Hash arguments.
+  * REXML::Document#write supports new :encoding option. It changes
+    XML document encoding. Without :encoding option, encoding in
+    XML declaration is used for XML document encoding.
+
+* RubyGems
+  * Updated to 2.0.0
+
+    RubyGems 2.0.0 features the following improvements:
+
+    * Improved support for default gems shipping with ruby 2.0.0+
+    * A gem can have arbitrary metadata through Gem::Specification#metadata
+    * `gem search` now defaults to --remote and is anchored like gem list.
+    * Added --document to replace --rdoc and --ri.  Use --no-document to
+      disable documentation, --document=rdoc to only generate rdoc.
+    * Only ri-format documentation is generated by default.
+    * `gem server` uses RDoc::Servlet from RDoc 4.0 to generate HTML
+      documentation.
+
+    For an expanded list of updates and bug fixes see:
+    https://github.com/rubygems/rubygems/blob/master/History.txt
+
+* shellwords
+  * Shellwords#shellescape now stringifies the given object using to_s.
+  * Shellwords#shelljoin accepts non-string objects in the given
+    array, each of which is stringified using to_s.
+
+* stringio
+  * deprecated methods:
+    * StringIO#lines, #bytes, #chars and #codepoints are deprecated.
+
+* syslog
+  * Added Syslog::Logger which provides a Logger API atop Syslog.
+  * Syslog::Priority, Syslog::Level, Syslog::Option and Syslog::Macros
+    are introduced for easy detection of available constants on a
+    running system.
+
+* tmpdir
+  * incompatible changes:
+    * Dir.mktmpdir uses FileUtils.remove_entry instead of
+      FileUtils.remove_entry_secure.  This means that applications should not
+      change the permission of the created temporary directory to make
+      writable from other users.
+
+* yaml
+  * Syck has been removed.  YAML now completely depends on libyaml being
+    installed.
+  * libyaml is now bundled with ruby, for cases where the library is not
+    installed locally.
+
+* zlib
+  * Added streaming support for Zlib::Inflate and Zlib::Deflate.  This allows
+    processing of a stream without the use of large amounts of memory.
+  * Added support for the new deflate strategies Zlib::RLE and Zlib::FIXED.
+  * Zlib streams are now processed without the GVL.  This allows gzip, zlib and
+    deflate streams to be processed in parallel.
+  * deprecated methods:
+    * Zlib::GzipReader#lines and #bytes are deprecated.
+
+=== Stdlib compatibility issues (excluding feature bug fixes)
+
+* OpenStruct new methods can conflict with custom attributes named
+  "each_pair", "eql?", "hash" or "to_h".
+
+* Dir.mktmpdir in lib/tmpdir.rb
+
+  See above.
+
+=== C API updates
+
+* NUM2SHORT() and NUM2USHORT() added. They are similar to NUM2INT, but short.
+
+* rb_newobj_of() and NEWOBJ_OF() added. They create a new object of a given class.
diff --git a/doc/NEWS-2.1.0 b/doc/NEWS-2.1.0
new file mode 100644
index 0000000000..5d4152b8dc
--- /dev/null
+++ b/doc/NEWS-2.1.0
@@ -0,0 +1,376 @@
+# -*- rdoc -*-
+
+= NEWS for Ruby 2.1.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.0.0 release
+
+=== Language changes
+
+* Now the default values of keyword arguments can be omitted.  Those
+  "required keyword arguments" need giving explicitly at the call time.
+
+* Added suffixes for integer and float literals: 'r', 'i', and 'ri'.
+  * "42r" and "3.14r" are evaluated as Rational(42, 1) and 3.14.rationalize,
+    respectively.  But exponential form with 'r' suffix like "6.022e+23r" is
+    not accepted because it is misleading.
+  * "42i" and "3.14i" are evaluated as Complex(0, 42) and Complex(0, 3.14),
+    respectively.
+  * "42ri" and "3.14ri" are evaluated as Complex(0, 42r) and Complex(0, 3.14r),
+    respectively.
+
+* def-expr now returns the symbol of its name instead of nil.
+
+=== Core classes updates (outstanding ones only)
+
+* Array
+  * New methods
+    * Array#to_h converts an array of key-value pairs into a Hash.
+
+* Binding
+  * New methods
+    * Binding#local_variable_get(symbol)
+    * Binding#local_variable_set(symbol, obj)
+    * Binding#local_variable_defined?(symbol)
+
+* Enumerable
+  * New methods
+    * Enumerable#to_h converts a list of key-value pairs into a Hash.
+
+* Exception
+  * New methods
+    * Exception#cause provides the previous exception which has been caught
+      at where raising the new exception.
+
+* GC
+  * improvements:
+    * introduced the generational GC a.k.a RGenGC.
+  * added environment variables:
+    * RUBY_GC_HEAP_INIT_SLOTS
+    * RUBY_GC_HEAP_FREE_SLOTS
+    * RUBY_GC_HEAP_GROWTH_FACTOR
+    * RUBY_GC_HEAP_GROWTH_MAX_SLOTS
+    * RUBY_GC_MALLOC_LIMIT_MAX
+    * RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR
+    * RUBY_GC_OLDMALLOC_LIMIT
+    * RUBY_GC_OLDMALLOC_LIMIT_MAX
+    * RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR
+  * obsoleted environment variables:
+    * RUBY_FREE_MIN (Use RUBY_GC_HEAP_FREE_SLOTS instead)
+    * RUBY_HEAP_MIN_SLOTS (Use RUBY_GC_HEAP_INIT_SLOTS instead)
+
+* Integer
+  * New methods
+    * Fixnum#bit_length
+    * Bignum#bit_length
+  * Bignum performance improvement
+    * Use GMP if available.
+      GMP is used only for several operations:
+      multiplication, division, radix conversion, GCD
+
+* IO
+  * extended methods:
+    * IO#seek supports SEEK_DATA and SEEK_HOLE as whence.
+    * IO#seek accepts symbols (:CUR, :END, :SET, :DATA, :HOLE) for 2nd argument.
+    * IO#read_nonblock accepts optional `exception: false` to return symbols
+    * IO#write_nonblock accepts optional `exception: false` to return symbols
+
+* Kernel
+  * New methods:
+    * Kernel#singleton_method
+
+* Module
+  * New methods:
+    * Module#using, which activates refinements of the specified module only
+      in the current class or module definition.
+    * Module#singleton_class? returns true if the receiver is a singleton class
+      or false if it is an ordinary class or module.
+  * extended methods:
+    * Module#refine is no longer experimental.
+    * Module#include and Module#prepend are now public methods.
+
+* Mutex
+  * misc
+    * Mutex#owned? is no longer experimental.
+
+* Numeric
+  * extended methods:
+    * Numeric#step allows the limit argument to be omitted, in which
+      case an infinite sequence of numbers is generated.  Keyword
+      arguments `to` and `by` are introduced for ease of use.
+      `by` can be 0, in which case the same value will be generated
+      indefinitely.
+
+* Process
+  * New methods:
+    * alternative methods to $0/$0=:
+      * Process.argv0() returns the original value of $0.
+      * Process.setproctitle() sets the process title without affecting $0.
+    * Process.clock_gettime
+    * Process.clock_getres
+
+* String
+  * "literal".freeze is now optimized to return the same object
+  * New methods:
+    * String#scrub and String#scrub! verify and fix invalid byte sequence.
+      If you want to use this function with older Ruby,
+      consider to use string-scrub.gem.
+
+* Symbol
+  * All symbols are now frozen.
+
+* pack/unpack (Array/String)
+  * Q! and q! directives for long long type if platform has the type.
+
+* toplevel
+  * extended methods:
+    * main.using is no longer experimental. The method activates refinements
+      in the ancestors of the argument module to support refinement
+      inheritance by Module#include.
+
+=== Core classes compatibility issues (excluding feature bug fixes)
+
+* Hash
+  * incompatible changes:
+    * Hash#reject will return plain Hash object in the future versions, that
+      is the original object's subclass, instance variables, default value,
+      and taintedness will be no longer copied, so now warnings are emitted
+      when called with such Hash.
+
+* IO
+  * incompatible changes:
+    * open ignore internal encoding if external encoding is ASCII-8BIT.
+
+* Kernel#eval, Kernel#instance_eval, and Module#module_eval.
+  * Copies the scope information of the original environment, which means
+    that private, protected, public, and module_function without arguments
+    do not affect the environment outside the eval string.
+    For example, `class Foo; eval "private"; def foo; end; end' doesn't make
+    Foo#foo private.
+
+* Kernel#untrusted?, untrust, and trust
+  * These methods are deprecated and their behavior is same as tainted?,
+    taint, and untaint, respectively.  If $VERBOSE is true, they show warnings.
+
+* Module#ancestors
+  * The ancestors of a singleton class now include singleton classes,
+    in particular itself.
+
+* Module#define_method and Object#define_singleton_method
+  * Now they return the symbols of the defined methods, not the methods/procs
+    themselves.
+
+* Numeric#quo
+  * Raises TypeError instead of ArgumentError if the receiver doesn't have
+    to_r method.
+
+* Proc
+  * Returning from lambda proc now always exits from the Proc, not from the
+    method where the lambda is created.  Returning from non-lambda proc exits
+    from the method, same as the former behavior.
+
+String
+  * If invalid: :replace is specified for String#encode, replace
+    invalid byte sequence even if the destination encoding equals to
+    the source encoding.
+
+=== Stdlib updates (outstanding ones only)
+
+* CGI::Util
+  * All class methods modulized.
+
+* Digest
+  * extended methods:
+    * Digest::Class.file takes optional arguments for its constructor
+
+* Matrix
+  * Added Vector#cross_product.
+
+* Net::SMTP
+  * Added Net::SMTP#rset to implement the RSET command
+
+* objspace
+  * new method:
+    * ObjectSpace.trace_object_allocations
+    * ObjectSpace.trace_object_allocations_start
+    * ObjectSpace.trace_object_allocations_stop
+    * ObjectSpace.trace_object_allocations_clear
+    * ObjectSpace.allocation_sourcefile
+    * ObjectSpace.allocation_sourceline
+    * ObjectSpace.allocation_class_path
+    * ObjectSpace.allocation_method_id
+    * ObjectSpace.allocation_generation
+    * ObjectSpace.reachable_objects_from_root
+    * ObjectSpace.dump
+    * ObjectSpace.dump_all
+
+* OpenSSL::BN
+  * extended methods:
+    * OpenSSL::BN.new allows Fixnum/Bignum argument.
+
+* open-uri
+  * Support multiple fields with same field name (like Set-Cookie).
+
+* Pathname
+  * New methods:
+    * Pathname#write
+    * Pathname#binwrite
+
+* rake
+  * Updated to 10.1.0.  Major changes include removal of the class namespace,
+    Rake::DSL to hold the rake DSL methods and removal of support for legacy
+    rake features.
+
+    For a complete list of changes since rake 0.9.6 see:
+
+    http://rake.rubyforge.org/doc/release_notes/rake-10_1_0_rdoc.html
+
+    http://rake.rubyforge.org/doc/release_notes/rake-10_0_3_rdoc.html
+
+* RbConfig
+  * New constants:
+    * RbConfig::SIZEOF is added to provide the size of C types.
+
+* RDoc
+  * Updated to 4.1.0.  Major enhancements include a modified default template
+  * and accessibility enhancements.
+
+    For a list of minor enhancements and bug fixes see:
+    https://github.com/rdoc/rdoc/blob/v4.1.0.preview.1/History.rdoc
+
+* Resolv
+  * New methods:
+    * Resolv::DNS.fetch_resource
+  * One-shot multicast DNS support
+  * Support LOC resources
+
+* REXML::Parsers::SAX2Parser
+  * Fixes wrong number of arguments of entitydecl event. Document of the event
+    says "an array of the entity declaration" but implementation passes two
+    or more arguments. It is an implementation bug but it breaks backward
+    compatibility.
+
+* REXML::Parsers::StreamParser
+  * Supports "entity" event.
+
+* REXML::Text
+  * REXML::Text#<< supports method chain like 'text << "XXX" << "YYY"'.
+  * REXML::Text#<< supports not "raw" mode.
+
+* Rinda::RingServer, Rinda::RingFinger
+  * Rinda now supports multicast sockets.  See Rinda::RingServer and
+    Rinda::RingFinger for details.
+
+* RubyGems
+  * Updated to 2.2.0.  Notable new features include:
+
+    * Gemfile or gem.deps.rb support including Gem.file.lock (experimental)
+    * Improved, iterative resolver (compared to RubyGems 2.1 and earlier)
+    * Support for a sharing a GEM_HOME across ruby platforms and versions
+
+    For a complete list of enhancements and bug fixes see:
+    https://github.com/rubygems/rubygems/tree/master/History.txt
+
+* Set
+  * New methods:
+    * Set#intersect?
+    * Set#disjoint?
+
+* Socket
+  * New methods:
+    * Socket.getifaddrs
+
+* StringScanner
+  * extended methods:
+    * StringScanner#[] supports named captures.
+
+* Syslog::Logger
+  * Added facility.
+
+* Tempfile
+  * New methods:
+    * Tempfile.create
+
+* Timeout
+  * The exception to terminate the given block can no longer be rescued
+    inside the block, by default, unless the exception class is given
+    explicitly.
+
+* TSort
+  * New methods:
+    * TSort.tsort
+    * TSort.tsort_each
+    * TSort.strongly_connected_components
+    * TSort.each_strongly_connected_component
+    * TSort.each_strongly_connected_component_from
+
+* WEBrick
+  * The body of a response may now be a StringIO or other IO-like that responds
+    to #readpartial and #read.
+
+* XMLRPC::Client
+  * New methods:
+    * XMLRPC::Client#http. It returns Net::HTTP for the client. Normally,
+      it is not needed. It is useful when you want to change minor HTTP client
+      options. You can change major HTTP client options by XMLRPC::Client
+      methods. You should use XMLRPC::Client methods for changing major
+      HTTP client options instead of XMLRPC::Client#http.
+
+=== Stdlib compatibility issues (excluding feature bug fixes)
+
+* Set
+  * incompatible changes:
+    * Set#to_set now returns self instead of generating a copy.
+
+* URI
+  * incompatible changes:
+    * URI.decode_www_form follows current WHATWG URL Standard.
+      It gets encoding argument to specify the character encoding.
+      It now allows loose percent encoded strings, but denies ;-separator.
+    * URI.encode_www_form follows current WHATWG URL Standard.
+      It gets encoding argument to convert before percent encode.
+      UTF-16 strings aren't converted to UTF-8 before percent encode by default.
+
+* curses
+  * Removed.
+    curses is now available as a gem.
+    See https://rubygems.org/gems/curses for details.
+
+=== Built-in global variables compatibility issues
+
+* $SAFE
+  * $SAFE=4 is obsolete.  If $SAFE is set to 4 or larger, an ArgumentError
+    is raised.
+
+=== C API updates
+
+* rb_gc_set_params() is deprecated. This is only used in Ruby internal.
+
+* rb_gc_count() added. This returns the number of times GC occurred.
+
+* rb_gc_stat() added. This allows access to specific GC.stat() values from C
+  without any allocation overhead.
+
+* rb_gc_latest_gc_info() added. This allows access to GC.latest_gc_info().
+
+* rb_postponed_job_register() added. Takes a function callback which is invoked
+  when the VM is in a consistent state, i.e. to perform work from a C signal
+  handler.
+
+* rb_profile_frames() added. Provides low-cost access to the current ruby stack
+  for callstack profiling.
+
+* rb_tracepoint_new() supports new internal events accessible only from C:
+  * RUBY_INTERNAL_EVENT_NEWOBJ
+  * RUBY_INTERNAL_EVENT_FREEOBJ
+  * RUBY_INTERNAL_EVENT_GC_START
+  * RUBY_INTERNAL_EVENT_GC_END_MARK
+  * RUBY_INTERNAL_EVENT_GC_END_SWEEP
+  * Note that you *can not* specify "internal events" with normal events
+    (such as RUBY_EVENT_CALL, RUBY_EVENT_RETURN) simultaneously.
diff --git a/doc/NEWS-2.2.0 b/doc/NEWS-2.2.0
new file mode 100644
index 0000000000..5564c606ae
--- /dev/null
+++ b/doc/NEWS-2.2.0
@@ -0,0 +1,361 @@
+# -*- 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
new file mode 100644
index 0000000000..489aba4a89
--- /dev/null
+++ b/doc/NEWS-2.3.0
@@ -0,0 +1,404 @@
+# -*- 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/NEWS-2.4.0 b/doc/NEWS-2.4.0
new file mode 100644
index 0000000000..28e855cde1
--- /dev/null
+++ b/doc/NEWS-2.4.0
@@ -0,0 +1,397 @@
+# -*- rdoc -*-
+
+= NEWS for Ruby 2.4.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.3.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]
+
+=== 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]
+
+* Dir
+
+  * Dir.empty?.  [Feature #10121]
+
+* 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]
+
+* 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]
+
+* IO
+
+  * IO#gets, IO#readline, IO#each_line, IO#readlines, IO.foreach now takes
+    an optional keyword argument, chomp flag.  [Feature #12553]
+
+* 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]
+
+* 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 to Onigmo 6.0.0.
+
+* Regexp/String: Update 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]
+
+* Symbol
+
+  * 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
+
+  * 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]
+
+=== 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
+
+  * New method: Pathname#empty? [Feature #12596]
+
+* Readline
+
+  * 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.
+
+=== Stdlib compatibility issues (excluding feature bug fixes)
+
+* DateTime
+
+  * DateTime#to_time now preserves timezone.  [Bug #12189]
+
+* Psych
+
+  * Update to Psych 2.2.2
+
+* RDoc
+
+  * Update to RDoc 5.0.0
+
+* RubyGems
+
+  * Update to RubyGems 2.6.8
+
+* shellwords
+
+  * Shellwords.shellwords (shellsplit) treats the backslash as escape
+    character only when followed by one of the following characters:
+    $ ` " \ <newline>
+    [Bug #10055]
+
+* Time
+
+  * Time#to_time now preserves timezone.  [Bug #12271]
+
+* thread
+
+  * 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.
+
+* Tk
+
+  * Tk is removed from stdlib.  [Feature #8539]
+    https://github.com/ruby/tk is the new upstream.
+
+* XMLRPC
+
+  * XMLRPC is removed from stdlib, and bundled as gem. [Feature #12160][ruby-core:74239]
+    https://github.com/ruby/xmlrpc is the new upstream.
+
+* Zlib
+
+  * Zlib.gzip and Zlib.gunzip [Feature #13020]
+
+=== 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]
diff --git a/doc/NEWS-2.5.0 b/doc/NEWS-2.5.0
new file mode 100644
index 0000000000..c891317b61
--- /dev/null
+++ b/doc/NEWS-2.5.0
@@ -0,0 +1,565 @@
+# -*- rdoc -*-
+
+= NEWS for Ruby 2.5.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.4.0 release
+
+=== Language changes
+
+* Top-level constant look-up is removed.  [Feature #11547]
+
+* rescue/else/ensure are allowed inside do/end blocks.  [Feature #12906]
+
+* refinements take place in string interpolations.  [Feature #13812]
+
+=== Core classes updates (outstanding ones only)
+
+* Array
+
+  * New methods:
+
+    * Array#append  [Feature #12746]
+    * Array#prepend  [Feature #12746]
+
+* Data
+
+  * Is deprecated. It was a base class for C extensions, and it's not
+    necessary to expose in Ruby level. [Feature #3072]
+
+* Exception
+
+  * New methods:
+
+    * Exception#full_message to retrieve a String expression of an exception,
+      formatted in the same way in which Ruby prints out an uncaught
+      exception.  [Feature #14141] [experimental]
+
+* Dir
+
+  * Dir.glob provides new optional keyword argument, +:base+ .  [Feature #13056]
+  * Dir.chdir (without block arg), Dir.open, Dir.new, Dir.mkdir, Dir.rmdir,
+    Dir.empty? releases GVL
+
+  * New methods:
+
+    * Dir.children  [Feature #11302]
+    * Dir.each_child  [Feature #11302]
+
+* Enumerable
+
+  * Enumerable#any?, Enumerable#all?, Enumerable#none? and Enumerable#one?
+    accept a pattern argument. [Feature #11286]
+
+* File
+
+  * File.open accepts +:newline+ option to imply text mode. [Bug #13350]
+  * File#path raises an IOError for files opened with
+    File::Constants::TMPFILE option. [Feature #13568]
+  * File.stat, File.exist? and other <code>rb_stat()</code>-using methods
+    release GVL. [Bug #13941]
+  * File.rename releases GVL. [Feature #13951]
+  * File::Stat#atime, File::Stat#mtime and File::Stat#ctime support fractional
+    second timestamps on Windows 8 and later.  [Feature #13726]
+  * File::Stat#ino and File.identical? support ReFS 128bit ino on Windows 8.1
+    and later.  [Feature #13731]
+  * File.readable?, File.readable_real?, File.writable?, File.writable_real?,
+    File.executable?, File.executable_real?, File.mkfifo, File.readlink,
+    File.truncate, File#truncate, File.chmod, File.lchmod, File.chown,
+    File.lchown, File.unlink, File.utime, File.lstat release GVL
+
+  * New method:
+
+    * File.lutime  [Feature #4052]
+
+* Hash
+
+  * New methods:
+
+    * Hash#transform_keys  [Feature #13583]
+    * Hash#transform_keys!  [Feature #13583]
+    * Hash#slice  [Feature #8499]
+
+* IO
+
+  * IO.copy_stream tries copy offload with copy_file_range(2) [Feature #13867]
+
+  * New methods:
+
+    * IO#pread  [Feature #4532]
+    * IO#pwrite  [Feature #4532]
+    * IO#write accepts multiple arguments  [Feature #9323]
+
+* IOError
+
+  * IO#close might raise an error with message "stream closed",
+    but it is refined to "stream closed in another thread". The new message
+    is more clear for user. [Bug #13405]
+
+* Integer
+
+  * Integer#round, Integer#floor, Integer#ceil and Integer#truncate always
+    return an Integer. [Bug #13420]
+  * Integer#pow accepts modulo argument for calculating modular
+    exponentiation.  [Feature #12508] [Feature #11003]
+
+  * New methods:
+
+    * Integer#allbits?, Integer#anybits?, Integer#nobits? [Feature #12753]
+    * Integer.sqrt  [Feature #13219]
+
+* Kernel
+
+  * Kernel#yield_self   [Feature #6721]
+  * Kernel#pp  [Feature #14123]
+  * Kernel#warn(..., uplevel:n)  [Feature #12882]
+
+* Method
+
+  * New methods:
+
+    * Method#=== that invokes Method#call, as same as Proc#=== [Feature #14142]
+
+* Module
+
+  * Module#attr, Module#attr_accessor, Module#attr_reader and Module#attr_writer
+    become public. [Feature #14132]
+  * Module#define_method, Module#alias_method, Module#undef_method and
+    Module#remove_method become public. [Feature #14133]
+
+* Numeric
+
+  * Numeric#step no longer hides errors from coerce method when
+    given a step value which cannot be compared with #> to 0. [Feature #7688]
+  * Numerical comparison operators (<,<=,>=,>) no longer hide exceptions
+    from #coerce method internally. Return nil in #coerce if the coercion is
+    impossible.  [Feature #7688]
+
+* Process
+
+  * Precision of Process.times is improved if getrusage(2) exists. [Feature #11952]
+
+  * New method:
+
+    * Process.last_status as an alias of $? [Feature #14043]
+
+* Range
+  * Range#initialize no longer hides exceptions when comparing begin and
+    end with #<=> and raise a "bad value for range" ArgumentError
+    but instead lets the exception from the #<=> call go through. [Feature #7688]
+
+* Regexp
+
+  * Update to Onigmo 6.1.3-669ac9997619954c298da971fcfacccf36909d05.
+
+    * Support absence operator https://github.com/k-takata/Onigmo/issues/82
+
+  * Support new 5 emoji-related Unicode character properties
+
+* RubyVM::InstructionSequence
+
+  * New method:
+
+    * RubyVM::InstructionSequence#each_child
+    * RubyVM::InstructionSequence#trace_points
+
+* String
+
+  * <code>String#-@</code> deduplicates unfrozen strings.  Already-frozen
+    strings remain unchanged for compatibility.  [Feature #13077]
+  * <code>-"literal"</code> (<code>String#-@</code>) optimized to return the same object
+    (same as <code>"literal".freeze</code> in Ruby 2.1+) [Feature #13295]
+  * String#casecmp and String#casecmp? return nil for non-string arguments
+    instead of raising a TypeError. [Bug #13312]
+  * String#start_with? accepts a regexp [Feature #13712]
+
+  * New methods:
+
+    * String#delete_prefix, String#delete_prefix! [Feature #12694]
+    * String#delete_suffix, String#delete_suffix! [Feature #13665]
+    * String#each_grapheme_cluster and String#grapheme_clusters to
+      enumerate grapheme clusters [Feature #13780]
+    * String#undump to unescape String#dump'ed string [Feature #12275]
+
+* Struct
+
+  * Struct.new takes `keyword_init: true` option to initialize members
+    with keyword arguments. [Feature #11925]
+
+* Regexp/String: Update Unicode version from 9.0.0 to 10.0.0 [Feature #13685]
+
+* Thread
+
+  * Description set by Thread#name= is now visible on Windows 10.
+
+  * New method:
+    * Thread#fetch  [Feature #13009]
+
+  * The default of Thread.report_on_exception is now true,
+    showing unhandled exceptions terminating threads on $stderr. [Feature #14143]
+
+* Time
+
+  * Time.at receives 3rd argument which specifies the unit of 2nd argument. [Feature #13919]
+
+* KeyError
+
+  * New methods:
+
+    * KeyError#receiver [Feature #12063]
+    * KeyError#key      [Feature #12063]
+
+* FrozenError
+
+  * New exception class. [Feature #13224]
+
+=== Stdlib updates (outstanding ones only)
+
+* BigDecimal
+
+  * Update to BigDecimal 1.3.4
+
+  * The following features are added:
+
+    * BigDecimal::VERSION
+
+  * The following features have been deprecated,
+    and are planned to be removed in the version 1.4.0:
+
+    * BigDecimal.new
+
+    * BigDecimal.ver
+
+  * BigDecimal#clone and #dup now do not make a new instance,
+    but returns the receiver itself.
+
+* Coverage
+
+  * Support branch coverage and method coverage measurement. [Feature #13901]
+    Branch coverage tells you which branches are executed, and which not.
+    Method coverage tells you which methods are invoked, and which not.
+    By running a test suite with this new feature, you can know which branches
+    and methods are executed by a test, and evaluate total coverage of a test
+    suite more strictly.
+
+    You can specify the measuring target by an option to `Coverage.start`:
+
+        Coverage.start(lines: true, branches: true, methods: true)
+
+    After some Ruby files are loaded, you can use `Coverage.result` to get
+    the coverage result:
+
+        Coverage.result
+        #=> { "/path/to/file.rb"=>
+        #     { :lines => [1, 2, 0, nil, ...],
+        #       :branches =>
+        #         { [:if, 0, 2, 1, 6, 4] =>
+        #             { [:then, 1, 3, 2, 3, 8] => 0,
+        #               [:else, 2, 5, 2, 5, 8] => 2
+        #             }
+        #         },
+        #       :methods => {
+        #          [Object, :foo, 1, 0, 7, 3] => 2
+        #       }
+        #     }
+        #   }
+
+    The result type of line coverage is not changed; it is just an array that
+    contains numbers, which means the count that each line was executed,
+    or `nil`s, which means that the line is not relevant.
+
+    The result type of branch coverage is:
+
+        { (jump base) => { (jump target) => (counter) } }
+
+    where jump base and targets have the format
+
+        [type, unique-id, start lineno, start column, end lineno, end column]
+
+    For example, `[:if, 0, 2, 1, 6, 4]` reads an `if` statement that ranges from
+    line 2 and column 1, to line 6 and column 4.  `[:then, 1, 3, 2, 3, 8]` reads
+    a `then` clause that ranges from line 3 and column 2, to line 3 and column 8.
+    Note that lineno starts from 1, and that columnno starts from 0.  So, the
+    above example shows a branch from the `if` to the `then` was never executed,
+    and a branch from the `if` to the `else` was executed twice.
+
+    The result type of method coverage is:
+
+        { (method key) => (counter) }
+
+    where method key has the format
+
+        [class, method-name, start lineno, start column, end lineno, end column]
+
+    For example, `[Object, :foo, 1, 0, 7, 3]` reads `Object#foo` that ranges from
+    line 1 and column 0, to line 7 and column 3.  The above example shows this
+    `Object#foo` was invoked twice.
+
+    Note: To keep compatibility, passing no option to `Coverage.start` will measure
+    only line coverage, and `Coverage.result` will return the old format:
+
+        Coverage.result
+        #=> { "/path/to/file.rb"=> [1, 2, 0, nil, ...] }
+
+* DRb
+
+  * ACL::ACLEntry.new no longer suppresses IPAddr::InvalidPrefixError.
+
+* ERB
+
+  * Add ERB#result_with_hash to render a template with local variables passed
+    with a Hash object. [Feature #8631]
+
+  * Default template file encoding is changed from ASCII-8BIT to UTF-8 in erb
+    command. [Bug #14095]
+
+  * Carriage returns are changed to be trimmed properly if trim_mode is specified
+    and used. Duplicated newlines will be removed on Windows. [Bug #5339] [Bug #11464]
+
+* IPAddr
+
+  * IPAddr no longer accepts invalid address mask. [Bug #13399]
+  * IPAddr#ipv4_compat and IPAddr#ipv4_compat? are marked for deprecation. [Bug #13769]
+
+  * New methods:
+
+    * IPAddr#prefix
+    * IPAddr#loopback?
+    * IPAddr#private? [Feature #11666]
+    * IPAddr#link_local? [Feature #10912]
+
+* IRB
+
+  * Print backtrace and error message in reverse order [Feature #8661] [experimental]
+  * `binding.irb` automatically requires irb and runs [Bug #13099] [experimental]
+  * `binding.irb` on its start shows source around the line where it was called [Feature #14124]
+
+* Matrix
+
+  * New methods:
+
+    * Matrix.combine and Matrix#combine [Feature #10903]
+    * Matrix#hadamard_product and Matrix#entrywise_product
+
+* Net::HTTP
+
+  * Net::HTTP.new supports no_proxy parameter [Feature #11195]
+  * Net::HTTP#min_version and Net::HTTP#max_version [Feature #9450]
+  * Add more HTTP status classes
+  * Net::HTTP::STATUS_CODES is added as HTTP Status Code Repository [Misc #12935]
+  * Net::HTTP#proxy_user and Net::HTTP#proxy_pass reflect http_proxy environment
+    variable if the system's environment variable is multiuser safe. [Bug #12921]
+
+* open-uri
+  * URI.open method defined as an alias to open-uri's Kernel.open.
+    open-uri's Kernel.open will be deprecated in future.
+
+* OpenSSL
+
+  * Updated Ruby/OpenSSL from version 2.0 to 2.1. Changes are noted in
+    "Version 2.1.0" section in ext/openssl/History.md.
+
+* Pathname
+
+  * New method:
+
+    * Pathname#glob [Feature #7360]
+
+* Psych
+
+  * Update to Psych 3.0.2.
+
+    * Convert fallback option to a keyword argument
+      https://github.com/ruby/psych/pull/342
+    * Add :symbolize_names option to Psych.load, Psych.safe_load like JSON.parse
+      https://github.com/ruby/psych/pull/333, https://github.com/ruby/psych/pull/337
+    * Add Psych::Handler#event_location
+      https://github.com/ruby/psych/pull/326
+    * Make frozen string literal = true
+      https://github.com/ruby/psych/pull/320
+    * Preserve time zone offset when deserializing times
+      https://github.com/ruby/psych/pull/316
+    * Remove deprecated method aliases for syck gem
+      https://github.com/ruby/psych/pull/312
+
+* RbConfig
+
+  * RbConfig::LIMITS is added to provide the limits of C types.
+    This is available when rbconfig/sizeof is loaded.
+
+* Ripper
+
+  * Ripper::EXPR_BEG and so on for Ripper#state.
+
+  * New method:
+
+    * Ripper#state to tell the state of scanner. [Feature #13686]
+
+* RDoc
+
+  * Update to RDoc 6.0.1.
+
+    * Replace IRB based lexer with Ripper.
+      * https://github.com/ruby/rdoc/pull/512
+      * This much improves the speed of generating documents.
+      * It also facilitates supporting new syntax in the future.
+    * Support many new syntaxes of Ruby from the past few years.
+    * Use "frozen_string_literal: true".
+      Performance survey: https://gist.github.com/aycabta/abdfaa75ea8a6877eeb734e942e73800
+    * Support did_you_mean.
+
+* Rubygems
+
+  * Update to Rubygems 2.7.3.
+    * http://blog.rubygems.org/2017/11/28/2.7.3-released.html
+    * http://blog.rubygems.org/2017/11/08/2.7.2-released.html
+    * http://blog.rubygems.org/2017/11/03/2.7.1-released.html
+    * http://blog.rubygems.org/2017/11/01/2.7.0-released.html
+    * http://blog.rubygems.org/2017/10/09/2.6.14-released.html
+    * http://blog.rubygems.org/2017/08/27/2.6.13-released.html
+
+* SecureRandom
+
+  * New method:
+
+    * SecureRandom.alphanumeric
+
+* Set
+
+  * New methods:
+
+    * Set#to_s as alias to #inspect [Feature #13676]
+    * Set#=== as alias to #include? [Feature #13801]
+    * Set#reset [Feature #6589]
+
+* StringIO
+
+  * StringIO#write accepts multiple arguments
+
+* StringScanner
+
+  * New methods:
+
+    * StringScanner#size, StringScanner#captures, StringScanner#values_at  [Feature #836]
+
+* URI
+
+  * Relative path operations no longer collapse consecutive slashes to a single slash. [Bug #8352]
+
+* WEBrick
+
+  * Add Server Name Indication (SNI) support [Feature #13729]
+  * support Proc objects as body responses [Feature #855]
+  * released as a RubyGem [Feature #13173]
+  * avoid unintended behavior from Kernel#open [Misc #14216]
+
+* Zlib
+
+  * Zlib::GzipWriter#write accepts multiple arguments
+
+=== Compatibility issues (excluding feature bug fixes)
+
+* Socket
+
+  * BasicSocket#read_nonblock and BasicSocket#write_nonblock no
+    longer set the O_NONBLOCK file description flag as side effect
+    (on Linux only) [Feature #13362]
+
+* Random
+
+  * Random.raw_seed renamed to become Random.urandom.  It is now
+    applicable to non-seeding purposes due to [Bug #9569].
+
+* Socket
+
+  * Socket::Ifaddr#vhid is added [Feature #13803]
+
+* ConditionVariable, Queue and SizedQueue reimplemented for speed.
+  They no longer subclass Struct. [Feature #13552]
+
+=== Stdlib compatibility issues (excluding feature bug fixes)
+
+* Gemification
+
+  * Promote following standard libraries to default gems.
+    * cmath
+    * csv
+    * date
+    * dbm
+    * etc
+    * fcntl
+    * fiddle
+    * fileutils
+    * gdbm
+    * ipaddr
+    * scanf
+    * sdbm
+    * stringio
+    * strscan
+    * webrick
+    * zlib
+
+* Logger
+
+  * Logger.new("| command") had been working to open a command
+    unintentionally. It was prohibited, and now Logger#initialize
+    treats a String argument only as a filename, as its specification. [Bug #14212]
+
+* Net::HTTP
+
+  * Net::HTTP#start now passes :ENV to p_addr by default. [Bug #13351]
+    To avoid this, pass nil explicitly.
+
+* mathn.rb
+
+  * Removed from stdlib. [Feature #10169]
+
+* Rubygems
+
+  * Removed "ubygems.rb" file from stdlib. It's needless since Ruby 1.9.
+
+=== Supported platform changes
+
+* Drop support of NaCl platform
+
+  * https://bugs.chromium.org/p/chromium/issues/detail?id=239656#c160
+
+=== Implementation improvements
+
+* (This might not be a "user visible feature change" but) Hash class's
+  hash function is now SipHash13. [Feature #13017]
+
+* SecureRandom now prefers OS-provided sources than OpenSSL. [Bug #9569]
+
+* Mutex rewritten to be smaller and faster [Feature #13517]
+
+* Performance of block passing using block parameters is improved by
+  lazy Proc allocation [Feature #14045]
+
+* Dynamic instrumentation for TracePoint hooks instead of using "trace"
+  instruction to avoid overhead [Feature #14104]
+
+* ERB now generates code from a template twice as fast as Ruby 2.4
+
+=== Miscellaneous changes
+
+* Print backtrace and error message in reverse order if $stderr is unchanged
+  and a tty. [Feature #8661] [experimental]
+
+* Print error message in bold/underlined text if $stderr is unchanged and a
+  tty. [Feature #14140] [experimental]
+
+* configure option --with-ext now mandates its arguments.  So for
+  instance if you run ./configure --with-ext=openssl,+ then the
+  openssl library is guaranteed compiled, otherwise the build fails
+  abnormally.
+
+  Note however to always add the ",+" at the end of the argument.
+  Otherwise nothing but openssl are built.  [Feature #13302]
diff --git a/doc/NEWS-2.6.0 b/doc/NEWS-2.6.0
new file mode 100644
index 0000000000..2303a5bd41
--- /dev/null
+++ b/doc/NEWS-2.6.0
@@ -0,0 +1,662 @@
+# -*- rdoc -*-
+
+= NEWS for Ruby 2.6.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.5.0 release
+
+=== Language changes
+
+* <code>$SAFE</code> now is a process global state and can be set to 0 again. [Feature #14250]
+
+* Refinements take place at block passing.  [Feature #14223]
+
+* Refinements take place at Kernel#public_send.  [Feature #15326]
+
+* Refinements take place at Kernel#respond_to?.  [Feature #15327]
+
+* +else+ without +rescue+ now causes a syntax error.  [EXPERIMENTAL] [Feature #14606]
+
+* Constant names may start with a non-ASCII capital letter. [Feature #13770]
+
+* Endless ranges are introduced.  You can use a Range that has no end,
+  like <code>(0..)</code> (or similarly <code>(0...)</code>).  [Feature #12912]
+
+  The following shows typical use cases:
+
+    ary[1..]                              # identical to ary[1..-1]
+    (1...).each {|index| block }          # infinite loop from index 1
+    ary.zip(1..) {|elem, index| block }   # ary.each.with_index(1) { }
+
+* Non-Symbol keys in a keyword arguments hash cause an exception.
+
+* The "shadowing outer local variable" warning is removed.  [Feature #12490]
+
+  You can now write the following without warning:
+
+    user = users.find {|user| cond(user) }
+
+* Print +cause+ of the exception if the exception is not caught and printed
+  its backtraces and error message. [Feature #8257]
+
+* The flip-flop syntax is deprecated. [Feature #5400]
+
+=== Core classes updates (outstanding ones only)
+
+Array::
+
+  New methods::
+
+    * Added Array#union and Array#difference instance methods.  [Feature #14097]
+
+  Modified method::
+
+    * Array#to_h now accepts a block that maps elements to new key/value pairs.  [Feature #15143]
+
+  Aliased methods::
+
+    * Array#filter is a new alias for Array#select. [Feature #13784]
+    * Array#filter! is a new alias for Array#select!. [Feature #13784]
+
+Binding::
+
+  New method::
+
+    * Added Binding#source_location.  [Feature #14230]
+
+      This method returns the source location of the binding, a 2-element
+      array of <code>__FILE__</code> and <code>__LINE__</code>.
+      Traditionally, the same information could be retrieved by
+      <code>eval("[__FILE__, __LINE__]", binding)</code>, but we are
+      planning to change this behavior so that Kernel#eval ignores
+      binding's source location [Bug #4352].  So, users should use this
+      newly-introduced method instead of Kernel#eval.
+
+Dir::
+
+  New methods::
+
+    * Added Dir#each_child and Dir#children instance methods. [Feature #13969]
+
+Enumerable::
+
+  New method::
+
+    * Enumerable#chain returns an enumerator object that iterates over the
+      elements of the receiver and then those of each argument
+      in sequence.  [Feature #15144]
+
+  Modified method::
+
+    * Enumerable#to_h now accepts a block that maps elements to new key/value pairs.  [Feature #15143]
+
+  Aliased method::
+
+    * Enumerable#filter is a new alias for Enumerable#select. [Feature #13784]
+
+Enumerator::ArithmeticSequence::
+
+  * This is a new class to represent a generator of an arithmetic sequence,
+    that is a number sequence defined by a common difference. It can be used
+    for representing what is similar to Python's slice. You can get an
+    instance of this class from Numeric#step and Range#step.
+
+Enumerator::Chain::
+
+  * This is a new class to represent a chain of enumerables that works as a
+    single enumerator, generated by such methods as Enumerable#chain and
+    Enumerator#+.
+
+Enumerator::Lazy::
+
+  Aliased method::
+
+    * Enumerator::Lazy#filter is a new alias for
+      Enumerator::Lazy#select.  [Feature #13784]
+
+Enumerator::
+
+  New methods::
+
+    * Enumerator#+ returns an enumerator object that iterates over the
+      elements of the receiver and then those of the other operand.  [Feature #15144]
+
+ENV::
+
+  Modified method::
+
+    * ENV.to_h now accepts a block that maps names and values to new keys and values.  [Feature #15143]
+
+Exception::
+
+  New options::
+
+    * Exception#full_message takes +:highlight+ and +:order+
+      options. [Bug #14324]
+
+Hash::
+
+  Modified methods::
+
+    * Hash#merge, Hash#merge!, and Hash#update now accept multiple
+      arguments.  [Feature #15111]
+
+    * Hash#to_h now accepts a block that maps keys and values to new keys and values.  [Feature #15143]
+
+  Aliased methods::
+
+    * Hash#filter is a new alias for Hash#select.  [Feature #13784]
+
+    * Hash#filter! is a new alias for Hash#select!. [Feature #13784]
+
+IO::
+
+  New option::
+
+    * Added new mode character <code>'x'</code> to open files for exclusive
+      access. [Feature #11258]
+
+Kernel::
+
+  Aliased method::
+
+    * Kernel#then is a new alias for Kernel#yield_self. [Feature #14594]
+
+  New options::
+
+    * Kernel#Complex, Kernel#Float, Kernel#Integer, and
+      Kernel#Rational take an +:exception+ option to specify the way of
+      error handling.  [Feature #12732]
+
+    * Kernel#system takes an +:exception+ option to raise an exception
+      on failure.  [Feature #14386]
+
+  Incompatible changes::
+
+    * Kernel#system and Kernel#exec do not close non-standard file descriptors
+      (the default of the +:close_others+ option is changed to +false+,
+      but we still set the +FD_CLOEXEC+ flag on descriptors we
+      create).  [Misc #14907]
+
+KeyError::
+
+  New options::
+
+    * KeyError.new accepts +:receiver+ and +:key+ options to set receiver and
+      key in Ruby code.  [Feature #14313]
+
+Method::
+
+  New methods::
+
+    * Added Method#<< and Method#>> for Proc composition.  [Feature #6284]
+
+Module::
+
+  Modified methods::
+
+    * Module#method_defined?, Module#private_method_defined?, and
+      Module#protected_method_defined? now accept the second
+      parameter as optional. If it is +true+ (the default value), it checks
+      ancestor modules/classes, or checks only the class itself. [Feature #14944]
+
+NameError::
+
+  New option::
+
+    * NameError.new accepts a +:receiver+ option to set receiver in Ruby
+      code.  [Feature #14313]
+
+NilClass::
+
+  New method::
+
+    * NilClass#=~ is added for compatibility.  [Feature #15231]
+
+NoMethodError::
+
+  New option::
+
+    * NoMethodError.new accepts a +:receiver+ option to set receiver in Ruby
+      code.  [Feature #14313]
+
+Numeric::
+
+  Incompatible changes::
+
+    * Numeric#step now returns an instance of the Enumerator::ArithmeticSequence
+      class rather than one of the Enumerator class.
+
+OpenStruct::
+
+  Modified method::
+
+    * OpenStruct#to_h now accepts a block that maps keys and values to new keys and values.  [Feature #15143]
+
+Proc::
+
+  New methods::
+
+    * Added Proc#<< and Proc#>> for Proc composition.  [Feature #6284]
+
+  Incompatible changes::
+
+    * Proc#call doesn't change <code>$SAFE</code> any more.  [Feature #14250]
+
+Random::
+
+  New method::
+
+    * Added Random.bytes.  [Feature #4938]
+
+Range::
+
+  New method::
+
+    * Added Range#% instance method.  [Feature #14697]
+
+  Incompatible changes::
+
+    * Range#=== now uses the +#cover?+ instead of the +#include?+ method. [Feature #14575]
+    * Range#cover? now accepts a Range object. [Feature #14473]
+    * Range#step now returns an instance of the Enumerator::ArithmeticSequence
+      class rather than one of the Enumerator class.
+
+Regexp/String::
+
+    * Update Unicode version from 10.0.0 to 11.0.0. [Feature #14802]
+
+      This includes a rewrite of the grapheme cluster (/\X/) algorithm
+      and special-casing for Georgian MTAVRULI on String#downcase.
+
+    * Update Emoji version from 5.0 to 11.0.0 [Feature #14802]
+
+RubyVM::AbstractSyntaxTree::
+
+  New methods::
+
+    * RubyVM::AbstractSyntaxTree.parse parses a given string and returns AST
+      nodes. [experimental]
+
+    * RubyVM::AbstractSyntaxTree.parse_file parses a given file and returns AST
+      nodes.  [experimental]
+
+    * RubyVM::AbstractSyntaxTree.of returns AST nodes of the given proc or
+      method.  [experimental]
+
+RubyVM::
+
+  New method::
+
+    * RubyVM.resolve_feature_path identifies the file that will be loaded by
+      "require(feature)". [experimental] [Feature #15230]
+
+String::
+
+  * String#crypt is now deprecated. [Feature #14915]
+
+  New features::
+
+    * String#split yields each substring to the block if given. [Feature #4780]
+
+Struct::
+
+  Modified method::
+
+    * Struct#to_h now accepts a block that maps keys and values to new keys and values.  [Feature #15143]
+
+  Aliased method::
+
+    * Struct#filter is a new alias for Struct#select. [Feature #13784]
+
+Time::
+
+  New features::
+
+    * Time.new and Time#getlocal accept a timezone object as well as
+      a UTC offset string. Time#+, Time#-, and Time#succ also preserve
+      the timezone.  [Feature #14850]
+
+TracePoint::
+
+  New features::
+
+    * "script_compiled" event is supported. [Feature #15287]
+
+  New methods::
+
+    * TracePoint#parameters [Feature #14694]
+
+    * TracePoint#instruction_sequence [Feature #15287]
+
+    * TracePoint#eval_script [Feature #15287]
+
+  Modified method::
+
+    * TracePoint#enable accepts new keywords "target:" and
+      "target_line:".  [Feature #15289]
+
+=== Stdlib updates (outstanding ones only)
+
+BigDecimal::
+
+  Update to version 1.4.0.  This version includes several compatibility
+  issues, see Compatibility issues section below for details.
+
+  Modified method::
+
+    * BigDecimal() accepts the new keyword "exception:" similar to Float().
+
+  Note for the differences among recent versions::
+
+    You should want to know the differences among recent versions of bigdecimal.
+    Please select the suitable version of bigdecimal according to the following
+    information.
+
+    * 1.3.5 has BigDecimal.new without "exception:" keyword.  You can see the
+      deprecation warning of BigDecimal.new when you specify "-w" option.
+      BigDecimal(), BigDecimal.new, and Object#to_d methods are the same.
+
+    * 1.4.0 has BigDecimal.new with "exception:" keyword.  You always see the
+      deprecation warning of BigDecimal.new.  Object#to_d method is different
+      from BigDecimal() and BigDecimal.new.
+
+    * 2.0.0 will be released soon after releasing Ruby 2.6.0.  This version
+      will not have the BigDecimal.new method.
+
+Bundler::
+
+  * Add Bundler to Standard Library. [Feature #12733]
+
+  * Use 1.17.2, the latest stable version.
+
+Coverage::
+
+  A oneshot_lines mode is added.  [Feature #15022]
+
+  This mode checks "whether each line was executed at least once or not",
+  instead of "how many times each line was executed".
+  A hook for each line is fired at most once, and after it is fired
+  the hook flag is removed, i.e., it runs with zero overhead.
+
+  New options::
+
+    * Add +:oneshot_lines+ keyword argument to Coverage.start.
+
+    * Add +:stop+ and +:clear+ keyword arguments to Coverage.result.
+      If +clear+ is true, it clears the counters to zero.
+      If +stop+ is true, it disables coverage measurement.
+
+  New methods::
+
+    * Coverage.line_stub, which is a simple helper function that
+      creates the "stub" of line coverage from a given source code.
+
+CSV::
+
+  * Upgrade to 3.0.2. This includes performance improvements especially
+    for writing. Writing is about 2 times faster.
+    See https://github.com/ruby/csv/blob/master/NEWS.md.
+
+ERB::
+
+  New options::
+
+    * Add +:trim_mode+ and +:eoutvar+ keyword arguments to ERB.new.
+      Now non-keyword arguments other than the first one are softly deprecated
+      and will be removed when Ruby 2.5 becomes EOL. [Feature #14256]
+
+    * erb command's <tt>-S</tt> option is deprecated, and will be removed
+      in the next version.
+
+FileUtils::
+
+  New methods::
+
+    * FileUtils#cp_lr.  [Feature #4189]
+
+Matrix::
+
+  New methods::
+
+    * Matrix#antisymmetric?, Matrix#skew_symmetric?
+
+    * Matrix#map!, Matrix#collect! [Feature #14151]
+
+    * Matrix#[]=
+
+    * Vector#map!, Vector#collect!
+
+    * Vector#[]=
+
+Net::
+
+  New options::
+
+    * Add +:write_timeout+ keyword argument to Net::HTTP.new. [Feature #13396]
+
+  New methods::
+
+    * Add Net::HTTP#write_timeout and Net::HTTP#write_timeout=.  [Feature #13396]
+
+  New constant::
+
+    * Add Net::HTTPClientException to deprecate Net::HTTPServerException,
+      whose name is misleading.  [Bug #14688]
+
+NKF::
+
+  * Upgrade to nkf v2.1.5
+
+Psych::
+
+  * Upgrade to Psych 3.1.0
+
+RDoc::
+
+  * Become about 2 times faster.
+
+  * Use SOURCE_DATE_EPOCH to generate files.
+
+  * Fix method line number that slipped off.
+
+  * Enable <code>--width</code>, <code>--exclude</code>,
+    and <code>--line-numbers</code> that were ignored.
+
+  * Add support for blockquote by ">>>" in default markup notation.
+
+  * Add support for "Raises" lines in TomDoc notation.
+
+  * Fix syntax error output.
+
+  * Fix many parsing bugs.
+
+REXML::
+
+  * Upgrade to REXML 3.1.9.
+    See https://github.com/ruby/rexml/blob/master/NEWS.md.
+
+  Improved some XPath implementations::
+
+    * <code>concat()</code> function: Stringify all arguments before concatenating.
+
+    * <code>string()</code> function: Support context node.
+
+    * <code>string()</code> function: Support processing instruction node.
+
+    * Support <code>"*:#{ELEMENT_NAME}"</code> syntax in XPath 2.0.
+
+  Fixed some XPath implementations::
+
+    * <code>"//#{ELEMENT_NAME}[#{POSITION}]"</code> case
+
+    * <code>string()</code> function: Fix <code>function(document)</code>
+      returns nodes that are out of root elements.
+
+    * <code>"/ #{ELEMENT_NAME} "</code> case
+
+    * <code>"/ #{ELEMENT_NAME} [ #{PREDICATE} ]"</code> case
+
+    * <code>"/ #{AXIS}::#{ELEMENT_NAME}"</code> case
+
+    * <code>"#{N}-#{M}"</code> case: One or more white spaces were required
+      before <code>"-"</code>
+
+    * <code>"/child::node()"</code> case
+
+    * <code>"#{FUNCTION}()/#{PATH}"</code> case
+
+    * <code>"@#{ATTRIBUTE}/parent::"</code> case
+
+    * <code>"name(#{NODE_SET})"</code> case
+
+RSS::
+
+  New options::
+
+    * RSS::Parser.parse now accepts options as Hash. +:validate+ ,
+      +:ignore_unknown_element+ , +:parser_class+ options are available.
+
+RubyGems::
+
+  * Upgrade to RubyGems 3.0.1
+
+  * https://blog.rubygems.org/2018/12/19/3.0.0-released.html
+
+  * https://blog.rubygems.org/2018/12/23/3.0.1-released.html
+
+Set::
+
+  Aliased method::
+
+    * Set#filter! is a new alias for Set#select!.  [Feature #13784]
+
+URI::
+
+  New constant::
+
+    * Add URI::File to handle the file URI scheme.  [Feature #14035]
+
+=== Compatibility issues (excluding feature bug fixes)
+
+Dir::
+
+  * Dir.glob with <code>'\0'</code>-separated pattern list will be deprecated,
+    and is now warned.  [Feature #14643]
+
+File::
+
+  * File.read, File.binread, File.write, File.binwrite, File.foreach, and
+    File.readlines do not invoke external commands even if the path starts
+    with the pipe character <code>'|'</code>. [Feature #14245]
+
+Object::
+
+  * Object#=~ is deprecated.  [Feature #15231]
+
+=== Stdlib compatibility issues (excluding feature bug fixes)
+
+* These standard libraries have been promoted to default gems.
+
+  * e2mmap
+  * forwardable
+  * irb
+  * logger
+  * matrix
+  * mutex_m
+  * ostruct
+  * prime
+  * rexml
+  * rss
+  * shell
+  * sync
+  * thwait
+  * tracer
+
+BigDecimal::
+
+  * The following methods are removed.
+
+    * BigDecimal.allocate
+    * BigDecimal.ver
+
+  * Every BigDecimal object is frozen. [Feature #13984]
+
+  * BigDecimal() parses the given string similar to Float().
+
+  * String#to_d parses the receiver string similar to String#to_f.
+
+  * BigDecimal.new will be removed in version 2.0.
+
+Pathname::
+
+  * Pathname#read, Pathname#binread, Pathname#write, Pathname#binwrite,
+    Pathname#each_line and Pathname#readlines do not invoke external
+    commands even if the path starts with the pipe character <code>'|'</code>.
+    This follows [Feature #14245].
+
+=== Implementation improvements
+
+* Speedup Proc#call because we don't need to care about <code>$SAFE</code>
+  any more. [Feature #14318]
+
+  With +lc_fizzbuzz+ benchmark which uses Proc#call many times we can
+  measure x1.4 improvements.  [Bug #10212]
+
+* Speedup block.call where +block+ is passed block parameter. [Feature #14330]
+
+  Ruby 2.5 improves block passing performance. [Feature #14045]
+
+  Additionally, Ruby 2.6 improves the performance of passed block calling.
+
+* Introduce an initial implementation of a JIT (Just-in-time) compiler. [Feature #14235] [experimental]
+
+  * <tt>--jit</tt> command line option is added to enable JIT. <tt>--jit-verbose=1</tt>
+    is good for inspection.  See <tt>ruby --help</tt> for others.
+  * To generate machine code, this JIT compiler uses the C compiler used for building
+    the interpreter. Currently GCC, Clang, and Microsoft Visual C++ are supported for it.
+  * <tt>--disable-mjit-support</tt> option is added to configure. This is added for JIT debugging,
+    but if you get an error on building a header file for JIT, you can use this option to skip
+    building it as a workaround.
+  * rb_waitpid reimplemented on Unix-like platforms to maintain
+    compatibility with processes created for JIT [Bug #14867]
+
+* VM generator script renewal; makes the generated VM more optimized. [GH-1779]
+
+* Thread cache enabled for pthreads platforms (for Thread.new and
+  Thread.start).  [Feature #14757]
+
+* timer thread is eliminated for platforms with POSIX timers. [Misc #14937]
+
+* Transient Heap (theap) is supported. [Bug #14858] [Feature #14989]
+
+  theap is a managed heap for short-living memory objects. For example,
+  making a small and short-living Hash object is x2 faster. With rdoc benchmark,
+  we measured 6-7% performance improvement.
+
+* Native implementations (arm32, arm64, ppc64le, win32, win64, x86, amd64) of
+  coroutines to improve performance of Fiber significantly. [Feature #14739]
+
+=== Miscellaneous changes
+
+* On macOS, shared libraries no longer include a full version number of Ruby
+  in their names.  This eliminates the burden of each teeny upgrade on the
+  platform that users need to rebuild every extension library.
+
+  Before::
+    * libruby.2.6.0.dylib
+    * libruby.2.6.dylib -> libruby.2.6.0.dylib
+    * libruby.dylib -> libruby.2.6.0.dylib
+
+  After::
+    * libruby.2.6.dylib
+    * libruby.dylib -> libruby.2.6.dylib
+
+* Extracted misc/*.el files to https://github.com/ruby/elisp
diff --git a/doc/bug_triaging.rdoc b/doc/bug_triaging.rdoc
new file mode 100644
index 0000000000..83fe88cabe
--- /dev/null
+++ b/doc/bug_triaging.rdoc
@@ -0,0 +1,79 @@
+= Bug Triaging Guide
+
+This guide discusses recommendations for triaging bugs in Ruby's bug tracker.
+
+== Bugs with Reproducible Examples
+
+These are the best bug reports.  First, consider whether the bug reported is
+actually an issue or if it is expected Ruby behavior.  If it is expected Ruby
+behavior, update the issue with why the behavior is expected, and set the
+status to Rejected.
+
+If the bug reported appears to be an actual bug, try reproducing the bug with
+the master branch.  If you are not able to reproduce the issue on the master
+branch, try reproducing it on the latest version for the branch the bug was
+reported on.  If you cannot reproduce the issue in either case, update
+the issue stating you cannot reproduce the issue, ask the reporter if they
+can reproduce the issue with either the master branch or a later release,
+and set the status to Feedback.
+
+If you can reproduce the example with the master branch, try to figure out
+what is causing the issue.  If you feel comfortable, try working on a
+patch for the issue, update the issue, and attach the patch.  Try to figure
+out which committer should be assigned to the issue, and set them as the
+assignee, and set the status to Assigned.
+
+If you cannot reproduce the example with the master branch, but can reproduce
+the issue on the latest version for the branch, then it is likely the bug has
+already been fixed, but it has not been backported yet.  Try to determine
+which commit fixed it, and update the issue noting that the issue has been
+fixed but not yet backported.  If the Ruby version is in the security
+maintenance phase or no longer supported, change the status to Closed. This
+change can be made without adding a note to avoid spamming the mailing list.
+
+For issues that may require backwards incompatible changes or may benefit from
+general committer attention or discussion, consider adding them as agenda
+items for the next committer meeting (https://bugs.ruby-lang.org/issues/14770).
+
+== Crash Bugs Without Reproducers
+
+Many bugs reported have little more than a crash report, often with no way to
+reproduce the issue.  These bugs are difficult to triage as they often do not
+contain enough information.
+
+For these bugs, if the Ruby version is the master branch or is the latest
+release for the branch and the branch is in normal maintenance phase, look at
+the backtrace and see if you can determine what could be causing the issue.
+If you can guess what could be causing the issue, see if you can put together
+a reproducible example (this is in general quite difficult).  If you cannot
+guess what could be causing the issue, or cannot put together a reproducible
+example yourself, please ask the reporter to provide a reproducible example,
+and change the status to Feedback.
+
+If the Ruby version is no longer current (e.g. 2.5.0 when the latest version
+on the Ruby 2.5 branch is 2.5.5), add a note to the issue asking the reporter
+to try the latest Ruby version for the branch and report back, and change the
+status to Feedback.  If the Ruby version is in the security maintenance phase
+or no longer supported, change the status to Closed. This change can be made
+without adding a note.
+
+== Crash Bugs With 3rd Party C Extensions
+
+If the crash happens inside a 3rd party C extension, try to figure out inside
+which C extension it happens, and add a note to the issue to report the
+issue to that C extension, and set the status to Third Party's Issue.
+
+== Non-Bug reports
+
+Any issues in the bug tracker that are not reports of problems should have
+the tracker changed from Bug to either Feature (new features or performance
+improvements) or Misc. This change can be made without adding a note.
+
+== Stale Issues
+
+There are many issues that are stale, with no updates in months or even years.
+For stale issues in Feedback state, where the feedback has not been received,
+you can change the status to Closed without adding a note.  For stale issues
+in Assigned state, you can reach out to the assignee and see if they can update
+the issue.  If the assignee is no longer an active committer, remove them
+as the assignee and change the status to Open.
diff --git a/doc/contributing.rdoc b/doc/contributing.rdoc
new file mode 100644
index 0000000000..68dda66e46
--- /dev/null
+++ b/doc/contributing.rdoc
@@ -0,0 +1,447 @@
+= Contributing to Ruby
+
+Ruby has a vast and friendly community with hundreds of people contributing to
+a thriving open-source ecosystem. This guide is designed to cover ways for
+participating in the development of CRuby.
+
+There are plenty of ways for you to help even if you're not ready to write
+code or documentation.  You can help by reporting issues, testing patches, and
+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
+report security vulnerabilities here, there is a {separate
+channel}[rdoc-label:label-Reporting+Security+Issues] for them.
+
+There are a few simple steps you should follow in order to receive feedback
+on your ticket.
+
+* If you haven't already,
+  {sign up for an account}[https://bugs.ruby-lang.org/account/register] on the
+  bug tracker.
+* Try the latest version.
+
+  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/].
+* 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.
+* If you can't find a ticket addressing your issue,
+  {create a new one}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues/new].
+* Choose the target version, usually current. Bugs will be first fixed in the
+  current release and then {backported}[rdoc-label:label-Backport+Requests].
+* Fill in the Ruby version you're using when experiencing this issue
+  (<code>ruby -v</code>).
+* Attach any logs or reproducible programs to provide additional information.
+  Reproducible scripts should be as small as possible.
+* Briefly describe your problem.  A 2-3 sentence description will help give a
+  quick response.
+* Pick a category, such as core for common problems, or lib for a standard
+  library.
+* Check the {Maintainers
+  list}[https://bugs.ruby-lang.org/projects/ruby/wiki/Maintainers] and assign
+  the ticket if there is an active maintainer for the library or feature.
+* If the ticket doesn't have any replies after 10 days, you can send a
+  reminder.
+* Please reply to feedback requests. If a bug report doesn't get any feedback,
+  it'll eventually get rejected.
+
+=== Reporting to downstream distributions
+
+You can report downstream issues for the following distributions via their bug tracker:
+
+* {debian}[https://bugs.debian.org/cgi-bin/pkgreport.cgi?src=ruby-defaults]
+* {freebsd}[http://www.freebsd.org/cgi/query-pr-summary.cgi?text=ruby]
+* {redhat}[https://bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=MODIFIED]
+* {macports}[https://trac.macports.org/query?status=assigned&status=new&status=reopened&port=~ruby]
+* etc (add your distribution bug tracker here)
+
+=== Platform Maintainers
+
+For platform specific bugs in Ruby, you can assign your ticket to the current
+maintainer for a specific platform.
+
+The current active platform maintainers are as follows:
+
+[mswin64 (Microsoft Windows)]
+  NAKAMURA Usaku (usa)
+[mingw32 (Minimalist GNU for Windows)]
+  Nobuyoshi Nakada (nobu)
+[AIX]
+  Yutaka Kanemoto (kanemoto)
+[FreeBSD]
+  Akinori MUSHA (knu)
+[Solaris]
+  Naohisa Goto (ngoto)
+[RHEL, CentOS]
+  KOSAKI Motohiro (kosaki)
+[macOS]
+  Kenta Murata (mrkn)
+[OpenBSD]
+  Jeremy Evans (jeremyevans0)
+[cygwin, bcc32, djgpp, wince, ...]
+  none. (Maintainer WANTED)
+
+== Reporting Security Issues
+
+Security vulnerabilities receive special treatment since they may negatively
+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.
+
+== Reporting Other Issues
+
+If you're having an issue with the website, or maybe the mailing list, you can
+contact the webmaster to help resolve the problem.
+
+The current webmaster is:
+
+* Hiroshi SHIBATA (hsbt)
+
+You can also report issues with the ruby-lang.org website on the issue tracker:
+
+* {issue tracker}[https://github.com/ruby/www.ruby-lang.org/issues]
+
+== Resolve Existing Issues
+
+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
+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
+of delinquent bugs that require attention.
+
+You can help by verifying the existing tickets, try to reproduce the reported
+issue on your own and comment if you still experience the bug. Some issues
+lack attention because of too much ambiguity, to help you can narrow down the
+problem and provide more specific details or instructions to reproduce the
+bug. You might also try contributing a failing test in the form of a patch,
+which we will cover later in this guide.
+
+It may also help to try out patches other contributors have submitted to
+redmine, if gone without notice. In this case the +patch+ command is your
+friend, see <code>man patch</code> for more information. Basically this would
+go something like this:
+
+  cd path/to/ruby
+  patch -p0 < path/to/patch
+
+You will then be prompted to apply the patch with the associated files. After
+building ruby again, you should try to run the tests and verify if the change
+actually worked or fixed the bug. It's important to provide valuable feedback
+on the patch that can help reach the overall goal, try to answer some of these
+questions:
+
+* What do you like about this change?
+* What would you do differently?
+* Are there any other edge cases not tested?
+* Is there any documentation that would be affected by this change?
+
+If you can answer some or all of these questions, you're on the right track.
+If your comment simply says "+1", then odds are that other reviewers aren't
+going to take it too seriously. Show that you took the time to review the
+patch.
+
+== How To Request Features
+
+If there's a new feature that you want to see added to Ruby, you will need to
+write a convincing proposal and patch to implement the feature.
+
+For new features in CRuby, use the {'Feature'
+tracker}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues?set_filter=1&tracker_id=2]
+on ruby-master. For non-CRuby dependent features, features that would apply to
+alternate Ruby implementations such as JRuby and Rubinius, use the {CommonRuby
+tracker}[https://bugs.ruby-lang.org/projects/common-ruby].
+
+When writing a proposal be sure to check for previous discussions on the
+topic and have a solid use case. You will need to be persuasive and convince
+Matz on your new feature. You should also consider the potential compatibility
+issues that this new feature might raise.
+
+Consider making your feature into a gem, and if there are enough people who
+benefit from your feature it could help persuade ruby-core. Although feature
+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:
+
+[Abstract]
+  Summary of your feature
+[Background]
+  Describe current behavior and why it is problem. Related work, such as
+  solutions in other language helps us to understand the problem.
+[Proposal]
+  Describe your proposal in details
+[Details]
+  If it has complicated feature, describe it
+[Usecase]
+  How would your feature be used? Who will benefit from it?
+[Discussion]
+  Discuss about this proposal. A list of pros and cons will help start
+  discussion.
+[Limitation]
+  Limitation of your proposal
+[Another alternative proposal]
+  If there are alternative proposals, show them.
+[See also]
+  Links to the other related resources
+
+=== 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.
+
+Slides should be:
+
+* One-page slide
+* Include a corresponding ticket number
+* MUST include a figure and/or short example code
+* SHOULD have less sentence in natural language (try to write less than 140 characters)
+* It is RECOMMENDED to itemize: motivation/use case, proposal, pros/cons, corner case
+* PDF or Image (Web browsers can show it)
+
+Please note:
+
+* Even if the proposal is generally acceptable, it won't be accepted without writing corner cases in the ticket
+* Slide's example: DevelopersMeeting20130727Japan
+
+== 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 master branch. If it's 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
+means only security related vulnerabilities will be backported. Versions in
+End-of-life (EOL) will not receive any updates and it is recommended you
+upgrade as soon as possible.
+
+If a major security issue is found or after a certain amount of time since the
+last patch level release, a new patch-level release will be made.
+
+When submitting a backport request please confirm the bug has been fixed in
+newer versions and exists in maintenance mode versions. There is a backport
+tracker for each major version still in maintenance where you can request a
+particular revision merged in the affected version of Ruby.
+
+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
+
+Status and maintainers of branches are listed on the
+{wiki}[https://bugs.ruby-lang.org/projects/ruby/wiki/ReleaseEngineering].
+
+== Running tests
+
+In order to help resolve existing issues and contributing patches to Ruby you
+need to be able to run the test suite.
+
+CRuby uses git for source control, the {git homepage}[https://git-scm.com/]
+has installation instructions with links to documentation for learning more
+about git. There is a mirror of the repository on {github}[https://github.com/ruby/ruby].
+For other resources see the {ruby-core documentation on
+ruby-lang.org}[https://www.ruby-lang.org/en/community/ruby-core/].
+
+Install the prerequisite dependencies for building the CRuby interpreter to
+run tests.
+
+* C compiler
+* autoconf - 2.67 or later, preferably 2.69.
+* bison - 2.0 or later, preferably 3.4.
+* gperf - 3.0.3 or later, preferably 3.1.
+* ruby - Ruby itself is prerequisite in order to build Ruby from source. It
+  can be 1.8.
+
+You should also have access to development headers for the following
+libraries, but these are not required:
+
+* NDBM/QDBM
+* GDBM
+* OpenSSL/LibreSSL
+* readline/editline(libedit)
+* zlib
+* libffi
+* libyaml
+* libexecinfo (FreeBSD)
+
+Now let's build CRuby:
+
+* Checkout the CRuby source code:
+
+    git clone https://github.com/ruby/ruby.git ruby-master
+
+* Generate the configuration files and build:
+
+    cd ruby-master
+    autoconf
+    mkdir build && cd build # its good practice to build outside of source dir
+    mkdir ~/.rubies # we will install to .rubies/ruby-master in our home dir
+    ../configure --prefix="${HOME}/.rubies/ruby-master"
+    make up && make install
+
+After adding Ruby to your PATH, you should be ready to run the test suite:
+
+    make test
+
+You can also use +test-all+ to run all of the tests with the RUNRUBY
+interpreter just built. Use TESTS or RUNRUBYOPT to pass parameters, such as:
+
+    make test-all TESTS=-v
+
+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
+checking out the associated branch in git, for example if you wanted to
+checkout 1.9.3:
+
+    git clone https://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
+some information available at
+{Contributing}[https://github.com/ruby/ruby#contributing].
+
+There is also the {Ruby Reference
+Manual}[https://github.com/rurema/doctree/wiki] in Japanese.
+
+== Contributing A Patch
+
+=== Deciding what to patch
+
+Before you submit a patch, there are a few things you should know:
+
+* Pay attention to the maintenance policy for stable and maintained versions of Ruby.
+* Released versions in security mode will not merge feature changes.
+* Search for previous discussions on ruby-core to verify the maintenance policy
+* Patches must be distributed under Ruby's license.
+* This license may change in the future, you must join the discussion if you don't agree to the change
+
+To improve the chance your patch will be accepted please follow these simple rules:
+
+* Bug fixes should be committed on master first
+* Format of the patch file must be a unified diff (ie: diff -pu, svn diff, or git diff)
+* Don't introduce cosmetic changes
+* Follow the original coding style of the code
+* Don't mix different changes in one commit
+
+First thing you should do is check out the code if you haven't already:
+
+  git clone https://github.com/ruby/ruby.git ruby-master
+
+Now create a dedicated branch:
+
+  cd ruby-master
+  git checkout -b my_new_branch
+
+The name of your branch doesn't really matter because it will only exist on
+your local computer and won't be part of the official Ruby repository. It will
+be used to create patches based on the differences between your branch and
+master, or edge Ruby.
+
+=== Coding style
+
+Here are some general rules to follow when writing Ruby and C code for CRuby:
+
+* Indent 4 spaces for C without tabs (old codes might use tabs for eight-space indentation,
+  but newer codes recommend to use spaces only)
+* Indent 2 space tabs for Ruby
+* Do not use TABs in ruby codes
+* ANSI C style for 1.9+ for function declarations
+* Follow C90 (not C99) Standard
+* PascalStyle for class/module names.
+* UNDERSCORE_SEPARATED_UPPER_CASE for other constants.
+* Capitalize words.
+* ABBRs should be all upper case.
+* Do as others do
+
+=== Commit messages
+
+When you're ready to commit:
+
+   git commit path/to/files
+
+This will open your editor in which you write your commit message.
+Use the following style for commit messages:
+
+* Use a succinct subject line.
+* Include reasoning behind the change in the commit message, focusing on why
+  the change is being made.
+* Refer to redmine issue (such as Fixes [Bug #1234] or Implements
+  [Feature #3456]), or discussion on the mailing list
+  (such as [ruby-core:12345]).
+* For GitHub issues, use [GH-#] (such as [Fixes GH-234]).
+* Follow the style used by other committers.
+
+=== Contributing your code
+
+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
+on github.
+
+Next copy the writable url for your fork and add it as a git remote, replace
+"my_username" with your github account name:
+
+    git remote add my_fork git@github.com:my_username/ruby.git
+    # Now we can push our branch to our fork
+    git push my_fork my_new_branch
+
+In order to generate a patch that you can upload to the bug tracker, we can use
+the github interface to review our changes just visit
+https://github.com/my_username/ruby/compare/master...my_new_branch
+
+Next, you can simply add '.patch' to the end of this URL and it will generate
+the patch for you, save the file to your computer and upload it to the bug
+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
+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'}[https://git-scm.com/docs/git-format-patch]
+command to generate patch files to upload to redmine.  You may also use
+the {'git request-pull'}[https://git-scm.com/docs/git-request-pull] command for
+formatting pull request messages to redmine.
+
+=== Updating the official repository
+
+If you are a committer, you can push changes directly into the official
+repository:
+
+    git push origin your-branch-name:master
+
+However, it is likely will have become outdated, and you will have to
+update it.  In that case, run:
+
+    git fetch origin
+    git rebase remotes/origin/master
+
+and then try pushing your changes again.
diff --git a/doc/contributors.rdoc b/doc/contributors.rdoc
new file mode 100644
index 0000000000..7c3722032b
--- /dev/null
+++ b/doc/contributors.rdoc
@@ -0,0 +1,793 @@
+= Contributors to Ruby
+
+The following list might be incomplete. Feel free to add your name if your
+patch was accepted into Ruby.
+
+== A
+
+Ayumu AIZAWA (ayumin)
+* committer
+
+AKIYOSHI, Masamichi (akiyoshi)
+* committer
+* He had maintained the VMS support on 2003-2004.
+
+Muhammad Ali
+* wrote rdoc for Fiber
+
+Minero Aoki (aamine)
+* committer
+* He is the maintainer of:
+  * fileutils
+  * net/http, net/https
+  * net/pop
+  * net/smtp
+  * racc
+  * ripper
+  * strscan
+
+Wakou Aoyama (wakou)
+* committer
+* He was the maintainer of some standard libraries.
+
+Koji Arai
+* committer
+
+arton
+* He is the distributor of ActiveScriptRuby and experimental 1.9.0-x installers for win32.
+* Wrote patches for win32ole, gc.c, tmpdir.rb
+
+Sergey Avseyev
+* Added IO#pread and IO#pwrite.
+
+== B
+
+Daniel Berger
+* a patch for irb
+* documentation
+* He wrote forwardable.rb
+
+David Black (dblack)
+* committer
+* He is the maintainer of scanf
+
+Ken Bloom
+* a patch for REXML.
+
+Oliver M. Bolzer
+* a patch for soap
+
+Alexey Borzenkov
+* a patch for mkmf.rb
+
+Evan Brodie
+* a patch for documentation of Float#round
+
+Richard Brown
+* a patch for configure.in
+
+Dirkjan Bussink
+* a patch for date.rb
+
+Daniel Bovensiepen
+* documentation
+* a patch for irb
+
+== C
+
+Brian Candler
+* a patch for configure.in, net/telnet
+
+keith cascio
+* a patch for optparse.rb
+
+Frederick Cheung
+* a patch for test/ruby/test_symbol.rb
+
+Christoph
+* patches for set.rb
+
+Sean Chittenden
+* patches for net/http, cgi
+
+William D. Clinger
+* ruby_strtod is based on his paper.
+
+== D
+
+Ryan Davis (ryan)
+* committer
+* He wrote and is the maintainer of miniunit
+
+Guy Decoux (ts)
+* committer
+
+Zach Dennis
+
+Martin Duerst (duerst)
+* committer
+* M17N
+
+Paul Duncan
+* patches for rdoc
+
+Alexander Dymo
+* a patch for lib/benchmark.rb
+
+== E
+
+Yusuke Endoh (mame)
+* committer
+* He wrote and is the maintainer of base64 library (1.9)
+* did much upon YARV compiler.
+
+erlercw
+* wrote Integer::gcd2
+
+== F
+
+Frank S.Fejes
+* a patch for net/pop
+
+Fundakowski Feldman
+* a patch for process.c
+
+Mauricio Fernandez
+* patches for parse.y
+
+David Flanagan (davidflanagan)
+* committer
+* M17N
+
+Takeyuki Fujioka (xibbar)
+* committer
+* He is the maintainer of cgi/*
+
+FUKUMOTO, Atsushi
+* a patch for tracer.rb
+
+Shota Fukumori (sorah)
+* committer
+* #4415 parallel unit/test
+
+Tadayoshi Funaba (tadf)
+* committer
+* He wrote and is the maintainer of
+  * date
+  * parsedate (1.8)
+* He ported rational.rb and complex.rb, which 1.8 contains, into rational.c and complex.c of 1.9.
+
+== G
+
+David M. Gay
+* ruby_strtod
+
+Florian Gilcher
+* documentation
+
+GOTOU, Kentaro (gotoken)
+* committer
+* He wrote benchmark.rb
+* He is the maintainer of:
+  * benchmark.rb
+  * open3
+
+GOTOU, Yuuzou (gotoyuzo)
+* committer
+
+James Edward Gray II (jeg2)
+* committer
+* He wrote the faster implementation of CSV and is the maintainer of csv.
+* Wrote documentation for rdoc
+
+== H
+
+Phil Hagelberg
+* patch for ruby-mode.el's documentation.
+
+Kirk Haines (wyhaines)
+* committer
+* the maintainer of ruby_1_8_6 branch
+
+Shinichiro Hamaji
+* fixed memory leaks (marshal.c, string.c)
+
+Shin-ichiro HARA
+* the developer and the sysop of ruby-{dev,list,core,talk} archive.
+* a patch for numeric.c
+
+Chris Heath (traumdeutung)
+* a patch for proc.c
+
+HIROKAWA Hisashi
+* fixed socket/socket.c
+
+Daniel Hob
+* He wrote:
+  * SMTP-TLS support for net/smtp.
+  * POP3S support
+
+Eric Hodel (drbrain)
+* committer
+* He is the maintainer of:
+  * rdoc
+  * ri
+  * rubygems
+
+Erik Hollensbe
+* a patch for delegate.rb
+
+Johan Holmberg
+* a patch for dir.c
+* documentation
+
+Erik Huelsmann
+
+Dae San Hwang
+* built a continuous integration environment on OpenSolaris.
+
+== I
+
+Nobuhiro IMAI
+* a patch for logger.rb
+
+"incorporate"
+* a patch for sprintf.c
+
+Keiju Ishitsuka (keiju)
+* committer
+* He wrote and is the maintainer of:
+  * cmath.rb (1.9)
+  * complex.rb (1.8)
+  * e2mmap.rb
+  * forwardable.rb
+  * irb
+  * mathn
+  * matrix.rb
+  * mutex_m.rb
+  * rational.rb (1.8)
+  * sync.rb
+  * shell/*
+  * thwait.rb
+  * tracer.rb
+
+== J
+
+Curtis Jackson
+* missing/dup2.c
+
+Alan Johnson
+* a patch for net/ftp
+
+Lyle Johnson
+* patches for nkf, bigdecimal, numeric.c
+
+== K
+
+Yoshihiro Kambayashi
+* a patch for enc/trans/single_byte.trans.
+* He wrote supports for some encodings.
+
+Yutaka Kanemoto
+* patches for common.mk, AIX AF_INET6 support
+
+Motoyuki Kasahara
+* He wrote getoptlong.rb
+
+Masahiro Kawato
+* a patch for shellwords.rb
+
+Wataru Kimura
+* a patch for configure.in
+
+Michael Klishin
+* patch for make help.
+
+Noritada Kobayashi
+* a patch for optparse.rb
+
+Shigeo Kobayashi (shigek)
+* committer
+* He is the maintainer of bigdecimal
+
+KONISHI, Hiromasa (H_Konishi)
+* committer
+* He had maintained the bcc32 support in 2004.
+
+Kornelius "murphy" Kalnbach
+* documentation
+
+K.Kosako (kosako)
+* committer
+* He wrote Oniguruma.
+
+Takehiro Kubo
+* patches for dl 64bit support.
+
+== L
+
+Marc-Andre Lafortune (marcandre)
+* committer
+* patches for hash.c, array.c, thread.c, enumc, string.c, range.c and rdoc documentation.
+
+Hongli Lai
+* improved pstore.rb
+* patch for tool/file2lastrev.rb.
+
+raspberry lemon
+* a patch for webrick/httpproxy.rb.
+
+Christian Loew
+* a patch for fileutils.rb
+
+== M
+
+Shugo Maeda (shugo)
+* committer
+* A system administrator of ruby-lang.org servers.
+* He wrote and is the maintainer of:
+  * monitor.rb
+  * net/ftp
+  * net/imap
+
+Stephan Maka (mathew)
+* documentation
+
+Yukihiro Matsumoto (matz)
+* Matz -- the founder, language designer of Ruby.
+* committer
+* Ruby itself, most of Ruby.
+* He is the maintainer of:
+  * singleton
+  * timeout
+  * gdbm
+  * sdbm
+
+Konrad Meyer
+* documentation
+
+Mib Software
+* missing/vsnprintf.c
+
+Todd C. Miller
+* missing/strlcat.c
+* missing/strlcpy.c
+
+MIYASAKA, Masaru
+* a patch for cgi.rb
+
+Stefan Monnier
+* regex.c was fixed with based on his Emacs21 patch.
+
+Marcel Moolenaar
+* patches for eval.c and gc.c.
+
+moonwolf
+* a patch for REXML, xmlrpc
+
+Hiroshi Moriyama
+* a patch for yaml.
+
+Kyosuke Morohashi
+* a patch for gem_prelude.rb
+
+Kenta Murata
+* patches for json, bignum.c
+
+Akinori MUSHA (knu)
+* committer
+* He wrote and is the maintainer of:
+  * abbrev.rb
+  * generator (1.8)
+  * enumerator (1.8)
+  * set
+  * ipaddr.rb
+  * digest/*
+  * syslog
+* He is the branch maintainer of ruby_1_8, the release manager of 1.8 series.
+
+== N
+
+Hidetoshi NAGAI (nagai)
+* committer
+* He is the maintainer of tk/*
+
+Nobuyoshi Nakada (nobu)
+* committer
+* a.k.a. the "patch monster"
+* He wrote and is the maintainer of:
+  * optparse
+  * stringio
+  * io/wait
+  * iconv
+
+Satoshi Nakagawa
+* patches for util.c
+
+Narihiro Nakamura (nari)
+* committer
+* a.k.a. authorNari
+* working at GC
+
+NAKAMURA, Hiroshi (nahi)
+* committer
+* He is the maintainer of:
+  * csv.rb (1.8)
+  * logger.rb
+  * soap/* (1.8)
+  * wsdl/* (1.8)
+  * xsd/* (1.8)
+
+NAKAMURA, Usaku (usa)
+* committer
+* a.k.a. unak
+* He is the maintainer of mswin32 and mswin64 support.
+
+NARUSE, Yui (naruse)
+* committer
+* a.k.a. "nurse"
+* Did much upon m17n.
+* He is the maintainer of:
+  * json
+  * nkf
+
+Christian Neukirchen
+* a patch for webrick/httputils
+
+Michael Neumann (mneumann)
+* committer
+* He is the maintainer of
+  * xmlrpc (1.8)
+  * gserver (1.8)
+
+NISHIO Hirokazu
+* wrote a patch for CVE-2010-0541
+
+Kazuhiro NISHIYAMA (kazu)
+* committer
+* a.k.a. znz
+
+Go Noguchi
+
+Martin Nordholts
+* misc/rdebug.el
+
+nmu
+* a patch for socket
+
+== O
+
+okkez
+* He is a sysop of the Ruby Reference Manual Renewal Project.
+* fixed ipaddr.rb, ext/etc
+
+Haruhiko Okumura
+* some of missing/* is based on his book:
+  * missing/erf.c
+  * missing/lgamma_r.c
+  * missing/tgamma.c
+
+OMAE, jun
+* a patch for debug.rb
+
+Eugene Ossintsev
+* documentation
+
+== P
+
+Heesob Park
+* a patch for win32/win32.c.
+
+pegacorn
+* a patch for instruby.rb
+
+== Q
+
+== R
+
+Gaston Ramos
+* documentation
+
+The Regents of the University of California
+* missing/crypt.c
+* missing/vsnprintf.c
+
+Sam Roberts
+* patch for socket
+* documentation
+
+Michal Rokos (michal)
+* committer
+* He was the maintainer of DJGPP support.
+
+rubikitch
+* a patch for io.c
+
+Marcus Rueckert
+* a patch for mkconfig.rb.
+
+Run Paint Run Run
+* patch for enc/unicode.c
+* documentation
+
+Sean Russell (ser)
+* committer
+* He wrote and is the maintainer of REXML.
+
+== S
+
+Kazuo Saito (ksaito)
+* committer
+* M17N
+
+Tadashi Saito
+* patches for test/ruby/test_math.rb, thread_*.c, bignum.c
+* working upon BigDecimal.
+* did much upon documentation
+
+Masahiro Sakai
+* a patch for io.c
+
+Laurent Sansonetti
+* a patch for tool/ytab.sed
+
+Jeff Saracco
+* documentation
+
+Koichi Sasada (ko1)
+* committer
+* He wrote YARV.
+
+Hugh Sasse
+* a patch for net/http
+* documentation
+
+Charlie Savage
+* a patch for win32/Makefile.sub
+
+Michael Scholz
+* a patch for ruby-mode.el
+
+Arthur Schreiber
+* patch for net/http and rdoc.
+
+Masatoshi SEKI (seki)
+* committer
+* He wrote and is the maintainer of:
+  * drb/*
+  * erb
+  * rinda
+
+Roman Shterenzon
+* a patch for open-uri.
+
+Kent Sibilev
+
+Gavin Sinclair (gsinclair)
+* committer
+
+John W. Small
+* He wrote gserver.rb
+
+Yuki Sonoda (yugui)
+* committer
+* She is the maintainer of man/* manual pages and is the release manager of 1.9 series.
+* She wrote prime.rb.
+* A developer and a sysop of redmine.ruby-lang.org.
+
+SOUMA, Yutaka
+* a patch for pack.c.
+
+Tatsuki Sugiura
+* WebDAV support for net/http
+
+Masaki Suketa (suke)
+* committer
+* He is the maintainer of win32ole
+
+sheepman
+* patches for ruby.c, thread.c, stringio, enum.c, webrick, net/http
+
+Siena. (siena)
+* committer
+
+Kirill A. Shutemov
+* a patch for parse.y
+
+Darren Smith
+* a patch for golf_prelude.rb
+
+Richard M. Stallman
+* missing/alloca.c
+
+Robin Stocker
+* documentation
+
+Joshua Stowers
+* a patch for array.c
+
+Marcus Stollsteimer (stomar)
+* committer
+* a maintainer of www.ruby-lang.org
+* patches for cgi (HTML5 tag maker), numeric.c, bigdecimal, ostruct.rb, prime.rb, and others
+* documentation
+
+Adam Strzelecki
+* a patch for compile.c
+
+Masashi Sumi
+* improved net/pop.rb
+
+Eric Sunshine
+* NeXT OpenStep, Rhapsody support
+
+Kouhei Sutou (kou)
+* committer
+* He wrote and is the maintainer of rss/*
+
+David Symonds
+* documentation
+
+== T
+
+TAKANO Mitsuhiro (takano32)
+* committer
+* He is the maintainer of IA-64 support.
+* BigDecimal
+
+TAKAO, Kouji (kouji)
+* committer
+* He is the maintainer of readline.
+
+Nathaniel Talbott (ntalbott)
+* committer
+* He was the maintainer of test/unit, runit, rubyunit.
+
+TANAKA, Akira (akr)
+* committer
+* Did much upon m17n.
+* And he is the maintainer of:
+  * open-uri
+  * pathname
+  * pp
+  * resolv-replace
+  * resolv
+  * time
+  * tsort
+
+Takaaki Tateishi (ttate)
+* committer
+* He was the maintainer of dl
+
+Technorama Ltd. (technoroma)
+* committer
+* openssl
+
+Andrew Thompson
+* a patch for socket.c IRIX support.
+
+Dave Thomas (dave)
+* committer
+* a.k.a. the Pragmatic Programmer.
+* He wrote rdoc.
+
+Tietew
+* patches for win32 support
+
+Masahiro Tomita
+* a patch for cgi.rb
+
+Jakub Travnik
+* a patch for eval.c
+
+Tom Truscott
+* missing/crypt.c
+
+== U
+
+UEDA, Satoshi
+* a patch for uri
+
+Takaaki Uematsu (uema2)
+* committer
+* He was the maintainer of WinCE support.
+
+UENO, Katsuhiro (katsu)
+* committer
+* He is the maintainer of zlib
+
+Hajimu UMEMOTO
+* He wrote ipaddr.rb
+
+URABE, Shyouhei (shyouhei)
+* committer
+* a.k.a. mput.
+* He is the branch maintainer of ruby_1_8_6 and ruby_1_8_7
+* and is the release manager of 1.8.x-pXXX.
+
+== V
+
+Joel VanderWerf
+* a patch for numeric.c
+
+Peter Vanbroekhoven
+
+Corinna Vinschen
+
+== W
+
+wanabe (wanabe)
+* committer
+* fixed YARV and Oniguruma.
+
+Chun Wang
+* a patch for time.rb
+
+WATANABE, Hirofumi (eban)
+* committer
+* He is the maintainer of
+  * ftools (1.8)
+  * tmpdir
+  * un
+  * Win32API
+
+WATANABE, Tetsuya
+* a patch for ruby.c
+
+William Webber (wew)
+* committer
+
+Jim Weirich (jim)
+* committer
+* He wrote Rake.
+
+Nathan Weizenbaum
+* fixed misc/ruby-mode.el.
+
+why the lukky stiff (why)
+* committer
+* He is the maintainer of syck
+
+Caley Woods
+* documentation
+
+Gary Wright
+* documentation
+
+== X
+
+== Y
+
+Akira Yamada (akira)
+* committer
+* He is the maintainer of ruby related packages at Debian project.
+
+Keita Yamaguchi
+* patches for enum.c, parse.y
+* documentation
+
+Hirokazu Yamamoto (ocean)
+* committer
+
+Hirotaka Yoshioka
+* a patch for improving SEGV handling
+
+== Z
+
+Aristarkh A Zagorodnikov
+* a patch for io.c
+
+Alexander Zavorine
+* committer
+* He is the maintainer for Symbian OS.
+
+Chiyuan Zhang
+* a patch for misc/ruby-mode.el.
+
+Dee Zsombor (zunda)
+* a patch for thread_pthread.c
+
+Dan Zwell
+* a patch for net/pop
+
+
diff --git a/doc/dtrace_probes.rdoc b/doc/dtrace_probes.rdoc
new file mode 100644
index 0000000000..d2cdd56902
--- /dev/null
+++ b/doc/dtrace_probes.rdoc
@@ -0,0 +1,178 @@
+= DTrace Probes
+
+A list of DTrace probes and their functionality. "Module" and "Function" cannot
+be defined in user defined probes (known as USDT), so they will not be
+specified. Probe definitions are in the format of:
+
+  provider:module:function:name(arguments)
+
+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)
+
+Where "ruby" is the provider name, module and function names are blank, the
+probe name is "method-entry", and the probe takes four arguments:
+
+* class name
+* method name
+* file name
+* line number
+
+== Probes List
+
+=== Stability
+
+Before we list the specific probes, let's talk about stability. Probe stability
+is declared in the probes.d file at the bottom on the #pragma D attributes
+lines. Here is a description of each of the stability declarations.
+
+[Provider name stability]
+  The provider name of "ruby" has been declared as stable. It is unlikely that
+  we will change the provider name from "ruby" to something else.
+
+[Module and Function stability]
+  Since we are not allowed to provide values for the module and function name,
+  the values we have provided (no value) is declared as stable.
+
+[Probe name stability]
+  The probe names are likely to change in the future, so they are marked as
+  "Evolving". Consumers should not depend on these names to be stable.
+
+[Probe argument stability]
+  The parameters passed to the probes are likely to change in the future, so
+  they are marked as "Evolving". Consumers should not depend on these to be
+  stable.
+
+=== Declared probes
+
+Probes are defined in the probes.d file. Here are the declared probes along
+with when they are fired and the arguments they take:
+
+[ruby:::method-entry(classname, methodname, filename, lineno);]
+  This probe is fired just before a method is entered.
+
+    classname name of the class (a string)
+    methodname name of the method about to be executed (a string)
+    filename the file name where the method is _being called_ (a string)
+    lineno the line number where the method is _being called_ (an int)
+
+[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".
+
+[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".
+
+[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".
+
+[ruby:::require-entry(requiredfile, filename, lineno);]
+  This probe is fired on calls to rb_require_safe (when a file is required).
+
+    requiredfile is the name of the file to be required (string).
+    filename is the file that called "require" (string).
+    lineno is the line number where the call to require was made (int).
+
+[ruby:::require-return(requiredfile, filename, lineno);]
+  This probe is fired just before rb_require_safe (when a file is required)
+  returns. The arguments are the same as "ruby:::require-entry". This probe
+  will not fire if there was an exception during file require.
+
+[ruby:::find-require-entry(requiredfile, filename, lineno);]
+  This probe is fired right before search_required is called. search_required
+  determines whether the file has already been required by searching loaded
+  features ($"), and if not, figures out which file must be loaded.
+
+    requiredfile is the file to be required (string).
+    filename is the file that called "require" (string).
+    lineno is the line number where the call to require was made (int).
+
+[ruby:::find-require-return(requiredfile, filename, lineno);]
+  This probe is fired right after search_required returns. See the
+  documentation for "ruby:::find-require-entry" for more details. Arguments for
+  this probe are the same as "ruby:::find-require-entry".
+
+[ruby:::load-entry(loadedfile, filename, lineno);]
+  This probe is fired when calls to "load" are made. The arguments are the same
+  as "ruby:::require-entry".
+
+[ruby:::load-return(loadedfile, filename, lineno);]
+  This probe is fired when "load" returns. The arguments are the same as
+  "ruby:::load-entry".
+
+[ruby:::raise(classname, filename, lineno);]
+  This probe is fired when an exception is raised.
+
+    classname is the class name of the raised exception (string)
+    filename the name of the file where the exception was raised (string)
+    lineno the line number in the file where the exception was raised (int)
+
+[ruby:::object-create(classname, filename, lineno);]
+  This probe is fired when an object is about to be allocated.
+
+    classname the class of the allocated object (string)
+    filename the name of the file where the object is allocated (string)
+    lineno the line number in the file where the object is allocated (int)
+
+[ruby:::array-create(length, filename, lineno);]
+  This probe is fired when an Array is about to be allocated.
+
+    length the size of the array (long)
+    filename the name of the file where the array is allocated (string)
+    lineno the line number in the file where the array is allocated (int)
+
+[ruby:::hash-create(length, filename, lineno);]
+  This probe is fired when a Hash is about to be allocated.
+
+    length the size of the hash (long)
+    filename the name of the file where the hash is allocated (string)
+    lineno the line number in the file where the hash is allocated (int)
+
+[ruby:::string-create(length, filename, lineno);]
+  This probe is fired when a String is about to be allocated.
+
+    length the size of the string (long)
+    filename the name of the file where the string is allocated (string)
+    lineno the line number in the file where the string is allocated (int)
+
+[ruby:::symbol-create(str, filename, lineno);]
+  This probe is fired when a Symbol is about to be allocated.
+
+    str the contents of the symbol (string)
+    filename the name of the file where the string is allocated (string)
+    lineno the line number in the file where the string is allocated (int)
+
+[ruby:::parse-begin(sourcefile, lineno);]
+  Fired just before parsing and compiling a source file.
+
+    sourcefile the file being parsed (string)
+    lineno the line number where the source starts (int)
+
+[ruby:::parse-end(sourcefile, lineno);]
+  Fired just after parsing and compiling a source file.
+
+    sourcefile the file being parsed (string)
+    lineno the line number where the source ended (int)
+
+[ruby:::gc-mark-begin();]
+  Fired at the beginning of a mark phase.
+
+[ruby:::gc-mark-end();]
+  Fired at the end of a mark phase.
+
+[ruby:::gc-sweep-begin();]
+  Fired at the beginning of a sweep phase.
+
+[ruby:::gc-sweep-end();]
+  Fired at the end of a sweep phase.
+
+[ruby:::method-cache-clear(class, sourcefile, lineno);]
+  Fired when the method cache is cleared.
+
+    class is the classname being cleared, or "global" (string)
+    sourcefile the file being parsed (string)
+    lineno the line number where the source ended (int)
+
diff --git a/doc/etc.rd b/doc/etc.rd
deleted file mode 100644
index b69f9884ad..0000000000
--- a/doc/etc.rd
+++ /dev/null
@@ -1,75 +0,0 @@
-# etc.rd -  -*- mode: rd; coding: us-ascii -*- created at: Fri Jul 14 00:47:15 JST 1995
-=begin
-
-= Etc(Module)
-
-The module to retrieve information from running OS.  All operations
-defined in this module are module functions, so that you can include
-Etc module into your class.
-
-== Module Function
-
---- getlogin
-
-	returns login name of the user.  It this fails, try getpwuid().
-
---- getpwnam(name)
-
-	searches in /etc/passwd file (or equivalent database), and
-	returns password entry for the user.  The return value is an
-	passwd structure, which has members described below.
-
-	  struct passwd
-	    name 	# user name(string)
-	    passwd	# encrypted password(string)
-	    uid		# user ID(integer)
-	    gid		# group ID(integer)
-	    gecos	# gecos field(string)
-	    dir		# home directory(string)
-	    shell	# login shell(string)
-	    # members below are optional
-	    change	# password change time(integer)
-	    quota	# quota value(integer)
-	    age		# password age(integer)
-	    class	# user access class(string)
-	    comment	# comment(string)
-	    expire	# account expiration time(integer)	    
-	  end
-
-	See getpwnam(3) for detail.
-
---- getpwuid([uid])
-
-	returns passwd entry for the specified user id.  If uid is
-	ommitted, use the value from getuid().  See getpwuid(3) for
-	detail.
-
---- getgrgid(gid)
-
-	searches in /etc/group file (or equivalent database), and
-	returns group entry for the group id.  The return value is an
-	group structure, which has members described below.
-
-	  struct group
-	    name 	# group name(string)
-	    passwd	# group password(string)
-	    gid		# group ID(integer)
-	    mem		# array of the group member names
-	  end
-
-	See getgrgid(3) for detail.
-
---- getgrnam(name)
-
-	returns the group entry for the specified name.  The return
-	value is the group structure.  See getgrnam(3) for detail.
-
---- group
-
-	iterates over all group entries.
-
---- passwd
-
-	iterates over all passwd entries.
-
-=end
diff --git a/doc/etc.rd.ja b/doc/etc.rd.ja
deleted file mode 100644
index 39a1efbff1..0000000000
--- a/doc/etc.rd.ja
+++ /dev/null
@@ -1,75 +0,0 @@
-# etc.rd.ja -  -*- mode: rd; coding: euc-jp; -*- created at: Fri Jul 14 00:47:15 JST 1995
-=begin
-
-= Etc(�⥸�塼��)
-
-�¹Ԥ��Ƥ���OS����ξ�������뤿��Υ⥸�塼�롥���饹�˥��󥯥롼��
-���ƻȤ����Ȥ�Ǥ��롥
-
-== Module Function
-
---- getlogin
-
-	��ʬ��login̾���֤������줬���Ԥ�������getpwuid()���Ѥ����
-	�ɤ���
-
---- getpwnam(name)
-
-	/etc/passwd�ե�����(���뤤��DBM�ե������NIS�ǡ����١���)��
-	������name��̾�������passwd����ȥ���֤�������ͤ�passwd��¤
-	�Τǰʲ��Υ��Ф���ġ�
-
-	  struct passwd
-	    name 	# �桼��̾(ʸ����)
-	    passwd	# �ѥ����(ʸ����)
-	    uid		# �桼��ID(����)
-	    gid		# ���롼��ID(����)
-	    gecos	# gecos�ե������(ʸ����)
-	    dir		# �ۡ���ǥ��쥯�ȥ�(ʸ����)
-	    shell	# �������󥷥���(ʸ����)
-	    # �ʹߤΥ��Фϥ����ƥ�ˤ�äƤ��󶡤���ʤ���
-	    change	# �ѥ�����ѹ�����(����)
-	    quota	# ��������(����)
-	    age		# ������(����)
-	    class	# �桼�������������饹(ʸ����)
-	    comment	# ������(ʸ����)
-	    expire	# ���������ͭ������(����)	    
-	  end
-
-	�ܺ٤�getpwnam(3)�򻲾ȤΤ��ȡ�
-
---- getpwuid([uid])
-
-	uid��桼��ID�Ȥ���passwd����ȥ���֤�������ͤ�getpwnam()��
-	Ʊ�ͤǤ��롥�������ά�������ˤ�getuid()���ͤ��Ѥ��롥�ܺ٤�
-	getpwuid(3)�򻲾ȤΤ��ȡ�
-
---- getgrgid(gid)
-
-	/etc/group�ե�����(���뤤�ϡ�getpwnam����)�򸡺�����gid�򥰥롼
-	��ID�Ȥ��륰�롼�ץ���ȥ���֤�������ͤ�group��¤�Τǰʲ���
-	���Ф���ġ�
-
-	  struct group
-	    name 	# ���롼��̾(ʸ����)
-	    passwd	# ���롼�פΥѥ����(ʸ����)
-	    gid		# ���롼��ID(����)
-	    mem		# ���롼�ץ���̾������
-	  end
-
-	�ܺ٤�getgrgid(3)�򻲾ȤΤ��ȡ�
-
---- getgrnam(name)
-
-	name�Ȥ���̾���Υ��롼�ץ���ȥ���֤�������ͤ�getgrgid()��Ʊ
-	�ͤǤ��롥�ܺ٤�getgrnam(3)�򻲾ȡ�
-
---- group
-
-	���ƤΥ��롼�ץ���ȥ���˥����������뤿��Υ��ƥ졼����
-
---- passwd
-
-	���Ƥ�passwd����ȥ���˥����������뤿��Υ��ƥ졼����
-
-=end
diff --git a/doc/extension.ja.rdoc b/doc/extension.ja.rdoc
new file mode 100644
index 0000000000..47303ec408
--- /dev/null
+++ b/doc/extension.ja.rdoc
@@ -0,0 +1,1834 @@
+# extension.ja.rdoc -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
+
+= Rubyの拡張ライブラリの作り方
+
+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_str_append(VALUE str1, VALUE str2) ::
+
+  Rubyの文字列str1にRubyの文字列str2を追加する．
+
+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_append(str, rb_sprintf(format, ...)) や
+  rb_str_append(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, rb_encoding *enc) ::
+
+  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_str_modify(VALUE str) ::
+
+  Rubyの文字列の変更する準備をする．strが変更可能でなければ例
+  外が発生する．strのバッファが共有されている場合は，新しいバッ
+  ファを割り当てて共有されていない状態にする．RSTRING_PTRを使っ
+  て中身を変更したり，rb_str_set_lenを呼んだりする前には，
+  必ずこの関数を呼ばなけれならない．
+
+==== 配列に対する関数
+
+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(int argc, const 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は次のように定義されています．
+
+  typedef struct rb_data_type_struct 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.ja.rdocのAppendix D
+  "世代別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に代入されます．
+
+これらのマクロの使い方はちょっと分かりにくいので，後で説明す
+る例題を参照してください．
+
+== 例: 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クラスを定義する */
+      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ではTypedData_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)
+
+=== 型変換
+
+  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) ::
+
+  マークする必要のあるRubyオブジェクトを含む大域変数を，GC
+  によって解放されないように保護する．
+
+void rb_gc_register_mark_object(VALUE object) ::
+
+  マークする必要のあるRubyオブジェクトを，GCによって解放さ
+  れないように登録する．
+
+=== 定数
+
+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
new file mode 100644
index 0000000000..79eb96d518
--- /dev/null
+++ b/doc/extension.rdoc
@@ -0,0 +1,2105 @@
+# extension.rdoc -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
+
+= Creating Extension Libraries for Ruby
+
+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_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_append(VALUE str1, VALUE str2) ::
+
+  Appends Ruby string str2 to Ruby string str1.
+
+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_append(str, rb_sprintf(format, ...)) and
+  rb_str_append(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, rb_encoding *enc) ::
+
+  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.
+
+rb_str_modify(VALUE str) ::
+
+  Prepares a Ruby string to modify.  If str is not modifiable, this
+  function raises an exception, or if the buffer of str is shared,
+  this function allocates new buffer to make it unshared.  Always
+  you MUST call this function before modifying the contents using
+  RSTRING_PTR and/or rb_str_set_len.
+
+==== 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(int argc, const 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 specify whether keyword arguments are passed when calling super:
+
+  VALUE rb_call_super(int argc, const VALUE *argv, int kw_splat)
+
++kw_splat+ can have these possible values (used by all methods that accept
++kw_splat+ argument):
+
+RB_NO_KEYWORDS :: Do not pass keywords
+RB_PASS_KEYWORDS :: Pass keywords, final argument should be a hash of keywords
+RB_PASS_EMPTY_KEYWORDS :: Pass empty keywords (not included in arguments)
+                          (this will be removed in Ruby 3.0)
+RB_PASS_CALLED_KEYWORDS :: Pass keywords if current method was called with
+                           keywords, useful for argument delegation
+
+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.
+
+  typedef struct rb_data_type_struct 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 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 invocation 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
+TypedData_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
+TypedData_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)
+
+or the objects themselves by
+
+  void rb_gc_register_mark_object(VALUE object)
+
+=== 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
+
+=== 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) ::
+
+  Tells GC to protect C global variable, which holds Ruby value to be marked.
+
+void rb_gc_register_mark_object(VALUE object) ::
+
+  Tells GC to protect the +object+, which may not be referenced anywhere.
+
+=== 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 [keyword-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
+    keyword-arg-spec := sym-for-keyword-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-keyword-arg            := ":"   ; Indicates that keyword
+                                            ; argument captured as a hash.
+                                            ; If keyword arguments are not
+                                            ; provided, returns nil.
+                                            ;
+                                            ; Currently, will also consider
+                                            ; final argument as keywords if
+                                            ; it 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.
+                                            ;
+                                            ; However, handling final
+                                            ; argument as keywords if
+                                            ; method was not called with
+                                            ; keywords (whether final
+                                            ; argument is hash or nil) is
+                                            ; deprecated. In that case, a
+                                            ; warning will be emitted, and
+                                            ; in Ruby 3.0 it will be an error.
+    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.
+
+rb_scan_args_kw(int kw_splat, int argc, VALUE *argv, const char *fmt, ...) ::
+
+  The same as +rb_scan_args+, except the +kw_splat+ argument specifies whether
+  keyword arguments are provided (instead of being determined by the call
+  from Ruby to the C function). +kw_splat+ should be one of the following
+  values:
+
+  RB_SCAN_ARGS_PASS_CALLED_KEYWORDS :: Same behavior as +rb_scan_args+.
+  RB_SCAN_ARGS_KEYWORDS :: The final argument should be a hash treated as
+                           keywords.
+  RB_SCAN_ARGS_EMPTY_KEYWORDS :: Don't treat a final hash as keywords.
+                                 (this will be removed in Ruby 3.0)
+  RB_SCAN_ARGS_LAST_HASH_KEYWORDS :: Treat a final argument as keywords if it
+                                     is a hash, and not as keywords otherwise.
+
+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_kw(VALUE recv, ID mid, int argc, VALUE *argv, int kw_splat) ::
+
+  Same as rb_funcallv, using +kw_splat+ to determine whether keyword
+  arguments are passed.
+
+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_funcallv_public_kw(VALUE recv, ID mid, int argc, VALUE *argv, int kw_splat) ::
+
+  Same as rb_funcallv_public, using +kw_splat+ to determine whether keyword
+  arguments are passed.
+
+VALUE rb_funcall_passing_block(VALUE recv, ID mid, int argc, const VALUE* argv) ::
+
+  Same as rb_funcallv_public, except is passes the currently active block as
+  the block when calling the method.
+
+VALUE rb_funcall_passing_block_kw(VALUE recv, ID mid, int argc, const VALUE* argv, int kw_splat) ::
+
+  Same as rb_funcall_passing_block, using +kw_splat+ to determine whether
+  keyword arguments are passed.
+
+VALUE rb_funcall_with_block(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE passed_procval) ::
+
+  Same as rb_funcallv_public, except +passed_procval+ specifies the block to
+  pass to the method.
+
+VALUE rb_funcall_with_block_kw(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE passed_procval, int kw_splat) ::
+
+  Same as rb_funcall_with_block, using +kw_splat+ to determine whether
+  keyword arguments are passed.
+
+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.
+
+VALUE rb_block_call_kw(VALUE recv, ID mid, int argc, VALUE * argv, VALUE (*func) (ANYARGS), VALUE data2, int kw_splat) ::
+
+  Same as rb_funcall_with_block, using +kw_splat+ to determine whether
+  keyword arguments are passed.
+
+\[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) ::
+
+  Yields val as a single argument to the block.
+
+VALUE rb_yield_values(int n, ...) ::
+
+  Yields +n+ number of arguments to the block, using one C argument per Ruby
+  argument.
+
+VALUE rb_yield_values2(int n, VALUE *argv) ::
+
+  Yields +n+ number of arguments to the block, with all Ruby arguments in the
+  C argv array.
+
+VALUE rb_yield_values_kw(int n, VALUE *argv, int kw_splat) ::
+
+  Same as rb_yield_values2, using +kw_splat+ to determine whether
+  keyword arguments are passed.
+
+VALUE rb_yield_splat(VALUE args) ::
+
+  Same as rb_yield_values2, except arguments are specified by the Ruby
+  array +args+.
+
+VALUE rb_yield_splat_kw(VALUE args, int kw_splat) ::
+
+  Same as rb_yield_splat, using +kw_splat+ to determine whether
+  keyword arguments are passed.
+
+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".
+
+=== Threading
+
+As of Ruby 1.9, Ruby supports native 1:1 threading with one kernel
+thread per Ruby Thread object.  Currently, there is a GVL (Global VM Lock)
+which prevents simultaneous execution of Ruby code which may be released
+by the rb_thread_call_without_gvl and rb_thread_call_without_gvl2 functions.
+These functions are tricky-to-use and documented in thread.c; do not
+use them before reading comments in thread.c.
+
+void rb_thread_schedule(void) ::
+
+  Give the scheduler a hint to pass execution to another thread.
+
+=== Input/Output (IO) on a single file descriptor
+
+int rb_io_wait_readable(int fd) ::
+
+  Wait indefinitely for the given FD to become readable, allowing other
+  threads to be scheduled.  Returns a true value if a read may be
+  performed, false if there is an unrecoverable error.
+
+int rb_io_wait_writable(int fd) ::
+
+  Like rb_io_wait_readable, but for writability.
+
+int rb_wait_for_single_fd(int fd, int events, struct timeval *timeout) ::
+
+  Allows waiting on a single FD for one or multiple events with a
+  specified timeout.
+
+  +events+ is a mask of any combination of the following values:
+
+  * RB_WAITFD_IN - wait for readability of normal data
+  * RB_WAITFD_OUT - wait for writability
+  * RB_WAITFD_PRI - wait for readability of urgent data
+
+  Use a NULL +timeout+ to wait indefinitely.
+
+=== I/O Multiplexing
+
+Ruby supports I/O multiplexing based on the select(2) system call.
+The Linux select_tut(2) manpage
+<http://man7.org/linux/man-pages/man2/select_tut.2.html>
+provides a good overview on how to use select(2), and the Ruby API has
+analogous functions and data structures to the well-known select API.
+Understanding of select(2) is required to understand this section.
+
+typedef struct rb_fdset_t ::
+
+  The data structure which wraps the fd_set bitmap used by select(2).
+  This allows Ruby to use FD sets larger than that allowed by
+  historic limitations on modern platforms.
+
+void rb_fd_init(rb_fdset_t *) ::
+
+  Initializes the rb_fdset_t, it must be initialized before other rb_fd_*
+  operations.  Analogous to calling malloc(3) to allocate an fd_set.
+
+void rb_fd_term(rb_fdset_t *) ::
+
+  Destroys the rb_fdset_t, releasing any memory and resources it used.
+  It must be reinitialized using rb_fd_init before future use.
+  Analogous to calling free(3) to release memory for an fd_set.
+
+void rb_fd_zero(rb_fdset_t *) ::
+
+  Clears all FDs from the rb_fdset_t, analogous to FD_ZERO(3).
+
+void rb_fd_set(int fd, rb_fdset_t *) ::
+
+  Adds a given FD in the rb_fdset_t, analogous to FD_SET(3).
+
+void rb_fd_clr(int fd, rb_fdset_t *) ::
+
+  Removes a given FD from the rb_fdset_t, analogous to FD_CLR(3).
+
+int rb_fd_isset(int fd, const rb_fdset_t *) ::
+
+  Returns true if a given FD is set in the rb_fdset_t, false if not.
+  Analogous to FD_ISSET(3).
+
+int rb_thread_fd_select(int nfds, rb_fdset_t *readfds, rb_fdset_t *writefds, rb_fdset_t *exceptfds, struct timeval *timeout) ::
+
+  Analogous to the select(2) system call, but allows other Ruby
+  threads to be scheduled while waiting.
+
+  When only waiting on a single FD, favor rb_io_wait_readable,
+  rb_io_wait_writable, or rb_wait_for_single_fd functions since
+  they can be optimized for specific platforms (currently, only Linux).
+
+=== 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.
+
+=== Defining backward compatible macros for keyword argument functions
+
+Most ruby C extensions are designed to support multiple Ruby versions.
+In order to correctly support Ruby 2.7+ in regards to keyword
+argument separation, C extensions need to use <code>*_kw</code>
+functions.  However, these functions do not exist in Ruby 2.6 and
+below, so in those cases macros should be defined to allow you to use
+the same code on multiple Ruby versions.  Here are example macros
+you can use in extensions that support Ruby 2.6 (or below) when using
+the <code>*_kw</code> functions introduced in Ruby 2.7.
+
+  #ifndef RB_PASS_KEYWORDS
+  /* Only define macros on Ruby <2.7 */
+  #define rb_funcallv_kw(o, m, c, v, kw) rb_funcallv(o, m, c, v)
+  #define rb_funcallv_public_kw(o, m, c, v, kw) rb_funcallv_public(o, m, c, v)
+  #define rb_funcall_passing_block_kw(o, m, c, v, kw) rb_funcall_passing_block(o, m, c, v)
+  #define rb_funcall_with_block_kw(o, m, c, v, b, kw) rb_funcall_with_block(o, m, c, v, b)
+  #define rb_scan_args_kw(kw, c, v, s, ...) rb_scan_args(c, v, s, __VA_ARGS__)
+  #define rb_call_super_kw(c, v, kw) rb_call_super(c, v)
+  #define rb_yield_values_kw(c, v, kw) rb_yield_values2(c, v)
+  #define rb_yield_splat_kw(a, kw) rb_yield_splat(a)
+  #define rb_block_call_kw(o, m, c, v, f, p, kw) rb_block_call(o, m, c, v, f, p)
+  #define rb_fiber_resume_kw(o, c, v, kw) rb_fiber_resume(o, c, v)
+  #define rb_fiber_yield_kw(c, v, kw) rb_fiber_yield(c, v)
+  #define rb_enumeratorize_with_size_kw(o, m, c, v, f, kw) rb_enumeratorize_with_size(o, m, c, v, f)
+  #define SIZED_ENUMERATOR_KW(obj, argc, argv, size_fn, kw_splat) \
+      rb_enumeratorize_with_size((obj), ID2SYM(rb_frame_this_func()), \
+                                 (argc), (argv), (size_fn))
+  #define RETURN_SIZED_ENUMERATOR_KW(obj, argc, argv, size_fn, kw_splat) do { \
+          if (!rb_block_given_p())                                            \
+              return SIZED_ENUMERATOR(obj, argc, argv, size_fn);              \
+      } while (0)
+  #define RETURN_ENUMERATOR_KW(obj, argc, argv, kw_splat) RETURN_SIZED_ENUMERATOR(obj, argc, argv, 0)
+  #define rb_check_funcall_kw(o, m, c, v, kw) rb_check_funcall(o, m, c, v)
+  #define rb_obj_call_init_kw(o, c, v, kw) rb_obj_call_init(o, c, v)
+  #define rb_class_new_instance_kw(c, v, k, kw) rb_class_new_instance(c, v, k)
+  #define rb_proc_call_kw(p, a, kw) rb_proc_call(p, a)
+  #define rb_proc_call_with_block_kw(p, c, v, b, kw) rb_proc_call_with_block(p, c, v, b)
+  #define rb_method_call_kw(c, v, m, kw) rb_method_call(c, v, m)
+  #define rb_method_call_with_block_kw(c, v, m, b, kw) rb_method_call_with_block(c, v, m, b)
+  #endif
+
+== 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
+(https://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 b/doc/forwardable.rd
deleted file mode 100644
index 0eca25b90a..0000000000
--- a/doc/forwardable.rd
+++ /dev/null
@@ -1,83 +0,0 @@
- -- forwardable.rb
-						
-                                                $Release Version: 1.1 $
-                                                $Revision$
-						Original version by Tosh
-
-=begin
-
-= Forwardable
-
-A Module to define delegations for selected methods to a class.
-
-== Usage
-
-Using through extending the class.
-  
-  class Foo
-    extend Forwardable
-
-    def_delegators("@out", "printf", "print")
-    def_delegators(:@in, :gets)
-    def_delegator(:@contents, :[], "content_at")
-  end
-  f = Foo.new
-  f.printf ...
-  f.gets
-  f.content_at(1)
-
-== Methods
-
---- Forwardable#def_instance_delegators(accessor, *methods)
-
-      adding the delegations for each method of ((|methods|)) to
-      ((|accessor|)).
-
---- Forwardable#def_instance_delegator(accessor, method, ali = method)
-      
-      adding the delegation for ((|method|)) to ((|accessor|)). When
-      you give optional argument ((|ali|)), ((|ali|)) is used as the
-      name of the delegation method, instead of ((|method|)).
-
---- Forwardable#def_delegators(accessor, *methods)
-
-      the alias of ((|Forwardable#def_instance_delegators|)).
-
---- Forwardable#def_delegator(accessor, method, ali = method)
-      
-      the alias of ((|Forwardable#def_instance_delegator|)).
-
-= SingleForwardable
-
-a Module to define delegations for selected methods to an object.
-
-== Usage
-
-Using through extending the object.
-
-  g = Goo.new
-  g.extend SingleForwardable
-  g.def_delegator("@out", :puts)
-  g.puts ...
-
-== Methods
-
---- SingleForwardable#def_singleton_delegators(accessor, *methods)
-
-      adding the delegations for each method of ((|methods|)) to
-      ((|accessor|)).
-
---- SingleForwardable#def_singleton_delegator(accessor, method, ali = method)
-
-      adding the delegation for ((|method|)) to ((|accessor|)). When
-      you give optional argument ((|ali|)), ((|ali|)) is used as the
-      name of the delegation method, instead of ((|method|)).
-
---- SingleForwardable#def_delegators(accessor, *methods)
-
-      the alias of ((|SingleForwardable#def_instance_delegators|)).
-
---- SingleForwardable#def_delegator(accessor, method, ali = method)
-
-      the alias of ((|SingleForwardable#def_instance_delegator|)).
-=end
diff --git a/doc/forwardable.rd.ja b/doc/forwardable.rd.ja
index 48186b111f..171724b2e5 100644
--- a/doc/forwardable.rd.ja
+++ b/doc/forwardable.rd.ja
@@ -5,12 +5,12 @@
 =begin
 = Forwardable
 
-���饹���Ф��᥽�åɤΰѾ���ǽ��������ޤ�.
+クラスに対しメソッドの委譲機能を定義します.
 
-== �Ȥ���
+== 使い方
+
+クラスに対してextendして使います.
 
-���饹���Ф���extend���ƻȤ��ޤ�. 
-  
   class Foo
     extend Forwardable
 
@@ -23,58 +23,58 @@
   f.gets
   f.content_at(1)
 
-== �᥽�å�
+== メソッド
 
 --- Forwardable#def_instance_delegators(accessor, *methods)
 
-      ((|methods|))���Ϥ��줿�᥽�åɤΥꥹ�Ȥ�((|accessor��|))�Ѿ�����
-      �褦�ˤ��ޤ�.
+      ((|methods|))で渡されたメソッドのリストを((|accessorに|))委譲する
+      ようにします.
 
 --- Forwardable#def_instance_delegator(accessor, method, ali = method)
 
-      ((||method|))���Ϥ��줿�᥽�åɤ�((|accessor|))�˰Ѿ�����褦�ˤ�
-      �ޤ�. ((|ali|))�������Ȥ����Ϥ��줿�Ȥ���, �᥽�å�((|ali|))���Ƥ�
-      �줿�Ȥ��ˤ�, ((|accessor|))���Ф�((|method|))��ƤӽФ��ޤ�.
+      ((||method|))で渡されたメソッドを((|accessor|))に委譲するようにし
+      ます. ((|ali|))が引数として渡されたときは, メソッド((|ali|))が呼ば
+      れたときには, ((|accessor|))に対し((|method|))を呼び出します.
 
 --- Forwardable#def_delegators(accessor, *methods)
 
-      ((|Forwardable#def_instance_delegators|))����̾�Ǥ�.
+      ((|Forwardable#def_instance_delegators|))の別名です.
 
 --- Forwardable#def_delegator(accessor, method, ali = method)
 
-      ((|Forwardable#def_instance_delegator|))����̾�Ǥ�.
+      ((|Forwardable#def_instance_delegator|))の別名です.
 
 = SingleForwardable
 
-���֥������Ȥ��Ф�, �᥽�åɤΰѾ���ǽ��������ޤ�.
+オブジェクトに対し, メソッドの委譲機能を定義します.
 
-== �Ȥ���
+== 使い方
 
-���֥������Ȥ��Ф���((|extend|))���ƻȤ��ޤ�. 
+オブジェクトに対して((|extend|))して使います.
 
   g = Goo.new
   g.extend SingleForwardable
   g.def_delegator("@out", :puts)
   g.puts ...
 
-== �᥽�å�
+== メソッド
 
 --- SingleForwardable#def_singleton_delegators(accessor, *methods)
 
-      ((|methods|))���Ϥ��줿�᥽�åɤΥꥹ�Ȥ�((|accessor|))�˰Ѿ�����
-      �褦�ˤ��ޤ�.
+      ((|methods|))で渡されたメソッドのリストを((|accessor|))に委譲する
+      ようにします.
 
 --- SingleForwardable#def_singleton_delegator(accessor, method, ali = method)
 
-      ((|method|))���Ϥ��줿�᥽�åɤ�((|accessor|))�˰Ѿ�����褦�ˤ���
-      ��. ((|ali|))�������Ȥ����Ϥ��줿�Ȥ���, �᥽�å�((|ali|))���ƤФ�
-      ���Ȥ��ˤ�, ((|accessor|))���Ф�((|method|))��ƤӽФ��ޤ�.
+      ((|method|))で渡されたメソッドを((|accessor|))に委譲するようにしま
+      す. ((|ali|))が引数として渡されたときは, メソッド((|ali|))が呼ばれ
+      たときには, ((|accessor|))に対し((|method|))を呼び出します.
 
 --- SingleForwardable#def_delegators(accessor, *methods)
 
-      ((|SingleForwardable#def_singleton_delegators|))����̾�Ǥ�.
+      ((|SingleForwardable#def_singleton_delegators|))の別名です.
 
 --- SingleForwardable#def_delegator(accessor, method, ali = method)
 
-      ((|SingleForwardable#def_singleton_delegator|))����̾�Ǥ�.
+      ((|SingleForwardable#def_singleton_delegator|))の別名です.
 =end
diff --git a/doc/globals.rdoc b/doc/globals.rdoc
new file mode 100644
index 0000000000..89b94e9a8f
--- /dev/null
+++ b/doc/globals.rdoc
@@ -0,0 +1,72 @@
+# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
+
+== Pre-defined global variables
+
+$!::   The Exception object set by Kernel#raise.
+$@::   The same as <code>$!.backtrace</code>.
+$~::   The information about the last match in the current scope (thread-local and frame-local).
+$&::   The string matched by the last successful match.
+$`::   The string to the left  of the last successful match.
+$'::   The string to the right of the last successful match.
+$+::   The highest group matched by the last successful match.
+$1::   The Nth group of the last successful match. May be > 1.
+$=::   This variable is no longer effective. Deprecated.
+$/::   The input record separator, newline by default. Aliased to $-0.
+$\::   The output record separator for Kernel#print and IO#write. Default is +nil+.
+$,::   The output field separator for Kernel#print and Array#join. Non-nil $, will be deprecated.
+$;::   The default separator for String#split. Non-nil $; will be deprecated. Aliased to $-F.
+$.::   The current input line number of the last file that was read.
+$<::   The same as ARGF.
+$>::   The default output stream for Kernel#print and Kernel#printf. $stdout by default.
+$_::   The last input line of string by gets or readline.
+$0::   Contains the name of the script being executed. May be assignable.
+$*::   The same as ARGV.
+$$::   The process number of the Ruby running this script. Same as Process.pid.
+$?::   The status of the last executed child process (thread-local).
+$LOAD_PATH::   Load path for searching Ruby scripts and extension libraries used
+               by Kernel#load and Kernel#require. Aliased to $: and $-I.
+               Has a singleton method <code>$LOAD_PATH.resolve_feature_path(feature)</code>
+               that returns [+:rb+ or +:so+, path], which resolves the feature to
+               the path the original Kernel#require method would load.
+$LOADED_FEATURES::   The array contains the module names loaded by require.
+                     Aliased to $".
+$DEBUG::     The debug flag, which is set by the <tt>-d</tt> switch.  Enabling debug
+             output prints each exception raised to $stderr (but not its
+             backtrace).  Setting this to a true value enables debug output as
+             if <tt>-d</tt> were given on the command line.  Setting this to a false
+             value disables debug output. Aliased to $-d.
+$FILENAME::  Current input filename from ARGF. Same as ARGF.filename.
+$stderr::    The current standard error output.
+$stdin::     The current standard input.
+$stdout::    The current standard output.
+$VERBOSE::   The verbose flag, which is set by the <tt>-w</tt> or <tt>-v</tt> switch.
+             Setting this to a true value enables warnings as if <tt>-w</tt> or <tt>-v</tt> were given
+             on the command line.  Setting this to +nil+ disables warnings,
+             including from Kernel#warn. Aliased to $-v and $-w.
+$-a::  True if option <tt>-a</tt> is set. Read-only variable.
+$-i::  In in-place-edit mode, this variable holds the extension, otherwise +nil+.
+$-l::  True if option <tt>-l</tt> is set. Read-only variable.
+$-p::  True if option <tt>-p</tt> is set. Read-only variable.
+
+== Pre-defined global constants
+
+TRUE::              The typical true value. Deprecated.
+FALSE::             The +false+ itself. Deprecated.
+NIL::               The +nil+ itself. Deprecated.
+STDIN::             The standard input. The default value for $stdin.
+STDOUT::            The standard output. The default value for $stdout.
+STDERR::            The standard error output. The default value for $stderr.
+ENV::               The hash contains current environment variables.
+ARGF::              The virtual concatenation of the files given on command line (or from $stdin if no files were given).
+ARGV::              An Array of command line arguments given for the script.
+DATA::              The file object of the script, pointing just after <code>__END__</code>.
+TOPLEVEL_BINDING::  The Binding of the top level scope.
+RUBY_VERSION::      The Ruby language version.
+RUBY_RELEASE_DATE:: The release date string.
+RUBY_PLATFORM::     The platform identifier.
+RUBY_PATCHLEVEL::   The patchlevel for this Ruby.  If this is a development build of Ruby the patchlevel will be -1.
+RUBY_REVISION::     The GIT commit hash for this Ruby.
+RUBY_COPYRIGHT::    The copyright string for Ruby.
+RUBY_ENGINE::       The name of the Ruby implementation.
+RUBY_ENGINE_VERSION:: The version of the Ruby implementation.
+RUBY_DESCRIPTION::  The same as <tt>ruby --version</tt>, a String describing various aspects of the Ruby implementation.
diff --git a/doc/irb/irb-tools.rd.ja b/doc/irb/irb-tools.rd.ja
index 7711f96e08..b997f0edea 100644
--- a/doc/irb/irb-tools.rd.ja
+++ b/doc/irb/irb-tools.rd.ja
@@ -1,70 +1,70 @@
-irb��Ϣ���ޤ����ޥ�ɤȥ饤�֥��
+irb関連おまけコマンドとライブラリ
 				$Release Version: 0.7.1 $
 			   	$Revision$
 			   	by Keiju ISHITSUKA(Nihon Rational Co.,Ltd.)
 
 =begin
 
-:���ޥ��:
+:コマンド:
 * rtags		-- ruby tags command
 
-:�ؿ��饤�֥��:
+:関数ライブラリ:
 * xmp		-- irb version of gotoken xmp-function
 
-:���饹�饤�֥��:
+:クラスライブラリ:
 * frame.rb      -- frame tracer
 * completion.rb -- irb completor
 
 = rtags
 
-rtags��emacs�ڤ�vi�Ѥ�, TAG�ե������Ĥ��륳�ޥ�ɤǤ�.
+rtagsはemacs及びvi用の, TAGファイルをつくるコマンドです.
 
-== �Ȥ���
+== 使い方
 
    rtags [-vi] file....
 
-�����ȥǥ��쥯�ȥ��emacs�Ѥ�TAGS�ե����뤬�Ǥ��ޤ�. -vi���ץ�����
-�Ĥ������ˤ�vi�Ѥ�tags�ե������������ޤ�.
+カレントディレクトリにemacs用のTAGSファイルができます. -viオプションを
+つけた時にはvi用のtagsファイルを作成します.
 
-emacs�ξ��, �̾��etags.el�����Τޤ޻Ȥ��ޤ�. ������ǽ�ʤΤ�,
+emacsの場合, 通常のetags.elがそのまま使えます. 検索可能なのは,
 
-* ���饹
-* �᥽�å�
-* �ðۥ᥽�å�
+* クラス
+* メソッド
+* 特異メソッド
 * alias
-* attr��������줿��������(�ѥ�᡼��������ܥ뤫ʸ�����ƥ��˸¤�)
-* attr_XXX��������줿��������(�ѥ�᡼��������ܥ뤫ʸ�����ƥ��˸¤�)
+* attrで宣言されたアクセサ(パラメータがシンボルか文字列リテラルに限る)
+* attr_XXXで宣言されたアクセサ(パラメータがシンボルか文字列リテラルに限る)
 
-�Ǥ�.
+です.
 
-C�ʤɤǻȤäƤ���ΤȰ㤦�Τ�, ����ץ꡼�����˴ؤ�����ʬ��,
+Cなどで使っているのと違うのは, コンプリーションに関する部分で,
 
-�ؿ�̾��,
+関数名は,
 
-  �ؿ�̾(
+  関数名(
 
-���饹��,
+クラスは,
 
-  ::���饹̾::....::���饹̾
+  ::クラス名::....::クラス名
 
-�᥽�åɤ�,
+メソッドは,
 
-  ::���饹̾::....::���饹̾#�᥽�å�̾
+  ::クラス名::....::クラス名#メソッド名
 
-�ðۥ᥽�å�(���饹�᥽�å�)��
+特異メソッド(クラスメソッド)は
 
-  ::���饹̾::....::���饹̾.�᥽�å�̾
+  ::クラス名::....::クラス名.メソッド名
 
-�ǥ���ץ꡼������Ԥʤ��Ȥ����Ǥ�.
+でコンプリーションを行なうところです.
 
 = xmp.rb
 
-���Ȥ���xmp�ξ�̸ߴ��С������Ǥ�. ����, ���˽Ť��ΤǤ��Ȥ���xmp��
-���б��Ǥ��ʤ�����, ���Ѥ�����ɤ��Ǥ��礦.
+ごとけんxmpの上位互換バージョンです. ただ, 非常に重いのでごとけんxmpで
+は対応できない時に, 使用すると良いでしょう.
 
-== �Ȥ���
+== 使い方
 
-=== �ؿ��Ȥ��ƻȤ�.
+=== 関数として使う.
 
     require "irb/xmp"
     xmp <<END
@@ -77,10 +77,10 @@ C�ʤɤǻȤäƤ���ΤȰ㤦�Τ�, ����ץ꡼�����˴ؤ�����ʬ��,
     foo
 	==>1
 
-=== XMP���󥹥��󥹤��Ѥ���.
+=== XMPインスタンスを用いる.
 
-���ξ���, XMP������ƥ����Ⱦ������ĤΤ�, �ѿ����ͤʤɤ��ݻ����Ƥ�
-�ޤ�.
+この場合は, XMPがコンテキスト情報を持つので, 変数の値などを保持してい
+ます.
 
   require "irb/xmp"
   xmp = XMP.new
@@ -99,52 +99,52 @@ C�ʤɤǻȤäƤ���ΤȰ㤦�Τ�, ����ץ꡼�����˴ؤ�����ʬ��,
   foo
       ==>1
 
-== ����ƥ����Ȥ˴ؤ���
+== コンテキストに関して
 
-XMP�᥽�åɷ��Υ���ƥ����Ȥ�, �ƤӽФ����Υ���ƥ����Ȥ�ɾ������ޤ�.
-����Ū�˥���ƥ����Ȥ���ꤹ��Ȥ��Υ���ƥ����Ȥ�ɾ�����ޤ�.
+XMPメソッド群のコンテキストは, 呼び出す前のコンテキストで評価されます.
+明示的にコンテキストを指定するとそのコンテキストで評価します.
 
-��:
+例:
 
   xmp "foo", an_binding
 
-:��:
-�ޥ������åɤˤ��б����Ƥ��ޤ���.
+:注:
+マルチスレッドには対応していません.
 
 = frame.rb
-���߼¹���Υե졼�������갷������Υ��饹�Ǥ�. 
+現在実行中のフレーム情報を取り扱うためのクラスです.
 
 * IRB::Frame.top(n = 0)
-  �夫��n���ܤΥ���ƥ����Ȥ���Ф��ޤ�. n��0���Ǿ�̤ˤʤ�ޤ�.
+  上からn番目のコンテキストを取り出します. nは0が最上位になります.
 * IRB::Frame.bottom(n = 0)
-  ������n���ܤΥ���ƥ����Ȥ���Ф��ޤ�. n��0���ǲ��̤ˤʤ�ޤ�.
+  下からn番目のコンテキストを取り出します. nは0が最下位になります.
 * IRB::Frame.sender
-  ������ˤʤäƤ��륪�֥������Ȥ���Ф��ޤ�. ������Ȥ�, ���Υ᥽��
-  �ɤ�ƤӽФ���¦��self�Τ��ȤǤ�.
+  センダになっているオブジェクトを取り出します. センダとは, そのメソッ
+  ドを呼び出した側のselfのことです.
 
-:��:
-set_trace_func���Ѥ���Ruby�μ¹Ԥ�ȥ졼�����Ƥ��ޤ�. �ޥ������åɤ�
-���б����Ƥ��ޤ���.
+:注:
+set_trace_funcを用いてRubyの実行をトレースしています. マルチスレッドに
+は対応していません.
 
 = completion.rb
-irb��completion��ǽ���󶡤����ΤǤ�. 
+irbのcompletion機能を提供するものです.
 
-== �Ȥ���
+== 使い方
 
    % irb -r irb/completion
 
-�Ȥ��뤫, ~/.irbrc ���
+とするか, ~/.irbrc 中に
 
    require "irb/completion"
 
-������Ƥ�������. irb�¹���� require "irb/completion" ���Ƥ�褤�Ǥ�.
+を入れてください. irb実行中に require "irb/completion" してもよいです.
 
-irb�¹���� (TAB) �򲡤��ȥ���ץ졼����󤷤ޤ�.
+irb実行中に (TAB) を押すとコンプレーションします.
 
-�ȥåץ�٥��(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
@@ -153,8 +153,8 @@ irb�¹���� (TAB) �򲡤��ȥ���ץ졼����󤷤ޤ�.
   irb(main):002:0> foo = Object.new
   #<Object:0x4027146c>
 
-  ((|�ѿ�̾.|))�θ��(TAB)�򲡤���, ���Υ��֥������ȤΥ᥽�åɰ������Ǥ�
-  ��.
+  ((|変数名.|))の後に(TAB)を押すと, そのオブジェクトのメソッド一覧がでま
+  す.
 
   irb(main):003:0> foo.
   foo.==                  foo.frozen?             foo.protected_methods
@@ -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/irb/irb.rd b/doc/irb/irb.rd
deleted file mode 100644
index 75274006e1..0000000000
--- a/doc/irb/irb.rd
+++ /dev/null
@@ -1,391 +0,0 @@
-irb -- interactive ruby
-		$Release Version: 0.9 $
-		$Revision$
-		by Keiju ISHITSUKA(keiju@ishitsuka.com)
-		by gotoken-san who is original translater from japanese version
-
-=begin
-= What is irb?
-
-irb stands for `interactive ruby'. irb is a tool to execute interactively
-ruby expressions read from stdin. 
-
-= Invoking
-
-  % irb
-
-= Usage
-
-Use of irb is easy if you know ruby.  Executing irb, prompts are 
-displayed as follows. Then, enter expression of ruby. A input is
-executed when it is syntacticaly completed. 
-
-  dim% irb
-  irb(main):001:0> 1+2
-  3
-  irb(main):002:0> class Foo
-  irb(main):003:1>  def foo
-  irb(main):004:2>    print 1
-  irb(main):005:2>  end
-  irb(main):006:1> end
-  nil
-  irb(main):007:0> 
-
-And, Readline extesion module can be used with irb. Using Readline
-is the standard default action if Readline is installed. 
-
-= Command line option
-
-  irb.rb [options] file_name opts
-  options:
-  -f		    suppress read ~/.irbrc 
-  -m		    bc mode (fraction or matrix are available)
-  -d                set $DEBUG  to true (same as `ruby -d')
-  -Kc		    same as `ruby -Kc'
-  -r load-module    same as `ruby -r'
-  --verbose	    command input is echoed(default)
-  --noverbose	    command input isn't echoed
-  --echo	    commands are echoed immediately before execution(default)
-  --noecho	    commands aren't echoed immediately before execution
-  --inspect	    uses `inspect' for output (the default except bc mode)
-  --noinspect	    doesn't uses inspect for output
-  --readline	    uses Readline extension module
-  --noreadline	    doesn't use Readline extension module
-  --prompt prompt-mode
-  --prompt-mode prompt-mode
-		    switches prompt mode. Pre-defined prompt modes are
-		    `default', `simple', `xmp' and `inf-ruby'
-			    
-  --inf-ruby-mode   uses prompt appreciate for inf-ruby-mode on emacs. 
-		    Suppresses --readline. 
-  --simple-prompt   simple prompt mode
-  --noprompt	    no prompt
-  --tracer	    display trace for each execution of commands.
-  --back-trace-limit n
-		    displayes backtrace top n and tail n. The default
-		    value is 16. 
-  --irb_debug n	    sets internal debug level to n (It shouldn't be used)
-  -v, --version	    prints the version of irb
-
-= Configurations
-
-irb reads `~/.irbrc' when it is invoked. If `~/.irbrb' doesn't exist
-irb try to read in the order `.irbrc', `irb.rc', `_irbrc' then `$irbrc'. 
-
-The following is altanative to the command line option. To use them
-type as follows in an irb session. 
-
-  IRB.conf[:IRB_NAME]="irb"
-  IRB.conf[:MATH_MODE]=false
-  IRB.conf[:USE_TRACER]=false
-  IRB.conf[:USE_LOADER]=false
-  IRB.conf[:IGNORE_SIGINT]=true
-  IRB.conf[:IGNORE_EOF]=false
-  IRB.conf[:INSPECT_MODE]=nil
-  IRB.conf[:IRB_RC] = nil
-  IRB.conf[:BACK_TRACE_LIMIT]=16
-  IRB.conf[:USE_LOADER] = false
-  IRB.conf[:USE_READLINE] = nil
-  IRB.conf[:USE_TRACER] = false
-  IRB.conf[:IGNORE_SIGINT] = true
-  IRB.conf[:IGNORE_EOF] = false
-  IRB.conf[:PROMPT_MODE] = :DEFALUT
-  IRB.conf[:PROMPT] = {...}
-  IRB.conf[:DEBUG_LEVEL]=0
-  IRB.conf[:VERBOSE]=true
-
-== Customizing prompt
-
-To costomize the prompt you set a variable
-
-  IRB.conf[:PROMPT]
-
-For example, describe as follows in `.irbrc'. 
-
-  IRB.conf[:PROMPT][:MY_PROMPT] = { # name of prompt mode
-    :PROMPT_I => nil,		  # normal prompt
-    :PROMPT_S => nil,		  # prompt for continuated strings
-    :PROMPT_C => nil,		  # prompt for continuated statement
-    :RETURN => "    ==>%s\n"	  # format to return value
-  }
-
-Then, invoke irb with the above prompt mode by
-
-  % irb --prompt my-prompt
-
-Or add the following in `.irbrc'. 
-
-  IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-
-Constants PROMPT_I, PROMPT_S and PROMPT_C specifies the format. 
-In the prompt specification, some special strings are available. 
-
-  %N	command name which is running
-  %m	to_s of main object (self)
-  %M	inspect of main object (self)
-  %l	type of string(", ', /, ]), `]' is inner %w[...]
-  %NNi	indent level. NN is degits and means as same as printf("%NNd"). 
-        It can be ommited
-  %NNn	line number. 
-  %%    %
-
-For instance, the default prompt mode is defined as follows:
-
-IRB.conf[:PROMPT_MODE][:DEFAULT] = {
-      :PROMPT_I => "%N(%m):%03n:%i> ",
-      :PROMPT_S => "%N(%m):%03n:%i%l ",
-      :PROMPT_C => "%N(%m):%03n:%i* ",
-      :RETURN => "%s\n"
-} 
-
-RETURN is used to printf. 
-
-== Configurating subirb
-
-The command line option or IRB.conf specify the default behavior of
-(sub)irb. On the other hand, each conf of in the next sction `6. Command' 
-is used to individually configurate (sub)irb. 
-
-If proc is set to IRB.conf[:IRB_RC], its subirb will be invoked after
-execution of that proc under giving the context of irb as its
-aregument. By this mechanism each subirb can be configurated. 
-
-= Command
-
-For irb commands, both simple name and `irb_'-prefixed name are prepared. 
-
---- exit, quit, irb_exit	
-    Quits (sub)irb. 
-
---- conf, irb_context
-    Displays current configuration. Modifing the configuration is
-    achieved by sending message to `conf'. 
-
---- conf.eval_history = N
-    Sets execution result history.
-    N is a integer or nil. If N > 0, the number of historys is N. 
-    If N == 0, the number of historys is unlimited. If N is nill,
-    execution result history isn't used(default).
-
---- conf.back_trace_limit
-    Sets display lines of backtrace as top n and tail n. 
-    The default value is 16.
-    
---- conf.debug_level = N
-    Sets debug level of irb. 
-
---- conf.ignore_eof = true/false
-    Whether ^D (control-d) will be ignored or not. 
-    If false is set, ^D means quit. 
-
---- conf.ignore_sigint= true/false
-    Whether ^C (control-c) will be ignored or not. 
-    If false is set, ^D means quit.  If true, 
-      during input:   cancel inputing then return to top level. 
-      during execute: abondon current execution. 
-
---- conf.inf_ruby_mode = true/false
-    Whether inf-ruby-mode or not. The default value is false.
-
---- conf.inspect_mode = true/false/nil
-    Specifies inspect mode. 
-    true:  display inspect
-    false: display to_s
-    nil:   inspect mode in non math mode, 
-           non inspect mode in math mode. 
-
---- conf.math_mode
-    Whether bc mode or not. 
-
---- conf.use_loader = true/false
-    Whether irb's own file reader method is used when load/require or not. 
-    This mode is globaly affected (irb wide). 
-
---- conf.prompt_c
-    prompt for a continuating statement (e.g, immediately after of `if')
-
---- conf.prompt_i
-    standard prompt
-
---- conf.prompt_s
-    prompt for a continuating string
-
---- conf.rc
-    Whether ~/.irbrc is read or not. 
-
---- conf.use_prompt = true/false
-    Prompting or not. 
-
---- conf.use_readline = true/false/nil
-    Whether readline is used or not. 
-    true: uses 
-    false: doen't use
-    nil: intends to use readline except for inf-ruby-mode (default)
-#
-#--- conf.verbose=T/F
-#    Whether verbose messages are display or not. 
-
---- cws, chws, irb_change_workspace [obj]
-    obj will be self. If obj is omitted, self will be home-object, or
-    the main object of first started irb.
-
---- pushws, irb_pushws, irb_push_workspace [obj]
-    same as UNIX-shell command pushd.
-
---- popws, irb_popws, irb_pop_workspace
-    same as UNIX-shell command popd
-
---- irb [obj]
-    Invoke subirb. If obj is given, obj will be self. 
-
---- jobs, irb_jobs
-    List of subirb
-
---- fg n, irb_fg n
-    Switch into specified subirb. The following is candidates of n:
-
-      irb number
-      thhread
-      irb object
-      self(obj which is specified of irb obj)
-
---- kill n, irb_kill n
-    Kill subirb. The means of n is as same as the case of irb_fg. 
-
---- source, irb_source  path
-    This is a like UNIX-shell command source. evaluate script in path
-    on current context.
-
---- irb_load path, prev
-    irb-version of Ruby's load.
-
-= System variable
-
---- _  The latest value of evaluation (it is local)
---- __ The history of evaluation values.
-    __[line_no] return an evaluation value of line number<line_no>. If
-    line_no is a negative, return value before -<line_no> from latest
-    value.
-
-= Session Example
-
-  dim% ruby irb.rb
-  irb(main):001:0> irb                        # invoke subirb
-  irb#1(main):001:0> jobs                     # list of subirbs
-  #0->irb on main (#<Thread:0x400fb7e4> : stop)
-  #1->irb#1 on main (#<Thread:0x40125d64> : running)
-  nil
-  irb#1(main):002:0> fg 0                     # switch job
-  nil
-  irb(main):002:0> class Foo;end
-  nil
-  irb(main):003:0> irb Foo                    # invoke subirb which has the 
-					      #              context of Foo
-  irb#2(Foo):001:0> def foo                   # define Foo#foo
-  irb#2(Foo):002:1>   print 1
-  irb#2(Foo):003:1> end
-  nil
-  irb#2(Foo):004:0> fg 0                      # switch job
-  nil
-  irb(main):004:0> jobs                       # list of job
-  #0->irb on main (#<Thread:0x400fb7e4> : running)
-  #1->irb#1 on main (#<Thread:0x40125d64> : stop)
-  #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
-  nil
-  irb(main):005:0> Foo.instance_methods       # Foo#foo is defined asurely
-  ["foo"]
-  irb(main):006:0> fg 2                       # switch job
-  nil
-  irb#2(Foo):005:0> def bar                   # define Foo#bar
-  irb#2(Foo):006:1>  print "bar"
-  irb#2(Foo):007:1> end
-  nil
-  irb#2(Foo):010:0>  Foo.instance_methods
-  ["bar", "foo"]
-  irb#2(Foo):011:0> fg 0                      
-  nil
-  irb(main):007:0> f = Foo.new
-  #<Foo:0x4010af3c>
-  irb(main):008:0> irb f                      # invoke subirb which has the
-					      #  context of f (instance of Foo)
-  irb#3(#<Foo:0x4010af3c>):001:0> jobs
-  #0->irb on main (#<Thread:0x400fb7e4> : stop)
-  #1->irb#1 on main (#<Thread:0x40125d64> : stop)
-  #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
-  #3->irb#3 on #<Foo:0x4010af3c> (#<Thread:0x4010a1e0> : running)
-  nil
-  irb#3(#<Foo:0x4010af3c>):002:0> foo         # evaluate f.foo
-  1nil
-  irb#3(#<Foo:0x4010af3c>):003:0> bar         # evaluate f.bar
-  barnil
-  irb#3(#<Foo:0x4010af3c>):004:0> kill 1, 2, 3# kill job
-  nil
-  irb(main):009:0> jobs
-  #0->irb on main (#<Thread:0x400fb7e4> : running)
-  nil
-  irb(main):010:0> exit                       # exit
-  dim% 
-
-= Restrictions
-
-Because irb evaluates the inputs immediately after the imput is
-syntactically completed, irb gives slight different result than
-directly use ruby. Known difference is pointed out here. 
-
-
-== Declaration of the local variable
-
-The following causes an error in ruby:
-
-  eval "foo = 0"
-  foo
-  --
-  -:2: undefined local variable or method `foo' for #<Object:0x40283118> (NameError)
-  ---
-  NameError
-
-Though, the above will successfully done by irb. 
-
-  >> eval "foo = 0"
- => 0
- >> foo
- => 0
-
-Ruby evaluates a code after reading entire of code and determination
-of the scope of local variables. On the other hand, irb do
-immediately. More precisely, irb evaluate at first
-
-  evel "foo = 0" 
-
-then foo is defined on this timing. It is because of this
-incompatibility.
-
-If you'd like to detect those differences, begin...end can be used:
-
-  >> begin
-  ?>   eval "foo = 0"
-  >>   foo
-  >> end
-  NameError: undefined local variable or method `foo' for #<Object:0x4013d0f0>
-  (irb):3
-  (irb_local_binding):1:in `eval'
-
-== Here-document
-
-Implementation of Here-document is incomplete. 
-
-== Symbol
-
-Irb can not always recognize a symbol as to be Symbol. Concretely, an
-expression have completed, however Irb regard it as continuation line.
-
-=end
-
-% Begin Emacs Environment
-% Local Variables:
-% mode: text
-% comment-column: 0
-% comment-start: "%"
-% comment-end: "\n"
-% End:
-%
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
index 6e3abd7b3c..81247ce4b0 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.ja
@@ -3,23 +3,23 @@ irb -- interactive ruby
 			   	$Revision$
 			   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 =begin
-= irb�Ȥ�?
+= irbとは?
 
-irb��interactive ruby��ά�Ǥ�. ruby�μ���ɸ�����Ϥ����ñ������/�¹Ԥ���
-����Υġ���Ǥ�.
+irbはinteractive rubyの略です. rubyの式を標準入力から簡単に入力/実行する
+ためのツールです.
 
-= ��ư
+= 起動
 
   % irb
 
-�ǹԤʤ��ޤ�. 
+で行ないます.
 
-= �Ȥ���
+= 使い方
 
-irb�λȤ�����, Ruby�����ΤäƤ���Ф����äƴ�ñ�Ǥ�. ����Ū�ˤ� irb ��
-�������ޥ�ɤ�¹Ԥ�������Ǥ�. irb��¹Ԥ����, �ʲ��Τ褦�ʥץ����
-�Ȥ�ɽ��Ƥ��ޤ�. ���, ruby�μ�������Ʋ�����. �������뤷�������Ǽ¹�
-����ޤ�.
+irbの使い方は, Rubyさえ知っていればいたって簡単です. 基本的には irb と
+いうコマンドを実行するだけです. irbを実行すると, 以下のようなプロンプ
+トが表れてきます. 後は, rubyの式を入れて下さい. 式が完結した時点で実行
+されます.
 
   dim% irb
   irb(main):001:0> 1+2
@@ -30,60 +30,66 @@ irb�λȤ�����, Ruby�����ΤäƤ���Ф����äƴ�ñ�Ǥ�. ����Ū�ˤ� irb ��
   irb(main):005:2>  end
   irb(main):006:1> end
   nil
-  irb(main):007:0> 
+  irb(main):007:0>
 
-�ޤ�, irb��Readline�⥸�塼��ˤ��б����Ƥ��ޤ�. Readline�⥸�塼�뤬
-���󥹥ȡ��뤵��Ƥ�����ˤ�, �����Ȥ��Τ�ɸ���ư��ˤʤ�ޤ�.
+また, irbはReadlineモジュールにも対応しています. Readlineモジュールが
+インストールされている時には, それを使うのが標準の動作になります.
 
-= ���ޥ�ɥ��ץ����
+= コマンドオプション
 
   irb.rb [options] file_name opts
   options:
-  -f		    ~/.irbrc ���ɤ߹��ޤʤ�.
-  -m		    bc�⡼��(ʬ��, ����η׻����Ǥ���)
-  -d                $DEBUG ��true�ˤ���(ruby -d ��Ʊ��)
-  -Kc		    ruby -Kc��Ʊ��
-  -r load-module    ruby -r ��Ʊ��.
-  --verbose	    ���줫��¹Ԥ���Ԥ�ɽ������(�ǥե����)
-  --noverbose	    ���줫��¹Ԥ���Ԥ�ɽ�����ʤ�
-  --echo	    �¹Է�̤�ɽ������(�ǥե����)
-  --noecho	    �¹Է�̤�ɽ�����ʤ�
-  --inspect	    ��̽��Ϥ�inspect���Ѥ���(bc�⡼�ɰʳ��ϥǥե����). 
-  --noinspect	    ��̽��Ϥ�inspect���Ѥ��ʤ�.
-  --readline	    readline�饤�֥������Ѥ���.
-  --noreadline	    readline�饤�֥������Ѥ��ʤ�. �ǥե���Ȥ�ư���,
-		    inf-ruby-mode�ʳ���readline�饤�֥������Ѥ��褦
-		    �Ȥ���. 
-  --prompt prompt-mode
-  --prompt-mode prompt-mode
-		    �ץ���ץȥ⡼�ɤ����ؤ��ޤ�. �����������Ƥ����
-		    ����ץȥ⡼�ɤ�, default, simple, xmp, inf-ruby��
-		    �Ѱդ���Ƥ��ޤ�. �ǥե���Ȥ�default�ץ���ץȥ⡼
-		    �ɤˤʤäƤ��ޤ�.
-			    
-  --inf-ruby-mode   emacs��inf-ruby-mode�ѤΥץ���ץ�ɽ����Ԥʤ�. ��
-		    �˻��꤬�ʤ��¤�, readline�饤�֥��ϻȤ�ʤ��ʤ�.
+  -f		    ~/.irbrc を読み込まない.
+  -d                $DEBUG をtrueにする(ruby -d と同じ)
+  -r load-module    ruby -r と同じ.
+  -I path           $LOAD_PATH に path を追加する.
+  -U                ruby -U と同じ.
+  -E enc            ruby -E と同じ.
+  -w                ruby -w と同じ.
+  -W[level=2]       ruby -W と同じ.
+  --context-mode n  新しいワークスペースを作成した時に関連する Binding
+		    オブジェクトの作成方法を 0 から 3 のいずれかに設定する.
+  --echo	    実行結果を表示する(デフォルト).
+  --noecho	    実行結果を表示しない.
+  --inspect	    結果出力にinspectを用いる.
+  --noinspect	    結果出力にinspectを用いない.
+  --singleline      シングルラインエディタを利用する.
+  --nosingleline    シングルラインエディタを利用しない. デフォルトの動
+                    作は, inf-ruby-mode以外でシングルラインエディタを利
+                    用しようとする.
+  --colorize	    色付けを利用する.
+  --nocolorize	    色付けを利用しない.
+  --prompt prompt-mode/--prompt-mode prompt-mode
+		    プロンプトモードを切替えます. 現在定義されているプ
+		    ロンプトモードは, default, simple, xmp, inf-rubyが
+		    用意されています.
+  --inf-ruby-mode   emacsのinf-ruby-mode用のプロンプト表示を行なう. 特
+		    に指定がない限り, ラインエディタは使わなくなる.
   --simple-prompt
-		    ���˥���ץ�ʥץ���ץȤ��Ѥ���⡼�ɤǤ�.
-  --noprompt	    �ץ���ץ�ɽ����Ԥʤ�ʤ�.
-  --tracer	    ���ޥ�ɼ¹Ի��˥ȥ졼����Ԥʤ�.
+		    非常にシンプルなプロンプトを用いるモードです.
+  --noprompt	    プロンプト表示を行なわない.
+  --single-irb	    irb 中で self を実行して得られるオブジェクトをサ
+		    ブ irb と共有する.
+  --tracer	    コマンド実行時にトレースを行なう.
   --back-trace-limit n
-		    �Хå��ȥ졼��ɽ����Хå��ȥ졼����Ƭ���� n, ���
-		    ����n�����Ԥʤ�. �ǥե���Ȥ�16 
-  --irb_debug n	    irb�ΥǥХå��ǥХå���٥��n�����ꤹ��(���Ѥ���
-		    ������̵��Ǥ��礦).
-  -v, --version	    irb�ΥС�������ɽ������
+		    バックトレース表示をバックトレースの頭から n, 後ろ
+		    からnだけ行なう. デフォルトは16
 
-= ����ե�����졼�����
+  --verbose	    詳細なメッセージを出力する.
+  --noverbose	    詳細なメッセージを出力しない(デフォルト).
+  -v, --version	    irbのバージョンを表示する.
+  -h, --help	    irb のヘルプを表示する.
+  --		    以降のコマンドライン引数をオプションとして扱わない.
 
-irb��ư����``~/.irbrc''���ɤ߹��ߤޤ�. �⤷¸�ߤ��ʤ�����,
-``.irbrc'', ``irb.rc'', ``_irbrc'', ``$irbrc''�ν��load���ߤޤ�.
+= コンフィギュレーション
 
-���ץ��������ꤹ�������, �ʲ��Υ��ޥ�ɤǤ�ǥե���Ȥ�ư�������
-�Ǥ��ޤ�.
+irb起動時に``~/.irbrc''を読み込みます. もし存在しない場合は,
+``.irbrc'', ``irb.rc'', ``_irbrc'', ``$irbrc''の順にloadを試みます.
+
+オプションを設定する代わりに, 以下のコマンドでもデフォルトの動作を設定
+できます.
 
   IRB.conf[:IRB_NAME]="irb"
-  IRB.conf[:MATH_MODE]=false
   IRB.conf[:USE_TRACER]=false
   IRB.conf[:USE_LOADER]=false
   IRB.conf[:IGNORE_SIGINT]=true
@@ -92,52 +98,51 @@ irb��ư����``~/.irbrc''���ɤ߹��ߤޤ�. �⤷¸�ߤ��ʤ�����,
   IRB.conf[:IRB_RC] = nil
   IRB.conf[:BACK_TRACE_LIMIT]=16
   IRB.conf[:USE_LOADER] = false
-  IRB.conf[:USE_READLINE] = nil
+  IRB.conf[:USE_SINGLELINE] = nil
   IRB.conf[:USE_TRACER] = false
   IRB.conf[:IGNORE_SIGINT] = true
   IRB.conf[:IGNORE_EOF] = false
-  IRB.conf[:PROMPT_MODE] = :DEFALUT
+  IRB.conf[:PROMPT_MODE] = :DEFAULT
   IRB.conf[:PROMPT] = {...}
-  IRB.conf[:DEBUG_LEVEL]=0
   IRB.conf[:VERBOSE]=true
 
-== �ץ���ץȤ�����
+== プロンプトの設定
 
-�ץ���ץȤ򥫥����ޥ������������ˤ�, 
+プロンプトをカスタマイズしたい時には,
 
    IRB.conf[:PROMPT]
 
-���Ѥ��ޤ�. �㤨��, .irbrc����ǲ��Τ褦�ʼ��򵭽Ҥ��ޤ�:
+を用います. 例えば, .irbrcの中で下のような式を記述します:
 
-   IRB.conf[:PROMPT][:MY_PROMPT] = { # �ץ���ץȥ⡼�ɤ�̾��
-     :PROMPT_I => nil,		  # �̾�Υץ���ץ�
-     :PROMPT_N => nil,		  # ��³�ԤΥץ���ץ�
-     :PROMPT_S => nil,		  # ʸ����ʤɤη�³�ԤΥץ���ץ�
-     :PROMPT_C => nil,		  # ������³���Ƥ�����Υץ���ץ�
-     :RETURN => "    ==>%s\n"	  # �꥿������Υץ���ץ�
+   IRB.conf[:PROMPT][:MY_PROMPT] = { # プロンプトモードの名前
+     :PROMPT_I => nil,		  # 通常のプロンプト
+     :PROMPT_N => nil,		  # 継続行のプロンプト
+     :PROMPT_S => nil,		  # 文字列などの継続行のプロンプト
+     :PROMPT_C => nil,		  # 式が継続している時のプロンプト
+     :RETURN => "    ==>%s\n"	  # リターン時のプロンプト
    }
 
-�ץ���ץȥ⡼�ɤ���ꤷ�������ˤ�,
+プロンプトモードを指定したい時には,
 
   irb --prompt my-prompt
 
-�Ǥ��Υץ���ץȥ⡼�ɤǵ�ư����ޤ�. �ޤ���, .irbrc�˲����򵭽Ҥ��Ƥ�
-OK�Ǥ�.
+でそのプロンプトモードで起動されます. または, .irbrcに下式を記述しても
+OKです.
 
   IRB.conf[:PROMPT_MODE] = :MY_PROMPT
 
-PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_C��, �ե����ޥåȤ���ꤷ�ޤ�.
+PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_Cは, フォーマットを指定します.
 
-  %N	��ư���Ƥ��륳�ޥ��̾�����Ϥ����.
-  %m	main���֥�������(self)��to_s�ǽ��Ϥ����.
-  %M	main���֥�������(self)��inspect����ƽ��Ϥ����.
-  %l	ʸ������Υ����פ�ɽ��(", ', /, ], `]'��%w����λ�)
-  %NNi	����ǥ�ȤΥ�٥��ɽ��. NN�Ͽ���������printf��%NNd��Ʊ��. ��
-	ά��ǽ
-  %NNn	���ֹ��ɽ���ޤ�.
+  %N	起動しているコマンド名が出力される.
+  %m	mainオブジェクト(self)がto_sで出力される.
+  %M	mainオブジェクト(self)がinspectされて出力される.
+  %l	文字列中のタイプを表す(", ', /, ], `]'は%wの中の時)
+  %NNi	インデントのレベルを表す. NNは数字が入りprintfの%NNdと同じ. 省
+	略可能
+  %NNn	行番号を表します.
   %%    %
 
-�㤨��, �ǥե���ȤΥץ���ץȥ⡼�ɤ�:
+例えば, デフォルトのプロンプトモードは:
 
   IRB.conf[:PROMPT_MODE][:DEFAULT] = {
       :PROMPT_I => "%N(%m):%03n:%i> ",
@@ -145,216 +150,218 @@ PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_C��, �ե����ޥåȤ���ꤷ�ޤ�.
       :PROMPT_S => "%N(%m):%03n:%i%l ",
       :PROMPT_C => "%N(%m):%03n:%i* ",
       :RETURN => "%s\n"
-  } 
+  }
 
-�ȤʤäƤ��ޤ�.
+となっています.
 
-RETURN��, ���ߤΤȤ���printf�����Ǥ�. ������ͤ��Ѥ�뤫���Τ�ޤ���.
+RETURNは, 現在のところprintf形式です. 将来仕様が変わるかも知れません.
 
-== ����irb������
+== サブirbの設定
 
-���ޥ�ɥ饤�󥪥ץ���󤪤��IRB.conf��(����)irb��ư���Υǥե���Ȥ�
-���������Τ�, `5. ���ޥ��'�ˤ���conf�Ǹ��̤�(����)irb�����꤬��
-����褦�ˤʤäƤ��ޤ�.
+コマンドラインオプションおよびIRB.confは(サブ)irb起動時のデフォルトの
+設定を決めるもので, `5. コマンド'にあるconfで個別の(サブ)irbの設定がで
+きるようになっています.
 
-IRB.conf[:IRB_RC]��proc�����ꤵ��Ƥ����, ����irb��ư������ˤ���
-proc��irb�Υ���ƥ����Ȥ�����Ȥ��ƸƤӽФ��ޤ�. ����ˤ�äƸ��̤Υ�
-��irb���Ȥ�������Ѥ��뤳�Ȥ��Ǥ���褦�ˤʤ�ޤ�.
+IRB.conf[:IRB_RC]にprocが設定されていると, サブirbを起動する時にその
+procをirbのコンテキストを引数として呼び出します. これによって個別のサ
+ブirbごとに設定を変えることができるようになります.
 
 
-= ���ޥ��
+= コマンド
 
-irb��ĥ���ޥ�ɤ�, ��ñ��̾����Ƭ��`irb_'��Ĥ���̾����ξ����������
-���ޤ�. �����, ��ñ��̾����override���줿���Τ���Ǥ�.
+irb拡張コマンドは, 簡単な名前と頭に`irb_'をつけた名前と両方定義されて
+います. これは, 簡単な名前がoverrideされた時のためです.
 
---- exit, quit, irb_exit	
-    ��λ����. 
-    ����irb�ξ��, ���Υ���irb��λ����.
+--- exit, quit, irb_exit
+    終了する.
+    サブirbの場合, そのサブirbを終了する.
 
 --- conf, irb_context
-    irb�θ��ߤ������ɽ������. ������ѹ���, conf�˥�å����������뤳
-    �Ȥˤ�äƹԤʤ���. 
+    irbの現在の設定を表示する. 設定の変更は, confにメッセージを送るこ
+    とによって行なえる.
 
 --- conf.eval_history = N
-    �¹Է�̤Υҥ��ȥ굡ǽ������.
-    nn��������nil�� nn>0 �Ǥ���Ф��ο������ҥ��ȥ�ˤ���롣nn==0�λ���
-    ̵���¤˵������롢nil���ȥҥ��ȥ굡ǽ�Ϥ���(�ǥե����). 
+    実行結果のヒストリ機能の設定.
+    nnは整数かnilで nn>0 であればその数だけヒストリにためる。nn==0の時は
+    無制限に記憶する、nilだとヒストリ機能はやめる(デフォルト).
 
 --- Conf.back_trace_limit
-    �Хå��ȥ졼��ɽ����Хå��ȥ졼����Ƭ����n, �������n�����Ԥʤ�.
-    �ǥե���Ȥ�16
-    
---- conf.debug_level = N
-    irb�ѤΥǥХå���٥������
+    バックトレース表示をバックトレースの頭からn, 後ろからnだけ行なう.
+    デフォルトは16
 
 --- conf.ignore_eof = true/false
-    ^D�����Ϥ��줿����ư������ꤹ��. true�λ���^D��̵�뤹��, false��
-    ����irb��λ����. 
+    ^Dが入力された時の動作を設定する. trueの時は^Dを無視する, falseの
+    時はirbを終了する.
 
 --- conf.ignore_sigint= true/false
-    ^C�����Ϥ��줿����ư������ꤹ��. false����, irb��λ����. true��
-    ����ư��ϰʲ��Τ褦�ˤʤ�:
-      ������: ����ޤ����Ϥ�����Τ򥭥�󥻥뤷�ȥåץ�٥�����. 
-      �¹���: �¹Ԥ���ߤ���.
+    ^Cが入力された時の動作を設定する. false時は, irbを終了する. trueの
+    時の動作は以下のようになる:
+      入力中: これまで入力したものをキャンセルしトップレベルに戻る.
+      実行中: 実行を中止する.
 
 --- conf.inf_ruby_mode = true/false
-    inf-ruby-mode�ѤΥץ���ץ�ɽ����Ԥʤ�. �ǥե���Ȥ�false.
+    inf-ruby-mode用のプロンプト表示を行なう. デフォルトはfalse. 特に指定
+    がない限り, ラインエディタは使わなくなる.
 
 --- conf.inspect_mode = true/false/nil
-    ���󥹥ڥ��ȥ⡼�ɤ����ꤹ��.
-    true: ���󥹥ڥ��Ȥ���ɽ������.
-    false: �̾��print��ɽ������.
-    nil: �̾�⡼�ɤǤ����, inspect mode�Ȥʤ�, math�⡼�ɤλ���, non
-	 inspect mode�Ȥʤ�.   
-
---- conf.math_mode
-    ���ȤΤ�. bc�⡼��(ʬ��, ����η׻����Ǥ��ޤ�)���ɤ���?
+    インスペクトモードを設定する.
+    true: インスペクトして表示する.
+    false: 通常のprintで表示する.
+    nil: 通常モードであれば, inspect modeとなり, mathモードの時は, non
+	 inspect modeとなる.
 
 --- conf.use_loader = true/false
-    load/require����irb��file�ɤ߹��ߵ�ǽ���Ѥ���⡼�ɤΥ����å�(�ǥե�
-    ��Ȥ��Ѥ��ʤ�). ���Υ⡼�ɤ�IRB���Τ�ȿ�Ǥ����.
+    load/require時にirbのfile読み込み機能を用いるモードのスイッチ(デフォ
+    ルトは用いない). このモードはIRB全体に反映される.
 
 --- conf.prompt_c
-    if��ľ��ʤ�, �Ԥ���³���Ƥ�����Υץ���ץ�.
+    ifの直後など, 行が継続している時のプロンプト.
 
 --- conf.prompt_i
-    �̾�Υץ���ץ�.
+    通常のプロンプト.
 
 --- conf.prompt_s
-    ʸ������ʤɤ�ɽ���ץ���ץ�.
+    文字列中などを表すプロンプト.
 
 --- conf.rc
-    ~/.irbrc���ɤ߹�������ɤ���?
+    ~/.irbrcを読み込んだかどうか?
 
 --- conf.use_prompt = true/false
-    �ץ���ץ�ɽ�����뤫�ɤ���? �ǥե���ȤǤϥץ���ץȤ�ɽ������.
-
---- conf.use_readline = true/false/nil
-    readline��Ȥ����ɤ���?
-    true: readline��Ȥ�.
-    false: readline��Ȥ�ʤ�.
-    nil: (�ǥե����)inf-ruby-mode�ʳ���readline�饤�֥������Ѥ���
-         ���Ȥ���.  
+    プロンプト表示するかどうか? デフォルトではプロンプトを表示する.
+
+--- conf.use_multiline = true/false/nil
+    マルチラインエディタを使うかどうか?
+    true: マルチラインエディタを使う.
+    false: マルチラインエディタを使わない.
+    nil: (デフォルト)inf-ruby-mode以外でマルチラインエディタを利用しよう
+    とする.
+
+--- conf.use_singleline = true/false/nil
+    シングルラインエディタを使うかどうか?
+    true: シングルラインエディタを使う.
+    false: シングルラインエディタを使わない.
+    nil: (デフォルト)inf-ruby-modeとマルチラインエディタ以外でシングルラ
+         インエディタを利用しようとする.
 #
 #--- conf.verbose=T/F
-#    irb���餤�������ʥ�å���������Ϥ��뤫?
+#    irbからいろいろなメッセージを出力するか?
 
 --- cws, chws, irb_cws, irb_chws, irb_change_workspace [obj]
-    obj��self�Ȥ���. obj����ά���줿�Ȥ���, home workspace, ���ʤ��
-    irb��ư�����Ȥ���main object��self�Ȥ���.
+    objをselfとする. objが省略されたときは, home workspace, すなわち
+    irbを起動したときのmain objectをselfとする.
 
 --- pushws, irb_pushws, irb_push_workspace [obj]
-    UNIX�����륳�ޥ�ɤ�pushd��Ʊ��.
+    UNIXシェルコマンドのpushdと同様.
 
 --- popws, irb_popws, irb_pop_workspace
-    UNIX�����륳�ޥ�ɤ�popd��Ʊ��.
+    UNIXシェルコマンドのpopdと同様.
 
 --- irb [obj]
-    ����irb��Ω��������. obj�����ꤵ�줿����, ����obj��self�Ȥ���.
+    サブirbを立ちあげる. objが指定された時は, そのobjをselfとする.
 
 --- jobs, irb_jobs
-    ����irb�Υꥹ��
+    サブirbのリスト
 
 --- fg n, irb_fg n
-    ���ꤷ������irb�˥����å�����. n��, ���Τ�Τ���ꤹ��.
+    指定したサブirbにスイッチする. nは, 次のものを指定する.
 
-      irb�ֹ�
-      ����å�
-      irb���֥�������
-      self(irb obj�ǵ�ư��������obj)
+      irb番号
+      スレッド
+      irbオブジェクト
+      self(irb objで起動した時のobj)
 
 --- kill n, irb_kill n
-      ����irb��kill����. n��fg��Ʊ��.
+      サブirbをkillする. nはfgと同じ.
 
 --- source, irb_source  path
-    UNIX�����륳�ޥ�ɤ�source�Ȼ��Ƥ���. ���ߤδĶ����path��Υ�����
-    �ץȤ�ɾ������.
+    UNIXシェルコマンドのsourceと似ている. 現在の環境上でpath内のスクリ
+    プトを評価する.
 
 --- irb_load path, prev
 
-    Ruby��load��irb��.
+    Rubyのloadのirb版.
 
-= �����ƥ��ѿ�
+= システム変数
 
---- _  
-    ���η׻��μ¹Է�̤�Ф��Ƥ���(���������ѿ�).
---- __ 
-    �¹Է�̤������Ф��Ƥ���.
-    __[line_no]�ǡ����ιԤǼ¹Ԥ�����̤����뤳�Ȥ��Ǥ���. line_no�����
-    ���ˤϡ��ǿ��η�̤���-line_no���η�̤����뤳�Ȥ��Ǥ���.
+--- _
+    前の計算の実行結果を覚えている(ローカル変数).
+--- __
+    実行結果の履歴を覚えている.
+    __[line_no]で、その行で実行した結果を得ることができる. line_noが負の
+    時には、最新の結果から-line_no前の結果を得ることができる.
 
-=  ������
+=  使用例
 
-�ʲ��Τ褦�ʴ����Ǥ�.
+以下のような感じです.
 
   dim% ruby irb.rb
-  irb(main):001:0> irb                        # ����irb��Ω������
-  irb#1(main):001:0> jobs                     # ����irb�Υꥹ��
+  irb(main):001:0> irb                        # サブirbの立ちあげ
+  irb#1(main):001:0> jobs                     # サブirbのリスト
   #0->irb on main (#<Thread:0x400fb7e4> : stop)
   #1->irb#1 on main (#<Thread:0x40125d64> : running)
   nil
-  irb#1(main):002:0> fg 0                     # job�Υ����å�
+  irb#1(main):002:0> fg 0                     # jobのスイッチ
   nil
   irb(main):002:0> class Foo;end
   nil
-  irb(main):003:0> irb Foo                    # Foo�򥳥�ƥ����Ȥ���irb
-					      # Ω������
-  irb#2(Foo):001:0> def foo                   # Foo#foo�����
+  irb(main):003:0> irb Foo                    # Fooをコンテキストしてirb
+					      # 立ちあげ
+  irb#2(Foo):001:0> def foo                   # Foo#fooの定義
   irb#2(Foo):002:1>   print 1
   irb#2(Foo):003:1> end
   nil
-  irb#2(Foo):004:0> fg 0                      # job�򥹥��å�
+  irb#2(Foo):004:0> fg 0                      # jobをスイッチ
   nil
-  irb(main):004:0> jobs                       # job�Υꥹ��
+  irb(main):004:0> jobs                       # jobのリスト
   #0->irb on main (#<Thread:0x400fb7e4> : running)
   #1->irb#1 on main (#<Thread:0x40125d64> : stop)
   #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
   nil
-  irb(main):005:0> Foo.instance_methods       # Foo#foo�������������
-					      # ��Ƥ���
+  irb(main):005:0> Foo.instance_methods       # Foo#fooがちゃんと定義さ
+					      # れている
   ["foo"]
-  irb(main):006:0> fg 2                       # job�򥹥��å�
+  irb(main):006:0> fg 2                       # jobをスイッチ
   nil
-  irb#2(Foo):005:0> def bar                   # Foo#bar�����
+  irb#2(Foo):005:0> def bar                   # Foo#barを定義
   irb#2(Foo):006:1>  print "bar"
   irb#2(Foo):007:1> end
   nil
   irb#2(Foo):010:0>  Foo.instance_methods
   ["bar", "foo"]
-  irb#2(Foo):011:0> fg 0                      
+  irb#2(Foo):011:0> fg 0
   nil
   irb(main):007:0> f = Foo.new
   #<Foo:0x4010af3c>
-  irb(main):008:0> irb f                      # Foo�Υ��󥹥��󥹤�irb��
-					      # Ω��������.
+  irb(main):008:0> irb f                      # Fooのインスタンスでirbを
+					      # 立ちあげる.
   irb#3(#<Foo:0x4010af3c>):001:0> jobs
   #0->irb on main (#<Thread:0x400fb7e4> : stop)
   #1->irb#1 on main (#<Thread:0x40125d64> : stop)
   #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
   #3->irb#3 on #<Foo:0x4010af3c> (#<Thread:0x4010a1e0> : running)
   nil
-  irb#3(#<Foo:0x4010af3c>):002:0> foo         # f.foo�μ¹�
+  irb#3(#<Foo:0x4010af3c>):002:0> foo         # f.fooの実行
   nil
-  irb#3(#<Foo:0x4010af3c>):003:0> bar         # f.bar�μ¹�
+  irb#3(#<Foo:0x4010af3c>):003:0> bar         # f.barの実行
   barnil
-  irb#3(#<Foo:0x4010af3c>):004:0> kill 1, 2, 3# job��kill
+  irb#3(#<Foo:0x4010af3c>):004:0> kill 1, 2, 3# jobのkill
   nil
   irb(main):009:0> jobs
   #0->irb on main (#<Thread:0x400fb7e4> : running)
   nil
-  irb(main):010:0> exit                       # ��λ
-  dim% 
+  irb(main):010:0> exit                       # 終了
+  dim%
 
-= ���Ѿ������
+= 使用上の制限
 
-irb��, ɾ���Ǥ������(�����Ĥ�������)�Ǥ��༡�¹Ԥ�Ԥʤ��ޤ�. ��������
-��, ruby��ľ�ܻȤä�����, �㴳�ۤʤ�ư���Ԥʤ���礬����ޤ�.
+irbは, 評価できる時点(式が閉じた時点)での逐次実行を行ないます. したがっ
+て, rubyを直接使った時と, 若干異なる動作を行なう場合があります.
 
-�������餫�ˤʤäƤ������������������ޤ�.
+現在明らかになっている問題点を説明します.
 
-== ���������ѿ������
+== ローカル変数の宣言
 
-ruby�Ǥ�, �ʲ��Υץ������ϥ��顼�ˤʤ�ޤ�.
+rubyでは, 以下のプログラムはエラーになります.
 
   eval "foo = 0"
   foo
@@ -363,24 +370,24 @@ ruby�Ǥ�, �ʲ��Υץ������ϥ��顼�ˤʤ�ޤ�.
   ---
   NameError
 
-�Ȥ�����, irb���Ѥ����
+ところが, irbを用いると
 
   >> eval "foo = 0"
   => 0
   >> foo
   => 0
 
-�Ȥʤ�, ���顼�򵯤����ޤ���. �����, ruby���ǽ�˥�����ץ����Τ򥳥�
-�ѥ��뤷�ƥ��������ѿ�����ꤹ�뤫��Ǥ�. ������Ф�, irb�ϼ¹Բ�ǽ��
-�ʤ�(�����Ĥ���)�ȼ�ưŪ��ɾ�����Ƥ��뤫��Ǥ�. �嵭����Ǥ�, 
+となり, エラーを起こしません. これは, rubyが最初にスクリプト全体をコン
+パイルしてローカル変数を決定するからです. それに対し, irbは実行可能に
+なる(式が閉じる)と自動的に評価しているからです. 上記の例では,
 
-  evel "foo = 0" 
+  evel "foo = 0"
 
-��Ԥʤä�������ɾ����Ԥʤ�, ���λ������ѿ����������뤿��, ������ 
-�ѿ�foo���������Ƥ��뤫��Ǥ�.
+を行なった時点で評価を行ない, その時点で変数が定義されるため, 次式で
+変数fooは定義されているからです.
 
-���Τ褦��ruby��irb��ư��ΰ㤤���褷��������, begin...end�ǳ�ä�
-�Хå�Ū�˼¹Ԥ��Ʋ�����:
+このようなrubyとirbの動作の違いを解決したい場合は, begin...endで括って
+バッチ的に実行して下さい:
 
   >> begin
   ?>   eval "foo = 0"
@@ -390,14 +397,14 @@ ruby�Ǥ�, �ʲ��Υץ������ϥ��顼�ˤʤ�ޤ�.
   (irb):3
   (irb_local_binding):1:in `eval'
 
-== �ҥ��ɥ������
+== ヒアドキュメント
 
-���ߤΤȤ����ҥ��ɥ�����Ȥμ������Դ����Ǥ�. 
+現在のところヒアドキュメントの実装は不完全です.
 
-== ����ܥ�
+== シンボル
 
-����ܥ�Ǥ��뤫�ɤ�����Ƚ�Ǥ�ְ㤨�뤳�Ȥ�����ޤ�. ����Ū�ˤϼ�����λ
-���Ƥ���Τ˷�³�Ԥȸ��ʤ����Ȥ�����ޤ�.
+シンボルであるかどうかの判断を間違えることがあります. 具体的には式が完了
+しているのに継続行と見なすことがあります.
 
 =end
 
@@ -409,4 +416,3 @@ ruby�Ǥ�, �ʲ��Υץ������ϥ��顼�ˤʤ�ޤ�.
 % comment-end: "\n"
 % End:
 %
-
diff --git a/doc/keywords.rdoc b/doc/keywords.rdoc
new file mode 100644
index 0000000000..a74126823d
--- /dev/null
+++ b/doc/keywords.rdoc
@@ -0,0 +1,160 @@
+== Keywords
+
+The following keywords are used by Ruby.
+
+__ENCODING__::
+  The script encoding of the current file.  See Encoding.
+
+__LINE__::
+  The line number of this keyword in the current file.
+
+__FILE__::
+  The path to the current file.
+
+BEGIN::
+  Runs before any other code in the current file.  See {miscellaneous
+  syntax}[rdoc-ref:syntax/miscellaneous.rdoc]
+
+END::
+  Runs after any other code in the current file.  See {miscellaneous
+  syntax}[rdoc-ref:syntax/miscellaneous.rdoc]
+
+alias::
+  Creates an alias between two methods (and other things).  See {modules and
+  classes syntax}[rdoc-ref:syntax/modules_and_classes.rdoc]
+
+and::
+  Short-circuit Boolean and with lower precedence than <code>&&</code>
+
+begin::
+  Starts an exception handling block.  See {exceptions
+  syntax}[rdoc-ref:syntax/exceptions.rdoc]
+
+break::
+  Leaves a block early.  See {control expressions
+  syntax}[rdoc-ref:syntax/control_expressions.rdoc]
+
+case::
+  Starts a +case+ expression.  See {control expressions
+  syntax}[rdoc-ref:syntax/control_expressions.rdoc]
+
+class::
+  Creates or opens a class.  See {modules and classes
+  syntax}[rdoc-ref:syntax/modules_and_classes.rdoc]
+
+def::
+  Defines a method.  See {methods syntax}[rdoc-ref:syntax/methods.rdoc]
+
+defined?::
+  Returns a string describing its argument.  See {miscellaneous
+  syntax}[rdoc-ref:syntax/miscellaneous.rdoc]
+
+do::
+  Starts a block.
+
+else::
+  The unhandled condition in +case+, +if+ and +unless+ expressions.  See
+  {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+elsif::
+  An alternate condition for an +if+ expression.  See {control
+  expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+end::
+  The end of a syntax block.  Used by classes, modules, methods, exception
+  handling and control expressions.
+
+ensure::
+  Starts a section of code that is always run when an exception is raised.
+  See {exception handling}[rdoc-ref:syntax/exceptions.rdoc]
+
+false::
+  Boolean false.  See {literals}[rdoc-ref:syntax/literals.rdoc]
+
+for::
+  A loop that is similar to using the +each+ method.  See {control
+  expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+if::
+  Used for +if+ and modifier +if+ statements.  See {control
+  expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+in::
+  Used to separate the iterable object and iterator variable in a +for+ loop.
+  See {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+module::
+  Creates or opens a module.  See {modules and classes
+  syntax}[rdoc-ref:syntax/modules_and_classes.rdoc]
+
+next::
+  Skips the rest of the block.  See {control
+  expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+nil::
+  A false value usually indicating "no value" or "unknown".  See
+  {literals}[rdoc-ref:syntax/literals.rdoc]
+
+not::
+  Inverts the following boolean expression.  Has a lower precedence than
+  <code>!</code>
+
+or::
+  Boolean or with lower precedence than <code>||</code>
+
+redo::
+  Restarts execution in the current block.  See {control
+  expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+rescue::
+  Starts an exception section of code in a +begin+ block.  See {exception
+  handling}[rdoc-ref:syntax/exceptions.rdoc]
+
+retry::
+  Retries an exception block.  See {exception
+  handling}[rdoc-ref:syntax/exceptions.rdoc]
+
+return::
+  Exits a method.  See {methods}[rdoc-ref:syntax/methods.rdoc].
+  If met in top-level scope, immediately stops interpretation of
+  the current file.
+
+self::
+  The object the current method is attached to.  See
+  {methods}[rdoc-ref:syntax/methods.rdoc]
+
+super::
+  Calls the current method in a superclass.  See
+  {methods}[rdoc-ref:syntax/methods.rdoc]
+
+then::
+  Indicates the end of conditional blocks in control structures.  See
+  {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+true::
+  Boolean true.  See {literals}[rdoc-ref:syntax/literals.rdoc]
+
+undef::
+  Prevents a class or module from responding to a method call.
+  See {modules and classes}[rdoc-ref:syntax/modules_and_classes.rdoc]
+
+unless::
+  Used for +unless+ and modifier +unless+ statements.  See {control
+  expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+until::
+  Creates a loop that executes until the condition is true.  See
+  {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+when::
+  A condition in a +case+ expression.  See
+  {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+while::
+  Creates a loop that executes while the condition is true.  See
+  {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+yield::
+  Starts execution of the block sent to the current method.  See
+  {methods}[rdoc-ref:syntax/methods.rdoc]
+
diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc
new file mode 100644
index 0000000000..98de9f2549
--- /dev/null
+++ b/doc/maintainers.rdoc
@@ -0,0 +1,359 @@
+= Maintainers
+
+This page describes the current module, library, and extension maintainers of Ruby.
+
+== Module Maintainers
+
+A module maintainer is responsible for a certain part of Ruby.
+
+* The maintainer fixes bugs of the part. Particularly, they should fix security vulnerabilities as soon as possible.
+* They handle issues related the module on the Redmine or ML.
+* They may be discharged by the 3 months rule [ruby-core:25764].
+* They have commit right to Ruby's repository to modify their part in the repository.
+* They have "developer" role on the Redmine to modify issues.
+* They have authority to decide the feature of their part. But they should always respect discussions on ruby-core/ruby-dev.
+
+A submaintainer of a module is like a maintainer. But The submaintainer does
+not have authority to change/add a feature on his/her part. They need consensus
+on ruby-core/ruby-dev before changing/adding. Some of submaintainers have
+commit right, others don't.
+
+=== Language core features including security
+
+Yukihiro Matsumoto (matz)
+
+=== Evaluator
+
+Koichi Sasada (ko1)
+
+=== Core classes
+
+Yukihiro Matsumoto (matz)
+
+=== Documentation
+
+Zachary Scott (zzak)
+
+== Standard Library Maintainers
+
+=== Libraries
+
+[lib/English.rb]
+  _unmaintained_
+[lib/abbrev.rb]
+  Akinori MUSHA (knu)
+[lib/base64.rb]
+  Yusuke Endoh (mame)
+[lib/drb.rb, lib/drb/*]
+  Masatoshi SEKI (seki)
+[lib/debug.rb]
+  _unmaintained_
+[lib/erb.rb]
+  Masatoshi SEKI (seki), Takashi Kokubun (k0kubun)
+[lib/find.rb]
+  Kazuki Tsujimoto (ktsj)
+[lib/mkmf.rb]
+  _unmaintained_
+[lib/monitor.rb]
+  Shugo Maeda (shugo)
+[lib/net/ftp.rb]
+  Shugo Maeda (shugo)
+[lib/net/imap.rb]
+  Shugo Maeda (shugo)
+[lib/net/http.rb, lib/net/https.rb]
+  NARUSE, Yui (naruse)
+[lib/net/protocol.rb]
+  _unmaintained_
+[lib/open-uri.rb]
+  Tanaka Akira (akr)
+[lib/optparse.rb, lib/optparse/*]
+  Nobuyuki Nakada (nobu)
+[lib/pp.rb]
+  Tanaka Akira (akr)
+[lib/prettyprint.rb]
+  Tanaka Akira (akr)
+[lib/resolv-replace.rb]
+  Tanaka Akira (akr)
+[lib/resolv.rb]
+  Tanaka Akira (akr)
+[lib/rinda/*]
+  Masatoshi SEKI (seki)
+[lib/rubygems.rb, lib/rubygems/*]
+  Eric Hodel (drbrain), Hiroshi SHIBATA (hsbt)
+  https://github.com/rubygems/rubygems
+[lib/set.rb]
+  Akinori MUSHA (knu)
+[lib/securerandom.rb]
+  Tanaka Akira (akr)
+[lib/shellwords.rb]
+  Akinori MUSHA (knu)
+[lib/tempfile.rb]
+  _unmaintained_
+[lib/tmpdir.rb]
+  _unmaintained_
+[lib/time.rb]
+  Tanaka Akira (akr)
+[lib/tsort.rb]
+  Tanaka Akira (akr)
+[lib/un.rb]
+  WATANABE Hirofumi (eban)
+[lib/unicode_normalize.rb, lib/unicode_normalize/*]
+  Martin J. Dürst
+[lib/weakref.rb]
+  _unmaintained_
+
+=== Extensions
+
+[ext/continuation]
+  Koichi Sasada (ko1)
+[ext/coverage]
+  Yusuke Endoh (mame)
+[ext/digest, ext/digest/*]
+  Akinori MUSHA (knu)
+[ext/fiber]
+  Koichi Sasada (ko1)
+[ext/io/nonblock]
+  Nobuyuki Nakada (nobu)
+[ext/io/wait]
+  Nobuyuki Nakada (nobu)
+[ext/nkf]
+  NARUSE, Yui (naruse)
+[ext/objspace]
+  _unmaintained_
+[ext/pathname]
+  Tanaka Akira (akr)
+[ext/pty]
+  _unmaintained_
+[ext/readline]
+  TAKAO Kouji (kouji)
+[ext/ripper]
+  _unmaintained_
+[ext/socket]
+  * Tanaka Akira (akr)
+  * API change needs matz's approval
+[ext/syslog]
+  Akinori MUSHA (knu)
+[ext/win32]
+  NAKAMURA Usaku (usa)
+[ext/win32ole]
+  Masaki Suketa (suke)
+
+== Default gems Maintainers
+
+=== Libraries
+
+[lib/benchmark.rb]
+  _unmaintained_
+  https://github.com/bundler/benchmark
+  https://rubygems.org/gems/benchmark
+[lib/bundler.rb, lib/bundler/*]
+  Hiroshi SHIBATA (hsbt)
+  https://github.com/bundler/bundler
+  https://rubygems.org/gems/bundler
+[lib/cgi.rb, lib/cgi/*]
+  Takeyuki Fujioka (xibbar)
+  https://github.com/ruby/cgi
+  https://rubygems.org/gems/cgi
+[lib/csv.rb]
+  Kenta Murata (mrkn), Kouhei Sutou (kou)
+  https://github.com/ruby/csv
+  https://rubygems.org/gems/csv
+[lib/delegate.rb]
+  _unmaintained_
+  https://github.com/ruby/delegate
+  https://rubygems.org/gems/delegate
+[lib/did_you_mean.rb]
+  Yuki Nishijima (yuki24)
+  https://github.com/ruby/did_you_mean
+[lib/fileutils.rb]
+  _unmaintained_
+  https://github.com/ruby/fileutils
+  https://rubygems.org/gems/fileutils
+[lib/forwardable.rb]
+  Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/forwardable
+  https://rubygems.org/gems/forwardable
+[lib/getoptlong.rb]
+  _unmaintained_
+  https://github.com/ruby/getoptlong
+  https://rubygems.org/gems/getoptlong
+[lib/ipaddr.rb]
+  Akinori MUSHA (knu)
+  https://github.com/ruby/ipaddr
+  https://rubygems.org/gems/ipaddr
+[lib/irb.rb, lib/irb/*]
+  Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/irb
+  https://rubygems.org/gems/irb
+[lib/logger.rb]
+  Naotoshi Seo (sonots)
+  https://github.com/ruby/logger
+  https://rubygems.org/gems/logger
+[lib/matrix.rb]
+  Marc-Andre Lafortune (marcandre)
+  https://github.com/ruby/matrix
+  https://rubygems.org/gems/matrix
+[lib/mutex_m.rb]
+  Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/mutex_m
+  https://rubygems.org/gems/mutex_m
+[lib/net/pop.rb]
+  _unmaintained_
+  https://github.com/ruby/net-pop
+  https://rubygems.org/gems/net-pop
+[lib/net/smtp.rb]
+  _unmaintained_
+  https://github.com/ruby/net-smtp
+  https://rubygems.org/gems/net-smtp
+[lib/observer.rb]
+  _unmaintained_
+  https://github.com/ruby/observer
+[lib/open3.rb]
+  _unmaintained_
+  https://github.com/ruby/open3
+  https://rubygems.org/gems/open3
+[lib/ostruct.rb]
+  Marc-Andre Lafortune (marcandre)
+  https://github.com/ruby/ostruct
+  https://rubygems.org/gems/ostruct
+[lib/prime.rb]
+  Yuki Sonoda (yugui)
+  https://github.com/ruby/prime
+[lib/pstore.rb]
+  _unmaintained_
+  https://github.com/ruby/pstore
+  https://rubygems.org/gems/pstore
+[lib/racc.rb, lib/racc/*]
+  Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt)
+  https://github.com/ruby/racc
+  https://rubygems.org/gems/racc
+[lib/readline.rb]
+  aycabta
+  https://github.com/ruby/readline
+  https://rubygems.org/gems/readline
+[lib/rdoc.rb, lib/rdoc/*]
+  Eric Hodel (drbrain), Hiroshi SHIBATA (hsbt)
+  https://github.com/ruby/rdoc
+  https://rubygems.org/gems/rdoc
+[lib/reline.rb, lib/reline/*]
+  aycabta
+  https://github.com/ruby/reline
+  https://rubygems.org/gems/reline
+[lib/rexml/*]
+  Kouhei Sutou (kou)
+  https://github.com/ruby/rexml
+  https://rubygems.org/gems/rexml
+[lib/rss.rb, lib/rss/*]
+  Kouhei Sutou (kou)
+  https://github.com/ruby/rss
+  https://rubygems.org/gems/rss
+[lib/singleton.rb]
+  Yukihiro Matsumoto (matz)
+  https://github.com/ruby/singleton
+  https://rubygems.org/gems/singleton
+[lib/timeout.rb]
+  Yukihiro Matsumoto (matz)
+  https://github.com/ruby/timeout
+[lib/thwait.rb]
+  Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/thwait
+  https://rubygems.org/gems/thwait
+[lib/tracer.rb]
+  Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/tracer
+[lib/uri.rb, lib/uri/*]
+  YAMADA, Akira (akira)
+  https://github.com/ruby/uri
+[lib/webrick.rb, lib/webrick/*]
+  Eric Wong (normalperson)
+  https://bugs.ruby-lang.org/
+  https://rubygems.org/gems/webrick
+[lib/yaml.rb, lib/yaml/*]
+  Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt)
+  https://github.com/ruby/yaml
+
+=== Extensions
+
+[ext/bigdecimal]
+  Kenta Murata (mrkn)
+  https://github.com/ruby/bigdecimal
+  https://rubygems.org/gems/bigdecimal
+[ext/cgi]
+  Nobuyoshi Nakada (nobu)
+  https://github.com/ruby/cgi
+  https://rubygems.org/gems/cgi
+[ext/date]
+  _unmaintained_
+  https://github.com/ruby/date
+  https://rubygems.org/gems/date
+[ext/dbm]
+  _unmaintained_
+  https://github.com/ruby/dbm
+  https://rubygems.org/gems/dbm
+[ext/etc]
+  Ruby core team
+  https://github.com/ruby/etc
+  https://rubygems.org/gems/etc
+[ext/fcntl]
+  Ruby core team
+  https://github.com/ruby/fcntl
+  https://rubygems.org/gems/fcntl
+[ext/fiddle]
+  Aaron Patterson (tenderlove)
+  https://github.com/ruby/fiddle
+  https://rubygems.org/gems/fiddle
+[ext/gdbm]
+  Yukihiro Matsumoto (matz)
+  https://github.com/ruby/gdbm
+  https://rubygems.org/gems/gdbm
+[ext/io/console]
+  Nobuyuki Nakada (nobu)
+  https://github.com/ruby/io-console
+  https://rubygems.org/gems/io-console
+[ext/json]
+  NARUSE, Yui (naruse), Hiroshi SHIBATA (hsbt)
+  https://github.com/flori/json
+  https://rubygems.org/gems/json
+[ext/openssl]
+  Kazuki Yamaguchi (rhe)
+  https://github.com/ruby/openssl
+  https://rubygems.org/gems/openssl
+[ext/psych]
+  Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt)
+  https://github.com/ruby/psych
+  https://rubygems.org/gems/psych
+[ext/racc]
+  Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt)
+  https://github.com/ruby/racc
+  https://rubygems.org/gems/racc
+[ext/sdbm]
+  Yukihiro Matsumoto (matz)
+  https://github.com/ruby/sdbm
+  https://rubygems.org/gems/sdbm
+[ext/stringio]
+  Nobuyuki Nakada (nobu)
+  https://github.com/ruby/stringio
+  https://rubygems.org/gems/stringio
+[ext/strscan]
+  Kouhei Sutou (kou)
+  https://github.com/ruby/strscan
+  https://rubygems.org/gems/strscan
+[ext/zlib]
+  NARUSE, Yui (naruse)
+  https://github.com/ruby/zlib
+  https://rubygems.org/gems/zlib
+
+== Bundled gems upstream repositories
+
+[minitest]
+  https://github.com/seattlerb/minitest
+[net-telnet]
+  https://github.com/ruby/net-telnet
+[power_assert]
+  https://github.com/k-tsj/power_assert
+[rake]
+  https://github.com/ruby/rake
+[test-unit]
+  https://github.com/test-unit/test-unit
+[xmlrpc]
+  https://github.com/ruby/xmlrpc
diff --git a/doc/marshal.rdoc b/doc/marshal.rdoc
new file mode 100644
index 0000000000..a51f1bf873
--- /dev/null
+++ b/doc/marshal.rdoc
@@ -0,0 +1,313 @@
+= Marshal Format
+
+The Marshal format is used to serialize ruby objects.  The format can store
+arbitrary objects through three user-defined extension mechanisms.
+
+For documentation on using Marshal to serialize and deserialize objects, see
+the Marshal module.
+
+This document calls a serialized set of objects a stream.  The Ruby
+implementation can load a set of objects from a String, an IO or an object
+that implements a +getc+ method.
+
+== Stream Format
+
+The first two bytes of the stream contain the major and minor version, each as
+a single byte encoding a digit.  The version implemented in Ruby is 4.8
+(stored as "\x04\x08") and is supported by ruby 1.8.0 and newer.
+
+Different major versions of the Marshal format are not compatible and cannot
+be understood by other major versions.  Lesser minor versions of the format
+can be understood by newer minor versions.  Format 4.7 can be loaded by a 4.8
+implementation but format 4.8 cannot be loaded by a 4.7 implementation.
+
+Following the version bytes is a stream describing the serialized object.  The
+stream contains nested objects (the same as a Ruby object) but objects in the
+stream do not necessarily have a direct mapping to the Ruby object model.
+
+Each object in the stream is described by a byte indicating its type followed
+by one or more bytes describing the object.  When "object" is mentioned below
+it means any of the types below that defines a Ruby object.
+
+=== true, false, nil
+
+These objects are each one byte long.  "T" is represents +true+, "F"
+represents +false+ and "0" represents +nil+.
+
+=== Fixnum and long
+
+"i" represents a signed 32 bit value using a packed format.  One through five
+bytes follows the type.  The value loaded will always be a Fixnum.  On
+32 bit platforms (where the precision of a Fixnum is less than 32 bits)
+loading large values will cause overflow on CRuby.
+
+The fixnum type is used to represent both ruby Fixnum objects and the sizes of
+marshaled arrays, hashes, instance variables and other types.  In the
+following sections "long" will mean the format described below, which supports
+full 32 bit precision.
+
+The first byte has the following special values:
+
+"\x00"::
+  The value of the integer is 0.  No bytes follow.
+
+"\x01"::
+  The total size of the integer is two bytes.  The following byte is a
+  positive integer in the range of 0 through 255.  Only values between 123
+  and 255 should be represented this way to save bytes.
+
+"\xff"::
+  The total size of the integer is two bytes.  The following byte is a
+  negative integer in the range of -1 through -256.
+
+"\x02"::
+  The total size of the integer is three bytes.  The following two bytes are a
+  positive little-endian integer.
+
+"\xfe"::
+  The total size of the integer is three bytes.  The following two bytes are a
+  negative little-endian integer.
+
+"\x03"::
+  The total size of the integer is four bytes.  The following three bytes are
+  a positive little-endian integer.
+
+"\xfd"::
+  The total size of the integer is two bytes.  The following three bytes are a
+  negative little-endian integer.
+
+"\x04"::
+  The total size of the integer is five bytes.  The following four bytes are a
+  positive little-endian integer.  For compatibility with 32 bit ruby,
+  only Fixnums less than 1073741824 should be represented this way.  For sizes
+  of stream objects full precision may be used.
+
+"\xfc"::
+  The total size of the integer is two bytes.  The following four bytes are a
+  negative little-endian integer.  For compatibility with 32 bit ruby,
+  only Fixnums greater than -10737341824 should be represented this way.  For
+  sizes of stream objects full precision may be used.
+
+Otherwise the first byte is a sign-extended eight-bit value with an offset.
+If the value is positive the value is determined by subtracting 5 from the
+value.  If the value is negative the value is determined by adding 5 to the
+value.
+
+There are multiple representations for many values.  CRuby always outputs the
+shortest representation possible.
+
+=== Symbols and Byte Sequence
+
+":" represents a real symbol.  A real symbol contains the data needed to
+define the symbol for the rest of the stream as future occurrences in the
+stream will instead be references (a symbol link) to this one.  The reference
+is a zero-indexed 32 bit value (so the first occurrence of <code>:hello</code>
+is 0).
+
+Following the type byte is byte sequence which consists of a long indicating
+the number of bytes in the sequence followed by that many bytes of data.  Byte
+sequences have no encoding.
+
+For example, the following stream contains the Symbol <code>:hello</code>:
+
+  "\x04\x08:\x0ahello"
+
+";" represents a Symbol link which references a previously defined Symbol.
+Following the type byte is a long containing the index in the lookup table for
+the linked (referenced) Symbol.
+
+For example, the following stream contains <code>[:hello, :hello]</code>:
+
+  "\x04\b[\a:\nhello;\x00"
+
+When a "symbol" is referenced below it may be either a real symbol or a
+symbol link.
+
+=== Object References
+
+Separate from but similar to symbol references, the stream contains only one
+copy of each object (as determined by #object_id) for all objects except
+true, false, nil, Fixnums and Symbols (which are stored separately as
+described above) a one-indexed 32 bit value will be stored and reused when the
+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:
+
+  "\004\b[\a\"\nhello@\006"
+
+=== Instance Variables
+
+"I" indicates that instance variables follow the next object.  An object
+follows the type byte.  Following the object is a length indicating the number
+of instance variables for the object.  Following the length is a set of
+name-value pairs.  The names are symbols while the values are objects.  The
+symbols must be instance variable names (<code>:@name</code>).
+
+An Object ("o" type, described below) uses the same format for its instance
+variables as described here.
+
+For a String and Regexp (described below) a special instance variable
+<code>:E</code> is used to indicate the Encoding.
+
+=== Extended
+
+"e" indicates that the next object is extended by a module.  An object follows
+the type byte.  Following the object is a symbol that contains the name of the
+module the object is extended by.
+
+=== Array
+
+"[" represents an Array.  Following the type byte is a long indicating the
+number of objects in the array.  The given number of objects follow the
+length.
+
+=== Bignum
+
+"l" represents a Bignum which is composed of three parts:
+
+sign::
+  A single byte containing "+" for a positive value or "-" for a negative
+  value.
+length::
+  A long indicating the number of bytes of Bignum data follows, divided by
+  two.  Multiply the length by two to determine the number of bytes of data
+  that follow.
+data::
+  Bytes of Bignum data representing the number.
+
+The following ruby code will reconstruct the Bignum value from an array of
+bytes:
+
+  result = 0
+
+  bytes.each_with_index do |byte, exp|
+   result += (byte * 2 ** (exp * 8))
+  end
+
+=== Class and Module
+
+"c" represents a Class object, "m" represents a Module and "M" represents
+either a class or module (this is an old-style for compatibility).  No class
+or module content is included, this type is only a reference.  Following the
+type byte is a byte sequence which is used to look up an existing class or
+module, respectively.
+
+Instance variables are not allowed on a class or module.
+
+If no class or module exists an exception should be raised.
+
+For "c" and "m" types, the loaded object must be a class or module,
+respectively.
+
+=== Data
+
+"d" represents a Data object.  (Data objects are wrapped pointers from ruby
+extensions.)  Following the type byte is a symbol indicating the class for the
+Data object and an object that contains the state of the Data object.
+
+To dump a Data object Ruby calls _dump_data.  To load a Data object Ruby calls
+_load_data with the state of the object on a newly allocated instance.
+
+=== Float
+
+"f" represents a Float object.  Following the type byte is a byte sequence
+containing the float value.  The following values are special:
+
+"inf"::
+  Positive infinity
+
+"-inf"::
+  Negative infinity
+
+"nan"::
+  Not a Number
+
+Otherwise the byte sequence contains a C double (loadable by strtod(3)).
+Older minor versions of Marshal also stored extra mantissa bits to ensure
+portability across platforms but 4.8 does not include these.  See
+[ruby-talk:69518] for some explanation.
+
+=== Hash and Hash with Default Value
+
+"{" represents a Hash object while "}" represents a Hash with a default value
+set (<code>Hash.new 0</code>).  Following the type byte is a long indicating
+the number of key-value pairs in the Hash, the size.  Double the given number
+of objects follow the size.
+
+For a Hash with a default value, the default value follows all the pairs.
+
+=== Module and Old Module
+
+=== Object
+
+"o" represents an object that doesn't have any other special form (such as
+a user-defined or built-in format).  Following the type byte is a symbol
+containing the class name of the object.  Following the class name is a long
+indicating the number of instance variable names and values for the object.
+Double the given number of pairs of objects follow the size.
+
+The keys in the pairs must be symbols containing instance variable names.
+
+=== Regular Expression
+
+"/" represents a regular expression.  Following the type byte is a byte
+sequence containing the regular expression source.  Following the type byte is
+a byte containing the regular expression options (case-insensitive, etc.) as a
+signed 8-bit value.
+
+Regular expressions can have an encoding attached through instance variables
+(see above).  If no encoding is attached escapes for the following regexp
+specials not present in ruby 1.8 must be removed: g-m, o-q, u, y, E, F, H-L,
+N-V, X, Y.
+
+=== String
+
+'"' represents a String.  Following the type byte is a byte sequence
+containing the string content.  When dumped from ruby 1.9 an encoding instance
+variable (<code>:E</code> see above) should be included unless the encoding is
+binary.
+
+=== Struct
+
+"S" represents a Struct.  Following the type byte is a symbol containing the
+name of the struct.  Following the name is a long indicating the number of
+members in the struct.  Double the number of objects follow the member count.
+Each member is a pair containing the member's symbol and an object for the
+value of that member.
+
+If the struct name does not match a Struct subclass in the running ruby an
+exception should be raised.
+
+If there is a mismatch between the struct in the currently running ruby and
+the member count in the marshaled struct an exception should be raised.
+
+=== User Class
+
+"C" represents a subclass of a String, Regexp, Array or Hash.  Following the
+type byte is a symbol containing the name of the subclass.  Following the name
+is the wrapped object.
+
+=== User Defined
+
+"u" represents an object with a user-defined serialization format using the
++_dump+ instance method and +_load+ class method.  Following the type byte is
+a symbol containing the class name.  Following the class name is a byte
+sequence containing the user-defined representation of the object.
+
+The class method +_load+ is called on the class with a string created from the
+byte-sequence.
+
+=== User Marshal
+
+"U" represents an object with a user-defined serialization format using the
++marshal_dump+ and +marshal_load+ instance methods.  Following the type byte
+is a symbol containing the class name.  Following the class name is an object
+containing the data.
+
+Upon loading a new instance must be allocated and +marshal_load+ must be
+called on the instance with the data.
+
diff --git a/doc/pty/README b/doc/pty/README
deleted file mode 100644
index d6368f3758..0000000000
--- a/doc/pty/README
+++ /dev/null
@@ -1,84 +0,0 @@
-pty extension version 0.3 by A.ito
-
-1. Introduction
-
-This extension module adds ruby a functionality to execute an 
-arbitrary command through pseudo tty (pty).
-
-2. Install
-
-Follow the instruction below.
-
-(1) Execute
-
-      ruby extconf.rb
-
-    then Makefile is generated.
-
-(3) Do make; make install.
-
-3. What you can do
-
-This extension module defines a module named PTY, which contains
-following module fungtions:
-
-   getpty(command)
-   spawn(command)
-
-      This function reserves a pty, executes command over the pty 
-      and returns an array. The return value is an array with three
-      elements. The first element in the array is for reading and the 
-      second for writing. The third element is the process ID of the
-      child process. If this function is called with an iterator block,
-      the array is passed to the block as block parameters, and the
-      function itself returns nil.
-
-      When the child process is suspended or finished, an exception is
-      raised.  If this function is called with an iterator block,
-      exception is raised only within the block.  Child process
-      monitor is terminated on block exit.
-
-   protect_signal
-   reset_signal
-
-      These functions are obsolete in this version of pty.
-
-   PTY.open
-
-      Allocates a pty (pseudo-terminal).
-
-      It returns an array which contains an IO object and a File object.
-      The former is the master of the pty.
-      The latter is the slave of the pty.
-
-      If a block is given, it yields the array instead of return.
-      The value of the block is returned.
-      master_io and slave_file is closed when return if they are not closed.
-
-   PTY.check(pid[, raise=false])
-
-      checks the status of the child process specified by pid, and
-      returns nil if the process is still alive and active.
-      Otherwise, returns Process::Status about the process if raise is
-      false, or PTY::ChildExited exception is raised.
-
-4. License
-
-(C) Copyright 1998 by Akinori Ito.
-
-This software may be redistributed freely for this purpose, in full 
-or in part, provided that this entire copyright notice is included 
-on any copies of this software and applications and derivations thereof.
-
-This software is provided on an "as is" basis, without warranty of any
-kind, either expressed or implied, as to any matter including, but not
-limited to warranty of fitness of purpose, or merchantability, or
-results obtained from use of this software.
-
-5. Bug report
-
-Please feel free to send E-mail to
-
-   aito@ei5sun.yz.yamagata-u.ac.jp
-
-for any bug report, opinion, contribution, etc.
diff --git a/doc/pty/README.expect b/doc/pty/README.expect
deleted file mode 100644
index fddbb6fdad..0000000000
--- a/doc/pty/README.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-	README for expect
-		by A. Ito, 28 October, 1998
-
-	Expect library adds IO class a method called expect(), which
-does similar act to tcl's expect extension. 
-
-The usage of the method is:
-
-   IO#expect(pattern,timeout=9999999)
-
-where `pattern' is an instance of String or Regexp and `timeout'
-is Fixnum, which can be omitted. 
-	When the method is called without block, it waits until the
-input which matches the pattern is obtained from the IO or the time
-specified as the timeout passes. When the pattern is obtained from the
-IO, the method returns an array. The first element of the array is the
-entire string obtained from the IO until the pattern matches. The
-following elements indicates the specific pattern which matched to the
-anchor in the regular expression. If the method ends because of
-timeout, it returns nil. 
- 	When the method is called with block, the array is passed as
-the block parameter.
diff --git a/doc/pty/README.expect.ja b/doc/pty/README.expect.ja
index db84695ee5..7c0456f24f 100644
--- a/doc/pty/README.expect.ja
+++ b/doc/pty/README.expect.ja
@@ -1,21 +1,21 @@
 	README for expect
 		by A. Ito, 28 October, 1998
 
-  Expect�饤�֥��ϡ�tcl �� expect �ѥå������Ȼ����褦�ʵ�ǽ��
-IO���饹���ɲä��ޤ���
+  Expectライブラリは，tcl の expect パッケージと似たような機能を
+IOクラスに追加します．
 
-  �ɲä����᥽�åɤλȤ����ϼ����̤�Ǥ���
+  追加されるメソッドの使い方は次の通りです．
 
    IO#expect(pattern,timeout=9999999)
 
-pattern �� String �� Regexp �Υ��󥹥��󥹡�timeout �� Fixnum
-�Υ��󥹥��󥹤Ǥ���timeout �Ͼ�ά�Ǥ��ޤ���
-  ���Υ᥽�åɤ��֥��å��ʤ��ǸƤФ줿��硤�ޤ��쥷���ФǤ���
-IO���֥������Ȥ��� pattern �˥ޥå�����ѥ������ɤߤ��ޤ��
-�ޤ��Ԥ��ޤ����ѥ���������줿�顤���Υѥ�����˴ؤ��������
-�֤��ޤ�������κǽ�����Ǥϡ�pattern �˥ޥå�����ޤǤ��ɤߤ�
-�ޤ줿���Ƥ�ʸ����Ǥ���2���ܰʹߤ����Ǥϡ�pattern ������ɽ��
-����˥��󥫡������ä����ˡ����Υ��󥫡��˥ޥå�������ʬ�Ǥ���
-�⤷�����ॢ���Ȥ����������ϡ����Υ᥽�åɤ�nil���֤��ޤ���
-  ���Υ᥽�åɤ��֥��å��դ��ǸƤФ줿���ˤϡ��ޥå��������Ǥ�
-���󤬥֥��å������Ȥ����Ϥ��졤�֥��å���ɾ������ޤ���
+pattern は String か Regexp のインスタンス，timeout は Fixnum
+のインスタンスです．timeout は省略できます．
+  このメソッドがブロックなしで呼ばれた場合，まずレシーバである
+IOオブジェクトから pattern にマッチするパターンが読みこまれる
+まで待ちます．パターンが得られたら，そのパターンに関する配列を
+返します．配列の最初の要素は，pattern にマッチするまでに読みこ
+まれた内容の文字列です．2番目以降の要素は，pattern の正規表現
+の中にアンカーがあった場合に，そのアンカーにマッチする部分です．
+もしタイムアウトが起きた場合は，このメソッドはnilを返します．
+  このメソッドがブロック付きで呼ばれた場合には，マッチした要素の
+配列がブロック引数として渡され，ブロックが評価されます．
diff --git a/doc/pty/README.ja b/doc/pty/README.ja
index ca2a01442a..2d83ffa033 100644
--- a/doc/pty/README.ja
+++ b/doc/pty/README.ja
@@ -1,76 +1,76 @@
-pty ��ĥ�⥸�塼�� version 0.3 by A.ito
+pty 拡張モジュール version 0.3 by A.ito
 
-1. �Ϥ����
+1. はじめに
 
-���γ�ĥ�⥸�塼��ϡ�����tty (pty) ���̤���Ŭ���ʥ��ޥ�ɤ�
-�¹Ԥ��뵡ǽ�� ruby ���󶡤��ޤ���
+この拡張モジュールは，仮想tty (pty) を通して適当なコマンドを
+実行する機能を ruby に提供します．
 
-2. ���󥹥ȡ���
+2. インストール
 
-���Τ褦�ˤ��ƥ��󥹥ȡ��뤷�Ƥ���������
+次のようにしてインストールしてください．
 
 (1)  ruby extconf.rb
 
-    ��¹Ԥ���� Makefile ����������ޤ���
+    を実行すると Makefile が生成されます．
 
-(2) make; make install ��¹Ԥ��Ƥ���������
+(2) make; make install を実行してください．
 
-3. �����Ǥ��뤫
+3. 何ができるか
 
-���γ�ĥ�⥸�塼��ϡ�PTY �Ȥ����⥸�塼���������ޤ���������
-�ˤϡ����Τ褦�ʥ⥸�塼��ؿ����ޤޤ�Ƥ��ޤ���
+この拡張モジュールは，PTY というモジュールを定義します．その中
+には，次のようなモジュール関数が含まれています．
 
    getpty(command)
    spawn(command)
 
-      ���δؿ��ϡ�����tty����ݤ������ꤵ�줿���ޥ�ɤ򤽤β���tty
-      �θ������Ǽ¹Ԥ���������֤��ޤ�������ͤ�3�Ĥ����Ǥ���ʤ�
-      ����Ǥ����ǽ�����Ǥϲ���tty�����ɤ߽Ф������IO���֥������ȡ�
-      2���ܤϽ񤭤��ि���IO���֥������ȡ�3���ܤϻҥץ������Υץ�
-      ����ID�Ǥ������δؿ������ƥ졼���Ȥ��ƸƤФ줿��硤������
-      ���Ǥϥ֥��å��ѥ�᡼���Ȥ����Ϥ��졤�ؿ����Τ�nil���֤��ޤ���
-
-      �ҥץ���������λ��������ߤ������ˤϡ��㳰��ȯ�����ޤ������δ�
-      �����֥��å��ѥ�᡼���դ��ǸƤФ줿���ˤϡ����Υ֥��å������
-      �Τ��㳰��ȯ�����ޤ����ҥץ��������˥������Ƥ��륹��åɤϥ֥���
-      ����ȴ����Ȥ��˽�λ���ޤ���
-      
+      この関数は，仮想ttyを確保し，指定されたコマンドをその仮想tty
+      の向こうで実行し，配列を返します．戻り値は3つの要素からなる
+      配列です．最初の要素は仮想ttyから読み出すためのIOオブジェクト，
+      2番目は書きこむためのIOオブジェクト，3番目は子プロセスのプロ
+      セスIDです．この関数がイテレータとして呼ばれた場合，これらの
+      要素はブロックパラメータとして渡され，関数自体はnilを返します．
+
+      子プロセスが終了したり停止した場合には，例外が発生します．この関
+      数がブロックパラメータ付きで呼ばれた場合には，そのブロックの中で
+      のみ例外が発生します．子プロセスをモニターしているスレッドはブロッ
+      クを抜けるときに終了します．
+
    protect_signal
    reset_signal
 
-      �ѻ�ͽ��Ǥ���
+      廃止予定です．
 
    PTY.open
 
-      ����tty����ݤ����ޥ�����¦���б�����IO���֥������Ȥȥ��졼��¦��
-      �б�����File���֥������Ȥ�������֤��ޤ����֥��å��դ��ǸƤӽФ�
-      �줿���ϡ����������Ǥϥ֥��å��ѥ�᡼���Ȥ����Ϥ��졤�֥���
-      �������֤��줿��̤��֤��ޤ����ޤ������Υޥ�����IO�ȥ��졼��File
-      �ϡ��֥��å���ȴ����Ȥ��˥��������ѤߤǤʤ���Х�����������ޤ���
+      仮想ttyを確保し，マスター側に対応するIOオブジェクトとスレーブ側に
+      対応するFileオブジェクトの配列を返します．ブロック付きで呼び出さ
+      れた場合は，これらの要素はブロックパラメータとして渡され，ブロッ
+      クから返された結果を返します．また、このマスターIOとスレーブFile
+      は、ブロックを抜けるときにクローズ済みでなければクローズされます．
 
    PTY.check(pid[, raise=false])
 
-      pid�ǻ��ꤵ�줿�ҥץ������ξ��֤�����å������¹���Ǥ����nil��
-      �֤��ޤ�����λ���Ƥ��뤫��ߤ��Ƥ����硢������������Ǥ���С�
-      �б�����Process::Status���֥������Ȥ��֤��ޤ������Ǥ����
-      PTY::ChildExited�㳰��ȯ�����ޤ���
+      pidで指定された子プロセスの状態をチェックし，実行中であればnilを
+      返します．終了しているか停止している場合、第二引数が偽であれば、
+      対応するProcess::Statusオブジェクトを返します。真であれば
+      PTY::ChildExited例外が発生します．
 
-4. ���ѤˤĤ���
+4. 利用について
 
-��ƣ��§���������ͭ���ޤ���
+伊藤彰則が著作権を保有します．
 
-�������ץ������ޤ��ϥɥ�����Ȥ˸������ɽ�������Ѥ��줺��
-ɽ������Ƥ�����˸¤ꡤï�Ǥ⡤���Υ��եȥ�������̵����������
-���Ԥ�̵�Ǥ����ѡ����ۡ����ѤǤ��ޤ���������Ū�ϸ��ꤵ��Ƥ��ޤ�
-��
+ソースプログラムまたはドキュメントに元の著作権表示が改変されずに
+表示されている場合に限り，誰でも，このソフトウェアを無償かつ著作
+権者に無断で利用・配布・改変できます．利用目的は限定されていませ
+ん．
 
-���Υץ����������ѡ����ۤ���¾���Υץ������˴ط�����԰٤ˤ�
-�ä������������ʤ�»�����Ф��Ƥ⡤��Ԥϰ�����Ǥ���餤�ޤ���
+このプログラムの利用・配布その他このプログラムに関係する行為によ
+って生じたいかなる損害に対しても，作者は一切責任を負いません．
 
-5. �Х������
+5. バグ報告等
 
-�Х���ݡ��Ȥϴ��ޤ��ޤ���
+バグレポートは歓迎します．
 
 	aito@ei5sun.yz.yamagata-u.ac.jp
 
-�ޤ��Żҥ᡼��ǥХ���ݡ��Ȥ����꤯��������
+まで電子メールでバグレポートをお送りください．
diff --git a/doc/rake/CHANGES b/doc/rake/CHANGES
deleted file mode 100644
index 3b1a02b812..0000000000
--- a/doc/rake/CHANGES
+++ /dev/null
@@ -1,440 +0,0 @@
-
-= Rake Changelog
-
-== Version 0.8.7
-
-* Fixed EXEEXT for JRuby on windows.
-
-== Version 0.8.6
-
-* Minor fixes to the RDoc generation (removed dependency on darkfish
-  and removed inline source option).
-
-== Version 0.8.5
-
-* Better support for the system command on Windows.
-
-== Version 0.8.4
-
-* Preserve case when locating rakefiles (patch from James
-  M. Lawrence/quix)
-
-* Better support for windows paths in the test task (patch from Simon
-  Chiang/bahuvrihi)
-
-* Windows system dir search order is now: HOME, HOMEDRIVE + HOMEPATH,
-  APPDATA, USERPROFILE (patch from Luis Lavena)
-
-* MingGW is now recognized as a windows platform.  (patch from Luis
-  Lavena)
-
-* Numerous fixes to the windows test suite (patch from Luis Lavena).
-
-* Improved Rakefile case insensitivity testing (patch from Luis
-  Lavena).
-
-* Fixed stray ARGV option problem that was interfering with
-  Test::Unit::Runner.
-
-* Fixed default verbose mode (was accidently changed to false).  
-
-* Removed reference to manage_gem to fix the warning produced by the
-  gem package task.
-
-== Version 0.8.3
-
-* Enhanced the system directory detection in windows. We now check
-  HOMEDRIVE/HOMEPATH and USERPROFILE if APPDATA isn't found. (Patch
-  supplied by James Tucker). Rake no long aborts if it can't find the
-  directory.
-
-* Added fix to handle ruby installations in directories with spaces in
-  their name.  
-
-== Version 0.8.2
-
-* Fixed bug in package task so that it will include the subdir
-  directory in the package for testing. (Bug found by Adam Majer)
-
-* Added ENV var to rakefile to prevent OS X from including extended
-  attribute junk in a tar file. (Bug found by Adam Majer)
-
-* Fixed filename dependency order bug in test_inspect_pending and
-  test_to_s_pending. (Bug found by Adam Majer)
-
-* Fixed check for file utils options to make them immune to the
-  symbol/string differences. (Patch supplied by Edwin Pratomo)
-
-* Fixed bug with rules involving multiple source (Patch supplied by
-  Emanuel Inderm�hle)
-
-* Switched from getoptlong to optparse (patches supplied by Edwin
-  Pratomo)
-
-* The -T option will now attempt to dynamically sense the size of the
-  terminal.  RAKE_COLUMNS will override any dynamic sensing.
-
-* FileList#clone and FileList#dup have better sematics w.r.t. taint
-  and freeze.
-
-* Added ability clear prerequisites, and/or actions from an existing
-  task.
-
-* Added the ability to reenable a task to be invoked a second time.
-
-* Changed RDoc test task to have no default template. This makes it
-  easier for the tempate to pick up the template from the environment.
-
-* Changed from using Mutex to Monitor. Evidently Mutex causes thread
-  join errors when Ruby is compiled with -disable-pthreads. (Patch
-  supplied by Ittay Dror) 
-
-* Fixed bug in makefile parser that had problems with extra spaces in
-  file task names. (Patch supplied by Ittay Dror)
-
-* Added a performance patch for reading large makefile dependency
-  files. (Patch supplied by Ittay Dror)
-
-* Default values for task arguments can easily be specified with the
-  :with_defaults method. (Idea for default argument merging supplied
-  by (Adam Q. Salter)
-
-* The -T output will only self-truncate if the output is a tty.
-  However, if RAKE_COLUMNS is explicitly set, it will be honored in
-  any case. (Patch provided by Gavin Stark).
-
-* Numerous fixes for running under windows. A big thanks to Bheeshmar
-  Redheendran for spending a good part of the afternoon at the
-  Lonestar Ruby Conference to help me work out these issues.
-
-== Version 0.8.1
-
-* Removed requires on parsedate.rb (in Ftptools)
-* Removed ftools from rake.rb.  Made it options in sys.rb
-
-== Version 0.8.0
-
-* Added task parameters (e.g. "rake build[version7]")
-* Made task parameters passable to prerequisites.
-* Comments are limited to 80 columns or so (suggested by Jamis Buck).
-* Added -D to display full comments (suggested by Jamis Buck).
-* The rake program will set the status value used in any explicit
-  exit(n) calls. (patch provided by Stephen Touset)
-* Fixed error in functional tests that were not including session (and
-  silently skipping the functionl tests.
-* Removed --usage and make -h the same as -H.
-* Make a prettier inspect for tasks.
-
-== Version 0.7.3
-
-* Added existing and existing! methods to FileList
-* FileLists now claim to be Arrays (via is_a?) to get better support
-  from the FileUtil module.
-* Added init and top_level for custom rake applications.
-
-== Version 0.7.2
-
-* Error messages are now send to stderr rather than stdout (from
-  Payton Quackenbush).
-* Better error handling on invalid command line arguments (from Payton
-  Quackenbush).
-* Added rcov task and updated unit testing for better code coverage.
-* Fixed some bugs where the application object was going to the global
-  appliation instead of using its own data.
-* Added square and curly bracket patterns to FileList#include (Tilman
-  Sauerbeck). 
-* Added plain filename support to rule dependents (suggested by Nobu
-  Nakada). 
-* Added pathmap support to rule dependents.
-* Added a 'tasks' method to a namespace to get a list of tasks
-  associated with the namespace.
-* Fixed the method name leak from FileUtils (bug found by Glenn
-  Vanderburg). 
-* Added rake_extension to handle detection of extension collisions.
-* Added test for noop, bad_option and verbose flags to sh command.
-* Removed dependency on internal fu_xxx functions from FileUtils.
-* Added a 'shame' task to the Rakefile.
-* Added tar_command and zip_command options to the Package task.
-* Added a description to the gem task in GemPackageTask.
-* Fixed a bug when rules have multiple prerequisites (patch by Joel
-  VanderWerf)
-* Added a protected 'require "rubygems"' to test/test_application to
-  unbreak cruisecontrol.rb.
-* Added the handful of RakeFileUtils to the private method as well.
-* Added block based exclusion.
-* The clean task will no longer delete 'core' if it is a directory.
-* Removed rake_dup.  Now we just simply rescue a bad dup.
-* Refactored the FileList reject logic to remove duplication.
-* Removed if __FILE__ at the end of the rake.rb file.
-
-== Version 0.7.1
-
-* Added optional filter parameter to the --tasks command line option.
-* Added flatten to allow rule transform procs to return lists of
-  prereqs (Joel VanderWerf provided patch).
-* Added pathmap to String and FileList.
-* The -r option will now load .rake files (but a straight require
-  doesn't yet).  NOTE: This is experimental ... it may be
-  discontinued.
-* The -f option without a value will disable the search for a
-  Rakefile.  The assumption is that the -r files are adequate.
-* Fixed the safe_ln function to fall back to cp in more error
-  scenarios.
-
-== Version 0.7.0
-
-* Added Rake.original_dir to return the original starting directory of
-  the rake application.
-* Added safe_ln support for openAFS (from Ludvig Omholt).
-* Added --trace reminder on short exception messages (David Heinemeier
-  Hansson suggestion).
-* Added multitask declaration that executes prerequisites in
-  parallel. (Doug Young providied an initial implementation).
-* Fixed missing_const hack to be compatible with Rails. (Jamis Buck
-  supplied test case).
-* Made the RDoc task default to internal (in-process) RDoc formatting.
-  The old behavior is still available by setting the +external+ flag
-  to true.
-* Rakefiles are now loaded with the expanded path to prevent
-  accidental polution from the Ruby load path.
-* The +namespace+ command now returns a NameSpace object that can be
-  used to lookup tasks defined in that namespace.  This allows for
-  better anonymous namespace behavior.
-* Task objects my now be used in prerequisite lists directly.
-
-== Version 0.6.1
-
-* Rebuilt 0.6.0 gem without signing.
-
-== Version 0.6.0
-
-* Fixed file creation bug in the unit tests (caused infinite loop on
-  windows).
-* Fixed bug where session based functional tests were run under
-  windows.
-* Fixed bug in directory tasks so that updating a directory will not
-  retrigger file tasks depending on the directory (see
-  FileCreationTask and EarlyTime).
-* Added egrep to FileList
-* ruby command now runs same ruby version as rake.
-* Added investigation to task object. (suggested by Martin Fowler)
-* Added ruby_opts to the test task to allow arbitrary ruby options to
-  be passed to the test script. (Greg Fast)
-* Fixed the test loader to ignore options. (Greg Fast)
-* Moved Task, FileTask, FileCreationTask and RakeApp into the Rake
-  module namespace.  Old style namespace behavior can be invoked via
-  the --classic-namespace option. (requested by Kelly Felkins).
-* GemTask is now sensitive to the gem platform (Masao Mutoh).
-* A non-existing file prerequisite will no longer cause an exception
-  (Philipp Neubeck).
-* Multiple prerequisites on Rake rules now allowed (initial patch
-  supplied by Stuart Jansen).
-
-== Version 0.5.4
-
-* Added double quotes to the test runner.
-* Added .svn to default ignore list.
-* Updated FileList#include to support nested arrays and filelists.
-
-== Version 0.5.3
-
-* Added support for importing Rakefile and other dependencies.
-* Fixed bug so that now rules can chain off of existing tasks as well
-  as existing files.
-* Fixed verbose flag bug in the testing task.  Shortened some failure
-  messages.
-* Make FileUtils methods private at the top level module to avoid
-  accidental method leaking into other objects.
-* Added test loader option to test task.  "testrb" is no longer the
-  default test loader.  It is now eating syntax errors that should
-  halt the unit tests.
-* Revamped FileList so that it works more like and array (addressed
-  flatten bug).  Added many tests around file list.
-* Added +ext+ method to both String and FileList.
-
-== Version 0.5.0
-
-* Fixed documentation that was lacking the Rake module name (Tilman
-  Sauerbeck).
-* Added tar.gz and tar.bz2 support to package task (Tilman Sauerbeck).
-* Recursive rules are now supported (Tilman Sauerbeck).
-* Added warning option for the Test Task (requested by Eric Hodel).
-* The jamis rdoc template is only used if it exists.
-* Added fix for Ruby 1.8.2 test/unit and rails problem.
-* Added contributed rake man file (Jani Monoses).
-* Added Brian Candler's fix for problems in --trace and --dry-run
-  mode.
-
-== Version 0.4.15
-
-* Fixed a bug that prevented the TESTOPTS flag from working with the
-  revised for 1.8.2 test task.
-* Updated the docs on --trace to indicate that it also enables a full
-  backtrace on errors. 
-
-== Version 0.4.14
-
-* Modified the TestTask to workaround the Ruby 1.8.2 change in
-  autoexecuting unit tests.
-
-== Version 0.4.13
-
-* Fixed the dry-run flag so it is operating again.
-* Multiple arguments to sh and ruby commands will not be interpreted
-  by the shell (patch provided by Jonathan Paisley).
-
-== Version 0.4.12
-
-* Added --silent (-s) to suppress the (in directory) rake message.
-
-== Version 0.4.11
-
-* Changed the "don't know how to rake" message (finally)
-* Changes references to a literal "Rakefile" to reference the global
-  variable $rakefile (which contains the actual name of the rakefile).
-
-== Version 0.4.10
-
-* Added block support to the "sh" command, allowing users to take
-  special actions on the result of the system call.  E.g.
-
-    sh "shell_command" do |ok, res|
-      puts "Program returned #{res.exitstatus}" if ! ok
-    end
-
-== Version 0.4.9
-
-* Switched to Jamis Buck's RDoc template.
-* Removed autorequire from Rake's gem spec.  This prevents the Rake
-  libraries from loading while using rails.
-
-== Version 0.4.8
-
-* Added support for .rb versions of Rakefile.
-* Removed \\\n's from test task.
-* Fixed Ruby 1.9 compatibility issue with FileList.
-
-== Version 0.4.7
-
-* Fixed problem in FileList that caused Ruby 1.9 to go into infinite
-  recursion.  Since to_a was removed from Object, it does not need to
-  added back into the list of methods to rewrite in FileList.  (Thanks
-  to Kent Sibilev for pointing this out).
-
-== Version 0.4.6
-* Removed test version of ln in FileUtils that prevented safe_ln from
-  using ln.
-
-== Version 0.4.5
-* Upgraded comments in TestTask.
-* FileList to_s and inspect now automatically resolve pending changes.
-* FileList#exclude properly returns the FileList.
-
-== Version 0.4.4
-* Fixed initialization problem with @comment.
-* Now using multi -r technique in TestTask.  Switch Rakefile back to
-  using the built-in test task macros because the rake runtime is no
-  longer needed.
-* Added 'TEST=filename' and 'TESTOPTS=options' to the Test Task
-  macros.
-* Allow a +test_files+ attribute in test tasks.  This allows more
-  flexibility in specifying test files.
-
-== Version 0.4.3
-* Fixed Comment leakage.
-
-== Version 0.4.2
-* Added safe_ln that falls back to a copy if a file link is not supported.
-* Package builder now uses safe_ln.
-
-== Version 0.4.1
-* Task comments are now additive, combined with "/".
-* Works with (soon to be released) rubygems 0.6.2 (or 0.7.0)
-
-== Version 0.4.0
-* FileList now uses deferred loading.  The file system is not searched
-  until the first call that needs the file names.
-* VAR=VALUE options are now accepted on the command line and are
-  treated like environment variables.  The values may be tested in a
-  Rakefile by referencing ENV['VAR'].
-* File.mtime is now used (instead of File.new().mtime).
-
-== Version 0.3.2.x
-
-* Removed some hidden dependencies on rubygems.  Tests now will test
-  gems only if they are installed.
-* Removed Sys from some example files.  I believe that is that last
-  reference to Sys outside of the contrib area.
-* Updated all copyright notices to include 2004.
-
-== Version 0.3.2
-
-* GEM Installation now works with the application stub.
-
-== Version 0.3.1
-
-* FileLists now automatically ignore CVS, .bak, !
-* GEM Installation now works.
-
-== Version 0.3.0
-
-Promoted 0.2.10.
-
-== Version 0.2.10
-General
-
-* Added title to Rake's rdocs
-* Contrib packages are no longer included in the documentation.
-
-RDoc Issues
-
-* Removed default for the '--main' option
-* Fixed rendering of the rdoc options
-* Fixed clean/clobber confusion with rerdoc
-* 'title' attribute added
-
-Package Task Library Issues
-
-* Version (or explicit :noversion) is required.
-* +package_file+ attribute is now writable
-
-FileList Issues
-
-* Dropped bang version of exclude.  Now using ant-like include/exclude semantics.
-* Enabled the "yield self" idiom in FileList#initialize.
-
-== Version 0.2.9
-
-This version contains numerous changes as the RubyConf.new(2003)
-presentation was being prepared.  The changes include:
-
-* The monolithic rubyapp task library is in the process of being
-  dropped in favor of lighter weight task libraries.
-
-== Version 0.2.7
-
-* Added "desc" for task descriptions.
-* -T will now display tasks with descriptions.
-* -P will display tasks and prerequisites.
-* Dropped the Sys module in favor of the 1.8.x FileUtils module.  Sys
-  is still supported in the contrib area.
-
-== Version 0.2.6
-
-* Moved to RubyForge
-
-== Version 0.2.5
-
-* Switched to standard ruby app builder.
-* Added no_match option to file matcher.
-
-== Version 0.2.4
-
-* Fixed indir, which neglected to actually change directories.
-
-== Version 0.2.3
-
-* Added rake module for a help target
-* Added 'for_files' to Sys
-* Added a $rakefile constant
-* Added test for selecting proper rule with multiple targets.
diff --git a/doc/rake/README b/doc/rake/README
deleted file mode 100644
index 41668dd727..0000000000
--- a/doc/rake/README
+++ /dev/null
@@ -1,196 +0,0 @@
-= RAKE -- Ruby Make 
-
-Supporting Rake version: 0.8.6
-
-This package contains Rake, a simple ruby build program with
-capabilities similar to make.
-
-Rake has the following features:
-
-* Rakefiles (rake's version of Makefiles) are completely defined in
-  standard Ruby syntax.  No XML files to edit.  No quirky Makefile
-  syntax to worry about (is that a tab or a space?)
-
-* Users can specify tasks with prerequisites.
-
-* Rake supports rule patterns to synthesize implicit tasks.
-
-* Flexible FileLists that act like arrays but know about manipulating
-  file names and paths.
-
-* A library of prepackaged tasks to make building rakefiles easier. For example,
-  tasks for building tarballs, gems and RDoc output are provided.
-
-* Supports parallel execution of tasks.
-
-
-== Installation
-
-=== Gem Installation
-
-Download and install  rake with the following.
-
-   gem install rake
-
-=== Normal Installation
-
-You can download the source tarball of the latest version of Rake from
-
-* http://rubyforge.org/project/showfiles.php?group_id=50
-
-Extract the tarball and run
-
-  % ruby install.rb
-
-from its distribution directory.
-
-== Usage
-
-=== Simple Example
-
-First, you must write a "Rakefile" file which contains the build rules. Here's
-a simple example:
-
-  task :default => [:test]
-  
-  task :test do
-    ruby "test/unittest.rb"
-  end
-
-This Rakefile has two tasks:
-
-* A task named "test", which - upon invocation - will run a unit test file in
-  Ruby.
-* A task named "default". This task does nothing by itself, but it has exactly
-  one dependency, namely the "test" task. Invoking the "default" task will
-  cause Rake to invoke the "test" task as well.
-
-Running the "rake" command without any options will cause it to run the
-"default" task in the Rakefile:
-
-  % ls
-  Rakefile     test/
-  % rake
-  (in /home/some_user/Projects/rake)
-  ruby test/unittest.rb
-  ....unit test output here...
-
-Type "rake --help" for all available options.
-
-
-=== More Information
-
-* For details on Rake's command-line invocation, read
-  doc/command_line_usage.rdoc[http://rake.rubyforge.org/files/doc/command_line_usage_rdoc.html]
-* For details on writing Rakefiles, see
-  doc/rakefile.rdoc[http://rake.rubyforge.org/files/doc/rakefile_rdoc.html].
-* For the original announcement of Rake, see
-  doc/rational.rdoc[http://rake.rubyforge.org/files/doc/rational_rdoc.html].
-* For a glossary of terms, see
-  doc/glossary.rdoc[http://rake.rubyforge.org/files/doc/glossary_rdoc.html].
-
-
-== Development
-
-=== Source Repository
-
-Rake is currently hosted at github. The github web page is
-http://github.com/jimweirich/rake. The public git clone URL is
-
-* git://github.com/jimweirich/rake.git
-
-=== Running the Rake Test Suite
-
-If you wish to run the unit and functional tests that come with Rake:
-
-* Install the 'session' gem in order to run the functional tests.
-* CD into the top project directory of rake.
-* Type one of the following:
-
-     rake                  # If you have a version of rake installed
-     ruby -Ilib bin/rake   # If you do not have a version of rake installed.
-
-=== Issues and Bug Reports
-
-Bugs, features requests and other issues can be logged at
-
-* http://onestepback.org/redmine/projects/show/rake
-
-You will need an account to before you can post issues.  Register at
-http://onestepback.org/redmine/account/register.  Or you can send me
-an email (at jim dot weirich at gmail dot com)
-
-
-== Online Resources
-
-=== Rake References
-
-* Rake Documentation Home: http://docs.rubyrake.org
-* Rake Project Page: http://rubyforge.org/projects/rake
-* Rake API Documents: http://rake.rubyforge.org
-* Rake Source Code Repo:  http://github.com/jimweirich/rake
-* Rake Git Repo Clone URL: git://github.com/jimweirich/rake.git
-
-=== Presentations and Articles about Rake
-
-* Jim Weirich's 2003 RubyConf presentation: http://onestepback.org/articles/buildingwithrake/
-* Martin Fowler's article on Rake: http://martinfowler.com/articles/rake.html
-
-== Other Make Reinvisionings ...
-
-Rake is a late entry in the make replacement field.  Here are links to
-other projects with similar (and not so similar) goals.
-
-* http://directory.fsf.org/bras.html -- Bras, one of earliest
-  implementations of "make in a scripting language".
-* http://www.a-a-p.org -- Make in Python
-* http://www.aromatic.com/tools/jam.txt -- JAM, Java Automated Make
-* http://ant.apache.org -- The Ant project
-* http://ppt.perl.org/commands/make/index.html -- Make from the Perl
-  Power Tools implementation.
-* http://search.cpan.org/search?query=PerlBuildSystem -- The Perl Build System
-* http://make.rubyforge.org -- Rant, another Ruby make tool.
-
-== Credits
-
-[<b>Ryan Dlugosz</b>] For the initial conversation that sparked Rake.
-
-[<b>nobu.nokada@softhome.net</b>] For the initial patch for rule support.
-
-[<b>Tilman Sauerbeck <tilman@code-monkey.de></b>] For the recursive rule patch.
-
-== License
-
-Rake is available under an MIT-style license.
-
-:include: MIT-LICENSE
-
-== Support
-
-The Rake homepage is http://rake.rubyforge.org.  You can find the Rake
-RubyForge page at http://rubyforge.org/projects/rake.
-
-Feel free to submit commits or feature requests.  If you send a patch,
-remember to update the corresponding unit tests.  If fact, I prefer
-new feature to be submitted in the form of new unit tests.
-
-For other information, feel free to ask on the ruby-talk mailing list
-(which is mirrored to comp.lang.ruby) or contact
-jim dot weirich at gmail.com.
-
----
-
-= Other stuff
-
-Author::   Jim Weirich <jim.weirich@gmail.com>
-Requires:: Ruby 1.8.0 or later
-License::  Copyright 2003-2008 by Jim Weirich.
-           Released under an MIT-style license.  See the LICENSE file
-           included in the distribution.
-
-== Warranty
-
-This software is provided "as is" and without any express or
-implied warranties, including, without limitation, the implied
-warranties of merchantibility and fitness for a particular
-purpose.
diff --git a/doc/rake/command_line_usage.rdoc b/doc/rake/command_line_usage.rdoc
deleted file mode 100644
index c60e53f51a..0000000000
--- a/doc/rake/command_line_usage.rdoc
+++ /dev/null
@@ -1,102 +0,0 @@
-= Rake Command Line Usage
-
-Rake is invoked from the command line using:
-
-   % rake [<em>options</em> ...]  [<em>VAR</em>=<em>VALUE</em>]  [<em>targets</em> ...]
-
-Options are:
-
-[<tt><em>name</em>=<em>value</em></tt>]
-    Set the environment variable <em>name</em> to <em>value</em>
-    during the execution of the <b>rake</b> command.  You can access
-    the value by using ENV['<em>name</em>'].  
-
-[<tt>--classic-namespace</tt> (-n)]
-    Import the Task, FileTask, and FileCreateTask into the top-level
-    scope to be compatible with older versions of Rake.  Alternatively
-    you can include the line <code>require
-    'rake/classic_namespace'</code> in your Rakefile to get the
-    classic behavior.
-
-[<tt>--describe</tt> _pattern_ (-D)]
-    Describe the tasks (matching optional PATTERN), then exit.
-
-[<tt>--dry-run</tt> (-n)]
-    Do a dry run.  Print the tasks invoked and executed, but do not
-    actually execute any of the actions.
-
-[<tt>--execute</tt> _code_ (-e)]
-    Execute some Ruby code and exit.
-
-[<tt>--execute-print</tt> _code_ (-p)]
-    Execute some Ruby code, print the result, and exit.
-
-[<tt>--execute-continue</tt> _code_ (-p)]
-    Execute some Ruby code, then continue with normal task processing.
-
-[<tt>--help</tt>  (-H)]
-    Display some help text and exit.
-
-[<tt>--libdir</tt> _directory_  (-I)]
-    Add _directory_ to the list of directories searched for require.
-
-[<tt>--nosearch</tt>  (-N)]
-    Do not search for a Rakefile in parent directories.
-
-[<tt>--prereqs</tt>  (-P)]
-    Display a list of all tasks and their immediate prerequisites.
-
-[<tt>--quiet</tt> (-q)]
-    Do not echo commands from FileUtils.
-
-[<tt>--rakefile</tt> _filename_ (-f)]
-    Use _filename_ as the name of the rakefile. The default rakefile
-    names are +rakefile+ and +Rakefile+ (with +rakefile+ taking
-    precedence). If the rakefile is not found in the current
-    directory, +rake+ will search parent directories for a match. The
-    directory where the Rakefile is found will become the current
-    directory for the actions executed in the Rakefile.
-
-[<tt>--rakelibdir</tt> _rakelibdir_ (-R)]
-    Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')
-
-[<tt>--require</tt> _name_ (-r)]
-    Require _name_ before executing the Rakefile.
-
-[<tt>--rules</tt>]
-    Trace the rules resolution.
-
-[<tt>--silent (-s)</tt>]
-    Like --quiet, but also suppresses the 'in directory' announcement.
-
-[<tt>--system</tt> (-g)]
-    Use the system wide (global) rakefiles. The project Rakefile is
-    ignored. By default, the system wide rakefiles are used only if no
-    project Rakefile is found. On Unix-like system, the system wide
-    rake files are located in $HOME/.rake. On a windows system they
-    are stored in $APPDATA/Rake.
-
-[<tt>--no-system</tt> (-G)]
-    Use the project level Rakefile, ignoring the system-wide (global)
-    rakefiles.
-
-[<tt>--tasks</tt> (-T)]
-    Display a list of the major tasks and their comments.  Comments
-    are defined using the "desc" command.
-
-[<tt>--trace</tt> (-t)]
-    Turn on invoke/execute tracing. Also enable full backtrace on
-    errors.
-
-[<tt>--usage</tt> (-h)]
-    Display a usage message and exit.
-
-[<tt>--verbose</tt> (-v)]
-    Echo the Sys commands to standard output.
-
-[<tt>--version</tt> (-V)]
-    Display the program version and exit.
-
-In addition, any command line option of the form
-<em>VAR</em>=<em>VALUE</em> will be added to the environment hash
-<tt>ENV</tt> and may be tested in the Rakefile.
diff --git a/doc/rake/example/Rakefile1 b/doc/rake/example/Rakefile1
deleted file mode 100644
index 39f8bcceb0..0000000000
--- a/doc/rake/example/Rakefile1
+++ /dev/null
@@ -1,38 +0,0 @@
-# Example Rakefile -*- ruby -*-
-
-task :default => [:main]
-
-file "a.o" => ["a.c"] do |t|
-  src = t.name.sub(/\.o$/, '.c')
-  sh "gcc #{src} -c -o #{t.name}"
-end
-
-file "b.o" => ["b.c"] do |t|
-  src = t.name.sub(/\.o$/, '.c')
-  sh "gcc #{src} -c -o #{t.name}"
-end
-
-file "main.o" => ["main.c"] do |t|
-  src = t.name.sub(/\.o$/, '.c')
-  sh "gcc #{src} -c -o #{t.name}"
-end
-
-OBJFILES = ["a.o", "b.o", "main.o"]
-task :obj => OBJFILES
-
-file "main" => OBJFILES do |t|
-  sh "gcc -o #{t.name} main.o a.o b.o"
-end
-
-task :clean do
-  rm_f FileList['*.o']
-  Dir['*~'].each { |fn| rm_f fn }
-end
-
-task :clobber => [:clean] do
-  rm_f "main"
-end
-
-task :run => ["main"] do
-  sh "./main"
-end
diff --git a/doc/rake/example/Rakefile2 b/doc/rake/example/Rakefile2
deleted file mode 100644
index 35310eceb5..0000000000
--- a/doc/rake/example/Rakefile2
+++ /dev/null
@@ -1,35 +0,0 @@
-# Example Rakefile -*- ruby -*-
-# Using the power of Ruby
-
-task :default => [:main]
-
-def ext(fn, newext)
-  fn.sub(/\.[^.]+$/, newext)
-end
-
-SRCFILES = Dir['*.c']
-OBJFILES = SRCFILES.collect { |fn| ext(fn,".o") }
-
-OBJFILES.each do |objfile|
-  srcfile = ext(objfile, ".c")
-  file objfile => [srcfile] do |t|
-    sh "gcc #{srcfile} -c -o #{t.name}"
-  end
-end
-
-file "main" => OBJFILES do |t|
-  sh "gcc -o #{t.name} main.o a.o b.o"
-end
-
-task :clean do
-  rm_f FileList['*.o']
-  Dir['*~'].each { |fn| rm_f fn }
-end
-
-task :clobber => [:clean] do
-  rm_f "main"
-end
-
-task :run => ["main"] do
-  sh "./main"
-end
diff --git a/doc/rake/example/a.c b/doc/rake/example/a.c
deleted file mode 100644
index 620e6f8007..0000000000
--- a/doc/rake/example/a.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdio.h>
-
-void a()
-{
-    printf ("In function a\n");
-}
diff --git a/doc/rake/example/b.c b/doc/rake/example/b.c
deleted file mode 100644
index 9b24aa1273..0000000000
--- a/doc/rake/example/b.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdio.h>
-
-void b()
-{
-    printf ("In function b\n");
-}
diff --git a/doc/rake/example/main.c b/doc/rake/example/main.c
deleted file mode 100644
index a04558a251..0000000000
--- a/doc/rake/example/main.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-
-extern void a();
-extern void b();
-
-int main ()
-{
-    a();
-    b();
-    return 0;
-}
diff --git a/doc/rake/glossary.rdoc b/doc/rake/glossary.rdoc
deleted file mode 100644
index 0ca1869306..0000000000
--- a/doc/rake/glossary.rdoc
+++ /dev/null
@@ -1,51 +0,0 @@
-= Glossary
-
-[<b>action</b>]
-	Code to be executed in order to perform a task.  Actions in a
-	rakefile are specified in a code block (usually delimited by
-	+do+/+end+ pairs.
-
-[<b>execute</b>]
-	When a task is executed, all of its actions are performed, in
-	the order they were defined.  Note that unlike
-	<tt>invoke</tt>, <tt>execute</tt> always executes the actions
-	(without invoking or executing the prerequisites).
-
-[<b>file task</b> (FileTask)]
-	 A file task is a task whose purpose is to create a file
-	 (which has the same name as the task).  When invoked, a file
-	 task will only execute if one or more of the following
-	 conditions are true.
-
-         1. The associated file does not exist.
-	 2. A prerequisite has a later time stamp than the existing file.
-
-	 Because normal Tasks always have the current time as
-	 timestamp, a FileTask that has a normal Task prerequisite
-	 will always execute.
-
-[<b>invoke</b>]
-	When a task is invoked, first we check to see if it has been
-	invoked before.  if it has been, then nothing else is done.
-	If this is the first time its been invoked, then we invoke
-	each of its prerequisites.  Finally, we check to see if we
-	need to execute the actions of this task by calling
-	<tt>needed?</tt>.  Finally, if the task is needed, we execute
-	its actions.
-
-	NOTE: Currently prerequisites are invoked even if the task is
-	not needed.  This may change in the future.
-
-[<b>prerequisites</b>]
-	Every task has a set (possiblity empty) of prerequisites.  A
-	prerequisite P to Task T is itself a task that must be invoked
-	before Task T.  
-
-[<b>rule</b>]
-	A rule is a recipe for synthesizing a task when no task is
-	explicitly defined.  Rules generally synthesize file tasks.
-
-[<b>task</b> (Task)]
-	Basic unit of work in a rakefile.  A task has a name, a set of
-	prerequisites and a list of actions to be performed.
-
diff --git a/doc/rake/jamis.rb b/doc/rake/jamis.rb
deleted file mode 100644
index c7bc84ac5b..0000000000
--- a/doc/rake/jamis.rb
+++ /dev/null
@@ -1,591 +0,0 @@
-module RDoc
-module Page
-
-FONTS = "\"Bitstream Vera Sans\", Verdana, Arial, Helvetica, sans-serif"
-
-STYLE = <<CSS
-a {
-  color: #00F;
-  text-decoration: none;
-}
-
-a:hover {
-  color: #77F;
-  text-decoration: underline;
-}
-
-body, td, p {
-  font-family: %fonts%;
-  background: #FFF;
-  color: #000;
-  margin: 0px;
-  font-size: small;
-}
-
-#content {
-  margin: 2em;
-}
-
-#description p {
-  margin-bottom: 0.5em;
-}
-
-.sectiontitle {
-  margin-top: 1em;
-  margin-bottom: 1em;
-  padding: 0.5em;
-  padding-left: 2em;
-  background: #005;
-  color: #FFF;
-  font-weight: bold;
-  border: 1px dotted black;
-}
-
-.attr-rw {
-  padding-left: 1em;
-  padding-right: 1em;
-  text-align: center;
-  color: #055;
-}
-
-.attr-name {
-  font-weight: bold;
-}
-
-.attr-desc {
-}
-
-.attr-value {
-  font-family: monospace;
-}
-
-.file-title-prefix {
-  font-size: large;
-}
-
-.file-title {
-  font-size: large;
-  font-weight: bold;
-  background: #005;
-  color: #FFF;
-}
-
-.banner {
-  background: #005;
-  color: #FFF;
-  border: 1px solid black;
-  padding: 1em;
-}
-
-.banner td {
-  background: transparent;
-  color: #FFF;
-}
-
-h1 a, h2 a, .sectiontitle a, .banner a {
-  color: #FF0;
-}
-
-h1 a:hover, h2 a:hover, .sectiontitle a:hover, .banner a:hover {
-  color: #FF7;
-}
-
-.dyn-source {
-  display: none;
-  background: #FFE;
-  color: #000;
-  border: 1px dotted black;
-  margin: 0.5em 2em 0.5em 2em;
-  padding: 0.5em;
-}
-
-.dyn-source .cmt {
-  color: #00F;
-  font-style: italic;
-}
-
-.dyn-source .kw {
-  color: #070;
-  font-weight: bold;
-}
-
-.method {
-  margin-left: 1em;
-  margin-right: 1em;
-  margin-bottom: 1em;
-}
-
-.description pre {
-  padding: 0.5em;
-  border: 1px dotted black;
-  background: #FFE;
-}
-
-.method .title {
-  font-family: monospace;
-  font-size: large;
-  border-bottom: 1px dashed black;
-  margin-bottom: 0.3em;
-  padding-bottom: 0.1em;
-}
-
-.method .description, .method .sourcecode {
-  margin-left: 1em;
-}
-
-.description p, .sourcecode p {
-  margin-bottom: 0.5em;
-}
-
-.method .sourcecode p.source-link {
-  text-indent: 0em;
-  margin-top: 0.5em;
-}
-
-.method .aka {
-  margin-top: 0.3em;
-  margin-left: 1em;
-  font-style: italic;
-  text-indent: 2em;
-}
-
-h1 {
-  padding: 1em;
-  border: 1px solid black;
-  font-size: x-large;
-  font-weight: bold;
-  color: #FFF;
-  background: #007;
-}
-
-h2 {
-  padding: 0.5em 1em 0.5em 1em;
-  border: 1px solid black;
-  font-size: large;
-  font-weight: bold;
-  color: #FFF;
-  background: #009;
-}
-
-h3, h4, h5, h6 {
-  padding: 0.2em 1em 0.2em 1em;
-  border: 1px dashed black;
-  color: #000;
-  background: #AAF;
-}
-
-.sourcecode > pre {
-  padding: 0.5em;
-  border: 1px dotted black;
-  background: #FFE;
-}
-
-CSS
-
-XHTML_PREAMBLE = %{<?xml version="1.0" encoding="%charset%"?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-}
-
-HEADER = XHTML_PREAMBLE + <<ENDHEADER
-<html>
-  <head>
-    <title>%title%</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
-    <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
-
-    <script language="JavaScript" type="text/javascript">
-    // <![CDATA[
-
-        function toggleSource( id )
-        {
-          var elem
-          var link
-
-          if( document.getElementById )
-          {
-            elem = document.getElementById( id )
-            link = document.getElementById( "l_" + id )
-          }
-          else if ( document.all )
-          {
-            elem = eval( "document.all." + id )
-            link = eval( "document.all.l_" + id )
-          }
-          else
-            return false;
-
-          if( elem.style.display == "block" )
-          {
-            elem.style.display = "none"
-            link.innerHTML = "show source"
-          }
-          else
-          {
-            elem.style.display = "block"
-            link.innerHTML = "hide source"
-          }
-        }
-
-        function openCode( url )
-        {
-          window.open( url, "SOURCE_CODE", "width=400,height=400,scrollbars=yes" )
-        }
-      // ]]>
-    </script>
-  </head>
-
-  <body>
-ENDHEADER
-
-FILE_PAGE = <<HTML
-<table border='0' cellpadding='0' cellspacing='0' width="100%" class='banner'>
-  <tr><td>
-    <table width="100%" border='0' cellpadding='0' cellspacing='0'><tr>
-      <td class="file-title" colspan="2"><span class="file-title-prefix">File</span><br />%short_name%</td>
-      <td align="right">
-        <table border='0' cellspacing="0" cellpadding="2">
-          <tr>
-            <td>Path:</td>
-            <td>%full_path%
-IF:cvsurl
-              &nbsp;(<a href="%cvsurl%">CVS</a>)
-ENDIF:cvsurl
-            </td>
-          </tr>
-          <tr>
-            <td>Modified:</td>
-            <td>%dtm_modified%</td>
-          </tr>
-        </table>
-      </td></tr>
-    </table>
-  </td></tr>
-</table><br>
-HTML
-
-###################################################################
-
-CLASS_PAGE = <<HTML
-<table width="100%" border='0' cellpadding='0' cellspacing='0' class='banner'><tr>
-  <td class="file-title"><span class="file-title-prefix">%classmod%</span><br />%full_name%</td>
-  <td align="right">
-    <table cellspacing=0 cellpadding=2>
-      <tr valign="top">
-        <td>In:</td>
-        <td>
-START:infiles
-HREF:full_path_url:full_path:
-IF:cvsurl
-&nbsp;(<a href="%cvsurl%">CVS</a>)
-ENDIF:cvsurl
-END:infiles
-        </td>
-      </tr>
-IF:parent
-    <tr>
-      <td>Parent:</td>
-      <td>
-IF:par_url
-        <a href="%par_url%">
-ENDIF:par_url
-%parent%
-IF:par_url
-         </a>
-ENDIF:par_url
-     </td>
-   </tr>
-ENDIF:parent
-         </table>
-        </td>
-        </tr>
-      </table>
-HTML
-
-###################################################################
-
-METHOD_LIST = <<HTML
-  <div id="content">
-IF:diagram
-  <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center">
-    %diagram%
-  </td></tr></table>
-ENDIF:diagram
-
-IF:description
-  <div class="description">%description%</div>
-ENDIF:description
-
-IF:requires
-  <div class="sectiontitle">Required Files</div>
-  <ul>
-START:requires
-  <li>HREF:aref:name:</li>
-END:requires
-  </ul>
-ENDIF:requires
-
-IF:toc
-  <div class="sectiontitle">Contents</div>
-  <ul>
-START:toc
-  <li><a href="#%href%">%secname%</a></li>
-END:toc
-  </ul>
-ENDIF:toc
-
-IF:methods
-  <div class="sectiontitle">Methods</div>
-  <ul>
-START:methods
-  <li>HREF:aref:name:</li>
-END:methods
-  </ul>
-ENDIF:methods
-
-IF:includes
-<div class="sectiontitle">Included Modules</div>
-<ul>
-START:includes
-  <li>HREF:aref:name:</li>
-END:includes
-</ul>
-ENDIF:includes
-
-START:sections
-IF:sectitle
-<div class="sectiontitle"><a nem="%secsequence%">%sectitle%</a></div>
-IF:seccomment
-<div class="description">
-%seccomment%
-</div>
-ENDIF:seccomment
-ENDIF:sectitle
-
-IF:classlist
-  <div class="sectiontitle">Classes and Modules</div>
-  %classlist%
-ENDIF:classlist
-
-IF:constants
-  <div class="sectiontitle">Constants</div>
-  <table border='0' cellpadding='5'>
-START:constants
-  <tr valign='top'>
-    <td class="attr-name">%name%</td>
-    <td>=</td>
-    <td class="attr-value">%value%</td>
-  </tr>
-IF:desc
-  <tr valign='top'>
-    <td>&nbsp;</td>
-    <td colspan="2" class="attr-desc">%desc%</td>
-  </tr>
-ENDIF:desc
-END:constants
-  </table>
-ENDIF:constants
-
-IF:attributes
-  <div class="sectiontitle">Attributes</div>
-  <table border='0' cellpadding='5'>
-START:attributes
-  <tr valign='top'>
-    <td class='attr-rw'>
-IF:rw
-[%rw%]
-ENDIF:rw
-    </td>
-    <td class='attr-name'>%name%</td>
-    <td class='attr-desc'>%a_desc%</td>
-  </tr>
-END:attributes
-  </table>
-ENDIF:attributes
-
-IF:method_list
-START:method_list
-IF:methods
-<div class="sectiontitle">%type% %category% methods</div>
-START:methods
-<div class="method">
-  <div class="title">
-IF:callseq
-    <a name="%aref%"></a><b>%callseq%</b>
-ENDIF:callseq
-IFNOT:callseq
-    <a name="%aref%"></a><b>%name%</b>%params%
-ENDIF:callseq
-IF:codeurl
-[ <a href="javascript:openCode('%codeurl%')">source</a> ]
-ENDIF:codeurl
-  </div>
-IF:m_desc
-  <div class="description">
-  %m_desc%
-  </div>
-ENDIF:m_desc
-IF:aka
-<div class="aka">
-  This method is also aliased as
-START:aka
-  <a href="%aref%">%name%</a>
-END:aka
-</div>
-ENDIF:aka
-IF:sourcecode
-<div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('%aref%_source')" id="l_%aref%_source">show source</a> ]</p>
-  <div id="%aref%_source" class="dyn-source">
-<pre>
-%sourcecode%
-</pre>
-  </div>
-</div>
-ENDIF:sourcecode
-</div>
-END:methods
-ENDIF:methods
-END:method_list
-ENDIF:method_list
-END:sections
-</div>
-HTML
-
-FOOTER = <<ENDFOOTER
-  </body>
-</html>
-ENDFOOTER
-
-BODY = HEADER + <<ENDBODY
-  !INCLUDE! <!-- banner header -->
-
-  <div id="bodyContent">
-    #{METHOD_LIST}
-  </div>
-
-  #{FOOTER}
-ENDBODY
-
-########################## Source code ##########################
-
-SRC_PAGE = XHTML_PREAMBLE + <<HTML
-<html>
-<head><title>%title%</title>
-<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-<style>
-.ruby-comment    { color: green; font-style: italic }
-.ruby-constant   { color: #4433aa; font-weight: bold; }
-.ruby-identifier { color: #222222;  }
-.ruby-ivar       { color: #2233dd; }
-.ruby-keyword    { color: #3333FF; font-weight: bold }
-.ruby-node       { color: #777777; }
-.ruby-operator   { color: #111111;  }
-.ruby-regexp     { color: #662222; }
-.ruby-value      { color: #662222; font-style: italic }
-  .kw { color: #3333FF; font-weight: bold }
-  .cmt { color: green; font-style: italic }
-  .str { color: #662222; font-style: italic }
-  .re  { color: #662222; }
-</style>
-</head>
-<body bgcolor="white">
-<pre>%code%</pre>
-</body>
-</html>
-HTML
-
-########################## Index ################################
-
-FR_INDEX_BODY = <<HTML
-!INCLUDE!
-HTML
-
-FILE_INDEX = XHTML_PREAMBLE + <<HTML
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-<style>
-<!--
-  body {
-    background-color: #EEE;
-    font-family: #{FONTS};
-    color: #000;
-    margin: 0px;
-  }
-  .banner {
-    background: #005;
-    color: #FFF;
-    padding: 0.2em;
-    font-size: small;
-    font-weight: bold;
-    text-align: center;
-  }
-  .entries {
-    margin: 0.25em 1em 0 1em;
-    font-size: x-small;
-  }
-  a {
-    color: #00F;
-    text-decoration: none;
-    white-space: nowrap;
-  }
-  a:hover {
-    color: #77F;
-    text-decoration: underline;
-  }
--->
-</style>
-<base target="docwin">
-</head>
-<body>
-<div class="banner">%list_title%</div>
-<div class="entries">
-START:entries
-<a href="%href%">%name%</a><br>
-END:entries
-</div>
-</body></html>
-HTML
-
-CLASS_INDEX = FILE_INDEX
-METHOD_INDEX = FILE_INDEX
-
-INDEX = XHTML_PREAMBLE + <<HTML
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>%title%</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
-</head>
-
-<frameset cols="20%,*">
-    <frameset rows="15%,35%,50%">
-        <frame src="fr_file_index.html"   title="Files" name="Files" />
-        <frame src="fr_class_index.html"  name="Classes" />
-        <frame src="fr_method_index.html" name="Methods" />
-    </frameset>
-IF:inline_source
-      <frame  src="%initial_page%" name="docwin">
-ENDIF:inline_source
-IFNOT:inline_source
-    <frameset rows="80%,20%">
-      <frame  src="%initial_page%" name="docwin">
-      <frame  src="blank.html" name="source">
-    </frameset>
-ENDIF:inline_source
-    <noframes>
-          <body bgcolor="white">
-            Click <a href="html/index.html">here</a> for a non-frames
-            version of this page.
-          </body>
-    </noframes>
-</frameset>
-
-</html>
-HTML
-
-end
-end
-
-
diff --git a/doc/rake/proto_rake.rdoc b/doc/rake/proto_rake.rdoc
deleted file mode 100644
index 39b9b88c1f..0000000000
--- a/doc/rake/proto_rake.rdoc
+++ /dev/null
@@ -1,127 +0,0 @@
-= Original Prototype Rake
-
-This is the original 100 line prototype rake program.
-
----
- #!/usr/bin/env ruby
- 
- require 'ftools'
- 
- class Task
-   TASKS = Hash.new
- 
-   attr_reader :prerequisites
- 
-   def initialize(task_name)
-     @name = task_name
-     @prerequisites = []
-     @actions = []
-   end
- 
-   def enhance(deps=nil, &block)
-     @prerequisites |= deps if deps
-     @actions << block if block_given?
-     self
-   end
- 
-   def name
-     @name.to_s
-   end
- 
-   def invoke
-     @prerequisites.each { |n| Task[n].invoke }
-     execute if needed?
-   end
- 
-   def execute
-     return if @triggered
-     @triggered = true
-     @actions.collect { |act| result = act.call(self) }.last
-   end
- 
-   def needed?
-     true
-   end
- 
-   def timestamp
-     Time.now
-   end
- 
-   class << self
-     def [](task_name)
-       TASKS[intern(task_name)] or fail "Don't know how to rake #{task_name}"
-     end
-     
-     def define_task(args, &block)
-       case args
-       when Hash
- 	fail "Too Many Target Names: #{args.keys.join(' ')}" if args.size > 1
- 	fail "No Task Name Given" if args.size < 1
- 	task_name = args.keys[0]
- 	deps = args[task_name]
-       else
- 	task_name = args
- 	deps = []
-       end
-       deps = deps.collect {|d| intern(d) }
-       get(task_name).enhance(deps, &block)
-     end
- 
-     def get(task_name)
-       name = intern(task_name)
-       TASKS[name] ||= self.new(name)
-     end
- 
-     def intern(task_name)
-       (Symbol === task_name) ? task_name : task_name.intern
-     end
-   end
- end
- 
- class FileTask < Task
-   def needed?
-     return true unless File.exist?(name)
-     latest_prereq = @prerequisites.collect{|n| Task[n].timestamp}.max
-     return false if latest_prereq.nil?
-     timestamp < latest_prereq
-   end
- 
-   def timestamp
-     File.new(name.to_s).mtime
-   end
- end
- 
- def task(args, &block)
-   Task.define_task(args, &block)
- end
- 
- def file(args, &block)
-   FileTask.define_task(args, &block)
- end
- 
- def sys(cmd)
-   puts cmd
-   system(cmd) or fail "Command Failed: [#{cmd}]"
- end
-   
- def rake
-   begin
-     here = Dir.pwd
-     while ! File.exist?("Rakefile")
-       Dir.chdir("..")
-       fail "No Rakefile found" if Dir.pwd == here
-       here = Dir.pwd
-     end
-     puts "(in #{Dir.pwd})"
-     load "./Rakefile"
-     ARGV.push("default") if ARGV.size == 0
-     ARGV.each { |task_name| Task[task_name].invoke }
-   rescue Exception => ex
-     puts "rake aborted ... #{ex.message}"
-     puts ex.backtrace.find {|str| str =~ /Rakefile/ } || ""
-   end    
- end
- 
- if __FILE__ == $0 then
-   rake
- end
diff --git a/doc/rake/rakefile.rdoc b/doc/rake/rakefile.rdoc
deleted file mode 100644
index f8ae72c32a..0000000000
--- a/doc/rake/rakefile.rdoc
+++ /dev/null
@@ -1,534 +0,0 @@
-= Rakefile Format (as of version 0.8.3)
-
-First of all, there is no special format for a Rakefile.  A Rakefile
-contains executable Ruby code.  Anything legal in a ruby script is
-allowed in a Rakefile.
-
-Now that we understand there is no special syntax in a Rakefile, there
-are some conventions that are used in a Rakefile that are a little
-unusual in a typical Ruby program.  Since a Rakefile is tailored to
-specifying tasks and actions, the idioms used in a Rakefile are
-designed to support that.
-
-So, what goes into a Rakefile?
-
-== Tasks
-
-Tasks are the main unit of work in a Rakefile.  Tasks have a name
-(usually given as a symbol or a string), a list of prerequisites (more
-symbols or strings) and a list of actions (given as a block).
-
-=== Simple Tasks
-
-A task is declared by using the +task+ method.  +task+ takes a single
-parameter that is the name of the task.
-
-  task :name
-
-=== Tasks with Prerequisites
-
-Any prerequisites are given as a list (inclosed in square brackets)
-following the name and an arrow (=>).
-
-  task :name => [:prereq1, :prereq2]
-
-<b>NOTE:</b> Although this syntax looks a little funky, it is legal
-Ruby.  We are constructing a hash where the key is :name and the value
-for that key is the list of prerequisites.  It is equivalent to the
-following ...
-
-  hash = Hash.new
-  hash[:name] = [:prereq1, :prereq2]
-  task(hash)
-
-=== Tasks with Actions
-
-Actions are defined by passing a block to the +task+ method.  Any Ruby
-code can be placed in the block.  The block may reference the task
-object via the block paramter..
-
-  task :name => [:prereq1, :prereq2] do |t|
-    # actions (may reference t)
-  end
-
-=== Multiple Definitions
-
-A task may be specified more than once.  Each specification adds its
-prerequisites and actions to the existing definition.  This allows one
-part of a rakefile to specify the actions and a different rakefile
-(perhaps separately generated) to specify the dependencies.
-
-For example, the following is equivalent to the single task
-specification given above.
-
-  task :name
-  task :name => [:prereq1]
-  task :name => [:prereq2]
-  task :name do |t|
-    # actions
-  end
-
-== File Tasks
-
-Some tasks are designed to create a file from one or more other files.
-Tasks that generate these files may be skipped if the file already
-exists.  File tasks are used to specify file creation tasks.
-
-File tasks are declared using the +file+ method (instead of the +task+
-method).  In addition, file tasks are usually named with a string
-rather than a symbol.
-
-The following file task creates a executable program (named +prog+)
-given two object files name <tt>a.o</tt> and <tt>b.o</tt>.  The tasks
-for creating <tt>a.o</tt> and <tt>b.o</tt> are not shown.
-
-  file "prog" => ["a.o", "b.o"] do |t|
-    sh "cc -o #{t.name} #{t.prerequisites.join(' ')}"
-  end
-
-== Directory Tasks
-
-It is common to need to create directories upon demand.  The
-+directory+ convenience method is a short-hand for creating a FileTask
-that creates the directory.  For example, the following declaration
-...
-
-  directory "testdata/examples/doc"
-
-is equivalent to ...
-
-  file "testdata"              do |t| mkdir t.name end
-  file "testdata/examples"     do |t| mkdir t.name end
-  file "testdata/examples/doc" do |t| mkdir t.name end
-
-The +directory+ method does not accept prerequisites or actions, but
-both prerequisites and actions can be added later.  For example ...
-
-  directory "testdata"
-  file "testdata" => ["otherdata"]
-  file "testdata" do
-    cp Dir["standard_data/*.data"], "testdata"
-  end
-
-== Tasks with Parallel Prerequisites
-
-Rake allows parallel execution of prerequisites using the following syntax:
-
-  multitask :copy_files => [:copy_src, :copy_doc, :copy_bin] do
-    puts "All Copies Complete"
-  end
-
-In this example, +copy_files+ is a normal rake task.  Its actions are
-executed whereever all of its prerequisites are done.  The big
-difference is that the prerequisites (+copy_src+, +copy_bin+ and
-+copy_doc+) are executed in parallel.  Each of the prerequisites are
-run in their own Ruby thread, possibly allowing faster overall runtime.
-
-=== Secondary Prerequisites
-
-If any of the primary prerequites of a multitask have common secondary
-prerequisites, all of the primary/parallel prerequisites will wait
-until the common prerequisites have been run.
-
-For example, if the <tt>copy_<em>xxx</em></tt> tasks have the
-following prerequisites:
-
-  task :copy_src => [:prep_for_copy]
-  task :copy_bin => [:prep_for_copy]
-  task :copy_doc => [:prep_for_copy]
-
-Then the +prep_for_copy+ task is run before starting all the copies in
-parallel.  Once +prep_for_copy+ is complete, +copy_src+, +copy_bin+,
-and +copy_doc+ are all run in parallel.  Note that +prep_for_copy+ is
-run only once, even though it is referenced in multiple threads.
-
-=== Thread Safety
-
-The Rake internal data structures are thread-safe with respect
-to the multitask parallel execution, so there is no need for the user
-to do extra synchronization for Rake's benefit.  However, if there are
-user data structures shared between the parallel prerequisites, the
-user must do whatever is necessary to prevent race conditions.
-
-== Tasks with Arguments
-
-Prior to version 0.8.0, rake was only able to handle command line
-arguments of the form NAME=VALUE that were passed into Rake via the
-ENV hash.  Many folks had asked for some kind of simple command line
-arguments, perhaps using "--" to separate regular task names from
-argument values on the command line.  The problem is that there was no
-easy way to associate positional arguments on the command line with
-different tasks.  Suppose both tasks :a and :b expect a command line
-argument: does the first value go with :a?  What if :b is run first?
-Should it then get the first command line argument.
-
-Rake 0.8.0 solves this problem by explicitly passing values directly
-to the tasks that need them.  For example, if I had a release task
-that required a version number, I could say:
-
-   rake release[0.8.2]
-
-And the string "0.8.2" will be passed to the :release task.  Multiple
-arguments can be passed by separating them with a comma, for example:
-
-   rake name[john,doe]
-
-Just a few words of caution.  The rake task name and its arguments
-need to be a single command line argument to rake.  This generally
-means no spaces.  If spaces are needed, then the entire rake +
-argument string should be quoted.  Something like this:
-
-   rake "name[billy bob, smith]"
-
-(Quoting rules vary between operating systems and shells, so make sure
-you consult the proper docs for your OS/shell).
-
-=== Tasks that Expect Parameters
-
-Parameters are only given to tasks that are setup to expect them.  In
-order to handle named parameters, the task declaration syntax for
-tasks has been extended slightly.
-
-For example, a task that needs a first name and last name might be
-declared as:
-
-   task :name, [:first_name, :last_name]
-
-The first argument is still the name of the task (:name in this case).
-The next to argumements are the names of the parameters expected by
-:name in an array (:first_name and :last_name in the example).
-
-To access the values of the paramters, the block defining the task
-behaviour can now accept a second parameter:
-
-   task :name, [:first_name, :last_name] do |t, args|
-     puts "First name is #{args.first_name}"
-     puts "Last  name is #{args.last_name}"
-   end
-
-The first argument of the block "t" is always bound to the current
-task object.  The second argument "args" is an open-struct like object
-that allows access to the task arguments.  Extra command line
-arguments to a task are ignored.  Missing command line arguments are
-given the nil value.
-
-If you wish to specify default values for the arguments, you can use
-the with_defaults method in the task body.  Here is the above example
-where we specify default values for the first and last names:
-
-   task :name, [:first_name, :last_name] do |t, args|
-     args.with_defaults(:first_name => "John", :last_name => "Dough")
-     puts "First name is #{args.first_name}"
-     puts "Last  name is #{args.last_name}"
-   end
-
-=== Tasks that Expect Parameters and Have Prerequisites
-
-Tasks that use parameters have a slightly different format for
-prerequisites.  Use the arrow notation to indicate the prerequisites
-for tasks with arguments.  For example:
-
-   task :name, [:first_name, :last_name] => [:pre_name] do |t, args|
-     args.with_defaults(:first_name => "John", :last_name => "Dough")
-     puts "First name is #{args.first_name}"
-     puts "Last  name is #{args.last_name}"
-   end
-
-=== Deprecated Task Parameters Format
-
-There is an older format for declaring task parameters that omitted
-the task argument array and used the :needs keyword to introduce the
-dependencies.  That format is still supported for compatibility, but
-is not recommended for use.
-
-== Accessing Task Programatically
-
-Sometimes it is useful to manipulate tasks programatically in a
-Rakefile. To find a task object, use the <tt>:[]</tt> operator on the
-<tt>Rake::Task</tt>.
-
-=== Programmatic Task Example
-
-For example, the following Rakefile defines two tasks.  The :doit task
-simply prints a simple "DONE" message.  The :dont class will lookup
-the doit class and remove (clear) all of its prerequisites and
-actions.
-
-   task :doit do
-     puts "DONE"
-   end
-
-   task :dont do
-     Rake::Task[:doit].clear
-   end        
-
-Running this example:
-
-  $ rake doit
-  (in /Users/jim/working/git/rake/x)
-  DONE
-  $ rake dont doit
-  (in /Users/jim/working/git/rake/x)
-  $ 
-
-The ability to programmatically manipulate tasks gives rake very
-powerful meta-programming capabilities w.r.t. task execution, but
-should be used with cation.
-
-== Rules
-
-When a file is named as a prerequisite, but does not have a file task
-defined for it, Rake will attempt to synthesize a task by looking at a
-list of rules supplied in the Rakefile.
-
-Suppose we were trying to invoke task "mycode.o", but no task is
-defined for it.  But the rakefile has a rule that look like this ...
-
-  rule '.o' => ['.c'] do |t|
-    sh "cc #{t.source} -c -o #{t.name}"
-  end
-
-This rule will synthesize any task that ends in ".o".  It has a
-prerequisite a source file with an extension of ".c" must exist.  If
-Rake is able to find a file named "mycode.c", it will automatically
-create a task that builds "mycode.o" from "mycode.c".
-
-If the file "mycode.c" does not exist, rake will attempt
-to recursively synthesize a rule for it. 
-
-When a task is synthesized from a rule, the +source+ attribute of the
-task is set to the matching source file.  This allows us to write
-rules with actions that reference the source file.
-
-=== Advanced Rules
-
-Any regular expression may be used as the rule pattern.  Additionally,
-a proc may be used to calculate the name of the source file.  This
-allows for complex patterns and sources.
-
-The following rule is equivalent to the example above.
-
-  rule( /\.o$/ => [
-    proc {|task_name| task_name.sub(/\.[^.]+$/, '.c') }
-  ]) do |t|
-    sh "cc #{t.source} -c -o #{t.name}"
-  end    
-
-<b>NOTE:</b> Because of a _quirk_ in Ruby syntax, parenthesis are
-required on *rule* when the first argument is a regular expression.
-
-The following rule might be used for Java files ...
-
-  rule '.java' => [
-    proc { |tn| tn.sub(/\.class$/, '.java').sub(/^classes\//, 'src/') }
-  ] do |t|
-    java_compile(t.source, t.name)  
-  end
-
-<b>NOTE:</b> +java_compile+ is a hypothetical method that invokes the
-java compiler.
-
-== Importing Dependencies
-
-Any ruby file (including other rakefiles) can be included with a
-standard Ruby +require+ command.  The rules and declarations in the
-required file are just added to the definitions already accumulated.
-
-Because the files are loaded _before_ the rake targets are evaluated,
-the loaded files must be "ready to go" when the rake command is
-invoked.  This make generated dependency files difficult to use.  By
-the time rake gets around to updating the dependencies file, it is too
-late to load it.
-
-The +import+ command addresses this by specifying a file to be loaded
-_after_ the main rakefile is loaded, but _before_ any targets on the
-command line are specified.  In addition, if the file name matches an
-explicit task, that task is invoked before loading the file.  This
-allows dependency files to be generated and used in a single rake
-command invocation.
-
-=== Example:
-
-  require 'rake/loaders/makefile'
-
-  file ".depends.mf" => [SRC_LIST] do |t|
-    sh "makedepend -f- -- #{CFLAGS} -- #{t.prerequisites} > #{t.name}"
-  end
-
-  import ".depends.mf"
-
-If ".depends" does not exist, or is out of date w.r.t. the source
-files, a new ".depends" file is generated using +makedepend+ before
-loading.
-
-== Comments
-
-Standard Ruby comments (beginning with "#") can be used anywhere it is
-legal in Ruby source code, including comments for tasks and rules.
-However, if you wish a task to be described using the "-T" switch,
-then you need to use the +desc+ command to describe the task.
-
-=== Example:
-
-  desc "Create a distribution package"
-  task :package => [ ... ] do ... end
-
-The "-T" switch (or "--tasks" if you like to spell things out) will
-display a list of tasks that have a defined comment.  If you use
-+desc+ to describe your major tasks, you have a semi-automatic way of
-generating a summary of your Rake file.
-
-  traken$ rake -T
-  (in /home/.../rake)
-  rake clean            # Remove any temporary products.
-  rake clobber          # Remove any generated file.
-  rake clobber_rdoc     # Remove rdoc products
-  rake contrib_test     # Run tests for contrib_test
-  rake default          # Default Task
-  rake install          # Install the application
-  rake lines            # Count lines in the main rake file
-  rake rdoc             # Build the rdoc HTML Files
-  rake rerdoc           # Force a rebuild of the RDOC files
-  rake test             # Run tests
-  rake testall          # Run all test targets
-
-Only tasks with descriptions will be displayed with the "-T" switch.
-Use "-P" (or "--prereqs") to get a list of all tasks and their
-prerequisites.
-
-== Namespaces
-
-As projects grow (and along with it, the number of tasks), it is
-common for task names to begin to clash.  For example, if you might
-have a main program and a set of sample programs built by a single
-Rakefile.  By placing the tasks related to the main program in one
-namespace, and the tasks for building the sample programs in a
-different namespace, the task names will not will not interfer with
-each other.
-
-For example:
-
-  namespace "main"
-    task :build do
-      # Build the main program
-    end
-  end
-
-  namespace "samples" do
-    task :build do
-      # Build the sample programs
-    end
-  end
-
-  task :build => ["main:build", "samples:build"]
-
-Referencing a task in a separate namespace can be achieved by
-prefixing the task name with the namespace and a colon
-(e.g. "main:build" refers to the :build task in the +main+ namespace).
-Nested namespaces are supported, so
-
-Note that the name given in the +task+ command is always the unadorned
-task name without any namespace prefixes.  The +task+ command always
-defines a task in the current namespace.  
-
-=== FileTasks
-
-File task names are not scoped by the namespace command.  Since the
-name of a file task is the name of an actual file in the file system,
-it makes little sense to include file task names in name space.
-Directory tasks (created by the +directory+ command) are a type of
-file task and are also not affected by namespaces.
-
-=== Name Resolution
-
-When looking up a task name, rake will start with the current
-namespace and attempt to find the name there.  If it fails to find a
-name in the current namespace, it will search the parent namespaces
-until a match is found (or an error occurs if there is no match).
-
-The "rake" namespace is a special implicit namespace that refers to
-the toplevel names.
-
-If a task name begins with a "^" character, the name resolution will
-start in the parent namespace.  Multiple "^" characters are allowed.
-
-Here is an example file with multiple :run tasks and how various names
-resolve in different locations.
-
-  task :run
-
-  namespace "one" do
-    task :run
-
-    namespace "two" do
-      task :run
-
-      # :run            => "one:two:run"
-      # "two:run"       => "one:two:run"
-      # "one:two:run"   => "one:two:run"
-      # "one:run"       => "one:run"
-      # "^run"          => "one:run"
-      # "^^run"         => "rake:run" (the top level task)
-      # "rake:run"      => "rake:run" (the top level task)
-    end
-
-    # :run       => "one:run"
-    # "two:run"  => "one:two:run"
-    # "^run"     => "rake:run"
-  end
-
-  # :run           => "rake:run"
-  # "one:run"      => "one:run"
-  # "one:two:run"  => "one:two:run"
-
-== FileLists
-
-FileLists are the way Rake manages lists of files.  You can treat a
-FileList as an array of strings for the most part, but FileLists
-support some additional operations.
-
-=== Creating a FileList
-
-Creating a file list is easy.  Just give it the list of file names:
-
-   fl = FileList['file1.rb', file2.rb']
-
-Or give it a glob pattern:
-
-   fl = FileList['*.rb']
-
-== Odds and Ends
-
-=== do/end verses { }
-
-Blocks may be specified with either a +do+/+end+ pair, or with curly
-braces in Ruby.  We _strongly_ recommend using +do+/+end+ to specify the
-actions for tasks and rules.  Because the rakefile idiom tends to
-leave off parenthesis on the task/file/rule methods, unusual
-ambiguities can arise when using curly braces.
-
-For example, suppose that the method +object_files+ returns a list of
-object files in a project.  Now we use +object_files+ as the
-prerequistes in a rule specified with actions in curly braces.
-
-  # DON'T DO THIS!
-  file "prog" => object_files {
-    # Actions are expected here (but it doesn't work)!
-  }
-
-Because curly braces have a higher precedence than +do+/+end+, the
-block is associated with the +object_files+ method rather than the
-+file+ method.
-
-This is the proper way to specify the task ...
-
-  # THIS IS FINE
-  file "prog" => object_files do
-    # Actions go here
-  end
-
-----
-
-== See
-
-* README -- Main documentation for Rake.
diff --git a/doc/rake/rational.rdoc b/doc/rake/rational.rdoc
deleted file mode 100644
index f741e65bf8..0000000000
--- a/doc/rake/rational.rdoc
+++ /dev/null
@@ -1,151 +0,0 @@
-= Why rake?
-
-Ok, let me state from the beginning that I never intended to write this
-code.  I'm not convinced it is useful, and I'm not convinced anyone
-would even be interested in it.  All I can say is that Why's onion truck
-must by been passing through the Ohio valley.
-
-What am I talking about? ... A Ruby version of Make.
-
-See, I can sense you cringing already, and I agree.  The world certainly
-doesn't need yet another reworking of the "make" program.  I mean, we
-already have "ant".  Isn't that enough?
-
-It started yesterday.  I was helping a coworker fix a problem in one of
-the Makefiles we use in our project.  Not a particularly tough problem,
-but during the course of the conversation I began lamenting some of the
-shortcomings of make.  In particular, in one of my makefiles I wanted to
-determine the name of a file dynamically and had to resort to some
-simple scripting (in Ruby) to make it work.  "Wouldn't it be nice if you
-could just use Ruby inside a Makefile" I said.
-
-My coworker (a recent convert to Ruby) agreed, but wondered what it
-would look like.  So I sketched the following on the whiteboard...
-
-    "What if you could specify the make tasks in Ruby, like this ..."
-
-      task "build" do
-        java_compile(...args, etc ...)
-      end
-
-    "The task function would register "build" as a target to be made,
-    and the block would be the action executed whenever the build
-    system determined that it was time to do the build target."
-
-We agreed that would be cool, but writing make from scratch would be WAY
-too much work.  And that was the end of that!
-
-... Except I couldn't get the thought out of my head.  What exactly
-would be needed to make the about syntax work as a make file?  Hmmm, you
-would need to register the tasks, you need some way of specifying
-dependencies between tasks, and some way of kicking off the process. 
-Hey!  What if we did ... and fifteen minutes later I had a working
-prototype of Ruby make, complete with dependencies and actions.
-
-I showed the code to my coworker and we had a good laugh.  It was just
-about a page worth of code that reproduced an amazing amount of the
-functionality of make.  We were both truely stunned with the power of
-Ruby.
-
-But it didn't do everything make did.  In particular, it didn't have
-timestamp based file dependencies (where a file is rebuilt if any of its
-prerequisite files have a later timestamp).  Obviously THAT would be a
-pain to add and so Ruby Make would remain an interesting experiment.
-
-... Except as I walked back to my desk, I started thinking about what
-file based dependecies would really need.  Rats!  I was hooked again,
-and by adding a new class and two new methods, file/timestamp
-dependencies were implemented.
-
-Ok, now I was really hooked.  Last night (during CSI!) I massaged the
-code and cleaned it up a bit.  The result is a bare-bones replacement
-for make in exactly 100 lines of code.
-
-For the curious, you can see it at ...
-* doc/proto_rake.rdoc
-
-Oh, about the name.  When I wrote the example Ruby Make task on my
-whiteboard, my coworker exclaimed "Oh! I have the perfect name: Rake ...
-Get it?  Ruby-Make. Rake!"  He said he envisioned the tasks as leaves
-and Rake would clean them up  ... or something like that.  Anyways, the
-name stuck.
-
-Some quick examples ...
-
-A simple task to delete backup files ...
-
-   task :clean do
-     Dir['*~'].each {|fn| rm fn rescue nil}
-   end
-
-Note that task names are symbols (they are slightly easier to type
-than quoted strings ... but you may use quoted string if you would
-rather). Rake makes the methods of the FileUtils module directly
-available, so we take advantage of the <tt>rm</tt> command.  Also note
-the use of "rescue nil" to trap and ignore errors in the <tt>rm</tt>
-command.
-
-To run it, just type "rake clean".  Rake will automatically find a
-Rakefile in the current directory (or above!) and will invoke the
-targets named on the command line.  If there are no targets explicitly
-named, rake will invoke the task "default".
-
-Here's another task with dependencies ...
-
-   task :clobber => [:clean] do
-     rm_r "tempdir"
-   end
-
-Task :clobber depends upon task :clean, so :clean will be run before
-:clobber is executed. 
-
-Files are specified by using the "file" command.  It is similar to the
-task command, except that the task name represents a file, and the task
-will be run only if the file doesn't exist, or if its modification time
-is earlier than any of its prerequisites.
-
-Here is a file based dependency that will compile "hello.cc" to
-"hello.o".
-
-   file "hello.cc"
-   file "hello.o" => ["hello.cc"] do |t|
-     srcfile = t.name.sub(/\.o$/, ".cc")
-     sh %{g++ #{srcfile} -c -o #{t.name}}
-   end
-
-I normally specify file tasks with string (rather than symbols).  Some
-file names can't be represented by symbols.  Plus it makes the
-distinction between them more clear to the casual reader.  
-
-Currently writing a task for each and every file in the project would be
-tedious at best.  I envision a set of libraries to make this job
-easier.  For instance, perhaps something like this ...
-
-   require 'rake/ctools'
-   Dir['*.c'].each do |fn|
-     c_source_file(fn)
-   end
-
-where "c_source_file" will create all the tasks need to compile all the
-C source files in a directory.  Any number of useful libraries could be
-created for rake.
-
-That's it.  There's no documentation (other than whats in this
-message).  Does this sound interesting to anyone?  If so, I'll continue
-to clean it up and write it up and publish it on RAA.  Otherwise, I'll
-leave it as an interesting excerise and a tribute to the power of Ruby.
-
-Why /might/ rake be interesting to Ruby programmers.  I don't know,
-perhaps ...
-
-* No weird make syntax (only weird Ruby syntax :-)
-* No need to edit or read XML (a la ant)
-* Platform independent build scripts.
-* Will run anywhere Ruby exists, so no need to have "make" installed.
-  If you stay away from the "sys" command and use things like
-  'ftools', you can have a perfectly platform independent
-  build script.  Also rake is only 100 lines of code, so it can
-  easily be packaged along with the rest of your code.
-
-So ... Sorry for the long rambling message.  Like I said, I never
-intended to write this code at all.
diff --git a/doc/rake/release_notes/rake-0.8.7.rdoc b/doc/rake/release_notes/rake-0.8.7.rdoc
deleted file mode 100644
index fb0c5d4e36..0000000000
--- a/doc/rake/release_notes/rake-0.8.7.rdoc
+++ /dev/null
@@ -1,55 +0,0 @@
-= Rake 0.8.7 Released
-
-Rake version 0.8.5 introduced greatly improved support for executing
-commands on Windows.  The "sh" command now has the same semantics on
-Windows that it has on Unix based platforms.
-
-Rake version 0.8.6 includes minor fixes the the RDoc generation.
-Rake version 0.8.7 includes a minor fix for JRuby running on windows.
-
-== Changes
-
-=== New Features / Enhancements in Version 0.8.5
-
-* Improved implementation of the Rake system command for Windows.
-  (patch from James M. Lawrence/quix)
-
-* Support for Ruby 1.9's improved system command.  (patch from James
-  M. Lawrence/quix)
-
-* Rake now includes the configured extension when invoking an
-  executable (Config::CONFIG['EXEEXT])
-
-=== Bug Fixes in Version 0.8.5
-
-* Environment variable keys are now correctly cased (it matters in
-  some implementations).
-
-== What is Rake
-
-Rake is a build tool similar to the make program in many ways. But
-instead of cryptic make recipes, Rake uses standard Ruby code to
-declare tasks and dependencies. You have the full power of a modern
-scripting language built right into your build tool.
-
-== Availability
-
-The easiest way to get and install rake is via RubyGems ...
-
-  gem install rake    (you may need root/admin privileges)
-
-Otherwise, you can get it from the more traditional places:
-
-Home Page:: http://rake.rubyforge.org/
-Download::  http://rubyforge.org/project/showfiles.php?group_id=50
-GitHub::    git://github.com/jimweirich/rake.git 
-
-== Thanks
-
-As usual, it was input from users that drove a alot of these changes. The
-following people either contributed patches, made suggestions or made
-otherwise helpful comments.  Thanks to ...
-
-* Charles Nutter
-
--- Jim Weirich
diff --git a/doc/re.rdoc b/doc/re.rdoc
deleted file mode 100644
index 0dfd8e5164..0000000000
--- a/doc/re.rdoc
+++ /dev/null
@@ -1,582 +0,0 @@
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-Regular expressions (<i>regexp</i>s) are patterns which describe the
-contents of a string. They're used for testing whether a string contains a
-given pattern, or extracting the portions that match. They are created
-with the <tt>/</tt><i>pat</i><tt>/</tt> and
-<tt>%r{</tt><i>pat</i><tt>}</tt> literals or the <tt>Regexp.new</tt>
-constructor.
-
-A regexp is usually delimited with forward slashes (<tt>/</tt>). For
-example:
-
-    /hay/ =~ 'haystack'   #=> 0
-    /y/.match('haystack') #=> #<MatchData "y">
-
-If a string contains the pattern it is said to <i>match</i>. A literal
-string matches itself.
-
-    # 'haystack' does not contain the pattern 'needle', so doesn't match.
-    /needle/.match('haystack') #=> nil
-    # 'haystack' does contain the pattern 'hay', so it matches
-    /hay/.match('haystack')    #=> #<MatchData "hay">
-
-Specifically, <tt>/st/</tt> requires that the string contains the letter
-_s_ followed by the letter _t_, so it matches _haystack_, also.
-
-== Metacharacters and Escapes
-
-The following are <i>metacharacters</i> <tt>(</tt>, <tt>)</tt>,
-<tt>[</tt>, <tt>]</tt>, <tt>{</tt>, <tt>}</tt>, <tt>.</tt>, <tt>?</tt>,
-<tt>+</tt>, <tt>*</tt>. They have a specific meaning when appearing in a
-pattern. To match them literally they must be backslash-escaped. To match
-a backslash literally backslash-escape that: <tt>\\\\\\</tt>.
-
-    /1 \+ 2 = 3\?/.match('Does 1 + 2 = 3?') #=> #<MatchData "1 + 2 = 3?">
-
-Patterns behave like double-quoted strings so can contain the same
-backslash escapes.
-
-    /\s\u{6771 4eac 90fd}/.match("Go to 東京都")
-        #=> #<MatchData " 東京都">
-
-Arbitrary Ruby expressions can be embedded into patterns with the
-<tt>#{...}</tt> construct.
-
-    place = "東京都"
-    /#{place}/.match("Go to 東京都")
-        #=> #<MatchData "東京都">
-
-== Character Classes
-
-A <i>character class</i> is delimited with square brackets (<tt>[</tt>,
-<tt>]</tt>) and lists characters that may appear at that point in the
-match. <tt>/[ab]/</tt> means _a_ or _b_, as opposed to <tt>/ab/</tt> which
-means _a_ followed by _b_.
-
-    /W[aeiou]rd/.match("Word") #=> #<MatchData "Word">
-
-Within a character class the hyphen (<tt>-</tt>) is a metacharacter
-denoting an inclusive range of characters. <tt>[abcd]</tt> is equivalent
-to <tt>[a-d]</tt>. A range can be followed by another range, so
-<tt>[abcdwxyz]</tt> is equivalent to <tt>[a-dw-z]</tt>. The order in which
-ranges or individual characters appear inside a character class is
-irrelevant.
-
-    /[0-9a-f]/.match('9f') #=> #<MatchData "9">
-    /[9f]/.match('9f')     #=> #<MatchData "9">
-
-If the first character of a character class is a caret (<tt>^</tt>) the
-class is inverted: it matches any character _except_ those named.
-
-    /[^a-eg-z]/.match('f') #=> #<MatchData "f">
-
-A character class may contain another character class. By itself this
-isn't useful because <tt>[a-z[0-9]]</tt> describes the same set as
-<tt>[a-z0-9]</tt>. However, character classes also support the <tt>&&</tt>
-operator which performs set intersection on its arguments. The two can be
-combined as follows:
-
-    /[a-w&&[^c-g]z]/ # ([a-w] AND ([^c-g] OR z))
-    # This is equivalent to:
-    /[abh-w]/
-
-The following metacharacters also behave like character classes:
-
-* <tt>/./</tt> - Any character except a newline.
-* <tt>/./m</tt> - Any character (the +m+ modifier enables multiline mode)
-* <tt>/\w/</tt> - A word character (<tt>[a-zA-Z0-9_]</tt>)
-* <tt>/\W/</tt> - A non-word character (<tt>[^a-zA-Z0-9_]</tt>)
-* <tt>/\d/</tt> - A digit character (<tt>[0-9]</tt>)
-* <tt>/\D/</tt> - A non-digit character (<tt>[^0-9]</tt>)
-* <tt>/\h/</tt> - A hexdigit character (<tt>[0-9a-fA-F]</tt>)
-* <tt>/\H/</tt> - A non-hexdigit character (<tt>[^0-9a-fA-F]</tt>)
-* <tt>/\s/</tt> - A whitespace character: <tt>/[ \t\r\n\f]/</tt>
-* <tt>/\S/</tt> - A non-whitespace character: <tt>/[^ \t\r\n\f]/</tt>
-
-POSIX <i>bracket expressions</i> are also similar to character classes.
-They provide a portable alternative to the above, with the added benefit
-that they encompass non-ASCII characters. For instance, <tt>/\d/</tt>
-matches only the ASCII decimal digits (0-9); whereas <tt>/[[:digit:]]/</tt>
-matches any character in the Unicode _Nd_ category.
-
-* <tt>/[[:alnum:]]/</tt> - Alphabetic and numeric character
-* <tt>/[[:alpha:]]/</tt> - Alphabetic character
-* <tt>/[[:blank:]]/</tt> - Space or tab
-* <tt>/[[:cntrl:]]/</tt> - Control character
-* <tt>/[[:digit:]]/</tt> - Digit
-* <tt>/[[:graph:]]/</tt> - Non-blank character (excludes spaces, control
-  characters, and similar)
-* <tt>/[[:lower:]]/</tt> - Lowercase alphabetical character
-* <tt>/[[:print:]]/</tt> - Like [:graph:], but includes the space character
-* <tt>/[[:punct:]]/</tt> - Punctuation character
-* <tt>/[[:space:]]/</tt> - Whitespace character (<tt>[:blank:]</tt>, newline,
-   carriage return, etc.)
-* <tt>/[[:upper:]]/</tt> - Uppercase alphabetical
-* <tt>/[[:xdigit:]]/</tt> - Digit allowed in a hexadecimal number (i.e.,
-  0-9a-fA-F)
-
-Ruby also supports the following non-POSIX character classes:
-
-* <tt>/[[:word:]]/</tt> - A character in one of the following Unicode
-  general categories _Letter_, _Mark_, _Number_,
-  <i>Connector_Punctuation<i/i>
-* <tt>/[[:ascii:]]/</tt> - A character in the ASCII character set
-
-    # U+06F2 is "EXTENDED ARABIC-INDIC DIGIT TWO"
-    /[[:digit:]]/.match("\u06F2")    #=> #<MatchData "\u{06F2}">
-    /[[:upper:]][[:lower:]]/.match("Hello") #=> #<MatchData "He">
-    /[[:xdigit:]][[:xdigit:]]/.match("A6")  #=> #<MatchData "A6">
-
-== Repetition
-
-The constructs described so far match a single character. They can be
-followed by a repetition metacharacter to specify how many times they need
-to occur. Such metacharacters are called <i>quantifiers</i>.
-
-* <tt>*</tt> - Zero or more times
-* <tt>+</tt> - One or more times
-* <tt>?</tt> - Zero or one times (optional)
-* <tt>{</tt><i>n</i><tt>}</tt> - Exactly <i>n</i> times
-* <tt>{</tt><i>n</i><tt>,}</tt> - <i>n</i> or more times
-* <tt>{,</tt><i>m</i><tt>}</tt> - <i>m</i> or less times
-* <tt>{</tt><i>n</i><tt>,</tt><i>m</i><tt>}</tt> - At least <i>n</i> and
-  at most <i>m</i> times
-
-    # At least one uppercase character ('H'), at least one lowercase
-    # character ('e'), two 'l' characters, then one 'o'
-    "Hello".match(/[[:upper:]]+[[:lower:]]+l{2}o/) #=> #<MatchData "Hello">
-
-Repetition is <i>greedy</i> by default: as many occurrences as possible
-are matched while still allowing the overall match to succeed. By
-contrast, <i>lazy</i> matching makes the minimal amount of matches
-necessary for overall success. A greedy metacharacter can be made lazy by
-following it with <tt>?</tt>.
-
-    # Both patterns below match the string. The fist uses a greedy
-    # quantifier so '.+' matches '<a><b>'; the second uses a lazy
-    # quantifier so '.+?' matches '<a>'.
-    /<.+>/.match("<a><b>")  #=> #<MatchData "<a><b>">
-    /<.+?>/.match("<a><b>") #=> #<MatchData "<a>">
-
-A quantifier followed by <tt>+</tt> matches <i>possessively</i>: once it
-has matched it does not backtrack. They behave like greedy quantifiers,
-but having matched they refuse to "give up" their match even if this
-jeopardises the overall match.
-
-== Capturing
-
-Parentheses can be used for <i>capturing</i>. The text enclosed by the
-<i>n</i><sup>th</sup> group of parentheses can be subsequently referred to
-with <i>n</i>. Within a pattern use the <i>backreference</i>
-<tt>\</tt><i>n</i>; outside of the pattern use
-<tt>MatchData[</tt><i>n</i><tt>]</tt>.
-
-    # 'at' is captured by the first group of parentheses, then referred to
-    # later with \1
-    /[csh](..) [csh]\1 in/.match("The cat sat in the hat")
-        #=> #<MatchData "cat sat in" 1:"at">
-    # Regexp#match returns a MatchData object which makes the captured
-    # text available with its #[] method.
-    /[csh](..) [csh]\1 in/.match("The cat sat in the hat")[1] #=> 'at'
-
-Capture groups can be referred to by name when defined with the
-<tt>(?<</tt><i>name</i><tt>>)</tt> or <tt>(?'</tt><i>name</i><tt>')</tt>
-constructs.
-
-    /\$(?<dollars>\d+)\.(?<cents>\d+)/.match("$3.67")
-        => #<MatchData "$3.67" dollars:"3" cents:"67">
-    /\$(?<dollars>\d+)\.(?<cents>\d+)/.match("$3.67")[:dollars] #=> "3"
-
-Named groups can be backreferenced with <tt>\k<</tt><i>name</i><tt>></tt>,
-where _name_ is the group name.
-
-    /(?<vowel>[aeiou]).\k<vowel>.\k<vowel>/.match('ototomy')
-        #=> #<MatchData "ototo" vowel:"o">
-
-*Note*: A regexp can't use named backreferences and numbered
-backreferences simultaneously.
-
-When named capture groups are used with a literal regexp on the left-hand
-side of an expression and the <tt>=~</tt> operator, the captured text is
-also assigned to local variables with corresponding names.
-
-    /\$(?<dollars>\d+)\.(?<cents>\d+)/ =~ "$3.67" #=> 0
-    dollars #=> "3"
-
-== Grouping
-
-Parentheses also <i>group</i> the terms they enclose, allowing them to be
-quantified as one <i>atomic</i> whole.
-
-    # The pattern below matches a vowel followed by 2 word characters:
-    # 'aen'
-    /[aeiou]\w{2}/.match("Caenorhabditis elegans") #=> #<MatchData "aen">
-    # Whereas the following pattern matches a vowel followed by a word
-    # character, twice, i.e. <tt>[aeiou]\w[aeiou]\w</tt>: 'enor'.
-    /([aeiou]\w){2}/.match("Caenorhabditis elegans")
-        #=> #<MatchData "enor" 1:"or">
-
-The <tt>(?:</tt>...<tt>)</tt> construct provides grouping without
-capturing. That is, it combines the terms it contains into an atomic whole
-without creating a backreference. This benefits performance at the slight
-expense of readabilty.
-
-    # The group of parentheses captures 'n' and the second 'ti'. The
-    # second group is referred to later with the backreference \2
-    /I(n)ves(ti)ga\2ons/.match("Investigations")
-        #=> #<MatchData "Investigations" 1:"n" 2:"ti">
-    # The first group of parentheses is now made non-capturing with '?:',
-    # so it still matches 'n', but doesn't create the backreference. Thus,
-    # the backreference \1 now refers to 'ti'.
-    /I(?:n)ves(ti)ga\1ons/.match("Investigations")
-        #=> #<MatchData "Investigations" 1:"ti">
-
-=== Atomic Grouping
-
-Grouping can be made <i>atomic</i> with
-<tt>(?></tt><i>pat</i><tt>)</tt>. This causes the subexpression <i>pat</i>
-to be matched independently of the rest of the expression such that what
-it matches becomes fixed for the remainder of the match, unless the entire
-subexpression must be abandoned and subsequently revisited. In this
-way <i>pat</i> is treated as a non-divisible whole. Atomic grouping is
-typically used to optimise patterns so as to prevent the regular
-expression engine from backtracking needlesly.
-
-    # The <tt>"</tt> in the pattern below matches the first character of
-    # the string, then <tt>.*</tt> matches <i>Quote"</i>. This causes the
-    # overall match to fail, so the text matched by <tt>.*</tt> is
-    # backtracked by one position, which leaves the final character of the
-    # string available to match <tt>"</tt>
-          /".*"/.match('"Quote"')     #=> #<MatchData "\"Quote\"">
-    # If <tt>.*</tt> is grouped atomically, it refuses to backtrack
-    # <i>Quote"</i>, even though this means that the overall match fails
-    /"(?>.*)"/.match('"Quote"') #=> nil
-
-== Subexpression Calls
-
-The <tt>\g<</tt><i>name</i><tt>></tt> syntax matches the previous
-subexpression named _name_, which can be a group name or number, again.
-This differs from backreferences in that it re-executes the group rather
-than simply trying to re-match the same text.
-
-    # Matches a <i>(</i> character and assigns it to the <tt>paren</tt>
-    # group, tries to call that the <tt>paren</tt> sub-expression again
-    # but fails, then matches a literal <i>)</i>.
-    /\A(?<paren>\(\g<paren>*\))*\z/ =~ '()'
-
-
-    /\A(?<paren>\(\g<paren>*\))*\z/ =~ '(())' #=> 0
-    # ^1
-    #      ^2
-    #           ^3
-    #                 ^4
-    #      ^5
-    #           ^6
-    #                      ^7
-    #                       ^8
-    #                       ^9
-    #                           ^10
-
-1.  Matches at the beginning of the string, i.e. before the first
-    character.
-2.  Enters a named capture group called <tt>paren</tt>
-3.  Matches a literal <i>(</i>, the first character in the string
-4.  Calls the <tt>paren</tt> group again, i.e. recurses back to the
-    second step
-5.  Re-enters the <tt>paren</tt> group
-6.  Matches a literal <i>(</i>, the second character in the
-    string
-7.  Try to call <tt>paren</tt> a third time, but fail because
-    doing so would prevent an overall successful match
-8.  Match a literal <i>)</i>, the third character in the string.
-    Marks the end of the second recursive call
-9.  Match a literal <i>)</i>, the fourth character in the string
-10. Match the end of the string
-
-== Alternation
-
-The vertical bar metacharacter (<tt>|</tt>) combines two expressions into
-a single one that matches either of the expressions. Each expression is an
-<i>alternative</i>.
-
-    /\w(and|or)\w/.match("Feliformia") #=> #<MatchData "form" 1:"or">
-    /\w(and|or)\w/.match("furandi")    #=> #<MatchData "randi" 1:"and">
-    /\w(and|or)\w/.match("dissemblance") #=> nil
-
-== Character Properties
-
-The <tt>\p{}</tt> construct matches characters with the named property,
-much like POSIX bracket classes.
-
-* <tt>/\p{Alnum}/</tt> - Alphabetic and numeric character
-* <tt>/\p{Alpha}/</tt> - Alphabetic character
-* <tt>/\p{Blank}/</tt> - Space or tab
-* <tt>/\p{Cntrl}/</tt> - Control character
-* <tt>/\p{Digit}/</tt> - Digit
-* <tt>/\p{Graph}/</tt> - Non-blank character (excludes spaces, control
-  characters, and similar)
-* <tt>/\p{Lower}/</tt> - Lowercase alphabetical character
-* <tt>/\p{Print}/</tt> - Like <tt>\p{Graph}</tt>, but includes the space character
-* <tt>/\p{Punct}/</tt> - Punctuation character
-* <tt>/\p{Space}/</tt> - Whitespace character (<tt>[:blank:]</tt>, newline,
-  carriage return, etc.)
-* <tt>/\p{Upper}/</tt> - Uppercase alphabetical
-* <tt>/\p{XDigit}/</tt> - Digit allowed in a hexadecimal number (i.e., 0-9a-fA-F)
-* <tt>/\p{Word}/</tt> - A member of one of the following Unicode general
-  category <i>Letter</i>, <i>Mark</i>, <i>Number</i>,
-  <i>Connector\_Punctuation</i>
-* <tt>/\p{ASCII}/</tt> - A character in the ASCII character set
-* <tt>/\p{Any}/</tt> - Any Unicode character (including unassigned
-  characters)
-* <tt>/\p{Assigned}/</tt> - An assigned character
-
-A Unicode character's <i>General Category</i> value can also be matched
-with <tt>\p{</tt><i>Ab</i><tt>}</tt> where <i>Ab</i> is the category's
-abbreviation as described below:
-
-* <tt>/\p{L}/</tt> - 'Letter'
-* <tt>/\p{Ll}/</tt> - 'Letter: Lowercase'
-* <tt>/\p{Lm}/</tt> - 'Letter: Mark'
-* <tt>/\p{Lo}/</tt> - 'Letter: Other'
-* <tt>/\p{Lt}/</tt> - 'Letter: Titlecase'
-* <tt>/\p{Lu}/</tt> - 'Letter: Uppercase
-* <tt>/\p{Lo}/</tt> - 'Letter: Other'
-* <tt>/\p{M}/</tt> - 'Mark'
-* <tt>/\p{Mn}/</tt> - 'Mark: Nonspacing'
-* <tt>/\p{Mc}/</tt> - 'Mark: Spacing Combining'
-* <tt>/\p{Me}/</tt> - 'Mark: Enclosing'
-* <tt>/\p{N}/</tt> - 'Number'
-* <tt>/\p{Nd}/</tt> - 'Number: Decimal Digit'
-* <tt>/\p{Nl}/</tt> - 'Number: Letter'
-* <tt>/\p{No}/</tt> - 'Number: Other'
-* <tt>/\p{P}/</tt> - 'Punctuation'
-* <tt>/\p{Pc}/</tt> - 'Punctuation: Connector'
-* <tt>/\p{Pd}/</tt> - 'Punctuation: Dash'
-* <tt>/\p{Ps}/</tt> - 'Punctuation: Open'
-* <tt>/\p{Pe}/</tt> - 'Punctuation: Close'
-* <tt>/\p{Pi}/</tt> - 'Punctuation: Initial Quote'
-* <tt>/\p{Pf}/</tt> - 'Punctuation: Final Quote'
-* <tt>/\p{Po}/</tt> - 'Punctuation: Other'
-* <tt>/\p{S}/</tt> - 'Symbol'
-* <tt>/\p{Sm}/</tt> - 'Symbol: Math'
-* <tt>/\p{Sc}/</tt> - 'Symbol: Currency'
-* <tt>/\p{Sc}/</tt> - 'Symbol: Currency'
-* <tt>/\p{Sk}/</tt> - 'Symbol: Modifier'
-* <tt>/\p{So}/</tt> - 'Symbol: Other'
-* <tt>/\p{Z}/</tt> - 'Separator'
-* <tt>/\p{Zs}/</tt> - 'Separator: Space'
-* <tt>/\p{Zl}/</tt> - 'Separator: Line'
-* <tt>/\p{Zp}/</tt> - 'Separator: Paragraph'
-* <tt>/\p{C}/</tt> - 'Other'
-* <tt>/\p{Cc}/</tt> - 'Other: Control'
-* <tt>/\p{Cf}/</tt> - 'Other: Format'
-* <tt>/\p{Cn}/</tt> - 'Other: Not Assigned'
-* <tt>/\p{Co}/</tt> - 'Other: Private Use'
-* <tt>/\p{Cs}/</tt> - 'Other: Surrogate'
-
-Lastly, <tt>\p{}</tt> matches a character's Unicode <i>script</i>. The
-following scripts are supported: <i>Arabic</i>, <i>Armenian</i>,
-<i>Balinese</i>, <i>Bengali</i>, <i>Bopomofo</i>, <i>Braille</i>,
-<i>Buginese</i>, <i>Buhid</i>, <i>Canadian_Aboriginal</i>, <i>Carian</i>,
-<i>Cham</i>, <i>Cherokee</i>, <i>Common</i>, <i>Coptic</i>,
-<i>Cuneiform</i>, <i>Cypriot</i>, <i>Cyrillic</i>, <i>Deseret</i>,
-<i>Devanagari</i>, <i>Ethiopic</i>, <i>Georgian</i>, <i>Glagolitic</i>,
-<i>Gothic</i>, <i>Greek</i>, <i>Gujarati</i>, <i>Gurmukhi</i>, <i>Han</i>,
-<i>Hangul</i>, <i>Hanunoo</i>, <i>Hebrew</i>, <i>Hiragana</i>,
-<i>Inherited</i>, <i>Kannada</i>, <i>Katakana</i>, <i>Kayah_Li</i>,
-<i>Kharoshthi</i>, <i>Khmer</i>, <i>Lao</i>, <i>Latin</i>, <i>Lepcha</i>,
-<i>Limbu</i>, <i>Linear_B</i>, <i>Lycian</i>, <i>Lydian</i>,
-<i>Malayalam</i>, <i>Mongolian</i>, <i>Myanmar</i>, <i>New_Tai_Lue</i>,
-<i>Nko</i>, <i>Ogham</i>, <i>Ol_Chiki</i>, <i>Old_Italic</i>,
-<i>Old_Persian</i>, <i>Oriya</i>, <i>Osmanya</i>, <i>Phags_Pa</i>,
-<i>Phoenician</i>, <i>Rejang</i>, <i>Runic</i>, <i>Saurashtra</i>,
-<i>Shavian</i>, <i>Sinhala</i>, <i>Sundanese</i>, <i>Syloti_Nagri</i>,
-<i>Syriac</i>, <i>Tagalog</i>, <i>Tagbanwa</i>, <i>Tai_Le</i>,
-<i>Tamil</i>, <i>Telugu</i>, <i>Thaana</i>, <i>Thai</i>, <i>Tibetan</i>,
-<i>Tifinagh</i>, <i>Ugaritic</i>, <i>Vai</i>, and <i>Yi</i>.
-
-    # Unicode codepoint U+06E9 is named "ARABIC PLACE OF SAJDAH" and
-    # belongs to the Arabic script.
-    /\p{Arabic}/.match("\u06E9") #=> #<MatchData "\u06E9">
-
-All character properties can be inverted by prefixing their name with a
-caret (<tt>^</tt>).
-
-    # Letter 'A' is not in the Unicode Ll (Letter; Lowercase) category, so
-    # this match succeeds
-    /\p{^Ll}/.match("A") #=> #<MatchData "A">
-
-== Anchors
-
-Anchors are metacharacter that match the zero-width positions between
-characters, <i>anchoring</i> the match to a specific position.
-
-* <tt>^</tt> - Matches beginning of line
-* <tt>$</tt> - Matches end of line
-* <tt>\A</tt> - Matches beginning of string.
-* <tt>\Z</tt> - Matches end of string. If string ends with a newline,
-  it matches just before newline
-* <tt>\z</tt> - Matches end of string
-* <tt>\G</tt> - Matches point where last match finished
-* <tt>\b</tt> - Matches word boundaries when outside brackets; backspace
-   (0x08) inside brackets
-* <tt>\B</tt> - Matches non-word boundaries
-* <tt>(?=</tt><i>pat</i><tt>)</tt> - <i>Positive lookahead</i> assertion:
-  ensures that the following characters match <i>pat</i>, but doesn't
-  include those characters in the matched text
-* <tt>(?!</tt><i>pat</i><tt>)</tt> - <i>Negative lookahead</i> assertion:
-  ensures that the following characters do not match <i>pat</i>, but
-  doesn't include those characters in the matched text
-* <tt>(?<=</tt><i>pat</i><tt>)</tt> - <i>Positive lookbehind</i>
-  assertion: ensures that the preceding characters match <i>pat</i>, but
-  doesn't include those characters in the matched text
-* <tt>(?<!</tt><i>pat</i><tt>)</tt> - <i>Negative lookbehind</i>
-  assertion: ensures that the preceding characters do not match
-  <i>pat</i>, but doesn't include those characters in the matched text
-
-    # If a pattern isn't anchored it can begin at any point in the string
-    /real/.match("surrealist") #=> #<MatchData "real">
-    # Anchoring the pattern to the beginning of the string forces the
-    # match to start there. 'real' doesn't occur at the beginning of the
-    # string, so now the match fails
-    /\Areal/.match("surrealist") #=> nil
-    # The match below fails because although 'Demand' contains 'and', the
-    pattern does not occur at a word boundary.
-    /\band/.match("Demand")
-    # Whereas in the following example 'and' has been anchored to a
-    # non-word boundary so instead of matching the first 'and' it matches
-    # from the fourth letter of 'demand' instead
-    /\Band.+/.match("Supply and demand curve") #=> #<MatchData "and curve">
-    # The pattern below uses positive lookahead and positive lookbehind to
-    # match text appearing in <b></b> tags without including the tags in the
-    # match
-    /(?<=<b>)\w+(?=<\/b>)/.match("Fortune favours the <b>bold</b>")
-        #=> #<MatchData "bold">
-
-== Options
-
-The end delimiter for a regexp can be followed by one or more single-letter
-options which control how the pattern can match.
-
-* <tt>/pat/i</tt> - Ignore case
-* <tt>/pat/m</tt> - Treat a newline as a character matched by <tt>.</tt>
-* <tt>/pat/x</tt> - Ignore whitespace and comments in the pattern
-* <tt>/pat/o</tt> - Perform <tt>#{}</tt> interpolation only once
-
-<tt>i</tt>, <tt>m</tt>, and <tt>x</tt> can also be applied on the
-subexpression level with the
-<tt>(?</tt><i>on</i><tt>-</tt><i>off</i><tt>)</tt> construct, which
-enables options <i>on</i>, and disables options <i>off</i> for the
-expression enclosed by the parentheses.
-
-    /a(?i:b)c/.match('aBc') #=> #<MatchData "aBc">
-    /a(?i:b)c/.match('abc') #=> #<MatchData "abc">
-
-== Free-Spacing Mode and Comments
-
-As mentioned above, the <tt>x</tt> option enables <i>free-spacing</i>
-mode. Literal white space inside the pattern is ignored, and the
-octothorpe (<tt>#</tt>) character introduces a comment until the end of
-the line. This allows the components of the pattern to be organised in a
-potentially more readable fashion.
-
-    # A contrived pattern to match a number with optional decimal places
-    float_pat = /\A
-        [[:digit:]]+ # 1 or more digits before the decimal point
-        (\.          # Decimal point
-            [[:digit:]]+ # 1 or more digits after the decimal point
-        )? # The decimal point and following digits are optional
-    \Z/x
-    float_pat.match('3.14') #=> #<MatchData "3.14" 1:".14">
-
-*Note*: To match whitespace in an <tt>x</tt> pattern use an escape such as
-<tt>\s</tt> or <tt>\p{Space}</tt>.
-
-Comments can be included in a non-<tt>x</tt> pattern with the
-<tt>(?#</tt><i>comment</i><tt>)</tt> construct, where <i>comment</i> is
-arbitrary text ignored by the regexp engine.
-
-== Encoding
-
-Regular expressions are assumed to use the source encoding. This can be
-overridden with one of the following modifiers.
-
-* <tt>/</tt><i>pat</i><tt>/u</tt> - UTF-8
-* <tt>/</tt><i>pat</i><tt>/e</tt> - EUC-JP
-* <tt>/</tt><i>pat</i><tt>/s</tt> - Windows-31J
-* <tt>/</tt><i>pat</i><tt>/n</tt> - ASCII-8BIT
-
-A regexp can be matched against a string when they either share an
-encoding, or the regexp's encoding is _US-ASCII_ and the string's encoding
-is ASCII-compatible.
-
-If a match between incompatible encodings is attempted an
-<tt>Encoding::CompatibilityError</tt> exception is raised.
-
-The <tt>Regexp#fixed_encoding?</tt> predicate indicates whether the regexp
-has a <i>fixed</i> encoding, that is one incompatible with ASCII. A
-regexp's encoding can be explicitly fixed by supplying
-<tt>Regexp::FIXEDENCODING</tt> as the second argument of
-<tt>Regexp.new</tt>:
-
-    r = Regexp.new("a".force_encoding("iso-8859-1"),Regexp::FIXEDENCODING)
-    r =~"a\u3042"
-       #=> Encoding::CompatibilityError: incompatible encoding regexp match
-            (ISO-8859-1 regexp with UTF-8 string)
-
-== Performance
-
-Certain pathological combinations of constructs can lead to abysmally bad
-performance.
-
-Consider a string of 25 <i>a</i>s, a <i>d</i>, 4 <i>a</i>s, and a
-<i>c</i>.
-
-    s = 'a' * 25 + 'd' 'a' * 4 + 'c'
-        #=> "aaaaaaaaaaaaaaaaaaaaaaaaadadadadac"
-
-The following patterns match instantly as you would expect:
-
-    /(b|a)/ =~ s #=> 0
-    /(b|a+)/ =~ s #=> 0
-    /(b|a+)*\/ =~ s #=> 0
-
-However, the following pattern takes appreciably longer:
-
-    /(b|a+)*c/ =~ s #=> 32
-
-This happens because an atom in the regexp is quantified by both an
-immediate <tt>+</tt> and an enclosing <tt>*</tt> with nothing to
-differentiate which is in control of any particular character. The
-nondeterminism that results produces super-linear performance. (Consult
-<i>Mastering Regular Expressions</i> (3rd ed.), pp 222, by
-<i>Jeffery Friedl</i>, for an in-depth analysis). This particular case
-can be fixed by use of atomic grouping, which prevents the unnecessary
-backtracking:
-
-    (start = Time.now) && /(b|a+)*c/ =~ s && (Time.now - start)
-       #=> 24.702736882
-    (start = Time.now) && /(?>b|a+)*c/ =~ s && (Time.now - start)
-       #=> 0.000166571
-
-A similar case is typified by the following example, which takes
-approximately 60 seconds to execute for me:
-
-    # Match a string of 29 <i>a</i>s against a pattern of 29 optional
-    # <i>a</i>s followed by 29 mandatory <i>a</i>s.
-    Regexp.new('a?' * 29 + 'a' * 29) =~ 'a' * 29
-
-The 29 optional <i>a</i>s match the string, but this prevents the 29
-mandatory <i>a</i>s that follow from matching. Ruby must then backtrack
-repeatedly so as to satisfy as many of the optional matches as it can
-while still matching the mandatory 29. It is plain to us that none of the
-optional matches can succeed, but this fact unfortunately eludes Ruby.
-
-One approach for improving performance is to anchor the match to the
-beginning of the string, thus significantly reducing the amount of
-backtracking needed.
-
-    Regexp.new('\A' 'a?' * 29 + 'a' * 29).match('a' * 29)
-        #=> #<MatchData "aaaaaaaaaaaaaaaaaaaaaaaaaaaaa">
-
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
new file mode 100644
index 0000000000..d84cae1771
--- /dev/null
+++ b/doc/regexp.rdoc
@@ -0,0 +1,724 @@
+# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
+
+Regular expressions (<i>regexp</i>s) are patterns which describe the
+contents of a string. They're used for testing whether a string contains a
+given pattern, or extracting the portions that match. They are created
+with the <tt>/</tt><i>pat</i><tt>/</tt> and
+<tt>%r{</tt><i>pat</i><tt>}</tt> literals or the <tt>Regexp.new</tt>
+constructor.
+
+A regexp is usually delimited with forward slashes (<tt>/</tt>). For
+example:
+
+    /hay/ =~ 'haystack'   #=> 0
+    /y/.match('haystack') #=> #<MatchData "y">
+
+If a string contains the pattern it is said to <i>match</i>. A literal
+string matches itself.
+
+Here 'haystack' does not contain the pattern 'needle', so it doesn't match:
+
+    /needle/.match('haystack') #=> nil
+
+Here 'haystack' contains the pattern 'hay', so it matches:
+
+    /hay/.match('haystack')    #=> #<MatchData "hay">
+
+Specifically, <tt>/st/</tt> requires that the string contains the letter
+_s_ followed by the letter _t_, so it matches _haystack_, also.
+
+== <tt>=~</tt> and Regexp#match
+
+Pattern matching may be achieved by using <tt>=~</tt> operator or Regexp#match
+method.
+
+=== <tt>=~</tt> operator
+
+<tt>=~</tt> is Ruby's basic pattern-matching operator.  When one operand is a
+regular expression and the other is a string then the regular expression is
+used as a pattern to match against the string.  (This operator is equivalently
+defined by Regexp and String so the order of String and Regexp do not matter.
+Other classes may have different implementations of <tt>=~</tt>.)  If a match
+is found, the operator returns index of first match in string, otherwise it
+returns +nil+.
+
+    /hay/ =~ 'haystack'   #=> 0
+    'haystack' =~ /hay/   #=> 0
+    /a/   =~ 'haystack'   #=> 1
+    /u/   =~ 'haystack'   #=> nil
+
+Using <tt>=~</tt> operator with a String and Regexp the <tt>$~</tt> global
+variable is set after a successful match.  <tt>$~</tt> holds a MatchData
+object. Regexp.last_match is equivalent to <tt>$~</tt>.
+
+=== Regexp#match method
+
+The #match method returns a MatchData object:
+
+    /st/.match('haystack')   #=> #<MatchData "st">
+
+== Metacharacters and Escapes
+
+The following are <i>metacharacters</i> <tt>(</tt>, <tt>)</tt>,
+<tt>[</tt>, <tt>]</tt>, <tt>{</tt>, <tt>}</tt>, <tt>.</tt>, <tt>?</tt>,
+<tt>+</tt>, <tt>*</tt>. They have a specific meaning when appearing in a
+pattern. To match them literally they must be backslash-escaped. To match
+a backslash literally, backslash-escape it: <tt>\\\\</tt>.
+
+    /1 \+ 2 = 3\?/.match('Does 1 + 2 = 3?') #=> #<MatchData "1 + 2 = 3?">
+    /a\\\\b/.match('a\\\\b')                    #=> #<MatchData "a\\b">
+
+Patterns behave like double-quoted strings and can contain the same
+backslash escapes (the meaning of <tt>\s</tt> is different, however,
+see below[#label-Character+Classes]).
+
+    /\s\u{6771 4eac 90fd}/.match("Go to 東京都")
+        #=> #<MatchData " 東京都">
+
+Arbitrary Ruby expressions can be embedded into patterns with the
+<tt>#{...}</tt> construct.
+
+    place = "東京都"
+    /#{place}/.match("Go to 東京都")
+        #=> #<MatchData "東京都">
+
+== Character Classes
+
+A <i>character class</i> is delimited with square brackets (<tt>[</tt>,
+<tt>]</tt>) and lists characters that may appear at that point in the
+match. <tt>/[ab]/</tt> means _a_ or _b_, as opposed to <tt>/ab/</tt> which
+means _a_ followed by _b_.
+
+    /W[aeiou]rd/.match("Word") #=> #<MatchData "Word">
+
+Within a character class the hyphen (<tt>-</tt>) is a metacharacter
+denoting an inclusive range of characters. <tt>[abcd]</tt> is equivalent
+to <tt>[a-d]</tt>. A range can be followed by another range, so
+<tt>[abcdwxyz]</tt> is equivalent to <tt>[a-dw-z]</tt>. The order in which
+ranges or individual characters appear inside a character class is
+irrelevant.
+
+    /[0-9a-f]/.match('9f') #=> #<MatchData "9">
+    /[9f]/.match('9f')     #=> #<MatchData "9">
+
+If the first character of a character class is a caret (<tt>^</tt>) the
+class is inverted: it matches any character _except_ those named.
+
+    /[^a-eg-z]/.match('f') #=> #<MatchData "f">
+
+A character class may contain another character class. By itself this
+isn't useful because <tt>[a-z[0-9]]</tt> describes the same set as
+<tt>[a-z0-9]</tt>. However, character classes also support the <tt>&&</tt>
+operator which performs set intersection on its arguments. The two can be
+combined as follows:
+
+    /[a-w&&[^c-g]z]/ # ([a-w] AND ([^c-g] OR z))
+
+This is equivalent to:
+
+    /[abh-w]/
+
+The following metacharacters also behave like character classes:
+
+* <tt>/./</tt> - Any character except a newline.
+* <tt>/./m</tt> - Any character (the +m+ modifier enables multiline mode)
+* <tt>/\w/</tt> - A word character (<tt>[a-zA-Z0-9_]</tt>)
+* <tt>/\W/</tt> - A non-word character (<tt>[^a-zA-Z0-9_]</tt>).
+  Please take a look at {Bug #4044}[https://bugs.ruby-lang.org/issues/4044] if
+  using <tt>/\W/</tt> with the <tt>/i</tt> modifier.
+* <tt>/\d/</tt> - A digit character (<tt>[0-9]</tt>)
+* <tt>/\D/</tt> - A non-digit character (<tt>[^0-9]</tt>)
+* <tt>/\h/</tt> - A hexdigit character (<tt>[0-9a-fA-F]</tt>)
+* <tt>/\H/</tt> - A non-hexdigit character (<tt>[^0-9a-fA-F]</tt>)
+* <tt>/\s/</tt> - A whitespace character: <tt>/[ \t\r\n\f\v]/</tt>
+* <tt>/\S/</tt> - A non-whitespace character: <tt>/[^ \t\r\n\f\v]/</tt>
+* <tt>/\R/</tt> - A linebreak: <tt>\n</tt>, <tt>\v</tt>, <tt>\f</tt>, <tt>\r</tt>
+  <tt>\u0085</tt> (NEXT LINE), <tt>\u2028</tt> (LINE SEPARATOR), <tt>\u2029</tt> (PARAGRAPH SEPARATOR)
+  or <tt>\r\n</tt>.
+
+POSIX <i>bracket expressions</i> are also similar to character classes.
+They provide a portable alternative to the above, with the added benefit
+that they encompass non-ASCII characters. For instance, <tt>/\d/</tt>
+matches only the ASCII decimal digits (0-9); whereas <tt>/[[:digit:]]/</tt>
+matches any character in the Unicode _Nd_ category.
+
+* <tt>/[[:alnum:]]/</tt> - Alphabetic and numeric character
+* <tt>/[[:alpha:]]/</tt> - Alphabetic character
+* <tt>/[[:blank:]]/</tt> - Space or tab
+* <tt>/[[:cntrl:]]/</tt> - Control character
+* <tt>/[[:digit:]]/</tt> - Digit
+* <tt>/[[:graph:]]/</tt> - Non-blank character (excludes spaces, control
+  characters, and similar)
+* <tt>/[[:lower:]]/</tt> - Lowercase alphabetical character
+* <tt>/[[:print:]]/</tt> - Like [:graph:], but includes the space character
+* <tt>/[[:punct:]]/</tt> - Punctuation character
+* <tt>/[[:space:]]/</tt> - Whitespace character (<tt>[:blank:]</tt>, newline,
+  carriage return, etc.)
+* <tt>/[[:upper:]]/</tt> - Uppercase alphabetical
+* <tt>/[[:xdigit:]]/</tt> - Digit allowed in a hexadecimal number (i.e.,
+  0-9a-fA-F)
+
+Ruby also supports the following non-POSIX character classes:
+
+* <tt>/[[:word:]]/</tt> - A character in one of the following Unicode
+  general categories _Letter_, _Mark_, _Number_,
+  <i>Connector_Punctuation</i>
+* <tt>/[[:ascii:]]/</tt> - A character in the ASCII character set
+
+    # U+06F2 is "EXTENDED ARABIC-INDIC DIGIT TWO"
+    /[[:digit:]]/.match("\u06F2")    #=> #<MatchData "\u{06F2}">
+    /[[:upper:]][[:lower:]]/.match("Hello") #=> #<MatchData "He">
+    /[[:xdigit:]][[:xdigit:]]/.match("A6")  #=> #<MatchData "A6">
+
+== Repetition
+
+The constructs described so far match a single character. They can be
+followed by a repetition metacharacter to specify how many times they need
+to occur. Such metacharacters are called <i>quantifiers</i>.
+
+* <tt>*</tt> - Zero or more times
+* <tt>+</tt> - One or more times
+* <tt>?</tt> - Zero or one times (optional)
+* <tt>{</tt><i>n</i><tt>}</tt> - Exactly <i>n</i> times
+* <tt>{</tt><i>n</i><tt>,}</tt> - <i>n</i> or more times
+* <tt>{,</tt><i>m</i><tt>}</tt> - <i>m</i> or less times
+* <tt>{</tt><i>n</i><tt>,</tt><i>m</i><tt>}</tt> - At least <i>n</i> and
+  at most <i>m</i> times
+
+At least one uppercase character ('H'), at least one lowercase character
+('e'), two 'l' characters, then one 'o':
+
+    "Hello".match(/[[:upper:]]+[[:lower:]]+l{2}o/) #=> #<MatchData "Hello">
+
+Repetition is <i>greedy</i> by default: as many occurrences as possible
+are matched while still allowing the overall match to succeed. By
+contrast, <i>lazy</i> matching makes the minimal amount of matches
+necessary for overall success. Most greedy metacharacters can be made lazy
+by following them with <tt>?</tt>. For the <tt>{n}</tt> pattern, because
+it specifies an exact number of characters to match and not a variable
+number of characters, the <tt>?</tt> metacharacter instead makes the
+repeated pattern optional.
+
+Both patterns below match the string. The first uses a greedy quantifier so
+'.+' matches '<a><b>'; the second uses a lazy quantifier so '.+?' matches
+'<a>':
+
+    /<.+>/.match("<a><b>")  #=> #<MatchData "<a><b>">
+    /<.+?>/.match("<a><b>") #=> #<MatchData "<a>">
+
+A quantifier followed by <tt>+</tt> matches <i>possessively</i>: once it
+has matched it does not backtrack. They behave like greedy quantifiers,
+but having matched they refuse to "give up" their match even if this
+jeopardises the overall match.
+
+== Capturing
+
+Parentheses can be used for <i>capturing</i>. The text enclosed by the
+<i>n</i><sup>th</sup> group of parentheses can be subsequently referred to
+with <i>n</i>. Within a pattern use the <i>backreference</i>
+<tt>\n</tt>; outside of the pattern use
+<tt>MatchData[</tt><i>n</i><tt>]</tt>.
+
+'at' is captured by the first group of parentheses, then referred to later
+with <tt>\1</tt>:
+
+    /[csh](..) [csh]\1 in/.match("The cat sat in the hat")
+        #=> #<MatchData "cat sat in" 1:"at">
+
+Regexp#match returns a MatchData object which makes the captured text
+available with its #[] method:
+
+    /[csh](..) [csh]\1 in/.match("The cat sat in the hat")[1] #=> 'at'
+
+Capture groups can be referred to by name when defined with the
+<tt>(?<</tt><i>name</i><tt>>)</tt> or <tt>(?'</tt><i>name</i><tt>')</tt>
+constructs.
+
+    /\$(?<dollars>\d+)\.(?<cents>\d+)/.match("$3.67")
+        #=> #<MatchData "$3.67" dollars:"3" cents:"67">
+    /\$(?<dollars>\d+)\.(?<cents>\d+)/.match("$3.67")[:dollars] #=> "3"
+
+Named groups can be backreferenced with <tt>\k<</tt><i>name</i><tt>></tt>,
+where _name_ is the group name.
+
+    /(?<vowel>[aeiou]).\k<vowel>.\k<vowel>/.match('ototomy')
+        #=> #<MatchData "ototo" vowel:"o">
+
+*Note*: A regexp can't use named backreferences and numbered
+backreferences simultaneously. Also, if a named capture is used in a
+regexp, then parentheses used for grouping which would otherwise result
+in a unnamed capture are treated as non-capturing.
+
+    /(\w)(\w)/.match("ab").captures # => ["a", "b"]
+    /(\w)(\w)/.match("ab").named_captures # => {}
+
+    /(?<c>\w)(\w)/.match("ab").captures # => ["a"]
+    /(?<c>\w)(\w)/.match("ab").named_captures # => {"c"=>"a"}
+
+When named capture groups are used with a literal regexp on the left-hand
+side of an expression and the <tt>=~</tt> operator, the captured text is
+also assigned to local variables with corresponding names.
+
+    /\$(?<dollars>\d+)\.(?<cents>\d+)/ =~ "$3.67" #=> 0
+    dollars #=> "3"
+
+== Grouping
+
+Parentheses also <i>group</i> the terms they enclose, allowing them to be
+quantified as one <i>atomic</i> whole.
+
+The pattern below matches a vowel followed by 2 word characters:
+
+    /[aeiou]\w{2}/.match("Caenorhabditis elegans") #=> #<MatchData "aen">
+
+Whereas the following pattern matches a vowel followed by a word character,
+twice, i.e. <tt>[aeiou]\w[aeiou]\w</tt>: 'enor'.
+
+    /([aeiou]\w){2}/.match("Caenorhabditis elegans")
+        #=> #<MatchData "enor" 1:"or">
+
+The <tt>(?:</tt>...<tt>)</tt> construct provides grouping without
+capturing. That is, it combines the terms it contains into an atomic whole
+without creating a backreference. This benefits performance at the slight
+expense of readability.
+
+The first group of parentheses captures 'n' and the second 'ti'. The second
+group is referred to later with the backreference <tt>\2</tt>:
+
+    /I(n)ves(ti)ga\2ons/.match("Investigations")
+        #=> #<MatchData "Investigations" 1:"n" 2:"ti">
+
+The first group of parentheses is now made non-capturing with '?:', so it
+still matches 'n', but doesn't create the backreference. Thus, the
+backreference <tt>\1</tt> now refers to 'ti'.
+
+    /I(?:n)ves(ti)ga\1ons/.match("Investigations")
+        #=> #<MatchData "Investigations" 1:"ti">
+
+=== Atomic Grouping
+
+Grouping can be made <i>atomic</i> with
+<tt>(?></tt><i>pat</i><tt>)</tt>. This causes the subexpression <i>pat</i>
+to be matched independently of the rest of the expression such that what
+it matches becomes fixed for the remainder of the match, unless the entire
+subexpression must be abandoned and subsequently revisited. In this
+way <i>pat</i> is treated as a non-divisible whole. Atomic grouping is
+typically used to optimise patterns so as to prevent the regular
+expression engine from backtracking needlessly.
+
+The <tt>"</tt> in the pattern below matches the first character of the string,
+then <tt>.*</tt> matches <i>Quote"</i>. This causes the overall match to fail,
+so the text matched by <tt>.*</tt> is backtracked by one position, which
+leaves the final character of the string available to match <tt>"</tt>
+
+          /".*"/.match('"Quote"')     #=> #<MatchData "\"Quote\"">
+
+If <tt>.*</tt> is grouped atomically, it refuses to backtrack <i>Quote"</i>,
+even though this means that the overall match fails
+
+    /"(?>.*)"/.match('"Quote"') #=> nil
+
+== Subexpression Calls
+
+The <tt>\g<</tt><i>name</i><tt>></tt> syntax matches the previous
+subexpression named _name_, which can be a group name or number, again.
+This differs from backreferences in that it re-executes the group rather
+than simply trying to re-match the same text.
+
+This pattern matches a <i>(</i> character and assigns it to the <tt>paren</tt>
+group, tries to call that the <tt>paren</tt> sub-expression again but fails,
+then matches a literal <i>)</i>:
+
+    /\A(?<paren>\(\g<paren>*\))*\z/ =~ '()'
+
+
+    /\A(?<paren>\(\g<paren>*\))*\z/ =~ '(())' #=> 0
+    # ^1
+    #      ^2
+    #           ^3
+    #                 ^4
+    #      ^5
+    #           ^6
+    #                      ^7
+    #                       ^8
+    #                       ^9
+    #                           ^10
+
+1.  Matches at the beginning of the string, i.e. before the first
+    character.
+2.  Enters a named capture group called <tt>paren</tt>
+3.  Matches a literal <i>(</i>, the first character in the string
+4.  Calls the <tt>paren</tt> group again, i.e. recurses back to the
+    second step
+5.  Re-enters the <tt>paren</tt> group
+6.  Matches a literal <i>(</i>, the second character in the
+    string
+7.  Try to call <tt>paren</tt> a third time, but fail because
+    doing so would prevent an overall successful match
+8.  Match a literal <i>)</i>, the third character in the string.
+    Marks the end of the second recursive call
+9.  Match a literal <i>)</i>, the fourth character in the string
+10. Match the end of the string
+
+== Alternation
+
+The vertical bar metacharacter (<tt>|</tt>) combines two expressions into
+a single one that matches either of the expressions. Each expression is an
+<i>alternative</i>.
+
+    /\w(and|or)\w/.match("Feliformia") #=> #<MatchData "form" 1:"or">
+    /\w(and|or)\w/.match("furandi")    #=> #<MatchData "randi" 1:"and">
+    /\w(and|or)\w/.match("dissemblance") #=> nil
+
+== Character Properties
+
+The <tt>\p{}</tt> construct matches characters with the named property,
+much like POSIX bracket classes.
+
+* <tt>/\p{Alnum}/</tt> - Alphabetic and numeric character
+* <tt>/\p{Alpha}/</tt> - Alphabetic character
+* <tt>/\p{Blank}/</tt> - Space or tab
+* <tt>/\p{Cntrl}/</tt> - Control character
+* <tt>/\p{Digit}/</tt> - Digit
+* <tt>/\p{Graph}/</tt> - Non-blank character (excludes spaces, control
+  characters, and similar)
+* <tt>/\p{Lower}/</tt> - Lowercase alphabetical character
+* <tt>/\p{Print}/</tt> - Like <tt>\p{Graph}</tt>, but includes the space character
+* <tt>/\p{Punct}/</tt> - Punctuation character
+* <tt>/\p{Space}/</tt> - Whitespace character (<tt>[:blank:]</tt>, newline,
+  carriage return, etc.)
+* <tt>/\p{Upper}/</tt> - Uppercase alphabetical
+* <tt>/\p{XDigit}/</tt> - Digit allowed in a hexadecimal number (i.e., 0-9a-fA-F)
+* <tt>/\p{Word}/</tt> - A member of one of the following Unicode general
+  category <i>Letter</i>, <i>Mark</i>, <i>Number</i>,
+  <i>Connector\_Punctuation</i>
+* <tt>/\p{ASCII}/</tt> - A character in the ASCII character set
+* <tt>/\p{Any}/</tt> - Any Unicode character (including unassigned
+  characters)
+* <tt>/\p{Assigned}/</tt> - An assigned character
+
+A Unicode character's <i>General Category</i> value can also be matched
+with <tt>\p{</tt><i>Ab</i><tt>}</tt> where <i>Ab</i> is the category's
+abbreviation as described below:
+
+* <tt>/\p{L}/</tt> - 'Letter'
+* <tt>/\p{Ll}/</tt> - 'Letter: Lowercase'
+* <tt>/\p{Lm}/</tt> - 'Letter: Mark'
+* <tt>/\p{Lo}/</tt> - 'Letter: Other'
+* <tt>/\p{Lt}/</tt> - 'Letter: Titlecase'
+* <tt>/\p{Lu}/</tt> - 'Letter: Uppercase
+* <tt>/\p{Lo}/</tt> - 'Letter: Other'
+* <tt>/\p{M}/</tt> - 'Mark'
+* <tt>/\p{Mn}/</tt> - 'Mark: Nonspacing'
+* <tt>/\p{Mc}/</tt> - 'Mark: Spacing Combining'
+* <tt>/\p{Me}/</tt> - 'Mark: Enclosing'
+* <tt>/\p{N}/</tt> - 'Number'
+* <tt>/\p{Nd}/</tt> - 'Number: Decimal Digit'
+* <tt>/\p{Nl}/</tt> - 'Number: Letter'
+* <tt>/\p{No}/</tt> - 'Number: Other'
+* <tt>/\p{P}/</tt> - 'Punctuation'
+* <tt>/\p{Pc}/</tt> - 'Punctuation: Connector'
+* <tt>/\p{Pd}/</tt> - 'Punctuation: Dash'
+* <tt>/\p{Ps}/</tt> - 'Punctuation: Open'
+* <tt>/\p{Pe}/</tt> - 'Punctuation: Close'
+* <tt>/\p{Pi}/</tt> - 'Punctuation: Initial Quote'
+* <tt>/\p{Pf}/</tt> - 'Punctuation: Final Quote'
+* <tt>/\p{Po}/</tt> - 'Punctuation: Other'
+* <tt>/\p{S}/</tt> - 'Symbol'
+* <tt>/\p{Sm}/</tt> - 'Symbol: Math'
+* <tt>/\p{Sc}/</tt> - 'Symbol: Currency'
+* <tt>/\p{Sc}/</tt> - 'Symbol: Currency'
+* <tt>/\p{Sk}/</tt> - 'Symbol: Modifier'
+* <tt>/\p{So}/</tt> - 'Symbol: Other'
+* <tt>/\p{Z}/</tt> - 'Separator'
+* <tt>/\p{Zs}/</tt> - 'Separator: Space'
+* <tt>/\p{Zl}/</tt> - 'Separator: Line'
+* <tt>/\p{Zp}/</tt> - 'Separator: Paragraph'
+* <tt>/\p{C}/</tt> - 'Other'
+* <tt>/\p{Cc}/</tt> - 'Other: Control'
+* <tt>/\p{Cf}/</tt> - 'Other: Format'
+* <tt>/\p{Cn}/</tt> - 'Other: Not Assigned'
+* <tt>/\p{Co}/</tt> - 'Other: Private Use'
+* <tt>/\p{Cs}/</tt> - 'Other: Surrogate'
+
+Lastly, <tt>\p{}</tt> matches a character's Unicode <i>script</i>. The
+following scripts are supported: <i>Arabic</i>, <i>Armenian</i>,
+<i>Balinese</i>, <i>Bengali</i>, <i>Bopomofo</i>, <i>Braille</i>,
+<i>Buginese</i>, <i>Buhid</i>, <i>Canadian_Aboriginal</i>, <i>Carian</i>,
+<i>Cham</i>, <i>Cherokee</i>, <i>Common</i>, <i>Coptic</i>,
+<i>Cuneiform</i>, <i>Cypriot</i>, <i>Cyrillic</i>, <i>Deseret</i>,
+<i>Devanagari</i>, <i>Ethiopic</i>, <i>Georgian</i>, <i>Glagolitic</i>,
+<i>Gothic</i>, <i>Greek</i>, <i>Gujarati</i>, <i>Gurmukhi</i>, <i>Han</i>,
+<i>Hangul</i>, <i>Hanunoo</i>, <i>Hebrew</i>, <i>Hiragana</i>,
+<i>Inherited</i>, <i>Kannada</i>, <i>Katakana</i>, <i>Kayah_Li</i>,
+<i>Kharoshthi</i>, <i>Khmer</i>, <i>Lao</i>, <i>Latin</i>, <i>Lepcha</i>,
+<i>Limbu</i>, <i>Linear_B</i>, <i>Lycian</i>, <i>Lydian</i>,
+<i>Malayalam</i>, <i>Mongolian</i>, <i>Myanmar</i>, <i>New_Tai_Lue</i>,
+<i>Nko</i>, <i>Ogham</i>, <i>Ol_Chiki</i>, <i>Old_Italic</i>,
+<i>Old_Persian</i>, <i>Oriya</i>, <i>Osmanya</i>, <i>Phags_Pa</i>,
+<i>Phoenician</i>, <i>Rejang</i>, <i>Runic</i>, <i>Saurashtra</i>,
+<i>Shavian</i>, <i>Sinhala</i>, <i>Sundanese</i>, <i>Syloti_Nagri</i>,
+<i>Syriac</i>, <i>Tagalog</i>, <i>Tagbanwa</i>, <i>Tai_Le</i>,
+<i>Tamil</i>, <i>Telugu</i>, <i>Thaana</i>, <i>Thai</i>, <i>Tibetan</i>,
+<i>Tifinagh</i>, <i>Ugaritic</i>, <i>Vai</i>, and <i>Yi</i>.
+
+Unicode codepoint U+06E9 is named "ARABIC PLACE OF SAJDAH" and belongs to the
+Arabic script:
+
+    /\p{Arabic}/.match("\u06E9") #=> #<MatchData "\u06E9">
+
+All character properties can be inverted by prefixing their name with a
+caret (<tt>^</tt>).
+
+Letter 'A' is not in the Unicode Ll (Letter; Lowercase) category, so this
+match succeeds:
+
+    /\p{^Ll}/.match("A") #=> #<MatchData "A">
+
+== Anchors
+
+Anchors are metacharacter that match the zero-width positions between
+characters, <i>anchoring</i> the match to a specific position.
+
+* <tt>^</tt> - Matches beginning of line
+* <tt>$</tt> - Matches end of line
+* <tt>\A</tt> - Matches beginning of string.
+* <tt>\Z</tt> - Matches end of string. If string ends with a newline,
+  it matches just before newline
+* <tt>\z</tt> - Matches end of string
+* <tt>\G</tt> - Matches 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>\b</tt> - Matches word boundaries when outside brackets;
+  backspace (0x08) when inside brackets
+* <tt>\B</tt> - Matches non-word boundaries
+* <tt>(?=</tt><i>pat</i><tt>)</tt> - <i>Positive lookahead</i> assertion:
+  ensures that the following characters match <i>pat</i>, but doesn't
+  include those characters in the matched text
+* <tt>(?!</tt><i>pat</i><tt>)</tt> - <i>Negative lookahead</i> assertion:
+  ensures that the following characters do not match <i>pat</i>, but
+  doesn't include those characters in the matched text
+* <tt>(?<=</tt><i>pat</i><tt>)</tt> - <i>Positive lookbehind</i>
+  assertion: ensures that the preceding characters match <i>pat</i>, but
+  doesn't include those characters in the matched text
+* <tt>(?<!</tt><i>pat</i><tt>)</tt> - <i>Negative lookbehind</i>
+  assertion: ensures that the preceding characters do not match
+  <i>pat</i>, but doesn't include those characters in the matched text
+
+If a pattern isn't anchored it can begin at any point in the string:
+
+    /real/.match("surrealist") #=> #<MatchData "real">
+
+Anchoring the pattern to the beginning of the string forces the match to start
+there. 'real' doesn't occur at the beginning of the string, so now the match
+fails:
+
+    /\Areal/.match("surrealist") #=> nil
+
+The match below fails because although 'Demand' contains 'and', the pattern
+does not occur at a word boundary.
+
+    /\band/.match("Demand")
+
+Whereas in the following example 'and' has been anchored to a non-word
+boundary so instead of matching the first 'and' it matches from the fourth
+letter of 'demand' instead:
+
+    /\Band.+/.match("Supply and demand curve") #=> #<MatchData "and curve">
+
+The pattern below uses positive lookahead and positive lookbehind to match
+text appearing in <b></b> tags without including the tags in the match:
+
+    /(?<=<b>)\w+(?=<\/b>)/.match("Fortune favours the <b>bold</b>")
+        #=> #<MatchData "bold">
+
+== Options
+
+The end delimiter for a regexp can be followed by one or more single-letter
+options which control how the pattern can match.
+
+* <tt>/pat/i</tt> - Ignore case
+* <tt>/pat/m</tt> - Treat a newline as a character matched by <tt>.</tt>
+* <tt>/pat/x</tt> - Ignore whitespace and comments in the pattern
+* <tt>/pat/o</tt> - Perform <tt>#{}</tt> interpolation only once
+
+<tt>i</tt>, <tt>m</tt>, and <tt>x</tt> can also be applied on the
+subexpression level with the
+<tt>(?</tt><i>on</i><tt>-</tt><i>off</i><tt>)</tt> construct, which
+enables options <i>on</i>, and disables options <i>off</i> for the
+expression enclosed by the parentheses:
+
+    /a(?i:b)c/.match('aBc')   #=> #<MatchData "aBc">
+    /a(?-i:b)c/i.match('ABC') #=> nil
+
+Additionally, these options can also be toggled for the remainder of the
+pattern:
+
+    /a(?i)bc/.match('abC') #=> #<MatchData "abC">
+
+Options may also be used with <tt>Regexp.new</tt>:
+
+    Regexp.new("abc", Regexp::IGNORECASE)                     #=> /abc/i
+    Regexp.new("abc", Regexp::MULTILINE)                      #=> /abc/m
+    Regexp.new("abc # Comment", Regexp::EXTENDED)             #=> /abc # Comment/x
+    Regexp.new("abc", Regexp::IGNORECASE | Regexp::MULTILINE) #=> /abc/mi
+
+== Free-Spacing Mode and Comments
+
+As mentioned above, the <tt>x</tt> option enables <i>free-spacing</i>
+mode. Literal white space inside the pattern is ignored, and the
+octothorpe (<tt>#</tt>) character introduces a comment until the end of
+the line. This allows the components of the pattern to be organized in a
+potentially more readable fashion.
+
+A contrived pattern to match a number with optional decimal places:
+
+    float_pat = /\A
+        [[:digit:]]+ # 1 or more digits before the decimal point
+        (\.          # Decimal point
+            [[:digit:]]+ # 1 or more digits after the decimal point
+        )? # The decimal point and following digits are optional
+    \Z/x
+    float_pat.match('3.14') #=> #<MatchData "3.14" 1:".14">
+
+There are a number of strategies for matching whitespace:
+
+* Use a pattern such as <tt>\s</tt> or <tt>\p{Space}</tt>.
+* Use escaped whitespace such as <tt>\ </tt>, i.e. a space preceded by a backslash.
+* Use a character class such as <tt>[ ]</tt>.
+
+Comments can be included in a non-<tt>x</tt> pattern with the
+<tt>(?#</tt><i>comment</i><tt>)</tt> construct, where <i>comment</i> is
+arbitrary text ignored by the regexp engine.
+
+Comments in regexp literals cannot include unescaped terminator
+characters.
+
+== Encoding
+
+Regular expressions are assumed to use the source encoding. This can be
+overridden with one of the following modifiers.
+
+* <tt>/</tt><i>pat</i><tt>/u</tt> - UTF-8
+* <tt>/</tt><i>pat</i><tt>/e</tt> - EUC-JP
+* <tt>/</tt><i>pat</i><tt>/s</tt> - Windows-31J
+* <tt>/</tt><i>pat</i><tt>/n</tt> - ASCII-8BIT
+
+A regexp can be matched against a string when they either share an
+encoding, or the regexp's encoding is _US-ASCII_ and the string's encoding
+is ASCII-compatible.
+
+If a match between incompatible encodings is attempted an
+<tt>Encoding::CompatibilityError</tt> exception is raised.
+
+The <tt>Regexp#fixed_encoding?</tt> predicate indicates whether the regexp
+has a <i>fixed</i> encoding, that is one incompatible with ASCII. A
+regexp's encoding can be explicitly fixed by supplying
+<tt>Regexp::FIXEDENCODING</tt> as the second argument of
+<tt>Regexp.new</tt>:
+
+    r = Regexp.new("a".force_encoding("iso-8859-1"),Regexp::FIXEDENCODING)
+    r =~ "a\u3042"
+       # raises Encoding::CompatibilityError: incompatible encoding regexp match
+       #         (ISO-8859-1 regexp with UTF-8 string)
+
+== Special global variables
+
+Pattern matching sets some global variables :
+* <tt>$~</tt> is equivalent to Regexp.last_match;
+* <tt>$&</tt> contains the complete matched text;
+* <tt>$`</tt> contains string before match;
+* <tt>$'</tt> contains string after match;
+* <tt>$1</tt>, <tt>$2</tt> and so on contain text matching first, second, etc
+  capture group;
+* <tt>$+</tt> contains last capture group.
+
+Example:
+
+    m = /s(\w{2}).*(c)/.match('haystack') #=> #<MatchData "stac" 1:"ta" 2:"c">
+    $~                                    #=> #<MatchData "stac" 1:"ta" 2:"c">
+    Regexp.last_match                     #=> #<MatchData "stac" 1:"ta" 2:"c">
+
+    $&      #=> "stac"
+            # same as m[0]
+    $`      #=> "hay"
+            # same as m.pre_match
+    $'      #=> "k"
+            # same as m.post_match
+    $1      #=> "ta"
+            # same as m[1]
+    $2      #=> "c"
+            # same as m[2]
+    $3      #=> nil
+            # no third group in pattern
+    $+      #=> "c"
+            # same as m[-1]
+
+These global variables are thread-local and method-local variables.
+
+== Performance
+
+Certain pathological combinations of constructs can lead to abysmally bad
+performance.
+
+Consider a string of 25 <i>a</i>s, a <i>d</i>, 4 <i>a</i>s, and a
+<i>c</i>.
+
+    s = 'a' * 25 + 'd' + 'a' * 4 + 'c'
+    #=> "aaaaaaaaaaaaaaaaaaaaaaaaadaaaac"
+
+The following patterns match instantly as you would expect:
+
+    /(b|a)/ =~ s #=> 0
+    /(b|a+)/ =~ s #=> 0
+    /(b|a+)*/ =~ s #=> 0
+
+However, the following pattern takes appreciably longer:
+
+    /(b|a+)*c/ =~ s #=> 26
+
+This happens because an atom in the regexp is quantified by both an
+immediate <tt>+</tt> and an enclosing <tt>*</tt> with nothing to
+differentiate which is in control of any particular character. The
+nondeterminism that results produces super-linear performance. (Consult
+<i>Mastering Regular Expressions</i> (3rd ed.), pp 222, by
+<i>Jeffery Friedl</i>, for an in-depth analysis). This particular case
+can be fixed by use of atomic grouping, which prevents the unnecessary
+backtracking:
+
+    (start = Time.now) && /(b|a+)*c/ =~ s && (Time.now - start)
+       #=> 24.702736882
+    (start = Time.now) && /(?>b|a+)*c/ =~ s && (Time.now - start)
+       #=> 0.000166571
+
+A similar case is typified by the following example, which takes
+approximately 60 seconds to execute for me:
+
+Match a string of 29 <i>a</i>s against a pattern of 29 optional <i>a</i>s
+followed by 29 mandatory <i>a</i>s:
+
+    Regexp.new('a?' * 29 + 'a' * 29) =~ 'a' * 29
+
+The 29 optional <i>a</i>s match the string, but this prevents the 29
+mandatory <i>a</i>s that follow from matching. Ruby must then backtrack
+repeatedly so as to satisfy as many of the optional matches as it can
+while still matching the mandatory 29. It is plain to us that none of the
+optional matches can succeed, but this fact unfortunately eludes Ruby.
+
+The best way to improve performance is to significantly reduce the amount of
+backtracking needed.  For this case, instead of individually matching 29
+optional <i>a</i>s, a range of optional <i>a</i>s can be matched all at once
+with <i>a{0,29}</i>:
+
+    Regexp.new('a{0,29}' + 'a' * 29) =~ 'a' * 29
+
diff --git a/doc/rubygems/ChangeLog b/doc/rubygems/ChangeLog
deleted file mode 100644
index 2e67a4c2c5..0000000000
--- a/doc/rubygems/ChangeLog
+++ /dev/null
@@ -1,5689 +0,0 @@
-# -*- coding: utf-8 -*-
-
-2010-02-20  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  1.3.6.
-	* test/*:  Windows test fixes
-	* lib/rubygems/remote_fetcher.rb:  Fix same file detection on windows.
-
-2010-02-15  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/config_file.rb:  Fix use of ConfigFile#api_key= vs
-	  #rubygems_api_key=.  Patch by Nick Quaranto.
-
-2010-02-12  Eric Hodel  <drbrain@segment7.net>
-
-	* Rakefile:  RubyGems doesn't depend on previous RubyGems.
-
-2010-02-11  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  http://rubygems.org is now the default source.
-	* lib/rubygems/dependency.rb:  Only warn once about
-	  #version_requirement
-
-2010-02-09  Eric Hodel  <drbrain@segment7.net>
-
-	* bin/update_rubygems:  Use system, exec more correctly, remove
-	  useless puts.
-	* lib/rubygems/commands/query_command.rb:  List every version when
-	  --prerelease --all is given.
-
-2010-02-08  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/dependency_command.rb:  Support --prerelease.
-	* lib/rubygems/commands/fetch_command.rb:  Support --prerelease.
-	* lib/rubygems/format.rb:  Don't crash on empty files.  Bug #27292 by
-	  Ian Ragsdale.
-	* lib/rubygems/server.rb:  Fix markup.  Bug #27045 by Eric Young.
-	* History.txt:  RubyGems 1.3.6 release notes.
-
-2010-02-07  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/dependency_installer.rb:  Allow prerelease gems to
-	  depend on non-prerelease gems.
-
-2010-02-06  Eric Hodel  <drbrain@segment7.net>
-
-	* test/test_gem_commands_specification_command.rb:  Don't enforce YAML
-	  format.  Patch #27791 by Aaron Patterson.
-	* lib/rubygems/version.rb:  Allow captial letters in prerelease
-	  versions.
-	* lib/rubygems/config_file.rb:  Explain format of ~/.gemrc.  Bug
-	  #27698 by J Smith.
-	* lib/rubygems/gem_path_searcher.rb:  Handle nil require_paths.
-	  Patch #27334 by Roger Pack.
-	* lib/rubygems/server.rb:  Handle --bind option.  Patch #27357 by
-	  Bruno Michel.
-	* lib/rubygems/doc_manager:  gem rdoc --overwrite to preserve built
-	  rdoc.  Patch #25982 by Akinori MUSHA.
-	* lib/rubygems/commands/which_command.rb:  Fail if no paths were
-	  found.  Adapted patch #27681 by Caio Chassot.
-	* lib/rubygems/remote_fetcher.rb:  Don't copy if the file is where we
-	  want it.  Patch #27409 by Jakub Šťastný.
-
-2010-02-01  John Barnette  <jbarnette@rubygems.org>
-
-	* lib/rubygems/command*: Add 'gem push' and 'gem owner' for
-	  interacting with modern/Gemcutter sources [Nick Quaranto]
-
-2010-01-18  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/dependency_list.rb:  Ignore development dependencies
-	  unless explicitly needed.  Bug #27608 by Roger Pack.
-
-2010-01-12  John Barnette <jbarnette@rubygems.org>
-
-	* Rakefile: Don't add development deps when building the
-	  rubygems-update gem, it borks older versions when they're updating
-	  from a stub index.
-
-2009-12-22  Evan Phoenix  <evan@fallingsnow.net>
-
-	* lib/rubygems/spec_fetcher.rb: Don't bother re-Marshaling the spec
-	  YAML list.
-
-2009-11-04  John Barnette  <jbarnette@rubygems.org>
-
-	* lib/rubygems/timer.rb: Removed. The deprecation sun set in July.
-
-2009-10-14  John Barnette  <jbarnette@rubygems.org>
-
-	* lib/rubygems/dependency.rb: Burndown/cleanup. Refactored code
-	  and tests. Gem::Dependency.version_requirement(s) is deprecated in
-	  favor of Gem::Dependency.requirement.
-
-	* lib/rubygems/requirement.rb: Burndown/cleanup. Refactored code
-	  and tests. See test/support/shortcuts.rb for some new test helpers.
-
-2009-10-13  John Barnette  <jbarnette@rubygems.org>
-
-	* lib/rubygems/local_remote_options.rb: Make --source additive,
-	  not exclusive. If exclusive sources are desired, use
-	  --clear-sources first.
-
-2009-09-29  John Barnette  <jbarnette@rubyforge.org>
-
-	* lib/rubygems/spec_fetcher.rb: Be slightly more robust when faced
-	  with corrupted indexes.
-
-2009-09-03  John Barnette  <jbarnette@rubyforge.org>
-
-	* LOTS: Use "raise" consistently, not "fail".
-
-2009-09-01  John Barnette  <jbarnette@rubyforge.org>
-
-	* lib/rubygems/version.rb: Gem::Version immutability
-	  burndown. Changed canonical internal representation to an
-	  Array. Refactored significant amounts of the internals for
-	  clarity. Breaking change: Gem::Version::Requirement is no longer
-	  available, use Gem::Requirement instead. Breaking change: custom
-	  YAML marshaling is gone. Credit to Yehuda Katz for certain bits of
-	  a related patch.
-	* test/test_gem_dependency.rb: Moved a bunch of tests over from
-	  test_gem_version.rb. Work in progress.
-	* test/test_gem_specification.rb: Removed a failing YAML
-	  test. Many more will be going away shortly.
-	* test/test_gem_version.rb: Significant refactoring for
-	  maintainability and clarity. Moved a ton of poorly-placed tests to
-	  test_gem_dependency.rb for future refactoring.
-
-2009-08-19  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/rubygems.rb: Cleanup of rdoc and file layout.
-	* lib/rubygems/versions.rb: Added Version#spermy_recommendation
-	  and fixed bug in Version::Part#inspect. General cleanup.
-
-2009-07-29  John Barnette <jbarnette@rubyforge.org>
-
-	* lib/rubygems/package/tar_input.rb:  Add Maglev to the list of
-	  implementations with working Zlib. Bug #26790 by Peter McLain.
-
-2009-07-21  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  1.3.5.
-	* lib/rubygems/package.rb:  Remove dangling digest require.  Reported
-	  by Jeremy Kemper.
-
-2009-06-25  Eric Hodel  <drbrain@segment7.net>
-
-	* release_notes/:  Merged into History.txt for Hoe.
-	* lib/rubygems/commands/setup_command.rb:  Streamlined install text.
-
-2009-06-23  Eric Hodel  <drbrain@segment7.net>
-
-	* release_notes/rel_1_3_5.rdoc:  RubyGems 1.3.5 release notes.
-	* lib/rubygems/builder.rb:  Only print out with verbose.
-	* lib/rubygems/package_task.rb:  Only print out with -t.
-
-2009-06-12  Ryan Davis  <ryand@zenspider.com>
-
-	* Rakefile:  Switched to Hoe.
-
-2009-06-10  Phil Hagelberg <technomancy@gmail.com>
-
-	* lib/rubygems/installer.rb:  --user-install is no longer enabled by
-	  default.
-	* lib/rubygems/source_index.rb:  Fix use of prerelease gems.
-
-2009-06-04  Eric Hodel  <drbrain@segment7.net>
-
-	* util/gem_prelude.rb.template:  Backports from 1.9.
-
-2009-06-03  Eric Hodel  <drbrain@segment7.net>
-
-	* bin/gem:  Support 1.8.6+
-	* lib/rubygems/digest*:  Removed, support dropped for Ruby < 1.8.6
-	* lib/rubygems/installer.rb:  Support env(1) in wrong path, use
-	  /bin/sh if shebang has options.  By Nobu, ruby trunk r22853.
-	* lib/rubygems/config_file.rb:  Switch to stdcall for appdata folder.
-	  [ruby-core:22601].
-	* lib/rubygems.rb:  Use only File::expand_path on 1.9 for home dir.
-	  Don't recklessly create directories.  Simplify RbConfig::datadir
-	  definition.
-
-2009-05-30  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/which_command.rb:  Only print out directory
-	  information to a TTY.
-	* lib/rubygems/rubygems_version.rb:  1.3.4.
-	* doc/release_notes/rel_1_3_4.rdoc:  RubyGems 1.3.4 release notes.
-
-2009-05-28  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/setup_command.rb:  Fix --format-executable
-	  option name.
-	* lib/rubygems/requirement.rb:  Fix typo in #parse.  Bug #26000 by
-	  Mike Gunderloy.
-
-2009-05-21  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  Add 'dev' and svn revision for -1 RUBY_PATCHLEVEL
-	  and RUBY_REVISION.
-
-2009-05-20  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/defaults.rb:  Restore 1.9.1 path behavior.
-	* lib/rubygems/specification.rb:  Fix undefined ivar warning.
-	* lib/rubygems/indexer.rb:  Force loading of builder gem.
-	* test/gemutilities.rb:  Remove gem_prelude code by hand to avoid 1.9
-	  warnings.
-
-2009-05-19  Luis Lavena  <luislavena@gmail.com>
-
-	* test/test_gem_specification.rb: skip symlinks tests on Windows.
-	* test/test_gem_commands_install_command.rb: skip chmod test on
-	  Windows.
-
-2009-05-15  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems*:  Fix 1.9 warnings about circular require.
-
-2009-05-12  Daniel Berger  <djberg96@gmail.com>
-
-	* lib/rubygems/remote_fetcher.rb:  Fixed the download method in the
-	  remote_fetcher.rb file so that it handles local installs on MS
-	  Windows when using explicit paths that aren't on the 'C:' drive.
-	  Bug #25882 by Lars Christensen.
-	* lib/rubygems/commands/update_command.rb:  Replaced deprecated
-	  Gem::SourceIndex method 'search' with 'find_name' in the 'execute'
-	  method.
-
-2009-05-07  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/query_command.rb:  Support prerelease version
-	  listing (--prerelease), list locally installed prereleases.
-	* lib/rubygems/source_info_cache.rb:  Gem::SourceInfoCache is
-	  officially unsupported, maintaining its tests is hard.
-	* lib/rubygems/source_index.rb:  Add #all_gems, fix #remove_spec,
-	  #search to work with it.  Prerelease gems can now be used.
-
-2009-05-04  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/rubygems_version.rb: 1.3.3.
-	* doc/release_notes/rel_1_3_3.rdoc:  RubyGems 1.3.3 release notes.
-	* lib/rubygems/specification.rb:  Default has_rdoc to true, ignore
-	  its value.
-	* lib/rubygems/doc_manager.rb:  Always generate RDoc regardless of
-	  #has_rdoc?
-	* lib/rubygems.rb:  Raise Gem::LoadError if Kernel#gem fails due to
-	  previously-loaded gem.  Bug reported by Alf Mikula.
-
-2009-05-02  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/server_command.rb:  Allow port names with
-	  --port.
-	* lib/rubygems/requirement.rb:  Match prerelease versions and ~>
-	  correctly.  Patch #25759 by Yossef Mendelssohn.
-
-2009-05-01  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb:  Check bindir for executables, not
-	  root.  Bug reported by David Chelimsky.  Remove Time.today, no way
-	  to override it before RubyGems loads.  Bug #25564 by Emanuele
-	  Vicentini.  Raise Gem::Exception for #installation_path when not
-	  installed.  Bug #25741 by Daniel Berger.  Don't error in #validate
-	  when homepage is nil.  Bug #25677 by Mike Burrows.
-	* lib/rubygems/commands/cleanup_command.rb:  Clean up --user-install
-	  gems.  Bug #25516 by Brett Eisenberg.
-	* lib/rubygems/uninstaller.rb:  Uninstall executables from the correct
-	  directory.  Bug #25555 by Brett Eisenberg.
-	* lib/rubygems/server.rb:  Add search that jumps to RDoc.  Patch
-	  #22959 by Vladimir Dobriakov.
-
-2009-05-01  James Tucker  <jftucker@gmail.com>
-
-	* lib/rubygems.rb: Gem.bin_path now escapes paths with spaces.
-
-2009-04-30  Daniel Berger  <djberg96@gmail.com>
-
-	* lib/rubygems/commands/install_command.rb:  Replaced deprecated
-	  Gem::SourceIndex method 'search' with 'find_name' when using
-	  the -t option. Fixes bug # 25632 by Daniel Berger.
-
-2009-04-30  James Tucker  <jftucker@gmail.com>
-
-	* lib/rubygems/ext/rake_builder.rb: Use explicit ruby command loading
-	  rubygems to invoke rake.
-
-2009-04-24  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/specification_command.rb:  Added requesting
-	  single fields from a spec.
-
-2009-04-23  James Tucker  <jftucker@gmail.com>
-
-	* lib/rubygems/ext/configure_builder.rb: Support Gem::Command.build_args.
-
-2009-04-15  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/rubygems_version.rb: 1.3.2.
-
-2009-04-14  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb:  Complain when summary and
-	  description are identical.
-
-2009-04-08  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb:  Strip directories, complain for
-	  non-files in #validate.
-
-2009-04-07  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb:  Implement #initialize_copy.
-	* lib/rubygems/commands/contents_command.rb:  Add --no-prefix and
-	  --all.
-
-2009-04-06  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/defaults.rb:  Don't allow gem to overwrite ruby on
-	  install.  Fixes bug #24958 by Michael Soulier.
-	* doc/release_notes/rel_1_3_2.rdoc:  Preliminary 1.3.2 release notes.
-	* Rakefile:  Trim off some stale code, switch to Manifest.txt, one
-	  step closer to Hoe!
-
-2009-04-06  Daniel Berger  <djberg96@gmail.com>
-
-	* test/test_gem_ext_configure_builder.rb: Better handling for MS
-	  Windows.
-	* test/gemutilities.rb: Added the make_command and vc_windows? helper
-	  methods.
-
-2009-04-03  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/: RDoc improvements.
-
-2009-04-02  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/setup_command.rb:  Fix --destdir.  Patch
-	  #24970 by Richard Brown.
-
-2009-04-02  Phil Hagelberg <technomancy@gmail.com>
-
-	* lib/rubygems/version.rb: Documentation of prerelease
-	versions. See http://technomancy.us/123 for details.
-
-2009-03-31  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/spec_fetcher.rb:  If the cached specs file won't load,
-	  refetch.  Bug #24961 by Dylan Stamat.
-	* lib/rubygems/defaults.rb:  Add a sanity check to
-	  Gem.default_exec_format.  Workaround for bug #24958 by Michael
-	  Soulier.
-	* lib/rubygems/commands/setup_command.rb:  Fix confusion with option
-	  names.  Patch #24971 by Richard Brown.
-	* lib/rubygems/specification.rb:  Make #validate complain about
-	  not-files.
-	* lib/gauntlet_rubygems.rb:  For verification of the validator.
-
-2009-03-27  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  RubyGems now loads plugins from rubygems_plugin.rb
-	  in installed gems.  This can be used to add commands (See
-	  Gem::CommandManager) or add install/uninstall hooks (See
-	  Gem::Installer and Gem::Uninstaller).
-	* setup.rb:  Ensure we're in a RubyGems dir when installing.
-
-2009-03-26  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/package_task.rb:  Import from Rake's
-	  rake/gempackagetask.rb
-	* Rakefile:  Switched to RDoc::Task from RDoc 2.4.2.
-	* lib/rubygems.rb:  Gem.find_files now returns paths in $LOAD_PATH.
-	* lib/rubygems/commands/sources_command.rb:  Allow sources to be added
-	  behind proxies.  Bug #24785 by Elia Schito.
-
-2009-03-25  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/install_command.rb:  Fix typo.  Patch #24446
-	  by Luis Parravicini.
-	* lib/rubygems/version.rb:  Handle non-String versions by calling
-	  #to_s.  Patch #24392 by Stephen Bannasch.
-
-2009-03-22  Daniel Berger <djberg96@gmail.com>
-
-	* lib/rubygems/remote_fetcher.rb: Always escape URI's to deal with spaces
-	  and such, regardless of platform.
-	* lib/rubygesm/validator.rb: Use the test-unit gem if installed.
-	  Part of the fix for RF #24261 by Daniel Berger
-	* lib/rubygems/commands/install_command.rb: Explictly require
-	  rubygems/uninstaller.rb if the user wants to bail because of failed
-	  tests.
-	  Part of the fix for RF #24261 by Daniel Berger
-
-2009-03-17  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/query_command.rb:  Make `gem unpack` work with
-	  more than one gem name, fix warning about installation location.
-
-2009-03-16  James Tucker <jftucker@gmail.com>
-
-	* lib/rubygems.rb: Deprecate ConfigMap[:RUBY_INSTALL_NAME]
-	* lib/rubygems/defaults.rb: Gem.default_exec_format to use 
-		ConfigMap[:ruby_install_name].
-		Fixes Bug #24457
-	* util/gem_prelude.rb.template: Fix potential bug in
-	  Gem.default_exec_format when ConfigMap[:BASERUBY] is not 'ruby'.
-
-2009-03-14  Luis Lavena  <luislavena@gmail.com>
-
-	* lib/rubygems/installer.rb: Cleanup quotes on Windows stub scripts.
-	  Fixes Bug #24039.
-	* lib/rubygems/commands/setup_command.rb: ditto.
-
-2008-03-13  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/uninstall_command.rb:  Add --user-install to
-	  allow uninstallation from ~/.gem.  Bug #23760 by Roger Pack.
-	* lib/rubygems/uninstaller.rb:  Automatically uninstall from
-	  Gem.user_dir.
-	* lib/rubygems/commands/update_command.rb:  Rescue InstallError
-	  and continue.  Bug #19268 by Gabriel Wilkins.
-	* lib/rubygems/doc_manager.rb:  Remove some options from the args list
-	  that RDoc no longer supports.
-
-2008-03-12  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb:  #description no longer removes
-	  newlines.
-	* lib/rubygems/indexer.rb:  Wrap description in a pre and force-wrap
-	  lines to 78 characters for prettier display.
-	* lib/rubygems/commands/setup_command.rb:  Clarify RubyGems RDoc
-	  installation location.  Bug #22656 by Gian Marco Gherardi.
-
-2008-03-09  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/query_command.rb:  Add platforms to gem list
-	  -d.
-	* lib/rubygems/commands/setup_command.rb:  Allow setup to run from
-	  read-only location.  Patch #21862 by Luis Herrera.
-	* lib/rubygems/package/tar_input.rb:  Use real File methods.  Bug
-	  #23966 by Mike Furr.
-	* lib/rubygems.rb:  Don't add PATCHLEVEL if it's -1.  Patch #24048 by
-	  Jeremy Kemper.
-	* lib/rubygems/package/tar_input.rb:  Choose security policy
-	  correctly.  Bug #24001 by Mike Furr.
-	* lib/rubygems/remote_fetcher.rb:  Handle local paths with spaces.
-	  Bug #24169 by Ryan Davis.
-	* lib/rubygems/specification.rb:  Removed Gem::Specification::list,
-	  causes leaks.  Bug #23668 by Steve Purcell.
-
-2008-03-07  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb:  Use Gem::bin_path in executable stubs to
-	  work around Kernel#load bug.
-	* lib/rubygems/commands/install_command.rb:  Copy user_install down to
-	  Gem::DependencyInstaller.  Patch #23573 by Alf Mikula.
-	* lib/rubygems/command.rb:  Add info on gem server directly to `gem
-	  help`.  Patch #22271 by Hugh Sasse.
-
-2008-03-06  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb:  Don't allow FIXME in specs.
-	* lib/rubygems/commands/spec_command.rb:  Add --ruby and --marshal
-	  formats.
-	* lib/rubygems.rb:  Add Gem::bin_path.  Patch #24114 by James Tucker.
-
-2008-03-04  Eric Hodel  <drbrain@segment7.net>
-
-	* setup.rb:  Moved guts to lib/rubygems/commands/setup_command.rb.
-	* lib/rubygems/indexer.rb:  Added RSS feed generation on full index
-	  update.
-
-2008-03-04  Phil Hagelberg <technomancy@gmail.com>
-
-	* lib/*: Prerelease gems go into their own index now and are excluded
-	from other indices. InstallCommand only gets prereleases if explicitly
-	requested. Thanks to Alex Vollmer.
-
-2008-03-04  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/*: Add lots of pretty pretty_print stuff!
-
-2008-02-25  Ryan Davis  <ryand@zenspider.com>
-
-	* lib/rubygems/commands/check_command.rb:  Fix various usability
-	  issues.
-
-2009-02-10  Daniel Berger <djberg96@gmail.com>
-	* lib/rubygems/specification: Refactored and fixed the installation_path
-	method. It was overwrought and it now no longer uses File::SEPARATOR
-	explicitly.
-	[RubyForge: bug #23879 by Daniel Berger]
-
-2009-02-10  Daniel Berger <djberg96@gmail.com>
-	* lib/rubygems/validator.rb: The Gem::Validator#verify_gem_file method
-	now explicitly rescues Errno::EINVAL as well as Errno::ENOENT because
-	MS Windows raises a different SystemCallError for empty paths.
-	
-2009-01-21  Daniel Berger <djberg96@gmail.com>
-	* lib/rubygems/remote_fetcher.rb: Split out nil and file handling in
-	the download method. Modified file URI handling to work properly.
-	[RubyForge: bug #16495 by Paul Sadauskas]
-	
-2009-01-19  Daniel Berger <djberg96@gmail.com>
-	* lib/rubygems/remote_fetcher.rb: Added uri scheme validation back
-	into the open_uri_or_path method, though it now accepts 'https' and
-	'file' as well.
-	* test/test_gem_remote_fetcher.rb: Updated the test_fetch_size_bad_uri
-	to reflect the updated error message.
-
-2009-01-15  Daniel Berger <djberg96@gmail.com>
-	* lib/rubygems/remote_fetcher.rb: Removed the open_file_uri_path method
-	since the URI#path method already does the same thing, and changed
-	the file_uri? method so that it explicitly calls .to_s.
-	* lib/rubygems/local_remote_options.rb: Allow file urls.
-
-2009-01-15  Daniel Berger <djberg96@gmail.com>
-	* lib/rubygems/commands/generate_index_command.rb: Fixed a typo in
-	the description.
-	* test/test_gem_doc_manager.rb: The test_uninstall_doc_unwritable
-	test is now skipped on Windows.
-	* test/test_gem_install_update_options.rb: The
-	test_user_install_disabled_read_only test is now skipped on Windows.
-	* test/test_gem_installer.rb: The test_generate_bin_symlink_no_perms
-	and test_generate_bin_script_no_perms tests are now skipped on Windows.
-
-2009-01-14  Daniel Berger <djberg96@gmail.com>
-	* lib/rubygems/specification.rb: Added support for a license attribute.
-	[RubyForge: feature #11041 (partial) by Kevin Williams]
-	* lib/rubygems/commands/query_command.rb: Gem detail information now
-	includes license information.
-	* test/test_gem_specification.rb: Added tests for the license attribute.
-
-2009-01-05  Chad Woolley <thewoolleyman@gmail.com>
-
-	* move processing of build args out of gem binary so they are handled correctly via API usage.
-	* lib/rubygems/command.rb: Add class accessor for build_args.
-	* lib/rubygems/ext/rake_builder.rb: Use Gem::Command.build_args instead of ARGV.
-	* lib/rubygems/ext/ext_conf_builder.rb: Use Gem::Command.build_args instead of ARGV.
-	* lib/rubygems/gem_runner.rb: Move build arg processing from gem binary.
-	* lib/rubygems/commands/contents_command.rb: Use nonzero return code (required to make tests pass).
-	* bin/gem: Move build arg processing to gem_runner.rb.
-	[RubyForge: bug #23210]
-
-	* lib/rubygems/config_file.rb:  Fix --config-file option with no
-	equals and subsequent options to properly assign config file.
-	Previously config file was overwritten by subsequent option.
-	Fixes bug #16688.
-
-2009-1-4  Daniel Berger <djberg96@gmail.com>
-	* lib/rubygems/installer.rb: Remove existing path if it already
-	exists before installing.
-	[RubyForge: patch #22837 by Eric Wong]
-	* lib/rubygems.rb: Minor modification to the location_of_caller
-	method - deal with possible characters after line number
-
-2009-1-3  Daniel Berger <djberg96@gmail.com>
-	* lib/rubygems.rb: Better activation error message.
-	[RubyForge: patch #23082 by Tim Carey-Smith]
-
-2009-1-2  Daniel Berger <djberg96@gmail.com>
-	* lib/rubygems/ext/rake_builder.rb: Quote path if it contains spaces
-	[RubyForge: patch #23003 by Charlie Savage]
-	* lib/rubygems/local_remote_options.rb: Ignore duplicate sources
-	[RubyForge: bug #22277 by Elliot Temple]
-	* lib/rubygems/remote_fetcher.rb: Automatically normalize the URI
-	[RubyForge: bug #22151 by Alex Legler]
-	* lib/rubygems/specification.rb: Ensure that specification_version is
-	a Fixnum [RubyForge: bug #22598 by Tsutomu Kuroda]
-	* lib/rubygems/specification.rb: Bumped the CURRENT_SPECIFICATION_VERSION
-	and added an entry to the SPECIFICATION_VERSION_HISTORY
-
-2009-1-1  Daniel Berger <djberg96@gmail.com>
-
-	* test/test_gem_dependency.rb: Removed a duplicate "def dep" that
-	was causing a warning.
-	* lib/rubygems/platform.rb: Added an empty? method in order to
-	better handle gem indexing when dealing with gems created
-	prior to 0.9.5. [Rubyforge: bug #22603 by Johnathan Conley]
-	* lib/rubygems.rb: Added an explicit 'require "etc"'.
-	[RubyForge: bug #22313 by Matthew Boedicker]
-
-2008-12-31  Daniel Berger <djberg96@gmail.com>
-
-	* lib/rubygems/local_remote_options: Allow 'https' as a valid scheme
-	in addition to 'http' [RubyForge: patch #22485 by Duarte Henriques] 
-	* setup.rb: Deal with extraneous quotation mark when autogenerating
-	.bat file on MS Windows [RubyForge: bug #22712 Takayuki Ishikawa]
-	* lib/rubygems/commands/unpack_command.rb: Fixed the --target option
-	[RubyForge: patch #22532 by Bryan Ash]
-
-2008-12-30  Daniel Berger <djberg96@gmail.com>
-
-	* lib/rubygems/builder.rb: Don't allow .gem file to be added back
-	onto itself [RubyForge: bug #19136, patch #23346 by Daniel Berger]
-	* lib/rubygems/defaults.rb: The default_path now only returns the
-	default_dir if the Gem.user_home doesn't exist
-	[RubyForge: bug #23037 by Pierre PLR]
-	* lib/rubygems.rb: Handle the possibility that Etc.getpwuid might
-	return nil on platforms other than Windows
-	[RubyForge: bug #22764 by Dudley Flanders]
-
-2008-12-16  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/doc_manager.rb:  Set title for generated documentation.
-	* lib/rubygems/dependency.rb:  Make #=~ work with Gem::Specification.
-
-2008-12-15  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb:  Fix documentation for
-	Gem::Installer#write_spec.  Issue by okkez.
-
-2008-12-12  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/local_remote_options.rb:  Merge documentation fix by
-	okkez [ruby-dev:37271].
-	* lib/rubygems/source_info_cache_entry.rb:  Merge documentation fix
-	from [ruby-dev:37255].
-
-2008-12-08  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  Add Gem::promote_load_path
-
-2008-12-01  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/rubygems/remote_fetcher.rb: made threadsafe.
-
-2008-11-25  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/install_command.rb:  Don't do any post-install
-	stuff if no gems were installed.  Issue by Daniel Berger.
-
-2008-11-20  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_index.rb:  Read the file outside the exception
-	block so we raise a sane error.
-	* lib/rubygems/indexer.rb:  Allow the modern index to be updated
-	incrementally.  Allow the legacy and modern indicies to be updated
-	separately.
-
-2008-11-17  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/indexer.rb:  Added ability to only generate modern or
-	legacy indicies.
-
-2008-11-14  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/timer.rb:  Deprecate and move methods to Gem and
-	Gem::StreamUI.
-
-2008-11-11  Phil Hagelberg <technomancy@gmail.com>
-
-	* lib/rubygems/, test/: Make Version understand prerelease
-	versions using letters. (eg. '1.2.1.b') Thanks to Josh Susser and
-	Alex Vollmer.
-
-2008-11-03  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb:  Gem name must be a String.
-
-2008-10-31  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/defaults.rb:  Update to support 1.9 libdir.
-	* util/gem_prelude.rb:  Move to .template, automatically fold in
-	defaults.
-
-2008-10-29  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  Handle nonexistent home directory.  Bug #22229 by
-	Alexey Verkhovsky.
-
-2008-10-25  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb, lib/rubygems/custom_require.rb:  Make kernel
-	methods private.  Patch #20801 by James M. Lawrence.  Expose
-	our kernel extensions to RDoc.  Make Gem::location_of_caller behave on
-	Windows.  Patch by Daniel Berger.
-	* doc/release_notes/rel_1_3_1.rdoc:  Final release notes for 1.3.1.
-	* lib/rubygems/rubygems_version.rb:  1.3.1.
-
-2008-10-10  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/unpack_command.rb:  Silence PATH warning.
-
-2008-10-09  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  Fix requires for inflate, deflate, etc.
-	* test/*:  Convert to minitest/unit.
-	* lib/rubygems/validator.rb:  Fix for MiniTest instead of test/unit
-	classic in 1.9.
-
-2008-10-03  Phil Hagelberg <technomancy@gmail.com>
-
-	* lib/rubygems.rb: Make Gem.dir respect :gemhome value from config.
-	* lib/rubygems/config_file.rb: Expose :gemhome value.
-
-2008-09-26  Luis Lavena  <luislavena@gmail.com>
-
-	* lib/rubygems.rb:  Disregard ownership of ~ under Windows while
-	creating ~/.gem.  Fixes issues related to no uid support under
-	Windows.
-
-2008-09-24  Eric Hodel  <drbrain@segment7.net>
-
-	* doc/release_notes/rel_1_3_0.rdoc:  Final release notes for 1.3.0.
-	* lib/rubygems/rubygems_version.rb:  1.3.0.
-	* lib/rubygems/builder.rb:  Examine process status correctly.  Patch
-	  by Nobu.
-	* test/test_gem_ext_rake_builder.rb:  Override Gem.ruby and
-	  ENV['rake'] for 1.9 integration.  Patch by Nobu.
-
-2008-09-16  Phil Hagelberg <technomancy@gmail.com>
-
-	* lib/rubygems.rb: Use the path set in the config file if
-	applicable.
-	* lib/rubygems/config_file.rb: Expose the path.
-
-2008-09-16  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  Only create ~/.gem by user owning ~.  Bug #21561
-	by Neil Wilson.
-
-2008-09-15  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_index.rb:  Autoload SpecFetcher to improve load
-	time.  Patch #21577 by Simon Chiang.
-	* lib/rubygems/commands/lock_command.rb:  Modernize.  Fix --strict.
-	Patch #21814 by Sven Engelhardt.
-	* lib/rubygems/platform.rb:  Fix for solaris platform.  Patch #21911
-	by Bob Remeika.
-
-2008-09-10  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/install_command.rb:  Describe _version_ in `gem
-	help install`.
-	* lib/rubygems/commands/environment_command.rb:  Describe environment
-	variables and gemrc in `gem help env`.
-	* lib/rubygems.rb:  Warn when executing Gem::manage_gems.
-	* lib/rubygems/doc_manager.rb:  Have RubyGems update the ri cache.
-	* lib/rubygems/source_index.rb:  Ensure specs are read as UTF-8.
-	* lib/rubygems/specification.rb:  Add magic comment to .gemspec files
-	so they are read in as UTF-8.
-
-2008-08-22  Luis Lavena  <luislavena@gmail.com>
-
-	* lib/rubygems.rb: Corrected usage of HOMEDRIVE and HOMEPATH on Windows.
-	Escape Gem.ruby if spaces in the path are present. Solves bug related to
-	extensions compile process.
-	* test/test_gem.rb: Added test to verify both conditions.
-
-2008-08-17  Eric Hodel  <drbrain@segment7.net>
-
-	* doc/release_notes/rel_1_3_0.rdoc:  Initial release notes for 1.3.0.
-	* util/CL2notes:  Release note creation helper script.
-
-2008-08-16  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/local_remote_options.rb:  Added #both? to complement
-	  #local? and #remote?.
-	* lib/rubygems/commands/query_command.rb:  Print out LOCAL/REMOTE with
-	--both, even without a TTY.
-	* lib/rubygems.rb:  Add Gem.find_files, allows a gem to discover
-	features provided by other gems.
-
-2008-08-14  Wilson Bilkovich  <wilson@supremetyrant.com>
-
-	* lib/rubygems/source_index.rb: Deprecate options to 'search' other than
-	Gem::Dependency instances and issue warning until November 2008.
-	* lib/rubygems/platform.rb:	Remove deprecated constant warnings
-	and really deprecate them.
-	* Rakefile: If the SETUP_OPTIONS environment variable is set, pass its
-	contents as arguments to setup.rb
-	* test/test_gem_commands_uninstall_command.rb: Added
-
-2008-08-13  Wilson Bilkovich  <wilson@supremetyrant.com>
-
-	* lib/rubygems/uninstaller.rb:	Fix binary script uninstallation.
-	Bug #21234 by Neil Wilson.
-	* test/test_gem_commands_uninstall_command.rb: Added
-
-2008-08-12  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb:  Try to create directory before diverting
-	to ~/.gems.
-	* lib/rubygems/uninstaller.rb:  Fix uninstallation with -i.  Bug
-	#20812 by John Clayton.  Have #remove_all call #uninstall_gem so hooks
-	get called.  Bug #21242 by Neil Wilson.
-	* lib/rubygems/commands/update_command.rb:  Fix updating RubyGems when
-	no previous rubygems-update is installed.  Bug #20775 by Hemant Kumar.
-
-2008-08-11  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/remote_fetcher.rb:  Fix HTTPS support.  Patch #21072 by
-	Alex Arnell.  Fix Not Modified handling.  Bug #21310 by Gordon
-	Thiesfeld.
-
-2008-07-11  Luis Lavena  <luislavena@gmail.com>
-
-	* setup.rb: Properly build --destdir folder structure using Pathname.
-	* test/mockgemui.rb: Fix warnings about instance variables in a module.
-
-2008-07-02  Phil Hagelberg <technomancy@gmail.com>
-
-	* lib/rubygems/defaults.rb: Add Gem.user_dir to use paths like
-	~/.gem/ruby/1.8/gems and the like instead of just ~/.gem. Update
-	remote fetcher and installer to use it.
-
-2008-07-01  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb:  Add #gem_home, #bin_dir for hooks.  Use
-	DependencyInstaller's source_index so reinstallation via -i does not
-	fail.
-	* lib/rubygems/uninstaller.rb:  Add #gem_home, #bin_dir for hooks.
-	* lib/rubygems/commands/query_command.rb:  Don't print LOCAL/REMOTE
-	gems if stdout is not a TTY.
-	* lib/rubygems/commands/query_command.rb:  Use the regexp we already
-	have for `gem list --installed`.  Bug #20876 by Nick Hoffman.
-	* lib/rubygems/commands/which_command.rb:  Clarify what `gem which` is
-	for.
-
-2008-06-30  Eric Hodel  <drbrain@segment7.net>
-
-	* test/test_ext_configure_builder.rb:  Locale-free patch by Yusuke
-	Endoh [ruby-core:17444].
-	* lib/rubygems.rb:  Add pre/post (un)install hooks.
-	* lib/rubygems/installer.rb:  Call pre/post install hooks as
-	appropriate.
-	* lib/rubygems/uninstaller.rb:  Call pre/post uninstall hooks as
-	appropriate.  Minor refactoring of #uninstall.
-	* lib/rubygems/package/tar_reader.rb:  Some OSs raise EINVAL on seek.
-	Based on patch in bug #20791 by Neil Wilson.
-	* lib/rubygems/specification.rb:  Correctly check for support of
-	development dependencies for #to_ruby.  Bug #20778 by Evan Weaver.
-	* lib/rubygems/spec_fetcher.rb:  Correctly load all cache file even if
-	latest has been loaded.  Bug #20776 by Uwe Kubosch.
-
-2008-06-25  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/config_file.rb:  Add Gem::ConfigFile constants for
-	packagers and implementors to override defaults.
-	* test/*:  Fixes to run tests when under test/rubygems/.  Patch by
-	Yusuke ENDOH [ruby-core:17353].
-
-2008-06-24  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/remote_fetcher.rb:  Cleanup to support
-	if-modified-since requests.  pair: Ryan Davis
-	* lib/rubygems/indexer:  Force platform to Gem::Platform::RUBY when
-	nil or blank.  Fixes various uninstallable gems.
-
-2008-06-24  Phil Hagelberg <technomancy@gmail.com>
-
-	* lib/rubygems/installer.rb: Fall back on ~/.gem if GEM_HOME is
-	not writable.
-	* lib/rubygems/install_update_options.rb: Allow --user-install or
-	--no-user-install command-line switch to explicitly force whether
-	or not ~/.gem should be used.
-	* lib/rubygems/remote_fetcher.rb: Use ~/.gem/cache if cache dir is
-	not writable.
-	* test/gemutilities.rb: Use MockGemUi for all tests.
-
-2008-06-21  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb:  Load specifications from the future.
-	Roll back specification version change.
-	* lib/rubygems/remote_fetcher.rb:  Reset connection when an HTTP
-	server misbehaves.
-	* setup.rb:  Fix --destdir for windows.
-	* doc/release_notes/rel_1_2_0.rdoc:  Bugs in RubyGems were
-	unintentionally added, order bug fixes by importance.
-	* lib/rubygems/rubygems_version.rb:  1.2.0.
-
-2008-06-20  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/uninstaller.rb:  Improve output when a gem to uninstall
-	isn't found.  Bug #20746 reported by Chad Wooley.
-	* setup.rb:  Fix rdoc installation with --destdir.  Patch #20739 by
-	Matthew Kent.
-	* lib/rubygems/commands/install_command.rb:  Don't reset GEM_PATH when
-	installing.  Fixes Bug #20746 by Chad Wooley.
-
-2008-06-20  Luis Lavena  <luislavena@gmail.com>
-
-	* setup.rb: Only prepend install_destdir when especified. Fixes
-	installation issues related to Windows paths (/C:/...)
-
-2008-06-19  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/dependency_installer.rb:  Ensure that the entire
-	dependency chain is installed.  Fixes bug reported by Chad Woolley.
-
-2008-06-18  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/dependency_command.rb:  Restore matching
-	everything when no name is specified, regexp matching.  Fixes bug
-	#20716, bug #20717 by Chad Woolley.
-
-2008-06-18  Chad Woolley  <thewoolleyman@gmail.com>
-
-	* lib/rubygems/config_file.rb:  Fix --config-file option with no
-	equals and subsequent options to properly assign config file.
-	Previously config file was overwritten by subsequent option.
-	Fixes bug #16688.
-
-2008-06-17  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/version.rb:  Gem::Version #hash and #eql? now operate
-	on the version string, terms of the version string, so "1" and "1.0"
-	no longer correspond to the same slot.  Fixes indexer bug reported by
-	Chad Woolley.
-	* setup.rb:  Fix --format-executable.  Patch #20698 by Richard Brown.
-	* util/gem_prelude.rb:  Prevent infinite recursion, check for Gem now.
-	Patch from ruby trunk by nobu.
-	* lib/*:  Spelling cleanup.  Patch from trunk by Evan Farrar.
-	* test/*:  Fixes for win32 test failures reported by Luis Lavena.
-	* util/gem_prelude.rb:  Only remove methods added by gem_prelude.rb.
-
-2008-06-16  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/indexer.rb:  Fix quick_index generation.
-	* lib/rubygems/specification.rb:  Correctly guard new spec features
-	for older RubyGems.
-	* lib/rubygems/config_file.rb:  Add system-wide config file
-	(/etc/gemrc).  Patch #14723 by Phil Hagelberg.  Add windows code to
-	use appropriate directory.  Code by Daniel Berger.
-	* doc/release_notes/rel_1_2_0.rdoc:  Draft of 1.2.0 release notes.
-
-2008-06-15  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/server.rb:  Store off if we are returning Marshal
-	format before running =~ again.  Fixes bug reported by Chad Woolley.
-	* lib/rubygems/commands/stale_command.rb:  `gem stale` lists gems by
-	last access time.  Patch #20593 by Aaron Patterson.
-	* lib/rubygems/setup.rb:  Add --vendor and --destdir to setup.rb for
-	packagers.  Patch #20610 by Richard Brown.  Don't look for stub
-	files to remove any more.
-	* lib/rubygems/specification.rb:  Bump specification version and be
-	backwards compatible with type 2 specs.
-	* lib/rubygems/commands/query_command.rb:  Add installed location to
-	details for installed gems.
-
-2008-06-09  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/dependency_installer.rb:  Only install all dependencies
-	when install_dir option is set.  Don't include satisfied dependencies
-	when gathering dependencies.
-	* lib/rubygems/commands/query_command.rb:  Display authors, rubyforge
-	and homepage urls with details.
-	* lib/rubygems/commands/environment_command.rb:  Add executable
-	directory (from Rubinius).
-	* lib/rubygems/commands/install_command.rb:  Don't set install_dir by
-	default.
-	* lib/rubygems/commands/update_command.rb:  Don't set install_dir by
-	default.  Use #find_missing for efficiency.
-
-2008-06-07  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/server.rb:  Fully mirror Gem::Indexer indexes, set
-	correct content-type headers, always refresh the source index.
-	* lib/rubygems/source_index.rb:  Add spec_dirs so that #refresh! will
-	always reload from the same locations.  #refresh! on manually-built
-	SourceIndex now raises.  Fixes #20509 by Chad Woolley.
-
-2008-06-06  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb:  Remove previous bin_script_path in case
-	it is a symlink.
-	* lib/rubygems/commands/pristine_command.rb:  Force reinstallation of
-	the gem using the installer.  Fixes bug #20387 by Erik Persson.
-	* lib/rubygems/doc_manager.rb:  Ensure args to RDoc are all strings.
-	* lib/rubygems/source_index.rb:  Use find_matching to discover updated
-	specs instead of fetch.
-	* lib/rubygems/commands/query_command.rb:  Platform, not name in spec
-	tuples.
-
-2008-06-05  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/local_remote_options.rb:  Ensure remote repository URLs
-	reference directories.  Fixes bug #20134 by Neil Wilson.
-	* lib/rubygems/source_index.rb:  Gracefully handle ^C or explicit exit
-	while loading .gemspec files from disk.  Fixes bug #20523 by Joel
-	VanderWerf.
-	* lib/rubygems/specification.rb:  Use File#expand_path in
-	installation_path.  Fixes bug #19317 by Hemant Kumar.
-	* lib/rubygems/spec_fetcher.rb:  Fix legacy test against URI.
-	* lib/rubygems/remote_fetcher.rb:  Always raise FetchError from
-	RemoteFetcher.  Fix FetchErrors without URIs.  Refactor Net::HTTP
-	request code to use persistent connections for HEAD requests.  Feature
-	Request #7973 by Christian Schachtzabel.
-	* lib/rubygems.rb:  Don't load custom_require until after the OS and
-	implementation have had a chance to set paths.
-
-2008-06-04  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/source_index.rb:  Only fetch specs we need in
-	#outdated.
-	* lib/rubygems.rb:  Fix typo in ::activate exception.
-	* lib/rubygems/dependency.rb:  For #to_s, display dependency type when
-	nil.
-	* lib/rubygems/dependency_installer.rb:  Reset #installed_gems for
-	every #install.  Fixes bug #19444 by Glenn Rempe.
-	* lib/rubygems/installer.rb:  Don't re-read the disk to check for new
-	gems, add them by hand on install.
-
-2008-06-03  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  Add ::gzip, ::gunzip, ::deflate and ::inflate.
-	* lib/rubygems/server.rb:  Add specs and latest_specs indicies.
-	* setup.rb:  Don't require rdoc until needed.  Patch #20414 by Brian
-	Candler.
-	* lib/uninstaller.rb:  Correctly uninstall gems installed with a
-	legacy platform.  Patch #19877 by Luis Lavena.
-	* lib/rubygems/commands/update_command.rb:  Only fetch remote specs
-	when we know what we're looking for.
-
-2008-06-02  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb:  Remove double slash in
-	#installation_path.  Fixes bug #19896 by Heiko Seebach.
-	* lib/rubygems/remote_fetcher.rb:  Require StringIO.  Fixes bug #19866
-	by Caleb Land.
-	* lib/rubygems.rb:  Require rubygems/defaults/#{RBX_ENGINE}.rb and
-	rubygem/defaults/operating_system.rb if they exist.  (OS require comes
-	first and may be overridden by operating system.)
-
-2008-06-01  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/indexer.rb:  Ensure identical names, versions and
-	platforms are identical for a smaller index.
-	* lib/rubygems/spec_fetcher.rb:  Only write to cache when we own it.
-	* lib/rubygems.rb:  Honor default_path if GEM_PATH environment
-	variable is not set.  Patch #19502 by Donavan Pantke.
-	* lib/rubygems/installer.rb:  Set file mode indicated by tar file.
-	Patch #19737 by Jason Roelofs.
-
-2008-06-01  John Barnette <jbarnette@rubyforge.org>
-
-	* lib/rubygems.rb: Add Gem.available?(gem, *specs) for easy availability
-	checks at runtime.
-
-2008-05-31  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/dependency_command.rb:  Delay fetching specs
-	until needed.  Reverse dependencies can no longer be calculated for
-	remote sources.  Add backwards compatibility.
-	* lib/rubygems/commands/fetch_command.rb:  Add backwards
-	compatibility.
-
-2008-05-30  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/local_remote_options.rb:  --sources option should not
-	add URIs to Gem.sources.
-	* lib/rubygems/spec_fetcher.rb:  Add #warn_legacy to help handling
-	legacy sources.
-	* luby/rubygems/commands/query_command.rb:  Add backwards
-	compatibility with legacy sources.
-
-2008-05-28  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/remote_fetcher.rb:  Add #uri to
-	Gem::RemoteFetcher::FetchError.
-	* lib/rubygems/user_interaction.rb:  Improve RDoc slightly.
-	* lib/rubygems/spec_fetcher.rb:  Introduce backwards compatibility for
-	legacy (pre 1.2) repositories
-	* lib/rubygems/commands/sources_command.rb:  Backwards compatibility
-	and restoration of --update.
-	* lib/rubygems/specification.rb:  Ensure nil-typed dependencies become
-	runtime dependencies.
-
-2008-05-27  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/spec_fetcher.rb:  Switch #fetch, #find_matching to be
-	compatible with Gem::SourceInfoCache#search_with_source.  Add caching
-	for .gemspec files.
-	* lib/rubygems/dependency_installer.rb:  Switch to SpecFetcher.
-	* lib/rubygems/source_index.rb:  Switch #outdated to use SpecFetcher.
-	* lib/rubygems/commands/dependency_command.rb:  Switch to SpecFetcher.
-	* lib/rubygems/commands/outdated_command.rb:  Switch to SpecFetcher.
-	* lib/rubygems/commands/query_command.rb:  Switch to SpecFetcher.
-	* lib/rubygems/commands/sources_command.rb:  Switch to SpecFetcher.
-	* lib/rubygems/commands/update_command.rb:  Switch to SpecFetcher.
-	* lib/rubygems/version.rb:  Handle comparisons with non-Gem::Version
-	objects.
-
-2008-05-13  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/spec_fetcher.rb:  Add caching of specs, latest_specs
-	files.
-	* test/gemutilities.rb:  Ensure Gem.user_home doesn't point to ~.
-
-2008-05-09  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/indexer.rb:  Add Marshal format index of spec names,
-	versions and platforms.  WIP.
-	* lib/rubygems/spec_fetcher.rb:  WIP for replacement of
-	Gem::SourceInfoCache and SourceInfoCacheEntry.
-	* lib/rubygems/dependency.rb:  Add #=~.
-
-2008-05-07 John Barnette <jbarnette@gmail.com>
-
-	* lib/rubygems/specification.rb, et. al: Let gems have development
-	dependencies, which aren't installed (except when --development is
-	supplied) or activated.
-
-2008-05-02  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/indexer.rb:  Refactored into simpler more imperative
-	code.
-	* lib/rubygems.rb:  Leave rbconfig/datadir.rb for non-RubyGems use.
-
-2008-04-16  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/server.rb:  Refresh the source index per request so new
-	gems will be found after server startup.
-
-2008-04-15  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_index.rb:  Only print out "Bulk updating" when
-	verbose, fix #latest_specs documentation.
-	* lib/rubygems/dependency_installer.rb:  Add :cache_dir option for
-	Tinderbox.
-
-2008-04-14  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/test_utilities.rb:  Expose some internal testing
-	utilities that are of general use.
-
-2008-04-10  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  Fix Gem.prefix so it reports nil when rubygems.rb
-	is in sitelibdir, libdir, or doesn't have 'lib' as a parent directory.
-	* doc/release_notes/rel_1_1_1.rdoc:  RubyGems 1.1.1 release notes.
-	* lib/rubygems/rubygems_version.rb:  1.1.1.
-
-2008-04-07  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/server.rb:  Fix fragment URIs.  Patch by James Tucker.
-	* lib/rubygems/commands/update_command.rb:  Pass
-	--no-format-executable to setup.rb.  Patch by Stephen Bannasch.
-
-2008-04-06  Chad Woolley  <thewoolleyman@gmail.com>
-
-	* lib/rubygems.rb:  Add setter Gems.platforms=, to allow platforms
-	to be set/reset when invoking or testing RubyGems programatically.
-	Also force Gems.platforms to automatically reset to default of
-	[Gem::Platform::RUBY, Gem::Platform.local] if cleared.
-	* lib/rubygems/version_option.rb:  Change add_platform_option
-	to initialize Gem.platforms to contain only Gem::Platform::RUBY
-
-2008-04-04  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_index.rb:  Make Gem::SourceIndex#refresh!
-	more-correct.  Reported by Paul Haddad.
-	* lib/rubygems.rb:  Add Gem::refresh.  Bug #19176 by Hongli Lai.
-	* lib/rubygems/dependency_installer.rb:  Put downloaded gems into
-	install_dir's cache.  Patch #19182 by Richard Brown.
-
-2008-04-03  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_info_cache.rb:  Merge full cache file into
-	latest data.  Don't write cache files when checking for them.  Only
-	update full cache file when we've read it.  Refresh all data when
-	loading all data.
-	* lib/rubygems/dependency_installer.rb:  Fix --force to work without
-	network for dependent gems.  Fix all-fetching test.
-	* lib/rubygems/commands/query_command.rb:  Obey --all flag for gem
-	query.
-	* lib/rubygems/commands/environment_command.rb:  Don't display
-	RubyGemsPackageVersion.
-	* lib/rubygems/indexer.rb:  Fix typo.  Patch by Tom Copeland.
-	* lib/rubygems/command_manager.rb:  Display RubyGemsVersion with
-	--version.
-	* lib/rubygems/commands/pristine_command.rb:  Rebuild extensions along
-	with everything else.  Patch #19281 by Dr. Nic Williams.
-
-2008-04-01  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  Fix prefix to point to directory above RubyGems,
-	so RubyGems will be installed into lib/.
-	* setup.rb:  Work around apple's libdir-installed RubyGems, by
-	installing into sitelibdir.
-	* Rakefile:  Add svnversion to RubyGems version number for `rake
-	install`.
-
-2008-03-31  Luis Lavena  <luislavena@gmail.com>
-
-	* test/: Allow tests to use a random (but controlled) port number
-	instead of a hardcoded one. This helps CI tools when running
-	parallels builds.
-
-2008-03-30  Luis Lavena  <luislavena@gmail.com>
-
-	* test/test_gem.rb: Leave APPLE_GEM_HOME tests only to *nixes.
-	* lib/rubygems/remote_fetcher.rb: Errno::ECONNABORTED raised on Windows
-	on closed Keep-Alive connections.
-
-2008-03-29  Eric Hodel  <drbrain@segment7.net>
-
-	* gemspecs/:  Removed.
-	* examples/:  Removed.
-	* doc/design/:  Removed.
-	* doc/rdoc_templates/:  Removed.
-	* Rakefile:  Package doc/release_notes/.
-	* setup.rb:  Use full path to release_notes, ensure RDoc can be
-	both removed and installed.
-
-2008-03-28  Eric Hodel  <drbrain@segment7.net>
-
-	* bin/gem, Rakefile:  RubyGems now requires Ruby > 1.8.3.
-	* lib/rubygems.rb:  Added Gem.ruby_version, Gem.read_binary,
-	Gem.binary_mode.
-	* lib/, test/:  Read files in binary mode for windows and ruby 1.9.
-	* lib/rubygems/commands/update_command.rb:  Only update once.
-	* lib/rubygems/commands/sources_command.rb:  Ditto.
-	* lib/rubygems/source_index.rb:  Fix #remove_extra, #find_missing so
-	legacy platform gems don't get updated repeatedly.
-	* doc/release_notes/rel_1_1_0.rdoc:  RubyGems 1.1.0 release notes.
-	* lib/rubygems/rubygems_version.rb:  1.1.0.
-
-2008-03-28  Ryan Woodrum  <rwoodrum@avvo.com>
-
-	* lib/rubygems/commands/query_command.rb: Add --installed
-	subcommand to check if a gem and/or version is installed.
-	* test/test_gem_commands_query_command.rb: Add relevant tests.
-	* test/gemutilities.rb: Override exit() for query tests.
-	* test/mockgemui.rb: Add =() to manipulate output values (clear).
-
-2008-03-28  Chad Woolley  <thewoolleyman@gmail.com>
-
-	* lib/rubygems/source_info_cache.rb: Add reset_cache_file.
-
-2008-03-27  Chad Woolley  <thewoolleyman@gmail.com>
-
-	* lib/rubygems/user_interaction.rb: Raise Gem::SystemExitException
-	instead of exiting, kill unused terminate_interaction!.
-	* lib/rubygems/exceptions.rb: Add Gem::SystemExitException.
-	* lib/rubygems/commands/install_command.rb: Raise
-	Gem::SystemExitException instead of exiting.
-	* bin/gem: Rescue Gem::SystemExitException and exit with
-	specified exit_code.
-	* test/test_gem_commands_install_command.rb: Assert on
-	Gem::SystemExitException and exit_code in tests.
-
-2008-03-27  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/sources_command.rb:  Allow sources to be
-	removed without network.  Fixes bug #18644 by Mikel Lindsaar.
-
-2008-03-27  Luis Lavena  <luislavena@gmail.com>
-
-	* lib/rubygems/commands/environment_command.rb: Use platform specific
-	PATH_SEPARATOR instead of hardcoded ':'
-	* test/test_gem_commands_unpack_command.rb: Ditto.
-	* test/test_gem_commands_environment_command.rb: Ditto.
-	* test/gemutilities.rb: Fix binary file reads being truncated on
-	Windows.
-	* test/test_gem_commands_install_command.rb: Switch to read_binary.
-	* test/test_gem_commands_update_command.rb: Ditto.
-	* test/test_gem_commands_server_command.rb: Consider full path when
-	evaluating location (instead of hardcoded or missing drive leter).
-	* test/test_gem_installer.rb: Ditto.
-	* test/test_gem_dependency_installer.rb: exclude no-wrapper tests for
-	Windows.
-
-2008-03-26  Luis Lavena  <luislavena@gmail.com>
-
-	* lib/rubygems.rb: Handle backslashes that came from GEM_HOME and
-	GEM_PATH on Windows.
-
-2008-03-25  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_index.rb:  Add updating from latest index,
-	default to updating from latest index.  Reduces common-case update
-	to under 3,000 gems at present.
-	* lib/rubygems/remote_fetcher:  Fix error reporting from net/http.
-	* lib/rubygems.rb:  Sort methods, remove last vestiges of autorequire,
-	RDoc cleanup.
-
-2008-03-23  Luis Lavena  <luislavena@gmail.com>
-
-	* setup.rb: generated Windows stubs will honors prefix using Gem.ruby
-	instead of hardcoded 'ruby.exe'
-	* lib/rubygems/installer.rb: generated Windows stubs scripts will now
-	work from differnt directories than Gem::bindir. Fixes bug #16259 by
-	Claus Folke Brobak
-
-2008-03-20  Eric Hodel  <drbrain@segment7.net>
-
-	* test/test_gem_source_info_cache.rb:  Test with real objects now.
-	* lib/rubygems/source_index.rb:  #latest_specs now has latest specs
-	for all platforms.
-	* lib/rubygems/source_info_cache.rb:  Add latest cache data, only load
-	full cache data when needed.
-
-2008-03-20  Luis Lavena  <luislavena@gmail.com>
-
-	* test/gemutilities.rb:  Change all the file processing mechanism to
-	enable binary mode by default (required for Windows file operations
-	dealing with non-printable characters).
-
-2008-03-19  Luis Lavena  <luislavena@gmail.com>
-
-	* lib/rubygems/package/tar_output.rb: Adapted code to use #wrap instead
-	of #new when dealing with Zlib::GzipWriter (fixes SEGV and warnings due
-	GzipWriter object not being closed explicitly).
-
-2008-03-12  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/indexer.rb:  Add latest_index.
-
-2008-03-09  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/defaults.rb:  Add special case for RUBY_ENGINE constant
-	when setting default gem dir.
-	* Rakefile:  Add update_rubinius and diff_rubinius.
-
-2008-03-08  Lincoln Stoll  <lstoll@lstoll.net>
-
-	* lib/rubygems/server.rb:  Drop use of RDoc's TemplatePage in favor of
-	ERB.
-
-2008-03-04  Ryan Davis  <ryan@wrath.local>
-
-	* lib/rubygems/remote_fetcher.rb: Moved #download from
-	DependencyInstaller.
-	* lib/rubygems/commands/fetch_command.rb: Updated to use #download.
-	* lib/rubygems/dependency_installer.rb: install now takes name or dep.
-	Renamed gather_specs_to_download to find_spec_by_name_and_version.
-	Modifed #initialize to not take gem name or version.
-
-2008-03-04  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/package*:  Removed #open_from_io and friends, switched
-	to #open, no special handling for file names.
-	* lib/rubygems/package/tar_output.rb:  Refactored ::open to use
-	instance methods.
-	* lib/rubygems/remote_fetcher.rb:  Print out number of requests made
-	before connection reset.
-
-2008-02-29  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/package/tar_reader/entry.rb:  Removed is_directory and
-	is_file? in favor of file? and directory?.
-
-2008-02-28  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/package.rb:  Broke up Tar bits into separate files.
-	* lib/rubygems/package/tar_reader/entry.rb:  Don't copy TarHeader data
-	into Entry, go through #header instead.  Better tests for
-	TarReader::Entry.
-
-2008-02-27  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/dependency_installer.rb:  Automatically fall back to
-	local-only install on network error.  Fixes bug #15759 by Chauk-Mean P.
-	* lib/rubygems/source_index.rb:  Process spec dirs so that earlier
-	dirs override later dirs.  Fixes bug #14816 by Kurt Stephens.
-
-2008-02-26  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/update_command.rb:  Only update gems that need
-	updates.  Fixes bug #14780 by Mathieu Lajugie.  Don't force
-	remote-only updates.  Properly handle dependencies when updating.
-	Fixes bug #17488 by Hongli Lai.
-	* lib/rubygems/commands/environment_command.rb:  Display path as a
-	usable path.
-	* lib/rubygems.rb:  Don't add APPLE_GEM_HOME with ENV['GEM_HOME'].
-
-2008-02-25  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  Expand sitelibdir when checking prefix.  Fixes bug
-	#17983 by Hemant Kumar.
-	* setup.rb:  Print release notes on installation.  Tell people where
-	`gem` was installed.
-	* bin/update_rubygems:  Added --help output to explain how to install
-	earlier versions of RubyGems.  Added --version option workaround.
-	Fixes bug #16842 by Chad Woolley.
-	* lib/rubygems/install_command.rb:  Give proper exit code on failure.
-	Fixes bug #17438 by Josh Nichols.
-
-2008-02-23  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/remote_fetcher.rb:  Change hosts correctly when
-	redirecting.  Handle EOFError from Net::HTTP.
-	* lib/rubygems/commands/specification_command.rb:  Pull specifications
-	from gem files.
-	* lib/rubygems/uninstaller.rb:  When :executable is set, don't ask the
-	user.  Fixes bug #16812 by Matt Mower.  Raise exception instead of
-	printing message when gem is not in GEM_HOME.
-	* lib/rubygems/uninstall_command.rb:  Print message when gem is not in
-	GEM_HOME.
-	* lib/rubygems/commands/cleanup_command.rb:  Clean up all old gems.
-	* lib/rubygems/commands/unpack_command.rb:  Scan every gem path when
-	unpacking.  Fixes bug #17602 by Ryan Davis.
-
-2008-02-20  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/install_update_options.rb: Add --bindir option to
-	specify destination to install executables into.  Patch #17937 by
-	Donavan Pantke.
-	* lib/rubygems/specification.rb: Fix Time.today == Time.today.  Bug
-	#17413 by Andrei Bocan.
-	* setup.rb: Properly check for deletablitily of user and system
-	caches.  Bug #17869 by Alexey Verkhovsky.  Fix --no-format-executable.
-	Fixes bug #16879 by Charles Nutter.
-
-2008-02-19  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/remote_fetcher.rb: Add persistent connection support.
-	Patch #18180 by Aaron Patterson.
-	* lib/rubygems/installer.rb: Fix #shebang to use the ruby install
-	name.  Patch #16878 by Donavan Pantke.
-	* lib/rubygems/defaults.rb, lib/rubygems.rb: Enable defaults for
-	Gem.path and Gem.bindir.  Patch #17886 by Donavan Pantke.
-	* test/test_gem_ext_configure_builder.rb: Make test_self_build_fail
-	more platform independent.  Patch #17599 by Martin Krauskopf.
-
-2008-02-14  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/fetch_command.rb: Fix a bug when fetching
-	from non-default sources.  Report non-existent gems instead of
-	crashing.
-
-2008-01-09  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/update_command.rb: Use portable and safe ENV
-	operation.  Patch by usa in ruby SVN revision 14739.
-	* lib/rubygems/open-uri.rb: Fix tests.  Patch by NARUSE Yui.
-	[ruby-dev:33336]
-
-2007-12-23  Eric Hodel  <drbrain@segment7.net>
-
-	* util/gem_prelude.rb:  Remove methods from Gem, not QuickLoader, to
-	fix warnings.
-
-2007-12-22  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/environment_command.rb:  Put GEM PATHS in the
-	correct order.
-	* lib/rubygems/commands/uninstall_command.rb:  Add --install-dir to
-	specify which local repository to uninstall from.  Patch #15151 by
-	Donavan Pantke.
-	* lib/rubygems/uninstaller.rb:  Only allow uninstallation of gems from
-	specified directory.  Properly clean up executables on uninstall.
-	Patch #15151 by Donavan Pantke.
-	* lib/rubygems/install_update_options.rb:  Add --no-env-shebang
-	option.  Patch #16508 by Donavan Pantke.
-	* util/gem_prelude.rb:  Use require to load rubygems.rb to make
-	$LOADED_FEATURES correct on RubyGems update.
-
-2007-12-21  Eric Hodel  <drbrain@segment7.net>
-
-	* util/gem_prelude.rb:  Place bin before lib so bin stubs work.
-
-2007-12-20  Eric Hodel  <drbrain@segment7.net>
-
-	* Rakefile:  Require Ruby > 1.8.2.  Enable CERT_DIR.
-	* lib/rubygems.rb:  Work with RbConfig and Config.  Bug #16457 by
-	Christian Ramilo, John Barnette.
-	* lib/rubygems/commands/build_command.rb:  Relax yaml? test to work
-	with Ruby 1.8.3.
-	* lib/rubygems/rubygems_version.rb:  1.0.1.
-	* doc/release_notes/rel_1_0_1.rdoc:  RubyGems 1.0.1 release notes.
-
-2007-12-19  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb:  Revert change that only wrapped
-	executables with #!.
-	* lib/rubygems/specification.rb:  Warn about a lot of things that
-	could be wrong with gemspecs on build, including missing #!.  Use
-	'x86-mswin32' for legacy 'mswin32' platform, fix CURRENT platform.
-	Paired with Luis Lavena.
-	* lib/rubygems/remote_installer.rb:  Deleted.
-	* lib/rubygems.rb:  Removed Kernel#require_gem.
-	* doc/release_notes/rel_1_0_0.rdoc:  RubyGems 1.0 release notes.
-	* lib/rubygems/rubygems_version.rb:  1.0.0.
-
-2007-12-18  Luis Lavena  <luislavena@gmail.com>
-
-	* lib/rubygems/commands/mirror_command.rb: Work around URI::parse
-	processing file:// scheme and drive paths on Windows.
-	* test/test_gem_commands_mirror_command.rb: ditto.
-
-2007-12-17  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb:  Copy files into bindir if they don't
-	have a shebang.  Bug reported by Luis Lavena.
-	* lib/rubygems/server.rb:  Handle platforms in Gem::Server#quick.
-	Exactly match gem names.  Bugs reported by Chad Woolley.
-	* lib/rubygems/platform.rb:  Remove platform constants in favor of
-	Gem::Platform::CURRENT.  Bug reported by Luis Lavena.
-	* lib/rubygems/dependency_installer.rb:  Work around Dir::glob not
-	understanding File::ALT_SEPARATOR.  Bug submitted by Luis Lavena.
-
-2007-12-16  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/remote_fetcher.rb:  Be more verbose in error messages
-	from OpenURI.
-	* lib/rubygems/server.rb:  Be more verbose in error/missing responses.
-
-2007-12-15  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb:  Output extension build results when
-	really verbose.  From bug #15853 John Croisant.
-	* lib/rubygems/specification.rb:  Fix backwards compatibility with
-	0.9.4, don't allow the platform to be nil or an empty string.  Bug
-	#16177 by Dan Manges.
-	* setup.rb:  Re-exec setup.rb if rubygems is loaded and RUBYOPT is
-	set.  Fixes bug #15974 by Joshua Sierles.
-	* lib/rubygems/update_command.rb:  Tweak formatting of updated
-	message.  Bug #15625 by Bil Kleb.
-	* lib/rubygems/remote_fetcher.rb:  Add URI to exception message for
-	Gem::RemoteFetcher#fetch_size.  Bug #14801 by Bil Kleb.
-
-2007-12-14  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/query_command.rb:  Don't display duplicate
-	version numbers.  Bug #15828 by Tim Fletcher.
-	* setup.rb:  Fix my stupidity with --help.  Patch #16308 by Stephen
-	Bannasch.  Fix --prefix= argument.  Bug #16002 by Piglop.
-
-2007-12-13  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/server_command.rb:  Fix --no-daemon.  Bug by
-	Chad Woolley.
-	* lib/rubygems/server.rb:  Fix Marshal quick index.  Bug by Chad
-	Woolley.
-	* lib/rubygems/installer.rb: Respect Gem::Specification#bindir.  Bug
-	#16202 by Suraj Kurapati.
-	* lib/rubygems/commands/update_command.rb: Fix `gem update mysql`.
-	Bug #16244 by Stephen Bannasch.
-
-2007-12-12  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb:  Add --format-executable option to
-	install executables with ruby's program-suffix and prefix.  Patch
-	#14688 by Jeremy Kemper.  Also, installing in really-verbose mode
-	prints out written files.
-	* setup.rb:  Add --format-executable option to install gem with ruby's
-	program-suffix and prefix.  Add --help.  Fixes bug #16056 by Chad
-	Woolley.
-	* lib/rubygems/uninstaller.rb:  Fallback to original_platform_name
-	correctly.  Patch #15960 by Nicola Piccinini's friend.
-
-2007-12-11  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/validator.rb:  Correct test run failures when no tests
-	are provided.  Patch #15701 by Jérémy Zurcher.
-	* lib/rubygems/commands/mirror_command.rb:  Don't File.join a
-	URI::HTTP.  Patch #16116 by Morgan Nelson.
-	* lib/rubygems/commands/unpack_command.rb:  Add --target option to
-	`gem unpack`.  Patch #16154 by Kevin Barnes.
-
-2007-12-10  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/dependency_installer.rb:  Revert to nil for the default
-	security policy to avoid requiring OpenSSL.
-	* lib/rubygems/defaults.rb: Consolidate defaults for easier editing.
-	Patch #15150 by Donavan Pantke.
-
-2007-11-27  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_index.rb: Remove dependency on forwadable.
-	Patch by Koichi Sasada.
-	* lib/rubygems/specification.rb: Reduce dependency on time.rb.  Patch
-	by Koichi Sasada.
-
-2007-11-26  Rich Kilmer <rich@infoether.com>
-
-	* lib/rubygems/version.rb: Fix bug 15948 with version bump
-	* test/test_gem_version.rb: Test for bug 15948 with version bump
-	* util/gem_prelude.rb: wrap init code with exception handler
-	and skip badly formed directory names
-
-2007-11-23  Rich Kilmer <rich@infoether.com>
-
-	* lib/rubygems.rb: Centralize all CONFIG options into Hash
-	Gem::ConfigMap with keys as symbols, change all references
-	to CONFIG to ConfigMap
-	* lib/rubygems/require_paths_builder.rb: Added to support 
-	building .require_paths file
-	* lib/rubygems/installer.rb: Add building of .require_paths if
-	needed
-	* lib/rubygems/platform.rb: Use new ConfigMap hash for arch
-	* lib/rubygems
-	* util/gem_prelude.rb: new gem prelude for Ruby 1.9
-	* test/test_gem_installer.rb: change to use ConfigMap hash
-	* test/gemutilities.rb: change to use ConfigMap hash
-
-2007-11-21  Daniel Berger <djberg96@gmail.com>
-
-	* lib/rubygems/platform.rb: Gem::Platform.new now returns
-	Gem::Platform.local if the arch matches Gem::Platform::CURRENT.
-	Bugs #15815 and #15782 submitted by Daniel Berger.
-
-2007-11-20  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/platform.rb: Handle bare 'mswin32' platform's CPU.
-
-2007-11-19  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/rubygems_version.rb: 0.9.5.
-
-2007-11-16  Eric Hodel  <drbrain@segment7.net>
-
-	* test/gemutilities: Add a legacy platform gem to the default test
-	gems list.
-	* lib/rubygems/specification.rb: Add Gem::Specification#original_name
-	for legacy purposes
-	* lib/rubygems/indexer.rb: Use #original_name to make the indexer
-	backwards compatible.
-	* lib/rubygems/master_index_builder.rb: Reduce memory consumption.
-
-2007-11-13  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/rubygems_version.rb: 0.9.4.7 beta.
-	* lib/rubygems.rb: Patch for RUBY_FRAMEWORK for OS X 10.5.  Patch
-	submitted by Laurent Sansonetti.
-	* lib/rubygems.rb: cygwin, djgpp, mingw are Windows platforms.  Fixes
-	bug #15537 by Roger Pack.
-
-2007-11-11  Eric Hodel  <drbrain@segment7.net>
-
-	* Rakefile: Tasks for maintaining ruby trunk export of RubyGems.
-	* lib/rubygems/specification.rb: Preserve original platform across
-	serialization.
-	* lib/rubygems/dependency_installer.rb: Retry with original platform
-	name on fetch error.
-
-2007-11-09  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb: Set #original_platform only once.
-	* lib/rubygems/indexer.rb: Handle legacy platforms.
-	* lib/rubygems/platform.rb: Gem::Platform is a valid argument.  Bug
-	#15511 submitted by Daniel Berger.
-	* lib/rubygems/custom_require.rb: Fix compatibility with 1.8.2.  Bug
-	#14933 submitted by Aaron Patterson.
-	* lib/rubygems/command.rb: Now '-V' enables verbose.  Bug #14951
-	submitted by Sasa Ebach.
-	* lib/rubygems/commands/check_command.rb: Change use of '-v', '-V' to
-	match above.
-	* lib/rubygems/package.rb: #send! is gone again.
-	* lib/rubygems.rb: Don't add custom_require for 1.9.
-	* test/*: Make compatible with 1.9 import.
-
-2007-10-30  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb: Don't re-use @platform to maintain
-	backwards compatibility.
-	* lib/rubygems/platform.rb: Handle nil and 'ruby' platforms in ::new.
-
-2007-10-20	Daniel Berger	<djberg96@gmail.com>
-
-	* lib/rubygems/uninstaller.rb: Changed '.cmd' to '.bat' in the
-	remove_executables method for MS Windows. Patch from Luis Lavena.
-
-2007-10-18  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/rubygems_version.rb: 0.9.4.6 beta.
-
-2007-10-19  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/update_command.rb: Don't install with
-	dependencies when updating.  This is a hack.
-
-2007-10-19  Daniel Berger  <djberg96@gmail.com>
-
-	* setup.rb: gem.cmd stub is now gem.cmd, and the stub generation was
-	changed - now better for NT. Patch #14725 (Luis Lavena).
-	* lib/rubygems/installer.rb: Same as for setup.rb.
-
-2007-10-18  Daniel Berger  <djberg96@gmail.com>
-
-	* lib/rubygems/platform.rb: Modified the Platform.local method for MS
-	Windows for versions built with VC++ 6. Patch #14727 (Luis Lavena).
-	* test/test_gem_specification.rb: Added version independent tests for
-	MS Windows. Patch #14727 (Luis Lavena).
-
-2007-10-18  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/remote_fetcher.rb: Add platform to User-Agent.
-	* lib/rubygems/commands/install_command.rb: Fix typo.  Debian bug
-	#443135 submitted by Reuben Thomas.
-	* lib/rubygems/dependency_installer.rb: Don't install dropped
-	dependencies.  Fixes bug #14724 submitted by Luis Lavena.
-
-2007-10-17  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/update_command.rb: Unset RUBYOPT when running
-	setup.rb
-	* setup.rb: Re-exec without RUBYOPT if it is set.  Fixes bug #14683
-	submitted by Lyle Johnson.
-
-2007-10-16  Daniel Berger  <djberg96@gmail.com>
-
-	* lib/rubygems/indexer/abstract_index_builder.rb: The compress method
-	now does a binary read to make MS Windows happy.
-
-2007-10-16  Eric Hodel  <drbrain@segment7.net>
-
-	* setup.rb: Installs bin stubs that warn when you try to use the old
-	commands.  Simple mswin deprecation stubs by Luis Lavena.
-
-2007-10-12  Eric Hodel  <drbrain@segment7.net>
-
-	* setup.rb: Remove source caches on install.
-	* doc/release_notes/rel_0_9_5.rdoc: Draft added.
-	* lib/rubygems/rubygems_version.rb: 0.9.4.5 beta.
-
-2007-10-10  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/dependency_installer.rb: Fix small bug found by Alan C.
-	Francis.
-
-2007-10-09  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/dependency_installer.rb: Use install_dir so custom gem
-	repos can be used.
-	* lib/rubygems/specification.rb: Always set required attributes, even
-	if they match the default.
-
-2007-10-08  Ryan Davis  <ryan@wrath.local>
-
-	* lib/rubygems.rb: Fixed require order so custom_require is
-	last. Added HACK tag to remind Jim to release rake.
-	* test/test_gem_source_index.rb: Fixed latest_specs' tests so
-	failures were much more readable.
-	* lib/rubygems/source_index.rb: Fixed latest_specs to deal with
-	platforms appropriately. Returns array again.
-
-2007-10-08  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/config_file.rb: Boost bulk_threshold to 1000, Marshal
-	format is smaller than yaml format quick index.
-	* lib/rubygems/installer.rb: Make #shebang correctly rewrite env
-	shebangs.
-	* lib/rubygems/specification.rb: Mark Time.today for removal, too much
-	depends upon it now.
-
-2007-10-07  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb: Sped up ::_load.
-	* lib/rubygems/source_index.rb: Sped up #search.
-	* lib/rubygems/version.rb: Replace #to_ints with #ints, and cache
-	result.
-	* lib/rubygems/source_info_cache.rb: Only flush cache when it changes.
-
-2007-10-05  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/user_interaction.rb: Allow customization of completion
-	message for progress reporters.
-	* lib/rubygems/command.rb: Add --quiet option.
-	* lib/rubygems/commands/generate_index_command.rb: Add description.
-
-2007-10-04  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/uninstaller.rb: Also check and uninstall old platform
-	name to ensure legacy platform gems are uninstalled.
-	* lib/rubygems/doc_manager.rb: Remove existing rdoc and ri directory
-	so regenerating docs succeeds even if previously interrupted.
-
-2007-10-02  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_index.rb: Make #outdated search only for gems
-	matching the current platform.
-	* lib/rubygems/commands/dependency_command.rb: Add --platform.
-	* lib/rubygems/commands/outdated_command.rb: Ditto.
-	* lib/rubygems/commands/specification_command.rb: Ditto.
-	* lib/rubygems/commands/update_command.rb: Ditto.
-
-2007-10-02  Wilson Bilkovich  <wilson@supremetyrant.com>
-
-	* lib/rubygems/specification.rb: Custom Marshal format to reduce index
-	size.
-	* lib/rubygems/requirement.rb: Ditto
-	* lib/rubygems/version.rb: Ditto
-
-2007-10-01  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/platform.rb: Handle mswin32 on VC6.  Partial patch and
-	assistance by Luis Lavena.  Handle cpu-os-version style platforms for
-	command-line arguments.
-
-2007-09-30  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb: Gem::Specification is now
-	forward-compatible while loading.
-
-2007-09-29  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_info_cache_entry.rb: Correctly handle URIs.
-	* lib/rubygems/remote_fetcher.rb: ditto.
-	* lib/rubygems/remote_options.rb: Add --update-sources option.  Patch
-	#14246 submitted by Alan Francis.
-	* lib/rubygems/config_file.rb: Add update_sources setting to control
-	automatic refreshing of sources (patch #14246).  Fix bug where things
-	would be overwritten in ~/.gemrc when they shouldn't.
-
-2007-09-28  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/rubygems.rb: Gem.ruby now returns the full path.  Added
-	Gem.prefix to make self updating work right.
-	* setup.rb, pre-install.rb, post-install.rb: Replace with a small,
-	simple setup script that works.
-	* lib/rubygems/commands/update_command.rb: Pass rdoc, ri and prefix
-	flags down to setup.rb when self updating.
-
-2007-09-26  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/version_option.rb: Always include RUBY platform,
-	allow RUBY platform as an option.
-	* lib/rubygems/specification.rb: Gems with non-ruby platform sort
-	last (first in preference for installation).
-	* lib/rubygems/platform.rb: Allow matching of legacy platforms.
-	* lib/rubygems/source_index.rb: Add only_platform option to #search.
-
-2007-09-24  Wilson Bilkovich  <wilson@supremetyrant.com>
-	* lib/rubygems/indexer.rb: Generate a Marshal index in parallel to YAML
-	* lib/rubygems/source_index.rb: Fetch a Marshal index if it exists, to
-	avoid the memory cost of parsing a huge YAML file
-	* lib/rubygems/commands/mirror_command.rb: Check for Marshal first
-	* lib/rubygems/indexer/abstract_index_builder.rb: Index refactoring
-	* lib/rubygems/indexer/marshal_index_builder.rb: Build Marshal index
-	* lib/rubygems/indexer/master_index_builder.rb: Simplify YAML generation
-	* lib/rubygems/indexer/quick_index_builder.rb: Build Marshal quickindex
-	* lib/rubygems/server.rb: Serve up Marshal index as well as YAML
-	* lib/rubygems/source_info_cache_entry.rb: Expect a Marshal index
-
-2007-09-23  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/fetch_command.rb: `gem fetch` downloads a gem
-	to the current directory.  Feature request #10752 by Bret Pettichord.
-	* lib/rubygems/commands/local_remote_options.rb, etc.: Fix spelling of
-	'threshold'.
-	* lib/rubygems/installer.rb: Revert feature request #8818, it
-	interferes with `ruby -S` and multiple versions of ruby (1.8 and 1.9).
-	* lib/rubygems/dependency_installer.rb: Fix a bug where the wrong
-	platform gem would be installed.
-	* lib/rubygems/version_option.rb: Add --platform.
-	* lib/rubygems/install_update_options.rb: Verify --security-policy.
-	* lib/rubygems/local_remote_options.rb: Verify --source, --http-proxy.
-
-2007-09-22  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/open-uri.rb: Don't document our OpenURI.
-	* lib/rubygems/commands/generate_index_command.rb: Fix Indexer class
-	change.
-	* lib/rubygems/commands/mirror_command.rb: Fix for 1.9.
-	* lib/rubygems/commands/pristine_command.rb: Have `gem pristine`
-	give a better report of what it accomplished.
-	* lib/rubygems/command.rb: Add optional description field.
-	* lib/rubygems/installer.rb: Hack around broken Pathname#absolute? on
-	windows.  Patch #14139 by Jim Hughes.
-
-2007-09-20  Eric Hodel  <drbrain@segment7.net>
-
-	* misc files: Tests pass on 1.9.
-	* test/gemutilities.rb: Added Object#send! stub for 1.8.
-	* test/test_open_uri.rb: Require gem_open_uri.rb to avoid warnings.
-	* lib/rubygems/commands/sources_command.rb: Clarify `gem sources -c`
-	and what `gem sources` does.  Patch by Hugh Sasse.
-
-2007-09-19  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/platform.rb: Make Gem::Platform a class.
-	* lib/rubygems/specification.rb: Gem::Specification#validate returns
-	true, non-Gem::Platform platforms are no longer allowed.
-	* test/gemutilities.rb: 1.9 compatiblity fixes.
-	* lib/rubygems/dependency_installer.rb: Work around a bug in URI.parse
-	which misinterprets "C:/".  Patch #13537 submitted by Daniel Berger.
-	* lib/rubygems/format.rb: Ensure file handles are closed.  Patch
-	#13533 submitted by Daniel Berger.
-	* test/test_gem_installer.rb: Win32 path fix.  Patch #13528 submitted
-	by Daniel Berger.
-	* test/gemutilities.rb: Make the platform be a win32 platform on
-	win32.  Fixes confusion in generate_bin_symlink tests.  Patch #13529
-	submitted by Daniel Berger.
-	* test/test_gem_specification.rb: Sequel to above.  Patch
-	#13535 submitted by Daniel Berger.
-	* lib/rubygems/source_index.rb: Make the updating cache message more
-	clear.  Patch #12778 submitted by Bil Kleb.
-	* lib/rubygems/server.rb: Allow gem's rdoc-style.css to be used.
-	Patch #13589 by Stephen Bannasch.
-	* lib/rubygems/indexer.rb: Fail on missing builder gem only when
-	trying to use the indexer.  Fixes bug #13939 by Bryan Stearns.
-	* lib/rubygems/indexer/indexer.rb: Move Indexer up one level in
-	nesting.
-	* lib/rubygems/indexer/compressor.rb: Only used in
-	Gem::Indexer::AbstractIndexBuilder subclasses, merged there.
-	* lib/rubygems/command_aids.rb: Merged Gem::CommandAids into
-	Gem::Command since that's the only place it gets used.
-	* misc other files: mswin fixes.  Paired with Daniel Berger.
-
-2007-08-24  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb: Fix #full_name for versionless
-	platforms.
-	* lib/rubygems/command_manager.rb: We're only looking for NameError.
-	* lib/rubygems/command.rb: 1.9 fix.
-	* lib/rubygems/format.rb: ditto.
-	* lib/rubygems/installer.rb: ditto.
-
-2007-08-24  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/rubygems_version.rb: 0.9.4.4
-
-2007-08-23  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/platform.rb: Add HPUX, AIX and NetBSD.  Thanks to
-	Daniel Berger, Yutaka KANEMOTO and Andre Nathan respectively.
-	* lib/rubygems/installer.rb: Move all option setting to #initialize to
-	make `gem pristine` work again.
-	* lib/rubygems/commands/environment_command.rb: Include platforms.
-	* lib/rubygems/dependency_installer.rb: Support local non-root
-	installation.
-
-2007-08-22  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/dependency_installer.rb: Don't reinstall dependencies
-	existing in the install dir.  Don't install dependencies for older
-	versions of the gem we're installing.  #installed_gems now contains
-	loaded gemspecs.  Always prefer local gems.  Handle globs correctly.
-	All deps are now installed into the install_dir.
-	* lib/rubygems/commands/install_command.rb: Switch to
-	Gem::DependencyInstaller.  Warn when -y is given, it will be removed.
-	Try our best to install everything the user asked.
-	* lib/rubygems.rb: Gem.bindir now handles Pathname correctly.
-	* lib/rubygems/remote_fetcher.rb: Don't downcase anymore.
-
-2007-08-21  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/dependency_installer.rb: Add installation from local
-	gems.  Install gems in the correct order.  Handle -E, -f,
-	--ignore-dependencies, -i, -r, -l, -b, -P, -w, -v options for `gem
-	install`
-	* test/gemutilities.rb: Work around OS X /private/tmp.
-	* lib/rubygems/platform.rb: Switch to using arch instead of target_*
-	for JRuby compatibility.  Thanks to Nick Sieger.
-
-2007-08-20  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/dependency_installer.rb: Add working but unfinished
-	Gem::DependencyInstaller.
-	* lib/rubygems/source_info_cache.rb: Add #search_with_source.
-	* lib/rubygems/dependency_list.rb: Move #fill_dependencies to
-	Gem::DependencyInstaller
-	* lib/rubygems/platform.rb: Split from specification.rb.  Add methods
-	to recognize platforms from Config::CONFIG.
-	* lib/rubygems.rb: Add Gem::platforms.
-	* lib/rubygems/specification.rb: Disallow String platforms.
-
-2007-08-18  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_info_cache.rb: Search by Gem::Dependenency.
-	* lib/rubygems/source_index: Search by Gem::Dependenency.
-	* lib/rubygems/version.rb: Version can be String or Integer.
-	Gem::Requirement::default is now >= 0.  Gem::Requirement can be built
-	from a Gem::Dependency.
-	* lib/rubygems/dependency_list.rb: Uses TSort now.  Add
-	Gem::DependencyList#fill_dependencies.
-	* lib/rubygems/server.rb: Support quick index.
-
-2007-08-17  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/dependency_list.rb: For diamond dependencies with
-	different versions on the bottom of the diamond, trim all but the
-	latest dependency.  This will prevent gems like hoe from being
-	installed multiple times.
-
-2007-08-15  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb: Support building mkrf extensions.  Fixes
-	bug #11313.  Patch by Jeremy Hinegardner.
-	* lib/rubygems/installer.rb: Ensure bin files are executable.  Fixes
-	bug #8985 submitted by Ara Howard.
-	* lib/rubygems/installer.rb: Insert installing gem home dir into bin
-	wrapper.  Patch #8818 by Ara Howard.
-
-2007-08-13  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/uninstall_command.rb: Gems with version of 0
-	can now be uninstalled.
-
-2007-08-11  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/config_file.rb: Command-line args override ~/.gemrc
-	now.  Gem.sources is pulled from ~/.gemrc now.  Gem::ConfigFile can
-	write itself out now.
-	* lib/rubygems/commands/sources_command.rb: Now writes out
-	Gem.configuration on changes.  No longer checks source cache on
-	--list.
-
-2007-08-09  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_info_cache.rb: Make Gem::SourceInfoCache#search
-	only search gems in Gem.sources.
-	* lib/rubygems.rb: Make Gem::configuration a real Gem::ConfigFile
-	object.
-	* lib/rubygems/commands/query_command.rb: Fix `gem query --details`.
-	Add `gem query --no-versions`.
-	* lib/rubygems/local_remote_options.rb: Make `gem mumble --source URL`
-	only use that source.
-	* lib/rubygems/config_file.rb: Fix Gem::ConfigFile#[]= to match
-	Gem::ConfigFile#[].
-
-2007-08-08  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/specification_command.rb: Match only exact gem
-	names.  Fixes bug #9681.  Patch by Michael DeCandia.
-	* lib/rubygems/commands/unpack_command.rb: Match only exact gem names.
-	Fixes bug #9681.  Patch by Michael DeCandia.
-	* lib/rubygems/commands/contents_command.rb: Match only exact gem
-	names.  Fixes bug #9681.  Patch by Michael DeCandia
-	* lib/rubygems/remote_fetcher.rb: Perform a GET request if the HEAD
-	request doesn't have Content-Length.  Fixes bug #9771.  Patch by Ben
-	Bleything.
-	* lib/rubygems.rb: Clear Gem::searcher when we Gem::clear_paths.
-	Fixes bug #12886.  Submitted by Peter Williams.
-	* lib/rubygems.rb: Add #default_sources and rework #sources to use it.
-	* post-install.rb: No longer runs install_sources.
-	* pkgs/sources: Updated to something what a 0.0.2 would look like, if
-	we ever make one.
-
-2007-08-02  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/gem_commands.rb: Removed and broken up into individual
-	files.
-	* lib/rubygems/command_manager.rb: Lazily loads gem commands.  Now to
-	use CommandManager just "require 'rubygems/command_manager'" and
-	everything will be there.
-
-2007-08-01  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/*, test/*: Pushed down dependencies as far as reasonable.
-	Removed Gem::manage_gems.  Now only 14 files are loaded with "require
-	'rubygems'".  Added tests for `gem build` and `gem cert`.
-	* lib/rubygems/extensions.rb: Added common place for all extensions.
-
-2007-07-26  Eric Hodel  <drbrain@segment7.net>
-
-	* test/test_gem_ext_configure_builder.rb: Linux has different behavior
-	for `sh ./configure` when configure is missing.  Fix adapted from
-	Patch #10019 by Donavan Pantke.
-	* lib/rubygems/commands/pristine_command.rb: Compare fully-qualified
-	paths.  Fixes bug #7976 by Lyle Johnson.
-	* lib/rubygems/config_file.rb: Add ConfigFile#[]=, so --proxy
-	command-line option works.  Fixes #8152 by Justin Sabelkko.
-	* lib/rubygems/post-install.rb: Make sure we use the
-	latest-and-greatest RubyGems when running post-install.rb.  Fixes Bug
-	#8411 by Duy Nguyen.
-	* lib/rubygems/remote_fetcher.rb: An empty HTTP_PROXY means no proxy.
-	Fixes Bug #9042 by Michael Brodhead.
-	* lib/rubygems/version.rb: Disallow newlines in version string.  Strip
-	spaces from version string.  Fixes Bug #9499 by Bryce Kerley.
-	* lib/rubygems/commands/sources_command.rb: Fix spelling error.  Fixes
-	Bug #11064 by Chris Eskow.
-
-2007-07-25  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/indexer.rb: Create the index in /tmp, then move it into
-	place when we're done.  This will prevent spurious bulk index updates
-	from occurring while the quick index is missing.  Remove the option to
-	not build the quick index.
-	* lib/rubygems/commands/generate_index_command.rb: --no-quick is gone.
-	* lib/rubygems/user_interaction.rb: If stdin is not a tty, it is
-	unlikely that gem is going to get a response when asking a question.
-	Patch #10660 by Paul Brannan.
-	* lib/rubygems/validator.rb: Output test failures when using install
-	-t.  Patch #10659 by Paul Brannan.
-	* lib/rubygems/custom_require.rb (Kernel#require): Only rescue a
-	LoadError that matches the file we are requiring.  Patch #10723 by
-	Tyler Rick.
-	* lib/rubygems/remote_fetcher.rb: Support HTTP basic authentication.
-	Patch #8121 by Max Dunn.
-	* lib/rubygems/commands/install_command.rb: Don't raise an error when
-	a gem has no tests.  Patch #11824 by Katsuyuki MIYAMUKO.
-
-2007-07-23  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/commands/contents_command.rb: Add --lib-only option, remove
-	useless --list option.  Feature request #9498 by Martin DeMello.
-	* lib/rubygems/specification.rb: Restrict to only files in
-	#require_paths.  Add #required_rubygems_version.  Feature request
-	#7780 by Eric Hodel.
-	* lib/rubygems/commands/dependency_command.rb: Display dependencies for
-	remote gems.  Feature request #12133 by Eric Hodel.  -r for reverse
-	dependencies is now -R.
-	* lib/rubygems/commands/specification_command.rb: Display
-	specifications for remote gems.  Feature request #12133 by Eric Hodel.
-	* lib/rubygems/installer.rb (Gem::Installer#install): Check
-	required_rubygems_version.
-	* lib/rubygems/user_interaction.rb
-	(Gem::UserInteraction#choose_from_list): Check result for EOF.  Fixes
-	bug #8018.  Patch by Jos Backus.
-	* post-install.rb: Install using absolute path.  Fixes bug #10675.
-	Patch by Jeremy Burks.
-	* lib/rubygems/commands/environment_command.rb: Add RUBY VERSION to
-	environment output.
-	* lib/rubygems/command.rb: Don't worry about duplicated command-line
-	options, OptionParser takes care of them for us.
-
-2007-07-22  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb (Gem::Specification#files): Make it
-	faster
-	* lib/rubygems/command.rb: Better documentation.  -v flag now lets you
-	get to "really verbose" mode which makes the verbose progress meter
-	work.  Add command groups to separate types of commands easily.
-	* lib/rubygems/commands/which_command.rb, bin/gemwhich: Move `gemwhich`
-	under `gem`.
-	* lib/rubygems/commands/mirror_command.rb, bin/gem_mirror: Move
-	`gem_mirror` under `gem`.
-	* lib/rubygems/commands/lock_command.rb, bin/gemlock: Move `gemlock`
-	under `gem`.
-	* lib/rubygems/commands/server_command.rb, bin/gem_server: Move
-	`gem_server` under `gem`.
-	* lib/rubygems/doc_manager.rb (Gem::DocManager#initialize): Only raise
-	when operating on the filesystem.
-	* lib/rubygems/server.rb: Remove option processing, now in
-	Gem::Commands::ServerCommand.
-	* lib/rubygems/commands/generate_index.rb, bin/index_gem_repository.rb:
-	Move `index_gem_repository.rb` to `gem generate_index`.
-	* lib/rubygems/indexer (Gem::Indexer): Extract from
-	index_gem_repository.rb and merge RubyForge changes.
-	* lib/rubygems/command_manager.rb (Gem::CommandManager#run): Print
-	backtrace when --debug is set too.
-	* lib/rubygems/command_manager.rb (Gem::CommandManager#load_and_instantiate):
-	Don't infinitely loop in retry.
-	* bin/gemri: Removed.  Everybody should have ri integration now.
-	* lib/rubygems/config_file.rb: Allow settings to be examined.  Pull
-	settings from .gemrc.
-	* lib/rubygems/commands/environment_command.rb: Add ruby executable
-	and configuration settings to `gem env`.
-	* lib/rubygems/indexer/indexer.rb (Gem::Indexer::Indexer#build_index):
-	Now uses UserInteraction.
-	* various: Use UserInteraction for output.
-	* lib/gemconfigure.rb: Removed. Same as multiple gem commands.
-	* lib/rubygems/commands/contents_command.rb: Removed extra --verbose
-	option.
-	* lib/rubygems/gem_commands.rb (Gem::LocalRemoteOptions): Moved -B,
-	--source, -p from Gem::Commands::common_options.
-
-2007-07-22  Chad Fowler  <chad@chadfowler.com>
-
-	* lib/rubygems/gem_commands.rb: Added another example to the gem
-	example output (Gile Bowkett)
-	* test/test_documentation_generation.rb, lib/rubygems/doc_manager.rb:
-	Added a test for documentation generation and fixed a bug when doc
-	location is not writable.
-
-2007-06-16  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/gem_path_searcher.rb (Gem::GemPathSearcher): Moved out
-	of lib/rubygems/custom_require.rb and added tests.
-
-2007-06-02  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/source_info_cache.rb (Gem::try_file): Fix for issue
-	where a non-existing source cache file causes the gem command to
-	not find a gem.  This fixes it by marshalling out an empty
-	hash.  (Thanks to Nick Sieger for this fix).
-
-2007-06-01  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems.rb
-	(Gem::OperationNotSupportedError::latest_partials): Changed from
-	match data style to $1 style regexp (on the recommendation of
-	better performance).
-
-2007-05-30  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/source_index.rb (Gem::SourceIndex::update):
-	Modified to get the bulk_threshhold from the configuration.
-	(Gem::SourceIndex::convert_specs): Ryan removed the "reduce_specs"
-	method because it is not needed any more and is creating memory
-	overhead.
-
-	* lib/rubygems/config_file.rb (Gem::ConfigFile): Added
-	bulk_threshhold field to ConfigFile.
-	(Gem::ConfigFile::initialize): Initialize bulk threshhold to 500.
-
-	* lib/rubygems/command.rb
-	(Gem::Command::specific_extra_args_hash): Added
-	-B (--bulk-threshhold) option to allow user specified bulk
-	download threshhold.
-
-2007-05-23  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/commands/sources_command.rb
-	(Gem::Commands::SourcesCommand::initialize): Added a --clear-all
-	option to the sources subcommand.  Clear-all will remove the cache
-	files.
-
-	* lib/rubygems/source_info_cache.rb (Gem): Moved system_cache_file
-	and user_cache_file to class methods so that we can get the file
-	names without creating a SourceInfoCache instance.
-
-2007-05-23  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_info_cache.rb: Teach SIC to repair itself
-	when it encounters a bad cache file.
-
-2007-05-14  Chad Fowler  <chad@chadfowler.com>
-		* lib/rubygems/command_manager.rb: Re-added registration for
-	gem cleanup command which I accidentally removed during refactoring.
-
-2007-05-10  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/remote_installer.rb: Uncommented the require
-	'sources' line.
-
-	* lib/rubygems/source_info_cache.rb: Uncommented the require
-	'sources' line.
-
-	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version 0.9.3
-	in preparation for release.
-
-	* lib/rubygems/package.rb (Gem::TarInput::zipped_stream):
-	Zipped_stream now always uses the in memory string IO buffer.
-	There were just too many problems with ZLib (on windows)
-	otherwise.
-
-2007-03-26  Jim Weirich  <jim@weirichhouse.org>
-
-	*  (Index): new digest technique.
-
-	* lib/rubygems/validator.rb (Gem::Validator::verify_gem): Removed
-	really old MD5 and replaced with gem based digests.  
-	
-	* experimental/deployment.rb (Gem::Deployment::Manager::initialize):
-	New digest technique.
-
-	* experimental/test_deployment.rb (TestDeployment::test_deployed_file):
-	New digest technique.
-
-2007-03-26  Chad Fowler <chad@chadfowler.com>
-
-	* Extracted the big ball of mud that was gem_commands.rb into    
-	separate files.
-
-2007-03-17  Chad Fowler <chad@chadfowler.com>
-
-	* Various ruby 1.8.6 fixes for failing tests.
-	
-	* Updated setup.rb to 3.4.1
-	
-	* Renamed cmd_manager to command_manager to keep names consistent
-	
-	* lib/installer.rb: Rework path checking to use Pathname (ara howard bug #8811)
-	
-2007-03-02  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb: Add bin directory before library directory,
-	otherwise gems like rake don't work.
-
-2007-03-01  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/open-uri.rb: Fix all the infinite loop errors.
-
-	* lib/rubygems.rb: Add dirs from activate after -I and ENV['RUBYLIB']
-	dirs.  Otherwise gems won't allow -I to work when #gem is called.
-
-2007-02-11  Chad Fowler <chad@chadfowler.com>
-
-	* test/gemutilities.rb: Fix to make Windows tests pass. (Anatol Pomozov)
-
-2007-02-05  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version 0.9.2
-	and made a release.
-
-2007-02-04  Chad Fowler <chad@chadfowler.com>
-
-	* Fixed failing tests (changed from assert_equal to assert_match to 
-	  deal with ARGV inconsistencies in test vs. production).
-
-2007-02-03  Jim Weirich  <jim@weirichhouse.org>
-
-	* Bumped version to 0.9.1.1.
-
-	* lib/rubygems/gem_open_uri.rb: Added the patched open-uri back
-	into the gems software.  Evidently, the 1.8 version of open-uri
-	does not handle authenticating proxies with username and password.
-
-	* lib/rubygems/source_info_cache.rb (Gem::cache_data): Added
-	rescue block to capture bad file loads.  The original rescue was
-	only around the marshal load (bug was probably introduced when the
-	file data was preloaded into a string).
-	(Gem::set_cache_data): Added set_cache_data to be used during
-	testing to avoid reload the cache file over and over.
-
-	* lib/rubygems/gem_commands.rb: Added require for command class so
-	that this file can be loaded independently.
-
-	* lib/rubygems/source_index.rb (Gem::SourceIndex::outdated): Minor
-	cleanup.
-
-	* test/gemutilities.rb
-	(RubyGemTestCase::util_setup_source_info_cache): Minor cleanup
-
-	* test/test_gem_source_info_cache.rb
-	(TestGemSourceInfoCache::test_write_cache_user): Switched to using
-	set_cache_data here and several other places to avoid rereading
-	the cache data over and over again.
-
-2007-02-02  Chad Fowler  <chad@chadfowler.com>
-
-	* lib/rubygems/gem_commands.rb:
-	Fixed gem unpack (broken since 0.9.1)
-
-2007-01-20  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_info_cache.rb (Gem::SourceInfoCache#cache_data):
-	Read the source_cache in binary mode for mswin.
-
-2007-01-16  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/rubygems_version.rb (Gem): Released 0.9.1.
-
-2007-01-15  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb (Gem::Installer#extract_files): Only allow
-	installation to absolute directories.  (Call File::expand_path first).
-	More informative message for attempting to install with bad path.
-	* post-install.rb: Install sources first, since its rather important.
-
-2007-01-14  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_info_cache.rb: require 'fileutils', as its
-	needed.
-
-2007-01-12  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb (Gem::Installer#extract_files): Don't
-	allow gems to place files outside the installation directory.  Fixes
-	bug 7751 by Gavin Sinclair.
-
-2007-01-08  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/specification.rb
-	(Gem::Specification::test_suite_file): Added rescue clause for
-	default_executable.
-	(Gem::Specification::add_bindir): Added rescue clause for
-	add_bindir.
-
-	* test/test_specification.rb
-	(TestSpecification::test_pathologically_bad_non_array_stuff_doesnt_goof_up_files):
-	Added a sanity check on hash for some pathologically bad case.
-	(TestSpecification::test_pathologically_bad_exectuables_doesnt_goof_up_hash):
-	Added sanity check for pathologically bad executables field.
-
-2007-01-08  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/gem_commands.rb (Gem::PristineCommand#execute): Better
-	messaging.
-	* lib/rubygems.rb, lib/rubygems/custom_require.rb: Correctly include
-	documentation for methods added to Kernel.
-
-2007-01-07  Eric Hodel  <drbrain@segment7.net>
-
-	* Rakefile: Include GPL.txt.  Fixes bug #7572 by David Lee.
-
-2007-01-06  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version
-	0.9.0.9.
-
-	* lib/rubygems/specification.rb
-	(Gem::Specification::test_suite_file): Rewrote default_executable
-	to be a bit more explicit.
-	(Gem::Specification::add_bindir): Rewrote the 'files' accessor to
-	handle pathologically bad input.
-	(Gem::Specification::copy_of): Added as_array private method.
-
-	* Rakefile (package_version): Added '*.out' to clobber list.
-	Removed the broken-1.0.0.gem file from the clobber list.
-
-	* test/test_specification.rb
-	(TestSpecification::test_default_executable):
-	Seriously beefed up tests for certain specification issues.
-
-	* test/gemenvironment.rb (TestEnvironment::create): Added the 'f'
-	flag to deleting 'gemhome'.
-
-2006-12-30  Eric Hodel  <drbrain@segment7.net>
-
-	* post-install.rb, lib/rubygems/server.rb: RubyGems now installs RDoc
-	and ri for itself.
-
-2006-12-28  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb (Gem::Installer#build_extensions):
-	Extension build failures now raise Gem::Installer::ExtensionBuildErrors.
-
-2006-12-26  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/package.rb (Gem::Package::TarInput#initialize): Bad
-	packages now raise FormatError instead of a generic RuntimeError.
-	* lib/rubygems/installer.rb (Gem::Installer#install): Raise an
-	InstallError when we have a bad gem file.
-
-2006-12-25  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/custom_require.rb (Gem::GemPathSearcher::find):
-	Removed SUFFIX_PATTERN.  Evidently this was miss during an earlier
-	attempt to remove it.
-	(Gem::GemPathSearcher::matching_file): Changed reference to
-	SUFFIX_PATTERN into a call to Gem.suffix_pattern.
-
-	* Removed tab characters from numerous source files.
-	
-	* lib/rubygems/installer.rb (Gem::Uninstaller::uninstall): Removed
-	stray tab characters.
-
-	* lib/rubygems.rb (Kernel::require_gem): Added file and line
-	number information to require_gem worning (makes it easier to
-	track down those offending lines of code).
-	(Kernel::location_of_caller): Added helper function to determine
-	file and line number of caller.
-
-2006-12-25  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb (Gem::Installer#app_script_text):
-	Simpler, more readable bin script.
-	* lib/rubygems/gem_commands.rb (Gem::PristineCommand#execute):
-	Regenerate bin scripts.  This will clean up require_gem in scripts.
-
-2006-12-24  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/remote_fetcher.rb (Gem::RemoteFetcher#fetch_path):
-	Rescue various errors and return a more-friendly error.
-
-2006-12-23  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/command.rb lib/rubygems/gem_commands.rb: Make help
-	output fit in 80 columns.
-	* lib/rubygems/rubygems_version.rb: Bump version to 0.9.0.8, beta
-	time!  (Oops, didn't go into beta.)
-
-2006-12-20  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/remote_fetcher.rb (Gem::RemoteFetcher#fetch_size): Give
-	a sensible error on bad URIs.
-	* lib/rubygems/gem_commands.rb (Gem::SourceCommand): Allow management
-	of sources in source_cache.  Fixes bug #1128.
-	* lib/rubygems.rb (Kernel#require_gem): Add deprecation warning in
-	favor of gem.
-
-2006-12-19  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb (Gem::ExtBuilder): Refactored for
-	uniformity.
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteInstaller#specs_n_sources_matching): Don't display gems
-	that can't be installed.
-	* lib/rubygems.rb, pre-install.rb: Fix installation errors on 1.9.
-	Fixes bug #4536 by Ryan Davis.
-	* lib/rubygems/source_index.rb, lib/rubygems/gem_commands.rb,
-	lib/rubygems-custom_require.rb: Use File.join with glob strings.
-	Fixes bug #1096 submitted by Chad Fowler.
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteInstaller#install_dependencies): Make --force actually
-	force.  Fixes bug #7365 by Robert James.
-
-2006-12-18  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/gem_commands (Gem::OutdatedCommand): Add a way to see
-	which gems are out-of-date.
-
-	* setup.rb: Ignore errors for .config and InstalledFiles when
-	the source path is read-only/NFS.  Fixes bugs #1395 and #1374.  Patch
-	by Ryan Davis.
-
-	* bin/gem_server: Pull code out into lib/rubygems/server.rb for
-	reusability.  Closes Feature Request #2220 by Chris Morris.
-
-2006-12-16  Chad Fowler <chad@chadfowler.com>
-
-	* test/: Added functional test for extension gems proving that
-	non-compiling extensions don't result in success message.
-
-	* lib/rubygems/specification.rb: Raise exception if loaded spec is
-	nil.  Closes bug #7299.
-
-	* test/gemenvironment.rb: Clean out gemhome every time to avoid dirty
-	directory failing tests.
-
-	* lib/rubygems/installer.rb: Change uninstall to require a full gem
-	name (not a partial match).  Fixes bug #6007 and related unreported
-	issues.
-
-2006-12-15  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/installer.rb (Gem::Uninstaller): Correctly uninstall
-	executables if GEM_HOME is set.  Patch #2264 by Sylvain Joyeux.
-
-	* lib/rubygems.rb (Gem::loaded_specs): Expose list of currently loaded
-	gems.
-
-	* lib/rubygems/gem_commands (Gem::UninstallCommand): Allow multiple
-	gems to be uninstalled at once.
-
-2006-12-14  Eric Hodel  <drbrain@segment7.net>
-
-	* post-install.rb: Don't attempt to read unreadable files.  Fixes
-	bug #2851.
-
-2006-12-13  Eric Hodel  <drbrain@segment7.net>
-
-	* pre-install.rb.rb, post-install.rb: Don't call manage_gems because
-	we don't have sources installed yet.  Bump version requirement to
-	1.8.2 since rubygems/open-uri.rb was removed.  Should fix bug #6206.
-
-	* lib/rubygems/installer.rb (Gem::Installer#build_extensions): Capture
-	stderr into results when building extensions.
-
-	* lib/rubygems/gem_commands.rb (Gem::ContentsCommand): Allow version
-	to be passed to gem contents.  Not backwards compatible, -v now -V and
-	vice versa.  Select newest gem for contents.  Fixes bugs #2723, #7225.
-	Patches by Sava Chankov, Tom Pollard.
-
-	* lib/rubygems/gem_commands.rb (Gem::InstallCommand#execute): Allow
-	install errors to result in non-zero exit code.  Fixes bug #2773.
-
-2006-12-03  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/remote_installer.rb (Gem::RemoteInstaller#install):
-	Add :cache_dir option to override the default.
-
-	* lib/rubygems/remote_installer.rb (Gem::RemoteInstaller#download_gem): 
-	Check cache to see if the gem has been cached before downloading.
-
-2006-12-02  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems.rb (Gem::OperationNotSupportedError::suffixes,
-	Gem::OperationNotSupportedError::suffix_pattern): Removed
-	duplicate copies of the SUFFIX_PATTERN by providing a global
-	method Gem.suffixes and Gem.suffix_pattern.
-
-	* lib/rubygems/remote_fetcher.rb (Gem::open_uri_or_path): Reworked
-	the connection options for the open-uri call.  Since we are not
-	using the rubygems supplied open_uri, we can use some new options
-	available that make proxy handling much easier.
-	(Gem::file_uri): Renamed is_file_uri to file_uri?.
-
-	* lib/rubygems/loadpath_manager.rb (Gem::LoadPathManager::self):
-	Added .jar to list of suffixes.
-
-	* test/functional.rb (FunctionalTest::test_env_remotesources):
-	Changed test to uses Gem.sources (the sources method on
-	remote_fetcher was removed).
-
-	* test/test_remote_fetcher.rb (TestRemoteFetcher): Renamed some of
-	the test constants and instance variables so that they were more
-	consistent and explained the tests a wee bit better.
-	(TestRemoteFetcher::test_no_proxy): Added assert_data_from_server
-	and assert_data_from_proxy to make it clear what the test was
-	doing and give better error messages on errors.
-	(TestRemoteFetcher::assert_data_from_server): Added
-	assert_data_from_server.
-	(TestRemoteFetcher::assert_data_from_proxy): Added
-	assert_data_from_proxy.
-
-2006-11-30  Chad Fowler <chad@chadfowler.com>
-
-	* lib/rubygems/open-uri.rb: Removed the duplicated library.
-
-2006-11-30  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification (Gem::Specification#eql?): Allow gemspecs
-	to be used intelligently with Array#- and Array#uniq.
-
-	* lib/rubygems/installer.rb: Return extension-building results in
-	Exception on build failure.
-
-	* lib/rubygems/remote_installer.rb: Ensure gems with similar names
-	cannot be matched for install.  (Broken when searching was removed
-	from RemoteInstaller.)
-
-2006-11-29  Eric Hodel  <drbrain@segment7.net>
-
-	* post-install.rb: Now requires rbconfig.
-
-	* lib/rubygems/specification.rb, lib/rubygems/version.rb: Fixed many
-	ivar warnings due to YAML specs.
-
-	* lib/rubygems/validator.rb, lib/rubygems/validator.rb
-	(Gem::Validator#unit_test Gem::RemoteInstaller::): Ensure the
-	current directory is restored.
-
-	* lib/rubygems/remote_fetcher.rb, lib/rubygems/remote_installer.rb,
-	lib/rubygems/installer.rb: Raise more-friendly and less-deadly errors.
-
-	* lib/rubygems/remote_installer.rb (Gem::RemoteInstaller#install):
-	Create version requirement correctly.
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteInstaller#find_gem_to_install): Allow RemoteInstaller to
-	work with SilentUI.
-
-	* lib/rubygems/remote_fetcher.rb (RemoteFetcher#open_uri_or_path):
-	Don't double-require open-uri.
-
-2006-11-27  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb
-	(Gem::Specification#default_executable):  Fixed bug where @executables
-	could be nil when loaded from index.
-
-2006-11-21  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/source_index.rb (Gem::SourceIndex#latest_specs):  Grab
-	the latest versions of everything in the index.  Written by Ryan
-	Davis.
-
-2006-11-20  Rich Kilmer  <rich@infoether.com>
-
-	* lib/rubygems/cmd_manager.rb: Added PristineCommand
-
-	* lib/rubygems/gem_commands.rb: Added PristineCommand to restore
-	gems to pristine condition in the event of files begin deleted
-	based on the cached .gem file
-
-2006-11-19  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/*_fetcher.rb: Removed code specific to remote source
-	index updating.
-
-	* lib/rubygems/remote_installer.rb (Gem::RemoteInstaller#search):
-	Moved to Gem::SourceInfoCache#search
-
-	* lib/rubygems/source_info_cache.rb: Taught to update itself
-
-	* lib/rubygems/source_info_cache_entry.rb: Taught to update itself
-
-	* lib/rubygems/source_index.rb: Taught to update itself from a uri.
-
-2006-11-18  Chad Fowler  <chad@chadfowler.com>
-
-	* lib/rubygems/installer.rb: Applied Kevin Clark's patch to make
-	RubyGems recognize mkrf files.
-
-2006-11-17  Eric Hodel  <drbrain@segment7.net>
-
-	* test/test_remote_fetcher.rb:  Don't allow files in Dir.pwd to make
-	tests fail.  Spotted by Chad Fowler.
-
-	* lib/rubygems/remote_installer.rb (Gem::RemoteFetcher,
-	Gem::CacheFetcher):  Break out of remote_installer.rb into separate
-	files.
-
-	* lib/rubygems/remote_installer.rb (Gem::SourceInfoCache,
-	Gem::SourceInfoCacheEntry):  Allow requiring just the source cache
-	without the remote fetcher.
-
-2006-11-16  Eric Hodel  <drbrain@segment7.net>
-
-	* test/test_local_cache.rb: Moved to better name
-
-	* test/test_gem_source_info_cache.rb: Renamed test methods to match
-	implementations.  Sorted test names.
-
-	* lib/rubygems/remote_installer (Gem::SourceInfoCache): cache_data no
-	longer resets dirty flag.  Sped up source cache loading.  Exposed
-	cache file name in use.
-	
-2006-11-15  Eric Hodel  <drbrain@segment7.net>
-
-	* test/, lib/: Made files -w clean.
-
-	* test/: Made tests run independently.
-
-	* Rakefile: Tests now run with warnings on.
-
-2006-11-14  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/user_interaction.rb (Gem::StreamUI#progress_reporter):
-	Fix for Gem.configuration.verbose = nil, false
-
-	* lib/rubygems.rb (Gem::configuration): Fix RakeFileUtils pollution.
-
-2006-10-05  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/installer.rb (Gem::Installer::shebang): Updated to
-	optionally call env_shebang if the command line option is set.
-	(Gem::Installer::shebang_env): Added this method.
-
-2006-09-25  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version
-	0.9.0.6.
-
-	* lib/rubygems/security.rb (Gem::Security::Exception): Added
-	permissions for cert files and directories.
-	(Gem::Security::Policy::verify_gem): File.exists? => File.exist?
-	(Gem::Security::self.verify_trust_dir): Beefed up code to create
-	trust directory structure.
-	(Gem::Security::self): Apply permissions when creating trust
-	files.
-
-	* lib/rubygems/package.rb (TarInput::initialize): File.exists? =>
-	File.exist?
-
-2006-09-24  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems.rb
-	(Gem::OperationNotSupportedError::configuration): Added
-	method_missing to configuration hash to allow nicer reference
-	syntax.
-
-2006-09-22  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteSourceFetcher::initialize): Proxy patch fixup to
-	escape user/password from Anatol Pomozov.
-	(Gem::RemoteSourceFetcher::connect_to): Proxy patch fixup to
-	escape user/password from Anatol Pomozov.
-
-	* test/test_remote_fetcher.rb (TestRemoteFetcher::setup): Proxy
-	patch fixup to escape user/password from Anatol Pomozov.
-	(TestRemoteFetcher::test_no_proxy): Proxy patch fixup to escape
-	user/password from Anatol Pomozov.
-
-	* test/io_capture.rb (Gem::IoCapture): Created new IoCapture
-	module to handle capturing output of code under test.
-
-	* test/test_installer.rb
-	(TestInstaller::test_generate_bin_symlinks_win32): Removed ugly
-	$TESTING hack and substituted new io capture module.
-	(TestInstaller::test_install_with_message): Removed one-off stdout
-	capture and replaced with new IO Capture module.
-
-2006-09-19  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version
-	0.9.0.3.
-
-	* test/test_version_comparison.rb (TestRequirementEquality): Added
-	more tests for Dependency equality testing and one additions check
-	for requirement vs non-requirement equality.
-
-	* lib/rubygems/version.rb (Gem::Dependency::==) Fixed '=' bug in
-	'==' code.
-
-2006-09-18 Chad Fowler <chad@chadfowler.com>
-
-	* lib/rubygems/remote_installer.rb
-	Only show the last 3 gem versions on a multiplatform remote
-	install list.
-
-2006-09-18  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteInstaller::install): Added Hugh Sasse's patch for
-	skipping gems on install.
-
-	* lib/rubygems/rubygems_version.rb (Gem): Bumped to 0.9.0.2.
-
-	* lib/rubygems/version.rb (Gem::Dependency::hash): Added hash code
-	--http-proxy, the ENV var http_proxy and with no proxy.
-
-2006-08-26  Jim Weirich  <jim@weirichhouse.org>
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteInstaller::download_gem): Fixed download_gems so that
-	it properly passes the proxy option to the fetcher class. (based
-	on patch by Andy Shen).
-
-2006-08-12  Jim Weirich  <jim@weirichhouse.org>
-
-	* bin/index_gem_repository.rb (Indexer::sanitize): Added a
-	sanitize step to the gem index generation in the hope of avoiding
-	problems with non-ASCII names in the yaml data.
-
-2006-06-14  Jim Weirich  <jim@weirichhouse.org>
-
-	* Rakefile (announce): Added 1.9 hack for ENV['CERT_DIR'].  Remove
-	this in the future if 1.9 behavior changes.
-
-2006-06-13  Jim Weirich  <jim@weirichhouse.org>
-
-	* Rakefile: ENV['CERT_DIR'] is now '' rather than nil.
-
-	* lib/rubygems/specification.rb (Gem::Specification::initialize):
-	Eric added some 1.9 compatibility code (funcall vs send).
-
-	* lib/rubygems/package.rb (TarOutput::self): Eric added some 1.9
-	compatibility code (funcall vs send).
-
-	* experimental/deployment.rb (Gem::Deployment): Moved the
-	deployment code out of the live code base into the experimental
-	directory.  The code wasn't used and the tests were not all
-	passing.
-
-2006-06-11  Jim Weirich  <jim@weirichhouse.org>
-
-	* bin/gemri: Added gemri to bin directory.
-
-	* lib/rubygems/custom_require.rb (Gem::GemPathSearcher::find):
-	Added .rbw to suffix pattern in custom_require.
-
-2006-06-07  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems.rb: Added copyright notices to all Ruby files.
-
-2006-04-07  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/gem_commands.rb (Gem::RDocCommand::execute): Added
-	RI option to the rdoc subcommand.
-
-2006-04-05  Jim Weirich  <jim@weirichhouse.org>
-
-	* test/test_parse_commands.rb
-	(TestParseCommands::test_parsing_update_options): Fixed unit tests
-	to assert that the install dir is expanded.
-
-	* lib/rubygems/doc_manager.rb (Gem::DocManager::generate_ri):
-	Break out from generate_rdoc to support installing all RI docs
-	first.
-
-	* lib/rubygems/gem_commands.rb
-	(Gem::InstallUpdateOptions::add_install_update_options): Expanded
-	repository directory to absolute path.
-	(Gem::InstallCommand::execute): Make sure that *all* of the RI
-	documents are generated before generating any RDocs (due to a bug
-	in the RDoc library).
-
-	* lib/rubygems/installer.rb (Gem::ExtExtConfBuilder::self): Fixed
-	typo in ExtExtConfBuilder that prevented C based gems to install.
-	(Gem::ExtExtConfBuilder::self): Installed patch to prevent the
-	overriding of target_prefix in native extensions (thanks to Aaron
-	Patterson for the patch).
-
-2006-04-04  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version
-	0.8.11.10.
-
-	* lib/rubygems/incremental_fetcher.rb
-	(Gem::IncrementalFetcher::update_cache): Now falls back to bulk
-	updates if the number of gems if over 50.
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteSourceFetcher::source_index): Added "bulk" to the
-	update message to differentiate it from the incremental message.
-
-	* lib/rubygems/specification.rb
-	(Gem::Specification::Specification): Modified to add dashes to
-	gemspecs generated under Ruby 1.8.3.  This makes it easier to run
-	RubyGems on a 1.8.2 system.
-
-2006-04-01  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/doc_manager.rb (Gem::DocManager::run_rdoc): Changed
-	exception handler to print error message if document generation
-	fails, but then to continue with the rest of the installation.
-	Permission errors still terminate the install because if one
-	install fails because of permission problems, chances are that all
-	will fail.
-	(Gem::DocManager::install_ri): Removed wrapping of exceptions with
-	DocumentError.  Most exceptions now don't propagate out of
-	run_rdoc.
-	(Gem::DocManager::install_rdoc): Removed wrapping of exceptions
-	with DocumentError.  Most exceptions now don't propagate out of
-	run_rdoc.
-
-2006-02-23  Jim Weirich  <jim@weirichhouse.org>
-
-	* bin/index_gem_repository.rb (MasterIndexBuilder::cleanup): Fixed
-	bug where we were trying to read the index file (to compress it)
-	before it was closed, often leading to a truncated index file.
-
-Tue Jan 24 16:26:13 2006  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems/config_file.rb
-	Luca Pireddu reported a fatal error when permissions on
-	.gemrc were too restrictive.  Fixed.
-
-Tue Dec  6 14:51:13 2005  Jim Weirich  <jim@tardis>
-
-	* lib/rubygems/source_index.rb
-		(Gem::SourceIndex::load_specification): Added an untaint call to
-		make the code run in SAFE=1 mode under 1.8.3.
-	(Gem::SourceIndex::load_gems_in): Untaint here too.
-
-	* lib/rubygems/installer.rb (Gem::Installer::install): Untaint
-		here too.
-	(Gem::Installer::extract_files): Untaint here too.
-
-	* lib/rubygems/custom_require.rb
-		(Gem::GemPathSearcher::matching_file): Untaint here too.
-
-	* test/gemenvironment.rb: Added $SAFE=1 to the test environment to
-		make sure we can run in $SAFE mode.
-
-2005-12-03  Jim Weirich  <jim@tardis>
-
-	* lib/rubygems/rubygems_version.rb (Gem): Bumped version to
-	0.8.11.6'
-
-	* lib/rubygems/user_interaction.rb
-	(Gem::StreamUI::SimpleProgressReporter::done): Added several new
-	progress reporters.
-
-	* lib/rubygems/command.rb
-	(Gem::Command::specific_extra_args_hash): Added --verbose
-	processing.
-	
-	* lib/rubygems/config_file.rb (Gem::ConfigFile::handle_arguments):
-	Added --traceback as alias for --backtrace (I always get them
-	confused).
-	(Gem::ConfigFile::initialize): Added a verbose option.
-
-2005-11-28  Jim Weirich  <jim@tardis>
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::SourceInfoCacheEntry::replace_source_index): Fixed the
-	SourceIndexCacheEntry so that it will manufacture an empty source
-	index if given a nil value for the +si+ value.
-
-2005-11-08  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems.rb: Ara Howard's fix to allow 0.0.0 to be a valid gem
-	version.
-
-2005-11-08  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/gem_commands.rb: Fixed bug in gem unpack.  It was
-	sorting incorrectly, resulting in the wrong version being unpacked in
-	some edge cases. Thanks to Jakob Skjerning for the detailed bug report.
-
-2005-11-03  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/installer.rb: Fixed bug that would cause the executables
-	from the wrong gem to be uninstalled if the names matched the same
-	regex.  Thanks Eric Hodel.
-
-2005-11-01  Jim Weirich  <jim@tardis>
-	* lib/rubygems/gem_commands.rb (Gem::UpdateCommand::initialize):
-	Upgrade => Update change.
-	(Gem::UpdateCommand::execute): Upgrade => Update change.
-	(Gem::UpdateCommand::execute): Upgrade => Update change.
-
-2005-11-01  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/gem_commands.rb: Allow gem unpack to accept a gem file
-	path instead of gem name: gem unpack mygem-1.0.0.gem.
-
-2005-10-31  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/installer.rb: Tilman Sauerbeck's patch to support
-	extensions built with Rake!
-
-2005-09-13  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/package.rb (TarInput::initialize): Removed
-	requirement for SSL when signatures are found in a gem.  Only
-	require SSL if the security policy requires checking the
-	signatures.
-
-	* lib/rubygems/custom_require.rb (Kernel::require): Disabled
-	autorequire during custom require.
-
-2005-09-07  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/gem_openssl.rb (Gem::ensure_ssl_available): Added a
-	test in gem_openssl to make sure the ruby portion of ssl is also
-	loaded.
-
-2005-08-31  Jim Weirich  <jim@weirichhouse.org>
-
-	* Rakefile (install): Changed the rake install task to use setup.rb.
-
-2005-07-08  Chad Fowler  <chad@chadfowler.com>
-
-	* lib/rubygems/remote_installer.rb: Applied Daniel Roux's patch
-	to make RubyGems work with authenticating proxies.
-
-2005-07-08  Jim Weirich  <jim@weirichhouse.org>
-
-	* Preparing for release 0.8.11.
-
-2005-06-12  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/installer.rb
-	(Gem::Installer::installation_satisfies_dependency): Refactored
-	dependency check into ensure_dependency! and
-	installation_satisfies_dependency?.
-
-2005-06-12  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems.rb,lib/rubygems/installer.rb: Applied Mark Hubbart's
-	* lib/rubygems/remote_installer.rb: Applied David Glasser's install-
-	* Applied Paul Duncan's incredibly complete gem signing patch.
-	Thanks, Paul!
-	* lib/rubygems/installer.rb: Fixed bug in installer that caused
-	dependency installation not to work.
-
-2005-06-06  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/specification.rb: Fixed Erik hatcher's reported bug
-	of gem directories having "-" at the end of their names (e.g.
-	"BlueCloth-1.0.0-".
-
-2005-06-01  Jim Weirich  <jim@weirichhouse.org>
-
-	* scripts/specdoc.rb (_resolve_links): Updated to generate hieraki
-	format so it can be included in the docs.rubygems.org site.
-
-	* test/test_specification.rb (TestSpecification::test_to_ruby):
-	Fixed test on date that hard-coded a specific date.
-
-2005-05-29  Jim Weirich  <jim@weirichhouse.org>
-
-	* Changes from the Seattle Code fest: (1) Package list command
-	(e.g. gem inspect GEM).  (2) .gemrc settings now allow cvsrc like
-	options to set defaults per subcommand.  (3) The autorequire spec
-	attribute will now accept a list.  (4) Binwrappers vs symlinks
-	(more info to follow).  (5) Substituted Time for Date in specs,
-	increasing performance dramatically in an important area.
-
-2005-05-04  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems.rb (Gem::Exception::find_home): Changed rescue
-	clause from Exception to StandardError.  Exception doesn't seem to
-	catch everything ... I'm not sure I understand why.
-
-2005-04-29  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems/specifiation.rb: Marcel Molina's patch to discover
-	which attributes in the spec are Array attributes.
-
-2005-04-27  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems/gem_commands.rb: -y is now a synonym for 
-	--include-dependencies
-
-2005-04-21  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems/installer.rb: Added non-require_gem dependency check
-	for installation.
-
-2005-04-03  Chad Fowler <chad@chadfowler.com>
-
-	* pre-install.rb: Added version check to RubyGems installation.
-
-2005-03-25  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/rubygems_version.rb (Gem): Created release for
-	0.8.10.
-
-	* lib/rubygems/gem_commands.rb
-	(Gem::UpdateCommand::do_rubygems_update): Update --system now runs
-	the ruby command directly rather than trying to load the
-	update-rubygems command.  There were too many things to go wrong
-	with the old way.
-
-2005-03-24  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteInstaller::find_dependencies_not_installed): Fixed to
-	reload source index before attempting to detect dependencies.
-
-2005-03-23  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteInstaller::find_dependencies_not_installed): Switched
-	to using SourceIndex#find_name to detect missing dependencies,
-	avoiding a gem activation during an install.
-
-	* lib/rubygems/installer.rb (Gem::Installer::install): Removed
-	activate call from install step.  If we need to do something about
-	dependencies at this time, then we need a better way to do them.
-
-	* lib/rubygems.rb: Removed the require for rubygems/timer.
-
-2005-03-16  Jim Weirich  <jim@weirichhouse.org>
-
-	* test/gemenvironment.rb (TestEnvironment::create): Added require
-	on gem/builder.
-
-	* lib/rubygems/source_index.rb (Gem::SourceIndex::initialize):
-	Allowing default argument to new to be an empty hash.
-	(Gem::SourceIndex::from_installed_gems): Refactored into a class
-	method that invokes a instance method.
-	(Gem::SourceIndex::refresh): Refresh now does a complete reload
-	from disk.  This should be more accurate that the earlier version.
-
-	* lib/rubygems/installer.rb (Gem::Uninstaller::uninstall): removed
-	unneeded refresh!.
-
-	* lib/rubygems.rb (Gem::Exception::source_index): Removed
-	automatic refresh from Gem.source_index ... it wasn't reliable
-	when removing installed gems.
-	(Gem::Exception::activate): Added detection of previously loaded
-	gems.
-
-2005-03-15  Chad Fowler  <chad@chadfowler.com>
-
-	* bin/gem_server: (htonl) rdoc opens in existing browser window.
-
-2005-03-14  Jim Weirich  <jim@weirichhouse.org>
-
-	* Released 0.8.8
-	
-2005-03-14  Jim Weirich  <jim@weirichhouse.org>
-
-	* Released 0.8.7
-	
-2005-03-13  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/installer.rb (Gem::Installer#shebang): Refactored and
-	stripped result to avoid ^M issues.
-
-2005-03-11  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/gem_commands.rb (Gem::DependencyCommand): Added a
-	new command "gem dependency" to show the dependencies of an
-	installed gem.
-
-	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::initialize):
-	Added DependencyCommand to the command manager registrar.
-
-	* lib/rubygems/version.rb (Gem::Requirement): Unnested Requirement
-	from the Version class.  There was no benefit to having it nested.
-	Gem::Version::Requirement is set to point to the new class so to
-	be compatible with old gems.
-
-	* lib/rubygems/installer.rb (Gem::Uninstaller::ask_if_ok): Changed
-	uninstaller confirm message to read 'Continue with uninstall'.
-	Its clearer that way.
-
-	* lib/rubygems.rb (Gem::Exception::required_location): Switch to
-	use SourceIndex#find_name rather than search.  Made sure a nil
-	value is returned with a path is not found.
-
-	* lib/rubygems/source_index.rb (Gem::SourceIndex::search): Changed
-	parameter name to gem_pattern to emphasize using Regex in search.
-	(Gem::SourceIndex::find_name): Added find_name to handle the
-	common case of searching for an exact match on the short name.
-
-	* lib/rubygems.rb (Gem::Exception::activate): Make sure that
-	activate more closely adheres to honoring the auto_require=>false
-	request.
-	(Gem::Exception::report_activate_error): Out of line error
-	reporting for activate.
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteInstaller::find_dependencies_not_installed): Found
-	another location that was using require_gem with auto_require.
-	Fixed to use :auto_require=>false.
-
-	* lib/rubygems/gem_commands.rb
-	(Gem::InstallUpdateOptions::add_install_update_options): Added
-	--ignore-dependencies option.  Still needs to be wired to logic.
-
-	* lib/rubygems/installer.rb (Gem::Installer::install): Added call
-	to require_gem_with_options.
-
-	* lib/rubygems.rb (Kernel::require_gem_with_options): Added to
-	allow easier specification of the autorequire flag for
-	Gem.activate.
-
-2005-03-10  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteSourceFetcher::normalize_uri): Normialize a URI to
-	start with http:// if it does not already.
-
-	* test/test_deployment.rb (TestDeployment::xtest_deploy_sources):
-	Disabled this test.  It is part of the new deployment software and
-	is not working yet.
-
-2005-03-09  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/gemconfigure.rb (Gem::self): Added to aid dynamic
-	versioning.
-
-	* lib/rubygems/command.rb (Gem::Command::command_manager): Moved
-	command_manager to base class.
-
-	* lib/rubygems/gem_commands.rb (Gem::CleanupCommand::execute):
-	Both implicit and explicit gems now work with cleanup.  
-
-2005-03-08  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/installer.rb (Gem::Uninstaller::ok_to_remove):
-	Fixed source index to be loaded from the installed gems when doing
-	an "OK TO REMOVE" dependency check.
-
-2005-03-06  Rich Kilmer <rich@infoether.com>
-	* lib/rubygems/deployment.rb: beginning of a deployment capability
-
-	* test/test_deployment.rb: first tests of new deployment system
-
-2005-03-04  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems/gem_commands.rb: Small bugfix for the case when you
-	pass in a gem name (or more) to cleanup for the cleanup command.
-
-2005-03-04  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/installer.rb (Gem::Uninstaller::ok_to_remove):
-	Reworked logic in uninstall to be intelligent about dependencies.
-	We only complain about dependencies if removing a gem will cause a
-	dependency error.  The uninstaller now checks for :ignore, :all
-	and :executables options.
-
-	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::initialize):
-	Registered Cleanup command.
-
-	* lib/rubygems/gem_commands.rb (Gem::CleanupCommand): Added
-	Cleanup command to gem.
-	(Gem::UninstallCommand::initialize): Added --all, --ignore and
-	--executables options to uninstall.  This helps to avoid excessive
-	YESes all the time.
-
-2005-02-28  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::LocalSourceInfoCache::write_cache): Open cache file in
-	binary mode.
-
-2005-02-28  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/config_file.rb: don't warn about not being able to
-	find config file.
-	* lib/rubygems/doc_manager.rb: (for DHH) don't install rdoc docs for
-	* lib/rubygems/gem_commands.rb: Print which gems are updated on 'gem
-	update'.  If --system is used, report that the rubygems system
-	software has been updated.
-	* lib/rubygems/installer.rb: Cleaned up the uninstall has_dependents
-	logic and output.  It was misleading and buggy before.
-
-2005-02-27  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/config_file.rb
-	(Gem::ConfigFile::default_config_file_name): Fixed bug in finding
-	home directory for the .gemrc file.
-
-2005-02-27  Chad Fowler  <chad@chadfowler.com>
-
-	* Released 0.8.6
-
-	* Fixed a small bug with shebang construction
-
-2005-02-26  Jim Weirich  <jim@weirichhouse.org>
-
-	* Released 0.8.5
-
-	* lib/rubygems/doc_manager.rb (Gem::DocManager::generate_rdoc):
-	Removed warning about generating rdocs on gems w/o an rdoc flag.
-
-	* lib/rubygems/gem_commands.rb
-	(Gem::UpdateCommand::do_rubygems_update): Added --system option to
-	update to specifically update the version of rubygems.
-	(Gem::UpdateCommand::which_to_update): Fixed some refactoring bugs
-	in the which_to_update method.
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::LocalSourceInfoCache::read_cache): switched to Marshal
-	rather than Yaml for local cache.
-
-	* bin/gem: Added requirement for Ruby >= 1.8.0.
-
-2005-02-10  Chad Fowler  <chad@chadfowler.com>
-	* bin/gem_server: Added Martin Ankerl's wonderful new gem_server
-	template
-
-2005-01-27  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/gem_commands.rb: Fixed
-	`gem update` so it accepts a list of gems to update and _only_
-	updates those.
-	* lib/rubygems/installer.rb: Fixed a bug in the new shebang code.
-	* lib/rubygems/remote_installer.rb: Attempt to fix Curt Hibbs'  
-	reported Proxy bug without actually having a proxy to test with.
-
-2005-01-22  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/custom_require.rb: Lyle Johnson's fix for Bug #1379
-
-2005-01-20  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/validator.rb: Applied Austin Ziegler/Kasper Schiess's
-	patch to fix unit test running bug.
-
-2005-01-14  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/installer.rb: attempt at fixing Ryan Davis's
-	reported Shebang bug.  STILL NOT WORKING, because it doesn't work
-	with ^M characters.
-	* lib/rubygems/config_file.rb: small but ugly error fixed if no
-	config file exists.
-	* lib/rubygems/remote_installer.rb: Fixed bug http://rubyforge.org/tracker/index.php?func=detail&aid=1331&group_id=126&atid=575.
-
-2005-01-01  Chad Fowler  <chad@chadfowler.com>
-	* Released 0.8.4
-
-2004-12-31  Jim Weirich  <jim@weirichhouse.org>
-
-	* Rakefile: Switch to standard Rake test tasks.
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteSourceFetcher::read_data): Added a retry to try a
-	lower case gem name if the open failed.  This fixes a problem
-	where case differences are preventing some gems from installing.
-
-2004-12-29  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/gem_commands.rb (Gem::InstallCommand::execute):
-	Changed the RemoteInstaller to take an options hash rather than
-	individual options.  This will leave the interface more resilient
-	to changes as more options are added
-	(e.g. --install_dependencies).
-
-	* lib/rubygems/specification.rb (Gem::Specification): Marked array
-	attributes explicitly.  This allows for explicit conversion to
-	arrays when assigned.
-
-	* test/test_specification.rb
-	(TestSimpleSpecification::test_array_attributes): Added test for
-	array_attributes forcing values to arrays.
-
-2004-12-28  Jim Weirich  <jim@tardis>
-
-	* lib/rubygems.rb (Gem::Exception::ensure_gem_subdirectories):
-	Fixed the Ryan Davis patch to work correctly when directories are
-	not writable.
-	
-2004-12-18  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems/version.rb: Erik Veenstra's sort patch.
-	* lib/rubygems.rb: Ryan Davis's installation bug fix.
-
-2004-12-14  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* test/test_loadmanager.rb: invalidated it as a unit test; it's
-	incompatible with custom_require.rb.
-
-2004-12-12  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/custom_require.rb: simple bug fix.
-
-2004-12-12  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/custom_require.rb: new file to replace
-	loadpath_manager.rb and speed up the custom require functionality.
-
-	* lib/rubygems/timer.rb: new file; simple benchmarking tool that's
-	useful at the moment but needn't stay in RubyGems permanently.
-
-	* lib/rubygems/source_index.rb: include Enumerable and implement #size
-	and #length.
-
-	* lib/rubygems/specification.rb: removed lazy initialisation of
-	attributes to reduce #copy_of invocations; folded
-	Specification.copy_of into Specification#copy_of.
-
-	* lib/rubygems.rb: require 'rubygems/custom_require' instead of
-	'rubygems/loadpath_manager'; removed out of date documentation; added
-	"require 'rubygems/timer'" to temporarily assist with benchmarks.
-
-2004-12-07  Jim Weirich  <jim@weirichhouse.org>
-
-	* Released 0.8.3
-
-2004-12-06  Jim Weirich  <jim@weirichhouse.org>
-
-	* test/test_specification.rb
-	(TestLegacyYamlSpecification::test_load): Fixed test to avoid the
-	__FILE__ stuff.  Running tests from rakefile guarantees that the
-	file paths start from the right location.
-
-	* pkgs/sources/sources.gemspec: Made Gem.sources_spec idempotent.
-
-	* lib/rubygems/specification.rb (Gem::Specification::initialize):
-	Added @@gather to Gem::Specification to facilitate proper loads.
-	(Gem::Specification::Specification): Added Specification.load.
-
-	* lib/rubygems/source_index.rb (Gem::SourceIndex): Fixed comments
-	'long name' => 'full name'.
-
-	* lib/rubygems/gem_commands.rb (Gem::BuildCommand::load_gemspecs):
-	Changed to use Gem.Specification.load.
-
-	* Rakefile: Added sources-*.gem to clobber list.
-	(egrep): Upgraded the DBG finder to include breakpoint.
-
-	* post-install.rb (install_sources): Using block version of chdir.
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::LocalSourceInfoCache::read_cache): Fixed initialization of
-	cache.
-
-	* lib/rubygems.rb: Updated version to 0.8.2.
-
-2004-12-04  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::LocalSourceInfoCache::writable_file): Now just returns the
-	selected cache file (which was selected based on writability).
-	(Gem::LocalSourceInfoCache::try_file): Added try_file to determine
-	if a file is a candidate for a cache file.
-	(Gem::LocalSourceInfoCache::select_cache_file): Added failure if
-	there are not valid cache file candidates.
-
-	* lib/rubygems.rb (Gem::Exception): Renamed @@cache to
-	@@source_index.
-	(Gem::Exception::source_index): Renamed Gem.cache to
-	Gem.source_index (but left cache as an alias).
-
-2004-12-03  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/remote_installer.rb (Gem::LocalSourceInfoCache):
-	Added a local cache manager object to implement the read/write
-	policies on the system and user cache files.
-	(Gem::LocalSourceInfoCache::update): Added update and flush to the
-	caching fetcher so that it knows when it needs to update the local
-	cache files.
-	(Gem::RemoteInstaller::initialize): Switched to using a cached
-	fetcher in the remote installer.  All the caching logic was
-	removed from the installer.  User writable cache files are now
-	supported.
-	(Gem::RemoteInstaller::write_gem_to_file): write_gem_to_file now
-	will create the path if needed.
-
-2004-12-02  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/package.rb (TarInput::zipped_stream): To workaround
-	a problem with earlier than 1.2.1, we read the zipped data into a
-	string, and then return an IO object on that string.
-	(TarInput::each): Refactored getting a stream to the zipped data
-	into <tt>zipped_stream</tt>.
-
-2004-12-01  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteSourceFetcher::convert_spec): We now proprocess the
-	yaml string data to reduce it in size.  This was done to
-	workaround a problem with large YAML files (although it is just a
-	temporary fix because our yaml data keeps growing and growing).
-
-	* Rakefile: Added more targets to the clobber target.
-
-	* test/test_remote_fetcher.rb
-	(TestRemoteFetcher::test_explicit_proxy): Added tests for proxy
-	support.
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteSourceFetcher::connect_to): Refactored to add proxy
-	support.
-
-2004-11-28  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems/loadpath_manager.rb: Added Mauricio's patch to work
-	around string contains null byte issue.
-
-2004-11-27  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteSourceFetcher::get_size): Switched from open-uri with
-	early abort to an HTTP.head call to get the size of the yaml file
-	on the server.
-
-2004-11-26  Jim Weirich  <jim@weirichhouse.org>
-
-	* test/test_specification.rb
-	(TestDefaultSpecification::test_defaults): Added test for some
-	basic defaults in a gem spec.
-
-	* test/test_remote_installer.rb (MockFetcher::source_info): Made
-	the fake test data more realistic.
-	(TestRemoteInstaller::test_source_info): Improved tests.
-
-2004-11-26  Jim Weirich  <jim@tardis>
-
-	* test/test_remote_installer.rb (MockFetcher): Added MockFetcher
-	to make testing the remote installer easier. Currently there are
-	two remote installer test classes.  Eventually TestRemoteInstaller
-	will succeed RemoteInstallerTest, which is very incomplete.
-
-	* test/test_package.rb (TC_TarReader::TC_TarInput): Made the unit
-	test ignore the setgid bit.  The setgid bit doesn't work on my
-	laptop for some reason.  This may be a problem with my laptop
-	rather than with this code.  Should investigate further.
-
-	* lib/rubygems/remote_installer.rb (Gem::RemoteSourceFetcher):
-	Added a Fetcher object to the remote installer to handle all the
-	details of getting the remote information.  This allows testing
-	the logic of the remote installer without actually doing remote
-	calls.
-	(Gem::RemoteInstaller::sources): Renamed get_caches to
-	source_info.  The problem is that cache is too generic and there
-	are actually several things that we will cache in the system.
-
-	* lib/rubygems/cache.rb (Gem::Cache::self): Changed interface to
-	from_installed_gems slightly.
-	(Gem::Cache::self): Reordered rescue clauses so that the syntax
-	exception might actually be handled.
-
-	* lib/rubygems.rb (Gem::Exception::ensure_gem_subdirectories):
-	Dumped the check_gem_subdirectories method to use the almost
-	identical ensure_gem_subdirectories method.
-	(Gem::Exception::ensure_gem_subdirectories): Only attempt to
-	create the gem subdirectories if we can actually write them.
-
-	* bin/gem_server: Added date of last file modification to header
-	of /yaml.  This is in preparation for using a head command with
-	date/time stamping in fetching the source cache.
-
-2004-11-25  Ryan Davis <ryand@zenspider.com>
-	* lib/rubygems.rb: Added GEM_SKIP functionality, which will tell
-	loadpath_manager not to load specific libs from gems.  For
-	testing/ development purposes.  Created by Ryan Davis.
-
-2004-11-24  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems/specification.rb: Allow multiple authors per gem.
-	* lib/rubygems/gem_commands.rb: command line error message if you
-	run 'gem install' with no args.
-	* lib/rubygems/loadpath_manager.rb: Fixed @specs bug as reported by
-	Lothar Schulz on ruby-talk.
-
-2004-11-07  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems.rb,lib/rubygems/installer.rb,lib/rubygems/cache.rb
-	lib/rubygems/remote_installer.rb,lib/rubygems/gem_commands.rb: 
-	Fixes to make non-root installation work properly.  Still need to
-	fix uninstallation.
-	* lib/rubygems/gem_commands.rb: Allow multiple gems/gem names on the
-	command line for install.
-
-2004-10-31  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems/version.rb,test/test_version_comparison.rb: Patrick May's
-	* post-install.rb: Patrick May's fix for rubygems lib not being found
-	during install.
-
-2004-10-29  Chad Fowler <chad@chadfowler.com>
-	* packages/,pkgs,install.rb: renamed "packages" to "pkgs" to avoid
-	* remote_installer.rb: Added user-agent reporting for remote
-	operations
-	* setup.rb,install.rb,bin/update_rubygems: removed install.rb and 
-	added setup.rb and post-install.rb.  Changed update_rubygems so that
-	params passed to it can be passed on to setup.rb
-		
-2004-10-25  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/installer.rb
-	(Gem::Uninstaller::remove_executables): Corrected spelling of
-	"addtion".
-
-2004-10-24  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/version.rb (Gem::Version::Requirement::self): Now
-	properly handles arrays of version constraints.
-
-	* lib/rubygems/loadpath_manager.rb
-	(Gem::LoadPathManager::Gem::Specification): Added comments
-	describing the fast Spec class purpose. Added to_s to
-	Gem::Specification (both fast and slow versions).
-	(Gem::LoadPathManager.paths): Returns (cached) list of gem paths.
-	(Gem::LoadPathManager::self): Refactored to use glob_over in
-	search_loadpaths and search_gempaths.
-
-	* lib/rubygems/installer.rb: Added some requires.
-
-	* lib/rubygems/cache.rb (Gem::Cache::refresh): Fixed refresh! to
-	call load_specification on the Cache class, not on itself.
-
-	* lib/rubygems.rb (Gem::Exception::activate): added comments to
-	activate.  Also made sure that partial name matches in the gem
-	cache search were avoided.
-	(Gem::Exception::clear_paths): Added code to clear the gem cache
-	when reseting the gem paths.
-	(Gem::Exception::require): Added a function to take a gem name and
-	a library file name (in that gem) and return a path to the library
-	in the gem.  David HH was interested in this in order to speed up
-	some require statements under ModRuby.  Eventually I hope we won't
-	need these special tricks.
-	(Gem::Exception::latest_partials): Fixed bug that assumed exactly
-	three digits in a version number.
-
-	* Rakefile (egrep): Added two tasks to find all the FIXME/TODO
-	markers in the source code comments and to find the DBG print
-	lines.
-
-2004-10-23  Jim Weirich  <jim@weirichhouse.org>
-
-	* test/test_specification.rb
-	(TestSimpleSpecification::test_add_bindir_to_list_of_files):
-	Verify that an executable doesn't need the bindir if bindir is
-	set.
-	(TestSimpleSpecification::test_no_bindir_in_list_of_files): Added
-	test the verify that exectuable can be written without a default
-	binder.
-
-	* lib/rubygems/installer.rb
-	(Gem::Installer::generate_bin_scripts): Added check so that the
-	bindir is access only when there are actually executables to
-	install.  Checking for an installable bindir was giving permission
-	errors when installing test gems.
-
-2004-10-21  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems/installer.rb: Show extension build errors during install
-	in addition to logging them to gem_make.out
-
-2004-10-02  Chad Fowler <chad@chadfowler.com>
-
-	* lib/rubygems/validator.rb,lib/rubygems/gem_commands.rb: Added
-	--test option for "gem check" that runs unit tests on already-
-	installed gems.
-
-2004-09-30  Rich Kilmer  <rich@infoether.com>
-
-	* lib/rubygems/specification.rb -  externalized the loaded_from runtime 
-	var on specification
-	* lib/rubygems/cache.rb - optimized cache refresh! method and refactored 
-	processing of files when building cache.
-	* lib/rubygems/loadpath_manager.rb - fixed bug in loadpath manager in 
-	finding native extensions that have ext on os x, win32 and solaris
-
-2004-09-20  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/gem_commands.rb:  If file match during local install is
-	a directory, don't try to treat it erroneously as a gem (bug reported
-	by Rich).
-	* lib/rubygems.rb:  Fixed small bug in #latest_load_paths
-
-	(NOTE: It looks like 0.8.0/0.8.1 was released in this timeframe)
-	
-2004-09-14  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems.rb: Fixed bug in require_gem (thanks Jamis Buck!)
-	that would require a gem based on an inexact search of its name
-	in the local cache.  This caused copland-webrick to be loaded
-	when a request was made for "copland".
-
-2004-09-12  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/specification.rb, test/test_specification.rb: Removed
-	library_stubs attribute.
-
-2004-09-12  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* scripts/specdoc.rb: Check that all attributes are documented; and
-	  improved formatting.
-	* scripts/specdoc.yaml: test_suite_file -> test_files; finished
-	  documentation.
-	* scripts/specdoc.data: misc changes.
-
-2004-09-11  Chad Fowler <chad@chadfowler.com>
-
-	* test/test_parse_commands.rb: Fix failing unit tests due to Rich's fix from
-
-	* lib/rubygems/specification.rb: Add bindir to executable path on file list
-
-2004-09-11  Rich Kilmer <rich@infoether.com>
-
-	* lib/rubygems/gem_commands.rb - got rid of stub options
-
-	* lib/rubygems/install.rb - changed output of messages so the UI would format
-	better 
-
-	* bin/gem_server - exit! from ^c
-
-2004-09-09  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems/loadpath_manager.rb: Small bug when gem specs have ruby 
-	version requirements.
-	* lib/rubygems/specification.rb, lib/rubygems/gem_commands.rb: Fixed failing
-	functional test.
-
-2004-09-08  Chad Fowler <chad@chadfowler.com>
-	* install.rb: added stub removal to the install process
-
-2004-09-06  Chad Fowler <chad@chadfowler.com>
-	* test/test_package.rb: Fixed failing unit test as per Mauricio's email to 
-	the rubygems list.
-	* Fixed minor issues with Windows cmd file generation.
-
-2004-09-06  Rich Kilmer <rich@infoether.com>
-	* lib/rubygems/remote_installer.rb - enabled caching of source caches
-	based on the size of the yaml.Z/yaml file.
-	
-2004-08-29  Chad Fowler <chad@chadfowler.com>
-	* /lib/rubygems/gem_command.rb: small big fix for local gem installs
-	on Windows.
-
-2004-08-28  Rich Kilmer <rich@infoether.com>
-
-	* /lib/rubygems/installer.rb, /lib/rubygems/doc_manager.rb, 
-	/lib/rubygems/cmd_manager.rb - Added an exception: FilePermissionError
-	which checks to ensure write access to the install/uninstall/rdoc 
-	destination directories and raises a nice error instead of the standard
-	one. 
-
-2004-08-28  Rich Kilmer <rich@infoether.com>
-
-	* /lib/rubygems/installer.rb - commented out stub addition and removal
-
-2004-08-28  Rich Kilmer <rich@infoether.com>
-
-	* /lib/rubygems.rb, /lib/rubygems/loadpath_manager.rb -
-	this adds all the loadpath_manager stuff with the 'ultimate require hack' to
-	rubygems.rb.  Also, require_gem methods body has been extracted into a method
-	Gem.activate that differs in the calling signature in that the second param is
-	a boolean that determines whether to autorequire or not.
-
-2004-08-27  Rich Kilmer <rich@infoether.com>
-
-	* lib/rubygems/user_interaction - added ask_yes_no as a method
-	which returns true/false and formats/processes the [yn] stuff.
-	it also has an optional second parameter of true/false for the
-	default value.
-
-	* lib/rubygems/installer.rb, lib/rubygems/remote_installer.rb, 
-	lib/rubygems/command_manager.rb - changed all places where ask 
-	was used with [Yn] to ask_yes_no
-
-2004-08-24  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/installer.rb: Library stubs are now installed as per
-	  'library_stubs' gemspec attribute.  A stub is (still) also installed
-	  for the 'autorequire' attribute.  All library stub handling
-	  refactored into two new classes: LibraryStubs and LibraryStub.
-
-	* test/test_parse_commands.rb: as per 2004-08-17 below, the 'update'
-	  command takes --rdoc as its default now.
-
-2004-08-22  Rich Kilmer <rich@infoether.com>
-	* lib/rubygems/installer.rb: fixed stub generation...i added the version 
-	stuff that only app stubs should have...sorry!
-
-2004-08-17  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/gem_commands.rb: --rdoc is default on 'update' command,
-	  consistent with 'install'.  'default_str' methods changed to reflect
-	  --rdoc being default now.
-
-2004-08-21  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/gem_commands.rb: Proper checking for gems in local 
-	directory on local install.  rescue Gem::LoadError to avoid ugly
-	backtrace.
-	* lib/rubygems/installer.rb: created Gem::LoadError to hold extra
-	metadata.  Setting up for proper dependency installation on local
-	installs.
-	
-2004-08-20  Chad Fowler  <chad@chadfowler.com>
-	
-	* lib/rubygems/specification.rb: Fixed small bug in the previous spec
-	change commit.
-
-	* lib/rubygems/cache.rb: Prevent catastrophic failure if a gemspec is 
-	corrupted.
-
-	* lib/rubygems/installer.rb: Fixed (in not a great way) a bug that would
-	cause a zero-length spec file to be written to the gem specifications
-	directory.
-
-2004-08-19  Chad Fowler  <chad@chadfowler.com>
-
-	* lib/rubygems/specification.rb: #files auto-includes any #extensions,
-	#extra_rdoc_files, #test_files, etc. that weren't explicitly added
-	to the file list.
-
-2004-08-18  Chad Fowler  <chad@chadfowler.com>
-
-	* lib/rubygems/specification.rb: One more bug with #test_files.
-	Default value of [] wasn't set, resulting in an attempt to call
-	#empty? on nil.
-
-	* lib/rubygems/gem_commands.rb: Unit tests appear to be working now.
-	Still more testing to do.
-
-	* lib/rubygems/remote_installer.rb, lib/rubygems/installer.rb: Fixed
-	minor bugs in default selections for questions asked during 
-	installation and uninstallation
-	
-2004-08-17  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/specification.rb:
-	  - #test_suite_file and #test_files now work on older gems.
-	  - Added Specification.from_yaml for loading YAML gemspecs
-	  - #to_ruby doesn't emit 'specification_version'
-
-	* lib/rubygems/gem_commands.rb: Updated test-on-install code to use
-	  Specification#test_files instead of #unit_test_suite.
-
-	* lib/rubygems/old_format.rb: Use Specification.from_yaml
-	* lib/rubygems/package.rb:    Ditto
-
-2004-08-17  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/command.rb: --debug option to turn on $DEBUG
-	* lib/rubygems/config_file.rb: ditto
-
-2004-08-11  Rich Kilmer <rich@infoether.com>
-	* lib/rubygems/installer.rb: The application stub now defaults to 
-	the latest version of the library, and optionally allows an initial 
-	parameter conforming to _VERSION_ to be passed to select a prior 
-	version of the library (this initial parameter, if present, is shifted 
-	off of ARGV). This change was re-added...I erased it somehow :(
-
-2004-08-11  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/gem_commands.rb:
-	  - 'gem spec X' displays spec for _latest_ version of X.  Added
-	    '--all' option if you want to see all versions.
-	  - RDocCommand code cleanup and slight change: document _all_
-	    versions of the gem by default, not just the first.
-
-	* lib/rubygems/doc_manager.rb: removed 'kilmer' default template
-	  option and obsolete error message.
-
-2004-08-12  Chad Fowler <chad@chadfowler.com>
-	* Added "gem rdoc" command for generating docs for already-installed
-	gems
-
-2004-08-11  Rich Kilmer <rich@infoether.com>
-	* bin/generate_yaml_index: updated to work with new gem format (and use the Gem::Format
-	 class to read).  Will deploy after testing on RubyForge.
-	* lib/rubygems/gem_commands.rb: generate rdoc by default on installs (I think this is
-	 just good practice.
-	* lib/rubygems/remote_install.rb: raise an exception if dependent gems cannot be found 
-	 on remote_install
-
-2004-08-11  Chad Fowler <chad@chadfowler.com>
-	* lib/rubygems/gem_commands.rb: query is now case insensitive (as it used to be)
-	* lib/rubygems/installer.rb: gem_make.out wasn't being written when an extension failed to compile.
-
-2004-08-11  Rich Kilmer <rich@infoether.com>
-
-	* removed String.to_requirement...we should not modify 
-	  base classes in Ruby! modified to get rid of said to_requirement 
-	  with Gem::Version::Requirement.create(obj)
-
-	* specification.rb - fixed constructor bug of version requirement...
-	  it now defaults to Requirement.default
-
-2004-08-11  Chad Fowler <chad@chadfowler.com>
-
-	* One more specification.rb bug fixed.
-
-2004-08-11  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/specification.rb:
-	  - Added convenience class methods: attribute_names,
-	    attribute_defaults, default_value, required_attributes, and
-	    required_attribute?.
-
-	  - IMPORTANT: attribute readers now use lazy initialization, just
-	    like some of them did before the 2004-08-01 change.  This was done
-	    to fix the breakage when loading older gemspecs.
-
-	  - IMPORTANT: replaced instance variable access with attribute reader
-	    method calls in many cases.  This is in line with the above change.
-
-	  - Good documentation for the "attribute" method.
-
-	  - Renamed _copy -> _copy_of.
-
-	* lib/rubygems/cache.rb:
-	  - Some fairly shallow changes. Exception handling needs improvement.
-
-	* lib/rubygems/version.rb:
-	  - (Version.create) new method (for convenience)
-	  - (Version::Requirement.create) new method (for convenience)
-	  - (Version::Requirement.default) new method (for consistency)
-
-	* test/test_specification.rb: test attribute_names instead of
-	  attributes.  Other "class convenience" methods remain to be tested
-	  at this stage.  Also added test classes for legacy gemspecs.
-
-	* test/data/legacy/keyedlist-0.4.0.ruby: added.
-	* test/data/legacy/keyedlist-0.4.0.yaml: added.
-
-2004-08-06  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/specification.rb:
-	  - Added convenience class methods: attribute_names,
-	    attribute_defaults, default_value, required_attributes, and
-	    required_attribute?.
-
-	  - IMPORTANT: attribute readers now use lazy initialization, just
-	    like some of them did before the 2004-08-01 change.  This was done
-	    to fix the breakage when loading older gemspecs.
-
-	  - Good documentation for the "attribute" method.
-
-	  - Renamed _copy -> _copy_of.
-
-	* test/test_specification.rb: test attribute_names instead of
-	  attributes.  Other "class convenience" methods remain to be tested
-	  at this stage.
-
-2004-08-01  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/specification.rb:
-	  - (Re)defined class methods: attribute, attributes,
-	    required_attribute, read_only, overwrite_accessor.	@@attributes
-	    contains a list of attribute names and default values.  This
-	    allows higher-level specification of gemspec attributes, and the
-	    handling of them in a DRY fashion.
-
-	  - to_yaml_properties now includes all properties, to ensure
-	    correct deserialization of a Gem::Specification object.
-
-	  - #to_ruby and #to_yaml_properties rewritten to use @@attributes
-
-	  - Introduced 'specification_version' attribute and three constants:
-	    NONEXISTENT_SPECIFICATION_VERSION, CURRENT_SPECIFICATION_VERSION, and
-	    SPECIFICATION_VERSION_HISTORY.  This allows us to track changes to
-	    the spec format.
-
-	  - Refactored several "helper" methods, using the new class method
-	    'attribute_alias_singular', which provides a "singular" alias for
-	    a "plural" attribute (e.g. require_path and require_paths).
-
-	  - All gemspec attributes now defined in a uniform fashion, which
-	    implies that they all have valid instance variables on
-	    initialization.  Previously, some attributes were lazily
-	    initialized.
-
-	  - Introduced attribute 'library_stubs', to allow the specification
-	    of several stub files.  (That feature not implemented, though.)
-
-	  - Introduced attribute 'test_files' and deprecated 'test_suite_file'.
-
-	  - Provided #warn_deprecated stub of a method, but don't know what to
-	    do with it.
-
-	  - Deprecated #has_test_suite? in favour of (new) #has_unit_tests?
-
-	  - Used overwrite_accessor to provide special behaviour for the
-	    setting of some attributes.
-
-	  - The 'date' attribute is now a Date object.	We don't need high
-	    resolution, and Time objects, being system-dependent, are not nice
-	    to deal with.
-
-	  - Various code style changes.
-
-	  - Summary: uniform treatment of gemspec attributes; reduced code by
-	    refactoring; 'test_suite_file' deprecated for 'test_files';
-	    'library_stubs' introduced; spec versioning introduced.
-
-	* lib/rubygems/version.rb: (Dependency) added #to_s, #==, and an
-	  alias (requirements_list -> requirement_list).
-
-	* test/test_specification.rb: several new tests: _singular_attributes,
-	  _deprecated_attributes, _defaults, _to_{yaml,ruby}_and_back,
-	  _directly_setting_dependencies_doesnt_work, and more.  Plus a new
-	  class to give Specification a more thorough workout (TestSpecificationComplex).
-
-	* scripts/runtest.rb: require 'pp' so it's always available in unit
-	  tests.
-
-2004-07-30  Rich Kilmer  <rich@infoether.com>
-
-	* lib/rubygems/installer.rb The application stub now defaults 
-	  to the latest version of the library, and optionally allows 
-	  an initial parameter conforming to _VERSION_ to be passed
-	  to select a prior version of the library (this initial 
-	  parameter, if present, is shifted off of ARGV).
-
-	* lib/rubygems/version.rb correct? is now a class method on
-	  Version enabling Gem::Version.correct?(...)
-
-	* lib/rubygems/install.rb make it so uninstalling a gem will
-	  not remove executables if another version of that gem is 
-	  installed and needs those executables
-
-2004-07-26  Jim Weirich  <jim@tardis>
-
-	* lib/rubygems.rb (Gem::Exception::latest_load_paths): Added
-	latest_load_paths and refactored all_load_paths to use common
-	code.
-
-2004-07-25  Rich Kilmer  <rich@infoether.com>
-	* fixed bug in using --source in command.rb (removed short -s version)
-
-	* changed spec to use the RUBY_PLATFORM for Platform::CURRENT
-
-	* added ability to choose from list of available gems on remote install
-	  if (1) some of the gems are binary and (2) there are move than one.
-	  If the gems are all source gems, the latest is selected.
-
-2004-07-25  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems.rb (Gem::Exception::all_load_paths): Added
-	all_load_paths utility function.
-
-	* bin/update_rubygems: Added a command to update the gem
-	installation based on a update gem.
-
-	* Rakefile: Pulled package file list out into a constant so it can
-	be reused between the package command and the gem package command.
-	Added a gem package target to support rubygems updates.
-
-2004-07-22  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/version.rb:
-	  * (Requirement#initialize) initialize @version to avoid warning
-	  * (Dependency#initialize) initialize @version_requirement to avoid
-	    warning
-
-2004-07-19  Chad Fowler     <chad@chadfowler.com>
-	* install.rb: Shebang line should point to the ruby version used during
-	installation.
-
-2004-07-19  Assaph Mehr     <assaph@avaya.com>
-	* lib/rubygems/command.rb, packages/sources/lib/sources.rb: Added
-	command-line-configurable sources.
-
-2004-07-18  Chad Fowler	    <chad@chadfowler.com>
-	* lib/rubygems/validator.rb: Fixed a bug that would cause "managed"
-	files to appear to be unmanaged due to differences in how the paths
-	were formatted.
-
-2004-07-17  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/gem_commands.rb (InstallCommand#execute): removed clear
-	  bug (name -> gem.name).
-
-2004-07-14  Rich Kilmer     <rich@infoether.com>
-	* added old_format.rb which is used in the (hack) in format.rb 
-	  to detect the older version of a gem, and if present, switches 
-	  to that class instead.
-	* fixed the ARGV passing in bin/gem to ingore args past -- which
-	  are used for passing params to source gems (extconf.rb)
-
-2004-07-13  Chad Fowler	    <chad@chadfowler.com>
-	* lib/rubygems/installer.rb, lib/rubygems/package.rb, 
-	lib/rubygems/format.rb, test/test_package.rb: Added Mauricio 
-	Fernandez's patch to replace old gem format with tar.gz format.
-	Fixed some failing unit tests that resulted.  Still a couple left.
-	* lib/rubygems.rb: Fixed a bug introduced by the previous patch.
-
-2004-07-13  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems.rb: (#require_gem) added the ability to do
-	  "require_gem 'rake/packagetask'", for instance, which is a
-	  shortcut for "require_gem 'rake'; require 'rake/packagetask'".
-
-2004-07-13  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/gem_commands.rb: refactored --version option
-	  in all cases to the new VersionOption module.
-
-2004-07-13  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/cmd_manager.rb: added 'unpack' command.
-
-	* lib/rubygems/gem_commands.rb (UnpackCommand): added.
-
-	* lib/rubygems/installer.rb (Installer#unpack): added.
-
-2004-07-09  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/user_interaction.rb (Gem::StreamUI::ask and
-	Gem::StreamUI::choose_from_list): Added flush before each gets.
-
-2004-07-05  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/command.rb (Gem::Command#defaults_str): added.
-
-	* lib/rubygems/command.rb (Gem::Command#create_option_parser):
-	  Defaults for the options are included in the parser output.
-
-	* lib/rubygems/gem_commands.rb: all commands which have options
-	  and defaults now have #defaults_str implemented.
-
-2004-07-05  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/command.rb (Gem::Command#create_option_parser):
-	Make the argument and option sections optional.  They are only
-	printed if there are options or arguments defined.
-
-2004-07-05  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/gem_commands.rb:
-	  - scrubbed up the 'help' command a bit, removing its options
-	  - added information to 'help commands'
-
-2004-07-04  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/gem_commands.rb:
-	  - modified generic help and examples
-	  - improved 'list' and 'search' help, and fixed bug in 'search'
-
-	* lib/rubygems/cmd_manager.rb: 
-	  - explicit support for top-level commands --help and --version
-	  - no more support for --examples and --commands
-
-2004-07-04  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/rubygems/gem_commands.rb:
-	  - added 'list' and 'search' commands ('list' is no longer an alias
-	    for 'query')
-	  - modified return value from all 'arguments' methods (see command.rb)
-
-	* lib/rubygems/cmd_manager.rb: added 'search' command.
-
-	* lib/rubygems/command.rb:
-	    (Command#create_option_parser): enhanced the option parser for 'help'
-					    display
-	    (Command#remove_option): added (to support 'list' and 'search')
-
-	* Rakefile: added 'gem' target.  Runs "local" (not installed) command
-	  and libraries.
-
-2004-07-04  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* Rakefile: added 'install' target.
-
-	* lib/rubygems/cmd_manager.rb: code formatting.
-
-	* lib/rubygems/gem_commands.rb:
-	  - refactored common install and update options into new module
-	    InstallUpdateOptions
-	      . consolidated option pairs (e.g. --test & --no-test ==> --[no-]test)
-	      . --gen-rdoc is now --rdoc
-	  - (UninstallCommand) corrected typo
-	  - (InstallCommand) corrected output with local install
-
-	* test/test_parse_commands.rb: :%s/--gen-rdoc/--rdoc/g
-
-2004-07-03  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/gem_commands.rb (Gem::InstallCommand::initialize):
-	Added --no-gen-rdoc and --no-test to allow the user to override
-	.gemrc default options.
-
-	* lib/rubygems/doc_manager.rb (Gem::DocManager::generate_rdoc):
-	Concatenate the local rdoc options to the end of the spec's rdoc
-	options.
-	(Gem::DocManager::configured_args): Added configured_args as a
-	place to store local rdoc options.
-
-	* lib/rubygems/gem_runner.rb (Gem::GemRunner::do_configuration):
-	Configuration handled in do_configuration now.
-	(Gem::GemRunner::do_configuration): Set the local rdoc
-	configuration from the config file.
-
-	* lib/rubygems/command.rb (Gem::Command::handles): Added a
-	handles? method to Command so that we can detect which extra
-	arguments can be used with a command.
-	(Gem::Command::add_extra_args): New method to add the config
-	file's extra arguments to the front of the argument list.
-	(Gem::Command::extra_args): Added extra_args to Command class to
-	hold the extra args discovered in the config file.
-
-	* Rakefile: Added TEST=filename option to all the test targets.
-
-	* test/functional.rb (FunctionalTest::test_gemrc): Added
-	functional test for gemrc.
-
-	* scripts/gemdoc.data: Added an example to the specification command.
-
-	* lib/rubygems.rb (Gem::Exception::manage_gems): Added gem_runner
-	and config_file to manage_gems.
-	(Gem::Exception::use_paths): use_paths now accepts (and ignores)
-	nil parameters.
-
-	* bin/gem: Make Gem::GemRunner the top level object.  It now
-	creates and calls the CommandManager /after/ the arguments are
-	processed.
-
-	* Rakefile: Added test/data/gemhome to clobber list.
-
-2004-07-01  Jim Weirich  <jim@weirichhouse.org>
-
-	* test/test_specification.rb
-	(TestSpecification::test_rdoc_files_included): Test for rdoc files
-	included in file list.	Test for redundent file removal.
-
-	* lib/rubygems/specification.rb (Gem::Specification::validate):
-	Added gem version to validation requirement.  Added normalize to
-	remove redundent files in lists.
-
-	* lib/rubygems/gem_commands.rb (Gem::InfoCommand::usage): Added
-	usage and arguments methods for InfoCommand.
-	(Gem::SpecificationCommand::usage): Fixed several usage comments.
-
-2004-06-30  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/gem_commands.rb (Gem::InstallCommand::usage):
-	Upcased the comment on the usage statement (and corresponding
-	option).  This makes the variable part of the command
-	(e.g. GEMNAME) stand out from the static parts.
-
-	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::process_args):
-	Downcased commands before searching (allows upper case or mixed
-	case for commands on command line).
-
-	* install.rb (install_rb): Fixed bug where the installer falsely
-	triggered the old repository upgrade when the directory part of
-	the file contained the matching "-digits." pattern.  Now the
-	pattern must be in the file's base name.
-
-2004-06-26  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* scripts/specdoc.rb: added (to generate gem specificiation document)
-	* scripts/specdoc.data: added (supports specdoc.rb)
-	* scripts/specdoc.yaml: added (supports specdoc.rb)
-
-2004-06-27  Jim Weirich  <jim@weirichhouse.org>
-
-	* scripts/gemdoc.data Removed extraneous <em> marker. 
-
-	* lib/rubygems/specification.rb
-	(Gem::Specification::satisfies_requirement): HA!  Caught another
-	version_requirement vs version_requirements error.  (I really
-	regret the decision to change that name.)
-
-	* lib/rubygems/installer.rb (Gem::Uninstaller::has_dependents):
-	Changed call to alert to alert_warning.
-
-	* lib/rubygems/gem_commands.rb (Gem::UninstallCommand::execute):
-	Again, remove local error handling to allow the error to perculate
-	up the chain to the top level.
-
-	* lib/rubygems/doc_manager.rb (Gem::DocManager::generate_rdoc):
-	Removed one level of exception handling.  Only catching RDocErrors
-	at the outermost level.  And instead of reporting the error and
-	swallowing it, I convert it to a Gem::DocumentError (with the same
-	error message).  This is for better error handling.
-
-	* lib/rubygems/command.rb (Gem::Command::handle_options): Removed
-	exception handling from handle_options.  This allows errors to be
-	handled at the top level.  Makes for a more consistent error
-	interface.
-
-	* lib/rubygems/doc_manager.rb (Gem::DocumentError): Added
-	DocumentError to wrap RDocErrors (which derive from Exception
-	... yuck).
-
-	* lib/rubygems/cmd_manager.rb (Gem::RemoteError): RemoteError and
-	LocalInstallationError are now Gem::Exceptions (rather than
-	StandardErrors).  
-
-	* lib/rubygems.rb (Gem::Exception): Changed base of Gem::Exception
-	to RuntimeError (was ::Exception).  Apps using gem as a library
-	would have to catch Gem::Exceptions explicitly (yuck), or catch
-	Exceptions generically.  Catching Exceptions will catch
-	EVERYTHING, including things like SystemExit.  By makeing
-	Gem::Exception a RuntimeError, apps can catch RuntimeError or even
-	StandardError.
-
-2004-06-26  Jim Weirich  <jim@weirichhouse.org>
-
-	* test/functional.rb (FunctionalTest::test_all_command_helps):
-	Added functional test to show all commands have usage messaegs.
-
-	* lib/rubygems/gem_commands.rb (Gem::HelpCommand::execute): Added
-	version option to help (gem help version).
-	(Gem): Cleaned up the help text.  Dropped unneeded verbage.
-
-	* lib/rubygems/cmd_manager.rb
-	(Gem::CommandManager::find_command_possibilities): Added
-	find_command_possibilities to help the Help command look for
-	commands.
-
-	* lib/rubygems/installer.rb (Gem::Uninstaller::uninstall): Fixed
-	null pointer bug where a list was destroyed in a method.
-
-	* lib/rubygems/gem_commands.rb (Gem::BuildCommand::load_gemspecs):
-	yaml gemspec files are now accepted by the build command.
-
-	* lib/rubygems/command.rb (Gem::Command::parser): Created an
-	on-demand option parser for all commands.
-	(Gem::Command::handle_options): Command line option hash is now
-	and instance variable with a reader.
-
-	* Rakefile: Linked package version to the value in the rubygems.rb
-	file.  The gem env command now shows both gem version (e.g. 0.6)
-	and the package version (e.g. 0.6.1).
-
-2004-06-25  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/gem_commands.rb (Gem::InfoCommand): Dropped the
-	version command (its available via gem env).  Added a gem info
-	command to extract the yaml from a gemfile.
-	(Gem::LocalRemoteOptions): Refactored the local/remote options
-	(adding and testing) into a mixin module.
-
-	* test/test_version_comparison.rb
-	(TestDependencies::test_normalization): Added some tests for the
-	normalization issues mentions below.
-
-	* lib/rubygems/version.rb (Gem::Dependency::normalize): Old gems
-	have requirements and dependencies incoded in the Yaml spec in an
-	out of date format.  When loaded, they have incorrect instance
-	variables for modern objects.  I added a normalize call to handle
-	transforming out dated objects in to modern objects. (Remember
-	this next time we change the data structure of something in the
-	spec file.)
-	(Gem::Version::Requirement::parse): Requirements are comparable
-	now, just so that we can test them with asserts.
-
-	* lib/rubygems/remote_installer.rb
-	(Gem::RemoteInstaller::find_dependencies_not_installed): Fixed
-	recursive call to require_gem to properly pass dependency
-	information.
-	
-	* lib/rubygems/installer.rb (Gem::Uninstaller::has_dependents):
-	Fixed reference to version_requirement (needs to be plural).
-
-	* lib/rubygems/command.rb (Gem::Command::invoke): Command now
-	handles it own help messages.  Commands no longer have to return
-	true/false to trigger help messages.
-
-	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::process_args):
-	Moved help handling into the help command.
-
-	* lib/rubygems/gem_commands.rb (Gem::HelpCommand): Renamed the
-	base command to HelpCommand and made it handle a lot of the help
-	options.  Still need work on individual command helps.
-
-	* test/functional.rb (FunctionalTest::test_env_version): Added a
-	bunch of new functional tests for the environment command.
-
-	* lib/rubygems/gem_commands.rb (Gem::InstallCommand::execute):
-	Made multiple gem names an error for now.  Should look at later.
-
-	* lib/rubygems/cmd_manager.rb (Gem::ListCommand): Added list as an
-	alias to query.
-	(Gem::UpdateCommand::initialize): Corrected spelling of install
-	(intall) in several places.
-
-	* bin/gem_server: Added Gem.manage_gems to the gem_server to fix
-	missing requirements.
-
-	* lib/rubygems/cmd_manager.rb (Gem::InstallCommand::initialize):
-	Added missing --both option to install.
-
-	* test/test_command.rb
-	(TestCommand::test_invode_with_bad_options): Catch the termination
-	request.
-
-	* test/mockgemui.rb (MockGemUi::terminate_interaction): Make the
-	mock UI throw an exception when a termination is requested.  This
-	makes sure that we don't miss accidental terminations.
-
-	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::find_command):
-	Added find_command to handle best matching command names.
-
-	* test/functional.rb (FunctionalTest::test_build): Updated
-	functional tests to use the new command structure.
-
-	* lib/rubygems/version.rb (Gem::Version::Requirement): Changed the
-	pessimistic version comparison operator to "~>".  I like to think
-	of it as "approximately greater than".	(It was ">*").
-
-	* bin/gem: Moved gem2 into the standard gem script location.  It
-	is now stable enough to use as the standard command.
-
-	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::run): Added
-	run method to trap errors while running commands.  Makes for
-	prettier output.
-	(Gem::CommandManager): Move *all* commands to their own classes.
-	Simplified CommandManager.  Lowered the coupling between
-	CommandManager and the Commands (the commands don't even need to
-	know about the manager anymore).  CommandManager maybe created
-	with "new" for testing (the script will continue to use
-	"instance").
-	(Gem::RubyGemsInfoCommand): New command.
-	(Gem::VersionCommand): New command.
-
-2004-06-24  Jim Weirich  <jim@weirichhouse.org>
-	
-	* lib/rubygems/user_interaction.rb (Gem::UserInteraction):
-	Significantly rewrote the whole user interaction scheme.  We are
-	now using an UI object that responds to the standard list of UI
-	commands (e.g. say, alert, ask).  The UserInteraction module
-	defines all the interaction methods to be forwarded to the default
-	UI objects.  The "ui" method returns that default object (and you
-	can use self.ui=(new_ui) to change it).  Also the use_ui(new_ui) {
-	} command is convienent for switching the UI object for a short
-	period of time.
-
-2004-06-18  Rich Kilmer <rich@infoether.com>
-	* broke test_cmd_manager.rb into test_parse_commands and 
-	test_process_commands to test the parsing of command line options
-	and the funtionality, respectively. 
-
-2004-06-18  Rich Kilmer <rich@infoether.com>
-	* added new unit test file: test/test_cmd_manager.rb to test the 
-	command manager classes.  this is just the first few tests which
-	will be expanded to a full test suite.
-
-2004-06-17  Chad FOwler <chad@chadfowler.com>
-
-	* lib/rubygems/installer.rb: Fixed bug in windows batch file generation
-	which was causing file not found errors.
-	* lib/rubygems/installer.rb: Uninstall now removes scripts and batch 
-	* lib/rubygems/specification.rb: Fixed install bug.  Thanks to Mark 
-	Sparshatt for the fix (via the rubyforge bug tracker). 
-
-2004-06-17  Jim Weirich  <jim@weirichhouse.org>
-
-	* lib/rubygems/doc_manager.rb (Gem::DocManager::generate_rdoc):
-	Changed rdoc generation to do a chdir into the base source
-	directory and then to use a relative path for all the source
-	files.	This makes the generated RDOC html look better and may fix
-	the windows drive/rdoc bug as a side effect.
-
-2004-06-17  Rich Kilmer <rich@infoether.com>
-	* Added ability to capture the UserInteraction with:
-	c = Gem::UserInteraction.capture
-	and then you can override specific methods like 'say':
-	c.on_say {|statement| puts "you said: #{statement}"}
-
-2004-06-15  Rich Kilmer <rich@infoether.com>
-	* Added refactored command handling in rubygems/cmd_manager.rb and a 
-	(temporary) bin/gem2 command file to test things out.  Once we feel
-	comfortable, we can replace gem with gem2.
-
-2004-06-10  Rich Kilmer <rich@infoether.com>
-	* Isolated all user interaction to pass through module methods on a new
-	Gem::UserInteraction module.  Those methods will be the method of abstracting
-	the interaction of RubyGems for use in a GUI-based solution.
-
-2004-06-10  Rich Kilmer <rich@infoether.com>
-	* require 'rubygems' now minimally requires only the files needed
-	for runtime access to gems...not management of gems.  To manage
-	gems you now additionally need to execute Gem::manage_gems prior
-	to using the builder/installer/etc.  This makes gemspecs not 
-	backward compatible unless they add that line to the gemspec 
-	after the require 'rubygems' line.
-
-2004-06-10  Gavin Sinclair <gsinclair@soyabean.com.au>
-	* bin/gem: --upgrade-all was broken, probably as a result of the
-	  search changes listed below.
-
-2004-06-09  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/remote_install.rb: delegate search functionality to
-	  Cache class, bringing remote and local search and list together into
-	  one piece of code.
-	* bin/gem, lib/rubygems/validator.rb: move all STDIO work to bin/gem.
-	  Validator.alien now returns a hash of ErrorData objects.
-	* bin/gem, lib/rubygems/installer.rb: move most of the STDIO stuff to
-	  bin/gem, communicating via exceptions in this case.
-
-2004-06-08  Rich Kilmer  <rich@infoether.com>
-	* Fixed the drive problem on win32 (hopefully) so multiple drives
-	  should now work.  Its still a hack until rdoc is fixed.
-
-2004-06-08  Chad Fowler  <chad@chadfowler.com>
-	* Fixed bug caused by method change on Version::Requirement
-
-2004-06-08  Rich Kilmer <rich@infoether.com>
-	* fixed bug in doc_manager.rb whereby the extra_rdoc_files should
-	  be appended to the list of directories prior to prepending the
-	  full path.
-
-2004-06-08  Gavin Sinclair <gsinclair@soyabean.com.au>
-	* bin/gem_server: List installed gems in [name,version] order.
-
-2004-06-08  Gavin Sinclair <gsinclair@soyabean.com.au>
-	* lib/rubygems/installer.rb: don't warn about not being able to
-	  install a library stub if a library stub is already installed.
-	  Still warn if it's not a library stub that's there already.
-
-2004-06-08  Gavin Sinclair <gsinclair@soyabean.com.au>
-	* bin/gem: renamed --upgrade-dist to --upgrade--all and fixed bug.
-	* lib/rubygems/installer.rb: fixed bug with Ruby version assertion.
-
-2004-06-07  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/remote_installer.rb, lib/rubygems/version.rb: Fixed old
-	  dependency on #version method for Gem::Version::Requirement
-	* bin/gem: new --upgrade-dist option allows one to upgrade every
-	  installed gem
-	* lib/rubygems/specification.rb,lib/rubygems/installer.rb: new
-	  #required_ruby_version attribute added to gem specification for specifying a
-	  dependency on which version of ruby the gem needs.	Format it accepts is
-	  the same as the Gem::Version::Requirement format.
-
-2004-06-06  Chad Fowler  <chad@chadfowler.com>
-	* bin/gem: install_stub is once again the default due to requests.
-
-2004-06-04  Chad Fowler  <chad@chadfowler.com>
-	* lib/rubygems/specification.rb, lib/rubygems/doc_manager.rb:  
-	Allow arbitrary files to be added for rdoc to run over them (as per
-	Jim's request).
-
-2004-06-04  Chad Fowler  <chad@chadfowler.com>
-	* bin/gem:  Reformatted --search and --list output such that
-	multiple versions of a gem are compressed into a single entry
-	(with version numbers in parentheses)
-
-2004-05-31  Jim Weirich  <jweirich@one.net>
-
-	* lib/rubygems/version.rb (Gem::Dependency): Dependency attribute
-	renamed to version_requirements (made plural).
-	(Gem::Version::bump): Added bump to implement pessimistic
-	operator.
-	(Gem::Version::Requirement): Added pessimistic operator to list of
-	operators. Operators now implemented using lambda.
-
-	* lib/rubygems.rb (Kernel::require_gem): require_gem now takes an
-	array of requirement strings.
-
-	* lib/rubygems/version.rb (Gem::Version::Requirement::initialize):
-	Simplified initialization by making parse a bit smarter.
-	(Gem::Version::Requirement::satisfied_by): Simplified by using
-	all?
-	(Gem::Version::Requirement::satisfy): Added explicit one
-	requirement satisfy test.
-	(Gem::Version::Requirement::parse): parse now returns a two
-	element string array (operator and version string).  We don't
-	bother converting to an integer array during parsing.
-
-2004-05-31 18:38 chadfowler
-
-	* gemspec now supports #rdoc_options, to which you can append
-	strings that will be passed to rdoc as additional options.
-
-2004-05-08 21:57  chadfowler
-
-	* Using Gem::RubyGemsVersion to match the release number.  If we
-	need to use this as an internal version format specifier in the
-	future, we can use the Gem::Version semantics.
-
-2004-05-30 14:33 gsinclair
-
-	* bin/gem: Split --help into --help (basic), --help-options (what
-	  --help used to be), and --help-examples.
-
-2004-04-30 15:57  chadfowler
-
-	* bin/gem: --install-stub is no longer the default ;)
-
-2004-04-30 15:51  chadfowler
-
-	* lib/rubygems/installer.rb: Rich Kilmer (who kicks butt) figured
-	  out how to fix the library stub stuff.
-
-2004-04-29 19:12  chadfowler
-
-	* lib/rubygems/doc_manager.rb: Dick Davies fixed a bug in the doc
-	  generator.
-
-2004-04-29 13:41  gsinclair
-
-	* lib/rubygems/installer.rb: Added skeleton code and comments to
-	  uninstall stub apps and libs
-
-2004-04-29 12:20  gsinclair
-
-	* install.rb: Don't install library stub for 'sources'
-
-2004-04-29 12:20  gsinclair
-
-	* lib/rubygems/installer.rb: Improvements to library stub
-	  installation: * don't overwrite existing file (emit warning) *
-	  nice warning if there's a permission problem * observe
-	  --[no-]install-stub flag (rather, observe the argument to
-	  #install)
-
-2004-04-29 12:16  gsinclair
-
-	* bin/gem: --install-stub is now the default
-
-2004-04-26 20:20  chadfowler
-
-	* test/test_remote_installer.rb: Cleaning up after Gavin and his
-	  test-breaking self. ;)
-
-2004-04-26 12:06  gsinclair
-
-	* bin/gem, lib/rubygems/installer.rb,
-	  lib/rubygems/remote_installer.rb: Installing a gem now causes a
-	  library stub to be installed as well, allowing you to require
-	  'package' without knowing it's a gem.
-
-2004-04-25 23:18  chadfowler
-
-	* lib/rubygems/: installer.rb, specification.rb: Prompt user if
-	  trying to uninstall a gem that other gems *may* depend on.
-
-2004-04-25 09:27  chadfowler
-
-	* test/test_remote_installer.rb: Changed expected test results to
-	  match new (old) gem naming scheme--"ruby" doesn't appear as a
-	  platform in the gem name.
-
-2004-04-25 05:50  gsinclair
-
-	* bin/gem: Changed @directory -> @install_dir for clarity
-
-2004-04-25 05:47  gsinclair
-
-	* bin/gem: Improved display of gems, platform-wise
-
-2004-04-25 05:46  gsinclair
-
-	* lib/rubygems/specification.rb: Added documentation
-
-2004-04-25 04:17  jimweirich
-
-	* test/functional.rb: Fixed functional test to properly name a Ruby
-	  platform gem.
-
-2004-04-25 04:17  jimweirich
-
-	* packages/sources/.cvsignore, test/data/one/.cvsignore: Ignore the
-	  proper gem name.
-
-2004-04-25 04:17  jimweirich
-
-	* lib/rubygems/specification.rb: Undefined several attributes that
-	  were redefined to avoid warnings.
-
-2004-04-25 04:17  jimweirich
-
-	* lib/rubygems.rb: Need to initialize @gem_home and @gem_path with
-	  ||= to avoid warning.
-
-2004-04-25 03:40  gsinclair
-
-	* lib/rubygems.rb, test/test_gempaths.rb: RUBY_GEMS -> GEM_PATH
-	  (environment variable)
-
-2004-04-25 03:33  gsinclair
-
-	* lib/rubygems/specification.rb: Pretty-print the specification
-
-2004-04-25 03:18  gsinclair
-
-	* lib/rubygems/specification.rb: Handle platform in a (hopefully)
-	  consistent manner
-
-2004-04-25 03:16  gsinclair
-
-	* install.rb: Use return value from Builder#build to locate gem
-	  file
-
-2004-04-25 03:09  gsinclair
-
-	* lib/rubygems/builder.rb: Return file name from #build
-
-2004-04-25 02:32  gsinclair
-
-	* lib/rubygems/specification.rb: Platform goes at the *end* of the
-	  full name now.
-
-2004-04-22 06:19  chadfowler
-
-	* test/test_remote_installer.rb: Fixed test to reflect fewer cache
-	  sources :(
-
-2004-04-21 17:19  rich
-
-	* lib/rubygems/remote_installer.rb: added support to download the
-	  yaml index as a .Z (zlib compressed) file if it exists, then move
-	  on to the plain yaml file if it does not
-
-2004-04-20 20:23  chadfowler
-
-	* examples/application/an-app.gemspec, lib/rubygems/format.rb,
-	  packages/sources/lib/sources.rb: Committed Dick Davies' patch to
-	  fix broken tests.
-
-2004-04-18 01:51  gsinclair
-
-	* bin/gem, lib/rubygems/doc_manager.rb: RDoc generation observes
-	  'rdoc' config file value
-
-2004-04-17 12:15  gsinclair
-
-	* bin/gem: Improved 'build' error output
-
-2004-04-17 12:12  gsinclair
-
-	* lib/: rubygems.rb, rubygems/remote_installer.rb,
-	  rubygems/specification.rb, rubygems/validator.rb: All
-	  gems-related exceptions now extend Gem::Exception
-
-2004-04-17 12:11  gsinclair
-
-	* lib/rubygems/specification.rb: Improved handling of summary and
-	  decription strings - convert to single line
-
-2004-04-17 01:09  gsinclair
-
-	* bin/gem: Prevent remote install attempt if local install was
-	  successful
-
-2004-04-17 00:49  gsinclair
-
-	* lib/rubygems/builder.rb: Better formatted the output code
-
-2004-04-16 21:31  gsinclair
-
-	* lib/rubygems/remote_installer.rb: Stoopid coding error (thanks
-	  Kent Sibilev)
-
-2004-04-16 00:00  rich
-
-	* lib/rubygems/installer.rb: added code to optionally use nmake
-	  instead of make on win32 systems
-
-2004-04-15 20:12  gsinclair
-
-	* bin/gem, lib/rubygems/remote_installer.rb: Clarified proxy
-	  handling and interface: --[no-]http-proxy [URL]
-
-2004-04-13 00:16  jimweirich
-
-	* bin/gem, test/bogussources.rb, test/functional.rb: Oops, missed
-	  an instance of GEM_PATH in the gem binary.
-
-2004-04-12 21:28  jimweirich
-
-	* lib/rubygems/cache.rb: Oops.	Missed a GEM_PATH.
-
-2004-04-12 21:11  jimweirich
-
-	* test/test_remote_installer.rb: removed setting of environment
-	  variable for now.
-
-2004-04-12 21:09  jimweirich
-
-	* Rakefile, lib/rubygems.rb, lib/rubygems/cache.rb,
-	  lib/rubygems/installer.rb, packages/sources/.cvsignore,
-	  scripts/runtest.rb, test/.cvsignore, test/bogussources.rb,
-	  test/test_format.rb, test/test_gempaths.rb,
-	  test/test_remote_installer.rb, test/test_validator.rb: Added
-	  test/temp to the clobber list.  Broke out tests into inline to
-	  avoid test dependencies on rubygem.
-
-2004-04-12 07:52  chadfowler
-
-	* lib/: rubygems.rb, rubygems/installer.rb,
-	  rubygems/remote_installer.rb: Cleaning up output strings wrt
-	  formating of "gem (version)".
-
-2004-04-12 07:41  chadfowler
-
-	* lib/rubygems/installer.rb: Gavin Sinclair's uninstall bug.
-
-2004-04-11 15:26  jimweirich
-
-	* test/data/one/: .cvsignore, one-ruby-0.0.1.gem:  removed
-	  one-ruby*.gem from source control.  This gem is automatically
-	  generated in testing.
-
-2004-04-11 10:50  chadfowler
-
-	* bin/gem: Gavin Sinclair's test code enhancements
-
-2004-04-11 07:50  chadfowler
-
-	* bin/gem, lib/rubygems/installer.rb,
-	  lib/rubygems/remote_installer.rb, lib/rubygems/specification.rb,
-	  test/insure_session.rb, test/test_remote_installer.rb,
-	  test/data/one/one-ruby-0.0.1.gem: Gavin Sinclair patches to make
-	  installer return types less ambiguous.
-
-2004-04-09 10:29  chadfowler
-
-	* lib/rubygems/installer.rb, test/data/one/one-ruby-0.0.1.gem: gem
-	  -u input validation patch by Ville Aine
-
-2004-04-07 07:49  chadfowler
-
-	* bin/gem, lib/rubygems/cache.rb, test/data/one/one-ruby-0.0.1.gem:
-	  Finally have passing tests.
-
-2004-04-07 07:24  chadfowler
-
-	* lib/rubygems/remote_installer.rb,
-	  test/data/one/one-ruby-0.0.1.gem: Allow default option to work on
-	  remote dependency prompt.
-
-2004-04-07 07:05  chadfowler
-
-	* lib/rubygems/remote_installer.rb, test/test_remote_installer.rb,
-	  test/data/one/one-ruby-0.0.1.gem: Applied George Marrows' patch
-	  to remote_install
-
-2004-04-07 06:23  chadfowler
-
-	* bin/gem, test/data/one/one-ruby-0.0.1.gem: No longer "seeing"
-	  double on remote searches
-
-2004-04-05 07:39  chadfowler
-
-	* Rakefile, test/test_remote_installer.rb,
-	  test/data/one/one-ruby-0.0.1.gem: remote_installer tests aren't
-	  completely hosed anymore.
-
-2004-04-05 06:16  chadfowler
-
-	* Rakefile, test/data/one/one-ruby-0.0.1.gem: Rake target for
-	  running all tests (unit + functional) "alltests"
-
-2004-04-05 00:48  jimweirich
-
-	* test/: insure_session.rb, data/one/README.one,
-	  data/one/one-ruby-0.0.1.gem, data/one/one.gemspec,
-	  data/one/lib/one.rb: added for functional tests
-
-2004-04-05 00:48  jimweirich
-
-	* test/functional.rb: Moved session gem detection to insure_session
-	  file.  Modified functional tests to use gem command.	Removed
-	  some directory stuff because rake guarantees the starting
-	  directory.  Added test_info functional test.	Added test_build
-	  functional test.  Added assert status.
-
-2004-04-05 00:48  jimweirich
-
-	* lib/rubygems/remote_installer.rb: Changed exceptions to inherit
-	  from RunTimeError
-
-2004-04-05 00:48  jimweirich
-
-	* bin/gem: Changed Installer to RemoteInstaller in rubygems-info.
-
-2004-04-05 00:48  jimweirich
-
-	* Rakefile: Added generated test gem to clobber list.  Added
-	  functional test target to rakefile.
-
-2004-04-04 21:17  chadfowler
-
-	* packages/sources/lib/sources.rb: Added gems mirror at
-	  http://gems.chadfowler.com
-
-2004-04-04 20:51  chadfowler
-
-	* bin/gem, lib/rubygems/remote_installer.rb, test/functional.rb:
-	  More improved error messages (don't show stack trace when using
-	  bin/gem)
-
-2004-04-04 20:43  chadfowler
-
-	* lib/rubygems/cache.rb: Only read specs that end in "gemspec".
-	  The code doesn't handle non-gemspecs very well at all.
-
-2004-04-04 20:15  chadfowler
-
-	* test/mock/gems/specifications/sources-0.0.1.gemspec: [no log
-	  message]
-
-2004-04-04 20:09  chadfowler
-
-	* test/mock/gems/gems/sources-0.0.1/lib/sources.rb: Rearranging
-	  things a bit
-
-2004-04-04 20:02  chadfowler
-
-	* bin/gem, lib/rubygems/remote_installer.rb, test/bogussources.rb,
-	  test/functional.rb: Better error messages on unresolvable host.
-
-2004-04-04 12:50  chadfowler
-
-	* redist/session.gem, test/bogussources.rb, test/functional.rb:
-	  Added the beginnings of a functional test suite.
-
-2004-04-03 22:02  chadfowler
-
-	* lib/rubygems/validator.rb: Just had to explicitly rescue
-	  VerificationError.  All is well.
-
-2004-04-03 22:01  chadfowler
-
-	* lib/rubygems/validator.rb: Mauricio fixed a problem with alien
-	  (just failed to update it when we changed the gem directory), but
-	  now there's another issue I can't find.  Anyway, this fix is
-	  obviously needed.  But alien is broken anyway.
-
-2004-04-03 21:57  chadfowler
-
-	* install.rb, lib/rubygems/builder.rb: Batsman's bug report and
-	  code for the bugs I introduced today. :)
-
-2004-04-03 09:50  chadfowler
-
-	* lib/rubygems/specification.rb: Defaulting a spec's require_path
-	  to [] to avoid downstream errors.
-
-2004-04-03 09:06  chadfowler
-
-	* lib/rubygems/builder.rb, test/test_builder.rb: builder now
-	  validates the gemspec.
-
-2004-04-03 08:48  chadfowler
-
-	* lib/rubygems/specification.rb, test/test_specification.rb: Added
-	  checking for gem specs to make sure they have all required
-	  attributes.
-
-2004-04-03 08:06  chadfowler
-
-	* gemspecs/rublog.gemspec: My original rublog gem was broken, in
-	  that it didn't have a require_path.
-
-2004-04-02 07:48  chadfowler
-
-	* lib/rubygems/remote_installer.rb: Prompt for installation of
-	  dependencies.
-
-	  For now, there is a puts/gets in the middle of
-	  remote_installer.rb  This should probably be cleaned up later
-	  (return control flow to the gem program to install the
-	  dependencies, for example.
-
-2004-04-02 07:37  chadfowler
-
-	* TODO: [no log message]
-
-2004-04-02 07:34  chadfowler
-
-	* test/: simple_gem.rb, test_format.rb: Some things I forgot to cvs
-	  add earlier.
-
-2004-04-02 07:29  chadfowler
-
-	* example/: test.gemspec, lib/test.rb, lib/test/wow.rb: Removing
-	  example directory in favor of "examples" directory (just better
-	  organized).
-
-2004-04-02 07:26  chadfowler
-
-	* test/test_all.rb: Removed test_all.rb.  Rake is obviously a
-	  better way to do it.
-
-2004-03-31 19:13  chadfowler
-
-	* lib/rubygems/format.rb, lib/rubygems/installer.rb,
-	  lib/rubygems/validator.rb, test/test_all.rb,
-	  test/test_validator.rb: More tests and refactoring to support
-	  them.
-
-2004-03-30 02:41  rich
-
-	* lib/rubygems/installer.rb: allow passing parameters to extconf.rb
-	  with:
-
-	  ruby -i blah.gem --local -- --with-option
-
-	  everything past the -- will go to the extconf.rb...just like
-	  setup.rb
-
-2004-03-30 02:34  rich
-
-	* lib/rubygems/: installer.rb, specification.rb: very initial
-	  capability to build source gems.  this only lets you build native
-	  extensions so long as you do not have to specify --with-
-	  directories
-
-2004-03-29 08:31  rich
-
-	* install.rb: switched migration of old gems to new ./gems subdir
-	  to use FileUtils rather than ftools...hope to fix reported win32
-	  error.
-
-2004-03-29 01:04  rich
-
-	* lib/rubygems/doc_manager.rb: fixed bug in pathing based on new
-	  directory structure
-
-2004-03-29 01:03  rich
-
-	* lib/rubygems/remote_installer.rb: fixed bug in default for proxy
-	  (should default to nil not true)
-
-2004-03-29 01:03  rich
-
-	* bin/gem: updated with patch to allow for config file with minor
-	  difference from gavin's patch which passes a nil to the
-	  RemoteInstaller if the proxy does not exist
-
-2004-03-28 23:22  rich
-
-	* install.rb: added code to migrate gems if they are in the old
-	  directory structure
-
-2004-03-28 21:30  rich
-
-	* install.rb, lib/rubygems.rb, lib/rubygems/installer.rb,
-	  lib/rubygems/specification.rb: changed path of installed gems to
-	  be:
-
-	  ruby/gems/1.8/gems
-
-	  which cleans up the root.
-
-2004-03-28 18:53  chadfowler
-
-	* test/test_all.rb: This is the file to run for all of the tests.
-
-	  test_remote_installer is commented out for now.  The open URI
-	  patch that George gave us makes the code a lot nicer to look at,
-	  but a little harder to test.
-
-2004-03-28 18:50  chadfowler
-
-	* lib/rubygems/remote_installer.rb, test/test_cache.rb,
-	  test/test_remote_installer.rb: Added some tests for cache search
-
-2004-03-28 12:19  chadfowler
-
-	* bin/gem, lib/rubygems/validator.rb, test/test_validator.rb: Some
-	  tests for the validator.
-
-	  Made the validator more testable.
-
-2004-03-28 09:30  chadfowler
-
-	* bin/gem, lib/rubygems/validator.rb: Fixed a problem with false
-	  alarms in the validator.
-
-2004-03-27 08:23  chadfowler
-
-	* bin/gem: No longer have an option to pass http proxy host into
-	  the gem program.  Only reads it from the environment.  This is
-	  because George's patch (and open-uri) work this way, and I'm lazy
-	  right now.
-
-2004-03-27 08:17  chadfowler
-
-	* lib/rubygems/remote_installer.rb: George Marrows' nice patch to
-	  remove a bunch of code from remote_installer.
-
-	  Our remote_installer tests are failing.  We really need to start
-	  paying attention to the test directory. :(`
-
-2004-03-24 23:26  jimweirich
-
-	* install.rb: Do not install commands ending in ~.
-
-2004-03-24 23:25  jimweirich
-
-	* lib/rubygems/specification.rb: Changed executables from accessor
-	  to writer to avoid redefinition.
-
-2004-03-21 21:10  jimweirich
-
-	* bin/gem: fixed uninitialized directory option
-
-2004-03-21 15:34  jimweirich
-
-	* bin/gem: removed carriage returns that screwed up the #! line
-
-2004-03-21 09:02  chadfowler
-
-	* bin/gem: Gavin's bin/gem refactoring.
-
-2004-03-20 17:03  jimweirich
-
-	* bin/gem: added wrapping to gem listing
-
-2004-03-20 12:22  chadfowler
-
-	* install.rb: More cleaning by Gavin Sinclair
-
-2004-03-20 12:08  chadfowler
-
-	* examples/application/an-app.gemspec,
-	  examples/application/bin/myapp,
-	  examples/application/lib/somefunctionality.rb, lib/rubygems.rb,
-	  lib/rubygems/installer.rb, lib/rubygems/specification.rb: Added
-	  functionality for installing applications into the system bindir.
-	  Needs cleaning and refactoring.
-
-2004-03-20 07:53  chadfowler
-
-	* bin/gem: [no log message]
-
-2004-03-19 23:03  chadfowler
-
-	* bin/gem: More intuitive default.
-
-2004-03-19 10:45  chadfowler
-
-	* bin/gem: * Some minor rearranging of the test stuff so that
-	  installation errors will also abort the test run * Don't try to
-	  run tests if none are included with the gem
-
-2004-03-18 22:27  chadfowler
-
-	* bin/gem, example/lib/test.rb, lib/rubygems/cache.rb,
-	  lib/rubygems/specification.rb: * Preliminary support for: gem -i
-	  blah-0.0.1.gem --run-tests Needs to be cleaned up considerably.
-	  * Introduction of new gemspec metadata "unit_test_suite", which
-	  will be require'd in order to load all unit tests
-
-2004-03-17 09:33  chadfowler
-
-	* bin/gem: Applied Gavin Sinclair's patch to make help output
-	  better.
-
-2004-03-16 21:55  chadfowler
-
-	* bin/gem: Added --remote-list option for gem command to display
-	  all gems on server.
-
-2004-03-16 21:50  chadfowler
-
-	* bin/gem, doc/UserDoc.html: Fixed --help case inconsistencies and
-	  documentation typos as per Scott Harper's email.
-
-2004-03-16 21:41  chadfowler
-
-	* bin/gem: --list and --search display are the same.
-
-2004-03-16 21:33  chadfowler
-
-	* bin/gem: Implemented some of Scott Harper's search suggestions:
-	  case insensitive sort of returned gems and display description
-	  with gem name in search results.
-
-2004-03-16 21:20  chadfowler
-
-	* bin/gem, lib/rubygems/remote_installer.rb: http_proxy  option
-	  implemented
-
-2004-03-15 07:19  chadfowler
-
-	* lib/rubygems/remote_installer.rb: Installation is now case
-	  insensitive (like search)
-
-2004-03-15 07:07  chadfowler
-
-	* TODO, bin/gem, lib/rubygems/remote_installer.rb: Better error
-	  messages.  updated TODO list.
-
-2004-03-14 21:02  chadfowler
-
-	* bin/gem, lib/rubygems/remote_installer.rb: --dir didn't work with
-	  remote-install.  Now it does.
-
-2004-03-14 17:48  rich
-
-	* bin/gem: fixed uninstall bug
-
-2004-03-14 17:18  rich
-
-	* lib/rubygems/doc_manager.rb: changed to remove <drive>: on
-	  win32...ug
-
-2004-03-14 16:15  rich
-
-	* install.rb: fixed typo
-
-2004-03-14 16:13  rich
-
-	* install.rb: generate cmd files
-
-2004-03-14 16:13  rich
-
-	* bin/: gem.cmd, gem_server.cmd: now generate cmd files
-
-2004-03-14 15:52  chadfowler
-
-	* bin/gem: Fixed a small bug with --gen-rdoc and the remote
-	  installer.
-
-2004-03-14 15:38  chadfowler
-
-	* lib/rubygems.rb: Back to version 1.0 ;)
-
-2004-03-14 15:36  chadfowler
-
-	* lib/rubygems.rb: Updated rubygemsversion
-
-2004-03-14 15:31  chadfowler
-
-	* README: credits
-
-2004-03-14 15:24  rich
-
-	* README: initial readme
-
-2004-03-14 15:12  rich
-
-	* doc/UserDoc.html: updated w/doc on documentation ;-)
-
-2004-03-14 15:01  rich
-
-	* gemspecs/jabber4r.gemspec: added jabber4r gemspec
-
-2004-03-14 14:58  rich
-
-	* bin/gem_server: change the documentation path to /
-
-2004-03-14 14:57  rich
-
-	* install.rb: remove installing .rb files from ./bin
-
-2004-03-14 14:32  rich
-
-	* doc/: DevDoc.txt, GemSpecification.txt, UserDoc.html,
-	  UserDoc.txt: updated with latest docs
-
-2004-03-14 12:05  chadfowler
-
-	* test/test_remote_installer.rb: Fixed tests.
-
-2004-03-14 11:31  chadfowler
-
-	* lib/rubygems/specification.rb: Fixed bug that would manifest
-	  itself if a gem creator put apostrophes/single-quotes in the gem
-	  spec.
-
-2004-03-14 00:04  rich
-
-	* doc/: UserDoc.html, UserDoc.txt: finished user's guide
-
-2004-03-13 21:48  rich
-
-	* doc/: DevDoc.html, UserDoc.html, UserDoc.txt: updated user's
-	  guide...will finish section on ruby's library mgt soon ;-)
-
-2004-03-13 20:48  chadfowler
-
-	* doc/DevDoc.txt: Added documentation on making and distributing
-	  gems
-
-2004-03-13 20:20  chadfowler
-
-	* TODO: [no log message]
-
-2004-03-13 19:51  rich
-
-	* doc/: DevDoc.html, DevDoc.txt, GemSpecification.html,
-	  GemSpecification.txt, UserDoc.html, UserDoc.txt, doc.css,
-	  makedoc.rb: added these doc (wiki) files from
-	  http://rubygems.rubyforge.org/
-
-2004-03-13 17:56  chadfowler
-
-	* TODO, gemspecs/README, gemspecs/cgikit-1.1.0.gemspec,
-	  gemspecs/linguistics.gemspec, gemspecs/ook.gemspec,
-	  gemspecs/progressbar.gemspec, gemspecs/redcloth.gemspec,
-	  gemspecs/rublog.gemspec, gemspecs/ruby-doom.gemspec,
-	  gemspecs/rubyjdwp.gemspec, gemspecs/statistics.gemspec: Added
-	  some gemspecs for actual RAA packages.
-
-2004-03-13 14:35  chadfowler
-
-	* TODO, lib/rubygems/remote_installer.rb: Preliminary HTTP Proxy
-	  support.  Untested.
-
-2004-03-13 09:11  chadfowler
-
-	* packages/sources/lib/sources.rb: Changed to point to rubyforge
-
-2004-03-12 22:40  rich
-
-	* bin/generate_yaml_index.rb: generates a yaml index for a gems
-	  repository
-
-2004-03-12 22:02  chadfowler
-
-	* bin/gem_server: No longer serving gem specs.
-
-2004-03-12 21:42  chadfowler
-
-	* TODO, bin/gem_server.cgi: We decided to trash gem_server.cgi in
-	  favor of the static content generator Rich is working on.
-
-2004-03-12 21:15  chadfowler
-
-	* TODO: [no log message]
-
-2004-03-12 20:11  chadfowler
-
-	* bin/gem, lib/rubygems/installer.rb,
-	  lib/rubygems/remote_installer.rb: Basic search funtionality in.
-
-	  Slight refactoring of Installer and RemoteInstaller
-
-2004-03-12 18:28  chadfowler
-
-	* TODO: [no log message]
-
-2004-03-12 16:37  chadfowler
-
-	* TODO: [no log message]
-
-2004-03-12 16:14  chadfowler
-
-	* TODO: More TODO items
-
-2004-03-08 13:50  chadfowler
-
-	* TODO, bin/gem_server, example/test.gemspec: Use rdoc templates
-	  for HTML.  Nearly XHTML compliant.
-
-2004-03-08 08:21  chadfowler
-
-	* TODO: Added TODO list
-
-2004-03-08 08:12  chadfowler
-
-	* lib/rubygems/validator.rb: Fixed a small (but crippling) bug in
-	  the validator.
-
-2004-01-24 13:49  chadfowler
-
-	* bin/gem, lib/rubygems.rb, lib/rubygems/cache.rb,
-	  lib/rubygems/validator.rb, lib/rubygems/version.rb: More cleanup.
-
-2004-01-24 13:29  chadfowler
-
-	* bin/gem, lib/rubygems/remote_installer.rb: A little cleaning of
-	  (Remote)Installer inconsistencies
-
-2004-01-24 13:23  chadfowler
-
-	* bin/gem: Removed the weird instance variable thing we had going
-	  on. :)
-
-2004-01-07 17:34  chadfowler
-
-	* bin/gem: removed old cruft
-
-2003-12-24 11:32  chadfowler
-
-	* lib/rubygems/validator.rb: Gem validation was returning false
-	  negatives (corrupted gems were not reporting their corruption).
-
-2003-12-18 14:18  chadfowler
-
-	* lib/rubygems/cache.rb: Lyle noticed some out of date rdoc
-	  documentation.  Thanks Lyle!
-
-2003-12-03 08:05  chadfowler
-
-	* install.rb: Gavin's patch for installing the files in bin/ on
-	  rubygems installation.
-
-2003-11-30 00:36  chadfowler
-
-	* lib/rubygems/specification.rb: Little warnings adjustment
-
-2003-11-29 17:27  jimweirich
-
-	* Rakefile: added Rakefile to package
-
-2003-11-29 16:23  jimweirich
-
-	* lib/rubygems/specification.rb: Removed defined? and initialized
-	  @platform
-
-2003-11-29 16:08  jimweirich
-
-	* lib/rubygems/specification.rb: Initialized @loaded and check
-	  defined?(@platform) to silence some -w warnings.
-
-2003-11-29 09:26  rich
-
-	* bin/gem_server, lib/rubygems/doc_manager.rb: updated to support
-	  /doc URL to generate list of installed gems w/doc link for rdoc
-	  generated links.
-
-2003-11-29 08:30  rich
-
-	* lib/rubygems/doc_manager.rb: minor format change of error message
-
-2003-11-29 08:29  rich
-
-	* bin/gem, lib/rubygems/builder.rb, lib/rubygems/doc_manager.rb,
-	  lib/rubygems/installer.rb: instantiates DocManager now.  errors
-	  out on no install of RDoc.  warns if .gemspec does not specify
-	  having rdoc, but rdoc is generated
-
-2003-11-29 02:13  rich
-
-	* bin/gem, lib/rubygems.rb, lib/rubygems/doc_manager.rb,
-	  lib/rubygems/format.rb, lib/rubygems/installer.rb,
-	  lib/rubygems/specification.rb: added capability to generate rdoc
-	  on install of gem (--gen-rdoc).  this doc is placed in
-	  Gem.dir+doc+gem.full_name fixed but in installer when moving to
-	  format (not calling each) added doc manager to add/remove
-	  documenatation (right now only rdoc)
-
-2003-11-29 01:28  rich
-
-	* lib/rubygems/specification.rb: should not define the attr_readers
-	  for requirements/dependencies so undef is unnecessary
-
-2003-11-29 00:12  jimweirich
-
-	* lib/rubygems/specification.rb: Undefing dependencies and
-	  requirements removes warning when used with -w.
-
-2003-11-29 00:12  jimweirich
-
-	* lib/rubygems.rb: Using defined?($GEM_PATH) avoids warning when
-	  used with -w switch.
-
-2003-11-28 15:58  chadfowler
-
-	* bin/gem, example/test.gemspec, lib/rubygems.rb,
-	  lib/rubygems/installer.rb, lib/rubygems/validator.rb,
-	  lib/rubygems/format.rb: Separated gem file reading into a
-	  separate class/file.
-
-2003-11-28 15:20  rich
-
-	* lib/rubygems/specification.rb: added has_rdoc?/has_rdoc methods
-	  ... will be used to autogenerate rdoc
-
-2003-11-28 12:30  chadfowler
-
-	* lib/rubygems/validator.rb: Rdoc added
-
-2003-11-28 11:51  chadfowler
-
-	* bin/gem, lib/rubygems.rb, lib/rubygems/validator.rb: A little
-	  rearranging of the validation/alien code.  It's still ugly, but
-	  at least it's in its own file now. :)
-
-2003-11-28 11:40  chadfowler
-
-	* bin/gem: Removed a little cruft.
-
-2003-11-27 11:04  chadfowler
-
-	* bin/gem: Print success message for each gem *not* containing
-	  errors.
-
-2003-11-27 11:00  chadfowler
-
-	* bin/gem, lib/rubygems/installer.rb: Preliminary support for gem
-	  directory validation (--alien).  Looks for bad or missing gem
-	  files, missing spec files, files installed that aren't part of
-	  the gem, checksum mismatches, etc.
-
-	  Very ugly code.  Very ugly output.  Work in progress.
-
-2003-11-24 11:58  rich
-
-	* lib/rubygems/specification.rb: change full_name to include
-	  platform
-
-2003-11-24 09:15  chadfowler
-
-	* bin/gem: Option for HTTP Proxy server for remote-install.  Not
-	  yet implemented.
-
-2003-11-23 20:22  chadfowler
-
-	* lib/rubygems/builder.rb: Removed a stray \" in builder's success
-	  message
-
-2003-11-23 20:16  chadfowler
-
-	* lib/rubygems/specification.rb: Leaving escape in but commenting
-	  out its functionality because it hosed some other things up.
-	  Need to revisit this for the case where:
-
-	   s.summary = "Chad's Thing" # It's the apostrophe
-
-2003-11-23 20:08  chadfowler
-
-	* lib/rubygems/specification.rb: Escape quotes to avoid invalid
-	  gemspecs in the #{Gem.dir}/specifications directory
-
-2003-11-23 19:21  chadfowler
-
-	* bin/gem: Less ugly error message on file IO problems.
-
-2003-11-22 22:34  chadfowler
-
-	* bin/gem: Very simple support for validating a gem.  Will probably
-	  move this into the libs eventually.
-
-2003-11-22 20:53  chadfowler
-
-	* example/test.gemspec, lib/rubygems/builder.rb: Generate MD5
-	  checksum for gem and store it in the file.  Will be used to
-	  validate gem file before installation.
-
-2003-11-22 13:58  chadfowler
-
-	* install.rb, lib/rubygems/remote_installer.rb,
-	  packages/sources/sources.gemspec,
-	  packages/sources/lib/sources.rb: remote-install sources are now
-	  installed as a ruby gem at the time of rubygems installation.
-	  sources gemspec included in the rubygems distribution.
-
-2003-11-22 12:52  chadfowler
-
-	* bin/gem: Allow gem info by --version
-
-2003-11-22 11:50  chadfowler
-
-	* lib/: rubygems.rb, rubygems/cache.rb: Fixed the bug I introduced
-	  by fixing Rich's bug with gem cache caching. ;)
-
-	  Gem::Cache now has a #refresh! method.
-
-2003-11-22 10:16  chadfowler
-
-	* bin/gem, lib/rubygems.rb, lib/rubygems/installer.rb,
-	  lib/rubygems/remote_installer.rb: - Fixed bug in Gem.cache
-	  (though we may want to revisit it for in-memory caching - Command
-	  line configurable version for uninstall
-
-2003-11-22 00:28  rich
-
-	* lib/rubygems/cache.rb: rdoc'd search method
-
-2003-11-22 00:24  rich
-
-	* bin/gem, lib/rubygems/cache.rb, lib/rubygems/version.rb,
-	  test/test_version_comparison.rb: removed search_by_name because
-	  search does the same thing.  version::requirement was updated to
-	  that if you did not specific a version operation, it assumes an =
-	  sign.  updated tests accordingly
-
-2003-11-21 23:58  rich
-
-	* lib/rubygems/: cache.rb, installer.rb: allow version to be
-	  specified in uninstall (if called programatically)
-
-2003-11-21 23:52  rich
-
-	* lib/: rubygems.rb, rubygems/cache.rb, rubygems/installer.rb,
-	  rubygems/specification.rb: > moved all searching into cache..and
-	  now search by name/version and return an
-	  ordered list (.last == highest version).
-	  > modified uninstaller to allow selecting a specific version to
-	  uninstall if
-	  multiple versions are installed.
-	  > implemented comparison function on specification.
-	  > changed require_gem to use new search of cache function
-
-2003-11-21 21:06  chadfowler
-
-	* bin/gem, lib/rubygems/remote_installer.rb: Added ability to
-	  specify optional version requirement for remote installations
-
-2003-11-21 20:25  chadfowler
-
-	* test/test_remote_installer.rb: Removed carriage returns
-
-2003-11-21 19:04  chadfowler
-
-	* bin/gem_server: Converted from getopts to optparse.
-
-2003-11-21 18:31  rich
-
-	* lib/rubygems.rb: changed the order in which operations are
-	  performed in require_gem.  it now requires dependent gems prior
-	  to adding the require_paths to a gem.  otherwise we could have
-	  had a LoadError on a dependent gem but the paths were already
-	  added...potential problem
-
-2003-11-21 18:21  rich
-
-	* lib/rubygems/installer.rb: updated to ensure
-	  (specifications/cache) directories exist for a provided path
-
-2003-11-21 18:01  rich
-
-	* lib/rubygems/specification.rb: updated rdoc
-
-2003-11-21 17:59  rich
-
-	* bin/gem, lib/rubygems/builder.rb, lib/rubygems/installer.rb,
-	  lib/rubygems/specification.rb: fixed various bugs with the
-	  $GEM_PATH stuff, specifically on uninstall.  Also, changed to
-	  allow specifying a directory on install (--dir) and force install
-	  (--force).  Changed the builder generated ruby header to use
-	  optparse.
-
-2003-11-21 07:03  chadfowler
-
-	* lib/: rubygems.rb, rubygems/cache.rb,
-	  rubygems/remote_installer.rb: Remote installation of dependencies
-	  now works.  It downloads all dependent gems or errors out.
-
-	  Fixed bug in require_gem.  Wrong call to cache.
-
-2003-11-21 00:59  rich
-
-	* bin/gem, example/test.gemspec, lib/rubygems.rb,
-	  lib/rubygems/cache.rb, lib/rubygems/installer.rb,
-	  lib/rubygems/specification.rb: added capability to support
-	  multiple paths $GEM_PATH in Ruby and RUBY_GEMS in the ARGV.  Lots
-	  of changes were needed to support this.  also added the --force
-	  and --dir options to gem installtion
-
-2003-11-20 22:50  chadfowler
-
-	* bin/gem: Switched to optparse.  Not a whole lot gained, but it
-	  seems to be the way Ruby is going.  It's nice not to have to do
-	  the "when" stuff, I guess.
-
-2003-11-19 23:41  chadfowler
-
-	* lib/rubygems/: installer.rb, remote_installer.rb: Added
-	  chadfowler.com to the hardcoded remote install list.
-
-	  Fixed a dangling YAML.load that broke uninstall.
-
-2003-11-19 22:56  rich
-
-	* lib/rubygems.rb: fixed bug in loading rubygems
-
-2003-11-19 22:51  chadfowler
-
-	* bin/: gem_server, gem_server.cgi: require 'yaml' :)
-
-2003-11-19 22:44  rich
-
-	* lib/: rubygems.rb, rubygems/cache.rb, rubygems/specification.rb:
-	  changed the format of stuff stored in the spec directory to ruby
-	  instead of YAML.  This allows us to not have to load yaml in
-	  'require_gem'.  switched the specification list to a Cache
-	  object.
-
-2003-11-19 21:56  rich
-
-	* lib/rubygems/installer.rb: write the spec file in ruby and not in
-	  yaml format (in the spec dir)
-
-2003-11-19 20:32  rich
-
-	* lib/rubygems/specification.rb: added to_ruby method to generate a
-	  ruby string that can be eval'ed in to build a Gem Specification
-
-2003-11-17 21:37  jimweirich
-
-	* bin/: gem_server, gem_server.cgi: removed carriage returns
-
-2003-11-17 21:19  chadfowler
-
-	* install.rb: Accidentally left some junk in the file.
-
-2003-11-17 19:50  dblack
-
-	* test/test_version_comparison.rb: * Test cases for Version.rb
-
-2003-11-17 19:50  dblack
-
-	* lib/rubygems/version.rb: * Split off tests into
-	  rubygems/tests/test_version_comparison.rb
-
-2003-11-17 12:37  chadfowler
-
-	* install.rb: Create File.join(Config::CONFIG['libdir'], "ruby",
-	  "gems") + "specifications" and + "cache" during installation.
-
-	  Need to remove this from rubygems.rb and replace with
-	  ensure_directory call.
-
-2003-11-17 12:29  rich
-
-	* lib/rubygems/version.rb: rdoc added
-
-2003-11-17 11:31  rich
-
-	* lib/rubygems/specification.rb: rdoc added
-
-2003-11-17 10:38  rich
-
-	* lib/rubygems/: cache.rb, installer.rb: made rdoc comments and
-	  renamed some variables
-
-2003-11-17 08:48  dblack
-
-	* lib/rubygems/version.rb: * Added stricter checking of incoming
-	  Requirement string
-
-	  * Added unit tests at end of file
-
-2003-11-17 07:32  chadfowler
-
-	* bin/: gem_server, gem_server.cgi: Refactored gem_server program
-	  and added an equivalent CGI version.
-
-2003-11-17 00:14  rich
-
-	* lib/: rubygems.rb, rubygems/builder.rb, rubygems/cache.rb: added
-	  rdoc documentation
-
-2003-11-16 17:15  chadfowler
-
-	* bin/: gem.cmd, gem_server.cmd: Added some batch files for Windows
-
-2003-11-16 17:08  rich
-
-	* install.rb, bin/gem, bin/gem_server, example/test.gemspec,
-	  example/lib/test.rb, example/lib/test/wow.rb, lib/rubygems.rb,
-	  lib/rubygems/builder.rb, lib/rubygems/cache.rb,
-	  lib/rubygems/installer.rb, lib/rubygems/remote_installer.rb,
-	  lib/rubygems/specification.rb, lib/rubygems/version.rb,
-	  test/test_remote_installer.rb: Initial import developed at
-	  RubyConf 2003 by:
-
-	  Rich Kilmer Chad Fowler David Black Paul Brannon Jim Weirich
-
-2003-11-16 17:08  rich
-
-	* install.rb, bin/gem, bin/gem_server, example/test.gemspec,
-	  example/lib/test.rb, example/lib/test/wow.rb, lib/rubygems.rb,
-	  lib/rubygems/builder.rb, lib/rubygems/cache.rb,
-	  lib/rubygems/installer.rb, lib/rubygems/remote_installer.rb,
-	  lib/rubygems/specification.rb, lib/rubygems/version.rb,
-	  test/test_remote_installer.rb: Initial revision
-
-Local variables:
-indent-tabs-mode: t
-tab-width: 8
-end:
diff --git a/doc/rubygems/History.txt b/doc/rubygems/History.txt
deleted file mode 100644
index 4a80b1bfb4..0000000000
--- a/doc/rubygems/History.txt
+++ /dev/null
@@ -1,852 +0,0 @@
-# -*- coding: utf-8 -*-
-
-=== 1.3.6 / 2010-02-17
-
-NOTE:
-
-http://rubygems.org is now the default source for downloading gems.
-
-You may have sources set via ~/.gemrc, so you should replace
-http://gems.rubyforge.org with http://rubygems.org
-
-http://gems.rubyforge.org will continue to work for the forseeable future.
-
-New features:
-
-* `gem` commands
-  * Added `gem push` and `gem owner` for interacting with modern/Gemcutter
-    sources
-  * `gem dep` now supports --prerelease.
-  * `gem fetch` now supports --prerelease.
-  * `gem server` now supports --bind.  Patch #27357 by Bruno Michel.
-  * `gem rdoc` no longer overwrites built documentation.  Use --overwrite
-    force rebuilding.  Patch #25982 by Akinori MUSHA.
-* Captial letters are now allowed in prerelease versions.
-
-Bug fixes:
-
-* Development deps are no longer added to rubygems-update gem so older
-  versions can update sucessfully.
-* Installer bugs:
-  * Prerelease gems can now depend on non-prerelease gems.
-  * Development dependencies are ignored unless explicitly needed.  Bug #27608
-    by Roger Pack.
-* `gem` commands
-  * `gem which` now fails if no paths were found.  Adapted patch #27681 by
-    Caio Chassot.
-  * `gem server` no longer has invalid markup.  Bug #27045 by Eric Young.
-  * `gem list` and friends show both prerelease and regular gems when
-    --prerelease --all is given
-* Gem::Format no longer crashes on empty files.  Bug #27292 by Ian Ragsdale.
-* Gem::GemPathSearcher handles nil require_paths. Patch #27334 by Roger Pack.
-* Gem::RemoteFetcher no longer copies the file if it is where we want it.
-  Patch #27409 by Jakub Šťastný.
-
-Deprecation Notices:
-
-* lib/rubygems/timer.rb has been removed.
-* Gem::Dependency#version_requirements is deprecated and will be removed on or
-  after August 2010.
-* Bulk index update is no longer supported.
-* Gem::manage_gems was removed in 1.3.3.
-* Time::today was removed in 1.3.3.
-
-=== 1.3.5 / 2009-07-21
-
-Bug fixes:
-
-* Fix use of prerelease gems.
-* Gem.bin_path no longer escapes path with spaces. Bug #25935 and #26458.
-
-Deprecation Notices:
-
-* Bulk index update is no longer supported (the code currently remains, but not
-  the tests)
-* Gem::manage_gems was removed in 1.3.3.
-* Time::today was removed in 1.3.3.
-
-=== 1.3.4 / 2009-05-03
-
-Bug Fixes:
-
-* Fixed various warnings
-* Gem::ruby_version works correctly for 1.8 branch and trunk
-* Prerelease gems now show up in `gem list` and can be used
-* Fixed option name for `gem setup --format-executable`
-* RubyGems now matches Ruby > 1.9.1 gem paths
-* Gem::RemoteFetcher#download now works for explicit Windows paths across
-  drives.  Bug #25882 by Lars Christensen
-* Fix typo in Gem::Requirement#parse.  Bug #26000 by Mike Gunderloy.
-
-Deprecation Notices:
-
-* Bulk index update is no longer supported (the code currently remains, but not
-  the tests)
-* Gem::manage_gems was removed in 1.3.3.
-* Time::today was removed in 1.3.3.
-
-=== 1.3.3 / 2009-05-04
-
-New Features:
-
-* `gem server` allows port names (from /etc/services) with --port.
-* `gem server` now has search that jumps to RDoc.  Patch #22959 by Vladimir
-  Dobriakov.
-* `gem spec` can retrieve single fields from a spec (like `gem spec rake
-  authors`).
-* Gem::Specification#has_rdoc= is deprecated and ignored (defaults to true)
-* RDoc is now generated regardless of Gem::Specification#has_rdoc?
-
-Bug Fixes:
-
-* `gem clean` now cleans up --user-install gems.  Bug #25516 by Brett
-  Eisenberg.
-* Gem.bin_path now escapes paths with spaces.
-* Rake extension builder uses explicit correctly loads rubygems when invoking
-  rake.
-* Prerelease versions now match "~>" correctly.  Patch #25759 by Yossef
-  Mendelssohn.
-* Check bindir for executables, not root when validating.  Bug reported by
-  David Chelimsky.
-* Remove Time.today, no way to override it before RubyGems loads.  Bug #25564
-  by Emanuele Vicentini
-* Raise Gem::Exception for #installation_path when not installed.  Bug #25741
-  by Daniel Berger.
-* Don't raise in Gem::Specification#validate when homepage is nil.  Bug #25677
-  by Mike Burrows.
-* Uninstall executables from the correct directory.  Bug #25555 by Brett
-  Eisenberg.
-* Raise Gem::LoadError if Kernel#gem fails due to previously-loaded gem.  Bug
-  reported by Alf Mikula.
-
-Deprecation Notices:
-
-* Gem::manage_gems has been removed.
-* Time::today has been removed early.  There was no way to make it warn and be
-  easy to override with user code.
-
-=== 1.3.2 / 2009-04-15
-
-Select New Features:
-
-* RubyGems now loads plugins from rubygems_plugin.rb in installed gems.
-  This can be used to add commands (See Gem::CommandManager) or add
-  install/uninstall hooks (See Gem::Installer and Gem::Uninstaller).
-* Gem::Version now understands prerelease versions using letters. (eg.
-  '1.2.1.b')  Thanks to Josh Susser, Alex Vollmer and Phil Hagelberg.
-* RubyGems now includes a Rake task for creating gems which replaces rake's
-  Rake::GemPackageTask.  See Gem::PackageTask.
-* Gem::find_files now returns paths in $LOAD_PATH.
-* Added Gem::promote_load_path for use with Gem::find_files
-* Added Gem::bin_path to make finding executables easier.  Patch #24114 by
-  James Tucker.
-* Various improvements to build arguments for installing gems.
-* `gem contents` added --all and --no-prefix.
-* Gem::Specification
-  * #validate strips directories and errors on not-files.
-  * #description no longer removes newlines.
-  * #name must be a String.
-  * FIXME and TODO are no longer allowed in various fields.
-  * Added support for a license attribute.  Feature #11041 (partial).
-  * Removed Gem::Specification::list, too much process growth.  Bug #23668 by
-    Steve Purcell.
-* `gem generate_index`
-  * Can now generate an RSS feed.
-  * Modern indicies can now be updated incrementally.
-  * Legacy indicies can be updated separately from modern.
-
-Select Bugs Fixed:
-
-* Better gem activation error message. Patch #23082.
-* Kernel methods are now private.  Patch #20801 by James M. Lawrence.
-* Fixed various usability issues with `gem check`.
-* `gem update` now rescues InstallError and continues.  Bug #19268 by Gabriel
-  Wilkins.
-* Allow 'https', 'file' as a valid schemes for --source.  Patch #22485.
-* `gem install`
-  * Now removes existing path before installing.  Bug #22837.
-  * Uses Gem::bin_path in executable stubs to work around Kernel#load bug in
-    1.9.
-  * Correctly handle build args (after --) via the API.  Bug #23210.
-* --user-install
-  * `gem install --no-user-install` now works.  Patch #23573 by Alf Mikula.
-  * `gem uninstall` can now uninstall from ~/.gem.  Bug #23760 by Roger Pack.
-* setup.rb
-  * Clarify RubyGems RDoc installation location.  Bug #22656 by Gian Marco
-    Gherardi.
-  * Allow setup to run from read-only location.  Patch #21862 by Luis Herrera.
-  * Fixed overwriting ruby executable when BASERUBY was not set.  Bug #24958
-    by Michael Soulier.
-  * Ensure we're in a RubyGems dir when installing.
-  * Deal with extraneous quotation mark when autogenerating .bat file on MS
-    Windows.  Bug #22712.
-
-Deprecation Notices:
-
-* Gem::manage_gems has been removed.
-* Time::today will be removed in RubyGems 1.4.
-
-Special thanks to Chad Wooley for backwards compatibility testing and Luis
-Lavena and Daniel Berger for continuing windows support.
-
-=== 1.3.1 / 2008-10-28
-
-Bugs fixed:
-
-* Disregard ownership of ~ under Windows while creating ~/.gem.  Fixes
-  issues related to no uid support under Windows.
-* Fix requires for Gem::inflate, Gem::deflate, etc.
-* Make Gem.dir respect :gemhome value from config.  (Note: this feature may be
-  removed since it is hard to implement on 1.9.)
-* Kernel methods are now private.  Patch #20801 by James M. Lawrence.
-* Gem::location_of_caller now behaves on Windows.  Patch by Daniel Berger.
-* Silence PATH warning.
-
-Deprecation Notices:
-
-* Gem::manage_gems will be removed on or after March 2009.
-
-=== 1.3.0 / 2008-09-25
-
-New features:
-
-* RubyGems doesn't print LOCAL/REMOTE titles for `gem query` and friends if
-  stdout is not a TTY, except with --both.
-* Added Gem.find_files, allows a gem to discover features provided by other
-  gems.
-* Added pre/post (un)install hooks for packagers of RubyGems.  (Not for gems
-  themselves).
-* RubyGems now installs gems into ~/.gem if GEM_HOME is not writable.  Use
-  --no-user-install command-line switch to disable this behavior.
-* Fetching specs for update now uses If-Modified-Since requests.
-* RubyGems now updates the ri cache when the rdoc gem is installed and
-  documentation is generated.
-
-Deprecation Notices:
-
-* Gem::manage_gems now warns when called.  It will be removed on or after March
-  2009.
-
-Bugs Fixed:
-
-* RubyGems 1.3.0+ now updates when no previous rubygems-update is installed.
-  Bug #20775 by Hemant Kumar.
-* RubyGems now uses the regexp we already have for `gem list --installed`.  Bug
-  #20876 by Nick Hoffman.
-* Platform is now forced to Gem::Platform::RUBY when nil or blank in the
-  indexer.  Fixes various uninstallable gems.
-* Handle EINVAL on seek.  Based on patch in bug #20791 by Neil Wilson.
-* Fix HTTPS support.  Patch #21072 by Alex Arnell.
-* RubyGems now loads all cache files even if latest has been loaded.  Bug
-  #20776 by Uwe Kubosch.
-* RubyGems checks for support of development dependencies for #to_ruby.  Bug
-  #20778 by Evan Weaver.
-* Now specifications from the future can be loaded.
-* Binary script uninstallation fixed.  Bug #21234 by Neil Wilson.
-* Uninstallation with -i fixed.  Bug #20812 by John Clayton.
-* Gem::Uninstaller#remove_all now calls Gem::Uninstaller#uninstall_gem so hooks
-  get called.  Bug #21242 by Neil Wilson.
-* Gem.ruby now properly escaped on windows.  Fixes problem with extension
-  compilation.
-* `gem lock --strict` works again.  Patch #21814 by Sven Engelhardt.
-* Platform detection for Solaris was improved.  Patch #21911 by Bob Remeika.
-
-Other Changes Include:
-
-* `gem help install` now describes _version_ argument to executable stubs
-* `gem help environment` describes environment variables and ~/.gemrc and
-  /etc/gemrc
-* On-disk gemspecs are now read in UTF-8 and written with a UTF-8 magic comment
-* Rakefile
-  * If the SETUP_OPTIONS environment variable is set, pass its contents as
-    arguments to setup.rb
-* lib/rubygems/platform.rb
-  * Remove deprecated constant warnings and really deprecate them.  (WIN32,
-    etc).
-* lib/rubygems/remote_fetcher.rb
-  * Now uses ~/.gem/cache if the cache dir in GEM_HOME is not writable.
-* lib/rubygems/source_index.rb
-  * Deprecate options to 'search' other than Gem::Dependency instances and
-    issue warning until November 2008.
-* setup.rb
-  * --destdir folder structure now built using Pathname, so it works for
-    Windows platforms.
-* test/*
-  * Fixes to run tests when under test/rubygems/.  Patch by Yusuke ENDOH
-    [ruby-core:17353].
-* test/test_ext_configure_builder.rb
-  * Locale-free patch by Yusuke Endoh [ruby-core:17444].
-
-=== 1.2.0 / 2008-06-21
-
-New features:
-
-* RubyGems no longer performs bulk updates and instead only fetches the gemspec
-  files it needs.  Alternate sources will need to upgrade to RubyGems 1.2 to
-  allow RubyGems to take advantage of the new metadata updater.  If a pre 1.2
-  remote source is in the sources list, RubyGems will revert to the bulk update
-  code for compatibility.
-* RubyGems now has runtime and development dependency types.  Use
-  #add_development_dependency and #add_runtime_dependency.  All typeless
-  dependencies are considered to be runtime dependencies.
-* RubyGems will now require rubygems/defaults/operating_system.rb and
-  rubygems/defaults/#{RBX_ENGINE}.rb if they exist.  This allows packagers and
-  ruby implementers to add custom behavior to RubyGems via these files.  (If
-  the RubyGems API is insufficient, please suggest improvements via the
-  RubyGems list.)
-* /etc/gemrc (and windows equivalent) for global settings
-* setup.rb now handles --vendor and --destdir for packagers
-* `gem stale` command that lists gems by last access time
-
-Bugs Fixed:
-
-* File modes from gems are now honored, patch #19737
-* Marshal Gem::Specification objects from the future can now be loaded.
-* A trailing / is now added to remote sources when missing, bug #20134
-* Gems with legacy platforms will now be correctly uninstalled, patch #19877
-* `gem install --no-wrappers` followed by `gem install --wrappers` no longer
-  overwrites executables
-* `gem pristine` now forces reinstallation of gems, bug #20387
-* RubyGems gracefully handles ^C while loading .gemspec files from disk, bug
-  #20523
-* Paths are expanded in more places, bug #19317, bug #19896
-* Gem::DependencyInstaller resets installed gems every install, bug #19444
-* Gem.default_path is now honored if GEM_PATH is not set, patch #19502
-
-Other Changes Include:
-
-* setup.rb
-  * stub files created by RubyGems 0.7.x and older are no longer removed.  When
-    upgrading from these ancient versions, upgrade to 1.1.x first to clean up
-    stubs.
-  * RDoc is no longer required until necessary, patch #20414
-* `gem server`
-  * Now completely matches the output of `gem generate_index` and
-    has correct content types
-  * Refreshes from source directories for every hit.  The server will no longer
-    need to be restarted after installing gems.
-* `gem query --details` and friends now display author, homepage, rubyforge url
-  and installed location
-* `gem install` without -i no longer reinstalls dependencies if they are in
-  GEM_PATH but not in GEM_HOME
-* Gem::RemoteFetcher now performs persistent connections for HEAD requests,
-  bug #7973
-
-=== 1.1.1 / 2008-04-11
-
-Bugs Fixed:
-
-* Gem.prefix now returns non-nil only when RubyGems was installed outside
-  sitelibdir or libdir.
-* The `gem server` gem list now correctly links to gem details.
-* `gem update --system` now passes --no-format-executable to setup.rb.
-* Gem::SourceIndex#refresh! now works with multiple gem repositories.
-* Downloaded gems now go into --install-dir's cache directory.
-* Various fixes to downloading gem metadata.
-* `gem install --force` now ignores network errors too.
-* `gem pristine` now rebuilds extensions.
-* `gem update --system` now works on virgin Apple ruby.
-* Gem::RemoteFetcher handles Errno::ECONNABORTED.
-* Printing of release notes fixed.
-
-=== 1.1.0 / 2008-03-29
-
-New features:
-
-* RubyGems now uses persistent connections on index updates.  Index updates are
-  much faster now.
-* RubyGems only updates from a latest index by default, cutting candidate gems
-  for updates to roughly 1/4 (at present).  Index updates are even faster
-  still.
-  * `gem list -r` may only show the latest version of a gem, add --all to see
-    all gems.
-* `gem spec` now extracts specifications from .gem files.
-* `gem query --installed` to aid automation of checking for gems.
-
-Bugs Fixed:
-
-* RubyGems works with both Config and RbConfig now.
-* Executables are now cleaned upon uninstall.
-* You can now uninstall from a particular directory.
-* Updating from non-default sources fixed.
-* Executable stubs now use ruby install name in shebang.
-* `gem unpack` checks every directory in Gem.path now.
-* `gem install` now exits with non-zero exit code when appropriate.
-* `gem update` only updates gems that need updates.
-* `gem update` doesn't force remote-only updates.
-* `gem update` handles dependencies properly when updating.
-* Gems are now loaded in Gem.path order.
-* Gem stub scripts on windows now work outside Gem.bindir.
-* `gem sources -r` now works without network access.
-
-Other Changes Include:
-
-* RubyGems now requires Ruby > 1.8.3.
-* Release notes are now printed upon installation.
-* `gem env path` now prints a usable path.
-* `gem install` reverts to local-only installation upon network error.
-* Tar handling code refactoring and cleanup.
-* Gem::DependencyInstaller's API has changed.
-
-For a full list of changes to RubyGems, see the ChangeLog file.
-
-=== 1.0.1 / 2007-12-20
-
-Bugs Fixed:
-
-* Installation on Ruby 1.8.3 through 1.8.5 fixed
-* `gem build` on 1.8.3 fixed
-
-Other Changes Include:
-
-* Since RubyGems 0.9.5, RubyGems is no longer supported on Ruby 1.8.2 or older,
-  this is official in RubyGems 1.0.1.
-
-=== 1.0.0 / 2007-12-20
-
-Major New Features Include:
-
-* RubyGems warns about various problems with gemspecs during gem building
-* More-consistent versioning for the RubyGems software
-
-Other Changes Include:
-
-* Fixed various bugs and problems with installing gems on Windows
-* Fixed using `gem server` for installing gems
-* Various operations are even more verbose with --verbose
-* Built gems are now backwards compatible with 0.9.4
-* Improved detection of RUBYOPT loading rubygems
-* `ruby setup.rb` now has a --help option
-* Gem::Specification#bindir is now respected on installation
-* Executable stubs can now be installed to match ruby's name, so if ruby is
-  installed as 'ruby18', foo_exec will be installed as 'foo_exec18'
-* `gem unpack` can now unpack into a specific directory with --target
-* OpenSSL is no longer required by default
-
-Deprecations and Deletions:
-
-* Kernel#require_gem has been removed
-* Executables without a shebang will not be wrapped in a future version, this
-  may cause such executables to fail to operate on installation
-* Gem::Platform constants other than RUBY and CURRENT have been removed
-* Gem::RemoteInstaller was removed
-* Gem::Specification#test_suite_file and #test_suite_file= are deprecated in
-  favor of #test_file and #test_file=
-* Gem::Specification#autorequire= has been deprecated
-* Time::today will be removed in a future version
-
-=== 0.9.5 / 2007-11-19
-
-Major New Features Include:
-
-* Platform support
-* Automatic installation of platform gems
-* New bandwidth and memory friendlier index file format
-* "Offline" mode (--no-update-sources)
-* Bulk update threshold can be specified (-B, --bulk-threshold)
-* New `gem fetch` command
-* `gem` now has "really verbose" output when you specify -v
-* Improved stubs and `gem.bat` on mswin, including better compatiblity
-  with the One-Click Installer.
-
-Other Changes Include:
-
-* Time::today is deprecated and will be removed at a future date
-* Gem::manage_gems is deprecated and will be removed at a future date
-* `gem install --include-dependencies` (-y) is now deprecated since it is the
-  default, use --ignore-dependencies to turn off automatic dependency
-  installation
-* Multi-version diamond dependencies only are installed once
-* Processing a YAML bulk index update takes less memory
-* `gem install -i` makes sure all depenencies are installed
-* `gem update --system` reinstalls into the prefix it was originally installed
-  in
-* `gem update --system` respects --no-rdoc and --no-ri flags
-* HTTP basic authentication support for proxies
-* Gem::Specification#platforms should no longer be a String, use
-  Gem::Platform::CURRENT when building binary gems instead
-* `gem env` has more diagnostic information
-* require 'rubygems' loads less code
-* sources.gem is gone, RubyGems now uses built-in defaults
-* `gem install --source` will no longer add --source by default, use `gem
-  sources --add` to make it a permanent extra source
-* `gem query` (list) no longer prints details by default
-* Exact gem names are matched in various places
-* mkrf extensions are now supported
-* A gem can depend on a specific RubyGems version
-* `gem_server` is now `gem server`
-* `gemlock` is now `gem lock`
-* `gem_mirror` is now `gem mirror`
-* `gemwhich` is now `gem which`
-* `gemri` is no longer included with RubyGems
-* `index_gem_repository.rb` is now `gem generate_index`
-* `gem` performs more validation of parameters
-* Custom rdoc styles are now supported
-* Gem indexer no longer removes quick index during index creation
-* Kernel#require only rescues a LoadError for the file being required now
-* `gem dependencies` can now display some information for remote gems
-* Updating RubyGems now works with RUBYOPT=-rubygems
-
-Special thanks to:
-
-* Daniel Berger
-* Luis Lavena
-* Tom Copeland
-* Wilson Bilkovich
-
-=== 0.9.4 / 2007-05-23
-
-If you are experiencing problems with the source index (e.g. strange
-"No Method" errors), or problems with zlib (e.g. "Buffer Error"
-messsage), we recommend upgrading to RubyGems 0.9.4.
-
-Bug Fixes Include:
-
-* Several people have been experiencing problems with no method errors
-  on the source index cache.  The source index cache is now a bit more
-  self healing.  Furthermore, if the source index cache is
-  irreparable, then it is automatically dropped and reloaded.
-* The source cache files may now be dropped with the "gem sources
-  --clear-all" command.  (This command may require root is the system
-  source cache is in a root protected area).
-* Several sub-commands were accidently dropped from the "gem" command.
-  These commands have been restored.
-
-=== 0.9.3 / 2007-05-10
-
-Bug Fixes Include:
-
-The ZLib library on Windows will occasionally complains about a buffer error
-when unpacking gems.  The Gems software has a workaround for that problem, but
-the workaround was only enabled for versions of ZLib 1.2.1 or earlier.  We
-have received several reports of the error occuring with ZLib 1.2.3, so we
-have permanently enabled the work around on all versions.
-
-=== 0.9.2 / 2007-02-05
-
-Bug Fixes Include:
-
-* The "unpack" command now works properly.
-* User name and password are now passed properly to the authenticating
-  proxy when downloading gems.
-
-=== 0.9.1 / 2007-01-16
-
-See ChangeLog
-
-=== 0.9.0 / 2006-06-28
-
-Finally, the much anticipated RubyGems version 0.9.0 is now available.
-This release includes a number of new features and bug fixes.  The
-number one change is that we can now download the gem index
-incrementally.  This will greatly speed up the gem command when only a
-few gems are out of date.
-
-Major Enhancments include:
-
-* The gem index is now downloaded incrementally, only updating entries
-  that are out of date.  If more than 50 entries are out of date, we
-  revert back to a bulk download.
-* Several patches related to allowing RubyGems to work with
-  authenticating proxies (from Danie Roux and Anatol Pomozov).  Just
-  put the user and password in the proxy URL (e.g. -p
-  http://user:password@proxy.address.com:8080) or use the
-  HTTP_PROXY_USER and HTTP_PROXY_PASS environment variables.
-* The gem unpack command can now accept a file path rather than just a
-  install gem name.
-* Both RI and RDOC documents are now generated by default.
-* A gemri command is included to read gem RI docs (only needed for
-  Ruby 1.8.4 or earlier).
-
-Minor enhancements include:
-
-* Verison 0.0.0 is now a valid gem version.
-* Better detection of missing SSL functionality.
-* SSL is not required if the security policy does not require
-  signature checking.
-* Rake built extensions are now supported (Tilman Sauerbeck).
-* Several autorequire bug fixes.
-* --traceback is now an alias for --backtrace (I can never remember
-  which one it is).
-* SAFE=1 compatibility fixes.
-* .rbw is now a supported suffix for RubyGem's custom require.
-* Several Ruby 1.9 compatibility fixes (Eric Hodel).
-
-Bug Fixes:
-
-* Added dashes to gemspecs generated in Ruby 1.8.3.  This solves some
-  cross-Ruby version compatibility issues.
-* Fixed bug where the wrong executables could be uninstalled (Eric
-  Hodel).
-* Fixed bug where gem unpack occasionally unpacked the wrong gem.
-* Fixed bug where a fatal error occured when permissions on .gemrc
-  were too restrictive (reported by Luca Pireddu).
-* Fixed prefix handling for native expressions (patch by Aaron Patterson).
-* Fixed several Upgrade => Update typos.
-
-=== 0.8.11 / 2005-07-13
-
-* -y is a synonym for --include-dependencies.
-* Better handling of errors in the top level rescue clause.
-* Package list command (e.g. gem inspect GEM).
-* .gemrc now allows cvsrc-like options to set defaults per subcommand.
-* The autorequire gem spec field will now accept a list.
-* Substituted Time for Date in specs, increasing performance
-  dramatically.
-* Fixed reported bug of gem directories ending in "-" (reported by
-  Erik Hatcher).
-* Fixed but in installer that caused dependency installation to not
-  work.
-* Added Paul Duncan's gem signing patch.
-* Added Mark Hubbart's Framework patch (for better integration with OS
-  X).
-* Added David Glasser's install-from-mirror patch.
-* Additional internal structural cleanup and test reorganization.
-
-=== 0.8.10 / 2005-03-27
-
-* In multi-user environments, it is common to supply mulitple versions of gems
-  (for example Rails), allowing individual users to select the version of the
-  gem they desire.  This allows a user to be insulated from updates to that
-  gem.  RubyGems 0.8.10 fixes a problem where gems could occasionally become
-  confused about the current versions of libraries selected by the user.
-* The other annoying bug is that if there are any existing rubygems-update gems
-  installed, then the "gem update --system" command will download a new
-  update, but install the latest update prior to the download.
-
-=== 0.8.9
-
-Never released
-
-=== 0.8.8 / 2005-03-14
-
-* Moved the master definition of class Requirement back under version.
-  Kept the body of Requirement under Gem.
-
-=== 0.8.7 / 2005-03-14
-
-Even though it has only been a few weeks since that last release,
-there are quite a number of new features in 0.8.7.  A complete list of
-new features will be given below, but here is a summary of the hot
-items.
-
-* The bug that prevented some users from installing rails has been
-  squashed.  A big thanks to Bill Guindon (aGorilla) for helping track
-  that one down.
-
-There are several new commands available on the gem command:
-
-* gem cleanup GEMNAME -- Cleanup (uninstall) all the old versions of
-  gem.  If the gem name is omitted, the entire repository is cleaned.
-* gem dependency GEMNAME -- Show the dependencies for the named gems.
-  This is really helpful when trying to figure out what gem needs what
-  other gem.
-
-There changes to the existing commands as well.
-
-* gem uninstall is much smarter about removing gems from the
-  repository.  Lists of gems are now uninstalled in proper dependency
-  order (ie. if A depends on B, A is uninstalled first).  Also,
-  warnings about broken dependencies occur only when removing the
-  *last* gem that supports a dependency is removed.
-
-Both gem install and gem uninstall support some new command line
-options that can reduce the amount of yes/no queries given the user.
-For install we have:
-
-* --ignore-dependencies -- Only install requests gems, no
-  dependendecies are automatically installed.
-* --include-dependencies -- Automatically install dependencies,
-  without confirmation.
-
-For gem uninstall, the new options are:
-
-* --all -- Uninstall all matching gems without confirmation.
-* --ignore-dependencies -- Uninstall, even if dependencies are broken.
-* --executables -- Remove executables without confirmation
-
-Under general cleanup, gems will not, by default, run RDoc on packages
-that do not have the RDoc flag set.
-
-And finally there is a new library file 'gemconfigure' to aid in
-writing version sensitive applications (without undue dependencies on
-RubyGems); and 'gemwhich', a short script to locate libraries in the
-file system.  You can read more about them here:
-
-* gemconfigure: http://docs.rubygems.org/read/chapter/4#page73
-* gemwhich: http://docs.rubygems.org/read/chapter/17
-
-=== 0.8.6 / 2005-02-27
-
-* Fixed a small bug with shebang construction
-
-=== 0.8.5 / 2005-02-26
-
-Do you know how you used to dread getting the following message while
-installing gems?
-
-  Updating Gem source index for: http://gems.rubyforge.org
-
-It could take up to 30 seconds (on my machine, even worse on others) for
-that crazy source index to update.
-
-This latest release of RubyGems speeds that wait time up considerably.
-The following table gives the following times for installing RedCloth
-with a required source index update on three system we had available to
-us.  No RDoc generation was included in the following times.
-
-  RubyGems    Linux         Mac OSX      Windows
-  0.8.4       33 secs       73 secs      58 secs
-  0.8.5        8 secs       14 secs      21 secs
-
-The new caching code is at least 3x faster than previous versions.  Woo
-Hoo!
-
-=== 0.8.4 / 2005-01-01
-
-* Rubygems 0.8.3's installer was broken unless you already had an older
-  version of RubyGems installed.  That's fixed.
-* Change in the way Gem::Specification internally deals with lazy attributes
-  and defaults, bringing (with some loadpath_manager changes) a fairly
-  significant increase in speed.
-* Support for lower-cased Gem file names (for you, Paul Duncan :)
-* Erik Veenstra's patch for making Gem versions sortable.
-
-=== 0.8.3 / 2004-12-07
-
-No real earth shattering news here, but there were a number of really
-annoying issues involving other libraries that RubyGems depends upon.
-0.8.3 contains some workarounds for these issues.  In particular:
-
-* Added workaround for the null byte in Dir string issue. (see
-  http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/121702).
-  (Thanks to Mauricio Fernández for the quick response on this one).
-* Added workaround for old version of Zlib on windows that caused
-  Ruwiki to fail to install. (see
-  http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/121770)
-* Added workaround for large YAML file issues.  (We dynamically cut
-  down the size of the source index YAML file and seem to have worked
-  around immediate issues.
-
-There has been some minor usability enhancements and changes ...
-
-* A user specific source index cache can be used when the site-wide
-  cache is unwritable (i.e. because you are running as a non-admin).
-  This *greatly* speeds up gem commands run in non-admin mode when the
-  site-wide cache is out of date.
-* The gem command now used an HTTP HEAD command to detect if the
-  server's source index needs to be downloaed.
-* gem check gemname --test will run unit tests on installed gems that
-  have unit tests.
-* Multiple gem names are allowed on the gem install command line.
-  This means you can do:
-  
-    gem install rake rails needle postgres-pr pimki
-  
-  (Ok, you get the idea)
-* Multiple authors my be specified in a Gem spec.
-* Switched to using setup.rb (rather than a custom install script) for
-  the installation of RubyGems itself.  If you have installed RubyGems
-  before, double check the installation instructions and make sure you
-  use setup.rb instead of install.rb.
-* Ryan Davis has provided a patch so you can use an env variable
-  (GEM_SKIP), to tell loadpath_manager not to load gems of those
-  names.  This was useful for him while testing libs that he had in
-  development.
-
-=== 0.8.1 / 2009-09-14
-
-* Quick release to capture some bug fixes.
-
-=== 0.8.0 / 2009-09-12
-
-* Remove need for library stubs.  Set the RUBYOPT environment variable to
-  include "rrubygems", and a normal require will find gem files.  Continue to
-  use 'require_gem gem_name, version' to specify gem versions.
-* Deprecated "test_suite_file" gemspec attribute in favor of "test_files" array.
-* Generates rdoc by default on installs.
-* Adopted tar/gzip file format, thanks to Mauricio Fernandez.
-* "gem rdoc" allows generation of rdoc after gem installation (will add a "gem
-  test"
-* Application stubs can now accept an optional parameter of _VERSION_ that will
-  run an arbitrary version of the application requested.
-* Various bug fixes
-* Various platform-independency improvements
-* "gem spec --all" displays spec info for all installed version of a given gem.
-* Dynamic caching of sources
-* Support for user-definable sources on the command line (thanks Assaph Mehr)
-* More intelligent support for platform-dependent gems.  Use Platform::CURRENT
-  when building a gem to set its platform to the one you're building on.
-  Installation displays a choice of platform-dependent gems, allowing the user
-  to pick.
-* Added "gem unpack" for "unpacking" a gem to the current directory
-
-=== 0.7.0 / 2004-07-09
-
-See ChangeLog
-
-=== 0.6.0 / 2004-06-08
-
-* Collapse output of --search and --list (and gem_server) operations so that
-  each gem is listed only once, with each of its versions listed on the same
-  line.
-* bin/gem: new --upgrade-all option allows one to upgrade every installed gem
-* new #required_ruby_version attribute added to gem specification for
-  specifying a dependency on which version of ruby the gem needs.  Format it
-  accepts is the same as the Gem::Version::Requirement format:
-  
-    spec.required_ruby_version = "> 1.8.0"
-* --install-stub defaults to true, so library stubs are created
-
-=== 0.5.0 / 2004-06-06
-
-* Jim added the ability to specify version constraints to avoid API
-  incompatibilities.  This has been the subject of much debate for the past
-  couple of months, with many ideas and code contributed by Eivind Eklund and
-  Mauricio Fernandez.  The following set of assertions shows how it works:
-  
-    assert_inadequate("1.3", "~> 1.4")
-    assert_adequate(  "1.4", "~> 1.4")
-    assert_adequate(  "1.5", "~> 1.4")
-    assert_inadequate("2.0", "~> 1.4") # This one is key--the new operator
-				       # disallows major version number
-				       # differences.
-* Group gem search output when multiple versions exist for a given gem:
-  
-    activerecord (0.7.8, 0.7.7, 0.7.6, 0.7.5)
-      Implements the ActiveRecord pattern for ORM.
-* Add arbitrary RDoc-able files via gemspec (not just Ruby source files) for
-  people who have, for example, README.rdoc in their distributions.  Add to
-  gemspec via: spec.extra_rdoc_files = ["list", "of", "files"].  Ruby files are
-  automatically included.
-* Some small bug fixes
-
-=== 0.4.0 / 2004-05-31
-
-* Minor bug fixes including Windows compatability issues
-
-=== 0.3.0 / 2004-04-30
-
-* Cleanup of command-line arguments and handling.  Most commands accept a
-  --local or --remote modifier.
-* Creation of Application Gems (packages that include executable programs).
-  See http://rubygems.rubyforge.org/wiki/wiki.pl?DeveloperGuide for information
-  on how to use it.
-* Basic functionality for installing binary gems from source (:extensions
-  property of gem specification holds an array of paths to extconf.rb files to
-  be used for compilation)
-* Install library "stub" allowing a normal 'require' to work (which then does
-  the rubygems require and 'require_gem'
-* --run-tests runs the test suite specified by the "test_suite_file" property
-  of a gem specification
-* HTTP Proxy support works.  Rewrite of HTTP code.
-* Unit and functional tests added (see Rakefile).
-* Prompt before remote-installing dependencies during gem installation.
-* Config file for storing preferences for 'gem' command usage.
-* Generally improved error messages (still more work to do)
-* Rearranged gem directory structure for cleanliness.
-
-=== 0.2.0 / 2004-03-14
-
-* Initial public release
-
diff --git a/doc/rubygems/LICENSE.txt b/doc/rubygems/LICENSE.txt
deleted file mode 100644
index db88c5e118..0000000000
--- a/doc/rubygems/LICENSE.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-RubyGems is copyrighted free software by Chad Fowler, Rich Kilmer, Jim
-Weirich and others.  You can redistribute it and/or modify it under
-either the terms of the GPL (see the GPL.txt file), or the conditions
-below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
diff --git a/doc/rubygems/README b/doc/rubygems/README
deleted file mode 100644
index 68a52593d4..0000000000
--- a/doc/rubygems/README
+++ /dev/null
@@ -1,41 +0,0 @@
-= RubyGems
-
-* http://rubygems.org/
-* http://docs.rubygems.org/
-* http://rubygems.rubyforge.org/
-* http://rubyforge.org/projects/rubygems
-
-== DESCRIPTION
-
-RubyGems is a package management framework for Ruby.
-
-This gem is an update for the RubyGems software. You must have an
-installation of RubyGems before this update can be applied.
-
-See Gem for information on RubyGems (or `ri Gem`)
-
-To upgrade to the latest RubyGems, run:
-
-  $ gem update --system  # you might need to be an administrator or root
-
-NOTE:  RubyGems 1.1 and 1.2 have problems upgrading when there is no
-rubygems-update installed.  You will need to use the following instructions
-if you see "Nothing to update".
-
-If you have an older version of RubyGems installed, then you can still
-do it in two steps:
-
-  $ gem install rubygems-update  # again, might need to be admin/root
-  $ update_rubygems              # ... here too
-
-If you don't have any RubyGems install, there is still the pre-gem approach to
-getting software, doing it manually:
-
-1. Download from: http://rubyforge.org/frs/?group_id=126
-2. Unpack into a directory and cd there
-3. Install with: ruby setup.rb  # you may need admin/root privilege
-
-For more details and other options, see:
-
-  ruby setup.rb --help
-
diff --git a/doc/security.rdoc b/doc/security.rdoc
new file mode 100644
index 0000000000..ae20ed30fa
--- /dev/null
+++ b/doc/security.rdoc
@@ -0,0 +1,139 @@
+= Ruby Security
+
+The Ruby programming language is large and complex and there are many security
+pitfalls often encountered by newcomers and experienced Rubyists alike.
+
+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 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.
+Reported problems will be published after fixes.
+
+== +Marshal.load+
+
+Ruby's +Marshal+ module provides methods for serializing and deserializing Ruby
+object trees to and from a binary data format.
+
+Never use +Marshal.load+ to deserialize untrusted or user supplied data.
+Because +Marshal+ can deserialize to almost any Ruby object and has full
+control over instance variables, it is possible to craft a malicious payload
+that executes code shortly after deserialization.
+
+If you need to deserialize untrusted data, you should use JSON as it is only
+capable of returning 'primitive' types such as strings, arrays, hashes, numbers
+and nil. If you need to deserialize other classes, you should handle this
+manually. Never deserialize to a user specified class.
+
+== YAML
+
+YAML is a popular human readable data serialization format used by many Ruby
+programs for configuration and database persistence of Ruby object trees.
+
+Similar to +Marshal+, it is able to deserialize into arbitrary Ruby classes.
+For example, the following YAML data will create an +ERB+ object when
+deserialized:
+
+  !ruby/object:ERB
+  src: puts `uname`
+
+Because of this, many of the security considerations applying to Marshal are
+also applicable to YAML. Do not use YAML to deserialize untrusted data.
+
+== Symbols
+
+Symbols are often seen as syntax sugar for simple strings, but they play a much
+more crucial role. The MRI Ruby implementation uses Symbols internally for
+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.
+
+== Regular expressions
+
+Ruby's regular expression syntax has some minor differences when compared to
+other languages. In Ruby, the <code>^</code> and <code>$</code> anchors do not
+refer to the beginning and end of the string, rather the beginning and end of a
+*line*.
+
+This means that if you're using a regular expression like
+<code>/^[a-z]+$/</code> to restrict a string to only letters, an attacker can
+bypass this check by passing a string containing a letter, then a newline, then
+any string of their choosing.
+
+If you want to match the beginning and end of the entire string in Ruby, use
+the anchors +\A+ and +\z+.
+
+== +eval+
+
+Never pass untrusted or user controlled input to +eval+.
+
+Unless you are implementing a REPL like +irb+ or +pry+, +eval+ is almost
+certainly not what you want. Do not attempt to filter user input before passing
+it to +eval+ - this approach is fraught with danger and will most likely open
+your application up to a serious remote code execution vulnerability.
+
+== +send+
+
+'Global functions' in Ruby (+puts+, +exit+, etc.) are actually private instance
+methods on +Object+. This means it is possible to invoke these methods with
++send+, even if the call to +send+ has an explicit receiver.
+
+For example, the following code snippet writes "Hello world" to the terminal:
+
+  1.send(:puts, "Hello world")
+
+You should never call +send+ with user supplied input as the first parameter.
+Doing so can introduce a denial of service vulnerability:
+
+  foo.send(params[:bar]) # params[:bar] is "exit!"
+
+If an attacker can control the first two arguments to +send+, remote code
+execution is possible:
+
+  # params is { :a => "eval", :b => "...ruby code to be executed..." }
+  foo.send(params[:a], params[:b])
+
+When dispatching a method call based on user input, carefully verify that the
+method name. If possible, check it against a whitelist of safe method names.
+
+Note that the use of +public_send+ is also dangerous, as +send+ itself is
+public:
+
+  1.public_send("send", "eval", "...ruby code to be executed...")
+
+== DRb
+
+As DRb allows remote clients to invoke arbitrary methods, it is not suitable to
+expose to untrusted clients.
+
+When using DRb, try to avoid exposing it over the network if possible. If this
+isn't possible and you need to expose DRb to the world, you *must* configure an
+appropriate security policy with <code>DRb::ACL</code>.
diff --git a/doc/shell.rd b/doc/shell.rd
deleted file mode 100644
index 8a1f7c5a80..0000000000
--- a/doc/shell.rd
+++ /dev/null
@@ -1,347 +0,0 @@
- -- shell.rb
-				$Release Version: 0.6.0 $
-			   	$Revision$
-			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-
-=begin
-
-= What's shell.rb?
-
-It realizes a wish to do execution of commands with filters and pipes
-like sh/csh by using just native facilities of ruby.
-
-= Main classes
-
-== Shell
-
-Every shell object has its own current working directory, and executes
-each command as if it stands in the directory.
-
---- Shell#cwd
---- Shell#dir
---- Shell#getwd
---- Shell#pwd
-
-      Returns the current directory
-
---- Shell#system_path
-
-      Returns the command search path in an array
-
---- Shell#umask
-
-      Returns the umask
-
-== Filter
-
-Any result of command exection is a Filter.  Filter include
-Enumerable, therefore a Filter object can use all Enumerable
-facilities.
-
-= Main methods
-
-== Command definitions
-
-In order to execute a command on your OS, you need to define it as a
-Shell method.
-
-Alternatively, you can execute any command via Shell#system even if it
-is not defined.
-
---- Shell.def_system_command(command, path = command)
-
-      Defines a command.  Registers <path> as a Shell method
-      <command>.
-
-      ex)
-      Shell.def_system_command "ls"
-        Defines ls.
-
-      Shell.def_system_command "sys_sort", "sort"
-        Defines sys_sort as sort.
-
---- Shell.undef_system_command(command)
-
-      Undefines a commmand
-
---- Shell.alias_command(ali, command, *opts) {...}
-
-      Aliases a command.
-
-      ex)
-        Shell.alias_command "lsC", "ls", "-CBF", "--show-control-chars"
-        Shell.alias_command("lsC", "ls"){|*opts| ["-CBF", "--show-control-chars", *opts]}
-
---- Shell.unalias_command(ali)
-
-      Unaliases a command.
-
---- Shell.install_system_commands(pre = "sys_")
-
-      Defines all commands in the default_system_path as Shell method,
-      all with <pre> prefixed to their names.
-
-== Creation
-
---- Shell.new
-
-      Creates a Shell object which current directory is set to the
-      process current directory.
-
---- Shell.cd(path)
-
-      Creates a Shell object which current directory is set to
-      <path>.
-
-== Process management
-
---- Shell#jobs
-
-      Returns a list of scheduled jobs.
-
---- Shell#kill sig, job
-
-      Sends a signal <sig> to <job>.
-
-== Current directory operations
-
---- Shell#cd(path, &block)
---- Shell#chdir
-
-      Changes the current directory to <path>.  If a block is given,
-      it restores the current directory when the block ends.
-
---- Shell#pushd(path = nil, &block)
---- Shell#pushdir
-
-      Pushes the current directory to the directory stack, changing
-      the current directory to <path>.  If <path> is omitted, it
-      exchanges its current directory and the top of its directory
-      stack.  If a block is given, it restores the current directory
-      when the block ends.
-
---- Shell#popd
---- Shell#popdir
-
-      Pops a directory from the directory stack, and sets the current
-      directory to it.
-
-== File and directory operations
-
---- Shell#foreach(path = nil, &block)
-
-      Same as:
-        File#foreach (when path is a file)
-        Dir#foreach (when path is a directory)
-
---- Shell#open(path, mode)
-
-      Same as:
-        File#open (when path is a file)
-        Dir#open (when path is a directory)
-
---- Shell#unlink(path)
-
-      Same as:
-        Dir#open (when path is a file)
-        Dir#unlink (when path is a directory)
-
---- Shell#test(command, file1, file2)
---- Shell#[command, file1, file2]
-
-      Same as test().
-      ex)
-          sh[?e, "foo"]
-          sh[:e, "foo"]
-          sh["e", "foo"]
-          sh[:exists?, "foo"]
-          sh["exists?", "foo"]
-
---- Shell#mkdir(*path)
-
-      Same as Dir.mkdir (with multiple directories allowed)
-
---- Shell#rmdir(*path)
-
-      Same as Dir.rmdir (with multiple directories allowed)
-
-== Command execution
-
---- System#system(command, *opts)
-
-      Executes <command> with <opts>.
-
-      ex)
-        print sh.system("ls", "-l")
-        sh.system("ls", "-l") | sh.head > STDOUT
-
---- System#rehash
-
-      Does rehash.
-
---- Shell#transact &block
-
-      Executes a block as self.
-      ex)
-        sh.transact{system("ls", "-l") | head > STDOUT}
-
---- Shell#out(dev = STDOUT, &block)
-
-      Does transact, with redirecting the result output to <dev>.
-
-== Internal commands
-
---- Shell#echo(*strings)
---- Shell#cat(*files)
---- Shell#glob(patten)
---- Shell#tee(file)
-
-      Return Filter objects, which are results of their execution.
-
---- Filter#each &block
-
-      Iterates a block for each line of it.
-
---- Filter#<(src)
-
-      Inputs from <src>, which is either a string of a file name or an
-      IO.
-
---- Filter#>(to)
-
-      Outputs to <to>, which is either a string of a file name or an
-      IO.
-
---- Filter#>>(to)
-
-      Appends the ouput to <to>, which is either a string of a file
-      name or an IO.
-
---- Filter#|(filter)
-
-      Processes a pipeline.
-
---- Filter#+(filter)
-
-      (filter1 + filter2) outputs filter1, and then outputs filter2.
-
---- Filter#to_a
---- Filter#to_s
-
-== Built-in commands
-
---- Shell#atime(file)
---- Shell#basename(file, *opt)
---- Shell#chmod(mode, *files)
---- Shell#chown(owner, group, *file)
---- Shell#ctime(file)
---- Shell#delete(*file)
---- Shell#dirname(file)
---- Shell#ftype(file)
---- Shell#join(*file)
---- Shell#link(file_from, file_to)
---- Shell#lstat(file)
---- Shell#mtime(file)
---- Shell#readlink(file)
---- Shell#rename(file_from, file_to)
---- Shell#split(file)
---- Shell#stat(file)
---- Shell#symlink(file_from, file_to)
---- Shell#truncate(file, length)
---- Shell#utime(atime, mtime, *file)
-
-      Equivalent to the class methods of File with the same names.
-
---- Shell#blockdev?(file)
---- Shell#chardev?(file)
---- Shell#directory?(file)
---- Shell#executable?(file)
---- Shell#executable_real?(file)
---- Shell#exist?(file)/Shell#exists?(file)
---- Shell#file?(file)
---- Shell#grpowned?(file)
---- Shell#owned?(file)
---- Shell#pipe?(file)
---- Shell#readable?(file)
---- Shell#readable_real?(file)
---- Shell#setgid?(file)
---- Shell#setuid?(file)
---- Shell#size(file)/Shell#size?(file)
---- Shell#socket?(file)
---- Shell#sticky?(file)
---- Shell#symlink?(file)
---- Shell#writable?(file)
---- Shell#writable_real?(file)
---- Shell#zero?(file)
-
-      Equivalent to the class methods of FileTest with the same names.
-
---- Shell#syscopy(filename_from, filename_to)
---- Shell#copy(filename_from, filename_to)
---- Shell#move(filename_from, filename_to)
---- Shell#compare(filename_from, filename_to)
---- Shell#safe_unlink(*filenames)
---- Shell#makedirs(*filenames)
---- Shell#install(filename_from, filename_to, mode)
-
-      Equivalent to the class methods of FileTools with the same
-      names.
-
-      And also, there are some aliases for convenience:
-
---- Shell#cmp	<- Shell#compare
---- Shell#mv	<- Shell#move
---- Shell#cp	<- Shell#copy
---- Shell#rm_f	<- Shell#safe_unlink
---- Shell#mkpath	<- Shell#makedirs
-
-= Samples
-
-== ex1
-
-  sh = Shell.cd("/tmp")
-  sh.mkdir "shell-test-1" unless sh.exists?("shell-test-1")
-  sh.cd("shell-test-1")
-  for dir in ["dir1", "dir3", "dir5"]
-    if !sh.exists?(dir)
-      sh.mkdir dir
-      sh.cd(dir) do
-	f = sh.open("tmpFile", "w")
-	f.print "TEST\n"
-	f.close
-      end
-      print sh.pwd
-    end
-  end
-
-== ex2
-
-  sh = Shell.cd("/tmp")
-  sh.transact do
-    mkdir "shell-test-1" unless exists?("shell-test-1")
-    cd("shell-test-1")
-    for dir in ["dir1", "dir3", "dir5"]
-      if !exists?(dir)
-	mkdir dir
-	cd(dir) do
-	  f = open("tmpFile", "w")
-	  f.print "TEST\n"
-	  f.close
-	end
-	print pwd
-      end
-    end
-  end
-
-== ex3
-
-  sh.cat("/etc/printcap") | sh.tee("tee1") > "tee2"
-  (sh.cat < "/etc/printcap") | sh.tee("tee11") > "tee12"
-  sh.cat("/etc/printcap") | sh.tee("tee1") >> "tee2"
-  (sh.cat < "/etc/printcap") | sh.tee("tee11") >> "tee12"
-
-== ex4
-
-  print sh.cat("/etc/passwd").head.collect{|l| l =~ /keiju/}
-
-=end
diff --git a/doc/shell.rd.ja b/doc/shell.rd.ja
deleted file mode 100644
index 33e5a9ed9b..0000000000
--- a/doc/shell.rd.ja
+++ /dev/null
@@ -1,335 +0,0 @@
- -- shell.rb
-				$Release Version: 0.6.0 $
-			   	$Revision$
-			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-
-=begin
-
-= ��Ū
-
-ruby���sh/csh�Τ褦�˥��ޥ�ɤμ¹Եڤӥե��륿��󥰤��ڤ˹Ԥ�.
-sh/csh������ʸ��ruby�ε�ǽ���Ѥ��Ƽ¸�����.
-
-= ��ʥ��饹����
-
-== Shell
-
-Shell���֥������Ȥϥ����ȥǥ��쥯�ȥ�����, ���ޥ�ɼ¹ԤϤ��������
-���Хѥ��ˤʤ�ޤ�.
-
---- Shell#cwd
---- Shell#dir
---- Shell#getwd
---- Shell#pwd
-
-      �����ȥǥ��쥯�ȥ���֤���
-
---- Shell#system_path
-
-      ���ޥ�ɥ������ѥ���������֤���
-
---- Shell#umask
-
-      umask���֤���
-
-== Filter
-
-���ޥ�ɤμ¹Է�̤Ϥ��٤�Filter�Ȥ��Ƥ�����ޤ�. Enumerable��include��
-�Ƥ��ޤ�.
-
-= ��ʥ᥽�åɰ���
-
-== ���ޥ�����
-
-OS��Υ��ޥ�ɤ�¹Ԥ���ˤϤޤ�, Shell�Υ᥽�åɤȤ���������ޤ�.
-
-��) ���ޥ�ɤ�������ʤ��Ȥ�ľ�ܼ¹ԤǤ���Shell#system���ޥ�ɤ⤢��ޤ�.
-
---- Shell.def_system_command(command, path = command)
-
-      Shell�Υ᥽�åɤȤ���command����Ͽ���ޤ�. 
-
-      ��)
-      Shell.def_system_command "ls"
-        ls �����
-
-      Shell.def_system_command "sys_sort", "sort"
-        sort���ޥ�ɤ�sys_sort�Ȥ������
-
---- Shell.undef_system_command(command)
-
-      command�������ޤ�.
-
---- Shell.alias_command(ali, command, *opts) {...}
-
-      command��alias�򤷤ޤ�. 
-
-      ��)
-        Shell.alias_command "lsC", "ls", "-CBF", "--show-control-chars"
-        Shell.alias_command("lsC", "ls"){|*opts| ["-CBF", "--show-control-chars", *opts]}
-
---- Shell.unalias_command(ali)
-
-      command��alias�������ޤ�.
-
---- Shell.install_system_commands(pre = "sys_")
-
-      system_path��ˤ������Ƥμ¹Բ�ǽ�ե������Shell���������. �᥽��
-      ��̾�ϸ��Υե�����̾��Ƭ��pre��Ĥ�����ΤȤʤ�.
-
-== ����
-
---- Shell.new
-
-      �ץ������Υ����ȥǥ��쥯�ȥ�򥫥��ȥǥ��쥯�ȥ�Ȥ���Shell��
-      �֥������Ȥ��������ޤ�.
-
---- Shell.cd(path)
-
-      path�򥫥��ȥǥ��쥯�ȥ�Ȥ���Shell���֥������Ȥ��������ޤ�.
-
-== �ץ���������
-
---- Shell#jobs
-
-      �������塼��󥰤���Ƥ���job�ΰ������֤�.
-
---- Shell#kill sig, job
-
-      job�˥����ʥ�sig������
-
-== �����ȥǥ��쥯�ȥ����
-
---- Shell#cd(path, &block)
---- Shell#chdir
-
-      �����ȥǥ��쥯�ȥ��path�ˤ���. ���ƥ졼���Ȥ��ƸƤФ줿�Ȥ��ˤ�
-      �֥��å��¹���Τߥ����ȥǥ��쥯�ȥ���ѹ�����.
-
---- Shell#pushd(path = nil, &block)
---- Shell#pushdir
-
-      �����ȥǥ��쥯�ȥ��ǥ��쥯�ȥꥹ���å��ˤĤ�, �����ȥǥ��쥯
-      �ȥ��path�ˤ���. path����ά���줿�Ȥ��ˤ�, �����ȥǥ��쥯�ȥ��
-      �ǥ��쥯�ȥꥹ���å��Υȥåפ�򴹤���. ���ƥ졼���Ȥ��ƸƤФ줿��
-      ���ˤ�, �֥��å��¹���Τ�pushd����.
-
---- Shell#popd
---- Shell#popdir
-
-      �ǥ��쥯�ȥꥹ���å�����ݥåפ�, ����򥫥��ȥǥ��쥯�ȥ�ˤ���.
-
-== �ե�����/�ǥ��쥯�ȥ����
-
---- Shell#foreach(path = nil, &block)
-
-      path���ե�����ʤ�, File#foreach
-      path���ǥ��쥯�ȥ�ʤ�, Dir#foreach
-
---- Shell#open(path, mode)
-
-      path���ե�����ʤ�, File#open
-      path���ǥ��쥯�ȥ�ʤ�, Dir#open
-
---- Shell#unlink(path)
-
-      path���ե�����ʤ�, File#unlink
-      path���ǥ��쥯�ȥ�ʤ�, Dir#unlink
-
---- Shell#test(command, file1, file2)
---- Shell#[command, file1, file2]
-
-      �ե�����ƥ��ȴؿ�test��Ʊ��. 
-      ��)
-          sh[?e, "foo"]
-          sh[:e, "foo"]
-          sh["e", "foo"]
-          sh[:exists?, "foo"]
-          sh["exists?", "foo"]
-
---- Shell#mkdir(*path)
-
-      Dir.mkdir��Ʊ��(ʣ����)
-
---- Shell#rmdir(*path)
-
-      Dir.rmdir��Ʊ��(ʣ����)
-
-== ���ޥ�ɼ¹�
-
---- System#system(command, *opts)
-
-      command��¹Ԥ���.
-      ��)
-        print sh.system("ls", "-l")
-        sh.system("ls", "-l") | sh.head > STDOUT
-
---- System#rehash
-
-      ��ϥå��夹��
-
---- Shell#transact &block
-
-      �֥��å���Ǥ�shell��self�Ȥ��Ƽ¹Ԥ���.
-      ��)
-        sh.transact{system("ls", "-l") | head > STDOUT}
-
---- Shell#out(dev = STDOUT, &block)
-
-      transact��ƤӽФ����η�̤�dev�˽��Ϥ���.
-
-== �������ޥ��
-
---- Shell#echo(*strings)
---- Shell#cat(*files)
---- Shell#glob(patten)
---- Shell#tee(file)
-
-      �����ϼ¹Ԥ����, ���������ƤȤ���Filter���֥������Ȥ��֤��ޤ�. 
-
---- Filter#each &block
-
-      �ե��륿�ΰ�Ԥ��Ĥ�block���Ϥ�.
-
---- Filter#<(src)
-
-      src��ե��륿�����ϤȤ���. src��, ʸ����ʤ�Хե������, IO�Ǥ���
-      �Ф���򤽤Τޤ����ϤȤ���.
-
---- Filter#>(to)
-
-      src��ե��륿�ν��ϤȤ���. to��, ʸ����ʤ�Хե������, IO�Ǥ���
-      �Ф���򤽤Τޤ޽��ϤȤ���.
-
---- Filter#>>(to)
-
-      src��ե��륿���ɲä���. to��, ʸ����ʤ�Хե������, IO�Ǥ����
-      ����򤽤Τޤ޽��ϤȤ���.
-
---- Filter#|(filter)
-
-      �ѥ��׷��
-
---- Filter#+(filter)
-
-      filter1 + filter2 �� filter1�ν��Ϥθ�, filter2�ν��Ϥ�Ԥ�.
-
---- Filter#to_a
---- Filter#to_s
-
-== �ȹ��ߥ��ޥ��
-
---- Shell#atime(file)
---- Shell#basename(file, *opt)
---- Shell#chmod(mode, *files)
---- Shell#chown(owner, group, *file)
---- Shell#ctime(file)
---- Shell#delete(*file)
---- Shell#dirname(file)
---- Shell#ftype(file)
---- Shell#join(*file)
---- Shell#link(file_from, file_to)
---- Shell#lstat(file)
---- Shell#mtime(file)
---- Shell#readlink(file)
---- Shell#rename(file_from, file_to)
---- Shell#split(file)
---- Shell#stat(file)
---- Shell#symlink(file_from, file_to)
---- Shell#truncate(file, length)
---- Shell#utime(atime, mtime, *file)
-
-      ������File���饹�ˤ���Ʊ̾�Υ��饹�᥽�åɤ�Ʊ���Ǥ�.
-
---- Shell#blockdev?(file)
---- Shell#chardev?(file)
---- Shell#directory?(file)
---- Shell#executable?(file)
---- Shell#executable_real?(file)
---- Shell#exist?(file)/Shell#exists?(file)
---- Shell#file?(file)
---- Shell#grpowned?(file)
---- Shell#owned?(file)
---- Shell#pipe?(file)
---- Shell#readable?(file)
---- Shell#readable_real?(file)
---- Shell#setgid?(file)
---- Shell#setuid?(file)
---- Shell#size(file)/Shell#size?(file)
---- Shell#socket?(file)
---- Shell#sticky?(file)
---- Shell#symlink?(file)
---- Shell#writable?(file)
---- Shell#writable_real?(file)
---- Shell#zero?(file)
-
-      ������FileTest���饹�ˤ���Ʊ̾�Υ��饹�᥽�åɤ�Ʊ���Ǥ�.
-
---- Shell#syscopy(filename_from, filename_to)
---- Shell#copy(filename_from, filename_to)
---- Shell#move(filename_from, filename_to)
---- Shell#compare(filename_from, filename_to)
---- Shell#safe_unlink(*filenames)
---- Shell#makedirs(*filenames)
---- Shell#install(filename_from, filename_to, mode)
-
-      ������FileTools���饹�ˤ���Ʊ̾�Υ��饹�᥽�åɤ�Ʊ���Ǥ�.
-
-      ����¾, �ʲ��Τ�Τ������ꥢ������Ƥ��ޤ�.
-
---- Shell#cmp	<- Shell#compare
---- Shell#mv	<- Shell#move
---- Shell#cp	<- Shell#copy
---- Shell#rm_f	<- Shell#safe_unlink
---- Shell#mkpath	<- Shell#makedirs
-
-= ����ץ�
-
-== ex1
-
-  sh = Shell.cd("/tmp")
-  sh.mkdir "shell-test-1" unless sh.exists?("shell-test-1")
-  sh.cd("shell-test-1")
-  for dir in ["dir1", "dir3", "dir5"]
-    if !sh.exists?(dir)
-      sh.mkdir dir
-      sh.cd(dir) do
-	f = sh.open("tmpFile", "w")
-	f.print "TEST\n"
-	f.close
-      end
-      print sh.pwd
-    end
-  end
-
-== ex2
-
-  sh = Shell.cd("/tmp")
-  sh.transact do
-    mkdir "shell-test-1" unless exists?("shell-test-1")
-    cd("shell-test-1")
-    for dir in ["dir1", "dir3", "dir5"]
-      if !exists?(dir)
-	mkdir dir
-	cd(dir) do
-	  f = open("tmpFile", "w")
-	  f.print "TEST\n"
-	  f.close
-	end
-	print pwd
-      end
-    end
-  end
-
-== ex3
-
-  sh.cat("/etc/printcap") | sh.tee("tee1") > "tee2"
-  (sh.cat < "/etc/printcap") | sh.tee("tee11") > "tee12"
-  sh.cat("/etc/printcap") | sh.tee("tee1") >> "tee2"
-  (sh.cat < "/etc/printcap") | sh.tee("tee11") >> "tee12"
-
-== ex4
-
-  print sh.cat("/etc/passwd").head.collect{|l| l =~ /keiju/}
-
-=end
diff --git a/doc/signals.rdoc b/doc/signals.rdoc
new file mode 100644
index 0000000000..403eb66549
--- /dev/null
+++ b/doc/signals.rdoc
@@ -0,0 +1,106 @@
+= Caveats for implementing Signal.trap callbacks
+
+As with implementing signal handlers in C or most other languages,
+all code passed to Signal.trap must be reentrant.  If you are not
+familiar with reentrancy, you need to read up on it at
+{Wikipedia}[https://en.wikipedia.org/wiki/Reentrancy_(computing)] or
+elsewhere before reading the rest of this document.
+
+Most importantly, "thread-safety" does not guarantee reentrancy;
+and methods such as Mutex#lock and Mutex#synchronize which are
+commonly used for thread-safety even prevent reentrancy.
+
+== An implementation detail of the Ruby VM
+
+The Ruby VM defers Signal.trap callbacks from running until it is safe
+for its internal data structures, but it does not know when it is safe
+for data structures in YOUR code.  Ruby implements deferred signal
+handling by registering short C functions with only
+{async-signal-safe functions}[http://man7.org/linux/man-pages/man7/signal-safety.7.html] as
+signal handlers.  These short C functions only do enough tell the VM to
+run callbacks registered via Signal.trap later in the main Ruby Thread.
+
+== Unsafe methods to call in Signal.trap blocks
+
+When in doubt, consider anything not listed as safe below as being
+unsafe.
+
+* Mutex#lock, Mutex#synchronize and any code using them are explicitly
+  unsafe.  This includes Monitor in the standard library which uses
+  Mutex to provide reentrancy.
+
+* Dir.chdir with block
+
+* any IO write operations when IO#sync is false;
+  including IO#write, IO#write_nonblock, IO#puts.
+  Pipes and sockets default to `IO#sync = true', so it is safe to
+  write to them unless IO#sync was disabled.
+
+* File#flock, as the underlying flock(2) call is not specified by POSIX
+
+== Commonly safe operations inside Signal.trap blocks
+
+* Assignment and retrieval of local, instance, and class variables
+
+* Most object allocations and initializations of common types
+  including Array, Hash, String, Struct, Time.
+
+* Common Array, Hash, String, Struct operations which do not execute a block
+  are generally safe; but beware if iteration is occurring elsewhere.
+
+* Hash#[], Hash#[]= (unless Hash.new was given an unsafe block)
+
+* Thread::Queue#push and Thread::SizedQueue#push (since Ruby 2.1)
+
+* Creating a new Thread via Thread.new/Thread.start can used to get
+  around the unusability of Mutexes inside a signal handler
+
+* Signal.trap is safe to use inside blocks passed to Signal.trap
+
+* arithmetic on Integer and Float (`+', `-', '%', '*', '/')
+
+  Additionally, signal handlers do not run between two successive
+  local variable accesses, so shortcuts such as `+=' and `-=' will
+  not trigger a data race when used on Integer and Float classes in
+  signal handlers.
+
+== System call wrapper methods which are safe inside Signal.trap
+
+Since Ruby has wrappers around many
+{async-signal-safe C functions}[http://man7.org/linux/man-pages/man7/signal-safety.7.html]
+the corresponding wrappers for many IO, File, Dir, and Socket methods
+are safe.
+
+(Incomplete list)
+
+* Dir.chdir (without block arg)
+* Dir.mkdir
+* Dir.open
+* File#truncate
+* File.link
+* File.open
+* File.readlink
+* File.rename
+* File.stat
+* File.symlink
+* File.truncate
+* File.unlink
+* File.utime
+* IO#close
+* IO#dup
+* IO#fsync
+* IO#read
+* IO#read_nonblock
+* IO#stat
+* IO#sysread
+* IO#syswrite
+* IO.select
+* IO.pipe
+* Process.clock_gettime
+* Process.exit!
+* Process.fork
+* Process.kill
+* Process.pid
+* Process.ppid
+* Process.waitpid
+...
diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc
new file mode 100644
index 0000000000..f71cedebf7
--- /dev/null
+++ b/doc/standard_library.rdoc
@@ -0,0 +1,121 @@
+= Ruby Standard Library
+
+The Ruby Standard Library is a vast collection of classes and modules that you
+can require in your code for additional features.
+
+Below is an overview of libraries and extensions followed by a brief
+description.
+
+== Libraries
+
+Abbrev:: Calculates a set of unique abbreviations for a given set of strings
+Base64:: Support for encoding and decoding binary data using a Base64 representation
+DEBUGGER__:: Debugging functionality for Ruby
+DRb:: Distributed object system for Ruby
+English.rb:: Require 'English.rb' to reference global variables with less cryptic names
+ERB:: An easy to use but powerful templating system for Ruby
+Find:: This module supports top-down traversal of a set of file paths
+MakeMakefile:: Module used to generate a Makefile for C extensions
+Monitor:: Provides an object or module to use safely by more than one thread
+Net::FTP:: Support for the File Transfer Protocol
+Net::HTTP:: HTTP client api for Ruby
+Net::IMAP:: Ruby client api for Internet Message Access Protocol
+OpenURI:: An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP
+OptionParser:: Ruby-oriented class for command-line option analysis
+PP:: Provides a PrettyPrinter for Ruby objects
+PrettyPrinter:: Implements a pretty printing algorithm for readable structure
+RbConfig:: Information of your configure and build of Ruby
+resolv-replace.rb:: Replace Socket DNS with Resolv
+Resolv::  Thread-aware DNS resolver library in Ruby
+Rinda:: The Linda distributed computing paradigm in Ruby
+Gem:: Package management framework for Ruby
+SecureRandom:: Interface for secure random number generator
+Set:: Provides a class to deal with collections of unordered, unique values
+Shellwords:: Manipulates strings with word parsing rules of UNIX Bourne shell
+Tempfile:: A utility class for managing temporary files
+Time:: Extends the Time class with methods for parsing and conversion
+tmpdir.rb:: Extends the Dir class to manage the OS temporary file path
+TSort:: Topological sorting using Tarjan's algorithm
+un.rb:: Utilities to replace common UNIX commands
+WeakRef:: Allows a referenced object to be garbage-collected
+
+== Extensions
+
+Coverage:: Provides coverage measurement for Ruby
+Digest:: Provides a framework for message digest libraries
+IO:: Extensions for Ruby IO class, including #wait and ::console
+NKF:: Ruby extension for Network Kanji Filter
+objspace:: Extends ObjectSpace module to add methods for internal statistics
+Pathname:: Representation of the name of a file or directory on the filesystem
+PTY:: Creates and manages pseudo terminals
+Ripper:: Provides an interface for parsing Ruby programs into S-expressions
+Socket:: Access underlying OS socket implementations
+Syslog:: Ruby interface for the POSIX system logging facility
+WIN32OLE:: Provides an interface for OLE Automation in Ruby
+
+= Default gems
+
+== Libraries
+
+Benchmark:: Provides methods to measure and report the time used to execute code
+Bundler:: Manage your Ruby application's gem dependencies
+CGI:: Support for the Common Gateway Interface protocol
+CSV:: Provides an interface to read and write CSV files and data
+Delegator:: Provides three abilities to delegate method calls to an object
+DidYouMean:: "Did you mean?" experience in Ruby
+FileUtils:: Several file utility methods for copying, moving, removing, etc
+Forwardable:: Provides delegation of specified methods to a designated object
+GetoptLong:: Parse command line options similar to the GNU C getopt_long()
+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
+Matrix:: Represents a mathematical matrix.
+Mutex_m:: Mixin to extend objects to be handled like a Mutex
+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
+Open3:: Provides access to stdin, stdout and stderr when running other programs
+OpenStruct:: Class to build custom data structures, similar to a Hash
+Prime:: Prime numbers and factorization library
+PStore:: Implements a file based persistence mechanism based on a Hash
+Racc:: A LALR(1) parser generator written in Ruby.
+RDoc:: Produces HTML and command-line documentation for Ruby
+REXML:: An XML toolkit for Ruby
+RSS:: Family of libraries that support various formats of XML "feeds"
+Singleton:: Implementation of the Singleton pattern for Ruby
+Timeout:: Auto-terminate potentially long-running operations in Ruby
+Tracer:: Outputs a source level execution trace of a Ruby program
+URI:: A Ruby module providing support for Uniform Resource Identifiers
+WEBrick:: An HTTP server toolkit for Ruby
+YAML:: Ruby client library for the Psych YAML implementation
+
+== Extensions
+
+BigDecimal:: Provides arbitrary-precision floating point decimal arithmetic
+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
+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
+GDBM:: Ruby extension for the GNU dbm (gdbm) library
+IO::console:: Console interface
+JSON:: Implements Javascript Object Notation for Ruby
+OpenSSL:: Provides SSL, TLS and general purpose cryptography for Ruby
+Psych:: A YAML parser and emitter for Ruby
+Readline:: Provides an interface for GNU Readline and Edit Line (libedit)
+SDBM:: Provides a simple file-based key-value store with String keys and values
+StringIO:: Pseudo I/O on String objects
+StringScanner:: Provides lexical scanning operations on a String
+Zlib:: Ruby interface for the zlib compression/decompression library
+
+= Bundled gems
+
+== Libraries
+
+MiniTest:: A test suite with TDD, BDD, mocking and benchmarking
+Net::Telnet:: Telnet client library for Ruby
+PowerAssert:: Power Assert for Ruby.
+Rake:: Ruby build program with capabilities similar to make
+Test::Unit:: A compatibility layer for MiniTest
+XMLRPC:: Remote Procedure Call over HTTP support for Ruby
diff --git a/doc/syntax.rdoc b/doc/syntax.rdoc
new file mode 100644
index 0000000000..2463c12a63
--- /dev/null
+++ b/doc/syntax.rdoc
@@ -0,0 +1,36 @@
+= Ruby Syntax
+
+The Ruby syntax is large and is split up into the following sections:
+
+Literals[rdoc-ref:syntax/literals.rdoc] ::
+  Numbers, Strings, Arrays, Hashes, etc.
+
+Assignment[rdoc-ref:syntax/assignment.rdoc] ::
+  Assignment and variables
+
+{Control Expressions}[rdoc-ref:syntax/control_expressions.rdoc] ::
+  +if+, +unless+, +while+, +until+, +for+, +break+, +next+, +redo+
+
+Methods[rdoc-ref:syntax/methods.rdoc] ::
+  Method and method argument syntax
+
+{Calling Methods}[rdoc-ref:syntax/calling_methods.rdoc] ::
+  How to call a method (or send a message to a method)
+
+{Modules and Classes}[rdoc-ref:syntax/modules_and_classes.rdoc] ::
+  Creating modules and classes including inheritance
+
+Exceptions[rdoc-ref:syntax/exceptions.rdoc] ::
+  Exception handling syntax
+
+Precedence[rdoc-ref:syntax/precedence.rdoc] ::
+  Precedence of ruby operators
+
+Refinements[rdoc-ref:syntax/refinements.rdoc] ::
+  Use and behavior of the experimental refinements feature
+
+Miscellaneous[rdoc-ref:syntax/miscellaneous.rdoc] ::
+  +alias+, +undef+, +BEGIN+, +END+
+
+Comments[rdoc-ref:syntax/comments.rdoc] ::
+  Line and block code comments
diff --git a/doc/syntax/assignment.rdoc b/doc/syntax/assignment.rdoc
new file mode 100644
index 0000000000..a1806e4c48
--- /dev/null
+++ b/doc/syntax/assignment.rdoc
@@ -0,0 +1,477 @@
+= Assignment
+
+In Ruby, assignment uses the <code>=</code> (equals sign) character.  This
+example assigns the number five to the local variable +v+:
+
+  v = 5
+
+Assignment creates a local variable if the variable was not previously
+referenced.
+
+== Local Variable Names
+
+A local variable name must start with a lowercase US-ASCII letter or a
+character with the eight bit set.  Typically local variables are US-ASCII
+compatible since the keys to type them exist on all keyboards.
+
+(Ruby programs must be written in a US-ASCII-compatible character set.  In
+such character sets if the eight bit is set it indicates an extended
+character.  Ruby allows local variables to contain such characters.)
+
+A local variable name may contain letters, numbers, an <code>_</code>
+(underscore or low line) or a character with the eighth bit set.
+
+== Local Variable Scope
+
+Once a local variable name has been assigned-to all uses of the name for the
+rest of the scope are considered local variables.
+
+Here is an example:
+
+  1.times do
+    a = 1
+    puts "local variables in the block: #{local_variables.join ", "}"
+  end
+
+  puts "no local variables outside the block" if local_variables.empty?
+
+This prints:
+
+  local variables in the block: a
+  no local variables outside the block
+
+Since the block creates a new scope, any local variables created inside it do
+not leak to the surrounding scope.
+
+Variables defined in an outer scope appear inner scope:
+
+  a = 0
+
+  1.times do
+    puts "local variables: #{local_variables.join ", "}"
+  end
+
+This prints:
+
+  local variables: a
+
+You may isolate variables in a block from the outer scope by listing them
+following a <code>;</code> in the block's arguments.  See the documentation
+for block local variables in the {calling
+methods}[rdoc-ref:syntax/calling_methods.rdoc] documentation for an example.
+
+See also Kernel#local_variables, but note that a +for+ loop does not create a
+new scope like a block does.
+
+== Local Variables and Methods
+
+In Ruby local variable names and method names are nearly identical.  If you
+have not assigned to one of these ambiguous names ruby will assume you wish to
+call a method.  Once you have assigned to the name ruby will assume you wish
+to reference a local variable.
+
+The local variable is created when the parser encounters the assignment, not
+when the assignment occurs:
+
+  a = 0 if false # does not assign to a
+
+  p local_variables # prints [:a]
+
+  p a # prints nil
+
+The similarity between method and local variable names can lead to confusing
+code, for example:
+
+  def big_calculation
+    42 # pretend this takes a long time
+  end
+
+  big_calculation = big_calculation()
+
+Now any reference to +big_calculation+ is considered a local variable and will
+be cached.  To call the method, use <code>self.big_calculation</code>.
+
+You can force a method call by using empty argument parentheses as shown above
+or by using an explicit receiver like <code>self</code>.  Using an explicit
+receiver may raise a NameError if the method's visibility is not public or the
+receiver is the literal <code>self</code>.
+
+Another commonly confusing case is when using a modifier +if+:
+
+  p a if a = 0.zero?
+
+Rather than printing "true" you receive a NameError, "undefined local variable
+or method `a'".  Since ruby parses the bare +a+ left of the +if+ first and has
+not yet seen an assignment to +a+ it assumes you wish to call a method.  Ruby
+then sees the assignment to +a+ and will assume you are referencing a local
+method.
+
+The confusion comes from the out-of-order execution of the expression.  First
+the local variable is assigned-to then you attempt to call a nonexistent
+method.
+
+== Local Variables and eval
+
+Using +eval+ to evaluate Ruby code will allow access to local variables defined
+in the same scope, even if the local variables are not defined until after the
+call to +eval+.  However, local variables defined inside the call to +eval+
+will not be reflected in the surrounding scope.  Inside the call to +eval+,
+local variables defined in the surrounding scope and local variables defined
+inside the call to +eval+ will be accessible.  However, you will not be able
+to access local variables defined in previous or subsequent calls to +eval+ in
+the same scope. Consider each +eval+ call a separate nested scope. Example:
+
+  def m
+    eval "bar = 1"
+    lvs = eval "baz = 2; ary = [local_variables, foo, baz]; x = 2; ary"
+    eval "quux = 3"
+    foo = 1
+    lvs << local_variables
+  end
+
+  m
+  # => [[:baz, :ary, :x, :lvs, :foo], nil, 2, [:lvs, :foo]]
+
+== Instance Variables
+
+Instance variables are shared across all methods for the same object.
+
+An instance variable must start with a <code>@</code> ("at" sign or
+commercial at).  Otherwise instance variable names follow the rules as local
+variable names.  Since the instance variable starts with an <code>@</code> the
+second character may be an upper-case letter.
+
+Here is an example of instance variable usage:
+
+  class C
+    def initialize(value)
+      @instance_variable = value
+    end
+
+    def value
+      @instance_variable
+    end
+  end
+
+  object1 = C.new "some value"
+  object2 = C.new "other value"
+
+  p object1.value # prints "some value"
+  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
+instance variable.
+
+The +value+ method has access to the value set by the +initialize+ method, but
+only for the same object.
+
+== Class Variables
+
+Class variables are shared between a class, its subclasses and its instances.
+
+A class variable must start with a <code>@@</code> (two "at" signs).  The rest
+of the name follows the same rules as instance variables.
+
+Here is an example:
+
+  class A
+    @@class_variable = 0
+
+    def value
+      @@class_variable
+    end
+
+    def update
+      @@class_variable = @@class_variable + 1
+    end
+  end
+
+  class B < A
+    def update
+      @@class_variable = @@class_variable + 2
+    end
+  end
+
+  a = A.new
+  b = B.new
+
+  puts "A value: #{a.value}"
+  puts "B value: #{b.value}"
+
+This prints:
+
+  A value: 0
+  B value: 0
+
+Continuing with the same example, we can update using objects from either
+class and the value is shared:
+
+  puts "update A"
+  a.update
+
+  puts "A value: #{a.value}"
+  puts "B value: #{b.value}"
+
+  puts "update B"
+  b.update
+
+  puts "A value: #{a.value}"
+  puts "B value: #{b.value}"
+
+  puts "update A"
+  a.update
+
+  puts "A value: #{a.value}"
+  puts "B value: #{b.value}"
+
+This prints:
+
+  update A
+  A value: 1
+  B value: 1
+  update B
+  A value: 3
+  B value: 3
+  update A
+  A value: 4
+  B value: 4
+
+Accessing an uninitialized class variable will raise a NameError exception.
+
+Note that classes have instance variables because classes are objects, so
+try not to confuse class and instance variables.
+
+== Global Variables
+
+Global variables are accessible everywhere.
+
+Global variables start with a <code>$</code> (dollar sign).  The rest of the
+name follows the same rules as instance variables.
+
+Here is an example:
+
+  $global = 0
+
+  class C
+    puts "in a class: #{$global}"
+
+    def my_method
+      puts "in a method: #{$global}"
+
+      $global = $global + 1
+      $other_global = 3
+    end
+  end
+
+  C.new.my_method
+
+  puts "at top-level, $global: #{$global}, $other_global: #{$other_global}"
+
+This prints:
+
+  in a class: 0
+  in a method: 0
+  at top-level, $global: 1, $other_global: 3
+
+An uninitialized global variable has a value of +nil+.
+
+Ruby has some special globals that behave differently depending on context
+such as the regular expression match variables or that have a side-effect when
+assigned to.  See the {global variables documentation}[rdoc-ref:globals.rdoc]
+for details.
+
+== Assignment Methods
+
+You can define methods that will behave like assignment, for example:
+
+  class C
+    def value=(value)
+      @value = value
+    end
+  end
+
+  c = C.new
+  c.value = 42
+
+Using assignment methods allows your programs to look nicer.  When assigning
+to an instance variable most people use Module#attr_accessor:
+
+  class C
+    attr_accessor :value
+  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:
+
+  class C
+    attr_accessor :value
+
+    def my_method
+      value = 42
+
+      puts "local_variables: #{local_variables.join ", "}"
+      puts "@value: #{@value.inspect}"
+    end
+  end
+
+  C.new.my_method
+
+This prints:
+
+  local_variables: value
+  @value: nil
+
+To use the assignment method you must set the receiver:
+
+  class C
+    attr_accessor :value
+
+    def my_method
+      self.value = 42
+
+      puts "local_variables: #{local_variables.join ", "}"
+      puts "@value: #{@value.inspect}"
+    end
+  end
+
+  C.new.my_method
+
+This prints:
+
+  local_variables:
+  @value: 42
+
+== Abbreviated Assignment
+
+You can mix several of the operators and assignment.  To add 1 to an object
+you can write:
+
+  a = 1
+
+  a += 2
+
+  p a # prints 3
+
+This is equivalent to:
+
+  a = 1
+
+  a = a + 2
+
+  p a # prints 3
+
+You can use the following operators this way:  <code>+</code>, <code>-</code>,
+<code>*</code>, <code>/</code>, <code>%</code>, <code>**</code>,
+<code>&</code>, <code>|</code>, <code>^</code>, <code><<</code>,
+<code>>></code>
+
+There are also <code>||=</code> and <code>&&=</code>.  The former makes an
+assignment if the value was +nil+ or +false+ while the latter makes an
+assignment if the value was not +nil+ or +false+.
+
+Here is an example:
+
+  a ||= 0
+  a &&= 1
+
+  p a # prints 1
+
+Note that these two operators behave more like <code>a || a = 0</code> than
+<code>a = a || 0</code>.
+
+== Implicit Array Assignment
+
+You can implicitly create an array by listing multiple values when assigning:
+
+  a = 1, 2, 3
+
+  p a # prints [1, 2, 3]
+
+This implicitly creates an Array.
+
+You can use <code>*</code> or the "splat" operator or unpack an Array when
+assigning.  This is similar to multiple assignment:
+
+  a = *[1, 2, 3]
+
+  p a # prints [1, 2, 3]
+
+You can splat anywhere in the right-hand side of the assignment:
+
+  a = 1, *[2, 3]
+
+  p a # prints [1, 2, 3]
+
+== Multiple Assignment
+
+You can assign multiple values on the right-hand side to multiple variables:
+
+  a, b = 1, 2
+
+  p a: a, b: b # prints {:a=>1, :b=>2}
+
+In the following sections any place "variable" is used an assignment method,
+instance, class or global will also work:
+
+  def value=(value)
+    p assigned: value
+  end
+
+  self.value, $global = 1, 2 # prints {:assigned=>1}
+
+  p $global # prints 2
+
+You can use multiple assignment to swap two values in-place:
+
+  old_value = 1
+
+  new_value, old_value = old_value, 2
+
+  p new_value: new_value, old_value: old_value
+  # 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:
+
+  a, b = 1, 2, 3
+
+  p a: a, b: b # prints {:a=>1, :b=>2}
+
+You can use <code>*</code> to gather extra values on the right-hand side of
+the assignment.
+
+  a, *b = 1, 2, 3
+
+  p a: a, b: b # prints {:a=>1, :b=>[2, 3]}
+
+The <code>*</code> can appear anywhere on the left-hand side:
+
+  *a, b = 1, 2, 3
+
+  p a: a, b: b # prints {:a=>[1, 2], :b=>3}
+
+But you may only use one <code>*</code> in an assignment.
+
+== Array Decomposition
+
+Like Array decomposition in {method arguments}[rdoc-ref:syntax/methods.rdoc]
+you can decompose an Array during assignment using parenthesis:
+
+  (a, b) = [1, 2]
+
+  p a: a, b: b # prints {:a=>1, :b=>2}
+
+You can decompose an Array as part of a larger multiple assignment:
+
+  a, (b, c) = 1, [2, 3]
+
+  p a: a, b: b, c: c # prints {:a=>1, :b=>2, :c=>3}
+
+Since each decomposition is considered its own multiple assignment you can use
+<code>*</code> to gather arguments in the decomposition:
+
+  a, (b, *c), *d = 1, [2, 3, 4], 5, 6
+
+  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
new file mode 100644
index 0000000000..5abecc69da
--- /dev/null
+++ b/doc/syntax/calling_methods.rdoc
@@ -0,0 +1,377 @@
+= Calling Methods
+
+Calling a method sends a message to an object so it can perform some work.
+
+In ruby you send a message to an object like this:
+
+  my_method()
+
+Note that the parenthesis are optional:
+
+  my_method
+
+Except when there is difference between using and omitting parentheses, this
+document uses parenthesis when arguments are present to avoid confusion.
+
+This section only covers calling methods.  See also the {syntax documentation
+on defining methods}[rdoc-ref:syntax/methods.rdoc].
+
+== Receiver
+
++self+ is the default receiver.  If you don't specify any receiver +self+ will
+be used.  To specify a receiver use <code>.</code>:
+
+  my_object.my_method
+
+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 also use <code>::</code> to designate a receiver, but this is rarely
+used due to the potential for confusion with <code>::</code> for namespaces.
+
+=== Safe navigation operator
+
+<code>&.</code>, called "safe navigation operator", allows to skip method call
+when receiver is +nil+. It returns +nil+ and doesn't evaluate method's arguments
+if the call is skipped.
+
+  REGEX = /(ruby) is (\w+)/i
+  "Ruby is awesome!".match(REGEX).values_at(1, 2)
+  # => ["Ruby", "awesome"]
+  "Python is fascinating!".match(REGEX).values_at(1, 2)
+  # NoMethodError: undefined method `values_at' for nil:NilClass
+  "Python is fascinating!".match(REGEX)&.values_at(1, 2)
+  # => nil
+
+This allows to easily chain methods which could return empty value. Note that
+<code>&.</code> skips only one next call, so for a longer chain it is necessary
+to add operator on each level:
+
+  "Python is fascinating!".match(REGEX)&.values_at(1, 2).join(' - ')
+  # NoMethodError: undefined method `join' for nil:NilClass
+  "Python is fascinating!".match(REGEX)&.values_at(1, 2)&.join(' - ')
+  # => nil
+
+== Arguments
+
+There are three types of arguments when sending a message, the positional
+arguments, keyword (or named) arguments and the block argument.  Each message
+sent may use one, two or all types of arguments, but the arguments must be
+supplied in this order.
+
+All arguments in ruby are passed by reference and are not lazily evaluated.
+
+Each argument is separated by a <code>,</code>:
+
+  my_method(1, '2', :three)
+
+Arguments may be an expression, a hash argument:
+
+  'key' => value
+
+or a keyword argument:
+
+  key: value
+
+Hash and keyword arguments must be contiguous and must appear after all
+positional arguments, but may be mixed:
+
+  my_method('a' => 1, b: 2, 'c' => 3)
+
+=== Positional Arguments
+
+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:
+
+  my_method argument1, argument2
+
+However, parenthesis are necessary to avoid ambiguity.  This will raise a
+SyntaxError because ruby does not know which method argument3 should be sent
+to:
+
+  method_one argument1, method_two argument2, argument3
+
+If the method definition has a <code>*argument</code> extra positional
+arguments will be assigned to +argument+ in the method as an Array.
+
+If the method definition doesn't include keyword arguments, the keyword or
+hash-type arguments are assigned as a single hash to the last argument:
+
+  def my_method(options)
+    p options
+  end
+
+  my_method('a' => 1, b: 2) # prints: {'a'=>1, :b=>2}
+
+If too many positional arguments are given, an ArgumentError is raised.
+
+=== Default Positional Arguments
+
+When the method defines default arguments you do not need to supply all the
+arguments to the method.  Ruby will fill in the missing arguments in-order.
+
+First we'll cover the simple case where the default arguments appear on the
+right.  Consider this method:
+
+  def my_method(a, b, c = 3, d = 4)
+    p [a, b, c, d]
+  end
+
+Here +c+ and +d+ have default values which ruby will apply for you.  If you
+send only two arguments to this method:
+
+  my_method(1, 2)
+
+You will see ruby print <code>[1, 2, 3, 4]</code>.
+
+If you send three arguments:
+
+  my_method(1, 2, 5)
+
+You will see ruby print <code>[1, 2, 5, 4]</code>
+
+Ruby fills in the missing arguments from left to right.
+
+Ruby allows default values to appear in the middle of positional arguments.
+Consider this more complicated method:
+
+  def my_method(a, b = 2, c = 3, d)
+    p [a, b, c, d]
+  end
+
+Here +b+ and +c+ have default values.  If you send only two arguments to this
+method:
+
+  my_method(1, 4)
+
+You will see ruby print <code>[1, 2, 3, 4]</code>.
+
+If you send three arguments:
+
+  my_method(1, 5, 6)
+
+You will see ruby print <code>[1, 5, 3, 6]</code>.
+
+Describing this in words gets complicated and confusing. I'll describe it
+in variables and values instead.
+
+First <code>1</code> is assigned to +a+, then <code>6</code> is assigned to
++d+.  This leaves only the arguments with default values.  Since
+<code>5</code> has not been assigned to a value yet, it is given to +b+ and
++c+ uses its default value of <code>3</code>.
+
+=== Keyword Arguments
+
+Keyword arguments follow any positional arguments and are separated by commas
+like positional arguments:
+
+  my_method(positional1, keyword1: value1, keyword2: value2)
+
+Any keyword arguments not given will use the default value from the method
+definition.  If a keyword argument is given that the method did not list,
+and the method definition does not accept arbitrary keyword arguments, an
+ArgumentError will be raised.
+
+=== Block Argument
+
+The block argument sends a closure from the calling scope to the method.
+
+The block argument is always last when sending a message to a method.  A block
+is sent to a method using <code>do ... end</code> or <code>{ ... }</code>:
+
+  my_method do
+    # ...
+  end
+
+or:
+
+  my_method {
+    # ...
+  }
+
+<code>do end</code> has lower precedence than <code>{ }</code> so:
+
+  method_1 method_2 {
+    # ...
+  }
+
+Sends the block to +method_2+ while:
+
+  method_1 method_2 do
+    # ...
+  end
+
+Sends the block to +method_1+.  Note that in the first case if parentheses are
+used the block is sent to +method_1+.
+
+A block will accept arguments from the method it was sent to.  Arguments are
+defined similar to the way a method defines arguments.  The block's arguments
+go in <code>| ... |</code> following the opening <code>do</code> or
+<code>{</code>:
+
+  my_method do |argument1, argument2|
+    # ...
+  end
+
+==== Block Local Arguments
+
+You may also declare block-local arguments to a block using <code>;</code> in
+the block arguments list.  Assigning to a block-local argument will not
+override local arguments outside the block in the caller's scope:
+
+  def my_method
+    yield self
+  end
+
+  place = "world"
+
+  my_method do |obj; place|
+    place = "block"
+    puts "hello #{obj} this is #{place}"
+  end
+
+  puts "place is: #{place}"
+
+This prints:
+
+  hello main this is block
+  place is world
+
+So the +place+ variable in the block is not the same +place+ variable as
+outside the block.  Removing <code>; place</code> from the block arguments
+gives this result:
+
+  hello main this is block
+  place is block
+
+=== Array to Arguments Conversion
+
+Given the following method:
+
+  def my_method(argument1, argument2, argument3)
+  end
+
+You can turn an Array into an argument list with <code>*</code> (or splat)
+operator:
+
+  arguments = [1, 2, 3]
+  my_method(*arguments)
+
+or:
+
+  arguments = [2, 3]
+  my_method(1, *arguments)
+
+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:
+
+  def my_method(a, b, c: 3)
+  end
+
+  arguments = [1, 2, { c: 4 }]
+  my_method(*arguments)
+
+Note that this behavior is currently deprecated and will emit a warning.
+This behavior will be removed in Ruby 3.0.
+
+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.
+
+If the splat operator comes first in the call, parentheses must be used to
+avoid a warning:
+
+  my_method *arguments  # warning
+  my_method(*arguments) # no warning
+
+=== Hash to Keyword Arguments Conversion
+
+Given the following method:
+
+  def my_method(first: 1, second: 2, third: 3)
+  end
+
+You can turn a Hash into keyword arguments with the <code>**</code>
+(keyword splat) operator:
+
+  arguments = { first: 3, second: 4, third: 5 }
+  my_method(**arguments)
+
+or:
+
+  arguments = { first: 3, second: 4 }
+  my_method(third: 5, **arguments)
+
+Both are equivalent to:
+
+  my_method(first: 3, second: 4, third: 5)
+
+If the method definition uses the keyword splat operator to
+gather arbitrary keyword arguments, they will not be gathered
+by <code>*</code>:
+
+  def my_method(*a, **kw)
+    p arguments: a, keywords: kw
+  end
+
+  my_method(1, 2, '3' => 4, five: 6)
+
+Prints:
+
+  {:arguments=>[1, 2], :keywords=>{'3'=>4, :five=>6}}
+
+=== Proc to Block Conversion
+
+Given a method that use a block:
+
+  def my_method
+    yield self
+  end
+
+You can convert a proc or lambda to a block argument with the <code>&</code>
+(block conversion) operator:
+
+  argument = proc { |a| puts "#{a.inspect} was yielded" }
+
+  my_method(&argument)
+
+If the block conversion operator comes first in the call, parenthesis must be
+used to avoid a warning:
+
+  my_method &argument  # warning
+  my_method(&argument) # no warning
+
+== Method Lookup
+
+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.
+
+Here is the order of method lookup for the receiver's class or module +R+:
+
+* The prepended modules of +R+ in reverse order
+* For a matching method in +R+
+* The included modules of +R+ in reverse order
+
+If +R+ is a class with a superclass, this is repeated with +R+'s superclass
+until a method is found.
+
+Once a match is found method lookup stops.
+
+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.
+See the {refinements documentation}[rdoc-ref:syntax/refinements.rdoc] for
+details.
diff --git a/doc/syntax/comments.rdoc b/doc/syntax/comments.rdoc
new file mode 100644
index 0000000000..a07dd41494
--- /dev/null
+++ b/doc/syntax/comments.rdoc
@@ -0,0 +1,37 @@
+= Code Comments
+
+Ruby has two types of comments: inline and block.
+
+Inline comments start with the <code>#</code> character and continue until the
+end of the line:
+
+  # On a separate line
+  class Foo # or at the end of the line
+    # can be indented
+    def bar
+    end
+  end
+
+Block comments start with <code>=begin</code> and end with <code>=end</code>.
+Each should start on a separate line.
+
+  =begin
+  This is
+  commented out
+  =end
+
+  class Foo
+  end
+
+  =begin some_tag
+  this works, too
+  =end
+
+<code>=begin</code> and <code>=end</code> can not be indented, so this is a
+syntax error:
+
+  class Foo
+    =begin
+    Will not work
+    =end
+  end
diff --git a/doc/syntax/control_expressions.rdoc b/doc/syntax/control_expressions.rdoc
new file mode 100644
index 0000000000..f7e6d54924
--- /dev/null
+++ b/doc/syntax/control_expressions.rdoc
@@ -0,0 +1,557 @@
+= Control Expressions
+
+Ruby has a variety of ways to control execution.  All the expressions described
+here return a value.
+
+For the tests in these control expressions, +nil+ and +false+ are false-values
+and +true+ and any other object are true-values.  In this document "true" will
+mean "true-value" and "false" will mean "false-value".
+
+== +if+ Expression
+
+The simplest +if+ expression has two parts, a "test" expression and a "then"
+expression.  If the "test" expression evaluates to a true then the "then"
+expression is evaluated.
+
+Here is a simple if statement:
+
+  if true then
+    puts "the test resulted in a true-value"
+  end
+
+This will print "the test resulted in a true-value".
+
+The +then+ is optional:
+
+  if true
+    puts "the test resulted in a true-value"
+  end
+
+This document will omit the optional +then+ for all expressions as that is the
+most common usage of +if+.
+
+You may also add an +else+ expression.  If the test does not evaluate to true
+the +else+ expression will be executed:
+
+  if false
+    puts "the test resulted in a true-value"
+  else
+    puts "the test resulted in a false-value"
+  end
+
+This will print "the test resulted in a false-value".
+
+You may add an arbitrary number of extra tests to an if expression using
++elsif+.  An +elsif+ executes when all tests above the +elsif+ are false.
+
+  a = 1
+
+  if a == 0
+    puts "a is zero"
+  elsif a == 1
+    puts "a is one"
+  else
+    puts "a is some other value"
+  end
+
+This will print "a is one" as <code>1</code> is not equal to <code>0</code>.
+Since +else+ is only executed when there are no matching conditions.
+
+Once a condition matches, either the +if+ condition or any +elsif+ condition,
+the +if+ expression is complete and no further tests will be performed.
+
+Like an +if+, an +elsif+ condition may be followed by a +then+.
+
+In this example only "a is one" is printed:
+
+  a = 1
+
+  if a == 0
+    puts "a is zero"
+  elsif a == 1
+    puts "a is one"
+  elsif a >= 1
+    puts "a is greater than or equal to one"
+  else
+    puts "a is some other value"
+  end
+
+The tests for +if+ and +elsif+ may have side-effects.  The most common use of
+side-effect is to cache a value into a local variable:
+
+  if a = object.some_value
+    # do something to a
+  end
+
+The result value of an +if+ expression is the last value executed in the
+expression.
+
+== Ternary if
+
+You may also write a if-then-else expression using <code>?</code> and
+<code>:</code>.  This ternary if:
+
+  input_type = gets =~ /hello/i ? "greeting" : "other"
+
+Is the same as this +if+ expression:
+
+  input_type =
+    if gets =~ /hello/i
+      "greeting"
+    else
+      "other"
+    end
+
+While the ternary if is much shorter to write than the more verbose form, for
+readability it is recommended that the ternary if is only used for simple
+conditionals.  Also, avoid using multiple ternary conditions in the same
+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:
+
+  unless true
+    puts "the value is a false-value"
+  end
+
+This prints nothing as true is not a false-value.
+
+You may use an optional +then+ with +unless+ just like +if+.
+
+Note that the above +unless+ expression is the same as:
+
+  if not true
+    puts "the value is a false-value"
+  end
+
+Like an +if+ expression you may use an +else+ condition with +unless+:
+
+  unless true
+    puts "the value is false"
+  else
+    puts "the value is true"
+  end
+
+This prints "the value is true" from the +else+ condition.
+
+You may not use +elsif+ with an +unless+ expression.
+
+The result value of an +unless+ expression is the last value executed in the
+expression.
+
+== Modifier +if+ and +unless+
+
++if+ and +unless+ can also be used to modify an expression.  When used as a
+modifier the left-hand side is the "then" statement and the right-hand side
+is the "test" expression:
+
+  a = 0
+
+  a += 1 if a.zero?
+
+  p a
+
+This will print 1.
+
+  a = 0
+
+  a += 1 unless a.zero?
+
+  p a
+
+This will print 0.
+
+While the modifier and standard versions have both a "test" expression and a
+"then" statement, they are not exact transformations of each other due to
+parse order.  Here is an example that shows the difference:
+
+  p a if a = 0.zero?
+
+This raises the NameError "undefined local variable or method `a'".
+
+When ruby parses this expression it first encounters +a+ as a method call in
+the "then" expression, then later it sees the assignment to +a+ in the "test"
+expression and marks +a+ as a local variable.
+
+When running this line it first executes the "test" expression, <code>a =
+0.zero?</code>.
+
+Since the test is true it executes the "then" expression, <code>p a</code>.
+Since the +a+ in the body was recorded as a method which does not exist the
+NameError is raised.
+
+The same is true for +unless+.
+
+== +case+ Expression
+
+The +case+ expression can be used in two ways.
+
+The most common way is to compare an object against multiple patterns.  The
+patterns are matched using the +===+ method which is aliased to +==+ on
+Object.  Other classes must override it to give meaningful behavior.  See
+Module#=== and Regexp#=== for examples.
+
+Here is an example of using +case+ to compare a String against a pattern:
+
+  case "12345"
+  when /^1/
+    puts "the string starts with one"
+  else
+    puts "I don't know what the string starts with"
+  end
+
+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
+ignored.
+
+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:
+
+  case "12345"
+  when /^1/
+    puts "the string starts with one"
+  end
+
+You may place multiple conditions on the same +when+:
+
+  case "2"
+  when /^1/, "2"
+    puts "the string starts with one or is '2'"
+  end
+
+Ruby will try each condition in turn, so first <code>/^1/ === "2"</code>
+returns +false+, then <code>"2" === "2"</code> returns +true+, so "the string
+starts with one or is '2'" is printed.
+
+You may use +then+ after the +when+ condition.  This is most frequently used
+to place the body of the +when+ on a single line.
+
+  case a
+  when 1, 2 then puts "a is one or two
+  when 3    then puts "a is three"
+  else           puts "I don't know what a is"
+  end
+
+The other way to use a +case+ expression is like an if-elsif expression:
+
+  a = 2
+
+  case
+  when a == 1, a == 2
+    puts "a is one or two"
+  when a == 3
+    puts "a is three"
+  else
+    puts "I don't know what a is"
+  end
+
+Again, the +then+ and +else+ are optional.
+
+The result value of a +case+ expression is the last value executed in the
+expression.
+
+== +while+ Loop
+
+The +while+ loop executes while a condition is true:
+
+  a = 0
+
+  while a < 10 do
+    p a
+    a += 1
+  end
+
+  p a
+
+Prints the numbers 0 through 10.  The condition <code>a < 10</code> is checked
+before the loop is entered, then the body executes, then the condition is
+checked again.  When the condition results in false the loop is terminated.
+
+The +do+ keyword is optional.  The following loop is equivalent to the loop
+above:
+
+  while a < 10
+    p a
+    a += 1
+  end
+
+The result of a +while+ loop is +nil+ unless +break+ is used to supply a
+value.
+
+== +until+ Loop
+
+The +until+ loop executes while a condition is false:
+
+  a = 0
+
+  until a > 10 do
+    p a
+    a += 1
+  end
+
+  p a
+
+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 result of an +until+ loop is nil unless +break+ is
+used.
+
+== +for+ Loop
+
+The +for+ loop consists of +for+ followed by a variable to contain the
+iteration argument followed by +in+ and the value to iterate over using #each.
+The +do+ is optional:
+
+  for value in [1, 2, 3] do
+    puts value
+  end
+
+Prints 1, 2 and 3.
+
+Like +while+ and +until+, the +do+ is optional.
+
+The +for+ loop is similar to using #each, but does not create a new variable
+scope.
+
+The result value of a +for+ loop is the value iterated over unless +break+ is
+used.
+
+The +for+ loop is rarely used in modern ruby programs.
+
+== Modifier +while+ and +until+
+
+Like +if+ and +unless+, +while+ and +until+ can be used as modifiers:
+
+  a = 0
+
+  a += 1 while a < 10
+
+  p a # prints 10
+
++until+ used as a modifier:
+
+  a = 0
+
+  a += 1 until a > 10
+
+  p a # prints 11
+
+You can use +begin+ and +end+ to create a +while+ loop that runs the body once
+before the condition:
+
+  a = 0
+
+  begin
+    a += 1
+  end while a < 10
+
+  p a # prints 10
+
+If you don't use +rescue+ or +ensure+, Ruby optimizes away any exception
+handling overhead.
+
+== +break+ Statement
+
+Use +break+ to leave a block early.  This will stop iterating over the items in +values+ if one of them is even:
+
+  values.each do |value|
+    break if value.even?
+
+    # ...
+  end
+
+You can also terminate from a +while+ loop using +break+:
+
+  a = 0
+
+  while true do
+    p a
+    a += 1
+
+    break if a < 10
+  end
+
+  p a
+
+This prints the numbers 0 and 1.
+
++break+ accepts a value that supplies the result of the expression it is
+"breaking" out of:
+
+  result = [1, 2, 3].each do |value|
+    break value * 2 if value.even?
+  end
+
+  p result # prints 4
+
+== +next+ Statement
+
+Use +next+ to skip the rest of the current iteration:
+
+  result = [1, 2, 3].map do |value|
+    next if value.even?
+
+    value * 2
+  end
+
+  p result # prints [2, nil, 6]
+
++next+ accepts an argument that can be used as the result of the current
+block iteration:
+
+  result = [1, 2, 3].map do |value|
+    next value if value.even?
+
+    value * 2
+  end
+
+  p result # prints [2, 2, 6]
+
+== +redo+ Statement
+
+Use +redo+ to redo the current iteration:
+
+  result = []
+
+  while result.length < 10 do
+    result << result.length
+
+    redo if result.last.even?
+
+    result << result.length + 1
+  end
+
+  p result
+
+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
+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+.
+
+== Modifier Statements
+
+Ruby's grammar differentiates between statements and expressions.  All
+expressions are statements (an expression is a type of statement), but
+not all statements are expressions.  Some parts of the grammar accept
+expressions and not other types of statements, which causes code that
+looks similar to be parsed differently.
+
+For example, when not used as a modifier, +if+, +else+, +while+, +until+,
+and +begin+ are expressions (and also statements).  However, when
+used as a modifier, +if+, +else+, +while+, +until+ and +rescue+
+are statements but not expressions.
+
+  if true; 1 end # expression (and therefore statement)
+  1 if true      # statement (not expression)
+
+Statements that are not expressions cannot be used in contexts where an
+expression is expected, such as method arguments.
+
+  puts( 1 if true )      #=> SyntaxError
+
+You can wrap a statement in parentheses to create an expression.
+
+  puts((1 if true))      #=> 1
+
+If you put a space between the method name and opening parenthesis, you
+do not need two sets of parentheses.
+
+  puts (1 if true)       #=> 1, because of optional parentheses for method
+
+This is because this is parsed similar to a method call without
+parentheses.  It is equivalent to the following code, without the creation
+of a local variable:
+
+  x = (1 if true)
+  p x
+
+In a modifier statement, the left-hand side must be a statement and the
+right-hand side must be an expression.
+
+So in <code>a if b rescue c</code>, because <code>b rescue c</code> is a
+statement that is not an expression, and therefore is not allowed as the
+right-hand side of the +if+ modifier statement, the code is necessarily
+parsed as <code>(a if b) rescue c</code>.
+
+This interacts with operator precedence in such a way that:
+
+  stmt if v = expr rescue x
+  stmt if v = expr unless x
+
+are parsed as:
+
+  stmt if v = (expr rescue x)
+  (stmt if v = expr) unless x
+
+This is because modifier +rescue+ has higher precedence than <code>=</code>,
+and modifier +if+ has lower precedence than <code>=</code>.
+
+== Flip-Flop
+
+The flip-flop is a 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>.
+
+The form of the flip-flop is an expression that indicates when the
+flip-flop turns on, <code>..</code> (or <code>...</code>), then an expression
+that indicates when the flip-flop will turn off.  While the flip-flop is on it
+will continue to evaluate to +true+, and +false+ when off.
+
+Here is an example:
+
+
+  selected = []
+
+  0.upto 10 do |value|
+    selected << value if value==2..value==8
+  end
+
+  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
+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
+evaluated when the on condition changes:
+
+  selected = []
+
+  0.upto 5 do |value|
+    selected << value if value==2..value==2
+  end
+
+  p selected # prints [2]
+
+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
+evaluated on the following iteration:
+
+  selected = []
+
+  0.upto 5 do |value|
+    selected << value if value==2...value==2
+  end
+
+  p selected # prints [2, 3, 4, 5]
+
+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
new file mode 100644
index 0000000000..31e2f0175c
--- /dev/null
+++ b/doc/syntax/exceptions.rdoc
@@ -0,0 +1,102 @@
+= Exception Handling
+
+Exceptions are rescued in a +begin+/+end+ block:
+
+  begin
+    # code that might raise
+  rescue
+    # handle exception
+  end
+
+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
+    # ...
+  rescue
+    # ...
+  end
+
+The same is true for a +class+, +module+, and +block+:
+
+  [0, 1, 2].map do |i|
+    10 / i
+  rescue ZeroDivisionError
+    nil
+  end
+  #=> [nil, 10, 5]
+
+You can assign the exception to a local variable by using <tt>=>
+variable_name</tt> at the end of the +rescue+ line:
+
+  begin
+    # ...
+  rescue => exception
+    warn exception.message
+    raise # re-raise the current exception
+  end
+
+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+:
+
+  begin
+    # ...
+  rescue ArgumentError, NameError
+    # handle ArgumentError or NameError
+  end
+
+You may rescue different types of exceptions in different ways:
+
+  begin
+    # ...
+  rescue ArgumentError
+    # handle ArgumentError
+  rescue NameError
+    # handle NameError
+  rescue
+    # handle any StandardError
+  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
+handled in the StandardError section.
+
+You may retry rescued exceptions:
+
+  begin
+    # ...
+  rescue
+    # do something that may change the result of the begin block
+    retry
+  end
+
+Execution will resume at the start of the begin block, so be careful not to
+create an infinite loop.
+
+Inside a rescue block is the only valid location for +retry+, all other uses
+will raise a SyntaxError.  If you wish to retry a block iteration use +redo+.
+See {Control Expressions}[rdoc-ref:syntax/control_expressions.rdoc] for
+details.
+
+To always run some code whether an exception was raised or not, use +ensure+:
+
+  begin
+    # ...
+  rescue
+    # ...
+  ensure
+    # this always runs
+  end
+
+You may also run some code when an exception is not raised:
+
+  begin
+    # ...
+  rescue
+    # ...
+  else
+    # this runs only when no exception was raised
+  ensure
+    # ...
+  end
diff --git a/doc/syntax/literals.rdoc b/doc/syntax/literals.rdoc
new file mode 100644
index 0000000000..38bfa38676
--- /dev/null
+++ b/doc/syntax/literals.rdoc
@@ -0,0 +1,400 @@
+= Literals
+
+Literals create objects you can use in your program.  Literals include:
+
+* Booleans and nil
+* Numbers
+* Strings
+* Symbols
+* Arrays
+* Hashes
+* Ranges
+* Regular Expressions
+* Procs
+
+== Booleans and nil
+
++nil+ and +false+ are both false values.  +nil+ is sometimes used to indicate
+"no value" or "unknown" but evaluates to +false+ in conditional expressions.
+
++true+ is a true value.  All objects except +nil+ and +false+ evaluate to a
+true value in conditional expressions.
+
+(There are also the constants +TRUE+, +FALSE+ and +NIL+, but the lowercase
+literal forms are preferred.)
+
+== Numbers
+
+You can write integers of any size as follows:
+
+  1234
+  1_234
+
+These numbers have the same value, 1,234.  The underscore may be used to
+enhance readability for humans.  You may place an underscore anywhere in the
+number.
+
+Floating point numbers may be written as follows:
+
+  12.34
+  1234e-2
+  1.234E1
+
+These numbers have the same value, 12.34.  You may use underscores in floating
+point numbers as well.
+
+You can use a special prefix to write numbers in decimal, hexadecimal, octal
+or binary formats.  For decimal numbers use a prefix of <tt>0d</tt>, for
+hexadecimal numbers use a prefix of <tt>0x</tt>, for octal numbers use a
+prefix of <tt>0</tt> or <tt>0o</tt>, for binary numbers use a prefix of
+<tt>0b</tt>.  The alphabetic component of the number is not case-sensitive.
+
+Examples:
+
+  0d170
+  0D170
+
+  0xaa
+  0xAa
+  0xAA
+  0Xaa
+  0XAa
+  0XaA
+
+  0252
+  0o252
+  0O252
+
+  0b10101010
+  0B10101010
+
+All these numbers have the same decimal value, 170.  Like integers and floats
+you may use an underscore for readability.
+
+=== Rational numbers
+
+Numbers suffixed by +r+ are Rational numbers.
+
+  12r         #=> (12/1)
+  12.3r       #=> (123/10)
+
+Rational numbers are exact, whereas Float numbers are inexact.
+
+  0.1r + 0.2r #=> (3/10)
+  0.1 + 0.2   #=> 0.30000000000000004
+
+=== Complex numbers
+
+Numbers suffixed by +i+ are Complex (or imaginary) numbers.
+
+  1i          #=> (0+1i)
+  1i * 1i     #=> (-1+0i)
+
+Also Rational numbers may be imaginary numbers.
+
+  12.3ri      #=> (0+(123/10)*i)
+
++i+ must be placed after +r+, the opposite is not allowed.
+
+  12.3ir      #=> syntax error
+
+== Strings
+
+The most common way of writing strings is using <tt>"</tt>:
+
+  "This is a string."
+
+The string may be many lines long.
+
+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 following a backslash is interpreted as the
+character itself.
+
+Double-quote strings allow interpolation of other values using
+<tt>#{...}</tt>:
+
+  "One plus one is two: #{1 + 1}"
+
+Any expression may be placed inside the interpolated section, but it's best to
+keep the expression small for readability.
+
+Interpolation may be disabled by escaping the "#" character or using
+single-quote strings:
+
+  '#{1 + 1}' #=> "\#{1 + 1}"
+
+In addition to disabling interpolation, single-quoted strings also disable all
+escape sequences except for the single-quote (<tt>\'</tt>) and backslash
+(<tt>\\\\</tt>).
+
+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
+<tt>%Q</tt> behaves as a double-quote string.  See Percent Strings below for
+more discussion of the syntax of percent strings.
+
+Adjacent string literals are automatically concatenated by the interpreter:
+
+  "con" "cat" "en" "at" "ion" #=> "concatenation"
+  "This string contains "\
+  "no newlines."              #=> "This string contains no newlines."
+
+Any combination of adjacent single-quote, double-quote, percent strings will
+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 (heredocs)
+
+If you are writing a large block of text you may use a "here document" or
+"heredoc":
+
+  expected_result = <<HEREDOC
+  This would contain specially formatted text.
+
+  That might span many lines
+  HEREDOC
+
+The heredoc starts on the line following <tt><<HEREDOC</tt> and ends with the
+next line that starts with <tt>HEREDOC</tt>.  The result includes the ending
+newline.
+
+You may use any identifier with a heredoc, but all-uppercase identifiers are
+typically used.
+
+You may indent the ending identifier if you place a "-" after <tt><<</tt>:
+
+    expected_result = <<-INDENTED_HEREDOC
+  This would contain specially formatted text.
+
+  That might span many lines
+    INDENTED_HEREDOC
+
+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:
+
+  expected_result = <<-'EXPECTED'
+  One plus one is #{1 + 1}
+  EXPECTED
+
+  p expected_result # prints: "One plus one is \#{1 + 1}\n"
+
+The identifier may also be surrounded with double quotes (which is the same as
+no quotes) or with backticks.  When surrounded by backticks the HEREDOC
+behaves like Kernel#`:
+
+  puts <<-`HEREDOC`
+  cat #{__FILE__}
+  HEREDOC
+
+When surrounding with quotes, any character but that quote and newline
+(CR and/or LF) can be used as the identifier.
+
+To call a method on a heredoc place it after the opening identifier:
+
+  expected_result = <<-EXPECTED.chomp
+  One plus one is #{1 + 1}
+  EXPECTED
+
+You may open multiple heredocs on the same line, but this can be difficult to
+read:
+
+  puts(<<-ONE, <<-TWO)
+  content for heredoc one
+  ONE
+  content for heredoc two
+  TWO
+
+== Symbols
+
+A Symbol represents a name inside the ruby interpreter.  See Symbol for more
+details on what symbols are and when ruby creates them internally.
+
+You may reference a symbol using a colon: <tt>:my_symbol</tt>.
+
+You may also create symbols by interpolation:
+
+  :"my_symbol1"
+  :"my_symbol#{1 + 1}"
+
+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
+well.
+
+== Arrays
+
+An array is created using the objects between <tt>[</tt> and <tt>]</tt>:
+
+  [1, 2, 3]
+
+You may place expressions inside the array:
+
+  [1, 1 + 1, 1 + 2]
+  [1, [1 + 1, [1 + 2]]]
+
+See Array for the methods you may use with an array.
+
+== Hashes
+
+A hash is created using key-value pairs between <tt>{</tt> and <tt>}</tt>:
+
+  { "a" => 1, "b" => 2 }
+
+Both the key and value may be any object.
+
+You can create a hash using symbol keys with the following syntax:
+
+  { a: 1, b: 2 }
+
+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
+
+A range represents an interval of values.  The range may include or exclude
+its ending value.
+
+  (1..2)  # includes its ending value
+  (1...2) # excludes its ending value
+  (1..)   # endless range, representing infinite sequence from 1 to Infinity
+  (..1)   # beginless range, representing infinite sequence from -Infinity to 1
+
+You may create a range of any object.  See the Range documentation for details
+on the methods you need to implement.
+
+== Regular Expressions
+
+A regular expression is created using "/":
+
+  /my regular expression/
+
+The regular expression may be followed by flags which adjust the matching
+behavior of the regular expression.  The "i" flag makes the regular expression
+case-insensitive:
+
+  /my regular expression/i
+
+Interpolation may be used inside regular expressions along with escaped
+characters.  Note that a regular expression may require additional escaped
+characters than a string.
+
+See Regexp for a description of the syntax of regular expressions.
+
+== Procs
+
+A proc can be created with <tt>-></tt>:
+
+  -> { 1 + 1 }
+
+Calling the above proc will give a result of <tt>2</tt>.
+
+You can require arguments for the proc as follows:
+
+  ->(v) { 1 + v }
+
+This proc will add one to its argument.
+
+== Percent Strings
+
+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.
+
+These are the types of percent strings in ruby:
+
+<tt>%i</tt> :: Array of Symbols
+<tt>%q</tt> :: String
+<tt>%r</tt> :: Regular Expression
+<tt>%s</tt> :: Symbol
+<tt>%w</tt> :: Array of Strings
+<tt>%x</tt> :: Backtick (capture subshell result)
+
+For the two array forms of percent string, if you wish to include a space in
+one of the array entries you must escape it with a "\\" character:
+
+  %w[one one-hundred\ one]
+  #=> ["one", "one-hundred one"]
+
+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
new file mode 100644
index 0000000000..924e31611f
--- /dev/null
+++ b/doc/syntax/methods.rdoc
@@ -0,0 +1,600 @@
+= Methods
+
+Methods implement the functionality of your program.  Here is a simple method
+definition:
+
+  def one_plus_one
+    1 + 1
+  end
+
+A method definition consists of the +def+ keyword, a method name, the body of
+the method, +return+ value and the +end+ keyword.  When called the method will
+execute the body of the method.  This method returns +2+.
+
+This section only covers defining methods.  See also the {syntax documentation
+on calling methods}[rdoc-ref:syntax/calling_methods.rdoc].
+
+== Method Names
+
+Method names may be one of the operators or must start a letter or a character
+with the eighth bit set. It may contain letters, numbers, an <code>_</code>
+(underscore or low line) or a character with the eighth bit set. The convention
+is to use underscores to separate words in a multiword method name:
+
+  def method_name
+    puts "use underscores to separate words"
+  end
+
+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 eighth 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>).
+
+The following are examples of valid Ruby methods:
+
+  def hello
+    "hello"
+  end
+
+  def こんにちは
+    puts "means hello in Japanese"
+  end
+
+Typically method names are US-ASCII compatible since the keys to type them
+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 the 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's core library the
+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, the 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 the 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
+object to indicate a true value (or "truthy" value).
+
+Methods that end with an equals sign indicate an assignment method.
+
+These are method names for the various Ruby operators.  Each of these
+operators accepts only one argument.  Following the operator is the typical
+use or name of the operator.  Creating an alternate meaning for the operator
+may lead to confusion as the user expects plus to add things, minus to
+subtract things, etc.  Additionally, you cannot alter the precedence of the
+operators.
+
+<code>+</code>   :: add
+<code>-</code>   :: subtract
+<code>*</code>   :: multiply
+<code>**</code>  :: power
+<code>/</code>   :: divide
+<code>%</code>   :: modulus division, String#%
+<code>&</code>   :: AND
+<code>^</code>   :: XOR (exclusive OR)
+<code>>></code>  :: right-shift
+<code><<</code>  :: left-shift, append
+<code>==</code>  :: equal
+<code>!=</code>  :: not equal
+<code>===</code> :: case equality.  See Object#===
+<code>=~</code>  :: pattern match.  (Not just for regular expressions)
+<code>!~</code>  :: does not match
+<code><=></code> :: comparison aka spaceship operator.  See Comparable
+<code><</code>   :: less-than
+<code><=</code>  :: less-than or equal
+<code>></code>   :: greater-than
+<code>>=</code>  :: greater-than or equal
+
+To define unary methods minus and plus, follow the operator with an
+<code>@</code> as in <code>+@</code>:
+
+  class C
+    def -@
+      puts "you inverted this object"
+    end
+  end
+
+  obj = C.new
+
+  -obj # prints "you inverted this object"
+
+The <code>@</code> is needed to differentiate unary minus and plus
+operators from binary minus and plus operators.
+
+You can also follow tilde and not (<code>!</code>) unary methods with
+<code>@</code>, but it is not required as there are no binary tilde
+and not operators.
+
+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
+of the method.  In the example above, the last (and only) expression evaluated
+was the simple sum <code>1 + 1</code>.  The +return+ keyword can be used to
+make it explicit that a method returns a value.
+
+  def one_plus_one
+    return 1 + 1
+  end
+
+It can also be used to make a method return before the last expression is
+evaluated.
+
+  def two_plus_two
+    return 2 + 2
+    1 + 1  # this expression is never evaluated
+  end
+
+Note that for assignment methods the return value will be ignored when using
+the assignment syntax.  Instead, the argument will be returned:
+
+  def a=(value)
+    return 1 + value
+  end
+
+  p(self.a = 5) # prints 5
+
+The actual return value will be returned when invoking the method directly:
+
+  p send(:a=, 5) # prints 6
+
+== Scope
+
+The standard syntax to define a method:
+
+  def my_method
+    # ...
+  end
+
+adds the method to a class.  You can define an instance method on a specific
+class with the +class+ keyword:
+
+  class C
+    def my_method
+      # ...
+    end
+  end
+
+A method may be defined on another object.  You may define a "class method" (a
+method that is defined on the class, not an instance of the class) like this:
+
+  class C
+    def self.my_method
+      # ...
+    end
+  end
+
+However, this is simply a special case of a greater syntactical power in Ruby,
+the ability to add methods to any object.  Classes are objects, so adding
+class methods is simply adding methods to the Class object.
+
+The syntax for adding a method to an object is as follows:
+
+  greeting = "Hello"
+
+  def greeting.broaden
+    self + ", world!"
+  end
+
+  greeting.broaden # returns "Hello, world!"
+
++self+ is a keyword referring to the current object under consideration
+by the compiler, which might make the use of +self+ in defining a class
+method above a little clearer.  Indeed, the example of adding a +hello+
+method to the class +String+ can be rewritten thus:
+
+  def String.hello
+    "Hello, world!"
+  end
+
+A method defined like this is called a "singleton method".  +broaden+ will only
+exist on the string instance +greeting+.  Other strings will not have +broaden+.
+
+== Overriding
+
+When Ruby encounters the +def+ keyword, it doesn't consider it an error if the
+method already exists: it simply redefines it.  This is called
+_overriding_.  Rather like extending core classes, this is a potentially
+dangerous ability, and should be used sparingly because it can cause unexpected
+results.  For example, consider this irb session:
+
+  >> "43".to_i
+  => 43
+  >> class String
+  >>   def to_i
+  >>     42
+  >>   end
+  >> end
+  => nil
+  >> "43".to_i
+  => 42
+
+This will effectively sabotage any code which makes use of the method
+<code>String#to_i</code> to parse numbers from strings.
+
+== Arguments
+
+A method may accept arguments.  The argument list follows the method name:
+
+  def add_one(value)
+    value + 1
+  end
+
+When called, the user of the +add_one+ method must provide an argument.  The
+argument is a local variable in the method body.  The method will then add one
+to this argument and return the value.  If given +1+ this method will
+return +2+.
+
+The parentheses around the arguments are optional:
+
+  def add_one value
+    value + 1
+  end
+
+Multiple arguments are separated by a comma:
+
+  def add_values(a, b)
+    a + b
+  end
+
+When called, the arguments must be provided in the exact order.  In other
+words, the arguments are positional.
+
+=== Default Values
+
+Arguments may have default values:
+
+  def add_values(a, b = 1)
+    a + b
+  end
+
+The default value does not need to appear first, but arguments with defaults
+must be grouped together.  This is ok:
+
+  def add_values(a = 1, b = 2, c)
+    a + b + c
+  end
+
+This will raise a SyntaxError:
+
+  def add_values(a = 1, b, c = 1)
+    a + b + c
+  end
+
+Default argument values can refer to arguments that have already been
+evaluated as local variables, and argument values are always evaluated
+left to right. So this is allowed:
+
+  def add_values(a = 1, b = a)
+    a + b
+  end
+  add_values
+  # => 2
+
+But this will raise a +NameError+ (unless there is a method named
++b+ defined):
+
+  def add_values(a = b, b = 1)
+    a + b
+  end
+  add_values
+  # NameError (undefined local variable or method `b' for main:Object)
+
+=== Array Decomposition
+
+You can decompose (unpack or extract values from) an Array using extra
+parentheses in the arguments:
+
+  def my_method((a, b))
+    p a: a, b: b
+  end
+
+  my_method([1, 2])
+
+This prints:
+
+  {:a=>1, :b=>2}
+
+If the argument has extra elements in the Array they will be ignored:
+
+  def my_method((a, b))
+    p a: a, b: b
+  end
+
+  my_method([1, 2, 3])
+
+This has the same output as above.
+
+You can use a <code>*</code> to collect the remaining arguments.  This splits
+an Array into a first element and the rest:
+
+  def my_method((a, *b))
+    p a: a, b: b
+  end
+
+  my_method([1, 2, 3])
+
+This prints:
+
+  {:a=>1, :b=>[2, 3]}
+
+The argument will be decomposed if it responds to #to_ary.  You should only
+define #to_ary if you can use your object in place of an Array.
+
+Use of the inner parentheses only uses one of the sent arguments.  If the
+argument is not an Array it will be assigned to the first argument in the
+decomposition and the remaining arguments in the decomposition will be +nil+:
+
+  def my_method(a, (b, c), d)
+    p a: a, b: b, c: c, d: d
+  end
+
+  my_method(1, 2, 3)
+
+This prints:
+
+  {:a=>1, :b=>2, :c=>nil, :d=>3}
+
+You can nest decomposition arbitrarily:
+
+  def my_method(((a, b), c))
+    # ...
+  end
+
+=== Array/Hash Argument
+
+Prefixing an argument with <code>*</code> causes any remaining arguments to be
+converted to an Array:
+
+  def gather_arguments(*arguments)
+    p arguments
+  end
+
+  gather_arguments 1, 2, 3 # prints [1, 2, 3]
+
+The array argument must be the last positional argument, it must appear before
+any keyword arguments.
+
+The array argument will capture a Hash as the last entry if a hash was sent by
+the caller after all positional arguments.
+
+  gather_arguments 1, a: 2 # prints [1, {:a=>2}]
+
+However, this only occurs if the method does not declare any keyword arguments.
+
+  def gather_arguments_keyword(*positional, keyword: nil)
+   p positional: positional, keyword: keyword
+  end
+
+  gather_arguments_keyword 1, 2, three: 3
+  #=> raises: unknown keyword: three (ArgumentError)
+
+Also, note that a bare <code>*</code> can be used to ignore arguments:
+
+  def ignore_arguments(*)
+  end
+
+=== Keyword Arguments
+
+Keyword arguments are similar to positional arguments with default values:
+
+  def add_values(first: 1, second: 2)
+    first + second
+  end
+
+Arbitrary keyword arguments will be accepted with <code>**</code>:
+
+  def gather_arguments(first: nil, **rest)
+    p first, rest
+  end
+
+  gather_arguments first: 1, second: 2, third: 3
+  # prints 1 then {:second=>2, :third=>3}
+
+When calling a method with keyword arguments the arguments may appear in any
+order.  If an unknown keyword argument is sent by the caller, and the method
+does not accept arbitrary keyword arguments, an ArgumentError is raised.
+
+To require a specific keyword argument, do not include a default value
+for the keyword argument:
+
+  def add_values(first:, second:)
+    first + second
+  end
+  add_values
+  # ArgumentError (missing keywords: first, second)
+  add_values(first: 1, second: 2)
+  # => 3
+
+When mixing keyword arguments and positional arguments, all positional
+arguments must appear before any keyword arguments.
+
+Also, note that <code>**</code> can be used to ignore keyword arguments:
+
+  def ignore_keywords(**)
+  end
+
+To mark a method as accepting keywords, but not actually accepting
+keywords, you can use the <code>**nil</code>:
+
+  def no_keywords(**nil)
+  end
+
+Calling such a method with keywords or a non-empty keyword splat will
+result in an ArgumentError. This syntax is supported so that keywords
+can be added to the method later without affected backwards compatibility.
+
+=== Keyword and Positional Argument Separation
+
+Between Ruby 2.0 and 2.6, keyword and positional arguments were not
+separated, and a keyword argument could be used as a positional argument
+and vice-versa.  In Ruby 3.0, keyword and positional arguments will
+be separated if the method definition includes keyword arguments.
+In Ruby 3.0, if the method definition does not include keyword arguments,
+keyword arguments provided when calling the method will continue to be
+treated as a final positional hash argument.
+
+Currently, the keyword and positional arguments are not separated,
+but cases where behavior will change in Ruby 3.0 will result in a
+warning being emitted.
+
+There are a few different types of keyword argument separation issues.
+
+==== Conversion of Hash to Keywords
+
+If a method is called with the hash, the hash could be treated as
+keywords:
+
+  def my_method(**keywords)
+    keywords
+  end
+  my_method({a: 1}) # {:a => 1}
+
+This occurs even if the hash could be an optional positional argument
+or an element of a rest argument:
+
+  def my_method(hash=nil, **keywords)
+    [hash, keywords]
+  end
+  my_method({a: 1}) # [nil, {:a => 1}]
+
+  def my_method(*args, **keywords)
+    [args, keywords]
+  end
+  my_method({a: 1}) # [[], {:a => 1}]
+
+However, if the hash is needed for a mandatory positional argument,
+it would not be treated as keywords:
+
+  def my_method(hash, **keywords)
+    [hash, keywords]
+  end
+  my_method({a: 1}) # [{:a => 1}, {}]
+
+==== Conversion of Keywords to Positional Arguments
+
+If a method is called with keywords, but it is missing one
+mandatory positional argument, the keywords are converted to
+a hash and the hash used as the mandatory positional argument:
+
+  def my_method(hash, **keywords)
+    [hash, keywords]
+  end
+  my_method(a: 1) # [{:a => 1}, {}]
+
+This is also true for empty keyword splats:
+
+  kw = {}
+  my_method(**kw) # [{}, {}]
+
+==== Splitting of Positional Hashes or Keywords
+
+If a method definition accepts specific keywords and not arbitrary keywords,
+keywords or a positional hash may be split if the hash includes both Symbol
+keys and non-Symbol keys and the keywords or positional hash are not needed
+as a mandatory positional argument.  In this case, the non-Symbol keys are
+separated into a positional argument hash, and the Symbol keys are used
+as the keyword arguments:
+
+  def my_method(hash=3, a: 4)
+    [hash, a]
+  end
+  my_method(a: 1, 'a' => 2)   # [{"a"=>2}, 1]
+  my_method({a: 1, 'a' => 2}) # [{"a"=>2}, 1]
+
+== Block Argument
+
+The block argument is indicated by <code>&</code> and must come last:
+
+  def my_method(&my_block)
+    my_block.call(self)
+  end
+
+Most frequently the block argument is used to pass a block to another method:
+
+  def each_item(&block)
+    @items.each(&block)
+  end
+
+If you are only going to call the block and will not otherwise manipulate it
+or send it to another method using <code>yield</code> without an explicit
+block parameter is preferred.  This method is equivalent to the first method
+in this section:
+
+  def my_method
+    yield self
+  end
+
+== Exception Handling
+
+Methods have an implied exception handling block so you do not need to use
++begin+ or +end+ to handle exceptions.  This:
+
+  def my_method
+    begin
+      # code that may raise an exception
+    rescue
+      # handle exception
+    end
+  end
+
+May be written as:
+
+  def my_method
+    # code that may raise an exception
+  rescue
+    # handle exception
+  end
+
+Similarly, if you wish to always run code even if an exception is raised,
+you can use +ensure+ without +begin+ and +end+:
+
+  def my_method
+    # code that may raise an exception
+  ensure
+    # code that runs even if previous code raised an exception
+  end
+
+You can also combine +rescue+ with +ensure+ and/or +else+, without
++begin+ and +end+:
+
+  def my_method
+    # code that may raise an exception
+  rescue
+    # handle exception
+  else
+    # only run if no exception raised above
+  ensure
+    # code that runs even if previous code raised an exception
+  end
+
+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
new file mode 100644
index 0000000000..87ec059ae7
--- /dev/null
+++ b/doc/syntax/miscellaneous.rdoc
@@ -0,0 +1,106 @@
+= Miscellaneous Syntax
+
+== Ending an Expression
+
+Ruby uses a newline as the end of an expression.  When ending a line with an
+operator, open parentheses, comma, etc. the expression will continue.
+
+You can end an expression with a <code>;</code> (semicolon).  Semicolons are
+most frequently used with <code>ruby -e</code>.
+
+== Indentation
+
+Ruby does not require any indentation.  Typically, ruby programs are indented
+two spaces.
+
+If you run ruby with warnings enabled and have an indentation mismatch, 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:
+
+  alias new_name old_name
+  alias :new_name :old_name
+
+For methods, Module#alias_method can often be used instead of +alias+.
+
+You can also use +alias+ to alias global variables:
+
+  $old = 0
+
+  alias $new $old
+
+  p $new # prints 0
+
+You may use +alias+ in any scope.
+
+== +undef+
+
+The +undef+ keyword prevents the current class from responding to calls to the
+named methods.
+
+  undef my_method
+
+You may use symbols instead of method names:
+
+  undef :my_method
+
+You may undef multiple methods:
+
+  undef method1, method2
+
+You may use +undef+ in any scope.  See also Module#undef_method
+
+== +defined?+
+
++defined?+ is a keyword that returns a string describing its argument:
+
+  p defined?(UNDEFINED_CONSTANT) # prints nil
+  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
+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
+instance variable is zero:
+
+  defined? @instance_variable && @instance_variable.zero?
+
+This returns <code>"expression"</code>, which is not what you want if the
+instance variable is not defined.
+
+  @instance_variable = 1
+  defined?(@instance_variable) && @instance_variable.zero?
+
+Adding parentheses when checking if the instance variable is defined is a
+better check.  This correctly returns +nil+ when the instance variable is not
+defined and +false+ when the instance variable is not zero.
+
+Using the specific reflection methods such as instance_variable_defined? for
+instance variables or const_defined? for constants is less error prone than
+using +defined?+.
+
+== +BEGIN+ and +END+
+
++BEGIN+ defines a block that is run before any other code in the current file.
+It is typically used in one-liners with <code>ruby -e</code>.  Similarly +END+
+defines a block that is run after any other code.
+
++BEGIN+ must appear at top-level and +END+ will issue a warning when you use it
+inside a method.
+
+Here is an example:
+
+  BEGIN {
+    count = 0
+  }
+
+You must use <code>{</code> and <code>}</code> you may not use +do+ and +end+.
+
+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
new file mode 100644
index 0000000000..6122f6e08e
--- /dev/null
+++ b/doc/syntax/modules_and_classes.rdoc
@@ -0,0 +1,376 @@
+= Modules
+
+Modules serve two purposes in Ruby, namespacing and mix-in functionality.
+
+A namespace can be used to organize code by package or functionality that
+separates common names from interference by other packages.  For example, the
+IRB namespace provides functionality for irb that prevents a collision
+for the common name "Context".
+
+Mix-in functionality allows sharing common methods across multiple classes or
+modules.  Ruby comes with the Enumerable mix-in module which provides many
+enumeration methods based on the +each+ method and Comparable allows comparison
+of objects based on the <code><=></code> comparison method.
+
+Note that there are many similarities between modules and classes.  Besides the
+ability to mix-in a module, the description of modules below also applies to
+classes.
+
+== Module Definition
+
+A module is created using the +module+ keyword:
+
+  module MyModule
+    # ...
+  end
+
+A module may be reopened any number of times to add, change or remove
+functionality:
+
+  module MyModule
+    def my_method
+    end
+  end
+
+  module MyModule
+    alias my_alias my_method
+  end
+
+  module MyModule
+    remove_method :my_method
+  end
+
+Reopening classes is a very powerful feature of Ruby, but it is best to only
+reopen classes you own.  Reopening classes you do not own may lead to naming
+conflicts or difficult to diagnose bugs.
+
+== Nesting
+
+Modules may be nested:
+
+  module Outer
+    module Inner
+    end
+  end
+
+Many packages create a single outermost module (or class) to provide a
+namespace for their functionality.
+
+You may also define inner modules using <code>::</code> provided the outer
+modules (or classes) are already defined:
+
+  module Outer::Inner::GrandChild
+  end
+
+Note that this will raise a +NameError+ if +Outer+ and
+<code>Outer::Inner</code> are not already defined.
+
+This style has the benefit of allowing the author to reduce the amount
+of indentation.  Instead of 3 levels of indentation only one is necessary.
+However, the scope of constant lookup is different for creating a namespace
+using this syntax instead of the more verbose syntax.
+
+== Scope
+
+=== +self+
+
++self+ refers to the object that defines the current scope.  +self+ will change
+when entering a different method or when defining a new module.
+
+=== Constants
+
+Accessible constants are different depending on the module nesting (which
+syntax was used to define the module).  In the following example
+the constant <code>A::Z</code> is accessible from B as A is part of the
+nesting:
+
+  module A
+    Z = 1
+
+    module B
+      p Module.nesting #=> [A::B, A]
+      p Z #=> 1
+    end
+  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
+does not include +A+:
+
+  module A
+    Z = 1
+  end
+
+  module A::B
+    p Module.nesting #=> [A::B]
+    p Z #=> raises NameError
+  end
+
+If a constant is defined at the top-level you may preceded it with
+<code>::</code> to reference it:
+
+  Z = 0
+
+  module A
+    Z = 1
+
+    module B
+      p ::Z #=> 0
+    end
+  end
+
+=== Methods
+
+For method definition documentation see the {syntax documentation for
+methods}[rdoc-ref:syntax/methods.rdoc].
+
+Class methods may be called directly.  (This is slightly confusing, but a
+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
+it outside the method as the scope is the same.
+
+Instance methods defined in a module are only callable when included.  These
+methods have access to the constants defined when they were included through
+the ancestors list:
+
+  module A
+    Z = 1
+
+    def z
+      Z
+    end
+  end
+
+  include A
+
+  p self.class.ancestors #=> [Object, A, Kernel, BasicObject]
+  p z #=> 1
+
+=== Visibility
+
+Ruby has three types of visibility.  The default is +public+.  A public method
+may be called from any other object.
+
+The second visibility is +protected+.  When calling a protected method the
+sender must be a subclass of the receiver or the receiver must be a subclass of
+the sender.  Otherwise a NoMethodError will be raised.
+
+Protected visibility is most frequently used to define <code>==</code> and
+other comparison methods where the author does not wish to expose an object's
+state to any caller and would like to restrict it only to inherited classes.
+
+Here is an example:
+
+  class A
+    def n(other)
+      other.m
+    end
+  end
+
+  class B < A
+    def m
+      1
+    end
+
+    protected :m
+
+  end
+
+  class C < B
+  end
+
+  a = A.new
+  b = B.new
+  c = C.new
+
+  c.n b #=> 1 -- C is a subclass of B
+  b.n b #=> 1 -- m called on defining class
+  a.n b # raises NoMethodError A is not a subclass of B
+
+The third visibility is +private+.  A private method may only be called from
+inside the owner class without a receiver, or with a literal +self+
+as a receiver.  If a private method is called with a
+receiver other than a literal +self+, a NoMethodError will be raised.
+
+  class A
+    def without
+      m
+    end
+
+    def with_self
+      self.m
+    end
+
+    def with_other
+      A.new.m
+    end
+
+    def with_renamed
+      copy = self
+      copy.m
+    end
+
+    def m
+      1
+    end
+
+    private :m
+  end
+
+  a = A.new
+  a.without      #=> 1
+  a.with_self    #=> 1
+  a.with_other   # NoMethodError (private method `m' called for #<A:0x0000559c287f27d0>)
+  a.with_renamed # NoMethodError (private method `m' called for #<A:0x0000559c285f8330>)
+
+=== +alias+ and +undef+
+
+You may also alias or undefine methods, but these operations are not
+restricted to modules or classes.  See the {miscellaneous syntax
+section}[rdoc-ref:syntax/miscellaneous.rdoc] for documentation.
+
+= Classes
+
+Every class is also a module, but unlike modules a class may not be mixed-in to
+another module (or class).  Like a module, a class can be used as a namespace.
+A class also inherits methods and constants from its superclass.
+
+== Defining a class
+
+Use the +class+ keyword to create a class:
+
+  class MyClass
+    # ...
+  end
+
+If you do not supply a superclass your new class will inherit from Object.  You
+may inherit from a different class using <code><</code> followed by a class
+name:
+
+  class MySubclass < MyClass
+    # ...
+  end
+
+There is a special class BasicObject which is designed as a blank class and
+includes a minimum of built-in methods.  You can use BasicObject to create an
+independent inheritance structure.  See the BasicObject documentation for
+further details.
+
+== Inheritance
+
+Any method defined on a class is callable from its subclass:
+
+  class A
+    Z = 1
+
+    def z
+      Z
+    end
+  end
+
+  class B < A
+  end
+
+  p B.new.z #=> 1
+
+The same is true for constants:
+
+  class A
+    Z = 1
+  end
+
+  class B < A
+    def z
+      Z
+    end
+  end
+
+  p B.new.z #=> 1
+
+You can override the functionality of a superclass method by redefining the
+method:
+
+  class A
+    def m
+      1
+    end
+  end
+
+  class B < A
+    def m
+      2
+    end
+  end
+
+  p B.new.m #=> 2
+
+If you wish to invoke the superclass functionality from a method use +super+:
+
+  class A
+    def m
+      1
+    end
+  end
+
+  class B < A
+    def m
+      2 + super
+    end
+  end
+
+  p B.new.m #=> 3
+
+When used without any arguments +super+ uses the arguments given to the
+subclass method.  To send no arguments to the superclass method use
+<code>super()</code>.  To send specific arguments to the superclass method
+provide them manually like <code>super(2)</code>.
+
++super+ may be called as many times as you like in the subclass method.
+
+= Singleton Classes
+
+The singleton class (also known as the metaclass or eigenclass) of an object is
+a class that holds methods for only that instance.  You can access the
+singleton class of an object using <code>class << object</code> like this:
+
+  class C
+  end
+
+  class << C
+    # self is the singleton class here
+  end
+
+Most frequently you'll see the singleton class accessed like this:
+
+  class C
+    class << self
+      # ...
+    end
+  end
+
+This allows definition of methods and attributes on a class (or module) without
+needing to write <code>def self.my_method</code>.
+
+Since you can open the singleton class of any object this means that this code
+block:
+
+  o = Object.new
+
+  def o.my_method
+    1 + 1
+  end
+
+is equivalent to this code block:
+
+  o = Object.new
+
+  class << o
+    def my_method
+      1 + 1
+    end
+  end
+
+Both objects will have a +my_method+ that returns +2+.
diff --git a/doc/syntax/precedence.rdoc b/doc/syntax/precedence.rdoc
new file mode 100644
index 0000000000..f64691ab1f
--- /dev/null
+++ b/doc/syntax/precedence.rdoc
@@ -0,0 +1,64 @@
+= Precedence
+
+From highest to lowest, this is the precedence table for ruby.  High precedence
+operations happen before low precedence operations.
+
+  !, ~, unary +
+
+  **
+
+  unary -
+
+  *, /, %
+
+  +, -
+
+  <<, >>
+
+  &
+
+  |, ^
+
+  >, >=, <, <=
+
+  <=>, ==, ===, !=, =~, !~
+
+  &&
+
+  ||
+
+  .., ...
+
+  ?, :
+
+  modifier-rescue
+
+  =, +=, -=, etc.
+
+  defined?
+
+  not
+
+  or, and
+
+  modifier-if, modifier-unless, modifier-while, modifier-until
+
+  { } blocks
+
+Unary <code>+</code> and unary <code>-</code> are for <code>+1</code>,
+<code>-1</code> or <code>-(a + b)</code>.
+
+Modifier-if, modifier-unless, etc. are for the modifier versions of those
+keywords.  For example, this is a modifier-unless statement:
+
+  a += 1 unless a.zero?
+
+Note that <code>(a if b rescue c)</code> is parsed as <code>((a if b) rescue
+c)</code> due to reasons not related to precedence. See {modifier
+statements}[control_expressions_rdoc.html#label-Modifier+Statements].
+
+<code>{ ... }</code> blocks have priority below all listed operations, but
+<code>do ... end</code> blocks have lower priority.
+
+All other words in the precedence table above are keywords.
+
diff --git a/doc/syntax/refinements.rdoc b/doc/syntax/refinements.rdoc
new file mode 100644
index 0000000000..fc554bb476
--- /dev/null
+++ b/doc/syntax/refinements.rdoc
@@ -0,0 +1,283 @@
+= Refinements
+
+Due to Ruby's open classes you can redefine or add functionality to existing
+classes.  This is called a "monkey patch".  Unfortunately the scope of such
+changes is global.  All users of the monkey-patched class see the same
+changes.  This can cause unintended side-effects or breakage of programs.
+
+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 can modify both classes and modules.
+
+Here is a basic refinement:
+
+  class C
+    def foo
+      puts "C#foo"
+    end
+  end
+
+  module M
+    refine C do
+      def foo
+        puts "C#foo in M"
+      end
+    end
+  end
+
+First, a class +C+ is defined.  Next a refinement for +C+ is created using
+Module#refine.
+
+Module#refine creates an anonymous module that contains the changes or
+refinements to the class (+C+ in the example).  +self+ in the refine block is
+this anonymous module similar to Module#module_eval.
+
+Activate the refinement with #using:
+
+  using M
+
+  c = C.new
+
+  c.foo # prints "C#foo in M"
+
+== 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 until 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.
+
+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
+
+  module M
+    refine C do
+      def foo
+        puts "C#foo in M"
+      end
+    end
+  end
+
+  def call_foo(x)
+    x.foo
+  end
+
+  using M
+
+  x = C.new
+  x.foo       # prints "C#foo in M"
+  call_foo(x) #=> raises NoMethodError
+
+If a method is defined in a scope where a refinement is active, the refinement
+will be active when the method is called.  This example spans multiple files:
+
+c.rb:
+
+  class C
+  end
+
+m.rb:
+
+  require "c"
+
+  module M
+    refine C do
+      def foo
+        puts "C#foo in M"
+      end
+    end
+  end
+
+m_user.rb:
+
+  require "m"
+
+  using M
+
+  class MUser
+    def call_foo(x)
+      x.foo
+    end
+  end
+
+main.rb:
+
+  require "m_user"
+
+  x = C.new
+  m_user = MUser.new
+  m_user.call_foo(x) # prints "C#foo in M"
+  x.foo              #=> raises NoMethodError
+
+Since the refinement +M+ is active in <code>m_user.rb</code> where
+<code>MUser#call_foo</code> is defined it is also active when
+<code>main.rb</code> calls +call_foo+.
+
+Since #using is a method, refinements are only active when it is called.  Here
+are examples of where a refinement +M+ is and is not active.
+
+In a file:
+
+  # not activated here
+  using M
+  # activated here
+  class Foo
+    # activated here
+    def foo
+      # activated here
+    end
+    # activated here
+  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
+  eval <<EOF
+    # not activated here
+    using M
+    # activated here
+  EOF
+  # not activated here
+
+When not evaluated:
+
+  # not activated here
+  if false
+    using M
+  end
+  # not activated here
+
+When defining multiple refinements in the same module inside multiple +refine+ blocks,
+all refinements from the same module are active when a refined method
+(any of the +to_json+ methods from the example below) is called:
+
+  module ToJSON
+    refine Integer do
+      def to_json
+        to_s
+      end
+    end
+
+    refine Array do
+      def to_json
+        "[" + map { |i| i.to_json }.join(",") + "]"
+      end
+    end
+
+    refine Hash do
+      def to_json
+        "{" + map { |k, v| k.to_s.dump + ":" + v.to_json }.join(",") + "}"
+      end
+    end
+  end
+
+  using ToJSON
+
+  p [{1=>2}, {3=>4}].to_json # prints "[{\"1\":2},{\"3\":4}]"
+
+
+== Method Lookup
+
+When looking up a method for an instance of class +C+ Ruby checks:
+
+* If refinements are active for +C+, in the reverse order they were activated:
+  * The prepended modules from the refinement for +C+
+  * The refinement for +C+
+  * The included modules from the refinement for +C+
+* The prepended modules of +C+
+* +C+
+* The included modules of +C+
+
+If no method was found at any point this repeats with the superclass of +C+.
+
+Note that methods in a subclass have priority over refinements in a
+superclass.  For example, if the method <code>/</code> is defined in a
+refinement for Numeric <code>1 / 2</code> invokes the original Integer#/
+because Integer is a subclass of Numeric and is searched before the refinements
+for the superclass Numeric. Since the method <code>/</code> is also present
+in child +Integer+, the method lookup does not move up to the superclass.
+
+However, if a method +foo+ is defined on Numeric in a refinement, <code>1.foo</code>
+invokes that method since +foo+ does not exist on Integer.
+
+== +super+
+
+When +super+ is invoked method lookup checks:
+
+* The included modules of the current class.  Note that the current class may
+  be a refinement.
+* If the current class is a refinement, the method lookup proceeds as in the
+  Method Lookup section above.
+* If the current class has a direct superclass, the method proceeds as in the
+  Method Lookup section above using the superclass.
+
+Note that +super+ in a method of a refinement invokes the method in the
+refined class even if there is another refinement which has been activated in
+the same context.
+
+== Methods Introspection
+
+When using introspection methods such as Kernel#method or Kernel#methods refinements are not honored.
+
+This behavior may be changed in the future.
+
+== Refinement inheritance by Module#include
+
+When a module X is included into a module Y, Y inherits refinements from X.
+
+For example, C inherits refinements from A and B in the following code:
+
+  module A
+    refine X do ... end
+    refine Y do ... end
+  end
+  module B
+    refine Z do ... end
+  end
+  module C
+    include A
+    include B
+  end
+
+  using C
+  # Refinements in A and B are activated here.
+
+Refinements in descendants have higher precedence than those of ancestors.
+
+== Further Reading
+
+See https://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/template/yarvarch.en b/doc/yarvarch.en
index 7a76e25b7e..7a76e25b7e 100644
--- a/template/yarvarch.en
+++ b/doc/yarvarch.en
diff --git a/doc/yarvarch.ja b/doc/yarvarch.ja
new file mode 100644
index 0000000000..2739ec6b14
--- /dev/null
+++ b/doc/yarvarch.ja
@@ -0,0 +1,454 @@
+#title  YARVアーキテクチャ
+#set author 日本 Ruby の会 ささだこういち
+
+
+- 2005-03-03(Thu) 00:31:12 +0900 いろいろと書き直し
+
+----
+
+* これは？
+
+[[YARV: Yet Another RubyVM|http://www.atdot.net/yarv]] の 設計メモです。
+
+
+YARV は、Ruby プログラムのための次の機能を提供します。
+
+- Compiler
+- VM Generator
+- VM (Virtual Machine)
+- Assembler
+- Dis-Assembler
+- (experimental) JIT Compiler
+- (experimental) AOT Compiler
+
+
+現在の YARV は Ruby インタプリタの拡張ライブラリとして実装しています。こ
+れにより、Ruby インタプリタの必要な機能（パーサ、オブジェクト管理、既存
+の拡張ライブラリ）などがほぼそのまま利用できます。
+
+ただし、いくつかのパッチを Ruby インタプリタに当てなければなりません。
+
+今後は、Ruby 本体のインタプリタ部分（eval.c）を置き換えることを目指して
+開発を継続する予定です。
+
+
+* Compiler (compile.h, compile.c)
+
+コンパイラは、Ruby インタプリタのパーサによって生成された構文木（RNode
+データによる木）を YARV 命令列に変換します。YARV 命令については後述しま
+す。
+
+とくに難しいことはしていませんが、スコープなどの開始時にローカル変数の初
+期化などを行い、あとは構文木を辿り変換していきます。
+
+変換中は Ruby の Array オブジェクトに YARV 命令オブジェクト、およびオペ
+ランドを格納していき、最後に実行できる形に変換します。コンパイラでは、コ
+ンパイル中に生成するメモリ領域の管理が問題になることがありますが、YARV
+の場合、Ruby インタプリタがすべて面倒をみてくれるのでこの部分は非常に楽
+に作ることができました（ガーベージコレクタによって自動的にメモリ管理をし
+てくれるため）。
+
+YARV 命令は、命令を示す識別子、オペランドなど、すべて 1 word （マシンで
+表現できる自然な値。C 言語ではポインタのサイズ。Ruby インタプリタ用語で
+は VALUE のサイズ）で表現されます。そのため、YARV 命令はいわゆる「バイト
+コード」ではありません。そのため、YARV の説明などでは「命令列」という用
+語を使っています。
+
+1 word であるため、メモリの利用効率は多少悪くなりますが、アクセス速度な
+どを考慮すると、本方式が一番いいと考えております。たとえばオペランドをコ
+ンスタントプールに格納し、インデックスのみをオペランドで示すことも可能で
+すが、間接アクセスになってしまうので性能に影響が出るため、却下しました。
+
+
+* VM Generator (rb/insns2vm.rb, insns.def)
+
+rb/insns2vm.rb というスクリプトは、insns.def というファイルを読み込み、
+VM のために必要なファイルを生成します。具体的には、命令を実行する部分を
+生成しますが、ほかにもコンパイルに必要な情報、最適化に必要な情報、やアセ
+ンブラ、逆アセンブラに必要な情報を示すファイルも生成します。
+
+
+** 命令記述
+
+insns.def には、各命令がどのような命令であるかを記述します。具体的には次
+の情報を記述します。
+
+- 命令の名前
+- その命令のカテゴリ、コメント（英語、日本語）
+- オペランドの名前
+- その命令実行前にスタックからポップする値
+- その命令実行後にスタックにプッシュする値
+- その命令のロジック（C 言語で記述）
+
+たとえば、スタックに self をおく putself という命令は次のように記述しま
+す。
+
+#code
+/**
+  @c put
+  @e put self.
+  @j self を置く。
+ */
+DEFINE_INSN
+putself
+()
+()
+(VALUE val)
+{
+  val = GET_SELF();
+}
+#end
+
+この場合、オペランドと、スタックからポップする値は無いことになります。命
+令終了後、self をスタックトップに置きたいわけですが、それは val という、
+スタックにプッシュする値として宣言しておいた変数に代入しておくことで、こ
+れを変換するとスタックトップに置く C プログラムが生成されます。
+
+細かいフォーマットは insns.def の冒頭を参照してください。そんなに難しく
+ないと思います。
+
+insnhelper.h というファイルに、命令ロジックを記述するために必要なマクロ
+が定義されています。また、VM の内部構造に関する定義は vm.h というファイ
+ルにあります。
+
+
+* VM (Virtual Machine, vm.h, vm.c)
+
+VM は、実際にコンパイルした結果生成される YARV 命令列を実行します。まさ
+に、この部分が YARV のキモになり、将来的には eval.c をこの VM で置き換え
+たいと考えています。
+
+現在の Ruby インタプリタで実行できるすべてのことが、この VM で実現できる
+ように作っています（現段階ではまだ完全ではありませんが、そうなるべきです）。
+
+VM は、単純なスタックマシンとして実装しています。スレッドひとつにスタッ
+クひとつを保持します。スタックの領域はヒープから取得するので、柔軟な領域
+設定が可能です。
+
+
+** レジスタ
+
+VM は 5 つの仮想的なレジスタによって制御されます。
+
+- PC (Program Counter)
+- SP (Stack Pointer)
+- CFP (Control Frame Pointer)
+- LFP (Local Frame Pointer)
+- DFP (Dynamic Frame Pointer)
+
+PC は現在実行中の命令列の位置を示します。SP はスタックトップの位置を示し
+ます。CFP、LFP、DFP はそれぞれフレームの情報を示します。詳細は後述します。
+
+
+** スタックフレーム
+
+obsolete (update soon)
+
+
+** フレームデザインについての補足
+
+Lisp の処理系などをかんがえると、わざわざブロックローカルフレームとメソ
+ッドローカルフレームのようなものを用意するのは奇異に見えるかもしれません。
+あるフレームを、入れ子構造にして、ローカル変数のアクセスはその入れ子を外
+側に辿れば必ずたどり着くことができるからです（つまり、lfp は必要ない）。
+
+しかし、Ruby ではいくつか状況が違います。まず、メソッドローカルな情報が
+あること、具体的にはブロックとself（callee からみると receiver）です。こ
+の情報をそれぞれのフレームにもたせるのは無駄です。
+
+また、Ruby2.0 からはブロックローカル変数はなくなります（ブロックローカル
+引数は残るので、構造自体はあまり変わりません）。そのため、メソッドローカ
+ル変数へのアクセスが頻発することが予想されます。
+
+このとき、メソッドローカル変数へのアクセスのたびにフレーム（スコープ）の
+リストをたどるのは無駄であると判断し、明示的にメソッドローカルスコープと
+ブロックフレームを分離し、ブロックフレームからはメソッドローカルフレーム
+が lfpレジスタによって容易にアクセスできるようにしました。
+
+
+** メソッド呼び出しについて
+
+メソッド呼び出しは、YARV 命令列で記述されたメソッドか、C で記述されたメ
+ソッドかによってディスパッチ手法が変わります。
+
+YARV 命令列であった場合、上述したスタックフレームを作成して命令を継続し
+ます。とくに VM の関数を再帰呼び出すすることは行ないません。
+
+C で記述されたメソッドだった場合、単純にその関数を呼び出します（ただし、
+バックトレースを正しく生成するためにメソッド呼び出しの情報を付加してから
+行ないます）。
+
+このため、VM 用スタックを別途用意したものの、プログラムによってはマシン
+スタックを使い切ってしまう可能性があります（C -> Ruby -> C -> ... という
+呼び出しが続いた場合）。これは、現在では避けられない仕様となっています。
+
+
+** 例外
+
+例外は、Java の JVM と同様に例外テーブルを用意することで実現します。例外
+が発生したら、当該フレームを、例外テーブルを検査します。そこで、例外が発
+生したときの PC の値に合致するエントリがあった場合、そのエントリに従って
+動作します。もしエントリが見つからなかった場合、スタックを撒き戻してまた
+同様にそのスコープの例外テーブルを検査します。
+
+また、break、return（ブロック中）、retry なども同様の仕組みで実現します。
+
+*** 例外テーブル
+
+例外テーブルエントリは具体的には次の情報が格納されています。
+
+- 対象とする PC の範囲
+- 対象とする例外の種類
+- もし対象となったときにジャンプする先（種類による）
+- もし対象となったときに起動するブロックの iseq
+
+
+*** rescue
+
+rescue 節はブロックとして実現しています。$! の値を唯一の引数として持ちま
+す。
+
+#code
+begin
+rescue A
+rescue B
+rescue C
+end
+#end
+
+は、次のような Ruby スクリプトに変換されます。
+
+#code
+{|err|
+  case err
+  when A === err
+  when B === err
+  when C === err
+  else
+    raise # yarv の命令では throw
+  end
+}
+#end
+
+
+*** ensure
+
+正常系（例外が発生しなかった場合）と異常系（例外が発生したときなど）の2
+種類の命令列が生成されます。正常系では、ただの連続したコード領域としてコ
+ンパイルされます。また、異常系ではブロックとして実装します。最後は必ず
+throw 命令で締めることになります。
+
+
+*** break, return（ブロック中）、retry
+
+break 文、ブロック中の return 文、retry 文は throw 命令としてコンパイル
+されます。どこまで戻るかは、break をフックする例外テーブルのエントリが判
+断します。
+
+
+** 定数の検索
+
+定数という名前なのに、Ruby ではコンパイル時に決定しません。というか、い
+つまでも再定義可能になっています。
+
+定数アクセスのためのRuby記述は次のようになります。
+
+#code
+Ruby表現:
+expr::ID::...::ID
+#end
+
+これは、yarv命令セットでは次のようになります。
+
+#code
+(expr)
+getconstant ID
+...
+getconstant ID
+#end
+
+
+*** 定数検索パス
+
+もし expr が nil だった場合、定数検索パスに従って定数を検索します。この
+挙動は今後 Ruby 2.0 に向けて変更される場合があります。
+
++ クラス、モジュールの動的ネスト関係（プログラムの字面上）をルートまで辿る
++ 継承関係をルート（Object）まで辿る
+
+このため、クラス、モジュールの動的ネスト関係を保存しなければなりません。
+このために、thread_object には klass_nest_stack というものを用意しました。
+これは、現在のネストの情報を保存します。
+
+メソッド定義時、その現在のネスト情報をメソッド定義時に（dupして）加える
+ことで、そのメソッドの実行時、そのネスト情報を参照することが可能になりま
+す。
+
+トップレベルでは、その情報はないことになります。
+
+クラス/モジュール定義文実行時は、現在の情報そのものを参照することになり
+ます。これは、クラススコープ突入時、その情報をクラス定義文にコピーします
+（すでにコピーされていれば、これを行いません）。
+
+これにより、動的なネスト情報を統一的に扱うことができます。
+
+
+** 最適化手法
+
+YARV では高速化を目的としているので、さまざまな最適化手法を利用していま
+す。詳細は割愛しますが、以下に述べる最適化などを行なっております。
+
+
+*** threaded code
+
+GCC の C 言語拡張である値としてのラベルを利用して direct threaded code
+を実現しています。
+
+
+*** Peephole optimization
+
+いくつかの簡単な最適化をしています。
+
+
+*** inline method cache
+
+命令列の中にメソッド検索結果を埋め込みます。
+
+
+*** inline constant cache
+
+命令列の中に定数検索結果を埋め込みます。
+
+
+*** ブロックと Proc オブジェクトの分離
+
+ブロック付きメソッド呼び出しが行なわれたときにはすぐにはブロックを Proc
+オブジェクトとして生成しません。これにより、必要ない Proc オブジェクトの
+生成を抑えています。
+
+Proc メソッドは、実際に必要になった時点で作られ、そのときに環境（スコー
+プ上に確保された変数など）をヒープに保存します。
+
+
+*** 特化命令
+
+Fixnum 同士の加算などを正直に関数呼び出しによって行なうと、コストがかか
+るので、これらのプリミティブな操作を行なうためのメソッド呼び出しは専用命
+令を用意しました。
+
+
+*** 命令融合
+
+複数の命令を 1 命令に変換します。融合命令は opt_insn_unif.def の記述によ
+り自動的に生成されます。
+
+
+*** オペランド融合
+
+複数のオペランドを含めた命令を生成します。融合命令は opt_operand.def の
+記述によって自動的に生成されます。
+
+
+*** stack caching
+
+スタックトップを仮想レジスタに保持するようにします。現在は 2 個の仮想レ
+ジスタを想定し、5状態のスタックキャッシングを行ないます。スタックキャッ
+シングする命令は自動的に生成されます。
+
+
+*** JIT Compile
+
+機械語を切り貼りします。非常に実験的なコードものしか作っておりません。ほ
+とんどのプログラムは動きません。
+
+
+*** AOT Compile
+
+YARV 命令列を C 言語に変換します。まだ十分な最適化を行なえておりませんが、
+それなりに動きます。rb/aotc.rb がコンパイラです。
+
+
+* Assembler (rb/yasm.rb)
+
+YARV 命令列のアセンブラを用意しました。使い方は rb/yasm.rb を参照してく
+ださい（まだ、例示してある生成手法のすべてをサポートしているわけではあり
+ません）。
+
+
+* Dis-Assembler (disasm.c)
+
+YARV 命令列を示すオブジェクト YARVCore::InstructionSequence には disasm
+メソッドがあります。これは、命令列を逆アセンブルした文字列を返します。
+
+
+* YARV 命令セット
+
+<%= d %>
+
+* その他
+
+** テスト
+
+test/test_* がテストケースです。一応、ミスなく動くはずです。逆にいうと、
+このテストに記述されている例ではきちんと動作するということです。
+
+
+** ベンチマーク
+
+benchmark/bm_* にベンチマークプログラムがおいてあります。
+
+
+** 今後の予定
+
+まだまだやらなければいけないこと、未実装部分がたくさんありますんでやって
+いかなければなりません。一番大きな目標は eval.c を置き換えることでしょう
+か。
+
+
+*** Verifier
+
+YARV 命令列は、ミスがあっても動かしてしまうため危険である可能性がありま
+す。そのため、スタックの利用状態をきちんと事前に検証するようなベリファイ
+アを用意しなければならないと考えています。
+
+
+*** Compiled File の構想
+
+Ruby プログラムをこの命令セットにシリアライズしたデータ構造をファイルに
+出力できるようにしたいと考えています。これを利用して一度コンパイルした命
+令列をファイルに保存しておけば、次回ロード時にはコンパイルの手間、コスト
+を省くことができます。
+
+
+**** 全体構成
+
+次のようなファイル構成を考えていますが、まだ未定です。
+
+#code
+u4 : 4 byte unsigned storage
+u2 : 2 byte unsigned storage
+u1 : 1 byte unsigned storage
+
+every storages are little endian :-)
+
+CompiledFile{
+  u4 magic;
+
+  u2 major;
+  u2 minor;
+
+  u4 character_code;
+
+  u4 constants_pool_count;
+  ConstantEntry constants_pool[constants_pool_count];
+
+  u4 block_count;
+  blockEntry blocks[block_count];
+
+  u4 method_count;
+  MethodEntry methods[method_count];
+}
+#end
+
+Java classfile のパクリ。
+
diff --git a/enc/Makefile.in b/enc/Makefile.in
index 203a83dbfd..8385236494 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -1,8 +1,7 @@
 V = 0
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
-n=$(NULLCMD)
-ECHO1 = $(V:1=@$n)
+ECHO1 = $(V:1=@@NULLCMD@)
 ECHO = $(ECHO1:0=@echo)
 
 encsrcdir = @srcdir@
@@ -20,11 +19,15 @@ ENCSODIR = $(EXTOUT)/$(arch)/enc
 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	= ascii.c us_ascii.c\
-		  unicode.c utf_8.c
+BUILTIN_ENCS	= enc/ascii.c enc/us_ascii.c\
+		  enc/unicode.c enc/utf_8.c
 
-BUILTIN_TRANSES	= newline.trans
+BUILTIN_TRANSES	= enc/trans/newline.trans
 
 RUBY_SO_NAME = @RUBY_SO_NAME@
 LIBRUBY = @LIBRUBY@
@@ -32,7 +35,10 @@ LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
 LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED)
 
 empty =
+AR = @AR@
 CC = @CC@
+ARFLAGS = @ARFLAGS@$(empty)
+RANLIB = @RANLIB@
 OUTFLAG = @OUTFLAG@$(empty)
 COUTFLAG = @COUTFLAG@$(empty)
 CFLAGS = $(CCDLFLAGS) @CFLAGS@ @ARCH_FLAG@
@@ -48,9 +54,13 @@ LDFLAGS = @LDFLAGS@
 LDSHARED = @LDSHARED@
 ldflags  = $(LDFLAGS)
 dldflags = @DLDFLAGS@
+extdldflags = @EXTDLDFLAGS@
 archflag = @ARCH_FLAG@
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+DLDFLAGS = $(ldflags) $(dldflags) $(extdldflags) $(archflag)
 RUBY     = $(MINIRUBY)
+TARGET_NAME_ = $(@F) # BSD make seems unable to deal with @F with substitution
+TARGET_NAME = $(TARGET_NAME_:.@DLEXT@=)
+TARGET_ENTRY = @EXPORT_PREFIX@Init_$(TARGET_NAME)
 
 WORKDIRS = @WORKDIRS@
 
@@ -62,7 +72,7 @@ MAKEDIRS = @MAKEDIRS@
 
 .SUFFIXES: .trans
 
-all: make-workdir
+all:
 
 make-workdir:
 	$(Q)$(MAKEDIRS) $(WORKDIRS)
diff --git a/enc/ascii.c b/enc/ascii.c
index 3d62ec9bf7..8b32c414fe 100644
--- a/enc/ascii.c
+++ b/enc/ascii.c
@@ -1,8 +1,9 @@
 /**********************************************************************
-  ascii.c -  Oniguruma (regular expression library)
+  ascii.c -  Onigmo (Oniguruma-mod) (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2006  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011       K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,6 +29,13 @@
  */
 
 #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,
@@ -45,7 +53,10 @@ OnigEncodingDefine(ascii, ASCII) = {
   onigenc_ascii_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  onigenc_single_byte_ascii_only_case_map,
+  ENCINDEX_ASCII,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("BINARY", "ASCII-8BIT")
 ENC_REPLICATE("IBM437", "ASCII-8BIT")
diff --git a/enc/big5.c b/enc/big5.c
index c39329170e..ab4fb69819 100644
--- a/enc/big5.c
+++ b/enc/big5.c
@@ -167,19 +167,19 @@ big5_mbc_enc_len0(const UChar* p, const UChar* e, int tridx, const int tbl[])
 static int
 big5_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
 {
-    return big5_mbc_enc_len0(p, e, 0, EncLen_BIG5);
+  return big5_mbc_enc_len0(p, e, 0, EncLen_BIG5);
 }
 
 static int
 big5_hkscs_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
 {
-    return big5_mbc_enc_len0(p, e, 2, EncLen_BIG5_HKSCS);
+  return big5_mbc_enc_len0(p, e, 2, EncLen_BIG5_HKSCS);
 }
 
 static int
 big5_uao_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
 {
-    return big5_mbc_enc_len0(p, e, 2, EncLen_BIG5_UAO);
+  return big5_mbc_enc_len0(p, e, 2, EncLen_BIG5_UAO);
 }
 
 static OnigCodePoint
@@ -299,7 +299,10 @@ OnigEncodingDefine(big5, BIG5) = {
   big5_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
-  big5_is_allowed_reverse_match
+  big5_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 
 /*
@@ -331,7 +334,10 @@ OnigEncodingDefine(big5_hkscs, BIG5_HKSCS) = {
   big5_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
-  big5_is_allowed_reverse_match
+  big5_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("Big5-HKSCS:2008", "Big5-HKSCS")
 
@@ -363,5 +369,8 @@ OnigEncodingDefine(big5_uao, BIG5_UAO) = {
   big5_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
-  big5_is_allowed_reverse_match
+  big5_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
diff --git a/enc/cesu_8.c b/enc/cesu_8.c
new file mode 100644
index 0000000000..decbb928f4
--- /dev/null
+++ b/enc/cesu_8.c
@@ -0,0 +1,454 @@
+/**********************************************************************
+  cesu_8.c -  Oniguruma (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+#ifdef RUBY
+# include "encindex.h"
+#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
+#endif
+#define VALID_CODE_LIMIT  0x0010ffff
+
+#define utf8_islead(c)     ((UChar )((c) & 0xc0) != 0x80)
+
+static const int EncLen_CESU8[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+};
+
+typedef enum {
+  FAILURE = -2,
+  ACCEPT,
+  S0, S1, S2, S3,
+  S4, S5, S6, S7
+} state_t;
+#define A ACCEPT
+#define F FAILURE
+static const signed char trans[][0x100] = {
+  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* c */ F, F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* e */ 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 3,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
+  },
+  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
+  },
+  { /* S2   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
+  },
+  { /* S3   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
+  },
+  { /* S4   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* a */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
+  },
+  { /* S5   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    /* 9 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    /* a */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    /* b */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
+  },
+  { /* S6   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, 7, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
+  },
+  { /* S7   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
+  },
+};
+#undef A
+#undef F
+
+static int
+mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+  int firstbyte = *p++;
+  state_t s;
+  s = trans[0][firstbyte];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_CESU8[firstbyte]-1);
+  s = trans[s][*p++];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+
+  if (p == e) {
+      int len = EncLen_CESU8[firstbyte];
+      if (s == 4) { /* S4 is CESU-8's surrogate pair; len is 6 */
+          len = 6;
+      }
+      return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(len-2);
+  }
+  s = trans[s][*p++];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(3) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(3);
+  s = trans[s][*p++];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(2);
+  s = trans[s][*p++];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(5) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
+  s = trans[s][*p++];
+  return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(6) :
+                       ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+}
+
+static int
+is_mbc_newline(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  if (p < end) {
+    if (*p == 0x0a) return 1;
+
+#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
+    if (*p == 0x0b || *p == 0x0c || *p == 0x0d) return 1;
+    if (p + 1 < end) {
+      if (*(p+1) == 0x85 && *p == 0xc2) /* U+0085 */
+	return 1;
+      if (p + 2 < end) {
+	if ((*(p+2) == 0xa8 || *(p+2) == 0xa9)
+	    && *(p+1) == 0x80 && *p == 0xe2)  /* U+2028, U+2029 */
+	  return 1;
+      }
+    }
+#endif
+  }
+
+  return 0;
+}
+
+static OnigCodePoint
+mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  int len;
+
+  len = mbc_enc_len(p, end, enc);
+  switch (len) {
+    case 1:
+      return *p;
+    case 2:
+      return ((p[0] & 0x1F)  << 6) | (p[1] & 0x3f);
+    case 3:
+      return ((p[0] & 0xF) << 12) | ((p[1] & 0x3f) << 6) | (p[2] & 0x3f);
+    case 6:
+      {
+          int high = ((p[0] & 0xF) << 12) | ((p[1] & 0x3f) << 6) | (p[2] & 0x3f);
+          int low  = ((p[3] & 0xF) << 12) | ((p[4] & 0x3f) << 6) | (p[5] & 0x3f);
+          return ((high & 0x03ff) << 10) + (low & 0x03ff) + 0x10000;
+      }
+  }
+#ifdef USE_INVALID_CODE_SCHEME
+  if (*p > 0xfd) {
+      return ((*p == 0xfe) ? INVALID_CODE_FE : INVALID_CODE_FF);
+  }
+#endif
+  return (OnigCodePoint )*p;
+}
+
+static int
+code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
+{
+  if      ((code & 0xffffff80) == 0) return 1;
+  else if ((code & 0xfffff800) == 0) return 2;
+  else if ((code & 0xffff0000) == 0) return 3;
+  else if (code <= VALID_CODE_LIMIT) return 6;
+#ifdef USE_INVALID_CODE_SCHEME
+  else if (code == INVALID_CODE_FE) return 1;
+  else if (code == INVALID_CODE_FF) return 1;
+#endif
+  else
+    return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
+}
+
+static int
+code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc ARG_UNUSED)
+{
+#define UTF8_TRAILS(code, shift) (UChar )((((code) >> (shift)) & 0x3f) | 0x80)
+#define UTF8_TRAIL0(code)        (UChar )(((code) & 0x3f) | 0x80)
+
+  if ((code & 0xffffff80) == 0) {
+    *buf = (UChar )code;
+    return 1;
+  }
+  else {
+    UChar *p = buf;
+
+    if ((code & 0xfffff800) == 0) {
+      *p++ = (UChar )(((code>>6)& 0x1f) | 0xc0);
+    }
+    else if ((code & 0xffff0000) == 0) {
+      *p++ = (UChar )(((code>>12) & 0x0f) | 0xe0);
+      *p++ = UTF8_TRAILS(code, 6);
+    }
+    else if (code <= VALID_CODE_LIMIT) {
+      unsigned int high = (code >> 10) + 0xD7C0;
+      code = (code & 0x3FF) + 0xDC00;
+      *p++ = (UChar )(((high>>12) & 0x0f) | 0xe0);
+      *p++ = UTF8_TRAILS(high, 6);
+      *p++ = UTF8_TRAIL0(high);
+      *p++ = (UChar )(((code>>12) & 0x0f) | 0xe0);
+      *p++ = UTF8_TRAILS(code, 6);
+    }
+#ifdef USE_INVALID_CODE_SCHEME
+    else if (code == INVALID_CODE_FE) {
+      *p = 0xfe;
+      return 1;
+    }
+    else if (code == INVALID_CODE_FF) {
+      *p = 0xff;
+      return 1;
+    }
+#endif
+    else {
+      return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
+    }
+
+    *p++ = UTF8_TRAIL0(code);
+    return (int )(p - buf);
+  }
+}
+
+static int
+mbc_case_fold(OnigCaseFoldType flag, const UChar** pp,
+	      const UChar* end, UChar* fold, OnigEncoding enc)
+{
+  const UChar* p = *pp;
+
+  if (ONIGENC_IS_MBC_ASCII(p)) {
+#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
+    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
+      if (*p == 0x49) {
+	*fold++ = 0xc4;
+	*fold   = 0xb1;
+	(*pp)++;
+	return 2;
+      }
+    }
+#endif
+
+    *fold = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
+    (*pp)++;
+    return 1; /* return byte length of converted char to lower */
+  }
+  else {
+    return onigenc_unicode_mbc_case_fold(enc, flag, pp, end, fold);
+  }
+}
+
+
+static int
+get_ctype_code_range(OnigCtype ctype, OnigCodePoint *sb_out,
+		     const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
+{
+  *sb_out = 0x80;
+  return onigenc_unicode_ctype_code_range(ctype, ranges);
+}
+
+
+static UChar*
+left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar *p;
+
+  if (s <= start) return (UChar* )s;
+  p = s;
+
+  while (!utf8_islead(*p) && p > start) p--;
+  return (UChar* )p;
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+    const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[],
+    OnigEncoding enc)
+{
+  return onigenc_unicode_get_case_fold_codes_by_str(enc, flag, p, end, items);
+}
+
+OnigEncodingDefine(cesu_8, CESU_8) = {
+  mbc_enc_len,
+  "CESU-8",     /* name */
+  6,           /* max byte length */
+  1,           /* min byte length */
+  is_mbc_newline,
+  mbc_to_code,
+  code_to_mbclen,
+  code_to_mbc,
+  mbc_case_fold,
+  onigenc_unicode_apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  onigenc_unicode_property_name_to_ctype,
+  onigenc_unicode_is_code_ctype,
+  get_ctype_code_range,
+  left_adjust_char_head,
+  onigenc_always_true_is_allowed_reverse_match,
+  onigenc_unicode_case_map,
+  ENCINDEX_UTF_8,
+  ONIGENC_FLAG_UNICODE,
+};
diff --git a/enc/cp949.c b/enc/cp949.c
index 3eb46c976a..bd2c8d21a4 100644
--- a/enc/cp949.c
+++ b/enc/cp949.c
@@ -210,7 +210,10 @@ OnigEncodingDefine(cp949, CP949) = {
   cp949_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   cp949_left_adjust_char_head,
-  cp949_is_allowed_reverse_match
+  cp949_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 /*
  * Name: CP949
diff --git a/enc/depend b/enc/depend
index 8e930d5053..0fffcc273f 100644
--- a/enc/depend
+++ b/enc/depend
@@ -1,44 +1,18 @@
-% inplace = File.identical?($srcdir, ".")
+% inplace = File.identical?($top_srcdir, ".")
 % workdirs = %w"$(ENCSODIR) $(TRANSSODIR) enc enc/trans"
 % CONFIG["WORKDIRS"] = workdirs.join(' ')
-% CONFIG["DLDFLAGS"].sub!(/(\A|\s)(-\S+(?:\s*\w*)?\$\(TARGET\)\S*)/, '\1')
-% dldflags = $2
 % enable_shared = CONFIG['ENABLE_SHARED'] == 'yes'
 % deffile = (true if /\$\(DEFFILE\)/ =~ CONFIG["LINK_SO"])
-% encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS
-% encs.each {|e| e.chomp!(".c")}
-% encs.reject! {|e| !ENC_PATTERNS.any? {|p| File.fnmatch?(p, e)}} if !ENC_PATTERNS.empty?
-% encs.reject! {|e| NOENC_PATTERNS.any? {|p| File.fnmatch?(p, e)}}
-% alphanumeric_order = proc {|e| e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten}
-% encs = encs.sort_by(&alphanumeric_order)
-% encs.unshift(encs.delete("encdb"))
-% atrans = []
-% trans = Dir.open($srcdir+"/trans") {|d|
-%   d.select {|e|
-%     if e.chomp!('.trans')
-%       atrans << e
-%       true
-%     elsif e.chomp!('.c')
-%       true
-%     end
-%   }
-% }
-% trans -= BUILTIN_TRANSES
-% atrans -= BUILTIN_TRANSES
-% trans.uniq!
-% atrans = atrans.sort_by(&alphanumeric_order)
-% trans = trans.sort_by(&alphanumeric_order)
-% trans.unshift(trans.delete("transdb"))
-% trans.compact!
-% trans |= atrans
-% trans.map! {|e| "trans/#{e}"}
-% dependencies = encs + trans
+% dependencies = ENCS + TRANS
 % cleanlibs = Shellwords.shellwords(CONFIG["cleanlibs"] || "")
 % cleanobjs = Shellwords.shellwords(CONFIG["cleanobjs"] || "")
 % cleanobjs << "$*.def" if deffile
 % rule_subst = CONFIG["RULE_SUBST"] || "%s"
 % transvpath = rule_subst.dup.sub!(/\{[^{}]+\}/, '$(TRANSVPATH)/') || "enc/trans/%s"
-% transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "") % ""
+% transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "%s") % ""
+% CONFIG['ARFLAGS'] = 'rcu ' if (CONFIG['ARFLAGS'] || "").empty?
+% CONFIG['RANLIB'] = ':' if (CONFIG['RANLIB'] || "").empty?
+% CONFIG['CPPFLAGS'] += " -DRUBY_EXPORT=1" if CONFIG["EXTSTATIC"] == "static"
 % if File::ALT_SEPARATOR
 %   pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")}
 % else
@@ -54,56 +28,96 @@ else
   ''
 end %> <%=CONFIG['LIBS']%> $(EXTLIBS)
 
-ENCOBJS = <%=encs.map {|e|"enc/#{e}.$(OBJEXT)"}.join(" \\\n\t  ")%><%="\n" if encs.size>1%>
-ENCSOS = <%=encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")%><%="\n" if encs.size>1%>
+ENCOBJS =<%ENCS.map {|e|%> enc/<%=e%>.$(OBJEXT) \
+         <%}%> #
+ENCSOS =<%ENCS.map {|e|%> $(ENCSODIR)/<%=e%>.$(DLEXT) \
+        <%}%> #
 ENCCLEANLIBS = <%=cleanlibs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
 }.join(" ")%>
 ENCCLEANOBJS = <%=cleanobjs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
 }.join(" ")%>
+LIBENC=enc/libenc.$(LIBEXT)
 
 TRANSVPATH = $(srcdir)/enc/trans
 
-TRANSCSRCS = <%=atrans.map {|e| transvpath % "#{e}.c"}.join(" \\\n\t     ")%><%="\n" if trans.size>1%>
-TRANSOBJS = <%=trans.map {|e|"enc/#{e}.$(OBJEXT)"}.join(" \\\n\t    ")%><%="\n" if trans.size>1%>
-TRANSSOS = <%=trans.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t   ")%><%="\n" if trans.size>1%>
+TRANSCSRCS =<%ATRANS.map {|e|%> <%=transvpath % "#{e}.c"%> \
+            <%}%> #
+TRANSOBJS =<%TRANS.map {|e|%> enc/<%=e%>.$(OBJEXT) \
+           <%}%> #
+TRANSSOS =<%TRANS.map {|e|%> $(ENCSODIR)/<%=e%>.$(DLEXT) \
+          <%}%> #
 TRANSCLEANLIBS = <%=cleanlibs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
 }.join(" ")%>
 TRANSCLEANOBJS = <%=cleanobjs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
 }.join(" ")%>
+LIBTRANS=enc/libtrans.$(LIBEXT)
+UNICODE_HDR_DIR = --missing-unicode-header-dir--
 
 encs: all
+% if MODULE_TYPE == :static
+all: libenc libtrans
+% else
 all: enc trans
+%end
+libencs: libenc libtrans
 enc: $(ENCSOS)
+libenc: $(LIBENC)
 trans: $(TRANSSOS)
+libtrans: $(LIBTRANS)
+
+$(LIBENC): $(ENCOBJS)
+	@$(RM) $@
+	$(ECHO) linking statically-linked encoding library $@
+	$(Q) $(AR) $(ARFLAGS)$@ $(ENCOBJS)
+	@-$(RANLIB) $@ 2> /dev/null || true
+$(LIBTRANS): $(TRANSOBJS)
+	@$(RM) $@
+	$(ECHO) linking statically-linked transcoder library $@
+	$(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? or TRANS.empty?
 
-%   unless encs.empty?
-$(ENCOBJS): regenc.h oniguruma.h config.h defines.h
+%   ENC_DEPS.each do |e, deps|
+enc/<%=e%>.$(OBJEXT): <%=deps.map {|n| rule_subst % n}.join(' ')%>
 %   end
-%   unless trans.empty?
-$(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.h st.h transcode_data.h
-%   end
-%   atrans.each do |e|
+%   ATRANS.each do |e|
 %     src = "#{e}.trans"
 
 <%=transvpath % "#{e}.c"%>: <%= transvpath % "#{e}.trans"%>
-%     src = [*IO.read(File.join($srcdir, "trans", src)).scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}]
-<%=transvpath % "#{e}.c"%>: <%= src.map {|e| transvpath % "#{e}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
+%     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
+<%=transvpath % "#{e}.c"%>: <%= src.map {|s| transvpath % "#{s}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
 %   end
 
 % end
-% link_so = LINK_SO.gsub(/\n/, "\n\t")
+% link_so = LINK_SO.gsub(/([^\\])\n/, "\\1\n$(Q) ").gsub(/\n/, "\n\t")
 % link_so.gsub!(/(-(?:implib|pdb):\S+)-\$\(arch\)\./, '\1.')
 % dependencies.each do |e|
 %   obj = "enc/#{e}.$(OBJEXT)"
@@ -119,20 +133,17 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.
 	$(ECHO) linking <%=mesg%> $(@F)
 %   cmd = link_so.sub(/\$\(OBJS\)/) {obj}
 %   base = File.basename(e)
-%   cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags
 %   if df
 	$(Q)echo> <%=df%> EXPORTS
 	$(Q)echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>
 %     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"}%>
 
@@ -142,21 +153,570 @@ enc/encdb.$(OBJEXT): encdb.h
 enc/trans/transdb.$(OBJEXT): transdb.h
 
 clean:
-% %w[$(ENCSOS) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean|
+% %w[$(ENCSOS) $(LIBENC) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(LIBTRANS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS) $(ENC_TRANS_D) $(ENC_TRANS_SO_D)].each do |clean|
 	$(Q)$(RM) <%=pathrep[clean]%>
 % end
 % @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
 % unless inplace
-	$(Q)$(RM) enc/unicode/name2ctype.h
+	$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
+	$(Q)$(RM) enc/jis/props.h
 	-$(Q)$(RMDIR) enc/unicode<%=@ignore_error%>
 % end
-% workdirs.reverse_each do|dir|
-	-$(Q)$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%>
+% workdirs.reverse_each do|d|
+	-$(Q)$(RMDIR) <%=pathrep[d]%><%=@ignore_error%>
 % end
 
 clean-srcs:
 	$(Q)$(RM) <%=pathrep['$(TRANSCSRCS)']%>
 	-$(Q)$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%>
-	$(Q)$(RM) enc/unicode/name2ctype.h
+	$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
+	$(Q)$(RM) enc/jis/props.h
 	-$(Q)$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%>
+	-$(Q)$(RMDIR) <%=pathrep['enc/props']%><%=@ignore_error%>
 	-$(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): onigmo.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): onigmo.h
+enc/cesu_8.$(OBJEXT): $(top_srcdir)/encindex.h
+enc/cesu_8.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/cesu_8.$(OBJEXT): config.h
+enc/cesu_8.$(OBJEXT): defines.h
+enc/cesu_8.$(OBJEXT): enc/cesu_8.c
+enc/cesu_8.$(OBJEXT): missing.h
+enc/cesu_8.$(OBJEXT): onigmo.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): onigmo.h
+enc/emacs_mule.$(OBJEXT): $(top_srcdir)/regenc.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): missing.h
+enc/emacs_mule.$(OBJEXT): onigmo.h
+enc/encdb.$(OBJEXT): $(hdrdir)/ruby.h
+enc/encdb.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/encdb.$(OBJEXT): $(top_srcdir)/internal.h
+enc/encdb.$(OBJEXT): assert.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): intern.h
+enc/encdb.$(OBJEXT): missing.h
+enc/encdb.$(OBJEXT): st.h
+enc/encdb.$(OBJEXT): subst.h
+enc/euc_jp.$(OBJEXT): $(top_srcdir)/regenc.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): missing.h
+enc/euc_jp.$(OBJEXT): onigmo.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): onigmo.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): onigmo.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): onigmo.h
+enc/gb2312.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/gb2312.$(OBJEXT): config.h
+enc/gb2312.$(OBJEXT): defines.h
+enc/gb2312.$(OBJEXT): enc/gb2312.c
+enc/gb2312.$(OBJEXT): missing.h
+enc/gb2312.$(OBJEXT): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.h
+enc/shift_jis.$(OBJEXT): $(top_srcdir)/regenc.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): enc/shift_jis.h
+enc/shift_jis.$(OBJEXT): missing.h
+enc/shift_jis.$(OBJEXT): onigmo.h
+enc/trans/big5.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/big5.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/big5.$(OBJEXT): assert.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/cesu_8.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/cesu_8.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/cesu_8.$(OBJEXT): assert.h
+enc/trans/cesu_8.$(OBJEXT): backward.h
+enc/trans/cesu_8.$(OBJEXT): config.h
+enc/trans/cesu_8.$(OBJEXT): defines.h
+enc/trans/cesu_8.$(OBJEXT): enc/trans/cesu_8.c
+enc/trans/cesu_8.$(OBJEXT): intern.h
+enc/trans/cesu_8.$(OBJEXT): missing.h
+enc/trans/cesu_8.$(OBJEXT): st.h
+enc/trans/cesu_8.$(OBJEXT): subst.h
+enc/trans/chinese.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/chinese.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/chinese.$(OBJEXT): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): assert.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): $(UNICODE_HDR_DIR)/casefold.h
+enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/name2ctype.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): assert.h
+enc/unicode.$(OBJEXT): config.h
+enc/unicode.$(OBJEXT): defines.h
+enc/unicode.$(OBJEXT): enc/unicode.c
+enc/unicode.$(OBJEXT): intern.h
+enc/unicode.$(OBJEXT): missing.h
+enc/unicode.$(OBJEXT): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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): onigmo.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/iso_8859.h
+enc/windows_1250.$(OBJEXT): enc/windows_1250.c
+enc/windows_1250.$(OBJEXT): missing.h
+enc/windows_1250.$(OBJEXT): onigmo.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): onigmo.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/iso_8859.h
+enc/windows_1252.$(OBJEXT): enc/windows_1252.c
+enc/windows_1252.$(OBJEXT): missing.h
+enc/windows_1252.$(OBJEXT): onigmo.h
+enc/windows_1253.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/windows_1253.$(OBJEXT): config.h
+enc/windows_1253.$(OBJEXT): defines.h
+enc/windows_1253.$(OBJEXT): enc/windows_1253.c
+enc/windows_1253.$(OBJEXT): missing.h
+enc/windows_1253.$(OBJEXT): onigmo.h
+enc/windows_1254.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/windows_1254.$(OBJEXT): config.h
+enc/windows_1254.$(OBJEXT): defines.h
+enc/windows_1254.$(OBJEXT): enc/iso_8859.h
+enc/windows_1254.$(OBJEXT): enc/windows_1254.c
+enc/windows_1254.$(OBJEXT): missing.h
+enc/windows_1254.$(OBJEXT): onigmo.h
+enc/windows_1257.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/windows_1257.$(OBJEXT): config.h
+enc/windows_1257.$(OBJEXT): defines.h
+enc/windows_1257.$(OBJEXT): enc/iso_8859.h
+enc/windows_1257.$(OBJEXT): enc/windows_1257.c
+enc/windows_1257.$(OBJEXT): missing.h
+enc/windows_1257.$(OBJEXT): onigmo.h
+enc/windows_31j.$(OBJEXT): $(top_srcdir)/regenc.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.h
+enc/windows_31j.$(OBJEXT): enc/windows_31j.c
+enc/windows_31j.$(OBJEXT): missing.h
+enc/windows_31j.$(OBJEXT): onigmo.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/enc/ebcdic.h b/enc/ebcdic.h
new file mode 100644
index 0000000000..a3b380a327
--- /dev/null
+++ b/enc/ebcdic.h
@@ -0,0 +1,11 @@
+#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 e75e40b168..f92eb183cf 100644
--- a/enc/emacs_mule.c
+++ b/enc/emacs_mule.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include "regint.h"
+#include "regenc.h"
 
 
 #define emacsmule_islead(c)    ((UChar )(c) < 0x9e)
@@ -334,7 +334,9 @@ OnigEncodingDefine(emacs_mule, Emacs_Mule) = {
   onigenc_not_support_get_ctype_code_range,
   left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  0
+  onigenc_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 
 ENC_REPLICATE("stateless-ISO-2022-JP", "Emacs-Mule")
diff --git a/enc/encdb.c b/enc/encdb.c
index 958b33504e..a41e4edc6d 100644
--- a/enc/encdb.c
+++ b/enc/encdb.c
@@ -9,16 +9,15 @@
 
 **********************************************************************/
 
-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);
+#include "internal.h"
+
 #define ENC_REPLICATE(name, orig) rb_encdb_replicate((name), (orig))
 #define ENC_ALIAS(name, orig) rb_encdb_alias((name), (orig))
 #define ENC_DUMMY(name) rb_encdb_dummy(name)
 #define ENC_DEFINE(name) rb_encdb_declare(name)
 #define ENC_SET_BASE(name, orig) rb_enc_set_base((name), (orig))
+#define ENC_SET_DUMMY(name, orig) rb_enc_set_dummy(name)
+#define ENC_DUMMY_UNICODE(name) rb_encdb_set_unicode(rb_enc_set_dummy(ENC_REPLICATE((name), name "BE")))
 
 void
 Init_encdb(void)
diff --git a/enc/encinit.c.erb b/enc/encinit.c.erb
new file mode 100644
index 0000000000..70c2a1934c
--- /dev/null
+++ b/enc/encinit.c.erb
@@ -0,0 +1,37 @@
+/* Copyright 2012 Google Inc. Some Rights Reserved.
+ * Author: yugui@google.com (Yugui Sonoda)
+ */
+#include <stdio.h>
+
+#define init(func, name) {	\
+    extern void func(void);	\
+    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 %>);
+% end
+
+    provide(transdb, "trans/transdb");
+% TRANS.each do |trans|
+%   next if trans == 'trans/transdb'
+    init_trans(<%= File.basename trans %>);
+% end
+}
+<%# vim: set ft=eruby sw=2 : -%>
diff --git a/enc/euc_jp.c b/enc/euc_jp.c
index 2666e60ae0..ded051af69 100644
--- a/enc/euc_jp.c
+++ b/enc/euc_jp.c
@@ -1,8 +1,9 @@
 /**********************************************************************
-  euc_jp.c -  Oniguruma (regular expression library)
+  euc_jp.c -  Onigmo (Oniguruma-mod) (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011       K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,8 +28,7 @@
  * SUCH DAMAGE.
  */
 
-#include "regint.h"
-
+#include "regenc.h"
 
 #define eucjp_islead(c)    ((UChar )((c) - 0xa1) > 0xfe - 0xa1)
 
@@ -114,6 +114,97 @@ static const signed char trans[][0x100] = {
 #undef A
 #undef F
 
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+  /* Fullwidth Alphabet */
+  { 0xa3c1, 0xa3e1 },
+  { 0xa3c2, 0xa3e2 },
+  { 0xa3c3, 0xa3e3 },
+  { 0xa3c4, 0xa3e4 },
+  { 0xa3c5, 0xa3e5 },
+  { 0xa3c6, 0xa3e6 },
+  { 0xa3c7, 0xa3e7 },
+  { 0xa3c8, 0xa3e8 },
+  { 0xa3c9, 0xa3e9 },
+  { 0xa3ca, 0xa3ea },
+  { 0xa3cb, 0xa3eb },
+  { 0xa3cc, 0xa3ec },
+  { 0xa3cd, 0xa3ed },
+  { 0xa3ce, 0xa3ee },
+  { 0xa3cf, 0xa3ef },
+  { 0xa3d0, 0xa3f0 },
+  { 0xa3d1, 0xa3f1 },
+  { 0xa3d2, 0xa3f2 },
+  { 0xa3d3, 0xa3f3 },
+  { 0xa3d4, 0xa3f4 },
+  { 0xa3d5, 0xa3f5 },
+  { 0xa3d6, 0xa3f6 },
+  { 0xa3d7, 0xa3f7 },
+  { 0xa3d8, 0xa3f8 },
+  { 0xa3d9, 0xa3f9 },
+  { 0xa3da, 0xa3fa },
+
+  /* Greek */
+  { 0xa6a1, 0xa6c1 },
+  { 0xa6a2, 0xa6c2 },
+  { 0xa6a3, 0xa6c3 },
+  { 0xa6a4, 0xa6c4 },
+  { 0xa6a5, 0xa6c5 },
+  { 0xa6a6, 0xa6c6 },
+  { 0xa6a7, 0xa6c7 },
+  { 0xa6a8, 0xa6c8 },
+  { 0xa6a9, 0xa6c9 },
+  { 0xa6aa, 0xa6ca },
+  { 0xa6ab, 0xa6cb },
+  { 0xa6ac, 0xa6cc },
+  { 0xa6ad, 0xa6cd },
+  { 0xa6ae, 0xa6ce },
+  { 0xa6af, 0xa6cf },
+  { 0xa6b0, 0xa6d0 },
+  { 0xa6b1, 0xa6d1 },
+  { 0xa6b2, 0xa6d2 },
+  { 0xa6b3, 0xa6d3 },
+  { 0xa6b4, 0xa6d4 },
+  { 0xa6b5, 0xa6d5 },
+  { 0xa6b6, 0xa6d6 },
+  { 0xa6b7, 0xa6d7 },
+  { 0xa6b8, 0xa6d8 },
+
+  /* Cyrillic */
+  { 0xa7a1, 0xa7d1 },
+  { 0xa7a2, 0xa7d2 },
+  { 0xa7a3, 0xa7d3 },
+  { 0xa7a4, 0xa7d4 },
+  { 0xa7a5, 0xa7d5 },
+  { 0xa7a6, 0xa7d6 },
+  { 0xa7a7, 0xa7d7 },
+  { 0xa7a8, 0xa7d8 },
+  { 0xa7a9, 0xa7d9 },
+  { 0xa7aa, 0xa7da },
+  { 0xa7ab, 0xa7db },
+  { 0xa7ac, 0xa7dc },
+  { 0xa7ad, 0xa7dd },
+  { 0xa7ae, 0xa7de },
+  { 0xa7af, 0xa7df },
+  { 0xa7b0, 0xa7e0 },
+  { 0xa7b1, 0xa7e1 },
+  { 0xa7b2, 0xa7e2 },
+  { 0xa7b3, 0xa7e3 },
+  { 0xa7b4, 0xa7e4 },
+  { 0xa7b5, 0xa7e5 },
+  { 0xa7b6, 0xa7e6 },
+  { 0xa7b7, 0xa7e7 },
+  { 0xa7b8, 0xa7e8 },
+  { 0xa7b9, 0xa7e9 },
+  { 0xa7ba, 0xa7ea },
+  { 0xa7bb, 0xa7eb },
+  { 0xa7bc, 0xa7ec },
+  { 0xa7bd, 0xa7ed },
+  { 0xa7be, 0xa7ee },
+  { 0xa7bf, 0xa7ef },
+  { 0xa7c0, 0xa7f0 },
+  { 0xa7c1, 0xa7f1 },
+};
+
 static int
 mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
 {
@@ -138,7 +229,7 @@ mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
   int c, i, len;
   OnigCodePoint n;
 
-  len = enclen(enc, p, end);
+  len = mbc_enc_len(p, end, enc);
   n = (OnigCodePoint )*p++;
   if (len == 1) return n;
 
@@ -154,9 +245,10 @@ static int
 code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
 {
   if (ONIGENC_IS_CODE_ASCII(code)) return 1;
-  else if (code > 0xffffff) return 0;
-  else if ((code & 0xff0000) >= 0x800000) return 3;
-  else if ((code &   0xff00) >= 0x8000) return 2;
+  else if (code > 0x00ffffff)
+    return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
+  else if ((code & 0xff808080) == 0x00808080) return 3;
+  else if ((code & 0xffff8080) == 0x00008080) return 2;
   else
     return ONIGERR_INVALID_CODE_POINT_VALUE;
 }
@@ -190,10 +282,87 @@ code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
   *p++ = (UChar )(code & 0xff);
 
 #if 1
-  if (enclen(enc, buf, p) != (p - buf))
+  if (mbc_enc_len(buf, p, enc) != (p - buf))
     return ONIGERR_INVALID_CODE_POINT_VALUE;
 #endif
-  return (int)(p - buf);
+  return (int )(p - buf);
+}
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+		    OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc)
+{
+  return onigenc_apply_all_case_fold_with_map(
+            numberof(CaseFoldMap), CaseFoldMap, 0,
+            flag, f, arg);
+}
+
+static OnigCodePoint
+get_lower_case(OnigCodePoint code)
+{
+  if (ONIGENC_IS_IN_RANGE(code, 0xa3c1, 0xa3da)) {
+    /* Fullwidth Alphabet */
+    return (OnigCodePoint )(code + 0x0020);
+  }
+  else if (ONIGENC_IS_IN_RANGE(code, 0xa6a1, 0xa6b8)) {
+    /* Greek */
+    return (OnigCodePoint )(code + 0x0020);
+  }
+  else if (ONIGENC_IS_IN_RANGE(code, 0xa7a1, 0xa7c1)) {
+    /* Cyrillic */
+    return (OnigCodePoint )(code + 0x0030);
+  }
+  return code;
+}
+
+static OnigCodePoint
+get_upper_case(OnigCodePoint code)
+{
+  if (ONIGENC_IS_IN_RANGE(code, 0xa3e1, 0xa3fa)) {
+    /* Fullwidth Alphabet */
+    return (OnigCodePoint )(code - 0x0020);
+  }
+  else if (ONIGENC_IS_IN_RANGE(code, 0xa6c1, 0xa6d8)) {
+    /* Greek */
+    return (OnigCodePoint )(code - 0x0020);
+  }
+  else if (ONIGENC_IS_IN_RANGE(code, 0xa7d1, 0xa7f1)) {
+    /* Cyrillic */
+    return (OnigCodePoint )(code - 0x0030);
+  }
+  return code;
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[], OnigEncoding enc)
+{
+  int len;
+  OnigCodePoint code, code_lo, code_up;
+
+  code = mbc_to_code(p, end, enc);
+  if (ONIGENC_IS_ASCII_CODE(code))
+    return onigenc_ascii_get_case_fold_codes_by_str(flag, p, end, items, enc);
+
+  len = mbc_enc_len(p, end, enc);
+  code_lo = get_lower_case(code);
+  code_up = get_upper_case(code);
+
+  if (code != code_lo) {
+    items[0].byte_len = len;
+    items[0].code_len = 1;
+    items[0].code[0] = code_lo;
+    return 1;
+  }
+  else if (code != code_up) {
+    items[0].byte_len = len;
+    items[0].code_len = 1;
+    items[0].code[0] = code_up;
+    return 1;
+  }
+
+  return 0;
 }
 
 static int
@@ -201,7 +370,6 @@ mbc_case_fold(OnigCaseFoldType flag,
 	      const UChar** pp, const UChar* end, UChar* lower,
 	      OnigEncoding enc)
 {
-  int len;
   const UChar* p = *pp;
 
   if (ONIGENC_IS_MBC_ASCII(p)) {
@@ -210,12 +378,13 @@ mbc_case_fold(OnigCaseFoldType flag,
     return 1;
   }
   else {
-    int i;
+    OnigCodePoint code;
+    int len;
 
-    len = enclen(enc, p, end);
-    for (i = 0; i < len; i++) {
-      *lower++ = *p++;
-    }
+    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 */
   }
@@ -234,7 +403,7 @@ left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, Onig
   p = s;
 
   while (!eucjp_islead(*p) && p > start) p--;
-  len = enclen(enc, p, end);
+  len = mbc_enc_len(p, end, enc);
   if (p + len > s) return (UChar* )p;
   p += len;
   return (UChar* )(p + ((s - p) & ~1));
@@ -251,55 +420,100 @@ is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc ARG_
 }
 
 
-static int PropertyInited = 0;
-static const OnigCodePoint** PropertyList;
-static int PropertyListNum;
-static int PropertyListSize;
-static hash_table_type* PropertyNameTable;
-
 static const OnigCodePoint CR_Hiragana[] = {
   1,
+#ifdef ENC_EUC_JIS_2004
+  0xa4a1, 0xa4fb
+#else
   0xa4a1, 0xa4f3
+#endif
 }; /* CR_Hiragana */
 
+#ifdef ENC_EUC_JIS_2004
+static const OnigCodePoint CR_Katakana[] = {
+  5,
+  0x8ea6, 0x8eaf,	/* JIS X 0201 Katakana */
+  0x8eb1, 0x8edd,	/* JIS X 0201 Katakana */
+  0xa5a1, 0xa5fe,
+  0xa6ee, 0xa6fe,
+  0xa7f2, 0xa7f5,
+}; /* CR_Katakana */
+#else
 static const OnigCodePoint CR_Katakana[] = {
   3,
+  0x8ea6, 0x8eaf,	/* JIS X 0201 Katakana */
+  0x8eb1, 0x8edd,	/* JIS X 0201 Katakana */
   0xa5a1, 0xa5f6,
-  0xaaa6, 0xaaaf,
-  0xaab1, 0xaadd
 }; /* CR_Katakana */
+#endif
 
-static int
-init_property_list(void)
-{
-  int r;
+#ifdef ENC_EUC_JIS_2004
+static const OnigCodePoint CR_Han[] = {
+  /* EUC-JIS-2004 (JIS X 0213:2004) */
+  7,
+  /* plane 1 */
+  0xa1b8, 0xa1b8,
+  0xaea1, 0xfefe,	/* Kanji level 1, 2 and 3 */
+  /* plane 2 */
+  0x8fa1a1, 0x8fa1fe,	/* row 1 */
+  0x8fa3a1, 0x8fa5fe,	/* row 3 .. 5 */
+  0x8fa8a1, 0x8fa8fe,	/* row 8 */
+  0x8faca1, 0x8faffe,	/* row 12 .. 15 */
+  0x8feea1, 0x8ffef6,	/* row 78 .. 94 */
+}; /* CR_Han */
+#else
+static const OnigCodePoint CR_Han[] = {
+  /* EUC-JP (JIS X 0208 based) */
+  4,
+  0xa1b8, 0xa1b8,
+  0xb0a1, 0xcfd3,	/* Kanji level 1 */
+  0xd0a1, 0xf4a6,	/* Kanji level 2 */
+  0x8fb0a1, 0x8fedf3	/* JIS X 0212 Supplemental Kanji (row 16 .. 77) */
+}; /* CR_Han */
+#endif
 
-  PROPERTY_LIST_ADD_PROP("hiragana", CR_Hiragana);
-  PROPERTY_LIST_ADD_PROP("katakana", CR_Katakana);
-  PropertyInited = 1;
+static const OnigCodePoint CR_Latin[] = {
+  4,
+  0x0041, 0x005a,
+  0x0061, 0x007a,
+  0xa3c1, 0xa3da,
+  0xa3e1, 0xa3fa,
+  /* TODO: add raw 8 .. 11 to support EUC-JIS-2004 */
+  /* TODO: add JIS X 0212 row 9 .. 11 */
+}; /* CR_Latin */
+
+static const OnigCodePoint CR_Greek[] = {
+  2,
+  0xa6a1, 0xa6b8,
+#ifdef ENC_EUC_JIS_2004
+  0xa6c1, 0xa6d9,
+#else
+  0xa6c1, 0xa6d8,
+  /* TODO: add JIS X 0212 row 6 */
+#endif
+}; /* CR_Greek */
 
- end:
-  return r;
-}
+static const OnigCodePoint CR_Cyrillic[] = {
+  2,
+  0xa7a1, 0xa7c1,
+  0xa7d1, 0xa7f1,
+  /* TODO: add JIS X 0212 row 7 */
+}; /* CR_Cyrillic */
+
+#include "enc/jis/props.h"
 
 static int
-property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
+property_name_to_ctype(OnigEncoding enc, const UChar* p, const UChar* end)
 {
-  st_data_t ctype;
-  UChar *s, *e;
-
-  PROPERTY_LIST_INIT_CHECK;
+  const UChar *s = p, *e = end;
+  const struct enc_property *prop =
+    onig_jis_property((const char* )s, (unsigned int )(e - s));
 
-  s = e = ALLOCA_N(UChar, end-p+1);
-  for (; p < end; p++) {
-    *e++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
-  }
-
-  if (onig_st_lookup_strend(PropertyNameTable, s, e, &ctype) == 0) {
+  if (!prop) {
     return onigenc_minimum_property_name_to_ctype(enc, s, e);
   }
 
-  return (int)ctype;
+  return (int )prop->ctype;
 }
 
 static int
@@ -315,8 +529,6 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
     }
   }
   else {
-    PROPERTY_LIST_INIT_CHECK;
-
     ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
     if (ctype >= (unsigned int )PropertyListNum)
       return ONIGERR_TYPE_BUG;
@@ -337,8 +549,6 @@ get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
   else {
     *sb_out = 0x80;
 
-    PROPERTY_LIST_INIT_CHECK;
-
     ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
     if (ctype >= (OnigCtype )PropertyListNum)
       return ONIGERR_TYPE_BUG;
@@ -359,14 +569,16 @@ OnigEncodingDefine(euc_jp, EUC_JP) = {
   code_to_mbclen,
   code_to_mbc,
   mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
   property_name_to_ctype,
   is_code_ctype,
   get_ctype_code_range,
   left_adjust_char_head,
   is_allowed_reverse_match,
-  0
+  onigenc_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 /*
  * Name: EUC-JP
@@ -395,3 +607,10 @@ ENC_ALIAS("euc-jp-ms", "eucJP-ms")
  * Link: http://msyk.at.webry.info/200511/article_2.html
  */
 ENC_REPLICATE("CP51932", "EUC-JP")
+
+/*
+ * Name: EUC-JIS-2004
+ * Link: http://ja.wikipedia.org/wiki/EUC-JIS-2004
+ */
+ENC_REPLICATE("EUC-JIS-2004", "EUC-JP") /* defined at JIS X 0213:2004 */
+ENC_ALIAS("EUC-JISX0213", "EUC-JIS-2004") /* defined at JIS X 0213:2000, and obsolete at JIS X 0213:2004 */
diff --git a/enc/euc_kr.c b/enc/euc_kr.c
index af5f7828f0..21d6ab4e1c 100644
--- a/enc/euc_kr.c
+++ b/enc/euc_kr.c
@@ -187,6 +187,34 @@ OnigEncodingDefine(euc_kr, EUC_KR) = {
   euckr_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   euckr_left_adjust_char_head,
-  euckr_is_allowed_reverse_match
+  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 5fed8a893d..1c5659cb1d 100644
--- a/enc/euc_tw.c
+++ b/enc/euc_tw.c
@@ -220,6 +220,9 @@ OnigEncodingDefine(euc_tw, EUC_TW) = {
   euctw_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   euctw_left_adjust_char_head,
-  euctw_is_allowed_reverse_match
+  euctw_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("eucTW", "EUC-TW")
diff --git a/enc/gb18030.c b/enc/gb18030.c
index 36e60af6b5..63d2e633ec 100644
--- a/enc/gb18030.c
+++ b/enc/gb18030.c
@@ -596,6 +596,8 @@ OnigEncodingDefine(gb18030, GB18030) = {
   gb18030_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   gb18030_left_adjust_char_head,
-  gb18030_is_allowed_reverse_match
+  gb18030_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
-
diff --git a/enc/gb2312.c b/enc/gb2312.c
index 6fc15735fc..20c8f5b7cc 100644
--- a/enc/gb2312.c
+++ b/enc/gb2312.c
@@ -1,13 +1,11 @@
-#include <ruby/ruby.h>
-#include <ruby/encoding.h>
 #include "regenc.h"
 
 void
 Init_gb2312(void)
 {
-    rb_enc_register("GB2312", rb_enc_find("EUC-KR"));
 }
 
+ENC_REPLICATE("GB2312", "EUC-KR")
 ENC_ALIAS("EUC-CN", "GB2312")
 ENC_ALIAS("eucCN", "GB2312")
 ENC_REPLICATE("GB12345", "GB2312")
diff --git a/enc/gbk.c b/enc/gbk.c
index ace7f378af..31032553bf 100644
--- a/enc/gbk.c
+++ b/enc/gbk.c
@@ -210,7 +210,10 @@ OnigEncodingDefine(gbk, GBK) = {
   gbk_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   gbk_left_adjust_char_head,
-  gbk_is_allowed_reverse_match
+  gbk_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 /*
  * Name: GBK
diff --git a/enc/iso_2022_jp.h b/enc/iso_2022_jp.h
index 8cfad0be06..9240130166 100644
--- a/enc/iso_2022_jp.h
+++ b/enc/iso_2022_jp.h
@@ -1,11 +1,16 @@
 #include "regenc.h"
-/* dummy for unsupported, statefull encoding */
+/* dummy for unsupported, stateful encoding */
 ENC_DUMMY("ISO-2022-JP");
 ENC_ALIAS("ISO2022-JP", "ISO-2022-JP");
 ENC_REPLICATE("ISO-2022-JP-2", "ISO-2022-JP");
 ENC_ALIAS("ISO2022-JP2", "ISO-2022-JP-2");
 
-/* Windows Codepage 50220
+/*
+ * Name: CP50220
+ * MIBenum: 2260
+ * Link: http://www.iana.org/assignments/charset-reg/CP50220
+ *
+ * Windows Codepage 50220
  * a ISO-2022-JP variant.
  * This includes
  * * US-ASCII
diff --git a/enc/iso_8859.h b/enc/iso_8859.h
new file mode 100644
index 0000000000..0ec1468661
--- /dev/null
+++ b/enc/iso_8859.h
@@ -0,0 +1 @@
+#define SHARP_s 0xdf
diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c
index a10a7679b8..7af0888c3e 100644
--- a/enc/iso_8859_1.c
+++ b/enc/iso_8859_1.c
@@ -28,8 +28,7 @@
  */
 
 #include "regenc.h"
-
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+#include "iso_8859.h"
 
 #define ENC_IS_ISO_8859_1_CTYPE(code,ctype) \
   ((EncISO_8859_1_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
@@ -127,7 +126,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 )0xdf;
+      items[1].code[0] = (OnigCodePoint )SHARP_s;
       return 2;
     }
     else
@@ -141,7 +140,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 )0xdf;
+      items[1].code[0] = (OnigCodePoint )SHARP_s;
       return 2;
     }
     else
@@ -154,7 +153,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
     return 1;
   }
   else if (0xd0 <= *p && *p <= 0xdf) {
-    if (*p == 0xdf) {
+    if (*p == SHARP_s) {
       items[0].byte_len = 1;
       items[0].code_len = 2;
       items[0].code[0] = (OnigCodePoint )'s';
@@ -208,7 +207,7 @@ mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end ARG_UNUS
 {
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -228,7 +227,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag,
   int v;
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -256,6 +255,49 @@ 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 */
@@ -272,16 +314,9 @@ OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  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 1643278dfd..cae4be2db0 100644
--- a/enc/iso_8859_10.c
+++ b/enc/iso_8859_10.c
@@ -28,6 +28,7 @@
  */
 
 #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) \
@@ -110,7 +111,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -129,7 +130,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -208,21 +209,67 @@ apply_all_case_fold(OnigCaseFoldType flag,
 			       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             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)
+			   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,
+	     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 */
@@ -239,6 +286,9 @@ OnigEncodingDefine(iso_8859_10, ISO_8859_10) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ISO8859-10", "ISO-8859-10")
diff --git a/enc/iso_8859_11.c b/enc/iso_8859_11.c
index 257d9d8919..85e8f2cdb4 100644
--- a/enc/iso_8859_11.c
+++ b/enc/iso_8859_11.c
@@ -92,7 +92,10 @@ OnigEncodingDefine(iso_8859_11, ISO_8859_11) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  onigenc_single_byte_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ISO8859-11", "ISO-8859-11")
 
diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c
index f29cb2e281..fe1ddd7065 100644
--- a/enc/iso_8859_13.c
+++ b/enc/iso_8859_13.c
@@ -28,6 +28,7 @@
  */
 
 #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) \
@@ -110,7 +111,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -129,7 +130,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -158,6 +159,10 @@ 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 },
@@ -197,21 +202,69 @@ apply_all_case_fold(OnigCaseFoldType flag,
 				OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             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)
+			   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,
+	     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 */
@@ -228,16 +281,9 @@ OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  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 be83f93f80..647514a016 100644
--- a/enc/iso_8859_14.c
+++ b/enc/iso_8859_14.c
@@ -28,6 +28,7 @@
  */
 
 #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) \
@@ -110,7 +111,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -130,7 +131,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag,
   int v;
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -210,21 +211,76 @@ apply_all_case_fold(OnigCaseFoldType flag,
 				OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             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)
+			   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,
+	     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 */
@@ -241,6 +297,9 @@ OnigEncodingDefine(iso_8859_14, ISO_8859_14) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ISO8859-14", "ISO-8859-14")
diff --git a/enc/iso_8859_15.c b/enc/iso_8859_15.c
index 2ec41b66c0..377a3afc7b 100644
--- a/enc/iso_8859_15.c
+++ b/enc/iso_8859_15.c
@@ -28,6 +28,7 @@
  */
 
 #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) \
@@ -110,7 +111,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -130,7 +131,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag,
   int v;
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -204,21 +205,73 @@ apply_all_case_fold(OnigCaseFoldType flag,
 				OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             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)
+			   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,
+	     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 */
@@ -235,6 +288,9 @@ OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ISO8859-15", "ISO-8859-15")
diff --git a/enc/iso_8859_16.c b/enc/iso_8859_16.c
index 3ddc1d91c6..135630eb73 100644
--- a/enc/iso_8859_16.c
+++ b/enc/iso_8859_16.c
@@ -28,6 +28,7 @@
  */
 
 #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) \
@@ -110,7 +111,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -129,7 +130,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -206,21 +207,75 @@ apply_all_case_fold(OnigCaseFoldType flag,
 				OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             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)
+			   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,
+	     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 */
@@ -237,6 +292,9 @@ OnigEncodingDefine(iso_8859_16, ISO_8859_16) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ISO8859-16", "ISO-8859-16")
diff --git a/enc/iso_8859_2.c b/enc/iso_8859_2.c
index 6c0d2d7dc1..3a05c6320d 100644
--- a/enc/iso_8859_2.c
+++ b/enc/iso_8859_2.c
@@ -28,8 +28,7 @@
  */
 
 #include "regenc.h"
-
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+#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) \
@@ -112,7 +111,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -131,7 +130,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -221,6 +220,53 @@ 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 */
@@ -237,16 +283,9 @@ OnigEncodingDefine(iso_8859_2, ISO_8859_2) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  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 81c0c742b6..2a343eac63 100644
--- a/enc/iso_8859_3.c
+++ b/enc/iso_8859_3.c
@@ -28,6 +28,7 @@
  */
 
 #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) \
@@ -55,7 +56,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', '\271', '\272', '\273', '\274', '\255', '\256', '\277',
+  '\250', '\151', '\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',
@@ -110,7 +111,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -129,7 +130,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -160,7 +161,7 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
 static const OnigPairCaseFoldCodes CaseFoldMap[] = {
  { 0xa1, 0xb1 },
  { 0xa6, 0xb6 },
- { 0xa9, 0xb9 },
+ /*{ 0xa9, 0xb9 }, exclude dotless i/I with dot; not a case pair */
  { 0xaa, 0xba },
  { 0xab, 0xbb },
  { 0xac, 0xbc },
@@ -204,7 +205,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 		    OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             numberof(CaseFoldMap), CaseFoldMap, 1,
              flag, f, arg);
 }
 
@@ -215,10 +216,67 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     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 ((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 */
@@ -235,6 +293,9 @@ OnigEncodingDefine(iso_8859_3, ISO_8859_3) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ISO8859-3", "ISO-8859-3")
diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c
index ec71c4bcbf..e2134e8c0b 100644
--- a/enc/iso_8859_4.c
+++ b/enc/iso_8859_4.c
@@ -28,6 +28,7 @@
  */
 
 #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) \
@@ -110,7 +111,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -129,7 +130,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -166,6 +167,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = {
  { 0xab, 0xbb },
  { 0xac, 0xbc },
  { 0xae, 0xbe },
+ { 0xbd, 0xbf },
 
  { 0xc0, 0xe0 },
  { 0xc1, 0xe1 },
@@ -206,7 +208,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 		    OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             numberof(CaseFoldMap), CaseFoldMap, 1,
              flag, f, arg);
 }
 
@@ -217,10 +219,60 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     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_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 */
@@ -237,6 +289,9 @@ OnigEncodingDefine(iso_8859_4, ISO_8859_4) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ISO8859-4", "ISO-8859-4")
diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c
index 81cc8e5b32..6fafc35823 100644
--- a/enc/iso_8859_5.c
+++ b/enc/iso_8859_5.c
@@ -194,7 +194,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 		    OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             numberof(CaseFoldMap), CaseFoldMap, 0,
              flag, f, arg);
 }
 
@@ -205,10 +205,42 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     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 ((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 */
@@ -225,6 +257,9 @@ OnigEncodingDefine(iso_8859_5, ISO_8859_5) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ISO8859-5", "ISO-8859-5")
diff --git a/enc/iso_8859_6.c b/enc/iso_8859_6.c
index 7384061a1f..6d852ac8c0 100644
--- a/enc/iso_8859_6.c
+++ b/enc/iso_8859_6.c
@@ -92,7 +92,10 @@ OnigEncodingDefine(iso_8859_6, ISO_8859_6) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  onigenc_single_byte_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ISO8859-6", "ISO-8859-6")
 
diff --git a/enc/iso_8859_7.c b/enc/iso_8859_7.c
index 2f916171db..ac973f74ba 100644
--- a/enc/iso_8859_7.c
+++ b/enc/iso_8859_7.c
@@ -190,7 +190,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 		    OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             numberof(CaseFoldMap), CaseFoldMap, 0,
              flag, f, arg);
 }
 
@@ -201,10 +201,64 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     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 ((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,
@@ -222,16 +276,9 @@ OnigEncodingDefine(iso_8859_7, ISO_8859_7) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  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 bd0754c2b1..0a7a29e82e 100644
--- a/enc/iso_8859_8.c
+++ b/enc/iso_8859_8.c
@@ -92,7 +92,10 @@ OnigEncodingDefine(iso_8859_8, ISO_8859_8) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  onigenc_single_byte_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ISO8859-8", "ISO-8859-8")
 
diff --git a/enc/iso_8859_9.c b/enc/iso_8859_9.c
index 4d46e742e2..004eec310f 100644
--- a/enc/iso_8859_9.c
+++ b/enc/iso_8859_9.c
@@ -28,6 +28,7 @@
  */
 
 #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) \
@@ -61,7 +62,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', '\335', '\376', '\337',
+  '\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',
@@ -110,7 +111,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -129,7 +130,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -187,7 +188,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = {
   { 0xda, 0xfa },
   { 0xdb, 0xfb },
   { 0xdc, 0xfc },
-  { 0xdd, 0xfd },
+  /*{ 0xdd, 0xfd }, exclude dotless i/I with dot; not a case pair */
   { 0xde, 0xfe }
 };
 
@@ -197,21 +198,74 @@ apply_all_case_fold(OnigCaseFoldType flag,
 			       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             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)
+			   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,
+	     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 */
@@ -228,16 +282,9 @@ OnigEncodingDefine(iso_8859_9, ISO_8859_9) = {
   is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  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/jis/props.h.blt b/enc/jis/props.h.blt
new file mode 100644
index 0000000000..54aa94f8bc
--- /dev/null
+++ b/enc/jis/props.h.blt
@@ -0,0 +1,217 @@
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf -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.kwd  */
+
+#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-gperf@gnu.org>."
+#endif
+
+#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
+#line 1 "enc/jis/props.kwd"
+/* -*- c -*- */
+#define GPERF_DOWNCASE 1
+#define GPERF_CASE_STRNCMP 1
+
+static inline int
+gperf_case_strncmp(const char *s1, const char *s2, size_t n)
+{
+    const UChar *str = (const UChar *)s1;
+    const UChar *s = (const UChar *)s2;
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, (int)n);
+}
+
+enum onigenc_jis_ctype {
+    onigenc_jis_min = ONIGENC_MAX_STD_CTYPE,
+    onigenc_jis_hiragana,
+    onigenc_jis_katakana,
+    onigenc_jis_han,
+    onigenc_jis_latin,
+    onigenc_jis_greek,
+    onigenc_jis_cyrillic,
+    onigenc_jis_max
+};
+
+enum {PropertyListNum = onigenc_jis_max - onigenc_jis_min - 1};
+
+static const OnigCodePoint* const PropertyList[PropertyListNum] = {
+    CR_Hiragana,
+    CR_Katakana,
+    CR_Han,
+    CR_Latin,
+    CR_Greek,
+    CR_Cyrillic,
+};
+
+struct enc_property {
+    signed char name;
+    unsigned char ctype;
+};
+
+static const struct enc_property *onig_jis_property(/*const char *str, unsigned int len*/);
+#line 43 "enc/jis/props.kwd"
+struct enc_property;
+
+#define TOTAL_KEYWORDS 6
+#define MIN_WORD_LENGTH 3
+#define MAX_WORD_LENGTH 8
+#define MIN_HASH_VALUE 5
+#define MAX_HASH_VALUE 12
+/* maximum key range = 8, 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_STRNCMP
+#define GPERF_CASE_STRNCMP 1
+static int
+gperf_case_strncmp (register const char *s1, register const char *s2, register size_t n)
+{
+  for (; n > 0;)
+    {
+      unsigned char c1 = gperf_downcase[(unsigned char)*s1++];
+      unsigned char c2 = gperf_downcase[(unsigned char)*s2++];
+      if (c1 != 0 && c1 == c2)
+        {
+          n--;
+          continue;
+        }
+      return (int)c1 - (int)c2;
+    }
+  return 0;
+}
+#endif
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+onig_jis_property_hash (register const char *str, register size_t len)
+{
+  static const unsigned char asso_values[] =
+    {
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13,  3, 13,  2,
+      13,  1,  1, 13, 13,  2,  1, 13,  1, 13,
+      13, 13,  1, 13,  1, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13,  3,
+      13,  2, 13,  1,  1, 13, 13,  2,  1, 13,
+       1, 13, 13, 13,  1, 13,  1, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13
+    };
+  return (unsigned int)len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
+}
+
+struct onig_jis_property_pool_t
+  {
+    char onig_jis_property_pool_str5[sizeof("han")];
+    char onig_jis_property_pool_str7[sizeof("latin")];
+    char onig_jis_property_pool_str8[sizeof("greek")];
+    char onig_jis_property_pool_str10[sizeof("hiragana")];
+    char onig_jis_property_pool_str11[sizeof("katakana")];
+    char onig_jis_property_pool_str12[sizeof("cyrillic")];
+  };
+static const struct onig_jis_property_pool_t onig_jis_property_pool_contents =
+  {
+    "han",
+    "latin",
+    "greek",
+    "hiragana",
+    "katakana",
+    "cyrillic"
+  };
+#define onig_jis_property_pool ((const char *) &onig_jis_property_pool_contents)
+const struct enc_property *
+onig_jis_property (register const char *str, register size_t len)
+{
+  static const struct enc_property wordlist[] =
+    {
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 48 "enc/jis/props.kwd"
+      {gperf_offsetof(onig_jis_property_pool, 5),      onigenc_jis_han},
+      {-1},
+#line 49 "enc/jis/props.kwd"
+      {gperf_offsetof(onig_jis_property_pool, 7),    onigenc_jis_latin},
+#line 50 "enc/jis/props.kwd"
+      {gperf_offsetof(onig_jis_property_pool, 8),    onigenc_jis_greek},
+      {-1},
+#line 46 "enc/jis/props.kwd"
+      {gperf_offsetof(onig_jis_property_pool, 10), onigenc_jis_hiragana},
+#line 47 "enc/jis/props.kwd"
+      {gperf_offsetof(onig_jis_property_pool, 11), onigenc_jis_katakana},
+#line 51 "enc/jis/props.kwd"
+      {gperf_offsetof(onig_jis_property_pool, 12), onigenc_jis_cyrillic}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register unsigned int key = onig_jis_property_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          register int o = wordlist[key].name;
+          if (o >= 0)
+            {
+              register const char *s = o + onig_jis_property_pool;
+
+              if ((((unsigned char)*str ^ (unsigned char)*s) & ~32) == 0 && !gperf_case_strncmp (str, s, len) && s[len] == '\0')
+                return &wordlist[key];
+            }
+        }
+    }
+  return 0;
+}
+#line 52 "enc/jis/props.kwd"
+
diff --git a/enc/jis/props.kwd b/enc/jis/props.kwd
new file mode 100644
index 0000000000..659cf0aff4
--- /dev/null
+++ b/enc/jis/props.kwd
@@ -0,0 +1,52 @@
+%{/* -*- c -*- */
+#define GPERF_DOWNCASE 1
+#define GPERF_CASE_STRNCMP 1
+
+static inline int
+gperf_case_strncmp(const char *s1, const char *s2, size_t n)
+{
+    const UChar *str = (const UChar *)s1;
+    const UChar *s = (const UChar *)s2;
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, (int)n);
+}
+
+enum onigenc_jis_ctype {
+    onigenc_jis_min = ONIGENC_MAX_STD_CTYPE,
+    onigenc_jis_hiragana,
+    onigenc_jis_katakana,
+    onigenc_jis_han,
+    onigenc_jis_latin,
+    onigenc_jis_greek,
+    onigenc_jis_cyrillic,
+    onigenc_jis_max
+};
+
+enum {PropertyListNum = onigenc_jis_max - onigenc_jis_min - 1};
+
+static const OnigCodePoint* const PropertyList[PropertyListNum] = {
+    CR_Hiragana,
+    CR_Katakana,
+    CR_Han,
+    CR_Latin,
+    CR_Greek,
+    CR_Cyrillic,
+};
+
+struct enc_property {
+    signed char name;
+    unsigned char ctype;
+};
+
+static const struct enc_property *onig_jis_property(/*!ANSI{*/const char *str, unsigned int len/*}!ANSI*/);
+%}
+
+struct enc_property;
+
+%%
+hiragana, onigenc_jis_hiragana
+katakana, onigenc_jis_katakana
+han,      onigenc_jis_han
+latin,    onigenc_jis_latin
+greek,    onigenc_jis_greek
+cyrillic, onigenc_jis_cyrillic
+%%
diff --git a/enc/jis/props.src b/enc/jis/props.src
new file mode 100644
index 0000000000..659cf0aff4
--- /dev/null
+++ b/enc/jis/props.src
@@ -0,0 +1,52 @@
+%{/* -*- c -*- */
+#define GPERF_DOWNCASE 1
+#define GPERF_CASE_STRNCMP 1
+
+static inline int
+gperf_case_strncmp(const char *s1, const char *s2, size_t n)
+{
+    const UChar *str = (const UChar *)s1;
+    const UChar *s = (const UChar *)s2;
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, (int)n);
+}
+
+enum onigenc_jis_ctype {
+    onigenc_jis_min = ONIGENC_MAX_STD_CTYPE,
+    onigenc_jis_hiragana,
+    onigenc_jis_katakana,
+    onigenc_jis_han,
+    onigenc_jis_latin,
+    onigenc_jis_greek,
+    onigenc_jis_cyrillic,
+    onigenc_jis_max
+};
+
+enum {PropertyListNum = onigenc_jis_max - onigenc_jis_min - 1};
+
+static const OnigCodePoint* const PropertyList[PropertyListNum] = {
+    CR_Hiragana,
+    CR_Katakana,
+    CR_Han,
+    CR_Latin,
+    CR_Greek,
+    CR_Cyrillic,
+};
+
+struct enc_property {
+    signed char name;
+    unsigned char ctype;
+};
+
+static const struct enc_property *onig_jis_property(/*!ANSI{*/const char *str, unsigned int len/*}!ANSI*/);
+%}
+
+struct enc_property;
+
+%%
+hiragana, onigenc_jis_hiragana
+katakana, onigenc_jis_katakana
+han,      onigenc_jis_han
+latin,    onigenc_jis_latin
+greek,    onigenc_jis_greek
+cyrillic, onigenc_jis_cyrillic
+%%
diff --git a/enc/koi8_r.c b/enc/koi8_r.c
index f5b7d22349..a520975774 100644
--- a/enc/koi8_r.c
+++ b/enc/koi8_r.c
@@ -183,7 +183,7 @@ koi8_r_apply_all_case_fold(OnigCaseFoldType flag,
 			   void* arg, OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             numberof(CaseFoldMap), CaseFoldMap, 0,
              flag, f, arg);
 }
 
@@ -193,7 +193,7 @@ koi8_r_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 		  OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     numberof(CaseFoldMap), CaseFoldMap, 0,
 	     flag, p, end, items);
 }
 
@@ -213,7 +213,9 @@ OnigEncodingDefine(koi8_r, KOI8_R) = {
   koi8_r_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  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 dfbaa9ac36..50bb78bd04 100644
--- a/enc/koi8_u.c
+++ b/enc/koi8_u.c
@@ -187,7 +187,7 @@ koi8_u_apply_all_case_fold(OnigCaseFoldType flag,
 			   void* arg, OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             numberof(CaseFoldMap), CaseFoldMap, 0,
              flag, f, arg);
 }
 
@@ -197,7 +197,7 @@ koi8_u_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 		  OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     numberof(CaseFoldMap), CaseFoldMap, 0,
 	     flag, p, end, items);
 }
 
@@ -217,5 +217,8 @@ OnigEncodingDefine(koi8_u, KOI8_U) = {
   koi8_u_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  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 ed3680313f..bc0597e3f4 100755
--- a/enc/make_encmake.rb
+++ b/enc/make_encmake.rb
@@ -9,12 +9,16 @@ 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?
   case ARGV[0]
@@ -30,13 +34,98 @@ 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$/
+    module_type = :static
+    ARGV.shift
   else
     break
   end
 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.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)}}
+  encs = encs.sort_by(&ALPHANUMERIC_ORDER)
+  deps = Hash.new {[]}
+  inc_srcs = Hash.new {[]}
+  default_deps = %w[regenc.h oniguruma.h config.h defines.h]
+  encs.delete(db = "encdb")
+  encs.each do |e|
+    File.foreach("#$srcdir/#{e}.c") do |l|
+      if /^\s*#\s*include\s+(?:"([^\"]+)"|<(ruby\/\sw+.h)>)/ =~ l
+        n = $1 || $2
+        if /\.c$/ =~ n
+          inc_srcs[e] <<= $`
+          n = "enc/#{n}"
+        end
+        deps[e] <<= n unless default_deps.include?(n)
+      end
+    end
+  end
+  class << inc_srcs; self; end.class_eval do
+    define_method(:expand) do |d|
+      d.map {|n| deps[n] | self.expand(self[n])}.flatten
+    end
+  end
+  inc_srcs.each do |e, d|
+    deps[e].concat(inc_srcs.expand(d))
+  end
+  encs.unshift(db)
+  return encs, deps
+end
+
+def target_transcoders
+  atrans = []
+  trans = Dir.open($srcdir+"/trans") {|d|
+    d.select {|e|
+      if e.chomp!('.trans')
+        atrans << e
+        true
+      elsif e.chomp!('.c')
+        true
+      end
+    }
+  }
+  trans -= BUILTIN_TRANSES
+  atrans -= BUILTIN_TRANSES
+  trans.uniq!
+  atrans.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.compact!
+  trans |= atrans
+  trans.map! {|e| "trans/#{e}"}
+
+  return atrans, trans
+end
+
+# Constants that "depend" needs.
+MODULE_TYPE = module_type
+ENCS, ENC_DEPS = target_encodings
+ATRANS, TRANS = target_transcoders
+
 if File.exist?(depend = File.join($srcdir, "depend"))
-  erb = ERB.new(File.read(depend), nil, '%')
+  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+    erb = ERB.new(File.read(depend), trim_mode: '%')
+  else
+    erb = ERB.new(File.read(depend), nil, '%')
+  end
   erb.filename = depend
   tmp = erb.result(binding)
   dep = "\n#### depend ####\n\n" << depend_rules(tmp).join
@@ -48,3 +137,23 @@ mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]}
 open(ARGV[0], 'wb') {|f|
   f.puts mkin, dep
 }
+if MODULE_TYPE == :static
+  filename = "encinit.c.erb"
+  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+    erb = ERB.new(File.read(File.join($srcdir, filename)), trim_mode: '%-')
+  else
+    erb = ERB.new(File.read(File.join($srcdir, filename)), nil, '%-')
+  end
+  erb.filename = "enc/#{filename}"
+  tmp = erb.result(binding)
+  begin
+    Dir.mkdir 'enc'
+  rescue Errno::EEXIST
+  end
+  File.open("enc/encinit.c", "w") {|f|
+    f.puts "/* Automatically generated from enc/encinit.c.erb"
+    f.puts " * Do not edit."
+    f.puts " */"
+    f.puts tmp
+  }
+end
diff --git a/enc/mktable.c b/enc/mktable.c
new file mode 100644
index 0000000000..4edd5a0ff7
--- /dev/null
+++ b/enc/mktable.c
@@ -0,0 +1,1184 @@
+/**********************************************************************
+  mktable.c
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2016  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 <stdlib.h>
+#include <stdio.h>
+#include <locale.h>
+
+#ifndef __USE_ISOC99
+#define __USE_ISOC99
+#endif
+
+#include <ctype.h>
+
+#include "regenc.h"
+
+#define ASCII                0
+#define UNICODE_ISO_8859_1   1
+#define ISO_8859_1           2
+#define ISO_8859_2           3
+#define ISO_8859_3           4
+#define ISO_8859_4           5
+#define ISO_8859_5           6
+#define ISO_8859_6           7
+#define ISO_8859_7           8
+#define ISO_8859_8           9
+#define ISO_8859_9          10
+#define ISO_8859_10         11
+#define ISO_8859_11         12
+#define ISO_8859_13         13
+#define ISO_8859_14         14
+#define ISO_8859_15         15
+#define ISO_8859_16         16
+#define KOI8                17
+#define KOI8_R              18
+
+typedef struct {
+  int   num;
+  const char* name;
+} ENC_INFO;
+
+static ENC_INFO Info[] = {
+  { ASCII,               "ASCII" },
+  { UNICODE_ISO_8859_1,  "UNICODE_ISO_8859_1"  },
+  { ISO_8859_1,  "ISO_8859_1"  },
+  { ISO_8859_2,  "ISO_8859_2"  },
+  { ISO_8859_3,  "ISO_8859_3"  },
+  { ISO_8859_4,  "ISO_8859_4"  },
+  { ISO_8859_5,  "ISO_8859_5"  },
+  { ISO_8859_6,  "ISO_8859_6"  },
+  { ISO_8859_7,  "ISO_8859_7"  },
+  { ISO_8859_8,  "ISO_8859_8"  },
+  { ISO_8859_9,  "ISO_8859_9"  },
+  { ISO_8859_10, "ISO_8859_10" },
+  { ISO_8859_11, "ISO_8859_11" },
+  { ISO_8859_13, "ISO_8859_13" },
+  { ISO_8859_14, "ISO_8859_14" },
+  { ISO_8859_15, "ISO_8859_15" },
+  { ISO_8859_16, "ISO_8859_16" },
+  { KOI8,        "KOI8" },
+  { KOI8_R,      "KOI8_R" }
+};
+
+
+static int IsAlpha(int enc, int c)
+{
+  if (enc == ASCII)
+    return isalpha(c);
+
+  if (c >= 0x41 && c <= 0x5a) return 1;
+  if (c >= 0x61 && c <= 0x7a) return 1;
+
+  switch (enc) {
+  case UNICODE_ISO_8859_1:
+  case ISO_8859_1:
+  case ISO_8859_9:
+    if (c == 0xaa) return 1;
+    if (c == 0xb5) return 1;
+    if (c == 0xba) return 1;
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xff) return 1;
+    break;
+
+  case ISO_8859_2:
+    if (c == 0xa1 || c == 0xa3) return 1;
+    if (c == 0xa5 || c == 0xa6) return 1;
+    if (c >= 0xa9 && c <= 0xac) return 1;
+    if (c >= 0xae && c <= 0xaf) return 1;
+    if (c == 0xb1 || c == 0xb3) return 1;
+    if (c == 0xb5 || c == 0xb6) return 1;
+    if (c >= 0xb9 && c <= 0xbc) return 1;
+    if (c >= 0xbe && c <= 0xbf) return 1;
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_3:
+    if (c == 0xa1) return 1;
+    if (c == 0xa6) return 1;
+    if (c >= 0xa9 && c <= 0xac) return 1;
+    if (c == 0xaf) return 1;
+    if (c == 0xb1) return 1;
+    if (c == 0xb5 || c == 0xb6) return 1;
+    if (c >= 0xb9 && c <= 0xbc) return 1;
+    if (c == 0xbf) return 1;
+    if (c >= 0xc0 && c <= 0xc2) return 1;
+    if (c >= 0xc4 && c <= 0xcf) return 1;
+    if (c >= 0xd1 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xe2) return 1;
+    if (c >= 0xe4 && c <= 0xef) return 1;
+    if (c >= 0xf1 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_4:
+    if (c >= 0xa1 && c <= 0xa3) return 1;
+    if (c == 0xa5 || c == 0xa6) return 1;
+    if (c >= 0xa9 && c <= 0xac) return 1;
+    if (c == 0xae) return 1;
+    if (c == 0xb1 || c == 0xb3) return 1;
+    if (c == 0xb5 || c == 0xb6) return 1;
+    if (c >= 0xb9 && c <= 0xbf) return 1;
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_5:
+    if (c >= 0xa1 && c <= 0xcf && c != 0xad) return 1;
+    if (c >= 0xd0 && c <= 0xff && c != 0xf0 && c != 0xfd) return 1;
+    break;
+
+  case ISO_8859_6:
+    if (c >= 0xc1 && c <= 0xda) return 1;
+    if (c >= 0xe0 && c <= 0xf2) return 1;
+    break;
+
+  case ISO_8859_7:
+    if (c == 0xb6) return 1;
+    if (c >= 0xb8 && c <= 0xba) return 1;
+    if (c == 0xbc) return 1;
+    if (c >= 0xbe && c <= 0xbf) return 1;
+    if (c == 0xc0) return 1;
+    if (c >= 0xc1 && c <= 0xdb && c != 0xd2) return 1;
+    if (c >= 0xdc && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_8:
+    if (c == 0xb5) return 1;
+    if (c >= 0xe0 && c <= 0xfa) return 1;
+    break;
+
+  case ISO_8859_10:
+    if (c >= 0xa1 && c <= 0xa6) return 1;
+    if (c >= 0xa8 && c <= 0xac) return 1;
+    if (c == 0xae || c == 0xaf) return 1;
+    if (c >= 0xb1 && c <= 0xb6) return 1;
+    if (c >= 0xb8 && c <= 0xbc) return 1;
+    if (c >= 0xbe && c <= 0xff) return 1;
+    break;
+
+  case ISO_8859_11:
+    if (c >= 0xa1 && c <= 0xda) return 1;
+    if (c >= 0xdf && c <= 0xfb) return 1;
+    break;
+
+  case ISO_8859_13:
+    if (c == 0xa8) return 1;
+    if (c == 0xaa) return 1;
+    if (c == 0xaf) return 1;
+    if (c == 0xb5) return 1;
+    if (c == 0xb8) return 1;
+    if (c == 0xba) return 1;
+    if (c >= 0xbf && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_14:
+    if (c == 0xa1 || c == 0xa2) return 1;
+    if (c == 0xa4 || c == 0xa5) return 1;
+    if (c == 0xa6 || c == 0xa8) return 1;
+    if (c >= 0xaa && c <= 0xac) return 1;
+    if (c >= 0xaf && c <= 0xb5) return 1;
+    if (c >= 0xb7 && c <= 0xff) return 1;
+    break;
+
+  case ISO_8859_15:
+    if (c == 0xaa) return 1;
+    if (c == 0xb5) return 1;
+    if (c == 0xba) return 1;
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xff) return 1;
+    if (c == 0xa6) return 1;
+    if (c == 0xa8) return 1;
+    if (c == 0xb4) return 1;
+    if (c == 0xb8) return 1;
+    if (c == 0xbc) return 1;
+    if (c == 0xbd) return 1;
+    if (c == 0xbe) return 1;
+    break;
+
+  case ISO_8859_16:
+    if (c == 0xa1) return 1;
+    if (c == 0xa2) return 1;
+    if (c == 0xa3) return 1;
+    if (c == 0xa6) return 1;
+    if (c == 0xa8) return 1;
+    if (c == 0xaa) return 1;
+    if (c == 0xac) return 1;
+    if (c == 0xae) return 1;
+    if (c == 0xaf) return 1;
+    if (c == 0xb2) return 1;
+    if (c == 0xb3) return 1;
+    if (c == 0xb4) return 1;
+    if (c >= 0xb8 && c <= 0xba) return 1;
+    if (c == 0xbc) return 1;
+    if (c == 0xbd) return 1;
+    if (c == 0xbe) return 1;
+    if (c == 0xbf) return 1;
+    if (c >= 0xc0 && c <= 0xde) return 1;
+    if (c >= 0xdf && c <= 0xff) return 1;
+    break;
+
+  case KOI8_R:
+    if (c == 0xa3 || c == 0xb3) return 1;
+    /* fall */
+  case KOI8:
+    if (c >= 0xc0 && c <= 0xff) return 1;
+    break;
+
+  default:
+    exit(-1);
+  }
+
+  return 0;
+}
+
+static int IsBlank(int enc, int c)
+{
+  if (enc == ASCII)
+    return isblank(c);
+
+  if (c == 0x09	|| c == 0x20) return 1;
+
+  switch (enc) {
+  case UNICODE_ISO_8859_1:
+  case ISO_8859_1:
+  case ISO_8859_2:
+  case ISO_8859_3:
+  case ISO_8859_4:
+  case ISO_8859_5:
+  case ISO_8859_6:
+  case ISO_8859_7:
+  case ISO_8859_8:
+  case ISO_8859_9:
+  case ISO_8859_10:
+  case ISO_8859_11:
+  case ISO_8859_13:
+  case ISO_8859_14:
+  case ISO_8859_15:
+  case ISO_8859_16:
+  case KOI8:
+    if (c == 0xa0) return 1;
+    break;
+
+  case KOI8_R:
+    if (c == 0x9a) return 1;
+    break;
+
+  default:
+    exit(-1);
+  }
+
+  return 0;
+}
+
+static int IsCntrl(int enc, int c)
+{
+  if (enc == ASCII)
+    return iscntrl(c);
+
+  if (c >= 0x00	&& c <= 0x1F) return 1;
+
+  switch (enc) {
+  case UNICODE_ISO_8859_1:
+    if (c == 0xad) return 1;
+    /* fall */
+  case ISO_8859_1:
+  case ISO_8859_2:
+  case ISO_8859_3:
+  case ISO_8859_4:
+  case ISO_8859_5:
+  case ISO_8859_6:
+  case ISO_8859_7:
+  case ISO_8859_8:
+  case ISO_8859_9:
+  case ISO_8859_10:
+  case ISO_8859_11:
+  case ISO_8859_13:
+  case ISO_8859_14:
+  case ISO_8859_15:
+  case ISO_8859_16:
+  case KOI8:
+    if (c >= 0x7f && c <= 0x9F) return 1;
+    break;
+
+
+  case KOI8_R:
+    if (c == 0x7f) return 1;
+    break;
+
+  default:
+    exit(-1);
+  }
+
+  return 0;
+}
+
+static int IsDigit(int enc ARG_UNUSED, int c)
+{
+  if (c >= 0x30 && c <= 0x39) return 1;
+  return 0;
+}
+
+static int IsGraph(int enc, int c)
+{
+  if (enc == ASCII)
+    return isgraph(c);
+
+  if (c >= 0x21 && c <= 0x7e) return 1;
+
+  switch (enc) {
+  case UNICODE_ISO_8859_1:
+  case ISO_8859_1:
+  case ISO_8859_2:
+  case ISO_8859_4:
+  case ISO_8859_5:
+  case ISO_8859_9:
+  case ISO_8859_10:
+  case ISO_8859_13:
+  case ISO_8859_14:
+  case ISO_8859_15:
+  case ISO_8859_16:
+    if (c >= 0xa1 && c <= 0xff) return 1;
+    break;
+
+  case ISO_8859_3:
+    if (c >= 0xa1) {
+      if (c == 0xa5 || c == 0xae || c == 0xbe || c == 0xc3 || c == 0xd0 ||
+	  c == 0xe3 || c == 0xf0)
+	return 0;
+      else
+	return 1;
+    }
+    break;
+
+  case ISO_8859_6:
+    if (c == 0xa4 || c == 0xac || c == 0xad || c == 0xbb || c == 0xbf)
+      return 1;
+    if (c >= 0xc1 && c <= 0xda) return 1;
+    if (c >= 0xe0 && c <= 0xf2) return 1;
+    break;
+
+  case ISO_8859_7:
+    if (c >= 0xa1 && c <= 0xfe &&
+	c != 0xa4 && c != 0xa5 && c != 0xaa &&
+	c != 0xae && c != 0xd2) return 1;
+    break;
+
+  case ISO_8859_8:
+    if (c >= 0xa2 && c <= 0xfa) {
+      if (c >= 0xbf && c <= 0xde) return 0;
+      return 1;
+    }
+    break;
+
+  case ISO_8859_11:
+    if (c >= 0xa1 && c <= 0xda) return 1;
+    if (c >= 0xdf && c <= 0xfb) return 1;
+    break;
+
+  case KOI8:
+    if (c >= 0xc0 && c <= 0xff) return 1;
+    break;
+
+  case KOI8_R:
+    if (c >= 0x80 && c <= 0xff && c != 0x9a) return 1;
+    break;
+
+  default:
+    exit(-1);
+  }
+
+  return 0;
+}
+
+static int IsLower(int enc, int c)
+{
+  if (enc == ASCII)
+    return islower(c);
+
+  if (c >= 0x61 && c <= 0x7a) return 1;
+
+  switch (enc) {
+  case UNICODE_ISO_8859_1:
+  case ISO_8859_1:
+  case ISO_8859_9:
+    if (c == 0xaa) return 1;
+    if (c == 0xb5) return 1;
+    if (c == 0xba) return 1;
+    if (c >= 0xdf && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xff) return 1;
+    break;
+
+  case ISO_8859_2:
+    if (c == 0xb1 || c == 0xb3) return 1;
+    if (c == 0xb5 || c == 0xb6) return 1;
+    if (c >= 0xb9 && c <= 0xbc) return 1;
+    if (c >= 0xbe && c <= 0xbf) return 1;
+    if (c >= 0xdf && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_3:
+    if (c == 0xb1) return 1;
+    if (c == 0xb5 || c == 0xb6) return 1;
+    if (c >= 0xb9 && c <= 0xbc) return 1;
+    if (c == 0xbf) return 1;
+    if (c == 0xdf) return 1;
+    if (c >= 0xe0 && c <= 0xe2) return 1;
+    if (c >= 0xe4 && c <= 0xef) return 1;
+    if (c >= 0xf1 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_4:
+    if (c == 0xa2) return 1;
+    if (c == 0xb1 || c == 0xb3) return 1;
+    if (c == 0xb5 || c == 0xb6) return 1;
+    if (c >= 0xb9 && c <= 0xbc) return 1;
+    if (c >= 0xbe && c <= 0xbf) return 1;
+    if (c == 0xdf) return 1;
+    if (c >= 0xe0 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_5:
+    if (c >= 0xd0 && c <= 0xff && c != 0xf0 && c != 0xfd) return 1;
+    break;
+
+  case ISO_8859_6:
+    break;
+
+  case ISO_8859_7:
+    if (c == 0xc0) return 1;
+    if (c >= 0xdc && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_8:
+    if (c == 0xb5) return 1;
+    break;
+
+  case ISO_8859_10:
+    if (c >= 0xb1 && c <= 0xb6) return 1;
+    if (c >= 0xb8 && c <= 0xbc) return 1;
+    if (c == 0xbe || c == 0xbf) return 1;
+    if (c >= 0xdf && c <= 0xff) return 1;
+    break;
+
+  case ISO_8859_11:
+    break;
+
+  case ISO_8859_13:
+    if (c == 0xb5) return 1;
+    if (c == 0xb8) return 1;
+    if (c == 0xba) return 1;
+    if (c == 0xbf) return 1;
+    if (c >= 0xdf && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_14:
+    if (c == 0xa2) return 1;
+    if (c == 0xa5) return 1;
+    if (c == 0xab) return 1;
+    if (c == 0xb1 || c == 0xb3 || c == 0xb5) return 1;
+    if (c >= 0xb8 && c <= 0xba) return 1;
+    if (c == 0xbc) return 1;
+    if (c == 0xbe || c == 0xbf) return 1;
+    if (c >= 0xdf && c <= 0xff) return 1;
+    break;
+
+  case ISO_8859_15:
+    if (c == 0xaa) return 1;
+    if (c == 0xb5) return 1;
+    if (c == 0xba) return 1;
+    if (c >= 0xdf && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xff) return 1;
+    if (c == 0xa8) return 1;
+    if (c == 0xb8) return 1;
+    if (c == 0xbd) return 1;
+    break;
+
+  case ISO_8859_16:
+    if (c == 0xa2) return 1;
+    if (c == 0xa8) return 1;
+    if (c == 0xae) return 1;
+    if (c == 0xb3) return 1;
+    if (c >= 0xb8 && c <= 0xba) return 1;
+    if (c == 0xbd) return 1;
+    if (c == 0xbf) return 1;
+    if (c >= 0xdf && c <= 0xff) return 1;
+    break;
+
+  case KOI8_R:
+    if (c == 0xa3) return 1;
+    /* fall */
+  case KOI8:
+    if (c >= 0xc0 && c <= 0xdf) return 1;
+    break;
+
+  default:
+    exit(-1);
+  }
+
+  return 0;
+}
+
+static int IsPrint(int enc, int c)
+{
+  if (enc == ASCII)
+    return isprint(c);
+
+  if (c >= 0x20 && c <= 0x7e) return 1;
+
+  switch (enc) {
+  case UNICODE_ISO_8859_1:
+    /* if (c >= 0x09 && c <= 0x0d) return 1; */
+    if (c == 0x85) return 1;
+    /* fall */
+  case ISO_8859_1:
+  case ISO_8859_2:
+  case ISO_8859_4:
+  case ISO_8859_5:
+  case ISO_8859_9:
+  case ISO_8859_10:
+  case ISO_8859_13:
+  case ISO_8859_14:
+  case ISO_8859_15:
+  case ISO_8859_16:
+    if (c >= 0xa0 && c <= 0xff) return 1;
+    break;
+
+  case ISO_8859_3:
+    if (c >= 0xa0) {
+      if (c == 0xa5 || c == 0xae || c == 0xbe || c == 0xc3 || c == 0xd0 ||
+	  c == 0xe3 || c == 0xf0)
+	return 0;
+      else
+	return 1;
+    }
+    break;
+
+  case ISO_8859_6:
+    if (c == 0xa0) return 1;
+    if (c == 0xa4 || c == 0xac || c == 0xad || c == 0xbb || c == 0xbf)
+      return 1;
+    if (c >= 0xc1 && c <= 0xda) return 1;
+    if (c >= 0xe0 && c <= 0xf2) return 1;
+    break;
+
+  case ISO_8859_7:
+    if (c >= 0xa0 && c <= 0xfe &&
+	c != 0xa4 && c != 0xa5 && c != 0xaa &&
+	c != 0xae && c != 0xd2) return 1;
+    break;
+
+  case ISO_8859_8:
+    if (c >= 0xa0 && c <= 0xfa) {
+      if (c >= 0xbf && c <= 0xde) return 0;
+      if (c == 0xa1) return 0;
+      return 1;
+    }
+    break;
+
+  case ISO_8859_11:
+    if (c >= 0xa0 && c <= 0xda) return 1;
+    if (c >= 0xdf && c <= 0xfb) return 1;
+    break;
+
+  case KOI8:
+    if (c == 0xa0) return 1;
+    if (c >= 0xc0 && c <= 0xff) return 1;
+    break;
+
+  case KOI8_R:
+    if (c >= 0x80 && c <= 0xff) return 1;
+    break;
+
+  default:
+    exit(-1);
+  }
+
+  return 0;
+}
+
+static int IsPunct(int enc, int c)
+{
+  if (enc == ASCII)
+    return ispunct(c);
+
+  if (enc == UNICODE_ISO_8859_1) {
+    if (c == 0x24 || c == 0x2b || c == 0x5e || c == 0x60 ||
+        c == 0x7c || c == 0x7e) return 1;
+    if (c >= 0x3c && c <= 0x3e) return 1;
+  }
+
+  if (c >= 0x21 && c <= 0x2f) return 1;
+  if (c >= 0x3a && c <= 0x40) return 1;
+  if (c >= 0x5b && c <= 0x60) return 1;
+  if (c >= 0x7b && c <= 0x7e) return 1;
+
+  switch (enc) {
+  case ISO_8859_1:
+  case ISO_8859_9:
+  case ISO_8859_15:
+    if (c == 0xad) return 1;
+    /* fall */
+  case UNICODE_ISO_8859_1:
+    if (c == 0xa1) return 1;
+    if (c == 0xab) return 1;
+    if (c == 0xb7) return 1;
+    if (c == 0xbb) return 1;
+    if (c == 0xbf) return 1;
+    break;
+
+  case ISO_8859_2:
+  case ISO_8859_4:
+  case ISO_8859_5:
+  case ISO_8859_14:
+    if (c == 0xad) return 1;
+    break;
+
+  case ISO_8859_3:
+  case ISO_8859_10:
+    if (c == 0xad) return 1;
+    if (c == 0xb7) return 1;
+    if (c == 0xbd) return 1;
+    break;
+
+  case ISO_8859_6:
+    if (c == 0xac) return 1;
+    if (c == 0xad) return 1;
+    if (c == 0xbb) return 1;
+    if (c == 0xbf) return 1;
+    break;
+
+  case ISO_8859_7:
+    if (c == 0xa1 || c == 0xa2) return 1;
+    if (c == 0xab) return 1;
+    if (c == 0xaf) return 1;
+    if (c == 0xad) return 1;
+    if (c == 0xb7 || c == 0xbb) return 1;
+    break;
+
+  case ISO_8859_8:
+    if (c == 0xab) return 1;
+    if (c == 0xad) return 1;
+    if (c == 0xb7) return 1;
+    if (c == 0xbb) return 1;
+    if (c == 0xdf) return 1;
+    break;
+
+  case ISO_8859_13:
+    if (c == 0xa1 || c == 0xa5) return 1;
+    if (c == 0xab || c == 0xad) return 1;
+    if (c == 0xb4 || c == 0xb7) return 1;
+    if (c == 0xbb) return 1;
+    if (c == 0xff) return 1;
+    break;
+
+  case ISO_8859_16:
+    if (c == 0xa5) return 1;
+    if (c == 0xab) return 1;
+    if (c == 0xad) return 1;
+    if (c == 0xb5) return 1;
+    if (c == 0xb7) return 1;
+    if (c == 0xbb) return 1;
+    break;
+
+  case KOI8_R:
+    if (c == 0x9e) return 1;
+    break;
+
+  case ISO_8859_11:
+  case KOI8:
+    break;
+
+  default:
+    exit(-1);
+  }
+
+  return 0;
+}
+
+static int IsSpace(int enc, int c)
+{
+  if (enc == ASCII)
+    return isspace(c);
+
+  if (c >= 0x09 && c <= 0x0d) return 1;
+  if (c == 0x20) return 1;
+
+  switch (enc) {
+  case UNICODE_ISO_8859_1:
+    if (c == 0x85) return 1;
+    /* fall */
+  case ISO_8859_1:
+  case ISO_8859_2:
+  case ISO_8859_3:
+  case ISO_8859_4:
+  case ISO_8859_5:
+  case ISO_8859_6:
+  case ISO_8859_7:
+  case ISO_8859_8:
+  case ISO_8859_9:
+  case ISO_8859_10:
+  case ISO_8859_11:
+  case ISO_8859_13:
+  case ISO_8859_14:
+  case ISO_8859_15:
+  case ISO_8859_16:
+  case KOI8:
+    if (c == 0xa0) return 1;
+    break;
+
+  case KOI8_R:
+    if (c == 0x9a) return 1;
+    break;
+
+  default:
+    exit(-1);
+  }
+
+  return 0;
+}
+
+static int IsUpper(int enc, int c)
+{
+  if (enc == ASCII)
+    return isupper(c);
+
+  if (c >= 0x41 && c <= 0x5a) return 1;
+
+  switch (enc) {
+  case UNICODE_ISO_8859_1:
+  case ISO_8859_1:
+  case ISO_8859_9:
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xde) return 1;
+    break;
+
+  case ISO_8859_2:
+    if (c == 0xa1 || c == 0xa3) return 1;
+    if (c == 0xa5 || c == 0xa6) return 1;
+    if (c >= 0xa9 && c <= 0xac) return 1;
+    if (c >= 0xae && c <= 0xaf) return 1;
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xde) return 1;
+    break;
+
+  case ISO_8859_3:
+    if (c == 0xa1) return 1;
+    if (c == 0xa6) return 1;
+    if (c >= 0xa9 && c <= 0xac) return 1;
+    if (c == 0xaf) return 1;
+    if (c >= 0xc0 && c <= 0xc2) return 1;
+    if (c >= 0xc4 && c <= 0xcf) return 1;
+    if (c >= 0xd1 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xde) return 1;
+    break;
+
+  case ISO_8859_4:
+    if (c == 0xa1 || c == 0xa3) return 1;
+    if (c == 0xa5 || c == 0xa6) return 1;
+    if (c >= 0xa9 && c <= 0xac) return 1;
+    if (c == 0xae) return 1;
+    if (c == 0xbd) return 1;
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xde) return 1;
+    break;
+
+  case ISO_8859_5:
+    if (c >= 0xa1 && c <= 0xcf && c != 0xad) return 1;
+    break;
+
+  case ISO_8859_6:
+    break;
+
+  case ISO_8859_7:
+    if (c == 0xb6) return 1;
+    if (c >= 0xb8 && c <= 0xba) return 1;
+    if (c == 0xbc) return 1;
+    if (c >= 0xbe && c <= 0xbf) return 1;
+    if (c >= 0xc1 && c <= 0xdb && c != 0xd2) return 1;
+    break;
+
+  case ISO_8859_8:
+  case ISO_8859_11:
+    break;
+
+  case ISO_8859_10:
+    if (c >= 0xa1 && c <= 0xa6) return 1;
+    if (c >= 0xa8 && c <= 0xac) return 1;
+    if (c == 0xae || c == 0xaf) return 1;
+    if (c >= 0xc0 && c <= 0xde) return 1;
+    break;
+
+  case ISO_8859_13:
+    if (c == 0xa8) return 1;
+    if (c == 0xaa) return 1;
+    if (c == 0xaf) return 1;
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xde) return 1;
+    break;
+
+  case ISO_8859_14:
+    if (c == 0xa1) return 1;
+    if (c == 0xa4 || c == 0xa6) return 1;
+    if (c == 0xa8) return 1;
+    if (c == 0xaa || c == 0xac) return 1;
+    if (c == 0xaf || c == 0xb0) return 1;
+    if (c == 0xb2 || c == 0xb4 || c == 0xb7) return 1;
+    if (c == 0xbb || c == 0xbd) return 1;
+    if (c >= 0xc0 && c <= 0xde) return 1;
+    break;
+
+  case ISO_8859_15:
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xde) return 1;
+    if (c == 0xa6) return 1;
+    if (c == 0xb4) return 1;
+    if (c == 0xbc) return 1;
+    if (c == 0xbe) return 1;
+    break;
+
+  case ISO_8859_16:
+    if (c == 0xa1) return 1;
+    if (c == 0xa3) return 1;
+    if (c == 0xa6) return 1;
+    if (c == 0xaa) return 1;
+    if (c == 0xac) return 1;
+    if (c == 0xaf) return 1;
+    if (c == 0xb2) return 1;
+    if (c == 0xb4) return 1;
+    if (c == 0xbc) return 1;
+    if (c == 0xbe) return 1;
+    if (c >= 0xc0 && c <= 0xde) return 1;
+    break;
+
+  case KOI8_R:
+    if (c == 0xb3) return 1;
+    /* fall */
+  case KOI8:
+    if (c >= 0xe0 && c <= 0xff) return 1;
+    break;
+
+  default:
+    exit(-1);
+  }
+
+  return 0;
+}
+
+static int IsXDigit(int enc, int c)
+{
+  if (enc == ASCII)
+    return isxdigit(c);
+
+  if (c >= 0x30 && c <= 0x39) return 1;
+  if (c >= 0x41 && c <= 0x46) return 1;
+  if (c >= 0x61 && c <= 0x66) return 1;
+  return 0;
+}
+
+static int IsWord(int enc, int c)
+{
+  if (enc == ASCII) {
+    return (isalpha(c) || isdigit(c) || c == 0x5f);
+  }
+
+  if (c >= 0x30 && c <= 0x39) return 1;
+  if (c >= 0x41 && c <= 0x5a) return 1;
+  if (c == 0x5f) return 1;
+  if (c >= 0x61 && c <= 0x7a) return 1;
+
+  switch (enc) {
+  case UNICODE_ISO_8859_1:
+  case ISO_8859_1:
+  case ISO_8859_9:
+    if (c == 0xaa) return 1;
+    if (c >= 0xb2 && c <= 0xb3) return 1;
+    if (c == 0xb5) return 1;
+    if (c >= 0xb9 && c <= 0xba) return 1;
+    if (c >= 0xbc && c <= 0xbe) return 1;
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xff) return 1;
+    break;
+
+  case ISO_8859_2:
+    if (c == 0xa1 || c == 0xa3) return 1;
+    if (c == 0xa5 || c == 0xa6) return 1;
+    if (c >= 0xa9 && c <= 0xac) return 1;
+    if (c >= 0xae && c <= 0xaf) return 1;
+    if (c == 0xb1 || c == 0xb3) return 1;
+    if (c == 0xb5 || c == 0xb6) return 1;
+    if (c >= 0xb9 && c <= 0xbc) return 1;
+    if (c >= 0xbe && c <= 0xbf) return 1;
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_3:
+    if (c == 0xa1) return 1;
+    if (c == 0xa6) return 1;
+    if (c >= 0xa9 && c <= 0xac) return 1;
+    if (c == 0xaf) return 1;
+    if (c >= 0xb1 && c <= 0xb3) return 1;
+    if (c == 0xb5 || c == 0xb6) return 1;
+    if (c >= 0xb9 && c <= 0xbd) return 1;
+    if (c == 0xbf) return 1;
+    if (c >= 0xc0 && c <= 0xc2) return 1;
+    if (c >= 0xc4 && c <= 0xcf) return 1;
+    if (c >= 0xd1 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xe2) return 1;
+    if (c >= 0xe4 && c <= 0xef) return 1;
+    if (c >= 0xf1 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_4:
+    if (c >= 0xa1 && c <= 0xa3) return 1;
+    if (c == 0xa5 || c == 0xa6) return 1;
+    if (c >= 0xa9 && c <= 0xac) return 1;
+    if (c == 0xae) return 1;
+    if (c == 0xb1 || c == 0xb3) return 1;
+    if (c == 0xb5 || c == 0xb6) return 1;
+    if (c >= 0xb9 && c <= 0xbf) return 1;
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_5:
+    if (c >= 0xa1 && c <= 0xcf && c != 0xad) return 1;
+    if (c >= 0xd0 && c <= 0xff && c != 0xf0 && c != 0xfd) return 1;
+    break;
+
+  case ISO_8859_6:
+    if (c >= 0xc1 && c <= 0xda) return 1;
+    if (c >= 0xe0 && c <= 0xea) return 1;
+    if (c >= 0xeb && c <= 0xf2) return 1;
+    break;
+
+  case ISO_8859_7:
+    if (c == 0xb2 || c == 0xb3) return 1;
+    if (c == 0xb6) return 1;
+    if (c >= 0xb8 && c <= 0xba) return 1;
+    if (c >= 0xbc && c <= 0xbf) return 1;
+    if (c == 0xc0) return 1;
+    if (c >= 0xc1 && c <= 0xdb && c != 0xd2) return 1;
+    if (c >= 0xdc && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_8:
+    if (c == 0xb2 || c == 0xb3 || c == 0xb5 || c == 0xb9) return 1;
+    if (c >= 0xbc && c <= 0xbe) return 1;
+    if (c >= 0xe0 && c <= 0xfa) return 1;
+    break;
+
+  case ISO_8859_10:
+    if (c >= 0xa1 && c <= 0xff) {
+      if (c != 0xa7 && c != 0xad && c != 0xb0 && c != 0xb7 && c != 0xbd)
+	return 1;
+    }
+    break;
+
+  case ISO_8859_11:
+    if (c >= 0xa1 && c <= 0xda) return 1;
+    if (c >= 0xdf && c <= 0xfb) return 1;
+    break;
+
+  case ISO_8859_13:
+    if (c == 0xa8) return 1;
+    if (c == 0xaa) return 1;
+    if (c == 0xaf) return 1;
+    if (c == 0xb2 || c == 0xb3 || c == 0xb5 || c == 0xb9) return 1;
+    if (c >= 0xbc && c <= 0xbe) return 1;
+    if (c == 0xb8) return 1;
+    if (c == 0xba) return 1;
+    if (c >= 0xbf && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xfe) return 1;
+    break;
+
+  case ISO_8859_14:
+    if (c >= 0xa1 && c <= 0xff) {
+      if (c == 0xa3 || c == 0xa7 || c == 0xa9 || c == 0xad || c == 0xae ||
+	  c == 0xb6) return 0;
+      return 1;
+    }
+    break;
+
+  case ISO_8859_15:
+    if (c == 0xaa) return 1;
+    if (c >= 0xb2 && c <= 0xb3) return 1;
+    if (c == 0xb5) return 1;
+    if (c >= 0xb9 && c <= 0xba) return 1;
+    if (c >= 0xbc && c <= 0xbe) return 1;
+    if (c >= 0xc0 && c <= 0xd6) return 1;
+    if (c >= 0xd8 && c <= 0xf6) return 1;
+    if (c >= 0xf8 && c <= 0xff) return 1;
+    if (c == 0xa6) return 1;
+    if (c == 0xa8) return 1;
+    if (c == 0xb4) return 1;
+    if (c == 0xb8) return 1;
+    break;
+
+  case ISO_8859_16:
+    if (c == 0xa1) return 1;
+    if (c == 0xa2) return 1;
+    if (c == 0xa3) return 1;
+    if (c == 0xa6) return 1;
+    if (c == 0xa8) return 1;
+    if (c == 0xaa) return 1;
+    if (c == 0xac) return 1;
+    if (c == 0xae) return 1;
+    if (c == 0xaf) return 1;
+    if (c == 0xb2) return 1;
+    if (c == 0xb3) return 1;
+    if (c == 0xb4) return 1;
+    if (c >= 0xb8 && c <= 0xba) return 1;
+    if (c == 0xbc) return 1;
+    if (c == 0xbd) return 1;
+    if (c == 0xbe) return 1;
+    if (c == 0xbf) return 1;
+    if (c >= 0xc0 && c <= 0xde) return 1;
+    if (c >= 0xdf && c <= 0xff) return 1;
+    break;
+
+  case KOI8_R:
+    if (c == 0x9d) return 1;
+    if (c == 0xa3 || c == 0xb3) return 1;
+    /* fall */
+  case KOI8:
+    if (c >= 0xc0 && c <= 0xff) return 1;
+    break;
+
+  default:
+    exit(-1);
+  }
+
+  return 0;
+}
+
+static int IsAscii(int enc ARG_UNUSED, int c)
+{
+  if (c >= 0x00 && c <= 0x7f) return 1;
+  return 0;
+}
+
+static int IsNewline(int enc ARG_UNUSED, int c)
+{
+  if (c == 0x0a) return 1;
+  return 0;
+}
+
+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;
+
+  for (c = 0; c < 256; c++) {
+    val = 0;
+    if (IsNewline(enc, c))  val |= BIT_CTYPE_NEWLINE;
+    if (IsAlpha (enc, c))   val |= (BIT_CTYPE_ALPHA | BIT_CTYPE_ALNUM);
+    if (IsBlank (enc, c))   val |= BIT_CTYPE_BLANK;
+    if (IsCntrl (enc, c))   val |= BIT_CTYPE_CNTRL;
+    if (IsDigit (enc, c))   val |= (BIT_CTYPE_DIGIT | BIT_CTYPE_ALNUM);
+    if (IsGraph (enc, c))   val |= BIT_CTYPE_GRAPH;
+    if (IsLower (enc, c))   val |= BIT_CTYPE_LOWER;
+    if (IsPrint (enc, c))   val |= BIT_CTYPE_PRINT;
+    if (IsPunct (enc, c))   val |= BIT_CTYPE_PUNCT;
+    if (IsSpace (enc, c))   val |= BIT_CTYPE_SPACE;
+    if (IsUpper (enc, c))   val |= BIT_CTYPE_UPPER;
+    if (IsXDigit(enc, c))   val |= BIT_CTYPE_XDIGIT;
+    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 != 0 && c % NCOL == (NCOL-1))
+      r = fputs("\n", fp);
+    else
+      r = fputs(" ", fp);
+
+    if (r < 0) return -1;
+  }
+  r = fprintf(fp, "};\n");
+  if (r < 0) return -1;
+
+  return 0;
+}
+
+extern int main(int argc ARG_UNUSED, char* argv[] ARG_UNUSED)
+{
+  int r;
+  int i;
+  FILE* fp = stdout;
+
+  setlocale(LC_ALL, "C");
+  /* setlocale(LC_ALL, "POSIX"); */
+  /* setlocale(LC_ALL, "en_GB.iso88591"); */
+  /* setlocale(LC_ALL, "de_BE.iso88591"); */
+  /* 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;
+    }
+  }
+
+  return 0;
+}
diff --git a/enc/prelude.rb b/enc/prelude.rb
deleted file mode 100644
index 8ce59f957a..0000000000
--- a/enc/prelude.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-%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 d1357b3212..65fd5102de 100644
--- a/enc/shift_jis.c
+++ b/enc/shift_jis.c
@@ -1,8 +1,9 @@
 /**********************************************************************
-  sjis.c -  Oniguruma (regular expression library)
+  shift_jis.c -  Onigmo (Oniguruma-mod) (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2009  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011-2017  K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,335 +28,7 @@
  * SUCH DAMAGE.
  */
 
-#include "regint.h"
-
-static const int EncLen_SJIS[] = {
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1
-};
-
-static const char SJIS_CAN_BE_TRAIL_TABLE[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0
-};
-
-#define SJIS_ISMB_FIRST(byte)  (EncLen_SJIS[byte] > 1)
-#define SJIS_ISMB_TRAIL(byte)  SJIS_CAN_BE_TRAIL_TABLE[(byte)]
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
-  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 8 */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F, F, F
-  },
-  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
-    /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, F, F, F
-  }
-};
-#undef A
-#undef F
-
-static int
-mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
-  int firstbyte = *p++;
-  state_t s;
-  s = trans[0][firstbyte];
-  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
-                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_SJIS[firstbyte]-1);
-  s = trans[s][*p++];
-  return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
-                       ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-}
-
-static int
-code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256) {
-    if (EncLen_SJIS[(int )code] == 1)
-      return 1;
-    else
-      return 0;
-  }
-  else if (code <= 0xffff) {
-    return 2;
-  }
-  else
-    return ONIGERR_INVALID_CODE_POINT_VALUE;
-}
-
-static OnigCodePoint
-mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
-  int c, i, len;
-  OnigCodePoint n;
-
-  len = enclen(enc, p, end);
-  c = *p++;
-  n = c;
-  if (len == 1) return n;
-
-  for (i = 1; i < len; i++) {
-    if (p >= end) break;
-    c = *p++;
-    n <<= 8;  n += c;
-  }
-  return n;
-}
-
-static int
-code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
-  UChar *p = buf;
-
-  if ((code & 0xff00) != 0) *p++ = (UChar )(((code >>  8) & 0xff));
-  *p++ = (UChar )(code & 0xff);
-
-#if 0
-  if (enclen(enc, buf) != (p - buf))
-    return REGERR_INVALID_CODE_POINT_VALUE;
-#endif
-  return (int)(p - buf);
-}
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-	      const UChar** pp, const UChar* end, UChar* lower,
-	      OnigEncoding enc)
-{
-  const UChar* p = *pp;
-
-  if (ONIGENC_IS_MBC_ASCII(p)) {
-    *lower = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
-    (*pp)++;
-    return 1;
-  }
-  else {
-    int i;
-    int len = enclen(enc, p, end);
-
-    for (i = 0; i < len; i++) {
-      *lower++ = *p++;
-    }
-    (*pp) += len;
-    return len; /* return byte length of converted char to lower */
-  }
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag,
-		 const UChar** pp, const UChar* end)
-{
-  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-
-}
-#endif
-
-#if 0
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype)
-{
-  if (code < 128)
-    return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
-  else {
-    if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
-      return (code_to_mbclen(code) > 1 ? TRUE : FALSE);
-    }
-  }
-
-  return FALSE;
-}
-#endif
-
-static UChar*
-left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
-{
-  const UChar *p;
-  int len;
-
-  if (s <= start) return (UChar* )s;
-  p = s;
-
-  if (SJIS_ISMB_TRAIL(*p)) {
-    while (p > start) {
-      if (! SJIS_ISMB_FIRST(*--p)) {
-	p++;
-	break;
-      }
-    }
-  }
-  len = enclen(enc, p, end);
-  if (p + len > s) return (UChar* )p;
-  p += len;
-  return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar c = *s;
-  return (SJIS_ISMB_TRAIL(c) ? FALSE : TRUE);
-}
-
-
-static int PropertyInited = 0;
-static const OnigCodePoint** PropertyList;
-static int PropertyListNum;
-static int PropertyListSize;
-static hash_table_type* PropertyNameTable;
-
-static const OnigCodePoint CR_Hiragana[] = {
-  1,
-  0x829f, 0x82f1
-}; /* CR_Hiragana */
-
-static const OnigCodePoint CR_Katakana[] = {
-  4,
-  0x00a6, 0x00af,
-  0x00b1, 0x00dd,
-  0x8340, 0x837e,
-  0x8380, 0x8396,
-}; /* CR_Katakana */
-
-static int
-init_property_list(void)
-{
-  int r;
-
-  PROPERTY_LIST_ADD_PROP("hiragana", CR_Hiragana);
-  PROPERTY_LIST_ADD_PROP("katakana", CR_Katakana);
-  PropertyInited = 1;
-
- end:
-  return r;
-}
-
-static int
-property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
-{
-  hash_data_type ctype;
-  UChar *s, *e;
-
-  PROPERTY_LIST_INIT_CHECK;
-
-  s = e = ALLOCA_N(UChar, end-p+1);
-  for (; p < end; p++) {
-    *e++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
-  }
-
-  if (onig_st_lookup_strend(PropertyNameTable, s, e, &ctype) == 0) {
-    return onigenc_minimum_property_name_to_ctype(enc, s, e);
-  }
-
-  return (int)ctype;
-}
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
-  if (ctype <= ONIGENC_MAX_STD_CTYPE) {
-    if (code < 128)
-      return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
-    else {
-      if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
-	return TRUE;
-      }
-    }
-  }
-  else {
-    PROPERTY_LIST_INIT_CHECK;
-
-    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
-    if (ctype >= (unsigned int )PropertyListNum)
-      return ONIGERR_TYPE_BUG;
-
-    return onig_is_in_code_range((UChar* )PropertyList[ctype], code);
-  }
-
-  return FALSE;
-}
-
-static int
-get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
-		     const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
-{
-  if (ctype <= ONIGENC_MAX_STD_CTYPE) {
-    return ONIG_NO_SUPPORT_CONFIG;
-  }
-  else {
-    *sb_out = 0x80;
-
-    PROPERTY_LIST_INIT_CHECK;
-
-    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
-    if (ctype >= (OnigCtype )PropertyListNum)
-      return ONIGERR_TYPE_BUG;
-
-    *ranges = PropertyList[ctype];
-    return 0;
-  }
-}
+#include "shift_jis.h"
 
 OnigEncodingDefine(shift_jis, Shift_JIS) = {
   mbc_enc_len,
@@ -367,14 +40,16 @@ OnigEncodingDefine(shift_jis, Shift_JIS) = {
   code_to_mbclen,
   code_to_mbc,
   mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
   property_name_to_ctype,
   is_code_ctype,
   get_ctype_code_range,
   left_adjust_char_head,
   is_allowed_reverse_match,
-  0
+  onigenc_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 /*
  * Name: Shift_JIS
@@ -384,35 +59,6 @@ OnigEncodingDefine(shift_jis, Shift_JIS) = {
  */
 
 /*
- * Name: Windows-31J
- * MIBenum: 2024
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/dbcs/932.mspx
- * Link: http://ja.wikipedia.org/wiki/Windows-31J
- * Link: http://source.icu-project.org/repos/icu/data/trunk/charset/data/ucm/windows-932-2000.ucm
- *
- * Windows Standard Character Set and its mapping to Unicode by Microsoft.
- * Since 1.9.3, SJIS is the alias of Windows-31J because its character
- * set is usually this one even if its mapping may differ.
- */
-ENC_REPLICATE("Windows-31J", "Shift_JIS")
-ENC_ALIAS("CP932", "Windows-31J")
-ENC_ALIAS("csWindows31J", "Windows-31J") /* IANA.  IE6 don't accept Windows-31J but csWindows31J. */
-ENC_ALIAS("SJIS", "Windows-31J")
-
-/*
- * Name: PCK
- * Link: http://download.oracle.com/docs/cd/E19253-01/819-0606/x-2chn0/index.html
- * Link: http://download.oracle.com/docs/cd/E19253-01/819-0606/appb-pckwarn-1/index.html
- *
- * Solaris's SJIS variant. Its set is Windows Standard Character Set; it
- * consists JIS X 0201 Latin (US-ASCII), JIS X 0201 Katakana, JIS X 0208, NEC
- * special characters, NEC-selected IBM extended characters, and IBM extended
- * characters. Solaris's iconv seems to use SJIS-open.
- */
-ENC_ALIAS("PCK", "Windows-31J")
-
-/*
  * Name: MacJapanese
  * Link: http://unicode.org/Public/MAPPINGS/VENDORS/APPLE/JAPANESE.TXT
  * Link: http://ja.wikipedia.org/wiki/MacJapanese
diff --git a/enc/shift_jis.h b/enc/shift_jis.h
new file mode 100644
index 0000000000..d552401595
--- /dev/null
+++ b/enc/shift_jis.h
@@ -0,0 +1,546 @@
+/**********************************************************************
+  shift_jis.h -  Onigmo (Oniguruma-mod) (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011       K.Takata  <kentkt AT csc DOT jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "regenc.h"
+
+static const int EncLen_SJIS[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1
+};
+
+static const char SJIS_CAN_BE_TRAIL_TABLE[256] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0
+};
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+  /* Fullwidth Alphabet */
+  { 0x8260, 0x8281 },
+  { 0x8261, 0x8282 },
+  { 0x8262, 0x8283 },
+  { 0x8263, 0x8284 },
+  { 0x8264, 0x8285 },
+  { 0x8265, 0x8286 },
+  { 0x8266, 0x8287 },
+  { 0x8267, 0x8288 },
+  { 0x8268, 0x8289 },
+  { 0x8269, 0x828a },
+  { 0x826a, 0x828b },
+  { 0x826b, 0x828c },
+  { 0x826c, 0x828d },
+  { 0x826d, 0x828e },
+  { 0x826e, 0x828f },
+  { 0x826f, 0x8290 },
+  { 0x8270, 0x8291 },
+  { 0x8271, 0x8292 },
+  { 0x8272, 0x8293 },
+  { 0x8273, 0x8294 },
+  { 0x8274, 0x8295 },
+  { 0x8275, 0x8296 },
+  { 0x8276, 0x8297 },
+  { 0x8277, 0x8298 },
+  { 0x8278, 0x8299 },
+  { 0x8279, 0x829a },
+
+  /* Greek */
+  { 0x839f, 0x83bf },
+  { 0x83a0, 0x83c0 },
+  { 0x83a1, 0x83c1 },
+  { 0x83a2, 0x83c2 },
+  { 0x83a3, 0x83c3 },
+  { 0x83a4, 0x83c4 },
+  { 0x83a5, 0x83c5 },
+  { 0x83a6, 0x83c6 },
+  { 0x83a7, 0x83c7 },
+  { 0x83a8, 0x83c8 },
+  { 0x83a9, 0x83c9 },
+  { 0x83aa, 0x83ca },
+  { 0x83ab, 0x83cb },
+  { 0x83ac, 0x83cc },
+  { 0x83ad, 0x83cd },
+  { 0x83ae, 0x83ce },
+  { 0x83af, 0x83cf },
+  { 0x83b0, 0x83d0 },
+  { 0x83b1, 0x83d1 },
+  { 0x83b2, 0x83d2 },
+  { 0x83b3, 0x83d3 },
+  { 0x83b4, 0x83d4 },
+  { 0x83b5, 0x83d5 },
+  { 0x83b6, 0x83d6 },
+
+  /* Cyrillic */
+  { 0x8440, 0x8470 },
+  { 0x8441, 0x8471 },
+  { 0x8442, 0x8472 },
+  { 0x8443, 0x8473 },
+  { 0x8444, 0x8474 },
+  { 0x8445, 0x8475 },
+  { 0x8446, 0x8476 },
+  { 0x8447, 0x8477 },
+  { 0x8448, 0x8478 },
+  { 0x8449, 0x8479 },
+  { 0x844a, 0x847a },
+  { 0x844b, 0x847b },
+  { 0x844c, 0x847c },
+  { 0x844d, 0x847d },
+  { 0x844e, 0x847e },
+  { 0x844f, 0x8480 },
+  { 0x8450, 0x8481 },
+  { 0x8451, 0x8482 },
+  { 0x8452, 0x8483 },
+  { 0x8453, 0x8484 },
+  { 0x8454, 0x8485 },
+  { 0x8455, 0x8486 },
+  { 0x8456, 0x8487 },
+  { 0x8457, 0x8488 },
+  { 0x8458, 0x8489 },
+  { 0x8459, 0x848a },
+  { 0x845a, 0x848b },
+  { 0x845b, 0x848c },
+  { 0x845c, 0x848d },
+  { 0x845d, 0x848e },
+  { 0x845e, 0x848f },
+  { 0x845f, 0x8490 },
+  { 0x8460, 0x8491 },
+};
+
+#define SJIS_ISMB_FIRST(byte)  (EncLen_SJIS[byte] > 1)
+#define SJIS_ISMB_TRAIL(byte)  SJIS_CAN_BE_TRAIL_TABLE[(byte)]
+
+typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
+#define A ACCEPT
+#define F FAILURE
+static const signed char trans[][0x100] = {
+  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 8 */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F, F, F
+  },
+  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
+    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
+    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
+    /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, F, F, F
+  }
+};
+#undef A
+#undef F
+
+static int
+mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
+{
+  int firstbyte = *p++;
+  state_t s;
+  s = trans[0][firstbyte];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_SJIS[firstbyte]-1);
+  s = trans[s][*p++];
+  return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
+                       ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+}
+
+static int
+code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
+{
+  if (code < 256) {
+    if (EncLen_SJIS[(int )code] == 1)
+      return 1;
+    else
+      return ONIGERR_INVALID_CODE_POINT_VALUE;
+  }
+  else if (code <= 0xffff) {
+    int low = code & 0xff;
+    if (! SJIS_ISMB_TRAIL(low))
+      return ONIGERR_INVALID_CODE_POINT_VALUE;
+    return 2;
+  }
+  else
+    return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
+}
+
+static OnigCodePoint
+mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  int c, i, len;
+  OnigCodePoint n;
+
+  len = mbc_enc_len(p, end, enc);
+  c = *p++;
+  n = c;
+  if (len == 1) return n;
+
+  for (i = 1; i < len; i++) {
+    if (p >= end) break;
+    c = *p++;
+    n <<= 8;  n += c;
+  }
+  return n;
+}
+
+static int
+code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
+{
+  UChar *p = buf;
+
+  if ((code & 0xff00) != 0) *p++ = (UChar )(((code >>  8) & 0xff));
+  *p++ = (UChar )(code & 0xff);
+
+#if 0
+  if (mbc_enc_len(buf, p, enc) != (p - buf))
+    return REGERR_INVALID_CODE_POINT_VALUE;
+#endif
+  return (int )(p - buf);
+}
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+		    OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc)
+{
+  return onigenc_apply_all_case_fold_with_map(
+            numberof(CaseFoldMap), CaseFoldMap, 0,
+            flag, f, arg);
+}
+
+static OnigCodePoint
+get_lower_case(OnigCodePoint code)
+{
+  if (ONIGENC_IS_IN_RANGE(code, 0x8260, 0x8279)) {
+    /* Fullwidth Alphabet */
+    return (OnigCodePoint )(code + 0x0021);
+  }
+  else if (ONIGENC_IS_IN_RANGE(code, 0x839f, 0x83b6)) {
+    /* Greek */
+    return (OnigCodePoint )(code + 0x0020);
+  }
+  else if (ONIGENC_IS_IN_RANGE(code, 0x8440, 0x8460)) {
+    /* Cyrillic */
+    int d = (code >= 0x844f) ? 1 : 0;
+    return (OnigCodePoint )(code + (0x0030 + d));
+  }
+  return code;
+}
+
+static OnigCodePoint
+get_upper_case(OnigCodePoint code)
+{
+  if (ONIGENC_IS_IN_RANGE(code, 0x8281, 0x829a)) {
+    /* Fullwidth Alphabet */
+    return (OnigCodePoint )(code - 0x0021);
+  }
+  else if (ONIGENC_IS_IN_RANGE(code, 0x83bf, 0x83d6)) {
+    /* Greek */
+    return (OnigCodePoint )(code - 0x0020);
+  }
+  else if (ONIGENC_IS_IN_RANGE(code, 0x8470, 0x847e) ||
+	   ONIGENC_IS_IN_RANGE(code, 0x8480, 0x8491)) {
+    /* Cyrillic */
+    int d = (code >= 0x8480) ? 1 : 0;
+    return (OnigCodePoint )(code - (0x0030 - d));
+  }
+  return code;
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[], OnigEncoding enc)
+{
+  int len;
+  OnigCodePoint code, code_lo, code_up;
+
+  code = mbc_to_code(p, end, enc);
+  if (ONIGENC_IS_ASCII_CODE(code))
+    return onigenc_ascii_get_case_fold_codes_by_str(flag, p, end, items, enc);
+
+  len = mbc_enc_len(p, end, enc);
+  code_lo = get_lower_case(code);
+  code_up = get_upper_case(code);
+
+  if (code != code_lo) {
+    items[0].byte_len = len;
+    items[0].code_len = 1;
+    items[0].code[0] = code_lo;
+    return 1;
+  }
+  else if (code != code_up) {
+    items[0].byte_len = len;
+    items[0].code_len = 1;
+    items[0].code[0] = code_up;
+    return 1;
+  }
+
+  return 0;
+}
+
+static int
+mbc_case_fold(OnigCaseFoldType flag,
+	      const UChar** pp, const UChar* end, UChar* lower,
+	      OnigEncoding enc)
+{
+  const UChar* p = *pp;
+
+  if (ONIGENC_IS_MBC_ASCII(p)) {
+    *lower = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
+    (*pp)++;
+    return 1;
+  }
+  else {
+    OnigCodePoint code;
+    int len;
+
+    code = get_lower_case(mbc_to_code(p, end, enc));
+    len = code_to_mbc(code, lower, enc);
+    (*pp) += len;
+    return len; /* return byte length of converted char to lower */
+  }
+}
+
+#if 0
+static int
+is_mbc_ambiguous(OnigCaseFoldType flag,
+		 const UChar** pp, const UChar* end)
+{
+  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
+
+}
+#endif
+
+#if 0
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype)
+{
+  if (code < 128)
+    return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
+  else {
+    if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
+      return (code_to_mbclen(code) > 1 ? TRUE : FALSE);
+    }
+  }
+
+  return FALSE;
+}
+#endif
+
+static UChar*
+left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
+{
+  const UChar *p;
+  int len;
+
+  if (s <= start) return (UChar* )s;
+  p = s;
+
+  if (SJIS_ISMB_TRAIL(*p)) {
+    while (p > start) {
+      if (! SJIS_ISMB_FIRST(*--p)) {
+	p++;
+	break;
+      }
+    }
+  }
+  len = mbc_enc_len(p, end, enc);
+  if (p + len > s) return (UChar* )p;
+  p += len;
+  return (UChar* )(p + ((s - p) & ~1));
+}
+
+static int
+is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED)
+{
+  const UChar c = *s;
+  return (SJIS_ISMB_TRAIL(c) ? FALSE : TRUE);
+}
+
+
+static const OnigCodePoint CR_Hiragana[] = {
+  1,
+  0x829f, 0x82f1
+}; /* CR_Hiragana */
+
+static const OnigCodePoint CR_Katakana[] = {
+  4,
+  0x00a6, 0x00af,
+  0x00b1, 0x00dd,
+  0x8340, 0x837e,
+  0x8380, 0x8396,
+}; /* CR_Katakana */
+
+#ifdef ENC_CP932
+static const OnigCodePoint CR_Han[] = {
+  6,
+  0x8157, 0x8157,
+  0x889f, 0x9872,	/* Kanji level 1 */
+  0x989f, 0x9ffc,	/* Kanji level 2 */
+  0xe040, 0xeaa4,	/* Kanji level 2 */
+  0xed40, 0xeeec,	/* NEC-selected IBM extended characters (without symbols) */
+  0xfa5c, 0xfc4b,	/* IBM extended characters (without symbols) */
+}; /* CR_Han */
+#else
+static const OnigCodePoint CR_Han[] = {
+  4,
+  0x8157, 0x8157,
+  0x889f, 0x9872,	/* Kanji level 1 */
+  0x989f, 0x9ffc,	/* Kanji level 2 */
+  0xe040, 0xeaa4,	/* Kanji level 2 */
+}; /* CR_Han */
+#endif
+
+static const OnigCodePoint CR_Latin[] = {
+  4,
+  0x0041, 0x005a,
+  0x0061, 0x007a,
+  0x8260, 0x8279,
+  0x8281, 0x829a,
+}; /* CR_Latin */
+
+static const OnigCodePoint CR_Greek[] = {
+  2,
+  0x839f, 0x83b6,
+  0x83bf, 0x83d6,
+}; /* CR_Greek */
+
+static const OnigCodePoint CR_Cyrillic[] = {
+  3,
+  0x8440, 0x8460,
+  0x8470, 0x847f,
+  0x8480, 0x8491,
+}; /* CR_Cyrillic */
+
+#include "enc/jis/props.h"
+
+static int
+property_name_to_ctype(OnigEncoding enc, const UChar* p, const UChar* end)
+{
+  const UChar *s = p, *e = end;
+  const struct enc_property *prop =
+    onig_jis_property((const char* )s, (unsigned int )(e - s));
+
+  if (!prop) {
+    return onigenc_minimum_property_name_to_ctype(enc, s, e);
+  }
+
+  return (int )prop->ctype;
+}
+
+static int
+is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
+{
+  if (ctype <= ONIGENC_MAX_STD_CTYPE) {
+    if (code < 128)
+      return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
+    else {
+      if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
+	return TRUE;
+      }
+    }
+  }
+  else {
+    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
+    if (ctype >= (unsigned int )PropertyListNum)
+      return ONIGERR_TYPE_BUG;
+
+    return onig_is_in_code_range((UChar* )PropertyList[ctype], code);
+  }
+
+  return FALSE;
+}
+
+static int
+get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
+		     const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
+{
+  if (ctype <= ONIGENC_MAX_STD_CTYPE) {
+    return ONIG_NO_SUPPORT_CONFIG;
+  }
+  else {
+    *sb_out = 0x80;
+
+    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
+    if (ctype >= (OnigCtype )PropertyListNum)
+      return ONIGERR_TYPE_BUG;
+
+    *ranges = PropertyList[ctype];
+    return 0;
+  }
+}
diff --git a/enc/trans/GB/GB12345%UCS.src b/enc/trans/GB/GB12345%UCS.src
index 0b4115bed9..9f1daad751 100644
--- a/enc/trans/GB/GB12345%UCS.src
+++ b/enc/trans/GB/GB12345%UCS.src
@@ -9,62 +9,11 @@ DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-#	Name:             GB12345-80 to Unicode table (complete, hex format)
-#	Unicode version:  1.1
-#	Table version:    0.0d1
-#	Table format:     Format A
-#	Date:             6 December 1993
-#	Author:           Glenn Adams <glenn@metis.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data Metis and Taligent currently have on how
-#       GB12345-90 characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the GB12345 code (in hex as 0xXXXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#					The official names for Unicode characters U+4E00
-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#					where XXXX is the code point.  Including all these
-#					names in this file increases its size substantially
-#					and needlessly.  The token "<CJK>" is used for the
-#					name of these characters.  If necessary, it can be
-#					expanded algorithmically by a parser or editor.
-#
-#	The entries are in GB12345 order
-#
-#	The following algorithms can be used to change the hex form
-#		of GB12345 to other standard forms:
-#
-#		To change hex to EUC form, add 0x8080
-#		To change hex to kuten form, first subtract 0x2020.  Then
-#			the high and low bytes correspond to the ku and ten of
-#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
-#			0x777E -> 0x575E -> 8794
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+# The mapping data below was created from a file provided by Unicode, Inc.
+# (The Unicode Consortium). The file was used to create a product supporting
+# Unicode, as explicitly permitted in the file's copyright notice. Please note
+# that Unicode, Inc. never made any claims as to fitness of that file for any
+# particular purpose, and has ceased to publish the file many years ago.
 #
 #
 0x2121 = 0x3000
diff --git a/enc/trans/GB/GB2312%UCS.src b/enc/trans/GB/GB2312%UCS.src
index d196bab535..dc222203fd 100644
--- a/enc/trans/GB/GB2312%UCS.src
+++ b/enc/trans/GB/GB2312%UCS.src
@@ -9,76 +9,11 @@ DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-#	Name:             GB2312-80 to Unicode table (complete, hex format)
-#	Unicode version:  3.0
-#	Table version:    1.0
-#	Table format:     Format A
-#	Date:             1999 October 8
-#
-#	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on optical media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Unicode, Inc. hereby grants the right to freely use the information
-#	supplied in this file in the creation of products supporting the
-#	Unicode Standard, and to make copies of this file in any form for
-#	internal or external distribution as long as this notice remains
-#	attached.
-#
-#	General notes:
-#
-#
-# This table contains one set of mappings from GB2312-80 into Unicode.
-# Note that these data are *possible* mappings only and may not be the
-# same as those used by actual products, nor may they be the best suited
-# for all uses.  For more information on the mappings between various code
-# pages incorporating the repertoire of GB2312-80 and Unicode, consult the
-# VENDORS mapping data.  Normative information on the mapping between
-# GB2312-80 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between GB2312-80 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
-#
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the GB2312 code (in hex as 0xXXXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#			The official names for Unicode characters U+4E00
-#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#			where XXXX is the code point.  Including all these
-#			names in this file increases its size substantially
-#			and needlessly.  The token "<CJK>" is used for the
-#			name of these characters.  If necessary, it can be
-#			expanded algorithmically by a parser or editor.
-#
-#	The entries are in GB2312 order
-#
-#	The following algorithms can be used to change the hex form
-#		of GB2312 to other standard forms:
-#
-#		To change hex to EUC form, add 0x8080
-#		To change hex to kuten form, first subtract 0x2020.  Then
-#			the high and low bytes correspond to the ku and ten of
-#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
-#			0x777E -> 0x575E -> 8794
-#
-#	Version history
-#	1.0 version updates 0.0d2 version by correcting mapping for 0x212C
-#             from U+2225 to U+2016.
+# The mapping data below was created from a file provided by Unicode, Inc.
+# (The Unicode Consortium). The file was used to create a product supporting
+# Unicode, as explicitly permitted in the file's copyright notice. Please note
+# that Unicode, Inc. never made any claims as to fitness of that file for any
+# particular purpose, and has ceased to publish the file many years ago.
 #
 #
 
diff --git a/enc/trans/GB/UCS%GB12345.src b/enc/trans/GB/UCS%GB12345.src
index 8ec8318438..a876bdaca8 100644
--- a/enc/trans/GB/UCS%GB12345.src
+++ b/enc/trans/GB/UCS%GB12345.src
@@ -9,62 +9,11 @@ DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-#	Name:             GB12345-80 to Unicode table (complete, hex format)
-#	Unicode version:  1.1
-#	Table version:    0.0d1
-#	Table format:     Format A
-#	Date:             6 December 1993
-#	Author:           Glenn Adams <glenn@metis.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data Metis and Taligent currently have on how
-#       GB12345-90 characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the GB12345 code (in hex as 0xXXXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#					The official names for Unicode characters U+4E00
-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#					where XXXX is the code point.  Including all these
-#					names in this file increases its size substantially
-#					and needlessly.  The token "<CJK>" is used for the
-#					name of these characters.  If necessary, it can be
-#					expanded algorithmically by a parser or editor.
-#
-#	The entries are in GB12345 order
-#
-#	The following algorithms can be used to change the hex form
-#		of GB12345 to other standard forms:
-#
-#		To change hex to EUC form, add 0x8080
-#		To change hex to kuten form, first subtract 0x2020.  Then
-#			the high and low bytes correspond to the ku and ten of
-#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
-#			0x777E -> 0x575E -> 8794
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+# The mapping data below was created from a file provided by Unicode, Inc.
+# (The Unicode Consortium). The file was used to create a product supporting
+# Unicode, as explicitly permitted in the file's copyright notice. Please note
+# that Unicode, Inc. never made any claims as to fitness of that file for any
+# particular purpose, and has ceased to publish the file many years ago.
 #
 #
 0x00A4 = 0x2168
diff --git a/enc/trans/GB/UCS%GB2312.src b/enc/trans/GB/UCS%GB2312.src
index 3293fea604..4f4d52a54a 100644
--- a/enc/trans/GB/UCS%GB2312.src
+++ b/enc/trans/GB/UCS%GB2312.src
@@ -9,76 +9,11 @@ DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-#	Name:             GB2312-80 to Unicode table (complete, hex format)
-#	Unicode version:  3.0
-#	Table version:    1.0
-#	Table format:     Format A
-#	Date:             1999 October 8
-#
-#	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on optical media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Unicode, Inc. hereby grants the right to freely use the information
-#	supplied in this file in the creation of products supporting the
-#	Unicode Standard, and to make copies of this file in any form for
-#	internal or external distribution as long as this notice remains
-#	attached.
-#
-#	General notes:
-#
-#
-# This table contains one set of mappings from GB2312-80 into Unicode.
-# Note that these data are *possible* mappings only and may not be the
-# same as those used by actual products, nor may they be the best suited
-# for all uses.  For more information on the mappings between various code
-# pages incorporating the repertoire of GB2312-80 and Unicode, consult the
-# VENDORS mapping data.  Normative information on the mapping between
-# GB2312-80 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between GB2312-80 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
-#
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the GB2312 code (in hex as 0xXXXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#			The official names for Unicode characters U+4E00
-#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#			where XXXX is the code point.  Including all these
-#			names in this file increases its size substantially
-#			and needlessly.  The token "<CJK>" is used for the
-#			name of these characters.  If necessary, it can be
-#			expanded algorithmically by a parser or editor.
-#
-#	The entries are in GB2312 order
-#
-#	The following algorithms can be used to change the hex form
-#		of GB2312 to other standard forms:
-#
-#		To change hex to EUC form, add 0x8080
-#		To change hex to kuten form, first subtract 0x2020.  Then
-#			the high and low bytes correspond to the ku and ten of
-#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
-#			0x777E -> 0x575E -> 8794
-#
-#	Version history
-#	1.0 version updates 0.0d2 version by correcting mapping for 0x212C
-#             from U+2225 to U+2016.
+# The mapping data below was created from a file provided by Unicode, Inc.
+# (The Unicode Consortium). The file was used to create a product supporting
+# Unicode, as explicitly permitted in the file's copyright notice. Please note
+# that Unicode, Inc. never made any claims as to fitness of that file for any
+# particular purpose, and has ceased to publish the file many years ago.
 #
 #
 0x00A4 = 0x2168
diff --git a/enc/trans/JIS/JISX0201-KANA%UCS.src b/enc/trans/JIS/JISX0201-KANA%UCS.src
index d25b580fed..d56b97f7cc 100644
--- a/enc/trans/JIS/JISX0201-KANA%UCS.src
+++ b/enc/trans/JIS/JISX0201-KANA%UCS.src
@@ -12,27 +12,16 @@ 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:    0.9
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             8 March 1994
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date:             2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
@@ -42,15 +31,7 @@ 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.  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.
+# VENDORS mapping data.
 #
 #
 #	Format:  Three tab-separated columns
@@ -60,6 +41,22 @@ 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 c2cacd422e..7875969b95 100644
--- a/enc/trans/JIS/JISX0208@1990%UCS.src
+++ b/enc/trans/JIS/JISX0208@1990%UCS.src
@@ -12,27 +12,17 @@ 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:    0.9
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             8 March 1994
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date:             2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
@@ -42,15 +32,7 @@ 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.  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.
+# VENDORS mapping data.
 #
 #
 #	Format:  Four tab-separated columns
@@ -77,12 +59,22 @@ BEGIN_MAP
 #			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
 #			0x7426 -> 0x5406 -> 8406
 #
-#   The kanji mappings are a normative part of ISO/IEC 10646.  The
-#       non-kanji mappings are provisional, pending definition of
-#       official mappings by Japanese standards bodies
+#  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.
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#    [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.
 #
 # 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 cf4e7ecf62..0e1ab4c9b9 100644
--- a/enc/trans/JIS/JISX0212%UCS.src
+++ b/enc/trans/JIS/JISX0212%UCS.src
@@ -12,27 +12,16 @@ 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:    0.9
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             8 March 1994
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date:             2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
@@ -42,15 +31,7 @@ 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.  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.
+# VENDORS mapping data.
 #
 #
 #	Format:  Three tab-separated columns
@@ -76,27 +57,38 @@ 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
 #
 #	   However, JIS X 0212 maintains the distinction between
 #	   the lowercase forms of these two elements at 0x2942 and 0x2943.
-#	   Given the structre of these JIS encodings, it is clear that
+#	   Given the structure of these JIS encodings, it is clear that
 #	   0x2922 and 0x2942 are intended to be a capital/small pair.
 #	   Consequently, in the Unicode mapping, 0x2922 is treated as
 #	   LATIN CAPITAL LETTER D WITH STROKE.
-#	  
+#
+#  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/JISX0213-1%UCS@BMP.src b/enc/trans/JIS/JISX0213-1%UCS@BMP.src
new file mode 100644
index 0000000000..09377be66b
--- /dev/null
+++ b/enc/trans/JIS/JISX0213-1%UCS@BMP.src
@@ -0,0 +1,1926 @@
+# $NetBSD: JISX0213-1%UCS@BMP.src,v 1.1 2007/03/05 16:58:33 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"JISX0213-1/UCS:BMP"
+SRC_ZONE	0x21-0x7E / 0x21-0x7E / 8
+OOB_MODE	INVALID
+DST_INVALID	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+## JIS X 0213:2004 vs Unicode mapping table
+## 
+## Date: 22 May 2006
+## License:
+## 	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.
+## Note:
+## 	3-XXXX	JIS X 0213:2004 plane 1 (GL encoding)
+## 	4-XXXX	JIS X 0213:2000 plane 2 (GL encoding)
+## 	[1983]	JIS codepoint defined by JIS X 0208-1983
+## 	[1990]	JIS codepoint defined by JIS X 0208-1990
+## 	[2000]	JIS codepoint defined by JIS X 0213:2000
+## 	[2004]	JIS codepoint defined by JIS X 0213:2004
+## 	[Unicode3.1]	UCS codepoint defined by Unicode 3.1
+## 	[Unicode3.2]	UCS codepoint defined by Unicode 3.2
+## 	Fullwidth	UCS fullwidth form (U+Fxxx)
+## 	Windows 	Windows (CP932) mapping
+## 	Some 0213 character can't represent by one UCS character.
+## 	In this table, such characters are described as 'U+xxxx+xxxx'.
+## 
+## JIS	Unicode	Name	Note
+0x222F = 0xFF07 # 0x0027
+0x2230 = 0xFF02 # 0x0022
+0x2231 = 0xFF0D # 0x002D
+0x2232 = 0xFF5E # 0x007E
+0x2233 = 0x3033
+0x2234 = 0x3034
+0x2235 = 0x3035
+0x2236 = 0x303B
+0x2237 = 0x303C
+0x2238 = 0x30FF
+0x2239 = 0x309F
+0x2242 = 0x2284
+0x2243 = 0x2285
+0x2244 = 0x228A
+0x2245 = 0x228B
+0x2246 = 0x2209
+0x2247 = 0x2205
+0x2248 = 0x2305
+0x2249 = 0x2306
+0x2251 = 0x2295
+0x2252 = 0x2296
+0x2253 = 0x2297
+0x2254 = 0x2225
+0x2255 = 0x2226
+0x2256 = 0xFF5F
+0x2257 = 0xFF60
+0x2258 = 0x3018
+0x2259 = 0x3019
+0x225A = 0x3016
+0x225B = 0x3017
+0x226B = 0x2262
+0x226C = 0x2243
+0x226D = 0x2245
+0x226E = 0x2248
+0x226F = 0x2276
+0x2270 = 0x2277
+0x2271 = 0x2194
+0x227A = 0x266E
+0x227B = 0x266B
+0x227C = 0x266C
+0x227D = 0x2669
+0x2321 = 0x25B7
+0x2322 = 0x25B6
+0x2323 = 0x25C1
+0x2324 = 0x25C0
+0x2325 = 0x2197
+0x2326 = 0x2198
+0x2327 = 0x2196
+0x2328 = 0x2199
+0x2329 = 0x21C4
+0x232A = 0x21E8
+0x232B = 0x21E6
+0x232C = 0x21E7
+0x232D = 0x21E9
+0x232E = 0x2934
+0x232F = 0x2935
+0x233A = 0x29BF
+0x233B = 0x25C9
+0x233C = 0x303D
+0x233D = 0xFE46
+0x233E = 0xFE45
+0x233F = 0x25E6
+0x2340 = 0x2022
+0x235B = 0x2213
+0x235C = 0x2135
+0x235D = 0x210F
+0x235E = 0x33CB
+0x235F = 0x2113
+0x2360 = 0x2127
+0x237B = 0x30A0
+0x237C = 0x2013
+0x237D = 0x29FA
+0x237E = 0x29FB
+0x2474 = 0x3094
+0x2475 = 0x3095
+0x2476 = 0x3096
+#0x2477 = 0x304B + 0x309A
+#0x2478 = 0x304D + 0x309A
+#0x2479 = 0x304F + 0x309A
+#0x247A = 0x3051 + 0x309A
+#0x247B = 0x3053 + 0x309A
+#0x2577 = 0x30AB + 0x309A
+#0x2578 = 0x30AD + 0x309A
+#0x2579 = 0x30AF + 0x309A
+#0x257A = 0x30B1 + 0x309A
+#0x257B = 0x30B3 + 0x309A
+#0x257C = 0x30BB + 0x309A
+#0x257D = 0x30C4 + 0x309A
+#0x257E = 0x30C8 + 0x309A
+0x2639 = 0x2664
+0x263A = 0x2660
+0x263B = 0x2662
+0x263C = 0x2666
+0x263D = 0x2661
+0x263E = 0x2665
+0x263F = 0x2667
+0x2640 = 0x2663
+0x2659 = 0x03C2
+0x265A = 0x24F5
+0x265B = 0x24F6
+0x265C = 0x24F7
+0x265D = 0x24F8
+0x265E = 0x24F9
+0x265F = 0x24FA
+0x2660 = 0x24FB
+0x2661 = 0x24FC
+0x2662 = 0x24FD
+0x2663 = 0x24FE
+0x2664 = 0x2616
+0x2665 = 0x2617
+0x2666 = 0x3020
+0x2667 = 0x260E
+0x2668 = 0x2600
+0x2669 = 0x2601
+0x266A = 0x2602
+0x266B = 0x2603
+0x266C = 0x2668
+0x266D = 0x25B1
+0x266E = 0x31F0
+0x266F = 0x31F1
+0x2670 = 0x31F2
+0x2671 = 0x31F3
+0x2672 = 0x31F4
+0x2673 = 0x31F5
+0x2674 = 0x31F6
+0x2675 = 0x31F7
+0x2676 = 0x31F8
+0x2677 = 0x31F9
+#0x2678 = 0x31F7 + 0x309A
+0x2679 = 0x31FA
+0x267A = 0x31FB
+0x267B = 0x31FC
+0x267C = 0x31FD
+0x267D = 0x31FE
+0x267E = 0x31FF
+0x2742 = 0x23BE
+0x2743 = 0x23BF
+0x2744 = 0x23C0
+0x2745 = 0x23C1
+0x2746 = 0x23C2
+0x2747 = 0x23C3
+0x2748 = 0x23C4
+0x2749 = 0x23C5
+0x274A = 0x23C6
+0x274B = 0x23C7
+0x274C = 0x23C8
+0x274D = 0x23C9
+0x274E = 0x23CA
+0x274F = 0x23CB
+0x2750 = 0x23CC
+0x2772 = 0x30F7
+0x2773 = 0x30F8
+0x2774 = 0x30F9
+0x2775 = 0x30FA
+0x2776 = 0x22DA
+0x2777 = 0x22DB
+0x2778 = 0x2153
+0x2779 = 0x2154
+0x277A = 0x2155
+0x277B = 0x2713
+0x277C = 0x2318
+0x277D = 0x2423
+0x277E = 0x23CE
+0x2841 = 0x3251
+0x2842 = 0x3252
+0x2843 = 0x3253
+0x2844 = 0x3254
+0x2845 = 0x3255
+0x2846 = 0x3256
+0x2847 = 0x3257
+0x2848 = 0x3258
+0x2849 = 0x3259
+0x284A = 0x325A
+0x284B = 0x325B
+0x284C = 0x325C
+0x284D = 0x325D
+0x284E = 0x325E
+0x284F = 0x325F
+0x2850 = 0x32B1
+0x2851 = 0x32B2
+0x2852 = 0x32B3
+0x2853 = 0x32B4
+0x2854 = 0x32B5
+0x2855 = 0x32B6
+0x2856 = 0x32B7
+0x2857 = 0x32B8
+0x2858 = 0x32B9
+0x2859 = 0x32BA
+0x285A = 0x32BB
+0x285B = 0x32BC
+0x285C = 0x32BD
+0x285D = 0x32BE
+0x285E = 0x32BF
+0x2867 = 0x25D0
+0x2868 = 0x25D1
+0x2869 = 0x25D2
+0x286A = 0x25D3
+0x286B = 0x203C
+0x286C = 0x2047
+0x286D = 0x2048
+0x286E = 0x2049
+0x286F = 0x01CD
+0x2870 = 0x01CE
+0x2871 = 0x01D0
+0x2872 = 0x1E3E
+0x2873 = 0x1E3F
+0x2874 = 0x01F8
+0x2875 = 0x01F9
+0x2876 = 0x01D1
+0x2877 = 0x01D2
+0x2878 = 0x01D4
+0x2879 = 0x01D6
+0x287A = 0x01D8
+0x287B = 0x01DA
+0x287C = 0x01DC
+0x2921 = 0x20AC
+0x2922 = 0x00A0
+0x2923 = 0x00A1
+0x2924 = 0x00A4
+0x2925 = 0x00A6
+0x2926 = 0x00A9
+0x2927 = 0x00AA
+0x2928 = 0x00AB
+0x2929 = 0x00AD
+0x292A = 0x00AE
+0x292B = 0x00AF
+0x292C = 0x00B2
+0x292D = 0x00B3
+0x292E = 0x00B7
+0x292F = 0x00B8
+0x2930 = 0x00B9
+0x2931 = 0x00BA
+0x2932 = 0x00BB
+0x2933 = 0x00BC
+0x2934 = 0x00BD
+0x2935 = 0x00BE
+0x2936 = 0x00BF
+0x2937 = 0x00C0
+0x2938 = 0x00C1
+0x2939 = 0x00C2
+0x293A = 0x00C3
+0x293B = 0x00C4
+0x293C = 0x00C5
+0x293D = 0x00C6
+0x293E = 0x00C7
+0x293F = 0x00C8
+0x2940 = 0x00C9
+0x2941 = 0x00CA
+0x2942 = 0x00CB
+0x2943 = 0x00CC
+0x2944 = 0x00CD
+0x2945 = 0x00CE
+0x2946 = 0x00CF
+0x2947 = 0x00D0
+0x2948 = 0x00D1
+0x2949 = 0x00D2
+0x294A = 0x00D3
+0x294B = 0x00D4
+0x294C = 0x00D5
+0x294D = 0x00D6
+0x294E = 0x00D8
+0x294F = 0x00D9
+0x2950 = 0x00DA
+0x2951 = 0x00DB
+0x2952 = 0x00DC
+0x2953 = 0x00DD
+0x2954 = 0x00DE
+0x2955 = 0x00DF
+0x2956 = 0x00E0
+0x2957 = 0x00E1
+0x2958 = 0x00E2
+0x2959 = 0x00E3
+0x295A = 0x00E4
+0x295B = 0x00E5
+0x295C = 0x00E6
+0x295D = 0x00E7
+0x295E = 0x00E8
+0x295F = 0x00E9
+0x2960 = 0x00EA
+0x2961 = 0x00EB
+0x2962 = 0x00EC
+0x2963 = 0x00ED
+0x2964 = 0x00EE
+0x2965 = 0x00EF
+0x2966 = 0x00F0
+0x2967 = 0x00F1
+0x2968 = 0x00F2
+0x2969 = 0x00F3
+0x296A = 0x00F4
+0x296B = 0x00F5
+0x296C = 0x00F6
+0x296D = 0x00F8
+0x296E = 0x00F9
+0x296F = 0x00FA
+0x2970 = 0x00FB
+0x2971 = 0x00FC
+0x2972 = 0x00FD
+0x2973 = 0x00FE
+0x2974 = 0x00FF
+0x2975 = 0x0100
+0x2976 = 0x012A
+0x2977 = 0x016A
+0x2978 = 0x0112
+0x2979 = 0x014C
+0x297A = 0x0101
+0x297B = 0x012B
+0x297C = 0x016B
+0x297D = 0x0113
+0x297E = 0x014D
+0x2A21 = 0x0104
+0x2A22 = 0x02D8
+0x2A23 = 0x0141
+0x2A24 = 0x013D
+0x2A25 = 0x015A
+0x2A26 = 0x0160
+0x2A27 = 0x015E
+0x2A28 = 0x0164
+0x2A29 = 0x0179
+0x2A2A = 0x017D
+0x2A2B = 0x017B
+0x2A2C = 0x0105
+0x2A2D = 0x02DB
+0x2A2E = 0x0142
+0x2A2F = 0x013E
+0x2A30 = 0x015B
+0x2A31 = 0x02C7
+0x2A32 = 0x0161
+0x2A33 = 0x015F
+0x2A34 = 0x0165
+0x2A35 = 0x017A
+0x2A36 = 0x02DD
+0x2A37 = 0x017E
+0x2A38 = 0x017C
+0x2A39 = 0x0154
+0x2A3A = 0x0102
+0x2A3B = 0x0139
+0x2A3C = 0x0106
+0x2A3D = 0x010C
+0x2A3E = 0x0118
+0x2A3F = 0x011A
+0x2A40 = 0x010E
+0x2A41 = 0x0143
+0x2A42 = 0x0147
+0x2A43 = 0x0150
+0x2A44 = 0x0158
+0x2A45 = 0x016E
+0x2A46 = 0x0170
+0x2A47 = 0x0162
+0x2A48 = 0x0155
+0x2A49 = 0x0103
+0x2A4A = 0x013A
+0x2A4B = 0x0107
+0x2A4C = 0x010D
+0x2A4D = 0x0119
+0x2A4E = 0x011B
+0x2A4F = 0x010F
+0x2A50 = 0x0111
+0x2A51 = 0x0144
+0x2A52 = 0x0148
+0x2A53 = 0x0151
+0x2A54 = 0x0159
+0x2A55 = 0x016F
+0x2A56 = 0x0171
+0x2A57 = 0x0163
+0x2A58 = 0x02D9
+0x2A59 = 0x0108
+0x2A5A = 0x011C
+0x2A5B = 0x0124
+0x2A5C = 0x0134
+0x2A5D = 0x015C
+0x2A5E = 0x016C
+0x2A5F = 0x0109
+0x2A60 = 0x011D
+0x2A61 = 0x0125
+0x2A62 = 0x0135
+0x2A63 = 0x015D
+0x2A64 = 0x016D
+0x2A65 = 0x0271
+0x2A66 = 0x028B
+0x2A67 = 0x027E
+0x2A68 = 0x0283
+0x2A69 = 0x0292
+0x2A6A = 0x026C
+0x2A6B = 0x026E
+0x2A6C = 0x0279
+0x2A6D = 0x0288
+0x2A6E = 0x0256
+0x2A6F = 0x0273
+0x2A70 = 0x027D
+0x2A71 = 0x0282
+0x2A72 = 0x0290
+0x2A73 = 0x027B
+0x2A74 = 0x026D
+0x2A75 = 0x025F
+0x2A76 = 0x0272
+0x2A77 = 0x029D
+0x2A78 = 0x028E
+0x2A79 = 0x0261
+0x2A7A = 0x014B
+0x2A7B = 0x0270
+0x2A7C = 0x0281
+0x2A7D = 0x0127
+0x2A7E = 0x0295
+0x2B21 = 0x0294
+0x2B22 = 0x0266
+0x2B23 = 0x0298
+0x2B24 = 0x01C2
+0x2B25 = 0x0253
+0x2B26 = 0x0257
+0x2B27 = 0x0284
+0x2B28 = 0x0260
+0x2B29 = 0x0193
+0x2B2A = 0x0153
+0x2B2B = 0x0152
+0x2B2C = 0x0268
+0x2B2D = 0x0289
+0x2B2E = 0x0258
+0x2B2F = 0x0275
+0x2B30 = 0x0259
+0x2B31 = 0x025C
+0x2B32 = 0x025E
+0x2B33 = 0x0250
+0x2B34 = 0x026F
+0x2B35 = 0x028A
+0x2B36 = 0x0264
+0x2B37 = 0x028C
+0x2B38 = 0x0254
+0x2B39 = 0x0251
+0x2B3A = 0x0252
+0x2B3B = 0x028D
+0x2B3C = 0x0265
+0x2B3D = 0x02A2
+0x2B3E = 0x02A1
+0x2B3F = 0x0255
+0x2B40 = 0x0291
+0x2B41 = 0x027A
+0x2B42 = 0x0267
+0x2B43 = 0x025A
+#0x2B44 = 0x00E6 + 0x0300
+0x2B45 = 0x01FD
+0x2B46 = 0x1F70
+0x2B47 = 0x1F71
+#0x2B48 = 0x0254 + 0x0300
+#0x2B49 = 0x0254 + 0x0301
+#0x2B4A = 0x028C + 0x0300
+#0x2B4B = 0x028C + 0x0301
+#0x2B4C = 0x0259 + 0x0300
+#0x2B4D = 0x0259 + 0x0301
+#0x2B4E = 0x025A + 0x0300
+#0x2B4F = 0x025A + 0x0301
+0x2B50 = 0x1F72
+0x2B51 = 0x1F73
+0x2B52 = 0x0361
+0x2B53 = 0x02C8
+0x2B54 = 0x02CC
+0x2B55 = 0x02D0
+0x2B56 = 0x02D1
+0x2B57 = 0x0306
+0x2B58 = 0x203F
+0x2B59 = 0x030B
+0x2B5A = 0x0301
+0x2B5B = 0x0304
+0x2B5C = 0x0300
+0x2B5D = 0x030F
+0x2B5E = 0x030C
+0x2B5F = 0x0302
+0x2B60 = 0x02E5
+0x2B61 = 0x02E6
+0x2B62 = 0x02E7
+0x2B63 = 0x02E8
+0x2B64 = 0x02E9
+#0x2B65 = 0x02E9 + 0x02E5
+#0x2B66 = 0x02E5 + 0x02E9
+0x2B67 = 0x0325
+0x2B68 = 0x032C
+0x2B69 = 0x0339
+0x2B6A = 0x031C
+0x2B6B = 0x031F
+0x2B6C = 0x0320
+0x2B6D = 0x0308
+0x2B6E = 0x033D
+0x2B6F = 0x0329
+0x2B70 = 0x032F
+0x2B71 = 0x02DE
+0x2B72 = 0x0324
+0x2B73 = 0x0330
+0x2B74 = 0x033C
+0x2B75 = 0x0334
+0x2B76 = 0x031D
+0x2B77 = 0x031E
+0x2B78 = 0x0318
+0x2B79 = 0x0319
+0x2B7A = 0x032A
+0x2B7B = 0x033A
+0x2B7C = 0x033B
+0x2B7D = 0x0303
+0x2B7E = 0x031A
+0x2C21 = 0x2776
+0x2C22 = 0x2777
+0x2C23 = 0x2778
+0x2C24 = 0x2779
+0x2C25 = 0x277A
+0x2C26 = 0x277B
+0x2C27 = 0x277C
+0x2C28 = 0x277D
+0x2C29 = 0x277E
+0x2C2A = 0x277F
+0x2C2B = 0x24EB
+0x2C2C = 0x24EC
+0x2C2D = 0x24ED
+0x2C2E = 0x24EE
+0x2C2F = 0x24EF
+0x2C30 = 0x24F0
+0x2C31 = 0x24F1
+0x2C32 = 0x24F2
+0x2C33 = 0x24F3
+0x2C34 = 0x24F4
+0x2C35 = 0x2170
+0x2C36 = 0x2171
+0x2C37 = 0x2172
+0x2C38 = 0x2173
+0x2C39 = 0x2174
+0x2C3A = 0x2175
+0x2C3B = 0x2176
+0x2C3C = 0x2177
+0x2C3D = 0x2178
+0x2C3E = 0x2179
+0x2C3F = 0x217A
+0x2C40 = 0x217B
+0x2C41 = 0x24D0
+0x2C42 = 0x24D1
+0x2C43 = 0x24D2
+0x2C44 = 0x24D3
+0x2C45 = 0x24D4
+0x2C46 = 0x24D5
+0x2C47 = 0x24D6
+0x2C48 = 0x24D7
+0x2C49 = 0x24D8
+0x2C4A = 0x24D9
+0x2C4B = 0x24DA
+0x2C4C = 0x24DB
+0x2C4D = 0x24DC
+0x2C4E = 0x24DD
+0x2C4F = 0x24DE
+0x2C50 = 0x24DF
+0x2C51 = 0x24E0
+0x2C52 = 0x24E1
+0x2C53 = 0x24E2
+0x2C54 = 0x24E3
+0x2C55 = 0x24E4
+0x2C56 = 0x24E5
+0x2C57 = 0x24E6
+0x2C58 = 0x24E7
+0x2C59 = 0x24E8
+0x2C5A = 0x24E9
+0x2C5B = 0x32D0
+0x2C5C = 0x32D1
+0x2C5D = 0x32D2
+0x2C5E = 0x32D3
+0x2C5F = 0x32D4
+0x2C60 = 0x32D5
+0x2C61 = 0x32D6
+0x2C62 = 0x32D7
+0x2C63 = 0x32D8
+0x2C64 = 0x32D9
+0x2C65 = 0x32DA
+0x2C66 = 0x32DB
+0x2C67 = 0x32DC
+0x2C68 = 0x32DD
+0x2C69 = 0x32DE
+0x2C6A = 0x32DF
+0x2C6B = 0x32E0
+0x2C6C = 0x32E1
+0x2C6D = 0x32E2
+0x2C6E = 0x32E3
+0x2C6F = 0x32FA
+0x2C70 = 0x32E9
+0x2C71 = 0x32E5
+0x2C72 = 0x32ED
+0x2C73 = 0x32EC
+0x2C7D = 0x2051
+0x2C7E = 0x2042
+0x2D21 = 0x2460
+0x2D22 = 0x2461
+0x2D23 = 0x2462
+0x2D24 = 0x2463
+0x2D25 = 0x2464
+0x2D26 = 0x2465
+0x2D27 = 0x2466
+0x2D28 = 0x2467
+0x2D29 = 0x2468
+0x2D2A = 0x2469
+0x2D2B = 0x246A
+0x2D2C = 0x246B
+0x2D2D = 0x246C
+0x2D2E = 0x246D
+0x2D2F = 0x246E
+0x2D30 = 0x246F
+0x2D31 = 0x2470
+0x2D32 = 0x2471
+0x2D33 = 0x2472
+0x2D34 = 0x2473
+0x2D35 = 0x2160
+0x2D36 = 0x2161
+0x2D37 = 0x2162
+0x2D38 = 0x2163
+0x2D39 = 0x2164
+0x2D3A = 0x2165
+0x2D3B = 0x2166
+0x2D3C = 0x2167
+0x2D3D = 0x2168
+0x2D3E = 0x2169
+0x2D3F = 0x216A
+0x2D40 = 0x3349
+0x2D41 = 0x3314
+0x2D42 = 0x3322
+0x2D43 = 0x334D
+0x2D44 = 0x3318
+0x2D45 = 0x3327
+0x2D46 = 0x3303
+0x2D47 = 0x3336
+0x2D48 = 0x3351
+0x2D49 = 0x3357
+0x2D4A = 0x330D
+0x2D4B = 0x3326
+0x2D4C = 0x3323
+0x2D4D = 0x332B
+0x2D4E = 0x334A
+0x2D4F = 0x333B
+0x2D50 = 0x339C
+0x2D51 = 0x339D
+0x2D52 = 0x339E
+0x2D53 = 0x338E
+0x2D54 = 0x338F
+0x2D55 = 0x33C4
+0x2D56 = 0x33A1
+0x2D57 = 0x216B
+0x2D5F = 0x337B
+0x2D60 = 0x301D
+0x2D61 = 0x301F
+0x2D62 = 0x2116
+0x2D63 = 0x33CD
+0x2D64 = 0x2121
+0x2D65 = 0x32A4
+0x2D66 = 0x32A5
+0x2D67 = 0x32A6
+0x2D68 = 0x32A7
+0x2D69 = 0x32A8
+0x2D6A = 0x3231
+0x2D6B = 0x3232
+0x2D6C = 0x3239
+0x2D6D = 0x337E
+0x2D6E = 0x337D
+0x2D6F = 0x337C
+0x2D73 = 0x222E
+0x2D78 = 0x221F
+0x2D79 = 0x22BF
+0x2D7D = 0x2756
+0x2D7E = 0x261E
+0x2E21 = 0x4FF1
+0x2E23 = 0x3402
+0x2E24 = 0x4E28
+0x2E25 = 0x4E2F
+0x2E26 = 0x4E30
+0x2E27 = 0x4E8D
+0x2E28 = 0x4EE1
+0x2E29 = 0x4EFD
+0x2E2A = 0x4EFF
+0x2E2B = 0x4F03
+0x2E2C = 0x4F0B
+0x2E2D = 0x4F60
+0x2E2E = 0x4F48
+0x2E2F = 0x4F49
+0x2E30 = 0x4F56
+0x2E31 = 0x4F5F
+0x2E32 = 0x4F6A
+0x2E33 = 0x4F6C
+0x2E34 = 0x4F7E
+0x2E35 = 0x4F8A
+0x2E36 = 0x4F94
+0x2E37 = 0x4F97
+0x2E38 = 0xFA30
+0x2E39 = 0x4FC9
+0x2E3A = 0x4FE0
+0x2E3B = 0x5001
+0x2E3C = 0x5002
+0x2E3D = 0x500E
+0x2E3E = 0x5018
+0x2E3F = 0x5027
+0x2E40 = 0x502E
+0x2E41 = 0x5040
+0x2E42 = 0x503B
+0x2E43 = 0x5041
+0x2E44 = 0x5094
+0x2E45 = 0x50CC
+0x2E46 = 0x50F2
+0x2E47 = 0x50D0
+0x2E48 = 0x50E6
+0x2E49 = 0xFA31
+0x2E4A = 0x5106
+0x2E4B = 0x5103
+0x2E4C = 0x510B
+0x2E4D = 0x511E
+0x2E4E = 0x5135
+0x2E4F = 0x514A
+0x2E50 = 0xFA32
+0x2E51 = 0x5155
+0x2E52 = 0x5157
+0x2E53 = 0x34B5
+0x2E54 = 0x519D
+0x2E55 = 0x51C3
+0x2E56 = 0x51CA
+0x2E57 = 0x51DE
+0x2E58 = 0x51E2
+0x2E59 = 0x51EE
+0x2E5A = 0x5201
+0x2E5B = 0x34DB
+0x2E5C = 0x5213
+0x2E5D = 0x5215
+0x2E5E = 0x5249
+0x2E5F = 0x5257
+0x2E60 = 0x5261
+0x2E61 = 0x5293
+0x2E62 = 0x52C8
+0x2E63 = 0xFA33
+0x2E64 = 0x52CC
+0x2E65 = 0x52D0
+0x2E66 = 0x52D6
+0x2E67 = 0x52DB
+0x2E68 = 0xFA34
+0x2E69 = 0x52F0
+0x2E6A = 0x52FB
+0x2E6B = 0x5300
+0x2E6C = 0x5307
+0x2E6D = 0x531C
+0x2E6E = 0xFA35
+0x2E6F = 0x5361
+0x2E70 = 0x5363
+0x2E71 = 0x537D
+0x2E72 = 0x5393
+0x2E73 = 0x539D
+0x2E74 = 0x53B2
+0x2E75 = 0x5412
+0x2E76 = 0x5427
+0x2E77 = 0x544D
+0x2E78 = 0x549C
+0x2E79 = 0x546B
+0x2E7A = 0x5474
+0x2E7B = 0x547F
+0x2E7C = 0x5488
+0x2E7D = 0x5496
+0x2E7E = 0x54A1
+0x2F21 = 0x54A9
+0x2F22 = 0x54C6
+0x2F23 = 0x54FF
+0x2F24 = 0x550E
+0x2F25 = 0x552B
+0x2F26 = 0x5535
+0x2F27 = 0x5550
+0x2F28 = 0x555E
+0x2F29 = 0x5581
+0x2F2A = 0x5586
+0x2F2B = 0x558E
+0x2F2C = 0xFA36
+0x2F2D = 0x55AD
+0x2F2E = 0x55CE
+0x2F2F = 0xFA37
+0x2F30 = 0x5608
+0x2F31 = 0x560E
+0x2F32 = 0x563B
+0x2F33 = 0x5649
+0x2F34 = 0x5676
+0x2F35 = 0x5666
+0x2F36 = 0xFA38
+0x2F37 = 0x566F
+0x2F38 = 0x5671
+0x2F39 = 0x5672
+0x2F3A = 0x5699
+0x2F3B = 0x569E
+0x2F3C = 0x56A9
+0x2F3D = 0x56AC
+0x2F3E = 0x56B3
+0x2F3F = 0x56C9
+0x2F40 = 0x56CA
+0x2F41 = 0x570A
+0x2F43 = 0x5721
+0x2F44 = 0x572F
+0x2F45 = 0x5733
+0x2F46 = 0x5734
+0x2F47 = 0x5770
+0x2F48 = 0x5777
+0x2F49 = 0x577C
+0x2F4A = 0x579C
+0x2F4B = 0xFA0F
+0x2F4D = 0x57B8
+0x2F4E = 0x57C7
+0x2F4F = 0x57C8
+0x2F50 = 0x57CF
+0x2F51 = 0x57E4
+0x2F52 = 0x57ED
+0x2F53 = 0x57F5
+0x2F54 = 0x57F6
+0x2F55 = 0x57FF
+0x2F56 = 0x5809
+0x2F57 = 0xFA10
+0x2F58 = 0x5861
+0x2F59 = 0x5864
+0x2F5A = 0xFA39
+0x2F5B = 0x587C
+0x2F5C = 0x5889
+0x2F5D = 0x589E
+0x2F5E = 0xFA3A
+0x2F5F = 0x58A9
+0x2F61 = 0x58D2
+0x2F62 = 0x58CE
+0x2F63 = 0x58D4
+0x2F64 = 0x58DA
+0x2F65 = 0x58E0
+0x2F66 = 0x58E9
+0x2F67 = 0x590C
+0x2F68 = 0x8641
+0x2F69 = 0x595D
+0x2F6A = 0x596D
+0x2F6B = 0x598B
+0x2F6C = 0x5992
+0x2F6D = 0x59A4
+0x2F6E = 0x59C3
+0x2F6F = 0x59D2
+0x2F70 = 0x59DD
+0x2F71 = 0x5A13
+0x2F72 = 0x5A23
+0x2F73 = 0x5A67
+0x2F74 = 0x5A6D
+0x2F75 = 0x5A77
+0x2F76 = 0x5A7E
+0x2F77 = 0x5A84
+0x2F78 = 0x5A9E
+0x2F79 = 0x5AA7
+0x2F7A = 0x5AC4
+0x2F7C = 0x5B19
+0x2F7D = 0x5B25
+0x2F7E = 0x525D
+0x4F55 = 0x5B41
+0x4F56 = 0x5B56
+0x4F57 = 0x5B7D
+0x4F58 = 0x5B93
+0x4F59 = 0x5BD8
+0x4F5A = 0x5BEC
+0x4F5B = 0x5C12
+0x4F5C = 0x5C1E
+0x4F5D = 0x5C23
+0x4F5E = 0x5C2B
+0x4F5F = 0x378D
+0x4F60 = 0x5C62
+0x4F61 = 0xFA3B
+0x4F62 = 0xFA3C
+0x4F64 = 0x5C7A
+0x4F65 = 0x5C8F
+0x4F66 = 0x5C9F
+0x4F67 = 0x5CA3
+0x4F68 = 0x5CAA
+0x4F69 = 0x5CBA
+0x4F6A = 0x5CCB
+0x4F6B = 0x5CD0
+0x4F6C = 0x5CD2
+0x4F6D = 0x5CF4
+0x4F6F = 0x37E2
+0x4F70 = 0x5D0D
+0x4F71 = 0x5D27
+0x4F72 = 0xFA11
+0x4F73 = 0x5D46
+0x4F74 = 0x5D47
+0x4F75 = 0x5D53
+0x4F76 = 0x5D4A
+0x4F77 = 0x5D6D
+0x4F78 = 0x5D81
+0x4F79 = 0x5DA0
+0x4F7A = 0x5DA4
+0x4F7B = 0x5DA7
+0x4F7C = 0x5DB8
+0x4F7D = 0x5DCB
+0x4F7E = 0x541E
+0x7427 = 0x5653
+0x7428 = 0x5DE2
+0x7429 = 0x5E14
+0x742A = 0x5E18
+0x742B = 0x5E58
+0x742C = 0x5E5E
+0x742D = 0x5EBE
+0x742E = 0xF928
+0x742F = 0x5ECB
+0x7430 = 0x5EF9
+0x7431 = 0x5F00
+0x7432 = 0x5F02
+0x7433 = 0x5F07
+0x7434 = 0x5F1D
+0x7435 = 0x5F23
+0x7436 = 0x5F34
+0x7437 = 0x5F36
+0x7438 = 0x5F3D
+0x7439 = 0x5F40
+0x743A = 0x5F45
+0x743B = 0x5F54
+0x743C = 0x5F58
+0x743D = 0x5F64
+0x743E = 0x5F67
+0x743F = 0x5F7D
+0x7440 = 0x5F89
+0x7441 = 0x5F9C
+0x7442 = 0x5FA7
+0x7443 = 0x5FAF
+0x7444 = 0x5FB5
+0x7445 = 0x5FB7
+0x7446 = 0x5FC9
+0x7447 = 0x5FDE
+0x7448 = 0x5FE1
+0x7449 = 0x5FE9
+0x744A = 0x600D
+0x744B = 0x6014
+0x744C = 0x6018
+0x744D = 0x6033
+0x744E = 0x6035
+0x744F = 0x6047
+0x7450 = 0xFA3D
+0x7451 = 0x609D
+0x7452 = 0x609E
+0x7453 = 0x60CB
+0x7454 = 0x60D4
+0x7455 = 0x60D5
+0x7456 = 0x60DD
+0x7457 = 0x60F8
+0x7458 = 0x611C
+0x7459 = 0x612B
+0x745A = 0x6130
+0x745B = 0x6137
+0x745C = 0xFA3E
+0x745D = 0x618D
+0x745E = 0xFA3F
+0x745F = 0x61BC
+0x7460 = 0x61B9
+0x7461 = 0xFA40
+0x7462 = 0x6222
+0x7463 = 0x623E
+0x7464 = 0x6243
+0x7465 = 0x6256
+0x7466 = 0x625A
+0x7467 = 0x626F
+0x7468 = 0x6285
+0x7469 = 0x62C4
+0x746A = 0x62D6
+0x746B = 0x62FC
+0x746C = 0x630A
+0x746D = 0x6318
+0x746E = 0x6339
+0x746F = 0x6343
+0x7470 = 0x6365
+0x7471 = 0x637C
+0x7472 = 0x63E5
+0x7473 = 0x63ED
+0x7474 = 0x63F5
+0x7475 = 0x6410
+0x7476 = 0x6414
+0x7477 = 0x6422
+0x7478 = 0x6479
+0x7479 = 0x6451
+0x747A = 0x6460
+0x747B = 0x646D
+0x747C = 0x64CE
+0x747D = 0x64BE
+0x747E = 0x64BF
+0x7521 = 0x64C4
+0x7522 = 0x64CA
+0x7523 = 0x64D0
+0x7524 = 0x64F7
+0x7525 = 0x64FB
+0x7526 = 0x6522
+0x7527 = 0x6529
+0x7528 = 0xFA41
+0x7529 = 0x6567
+0x752A = 0x659D
+0x752B = 0xFA42
+0x752C = 0x6600
+0x752D = 0x6609
+0x752E = 0x6615
+0x752F = 0x661E
+0x7530 = 0x663A
+0x7531 = 0x6622
+0x7532 = 0x6624
+0x7533 = 0x662B
+0x7534 = 0x6630
+0x7535 = 0x6631
+0x7536 = 0x6633
+0x7537 = 0x66FB
+0x7538 = 0x6648
+0x7539 = 0x664C
+0x753B = 0x6659
+0x753C = 0x665A
+0x753D = 0x6661
+0x753E = 0x6665
+0x753F = 0x6673
+0x7540 = 0x6677
+0x7541 = 0x6678
+0x7542 = 0x668D
+0x7543 = 0xFA43
+0x7544 = 0x66A0
+0x7545 = 0x66B2
+0x7546 = 0x66BB
+0x7547 = 0x66C6
+0x7548 = 0x66C8
+0x7549 = 0x3B22
+0x754A = 0x66DB
+0x754B = 0x66E8
+0x754C = 0x66FA
+0x754D = 0x6713
+0x754E = 0xF929
+0x754F = 0x6733
+0x7550 = 0x6766
+0x7551 = 0x6747
+0x7552 = 0x6748
+0x7553 = 0x677B
+0x7554 = 0x6781
+0x7555 = 0x6793
+0x7556 = 0x6798
+0x7557 = 0x679B
+0x7558 = 0x67BB
+0x7559 = 0x67F9
+0x755A = 0x67C0
+0x755B = 0x67D7
+0x755C = 0x67FC
+0x755D = 0x6801
+0x755E = 0x6852
+0x755F = 0x681D
+0x7560 = 0x682C
+0x7561 = 0x6831
+0x7562 = 0x685B
+0x7563 = 0x6872
+0x7564 = 0x6875
+0x7565 = 0xFA44
+0x7566 = 0x68A3
+0x7567 = 0x68A5
+0x7568 = 0x68B2
+0x7569 = 0x68C8
+0x756A = 0x68D0
+0x756B = 0x68E8
+0x756C = 0x68ED
+0x756D = 0x68F0
+0x756E = 0x68F1
+0x756F = 0x68FC
+0x7570 = 0x690A
+0x7571 = 0x6949
+0x7573 = 0x6935
+0x7574 = 0x6942
+0x7575 = 0x6957
+0x7576 = 0x6963
+0x7577 = 0x6964
+0x7578 = 0x6968
+0x7579 = 0x6980
+0x757A = 0xFA14
+0x757B = 0x69A5
+0x757C = 0x69AD
+0x757D = 0x69CF
+0x757E = 0x3BB6
+0x7621 = 0x3BC3
+0x7622 = 0x69E2
+0x7623 = 0x69E9
+0x7624 = 0x69EA
+0x7625 = 0x69F5
+0x7626 = 0x69F6
+0x7627 = 0x6A0F
+0x7628 = 0x6A15
+0x762A = 0x6A3B
+0x762B = 0x6A3E
+0x762C = 0x6A45
+0x762D = 0x6A50
+0x762E = 0x6A56
+0x762F = 0x6A5B
+0x7630 = 0x6A6B
+0x7631 = 0x6A73
+0x7633 = 0x6A89
+0x7634 = 0x6A94
+0x7635 = 0x6A9D
+0x7636 = 0x6A9E
+0x7637 = 0x6AA5
+0x7638 = 0x6AE4
+0x7639 = 0x6AE7
+0x763A = 0x3C0F
+0x763B = 0xF91D
+0x763C = 0x6B1B
+0x763D = 0x6B1E
+0x763E = 0x6B2C
+0x763F = 0x6B35
+0x7640 = 0x6B46
+0x7641 = 0x6B56
+0x7642 = 0x6B60
+0x7643 = 0x6B65
+0x7644 = 0x6B67
+0x7645 = 0x6B77
+0x7646 = 0x6B82
+0x7647 = 0x6BA9
+0x7648 = 0x6BAD
+0x7649 = 0xF970
+0x764A = 0x6BCF
+0x764B = 0x6BD6
+0x764C = 0x6BD7
+0x764D = 0x6BFF
+0x764E = 0x6C05
+0x764F = 0x6C10
+0x7650 = 0x6C33
+0x7651 = 0x6C59
+0x7652 = 0x6C5C
+0x7653 = 0x6CAA
+0x7654 = 0x6C74
+0x7655 = 0x6C76
+0x7656 = 0x6C85
+0x7657 = 0x6C86
+0x7658 = 0x6C98
+0x7659 = 0x6C9C
+0x765A = 0x6CFB
+0x765B = 0x6CC6
+0x765C = 0x6CD4
+0x765D = 0x6CE0
+0x765E = 0x6CEB
+0x765F = 0x6CEE
+0x7661 = 0x6D04
+0x7662 = 0x6D0E
+0x7663 = 0x6D2E
+0x7664 = 0x6D31
+0x7665 = 0x6D39
+0x7666 = 0x6D3F
+0x7667 = 0x6D58
+0x7668 = 0x6D65
+0x7669 = 0xFA45
+0x766A = 0x6D82
+0x766B = 0x6D87
+0x766C = 0x6D89
+0x766D = 0x6D94
+0x766E = 0x6DAA
+0x766F = 0x6DAC
+0x7670 = 0x6DBF
+0x7671 = 0x6DC4
+0x7672 = 0x6DD6
+0x7673 = 0x6DDA
+0x7674 = 0x6DDB
+0x7675 = 0x6DDD
+0x7676 = 0x6DFC
+0x7677 = 0xFA46
+0x7678 = 0x6E34
+0x7679 = 0x6E44
+0x767A = 0x6E5C
+0x767B = 0x6E5E
+0x767C = 0x6EAB
+0x767D = 0x6EB1
+0x767E = 0x6EC1
+0x7721 = 0x6EC7
+0x7722 = 0x6ECE
+0x7723 = 0x6F10
+0x7724 = 0x6F1A
+0x7725 = 0xFA47
+0x7726 = 0x6F2A
+0x7727 = 0x6F2F
+0x7728 = 0x6F33
+0x7729 = 0x6F51
+0x772A = 0x6F59
+0x772B = 0x6F5E
+0x772C = 0x6F61
+0x772D = 0x6F62
+0x772E = 0x6F7E
+0x772F = 0x6F88
+0x7730 = 0x6F8C
+0x7731 = 0x6F8D
+0x7732 = 0x6F94
+0x7733 = 0x6FA0
+0x7734 = 0x6FA7
+0x7735 = 0x6FB6
+0x7736 = 0x6FBC
+0x7737 = 0x6FC7
+0x7738 = 0x6FCA
+0x7739 = 0x6FF9
+0x773A = 0x6FF0
+0x773B = 0x6FF5
+0x773C = 0x7005
+0x773D = 0x7006
+0x773E = 0x7028
+0x773F = 0x704A
+0x7740 = 0x705D
+0x7741 = 0x705E
+0x7742 = 0x704E
+0x7743 = 0x7064
+0x7744 = 0x7075
+0x7745 = 0x7085
+0x7746 = 0x70A4
+0x7747 = 0x70AB
+0x7748 = 0x70B7
+0x7749 = 0x70D4
+0x774A = 0x70D8
+0x774B = 0x70E4
+0x774C = 0x710F
+0x774D = 0x712B
+0x774E = 0x711E
+0x774F = 0x7120
+0x7750 = 0x712E
+0x7751 = 0x7130
+0x7752 = 0x7146
+0x7753 = 0x7147
+0x7754 = 0x7151
+0x7755 = 0xFA48
+0x7756 = 0x7152
+0x7757 = 0x715C
+0x7758 = 0x7160
+0x7759 = 0x7168
+0x775A = 0xFA15
+0x775B = 0x7185
+0x775C = 0x7187
+0x775D = 0x7192
+0x775E = 0x71C1
+0x775F = 0x71BA
+0x7760 = 0x71C4
+0x7761 = 0x71FE
+0x7762 = 0x7200
+0x7763 = 0x7215
+0x7764 = 0x7255
+0x7765 = 0x7256
+0x7766 = 0x3E3F
+0x7767 = 0x728D
+0x7768 = 0x729B
+0x7769 = 0x72BE
+0x776A = 0x72C0
+0x776B = 0x72FB
+0x776D = 0x7327
+0x776E = 0x7328
+0x776F = 0xFA16
+0x7770 = 0x7350
+0x7771 = 0x7366
+0x7772 = 0x737C
+0x7773 = 0x7395
+0x7774 = 0x739F
+0x7775 = 0x73A0
+0x7776 = 0x73A2
+0x7777 = 0x73A6
+0x7778 = 0x73AB
+0x7779 = 0x73C9
+0x777A = 0x73CF
+0x777B = 0x73D6
+0x777C = 0x73D9
+0x777D = 0x73E3
+0x777E = 0x73E9
+0x7821 = 0x7407
+0x7822 = 0x740A
+0x7823 = 0x741A
+0x7824 = 0x741B
+0x7825 = 0xFA4A
+0x7826 = 0x7426
+0x7827 = 0x7428
+0x7828 = 0x742A
+0x7829 = 0x742B
+0x782A = 0x742C
+0x782B = 0x742E
+0x782C = 0x742F
+0x782D = 0x7430
+0x782E = 0x7444
+0x782F = 0x7446
+0x7830 = 0x7447
+0x7831 = 0x744B
+0x7832 = 0x7457
+0x7833 = 0x7462
+0x7834 = 0x746B
+0x7835 = 0x746D
+0x7836 = 0x7486
+0x7837 = 0x7487
+0x7838 = 0x7489
+0x7839 = 0x7498
+0x783A = 0x749C
+0x783B = 0x749F
+0x783C = 0x74A3
+0x783D = 0x7490
+0x783E = 0x74A6
+0x783F = 0x74A8
+0x7840 = 0x74A9
+0x7841 = 0x74B5
+0x7842 = 0x74BF
+0x7843 = 0x74C8
+0x7844 = 0x74C9
+0x7845 = 0x74DA
+0x7846 = 0x74FF
+0x7847 = 0x7501
+0x7848 = 0x7517
+0x7849 = 0x752F
+0x784A = 0x756F
+0x784B = 0x7579
+0x784C = 0x7592
+0x784D = 0x3F72
+0x784E = 0x75CE
+0x784F = 0x75E4
+0x7850 = 0x7600
+0x7851 = 0x7602
+0x7852 = 0x7608
+0x7853 = 0x7615
+0x7854 = 0x7616
+0x7855 = 0x7619
+0x7856 = 0x761E
+0x7857 = 0x762D
+0x7858 = 0x7635
+0x7859 = 0x7643
+0x785A = 0x764B
+0x785B = 0x7664
+0x785C = 0x7665
+0x785D = 0x766D
+0x785E = 0x766F
+0x785F = 0x7671
+0x7860 = 0x7681
+0x7861 = 0x769B
+0x7862 = 0x769D
+0x7863 = 0x769E
+0x7864 = 0x76A6
+0x7865 = 0x76AA
+0x7866 = 0x76B6
+0x7867 = 0x76C5
+0x7868 = 0x76CC
+0x7869 = 0x76CE
+0x786A = 0x76D4
+0x786B = 0x76E6
+0x786C = 0x76F1
+0x786D = 0x76FC
+0x786E = 0x770A
+0x786F = 0x7719
+0x7870 = 0x7734
+0x7871 = 0x7736
+0x7872 = 0x7746
+0x7873 = 0x774D
+0x7874 = 0x774E
+0x7875 = 0x775C
+0x7876 = 0x775F
+0x7877 = 0x7762
+0x7878 = 0x777A
+0x7879 = 0x7780
+0x787A = 0x7794
+0x787B = 0x77AA
+0x787C = 0x77E0
+0x787D = 0x782D
+0x7921 = 0x7843
+0x7922 = 0x784E
+0x7923 = 0x784F
+0x7924 = 0x7851
+0x7925 = 0x7868
+0x7926 = 0x786E
+0x7927 = 0xFA4B
+0x7928 = 0x78B0
+0x792A = 0x78AD
+0x792B = 0x78E4
+0x792C = 0x78F2
+0x792D = 0x7900
+0x792E = 0x78F7
+0x792F = 0x791C
+0x7930 = 0x792E
+0x7931 = 0x7931
+0x7932 = 0x7934
+0x7933 = 0xFA4C
+0x7934 = 0xFA4D
+0x7935 = 0x7945
+0x7936 = 0x7946
+0x7937 = 0xFA4E
+0x7938 = 0xFA4F
+0x7939 = 0xFA50
+0x793A = 0x795C
+0x793B = 0xFA51
+0x793C = 0xFA19
+0x793D = 0xFA1A
+0x793E = 0x7979
+0x793F = 0xFA52
+0x7940 = 0xFA53
+0x7941 = 0xFA1B
+0x7942 = 0x7998
+0x7943 = 0x79B1
+0x7944 = 0x79B8
+0x7945 = 0x79C8
+0x7946 = 0x79CA
+0x7948 = 0x79D4
+0x7949 = 0x79DE
+0x794A = 0x79EB
+0x794B = 0x79ED
+0x794C = 0x7A03
+0x794D = 0xFA54
+0x794E = 0x7A39
+0x794F = 0x7A5D
+0x7950 = 0x7A6D
+0x7951 = 0xFA55
+0x7952 = 0x7A85
+0x7953 = 0x7AA0
+0x7955 = 0x7AB3
+0x7956 = 0x7ABB
+0x7957 = 0x7ACE
+0x7958 = 0x7AEB
+0x7959 = 0x7AFD
+0x795A = 0x7B12
+0x795B = 0x7B2D
+0x795C = 0x7B3B
+0x795D = 0x7B47
+0x795E = 0x7B4E
+0x795F = 0x7B60
+0x7960 = 0x7B6D
+0x7961 = 0x7B6F
+0x7962 = 0x7B72
+0x7963 = 0x7B9E
+0x7964 = 0xFA56
+0x7965 = 0x7BD7
+0x7966 = 0x7BD9
+0x7967 = 0x7C01
+0x7968 = 0x7C31
+0x7969 = 0x7C1E
+0x796A = 0x7C20
+0x796B = 0x7C33
+0x796C = 0x7C36
+0x796D = 0x4264
+0x796F = 0x7C59
+0x7970 = 0x7C6D
+0x7971 = 0x7C79
+0x7972 = 0x7C8F
+0x7973 = 0x7C94
+0x7974 = 0x7CA0
+0x7975 = 0x7CBC
+0x7976 = 0x7CD5
+0x7977 = 0x7CD9
+0x7978 = 0x7CDD
+0x7979 = 0x7D07
+0x797A = 0x7D08
+0x797B = 0x7D13
+0x797C = 0x7D1D
+0x797D = 0x7D23
+0x797E = 0x7D31
+0x7A21 = 0x7D41
+0x7A22 = 0x7D48
+0x7A23 = 0x7D53
+0x7A24 = 0x7D5C
+0x7A25 = 0x7D7A
+0x7A26 = 0x7D83
+0x7A27 = 0x7D8B
+0x7A28 = 0x7DA0
+0x7A29 = 0x7DA6
+0x7A2A = 0x7DC2
+0x7A2B = 0x7DCC
+0x7A2C = 0x7DD6
+0x7A2D = 0x7DE3
+0x7A2E = 0xFA57
+0x7A2F = 0x7E28
+0x7A30 = 0x7E08
+0x7A31 = 0x7E11
+0x7A32 = 0x7E15
+0x7A33 = 0xFA59
+0x7A34 = 0x7E47
+0x7A35 = 0x7E52
+0x7A36 = 0x7E61
+0x7A37 = 0x7E8A
+0x7A38 = 0x7E8D
+0x7A39 = 0x7F47
+0x7A3A = 0xFA5A
+0x7A3B = 0x7F91
+0x7A3C = 0x7F97
+0x7A3D = 0x7FBF
+0x7A3E = 0x7FCE
+0x7A3F = 0x7FDB
+0x7A40 = 0x7FDF
+0x7A41 = 0x7FEC
+0x7A42 = 0x7FEE
+0x7A43 = 0x7FFA
+0x7A44 = 0xFA5B
+0x7A45 = 0x8014
+0x7A46 = 0x8026
+0x7A47 = 0x8035
+0x7A48 = 0x8037
+0x7A49 = 0x803C
+0x7A4A = 0x80CA
+0x7A4B = 0x80D7
+0x7A4C = 0x80E0
+0x7A4D = 0x80F3
+0x7A4E = 0x8118
+0x7A4F = 0x814A
+0x7A50 = 0x8160
+0x7A51 = 0x8167
+0x7A52 = 0x8168
+0x7A53 = 0x816D
+0x7A54 = 0x81BB
+0x7A55 = 0x81CA
+0x7A56 = 0x81CF
+0x7A57 = 0x81D7
+0x7A58 = 0xFA5C
+0x7A59 = 0x4453
+0x7A5A = 0x445B
+0x7A5B = 0x8260
+0x7A5C = 0x8274
+0x7A5E = 0x828E
+0x7A5F = 0x82A1
+0x7A60 = 0x82A3
+0x7A61 = 0x82A4
+0x7A62 = 0x82A9
+0x7A63 = 0x82AE
+0x7A64 = 0x82B7
+0x7A65 = 0x82BE
+0x7A66 = 0x82BF
+0x7A67 = 0x82C6
+0x7A68 = 0x82D5
+0x7A69 = 0x82FD
+0x7A6A = 0x82FE
+0x7A6B = 0x8300
+0x7A6C = 0x8301
+0x7A6D = 0x8362
+0x7A6E = 0x8322
+0x7A6F = 0x832D
+0x7A70 = 0x833A
+0x7A71 = 0x8343
+0x7A72 = 0x8347
+0x7A73 = 0x8351
+0x7A74 = 0x8355
+0x7A75 = 0x837D
+0x7A76 = 0x8386
+0x7A77 = 0x8392
+0x7A78 = 0x8398
+0x7A79 = 0x83A7
+0x7A7A = 0x83A9
+0x7A7B = 0x83BF
+0x7A7C = 0x83C0
+0x7A7D = 0x83C7
+0x7A7E = 0x83CF
+0x7B21 = 0x83D1
+0x7B22 = 0x83E1
+0x7B23 = 0x83EA
+0x7B24 = 0x8401
+0x7B25 = 0x8406
+0x7B26 = 0x840A
+0x7B27 = 0xFA5F
+0x7B28 = 0x8448
+0x7B29 = 0x845F
+0x7B2A = 0x8470
+0x7B2B = 0x8473
+0x7B2C = 0x8485
+0x7B2D = 0x849E
+0x7B2E = 0x84AF
+0x7B2F = 0x84B4
+0x7B30 = 0x84BA
+0x7B31 = 0x84C0
+0x7B32 = 0x84C2
+0x7B34 = 0x8532
+0x7B35 = 0x851E
+0x7B36 = 0x8523
+0x7B37 = 0x852F
+0x7B38 = 0x8559
+0x7B39 = 0x8564
+0x7B3A = 0xFA1F
+0x7B3B = 0x85AD
+0x7B3C = 0x857A
+0x7B3D = 0x858C
+0x7B3E = 0x858F
+0x7B3F = 0x85A2
+0x7B40 = 0x85B0
+0x7B41 = 0x85CB
+0x7B42 = 0x85CE
+0x7B43 = 0x85ED
+0x7B44 = 0x8612
+0x7B45 = 0x85FF
+0x7B46 = 0x8604
+0x7B47 = 0x8605
+0x7B48 = 0x8610
+0x7B4A = 0x8618
+0x7B4B = 0x8629
+0x7B4C = 0x8638
+0x7B4D = 0x8657
+0x7B4E = 0x865B
+0x7B4F = 0xF936
+0x7B50 = 0x8662
+0x7B51 = 0x459D
+0x7B52 = 0x866C
+0x7B53 = 0x8675
+0x7B54 = 0x8698
+0x7B55 = 0x86B8
+0x7B56 = 0x86FA
+0x7B57 = 0x86FC
+0x7B58 = 0x86FD
+0x7B59 = 0x870B
+0x7B5A = 0x8771
+0x7B5B = 0x8787
+0x7B5C = 0x8788
+0x7B5D = 0x87AC
+0x7B5E = 0x87AD
+0x7B5F = 0x87B5
+0x7B60 = 0x45EA
+0x7B61 = 0x87D6
+0x7B62 = 0x87EC
+0x7B63 = 0x8806
+0x7B64 = 0x880A
+0x7B65 = 0x8810
+0x7B66 = 0x8814
+0x7B67 = 0x881F
+0x7B68 = 0x8898
+0x7B69 = 0x88AA
+0x7B6A = 0x88CA
+0x7B6B = 0x88CE
+0x7B6D = 0x88F5
+0x7B6E = 0x891C
+0x7B6F = 0xFA60
+0x7B70 = 0x8918
+0x7B71 = 0x8919
+0x7B72 = 0x891A
+0x7B73 = 0x8927
+0x7B74 = 0x8930
+0x7B75 = 0x8932
+0x7B76 = 0x8939
+0x7B77 = 0x8940
+0x7B78 = 0x8994
+0x7B79 = 0xFA61
+0x7B7A = 0x89D4
+0x7B7B = 0x89E5
+0x7B7C = 0x89F6
+0x7B7D = 0x8A12
+0x7B7E = 0x8A15
+0x7C21 = 0x8A22
+0x7C22 = 0x8A37
+0x7C23 = 0x8A47
+0x7C24 = 0x8A4E
+0x7C25 = 0x8A5D
+0x7C26 = 0x8A61
+0x7C27 = 0x8A75
+0x7C28 = 0x8A79
+0x7C29 = 0x8AA7
+0x7C2A = 0x8AD0
+0x7C2B = 0x8ADF
+0x7C2C = 0x8AF4
+0x7C2D = 0x8AF6
+0x7C2E = 0xFA22
+0x7C2F = 0xFA62
+0x7C30 = 0xFA63
+0x7C31 = 0x8B46
+0x7C32 = 0x8B54
+0x7C33 = 0x8B59
+0x7C34 = 0x8B69
+0x7C35 = 0x8B9D
+0x7C36 = 0x8C49
+0x7C37 = 0x8C68
+0x7C38 = 0xFA64
+0x7C39 = 0x8CE1
+0x7C3A = 0x8CF4
+0x7C3B = 0x8CF8
+0x7C3C = 0x8CFE
+0x7C3D = 0xFA65
+0x7C3E = 0x8D12
+0x7C3F = 0x8D1B
+0x7C40 = 0x8DAF
+0x7C41 = 0x8DCE
+0x7C42 = 0x8DD1
+0x7C43 = 0x8DD7
+0x7C44 = 0x8E20
+0x7C45 = 0x8E23
+0x7C46 = 0x8E3D
+0x7C47 = 0x8E70
+0x7C48 = 0x8E7B
+0x7C4A = 0x8EC0
+0x7C4B = 0x4844
+0x7C4C = 0x8EFA
+0x7C4D = 0x8F1E
+0x7C4E = 0x8F2D
+0x7C4F = 0x8F36
+0x7C50 = 0x8F54
+0x7C52 = 0x8FA6
+0x7C53 = 0x8FB5
+0x7C54 = 0x8FE4
+0x7C55 = 0x8FE8
+0x7C56 = 0x8FEE
+0x7C57 = 0x9008
+0x7C58 = 0x902D
+0x7C59 = 0xFA67
+0x7C5A = 0x9088
+0x7C5B = 0x9095
+0x7C5C = 0x9097
+0x7C5D = 0x9099
+0x7C5E = 0x909B
+0x7C5F = 0x90A2
+0x7C60 = 0x90B3
+0x7C61 = 0x90BE
+0x7C62 = 0x90C4
+0x7C63 = 0x90C5
+0x7C64 = 0x90C7
+0x7C65 = 0x90D7
+0x7C66 = 0x90DD
+0x7C67 = 0x90DE
+0x7C68 = 0x90EF
+0x7C69 = 0x90F4
+0x7C6A = 0xFA26
+0x7C6B = 0x9114
+0x7C6C = 0x9115
+0x7C6D = 0x9116
+0x7C6E = 0x9122
+0x7C6F = 0x9123
+0x7C70 = 0x9127
+0x7C71 = 0x912F
+0x7C72 = 0x9131
+0x7C73 = 0x9134
+0x7C74 = 0x913D
+0x7C75 = 0x9148
+0x7C76 = 0x915B
+0x7C77 = 0x9183
+0x7C78 = 0x919E
+0x7C79 = 0x91AC
+0x7C7A = 0x91B1
+0x7C7B = 0x91BC
+0x7C7C = 0x91D7
+0x7C7D = 0x91FB
+0x7C7E = 0x91E4
+0x7D21 = 0x91E5
+0x7D22 = 0x91ED
+0x7D23 = 0x91F1
+0x7D24 = 0x9207
+0x7D25 = 0x9210
+0x7D26 = 0x9238
+0x7D27 = 0x9239
+0x7D28 = 0x923A
+0x7D29 = 0x923C
+0x7D2A = 0x9240
+0x7D2B = 0x9243
+0x7D2C = 0x924F
+0x7D2D = 0x9278
+0x7D2E = 0x9288
+0x7D2F = 0x92C2
+0x7D30 = 0x92CB
+0x7D31 = 0x92CC
+0x7D32 = 0x92D3
+0x7D33 = 0x92E0
+0x7D34 = 0x92FF
+0x7D35 = 0x9304
+0x7D36 = 0x931F
+0x7D37 = 0x9321
+0x7D38 = 0x9325
+0x7D39 = 0x9348
+0x7D3A = 0x9349
+0x7D3B = 0x934A
+0x7D3C = 0x9364
+0x7D3D = 0x9365
+0x7D3E = 0x936A
+0x7D3F = 0x9370
+0x7D40 = 0x939B
+0x7D41 = 0x93A3
+0x7D42 = 0x93BA
+0x7D43 = 0x93C6
+0x7D44 = 0x93DE
+0x7D45 = 0x93DF
+0x7D46 = 0x9404
+0x7D47 = 0x93FD
+0x7D48 = 0x9433
+0x7D49 = 0x944A
+0x7D4A = 0x9463
+0x7D4B = 0x946B
+0x7D4C = 0x9471
+0x7D4D = 0x9472
+0x7D4E = 0x958E
+0x7D4F = 0x959F
+0x7D50 = 0x95A6
+0x7D51 = 0x95A9
+0x7D52 = 0x95AC
+0x7D53 = 0x95B6
+0x7D54 = 0x95BD
+0x7D55 = 0x95CB
+0x7D56 = 0x95D0
+0x7D57 = 0x95D3
+0x7D58 = 0x49B0
+0x7D59 = 0x95DA
+0x7D5A = 0x95DE
+0x7D5B = 0x9658
+0x7D5C = 0x9684
+0x7D5D = 0xF9DC
+0x7D5E = 0x969D
+0x7D5F = 0x96A4
+0x7D60 = 0x96A5
+0x7D61 = 0x96D2
+0x7D62 = 0x96DE
+0x7D63 = 0xFA68
+0x7D64 = 0x96E9
+0x7D65 = 0x96EF
+0x7D66 = 0x9733
+0x7D67 = 0x973B
+0x7D68 = 0x974D
+0x7D69 = 0x974E
+0x7D6A = 0x974F
+0x7D6B = 0x975A
+0x7D6C = 0x976E
+0x7D6D = 0x9773
+0x7D6E = 0x9795
+0x7D6F = 0x97AE
+0x7D70 = 0x97BA
+0x7D71 = 0x97C1
+0x7D72 = 0x97C9
+0x7D73 = 0x97DE
+0x7D74 = 0x97DB
+0x7D75 = 0x97F4
+0x7D76 = 0xFA69
+0x7D77 = 0x980A
+0x7D78 = 0x981E
+0x7D79 = 0x982B
+0x7D7A = 0x9830
+0x7D7B = 0xFA6A
+0x7D7C = 0x9852
+0x7D7D = 0x9853
+0x7D7E = 0x9856
+0x7E21 = 0x9857
+0x7E22 = 0x9859
+0x7E23 = 0x985A
+0x7E24 = 0xF9D0
+0x7E25 = 0x9865
+0x7E26 = 0x986C
+0x7E27 = 0x98BA
+0x7E28 = 0x98C8
+0x7E29 = 0x98E7
+0x7E2A = 0x9958
+0x7E2B = 0x999E
+0x7E2C = 0x9A02
+0x7E2D = 0x9A03
+0x7E2E = 0x9A24
+0x7E2F = 0x9A2D
+0x7E30 = 0x9A2E
+0x7E31 = 0x9A38
+0x7E32 = 0x9A4A
+0x7E33 = 0x9A4E
+0x7E34 = 0x9A52
+0x7E35 = 0x9AB6
+0x7E36 = 0x9AC1
+0x7E37 = 0x9AC3
+0x7E38 = 0x9ACE
+0x7E39 = 0x9AD6
+0x7E3A = 0x9AF9
+0x7E3B = 0x9B02
+0x7E3C = 0x9B08
+0x7E3D = 0x9B20
+0x7E3E = 0x4C17
+0x7E3F = 0x9B2D
+0x7E40 = 0x9B5E
+0x7E41 = 0x9B79
+0x7E42 = 0x9B66
+0x7E43 = 0x9B72
+0x7E44 = 0x9B75
+0x7E45 = 0x9B84
+0x7E46 = 0x9B8A
+0x7E47 = 0x9B8F
+0x7E48 = 0x9B9E
+0x7E49 = 0x9BA7
+0x7E4A = 0x9BC1
+0x7E4B = 0x9BCE
+0x7E4C = 0x9BE5
+0x7E4D = 0x9BF8
+0x7E4E = 0x9BFD
+0x7E4F = 0x9C00
+0x7E50 = 0x9C23
+0x7E51 = 0x9C41
+0x7E52 = 0x9C4F
+0x7E53 = 0x9C50
+0x7E54 = 0x9C53
+0x7E55 = 0x9C63
+0x7E56 = 0x9C65
+0x7E57 = 0x9C77
+0x7E58 = 0x9D1D
+0x7E59 = 0x9D1E
+0x7E5A = 0x9D43
+0x7E5B = 0x9D47
+0x7E5C = 0x9D52
+0x7E5D = 0x9D63
+0x7E5E = 0x9D70
+0x7E5F = 0x9D7C
+0x7E60 = 0x9D8A
+0x7E61 = 0x9D96
+0x7E62 = 0x9DC0
+0x7E63 = 0x9DAC
+0x7E64 = 0x9DBC
+0x7E65 = 0x9DD7
+0x7E67 = 0x9DE7
+0x7E68 = 0x9E07
+0x7E69 = 0x9E15
+0x7E6A = 0x9E7C
+0x7E6B = 0x9E9E
+0x7E6C = 0x9EA4
+0x7E6D = 0x9EAC
+0x7E6E = 0x9EAF
+0x7E6F = 0x9EB4
+0x7E70 = 0x9EB5
+0x7E71 = 0x9EC3
+0x7E72 = 0x9ED1
+0x7E73 = 0x9F10
+0x7E74 = 0x9F39
+0x7E75 = 0x9F57
+0x7E76 = 0x9F90
+0x7E77 = 0x9F94
+0x7E78 = 0x9F97
+0x7E79 = 0x9FA2
+0x7E7A = 0x59F8
+0x7E7B = 0x5C5B
+0x7E7C = 0x5E77
+0x7E7D = 0x7626
+0x7E7E = 0x7E6B
+END_MAP
diff --git a/enc/trans/JIS/JISX0213-1%UCS@SIP.src b/enc/trans/JIS/JISX0213-1%UCS@SIP.src
new file mode 100644
index 0000000000..da7eab62a7
--- /dev/null
+++ b/enc/trans/JIS/JISX0213-1%UCS@SIP.src
@@ -0,0 +1,60 @@
+# $NetBSD: JISX0213-1%UCS@SIP.src,v 1.1 2007/03/05 16:58:33 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"JISX0213-1/UCS:SIP"
+SRC_ZONE	0x21-0x7E / 0x21-0x7E / 8
+OOB_MODE	INVALID
+DST_INVALID	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+## JIS X 0213:2004 vs Unicode mapping table
+## 
+## Date: 22 May 2006
+## License:
+## 	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.
+## Note:
+## 	3-XXXX	JIS X 0213:2004 plane 1 (GL encoding)
+## 	4-XXXX	JIS X 0213:2000 plane 2 (GL encoding)
+## 	[1983]	JIS codepoint defined by JIS X 0208-1983
+## 	[1990]	JIS codepoint defined by JIS X 0208-1990
+## 	[2000]	JIS codepoint defined by JIS X 0213:2000
+## 	[2004]	JIS codepoint defined by JIS X 0213:2004
+## 	[Unicode3.1]	UCS codepoint defined by Unicode 3.1
+## 	[Unicode3.2]	UCS codepoint defined by Unicode 3.2
+## 	Fullwidth	UCS fullwidth form (U+Fxxx)
+## 	Windows 	Windows (CP932) mapping
+## 	Some 0213 character can't represent by one UCS character.
+## 	In this table, such characters are described as 'U+xxxx+xxxx'.
+## 
+## JIS	Unicode	Name	Note
+0x2E22 = 0x000B
+0x2F42 = 0x123D
+0x2F4C = 0x131B
+0x2F60 = 0x146E
+0x2F7B = 0x18BD
+0x4F54 = 0x0B9F
+0x4F63 = 0x16B4
+0x4F6E = 0x1E34
+0x753A = 0x31C4
+0x7572 = 0x35C4
+0x7629 = 0x373F
+0x7632 = 0x3763
+0x7660 = 0x3CFE
+0x776C = 0x47F1
+0x787E = 0x548E
+0x7929 = 0x550E
+0x7947 = 0x5771
+0x7954 = 0x59C4
+0x796E = 0x5DA1
+0x7A5D = 0x6AFF
+0x7B33 = 0x6E40
+0x7B49 = 0x70F4
+0x7B6C = 0x7684
+0x7C49 = 0x8277
+0x7C51 = 0x83CD
+0x7E66 = 0xA190
+END_MAP
diff --git a/enc/trans/JIS/JISX0213-2%UCS@BMP.src b/enc/trans/JIS/JISX0213-2%UCS@BMP.src
new file mode 100644
index 0000000000..e22ef8aa26
--- /dev/null
+++ b/enc/trans/JIS/JISX0213-2%UCS@BMP.src
@@ -0,0 +1,2193 @@
+# $NetBSD: JISX0213-2%UCS@BMP.src,v 1.1 2007/03/05 16:58:33 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"JISX0213-2/UCS:BMP"
+SRC_ZONE	0x21-0x7E / 0x21-0x7E / 8
+OOB_MODE	INVALID
+DST_INVALID	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+## JIS X 0213:2004 vs Unicode mapping table
+## 
+## Date: 22 May 2006
+## License:
+## 	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.
+## Note:
+## 	3-XXXX	JIS X 0213:2004 plane 1 (GL encoding)
+## 	4-XXXX	JIS X 0213:2000 plane 2 (GL encoding)
+## 	[1983]	JIS codepoint defined by JIS X 0208-1983
+## 	[1990]	JIS codepoint defined by JIS X 0208-1990
+## 	[2000]	JIS codepoint defined by JIS X 0213:2000
+## 	[2004]	JIS codepoint defined by JIS X 0213:2004
+## 	[Unicode3.1]	UCS codepoint defined by Unicode 3.1
+## 	[Unicode3.2]	UCS codepoint defined by Unicode 3.2
+## 	Fullwidth	UCS fullwidth form (U+Fxxx)
+## 	Windows 	Windows (CP932) mapping
+## 	Some 0213 character can't represent by one UCS character.
+## 	In this table, such characters are described as 'U+xxxx+xxxx'.
+## 
+## JIS	Unicode	Name	Note
+0x2122 = 0x4E02
+0x2123 = 0x4E0F
+0x2124 = 0x4E12
+0x2125 = 0x4E29
+0x2126 = 0x4E2B
+0x2127 = 0x4E2E
+0x2128 = 0x4E40
+0x2129 = 0x4E47
+0x212A = 0x4E48
+0x212C = 0x4E51
+0x212D = 0x3406
+0x212F = 0x4E5A
+0x2130 = 0x4E69
+0x2131 = 0x4E9D
+0x2132 = 0x342C
+0x2133 = 0x342E
+0x2134 = 0x4EB9
+0x2135 = 0x4EBB
+0x2137 = 0x4EBC
+0x2138 = 0x4EC3
+0x2139 = 0x4EC8
+0x213A = 0x4ED0
+0x213B = 0x4EEB
+0x213C = 0x4EDA
+0x213D = 0x4EF1
+0x213E = 0x4EF5
+0x213F = 0x4F00
+0x2140 = 0x4F16
+0x2141 = 0x4F64
+0x2142 = 0x4F37
+0x2143 = 0x4F3E
+0x2144 = 0x4F54
+0x2145 = 0x4F58
+0x2147 = 0x4F77
+0x2148 = 0x4F78
+0x2149 = 0x4F7A
+0x214A = 0x4F7D
+0x214B = 0x4F82
+0x214C = 0x4F85
+0x214D = 0x4F92
+0x214E = 0x4F9A
+0x214F = 0x4FE6
+0x2150 = 0x4FB2
+0x2151 = 0x4FBE
+0x2152 = 0x4FC5
+0x2153 = 0x4FCB
+0x2154 = 0x4FCF
+0x2155 = 0x4FD2
+0x2156 = 0x346A
+0x2157 = 0x4FF2
+0x2158 = 0x5000
+0x2159 = 0x5010
+0x215A = 0x5013
+0x215B = 0x501C
+0x215C = 0x501E
+0x215D = 0x5022
+0x215E = 0x3468
+0x215F = 0x5042
+0x2160 = 0x5046
+0x2161 = 0x504E
+0x2162 = 0x5053
+0x2163 = 0x5057
+0x2164 = 0x5063
+0x2165 = 0x5066
+0x2166 = 0x506A
+0x2167 = 0x5070
+0x2168 = 0x50A3
+0x2169 = 0x5088
+0x216A = 0x5092
+0x216B = 0x5093
+0x216C = 0x5095
+0x216D = 0x5096
+0x216E = 0x509C
+0x216F = 0x50AA
+0x2171 = 0x50B1
+0x2172 = 0x50BA
+0x2173 = 0x50BB
+0x2174 = 0x50C4
+0x2175 = 0x50C7
+0x2176 = 0x50F3
+0x2178 = 0x50CE
+0x217A = 0x50D4
+0x217B = 0x50D9
+0x217C = 0x50E1
+0x217D = 0x50E9
+0x217E = 0x3492
+0x2321 = 0x5108
+0x2323 = 0x5117
+0x2324 = 0x511B
+0x2326 = 0x5160
+0x2328 = 0x5173
+0x2329 = 0x5183
+0x232A = 0x518B
+0x232B = 0x34BC
+0x232C = 0x5198
+0x232D = 0x51A3
+0x232E = 0x51AD
+0x232F = 0x34C7
+0x2330 = 0x51BC
+0x2333 = 0x51F3
+0x2334 = 0x51F4
+0x2335 = 0x5202
+0x2336 = 0x5212
+0x2337 = 0x5216
+0x2339 = 0x5255
+0x233A = 0x525C
+0x233B = 0x526C
+0x233C = 0x5277
+0x233D = 0x5284
+0x233E = 0x5282
+0x2340 = 0x5298
+0x2342 = 0x52A4
+0x2343 = 0x52A6
+0x2344 = 0x52AF
+0x2345 = 0x52BA
+0x2346 = 0x52BB
+0x2347 = 0x52CA
+0x2348 = 0x351F
+0x2349 = 0x52D1
+0x234B = 0x52F7
+0x234C = 0x530A
+0x234D = 0x530B
+0x234E = 0x5324
+0x234F = 0x5335
+0x2350 = 0x533E
+0x2351 = 0x5342
+0x2354 = 0x5367
+0x2355 = 0x536C
+0x2356 = 0x537A
+0x2357 = 0x53A4
+0x2358 = 0x53B4
+0x235A = 0x53B7
+0x235B = 0x53C0
+0x235D = 0x355D
+0x235E = 0x355E
+0x235F = 0x53D5
+0x2360 = 0x53DA
+0x2361 = 0x3563
+0x2362 = 0x53F4
+0x2363 = 0x53F5
+0x2364 = 0x5455
+0x2365 = 0x5424
+0x2366 = 0x5428
+0x2367 = 0x356E
+0x2368 = 0x5443
+0x2369 = 0x5462
+0x236A = 0x5466
+0x236B = 0x546C
+0x236C = 0x548A
+0x236D = 0x548D
+0x236E = 0x5495
+0x236F = 0x54A0
+0x2370 = 0x54A6
+0x2371 = 0x54AD
+0x2372 = 0x54AE
+0x2373 = 0x54B7
+0x2374 = 0x54BA
+0x2375 = 0x54BF
+0x2376 = 0x54C3
+0x2378 = 0x54EC
+0x2379 = 0x54EF
+0x237A = 0x54F1
+0x237B = 0x54F3
+0x237C = 0x5500
+0x237D = 0x5501
+0x237E = 0x5509
+0x2421 = 0x553C
+0x2422 = 0x5541
+0x2423 = 0x35A6
+0x2424 = 0x5547
+0x2425 = 0x554A
+0x2426 = 0x35A8
+0x2427 = 0x5560
+0x2428 = 0x5561
+0x2429 = 0x5564
+0x242B = 0x557D
+0x242C = 0x5582
+0x242D = 0x5588
+0x242E = 0x5591
+0x242F = 0x35C5
+0x2430 = 0x55D2
+0x2433 = 0x55BF
+0x2434 = 0x55C9
+0x2435 = 0x55CC
+0x2436 = 0x55D1
+0x2437 = 0x55DD
+0x2438 = 0x35DA
+0x2439 = 0x55E2
+0x243B = 0x55E9
+0x243C = 0x5628
+0x243E = 0x5607
+0x243F = 0x5610
+0x2440 = 0x5630
+0x2441 = 0x5637
+0x2442 = 0x35F4
+0x2443 = 0x563D
+0x2444 = 0x563F
+0x2445 = 0x5640
+0x2446 = 0x5647
+0x2447 = 0x565E
+0x2448 = 0x5660
+0x2449 = 0x566D
+0x244A = 0x3605
+0x244B = 0x5688
+0x244C = 0x568C
+0x244D = 0x5695
+0x244E = 0x569A
+0x244F = 0x569D
+0x2450 = 0x56A8
+0x2451 = 0x56AD
+0x2452 = 0x56B2
+0x2453 = 0x56C5
+0x2454 = 0x56CD
+0x2455 = 0x56DF
+0x2456 = 0x56E8
+0x2457 = 0x56F6
+0x2458 = 0x56F7
+0x245A = 0x5715
+0x245B = 0x5723
+0x245D = 0x5729
+0x245F = 0x5745
+0x2460 = 0x5746
+0x2461 = 0x574C
+0x2462 = 0x574D
+0x2464 = 0x5768
+0x2465 = 0x576F
+0x2466 = 0x5773
+0x2467 = 0x5774
+0x2468 = 0x5775
+0x2469 = 0x577B
+0x246C = 0x57AC
+0x246D = 0x579A
+0x246E = 0x579D
+0x246F = 0x579E
+0x2470 = 0x57A8
+0x2471 = 0x57D7
+0x2473 = 0x57CC
+0x2476 = 0x57DE
+0x2477 = 0x57E6
+0x2478 = 0x57F0
+0x2479 = 0x364A
+0x247A = 0x57F8
+0x247B = 0x57FB
+0x247C = 0x57FD
+0x247D = 0x5804
+0x247E = 0x581E
+0x2521 = 0x5820
+0x2522 = 0x5827
+0x2523 = 0x5832
+0x2524 = 0x5839
+0x2526 = 0x5849
+0x2527 = 0x584C
+0x2528 = 0x5867
+0x2529 = 0x588A
+0x252A = 0x588B
+0x252B = 0x588D
+0x252C = 0x588F
+0x252D = 0x5890
+0x252E = 0x5894
+0x252F = 0x589D
+0x2530 = 0x58AA
+0x2531 = 0x58B1
+0x2533 = 0x58C3
+0x2534 = 0x58CD
+0x2535 = 0x58E2
+0x2536 = 0x58F3
+0x2537 = 0x58F4
+0x2538 = 0x5905
+0x2539 = 0x5906
+0x253A = 0x590B
+0x253B = 0x590D
+0x253C = 0x5914
+0x253D = 0x5924
+0x253F = 0x3691
+0x2540 = 0x593D
+0x2541 = 0x3699
+0x2542 = 0x5946
+0x2543 = 0x3696
+0x2545 = 0x595B
+0x2546 = 0x595F
+0x2548 = 0x5975
+0x2549 = 0x5976
+0x254A = 0x597C
+0x254B = 0x599F
+0x254C = 0x59AE
+0x254D = 0x59BC
+0x254E = 0x59C8
+0x254F = 0x59CD
+0x2550 = 0x59DE
+0x2551 = 0x59E3
+0x2552 = 0x59E4
+0x2553 = 0x59E7
+0x2554 = 0x59EE
+0x2557 = 0x36CF
+0x2558 = 0x5A0C
+0x2559 = 0x5A0D
+0x255A = 0x5A17
+0x255B = 0x5A27
+0x255C = 0x5A2D
+0x255D = 0x5A55
+0x255E = 0x5A65
+0x255F = 0x5A7A
+0x2560 = 0x5A8B
+0x2561 = 0x5A9C
+0x2562 = 0x5A9F
+0x2563 = 0x5AA0
+0x2564 = 0x5AA2
+0x2565 = 0x5AB1
+0x2566 = 0x5AB3
+0x2567 = 0x5AB5
+0x2568 = 0x5ABA
+0x2569 = 0x5ABF
+0x256A = 0x5ADA
+0x256B = 0x5ADC
+0x256C = 0x5AE0
+0x256D = 0x5AE5
+0x256E = 0x5AF0
+0x256F = 0x5AEE
+0x2570 = 0x5AF5
+0x2571 = 0x5B00
+0x2572 = 0x5B08
+0x2573 = 0x5B17
+0x2574 = 0x5B34
+0x2575 = 0x5B2D
+0x2576 = 0x5B4C
+0x2577 = 0x5B52
+0x2578 = 0x5B68
+0x2579 = 0x5B6F
+0x257A = 0x5B7C
+0x257B = 0x5B7F
+0x257C = 0x5B81
+0x257D = 0x5B84
+0x2821 = 0x5B96
+0x2822 = 0x5BAC
+0x2823 = 0x3761
+0x2824 = 0x5BC0
+0x2825 = 0x3762
+0x2826 = 0x5BCE
+0x2827 = 0x5BD6
+0x2828 = 0x376C
+0x2829 = 0x376B
+0x282A = 0x5BF1
+0x282B = 0x5BFD
+0x282C = 0x3775
+0x282D = 0x5C03
+0x282E = 0x5C29
+0x282F = 0x5C30
+0x2831 = 0x5C5F
+0x2832 = 0x5C63
+0x2833 = 0x5C67
+0x2834 = 0x5C68
+0x2835 = 0x5C69
+0x2836 = 0x5C70
+0x2839 = 0x5C7C
+0x283C = 0x5C88
+0x283D = 0x5C8A
+0x283E = 0x37C1
+0x2841 = 0x5CA0
+0x2842 = 0x5CA2
+0x2843 = 0x5CA6
+0x2844 = 0x5CA7
+0x2846 = 0x5CAD
+0x2847 = 0x5CB5
+0x2849 = 0x5CC9
+0x284C = 0x5D06
+0x284D = 0x5D10
+0x284E = 0x5D2B
+0x284F = 0x5D1D
+0x2850 = 0x5D20
+0x2851 = 0x5D24
+0x2852 = 0x5D26
+0x2853 = 0x5D31
+0x2854 = 0x5D39
+0x2855 = 0x5D42
+0x2856 = 0x37E8
+0x2857 = 0x5D61
+0x2858 = 0x5D6A
+0x2859 = 0x37F4
+0x285A = 0x5D70
+0x285C = 0x37FD
+0x285D = 0x5D88
+0x285E = 0x3800
+0x285F = 0x5D92
+0x2860 = 0x5D94
+0x2861 = 0x5D97
+0x2862 = 0x5D99
+0x2863 = 0x5DB0
+0x2864 = 0x5DB2
+0x2865 = 0x5DB4
+0x2867 = 0x5DB9
+0x2868 = 0x5DD1
+0x2869 = 0x5DD7
+0x286A = 0x5DD8
+0x286B = 0x5DE0
+0x286D = 0x5DE4
+0x286E = 0x5DE9
+0x286F = 0x382F
+0x2870 = 0x5E00
+0x2871 = 0x3836
+0x2872 = 0x5E12
+0x2873 = 0x5E15
+0x2874 = 0x3840
+0x2875 = 0x5E1F
+0x2876 = 0x5E2E
+0x2877 = 0x5E3E
+0x2878 = 0x5E49
+0x2879 = 0x385C
+0x287A = 0x5E56
+0x287B = 0x3861
+0x287C = 0x5E6B
+0x287D = 0x5E6C
+0x287E = 0x5E6D
+0x2C21 = 0x5E6E
+0x2C23 = 0x5EA5
+0x2C24 = 0x5EAA
+0x2C25 = 0x5EAC
+0x2C26 = 0x5EB9
+0x2C27 = 0x5EBF
+0x2C28 = 0x5EC6
+0x2C29 = 0x5ED2
+0x2C2A = 0x5ED9
+0x2C2C = 0x5EFD
+0x2C2D = 0x5F08
+0x2C2E = 0x5F0E
+0x2C2F = 0x5F1C
+0x2C31 = 0x5F1E
+0x2C32 = 0x5F47
+0x2C33 = 0x5F63
+0x2C34 = 0x5F72
+0x2C35 = 0x5F7E
+0x2C36 = 0x5F8F
+0x2C37 = 0x5FA2
+0x2C38 = 0x5FA4
+0x2C39 = 0x5FB8
+0x2C3A = 0x5FC4
+0x2C3B = 0x38FA
+0x2C3C = 0x5FC7
+0x2C3D = 0x5FCB
+0x2C3E = 0x5FD2
+0x2C3F = 0x5FD3
+0x2C40 = 0x5FD4
+0x2C41 = 0x5FE2
+0x2C42 = 0x5FEE
+0x2C43 = 0x5FEF
+0x2C44 = 0x5FF3
+0x2C45 = 0x5FFC
+0x2C46 = 0x3917
+0x2C47 = 0x6017
+0x2C48 = 0x6022
+0x2C49 = 0x6024
+0x2C4A = 0x391A
+0x2C4B = 0x604C
+0x2C4C = 0x607F
+0x2C4D = 0x608A
+0x2C4E = 0x6095
+0x2C4F = 0x60A8
+0x2C51 = 0x60B0
+0x2C52 = 0x60B1
+0x2C53 = 0x60BE
+0x2C54 = 0x60C8
+0x2C55 = 0x60D9
+0x2C56 = 0x60DB
+0x2C57 = 0x60EE
+0x2C58 = 0x60F2
+0x2C59 = 0x60F5
+0x2C5A = 0x6110
+0x2C5B = 0x6112
+0x2C5C = 0x6113
+0x2C5D = 0x6119
+0x2C5E = 0x611E
+0x2C5F = 0x613A
+0x2C60 = 0x396F
+0x2C61 = 0x6141
+0x2C62 = 0x6146
+0x2C63 = 0x6160
+0x2C64 = 0x617C
+0x2C66 = 0x6192
+0x2C67 = 0x6193
+0x2C68 = 0x6197
+0x2C69 = 0x6198
+0x2C6A = 0x61A5
+0x2C6B = 0x61A8
+0x2C6C = 0x61AD
+0x2C6E = 0x61D5
+0x2C6F = 0x61DD
+0x2C70 = 0x61DF
+0x2C71 = 0x61F5
+0x2C73 = 0x6215
+0x2C74 = 0x6223
+0x2C75 = 0x6229
+0x2C76 = 0x6246
+0x2C77 = 0x624C
+0x2C78 = 0x6251
+0x2C79 = 0x6252
+0x2C7A = 0x6261
+0x2C7B = 0x6264
+0x2C7C = 0x627B
+0x2C7D = 0x626D
+0x2C7E = 0x6273
+0x2D21 = 0x6299
+0x2D22 = 0x62A6
+0x2D23 = 0x62D5
+0x2D25 = 0x62FD
+0x2D26 = 0x6303
+0x2D27 = 0x630D
+0x2D28 = 0x6310
+0x2D2B = 0x6332
+0x2D2C = 0x6335
+0x2D2D = 0x633B
+0x2D2E = 0x633C
+0x2D2F = 0x6341
+0x2D30 = 0x6344
+0x2D31 = 0x634E
+0x2D33 = 0x6359
+0x2D36 = 0x636C
+0x2D37 = 0x6384
+0x2D38 = 0x6399
+0x2D3A = 0x6394
+0x2D3B = 0x63BD
+0x2D3C = 0x63F7
+0x2D3D = 0x63D4
+0x2D3E = 0x63D5
+0x2D3F = 0x63DC
+0x2D40 = 0x63E0
+0x2D41 = 0x63EB
+0x2D42 = 0x63EC
+0x2D43 = 0x63F2
+0x2D44 = 0x6409
+0x2D45 = 0x641E
+0x2D46 = 0x6425
+0x2D47 = 0x6429
+0x2D48 = 0x642F
+0x2D49 = 0x645A
+0x2D4A = 0x645B
+0x2D4B = 0x645D
+0x2D4C = 0x6473
+0x2D4D = 0x647D
+0x2D4E = 0x6487
+0x2D4F = 0x6491
+0x2D50 = 0x649D
+0x2D51 = 0x649F
+0x2D52 = 0x64CB
+0x2D53 = 0x64CC
+0x2D54 = 0x64D5
+0x2D55 = 0x64D7
+0x2D57 = 0x64E4
+0x2D58 = 0x64E5
+0x2D59 = 0x64FF
+0x2D5A = 0x6504
+0x2D5B = 0x3A6E
+0x2D5C = 0x650F
+0x2D5D = 0x6514
+0x2D5E = 0x6516
+0x2D5F = 0x3A73
+0x2D60 = 0x651E
+0x2D61 = 0x6532
+0x2D62 = 0x6544
+0x2D63 = 0x6554
+0x2D64 = 0x656B
+0x2D65 = 0x657A
+0x2D66 = 0x6581
+0x2D67 = 0x6584
+0x2D68 = 0x6585
+0x2D69 = 0x658A
+0x2D6A = 0x65B2
+0x2D6B = 0x65B5
+0x2D6C = 0x65B8
+0x2D6D = 0x65BF
+0x2D6E = 0x65C2
+0x2D6F = 0x65C9
+0x2D70 = 0x65D4
+0x2D71 = 0x3AD6
+0x2D72 = 0x65F2
+0x2D73 = 0x65F9
+0x2D74 = 0x65FC
+0x2D75 = 0x6604
+0x2D76 = 0x6608
+0x2D77 = 0x6621
+0x2D78 = 0x662A
+0x2D79 = 0x6645
+0x2D7A = 0x6651
+0x2D7B = 0x664E
+0x2D7C = 0x3AEA
+0x2D7E = 0x6657
+0x2E21 = 0x665B
+0x2E22 = 0x6663
+0x2E25 = 0x666A
+0x2E26 = 0x666B
+0x2E27 = 0x666C
+0x2E28 = 0x666D
+0x2E29 = 0x667B
+0x2E2A = 0x6680
+0x2E2B = 0x6690
+0x2E2C = 0x6692
+0x2E2D = 0x6699
+0x2E2E = 0x3B0E
+0x2E2F = 0x66AD
+0x2E30 = 0x66B1
+0x2E31 = 0x66B5
+0x2E32 = 0x3B1A
+0x2E33 = 0x66BF
+0x2E34 = 0x3B1C
+0x2E35 = 0x66EC
+0x2E36 = 0x3AD7
+0x2E37 = 0x6701
+0x2E38 = 0x6705
+0x2E39 = 0x6712
+0x2E3B = 0x6719
+0x2E3E = 0x674C
+0x2E3F = 0x674D
+0x2E40 = 0x6754
+0x2E41 = 0x675D
+0x2E45 = 0x6774
+0x2E46 = 0x6776
+0x2E48 = 0x6792
+0x2E4A = 0x8363
+0x2E4B = 0x6810
+0x2E4C = 0x67B0
+0x2E4D = 0x67B2
+0x2E4E = 0x67C3
+0x2E4F = 0x67C8
+0x2E50 = 0x67D2
+0x2E51 = 0x67D9
+0x2E52 = 0x67DB
+0x2E53 = 0x67F0
+0x2E54 = 0x67F7
+0x2E58 = 0x6818
+0x2E59 = 0x681F
+0x2E5A = 0x682D
+0x2E5C = 0x6833
+0x2E5D = 0x683B
+0x2E5E = 0x683E
+0x2E5F = 0x6844
+0x2E60 = 0x6845
+0x2E61 = 0x6849
+0x2E62 = 0x684C
+0x2E63 = 0x6855
+0x2E64 = 0x6857
+0x2E65 = 0x3B77
+0x2E66 = 0x686B
+0x2E67 = 0x686E
+0x2E68 = 0x687A
+0x2E69 = 0x687C
+0x2E6A = 0x6882
+0x2E6B = 0x6890
+0x2E6C = 0x6896
+0x2E6D = 0x3B6D
+0x2E6E = 0x6898
+0x2E6F = 0x6899
+0x2E70 = 0x689A
+0x2E71 = 0x689C
+0x2E72 = 0x68AA
+0x2E73 = 0x68AB
+0x2E74 = 0x68B4
+0x2E75 = 0x68BB
+0x2E76 = 0x68FB
+0x2E79 = 0xFA13
+0x2E7A = 0x68C3
+0x2E7B = 0x68C5
+0x2E7C = 0x68CC
+0x2E7D = 0x68CF
+0x2E7E = 0x68D6
+0x2F21 = 0x68D9
+0x2F22 = 0x68E4
+0x2F23 = 0x68E5
+0x2F24 = 0x68EC
+0x2F25 = 0x68F7
+0x2F26 = 0x6903
+0x2F27 = 0x6907
+0x2F28 = 0x3B87
+0x2F29 = 0x3B88
+0x2F2B = 0x693B
+0x2F2C = 0x3B8D
+0x2F2D = 0x6946
+0x2F2E = 0x6969
+0x2F2F = 0x696C
+0x2F30 = 0x6972
+0x2F31 = 0x697A
+0x2F32 = 0x697F
+0x2F33 = 0x6992
+0x2F34 = 0x3BA4
+0x2F35 = 0x6996
+0x2F36 = 0x6998
+0x2F37 = 0x69A6
+0x2F38 = 0x69B0
+0x2F39 = 0x69B7
+0x2F3A = 0x69BA
+0x2F3B = 0x69BC
+0x2F3C = 0x69C0
+0x2F3D = 0x69D1
+0x2F3E = 0x69D6
+0x2F41 = 0x6A30
+0x2F44 = 0x69E3
+0x2F45 = 0x69EE
+0x2F46 = 0x69EF
+0x2F47 = 0x69F3
+0x2F48 = 0x3BCD
+0x2F49 = 0x69F4
+0x2F4A = 0x69FE
+0x2F4B = 0x6A11
+0x2F4C = 0x6A1A
+0x2F4D = 0x6A1D
+0x2F4F = 0x6A32
+0x2F50 = 0x6A33
+0x2F51 = 0x6A34
+0x2F52 = 0x6A3F
+0x2F53 = 0x6A46
+0x2F54 = 0x6A49
+0x2F55 = 0x6A7A
+0x2F56 = 0x6A4E
+0x2F57 = 0x6A52
+0x2F58 = 0x6A64
+0x2F5A = 0x6A7E
+0x2F5B = 0x6A83
+0x2F5C = 0x6A8B
+0x2F5D = 0x3BF0
+0x2F5E = 0x6A91
+0x2F5F = 0x6A9F
+0x2F60 = 0x6AA1
+0x2F62 = 0x6AAB
+0x2F63 = 0x6ABD
+0x2F64 = 0x6AC6
+0x2F65 = 0x6AD4
+0x2F66 = 0x6AD0
+0x2F67 = 0x6ADC
+0x2F68 = 0x6ADD
+0x2F6B = 0x6AEC
+0x2F6C = 0x6AF1
+0x2F6D = 0x6AF2
+0x2F6E = 0x6AF3
+0x2F6F = 0x6AFD
+0x2F71 = 0x6B0B
+0x2F72 = 0x6B0F
+0x2F73 = 0x6B10
+0x2F74 = 0x6B11
+0x2F76 = 0x6B17
+0x2F77 = 0x3C26
+0x2F78 = 0x6B2F
+0x2F79 = 0x6B4A
+0x2F7A = 0x6B58
+0x2F7B = 0x6B6C
+0x2F7C = 0x6B75
+0x2F7D = 0x6B7A
+0x2F7E = 0x6B81
+0x6E21 = 0x6B9B
+0x6E22 = 0x6BAE
+0x6E24 = 0x6BBD
+0x6E25 = 0x6BBE
+0x6E26 = 0x6BC7
+0x6E27 = 0x6BC8
+0x6E28 = 0x6BC9
+0x6E29 = 0x6BDA
+0x6E2A = 0x6BE6
+0x6E2B = 0x6BE7
+0x6E2C = 0x6BEE
+0x6E2D = 0x6BF1
+0x6E2E = 0x6C02
+0x6E2F = 0x6C0A
+0x6E30 = 0x6C0E
+0x6E31 = 0x6C35
+0x6E32 = 0x6C36
+0x6E33 = 0x6C3A
+0x6E35 = 0x6C3F
+0x6E36 = 0x6C4D
+0x6E37 = 0x6C5B
+0x6E38 = 0x6C6D
+0x6E39 = 0x6C84
+0x6E3A = 0x6C89
+0x6E3B = 0x3CC3
+0x6E3C = 0x6C94
+0x6E3D = 0x6C95
+0x6E3E = 0x6C97
+0x6E3F = 0x6CAD
+0x6E40 = 0x6CC2
+0x6E41 = 0x6CD0
+0x6E42 = 0x3CD2
+0x6E43 = 0x6CD6
+0x6E44 = 0x6CDA
+0x6E45 = 0x6CDC
+0x6E46 = 0x6CE9
+0x6E47 = 0x6CEC
+0x6E48 = 0x6CED
+0x6E4A = 0x6D00
+0x6E4B = 0x6D0A
+0x6E4C = 0x6D24
+0x6E4D = 0x6D26
+0x6E4E = 0x6D27
+0x6E4F = 0x6C67
+0x6E50 = 0x6D2F
+0x6E51 = 0x6D3C
+0x6E52 = 0x6D5B
+0x6E53 = 0x6D5E
+0x6E54 = 0x6D60
+0x6E55 = 0x6D70
+0x6E56 = 0x6D80
+0x6E57 = 0x6D81
+0x6E58 = 0x6D8A
+0x6E59 = 0x6D8D
+0x6E5A = 0x6D91
+0x6E5B = 0x6D98
+0x6E5D = 0x6E17
+0x6E61 = 0x6DAB
+0x6E62 = 0x6DAE
+0x6E63 = 0x6DB4
+0x6E64 = 0x6DC2
+0x6E65 = 0x6D34
+0x6E66 = 0x6DC8
+0x6E67 = 0x6DCE
+0x6E68 = 0x6DCF
+0x6E69 = 0x6DD0
+0x6E6A = 0x6DDF
+0x6E6B = 0x6DE9
+0x6E6C = 0x6DF6
+0x6E6D = 0x6E36
+0x6E6E = 0x6E1E
+0x6E6F = 0x6E22
+0x6E70 = 0x6E27
+0x6E71 = 0x3D11
+0x6E72 = 0x6E32
+0x6E73 = 0x6E3C
+0x6E74 = 0x6E48
+0x6E75 = 0x6E49
+0x6E76 = 0x6E4B
+0x6E77 = 0x6E4C
+0x6E78 = 0x6E4F
+0x6E79 = 0x6E51
+0x6E7A = 0x6E53
+0x6E7B = 0x6E54
+0x6E7C = 0x6E57
+0x6E7D = 0x6E63
+0x6E7E = 0x3D1E
+0x6F21 = 0x6E93
+0x6F22 = 0x6EA7
+0x6F23 = 0x6EB4
+0x6F24 = 0x6EBF
+0x6F25 = 0x6EC3
+0x6F26 = 0x6ECA
+0x6F27 = 0x6ED9
+0x6F28 = 0x6F35
+0x6F29 = 0x6EEB
+0x6F2A = 0x6EF9
+0x6F2B = 0x6EFB
+0x6F2C = 0x6F0A
+0x6F2D = 0x6F0C
+0x6F2E = 0x6F18
+0x6F2F = 0x6F25
+0x6F30 = 0x6F36
+0x6F31 = 0x6F3C
+0x6F33 = 0x6F52
+0x6F34 = 0x6F57
+0x6F35 = 0x6F5A
+0x6F36 = 0x6F60
+0x6F37 = 0x6F68
+0x6F38 = 0x6F98
+0x6F39 = 0x6F7D
+0x6F3A = 0x6F90
+0x6F3B = 0x6F96
+0x6F3C = 0x6FBE
+0x6F3D = 0x6F9F
+0x6F3E = 0x6FA5
+0x6F3F = 0x6FAF
+0x6F40 = 0x3D64
+0x6F41 = 0x6FB5
+0x6F42 = 0x6FC8
+0x6F43 = 0x6FC9
+0x6F44 = 0x6FDA
+0x6F45 = 0x6FDE
+0x6F46 = 0x6FE9
+0x6F48 = 0x6FFC
+0x6F49 = 0x7000
+0x6F4A = 0x7007
+0x6F4B = 0x700A
+0x6F4C = 0x7023
+0x6F4E = 0x7039
+0x6F4F = 0x703A
+0x6F50 = 0x703C
+0x6F51 = 0x7043
+0x6F52 = 0x7047
+0x6F53 = 0x704B
+0x6F54 = 0x3D9A
+0x6F55 = 0x7054
+0x6F56 = 0x7065
+0x6F57 = 0x7069
+0x6F58 = 0x706C
+0x6F59 = 0x706E
+0x6F5A = 0x7076
+0x6F5B = 0x707E
+0x6F5C = 0x7081
+0x6F5D = 0x7086
+0x6F5E = 0x7095
+0x6F5F = 0x7097
+0x6F60 = 0x70BB
+0x6F62 = 0x709F
+0x6F63 = 0x70B1
+0x6F65 = 0x70EC
+0x6F66 = 0x70CA
+0x6F67 = 0x70D1
+0x6F68 = 0x70D3
+0x6F69 = 0x70DC
+0x6F6A = 0x7103
+0x6F6B = 0x7104
+0x6F6C = 0x7106
+0x6F6D = 0x7107
+0x6F6E = 0x7108
+0x6F6F = 0x710C
+0x6F70 = 0x3DC0
+0x6F71 = 0x712F
+0x6F72 = 0x7131
+0x6F73 = 0x7150
+0x6F74 = 0x714A
+0x6F75 = 0x7153
+0x6F76 = 0x715E
+0x6F77 = 0x3DD4
+0x6F78 = 0x7196
+0x6F79 = 0x7180
+0x6F7A = 0x719B
+0x6F7B = 0x71A0
+0x6F7C = 0x71A2
+0x6F7D = 0x71AE
+0x6F7E = 0x71AF
+0x7021 = 0x71B3
+0x7023 = 0x71CB
+0x7024 = 0x71D3
+0x7025 = 0x71D9
+0x7026 = 0x71DC
+0x7027 = 0x7207
+0x7028 = 0x3E05
+0x7029 = 0xFA49
+0x702A = 0x722B
+0x702B = 0x7234
+0x702C = 0x7238
+0x702D = 0x7239
+0x702E = 0x4E2C
+0x702F = 0x7242
+0x7030 = 0x7253
+0x7031 = 0x7257
+0x7032 = 0x7263
+0x7034 = 0x726E
+0x7035 = 0x726F
+0x7036 = 0x7278
+0x7037 = 0x727F
+0x7038 = 0x728E
+0x703A = 0x72AD
+0x703B = 0x72AE
+0x703C = 0x72B0
+0x703D = 0x72B1
+0x703E = 0x72C1
+0x703F = 0x3E60
+0x7040 = 0x72CC
+0x7041 = 0x3E66
+0x7042 = 0x3E68
+0x7043 = 0x72F3
+0x7044 = 0x72FA
+0x7045 = 0x7307
+0x7046 = 0x7312
+0x7047 = 0x7318
+0x7048 = 0x7319
+0x7049 = 0x3E83
+0x704A = 0x7339
+0x704B = 0x732C
+0x704C = 0x7331
+0x704D = 0x7333
+0x704E = 0x733D
+0x704F = 0x7352
+0x7050 = 0x3E94
+0x7051 = 0x736B
+0x7052 = 0x736C
+0x7054 = 0x736E
+0x7055 = 0x736F
+0x7056 = 0x7371
+0x7057 = 0x7377
+0x7058 = 0x7381
+0x7059 = 0x7385
+0x705A = 0x738A
+0x705B = 0x7394
+0x705C = 0x7398
+0x705D = 0x739C
+0x705E = 0x739E
+0x705F = 0x73A5
+0x7060 = 0x73A8
+0x7061 = 0x73B5
+0x7062 = 0x73B7
+0x7063 = 0x73B9
+0x7064 = 0x73BC
+0x7065 = 0x73BF
+0x7066 = 0x73C5
+0x7067 = 0x73CB
+0x7068 = 0x73E1
+0x7069 = 0x73E7
+0x706A = 0x73F9
+0x706B = 0x7413
+0x706C = 0x73FA
+0x706D = 0x7401
+0x706E = 0x7424
+0x706F = 0x7431
+0x7070 = 0x7439
+0x7071 = 0x7453
+0x7072 = 0x7440
+0x7073 = 0x7443
+0x7074 = 0x744D
+0x7075 = 0x7452
+0x7076 = 0x745D
+0x7077 = 0x7471
+0x7078 = 0x7481
+0x7079 = 0x7485
+0x707A = 0x7488
+0x707C = 0x7492
+0x707D = 0x7497
+0x707E = 0x7499
+0x7121 = 0x74A0
+0x7122 = 0x74A1
+0x7123 = 0x74A5
+0x7124 = 0x74AA
+0x7125 = 0x74AB
+0x7126 = 0x74B9
+0x7127 = 0x74BB
+0x7128 = 0x74BA
+0x7129 = 0x74D6
+0x712A = 0x74D8
+0x712B = 0x74DE
+0x712C = 0x74EF
+0x712D = 0x74EB
+0x712F = 0x74FA
+0x7131 = 0x7520
+0x7132 = 0x7524
+0x7133 = 0x752A
+0x7134 = 0x3F57
+0x7136 = 0x753D
+0x7137 = 0x753E
+0x7138 = 0x7540
+0x7139 = 0x7548
+0x713A = 0x754E
+0x713B = 0x7550
+0x713C = 0x7552
+0x713D = 0x756C
+0x713E = 0x7572
+0x713F = 0x7571
+0x7140 = 0x757A
+0x7141 = 0x757D
+0x7142 = 0x757E
+0x7143 = 0x7581
+0x7145 = 0x758C
+0x7146 = 0x3F75
+0x7147 = 0x75A2
+0x7148 = 0x3F77
+0x7149 = 0x75B0
+0x714A = 0x75B7
+0x714B = 0x75BF
+0x714C = 0x75C0
+0x714D = 0x75C6
+0x714E = 0x75CF
+0x714F = 0x75D3
+0x7150 = 0x75DD
+0x7151 = 0x75DF
+0x7152 = 0x75E0
+0x7153 = 0x75E7
+0x7154 = 0x75EC
+0x7155 = 0x75EE
+0x7156 = 0x75F1
+0x7157 = 0x75F9
+0x7158 = 0x7603
+0x7159 = 0x7618
+0x715A = 0x7607
+0x715B = 0x760F
+0x715C = 0x3FAE
+0x715E = 0x7613
+0x715F = 0x761B
+0x7160 = 0x761C
+0x7162 = 0x7625
+0x7163 = 0x7628
+0x7164 = 0x763C
+0x7165 = 0x7633
+0x7167 = 0x3FC9
+0x7168 = 0x7641
+0x716A = 0x7649
+0x716B = 0x7655
+0x716C = 0x3FD7
+0x716D = 0x766E
+0x716E = 0x7695
+0x716F = 0x769C
+0x7170 = 0x76A1
+0x7171 = 0x76A0
+0x7172 = 0x76A7
+0x7173 = 0x76A8
+0x7174 = 0x76AF
+0x7176 = 0x76C9
+0x7178 = 0x76E8
+0x7179 = 0x76EC
+0x717B = 0x7717
+0x717C = 0x771A
+0x717D = 0x772D
+0x717E = 0x7735
+0x7222 = 0x4039
+0x7225 = 0x7758
+0x7226 = 0x7760
+0x7227 = 0x776A
+0x7229 = 0x7772
+0x722A = 0x777C
+0x722B = 0x777D
+0x722D = 0x4058
+0x722E = 0x779A
+0x722F = 0x779F
+0x7230 = 0x77A2
+0x7231 = 0x77A4
+0x7232 = 0x77A9
+0x7233 = 0x77DE
+0x7234 = 0x77DF
+0x7235 = 0x77E4
+0x7236 = 0x77E6
+0x7237 = 0x77EA
+0x7238 = 0x77EC
+0x7239 = 0x4093
+0x723A = 0x77F0
+0x723B = 0x77F4
+0x723C = 0x77FB
+0x723E = 0x7805
+0x723F = 0x7806
+0x7240 = 0x7809
+0x7241 = 0x780D
+0x7242 = 0x7819
+0x7243 = 0x7821
+0x7244 = 0x782C
+0x7245 = 0x7847
+0x7246 = 0x7864
+0x7247 = 0x786A
+0x7249 = 0x788A
+0x724A = 0x7894
+0x724B = 0x78A4
+0x724C = 0x789D
+0x724D = 0x789E
+0x724E = 0x789F
+0x724F = 0x78BB
+0x7250 = 0x78C8
+0x7251 = 0x78CC
+0x7252 = 0x78CE
+0x7253 = 0x78D5
+0x7254 = 0x78E0
+0x7255 = 0x78E1
+0x7256 = 0x78E6
+0x7257 = 0x78F9
+0x7258 = 0x78FA
+0x7259 = 0x78FB
+0x725A = 0x78FE
+0x725C = 0x7910
+0x725D = 0x791B
+0x725E = 0x7930
+0x725F = 0x7925
+0x7260 = 0x793B
+0x7261 = 0x794A
+0x7262 = 0x7958
+0x7263 = 0x795B
+0x7264 = 0x4105
+0x7265 = 0x7967
+0x7266 = 0x7972
+0x7267 = 0x7994
+0x7268 = 0x7995
+0x7269 = 0x7996
+0x726A = 0x799B
+0x726B = 0x79A1
+0x726C = 0x79A9
+0x726D = 0x79B4
+0x726E = 0x79BB
+0x726F = 0x79C2
+0x7270 = 0x79C7
+0x7271 = 0x79CC
+0x7272 = 0x79CD
+0x7273 = 0x79D6
+0x7274 = 0x4148
+0x7277 = 0x414F
+0x7278 = 0x7A0A
+0x7279 = 0x7A11
+0x727A = 0x7A15
+0x727B = 0x7A1B
+0x727C = 0x7A1E
+0x727D = 0x4163
+0x727E = 0x7A2D
+0x7321 = 0x7A38
+0x7322 = 0x7A47
+0x7323 = 0x7A4C
+0x7324 = 0x7A56
+0x7325 = 0x7A59
+0x7326 = 0x7A5C
+0x7327 = 0x7A5F
+0x7328 = 0x7A60
+0x7329 = 0x7A67
+0x732A = 0x7A6A
+0x732B = 0x7A75
+0x732C = 0x7A78
+0x732D = 0x7A82
+0x732E = 0x7A8A
+0x732F = 0x7A90
+0x7330 = 0x7AA3
+0x7331 = 0x7AAC
+0x7333 = 0x41B4
+0x7334 = 0x7AB9
+0x7335 = 0x7ABC
+0x7336 = 0x7ABE
+0x7337 = 0x41BF
+0x7338 = 0x7ACC
+0x7339 = 0x7AD1
+0x733A = 0x7AE7
+0x733B = 0x7AE8
+0x733C = 0x7AF4
+0x733F = 0x7B07
+0x7341 = 0x7B3D
+0x7342 = 0x7B27
+0x7343 = 0x7B2A
+0x7344 = 0x7B2E
+0x7345 = 0x7B2F
+0x7346 = 0x7B31
+0x7347 = 0x41E6
+0x7348 = 0x41F3
+0x7349 = 0x7B7F
+0x734A = 0x7B41
+0x734B = 0x41EE
+0x734C = 0x7B55
+0x734D = 0x7B79
+0x734E = 0x7B64
+0x734F = 0x7B66
+0x7350 = 0x7B69
+0x7351 = 0x7B73
+0x7353 = 0x4207
+0x7354 = 0x7B90
+0x7355 = 0x7B91
+0x7356 = 0x7B9B
+0x7357 = 0x420E
+0x7358 = 0x7BAF
+0x7359 = 0x7BB5
+0x735A = 0x7BBC
+0x735B = 0x7BC5
+0x735C = 0x7BCA
+0x735F = 0x7BD4
+0x7360 = 0x7BD6
+0x7361 = 0x7BDA
+0x7362 = 0x7BEA
+0x7363 = 0x7BF0
+0x7364 = 0x7C03
+0x7365 = 0x7C0B
+0x7366 = 0x7C0E
+0x7367 = 0x7C0F
+0x7368 = 0x7C26
+0x7369 = 0x7C45
+0x736A = 0x7C4A
+0x736B = 0x7C51
+0x736C = 0x7C57
+0x736D = 0x7C5E
+0x736E = 0x7C61
+0x736F = 0x7C69
+0x7370 = 0x7C6E
+0x7371 = 0x7C6F
+0x7372 = 0x7C70
+0x7376 = 0x7CA6
+0x7378 = 0x7CB6
+0x7379 = 0x7CB7
+0x737A = 0x7CBF
+0x737C = 0x7CC4
+0x737E = 0x7CC8
+0x7421 = 0x7CCD
+0x7423 = 0x7CD7
+0x7425 = 0x7CE6
+0x7426 = 0x7CEB
+0x7428 = 0x7CF5
+0x7429 = 0x7D03
+0x742A = 0x7D09
+0x742B = 0x42C6
+0x742C = 0x7D12
+0x742D = 0x7D1E
+0x7430 = 0x7D3D
+0x7431 = 0x7D3E
+0x7432 = 0x7D40
+0x7433 = 0x7D47
+0x7436 = 0x42D6
+0x7437 = 0x7D59
+0x7438 = 0x7D5A
+0x7439 = 0x7D6A
+0x743A = 0x7D70
+0x743B = 0x42DD
+0x743C = 0x7D7F
+0x743E = 0x7D86
+0x743F = 0x7D88
+0x7440 = 0x7D8C
+0x7441 = 0x7D97
+0x7443 = 0x7D9D
+0x7444 = 0x7DA7
+0x7445 = 0x7DAA
+0x7446 = 0x7DB6
+0x7447 = 0x7DB7
+0x7448 = 0x7DC0
+0x7449 = 0x7DD7
+0x744A = 0x7DD9
+0x744B = 0x7DE6
+0x744C = 0x7DF1
+0x744D = 0x7DF9
+0x744E = 0x4302
+0x7450 = 0xFA58
+0x7451 = 0x7E10
+0x7452 = 0x7E17
+0x7453 = 0x7E1D
+0x7454 = 0x7E20
+0x7455 = 0x7E27
+0x7456 = 0x7E2C
+0x7457 = 0x7E45
+0x7458 = 0x7E73
+0x7459 = 0x7E75
+0x745A = 0x7E7E
+0x745B = 0x7E86
+0x745C = 0x7E87
+0x745D = 0x432B
+0x745E = 0x7E91
+0x745F = 0x7E98
+0x7460 = 0x7E9A
+0x7461 = 0x4343
+0x7462 = 0x7F3C
+0x7463 = 0x7F3B
+0x7464 = 0x7F3E
+0x7465 = 0x7F43
+0x7466 = 0x7F44
+0x7467 = 0x7F4F
+0x7468 = 0x34C1
+0x746A = 0x7F52
+0x746C = 0x7F61
+0x746D = 0x7F63
+0x746E = 0x7F64
+0x746F = 0x7F6D
+0x7470 = 0x7F7D
+0x7471 = 0x7F7E
+0x7473 = 0x7F90
+0x7474 = 0x517B
+0x7476 = 0x7F96
+0x7477 = 0x7F9C
+0x7478 = 0x7FAD
+0x747A = 0x7FC3
+0x747B = 0x7FCF
+0x747C = 0x7FE3
+0x747D = 0x7FE5
+0x747E = 0x7FEF
+0x7521 = 0x7FF2
+0x7522 = 0x8002
+0x7523 = 0x800A
+0x7524 = 0x8008
+0x7525 = 0x800E
+0x7526 = 0x8011
+0x7527 = 0x8016
+0x7528 = 0x8024
+0x7529 = 0x802C
+0x752A = 0x8030
+0x752B = 0x8043
+0x752C = 0x8066
+0x752D = 0x8071
+0x752E = 0x8075
+0x752F = 0x807B
+0x7530 = 0x8099
+0x7531 = 0x809C
+0x7532 = 0x80A4
+0x7533 = 0x80A7
+0x7534 = 0x80B8
+0x7536 = 0x80C5
+0x7537 = 0x80D5
+0x7538 = 0x80D8
+0x7539 = 0x80E6
+0x753B = 0x810D
+0x753C = 0x80F5
+0x753D = 0x80FB
+0x753E = 0x43EE
+0x753F = 0x8135
+0x7540 = 0x8116
+0x7541 = 0x811E
+0x7542 = 0x43F0
+0x7543 = 0x8124
+0x7544 = 0x8127
+0x7545 = 0x812C
+0x7547 = 0x813D
+0x7548 = 0x4408
+0x7549 = 0x8169
+0x754A = 0x4417
+0x754B = 0x8181
+0x754C = 0x441C
+0x754D = 0x8184
+0x754E = 0x8185
+0x754F = 0x4422
+0x7550 = 0x8198
+0x7551 = 0x81B2
+0x7552 = 0x81C1
+0x7553 = 0x81C3
+0x7554 = 0x81D6
+0x7555 = 0x81DB
+0x7557 = 0x81E4
+0x7559 = 0x81EC
+0x755B = 0x81FD
+0x755C = 0x81FF
+0x755E = 0x8204
+0x7560 = 0x8219
+0x7561 = 0x8221
+0x7562 = 0x8222
+0x7564 = 0x8232
+0x7565 = 0x8234
+0x7566 = 0x823C
+0x7567 = 0x8246
+0x7568 = 0x8249
+0x7569 = 0x8245
+0x756B = 0x824B
+0x756C = 0x4476
+0x756D = 0x824F
+0x756E = 0x447A
+0x756F = 0x8257
+0x7571 = 0x825C
+0x7572 = 0x8263
+0x7574 = 0xFA5D
+0x7575 = 0xFA5E
+0x7576 = 0x8279
+0x7577 = 0x4491
+0x7578 = 0x827D
+0x7579 = 0x827F
+0x757A = 0x8283
+0x757B = 0x828A
+0x757C = 0x8293
+0x757D = 0x82A7
+0x757E = 0x82A8
+0x7621 = 0x82B2
+0x7622 = 0x82B4
+0x7623 = 0x82BA
+0x7624 = 0x82BC
+0x7625 = 0x82E2
+0x7626 = 0x82E8
+0x7627 = 0x82F7
+0x7628 = 0x8307
+0x7629 = 0x8308
+0x762A = 0x830C
+0x762B = 0x8354
+0x762C = 0x831B
+0x762D = 0x831D
+0x762E = 0x8330
+0x762F = 0x833C
+0x7630 = 0x8344
+0x7631 = 0x8357
+0x7632 = 0x44BE
+0x7633 = 0x837F
+0x7634 = 0x44D4
+0x7635 = 0x44B3
+0x7636 = 0x838D
+0x7637 = 0x8394
+0x7638 = 0x8395
+0x7639 = 0x839B
+0x763A = 0x839D
+0x763B = 0x83C9
+0x763C = 0x83D0
+0x763D = 0x83D4
+0x763E = 0x83DD
+0x763F = 0x83E5
+0x7640 = 0x83F9
+0x7641 = 0x840F
+0x7642 = 0x8411
+0x7643 = 0x8415
+0x7645 = 0x8417
+0x7646 = 0x8439
+0x7647 = 0x844A
+0x7648 = 0x844F
+0x7649 = 0x8451
+0x764A = 0x8452
+0x764B = 0x8459
+0x764C = 0x845A
+0x764D = 0x845C
+0x764F = 0x8465
+0x7650 = 0x8476
+0x7651 = 0x8478
+0x7652 = 0x847C
+0x7653 = 0x8481
+0x7654 = 0x450D
+0x7655 = 0x84DC
+0x7656 = 0x8497
+0x7657 = 0x84A6
+0x7658 = 0x84BE
+0x7659 = 0x4508
+0x765A = 0x84CE
+0x765B = 0x84CF
+0x765C = 0x84D3
+0x765E = 0x84E7
+0x765F = 0x84EA
+0x7660 = 0x84EF
+0x7661 = 0x84F0
+0x7662 = 0x84F1
+0x7663 = 0x84FA
+0x7664 = 0x84FD
+0x7665 = 0x850C
+0x7666 = 0x851B
+0x7667 = 0x8524
+0x7668 = 0x8525
+0x7669 = 0x852B
+0x766A = 0x8534
+0x766B = 0x854F
+0x766C = 0x856F
+0x766D = 0x4525
+0x766E = 0x4543
+0x766F = 0x853E
+0x7670 = 0x8551
+0x7671 = 0x8553
+0x7672 = 0x855E
+0x7673 = 0x8561
+0x7674 = 0x8562
+0x7676 = 0x857B
+0x7677 = 0x857D
+0x7678 = 0x857F
+0x7679 = 0x8581
+0x767A = 0x8586
+0x767B = 0x8593
+0x767C = 0x859D
+0x767D = 0x859F
+0x7723 = 0x85B7
+0x7724 = 0x85BC
+0x7725 = 0x85C7
+0x7726 = 0x85CA
+0x7727 = 0x85D8
+0x7728 = 0x85D9
+0x7729 = 0x85DF
+0x772A = 0x85E1
+0x772B = 0x85E6
+0x772C = 0x85F6
+0x772D = 0x8600
+0x772E = 0x8611
+0x772F = 0x861E
+0x7730 = 0x8621
+0x7731 = 0x8624
+0x7732 = 0x8627
+0x7734 = 0x8639
+0x7735 = 0x863C
+0x7737 = 0x8640
+0x7738 = 0xFA20
+0x7739 = 0x8653
+0x773A = 0x8656
+0x773B = 0x866F
+0x773C = 0x8677
+0x773D = 0x867A
+0x773E = 0x8687
+0x773F = 0x8689
+0x7740 = 0x868D
+0x7741 = 0x8691
+0x7742 = 0x869C
+0x7743 = 0x869D
+0x7744 = 0x86A8
+0x7745 = 0xFA21
+0x7746 = 0x86B1
+0x7747 = 0x86B3
+0x7748 = 0x86C1
+0x7749 = 0x86C3
+0x774A = 0x86D1
+0x774B = 0x86D5
+0x774C = 0x86D7
+0x774D = 0x86E3
+0x774E = 0x86E6
+0x774F = 0x45B8
+0x7750 = 0x8705
+0x7751 = 0x8707
+0x7752 = 0x870E
+0x7753 = 0x8710
+0x7754 = 0x8713
+0x7755 = 0x8719
+0x7756 = 0x871F
+0x7757 = 0x8721
+0x7758 = 0x8723
+0x7759 = 0x8731
+0x775A = 0x873A
+0x775B = 0x873E
+0x775C = 0x8740
+0x775D = 0x8743
+0x775E = 0x8751
+0x775F = 0x8758
+0x7760 = 0x8764
+0x7761 = 0x8765
+0x7762 = 0x8772
+0x7763 = 0x877C
+0x7766 = 0x87A7
+0x7767 = 0x8789
+0x7768 = 0x878B
+0x7769 = 0x8793
+0x776A = 0x87A0
+0x776C = 0x45E5
+0x776D = 0x87BE
+0x776F = 0x87C1
+0x7770 = 0x87CE
+0x7771 = 0x87F5
+0x7772 = 0x87DF
+0x7774 = 0x87E3
+0x7775 = 0x87E5
+0x7776 = 0x87E6
+0x7777 = 0x87EA
+0x7778 = 0x87EB
+0x7779 = 0x87ED
+0x777A = 0x8801
+0x777B = 0x8803
+0x777C = 0x880B
+0x777D = 0x8813
+0x777E = 0x8828
+0x7821 = 0x882E
+0x7822 = 0x8832
+0x7823 = 0x883C
+0x7824 = 0x460F
+0x7825 = 0x884A
+0x7826 = 0x8858
+0x7827 = 0x885F
+0x7828 = 0x8864
+0x782B = 0x8869
+0x782D = 0x886F
+0x782E = 0x88A0
+0x782F = 0x88BC
+0x7830 = 0x88BD
+0x7831 = 0x88BE
+0x7832 = 0x88C0
+0x7833 = 0x88D2
+0x7835 = 0x88D1
+0x7836 = 0x88D3
+0x7837 = 0x88DB
+0x7838 = 0x88F0
+0x7839 = 0x88F1
+0x783A = 0x4641
+0x783B = 0x8901
+0x783D = 0x8937
+0x783F = 0x8942
+0x7840 = 0x8945
+0x7841 = 0x8949
+0x7843 = 0x4665
+0x7844 = 0x8962
+0x7845 = 0x8980
+0x7846 = 0x8989
+0x7847 = 0x8990
+0x7848 = 0x899F
+0x7849 = 0x89B0
+0x784A = 0x89B7
+0x784B = 0x89D6
+0x784C = 0x89D8
+0x784D = 0x89EB
+0x784E = 0x46A1
+0x784F = 0x89F1
+0x7850 = 0x89F3
+0x7851 = 0x89FD
+0x7852 = 0x89FF
+0x7853 = 0x46AF
+0x7854 = 0x8A11
+0x7855 = 0x8A14
+0x7857 = 0x8A21
+0x7858 = 0x8A35
+0x7859 = 0x8A3E
+0x785A = 0x8A45
+0x785B = 0x8A4D
+0x785C = 0x8A58
+0x785D = 0x8AAE
+0x785E = 0x8A90
+0x785F = 0x8AB7
+0x7860 = 0x8ABE
+0x7861 = 0x8AD7
+0x7862 = 0x8AFC
+0x7864 = 0x8B0A
+0x7865 = 0x8B05
+0x7866 = 0x8B0D
+0x7867 = 0x8B1C
+0x7868 = 0x8B1F
+0x7869 = 0x8B2D
+0x786A = 0x8B43
+0x786B = 0x470C
+0x786C = 0x8B51
+0x786D = 0x8B5E
+0x786E = 0x8B76
+0x786F = 0x8B7F
+0x7870 = 0x8B81
+0x7871 = 0x8B8B
+0x7872 = 0x8B94
+0x7873 = 0x8B95
+0x7874 = 0x8B9C
+0x7875 = 0x8B9E
+0x7876 = 0x8C39
+0x7878 = 0x8C3D
+0x787B = 0x8C45
+0x787C = 0x8C47
+0x787D = 0x8C4F
+0x787E = 0x8C54
+0x7921 = 0x8C57
+0x7922 = 0x8C69
+0x7923 = 0x8C6D
+0x7924 = 0x8C73
+0x7926 = 0x8C93
+0x7927 = 0x8C92
+0x7928 = 0x8C99
+0x7929 = 0x4764
+0x792A = 0x8C9B
+0x792B = 0x8CA4
+0x792C = 0x8CD6
+0x792D = 0x8CD5
+0x792E = 0x8CD9
+0x7930 = 0x8CF0
+0x7931 = 0x8CF1
+0x7933 = 0x8D09
+0x7934 = 0x8D0E
+0x7935 = 0x8D6C
+0x7936 = 0x8D84
+0x7937 = 0x8D95
+0x7938 = 0x8DA6
+0x793A = 0x8DC6
+0x793B = 0x8DC8
+0x793C = 0x8DD9
+0x793D = 0x8DEC
+0x793E = 0x8E0C
+0x793F = 0x47FD
+0x7940 = 0x8DFD
+0x7941 = 0x8E06
+0x7943 = 0x8E14
+0x7944 = 0x8E16
+0x7945 = 0x8E21
+0x7946 = 0x8E22
+0x7947 = 0x8E27
+0x7949 = 0x4816
+0x794A = 0x8E36
+0x794B = 0x8E39
+0x794C = 0x8E4B
+0x794D = 0x8E54
+0x794E = 0x8E62
+0x794F = 0x8E6C
+0x7950 = 0x8E6D
+0x7951 = 0x8E6F
+0x7952 = 0x8E98
+0x7953 = 0x8E9E
+0x7954 = 0x8EAE
+0x7955 = 0x8EB3
+0x7956 = 0x8EB5
+0x7957 = 0x8EB6
+0x7958 = 0x8EBB
+0x795A = 0x8ED1
+0x795B = 0x8ED4
+0x795C = 0x484E
+0x795D = 0x8EF9
+0x795F = 0x8F00
+0x7960 = 0x8F08
+0x7961 = 0x8F17
+0x7962 = 0x8F2B
+0x7963 = 0x8F40
+0x7964 = 0x8F4A
+0x7965 = 0x8F58
+0x7967 = 0x8FA4
+0x7968 = 0x8FB4
+0x7969 = 0xFA66
+0x796A = 0x8FB6
+0x796C = 0x8FC1
+0x796D = 0x8FC6
+0x796E = 0xFA24
+0x796F = 0x8FCA
+0x7970 = 0x8FCD
+0x7971 = 0x8FD3
+0x7972 = 0x8FD5
+0x7973 = 0x8FE0
+0x7974 = 0x8FF1
+0x7975 = 0x8FF5
+0x7976 = 0x8FFB
+0x7977 = 0x9002
+0x7978 = 0x900C
+0x7979 = 0x9037
+0x797B = 0x9043
+0x797C = 0x9044
+0x797D = 0x905D
+0x7A22 = 0x9085
+0x7A23 = 0x908C
+0x7A24 = 0x9090
+0x7A25 = 0x961D
+0x7A26 = 0x90A1
+0x7A27 = 0x48B5
+0x7A28 = 0x90B0
+0x7A29 = 0x90B6
+0x7A2A = 0x90C3
+0x7A2B = 0x90C8
+0x7A2D = 0x90DC
+0x7A2E = 0x90DF
+0x7A30 = 0x90F6
+0x7A31 = 0x90F2
+0x7A32 = 0x9100
+0x7A33 = 0x90EB
+0x7A34 = 0x90FE
+0x7A35 = 0x90FF
+0x7A36 = 0x9104
+0x7A37 = 0x9106
+0x7A38 = 0x9118
+0x7A39 = 0x911C
+0x7A3A = 0x911E
+0x7A3B = 0x9137
+0x7A3C = 0x9139
+0x7A3D = 0x913A
+0x7A3E = 0x9146
+0x7A3F = 0x9147
+0x7A40 = 0x9157
+0x7A41 = 0x9159
+0x7A42 = 0x9161
+0x7A43 = 0x9164
+0x7A44 = 0x9174
+0x7A45 = 0x9179
+0x7A46 = 0x9185
+0x7A47 = 0x918E
+0x7A48 = 0x91A8
+0x7A49 = 0x91AE
+0x7A4A = 0x91B3
+0x7A4B = 0x91B6
+0x7A4C = 0x91C3
+0x7A4D = 0x91C4
+0x7A4E = 0x91DA
+0x7A51 = 0x91EC
+0x7A52 = 0x91EE
+0x7A53 = 0x9201
+0x7A54 = 0x920A
+0x7A55 = 0x9216
+0x7A56 = 0x9217
+0x7A58 = 0x9233
+0x7A59 = 0x9242
+0x7A5A = 0x9247
+0x7A5B = 0x924A
+0x7A5C = 0x924E
+0x7A5D = 0x9251
+0x7A5E = 0x9256
+0x7A5F = 0x9259
+0x7A60 = 0x9260
+0x7A61 = 0x9261
+0x7A62 = 0x9265
+0x7A63 = 0x9267
+0x7A64 = 0x9268
+0x7A67 = 0x927C
+0x7A68 = 0x927D
+0x7A69 = 0x927F
+0x7A6A = 0x9289
+0x7A6B = 0x928D
+0x7A6C = 0x9297
+0x7A6D = 0x9299
+0x7A6E = 0x929F
+0x7A6F = 0x92A7
+0x7A70 = 0x92AB
+0x7A73 = 0x92B2
+0x7A74 = 0x92BF
+0x7A75 = 0x92C0
+0x7A76 = 0x92C6
+0x7A77 = 0x92CE
+0x7A78 = 0x92D0
+0x7A79 = 0x92D7
+0x7A7A = 0x92D9
+0x7A7B = 0x92E5
+0x7A7C = 0x92E7
+0x7A7D = 0x9311
+0x7B22 = 0x92F7
+0x7B23 = 0x92F9
+0x7B24 = 0x92FB
+0x7B25 = 0x9302
+0x7B26 = 0x930D
+0x7B27 = 0x9315
+0x7B28 = 0x931D
+0x7B29 = 0x931E
+0x7B2A = 0x9327
+0x7B2B = 0x9329
+0x7B2E = 0x9347
+0x7B2F = 0x9351
+0x7B30 = 0x9357
+0x7B31 = 0x935A
+0x7B32 = 0x936B
+0x7B33 = 0x9371
+0x7B34 = 0x9373
+0x7B35 = 0x93A1
+0x7B38 = 0x9388
+0x7B39 = 0x938B
+0x7B3A = 0x938F
+0x7B3B = 0x939E
+0x7B3C = 0x93F5
+0x7B3F = 0x93F1
+0x7B40 = 0x93C1
+0x7B41 = 0x93C7
+0x7B42 = 0x93DC
+0x7B43 = 0x93E2
+0x7B44 = 0x93E7
+0x7B45 = 0x9409
+0x7B46 = 0x940F
+0x7B47 = 0x9416
+0x7B48 = 0x9417
+0x7B49 = 0x93FB
+0x7B4A = 0x9432
+0x7B4B = 0x9434
+0x7B4C = 0x943B
+0x7B4D = 0x9445
+0x7B50 = 0x946D
+0x7B51 = 0x946F
+0x7B52 = 0x9578
+0x7B53 = 0x9579
+0x7B54 = 0x9586
+0x7B55 = 0x958C
+0x7B56 = 0x958D
+0x7B58 = 0x95AB
+0x7B59 = 0x95B4
+0x7B5B = 0x95C8
+0x7B5E = 0x962C
+0x7B5F = 0x9633
+0x7B60 = 0x9634
+0x7B62 = 0x963C
+0x7B63 = 0x9641
+0x7B64 = 0x9661
+0x7B66 = 0x9682
+0x7B68 = 0x969A
+0x7B6A = 0x49E7
+0x7B6B = 0x96A9
+0x7B6C = 0x96AF
+0x7B6D = 0x96B3
+0x7B6E = 0x96BA
+0x7B6F = 0x96BD
+0x7B70 = 0x49FA
+0x7B72 = 0x96D8
+0x7B73 = 0x96DA
+0x7B74 = 0x96DD
+0x7B75 = 0x4A04
+0x7B76 = 0x9714
+0x7B77 = 0x9723
+0x7B78 = 0x4A29
+0x7B79 = 0x9736
+0x7B7A = 0x9741
+0x7B7B = 0x9747
+0x7B7C = 0x9755
+0x7B7D = 0x9757
+0x7B7E = 0x975B
+0x7C21 = 0x976A
+0x7C24 = 0x9796
+0x7C25 = 0x979A
+0x7C26 = 0x979E
+0x7C27 = 0x97A2
+0x7C28 = 0x97B1
+0x7C29 = 0x97B2
+0x7C2A = 0x97BE
+0x7C2B = 0x97CC
+0x7C2C = 0x97D1
+0x7C2D = 0x97D4
+0x7C2E = 0x97D8
+0x7C2F = 0x97D9
+0x7C30 = 0x97E1
+0x7C31 = 0x97F1
+0x7C32 = 0x9804
+0x7C33 = 0x980D
+0x7C34 = 0x980E
+0x7C35 = 0x9814
+0x7C36 = 0x9816
+0x7C37 = 0x4ABC
+0x7C39 = 0x9823
+0x7C3A = 0x9832
+0x7C3B = 0x9833
+0x7C3C = 0x9825
+0x7C3D = 0x9847
+0x7C3E = 0x9866
+0x7C3F = 0x98AB
+0x7C40 = 0x98AD
+0x7C41 = 0x98B0
+0x7C43 = 0x98B7
+0x7C44 = 0x98B8
+0x7C45 = 0x98BB
+0x7C46 = 0x98BC
+0x7C47 = 0x98BF
+0x7C48 = 0x98C2
+0x7C49 = 0x98C7
+0x7C4A = 0x98CB
+0x7C4B = 0x98E0
+0x7C4D = 0x98E1
+0x7C4E = 0x98E3
+0x7C4F = 0x98E5
+0x7C50 = 0x98EA
+0x7C51 = 0x98F0
+0x7C52 = 0x98F1
+0x7C53 = 0x98F3
+0x7C54 = 0x9908
+0x7C55 = 0x4B3B
+0x7C57 = 0x9916
+0x7C58 = 0x9917
+0x7C5A = 0x991A
+0x7C5B = 0x991B
+0x7C5C = 0x991C
+0x7C5E = 0x9931
+0x7C5F = 0x9932
+0x7C60 = 0x9933
+0x7C61 = 0x993A
+0x7C62 = 0x993B
+0x7C63 = 0x993C
+0x7C64 = 0x9940
+0x7C65 = 0x9941
+0x7C66 = 0x9946
+0x7C67 = 0x994D
+0x7C68 = 0x994E
+0x7C69 = 0x995C
+0x7C6A = 0x995F
+0x7C6B = 0x9960
+0x7C6C = 0x99A3
+0x7C6D = 0x99A6
+0x7C6E = 0x99B9
+0x7C6F = 0x99BD
+0x7C70 = 0x99BF
+0x7C71 = 0x99C3
+0x7C72 = 0x99C9
+0x7C73 = 0x99D4
+0x7C74 = 0x99D9
+0x7C75 = 0x99DE
+0x7C77 = 0x99F0
+0x7C78 = 0x99F9
+0x7C79 = 0x99FC
+0x7C7A = 0x9A0A
+0x7C7B = 0x9A11
+0x7C7C = 0x9A16
+0x7C7D = 0x9A1A
+0x7C7E = 0x9A20
+0x7D21 = 0x9A31
+0x7D22 = 0x9A36
+0x7D23 = 0x9A44
+0x7D24 = 0x9A4C
+0x7D25 = 0x9A58
+0x7D26 = 0x4BC2
+0x7D27 = 0x9AAF
+0x7D28 = 0x4BCA
+0x7D29 = 0x9AB7
+0x7D2A = 0x4BD2
+0x7D2B = 0x9AB9
+0x7D2D = 0x9AC6
+0x7D2E = 0x9AD0
+0x7D2F = 0x9AD2
+0x7D30 = 0x9AD5
+0x7D31 = 0x4BE8
+0x7D32 = 0x9ADC
+0x7D33 = 0x9AE0
+0x7D34 = 0x9AE5
+0x7D35 = 0x9AE9
+0x7D36 = 0x9B03
+0x7D37 = 0x9B0C
+0x7D38 = 0x9B10
+0x7D39 = 0x9B12
+0x7D3A = 0x9B16
+0x7D3B = 0x9B1C # 0x9B1D
+0x7D3C = 0x9B2B
+0x7D3D = 0x9B33
+0x7D3E = 0x9B3D
+0x7D3F = 0x4C20
+0x7D40 = 0x9B4B
+0x7D41 = 0x9B63
+0x7D42 = 0x9B65
+0x7D43 = 0x9B6B
+0x7D44 = 0x9B6C
+0x7D45 = 0x9B73
+0x7D46 = 0x9B76
+0x7D47 = 0x9B77
+0x7D48 = 0x9BA6
+0x7D49 = 0x9BAC
+0x7D4A = 0x9BB1
+0x7D4D = 0x9BB2
+0x7D4E = 0x9BB8
+0x7D4F = 0x9BBE
+0x7D50 = 0x9BC7
+0x7D51 = 0x9BF3
+0x7D52 = 0x9BD8
+0x7D53 = 0x9BDD
+0x7D54 = 0x9BE7
+0x7D55 = 0x9BEA
+0x7D56 = 0x9BEB
+0x7D57 = 0x9BEF
+0x7D58 = 0x9BEE
+0x7D5A = 0x9BFA
+0x7D5C = 0x9BF7
+0x7D5E = 0x9C16
+0x7D5F = 0x9C18
+0x7D60 = 0x9C19
+0x7D61 = 0x9C1A
+0x7D62 = 0x9C1D
+0x7D63 = 0x9C22
+0x7D64 = 0x9C27
+0x7D65 = 0x9C29
+0x7D66 = 0x9C2A
+0x7D68 = 0x9C31
+0x7D69 = 0x9C36
+0x7D6A = 0x9C37
+0x7D6B = 0x9C45
+0x7D6C = 0x9C5C
+0x7D6E = 0x9C49
+0x7D6F = 0x9C4A
+0x7D71 = 0x9C54
+0x7D72 = 0x9C58
+0x7D73 = 0x9C5B
+0x7D74 = 0x9C5D
+0x7D75 = 0x9C5F
+0x7D76 = 0x9C69
+0x7D77 = 0x9C6A
+0x7D78 = 0x9C6B
+0x7D79 = 0x9C6D
+0x7D7A = 0x9C6E
+0x7D7B = 0x9C70
+0x7D7C = 0x9C72
+0x7D7D = 0x9C75
+0x7D7E = 0x9C7A
+0x7E21 = 0x9CE6
+0x7E22 = 0x9CF2
+0x7E23 = 0x9D0B
+0x7E24 = 0x9D02
+0x7E26 = 0x9D11
+0x7E27 = 0x9D17
+0x7E28 = 0x9D18
+0x7E2A = 0x4CC4
+0x7E2C = 0x9D32
+0x7E2D = 0x4CD1
+0x7E2E = 0x9D42
+0x7E2F = 0x9D4A
+0x7E30 = 0x9D5F
+0x7E31 = 0x9D62
+0x7E33 = 0x9D69
+0x7E34 = 0x9D6B
+0x7E36 = 0x9D73
+0x7E37 = 0x9D76
+0x7E38 = 0x9D77
+0x7E39 = 0x9D7E
+0x7E3A = 0x9D84
+0x7E3B = 0x9D8D
+0x7E3C = 0x9D99
+0x7E3D = 0x9DA1
+0x7E3E = 0x9DBF
+0x7E3F = 0x9DB5
+0x7E40 = 0x9DB9
+0x7E41 = 0x9DBD
+0x7E42 = 0x9DC3
+0x7E43 = 0x9DC7
+0x7E44 = 0x9DC9
+0x7E45 = 0x9DD6
+0x7E46 = 0x9DDA
+0x7E47 = 0x9DDF
+0x7E48 = 0x9DE0
+0x7E49 = 0x9DE3
+0x7E4A = 0x9DF4
+0x7E4B = 0x4D07
+0x7E4C = 0x9E0A
+0x7E4D = 0x9E02
+0x7E4E = 0x9E0D
+0x7E4F = 0x9E19
+0x7E50 = 0x9E1C
+0x7E51 = 0x9E1D
+0x7E52 = 0x9E7B
+0x7E54 = 0x9E80
+0x7E55 = 0x9E85
+0x7E56 = 0x9E9B
+0x7E57 = 0x9EA8
+0x7E59 = 0x9EBD
+0x7E5B = 0x9EDF
+0x7E5C = 0x9EE7
+0x7E5D = 0x9EEE
+0x7E5E = 0x9EFF
+0x7E5F = 0x9F02
+0x7E60 = 0x4D77
+0x7E61 = 0x9F03
+0x7E62 = 0x9F17
+0x7E63 = 0x9F19
+0x7E64 = 0x9F2F
+0x7E65 = 0x9F37
+0x7E66 = 0x9F3A
+0x7E67 = 0x9F3D
+0x7E68 = 0x9F41
+0x7E69 = 0x9F45
+0x7E6A = 0x9F46
+0x7E6B = 0x9F53
+0x7E6C = 0x9F55
+0x7E6D = 0x9F58
+0x7E6F = 0x9F5D
+0x7E71 = 0x9F69
+0x7E73 = 0x9F6D
+0x7E74 = 0x9F70
+0x7E75 = 0x9F75
+END_MAP
diff --git a/enc/trans/JIS/JISX0213-2%UCS@SIP.src b/enc/trans/JIS/JISX0213-2%UCS@SIP.src
new file mode 100644
index 0000000000..15f8d317e6
--- /dev/null
+++ b/enc/trans/JIS/JISX0213-2%UCS@SIP.src
@@ -0,0 +1,311 @@
+# $NetBSD: JISX0213-2%UCS@SIP.src,v 1.1 2007/03/05 16:58:33 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"JISX0213-2/UCS:SIP"
+SRC_ZONE	0x21-0x7E / 0x21-0x7E / 8
+OOB_MODE	INVALID
+DST_INVALID	0xFFFE
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+## JIS X 0213:2004 vs Unicode mapping table
+## 
+## Date: 22 May 2006
+## License:
+## 	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.
+## Note:
+## 	3-XXXX	JIS X 0213:2004 plane 1 (GL encoding)
+## 	4-XXXX	JIS X 0213:2000 plane 2 (GL encoding)
+## 	[1983]	JIS codepoint defined by JIS X 0208-1983
+## 	[1990]	JIS codepoint defined by JIS X 0208-1990
+## 	[2000]	JIS codepoint defined by JIS X 0213:2000
+## 	[2004]	JIS codepoint defined by JIS X 0213:2004
+## 	[Unicode3.1]	UCS codepoint defined by Unicode 3.1
+## 	[Unicode3.2]	UCS codepoint defined by Unicode 3.2
+## 	Fullwidth	UCS fullwidth form (U+Fxxx)
+## 	Windows 	Windows (CP932) mapping
+## 	Some 0213 character can't represent by one UCS character.
+## 	In this table, such characters are described as 'U+xxxx+xxxx'.
+## 
+## JIS	Unicode	Name	Note
+0x2121 = 0x0089
+0x212B = 0x00A2
+0x212E = 0x00A4
+0x2136 = 0x01A2
+0x2146 = 0x0213
+0x2170 = 0x032B
+0x2177 = 0x0381
+0x2179 = 0x0371
+0x2322 = 0x03F9
+0x2325 = 0x044A
+0x2327 = 0x0509
+0x2331 = 0x05D6
+0x2332 = 0x0628
+0x2338 = 0x074F
+0x233F = 0x0807
+0x2341 = 0x083A
+0x234A = 0x08B9
+0x2352 = 0x097C
+0x2353 = 0x099D
+0x2359 = 0x0AD3
+0x235C = 0x0B1D
+0x2377 = 0x0D45
+0x242A = 0x0DE1
+0x2431 = 0x0E95
+0x2432 = 0x0E6D
+0x243A = 0x0E64
+0x243D = 0x0F5F
+0x2459 = 0x1201
+0x245C = 0x1255
+0x245E = 0x127B
+0x2463 = 0x1274
+0x246A = 0x12E4
+0x246B = 0x12D7
+0x2472 = 0x12FD
+0x2474 = 0x1336
+0x2475 = 0x1344
+0x2525 = 0x13C4
+0x2532 = 0x146D
+0x253E = 0x15D7
+0x2544 = 0x6C29
+0x2547 = 0x1647
+0x2555 = 0x1706
+0x2556 = 0x1742
+0x257E = 0x19C3
+0x2830 = 0x1C56
+0x2837 = 0x1D2D
+0x2838 = 0x1D45
+0x283A = 0x1D78
+0x283B = 0x1D62
+0x283F = 0x1DA1
+0x2840 = 0x1D9C
+0x2845 = 0x1D92
+0x2848 = 0x1DB7
+0x284A = 0x1DE0
+0x284B = 0x1E33
+0x285B = 0x1F1E
+0x2866 = 0x1F76
+0x286C = 0x1FFA
+0x2C22 = 0x217B
+0x2C2B = 0x231E
+0x2C30 = 0x23AD
+0x2C50 = 0x26F3
+0x2C65 = 0x285B
+0x2C6D = 0x28AB
+0x2C72 = 0x298F
+0x2D24 = 0x2AB8
+0x2D29 = 0x2B4F
+0x2D2A = 0x2B50
+0x2D32 = 0x2B46
+0x2D34 = 0x2C1D
+0x2D35 = 0x2BA6
+0x2D39 = 0x2C24
+0x2D56 = 0x2DE1
+0x2D7D = 0x31C3
+0x2E23 = 0x31F5
+0x2E24 = 0x31B6
+0x2E3A = 0x3372
+0x2E3C = 0x33D3
+0x2E3D = 0x33D2
+0x2E42 = 0x33D0
+0x2E43 = 0x33E4
+0x2E44 = 0x33D5
+0x2E47 = 0x33DA
+0x2E49 = 0x33DF
+0x2E55 = 0x344A
+0x2E56 = 0x3451
+0x2E57 = 0x344B
+0x2E5B = 0x3465
+0x2E77 = 0x34E4
+0x2E78 = 0x355A
+0x2F2A = 0x3594
+0x2F3F = 0x3639
+0x2F40 = 0x3647
+0x2F42 = 0x3638
+0x2F43 = 0x363A
+0x2F4E = 0x371C
+0x2F59 = 0x370C
+0x2F61 = 0x3764
+0x2F69 = 0x37FF
+0x2F6A = 0x37E7
+0x2F70 = 0x3824
+0x2F75 = 0x383D
+0x6E23 = 0x3A98
+0x6E34 = 0x3C7F
+0x6E49 = 0x3D00
+0x6E5C = 0x3D40
+0x6E5E = 0x3DFA
+0x6E5F = 0x3DF9
+0x6E60 = 0x3DD3
+0x6F32 = 0x3F7E
+0x6F47 = 0x4096
+0x6F4D = 0x4103
+0x6F61 = 0x41C6
+0x6F64 = 0x41FE
+0x7022 = 0x43BC
+0x7033 = 0x4629
+0x7039 = 0x46A5
+0x7053 = 0x4896
+0x707B = 0x4A4D
+0x712E = 0x4B56
+0x7130 = 0x4B6F
+0x7135 = 0x4C16
+0x7144 = 0x4D14
+0x715D = 0x4E0E
+0x7161 = 0x4E37
+0x7166 = 0x4E6A
+0x7169 = 0x4E8B
+0x7175 = 0x504A
+0x7177 = 0x5055
+0x717A = 0x5122
+0x7221 = 0x51A9
+0x7223 = 0x51E5
+0x7224 = 0x51CD
+0x7228 = 0x521E
+0x722C = 0x524C
+0x723D = 0x542E
+0x7248 = 0x54D9
+0x725B = 0x55A7
+0x7275 = 0x57A9
+0x7276 = 0x57B4
+0x7332 = 0x59D4
+0x733D = 0x5AE4
+0x733E = 0x5AE3
+0x7340 = 0x5AF1
+0x7352 = 0x5BB2
+0x735D = 0x5C4B
+0x735E = 0x5C64
+0x7373 = 0x5E2E
+0x7374 = 0x5E56
+0x7375 = 0x5E65
+0x7377 = 0x5E62
+0x737B = 0x5ED8
+0x737D = 0x5EC2
+0x7422 = 0x5EE8
+0x7424 = 0x5F23
+0x7427 = 0x5F5C
+0x742E = 0x5FE0
+0x742F = 0x5FD4
+0x7434 = 0x600C
+0x7435 = 0x5FFB
+0x743D = 0x6017
+0x7442 = 0x6060
+0x744F = 0x60ED
+0x7469 = 0x6270
+0x746B = 0x6286
+0x7472 = 0x634C
+0x7475 = 0x3D0E
+0x7479 = 0x6402
+0x7535 = 0x667E
+0x753A = 0x66B0
+0x7546 = 0x671D
+0x7556 = 0x68DD
+0x7558 = 0x68EA
+0x755A = 0x6951
+0x755D = 0x696F
+0x755F = 0x69DD
+0x7563 = 0x6A1E
+0x756A = 0x6A58
+0x7570 = 0x6A8C
+0x7573 = 0x6AB7
+0x7644 = 0x6C73
+0x764E = 0x6CDD
+0x765D = 0x6E65
+0x7675 = 0x6F94
+0x767E = 0x6FF8
+0x7721 = 0x6FF6
+0x7722 = 0x6FF7
+0x7733 = 0x710D
+0x7736 = 0x7139
+0x7764 = 0x73DB
+0x7765 = 0x73DA
+0x776B = 0x73FE
+0x776E = 0x7410
+0x7773 = 0x7449
+0x7829 = 0x7615
+0x782A = 0x7614
+0x782C = 0x7631
+0x7834 = 0x7693
+0x783C = 0x770E
+0x783E = 0x7723
+0x7842 = 0x7752
+0x7856 = 0x7985
+0x7863 = 0x7A84
+0x7877 = 0x7BB3
+0x7879 = 0x7BBE
+0x787A = 0x7BC7
+0x7925 = 0x7CB8
+0x792F = 0x7DA0
+0x7932 = 0x7E10
+0x7939 = 0x7FB7
+0x7942 = 0x808A
+0x7948 = 0x80BB
+0x7959 = 0x8282
+0x795E = 0x82F3
+0x7966 = 0x840C
+0x796B = 0x8455
+0x797A = 0x856B
+0x797E = 0x85C8
+0x7A21 = 0x85C9
+0x7A2C = 0x86D7
+0x7A2F = 0x86FA
+0x7A4F = 0x8949
+0x7A50 = 0x8946
+0x7A57 = 0x896B
+0x7A65 = 0x8987
+0x7A66 = 0x8988
+0x7A71 = 0x89BA
+0x7A72 = 0x89BB
+0x7A7E = 0x8A1E
+0x7B21 = 0x8A29
+0x7B2C = 0x8A71
+0x7B2D = 0x8A43
+0x7B36 = 0x8A99
+0x7B37 = 0x8ACD
+0x7B3D = 0x8AE4
+0x7B3E = 0x8ADD
+0x7B4E = 0x8BC1
+0x7B4F = 0x8BEF
+0x7B57 = 0x8D10
+0x7B5A = 0x8D71
+0x7B5C = 0x8DFB
+0x7B5D = 0x8E1F
+0x7B61 = 0x8E36
+0x7B65 = 0x8E89
+0x7B67 = 0x8EEB
+0x7B69 = 0x8F32
+0x7B71 = 0x8FF8
+0x7C22 = 0x92A0
+0x7C23 = 0x92B1
+0x7C38 = 0x9490
+0x7C42 = 0x95CF
+0x7C4C = 0x967F
+0x7C56 = 0x96F0
+0x7C59 = 0x9719
+0x7C5D = 0x9750
+0x7C76 = 0x98C6
+0x7D2C = 0x9A72
+0x7D4B = 0x9DDB
+0x7D4C = 0x9E3D
+0x7D59 = 0x9E15
+0x7D5B = 0x9E8A
+0x7D5D = 0x9E49
+0x7D67 = 0x9EC4
+0x7D6D = 0x9EE9
+0x7D70 = 0x9EDB
+0x7E25 = 0x9FCE
+0x7E29 = 0xA02F
+0x7E2B = 0xA01A
+0x7E32 = 0xA0F9
+0x7E35 = 0xA082
+0x7E53 = 0x2218
+0x7E58 = 0xA38C
+0x7E5A = 0xA437
+0x7E6E = 0xA5F1
+0x7E70 = 0xA602
+0x7E72 = 0xA61A
+0x7E76 = 0xA6B2
+END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0201-KANA.src b/enc/trans/JIS/UCS%JISX0201-KANA.src
index 57ae00f23b..fac6ae8afe 100644
--- a/enc/trans/JIS/UCS%JISX0201-KANA.src
+++ b/enc/trans/JIS/UCS%JISX0201-KANA.src
@@ -12,27 +12,16 @@ 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:    0.9
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             8 March 1994
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date:             2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
@@ -42,15 +31,7 @@ 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.  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.
+# VENDORS mapping data.
 #
 #
 #	Format:  Three tab-separated columns
@@ -60,6 +41,23 @@ 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 977171ccda..b06e6de231 100644
--- a/enc/trans/JIS/UCS%JISX0208@1990.src
+++ b/enc/trans/JIS/UCS%JISX0208@1990.src
@@ -12,27 +12,16 @@ 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:    0.9
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             8 March 1994
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date:             2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
@@ -42,15 +31,7 @@ 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.  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.
+# VENDORS mapping data.
 #
 #
 #	Format:  Four tab-separated columns
@@ -77,12 +58,22 @@ BEGIN_MAP
 #			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
 #			0x7426 -> 0x5406 -> 8406
 #
-#   The kanji mappings are a normative part of ISO/IEC 10646.  The
-#       non-kanji mappings are provisional, pending definition of
-#       official mappings by Japanese standards bodies
+#  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.
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#    [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.
 #
 # 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 f3b2e7089b..c7711c8ac0 100644
--- a/enc/trans/JIS/UCS%JISX0212.src
+++ b/enc/trans/JIS/UCS%JISX0212.src
@@ -12,27 +12,16 @@ 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:    0.9
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             8 March 1994
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date:             2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
@@ -42,15 +31,7 @@ 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.  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.
+# VENDORS mapping data.
 #
 #
 #	Format:  Three tab-separated columns
@@ -76,27 +57,39 @@ 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
 #
 #	   However, JIS X 0212 maintains the distinction between
 #	   the lowercase forms of these two elements at 0x2942 and 0x2943.
-#	   Given the structre of these JIS encodings, it is clear that
+#	   Given the structure of these JIS encodings, it is clear that
 #	   0x2922 and 0x2942 are intended to be a capital/small pair.
 #	   Consequently, in the Unicode mapping, 0x2922 is treated as
 #	   LATIN CAPITAL LETTER D WITH STROKE.
 #
+#  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/JIS/UCS@BMP%JISX0213-1.src b/enc/trans/JIS/UCS@BMP%JISX0213-1.src
new file mode 100644
index 0000000000..953e361738
--- /dev/null
+++ b/enc/trans/JIS/UCS@BMP%JISX0213-1.src
@@ -0,0 +1,1922 @@
+# $NetBSD: UCS@BMP%JISX0213-1.src,v 1.1 2007/03/05 16:58:33 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"UCS:BMP/JISX0213-1"
+SRC_ZONE	0x007E - 0xFF60
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+## Shift_JIS-2004 (JIS X 0213:2004) vs Unicode mapping table
+## 
+## Date: 12 Feb 2005 10:15:00 GMT
+## License:
+## 	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.
+## Note:
+## 	[1983]	JIS codepoint defined by JIS X 0208-1983
+## 	[1990]	JIS codepoint defined by JIS X 0208-1990
+## 	[2000]	JIS codepoint defined by JIS X 0213:2000
+## 	[2004]	JIS codepoint defined by JIS X 0213:2004
+## 	[Unicode3.1]	UCS codepoint defined by Unicode 3.1
+## 	[Unicode3.2]	UCS codepoint defined by Unicode 3.2
+## 	Fullwidth	UCS fullwidth form (U+Fxxx)
+## 	Windows 	Windows (CP932) mapping
+## 	Some 0213 character can't represent by one UCS character.
+## 	In this table, such characters are described as 'U+xxxx+xxxx'.
+## 
+0x00A0 = 0x2922
+0x00A1 = 0x2923
+0x00A4 = 0x2924
+0x00A6 = 0x2925
+0x00A9 = 0x2926
+0x00AA = 0x2927
+0x00AB = 0x2928
+0x00AD = 0x2929
+0x00AE = 0x292A
+0x00AF = 0x292B
+0x00B2 = 0x292C
+0x00B3 = 0x292D
+0x00B7 = 0x292E
+0x00B8 = 0x292F
+0x00B9 = 0x2930
+0x00BA = 0x2931
+0x00BB = 0x2932
+0x00BC = 0x2933
+0x00BD = 0x2934
+0x00BE = 0x2935
+0x00BF = 0x2936
+0x00C0 = 0x2937
+0x00C1 = 0x2938
+0x00C2 = 0x2939
+0x00C3 = 0x293A
+0x00C4 = 0x293B
+0x00C5 = 0x293C
+0x00C6 = 0x293D
+0x00C7 = 0x293E
+0x00C8 = 0x293F
+0x00C9 = 0x2940
+0x00CA = 0x2941
+0x00CB = 0x2942
+0x00CC = 0x2943
+0x00CD = 0x2944
+0x00CE = 0x2945
+0x00CF = 0x2946
+0x00D0 = 0x2947
+0x00D1 = 0x2948
+0x00D2 = 0x2949
+0x00D3 = 0x294A
+0x00D4 = 0x294B
+0x00D5 = 0x294C
+0x00D6 = 0x294D
+0x00D8 = 0x294E
+0x00D9 = 0x294F
+0x00DA = 0x2950
+0x00DB = 0x2951
+0x00DC = 0x2952
+0x00DD = 0x2953
+0x00DE = 0x2954
+0x00DF = 0x2955
+0x00E0 = 0x2956
+0x00E1 = 0x2957
+0x00E2 = 0x2958
+0x00E3 = 0x2959
+0x00E4 = 0x295A
+0x00E5 = 0x295B
+#0x00E6 + 0x0300 = 0x2B44
+0x00E6 = 0x295C
+0x00E7 = 0x295D
+0x00E8 = 0x295E
+0x00E9 = 0x295F
+0x00EA = 0x2960
+0x00EB = 0x2961
+0x00EC = 0x2962
+0x00ED = 0x2963
+0x00EE = 0x2964
+0x00EF = 0x2965
+0x00F0 = 0x2966
+0x00F1 = 0x2967
+0x00F2 = 0x2968
+0x00F3 = 0x2969
+0x00F4 = 0x296A
+0x00F5 = 0x296B
+0x00F6 = 0x296C
+0x00F8 = 0x296D
+0x00F9 = 0x296E
+0x00FA = 0x296F
+0x00FB = 0x2970
+0x00FC = 0x2971
+0x00FD = 0x2972
+0x00FE = 0x2973
+0x00FF = 0x2974
+0x0100 = 0x2975
+0x0101 = 0x297A
+0x0102 = 0x2A3A
+0x0103 = 0x2A49
+0x0104 = 0x2A21
+0x0105 = 0x2A2C
+0x0106 = 0x2A3C
+0x0107 = 0x2A4B
+0x0108 = 0x2A59
+0x0109 = 0x2A5F
+0x010C = 0x2A3D
+0x010D = 0x2A4C
+0x010E = 0x2A40
+0x010F = 0x2A4F
+0x0111 = 0x2A50
+0x0112 = 0x2978
+0x0113 = 0x297D
+0x0118 = 0x2A3E
+0x0119 = 0x2A4D
+0x011A = 0x2A3F
+0x011B = 0x2A4E
+0x011C = 0x2A5A
+0x011D = 0x2A60
+0x0124 = 0x2A5B
+0x0125 = 0x2A61
+0x0127 = 0x2A7D
+0x012A = 0x2976
+0x012B = 0x297B
+0x0134 = 0x2A5C
+0x0135 = 0x2A62
+0x0139 = 0x2A3B
+0x013A = 0x2A4A
+0x013D = 0x2A24
+0x013E = 0x2A2F
+0x0141 = 0x2A23
+0x0142 = 0x2A2E
+0x0143 = 0x2A41
+0x0144 = 0x2A51
+0x0147 = 0x2A42
+0x0148 = 0x2A52
+0x014B = 0x2A7A
+0x014C = 0x2979
+0x014D = 0x297E
+0x0150 = 0x2A43
+0x0151 = 0x2A53
+0x0152 = 0x2B2B
+0x0153 = 0x2B2A
+0x0154 = 0x2A39
+0x0155 = 0x2A48
+0x0158 = 0x2A44
+0x0159 = 0x2A54
+0x015A = 0x2A25
+0x015B = 0x2A30
+0x015C = 0x2A5D
+0x015D = 0x2A63
+0x015E = 0x2A27
+0x015F = 0x2A33
+0x0160 = 0x2A26
+0x0161 = 0x2A32
+0x0162 = 0x2A47
+0x0163 = 0x2A57
+0x0164 = 0x2A28
+0x0165 = 0x2A34
+0x016A = 0x2977
+0x016B = 0x297C
+0x016C = 0x2A5E
+0x016D = 0x2A64
+0x016E = 0x2A45
+0x016F = 0x2A55
+0x0170 = 0x2A46
+0x0171 = 0x2A56
+0x0179 = 0x2A29
+0x017A = 0x2A35
+0x017B = 0x2A2B
+0x017C = 0x2A38
+0x017D = 0x2A2A
+0x017E = 0x2A37
+0x0193 = 0x2B29
+0x01C2 = 0x2B24
+0x01CD = 0x286F
+0x01CE = 0x2870
+0x01D0 = 0x2871
+0x01D1 = 0x2876
+0x01D2 = 0x2877
+0x01D4 = 0x2878
+0x01D6 = 0x2879
+0x01D8 = 0x287A
+0x01DA = 0x287B
+0x01DC = 0x287C
+0x01F8 = 0x2874
+0x01F9 = 0x2875
+0x01FD = 0x2B45
+0x0250 = 0x2B33
+0x0251 = 0x2B39
+0x0252 = 0x2B3A
+0x0253 = 0x2B25
+#0x0254 + 0x0300 = 0x2B48
+#0x0254 + 0x0301 = 0x2B49
+0x0254 = 0x2B38
+0x0255 = 0x2B3F
+0x0256 = 0x2A6E
+0x0257 = 0x2B26
+0x0258 = 0x2B2E
+#0x0259 + 0x0300 = 0x2B4C
+#0x0259 + 0x0301 = 0x2B4D
+0x0259 = 0x2B30
+#0x025A + 0x0300 = 0x2B4E
+#0x025A + 0x0301 = 0x2B4F
+0x025A = 0x2B43
+0x025C = 0x2B31
+0x025E = 0x2B32
+0x025F = 0x2A75
+0x0260 = 0x2B28
+0x0261 = 0x2A79
+0x0264 = 0x2B36
+0x0265 = 0x2B3C
+0x0266 = 0x2B22
+0x0267 = 0x2B42
+0x0268 = 0x2B2C
+0x026C = 0x2A6A
+0x026D = 0x2A74
+0x026E = 0x2A6B
+0x026F = 0x2B34
+0x0270 = 0x2A7B
+0x0271 = 0x2A65
+0x0272 = 0x2A76
+0x0273 = 0x2A6F
+0x0275 = 0x2B2F
+0x0279 = 0x2A6C
+0x027A = 0x2B41
+0x027B = 0x2A73
+0x027D = 0x2A70
+0x027E = 0x2A67
+0x0281 = 0x2A7C
+0x0282 = 0x2A71
+0x0283 = 0x2A68
+0x0284 = 0x2B27
+0x0288 = 0x2A6D
+0x0289 = 0x2B2D
+0x028A = 0x2B35
+0x028B = 0x2A66
+#0x028C + 0x0300 = 0x2B4A
+#0x028C + 0x0301 = 0x2B4B
+0x028C = 0x2B37
+0x028D = 0x2B3B
+0x028E = 0x2A78
+0x0290 = 0x2A72
+0x0291 = 0x2B40
+0x0292 = 0x2A69
+0x0294 = 0x2B21
+0x0295 = 0x2A7E
+0x0298 = 0x2B23
+0x029D = 0x2A77
+0x02A1 = 0x2B3E
+0x02A2 = 0x2B3D
+0x02C7 = 0x2A31
+0x02C8 = 0x2B53
+0x02CC = 0x2B54
+0x02D0 = 0x2B55
+0x02D1 = 0x2B56
+0x02D8 = 0x2A22
+0x02D9 = 0x2A58
+0x02DB = 0x2A2D
+0x02DD = 0x2A36
+0x02DE = 0x2B71
+#0x02E5 + 0x02E9 = 0x2B66
+0x02E5 = 0x2B60
+0x02E6 = 0x2B61
+0x02E7 = 0x2B62
+0x02E8 = 0x2B63
+#0x02E9 + 0x02E5 = 0x2B65
+0x02E9 = 0x2B64
+0x0300 = 0x2B5C
+0x0301 = 0x2B5A
+0x0302 = 0x2B5F
+0x0303 = 0x2B7D
+0x0304 = 0x2B5B
+0x0306 = 0x2B57
+0x0308 = 0x2B6D
+0x030B = 0x2B59
+0x030C = 0x2B5E
+0x030F = 0x2B5D
+0x0318 = 0x2B78
+0x0319 = 0x2B79
+0x031A = 0x2B7E
+0x031C = 0x2B6A
+0x031D = 0x2B76
+0x031E = 0x2B77
+0x031F = 0x2B6B
+0x0320 = 0x2B6C
+0x0324 = 0x2B72
+0x0325 = 0x2B67
+0x0329 = 0x2B6F
+0x032A = 0x2B7A
+0x032C = 0x2B68
+0x032F = 0x2B70
+0x0330 = 0x2B73
+0x0334 = 0x2B75
+0x0339 = 0x2B69
+0x033A = 0x2B7B
+0x033B = 0x2B7C
+0x033C = 0x2B74
+0x033D = 0x2B6E
+0x0361 = 0x2B52
+0x03C2 = 0x2659
+0x1E3E = 0x2872
+0x1E3F = 0x2873
+0x1F70 = 0x2B46
+0x1F71 = 0x2B47
+0x1F72 = 0x2B50
+0x1F73 = 0x2B51
+0x2013 = 0x237C
+0x2022 = 0x2340
+0x203C = 0x286B
+0x203F = 0x2B58
+0x2042 = 0x2C7E
+0x2047 = 0x286C
+0x2048 = 0x286D
+0x2049 = 0x286E
+0x2051 = 0x2C7D
+0x20AC = 0x2921
+0x210F = 0x235D
+0x2113 = 0x235F
+0x2116 = 0x2D62
+0x2121 = 0x2D64
+0x2127 = 0x2360
+0x2135 = 0x235C
+0x2153 = 0x2778
+0x2154 = 0x2779
+0x2155 = 0x277A
+0x2160 = 0x2D35
+0x2161 = 0x2D36
+0x2162 = 0x2D37
+0x2163 = 0x2D38
+0x2164 = 0x2D39
+0x2165 = 0x2D3A
+0x2166 = 0x2D3B
+0x2167 = 0x2D3C
+0x2168 = 0x2D3D
+0x2169 = 0x2D3E
+0x216A = 0x2D3F
+0x216B = 0x2D57
+0x2170 = 0x2C35
+0x2171 = 0x2C36
+0x2172 = 0x2C37
+0x2173 = 0x2C38
+0x2174 = 0x2C39
+0x2175 = 0x2C3A
+0x2176 = 0x2C3B
+0x2177 = 0x2C3C
+0x2178 = 0x2C3D
+0x2179 = 0x2C3E
+0x217A = 0x2C3F
+0x217B = 0x2C40
+0x2194 = 0x2271
+0x2196 = 0x2327
+0x2197 = 0x2325
+0x2198 = 0x2326
+0x2199 = 0x2328
+0x21C4 = 0x2329
+0x21E6 = 0x232B
+0x21E7 = 0x232C
+0x21E8 = 0x232A
+0x21E9 = 0x232D
+0x2205 = 0x2247
+0x2209 = 0x2246
+0x2213 = 0x235B
+0x221F = 0x2D78
+0x2225 = 0x2254
+0x2226 = 0x2255
+0x222E = 0x2D73
+0x2243 = 0x226C
+0x2245 = 0x226D
+0x2248 = 0x226E
+0x2262 = 0x226B
+0x2276 = 0x226F
+0x2277 = 0x2270
+0x2284 = 0x2242
+0x2285 = 0x2243
+0x228A = 0x2244
+0x228B = 0x2245
+0x2295 = 0x2251
+0x2296 = 0x2252
+0x2297 = 0x2253
+0x22BF = 0x2D79
+0x22DA = 0x2776
+0x22DB = 0x2777
+0x2305 = 0x2248
+0x2306 = 0x2249
+0x2318 = 0x277C
+0x23BE = 0x2742
+0x23BF = 0x2743
+0x23C0 = 0x2744
+0x23C1 = 0x2745
+0x23C2 = 0x2746
+0x23C3 = 0x2747
+0x23C4 = 0x2748
+0x23C5 = 0x2749
+0x23C6 = 0x274A
+0x23C7 = 0x274B
+0x23C8 = 0x274C
+0x23C9 = 0x274D
+0x23CA = 0x274E
+0x23CB = 0x274F
+0x23CC = 0x2750
+0x23CE = 0x277E
+0x2423 = 0x277D
+0x2460 = 0x2D21
+0x2461 = 0x2D22
+0x2462 = 0x2D23
+0x2463 = 0x2D24
+0x2464 = 0x2D25
+0x2465 = 0x2D26
+0x2466 = 0x2D27
+0x2467 = 0x2D28
+0x2468 = 0x2D29
+0x2469 = 0x2D2A
+0x246A = 0x2D2B
+0x246B = 0x2D2C
+0x246C = 0x2D2D
+0x246D = 0x2D2E
+0x246E = 0x2D2F
+0x246F = 0x2D30
+0x2470 = 0x2D31
+0x2471 = 0x2D32
+0x2472 = 0x2D33
+0x2473 = 0x2D34
+0x24D0 = 0x2C41
+0x24D1 = 0x2C42
+0x24D2 = 0x2C43
+0x24D3 = 0x2C44
+0x24D4 = 0x2C45
+0x24D5 = 0x2C46
+0x24D6 = 0x2C47
+0x24D7 = 0x2C48
+0x24D8 = 0x2C49
+0x24D9 = 0x2C4A
+0x24DA = 0x2C4B
+0x24DB = 0x2C4C
+0x24DC = 0x2C4D
+0x24DD = 0x2C4E
+0x24DE = 0x2C4F
+0x24DF = 0x2C50
+0x24E0 = 0x2C51
+0x24E1 = 0x2C52
+0x24E2 = 0x2C53
+0x24E3 = 0x2C54
+0x24E4 = 0x2C55
+0x24E5 = 0x2C56
+0x24E6 = 0x2C57
+0x24E7 = 0x2C58
+0x24E8 = 0x2C59
+0x24E9 = 0x2C5A
+0x24EB = 0x2C2B
+0x24EC = 0x2C2C
+0x24ED = 0x2C2D
+0x24EE = 0x2C2E
+0x24EF = 0x2C2F
+0x24F0 = 0x2C30
+0x24F1 = 0x2C31
+0x24F2 = 0x2C32
+0x24F3 = 0x2C33
+0x24F4 = 0x2C34
+0x24F5 = 0x265A
+0x24F6 = 0x265B
+0x24F7 = 0x265C
+0x24F8 = 0x265D
+0x24F9 = 0x265E
+0x24FA = 0x265F
+0x24FB = 0x2660
+0x24FC = 0x2661
+0x24FD = 0x2662
+0x24FE = 0x2663
+0x25B1 = 0x266D
+0x25B6 = 0x2322
+0x25B7 = 0x2321
+0x25C0 = 0x2324
+0x25C1 = 0x2323
+0x25C9 = 0x233B
+0x25D0 = 0x2867
+0x25D1 = 0x2868
+0x25D2 = 0x2869
+0x25D3 = 0x286A
+0x25E6 = 0x233F
+0x2600 = 0x2668
+0x2601 = 0x2669
+0x2602 = 0x266A
+0x2603 = 0x266B
+0x260E = 0x2667
+0x2616 = 0x2664
+0x2617 = 0x2665
+0x261E = 0x2D7E
+0x2660 = 0x263A
+0x2661 = 0x263D
+0x2662 = 0x263B
+0x2663 = 0x2640
+0x2664 = 0x2639
+0x2665 = 0x263E
+0x2666 = 0x263C
+0x2667 = 0x263F
+0x2668 = 0x266C
+0x2669 = 0x227D
+0x266B = 0x227B
+0x266C = 0x227C
+0x266E = 0x227A
+0x2713 = 0x277B
+0x2756 = 0x2D7D
+0x2776 = 0x2C21
+0x2777 = 0x2C22
+0x2778 = 0x2C23
+0x2779 = 0x2C24
+0x277A = 0x2C25
+0x277B = 0x2C26
+0x277C = 0x2C27
+0x277D = 0x2C28
+0x277E = 0x2C29
+0x277F = 0x2C2A
+0x2934 = 0x232E
+0x2935 = 0x232F
+0x29BF = 0x233A
+0x29FA = 0x237D
+0x29FB = 0x237E
+0x3016 = 0x225A
+0x3017 = 0x225B
+0x3018 = 0x2258
+0x3019 = 0x2259
+0x301D = 0x2D60
+0x301F = 0x2D61
+0x3020 = 0x2666
+0x3033 = 0x2233
+0x3034 = 0x2234
+0x3035 = 0x2235
+0x303B = 0x2236
+0x303C = 0x2237
+0x303D = 0x233C
+#0x304B + 0x309A = 0x2477
+#0x304D + 0x309A = 0x2478
+#0x304F + 0x309A = 0x2479
+#0x3051 + 0x309A = 0x247A
+#0x3053 + 0x309A = 0x247B
+0x3094 = 0x2474
+0x3095 = 0x2475
+0x3096 = 0x2476
+0x309F = 0x2239
+0x30A0 = 0x237B
+#0x30AB + 0x309A = 0x2577
+#0x30AD + 0x309A = 0x2578
+#0x30AF + 0x309A = 0x2579
+#0x30B1 + 0x309A = 0x257A
+#0x30B3 + 0x309A = 0x257B
+#0x30BB + 0x309A = 0x257C
+#0x30C4 + 0x309A = 0x257D
+#0x30C8 + 0x309A = 0x257E
+0x30F7 = 0x2772
+0x30F8 = 0x2773
+0x30F9 = 0x2774
+0x30FA = 0x2775
+0x30FF = 0x2238
+0x31F0 = 0x266E
+0x31F1 = 0x266F
+0x31F2 = 0x2670
+0x31F3 = 0x2671
+0x31F4 = 0x2672
+0x31F5 = 0x2673
+0x31F6 = 0x2674
+#0x31F7 + 0x309A = 0x2678
+0x31F7 = 0x2675
+0x31F8 = 0x2676
+0x31F9 = 0x2677
+0x31FA = 0x2679
+0x31FB = 0x267A
+0x31FC = 0x267B
+0x31FD = 0x267C
+0x31FE = 0x267D
+0x31FF = 0x267E
+0x3231 = 0x2D6A
+0x3232 = 0x2D6B
+0x3239 = 0x2D6C
+0x3251 = 0x2841
+0x3252 = 0x2842
+0x3253 = 0x2843
+0x3254 = 0x2844
+0x3255 = 0x2845
+0x3256 = 0x2846
+0x3257 = 0x2847
+0x3258 = 0x2848
+0x3259 = 0x2849
+0x325A = 0x284A
+0x325B = 0x284B
+0x325C = 0x284C
+0x325D = 0x284D
+0x325E = 0x284E
+0x325F = 0x284F
+0x32A4 = 0x2D65
+0x32A5 = 0x2D66
+0x32A6 = 0x2D67
+0x32A7 = 0x2D68
+0x32A8 = 0x2D69
+0x32B1 = 0x2850
+0x32B2 = 0x2851
+0x32B3 = 0x2852
+0x32B4 = 0x2853
+0x32B5 = 0x2854
+0x32B6 = 0x2855
+0x32B7 = 0x2856
+0x32B8 = 0x2857
+0x32B9 = 0x2858
+0x32BA = 0x2859
+0x32BB = 0x285A
+0x32BC = 0x285B
+0x32BD = 0x285C
+0x32BE = 0x285D
+0x32BF = 0x285E
+0x32D0 = 0x2C5B
+0x32D1 = 0x2C5C
+0x32D2 = 0x2C5D
+0x32D3 = 0x2C5E
+0x32D4 = 0x2C5F
+0x32D5 = 0x2C60
+0x32D6 = 0x2C61
+0x32D7 = 0x2C62
+0x32D8 = 0x2C63
+0x32D9 = 0x2C64
+0x32DA = 0x2C65
+0x32DB = 0x2C66
+0x32DC = 0x2C67
+0x32DD = 0x2C68
+0x32DE = 0x2C69
+0x32DF = 0x2C6A
+0x32E0 = 0x2C6B
+0x32E1 = 0x2C6C
+0x32E2 = 0x2C6D
+0x32E3 = 0x2C6E
+0x32E5 = 0x2C71
+0x32E9 = 0x2C70
+0x32EC = 0x2C73
+0x32ED = 0x2C72
+0x32FA = 0x2C6F
+0x3303 = 0x2D46
+0x330D = 0x2D4A
+0x3314 = 0x2D41
+0x3318 = 0x2D44
+0x3322 = 0x2D42
+0x3323 = 0x2D4C
+0x3326 = 0x2D4B
+0x3327 = 0x2D45
+0x332B = 0x2D4D
+0x3336 = 0x2D47
+0x333B = 0x2D4F
+0x3349 = 0x2D40
+0x334A = 0x2D4E
+0x334D = 0x2D43
+0x3351 = 0x2D48
+0x3357 = 0x2D49
+0x337B = 0x2D5F
+0x337C = 0x2D6F
+0x337D = 0x2D6E
+0x337E = 0x2D6D
+0x338E = 0x2D53
+0x338F = 0x2D54
+0x339C = 0x2D50
+0x339D = 0x2D51
+0x339E = 0x2D52
+0x33A1 = 0x2D56
+0x33C4 = 0x2D55
+0x33CB = 0x235E
+0x33CD = 0x2D63
+0x3402 = 0x2E23
+0x34B5 = 0x2E53
+0x34DB = 0x2E5B
+0x378D = 0x4F5F
+0x37E2 = 0x4F6F
+0x3B22 = 0x7549
+0x3BB6 = 0x757E
+0x3BC3 = 0x7621
+0x3C0F = 0x763A
+0x3E3F = 0x7766
+0x3F72 = 0x784D
+0x4264 = 0x796D
+0x4453 = 0x7A59
+0x445B = 0x7A5A
+0x459D = 0x7B51
+0x45EA = 0x7B60
+0x4844 = 0x7C4B
+0x49B0 = 0x7D58
+0x4C17 = 0x7E3E
+0x4E28 = 0x2E24
+0x4E2F = 0x2E25
+0x4E30 = 0x2E26
+0x4E8D = 0x2E27
+0x4EE1 = 0x2E28
+0x4EFD = 0x2E29
+0x4EFF = 0x2E2A
+0x4F03 = 0x2E2B
+0x4F0B = 0x2E2C
+0x4F48 = 0x2E2E
+0x4F49 = 0x2E2F
+0x4F56 = 0x2E30
+0x4F5F = 0x2E31
+0x4F60 = 0x2E2D
+0x4F6A = 0x2E32
+0x4F6C = 0x2E33
+0x4F7E = 0x2E34
+0x4F8A = 0x2E35
+0x4F94 = 0x2E36
+0x4F97 = 0x2E37
+0x4FC9 = 0x2E39
+0x4FE0 = 0x2E3A
+0x4FF1 = 0x2E21
+0x5001 = 0x2E3B
+0x5002 = 0x2E3C
+0x500E = 0x2E3D
+0x5018 = 0x2E3E
+0x5027 = 0x2E3F
+0x502E = 0x2E40
+0x503B = 0x2E42
+0x5040 = 0x2E41
+0x5041 = 0x2E43
+0x5094 = 0x2E44
+0x50CC = 0x2E45
+0x50D0 = 0x2E47
+0x50E6 = 0x2E48
+0x50F2 = 0x2E46
+0x5103 = 0x2E4B
+0x5106 = 0x2E4A
+0x510B = 0x2E4C
+0x511E = 0x2E4D
+0x5135 = 0x2E4E
+0x514A = 0x2E4F
+0x5155 = 0x2E51
+0x5157 = 0x2E52
+0x519D = 0x2E54
+0x51C3 = 0x2E55
+0x51CA = 0x2E56
+0x51DE = 0x2E57
+0x51E2 = 0x2E58
+0x51EE = 0x2E59
+0x5201 = 0x2E5A
+0x5213 = 0x2E5C
+0x5215 = 0x2E5D
+0x5249 = 0x2E5E
+0x5257 = 0x2E5F
+0x525D = 0x2F7E
+0x5261 = 0x2E60
+0x5293 = 0x2E61
+0x52C8 = 0x2E62
+0x52CC = 0x2E64
+0x52D0 = 0x2E65
+0x52D6 = 0x2E66
+0x52DB = 0x2E67
+0x52F0 = 0x2E69
+0x52FB = 0x2E6A
+0x5300 = 0x2E6B
+0x5307 = 0x2E6C
+0x531C = 0x2E6D
+0x5361 = 0x2E6F
+0x5363 = 0x2E70
+0x537D = 0x2E71
+0x5393 = 0x2E72
+0x539D = 0x2E73
+0x53B2 = 0x2E74
+0x5412 = 0x2E75
+0x541E = 0x4F7E
+0x5427 = 0x2E76
+0x544D = 0x2E77
+0x546B = 0x2E79
+0x5474 = 0x2E7A
+0x547F = 0x2E7B
+0x5488 = 0x2E7C
+0x5496 = 0x2E7D
+0x549C = 0x2E78
+0x54A1 = 0x2E7E
+0x54A9 = 0x2F21
+0x54C6 = 0x2F22
+0x54FF = 0x2F23
+0x550E = 0x2F24
+0x552B = 0x2F25
+0x5535 = 0x2F26
+0x5550 = 0x2F27
+0x555E = 0x2F28
+0x5581 = 0x2F29
+0x5586 = 0x2F2A
+0x558E = 0x2F2B
+0x55AD = 0x2F2D
+0x55CE = 0x2F2E
+0x5608 = 0x2F30
+0x560E = 0x2F31
+0x563B = 0x2F32
+0x5649 = 0x2F33
+0x5653 = 0x7427
+0x5666 = 0x2F35
+0x566F = 0x2F37
+0x5671 = 0x2F38
+0x5672 = 0x2F39
+0x5676 = 0x2F34
+0x5699 = 0x2F3A
+0x569E = 0x2F3B
+0x56A9 = 0x2F3C
+0x56AC = 0x2F3D
+0x56B3 = 0x2F3E
+0x56C9 = 0x2F3F
+0x56CA = 0x2F40
+0x570A = 0x2F41
+0x5721 = 0x2F43
+0x572F = 0x2F44
+0x5733 = 0x2F45
+0x5734 = 0x2F46
+0x5770 = 0x2F47
+0x5777 = 0x2F48
+0x577C = 0x2F49
+0x579C = 0x2F4A
+0x57B8 = 0x2F4D
+0x57C7 = 0x2F4E
+0x57C8 = 0x2F4F
+0x57CF = 0x2F50
+0x57E4 = 0x2F51
+0x57ED = 0x2F52
+0x57F5 = 0x2F53
+0x57F6 = 0x2F54
+0x57FF = 0x2F55
+0x5809 = 0x2F56
+0x5861 = 0x2F58
+0x5864 = 0x2F59
+0x587C = 0x2F5B
+0x5889 = 0x2F5C
+0x589E = 0x2F5D
+0x58A9 = 0x2F5F
+0x58CE = 0x2F62
+0x58D2 = 0x2F61
+0x58D4 = 0x2F63
+0x58DA = 0x2F64
+0x58E0 = 0x2F65
+0x58E9 = 0x2F66
+0x590C = 0x2F67
+0x595D = 0x2F69
+0x596D = 0x2F6A
+0x598B = 0x2F6B
+0x5992 = 0x2F6C
+0x59A4 = 0x2F6D
+0x59C3 = 0x2F6E
+0x59D2 = 0x2F6F
+0x59DD = 0x2F70
+0x59F8 = 0x7E7A
+0x5A13 = 0x2F71
+0x5A23 = 0x2F72
+0x5A67 = 0x2F73
+0x5A6D = 0x2F74
+0x5A77 = 0x2F75
+0x5A7E = 0x2F76
+0x5A84 = 0x2F77
+0x5A9E = 0x2F78
+0x5AA7 = 0x2F79
+0x5AC4 = 0x2F7A
+0x5B19 = 0x2F7C
+0x5B25 = 0x2F7D
+0x5B41 = 0x4F55
+0x5B56 = 0x4F56
+0x5B7D = 0x4F57
+0x5B93 = 0x4F58
+0x5BD8 = 0x4F59
+0x5BEC = 0x4F5A
+0x5C12 = 0x4F5B
+0x5C1E = 0x4F5C
+0x5C23 = 0x4F5D
+0x5C2B = 0x4F5E
+0x5C5B = 0x7E7B
+0x5C62 = 0x4F60
+0x5C7A = 0x4F64
+0x5C8F = 0x4F65
+0x5C9F = 0x4F66
+0x5CA3 = 0x4F67
+0x5CAA = 0x4F68
+0x5CBA = 0x4F69
+0x5CCB = 0x4F6A
+0x5CD0 = 0x4F6B
+0x5CD2 = 0x4F6C
+0x5CF4 = 0x4F6D
+0x5D0D = 0x4F70
+0x5D27 = 0x4F71
+0x5D46 = 0x4F73
+0x5D47 = 0x4F74
+0x5D4A = 0x4F76
+0x5D53 = 0x4F75
+0x5D6D = 0x4F77
+0x5D81 = 0x4F78
+0x5DA0 = 0x4F79
+0x5DA4 = 0x4F7A
+0x5DA7 = 0x4F7B
+0x5DB8 = 0x4F7C
+0x5DCB = 0x4F7D
+0x5DE2 = 0x7428
+0x5E14 = 0x7429
+0x5E18 = 0x742A
+0x5E58 = 0x742B
+0x5E5E = 0x742C
+0x5E77 = 0x7E7C
+0x5EBE = 0x742D
+0x5ECB = 0x742F
+0x5EF9 = 0x7430
+0x5F00 = 0x7431
+0x5F02 = 0x7432
+0x5F07 = 0x7433
+0x5F1D = 0x7434
+0x5F23 = 0x7435
+0x5F34 = 0x7436
+0x5F36 = 0x7437
+0x5F3D = 0x7438
+0x5F40 = 0x7439
+0x5F45 = 0x743A
+0x5F54 = 0x743B
+0x5F58 = 0x743C
+0x5F64 = 0x743D
+0x5F67 = 0x743E
+0x5F7D = 0x743F
+0x5F89 = 0x7440
+0x5F9C = 0x7441
+0x5FA7 = 0x7442
+0x5FAF = 0x7443
+0x5FB5 = 0x7444
+0x5FB7 = 0x7445
+0x5FC9 = 0x7446
+0x5FDE = 0x7447
+0x5FE1 = 0x7448
+0x5FE9 = 0x7449
+0x600D = 0x744A
+0x6014 = 0x744B
+0x6018 = 0x744C
+0x6033 = 0x744D
+0x6035 = 0x744E
+0x6047 = 0x744F
+0x609D = 0x7451
+0x609E = 0x7452
+0x60CB = 0x7453
+0x60D4 = 0x7454
+0x60D5 = 0x7455
+0x60DD = 0x7456
+0x60F8 = 0x7457
+0x611C = 0x7458
+0x612B = 0x7459
+0x6130 = 0x745A
+0x6137 = 0x745B
+0x618D = 0x745D
+0x61B9 = 0x7460
+0x61BC = 0x745F
+0x6222 = 0x7462
+0x623E = 0x7463
+0x6243 = 0x7464
+0x6256 = 0x7465
+0x625A = 0x7466
+0x626F = 0x7467
+0x6285 = 0x7468
+0x62C4 = 0x7469
+0x62D6 = 0x746A
+0x62FC = 0x746B
+0x630A = 0x746C
+0x6318 = 0x746D
+0x6339 = 0x746E
+0x6343 = 0x746F
+0x6365 = 0x7470
+0x637C = 0x7471
+0x63E5 = 0x7472
+0x63ED = 0x7473
+0x63F5 = 0x7474
+0x6410 = 0x7475
+0x6414 = 0x7476
+0x6422 = 0x7477
+0x6451 = 0x7479
+0x6460 = 0x747A
+0x646D = 0x747B
+0x6479 = 0x7478
+0x64BE = 0x747D
+0x64BF = 0x747E
+0x64C4 = 0x7521
+0x64CA = 0x7522
+0x64CE = 0x747C
+0x64D0 = 0x7523
+0x64F7 = 0x7524
+0x64FB = 0x7525
+0x6522 = 0x7526
+0x6529 = 0x7527
+0x6567 = 0x7529
+0x659D = 0x752A
+0x6600 = 0x752C
+0x6609 = 0x752D
+0x6615 = 0x752E
+0x661E = 0x752F
+0x6622 = 0x7531
+0x6624 = 0x7532
+0x662B = 0x7533
+0x6630 = 0x7534
+0x6631 = 0x7535
+0x6633 = 0x7536
+0x663A = 0x7530
+0x6648 = 0x7538
+0x664C = 0x7539
+0x6659 = 0x753B
+0x665A = 0x753C
+0x6661 = 0x753D
+0x6665 = 0x753E
+0x6673 = 0x753F
+0x6677 = 0x7540
+0x6678 = 0x7541
+0x668D = 0x7542
+0x66A0 = 0x7544
+0x66B2 = 0x7545
+0x66BB = 0x7546
+0x66C6 = 0x7547
+0x66C8 = 0x7548
+0x66DB = 0x754A
+0x66E8 = 0x754B
+0x66FA = 0x754C
+0x66FB = 0x7537
+0x6713 = 0x754D
+0x6733 = 0x754F
+0x6747 = 0x7551
+0x6748 = 0x7552
+0x6766 = 0x7550
+0x677B = 0x7553
+0x6781 = 0x7554
+0x6793 = 0x7555
+0x6798 = 0x7556
+0x679B = 0x7557
+0x67BB = 0x7558
+0x67C0 = 0x755A
+0x67D7 = 0x755B
+0x67F9 = 0x7559
+0x67FC = 0x755C
+0x6801 = 0x755D
+0x681D = 0x755F
+0x682C = 0x7560
+0x6831 = 0x7561
+0x6852 = 0x755E
+0x685B = 0x7562
+0x6872 = 0x7563
+0x6875 = 0x7564
+0x68A3 = 0x7566
+0x68A5 = 0x7567
+0x68B2 = 0x7568
+0x68C8 = 0x7569
+0x68D0 = 0x756A
+0x68E8 = 0x756B
+0x68ED = 0x756C
+0x68F0 = 0x756D
+0x68F1 = 0x756E
+0x68FC = 0x756F
+0x690A = 0x7570
+0x6935 = 0x7573
+0x6942 = 0x7574
+0x6949 = 0x7571
+0x6957 = 0x7575
+0x6963 = 0x7576
+0x6964 = 0x7577
+0x6968 = 0x7578
+0x6980 = 0x7579
+0x69A5 = 0x757B
+0x69AD = 0x757C
+0x69CF = 0x757D
+0x69E2 = 0x7622
+0x69E9 = 0x7623
+0x69EA = 0x7624
+0x69F5 = 0x7625
+0x69F6 = 0x7626
+0x6A0F = 0x7627
+0x6A15 = 0x7628
+0x6A3B = 0x762A
+0x6A3E = 0x762B
+0x6A45 = 0x762C
+0x6A50 = 0x762D
+0x6A56 = 0x762E
+0x6A5B = 0x762F
+0x6A6B = 0x7630
+0x6A73 = 0x7631
+0x6A89 = 0x7633
+0x6A94 = 0x7634
+0x6A9D = 0x7635
+0x6A9E = 0x7636
+0x6AA5 = 0x7637
+0x6AE4 = 0x7638
+0x6AE7 = 0x7639
+0x6B1B = 0x763C
+0x6B1E = 0x763D
+0x6B2C = 0x763E
+0x6B35 = 0x763F
+0x6B46 = 0x7640
+0x6B56 = 0x7641
+0x6B60 = 0x7642
+0x6B65 = 0x7643
+0x6B67 = 0x7644
+0x6B77 = 0x7645
+0x6B82 = 0x7646
+0x6BA9 = 0x7647
+0x6BAD = 0x7648
+0x6BCF = 0x764A
+0x6BD6 = 0x764B
+0x6BD7 = 0x764C
+0x6BFF = 0x764D
+0x6C05 = 0x764E
+0x6C10 = 0x764F
+0x6C33 = 0x7650
+0x6C59 = 0x7651
+0x6C5C = 0x7652
+0x6C74 = 0x7654
+0x6C76 = 0x7655
+0x6C85 = 0x7656
+0x6C86 = 0x7657
+0x6C98 = 0x7658
+0x6C9C = 0x7659
+0x6CAA = 0x7653
+0x6CC6 = 0x765B
+0x6CD4 = 0x765C
+0x6CE0 = 0x765D
+0x6CEB = 0x765E
+0x6CEE = 0x765F
+0x6CFB = 0x765A
+0x6D04 = 0x7661
+0x6D0E = 0x7662
+0x6D2E = 0x7663
+0x6D31 = 0x7664
+0x6D39 = 0x7665
+0x6D3F = 0x7666
+0x6D58 = 0x7667
+0x6D65 = 0x7668
+0x6D82 = 0x766A
+0x6D87 = 0x766B
+0x6D89 = 0x766C
+0x6D94 = 0x766D
+0x6DAA = 0x766E
+0x6DAC = 0x766F
+0x6DBF = 0x7670
+0x6DC4 = 0x7671
+0x6DD6 = 0x7672
+0x6DDA = 0x7673
+0x6DDB = 0x7674
+0x6DDD = 0x7675
+0x6DFC = 0x7676
+0x6E34 = 0x7678
+0x6E44 = 0x7679
+0x6E5C = 0x767A
+0x6E5E = 0x767B
+0x6EAB = 0x767C
+0x6EB1 = 0x767D
+0x6EC1 = 0x767E
+0x6EC7 = 0x7721
+0x6ECE = 0x7722
+0x6F10 = 0x7723
+0x6F1A = 0x7724
+0x6F2A = 0x7726
+0x6F2F = 0x7727
+0x6F33 = 0x7728
+0x6F51 = 0x7729
+0x6F59 = 0x772A
+0x6F5E = 0x772B
+0x6F61 = 0x772C
+0x6F62 = 0x772D
+0x6F7E = 0x772E
+0x6F88 = 0x772F
+0x6F8C = 0x7730
+0x6F8D = 0x7731
+0x6F94 = 0x7732
+0x6FA0 = 0x7733
+0x6FA7 = 0x7734
+0x6FB6 = 0x7735
+0x6FBC = 0x7736
+0x6FC7 = 0x7737
+0x6FCA = 0x7738
+0x6FF0 = 0x773A
+0x6FF5 = 0x773B
+0x6FF9 = 0x7739
+0x7005 = 0x773C
+0x7006 = 0x773D
+0x7028 = 0x773E
+0x704A = 0x773F
+0x704E = 0x7742
+0x705D = 0x7740
+0x705E = 0x7741
+0x7064 = 0x7743
+0x7075 = 0x7744
+0x7085 = 0x7745
+0x70A4 = 0x7746
+0x70AB = 0x7747
+0x70B7 = 0x7748
+0x70D4 = 0x7749
+0x70D8 = 0x774A
+0x70E4 = 0x774B
+0x710F = 0x774C
+0x711E = 0x774E
+0x7120 = 0x774F
+0x712B = 0x774D
+0x712E = 0x7750
+0x7130 = 0x7751
+0x7146 = 0x7752
+0x7147 = 0x7753
+0x7151 = 0x7754
+0x7152 = 0x7756
+0x715C = 0x7757
+0x7160 = 0x7758
+0x7168 = 0x7759
+0x7185 = 0x775B
+0x7187 = 0x775C
+0x7192 = 0x775D
+0x71BA = 0x775F
+0x71C1 = 0x775E
+0x71C4 = 0x7760
+0x71FE = 0x7761
+0x7200 = 0x7762
+0x7215 = 0x7763
+0x7255 = 0x7764
+0x7256 = 0x7765
+0x728D = 0x7767
+0x729B = 0x7768
+0x72BE = 0x7769
+0x72C0 = 0x776A
+0x72FB = 0x776B
+0x7327 = 0x776D
+0x7328 = 0x776E
+0x7350 = 0x7770
+0x7366 = 0x7771
+0x737C = 0x7772
+0x7395 = 0x7773
+0x739F = 0x7774
+0x73A0 = 0x7775
+0x73A2 = 0x7776
+0x73A6 = 0x7777
+0x73AB = 0x7778
+0x73C9 = 0x7779
+0x73CF = 0x777A
+0x73D6 = 0x777B
+0x73D9 = 0x777C
+0x73E3 = 0x777D
+0x73E9 = 0x777E
+0x7407 = 0x7821
+0x740A = 0x7822
+0x741A = 0x7823
+0x741B = 0x7824
+0x7426 = 0x7826
+0x7428 = 0x7827
+0x742A = 0x7828
+0x742B = 0x7829
+0x742C = 0x782A
+0x742E = 0x782B
+0x742F = 0x782C
+0x7430 = 0x782D
+0x7444 = 0x782E
+0x7446 = 0x782F
+0x7447 = 0x7830
+0x744B = 0x7831
+0x7457 = 0x7832
+0x7462 = 0x7833
+0x746B = 0x7834
+0x746D = 0x7835
+0x7486 = 0x7836
+0x7487 = 0x7837
+0x7489 = 0x7838
+0x7490 = 0x783D
+0x7498 = 0x7839
+0x749C = 0x783A
+0x749F = 0x783B
+0x74A3 = 0x783C
+0x74A6 = 0x783E
+0x74A8 = 0x783F
+0x74A9 = 0x7840
+0x74B5 = 0x7841
+0x74BF = 0x7842
+0x74C8 = 0x7843
+0x74C9 = 0x7844
+0x74DA = 0x7845
+0x74FF = 0x7846
+0x7501 = 0x7847
+0x7517 = 0x7848
+0x752F = 0x7849
+0x756F = 0x784A
+0x7579 = 0x784B
+0x7592 = 0x784C
+0x75CE = 0x784E
+0x75E4 = 0x784F
+0x7600 = 0x7850
+0x7602 = 0x7851
+0x7608 = 0x7852
+0x7615 = 0x7853
+0x7616 = 0x7854
+0x7619 = 0x7855
+0x761E = 0x7856
+0x7626 = 0x7E7D
+0x762D = 0x7857
+0x7635 = 0x7858
+0x7643 = 0x7859
+0x764B = 0x785A
+0x7664 = 0x785B
+0x7665 = 0x785C
+0x766D = 0x785D
+0x766F = 0x785E
+0x7671 = 0x785F
+0x7681 = 0x7860
+0x769B = 0x7861
+0x769D = 0x7862
+0x769E = 0x7863
+0x76A6 = 0x7864
+0x76AA = 0x7865
+0x76B6 = 0x7866
+0x76C5 = 0x7867
+0x76CC = 0x7868
+0x76CE = 0x7869
+0x76D4 = 0x786A
+0x76E6 = 0x786B
+0x76F1 = 0x786C
+0x76FC = 0x786D
+0x770A = 0x786E
+0x7719 = 0x786F
+0x7734 = 0x7870
+0x7736 = 0x7871
+0x7746 = 0x7872
+0x774D = 0x7873
+0x774E = 0x7874
+0x775C = 0x7875
+0x775F = 0x7876
+0x7762 = 0x7877
+0x777A = 0x7878
+0x7780 = 0x7879
+0x7794 = 0x787A
+0x77AA = 0x787B
+0x77E0 = 0x787C
+0x782D = 0x787D
+0x7843 = 0x7921
+0x784E = 0x7922
+0x784F = 0x7923
+0x7851 = 0x7924
+0x7868 = 0x7925
+0x786E = 0x7926
+0x78AD = 0x792A
+0x78B0 = 0x7928
+0x78E4 = 0x792B
+0x78F2 = 0x792C
+0x78F7 = 0x792E
+0x7900 = 0x792D
+0x791C = 0x792F
+0x792E = 0x7930
+0x7931 = 0x7931
+0x7934 = 0x7932
+0x7945 = 0x7935
+0x7946 = 0x7936
+0x795C = 0x793A
+0x7979 = 0x793E
+0x7998 = 0x7942
+0x79B1 = 0x7943
+0x79B8 = 0x7944
+0x79C8 = 0x7945
+0x79CA = 0x7946
+0x79D4 = 0x7948
+0x79DE = 0x7949
+0x79EB = 0x794A
+0x79ED = 0x794B
+0x7A03 = 0x794C
+0x7A39 = 0x794E
+0x7A5D = 0x794F
+0x7A6D = 0x7950
+0x7A85 = 0x7952
+0x7AA0 = 0x7953
+0x7AB3 = 0x7955
+0x7ABB = 0x7956
+0x7ACE = 0x7957
+0x7AEB = 0x7958
+0x7AFD = 0x7959
+0x7B12 = 0x795A
+0x7B2D = 0x795B
+0x7B3B = 0x795C
+0x7B47 = 0x795D
+0x7B4E = 0x795E
+0x7B60 = 0x795F
+0x7B6D = 0x7960
+0x7B6F = 0x7961
+0x7B72 = 0x7962
+0x7B9E = 0x7963
+0x7BD7 = 0x7965
+0x7BD9 = 0x7966
+0x7C01 = 0x7967
+0x7C1E = 0x7969
+0x7C20 = 0x796A
+0x7C31 = 0x7968
+0x7C33 = 0x796B
+0x7C36 = 0x796C
+0x7C59 = 0x796F
+0x7C6D = 0x7970
+0x7C79 = 0x7971
+0x7C8F = 0x7972
+0x7C94 = 0x7973
+0x7CA0 = 0x7974
+0x7CBC = 0x7975
+0x7CD5 = 0x7976
+0x7CD9 = 0x7977
+0x7CDD = 0x7978
+0x7D07 = 0x7979
+0x7D08 = 0x797A
+0x7D13 = 0x797B
+0x7D1D = 0x797C
+0x7D23 = 0x797D
+0x7D31 = 0x797E
+0x7D41 = 0x7A21
+0x7D48 = 0x7A22
+0x7D53 = 0x7A23
+0x7D5C = 0x7A24
+0x7D7A = 0x7A25
+0x7D83 = 0x7A26
+0x7D8B = 0x7A27
+0x7DA0 = 0x7A28
+0x7DA6 = 0x7A29
+0x7DC2 = 0x7A2A
+0x7DCC = 0x7A2B
+0x7DD6 = 0x7A2C
+0x7DE3 = 0x7A2D
+0x7E08 = 0x7A30
+0x7E11 = 0x7A31
+0x7E15 = 0x7A32
+0x7E28 = 0x7A2F
+0x7E47 = 0x7A34
+0x7E52 = 0x7A35
+0x7E61 = 0x7A36
+0x7E6B = 0x7E7E
+0x7E8A = 0x7A37
+0x7E8D = 0x7A38
+0x7F47 = 0x7A39
+0x7F91 = 0x7A3B
+0x7F97 = 0x7A3C
+0x7FBF = 0x7A3D
+0x7FCE = 0x7A3E
+0x7FDB = 0x7A3F
+0x7FDF = 0x7A40
+0x7FEC = 0x7A41
+0x7FEE = 0x7A42
+0x7FFA = 0x7A43
+0x8014 = 0x7A45
+0x8026 = 0x7A46
+0x8035 = 0x7A47
+0x8037 = 0x7A48
+0x803C = 0x7A49
+0x80CA = 0x7A4A
+0x80D7 = 0x7A4B
+0x80E0 = 0x7A4C
+0x80F3 = 0x7A4D
+0x8118 = 0x7A4E
+0x814A = 0x7A4F
+0x8160 = 0x7A50
+0x8167 = 0x7A51
+0x8168 = 0x7A52
+0x816D = 0x7A53
+0x81BB = 0x7A54
+0x81CA = 0x7A55
+0x81CF = 0x7A56
+0x81D7 = 0x7A57
+0x8260 = 0x7A5B
+0x8274 = 0x7A5C
+0x828E = 0x7A5E
+0x82A1 = 0x7A5F
+0x82A3 = 0x7A60
+0x82A4 = 0x7A61
+0x82A9 = 0x7A62
+0x82AE = 0x7A63
+0x82B7 = 0x7A64
+0x82BE = 0x7A65
+0x82BF = 0x7A66
+0x82C6 = 0x7A67
+0x82D5 = 0x7A68
+0x82FD = 0x7A69
+0x82FE = 0x7A6A
+0x8300 = 0x7A6B
+0x8301 = 0x7A6C
+0x8322 = 0x7A6E
+0x832D = 0x7A6F
+0x833A = 0x7A70
+0x8343 = 0x7A71
+0x8347 = 0x7A72
+0x8351 = 0x7A73
+0x8355 = 0x7A74
+0x8362 = 0x7A6D
+0x837D = 0x7A75
+0x8386 = 0x7A76
+0x8392 = 0x7A77
+0x8398 = 0x7A78
+0x83A7 = 0x7A79
+0x83A9 = 0x7A7A
+0x83BF = 0x7A7B
+0x83C0 = 0x7A7C
+0x83C7 = 0x7A7D
+0x83CF = 0x7A7E
+0x83D1 = 0x7B21
+0x83E1 = 0x7B22
+0x83EA = 0x7B23
+0x8401 = 0x7B24
+0x8406 = 0x7B25
+0x840A = 0x7B26
+0x8448 = 0x7B28
+0x845F = 0x7B29
+0x8470 = 0x7B2A
+0x8473 = 0x7B2B
+0x8485 = 0x7B2C
+0x849E = 0x7B2D
+0x84AF = 0x7B2E
+0x84B4 = 0x7B2F
+0x84BA = 0x7B30
+0x84C0 = 0x7B31
+0x84C2 = 0x7B32
+0x851E = 0x7B35
+0x8523 = 0x7B36
+0x852F = 0x7B37
+0x8532 = 0x7B34
+0x8559 = 0x7B38
+0x8564 = 0x7B39
+0x857A = 0x7B3C
+0x858C = 0x7B3D
+0x858F = 0x7B3E
+0x85A2 = 0x7B3F
+0x85AD = 0x7B3B
+0x85B0 = 0x7B40
+0x85CB = 0x7B41
+0x85CE = 0x7B42
+0x85ED = 0x7B43
+0x85FF = 0x7B45
+0x8604 = 0x7B46
+0x8605 = 0x7B47
+0x8610 = 0x7B48
+0x8612 = 0x7B44
+0x8618 = 0x7B4A
+0x8629 = 0x7B4B
+0x8638 = 0x7B4C
+0x8641 = 0x2F68
+0x8657 = 0x7B4D
+0x865B = 0x7B4E
+0x8662 = 0x7B50
+0x866C = 0x7B52
+0x8675 = 0x7B53
+0x8698 = 0x7B54
+0x86B8 = 0x7B55
+0x86FA = 0x7B56
+0x86FC = 0x7B57
+0x86FD = 0x7B58
+0x870B = 0x7B59
+0x8771 = 0x7B5A
+0x8787 = 0x7B5B
+0x8788 = 0x7B5C
+0x87AC = 0x7B5D
+0x87AD = 0x7B5E
+0x87B5 = 0x7B5F
+0x87D6 = 0x7B61
+0x87EC = 0x7B62
+0x8806 = 0x7B63
+0x880A = 0x7B64
+0x8810 = 0x7B65
+0x8814 = 0x7B66
+0x881F = 0x7B67
+0x8898 = 0x7B68
+0x88AA = 0x7B69
+0x88CA = 0x7B6A
+0x88CE = 0x7B6B
+0x88F5 = 0x7B6D
+0x8918 = 0x7B70
+0x8919 = 0x7B71
+0x891A = 0x7B72
+0x891C = 0x7B6E
+0x8927 = 0x7B73
+0x8930 = 0x7B74
+0x8932 = 0x7B75
+0x8939 = 0x7B76
+0x8940 = 0x7B77
+0x8994 = 0x7B78
+0x89D4 = 0x7B7A
+0x89E5 = 0x7B7B
+0x89F6 = 0x7B7C
+0x8A12 = 0x7B7D
+0x8A15 = 0x7B7E
+0x8A22 = 0x7C21
+0x8A37 = 0x7C22
+0x8A47 = 0x7C23
+0x8A4E = 0x7C24
+0x8A5D = 0x7C25
+0x8A61 = 0x7C26
+0x8A75 = 0x7C27
+0x8A79 = 0x7C28
+0x8AA7 = 0x7C29
+0x8AD0 = 0x7C2A
+0x8ADF = 0x7C2B
+0x8AF4 = 0x7C2C
+0x8AF6 = 0x7C2D
+0x8B46 = 0x7C31
+0x8B54 = 0x7C32
+0x8B59 = 0x7C33
+0x8B69 = 0x7C34
+0x8B9D = 0x7C35
+0x8C49 = 0x7C36
+0x8C68 = 0x7C37
+0x8CE1 = 0x7C39
+0x8CF4 = 0x7C3A
+0x8CF8 = 0x7C3B
+0x8CFE = 0x7C3C
+0x8D12 = 0x7C3E
+0x8D1B = 0x7C3F
+0x8DAF = 0x7C40
+0x8DCE = 0x7C41
+0x8DD1 = 0x7C42
+0x8DD7 = 0x7C43
+0x8E20 = 0x7C44
+0x8E23 = 0x7C45
+0x8E3D = 0x7C46
+0x8E70 = 0x7C47
+0x8E7B = 0x7C48
+0x8EC0 = 0x7C4A
+0x8EFA = 0x7C4C
+0x8F1E = 0x7C4D
+0x8F2D = 0x7C4E
+0x8F36 = 0x7C4F
+0x8F54 = 0x7C50
+0x8FA6 = 0x7C52
+0x8FB5 = 0x7C53
+0x8FE4 = 0x7C54
+0x8FE8 = 0x7C55
+0x8FEE = 0x7C56
+0x9008 = 0x7C57
+0x902D = 0x7C58
+0x9088 = 0x7C5A
+0x9095 = 0x7C5B
+0x9097 = 0x7C5C
+0x9099 = 0x7C5D
+0x909B = 0x7C5E
+0x90A2 = 0x7C5F
+0x90B3 = 0x7C60
+0x90BE = 0x7C61
+0x90C4 = 0x7C62
+0x90C5 = 0x7C63
+0x90C7 = 0x7C64
+0x90D7 = 0x7C65
+0x90DD = 0x7C66
+0x90DE = 0x7C67
+0x90EF = 0x7C68
+0x90F4 = 0x7C69
+0x9114 = 0x7C6B
+0x9115 = 0x7C6C
+0x9116 = 0x7C6D
+0x9122 = 0x7C6E
+0x9123 = 0x7C6F
+0x9127 = 0x7C70
+0x912F = 0x7C71
+0x9131 = 0x7C72
+0x9134 = 0x7C73
+0x913D = 0x7C74
+0x9148 = 0x7C75
+0x915B = 0x7C76
+0x9183 = 0x7C77
+0x919E = 0x7C78
+0x91AC = 0x7C79
+0x91B1 = 0x7C7A
+0x91BC = 0x7C7B
+0x91D7 = 0x7C7C
+0x91E4 = 0x7C7E
+0x91E5 = 0x7D21
+0x91ED = 0x7D22
+0x91F1 = 0x7D23
+0x91FB = 0x7C7D
+0x9207 = 0x7D24
+0x9210 = 0x7D25
+0x9238 = 0x7D26
+0x9239 = 0x7D27
+0x923A = 0x7D28
+0x923C = 0x7D29
+0x9240 = 0x7D2A
+0x9243 = 0x7D2B
+0x924F = 0x7D2C
+0x9278 = 0x7D2D
+0x9288 = 0x7D2E
+0x92C2 = 0x7D2F
+0x92CB = 0x7D30
+0x92CC = 0x7D31
+0x92D3 = 0x7D32
+0x92E0 = 0x7D33
+0x92FF = 0x7D34
+0x9304 = 0x7D35
+0x931F = 0x7D36
+0x9321 = 0x7D37
+0x9325 = 0x7D38
+0x9348 = 0x7D39
+0x9349 = 0x7D3A
+0x934A = 0x7D3B
+0x9364 = 0x7D3C
+0x9365 = 0x7D3D
+0x936A = 0x7D3E
+0x9370 = 0x7D3F
+0x939B = 0x7D40
+0x93A3 = 0x7D41
+0x93BA = 0x7D42
+0x93C6 = 0x7D43
+0x93DE = 0x7D44
+0x93DF = 0x7D45
+0x93FD = 0x7D47
+0x9404 = 0x7D46
+0x9433 = 0x7D48
+0x944A = 0x7D49
+0x9463 = 0x7D4A
+0x946B = 0x7D4B
+0x9471 = 0x7D4C
+0x9472 = 0x7D4D
+0x958E = 0x7D4E
+0x959F = 0x7D4F
+0x95A6 = 0x7D50
+0x95A9 = 0x7D51
+0x95AC = 0x7D52
+0x95B6 = 0x7D53
+0x95BD = 0x7D54
+0x95CB = 0x7D55
+0x95D0 = 0x7D56
+0x95D3 = 0x7D57
+0x95DA = 0x7D59
+0x95DE = 0x7D5A
+0x9658 = 0x7D5B
+0x9684 = 0x7D5C
+0x969D = 0x7D5E
+0x96A4 = 0x7D5F
+0x96A5 = 0x7D60
+0x96D2 = 0x7D61
+0x96DE = 0x7D62
+0x96E9 = 0x7D64
+0x96EF = 0x7D65
+0x9733 = 0x7D66
+0x973B = 0x7D67
+0x974D = 0x7D68
+0x974E = 0x7D69
+0x974F = 0x7D6A
+0x975A = 0x7D6B
+0x976E = 0x7D6C
+0x9773 = 0x7D6D
+0x9795 = 0x7D6E
+0x97AE = 0x7D6F
+0x97BA = 0x7D70
+0x97C1 = 0x7D71
+0x97C9 = 0x7D72
+0x97DB = 0x7D74
+0x97DE = 0x7D73
+0x97F4 = 0x7D75
+0x980A = 0x7D77
+0x981E = 0x7D78
+0x982B = 0x7D79
+0x9830 = 0x7D7A
+0x9852 = 0x7D7C
+0x9853 = 0x7D7D
+0x9856 = 0x7D7E
+0x9857 = 0x7E21
+0x9859 = 0x7E22
+0x985A = 0x7E23
+0x9865 = 0x7E25
+0x986C = 0x7E26
+0x98BA = 0x7E27
+0x98C8 = 0x7E28
+0x98E7 = 0x7E29
+0x9958 = 0x7E2A
+0x999E = 0x7E2B
+0x9A02 = 0x7E2C
+0x9A03 = 0x7E2D
+0x9A24 = 0x7E2E
+0x9A2D = 0x7E2F
+0x9A2E = 0x7E30
+0x9A38 = 0x7E31
+0x9A4A = 0x7E32
+0x9A4E = 0x7E33
+0x9A52 = 0x7E34
+0x9AB6 = 0x7E35
+0x9AC1 = 0x7E36
+0x9AC3 = 0x7E37
+0x9ACE = 0x7E38
+0x9AD6 = 0x7E39
+0x9AF9 = 0x7E3A
+0x9B02 = 0x7E3B
+0x9B08 = 0x7E3C
+0x9B20 = 0x7E3D
+0x9B2D = 0x7E3F
+0x9B5E = 0x7E40
+0x9B66 = 0x7E42
+0x9B72 = 0x7E43
+0x9B75 = 0x7E44
+0x9B79 = 0x7E41
+0x9B84 = 0x7E45
+0x9B8A = 0x7E46
+0x9B8F = 0x7E47
+0x9B9E = 0x7E48
+0x9BA7 = 0x7E49
+0x9BC1 = 0x7E4A
+0x9BCE = 0x7E4B
+0x9BE5 = 0x7E4C
+0x9BF8 = 0x7E4D
+0x9BFD = 0x7E4E
+0x9C00 = 0x7E4F
+0x9C23 = 0x7E50
+0x9C41 = 0x7E51
+0x9C4F = 0x7E52
+0x9C50 = 0x7E53
+0x9C53 = 0x7E54
+0x9C63 = 0x7E55
+0x9C65 = 0x7E56
+0x9C77 = 0x7E57
+0x9D1D = 0x7E58
+0x9D1E = 0x7E59
+0x9D43 = 0x7E5A
+0x9D47 = 0x7E5B
+0x9D52 = 0x7E5C
+0x9D63 = 0x7E5D
+0x9D70 = 0x7E5E
+0x9D7C = 0x7E5F
+0x9D8A = 0x7E60
+0x9D96 = 0x7E61
+0x9DAC = 0x7E63
+0x9DBC = 0x7E64
+0x9DC0 = 0x7E62
+0x9DD7 = 0x7E65
+0x9DE7 = 0x7E67
+0x9E07 = 0x7E68
+0x9E15 = 0x7E69
+0x9E7C = 0x7E6A
+0x9E9E = 0x7E6B
+0x9EA4 = 0x7E6C
+0x9EAC = 0x7E6D
+0x9EAF = 0x7E6E
+0x9EB4 = 0x7E6F
+0x9EB5 = 0x7E70
+0x9EC3 = 0x7E71
+0x9ED1 = 0x7E72
+0x9F10 = 0x7E73
+0x9F39 = 0x7E74
+0x9F57 = 0x7E75
+0x9F90 = 0x7E76
+0x9F94 = 0x7E77
+0x9F97 = 0x7E78
+0x9FA2 = 0x7E79
+0xF91D = 0x763B
+0xF928 = 0x742E
+0xF929 = 0x754E
+0xF936 = 0x7B4F
+0xF970 = 0x7649
+0xF9D0 = 0x7E24
+0xF9DC = 0x7D5D
+0xFA0F = 0x2F4B
+0xFA10 = 0x2F57
+0xFA11 = 0x4F72
+0xFA14 = 0x757A
+0xFA15 = 0x775A
+0xFA16 = 0x776F
+0xFA19 = 0x793C
+0xFA1A = 0x793D
+0xFA1B = 0x7941
+0xFA1F = 0x7B3A
+0xFA22 = 0x7C2E
+0xFA26 = 0x7C6A
+0xFA30 = 0x2E38
+0xFA31 = 0x2E49
+0xFA32 = 0x2E50
+0xFA33 = 0x2E63
+0xFA34 = 0x2E68
+0xFA35 = 0x2E6E
+0xFA36 = 0x2F2C
+0xFA37 = 0x2F2F
+0xFA38 = 0x2F36
+0xFA39 = 0x2F5A
+0xFA3A = 0x2F5E
+0xFA3B = 0x4F61
+0xFA3C = 0x4F62
+0xFA3D = 0x7450
+0xFA3E = 0x745C
+0xFA3F = 0x745E
+0xFA40 = 0x7461
+0xFA41 = 0x7528
+0xFA42 = 0x752B
+0xFA43 = 0x7543
+0xFA44 = 0x7565
+0xFA45 = 0x7669
+0xFA46 = 0x7677
+0xFA47 = 0x7725
+0xFA48 = 0x7755
+0xFA4A = 0x7825
+0xFA4B = 0x7927
+0xFA4C = 0x7933
+0xFA4D = 0x7934
+0xFA4E = 0x7937
+0xFA4F = 0x7938
+0xFA50 = 0x7939
+0xFA51 = 0x793B
+0xFA52 = 0x793F
+0xFA53 = 0x7940
+0xFA54 = 0x794D
+0xFA55 = 0x7951
+0xFA56 = 0x7964
+0xFA57 = 0x7A2E
+0xFA59 = 0x7A33
+0xFA5A = 0x7A3A
+0xFA5B = 0x7A44
+0xFA5C = 0x7A58
+0xFA5F = 0x7B27
+0xFA60 = 0x7B6F
+0xFA61 = 0x7B79
+0xFA62 = 0x7C2F
+0xFA63 = 0x7C30
+0xFA64 = 0x7C38
+0xFA65 = 0x7C3D
+0xFA67 = 0x7C59
+0xFA68 = 0x7D63
+0xFA69 = 0x7D76
+0xFA6A = 0x7D7B
+0xFE45 = 0x233E
+0xFE46 = 0x233D
+0xFF02 = 0x2230 # 0x0022
+0xFF07 = 0x222F # 0x0027
+0xFF0D = 0x2231 # 0x002D
+0xFF5E = 0x2232 # 0x007E
+0xFF5F = 0x2256
+0xFF60 = 0x2257
+END_MAP
diff --git a/enc/trans/JIS/UCS@BMP%JISX0213-2.src b/enc/trans/JIS/UCS@BMP%JISX0213-2.src
new file mode 100644
index 0000000000..ba53d7d72f
--- /dev/null
+++ b/enc/trans/JIS/UCS@BMP%JISX0213-2.src
@@ -0,0 +1,2189 @@
+# $NetBSD: UCS@BMP%JISX0213-2.src,v 1.1 2007/03/05 16:58:33 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"UCS:BMP/JISX0213-2"
+SRC_ZONE	0x3406 - 0xFA66
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+## Shift_JIS-2004 (JIS X 0213:2004) vs Unicode mapping table
+## 
+## Date: 12 Feb 2005 10:15:00 GMT
+## License:
+## 	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.
+## Note:
+## 	[1983]	JIS codepoint defined by JIS X 0208-1983
+## 	[1990]	JIS codepoint defined by JIS X 0208-1990
+## 	[2000]	JIS codepoint defined by JIS X 0213:2000
+## 	[2004]	JIS codepoint defined by JIS X 0213:2004
+## 	[Unicode3.1]	UCS codepoint defined by Unicode 3.1
+## 	[Unicode3.2]	UCS codepoint defined by Unicode 3.2
+## 	Fullwidth	UCS fullwidth form (U+Fxxx)
+## 	Windows 	Windows (CP932) mapping
+## 	Some 0213 character can't represent by one UCS character.
+## 	In this table, such characters are described as 'U+xxxx+xxxx'.
+## 
+0x3406 = 0x212D
+0x342C = 0x2132
+0x342E = 0x2133
+0x3468 = 0x215E
+0x346A = 0x2156
+0x3492 = 0x217E
+0x34BC = 0x232B
+0x34C1 = 0x7468
+0x34C7 = 0x232F
+0x351F = 0x2348
+0x355D = 0x235D
+0x355E = 0x235E
+0x3563 = 0x2361
+0x356E = 0x2367
+0x35A6 = 0x2423
+0x35A8 = 0x2426
+0x35C5 = 0x242F
+0x35DA = 0x2438
+0x35F4 = 0x2442
+0x3605 = 0x244A
+0x364A = 0x2479
+0x3691 = 0x253F
+0x3696 = 0x2543
+0x3699 = 0x2541
+0x36CF = 0x2557
+0x3761 = 0x2823
+0x3762 = 0x2825
+0x376B = 0x2829
+0x376C = 0x2828
+0x3775 = 0x282C
+0x37C1 = 0x283E
+0x37E8 = 0x2856
+0x37F4 = 0x2859
+0x37FD = 0x285C
+0x3800 = 0x285E
+0x382F = 0x286F
+0x3836 = 0x2871
+0x3840 = 0x2874
+0x385C = 0x2879
+0x3861 = 0x287B
+0x38FA = 0x2C3B
+0x3917 = 0x2C46
+0x391A = 0x2C4A
+0x396F = 0x2C60
+0x3A6E = 0x2D5B
+0x3A73 = 0x2D5F
+0x3AD6 = 0x2D71
+0x3AD7 = 0x2E36
+0x3AEA = 0x2D7C
+0x3B0E = 0x2E2E
+0x3B1A = 0x2E32
+0x3B1C = 0x2E34
+0x3B6D = 0x2E6D
+0x3B77 = 0x2E65
+0x3B87 = 0x2F28
+0x3B88 = 0x2F29
+0x3B8D = 0x2F2C
+0x3BA4 = 0x2F34
+0x3BCD = 0x2F48
+0x3BF0 = 0x2F5D
+0x3C26 = 0x2F77
+0x3CC3 = 0x6E3B
+0x3CD2 = 0x6E42
+0x3D11 = 0x6E71
+0x3D1E = 0x6E7E
+0x3D64 = 0x6F40
+0x3D9A = 0x6F54
+0x3DC0 = 0x6F70
+0x3DD4 = 0x6F77
+0x3E05 = 0x7028
+0x3E60 = 0x703F
+0x3E66 = 0x7041
+0x3E68 = 0x7042
+0x3E83 = 0x7049
+0x3E94 = 0x7050
+0x3F57 = 0x7134
+0x3F75 = 0x7146
+0x3F77 = 0x7148
+0x3FAE = 0x715C
+0x3FC9 = 0x7167
+0x3FD7 = 0x716C
+0x4039 = 0x7222
+0x4058 = 0x722D
+0x4093 = 0x7239
+0x4105 = 0x7264
+0x4148 = 0x7274
+0x414F = 0x7277
+0x4163 = 0x727D
+0x41B4 = 0x7333
+0x41BF = 0x7337
+0x41E6 = 0x7347
+0x41EE = 0x734B
+0x41F3 = 0x7348
+0x4207 = 0x7353
+0x420E = 0x7357
+0x42C6 = 0x742B
+0x42D6 = 0x7436
+0x42DD = 0x743B
+0x4302 = 0x744E
+0x432B = 0x745D
+0x4343 = 0x7461
+0x43EE = 0x753E
+0x43F0 = 0x7542
+0x4408 = 0x7548
+0x4417 = 0x754A
+0x441C = 0x754C
+0x4422 = 0x754F
+0x4476 = 0x756C
+0x447A = 0x756E
+0x4491 = 0x7577
+0x44B3 = 0x7635
+0x44BE = 0x7632
+0x44D4 = 0x7634
+0x4508 = 0x7659
+0x450D = 0x7654
+0x4525 = 0x766D
+0x4543 = 0x766E
+0x45B8 = 0x774F
+0x45E5 = 0x776C
+0x460F = 0x7824
+0x4641 = 0x783A
+0x4665 = 0x7843
+0x46A1 = 0x784E
+0x46AF = 0x7853
+0x470C = 0x786B
+0x4764 = 0x7929
+0x47FD = 0x793F
+0x4816 = 0x7949
+0x484E = 0x795C
+0x48B5 = 0x7A27
+0x49E7 = 0x7B6A
+0x49FA = 0x7B70
+0x4A04 = 0x7B75
+0x4A29 = 0x7B78
+0x4ABC = 0x7C37
+0x4B3B = 0x7C55
+0x4BC2 = 0x7D26
+0x4BCA = 0x7D28
+0x4BD2 = 0x7D2A
+0x4BE8 = 0x7D31
+0x4C20 = 0x7D3F
+0x4CC4 = 0x7E2A
+0x4CD1 = 0x7E2D
+0x4D07 = 0x7E4B
+0x4D77 = 0x7E60
+0x4E02 = 0x2122
+0x4E0F = 0x2123
+0x4E12 = 0x2124
+0x4E29 = 0x2125
+0x4E2B = 0x2126
+0x4E2C = 0x702E
+0x4E2E = 0x2127
+0x4E40 = 0x2128
+0x4E47 = 0x2129
+0x4E48 = 0x212A
+0x4E51 = 0x212C
+0x4E5A = 0x212F
+0x4E69 = 0x2130
+0x4E9D = 0x2131
+0x4EB9 = 0x2134
+0x4EBB = 0x2135
+0x4EBC = 0x2137
+0x4EC3 = 0x2138
+0x4EC8 = 0x2139
+0x4ED0 = 0x213A
+0x4EDA = 0x213C
+0x4EEB = 0x213B
+0x4EF1 = 0x213D
+0x4EF5 = 0x213E
+0x4F00 = 0x213F
+0x4F16 = 0x2140
+0x4F37 = 0x2142
+0x4F3E = 0x2143
+0x4F54 = 0x2144
+0x4F58 = 0x2145
+0x4F64 = 0x2141
+0x4F77 = 0x2147
+0x4F78 = 0x2148
+0x4F7A = 0x2149
+0x4F7D = 0x214A
+0x4F82 = 0x214B
+0x4F85 = 0x214C
+0x4F92 = 0x214D
+0x4F9A = 0x214E
+0x4FB2 = 0x2150
+0x4FBE = 0x2151
+0x4FC5 = 0x2152
+0x4FCB = 0x2153
+0x4FCF = 0x2154
+0x4FD2 = 0x2155
+0x4FE6 = 0x214F
+0x4FF2 = 0x2157
+0x5000 = 0x2158
+0x5010 = 0x2159
+0x5013 = 0x215A
+0x501C = 0x215B
+0x501E = 0x215C
+0x5022 = 0x215D
+0x5042 = 0x215F
+0x5046 = 0x2160
+0x504E = 0x2161
+0x5053 = 0x2162
+0x5057 = 0x2163
+0x5063 = 0x2164
+0x5066 = 0x2165
+0x506A = 0x2166
+0x5070 = 0x2167
+0x5088 = 0x2169
+0x5092 = 0x216A
+0x5093 = 0x216B
+0x5095 = 0x216C
+0x5096 = 0x216D
+0x509C = 0x216E
+0x50A3 = 0x2168
+0x50AA = 0x216F
+0x50B1 = 0x2171
+0x50BA = 0x2172
+0x50BB = 0x2173
+0x50C4 = 0x2174
+0x50C7 = 0x2175
+0x50CE = 0x2178
+0x50D4 = 0x217A
+0x50D9 = 0x217B
+0x50E1 = 0x217C
+0x50E9 = 0x217D
+0x50F3 = 0x2176
+0x5108 = 0x2321
+0x5117 = 0x2323
+0x511B = 0x2324
+0x5160 = 0x2326
+0x5173 = 0x2328
+0x517B = 0x7474
+0x5183 = 0x2329
+0x518B = 0x232A
+0x5198 = 0x232C
+0x51A3 = 0x232D
+0x51AD = 0x232E
+0x51BC = 0x2330
+0x51F3 = 0x2333
+0x51F4 = 0x2334
+0x5202 = 0x2335
+0x5212 = 0x2336
+0x5216 = 0x2337
+0x5255 = 0x2339
+0x525C = 0x233A
+0x526C = 0x233B
+0x5277 = 0x233C
+0x5282 = 0x233E
+0x5284 = 0x233D
+0x5298 = 0x2340
+0x52A4 = 0x2342
+0x52A6 = 0x2343
+0x52AF = 0x2344
+0x52BA = 0x2345
+0x52BB = 0x2346
+0x52CA = 0x2347
+0x52D1 = 0x2349
+0x52F7 = 0x234B
+0x530A = 0x234C
+0x530B = 0x234D
+0x5324 = 0x234E
+0x5335 = 0x234F
+0x533E = 0x2350
+0x5342 = 0x2351
+0x5367 = 0x2354
+0x536C = 0x2355
+0x537A = 0x2356
+0x53A4 = 0x2357
+0x53B4 = 0x2358
+0x53B7 = 0x235A
+0x53C0 = 0x235B
+0x53D5 = 0x235F
+0x53DA = 0x2360
+0x53F4 = 0x2362
+0x53F5 = 0x2363
+0x5424 = 0x2365
+0x5428 = 0x2366
+0x5443 = 0x2368
+0x5455 = 0x2364
+0x5462 = 0x2369
+0x5466 = 0x236A
+0x546C = 0x236B
+0x548A = 0x236C
+0x548D = 0x236D
+0x5495 = 0x236E
+0x54A0 = 0x236F
+0x54A6 = 0x2370
+0x54AD = 0x2371
+0x54AE = 0x2372
+0x54B7 = 0x2373
+0x54BA = 0x2374
+0x54BF = 0x2375
+0x54C3 = 0x2376
+0x54EC = 0x2378
+0x54EF = 0x2379
+0x54F1 = 0x237A
+0x54F3 = 0x237B
+0x5500 = 0x237C
+0x5501 = 0x237D
+0x5509 = 0x237E
+0x553C = 0x2421
+0x5541 = 0x2422
+0x5547 = 0x2424
+0x554A = 0x2425
+0x5560 = 0x2427
+0x5561 = 0x2428
+0x5564 = 0x2429
+0x557D = 0x242B
+0x5582 = 0x242C
+0x5588 = 0x242D
+0x5591 = 0x242E
+0x55BF = 0x2433
+0x55C9 = 0x2434
+0x55CC = 0x2435
+0x55D1 = 0x2436
+0x55D2 = 0x2430
+0x55DD = 0x2437
+0x55E2 = 0x2439
+0x55E9 = 0x243B
+0x5607 = 0x243E
+0x5610 = 0x243F
+0x5628 = 0x243C
+0x5630 = 0x2440
+0x5637 = 0x2441
+0x563D = 0x2443
+0x563F = 0x2444
+0x5640 = 0x2445
+0x5647 = 0x2446
+0x565E = 0x2447
+0x5660 = 0x2448
+0x566D = 0x2449
+0x5688 = 0x244B
+0x568C = 0x244C
+0x5695 = 0x244D
+0x569A = 0x244E
+0x569D = 0x244F
+0x56A8 = 0x2450
+0x56AD = 0x2451
+0x56B2 = 0x2452
+0x56C5 = 0x2453
+0x56CD = 0x2454
+0x56DF = 0x2455
+0x56E8 = 0x2456
+0x56F6 = 0x2457
+0x56F7 = 0x2458
+0x5715 = 0x245A
+0x5723 = 0x245B
+0x5729 = 0x245D
+0x5745 = 0x245F
+0x5746 = 0x2460
+0x574C = 0x2461
+0x574D = 0x2462
+0x5768 = 0x2464
+0x576F = 0x2465
+0x5773 = 0x2466
+0x5774 = 0x2467
+0x5775 = 0x2468
+0x577B = 0x2469
+0x579A = 0x246D
+0x579D = 0x246E
+0x579E = 0x246F
+0x57A8 = 0x2470
+0x57AC = 0x246C
+0x57CC = 0x2473
+0x57D7 = 0x2471
+0x57DE = 0x2476
+0x57E6 = 0x2477
+0x57F0 = 0x2478
+0x57F8 = 0x247A
+0x57FB = 0x247B
+0x57FD = 0x247C
+0x5804 = 0x247D
+0x581E = 0x247E
+0x5820 = 0x2521
+0x5827 = 0x2522
+0x5832 = 0x2523
+0x5839 = 0x2524
+0x5849 = 0x2526
+0x584C = 0x2527
+0x5867 = 0x2528
+0x588A = 0x2529
+0x588B = 0x252A
+0x588D = 0x252B
+0x588F = 0x252C
+0x5890 = 0x252D
+0x5894 = 0x252E
+0x589D = 0x252F
+0x58AA = 0x2530
+0x58B1 = 0x2531
+0x58C3 = 0x2533
+0x58CD = 0x2534
+0x58E2 = 0x2535
+0x58F3 = 0x2536
+0x58F4 = 0x2537
+0x5905 = 0x2538
+0x5906 = 0x2539
+0x590B = 0x253A
+0x590D = 0x253B
+0x5914 = 0x253C
+0x5924 = 0x253D
+0x593D = 0x2540
+0x5946 = 0x2542
+0x595B = 0x2545
+0x595F = 0x2546
+0x5975 = 0x2548
+0x5976 = 0x2549
+0x597C = 0x254A
+0x599F = 0x254B
+0x59AE = 0x254C
+0x59BC = 0x254D
+0x59C8 = 0x254E
+0x59CD = 0x254F
+0x59DE = 0x2550
+0x59E3 = 0x2551
+0x59E4 = 0x2552
+0x59E7 = 0x2553
+0x59EE = 0x2554
+0x5A0C = 0x2558
+0x5A0D = 0x2559
+0x5A17 = 0x255A
+0x5A27 = 0x255B
+0x5A2D = 0x255C
+0x5A55 = 0x255D
+0x5A65 = 0x255E
+0x5A7A = 0x255F
+0x5A8B = 0x2560
+0x5A9C = 0x2561
+0x5A9F = 0x2562
+0x5AA0 = 0x2563
+0x5AA2 = 0x2564
+0x5AB1 = 0x2565
+0x5AB3 = 0x2566
+0x5AB5 = 0x2567
+0x5ABA = 0x2568
+0x5ABF = 0x2569
+0x5ADA = 0x256A
+0x5ADC = 0x256B
+0x5AE0 = 0x256C
+0x5AE5 = 0x256D
+0x5AEE = 0x256F
+0x5AF0 = 0x256E
+0x5AF5 = 0x2570
+0x5B00 = 0x2571
+0x5B08 = 0x2572
+0x5B17 = 0x2573
+0x5B2D = 0x2575
+0x5B34 = 0x2574
+0x5B4C = 0x2576
+0x5B52 = 0x2577
+0x5B68 = 0x2578
+0x5B6F = 0x2579
+0x5B7C = 0x257A
+0x5B7F = 0x257B
+0x5B81 = 0x257C
+0x5B84 = 0x257D
+0x5B96 = 0x2821
+0x5BAC = 0x2822
+0x5BC0 = 0x2824
+0x5BCE = 0x2826
+0x5BD6 = 0x2827
+0x5BF1 = 0x282A
+0x5BFD = 0x282B
+0x5C03 = 0x282D
+0x5C29 = 0x282E
+0x5C30 = 0x282F
+0x5C5F = 0x2831
+0x5C63 = 0x2832
+0x5C67 = 0x2833
+0x5C68 = 0x2834
+0x5C69 = 0x2835
+0x5C70 = 0x2836
+0x5C7C = 0x2839
+0x5C88 = 0x283C
+0x5C8A = 0x283D
+0x5CA0 = 0x2841
+0x5CA2 = 0x2842
+0x5CA6 = 0x2843
+0x5CA7 = 0x2844
+0x5CAD = 0x2846
+0x5CB5 = 0x2847
+0x5CC9 = 0x2849
+0x5D06 = 0x284C
+0x5D10 = 0x284D
+0x5D1D = 0x284F
+0x5D20 = 0x2850
+0x5D24 = 0x2851
+0x5D26 = 0x2852
+0x5D2B = 0x284E
+0x5D31 = 0x2853
+0x5D39 = 0x2854
+0x5D42 = 0x2855
+0x5D61 = 0x2857
+0x5D6A = 0x2858
+0x5D70 = 0x285A
+0x5D88 = 0x285D
+0x5D92 = 0x285F
+0x5D94 = 0x2860
+0x5D97 = 0x2861
+0x5D99 = 0x2862
+0x5DB0 = 0x2863
+0x5DB2 = 0x2864
+0x5DB4 = 0x2865
+0x5DB9 = 0x2867
+0x5DD1 = 0x2868
+0x5DD7 = 0x2869
+0x5DD8 = 0x286A
+0x5DE0 = 0x286B
+0x5DE4 = 0x286D
+0x5DE9 = 0x286E
+0x5E00 = 0x2870
+0x5E12 = 0x2872
+0x5E15 = 0x2873
+0x5E1F = 0x2875
+0x5E2E = 0x2876
+0x5E3E = 0x2877
+0x5E49 = 0x2878
+0x5E56 = 0x287A
+0x5E6B = 0x287C
+0x5E6C = 0x287D
+0x5E6D = 0x287E
+0x5E6E = 0x2C21
+0x5EA5 = 0x2C23
+0x5EAA = 0x2C24
+0x5EAC = 0x2C25
+0x5EB9 = 0x2C26
+0x5EBF = 0x2C27
+0x5EC6 = 0x2C28
+0x5ED2 = 0x2C29
+0x5ED9 = 0x2C2A
+0x5EFD = 0x2C2C
+0x5F08 = 0x2C2D
+0x5F0E = 0x2C2E
+0x5F1C = 0x2C2F
+0x5F1E = 0x2C31
+0x5F47 = 0x2C32
+0x5F63 = 0x2C33
+0x5F72 = 0x2C34
+0x5F7E = 0x2C35
+0x5F8F = 0x2C36
+0x5FA2 = 0x2C37
+0x5FA4 = 0x2C38
+0x5FB8 = 0x2C39
+0x5FC4 = 0x2C3A
+0x5FC7 = 0x2C3C
+0x5FCB = 0x2C3D
+0x5FD2 = 0x2C3E
+0x5FD3 = 0x2C3F
+0x5FD4 = 0x2C40
+0x5FE2 = 0x2C41
+0x5FEE = 0x2C42
+0x5FEF = 0x2C43
+0x5FF3 = 0x2C44
+0x5FFC = 0x2C45
+0x6017 = 0x2C47
+0x6022 = 0x2C48
+0x6024 = 0x2C49
+0x604C = 0x2C4B
+0x607F = 0x2C4C
+0x608A = 0x2C4D
+0x6095 = 0x2C4E
+0x60A8 = 0x2C4F
+0x60B0 = 0x2C51
+0x60B1 = 0x2C52
+0x60BE = 0x2C53
+0x60C8 = 0x2C54
+0x60D9 = 0x2C55
+0x60DB = 0x2C56
+0x60EE = 0x2C57
+0x60F2 = 0x2C58
+0x60F5 = 0x2C59
+0x6110 = 0x2C5A
+0x6112 = 0x2C5B
+0x6113 = 0x2C5C
+0x6119 = 0x2C5D
+0x611E = 0x2C5E
+0x613A = 0x2C5F
+0x6141 = 0x2C61
+0x6146 = 0x2C62
+0x6160 = 0x2C63
+0x617C = 0x2C64
+0x6192 = 0x2C66
+0x6193 = 0x2C67
+0x6197 = 0x2C68
+0x6198 = 0x2C69
+0x61A5 = 0x2C6A
+0x61A8 = 0x2C6B
+0x61AD = 0x2C6C
+0x61D5 = 0x2C6E
+0x61DD = 0x2C6F
+0x61DF = 0x2C70
+0x61F5 = 0x2C71
+0x6215 = 0x2C73
+0x6223 = 0x2C74
+0x6229 = 0x2C75
+0x6246 = 0x2C76
+0x624C = 0x2C77
+0x6251 = 0x2C78
+0x6252 = 0x2C79
+0x6261 = 0x2C7A
+0x6264 = 0x2C7B
+0x626D = 0x2C7D
+0x6273 = 0x2C7E
+0x627B = 0x2C7C
+0x6299 = 0x2D21
+0x62A6 = 0x2D22
+0x62D5 = 0x2D23
+0x62FD = 0x2D25
+0x6303 = 0x2D26
+0x630D = 0x2D27
+0x6310 = 0x2D28
+0x6332 = 0x2D2B
+0x6335 = 0x2D2C
+0x633B = 0x2D2D
+0x633C = 0x2D2E
+0x6341 = 0x2D2F
+0x6344 = 0x2D30
+0x634E = 0x2D31
+0x6359 = 0x2D33
+0x636C = 0x2D36
+0x6384 = 0x2D37
+0x6394 = 0x2D3A
+0x6399 = 0x2D38
+0x63BD = 0x2D3B
+0x63D4 = 0x2D3D
+0x63D5 = 0x2D3E
+0x63DC = 0x2D3F
+0x63E0 = 0x2D40
+0x63EB = 0x2D41
+0x63EC = 0x2D42
+0x63F2 = 0x2D43
+0x63F7 = 0x2D3C
+0x6409 = 0x2D44
+0x641E = 0x2D45
+0x6425 = 0x2D46
+0x6429 = 0x2D47
+0x642F = 0x2D48
+0x645A = 0x2D49
+0x645B = 0x2D4A
+0x645D = 0x2D4B
+0x6473 = 0x2D4C
+0x647D = 0x2D4D
+0x6487 = 0x2D4E
+0x6491 = 0x2D4F
+0x649D = 0x2D50
+0x649F = 0x2D51
+0x64CB = 0x2D52
+0x64CC = 0x2D53
+0x64D5 = 0x2D54
+0x64D7 = 0x2D55
+0x64E4 = 0x2D57
+0x64E5 = 0x2D58
+0x64FF = 0x2D59
+0x6504 = 0x2D5A
+0x650F = 0x2D5C
+0x6514 = 0x2D5D
+0x6516 = 0x2D5E
+0x651E = 0x2D60
+0x6532 = 0x2D61
+0x6544 = 0x2D62
+0x6554 = 0x2D63
+0x656B = 0x2D64
+0x657A = 0x2D65
+0x6581 = 0x2D66
+0x6584 = 0x2D67
+0x6585 = 0x2D68
+0x658A = 0x2D69
+0x65B2 = 0x2D6A
+0x65B5 = 0x2D6B
+0x65B8 = 0x2D6C
+0x65BF = 0x2D6D
+0x65C2 = 0x2D6E
+0x65C9 = 0x2D6F
+0x65D4 = 0x2D70
+0x65F2 = 0x2D72
+0x65F9 = 0x2D73
+0x65FC = 0x2D74
+0x6604 = 0x2D75
+0x6608 = 0x2D76
+0x6621 = 0x2D77
+0x662A = 0x2D78
+0x6645 = 0x2D79
+0x664E = 0x2D7B
+0x6651 = 0x2D7A
+0x6657 = 0x2D7E
+0x665B = 0x2E21
+0x6663 = 0x2E22
+0x666A = 0x2E25
+0x666B = 0x2E26
+0x666C = 0x2E27
+0x666D = 0x2E28
+0x667B = 0x2E29
+0x6680 = 0x2E2A
+0x6690 = 0x2E2B
+0x6692 = 0x2E2C
+0x6699 = 0x2E2D
+0x66AD = 0x2E2F
+0x66B1 = 0x2E30
+0x66B5 = 0x2E31
+0x66BF = 0x2E33
+0x66EC = 0x2E35
+0x6701 = 0x2E37
+0x6705 = 0x2E38
+0x6712 = 0x2E39
+0x6719 = 0x2E3B
+0x674C = 0x2E3E
+0x674D = 0x2E3F
+0x6754 = 0x2E40
+0x675D = 0x2E41
+0x6774 = 0x2E45
+0x6776 = 0x2E46
+0x6792 = 0x2E48
+0x67B0 = 0x2E4C
+0x67B2 = 0x2E4D
+0x67C3 = 0x2E4E
+0x67C8 = 0x2E4F
+0x67D2 = 0x2E50
+0x67D9 = 0x2E51
+0x67DB = 0x2E52
+0x67F0 = 0x2E53
+0x67F7 = 0x2E54
+0x6810 = 0x2E4B
+0x6818 = 0x2E58
+0x681F = 0x2E59
+0x682D = 0x2E5A
+0x6833 = 0x2E5C
+0x683B = 0x2E5D
+0x683E = 0x2E5E
+0x6844 = 0x2E5F
+0x6845 = 0x2E60
+0x6849 = 0x2E61
+0x684C = 0x2E62
+0x6855 = 0x2E63
+0x6857 = 0x2E64
+0x686B = 0x2E66
+0x686E = 0x2E67
+0x687A = 0x2E68
+0x687C = 0x2E69
+0x6882 = 0x2E6A
+0x6890 = 0x2E6B
+0x6896 = 0x2E6C
+0x6898 = 0x2E6E
+0x6899 = 0x2E6F
+0x689A = 0x2E70
+0x689C = 0x2E71
+0x68AA = 0x2E72
+0x68AB = 0x2E73
+0x68B4 = 0x2E74
+0x68BB = 0x2E75
+0x68C3 = 0x2E7A
+0x68C5 = 0x2E7B
+0x68CC = 0x2E7C
+0x68CF = 0x2E7D
+0x68D6 = 0x2E7E
+0x68D9 = 0x2F21
+0x68E4 = 0x2F22
+0x68E5 = 0x2F23
+0x68EC = 0x2F24
+0x68F7 = 0x2F25
+0x68FB = 0x2E76
+0x6903 = 0x2F26
+0x6907 = 0x2F27
+0x693B = 0x2F2B
+0x6946 = 0x2F2D
+0x6969 = 0x2F2E
+0x696C = 0x2F2F
+0x6972 = 0x2F30
+0x697A = 0x2F31
+0x697F = 0x2F32
+0x6992 = 0x2F33
+0x6996 = 0x2F35
+0x6998 = 0x2F36
+0x69A6 = 0x2F37
+0x69B0 = 0x2F38
+0x69B7 = 0x2F39
+0x69BA = 0x2F3A
+0x69BC = 0x2F3B
+0x69C0 = 0x2F3C
+0x69D1 = 0x2F3D
+0x69D6 = 0x2F3E
+0x69E3 = 0x2F44
+0x69EE = 0x2F45
+0x69EF = 0x2F46
+0x69F3 = 0x2F47
+0x69F4 = 0x2F49
+0x69FE = 0x2F4A
+0x6A11 = 0x2F4B
+0x6A1A = 0x2F4C
+0x6A1D = 0x2F4D
+0x6A30 = 0x2F41
+0x6A32 = 0x2F4F
+0x6A33 = 0x2F50
+0x6A34 = 0x2F51
+0x6A3F = 0x2F52
+0x6A46 = 0x2F53
+0x6A49 = 0x2F54
+0x6A4E = 0x2F56
+0x6A52 = 0x2F57
+0x6A64 = 0x2F58
+0x6A7A = 0x2F55
+0x6A7E = 0x2F5A
+0x6A83 = 0x2F5B
+0x6A8B = 0x2F5C
+0x6A91 = 0x2F5E
+0x6A9F = 0x2F5F
+0x6AA1 = 0x2F60
+0x6AAB = 0x2F62
+0x6ABD = 0x2F63
+0x6AC6 = 0x2F64
+0x6AD0 = 0x2F66
+0x6AD4 = 0x2F65
+0x6ADC = 0x2F67
+0x6ADD = 0x2F68
+0x6AEC = 0x2F6B
+0x6AF1 = 0x2F6C
+0x6AF2 = 0x2F6D
+0x6AF3 = 0x2F6E
+0x6AFD = 0x2F6F
+0x6B0B = 0x2F71
+0x6B0F = 0x2F72
+0x6B10 = 0x2F73
+0x6B11 = 0x2F74
+0x6B17 = 0x2F76
+0x6B2F = 0x2F78
+0x6B4A = 0x2F79
+0x6B58 = 0x2F7A
+0x6B6C = 0x2F7B
+0x6B75 = 0x2F7C
+0x6B7A = 0x2F7D
+0x6B81 = 0x2F7E
+0x6B9B = 0x6E21
+0x6BAE = 0x6E22
+0x6BBD = 0x6E24
+0x6BBE = 0x6E25
+0x6BC7 = 0x6E26
+0x6BC8 = 0x6E27
+0x6BC9 = 0x6E28
+0x6BDA = 0x6E29
+0x6BE6 = 0x6E2A
+0x6BE7 = 0x6E2B
+0x6BEE = 0x6E2C
+0x6BF1 = 0x6E2D
+0x6C02 = 0x6E2E
+0x6C0A = 0x6E2F
+0x6C0E = 0x6E30
+0x6C35 = 0x6E31
+0x6C36 = 0x6E32
+0x6C3A = 0x6E33
+0x6C3F = 0x6E35
+0x6C4D = 0x6E36
+0x6C5B = 0x6E37
+0x6C67 = 0x6E4F
+0x6C6D = 0x6E38
+0x6C84 = 0x6E39
+0x6C89 = 0x6E3A
+0x6C94 = 0x6E3C
+0x6C95 = 0x6E3D
+0x6C97 = 0x6E3E
+0x6CAD = 0x6E3F
+0x6CC2 = 0x6E40
+0x6CD0 = 0x6E41
+0x6CD6 = 0x6E43
+0x6CDA = 0x6E44
+0x6CDC = 0x6E45
+0x6CE9 = 0x6E46
+0x6CEC = 0x6E47
+0x6CED = 0x6E48
+0x6D00 = 0x6E4A
+0x6D0A = 0x6E4B
+0x6D24 = 0x6E4C
+0x6D26 = 0x6E4D
+0x6D27 = 0x6E4E
+0x6D2F = 0x6E50
+0x6D34 = 0x6E65
+0x6D3C = 0x6E51
+0x6D5B = 0x6E52
+0x6D5E = 0x6E53
+0x6D60 = 0x6E54
+0x6D70 = 0x6E55
+0x6D80 = 0x6E56
+0x6D81 = 0x6E57
+0x6D8A = 0x6E58
+0x6D8D = 0x6E59
+0x6D91 = 0x6E5A
+0x6D98 = 0x6E5B
+0x6DAB = 0x6E61
+0x6DAE = 0x6E62
+0x6DB4 = 0x6E63
+0x6DC2 = 0x6E64
+0x6DC8 = 0x6E66
+0x6DCE = 0x6E67
+0x6DCF = 0x6E68
+0x6DD0 = 0x6E69
+0x6DDF = 0x6E6A
+0x6DE9 = 0x6E6B
+0x6DF6 = 0x6E6C
+0x6E17 = 0x6E5D
+0x6E1E = 0x6E6E
+0x6E22 = 0x6E6F
+0x6E27 = 0x6E70
+0x6E32 = 0x6E72
+0x6E36 = 0x6E6D
+0x6E3C = 0x6E73
+0x6E48 = 0x6E74
+0x6E49 = 0x6E75
+0x6E4B = 0x6E76
+0x6E4C = 0x6E77
+0x6E4F = 0x6E78
+0x6E51 = 0x6E79
+0x6E53 = 0x6E7A
+0x6E54 = 0x6E7B
+0x6E57 = 0x6E7C
+0x6E63 = 0x6E7D
+0x6E93 = 0x6F21
+0x6EA7 = 0x6F22
+0x6EB4 = 0x6F23
+0x6EBF = 0x6F24
+0x6EC3 = 0x6F25
+0x6ECA = 0x6F26
+0x6ED9 = 0x6F27
+0x6EEB = 0x6F29
+0x6EF9 = 0x6F2A
+0x6EFB = 0x6F2B
+0x6F0A = 0x6F2C
+0x6F0C = 0x6F2D
+0x6F18 = 0x6F2E
+0x6F25 = 0x6F2F
+0x6F35 = 0x6F28
+0x6F36 = 0x6F30
+0x6F3C = 0x6F31
+0x6F52 = 0x6F33
+0x6F57 = 0x6F34
+0x6F5A = 0x6F35
+0x6F60 = 0x6F36
+0x6F68 = 0x6F37
+0x6F7D = 0x6F39
+0x6F90 = 0x6F3A
+0x6F96 = 0x6F3B
+0x6F98 = 0x6F38
+0x6F9F = 0x6F3D
+0x6FA5 = 0x6F3E
+0x6FAF = 0x6F3F
+0x6FB5 = 0x6F41
+0x6FBE = 0x6F3C
+0x6FC8 = 0x6F42
+0x6FC9 = 0x6F43
+0x6FDA = 0x6F44
+0x6FDE = 0x6F45
+0x6FE9 = 0x6F46
+0x6FFC = 0x6F48
+0x7000 = 0x6F49
+0x7007 = 0x6F4A
+0x700A = 0x6F4B
+0x7023 = 0x6F4C
+0x7039 = 0x6F4E
+0x703A = 0x6F4F
+0x703C = 0x6F50
+0x7043 = 0x6F51
+0x7047 = 0x6F52
+0x704B = 0x6F53
+0x7054 = 0x6F55
+0x7065 = 0x6F56
+0x7069 = 0x6F57
+0x706C = 0x6F58
+0x706E = 0x6F59
+0x7076 = 0x6F5A
+0x707E = 0x6F5B
+0x7081 = 0x6F5C
+0x7086 = 0x6F5D
+0x7095 = 0x6F5E
+0x7097 = 0x6F5F
+0x709F = 0x6F62
+0x70B1 = 0x6F63
+0x70BB = 0x6F60
+0x70CA = 0x6F66
+0x70D1 = 0x6F67
+0x70D3 = 0x6F68
+0x70DC = 0x6F69
+0x70EC = 0x6F65
+0x7103 = 0x6F6A
+0x7104 = 0x6F6B
+0x7106 = 0x6F6C
+0x7107 = 0x6F6D
+0x7108 = 0x6F6E
+0x710C = 0x6F6F
+0x712F = 0x6F71
+0x7131 = 0x6F72
+0x714A = 0x6F74
+0x7150 = 0x6F73
+0x7153 = 0x6F75
+0x715E = 0x6F76
+0x7180 = 0x6F79
+0x7196 = 0x6F78
+0x719B = 0x6F7A
+0x71A0 = 0x6F7B
+0x71A2 = 0x6F7C
+0x71AE = 0x6F7D
+0x71AF = 0x6F7E
+0x71B3 = 0x7021
+0x71CB = 0x7023
+0x71D3 = 0x7024
+0x71D9 = 0x7025
+0x71DC = 0x7026
+0x7207 = 0x7027
+0x722B = 0x702A
+0x7234 = 0x702B
+0x7238 = 0x702C
+0x7239 = 0x702D
+0x7242 = 0x702F
+0x7253 = 0x7030
+0x7257 = 0x7031
+0x7263 = 0x7032
+0x726E = 0x7034
+0x726F = 0x7035
+0x7278 = 0x7036
+0x727F = 0x7037
+0x728E = 0x7038
+0x72AD = 0x703A
+0x72AE = 0x703B
+0x72B0 = 0x703C
+0x72B1 = 0x703D
+0x72C1 = 0x703E
+0x72CC = 0x7040
+0x72F3 = 0x7043
+0x72FA = 0x7044
+0x7307 = 0x7045
+0x7312 = 0x7046
+0x7318 = 0x7047
+0x7319 = 0x7048
+0x732C = 0x704B
+0x7331 = 0x704C
+0x7333 = 0x704D
+0x7339 = 0x704A
+0x733D = 0x704E
+0x7352 = 0x704F
+0x736B = 0x7051
+0x736C = 0x7052
+0x736E = 0x7054
+0x736F = 0x7055
+0x7371 = 0x7056
+0x7377 = 0x7057
+0x7381 = 0x7058
+0x7385 = 0x7059
+0x738A = 0x705A
+0x7394 = 0x705B
+0x7398 = 0x705C
+0x739C = 0x705D
+0x739E = 0x705E
+0x73A5 = 0x705F
+0x73A8 = 0x7060
+0x73B5 = 0x7061
+0x73B7 = 0x7062
+0x73B9 = 0x7063
+0x73BC = 0x7064
+0x73BF = 0x7065
+0x73C5 = 0x7066
+0x73CB = 0x7067
+0x73E1 = 0x7068
+0x73E7 = 0x7069
+0x73F9 = 0x706A
+0x73FA = 0x706C
+0x7401 = 0x706D
+0x7413 = 0x706B
+0x7424 = 0x706E
+0x7431 = 0x706F
+0x7439 = 0x7070
+0x7440 = 0x7072
+0x7443 = 0x7073
+0x744D = 0x7074
+0x7452 = 0x7075
+0x7453 = 0x7071
+0x745D = 0x7076
+0x7471 = 0x7077
+0x7481 = 0x7078
+0x7485 = 0x7079
+0x7488 = 0x707A
+0x7492 = 0x707C
+0x7497 = 0x707D
+0x7499 = 0x707E
+0x74A0 = 0x7121
+0x74A1 = 0x7122
+0x74A5 = 0x7123
+0x74AA = 0x7124
+0x74AB = 0x7125
+0x74B9 = 0x7126
+0x74BA = 0x7128
+0x74BB = 0x7127
+0x74D6 = 0x7129
+0x74D8 = 0x712A
+0x74DE = 0x712B
+0x74EB = 0x712D
+0x74EF = 0x712C
+0x74FA = 0x712F
+0x7520 = 0x7131
+0x7524 = 0x7132
+0x752A = 0x7133
+0x753D = 0x7136
+0x753E = 0x7137
+0x7540 = 0x7138
+0x7548 = 0x7139
+0x754E = 0x713A
+0x7550 = 0x713B
+0x7552 = 0x713C
+0x756C = 0x713D
+0x7571 = 0x713F
+0x7572 = 0x713E
+0x757A = 0x7140
+0x757D = 0x7141
+0x757E = 0x7142
+0x7581 = 0x7143
+0x758C = 0x7145
+0x75A2 = 0x7147
+0x75B0 = 0x7149
+0x75B7 = 0x714A
+0x75BF = 0x714B
+0x75C0 = 0x714C
+0x75C6 = 0x714D
+0x75CF = 0x714E
+0x75D3 = 0x714F
+0x75DD = 0x7150
+0x75DF = 0x7151
+0x75E0 = 0x7152
+0x75E7 = 0x7153
+0x75EC = 0x7154
+0x75EE = 0x7155
+0x75F1 = 0x7156
+0x75F9 = 0x7157
+0x7603 = 0x7158
+0x7607 = 0x715A
+0x760F = 0x715B
+0x7613 = 0x715E
+0x7618 = 0x7159
+0x761B = 0x715F
+0x761C = 0x7160
+0x7625 = 0x7162
+0x7628 = 0x7163
+0x7633 = 0x7165
+0x763C = 0x7164
+0x7641 = 0x7168
+0x7649 = 0x716A
+0x7655 = 0x716B
+0x766E = 0x716D
+0x7695 = 0x716E
+0x769C = 0x716F
+0x76A0 = 0x7171
+0x76A1 = 0x7170
+0x76A7 = 0x7172
+0x76A8 = 0x7173
+0x76AF = 0x7174
+0x76C9 = 0x7176
+0x76E8 = 0x7178
+0x76EC = 0x7179
+0x7717 = 0x717B
+0x771A = 0x717C
+0x772D = 0x717D
+0x7735 = 0x717E
+0x7758 = 0x7225
+0x7760 = 0x7226
+0x776A = 0x7227
+0x7772 = 0x7229
+0x777C = 0x722A
+0x777D = 0x722B
+0x779A = 0x722E
+0x779F = 0x722F
+0x77A2 = 0x7230
+0x77A4 = 0x7231
+0x77A9 = 0x7232
+0x77DE = 0x7233
+0x77DF = 0x7234
+0x77E4 = 0x7235
+0x77E6 = 0x7236
+0x77EA = 0x7237
+0x77EC = 0x7238
+0x77F0 = 0x723A
+0x77F4 = 0x723B
+0x77FB = 0x723C
+0x7805 = 0x723E
+0x7806 = 0x723F
+0x7809 = 0x7240
+0x780D = 0x7241
+0x7819 = 0x7242
+0x7821 = 0x7243
+0x782C = 0x7244
+0x7847 = 0x7245
+0x7864 = 0x7246
+0x786A = 0x7247
+0x788A = 0x7249
+0x7894 = 0x724A
+0x789D = 0x724C
+0x789E = 0x724D
+0x789F = 0x724E
+0x78A4 = 0x724B
+0x78BB = 0x724F
+0x78C8 = 0x7250
+0x78CC = 0x7251
+0x78CE = 0x7252
+0x78D5 = 0x7253
+0x78E0 = 0x7254
+0x78E1 = 0x7255
+0x78E6 = 0x7256
+0x78F9 = 0x7257
+0x78FA = 0x7258
+0x78FB = 0x7259
+0x78FE = 0x725A
+0x7910 = 0x725C
+0x791B = 0x725D
+0x7925 = 0x725F
+0x7930 = 0x725E
+0x793B = 0x7260
+0x794A = 0x7261
+0x7958 = 0x7262
+0x795B = 0x7263
+0x7967 = 0x7265
+0x7972 = 0x7266
+0x7994 = 0x7267
+0x7995 = 0x7268
+0x7996 = 0x7269
+0x799B = 0x726A
+0x79A1 = 0x726B
+0x79A9 = 0x726C
+0x79B4 = 0x726D
+0x79BB = 0x726E
+0x79C2 = 0x726F
+0x79C7 = 0x7270
+0x79CC = 0x7271
+0x79CD = 0x7272
+0x79D6 = 0x7273
+0x7A0A = 0x7278
+0x7A11 = 0x7279
+0x7A15 = 0x727A
+0x7A1B = 0x727B
+0x7A1E = 0x727C
+0x7A2D = 0x727E
+0x7A38 = 0x7321
+0x7A47 = 0x7322
+0x7A4C = 0x7323
+0x7A56 = 0x7324
+0x7A59 = 0x7325
+0x7A5C = 0x7326
+0x7A5F = 0x7327
+0x7A60 = 0x7328
+0x7A67 = 0x7329
+0x7A6A = 0x732A
+0x7A75 = 0x732B
+0x7A78 = 0x732C
+0x7A82 = 0x732D
+0x7A8A = 0x732E
+0x7A90 = 0x732F
+0x7AA3 = 0x7330
+0x7AAC = 0x7331
+0x7AB9 = 0x7334
+0x7ABC = 0x7335
+0x7ABE = 0x7336
+0x7ACC = 0x7338
+0x7AD1 = 0x7339
+0x7AE7 = 0x733A
+0x7AE8 = 0x733B
+0x7AF4 = 0x733C
+0x7B07 = 0x733F
+0x7B27 = 0x7342
+0x7B2A = 0x7343
+0x7B2E = 0x7344
+0x7B2F = 0x7345
+0x7B31 = 0x7346
+0x7B3D = 0x7341
+0x7B41 = 0x734A
+0x7B55 = 0x734C
+0x7B64 = 0x734E
+0x7B66 = 0x734F
+0x7B69 = 0x7350
+0x7B73 = 0x7351
+0x7B79 = 0x734D
+0x7B7F = 0x7349
+0x7B90 = 0x7354
+0x7B91 = 0x7355
+0x7B9B = 0x7356
+0x7BAF = 0x7358
+0x7BB5 = 0x7359
+0x7BBC = 0x735A
+0x7BC5 = 0x735B
+0x7BCA = 0x735C
+0x7BD4 = 0x735F
+0x7BD6 = 0x7360
+0x7BDA = 0x7361
+0x7BEA = 0x7362
+0x7BF0 = 0x7363
+0x7C03 = 0x7364
+0x7C0B = 0x7365
+0x7C0E = 0x7366
+0x7C0F = 0x7367
+0x7C26 = 0x7368
+0x7C45 = 0x7369
+0x7C4A = 0x736A
+0x7C51 = 0x736B
+0x7C57 = 0x736C
+0x7C5E = 0x736D
+0x7C61 = 0x736E
+0x7C69 = 0x736F
+0x7C6E = 0x7370
+0x7C6F = 0x7371
+0x7C70 = 0x7372
+0x7CA6 = 0x7376
+0x7CB6 = 0x7378
+0x7CB7 = 0x7379
+0x7CBF = 0x737A
+0x7CC4 = 0x737C
+0x7CC8 = 0x737E
+0x7CCD = 0x7421
+0x7CD7 = 0x7423
+0x7CE6 = 0x7425
+0x7CEB = 0x7426
+0x7CF5 = 0x7428
+0x7D03 = 0x7429
+0x7D09 = 0x742A
+0x7D12 = 0x742C
+0x7D1E = 0x742D
+0x7D3D = 0x7430
+0x7D3E = 0x7431
+0x7D40 = 0x7432
+0x7D47 = 0x7433
+0x7D59 = 0x7437
+0x7D5A = 0x7438
+0x7D6A = 0x7439
+0x7D70 = 0x743A
+0x7D7F = 0x743C
+0x7D86 = 0x743E
+0x7D88 = 0x743F
+0x7D8C = 0x7440
+0x7D97 = 0x7441
+0x7D9D = 0x7443
+0x7DA7 = 0x7444
+0x7DAA = 0x7445
+0x7DB6 = 0x7446
+0x7DB7 = 0x7447
+0x7DC0 = 0x7448
+0x7DD7 = 0x7449
+0x7DD9 = 0x744A
+0x7DE6 = 0x744B
+0x7DF1 = 0x744C
+0x7DF9 = 0x744D
+0x7E10 = 0x7451
+0x7E17 = 0x7452
+0x7E1D = 0x7453
+0x7E20 = 0x7454
+0x7E27 = 0x7455
+0x7E2C = 0x7456
+0x7E45 = 0x7457
+0x7E73 = 0x7458
+0x7E75 = 0x7459
+0x7E7E = 0x745A
+0x7E86 = 0x745B
+0x7E87 = 0x745C
+0x7E91 = 0x745E
+0x7E98 = 0x745F
+0x7E9A = 0x7460
+0x7F3B = 0x7463
+0x7F3C = 0x7462
+0x7F3E = 0x7464
+0x7F43 = 0x7465
+0x7F44 = 0x7466
+0x7F4F = 0x7467
+0x7F52 = 0x746A
+0x7F61 = 0x746C
+0x7F63 = 0x746D
+0x7F64 = 0x746E
+0x7F6D = 0x746F
+0x7F7D = 0x7470
+0x7F7E = 0x7471
+0x7F90 = 0x7473
+0x7F96 = 0x7476
+0x7F9C = 0x7477
+0x7FAD = 0x7478
+0x7FC3 = 0x747A
+0x7FCF = 0x747B
+0x7FE3 = 0x747C
+0x7FE5 = 0x747D
+0x7FEF = 0x747E
+0x7FF2 = 0x7521
+0x8002 = 0x7522
+0x8008 = 0x7524
+0x800A = 0x7523
+0x800E = 0x7525
+0x8011 = 0x7526
+0x8016 = 0x7527
+0x8024 = 0x7528
+0x802C = 0x7529
+0x8030 = 0x752A
+0x8043 = 0x752B
+0x8066 = 0x752C
+0x8071 = 0x752D
+0x8075 = 0x752E
+0x807B = 0x752F
+0x8099 = 0x7530
+0x809C = 0x7531
+0x80A4 = 0x7532
+0x80A7 = 0x7533
+0x80B8 = 0x7534
+0x80C5 = 0x7536
+0x80D5 = 0x7537
+0x80D8 = 0x7538
+0x80E6 = 0x7539
+0x80F5 = 0x753C
+0x80FB = 0x753D
+0x810D = 0x753B
+0x8116 = 0x7540
+0x811E = 0x7541
+0x8124 = 0x7543
+0x8127 = 0x7544
+0x812C = 0x7545
+0x8135 = 0x753F
+0x813D = 0x7547
+0x8169 = 0x7549
+0x8181 = 0x754B
+0x8184 = 0x754D
+0x8185 = 0x754E
+0x8198 = 0x7550
+0x81B2 = 0x7551
+0x81C1 = 0x7552
+0x81C3 = 0x7553
+0x81D6 = 0x7554
+0x81DB = 0x7555
+0x81E4 = 0x7557
+0x81EC = 0x7559
+0x81FD = 0x755B
+0x81FF = 0x755C
+0x8204 = 0x755E
+0x8219 = 0x7560
+0x8221 = 0x7561
+0x8222 = 0x7562
+0x8232 = 0x7564
+0x8234 = 0x7565
+0x823C = 0x7566
+0x8245 = 0x7569
+0x8246 = 0x7567
+0x8249 = 0x7568
+0x824B = 0x756B
+0x824F = 0x756D
+0x8257 = 0x756F
+0x825C = 0x7571
+0x8263 = 0x7572
+0x8279 = 0x7576
+0x827D = 0x7578
+0x827F = 0x7579
+0x8283 = 0x757A
+0x828A = 0x757B
+0x8293 = 0x757C
+0x82A7 = 0x757D
+0x82A8 = 0x757E
+0x82B2 = 0x7621
+0x82B4 = 0x7622
+0x82BA = 0x7623
+0x82BC = 0x7624
+0x82E2 = 0x7625
+0x82E8 = 0x7626
+0x82F7 = 0x7627
+0x8307 = 0x7628
+0x8308 = 0x7629
+0x830C = 0x762A
+0x831B = 0x762C
+0x831D = 0x762D
+0x8330 = 0x762E
+0x833C = 0x762F
+0x8344 = 0x7630
+0x8354 = 0x762B
+0x8357 = 0x7631
+0x8363 = 0x2E4A
+0x837F = 0x7633
+0x838D = 0x7636
+0x8394 = 0x7637
+0x8395 = 0x7638
+0x839B = 0x7639
+0x839D = 0x763A
+0x83C9 = 0x763B
+0x83D0 = 0x763C
+0x83D4 = 0x763D
+0x83DD = 0x763E
+0x83E5 = 0x763F
+0x83F9 = 0x7640
+0x840F = 0x7641
+0x8411 = 0x7642
+0x8415 = 0x7643
+0x8417 = 0x7645
+0x8439 = 0x7646
+0x844A = 0x7647
+0x844F = 0x7648
+0x8451 = 0x7649
+0x8452 = 0x764A
+0x8459 = 0x764B
+0x845A = 0x764C
+0x845C = 0x764D
+0x8465 = 0x764F
+0x8476 = 0x7650
+0x8478 = 0x7651
+0x847C = 0x7652
+0x8481 = 0x7653
+0x8497 = 0x7656
+0x84A6 = 0x7657
+0x84BE = 0x7658
+0x84CE = 0x765A
+0x84CF = 0x765B
+0x84D3 = 0x765C
+0x84DC = 0x7655
+0x84E7 = 0x765E
+0x84EA = 0x765F
+0x84EF = 0x7660
+0x84F0 = 0x7661
+0x84F1 = 0x7662
+0x84FA = 0x7663
+0x84FD = 0x7664
+0x850C = 0x7665
+0x851B = 0x7666
+0x8524 = 0x7667
+0x8525 = 0x7668
+0x852B = 0x7669
+0x8534 = 0x766A
+0x853E = 0x766F
+0x854F = 0x766B
+0x8551 = 0x7670
+0x8553 = 0x7671
+0x855E = 0x7672
+0x8561 = 0x7673
+0x8562 = 0x7674
+0x856F = 0x766C
+0x857B = 0x7676
+0x857D = 0x7677
+0x857F = 0x7678
+0x8581 = 0x7679
+0x8586 = 0x767A
+0x8593 = 0x767B
+0x859D = 0x767C
+0x859F = 0x767D
+0x85B7 = 0x7723
+0x85BC = 0x7724
+0x85C7 = 0x7725
+0x85CA = 0x7726
+0x85D8 = 0x7727
+0x85D9 = 0x7728
+0x85DF = 0x7729
+0x85E1 = 0x772A
+0x85E6 = 0x772B
+0x85F6 = 0x772C
+0x8600 = 0x772D
+0x8611 = 0x772E
+0x861E = 0x772F
+0x8621 = 0x7730
+0x8624 = 0x7731
+0x8627 = 0x7732
+0x8639 = 0x7734
+0x863C = 0x7735
+0x8640 = 0x7737
+0x8653 = 0x7739
+0x8656 = 0x773A
+0x866F = 0x773B
+0x8677 = 0x773C
+0x867A = 0x773D
+0x8687 = 0x773E
+0x8689 = 0x773F
+0x868D = 0x7740
+0x8691 = 0x7741
+0x869C = 0x7742
+0x869D = 0x7743
+0x86A8 = 0x7744
+0x86B1 = 0x7746
+0x86B3 = 0x7747
+0x86C1 = 0x7748
+0x86C3 = 0x7749
+0x86D1 = 0x774A
+0x86D5 = 0x774B
+0x86D7 = 0x774C
+0x86E3 = 0x774D
+0x86E6 = 0x774E
+0x8705 = 0x7750
+0x8707 = 0x7751
+0x870E = 0x7752
+0x8710 = 0x7753
+0x8713 = 0x7754
+0x8719 = 0x7755
+0x871F = 0x7756
+0x8721 = 0x7757
+0x8723 = 0x7758
+0x8731 = 0x7759
+0x873A = 0x775A
+0x873E = 0x775B
+0x8740 = 0x775C
+0x8743 = 0x775D
+0x8751 = 0x775E
+0x8758 = 0x775F
+0x8764 = 0x7760
+0x8765 = 0x7761
+0x8772 = 0x7762
+0x877C = 0x7763
+0x8789 = 0x7767
+0x878B = 0x7768
+0x8793 = 0x7769
+0x87A0 = 0x776A
+0x87A7 = 0x7766
+0x87BE = 0x776D
+0x87C1 = 0x776F
+0x87CE = 0x7770
+0x87DF = 0x7772
+0x87E3 = 0x7774
+0x87E5 = 0x7775
+0x87E6 = 0x7776
+0x87EA = 0x7777
+0x87EB = 0x7778
+0x87ED = 0x7779
+0x87F5 = 0x7771
+0x8801 = 0x777A
+0x8803 = 0x777B
+0x880B = 0x777C
+0x8813 = 0x777D
+0x8828 = 0x777E
+0x882E = 0x7821
+0x8832 = 0x7822
+0x883C = 0x7823
+0x884A = 0x7825
+0x8858 = 0x7826
+0x885F = 0x7827
+0x8864 = 0x7828
+0x8869 = 0x782B
+0x886F = 0x782D
+0x88A0 = 0x782E
+0x88BC = 0x782F
+0x88BD = 0x7830
+0x88BE = 0x7831
+0x88C0 = 0x7832
+0x88D1 = 0x7835
+0x88D2 = 0x7833
+0x88D3 = 0x7836
+0x88DB = 0x7837
+0x88F0 = 0x7838
+0x88F1 = 0x7839
+0x8901 = 0x783B
+0x8937 = 0x783D
+0x8942 = 0x783F
+0x8945 = 0x7840
+0x8949 = 0x7841
+0x8962 = 0x7844
+0x8980 = 0x7845
+0x8989 = 0x7846
+0x8990 = 0x7847
+0x899F = 0x7848
+0x89B0 = 0x7849
+0x89B7 = 0x784A
+0x89D6 = 0x784B
+0x89D8 = 0x784C
+0x89EB = 0x784D
+0x89F1 = 0x784F
+0x89F3 = 0x7850
+0x89FD = 0x7851
+0x89FF = 0x7852
+0x8A11 = 0x7854
+0x8A14 = 0x7855
+0x8A21 = 0x7857
+0x8A35 = 0x7858
+0x8A3E = 0x7859
+0x8A45 = 0x785A
+0x8A4D = 0x785B
+0x8A58 = 0x785C
+0x8A90 = 0x785E
+0x8AAE = 0x785D
+0x8AB7 = 0x785F
+0x8ABE = 0x7860
+0x8AD7 = 0x7861
+0x8AFC = 0x7862
+0x8B05 = 0x7865
+0x8B0A = 0x7864
+0x8B0D = 0x7866
+0x8B1C = 0x7867
+0x8B1F = 0x7868
+0x8B2D = 0x7869
+0x8B43 = 0x786A
+0x8B51 = 0x786C
+0x8B5E = 0x786D
+0x8B76 = 0x786E
+0x8B7F = 0x786F
+0x8B81 = 0x7870
+0x8B8B = 0x7871
+0x8B94 = 0x7872
+0x8B95 = 0x7873
+0x8B9C = 0x7874
+0x8B9E = 0x7875
+0x8C39 = 0x7876
+0x8C3D = 0x7878
+0x8C45 = 0x787B
+0x8C47 = 0x787C
+0x8C4F = 0x787D
+0x8C54 = 0x787E
+0x8C57 = 0x7921
+0x8C69 = 0x7922
+0x8C6D = 0x7923
+0x8C73 = 0x7924
+0x8C92 = 0x7927
+0x8C93 = 0x7926
+0x8C99 = 0x7928
+0x8C9B = 0x792A
+0x8CA4 = 0x792B
+0x8CD5 = 0x792D
+0x8CD6 = 0x792C
+0x8CD9 = 0x792E
+0x8CF0 = 0x7930
+0x8CF1 = 0x7931
+0x8D09 = 0x7933
+0x8D0E = 0x7934
+0x8D6C = 0x7935
+0x8D84 = 0x7936
+0x8D95 = 0x7937
+0x8DA6 = 0x7938
+0x8DC6 = 0x793A
+0x8DC8 = 0x793B
+0x8DD9 = 0x793C
+0x8DEC = 0x793D
+0x8DFD = 0x7940
+0x8E06 = 0x7941
+0x8E0C = 0x793E
+0x8E14 = 0x7943
+0x8E16 = 0x7944
+0x8E21 = 0x7945
+0x8E22 = 0x7946
+0x8E27 = 0x7947
+0x8E36 = 0x794A
+0x8E39 = 0x794B
+0x8E4B = 0x794C
+0x8E54 = 0x794D
+0x8E62 = 0x794E
+0x8E6C = 0x794F
+0x8E6D = 0x7950
+0x8E6F = 0x7951
+0x8E98 = 0x7952
+0x8E9E = 0x7953
+0x8EAE = 0x7954
+0x8EB3 = 0x7955
+0x8EB5 = 0x7956
+0x8EB6 = 0x7957
+0x8EBB = 0x7958
+0x8ED1 = 0x795A
+0x8ED4 = 0x795B
+0x8EF9 = 0x795D
+0x8F00 = 0x795F
+0x8F08 = 0x7960
+0x8F17 = 0x7961
+0x8F2B = 0x7962
+0x8F40 = 0x7963
+0x8F4A = 0x7964
+0x8F58 = 0x7965
+0x8FA4 = 0x7967
+0x8FB4 = 0x7968
+0x8FB6 = 0x796A
+0x8FC1 = 0x796C
+0x8FC6 = 0x796D
+0x8FCA = 0x796F
+0x8FCD = 0x7970
+0x8FD3 = 0x7971
+0x8FD5 = 0x7972
+0x8FE0 = 0x7973
+0x8FF1 = 0x7974
+0x8FF5 = 0x7975
+0x8FFB = 0x7976
+0x9002 = 0x7977
+0x900C = 0x7978
+0x9037 = 0x7979
+0x9043 = 0x797B
+0x9044 = 0x797C
+0x905D = 0x797D
+0x9085 = 0x7A22
+0x908C = 0x7A23
+0x9090 = 0x7A24
+0x90A1 = 0x7A26
+0x90B0 = 0x7A28
+0x90B6 = 0x7A29
+0x90C3 = 0x7A2A
+0x90C8 = 0x7A2B
+0x90DC = 0x7A2D
+0x90DF = 0x7A2E
+0x90EB = 0x7A33
+0x90F2 = 0x7A31
+0x90F6 = 0x7A30
+0x90FE = 0x7A34
+0x90FF = 0x7A35
+0x9100 = 0x7A32
+0x9104 = 0x7A36
+0x9106 = 0x7A37
+0x9118 = 0x7A38
+0x911C = 0x7A39
+0x911E = 0x7A3A
+0x9137 = 0x7A3B
+0x9139 = 0x7A3C
+0x913A = 0x7A3D
+0x9146 = 0x7A3E
+0x9147 = 0x7A3F
+0x9157 = 0x7A40
+0x9159 = 0x7A41
+0x9161 = 0x7A42
+0x9164 = 0x7A43
+0x9174 = 0x7A44
+0x9179 = 0x7A45
+0x9185 = 0x7A46
+0x918E = 0x7A47
+0x91A8 = 0x7A48
+0x91AE = 0x7A49
+0x91B3 = 0x7A4A
+0x91B6 = 0x7A4B
+0x91C3 = 0x7A4C
+0x91C4 = 0x7A4D
+0x91DA = 0x7A4E
+0x91EC = 0x7A51
+0x91EE = 0x7A52
+0x9201 = 0x7A53
+0x920A = 0x7A54
+0x9216 = 0x7A55
+0x9217 = 0x7A56
+0x9233 = 0x7A58
+0x9242 = 0x7A59
+0x9247 = 0x7A5A
+0x924A = 0x7A5B
+0x924E = 0x7A5C
+0x9251 = 0x7A5D
+0x9256 = 0x7A5E
+0x9259 = 0x7A5F
+0x9260 = 0x7A60
+0x9261 = 0x7A61
+0x9265 = 0x7A62
+0x9267 = 0x7A63
+0x9268 = 0x7A64
+0x927C = 0x7A67
+0x927D = 0x7A68
+0x927F = 0x7A69
+0x9289 = 0x7A6A
+0x928D = 0x7A6B
+0x9297 = 0x7A6C
+0x9299 = 0x7A6D
+0x929F = 0x7A6E
+0x92A7 = 0x7A6F
+0x92AB = 0x7A70
+0x92B2 = 0x7A73
+0x92BF = 0x7A74
+0x92C0 = 0x7A75
+0x92C6 = 0x7A76
+0x92CE = 0x7A77
+0x92D0 = 0x7A78
+0x92D7 = 0x7A79
+0x92D9 = 0x7A7A
+0x92E5 = 0x7A7B
+0x92E7 = 0x7A7C
+0x92F7 = 0x7B22
+0x92F9 = 0x7B23
+0x92FB = 0x7B24
+0x9302 = 0x7B25
+0x930D = 0x7B26
+0x9311 = 0x7A7D
+0x9315 = 0x7B27
+0x931D = 0x7B28
+0x931E = 0x7B29
+0x9327 = 0x7B2A
+0x9329 = 0x7B2B
+0x9347 = 0x7B2E
+0x9351 = 0x7B2F
+0x9357 = 0x7B30
+0x935A = 0x7B31
+0x936B = 0x7B32
+0x9371 = 0x7B33
+0x9373 = 0x7B34
+0x9388 = 0x7B38
+0x938B = 0x7B39
+0x938F = 0x7B3A
+0x939E = 0x7B3B
+0x93A1 = 0x7B35
+0x93C1 = 0x7B40
+0x93C7 = 0x7B41
+0x93DC = 0x7B42
+0x93E2 = 0x7B43
+0x93E7 = 0x7B44
+0x93F1 = 0x7B3F
+0x93F5 = 0x7B3C
+0x93FB = 0x7B49
+0x9409 = 0x7B45
+0x940F = 0x7B46
+0x9416 = 0x7B47
+0x9417 = 0x7B48
+0x9432 = 0x7B4A
+0x9434 = 0x7B4B
+0x943B = 0x7B4C
+0x9445 = 0x7B4D
+0x946D = 0x7B50
+0x946F = 0x7B51
+0x9578 = 0x7B52
+0x9579 = 0x7B53
+0x9586 = 0x7B54
+0x958C = 0x7B55
+0x958D = 0x7B56
+0x95AB = 0x7B58
+0x95B4 = 0x7B59
+0x95C8 = 0x7B5B
+0x961D = 0x7A25
+0x962C = 0x7B5E
+0x9633 = 0x7B5F
+0x9634 = 0x7B60
+0x963C = 0x7B62
+0x9641 = 0x7B63
+0x9661 = 0x7B64
+0x9682 = 0x7B66
+0x969A = 0x7B68
+0x96A9 = 0x7B6B
+0x96AF = 0x7B6C
+0x96B3 = 0x7B6D
+0x96BA = 0x7B6E
+0x96BD = 0x7B6F
+0x96D8 = 0x7B72
+0x96DA = 0x7B73
+0x96DD = 0x7B74
+0x9714 = 0x7B76
+0x9723 = 0x7B77
+0x9736 = 0x7B79
+0x9741 = 0x7B7A
+0x9747 = 0x7B7B
+0x9755 = 0x7B7C
+0x9757 = 0x7B7D
+0x975B = 0x7B7E
+0x976A = 0x7C21
+0x9796 = 0x7C24
+0x979A = 0x7C25
+0x979E = 0x7C26
+0x97A2 = 0x7C27
+0x97B1 = 0x7C28
+0x97B2 = 0x7C29
+0x97BE = 0x7C2A
+0x97CC = 0x7C2B
+0x97D1 = 0x7C2C
+0x97D4 = 0x7C2D
+0x97D8 = 0x7C2E
+0x97D9 = 0x7C2F
+0x97E1 = 0x7C30
+0x97F1 = 0x7C31
+0x9804 = 0x7C32
+0x980D = 0x7C33
+0x980E = 0x7C34
+0x9814 = 0x7C35
+0x9816 = 0x7C36
+0x9823 = 0x7C39
+0x9825 = 0x7C3C
+0x9832 = 0x7C3A
+0x9833 = 0x7C3B
+0x9847 = 0x7C3D
+0x9866 = 0x7C3E
+0x98AB = 0x7C3F
+0x98AD = 0x7C40
+0x98B0 = 0x7C41
+0x98B7 = 0x7C43
+0x98B8 = 0x7C44
+0x98BB = 0x7C45
+0x98BC = 0x7C46
+0x98BF = 0x7C47
+0x98C2 = 0x7C48
+0x98C7 = 0x7C49
+0x98CB = 0x7C4A
+0x98E0 = 0x7C4B
+0x98E1 = 0x7C4D
+0x98E3 = 0x7C4E
+0x98E5 = 0x7C4F
+0x98EA = 0x7C50
+0x98F0 = 0x7C51
+0x98F1 = 0x7C52
+0x98F3 = 0x7C53
+0x9908 = 0x7C54
+0x9916 = 0x7C57
+0x9917 = 0x7C58
+0x991A = 0x7C5A
+0x991B = 0x7C5B
+0x991C = 0x7C5C
+0x9931 = 0x7C5E
+0x9932 = 0x7C5F
+0x9933 = 0x7C60
+0x993A = 0x7C61
+0x993B = 0x7C62
+0x993C = 0x7C63
+0x9940 = 0x7C64
+0x9941 = 0x7C65
+0x9946 = 0x7C66
+0x994D = 0x7C67
+0x994E = 0x7C68
+0x995C = 0x7C69
+0x995F = 0x7C6A
+0x9960 = 0x7C6B
+0x99A3 = 0x7C6C
+0x99A6 = 0x7C6D
+0x99B9 = 0x7C6E
+0x99BD = 0x7C6F
+0x99BF = 0x7C70
+0x99C3 = 0x7C71
+0x99C9 = 0x7C72
+0x99D4 = 0x7C73
+0x99D9 = 0x7C74
+0x99DE = 0x7C75
+0x99F0 = 0x7C77
+0x99F9 = 0x7C78
+0x99FC = 0x7C79
+0x9A0A = 0x7C7A
+0x9A11 = 0x7C7B
+0x9A16 = 0x7C7C
+0x9A1A = 0x7C7D
+0x9A20 = 0x7C7E
+0x9A31 = 0x7D21
+0x9A36 = 0x7D22
+0x9A44 = 0x7D23
+0x9A4C = 0x7D24
+0x9A58 = 0x7D25
+0x9AAF = 0x7D27
+0x9AB7 = 0x7D29
+0x9AB9 = 0x7D2B
+0x9AC6 = 0x7D2D
+0x9AD0 = 0x7D2E
+0x9AD2 = 0x7D2F
+0x9AD5 = 0x7D30
+0x9ADC = 0x7D32
+0x9AE0 = 0x7D33
+0x9AE5 = 0x7D34
+0x9AE9 = 0x7D35
+0x9B03 = 0x7D36
+0x9B0C = 0x7D37
+0x9B10 = 0x7D38
+0x9B12 = 0x7D39
+0x9B16 = 0x7D3A
+0x9B1C = 0x7D3B # 0x9B1D
+0x9B2B = 0x7D3C
+0x9B33 = 0x7D3D
+0x9B3D = 0x7D3E
+0x9B4B = 0x7D40
+0x9B63 = 0x7D41
+0x9B65 = 0x7D42
+0x9B6B = 0x7D43
+0x9B6C = 0x7D44
+0x9B73 = 0x7D45
+0x9B76 = 0x7D46
+0x9B77 = 0x7D47
+0x9BA6 = 0x7D48
+0x9BAC = 0x7D49
+0x9BB1 = 0x7D4A
+0x9BB2 = 0x7D4D
+0x9BB8 = 0x7D4E
+0x9BBE = 0x7D4F
+0x9BC7 = 0x7D50
+0x9BD8 = 0x7D52
+0x9BDD = 0x7D53
+0x9BE7 = 0x7D54
+0x9BEA = 0x7D55
+0x9BEB = 0x7D56
+0x9BEE = 0x7D58
+0x9BEF = 0x7D57
+0x9BF3 = 0x7D51
+0x9BF7 = 0x7D5C
+0x9BFA = 0x7D5A
+0x9C16 = 0x7D5E
+0x9C18 = 0x7D5F
+0x9C19 = 0x7D60
+0x9C1A = 0x7D61
+0x9C1D = 0x7D62
+0x9C22 = 0x7D63
+0x9C27 = 0x7D64
+0x9C29 = 0x7D65
+0x9C2A = 0x7D66
+0x9C31 = 0x7D68
+0x9C36 = 0x7D69
+0x9C37 = 0x7D6A
+0x9C45 = 0x7D6B
+0x9C49 = 0x7D6E
+0x9C4A = 0x7D6F
+0x9C54 = 0x7D71
+0x9C58 = 0x7D72
+0x9C5B = 0x7D73
+0x9C5C = 0x7D6C
+0x9C5D = 0x7D74
+0x9C5F = 0x7D75
+0x9C69 = 0x7D76
+0x9C6A = 0x7D77
+0x9C6B = 0x7D78
+0x9C6D = 0x7D79
+0x9C6E = 0x7D7A
+0x9C70 = 0x7D7B
+0x9C72 = 0x7D7C
+0x9C75 = 0x7D7D
+0x9C7A = 0x7D7E
+0x9CE6 = 0x7E21
+0x9CF2 = 0x7E22
+0x9D02 = 0x7E24
+0x9D0B = 0x7E23
+0x9D11 = 0x7E26
+0x9D17 = 0x7E27
+0x9D18 = 0x7E28
+0x9D32 = 0x7E2C
+0x9D42 = 0x7E2E
+0x9D4A = 0x7E2F
+0x9D5F = 0x7E30
+0x9D62 = 0x7E31
+0x9D69 = 0x7E33
+0x9D6B = 0x7E34
+0x9D73 = 0x7E36
+0x9D76 = 0x7E37
+0x9D77 = 0x7E38
+0x9D7E = 0x7E39
+0x9D84 = 0x7E3A
+0x9D8D = 0x7E3B
+0x9D99 = 0x7E3C
+0x9DA1 = 0x7E3D
+0x9DB5 = 0x7E3F
+0x9DB9 = 0x7E40
+0x9DBD = 0x7E41
+0x9DBF = 0x7E3E
+0x9DC3 = 0x7E42
+0x9DC7 = 0x7E43
+0x9DC9 = 0x7E44
+0x9DD6 = 0x7E45
+0x9DDA = 0x7E46
+0x9DDF = 0x7E47
+0x9DE0 = 0x7E48
+0x9DE3 = 0x7E49
+0x9DF4 = 0x7E4A
+0x9E02 = 0x7E4D
+0x9E0A = 0x7E4C
+0x9E0D = 0x7E4E
+0x9E19 = 0x7E4F
+0x9E1C = 0x7E50
+0x9E1D = 0x7E51
+0x9E7B = 0x7E52
+0x9E80 = 0x7E54
+0x9E85 = 0x7E55
+0x9E9B = 0x7E56
+0x9EA8 = 0x7E57
+0x9EBD = 0x7E59
+0x9EDF = 0x7E5B
+0x9EE7 = 0x7E5C
+0x9EEE = 0x7E5D
+0x9EFF = 0x7E5E
+0x9F02 = 0x7E5F
+0x9F03 = 0x7E61
+0x9F17 = 0x7E62
+0x9F19 = 0x7E63
+0x9F2F = 0x7E64
+0x9F37 = 0x7E65
+0x9F3A = 0x7E66
+0x9F3D = 0x7E67
+0x9F41 = 0x7E68
+0x9F45 = 0x7E69
+0x9F46 = 0x7E6A
+0x9F53 = 0x7E6B
+0x9F55 = 0x7E6C
+0x9F58 = 0x7E6D
+0x9F5D = 0x7E6F
+0x9F69 = 0x7E71
+0x9F6D = 0x7E73
+0x9F70 = 0x7E74
+0x9F75 = 0x7E75
+0xFA13 = 0x2E79
+0xFA20 = 0x7738
+0xFA21 = 0x7745
+0xFA24 = 0x796E
+0xFA49 = 0x7029
+0xFA58 = 0x7450
+0xFA5D = 0x7574
+0xFA5E = 0x7575
+0xFA66 = 0x7969
+END_MAP
diff --git a/enc/trans/JIS/UCS@SIP%JISX0213-1.src b/enc/trans/JIS/UCS@SIP%JISX0213-1.src
new file mode 100644
index 0000000000..f4469c60d7
--- /dev/null
+++ b/enc/trans/JIS/UCS@SIP%JISX0213-1.src
@@ -0,0 +1,56 @@
+# $NetBSD: UCS@SIP%JISX0213-1.src,v 1.1 2007/03/05 16:58:34 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"UCS:SIP/JISX0213-1"
+SRC_ZONE	0x000B - 0xA190
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+## Shift_JIS-2004 (JIS X 0213:2004) vs Unicode mapping table
+## 
+## Date: 12 Feb 2005 10:15:00 GMT
+## License:
+## 	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.
+## Note:
+## 	[1983]	JIS codepoint defined by JIS X 0208-1983
+## 	[1990]	JIS codepoint defined by JIS X 0208-1990
+## 	[2000]	JIS codepoint defined by JIS X 0213:2000
+## 	[2004]	JIS codepoint defined by JIS X 0213:2004
+## 	[Unicode3.1]	UCS codepoint defined by Unicode 3.1
+## 	[Unicode3.2]	UCS codepoint defined by Unicode 3.2
+## 	Fullwidth	UCS fullwidth form (U+Fxxx)
+## 	Windows 	Windows (CP932) mapping
+## 	Some 0213 character can't represent by one UCS character.
+## 	In this table, such characters are described as 'U+xxxx+xxxx'.
+## 
+0x000B = 0x2E22
+0x0B9F = 0x4F54
+0x123D = 0x2F42
+0x131B = 0x2F4C
+0x146E = 0x2F60
+0x16B4 = 0x4F63
+0x18BD = 0x2F7B
+0x1E34 = 0x4F6E
+0x31C4 = 0x753A
+0x35C4 = 0x7572
+0x373F = 0x7629
+0x3763 = 0x7632
+0x3CFE = 0x7660
+0x47F1 = 0x776C
+0x548E = 0x787E
+0x550E = 0x7929
+0x5771 = 0x7947
+0x59C4 = 0x7954
+0x5DA1 = 0x796E
+0x6AFF = 0x7A5D
+0x6E40 = 0x7B33
+0x70F4 = 0x7B49
+0x7684 = 0x7B6C
+0x8277 = 0x7C49
+0x83CD = 0x7C51
+0xA190 = 0x7E66
+END_MAP
diff --git a/enc/trans/JIS/UCS@SIP%JISX0213-2.src b/enc/trans/JIS/UCS@SIP%JISX0213-2.src
new file mode 100644
index 0000000000..7a33430ee9
--- /dev/null
+++ b/enc/trans/JIS/UCS@SIP%JISX0213-2.src
@@ -0,0 +1,307 @@
+# $NetBSD: UCS@SIP%JISX0213-2.src,v 1.1 2007/03/05 16:58:34 tnozaki Exp $
+
+TYPE		ROWCOL
+NAME		"UCS:SIP/JISX0213-2"
+SRC_ZONE	0x0089 - 0xA6B2
+OOB_MODE	INVALID
+DST_INVALID	0xFFFF
+DST_UNIT_BITS	16
+
+BEGIN_MAP
+## Shift_JIS-2004 (JIS X 0213:2004) vs Unicode mapping table
+## 
+## Date: 12 Feb 2005 10:15:00 GMT
+## License:
+## 	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.
+## Note:
+## 	[1983]	JIS codepoint defined by JIS X 0208-1983
+## 	[1990]	JIS codepoint defined by JIS X 0208-1990
+## 	[2000]	JIS codepoint defined by JIS X 0213:2000
+## 	[2004]	JIS codepoint defined by JIS X 0213:2004
+## 	[Unicode3.1]	UCS codepoint defined by Unicode 3.1
+## 	[Unicode3.2]	UCS codepoint defined by Unicode 3.2
+## 	Fullwidth	UCS fullwidth form (U+Fxxx)
+## 	Windows 	Windows (CP932) mapping
+## 	Some 0213 character can't represent by one UCS character.
+## 	In this table, such characters are described as 'U+xxxx+xxxx'.
+## 
+0x0089 = 0x2121
+0x00A2 = 0x212B
+0x00A4 = 0x212E
+0x01A2 = 0x2136
+0x0213 = 0x2146
+0x032B = 0x2170
+0x0371 = 0x2179
+0x0381 = 0x2177
+0x03F9 = 0x2322
+0x044A = 0x2325
+0x0509 = 0x2327
+0x05D6 = 0x2331
+0x0628 = 0x2332
+0x074F = 0x2338
+0x0807 = 0x233F
+0x083A = 0x2341
+0x08B9 = 0x234A
+0x097C = 0x2352
+0x099D = 0x2353
+0x0AD3 = 0x2359
+0x0B1D = 0x235C
+0x0D45 = 0x2377
+0x0DE1 = 0x242A
+0x0E64 = 0x243A
+0x0E6D = 0x2432
+0x0E95 = 0x2431
+0x0F5F = 0x243D
+0x1201 = 0x2459
+0x1255 = 0x245C
+0x1274 = 0x2463
+0x127B = 0x245E
+0x12D7 = 0x246B
+0x12E4 = 0x246A
+0x12FD = 0x2472
+0x1336 = 0x2474
+0x1344 = 0x2475
+0x13C4 = 0x2525
+0x146D = 0x2532
+0x15D7 = 0x253E
+0x1647 = 0x2547
+0x1706 = 0x2555
+0x1742 = 0x2556
+0x19C3 = 0x257E
+0x1C56 = 0x2830
+0x1D2D = 0x2837
+0x1D45 = 0x2838
+0x1D62 = 0x283B
+0x1D78 = 0x283A
+0x1D92 = 0x2845
+0x1D9C = 0x2840
+0x1DA1 = 0x283F
+0x1DB7 = 0x2848
+0x1DE0 = 0x284A
+0x1E33 = 0x284B
+0x1F1E = 0x285B
+0x1F76 = 0x2866
+0x1FFA = 0x286C
+0x217B = 0x2C22
+0x2218 = 0x7E53
+0x231E = 0x2C2B
+0x23AD = 0x2C30
+0x26F3 = 0x2C50
+0x285B = 0x2C65
+0x28AB = 0x2C6D
+0x298F = 0x2C72
+0x2AB8 = 0x2D24
+0x2B46 = 0x2D32
+0x2B4F = 0x2D29
+0x2B50 = 0x2D2A
+0x2BA6 = 0x2D35
+0x2C1D = 0x2D34
+0x2C24 = 0x2D39
+0x2DE1 = 0x2D56
+0x31B6 = 0x2E24
+0x31C3 = 0x2D7D
+0x31F5 = 0x2E23
+0x3372 = 0x2E3A
+0x33D0 = 0x2E42
+0x33D2 = 0x2E3D
+0x33D3 = 0x2E3C
+0x33D5 = 0x2E44
+0x33DA = 0x2E47
+0x33DF = 0x2E49
+0x33E4 = 0x2E43
+0x344A = 0x2E55
+0x344B = 0x2E57
+0x3451 = 0x2E56
+0x3465 = 0x2E5B
+0x34E4 = 0x2E77
+0x355A = 0x2E78
+0x3594 = 0x2F2A
+0x3638 = 0x2F42
+0x3639 = 0x2F3F
+0x363A = 0x2F43
+0x3647 = 0x2F40
+0x370C = 0x2F59
+0x371C = 0x2F4E
+0x3764 = 0x2F61
+0x37E7 = 0x2F6A
+0x37FF = 0x2F69
+0x3824 = 0x2F70
+0x383D = 0x2F75
+0x3A98 = 0x6E23
+0x3C7F = 0x6E34
+0x3D00 = 0x6E49
+0x3D0E = 0x7475
+0x3D40 = 0x6E5C
+0x3DD3 = 0x6E60
+0x3DF9 = 0x6E5F
+0x3DFA = 0x6E5E
+0x3F7E = 0x6F32
+0x4096 = 0x6F47
+0x4103 = 0x6F4D
+0x41C6 = 0x6F61
+0x41FE = 0x6F64
+0x43BC = 0x7022
+0x4629 = 0x7033
+0x46A5 = 0x7039
+0x4896 = 0x7053
+0x4A4D = 0x707B
+0x4B56 = 0x712E
+0x4B6F = 0x7130
+0x4C16 = 0x7135
+0x4D14 = 0x7144
+0x4E0E = 0x715D
+0x4E37 = 0x7161
+0x4E6A = 0x7166
+0x4E8B = 0x7169
+0x504A = 0x7175
+0x5055 = 0x7177
+0x5122 = 0x717A
+0x51A9 = 0x7221
+0x51CD = 0x7224
+0x51E5 = 0x7223
+0x521E = 0x7228
+0x524C = 0x722C
+0x542E = 0x723D
+0x54D9 = 0x7248
+0x55A7 = 0x725B
+0x57A9 = 0x7275
+0x57B4 = 0x7276
+0x59D4 = 0x7332
+0x5AE3 = 0x733E
+0x5AE4 = 0x733D
+0x5AF1 = 0x7340
+0x5BB2 = 0x7352
+0x5C4B = 0x735D
+0x5C64 = 0x735E
+0x5E2E = 0x7373
+0x5E56 = 0x7374
+0x5E62 = 0x7377
+0x5E65 = 0x7375
+0x5EC2 = 0x737D
+0x5ED8 = 0x737B
+0x5EE8 = 0x7422
+0x5F23 = 0x7424
+0x5F5C = 0x7427
+0x5FD4 = 0x742F
+0x5FE0 = 0x742E
+0x5FFB = 0x7435
+0x600C = 0x7434
+0x6017 = 0x743D
+0x6060 = 0x7442
+0x60ED = 0x744F
+0x6270 = 0x7469
+0x6286 = 0x746B
+0x634C = 0x7472
+0x6402 = 0x7479
+0x667E = 0x7535
+0x66B0 = 0x753A
+0x671D = 0x7546
+0x68DD = 0x7556
+0x68EA = 0x7558
+0x6951 = 0x755A
+0x696F = 0x755D
+0x69DD = 0x755F
+0x6A1E = 0x7563
+0x6A58 = 0x756A
+0x6A8C = 0x7570
+0x6AB7 = 0x7573
+0x6C29 = 0x2544
+0x6C73 = 0x7644
+0x6CDD = 0x764E
+0x6E65 = 0x765D
+0x6F94 = 0x7675
+0x6FF6 = 0x7721
+0x6FF7 = 0x7722
+0x6FF8 = 0x767E
+0x710D = 0x7733
+0x7139 = 0x7736
+0x73DA = 0x7765
+0x73DB = 0x7764
+0x73FE = 0x776B
+0x7410 = 0x776E
+0x7449 = 0x7773
+0x7614 = 0x782A
+0x7615 = 0x7829
+0x7631 = 0x782C
+0x7693 = 0x7834
+0x770E = 0x783C
+0x7723 = 0x783E
+0x7752 = 0x7842
+0x7985 = 0x7856
+0x7A84 = 0x7863
+0x7BB3 = 0x7877
+0x7BBE = 0x7879
+0x7BC7 = 0x787A
+0x7CB8 = 0x7925
+0x7DA0 = 0x792F
+0x7E10 = 0x7932
+0x7FB7 = 0x7939
+0x808A = 0x7942
+0x80BB = 0x7948
+0x8282 = 0x7959
+0x82F3 = 0x795E
+0x840C = 0x7966
+0x8455 = 0x796B
+0x856B = 0x797A
+0x85C8 = 0x797E
+0x85C9 = 0x7A21
+0x86D7 = 0x7A2C
+0x86FA = 0x7A2F
+0x8946 = 0x7A50
+0x8949 = 0x7A4F
+0x896B = 0x7A57
+0x8987 = 0x7A65
+0x8988 = 0x7A66
+0x89BA = 0x7A71
+0x89BB = 0x7A72
+0x8A1E = 0x7A7E
+0x8A29 = 0x7B21
+0x8A43 = 0x7B2D
+0x8A71 = 0x7B2C
+0x8A99 = 0x7B36
+0x8ACD = 0x7B37
+0x8ADD = 0x7B3E
+0x8AE4 = 0x7B3D
+0x8BC1 = 0x7B4E
+0x8BEF = 0x7B4F
+0x8D10 = 0x7B57
+0x8D71 = 0x7B5A
+0x8DFB = 0x7B5C
+0x8E1F = 0x7B5D
+0x8E36 = 0x7B61
+0x8E89 = 0x7B65
+0x8EEB = 0x7B67
+0x8F32 = 0x7B69
+0x8FF8 = 0x7B71
+0x92A0 = 0x7C22
+0x92B1 = 0x7C23
+0x9490 = 0x7C38
+0x95CF = 0x7C42
+0x967F = 0x7C4C
+0x96F0 = 0x7C56
+0x9719 = 0x7C59
+0x9750 = 0x7C5D
+0x98C6 = 0x7C76
+0x9A72 = 0x7D2C
+0x9DDB = 0x7D4B
+0x9E15 = 0x7D59
+0x9E3D = 0x7D4C
+0x9E49 = 0x7D5D
+0x9E8A = 0x7D5B
+0x9EC4 = 0x7D67
+0x9EDB = 0x7D70
+0x9EE9 = 0x7D6D
+0x9FCE = 0x7E25
+0xA01A = 0x7E2B
+0xA02F = 0x7E29
+0xA082 = 0x7E35
+0xA0F9 = 0x7E32
+0xA38C = 0x7E58
+0xA437 = 0x7E5A
+0xA5F1 = 0x7E6E
+0xA602 = 0x7E70
+0xA61A = 0x7E72
+0xA6B2 = 0x7E76
+END_MAP
diff --git a/enc/trans/big5.trans b/enc/trans/big5.trans
index 9dacfd1f7e..c85ada3731 100644
--- a/enc/trans/big5.trans
+++ b/enc/trans/big5.trans
@@ -26,8 +26,7 @@
 
 <%= transcode_generated_code %>
 
-void
-Init_big5(void)
+TRANS_INIT(big5)
 {
 <%= transcode_register_code %>
 }
diff --git a/enc/trans/cesu_8.trans b/enc/trans/cesu_8.trans
new file mode 100644
index 0000000000..4e17b1ddbb
--- /dev/null
+++ b/enc/trans/cesu_8.trans
@@ -0,0 +1,85 @@
+#include "transcode_data.h"
+
+<%
+  map = {}
+  map["{00-7f}"] = :nomap
+  map["{c2-df}{80-bf}"] = :nomap
+  map["e0{a0-bf}{80-bf}"] = :nomap
+  map["{e1-ec}{80-bf}{80-bf}"] = :nomap
+  map["ed{80-9f}{80-bf}"] = :nomap
+  map["{ee-ef}{80-bf}{80-bf}"] = :nomap
+  map["ed{a0-af}{80-bf}ed{b0-bf}{80-bf}"] = :func_so # surrogate pairs
+  transcode_generate_node(ActionMap.parse(map), "from_CESU_8")
+
+  map = {}
+  map["{00-7f}"] = :nomap
+  map["{c2-df}{80-bf}"] = :nomap
+  map["e0{a0-bf}{80-bf}"] = :nomap
+  map["{e1-ec}{80-bf}{80-bf}"] = :nomap
+  map["ed{80-9f}{80-bf}"] = :nomap
+  map["{ee-ef}{80-bf}{80-bf}"] = :nomap
+  map["f0{90-bf}{80-bf}{80-bf}"] = :func_so      # planes 1-3
+  map["{f1-f3}{80-bf}{80-bf}{80-bf}"] = :func_so # planes 4-15
+  map["f4{80-8f}{80-bf}{80-bf}"] = :func_so      # plane 16
+  transcode_generate_node(ActionMap.parse(map), "to_CESU_8")
+%>
+
+<%= transcode_generated_code %>
+
+static ssize_t
+fun_so_from_cesu_8(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    unsigned int scalar = ( ((s[1]&0x0F)<<16) | ((s[2]&0x3F)<<10)
+                          | ((s[4]&0x0F)<< 6) |  (s[5]&0x3F)
+                          ) + 0x10000;
+    o[0] = 0xF0 |  (scalar>>18);
+    o[1] = 0x80 | ((scalar>>12)&0x3F);
+    o[2] = 0x80 | ((scalar>> 6)&0x3F);
+    o[3] = 0x80 | ( scalar     &0x3F);
+    return 4;
+}
+
+static ssize_t
+fun_so_to_cesu_8(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    unsigned int scalar = ((s[0]&0x07)<<18) | ((s[1]&0x3F)<<12)
+                        | ((s[2]&0x3F)<< 6) |  (s[3]&0x3F);
+    scalar -= 0x10000;
+    o[0] = 0xED;
+    o[1] = 0xA0 |  (scalar>>16);
+    o[2] = 0x80 | ((scalar>>10)&0x3F);
+    o[3] = 0xED;
+    o[4] = 0xB0 | ((scalar>> 6)&0x0F);
+    o[5] = 0x80 | (scalar      &0x3F);
+    return 6;
+}
+
+static const rb_transcoder
+rb_from_CESU_8 = {
+    "CESU-8", "UTF-8", from_CESU_8,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    6, /* max_input */
+    4, /* max_output */
+    asciicompat_decoder, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_from_cesu_8
+};
+
+static const rb_transcoder
+rb_to_CESU_8 = {
+    "UTF-8", "CESU-8", to_CESU_8,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    4, /* max_input */
+    6, /* max_output */
+    asciicompat_encoder, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_to_cesu_8
+};
+
+TRANS_INIT(cesu_8)
+{
+    rb_register_transcoder(&rb_from_CESU_8);
+    rb_register_transcoder(&rb_to_CESU_8);
+}
diff --git a/enc/trans/chinese.trans b/enc/trans/chinese.trans
index 0662a3bebc..282c91aba7 100644
--- a/enc/trans/chinese.trans
+++ b/enc/trans/chinese.trans
@@ -25,8 +25,7 @@
 
 <%= transcode_generated_code %>
 
-void
-Init_chinese(void)
+TRANS_INIT(chinese)
 {
 <%= transcode_register_code %>
 }
diff --git a/enc/trans/ebcdic.trans b/enc/trans/ebcdic.trans
new file mode 100644
index 0000000000..c5b5dfec87
--- /dev/null
+++ b/enc/trans/ebcdic.trans
@@ -0,0 +1,278 @@
+#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/emoji.trans b/enc/trans/emoji.trans
index 1cf13743a2..25d9fdd4d8 100644
--- a/enc/trans/emoji.trans
+++ b/enc/trans/emoji.trans
@@ -30,8 +30,7 @@
 
 <%= transcode_generated_code %>
 
-void
-Init_emoji(void)
+TRANS_INIT(emoji)
 {
 <%= transcode_register_code %>
 }
diff --git a/enc/trans/emoji_iso2022_kddi.trans b/enc/trans/emoji_iso2022_kddi.trans
index ccf3139d3c..ea180c1e42 100644
--- a/enc/trans/emoji_iso2022_kddi.trans
+++ b/enc/trans/emoji_iso2022_kddi.trans
@@ -208,8 +208,7 @@ rb_iso2022jp_kddi_encoder = {
     iso2022jp_kddi_encoder_reset_sequence_size, finish_iso2022jp_kddi_encoder
 };
 
-void
-Init_emoji_iso2022_kddi(void)
+TRANS_INIT(emoji_iso2022_kddi)
 {
     rb_register_transcoder(&rb_iso2022jp_kddi_decoder);
     rb_register_transcoder(&rb_iso2022jp_kddi_encoder);
diff --git a/enc/trans/emoji_sjis_docomo.trans b/enc/trans/emoji_sjis_docomo.trans
index 36e6e20339..5dd9c7a1e3 100644
--- a/enc/trans/emoji_sjis_docomo.trans
+++ b/enc/trans/emoji_sjis_docomo.trans
@@ -26,8 +26,7 @@
 
 <%= transcode_generated_code %>
 
-void
-Init_emoji_sjis_docomo(void)
+TRANS_INIT(emoji_sjis_docomo)
 {
 <%= transcode_register_code %>
 }
diff --git a/enc/trans/emoji_sjis_kddi.trans b/enc/trans/emoji_sjis_kddi.trans
index 654bed134e..6df62f14d1 100644
--- a/enc/trans/emoji_sjis_kddi.trans
+++ b/enc/trans/emoji_sjis_kddi.trans
@@ -27,8 +27,7 @@
 
 <%= transcode_generated_code %>
 
-void
-Init_emoji_sjis_kddi(void)
+TRANS_INIT(emoji_sjis_kddi)
 {
 <%= transcode_register_code %>
 }
diff --git a/enc/trans/emoji_sjis_softbank.trans b/enc/trans/emoji_sjis_softbank.trans
index c152d99c76..c520035347 100644
--- a/enc/trans/emoji_sjis_softbank.trans
+++ b/enc/trans/emoji_sjis_softbank.trans
@@ -26,8 +26,7 @@
 
 <%= transcode_generated_code %>
 
-void
-Init_emoji_sjis_softbank(void)
+TRANS_INIT(emoji_sjis_softbank)
 {
 <%= transcode_register_code %>
 }
diff --git a/enc/trans/escape.trans b/enc/trans/escape.trans
index a2fbebac33..c76ffa0e06 100644
--- a/enc/trans/escape.trans
+++ b/enc/trans/escape.trans
@@ -6,19 +6,19 @@
   end
 
   transcode_tblgen("", "amp_escape", [
-    ["{00-25,27-FF}", :nomap], 
+    ["{00-25,27-FF}", :nomap],
     ["26", hexstr("&amp;")]
   ], nil)
 
   transcode_tblgen("", "xml_text_escape", [
-    ["{00-25,27-3B,3D,3F-FF}", :nomap], 
+    ["{00-25,27-3B,3D,3F-FF}", :nomap],
     ["26", hexstr("&amp;")],
     ["3C", hexstr("&lt;")],
     ["3E", hexstr("&gt;")]
   ], nil)
 
   transcode_tblgen("", "xml_attr_content_escape", [
-    ["{00-21,23-25,27-3B,3D,3F-FF}", :nomap], 
+    ["{00-21,23-25,27-3B,3D,3F-FF}", :nomap],
     ["22", hexstr("&quot;")],
     ["26", hexstr("&amp;")],
     ["3C", hexstr("&lt;")],
@@ -85,8 +85,7 @@ rb_escape_xml_attr_quote = {
     escape_xml_attr_quote_finish
 };
 
-void
-Init_escape(void)
+TRANS_INIT(escape)
 {
 <%= transcode_register_code %>
     rb_register_transcoder(&rb_escape_xml_attr_quote);
diff --git a/enc/trans/euckr-tbl.rb b/enc/trans/euckr-tbl.rb
index 773cd90122..4ce8521a8a 100644
--- a/enc/trans/euckr-tbl.rb
+++ b/enc/trans/euckr-tbl.rb
@@ -162,6 +162,8 @@ EUCKR_TO_UCS_TBL = [
   ["A2E3",0x33C2],
   ["A2E4",0x33D8],
   ["A2E5",0x2121],
+  ["A2E6",0x20AC],
+  ["A2E7",0x00AE],
   ["A3A1",0xFF01],
   ["A3A2",0xFF02],
   ["A3A3",0xFF03],
diff --git a/enc/trans/gb18030.trans b/enc/trans/gb18030.trans
index c7da4c64b4..f42f8fd2d5 100644
--- a/enc/trans/gb18030.trans
+++ b/enc/trans/gb18030.trans
@@ -2,9 +2,9 @@
 
 <%
   require "gb18030-tbl"
-  
+
   def linear(code)
-    bytes = [code].pack('H8').unpack 'C4' 
+    bytes = [code].pack('H8').unpack 'C4'
     ((bytes[0]*10+bytes[1])*126+bytes[2])*10+bytes[3]
   end
 
@@ -31,7 +31,7 @@
       code
     end
   end
-  
+
   def calculate_differences_utf_gb(table)
     table_rev = table.map{|a,b| [b,a]}
     table_rev.collect do |code|
@@ -123,7 +123,7 @@ fun_sio_to_gb18030(void *statep, const unsigned char *s, size_t l, VALUE info, u
 {
     unsigned int diff = (unsigned int)(info >> 8);
     unsigned int u;    /* Unicode Scalar Value */
-    
+
     u = ((s[0]&0x0F)<<12) | ((s[1]&0x3F)<<6) | (s[2]&0x3F);
 
     if (diff & 0x20000) { /* GB18030 4 bytes */
@@ -176,8 +176,7 @@ rb_to_GB18030 = {
 };
 
 
-void
-Init_gb18030(void)
+TRANS_INIT(gb18030)
 {
     rb_register_transcoder(&rb_from_GB18030);
     rb_register_transcoder(&rb_to_GB18030);
diff --git a/enc/trans/gbk.trans b/enc/trans/gbk.trans
index 0df148198e..3c2cf0c1af 100644
--- a/enc/trans/gbk.trans
+++ b/enc/trans/gbk.trans
@@ -9,8 +9,7 @@
 
 <%= transcode_generated_code %>
 
-void
-Init_gbk(void)
+TRANS_INIT(gbk)
 {
 <%= transcode_register_code %>
 }
diff --git a/enc/trans/iso-8859-16-tbl.rb b/enc/trans/iso-8859-16-tbl.rb
new file mode 100644
index 0000000000..27f1e49935
--- /dev/null
+++ b/enc/trans/iso-8859-16-tbl.rb
@@ -0,0 +1,98 @@
+ISO_8859_16_TO_UCS_TBL = [
+  ["A0", 0x00A0],
+  ["A1", 0x0104],
+  ["A2", 0x0105],
+  ["A3", 0x0141],
+  ["A4", 0x20AC],
+  ["A5", 0x201E],
+  ["A6", 0x0160],
+  ["A7", 0x00A7],
+  ["A8", 0x0161],
+  ["A9", 0x00A9],
+  ["AA", 0x0218],
+  ["AB", 0x00AB],
+  ["AC", 0x0179],
+  ["AD", 0x00AD],
+  ["AE", 0x017A],
+  ["AF", 0x017B],
+  ["B0", 0x00B0],
+  ["B1", 0x00B1],
+  ["B2", 0x010C],
+  ["B3", 0x0142],
+  ["B4", 0x017D],
+  ["B5", 0x201D],
+  ["B6", 0x00B6],
+  ["B7", 0x00B7],
+  ["B8", 0x017E],
+  ["B9", 0x010D],
+  ["BA", 0x0219],
+  ["BB", 0x00BB],
+  ["BC", 0x0152],
+  ["BD", 0x0153],
+  ["BE", 0x0178],
+  ["BF", 0x017C],
+  ["C0", 0x00C0],
+  ["C1", 0x00C1],
+  ["C2", 0x00C2],
+  ["C3", 0x0102],
+  ["C4", 0x00C4],
+  ["C5", 0x0106],
+  ["C6", 0x00C6],
+  ["C7", 0x00C7],
+  ["C8", 0x00C8],
+  ["C9", 0x00C9],
+  ["CA", 0x00CA],
+  ["CB", 0x00CB],
+  ["CC", 0x00CC],
+  ["CD", 0x00CD],
+  ["CE", 0x00CE],
+  ["CF", 0x00CF],
+  ["D0", 0x0110],
+  ["D1", 0x0143],
+  ["D2", 0x00D2],
+  ["D3", 0x00D3],
+  ["D4", 0x00D4],
+  ["D5", 0x0150],
+  ["D6", 0x00D6],
+  ["D7", 0x015A],
+  ["D8", 0x0170],
+  ["D9", 0x00D9],
+  ["DA", 0x00DA],
+  ["DB", 0x00DB],
+  ["DC", 0x00DC],
+  ["DD", 0x0118],
+  ["DE", 0x021A],
+  ["DF", 0x00DF],
+  ["E0", 0x00E0],
+  ["E1", 0x00E1],
+  ["E2", 0x00E2],
+  ["E3", 0x0103],
+  ["E4", 0x00E4],
+  ["E5", 0x0107],
+  ["E6", 0x00E6],
+  ["E7", 0x00E7],
+  ["E8", 0x00E8],
+  ["E9", 0x00E9],
+  ["EA", 0x00EA],
+  ["EB", 0x00EB],
+  ["EC", 0x00EC],
+  ["ED", 0x00ED],
+  ["EE", 0x00EE],
+  ["EF", 0x00EF],
+  ["F0", 0x0111],
+  ["F1", 0x0144],
+  ["F2", 0x00F2],
+  ["F3", 0x00F3],
+  ["F4", 0x00F4],
+  ["F5", 0x0151],
+  ["F6", 0x00F6],
+  ["F7", 0x015B],
+  ["F8", 0x0171],
+  ["F9", 0x00F9],
+  ["FA", 0x00FA],
+  ["FB", 0x00FB],
+  ["FC", 0x00FC],
+  ["FD", 0x0119],
+  ["FE", 0x021B],
+  ["FF", 0x00FF],
+]
diff --git a/enc/trans/iso2022.trans b/enc/trans/iso2022.trans
index 3f40cce3c8..a441f1596d 100644
--- a/enc/trans/iso2022.trans
+++ b/enc/trans/iso2022.trans
@@ -553,8 +553,7 @@ rb_cp50220_encoder = {
     iso2022jp_encoder_reset_sequence_size, finish_cp50220_encoder
 };
 
-void
-Init_iso2022(void)
+TRANS_INIT(iso2022)
 {
     rb_register_transcoder(&rb_iso2022jp_decoder);
     rb_register_transcoder(&rb_iso2022jp_encoder);
diff --git a/enc/trans/japanese.trans b/enc/trans/japanese.trans
index ce5d0bb70f..7ff024fa8d 100644
--- a/enc/trans/japanese.trans
+++ b/enc/trans/japanese.trans
@@ -90,8 +90,7 @@ rb_sjis2eucjp = {
     NULL, NULL, NULL, fun_so_sjis2eucjp
 };
 
-void
-Init_japanese(void)
+TRANS_INIT(japanese)
 {
     rb_register_transcoder(&rb_eucjp2sjis);
     rb_register_transcoder(&rb_sjis2eucjp);
diff --git a/enc/trans/japanese_euc.trans b/enc/trans/japanese_euc.trans
index a976fe57d3..d96f69feda 100644
--- a/enc/trans/japanese_euc.trans
+++ b/enc/trans/japanese_euc.trans
@@ -18,6 +18,12 @@
   citrus_decode_mapsrc("euc", 0x8080, "JISX0208VDC:NEC/UCS,CP932VDC:NEC_IBM/UCS,JISX0208:MS/UCS") +
   citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS")
 
+  transcode_tblgen "EUC-JIS-2004", "UTF-8",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("euc", 0x8080, "JISX0208:1990/UCS,JISX0213-1/UCS@BMP,JISX0213-1/UCS@SIP") +
+  citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS") +
+  citrus_decode_mapsrc("euc", 0x8000, "JISX0213-2/UCS@BMP,JISX0213-2/UCS@SIP")
+
 
   transcode_tblgen "UTF-8", "EUC-JP",
   [["{00-7f}", :nomap]] +
@@ -35,12 +41,17 @@
   [["{00-7f}", :nomap]] +
   citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:MS,UCS/JISX0208VDC:NEC,UCS/CP932VDC:NEC_IBM") +
   citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA")
+
+  transcode_tblgen "UTF-8", "EUC-JIS-2004",
+  [["{00-7f}", :nomap]] +
+  citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:1990,UCS@BMP/JISX0213-1,UCS@SIP/JISX0213-1") +
+  citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA") +
+  citrus_decode_mapsrc("euc", 0x8000, "UCS@BMP/JISX0213-2,UCS@SIP/JISX0213-2")
 %>
 
 <%= transcode_generated_code %>
 
-void
-Init_japanese_euc(void)
+TRANS_INIT(japanese_euc)
 {
 <%= transcode_register_code %>
 }
diff --git a/enc/trans/japanese_sjis.trans b/enc/trans/japanese_sjis.trans
index 00eace27a3..8e1e13056d 100644
--- a/enc/trans/japanese_sjis.trans
+++ b/enc/trans/japanese_sjis.trans
@@ -27,8 +27,7 @@
 
 <%= transcode_generated_code %>
 
-void
-Init_japanese_sjis(void)
+TRANS_INIT(japanese_sjis)
 {
 <%= transcode_register_code %>
 }
diff --git a/enc/trans/korean.trans b/enc/trans/korean.trans
index ef1cdfcb8e..fda1a3eeda 100644
--- a/enc/trans/korean.trans
+++ b/enc/trans/korean.trans
@@ -12,8 +12,7 @@
 
 <%= transcode_generated_code %>
 
-void
-Init_korean(void)
+TRANS_INIT(korean)
 {
 <%= transcode_register_code %>
 }
diff --git a/enc/trans/single_byte.trans b/enc/trans/single_byte.trans
index 1bf1001720..cf521bed38 100644
--- a/enc/trans/single_byte.trans
+++ b/enc/trans/single_byte.trans
@@ -18,15 +18,12 @@
   #   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")
-    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
+    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] }])
   end
 
   transcode_tblgen_singlebyte "ISO-8859-1"
@@ -43,6 +40,7 @@
   transcode_tblgen_singlebyte "ISO-8859-13"
   transcode_tblgen_singlebyte "ISO-8859-14"
   transcode_tblgen_singlebyte "ISO-8859-15"
+  transcode_tblgen_singlebyte "ISO-8859-16"
   transcode_tblgen_singlebyte "WINDOWS-874"
   transcode_tblgen_singlebyte "WINDOWS-1250"
   transcode_tblgen_singlebyte "WINDOWS-1251"
@@ -83,8 +81,7 @@
 
 <%= transcode_generated_code %>
 
-void
-Init_single_byte(void)
+TRANS_INIT(single_byte)
 {
 <%= transcode_register_code %>
 }
diff --git a/enc/trans/utf8_mac-tbl.rb b/enc/trans/utf8_mac-tbl.rb
index f43478bd3e..80bd049114 100644
--- a/enc/trans/utf8_mac-tbl.rb
+++ b/enc/trans/utf8_mac-tbl.rb
@@ -1,856 +1,23099 @@
-# http://developer.apple.com/technotes/tn/tn1150table.html
 MAC_DECOMPOSE_TBL = [
+  ["cdbe", "3b"],
   ["c380", "41cc80"],
   ["c381", "41cc81"],
   ["c382", "41cc82"],
+  ["e1baa6", "41cc82cc80"],
+  ["e1baa6", "c382cc80"],
+  ["e1baa4", "41cc82cc81"],
+  ["e1baa4", "c382cc81"],
+  ["e1baaa", "41cc82cc83"],
+  ["e1baaa", "c382cc83"],
+  ["e1baa8", "41cc82cc89"],
+  ["e1baa8", "c382cc89"],
   ["c383", "41cc83"],
-  ["c384", "41cc88"],
-  ["c385", "41cc8a"],
-  ["c387", "43cca7"],
-  ["c388", "45cc80"],
-  ["c389", "45cc81"],
-  ["c38a", "45cc82"],
-  ["c38b", "45cc88"],
-  ["c38c", "49cc80"],
-  ["c38d", "49cc81"],
-  ["c38e", "49cc82"],
-  ["c38f", "49cc88"],
-  ["c391", "4ecc83"],
-  ["c392", "4fcc80"],
-  ["c393", "4fcc81"],
-  ["c394", "4fcc82"],
-  ["c395", "4fcc83"],
-  ["c396", "4fcc88"],
-  ["c399", "55cc80"],
-  ["c39a", "55cc81"],
-  ["c39b", "55cc82"],
-  ["c39c", "55cc88"],
-  ["c39d", "59cc81"],
-  ["c3a0", "61cc80"],
-  ["c3a1", "61cc81"],
-  ["c3a2", "61cc82"],
-  ["c3a3", "61cc83"],
-  ["c3a4", "61cc88"],
-  ["c3a5", "61cc8a"],
-  ["c3a7", "63cca7"],
-  ["c3a8", "65cc80"],
-  ["c3a9", "65cc81"],
-  ["c3aa", "65cc82"],
-  ["c3ab", "65cc88"],
-  ["c3ac", "69cc80"],
-  ["c3ad", "69cc81"],
-  ["c3ae", "69cc82"],
-  ["c3af", "69cc88"],
-  ["c3b1", "6ecc83"],
-  ["c3b2", "6fcc80"],
-  ["c3b3", "6fcc81"],
-  ["c3b4", "6fcc82"],
-  ["c3b5", "6fcc83"],
-  ["c3b6", "6fcc88"],
-  ["c3b9", "75cc80"],
-  ["c3ba", "75cc81"],
-  ["c3bb", "75cc82"],
-  ["c3bc", "75cc88"],
-  ["c3bd", "79cc81"],
-  ["c3bf", "79cc88"],
   ["c480", "41cc84"],
-  ["c481", "61cc84"],
   ["c482", "41cc86"],
-  ["c483", "61cc86"],
+  ["e1bab0", "41cc86cc80"],
+  ["e1bab0", "c482cc80"],
+  ["e1baae", "41cc86cc81"],
+  ["e1baae", "c482cc81"],
+  ["e1bab4", "41cc86cc83"],
+  ["e1bab4", "c482cc83"],
+  ["e1bab2", "41cc86cc89"],
+  ["e1bab2", "c482cc89"],
+  ["c8a6", "41cc87"],
+  ["c7a0", "41cc87cc84"],
+  ["c7a0", "c8a6cc84"],
+  ["c384", "41cc88"],
+  ["c79e", "41cc88cc84"],
+  ["c79e", "c384cc84"],
+  ["e1baa2", "41cc89"],
+  ["c385", "41cc8a"],
+  ["c7ba", "41cc8acc81"],
+  ["c7ba", "c385cc81"],
+  ["c78d", "41cc8c"],
+  ["c880", "41cc8f"],
+  ["c882", "41cc91"],
+  ["e1baa0", "41cca3"],
+  ["e1baac", "41cca3cc82"],
+  ["e1baac", "e1baa0cc82"],
+  ["e1bab6", "41cca3cc86"],
+  ["e1bab6", "e1baa0cc86"],
+  ["e1b880", "41cca5"],
   ["c484", "41cca8"],
-  ["c485", "61cca8"],
+  ["e1b882", "42cc87"],
+  ["e1b884", "42cca3"],
+  ["e1b886", "42ccb1"],
   ["c486", "43cc81"],
-  ["c487", "63cc81"],
   ["c488", "43cc82"],
-  ["c489", "63cc82"],
   ["c48a", "43cc87"],
-  ["c48b", "63cc87"],
   ["c48c", "43cc8c"],
-  ["c48d", "63cc8c"],
+  ["c387", "43cca7"],
+  ["e1b888", "43cca7cc81"],
+  ["e1b888", "c387cc81"],
+  ["e1b88a", "44cc87"],
   ["c48e", "44cc8c"],
-  ["c48f", "64cc8c"],
+  ["e1b88c", "44cca3"],
+  ["e1b890", "44cca7"],
+  ["e1b892", "44ccad"],
+  ["e1b88e", "44ccb1"],
+  ["c388", "45cc80"],
+  ["c389", "45cc81"],
+  ["c38a", "45cc82"],
+  ["e1bb80", "45cc82cc80"],
+  ["e1bb80", "c38acc80"],
+  ["e1babe", "45cc82cc81"],
+  ["e1babe", "c38acc81"],
+  ["e1bb84", "45cc82cc83"],
+  ["e1bb84", "c38acc83"],
+  ["e1bb82", "45cc82cc89"],
+  ["e1bb82", "c38acc89"],
+  ["e1babc", "45cc83"],
   ["c492", "45cc84"],
-  ["c493", "65cc84"],
+  ["e1b894", "45cc84cc80"],
+  ["e1b894", "c492cc80"],
+  ["e1b896", "45cc84cc81"],
+  ["e1b896", "c492cc81"],
   ["c494", "45cc86"],
-  ["c495", "65cc86"],
   ["c496", "45cc87"],
-  ["c497", "65cc87"],
-  ["c498", "45cca8"],
-  ["c499", "65cca8"],
+  ["c38b", "45cc88"],
+  ["e1baba", "45cc89"],
   ["c49a", "45cc8c"],
-  ["c49b", "65cc8c"],
+  ["c884", "45cc8f"],
+  ["c886", "45cc91"],
+  ["e1bab8", "45cca3"],
+  ["e1bb86", "45cca3cc82"],
+  ["e1bb86", "e1bab8cc82"],
+  ["c8a8", "45cca7"],
+  ["e1b89c", "45cca7cc86"],
+  ["e1b89c", "c8a8cc86"],
+  ["c498", "45cca8"],
+  ["e1b898", "45ccad"],
+  ["e1b89a", "45ccb0"],
+  ["e1b89e", "46cc87"],
+  ["c7b4", "47cc81"],
   ["c49c", "47cc82"],
-  ["c49d", "67cc82"],
+  ["e1b8a0", "47cc84"],
   ["c49e", "47cc86"],
-  ["c49f", "67cc86"],
   ["c4a0", "47cc87"],
-  ["c4a1", "67cc87"],
+  ["c7a6", "47cc8c"],
   ["c4a2", "47cca7"],
-  ["c4a3", "67cca7"],
   ["c4a4", "48cc82"],
-  ["c4a5", "68cc82"],
+  ["e1b8a2", "48cc87"],
+  ["e1b8a6", "48cc88"],
+  ["c89e", "48cc8c"],
+  ["e1b8a4", "48cca3"],
+  ["e1b8a8", "48cca7"],
+  ["e1b8aa", "48ccae"],
+  ["c38c", "49cc80"],
+  ["c38d", "49cc81"],
+  ["c38e", "49cc82"],
   ["c4a8", "49cc83"],
-  ["c4a9", "69cc83"],
   ["c4aa", "49cc84"],
-  ["c4ab", "69cc84"],
   ["c4ac", "49cc86"],
-  ["c4ad", "69cc86"],
-  ["c4ae", "49cca8"],
-  ["c4af", "69cca8"],
   ["c4b0", "49cc87"],
+  ["c38f", "49cc88"],
+  ["e1b8ae", "49cc88cc81"],
+  ["e1b8ae", "c38fcc81"],
+  ["e1bb88", "49cc89"],
+  ["c78f", "49cc8c"],
+  ["c888", "49cc8f"],
+  ["c88a", "49cc91"],
+  ["e1bb8a", "49cca3"],
+  ["c4ae", "49cca8"],
+  ["e1b8ac", "49ccb0"],
   ["c4b4", "4acc82"],
-  ["c4b5", "6acc82"],
+  ["e1b8b0", "4bcc81"],
+  ["c7a8", "4bcc8c"],
+  ["e1b8b2", "4bcca3"],
   ["c4b6", "4bcca7"],
-  ["c4b7", "6bcca7"],
+  ["e1b8b4", "4bccb1"],
   ["c4b9", "4ccc81"],
-  ["c4ba", "6ccc81"],
-  ["c4bb", "4ccca7"],
-  ["c4bc", "6ccca7"],
   ["c4bd", "4ccc8c"],
-  ["c4be", "6ccc8c"],
+  ["e1b8b6", "4ccca3"],
+  ["e1b8b8", "4ccca3cc84"],
+  ["e1b8b8", "e1b8b6cc84"],
+  ["c4bb", "4ccca7"],
+  ["e1b8bc", "4cccad"],
+  ["e1b8ba", "4cccb1"],
+  ["e1b8be", "4dcc81"],
+  ["e1b980", "4dcc87"],
+  ["e1b982", "4dcca3"],
+  ["c7b8", "4ecc80"],
   ["c583", "4ecc81"],
-  ["c584", "6ecc81"],
-  ["c585", "4ecca7"],
-  ["c586", "6ecca7"],
+  ["c391", "4ecc83"],
+  ["e1b984", "4ecc87"],
   ["c587", "4ecc8c"],
-  ["c588", "6ecc8c"],
+  ["e1b986", "4ecca3"],
+  ["c585", "4ecca7"],
+  ["e1b98a", "4eccad"],
+  ["e1b988", "4eccb1"],
+  ["c392", "4fcc80"],
+  ["c393", "4fcc81"],
+  ["c394", "4fcc82"],
+  ["e1bb92", "4fcc82cc80"],
+  ["e1bb92", "c394cc80"],
+  ["e1bb90", "4fcc82cc81"],
+  ["e1bb90", "c394cc81"],
+  ["e1bb96", "4fcc82cc83"],
+  ["e1bb96", "c394cc83"],
+  ["e1bb94", "4fcc82cc89"],
+  ["e1bb94", "c394cc89"],
+  ["c395", "4fcc83"],
+  ["e1b98c", "4fcc83cc81"],
+  ["e1b98c", "c395cc81"],
+  ["c8ac", "4fcc83cc84"],
+  ["c8ac", "c395cc84"],
+  ["e1b98e", "4fcc83cc88"],
+  ["e1b98e", "c395cc88"],
   ["c58c", "4fcc84"],
-  ["c58d", "6fcc84"],
+  ["e1b990", "4fcc84cc80"],
+  ["e1b990", "c58ccc80"],
+  ["e1b992", "4fcc84cc81"],
+  ["e1b992", "c58ccc81"],
   ["c58e", "4fcc86"],
-  ["c58f", "6fcc86"],
+  ["c8ae", "4fcc87"],
+  ["c8b0", "4fcc87cc84"],
+  ["c8b0", "c8aecc84"],
+  ["c396", "4fcc88"],
+  ["c8aa", "4fcc88cc84"],
+  ["c8aa", "c396cc84"],
+  ["e1bb8e", "4fcc89"],
   ["c590", "4fcc8b"],
-  ["c591", "6fcc8b"],
+  ["c791", "4fcc8c"],
+  ["c88c", "4fcc8f"],
+  ["c88e", "4fcc91"],
+  ["c6a0", "4fcc9b"],
+  ["e1bb9c", "4fcc9bcc80"],
+  ["e1bb9c", "c6a0cc80"],
+  ["e1bb9a", "4fcc9bcc81"],
+  ["e1bb9a", "c6a0cc81"],
+  ["e1bba0", "4fcc9bcc83"],
+  ["e1bba0", "c6a0cc83"],
+  ["e1bb9e", "4fcc9bcc89"],
+  ["e1bb9e", "c6a0cc89"],
+  ["e1bba2", "4fcc9bcca3"],
+  ["e1bba2", "c6a0cca3"],
+  ["e1bb8c", "4fcca3"],
+  ["e1bb98", "4fcca3cc82"],
+  ["e1bb98", "e1bb8ccc82"],
+  ["c7aa", "4fcca8"],
+  ["c7ac", "4fcca8cc84"],
+  ["c7ac", "c7aacc84"],
+  ["e1b994", "50cc81"],
+  ["e1b996", "50cc87"],
   ["c594", "52cc81"],
-  ["c595", "72cc81"],
-  ["c596", "52cca7"],
-  ["c597", "72cca7"],
+  ["e1b998", "52cc87"],
   ["c598", "52cc8c"],
-  ["c599", "72cc8c"],
+  ["c890", "52cc8f"],
+  ["c892", "52cc91"],
+  ["e1b99a", "52cca3"],
+  ["e1b99c", "52cca3cc84"],
+  ["e1b99c", "e1b99acc84"],
+  ["c596", "52cca7"],
+  ["e1b99e", "52ccb1"],
   ["c59a", "53cc81"],
-  ["c59b", "73cc81"],
+  ["e1b9a4", "53cc81cc87"],
+  ["e1b9a4", "c59acc87"],
   ["c59c", "53cc82"],
-  ["c59d", "73cc82"],
-  ["c59e", "53cca7"],
-  ["c59f", "73cca7"],
+  ["e1b9a0", "53cc87"],
   ["c5a0", "53cc8c"],
-  ["c5a1", "73cc8c"],
-  ["c5a2", "54cca7"],
-  ["c5a3", "74cca7"],
+  ["e1b9a6", "53cc8ccc87"],
+  ["e1b9a6", "c5a0cc87"],
+  ["e1b9a2", "53cca3"],
+  ["e1b9a8", "53cca3cc87"],
+  ["e1b9a8", "e1b9a2cc87"],
+  ["c898", "53cca6"],
+  ["c59e", "53cca7"],
+  ["e1b9aa", "54cc87"],
   ["c5a4", "54cc8c"],
-  ["c5a5", "74cc8c"],
+  ["e1b9ac", "54cca3"],
+  ["c89a", "54cca6"],
+  ["c5a2", "54cca7"],
+  ["e1b9b0", "54ccad"],
+  ["e1b9ae", "54ccb1"],
+  ["c399", "55cc80"],
+  ["c39a", "55cc81"],
+  ["c39b", "55cc82"],
   ["c5a8", "55cc83"],
-  ["c5a9", "75cc83"],
+  ["e1b9b8", "55cc83cc81"],
+  ["e1b9b8", "c5a8cc81"],
   ["c5aa", "55cc84"],
-  ["c5ab", "75cc84"],
+  ["e1b9ba", "55cc84cc88"],
+  ["e1b9ba", "c5aacc88"],
   ["c5ac", "55cc86"],
-  ["c5ad", "75cc86"],
+  ["c39c", "55cc88"],
+  ["c79b", "55cc88cc80"],
+  ["c79b", "c39ccc80"],
+  ["c797", "55cc88cc81"],
+  ["c797", "c39ccc81"],
+  ["c795", "55cc88cc84"],
+  ["c795", "c39ccc84"],
+  ["c799", "55cc88cc8c"],
+  ["c799", "c39ccc8c"],
+  ["e1bba6", "55cc89"],
   ["c5ae", "55cc8a"],
-  ["c5af", "75cc8a"],
   ["c5b0", "55cc8b"],
-  ["c5b1", "75cc8b"],
+  ["c793", "55cc8c"],
+  ["c894", "55cc8f"],
+  ["c896", "55cc91"],
+  ["c6af", "55cc9b"],
+  ["e1bbaa", "55cc9bcc80"],
+  ["e1bbaa", "c6afcc80"],
+  ["e1bba8", "55cc9bcc81"],
+  ["e1bba8", "c6afcc81"],
+  ["e1bbae", "55cc9bcc83"],
+  ["e1bbae", "c6afcc83"],
+  ["e1bbac", "55cc9bcc89"],
+  ["e1bbac", "c6afcc89"],
+  ["e1bbb0", "55cc9bcca3"],
+  ["e1bbb0", "c6afcca3"],
+  ["e1bba4", "55cca3"],
+  ["e1b9b2", "55cca4"],
   ["c5b2", "55cca8"],
-  ["c5b3", "75cca8"],
+  ["e1b9b6", "55ccad"],
+  ["e1b9b4", "55ccb0"],
+  ["e1b9bc", "56cc83"],
+  ["e1b9be", "56cca3"],
+  ["e1ba80", "57cc80"],
+  ["e1ba82", "57cc81"],
   ["c5b4", "57cc82"],
-  ["c5b5", "77cc82"],
+  ["e1ba86", "57cc87"],
+  ["e1ba84", "57cc88"],
+  ["e1ba88", "57cca3"],
+  ["e1ba8a", "58cc87"],
+  ["e1ba8c", "58cc88"],
+  ["e1bbb2", "59cc80"],
+  ["c39d", "59cc81"],
   ["c5b6", "59cc82"],
-  ["c5b7", "79cc82"],
+  ["e1bbb8", "59cc83"],
+  ["c8b2", "59cc84"],
+  ["e1ba8e", "59cc87"],
   ["c5b8", "59cc88"],
+  ["e1bbb6", "59cc89"],
+  ["e1bbb4", "59cca3"],
   ["c5b9", "5acc81"],
-  ["c5ba", "7acc81"],
+  ["e1ba90", "5acc82"],
   ["c5bb", "5acc87"],
-  ["c5bc", "7acc87"],
   ["c5bd", "5acc8c"],
-  ["c5be", "7acc8c"],
-  ["c6a0", "4fcc9b"],
-  ["c6a1", "6fcc9b"],
-  ["c6af", "55cc9b"],
-  ["c6b0", "75cc9b"],
-  ["c78d", "41cc8c"],
-  ["c78e", "61cc8c"],
-  ["c78f", "49cc8c"],
-  ["c790", "69cc8c"],
-  ["c791", "4fcc8c"],
-  ["c792", "6fcc8c"],
-  ["c793", "55cc8c"],
-  ["c794", "75cc8c"],
-  ["c795", "55cc88cc84"],
-  ["c796", "75cc88cc84"],
-  ["c797", "55cc88cc81"],
-  ["c798", "75cc88cc81"],
-  ["c799", "55cc88cc8c"],
-  ["c79a", "75cc88cc8c"],
-  ["c79b", "55cc88cc80"],
-  ["c79c", "75cc88cc80"],
-  ["c79e", "41cc88cc84"],
-  ["c79f", "61cc88cc84"],
-  ["c7a0", "41cc87cc84"],
+  ["e1ba92", "5acca3"],
+  ["e1ba94", "5accb1"],
+  ["e1bfaf", "60"],
+  ["c3a0", "61cc80"],
+  ["c3a1", "61cc81"],
+  ["c3a2", "61cc82"],
+  ["e1baa7", "61cc82cc80"],
+  ["e1baa7", "c3a2cc80"],
+  ["e1baa5", "61cc82cc81"],
+  ["e1baa5", "c3a2cc81"],
+  ["e1baab", "61cc82cc83"],
+  ["e1baab", "c3a2cc83"],
+  ["e1baa9", "61cc82cc89"],
+  ["e1baa9", "c3a2cc89"],
+  ["c3a3", "61cc83"],
+  ["c481", "61cc84"],
+  ["c483", "61cc86"],
+  ["e1bab1", "61cc86cc80"],
+  ["e1bab1", "c483cc80"],
+  ["e1baaf", "61cc86cc81"],
+  ["e1baaf", "c483cc81"],
+  ["e1bab5", "61cc86cc83"],
+  ["e1bab5", "c483cc83"],
+  ["e1bab3", "61cc86cc89"],
+  ["e1bab3", "c483cc89"],
+  ["c8a7", "61cc87"],
   ["c7a1", "61cc87cc84"],
-  ["c7a2", "c386cc84"],
-  ["c7a3", "c3a6cc84"],
-  ["c7a6", "47cc8c"],
-  ["c7a7", "67cc8c"],
-  ["c7a8", "4bcc8c"],
-  ["c7a9", "6bcc8c"],
-  ["c7aa", "4fcca8"],
-  ["c7ab", "6fcca8"],
-  ["c7ac", "4fcca8cc84"],
-  ["c7ad", "6fcca8cc84"],
-  ["c7ae", "c6b7cc8c"],
-  ["c7af", "ca92cc8c"],
-  ["c7b0", "6acc8c"],
-  ["c7b4", "47cc81"],
-  ["c7b5", "67cc81"],
-  ["c7ba", "41cc8acc81"],
+  ["c7a1", "c8a7cc84"],
+  ["c3a4", "61cc88"],
+  ["c79f", "61cc88cc84"],
+  ["c79f", "c3a4cc84"],
+  ["e1baa3", "61cc89"],
+  ["c3a5", "61cc8a"],
   ["c7bb", "61cc8acc81"],
-  ["c7bc", "c386cc81"],
-  ["c7bd", "c3a6cc81"],
-  ["c7be", "c398cc81"],
-  ["c7bf", "c3b8cc81"],
-  ["c880", "41cc8f"],
+  ["c7bb", "c3a5cc81"],
+  ["c78e", "61cc8c"],
   ["c881", "61cc8f"],
-  ["c882", "41cc91"],
   ["c883", "61cc91"],
-  ["c884", "45cc8f"],
-  ["c885", "65cc8f"],
-  ["c886", "45cc91"],
-  ["c887", "65cc91"],
-  ["c888", "49cc8f"],
-  ["c889", "69cc8f"],
-  ["c88a", "49cc91"],
-  ["c88b", "69cc91"],
-  ["c88c", "4fcc8f"],
-  ["c88d", "6fcc8f"],
-  ["c88e", "4fcc91"],
-  ["c88f", "6fcc91"],
-  ["c890", "52cc8f"],
-  ["c891", "72cc8f"],
-  ["c892", "52cc91"],
-  ["c893", "72cc91"],
-  ["c894", "55cc8f"],
-  ["c895", "75cc8f"],
-  ["c896", "55cc91"],
-  ["c897", "75cc91"],
-  ["cc90", "cc86cc87"],
-  ["cd80", "cc80"],
-  ["cd81", "cc81"],
-  ["cd83", "cc93"],
-  ["cd84", "cc88cc8d"],
-  ["cdb4", "cab9"],
-  ["cdbe", "3b"],
-  ["ce85", "c2a8cc8d"],
-  ["ce86", "ce91cc8d"],
-  ["ce87", "c2b7"],
-  ["ce88", "ce95cc8d"],
-  ["ce89", "ce97cc8d"],
-  ["ce8a", "ce99cc8d"],
-  ["ce8c", "ce9fcc8d"],
-  ["ce8e", "cea5cc8d"],
-  ["ce8f", "cea9cc8d"],
-  ["ce90", "ceb9cc88cc8d"],
-  ["ceaa", "ce99cc88"],
-  ["ceab", "cea5cc88"],
-  ["ceac", "ceb1cc8d"],
-  ["cead", "ceb5cc8d"],
-  ["ceae", "ceb7cc8d"],
-  ["ceaf", "ceb9cc8d"],
-  ["ceb0", "cf85cc88cc8d"],
-  ["cf8a", "ceb9cc88"],
-  ["cf8b", "cf85cc88"],
-  ["cf8c", "cebfcc8d"],
-  ["cf8d", "cf85cc8d"],
-  ["cf8e", "cf89cc8d"],
-  ["cf93", "cf92cc8d"],
-  ["cf94", "cf92cc88"],
-  ["d081", "d095cc88"],
-  ["d083", "d093cc81"],
-  ["d087", "d086cc88"],
-  ["d08c", "d09acc81"],
-  ["d08e", "d0a3cc86"],
-  ["d099", "d098cc86"],
-  ["d0b9", "d0b8cc86"],
-  ["d191", "d0b5cc88"],
-  ["d193", "d0b3cc81"],
-  ["d197", "d196cc88"],
-  ["d19c", "d0bacc81"],
-  ["d19e", "d183cc86"],
-  ["d1b6", "d1b4cc8f"],
-  ["d1b7", "d1b5cc8f"],
-  ["d381", "d096cc86"],
-  ["d382", "d0b6cc86"],
-  ["d390", "d090cc86"],
-  ["d391", "d0b0cc86"],
-  ["d392", "d090cc88"],
-  ["d393", "d0b0cc88"],
-  ["d394", "c386"],
-  ["d395", "c3a6"],
-  ["d396", "d095cc86"],
-  ["d397", "d0b5cc86"],
-  ["d398", "c68f"],
-  ["d399", "c999"],
-  ["d39a", "c68fcc88"],
-  ["d39b", "c999cc88"],
-  ["d39c", "d096cc88"],
-  ["d39d", "d0b6cc88"],
-  ["d39e", "d097cc88"],
-  ["d39f", "d0b7cc88"],
-  ["d3a0", "c6b7"],
-  ["d3a1", "ca92"],
-  ["d3a2", "d098cc84"],
-  ["d3a3", "d0b8cc84"],
-  ["d3a4", "d098cc88"],
-  ["d3a5", "d0b8cc88"],
-  ["d3a6", "d09ecc88"],
-  ["d3a7", "d0becc88"],
-  ["d3a8", "c69f"],
-  ["d3a9", "c9b5"],
-  ["d3aa", "c69fcc88"],
-  ["d3ab", "c9b5cc88"],
-  ["d3ae", "d0a3cc84"],
-  ["d3af", "d183cc84"],
-  ["d3b0", "d0a3cc88"],
-  ["d3b1", "d183cc88"],
-  ["d3b2", "d0a3cc8b"],
-  ["d3b3", "d183cc8b"],
-  ["d3b4", "d0a7cc88"],
-  ["d3b5", "d187cc88"],
-  ["d3b8", "d0abcc88"],
-  ["d3b9", "d18bcc88"],
-  ["e0a4a9", "e0a4a8e0a4bc"],
-  ["e0a4b1", "e0a4b0e0a4bc"],
-  ["e0a4b4", "e0a4b3e0a4bc"],
-  ["e0a598", "e0a495e0a4bc"],
-  ["e0a599", "e0a496e0a4bc"],
-  ["e0a59a", "e0a497e0a4bc"],
-  ["e0a59b", "e0a49ce0a4bc"],
-  ["e0a59c", "e0a4a1e0a4bc"],
-  ["e0a59d", "e0a4a2e0a4bc"],
-  ["e0a59e", "e0a4abe0a4bc"],
-  ["e0a59f", "e0a4afe0a4bc"],
-  ["e0a6b0", "e0a6ace0a6bc"],
-  ["e0a78b", "e0a787e0a6be"],
-  ["e0a78c", "e0a787e0a797"],
-  ["e0a79c", "e0a6a1e0a6bc"],
-  ["e0a79d", "e0a6a2e0a6bc"],
-  ["e0a79f", "e0a6afe0a6bc"],
-  ["e0a999", "e0a896e0a8bc"],
-  ["e0a99a", "e0a897e0a8bc"],
-  ["e0a99b", "e0a89ce0a8bc"],
-  ["e0a99c", "e0a8a1e0a8bc"],
-  ["e0a99e", "e0a8abe0a8bc"],
-  ["e0ad88", "e0ad87e0ad96"],
-  ["e0ad8b", "e0ad87e0acbe"],
-  ["e0ad8c", "e0ad87e0ad97"],
-  ["e0ad9c", "e0aca1e0acbc"],
-  ["e0ad9d", "e0aca2e0acbc"],
-  ["e0ad9f", "e0acafe0acbc"],
-  ["e0ae94", "e0ae92e0af97"],
-  ["e0af8a", "e0af86e0aebe"],
-  ["e0af8b", "e0af87e0aebe"],
-  ["e0af8c", "e0af86e0af97"],
-  ["e0b188", "e0b186e0b196"],
-  ["e0b380", "e0b2bfe0b395"],
-  ["e0b387", "e0b386e0b395"],
-  ["e0b388", "e0b386e0b396"],
-  ["e0b38a", "e0b386e0b382"],
-  ["e0b38b", "e0b386e0b382e0b395"],
-  ["e0b58a", "e0b586e0b4be"],
-  ["e0b58b", "e0b587e0b4be"],
-  ["e0b58c", "e0b586e0b597"],
-  ["e0b8b3", "e0b98de0b8b2"],
-  ["e0bab3", "e0bb8de0bab2"],
-  ["e0bd83", "e0bd82e0beb7"],
-  ["e0bd8d", "e0bd8ce0beb7"],
-  ["e0bd92", "e0bd91e0beb7"],
-  ["e0bd97", "e0bd96e0beb7"],
-  ["e0bd9c", "e0bd9be0beb7"],
-  ["e0bda9", "e0bd80e0beb5"],
-  ["e0bdb3", "e0bdb2e0bdb1"],
-  ["e0bdb5", "e0bdb4e0bdb1"],
-  ["e0bdb6", "e0beb2e0be80"],
-  ["e0bdb7", "e0beb2e0be80e0bdb1"],
-  ["e0bdb8", "e0beb3e0be80"],
-  ["e0bdb9", "e0beb3e0be80e0bdb1"],
-  ["e0be81", "e0be80e0bdb1"],
-  ["e0be93", "e0be92e0beb7"],
-  ["e0be9d", "e0be9ce0beb7"],
-  ["e0bea2", "e0bea1e0beb7"],
-  ["e0bea7", "e0bea6e0beb7"],
-  ["e0beac", "e0beabe0beb7"],
-  ["e0beb9", "e0be90e0beb5"],
-  ["e1b880", "41cca5"],
+  ["e1baa1", "61cca3"],
+  ["e1baad", "61cca3cc82"],
+  ["e1baad", "e1baa1cc82"],
+  ["e1bab7", "61cca3cc86"],
+  ["e1bab7", "e1baa1cc86"],
   ["e1b881", "61cca5"],
-  ["e1b882", "42cc87"],
+  ["c485", "61cca8"],
   ["e1b883", "62cc87"],
-  ["e1b884", "42cca3"],
   ["e1b885", "62cca3"],
-  ["e1b886", "42ccb1"],
   ["e1b887", "62ccb1"],
-  ["e1b888", "43cca7cc81"],
+  ["c487", "63cc81"],
+  ["c489", "63cc82"],
+  ["c48b", "63cc87"],
+  ["c48d", "63cc8c"],
+  ["c3a7", "63cca7"],
   ["e1b889", "63cca7cc81"],
-  ["e1b88a", "44cc87"],
+  ["e1b889", "c3a7cc81"],
   ["e1b88b", "64cc87"],
-  ["e1b88c", "44cca3"],
+  ["c48f", "64cc8c"],
   ["e1b88d", "64cca3"],
-  ["e1b88e", "44ccb1"],
-  ["e1b88f", "64ccb1"],
-  ["e1b890", "44cca7"],
   ["e1b891", "64cca7"],
-  ["e1b892", "44ccad"],
   ["e1b893", "64ccad"],
-  ["e1b894", "45cc84cc80"],
+  ["e1b88f", "64ccb1"],
+  ["c3a8", "65cc80"],
+  ["c3a9", "65cc81"],
+  ["c3aa", "65cc82"],
+  ["e1bb81", "65cc82cc80"],
+  ["e1bb81", "c3aacc80"],
+  ["e1babf", "65cc82cc81"],
+  ["e1babf", "c3aacc81"],
+  ["e1bb85", "65cc82cc83"],
+  ["e1bb85", "c3aacc83"],
+  ["e1bb83", "65cc82cc89"],
+  ["e1bb83", "c3aacc89"],
+  ["e1babd", "65cc83"],
+  ["c493", "65cc84"],
   ["e1b895", "65cc84cc80"],
-  ["e1b896", "45cc84cc81"],
+  ["e1b895", "c493cc80"],
   ["e1b897", "65cc84cc81"],
-  ["e1b898", "45ccad"],
+  ["e1b897", "c493cc81"],
+  ["c495", "65cc86"],
+  ["c497", "65cc87"],
+  ["c3ab", "65cc88"],
+  ["e1babb", "65cc89"],
+  ["c49b", "65cc8c"],
+  ["c885", "65cc8f"],
+  ["c887", "65cc91"],
+  ["e1bab9", "65cca3"],
+  ["e1bb87", "65cca3cc82"],
+  ["e1bb87", "e1bab9cc82"],
+  ["c8a9", "65cca7"],
+  ["e1b89d", "65cca7cc86"],
+  ["e1b89d", "c8a9cc86"],
+  ["c499", "65cca8"],
   ["e1b899", "65ccad"],
-  ["e1b89a", "45ccb0"],
   ["e1b89b", "65ccb0"],
-  ["e1b89c", "45cca7cc86"],
-  ["e1b89d", "65cca7cc86"],
-  ["e1b89e", "46cc87"],
   ["e1b89f", "66cc87"],
-  ["e1b8a0", "47cc84"],
+  ["c7b5", "67cc81"],
+  ["c49d", "67cc82"],
   ["e1b8a1", "67cc84"],
-  ["e1b8a2", "48cc87"],
+  ["c49f", "67cc86"],
+  ["c4a1", "67cc87"],
+  ["c7a7", "67cc8c"],
+  ["c4a3", "67cca7"],
+  ["c4a5", "68cc82"],
   ["e1b8a3", "68cc87"],
-  ["e1b8a4", "48cca3"],
-  ["e1b8a5", "68cca3"],
-  ["e1b8a6", "48cc88"],
   ["e1b8a7", "68cc88"],
-  ["e1b8a8", "48cca7"],
+  ["c89f", "68cc8c"],
+  ["e1b8a5", "68cca3"],
   ["e1b8a9", "68cca7"],
-  ["e1b8aa", "48ccae"],
   ["e1b8ab", "68ccae"],
-  ["e1b8ac", "49ccb0"],
-  ["e1b8ad", "69ccb0"],
-  ["e1b8ae", "49cc88cc81"],
+  ["e1ba96", "68ccb1"],
+  ["c3ac", "69cc80"],
+  ["c3ad", "69cc81"],
+  ["c3ae", "69cc82"],
+  ["c4a9", "69cc83"],
+  ["c4ab", "69cc84"],
+  ["c4ad", "69cc86"],
+  ["c3af", "69cc88"],
   ["e1b8af", "69cc88cc81"],
-  ["e1b8b0", "4bcc81"],
+  ["e1b8af", "c3afcc81"],
+  ["e1bb89", "69cc89"],
+  ["c790", "69cc8c"],
+  ["c889", "69cc8f"],
+  ["c88b", "69cc91"],
+  ["e1bb8b", "69cca3"],
+  ["c4af", "69cca8"],
+  ["e1b8ad", "69ccb0"],
+  ["c4b5", "6acc82"],
+  ["c7b0", "6acc8c"],
   ["e1b8b1", "6bcc81"],
-  ["e1b8b2", "4bcca3"],
+  ["c7a9", "6bcc8c"],
   ["e1b8b3", "6bcca3"],
-  ["e1b8b4", "4bccb1"],
+  ["c4b7", "6bcca7"],
   ["e1b8b5", "6bccb1"],
-  ["e1b8b6", "4ccca3"],
+  ["c4ba", "6ccc81"],
+  ["c4be", "6ccc8c"],
   ["e1b8b7", "6ccca3"],
-  ["e1b8b8", "4ccca3cc84"],
   ["e1b8b9", "6ccca3cc84"],
-  ["e1b8ba", "4cccb1"],
-  ["e1b8bb", "6cccb1"],
-  ["e1b8bc", "4cccad"],
+  ["e1b8b9", "e1b8b7cc84"],
+  ["c4bc", "6ccca7"],
   ["e1b8bd", "6cccad"],
-  ["e1b8be", "4dcc81"],
+  ["e1b8bb", "6cccb1"],
   ["e1b8bf", "6dcc81"],
-  ["e1b980", "4dcc87"],
   ["e1b981", "6dcc87"],
-  ["e1b982", "4dcca3"],
   ["e1b983", "6dcca3"],
-  ["e1b984", "4ecc87"],
+  ["c7b9", "6ecc80"],
+  ["c584", "6ecc81"],
+  ["c3b1", "6ecc83"],
   ["e1b985", "6ecc87"],
-  ["e1b986", "4ecca3"],
+  ["c588", "6ecc8c"],
   ["e1b987", "6ecca3"],
-  ["e1b988", "4eccb1"],
-  ["e1b989", "6eccb1"],
-  ["e1b98a", "4eccad"],
+  ["c586", "6ecca7"],
   ["e1b98b", "6eccad"],
-  ["e1b98c", "4fcc83cc81"],
+  ["e1b989", "6eccb1"],
+  ["c3b2", "6fcc80"],
+  ["c3b3", "6fcc81"],
+  ["c3b4", "6fcc82"],
+  ["e1bb93", "6fcc82cc80"],
+  ["e1bb93", "c3b4cc80"],
+  ["e1bb91", "6fcc82cc81"],
+  ["e1bb91", "c3b4cc81"],
+  ["e1bb97", "6fcc82cc83"],
+  ["e1bb97", "c3b4cc83"],
+  ["e1bb95", "6fcc82cc89"],
+  ["e1bb95", "c3b4cc89"],
+  ["c3b5", "6fcc83"],
   ["e1b98d", "6fcc83cc81"],
-  ["e1b98e", "4fcc83cc88"],
+  ["e1b98d", "c3b5cc81"],
+  ["c8ad", "6fcc83cc84"],
+  ["c8ad", "c3b5cc84"],
   ["e1b98f", "6fcc83cc88"],
-  ["e1b990", "4fcc84cc80"],
+  ["e1b98f", "c3b5cc88"],
+  ["c58d", "6fcc84"],
   ["e1b991", "6fcc84cc80"],
-  ["e1b992", "4fcc84cc81"],
+  ["e1b991", "c58dcc80"],
   ["e1b993", "6fcc84cc81"],
-  ["e1b994", "50cc81"],
+  ["e1b993", "c58dcc81"],
+  ["c58f", "6fcc86"],
+  ["c8af", "6fcc87"],
+  ["c8b1", "6fcc87cc84"],
+  ["c8b1", "c8afcc84"],
+  ["c3b6", "6fcc88"],
+  ["c8ab", "6fcc88cc84"],
+  ["c8ab", "c3b6cc84"],
+  ["e1bb8f", "6fcc89"],
+  ["c591", "6fcc8b"],
+  ["c792", "6fcc8c"],
+  ["c88d", "6fcc8f"],
+  ["c88f", "6fcc91"],
+  ["c6a1", "6fcc9b"],
+  ["e1bb9d", "6fcc9bcc80"],
+  ["e1bb9d", "c6a1cc80"],
+  ["e1bb9b", "6fcc9bcc81"],
+  ["e1bb9b", "c6a1cc81"],
+  ["e1bba1", "6fcc9bcc83"],
+  ["e1bba1", "c6a1cc83"],
+  ["e1bb9f", "6fcc9bcc89"],
+  ["e1bb9f", "c6a1cc89"],
+  ["e1bba3", "6fcc9bcca3"],
+  ["e1bba3", "c6a1cca3"],
+  ["e1bb8d", "6fcca3"],
+  ["e1bb99", "6fcca3cc82"],
+  ["e1bb99", "e1bb8dcc82"],
+  ["c7ab", "6fcca8"],
+  ["c7ad", "6fcca8cc84"],
+  ["c7ad", "c7abcc84"],
   ["e1b995", "70cc81"],
-  ["e1b996", "50cc87"],
   ["e1b997", "70cc87"],
-  ["e1b998", "52cc87"],
+  ["c595", "72cc81"],
   ["e1b999", "72cc87"],
-  ["e1b99a", "52cca3"],
+  ["c599", "72cc8c"],
+  ["c891", "72cc8f"],
+  ["c893", "72cc91"],
   ["e1b99b", "72cca3"],
-  ["e1b99c", "52cca3cc84"],
   ["e1b99d", "72cca3cc84"],
-  ["e1b99e", "52ccb1"],
+  ["e1b99d", "e1b99bcc84"],
+  ["c597", "72cca7"],
   ["e1b99f", "72ccb1"],
-  ["e1b9a0", "53cc87"],
-  ["e1b9a1", "73cc87"],
-  ["e1b9a2", "53cca3"],
-  ["e1b9a3", "73cca3"],
-  ["e1b9a4", "53cc81cc87"],
+  ["c59b", "73cc81"],
   ["e1b9a5", "73cc81cc87"],
-  ["e1b9a6", "53cc8ccc87"],
+  ["e1b9a5", "c59bcc87"],
+  ["c59d", "73cc82"],
+  ["e1b9a1", "73cc87"],
+  ["c5a1", "73cc8c"],
   ["e1b9a7", "73cc8ccc87"],
-  ["e1b9a8", "53cca3cc87"],
+  ["e1b9a7", "c5a1cc87"],
+  ["e1b9a3", "73cca3"],
   ["e1b9a9", "73cca3cc87"],
-  ["e1b9aa", "54cc87"],
+  ["e1b9a9", "e1b9a3cc87"],
+  ["c899", "73cca6"],
+  ["c59f", "73cca7"],
   ["e1b9ab", "74cc87"],
-  ["e1b9ac", "54cca3"],
+  ["e1ba97", "74cc88"],
+  ["c5a5", "74cc8c"],
   ["e1b9ad", "74cca3"],
-  ["e1b9ae", "54ccb1"],
-  ["e1b9af", "74ccb1"],
-  ["e1b9b0", "54ccad"],
+  ["c89b", "74cca6"],
+  ["c5a3", "74cca7"],
   ["e1b9b1", "74ccad"],
-  ["e1b9b2", "55cca4"],
-  ["e1b9b3", "75cca4"],
-  ["e1b9b4", "55ccb0"],
-  ["e1b9b5", "75ccb0"],
-  ["e1b9b6", "55ccad"],
-  ["e1b9b7", "75ccad"],
-  ["e1b9b8", "55cc83cc81"],
+  ["e1b9af", "74ccb1"],
+  ["c3b9", "75cc80"],
+  ["c3ba", "75cc81"],
+  ["c3bb", "75cc82"],
+  ["c5a9", "75cc83"],
   ["e1b9b9", "75cc83cc81"],
-  ["e1b9ba", "55cc84cc88"],
+  ["e1b9b9", "c5a9cc81"],
+  ["c5ab", "75cc84"],
   ["e1b9bb", "75cc84cc88"],
-  ["e1b9bc", "56cc83"],
+  ["e1b9bb", "c5abcc88"],
+  ["c5ad", "75cc86"],
+  ["c3bc", "75cc88"],
+  ["c79c", "75cc88cc80"],
+  ["c79c", "c3bccc80"],
+  ["c798", "75cc88cc81"],
+  ["c798", "c3bccc81"],
+  ["c796", "75cc88cc84"],
+  ["c796", "c3bccc84"],
+  ["c79a", "75cc88cc8c"],
+  ["c79a", "c3bccc8c"],
+  ["e1bba7", "75cc89"],
+  ["c5af", "75cc8a"],
+  ["c5b1", "75cc8b"],
+  ["c794", "75cc8c"],
+  ["c895", "75cc8f"],
+  ["c897", "75cc91"],
+  ["c6b0", "75cc9b"],
+  ["e1bbab", "75cc9bcc80"],
+  ["e1bbab", "c6b0cc80"],
+  ["e1bba9", "75cc9bcc81"],
+  ["e1bba9", "c6b0cc81"],
+  ["e1bbaf", "75cc9bcc83"],
+  ["e1bbaf", "c6b0cc83"],
+  ["e1bbad", "75cc9bcc89"],
+  ["e1bbad", "c6b0cc89"],
+  ["e1bbb1", "75cc9bcca3"],
+  ["e1bbb1", "c6b0cca3"],
+  ["e1bba5", "75cca3"],
+  ["e1b9b3", "75cca4"],
+  ["c5b3", "75cca8"],
+  ["e1b9b7", "75ccad"],
+  ["e1b9b5", "75ccb0"],
   ["e1b9bd", "76cc83"],
-  ["e1b9be", "56cca3"],
   ["e1b9bf", "76cca3"],
-  ["e1ba80", "57cc80"],
   ["e1ba81", "77cc80"],
-  ["e1ba82", "57cc81"],
   ["e1ba83", "77cc81"],
-  ["e1ba84", "57cc88"],
-  ["e1ba85", "77cc88"],
-  ["e1ba86", "57cc87"],
+  ["c5b5", "77cc82"],
   ["e1ba87", "77cc87"],
-  ["e1ba88", "57cca3"],
+  ["e1ba85", "77cc88"],
+  ["e1ba98", "77cc8a"],
   ["e1ba89", "77cca3"],
-  ["e1ba8a", "58cc87"],
   ["e1ba8b", "78cc87"],
-  ["e1ba8c", "58cc88"],
   ["e1ba8d", "78cc88"],
-  ["e1ba8e", "59cc87"],
+  ["e1bbb3", "79cc80"],
+  ["c3bd", "79cc81"],
+  ["c5b7", "79cc82"],
+  ["e1bbb9", "79cc83"],
+  ["c8b3", "79cc84"],
   ["e1ba8f", "79cc87"],
-  ["e1ba90", "5acc82"],
+  ["c3bf", "79cc88"],
+  ["e1bbb7", "79cc89"],
+  ["e1ba99", "79cc8a"],
+  ["e1bbb5", "79cca3"],
+  ["c5ba", "7acc81"],
   ["e1ba91", "7acc82"],
-  ["e1ba92", "5acca3"],
+  ["c5bc", "7acc87"],
+  ["c5be", "7acc8c"],
   ["e1ba93", "7acca3"],
-  ["e1ba94", "5accb1"],
   ["e1ba95", "7accb1"],
-  ["e1ba96", "68ccb1"],
-  ["e1ba97", "74cc88"],
-  ["e1ba98", "77cc8a"],
-  ["e1ba99", "79cc8a"],
+  ["e1bfad", "c2a8cc80"],
+  ["ce85", "c2a8cc81"],
+  ["e1bf81", "c2a8cd82"],
+  ["e1bfbd", "c2b4"],
+  ["ce87", "c2b7"],
+  ["c7bc", "c386cc81"],
+  ["c7a2", "c386cc84"],
+  ["c7be", "c398cc81"],
+  ["c7bd", "c3a6cc81"],
+  ["c7a3", "c3a6cc84"],
+  ["c7bf", "c3b8cc81"],
   ["e1ba9b", "c5bfcc87"],
-  ["e1baa0", "41cca3"],
-  ["e1baa1", "61cca3"],
-  ["e1baa2", "41cc89"],
-  ["e1baa3", "61cc89"],
-  ["e1baa4", "41cc82cc81"],
-  ["e1baa5", "61cc82cc81"],
-  ["e1baa6", "41cc82cc80"],
-  ["e1baa7", "61cc82cc80"],
-  ["e1baa8", "41cc82cc89"],
-  ["e1baa9", "61cc82cc89"],
-  ["e1baaa", "41cc82cc83"],
-  ["e1baab", "61cc82cc83"],
-  ["e1baac", "41cca3cc82"],
-  ["e1baad", "61cca3cc82"],
-  ["e1baae", "41cc86cc81"],
-  ["e1baaf", "61cc86cc81"],
-  ["e1bab0", "41cc86cc80"],
-  ["e1bab1", "61cc86cc80"],
-  ["e1bab2", "41cc86cc89"],
-  ["e1bab3", "61cc86cc89"],
-  ["e1bab4", "41cc86cc83"],
-  ["e1bab5", "61cc86cc83"],
-  ["e1bab6", "41cca3cc86"],
-  ["e1bab7", "61cca3cc86"],
-  ["e1bab8", "45cca3"],
-  ["e1bab9", "65cca3"],
-  ["e1baba", "45cc89"],
-  ["e1babb", "65cc89"],
-  ["e1babc", "45cc83"],
-  ["e1babd", "65cc83"],
-  ["e1babe", "45cc82cc81"],
-  ["e1babf", "65cc82cc81"],
-  ["e1bb80", "45cc82cc80"],
-  ["e1bb81", "65cc82cc80"],
-  ["e1bb82", "45cc82cc89"],
-  ["e1bb83", "65cc82cc89"],
-  ["e1bb84", "45cc82cc83"],
-  ["e1bb85", "65cc82cc83"],
-  ["e1bb86", "45cca3cc82"],
-  ["e1bb87", "65cca3cc82"],
-  ["e1bb88", "49cc89"],
-  ["e1bb89", "69cc89"],
-  ["e1bb8a", "49cca3"],
-  ["e1bb8b", "69cca3"],
-  ["e1bb8c", "4fcca3"],
-  ["e1bb8d", "6fcca3"],
-  ["e1bb8e", "4fcc89"],
-  ["e1bb8f", "6fcc89"],
-  ["e1bb90", "4fcc82cc81"],
-  ["e1bb91", "6fcc82cc81"],
-  ["e1bb92", "4fcc82cc80"],
-  ["e1bb93", "6fcc82cc80"],
-  ["e1bb94", "4fcc82cc89"],
-  ["e1bb95", "6fcc82cc89"],
-  ["e1bb96", "4fcc82cc83"],
-  ["e1bb97", "6fcc82cc83"],
-  ["e1bb98", "4fcca3cc82"],
-  ["e1bb99", "6fcca3cc82"],
-  ["e1bb9a", "4fcc9bcc81"],
-  ["e1bb9b", "6fcc9bcc81"],
-  ["e1bb9c", "4fcc9bcc80"],
-  ["e1bb9d", "6fcc9bcc80"],
-  ["e1bb9e", "4fcc9bcc89"],
-  ["e1bb9f", "6fcc9bcc89"],
-  ["e1bba0", "4fcc9bcc83"],
-  ["e1bba1", "6fcc9bcc83"],
-  ["e1bba2", "4fcc9bcca3"],
-  ["e1bba3", "6fcc9bcca3"],
-  ["e1bba4", "55cca3"],
-  ["e1bba5", "75cca3"],
-  ["e1bba6", "55cc89"],
-  ["e1bba7", "75cc89"],
-  ["e1bba8", "55cc9bcc81"],
-  ["e1bba9", "75cc9bcc81"],
-  ["e1bbaa", "55cc9bcc80"],
-  ["e1bbab", "75cc9bcc80"],
-  ["e1bbac", "55cc9bcc89"],
-  ["e1bbad", "75cc9bcc89"],
-  ["e1bbae", "55cc9bcc83"],
-  ["e1bbaf", "75cc9bcc83"],
-  ["e1bbb0", "55cc9bcca3"],
-  ["e1bbb1", "75cc9bcca3"],
-  ["e1bbb2", "59cc80"],
-  ["e1bbb3", "79cc80"],
-  ["e1bbb4", "59cca3"],
-  ["e1bbb5", "79cca3"],
-  ["e1bbb6", "59cc89"],
-  ["e1bbb7", "79cc89"],
-  ["e1bbb8", "59cc83"],
-  ["e1bbb9", "79cc83"],
-  ["e1bc80", "ceb1cc93"],
-  ["e1bc81", "ceb1cc94"],
-  ["e1bc82", "ceb1cc93cc80"],
-  ["e1bc83", "ceb1cc94cc80"],
-  ["e1bc84", "ceb1cc93cc81"],
-  ["e1bc85", "ceb1cc94cc81"],
-  ["e1bc86", "ceb1cc93cd82"],
-  ["e1bc87", "ceb1cc94cd82"],
+  ["c7ae", "c6b7cc8c"],
+  ["c7af", "ca92cc8c"],
+  ["cdb4", "cab9"],
+  ["cd80", "cc80"],
+  ["cd81", "cc81"],
+  ["cd84", "cc88cc81"],
+  ["cd83", "cc93"],
+  ["e1beba", "ce91cc80"],
+  ["ce86", "ce91cc81"],
+  ["e1beb9", "ce91cc84"],
+  ["e1beb8", "ce91cc86"],
   ["e1bc88", "ce91cc93"],
-  ["e1bc89", "ce91cc94"],
   ["e1bc8a", "ce91cc93cc80"],
-  ["e1bc8b", "ce91cc94cc80"],
+  ["e1bc8a", "e1bc88cc80"],
+  ["e1be8a", "ce91cc93cc80cd85"],
+  ["e1be8a", "e1bc8acd85"],
   ["e1bc8c", "ce91cc93cc81"],
-  ["e1bc8d", "ce91cc94cc81"],
+  ["e1bc8c", "e1bc88cc81"],
+  ["e1be8c", "ce91cc93cc81cd85"],
+  ["e1be8c", "e1bc8ccd85"],
   ["e1bc8e", "ce91cc93cd82"],
+  ["e1bc8e", "e1bc88cd82"],
+  ["e1be8e", "ce91cc93cd82cd85"],
+  ["e1be8e", "e1bc8ecd85"],
+  ["e1be88", "ce91cc93cd85"],
+  ["e1be88", "e1bc88cd85"],
+  ["e1bc89", "ce91cc94"],
+  ["e1bc8b", "ce91cc94cc80"],
+  ["e1bc8b", "e1bc89cc80"],
+  ["e1be8b", "ce91cc94cc80cd85"],
+  ["e1be8b", "e1bc8bcd85"],
+  ["e1bc8d", "ce91cc94cc81"],
+  ["e1bc8d", "e1bc89cc81"],
+  ["e1be8d", "ce91cc94cc81cd85"],
+  ["e1be8d", "e1bc8dcd85"],
   ["e1bc8f", "ce91cc94cd82"],
-  ["e1bc90", "ceb5cc93"],
-  ["e1bc91", "ceb5cc94"],
-  ["e1bc92", "ceb5cc93cc80"],
-  ["e1bc93", "ceb5cc94cc80"],
-  ["e1bc94", "ceb5cc93cc81"],
-  ["e1bc95", "ceb5cc94cc81"],
+  ["e1bc8f", "e1bc89cd82"],
+  ["e1be8f", "ce91cc94cd82cd85"],
+  ["e1be8f", "e1bc8fcd85"],
+  ["e1be89", "ce91cc94cd85"],
+  ["e1be89", "e1bc89cd85"],
+  ["e1bebc", "ce91cd85"],
+  ["e1bf88", "ce95cc80"],
+  ["ce88", "ce95cc81"],
   ["e1bc98", "ce95cc93"],
-  ["e1bc99", "ce95cc94"],
   ["e1bc9a", "ce95cc93cc80"],
-  ["e1bc9b", "ce95cc94cc80"],
+  ["e1bc9a", "e1bc98cc80"],
   ["e1bc9c", "ce95cc93cc81"],
+  ["e1bc9c", "e1bc98cc81"],
+  ["e1bc99", "ce95cc94"],
+  ["e1bc9b", "ce95cc94cc80"],
+  ["e1bc9b", "e1bc99cc80"],
   ["e1bc9d", "ce95cc94cc81"],
-  ["e1bca0", "ceb7cc93"],
-  ["e1bca1", "ceb7cc94"],
-  ["e1bca2", "ceb7cc93cc80"],
-  ["e1bca3", "ceb7cc94cc80"],
-  ["e1bca4", "ceb7cc93cc81"],
-  ["e1bca5", "ceb7cc94cc81"],
-  ["e1bca6", "ceb7cc93cd82"],
-  ["e1bca7", "ceb7cc94cd82"],
+  ["e1bc9d", "e1bc99cc81"],
+  ["e1bf8a", "ce97cc80"],
+  ["ce89", "ce97cc81"],
   ["e1bca8", "ce97cc93"],
-  ["e1bca9", "ce97cc94"],
   ["e1bcaa", "ce97cc93cc80"],
-  ["e1bcab", "ce97cc94cc80"],
+  ["e1bcaa", "e1bca8cc80"],
+  ["e1be9a", "ce97cc93cc80cd85"],
+  ["e1be9a", "e1bcaacd85"],
   ["e1bcac", "ce97cc93cc81"],
-  ["e1bcad", "ce97cc94cc81"],
+  ["e1bcac", "e1bca8cc81"],
+  ["e1be9c", "ce97cc93cc81cd85"],
+  ["e1be9c", "e1bcaccd85"],
   ["e1bcae", "ce97cc93cd82"],
+  ["e1bcae", "e1bca8cd82"],
+  ["e1be9e", "ce97cc93cd82cd85"],
+  ["e1be9e", "e1bcaecd85"],
+  ["e1be98", "ce97cc93cd85"],
+  ["e1be98", "e1bca8cd85"],
+  ["e1bca9", "ce97cc94"],
+  ["e1bcab", "ce97cc94cc80"],
+  ["e1bcab", "e1bca9cc80"],
+  ["e1be9b", "ce97cc94cc80cd85"],
+  ["e1be9b", "e1bcabcd85"],
+  ["e1bcad", "ce97cc94cc81"],
+  ["e1bcad", "e1bca9cc81"],
+  ["e1be9d", "ce97cc94cc81cd85"],
+  ["e1be9d", "e1bcadcd85"],
   ["e1bcaf", "ce97cc94cd82"],
-  ["e1bcb0", "ceb9cc93"],
-  ["e1bcb1", "ceb9cc94"],
-  ["e1bcb2", "ceb9cc93cc80"],
-  ["e1bcb3", "ceb9cc94cc80"],
-  ["e1bcb4", "ceb9cc93cc81"],
-  ["e1bcb5", "ceb9cc94cc81"],
-  ["e1bcb6", "ceb9cc93cd82"],
-  ["e1bcb7", "ceb9cc94cd82"],
+  ["e1bcaf", "e1bca9cd82"],
+  ["e1be9f", "ce97cc94cd82cd85"],
+  ["e1be9f", "e1bcafcd85"],
+  ["e1be99", "ce97cc94cd85"],
+  ["e1be99", "e1bca9cd85"],
+  ["e1bf8c", "ce97cd85"],
+  ["e1bf9a", "ce99cc80"],
+  ["ce8a", "ce99cc81"],
+  ["e1bf99", "ce99cc84"],
+  ["e1bf98", "ce99cc86"],
+  ["ceaa", "ce99cc88"],
   ["e1bcb8", "ce99cc93"],
-  ["e1bcb9", "ce99cc94"],
   ["e1bcba", "ce99cc93cc80"],
-  ["e1bcbb", "ce99cc94cc80"],
+  ["e1bcba", "e1bcb8cc80"],
   ["e1bcbc", "ce99cc93cc81"],
-  ["e1bcbd", "ce99cc94cc81"],
+  ["e1bcbc", "e1bcb8cc81"],
   ["e1bcbe", "ce99cc93cd82"],
+  ["e1bcbe", "e1bcb8cd82"],
+  ["e1bcb9", "ce99cc94"],
+  ["e1bcbb", "ce99cc94cc80"],
+  ["e1bcbb", "e1bcb9cc80"],
+  ["e1bcbd", "ce99cc94cc81"],
+  ["e1bcbd", "e1bcb9cc81"],
   ["e1bcbf", "ce99cc94cd82"],
-  ["e1bd80", "cebfcc93"],
-  ["e1bd81", "cebfcc94"],
-  ["e1bd82", "cebfcc93cc80"],
-  ["e1bd83", "cebfcc94cc80"],
-  ["e1bd84", "cebfcc93cc81"],
-  ["e1bd85", "cebfcc94cc81"],
+  ["e1bcbf", "e1bcb9cd82"],
+  ["e1bfb8", "ce9fcc80"],
+  ["ce8c", "ce9fcc81"],
   ["e1bd88", "ce9fcc93"],
-  ["e1bd89", "ce9fcc94"],
   ["e1bd8a", "ce9fcc93cc80"],
-  ["e1bd8b", "ce9fcc94cc80"],
+  ["e1bd8a", "e1bd88cc80"],
   ["e1bd8c", "ce9fcc93cc81"],
+  ["e1bd8c", "e1bd88cc81"],
+  ["e1bd89", "ce9fcc94"],
+  ["e1bd8b", "ce9fcc94cc80"],
+  ["e1bd8b", "e1bd89cc80"],
   ["e1bd8d", "ce9fcc94cc81"],
-  ["e1bd90", "cf85cc93"],
-  ["e1bd91", "cf85cc94"],
-  ["e1bd92", "cf85cc93cc80"],
-  ["e1bd93", "cf85cc94cc80"],
-  ["e1bd94", "cf85cc93cc81"],
-  ["e1bd95", "cf85cc94cc81"],
-  ["e1bd96", "cf85cc93cd82"],
-  ["e1bd97", "cf85cc94cd82"],
+  ["e1bd8d", "e1bd89cc81"],
+  ["e1bfac", "cea1cc94"],
+  ["e1bfaa", "cea5cc80"],
+  ["ce8e", "cea5cc81"],
+  ["e1bfa9", "cea5cc84"],
+  ["e1bfa8", "cea5cc86"],
+  ["ceab", "cea5cc88"],
   ["e1bd99", "cea5cc94"],
   ["e1bd9b", "cea5cc94cc80"],
+  ["e1bd9b", "e1bd99cc80"],
   ["e1bd9d", "cea5cc94cc81"],
+  ["e1bd9d", "e1bd99cc81"],
   ["e1bd9f", "cea5cc94cd82"],
-  ["e1bda0", "cf89cc93"],
-  ["e1bda1", "cf89cc94"],
-  ["e1bda2", "cf89cc93cc80"],
-  ["e1bda3", "cf89cc94cc80"],
-  ["e1bda4", "cf89cc93cc81"],
-  ["e1bda5", "cf89cc94cc81"],
-  ["e1bda6", "cf89cc93cd82"],
-  ["e1bda7", "cf89cc94cd82"],
+  ["e1bd9f", "e1bd99cd82"],
+  ["e1bfba", "cea9cc80"],
+  ["ce8f", "cea9cc81"],
   ["e1bda8", "cea9cc93"],
-  ["e1bda9", "cea9cc94"],
   ["e1bdaa", "cea9cc93cc80"],
-  ["e1bdab", "cea9cc94cc80"],
+  ["e1bdaa", "e1bda8cc80"],
+  ["e1beaa", "cea9cc93cc80cd85"],
+  ["e1beaa", "e1bdaacd85"],
   ["e1bdac", "cea9cc93cc81"],
-  ["e1bdad", "cea9cc94cc81"],
+  ["e1bdac", "e1bda8cc81"],
+  ["e1beac", "cea9cc93cc81cd85"],
+  ["e1beac", "e1bdaccd85"],
   ["e1bdae", "cea9cc93cd82"],
+  ["e1bdae", "e1bda8cd82"],
+  ["e1beae", "cea9cc93cd82cd85"],
+  ["e1beae", "e1bdaecd85"],
+  ["e1bea8", "cea9cc93cd85"],
+  ["e1bea8", "e1bda8cd85"],
+  ["e1bda9", "cea9cc94"],
+  ["e1bdab", "cea9cc94cc80"],
+  ["e1bdab", "e1bda9cc80"],
+  ["e1beab", "cea9cc94cc80cd85"],
+  ["e1beab", "e1bdabcd85"],
+  ["e1bdad", "cea9cc94cc81"],
+  ["e1bdad", "e1bda9cc81"],
+  ["e1bead", "cea9cc94cc81cd85"],
+  ["e1bead", "e1bdadcd85"],
   ["e1bdaf", "cea9cc94cd82"],
+  ["e1bdaf", "e1bda9cd82"],
+  ["e1beaf", "cea9cc94cd82cd85"],
+  ["e1beaf", "e1bdafcd85"],
+  ["e1bea9", "cea9cc94cd85"],
+  ["e1bea9", "e1bda9cd85"],
+  ["e1bfbc", "cea9cd85"],
   ["e1bdb0", "ceb1cc80"],
-  ["e1bdb1", "ceb1cc81"],
-  ["e1bdb2", "ceb5cc80"],
-  ["e1bdb3", "ceb5cc81"],
-  ["e1bdb4", "ceb7cc80"],
-  ["e1bdb5", "ceb7cc81"],
-  ["e1bdb6", "ceb9cc80"],
-  ["e1bdb7", "ceb9cc81"],
-  ["e1bdb8", "cebfcc80"],
-  ["e1bdb9", "cebfcc81"],
-  ["e1bdba", "cf85cc80"],
-  ["e1bdbb", "cf85cc81"],
-  ["e1bdbc", "cf89cc80"],
-  ["e1bdbd", "cf89cc81"],
-  ["e1be80", "ceb1cd85cc93"],
-  ["e1be81", "ceb1cd85cc94"],
-  ["e1be82", "ceb1cd85cc93cc80"],
-  ["e1be83", "ceb1cd85cc94cc80"],
-  ["e1be84", "ceb1cd85cc93cc81"],
-  ["e1be85", "ceb1cd85cc94cc81"],
-  ["e1be86", "ceb1cd85cc93cd82"],
-  ["e1be87", "ceb1cd85cc94cd82"],
-  ["e1be88", "ce91cd85cc93"],
-  ["e1be89", "ce91cd85cc94"],
-  ["e1be8a", "ce91cd85cc93cc80"],
-  ["e1be8b", "ce91cd85cc94cc80"],
-  ["e1be8c", "ce91cd85cc93cc81"],
-  ["e1be8d", "ce91cd85cc94cc81"],
-  ["e1be8e", "ce91cd85cc93cd82"],
-  ["e1be8f", "ce91cd85cc94cd82"],
-  ["e1be90", "ceb7cd85cc93"],
-  ["e1be91", "ceb7cd85cc94"],
-  ["e1be92", "ceb7cd85cc93cc80"],
-  ["e1be93", "ceb7cd85cc94cc80"],
-  ["e1be94", "ceb7cd85cc93cc81"],
-  ["e1be95", "ceb7cd85cc94cc81"],
-  ["e1be96", "ceb7cd85cc93cd82"],
-  ["e1be97", "ceb7cd85cc94cd82"],
-  ["e1be98", "ce97cd85cc93"],
-  ["e1be99", "ce97cd85cc94"],
-  ["e1be9a", "ce97cd85cc93cc80"],
-  ["e1be9b", "ce97cd85cc94cc80"],
-  ["e1be9c", "ce97cd85cc93cc81"],
-  ["e1be9d", "ce97cd85cc94cc81"],
-  ["e1be9e", "ce97cd85cc93cd82"],
-  ["e1be9f", "ce97cd85cc94cd82"],
-  ["e1bea0", "cf89cd85cc93"],
-  ["e1bea1", "cf89cd85cc94"],
-  ["e1bea2", "cf89cd85cc93cc80"],
-  ["e1bea3", "cf89cd85cc94cc80"],
-  ["e1bea4", "cf89cd85cc93cc81"],
-  ["e1bea5", "cf89cd85cc94cc81"],
-  ["e1bea6", "cf89cd85cc93cd82"],
-  ["e1bea7", "cf89cd85cc94cd82"],
-  ["e1bea8", "cea9cd85cc93"],
-  ["e1bea9", "cea9cd85cc94"],
-  ["e1beaa", "cea9cd85cc93cc80"],
-  ["e1beab", "cea9cd85cc94cc80"],
-  ["e1beac", "cea9cd85cc93cc81"],
-  ["e1bead", "cea9cd85cc94cc81"],
-  ["e1beae", "cea9cd85cc93cd82"],
-  ["e1beaf", "cea9cd85cc94cd82"],
-  ["e1beb0", "ceb1cc86"],
+  ["e1beb2", "ceb1cc80cd85"],
+  ["e1beb2", "e1bdb0cd85"],
+  ["ceac", "ceb1cc81"],
+  ["e1beb4", "ceb1cc81cd85"],
+  ["e1beb4", "ceaccd85"],
   ["e1beb1", "ceb1cc84"],
-  ["e1beb2", "ceb1cd85cc80"],
-  ["e1beb3", "ceb1cd85"],
-  ["e1beb4", "ceb1cd85cc81"],
+  ["e1beb0", "ceb1cc86"],
+  ["e1bc80", "ceb1cc93"],
+  ["e1bc82", "ceb1cc93cc80"],
+  ["e1bc82", "e1bc80cc80"],
+  ["e1be82", "ceb1cc93cc80cd85"],
+  ["e1be82", "e1bc82cd85"],
+  ["e1bc84", "ceb1cc93cc81"],
+  ["e1bc84", "e1bc80cc81"],
+  ["e1be84", "ceb1cc93cc81cd85"],
+  ["e1be84", "e1bc84cd85"],
+  ["e1bc86", "ceb1cc93cd82"],
+  ["e1bc86", "e1bc80cd82"],
+  ["e1be86", "ceb1cc93cd82cd85"],
+  ["e1be86", "e1bc86cd85"],
+  ["e1be80", "ceb1cc93cd85"],
+  ["e1be80", "e1bc80cd85"],
+  ["e1bc81", "ceb1cc94"],
+  ["e1bc83", "ceb1cc94cc80"],
+  ["e1bc83", "e1bc81cc80"],
+  ["e1be83", "ceb1cc94cc80cd85"],
+  ["e1be83", "e1bc83cd85"],
+  ["e1bc85", "ceb1cc94cc81"],
+  ["e1bc85", "e1bc81cc81"],
+  ["e1be85", "ceb1cc94cc81cd85"],
+  ["e1be85", "e1bc85cd85"],
+  ["e1bc87", "ceb1cc94cd82"],
+  ["e1bc87", "e1bc81cd82"],
+  ["e1be87", "ceb1cc94cd82cd85"],
+  ["e1be87", "e1bc87cd85"],
+  ["e1be81", "ceb1cc94cd85"],
+  ["e1be81", "e1bc81cd85"],
   ["e1beb6", "ceb1cd82"],
-  ["e1beb7", "ceb1cd85cd82"],
-  ["e1beb8", "ce91cc86"],
-  ["e1beb9", "ce91cc84"],
-  ["e1beba", "ce91cc80"],
-  ["e1bebb", "ce91cc81"],
-  ["e1bebc", "ce91cd85"],
-  ["e1bebe", "ceb9"],
-  ["e1bf81", "c2a8cd82"],
-  ["e1bf82", "ceb7cd85cc80"],
-  ["e1bf83", "ceb7cd85"],
-  ["e1bf84", "ceb7cd85cc81"],
+  ["e1beb7", "ceb1cd82cd85"],
+  ["e1beb7", "e1beb6cd85"],
+  ["e1beb3", "ceb1cd85"],
+  ["e1bdb2", "ceb5cc80"],
+  ["cead", "ceb5cc81"],
+  ["e1bc90", "ceb5cc93"],
+  ["e1bc92", "ceb5cc93cc80"],
+  ["e1bc92", "e1bc90cc80"],
+  ["e1bc94", "ceb5cc93cc81"],
+  ["e1bc94", "e1bc90cc81"],
+  ["e1bc91", "ceb5cc94"],
+  ["e1bc93", "ceb5cc94cc80"],
+  ["e1bc93", "e1bc91cc80"],
+  ["e1bc95", "ceb5cc94cc81"],
+  ["e1bc95", "e1bc91cc81"],
+  ["e1bdb4", "ceb7cc80"],
+  ["e1bf82", "ceb7cc80cd85"],
+  ["e1bf82", "e1bdb4cd85"],
+  ["ceae", "ceb7cc81"],
+  ["e1bf84", "ceb7cc81cd85"],
+  ["e1bf84", "ceaecd85"],
+  ["e1bca0", "ceb7cc93"],
+  ["e1bca2", "ceb7cc93cc80"],
+  ["e1bca2", "e1bca0cc80"],
+  ["e1be92", "ceb7cc93cc80cd85"],
+  ["e1be92", "e1bca2cd85"],
+  ["e1bca4", "ceb7cc93cc81"],
+  ["e1bca4", "e1bca0cc81"],
+  ["e1be94", "ceb7cc93cc81cd85"],
+  ["e1be94", "e1bca4cd85"],
+  ["e1bca6", "ceb7cc93cd82"],
+  ["e1bca6", "e1bca0cd82"],
+  ["e1be96", "ceb7cc93cd82cd85"],
+  ["e1be96", "e1bca6cd85"],
+  ["e1be90", "ceb7cc93cd85"],
+  ["e1be90", "e1bca0cd85"],
+  ["e1bca1", "ceb7cc94"],
+  ["e1bca3", "ceb7cc94cc80"],
+  ["e1bca3", "e1bca1cc80"],
+  ["e1be93", "ceb7cc94cc80cd85"],
+  ["e1be93", "e1bca3cd85"],
+  ["e1bca5", "ceb7cc94cc81"],
+  ["e1bca5", "e1bca1cc81"],
+  ["e1be95", "ceb7cc94cc81cd85"],
+  ["e1be95", "e1bca5cd85"],
+  ["e1bca7", "ceb7cc94cd82"],
+  ["e1bca7", "e1bca1cd82"],
+  ["e1be97", "ceb7cc94cd82cd85"],
+  ["e1be97", "e1bca7cd85"],
+  ["e1be91", "ceb7cc94cd85"],
+  ["e1be91", "e1bca1cd85"],
   ["e1bf86", "ceb7cd82"],
-  ["e1bf87", "ceb7cd85cd82"],
-  ["e1bf88", "ce95cc80"],
-  ["e1bf89", "ce95cc81"],
-  ["e1bf8a", "ce97cc80"],
-  ["e1bf8b", "ce97cc81"],
-  ["e1bf8c", "ce97cd85"],
-  ["e1bf8d", "e1bebfcc80"],
-  ["e1bf8e", "e1bebfcc81"],
-  ["e1bf8f", "e1bebfcd82"],
-  ["e1bf90", "ceb9cc86"],
+  ["e1bf87", "ceb7cd82cd85"],
+  ["e1bf87", "e1bf86cd85"],
+  ["e1bf83", "ceb7cd85"],
+  ["e1bebe", "ceb9"],
+  ["e1bdb6", "ceb9cc80"],
+  ["ceaf", "ceb9cc81"],
   ["e1bf91", "ceb9cc84"],
+  ["e1bf90", "ceb9cc86"],
+  ["cf8a", "ceb9cc88"],
   ["e1bf92", "ceb9cc88cc80"],
+  ["e1bf92", "cf8acc80"],
   ["e1bf93", "ceb9cc88cc81"],
-  ["e1bf96", "ceb9cd82"],
+  ["e1bf93", "cf8acc81"],
   ["e1bf97", "ceb9cc88cd82"],
-  ["e1bf98", "ce99cc86"],
-  ["e1bf99", "ce99cc84"],
-  ["e1bf9a", "ce99cc80"],
-  ["e1bf9b", "ce99cc81"],
-  ["e1bf9d", "e1bfbecc80"],
-  ["e1bf9e", "e1bfbecc81"],
-  ["e1bf9f", "e1bfbecd82"],
-  ["e1bfa0", "cf85cc86"],
+  ["e1bf97", "cf8acd82"],
+  ["e1bcb0", "ceb9cc93"],
+  ["e1bcb2", "ceb9cc93cc80"],
+  ["e1bcb2", "e1bcb0cc80"],
+  ["e1bcb4", "ceb9cc93cc81"],
+  ["e1bcb4", "e1bcb0cc81"],
+  ["e1bcb6", "ceb9cc93cd82"],
+  ["e1bcb6", "e1bcb0cd82"],
+  ["e1bcb1", "ceb9cc94"],
+  ["e1bcb3", "ceb9cc94cc80"],
+  ["e1bcb3", "e1bcb1cc80"],
+  ["e1bcb5", "ceb9cc94cc81"],
+  ["e1bcb5", "e1bcb1cc81"],
+  ["e1bcb7", "ceb9cc94cd82"],
+  ["e1bcb7", "e1bcb1cd82"],
+  ["e1bf96", "ceb9cd82"],
+  ["e1bdb8", "cebfcc80"],
+  ["cf8c", "cebfcc81"],
+  ["e1bd80", "cebfcc93"],
+  ["e1bd82", "cebfcc93cc80"],
+  ["e1bd82", "e1bd80cc80"],
+  ["e1bd84", "cebfcc93cc81"],
+  ["e1bd84", "e1bd80cc81"],
+  ["e1bd81", "cebfcc94"],
+  ["e1bd83", "cebfcc94cc80"],
+  ["e1bd83", "e1bd81cc80"],
+  ["e1bd85", "cebfcc94cc81"],
+  ["e1bd85", "e1bd81cc81"],
+  ["e1bfa4", "cf81cc93"],
+  ["e1bfa5", "cf81cc94"],
+  ["e1bdba", "cf85cc80"],
+  ["cf8d", "cf85cc81"],
   ["e1bfa1", "cf85cc84"],
+  ["e1bfa0", "cf85cc86"],
+  ["cf8b", "cf85cc88"],
   ["e1bfa2", "cf85cc88cc80"],
+  ["e1bfa2", "cf8bcc80"],
   ["e1bfa3", "cf85cc88cc81"],
-  ["e1bfa4", "cf81cc93"],
-  ["e1bfa5", "cf81cc94"],
-  ["e1bfa6", "cf85cd82"],
+  ["e1bfa3", "cf8bcc81"],
   ["e1bfa7", "cf85cc88cd82"],
-  ["e1bfa8", "cea5cc86"],
-  ["e1bfa9", "cea5cc84"],
-  ["e1bfaa", "cea5cc80"],
-  ["e1bfab", "cea5cc81"],
-  ["e1bfac", "cea1cc94"],
-  ["e1bfad", "c2a8cc80"],
-  ["e1bfae", "c2a8cc81"],
-  ["e1bfaf", "60"],
-  ["e1bfb2", "cf89cd85cc80"],
-  ["e1bfb3", "cf89cd85"],
-  ["e1bfb4", "cebfcd85cc81"],
+  ["e1bfa7", "cf8bcd82"],
+  ["e1bd90", "cf85cc93"],
+  ["e1bd92", "cf85cc93cc80"],
+  ["e1bd92", "e1bd90cc80"],
+  ["e1bd94", "cf85cc93cc81"],
+  ["e1bd94", "e1bd90cc81"],
+  ["e1bd96", "cf85cc93cd82"],
+  ["e1bd96", "e1bd90cd82"],
+  ["e1bd91", "cf85cc94"],
+  ["e1bd93", "cf85cc94cc80"],
+  ["e1bd93", "e1bd91cc80"],
+  ["e1bd95", "cf85cc94cc81"],
+  ["e1bd95", "e1bd91cc81"],
+  ["e1bd97", "cf85cc94cd82"],
+  ["e1bd97", "e1bd91cd82"],
+  ["e1bfa6", "cf85cd82"],
+  ["e1bdbc", "cf89cc80"],
+  ["e1bfb2", "cf89cc80cd85"],
+  ["e1bfb2", "e1bdbccd85"],
+  ["cf8e", "cf89cc81"],
+  ["e1bfb4", "cf89cc81cd85"],
+  ["e1bfb4", "cf8ecd85"],
+  ["e1bda0", "cf89cc93"],
+  ["e1bda2", "cf89cc93cc80"],
+  ["e1bda2", "e1bda0cc80"],
+  ["e1bea2", "cf89cc93cc80cd85"],
+  ["e1bea2", "e1bda2cd85"],
+  ["e1bda4", "cf89cc93cc81"],
+  ["e1bda4", "e1bda0cc81"],
+  ["e1bea4", "cf89cc93cc81cd85"],
+  ["e1bea4", "e1bda4cd85"],
+  ["e1bda6", "cf89cc93cd82"],
+  ["e1bda6", "e1bda0cd82"],
+  ["e1bea6", "cf89cc93cd82cd85"],
+  ["e1bea6", "e1bda6cd85"],
+  ["e1bea0", "cf89cc93cd85"],
+  ["e1bea0", "e1bda0cd85"],
+  ["e1bda1", "cf89cc94"],
+  ["e1bda3", "cf89cc94cc80"],
+  ["e1bda3", "e1bda1cc80"],
+  ["e1bea3", "cf89cc94cc80cd85"],
+  ["e1bea3", "e1bda3cd85"],
+  ["e1bda5", "cf89cc94cc81"],
+  ["e1bda5", "e1bda1cc81"],
+  ["e1bea5", "cf89cc94cc81cd85"],
+  ["e1bea5", "e1bda5cd85"],
+  ["e1bda7", "cf89cc94cd82"],
+  ["e1bda7", "e1bda1cd82"],
+  ["e1bea7", "cf89cc94cd82cd85"],
+  ["e1bea7", "e1bda7cd85"],
+  ["e1bea1", "cf89cc94cd85"],
+  ["e1bea1", "e1bda1cd85"],
   ["e1bfb6", "cf89cd82"],
-  ["e1bfb7", "cf89cd85cd82"],
-  ["e1bfb8", "ce9fcc80"],
-  ["e1bfb9", "ce9fcc81"],
-  ["e1bfba", "cea9cc80"],
-  ["e1bfbb", "cea9cc81"],
-  ["e1bfbc", "cea9cd85"],
-  ["e1bfbd", "c2b4"],
+  ["e1bfb7", "cf89cd82cd85"],
+  ["e1bfb7", "e1bfb6cd85"],
+  ["e1bfb3", "cf89cd85"],
+  ["cf93", "cf92cc81"],
+  ["cf94", "cf92cc88"],
+  ["d087", "d086cc88"],
+  ["d390", "d090cc86"],
+  ["d392", "d090cc88"],
+  ["d083", "d093cc81"],
+  ["d080", "d095cc80"],
+  ["d396", "d095cc86"],
+  ["d081", "d095cc88"],
+  ["d381", "d096cc86"],
+  ["d39c", "d096cc88"],
+  ["d39e", "d097cc88"],
+  ["d08d", "d098cc80"],
+  ["d3a2", "d098cc84"],
+  ["d099", "d098cc86"],
+  ["d3a4", "d098cc88"],
+  ["d08c", "d09acc81"],
+  ["d3a6", "d09ecc88"],
+  ["d3ae", "d0a3cc84"],
+  ["d08e", "d0a3cc86"],
+  ["d3b0", "d0a3cc88"],
+  ["d3b2", "d0a3cc8b"],
+  ["d3b4", "d0a7cc88"],
+  ["d3b8", "d0abcc88"],
+  ["d3ac", "d0adcc88"],
+  ["d391", "d0b0cc86"],
+  ["d393", "d0b0cc88"],
+  ["d193", "d0b3cc81"],
+  ["d190", "d0b5cc80"],
+  ["d397", "d0b5cc86"],
+  ["d191", "d0b5cc88"],
+  ["d382", "d0b6cc86"],
+  ["d39d", "d0b6cc88"],
+  ["d39f", "d0b7cc88"],
+  ["d19d", "d0b8cc80"],
+  ["d3a3", "d0b8cc84"],
+  ["d0b9", "d0b8cc86"],
+  ["d3a5", "d0b8cc88"],
+  ["d19c", "d0bacc81"],
+  ["d3a7", "d0becc88"],
+  ["d3af", "d183cc84"],
+  ["d19e", "d183cc86"],
+  ["d3b1", "d183cc88"],
+  ["d3b3", "d183cc8b"],
+  ["d3b5", "d187cc88"],
+  ["d3b9", "d18bcc88"],
+  ["d3ad", "d18dcc88"],
+  ["d197", "d196cc88"],
+  ["d1b6", "d1b4cc8f"],
+  ["d1b7", "d1b5cc8f"],
+  ["d39a", "d398cc88"],
+  ["d39b", "d399cc88"],
+  ["d3aa", "d3a8cc88"],
+  ["d3ab", "d3a9cc88"],
+  ["efacae", "d790d6b7"],
+  ["efacaf", "d790d6b8"],
+  ["efacb0", "d790d6bc"],
+  ["efacb1", "d791d6bc"],
+  ["efad8c", "d791d6bf"],
+  ["efacb2", "d792d6bc"],
+  ["efacb3", "d793d6bc"],
+  ["efacb4", "d794d6bc"],
+  ["efad8b", "d795d6b9"],
+  ["efacb5", "d795d6bc"],
+  ["efacb6", "d796d6bc"],
+  ["efacb8", "d798d6bc"],
+  ["efac9d", "d799d6b4"],
+  ["efacb9", "d799d6bc"],
+  ["efacba", "d79ad6bc"],
+  ["efacbb", "d79bd6bc"],
+  ["efad8d", "d79bd6bf"],
+  ["efacbc", "d79cd6bc"],
+  ["efacbe", "d79ed6bc"],
+  ["efad80", "d7a0d6bc"],
+  ["efad81", "d7a1d6bc"],
+  ["efad83", "d7a3d6bc"],
+  ["efad84", "d7a4d6bc"],
+  ["efad8e", "d7a4d6bf"],
+  ["efad86", "d7a6d6bc"],
+  ["efad87", "d7a7d6bc"],
+  ["efad88", "d7a8d6bc"],
+  ["efad89", "d7a9d6bc"],
+  ["efacac", "d7a9d6bcd781"],
+  ["efacac", "efad89d781"],
+  ["efacad", "d7a9d6bcd782"],
+  ["efacad", "efad89d782"],
+  ["efacaa", "d7a9d781"],
+  ["efacab", "d7a9d782"],
+  ["efad8a", "d7aad6bc"],
+  ["efac9f", "d7b2d6b7"],
+  ["d8a2", "d8a7d993"],
+  ["d8a3", "d8a7d994"],
+  ["d8a5", "d8a7d995"],
+  ["d8a4", "d988d994"],
+  ["d8a6", "d98ad994"],
+  ["db82", "db81d994"],
+  ["db93", "db92d994"],
+  ["db80", "db95d994"],
+  ["e0a598", "e0a495e0a4bc"],
+  ["e0a599", "e0a496e0a4bc"],
+  ["e0a59a", "e0a497e0a4bc"],
+  ["e0a59b", "e0a49ce0a4bc"],
+  ["e0a59c", "e0a4a1e0a4bc"],
+  ["e0a59d", "e0a4a2e0a4bc"],
+  ["e0a4a9", "e0a4a8e0a4bc"],
+  ["e0a59e", "e0a4abe0a4bc"],
+  ["e0a59f", "e0a4afe0a4bc"],
+  ["e0a4b1", "e0a4b0e0a4bc"],
+  ["e0a4b4", "e0a4b3e0a4bc"],
+  ["e0a79c", "e0a6a1e0a6bc"],
+  ["e0a79d", "e0a6a2e0a6bc"],
+  ["e0a79f", "e0a6afe0a6bc"],
+  ["e0a78b", "e0a787e0a6be"],
+  ["e0a78c", "e0a787e0a797"],
+  ["e0a999", "e0a896e0a8bc"],
+  ["e0a99a", "e0a897e0a8bc"],
+  ["e0a99b", "e0a89ce0a8bc"],
+  ["e0a99e", "e0a8abe0a8bc"],
+  ["e0a8b3", "e0a8b2e0a8bc"],
+  ["e0a8b6", "e0a8b8e0a8bc"],
+  ["e0ad9c", "e0aca1e0acbc"],
+  ["e0ad9d", "e0aca2e0acbc"],
+  ["e0ad8b", "e0ad87e0acbe"],
+  ["e0ad88", "e0ad87e0ad96"],
+  ["e0ad8c", "e0ad87e0ad97"],
+  ["e0ae94", "e0ae92e0af97"],
+  ["e0af8a", "e0af86e0aebe"],
+  ["e0af8c", "e0af86e0af97"],
+  ["e0af8b", "e0af87e0aebe"],
+  ["e0b188", "e0b186e0b196"],
+  ["e0b380", "e0b2bfe0b395"],
+  ["e0b38a", "e0b386e0b382"],
+  ["e0b38b", "e0b386e0b382e0b395"],
+  ["e0b38b", "e0b38ae0b395"],
+  ["e0b387", "e0b386e0b395"],
+  ["e0b388", "e0b386e0b396"],
+  ["e0b58a", "e0b586e0b4be"],
+  ["e0b58c", "e0b586e0b597"],
+  ["e0b58b", "e0b587e0b4be"],
+  ["e0b79a", "e0b799e0b78a"],
+  ["e0b79c", "e0b799e0b78f"],
+  ["e0b79d", "e0b799e0b78fe0b78a"],
+  ["e0b79d", "e0b79ce0b78a"],
+  ["e0b79e", "e0b799e0b79f"],
+  ["e0bda9", "e0bd80e0beb5"],
+  ["e0bd83", "e0bd82e0beb7"],
+  ["e0bd8d", "e0bd8ce0beb7"],
+  ["e0bd92", "e0bd91e0beb7"],
+  ["e0bd97", "e0bd96e0beb7"],
+  ["e0bd9c", "e0bd9be0beb7"],
+  ["e0bdb3", "e0bdb1e0bdb2"],
+  ["e0bdb5", "e0bdb1e0bdb4"],
+  ["e0be81", "e0bdb1e0be80"],
+  ["e0beb9", "e0be90e0beb5"],
+  ["e0be93", "e0be92e0beb7"],
+  ["e0be9d", "e0be9ce0beb7"],
+  ["e0bea2", "e0bea1e0beb7"],
+  ["e0bea7", "e0bea6e0beb7"],
+  ["e0beac", "e0beabe0beb7"],
+  ["e0bdb6", "e0beb2e0be80"],
+  ["e0bdb8", "e0beb3e0be80"],
+  ["e180a6", "e180a5e180ae"],
+  ["eab080", "e18480e185a1"],
+  ["eab081", "e18480e185a1e186a8"],
+  ["eab081", "eab080e186a8"],
+  ["eab082", "e18480e185a1e186a9"],
+  ["eab082", "eab080e186a9"],
+  ["eab083", "e18480e185a1e186aa"],
+  ["eab083", "eab080e186aa"],
+  ["eab084", "e18480e185a1e186ab"],
+  ["eab084", "eab080e186ab"],
+  ["eab085", "e18480e185a1e186ac"],
+  ["eab085", "eab080e186ac"],
+  ["eab086", "e18480e185a1e186ad"],
+  ["eab086", "eab080e186ad"],
+  ["eab087", "e18480e185a1e186ae"],
+  ["eab087", "eab080e186ae"],
+  ["eab088", "e18480e185a1e186af"],
+  ["eab088", "eab080e186af"],
+  ["eab089", "e18480e185a1e186b0"],
+  ["eab089", "eab080e186b0"],
+  ["eab08a", "e18480e185a1e186b1"],
+  ["eab08a", "eab080e186b1"],
+  ["eab08b", "e18480e185a1e186b2"],
+  ["eab08b", "eab080e186b2"],
+  ["eab08c", "e18480e185a1e186b3"],
+  ["eab08c", "eab080e186b3"],
+  ["eab08d", "e18480e185a1e186b4"],
+  ["eab08d", "eab080e186b4"],
+  ["eab08e", "e18480e185a1e186b5"],
+  ["eab08e", "eab080e186b5"],
+  ["eab08f", "e18480e185a1e186b6"],
+  ["eab08f", "eab080e186b6"],
+  ["eab090", "e18480e185a1e186b7"],
+  ["eab090", "eab080e186b7"],
+  ["eab091", "e18480e185a1e186b8"],
+  ["eab091", "eab080e186b8"],
+  ["eab092", "e18480e185a1e186b9"],
+  ["eab092", "eab080e186b9"],
+  ["eab093", "e18480e185a1e186ba"],
+  ["eab093", "eab080e186ba"],
+  ["eab094", "e18480e185a1e186bb"],
+  ["eab094", "eab080e186bb"],
+  ["eab095", "e18480e185a1e186bc"],
+  ["eab095", "eab080e186bc"],
+  ["eab096", "e18480e185a1e186bd"],
+  ["eab096", "eab080e186bd"],
+  ["eab097", "e18480e185a1e186be"],
+  ["eab097", "eab080e186be"],
+  ["eab098", "e18480e185a1e186bf"],
+  ["eab098", "eab080e186bf"],
+  ["eab099", "e18480e185a1e18780"],
+  ["eab099", "eab080e18780"],
+  ["eab09a", "e18480e185a1e18781"],
+  ["eab09a", "eab080e18781"],
+  ["eab09b", "e18480e185a1e18782"],
+  ["eab09b", "eab080e18782"],
+  ["eab09c", "e18480e185a2"],
+  ["eab09d", "e18480e185a2e186a8"],
+  ["eab09d", "eab09ce186a8"],
+  ["eab09e", "e18480e185a2e186a9"],
+  ["eab09e", "eab09ce186a9"],
+  ["eab09f", "e18480e185a2e186aa"],
+  ["eab09f", "eab09ce186aa"],
+  ["eab0a0", "e18480e185a2e186ab"],
+  ["eab0a0", "eab09ce186ab"],
+  ["eab0a1", "e18480e185a2e186ac"],
+  ["eab0a1", "eab09ce186ac"],
+  ["eab0a2", "e18480e185a2e186ad"],
+  ["eab0a2", "eab09ce186ad"],
+  ["eab0a3", "e18480e185a2e186ae"],
+  ["eab0a3", "eab09ce186ae"],
+  ["eab0a4", "e18480e185a2e186af"],
+  ["eab0a4", "eab09ce186af"],
+  ["eab0a5", "e18480e185a2e186b0"],
+  ["eab0a5", "eab09ce186b0"],
+  ["eab0a6", "e18480e185a2e186b1"],
+  ["eab0a6", "eab09ce186b1"],
+  ["eab0a7", "e18480e185a2e186b2"],
+  ["eab0a7", "eab09ce186b2"],
+  ["eab0a8", "e18480e185a2e186b3"],
+  ["eab0a8", "eab09ce186b3"],
+  ["eab0a9", "e18480e185a2e186b4"],
+  ["eab0a9", "eab09ce186b4"],
+  ["eab0aa", "e18480e185a2e186b5"],
+  ["eab0aa", "eab09ce186b5"],
+  ["eab0ab", "e18480e185a2e186b6"],
+  ["eab0ab", "eab09ce186b6"],
+  ["eab0ac", "e18480e185a2e186b7"],
+  ["eab0ac", "eab09ce186b7"],
+  ["eab0ad", "e18480e185a2e186b8"],
+  ["eab0ad", "eab09ce186b8"],
+  ["eab0ae", "e18480e185a2e186b9"],
+  ["eab0ae", "eab09ce186b9"],
+  ["eab0af", "e18480e185a2e186ba"],
+  ["eab0af", "eab09ce186ba"],
+  ["eab0b0", "e18480e185a2e186bb"],
+  ["eab0b0", "eab09ce186bb"],
+  ["eab0b1", "e18480e185a2e186bc"],
+  ["eab0b1", "eab09ce186bc"],
+  ["eab0b2", "e18480e185a2e186bd"],
+  ["eab0b2", "eab09ce186bd"],
+  ["eab0b3", "e18480e185a2e186be"],
+  ["eab0b3", "eab09ce186be"],
+  ["eab0b4", "e18480e185a2e186bf"],
+  ["eab0b4", "eab09ce186bf"],
+  ["eab0b5", "e18480e185a2e18780"],
+  ["eab0b5", "eab09ce18780"],
+  ["eab0b6", "e18480e185a2e18781"],
+  ["eab0b6", "eab09ce18781"],
+  ["eab0b7", "e18480e185a2e18782"],
+  ["eab0b7", "eab09ce18782"],
+  ["eab0b8", "e18480e185a3"],
+  ["eab0b9", "e18480e185a3e186a8"],
+  ["eab0b9", "eab0b8e186a8"],
+  ["eab0ba", "e18480e185a3e186a9"],
+  ["eab0ba", "eab0b8e186a9"],
+  ["eab0bb", "e18480e185a3e186aa"],
+  ["eab0bb", "eab0b8e186aa"],
+  ["eab0bc", "e18480e185a3e186ab"],
+  ["eab0bc", "eab0b8e186ab"],
+  ["eab0bd", "e18480e185a3e186ac"],
+  ["eab0bd", "eab0b8e186ac"],
+  ["eab0be", "e18480e185a3e186ad"],
+  ["eab0be", "eab0b8e186ad"],
+  ["eab0bf", "e18480e185a3e186ae"],
+  ["eab0bf", "eab0b8e186ae"],
+  ["eab180", "e18480e185a3e186af"],
+  ["eab180", "eab0b8e186af"],
+  ["eab181", "e18480e185a3e186b0"],
+  ["eab181", "eab0b8e186b0"],
+  ["eab182", "e18480e185a3e186b1"],
+  ["eab182", "eab0b8e186b1"],
+  ["eab183", "e18480e185a3e186b2"],
+  ["eab183", "eab0b8e186b2"],
+  ["eab184", "e18480e185a3e186b3"],
+  ["eab184", "eab0b8e186b3"],
+  ["eab185", "e18480e185a3e186b4"],
+  ["eab185", "eab0b8e186b4"],
+  ["eab186", "e18480e185a3e186b5"],
+  ["eab186", "eab0b8e186b5"],
+  ["eab187", "e18480e185a3e186b6"],
+  ["eab187", "eab0b8e186b6"],
+  ["eab188", "e18480e185a3e186b7"],
+  ["eab188", "eab0b8e186b7"],
+  ["eab189", "e18480e185a3e186b8"],
+  ["eab189", "eab0b8e186b8"],
+  ["eab18a", "e18480e185a3e186b9"],
+  ["eab18a", "eab0b8e186b9"],
+  ["eab18b", "e18480e185a3e186ba"],
+  ["eab18b", "eab0b8e186ba"],
+  ["eab18c", "e18480e185a3e186bb"],
+  ["eab18c", "eab0b8e186bb"],
+  ["eab18d", "e18480e185a3e186bc"],
+  ["eab18d", "eab0b8e186bc"],
+  ["eab18e", "e18480e185a3e186bd"],
+  ["eab18e", "eab0b8e186bd"],
+  ["eab18f", "e18480e185a3e186be"],
+  ["eab18f", "eab0b8e186be"],
+  ["eab190", "e18480e185a3e186bf"],
+  ["eab190", "eab0b8e186bf"],
+  ["eab191", "e18480e185a3e18780"],
+  ["eab191", "eab0b8e18780"],
+  ["eab192", "e18480e185a3e18781"],
+  ["eab192", "eab0b8e18781"],
+  ["eab193", "e18480e185a3e18782"],
+  ["eab193", "eab0b8e18782"],
+  ["eab194", "e18480e185a4"],
+  ["eab195", "e18480e185a4e186a8"],
+  ["eab195", "eab194e186a8"],
+  ["eab196", "e18480e185a4e186a9"],
+  ["eab196", "eab194e186a9"],
+  ["eab197", "e18480e185a4e186aa"],
+  ["eab197", "eab194e186aa"],
+  ["eab198", "e18480e185a4e186ab"],
+  ["eab198", "eab194e186ab"],
+  ["eab199", "e18480e185a4e186ac"],
+  ["eab199", "eab194e186ac"],
+  ["eab19a", "e18480e185a4e186ad"],
+  ["eab19a", "eab194e186ad"],
+  ["eab19b", "e18480e185a4e186ae"],
+  ["eab19b", "eab194e186ae"],
+  ["eab19c", "e18480e185a4e186af"],
+  ["eab19c", "eab194e186af"],
+  ["eab19d", "e18480e185a4e186b0"],
+  ["eab19d", "eab194e186b0"],
+  ["eab19e", "e18480e185a4e186b1"],
+  ["eab19e", "eab194e186b1"],
+  ["eab19f", "e18480e185a4e186b2"],
+  ["eab19f", "eab194e186b2"],
+  ["eab1a0", "e18480e185a4e186b3"],
+  ["eab1a0", "eab194e186b3"],
+  ["eab1a1", "e18480e185a4e186b4"],
+  ["eab1a1", "eab194e186b4"],
+  ["eab1a2", "e18480e185a4e186b5"],
+  ["eab1a2", "eab194e186b5"],
+  ["eab1a3", "e18480e185a4e186b6"],
+  ["eab1a3", "eab194e186b6"],
+  ["eab1a4", "e18480e185a4e186b7"],
+  ["eab1a4", "eab194e186b7"],
+  ["eab1a5", "e18480e185a4e186b8"],
+  ["eab1a5", "eab194e186b8"],
+  ["eab1a6", "e18480e185a4e186b9"],
+  ["eab1a6", "eab194e186b9"],
+  ["eab1a7", "e18480e185a4e186ba"],
+  ["eab1a7", "eab194e186ba"],
+  ["eab1a8", "e18480e185a4e186bb"],
+  ["eab1a8", "eab194e186bb"],
+  ["eab1a9", "e18480e185a4e186bc"],
+  ["eab1a9", "eab194e186bc"],
+  ["eab1aa", "e18480e185a4e186bd"],
+  ["eab1aa", "eab194e186bd"],
+  ["eab1ab", "e18480e185a4e186be"],
+  ["eab1ab", "eab194e186be"],
+  ["eab1ac", "e18480e185a4e186bf"],
+  ["eab1ac", "eab194e186bf"],
+  ["eab1ad", "e18480e185a4e18780"],
+  ["eab1ad", "eab194e18780"],
+  ["eab1ae", "e18480e185a4e18781"],
+  ["eab1ae", "eab194e18781"],
+  ["eab1af", "e18480e185a4e18782"],
+  ["eab1af", "eab194e18782"],
+  ["eab1b0", "e18480e185a5"],
+  ["eab1b1", "e18480e185a5e186a8"],
+  ["eab1b1", "eab1b0e186a8"],
+  ["eab1b2", "e18480e185a5e186a9"],
+  ["eab1b2", "eab1b0e186a9"],
+  ["eab1b3", "e18480e185a5e186aa"],
+  ["eab1b3", "eab1b0e186aa"],
+  ["eab1b4", "e18480e185a5e186ab"],
+  ["eab1b4", "eab1b0e186ab"],
+  ["eab1b5", "e18480e185a5e186ac"],
+  ["eab1b5", "eab1b0e186ac"],
+  ["eab1b6", "e18480e185a5e186ad"],
+  ["eab1b6", "eab1b0e186ad"],
+  ["eab1b7", "e18480e185a5e186ae"],
+  ["eab1b7", "eab1b0e186ae"],
+  ["eab1b8", "e18480e185a5e186af"],
+  ["eab1b8", "eab1b0e186af"],
+  ["eab1b9", "e18480e185a5e186b0"],
+  ["eab1b9", "eab1b0e186b0"],
+  ["eab1ba", "e18480e185a5e186b1"],
+  ["eab1ba", "eab1b0e186b1"],
+  ["eab1bb", "e18480e185a5e186b2"],
+  ["eab1bb", "eab1b0e186b2"],
+  ["eab1bc", "e18480e185a5e186b3"],
+  ["eab1bc", "eab1b0e186b3"],
+  ["eab1bd", "e18480e185a5e186b4"],
+  ["eab1bd", "eab1b0e186b4"],
+  ["eab1be", "e18480e185a5e186b5"],
+  ["eab1be", "eab1b0e186b5"],
+  ["eab1bf", "e18480e185a5e186b6"],
+  ["eab1bf", "eab1b0e186b6"],
+  ["eab280", "e18480e185a5e186b7"],
+  ["eab280", "eab1b0e186b7"],
+  ["eab281", "e18480e185a5e186b8"],
+  ["eab281", "eab1b0e186b8"],
+  ["eab282", "e18480e185a5e186b9"],
+  ["eab282", "eab1b0e186b9"],
+  ["eab283", "e18480e185a5e186ba"],
+  ["eab283", "eab1b0e186ba"],
+  ["eab284", "e18480e185a5e186bb"],
+  ["eab284", "eab1b0e186bb"],
+  ["eab285", "e18480e185a5e186bc"],
+  ["eab285", "eab1b0e186bc"],
+  ["eab286", "e18480e185a5e186bd"],
+  ["eab286", "eab1b0e186bd"],
+  ["eab287", "e18480e185a5e186be"],
+  ["eab287", "eab1b0e186be"],
+  ["eab288", "e18480e185a5e186bf"],
+  ["eab288", "eab1b0e186bf"],
+  ["eab289", "e18480e185a5e18780"],
+  ["eab289", "eab1b0e18780"],
+  ["eab28a", "e18480e185a5e18781"],
+  ["eab28a", "eab1b0e18781"],
+  ["eab28b", "e18480e185a5e18782"],
+  ["eab28b", "eab1b0e18782"],
+  ["eab28c", "e18480e185a6"],
+  ["eab28d", "e18480e185a6e186a8"],
+  ["eab28d", "eab28ce186a8"],
+  ["eab28e", "e18480e185a6e186a9"],
+  ["eab28e", "eab28ce186a9"],
+  ["eab28f", "e18480e185a6e186aa"],
+  ["eab28f", "eab28ce186aa"],
+  ["eab290", "e18480e185a6e186ab"],
+  ["eab290", "eab28ce186ab"],
+  ["eab291", "e18480e185a6e186ac"],
+  ["eab291", "eab28ce186ac"],
+  ["eab292", "e18480e185a6e186ad"],
+  ["eab292", "eab28ce186ad"],
+  ["eab293", "e18480e185a6e186ae"],
+  ["eab293", "eab28ce186ae"],
+  ["eab294", "e18480e185a6e186af"],
+  ["eab294", "eab28ce186af"],
+  ["eab295", "e18480e185a6e186b0"],
+  ["eab295", "eab28ce186b0"],
+  ["eab296", "e18480e185a6e186b1"],
+  ["eab296", "eab28ce186b1"],
+  ["eab297", "e18480e185a6e186b2"],
+  ["eab297", "eab28ce186b2"],
+  ["eab298", "e18480e185a6e186b3"],
+  ["eab298", "eab28ce186b3"],
+  ["eab299", "e18480e185a6e186b4"],
+  ["eab299", "eab28ce186b4"],
+  ["eab29a", "e18480e185a6e186b5"],
+  ["eab29a", "eab28ce186b5"],
+  ["eab29b", "e18480e185a6e186b6"],
+  ["eab29b", "eab28ce186b6"],
+  ["eab29c", "e18480e185a6e186b7"],
+  ["eab29c", "eab28ce186b7"],
+  ["eab29d", "e18480e185a6e186b8"],
+  ["eab29d", "eab28ce186b8"],
+  ["eab29e", "e18480e185a6e186b9"],
+  ["eab29e", "eab28ce186b9"],
+  ["eab29f", "e18480e185a6e186ba"],
+  ["eab29f", "eab28ce186ba"],
+  ["eab2a0", "e18480e185a6e186bb"],
+  ["eab2a0", "eab28ce186bb"],
+  ["eab2a1", "e18480e185a6e186bc"],
+  ["eab2a1", "eab28ce186bc"],
+  ["eab2a2", "e18480e185a6e186bd"],
+  ["eab2a2", "eab28ce186bd"],
+  ["eab2a3", "e18480e185a6e186be"],
+  ["eab2a3", "eab28ce186be"],
+  ["eab2a4", "e18480e185a6e186bf"],
+  ["eab2a4", "eab28ce186bf"],
+  ["eab2a5", "e18480e185a6e18780"],
+  ["eab2a5", "eab28ce18780"],
+  ["eab2a6", "e18480e185a6e18781"],
+  ["eab2a6", "eab28ce18781"],
+  ["eab2a7", "e18480e185a6e18782"],
+  ["eab2a7", "eab28ce18782"],
+  ["eab2a8", "e18480e185a7"],
+  ["eab2a9", "e18480e185a7e186a8"],
+  ["eab2a9", "eab2a8e186a8"],
+  ["eab2aa", "e18480e185a7e186a9"],
+  ["eab2aa", "eab2a8e186a9"],
+  ["eab2ab", "e18480e185a7e186aa"],
+  ["eab2ab", "eab2a8e186aa"],
+  ["eab2ac", "e18480e185a7e186ab"],
+  ["eab2ac", "eab2a8e186ab"],
+  ["eab2ad", "e18480e185a7e186ac"],
+  ["eab2ad", "eab2a8e186ac"],
+  ["eab2ae", "e18480e185a7e186ad"],
+  ["eab2ae", "eab2a8e186ad"],
+  ["eab2af", "e18480e185a7e186ae"],
+  ["eab2af", "eab2a8e186ae"],
+  ["eab2b0", "e18480e185a7e186af"],
+  ["eab2b0", "eab2a8e186af"],
+  ["eab2b1", "e18480e185a7e186b0"],
+  ["eab2b1", "eab2a8e186b0"],
+  ["eab2b2", "e18480e185a7e186b1"],
+  ["eab2b2", "eab2a8e186b1"],
+  ["eab2b3", "e18480e185a7e186b2"],
+  ["eab2b3", "eab2a8e186b2"],
+  ["eab2b4", "e18480e185a7e186b3"],
+  ["eab2b4", "eab2a8e186b3"],
+  ["eab2b5", "e18480e185a7e186b4"],
+  ["eab2b5", "eab2a8e186b4"],
+  ["eab2b6", "e18480e185a7e186b5"],
+  ["eab2b6", "eab2a8e186b5"],
+  ["eab2b7", "e18480e185a7e186b6"],
+  ["eab2b7", "eab2a8e186b6"],
+  ["eab2b8", "e18480e185a7e186b7"],
+  ["eab2b8", "eab2a8e186b7"],
+  ["eab2b9", "e18480e185a7e186b8"],
+  ["eab2b9", "eab2a8e186b8"],
+  ["eab2ba", "e18480e185a7e186b9"],
+  ["eab2ba", "eab2a8e186b9"],
+  ["eab2bb", "e18480e185a7e186ba"],
+  ["eab2bb", "eab2a8e186ba"],
+  ["eab2bc", "e18480e185a7e186bb"],
+  ["eab2bc", "eab2a8e186bb"],
+  ["eab2bd", "e18480e185a7e186bc"],
+  ["eab2bd", "eab2a8e186bc"],
+  ["eab2be", "e18480e185a7e186bd"],
+  ["eab2be", "eab2a8e186bd"],
+  ["eab2bf", "e18480e185a7e186be"],
+  ["eab2bf", "eab2a8e186be"],
+  ["eab380", "e18480e185a7e186bf"],
+  ["eab380", "eab2a8e186bf"],
+  ["eab381", "e18480e185a7e18780"],
+  ["eab381", "eab2a8e18780"],
+  ["eab382", "e18480e185a7e18781"],
+  ["eab382", "eab2a8e18781"],
+  ["eab383", "e18480e185a7e18782"],
+  ["eab383", "eab2a8e18782"],
+  ["eab384", "e18480e185a8"],
+  ["eab385", "e18480e185a8e186a8"],
+  ["eab385", "eab384e186a8"],
+  ["eab386", "e18480e185a8e186a9"],
+  ["eab386", "eab384e186a9"],
+  ["eab387", "e18480e185a8e186aa"],
+  ["eab387", "eab384e186aa"],
+  ["eab388", "e18480e185a8e186ab"],
+  ["eab388", "eab384e186ab"],
+  ["eab389", "e18480e185a8e186ac"],
+  ["eab389", "eab384e186ac"],
+  ["eab38a", "e18480e185a8e186ad"],
+  ["eab38a", "eab384e186ad"],
+  ["eab38b", "e18480e185a8e186ae"],
+  ["eab38b", "eab384e186ae"],
+  ["eab38c", "e18480e185a8e186af"],
+  ["eab38c", "eab384e186af"],
+  ["eab38d", "e18480e185a8e186b0"],
+  ["eab38d", "eab384e186b0"],
+  ["eab38e", "e18480e185a8e186b1"],
+  ["eab38e", "eab384e186b1"],
+  ["eab38f", "e18480e185a8e186b2"],
+  ["eab38f", "eab384e186b2"],
+  ["eab390", "e18480e185a8e186b3"],
+  ["eab390", "eab384e186b3"],
+  ["eab391", "e18480e185a8e186b4"],
+  ["eab391", "eab384e186b4"],
+  ["eab392", "e18480e185a8e186b5"],
+  ["eab392", "eab384e186b5"],
+  ["eab393", "e18480e185a8e186b6"],
+  ["eab393", "eab384e186b6"],
+  ["eab394", "e18480e185a8e186b7"],
+  ["eab394", "eab384e186b7"],
+  ["eab395", "e18480e185a8e186b8"],
+  ["eab395", "eab384e186b8"],
+  ["eab396", "e18480e185a8e186b9"],
+  ["eab396", "eab384e186b9"],
+  ["eab397", "e18480e185a8e186ba"],
+  ["eab397", "eab384e186ba"],
+  ["eab398", "e18480e185a8e186bb"],
+  ["eab398", "eab384e186bb"],
+  ["eab399", "e18480e185a8e186bc"],
+  ["eab399", "eab384e186bc"],
+  ["eab39a", "e18480e185a8e186bd"],
+  ["eab39a", "eab384e186bd"],
+  ["eab39b", "e18480e185a8e186be"],
+  ["eab39b", "eab384e186be"],
+  ["eab39c", "e18480e185a8e186bf"],
+  ["eab39c", "eab384e186bf"],
+  ["eab39d", "e18480e185a8e18780"],
+  ["eab39d", "eab384e18780"],
+  ["eab39e", "e18480e185a8e18781"],
+  ["eab39e", "eab384e18781"],
+  ["eab39f", "e18480e185a8e18782"],
+  ["eab39f", "eab384e18782"],
+  ["eab3a0", "e18480e185a9"],
+  ["eab3a1", "e18480e185a9e186a8"],
+  ["eab3a1", "eab3a0e186a8"],
+  ["eab3a2", "e18480e185a9e186a9"],
+  ["eab3a2", "eab3a0e186a9"],
+  ["eab3a3", "e18480e185a9e186aa"],
+  ["eab3a3", "eab3a0e186aa"],
+  ["eab3a4", "e18480e185a9e186ab"],
+  ["eab3a4", "eab3a0e186ab"],
+  ["eab3a5", "e18480e185a9e186ac"],
+  ["eab3a5", "eab3a0e186ac"],
+  ["eab3a6", "e18480e185a9e186ad"],
+  ["eab3a6", "eab3a0e186ad"],
+  ["eab3a7", "e18480e185a9e186ae"],
+  ["eab3a7", "eab3a0e186ae"],
+  ["eab3a8", "e18480e185a9e186af"],
+  ["eab3a8", "eab3a0e186af"],
+  ["eab3a9", "e18480e185a9e186b0"],
+  ["eab3a9", "eab3a0e186b0"],
+  ["eab3aa", "e18480e185a9e186b1"],
+  ["eab3aa", "eab3a0e186b1"],
+  ["eab3ab", "e18480e185a9e186b2"],
+  ["eab3ab", "eab3a0e186b2"],
+  ["eab3ac", "e18480e185a9e186b3"],
+  ["eab3ac", "eab3a0e186b3"],
+  ["eab3ad", "e18480e185a9e186b4"],
+  ["eab3ad", "eab3a0e186b4"],
+  ["eab3ae", "e18480e185a9e186b5"],
+  ["eab3ae", "eab3a0e186b5"],
+  ["eab3af", "e18480e185a9e186b6"],
+  ["eab3af", "eab3a0e186b6"],
+  ["eab3b0", "e18480e185a9e186b7"],
+  ["eab3b0", "eab3a0e186b7"],
+  ["eab3b1", "e18480e185a9e186b8"],
+  ["eab3b1", "eab3a0e186b8"],
+  ["eab3b2", "e18480e185a9e186b9"],
+  ["eab3b2", "eab3a0e186b9"],
+  ["eab3b3", "e18480e185a9e186ba"],
+  ["eab3b3", "eab3a0e186ba"],
+  ["eab3b4", "e18480e185a9e186bb"],
+  ["eab3b4", "eab3a0e186bb"],
+  ["eab3b5", "e18480e185a9e186bc"],
+  ["eab3b5", "eab3a0e186bc"],
+  ["eab3b6", "e18480e185a9e186bd"],
+  ["eab3b6", "eab3a0e186bd"],
+  ["eab3b7", "e18480e185a9e186be"],
+  ["eab3b7", "eab3a0e186be"],
+  ["eab3b8", "e18480e185a9e186bf"],
+  ["eab3b8", "eab3a0e186bf"],
+  ["eab3b9", "e18480e185a9e18780"],
+  ["eab3b9", "eab3a0e18780"],
+  ["eab3ba", "e18480e185a9e18781"],
+  ["eab3ba", "eab3a0e18781"],
+  ["eab3bb", "e18480e185a9e18782"],
+  ["eab3bb", "eab3a0e18782"],
+  ["eab3bc", "e18480e185aa"],
+  ["eab3bd", "e18480e185aae186a8"],
+  ["eab3bd", "eab3bce186a8"],
+  ["eab3be", "e18480e185aae186a9"],
+  ["eab3be", "eab3bce186a9"],
+  ["eab3bf", "e18480e185aae186aa"],
+  ["eab3bf", "eab3bce186aa"],
+  ["eab480", "e18480e185aae186ab"],
+  ["eab480", "eab3bce186ab"],
+  ["eab481", "e18480e185aae186ac"],
+  ["eab481", "eab3bce186ac"],
+  ["eab482", "e18480e185aae186ad"],
+  ["eab482", "eab3bce186ad"],
+  ["eab483", "e18480e185aae186ae"],
+  ["eab483", "eab3bce186ae"],
+  ["eab484", "e18480e185aae186af"],
+  ["eab484", "eab3bce186af"],
+  ["eab485", "e18480e185aae186b0"],
+  ["eab485", "eab3bce186b0"],
+  ["eab486", "e18480e185aae186b1"],
+  ["eab486", "eab3bce186b1"],
+  ["eab487", "e18480e185aae186b2"],
+  ["eab487", "eab3bce186b2"],
+  ["eab488", "e18480e185aae186b3"],
+  ["eab488", "eab3bce186b3"],
+  ["eab489", "e18480e185aae186b4"],
+  ["eab489", "eab3bce186b4"],
+  ["eab48a", "e18480e185aae186b5"],
+  ["eab48a", "eab3bce186b5"],
+  ["eab48b", "e18480e185aae186b6"],
+  ["eab48b", "eab3bce186b6"],
+  ["eab48c", "e18480e185aae186b7"],
+  ["eab48c", "eab3bce186b7"],
+  ["eab48d", "e18480e185aae186b8"],
+  ["eab48d", "eab3bce186b8"],
+  ["eab48e", "e18480e185aae186b9"],
+  ["eab48e", "eab3bce186b9"],
+  ["eab48f", "e18480e185aae186ba"],
+  ["eab48f", "eab3bce186ba"],
+  ["eab490", "e18480e185aae186bb"],
+  ["eab490", "eab3bce186bb"],
+  ["eab491", "e18480e185aae186bc"],
+  ["eab491", "eab3bce186bc"],
+  ["eab492", "e18480e185aae186bd"],
+  ["eab492", "eab3bce186bd"],
+  ["eab493", "e18480e185aae186be"],
+  ["eab493", "eab3bce186be"],
+  ["eab494", "e18480e185aae186bf"],
+  ["eab494", "eab3bce186bf"],
+  ["eab495", "e18480e185aae18780"],
+  ["eab495", "eab3bce18780"],
+  ["eab496", "e18480e185aae18781"],
+  ["eab496", "eab3bce18781"],
+  ["eab497", "e18480e185aae18782"],
+  ["eab497", "eab3bce18782"],
+  ["eab498", "e18480e185ab"],
+  ["eab499", "e18480e185abe186a8"],
+  ["eab499", "eab498e186a8"],
+  ["eab49a", "e18480e185abe186a9"],
+  ["eab49a", "eab498e186a9"],
+  ["eab49b", "e18480e185abe186aa"],
+  ["eab49b", "eab498e186aa"],
+  ["eab49c", "e18480e185abe186ab"],
+  ["eab49c", "eab498e186ab"],
+  ["eab49d", "e18480e185abe186ac"],
+  ["eab49d", "eab498e186ac"],
+  ["eab49e", "e18480e185abe186ad"],
+  ["eab49e", "eab498e186ad"],
+  ["eab49f", "e18480e185abe186ae"],
+  ["eab49f", "eab498e186ae"],
+  ["eab4a0", "e18480e185abe186af"],
+  ["eab4a0", "eab498e186af"],
+  ["eab4a1", "e18480e185abe186b0"],
+  ["eab4a1", "eab498e186b0"],
+  ["eab4a2", "e18480e185abe186b1"],
+  ["eab4a2", "eab498e186b1"],
+  ["eab4a3", "e18480e185abe186b2"],
+  ["eab4a3", "eab498e186b2"],
+  ["eab4a4", "e18480e185abe186b3"],
+  ["eab4a4", "eab498e186b3"],
+  ["eab4a5", "e18480e185abe186b4"],
+  ["eab4a5", "eab498e186b4"],
+  ["eab4a6", "e18480e185abe186b5"],
+  ["eab4a6", "eab498e186b5"],
+  ["eab4a7", "e18480e185abe186b6"],
+  ["eab4a7", "eab498e186b6"],
+  ["eab4a8", "e18480e185abe186b7"],
+  ["eab4a8", "eab498e186b7"],
+  ["eab4a9", "e18480e185abe186b8"],
+  ["eab4a9", "eab498e186b8"],
+  ["eab4aa", "e18480e185abe186b9"],
+  ["eab4aa", "eab498e186b9"],
+  ["eab4ab", "e18480e185abe186ba"],
+  ["eab4ab", "eab498e186ba"],
+  ["eab4ac", "e18480e185abe186bb"],
+  ["eab4ac", "eab498e186bb"],
+  ["eab4ad", "e18480e185abe186bc"],
+  ["eab4ad", "eab498e186bc"],
+  ["eab4ae", "e18480e185abe186bd"],
+  ["eab4ae", "eab498e186bd"],
+  ["eab4af", "e18480e185abe186be"],
+  ["eab4af", "eab498e186be"],
+  ["eab4b0", "e18480e185abe186bf"],
+  ["eab4b0", "eab498e186bf"],
+  ["eab4b1", "e18480e185abe18780"],
+  ["eab4b1", "eab498e18780"],
+  ["eab4b2", "e18480e185abe18781"],
+  ["eab4b2", "eab498e18781"],
+  ["eab4b3", "e18480e185abe18782"],
+  ["eab4b3", "eab498e18782"],
+  ["eab4b4", "e18480e185ac"],
+  ["eab4b5", "e18480e185ace186a8"],
+  ["eab4b5", "eab4b4e186a8"],
+  ["eab4b6", "e18480e185ace186a9"],
+  ["eab4b6", "eab4b4e186a9"],
+  ["eab4b7", "e18480e185ace186aa"],
+  ["eab4b7", "eab4b4e186aa"],
+  ["eab4b8", "e18480e185ace186ab"],
+  ["eab4b8", "eab4b4e186ab"],
+  ["eab4b9", "e18480e185ace186ac"],
+  ["eab4b9", "eab4b4e186ac"],
+  ["eab4ba", "e18480e185ace186ad"],
+  ["eab4ba", "eab4b4e186ad"],
+  ["eab4bb", "e18480e185ace186ae"],
+  ["eab4bb", "eab4b4e186ae"],
+  ["eab4bc", "e18480e185ace186af"],
+  ["eab4bc", "eab4b4e186af"],
+  ["eab4bd", "e18480e185ace186b0"],
+  ["eab4bd", "eab4b4e186b0"],
+  ["eab4be", "e18480e185ace186b1"],
+  ["eab4be", "eab4b4e186b1"],
+  ["eab4bf", "e18480e185ace186b2"],
+  ["eab4bf", "eab4b4e186b2"],
+  ["eab580", "e18480e185ace186b3"],
+  ["eab580", "eab4b4e186b3"],
+  ["eab581", "e18480e185ace186b4"],
+  ["eab581", "eab4b4e186b4"],
+  ["eab582", "e18480e185ace186b5"],
+  ["eab582", "eab4b4e186b5"],
+  ["eab583", "e18480e185ace186b6"],
+  ["eab583", "eab4b4e186b6"],
+  ["eab584", "e18480e185ace186b7"],
+  ["eab584", "eab4b4e186b7"],
+  ["eab585", "e18480e185ace186b8"],
+  ["eab585", "eab4b4e186b8"],
+  ["eab586", "e18480e185ace186b9"],
+  ["eab586", "eab4b4e186b9"],
+  ["eab587", "e18480e185ace186ba"],
+  ["eab587", "eab4b4e186ba"],
+  ["eab588", "e18480e185ace186bb"],
+  ["eab588", "eab4b4e186bb"],
+  ["eab589", "e18480e185ace186bc"],
+  ["eab589", "eab4b4e186bc"],
+  ["eab58a", "e18480e185ace186bd"],
+  ["eab58a", "eab4b4e186bd"],
+  ["eab58b", "e18480e185ace186be"],
+  ["eab58b", "eab4b4e186be"],
+  ["eab58c", "e18480e185ace186bf"],
+  ["eab58c", "eab4b4e186bf"],
+  ["eab58d", "e18480e185ace18780"],
+  ["eab58d", "eab4b4e18780"],
+  ["eab58e", "e18480e185ace18781"],
+  ["eab58e", "eab4b4e18781"],
+  ["eab58f", "e18480e185ace18782"],
+  ["eab58f", "eab4b4e18782"],
+  ["eab590", "e18480e185ad"],
+  ["eab591", "e18480e185ade186a8"],
+  ["eab591", "eab590e186a8"],
+  ["eab592", "e18480e185ade186a9"],
+  ["eab592", "eab590e186a9"],
+  ["eab593", "e18480e185ade186aa"],
+  ["eab593", "eab590e186aa"],
+  ["eab594", "e18480e185ade186ab"],
+  ["eab594", "eab590e186ab"],
+  ["eab595", "e18480e185ade186ac"],
+  ["eab595", "eab590e186ac"],
+  ["eab596", "e18480e185ade186ad"],
+  ["eab596", "eab590e186ad"],
+  ["eab597", "e18480e185ade186ae"],
+  ["eab597", "eab590e186ae"],
+  ["eab598", "e18480e185ade186af"],
+  ["eab598", "eab590e186af"],
+  ["eab599", "e18480e185ade186b0"],
+  ["eab599", "eab590e186b0"],
+  ["eab59a", "e18480e185ade186b1"],
+  ["eab59a", "eab590e186b1"],
+  ["eab59b", "e18480e185ade186b2"],
+  ["eab59b", "eab590e186b2"],
+  ["eab59c", "e18480e185ade186b3"],
+  ["eab59c", "eab590e186b3"],
+  ["eab59d", "e18480e185ade186b4"],
+  ["eab59d", "eab590e186b4"],
+  ["eab59e", "e18480e185ade186b5"],
+  ["eab59e", "eab590e186b5"],
+  ["eab59f", "e18480e185ade186b6"],
+  ["eab59f", "eab590e186b6"],
+  ["eab5a0", "e18480e185ade186b7"],
+  ["eab5a0", "eab590e186b7"],
+  ["eab5a1", "e18480e185ade186b8"],
+  ["eab5a1", "eab590e186b8"],
+  ["eab5a2", "e18480e185ade186b9"],
+  ["eab5a2", "eab590e186b9"],
+  ["eab5a3", "e18480e185ade186ba"],
+  ["eab5a3", "eab590e186ba"],
+  ["eab5a4", "e18480e185ade186bb"],
+  ["eab5a4", "eab590e186bb"],
+  ["eab5a5", "e18480e185ade186bc"],
+  ["eab5a5", "eab590e186bc"],
+  ["eab5a6", "e18480e185ade186bd"],
+  ["eab5a6", "eab590e186bd"],
+  ["eab5a7", "e18480e185ade186be"],
+  ["eab5a7", "eab590e186be"],
+  ["eab5a8", "e18480e185ade186bf"],
+  ["eab5a8", "eab590e186bf"],
+  ["eab5a9", "e18480e185ade18780"],
+  ["eab5a9", "eab590e18780"],
+  ["eab5aa", "e18480e185ade18781"],
+  ["eab5aa", "eab590e18781"],
+  ["eab5ab", "e18480e185ade18782"],
+  ["eab5ab", "eab590e18782"],
+  ["eab5ac", "e18480e185ae"],
+  ["eab5ad", "e18480e185aee186a8"],
+  ["eab5ad", "eab5ace186a8"],
+  ["eab5ae", "e18480e185aee186a9"],
+  ["eab5ae", "eab5ace186a9"],
+  ["eab5af", "e18480e185aee186aa"],
+  ["eab5af", "eab5ace186aa"],
+  ["eab5b0", "e18480e185aee186ab"],
+  ["eab5b0", "eab5ace186ab"],
+  ["eab5b1", "e18480e185aee186ac"],
+  ["eab5b1", "eab5ace186ac"],
+  ["eab5b2", "e18480e185aee186ad"],
+  ["eab5b2", "eab5ace186ad"],
+  ["eab5b3", "e18480e185aee186ae"],
+  ["eab5b3", "eab5ace186ae"],
+  ["eab5b4", "e18480e185aee186af"],
+  ["eab5b4", "eab5ace186af"],
+  ["eab5b5", "e18480e185aee186b0"],
+  ["eab5b5", "eab5ace186b0"],
+  ["eab5b6", "e18480e185aee186b1"],
+  ["eab5b6", "eab5ace186b1"],
+  ["eab5b7", "e18480e185aee186b2"],
+  ["eab5b7", "eab5ace186b2"],
+  ["eab5b8", "e18480e185aee186b3"],
+  ["eab5b8", "eab5ace186b3"],
+  ["eab5b9", "e18480e185aee186b4"],
+  ["eab5b9", "eab5ace186b4"],
+  ["eab5ba", "e18480e185aee186b5"],
+  ["eab5ba", "eab5ace186b5"],
+  ["eab5bb", "e18480e185aee186b6"],
+  ["eab5bb", "eab5ace186b6"],
+  ["eab5bc", "e18480e185aee186b7"],
+  ["eab5bc", "eab5ace186b7"],
+  ["eab5bd", "e18480e185aee186b8"],
+  ["eab5bd", "eab5ace186b8"],
+  ["eab5be", "e18480e185aee186b9"],
+  ["eab5be", "eab5ace186b9"],
+  ["eab5bf", "e18480e185aee186ba"],
+  ["eab5bf", "eab5ace186ba"],
+  ["eab680", "e18480e185aee186bb"],
+  ["eab680", "eab5ace186bb"],
+  ["eab681", "e18480e185aee186bc"],
+  ["eab681", "eab5ace186bc"],
+  ["eab682", "e18480e185aee186bd"],
+  ["eab682", "eab5ace186bd"],
+  ["eab683", "e18480e185aee186be"],
+  ["eab683", "eab5ace186be"],
+  ["eab684", "e18480e185aee186bf"],
+  ["eab684", "eab5ace186bf"],
+  ["eab685", "e18480e185aee18780"],
+  ["eab685", "eab5ace18780"],
+  ["eab686", "e18480e185aee18781"],
+  ["eab686", "eab5ace18781"],
+  ["eab687", "e18480e185aee18782"],
+  ["eab687", "eab5ace18782"],
+  ["eab688", "e18480e185af"],
+  ["eab689", "e18480e185afe186a8"],
+  ["eab689", "eab688e186a8"],
+  ["eab68a", "e18480e185afe186a9"],
+  ["eab68a", "eab688e186a9"],
+  ["eab68b", "e18480e185afe186aa"],
+  ["eab68b", "eab688e186aa"],
+  ["eab68c", "e18480e185afe186ab"],
+  ["eab68c", "eab688e186ab"],
+  ["eab68d", "e18480e185afe186ac"],
+  ["eab68d", "eab688e186ac"],
+  ["eab68e", "e18480e185afe186ad"],
+  ["eab68e", "eab688e186ad"],
+  ["eab68f", "e18480e185afe186ae"],
+  ["eab68f", "eab688e186ae"],
+  ["eab690", "e18480e185afe186af"],
+  ["eab690", "eab688e186af"],
+  ["eab691", "e18480e185afe186b0"],
+  ["eab691", "eab688e186b0"],
+  ["eab692", "e18480e185afe186b1"],
+  ["eab692", "eab688e186b1"],
+  ["eab693", "e18480e185afe186b2"],
+  ["eab693", "eab688e186b2"],
+  ["eab694", "e18480e185afe186b3"],
+  ["eab694", "eab688e186b3"],
+  ["eab695", "e18480e185afe186b4"],
+  ["eab695", "eab688e186b4"],
+  ["eab696", "e18480e185afe186b5"],
+  ["eab696", "eab688e186b5"],
+  ["eab697", "e18480e185afe186b6"],
+  ["eab697", "eab688e186b6"],
+  ["eab698", "e18480e185afe186b7"],
+  ["eab698", "eab688e186b7"],
+  ["eab699", "e18480e185afe186b8"],
+  ["eab699", "eab688e186b8"],
+  ["eab69a", "e18480e185afe186b9"],
+  ["eab69a", "eab688e186b9"],
+  ["eab69b", "e18480e185afe186ba"],
+  ["eab69b", "eab688e186ba"],
+  ["eab69c", "e18480e185afe186bb"],
+  ["eab69c", "eab688e186bb"],
+  ["eab69d", "e18480e185afe186bc"],
+  ["eab69d", "eab688e186bc"],
+  ["eab69e", "e18480e185afe186bd"],
+  ["eab69e", "eab688e186bd"],
+  ["eab69f", "e18480e185afe186be"],
+  ["eab69f", "eab688e186be"],
+  ["eab6a0", "e18480e185afe186bf"],
+  ["eab6a0", "eab688e186bf"],
+  ["eab6a1", "e18480e185afe18780"],
+  ["eab6a1", "eab688e18780"],
+  ["eab6a2", "e18480e185afe18781"],
+  ["eab6a2", "eab688e18781"],
+  ["eab6a3", "e18480e185afe18782"],
+  ["eab6a3", "eab688e18782"],
+  ["eab6a4", "e18480e185b0"],
+  ["eab6a5", "e18480e185b0e186a8"],
+  ["eab6a5", "eab6a4e186a8"],
+  ["eab6a6", "e18480e185b0e186a9"],
+  ["eab6a6", "eab6a4e186a9"],
+  ["eab6a7", "e18480e185b0e186aa"],
+  ["eab6a7", "eab6a4e186aa"],
+  ["eab6a8", "e18480e185b0e186ab"],
+  ["eab6a8", "eab6a4e186ab"],
+  ["eab6a9", "e18480e185b0e186ac"],
+  ["eab6a9", "eab6a4e186ac"],
+  ["eab6aa", "e18480e185b0e186ad"],
+  ["eab6aa", "eab6a4e186ad"],
+  ["eab6ab", "e18480e185b0e186ae"],
+  ["eab6ab", "eab6a4e186ae"],
+  ["eab6ac", "e18480e185b0e186af"],
+  ["eab6ac", "eab6a4e186af"],
+  ["eab6ad", "e18480e185b0e186b0"],
+  ["eab6ad", "eab6a4e186b0"],
+  ["eab6ae", "e18480e185b0e186b1"],
+  ["eab6ae", "eab6a4e186b1"],
+  ["eab6af", "e18480e185b0e186b2"],
+  ["eab6af", "eab6a4e186b2"],
+  ["eab6b0", "e18480e185b0e186b3"],
+  ["eab6b0", "eab6a4e186b3"],
+  ["eab6b1", "e18480e185b0e186b4"],
+  ["eab6b1", "eab6a4e186b4"],
+  ["eab6b2", "e18480e185b0e186b5"],
+  ["eab6b2", "eab6a4e186b5"],
+  ["eab6b3", "e18480e185b0e186b6"],
+  ["eab6b3", "eab6a4e186b6"],
+  ["eab6b4", "e18480e185b0e186b7"],
+  ["eab6b4", "eab6a4e186b7"],
+  ["eab6b5", "e18480e185b0e186b8"],
+  ["eab6b5", "eab6a4e186b8"],
+  ["eab6b6", "e18480e185b0e186b9"],
+  ["eab6b6", "eab6a4e186b9"],
+  ["eab6b7", "e18480e185b0e186ba"],
+  ["eab6b7", "eab6a4e186ba"],
+  ["eab6b8", "e18480e185b0e186bb"],
+  ["eab6b8", "eab6a4e186bb"],
+  ["eab6b9", "e18480e185b0e186bc"],
+  ["eab6b9", "eab6a4e186bc"],
+  ["eab6ba", "e18480e185b0e186bd"],
+  ["eab6ba", "eab6a4e186bd"],
+  ["eab6bb", "e18480e185b0e186be"],
+  ["eab6bb", "eab6a4e186be"],
+  ["eab6bc", "e18480e185b0e186bf"],
+  ["eab6bc", "eab6a4e186bf"],
+  ["eab6bd", "e18480e185b0e18780"],
+  ["eab6bd", "eab6a4e18780"],
+  ["eab6be", "e18480e185b0e18781"],
+  ["eab6be", "eab6a4e18781"],
+  ["eab6bf", "e18480e185b0e18782"],
+  ["eab6bf", "eab6a4e18782"],
+  ["eab780", "e18480e185b1"],
+  ["eab781", "e18480e185b1e186a8"],
+  ["eab781", "eab780e186a8"],
+  ["eab782", "e18480e185b1e186a9"],
+  ["eab782", "eab780e186a9"],
+  ["eab783", "e18480e185b1e186aa"],
+  ["eab783", "eab780e186aa"],
+  ["eab784", "e18480e185b1e186ab"],
+  ["eab784", "eab780e186ab"],
+  ["eab785", "e18480e185b1e186ac"],
+  ["eab785", "eab780e186ac"],
+  ["eab786", "e18480e185b1e186ad"],
+  ["eab786", "eab780e186ad"],
+  ["eab787", "e18480e185b1e186ae"],
+  ["eab787", "eab780e186ae"],
+  ["eab788", "e18480e185b1e186af"],
+  ["eab788", "eab780e186af"],
+  ["eab789", "e18480e185b1e186b0"],
+  ["eab789", "eab780e186b0"],
+  ["eab78a", "e18480e185b1e186b1"],
+  ["eab78a", "eab780e186b1"],
+  ["eab78b", "e18480e185b1e186b2"],
+  ["eab78b", "eab780e186b2"],
+  ["eab78c", "e18480e185b1e186b3"],
+  ["eab78c", "eab780e186b3"],
+  ["eab78d", "e18480e185b1e186b4"],
+  ["eab78d", "eab780e186b4"],
+  ["eab78e", "e18480e185b1e186b5"],
+  ["eab78e", "eab780e186b5"],
+  ["eab78f", "e18480e185b1e186b6"],
+  ["eab78f", "eab780e186b6"],
+  ["eab790", "e18480e185b1e186b7"],
+  ["eab790", "eab780e186b7"],
+  ["eab791", "e18480e185b1e186b8"],
+  ["eab791", "eab780e186b8"],
+  ["eab792", "e18480e185b1e186b9"],
+  ["eab792", "eab780e186b9"],
+  ["eab793", "e18480e185b1e186ba"],
+  ["eab793", "eab780e186ba"],
+  ["eab794", "e18480e185b1e186bb"],
+  ["eab794", "eab780e186bb"],
+  ["eab795", "e18480e185b1e186bc"],
+  ["eab795", "eab780e186bc"],
+  ["eab796", "e18480e185b1e186bd"],
+  ["eab796", "eab780e186bd"],
+  ["eab797", "e18480e185b1e186be"],
+  ["eab797", "eab780e186be"],
+  ["eab798", "e18480e185b1e186bf"],
+  ["eab798", "eab780e186bf"],
+  ["eab799", "e18480e185b1e18780"],
+  ["eab799", "eab780e18780"],
+  ["eab79a", "e18480e185b1e18781"],
+  ["eab79a", "eab780e18781"],
+  ["eab79b", "e18480e185b1e18782"],
+  ["eab79b", "eab780e18782"],
+  ["eab79c", "e18480e185b2"],
+  ["eab79d", "e18480e185b2e186a8"],
+  ["eab79d", "eab79ce186a8"],
+  ["eab79e", "e18480e185b2e186a9"],
+  ["eab79e", "eab79ce186a9"],
+  ["eab79f", "e18480e185b2e186aa"],
+  ["eab79f", "eab79ce186aa"],
+  ["eab7a0", "e18480e185b2e186ab"],
+  ["eab7a0", "eab79ce186ab"],
+  ["eab7a1", "e18480e185b2e186ac"],
+  ["eab7a1", "eab79ce186ac"],
+  ["eab7a2", "e18480e185b2e186ad"],
+  ["eab7a2", "eab79ce186ad"],
+  ["eab7a3", "e18480e185b2e186ae"],
+  ["eab7a3", "eab79ce186ae"],
+  ["eab7a4", "e18480e185b2e186af"],
+  ["eab7a4", "eab79ce186af"],
+  ["eab7a5", "e18480e185b2e186b0"],
+  ["eab7a5", "eab79ce186b0"],
+  ["eab7a6", "e18480e185b2e186b1"],
+  ["eab7a6", "eab79ce186b1"],
+  ["eab7a7", "e18480e185b2e186b2"],
+  ["eab7a7", "eab79ce186b2"],
+  ["eab7a8", "e18480e185b2e186b3"],
+  ["eab7a8", "eab79ce186b3"],
+  ["eab7a9", "e18480e185b2e186b4"],
+  ["eab7a9", "eab79ce186b4"],
+  ["eab7aa", "e18480e185b2e186b5"],
+  ["eab7aa", "eab79ce186b5"],
+  ["eab7ab", "e18480e185b2e186b6"],
+  ["eab7ab", "eab79ce186b6"],
+  ["eab7ac", "e18480e185b2e186b7"],
+  ["eab7ac", "eab79ce186b7"],
+  ["eab7ad", "e18480e185b2e186b8"],
+  ["eab7ad", "eab79ce186b8"],
+  ["eab7ae", "e18480e185b2e186b9"],
+  ["eab7ae", "eab79ce186b9"],
+  ["eab7af", "e18480e185b2e186ba"],
+  ["eab7af", "eab79ce186ba"],
+  ["eab7b0", "e18480e185b2e186bb"],
+  ["eab7b0", "eab79ce186bb"],
+  ["eab7b1", "e18480e185b2e186bc"],
+  ["eab7b1", "eab79ce186bc"],
+  ["eab7b2", "e18480e185b2e186bd"],
+  ["eab7b2", "eab79ce186bd"],
+  ["eab7b3", "e18480e185b2e186be"],
+  ["eab7b3", "eab79ce186be"],
+  ["eab7b4", "e18480e185b2e186bf"],
+  ["eab7b4", "eab79ce186bf"],
+  ["eab7b5", "e18480e185b2e18780"],
+  ["eab7b5", "eab79ce18780"],
+  ["eab7b6", "e18480e185b2e18781"],
+  ["eab7b6", "eab79ce18781"],
+  ["eab7b7", "e18480e185b2e18782"],
+  ["eab7b7", "eab79ce18782"],
+  ["eab7b8", "e18480e185b3"],
+  ["eab7b9", "e18480e185b3e186a8"],
+  ["eab7b9", "eab7b8e186a8"],
+  ["eab7ba", "e18480e185b3e186a9"],
+  ["eab7ba", "eab7b8e186a9"],
+  ["eab7bb", "e18480e185b3e186aa"],
+  ["eab7bb", "eab7b8e186aa"],
+  ["eab7bc", "e18480e185b3e186ab"],
+  ["eab7bc", "eab7b8e186ab"],
+  ["eab7bd", "e18480e185b3e186ac"],
+  ["eab7bd", "eab7b8e186ac"],
+  ["eab7be", "e18480e185b3e186ad"],
+  ["eab7be", "eab7b8e186ad"],
+  ["eab7bf", "e18480e185b3e186ae"],
+  ["eab7bf", "eab7b8e186ae"],
+  ["eab880", "e18480e185b3e186af"],
+  ["eab880", "eab7b8e186af"],
+  ["eab881", "e18480e185b3e186b0"],
+  ["eab881", "eab7b8e186b0"],
+  ["eab882", "e18480e185b3e186b1"],
+  ["eab882", "eab7b8e186b1"],
+  ["eab883", "e18480e185b3e186b2"],
+  ["eab883", "eab7b8e186b2"],
+  ["eab884", "e18480e185b3e186b3"],
+  ["eab884", "eab7b8e186b3"],
+  ["eab885", "e18480e185b3e186b4"],
+  ["eab885", "eab7b8e186b4"],
+  ["eab886", "e18480e185b3e186b5"],
+  ["eab886", "eab7b8e186b5"],
+  ["eab887", "e18480e185b3e186b6"],
+  ["eab887", "eab7b8e186b6"],
+  ["eab888", "e18480e185b3e186b7"],
+  ["eab888", "eab7b8e186b7"],
+  ["eab889", "e18480e185b3e186b8"],
+  ["eab889", "eab7b8e186b8"],
+  ["eab88a", "e18480e185b3e186b9"],
+  ["eab88a", "eab7b8e186b9"],
+  ["eab88b", "e18480e185b3e186ba"],
+  ["eab88b", "eab7b8e186ba"],
+  ["eab88c", "e18480e185b3e186bb"],
+  ["eab88c", "eab7b8e186bb"],
+  ["eab88d", "e18480e185b3e186bc"],
+  ["eab88d", "eab7b8e186bc"],
+  ["eab88e", "e18480e185b3e186bd"],
+  ["eab88e", "eab7b8e186bd"],
+  ["eab88f", "e18480e185b3e186be"],
+  ["eab88f", "eab7b8e186be"],
+  ["eab890", "e18480e185b3e186bf"],
+  ["eab890", "eab7b8e186bf"],
+  ["eab891", "e18480e185b3e18780"],
+  ["eab891", "eab7b8e18780"],
+  ["eab892", "e18480e185b3e18781"],
+  ["eab892", "eab7b8e18781"],
+  ["eab893", "e18480e185b3e18782"],
+  ["eab893", "eab7b8e18782"],
+  ["eab894", "e18480e185b4"],
+  ["eab895", "e18480e185b4e186a8"],
+  ["eab895", "eab894e186a8"],
+  ["eab896", "e18480e185b4e186a9"],
+  ["eab896", "eab894e186a9"],
+  ["eab897", "e18480e185b4e186aa"],
+  ["eab897", "eab894e186aa"],
+  ["eab898", "e18480e185b4e186ab"],
+  ["eab898", "eab894e186ab"],
+  ["eab899", "e18480e185b4e186ac"],
+  ["eab899", "eab894e186ac"],
+  ["eab89a", "e18480e185b4e186ad"],
+  ["eab89a", "eab894e186ad"],
+  ["eab89b", "e18480e185b4e186ae"],
+  ["eab89b", "eab894e186ae"],
+  ["eab89c", "e18480e185b4e186af"],
+  ["eab89c", "eab894e186af"],
+  ["eab89d", "e18480e185b4e186b0"],
+  ["eab89d", "eab894e186b0"],
+  ["eab89e", "e18480e185b4e186b1"],
+  ["eab89e", "eab894e186b1"],
+  ["eab89f", "e18480e185b4e186b2"],
+  ["eab89f", "eab894e186b2"],
+  ["eab8a0", "e18480e185b4e186b3"],
+  ["eab8a0", "eab894e186b3"],
+  ["eab8a1", "e18480e185b4e186b4"],
+  ["eab8a1", "eab894e186b4"],
+  ["eab8a2", "e18480e185b4e186b5"],
+  ["eab8a2", "eab894e186b5"],
+  ["eab8a3", "e18480e185b4e186b6"],
+  ["eab8a3", "eab894e186b6"],
+  ["eab8a4", "e18480e185b4e186b7"],
+  ["eab8a4", "eab894e186b7"],
+  ["eab8a5", "e18480e185b4e186b8"],
+  ["eab8a5", "eab894e186b8"],
+  ["eab8a6", "e18480e185b4e186b9"],
+  ["eab8a6", "eab894e186b9"],
+  ["eab8a7", "e18480e185b4e186ba"],
+  ["eab8a7", "eab894e186ba"],
+  ["eab8a8", "e18480e185b4e186bb"],
+  ["eab8a8", "eab894e186bb"],
+  ["eab8a9", "e18480e185b4e186bc"],
+  ["eab8a9", "eab894e186bc"],
+  ["eab8aa", "e18480e185b4e186bd"],
+  ["eab8aa", "eab894e186bd"],
+  ["eab8ab", "e18480e185b4e186be"],
+  ["eab8ab", "eab894e186be"],
+  ["eab8ac", "e18480e185b4e186bf"],
+  ["eab8ac", "eab894e186bf"],
+  ["eab8ad", "e18480e185b4e18780"],
+  ["eab8ad", "eab894e18780"],
+  ["eab8ae", "e18480e185b4e18781"],
+  ["eab8ae", "eab894e18781"],
+  ["eab8af", "e18480e185b4e18782"],
+  ["eab8af", "eab894e18782"],
+  ["eab8b0", "e18480e185b5"],
+  ["eab8b1", "e18480e185b5e186a8"],
+  ["eab8b1", "eab8b0e186a8"],
+  ["eab8b2", "e18480e185b5e186a9"],
+  ["eab8b2", "eab8b0e186a9"],
+  ["eab8b3", "e18480e185b5e186aa"],
+  ["eab8b3", "eab8b0e186aa"],
+  ["eab8b4", "e18480e185b5e186ab"],
+  ["eab8b4", "eab8b0e186ab"],
+  ["eab8b5", "e18480e185b5e186ac"],
+  ["eab8b5", "eab8b0e186ac"],
+  ["eab8b6", "e18480e185b5e186ad"],
+  ["eab8b6", "eab8b0e186ad"],
+  ["eab8b7", "e18480e185b5e186ae"],
+  ["eab8b7", "eab8b0e186ae"],
+  ["eab8b8", "e18480e185b5e186af"],
+  ["eab8b8", "eab8b0e186af"],
+  ["eab8b9", "e18480e185b5e186b0"],
+  ["eab8b9", "eab8b0e186b0"],
+  ["eab8ba", "e18480e185b5e186b1"],
+  ["eab8ba", "eab8b0e186b1"],
+  ["eab8bb", "e18480e185b5e186b2"],
+  ["eab8bb", "eab8b0e186b2"],
+  ["eab8bc", "e18480e185b5e186b3"],
+  ["eab8bc", "eab8b0e186b3"],
+  ["eab8bd", "e18480e185b5e186b4"],
+  ["eab8bd", "eab8b0e186b4"],
+  ["eab8be", "e18480e185b5e186b5"],
+  ["eab8be", "eab8b0e186b5"],
+  ["eab8bf", "e18480e185b5e186b6"],
+  ["eab8bf", "eab8b0e186b6"],
+  ["eab980", "e18480e185b5e186b7"],
+  ["eab980", "eab8b0e186b7"],
+  ["eab981", "e18480e185b5e186b8"],
+  ["eab981", "eab8b0e186b8"],
+  ["eab982", "e18480e185b5e186b9"],
+  ["eab982", "eab8b0e186b9"],
+  ["eab983", "e18480e185b5e186ba"],
+  ["eab983", "eab8b0e186ba"],
+  ["eab984", "e18480e185b5e186bb"],
+  ["eab984", "eab8b0e186bb"],
+  ["eab985", "e18480e185b5e186bc"],
+  ["eab985", "eab8b0e186bc"],
+  ["eab986", "e18480e185b5e186bd"],
+  ["eab986", "eab8b0e186bd"],
+  ["eab987", "e18480e185b5e186be"],
+  ["eab987", "eab8b0e186be"],
+  ["eab988", "e18480e185b5e186bf"],
+  ["eab988", "eab8b0e186bf"],
+  ["eab989", "e18480e185b5e18780"],
+  ["eab989", "eab8b0e18780"],
+  ["eab98a", "e18480e185b5e18781"],
+  ["eab98a", "eab8b0e18781"],
+  ["eab98b", "e18480e185b5e18782"],
+  ["eab98b", "eab8b0e18782"],
+  ["eab98c", "e18481e185a1"],
+  ["eab98d", "e18481e185a1e186a8"],
+  ["eab98d", "eab98ce186a8"],
+  ["eab98e", "e18481e185a1e186a9"],
+  ["eab98e", "eab98ce186a9"],
+  ["eab98f", "e18481e185a1e186aa"],
+  ["eab98f", "eab98ce186aa"],
+  ["eab990", "e18481e185a1e186ab"],
+  ["eab990", "eab98ce186ab"],
+  ["eab991", "e18481e185a1e186ac"],
+  ["eab991", "eab98ce186ac"],
+  ["eab992", "e18481e185a1e186ad"],
+  ["eab992", "eab98ce186ad"],
+  ["eab993", "e18481e185a1e186ae"],
+  ["eab993", "eab98ce186ae"],
+  ["eab994", "e18481e185a1e186af"],
+  ["eab994", "eab98ce186af"],
+  ["eab995", "e18481e185a1e186b0"],
+  ["eab995", "eab98ce186b0"],
+  ["eab996", "e18481e185a1e186b1"],
+  ["eab996", "eab98ce186b1"],
+  ["eab997", "e18481e185a1e186b2"],
+  ["eab997", "eab98ce186b2"],
+  ["eab998", "e18481e185a1e186b3"],
+  ["eab998", "eab98ce186b3"],
+  ["eab999", "e18481e185a1e186b4"],
+  ["eab999", "eab98ce186b4"],
+  ["eab99a", "e18481e185a1e186b5"],
+  ["eab99a", "eab98ce186b5"],
+  ["eab99b", "e18481e185a1e186b6"],
+  ["eab99b", "eab98ce186b6"],
+  ["eab99c", "e18481e185a1e186b7"],
+  ["eab99c", "eab98ce186b7"],
+  ["eab99d", "e18481e185a1e186b8"],
+  ["eab99d", "eab98ce186b8"],
+  ["eab99e", "e18481e185a1e186b9"],
+  ["eab99e", "eab98ce186b9"],
+  ["eab99f", "e18481e185a1e186ba"],
+  ["eab99f", "eab98ce186ba"],
+  ["eab9a0", "e18481e185a1e186bb"],
+  ["eab9a0", "eab98ce186bb"],
+  ["eab9a1", "e18481e185a1e186bc"],
+  ["eab9a1", "eab98ce186bc"],
+  ["eab9a2", "e18481e185a1e186bd"],
+  ["eab9a2", "eab98ce186bd"],
+  ["eab9a3", "e18481e185a1e186be"],
+  ["eab9a3", "eab98ce186be"],
+  ["eab9a4", "e18481e185a1e186bf"],
+  ["eab9a4", "eab98ce186bf"],
+  ["eab9a5", "e18481e185a1e18780"],
+  ["eab9a5", "eab98ce18780"],
+  ["eab9a6", "e18481e185a1e18781"],
+  ["eab9a6", "eab98ce18781"],
+  ["eab9a7", "e18481e185a1e18782"],
+  ["eab9a7", "eab98ce18782"],
+  ["eab9a8", "e18481e185a2"],
+  ["eab9a9", "e18481e185a2e186a8"],
+  ["eab9a9", "eab9a8e186a8"],
+  ["eab9aa", "e18481e185a2e186a9"],
+  ["eab9aa", "eab9a8e186a9"],
+  ["eab9ab", "e18481e185a2e186aa"],
+  ["eab9ab", "eab9a8e186aa"],
+  ["eab9ac", "e18481e185a2e186ab"],
+  ["eab9ac", "eab9a8e186ab"],
+  ["eab9ad", "e18481e185a2e186ac"],
+  ["eab9ad", "eab9a8e186ac"],
+  ["eab9ae", "e18481e185a2e186ad"],
+  ["eab9ae", "eab9a8e186ad"],
+  ["eab9af", "e18481e185a2e186ae"],
+  ["eab9af", "eab9a8e186ae"],
+  ["eab9b0", "e18481e185a2e186af"],
+  ["eab9b0", "eab9a8e186af"],
+  ["eab9b1", "e18481e185a2e186b0"],
+  ["eab9b1", "eab9a8e186b0"],
+  ["eab9b2", "e18481e185a2e186b1"],
+  ["eab9b2", "eab9a8e186b1"],
+  ["eab9b3", "e18481e185a2e186b2"],
+  ["eab9b3", "eab9a8e186b2"],
+  ["eab9b4", "e18481e185a2e186b3"],
+  ["eab9b4", "eab9a8e186b3"],
+  ["eab9b5", "e18481e185a2e186b4"],
+  ["eab9b5", "eab9a8e186b4"],
+  ["eab9b6", "e18481e185a2e186b5"],
+  ["eab9b6", "eab9a8e186b5"],
+  ["eab9b7", "e18481e185a2e186b6"],
+  ["eab9b7", "eab9a8e186b6"],
+  ["eab9b8", "e18481e185a2e186b7"],
+  ["eab9b8", "eab9a8e186b7"],
+  ["eab9b9", "e18481e185a2e186b8"],
+  ["eab9b9", "eab9a8e186b8"],
+  ["eab9ba", "e18481e185a2e186b9"],
+  ["eab9ba", "eab9a8e186b9"],
+  ["eab9bb", "e18481e185a2e186ba"],
+  ["eab9bb", "eab9a8e186ba"],
+  ["eab9bc", "e18481e185a2e186bb"],
+  ["eab9bc", "eab9a8e186bb"],
+  ["eab9bd", "e18481e185a2e186bc"],
+  ["eab9bd", "eab9a8e186bc"],
+  ["eab9be", "e18481e185a2e186bd"],
+  ["eab9be", "eab9a8e186bd"],
+  ["eab9bf", "e18481e185a2e186be"],
+  ["eab9bf", "eab9a8e186be"],
+  ["eaba80", "e18481e185a2e186bf"],
+  ["eaba80", "eab9a8e186bf"],
+  ["eaba81", "e18481e185a2e18780"],
+  ["eaba81", "eab9a8e18780"],
+  ["eaba82", "e18481e185a2e18781"],
+  ["eaba82", "eab9a8e18781"],
+  ["eaba83", "e18481e185a2e18782"],
+  ["eaba83", "eab9a8e18782"],
+  ["eaba84", "e18481e185a3"],
+  ["eaba85", "e18481e185a3e186a8"],
+  ["eaba85", "eaba84e186a8"],
+  ["eaba86", "e18481e185a3e186a9"],
+  ["eaba86", "eaba84e186a9"],
+  ["eaba87", "e18481e185a3e186aa"],
+  ["eaba87", "eaba84e186aa"],
+  ["eaba88", "e18481e185a3e186ab"],
+  ["eaba88", "eaba84e186ab"],
+  ["eaba89", "e18481e185a3e186ac"],
+  ["eaba89", "eaba84e186ac"],
+  ["eaba8a", "e18481e185a3e186ad"],
+  ["eaba8a", "eaba84e186ad"],
+  ["eaba8b", "e18481e185a3e186ae"],
+  ["eaba8b", "eaba84e186ae"],
+  ["eaba8c", "e18481e185a3e186af"],
+  ["eaba8c", "eaba84e186af"],
+  ["eaba8d", "e18481e185a3e186b0"],
+  ["eaba8d", "eaba84e186b0"],
+  ["eaba8e", "e18481e185a3e186b1"],
+  ["eaba8e", "eaba84e186b1"],
+  ["eaba8f", "e18481e185a3e186b2"],
+  ["eaba8f", "eaba84e186b2"],
+  ["eaba90", "e18481e185a3e186b3"],
+  ["eaba90", "eaba84e186b3"],
+  ["eaba91", "e18481e185a3e186b4"],
+  ["eaba91", "eaba84e186b4"],
+  ["eaba92", "e18481e185a3e186b5"],
+  ["eaba92", "eaba84e186b5"],
+  ["eaba93", "e18481e185a3e186b6"],
+  ["eaba93", "eaba84e186b6"],
+  ["eaba94", "e18481e185a3e186b7"],
+  ["eaba94", "eaba84e186b7"],
+  ["eaba95", "e18481e185a3e186b8"],
+  ["eaba95", "eaba84e186b8"],
+  ["eaba96", "e18481e185a3e186b9"],
+  ["eaba96", "eaba84e186b9"],
+  ["eaba97", "e18481e185a3e186ba"],
+  ["eaba97", "eaba84e186ba"],
+  ["eaba98", "e18481e185a3e186bb"],
+  ["eaba98", "eaba84e186bb"],
+  ["eaba99", "e18481e185a3e186bc"],
+  ["eaba99", "eaba84e186bc"],
+  ["eaba9a", "e18481e185a3e186bd"],
+  ["eaba9a", "eaba84e186bd"],
+  ["eaba9b", "e18481e185a3e186be"],
+  ["eaba9b", "eaba84e186be"],
+  ["eaba9c", "e18481e185a3e186bf"],
+  ["eaba9c", "eaba84e186bf"],
+  ["eaba9d", "e18481e185a3e18780"],
+  ["eaba9d", "eaba84e18780"],
+  ["eaba9e", "e18481e185a3e18781"],
+  ["eaba9e", "eaba84e18781"],
+  ["eaba9f", "e18481e185a3e18782"],
+  ["eaba9f", "eaba84e18782"],
+  ["eabaa0", "e18481e185a4"],
+  ["eabaa1", "e18481e185a4e186a8"],
+  ["eabaa1", "eabaa0e186a8"],
+  ["eabaa2", "e18481e185a4e186a9"],
+  ["eabaa2", "eabaa0e186a9"],
+  ["eabaa3", "e18481e185a4e186aa"],
+  ["eabaa3", "eabaa0e186aa"],
+  ["eabaa4", "e18481e185a4e186ab"],
+  ["eabaa4", "eabaa0e186ab"],
+  ["eabaa5", "e18481e185a4e186ac"],
+  ["eabaa5", "eabaa0e186ac"],
+  ["eabaa6", "e18481e185a4e186ad"],
+  ["eabaa6", "eabaa0e186ad"],
+  ["eabaa7", "e18481e185a4e186ae"],
+  ["eabaa7", "eabaa0e186ae"],
+  ["eabaa8", "e18481e185a4e186af"],
+  ["eabaa8", "eabaa0e186af"],
+  ["eabaa9", "e18481e185a4e186b0"],
+  ["eabaa9", "eabaa0e186b0"],
+  ["eabaaa", "e18481e185a4e186b1"],
+  ["eabaaa", "eabaa0e186b1"],
+  ["eabaab", "e18481e185a4e186b2"],
+  ["eabaab", "eabaa0e186b2"],
+  ["eabaac", "e18481e185a4e186b3"],
+  ["eabaac", "eabaa0e186b3"],
+  ["eabaad", "e18481e185a4e186b4"],
+  ["eabaad", "eabaa0e186b4"],
+  ["eabaae", "e18481e185a4e186b5"],
+  ["eabaae", "eabaa0e186b5"],
+  ["eabaaf", "e18481e185a4e186b6"],
+  ["eabaaf", "eabaa0e186b6"],
+  ["eabab0", "e18481e185a4e186b7"],
+  ["eabab0", "eabaa0e186b7"],
+  ["eabab1", "e18481e185a4e186b8"],
+  ["eabab1", "eabaa0e186b8"],
+  ["eabab2", "e18481e185a4e186b9"],
+  ["eabab2", "eabaa0e186b9"],
+  ["eabab3", "e18481e185a4e186ba"],
+  ["eabab3", "eabaa0e186ba"],
+  ["eabab4", "e18481e185a4e186bb"],
+  ["eabab4", "eabaa0e186bb"],
+  ["eabab5", "e18481e185a4e186bc"],
+  ["eabab5", "eabaa0e186bc"],
+  ["eabab6", "e18481e185a4e186bd"],
+  ["eabab6", "eabaa0e186bd"],
+  ["eabab7", "e18481e185a4e186be"],
+  ["eabab7", "eabaa0e186be"],
+  ["eabab8", "e18481e185a4e186bf"],
+  ["eabab8", "eabaa0e186bf"],
+  ["eabab9", "e18481e185a4e18780"],
+  ["eabab9", "eabaa0e18780"],
+  ["eababa", "e18481e185a4e18781"],
+  ["eababa", "eabaa0e18781"],
+  ["eababb", "e18481e185a4e18782"],
+  ["eababb", "eabaa0e18782"],
+  ["eababc", "e18481e185a5"],
+  ["eababd", "e18481e185a5e186a8"],
+  ["eababd", "eababce186a8"],
+  ["eababe", "e18481e185a5e186a9"],
+  ["eababe", "eababce186a9"],
+  ["eababf", "e18481e185a5e186aa"],
+  ["eababf", "eababce186aa"],
+  ["eabb80", "e18481e185a5e186ab"],
+  ["eabb80", "eababce186ab"],
+  ["eabb81", "e18481e185a5e186ac"],
+  ["eabb81", "eababce186ac"],
+  ["eabb82", "e18481e185a5e186ad"],
+  ["eabb82", "eababce186ad"],
+  ["eabb83", "e18481e185a5e186ae"],
+  ["eabb83", "eababce186ae"],
+  ["eabb84", "e18481e185a5e186af"],
+  ["eabb84", "eababce186af"],
+  ["eabb85", "e18481e185a5e186b0"],
+  ["eabb85", "eababce186b0"],
+  ["eabb86", "e18481e185a5e186b1"],
+  ["eabb86", "eababce186b1"],
+  ["eabb87", "e18481e185a5e186b2"],
+  ["eabb87", "eababce186b2"],
+  ["eabb88", "e18481e185a5e186b3"],
+  ["eabb88", "eababce186b3"],
+  ["eabb89", "e18481e185a5e186b4"],
+  ["eabb89", "eababce186b4"],
+  ["eabb8a", "e18481e185a5e186b5"],
+  ["eabb8a", "eababce186b5"],
+  ["eabb8b", "e18481e185a5e186b6"],
+  ["eabb8b", "eababce186b6"],
+  ["eabb8c", "e18481e185a5e186b7"],
+  ["eabb8c", "eababce186b7"],
+  ["eabb8d", "e18481e185a5e186b8"],
+  ["eabb8d", "eababce186b8"],
+  ["eabb8e", "e18481e185a5e186b9"],
+  ["eabb8e", "eababce186b9"],
+  ["eabb8f", "e18481e185a5e186ba"],
+  ["eabb8f", "eababce186ba"],
+  ["eabb90", "e18481e185a5e186bb"],
+  ["eabb90", "eababce186bb"],
+  ["eabb91", "e18481e185a5e186bc"],
+  ["eabb91", "eababce186bc"],
+  ["eabb92", "e18481e185a5e186bd"],
+  ["eabb92", "eababce186bd"],
+  ["eabb93", "e18481e185a5e186be"],
+  ["eabb93", "eababce186be"],
+  ["eabb94", "e18481e185a5e186bf"],
+  ["eabb94", "eababce186bf"],
+  ["eabb95", "e18481e185a5e18780"],
+  ["eabb95", "eababce18780"],
+  ["eabb96", "e18481e185a5e18781"],
+  ["eabb96", "eababce18781"],
+  ["eabb97", "e18481e185a5e18782"],
+  ["eabb97", "eababce18782"],
+  ["eabb98", "e18481e185a6"],
+  ["eabb99", "e18481e185a6e186a8"],
+  ["eabb99", "eabb98e186a8"],
+  ["eabb9a", "e18481e185a6e186a9"],
+  ["eabb9a", "eabb98e186a9"],
+  ["eabb9b", "e18481e185a6e186aa"],
+  ["eabb9b", "eabb98e186aa"],
+  ["eabb9c", "e18481e185a6e186ab"],
+  ["eabb9c", "eabb98e186ab"],
+  ["eabb9d", "e18481e185a6e186ac"],
+  ["eabb9d", "eabb98e186ac"],
+  ["eabb9e", "e18481e185a6e186ad"],
+  ["eabb9e", "eabb98e186ad"],
+  ["eabb9f", "e18481e185a6e186ae"],
+  ["eabb9f", "eabb98e186ae"],
+  ["eabba0", "e18481e185a6e186af"],
+  ["eabba0", "eabb98e186af"],
+  ["eabba1", "e18481e185a6e186b0"],
+  ["eabba1", "eabb98e186b0"],
+  ["eabba2", "e18481e185a6e186b1"],
+  ["eabba2", "eabb98e186b1"],
+  ["eabba3", "e18481e185a6e186b2"],
+  ["eabba3", "eabb98e186b2"],
+  ["eabba4", "e18481e185a6e186b3"],
+  ["eabba4", "eabb98e186b3"],
+  ["eabba5", "e18481e185a6e186b4"],
+  ["eabba5", "eabb98e186b4"],
+  ["eabba6", "e18481e185a6e186b5"],
+  ["eabba6", "eabb98e186b5"],
+  ["eabba7", "e18481e185a6e186b6"],
+  ["eabba7", "eabb98e186b6"],
+  ["eabba8", "e18481e185a6e186b7"],
+  ["eabba8", "eabb98e186b7"],
+  ["eabba9", "e18481e185a6e186b8"],
+  ["eabba9", "eabb98e186b8"],
+  ["eabbaa", "e18481e185a6e186b9"],
+  ["eabbaa", "eabb98e186b9"],
+  ["eabbab", "e18481e185a6e186ba"],
+  ["eabbab", "eabb98e186ba"],
+  ["eabbac", "e18481e185a6e186bb"],
+  ["eabbac", "eabb98e186bb"],
+  ["eabbad", "e18481e185a6e186bc"],
+  ["eabbad", "eabb98e186bc"],
+  ["eabbae", "e18481e185a6e186bd"],
+  ["eabbae", "eabb98e186bd"],
+  ["eabbaf", "e18481e185a6e186be"],
+  ["eabbaf", "eabb98e186be"],
+  ["eabbb0", "e18481e185a6e186bf"],
+  ["eabbb0", "eabb98e186bf"],
+  ["eabbb1", "e18481e185a6e18780"],
+  ["eabbb1", "eabb98e18780"],
+  ["eabbb2", "e18481e185a6e18781"],
+  ["eabbb2", "eabb98e18781"],
+  ["eabbb3", "e18481e185a6e18782"],
+  ["eabbb3", "eabb98e18782"],
+  ["eabbb4", "e18481e185a7"],
+  ["eabbb5", "e18481e185a7e186a8"],
+  ["eabbb5", "eabbb4e186a8"],
+  ["eabbb6", "e18481e185a7e186a9"],
+  ["eabbb6", "eabbb4e186a9"],
+  ["eabbb7", "e18481e185a7e186aa"],
+  ["eabbb7", "eabbb4e186aa"],
+  ["eabbb8", "e18481e185a7e186ab"],
+  ["eabbb8", "eabbb4e186ab"],
+  ["eabbb9", "e18481e185a7e186ac"],
+  ["eabbb9", "eabbb4e186ac"],
+  ["eabbba", "e18481e185a7e186ad"],
+  ["eabbba", "eabbb4e186ad"],
+  ["eabbbb", "e18481e185a7e186ae"],
+  ["eabbbb", "eabbb4e186ae"],
+  ["eabbbc", "e18481e185a7e186af"],
+  ["eabbbc", "eabbb4e186af"],
+  ["eabbbd", "e18481e185a7e186b0"],
+  ["eabbbd", "eabbb4e186b0"],
+  ["eabbbe", "e18481e185a7e186b1"],
+  ["eabbbe", "eabbb4e186b1"],
+  ["eabbbf", "e18481e185a7e186b2"],
+  ["eabbbf", "eabbb4e186b2"],
+  ["eabc80", "e18481e185a7e186b3"],
+  ["eabc80", "eabbb4e186b3"],
+  ["eabc81", "e18481e185a7e186b4"],
+  ["eabc81", "eabbb4e186b4"],
+  ["eabc82", "e18481e185a7e186b5"],
+  ["eabc82", "eabbb4e186b5"],
+  ["eabc83", "e18481e185a7e186b6"],
+  ["eabc83", "eabbb4e186b6"],
+  ["eabc84", "e18481e185a7e186b7"],
+  ["eabc84", "eabbb4e186b7"],
+  ["eabc85", "e18481e185a7e186b8"],
+  ["eabc85", "eabbb4e186b8"],
+  ["eabc86", "e18481e185a7e186b9"],
+  ["eabc86", "eabbb4e186b9"],
+  ["eabc87", "e18481e185a7e186ba"],
+  ["eabc87", "eabbb4e186ba"],
+  ["eabc88", "e18481e185a7e186bb"],
+  ["eabc88", "eabbb4e186bb"],
+  ["eabc89", "e18481e185a7e186bc"],
+  ["eabc89", "eabbb4e186bc"],
+  ["eabc8a", "e18481e185a7e186bd"],
+  ["eabc8a", "eabbb4e186bd"],
+  ["eabc8b", "e18481e185a7e186be"],
+  ["eabc8b", "eabbb4e186be"],
+  ["eabc8c", "e18481e185a7e186bf"],
+  ["eabc8c", "eabbb4e186bf"],
+  ["eabc8d", "e18481e185a7e18780"],
+  ["eabc8d", "eabbb4e18780"],
+  ["eabc8e", "e18481e185a7e18781"],
+  ["eabc8e", "eabbb4e18781"],
+  ["eabc8f", "e18481e185a7e18782"],
+  ["eabc8f", "eabbb4e18782"],
+  ["eabc90", "e18481e185a8"],
+  ["eabc91", "e18481e185a8e186a8"],
+  ["eabc91", "eabc90e186a8"],
+  ["eabc92", "e18481e185a8e186a9"],
+  ["eabc92", "eabc90e186a9"],
+  ["eabc93", "e18481e185a8e186aa"],
+  ["eabc93", "eabc90e186aa"],
+  ["eabc94", "e18481e185a8e186ab"],
+  ["eabc94", "eabc90e186ab"],
+  ["eabc95", "e18481e185a8e186ac"],
+  ["eabc95", "eabc90e186ac"],
+  ["eabc96", "e18481e185a8e186ad"],
+  ["eabc96", "eabc90e186ad"],
+  ["eabc97", "e18481e185a8e186ae"],
+  ["eabc97", "eabc90e186ae"],
+  ["eabc98", "e18481e185a8e186af"],
+  ["eabc98", "eabc90e186af"],
+  ["eabc99", "e18481e185a8e186b0"],
+  ["eabc99", "eabc90e186b0"],
+  ["eabc9a", "e18481e185a8e186b1"],
+  ["eabc9a", "eabc90e186b1"],
+  ["eabc9b", "e18481e185a8e186b2"],
+  ["eabc9b", "eabc90e186b2"],
+  ["eabc9c", "e18481e185a8e186b3"],
+  ["eabc9c", "eabc90e186b3"],
+  ["eabc9d", "e18481e185a8e186b4"],
+  ["eabc9d", "eabc90e186b4"],
+  ["eabc9e", "e18481e185a8e186b5"],
+  ["eabc9e", "eabc90e186b5"],
+  ["eabc9f", "e18481e185a8e186b6"],
+  ["eabc9f", "eabc90e186b6"],
+  ["eabca0", "e18481e185a8e186b7"],
+  ["eabca0", "eabc90e186b7"],
+  ["eabca1", "e18481e185a8e186b8"],
+  ["eabca1", "eabc90e186b8"],
+  ["eabca2", "e18481e185a8e186b9"],
+  ["eabca2", "eabc90e186b9"],
+  ["eabca3", "e18481e185a8e186ba"],
+  ["eabca3", "eabc90e186ba"],
+  ["eabca4", "e18481e185a8e186bb"],
+  ["eabca4", "eabc90e186bb"],
+  ["eabca5", "e18481e185a8e186bc"],
+  ["eabca5", "eabc90e186bc"],
+  ["eabca6", "e18481e185a8e186bd"],
+  ["eabca6", "eabc90e186bd"],
+  ["eabca7", "e18481e185a8e186be"],
+  ["eabca7", "eabc90e186be"],
+  ["eabca8", "e18481e185a8e186bf"],
+  ["eabca8", "eabc90e186bf"],
+  ["eabca9", "e18481e185a8e18780"],
+  ["eabca9", "eabc90e18780"],
+  ["eabcaa", "e18481e185a8e18781"],
+  ["eabcaa", "eabc90e18781"],
+  ["eabcab", "e18481e185a8e18782"],
+  ["eabcab", "eabc90e18782"],
+  ["eabcac", "e18481e185a9"],
+  ["eabcad", "e18481e185a9e186a8"],
+  ["eabcad", "eabcace186a8"],
+  ["eabcae", "e18481e185a9e186a9"],
+  ["eabcae", "eabcace186a9"],
+  ["eabcaf", "e18481e185a9e186aa"],
+  ["eabcaf", "eabcace186aa"],
+  ["eabcb0", "e18481e185a9e186ab"],
+  ["eabcb0", "eabcace186ab"],
+  ["eabcb1", "e18481e185a9e186ac"],
+  ["eabcb1", "eabcace186ac"],
+  ["eabcb2", "e18481e185a9e186ad"],
+  ["eabcb2", "eabcace186ad"],
+  ["eabcb3", "e18481e185a9e186ae"],
+  ["eabcb3", "eabcace186ae"],
+  ["eabcb4", "e18481e185a9e186af"],
+  ["eabcb4", "eabcace186af"],
+  ["eabcb5", "e18481e185a9e186b0"],
+  ["eabcb5", "eabcace186b0"],
+  ["eabcb6", "e18481e185a9e186b1"],
+  ["eabcb6", "eabcace186b1"],
+  ["eabcb7", "e18481e185a9e186b2"],
+  ["eabcb7", "eabcace186b2"],
+  ["eabcb8", "e18481e185a9e186b3"],
+  ["eabcb8", "eabcace186b3"],
+  ["eabcb9", "e18481e185a9e186b4"],
+  ["eabcb9", "eabcace186b4"],
+  ["eabcba", "e18481e185a9e186b5"],
+  ["eabcba", "eabcace186b5"],
+  ["eabcbb", "e18481e185a9e186b6"],
+  ["eabcbb", "eabcace186b6"],
+  ["eabcbc", "e18481e185a9e186b7"],
+  ["eabcbc", "eabcace186b7"],
+  ["eabcbd", "e18481e185a9e186b8"],
+  ["eabcbd", "eabcace186b8"],
+  ["eabcbe", "e18481e185a9e186b9"],
+  ["eabcbe", "eabcace186b9"],
+  ["eabcbf", "e18481e185a9e186ba"],
+  ["eabcbf", "eabcace186ba"],
+  ["eabd80", "e18481e185a9e186bb"],
+  ["eabd80", "eabcace186bb"],
+  ["eabd81", "e18481e185a9e186bc"],
+  ["eabd81", "eabcace186bc"],
+  ["eabd82", "e18481e185a9e186bd"],
+  ["eabd82", "eabcace186bd"],
+  ["eabd83", "e18481e185a9e186be"],
+  ["eabd83", "eabcace186be"],
+  ["eabd84", "e18481e185a9e186bf"],
+  ["eabd84", "eabcace186bf"],
+  ["eabd85", "e18481e185a9e18780"],
+  ["eabd85", "eabcace18780"],
+  ["eabd86", "e18481e185a9e18781"],
+  ["eabd86", "eabcace18781"],
+  ["eabd87", "e18481e185a9e18782"],
+  ["eabd87", "eabcace18782"],
+  ["eabd88", "e18481e185aa"],
+  ["eabd89", "e18481e185aae186a8"],
+  ["eabd89", "eabd88e186a8"],
+  ["eabd8a", "e18481e185aae186a9"],
+  ["eabd8a", "eabd88e186a9"],
+  ["eabd8b", "e18481e185aae186aa"],
+  ["eabd8b", "eabd88e186aa"],
+  ["eabd8c", "e18481e185aae186ab"],
+  ["eabd8c", "eabd88e186ab"],
+  ["eabd8d", "e18481e185aae186ac"],
+  ["eabd8d", "eabd88e186ac"],
+  ["eabd8e", "e18481e185aae186ad"],
+  ["eabd8e", "eabd88e186ad"],
+  ["eabd8f", "e18481e185aae186ae"],
+  ["eabd8f", "eabd88e186ae"],
+  ["eabd90", "e18481e185aae186af"],
+  ["eabd90", "eabd88e186af"],
+  ["eabd91", "e18481e185aae186b0"],
+  ["eabd91", "eabd88e186b0"],
+  ["eabd92", "e18481e185aae186b1"],
+  ["eabd92", "eabd88e186b1"],
+  ["eabd93", "e18481e185aae186b2"],
+  ["eabd93", "eabd88e186b2"],
+  ["eabd94", "e18481e185aae186b3"],
+  ["eabd94", "eabd88e186b3"],
+  ["eabd95", "e18481e185aae186b4"],
+  ["eabd95", "eabd88e186b4"],
+  ["eabd96", "e18481e185aae186b5"],
+  ["eabd96", "eabd88e186b5"],
+  ["eabd97", "e18481e185aae186b6"],
+  ["eabd97", "eabd88e186b6"],
+  ["eabd98", "e18481e185aae186b7"],
+  ["eabd98", "eabd88e186b7"],
+  ["eabd99", "e18481e185aae186b8"],
+  ["eabd99", "eabd88e186b8"],
+  ["eabd9a", "e18481e185aae186b9"],
+  ["eabd9a", "eabd88e186b9"],
+  ["eabd9b", "e18481e185aae186ba"],
+  ["eabd9b", "eabd88e186ba"],
+  ["eabd9c", "e18481e185aae186bb"],
+  ["eabd9c", "eabd88e186bb"],
+  ["eabd9d", "e18481e185aae186bc"],
+  ["eabd9d", "eabd88e186bc"],
+  ["eabd9e", "e18481e185aae186bd"],
+  ["eabd9e", "eabd88e186bd"],
+  ["eabd9f", "e18481e185aae186be"],
+  ["eabd9f", "eabd88e186be"],
+  ["eabda0", "e18481e185aae186bf"],
+  ["eabda0", "eabd88e186bf"],
+  ["eabda1", "e18481e185aae18780"],
+  ["eabda1", "eabd88e18780"],
+  ["eabda2", "e18481e185aae18781"],
+  ["eabda2", "eabd88e18781"],
+  ["eabda3", "e18481e185aae18782"],
+  ["eabda3", "eabd88e18782"],
+  ["eabda4", "e18481e185ab"],
+  ["eabda5", "e18481e185abe186a8"],
+  ["eabda5", "eabda4e186a8"],
+  ["eabda6", "e18481e185abe186a9"],
+  ["eabda6", "eabda4e186a9"],
+  ["eabda7", "e18481e185abe186aa"],
+  ["eabda7", "eabda4e186aa"],
+  ["eabda8", "e18481e185abe186ab"],
+  ["eabda8", "eabda4e186ab"],
+  ["eabda9", "e18481e185abe186ac"],
+  ["eabda9", "eabda4e186ac"],
+  ["eabdaa", "e18481e185abe186ad"],
+  ["eabdaa", "eabda4e186ad"],
+  ["eabdab", "e18481e185abe186ae"],
+  ["eabdab", "eabda4e186ae"],
+  ["eabdac", "e18481e185abe186af"],
+  ["eabdac", "eabda4e186af"],
+  ["eabdad", "e18481e185abe186b0"],
+  ["eabdad", "eabda4e186b0"],
+  ["eabdae", "e18481e185abe186b1"],
+  ["eabdae", "eabda4e186b1"],
+  ["eabdaf", "e18481e185abe186b2"],
+  ["eabdaf", "eabda4e186b2"],
+  ["eabdb0", "e18481e185abe186b3"],
+  ["eabdb0", "eabda4e186b3"],
+  ["eabdb1", "e18481e185abe186b4"],
+  ["eabdb1", "eabda4e186b4"],
+  ["eabdb2", "e18481e185abe186b5"],
+  ["eabdb2", "eabda4e186b5"],
+  ["eabdb3", "e18481e185abe186b6"],
+  ["eabdb3", "eabda4e186b6"],
+  ["eabdb4", "e18481e185abe186b7"],
+  ["eabdb4", "eabda4e186b7"],
+  ["eabdb5", "e18481e185abe186b8"],
+  ["eabdb5", "eabda4e186b8"],
+  ["eabdb6", "e18481e185abe186b9"],
+  ["eabdb6", "eabda4e186b9"],
+  ["eabdb7", "e18481e185abe186ba"],
+  ["eabdb7", "eabda4e186ba"],
+  ["eabdb8", "e18481e185abe186bb"],
+  ["eabdb8", "eabda4e186bb"],
+  ["eabdb9", "e18481e185abe186bc"],
+  ["eabdb9", "eabda4e186bc"],
+  ["eabdba", "e18481e185abe186bd"],
+  ["eabdba", "eabda4e186bd"],
+  ["eabdbb", "e18481e185abe186be"],
+  ["eabdbb", "eabda4e186be"],
+  ["eabdbc", "e18481e185abe186bf"],
+  ["eabdbc", "eabda4e186bf"],
+  ["eabdbd", "e18481e185abe18780"],
+  ["eabdbd", "eabda4e18780"],
+  ["eabdbe", "e18481e185abe18781"],
+  ["eabdbe", "eabda4e18781"],
+  ["eabdbf", "e18481e185abe18782"],
+  ["eabdbf", "eabda4e18782"],
+  ["eabe80", "e18481e185ac"],
+  ["eabe81", "e18481e185ace186a8"],
+  ["eabe81", "eabe80e186a8"],
+  ["eabe82", "e18481e185ace186a9"],
+  ["eabe82", "eabe80e186a9"],
+  ["eabe83", "e18481e185ace186aa"],
+  ["eabe83", "eabe80e186aa"],
+  ["eabe84", "e18481e185ace186ab"],
+  ["eabe84", "eabe80e186ab"],
+  ["eabe85", "e18481e185ace186ac"],
+  ["eabe85", "eabe80e186ac"],
+  ["eabe86", "e18481e185ace186ad"],
+  ["eabe86", "eabe80e186ad"],
+  ["eabe87", "e18481e185ace186ae"],
+  ["eabe87", "eabe80e186ae"],
+  ["eabe88", "e18481e185ace186af"],
+  ["eabe88", "eabe80e186af"],
+  ["eabe89", "e18481e185ace186b0"],
+  ["eabe89", "eabe80e186b0"],
+  ["eabe8a", "e18481e185ace186b1"],
+  ["eabe8a", "eabe80e186b1"],
+  ["eabe8b", "e18481e185ace186b2"],
+  ["eabe8b", "eabe80e186b2"],
+  ["eabe8c", "e18481e185ace186b3"],
+  ["eabe8c", "eabe80e186b3"],
+  ["eabe8d", "e18481e185ace186b4"],
+  ["eabe8d", "eabe80e186b4"],
+  ["eabe8e", "e18481e185ace186b5"],
+  ["eabe8e", "eabe80e186b5"],
+  ["eabe8f", "e18481e185ace186b6"],
+  ["eabe8f", "eabe80e186b6"],
+  ["eabe90", "e18481e185ace186b7"],
+  ["eabe90", "eabe80e186b7"],
+  ["eabe91", "e18481e185ace186b8"],
+  ["eabe91", "eabe80e186b8"],
+  ["eabe92", "e18481e185ace186b9"],
+  ["eabe92", "eabe80e186b9"],
+  ["eabe93", "e18481e185ace186ba"],
+  ["eabe93", "eabe80e186ba"],
+  ["eabe94", "e18481e185ace186bb"],
+  ["eabe94", "eabe80e186bb"],
+  ["eabe95", "e18481e185ace186bc"],
+  ["eabe95", "eabe80e186bc"],
+  ["eabe96", "e18481e185ace186bd"],
+  ["eabe96", "eabe80e186bd"],
+  ["eabe97", "e18481e185ace186be"],
+  ["eabe97", "eabe80e186be"],
+  ["eabe98", "e18481e185ace186bf"],
+  ["eabe98", "eabe80e186bf"],
+  ["eabe99", "e18481e185ace18780"],
+  ["eabe99", "eabe80e18780"],
+  ["eabe9a", "e18481e185ace18781"],
+  ["eabe9a", "eabe80e18781"],
+  ["eabe9b", "e18481e185ace18782"],
+  ["eabe9b", "eabe80e18782"],
+  ["eabe9c", "e18481e185ad"],
+  ["eabe9d", "e18481e185ade186a8"],
+  ["eabe9d", "eabe9ce186a8"],
+  ["eabe9e", "e18481e185ade186a9"],
+  ["eabe9e", "eabe9ce186a9"],
+  ["eabe9f", "e18481e185ade186aa"],
+  ["eabe9f", "eabe9ce186aa"],
+  ["eabea0", "e18481e185ade186ab"],
+  ["eabea0", "eabe9ce186ab"],
+  ["eabea1", "e18481e185ade186ac"],
+  ["eabea1", "eabe9ce186ac"],
+  ["eabea2", "e18481e185ade186ad"],
+  ["eabea2", "eabe9ce186ad"],
+  ["eabea3", "e18481e185ade186ae"],
+  ["eabea3", "eabe9ce186ae"],
+  ["eabea4", "e18481e185ade186af"],
+  ["eabea4", "eabe9ce186af"],
+  ["eabea5", "e18481e185ade186b0"],
+  ["eabea5", "eabe9ce186b0"],
+  ["eabea6", "e18481e185ade186b1"],
+  ["eabea6", "eabe9ce186b1"],
+  ["eabea7", "e18481e185ade186b2"],
+  ["eabea7", "eabe9ce186b2"],
+  ["eabea8", "e18481e185ade186b3"],
+  ["eabea8", "eabe9ce186b3"],
+  ["eabea9", "e18481e185ade186b4"],
+  ["eabea9", "eabe9ce186b4"],
+  ["eabeaa", "e18481e185ade186b5"],
+  ["eabeaa", "eabe9ce186b5"],
+  ["eabeab", "e18481e185ade186b6"],
+  ["eabeab", "eabe9ce186b6"],
+  ["eabeac", "e18481e185ade186b7"],
+  ["eabeac", "eabe9ce186b7"],
+  ["eabead", "e18481e185ade186b8"],
+  ["eabead", "eabe9ce186b8"],
+  ["eabeae", "e18481e185ade186b9"],
+  ["eabeae", "eabe9ce186b9"],
+  ["eabeaf", "e18481e185ade186ba"],
+  ["eabeaf", "eabe9ce186ba"],
+  ["eabeb0", "e18481e185ade186bb"],
+  ["eabeb0", "eabe9ce186bb"],
+  ["eabeb1", "e18481e185ade186bc"],
+  ["eabeb1", "eabe9ce186bc"],
+  ["eabeb2", "e18481e185ade186bd"],
+  ["eabeb2", "eabe9ce186bd"],
+  ["eabeb3", "e18481e185ade186be"],
+  ["eabeb3", "eabe9ce186be"],
+  ["eabeb4", "e18481e185ade186bf"],
+  ["eabeb4", "eabe9ce186bf"],
+  ["eabeb5", "e18481e185ade18780"],
+  ["eabeb5", "eabe9ce18780"],
+  ["eabeb6", "e18481e185ade18781"],
+  ["eabeb6", "eabe9ce18781"],
+  ["eabeb7", "e18481e185ade18782"],
+  ["eabeb7", "eabe9ce18782"],
+  ["eabeb8", "e18481e185ae"],
+  ["eabeb9", "e18481e185aee186a8"],
+  ["eabeb9", "eabeb8e186a8"],
+  ["eabeba", "e18481e185aee186a9"],
+  ["eabeba", "eabeb8e186a9"],
+  ["eabebb", "e18481e185aee186aa"],
+  ["eabebb", "eabeb8e186aa"],
+  ["eabebc", "e18481e185aee186ab"],
+  ["eabebc", "eabeb8e186ab"],
+  ["eabebd", "e18481e185aee186ac"],
+  ["eabebd", "eabeb8e186ac"],
+  ["eabebe", "e18481e185aee186ad"],
+  ["eabebe", "eabeb8e186ad"],
+  ["eabebf", "e18481e185aee186ae"],
+  ["eabebf", "eabeb8e186ae"],
+  ["eabf80", "e18481e185aee186af"],
+  ["eabf80", "eabeb8e186af"],
+  ["eabf81", "e18481e185aee186b0"],
+  ["eabf81", "eabeb8e186b0"],
+  ["eabf82", "e18481e185aee186b1"],
+  ["eabf82", "eabeb8e186b1"],
+  ["eabf83", "e18481e185aee186b2"],
+  ["eabf83", "eabeb8e186b2"],
+  ["eabf84", "e18481e185aee186b3"],
+  ["eabf84", "eabeb8e186b3"],
+  ["eabf85", "e18481e185aee186b4"],
+  ["eabf85", "eabeb8e186b4"],
+  ["eabf86", "e18481e185aee186b5"],
+  ["eabf86", "eabeb8e186b5"],
+  ["eabf87", "e18481e185aee186b6"],
+  ["eabf87", "eabeb8e186b6"],
+  ["eabf88", "e18481e185aee186b7"],
+  ["eabf88", "eabeb8e186b7"],
+  ["eabf89", "e18481e185aee186b8"],
+  ["eabf89", "eabeb8e186b8"],
+  ["eabf8a", "e18481e185aee186b9"],
+  ["eabf8a", "eabeb8e186b9"],
+  ["eabf8b", "e18481e185aee186ba"],
+  ["eabf8b", "eabeb8e186ba"],
+  ["eabf8c", "e18481e185aee186bb"],
+  ["eabf8c", "eabeb8e186bb"],
+  ["eabf8d", "e18481e185aee186bc"],
+  ["eabf8d", "eabeb8e186bc"],
+  ["eabf8e", "e18481e185aee186bd"],
+  ["eabf8e", "eabeb8e186bd"],
+  ["eabf8f", "e18481e185aee186be"],
+  ["eabf8f", "eabeb8e186be"],
+  ["eabf90", "e18481e185aee186bf"],
+  ["eabf90", "eabeb8e186bf"],
+  ["eabf91", "e18481e185aee18780"],
+  ["eabf91", "eabeb8e18780"],
+  ["eabf92", "e18481e185aee18781"],
+  ["eabf92", "eabeb8e18781"],
+  ["eabf93", "e18481e185aee18782"],
+  ["eabf93", "eabeb8e18782"],
+  ["eabf94", "e18481e185af"],
+  ["eabf95", "e18481e185afe186a8"],
+  ["eabf95", "eabf94e186a8"],
+  ["eabf96", "e18481e185afe186a9"],
+  ["eabf96", "eabf94e186a9"],
+  ["eabf97", "e18481e185afe186aa"],
+  ["eabf97", "eabf94e186aa"],
+  ["eabf98", "e18481e185afe186ab"],
+  ["eabf98", "eabf94e186ab"],
+  ["eabf99", "e18481e185afe186ac"],
+  ["eabf99", "eabf94e186ac"],
+  ["eabf9a", "e18481e185afe186ad"],
+  ["eabf9a", "eabf94e186ad"],
+  ["eabf9b", "e18481e185afe186ae"],
+  ["eabf9b", "eabf94e186ae"],
+  ["eabf9c", "e18481e185afe186af"],
+  ["eabf9c", "eabf94e186af"],
+  ["eabf9d", "e18481e185afe186b0"],
+  ["eabf9d", "eabf94e186b0"],
+  ["eabf9e", "e18481e185afe186b1"],
+  ["eabf9e", "eabf94e186b1"],
+  ["eabf9f", "e18481e185afe186b2"],
+  ["eabf9f", "eabf94e186b2"],
+  ["eabfa0", "e18481e185afe186b3"],
+  ["eabfa0", "eabf94e186b3"],
+  ["eabfa1", "e18481e185afe186b4"],
+  ["eabfa1", "eabf94e186b4"],
+  ["eabfa2", "e18481e185afe186b5"],
+  ["eabfa2", "eabf94e186b5"],
+  ["eabfa3", "e18481e185afe186b6"],
+  ["eabfa3", "eabf94e186b6"],
+  ["eabfa4", "e18481e185afe186b7"],
+  ["eabfa4", "eabf94e186b7"],
+  ["eabfa5", "e18481e185afe186b8"],
+  ["eabfa5", "eabf94e186b8"],
+  ["eabfa6", "e18481e185afe186b9"],
+  ["eabfa6", "eabf94e186b9"],
+  ["eabfa7", "e18481e185afe186ba"],
+  ["eabfa7", "eabf94e186ba"],
+  ["eabfa8", "e18481e185afe186bb"],
+  ["eabfa8", "eabf94e186bb"],
+  ["eabfa9", "e18481e185afe186bc"],
+  ["eabfa9", "eabf94e186bc"],
+  ["eabfaa", "e18481e185afe186bd"],
+  ["eabfaa", "eabf94e186bd"],
+  ["eabfab", "e18481e185afe186be"],
+  ["eabfab", "eabf94e186be"],
+  ["eabfac", "e18481e185afe186bf"],
+  ["eabfac", "eabf94e186bf"],
+  ["eabfad", "e18481e185afe18780"],
+  ["eabfad", "eabf94e18780"],
+  ["eabfae", "e18481e185afe18781"],
+  ["eabfae", "eabf94e18781"],
+  ["eabfaf", "e18481e185afe18782"],
+  ["eabfaf", "eabf94e18782"],
+  ["eabfb0", "e18481e185b0"],
+  ["eabfb1", "e18481e185b0e186a8"],
+  ["eabfb1", "eabfb0e186a8"],
+  ["eabfb2", "e18481e185b0e186a9"],
+  ["eabfb2", "eabfb0e186a9"],
+  ["eabfb3", "e18481e185b0e186aa"],
+  ["eabfb3", "eabfb0e186aa"],
+  ["eabfb4", "e18481e185b0e186ab"],
+  ["eabfb4", "eabfb0e186ab"],
+  ["eabfb5", "e18481e185b0e186ac"],
+  ["eabfb5", "eabfb0e186ac"],
+  ["eabfb6", "e18481e185b0e186ad"],
+  ["eabfb6", "eabfb0e186ad"],
+  ["eabfb7", "e18481e185b0e186ae"],
+  ["eabfb7", "eabfb0e186ae"],
+  ["eabfb8", "e18481e185b0e186af"],
+  ["eabfb8", "eabfb0e186af"],
+  ["eabfb9", "e18481e185b0e186b0"],
+  ["eabfb9", "eabfb0e186b0"],
+  ["eabfba", "e18481e185b0e186b1"],
+  ["eabfba", "eabfb0e186b1"],
+  ["eabfbb", "e18481e185b0e186b2"],
+  ["eabfbb", "eabfb0e186b2"],
+  ["eabfbc", "e18481e185b0e186b3"],
+  ["eabfbc", "eabfb0e186b3"],
+  ["eabfbd", "e18481e185b0e186b4"],
+  ["eabfbd", "eabfb0e186b4"],
+  ["eabfbe", "e18481e185b0e186b5"],
+  ["eabfbe", "eabfb0e186b5"],
+  ["eabfbf", "e18481e185b0e186b6"],
+  ["eabfbf", "eabfb0e186b6"],
+  ["eb8080", "e18481e185b0e186b7"],
+  ["eb8080", "eabfb0e186b7"],
+  ["eb8081", "e18481e185b0e186b8"],
+  ["eb8081", "eabfb0e186b8"],
+  ["eb8082", "e18481e185b0e186b9"],
+  ["eb8082", "eabfb0e186b9"],
+  ["eb8083", "e18481e185b0e186ba"],
+  ["eb8083", "eabfb0e186ba"],
+  ["eb8084", "e18481e185b0e186bb"],
+  ["eb8084", "eabfb0e186bb"],
+  ["eb8085", "e18481e185b0e186bc"],
+  ["eb8085", "eabfb0e186bc"],
+  ["eb8086", "e18481e185b0e186bd"],
+  ["eb8086", "eabfb0e186bd"],
+  ["eb8087", "e18481e185b0e186be"],
+  ["eb8087", "eabfb0e186be"],
+  ["eb8088", "e18481e185b0e186bf"],
+  ["eb8088", "eabfb0e186bf"],
+  ["eb8089", "e18481e185b0e18780"],
+  ["eb8089", "eabfb0e18780"],
+  ["eb808a", "e18481e185b0e18781"],
+  ["eb808a", "eabfb0e18781"],
+  ["eb808b", "e18481e185b0e18782"],
+  ["eb808b", "eabfb0e18782"],
+  ["eb808c", "e18481e185b1"],
+  ["eb808d", "e18481e185b1e186a8"],
+  ["eb808d", "eb808ce186a8"],
+  ["eb808e", "e18481e185b1e186a9"],
+  ["eb808e", "eb808ce186a9"],
+  ["eb808f", "e18481e185b1e186aa"],
+  ["eb808f", "eb808ce186aa"],
+  ["eb8090", "e18481e185b1e186ab"],
+  ["eb8090", "eb808ce186ab"],
+  ["eb8091", "e18481e185b1e186ac"],
+  ["eb8091", "eb808ce186ac"],
+  ["eb8092", "e18481e185b1e186ad"],
+  ["eb8092", "eb808ce186ad"],
+  ["eb8093", "e18481e185b1e186ae"],
+  ["eb8093", "eb808ce186ae"],
+  ["eb8094", "e18481e185b1e186af"],
+  ["eb8094", "eb808ce186af"],
+  ["eb8095", "e18481e185b1e186b0"],
+  ["eb8095", "eb808ce186b0"],
+  ["eb8096", "e18481e185b1e186b1"],
+  ["eb8096", "eb808ce186b1"],
+  ["eb8097", "e18481e185b1e186b2"],
+  ["eb8097", "eb808ce186b2"],
+  ["eb8098", "e18481e185b1e186b3"],
+  ["eb8098", "eb808ce186b3"],
+  ["eb8099", "e18481e185b1e186b4"],
+  ["eb8099", "eb808ce186b4"],
+  ["eb809a", "e18481e185b1e186b5"],
+  ["eb809a", "eb808ce186b5"],
+  ["eb809b", "e18481e185b1e186b6"],
+  ["eb809b", "eb808ce186b6"],
+  ["eb809c", "e18481e185b1e186b7"],
+  ["eb809c", "eb808ce186b7"],
+  ["eb809d", "e18481e185b1e186b8"],
+  ["eb809d", "eb808ce186b8"],
+  ["eb809e", "e18481e185b1e186b9"],
+  ["eb809e", "eb808ce186b9"],
+  ["eb809f", "e18481e185b1e186ba"],
+  ["eb809f", "eb808ce186ba"],
+  ["eb80a0", "e18481e185b1e186bb"],
+  ["eb80a0", "eb808ce186bb"],
+  ["eb80a1", "e18481e185b1e186bc"],
+  ["eb80a1", "eb808ce186bc"],
+  ["eb80a2", "e18481e185b1e186bd"],
+  ["eb80a2", "eb808ce186bd"],
+  ["eb80a3", "e18481e185b1e186be"],
+  ["eb80a3", "eb808ce186be"],
+  ["eb80a4", "e18481e185b1e186bf"],
+  ["eb80a4", "eb808ce186bf"],
+  ["eb80a5", "e18481e185b1e18780"],
+  ["eb80a5", "eb808ce18780"],
+  ["eb80a6", "e18481e185b1e18781"],
+  ["eb80a6", "eb808ce18781"],
+  ["eb80a7", "e18481e185b1e18782"],
+  ["eb80a7", "eb808ce18782"],
+  ["eb80a8", "e18481e185b2"],
+  ["eb80a9", "e18481e185b2e186a8"],
+  ["eb80a9", "eb80a8e186a8"],
+  ["eb80aa", "e18481e185b2e186a9"],
+  ["eb80aa", "eb80a8e186a9"],
+  ["eb80ab", "e18481e185b2e186aa"],
+  ["eb80ab", "eb80a8e186aa"],
+  ["eb80ac", "e18481e185b2e186ab"],
+  ["eb80ac", "eb80a8e186ab"],
+  ["eb80ad", "e18481e185b2e186ac"],
+  ["eb80ad", "eb80a8e186ac"],
+  ["eb80ae", "e18481e185b2e186ad"],
+  ["eb80ae", "eb80a8e186ad"],
+  ["eb80af", "e18481e185b2e186ae"],
+  ["eb80af", "eb80a8e186ae"],
+  ["eb80b0", "e18481e185b2e186af"],
+  ["eb80b0", "eb80a8e186af"],
+  ["eb80b1", "e18481e185b2e186b0"],
+  ["eb80b1", "eb80a8e186b0"],
+  ["eb80b2", "e18481e185b2e186b1"],
+  ["eb80b2", "eb80a8e186b1"],
+  ["eb80b3", "e18481e185b2e186b2"],
+  ["eb80b3", "eb80a8e186b2"],
+  ["eb80b4", "e18481e185b2e186b3"],
+  ["eb80b4", "eb80a8e186b3"],
+  ["eb80b5", "e18481e185b2e186b4"],
+  ["eb80b5", "eb80a8e186b4"],
+  ["eb80b6", "e18481e185b2e186b5"],
+  ["eb80b6", "eb80a8e186b5"],
+  ["eb80b7", "e18481e185b2e186b6"],
+  ["eb80b7", "eb80a8e186b6"],
+  ["eb80b8", "e18481e185b2e186b7"],
+  ["eb80b8", "eb80a8e186b7"],
+  ["eb80b9", "e18481e185b2e186b8"],
+  ["eb80b9", "eb80a8e186b8"],
+  ["eb80ba", "e18481e185b2e186b9"],
+  ["eb80ba", "eb80a8e186b9"],
+  ["eb80bb", "e18481e185b2e186ba"],
+  ["eb80bb", "eb80a8e186ba"],
+  ["eb80bc", "e18481e185b2e186bb"],
+  ["eb80bc", "eb80a8e186bb"],
+  ["eb80bd", "e18481e185b2e186bc"],
+  ["eb80bd", "eb80a8e186bc"],
+  ["eb80be", "e18481e185b2e186bd"],
+  ["eb80be", "eb80a8e186bd"],
+  ["eb80bf", "e18481e185b2e186be"],
+  ["eb80bf", "eb80a8e186be"],
+  ["eb8180", "e18481e185b2e186bf"],
+  ["eb8180", "eb80a8e186bf"],
+  ["eb8181", "e18481e185b2e18780"],
+  ["eb8181", "eb80a8e18780"],
+  ["eb8182", "e18481e185b2e18781"],
+  ["eb8182", "eb80a8e18781"],
+  ["eb8183", "e18481e185b2e18782"],
+  ["eb8183", "eb80a8e18782"],
+  ["eb8184", "e18481e185b3"],
+  ["eb8185", "e18481e185b3e186a8"],
+  ["eb8185", "eb8184e186a8"],
+  ["eb8186", "e18481e185b3e186a9"],
+  ["eb8186", "eb8184e186a9"],
+  ["eb8187", "e18481e185b3e186aa"],
+  ["eb8187", "eb8184e186aa"],
+  ["eb8188", "e18481e185b3e186ab"],
+  ["eb8188", "eb8184e186ab"],
+  ["eb8189", "e18481e185b3e186ac"],
+  ["eb8189", "eb8184e186ac"],
+  ["eb818a", "e18481e185b3e186ad"],
+  ["eb818a", "eb8184e186ad"],
+  ["eb818b", "e18481e185b3e186ae"],
+  ["eb818b", "eb8184e186ae"],
+  ["eb818c", "e18481e185b3e186af"],
+  ["eb818c", "eb8184e186af"],
+  ["eb818d", "e18481e185b3e186b0"],
+  ["eb818d", "eb8184e186b0"],
+  ["eb818e", "e18481e185b3e186b1"],
+  ["eb818e", "eb8184e186b1"],
+  ["eb818f", "e18481e185b3e186b2"],
+  ["eb818f", "eb8184e186b2"],
+  ["eb8190", "e18481e185b3e186b3"],
+  ["eb8190", "eb8184e186b3"],
+  ["eb8191", "e18481e185b3e186b4"],
+  ["eb8191", "eb8184e186b4"],
+  ["eb8192", "e18481e185b3e186b5"],
+  ["eb8192", "eb8184e186b5"],
+  ["eb8193", "e18481e185b3e186b6"],
+  ["eb8193", "eb8184e186b6"],
+  ["eb8194", "e18481e185b3e186b7"],
+  ["eb8194", "eb8184e186b7"],
+  ["eb8195", "e18481e185b3e186b8"],
+  ["eb8195", "eb8184e186b8"],
+  ["eb8196", "e18481e185b3e186b9"],
+  ["eb8196", "eb8184e186b9"],
+  ["eb8197", "e18481e185b3e186ba"],
+  ["eb8197", "eb8184e186ba"],
+  ["eb8198", "e18481e185b3e186bb"],
+  ["eb8198", "eb8184e186bb"],
+  ["eb8199", "e18481e185b3e186bc"],
+  ["eb8199", "eb8184e186bc"],
+  ["eb819a", "e18481e185b3e186bd"],
+  ["eb819a", "eb8184e186bd"],
+  ["eb819b", "e18481e185b3e186be"],
+  ["eb819b", "eb8184e186be"],
+  ["eb819c", "e18481e185b3e186bf"],
+  ["eb819c", "eb8184e186bf"],
+  ["eb819d", "e18481e185b3e18780"],
+  ["eb819d", "eb8184e18780"],
+  ["eb819e", "e18481e185b3e18781"],
+  ["eb819e", "eb8184e18781"],
+  ["eb819f", "e18481e185b3e18782"],
+  ["eb819f", "eb8184e18782"],
+  ["eb81a0", "e18481e185b4"],
+  ["eb81a1", "e18481e185b4e186a8"],
+  ["eb81a1", "eb81a0e186a8"],
+  ["eb81a2", "e18481e185b4e186a9"],
+  ["eb81a2", "eb81a0e186a9"],
+  ["eb81a3", "e18481e185b4e186aa"],
+  ["eb81a3", "eb81a0e186aa"],
+  ["eb81a4", "e18481e185b4e186ab"],
+  ["eb81a4", "eb81a0e186ab"],
+  ["eb81a5", "e18481e185b4e186ac"],
+  ["eb81a5", "eb81a0e186ac"],
+  ["eb81a6", "e18481e185b4e186ad"],
+  ["eb81a6", "eb81a0e186ad"],
+  ["eb81a7", "e18481e185b4e186ae"],
+  ["eb81a7", "eb81a0e186ae"],
+  ["eb81a8", "e18481e185b4e186af"],
+  ["eb81a8", "eb81a0e186af"],
+  ["eb81a9", "e18481e185b4e186b0"],
+  ["eb81a9", "eb81a0e186b0"],
+  ["eb81aa", "e18481e185b4e186b1"],
+  ["eb81aa", "eb81a0e186b1"],
+  ["eb81ab", "e18481e185b4e186b2"],
+  ["eb81ab", "eb81a0e186b2"],
+  ["eb81ac", "e18481e185b4e186b3"],
+  ["eb81ac", "eb81a0e186b3"],
+  ["eb81ad", "e18481e185b4e186b4"],
+  ["eb81ad", "eb81a0e186b4"],
+  ["eb81ae", "e18481e185b4e186b5"],
+  ["eb81ae", "eb81a0e186b5"],
+  ["eb81af", "e18481e185b4e186b6"],
+  ["eb81af", "eb81a0e186b6"],
+  ["eb81b0", "e18481e185b4e186b7"],
+  ["eb81b0", "eb81a0e186b7"],
+  ["eb81b1", "e18481e185b4e186b8"],
+  ["eb81b1", "eb81a0e186b8"],
+  ["eb81b2", "e18481e185b4e186b9"],
+  ["eb81b2", "eb81a0e186b9"],
+  ["eb81b3", "e18481e185b4e186ba"],
+  ["eb81b3", "eb81a0e186ba"],
+  ["eb81b4", "e18481e185b4e186bb"],
+  ["eb81b4", "eb81a0e186bb"],
+  ["eb81b5", "e18481e185b4e186bc"],
+  ["eb81b5", "eb81a0e186bc"],
+  ["eb81b6", "e18481e185b4e186bd"],
+  ["eb81b6", "eb81a0e186bd"],
+  ["eb81b7", "e18481e185b4e186be"],
+  ["eb81b7", "eb81a0e186be"],
+  ["eb81b8", "e18481e185b4e186bf"],
+  ["eb81b8", "eb81a0e186bf"],
+  ["eb81b9", "e18481e185b4e18780"],
+  ["eb81b9", "eb81a0e18780"],
+  ["eb81ba", "e18481e185b4e18781"],
+  ["eb81ba", "eb81a0e18781"],
+  ["eb81bb", "e18481e185b4e18782"],
+  ["eb81bb", "eb81a0e18782"],
+  ["eb81bc", "e18481e185b5"],
+  ["eb81bd", "e18481e185b5e186a8"],
+  ["eb81bd", "eb81bce186a8"],
+  ["eb81be", "e18481e185b5e186a9"],
+  ["eb81be", "eb81bce186a9"],
+  ["eb81bf", "e18481e185b5e186aa"],
+  ["eb81bf", "eb81bce186aa"],
+  ["eb8280", "e18481e185b5e186ab"],
+  ["eb8280", "eb81bce186ab"],
+  ["eb8281", "e18481e185b5e186ac"],
+  ["eb8281", "eb81bce186ac"],
+  ["eb8282", "e18481e185b5e186ad"],
+  ["eb8282", "eb81bce186ad"],
+  ["eb8283", "e18481e185b5e186ae"],
+  ["eb8283", "eb81bce186ae"],
+  ["eb8284", "e18481e185b5e186af"],
+  ["eb8284", "eb81bce186af"],
+  ["eb8285", "e18481e185b5e186b0"],
+  ["eb8285", "eb81bce186b0"],
+  ["eb8286", "e18481e185b5e186b1"],
+  ["eb8286", "eb81bce186b1"],
+  ["eb8287", "e18481e185b5e186b2"],
+  ["eb8287", "eb81bce186b2"],
+  ["eb8288", "e18481e185b5e186b3"],
+  ["eb8288", "eb81bce186b3"],
+  ["eb8289", "e18481e185b5e186b4"],
+  ["eb8289", "eb81bce186b4"],
+  ["eb828a", "e18481e185b5e186b5"],
+  ["eb828a", "eb81bce186b5"],
+  ["eb828b", "e18481e185b5e186b6"],
+  ["eb828b", "eb81bce186b6"],
+  ["eb828c", "e18481e185b5e186b7"],
+  ["eb828c", "eb81bce186b7"],
+  ["eb828d", "e18481e185b5e186b8"],
+  ["eb828d", "eb81bce186b8"],
+  ["eb828e", "e18481e185b5e186b9"],
+  ["eb828e", "eb81bce186b9"],
+  ["eb828f", "e18481e185b5e186ba"],
+  ["eb828f", "eb81bce186ba"],
+  ["eb8290", "e18481e185b5e186bb"],
+  ["eb8290", "eb81bce186bb"],
+  ["eb8291", "e18481e185b5e186bc"],
+  ["eb8291", "eb81bce186bc"],
+  ["eb8292", "e18481e185b5e186bd"],
+  ["eb8292", "eb81bce186bd"],
+  ["eb8293", "e18481e185b5e186be"],
+  ["eb8293", "eb81bce186be"],
+  ["eb8294", "e18481e185b5e186bf"],
+  ["eb8294", "eb81bce186bf"],
+  ["eb8295", "e18481e185b5e18780"],
+  ["eb8295", "eb81bce18780"],
+  ["eb8296", "e18481e185b5e18781"],
+  ["eb8296", "eb81bce18781"],
+  ["eb8297", "e18481e185b5e18782"],
+  ["eb8297", "eb81bce18782"],
+  ["eb8298", "e18482e185a1"],
+  ["eb8299", "e18482e185a1e186a8"],
+  ["eb8299", "eb8298e186a8"],
+  ["eb829a", "e18482e185a1e186a9"],
+  ["eb829a", "eb8298e186a9"],
+  ["eb829b", "e18482e185a1e186aa"],
+  ["eb829b", "eb8298e186aa"],
+  ["eb829c", "e18482e185a1e186ab"],
+  ["eb829c", "eb8298e186ab"],
+  ["eb829d", "e18482e185a1e186ac"],
+  ["eb829d", "eb8298e186ac"],
+  ["eb829e", "e18482e185a1e186ad"],
+  ["eb829e", "eb8298e186ad"],
+  ["eb829f", "e18482e185a1e186ae"],
+  ["eb829f", "eb8298e186ae"],
+  ["eb82a0", "e18482e185a1e186af"],
+  ["eb82a0", "eb8298e186af"],
+  ["eb82a1", "e18482e185a1e186b0"],
+  ["eb82a1", "eb8298e186b0"],
+  ["eb82a2", "e18482e185a1e186b1"],
+  ["eb82a2", "eb8298e186b1"],
+  ["eb82a3", "e18482e185a1e186b2"],
+  ["eb82a3", "eb8298e186b2"],
+  ["eb82a4", "e18482e185a1e186b3"],
+  ["eb82a4", "eb8298e186b3"],
+  ["eb82a5", "e18482e185a1e186b4"],
+  ["eb82a5", "eb8298e186b4"],
+  ["eb82a6", "e18482e185a1e186b5"],
+  ["eb82a6", "eb8298e186b5"],
+  ["eb82a7", "e18482e185a1e186b6"],
+  ["eb82a7", "eb8298e186b6"],
+  ["eb82a8", "e18482e185a1e186b7"],
+  ["eb82a8", "eb8298e186b7"],
+  ["eb82a9", "e18482e185a1e186b8"],
+  ["eb82a9", "eb8298e186b8"],
+  ["eb82aa", "e18482e185a1e186b9"],
+  ["eb82aa", "eb8298e186b9"],
+  ["eb82ab", "e18482e185a1e186ba"],
+  ["eb82ab", "eb8298e186ba"],
+  ["eb82ac", "e18482e185a1e186bb"],
+  ["eb82ac", "eb8298e186bb"],
+  ["eb82ad", "e18482e185a1e186bc"],
+  ["eb82ad", "eb8298e186bc"],
+  ["eb82ae", "e18482e185a1e186bd"],
+  ["eb82ae", "eb8298e186bd"],
+  ["eb82af", "e18482e185a1e186be"],
+  ["eb82af", "eb8298e186be"],
+  ["eb82b0", "e18482e185a1e186bf"],
+  ["eb82b0", "eb8298e186bf"],
+  ["eb82b1", "e18482e185a1e18780"],
+  ["eb82b1", "eb8298e18780"],
+  ["eb82b2", "e18482e185a1e18781"],
+  ["eb82b2", "eb8298e18781"],
+  ["eb82b3", "e18482e185a1e18782"],
+  ["eb82b3", "eb8298e18782"],
+  ["eb82b4", "e18482e185a2"],
+  ["eb82b5", "e18482e185a2e186a8"],
+  ["eb82b5", "eb82b4e186a8"],
+  ["eb82b6", "e18482e185a2e186a9"],
+  ["eb82b6", "eb82b4e186a9"],
+  ["eb82b7", "e18482e185a2e186aa"],
+  ["eb82b7", "eb82b4e186aa"],
+  ["eb82b8", "e18482e185a2e186ab"],
+  ["eb82b8", "eb82b4e186ab"],
+  ["eb82b9", "e18482e185a2e186ac"],
+  ["eb82b9", "eb82b4e186ac"],
+  ["eb82ba", "e18482e185a2e186ad"],
+  ["eb82ba", "eb82b4e186ad"],
+  ["eb82bb", "e18482e185a2e186ae"],
+  ["eb82bb", "eb82b4e186ae"],
+  ["eb82bc", "e18482e185a2e186af"],
+  ["eb82bc", "eb82b4e186af"],
+  ["eb82bd", "e18482e185a2e186b0"],
+  ["eb82bd", "eb82b4e186b0"],
+  ["eb82be", "e18482e185a2e186b1"],
+  ["eb82be", "eb82b4e186b1"],
+  ["eb82bf", "e18482e185a2e186b2"],
+  ["eb82bf", "eb82b4e186b2"],
+  ["eb8380", "e18482e185a2e186b3"],
+  ["eb8380", "eb82b4e186b3"],
+  ["eb8381", "e18482e185a2e186b4"],
+  ["eb8381", "eb82b4e186b4"],
+  ["eb8382", "e18482e185a2e186b5"],
+  ["eb8382", "eb82b4e186b5"],
+  ["eb8383", "e18482e185a2e186b6"],
+  ["eb8383", "eb82b4e186b6"],
+  ["eb8384", "e18482e185a2e186b7"],
+  ["eb8384", "eb82b4e186b7"],
+  ["eb8385", "e18482e185a2e186b8"],
+  ["eb8385", "eb82b4e186b8"],
+  ["eb8386", "e18482e185a2e186b9"],
+  ["eb8386", "eb82b4e186b9"],
+  ["eb8387", "e18482e185a2e186ba"],
+  ["eb8387", "eb82b4e186ba"],
+  ["eb8388", "e18482e185a2e186bb"],
+  ["eb8388", "eb82b4e186bb"],
+  ["eb8389", "e18482e185a2e186bc"],
+  ["eb8389", "eb82b4e186bc"],
+  ["eb838a", "e18482e185a2e186bd"],
+  ["eb838a", "eb82b4e186bd"],
+  ["eb838b", "e18482e185a2e186be"],
+  ["eb838b", "eb82b4e186be"],
+  ["eb838c", "e18482e185a2e186bf"],
+  ["eb838c", "eb82b4e186bf"],
+  ["eb838d", "e18482e185a2e18780"],
+  ["eb838d", "eb82b4e18780"],
+  ["eb838e", "e18482e185a2e18781"],
+  ["eb838e", "eb82b4e18781"],
+  ["eb838f", "e18482e185a2e18782"],
+  ["eb838f", "eb82b4e18782"],
+  ["eb8390", "e18482e185a3"],
+  ["eb8391", "e18482e185a3e186a8"],
+  ["eb8391", "eb8390e186a8"],
+  ["eb8392", "e18482e185a3e186a9"],
+  ["eb8392", "eb8390e186a9"],
+  ["eb8393", "e18482e185a3e186aa"],
+  ["eb8393", "eb8390e186aa"],
+  ["eb8394", "e18482e185a3e186ab"],
+  ["eb8394", "eb8390e186ab"],
+  ["eb8395", "e18482e185a3e186ac"],
+  ["eb8395", "eb8390e186ac"],
+  ["eb8396", "e18482e185a3e186ad"],
+  ["eb8396", "eb8390e186ad"],
+  ["eb8397", "e18482e185a3e186ae"],
+  ["eb8397", "eb8390e186ae"],
+  ["eb8398", "e18482e185a3e186af"],
+  ["eb8398", "eb8390e186af"],
+  ["eb8399", "e18482e185a3e186b0"],
+  ["eb8399", "eb8390e186b0"],
+  ["eb839a", "e18482e185a3e186b1"],
+  ["eb839a", "eb8390e186b1"],
+  ["eb839b", "e18482e185a3e186b2"],
+  ["eb839b", "eb8390e186b2"],
+  ["eb839c", "e18482e185a3e186b3"],
+  ["eb839c", "eb8390e186b3"],
+  ["eb839d", "e18482e185a3e186b4"],
+  ["eb839d", "eb8390e186b4"],
+  ["eb839e", "e18482e185a3e186b5"],
+  ["eb839e", "eb8390e186b5"],
+  ["eb839f", "e18482e185a3e186b6"],
+  ["eb839f", "eb8390e186b6"],
+  ["eb83a0", "e18482e185a3e186b7"],
+  ["eb83a0", "eb8390e186b7"],
+  ["eb83a1", "e18482e185a3e186b8"],
+  ["eb83a1", "eb8390e186b8"],
+  ["eb83a2", "e18482e185a3e186b9"],
+  ["eb83a2", "eb8390e186b9"],
+  ["eb83a3", "e18482e185a3e186ba"],
+  ["eb83a3", "eb8390e186ba"],
+  ["eb83a4", "e18482e185a3e186bb"],
+  ["eb83a4", "eb8390e186bb"],
+  ["eb83a5", "e18482e185a3e186bc"],
+  ["eb83a5", "eb8390e186bc"],
+  ["eb83a6", "e18482e185a3e186bd"],
+  ["eb83a6", "eb8390e186bd"],
+  ["eb83a7", "e18482e185a3e186be"],
+  ["eb83a7", "eb8390e186be"],
+  ["eb83a8", "e18482e185a3e186bf"],
+  ["eb83a8", "eb8390e186bf"],
+  ["eb83a9", "e18482e185a3e18780"],
+  ["eb83a9", "eb8390e18780"],
+  ["eb83aa", "e18482e185a3e18781"],
+  ["eb83aa", "eb8390e18781"],
+  ["eb83ab", "e18482e185a3e18782"],
+  ["eb83ab", "eb8390e18782"],
+  ["eb83ac", "e18482e185a4"],
+  ["eb83ad", "e18482e185a4e186a8"],
+  ["eb83ad", "eb83ace186a8"],
+  ["eb83ae", "e18482e185a4e186a9"],
+  ["eb83ae", "eb83ace186a9"],
+  ["eb83af", "e18482e185a4e186aa"],
+  ["eb83af", "eb83ace186aa"],
+  ["eb83b0", "e18482e185a4e186ab"],
+  ["eb83b0", "eb83ace186ab"],
+  ["eb83b1", "e18482e185a4e186ac"],
+  ["eb83b1", "eb83ace186ac"],
+  ["eb83b2", "e18482e185a4e186ad"],
+  ["eb83b2", "eb83ace186ad"],
+  ["eb83b3", "e18482e185a4e186ae"],
+  ["eb83b3", "eb83ace186ae"],
+  ["eb83b4", "e18482e185a4e186af"],
+  ["eb83b4", "eb83ace186af"],
+  ["eb83b5", "e18482e185a4e186b0"],
+  ["eb83b5", "eb83ace186b0"],
+  ["eb83b6", "e18482e185a4e186b1"],
+  ["eb83b6", "eb83ace186b1"],
+  ["eb83b7", "e18482e185a4e186b2"],
+  ["eb83b7", "eb83ace186b2"],
+  ["eb83b8", "e18482e185a4e186b3"],
+  ["eb83b8", "eb83ace186b3"],
+  ["eb83b9", "e18482e185a4e186b4"],
+  ["eb83b9", "eb83ace186b4"],
+  ["eb83ba", "e18482e185a4e186b5"],
+  ["eb83ba", "eb83ace186b5"],
+  ["eb83bb", "e18482e185a4e186b6"],
+  ["eb83bb", "eb83ace186b6"],
+  ["eb83bc", "e18482e185a4e186b7"],
+  ["eb83bc", "eb83ace186b7"],
+  ["eb83bd", "e18482e185a4e186b8"],
+  ["eb83bd", "eb83ace186b8"],
+  ["eb83be", "e18482e185a4e186b9"],
+  ["eb83be", "eb83ace186b9"],
+  ["eb83bf", "e18482e185a4e186ba"],
+  ["eb83bf", "eb83ace186ba"],
+  ["eb8480", "e18482e185a4e186bb"],
+  ["eb8480", "eb83ace186bb"],
+  ["eb8481", "e18482e185a4e186bc"],
+  ["eb8481", "eb83ace186bc"],
+  ["eb8482", "e18482e185a4e186bd"],
+  ["eb8482", "eb83ace186bd"],
+  ["eb8483", "e18482e185a4e186be"],
+  ["eb8483", "eb83ace186be"],
+  ["eb8484", "e18482e185a4e186bf"],
+  ["eb8484", "eb83ace186bf"],
+  ["eb8485", "e18482e185a4e18780"],
+  ["eb8485", "eb83ace18780"],
+  ["eb8486", "e18482e185a4e18781"],
+  ["eb8486", "eb83ace18781"],
+  ["eb8487", "e18482e185a4e18782"],
+  ["eb8487", "eb83ace18782"],
+  ["eb8488", "e18482e185a5"],
+  ["eb8489", "e18482e185a5e186a8"],
+  ["eb8489", "eb8488e186a8"],
+  ["eb848a", "e18482e185a5e186a9"],
+  ["eb848a", "eb8488e186a9"],
+  ["eb848b", "e18482e185a5e186aa"],
+  ["eb848b", "eb8488e186aa"],
+  ["eb848c", "e18482e185a5e186ab"],
+  ["eb848c", "eb8488e186ab"],
+  ["eb848d", "e18482e185a5e186ac"],
+  ["eb848d", "eb8488e186ac"],
+  ["eb848e", "e18482e185a5e186ad"],
+  ["eb848e", "eb8488e186ad"],
+  ["eb848f", "e18482e185a5e186ae"],
+  ["eb848f", "eb8488e186ae"],
+  ["eb8490", "e18482e185a5e186af"],
+  ["eb8490", "eb8488e186af"],
+  ["eb8491", "e18482e185a5e186b0"],
+  ["eb8491", "eb8488e186b0"],
+  ["eb8492", "e18482e185a5e186b1"],
+  ["eb8492", "eb8488e186b1"],
+  ["eb8493", "e18482e185a5e186b2"],
+  ["eb8493", "eb8488e186b2"],
+  ["eb8494", "e18482e185a5e186b3"],
+  ["eb8494", "eb8488e186b3"],
+  ["eb8495", "e18482e185a5e186b4"],
+  ["eb8495", "eb8488e186b4"],
+  ["eb8496", "e18482e185a5e186b5"],
+  ["eb8496", "eb8488e186b5"],
+  ["eb8497", "e18482e185a5e186b6"],
+  ["eb8497", "eb8488e186b6"],
+  ["eb8498", "e18482e185a5e186b7"],
+  ["eb8498", "eb8488e186b7"],
+  ["eb8499", "e18482e185a5e186b8"],
+  ["eb8499", "eb8488e186b8"],
+  ["eb849a", "e18482e185a5e186b9"],
+  ["eb849a", "eb8488e186b9"],
+  ["eb849b", "e18482e185a5e186ba"],
+  ["eb849b", "eb8488e186ba"],
+  ["eb849c", "e18482e185a5e186bb"],
+  ["eb849c", "eb8488e186bb"],
+  ["eb849d", "e18482e185a5e186bc"],
+  ["eb849d", "eb8488e186bc"],
+  ["eb849e", "e18482e185a5e186bd"],
+  ["eb849e", "eb8488e186bd"],
+  ["eb849f", "e18482e185a5e186be"],
+  ["eb849f", "eb8488e186be"],
+  ["eb84a0", "e18482e185a5e186bf"],
+  ["eb84a0", "eb8488e186bf"],
+  ["eb84a1", "e18482e185a5e18780"],
+  ["eb84a1", "eb8488e18780"],
+  ["eb84a2", "e18482e185a5e18781"],
+  ["eb84a2", "eb8488e18781"],
+  ["eb84a3", "e18482e185a5e18782"],
+  ["eb84a3", "eb8488e18782"],
+  ["eb84a4", "e18482e185a6"],
+  ["eb84a5", "e18482e185a6e186a8"],
+  ["eb84a5", "eb84a4e186a8"],
+  ["eb84a6", "e18482e185a6e186a9"],
+  ["eb84a6", "eb84a4e186a9"],
+  ["eb84a7", "e18482e185a6e186aa"],
+  ["eb84a7", "eb84a4e186aa"],
+  ["eb84a8", "e18482e185a6e186ab"],
+  ["eb84a8", "eb84a4e186ab"],
+  ["eb84a9", "e18482e185a6e186ac"],
+  ["eb84a9", "eb84a4e186ac"],
+  ["eb84aa", "e18482e185a6e186ad"],
+  ["eb84aa", "eb84a4e186ad"],
+  ["eb84ab", "e18482e185a6e186ae"],
+  ["eb84ab", "eb84a4e186ae"],
+  ["eb84ac", "e18482e185a6e186af"],
+  ["eb84ac", "eb84a4e186af"],
+  ["eb84ad", "e18482e185a6e186b0"],
+  ["eb84ad", "eb84a4e186b0"],
+  ["eb84ae", "e18482e185a6e186b1"],
+  ["eb84ae", "eb84a4e186b1"],
+  ["eb84af", "e18482e185a6e186b2"],
+  ["eb84af", "eb84a4e186b2"],
+  ["eb84b0", "e18482e185a6e186b3"],
+  ["eb84b0", "eb84a4e186b3"],
+  ["eb84b1", "e18482e185a6e186b4"],
+  ["eb84b1", "eb84a4e186b4"],
+  ["eb84b2", "e18482e185a6e186b5"],
+  ["eb84b2", "eb84a4e186b5"],
+  ["eb84b3", "e18482e185a6e186b6"],
+  ["eb84b3", "eb84a4e186b6"],
+  ["eb84b4", "e18482e185a6e186b7"],
+  ["eb84b4", "eb84a4e186b7"],
+  ["eb84b5", "e18482e185a6e186b8"],
+  ["eb84b5", "eb84a4e186b8"],
+  ["eb84b6", "e18482e185a6e186b9"],
+  ["eb84b6", "eb84a4e186b9"],
+  ["eb84b7", "e18482e185a6e186ba"],
+  ["eb84b7", "eb84a4e186ba"],
+  ["eb84b8", "e18482e185a6e186bb"],
+  ["eb84b8", "eb84a4e186bb"],
+  ["eb84b9", "e18482e185a6e186bc"],
+  ["eb84b9", "eb84a4e186bc"],
+  ["eb84ba", "e18482e185a6e186bd"],
+  ["eb84ba", "eb84a4e186bd"],
+  ["eb84bb", "e18482e185a6e186be"],
+  ["eb84bb", "eb84a4e186be"],
+  ["eb84bc", "e18482e185a6e186bf"],
+  ["eb84bc", "eb84a4e186bf"],
+  ["eb84bd", "e18482e185a6e18780"],
+  ["eb84bd", "eb84a4e18780"],
+  ["eb84be", "e18482e185a6e18781"],
+  ["eb84be", "eb84a4e18781"],
+  ["eb84bf", "e18482e185a6e18782"],
+  ["eb84bf", "eb84a4e18782"],
+  ["eb8580", "e18482e185a7"],
+  ["eb8581", "e18482e185a7e186a8"],
+  ["eb8581", "eb8580e186a8"],
+  ["eb8582", "e18482e185a7e186a9"],
+  ["eb8582", "eb8580e186a9"],
+  ["eb8583", "e18482e185a7e186aa"],
+  ["eb8583", "eb8580e186aa"],
+  ["eb8584", "e18482e185a7e186ab"],
+  ["eb8584", "eb8580e186ab"],
+  ["eb8585", "e18482e185a7e186ac"],
+  ["eb8585", "eb8580e186ac"],
+  ["eb8586", "e18482e185a7e186ad"],
+  ["eb8586", "eb8580e186ad"],
+  ["eb8587", "e18482e185a7e186ae"],
+  ["eb8587", "eb8580e186ae"],
+  ["eb8588", "e18482e185a7e186af"],
+  ["eb8588", "eb8580e186af"],
+  ["eb8589", "e18482e185a7e186b0"],
+  ["eb8589", "eb8580e186b0"],
+  ["eb858a", "e18482e185a7e186b1"],
+  ["eb858a", "eb8580e186b1"],
+  ["eb858b", "e18482e185a7e186b2"],
+  ["eb858b", "eb8580e186b2"],
+  ["eb858c", "e18482e185a7e186b3"],
+  ["eb858c", "eb8580e186b3"],
+  ["eb858d", "e18482e185a7e186b4"],
+  ["eb858d", "eb8580e186b4"],
+  ["eb858e", "e18482e185a7e186b5"],
+  ["eb858e", "eb8580e186b5"],
+  ["eb858f", "e18482e185a7e186b6"],
+  ["eb858f", "eb8580e186b6"],
+  ["eb8590", "e18482e185a7e186b7"],
+  ["eb8590", "eb8580e186b7"],
+  ["eb8591", "e18482e185a7e186b8"],
+  ["eb8591", "eb8580e186b8"],
+  ["eb8592", "e18482e185a7e186b9"],
+  ["eb8592", "eb8580e186b9"],
+  ["eb8593", "e18482e185a7e186ba"],
+  ["eb8593", "eb8580e186ba"],
+  ["eb8594", "e18482e185a7e186bb"],
+  ["eb8594", "eb8580e186bb"],
+  ["eb8595", "e18482e185a7e186bc"],
+  ["eb8595", "eb8580e186bc"],
+  ["eb8596", "e18482e185a7e186bd"],
+  ["eb8596", "eb8580e186bd"],
+  ["eb8597", "e18482e185a7e186be"],
+  ["eb8597", "eb8580e186be"],
+  ["eb8598", "e18482e185a7e186bf"],
+  ["eb8598", "eb8580e186bf"],
+  ["eb8599", "e18482e185a7e18780"],
+  ["eb8599", "eb8580e18780"],
+  ["eb859a", "e18482e185a7e18781"],
+  ["eb859a", "eb8580e18781"],
+  ["eb859b", "e18482e185a7e18782"],
+  ["eb859b", "eb8580e18782"],
+  ["eb859c", "e18482e185a8"],
+  ["eb859d", "e18482e185a8e186a8"],
+  ["eb859d", "eb859ce186a8"],
+  ["eb859e", "e18482e185a8e186a9"],
+  ["eb859e", "eb859ce186a9"],
+  ["eb859f", "e18482e185a8e186aa"],
+  ["eb859f", "eb859ce186aa"],
+  ["eb85a0", "e18482e185a8e186ab"],
+  ["eb85a0", "eb859ce186ab"],
+  ["eb85a1", "e18482e185a8e186ac"],
+  ["eb85a1", "eb859ce186ac"],
+  ["eb85a2", "e18482e185a8e186ad"],
+  ["eb85a2", "eb859ce186ad"],
+  ["eb85a3", "e18482e185a8e186ae"],
+  ["eb85a3", "eb859ce186ae"],
+  ["eb85a4", "e18482e185a8e186af"],
+  ["eb85a4", "eb859ce186af"],
+  ["eb85a5", "e18482e185a8e186b0"],
+  ["eb85a5", "eb859ce186b0"],
+  ["eb85a6", "e18482e185a8e186b1"],
+  ["eb85a6", "eb859ce186b1"],
+  ["eb85a7", "e18482e185a8e186b2"],
+  ["eb85a7", "eb859ce186b2"],
+  ["eb85a8", "e18482e185a8e186b3"],
+  ["eb85a8", "eb859ce186b3"],
+  ["eb85a9", "e18482e185a8e186b4"],
+  ["eb85a9", "eb859ce186b4"],
+  ["eb85aa", "e18482e185a8e186b5"],
+  ["eb85aa", "eb859ce186b5"],
+  ["eb85ab", "e18482e185a8e186b6"],
+  ["eb85ab", "eb859ce186b6"],
+  ["eb85ac", "e18482e185a8e186b7"],
+  ["eb85ac", "eb859ce186b7"],
+  ["eb85ad", "e18482e185a8e186b8"],
+  ["eb85ad", "eb859ce186b8"],
+  ["eb85ae", "e18482e185a8e186b9"],
+  ["eb85ae", "eb859ce186b9"],
+  ["eb85af", "e18482e185a8e186ba"],
+  ["eb85af", "eb859ce186ba"],
+  ["eb85b0", "e18482e185a8e186bb"],
+  ["eb85b0", "eb859ce186bb"],
+  ["eb85b1", "e18482e185a8e186bc"],
+  ["eb85b1", "eb859ce186bc"],
+  ["eb85b2", "e18482e185a8e186bd"],
+  ["eb85b2", "eb859ce186bd"],
+  ["eb85b3", "e18482e185a8e186be"],
+  ["eb85b3", "eb859ce186be"],
+  ["eb85b4", "e18482e185a8e186bf"],
+  ["eb85b4", "eb859ce186bf"],
+  ["eb85b5", "e18482e185a8e18780"],
+  ["eb85b5", "eb859ce18780"],
+  ["eb85b6", "e18482e185a8e18781"],
+  ["eb85b6", "eb859ce18781"],
+  ["eb85b7", "e18482e185a8e18782"],
+  ["eb85b7", "eb859ce18782"],
+  ["eb85b8", "e18482e185a9"],
+  ["eb85b9", "e18482e185a9e186a8"],
+  ["eb85b9", "eb85b8e186a8"],
+  ["eb85ba", "e18482e185a9e186a9"],
+  ["eb85ba", "eb85b8e186a9"],
+  ["eb85bb", "e18482e185a9e186aa"],
+  ["eb85bb", "eb85b8e186aa"],
+  ["eb85bc", "e18482e185a9e186ab"],
+  ["eb85bc", "eb85b8e186ab"],
+  ["eb85bd", "e18482e185a9e186ac"],
+  ["eb85bd", "eb85b8e186ac"],
+  ["eb85be", "e18482e185a9e186ad"],
+  ["eb85be", "eb85b8e186ad"],
+  ["eb85bf", "e18482e185a9e186ae"],
+  ["eb85bf", "eb85b8e186ae"],
+  ["eb8680", "e18482e185a9e186af"],
+  ["eb8680", "eb85b8e186af"],
+  ["eb8681", "e18482e185a9e186b0"],
+  ["eb8681", "eb85b8e186b0"],
+  ["eb8682", "e18482e185a9e186b1"],
+  ["eb8682", "eb85b8e186b1"],
+  ["eb8683", "e18482e185a9e186b2"],
+  ["eb8683", "eb85b8e186b2"],
+  ["eb8684", "e18482e185a9e186b3"],
+  ["eb8684", "eb85b8e186b3"],
+  ["eb8685", "e18482e185a9e186b4"],
+  ["eb8685", "eb85b8e186b4"],
+  ["eb8686", "e18482e185a9e186b5"],
+  ["eb8686", "eb85b8e186b5"],
+  ["eb8687", "e18482e185a9e186b6"],
+  ["eb8687", "eb85b8e186b6"],
+  ["eb8688", "e18482e185a9e186b7"],
+  ["eb8688", "eb85b8e186b7"],
+  ["eb8689", "e18482e185a9e186b8"],
+  ["eb8689", "eb85b8e186b8"],
+  ["eb868a", "e18482e185a9e186b9"],
+  ["eb868a", "eb85b8e186b9"],
+  ["eb868b", "e18482e185a9e186ba"],
+  ["eb868b", "eb85b8e186ba"],
+  ["eb868c", "e18482e185a9e186bb"],
+  ["eb868c", "eb85b8e186bb"],
+  ["eb868d", "e18482e185a9e186bc"],
+  ["eb868d", "eb85b8e186bc"],
+  ["eb868e", "e18482e185a9e186bd"],
+  ["eb868e", "eb85b8e186bd"],
+  ["eb868f", "e18482e185a9e186be"],
+  ["eb868f", "eb85b8e186be"],
+  ["eb8690", "e18482e185a9e186bf"],
+  ["eb8690", "eb85b8e186bf"],
+  ["eb8691", "e18482e185a9e18780"],
+  ["eb8691", "eb85b8e18780"],
+  ["eb8692", "e18482e185a9e18781"],
+  ["eb8692", "eb85b8e18781"],
+  ["eb8693", "e18482e185a9e18782"],
+  ["eb8693", "eb85b8e18782"],
+  ["eb8694", "e18482e185aa"],
+  ["eb8695", "e18482e185aae186a8"],
+  ["eb8695", "eb8694e186a8"],
+  ["eb8696", "e18482e185aae186a9"],
+  ["eb8696", "eb8694e186a9"],
+  ["eb8697", "e18482e185aae186aa"],
+  ["eb8697", "eb8694e186aa"],
+  ["eb8698", "e18482e185aae186ab"],
+  ["eb8698", "eb8694e186ab"],
+  ["eb8699", "e18482e185aae186ac"],
+  ["eb8699", "eb8694e186ac"],
+  ["eb869a", "e18482e185aae186ad"],
+  ["eb869a", "eb8694e186ad"],
+  ["eb869b", "e18482e185aae186ae"],
+  ["eb869b", "eb8694e186ae"],
+  ["eb869c", "e18482e185aae186af"],
+  ["eb869c", "eb8694e186af"],
+  ["eb869d", "e18482e185aae186b0"],
+  ["eb869d", "eb8694e186b0"],
+  ["eb869e", "e18482e185aae186b1"],
+  ["eb869e", "eb8694e186b1"],
+  ["eb869f", "e18482e185aae186b2"],
+  ["eb869f", "eb8694e186b2"],
+  ["eb86a0", "e18482e185aae186b3"],
+  ["eb86a0", "eb8694e186b3"],
+  ["eb86a1", "e18482e185aae186b4"],
+  ["eb86a1", "eb8694e186b4"],
+  ["eb86a2", "e18482e185aae186b5"],
+  ["eb86a2", "eb8694e186b5"],
+  ["eb86a3", "e18482e185aae186b6"],
+  ["eb86a3", "eb8694e186b6"],
+  ["eb86a4", "e18482e185aae186b7"],
+  ["eb86a4", "eb8694e186b7"],
+  ["eb86a5", "e18482e185aae186b8"],
+  ["eb86a5", "eb8694e186b8"],
+  ["eb86a6", "e18482e185aae186b9"],
+  ["eb86a6", "eb8694e186b9"],
+  ["eb86a7", "e18482e185aae186ba"],
+  ["eb86a7", "eb8694e186ba"],
+  ["eb86a8", "e18482e185aae186bb"],
+  ["eb86a8", "eb8694e186bb"],
+  ["eb86a9", "e18482e185aae186bc"],
+  ["eb86a9", "eb8694e186bc"],
+  ["eb86aa", "e18482e185aae186bd"],
+  ["eb86aa", "eb8694e186bd"],
+  ["eb86ab", "e18482e185aae186be"],
+  ["eb86ab", "eb8694e186be"],
+  ["eb86ac", "e18482e185aae186bf"],
+  ["eb86ac", "eb8694e186bf"],
+  ["eb86ad", "e18482e185aae18780"],
+  ["eb86ad", "eb8694e18780"],
+  ["eb86ae", "e18482e185aae18781"],
+  ["eb86ae", "eb8694e18781"],
+  ["eb86af", "e18482e185aae18782"],
+  ["eb86af", "eb8694e18782"],
+  ["eb86b0", "e18482e185ab"],
+  ["eb86b1", "e18482e185abe186a8"],
+  ["eb86b1", "eb86b0e186a8"],
+  ["eb86b2", "e18482e185abe186a9"],
+  ["eb86b2", "eb86b0e186a9"],
+  ["eb86b3", "e18482e185abe186aa"],
+  ["eb86b3", "eb86b0e186aa"],
+  ["eb86b4", "e18482e185abe186ab"],
+  ["eb86b4", "eb86b0e186ab"],
+  ["eb86b5", "e18482e185abe186ac"],
+  ["eb86b5", "eb86b0e186ac"],
+  ["eb86b6", "e18482e185abe186ad"],
+  ["eb86b6", "eb86b0e186ad"],
+  ["eb86b7", "e18482e185abe186ae"],
+  ["eb86b7", "eb86b0e186ae"],
+  ["eb86b8", "e18482e185abe186af"],
+  ["eb86b8", "eb86b0e186af"],
+  ["eb86b9", "e18482e185abe186b0"],
+  ["eb86b9", "eb86b0e186b0"],
+  ["eb86ba", "e18482e185abe186b1"],
+  ["eb86ba", "eb86b0e186b1"],
+  ["eb86bb", "e18482e185abe186b2"],
+  ["eb86bb", "eb86b0e186b2"],
+  ["eb86bc", "e18482e185abe186b3"],
+  ["eb86bc", "eb86b0e186b3"],
+  ["eb86bd", "e18482e185abe186b4"],
+  ["eb86bd", "eb86b0e186b4"],
+  ["eb86be", "e18482e185abe186b5"],
+  ["eb86be", "eb86b0e186b5"],
+  ["eb86bf", "e18482e185abe186b6"],
+  ["eb86bf", "eb86b0e186b6"],
+  ["eb8780", "e18482e185abe186b7"],
+  ["eb8780", "eb86b0e186b7"],
+  ["eb8781", "e18482e185abe186b8"],
+  ["eb8781", "eb86b0e186b8"],
+  ["eb8782", "e18482e185abe186b9"],
+  ["eb8782", "eb86b0e186b9"],
+  ["eb8783", "e18482e185abe186ba"],
+  ["eb8783", "eb86b0e186ba"],
+  ["eb8784", "e18482e185abe186bb"],
+  ["eb8784", "eb86b0e186bb"],
+  ["eb8785", "e18482e185abe186bc"],
+  ["eb8785", "eb86b0e186bc"],
+  ["eb8786", "e18482e185abe186bd"],
+  ["eb8786", "eb86b0e186bd"],
+  ["eb8787", "e18482e185abe186be"],
+  ["eb8787", "eb86b0e186be"],
+  ["eb8788", "e18482e185abe186bf"],
+  ["eb8788", "eb86b0e186bf"],
+  ["eb8789", "e18482e185abe18780"],
+  ["eb8789", "eb86b0e18780"],
+  ["eb878a", "e18482e185abe18781"],
+  ["eb878a", "eb86b0e18781"],
+  ["eb878b", "e18482e185abe18782"],
+  ["eb878b", "eb86b0e18782"],
+  ["eb878c", "e18482e185ac"],
+  ["eb878d", "e18482e185ace186a8"],
+  ["eb878d", "eb878ce186a8"],
+  ["eb878e", "e18482e185ace186a9"],
+  ["eb878e", "eb878ce186a9"],
+  ["eb878f", "e18482e185ace186aa"],
+  ["eb878f", "eb878ce186aa"],
+  ["eb8790", "e18482e185ace186ab"],
+  ["eb8790", "eb878ce186ab"],
+  ["eb8791", "e18482e185ace186ac"],
+  ["eb8791", "eb878ce186ac"],
+  ["eb8792", "e18482e185ace186ad"],
+  ["eb8792", "eb878ce186ad"],
+  ["eb8793", "e18482e185ace186ae"],
+  ["eb8793", "eb878ce186ae"],
+  ["eb8794", "e18482e185ace186af"],
+  ["eb8794", "eb878ce186af"],
+  ["eb8795", "e18482e185ace186b0"],
+  ["eb8795", "eb878ce186b0"],
+  ["eb8796", "e18482e185ace186b1"],
+  ["eb8796", "eb878ce186b1"],
+  ["eb8797", "e18482e185ace186b2"],
+  ["eb8797", "eb878ce186b2"],
+  ["eb8798", "e18482e185ace186b3"],
+  ["eb8798", "eb878ce186b3"],
+  ["eb8799", "e18482e185ace186b4"],
+  ["eb8799", "eb878ce186b4"],
+  ["eb879a", "e18482e185ace186b5"],
+  ["eb879a", "eb878ce186b5"],
+  ["eb879b", "e18482e185ace186b6"],
+  ["eb879b", "eb878ce186b6"],
+  ["eb879c", "e18482e185ace186b7"],
+  ["eb879c", "eb878ce186b7"],
+  ["eb879d", "e18482e185ace186b8"],
+  ["eb879d", "eb878ce186b8"],
+  ["eb879e", "e18482e185ace186b9"],
+  ["eb879e", "eb878ce186b9"],
+  ["eb879f", "e18482e185ace186ba"],
+  ["eb879f", "eb878ce186ba"],
+  ["eb87a0", "e18482e185ace186bb"],
+  ["eb87a0", "eb878ce186bb"],
+  ["eb87a1", "e18482e185ace186bc"],
+  ["eb87a1", "eb878ce186bc"],
+  ["eb87a2", "e18482e185ace186bd"],
+  ["eb87a2", "eb878ce186bd"],
+  ["eb87a3", "e18482e185ace186be"],
+  ["eb87a3", "eb878ce186be"],
+  ["eb87a4", "e18482e185ace186bf"],
+  ["eb87a4", "eb878ce186bf"],
+  ["eb87a5", "e18482e185ace18780"],
+  ["eb87a5", "eb878ce18780"],
+  ["eb87a6", "e18482e185ace18781"],
+  ["eb87a6", "eb878ce18781"],
+  ["eb87a7", "e18482e185ace18782"],
+  ["eb87a7", "eb878ce18782"],
+  ["eb87a8", "e18482e185ad"],
+  ["eb87a9", "e18482e185ade186a8"],
+  ["eb87a9", "eb87a8e186a8"],
+  ["eb87aa", "e18482e185ade186a9"],
+  ["eb87aa", "eb87a8e186a9"],
+  ["eb87ab", "e18482e185ade186aa"],
+  ["eb87ab", "eb87a8e186aa"],
+  ["eb87ac", "e18482e185ade186ab"],
+  ["eb87ac", "eb87a8e186ab"],
+  ["eb87ad", "e18482e185ade186ac"],
+  ["eb87ad", "eb87a8e186ac"],
+  ["eb87ae", "e18482e185ade186ad"],
+  ["eb87ae", "eb87a8e186ad"],
+  ["eb87af", "e18482e185ade186ae"],
+  ["eb87af", "eb87a8e186ae"],
+  ["eb87b0", "e18482e185ade186af"],
+  ["eb87b0", "eb87a8e186af"],
+  ["eb87b1", "e18482e185ade186b0"],
+  ["eb87b1", "eb87a8e186b0"],
+  ["eb87b2", "e18482e185ade186b1"],
+  ["eb87b2", "eb87a8e186b1"],
+  ["eb87b3", "e18482e185ade186b2"],
+  ["eb87b3", "eb87a8e186b2"],
+  ["eb87b4", "e18482e185ade186b3"],
+  ["eb87b4", "eb87a8e186b3"],
+  ["eb87b5", "e18482e185ade186b4"],
+  ["eb87b5", "eb87a8e186b4"],
+  ["eb87b6", "e18482e185ade186b5"],
+  ["eb87b6", "eb87a8e186b5"],
+  ["eb87b7", "e18482e185ade186b6"],
+  ["eb87b7", "eb87a8e186b6"],
+  ["eb87b8", "e18482e185ade186b7"],
+  ["eb87b8", "eb87a8e186b7"],
+  ["eb87b9", "e18482e185ade186b8"],
+  ["eb87b9", "eb87a8e186b8"],
+  ["eb87ba", "e18482e185ade186b9"],
+  ["eb87ba", "eb87a8e186b9"],
+  ["eb87bb", "e18482e185ade186ba"],
+  ["eb87bb", "eb87a8e186ba"],
+  ["eb87bc", "e18482e185ade186bb"],
+  ["eb87bc", "eb87a8e186bb"],
+  ["eb87bd", "e18482e185ade186bc"],
+  ["eb87bd", "eb87a8e186bc"],
+  ["eb87be", "e18482e185ade186bd"],
+  ["eb87be", "eb87a8e186bd"],
+  ["eb87bf", "e18482e185ade186be"],
+  ["eb87bf", "eb87a8e186be"],
+  ["eb8880", "e18482e185ade186bf"],
+  ["eb8880", "eb87a8e186bf"],
+  ["eb8881", "e18482e185ade18780"],
+  ["eb8881", "eb87a8e18780"],
+  ["eb8882", "e18482e185ade18781"],
+  ["eb8882", "eb87a8e18781"],
+  ["eb8883", "e18482e185ade18782"],
+  ["eb8883", "eb87a8e18782"],
+  ["eb8884", "e18482e185ae"],
+  ["eb8885", "e18482e185aee186a8"],
+  ["eb8885", "eb8884e186a8"],
+  ["eb8886", "e18482e185aee186a9"],
+  ["eb8886", "eb8884e186a9"],
+  ["eb8887", "e18482e185aee186aa"],
+  ["eb8887", "eb8884e186aa"],
+  ["eb8888", "e18482e185aee186ab"],
+  ["eb8888", "eb8884e186ab"],
+  ["eb8889", "e18482e185aee186ac"],
+  ["eb8889", "eb8884e186ac"],
+  ["eb888a", "e18482e185aee186ad"],
+  ["eb888a", "eb8884e186ad"],
+  ["eb888b", "e18482e185aee186ae"],
+  ["eb888b", "eb8884e186ae"],
+  ["eb888c", "e18482e185aee186af"],
+  ["eb888c", "eb8884e186af"],
+  ["eb888d", "e18482e185aee186b0"],
+  ["eb888d", "eb8884e186b0"],
+  ["eb888e", "e18482e185aee186b1"],
+  ["eb888e", "eb8884e186b1"],
+  ["eb888f", "e18482e185aee186b2"],
+  ["eb888f", "eb8884e186b2"],
+  ["eb8890", "e18482e185aee186b3"],
+  ["eb8890", "eb8884e186b3"],
+  ["eb8891", "e18482e185aee186b4"],
+  ["eb8891", "eb8884e186b4"],
+  ["eb8892", "e18482e185aee186b5"],
+  ["eb8892", "eb8884e186b5"],
+  ["eb8893", "e18482e185aee186b6"],
+  ["eb8893", "eb8884e186b6"],
+  ["eb8894", "e18482e185aee186b7"],
+  ["eb8894", "eb8884e186b7"],
+  ["eb8895", "e18482e185aee186b8"],
+  ["eb8895", "eb8884e186b8"],
+  ["eb8896", "e18482e185aee186b9"],
+  ["eb8896", "eb8884e186b9"],
+  ["eb8897", "e18482e185aee186ba"],
+  ["eb8897", "eb8884e186ba"],
+  ["eb8898", "e18482e185aee186bb"],
+  ["eb8898", "eb8884e186bb"],
+  ["eb8899", "e18482e185aee186bc"],
+  ["eb8899", "eb8884e186bc"],
+  ["eb889a", "e18482e185aee186bd"],
+  ["eb889a", "eb8884e186bd"],
+  ["eb889b", "e18482e185aee186be"],
+  ["eb889b", "eb8884e186be"],
+  ["eb889c", "e18482e185aee186bf"],
+  ["eb889c", "eb8884e186bf"],
+  ["eb889d", "e18482e185aee18780"],
+  ["eb889d", "eb8884e18780"],
+  ["eb889e", "e18482e185aee18781"],
+  ["eb889e", "eb8884e18781"],
+  ["eb889f", "e18482e185aee18782"],
+  ["eb889f", "eb8884e18782"],
+  ["eb88a0", "e18482e185af"],
+  ["eb88a1", "e18482e185afe186a8"],
+  ["eb88a1", "eb88a0e186a8"],
+  ["eb88a2", "e18482e185afe186a9"],
+  ["eb88a2", "eb88a0e186a9"],
+  ["eb88a3", "e18482e185afe186aa"],
+  ["eb88a3", "eb88a0e186aa"],
+  ["eb88a4", "e18482e185afe186ab"],
+  ["eb88a4", "eb88a0e186ab"],
+  ["eb88a5", "e18482e185afe186ac"],
+  ["eb88a5", "eb88a0e186ac"],
+  ["eb88a6", "e18482e185afe186ad"],
+  ["eb88a6", "eb88a0e186ad"],
+  ["eb88a7", "e18482e185afe186ae"],
+  ["eb88a7", "eb88a0e186ae"],
+  ["eb88a8", "e18482e185afe186af"],
+  ["eb88a8", "eb88a0e186af"],
+  ["eb88a9", "e18482e185afe186b0"],
+  ["eb88a9", "eb88a0e186b0"],
+  ["eb88aa", "e18482e185afe186b1"],
+  ["eb88aa", "eb88a0e186b1"],
+  ["eb88ab", "e18482e185afe186b2"],
+  ["eb88ab", "eb88a0e186b2"],
+  ["eb88ac", "e18482e185afe186b3"],
+  ["eb88ac", "eb88a0e186b3"],
+  ["eb88ad", "e18482e185afe186b4"],
+  ["eb88ad", "eb88a0e186b4"],
+  ["eb88ae", "e18482e185afe186b5"],
+  ["eb88ae", "eb88a0e186b5"],
+  ["eb88af", "e18482e185afe186b6"],
+  ["eb88af", "eb88a0e186b6"],
+  ["eb88b0", "e18482e185afe186b7"],
+  ["eb88b0", "eb88a0e186b7"],
+  ["eb88b1", "e18482e185afe186b8"],
+  ["eb88b1", "eb88a0e186b8"],
+  ["eb88b2", "e18482e185afe186b9"],
+  ["eb88b2", "eb88a0e186b9"],
+  ["eb88b3", "e18482e185afe186ba"],
+  ["eb88b3", "eb88a0e186ba"],
+  ["eb88b4", "e18482e185afe186bb"],
+  ["eb88b4", "eb88a0e186bb"],
+  ["eb88b5", "e18482e185afe186bc"],
+  ["eb88b5", "eb88a0e186bc"],
+  ["eb88b6", "e18482e185afe186bd"],
+  ["eb88b6", "eb88a0e186bd"],
+  ["eb88b7", "e18482e185afe186be"],
+  ["eb88b7", "eb88a0e186be"],
+  ["eb88b8", "e18482e185afe186bf"],
+  ["eb88b8", "eb88a0e186bf"],
+  ["eb88b9", "e18482e185afe18780"],
+  ["eb88b9", "eb88a0e18780"],
+  ["eb88ba", "e18482e185afe18781"],
+  ["eb88ba", "eb88a0e18781"],
+  ["eb88bb", "e18482e185afe18782"],
+  ["eb88bb", "eb88a0e18782"],
+  ["eb88bc", "e18482e185b0"],
+  ["eb88bd", "e18482e185b0e186a8"],
+  ["eb88bd", "eb88bce186a8"],
+  ["eb88be", "e18482e185b0e186a9"],
+  ["eb88be", "eb88bce186a9"],
+  ["eb88bf", "e18482e185b0e186aa"],
+  ["eb88bf", "eb88bce186aa"],
+  ["eb8980", "e18482e185b0e186ab"],
+  ["eb8980", "eb88bce186ab"],
+  ["eb8981", "e18482e185b0e186ac"],
+  ["eb8981", "eb88bce186ac"],
+  ["eb8982", "e18482e185b0e186ad"],
+  ["eb8982", "eb88bce186ad"],
+  ["eb8983", "e18482e185b0e186ae"],
+  ["eb8983", "eb88bce186ae"],
+  ["eb8984", "e18482e185b0e186af"],
+  ["eb8984", "eb88bce186af"],
+  ["eb8985", "e18482e185b0e186b0"],
+  ["eb8985", "eb88bce186b0"],
+  ["eb8986", "e18482e185b0e186b1"],
+  ["eb8986", "eb88bce186b1"],
+  ["eb8987", "e18482e185b0e186b2"],
+  ["eb8987", "eb88bce186b2"],
+  ["eb8988", "e18482e185b0e186b3"],
+  ["eb8988", "eb88bce186b3"],
+  ["eb8989", "e18482e185b0e186b4"],
+  ["eb8989", "eb88bce186b4"],
+  ["eb898a", "e18482e185b0e186b5"],
+  ["eb898a", "eb88bce186b5"],
+  ["eb898b", "e18482e185b0e186b6"],
+  ["eb898b", "eb88bce186b6"],
+  ["eb898c", "e18482e185b0e186b7"],
+  ["eb898c", "eb88bce186b7"],
+  ["eb898d", "e18482e185b0e186b8"],
+  ["eb898d", "eb88bce186b8"],
+  ["eb898e", "e18482e185b0e186b9"],
+  ["eb898e", "eb88bce186b9"],
+  ["eb898f", "e18482e185b0e186ba"],
+  ["eb898f", "eb88bce186ba"],
+  ["eb8990", "e18482e185b0e186bb"],
+  ["eb8990", "eb88bce186bb"],
+  ["eb8991", "e18482e185b0e186bc"],
+  ["eb8991", "eb88bce186bc"],
+  ["eb8992", "e18482e185b0e186bd"],
+  ["eb8992", "eb88bce186bd"],
+  ["eb8993", "e18482e185b0e186be"],
+  ["eb8993", "eb88bce186be"],
+  ["eb8994", "e18482e185b0e186bf"],
+  ["eb8994", "eb88bce186bf"],
+  ["eb8995", "e18482e185b0e18780"],
+  ["eb8995", "eb88bce18780"],
+  ["eb8996", "e18482e185b0e18781"],
+  ["eb8996", "eb88bce18781"],
+  ["eb8997", "e18482e185b0e18782"],
+  ["eb8997", "eb88bce18782"],
+  ["eb8998", "e18482e185b1"],
+  ["eb8999", "e18482e185b1e186a8"],
+  ["eb8999", "eb8998e186a8"],
+  ["eb899a", "e18482e185b1e186a9"],
+  ["eb899a", "eb8998e186a9"],
+  ["eb899b", "e18482e185b1e186aa"],
+  ["eb899b", "eb8998e186aa"],
+  ["eb899c", "e18482e185b1e186ab"],
+  ["eb899c", "eb8998e186ab"],
+  ["eb899d", "e18482e185b1e186ac"],
+  ["eb899d", "eb8998e186ac"],
+  ["eb899e", "e18482e185b1e186ad"],
+  ["eb899e", "eb8998e186ad"],
+  ["eb899f", "e18482e185b1e186ae"],
+  ["eb899f", "eb8998e186ae"],
+  ["eb89a0", "e18482e185b1e186af"],
+  ["eb89a0", "eb8998e186af"],
+  ["eb89a1", "e18482e185b1e186b0"],
+  ["eb89a1", "eb8998e186b0"],
+  ["eb89a2", "e18482e185b1e186b1"],
+  ["eb89a2", "eb8998e186b1"],
+  ["eb89a3", "e18482e185b1e186b2"],
+  ["eb89a3", "eb8998e186b2"],
+  ["eb89a4", "e18482e185b1e186b3"],
+  ["eb89a4", "eb8998e186b3"],
+  ["eb89a5", "e18482e185b1e186b4"],
+  ["eb89a5", "eb8998e186b4"],
+  ["eb89a6", "e18482e185b1e186b5"],
+  ["eb89a6", "eb8998e186b5"],
+  ["eb89a7", "e18482e185b1e186b6"],
+  ["eb89a7", "eb8998e186b6"],
+  ["eb89a8", "e18482e185b1e186b7"],
+  ["eb89a8", "eb8998e186b7"],
+  ["eb89a9", "e18482e185b1e186b8"],
+  ["eb89a9", "eb8998e186b8"],
+  ["eb89aa", "e18482e185b1e186b9"],
+  ["eb89aa", "eb8998e186b9"],
+  ["eb89ab", "e18482e185b1e186ba"],
+  ["eb89ab", "eb8998e186ba"],
+  ["eb89ac", "e18482e185b1e186bb"],
+  ["eb89ac", "eb8998e186bb"],
+  ["eb89ad", "e18482e185b1e186bc"],
+  ["eb89ad", "eb8998e186bc"],
+  ["eb89ae", "e18482e185b1e186bd"],
+  ["eb89ae", "eb8998e186bd"],
+  ["eb89af", "e18482e185b1e186be"],
+  ["eb89af", "eb8998e186be"],
+  ["eb89b0", "e18482e185b1e186bf"],
+  ["eb89b0", "eb8998e186bf"],
+  ["eb89b1", "e18482e185b1e18780"],
+  ["eb89b1", "eb8998e18780"],
+  ["eb89b2", "e18482e185b1e18781"],
+  ["eb89b2", "eb8998e18781"],
+  ["eb89b3", "e18482e185b1e18782"],
+  ["eb89b3", "eb8998e18782"],
+  ["eb89b4", "e18482e185b2"],
+  ["eb89b5", "e18482e185b2e186a8"],
+  ["eb89b5", "eb89b4e186a8"],
+  ["eb89b6", "e18482e185b2e186a9"],
+  ["eb89b6", "eb89b4e186a9"],
+  ["eb89b7", "e18482e185b2e186aa"],
+  ["eb89b7", "eb89b4e186aa"],
+  ["eb89b8", "e18482e185b2e186ab"],
+  ["eb89b8", "eb89b4e186ab"],
+  ["eb89b9", "e18482e185b2e186ac"],
+  ["eb89b9", "eb89b4e186ac"],
+  ["eb89ba", "e18482e185b2e186ad"],
+  ["eb89ba", "eb89b4e186ad"],
+  ["eb89bb", "e18482e185b2e186ae"],
+  ["eb89bb", "eb89b4e186ae"],
+  ["eb89bc", "e18482e185b2e186af"],
+  ["eb89bc", "eb89b4e186af"],
+  ["eb89bd", "e18482e185b2e186b0"],
+  ["eb89bd", "eb89b4e186b0"],
+  ["eb89be", "e18482e185b2e186b1"],
+  ["eb89be", "eb89b4e186b1"],
+  ["eb89bf", "e18482e185b2e186b2"],
+  ["eb89bf", "eb89b4e186b2"],
+  ["eb8a80", "e18482e185b2e186b3"],
+  ["eb8a80", "eb89b4e186b3"],
+  ["eb8a81", "e18482e185b2e186b4"],
+  ["eb8a81", "eb89b4e186b4"],
+  ["eb8a82", "e18482e185b2e186b5"],
+  ["eb8a82", "eb89b4e186b5"],
+  ["eb8a83", "e18482e185b2e186b6"],
+  ["eb8a83", "eb89b4e186b6"],
+  ["eb8a84", "e18482e185b2e186b7"],
+  ["eb8a84", "eb89b4e186b7"],
+  ["eb8a85", "e18482e185b2e186b8"],
+  ["eb8a85", "eb89b4e186b8"],
+  ["eb8a86", "e18482e185b2e186b9"],
+  ["eb8a86", "eb89b4e186b9"],
+  ["eb8a87", "e18482e185b2e186ba"],
+  ["eb8a87", "eb89b4e186ba"],
+  ["eb8a88", "e18482e185b2e186bb"],
+  ["eb8a88", "eb89b4e186bb"],
+  ["eb8a89", "e18482e185b2e186bc"],
+  ["eb8a89", "eb89b4e186bc"],
+  ["eb8a8a", "e18482e185b2e186bd"],
+  ["eb8a8a", "eb89b4e186bd"],
+  ["eb8a8b", "e18482e185b2e186be"],
+  ["eb8a8b", "eb89b4e186be"],
+  ["eb8a8c", "e18482e185b2e186bf"],
+  ["eb8a8c", "eb89b4e186bf"],
+  ["eb8a8d", "e18482e185b2e18780"],
+  ["eb8a8d", "eb89b4e18780"],
+  ["eb8a8e", "e18482e185b2e18781"],
+  ["eb8a8e", "eb89b4e18781"],
+  ["eb8a8f", "e18482e185b2e18782"],
+  ["eb8a8f", "eb89b4e18782"],
+  ["eb8a90", "e18482e185b3"],
+  ["eb8a91", "e18482e185b3e186a8"],
+  ["eb8a91", "eb8a90e186a8"],
+  ["eb8a92", "e18482e185b3e186a9"],
+  ["eb8a92", "eb8a90e186a9"],
+  ["eb8a93", "e18482e185b3e186aa"],
+  ["eb8a93", "eb8a90e186aa"],
+  ["eb8a94", "e18482e185b3e186ab"],
+  ["eb8a94", "eb8a90e186ab"],
+  ["eb8a95", "e18482e185b3e186ac"],
+  ["eb8a95", "eb8a90e186ac"],
+  ["eb8a96", "e18482e185b3e186ad"],
+  ["eb8a96", "eb8a90e186ad"],
+  ["eb8a97", "e18482e185b3e186ae"],
+  ["eb8a97", "eb8a90e186ae"],
+  ["eb8a98", "e18482e185b3e186af"],
+  ["eb8a98", "eb8a90e186af"],
+  ["eb8a99", "e18482e185b3e186b0"],
+  ["eb8a99", "eb8a90e186b0"],
+  ["eb8a9a", "e18482e185b3e186b1"],
+  ["eb8a9a", "eb8a90e186b1"],
+  ["eb8a9b", "e18482e185b3e186b2"],
+  ["eb8a9b", "eb8a90e186b2"],
+  ["eb8a9c", "e18482e185b3e186b3"],
+  ["eb8a9c", "eb8a90e186b3"],
+  ["eb8a9d", "e18482e185b3e186b4"],
+  ["eb8a9d", "eb8a90e186b4"],
+  ["eb8a9e", "e18482e185b3e186b5"],
+  ["eb8a9e", "eb8a90e186b5"],
+  ["eb8a9f", "e18482e185b3e186b6"],
+  ["eb8a9f", "eb8a90e186b6"],
+  ["eb8aa0", "e18482e185b3e186b7"],
+  ["eb8aa0", "eb8a90e186b7"],
+  ["eb8aa1", "e18482e185b3e186b8"],
+  ["eb8aa1", "eb8a90e186b8"],
+  ["eb8aa2", "e18482e185b3e186b9"],
+  ["eb8aa2", "eb8a90e186b9"],
+  ["eb8aa3", "e18482e185b3e186ba"],
+  ["eb8aa3", "eb8a90e186ba"],
+  ["eb8aa4", "e18482e185b3e186bb"],
+  ["eb8aa4", "eb8a90e186bb"],
+  ["eb8aa5", "e18482e185b3e186bc"],
+  ["eb8aa5", "eb8a90e186bc"],
+  ["eb8aa6", "e18482e185b3e186bd"],
+  ["eb8aa6", "eb8a90e186bd"],
+  ["eb8aa7", "e18482e185b3e186be"],
+  ["eb8aa7", "eb8a90e186be"],
+  ["eb8aa8", "e18482e185b3e186bf"],
+  ["eb8aa8", "eb8a90e186bf"],
+  ["eb8aa9", "e18482e185b3e18780"],
+  ["eb8aa9", "eb8a90e18780"],
+  ["eb8aaa", "e18482e185b3e18781"],
+  ["eb8aaa", "eb8a90e18781"],
+  ["eb8aab", "e18482e185b3e18782"],
+  ["eb8aab", "eb8a90e18782"],
+  ["eb8aac", "e18482e185b4"],
+  ["eb8aad", "e18482e185b4e186a8"],
+  ["eb8aad", "eb8aace186a8"],
+  ["eb8aae", "e18482e185b4e186a9"],
+  ["eb8aae", "eb8aace186a9"],
+  ["eb8aaf", "e18482e185b4e186aa"],
+  ["eb8aaf", "eb8aace186aa"],
+  ["eb8ab0", "e18482e185b4e186ab"],
+  ["eb8ab0", "eb8aace186ab"],
+  ["eb8ab1", "e18482e185b4e186ac"],
+  ["eb8ab1", "eb8aace186ac"],
+  ["eb8ab2", "e18482e185b4e186ad"],
+  ["eb8ab2", "eb8aace186ad"],
+  ["eb8ab3", "e18482e185b4e186ae"],
+  ["eb8ab3", "eb8aace186ae"],
+  ["eb8ab4", "e18482e185b4e186af"],
+  ["eb8ab4", "eb8aace186af"],
+  ["eb8ab5", "e18482e185b4e186b0"],
+  ["eb8ab5", "eb8aace186b0"],
+  ["eb8ab6", "e18482e185b4e186b1"],
+  ["eb8ab6", "eb8aace186b1"],
+  ["eb8ab7", "e18482e185b4e186b2"],
+  ["eb8ab7", "eb8aace186b2"],
+  ["eb8ab8", "e18482e185b4e186b3"],
+  ["eb8ab8", "eb8aace186b3"],
+  ["eb8ab9", "e18482e185b4e186b4"],
+  ["eb8ab9", "eb8aace186b4"],
+  ["eb8aba", "e18482e185b4e186b5"],
+  ["eb8aba", "eb8aace186b5"],
+  ["eb8abb", "e18482e185b4e186b6"],
+  ["eb8abb", "eb8aace186b6"],
+  ["eb8abc", "e18482e185b4e186b7"],
+  ["eb8abc", "eb8aace186b7"],
+  ["eb8abd", "e18482e185b4e186b8"],
+  ["eb8abd", "eb8aace186b8"],
+  ["eb8abe", "e18482e185b4e186b9"],
+  ["eb8abe", "eb8aace186b9"],
+  ["eb8abf", "e18482e185b4e186ba"],
+  ["eb8abf", "eb8aace186ba"],
+  ["eb8b80", "e18482e185b4e186bb"],
+  ["eb8b80", "eb8aace186bb"],
+  ["eb8b81", "e18482e185b4e186bc"],
+  ["eb8b81", "eb8aace186bc"],
+  ["eb8b82", "e18482e185b4e186bd"],
+  ["eb8b82", "eb8aace186bd"],
+  ["eb8b83", "e18482e185b4e186be"],
+  ["eb8b83", "eb8aace186be"],
+  ["eb8b84", "e18482e185b4e186bf"],
+  ["eb8b84", "eb8aace186bf"],
+  ["eb8b85", "e18482e185b4e18780"],
+  ["eb8b85", "eb8aace18780"],
+  ["eb8b86", "e18482e185b4e18781"],
+  ["eb8b86", "eb8aace18781"],
+  ["eb8b87", "e18482e185b4e18782"],
+  ["eb8b87", "eb8aace18782"],
+  ["eb8b88", "e18482e185b5"],
+  ["eb8b89", "e18482e185b5e186a8"],
+  ["eb8b89", "eb8b88e186a8"],
+  ["eb8b8a", "e18482e185b5e186a9"],
+  ["eb8b8a", "eb8b88e186a9"],
+  ["eb8b8b", "e18482e185b5e186aa"],
+  ["eb8b8b", "eb8b88e186aa"],
+  ["eb8b8c", "e18482e185b5e186ab"],
+  ["eb8b8c", "eb8b88e186ab"],
+  ["eb8b8d", "e18482e185b5e186ac"],
+  ["eb8b8d", "eb8b88e186ac"],
+  ["eb8b8e", "e18482e185b5e186ad"],
+  ["eb8b8e", "eb8b88e186ad"],
+  ["eb8b8f", "e18482e185b5e186ae"],
+  ["eb8b8f", "eb8b88e186ae"],
+  ["eb8b90", "e18482e185b5e186af"],
+  ["eb8b90", "eb8b88e186af"],
+  ["eb8b91", "e18482e185b5e186b0"],
+  ["eb8b91", "eb8b88e186b0"],
+  ["eb8b92", "e18482e185b5e186b1"],
+  ["eb8b92", "eb8b88e186b1"],
+  ["eb8b93", "e18482e185b5e186b2"],
+  ["eb8b93", "eb8b88e186b2"],
+  ["eb8b94", "e18482e185b5e186b3"],
+  ["eb8b94", "eb8b88e186b3"],
+  ["eb8b95", "e18482e185b5e186b4"],
+  ["eb8b95", "eb8b88e186b4"],
+  ["eb8b96", "e18482e185b5e186b5"],
+  ["eb8b96", "eb8b88e186b5"],
+  ["eb8b97", "e18482e185b5e186b6"],
+  ["eb8b97", "eb8b88e186b6"],
+  ["eb8b98", "e18482e185b5e186b7"],
+  ["eb8b98", "eb8b88e186b7"],
+  ["eb8b99", "e18482e185b5e186b8"],
+  ["eb8b99", "eb8b88e186b8"],
+  ["eb8b9a", "e18482e185b5e186b9"],
+  ["eb8b9a", "eb8b88e186b9"],
+  ["eb8b9b", "e18482e185b5e186ba"],
+  ["eb8b9b", "eb8b88e186ba"],
+  ["eb8b9c", "e18482e185b5e186bb"],
+  ["eb8b9c", "eb8b88e186bb"],
+  ["eb8b9d", "e18482e185b5e186bc"],
+  ["eb8b9d", "eb8b88e186bc"],
+  ["eb8b9e", "e18482e185b5e186bd"],
+  ["eb8b9e", "eb8b88e186bd"],
+  ["eb8b9f", "e18482e185b5e186be"],
+  ["eb8b9f", "eb8b88e186be"],
+  ["eb8ba0", "e18482e185b5e186bf"],
+  ["eb8ba0", "eb8b88e186bf"],
+  ["eb8ba1", "e18482e185b5e18780"],
+  ["eb8ba1", "eb8b88e18780"],
+  ["eb8ba2", "e18482e185b5e18781"],
+  ["eb8ba2", "eb8b88e18781"],
+  ["eb8ba3", "e18482e185b5e18782"],
+  ["eb8ba3", "eb8b88e18782"],
+  ["eb8ba4", "e18483e185a1"],
+  ["eb8ba5", "e18483e185a1e186a8"],
+  ["eb8ba5", "eb8ba4e186a8"],
+  ["eb8ba6", "e18483e185a1e186a9"],
+  ["eb8ba6", "eb8ba4e186a9"],
+  ["eb8ba7", "e18483e185a1e186aa"],
+  ["eb8ba7", "eb8ba4e186aa"],
+  ["eb8ba8", "e18483e185a1e186ab"],
+  ["eb8ba8", "eb8ba4e186ab"],
+  ["eb8ba9", "e18483e185a1e186ac"],
+  ["eb8ba9", "eb8ba4e186ac"],
+  ["eb8baa", "e18483e185a1e186ad"],
+  ["eb8baa", "eb8ba4e186ad"],
+  ["eb8bab", "e18483e185a1e186ae"],
+  ["eb8bab", "eb8ba4e186ae"],
+  ["eb8bac", "e18483e185a1e186af"],
+  ["eb8bac", "eb8ba4e186af"],
+  ["eb8bad", "e18483e185a1e186b0"],
+  ["eb8bad", "eb8ba4e186b0"],
+  ["eb8bae", "e18483e185a1e186b1"],
+  ["eb8bae", "eb8ba4e186b1"],
+  ["eb8baf", "e18483e185a1e186b2"],
+  ["eb8baf", "eb8ba4e186b2"],
+  ["eb8bb0", "e18483e185a1e186b3"],
+  ["eb8bb0", "eb8ba4e186b3"],
+  ["eb8bb1", "e18483e185a1e186b4"],
+  ["eb8bb1", "eb8ba4e186b4"],
+  ["eb8bb2", "e18483e185a1e186b5"],
+  ["eb8bb2", "eb8ba4e186b5"],
+  ["eb8bb3", "e18483e185a1e186b6"],
+  ["eb8bb3", "eb8ba4e186b6"],
+  ["eb8bb4", "e18483e185a1e186b7"],
+  ["eb8bb4", "eb8ba4e186b7"],
+  ["eb8bb5", "e18483e185a1e186b8"],
+  ["eb8bb5", "eb8ba4e186b8"],
+  ["eb8bb6", "e18483e185a1e186b9"],
+  ["eb8bb6", "eb8ba4e186b9"],
+  ["eb8bb7", "e18483e185a1e186ba"],
+  ["eb8bb7", "eb8ba4e186ba"],
+  ["eb8bb8", "e18483e185a1e186bb"],
+  ["eb8bb8", "eb8ba4e186bb"],
+  ["eb8bb9", "e18483e185a1e186bc"],
+  ["eb8bb9", "eb8ba4e186bc"],
+  ["eb8bba", "e18483e185a1e186bd"],
+  ["eb8bba", "eb8ba4e186bd"],
+  ["eb8bbb", "e18483e185a1e186be"],
+  ["eb8bbb", "eb8ba4e186be"],
+  ["eb8bbc", "e18483e185a1e186bf"],
+  ["eb8bbc", "eb8ba4e186bf"],
+  ["eb8bbd", "e18483e185a1e18780"],
+  ["eb8bbd", "eb8ba4e18780"],
+  ["eb8bbe", "e18483e185a1e18781"],
+  ["eb8bbe", "eb8ba4e18781"],
+  ["eb8bbf", "e18483e185a1e18782"],
+  ["eb8bbf", "eb8ba4e18782"],
+  ["eb8c80", "e18483e185a2"],
+  ["eb8c81", "e18483e185a2e186a8"],
+  ["eb8c81", "eb8c80e186a8"],
+  ["eb8c82", "e18483e185a2e186a9"],
+  ["eb8c82", "eb8c80e186a9"],
+  ["eb8c83", "e18483e185a2e186aa"],
+  ["eb8c83", "eb8c80e186aa"],
+  ["eb8c84", "e18483e185a2e186ab"],
+  ["eb8c84", "eb8c80e186ab"],
+  ["eb8c85", "e18483e185a2e186ac"],
+  ["eb8c85", "eb8c80e186ac"],
+  ["eb8c86", "e18483e185a2e186ad"],
+  ["eb8c86", "eb8c80e186ad"],
+  ["eb8c87", "e18483e185a2e186ae"],
+  ["eb8c87", "eb8c80e186ae"],
+  ["eb8c88", "e18483e185a2e186af"],
+  ["eb8c88", "eb8c80e186af"],
+  ["eb8c89", "e18483e185a2e186b0"],
+  ["eb8c89", "eb8c80e186b0"],
+  ["eb8c8a", "e18483e185a2e186b1"],
+  ["eb8c8a", "eb8c80e186b1"],
+  ["eb8c8b", "e18483e185a2e186b2"],
+  ["eb8c8b", "eb8c80e186b2"],
+  ["eb8c8c", "e18483e185a2e186b3"],
+  ["eb8c8c", "eb8c80e186b3"],
+  ["eb8c8d", "e18483e185a2e186b4"],
+  ["eb8c8d", "eb8c80e186b4"],
+  ["eb8c8e", "e18483e185a2e186b5"],
+  ["eb8c8e", "eb8c80e186b5"],
+  ["eb8c8f", "e18483e185a2e186b6"],
+  ["eb8c8f", "eb8c80e186b6"],
+  ["eb8c90", "e18483e185a2e186b7"],
+  ["eb8c90", "eb8c80e186b7"],
+  ["eb8c91", "e18483e185a2e186b8"],
+  ["eb8c91", "eb8c80e186b8"],
+  ["eb8c92", "e18483e185a2e186b9"],
+  ["eb8c92", "eb8c80e186b9"],
+  ["eb8c93", "e18483e185a2e186ba"],
+  ["eb8c93", "eb8c80e186ba"],
+  ["eb8c94", "e18483e185a2e186bb"],
+  ["eb8c94", "eb8c80e186bb"],
+  ["eb8c95", "e18483e185a2e186bc"],
+  ["eb8c95", "eb8c80e186bc"],
+  ["eb8c96", "e18483e185a2e186bd"],
+  ["eb8c96", "eb8c80e186bd"],
+  ["eb8c97", "e18483e185a2e186be"],
+  ["eb8c97", "eb8c80e186be"],
+  ["eb8c98", "e18483e185a2e186bf"],
+  ["eb8c98", "eb8c80e186bf"],
+  ["eb8c99", "e18483e185a2e18780"],
+  ["eb8c99", "eb8c80e18780"],
+  ["eb8c9a", "e18483e185a2e18781"],
+  ["eb8c9a", "eb8c80e18781"],
+  ["eb8c9b", "e18483e185a2e18782"],
+  ["eb8c9b", "eb8c80e18782"],
+  ["eb8c9c", "e18483e185a3"],
+  ["eb8c9d", "e18483e185a3e186a8"],
+  ["eb8c9d", "eb8c9ce186a8"],
+  ["eb8c9e", "e18483e185a3e186a9"],
+  ["eb8c9e", "eb8c9ce186a9"],
+  ["eb8c9f", "e18483e185a3e186aa"],
+  ["eb8c9f", "eb8c9ce186aa"],
+  ["eb8ca0", "e18483e185a3e186ab"],
+  ["eb8ca0", "eb8c9ce186ab"],
+  ["eb8ca1", "e18483e185a3e186ac"],
+  ["eb8ca1", "eb8c9ce186ac"],
+  ["eb8ca2", "e18483e185a3e186ad"],
+  ["eb8ca2", "eb8c9ce186ad"],
+  ["eb8ca3", "e18483e185a3e186ae"],
+  ["eb8ca3", "eb8c9ce186ae"],
+  ["eb8ca4", "e18483e185a3e186af"],
+  ["eb8ca4", "eb8c9ce186af"],
+  ["eb8ca5", "e18483e185a3e186b0"],
+  ["eb8ca5", "eb8c9ce186b0"],
+  ["eb8ca6", "e18483e185a3e186b1"],
+  ["eb8ca6", "eb8c9ce186b1"],
+  ["eb8ca7", "e18483e185a3e186b2"],
+  ["eb8ca7", "eb8c9ce186b2"],
+  ["eb8ca8", "e18483e185a3e186b3"],
+  ["eb8ca8", "eb8c9ce186b3"],
+  ["eb8ca9", "e18483e185a3e186b4"],
+  ["eb8ca9", "eb8c9ce186b4"],
+  ["eb8caa", "e18483e185a3e186b5"],
+  ["eb8caa", "eb8c9ce186b5"],
+  ["eb8cab", "e18483e185a3e186b6"],
+  ["eb8cab", "eb8c9ce186b6"],
+  ["eb8cac", "e18483e185a3e186b7"],
+  ["eb8cac", "eb8c9ce186b7"],
+  ["eb8cad", "e18483e185a3e186b8"],
+  ["eb8cad", "eb8c9ce186b8"],
+  ["eb8cae", "e18483e185a3e186b9"],
+  ["eb8cae", "eb8c9ce186b9"],
+  ["eb8caf", "e18483e185a3e186ba"],
+  ["eb8caf", "eb8c9ce186ba"],
+  ["eb8cb0", "e18483e185a3e186bb"],
+  ["eb8cb0", "eb8c9ce186bb"],
+  ["eb8cb1", "e18483e185a3e186bc"],
+  ["eb8cb1", "eb8c9ce186bc"],
+  ["eb8cb2", "e18483e185a3e186bd"],
+  ["eb8cb2", "eb8c9ce186bd"],
+  ["eb8cb3", "e18483e185a3e186be"],
+  ["eb8cb3", "eb8c9ce186be"],
+  ["eb8cb4", "e18483e185a3e186bf"],
+  ["eb8cb4", "eb8c9ce186bf"],
+  ["eb8cb5", "e18483e185a3e18780"],
+  ["eb8cb5", "eb8c9ce18780"],
+  ["eb8cb6", "e18483e185a3e18781"],
+  ["eb8cb6", "eb8c9ce18781"],
+  ["eb8cb7", "e18483e185a3e18782"],
+  ["eb8cb7", "eb8c9ce18782"],
+  ["eb8cb8", "e18483e185a4"],
+  ["eb8cb9", "e18483e185a4e186a8"],
+  ["eb8cb9", "eb8cb8e186a8"],
+  ["eb8cba", "e18483e185a4e186a9"],
+  ["eb8cba", "eb8cb8e186a9"],
+  ["eb8cbb", "e18483e185a4e186aa"],
+  ["eb8cbb", "eb8cb8e186aa"],
+  ["eb8cbc", "e18483e185a4e186ab"],
+  ["eb8cbc", "eb8cb8e186ab"],
+  ["eb8cbd", "e18483e185a4e186ac"],
+  ["eb8cbd", "eb8cb8e186ac"],
+  ["eb8cbe", "e18483e185a4e186ad"],
+  ["eb8cbe", "eb8cb8e186ad"],
+  ["eb8cbf", "e18483e185a4e186ae"],
+  ["eb8cbf", "eb8cb8e186ae"],
+  ["eb8d80", "e18483e185a4e186af"],
+  ["eb8d80", "eb8cb8e186af"],
+  ["eb8d81", "e18483e185a4e186b0"],
+  ["eb8d81", "eb8cb8e186b0"],
+  ["eb8d82", "e18483e185a4e186b1"],
+  ["eb8d82", "eb8cb8e186b1"],
+  ["eb8d83", "e18483e185a4e186b2"],
+  ["eb8d83", "eb8cb8e186b2"],
+  ["eb8d84", "e18483e185a4e186b3"],
+  ["eb8d84", "eb8cb8e186b3"],
+  ["eb8d85", "e18483e185a4e186b4"],
+  ["eb8d85", "eb8cb8e186b4"],
+  ["eb8d86", "e18483e185a4e186b5"],
+  ["eb8d86", "eb8cb8e186b5"],
+  ["eb8d87", "e18483e185a4e186b6"],
+  ["eb8d87", "eb8cb8e186b6"],
+  ["eb8d88", "e18483e185a4e186b7"],
+  ["eb8d88", "eb8cb8e186b7"],
+  ["eb8d89", "e18483e185a4e186b8"],
+  ["eb8d89", "eb8cb8e186b8"],
+  ["eb8d8a", "e18483e185a4e186b9"],
+  ["eb8d8a", "eb8cb8e186b9"],
+  ["eb8d8b", "e18483e185a4e186ba"],
+  ["eb8d8b", "eb8cb8e186ba"],
+  ["eb8d8c", "e18483e185a4e186bb"],
+  ["eb8d8c", "eb8cb8e186bb"],
+  ["eb8d8d", "e18483e185a4e186bc"],
+  ["eb8d8d", "eb8cb8e186bc"],
+  ["eb8d8e", "e18483e185a4e186bd"],
+  ["eb8d8e", "eb8cb8e186bd"],
+  ["eb8d8f", "e18483e185a4e186be"],
+  ["eb8d8f", "eb8cb8e186be"],
+  ["eb8d90", "e18483e185a4e186bf"],
+  ["eb8d90", "eb8cb8e186bf"],
+  ["eb8d91", "e18483e185a4e18780"],
+  ["eb8d91", "eb8cb8e18780"],
+  ["eb8d92", "e18483e185a4e18781"],
+  ["eb8d92", "eb8cb8e18781"],
+  ["eb8d93", "e18483e185a4e18782"],
+  ["eb8d93", "eb8cb8e18782"],
+  ["eb8d94", "e18483e185a5"],
+  ["eb8d95", "e18483e185a5e186a8"],
+  ["eb8d95", "eb8d94e186a8"],
+  ["eb8d96", "e18483e185a5e186a9"],
+  ["eb8d96", "eb8d94e186a9"],
+  ["eb8d97", "e18483e185a5e186aa"],
+  ["eb8d97", "eb8d94e186aa"],
+  ["eb8d98", "e18483e185a5e186ab"],
+  ["eb8d98", "eb8d94e186ab"],
+  ["eb8d99", "e18483e185a5e186ac"],
+  ["eb8d99", "eb8d94e186ac"],
+  ["eb8d9a", "e18483e185a5e186ad"],
+  ["eb8d9a", "eb8d94e186ad"],
+  ["eb8d9b", "e18483e185a5e186ae"],
+  ["eb8d9b", "eb8d94e186ae"],
+  ["eb8d9c", "e18483e185a5e186af"],
+  ["eb8d9c", "eb8d94e186af"],
+  ["eb8d9d", "e18483e185a5e186b0"],
+  ["eb8d9d", "eb8d94e186b0"],
+  ["eb8d9e", "e18483e185a5e186b1"],
+  ["eb8d9e", "eb8d94e186b1"],
+  ["eb8d9f", "e18483e185a5e186b2"],
+  ["eb8d9f", "eb8d94e186b2"],
+  ["eb8da0", "e18483e185a5e186b3"],
+  ["eb8da0", "eb8d94e186b3"],
+  ["eb8da1", "e18483e185a5e186b4"],
+  ["eb8da1", "eb8d94e186b4"],
+  ["eb8da2", "e18483e185a5e186b5"],
+  ["eb8da2", "eb8d94e186b5"],
+  ["eb8da3", "e18483e185a5e186b6"],
+  ["eb8da3", "eb8d94e186b6"],
+  ["eb8da4", "e18483e185a5e186b7"],
+  ["eb8da4", "eb8d94e186b7"],
+  ["eb8da5", "e18483e185a5e186b8"],
+  ["eb8da5", "eb8d94e186b8"],
+  ["eb8da6", "e18483e185a5e186b9"],
+  ["eb8da6", "eb8d94e186b9"],
+  ["eb8da7", "e18483e185a5e186ba"],
+  ["eb8da7", "eb8d94e186ba"],
+  ["eb8da8", "e18483e185a5e186bb"],
+  ["eb8da8", "eb8d94e186bb"],
+  ["eb8da9", "e18483e185a5e186bc"],
+  ["eb8da9", "eb8d94e186bc"],
+  ["eb8daa", "e18483e185a5e186bd"],
+  ["eb8daa", "eb8d94e186bd"],
+  ["eb8dab", "e18483e185a5e186be"],
+  ["eb8dab", "eb8d94e186be"],
+  ["eb8dac", "e18483e185a5e186bf"],
+  ["eb8dac", "eb8d94e186bf"],
+  ["eb8dad", "e18483e185a5e18780"],
+  ["eb8dad", "eb8d94e18780"],
+  ["eb8dae", "e18483e185a5e18781"],
+  ["eb8dae", "eb8d94e18781"],
+  ["eb8daf", "e18483e185a5e18782"],
+  ["eb8daf", "eb8d94e18782"],
+  ["eb8db0", "e18483e185a6"],
+  ["eb8db1", "e18483e185a6e186a8"],
+  ["eb8db1", "eb8db0e186a8"],
+  ["eb8db2", "e18483e185a6e186a9"],
+  ["eb8db2", "eb8db0e186a9"],
+  ["eb8db3", "e18483e185a6e186aa"],
+  ["eb8db3", "eb8db0e186aa"],
+  ["eb8db4", "e18483e185a6e186ab"],
+  ["eb8db4", "eb8db0e186ab"],
+  ["eb8db5", "e18483e185a6e186ac"],
+  ["eb8db5", "eb8db0e186ac"],
+  ["eb8db6", "e18483e185a6e186ad"],
+  ["eb8db6", "eb8db0e186ad"],
+  ["eb8db7", "e18483e185a6e186ae"],
+  ["eb8db7", "eb8db0e186ae"],
+  ["eb8db8", "e18483e185a6e186af"],
+  ["eb8db8", "eb8db0e186af"],
+  ["eb8db9", "e18483e185a6e186b0"],
+  ["eb8db9", "eb8db0e186b0"],
+  ["eb8dba", "e18483e185a6e186b1"],
+  ["eb8dba", "eb8db0e186b1"],
+  ["eb8dbb", "e18483e185a6e186b2"],
+  ["eb8dbb", "eb8db0e186b2"],
+  ["eb8dbc", "e18483e185a6e186b3"],
+  ["eb8dbc", "eb8db0e186b3"],
+  ["eb8dbd", "e18483e185a6e186b4"],
+  ["eb8dbd", "eb8db0e186b4"],
+  ["eb8dbe", "e18483e185a6e186b5"],
+  ["eb8dbe", "eb8db0e186b5"],
+  ["eb8dbf", "e18483e185a6e186b6"],
+  ["eb8dbf", "eb8db0e186b6"],
+  ["eb8e80", "e18483e185a6e186b7"],
+  ["eb8e80", "eb8db0e186b7"],
+  ["eb8e81", "e18483e185a6e186b8"],
+  ["eb8e81", "eb8db0e186b8"],
+  ["eb8e82", "e18483e185a6e186b9"],
+  ["eb8e82", "eb8db0e186b9"],
+  ["eb8e83", "e18483e185a6e186ba"],
+  ["eb8e83", "eb8db0e186ba"],
+  ["eb8e84", "e18483e185a6e186bb"],
+  ["eb8e84", "eb8db0e186bb"],
+  ["eb8e85", "e18483e185a6e186bc"],
+  ["eb8e85", "eb8db0e186bc"],
+  ["eb8e86", "e18483e185a6e186bd"],
+  ["eb8e86", "eb8db0e186bd"],
+  ["eb8e87", "e18483e185a6e186be"],
+  ["eb8e87", "eb8db0e186be"],
+  ["eb8e88", "e18483e185a6e186bf"],
+  ["eb8e88", "eb8db0e186bf"],
+  ["eb8e89", "e18483e185a6e18780"],
+  ["eb8e89", "eb8db0e18780"],
+  ["eb8e8a", "e18483e185a6e18781"],
+  ["eb8e8a", "eb8db0e18781"],
+  ["eb8e8b", "e18483e185a6e18782"],
+  ["eb8e8b", "eb8db0e18782"],
+  ["eb8e8c", "e18483e185a7"],
+  ["eb8e8d", "e18483e185a7e186a8"],
+  ["eb8e8d", "eb8e8ce186a8"],
+  ["eb8e8e", "e18483e185a7e186a9"],
+  ["eb8e8e", "eb8e8ce186a9"],
+  ["eb8e8f", "e18483e185a7e186aa"],
+  ["eb8e8f", "eb8e8ce186aa"],
+  ["eb8e90", "e18483e185a7e186ab"],
+  ["eb8e90", "eb8e8ce186ab"],
+  ["eb8e91", "e18483e185a7e186ac"],
+  ["eb8e91", "eb8e8ce186ac"],
+  ["eb8e92", "e18483e185a7e186ad"],
+  ["eb8e92", "eb8e8ce186ad"],
+  ["eb8e93", "e18483e185a7e186ae"],
+  ["eb8e93", "eb8e8ce186ae"],
+  ["eb8e94", "e18483e185a7e186af"],
+  ["eb8e94", "eb8e8ce186af"],
+  ["eb8e95", "e18483e185a7e186b0"],
+  ["eb8e95", "eb8e8ce186b0"],
+  ["eb8e96", "e18483e185a7e186b1"],
+  ["eb8e96", "eb8e8ce186b1"],
+  ["eb8e97", "e18483e185a7e186b2"],
+  ["eb8e97", "eb8e8ce186b2"],
+  ["eb8e98", "e18483e185a7e186b3"],
+  ["eb8e98", "eb8e8ce186b3"],
+  ["eb8e99", "e18483e185a7e186b4"],
+  ["eb8e99", "eb8e8ce186b4"],
+  ["eb8e9a", "e18483e185a7e186b5"],
+  ["eb8e9a", "eb8e8ce186b5"],
+  ["eb8e9b", "e18483e185a7e186b6"],
+  ["eb8e9b", "eb8e8ce186b6"],
+  ["eb8e9c", "e18483e185a7e186b7"],
+  ["eb8e9c", "eb8e8ce186b7"],
+  ["eb8e9d", "e18483e185a7e186b8"],
+  ["eb8e9d", "eb8e8ce186b8"],
+  ["eb8e9e", "e18483e185a7e186b9"],
+  ["eb8e9e", "eb8e8ce186b9"],
+  ["eb8e9f", "e18483e185a7e186ba"],
+  ["eb8e9f", "eb8e8ce186ba"],
+  ["eb8ea0", "e18483e185a7e186bb"],
+  ["eb8ea0", "eb8e8ce186bb"],
+  ["eb8ea1", "e18483e185a7e186bc"],
+  ["eb8ea1", "eb8e8ce186bc"],
+  ["eb8ea2", "e18483e185a7e186bd"],
+  ["eb8ea2", "eb8e8ce186bd"],
+  ["eb8ea3", "e18483e185a7e186be"],
+  ["eb8ea3", "eb8e8ce186be"],
+  ["eb8ea4", "e18483e185a7e186bf"],
+  ["eb8ea4", "eb8e8ce186bf"],
+  ["eb8ea5", "e18483e185a7e18780"],
+  ["eb8ea5", "eb8e8ce18780"],
+  ["eb8ea6", "e18483e185a7e18781"],
+  ["eb8ea6", "eb8e8ce18781"],
+  ["eb8ea7", "e18483e185a7e18782"],
+  ["eb8ea7", "eb8e8ce18782"],
+  ["eb8ea8", "e18483e185a8"],
+  ["eb8ea9", "e18483e185a8e186a8"],
+  ["eb8ea9", "eb8ea8e186a8"],
+  ["eb8eaa", "e18483e185a8e186a9"],
+  ["eb8eaa", "eb8ea8e186a9"],
+  ["eb8eab", "e18483e185a8e186aa"],
+  ["eb8eab", "eb8ea8e186aa"],
+  ["eb8eac", "e18483e185a8e186ab"],
+  ["eb8eac", "eb8ea8e186ab"],
+  ["eb8ead", "e18483e185a8e186ac"],
+  ["eb8ead", "eb8ea8e186ac"],
+  ["eb8eae", "e18483e185a8e186ad"],
+  ["eb8eae", "eb8ea8e186ad"],
+  ["eb8eaf", "e18483e185a8e186ae"],
+  ["eb8eaf", "eb8ea8e186ae"],
+  ["eb8eb0", "e18483e185a8e186af"],
+  ["eb8eb0", "eb8ea8e186af"],
+  ["eb8eb1", "e18483e185a8e186b0"],
+  ["eb8eb1", "eb8ea8e186b0"],
+  ["eb8eb2", "e18483e185a8e186b1"],
+  ["eb8eb2", "eb8ea8e186b1"],
+  ["eb8eb3", "e18483e185a8e186b2"],
+  ["eb8eb3", "eb8ea8e186b2"],
+  ["eb8eb4", "e18483e185a8e186b3"],
+  ["eb8eb4", "eb8ea8e186b3"],
+  ["eb8eb5", "e18483e185a8e186b4"],
+  ["eb8eb5", "eb8ea8e186b4"],
+  ["eb8eb6", "e18483e185a8e186b5"],
+  ["eb8eb6", "eb8ea8e186b5"],
+  ["eb8eb7", "e18483e185a8e186b6"],
+  ["eb8eb7", "eb8ea8e186b6"],
+  ["eb8eb8", "e18483e185a8e186b7"],
+  ["eb8eb8", "eb8ea8e186b7"],
+  ["eb8eb9", "e18483e185a8e186b8"],
+  ["eb8eb9", "eb8ea8e186b8"],
+  ["eb8eba", "e18483e185a8e186b9"],
+  ["eb8eba", "eb8ea8e186b9"],
+  ["eb8ebb", "e18483e185a8e186ba"],
+  ["eb8ebb", "eb8ea8e186ba"],
+  ["eb8ebc", "e18483e185a8e186bb"],
+  ["eb8ebc", "eb8ea8e186bb"],
+  ["eb8ebd", "e18483e185a8e186bc"],
+  ["eb8ebd", "eb8ea8e186bc"],
+  ["eb8ebe", "e18483e185a8e186bd"],
+  ["eb8ebe", "eb8ea8e186bd"],
+  ["eb8ebf", "e18483e185a8e186be"],
+  ["eb8ebf", "eb8ea8e186be"],
+  ["eb8f80", "e18483e185a8e186bf"],
+  ["eb8f80", "eb8ea8e186bf"],
+  ["eb8f81", "e18483e185a8e18780"],
+  ["eb8f81", "eb8ea8e18780"],
+  ["eb8f82", "e18483e185a8e18781"],
+  ["eb8f82", "eb8ea8e18781"],
+  ["eb8f83", "e18483e185a8e18782"],
+  ["eb8f83", "eb8ea8e18782"],
+  ["eb8f84", "e18483e185a9"],
+  ["eb8f85", "e18483e185a9e186a8"],
+  ["eb8f85", "eb8f84e186a8"],
+  ["eb8f86", "e18483e185a9e186a9"],
+  ["eb8f86", "eb8f84e186a9"],
+  ["eb8f87", "e18483e185a9e186aa"],
+  ["eb8f87", "eb8f84e186aa"],
+  ["eb8f88", "e18483e185a9e186ab"],
+  ["eb8f88", "eb8f84e186ab"],
+  ["eb8f89", "e18483e185a9e186ac"],
+  ["eb8f89", "eb8f84e186ac"],
+  ["eb8f8a", "e18483e185a9e186ad"],
+  ["eb8f8a", "eb8f84e186ad"],
+  ["eb8f8b", "e18483e185a9e186ae"],
+  ["eb8f8b", "eb8f84e186ae"],
+  ["eb8f8c", "e18483e185a9e186af"],
+  ["eb8f8c", "eb8f84e186af"],
+  ["eb8f8d", "e18483e185a9e186b0"],
+  ["eb8f8d", "eb8f84e186b0"],
+  ["eb8f8e", "e18483e185a9e186b1"],
+  ["eb8f8e", "eb8f84e186b1"],
+  ["eb8f8f", "e18483e185a9e186b2"],
+  ["eb8f8f", "eb8f84e186b2"],
+  ["eb8f90", "e18483e185a9e186b3"],
+  ["eb8f90", "eb8f84e186b3"],
+  ["eb8f91", "e18483e185a9e186b4"],
+  ["eb8f91", "eb8f84e186b4"],
+  ["eb8f92", "e18483e185a9e186b5"],
+  ["eb8f92", "eb8f84e186b5"],
+  ["eb8f93", "e18483e185a9e186b6"],
+  ["eb8f93", "eb8f84e186b6"],
+  ["eb8f94", "e18483e185a9e186b7"],
+  ["eb8f94", "eb8f84e186b7"],
+  ["eb8f95", "e18483e185a9e186b8"],
+  ["eb8f95", "eb8f84e186b8"],
+  ["eb8f96", "e18483e185a9e186b9"],
+  ["eb8f96", "eb8f84e186b9"],
+  ["eb8f97", "e18483e185a9e186ba"],
+  ["eb8f97", "eb8f84e186ba"],
+  ["eb8f98", "e18483e185a9e186bb"],
+  ["eb8f98", "eb8f84e186bb"],
+  ["eb8f99", "e18483e185a9e186bc"],
+  ["eb8f99", "eb8f84e186bc"],
+  ["eb8f9a", "e18483e185a9e186bd"],
+  ["eb8f9a", "eb8f84e186bd"],
+  ["eb8f9b", "e18483e185a9e186be"],
+  ["eb8f9b", "eb8f84e186be"],
+  ["eb8f9c", "e18483e185a9e186bf"],
+  ["eb8f9c", "eb8f84e186bf"],
+  ["eb8f9d", "e18483e185a9e18780"],
+  ["eb8f9d", "eb8f84e18780"],
+  ["eb8f9e", "e18483e185a9e18781"],
+  ["eb8f9e", "eb8f84e18781"],
+  ["eb8f9f", "e18483e185a9e18782"],
+  ["eb8f9f", "eb8f84e18782"],
+  ["eb8fa0", "e18483e185aa"],
+  ["eb8fa1", "e18483e185aae186a8"],
+  ["eb8fa1", "eb8fa0e186a8"],
+  ["eb8fa2", "e18483e185aae186a9"],
+  ["eb8fa2", "eb8fa0e186a9"],
+  ["eb8fa3", "e18483e185aae186aa"],
+  ["eb8fa3", "eb8fa0e186aa"],
+  ["eb8fa4", "e18483e185aae186ab"],
+  ["eb8fa4", "eb8fa0e186ab"],
+  ["eb8fa5", "e18483e185aae186ac"],
+  ["eb8fa5", "eb8fa0e186ac"],
+  ["eb8fa6", "e18483e185aae186ad"],
+  ["eb8fa6", "eb8fa0e186ad"],
+  ["eb8fa7", "e18483e185aae186ae"],
+  ["eb8fa7", "eb8fa0e186ae"],
+  ["eb8fa8", "e18483e185aae186af"],
+  ["eb8fa8", "eb8fa0e186af"],
+  ["eb8fa9", "e18483e185aae186b0"],
+  ["eb8fa9", "eb8fa0e186b0"],
+  ["eb8faa", "e18483e185aae186b1"],
+  ["eb8faa", "eb8fa0e186b1"],
+  ["eb8fab", "e18483e185aae186b2"],
+  ["eb8fab", "eb8fa0e186b2"],
+  ["eb8fac", "e18483e185aae186b3"],
+  ["eb8fac", "eb8fa0e186b3"],
+  ["eb8fad", "e18483e185aae186b4"],
+  ["eb8fad", "eb8fa0e186b4"],
+  ["eb8fae", "e18483e185aae186b5"],
+  ["eb8fae", "eb8fa0e186b5"],
+  ["eb8faf", "e18483e185aae186b6"],
+  ["eb8faf", "eb8fa0e186b6"],
+  ["eb8fb0", "e18483e185aae186b7"],
+  ["eb8fb0", "eb8fa0e186b7"],
+  ["eb8fb1", "e18483e185aae186b8"],
+  ["eb8fb1", "eb8fa0e186b8"],
+  ["eb8fb2", "e18483e185aae186b9"],
+  ["eb8fb2", "eb8fa0e186b9"],
+  ["eb8fb3", "e18483e185aae186ba"],
+  ["eb8fb3", "eb8fa0e186ba"],
+  ["eb8fb4", "e18483e185aae186bb"],
+  ["eb8fb4", "eb8fa0e186bb"],
+  ["eb8fb5", "e18483e185aae186bc"],
+  ["eb8fb5", "eb8fa0e186bc"],
+  ["eb8fb6", "e18483e185aae186bd"],
+  ["eb8fb6", "eb8fa0e186bd"],
+  ["eb8fb7", "e18483e185aae186be"],
+  ["eb8fb7", "eb8fa0e186be"],
+  ["eb8fb8", "e18483e185aae186bf"],
+  ["eb8fb8", "eb8fa0e186bf"],
+  ["eb8fb9", "e18483e185aae18780"],
+  ["eb8fb9", "eb8fa0e18780"],
+  ["eb8fba", "e18483e185aae18781"],
+  ["eb8fba", "eb8fa0e18781"],
+  ["eb8fbb", "e18483e185aae18782"],
+  ["eb8fbb", "eb8fa0e18782"],
+  ["eb8fbc", "e18483e185ab"],
+  ["eb8fbd", "e18483e185abe186a8"],
+  ["eb8fbd", "eb8fbce186a8"],
+  ["eb8fbe", "e18483e185abe186a9"],
+  ["eb8fbe", "eb8fbce186a9"],
+  ["eb8fbf", "e18483e185abe186aa"],
+  ["eb8fbf", "eb8fbce186aa"],
+  ["eb9080", "e18483e185abe186ab"],
+  ["eb9080", "eb8fbce186ab"],
+  ["eb9081", "e18483e185abe186ac"],
+  ["eb9081", "eb8fbce186ac"],
+  ["eb9082", "e18483e185abe186ad"],
+  ["eb9082", "eb8fbce186ad"],
+  ["eb9083", "e18483e185abe186ae"],
+  ["eb9083", "eb8fbce186ae"],
+  ["eb9084", "e18483e185abe186af"],
+  ["eb9084", "eb8fbce186af"],
+  ["eb9085", "e18483e185abe186b0"],
+  ["eb9085", "eb8fbce186b0"],
+  ["eb9086", "e18483e185abe186b1"],
+  ["eb9086", "eb8fbce186b1"],
+  ["eb9087", "e18483e185abe186b2"],
+  ["eb9087", "eb8fbce186b2"],
+  ["eb9088", "e18483e185abe186b3"],
+  ["eb9088", "eb8fbce186b3"],
+  ["eb9089", "e18483e185abe186b4"],
+  ["eb9089", "eb8fbce186b4"],
+  ["eb908a", "e18483e185abe186b5"],
+  ["eb908a", "eb8fbce186b5"],
+  ["eb908b", "e18483e185abe186b6"],
+  ["eb908b", "eb8fbce186b6"],
+  ["eb908c", "e18483e185abe186b7"],
+  ["eb908c", "eb8fbce186b7"],
+  ["eb908d", "e18483e185abe186b8"],
+  ["eb908d", "eb8fbce186b8"],
+  ["eb908e", "e18483e185abe186b9"],
+  ["eb908e", "eb8fbce186b9"],
+  ["eb908f", "e18483e185abe186ba"],
+  ["eb908f", "eb8fbce186ba"],
+  ["eb9090", "e18483e185abe186bb"],
+  ["eb9090", "eb8fbce186bb"],
+  ["eb9091", "e18483e185abe186bc"],
+  ["eb9091", "eb8fbce186bc"],
+  ["eb9092", "e18483e185abe186bd"],
+  ["eb9092", "eb8fbce186bd"],
+  ["eb9093", "e18483e185abe186be"],
+  ["eb9093", "eb8fbce186be"],
+  ["eb9094", "e18483e185abe186bf"],
+  ["eb9094", "eb8fbce186bf"],
+  ["eb9095", "e18483e185abe18780"],
+  ["eb9095", "eb8fbce18780"],
+  ["eb9096", "e18483e185abe18781"],
+  ["eb9096", "eb8fbce18781"],
+  ["eb9097", "e18483e185abe18782"],
+  ["eb9097", "eb8fbce18782"],
+  ["eb9098", "e18483e185ac"],
+  ["eb9099", "e18483e185ace186a8"],
+  ["eb9099", "eb9098e186a8"],
+  ["eb909a", "e18483e185ace186a9"],
+  ["eb909a", "eb9098e186a9"],
+  ["eb909b", "e18483e185ace186aa"],
+  ["eb909b", "eb9098e186aa"],
+  ["eb909c", "e18483e185ace186ab"],
+  ["eb909c", "eb9098e186ab"],
+  ["eb909d", "e18483e185ace186ac"],
+  ["eb909d", "eb9098e186ac"],
+  ["eb909e", "e18483e185ace186ad"],
+  ["eb909e", "eb9098e186ad"],
+  ["eb909f", "e18483e185ace186ae"],
+  ["eb909f", "eb9098e186ae"],
+  ["eb90a0", "e18483e185ace186af"],
+  ["eb90a0", "eb9098e186af"],
+  ["eb90a1", "e18483e185ace186b0"],
+  ["eb90a1", "eb9098e186b0"],
+  ["eb90a2", "e18483e185ace186b1"],
+  ["eb90a2", "eb9098e186b1"],
+  ["eb90a3", "e18483e185ace186b2"],
+  ["eb90a3", "eb9098e186b2"],
+  ["eb90a4", "e18483e185ace186b3"],
+  ["eb90a4", "eb9098e186b3"],
+  ["eb90a5", "e18483e185ace186b4"],
+  ["eb90a5", "eb9098e186b4"],
+  ["eb90a6", "e18483e185ace186b5"],
+  ["eb90a6", "eb9098e186b5"],
+  ["eb90a7", "e18483e185ace186b6"],
+  ["eb90a7", "eb9098e186b6"],
+  ["eb90a8", "e18483e185ace186b7"],
+  ["eb90a8", "eb9098e186b7"],
+  ["eb90a9", "e18483e185ace186b8"],
+  ["eb90a9", "eb9098e186b8"],
+  ["eb90aa", "e18483e185ace186b9"],
+  ["eb90aa", "eb9098e186b9"],
+  ["eb90ab", "e18483e185ace186ba"],
+  ["eb90ab", "eb9098e186ba"],
+  ["eb90ac", "e18483e185ace186bb"],
+  ["eb90ac", "eb9098e186bb"],
+  ["eb90ad", "e18483e185ace186bc"],
+  ["eb90ad", "eb9098e186bc"],
+  ["eb90ae", "e18483e185ace186bd"],
+  ["eb90ae", "eb9098e186bd"],
+  ["eb90af", "e18483e185ace186be"],
+  ["eb90af", "eb9098e186be"],
+  ["eb90b0", "e18483e185ace186bf"],
+  ["eb90b0", "eb9098e186bf"],
+  ["eb90b1", "e18483e185ace18780"],
+  ["eb90b1", "eb9098e18780"],
+  ["eb90b2", "e18483e185ace18781"],
+  ["eb90b2", "eb9098e18781"],
+  ["eb90b3", "e18483e185ace18782"],
+  ["eb90b3", "eb9098e18782"],
+  ["eb90b4", "e18483e185ad"],
+  ["eb90b5", "e18483e185ade186a8"],
+  ["eb90b5", "eb90b4e186a8"],
+  ["eb90b6", "e18483e185ade186a9"],
+  ["eb90b6", "eb90b4e186a9"],
+  ["eb90b7", "e18483e185ade186aa"],
+  ["eb90b7", "eb90b4e186aa"],
+  ["eb90b8", "e18483e185ade186ab"],
+  ["eb90b8", "eb90b4e186ab"],
+  ["eb90b9", "e18483e185ade186ac"],
+  ["eb90b9", "eb90b4e186ac"],
+  ["eb90ba", "e18483e185ade186ad"],
+  ["eb90ba", "eb90b4e186ad"],
+  ["eb90bb", "e18483e185ade186ae"],
+  ["eb90bb", "eb90b4e186ae"],
+  ["eb90bc", "e18483e185ade186af"],
+  ["eb90bc", "eb90b4e186af"],
+  ["eb90bd", "e18483e185ade186b0"],
+  ["eb90bd", "eb90b4e186b0"],
+  ["eb90be", "e18483e185ade186b1"],
+  ["eb90be", "eb90b4e186b1"],
+  ["eb90bf", "e18483e185ade186b2"],
+  ["eb90bf", "eb90b4e186b2"],
+  ["eb9180", "e18483e185ade186b3"],
+  ["eb9180", "eb90b4e186b3"],
+  ["eb9181", "e18483e185ade186b4"],
+  ["eb9181", "eb90b4e186b4"],
+  ["eb9182", "e18483e185ade186b5"],
+  ["eb9182", "eb90b4e186b5"],
+  ["eb9183", "e18483e185ade186b6"],
+  ["eb9183", "eb90b4e186b6"],
+  ["eb9184", "e18483e185ade186b7"],
+  ["eb9184", "eb90b4e186b7"],
+  ["eb9185", "e18483e185ade186b8"],
+  ["eb9185", "eb90b4e186b8"],
+  ["eb9186", "e18483e185ade186b9"],
+  ["eb9186", "eb90b4e186b9"],
+  ["eb9187", "e18483e185ade186ba"],
+  ["eb9187", "eb90b4e186ba"],
+  ["eb9188", "e18483e185ade186bb"],
+  ["eb9188", "eb90b4e186bb"],
+  ["eb9189", "e18483e185ade186bc"],
+  ["eb9189", "eb90b4e186bc"],
+  ["eb918a", "e18483e185ade186bd"],
+  ["eb918a", "eb90b4e186bd"],
+  ["eb918b", "e18483e185ade186be"],
+  ["eb918b", "eb90b4e186be"],
+  ["eb918c", "e18483e185ade186bf"],
+  ["eb918c", "eb90b4e186bf"],
+  ["eb918d", "e18483e185ade18780"],
+  ["eb918d", "eb90b4e18780"],
+  ["eb918e", "e18483e185ade18781"],
+  ["eb918e", "eb90b4e18781"],
+  ["eb918f", "e18483e185ade18782"],
+  ["eb918f", "eb90b4e18782"],
+  ["eb9190", "e18483e185ae"],
+  ["eb9191", "e18483e185aee186a8"],
+  ["eb9191", "eb9190e186a8"],
+  ["eb9192", "e18483e185aee186a9"],
+  ["eb9192", "eb9190e186a9"],
+  ["eb9193", "e18483e185aee186aa"],
+  ["eb9193", "eb9190e186aa"],
+  ["eb9194", "e18483e185aee186ab"],
+  ["eb9194", "eb9190e186ab"],
+  ["eb9195", "e18483e185aee186ac"],
+  ["eb9195", "eb9190e186ac"],
+  ["eb9196", "e18483e185aee186ad"],
+  ["eb9196", "eb9190e186ad"],
+  ["eb9197", "e18483e185aee186ae"],
+  ["eb9197", "eb9190e186ae"],
+  ["eb9198", "e18483e185aee186af"],
+  ["eb9198", "eb9190e186af"],
+  ["eb9199", "e18483e185aee186b0"],
+  ["eb9199", "eb9190e186b0"],
+  ["eb919a", "e18483e185aee186b1"],
+  ["eb919a", "eb9190e186b1"],
+  ["eb919b", "e18483e185aee186b2"],
+  ["eb919b", "eb9190e186b2"],
+  ["eb919c", "e18483e185aee186b3"],
+  ["eb919c", "eb9190e186b3"],
+  ["eb919d", "e18483e185aee186b4"],
+  ["eb919d", "eb9190e186b4"],
+  ["eb919e", "e18483e185aee186b5"],
+  ["eb919e", "eb9190e186b5"],
+  ["eb919f", "e18483e185aee186b6"],
+  ["eb919f", "eb9190e186b6"],
+  ["eb91a0", "e18483e185aee186b7"],
+  ["eb91a0", "eb9190e186b7"],
+  ["eb91a1", "e18483e185aee186b8"],
+  ["eb91a1", "eb9190e186b8"],
+  ["eb91a2", "e18483e185aee186b9"],
+  ["eb91a2", "eb9190e186b9"],
+  ["eb91a3", "e18483e185aee186ba"],
+  ["eb91a3", "eb9190e186ba"],
+  ["eb91a4", "e18483e185aee186bb"],
+  ["eb91a4", "eb9190e186bb"],
+  ["eb91a5", "e18483e185aee186bc"],
+  ["eb91a5", "eb9190e186bc"],
+  ["eb91a6", "e18483e185aee186bd"],
+  ["eb91a6", "eb9190e186bd"],
+  ["eb91a7", "e18483e185aee186be"],
+  ["eb91a7", "eb9190e186be"],
+  ["eb91a8", "e18483e185aee186bf"],
+  ["eb91a8", "eb9190e186bf"],
+  ["eb91a9", "e18483e185aee18780"],
+  ["eb91a9", "eb9190e18780"],
+  ["eb91aa", "e18483e185aee18781"],
+  ["eb91aa", "eb9190e18781"],
+  ["eb91ab", "e18483e185aee18782"],
+  ["eb91ab", "eb9190e18782"],
+  ["eb91ac", "e18483e185af"],
+  ["eb91ad", "e18483e185afe186a8"],
+  ["eb91ad", "eb91ace186a8"],
+  ["eb91ae", "e18483e185afe186a9"],
+  ["eb91ae", "eb91ace186a9"],
+  ["eb91af", "e18483e185afe186aa"],
+  ["eb91af", "eb91ace186aa"],
+  ["eb91b0", "e18483e185afe186ab"],
+  ["eb91b0", "eb91ace186ab"],
+  ["eb91b1", "e18483e185afe186ac"],
+  ["eb91b1", "eb91ace186ac"],
+  ["eb91b2", "e18483e185afe186ad"],
+  ["eb91b2", "eb91ace186ad"],
+  ["eb91b3", "e18483e185afe186ae"],
+  ["eb91b3", "eb91ace186ae"],
+  ["eb91b4", "e18483e185afe186af"],
+  ["eb91b4", "eb91ace186af"],
+  ["eb91b5", "e18483e185afe186b0"],
+  ["eb91b5", "eb91ace186b0"],
+  ["eb91b6", "e18483e185afe186b1"],
+  ["eb91b6", "eb91ace186b1"],
+  ["eb91b7", "e18483e185afe186b2"],
+  ["eb91b7", "eb91ace186b2"],
+  ["eb91b8", "e18483e185afe186b3"],
+  ["eb91b8", "eb91ace186b3"],
+  ["eb91b9", "e18483e185afe186b4"],
+  ["eb91b9", "eb91ace186b4"],
+  ["eb91ba", "e18483e185afe186b5"],
+  ["eb91ba", "eb91ace186b5"],
+  ["eb91bb", "e18483e185afe186b6"],
+  ["eb91bb", "eb91ace186b6"],
+  ["eb91bc", "e18483e185afe186b7"],
+  ["eb91bc", "eb91ace186b7"],
+  ["eb91bd", "e18483e185afe186b8"],
+  ["eb91bd", "eb91ace186b8"],
+  ["eb91be", "e18483e185afe186b9"],
+  ["eb91be", "eb91ace186b9"],
+  ["eb91bf", "e18483e185afe186ba"],
+  ["eb91bf", "eb91ace186ba"],
+  ["eb9280", "e18483e185afe186bb"],
+  ["eb9280", "eb91ace186bb"],
+  ["eb9281", "e18483e185afe186bc"],
+  ["eb9281", "eb91ace186bc"],
+  ["eb9282", "e18483e185afe186bd"],
+  ["eb9282", "eb91ace186bd"],
+  ["eb9283", "e18483e185afe186be"],
+  ["eb9283", "eb91ace186be"],
+  ["eb9284", "e18483e185afe186bf"],
+  ["eb9284", "eb91ace186bf"],
+  ["eb9285", "e18483e185afe18780"],
+  ["eb9285", "eb91ace18780"],
+  ["eb9286", "e18483e185afe18781"],
+  ["eb9286", "eb91ace18781"],
+  ["eb9287", "e18483e185afe18782"],
+  ["eb9287", "eb91ace18782"],
+  ["eb9288", "e18483e185b0"],
+  ["eb9289", "e18483e185b0e186a8"],
+  ["eb9289", "eb9288e186a8"],
+  ["eb928a", "e18483e185b0e186a9"],
+  ["eb928a", "eb9288e186a9"],
+  ["eb928b", "e18483e185b0e186aa"],
+  ["eb928b", "eb9288e186aa"],
+  ["eb928c", "e18483e185b0e186ab"],
+  ["eb928c", "eb9288e186ab"],
+  ["eb928d", "e18483e185b0e186ac"],
+  ["eb928d", "eb9288e186ac"],
+  ["eb928e", "e18483e185b0e186ad"],
+  ["eb928e", "eb9288e186ad"],
+  ["eb928f", "e18483e185b0e186ae"],
+  ["eb928f", "eb9288e186ae"],
+  ["eb9290", "e18483e185b0e186af"],
+  ["eb9290", "eb9288e186af"],
+  ["eb9291", "e18483e185b0e186b0"],
+  ["eb9291", "eb9288e186b0"],
+  ["eb9292", "e18483e185b0e186b1"],
+  ["eb9292", "eb9288e186b1"],
+  ["eb9293", "e18483e185b0e186b2"],
+  ["eb9293", "eb9288e186b2"],
+  ["eb9294", "e18483e185b0e186b3"],
+  ["eb9294", "eb9288e186b3"],
+  ["eb9295", "e18483e185b0e186b4"],
+  ["eb9295", "eb9288e186b4"],
+  ["eb9296", "e18483e185b0e186b5"],
+  ["eb9296", "eb9288e186b5"],
+  ["eb9297", "e18483e185b0e186b6"],
+  ["eb9297", "eb9288e186b6"],
+  ["eb9298", "e18483e185b0e186b7"],
+  ["eb9298", "eb9288e186b7"],
+  ["eb9299", "e18483e185b0e186b8"],
+  ["eb9299", "eb9288e186b8"],
+  ["eb929a", "e18483e185b0e186b9"],
+  ["eb929a", "eb9288e186b9"],
+  ["eb929b", "e18483e185b0e186ba"],
+  ["eb929b", "eb9288e186ba"],
+  ["eb929c", "e18483e185b0e186bb"],
+  ["eb929c", "eb9288e186bb"],
+  ["eb929d", "e18483e185b0e186bc"],
+  ["eb929d", "eb9288e186bc"],
+  ["eb929e", "e18483e185b0e186bd"],
+  ["eb929e", "eb9288e186bd"],
+  ["eb929f", "e18483e185b0e186be"],
+  ["eb929f", "eb9288e186be"],
+  ["eb92a0", "e18483e185b0e186bf"],
+  ["eb92a0", "eb9288e186bf"],
+  ["eb92a1", "e18483e185b0e18780"],
+  ["eb92a1", "eb9288e18780"],
+  ["eb92a2", "e18483e185b0e18781"],
+  ["eb92a2", "eb9288e18781"],
+  ["eb92a3", "e18483e185b0e18782"],
+  ["eb92a3", "eb9288e18782"],
+  ["eb92a4", "e18483e185b1"],
+  ["eb92a5", "e18483e185b1e186a8"],
+  ["eb92a5", "eb92a4e186a8"],
+  ["eb92a6", "e18483e185b1e186a9"],
+  ["eb92a6", "eb92a4e186a9"],
+  ["eb92a7", "e18483e185b1e186aa"],
+  ["eb92a7", "eb92a4e186aa"],
+  ["eb92a8", "e18483e185b1e186ab"],
+  ["eb92a8", "eb92a4e186ab"],
+  ["eb92a9", "e18483e185b1e186ac"],
+  ["eb92a9", "eb92a4e186ac"],
+  ["eb92aa", "e18483e185b1e186ad"],
+  ["eb92aa", "eb92a4e186ad"],
+  ["eb92ab", "e18483e185b1e186ae"],
+  ["eb92ab", "eb92a4e186ae"],
+  ["eb92ac", "e18483e185b1e186af"],
+  ["eb92ac", "eb92a4e186af"],
+  ["eb92ad", "e18483e185b1e186b0"],
+  ["eb92ad", "eb92a4e186b0"],
+  ["eb92ae", "e18483e185b1e186b1"],
+  ["eb92ae", "eb92a4e186b1"],
+  ["eb92af", "e18483e185b1e186b2"],
+  ["eb92af", "eb92a4e186b2"],
+  ["eb92b0", "e18483e185b1e186b3"],
+  ["eb92b0", "eb92a4e186b3"],
+  ["eb92b1", "e18483e185b1e186b4"],
+  ["eb92b1", "eb92a4e186b4"],
+  ["eb92b2", "e18483e185b1e186b5"],
+  ["eb92b2", "eb92a4e186b5"],
+  ["eb92b3", "e18483e185b1e186b6"],
+  ["eb92b3", "eb92a4e186b6"],
+  ["eb92b4", "e18483e185b1e186b7"],
+  ["eb92b4", "eb92a4e186b7"],
+  ["eb92b5", "e18483e185b1e186b8"],
+  ["eb92b5", "eb92a4e186b8"],
+  ["eb92b6", "e18483e185b1e186b9"],
+  ["eb92b6", "eb92a4e186b9"],
+  ["eb92b7", "e18483e185b1e186ba"],
+  ["eb92b7", "eb92a4e186ba"],
+  ["eb92b8", "e18483e185b1e186bb"],
+  ["eb92b8", "eb92a4e186bb"],
+  ["eb92b9", "e18483e185b1e186bc"],
+  ["eb92b9", "eb92a4e186bc"],
+  ["eb92ba", "e18483e185b1e186bd"],
+  ["eb92ba", "eb92a4e186bd"],
+  ["eb92bb", "e18483e185b1e186be"],
+  ["eb92bb", "eb92a4e186be"],
+  ["eb92bc", "e18483e185b1e186bf"],
+  ["eb92bc", "eb92a4e186bf"],
+  ["eb92bd", "e18483e185b1e18780"],
+  ["eb92bd", "eb92a4e18780"],
+  ["eb92be", "e18483e185b1e18781"],
+  ["eb92be", "eb92a4e18781"],
+  ["eb92bf", "e18483e185b1e18782"],
+  ["eb92bf", "eb92a4e18782"],
+  ["eb9380", "e18483e185b2"],
+  ["eb9381", "e18483e185b2e186a8"],
+  ["eb9381", "eb9380e186a8"],
+  ["eb9382", "e18483e185b2e186a9"],
+  ["eb9382", "eb9380e186a9"],
+  ["eb9383", "e18483e185b2e186aa"],
+  ["eb9383", "eb9380e186aa"],
+  ["eb9384", "e18483e185b2e186ab"],
+  ["eb9384", "eb9380e186ab"],
+  ["eb9385", "e18483e185b2e186ac"],
+  ["eb9385", "eb9380e186ac"],
+  ["eb9386", "e18483e185b2e186ad"],
+  ["eb9386", "eb9380e186ad"],
+  ["eb9387", "e18483e185b2e186ae"],
+  ["eb9387", "eb9380e186ae"],
+  ["eb9388", "e18483e185b2e186af"],
+  ["eb9388", "eb9380e186af"],
+  ["eb9389", "e18483e185b2e186b0"],
+  ["eb9389", "eb9380e186b0"],
+  ["eb938a", "e18483e185b2e186b1"],
+  ["eb938a", "eb9380e186b1"],
+  ["eb938b", "e18483e185b2e186b2"],
+  ["eb938b", "eb9380e186b2"],
+  ["eb938c", "e18483e185b2e186b3"],
+  ["eb938c", "eb9380e186b3"],
+  ["eb938d", "e18483e185b2e186b4"],
+  ["eb938d", "eb9380e186b4"],
+  ["eb938e", "e18483e185b2e186b5"],
+  ["eb938e", "eb9380e186b5"],
+  ["eb938f", "e18483e185b2e186b6"],
+  ["eb938f", "eb9380e186b6"],
+  ["eb9390", "e18483e185b2e186b7"],
+  ["eb9390", "eb9380e186b7"],
+  ["eb9391", "e18483e185b2e186b8"],
+  ["eb9391", "eb9380e186b8"],
+  ["eb9392", "e18483e185b2e186b9"],
+  ["eb9392", "eb9380e186b9"],
+  ["eb9393", "e18483e185b2e186ba"],
+  ["eb9393", "eb9380e186ba"],
+  ["eb9394", "e18483e185b2e186bb"],
+  ["eb9394", "eb9380e186bb"],
+  ["eb9395", "e18483e185b2e186bc"],
+  ["eb9395", "eb9380e186bc"],
+  ["eb9396", "e18483e185b2e186bd"],
+  ["eb9396", "eb9380e186bd"],
+  ["eb9397", "e18483e185b2e186be"],
+  ["eb9397", "eb9380e186be"],
+  ["eb9398", "e18483e185b2e186bf"],
+  ["eb9398", "eb9380e186bf"],
+  ["eb9399", "e18483e185b2e18780"],
+  ["eb9399", "eb9380e18780"],
+  ["eb939a", "e18483e185b2e18781"],
+  ["eb939a", "eb9380e18781"],
+  ["eb939b", "e18483e185b2e18782"],
+  ["eb939b", "eb9380e18782"],
+  ["eb939c", "e18483e185b3"],
+  ["eb939d", "e18483e185b3e186a8"],
+  ["eb939d", "eb939ce186a8"],
+  ["eb939e", "e18483e185b3e186a9"],
+  ["eb939e", "eb939ce186a9"],
+  ["eb939f", "e18483e185b3e186aa"],
+  ["eb939f", "eb939ce186aa"],
+  ["eb93a0", "e18483e185b3e186ab"],
+  ["eb93a0", "eb939ce186ab"],
+  ["eb93a1", "e18483e185b3e186ac"],
+  ["eb93a1", "eb939ce186ac"],
+  ["eb93a2", "e18483e185b3e186ad"],
+  ["eb93a2", "eb939ce186ad"],
+  ["eb93a3", "e18483e185b3e186ae"],
+  ["eb93a3", "eb939ce186ae"],
+  ["eb93a4", "e18483e185b3e186af"],
+  ["eb93a4", "eb939ce186af"],
+  ["eb93a5", "e18483e185b3e186b0"],
+  ["eb93a5", "eb939ce186b0"],
+  ["eb93a6", "e18483e185b3e186b1"],
+  ["eb93a6", "eb939ce186b1"],
+  ["eb93a7", "e18483e185b3e186b2"],
+  ["eb93a7", "eb939ce186b2"],
+  ["eb93a8", "e18483e185b3e186b3"],
+  ["eb93a8", "eb939ce186b3"],
+  ["eb93a9", "e18483e185b3e186b4"],
+  ["eb93a9", "eb939ce186b4"],
+  ["eb93aa", "e18483e185b3e186b5"],
+  ["eb93aa", "eb939ce186b5"],
+  ["eb93ab", "e18483e185b3e186b6"],
+  ["eb93ab", "eb939ce186b6"],
+  ["eb93ac", "e18483e185b3e186b7"],
+  ["eb93ac", "eb939ce186b7"],
+  ["eb93ad", "e18483e185b3e186b8"],
+  ["eb93ad", "eb939ce186b8"],
+  ["eb93ae", "e18483e185b3e186b9"],
+  ["eb93ae", "eb939ce186b9"],
+  ["eb93af", "e18483e185b3e186ba"],
+  ["eb93af", "eb939ce186ba"],
+  ["eb93b0", "e18483e185b3e186bb"],
+  ["eb93b0", "eb939ce186bb"],
+  ["eb93b1", "e18483e185b3e186bc"],
+  ["eb93b1", "eb939ce186bc"],
+  ["eb93b2", "e18483e185b3e186bd"],
+  ["eb93b2", "eb939ce186bd"],
+  ["eb93b3", "e18483e185b3e186be"],
+  ["eb93b3", "eb939ce186be"],
+  ["eb93b4", "e18483e185b3e186bf"],
+  ["eb93b4", "eb939ce186bf"],
+  ["eb93b5", "e18483e185b3e18780"],
+  ["eb93b5", "eb939ce18780"],
+  ["eb93b6", "e18483e185b3e18781"],
+  ["eb93b6", "eb939ce18781"],
+  ["eb93b7", "e18483e185b3e18782"],
+  ["eb93b7", "eb939ce18782"],
+  ["eb93b8", "e18483e185b4"],
+  ["eb93b9", "e18483e185b4e186a8"],
+  ["eb93b9", "eb93b8e186a8"],
+  ["eb93ba", "e18483e185b4e186a9"],
+  ["eb93ba", "eb93b8e186a9"],
+  ["eb93bb", "e18483e185b4e186aa"],
+  ["eb93bb", "eb93b8e186aa"],
+  ["eb93bc", "e18483e185b4e186ab"],
+  ["eb93bc", "eb93b8e186ab"],
+  ["eb93bd", "e18483e185b4e186ac"],
+  ["eb93bd", "eb93b8e186ac"],
+  ["eb93be", "e18483e185b4e186ad"],
+  ["eb93be", "eb93b8e186ad"],
+  ["eb93bf", "e18483e185b4e186ae"],
+  ["eb93bf", "eb93b8e186ae"],
+  ["eb9480", "e18483e185b4e186af"],
+  ["eb9480", "eb93b8e186af"],
+  ["eb9481", "e18483e185b4e186b0"],
+  ["eb9481", "eb93b8e186b0"],
+  ["eb9482", "e18483e185b4e186b1"],
+  ["eb9482", "eb93b8e186b1"],
+  ["eb9483", "e18483e185b4e186b2"],
+  ["eb9483", "eb93b8e186b2"],
+  ["eb9484", "e18483e185b4e186b3"],
+  ["eb9484", "eb93b8e186b3"],
+  ["eb9485", "e18483e185b4e186b4"],
+  ["eb9485", "eb93b8e186b4"],
+  ["eb9486", "e18483e185b4e186b5"],
+  ["eb9486", "eb93b8e186b5"],
+  ["eb9487", "e18483e185b4e186b6"],
+  ["eb9487", "eb93b8e186b6"],
+  ["eb9488", "e18483e185b4e186b7"],
+  ["eb9488", "eb93b8e186b7"],
+  ["eb9489", "e18483e185b4e186b8"],
+  ["eb9489", "eb93b8e186b8"],
+  ["eb948a", "e18483e185b4e186b9"],
+  ["eb948a", "eb93b8e186b9"],
+  ["eb948b", "e18483e185b4e186ba"],
+  ["eb948b", "eb93b8e186ba"],
+  ["eb948c", "e18483e185b4e186bb"],
+  ["eb948c", "eb93b8e186bb"],
+  ["eb948d", "e18483e185b4e186bc"],
+  ["eb948d", "eb93b8e186bc"],
+  ["eb948e", "e18483e185b4e186bd"],
+  ["eb948e", "eb93b8e186bd"],
+  ["eb948f", "e18483e185b4e186be"],
+  ["eb948f", "eb93b8e186be"],
+  ["eb9490", "e18483e185b4e186bf"],
+  ["eb9490", "eb93b8e186bf"],
+  ["eb9491", "e18483e185b4e18780"],
+  ["eb9491", "eb93b8e18780"],
+  ["eb9492", "e18483e185b4e18781"],
+  ["eb9492", "eb93b8e18781"],
+  ["eb9493", "e18483e185b4e18782"],
+  ["eb9493", "eb93b8e18782"],
+  ["eb9494", "e18483e185b5"],
+  ["eb9495", "e18483e185b5e186a8"],
+  ["eb9495", "eb9494e186a8"],
+  ["eb9496", "e18483e185b5e186a9"],
+  ["eb9496", "eb9494e186a9"],
+  ["eb9497", "e18483e185b5e186aa"],
+  ["eb9497", "eb9494e186aa"],
+  ["eb9498", "e18483e185b5e186ab"],
+  ["eb9498", "eb9494e186ab"],
+  ["eb9499", "e18483e185b5e186ac"],
+  ["eb9499", "eb9494e186ac"],
+  ["eb949a", "e18483e185b5e186ad"],
+  ["eb949a", "eb9494e186ad"],
+  ["eb949b", "e18483e185b5e186ae"],
+  ["eb949b", "eb9494e186ae"],
+  ["eb949c", "e18483e185b5e186af"],
+  ["eb949c", "eb9494e186af"],
+  ["eb949d", "e18483e185b5e186b0"],
+  ["eb949d", "eb9494e186b0"],
+  ["eb949e", "e18483e185b5e186b1"],
+  ["eb949e", "eb9494e186b1"],
+  ["eb949f", "e18483e185b5e186b2"],
+  ["eb949f", "eb9494e186b2"],
+  ["eb94a0", "e18483e185b5e186b3"],
+  ["eb94a0", "eb9494e186b3"],
+  ["eb94a1", "e18483e185b5e186b4"],
+  ["eb94a1", "eb9494e186b4"],
+  ["eb94a2", "e18483e185b5e186b5"],
+  ["eb94a2", "eb9494e186b5"],
+  ["eb94a3", "e18483e185b5e186b6"],
+  ["eb94a3", "eb9494e186b6"],
+  ["eb94a4", "e18483e185b5e186b7"],
+  ["eb94a4", "eb9494e186b7"],
+  ["eb94a5", "e18483e185b5e186b8"],
+  ["eb94a5", "eb9494e186b8"],
+  ["eb94a6", "e18483e185b5e186b9"],
+  ["eb94a6", "eb9494e186b9"],
+  ["eb94a7", "e18483e185b5e186ba"],
+  ["eb94a7", "eb9494e186ba"],
+  ["eb94a8", "e18483e185b5e186bb"],
+  ["eb94a8", "eb9494e186bb"],
+  ["eb94a9", "e18483e185b5e186bc"],
+  ["eb94a9", "eb9494e186bc"],
+  ["eb94aa", "e18483e185b5e186bd"],
+  ["eb94aa", "eb9494e186bd"],
+  ["eb94ab", "e18483e185b5e186be"],
+  ["eb94ab", "eb9494e186be"],
+  ["eb94ac", "e18483e185b5e186bf"],
+  ["eb94ac", "eb9494e186bf"],
+  ["eb94ad", "e18483e185b5e18780"],
+  ["eb94ad", "eb9494e18780"],
+  ["eb94ae", "e18483e185b5e18781"],
+  ["eb94ae", "eb9494e18781"],
+  ["eb94af", "e18483e185b5e18782"],
+  ["eb94af", "eb9494e18782"],
+  ["eb94b0", "e18484e185a1"],
+  ["eb94b1", "e18484e185a1e186a8"],
+  ["eb94b1", "eb94b0e186a8"],
+  ["eb94b2", "e18484e185a1e186a9"],
+  ["eb94b2", "eb94b0e186a9"],
+  ["eb94b3", "e18484e185a1e186aa"],
+  ["eb94b3", "eb94b0e186aa"],
+  ["eb94b4", "e18484e185a1e186ab"],
+  ["eb94b4", "eb94b0e186ab"],
+  ["eb94b5", "e18484e185a1e186ac"],
+  ["eb94b5", "eb94b0e186ac"],
+  ["eb94b6", "e18484e185a1e186ad"],
+  ["eb94b6", "eb94b0e186ad"],
+  ["eb94b7", "e18484e185a1e186ae"],
+  ["eb94b7", "eb94b0e186ae"],
+  ["eb94b8", "e18484e185a1e186af"],
+  ["eb94b8", "eb94b0e186af"],
+  ["eb94b9", "e18484e185a1e186b0"],
+  ["eb94b9", "eb94b0e186b0"],
+  ["eb94ba", "e18484e185a1e186b1"],
+  ["eb94ba", "eb94b0e186b1"],
+  ["eb94bb", "e18484e185a1e186b2"],
+  ["eb94bb", "eb94b0e186b2"],
+  ["eb94bc", "e18484e185a1e186b3"],
+  ["eb94bc", "eb94b0e186b3"],
+  ["eb94bd", "e18484e185a1e186b4"],
+  ["eb94bd", "eb94b0e186b4"],
+  ["eb94be", "e18484e185a1e186b5"],
+  ["eb94be", "eb94b0e186b5"],
+  ["eb94bf", "e18484e185a1e186b6"],
+  ["eb94bf", "eb94b0e186b6"],
+  ["eb9580", "e18484e185a1e186b7"],
+  ["eb9580", "eb94b0e186b7"],
+  ["eb9581", "e18484e185a1e186b8"],
+  ["eb9581", "eb94b0e186b8"],
+  ["eb9582", "e18484e185a1e186b9"],
+  ["eb9582", "eb94b0e186b9"],
+  ["eb9583", "e18484e185a1e186ba"],
+  ["eb9583", "eb94b0e186ba"],
+  ["eb9584", "e18484e185a1e186bb"],
+  ["eb9584", "eb94b0e186bb"],
+  ["eb9585", "e18484e185a1e186bc"],
+  ["eb9585", "eb94b0e186bc"],
+  ["eb9586", "e18484e185a1e186bd"],
+  ["eb9586", "eb94b0e186bd"],
+  ["eb9587", "e18484e185a1e186be"],
+  ["eb9587", "eb94b0e186be"],
+  ["eb9588", "e18484e185a1e186bf"],
+  ["eb9588", "eb94b0e186bf"],
+  ["eb9589", "e18484e185a1e18780"],
+  ["eb9589", "eb94b0e18780"],
+  ["eb958a", "e18484e185a1e18781"],
+  ["eb958a", "eb94b0e18781"],
+  ["eb958b", "e18484e185a1e18782"],
+  ["eb958b", "eb94b0e18782"],
+  ["eb958c", "e18484e185a2"],
+  ["eb958d", "e18484e185a2e186a8"],
+  ["eb958d", "eb958ce186a8"],
+  ["eb958e", "e18484e185a2e186a9"],
+  ["eb958e", "eb958ce186a9"],
+  ["eb958f", "e18484e185a2e186aa"],
+  ["eb958f", "eb958ce186aa"],
+  ["eb9590", "e18484e185a2e186ab"],
+  ["eb9590", "eb958ce186ab"],
+  ["eb9591", "e18484e185a2e186ac"],
+  ["eb9591", "eb958ce186ac"],
+  ["eb9592", "e18484e185a2e186ad"],
+  ["eb9592", "eb958ce186ad"],
+  ["eb9593", "e18484e185a2e186ae"],
+  ["eb9593", "eb958ce186ae"],
+  ["eb9594", "e18484e185a2e186af"],
+  ["eb9594", "eb958ce186af"],
+  ["eb9595", "e18484e185a2e186b0"],
+  ["eb9595", "eb958ce186b0"],
+  ["eb9596", "e18484e185a2e186b1"],
+  ["eb9596", "eb958ce186b1"],
+  ["eb9597", "e18484e185a2e186b2"],
+  ["eb9597", "eb958ce186b2"],
+  ["eb9598", "e18484e185a2e186b3"],
+  ["eb9598", "eb958ce186b3"],
+  ["eb9599", "e18484e185a2e186b4"],
+  ["eb9599", "eb958ce186b4"],
+  ["eb959a", "e18484e185a2e186b5"],
+  ["eb959a", "eb958ce186b5"],
+  ["eb959b", "e18484e185a2e186b6"],
+  ["eb959b", "eb958ce186b6"],
+  ["eb959c", "e18484e185a2e186b7"],
+  ["eb959c", "eb958ce186b7"],
+  ["eb959d", "e18484e185a2e186b8"],
+  ["eb959d", "eb958ce186b8"],
+  ["eb959e", "e18484e185a2e186b9"],
+  ["eb959e", "eb958ce186b9"],
+  ["eb959f", "e18484e185a2e186ba"],
+  ["eb959f", "eb958ce186ba"],
+  ["eb95a0", "e18484e185a2e186bb"],
+  ["eb95a0", "eb958ce186bb"],
+  ["eb95a1", "e18484e185a2e186bc"],
+  ["eb95a1", "eb958ce186bc"],
+  ["eb95a2", "e18484e185a2e186bd"],
+  ["eb95a2", "eb958ce186bd"],
+  ["eb95a3", "e18484e185a2e186be"],
+  ["eb95a3", "eb958ce186be"],
+  ["eb95a4", "e18484e185a2e186bf"],
+  ["eb95a4", "eb958ce186bf"],
+  ["eb95a5", "e18484e185a2e18780"],
+  ["eb95a5", "eb958ce18780"],
+  ["eb95a6", "e18484e185a2e18781"],
+  ["eb95a6", "eb958ce18781"],
+  ["eb95a7", "e18484e185a2e18782"],
+  ["eb95a7", "eb958ce18782"],
+  ["eb95a8", "e18484e185a3"],
+  ["eb95a9", "e18484e185a3e186a8"],
+  ["eb95a9", "eb95a8e186a8"],
+  ["eb95aa", "e18484e185a3e186a9"],
+  ["eb95aa", "eb95a8e186a9"],
+  ["eb95ab", "e18484e185a3e186aa"],
+  ["eb95ab", "eb95a8e186aa"],
+  ["eb95ac", "e18484e185a3e186ab"],
+  ["eb95ac", "eb95a8e186ab"],
+  ["eb95ad", "e18484e185a3e186ac"],
+  ["eb95ad", "eb95a8e186ac"],
+  ["eb95ae", "e18484e185a3e186ad"],
+  ["eb95ae", "eb95a8e186ad"],
+  ["eb95af", "e18484e185a3e186ae"],
+  ["eb95af", "eb95a8e186ae"],
+  ["eb95b0", "e18484e185a3e186af"],
+  ["eb95b0", "eb95a8e186af"],
+  ["eb95b1", "e18484e185a3e186b0"],
+  ["eb95b1", "eb95a8e186b0"],
+  ["eb95b2", "e18484e185a3e186b1"],
+  ["eb95b2", "eb95a8e186b1"],
+  ["eb95b3", "e18484e185a3e186b2"],
+  ["eb95b3", "eb95a8e186b2"],
+  ["eb95b4", "e18484e185a3e186b3"],
+  ["eb95b4", "eb95a8e186b3"],
+  ["eb95b5", "e18484e185a3e186b4"],
+  ["eb95b5", "eb95a8e186b4"],
+  ["eb95b6", "e18484e185a3e186b5"],
+  ["eb95b6", "eb95a8e186b5"],
+  ["eb95b7", "e18484e185a3e186b6"],
+  ["eb95b7", "eb95a8e186b6"],
+  ["eb95b8", "e18484e185a3e186b7"],
+  ["eb95b8", "eb95a8e186b7"],
+  ["eb95b9", "e18484e185a3e186b8"],
+  ["eb95b9", "eb95a8e186b8"],
+  ["eb95ba", "e18484e185a3e186b9"],
+  ["eb95ba", "eb95a8e186b9"],
+  ["eb95bb", "e18484e185a3e186ba"],
+  ["eb95bb", "eb95a8e186ba"],
+  ["eb95bc", "e18484e185a3e186bb"],
+  ["eb95bc", "eb95a8e186bb"],
+  ["eb95bd", "e18484e185a3e186bc"],
+  ["eb95bd", "eb95a8e186bc"],
+  ["eb95be", "e18484e185a3e186bd"],
+  ["eb95be", "eb95a8e186bd"],
+  ["eb95bf", "e18484e185a3e186be"],
+  ["eb95bf", "eb95a8e186be"],
+  ["eb9680", "e18484e185a3e186bf"],
+  ["eb9680", "eb95a8e186bf"],
+  ["eb9681", "e18484e185a3e18780"],
+  ["eb9681", "eb95a8e18780"],
+  ["eb9682", "e18484e185a3e18781"],
+  ["eb9682", "eb95a8e18781"],
+  ["eb9683", "e18484e185a3e18782"],
+  ["eb9683", "eb95a8e18782"],
+  ["eb9684", "e18484e185a4"],
+  ["eb9685", "e18484e185a4e186a8"],
+  ["eb9685", "eb9684e186a8"],
+  ["eb9686", "e18484e185a4e186a9"],
+  ["eb9686", "eb9684e186a9"],
+  ["eb9687", "e18484e185a4e186aa"],
+  ["eb9687", "eb9684e186aa"],
+  ["eb9688", "e18484e185a4e186ab"],
+  ["eb9688", "eb9684e186ab"],
+  ["eb9689", "e18484e185a4e186ac"],
+  ["eb9689", "eb9684e186ac"],
+  ["eb968a", "e18484e185a4e186ad"],
+  ["eb968a", "eb9684e186ad"],
+  ["eb968b", "e18484e185a4e186ae"],
+  ["eb968b", "eb9684e186ae"],
+  ["eb968c", "e18484e185a4e186af"],
+  ["eb968c", "eb9684e186af"],
+  ["eb968d", "e18484e185a4e186b0"],
+  ["eb968d", "eb9684e186b0"],
+  ["eb968e", "e18484e185a4e186b1"],
+  ["eb968e", "eb9684e186b1"],
+  ["eb968f", "e18484e185a4e186b2"],
+  ["eb968f", "eb9684e186b2"],
+  ["eb9690", "e18484e185a4e186b3"],
+  ["eb9690", "eb9684e186b3"],
+  ["eb9691", "e18484e185a4e186b4"],
+  ["eb9691", "eb9684e186b4"],
+  ["eb9692", "e18484e185a4e186b5"],
+  ["eb9692", "eb9684e186b5"],
+  ["eb9693", "e18484e185a4e186b6"],
+  ["eb9693", "eb9684e186b6"],
+  ["eb9694", "e18484e185a4e186b7"],
+  ["eb9694", "eb9684e186b7"],
+  ["eb9695", "e18484e185a4e186b8"],
+  ["eb9695", "eb9684e186b8"],
+  ["eb9696", "e18484e185a4e186b9"],
+  ["eb9696", "eb9684e186b9"],
+  ["eb9697", "e18484e185a4e186ba"],
+  ["eb9697", "eb9684e186ba"],
+  ["eb9698", "e18484e185a4e186bb"],
+  ["eb9698", "eb9684e186bb"],
+  ["eb9699", "e18484e185a4e186bc"],
+  ["eb9699", "eb9684e186bc"],
+  ["eb969a", "e18484e185a4e186bd"],
+  ["eb969a", "eb9684e186bd"],
+  ["eb969b", "e18484e185a4e186be"],
+  ["eb969b", "eb9684e186be"],
+  ["eb969c", "e18484e185a4e186bf"],
+  ["eb969c", "eb9684e186bf"],
+  ["eb969d", "e18484e185a4e18780"],
+  ["eb969d", "eb9684e18780"],
+  ["eb969e", "e18484e185a4e18781"],
+  ["eb969e", "eb9684e18781"],
+  ["eb969f", "e18484e185a4e18782"],
+  ["eb969f", "eb9684e18782"],
+  ["eb96a0", "e18484e185a5"],
+  ["eb96a1", "e18484e185a5e186a8"],
+  ["eb96a1", "eb96a0e186a8"],
+  ["eb96a2", "e18484e185a5e186a9"],
+  ["eb96a2", "eb96a0e186a9"],
+  ["eb96a3", "e18484e185a5e186aa"],
+  ["eb96a3", "eb96a0e186aa"],
+  ["eb96a4", "e18484e185a5e186ab"],
+  ["eb96a4", "eb96a0e186ab"],
+  ["eb96a5", "e18484e185a5e186ac"],
+  ["eb96a5", "eb96a0e186ac"],
+  ["eb96a6", "e18484e185a5e186ad"],
+  ["eb96a6", "eb96a0e186ad"],
+  ["eb96a7", "e18484e185a5e186ae"],
+  ["eb96a7", "eb96a0e186ae"],
+  ["eb96a8", "e18484e185a5e186af"],
+  ["eb96a8", "eb96a0e186af"],
+  ["eb96a9", "e18484e185a5e186b0"],
+  ["eb96a9", "eb96a0e186b0"],
+  ["eb96aa", "e18484e185a5e186b1"],
+  ["eb96aa", "eb96a0e186b1"],
+  ["eb96ab", "e18484e185a5e186b2"],
+  ["eb96ab", "eb96a0e186b2"],
+  ["eb96ac", "e18484e185a5e186b3"],
+  ["eb96ac", "eb96a0e186b3"],
+  ["eb96ad", "e18484e185a5e186b4"],
+  ["eb96ad", "eb96a0e186b4"],
+  ["eb96ae", "e18484e185a5e186b5"],
+  ["eb96ae", "eb96a0e186b5"],
+  ["eb96af", "e18484e185a5e186b6"],
+  ["eb96af", "eb96a0e186b6"],
+  ["eb96b0", "e18484e185a5e186b7"],
+  ["eb96b0", "eb96a0e186b7"],
+  ["eb96b1", "e18484e185a5e186b8"],
+  ["eb96b1", "eb96a0e186b8"],
+  ["eb96b2", "e18484e185a5e186b9"],
+  ["eb96b2", "eb96a0e186b9"],
+  ["eb96b3", "e18484e185a5e186ba"],
+  ["eb96b3", "eb96a0e186ba"],
+  ["eb96b4", "e18484e185a5e186bb"],
+  ["eb96b4", "eb96a0e186bb"],
+  ["eb96b5", "e18484e185a5e186bc"],
+  ["eb96b5", "eb96a0e186bc"],
+  ["eb96b6", "e18484e185a5e186bd"],
+  ["eb96b6", "eb96a0e186bd"],
+  ["eb96b7", "e18484e185a5e186be"],
+  ["eb96b7", "eb96a0e186be"],
+  ["eb96b8", "e18484e185a5e186bf"],
+  ["eb96b8", "eb96a0e186bf"],
+  ["eb96b9", "e18484e185a5e18780"],
+  ["eb96b9", "eb96a0e18780"],
+  ["eb96ba", "e18484e185a5e18781"],
+  ["eb96ba", "eb96a0e18781"],
+  ["eb96bb", "e18484e185a5e18782"],
+  ["eb96bb", "eb96a0e18782"],
+  ["eb96bc", "e18484e185a6"],
+  ["eb96bd", "e18484e185a6e186a8"],
+  ["eb96bd", "eb96bce186a8"],
+  ["eb96be", "e18484e185a6e186a9"],
+  ["eb96be", "eb96bce186a9"],
+  ["eb96bf", "e18484e185a6e186aa"],
+  ["eb96bf", "eb96bce186aa"],
+  ["eb9780", "e18484e185a6e186ab"],
+  ["eb9780", "eb96bce186ab"],
+  ["eb9781", "e18484e185a6e186ac"],
+  ["eb9781", "eb96bce186ac"],
+  ["eb9782", "e18484e185a6e186ad"],
+  ["eb9782", "eb96bce186ad"],
+  ["eb9783", "e18484e185a6e186ae"],
+  ["eb9783", "eb96bce186ae"],
+  ["eb9784", "e18484e185a6e186af"],
+  ["eb9784", "eb96bce186af"],
+  ["eb9785", "e18484e185a6e186b0"],
+  ["eb9785", "eb96bce186b0"],
+  ["eb9786", "e18484e185a6e186b1"],
+  ["eb9786", "eb96bce186b1"],
+  ["eb9787", "e18484e185a6e186b2"],
+  ["eb9787", "eb96bce186b2"],
+  ["eb9788", "e18484e185a6e186b3"],
+  ["eb9788", "eb96bce186b3"],
+  ["eb9789", "e18484e185a6e186b4"],
+  ["eb9789", "eb96bce186b4"],
+  ["eb978a", "e18484e185a6e186b5"],
+  ["eb978a", "eb96bce186b5"],
+  ["eb978b", "e18484e185a6e186b6"],
+  ["eb978b", "eb96bce186b6"],
+  ["eb978c", "e18484e185a6e186b7"],
+  ["eb978c", "eb96bce186b7"],
+  ["eb978d", "e18484e185a6e186b8"],
+  ["eb978d", "eb96bce186b8"],
+  ["eb978e", "e18484e185a6e186b9"],
+  ["eb978e", "eb96bce186b9"],
+  ["eb978f", "e18484e185a6e186ba"],
+  ["eb978f", "eb96bce186ba"],
+  ["eb9790", "e18484e185a6e186bb"],
+  ["eb9790", "eb96bce186bb"],
+  ["eb9791", "e18484e185a6e186bc"],
+  ["eb9791", "eb96bce186bc"],
+  ["eb9792", "e18484e185a6e186bd"],
+  ["eb9792", "eb96bce186bd"],
+  ["eb9793", "e18484e185a6e186be"],
+  ["eb9793", "eb96bce186be"],
+  ["eb9794", "e18484e185a6e186bf"],
+  ["eb9794", "eb96bce186bf"],
+  ["eb9795", "e18484e185a6e18780"],
+  ["eb9795", "eb96bce18780"],
+  ["eb9796", "e18484e185a6e18781"],
+  ["eb9796", "eb96bce18781"],
+  ["eb9797", "e18484e185a6e18782"],
+  ["eb9797", "eb96bce18782"],
+  ["eb9798", "e18484e185a7"],
+  ["eb9799", "e18484e185a7e186a8"],
+  ["eb9799", "eb9798e186a8"],
+  ["eb979a", "e18484e185a7e186a9"],
+  ["eb979a", "eb9798e186a9"],
+  ["eb979b", "e18484e185a7e186aa"],
+  ["eb979b", "eb9798e186aa"],
+  ["eb979c", "e18484e185a7e186ab"],
+  ["eb979c", "eb9798e186ab"],
+  ["eb979d", "e18484e185a7e186ac"],
+  ["eb979d", "eb9798e186ac"],
+  ["eb979e", "e18484e185a7e186ad"],
+  ["eb979e", "eb9798e186ad"],
+  ["eb979f", "e18484e185a7e186ae"],
+  ["eb979f", "eb9798e186ae"],
+  ["eb97a0", "e18484e185a7e186af"],
+  ["eb97a0", "eb9798e186af"],
+  ["eb97a1", "e18484e185a7e186b0"],
+  ["eb97a1", "eb9798e186b0"],
+  ["eb97a2", "e18484e185a7e186b1"],
+  ["eb97a2", "eb9798e186b1"],
+  ["eb97a3", "e18484e185a7e186b2"],
+  ["eb97a3", "eb9798e186b2"],
+  ["eb97a4", "e18484e185a7e186b3"],
+  ["eb97a4", "eb9798e186b3"],
+  ["eb97a5", "e18484e185a7e186b4"],
+  ["eb97a5", "eb9798e186b4"],
+  ["eb97a6", "e18484e185a7e186b5"],
+  ["eb97a6", "eb9798e186b5"],
+  ["eb97a7", "e18484e185a7e186b6"],
+  ["eb97a7", "eb9798e186b6"],
+  ["eb97a8", "e18484e185a7e186b7"],
+  ["eb97a8", "eb9798e186b7"],
+  ["eb97a9", "e18484e185a7e186b8"],
+  ["eb97a9", "eb9798e186b8"],
+  ["eb97aa", "e18484e185a7e186b9"],
+  ["eb97aa", "eb9798e186b9"],
+  ["eb97ab", "e18484e185a7e186ba"],
+  ["eb97ab", "eb9798e186ba"],
+  ["eb97ac", "e18484e185a7e186bb"],
+  ["eb97ac", "eb9798e186bb"],
+  ["eb97ad", "e18484e185a7e186bc"],
+  ["eb97ad", "eb9798e186bc"],
+  ["eb97ae", "e18484e185a7e186bd"],
+  ["eb97ae", "eb9798e186bd"],
+  ["eb97af", "e18484e185a7e186be"],
+  ["eb97af", "eb9798e186be"],
+  ["eb97b0", "e18484e185a7e186bf"],
+  ["eb97b0", "eb9798e186bf"],
+  ["eb97b1", "e18484e185a7e18780"],
+  ["eb97b1", "eb9798e18780"],
+  ["eb97b2", "e18484e185a7e18781"],
+  ["eb97b2", "eb9798e18781"],
+  ["eb97b3", "e18484e185a7e18782"],
+  ["eb97b3", "eb9798e18782"],
+  ["eb97b4", "e18484e185a8"],
+  ["eb97b5", "e18484e185a8e186a8"],
+  ["eb97b5", "eb97b4e186a8"],
+  ["eb97b6", "e18484e185a8e186a9"],
+  ["eb97b6", "eb97b4e186a9"],
+  ["eb97b7", "e18484e185a8e186aa"],
+  ["eb97b7", "eb97b4e186aa"],
+  ["eb97b8", "e18484e185a8e186ab"],
+  ["eb97b8", "eb97b4e186ab"],
+  ["eb97b9", "e18484e185a8e186ac"],
+  ["eb97b9", "eb97b4e186ac"],
+  ["eb97ba", "e18484e185a8e186ad"],
+  ["eb97ba", "eb97b4e186ad"],
+  ["eb97bb", "e18484e185a8e186ae"],
+  ["eb97bb", "eb97b4e186ae"],
+  ["eb97bc", "e18484e185a8e186af"],
+  ["eb97bc", "eb97b4e186af"],
+  ["eb97bd", "e18484e185a8e186b0"],
+  ["eb97bd", "eb97b4e186b0"],
+  ["eb97be", "e18484e185a8e186b1"],
+  ["eb97be", "eb97b4e186b1"],
+  ["eb97bf", "e18484e185a8e186b2"],
+  ["eb97bf", "eb97b4e186b2"],
+  ["eb9880", "e18484e185a8e186b3"],
+  ["eb9880", "eb97b4e186b3"],
+  ["eb9881", "e18484e185a8e186b4"],
+  ["eb9881", "eb97b4e186b4"],
+  ["eb9882", "e18484e185a8e186b5"],
+  ["eb9882", "eb97b4e186b5"],
+  ["eb9883", "e18484e185a8e186b6"],
+  ["eb9883", "eb97b4e186b6"],
+  ["eb9884", "e18484e185a8e186b7"],
+  ["eb9884", "eb97b4e186b7"],
+  ["eb9885", "e18484e185a8e186b8"],
+  ["eb9885", "eb97b4e186b8"],
+  ["eb9886", "e18484e185a8e186b9"],
+  ["eb9886", "eb97b4e186b9"],
+  ["eb9887", "e18484e185a8e186ba"],
+  ["eb9887", "eb97b4e186ba"],
+  ["eb9888", "e18484e185a8e186bb"],
+  ["eb9888", "eb97b4e186bb"],
+  ["eb9889", "e18484e185a8e186bc"],
+  ["eb9889", "eb97b4e186bc"],
+  ["eb988a", "e18484e185a8e186bd"],
+  ["eb988a", "eb97b4e186bd"],
+  ["eb988b", "e18484e185a8e186be"],
+  ["eb988b", "eb97b4e186be"],
+  ["eb988c", "e18484e185a8e186bf"],
+  ["eb988c", "eb97b4e186bf"],
+  ["eb988d", "e18484e185a8e18780"],
+  ["eb988d", "eb97b4e18780"],
+  ["eb988e", "e18484e185a8e18781"],
+  ["eb988e", "eb97b4e18781"],
+  ["eb988f", "e18484e185a8e18782"],
+  ["eb988f", "eb97b4e18782"],
+  ["eb9890", "e18484e185a9"],
+  ["eb9891", "e18484e185a9e186a8"],
+  ["eb9891", "eb9890e186a8"],
+  ["eb9892", "e18484e185a9e186a9"],
+  ["eb9892", "eb9890e186a9"],
+  ["eb9893", "e18484e185a9e186aa"],
+  ["eb9893", "eb9890e186aa"],
+  ["eb9894", "e18484e185a9e186ab"],
+  ["eb9894", "eb9890e186ab"],
+  ["eb9895", "e18484e185a9e186ac"],
+  ["eb9895", "eb9890e186ac"],
+  ["eb9896", "e18484e185a9e186ad"],
+  ["eb9896", "eb9890e186ad"],
+  ["eb9897", "e18484e185a9e186ae"],
+  ["eb9897", "eb9890e186ae"],
+  ["eb9898", "e18484e185a9e186af"],
+  ["eb9898", "eb9890e186af"],
+  ["eb9899", "e18484e185a9e186b0"],
+  ["eb9899", "eb9890e186b0"],
+  ["eb989a", "e18484e185a9e186b1"],
+  ["eb989a", "eb9890e186b1"],
+  ["eb989b", "e18484e185a9e186b2"],
+  ["eb989b", "eb9890e186b2"],
+  ["eb989c", "e18484e185a9e186b3"],
+  ["eb989c", "eb9890e186b3"],
+  ["eb989d", "e18484e185a9e186b4"],
+  ["eb989d", "eb9890e186b4"],
+  ["eb989e", "e18484e185a9e186b5"],
+  ["eb989e", "eb9890e186b5"],
+  ["eb989f", "e18484e185a9e186b6"],
+  ["eb989f", "eb9890e186b6"],
+  ["eb98a0", "e18484e185a9e186b7"],
+  ["eb98a0", "eb9890e186b7"],
+  ["eb98a1", "e18484e185a9e186b8"],
+  ["eb98a1", "eb9890e186b8"],
+  ["eb98a2", "e18484e185a9e186b9"],
+  ["eb98a2", "eb9890e186b9"],
+  ["eb98a3", "e18484e185a9e186ba"],
+  ["eb98a3", "eb9890e186ba"],
+  ["eb98a4", "e18484e185a9e186bb"],
+  ["eb98a4", "eb9890e186bb"],
+  ["eb98a5", "e18484e185a9e186bc"],
+  ["eb98a5", "eb9890e186bc"],
+  ["eb98a6", "e18484e185a9e186bd"],
+  ["eb98a6", "eb9890e186bd"],
+  ["eb98a7", "e18484e185a9e186be"],
+  ["eb98a7", "eb9890e186be"],
+  ["eb98a8", "e18484e185a9e186bf"],
+  ["eb98a8", "eb9890e186bf"],
+  ["eb98a9", "e18484e185a9e18780"],
+  ["eb98a9", "eb9890e18780"],
+  ["eb98aa", "e18484e185a9e18781"],
+  ["eb98aa", "eb9890e18781"],
+  ["eb98ab", "e18484e185a9e18782"],
+  ["eb98ab", "eb9890e18782"],
+  ["eb98ac", "e18484e185aa"],
+  ["eb98ad", "e18484e185aae186a8"],
+  ["eb98ad", "eb98ace186a8"],
+  ["eb98ae", "e18484e185aae186a9"],
+  ["eb98ae", "eb98ace186a9"],
+  ["eb98af", "e18484e185aae186aa"],
+  ["eb98af", "eb98ace186aa"],
+  ["eb98b0", "e18484e185aae186ab"],
+  ["eb98b0", "eb98ace186ab"],
+  ["eb98b1", "e18484e185aae186ac"],
+  ["eb98b1", "eb98ace186ac"],
+  ["eb98b2", "e18484e185aae186ad"],
+  ["eb98b2", "eb98ace186ad"],
+  ["eb98b3", "e18484e185aae186ae"],
+  ["eb98b3", "eb98ace186ae"],
+  ["eb98b4", "e18484e185aae186af"],
+  ["eb98b4", "eb98ace186af"],
+  ["eb98b5", "e18484e185aae186b0"],
+  ["eb98b5", "eb98ace186b0"],
+  ["eb98b6", "e18484e185aae186b1"],
+  ["eb98b6", "eb98ace186b1"],
+  ["eb98b7", "e18484e185aae186b2"],
+  ["eb98b7", "eb98ace186b2"],
+  ["eb98b8", "e18484e185aae186b3"],
+  ["eb98b8", "eb98ace186b3"],
+  ["eb98b9", "e18484e185aae186b4"],
+  ["eb98b9", "eb98ace186b4"],
+  ["eb98ba", "e18484e185aae186b5"],
+  ["eb98ba", "eb98ace186b5"],
+  ["eb98bb", "e18484e185aae186b6"],
+  ["eb98bb", "eb98ace186b6"],
+  ["eb98bc", "e18484e185aae186b7"],
+  ["eb98bc", "eb98ace186b7"],
+  ["eb98bd", "e18484e185aae186b8"],
+  ["eb98bd", "eb98ace186b8"],
+  ["eb98be", "e18484e185aae186b9"],
+  ["eb98be", "eb98ace186b9"],
+  ["eb98bf", "e18484e185aae186ba"],
+  ["eb98bf", "eb98ace186ba"],
+  ["eb9980", "e18484e185aae186bb"],
+  ["eb9980", "eb98ace186bb"],
+  ["eb9981", "e18484e185aae186bc"],
+  ["eb9981", "eb98ace186bc"],
+  ["eb9982", "e18484e185aae186bd"],
+  ["eb9982", "eb98ace186bd"],
+  ["eb9983", "e18484e185aae186be"],
+  ["eb9983", "eb98ace186be"],
+  ["eb9984", "e18484e185aae186bf"],
+  ["eb9984", "eb98ace186bf"],
+  ["eb9985", "e18484e185aae18780"],
+  ["eb9985", "eb98ace18780"],
+  ["eb9986", "e18484e185aae18781"],
+  ["eb9986", "eb98ace18781"],
+  ["eb9987", "e18484e185aae18782"],
+  ["eb9987", "eb98ace18782"],
+  ["eb9988", "e18484e185ab"],
+  ["eb9989", "e18484e185abe186a8"],
+  ["eb9989", "eb9988e186a8"],
+  ["eb998a", "e18484e185abe186a9"],
+  ["eb998a", "eb9988e186a9"],
+  ["eb998b", "e18484e185abe186aa"],
+  ["eb998b", "eb9988e186aa"],
+  ["eb998c", "e18484e185abe186ab"],
+  ["eb998c", "eb9988e186ab"],
+  ["eb998d", "e18484e185abe186ac"],
+  ["eb998d", "eb9988e186ac"],
+  ["eb998e", "e18484e185abe186ad"],
+  ["eb998e", "eb9988e186ad"],
+  ["eb998f", "e18484e185abe186ae"],
+  ["eb998f", "eb9988e186ae"],
+  ["eb9990", "e18484e185abe186af"],
+  ["eb9990", "eb9988e186af"],
+  ["eb9991", "e18484e185abe186b0"],
+  ["eb9991", "eb9988e186b0"],
+  ["eb9992", "e18484e185abe186b1"],
+  ["eb9992", "eb9988e186b1"],
+  ["eb9993", "e18484e185abe186b2"],
+  ["eb9993", "eb9988e186b2"],
+  ["eb9994", "e18484e185abe186b3"],
+  ["eb9994", "eb9988e186b3"],
+  ["eb9995", "e18484e185abe186b4"],
+  ["eb9995", "eb9988e186b4"],
+  ["eb9996", "e18484e185abe186b5"],
+  ["eb9996", "eb9988e186b5"],
+  ["eb9997", "e18484e185abe186b6"],
+  ["eb9997", "eb9988e186b6"],
+  ["eb9998", "e18484e185abe186b7"],
+  ["eb9998", "eb9988e186b7"],
+  ["eb9999", "e18484e185abe186b8"],
+  ["eb9999", "eb9988e186b8"],
+  ["eb999a", "e18484e185abe186b9"],
+  ["eb999a", "eb9988e186b9"],
+  ["eb999b", "e18484e185abe186ba"],
+  ["eb999b", "eb9988e186ba"],
+  ["eb999c", "e18484e185abe186bb"],
+  ["eb999c", "eb9988e186bb"],
+  ["eb999d", "e18484e185abe186bc"],
+  ["eb999d", "eb9988e186bc"],
+  ["eb999e", "e18484e185abe186bd"],
+  ["eb999e", "eb9988e186bd"],
+  ["eb999f", "e18484e185abe186be"],
+  ["eb999f", "eb9988e186be"],
+  ["eb99a0", "e18484e185abe186bf"],
+  ["eb99a0", "eb9988e186bf"],
+  ["eb99a1", "e18484e185abe18780"],
+  ["eb99a1", "eb9988e18780"],
+  ["eb99a2", "e18484e185abe18781"],
+  ["eb99a2", "eb9988e18781"],
+  ["eb99a3", "e18484e185abe18782"],
+  ["eb99a3", "eb9988e18782"],
+  ["eb99a4", "e18484e185ac"],
+  ["eb99a5", "e18484e185ace186a8"],
+  ["eb99a5", "eb99a4e186a8"],
+  ["eb99a6", "e18484e185ace186a9"],
+  ["eb99a6", "eb99a4e186a9"],
+  ["eb99a7", "e18484e185ace186aa"],
+  ["eb99a7", "eb99a4e186aa"],
+  ["eb99a8", "e18484e185ace186ab"],
+  ["eb99a8", "eb99a4e186ab"],
+  ["eb99a9", "e18484e185ace186ac"],
+  ["eb99a9", "eb99a4e186ac"],
+  ["eb99aa", "e18484e185ace186ad"],
+  ["eb99aa", "eb99a4e186ad"],
+  ["eb99ab", "e18484e185ace186ae"],
+  ["eb99ab", "eb99a4e186ae"],
+  ["eb99ac", "e18484e185ace186af"],
+  ["eb99ac", "eb99a4e186af"],
+  ["eb99ad", "e18484e185ace186b0"],
+  ["eb99ad", "eb99a4e186b0"],
+  ["eb99ae", "e18484e185ace186b1"],
+  ["eb99ae", "eb99a4e186b1"],
+  ["eb99af", "e18484e185ace186b2"],
+  ["eb99af", "eb99a4e186b2"],
+  ["eb99b0", "e18484e185ace186b3"],
+  ["eb99b0", "eb99a4e186b3"],
+  ["eb99b1", "e18484e185ace186b4"],
+  ["eb99b1", "eb99a4e186b4"],
+  ["eb99b2", "e18484e185ace186b5"],
+  ["eb99b2", "eb99a4e186b5"],
+  ["eb99b3", "e18484e185ace186b6"],
+  ["eb99b3", "eb99a4e186b6"],
+  ["eb99b4", "e18484e185ace186b7"],
+  ["eb99b4", "eb99a4e186b7"],
+  ["eb99b5", "e18484e185ace186b8"],
+  ["eb99b5", "eb99a4e186b8"],
+  ["eb99b6", "e18484e185ace186b9"],
+  ["eb99b6", "eb99a4e186b9"],
+  ["eb99b7", "e18484e185ace186ba"],
+  ["eb99b7", "eb99a4e186ba"],
+  ["eb99b8", "e18484e185ace186bb"],
+  ["eb99b8", "eb99a4e186bb"],
+  ["eb99b9", "e18484e185ace186bc"],
+  ["eb99b9", "eb99a4e186bc"],
+  ["eb99ba", "e18484e185ace186bd"],
+  ["eb99ba", "eb99a4e186bd"],
+  ["eb99bb", "e18484e185ace186be"],
+  ["eb99bb", "eb99a4e186be"],
+  ["eb99bc", "e18484e185ace186bf"],
+  ["eb99bc", "eb99a4e186bf"],
+  ["eb99bd", "e18484e185ace18780"],
+  ["eb99bd", "eb99a4e18780"],
+  ["eb99be", "e18484e185ace18781"],
+  ["eb99be", "eb99a4e18781"],
+  ["eb99bf", "e18484e185ace18782"],
+  ["eb99bf", "eb99a4e18782"],
+  ["eb9a80", "e18484e185ad"],
+  ["eb9a81", "e18484e185ade186a8"],
+  ["eb9a81", "eb9a80e186a8"],
+  ["eb9a82", "e18484e185ade186a9"],
+  ["eb9a82", "eb9a80e186a9"],
+  ["eb9a83", "e18484e185ade186aa"],
+  ["eb9a83", "eb9a80e186aa"],
+  ["eb9a84", "e18484e185ade186ab"],
+  ["eb9a84", "eb9a80e186ab"],
+  ["eb9a85", "e18484e185ade186ac"],
+  ["eb9a85", "eb9a80e186ac"],
+  ["eb9a86", "e18484e185ade186ad"],
+  ["eb9a86", "eb9a80e186ad"],
+  ["eb9a87", "e18484e185ade186ae"],
+  ["eb9a87", "eb9a80e186ae"],
+  ["eb9a88", "e18484e185ade186af"],
+  ["eb9a88", "eb9a80e186af"],
+  ["eb9a89", "e18484e185ade186b0"],
+  ["eb9a89", "eb9a80e186b0"],
+  ["eb9a8a", "e18484e185ade186b1"],
+  ["eb9a8a", "eb9a80e186b1"],
+  ["eb9a8b", "e18484e185ade186b2"],
+  ["eb9a8b", "eb9a80e186b2"],
+  ["eb9a8c", "e18484e185ade186b3"],
+  ["eb9a8c", "eb9a80e186b3"],
+  ["eb9a8d", "e18484e185ade186b4"],
+  ["eb9a8d", "eb9a80e186b4"],
+  ["eb9a8e", "e18484e185ade186b5"],
+  ["eb9a8e", "eb9a80e186b5"],
+  ["eb9a8f", "e18484e185ade186b6"],
+  ["eb9a8f", "eb9a80e186b6"],
+  ["eb9a90", "e18484e185ade186b7"],
+  ["eb9a90", "eb9a80e186b7"],
+  ["eb9a91", "e18484e185ade186b8"],
+  ["eb9a91", "eb9a80e186b8"],
+  ["eb9a92", "e18484e185ade186b9"],
+  ["eb9a92", "eb9a80e186b9"],
+  ["eb9a93", "e18484e185ade186ba"],
+  ["eb9a93", "eb9a80e186ba"],
+  ["eb9a94", "e18484e185ade186bb"],
+  ["eb9a94", "eb9a80e186bb"],
+  ["eb9a95", "e18484e185ade186bc"],
+  ["eb9a95", "eb9a80e186bc"],
+  ["eb9a96", "e18484e185ade186bd"],
+  ["eb9a96", "eb9a80e186bd"],
+  ["eb9a97", "e18484e185ade186be"],
+  ["eb9a97", "eb9a80e186be"],
+  ["eb9a98", "e18484e185ade186bf"],
+  ["eb9a98", "eb9a80e186bf"],
+  ["eb9a99", "e18484e185ade18780"],
+  ["eb9a99", "eb9a80e18780"],
+  ["eb9a9a", "e18484e185ade18781"],
+  ["eb9a9a", "eb9a80e18781"],
+  ["eb9a9b", "e18484e185ade18782"],
+  ["eb9a9b", "eb9a80e18782"],
+  ["eb9a9c", "e18484e185ae"],
+  ["eb9a9d", "e18484e185aee186a8"],
+  ["eb9a9d", "eb9a9ce186a8"],
+  ["eb9a9e", "e18484e185aee186a9"],
+  ["eb9a9e", "eb9a9ce186a9"],
+  ["eb9a9f", "e18484e185aee186aa"],
+  ["eb9a9f", "eb9a9ce186aa"],
+  ["eb9aa0", "e18484e185aee186ab"],
+  ["eb9aa0", "eb9a9ce186ab"],
+  ["eb9aa1", "e18484e185aee186ac"],
+  ["eb9aa1", "eb9a9ce186ac"],
+  ["eb9aa2", "e18484e185aee186ad"],
+  ["eb9aa2", "eb9a9ce186ad"],
+  ["eb9aa3", "e18484e185aee186ae"],
+  ["eb9aa3", "eb9a9ce186ae"],
+  ["eb9aa4", "e18484e185aee186af"],
+  ["eb9aa4", "eb9a9ce186af"],
+  ["eb9aa5", "e18484e185aee186b0"],
+  ["eb9aa5", "eb9a9ce186b0"],
+  ["eb9aa6", "e18484e185aee186b1"],
+  ["eb9aa6", "eb9a9ce186b1"],
+  ["eb9aa7", "e18484e185aee186b2"],
+  ["eb9aa7", "eb9a9ce186b2"],
+  ["eb9aa8", "e18484e185aee186b3"],
+  ["eb9aa8", "eb9a9ce186b3"],
+  ["eb9aa9", "e18484e185aee186b4"],
+  ["eb9aa9", "eb9a9ce186b4"],
+  ["eb9aaa", "e18484e185aee186b5"],
+  ["eb9aaa", "eb9a9ce186b5"],
+  ["eb9aab", "e18484e185aee186b6"],
+  ["eb9aab", "eb9a9ce186b6"],
+  ["eb9aac", "e18484e185aee186b7"],
+  ["eb9aac", "eb9a9ce186b7"],
+  ["eb9aad", "e18484e185aee186b8"],
+  ["eb9aad", "eb9a9ce186b8"],
+  ["eb9aae", "e18484e185aee186b9"],
+  ["eb9aae", "eb9a9ce186b9"],
+  ["eb9aaf", "e18484e185aee186ba"],
+  ["eb9aaf", "eb9a9ce186ba"],
+  ["eb9ab0", "e18484e185aee186bb"],
+  ["eb9ab0", "eb9a9ce186bb"],
+  ["eb9ab1", "e18484e185aee186bc"],
+  ["eb9ab1", "eb9a9ce186bc"],
+  ["eb9ab2", "e18484e185aee186bd"],
+  ["eb9ab2", "eb9a9ce186bd"],
+  ["eb9ab3", "e18484e185aee186be"],
+  ["eb9ab3", "eb9a9ce186be"],
+  ["eb9ab4", "e18484e185aee186bf"],
+  ["eb9ab4", "eb9a9ce186bf"],
+  ["eb9ab5", "e18484e185aee18780"],
+  ["eb9ab5", "eb9a9ce18780"],
+  ["eb9ab6", "e18484e185aee18781"],
+  ["eb9ab6", "eb9a9ce18781"],
+  ["eb9ab7", "e18484e185aee18782"],
+  ["eb9ab7", "eb9a9ce18782"],
+  ["eb9ab8", "e18484e185af"],
+  ["eb9ab9", "e18484e185afe186a8"],
+  ["eb9ab9", "eb9ab8e186a8"],
+  ["eb9aba", "e18484e185afe186a9"],
+  ["eb9aba", "eb9ab8e186a9"],
+  ["eb9abb", "e18484e185afe186aa"],
+  ["eb9abb", "eb9ab8e186aa"],
+  ["eb9abc", "e18484e185afe186ab"],
+  ["eb9abc", "eb9ab8e186ab"],
+  ["eb9abd", "e18484e185afe186ac"],
+  ["eb9abd", "eb9ab8e186ac"],
+  ["eb9abe", "e18484e185afe186ad"],
+  ["eb9abe", "eb9ab8e186ad"],
+  ["eb9abf", "e18484e185afe186ae"],
+  ["eb9abf", "eb9ab8e186ae"],
+  ["eb9b80", "e18484e185afe186af"],
+  ["eb9b80", "eb9ab8e186af"],
+  ["eb9b81", "e18484e185afe186b0"],
+  ["eb9b81", "eb9ab8e186b0"],
+  ["eb9b82", "e18484e185afe186b1"],
+  ["eb9b82", "eb9ab8e186b1"],
+  ["eb9b83", "e18484e185afe186b2"],
+  ["eb9b83", "eb9ab8e186b2"],
+  ["eb9b84", "e18484e185afe186b3"],
+  ["eb9b84", "eb9ab8e186b3"],
+  ["eb9b85", "e18484e185afe186b4"],
+  ["eb9b85", "eb9ab8e186b4"],
+  ["eb9b86", "e18484e185afe186b5"],
+  ["eb9b86", "eb9ab8e186b5"],
+  ["eb9b87", "e18484e185afe186b6"],
+  ["eb9b87", "eb9ab8e186b6"],
+  ["eb9b88", "e18484e185afe186b7"],
+  ["eb9b88", "eb9ab8e186b7"],
+  ["eb9b89", "e18484e185afe186b8"],
+  ["eb9b89", "eb9ab8e186b8"],
+  ["eb9b8a", "e18484e185afe186b9"],
+  ["eb9b8a", "eb9ab8e186b9"],
+  ["eb9b8b", "e18484e185afe186ba"],
+  ["eb9b8b", "eb9ab8e186ba"],
+  ["eb9b8c", "e18484e185afe186bb"],
+  ["eb9b8c", "eb9ab8e186bb"],
+  ["eb9b8d", "e18484e185afe186bc"],
+  ["eb9b8d", "eb9ab8e186bc"],
+  ["eb9b8e", "e18484e185afe186bd"],
+  ["eb9b8e", "eb9ab8e186bd"],
+  ["eb9b8f", "e18484e185afe186be"],
+  ["eb9b8f", "eb9ab8e186be"],
+  ["eb9b90", "e18484e185afe186bf"],
+  ["eb9b90", "eb9ab8e186bf"],
+  ["eb9b91", "e18484e185afe18780"],
+  ["eb9b91", "eb9ab8e18780"],
+  ["eb9b92", "e18484e185afe18781"],
+  ["eb9b92", "eb9ab8e18781"],
+  ["eb9b93", "e18484e185afe18782"],
+  ["eb9b93", "eb9ab8e18782"],
+  ["eb9b94", "e18484e185b0"],
+  ["eb9b95", "e18484e185b0e186a8"],
+  ["eb9b95", "eb9b94e186a8"],
+  ["eb9b96", "e18484e185b0e186a9"],
+  ["eb9b96", "eb9b94e186a9"],
+  ["eb9b97", "e18484e185b0e186aa"],
+  ["eb9b97", "eb9b94e186aa"],
+  ["eb9b98", "e18484e185b0e186ab"],
+  ["eb9b98", "eb9b94e186ab"],
+  ["eb9b99", "e18484e185b0e186ac"],
+  ["eb9b99", "eb9b94e186ac"],
+  ["eb9b9a", "e18484e185b0e186ad"],
+  ["eb9b9a", "eb9b94e186ad"],
+  ["eb9b9b", "e18484e185b0e186ae"],
+  ["eb9b9b", "eb9b94e186ae"],
+  ["eb9b9c", "e18484e185b0e186af"],
+  ["eb9b9c", "eb9b94e186af"],
+  ["eb9b9d", "e18484e185b0e186b0"],
+  ["eb9b9d", "eb9b94e186b0"],
+  ["eb9b9e", "e18484e185b0e186b1"],
+  ["eb9b9e", "eb9b94e186b1"],
+  ["eb9b9f", "e18484e185b0e186b2"],
+  ["eb9b9f", "eb9b94e186b2"],
+  ["eb9ba0", "e18484e185b0e186b3"],
+  ["eb9ba0", "eb9b94e186b3"],
+  ["eb9ba1", "e18484e185b0e186b4"],
+  ["eb9ba1", "eb9b94e186b4"],
+  ["eb9ba2", "e18484e185b0e186b5"],
+  ["eb9ba2", "eb9b94e186b5"],
+  ["eb9ba3", "e18484e185b0e186b6"],
+  ["eb9ba3", "eb9b94e186b6"],
+  ["eb9ba4", "e18484e185b0e186b7"],
+  ["eb9ba4", "eb9b94e186b7"],
+  ["eb9ba5", "e18484e185b0e186b8"],
+  ["eb9ba5", "eb9b94e186b8"],
+  ["eb9ba6", "e18484e185b0e186b9"],
+  ["eb9ba6", "eb9b94e186b9"],
+  ["eb9ba7", "e18484e185b0e186ba"],
+  ["eb9ba7", "eb9b94e186ba"],
+  ["eb9ba8", "e18484e185b0e186bb"],
+  ["eb9ba8", "eb9b94e186bb"],
+  ["eb9ba9", "e18484e185b0e186bc"],
+  ["eb9ba9", "eb9b94e186bc"],
+  ["eb9baa", "e18484e185b0e186bd"],
+  ["eb9baa", "eb9b94e186bd"],
+  ["eb9bab", "e18484e185b0e186be"],
+  ["eb9bab", "eb9b94e186be"],
+  ["eb9bac", "e18484e185b0e186bf"],
+  ["eb9bac", "eb9b94e186bf"],
+  ["eb9bad", "e18484e185b0e18780"],
+  ["eb9bad", "eb9b94e18780"],
+  ["eb9bae", "e18484e185b0e18781"],
+  ["eb9bae", "eb9b94e18781"],
+  ["eb9baf", "e18484e185b0e18782"],
+  ["eb9baf", "eb9b94e18782"],
+  ["eb9bb0", "e18484e185b1"],
+  ["eb9bb1", "e18484e185b1e186a8"],
+  ["eb9bb1", "eb9bb0e186a8"],
+  ["eb9bb2", "e18484e185b1e186a9"],
+  ["eb9bb2", "eb9bb0e186a9"],
+  ["eb9bb3", "e18484e185b1e186aa"],
+  ["eb9bb3", "eb9bb0e186aa"],
+  ["eb9bb4", "e18484e185b1e186ab"],
+  ["eb9bb4", "eb9bb0e186ab"],
+  ["eb9bb5", "e18484e185b1e186ac"],
+  ["eb9bb5", "eb9bb0e186ac"],
+  ["eb9bb6", "e18484e185b1e186ad"],
+  ["eb9bb6", "eb9bb0e186ad"],
+  ["eb9bb7", "e18484e185b1e186ae"],
+  ["eb9bb7", "eb9bb0e186ae"],
+  ["eb9bb8", "e18484e185b1e186af"],
+  ["eb9bb8", "eb9bb0e186af"],
+  ["eb9bb9", "e18484e185b1e186b0"],
+  ["eb9bb9", "eb9bb0e186b0"],
+  ["eb9bba", "e18484e185b1e186b1"],
+  ["eb9bba", "eb9bb0e186b1"],
+  ["eb9bbb", "e18484e185b1e186b2"],
+  ["eb9bbb", "eb9bb0e186b2"],
+  ["eb9bbc", "e18484e185b1e186b3"],
+  ["eb9bbc", "eb9bb0e186b3"],
+  ["eb9bbd", "e18484e185b1e186b4"],
+  ["eb9bbd", "eb9bb0e186b4"],
+  ["eb9bbe", "e18484e185b1e186b5"],
+  ["eb9bbe", "eb9bb0e186b5"],
+  ["eb9bbf", "e18484e185b1e186b6"],
+  ["eb9bbf", "eb9bb0e186b6"],
+  ["eb9c80", "e18484e185b1e186b7"],
+  ["eb9c80", "eb9bb0e186b7"],
+  ["eb9c81", "e18484e185b1e186b8"],
+  ["eb9c81", "eb9bb0e186b8"],
+  ["eb9c82", "e18484e185b1e186b9"],
+  ["eb9c82", "eb9bb0e186b9"],
+  ["eb9c83", "e18484e185b1e186ba"],
+  ["eb9c83", "eb9bb0e186ba"],
+  ["eb9c84", "e18484e185b1e186bb"],
+  ["eb9c84", "eb9bb0e186bb"],
+  ["eb9c85", "e18484e185b1e186bc"],
+  ["eb9c85", "eb9bb0e186bc"],
+  ["eb9c86", "e18484e185b1e186bd"],
+  ["eb9c86", "eb9bb0e186bd"],
+  ["eb9c87", "e18484e185b1e186be"],
+  ["eb9c87", "eb9bb0e186be"],
+  ["eb9c88", "e18484e185b1e186bf"],
+  ["eb9c88", "eb9bb0e186bf"],
+  ["eb9c89", "e18484e185b1e18780"],
+  ["eb9c89", "eb9bb0e18780"],
+  ["eb9c8a", "e18484e185b1e18781"],
+  ["eb9c8a", "eb9bb0e18781"],
+  ["eb9c8b", "e18484e185b1e18782"],
+  ["eb9c8b", "eb9bb0e18782"],
+  ["eb9c8c", "e18484e185b2"],
+  ["eb9c8d", "e18484e185b2e186a8"],
+  ["eb9c8d", "eb9c8ce186a8"],
+  ["eb9c8e", "e18484e185b2e186a9"],
+  ["eb9c8e", "eb9c8ce186a9"],
+  ["eb9c8f", "e18484e185b2e186aa"],
+  ["eb9c8f", "eb9c8ce186aa"],
+  ["eb9c90", "e18484e185b2e186ab"],
+  ["eb9c90", "eb9c8ce186ab"],
+  ["eb9c91", "e18484e185b2e186ac"],
+  ["eb9c91", "eb9c8ce186ac"],
+  ["eb9c92", "e18484e185b2e186ad"],
+  ["eb9c92", "eb9c8ce186ad"],
+  ["eb9c93", "e18484e185b2e186ae"],
+  ["eb9c93", "eb9c8ce186ae"],
+  ["eb9c94", "e18484e185b2e186af"],
+  ["eb9c94", "eb9c8ce186af"],
+  ["eb9c95", "e18484e185b2e186b0"],
+  ["eb9c95", "eb9c8ce186b0"],
+  ["eb9c96", "e18484e185b2e186b1"],
+  ["eb9c96", "eb9c8ce186b1"],
+  ["eb9c97", "e18484e185b2e186b2"],
+  ["eb9c97", "eb9c8ce186b2"],
+  ["eb9c98", "e18484e185b2e186b3"],
+  ["eb9c98", "eb9c8ce186b3"],
+  ["eb9c99", "e18484e185b2e186b4"],
+  ["eb9c99", "eb9c8ce186b4"],
+  ["eb9c9a", "e18484e185b2e186b5"],
+  ["eb9c9a", "eb9c8ce186b5"],
+  ["eb9c9b", "e18484e185b2e186b6"],
+  ["eb9c9b", "eb9c8ce186b6"],
+  ["eb9c9c", "e18484e185b2e186b7"],
+  ["eb9c9c", "eb9c8ce186b7"],
+  ["eb9c9d", "e18484e185b2e186b8"],
+  ["eb9c9d", "eb9c8ce186b8"],
+  ["eb9c9e", "e18484e185b2e186b9"],
+  ["eb9c9e", "eb9c8ce186b9"],
+  ["eb9c9f", "e18484e185b2e186ba"],
+  ["eb9c9f", "eb9c8ce186ba"],
+  ["eb9ca0", "e18484e185b2e186bb"],
+  ["eb9ca0", "eb9c8ce186bb"],
+  ["eb9ca1", "e18484e185b2e186bc"],
+  ["eb9ca1", "eb9c8ce186bc"],
+  ["eb9ca2", "e18484e185b2e186bd"],
+  ["eb9ca2", "eb9c8ce186bd"],
+  ["eb9ca3", "e18484e185b2e186be"],
+  ["eb9ca3", "eb9c8ce186be"],
+  ["eb9ca4", "e18484e185b2e186bf"],
+  ["eb9ca4", "eb9c8ce186bf"],
+  ["eb9ca5", "e18484e185b2e18780"],
+  ["eb9ca5", "eb9c8ce18780"],
+  ["eb9ca6", "e18484e185b2e18781"],
+  ["eb9ca6", "eb9c8ce18781"],
+  ["eb9ca7", "e18484e185b2e18782"],
+  ["eb9ca7", "eb9c8ce18782"],
+  ["eb9ca8", "e18484e185b3"],
+  ["eb9ca9", "e18484e185b3e186a8"],
+  ["eb9ca9", "eb9ca8e186a8"],
+  ["eb9caa", "e18484e185b3e186a9"],
+  ["eb9caa", "eb9ca8e186a9"],
+  ["eb9cab", "e18484e185b3e186aa"],
+  ["eb9cab", "eb9ca8e186aa"],
+  ["eb9cac", "e18484e185b3e186ab"],
+  ["eb9cac", "eb9ca8e186ab"],
+  ["eb9cad", "e18484e185b3e186ac"],
+  ["eb9cad", "eb9ca8e186ac"],
+  ["eb9cae", "e18484e185b3e186ad"],
+  ["eb9cae", "eb9ca8e186ad"],
+  ["eb9caf", "e18484e185b3e186ae"],
+  ["eb9caf", "eb9ca8e186ae"],
+  ["eb9cb0", "e18484e185b3e186af"],
+  ["eb9cb0", "eb9ca8e186af"],
+  ["eb9cb1", "e18484e185b3e186b0"],
+  ["eb9cb1", "eb9ca8e186b0"],
+  ["eb9cb2", "e18484e185b3e186b1"],
+  ["eb9cb2", "eb9ca8e186b1"],
+  ["eb9cb3", "e18484e185b3e186b2"],
+  ["eb9cb3", "eb9ca8e186b2"],
+  ["eb9cb4", "e18484e185b3e186b3"],
+  ["eb9cb4", "eb9ca8e186b3"],
+  ["eb9cb5", "e18484e185b3e186b4"],
+  ["eb9cb5", "eb9ca8e186b4"],
+  ["eb9cb6", "e18484e185b3e186b5"],
+  ["eb9cb6", "eb9ca8e186b5"],
+  ["eb9cb7", "e18484e185b3e186b6"],
+  ["eb9cb7", "eb9ca8e186b6"],
+  ["eb9cb8", "e18484e185b3e186b7"],
+  ["eb9cb8", "eb9ca8e186b7"],
+  ["eb9cb9", "e18484e185b3e186b8"],
+  ["eb9cb9", "eb9ca8e186b8"],
+  ["eb9cba", "e18484e185b3e186b9"],
+  ["eb9cba", "eb9ca8e186b9"],
+  ["eb9cbb", "e18484e185b3e186ba"],
+  ["eb9cbb", "eb9ca8e186ba"],
+  ["eb9cbc", "e18484e185b3e186bb"],
+  ["eb9cbc", "eb9ca8e186bb"],
+  ["eb9cbd", "e18484e185b3e186bc"],
+  ["eb9cbd", "eb9ca8e186bc"],
+  ["eb9cbe", "e18484e185b3e186bd"],
+  ["eb9cbe", "eb9ca8e186bd"],
+  ["eb9cbf", "e18484e185b3e186be"],
+  ["eb9cbf", "eb9ca8e186be"],
+  ["eb9d80", "e18484e185b3e186bf"],
+  ["eb9d80", "eb9ca8e186bf"],
+  ["eb9d81", "e18484e185b3e18780"],
+  ["eb9d81", "eb9ca8e18780"],
+  ["eb9d82", "e18484e185b3e18781"],
+  ["eb9d82", "eb9ca8e18781"],
+  ["eb9d83", "e18484e185b3e18782"],
+  ["eb9d83", "eb9ca8e18782"],
+  ["eb9d84", "e18484e185b4"],
+  ["eb9d85", "e18484e185b4e186a8"],
+  ["eb9d85", "eb9d84e186a8"],
+  ["eb9d86", "e18484e185b4e186a9"],
+  ["eb9d86", "eb9d84e186a9"],
+  ["eb9d87", "e18484e185b4e186aa"],
+  ["eb9d87", "eb9d84e186aa"],
+  ["eb9d88", "e18484e185b4e186ab"],
+  ["eb9d88", "eb9d84e186ab"],
+  ["eb9d89", "e18484e185b4e186ac"],
+  ["eb9d89", "eb9d84e186ac"],
+  ["eb9d8a", "e18484e185b4e186ad"],
+  ["eb9d8a", "eb9d84e186ad"],
+  ["eb9d8b", "e18484e185b4e186ae"],
+  ["eb9d8b", "eb9d84e186ae"],
+  ["eb9d8c", "e18484e185b4e186af"],
+  ["eb9d8c", "eb9d84e186af"],
+  ["eb9d8d", "e18484e185b4e186b0"],
+  ["eb9d8d", "eb9d84e186b0"],
+  ["eb9d8e", "e18484e185b4e186b1"],
+  ["eb9d8e", "eb9d84e186b1"],
+  ["eb9d8f", "e18484e185b4e186b2"],
+  ["eb9d8f", "eb9d84e186b2"],
+  ["eb9d90", "e18484e185b4e186b3"],
+  ["eb9d90", "eb9d84e186b3"],
+  ["eb9d91", "e18484e185b4e186b4"],
+  ["eb9d91", "eb9d84e186b4"],
+  ["eb9d92", "e18484e185b4e186b5"],
+  ["eb9d92", "eb9d84e186b5"],
+  ["eb9d93", "e18484e185b4e186b6"],
+  ["eb9d93", "eb9d84e186b6"],
+  ["eb9d94", "e18484e185b4e186b7"],
+  ["eb9d94", "eb9d84e186b7"],
+  ["eb9d95", "e18484e185b4e186b8"],
+  ["eb9d95", "eb9d84e186b8"],
+  ["eb9d96", "e18484e185b4e186b9"],
+  ["eb9d96", "eb9d84e186b9"],
+  ["eb9d97", "e18484e185b4e186ba"],
+  ["eb9d97", "eb9d84e186ba"],
+  ["eb9d98", "e18484e185b4e186bb"],
+  ["eb9d98", "eb9d84e186bb"],
+  ["eb9d99", "e18484e185b4e186bc"],
+  ["eb9d99", "eb9d84e186bc"],
+  ["eb9d9a", "e18484e185b4e186bd"],
+  ["eb9d9a", "eb9d84e186bd"],
+  ["eb9d9b", "e18484e185b4e186be"],
+  ["eb9d9b", "eb9d84e186be"],
+  ["eb9d9c", "e18484e185b4e186bf"],
+  ["eb9d9c", "eb9d84e186bf"],
+  ["eb9d9d", "e18484e185b4e18780"],
+  ["eb9d9d", "eb9d84e18780"],
+  ["eb9d9e", "e18484e185b4e18781"],
+  ["eb9d9e", "eb9d84e18781"],
+  ["eb9d9f", "e18484e185b4e18782"],
+  ["eb9d9f", "eb9d84e18782"],
+  ["eb9da0", "e18484e185b5"],
+  ["eb9da1", "e18484e185b5e186a8"],
+  ["eb9da1", "eb9da0e186a8"],
+  ["eb9da2", "e18484e185b5e186a9"],
+  ["eb9da2", "eb9da0e186a9"],
+  ["eb9da3", "e18484e185b5e186aa"],
+  ["eb9da3", "eb9da0e186aa"],
+  ["eb9da4", "e18484e185b5e186ab"],
+  ["eb9da4", "eb9da0e186ab"],
+  ["eb9da5", "e18484e185b5e186ac"],
+  ["eb9da5", "eb9da0e186ac"],
+  ["eb9da6", "e18484e185b5e186ad"],
+  ["eb9da6", "eb9da0e186ad"],
+  ["eb9da7", "e18484e185b5e186ae"],
+  ["eb9da7", "eb9da0e186ae"],
+  ["eb9da8", "e18484e185b5e186af"],
+  ["eb9da8", "eb9da0e186af"],
+  ["eb9da9", "e18484e185b5e186b0"],
+  ["eb9da9", "eb9da0e186b0"],
+  ["eb9daa", "e18484e185b5e186b1"],
+  ["eb9daa", "eb9da0e186b1"],
+  ["eb9dab", "e18484e185b5e186b2"],
+  ["eb9dab", "eb9da0e186b2"],
+  ["eb9dac", "e18484e185b5e186b3"],
+  ["eb9dac", "eb9da0e186b3"],
+  ["eb9dad", "e18484e185b5e186b4"],
+  ["eb9dad", "eb9da0e186b4"],
+  ["eb9dae", "e18484e185b5e186b5"],
+  ["eb9dae", "eb9da0e186b5"],
+  ["eb9daf", "e18484e185b5e186b6"],
+  ["eb9daf", "eb9da0e186b6"],
+  ["eb9db0", "e18484e185b5e186b7"],
+  ["eb9db0", "eb9da0e186b7"],
+  ["eb9db1", "e18484e185b5e186b8"],
+  ["eb9db1", "eb9da0e186b8"],
+  ["eb9db2", "e18484e185b5e186b9"],
+  ["eb9db2", "eb9da0e186b9"],
+  ["eb9db3", "e18484e185b5e186ba"],
+  ["eb9db3", "eb9da0e186ba"],
+  ["eb9db4", "e18484e185b5e186bb"],
+  ["eb9db4", "eb9da0e186bb"],
+  ["eb9db5", "e18484e185b5e186bc"],
+  ["eb9db5", "eb9da0e186bc"],
+  ["eb9db6", "e18484e185b5e186bd"],
+  ["eb9db6", "eb9da0e186bd"],
+  ["eb9db7", "e18484e185b5e186be"],
+  ["eb9db7", "eb9da0e186be"],
+  ["eb9db8", "e18484e185b5e186bf"],
+  ["eb9db8", "eb9da0e186bf"],
+  ["eb9db9", "e18484e185b5e18780"],
+  ["eb9db9", "eb9da0e18780"],
+  ["eb9dba", "e18484e185b5e18781"],
+  ["eb9dba", "eb9da0e18781"],
+  ["eb9dbb", "e18484e185b5e18782"],
+  ["eb9dbb", "eb9da0e18782"],
+  ["eb9dbc", "e18485e185a1"],
+  ["eb9dbd", "e18485e185a1e186a8"],
+  ["eb9dbd", "eb9dbce186a8"],
+  ["eb9dbe", "e18485e185a1e186a9"],
+  ["eb9dbe", "eb9dbce186a9"],
+  ["eb9dbf", "e18485e185a1e186aa"],
+  ["eb9dbf", "eb9dbce186aa"],
+  ["eb9e80", "e18485e185a1e186ab"],
+  ["eb9e80", "eb9dbce186ab"],
+  ["eb9e81", "e18485e185a1e186ac"],
+  ["eb9e81", "eb9dbce186ac"],
+  ["eb9e82", "e18485e185a1e186ad"],
+  ["eb9e82", "eb9dbce186ad"],
+  ["eb9e83", "e18485e185a1e186ae"],
+  ["eb9e83", "eb9dbce186ae"],
+  ["eb9e84", "e18485e185a1e186af"],
+  ["eb9e84", "eb9dbce186af"],
+  ["eb9e85", "e18485e185a1e186b0"],
+  ["eb9e85", "eb9dbce186b0"],
+  ["eb9e86", "e18485e185a1e186b1"],
+  ["eb9e86", "eb9dbce186b1"],
+  ["eb9e87", "e18485e185a1e186b2"],
+  ["eb9e87", "eb9dbce186b2"],
+  ["eb9e88", "e18485e185a1e186b3"],
+  ["eb9e88", "eb9dbce186b3"],
+  ["eb9e89", "e18485e185a1e186b4"],
+  ["eb9e89", "eb9dbce186b4"],
+  ["eb9e8a", "e18485e185a1e186b5"],
+  ["eb9e8a", "eb9dbce186b5"],
+  ["eb9e8b", "e18485e185a1e186b6"],
+  ["eb9e8b", "eb9dbce186b6"],
+  ["eb9e8c", "e18485e185a1e186b7"],
+  ["eb9e8c", "eb9dbce186b7"],
+  ["eb9e8d", "e18485e185a1e186b8"],
+  ["eb9e8d", "eb9dbce186b8"],
+  ["eb9e8e", "e18485e185a1e186b9"],
+  ["eb9e8e", "eb9dbce186b9"],
+  ["eb9e8f", "e18485e185a1e186ba"],
+  ["eb9e8f", "eb9dbce186ba"],
+  ["eb9e90", "e18485e185a1e186bb"],
+  ["eb9e90", "eb9dbce186bb"],
+  ["eb9e91", "e18485e185a1e186bc"],
+  ["eb9e91", "eb9dbce186bc"],
+  ["eb9e92", "e18485e185a1e186bd"],
+  ["eb9e92", "eb9dbce186bd"],
+  ["eb9e93", "e18485e185a1e186be"],
+  ["eb9e93", "eb9dbce186be"],
+  ["eb9e94", "e18485e185a1e186bf"],
+  ["eb9e94", "eb9dbce186bf"],
+  ["eb9e95", "e18485e185a1e18780"],
+  ["eb9e95", "eb9dbce18780"],
+  ["eb9e96", "e18485e185a1e18781"],
+  ["eb9e96", "eb9dbce18781"],
+  ["eb9e97", "e18485e185a1e18782"],
+  ["eb9e97", "eb9dbce18782"],
+  ["eb9e98", "e18485e185a2"],
+  ["eb9e99", "e18485e185a2e186a8"],
+  ["eb9e99", "eb9e98e186a8"],
+  ["eb9e9a", "e18485e185a2e186a9"],
+  ["eb9e9a", "eb9e98e186a9"],
+  ["eb9e9b", "e18485e185a2e186aa"],
+  ["eb9e9b", "eb9e98e186aa"],
+  ["eb9e9c", "e18485e185a2e186ab"],
+  ["eb9e9c", "eb9e98e186ab"],
+  ["eb9e9d", "e18485e185a2e186ac"],
+  ["eb9e9d", "eb9e98e186ac"],
+  ["eb9e9e", "e18485e185a2e186ad"],
+  ["eb9e9e", "eb9e98e186ad"],
+  ["eb9e9f", "e18485e185a2e186ae"],
+  ["eb9e9f", "eb9e98e186ae"],
+  ["eb9ea0", "e18485e185a2e186af"],
+  ["eb9ea0", "eb9e98e186af"],
+  ["eb9ea1", "e18485e185a2e186b0"],
+  ["eb9ea1", "eb9e98e186b0"],
+  ["eb9ea2", "e18485e185a2e186b1"],
+  ["eb9ea2", "eb9e98e186b1"],
+  ["eb9ea3", "e18485e185a2e186b2"],
+  ["eb9ea3", "eb9e98e186b2"],
+  ["eb9ea4", "e18485e185a2e186b3"],
+  ["eb9ea4", "eb9e98e186b3"],
+  ["eb9ea5", "e18485e185a2e186b4"],
+  ["eb9ea5", "eb9e98e186b4"],
+  ["eb9ea6", "e18485e185a2e186b5"],
+  ["eb9ea6", "eb9e98e186b5"],
+  ["eb9ea7", "e18485e185a2e186b6"],
+  ["eb9ea7", "eb9e98e186b6"],
+  ["eb9ea8", "e18485e185a2e186b7"],
+  ["eb9ea8", "eb9e98e186b7"],
+  ["eb9ea9", "e18485e185a2e186b8"],
+  ["eb9ea9", "eb9e98e186b8"],
+  ["eb9eaa", "e18485e185a2e186b9"],
+  ["eb9eaa", "eb9e98e186b9"],
+  ["eb9eab", "e18485e185a2e186ba"],
+  ["eb9eab", "eb9e98e186ba"],
+  ["eb9eac", "e18485e185a2e186bb"],
+  ["eb9eac", "eb9e98e186bb"],
+  ["eb9ead", "e18485e185a2e186bc"],
+  ["eb9ead", "eb9e98e186bc"],
+  ["eb9eae", "e18485e185a2e186bd"],
+  ["eb9eae", "eb9e98e186bd"],
+  ["eb9eaf", "e18485e185a2e186be"],
+  ["eb9eaf", "eb9e98e186be"],
+  ["eb9eb0", "e18485e185a2e186bf"],
+  ["eb9eb0", "eb9e98e186bf"],
+  ["eb9eb1", "e18485e185a2e18780"],
+  ["eb9eb1", "eb9e98e18780"],
+  ["eb9eb2", "e18485e185a2e18781"],
+  ["eb9eb2", "eb9e98e18781"],
+  ["eb9eb3", "e18485e185a2e18782"],
+  ["eb9eb3", "eb9e98e18782"],
+  ["eb9eb4", "e18485e185a3"],
+  ["eb9eb5", "e18485e185a3e186a8"],
+  ["eb9eb5", "eb9eb4e186a8"],
+  ["eb9eb6", "e18485e185a3e186a9"],
+  ["eb9eb6", "eb9eb4e186a9"],
+  ["eb9eb7", "e18485e185a3e186aa"],
+  ["eb9eb7", "eb9eb4e186aa"],
+  ["eb9eb8", "e18485e185a3e186ab"],
+  ["eb9eb8", "eb9eb4e186ab"],
+  ["eb9eb9", "e18485e185a3e186ac"],
+  ["eb9eb9", "eb9eb4e186ac"],
+  ["eb9eba", "e18485e185a3e186ad"],
+  ["eb9eba", "eb9eb4e186ad"],
+  ["eb9ebb", "e18485e185a3e186ae"],
+  ["eb9ebb", "eb9eb4e186ae"],
+  ["eb9ebc", "e18485e185a3e186af"],
+  ["eb9ebc", "eb9eb4e186af"],
+  ["eb9ebd", "e18485e185a3e186b0"],
+  ["eb9ebd", "eb9eb4e186b0"],
+  ["eb9ebe", "e18485e185a3e186b1"],
+  ["eb9ebe", "eb9eb4e186b1"],
+  ["eb9ebf", "e18485e185a3e186b2"],
+  ["eb9ebf", "eb9eb4e186b2"],
+  ["eb9f80", "e18485e185a3e186b3"],
+  ["eb9f80", "eb9eb4e186b3"],
+  ["eb9f81", "e18485e185a3e186b4"],
+  ["eb9f81", "eb9eb4e186b4"],
+  ["eb9f82", "e18485e185a3e186b5"],
+  ["eb9f82", "eb9eb4e186b5"],
+  ["eb9f83", "e18485e185a3e186b6"],
+  ["eb9f83", "eb9eb4e186b6"],
+  ["eb9f84", "e18485e185a3e186b7"],
+  ["eb9f84", "eb9eb4e186b7"],
+  ["eb9f85", "e18485e185a3e186b8"],
+  ["eb9f85", "eb9eb4e186b8"],
+  ["eb9f86", "e18485e185a3e186b9"],
+  ["eb9f86", "eb9eb4e186b9"],
+  ["eb9f87", "e18485e185a3e186ba"],
+  ["eb9f87", "eb9eb4e186ba"],
+  ["eb9f88", "e18485e185a3e186bb"],
+  ["eb9f88", "eb9eb4e186bb"],
+  ["eb9f89", "e18485e185a3e186bc"],
+  ["eb9f89", "eb9eb4e186bc"],
+  ["eb9f8a", "e18485e185a3e186bd"],
+  ["eb9f8a", "eb9eb4e186bd"],
+  ["eb9f8b", "e18485e185a3e186be"],
+  ["eb9f8b", "eb9eb4e186be"],
+  ["eb9f8c", "e18485e185a3e186bf"],
+  ["eb9f8c", "eb9eb4e186bf"],
+  ["eb9f8d", "e18485e185a3e18780"],
+  ["eb9f8d", "eb9eb4e18780"],
+  ["eb9f8e", "e18485e185a3e18781"],
+  ["eb9f8e", "eb9eb4e18781"],
+  ["eb9f8f", "e18485e185a3e18782"],
+  ["eb9f8f", "eb9eb4e18782"],
+  ["eb9f90", "e18485e185a4"],
+  ["eb9f91", "e18485e185a4e186a8"],
+  ["eb9f91", "eb9f90e186a8"],
+  ["eb9f92", "e18485e185a4e186a9"],
+  ["eb9f92", "eb9f90e186a9"],
+  ["eb9f93", "e18485e185a4e186aa"],
+  ["eb9f93", "eb9f90e186aa"],
+  ["eb9f94", "e18485e185a4e186ab"],
+  ["eb9f94", "eb9f90e186ab"],
+  ["eb9f95", "e18485e185a4e186ac"],
+  ["eb9f95", "eb9f90e186ac"],
+  ["eb9f96", "e18485e185a4e186ad"],
+  ["eb9f96", "eb9f90e186ad"],
+  ["eb9f97", "e18485e185a4e186ae"],
+  ["eb9f97", "eb9f90e186ae"],
+  ["eb9f98", "e18485e185a4e186af"],
+  ["eb9f98", "eb9f90e186af"],
+  ["eb9f99", "e18485e185a4e186b0"],
+  ["eb9f99", "eb9f90e186b0"],
+  ["eb9f9a", "e18485e185a4e186b1"],
+  ["eb9f9a", "eb9f90e186b1"],
+  ["eb9f9b", "e18485e185a4e186b2"],
+  ["eb9f9b", "eb9f90e186b2"],
+  ["eb9f9c", "e18485e185a4e186b3"],
+  ["eb9f9c", "eb9f90e186b3"],
+  ["eb9f9d", "e18485e185a4e186b4"],
+  ["eb9f9d", "eb9f90e186b4"],
+  ["eb9f9e", "e18485e185a4e186b5"],
+  ["eb9f9e", "eb9f90e186b5"],
+  ["eb9f9f", "e18485e185a4e186b6"],
+  ["eb9f9f", "eb9f90e186b6"],
+  ["eb9fa0", "e18485e185a4e186b7"],
+  ["eb9fa0", "eb9f90e186b7"],
+  ["eb9fa1", "e18485e185a4e186b8"],
+  ["eb9fa1", "eb9f90e186b8"],
+  ["eb9fa2", "e18485e185a4e186b9"],
+  ["eb9fa2", "eb9f90e186b9"],
+  ["eb9fa3", "e18485e185a4e186ba"],
+  ["eb9fa3", "eb9f90e186ba"],
+  ["eb9fa4", "e18485e185a4e186bb"],
+  ["eb9fa4", "eb9f90e186bb"],
+  ["eb9fa5", "e18485e185a4e186bc"],
+  ["eb9fa5", "eb9f90e186bc"],
+  ["eb9fa6", "e18485e185a4e186bd"],
+  ["eb9fa6", "eb9f90e186bd"],
+  ["eb9fa7", "e18485e185a4e186be"],
+  ["eb9fa7", "eb9f90e186be"],
+  ["eb9fa8", "e18485e185a4e186bf"],
+  ["eb9fa8", "eb9f90e186bf"],
+  ["eb9fa9", "e18485e185a4e18780"],
+  ["eb9fa9", "eb9f90e18780"],
+  ["eb9faa", "e18485e185a4e18781"],
+  ["eb9faa", "eb9f90e18781"],
+  ["eb9fab", "e18485e185a4e18782"],
+  ["eb9fab", "eb9f90e18782"],
+  ["eb9fac", "e18485e185a5"],
+  ["eb9fad", "e18485e185a5e186a8"],
+  ["eb9fad", "eb9face186a8"],
+  ["eb9fae", "e18485e185a5e186a9"],
+  ["eb9fae", "eb9face186a9"],
+  ["eb9faf", "e18485e185a5e186aa"],
+  ["eb9faf", "eb9face186aa"],
+  ["eb9fb0", "e18485e185a5e186ab"],
+  ["eb9fb0", "eb9face186ab"],
+  ["eb9fb1", "e18485e185a5e186ac"],
+  ["eb9fb1", "eb9face186ac"],
+  ["eb9fb2", "e18485e185a5e186ad"],
+  ["eb9fb2", "eb9face186ad"],
+  ["eb9fb3", "e18485e185a5e186ae"],
+  ["eb9fb3", "eb9face186ae"],
+  ["eb9fb4", "e18485e185a5e186af"],
+  ["eb9fb4", "eb9face186af"],
+  ["eb9fb5", "e18485e185a5e186b0"],
+  ["eb9fb5", "eb9face186b0"],
+  ["eb9fb6", "e18485e185a5e186b1"],
+  ["eb9fb6", "eb9face186b1"],
+  ["eb9fb7", "e18485e185a5e186b2"],
+  ["eb9fb7", "eb9face186b2"],
+  ["eb9fb8", "e18485e185a5e186b3"],
+  ["eb9fb8", "eb9face186b3"],
+  ["eb9fb9", "e18485e185a5e186b4"],
+  ["eb9fb9", "eb9face186b4"],
+  ["eb9fba", "e18485e185a5e186b5"],
+  ["eb9fba", "eb9face186b5"],
+  ["eb9fbb", "e18485e185a5e186b6"],
+  ["eb9fbb", "eb9face186b6"],
+  ["eb9fbc", "e18485e185a5e186b7"],
+  ["eb9fbc", "eb9face186b7"],
+  ["eb9fbd", "e18485e185a5e186b8"],
+  ["eb9fbd", "eb9face186b8"],
+  ["eb9fbe", "e18485e185a5e186b9"],
+  ["eb9fbe", "eb9face186b9"],
+  ["eb9fbf", "e18485e185a5e186ba"],
+  ["eb9fbf", "eb9face186ba"],
+  ["eba080", "e18485e185a5e186bb"],
+  ["eba080", "eb9face186bb"],
+  ["eba081", "e18485e185a5e186bc"],
+  ["eba081", "eb9face186bc"],
+  ["eba082", "e18485e185a5e186bd"],
+  ["eba082", "eb9face186bd"],
+  ["eba083", "e18485e185a5e186be"],
+  ["eba083", "eb9face186be"],
+  ["eba084", "e18485e185a5e186bf"],
+  ["eba084", "eb9face186bf"],
+  ["eba085", "e18485e185a5e18780"],
+  ["eba085", "eb9face18780"],
+  ["eba086", "e18485e185a5e18781"],
+  ["eba086", "eb9face18781"],
+  ["eba087", "e18485e185a5e18782"],
+  ["eba087", "eb9face18782"],
+  ["eba088", "e18485e185a6"],
+  ["eba089", "e18485e185a6e186a8"],
+  ["eba089", "eba088e186a8"],
+  ["eba08a", "e18485e185a6e186a9"],
+  ["eba08a", "eba088e186a9"],
+  ["eba08b", "e18485e185a6e186aa"],
+  ["eba08b", "eba088e186aa"],
+  ["eba08c", "e18485e185a6e186ab"],
+  ["eba08c", "eba088e186ab"],
+  ["eba08d", "e18485e185a6e186ac"],
+  ["eba08d", "eba088e186ac"],
+  ["eba08e", "e18485e185a6e186ad"],
+  ["eba08e", "eba088e186ad"],
+  ["eba08f", "e18485e185a6e186ae"],
+  ["eba08f", "eba088e186ae"],
+  ["eba090", "e18485e185a6e186af"],
+  ["eba090", "eba088e186af"],
+  ["eba091", "e18485e185a6e186b0"],
+  ["eba091", "eba088e186b0"],
+  ["eba092", "e18485e185a6e186b1"],
+  ["eba092", "eba088e186b1"],
+  ["eba093", "e18485e185a6e186b2"],
+  ["eba093", "eba088e186b2"],
+  ["eba094", "e18485e185a6e186b3"],
+  ["eba094", "eba088e186b3"],
+  ["eba095", "e18485e185a6e186b4"],
+  ["eba095", "eba088e186b4"],
+  ["eba096", "e18485e185a6e186b5"],
+  ["eba096", "eba088e186b5"],
+  ["eba097", "e18485e185a6e186b6"],
+  ["eba097", "eba088e186b6"],
+  ["eba098", "e18485e185a6e186b7"],
+  ["eba098", "eba088e186b7"],
+  ["eba099", "e18485e185a6e186b8"],
+  ["eba099", "eba088e186b8"],
+  ["eba09a", "e18485e185a6e186b9"],
+  ["eba09a", "eba088e186b9"],
+  ["eba09b", "e18485e185a6e186ba"],
+  ["eba09b", "eba088e186ba"],
+  ["eba09c", "e18485e185a6e186bb"],
+  ["eba09c", "eba088e186bb"],
+  ["eba09d", "e18485e185a6e186bc"],
+  ["eba09d", "eba088e186bc"],
+  ["eba09e", "e18485e185a6e186bd"],
+  ["eba09e", "eba088e186bd"],
+  ["eba09f", "e18485e185a6e186be"],
+  ["eba09f", "eba088e186be"],
+  ["eba0a0", "e18485e185a6e186bf"],
+  ["eba0a0", "eba088e186bf"],
+  ["eba0a1", "e18485e185a6e18780"],
+  ["eba0a1", "eba088e18780"],
+  ["eba0a2", "e18485e185a6e18781"],
+  ["eba0a2", "eba088e18781"],
+  ["eba0a3", "e18485e185a6e18782"],
+  ["eba0a3", "eba088e18782"],
+  ["eba0a4", "e18485e185a7"],
+  ["eba0a5", "e18485e185a7e186a8"],
+  ["eba0a5", "eba0a4e186a8"],
+  ["eba0a6", "e18485e185a7e186a9"],
+  ["eba0a6", "eba0a4e186a9"],
+  ["eba0a7", "e18485e185a7e186aa"],
+  ["eba0a7", "eba0a4e186aa"],
+  ["eba0a8", "e18485e185a7e186ab"],
+  ["eba0a8", "eba0a4e186ab"],
+  ["eba0a9", "e18485e185a7e186ac"],
+  ["eba0a9", "eba0a4e186ac"],
+  ["eba0aa", "e18485e185a7e186ad"],
+  ["eba0aa", "eba0a4e186ad"],
+  ["eba0ab", "e18485e185a7e186ae"],
+  ["eba0ab", "eba0a4e186ae"],
+  ["eba0ac", "e18485e185a7e186af"],
+  ["eba0ac", "eba0a4e186af"],
+  ["eba0ad", "e18485e185a7e186b0"],
+  ["eba0ad", "eba0a4e186b0"],
+  ["eba0ae", "e18485e185a7e186b1"],
+  ["eba0ae", "eba0a4e186b1"],
+  ["eba0af", "e18485e185a7e186b2"],
+  ["eba0af", "eba0a4e186b2"],
+  ["eba0b0", "e18485e185a7e186b3"],
+  ["eba0b0", "eba0a4e186b3"],
+  ["eba0b1", "e18485e185a7e186b4"],
+  ["eba0b1", "eba0a4e186b4"],
+  ["eba0b2", "e18485e185a7e186b5"],
+  ["eba0b2", "eba0a4e186b5"],
+  ["eba0b3", "e18485e185a7e186b6"],
+  ["eba0b3", "eba0a4e186b6"],
+  ["eba0b4", "e18485e185a7e186b7"],
+  ["eba0b4", "eba0a4e186b7"],
+  ["eba0b5", "e18485e185a7e186b8"],
+  ["eba0b5", "eba0a4e186b8"],
+  ["eba0b6", "e18485e185a7e186b9"],
+  ["eba0b6", "eba0a4e186b9"],
+  ["eba0b7", "e18485e185a7e186ba"],
+  ["eba0b7", "eba0a4e186ba"],
+  ["eba0b8", "e18485e185a7e186bb"],
+  ["eba0b8", "eba0a4e186bb"],
+  ["eba0b9", "e18485e185a7e186bc"],
+  ["eba0b9", "eba0a4e186bc"],
+  ["eba0ba", "e18485e185a7e186bd"],
+  ["eba0ba", "eba0a4e186bd"],
+  ["eba0bb", "e18485e185a7e186be"],
+  ["eba0bb", "eba0a4e186be"],
+  ["eba0bc", "e18485e185a7e186bf"],
+  ["eba0bc", "eba0a4e186bf"],
+  ["eba0bd", "e18485e185a7e18780"],
+  ["eba0bd", "eba0a4e18780"],
+  ["eba0be", "e18485e185a7e18781"],
+  ["eba0be", "eba0a4e18781"],
+  ["eba0bf", "e18485e185a7e18782"],
+  ["eba0bf", "eba0a4e18782"],
+  ["eba180", "e18485e185a8"],
+  ["eba181", "e18485e185a8e186a8"],
+  ["eba181", "eba180e186a8"],
+  ["eba182", "e18485e185a8e186a9"],
+  ["eba182", "eba180e186a9"],
+  ["eba183", "e18485e185a8e186aa"],
+  ["eba183", "eba180e186aa"],
+  ["eba184", "e18485e185a8e186ab"],
+  ["eba184", "eba180e186ab"],
+  ["eba185", "e18485e185a8e186ac"],
+  ["eba185", "eba180e186ac"],
+  ["eba186", "e18485e185a8e186ad"],
+  ["eba186", "eba180e186ad"],
+  ["eba187", "e18485e185a8e186ae"],
+  ["eba187", "eba180e186ae"],
+  ["eba188", "e18485e185a8e186af"],
+  ["eba188", "eba180e186af"],
+  ["eba189", "e18485e185a8e186b0"],
+  ["eba189", "eba180e186b0"],
+  ["eba18a", "e18485e185a8e186b1"],
+  ["eba18a", "eba180e186b1"],
+  ["eba18b", "e18485e185a8e186b2"],
+  ["eba18b", "eba180e186b2"],
+  ["eba18c", "e18485e185a8e186b3"],
+  ["eba18c", "eba180e186b3"],
+  ["eba18d", "e18485e185a8e186b4"],
+  ["eba18d", "eba180e186b4"],
+  ["eba18e", "e18485e185a8e186b5"],
+  ["eba18e", "eba180e186b5"],
+  ["eba18f", "e18485e185a8e186b6"],
+  ["eba18f", "eba180e186b6"],
+  ["eba190", "e18485e185a8e186b7"],
+  ["eba190", "eba180e186b7"],
+  ["eba191", "e18485e185a8e186b8"],
+  ["eba191", "eba180e186b8"],
+  ["eba192", "e18485e185a8e186b9"],
+  ["eba192", "eba180e186b9"],
+  ["eba193", "e18485e185a8e186ba"],
+  ["eba193", "eba180e186ba"],
+  ["eba194", "e18485e185a8e186bb"],
+  ["eba194", "eba180e186bb"],
+  ["eba195", "e18485e185a8e186bc"],
+  ["eba195", "eba180e186bc"],
+  ["eba196", "e18485e185a8e186bd"],
+  ["eba196", "eba180e186bd"],
+  ["eba197", "e18485e185a8e186be"],
+  ["eba197", "eba180e186be"],
+  ["eba198", "e18485e185a8e186bf"],
+  ["eba198", "eba180e186bf"],
+  ["eba199", "e18485e185a8e18780"],
+  ["eba199", "eba180e18780"],
+  ["eba19a", "e18485e185a8e18781"],
+  ["eba19a", "eba180e18781"],
+  ["eba19b", "e18485e185a8e18782"],
+  ["eba19b", "eba180e18782"],
+  ["eba19c", "e18485e185a9"],
+  ["eba19d", "e18485e185a9e186a8"],
+  ["eba19d", "eba19ce186a8"],
+  ["eba19e", "e18485e185a9e186a9"],
+  ["eba19e", "eba19ce186a9"],
+  ["eba19f", "e18485e185a9e186aa"],
+  ["eba19f", "eba19ce186aa"],
+  ["eba1a0", "e18485e185a9e186ab"],
+  ["eba1a0", "eba19ce186ab"],
+  ["eba1a1", "e18485e185a9e186ac"],
+  ["eba1a1", "eba19ce186ac"],
+  ["eba1a2", "e18485e185a9e186ad"],
+  ["eba1a2", "eba19ce186ad"],
+  ["eba1a3", "e18485e185a9e186ae"],
+  ["eba1a3", "eba19ce186ae"],
+  ["eba1a4", "e18485e185a9e186af"],
+  ["eba1a4", "eba19ce186af"],
+  ["eba1a5", "e18485e185a9e186b0"],
+  ["eba1a5", "eba19ce186b0"],
+  ["eba1a6", "e18485e185a9e186b1"],
+  ["eba1a6", "eba19ce186b1"],
+  ["eba1a7", "e18485e185a9e186b2"],
+  ["eba1a7", "eba19ce186b2"],
+  ["eba1a8", "e18485e185a9e186b3"],
+  ["eba1a8", "eba19ce186b3"],
+  ["eba1a9", "e18485e185a9e186b4"],
+  ["eba1a9", "eba19ce186b4"],
+  ["eba1aa", "e18485e185a9e186b5"],
+  ["eba1aa", "eba19ce186b5"],
+  ["eba1ab", "e18485e185a9e186b6"],
+  ["eba1ab", "eba19ce186b6"],
+  ["eba1ac", "e18485e185a9e186b7"],
+  ["eba1ac", "eba19ce186b7"],
+  ["eba1ad", "e18485e185a9e186b8"],
+  ["eba1ad", "eba19ce186b8"],
+  ["eba1ae", "e18485e185a9e186b9"],
+  ["eba1ae", "eba19ce186b9"],
+  ["eba1af", "e18485e185a9e186ba"],
+  ["eba1af", "eba19ce186ba"],
+  ["eba1b0", "e18485e185a9e186bb"],
+  ["eba1b0", "eba19ce186bb"],
+  ["eba1b1", "e18485e185a9e186bc"],
+  ["eba1b1", "eba19ce186bc"],
+  ["eba1b2", "e18485e185a9e186bd"],
+  ["eba1b2", "eba19ce186bd"],
+  ["eba1b3", "e18485e185a9e186be"],
+  ["eba1b3", "eba19ce186be"],
+  ["eba1b4", "e18485e185a9e186bf"],
+  ["eba1b4", "eba19ce186bf"],
+  ["eba1b5", "e18485e185a9e18780"],
+  ["eba1b5", "eba19ce18780"],
+  ["eba1b6", "e18485e185a9e18781"],
+  ["eba1b6", "eba19ce18781"],
+  ["eba1b7", "e18485e185a9e18782"],
+  ["eba1b7", "eba19ce18782"],
+  ["eba1b8", "e18485e185aa"],
+  ["eba1b9", "e18485e185aae186a8"],
+  ["eba1b9", "eba1b8e186a8"],
+  ["eba1ba", "e18485e185aae186a9"],
+  ["eba1ba", "eba1b8e186a9"],
+  ["eba1bb", "e18485e185aae186aa"],
+  ["eba1bb", "eba1b8e186aa"],
+  ["eba1bc", "e18485e185aae186ab"],
+  ["eba1bc", "eba1b8e186ab"],
+  ["eba1bd", "e18485e185aae186ac"],
+  ["eba1bd", "eba1b8e186ac"],
+  ["eba1be", "e18485e185aae186ad"],
+  ["eba1be", "eba1b8e186ad"],
+  ["eba1bf", "e18485e185aae186ae"],
+  ["eba1bf", "eba1b8e186ae"],
+  ["eba280", "e18485e185aae186af"],
+  ["eba280", "eba1b8e186af"],
+  ["eba281", "e18485e185aae186b0"],
+  ["eba281", "eba1b8e186b0"],
+  ["eba282", "e18485e185aae186b1"],
+  ["eba282", "eba1b8e186b1"],
+  ["eba283", "e18485e185aae186b2"],
+  ["eba283", "eba1b8e186b2"],
+  ["eba284", "e18485e185aae186b3"],
+  ["eba284", "eba1b8e186b3"],
+  ["eba285", "e18485e185aae186b4"],
+  ["eba285", "eba1b8e186b4"],
+  ["eba286", "e18485e185aae186b5"],
+  ["eba286", "eba1b8e186b5"],
+  ["eba287", "e18485e185aae186b6"],
+  ["eba287", "eba1b8e186b6"],
+  ["eba288", "e18485e185aae186b7"],
+  ["eba288", "eba1b8e186b7"],
+  ["eba289", "e18485e185aae186b8"],
+  ["eba289", "eba1b8e186b8"],
+  ["eba28a", "e18485e185aae186b9"],
+  ["eba28a", "eba1b8e186b9"],
+  ["eba28b", "e18485e185aae186ba"],
+  ["eba28b", "eba1b8e186ba"],
+  ["eba28c", "e18485e185aae186bb"],
+  ["eba28c", "eba1b8e186bb"],
+  ["eba28d", "e18485e185aae186bc"],
+  ["eba28d", "eba1b8e186bc"],
+  ["eba28e", "e18485e185aae186bd"],
+  ["eba28e", "eba1b8e186bd"],
+  ["eba28f", "e18485e185aae186be"],
+  ["eba28f", "eba1b8e186be"],
+  ["eba290", "e18485e185aae186bf"],
+  ["eba290", "eba1b8e186bf"],
+  ["eba291", "e18485e185aae18780"],
+  ["eba291", "eba1b8e18780"],
+  ["eba292", "e18485e185aae18781"],
+  ["eba292", "eba1b8e18781"],
+  ["eba293", "e18485e185aae18782"],
+  ["eba293", "eba1b8e18782"],
+  ["eba294", "e18485e185ab"],
+  ["eba295", "e18485e185abe186a8"],
+  ["eba295", "eba294e186a8"],
+  ["eba296", "e18485e185abe186a9"],
+  ["eba296", "eba294e186a9"],
+  ["eba297", "e18485e185abe186aa"],
+  ["eba297", "eba294e186aa"],
+  ["eba298", "e18485e185abe186ab"],
+  ["eba298", "eba294e186ab"],
+  ["eba299", "e18485e185abe186ac"],
+  ["eba299", "eba294e186ac"],
+  ["eba29a", "e18485e185abe186ad"],
+  ["eba29a", "eba294e186ad"],
+  ["eba29b", "e18485e185abe186ae"],
+  ["eba29b", "eba294e186ae"],
+  ["eba29c", "e18485e185abe186af"],
+  ["eba29c", "eba294e186af"],
+  ["eba29d", "e18485e185abe186b0"],
+  ["eba29d", "eba294e186b0"],
+  ["eba29e", "e18485e185abe186b1"],
+  ["eba29e", "eba294e186b1"],
+  ["eba29f", "e18485e185abe186b2"],
+  ["eba29f", "eba294e186b2"],
+  ["eba2a0", "e18485e185abe186b3"],
+  ["eba2a0", "eba294e186b3"],
+  ["eba2a1", "e18485e185abe186b4"],
+  ["eba2a1", "eba294e186b4"],
+  ["eba2a2", "e18485e185abe186b5"],
+  ["eba2a2", "eba294e186b5"],
+  ["eba2a3", "e18485e185abe186b6"],
+  ["eba2a3", "eba294e186b6"],
+  ["eba2a4", "e18485e185abe186b7"],
+  ["eba2a4", "eba294e186b7"],
+  ["eba2a5", "e18485e185abe186b8"],
+  ["eba2a5", "eba294e186b8"],
+  ["eba2a6", "e18485e185abe186b9"],
+  ["eba2a6", "eba294e186b9"],
+  ["eba2a7", "e18485e185abe186ba"],
+  ["eba2a7", "eba294e186ba"],
+  ["eba2a8", "e18485e185abe186bb"],
+  ["eba2a8", "eba294e186bb"],
+  ["eba2a9", "e18485e185abe186bc"],
+  ["eba2a9", "eba294e186bc"],
+  ["eba2aa", "e18485e185abe186bd"],
+  ["eba2aa", "eba294e186bd"],
+  ["eba2ab", "e18485e185abe186be"],
+  ["eba2ab", "eba294e186be"],
+  ["eba2ac", "e18485e185abe186bf"],
+  ["eba2ac", "eba294e186bf"],
+  ["eba2ad", "e18485e185abe18780"],
+  ["eba2ad", "eba294e18780"],
+  ["eba2ae", "e18485e185abe18781"],
+  ["eba2ae", "eba294e18781"],
+  ["eba2af", "e18485e185abe18782"],
+  ["eba2af", "eba294e18782"],
+  ["eba2b0", "e18485e185ac"],
+  ["eba2b1", "e18485e185ace186a8"],
+  ["eba2b1", "eba2b0e186a8"],
+  ["eba2b2", "e18485e185ace186a9"],
+  ["eba2b2", "eba2b0e186a9"],
+  ["eba2b3", "e18485e185ace186aa"],
+  ["eba2b3", "eba2b0e186aa"],
+  ["eba2b4", "e18485e185ace186ab"],
+  ["eba2b4", "eba2b0e186ab"],
+  ["eba2b5", "e18485e185ace186ac"],
+  ["eba2b5", "eba2b0e186ac"],
+  ["eba2b6", "e18485e185ace186ad"],
+  ["eba2b6", "eba2b0e186ad"],
+  ["eba2b7", "e18485e185ace186ae"],
+  ["eba2b7", "eba2b0e186ae"],
+  ["eba2b8", "e18485e185ace186af"],
+  ["eba2b8", "eba2b0e186af"],
+  ["eba2b9", "e18485e185ace186b0"],
+  ["eba2b9", "eba2b0e186b0"],
+  ["eba2ba", "e18485e185ace186b1"],
+  ["eba2ba", "eba2b0e186b1"],
+  ["eba2bb", "e18485e185ace186b2"],
+  ["eba2bb", "eba2b0e186b2"],
+  ["eba2bc", "e18485e185ace186b3"],
+  ["eba2bc", "eba2b0e186b3"],
+  ["eba2bd", "e18485e185ace186b4"],
+  ["eba2bd", "eba2b0e186b4"],
+  ["eba2be", "e18485e185ace186b5"],
+  ["eba2be", "eba2b0e186b5"],
+  ["eba2bf", "e18485e185ace186b6"],
+  ["eba2bf", "eba2b0e186b6"],
+  ["eba380", "e18485e185ace186b7"],
+  ["eba380", "eba2b0e186b7"],
+  ["eba381", "e18485e185ace186b8"],
+  ["eba381", "eba2b0e186b8"],
+  ["eba382", "e18485e185ace186b9"],
+  ["eba382", "eba2b0e186b9"],
+  ["eba383", "e18485e185ace186ba"],
+  ["eba383", "eba2b0e186ba"],
+  ["eba384", "e18485e185ace186bb"],
+  ["eba384", "eba2b0e186bb"],
+  ["eba385", "e18485e185ace186bc"],
+  ["eba385", "eba2b0e186bc"],
+  ["eba386", "e18485e185ace186bd"],
+  ["eba386", "eba2b0e186bd"],
+  ["eba387", "e18485e185ace186be"],
+  ["eba387", "eba2b0e186be"],
+  ["eba388", "e18485e185ace186bf"],
+  ["eba388", "eba2b0e186bf"],
+  ["eba389", "e18485e185ace18780"],
+  ["eba389", "eba2b0e18780"],
+  ["eba38a", "e18485e185ace18781"],
+  ["eba38a", "eba2b0e18781"],
+  ["eba38b", "e18485e185ace18782"],
+  ["eba38b", "eba2b0e18782"],
+  ["eba38c", "e18485e185ad"],
+  ["eba38d", "e18485e185ade186a8"],
+  ["eba38d", "eba38ce186a8"],
+  ["eba38e", "e18485e185ade186a9"],
+  ["eba38e", "eba38ce186a9"],
+  ["eba38f", "e18485e185ade186aa"],
+  ["eba38f", "eba38ce186aa"],
+  ["eba390", "e18485e185ade186ab"],
+  ["eba390", "eba38ce186ab"],
+  ["eba391", "e18485e185ade186ac"],
+  ["eba391", "eba38ce186ac"],
+  ["eba392", "e18485e185ade186ad"],
+  ["eba392", "eba38ce186ad"],
+  ["eba393", "e18485e185ade186ae"],
+  ["eba393", "eba38ce186ae"],
+  ["eba394", "e18485e185ade186af"],
+  ["eba394", "eba38ce186af"],
+  ["eba395", "e18485e185ade186b0"],
+  ["eba395", "eba38ce186b0"],
+  ["eba396", "e18485e185ade186b1"],
+  ["eba396", "eba38ce186b1"],
+  ["eba397", "e18485e185ade186b2"],
+  ["eba397", "eba38ce186b2"],
+  ["eba398", "e18485e185ade186b3"],
+  ["eba398", "eba38ce186b3"],
+  ["eba399", "e18485e185ade186b4"],
+  ["eba399", "eba38ce186b4"],
+  ["eba39a", "e18485e185ade186b5"],
+  ["eba39a", "eba38ce186b5"],
+  ["eba39b", "e18485e185ade186b6"],
+  ["eba39b", "eba38ce186b6"],
+  ["eba39c", "e18485e185ade186b7"],
+  ["eba39c", "eba38ce186b7"],
+  ["eba39d", "e18485e185ade186b8"],
+  ["eba39d", "eba38ce186b8"],
+  ["eba39e", "e18485e185ade186b9"],
+  ["eba39e", "eba38ce186b9"],
+  ["eba39f", "e18485e185ade186ba"],
+  ["eba39f", "eba38ce186ba"],
+  ["eba3a0", "e18485e185ade186bb"],
+  ["eba3a0", "eba38ce186bb"],
+  ["eba3a1", "e18485e185ade186bc"],
+  ["eba3a1", "eba38ce186bc"],
+  ["eba3a2", "e18485e185ade186bd"],
+  ["eba3a2", "eba38ce186bd"],
+  ["eba3a3", "e18485e185ade186be"],
+  ["eba3a3", "eba38ce186be"],
+  ["eba3a4", "e18485e185ade186bf"],
+  ["eba3a4", "eba38ce186bf"],
+  ["eba3a5", "e18485e185ade18780"],
+  ["eba3a5", "eba38ce18780"],
+  ["eba3a6", "e18485e185ade18781"],
+  ["eba3a6", "eba38ce18781"],
+  ["eba3a7", "e18485e185ade18782"],
+  ["eba3a7", "eba38ce18782"],
+  ["eba3a8", "e18485e185ae"],
+  ["eba3a9", "e18485e185aee186a8"],
+  ["eba3a9", "eba3a8e186a8"],
+  ["eba3aa", "e18485e185aee186a9"],
+  ["eba3aa", "eba3a8e186a9"],
+  ["eba3ab", "e18485e185aee186aa"],
+  ["eba3ab", "eba3a8e186aa"],
+  ["eba3ac", "e18485e185aee186ab"],
+  ["eba3ac", "eba3a8e186ab"],
+  ["eba3ad", "e18485e185aee186ac"],
+  ["eba3ad", "eba3a8e186ac"],
+  ["eba3ae", "e18485e185aee186ad"],
+  ["eba3ae", "eba3a8e186ad"],
+  ["eba3af", "e18485e185aee186ae"],
+  ["eba3af", "eba3a8e186ae"],
+  ["eba3b0", "e18485e185aee186af"],
+  ["eba3b0", "eba3a8e186af"],
+  ["eba3b1", "e18485e185aee186b0"],
+  ["eba3b1", "eba3a8e186b0"],
+  ["eba3b2", "e18485e185aee186b1"],
+  ["eba3b2", "eba3a8e186b1"],
+  ["eba3b3", "e18485e185aee186b2"],
+  ["eba3b3", "eba3a8e186b2"],
+  ["eba3b4", "e18485e185aee186b3"],
+  ["eba3b4", "eba3a8e186b3"],
+  ["eba3b5", "e18485e185aee186b4"],
+  ["eba3b5", "eba3a8e186b4"],
+  ["eba3b6", "e18485e185aee186b5"],
+  ["eba3b6", "eba3a8e186b5"],
+  ["eba3b7", "e18485e185aee186b6"],
+  ["eba3b7", "eba3a8e186b6"],
+  ["eba3b8", "e18485e185aee186b7"],
+  ["eba3b8", "eba3a8e186b7"],
+  ["eba3b9", "e18485e185aee186b8"],
+  ["eba3b9", "eba3a8e186b8"],
+  ["eba3ba", "e18485e185aee186b9"],
+  ["eba3ba", "eba3a8e186b9"],
+  ["eba3bb", "e18485e185aee186ba"],
+  ["eba3bb", "eba3a8e186ba"],
+  ["eba3bc", "e18485e185aee186bb"],
+  ["eba3bc", "eba3a8e186bb"],
+  ["eba3bd", "e18485e185aee186bc"],
+  ["eba3bd", "eba3a8e186bc"],
+  ["eba3be", "e18485e185aee186bd"],
+  ["eba3be", "eba3a8e186bd"],
+  ["eba3bf", "e18485e185aee186be"],
+  ["eba3bf", "eba3a8e186be"],
+  ["eba480", "e18485e185aee186bf"],
+  ["eba480", "eba3a8e186bf"],
+  ["eba481", "e18485e185aee18780"],
+  ["eba481", "eba3a8e18780"],
+  ["eba482", "e18485e185aee18781"],
+  ["eba482", "eba3a8e18781"],
+  ["eba483", "e18485e185aee18782"],
+  ["eba483", "eba3a8e18782"],
+  ["eba484", "e18485e185af"],
+  ["eba485", "e18485e185afe186a8"],
+  ["eba485", "eba484e186a8"],
+  ["eba486", "e18485e185afe186a9"],
+  ["eba486", "eba484e186a9"],
+  ["eba487", "e18485e185afe186aa"],
+  ["eba487", "eba484e186aa"],
+  ["eba488", "e18485e185afe186ab"],
+  ["eba488", "eba484e186ab"],
+  ["eba489", "e18485e185afe186ac"],
+  ["eba489", "eba484e186ac"],
+  ["eba48a", "e18485e185afe186ad"],
+  ["eba48a", "eba484e186ad"],
+  ["eba48b", "e18485e185afe186ae"],
+  ["eba48b", "eba484e186ae"],
+  ["eba48c", "e18485e185afe186af"],
+  ["eba48c", "eba484e186af"],
+  ["eba48d", "e18485e185afe186b0"],
+  ["eba48d", "eba484e186b0"],
+  ["eba48e", "e18485e185afe186b1"],
+  ["eba48e", "eba484e186b1"],
+  ["eba48f", "e18485e185afe186b2"],
+  ["eba48f", "eba484e186b2"],
+  ["eba490", "e18485e185afe186b3"],
+  ["eba490", "eba484e186b3"],
+  ["eba491", "e18485e185afe186b4"],
+  ["eba491", "eba484e186b4"],
+  ["eba492", "e18485e185afe186b5"],
+  ["eba492", "eba484e186b5"],
+  ["eba493", "e18485e185afe186b6"],
+  ["eba493", "eba484e186b6"],
+  ["eba494", "e18485e185afe186b7"],
+  ["eba494", "eba484e186b7"],
+  ["eba495", "e18485e185afe186b8"],
+  ["eba495", "eba484e186b8"],
+  ["eba496", "e18485e185afe186b9"],
+  ["eba496", "eba484e186b9"],
+  ["eba497", "e18485e185afe186ba"],
+  ["eba497", "eba484e186ba"],
+  ["eba498", "e18485e185afe186bb"],
+  ["eba498", "eba484e186bb"],
+  ["eba499", "e18485e185afe186bc"],
+  ["eba499", "eba484e186bc"],
+  ["eba49a", "e18485e185afe186bd"],
+  ["eba49a", "eba484e186bd"],
+  ["eba49b", "e18485e185afe186be"],
+  ["eba49b", "eba484e186be"],
+  ["eba49c", "e18485e185afe186bf"],
+  ["eba49c", "eba484e186bf"],
+  ["eba49d", "e18485e185afe18780"],
+  ["eba49d", "eba484e18780"],
+  ["eba49e", "e18485e185afe18781"],
+  ["eba49e", "eba484e18781"],
+  ["eba49f", "e18485e185afe18782"],
+  ["eba49f", "eba484e18782"],
+  ["eba4a0", "e18485e185b0"],
+  ["eba4a1", "e18485e185b0e186a8"],
+  ["eba4a1", "eba4a0e186a8"],
+  ["eba4a2", "e18485e185b0e186a9"],
+  ["eba4a2", "eba4a0e186a9"],
+  ["eba4a3", "e18485e185b0e186aa"],
+  ["eba4a3", "eba4a0e186aa"],
+  ["eba4a4", "e18485e185b0e186ab"],
+  ["eba4a4", "eba4a0e186ab"],
+  ["eba4a5", "e18485e185b0e186ac"],
+  ["eba4a5", "eba4a0e186ac"],
+  ["eba4a6", "e18485e185b0e186ad"],
+  ["eba4a6", "eba4a0e186ad"],
+  ["eba4a7", "e18485e185b0e186ae"],
+  ["eba4a7", "eba4a0e186ae"],
+  ["eba4a8", "e18485e185b0e186af"],
+  ["eba4a8", "eba4a0e186af"],
+  ["eba4a9", "e18485e185b0e186b0"],
+  ["eba4a9", "eba4a0e186b0"],
+  ["eba4aa", "e18485e185b0e186b1"],
+  ["eba4aa", "eba4a0e186b1"],
+  ["eba4ab", "e18485e185b0e186b2"],
+  ["eba4ab", "eba4a0e186b2"],
+  ["eba4ac", "e18485e185b0e186b3"],
+  ["eba4ac", "eba4a0e186b3"],
+  ["eba4ad", "e18485e185b0e186b4"],
+  ["eba4ad", "eba4a0e186b4"],
+  ["eba4ae", "e18485e185b0e186b5"],
+  ["eba4ae", "eba4a0e186b5"],
+  ["eba4af", "e18485e185b0e186b6"],
+  ["eba4af", "eba4a0e186b6"],
+  ["eba4b0", "e18485e185b0e186b7"],
+  ["eba4b0", "eba4a0e186b7"],
+  ["eba4b1", "e18485e185b0e186b8"],
+  ["eba4b1", "eba4a0e186b8"],
+  ["eba4b2", "e18485e185b0e186b9"],
+  ["eba4b2", "eba4a0e186b9"],
+  ["eba4b3", "e18485e185b0e186ba"],
+  ["eba4b3", "eba4a0e186ba"],
+  ["eba4b4", "e18485e185b0e186bb"],
+  ["eba4b4", "eba4a0e186bb"],
+  ["eba4b5", "e18485e185b0e186bc"],
+  ["eba4b5", "eba4a0e186bc"],
+  ["eba4b6", "e18485e185b0e186bd"],
+  ["eba4b6", "eba4a0e186bd"],
+  ["eba4b7", "e18485e185b0e186be"],
+  ["eba4b7", "eba4a0e186be"],
+  ["eba4b8", "e18485e185b0e186bf"],
+  ["eba4b8", "eba4a0e186bf"],
+  ["eba4b9", "e18485e185b0e18780"],
+  ["eba4b9", "eba4a0e18780"],
+  ["eba4ba", "e18485e185b0e18781"],
+  ["eba4ba", "eba4a0e18781"],
+  ["eba4bb", "e18485e185b0e18782"],
+  ["eba4bb", "eba4a0e18782"],
+  ["eba4bc", "e18485e185b1"],
+  ["eba4bd", "e18485e185b1e186a8"],
+  ["eba4bd", "eba4bce186a8"],
+  ["eba4be", "e18485e185b1e186a9"],
+  ["eba4be", "eba4bce186a9"],
+  ["eba4bf", "e18485e185b1e186aa"],
+  ["eba4bf", "eba4bce186aa"],
+  ["eba580", "e18485e185b1e186ab"],
+  ["eba580", "eba4bce186ab"],
+  ["eba581", "e18485e185b1e186ac"],
+  ["eba581", "eba4bce186ac"],
+  ["eba582", "e18485e185b1e186ad"],
+  ["eba582", "eba4bce186ad"],
+  ["eba583", "e18485e185b1e186ae"],
+  ["eba583", "eba4bce186ae"],
+  ["eba584", "e18485e185b1e186af"],
+  ["eba584", "eba4bce186af"],
+  ["eba585", "e18485e185b1e186b0"],
+  ["eba585", "eba4bce186b0"],
+  ["eba586", "e18485e185b1e186b1"],
+  ["eba586", "eba4bce186b1"],
+  ["eba587", "e18485e185b1e186b2"],
+  ["eba587", "eba4bce186b2"],
+  ["eba588", "e18485e185b1e186b3"],
+  ["eba588", "eba4bce186b3"],
+  ["eba589", "e18485e185b1e186b4"],
+  ["eba589", "eba4bce186b4"],
+  ["eba58a", "e18485e185b1e186b5"],
+  ["eba58a", "eba4bce186b5"],
+  ["eba58b", "e18485e185b1e186b6"],
+  ["eba58b", "eba4bce186b6"],
+  ["eba58c", "e18485e185b1e186b7"],
+  ["eba58c", "eba4bce186b7"],
+  ["eba58d", "e18485e185b1e186b8"],
+  ["eba58d", "eba4bce186b8"],
+  ["eba58e", "e18485e185b1e186b9"],
+  ["eba58e", "eba4bce186b9"],
+  ["eba58f", "e18485e185b1e186ba"],
+  ["eba58f", "eba4bce186ba"],
+  ["eba590", "e18485e185b1e186bb"],
+  ["eba590", "eba4bce186bb"],
+  ["eba591", "e18485e185b1e186bc"],
+  ["eba591", "eba4bce186bc"],
+  ["eba592", "e18485e185b1e186bd"],
+  ["eba592", "eba4bce186bd"],
+  ["eba593", "e18485e185b1e186be"],
+  ["eba593", "eba4bce186be"],
+  ["eba594", "e18485e185b1e186bf"],
+  ["eba594", "eba4bce186bf"],
+  ["eba595", "e18485e185b1e18780"],
+  ["eba595", "eba4bce18780"],
+  ["eba596", "e18485e185b1e18781"],
+  ["eba596", "eba4bce18781"],
+  ["eba597", "e18485e185b1e18782"],
+  ["eba597", "eba4bce18782"],
+  ["eba598", "e18485e185b2"],
+  ["eba599", "e18485e185b2e186a8"],
+  ["eba599", "eba598e186a8"],
+  ["eba59a", "e18485e185b2e186a9"],
+  ["eba59a", "eba598e186a9"],
+  ["eba59b", "e18485e185b2e186aa"],
+  ["eba59b", "eba598e186aa"],
+  ["eba59c", "e18485e185b2e186ab"],
+  ["eba59c", "eba598e186ab"],
+  ["eba59d", "e18485e185b2e186ac"],
+  ["eba59d", "eba598e186ac"],
+  ["eba59e", "e18485e185b2e186ad"],
+  ["eba59e", "eba598e186ad"],
+  ["eba59f", "e18485e185b2e186ae"],
+  ["eba59f", "eba598e186ae"],
+  ["eba5a0", "e18485e185b2e186af"],
+  ["eba5a0", "eba598e186af"],
+  ["eba5a1", "e18485e185b2e186b0"],
+  ["eba5a1", "eba598e186b0"],
+  ["eba5a2", "e18485e185b2e186b1"],
+  ["eba5a2", "eba598e186b1"],
+  ["eba5a3", "e18485e185b2e186b2"],
+  ["eba5a3", "eba598e186b2"],
+  ["eba5a4", "e18485e185b2e186b3"],
+  ["eba5a4", "eba598e186b3"],
+  ["eba5a5", "e18485e185b2e186b4"],
+  ["eba5a5", "eba598e186b4"],
+  ["eba5a6", "e18485e185b2e186b5"],
+  ["eba5a6", "eba598e186b5"],
+  ["eba5a7", "e18485e185b2e186b6"],
+  ["eba5a7", "eba598e186b6"],
+  ["eba5a8", "e18485e185b2e186b7"],
+  ["eba5a8", "eba598e186b7"],
+  ["eba5a9", "e18485e185b2e186b8"],
+  ["eba5a9", "eba598e186b8"],
+  ["eba5aa", "e18485e185b2e186b9"],
+  ["eba5aa", "eba598e186b9"],
+  ["eba5ab", "e18485e185b2e186ba"],
+  ["eba5ab", "eba598e186ba"],
+  ["eba5ac", "e18485e185b2e186bb"],
+  ["eba5ac", "eba598e186bb"],
+  ["eba5ad", "e18485e185b2e186bc"],
+  ["eba5ad", "eba598e186bc"],
+  ["eba5ae", "e18485e185b2e186bd"],
+  ["eba5ae", "eba598e186bd"],
+  ["eba5af", "e18485e185b2e186be"],
+  ["eba5af", "eba598e186be"],
+  ["eba5b0", "e18485e185b2e186bf"],
+  ["eba5b0", "eba598e186bf"],
+  ["eba5b1", "e18485e185b2e18780"],
+  ["eba5b1", "eba598e18780"],
+  ["eba5b2", "e18485e185b2e18781"],
+  ["eba5b2", "eba598e18781"],
+  ["eba5b3", "e18485e185b2e18782"],
+  ["eba5b3", "eba598e18782"],
+  ["eba5b4", "e18485e185b3"],
+  ["eba5b5", "e18485e185b3e186a8"],
+  ["eba5b5", "eba5b4e186a8"],
+  ["eba5b6", "e18485e185b3e186a9"],
+  ["eba5b6", "eba5b4e186a9"],
+  ["eba5b7", "e18485e185b3e186aa"],
+  ["eba5b7", "eba5b4e186aa"],
+  ["eba5b8", "e18485e185b3e186ab"],
+  ["eba5b8", "eba5b4e186ab"],
+  ["eba5b9", "e18485e185b3e186ac"],
+  ["eba5b9", "eba5b4e186ac"],
+  ["eba5ba", "e18485e185b3e186ad"],
+  ["eba5ba", "eba5b4e186ad"],
+  ["eba5bb", "e18485e185b3e186ae"],
+  ["eba5bb", "eba5b4e186ae"],
+  ["eba5bc", "e18485e185b3e186af"],
+  ["eba5bc", "eba5b4e186af"],
+  ["eba5bd", "e18485e185b3e186b0"],
+  ["eba5bd", "eba5b4e186b0"],
+  ["eba5be", "e18485e185b3e186b1"],
+  ["eba5be", "eba5b4e186b1"],
+  ["eba5bf", "e18485e185b3e186b2"],
+  ["eba5bf", "eba5b4e186b2"],
+  ["eba680", "e18485e185b3e186b3"],
+  ["eba680", "eba5b4e186b3"],
+  ["eba681", "e18485e185b3e186b4"],
+  ["eba681", "eba5b4e186b4"],
+  ["eba682", "e18485e185b3e186b5"],
+  ["eba682", "eba5b4e186b5"],
+  ["eba683", "e18485e185b3e186b6"],
+  ["eba683", "eba5b4e186b6"],
+  ["eba684", "e18485e185b3e186b7"],
+  ["eba684", "eba5b4e186b7"],
+  ["eba685", "e18485e185b3e186b8"],
+  ["eba685", "eba5b4e186b8"],
+  ["eba686", "e18485e185b3e186b9"],
+  ["eba686", "eba5b4e186b9"],
+  ["eba687", "e18485e185b3e186ba"],
+  ["eba687", "eba5b4e186ba"],
+  ["eba688", "e18485e185b3e186bb"],
+  ["eba688", "eba5b4e186bb"],
+  ["eba689", "e18485e185b3e186bc"],
+  ["eba689", "eba5b4e186bc"],
+  ["eba68a", "e18485e185b3e186bd"],
+  ["eba68a", "eba5b4e186bd"],
+  ["eba68b", "e18485e185b3e186be"],
+  ["eba68b", "eba5b4e186be"],
+  ["eba68c", "e18485e185b3e186bf"],
+  ["eba68c", "eba5b4e186bf"],
+  ["eba68d", "e18485e185b3e18780"],
+  ["eba68d", "eba5b4e18780"],
+  ["eba68e", "e18485e185b3e18781"],
+  ["eba68e", "eba5b4e18781"],
+  ["eba68f", "e18485e185b3e18782"],
+  ["eba68f", "eba5b4e18782"],
+  ["eba690", "e18485e185b4"],
+  ["eba691", "e18485e185b4e186a8"],
+  ["eba691", "eba690e186a8"],
+  ["eba692", "e18485e185b4e186a9"],
+  ["eba692", "eba690e186a9"],
+  ["eba693", "e18485e185b4e186aa"],
+  ["eba693", "eba690e186aa"],
+  ["eba694", "e18485e185b4e186ab"],
+  ["eba694", "eba690e186ab"],
+  ["eba695", "e18485e185b4e186ac"],
+  ["eba695", "eba690e186ac"],
+  ["eba696", "e18485e185b4e186ad"],
+  ["eba696", "eba690e186ad"],
+  ["eba697", "e18485e185b4e186ae"],
+  ["eba697", "eba690e186ae"],
+  ["eba698", "e18485e185b4e186af"],
+  ["eba698", "eba690e186af"],
+  ["eba699", "e18485e185b4e186b0"],
+  ["eba699", "eba690e186b0"],
+  ["eba69a", "e18485e185b4e186b1"],
+  ["eba69a", "eba690e186b1"],
+  ["eba69b", "e18485e185b4e186b2"],
+  ["eba69b", "eba690e186b2"],
+  ["eba69c", "e18485e185b4e186b3"],
+  ["eba69c", "eba690e186b3"],
+  ["eba69d", "e18485e185b4e186b4"],
+  ["eba69d", "eba690e186b4"],
+  ["eba69e", "e18485e185b4e186b5"],
+  ["eba69e", "eba690e186b5"],
+  ["eba69f", "e18485e185b4e186b6"],
+  ["eba69f", "eba690e186b6"],
+  ["eba6a0", "e18485e185b4e186b7"],
+  ["eba6a0", "eba690e186b7"],
+  ["eba6a1", "e18485e185b4e186b8"],
+  ["eba6a1", "eba690e186b8"],
+  ["eba6a2", "e18485e185b4e186b9"],
+  ["eba6a2", "eba690e186b9"],
+  ["eba6a3", "e18485e185b4e186ba"],
+  ["eba6a3", "eba690e186ba"],
+  ["eba6a4", "e18485e185b4e186bb"],
+  ["eba6a4", "eba690e186bb"],
+  ["eba6a5", "e18485e185b4e186bc"],
+  ["eba6a5", "eba690e186bc"],
+  ["eba6a6", "e18485e185b4e186bd"],
+  ["eba6a6", "eba690e186bd"],
+  ["eba6a7", "e18485e185b4e186be"],
+  ["eba6a7", "eba690e186be"],
+  ["eba6a8", "e18485e185b4e186bf"],
+  ["eba6a8", "eba690e186bf"],
+  ["eba6a9", "e18485e185b4e18780"],
+  ["eba6a9", "eba690e18780"],
+  ["eba6aa", "e18485e185b4e18781"],
+  ["eba6aa", "eba690e18781"],
+  ["eba6ab", "e18485e185b4e18782"],
+  ["eba6ab", "eba690e18782"],
+  ["eba6ac", "e18485e185b5"],
+  ["eba6ad", "e18485e185b5e186a8"],
+  ["eba6ad", "eba6ace186a8"],
+  ["eba6ae", "e18485e185b5e186a9"],
+  ["eba6ae", "eba6ace186a9"],
+  ["eba6af", "e18485e185b5e186aa"],
+  ["eba6af", "eba6ace186aa"],
+  ["eba6b0", "e18485e185b5e186ab"],
+  ["eba6b0", "eba6ace186ab"],
+  ["eba6b1", "e18485e185b5e186ac"],
+  ["eba6b1", "eba6ace186ac"],
+  ["eba6b2", "e18485e185b5e186ad"],
+  ["eba6b2", "eba6ace186ad"],
+  ["eba6b3", "e18485e185b5e186ae"],
+  ["eba6b3", "eba6ace186ae"],
+  ["eba6b4", "e18485e185b5e186af"],
+  ["eba6b4", "eba6ace186af"],
+  ["eba6b5", "e18485e185b5e186b0"],
+  ["eba6b5", "eba6ace186b0"],
+  ["eba6b6", "e18485e185b5e186b1"],
+  ["eba6b6", "eba6ace186b1"],
+  ["eba6b7", "e18485e185b5e186b2"],
+  ["eba6b7", "eba6ace186b2"],
+  ["eba6b8", "e18485e185b5e186b3"],
+  ["eba6b8", "eba6ace186b3"],
+  ["eba6b9", "e18485e185b5e186b4"],
+  ["eba6b9", "eba6ace186b4"],
+  ["eba6ba", "e18485e185b5e186b5"],
+  ["eba6ba", "eba6ace186b5"],
+  ["eba6bb", "e18485e185b5e186b6"],
+  ["eba6bb", "eba6ace186b6"],
+  ["eba6bc", "e18485e185b5e186b7"],
+  ["eba6bc", "eba6ace186b7"],
+  ["eba6bd", "e18485e185b5e186b8"],
+  ["eba6bd", "eba6ace186b8"],
+  ["eba6be", "e18485e185b5e186b9"],
+  ["eba6be", "eba6ace186b9"],
+  ["eba6bf", "e18485e185b5e186ba"],
+  ["eba6bf", "eba6ace186ba"],
+  ["eba780", "e18485e185b5e186bb"],
+  ["eba780", "eba6ace186bb"],
+  ["eba781", "e18485e185b5e186bc"],
+  ["eba781", "eba6ace186bc"],
+  ["eba782", "e18485e185b5e186bd"],
+  ["eba782", "eba6ace186bd"],
+  ["eba783", "e18485e185b5e186be"],
+  ["eba783", "eba6ace186be"],
+  ["eba784", "e18485e185b5e186bf"],
+  ["eba784", "eba6ace186bf"],
+  ["eba785", "e18485e185b5e18780"],
+  ["eba785", "eba6ace18780"],
+  ["eba786", "e18485e185b5e18781"],
+  ["eba786", "eba6ace18781"],
+  ["eba787", "e18485e185b5e18782"],
+  ["eba787", "eba6ace18782"],
+  ["eba788", "e18486e185a1"],
+  ["eba789", "e18486e185a1e186a8"],
+  ["eba789", "eba788e186a8"],
+  ["eba78a", "e18486e185a1e186a9"],
+  ["eba78a", "eba788e186a9"],
+  ["eba78b", "e18486e185a1e186aa"],
+  ["eba78b", "eba788e186aa"],
+  ["eba78c", "e18486e185a1e186ab"],
+  ["eba78c", "eba788e186ab"],
+  ["eba78d", "e18486e185a1e186ac"],
+  ["eba78d", "eba788e186ac"],
+  ["eba78e", "e18486e185a1e186ad"],
+  ["eba78e", "eba788e186ad"],
+  ["eba78f", "e18486e185a1e186ae"],
+  ["eba78f", "eba788e186ae"],
+  ["eba790", "e18486e185a1e186af"],
+  ["eba790", "eba788e186af"],
+  ["eba791", "e18486e185a1e186b0"],
+  ["eba791", "eba788e186b0"],
+  ["eba792", "e18486e185a1e186b1"],
+  ["eba792", "eba788e186b1"],
+  ["eba793", "e18486e185a1e186b2"],
+  ["eba793", "eba788e186b2"],
+  ["eba794", "e18486e185a1e186b3"],
+  ["eba794", "eba788e186b3"],
+  ["eba795", "e18486e185a1e186b4"],
+  ["eba795", "eba788e186b4"],
+  ["eba796", "e18486e185a1e186b5"],
+  ["eba796", "eba788e186b5"],
+  ["eba797", "e18486e185a1e186b6"],
+  ["eba797", "eba788e186b6"],
+  ["eba798", "e18486e185a1e186b7"],
+  ["eba798", "eba788e186b7"],
+  ["eba799", "e18486e185a1e186b8"],
+  ["eba799", "eba788e186b8"],
+  ["eba79a", "e18486e185a1e186b9"],
+  ["eba79a", "eba788e186b9"],
+  ["eba79b", "e18486e185a1e186ba"],
+  ["eba79b", "eba788e186ba"],
+  ["eba79c", "e18486e185a1e186bb"],
+  ["eba79c", "eba788e186bb"],
+  ["eba79d", "e18486e185a1e186bc"],
+  ["eba79d", "eba788e186bc"],
+  ["eba79e", "e18486e185a1e186bd"],
+  ["eba79e", "eba788e186bd"],
+  ["eba79f", "e18486e185a1e186be"],
+  ["eba79f", "eba788e186be"],
+  ["eba7a0", "e18486e185a1e186bf"],
+  ["eba7a0", "eba788e186bf"],
+  ["eba7a1", "e18486e185a1e18780"],
+  ["eba7a1", "eba788e18780"],
+  ["eba7a2", "e18486e185a1e18781"],
+  ["eba7a2", "eba788e18781"],
+  ["eba7a3", "e18486e185a1e18782"],
+  ["eba7a3", "eba788e18782"],
+  ["eba7a4", "e18486e185a2"],
+  ["eba7a5", "e18486e185a2e186a8"],
+  ["eba7a5", "eba7a4e186a8"],
+  ["eba7a6", "e18486e185a2e186a9"],
+  ["eba7a6", "eba7a4e186a9"],
+  ["eba7a7", "e18486e185a2e186aa"],
+  ["eba7a7", "eba7a4e186aa"],
+  ["eba7a8", "e18486e185a2e186ab"],
+  ["eba7a8", "eba7a4e186ab"],
+  ["eba7a9", "e18486e185a2e186ac"],
+  ["eba7a9", "eba7a4e186ac"],
+  ["eba7aa", "e18486e185a2e186ad"],
+  ["eba7aa", "eba7a4e186ad"],
+  ["eba7ab", "e18486e185a2e186ae"],
+  ["eba7ab", "eba7a4e186ae"],
+  ["eba7ac", "e18486e185a2e186af"],
+  ["eba7ac", "eba7a4e186af"],
+  ["eba7ad", "e18486e185a2e186b0"],
+  ["eba7ad", "eba7a4e186b0"],
+  ["eba7ae", "e18486e185a2e186b1"],
+  ["eba7ae", "eba7a4e186b1"],
+  ["eba7af", "e18486e185a2e186b2"],
+  ["eba7af", "eba7a4e186b2"],
+  ["eba7b0", "e18486e185a2e186b3"],
+  ["eba7b0", "eba7a4e186b3"],
+  ["eba7b1", "e18486e185a2e186b4"],
+  ["eba7b1", "eba7a4e186b4"],
+  ["eba7b2", "e18486e185a2e186b5"],
+  ["eba7b2", "eba7a4e186b5"],
+  ["eba7b3", "e18486e185a2e186b6"],
+  ["eba7b3", "eba7a4e186b6"],
+  ["eba7b4", "e18486e185a2e186b7"],
+  ["eba7b4", "eba7a4e186b7"],
+  ["eba7b5", "e18486e185a2e186b8"],
+  ["eba7b5", "eba7a4e186b8"],
+  ["eba7b6", "e18486e185a2e186b9"],
+  ["eba7b6", "eba7a4e186b9"],
+  ["eba7b7", "e18486e185a2e186ba"],
+  ["eba7b7", "eba7a4e186ba"],
+  ["eba7b8", "e18486e185a2e186bb"],
+  ["eba7b8", "eba7a4e186bb"],
+  ["eba7b9", "e18486e185a2e186bc"],
+  ["eba7b9", "eba7a4e186bc"],
+  ["eba7ba", "e18486e185a2e186bd"],
+  ["eba7ba", "eba7a4e186bd"],
+  ["eba7bb", "e18486e185a2e186be"],
+  ["eba7bb", "eba7a4e186be"],
+  ["eba7bc", "e18486e185a2e186bf"],
+  ["eba7bc", "eba7a4e186bf"],
+  ["eba7bd", "e18486e185a2e18780"],
+  ["eba7bd", "eba7a4e18780"],
+  ["eba7be", "e18486e185a2e18781"],
+  ["eba7be", "eba7a4e18781"],
+  ["eba7bf", "e18486e185a2e18782"],
+  ["eba7bf", "eba7a4e18782"],
+  ["eba880", "e18486e185a3"],
+  ["eba881", "e18486e185a3e186a8"],
+  ["eba881", "eba880e186a8"],
+  ["eba882", "e18486e185a3e186a9"],
+  ["eba882", "eba880e186a9"],
+  ["eba883", "e18486e185a3e186aa"],
+  ["eba883", "eba880e186aa"],
+  ["eba884", "e18486e185a3e186ab"],
+  ["eba884", "eba880e186ab"],
+  ["eba885", "e18486e185a3e186ac"],
+  ["eba885", "eba880e186ac"],
+  ["eba886", "e18486e185a3e186ad"],
+  ["eba886", "eba880e186ad"],
+  ["eba887", "e18486e185a3e186ae"],
+  ["eba887", "eba880e186ae"],
+  ["eba888", "e18486e185a3e186af"],
+  ["eba888", "eba880e186af"],
+  ["eba889", "e18486e185a3e186b0"],
+  ["eba889", "eba880e186b0"],
+  ["eba88a", "e18486e185a3e186b1"],
+  ["eba88a", "eba880e186b1"],
+  ["eba88b", "e18486e185a3e186b2"],
+  ["eba88b", "eba880e186b2"],
+  ["eba88c", "e18486e185a3e186b3"],
+  ["eba88c", "eba880e186b3"],
+  ["eba88d", "e18486e185a3e186b4"],
+  ["eba88d", "eba880e186b4"],
+  ["eba88e", "e18486e185a3e186b5"],
+  ["eba88e", "eba880e186b5"],
+  ["eba88f", "e18486e185a3e186b6"],
+  ["eba88f", "eba880e186b6"],
+  ["eba890", "e18486e185a3e186b7"],
+  ["eba890", "eba880e186b7"],
+  ["eba891", "e18486e185a3e186b8"],
+  ["eba891", "eba880e186b8"],
+  ["eba892", "e18486e185a3e186b9"],
+  ["eba892", "eba880e186b9"],
+  ["eba893", "e18486e185a3e186ba"],
+  ["eba893", "eba880e186ba"],
+  ["eba894", "e18486e185a3e186bb"],
+  ["eba894", "eba880e186bb"],
+  ["eba895", "e18486e185a3e186bc"],
+  ["eba895", "eba880e186bc"],
+  ["eba896", "e18486e185a3e186bd"],
+  ["eba896", "eba880e186bd"],
+  ["eba897", "e18486e185a3e186be"],
+  ["eba897", "eba880e186be"],
+  ["eba898", "e18486e185a3e186bf"],
+  ["eba898", "eba880e186bf"],
+  ["eba899", "e18486e185a3e18780"],
+  ["eba899", "eba880e18780"],
+  ["eba89a", "e18486e185a3e18781"],
+  ["eba89a", "eba880e18781"],
+  ["eba89b", "e18486e185a3e18782"],
+  ["eba89b", "eba880e18782"],
+  ["eba89c", "e18486e185a4"],
+  ["eba89d", "e18486e185a4e186a8"],
+  ["eba89d", "eba89ce186a8"],
+  ["eba89e", "e18486e185a4e186a9"],
+  ["eba89e", "eba89ce186a9"],
+  ["eba89f", "e18486e185a4e186aa"],
+  ["eba89f", "eba89ce186aa"],
+  ["eba8a0", "e18486e185a4e186ab"],
+  ["eba8a0", "eba89ce186ab"],
+  ["eba8a1", "e18486e185a4e186ac"],
+  ["eba8a1", "eba89ce186ac"],
+  ["eba8a2", "e18486e185a4e186ad"],
+  ["eba8a2", "eba89ce186ad"],
+  ["eba8a3", "e18486e185a4e186ae"],
+  ["eba8a3", "eba89ce186ae"],
+  ["eba8a4", "e18486e185a4e186af"],
+  ["eba8a4", "eba89ce186af"],
+  ["eba8a5", "e18486e185a4e186b0"],
+  ["eba8a5", "eba89ce186b0"],
+  ["eba8a6", "e18486e185a4e186b1"],
+  ["eba8a6", "eba89ce186b1"],
+  ["eba8a7", "e18486e185a4e186b2"],
+  ["eba8a7", "eba89ce186b2"],
+  ["eba8a8", "e18486e185a4e186b3"],
+  ["eba8a8", "eba89ce186b3"],
+  ["eba8a9", "e18486e185a4e186b4"],
+  ["eba8a9", "eba89ce186b4"],
+  ["eba8aa", "e18486e185a4e186b5"],
+  ["eba8aa", "eba89ce186b5"],
+  ["eba8ab", "e18486e185a4e186b6"],
+  ["eba8ab", "eba89ce186b6"],
+  ["eba8ac", "e18486e185a4e186b7"],
+  ["eba8ac", "eba89ce186b7"],
+  ["eba8ad", "e18486e185a4e186b8"],
+  ["eba8ad", "eba89ce186b8"],
+  ["eba8ae", "e18486e185a4e186b9"],
+  ["eba8ae", "eba89ce186b9"],
+  ["eba8af", "e18486e185a4e186ba"],
+  ["eba8af", "eba89ce186ba"],
+  ["eba8b0", "e18486e185a4e186bb"],
+  ["eba8b0", "eba89ce186bb"],
+  ["eba8b1", "e18486e185a4e186bc"],
+  ["eba8b1", "eba89ce186bc"],
+  ["eba8b2", "e18486e185a4e186bd"],
+  ["eba8b2", "eba89ce186bd"],
+  ["eba8b3", "e18486e185a4e186be"],
+  ["eba8b3", "eba89ce186be"],
+  ["eba8b4", "e18486e185a4e186bf"],
+  ["eba8b4", "eba89ce186bf"],
+  ["eba8b5", "e18486e185a4e18780"],
+  ["eba8b5", "eba89ce18780"],
+  ["eba8b6", "e18486e185a4e18781"],
+  ["eba8b6", "eba89ce18781"],
+  ["eba8b7", "e18486e185a4e18782"],
+  ["eba8b7", "eba89ce18782"],
+  ["eba8b8", "e18486e185a5"],
+  ["eba8b9", "e18486e185a5e186a8"],
+  ["eba8b9", "eba8b8e186a8"],
+  ["eba8ba", "e18486e185a5e186a9"],
+  ["eba8ba", "eba8b8e186a9"],
+  ["eba8bb", "e18486e185a5e186aa"],
+  ["eba8bb", "eba8b8e186aa"],
+  ["eba8bc", "e18486e185a5e186ab"],
+  ["eba8bc", "eba8b8e186ab"],
+  ["eba8bd", "e18486e185a5e186ac"],
+  ["eba8bd", "eba8b8e186ac"],
+  ["eba8be", "e18486e185a5e186ad"],
+  ["eba8be", "eba8b8e186ad"],
+  ["eba8bf", "e18486e185a5e186ae"],
+  ["eba8bf", "eba8b8e186ae"],
+  ["eba980", "e18486e185a5e186af"],
+  ["eba980", "eba8b8e186af"],
+  ["eba981", "e18486e185a5e186b0"],
+  ["eba981", "eba8b8e186b0"],
+  ["eba982", "e18486e185a5e186b1"],
+  ["eba982", "eba8b8e186b1"],
+  ["eba983", "e18486e185a5e186b2"],
+  ["eba983", "eba8b8e186b2"],
+  ["eba984", "e18486e185a5e186b3"],
+  ["eba984", "eba8b8e186b3"],
+  ["eba985", "e18486e185a5e186b4"],
+  ["eba985", "eba8b8e186b4"],
+  ["eba986", "e18486e185a5e186b5"],
+  ["eba986", "eba8b8e186b5"],
+  ["eba987", "e18486e185a5e186b6"],
+  ["eba987", "eba8b8e186b6"],
+  ["eba988", "e18486e185a5e186b7"],
+  ["eba988", "eba8b8e186b7"],
+  ["eba989", "e18486e185a5e186b8"],
+  ["eba989", "eba8b8e186b8"],
+  ["eba98a", "e18486e185a5e186b9"],
+  ["eba98a", "eba8b8e186b9"],
+  ["eba98b", "e18486e185a5e186ba"],
+  ["eba98b", "eba8b8e186ba"],
+  ["eba98c", "e18486e185a5e186bb"],
+  ["eba98c", "eba8b8e186bb"],
+  ["eba98d", "e18486e185a5e186bc"],
+  ["eba98d", "eba8b8e186bc"],
+  ["eba98e", "e18486e185a5e186bd"],
+  ["eba98e", "eba8b8e186bd"],
+  ["eba98f", "e18486e185a5e186be"],
+  ["eba98f", "eba8b8e186be"],
+  ["eba990", "e18486e185a5e186bf"],
+  ["eba990", "eba8b8e186bf"],
+  ["eba991", "e18486e185a5e18780"],
+  ["eba991", "eba8b8e18780"],
+  ["eba992", "e18486e185a5e18781"],
+  ["eba992", "eba8b8e18781"],
+  ["eba993", "e18486e185a5e18782"],
+  ["eba993", "eba8b8e18782"],
+  ["eba994", "e18486e185a6"],
+  ["eba995", "e18486e185a6e186a8"],
+  ["eba995", "eba994e186a8"],
+  ["eba996", "e18486e185a6e186a9"],
+  ["eba996", "eba994e186a9"],
+  ["eba997", "e18486e185a6e186aa"],
+  ["eba997", "eba994e186aa"],
+  ["eba998", "e18486e185a6e186ab"],
+  ["eba998", "eba994e186ab"],
+  ["eba999", "e18486e185a6e186ac"],
+  ["eba999", "eba994e186ac"],
+  ["eba99a", "e18486e185a6e186ad"],
+  ["eba99a", "eba994e186ad"],
+  ["eba99b", "e18486e185a6e186ae"],
+  ["eba99b", "eba994e186ae"],
+  ["eba99c", "e18486e185a6e186af"],
+  ["eba99c", "eba994e186af"],
+  ["eba99d", "e18486e185a6e186b0"],
+  ["eba99d", "eba994e186b0"],
+  ["eba99e", "e18486e185a6e186b1"],
+  ["eba99e", "eba994e186b1"],
+  ["eba99f", "e18486e185a6e186b2"],
+  ["eba99f", "eba994e186b2"],
+  ["eba9a0", "e18486e185a6e186b3"],
+  ["eba9a0", "eba994e186b3"],
+  ["eba9a1", "e18486e185a6e186b4"],
+  ["eba9a1", "eba994e186b4"],
+  ["eba9a2", "e18486e185a6e186b5"],
+  ["eba9a2", "eba994e186b5"],
+  ["eba9a3", "e18486e185a6e186b6"],
+  ["eba9a3", "eba994e186b6"],
+  ["eba9a4", "e18486e185a6e186b7"],
+  ["eba9a4", "eba994e186b7"],
+  ["eba9a5", "e18486e185a6e186b8"],
+  ["eba9a5", "eba994e186b8"],
+  ["eba9a6", "e18486e185a6e186b9"],
+  ["eba9a6", "eba994e186b9"],
+  ["eba9a7", "e18486e185a6e186ba"],
+  ["eba9a7", "eba994e186ba"],
+  ["eba9a8", "e18486e185a6e186bb"],
+  ["eba9a8", "eba994e186bb"],
+  ["eba9a9", "e18486e185a6e186bc"],
+  ["eba9a9", "eba994e186bc"],
+  ["eba9aa", "e18486e185a6e186bd"],
+  ["eba9aa", "eba994e186bd"],
+  ["eba9ab", "e18486e185a6e186be"],
+  ["eba9ab", "eba994e186be"],
+  ["eba9ac", "e18486e185a6e186bf"],
+  ["eba9ac", "eba994e186bf"],
+  ["eba9ad", "e18486e185a6e18780"],
+  ["eba9ad", "eba994e18780"],
+  ["eba9ae", "e18486e185a6e18781"],
+  ["eba9ae", "eba994e18781"],
+  ["eba9af", "e18486e185a6e18782"],
+  ["eba9af", "eba994e18782"],
+  ["eba9b0", "e18486e185a7"],
+  ["eba9b1", "e18486e185a7e186a8"],
+  ["eba9b1", "eba9b0e186a8"],
+  ["eba9b2", "e18486e185a7e186a9"],
+  ["eba9b2", "eba9b0e186a9"],
+  ["eba9b3", "e18486e185a7e186aa"],
+  ["eba9b3", "eba9b0e186aa"],
+  ["eba9b4", "e18486e185a7e186ab"],
+  ["eba9b4", "eba9b0e186ab"],
+  ["eba9b5", "e18486e185a7e186ac"],
+  ["eba9b5", "eba9b0e186ac"],
+  ["eba9b6", "e18486e185a7e186ad"],
+  ["eba9b6", "eba9b0e186ad"],
+  ["eba9b7", "e18486e185a7e186ae"],
+  ["eba9b7", "eba9b0e186ae"],
+  ["eba9b8", "e18486e185a7e186af"],
+  ["eba9b8", "eba9b0e186af"],
+  ["eba9b9", "e18486e185a7e186b0"],
+  ["eba9b9", "eba9b0e186b0"],
+  ["eba9ba", "e18486e185a7e186b1"],
+  ["eba9ba", "eba9b0e186b1"],
+  ["eba9bb", "e18486e185a7e186b2"],
+  ["eba9bb", "eba9b0e186b2"],
+  ["eba9bc", "e18486e185a7e186b3"],
+  ["eba9bc", "eba9b0e186b3"],
+  ["eba9bd", "e18486e185a7e186b4"],
+  ["eba9bd", "eba9b0e186b4"],
+  ["eba9be", "e18486e185a7e186b5"],
+  ["eba9be", "eba9b0e186b5"],
+  ["eba9bf", "e18486e185a7e186b6"],
+  ["eba9bf", "eba9b0e186b6"],
+  ["ebaa80", "e18486e185a7e186b7"],
+  ["ebaa80", "eba9b0e186b7"],
+  ["ebaa81", "e18486e185a7e186b8"],
+  ["ebaa81", "eba9b0e186b8"],
+  ["ebaa82", "e18486e185a7e186b9"],
+  ["ebaa82", "eba9b0e186b9"],
+  ["ebaa83", "e18486e185a7e186ba"],
+  ["ebaa83", "eba9b0e186ba"],
+  ["ebaa84", "e18486e185a7e186bb"],
+  ["ebaa84", "eba9b0e186bb"],
+  ["ebaa85", "e18486e185a7e186bc"],
+  ["ebaa85", "eba9b0e186bc"],
+  ["ebaa86", "e18486e185a7e186bd"],
+  ["ebaa86", "eba9b0e186bd"],
+  ["ebaa87", "e18486e185a7e186be"],
+  ["ebaa87", "eba9b0e186be"],
+  ["ebaa88", "e18486e185a7e186bf"],
+  ["ebaa88", "eba9b0e186bf"],
+  ["ebaa89", "e18486e185a7e18780"],
+  ["ebaa89", "eba9b0e18780"],
+  ["ebaa8a", "e18486e185a7e18781"],
+  ["ebaa8a", "eba9b0e18781"],
+  ["ebaa8b", "e18486e185a7e18782"],
+  ["ebaa8b", "eba9b0e18782"],
+  ["ebaa8c", "e18486e185a8"],
+  ["ebaa8d", "e18486e185a8e186a8"],
+  ["ebaa8d", "ebaa8ce186a8"],
+  ["ebaa8e", "e18486e185a8e186a9"],
+  ["ebaa8e", "ebaa8ce186a9"],
+  ["ebaa8f", "e18486e185a8e186aa"],
+  ["ebaa8f", "ebaa8ce186aa"],
+  ["ebaa90", "e18486e185a8e186ab"],
+  ["ebaa90", "ebaa8ce186ab"],
+  ["ebaa91", "e18486e185a8e186ac"],
+  ["ebaa91", "ebaa8ce186ac"],
+  ["ebaa92", "e18486e185a8e186ad"],
+  ["ebaa92", "ebaa8ce186ad"],
+  ["ebaa93", "e18486e185a8e186ae"],
+  ["ebaa93", "ebaa8ce186ae"],
+  ["ebaa94", "e18486e185a8e186af"],
+  ["ebaa94", "ebaa8ce186af"],
+  ["ebaa95", "e18486e185a8e186b0"],
+  ["ebaa95", "ebaa8ce186b0"],
+  ["ebaa96", "e18486e185a8e186b1"],
+  ["ebaa96", "ebaa8ce186b1"],
+  ["ebaa97", "e18486e185a8e186b2"],
+  ["ebaa97", "ebaa8ce186b2"],
+  ["ebaa98", "e18486e185a8e186b3"],
+  ["ebaa98", "ebaa8ce186b3"],
+  ["ebaa99", "e18486e185a8e186b4"],
+  ["ebaa99", "ebaa8ce186b4"],
+  ["ebaa9a", "e18486e185a8e186b5"],
+  ["ebaa9a", "ebaa8ce186b5"],
+  ["ebaa9b", "e18486e185a8e186b6"],
+  ["ebaa9b", "ebaa8ce186b6"],
+  ["ebaa9c", "e18486e185a8e186b7"],
+  ["ebaa9c", "ebaa8ce186b7"],
+  ["ebaa9d", "e18486e185a8e186b8"],
+  ["ebaa9d", "ebaa8ce186b8"],
+  ["ebaa9e", "e18486e185a8e186b9"],
+  ["ebaa9e", "ebaa8ce186b9"],
+  ["ebaa9f", "e18486e185a8e186ba"],
+  ["ebaa9f", "ebaa8ce186ba"],
+  ["ebaaa0", "e18486e185a8e186bb"],
+  ["ebaaa0", "ebaa8ce186bb"],
+  ["ebaaa1", "e18486e185a8e186bc"],
+  ["ebaaa1", "ebaa8ce186bc"],
+  ["ebaaa2", "e18486e185a8e186bd"],
+  ["ebaaa2", "ebaa8ce186bd"],
+  ["ebaaa3", "e18486e185a8e186be"],
+  ["ebaaa3", "ebaa8ce186be"],
+  ["ebaaa4", "e18486e185a8e186bf"],
+  ["ebaaa4", "ebaa8ce186bf"],
+  ["ebaaa5", "e18486e185a8e18780"],
+  ["ebaaa5", "ebaa8ce18780"],
+  ["ebaaa6", "e18486e185a8e18781"],
+  ["ebaaa6", "ebaa8ce18781"],
+  ["ebaaa7", "e18486e185a8e18782"],
+  ["ebaaa7", "ebaa8ce18782"],
+  ["ebaaa8", "e18486e185a9"],
+  ["ebaaa9", "e18486e185a9e186a8"],
+  ["ebaaa9", "ebaaa8e186a8"],
+  ["ebaaaa", "e18486e185a9e186a9"],
+  ["ebaaaa", "ebaaa8e186a9"],
+  ["ebaaab", "e18486e185a9e186aa"],
+  ["ebaaab", "ebaaa8e186aa"],
+  ["ebaaac", "e18486e185a9e186ab"],
+  ["ebaaac", "ebaaa8e186ab"],
+  ["ebaaad", "e18486e185a9e186ac"],
+  ["ebaaad", "ebaaa8e186ac"],
+  ["ebaaae", "e18486e185a9e186ad"],
+  ["ebaaae", "ebaaa8e186ad"],
+  ["ebaaaf", "e18486e185a9e186ae"],
+  ["ebaaaf", "ebaaa8e186ae"],
+  ["ebaab0", "e18486e185a9e186af"],
+  ["ebaab0", "ebaaa8e186af"],
+  ["ebaab1", "e18486e185a9e186b0"],
+  ["ebaab1", "ebaaa8e186b0"],
+  ["ebaab2", "e18486e185a9e186b1"],
+  ["ebaab2", "ebaaa8e186b1"],
+  ["ebaab3", "e18486e185a9e186b2"],
+  ["ebaab3", "ebaaa8e186b2"],
+  ["ebaab4", "e18486e185a9e186b3"],
+  ["ebaab4", "ebaaa8e186b3"],
+  ["ebaab5", "e18486e185a9e186b4"],
+  ["ebaab5", "ebaaa8e186b4"],
+  ["ebaab6", "e18486e185a9e186b5"],
+  ["ebaab6", "ebaaa8e186b5"],
+  ["ebaab7", "e18486e185a9e186b6"],
+  ["ebaab7", "ebaaa8e186b6"],
+  ["ebaab8", "e18486e185a9e186b7"],
+  ["ebaab8", "ebaaa8e186b7"],
+  ["ebaab9", "e18486e185a9e186b8"],
+  ["ebaab9", "ebaaa8e186b8"],
+  ["ebaaba", "e18486e185a9e186b9"],
+  ["ebaaba", "ebaaa8e186b9"],
+  ["ebaabb", "e18486e185a9e186ba"],
+  ["ebaabb", "ebaaa8e186ba"],
+  ["ebaabc", "e18486e185a9e186bb"],
+  ["ebaabc", "ebaaa8e186bb"],
+  ["ebaabd", "e18486e185a9e186bc"],
+  ["ebaabd", "ebaaa8e186bc"],
+  ["ebaabe", "e18486e185a9e186bd"],
+  ["ebaabe", "ebaaa8e186bd"],
+  ["ebaabf", "e18486e185a9e186be"],
+  ["ebaabf", "ebaaa8e186be"],
+  ["ebab80", "e18486e185a9e186bf"],
+  ["ebab80", "ebaaa8e186bf"],
+  ["ebab81", "e18486e185a9e18780"],
+  ["ebab81", "ebaaa8e18780"],
+  ["ebab82", "e18486e185a9e18781"],
+  ["ebab82", "ebaaa8e18781"],
+  ["ebab83", "e18486e185a9e18782"],
+  ["ebab83", "ebaaa8e18782"],
+  ["ebab84", "e18486e185aa"],
+  ["ebab85", "e18486e185aae186a8"],
+  ["ebab85", "ebab84e186a8"],
+  ["ebab86", "e18486e185aae186a9"],
+  ["ebab86", "ebab84e186a9"],
+  ["ebab87", "e18486e185aae186aa"],
+  ["ebab87", "ebab84e186aa"],
+  ["ebab88", "e18486e185aae186ab"],
+  ["ebab88", "ebab84e186ab"],
+  ["ebab89", "e18486e185aae186ac"],
+  ["ebab89", "ebab84e186ac"],
+  ["ebab8a", "e18486e185aae186ad"],
+  ["ebab8a", "ebab84e186ad"],
+  ["ebab8b", "e18486e185aae186ae"],
+  ["ebab8b", "ebab84e186ae"],
+  ["ebab8c", "e18486e185aae186af"],
+  ["ebab8c", "ebab84e186af"],
+  ["ebab8d", "e18486e185aae186b0"],
+  ["ebab8d", "ebab84e186b0"],
+  ["ebab8e", "e18486e185aae186b1"],
+  ["ebab8e", "ebab84e186b1"],
+  ["ebab8f", "e18486e185aae186b2"],
+  ["ebab8f", "ebab84e186b2"],
+  ["ebab90", "e18486e185aae186b3"],
+  ["ebab90", "ebab84e186b3"],
+  ["ebab91", "e18486e185aae186b4"],
+  ["ebab91", "ebab84e186b4"],
+  ["ebab92", "e18486e185aae186b5"],
+  ["ebab92", "ebab84e186b5"],
+  ["ebab93", "e18486e185aae186b6"],
+  ["ebab93", "ebab84e186b6"],
+  ["ebab94", "e18486e185aae186b7"],
+  ["ebab94", "ebab84e186b7"],
+  ["ebab95", "e18486e185aae186b8"],
+  ["ebab95", "ebab84e186b8"],
+  ["ebab96", "e18486e185aae186b9"],
+  ["ebab96", "ebab84e186b9"],
+  ["ebab97", "e18486e185aae186ba"],
+  ["ebab97", "ebab84e186ba"],
+  ["ebab98", "e18486e185aae186bb"],
+  ["ebab98", "ebab84e186bb"],
+  ["ebab99", "e18486e185aae186bc"],
+  ["ebab99", "ebab84e186bc"],
+  ["ebab9a", "e18486e185aae186bd"],
+  ["ebab9a", "ebab84e186bd"],
+  ["ebab9b", "e18486e185aae186be"],
+  ["ebab9b", "ebab84e186be"],
+  ["ebab9c", "e18486e185aae186bf"],
+  ["ebab9c", "ebab84e186bf"],
+  ["ebab9d", "e18486e185aae18780"],
+  ["ebab9d", "ebab84e18780"],
+  ["ebab9e", "e18486e185aae18781"],
+  ["ebab9e", "ebab84e18781"],
+  ["ebab9f", "e18486e185aae18782"],
+  ["ebab9f", "ebab84e18782"],
+  ["ebaba0", "e18486e185ab"],
+  ["ebaba1", "e18486e185abe186a8"],
+  ["ebaba1", "ebaba0e186a8"],
+  ["ebaba2", "e18486e185abe186a9"],
+  ["ebaba2", "ebaba0e186a9"],
+  ["ebaba3", "e18486e185abe186aa"],
+  ["ebaba3", "ebaba0e186aa"],
+  ["ebaba4", "e18486e185abe186ab"],
+  ["ebaba4", "ebaba0e186ab"],
+  ["ebaba5", "e18486e185abe186ac"],
+  ["ebaba5", "ebaba0e186ac"],
+  ["ebaba6", "e18486e185abe186ad"],
+  ["ebaba6", "ebaba0e186ad"],
+  ["ebaba7", "e18486e185abe186ae"],
+  ["ebaba7", "ebaba0e186ae"],
+  ["ebaba8", "e18486e185abe186af"],
+  ["ebaba8", "ebaba0e186af"],
+  ["ebaba9", "e18486e185abe186b0"],
+  ["ebaba9", "ebaba0e186b0"],
+  ["ebabaa", "e18486e185abe186b1"],
+  ["ebabaa", "ebaba0e186b1"],
+  ["ebabab", "e18486e185abe186b2"],
+  ["ebabab", "ebaba0e186b2"],
+  ["ebabac", "e18486e185abe186b3"],
+  ["ebabac", "ebaba0e186b3"],
+  ["ebabad", "e18486e185abe186b4"],
+  ["ebabad", "ebaba0e186b4"],
+  ["ebabae", "e18486e185abe186b5"],
+  ["ebabae", "ebaba0e186b5"],
+  ["ebabaf", "e18486e185abe186b6"],
+  ["ebabaf", "ebaba0e186b6"],
+  ["ebabb0", "e18486e185abe186b7"],
+  ["ebabb0", "ebaba0e186b7"],
+  ["ebabb1", "e18486e185abe186b8"],
+  ["ebabb1", "ebaba0e186b8"],
+  ["ebabb2", "e18486e185abe186b9"],
+  ["ebabb2", "ebaba0e186b9"],
+  ["ebabb3", "e18486e185abe186ba"],
+  ["ebabb3", "ebaba0e186ba"],
+  ["ebabb4", "e18486e185abe186bb"],
+  ["ebabb4", "ebaba0e186bb"],
+  ["ebabb5", "e18486e185abe186bc"],
+  ["ebabb5", "ebaba0e186bc"],
+  ["ebabb6", "e18486e185abe186bd"],
+  ["ebabb6", "ebaba0e186bd"],
+  ["ebabb7", "e18486e185abe186be"],
+  ["ebabb7", "ebaba0e186be"],
+  ["ebabb8", "e18486e185abe186bf"],
+  ["ebabb8", "ebaba0e186bf"],
+  ["ebabb9", "e18486e185abe18780"],
+  ["ebabb9", "ebaba0e18780"],
+  ["ebabba", "e18486e185abe18781"],
+  ["ebabba", "ebaba0e18781"],
+  ["ebabbb", "e18486e185abe18782"],
+  ["ebabbb", "ebaba0e18782"],
+  ["ebabbc", "e18486e185ac"],
+  ["ebabbd", "e18486e185ace186a8"],
+  ["ebabbd", "ebabbce186a8"],
+  ["ebabbe", "e18486e185ace186a9"],
+  ["ebabbe", "ebabbce186a9"],
+  ["ebabbf", "e18486e185ace186aa"],
+  ["ebabbf", "ebabbce186aa"],
+  ["ebac80", "e18486e185ace186ab"],
+  ["ebac80", "ebabbce186ab"],
+  ["ebac81", "e18486e185ace186ac"],
+  ["ebac81", "ebabbce186ac"],
+  ["ebac82", "e18486e185ace186ad"],
+  ["ebac82", "ebabbce186ad"],
+  ["ebac83", "e18486e185ace186ae"],
+  ["ebac83", "ebabbce186ae"],
+  ["ebac84", "e18486e185ace186af"],
+  ["ebac84", "ebabbce186af"],
+  ["ebac85", "e18486e185ace186b0"],
+  ["ebac85", "ebabbce186b0"],
+  ["ebac86", "e18486e185ace186b1"],
+  ["ebac86", "ebabbce186b1"],
+  ["ebac87", "e18486e185ace186b2"],
+  ["ebac87", "ebabbce186b2"],
+  ["ebac88", "e18486e185ace186b3"],
+  ["ebac88", "ebabbce186b3"],
+  ["ebac89", "e18486e185ace186b4"],
+  ["ebac89", "ebabbce186b4"],
+  ["ebac8a", "e18486e185ace186b5"],
+  ["ebac8a", "ebabbce186b5"],
+  ["ebac8b", "e18486e185ace186b6"],
+  ["ebac8b", "ebabbce186b6"],
+  ["ebac8c", "e18486e185ace186b7"],
+  ["ebac8c", "ebabbce186b7"],
+  ["ebac8d", "e18486e185ace186b8"],
+  ["ebac8d", "ebabbce186b8"],
+  ["ebac8e", "e18486e185ace186b9"],
+  ["ebac8e", "ebabbce186b9"],
+  ["ebac8f", "e18486e185ace186ba"],
+  ["ebac8f", "ebabbce186ba"],
+  ["ebac90", "e18486e185ace186bb"],
+  ["ebac90", "ebabbce186bb"],
+  ["ebac91", "e18486e185ace186bc"],
+  ["ebac91", "ebabbce186bc"],
+  ["ebac92", "e18486e185ace186bd"],
+  ["ebac92", "ebabbce186bd"],
+  ["ebac93", "e18486e185ace186be"],
+  ["ebac93", "ebabbce186be"],
+  ["ebac94", "e18486e185ace186bf"],
+  ["ebac94", "ebabbce186bf"],
+  ["ebac95", "e18486e185ace18780"],
+  ["ebac95", "ebabbce18780"],
+  ["ebac96", "e18486e185ace18781"],
+  ["ebac96", "ebabbce18781"],
+  ["ebac97", "e18486e185ace18782"],
+  ["ebac97", "ebabbce18782"],
+  ["ebac98", "e18486e185ad"],
+  ["ebac99", "e18486e185ade186a8"],
+  ["ebac99", "ebac98e186a8"],
+  ["ebac9a", "e18486e185ade186a9"],
+  ["ebac9a", "ebac98e186a9"],
+  ["ebac9b", "e18486e185ade186aa"],
+  ["ebac9b", "ebac98e186aa"],
+  ["ebac9c", "e18486e185ade186ab"],
+  ["ebac9c", "ebac98e186ab"],
+  ["ebac9d", "e18486e185ade186ac"],
+  ["ebac9d", "ebac98e186ac"],
+  ["ebac9e", "e18486e185ade186ad"],
+  ["ebac9e", "ebac98e186ad"],
+  ["ebac9f", "e18486e185ade186ae"],
+  ["ebac9f", "ebac98e186ae"],
+  ["ebaca0", "e18486e185ade186af"],
+  ["ebaca0", "ebac98e186af"],
+  ["ebaca1", "e18486e185ade186b0"],
+  ["ebaca1", "ebac98e186b0"],
+  ["ebaca2", "e18486e185ade186b1"],
+  ["ebaca2", "ebac98e186b1"],
+  ["ebaca3", "e18486e185ade186b2"],
+  ["ebaca3", "ebac98e186b2"],
+  ["ebaca4", "e18486e185ade186b3"],
+  ["ebaca4", "ebac98e186b3"],
+  ["ebaca5", "e18486e185ade186b4"],
+  ["ebaca5", "ebac98e186b4"],
+  ["ebaca6", "e18486e185ade186b5"],
+  ["ebaca6", "ebac98e186b5"],
+  ["ebaca7", "e18486e185ade186b6"],
+  ["ebaca7", "ebac98e186b6"],
+  ["ebaca8", "e18486e185ade186b7"],
+  ["ebaca8", "ebac98e186b7"],
+  ["ebaca9", "e18486e185ade186b8"],
+  ["ebaca9", "ebac98e186b8"],
+  ["ebacaa", "e18486e185ade186b9"],
+  ["ebacaa", "ebac98e186b9"],
+  ["ebacab", "e18486e185ade186ba"],
+  ["ebacab", "ebac98e186ba"],
+  ["ebacac", "e18486e185ade186bb"],
+  ["ebacac", "ebac98e186bb"],
+  ["ebacad", "e18486e185ade186bc"],
+  ["ebacad", "ebac98e186bc"],
+  ["ebacae", "e18486e185ade186bd"],
+  ["ebacae", "ebac98e186bd"],
+  ["ebacaf", "e18486e185ade186be"],
+  ["ebacaf", "ebac98e186be"],
+  ["ebacb0", "e18486e185ade186bf"],
+  ["ebacb0", "ebac98e186bf"],
+  ["ebacb1", "e18486e185ade18780"],
+  ["ebacb1", "ebac98e18780"],
+  ["ebacb2", "e18486e185ade18781"],
+  ["ebacb2", "ebac98e18781"],
+  ["ebacb3", "e18486e185ade18782"],
+  ["ebacb3", "ebac98e18782"],
+  ["ebacb4", "e18486e185ae"],
+  ["ebacb5", "e18486e185aee186a8"],
+  ["ebacb5", "ebacb4e186a8"],
+  ["ebacb6", "e18486e185aee186a9"],
+  ["ebacb6", "ebacb4e186a9"],
+  ["ebacb7", "e18486e185aee186aa"],
+  ["ebacb7", "ebacb4e186aa"],
+  ["ebacb8", "e18486e185aee186ab"],
+  ["ebacb8", "ebacb4e186ab"],
+  ["ebacb9", "e18486e185aee186ac"],
+  ["ebacb9", "ebacb4e186ac"],
+  ["ebacba", "e18486e185aee186ad"],
+  ["ebacba", "ebacb4e186ad"],
+  ["ebacbb", "e18486e185aee186ae"],
+  ["ebacbb", "ebacb4e186ae"],
+  ["ebacbc", "e18486e185aee186af"],
+  ["ebacbc", "ebacb4e186af"],
+  ["ebacbd", "e18486e185aee186b0"],
+  ["ebacbd", "ebacb4e186b0"],
+  ["ebacbe", "e18486e185aee186b1"],
+  ["ebacbe", "ebacb4e186b1"],
+  ["ebacbf", "e18486e185aee186b2"],
+  ["ebacbf", "ebacb4e186b2"],
+  ["ebad80", "e18486e185aee186b3"],
+  ["ebad80", "ebacb4e186b3"],
+  ["ebad81", "e18486e185aee186b4"],
+  ["ebad81", "ebacb4e186b4"],
+  ["ebad82", "e18486e185aee186b5"],
+  ["ebad82", "ebacb4e186b5"],
+  ["ebad83", "e18486e185aee186b6"],
+  ["ebad83", "ebacb4e186b6"],
+  ["ebad84", "e18486e185aee186b7"],
+  ["ebad84", "ebacb4e186b7"],
+  ["ebad85", "e18486e185aee186b8"],
+  ["ebad85", "ebacb4e186b8"],
+  ["ebad86", "e18486e185aee186b9"],
+  ["ebad86", "ebacb4e186b9"],
+  ["ebad87", "e18486e185aee186ba"],
+  ["ebad87", "ebacb4e186ba"],
+  ["ebad88", "e18486e185aee186bb"],
+  ["ebad88", "ebacb4e186bb"],
+  ["ebad89", "e18486e185aee186bc"],
+  ["ebad89", "ebacb4e186bc"],
+  ["ebad8a", "e18486e185aee186bd"],
+  ["ebad8a", "ebacb4e186bd"],
+  ["ebad8b", "e18486e185aee186be"],
+  ["ebad8b", "ebacb4e186be"],
+  ["ebad8c", "e18486e185aee186bf"],
+  ["ebad8c", "ebacb4e186bf"],
+  ["ebad8d", "e18486e185aee18780"],
+  ["ebad8d", "ebacb4e18780"],
+  ["ebad8e", "e18486e185aee18781"],
+  ["ebad8e", "ebacb4e18781"],
+  ["ebad8f", "e18486e185aee18782"],
+  ["ebad8f", "ebacb4e18782"],
+  ["ebad90", "e18486e185af"],
+  ["ebad91", "e18486e185afe186a8"],
+  ["ebad91", "ebad90e186a8"],
+  ["ebad92", "e18486e185afe186a9"],
+  ["ebad92", "ebad90e186a9"],
+  ["ebad93", "e18486e185afe186aa"],
+  ["ebad93", "ebad90e186aa"],
+  ["ebad94", "e18486e185afe186ab"],
+  ["ebad94", "ebad90e186ab"],
+  ["ebad95", "e18486e185afe186ac"],
+  ["ebad95", "ebad90e186ac"],
+  ["ebad96", "e18486e185afe186ad"],
+  ["ebad96", "ebad90e186ad"],
+  ["ebad97", "e18486e185afe186ae"],
+  ["ebad97", "ebad90e186ae"],
+  ["ebad98", "e18486e185afe186af"],
+  ["ebad98", "ebad90e186af"],
+  ["ebad99", "e18486e185afe186b0"],
+  ["ebad99", "ebad90e186b0"],
+  ["ebad9a", "e18486e185afe186b1"],
+  ["ebad9a", "ebad90e186b1"],
+  ["ebad9b", "e18486e185afe186b2"],
+  ["ebad9b", "ebad90e186b2"],
+  ["ebad9c", "e18486e185afe186b3"],
+  ["ebad9c", "ebad90e186b3"],
+  ["ebad9d", "e18486e185afe186b4"],
+  ["ebad9d", "ebad90e186b4"],
+  ["ebad9e", "e18486e185afe186b5"],
+  ["ebad9e", "ebad90e186b5"],
+  ["ebad9f", "e18486e185afe186b6"],
+  ["ebad9f", "ebad90e186b6"],
+  ["ebada0", "e18486e185afe186b7"],
+  ["ebada0", "ebad90e186b7"],
+  ["ebada1", "e18486e185afe186b8"],
+  ["ebada1", "ebad90e186b8"],
+  ["ebada2", "e18486e185afe186b9"],
+  ["ebada2", "ebad90e186b9"],
+  ["ebada3", "e18486e185afe186ba"],
+  ["ebada3", "ebad90e186ba"],
+  ["ebada4", "e18486e185afe186bb"],
+  ["ebada4", "ebad90e186bb"],
+  ["ebada5", "e18486e185afe186bc"],
+  ["ebada5", "ebad90e186bc"],
+  ["ebada6", "e18486e185afe186bd"],
+  ["ebada6", "ebad90e186bd"],
+  ["ebada7", "e18486e185afe186be"],
+  ["ebada7", "ebad90e186be"],
+  ["ebada8", "e18486e185afe186bf"],
+  ["ebada8", "ebad90e186bf"],
+  ["ebada9", "e18486e185afe18780"],
+  ["ebada9", "ebad90e18780"],
+  ["ebadaa", "e18486e185afe18781"],
+  ["ebadaa", "ebad90e18781"],
+  ["ebadab", "e18486e185afe18782"],
+  ["ebadab", "ebad90e18782"],
+  ["ebadac", "e18486e185b0"],
+  ["ebadad", "e18486e185b0e186a8"],
+  ["ebadad", "ebadace186a8"],
+  ["ebadae", "e18486e185b0e186a9"],
+  ["ebadae", "ebadace186a9"],
+  ["ebadaf", "e18486e185b0e186aa"],
+  ["ebadaf", "ebadace186aa"],
+  ["ebadb0", "e18486e185b0e186ab"],
+  ["ebadb0", "ebadace186ab"],
+  ["ebadb1", "e18486e185b0e186ac"],
+  ["ebadb1", "ebadace186ac"],
+  ["ebadb2", "e18486e185b0e186ad"],
+  ["ebadb2", "ebadace186ad"],
+  ["ebadb3", "e18486e185b0e186ae"],
+  ["ebadb3", "ebadace186ae"],
+  ["ebadb4", "e18486e185b0e186af"],
+  ["ebadb4", "ebadace186af"],
+  ["ebadb5", "e18486e185b0e186b0"],
+  ["ebadb5", "ebadace186b0"],
+  ["ebadb6", "e18486e185b0e186b1"],
+  ["ebadb6", "ebadace186b1"],
+  ["ebadb7", "e18486e185b0e186b2"],
+  ["ebadb7", "ebadace186b2"],
+  ["ebadb8", "e18486e185b0e186b3"],
+  ["ebadb8", "ebadace186b3"],
+  ["ebadb9", "e18486e185b0e186b4"],
+  ["ebadb9", "ebadace186b4"],
+  ["ebadba", "e18486e185b0e186b5"],
+  ["ebadba", "ebadace186b5"],
+  ["ebadbb", "e18486e185b0e186b6"],
+  ["ebadbb", "ebadace186b6"],
+  ["ebadbc", "e18486e185b0e186b7"],
+  ["ebadbc", "ebadace186b7"],
+  ["ebadbd", "e18486e185b0e186b8"],
+  ["ebadbd", "ebadace186b8"],
+  ["ebadbe", "e18486e185b0e186b9"],
+  ["ebadbe", "ebadace186b9"],
+  ["ebadbf", "e18486e185b0e186ba"],
+  ["ebadbf", "ebadace186ba"],
+  ["ebae80", "e18486e185b0e186bb"],
+  ["ebae80", "ebadace186bb"],
+  ["ebae81", "e18486e185b0e186bc"],
+  ["ebae81", "ebadace186bc"],
+  ["ebae82", "e18486e185b0e186bd"],
+  ["ebae82", "ebadace186bd"],
+  ["ebae83", "e18486e185b0e186be"],
+  ["ebae83", "ebadace186be"],
+  ["ebae84", "e18486e185b0e186bf"],
+  ["ebae84", "ebadace186bf"],
+  ["ebae85", "e18486e185b0e18780"],
+  ["ebae85", "ebadace18780"],
+  ["ebae86", "e18486e185b0e18781"],
+  ["ebae86", "ebadace18781"],
+  ["ebae87", "e18486e185b0e18782"],
+  ["ebae87", "ebadace18782"],
+  ["ebae88", "e18486e185b1"],
+  ["ebae89", "e18486e185b1e186a8"],
+  ["ebae89", "ebae88e186a8"],
+  ["ebae8a", "e18486e185b1e186a9"],
+  ["ebae8a", "ebae88e186a9"],
+  ["ebae8b", "e18486e185b1e186aa"],
+  ["ebae8b", "ebae88e186aa"],
+  ["ebae8c", "e18486e185b1e186ab"],
+  ["ebae8c", "ebae88e186ab"],
+  ["ebae8d", "e18486e185b1e186ac"],
+  ["ebae8d", "ebae88e186ac"],
+  ["ebae8e", "e18486e185b1e186ad"],
+  ["ebae8e", "ebae88e186ad"],
+  ["ebae8f", "e18486e185b1e186ae"],
+  ["ebae8f", "ebae88e186ae"],
+  ["ebae90", "e18486e185b1e186af"],
+  ["ebae90", "ebae88e186af"],
+  ["ebae91", "e18486e185b1e186b0"],
+  ["ebae91", "ebae88e186b0"],
+  ["ebae92", "e18486e185b1e186b1"],
+  ["ebae92", "ebae88e186b1"],
+  ["ebae93", "e18486e185b1e186b2"],
+  ["ebae93", "ebae88e186b2"],
+  ["ebae94", "e18486e185b1e186b3"],
+  ["ebae94", "ebae88e186b3"],
+  ["ebae95", "e18486e185b1e186b4"],
+  ["ebae95", "ebae88e186b4"],
+  ["ebae96", "e18486e185b1e186b5"],
+  ["ebae96", "ebae88e186b5"],
+  ["ebae97", "e18486e185b1e186b6"],
+  ["ebae97", "ebae88e186b6"],
+  ["ebae98", "e18486e185b1e186b7"],
+  ["ebae98", "ebae88e186b7"],
+  ["ebae99", "e18486e185b1e186b8"],
+  ["ebae99", "ebae88e186b8"],
+  ["ebae9a", "e18486e185b1e186b9"],
+  ["ebae9a", "ebae88e186b9"],
+  ["ebae9b", "e18486e185b1e186ba"],
+  ["ebae9b", "ebae88e186ba"],
+  ["ebae9c", "e18486e185b1e186bb"],
+  ["ebae9c", "ebae88e186bb"],
+  ["ebae9d", "e18486e185b1e186bc"],
+  ["ebae9d", "ebae88e186bc"],
+  ["ebae9e", "e18486e185b1e186bd"],
+  ["ebae9e", "ebae88e186bd"],
+  ["ebae9f", "e18486e185b1e186be"],
+  ["ebae9f", "ebae88e186be"],
+  ["ebaea0", "e18486e185b1e186bf"],
+  ["ebaea0", "ebae88e186bf"],
+  ["ebaea1", "e18486e185b1e18780"],
+  ["ebaea1", "ebae88e18780"],
+  ["ebaea2", "e18486e185b1e18781"],
+  ["ebaea2", "ebae88e18781"],
+  ["ebaea3", "e18486e185b1e18782"],
+  ["ebaea3", "ebae88e18782"],
+  ["ebaea4", "e18486e185b2"],
+  ["ebaea5", "e18486e185b2e186a8"],
+  ["ebaea5", "ebaea4e186a8"],
+  ["ebaea6", "e18486e185b2e186a9"],
+  ["ebaea6", "ebaea4e186a9"],
+  ["ebaea7", "e18486e185b2e186aa"],
+  ["ebaea7", "ebaea4e186aa"],
+  ["ebaea8", "e18486e185b2e186ab"],
+  ["ebaea8", "ebaea4e186ab"],
+  ["ebaea9", "e18486e185b2e186ac"],
+  ["ebaea9", "ebaea4e186ac"],
+  ["ebaeaa", "e18486e185b2e186ad"],
+  ["ebaeaa", "ebaea4e186ad"],
+  ["ebaeab", "e18486e185b2e186ae"],
+  ["ebaeab", "ebaea4e186ae"],
+  ["ebaeac", "e18486e185b2e186af"],
+  ["ebaeac", "ebaea4e186af"],
+  ["ebaead", "e18486e185b2e186b0"],
+  ["ebaead", "ebaea4e186b0"],
+  ["ebaeae", "e18486e185b2e186b1"],
+  ["ebaeae", "ebaea4e186b1"],
+  ["ebaeaf", "e18486e185b2e186b2"],
+  ["ebaeaf", "ebaea4e186b2"],
+  ["ebaeb0", "e18486e185b2e186b3"],
+  ["ebaeb0", "ebaea4e186b3"],
+  ["ebaeb1", "e18486e185b2e186b4"],
+  ["ebaeb1", "ebaea4e186b4"],
+  ["ebaeb2", "e18486e185b2e186b5"],
+  ["ebaeb2", "ebaea4e186b5"],
+  ["ebaeb3", "e18486e185b2e186b6"],
+  ["ebaeb3", "ebaea4e186b6"],
+  ["ebaeb4", "e18486e185b2e186b7"],
+  ["ebaeb4", "ebaea4e186b7"],
+  ["ebaeb5", "e18486e185b2e186b8"],
+  ["ebaeb5", "ebaea4e186b8"],
+  ["ebaeb6", "e18486e185b2e186b9"],
+  ["ebaeb6", "ebaea4e186b9"],
+  ["ebaeb7", "e18486e185b2e186ba"],
+  ["ebaeb7", "ebaea4e186ba"],
+  ["ebaeb8", "e18486e185b2e186bb"],
+  ["ebaeb8", "ebaea4e186bb"],
+  ["ebaeb9", "e18486e185b2e186bc"],
+  ["ebaeb9", "ebaea4e186bc"],
+  ["ebaeba", "e18486e185b2e186bd"],
+  ["ebaeba", "ebaea4e186bd"],
+  ["ebaebb", "e18486e185b2e186be"],
+  ["ebaebb", "ebaea4e186be"],
+  ["ebaebc", "e18486e185b2e186bf"],
+  ["ebaebc", "ebaea4e186bf"],
+  ["ebaebd", "e18486e185b2e18780"],
+  ["ebaebd", "ebaea4e18780"],
+  ["ebaebe", "e18486e185b2e18781"],
+  ["ebaebe", "ebaea4e18781"],
+  ["ebaebf", "e18486e185b2e18782"],
+  ["ebaebf", "ebaea4e18782"],
+  ["ebaf80", "e18486e185b3"],
+  ["ebaf81", "e18486e185b3e186a8"],
+  ["ebaf81", "ebaf80e186a8"],
+  ["ebaf82", "e18486e185b3e186a9"],
+  ["ebaf82", "ebaf80e186a9"],
+  ["ebaf83", "e18486e185b3e186aa"],
+  ["ebaf83", "ebaf80e186aa"],
+  ["ebaf84", "e18486e185b3e186ab"],
+  ["ebaf84", "ebaf80e186ab"],
+  ["ebaf85", "e18486e185b3e186ac"],
+  ["ebaf85", "ebaf80e186ac"],
+  ["ebaf86", "e18486e185b3e186ad"],
+  ["ebaf86", "ebaf80e186ad"],
+  ["ebaf87", "e18486e185b3e186ae"],
+  ["ebaf87", "ebaf80e186ae"],
+  ["ebaf88", "e18486e185b3e186af"],
+  ["ebaf88", "ebaf80e186af"],
+  ["ebaf89", "e18486e185b3e186b0"],
+  ["ebaf89", "ebaf80e186b0"],
+  ["ebaf8a", "e18486e185b3e186b1"],
+  ["ebaf8a", "ebaf80e186b1"],
+  ["ebaf8b", "e18486e185b3e186b2"],
+  ["ebaf8b", "ebaf80e186b2"],
+  ["ebaf8c", "e18486e185b3e186b3"],
+  ["ebaf8c", "ebaf80e186b3"],
+  ["ebaf8d", "e18486e185b3e186b4"],
+  ["ebaf8d", "ebaf80e186b4"],
+  ["ebaf8e", "e18486e185b3e186b5"],
+  ["ebaf8e", "ebaf80e186b5"],
+  ["ebaf8f", "e18486e185b3e186b6"],
+  ["ebaf8f", "ebaf80e186b6"],
+  ["ebaf90", "e18486e185b3e186b7"],
+  ["ebaf90", "ebaf80e186b7"],
+  ["ebaf91", "e18486e185b3e186b8"],
+  ["ebaf91", "ebaf80e186b8"],
+  ["ebaf92", "e18486e185b3e186b9"],
+  ["ebaf92", "ebaf80e186b9"],
+  ["ebaf93", "e18486e185b3e186ba"],
+  ["ebaf93", "ebaf80e186ba"],
+  ["ebaf94", "e18486e185b3e186bb"],
+  ["ebaf94", "ebaf80e186bb"],
+  ["ebaf95", "e18486e185b3e186bc"],
+  ["ebaf95", "ebaf80e186bc"],
+  ["ebaf96", "e18486e185b3e186bd"],
+  ["ebaf96", "ebaf80e186bd"],
+  ["ebaf97", "e18486e185b3e186be"],
+  ["ebaf97", "ebaf80e186be"],
+  ["ebaf98", "e18486e185b3e186bf"],
+  ["ebaf98", "ebaf80e186bf"],
+  ["ebaf99", "e18486e185b3e18780"],
+  ["ebaf99", "ebaf80e18780"],
+  ["ebaf9a", "e18486e185b3e18781"],
+  ["ebaf9a", "ebaf80e18781"],
+  ["ebaf9b", "e18486e185b3e18782"],
+  ["ebaf9b", "ebaf80e18782"],
+  ["ebaf9c", "e18486e185b4"],
+  ["ebaf9d", "e18486e185b4e186a8"],
+  ["ebaf9d", "ebaf9ce186a8"],
+  ["ebaf9e", "e18486e185b4e186a9"],
+  ["ebaf9e", "ebaf9ce186a9"],
+  ["ebaf9f", "e18486e185b4e186aa"],
+  ["ebaf9f", "ebaf9ce186aa"],
+  ["ebafa0", "e18486e185b4e186ab"],
+  ["ebafa0", "ebaf9ce186ab"],
+  ["ebafa1", "e18486e185b4e186ac"],
+  ["ebafa1", "ebaf9ce186ac"],
+  ["ebafa2", "e18486e185b4e186ad"],
+  ["ebafa2", "ebaf9ce186ad"],
+  ["ebafa3", "e18486e185b4e186ae"],
+  ["ebafa3", "ebaf9ce186ae"],
+  ["ebafa4", "e18486e185b4e186af"],
+  ["ebafa4", "ebaf9ce186af"],
+  ["ebafa5", "e18486e185b4e186b0"],
+  ["ebafa5", "ebaf9ce186b0"],
+  ["ebafa6", "e18486e185b4e186b1"],
+  ["ebafa6", "ebaf9ce186b1"],
+  ["ebafa7", "e18486e185b4e186b2"],
+  ["ebafa7", "ebaf9ce186b2"],
+  ["ebafa8", "e18486e185b4e186b3"],
+  ["ebafa8", "ebaf9ce186b3"],
+  ["ebafa9", "e18486e185b4e186b4"],
+  ["ebafa9", "ebaf9ce186b4"],
+  ["ebafaa", "e18486e185b4e186b5"],
+  ["ebafaa", "ebaf9ce186b5"],
+  ["ebafab", "e18486e185b4e186b6"],
+  ["ebafab", "ebaf9ce186b6"],
+  ["ebafac", "e18486e185b4e186b7"],
+  ["ebafac", "ebaf9ce186b7"],
+  ["ebafad", "e18486e185b4e186b8"],
+  ["ebafad", "ebaf9ce186b8"],
+  ["ebafae", "e18486e185b4e186b9"],
+  ["ebafae", "ebaf9ce186b9"],
+  ["ebafaf", "e18486e185b4e186ba"],
+  ["ebafaf", "ebaf9ce186ba"],
+  ["ebafb0", "e18486e185b4e186bb"],
+  ["ebafb0", "ebaf9ce186bb"],
+  ["ebafb1", "e18486e185b4e186bc"],
+  ["ebafb1", "ebaf9ce186bc"],
+  ["ebafb2", "e18486e185b4e186bd"],
+  ["ebafb2", "ebaf9ce186bd"],
+  ["ebafb3", "e18486e185b4e186be"],
+  ["ebafb3", "ebaf9ce186be"],
+  ["ebafb4", "e18486e185b4e186bf"],
+  ["ebafb4", "ebaf9ce186bf"],
+  ["ebafb5", "e18486e185b4e18780"],
+  ["ebafb5", "ebaf9ce18780"],
+  ["ebafb6", "e18486e185b4e18781"],
+  ["ebafb6", "ebaf9ce18781"],
+  ["ebafb7", "e18486e185b4e18782"],
+  ["ebafb7", "ebaf9ce18782"],
+  ["ebafb8", "e18486e185b5"],
+  ["ebafb9", "e18486e185b5e186a8"],
+  ["ebafb9", "ebafb8e186a8"],
+  ["ebafba", "e18486e185b5e186a9"],
+  ["ebafba", "ebafb8e186a9"],
+  ["ebafbb", "e18486e185b5e186aa"],
+  ["ebafbb", "ebafb8e186aa"],
+  ["ebafbc", "e18486e185b5e186ab"],
+  ["ebafbc", "ebafb8e186ab"],
+  ["ebafbd", "e18486e185b5e186ac"],
+  ["ebafbd", "ebafb8e186ac"],
+  ["ebafbe", "e18486e185b5e186ad"],
+  ["ebafbe", "ebafb8e186ad"],
+  ["ebafbf", "e18486e185b5e186ae"],
+  ["ebafbf", "ebafb8e186ae"],
+  ["ebb080", "e18486e185b5e186af"],
+  ["ebb080", "ebafb8e186af"],
+  ["ebb081", "e18486e185b5e186b0"],
+  ["ebb081", "ebafb8e186b0"],
+  ["ebb082", "e18486e185b5e186b1"],
+  ["ebb082", "ebafb8e186b1"],
+  ["ebb083", "e18486e185b5e186b2"],
+  ["ebb083", "ebafb8e186b2"],
+  ["ebb084", "e18486e185b5e186b3"],
+  ["ebb084", "ebafb8e186b3"],
+  ["ebb085", "e18486e185b5e186b4"],
+  ["ebb085", "ebafb8e186b4"],
+  ["ebb086", "e18486e185b5e186b5"],
+  ["ebb086", "ebafb8e186b5"],
+  ["ebb087", "e18486e185b5e186b6"],
+  ["ebb087", "ebafb8e186b6"],
+  ["ebb088", "e18486e185b5e186b7"],
+  ["ebb088", "ebafb8e186b7"],
+  ["ebb089", "e18486e185b5e186b8"],
+  ["ebb089", "ebafb8e186b8"],
+  ["ebb08a", "e18486e185b5e186b9"],
+  ["ebb08a", "ebafb8e186b9"],
+  ["ebb08b", "e18486e185b5e186ba"],
+  ["ebb08b", "ebafb8e186ba"],
+  ["ebb08c", "e18486e185b5e186bb"],
+  ["ebb08c", "ebafb8e186bb"],
+  ["ebb08d", "e18486e185b5e186bc"],
+  ["ebb08d", "ebafb8e186bc"],
+  ["ebb08e", "e18486e185b5e186bd"],
+  ["ebb08e", "ebafb8e186bd"],
+  ["ebb08f", "e18486e185b5e186be"],
+  ["ebb08f", "ebafb8e186be"],
+  ["ebb090", "e18486e185b5e186bf"],
+  ["ebb090", "ebafb8e186bf"],
+  ["ebb091", "e18486e185b5e18780"],
+  ["ebb091", "ebafb8e18780"],
+  ["ebb092", "e18486e185b5e18781"],
+  ["ebb092", "ebafb8e18781"],
+  ["ebb093", "e18486e185b5e18782"],
+  ["ebb093", "ebafb8e18782"],
+  ["ebb094", "e18487e185a1"],
+  ["ebb095", "e18487e185a1e186a8"],
+  ["ebb095", "ebb094e186a8"],
+  ["ebb096", "e18487e185a1e186a9"],
+  ["ebb096", "ebb094e186a9"],
+  ["ebb097", "e18487e185a1e186aa"],
+  ["ebb097", "ebb094e186aa"],
+  ["ebb098", "e18487e185a1e186ab"],
+  ["ebb098", "ebb094e186ab"],
+  ["ebb099", "e18487e185a1e186ac"],
+  ["ebb099", "ebb094e186ac"],
+  ["ebb09a", "e18487e185a1e186ad"],
+  ["ebb09a", "ebb094e186ad"],
+  ["ebb09b", "e18487e185a1e186ae"],
+  ["ebb09b", "ebb094e186ae"],
+  ["ebb09c", "e18487e185a1e186af"],
+  ["ebb09c", "ebb094e186af"],
+  ["ebb09d", "e18487e185a1e186b0"],
+  ["ebb09d", "ebb094e186b0"],
+  ["ebb09e", "e18487e185a1e186b1"],
+  ["ebb09e", "ebb094e186b1"],
+  ["ebb09f", "e18487e185a1e186b2"],
+  ["ebb09f", "ebb094e186b2"],
+  ["ebb0a0", "e18487e185a1e186b3"],
+  ["ebb0a0", "ebb094e186b3"],
+  ["ebb0a1", "e18487e185a1e186b4"],
+  ["ebb0a1", "ebb094e186b4"],
+  ["ebb0a2", "e18487e185a1e186b5"],
+  ["ebb0a2", "ebb094e186b5"],
+  ["ebb0a3", "e18487e185a1e186b6"],
+  ["ebb0a3", "ebb094e186b6"],
+  ["ebb0a4", "e18487e185a1e186b7"],
+  ["ebb0a4", "ebb094e186b7"],
+  ["ebb0a5", "e18487e185a1e186b8"],
+  ["ebb0a5", "ebb094e186b8"],
+  ["ebb0a6", "e18487e185a1e186b9"],
+  ["ebb0a6", "ebb094e186b9"],
+  ["ebb0a7", "e18487e185a1e186ba"],
+  ["ebb0a7", "ebb094e186ba"],
+  ["ebb0a8", "e18487e185a1e186bb"],
+  ["ebb0a8", "ebb094e186bb"],
+  ["ebb0a9", "e18487e185a1e186bc"],
+  ["ebb0a9", "ebb094e186bc"],
+  ["ebb0aa", "e18487e185a1e186bd"],
+  ["ebb0aa", "ebb094e186bd"],
+  ["ebb0ab", "e18487e185a1e186be"],
+  ["ebb0ab", "ebb094e186be"],
+  ["ebb0ac", "e18487e185a1e186bf"],
+  ["ebb0ac", "ebb094e186bf"],
+  ["ebb0ad", "e18487e185a1e18780"],
+  ["ebb0ad", "ebb094e18780"],
+  ["ebb0ae", "e18487e185a1e18781"],
+  ["ebb0ae", "ebb094e18781"],
+  ["ebb0af", "e18487e185a1e18782"],
+  ["ebb0af", "ebb094e18782"],
+  ["ebb0b0", "e18487e185a2"],
+  ["ebb0b1", "e18487e185a2e186a8"],
+  ["ebb0b1", "ebb0b0e186a8"],
+  ["ebb0b2", "e18487e185a2e186a9"],
+  ["ebb0b2", "ebb0b0e186a9"],
+  ["ebb0b3", "e18487e185a2e186aa"],
+  ["ebb0b3", "ebb0b0e186aa"],
+  ["ebb0b4", "e18487e185a2e186ab"],
+  ["ebb0b4", "ebb0b0e186ab"],
+  ["ebb0b5", "e18487e185a2e186ac"],
+  ["ebb0b5", "ebb0b0e186ac"],
+  ["ebb0b6", "e18487e185a2e186ad"],
+  ["ebb0b6", "ebb0b0e186ad"],
+  ["ebb0b7", "e18487e185a2e186ae"],
+  ["ebb0b7", "ebb0b0e186ae"],
+  ["ebb0b8", "e18487e185a2e186af"],
+  ["ebb0b8", "ebb0b0e186af"],
+  ["ebb0b9", "e18487e185a2e186b0"],
+  ["ebb0b9", "ebb0b0e186b0"],
+  ["ebb0ba", "e18487e185a2e186b1"],
+  ["ebb0ba", "ebb0b0e186b1"],
+  ["ebb0bb", "e18487e185a2e186b2"],
+  ["ebb0bb", "ebb0b0e186b2"],
+  ["ebb0bc", "e18487e185a2e186b3"],
+  ["ebb0bc", "ebb0b0e186b3"],
+  ["ebb0bd", "e18487e185a2e186b4"],
+  ["ebb0bd", "ebb0b0e186b4"],
+  ["ebb0be", "e18487e185a2e186b5"],
+  ["ebb0be", "ebb0b0e186b5"],
+  ["ebb0bf", "e18487e185a2e186b6"],
+  ["ebb0bf", "ebb0b0e186b6"],
+  ["ebb180", "e18487e185a2e186b7"],
+  ["ebb180", "ebb0b0e186b7"],
+  ["ebb181", "e18487e185a2e186b8"],
+  ["ebb181", "ebb0b0e186b8"],
+  ["ebb182", "e18487e185a2e186b9"],
+  ["ebb182", "ebb0b0e186b9"],
+  ["ebb183", "e18487e185a2e186ba"],
+  ["ebb183", "ebb0b0e186ba"],
+  ["ebb184", "e18487e185a2e186bb"],
+  ["ebb184", "ebb0b0e186bb"],
+  ["ebb185", "e18487e185a2e186bc"],
+  ["ebb185", "ebb0b0e186bc"],
+  ["ebb186", "e18487e185a2e186bd"],
+  ["ebb186", "ebb0b0e186bd"],
+  ["ebb187", "e18487e185a2e186be"],
+  ["ebb187", "ebb0b0e186be"],
+  ["ebb188", "e18487e185a2e186bf"],
+  ["ebb188", "ebb0b0e186bf"],
+  ["ebb189", "e18487e185a2e18780"],
+  ["ebb189", "ebb0b0e18780"],
+  ["ebb18a", "e18487e185a2e18781"],
+  ["ebb18a", "ebb0b0e18781"],
+  ["ebb18b", "e18487e185a2e18782"],
+  ["ebb18b", "ebb0b0e18782"],
+  ["ebb18c", "e18487e185a3"],
+  ["ebb18d", "e18487e185a3e186a8"],
+  ["ebb18d", "ebb18ce186a8"],
+  ["ebb18e", "e18487e185a3e186a9"],
+  ["ebb18e", "ebb18ce186a9"],
+  ["ebb18f", "e18487e185a3e186aa"],
+  ["ebb18f", "ebb18ce186aa"],
+  ["ebb190", "e18487e185a3e186ab"],
+  ["ebb190", "ebb18ce186ab"],
+  ["ebb191", "e18487e185a3e186ac"],
+  ["ebb191", "ebb18ce186ac"],
+  ["ebb192", "e18487e185a3e186ad"],
+  ["ebb192", "ebb18ce186ad"],
+  ["ebb193", "e18487e185a3e186ae"],
+  ["ebb193", "ebb18ce186ae"],
+  ["ebb194", "e18487e185a3e186af"],
+  ["ebb194", "ebb18ce186af"],
+  ["ebb195", "e18487e185a3e186b0"],
+  ["ebb195", "ebb18ce186b0"],
+  ["ebb196", "e18487e185a3e186b1"],
+  ["ebb196", "ebb18ce186b1"],
+  ["ebb197", "e18487e185a3e186b2"],
+  ["ebb197", "ebb18ce186b2"],
+  ["ebb198", "e18487e185a3e186b3"],
+  ["ebb198", "ebb18ce186b3"],
+  ["ebb199", "e18487e185a3e186b4"],
+  ["ebb199", "ebb18ce186b4"],
+  ["ebb19a", "e18487e185a3e186b5"],
+  ["ebb19a", "ebb18ce186b5"],
+  ["ebb19b", "e18487e185a3e186b6"],
+  ["ebb19b", "ebb18ce186b6"],
+  ["ebb19c", "e18487e185a3e186b7"],
+  ["ebb19c", "ebb18ce186b7"],
+  ["ebb19d", "e18487e185a3e186b8"],
+  ["ebb19d", "ebb18ce186b8"],
+  ["ebb19e", "e18487e185a3e186b9"],
+  ["ebb19e", "ebb18ce186b9"],
+  ["ebb19f", "e18487e185a3e186ba"],
+  ["ebb19f", "ebb18ce186ba"],
+  ["ebb1a0", "e18487e185a3e186bb"],
+  ["ebb1a0", "ebb18ce186bb"],
+  ["ebb1a1", "e18487e185a3e186bc"],
+  ["ebb1a1", "ebb18ce186bc"],
+  ["ebb1a2", "e18487e185a3e186bd"],
+  ["ebb1a2", "ebb18ce186bd"],
+  ["ebb1a3", "e18487e185a3e186be"],
+  ["ebb1a3", "ebb18ce186be"],
+  ["ebb1a4", "e18487e185a3e186bf"],
+  ["ebb1a4", "ebb18ce186bf"],
+  ["ebb1a5", "e18487e185a3e18780"],
+  ["ebb1a5", "ebb18ce18780"],
+  ["ebb1a6", "e18487e185a3e18781"],
+  ["ebb1a6", "ebb18ce18781"],
+  ["ebb1a7", "e18487e185a3e18782"],
+  ["ebb1a7", "ebb18ce18782"],
+  ["ebb1a8", "e18487e185a4"],
+  ["ebb1a9", "e18487e185a4e186a8"],
+  ["ebb1a9", "ebb1a8e186a8"],
+  ["ebb1aa", "e18487e185a4e186a9"],
+  ["ebb1aa", "ebb1a8e186a9"],
+  ["ebb1ab", "e18487e185a4e186aa"],
+  ["ebb1ab", "ebb1a8e186aa"],
+  ["ebb1ac", "e18487e185a4e186ab"],
+  ["ebb1ac", "ebb1a8e186ab"],
+  ["ebb1ad", "e18487e185a4e186ac"],
+  ["ebb1ad", "ebb1a8e186ac"],
+  ["ebb1ae", "e18487e185a4e186ad"],
+  ["ebb1ae", "ebb1a8e186ad"],
+  ["ebb1af", "e18487e185a4e186ae"],
+  ["ebb1af", "ebb1a8e186ae"],
+  ["ebb1b0", "e18487e185a4e186af"],
+  ["ebb1b0", "ebb1a8e186af"],
+  ["ebb1b1", "e18487e185a4e186b0"],
+  ["ebb1b1", "ebb1a8e186b0"],
+  ["ebb1b2", "e18487e185a4e186b1"],
+  ["ebb1b2", "ebb1a8e186b1"],
+  ["ebb1b3", "e18487e185a4e186b2"],
+  ["ebb1b3", "ebb1a8e186b2"],
+  ["ebb1b4", "e18487e185a4e186b3"],
+  ["ebb1b4", "ebb1a8e186b3"],
+  ["ebb1b5", "e18487e185a4e186b4"],
+  ["ebb1b5", "ebb1a8e186b4"],
+  ["ebb1b6", "e18487e185a4e186b5"],
+  ["ebb1b6", "ebb1a8e186b5"],
+  ["ebb1b7", "e18487e185a4e186b6"],
+  ["ebb1b7", "ebb1a8e186b6"],
+  ["ebb1b8", "e18487e185a4e186b7"],
+  ["ebb1b8", "ebb1a8e186b7"],
+  ["ebb1b9", "e18487e185a4e186b8"],
+  ["ebb1b9", "ebb1a8e186b8"],
+  ["ebb1ba", "e18487e185a4e186b9"],
+  ["ebb1ba", "ebb1a8e186b9"],
+  ["ebb1bb", "e18487e185a4e186ba"],
+  ["ebb1bb", "ebb1a8e186ba"],
+  ["ebb1bc", "e18487e185a4e186bb"],
+  ["ebb1bc", "ebb1a8e186bb"],
+  ["ebb1bd", "e18487e185a4e186bc"],
+  ["ebb1bd", "ebb1a8e186bc"],
+  ["ebb1be", "e18487e185a4e186bd"],
+  ["ebb1be", "ebb1a8e186bd"],
+  ["ebb1bf", "e18487e185a4e186be"],
+  ["ebb1bf", "ebb1a8e186be"],
+  ["ebb280", "e18487e185a4e186bf"],
+  ["ebb280", "ebb1a8e186bf"],
+  ["ebb281", "e18487e185a4e18780"],
+  ["ebb281", "ebb1a8e18780"],
+  ["ebb282", "e18487e185a4e18781"],
+  ["ebb282", "ebb1a8e18781"],
+  ["ebb283", "e18487e185a4e18782"],
+  ["ebb283", "ebb1a8e18782"],
+  ["ebb284", "e18487e185a5"],
+  ["ebb285", "e18487e185a5e186a8"],
+  ["ebb285", "ebb284e186a8"],
+  ["ebb286", "e18487e185a5e186a9"],
+  ["ebb286", "ebb284e186a9"],
+  ["ebb287", "e18487e185a5e186aa"],
+  ["ebb287", "ebb284e186aa"],
+  ["ebb288", "e18487e185a5e186ab"],
+  ["ebb288", "ebb284e186ab"],
+  ["ebb289", "e18487e185a5e186ac"],
+  ["ebb289", "ebb284e186ac"],
+  ["ebb28a", "e18487e185a5e186ad"],
+  ["ebb28a", "ebb284e186ad"],
+  ["ebb28b", "e18487e185a5e186ae"],
+  ["ebb28b", "ebb284e186ae"],
+  ["ebb28c", "e18487e185a5e186af"],
+  ["ebb28c", "ebb284e186af"],
+  ["ebb28d", "e18487e185a5e186b0"],
+  ["ebb28d", "ebb284e186b0"],
+  ["ebb28e", "e18487e185a5e186b1"],
+  ["ebb28e", "ebb284e186b1"],
+  ["ebb28f", "e18487e185a5e186b2"],
+  ["ebb28f", "ebb284e186b2"],
+  ["ebb290", "e18487e185a5e186b3"],
+  ["ebb290", "ebb284e186b3"],
+  ["ebb291", "e18487e185a5e186b4"],
+  ["ebb291", "ebb284e186b4"],
+  ["ebb292", "e18487e185a5e186b5"],
+  ["ebb292", "ebb284e186b5"],
+  ["ebb293", "e18487e185a5e186b6"],
+  ["ebb293", "ebb284e186b6"],
+  ["ebb294", "e18487e185a5e186b7"],
+  ["ebb294", "ebb284e186b7"],
+  ["ebb295", "e18487e185a5e186b8"],
+  ["ebb295", "ebb284e186b8"],
+  ["ebb296", "e18487e185a5e186b9"],
+  ["ebb296", "ebb284e186b9"],
+  ["ebb297", "e18487e185a5e186ba"],
+  ["ebb297", "ebb284e186ba"],
+  ["ebb298", "e18487e185a5e186bb"],
+  ["ebb298", "ebb284e186bb"],
+  ["ebb299", "e18487e185a5e186bc"],
+  ["ebb299", "ebb284e186bc"],
+  ["ebb29a", "e18487e185a5e186bd"],
+  ["ebb29a", "ebb284e186bd"],
+  ["ebb29b", "e18487e185a5e186be"],
+  ["ebb29b", "ebb284e186be"],
+  ["ebb29c", "e18487e185a5e186bf"],
+  ["ebb29c", "ebb284e186bf"],
+  ["ebb29d", "e18487e185a5e18780"],
+  ["ebb29d", "ebb284e18780"],
+  ["ebb29e", "e18487e185a5e18781"],
+  ["ebb29e", "ebb284e18781"],
+  ["ebb29f", "e18487e185a5e18782"],
+  ["ebb29f", "ebb284e18782"],
+  ["ebb2a0", "e18487e185a6"],
+  ["ebb2a1", "e18487e185a6e186a8"],
+  ["ebb2a1", "ebb2a0e186a8"],
+  ["ebb2a2", "e18487e185a6e186a9"],
+  ["ebb2a2", "ebb2a0e186a9"],
+  ["ebb2a3", "e18487e185a6e186aa"],
+  ["ebb2a3", "ebb2a0e186aa"],
+  ["ebb2a4", "e18487e185a6e186ab"],
+  ["ebb2a4", "ebb2a0e186ab"],
+  ["ebb2a5", "e18487e185a6e186ac"],
+  ["ebb2a5", "ebb2a0e186ac"],
+  ["ebb2a6", "e18487e185a6e186ad"],
+  ["ebb2a6", "ebb2a0e186ad"],
+  ["ebb2a7", "e18487e185a6e186ae"],
+  ["ebb2a7", "ebb2a0e186ae"],
+  ["ebb2a8", "e18487e185a6e186af"],
+  ["ebb2a8", "ebb2a0e186af"],
+  ["ebb2a9", "e18487e185a6e186b0"],
+  ["ebb2a9", "ebb2a0e186b0"],
+  ["ebb2aa", "e18487e185a6e186b1"],
+  ["ebb2aa", "ebb2a0e186b1"],
+  ["ebb2ab", "e18487e185a6e186b2"],
+  ["ebb2ab", "ebb2a0e186b2"],
+  ["ebb2ac", "e18487e185a6e186b3"],
+  ["ebb2ac", "ebb2a0e186b3"],
+  ["ebb2ad", "e18487e185a6e186b4"],
+  ["ebb2ad", "ebb2a0e186b4"],
+  ["ebb2ae", "e18487e185a6e186b5"],
+  ["ebb2ae", "ebb2a0e186b5"],
+  ["ebb2af", "e18487e185a6e186b6"],
+  ["ebb2af", "ebb2a0e186b6"],
+  ["ebb2b0", "e18487e185a6e186b7"],
+  ["ebb2b0", "ebb2a0e186b7"],
+  ["ebb2b1", "e18487e185a6e186b8"],
+  ["ebb2b1", "ebb2a0e186b8"],
+  ["ebb2b2", "e18487e185a6e186b9"],
+  ["ebb2b2", "ebb2a0e186b9"],
+  ["ebb2b3", "e18487e185a6e186ba"],
+  ["ebb2b3", "ebb2a0e186ba"],
+  ["ebb2b4", "e18487e185a6e186bb"],
+  ["ebb2b4", "ebb2a0e186bb"],
+  ["ebb2b5", "e18487e185a6e186bc"],
+  ["ebb2b5", "ebb2a0e186bc"],
+  ["ebb2b6", "e18487e185a6e186bd"],
+  ["ebb2b6", "ebb2a0e186bd"],
+  ["ebb2b7", "e18487e185a6e186be"],
+  ["ebb2b7", "ebb2a0e186be"],
+  ["ebb2b8", "e18487e185a6e186bf"],
+  ["ebb2b8", "ebb2a0e186bf"],
+  ["ebb2b9", "e18487e185a6e18780"],
+  ["ebb2b9", "ebb2a0e18780"],
+  ["ebb2ba", "e18487e185a6e18781"],
+  ["ebb2ba", "ebb2a0e18781"],
+  ["ebb2bb", "e18487e185a6e18782"],
+  ["ebb2bb", "ebb2a0e18782"],
+  ["ebb2bc", "e18487e185a7"],
+  ["ebb2bd", "e18487e185a7e186a8"],
+  ["ebb2bd", "ebb2bce186a8"],
+  ["ebb2be", "e18487e185a7e186a9"],
+  ["ebb2be", "ebb2bce186a9"],
+  ["ebb2bf", "e18487e185a7e186aa"],
+  ["ebb2bf", "ebb2bce186aa"],
+  ["ebb380", "e18487e185a7e186ab"],
+  ["ebb380", "ebb2bce186ab"],
+  ["ebb381", "e18487e185a7e186ac"],
+  ["ebb381", "ebb2bce186ac"],
+  ["ebb382", "e18487e185a7e186ad"],
+  ["ebb382", "ebb2bce186ad"],
+  ["ebb383", "e18487e185a7e186ae"],
+  ["ebb383", "ebb2bce186ae"],
+  ["ebb384", "e18487e185a7e186af"],
+  ["ebb384", "ebb2bce186af"],
+  ["ebb385", "e18487e185a7e186b0"],
+  ["ebb385", "ebb2bce186b0"],
+  ["ebb386", "e18487e185a7e186b1"],
+  ["ebb386", "ebb2bce186b1"],
+  ["ebb387", "e18487e185a7e186b2"],
+  ["ebb387", "ebb2bce186b2"],
+  ["ebb388", "e18487e185a7e186b3"],
+  ["ebb388", "ebb2bce186b3"],
+  ["ebb389", "e18487e185a7e186b4"],
+  ["ebb389", "ebb2bce186b4"],
+  ["ebb38a", "e18487e185a7e186b5"],
+  ["ebb38a", "ebb2bce186b5"],
+  ["ebb38b", "e18487e185a7e186b6"],
+  ["ebb38b", "ebb2bce186b6"],
+  ["ebb38c", "e18487e185a7e186b7"],
+  ["ebb38c", "ebb2bce186b7"],
+  ["ebb38d", "e18487e185a7e186b8"],
+  ["ebb38d", "ebb2bce186b8"],
+  ["ebb38e", "e18487e185a7e186b9"],
+  ["ebb38e", "ebb2bce186b9"],
+  ["ebb38f", "e18487e185a7e186ba"],
+  ["ebb38f", "ebb2bce186ba"],
+  ["ebb390", "e18487e185a7e186bb"],
+  ["ebb390", "ebb2bce186bb"],
+  ["ebb391", "e18487e185a7e186bc"],
+  ["ebb391", "ebb2bce186bc"],
+  ["ebb392", "e18487e185a7e186bd"],
+  ["ebb392", "ebb2bce186bd"],
+  ["ebb393", "e18487e185a7e186be"],
+  ["ebb393", "ebb2bce186be"],
+  ["ebb394", "e18487e185a7e186bf"],
+  ["ebb394", "ebb2bce186bf"],
+  ["ebb395", "e18487e185a7e18780"],
+  ["ebb395", "ebb2bce18780"],
+  ["ebb396", "e18487e185a7e18781"],
+  ["ebb396", "ebb2bce18781"],
+  ["ebb397", "e18487e185a7e18782"],
+  ["ebb397", "ebb2bce18782"],
+  ["ebb398", "e18487e185a8"],
+  ["ebb399", "e18487e185a8e186a8"],
+  ["ebb399", "ebb398e186a8"],
+  ["ebb39a", "e18487e185a8e186a9"],
+  ["ebb39a", "ebb398e186a9"],
+  ["ebb39b", "e18487e185a8e186aa"],
+  ["ebb39b", "ebb398e186aa"],
+  ["ebb39c", "e18487e185a8e186ab"],
+  ["ebb39c", "ebb398e186ab"],
+  ["ebb39d", "e18487e185a8e186ac"],
+  ["ebb39d", "ebb398e186ac"],
+  ["ebb39e", "e18487e185a8e186ad"],
+  ["ebb39e", "ebb398e186ad"],
+  ["ebb39f", "e18487e185a8e186ae"],
+  ["ebb39f", "ebb398e186ae"],
+  ["ebb3a0", "e18487e185a8e186af"],
+  ["ebb3a0", "ebb398e186af"],
+  ["ebb3a1", "e18487e185a8e186b0"],
+  ["ebb3a1", "ebb398e186b0"],
+  ["ebb3a2", "e18487e185a8e186b1"],
+  ["ebb3a2", "ebb398e186b1"],
+  ["ebb3a3", "e18487e185a8e186b2"],
+  ["ebb3a3", "ebb398e186b2"],
+  ["ebb3a4", "e18487e185a8e186b3"],
+  ["ebb3a4", "ebb398e186b3"],
+  ["ebb3a5", "e18487e185a8e186b4"],
+  ["ebb3a5", "ebb398e186b4"],
+  ["ebb3a6", "e18487e185a8e186b5"],
+  ["ebb3a6", "ebb398e186b5"],
+  ["ebb3a7", "e18487e185a8e186b6"],
+  ["ebb3a7", "ebb398e186b6"],
+  ["ebb3a8", "e18487e185a8e186b7"],
+  ["ebb3a8", "ebb398e186b7"],
+  ["ebb3a9", "e18487e185a8e186b8"],
+  ["ebb3a9", "ebb398e186b8"],
+  ["ebb3aa", "e18487e185a8e186b9"],
+  ["ebb3aa", "ebb398e186b9"],
+  ["ebb3ab", "e18487e185a8e186ba"],
+  ["ebb3ab", "ebb398e186ba"],
+  ["ebb3ac", "e18487e185a8e186bb"],
+  ["ebb3ac", "ebb398e186bb"],
+  ["ebb3ad", "e18487e185a8e186bc"],
+  ["ebb3ad", "ebb398e186bc"],
+  ["ebb3ae", "e18487e185a8e186bd"],
+  ["ebb3ae", "ebb398e186bd"],
+  ["ebb3af", "e18487e185a8e186be"],
+  ["ebb3af", "ebb398e186be"],
+  ["ebb3b0", "e18487e185a8e186bf"],
+  ["ebb3b0", "ebb398e186bf"],
+  ["ebb3b1", "e18487e185a8e18780"],
+  ["ebb3b1", "ebb398e18780"],
+  ["ebb3b2", "e18487e185a8e18781"],
+  ["ebb3b2", "ebb398e18781"],
+  ["ebb3b3", "e18487e185a8e18782"],
+  ["ebb3b3", "ebb398e18782"],
+  ["ebb3b4", "e18487e185a9"],
+  ["ebb3b5", "e18487e185a9e186a8"],
+  ["ebb3b5", "ebb3b4e186a8"],
+  ["ebb3b6", "e18487e185a9e186a9"],
+  ["ebb3b6", "ebb3b4e186a9"],
+  ["ebb3b7", "e18487e185a9e186aa"],
+  ["ebb3b7", "ebb3b4e186aa"],
+  ["ebb3b8", "e18487e185a9e186ab"],
+  ["ebb3b8", "ebb3b4e186ab"],
+  ["ebb3b9", "e18487e185a9e186ac"],
+  ["ebb3b9", "ebb3b4e186ac"],
+  ["ebb3ba", "e18487e185a9e186ad"],
+  ["ebb3ba", "ebb3b4e186ad"],
+  ["ebb3bb", "e18487e185a9e186ae"],
+  ["ebb3bb", "ebb3b4e186ae"],
+  ["ebb3bc", "e18487e185a9e186af"],
+  ["ebb3bc", "ebb3b4e186af"],
+  ["ebb3bd", "e18487e185a9e186b0"],
+  ["ebb3bd", "ebb3b4e186b0"],
+  ["ebb3be", "e18487e185a9e186b1"],
+  ["ebb3be", "ebb3b4e186b1"],
+  ["ebb3bf", "e18487e185a9e186b2"],
+  ["ebb3bf", "ebb3b4e186b2"],
+  ["ebb480", "e18487e185a9e186b3"],
+  ["ebb480", "ebb3b4e186b3"],
+  ["ebb481", "e18487e185a9e186b4"],
+  ["ebb481", "ebb3b4e186b4"],
+  ["ebb482", "e18487e185a9e186b5"],
+  ["ebb482", "ebb3b4e186b5"],
+  ["ebb483", "e18487e185a9e186b6"],
+  ["ebb483", "ebb3b4e186b6"],
+  ["ebb484", "e18487e185a9e186b7"],
+  ["ebb484", "ebb3b4e186b7"],
+  ["ebb485", "e18487e185a9e186b8"],
+  ["ebb485", "ebb3b4e186b8"],
+  ["ebb486", "e18487e185a9e186b9"],
+  ["ebb486", "ebb3b4e186b9"],
+  ["ebb487", "e18487e185a9e186ba"],
+  ["ebb487", "ebb3b4e186ba"],
+  ["ebb488", "e18487e185a9e186bb"],
+  ["ebb488", "ebb3b4e186bb"],
+  ["ebb489", "e18487e185a9e186bc"],
+  ["ebb489", "ebb3b4e186bc"],
+  ["ebb48a", "e18487e185a9e186bd"],
+  ["ebb48a", "ebb3b4e186bd"],
+  ["ebb48b", "e18487e185a9e186be"],
+  ["ebb48b", "ebb3b4e186be"],
+  ["ebb48c", "e18487e185a9e186bf"],
+  ["ebb48c", "ebb3b4e186bf"],
+  ["ebb48d", "e18487e185a9e18780"],
+  ["ebb48d", "ebb3b4e18780"],
+  ["ebb48e", "e18487e185a9e18781"],
+  ["ebb48e", "ebb3b4e18781"],
+  ["ebb48f", "e18487e185a9e18782"],
+  ["ebb48f", "ebb3b4e18782"],
+  ["ebb490", "e18487e185aa"],
+  ["ebb491", "e18487e185aae186a8"],
+  ["ebb491", "ebb490e186a8"],
+  ["ebb492", "e18487e185aae186a9"],
+  ["ebb492", "ebb490e186a9"],
+  ["ebb493", "e18487e185aae186aa"],
+  ["ebb493", "ebb490e186aa"],
+  ["ebb494", "e18487e185aae186ab"],
+  ["ebb494", "ebb490e186ab"],
+  ["ebb495", "e18487e185aae186ac"],
+  ["ebb495", "ebb490e186ac"],
+  ["ebb496", "e18487e185aae186ad"],
+  ["ebb496", "ebb490e186ad"],
+  ["ebb497", "e18487e185aae186ae"],
+  ["ebb497", "ebb490e186ae"],
+  ["ebb498", "e18487e185aae186af"],
+  ["ebb498", "ebb490e186af"],
+  ["ebb499", "e18487e185aae186b0"],
+  ["ebb499", "ebb490e186b0"],
+  ["ebb49a", "e18487e185aae186b1"],
+  ["ebb49a", "ebb490e186b1"],
+  ["ebb49b", "e18487e185aae186b2"],
+  ["ebb49b", "ebb490e186b2"],
+  ["ebb49c", "e18487e185aae186b3"],
+  ["ebb49c", "ebb490e186b3"],
+  ["ebb49d", "e18487e185aae186b4"],
+  ["ebb49d", "ebb490e186b4"],
+  ["ebb49e", "e18487e185aae186b5"],
+  ["ebb49e", "ebb490e186b5"],
+  ["ebb49f", "e18487e185aae186b6"],
+  ["ebb49f", "ebb490e186b6"],
+  ["ebb4a0", "e18487e185aae186b7"],
+  ["ebb4a0", "ebb490e186b7"],
+  ["ebb4a1", "e18487e185aae186b8"],
+  ["ebb4a1", "ebb490e186b8"],
+  ["ebb4a2", "e18487e185aae186b9"],
+  ["ebb4a2", "ebb490e186b9"],
+  ["ebb4a3", "e18487e185aae186ba"],
+  ["ebb4a3", "ebb490e186ba"],
+  ["ebb4a4", "e18487e185aae186bb"],
+  ["ebb4a4", "ebb490e186bb"],
+  ["ebb4a5", "e18487e185aae186bc"],
+  ["ebb4a5", "ebb490e186bc"],
+  ["ebb4a6", "e18487e185aae186bd"],
+  ["ebb4a6", "ebb490e186bd"],
+  ["ebb4a7", "e18487e185aae186be"],
+  ["ebb4a7", "ebb490e186be"],
+  ["ebb4a8", "e18487e185aae186bf"],
+  ["ebb4a8", "ebb490e186bf"],
+  ["ebb4a9", "e18487e185aae18780"],
+  ["ebb4a9", "ebb490e18780"],
+  ["ebb4aa", "e18487e185aae18781"],
+  ["ebb4aa", "ebb490e18781"],
+  ["ebb4ab", "e18487e185aae18782"],
+  ["ebb4ab", "ebb490e18782"],
+  ["ebb4ac", "e18487e185ab"],
+  ["ebb4ad", "e18487e185abe186a8"],
+  ["ebb4ad", "ebb4ace186a8"],
+  ["ebb4ae", "e18487e185abe186a9"],
+  ["ebb4ae", "ebb4ace186a9"],
+  ["ebb4af", "e18487e185abe186aa"],
+  ["ebb4af", "ebb4ace186aa"],
+  ["ebb4b0", "e18487e185abe186ab"],
+  ["ebb4b0", "ebb4ace186ab"],
+  ["ebb4b1", "e18487e185abe186ac"],
+  ["ebb4b1", "ebb4ace186ac"],
+  ["ebb4b2", "e18487e185abe186ad"],
+  ["ebb4b2", "ebb4ace186ad"],
+  ["ebb4b3", "e18487e185abe186ae"],
+  ["ebb4b3", "ebb4ace186ae"],
+  ["ebb4b4", "e18487e185abe186af"],
+  ["ebb4b4", "ebb4ace186af"],
+  ["ebb4b5", "e18487e185abe186b0"],
+  ["ebb4b5", "ebb4ace186b0"],
+  ["ebb4b6", "e18487e185abe186b1"],
+  ["ebb4b6", "ebb4ace186b1"],
+  ["ebb4b7", "e18487e185abe186b2"],
+  ["ebb4b7", "ebb4ace186b2"],
+  ["ebb4b8", "e18487e185abe186b3"],
+  ["ebb4b8", "ebb4ace186b3"],
+  ["ebb4b9", "e18487e185abe186b4"],
+  ["ebb4b9", "ebb4ace186b4"],
+  ["ebb4ba", "e18487e185abe186b5"],
+  ["ebb4ba", "ebb4ace186b5"],
+  ["ebb4bb", "e18487e185abe186b6"],
+  ["ebb4bb", "ebb4ace186b6"],
+  ["ebb4bc", "e18487e185abe186b7"],
+  ["ebb4bc", "ebb4ace186b7"],
+  ["ebb4bd", "e18487e185abe186b8"],
+  ["ebb4bd", "ebb4ace186b8"],
+  ["ebb4be", "e18487e185abe186b9"],
+  ["ebb4be", "ebb4ace186b9"],
+  ["ebb4bf", "e18487e185abe186ba"],
+  ["ebb4bf", "ebb4ace186ba"],
+  ["ebb580", "e18487e185abe186bb"],
+  ["ebb580", "ebb4ace186bb"],
+  ["ebb581", "e18487e185abe186bc"],
+  ["ebb581", "ebb4ace186bc"],
+  ["ebb582", "e18487e185abe186bd"],
+  ["ebb582", "ebb4ace186bd"],
+  ["ebb583", "e18487e185abe186be"],
+  ["ebb583", "ebb4ace186be"],
+  ["ebb584", "e18487e185abe186bf"],
+  ["ebb584", "ebb4ace186bf"],
+  ["ebb585", "e18487e185abe18780"],
+  ["ebb585", "ebb4ace18780"],
+  ["ebb586", "e18487e185abe18781"],
+  ["ebb586", "ebb4ace18781"],
+  ["ebb587", "e18487e185abe18782"],
+  ["ebb587", "ebb4ace18782"],
+  ["ebb588", "e18487e185ac"],
+  ["ebb589", "e18487e185ace186a8"],
+  ["ebb589", "ebb588e186a8"],
+  ["ebb58a", "e18487e185ace186a9"],
+  ["ebb58a", "ebb588e186a9"],
+  ["ebb58b", "e18487e185ace186aa"],
+  ["ebb58b", "ebb588e186aa"],
+  ["ebb58c", "e18487e185ace186ab"],
+  ["ebb58c", "ebb588e186ab"],
+  ["ebb58d", "e18487e185ace186ac"],
+  ["ebb58d", "ebb588e186ac"],
+  ["ebb58e", "e18487e185ace186ad"],
+  ["ebb58e", "ebb588e186ad"],
+  ["ebb58f", "e18487e185ace186ae"],
+  ["ebb58f", "ebb588e186ae"],
+  ["ebb590", "e18487e185ace186af"],
+  ["ebb590", "ebb588e186af"],
+  ["ebb591", "e18487e185ace186b0"],
+  ["ebb591", "ebb588e186b0"],
+  ["ebb592", "e18487e185ace186b1"],
+  ["ebb592", "ebb588e186b1"],
+  ["ebb593", "e18487e185ace186b2"],
+  ["ebb593", "ebb588e186b2"],
+  ["ebb594", "e18487e185ace186b3"],
+  ["ebb594", "ebb588e186b3"],
+  ["ebb595", "e18487e185ace186b4"],
+  ["ebb595", "ebb588e186b4"],
+  ["ebb596", "e18487e185ace186b5"],
+  ["ebb596", "ebb588e186b5"],
+  ["ebb597", "e18487e185ace186b6"],
+  ["ebb597", "ebb588e186b6"],
+  ["ebb598", "e18487e185ace186b7"],
+  ["ebb598", "ebb588e186b7"],
+  ["ebb599", "e18487e185ace186b8"],
+  ["ebb599", "ebb588e186b8"],
+  ["ebb59a", "e18487e185ace186b9"],
+  ["ebb59a", "ebb588e186b9"],
+  ["ebb59b", "e18487e185ace186ba"],
+  ["ebb59b", "ebb588e186ba"],
+  ["ebb59c", "e18487e185ace186bb"],
+  ["ebb59c", "ebb588e186bb"],
+  ["ebb59d", "e18487e185ace186bc"],
+  ["ebb59d", "ebb588e186bc"],
+  ["ebb59e", "e18487e185ace186bd"],
+  ["ebb59e", "ebb588e186bd"],
+  ["ebb59f", "e18487e185ace186be"],
+  ["ebb59f", "ebb588e186be"],
+  ["ebb5a0", "e18487e185ace186bf"],
+  ["ebb5a0", "ebb588e186bf"],
+  ["ebb5a1", "e18487e185ace18780"],
+  ["ebb5a1", "ebb588e18780"],
+  ["ebb5a2", "e18487e185ace18781"],
+  ["ebb5a2", "ebb588e18781"],
+  ["ebb5a3", "e18487e185ace18782"],
+  ["ebb5a3", "ebb588e18782"],
+  ["ebb5a4", "e18487e185ad"],
+  ["ebb5a5", "e18487e185ade186a8"],
+  ["ebb5a5", "ebb5a4e186a8"],
+  ["ebb5a6", "e18487e185ade186a9"],
+  ["ebb5a6", "ebb5a4e186a9"],
+  ["ebb5a7", "e18487e185ade186aa"],
+  ["ebb5a7", "ebb5a4e186aa"],
+  ["ebb5a8", "e18487e185ade186ab"],
+  ["ebb5a8", "ebb5a4e186ab"],
+  ["ebb5a9", "e18487e185ade186ac"],
+  ["ebb5a9", "ebb5a4e186ac"],
+  ["ebb5aa", "e18487e185ade186ad"],
+  ["ebb5aa", "ebb5a4e186ad"],
+  ["ebb5ab", "e18487e185ade186ae"],
+  ["ebb5ab", "ebb5a4e186ae"],
+  ["ebb5ac", "e18487e185ade186af"],
+  ["ebb5ac", "ebb5a4e186af"],
+  ["ebb5ad", "e18487e185ade186b0"],
+  ["ebb5ad", "ebb5a4e186b0"],
+  ["ebb5ae", "e18487e185ade186b1"],
+  ["ebb5ae", "ebb5a4e186b1"],
+  ["ebb5af", "e18487e185ade186b2"],
+  ["ebb5af", "ebb5a4e186b2"],
+  ["ebb5b0", "e18487e185ade186b3"],
+  ["ebb5b0", "ebb5a4e186b3"],
+  ["ebb5b1", "e18487e185ade186b4"],
+  ["ebb5b1", "ebb5a4e186b4"],
+  ["ebb5b2", "e18487e185ade186b5"],
+  ["ebb5b2", "ebb5a4e186b5"],
+  ["ebb5b3", "e18487e185ade186b6"],
+  ["ebb5b3", "ebb5a4e186b6"],
+  ["ebb5b4", "e18487e185ade186b7"],
+  ["ebb5b4", "ebb5a4e186b7"],
+  ["ebb5b5", "e18487e185ade186b8"],
+  ["ebb5b5", "ebb5a4e186b8"],
+  ["ebb5b6", "e18487e185ade186b9"],
+  ["ebb5b6", "ebb5a4e186b9"],
+  ["ebb5b7", "e18487e185ade186ba"],
+  ["ebb5b7", "ebb5a4e186ba"],
+  ["ebb5b8", "e18487e185ade186bb"],
+  ["ebb5b8", "ebb5a4e186bb"],
+  ["ebb5b9", "e18487e185ade186bc"],
+  ["ebb5b9", "ebb5a4e186bc"],
+  ["ebb5ba", "e18487e185ade186bd"],
+  ["ebb5ba", "ebb5a4e186bd"],
+  ["ebb5bb", "e18487e185ade186be"],
+  ["ebb5bb", "ebb5a4e186be"],
+  ["ebb5bc", "e18487e185ade186bf"],
+  ["ebb5bc", "ebb5a4e186bf"],
+  ["ebb5bd", "e18487e185ade18780"],
+  ["ebb5bd", "ebb5a4e18780"],
+  ["ebb5be", "e18487e185ade18781"],
+  ["ebb5be", "ebb5a4e18781"],
+  ["ebb5bf", "e18487e185ade18782"],
+  ["ebb5bf", "ebb5a4e18782"],
+  ["ebb680", "e18487e185ae"],
+  ["ebb681", "e18487e185aee186a8"],
+  ["ebb681", "ebb680e186a8"],
+  ["ebb682", "e18487e185aee186a9"],
+  ["ebb682", "ebb680e186a9"],
+  ["ebb683", "e18487e185aee186aa"],
+  ["ebb683", "ebb680e186aa"],
+  ["ebb684", "e18487e185aee186ab"],
+  ["ebb684", "ebb680e186ab"],
+  ["ebb685", "e18487e185aee186ac"],
+  ["ebb685", "ebb680e186ac"],
+  ["ebb686", "e18487e185aee186ad"],
+  ["ebb686", "ebb680e186ad"],
+  ["ebb687", "e18487e185aee186ae"],
+  ["ebb687", "ebb680e186ae"],
+  ["ebb688", "e18487e185aee186af"],
+  ["ebb688", "ebb680e186af"],
+  ["ebb689", "e18487e185aee186b0"],
+  ["ebb689", "ebb680e186b0"],
+  ["ebb68a", "e18487e185aee186b1"],
+  ["ebb68a", "ebb680e186b1"],
+  ["ebb68b", "e18487e185aee186b2"],
+  ["ebb68b", "ebb680e186b2"],
+  ["ebb68c", "e18487e185aee186b3"],
+  ["ebb68c", "ebb680e186b3"],
+  ["ebb68d", "e18487e185aee186b4"],
+  ["ebb68d", "ebb680e186b4"],
+  ["ebb68e", "e18487e185aee186b5"],
+  ["ebb68e", "ebb680e186b5"],
+  ["ebb68f", "e18487e185aee186b6"],
+  ["ebb68f", "ebb680e186b6"],
+  ["ebb690", "e18487e185aee186b7"],
+  ["ebb690", "ebb680e186b7"],
+  ["ebb691", "e18487e185aee186b8"],
+  ["ebb691", "ebb680e186b8"],
+  ["ebb692", "e18487e185aee186b9"],
+  ["ebb692", "ebb680e186b9"],
+  ["ebb693", "e18487e185aee186ba"],
+  ["ebb693", "ebb680e186ba"],
+  ["ebb694", "e18487e185aee186bb"],
+  ["ebb694", "ebb680e186bb"],
+  ["ebb695", "e18487e185aee186bc"],
+  ["ebb695", "ebb680e186bc"],
+  ["ebb696", "e18487e185aee186bd"],
+  ["ebb696", "ebb680e186bd"],
+  ["ebb697", "e18487e185aee186be"],
+  ["ebb697", "ebb680e186be"],
+  ["ebb698", "e18487e185aee186bf"],
+  ["ebb698", "ebb680e186bf"],
+  ["ebb699", "e18487e185aee18780"],
+  ["ebb699", "ebb680e18780"],
+  ["ebb69a", "e18487e185aee18781"],
+  ["ebb69a", "ebb680e18781"],
+  ["ebb69b", "e18487e185aee18782"],
+  ["ebb69b", "ebb680e18782"],
+  ["ebb69c", "e18487e185af"],
+  ["ebb69d", "e18487e185afe186a8"],
+  ["ebb69d", "ebb69ce186a8"],
+  ["ebb69e", "e18487e185afe186a9"],
+  ["ebb69e", "ebb69ce186a9"],
+  ["ebb69f", "e18487e185afe186aa"],
+  ["ebb69f", "ebb69ce186aa"],
+  ["ebb6a0", "e18487e185afe186ab"],
+  ["ebb6a0", "ebb69ce186ab"],
+  ["ebb6a1", "e18487e185afe186ac"],
+  ["ebb6a1", "ebb69ce186ac"],
+  ["ebb6a2", "e18487e185afe186ad"],
+  ["ebb6a2", "ebb69ce186ad"],
+  ["ebb6a3", "e18487e185afe186ae"],
+  ["ebb6a3", "ebb69ce186ae"],
+  ["ebb6a4", "e18487e185afe186af"],
+  ["ebb6a4", "ebb69ce186af"],
+  ["ebb6a5", "e18487e185afe186b0"],
+  ["ebb6a5", "ebb69ce186b0"],
+  ["ebb6a6", "e18487e185afe186b1"],
+  ["ebb6a6", "ebb69ce186b1"],
+  ["ebb6a7", "e18487e185afe186b2"],
+  ["ebb6a7", "ebb69ce186b2"],
+  ["ebb6a8", "e18487e185afe186b3"],
+  ["ebb6a8", "ebb69ce186b3"],
+  ["ebb6a9", "e18487e185afe186b4"],
+  ["ebb6a9", "ebb69ce186b4"],
+  ["ebb6aa", "e18487e185afe186b5"],
+  ["ebb6aa", "ebb69ce186b5"],
+  ["ebb6ab", "e18487e185afe186b6"],
+  ["ebb6ab", "ebb69ce186b6"],
+  ["ebb6ac", "e18487e185afe186b7"],
+  ["ebb6ac", "ebb69ce186b7"],
+  ["ebb6ad", "e18487e185afe186b8"],
+  ["ebb6ad", "ebb69ce186b8"],
+  ["ebb6ae", "e18487e185afe186b9"],
+  ["ebb6ae", "ebb69ce186b9"],
+  ["ebb6af", "e18487e185afe186ba"],
+  ["ebb6af", "ebb69ce186ba"],
+  ["ebb6b0", "e18487e185afe186bb"],
+  ["ebb6b0", "ebb69ce186bb"],
+  ["ebb6b1", "e18487e185afe186bc"],
+  ["ebb6b1", "ebb69ce186bc"],
+  ["ebb6b2", "e18487e185afe186bd"],
+  ["ebb6b2", "ebb69ce186bd"],
+  ["ebb6b3", "e18487e185afe186be"],
+  ["ebb6b3", "ebb69ce186be"],
+  ["ebb6b4", "e18487e185afe186bf"],
+  ["ebb6b4", "ebb69ce186bf"],
+  ["ebb6b5", "e18487e185afe18780"],
+  ["ebb6b5", "ebb69ce18780"],
+  ["ebb6b6", "e18487e185afe18781"],
+  ["ebb6b6", "ebb69ce18781"],
+  ["ebb6b7", "e18487e185afe18782"],
+  ["ebb6b7", "ebb69ce18782"],
+  ["ebb6b8", "e18487e185b0"],
+  ["ebb6b9", "e18487e185b0e186a8"],
+  ["ebb6b9", "ebb6b8e186a8"],
+  ["ebb6ba", "e18487e185b0e186a9"],
+  ["ebb6ba", "ebb6b8e186a9"],
+  ["ebb6bb", "e18487e185b0e186aa"],
+  ["ebb6bb", "ebb6b8e186aa"],
+  ["ebb6bc", "e18487e185b0e186ab"],
+  ["ebb6bc", "ebb6b8e186ab"],
+  ["ebb6bd", "e18487e185b0e186ac"],
+  ["ebb6bd", "ebb6b8e186ac"],
+  ["ebb6be", "e18487e185b0e186ad"],
+  ["ebb6be", "ebb6b8e186ad"],
+  ["ebb6bf", "e18487e185b0e186ae"],
+  ["ebb6bf", "ebb6b8e186ae"],
+  ["ebb780", "e18487e185b0e186af"],
+  ["ebb780", "ebb6b8e186af"],
+  ["ebb781", "e18487e185b0e186b0"],
+  ["ebb781", "ebb6b8e186b0"],
+  ["ebb782", "e18487e185b0e186b1"],
+  ["ebb782", "ebb6b8e186b1"],
+  ["ebb783", "e18487e185b0e186b2"],
+  ["ebb783", "ebb6b8e186b2"],
+  ["ebb784", "e18487e185b0e186b3"],
+  ["ebb784", "ebb6b8e186b3"],
+  ["ebb785", "e18487e185b0e186b4"],
+  ["ebb785", "ebb6b8e186b4"],
+  ["ebb786", "e18487e185b0e186b5"],
+  ["ebb786", "ebb6b8e186b5"],
+  ["ebb787", "e18487e185b0e186b6"],
+  ["ebb787", "ebb6b8e186b6"],
+  ["ebb788", "e18487e185b0e186b7"],
+  ["ebb788", "ebb6b8e186b7"],
+  ["ebb789", "e18487e185b0e186b8"],
+  ["ebb789", "ebb6b8e186b8"],
+  ["ebb78a", "e18487e185b0e186b9"],
+  ["ebb78a", "ebb6b8e186b9"],
+  ["ebb78b", "e18487e185b0e186ba"],
+  ["ebb78b", "ebb6b8e186ba"],
+  ["ebb78c", "e18487e185b0e186bb"],
+  ["ebb78c", "ebb6b8e186bb"],
+  ["ebb78d", "e18487e185b0e186bc"],
+  ["ebb78d", "ebb6b8e186bc"],
+  ["ebb78e", "e18487e185b0e186bd"],
+  ["ebb78e", "ebb6b8e186bd"],
+  ["ebb78f", "e18487e185b0e186be"],
+  ["ebb78f", "ebb6b8e186be"],
+  ["ebb790", "e18487e185b0e186bf"],
+  ["ebb790", "ebb6b8e186bf"],
+  ["ebb791", "e18487e185b0e18780"],
+  ["ebb791", "ebb6b8e18780"],
+  ["ebb792", "e18487e185b0e18781"],
+  ["ebb792", "ebb6b8e18781"],
+  ["ebb793", "e18487e185b0e18782"],
+  ["ebb793", "ebb6b8e18782"],
+  ["ebb794", "e18487e185b1"],
+  ["ebb795", "e18487e185b1e186a8"],
+  ["ebb795", "ebb794e186a8"],
+  ["ebb796", "e18487e185b1e186a9"],
+  ["ebb796", "ebb794e186a9"],
+  ["ebb797", "e18487e185b1e186aa"],
+  ["ebb797", "ebb794e186aa"],
+  ["ebb798", "e18487e185b1e186ab"],
+  ["ebb798", "ebb794e186ab"],
+  ["ebb799", "e18487e185b1e186ac"],
+  ["ebb799", "ebb794e186ac"],
+  ["ebb79a", "e18487e185b1e186ad"],
+  ["ebb79a", "ebb794e186ad"],
+  ["ebb79b", "e18487e185b1e186ae"],
+  ["ebb79b", "ebb794e186ae"],
+  ["ebb79c", "e18487e185b1e186af"],
+  ["ebb79c", "ebb794e186af"],
+  ["ebb79d", "e18487e185b1e186b0"],
+  ["ebb79d", "ebb794e186b0"],
+  ["ebb79e", "e18487e185b1e186b1"],
+  ["ebb79e", "ebb794e186b1"],
+  ["ebb79f", "e18487e185b1e186b2"],
+  ["ebb79f", "ebb794e186b2"],
+  ["ebb7a0", "e18487e185b1e186b3"],
+  ["ebb7a0", "ebb794e186b3"],
+  ["ebb7a1", "e18487e185b1e186b4"],
+  ["ebb7a1", "ebb794e186b4"],
+  ["ebb7a2", "e18487e185b1e186b5"],
+  ["ebb7a2", "ebb794e186b5"],
+  ["ebb7a3", "e18487e185b1e186b6"],
+  ["ebb7a3", "ebb794e186b6"],
+  ["ebb7a4", "e18487e185b1e186b7"],
+  ["ebb7a4", "ebb794e186b7"],
+  ["ebb7a5", "e18487e185b1e186b8"],
+  ["ebb7a5", "ebb794e186b8"],
+  ["ebb7a6", "e18487e185b1e186b9"],
+  ["ebb7a6", "ebb794e186b9"],
+  ["ebb7a7", "e18487e185b1e186ba"],
+  ["ebb7a7", "ebb794e186ba"],
+  ["ebb7a8", "e18487e185b1e186bb"],
+  ["ebb7a8", "ebb794e186bb"],
+  ["ebb7a9", "e18487e185b1e186bc"],
+  ["ebb7a9", "ebb794e186bc"],
+  ["ebb7aa", "e18487e185b1e186bd"],
+  ["ebb7aa", "ebb794e186bd"],
+  ["ebb7ab", "e18487e185b1e186be"],
+  ["ebb7ab", "ebb794e186be"],
+  ["ebb7ac", "e18487e185b1e186bf"],
+  ["ebb7ac", "ebb794e186bf"],
+  ["ebb7ad", "e18487e185b1e18780"],
+  ["ebb7ad", "ebb794e18780"],
+  ["ebb7ae", "e18487e185b1e18781"],
+  ["ebb7ae", "ebb794e18781"],
+  ["ebb7af", "e18487e185b1e18782"],
+  ["ebb7af", "ebb794e18782"],
+  ["ebb7b0", "e18487e185b2"],
+  ["ebb7b1", "e18487e185b2e186a8"],
+  ["ebb7b1", "ebb7b0e186a8"],
+  ["ebb7b2", "e18487e185b2e186a9"],
+  ["ebb7b2", "ebb7b0e186a9"],
+  ["ebb7b3", "e18487e185b2e186aa"],
+  ["ebb7b3", "ebb7b0e186aa"],
+  ["ebb7b4", "e18487e185b2e186ab"],
+  ["ebb7b4", "ebb7b0e186ab"],
+  ["ebb7b5", "e18487e185b2e186ac"],
+  ["ebb7b5", "ebb7b0e186ac"],
+  ["ebb7b6", "e18487e185b2e186ad"],
+  ["ebb7b6", "ebb7b0e186ad"],
+  ["ebb7b7", "e18487e185b2e186ae"],
+  ["ebb7b7", "ebb7b0e186ae"],
+  ["ebb7b8", "e18487e185b2e186af"],
+  ["ebb7b8", "ebb7b0e186af"],
+  ["ebb7b9", "e18487e185b2e186b0"],
+  ["ebb7b9", "ebb7b0e186b0"],
+  ["ebb7ba", "e18487e185b2e186b1"],
+  ["ebb7ba", "ebb7b0e186b1"],
+  ["ebb7bb", "e18487e185b2e186b2"],
+  ["ebb7bb", "ebb7b0e186b2"],
+  ["ebb7bc", "e18487e185b2e186b3"],
+  ["ebb7bc", "ebb7b0e186b3"],
+  ["ebb7bd", "e18487e185b2e186b4"],
+  ["ebb7bd", "ebb7b0e186b4"],
+  ["ebb7be", "e18487e185b2e186b5"],
+  ["ebb7be", "ebb7b0e186b5"],
+  ["ebb7bf", "e18487e185b2e186b6"],
+  ["ebb7bf", "ebb7b0e186b6"],
+  ["ebb880", "e18487e185b2e186b7"],
+  ["ebb880", "ebb7b0e186b7"],
+  ["ebb881", "e18487e185b2e186b8"],
+  ["ebb881", "ebb7b0e186b8"],
+  ["ebb882", "e18487e185b2e186b9"],
+  ["ebb882", "ebb7b0e186b9"],
+  ["ebb883", "e18487e185b2e186ba"],
+  ["ebb883", "ebb7b0e186ba"],
+  ["ebb884", "e18487e185b2e186bb"],
+  ["ebb884", "ebb7b0e186bb"],
+  ["ebb885", "e18487e185b2e186bc"],
+  ["ebb885", "ebb7b0e186bc"],
+  ["ebb886", "e18487e185b2e186bd"],
+  ["ebb886", "ebb7b0e186bd"],
+  ["ebb887", "e18487e185b2e186be"],
+  ["ebb887", "ebb7b0e186be"],
+  ["ebb888", "e18487e185b2e186bf"],
+  ["ebb888", "ebb7b0e186bf"],
+  ["ebb889", "e18487e185b2e18780"],
+  ["ebb889", "ebb7b0e18780"],
+  ["ebb88a", "e18487e185b2e18781"],
+  ["ebb88a", "ebb7b0e18781"],
+  ["ebb88b", "e18487e185b2e18782"],
+  ["ebb88b", "ebb7b0e18782"],
+  ["ebb88c", "e18487e185b3"],
+  ["ebb88d", "e18487e185b3e186a8"],
+  ["ebb88d", "ebb88ce186a8"],
+  ["ebb88e", "e18487e185b3e186a9"],
+  ["ebb88e", "ebb88ce186a9"],
+  ["ebb88f", "e18487e185b3e186aa"],
+  ["ebb88f", "ebb88ce186aa"],
+  ["ebb890", "e18487e185b3e186ab"],
+  ["ebb890", "ebb88ce186ab"],
+  ["ebb891", "e18487e185b3e186ac"],
+  ["ebb891", "ebb88ce186ac"],
+  ["ebb892", "e18487e185b3e186ad"],
+  ["ebb892", "ebb88ce186ad"],
+  ["ebb893", "e18487e185b3e186ae"],
+  ["ebb893", "ebb88ce186ae"],
+  ["ebb894", "e18487e185b3e186af"],
+  ["ebb894", "ebb88ce186af"],
+  ["ebb895", "e18487e185b3e186b0"],
+  ["ebb895", "ebb88ce186b0"],
+  ["ebb896", "e18487e185b3e186b1"],
+  ["ebb896", "ebb88ce186b1"],
+  ["ebb897", "e18487e185b3e186b2"],
+  ["ebb897", "ebb88ce186b2"],
+  ["ebb898", "e18487e185b3e186b3"],
+  ["ebb898", "ebb88ce186b3"],
+  ["ebb899", "e18487e185b3e186b4"],
+  ["ebb899", "ebb88ce186b4"],
+  ["ebb89a", "e18487e185b3e186b5"],
+  ["ebb89a", "ebb88ce186b5"],
+  ["ebb89b", "e18487e185b3e186b6"],
+  ["ebb89b", "ebb88ce186b6"],
+  ["ebb89c", "e18487e185b3e186b7"],
+  ["ebb89c", "ebb88ce186b7"],
+  ["ebb89d", "e18487e185b3e186b8"],
+  ["ebb89d", "ebb88ce186b8"],
+  ["ebb89e", "e18487e185b3e186b9"],
+  ["ebb89e", "ebb88ce186b9"],
+  ["ebb89f", "e18487e185b3e186ba"],
+  ["ebb89f", "ebb88ce186ba"],
+  ["ebb8a0", "e18487e185b3e186bb"],
+  ["ebb8a0", "ebb88ce186bb"],
+  ["ebb8a1", "e18487e185b3e186bc"],
+  ["ebb8a1", "ebb88ce186bc"],
+  ["ebb8a2", "e18487e185b3e186bd"],
+  ["ebb8a2", "ebb88ce186bd"],
+  ["ebb8a3", "e18487e185b3e186be"],
+  ["ebb8a3", "ebb88ce186be"],
+  ["ebb8a4", "e18487e185b3e186bf"],
+  ["ebb8a4", "ebb88ce186bf"],
+  ["ebb8a5", "e18487e185b3e18780"],
+  ["ebb8a5", "ebb88ce18780"],
+  ["ebb8a6", "e18487e185b3e18781"],
+  ["ebb8a6", "ebb88ce18781"],
+  ["ebb8a7", "e18487e185b3e18782"],
+  ["ebb8a7", "ebb88ce18782"],
+  ["ebb8a8", "e18487e185b4"],
+  ["ebb8a9", "e18487e185b4e186a8"],
+  ["ebb8a9", "ebb8a8e186a8"],
+  ["ebb8aa", "e18487e185b4e186a9"],
+  ["ebb8aa", "ebb8a8e186a9"],
+  ["ebb8ab", "e18487e185b4e186aa"],
+  ["ebb8ab", "ebb8a8e186aa"],
+  ["ebb8ac", "e18487e185b4e186ab"],
+  ["ebb8ac", "ebb8a8e186ab"],
+  ["ebb8ad", "e18487e185b4e186ac"],
+  ["ebb8ad", "ebb8a8e186ac"],
+  ["ebb8ae", "e18487e185b4e186ad"],
+  ["ebb8ae", "ebb8a8e186ad"],
+  ["ebb8af", "e18487e185b4e186ae"],
+  ["ebb8af", "ebb8a8e186ae"],
+  ["ebb8b0", "e18487e185b4e186af"],
+  ["ebb8b0", "ebb8a8e186af"],
+  ["ebb8b1", "e18487e185b4e186b0"],
+  ["ebb8b1", "ebb8a8e186b0"],
+  ["ebb8b2", "e18487e185b4e186b1"],
+  ["ebb8b2", "ebb8a8e186b1"],
+  ["ebb8b3", "e18487e185b4e186b2"],
+  ["ebb8b3", "ebb8a8e186b2"],
+  ["ebb8b4", "e18487e185b4e186b3"],
+  ["ebb8b4", "ebb8a8e186b3"],
+  ["ebb8b5", "e18487e185b4e186b4"],
+  ["ebb8b5", "ebb8a8e186b4"],
+  ["ebb8b6", "e18487e185b4e186b5"],
+  ["ebb8b6", "ebb8a8e186b5"],
+  ["ebb8b7", "e18487e185b4e186b6"],
+  ["ebb8b7", "ebb8a8e186b6"],
+  ["ebb8b8", "e18487e185b4e186b7"],
+  ["ebb8b8", "ebb8a8e186b7"],
+  ["ebb8b9", "e18487e185b4e186b8"],
+  ["ebb8b9", "ebb8a8e186b8"],
+  ["ebb8ba", "e18487e185b4e186b9"],
+  ["ebb8ba", "ebb8a8e186b9"],
+  ["ebb8bb", "e18487e185b4e186ba"],
+  ["ebb8bb", "ebb8a8e186ba"],
+  ["ebb8bc", "e18487e185b4e186bb"],
+  ["ebb8bc", "ebb8a8e186bb"],
+  ["ebb8bd", "e18487e185b4e186bc"],
+  ["ebb8bd", "ebb8a8e186bc"],
+  ["ebb8be", "e18487e185b4e186bd"],
+  ["ebb8be", "ebb8a8e186bd"],
+  ["ebb8bf", "e18487e185b4e186be"],
+  ["ebb8bf", "ebb8a8e186be"],
+  ["ebb980", "e18487e185b4e186bf"],
+  ["ebb980", "ebb8a8e186bf"],
+  ["ebb981", "e18487e185b4e18780"],
+  ["ebb981", "ebb8a8e18780"],
+  ["ebb982", "e18487e185b4e18781"],
+  ["ebb982", "ebb8a8e18781"],
+  ["ebb983", "e18487e185b4e18782"],
+  ["ebb983", "ebb8a8e18782"],
+  ["ebb984", "e18487e185b5"],
+  ["ebb985", "e18487e185b5e186a8"],
+  ["ebb985", "ebb984e186a8"],
+  ["ebb986", "e18487e185b5e186a9"],
+  ["ebb986", "ebb984e186a9"],
+  ["ebb987", "e18487e185b5e186aa"],
+  ["ebb987", "ebb984e186aa"],
+  ["ebb988", "e18487e185b5e186ab"],
+  ["ebb988", "ebb984e186ab"],
+  ["ebb989", "e18487e185b5e186ac"],
+  ["ebb989", "ebb984e186ac"],
+  ["ebb98a", "e18487e185b5e186ad"],
+  ["ebb98a", "ebb984e186ad"],
+  ["ebb98b", "e18487e185b5e186ae"],
+  ["ebb98b", "ebb984e186ae"],
+  ["ebb98c", "e18487e185b5e186af"],
+  ["ebb98c", "ebb984e186af"],
+  ["ebb98d", "e18487e185b5e186b0"],
+  ["ebb98d", "ebb984e186b0"],
+  ["ebb98e", "e18487e185b5e186b1"],
+  ["ebb98e", "ebb984e186b1"],
+  ["ebb98f", "e18487e185b5e186b2"],
+  ["ebb98f", "ebb984e186b2"],
+  ["ebb990", "e18487e185b5e186b3"],
+  ["ebb990", "ebb984e186b3"],
+  ["ebb991", "e18487e185b5e186b4"],
+  ["ebb991", "ebb984e186b4"],
+  ["ebb992", "e18487e185b5e186b5"],
+  ["ebb992", "ebb984e186b5"],
+  ["ebb993", "e18487e185b5e186b6"],
+  ["ebb993", "ebb984e186b6"],
+  ["ebb994", "e18487e185b5e186b7"],
+  ["ebb994", "ebb984e186b7"],
+  ["ebb995", "e18487e185b5e186b8"],
+  ["ebb995", "ebb984e186b8"],
+  ["ebb996", "e18487e185b5e186b9"],
+  ["ebb996", "ebb984e186b9"],
+  ["ebb997", "e18487e185b5e186ba"],
+  ["ebb997", "ebb984e186ba"],
+  ["ebb998", "e18487e185b5e186bb"],
+  ["ebb998", "ebb984e186bb"],
+  ["ebb999", "e18487e185b5e186bc"],
+  ["ebb999", "ebb984e186bc"],
+  ["ebb99a", "e18487e185b5e186bd"],
+  ["ebb99a", "ebb984e186bd"],
+  ["ebb99b", "e18487e185b5e186be"],
+  ["ebb99b", "ebb984e186be"],
+  ["ebb99c", "e18487e185b5e186bf"],
+  ["ebb99c", "ebb984e186bf"],
+  ["ebb99d", "e18487e185b5e18780"],
+  ["ebb99d", "ebb984e18780"],
+  ["ebb99e", "e18487e185b5e18781"],
+  ["ebb99e", "ebb984e18781"],
+  ["ebb99f", "e18487e185b5e18782"],
+  ["ebb99f", "ebb984e18782"],
+  ["ebb9a0", "e18488e185a1"],
+  ["ebb9a1", "e18488e185a1e186a8"],
+  ["ebb9a1", "ebb9a0e186a8"],
+  ["ebb9a2", "e18488e185a1e186a9"],
+  ["ebb9a2", "ebb9a0e186a9"],
+  ["ebb9a3", "e18488e185a1e186aa"],
+  ["ebb9a3", "ebb9a0e186aa"],
+  ["ebb9a4", "e18488e185a1e186ab"],
+  ["ebb9a4", "ebb9a0e186ab"],
+  ["ebb9a5", "e18488e185a1e186ac"],
+  ["ebb9a5", "ebb9a0e186ac"],
+  ["ebb9a6", "e18488e185a1e186ad"],
+  ["ebb9a6", "ebb9a0e186ad"],
+  ["ebb9a7", "e18488e185a1e186ae"],
+  ["ebb9a7", "ebb9a0e186ae"],
+  ["ebb9a8", "e18488e185a1e186af"],
+  ["ebb9a8", "ebb9a0e186af"],
+  ["ebb9a9", "e18488e185a1e186b0"],
+  ["ebb9a9", "ebb9a0e186b0"],
+  ["ebb9aa", "e18488e185a1e186b1"],
+  ["ebb9aa", "ebb9a0e186b1"],
+  ["ebb9ab", "e18488e185a1e186b2"],
+  ["ebb9ab", "ebb9a0e186b2"],
+  ["ebb9ac", "e18488e185a1e186b3"],
+  ["ebb9ac", "ebb9a0e186b3"],
+  ["ebb9ad", "e18488e185a1e186b4"],
+  ["ebb9ad", "ebb9a0e186b4"],
+  ["ebb9ae", "e18488e185a1e186b5"],
+  ["ebb9ae", "ebb9a0e186b5"],
+  ["ebb9af", "e18488e185a1e186b6"],
+  ["ebb9af", "ebb9a0e186b6"],
+  ["ebb9b0", "e18488e185a1e186b7"],
+  ["ebb9b0", "ebb9a0e186b7"],
+  ["ebb9b1", "e18488e185a1e186b8"],
+  ["ebb9b1", "ebb9a0e186b8"],
+  ["ebb9b2", "e18488e185a1e186b9"],
+  ["ebb9b2", "ebb9a0e186b9"],
+  ["ebb9b3", "e18488e185a1e186ba"],
+  ["ebb9b3", "ebb9a0e186ba"],
+  ["ebb9b4", "e18488e185a1e186bb"],
+  ["ebb9b4", "ebb9a0e186bb"],
+  ["ebb9b5", "e18488e185a1e186bc"],
+  ["ebb9b5", "ebb9a0e186bc"],
+  ["ebb9b6", "e18488e185a1e186bd"],
+  ["ebb9b6", "ebb9a0e186bd"],
+  ["ebb9b7", "e18488e185a1e186be"],
+  ["ebb9b7", "ebb9a0e186be"],
+  ["ebb9b8", "e18488e185a1e186bf"],
+  ["ebb9b8", "ebb9a0e186bf"],
+  ["ebb9b9", "e18488e185a1e18780"],
+  ["ebb9b9", "ebb9a0e18780"],
+  ["ebb9ba", "e18488e185a1e18781"],
+  ["ebb9ba", "ebb9a0e18781"],
+  ["ebb9bb", "e18488e185a1e18782"],
+  ["ebb9bb", "ebb9a0e18782"],
+  ["ebb9bc", "e18488e185a2"],
+  ["ebb9bd", "e18488e185a2e186a8"],
+  ["ebb9bd", "ebb9bce186a8"],
+  ["ebb9be", "e18488e185a2e186a9"],
+  ["ebb9be", "ebb9bce186a9"],
+  ["ebb9bf", "e18488e185a2e186aa"],
+  ["ebb9bf", "ebb9bce186aa"],
+  ["ebba80", "e18488e185a2e186ab"],
+  ["ebba80", "ebb9bce186ab"],
+  ["ebba81", "e18488e185a2e186ac"],
+  ["ebba81", "ebb9bce186ac"],
+  ["ebba82", "e18488e185a2e186ad"],
+  ["ebba82", "ebb9bce186ad"],
+  ["ebba83", "e18488e185a2e186ae"],
+  ["ebba83", "ebb9bce186ae"],
+  ["ebba84", "e18488e185a2e186af"],
+  ["ebba84", "ebb9bce186af"],
+  ["ebba85", "e18488e185a2e186b0"],
+  ["ebba85", "ebb9bce186b0"],
+  ["ebba86", "e18488e185a2e186b1"],
+  ["ebba86", "ebb9bce186b1"],
+  ["ebba87", "e18488e185a2e186b2"],
+  ["ebba87", "ebb9bce186b2"],
+  ["ebba88", "e18488e185a2e186b3"],
+  ["ebba88", "ebb9bce186b3"],
+  ["ebba89", "e18488e185a2e186b4"],
+  ["ebba89", "ebb9bce186b4"],
+  ["ebba8a", "e18488e185a2e186b5"],
+  ["ebba8a", "ebb9bce186b5"],
+  ["ebba8b", "e18488e185a2e186b6"],
+  ["ebba8b", "ebb9bce186b6"],
+  ["ebba8c", "e18488e185a2e186b7"],
+  ["ebba8c", "ebb9bce186b7"],
+  ["ebba8d", "e18488e185a2e186b8"],
+  ["ebba8d", "ebb9bce186b8"],
+  ["ebba8e", "e18488e185a2e186b9"],
+  ["ebba8e", "ebb9bce186b9"],
+  ["ebba8f", "e18488e185a2e186ba"],
+  ["ebba8f", "ebb9bce186ba"],
+  ["ebba90", "e18488e185a2e186bb"],
+  ["ebba90", "ebb9bce186bb"],
+  ["ebba91", "e18488e185a2e186bc"],
+  ["ebba91", "ebb9bce186bc"],
+  ["ebba92", "e18488e185a2e186bd"],
+  ["ebba92", "ebb9bce186bd"],
+  ["ebba93", "e18488e185a2e186be"],
+  ["ebba93", "ebb9bce186be"],
+  ["ebba94", "e18488e185a2e186bf"],
+  ["ebba94", "ebb9bce186bf"],
+  ["ebba95", "e18488e185a2e18780"],
+  ["ebba95", "ebb9bce18780"],
+  ["ebba96", "e18488e185a2e18781"],
+  ["ebba96", "ebb9bce18781"],
+  ["ebba97", "e18488e185a2e18782"],
+  ["ebba97", "ebb9bce18782"],
+  ["ebba98", "e18488e185a3"],
+  ["ebba99", "e18488e185a3e186a8"],
+  ["ebba99", "ebba98e186a8"],
+  ["ebba9a", "e18488e185a3e186a9"],
+  ["ebba9a", "ebba98e186a9"],
+  ["ebba9b", "e18488e185a3e186aa"],
+  ["ebba9b", "ebba98e186aa"],
+  ["ebba9c", "e18488e185a3e186ab"],
+  ["ebba9c", "ebba98e186ab"],
+  ["ebba9d", "e18488e185a3e186ac"],
+  ["ebba9d", "ebba98e186ac"],
+  ["ebba9e", "e18488e185a3e186ad"],
+  ["ebba9e", "ebba98e186ad"],
+  ["ebba9f", "e18488e185a3e186ae"],
+  ["ebba9f", "ebba98e186ae"],
+  ["ebbaa0", "e18488e185a3e186af"],
+  ["ebbaa0", "ebba98e186af"],
+  ["ebbaa1", "e18488e185a3e186b0"],
+  ["ebbaa1", "ebba98e186b0"],
+  ["ebbaa2", "e18488e185a3e186b1"],
+  ["ebbaa2", "ebba98e186b1"],
+  ["ebbaa3", "e18488e185a3e186b2"],
+  ["ebbaa3", "ebba98e186b2"],
+  ["ebbaa4", "e18488e185a3e186b3"],
+  ["ebbaa4", "ebba98e186b3"],
+  ["ebbaa5", "e18488e185a3e186b4"],
+  ["ebbaa5", "ebba98e186b4"],
+  ["ebbaa6", "e18488e185a3e186b5"],
+  ["ebbaa6", "ebba98e186b5"],
+  ["ebbaa7", "e18488e185a3e186b6"],
+  ["ebbaa7", "ebba98e186b6"],
+  ["ebbaa8", "e18488e185a3e186b7"],
+  ["ebbaa8", "ebba98e186b7"],
+  ["ebbaa9", "e18488e185a3e186b8"],
+  ["ebbaa9", "ebba98e186b8"],
+  ["ebbaaa", "e18488e185a3e186b9"],
+  ["ebbaaa", "ebba98e186b9"],
+  ["ebbaab", "e18488e185a3e186ba"],
+  ["ebbaab", "ebba98e186ba"],
+  ["ebbaac", "e18488e185a3e186bb"],
+  ["ebbaac", "ebba98e186bb"],
+  ["ebbaad", "e18488e185a3e186bc"],
+  ["ebbaad", "ebba98e186bc"],
+  ["ebbaae", "e18488e185a3e186bd"],
+  ["ebbaae", "ebba98e186bd"],
+  ["ebbaaf", "e18488e185a3e186be"],
+  ["ebbaaf", "ebba98e186be"],
+  ["ebbab0", "e18488e185a3e186bf"],
+  ["ebbab0", "ebba98e186bf"],
+  ["ebbab1", "e18488e185a3e18780"],
+  ["ebbab1", "ebba98e18780"],
+  ["ebbab2", "e18488e185a3e18781"],
+  ["ebbab2", "ebba98e18781"],
+  ["ebbab3", "e18488e185a3e18782"],
+  ["ebbab3", "ebba98e18782"],
+  ["ebbab4", "e18488e185a4"],
+  ["ebbab5", "e18488e185a4e186a8"],
+  ["ebbab5", "ebbab4e186a8"],
+  ["ebbab6", "e18488e185a4e186a9"],
+  ["ebbab6", "ebbab4e186a9"],
+  ["ebbab7", "e18488e185a4e186aa"],
+  ["ebbab7", "ebbab4e186aa"],
+  ["ebbab8", "e18488e185a4e186ab"],
+  ["ebbab8", "ebbab4e186ab"],
+  ["ebbab9", "e18488e185a4e186ac"],
+  ["ebbab9", "ebbab4e186ac"],
+  ["ebbaba", "e18488e185a4e186ad"],
+  ["ebbaba", "ebbab4e186ad"],
+  ["ebbabb", "e18488e185a4e186ae"],
+  ["ebbabb", "ebbab4e186ae"],
+  ["ebbabc", "e18488e185a4e186af"],
+  ["ebbabc", "ebbab4e186af"],
+  ["ebbabd", "e18488e185a4e186b0"],
+  ["ebbabd", "ebbab4e186b0"],
+  ["ebbabe", "e18488e185a4e186b1"],
+  ["ebbabe", "ebbab4e186b1"],
+  ["ebbabf", "e18488e185a4e186b2"],
+  ["ebbabf", "ebbab4e186b2"],
+  ["ebbb80", "e18488e185a4e186b3"],
+  ["ebbb80", "ebbab4e186b3"],
+  ["ebbb81", "e18488e185a4e186b4"],
+  ["ebbb81", "ebbab4e186b4"],
+  ["ebbb82", "e18488e185a4e186b5"],
+  ["ebbb82", "ebbab4e186b5"],
+  ["ebbb83", "e18488e185a4e186b6"],
+  ["ebbb83", "ebbab4e186b6"],
+  ["ebbb84", "e18488e185a4e186b7"],
+  ["ebbb84", "ebbab4e186b7"],
+  ["ebbb85", "e18488e185a4e186b8"],
+  ["ebbb85", "ebbab4e186b8"],
+  ["ebbb86", "e18488e185a4e186b9"],
+  ["ebbb86", "ebbab4e186b9"],
+  ["ebbb87", "e18488e185a4e186ba"],
+  ["ebbb87", "ebbab4e186ba"],
+  ["ebbb88", "e18488e185a4e186bb"],
+  ["ebbb88", "ebbab4e186bb"],
+  ["ebbb89", "e18488e185a4e186bc"],
+  ["ebbb89", "ebbab4e186bc"],
+  ["ebbb8a", "e18488e185a4e186bd"],
+  ["ebbb8a", "ebbab4e186bd"],
+  ["ebbb8b", "e18488e185a4e186be"],
+  ["ebbb8b", "ebbab4e186be"],
+  ["ebbb8c", "e18488e185a4e186bf"],
+  ["ebbb8c", "ebbab4e186bf"],
+  ["ebbb8d", "e18488e185a4e18780"],
+  ["ebbb8d", "ebbab4e18780"],
+  ["ebbb8e", "e18488e185a4e18781"],
+  ["ebbb8e", "ebbab4e18781"],
+  ["ebbb8f", "e18488e185a4e18782"],
+  ["ebbb8f", "ebbab4e18782"],
+  ["ebbb90", "e18488e185a5"],
+  ["ebbb91", "e18488e185a5e186a8"],
+  ["ebbb91", "ebbb90e186a8"],
+  ["ebbb92", "e18488e185a5e186a9"],
+  ["ebbb92", "ebbb90e186a9"],
+  ["ebbb93", "e18488e185a5e186aa"],
+  ["ebbb93", "ebbb90e186aa"],
+  ["ebbb94", "e18488e185a5e186ab"],
+  ["ebbb94", "ebbb90e186ab"],
+  ["ebbb95", "e18488e185a5e186ac"],
+  ["ebbb95", "ebbb90e186ac"],
+  ["ebbb96", "e18488e185a5e186ad"],
+  ["ebbb96", "ebbb90e186ad"],
+  ["ebbb97", "e18488e185a5e186ae"],
+  ["ebbb97", "ebbb90e186ae"],
+  ["ebbb98", "e18488e185a5e186af"],
+  ["ebbb98", "ebbb90e186af"],
+  ["ebbb99", "e18488e185a5e186b0"],
+  ["ebbb99", "ebbb90e186b0"],
+  ["ebbb9a", "e18488e185a5e186b1"],
+  ["ebbb9a", "ebbb90e186b1"],
+  ["ebbb9b", "e18488e185a5e186b2"],
+  ["ebbb9b", "ebbb90e186b2"],
+  ["ebbb9c", "e18488e185a5e186b3"],
+  ["ebbb9c", "ebbb90e186b3"],
+  ["ebbb9d", "e18488e185a5e186b4"],
+  ["ebbb9d", "ebbb90e186b4"],
+  ["ebbb9e", "e18488e185a5e186b5"],
+  ["ebbb9e", "ebbb90e186b5"],
+  ["ebbb9f", "e18488e185a5e186b6"],
+  ["ebbb9f", "ebbb90e186b6"],
+  ["ebbba0", "e18488e185a5e186b7"],
+  ["ebbba0", "ebbb90e186b7"],
+  ["ebbba1", "e18488e185a5e186b8"],
+  ["ebbba1", "ebbb90e186b8"],
+  ["ebbba2", "e18488e185a5e186b9"],
+  ["ebbba2", "ebbb90e186b9"],
+  ["ebbba3", "e18488e185a5e186ba"],
+  ["ebbba3", "ebbb90e186ba"],
+  ["ebbba4", "e18488e185a5e186bb"],
+  ["ebbba4", "ebbb90e186bb"],
+  ["ebbba5", "e18488e185a5e186bc"],
+  ["ebbba5", "ebbb90e186bc"],
+  ["ebbba6", "e18488e185a5e186bd"],
+  ["ebbba6", "ebbb90e186bd"],
+  ["ebbba7", "e18488e185a5e186be"],
+  ["ebbba7", "ebbb90e186be"],
+  ["ebbba8", "e18488e185a5e186bf"],
+  ["ebbba8", "ebbb90e186bf"],
+  ["ebbba9", "e18488e185a5e18780"],
+  ["ebbba9", "ebbb90e18780"],
+  ["ebbbaa", "e18488e185a5e18781"],
+  ["ebbbaa", "ebbb90e18781"],
+  ["ebbbab", "e18488e185a5e18782"],
+  ["ebbbab", "ebbb90e18782"],
+  ["ebbbac", "e18488e185a6"],
+  ["ebbbad", "e18488e185a6e186a8"],
+  ["ebbbad", "ebbbace186a8"],
+  ["ebbbae", "e18488e185a6e186a9"],
+  ["ebbbae", "ebbbace186a9"],
+  ["ebbbaf", "e18488e185a6e186aa"],
+  ["ebbbaf", "ebbbace186aa"],
+  ["ebbbb0", "e18488e185a6e186ab"],
+  ["ebbbb0", "ebbbace186ab"],
+  ["ebbbb1", "e18488e185a6e186ac"],
+  ["ebbbb1", "ebbbace186ac"],
+  ["ebbbb2", "e18488e185a6e186ad"],
+  ["ebbbb2", "ebbbace186ad"],
+  ["ebbbb3", "e18488e185a6e186ae"],
+  ["ebbbb3", "ebbbace186ae"],
+  ["ebbbb4", "e18488e185a6e186af"],
+  ["ebbbb4", "ebbbace186af"],
+  ["ebbbb5", "e18488e185a6e186b0"],
+  ["ebbbb5", "ebbbace186b0"],
+  ["ebbbb6", "e18488e185a6e186b1"],
+  ["ebbbb6", "ebbbace186b1"],
+  ["ebbbb7", "e18488e185a6e186b2"],
+  ["ebbbb7", "ebbbace186b2"],
+  ["ebbbb8", "e18488e185a6e186b3"],
+  ["ebbbb8", "ebbbace186b3"],
+  ["ebbbb9", "e18488e185a6e186b4"],
+  ["ebbbb9", "ebbbace186b4"],
+  ["ebbbba", "e18488e185a6e186b5"],
+  ["ebbbba", "ebbbace186b5"],
+  ["ebbbbb", "e18488e185a6e186b6"],
+  ["ebbbbb", "ebbbace186b6"],
+  ["ebbbbc", "e18488e185a6e186b7"],
+  ["ebbbbc", "ebbbace186b7"],
+  ["ebbbbd", "e18488e185a6e186b8"],
+  ["ebbbbd", "ebbbace186b8"],
+  ["ebbbbe", "e18488e185a6e186b9"],
+  ["ebbbbe", "ebbbace186b9"],
+  ["ebbbbf", "e18488e185a6e186ba"],
+  ["ebbbbf", "ebbbace186ba"],
+  ["ebbc80", "e18488e185a6e186bb"],
+  ["ebbc80", "ebbbace186bb"],
+  ["ebbc81", "e18488e185a6e186bc"],
+  ["ebbc81", "ebbbace186bc"],
+  ["ebbc82", "e18488e185a6e186bd"],
+  ["ebbc82", "ebbbace186bd"],
+  ["ebbc83", "e18488e185a6e186be"],
+  ["ebbc83", "ebbbace186be"],
+  ["ebbc84", "e18488e185a6e186bf"],
+  ["ebbc84", "ebbbace186bf"],
+  ["ebbc85", "e18488e185a6e18780"],
+  ["ebbc85", "ebbbace18780"],
+  ["ebbc86", "e18488e185a6e18781"],
+  ["ebbc86", "ebbbace18781"],
+  ["ebbc87", "e18488e185a6e18782"],
+  ["ebbc87", "ebbbace18782"],
+  ["ebbc88", "e18488e185a7"],
+  ["ebbc89", "e18488e185a7e186a8"],
+  ["ebbc89", "ebbc88e186a8"],
+  ["ebbc8a", "e18488e185a7e186a9"],
+  ["ebbc8a", "ebbc88e186a9"],
+  ["ebbc8b", "e18488e185a7e186aa"],
+  ["ebbc8b", "ebbc88e186aa"],
+  ["ebbc8c", "e18488e185a7e186ab"],
+  ["ebbc8c", "ebbc88e186ab"],
+  ["ebbc8d", "e18488e185a7e186ac"],
+  ["ebbc8d", "ebbc88e186ac"],
+  ["ebbc8e", "e18488e185a7e186ad"],
+  ["ebbc8e", "ebbc88e186ad"],
+  ["ebbc8f", "e18488e185a7e186ae"],
+  ["ebbc8f", "ebbc88e186ae"],
+  ["ebbc90", "e18488e185a7e186af"],
+  ["ebbc90", "ebbc88e186af"],
+  ["ebbc91", "e18488e185a7e186b0"],
+  ["ebbc91", "ebbc88e186b0"],
+  ["ebbc92", "e18488e185a7e186b1"],
+  ["ebbc92", "ebbc88e186b1"],
+  ["ebbc93", "e18488e185a7e186b2"],
+  ["ebbc93", "ebbc88e186b2"],
+  ["ebbc94", "e18488e185a7e186b3"],
+  ["ebbc94", "ebbc88e186b3"],
+  ["ebbc95", "e18488e185a7e186b4"],
+  ["ebbc95", "ebbc88e186b4"],
+  ["ebbc96", "e18488e185a7e186b5"],
+  ["ebbc96", "ebbc88e186b5"],
+  ["ebbc97", "e18488e185a7e186b6"],
+  ["ebbc97", "ebbc88e186b6"],
+  ["ebbc98", "e18488e185a7e186b7"],
+  ["ebbc98", "ebbc88e186b7"],
+  ["ebbc99", "e18488e185a7e186b8"],
+  ["ebbc99", "ebbc88e186b8"],
+  ["ebbc9a", "e18488e185a7e186b9"],
+  ["ebbc9a", "ebbc88e186b9"],
+  ["ebbc9b", "e18488e185a7e186ba"],
+  ["ebbc9b", "ebbc88e186ba"],
+  ["ebbc9c", "e18488e185a7e186bb"],
+  ["ebbc9c", "ebbc88e186bb"],
+  ["ebbc9d", "e18488e185a7e186bc"],
+  ["ebbc9d", "ebbc88e186bc"],
+  ["ebbc9e", "e18488e185a7e186bd"],
+  ["ebbc9e", "ebbc88e186bd"],
+  ["ebbc9f", "e18488e185a7e186be"],
+  ["ebbc9f", "ebbc88e186be"],
+  ["ebbca0", "e18488e185a7e186bf"],
+  ["ebbca0", "ebbc88e186bf"],
+  ["ebbca1", "e18488e185a7e18780"],
+  ["ebbca1", "ebbc88e18780"],
+  ["ebbca2", "e18488e185a7e18781"],
+  ["ebbca2", "ebbc88e18781"],
+  ["ebbca3", "e18488e185a7e18782"],
+  ["ebbca3", "ebbc88e18782"],
+  ["ebbca4", "e18488e185a8"],
+  ["ebbca5", "e18488e185a8e186a8"],
+  ["ebbca5", "ebbca4e186a8"],
+  ["ebbca6", "e18488e185a8e186a9"],
+  ["ebbca6", "ebbca4e186a9"],
+  ["ebbca7", "e18488e185a8e186aa"],
+  ["ebbca7", "ebbca4e186aa"],
+  ["ebbca8", "e18488e185a8e186ab"],
+  ["ebbca8", "ebbca4e186ab"],
+  ["ebbca9", "e18488e185a8e186ac"],
+  ["ebbca9", "ebbca4e186ac"],
+  ["ebbcaa", "e18488e185a8e186ad"],
+  ["ebbcaa", "ebbca4e186ad"],
+  ["ebbcab", "e18488e185a8e186ae"],
+  ["ebbcab", "ebbca4e186ae"],
+  ["ebbcac", "e18488e185a8e186af"],
+  ["ebbcac", "ebbca4e186af"],
+  ["ebbcad", "e18488e185a8e186b0"],
+  ["ebbcad", "ebbca4e186b0"],
+  ["ebbcae", "e18488e185a8e186b1"],
+  ["ebbcae", "ebbca4e186b1"],
+  ["ebbcaf", "e18488e185a8e186b2"],
+  ["ebbcaf", "ebbca4e186b2"],
+  ["ebbcb0", "e18488e185a8e186b3"],
+  ["ebbcb0", "ebbca4e186b3"],
+  ["ebbcb1", "e18488e185a8e186b4"],
+  ["ebbcb1", "ebbca4e186b4"],
+  ["ebbcb2", "e18488e185a8e186b5"],
+  ["ebbcb2", "ebbca4e186b5"],
+  ["ebbcb3", "e18488e185a8e186b6"],
+  ["ebbcb3", "ebbca4e186b6"],
+  ["ebbcb4", "e18488e185a8e186b7"],
+  ["ebbcb4", "ebbca4e186b7"],
+  ["ebbcb5", "e18488e185a8e186b8"],
+  ["ebbcb5", "ebbca4e186b8"],
+  ["ebbcb6", "e18488e185a8e186b9"],
+  ["ebbcb6", "ebbca4e186b9"],
+  ["ebbcb7", "e18488e185a8e186ba"],
+  ["ebbcb7", "ebbca4e186ba"],
+  ["ebbcb8", "e18488e185a8e186bb"],
+  ["ebbcb8", "ebbca4e186bb"],
+  ["ebbcb9", "e18488e185a8e186bc"],
+  ["ebbcb9", "ebbca4e186bc"],
+  ["ebbcba", "e18488e185a8e186bd"],
+  ["ebbcba", "ebbca4e186bd"],
+  ["ebbcbb", "e18488e185a8e186be"],
+  ["ebbcbb", "ebbca4e186be"],
+  ["ebbcbc", "e18488e185a8e186bf"],
+  ["ebbcbc", "ebbca4e186bf"],
+  ["ebbcbd", "e18488e185a8e18780"],
+  ["ebbcbd", "ebbca4e18780"],
+  ["ebbcbe", "e18488e185a8e18781"],
+  ["ebbcbe", "ebbca4e18781"],
+  ["ebbcbf", "e18488e185a8e18782"],
+  ["ebbcbf", "ebbca4e18782"],
+  ["ebbd80", "e18488e185a9"],
+  ["ebbd81", "e18488e185a9e186a8"],
+  ["ebbd81", "ebbd80e186a8"],
+  ["ebbd82", "e18488e185a9e186a9"],
+  ["ebbd82", "ebbd80e186a9"],
+  ["ebbd83", "e18488e185a9e186aa"],
+  ["ebbd83", "ebbd80e186aa"],
+  ["ebbd84", "e18488e185a9e186ab"],
+  ["ebbd84", "ebbd80e186ab"],
+  ["ebbd85", "e18488e185a9e186ac"],
+  ["ebbd85", "ebbd80e186ac"],
+  ["ebbd86", "e18488e185a9e186ad"],
+  ["ebbd86", "ebbd80e186ad"],
+  ["ebbd87", "e18488e185a9e186ae"],
+  ["ebbd87", "ebbd80e186ae"],
+  ["ebbd88", "e18488e185a9e186af"],
+  ["ebbd88", "ebbd80e186af"],
+  ["ebbd89", "e18488e185a9e186b0"],
+  ["ebbd89", "ebbd80e186b0"],
+  ["ebbd8a", "e18488e185a9e186b1"],
+  ["ebbd8a", "ebbd80e186b1"],
+  ["ebbd8b", "e18488e185a9e186b2"],
+  ["ebbd8b", "ebbd80e186b2"],
+  ["ebbd8c", "e18488e185a9e186b3"],
+  ["ebbd8c", "ebbd80e186b3"],
+  ["ebbd8d", "e18488e185a9e186b4"],
+  ["ebbd8d", "ebbd80e186b4"],
+  ["ebbd8e", "e18488e185a9e186b5"],
+  ["ebbd8e", "ebbd80e186b5"],
+  ["ebbd8f", "e18488e185a9e186b6"],
+  ["ebbd8f", "ebbd80e186b6"],
+  ["ebbd90", "e18488e185a9e186b7"],
+  ["ebbd90", "ebbd80e186b7"],
+  ["ebbd91", "e18488e185a9e186b8"],
+  ["ebbd91", "ebbd80e186b8"],
+  ["ebbd92", "e18488e185a9e186b9"],
+  ["ebbd92", "ebbd80e186b9"],
+  ["ebbd93", "e18488e185a9e186ba"],
+  ["ebbd93", "ebbd80e186ba"],
+  ["ebbd94", "e18488e185a9e186bb"],
+  ["ebbd94", "ebbd80e186bb"],
+  ["ebbd95", "e18488e185a9e186bc"],
+  ["ebbd95", "ebbd80e186bc"],
+  ["ebbd96", "e18488e185a9e186bd"],
+  ["ebbd96", "ebbd80e186bd"],
+  ["ebbd97", "e18488e185a9e186be"],
+  ["ebbd97", "ebbd80e186be"],
+  ["ebbd98", "e18488e185a9e186bf"],
+  ["ebbd98", "ebbd80e186bf"],
+  ["ebbd99", "e18488e185a9e18780"],
+  ["ebbd99", "ebbd80e18780"],
+  ["ebbd9a", "e18488e185a9e18781"],
+  ["ebbd9a", "ebbd80e18781"],
+  ["ebbd9b", "e18488e185a9e18782"],
+  ["ebbd9b", "ebbd80e18782"],
+  ["ebbd9c", "e18488e185aa"],
+  ["ebbd9d", "e18488e185aae186a8"],
+  ["ebbd9d", "ebbd9ce186a8"],
+  ["ebbd9e", "e18488e185aae186a9"],
+  ["ebbd9e", "ebbd9ce186a9"],
+  ["ebbd9f", "e18488e185aae186aa"],
+  ["ebbd9f", "ebbd9ce186aa"],
+  ["ebbda0", "e18488e185aae186ab"],
+  ["ebbda0", "ebbd9ce186ab"],
+  ["ebbda1", "e18488e185aae186ac"],
+  ["ebbda1", "ebbd9ce186ac"],
+  ["ebbda2", "e18488e185aae186ad"],
+  ["ebbda2", "ebbd9ce186ad"],
+  ["ebbda3", "e18488e185aae186ae"],
+  ["ebbda3", "ebbd9ce186ae"],
+  ["ebbda4", "e18488e185aae186af"],
+  ["ebbda4", "ebbd9ce186af"],
+  ["ebbda5", "e18488e185aae186b0"],
+  ["ebbda5", "ebbd9ce186b0"],
+  ["ebbda6", "e18488e185aae186b1"],
+  ["ebbda6", "ebbd9ce186b1"],
+  ["ebbda7", "e18488e185aae186b2"],
+  ["ebbda7", "ebbd9ce186b2"],
+  ["ebbda8", "e18488e185aae186b3"],
+  ["ebbda8", "ebbd9ce186b3"],
+  ["ebbda9", "e18488e185aae186b4"],
+  ["ebbda9", "ebbd9ce186b4"],
+  ["ebbdaa", "e18488e185aae186b5"],
+  ["ebbdaa", "ebbd9ce186b5"],
+  ["ebbdab", "e18488e185aae186b6"],
+  ["ebbdab", "ebbd9ce186b6"],
+  ["ebbdac", "e18488e185aae186b7"],
+  ["ebbdac", "ebbd9ce186b7"],
+  ["ebbdad", "e18488e185aae186b8"],
+  ["ebbdad", "ebbd9ce186b8"],
+  ["ebbdae", "e18488e185aae186b9"],
+  ["ebbdae", "ebbd9ce186b9"],
+  ["ebbdaf", "e18488e185aae186ba"],
+  ["ebbdaf", "ebbd9ce186ba"],
+  ["ebbdb0", "e18488e185aae186bb"],
+  ["ebbdb0", "ebbd9ce186bb"],
+  ["ebbdb1", "e18488e185aae186bc"],
+  ["ebbdb1", "ebbd9ce186bc"],
+  ["ebbdb2", "e18488e185aae186bd"],
+  ["ebbdb2", "ebbd9ce186bd"],
+  ["ebbdb3", "e18488e185aae186be"],
+  ["ebbdb3", "ebbd9ce186be"],
+  ["ebbdb4", "e18488e185aae186bf"],
+  ["ebbdb4", "ebbd9ce186bf"],
+  ["ebbdb5", "e18488e185aae18780"],
+  ["ebbdb5", "ebbd9ce18780"],
+  ["ebbdb6", "e18488e185aae18781"],
+  ["ebbdb6", "ebbd9ce18781"],
+  ["ebbdb7", "e18488e185aae18782"],
+  ["ebbdb7", "ebbd9ce18782"],
+  ["ebbdb8", "e18488e185ab"],
+  ["ebbdb9", "e18488e185abe186a8"],
+  ["ebbdb9", "ebbdb8e186a8"],
+  ["ebbdba", "e18488e185abe186a9"],
+  ["ebbdba", "ebbdb8e186a9"],
+  ["ebbdbb", "e18488e185abe186aa"],
+  ["ebbdbb", "ebbdb8e186aa"],
+  ["ebbdbc", "e18488e185abe186ab"],
+  ["ebbdbc", "ebbdb8e186ab"],
+  ["ebbdbd", "e18488e185abe186ac"],
+  ["ebbdbd", "ebbdb8e186ac"],
+  ["ebbdbe", "e18488e185abe186ad"],
+  ["ebbdbe", "ebbdb8e186ad"],
+  ["ebbdbf", "e18488e185abe186ae"],
+  ["ebbdbf", "ebbdb8e186ae"],
+  ["ebbe80", "e18488e185abe186af"],
+  ["ebbe80", "ebbdb8e186af"],
+  ["ebbe81", "e18488e185abe186b0"],
+  ["ebbe81", "ebbdb8e186b0"],
+  ["ebbe82", "e18488e185abe186b1"],
+  ["ebbe82", "ebbdb8e186b1"],
+  ["ebbe83", "e18488e185abe186b2"],
+  ["ebbe83", "ebbdb8e186b2"],
+  ["ebbe84", "e18488e185abe186b3"],
+  ["ebbe84", "ebbdb8e186b3"],
+  ["ebbe85", "e18488e185abe186b4"],
+  ["ebbe85", "ebbdb8e186b4"],
+  ["ebbe86", "e18488e185abe186b5"],
+  ["ebbe86", "ebbdb8e186b5"],
+  ["ebbe87", "e18488e185abe186b6"],
+  ["ebbe87", "ebbdb8e186b6"],
+  ["ebbe88", "e18488e185abe186b7"],
+  ["ebbe88", "ebbdb8e186b7"],
+  ["ebbe89", "e18488e185abe186b8"],
+  ["ebbe89", "ebbdb8e186b8"],
+  ["ebbe8a", "e18488e185abe186b9"],
+  ["ebbe8a", "ebbdb8e186b9"],
+  ["ebbe8b", "e18488e185abe186ba"],
+  ["ebbe8b", "ebbdb8e186ba"],
+  ["ebbe8c", "e18488e185abe186bb"],
+  ["ebbe8c", "ebbdb8e186bb"],
+  ["ebbe8d", "e18488e185abe186bc"],
+  ["ebbe8d", "ebbdb8e186bc"],
+  ["ebbe8e", "e18488e185abe186bd"],
+  ["ebbe8e", "ebbdb8e186bd"],
+  ["ebbe8f", "e18488e185abe186be"],
+  ["ebbe8f", "ebbdb8e186be"],
+  ["ebbe90", "e18488e185abe186bf"],
+  ["ebbe90", "ebbdb8e186bf"],
+  ["ebbe91", "e18488e185abe18780"],
+  ["ebbe91", "ebbdb8e18780"],
+  ["ebbe92", "e18488e185abe18781"],
+  ["ebbe92", "ebbdb8e18781"],
+  ["ebbe93", "e18488e185abe18782"],
+  ["ebbe93", "ebbdb8e18782"],
+  ["ebbe94", "e18488e185ac"],
+  ["ebbe95", "e18488e185ace186a8"],
+  ["ebbe95", "ebbe94e186a8"],
+  ["ebbe96", "e18488e185ace186a9"],
+  ["ebbe96", "ebbe94e186a9"],
+  ["ebbe97", "e18488e185ace186aa"],
+  ["ebbe97", "ebbe94e186aa"],
+  ["ebbe98", "e18488e185ace186ab"],
+  ["ebbe98", "ebbe94e186ab"],
+  ["ebbe99", "e18488e185ace186ac"],
+  ["ebbe99", "ebbe94e186ac"],
+  ["ebbe9a", "e18488e185ace186ad"],
+  ["ebbe9a", "ebbe94e186ad"],
+  ["ebbe9b", "e18488e185ace186ae"],
+  ["ebbe9b", "ebbe94e186ae"],
+  ["ebbe9c", "e18488e185ace186af"],
+  ["ebbe9c", "ebbe94e186af"],
+  ["ebbe9d", "e18488e185ace186b0"],
+  ["ebbe9d", "ebbe94e186b0"],
+  ["ebbe9e", "e18488e185ace186b1"],
+  ["ebbe9e", "ebbe94e186b1"],
+  ["ebbe9f", "e18488e185ace186b2"],
+  ["ebbe9f", "ebbe94e186b2"],
+  ["ebbea0", "e18488e185ace186b3"],
+  ["ebbea0", "ebbe94e186b3"],
+  ["ebbea1", "e18488e185ace186b4"],
+  ["ebbea1", "ebbe94e186b4"],
+  ["ebbea2", "e18488e185ace186b5"],
+  ["ebbea2", "ebbe94e186b5"],
+  ["ebbea3", "e18488e185ace186b6"],
+  ["ebbea3", "ebbe94e186b6"],
+  ["ebbea4", "e18488e185ace186b7"],
+  ["ebbea4", "ebbe94e186b7"],
+  ["ebbea5", "e18488e185ace186b8"],
+  ["ebbea5", "ebbe94e186b8"],
+  ["ebbea6", "e18488e185ace186b9"],
+  ["ebbea6", "ebbe94e186b9"],
+  ["ebbea7", "e18488e185ace186ba"],
+  ["ebbea7", "ebbe94e186ba"],
+  ["ebbea8", "e18488e185ace186bb"],
+  ["ebbea8", "ebbe94e186bb"],
+  ["ebbea9", "e18488e185ace186bc"],
+  ["ebbea9", "ebbe94e186bc"],
+  ["ebbeaa", "e18488e185ace186bd"],
+  ["ebbeaa", "ebbe94e186bd"],
+  ["ebbeab", "e18488e185ace186be"],
+  ["ebbeab", "ebbe94e186be"],
+  ["ebbeac", "e18488e185ace186bf"],
+  ["ebbeac", "ebbe94e186bf"],
+  ["ebbead", "e18488e185ace18780"],
+  ["ebbead", "ebbe94e18780"],
+  ["ebbeae", "e18488e185ace18781"],
+  ["ebbeae", "ebbe94e18781"],
+  ["ebbeaf", "e18488e185ace18782"],
+  ["ebbeaf", "ebbe94e18782"],
+  ["ebbeb0", "e18488e185ad"],
+  ["ebbeb1", "e18488e185ade186a8"],
+  ["ebbeb1", "ebbeb0e186a8"],
+  ["ebbeb2", "e18488e185ade186a9"],
+  ["ebbeb2", "ebbeb0e186a9"],
+  ["ebbeb3", "e18488e185ade186aa"],
+  ["ebbeb3", "ebbeb0e186aa"],
+  ["ebbeb4", "e18488e185ade186ab"],
+  ["ebbeb4", "ebbeb0e186ab"],
+  ["ebbeb5", "e18488e185ade186ac"],
+  ["ebbeb5", "ebbeb0e186ac"],
+  ["ebbeb6", "e18488e185ade186ad"],
+  ["ebbeb6", "ebbeb0e186ad"],
+  ["ebbeb7", "e18488e185ade186ae"],
+  ["ebbeb7", "ebbeb0e186ae"],
+  ["ebbeb8", "e18488e185ade186af"],
+  ["ebbeb8", "ebbeb0e186af"],
+  ["ebbeb9", "e18488e185ade186b0"],
+  ["ebbeb9", "ebbeb0e186b0"],
+  ["ebbeba", "e18488e185ade186b1"],
+  ["ebbeba", "ebbeb0e186b1"],
+  ["ebbebb", "e18488e185ade186b2"],
+  ["ebbebb", "ebbeb0e186b2"],
+  ["ebbebc", "e18488e185ade186b3"],
+  ["ebbebc", "ebbeb0e186b3"],
+  ["ebbebd", "e18488e185ade186b4"],
+  ["ebbebd", "ebbeb0e186b4"],
+  ["ebbebe", "e18488e185ade186b5"],
+  ["ebbebe", "ebbeb0e186b5"],
+  ["ebbebf", "e18488e185ade186b6"],
+  ["ebbebf", "ebbeb0e186b6"],
+  ["ebbf80", "e18488e185ade186b7"],
+  ["ebbf80", "ebbeb0e186b7"],
+  ["ebbf81", "e18488e185ade186b8"],
+  ["ebbf81", "ebbeb0e186b8"],
+  ["ebbf82", "e18488e185ade186b9"],
+  ["ebbf82", "ebbeb0e186b9"],
+  ["ebbf83", "e18488e185ade186ba"],
+  ["ebbf83", "ebbeb0e186ba"],
+  ["ebbf84", "e18488e185ade186bb"],
+  ["ebbf84", "ebbeb0e186bb"],
+  ["ebbf85", "e18488e185ade186bc"],
+  ["ebbf85", "ebbeb0e186bc"],
+  ["ebbf86", "e18488e185ade186bd"],
+  ["ebbf86", "ebbeb0e186bd"],
+  ["ebbf87", "e18488e185ade186be"],
+  ["ebbf87", "ebbeb0e186be"],
+  ["ebbf88", "e18488e185ade186bf"],
+  ["ebbf88", "ebbeb0e186bf"],
+  ["ebbf89", "e18488e185ade18780"],
+  ["ebbf89", "ebbeb0e18780"],
+  ["ebbf8a", "e18488e185ade18781"],
+  ["ebbf8a", "ebbeb0e18781"],
+  ["ebbf8b", "e18488e185ade18782"],
+  ["ebbf8b", "ebbeb0e18782"],
+  ["ebbf8c", "e18488e185ae"],
+  ["ebbf8d", "e18488e185aee186a8"],
+  ["ebbf8d", "ebbf8ce186a8"],
+  ["ebbf8e", "e18488e185aee186a9"],
+  ["ebbf8e", "ebbf8ce186a9"],
+  ["ebbf8f", "e18488e185aee186aa"],
+  ["ebbf8f", "ebbf8ce186aa"],
+  ["ebbf90", "e18488e185aee186ab"],
+  ["ebbf90", "ebbf8ce186ab"],
+  ["ebbf91", "e18488e185aee186ac"],
+  ["ebbf91", "ebbf8ce186ac"],
+  ["ebbf92", "e18488e185aee186ad"],
+  ["ebbf92", "ebbf8ce186ad"],
+  ["ebbf93", "e18488e185aee186ae"],
+  ["ebbf93", "ebbf8ce186ae"],
+  ["ebbf94", "e18488e185aee186af"],
+  ["ebbf94", "ebbf8ce186af"],
+  ["ebbf95", "e18488e185aee186b0"],
+  ["ebbf95", "ebbf8ce186b0"],
+  ["ebbf96", "e18488e185aee186b1"],
+  ["ebbf96", "ebbf8ce186b1"],
+  ["ebbf97", "e18488e185aee186b2"],
+  ["ebbf97", "ebbf8ce186b2"],
+  ["ebbf98", "e18488e185aee186b3"],
+  ["ebbf98", "ebbf8ce186b3"],
+  ["ebbf99", "e18488e185aee186b4"],
+  ["ebbf99", "ebbf8ce186b4"],
+  ["ebbf9a", "e18488e185aee186b5"],
+  ["ebbf9a", "ebbf8ce186b5"],
+  ["ebbf9b", "e18488e185aee186b6"],
+  ["ebbf9b", "ebbf8ce186b6"],
+  ["ebbf9c", "e18488e185aee186b7"],
+  ["ebbf9c", "ebbf8ce186b7"],
+  ["ebbf9d", "e18488e185aee186b8"],
+  ["ebbf9d", "ebbf8ce186b8"],
+  ["ebbf9e", "e18488e185aee186b9"],
+  ["ebbf9e", "ebbf8ce186b9"],
+  ["ebbf9f", "e18488e185aee186ba"],
+  ["ebbf9f", "ebbf8ce186ba"],
+  ["ebbfa0", "e18488e185aee186bb"],
+  ["ebbfa0", "ebbf8ce186bb"],
+  ["ebbfa1", "e18488e185aee186bc"],
+  ["ebbfa1", "ebbf8ce186bc"],
+  ["ebbfa2", "e18488e185aee186bd"],
+  ["ebbfa2", "ebbf8ce186bd"],
+  ["ebbfa3", "e18488e185aee186be"],
+  ["ebbfa3", "ebbf8ce186be"],
+  ["ebbfa4", "e18488e185aee186bf"],
+  ["ebbfa4", "ebbf8ce186bf"],
+  ["ebbfa5", "e18488e185aee18780"],
+  ["ebbfa5", "ebbf8ce18780"],
+  ["ebbfa6", "e18488e185aee18781"],
+  ["ebbfa6", "ebbf8ce18781"],
+  ["ebbfa7", "e18488e185aee18782"],
+  ["ebbfa7", "ebbf8ce18782"],
+  ["ebbfa8", "e18488e185af"],
+  ["ebbfa9", "e18488e185afe186a8"],
+  ["ebbfa9", "ebbfa8e186a8"],
+  ["ebbfaa", "e18488e185afe186a9"],
+  ["ebbfaa", "ebbfa8e186a9"],
+  ["ebbfab", "e18488e185afe186aa"],
+  ["ebbfab", "ebbfa8e186aa"],
+  ["ebbfac", "e18488e185afe186ab"],
+  ["ebbfac", "ebbfa8e186ab"],
+  ["ebbfad", "e18488e185afe186ac"],
+  ["ebbfad", "ebbfa8e186ac"],
+  ["ebbfae", "e18488e185afe186ad"],
+  ["ebbfae", "ebbfa8e186ad"],
+  ["ebbfaf", "e18488e185afe186ae"],
+  ["ebbfaf", "ebbfa8e186ae"],
+  ["ebbfb0", "e18488e185afe186af"],
+  ["ebbfb0", "ebbfa8e186af"],
+  ["ebbfb1", "e18488e185afe186b0"],
+  ["ebbfb1", "ebbfa8e186b0"],
+  ["ebbfb2", "e18488e185afe186b1"],
+  ["ebbfb2", "ebbfa8e186b1"],
+  ["ebbfb3", "e18488e185afe186b2"],
+  ["ebbfb3", "ebbfa8e186b2"],
+  ["ebbfb4", "e18488e185afe186b3"],
+  ["ebbfb4", "ebbfa8e186b3"],
+  ["ebbfb5", "e18488e185afe186b4"],
+  ["ebbfb5", "ebbfa8e186b4"],
+  ["ebbfb6", "e18488e185afe186b5"],
+  ["ebbfb6", "ebbfa8e186b5"],
+  ["ebbfb7", "e18488e185afe186b6"],
+  ["ebbfb7", "ebbfa8e186b6"],
+  ["ebbfb8", "e18488e185afe186b7"],
+  ["ebbfb8", "ebbfa8e186b7"],
+  ["ebbfb9", "e18488e185afe186b8"],
+  ["ebbfb9", "ebbfa8e186b8"],
+  ["ebbfba", "e18488e185afe186b9"],
+  ["ebbfba", "ebbfa8e186b9"],
+  ["ebbfbb", "e18488e185afe186ba"],
+  ["ebbfbb", "ebbfa8e186ba"],
+  ["ebbfbc", "e18488e185afe186bb"],
+  ["ebbfbc", "ebbfa8e186bb"],
+  ["ebbfbd", "e18488e185afe186bc"],
+  ["ebbfbd", "ebbfa8e186bc"],
+  ["ebbfbe", "e18488e185afe186bd"],
+  ["ebbfbe", "ebbfa8e186bd"],
+  ["ebbfbf", "e18488e185afe186be"],
+  ["ebbfbf", "ebbfa8e186be"],
+  ["ec8080", "e18488e185afe186bf"],
+  ["ec8080", "ebbfa8e186bf"],
+  ["ec8081", "e18488e185afe18780"],
+  ["ec8081", "ebbfa8e18780"],
+  ["ec8082", "e18488e185afe18781"],
+  ["ec8082", "ebbfa8e18781"],
+  ["ec8083", "e18488e185afe18782"],
+  ["ec8083", "ebbfa8e18782"],
+  ["ec8084", "e18488e185b0"],
+  ["ec8085", "e18488e185b0e186a8"],
+  ["ec8085", "ec8084e186a8"],
+  ["ec8086", "e18488e185b0e186a9"],
+  ["ec8086", "ec8084e186a9"],
+  ["ec8087", "e18488e185b0e186aa"],
+  ["ec8087", "ec8084e186aa"],
+  ["ec8088", "e18488e185b0e186ab"],
+  ["ec8088", "ec8084e186ab"],
+  ["ec8089", "e18488e185b0e186ac"],
+  ["ec8089", "ec8084e186ac"],
+  ["ec808a", "e18488e185b0e186ad"],
+  ["ec808a", "ec8084e186ad"],
+  ["ec808b", "e18488e185b0e186ae"],
+  ["ec808b", "ec8084e186ae"],
+  ["ec808c", "e18488e185b0e186af"],
+  ["ec808c", "ec8084e186af"],
+  ["ec808d", "e18488e185b0e186b0"],
+  ["ec808d", "ec8084e186b0"],
+  ["ec808e", "e18488e185b0e186b1"],
+  ["ec808e", "ec8084e186b1"],
+  ["ec808f", "e18488e185b0e186b2"],
+  ["ec808f", "ec8084e186b2"],
+  ["ec8090", "e18488e185b0e186b3"],
+  ["ec8090", "ec8084e186b3"],
+  ["ec8091", "e18488e185b0e186b4"],
+  ["ec8091", "ec8084e186b4"],
+  ["ec8092", "e18488e185b0e186b5"],
+  ["ec8092", "ec8084e186b5"],
+  ["ec8093", "e18488e185b0e186b6"],
+  ["ec8093", "ec8084e186b6"],
+  ["ec8094", "e18488e185b0e186b7"],
+  ["ec8094", "ec8084e186b7"],
+  ["ec8095", "e18488e185b0e186b8"],
+  ["ec8095", "ec8084e186b8"],
+  ["ec8096", "e18488e185b0e186b9"],
+  ["ec8096", "ec8084e186b9"],
+  ["ec8097", "e18488e185b0e186ba"],
+  ["ec8097", "ec8084e186ba"],
+  ["ec8098", "e18488e185b0e186bb"],
+  ["ec8098", "ec8084e186bb"],
+  ["ec8099", "e18488e185b0e186bc"],
+  ["ec8099", "ec8084e186bc"],
+  ["ec809a", "e18488e185b0e186bd"],
+  ["ec809a", "ec8084e186bd"],
+  ["ec809b", "e18488e185b0e186be"],
+  ["ec809b", "ec8084e186be"],
+  ["ec809c", "e18488e185b0e186bf"],
+  ["ec809c", "ec8084e186bf"],
+  ["ec809d", "e18488e185b0e18780"],
+  ["ec809d", "ec8084e18780"],
+  ["ec809e", "e18488e185b0e18781"],
+  ["ec809e", "ec8084e18781"],
+  ["ec809f", "e18488e185b0e18782"],
+  ["ec809f", "ec8084e18782"],
+  ["ec80a0", "e18488e185b1"],
+  ["ec80a1", "e18488e185b1e186a8"],
+  ["ec80a1", "ec80a0e186a8"],
+  ["ec80a2", "e18488e185b1e186a9"],
+  ["ec80a2", "ec80a0e186a9"],
+  ["ec80a3", "e18488e185b1e186aa"],
+  ["ec80a3", "ec80a0e186aa"],
+  ["ec80a4", "e18488e185b1e186ab"],
+  ["ec80a4", "ec80a0e186ab"],
+  ["ec80a5", "e18488e185b1e186ac"],
+  ["ec80a5", "ec80a0e186ac"],
+  ["ec80a6", "e18488e185b1e186ad"],
+  ["ec80a6", "ec80a0e186ad"],
+  ["ec80a7", "e18488e185b1e186ae"],
+  ["ec80a7", "ec80a0e186ae"],
+  ["ec80a8", "e18488e185b1e186af"],
+  ["ec80a8", "ec80a0e186af"],
+  ["ec80a9", "e18488e185b1e186b0"],
+  ["ec80a9", "ec80a0e186b0"],
+  ["ec80aa", "e18488e185b1e186b1"],
+  ["ec80aa", "ec80a0e186b1"],
+  ["ec80ab", "e18488e185b1e186b2"],
+  ["ec80ab", "ec80a0e186b2"],
+  ["ec80ac", "e18488e185b1e186b3"],
+  ["ec80ac", "ec80a0e186b3"],
+  ["ec80ad", "e18488e185b1e186b4"],
+  ["ec80ad", "ec80a0e186b4"],
+  ["ec80ae", "e18488e185b1e186b5"],
+  ["ec80ae", "ec80a0e186b5"],
+  ["ec80af", "e18488e185b1e186b6"],
+  ["ec80af", "ec80a0e186b6"],
+  ["ec80b0", "e18488e185b1e186b7"],
+  ["ec80b0", "ec80a0e186b7"],
+  ["ec80b1", "e18488e185b1e186b8"],
+  ["ec80b1", "ec80a0e186b8"],
+  ["ec80b2", "e18488e185b1e186b9"],
+  ["ec80b2", "ec80a0e186b9"],
+  ["ec80b3", "e18488e185b1e186ba"],
+  ["ec80b3", "ec80a0e186ba"],
+  ["ec80b4", "e18488e185b1e186bb"],
+  ["ec80b4", "ec80a0e186bb"],
+  ["ec80b5", "e18488e185b1e186bc"],
+  ["ec80b5", "ec80a0e186bc"],
+  ["ec80b6", "e18488e185b1e186bd"],
+  ["ec80b6", "ec80a0e186bd"],
+  ["ec80b7", "e18488e185b1e186be"],
+  ["ec80b7", "ec80a0e186be"],
+  ["ec80b8", "e18488e185b1e186bf"],
+  ["ec80b8", "ec80a0e186bf"],
+  ["ec80b9", "e18488e185b1e18780"],
+  ["ec80b9", "ec80a0e18780"],
+  ["ec80ba", "e18488e185b1e18781"],
+  ["ec80ba", "ec80a0e18781"],
+  ["ec80bb", "e18488e185b1e18782"],
+  ["ec80bb", "ec80a0e18782"],
+  ["ec80bc", "e18488e185b2"],
+  ["ec80bd", "e18488e185b2e186a8"],
+  ["ec80bd", "ec80bce186a8"],
+  ["ec80be", "e18488e185b2e186a9"],
+  ["ec80be", "ec80bce186a9"],
+  ["ec80bf", "e18488e185b2e186aa"],
+  ["ec80bf", "ec80bce186aa"],
+  ["ec8180", "e18488e185b2e186ab"],
+  ["ec8180", "ec80bce186ab"],
+  ["ec8181", "e18488e185b2e186ac"],
+  ["ec8181", "ec80bce186ac"],
+  ["ec8182", "e18488e185b2e186ad"],
+  ["ec8182", "ec80bce186ad"],
+  ["ec8183", "e18488e185b2e186ae"],
+  ["ec8183", "ec80bce186ae"],
+  ["ec8184", "e18488e185b2e186af"],
+  ["ec8184", "ec80bce186af"],
+  ["ec8185", "e18488e185b2e186b0"],
+  ["ec8185", "ec80bce186b0"],
+  ["ec8186", "e18488e185b2e186b1"],
+  ["ec8186", "ec80bce186b1"],
+  ["ec8187", "e18488e185b2e186b2"],
+  ["ec8187", "ec80bce186b2"],
+  ["ec8188", "e18488e185b2e186b3"],
+  ["ec8188", "ec80bce186b3"],
+  ["ec8189", "e18488e185b2e186b4"],
+  ["ec8189", "ec80bce186b4"],
+  ["ec818a", "e18488e185b2e186b5"],
+  ["ec818a", "ec80bce186b5"],
+  ["ec818b", "e18488e185b2e186b6"],
+  ["ec818b", "ec80bce186b6"],
+  ["ec818c", "e18488e185b2e186b7"],
+  ["ec818c", "ec80bce186b7"],
+  ["ec818d", "e18488e185b2e186b8"],
+  ["ec818d", "ec80bce186b8"],
+  ["ec818e", "e18488e185b2e186b9"],
+  ["ec818e", "ec80bce186b9"],
+  ["ec818f", "e18488e185b2e186ba"],
+  ["ec818f", "ec80bce186ba"],
+  ["ec8190", "e18488e185b2e186bb"],
+  ["ec8190", "ec80bce186bb"],
+  ["ec8191", "e18488e185b2e186bc"],
+  ["ec8191", "ec80bce186bc"],
+  ["ec8192", "e18488e185b2e186bd"],
+  ["ec8192", "ec80bce186bd"],
+  ["ec8193", "e18488e185b2e186be"],
+  ["ec8193", "ec80bce186be"],
+  ["ec8194", "e18488e185b2e186bf"],
+  ["ec8194", "ec80bce186bf"],
+  ["ec8195", "e18488e185b2e18780"],
+  ["ec8195", "ec80bce18780"],
+  ["ec8196", "e18488e185b2e18781"],
+  ["ec8196", "ec80bce18781"],
+  ["ec8197", "e18488e185b2e18782"],
+  ["ec8197", "ec80bce18782"],
+  ["ec8198", "e18488e185b3"],
+  ["ec8199", "e18488e185b3e186a8"],
+  ["ec8199", "ec8198e186a8"],
+  ["ec819a", "e18488e185b3e186a9"],
+  ["ec819a", "ec8198e186a9"],
+  ["ec819b", "e18488e185b3e186aa"],
+  ["ec819b", "ec8198e186aa"],
+  ["ec819c", "e18488e185b3e186ab"],
+  ["ec819c", "ec8198e186ab"],
+  ["ec819d", "e18488e185b3e186ac"],
+  ["ec819d", "ec8198e186ac"],
+  ["ec819e", "e18488e185b3e186ad"],
+  ["ec819e", "ec8198e186ad"],
+  ["ec819f", "e18488e185b3e186ae"],
+  ["ec819f", "ec8198e186ae"],
+  ["ec81a0", "e18488e185b3e186af"],
+  ["ec81a0", "ec8198e186af"],
+  ["ec81a1", "e18488e185b3e186b0"],
+  ["ec81a1", "ec8198e186b0"],
+  ["ec81a2", "e18488e185b3e186b1"],
+  ["ec81a2", "ec8198e186b1"],
+  ["ec81a3", "e18488e185b3e186b2"],
+  ["ec81a3", "ec8198e186b2"],
+  ["ec81a4", "e18488e185b3e186b3"],
+  ["ec81a4", "ec8198e186b3"],
+  ["ec81a5", "e18488e185b3e186b4"],
+  ["ec81a5", "ec8198e186b4"],
+  ["ec81a6", "e18488e185b3e186b5"],
+  ["ec81a6", "ec8198e186b5"],
+  ["ec81a7", "e18488e185b3e186b6"],
+  ["ec81a7", "ec8198e186b6"],
+  ["ec81a8", "e18488e185b3e186b7"],
+  ["ec81a8", "ec8198e186b7"],
+  ["ec81a9", "e18488e185b3e186b8"],
+  ["ec81a9", "ec8198e186b8"],
+  ["ec81aa", "e18488e185b3e186b9"],
+  ["ec81aa", "ec8198e186b9"],
+  ["ec81ab", "e18488e185b3e186ba"],
+  ["ec81ab", "ec8198e186ba"],
+  ["ec81ac", "e18488e185b3e186bb"],
+  ["ec81ac", "ec8198e186bb"],
+  ["ec81ad", "e18488e185b3e186bc"],
+  ["ec81ad", "ec8198e186bc"],
+  ["ec81ae", "e18488e185b3e186bd"],
+  ["ec81ae", "ec8198e186bd"],
+  ["ec81af", "e18488e185b3e186be"],
+  ["ec81af", "ec8198e186be"],
+  ["ec81b0", "e18488e185b3e186bf"],
+  ["ec81b0", "ec8198e186bf"],
+  ["ec81b1", "e18488e185b3e18780"],
+  ["ec81b1", "ec8198e18780"],
+  ["ec81b2", "e18488e185b3e18781"],
+  ["ec81b2", "ec8198e18781"],
+  ["ec81b3", "e18488e185b3e18782"],
+  ["ec81b3", "ec8198e18782"],
+  ["ec81b4", "e18488e185b4"],
+  ["ec81b5", "e18488e185b4e186a8"],
+  ["ec81b5", "ec81b4e186a8"],
+  ["ec81b6", "e18488e185b4e186a9"],
+  ["ec81b6", "ec81b4e186a9"],
+  ["ec81b7", "e18488e185b4e186aa"],
+  ["ec81b7", "ec81b4e186aa"],
+  ["ec81b8", "e18488e185b4e186ab"],
+  ["ec81b8", "ec81b4e186ab"],
+  ["ec81b9", "e18488e185b4e186ac"],
+  ["ec81b9", "ec81b4e186ac"],
+  ["ec81ba", "e18488e185b4e186ad"],
+  ["ec81ba", "ec81b4e186ad"],
+  ["ec81bb", "e18488e185b4e186ae"],
+  ["ec81bb", "ec81b4e186ae"],
+  ["ec81bc", "e18488e185b4e186af"],
+  ["ec81bc", "ec81b4e186af"],
+  ["ec81bd", "e18488e185b4e186b0"],
+  ["ec81bd", "ec81b4e186b0"],
+  ["ec81be", "e18488e185b4e186b1"],
+  ["ec81be", "ec81b4e186b1"],
+  ["ec81bf", "e18488e185b4e186b2"],
+  ["ec81bf", "ec81b4e186b2"],
+  ["ec8280", "e18488e185b4e186b3"],
+  ["ec8280", "ec81b4e186b3"],
+  ["ec8281", "e18488e185b4e186b4"],
+  ["ec8281", "ec81b4e186b4"],
+  ["ec8282", "e18488e185b4e186b5"],
+  ["ec8282", "ec81b4e186b5"],
+  ["ec8283", "e18488e185b4e186b6"],
+  ["ec8283", "ec81b4e186b6"],
+  ["ec8284", "e18488e185b4e186b7"],
+  ["ec8284", "ec81b4e186b7"],
+  ["ec8285", "e18488e185b4e186b8"],
+  ["ec8285", "ec81b4e186b8"],
+  ["ec8286", "e18488e185b4e186b9"],
+  ["ec8286", "ec81b4e186b9"],
+  ["ec8287", "e18488e185b4e186ba"],
+  ["ec8287", "ec81b4e186ba"],
+  ["ec8288", "e18488e185b4e186bb"],
+  ["ec8288", "ec81b4e186bb"],
+  ["ec8289", "e18488e185b4e186bc"],
+  ["ec8289", "ec81b4e186bc"],
+  ["ec828a", "e18488e185b4e186bd"],
+  ["ec828a", "ec81b4e186bd"],
+  ["ec828b", "e18488e185b4e186be"],
+  ["ec828b", "ec81b4e186be"],
+  ["ec828c", "e18488e185b4e186bf"],
+  ["ec828c", "ec81b4e186bf"],
+  ["ec828d", "e18488e185b4e18780"],
+  ["ec828d", "ec81b4e18780"],
+  ["ec828e", "e18488e185b4e18781"],
+  ["ec828e", "ec81b4e18781"],
+  ["ec828f", "e18488e185b4e18782"],
+  ["ec828f", "ec81b4e18782"],
+  ["ec8290", "e18488e185b5"],
+  ["ec8291", "e18488e185b5e186a8"],
+  ["ec8291", "ec8290e186a8"],
+  ["ec8292", "e18488e185b5e186a9"],
+  ["ec8292", "ec8290e186a9"],
+  ["ec8293", "e18488e185b5e186aa"],
+  ["ec8293", "ec8290e186aa"],
+  ["ec8294", "e18488e185b5e186ab"],
+  ["ec8294", "ec8290e186ab"],
+  ["ec8295", "e18488e185b5e186ac"],
+  ["ec8295", "ec8290e186ac"],
+  ["ec8296", "e18488e185b5e186ad"],
+  ["ec8296", "ec8290e186ad"],
+  ["ec8297", "e18488e185b5e186ae"],
+  ["ec8297", "ec8290e186ae"],
+  ["ec8298", "e18488e185b5e186af"],
+  ["ec8298", "ec8290e186af"],
+  ["ec8299", "e18488e185b5e186b0"],
+  ["ec8299", "ec8290e186b0"],
+  ["ec829a", "e18488e185b5e186b1"],
+  ["ec829a", "ec8290e186b1"],
+  ["ec829b", "e18488e185b5e186b2"],
+  ["ec829b", "ec8290e186b2"],
+  ["ec829c", "e18488e185b5e186b3"],
+  ["ec829c", "ec8290e186b3"],
+  ["ec829d", "e18488e185b5e186b4"],
+  ["ec829d", "ec8290e186b4"],
+  ["ec829e", "e18488e185b5e186b5"],
+  ["ec829e", "ec8290e186b5"],
+  ["ec829f", "e18488e185b5e186b6"],
+  ["ec829f", "ec8290e186b6"],
+  ["ec82a0", "e18488e185b5e186b7"],
+  ["ec82a0", "ec8290e186b7"],
+  ["ec82a1", "e18488e185b5e186b8"],
+  ["ec82a1", "ec8290e186b8"],
+  ["ec82a2", "e18488e185b5e186b9"],
+  ["ec82a2", "ec8290e186b9"],
+  ["ec82a3", "e18488e185b5e186ba"],
+  ["ec82a3", "ec8290e186ba"],
+  ["ec82a4", "e18488e185b5e186bb"],
+  ["ec82a4", "ec8290e186bb"],
+  ["ec82a5", "e18488e185b5e186bc"],
+  ["ec82a5", "ec8290e186bc"],
+  ["ec82a6", "e18488e185b5e186bd"],
+  ["ec82a6", "ec8290e186bd"],
+  ["ec82a7", "e18488e185b5e186be"],
+  ["ec82a7", "ec8290e186be"],
+  ["ec82a8", "e18488e185b5e186bf"],
+  ["ec82a8", "ec8290e186bf"],
+  ["ec82a9", "e18488e185b5e18780"],
+  ["ec82a9", "ec8290e18780"],
+  ["ec82aa", "e18488e185b5e18781"],
+  ["ec82aa", "ec8290e18781"],
+  ["ec82ab", "e18488e185b5e18782"],
+  ["ec82ab", "ec8290e18782"],
+  ["ec82ac", "e18489e185a1"],
+  ["ec82ad", "e18489e185a1e186a8"],
+  ["ec82ad", "ec82ace186a8"],
+  ["ec82ae", "e18489e185a1e186a9"],
+  ["ec82ae", "ec82ace186a9"],
+  ["ec82af", "e18489e185a1e186aa"],
+  ["ec82af", "ec82ace186aa"],
+  ["ec82b0", "e18489e185a1e186ab"],
+  ["ec82b0", "ec82ace186ab"],
+  ["ec82b1", "e18489e185a1e186ac"],
+  ["ec82b1", "ec82ace186ac"],
+  ["ec82b2", "e18489e185a1e186ad"],
+  ["ec82b2", "ec82ace186ad"],
+  ["ec82b3", "e18489e185a1e186ae"],
+  ["ec82b3", "ec82ace186ae"],
+  ["ec82b4", "e18489e185a1e186af"],
+  ["ec82b4", "ec82ace186af"],
+  ["ec82b5", "e18489e185a1e186b0"],
+  ["ec82b5", "ec82ace186b0"],
+  ["ec82b6", "e18489e185a1e186b1"],
+  ["ec82b6", "ec82ace186b1"],
+  ["ec82b7", "e18489e185a1e186b2"],
+  ["ec82b7", "ec82ace186b2"],
+  ["ec82b8", "e18489e185a1e186b3"],
+  ["ec82b8", "ec82ace186b3"],
+  ["ec82b9", "e18489e185a1e186b4"],
+  ["ec82b9", "ec82ace186b4"],
+  ["ec82ba", "e18489e185a1e186b5"],
+  ["ec82ba", "ec82ace186b5"],
+  ["ec82bb", "e18489e185a1e186b6"],
+  ["ec82bb", "ec82ace186b6"],
+  ["ec82bc", "e18489e185a1e186b7"],
+  ["ec82bc", "ec82ace186b7"],
+  ["ec82bd", "e18489e185a1e186b8"],
+  ["ec82bd", "ec82ace186b8"],
+  ["ec82be", "e18489e185a1e186b9"],
+  ["ec82be", "ec82ace186b9"],
+  ["ec82bf", "e18489e185a1e186ba"],
+  ["ec82bf", "ec82ace186ba"],
+  ["ec8380", "e18489e185a1e186bb"],
+  ["ec8380", "ec82ace186bb"],
+  ["ec8381", "e18489e185a1e186bc"],
+  ["ec8381", "ec82ace186bc"],
+  ["ec8382", "e18489e185a1e186bd"],
+  ["ec8382", "ec82ace186bd"],
+  ["ec8383", "e18489e185a1e186be"],
+  ["ec8383", "ec82ace186be"],
+  ["ec8384", "e18489e185a1e186bf"],
+  ["ec8384", "ec82ace186bf"],
+  ["ec8385", "e18489e185a1e18780"],
+  ["ec8385", "ec82ace18780"],
+  ["ec8386", "e18489e185a1e18781"],
+  ["ec8386", "ec82ace18781"],
+  ["ec8387", "e18489e185a1e18782"],
+  ["ec8387", "ec82ace18782"],
+  ["ec8388", "e18489e185a2"],
+  ["ec8389", "e18489e185a2e186a8"],
+  ["ec8389", "ec8388e186a8"],
+  ["ec838a", "e18489e185a2e186a9"],
+  ["ec838a", "ec8388e186a9"],
+  ["ec838b", "e18489e185a2e186aa"],
+  ["ec838b", "ec8388e186aa"],
+  ["ec838c", "e18489e185a2e186ab"],
+  ["ec838c", "ec8388e186ab"],
+  ["ec838d", "e18489e185a2e186ac"],
+  ["ec838d", "ec8388e186ac"],
+  ["ec838e", "e18489e185a2e186ad"],
+  ["ec838e", "ec8388e186ad"],
+  ["ec838f", "e18489e185a2e186ae"],
+  ["ec838f", "ec8388e186ae"],
+  ["ec8390", "e18489e185a2e186af"],
+  ["ec8390", "ec8388e186af"],
+  ["ec8391", "e18489e185a2e186b0"],
+  ["ec8391", "ec8388e186b0"],
+  ["ec8392", "e18489e185a2e186b1"],
+  ["ec8392", "ec8388e186b1"],
+  ["ec8393", "e18489e185a2e186b2"],
+  ["ec8393", "ec8388e186b2"],
+  ["ec8394", "e18489e185a2e186b3"],
+  ["ec8394", "ec8388e186b3"],
+  ["ec8395", "e18489e185a2e186b4"],
+  ["ec8395", "ec8388e186b4"],
+  ["ec8396", "e18489e185a2e186b5"],
+  ["ec8396", "ec8388e186b5"],
+  ["ec8397", "e18489e185a2e186b6"],
+  ["ec8397", "ec8388e186b6"],
+  ["ec8398", "e18489e185a2e186b7"],
+  ["ec8398", "ec8388e186b7"],
+  ["ec8399", "e18489e185a2e186b8"],
+  ["ec8399", "ec8388e186b8"],
+  ["ec839a", "e18489e185a2e186b9"],
+  ["ec839a", "ec8388e186b9"],
+  ["ec839b", "e18489e185a2e186ba"],
+  ["ec839b", "ec8388e186ba"],
+  ["ec839c", "e18489e185a2e186bb"],
+  ["ec839c", "ec8388e186bb"],
+  ["ec839d", "e18489e185a2e186bc"],
+  ["ec839d", "ec8388e186bc"],
+  ["ec839e", "e18489e185a2e186bd"],
+  ["ec839e", "ec8388e186bd"],
+  ["ec839f", "e18489e185a2e186be"],
+  ["ec839f", "ec8388e186be"],
+  ["ec83a0", "e18489e185a2e186bf"],
+  ["ec83a0", "ec8388e186bf"],
+  ["ec83a1", "e18489e185a2e18780"],
+  ["ec83a1", "ec8388e18780"],
+  ["ec83a2", "e18489e185a2e18781"],
+  ["ec83a2", "ec8388e18781"],
+  ["ec83a3", "e18489e185a2e18782"],
+  ["ec83a3", "ec8388e18782"],
+  ["ec83a4", "e18489e185a3"],
+  ["ec83a5", "e18489e185a3e186a8"],
+  ["ec83a5", "ec83a4e186a8"],
+  ["ec83a6", "e18489e185a3e186a9"],
+  ["ec83a6", "ec83a4e186a9"],
+  ["ec83a7", "e18489e185a3e186aa"],
+  ["ec83a7", "ec83a4e186aa"],
+  ["ec83a8", "e18489e185a3e186ab"],
+  ["ec83a8", "ec83a4e186ab"],
+  ["ec83a9", "e18489e185a3e186ac"],
+  ["ec83a9", "ec83a4e186ac"],
+  ["ec83aa", "e18489e185a3e186ad"],
+  ["ec83aa", "ec83a4e186ad"],
+  ["ec83ab", "e18489e185a3e186ae"],
+  ["ec83ab", "ec83a4e186ae"],
+  ["ec83ac", "e18489e185a3e186af"],
+  ["ec83ac", "ec83a4e186af"],
+  ["ec83ad", "e18489e185a3e186b0"],
+  ["ec83ad", "ec83a4e186b0"],
+  ["ec83ae", "e18489e185a3e186b1"],
+  ["ec83ae", "ec83a4e186b1"],
+  ["ec83af", "e18489e185a3e186b2"],
+  ["ec83af", "ec83a4e186b2"],
+  ["ec83b0", "e18489e185a3e186b3"],
+  ["ec83b0", "ec83a4e186b3"],
+  ["ec83b1", "e18489e185a3e186b4"],
+  ["ec83b1", "ec83a4e186b4"],
+  ["ec83b2", "e18489e185a3e186b5"],
+  ["ec83b2", "ec83a4e186b5"],
+  ["ec83b3", "e18489e185a3e186b6"],
+  ["ec83b3", "ec83a4e186b6"],
+  ["ec83b4", "e18489e185a3e186b7"],
+  ["ec83b4", "ec83a4e186b7"],
+  ["ec83b5", "e18489e185a3e186b8"],
+  ["ec83b5", "ec83a4e186b8"],
+  ["ec83b6", "e18489e185a3e186b9"],
+  ["ec83b6", "ec83a4e186b9"],
+  ["ec83b7", "e18489e185a3e186ba"],
+  ["ec83b7", "ec83a4e186ba"],
+  ["ec83b8", "e18489e185a3e186bb"],
+  ["ec83b8", "ec83a4e186bb"],
+  ["ec83b9", "e18489e185a3e186bc"],
+  ["ec83b9", "ec83a4e186bc"],
+  ["ec83ba", "e18489e185a3e186bd"],
+  ["ec83ba", "ec83a4e186bd"],
+  ["ec83bb", "e18489e185a3e186be"],
+  ["ec83bb", "ec83a4e186be"],
+  ["ec83bc", "e18489e185a3e186bf"],
+  ["ec83bc", "ec83a4e186bf"],
+  ["ec83bd", "e18489e185a3e18780"],
+  ["ec83bd", "ec83a4e18780"],
+  ["ec83be", "e18489e185a3e18781"],
+  ["ec83be", "ec83a4e18781"],
+  ["ec83bf", "e18489e185a3e18782"],
+  ["ec83bf", "ec83a4e18782"],
+  ["ec8480", "e18489e185a4"],
+  ["ec8481", "e18489e185a4e186a8"],
+  ["ec8481", "ec8480e186a8"],
+  ["ec8482", "e18489e185a4e186a9"],
+  ["ec8482", "ec8480e186a9"],
+  ["ec8483", "e18489e185a4e186aa"],
+  ["ec8483", "ec8480e186aa"],
+  ["ec8484", "e18489e185a4e186ab"],
+  ["ec8484", "ec8480e186ab"],
+  ["ec8485", "e18489e185a4e186ac"],
+  ["ec8485", "ec8480e186ac"],
+  ["ec8486", "e18489e185a4e186ad"],
+  ["ec8486", "ec8480e186ad"],
+  ["ec8487", "e18489e185a4e186ae"],
+  ["ec8487", "ec8480e186ae"],
+  ["ec8488", "e18489e185a4e186af"],
+  ["ec8488", "ec8480e186af"],
+  ["ec8489", "e18489e185a4e186b0"],
+  ["ec8489", "ec8480e186b0"],
+  ["ec848a", "e18489e185a4e186b1"],
+  ["ec848a", "ec8480e186b1"],
+  ["ec848b", "e18489e185a4e186b2"],
+  ["ec848b", "ec8480e186b2"],
+  ["ec848c", "e18489e185a4e186b3"],
+  ["ec848c", "ec8480e186b3"],
+  ["ec848d", "e18489e185a4e186b4"],
+  ["ec848d", "ec8480e186b4"],
+  ["ec848e", "e18489e185a4e186b5"],
+  ["ec848e", "ec8480e186b5"],
+  ["ec848f", "e18489e185a4e186b6"],
+  ["ec848f", "ec8480e186b6"],
+  ["ec8490", "e18489e185a4e186b7"],
+  ["ec8490", "ec8480e186b7"],
+  ["ec8491", "e18489e185a4e186b8"],
+  ["ec8491", "ec8480e186b8"],
+  ["ec8492", "e18489e185a4e186b9"],
+  ["ec8492", "ec8480e186b9"],
+  ["ec8493", "e18489e185a4e186ba"],
+  ["ec8493", "ec8480e186ba"],
+  ["ec8494", "e18489e185a4e186bb"],
+  ["ec8494", "ec8480e186bb"],
+  ["ec8495", "e18489e185a4e186bc"],
+  ["ec8495", "ec8480e186bc"],
+  ["ec8496", "e18489e185a4e186bd"],
+  ["ec8496", "ec8480e186bd"],
+  ["ec8497", "e18489e185a4e186be"],
+  ["ec8497", "ec8480e186be"],
+  ["ec8498", "e18489e185a4e186bf"],
+  ["ec8498", "ec8480e186bf"],
+  ["ec8499", "e18489e185a4e18780"],
+  ["ec8499", "ec8480e18780"],
+  ["ec849a", "e18489e185a4e18781"],
+  ["ec849a", "ec8480e18781"],
+  ["ec849b", "e18489e185a4e18782"],
+  ["ec849b", "ec8480e18782"],
+  ["ec849c", "e18489e185a5"],
+  ["ec849d", "e18489e185a5e186a8"],
+  ["ec849d", "ec849ce186a8"],
+  ["ec849e", "e18489e185a5e186a9"],
+  ["ec849e", "ec849ce186a9"],
+  ["ec849f", "e18489e185a5e186aa"],
+  ["ec849f", "ec849ce186aa"],
+  ["ec84a0", "e18489e185a5e186ab"],
+  ["ec84a0", "ec849ce186ab"],
+  ["ec84a1", "e18489e185a5e186ac"],
+  ["ec84a1", "ec849ce186ac"],
+  ["ec84a2", "e18489e185a5e186ad"],
+  ["ec84a2", "ec849ce186ad"],
+  ["ec84a3", "e18489e185a5e186ae"],
+  ["ec84a3", "ec849ce186ae"],
+  ["ec84a4", "e18489e185a5e186af"],
+  ["ec84a4", "ec849ce186af"],
+  ["ec84a5", "e18489e185a5e186b0"],
+  ["ec84a5", "ec849ce186b0"],
+  ["ec84a6", "e18489e185a5e186b1"],
+  ["ec84a6", "ec849ce186b1"],
+  ["ec84a7", "e18489e185a5e186b2"],
+  ["ec84a7", "ec849ce186b2"],
+  ["ec84a8", "e18489e185a5e186b3"],
+  ["ec84a8", "ec849ce186b3"],
+  ["ec84a9", "e18489e185a5e186b4"],
+  ["ec84a9", "ec849ce186b4"],
+  ["ec84aa", "e18489e185a5e186b5"],
+  ["ec84aa", "ec849ce186b5"],
+  ["ec84ab", "e18489e185a5e186b6"],
+  ["ec84ab", "ec849ce186b6"],
+  ["ec84ac", "e18489e185a5e186b7"],
+  ["ec84ac", "ec849ce186b7"],
+  ["ec84ad", "e18489e185a5e186b8"],
+  ["ec84ad", "ec849ce186b8"],
+  ["ec84ae", "e18489e185a5e186b9"],
+  ["ec84ae", "ec849ce186b9"],
+  ["ec84af", "e18489e185a5e186ba"],
+  ["ec84af", "ec849ce186ba"],
+  ["ec84b0", "e18489e185a5e186bb"],
+  ["ec84b0", "ec849ce186bb"],
+  ["ec84b1", "e18489e185a5e186bc"],
+  ["ec84b1", "ec849ce186bc"],
+  ["ec84b2", "e18489e185a5e186bd"],
+  ["ec84b2", "ec849ce186bd"],
+  ["ec84b3", "e18489e185a5e186be"],
+  ["ec84b3", "ec849ce186be"],
+  ["ec84b4", "e18489e185a5e186bf"],
+  ["ec84b4", "ec849ce186bf"],
+  ["ec84b5", "e18489e185a5e18780"],
+  ["ec84b5", "ec849ce18780"],
+  ["ec84b6", "e18489e185a5e18781"],
+  ["ec84b6", "ec849ce18781"],
+  ["ec84b7", "e18489e185a5e18782"],
+  ["ec84b7", "ec849ce18782"],
+  ["ec84b8", "e18489e185a6"],
+  ["ec84b9", "e18489e185a6e186a8"],
+  ["ec84b9", "ec84b8e186a8"],
+  ["ec84ba", "e18489e185a6e186a9"],
+  ["ec84ba", "ec84b8e186a9"],
+  ["ec84bb", "e18489e185a6e186aa"],
+  ["ec84bb", "ec84b8e186aa"],
+  ["ec84bc", "e18489e185a6e186ab"],
+  ["ec84bc", "ec84b8e186ab"],
+  ["ec84bd", "e18489e185a6e186ac"],
+  ["ec84bd", "ec84b8e186ac"],
+  ["ec84be", "e18489e185a6e186ad"],
+  ["ec84be", "ec84b8e186ad"],
+  ["ec84bf", "e18489e185a6e186ae"],
+  ["ec84bf", "ec84b8e186ae"],
+  ["ec8580", "e18489e185a6e186af"],
+  ["ec8580", "ec84b8e186af"],
+  ["ec8581", "e18489e185a6e186b0"],
+  ["ec8581", "ec84b8e186b0"],
+  ["ec8582", "e18489e185a6e186b1"],
+  ["ec8582", "ec84b8e186b1"],
+  ["ec8583", "e18489e185a6e186b2"],
+  ["ec8583", "ec84b8e186b2"],
+  ["ec8584", "e18489e185a6e186b3"],
+  ["ec8584", "ec84b8e186b3"],
+  ["ec8585", "e18489e185a6e186b4"],
+  ["ec8585", "ec84b8e186b4"],
+  ["ec8586", "e18489e185a6e186b5"],
+  ["ec8586", "ec84b8e186b5"],
+  ["ec8587", "e18489e185a6e186b6"],
+  ["ec8587", "ec84b8e186b6"],
+  ["ec8588", "e18489e185a6e186b7"],
+  ["ec8588", "ec84b8e186b7"],
+  ["ec8589", "e18489e185a6e186b8"],
+  ["ec8589", "ec84b8e186b8"],
+  ["ec858a", "e18489e185a6e186b9"],
+  ["ec858a", "ec84b8e186b9"],
+  ["ec858b", "e18489e185a6e186ba"],
+  ["ec858b", "ec84b8e186ba"],
+  ["ec858c", "e18489e185a6e186bb"],
+  ["ec858c", "ec84b8e186bb"],
+  ["ec858d", "e18489e185a6e186bc"],
+  ["ec858d", "ec84b8e186bc"],
+  ["ec858e", "e18489e185a6e186bd"],
+  ["ec858e", "ec84b8e186bd"],
+  ["ec858f", "e18489e185a6e186be"],
+  ["ec858f", "ec84b8e186be"],
+  ["ec8590", "e18489e185a6e186bf"],
+  ["ec8590", "ec84b8e186bf"],
+  ["ec8591", "e18489e185a6e18780"],
+  ["ec8591", "ec84b8e18780"],
+  ["ec8592", "e18489e185a6e18781"],
+  ["ec8592", "ec84b8e18781"],
+  ["ec8593", "e18489e185a6e18782"],
+  ["ec8593", "ec84b8e18782"],
+  ["ec8594", "e18489e185a7"],
+  ["ec8595", "e18489e185a7e186a8"],
+  ["ec8595", "ec8594e186a8"],
+  ["ec8596", "e18489e185a7e186a9"],
+  ["ec8596", "ec8594e186a9"],
+  ["ec8597", "e18489e185a7e186aa"],
+  ["ec8597", "ec8594e186aa"],
+  ["ec8598", "e18489e185a7e186ab"],
+  ["ec8598", "ec8594e186ab"],
+  ["ec8599", "e18489e185a7e186ac"],
+  ["ec8599", "ec8594e186ac"],
+  ["ec859a", "e18489e185a7e186ad"],
+  ["ec859a", "ec8594e186ad"],
+  ["ec859b", "e18489e185a7e186ae"],
+  ["ec859b", "ec8594e186ae"],
+  ["ec859c", "e18489e185a7e186af"],
+  ["ec859c", "ec8594e186af"],
+  ["ec859d", "e18489e185a7e186b0"],
+  ["ec859d", "ec8594e186b0"],
+  ["ec859e", "e18489e185a7e186b1"],
+  ["ec859e", "ec8594e186b1"],
+  ["ec859f", "e18489e185a7e186b2"],
+  ["ec859f", "ec8594e186b2"],
+  ["ec85a0", "e18489e185a7e186b3"],
+  ["ec85a0", "ec8594e186b3"],
+  ["ec85a1", "e18489e185a7e186b4"],
+  ["ec85a1", "ec8594e186b4"],
+  ["ec85a2", "e18489e185a7e186b5"],
+  ["ec85a2", "ec8594e186b5"],
+  ["ec85a3", "e18489e185a7e186b6"],
+  ["ec85a3", "ec8594e186b6"],
+  ["ec85a4", "e18489e185a7e186b7"],
+  ["ec85a4", "ec8594e186b7"],
+  ["ec85a5", "e18489e185a7e186b8"],
+  ["ec85a5", "ec8594e186b8"],
+  ["ec85a6", "e18489e185a7e186b9"],
+  ["ec85a6", "ec8594e186b9"],
+  ["ec85a7", "e18489e185a7e186ba"],
+  ["ec85a7", "ec8594e186ba"],
+  ["ec85a8", "e18489e185a7e186bb"],
+  ["ec85a8", "ec8594e186bb"],
+  ["ec85a9", "e18489e185a7e186bc"],
+  ["ec85a9", "ec8594e186bc"],
+  ["ec85aa", "e18489e185a7e186bd"],
+  ["ec85aa", "ec8594e186bd"],
+  ["ec85ab", "e18489e185a7e186be"],
+  ["ec85ab", "ec8594e186be"],
+  ["ec85ac", "e18489e185a7e186bf"],
+  ["ec85ac", "ec8594e186bf"],
+  ["ec85ad", "e18489e185a7e18780"],
+  ["ec85ad", "ec8594e18780"],
+  ["ec85ae", "e18489e185a7e18781"],
+  ["ec85ae", "ec8594e18781"],
+  ["ec85af", "e18489e185a7e18782"],
+  ["ec85af", "ec8594e18782"],
+  ["ec85b0", "e18489e185a8"],
+  ["ec85b1", "e18489e185a8e186a8"],
+  ["ec85b1", "ec85b0e186a8"],
+  ["ec85b2", "e18489e185a8e186a9"],
+  ["ec85b2", "ec85b0e186a9"],
+  ["ec85b3", "e18489e185a8e186aa"],
+  ["ec85b3", "ec85b0e186aa"],
+  ["ec85b4", "e18489e185a8e186ab"],
+  ["ec85b4", "ec85b0e186ab"],
+  ["ec85b5", "e18489e185a8e186ac"],
+  ["ec85b5", "ec85b0e186ac"],
+  ["ec85b6", "e18489e185a8e186ad"],
+  ["ec85b6", "ec85b0e186ad"],
+  ["ec85b7", "e18489e185a8e186ae"],
+  ["ec85b7", "ec85b0e186ae"],
+  ["ec85b8", "e18489e185a8e186af"],
+  ["ec85b8", "ec85b0e186af"],
+  ["ec85b9", "e18489e185a8e186b0"],
+  ["ec85b9", "ec85b0e186b0"],
+  ["ec85ba", "e18489e185a8e186b1"],
+  ["ec85ba", "ec85b0e186b1"],
+  ["ec85bb", "e18489e185a8e186b2"],
+  ["ec85bb", "ec85b0e186b2"],
+  ["ec85bc", "e18489e185a8e186b3"],
+  ["ec85bc", "ec85b0e186b3"],
+  ["ec85bd", "e18489e185a8e186b4"],
+  ["ec85bd", "ec85b0e186b4"],
+  ["ec85be", "e18489e185a8e186b5"],
+  ["ec85be", "ec85b0e186b5"],
+  ["ec85bf", "e18489e185a8e186b6"],
+  ["ec85bf", "ec85b0e186b6"],
+  ["ec8680", "e18489e185a8e186b7"],
+  ["ec8680", "ec85b0e186b7"],
+  ["ec8681", "e18489e185a8e186b8"],
+  ["ec8681", "ec85b0e186b8"],
+  ["ec8682", "e18489e185a8e186b9"],
+  ["ec8682", "ec85b0e186b9"],
+  ["ec8683", "e18489e185a8e186ba"],
+  ["ec8683", "ec85b0e186ba"],
+  ["ec8684", "e18489e185a8e186bb"],
+  ["ec8684", "ec85b0e186bb"],
+  ["ec8685", "e18489e185a8e186bc"],
+  ["ec8685", "ec85b0e186bc"],
+  ["ec8686", "e18489e185a8e186bd"],
+  ["ec8686", "ec85b0e186bd"],
+  ["ec8687", "e18489e185a8e186be"],
+  ["ec8687", "ec85b0e186be"],
+  ["ec8688", "e18489e185a8e186bf"],
+  ["ec8688", "ec85b0e186bf"],
+  ["ec8689", "e18489e185a8e18780"],
+  ["ec8689", "ec85b0e18780"],
+  ["ec868a", "e18489e185a8e18781"],
+  ["ec868a", "ec85b0e18781"],
+  ["ec868b", "e18489e185a8e18782"],
+  ["ec868b", "ec85b0e18782"],
+  ["ec868c", "e18489e185a9"],
+  ["ec868d", "e18489e185a9e186a8"],
+  ["ec868d", "ec868ce186a8"],
+  ["ec868e", "e18489e185a9e186a9"],
+  ["ec868e", "ec868ce186a9"],
+  ["ec868f", "e18489e185a9e186aa"],
+  ["ec868f", "ec868ce186aa"],
+  ["ec8690", "e18489e185a9e186ab"],
+  ["ec8690", "ec868ce186ab"],
+  ["ec8691", "e18489e185a9e186ac"],
+  ["ec8691", "ec868ce186ac"],
+  ["ec8692", "e18489e185a9e186ad"],
+  ["ec8692", "ec868ce186ad"],
+  ["ec8693", "e18489e185a9e186ae"],
+  ["ec8693", "ec868ce186ae"],
+  ["ec8694", "e18489e185a9e186af"],
+  ["ec8694", "ec868ce186af"],
+  ["ec8695", "e18489e185a9e186b0"],
+  ["ec8695", "ec868ce186b0"],
+  ["ec8696", "e18489e185a9e186b1"],
+  ["ec8696", "ec868ce186b1"],
+  ["ec8697", "e18489e185a9e186b2"],
+  ["ec8697", "ec868ce186b2"],
+  ["ec8698", "e18489e185a9e186b3"],
+  ["ec8698", "ec868ce186b3"],
+  ["ec8699", "e18489e185a9e186b4"],
+  ["ec8699", "ec868ce186b4"],
+  ["ec869a", "e18489e185a9e186b5"],
+  ["ec869a", "ec868ce186b5"],
+  ["ec869b", "e18489e185a9e186b6"],
+  ["ec869b", "ec868ce186b6"],
+  ["ec869c", "e18489e185a9e186b7"],
+  ["ec869c", "ec868ce186b7"],
+  ["ec869d", "e18489e185a9e186b8"],
+  ["ec869d", "ec868ce186b8"],
+  ["ec869e", "e18489e185a9e186b9"],
+  ["ec869e", "ec868ce186b9"],
+  ["ec869f", "e18489e185a9e186ba"],
+  ["ec869f", "ec868ce186ba"],
+  ["ec86a0", "e18489e185a9e186bb"],
+  ["ec86a0", "ec868ce186bb"],
+  ["ec86a1", "e18489e185a9e186bc"],
+  ["ec86a1", "ec868ce186bc"],
+  ["ec86a2", "e18489e185a9e186bd"],
+  ["ec86a2", "ec868ce186bd"],
+  ["ec86a3", "e18489e185a9e186be"],
+  ["ec86a3", "ec868ce186be"],
+  ["ec86a4", "e18489e185a9e186bf"],
+  ["ec86a4", "ec868ce186bf"],
+  ["ec86a5", "e18489e185a9e18780"],
+  ["ec86a5", "ec868ce18780"],
+  ["ec86a6", "e18489e185a9e18781"],
+  ["ec86a6", "ec868ce18781"],
+  ["ec86a7", "e18489e185a9e18782"],
+  ["ec86a7", "ec868ce18782"],
+  ["ec86a8", "e18489e185aa"],
+  ["ec86a9", "e18489e185aae186a8"],
+  ["ec86a9", "ec86a8e186a8"],
+  ["ec86aa", "e18489e185aae186a9"],
+  ["ec86aa", "ec86a8e186a9"],
+  ["ec86ab", "e18489e185aae186aa"],
+  ["ec86ab", "ec86a8e186aa"],
+  ["ec86ac", "e18489e185aae186ab"],
+  ["ec86ac", "ec86a8e186ab"],
+  ["ec86ad", "e18489e185aae186ac"],
+  ["ec86ad", "ec86a8e186ac"],
+  ["ec86ae", "e18489e185aae186ad"],
+  ["ec86ae", "ec86a8e186ad"],
+  ["ec86af", "e18489e185aae186ae"],
+  ["ec86af", "ec86a8e186ae"],
+  ["ec86b0", "e18489e185aae186af"],
+  ["ec86b0", "ec86a8e186af"],
+  ["ec86b1", "e18489e185aae186b0"],
+  ["ec86b1", "ec86a8e186b0"],
+  ["ec86b2", "e18489e185aae186b1"],
+  ["ec86b2", "ec86a8e186b1"],
+  ["ec86b3", "e18489e185aae186b2"],
+  ["ec86b3", "ec86a8e186b2"],
+  ["ec86b4", "e18489e185aae186b3"],
+  ["ec86b4", "ec86a8e186b3"],
+  ["ec86b5", "e18489e185aae186b4"],
+  ["ec86b5", "ec86a8e186b4"],
+  ["ec86b6", "e18489e185aae186b5"],
+  ["ec86b6", "ec86a8e186b5"],
+  ["ec86b7", "e18489e185aae186b6"],
+  ["ec86b7", "ec86a8e186b6"],
+  ["ec86b8", "e18489e185aae186b7"],
+  ["ec86b8", "ec86a8e186b7"],
+  ["ec86b9", "e18489e185aae186b8"],
+  ["ec86b9", "ec86a8e186b8"],
+  ["ec86ba", "e18489e185aae186b9"],
+  ["ec86ba", "ec86a8e186b9"],
+  ["ec86bb", "e18489e185aae186ba"],
+  ["ec86bb", "ec86a8e186ba"],
+  ["ec86bc", "e18489e185aae186bb"],
+  ["ec86bc", "ec86a8e186bb"],
+  ["ec86bd", "e18489e185aae186bc"],
+  ["ec86bd", "ec86a8e186bc"],
+  ["ec86be", "e18489e185aae186bd"],
+  ["ec86be", "ec86a8e186bd"],
+  ["ec86bf", "e18489e185aae186be"],
+  ["ec86bf", "ec86a8e186be"],
+  ["ec8780", "e18489e185aae186bf"],
+  ["ec8780", "ec86a8e186bf"],
+  ["ec8781", "e18489e185aae18780"],
+  ["ec8781", "ec86a8e18780"],
+  ["ec8782", "e18489e185aae18781"],
+  ["ec8782", "ec86a8e18781"],
+  ["ec8783", "e18489e185aae18782"],
+  ["ec8783", "ec86a8e18782"],
+  ["ec8784", "e18489e185ab"],
+  ["ec8785", "e18489e185abe186a8"],
+  ["ec8785", "ec8784e186a8"],
+  ["ec8786", "e18489e185abe186a9"],
+  ["ec8786", "ec8784e186a9"],
+  ["ec8787", "e18489e185abe186aa"],
+  ["ec8787", "ec8784e186aa"],
+  ["ec8788", "e18489e185abe186ab"],
+  ["ec8788", "ec8784e186ab"],
+  ["ec8789", "e18489e185abe186ac"],
+  ["ec8789", "ec8784e186ac"],
+  ["ec878a", "e18489e185abe186ad"],
+  ["ec878a", "ec8784e186ad"],
+  ["ec878b", "e18489e185abe186ae"],
+  ["ec878b", "ec8784e186ae"],
+  ["ec878c", "e18489e185abe186af"],
+  ["ec878c", "ec8784e186af"],
+  ["ec878d", "e18489e185abe186b0"],
+  ["ec878d", "ec8784e186b0"],
+  ["ec878e", "e18489e185abe186b1"],
+  ["ec878e", "ec8784e186b1"],
+  ["ec878f", "e18489e185abe186b2"],
+  ["ec878f", "ec8784e186b2"],
+  ["ec8790", "e18489e185abe186b3"],
+  ["ec8790", "ec8784e186b3"],
+  ["ec8791", "e18489e185abe186b4"],
+  ["ec8791", "ec8784e186b4"],
+  ["ec8792", "e18489e185abe186b5"],
+  ["ec8792", "ec8784e186b5"],
+  ["ec8793", "e18489e185abe186b6"],
+  ["ec8793", "ec8784e186b6"],
+  ["ec8794", "e18489e185abe186b7"],
+  ["ec8794", "ec8784e186b7"],
+  ["ec8795", "e18489e185abe186b8"],
+  ["ec8795", "ec8784e186b8"],
+  ["ec8796", "e18489e185abe186b9"],
+  ["ec8796", "ec8784e186b9"],
+  ["ec8797", "e18489e185abe186ba"],
+  ["ec8797", "ec8784e186ba"],
+  ["ec8798", "e18489e185abe186bb"],
+  ["ec8798", "ec8784e186bb"],
+  ["ec8799", "e18489e185abe186bc"],
+  ["ec8799", "ec8784e186bc"],
+  ["ec879a", "e18489e185abe186bd"],
+  ["ec879a", "ec8784e186bd"],
+  ["ec879b", "e18489e185abe186be"],
+  ["ec879b", "ec8784e186be"],
+  ["ec879c", "e18489e185abe186bf"],
+  ["ec879c", "ec8784e186bf"],
+  ["ec879d", "e18489e185abe18780"],
+  ["ec879d", "ec8784e18780"],
+  ["ec879e", "e18489e185abe18781"],
+  ["ec879e", "ec8784e18781"],
+  ["ec879f", "e18489e185abe18782"],
+  ["ec879f", "ec8784e18782"],
+  ["ec87a0", "e18489e185ac"],
+  ["ec87a1", "e18489e185ace186a8"],
+  ["ec87a1", "ec87a0e186a8"],
+  ["ec87a2", "e18489e185ace186a9"],
+  ["ec87a2", "ec87a0e186a9"],
+  ["ec87a3", "e18489e185ace186aa"],
+  ["ec87a3", "ec87a0e186aa"],
+  ["ec87a4", "e18489e185ace186ab"],
+  ["ec87a4", "ec87a0e186ab"],
+  ["ec87a5", "e18489e185ace186ac"],
+  ["ec87a5", "ec87a0e186ac"],
+  ["ec87a6", "e18489e185ace186ad"],
+  ["ec87a6", "ec87a0e186ad"],
+  ["ec87a7", "e18489e185ace186ae"],
+  ["ec87a7", "ec87a0e186ae"],
+  ["ec87a8", "e18489e185ace186af"],
+  ["ec87a8", "ec87a0e186af"],
+  ["ec87a9", "e18489e185ace186b0"],
+  ["ec87a9", "ec87a0e186b0"],
+  ["ec87aa", "e18489e185ace186b1"],
+  ["ec87aa", "ec87a0e186b1"],
+  ["ec87ab", "e18489e185ace186b2"],
+  ["ec87ab", "ec87a0e186b2"],
+  ["ec87ac", "e18489e185ace186b3"],
+  ["ec87ac", "ec87a0e186b3"],
+  ["ec87ad", "e18489e185ace186b4"],
+  ["ec87ad", "ec87a0e186b4"],
+  ["ec87ae", "e18489e185ace186b5"],
+  ["ec87ae", "ec87a0e186b5"],
+  ["ec87af", "e18489e185ace186b6"],
+  ["ec87af", "ec87a0e186b6"],
+  ["ec87b0", "e18489e185ace186b7"],
+  ["ec87b0", "ec87a0e186b7"],
+  ["ec87b1", "e18489e185ace186b8"],
+  ["ec87b1", "ec87a0e186b8"],
+  ["ec87b2", "e18489e185ace186b9"],
+  ["ec87b2", "ec87a0e186b9"],
+  ["ec87b3", "e18489e185ace186ba"],
+  ["ec87b3", "ec87a0e186ba"],
+  ["ec87b4", "e18489e185ace186bb"],
+  ["ec87b4", "ec87a0e186bb"],
+  ["ec87b5", "e18489e185ace186bc"],
+  ["ec87b5", "ec87a0e186bc"],
+  ["ec87b6", "e18489e185ace186bd"],
+  ["ec87b6", "ec87a0e186bd"],
+  ["ec87b7", "e18489e185ace186be"],
+  ["ec87b7", "ec87a0e186be"],
+  ["ec87b8", "e18489e185ace186bf"],
+  ["ec87b8", "ec87a0e186bf"],
+  ["ec87b9", "e18489e185ace18780"],
+  ["ec87b9", "ec87a0e18780"],
+  ["ec87ba", "e18489e185ace18781"],
+  ["ec87ba", "ec87a0e18781"],
+  ["ec87bb", "e18489e185ace18782"],
+  ["ec87bb", "ec87a0e18782"],
+  ["ec87bc", "e18489e185ad"],
+  ["ec87bd", "e18489e185ade186a8"],
+  ["ec87bd", "ec87bce186a8"],
+  ["ec87be", "e18489e185ade186a9"],
+  ["ec87be", "ec87bce186a9"],
+  ["ec87bf", "e18489e185ade186aa"],
+  ["ec87bf", "ec87bce186aa"],
+  ["ec8880", "e18489e185ade186ab"],
+  ["ec8880", "ec87bce186ab"],
+  ["ec8881", "e18489e185ade186ac"],
+  ["ec8881", "ec87bce186ac"],
+  ["ec8882", "e18489e185ade186ad"],
+  ["ec8882", "ec87bce186ad"],
+  ["ec8883", "e18489e185ade186ae"],
+  ["ec8883", "ec87bce186ae"],
+  ["ec8884", "e18489e185ade186af"],
+  ["ec8884", "ec87bce186af"],
+  ["ec8885", "e18489e185ade186b0"],
+  ["ec8885", "ec87bce186b0"],
+  ["ec8886", "e18489e185ade186b1"],
+  ["ec8886", "ec87bce186b1"],
+  ["ec8887", "e18489e185ade186b2"],
+  ["ec8887", "ec87bce186b2"],
+  ["ec8888", "e18489e185ade186b3"],
+  ["ec8888", "ec87bce186b3"],
+  ["ec8889", "e18489e185ade186b4"],
+  ["ec8889", "ec87bce186b4"],
+  ["ec888a", "e18489e185ade186b5"],
+  ["ec888a", "ec87bce186b5"],
+  ["ec888b", "e18489e185ade186b6"],
+  ["ec888b", "ec87bce186b6"],
+  ["ec888c", "e18489e185ade186b7"],
+  ["ec888c", "ec87bce186b7"],
+  ["ec888d", "e18489e185ade186b8"],
+  ["ec888d", "ec87bce186b8"],
+  ["ec888e", "e18489e185ade186b9"],
+  ["ec888e", "ec87bce186b9"],
+  ["ec888f", "e18489e185ade186ba"],
+  ["ec888f", "ec87bce186ba"],
+  ["ec8890", "e18489e185ade186bb"],
+  ["ec8890", "ec87bce186bb"],
+  ["ec8891", "e18489e185ade186bc"],
+  ["ec8891", "ec87bce186bc"],
+  ["ec8892", "e18489e185ade186bd"],
+  ["ec8892", "ec87bce186bd"],
+  ["ec8893", "e18489e185ade186be"],
+  ["ec8893", "ec87bce186be"],
+  ["ec8894", "e18489e185ade186bf"],
+  ["ec8894", "ec87bce186bf"],
+  ["ec8895", "e18489e185ade18780"],
+  ["ec8895", "ec87bce18780"],
+  ["ec8896", "e18489e185ade18781"],
+  ["ec8896", "ec87bce18781"],
+  ["ec8897", "e18489e185ade18782"],
+  ["ec8897", "ec87bce18782"],
+  ["ec8898", "e18489e185ae"],
+  ["ec8899", "e18489e185aee186a8"],
+  ["ec8899", "ec8898e186a8"],
+  ["ec889a", "e18489e185aee186a9"],
+  ["ec889a", "ec8898e186a9"],
+  ["ec889b", "e18489e185aee186aa"],
+  ["ec889b", "ec8898e186aa"],
+  ["ec889c", "e18489e185aee186ab"],
+  ["ec889c", "ec8898e186ab"],
+  ["ec889d", "e18489e185aee186ac"],
+  ["ec889d", "ec8898e186ac"],
+  ["ec889e", "e18489e185aee186ad"],
+  ["ec889e", "ec8898e186ad"],
+  ["ec889f", "e18489e185aee186ae"],
+  ["ec889f", "ec8898e186ae"],
+  ["ec88a0", "e18489e185aee186af"],
+  ["ec88a0", "ec8898e186af"],
+  ["ec88a1", "e18489e185aee186b0"],
+  ["ec88a1", "ec8898e186b0"],
+  ["ec88a2", "e18489e185aee186b1"],
+  ["ec88a2", "ec8898e186b1"],
+  ["ec88a3", "e18489e185aee186b2"],
+  ["ec88a3", "ec8898e186b2"],
+  ["ec88a4", "e18489e185aee186b3"],
+  ["ec88a4", "ec8898e186b3"],
+  ["ec88a5", "e18489e185aee186b4"],
+  ["ec88a5", "ec8898e186b4"],
+  ["ec88a6", "e18489e185aee186b5"],
+  ["ec88a6", "ec8898e186b5"],
+  ["ec88a7", "e18489e185aee186b6"],
+  ["ec88a7", "ec8898e186b6"],
+  ["ec88a8", "e18489e185aee186b7"],
+  ["ec88a8", "ec8898e186b7"],
+  ["ec88a9", "e18489e185aee186b8"],
+  ["ec88a9", "ec8898e186b8"],
+  ["ec88aa", "e18489e185aee186b9"],
+  ["ec88aa", "ec8898e186b9"],
+  ["ec88ab", "e18489e185aee186ba"],
+  ["ec88ab", "ec8898e186ba"],
+  ["ec88ac", "e18489e185aee186bb"],
+  ["ec88ac", "ec8898e186bb"],
+  ["ec88ad", "e18489e185aee186bc"],
+  ["ec88ad", "ec8898e186bc"],
+  ["ec88ae", "e18489e185aee186bd"],
+  ["ec88ae", "ec8898e186bd"],
+  ["ec88af", "e18489e185aee186be"],
+  ["ec88af", "ec8898e186be"],
+  ["ec88b0", "e18489e185aee186bf"],
+  ["ec88b0", "ec8898e186bf"],
+  ["ec88b1", "e18489e185aee18780"],
+  ["ec88b1", "ec8898e18780"],
+  ["ec88b2", "e18489e185aee18781"],
+  ["ec88b2", "ec8898e18781"],
+  ["ec88b3", "e18489e185aee18782"],
+  ["ec88b3", "ec8898e18782"],
+  ["ec88b4", "e18489e185af"],
+  ["ec88b5", "e18489e185afe186a8"],
+  ["ec88b5", "ec88b4e186a8"],
+  ["ec88b6", "e18489e185afe186a9"],
+  ["ec88b6", "ec88b4e186a9"],
+  ["ec88b7", "e18489e185afe186aa"],
+  ["ec88b7", "ec88b4e186aa"],
+  ["ec88b8", "e18489e185afe186ab"],
+  ["ec88b8", "ec88b4e186ab"],
+  ["ec88b9", "e18489e185afe186ac"],
+  ["ec88b9", "ec88b4e186ac"],
+  ["ec88ba", "e18489e185afe186ad"],
+  ["ec88ba", "ec88b4e186ad"],
+  ["ec88bb", "e18489e185afe186ae"],
+  ["ec88bb", "ec88b4e186ae"],
+  ["ec88bc", "e18489e185afe186af"],
+  ["ec88bc", "ec88b4e186af"],
+  ["ec88bd", "e18489e185afe186b0"],
+  ["ec88bd", "ec88b4e186b0"],
+  ["ec88be", "e18489e185afe186b1"],
+  ["ec88be", "ec88b4e186b1"],
+  ["ec88bf", "e18489e185afe186b2"],
+  ["ec88bf", "ec88b4e186b2"],
+  ["ec8980", "e18489e185afe186b3"],
+  ["ec8980", "ec88b4e186b3"],
+  ["ec8981", "e18489e185afe186b4"],
+  ["ec8981", "ec88b4e186b4"],
+  ["ec8982", "e18489e185afe186b5"],
+  ["ec8982", "ec88b4e186b5"],
+  ["ec8983", "e18489e185afe186b6"],
+  ["ec8983", "ec88b4e186b6"],
+  ["ec8984", "e18489e185afe186b7"],
+  ["ec8984", "ec88b4e186b7"],
+  ["ec8985", "e18489e185afe186b8"],
+  ["ec8985", "ec88b4e186b8"],
+  ["ec8986", "e18489e185afe186b9"],
+  ["ec8986", "ec88b4e186b9"],
+  ["ec8987", "e18489e185afe186ba"],
+  ["ec8987", "ec88b4e186ba"],
+  ["ec8988", "e18489e185afe186bb"],
+  ["ec8988", "ec88b4e186bb"],
+  ["ec8989", "e18489e185afe186bc"],
+  ["ec8989", "ec88b4e186bc"],
+  ["ec898a", "e18489e185afe186bd"],
+  ["ec898a", "ec88b4e186bd"],
+  ["ec898b", "e18489e185afe186be"],
+  ["ec898b", "ec88b4e186be"],
+  ["ec898c", "e18489e185afe186bf"],
+  ["ec898c", "ec88b4e186bf"],
+  ["ec898d", "e18489e185afe18780"],
+  ["ec898d", "ec88b4e18780"],
+  ["ec898e", "e18489e185afe18781"],
+  ["ec898e", "ec88b4e18781"],
+  ["ec898f", "e18489e185afe18782"],
+  ["ec898f", "ec88b4e18782"],
+  ["ec8990", "e18489e185b0"],
+  ["ec8991", "e18489e185b0e186a8"],
+  ["ec8991", "ec8990e186a8"],
+  ["ec8992", "e18489e185b0e186a9"],
+  ["ec8992", "ec8990e186a9"],
+  ["ec8993", "e18489e185b0e186aa"],
+  ["ec8993", "ec8990e186aa"],
+  ["ec8994", "e18489e185b0e186ab"],
+  ["ec8994", "ec8990e186ab"],
+  ["ec8995", "e18489e185b0e186ac"],
+  ["ec8995", "ec8990e186ac"],
+  ["ec8996", "e18489e185b0e186ad"],
+  ["ec8996", "ec8990e186ad"],
+  ["ec8997", "e18489e185b0e186ae"],
+  ["ec8997", "ec8990e186ae"],
+  ["ec8998", "e18489e185b0e186af"],
+  ["ec8998", "ec8990e186af"],
+  ["ec8999", "e18489e185b0e186b0"],
+  ["ec8999", "ec8990e186b0"],
+  ["ec899a", "e18489e185b0e186b1"],
+  ["ec899a", "ec8990e186b1"],
+  ["ec899b", "e18489e185b0e186b2"],
+  ["ec899b", "ec8990e186b2"],
+  ["ec899c", "e18489e185b0e186b3"],
+  ["ec899c", "ec8990e186b3"],
+  ["ec899d", "e18489e185b0e186b4"],
+  ["ec899d", "ec8990e186b4"],
+  ["ec899e", "e18489e185b0e186b5"],
+  ["ec899e", "ec8990e186b5"],
+  ["ec899f", "e18489e185b0e186b6"],
+  ["ec899f", "ec8990e186b6"],
+  ["ec89a0", "e18489e185b0e186b7"],
+  ["ec89a0", "ec8990e186b7"],
+  ["ec89a1", "e18489e185b0e186b8"],
+  ["ec89a1", "ec8990e186b8"],
+  ["ec89a2", "e18489e185b0e186b9"],
+  ["ec89a2", "ec8990e186b9"],
+  ["ec89a3", "e18489e185b0e186ba"],
+  ["ec89a3", "ec8990e186ba"],
+  ["ec89a4", "e18489e185b0e186bb"],
+  ["ec89a4", "ec8990e186bb"],
+  ["ec89a5", "e18489e185b0e186bc"],
+  ["ec89a5", "ec8990e186bc"],
+  ["ec89a6", "e18489e185b0e186bd"],
+  ["ec89a6", "ec8990e186bd"],
+  ["ec89a7", "e18489e185b0e186be"],
+  ["ec89a7", "ec8990e186be"],
+  ["ec89a8", "e18489e185b0e186bf"],
+  ["ec89a8", "ec8990e186bf"],
+  ["ec89a9", "e18489e185b0e18780"],
+  ["ec89a9", "ec8990e18780"],
+  ["ec89aa", "e18489e185b0e18781"],
+  ["ec89aa", "ec8990e18781"],
+  ["ec89ab", "e18489e185b0e18782"],
+  ["ec89ab", "ec8990e18782"],
+  ["ec89ac", "e18489e185b1"],
+  ["ec89ad", "e18489e185b1e186a8"],
+  ["ec89ad", "ec89ace186a8"],
+  ["ec89ae", "e18489e185b1e186a9"],
+  ["ec89ae", "ec89ace186a9"],
+  ["ec89af", "e18489e185b1e186aa"],
+  ["ec89af", "ec89ace186aa"],
+  ["ec89b0", "e18489e185b1e186ab"],
+  ["ec89b0", "ec89ace186ab"],
+  ["ec89b1", "e18489e185b1e186ac"],
+  ["ec89b1", "ec89ace186ac"],
+  ["ec89b2", "e18489e185b1e186ad"],
+  ["ec89b2", "ec89ace186ad"],
+  ["ec89b3", "e18489e185b1e186ae"],
+  ["ec89b3", "ec89ace186ae"],
+  ["ec89b4", "e18489e185b1e186af"],
+  ["ec89b4", "ec89ace186af"],
+  ["ec89b5", "e18489e185b1e186b0"],
+  ["ec89b5", "ec89ace186b0"],
+  ["ec89b6", "e18489e185b1e186b1"],
+  ["ec89b6", "ec89ace186b1"],
+  ["ec89b7", "e18489e185b1e186b2"],
+  ["ec89b7", "ec89ace186b2"],
+  ["ec89b8", "e18489e185b1e186b3"],
+  ["ec89b8", "ec89ace186b3"],
+  ["ec89b9", "e18489e185b1e186b4"],
+  ["ec89b9", "ec89ace186b4"],
+  ["ec89ba", "e18489e185b1e186b5"],
+  ["ec89ba", "ec89ace186b5"],
+  ["ec89bb", "e18489e185b1e186b6"],
+  ["ec89bb", "ec89ace186b6"],
+  ["ec89bc", "e18489e185b1e186b7"],
+  ["ec89bc", "ec89ace186b7"],
+  ["ec89bd", "e18489e185b1e186b8"],
+  ["ec89bd", "ec89ace186b8"],
+  ["ec89be", "e18489e185b1e186b9"],
+  ["ec89be", "ec89ace186b9"],
+  ["ec89bf", "e18489e185b1e186ba"],
+  ["ec89bf", "ec89ace186ba"],
+  ["ec8a80", "e18489e185b1e186bb"],
+  ["ec8a80", "ec89ace186bb"],
+  ["ec8a81", "e18489e185b1e186bc"],
+  ["ec8a81", "ec89ace186bc"],
+  ["ec8a82", "e18489e185b1e186bd"],
+  ["ec8a82", "ec89ace186bd"],
+  ["ec8a83", "e18489e185b1e186be"],
+  ["ec8a83", "ec89ace186be"],
+  ["ec8a84", "e18489e185b1e186bf"],
+  ["ec8a84", "ec89ace186bf"],
+  ["ec8a85", "e18489e185b1e18780"],
+  ["ec8a85", "ec89ace18780"],
+  ["ec8a86", "e18489e185b1e18781"],
+  ["ec8a86", "ec89ace18781"],
+  ["ec8a87", "e18489e185b1e18782"],
+  ["ec8a87", "ec89ace18782"],
+  ["ec8a88", "e18489e185b2"],
+  ["ec8a89", "e18489e185b2e186a8"],
+  ["ec8a89", "ec8a88e186a8"],
+  ["ec8a8a", "e18489e185b2e186a9"],
+  ["ec8a8a", "ec8a88e186a9"],
+  ["ec8a8b", "e18489e185b2e186aa"],
+  ["ec8a8b", "ec8a88e186aa"],
+  ["ec8a8c", "e18489e185b2e186ab"],
+  ["ec8a8c", "ec8a88e186ab"],
+  ["ec8a8d", "e18489e185b2e186ac"],
+  ["ec8a8d", "ec8a88e186ac"],
+  ["ec8a8e", "e18489e185b2e186ad"],
+  ["ec8a8e", "ec8a88e186ad"],
+  ["ec8a8f", "e18489e185b2e186ae"],
+  ["ec8a8f", "ec8a88e186ae"],
+  ["ec8a90", "e18489e185b2e186af"],
+  ["ec8a90", "ec8a88e186af"],
+  ["ec8a91", "e18489e185b2e186b0"],
+  ["ec8a91", "ec8a88e186b0"],
+  ["ec8a92", "e18489e185b2e186b1"],
+  ["ec8a92", "ec8a88e186b1"],
+  ["ec8a93", "e18489e185b2e186b2"],
+  ["ec8a93", "ec8a88e186b2"],
+  ["ec8a94", "e18489e185b2e186b3"],
+  ["ec8a94", "ec8a88e186b3"],
+  ["ec8a95", "e18489e185b2e186b4"],
+  ["ec8a95", "ec8a88e186b4"],
+  ["ec8a96", "e18489e185b2e186b5"],
+  ["ec8a96", "ec8a88e186b5"],
+  ["ec8a97", "e18489e185b2e186b6"],
+  ["ec8a97", "ec8a88e186b6"],
+  ["ec8a98", "e18489e185b2e186b7"],
+  ["ec8a98", "ec8a88e186b7"],
+  ["ec8a99", "e18489e185b2e186b8"],
+  ["ec8a99", "ec8a88e186b8"],
+  ["ec8a9a", "e18489e185b2e186b9"],
+  ["ec8a9a", "ec8a88e186b9"],
+  ["ec8a9b", "e18489e185b2e186ba"],
+  ["ec8a9b", "ec8a88e186ba"],
+  ["ec8a9c", "e18489e185b2e186bb"],
+  ["ec8a9c", "ec8a88e186bb"],
+  ["ec8a9d", "e18489e185b2e186bc"],
+  ["ec8a9d", "ec8a88e186bc"],
+  ["ec8a9e", "e18489e185b2e186bd"],
+  ["ec8a9e", "ec8a88e186bd"],
+  ["ec8a9f", "e18489e185b2e186be"],
+  ["ec8a9f", "ec8a88e186be"],
+  ["ec8aa0", "e18489e185b2e186bf"],
+  ["ec8aa0", "ec8a88e186bf"],
+  ["ec8aa1", "e18489e185b2e18780"],
+  ["ec8aa1", "ec8a88e18780"],
+  ["ec8aa2", "e18489e185b2e18781"],
+  ["ec8aa2", "ec8a88e18781"],
+  ["ec8aa3", "e18489e185b2e18782"],
+  ["ec8aa3", "ec8a88e18782"],
+  ["ec8aa4", "e18489e185b3"],
+  ["ec8aa5", "e18489e185b3e186a8"],
+  ["ec8aa5", "ec8aa4e186a8"],
+  ["ec8aa6", "e18489e185b3e186a9"],
+  ["ec8aa6", "ec8aa4e186a9"],
+  ["ec8aa7", "e18489e185b3e186aa"],
+  ["ec8aa7", "ec8aa4e186aa"],
+  ["ec8aa8", "e18489e185b3e186ab"],
+  ["ec8aa8", "ec8aa4e186ab"],
+  ["ec8aa9", "e18489e185b3e186ac"],
+  ["ec8aa9", "ec8aa4e186ac"],
+  ["ec8aaa", "e18489e185b3e186ad"],
+  ["ec8aaa", "ec8aa4e186ad"],
+  ["ec8aab", "e18489e185b3e186ae"],
+  ["ec8aab", "ec8aa4e186ae"],
+  ["ec8aac", "e18489e185b3e186af"],
+  ["ec8aac", "ec8aa4e186af"],
+  ["ec8aad", "e18489e185b3e186b0"],
+  ["ec8aad", "ec8aa4e186b0"],
+  ["ec8aae", "e18489e185b3e186b1"],
+  ["ec8aae", "ec8aa4e186b1"],
+  ["ec8aaf", "e18489e185b3e186b2"],
+  ["ec8aaf", "ec8aa4e186b2"],
+  ["ec8ab0", "e18489e185b3e186b3"],
+  ["ec8ab0", "ec8aa4e186b3"],
+  ["ec8ab1", "e18489e185b3e186b4"],
+  ["ec8ab1", "ec8aa4e186b4"],
+  ["ec8ab2", "e18489e185b3e186b5"],
+  ["ec8ab2", "ec8aa4e186b5"],
+  ["ec8ab3", "e18489e185b3e186b6"],
+  ["ec8ab3", "ec8aa4e186b6"],
+  ["ec8ab4", "e18489e185b3e186b7"],
+  ["ec8ab4", "ec8aa4e186b7"],
+  ["ec8ab5", "e18489e185b3e186b8"],
+  ["ec8ab5", "ec8aa4e186b8"],
+  ["ec8ab6", "e18489e185b3e186b9"],
+  ["ec8ab6", "ec8aa4e186b9"],
+  ["ec8ab7", "e18489e185b3e186ba"],
+  ["ec8ab7", "ec8aa4e186ba"],
+  ["ec8ab8", "e18489e185b3e186bb"],
+  ["ec8ab8", "ec8aa4e186bb"],
+  ["ec8ab9", "e18489e185b3e186bc"],
+  ["ec8ab9", "ec8aa4e186bc"],
+  ["ec8aba", "e18489e185b3e186bd"],
+  ["ec8aba", "ec8aa4e186bd"],
+  ["ec8abb", "e18489e185b3e186be"],
+  ["ec8abb", "ec8aa4e186be"],
+  ["ec8abc", "e18489e185b3e186bf"],
+  ["ec8abc", "ec8aa4e186bf"],
+  ["ec8abd", "e18489e185b3e18780"],
+  ["ec8abd", "ec8aa4e18780"],
+  ["ec8abe", "e18489e185b3e18781"],
+  ["ec8abe", "ec8aa4e18781"],
+  ["ec8abf", "e18489e185b3e18782"],
+  ["ec8abf", "ec8aa4e18782"],
+  ["ec8b80", "e18489e185b4"],
+  ["ec8b81", "e18489e185b4e186a8"],
+  ["ec8b81", "ec8b80e186a8"],
+  ["ec8b82", "e18489e185b4e186a9"],
+  ["ec8b82", "ec8b80e186a9"],
+  ["ec8b83", "e18489e185b4e186aa"],
+  ["ec8b83", "ec8b80e186aa"],
+  ["ec8b84", "e18489e185b4e186ab"],
+  ["ec8b84", "ec8b80e186ab"],
+  ["ec8b85", "e18489e185b4e186ac"],
+  ["ec8b85", "ec8b80e186ac"],
+  ["ec8b86", "e18489e185b4e186ad"],
+  ["ec8b86", "ec8b80e186ad"],
+  ["ec8b87", "e18489e185b4e186ae"],
+  ["ec8b87", "ec8b80e186ae"],
+  ["ec8b88", "e18489e185b4e186af"],
+  ["ec8b88", "ec8b80e186af"],
+  ["ec8b89", "e18489e185b4e186b0"],
+  ["ec8b89", "ec8b80e186b0"],
+  ["ec8b8a", "e18489e185b4e186b1"],
+  ["ec8b8a", "ec8b80e186b1"],
+  ["ec8b8b", "e18489e185b4e186b2"],
+  ["ec8b8b", "ec8b80e186b2"],
+  ["ec8b8c", "e18489e185b4e186b3"],
+  ["ec8b8c", "ec8b80e186b3"],
+  ["ec8b8d", "e18489e185b4e186b4"],
+  ["ec8b8d", "ec8b80e186b4"],
+  ["ec8b8e", "e18489e185b4e186b5"],
+  ["ec8b8e", "ec8b80e186b5"],
+  ["ec8b8f", "e18489e185b4e186b6"],
+  ["ec8b8f", "ec8b80e186b6"],
+  ["ec8b90", "e18489e185b4e186b7"],
+  ["ec8b90", "ec8b80e186b7"],
+  ["ec8b91", "e18489e185b4e186b8"],
+  ["ec8b91", "ec8b80e186b8"],
+  ["ec8b92", "e18489e185b4e186b9"],
+  ["ec8b92", "ec8b80e186b9"],
+  ["ec8b93", "e18489e185b4e186ba"],
+  ["ec8b93", "ec8b80e186ba"],
+  ["ec8b94", "e18489e185b4e186bb"],
+  ["ec8b94", "ec8b80e186bb"],
+  ["ec8b95", "e18489e185b4e186bc"],
+  ["ec8b95", "ec8b80e186bc"],
+  ["ec8b96", "e18489e185b4e186bd"],
+  ["ec8b96", "ec8b80e186bd"],
+  ["ec8b97", "e18489e185b4e186be"],
+  ["ec8b97", "ec8b80e186be"],
+  ["ec8b98", "e18489e185b4e186bf"],
+  ["ec8b98", "ec8b80e186bf"],
+  ["ec8b99", "e18489e185b4e18780"],
+  ["ec8b99", "ec8b80e18780"],
+  ["ec8b9a", "e18489e185b4e18781"],
+  ["ec8b9a", "ec8b80e18781"],
+  ["ec8b9b", "e18489e185b4e18782"],
+  ["ec8b9b", "ec8b80e18782"],
+  ["ec8b9c", "e18489e185b5"],
+  ["ec8b9d", "e18489e185b5e186a8"],
+  ["ec8b9d", "ec8b9ce186a8"],
+  ["ec8b9e", "e18489e185b5e186a9"],
+  ["ec8b9e", "ec8b9ce186a9"],
+  ["ec8b9f", "e18489e185b5e186aa"],
+  ["ec8b9f", "ec8b9ce186aa"],
+  ["ec8ba0", "e18489e185b5e186ab"],
+  ["ec8ba0", "ec8b9ce186ab"],
+  ["ec8ba1", "e18489e185b5e186ac"],
+  ["ec8ba1", "ec8b9ce186ac"],
+  ["ec8ba2", "e18489e185b5e186ad"],
+  ["ec8ba2", "ec8b9ce186ad"],
+  ["ec8ba3", "e18489e185b5e186ae"],
+  ["ec8ba3", "ec8b9ce186ae"],
+  ["ec8ba4", "e18489e185b5e186af"],
+  ["ec8ba4", "ec8b9ce186af"],
+  ["ec8ba5", "e18489e185b5e186b0"],
+  ["ec8ba5", "ec8b9ce186b0"],
+  ["ec8ba6", "e18489e185b5e186b1"],
+  ["ec8ba6", "ec8b9ce186b1"],
+  ["ec8ba7", "e18489e185b5e186b2"],
+  ["ec8ba7", "ec8b9ce186b2"],
+  ["ec8ba8", "e18489e185b5e186b3"],
+  ["ec8ba8", "ec8b9ce186b3"],
+  ["ec8ba9", "e18489e185b5e186b4"],
+  ["ec8ba9", "ec8b9ce186b4"],
+  ["ec8baa", "e18489e185b5e186b5"],
+  ["ec8baa", "ec8b9ce186b5"],
+  ["ec8bab", "e18489e185b5e186b6"],
+  ["ec8bab", "ec8b9ce186b6"],
+  ["ec8bac", "e18489e185b5e186b7"],
+  ["ec8bac", "ec8b9ce186b7"],
+  ["ec8bad", "e18489e185b5e186b8"],
+  ["ec8bad", "ec8b9ce186b8"],
+  ["ec8bae", "e18489e185b5e186b9"],
+  ["ec8bae", "ec8b9ce186b9"],
+  ["ec8baf", "e18489e185b5e186ba"],
+  ["ec8baf", "ec8b9ce186ba"],
+  ["ec8bb0", "e18489e185b5e186bb"],
+  ["ec8bb0", "ec8b9ce186bb"],
+  ["ec8bb1", "e18489e185b5e186bc"],
+  ["ec8bb1", "ec8b9ce186bc"],
+  ["ec8bb2", "e18489e185b5e186bd"],
+  ["ec8bb2", "ec8b9ce186bd"],
+  ["ec8bb3", "e18489e185b5e186be"],
+  ["ec8bb3", "ec8b9ce186be"],
+  ["ec8bb4", "e18489e185b5e186bf"],
+  ["ec8bb4", "ec8b9ce186bf"],
+  ["ec8bb5", "e18489e185b5e18780"],
+  ["ec8bb5", "ec8b9ce18780"],
+  ["ec8bb6", "e18489e185b5e18781"],
+  ["ec8bb6", "ec8b9ce18781"],
+  ["ec8bb7", "e18489e185b5e18782"],
+  ["ec8bb7", "ec8b9ce18782"],
+  ["ec8bb8", "e1848ae185a1"],
+  ["ec8bb9", "e1848ae185a1e186a8"],
+  ["ec8bb9", "ec8bb8e186a8"],
+  ["ec8bba", "e1848ae185a1e186a9"],
+  ["ec8bba", "ec8bb8e186a9"],
+  ["ec8bbb", "e1848ae185a1e186aa"],
+  ["ec8bbb", "ec8bb8e186aa"],
+  ["ec8bbc", "e1848ae185a1e186ab"],
+  ["ec8bbc", "ec8bb8e186ab"],
+  ["ec8bbd", "e1848ae185a1e186ac"],
+  ["ec8bbd", "ec8bb8e186ac"],
+  ["ec8bbe", "e1848ae185a1e186ad"],
+  ["ec8bbe", "ec8bb8e186ad"],
+  ["ec8bbf", "e1848ae185a1e186ae"],
+  ["ec8bbf", "ec8bb8e186ae"],
+  ["ec8c80", "e1848ae185a1e186af"],
+  ["ec8c80", "ec8bb8e186af"],
+  ["ec8c81", "e1848ae185a1e186b0"],
+  ["ec8c81", "ec8bb8e186b0"],
+  ["ec8c82", "e1848ae185a1e186b1"],
+  ["ec8c82", "ec8bb8e186b1"],
+  ["ec8c83", "e1848ae185a1e186b2"],
+  ["ec8c83", "ec8bb8e186b2"],
+  ["ec8c84", "e1848ae185a1e186b3"],
+  ["ec8c84", "ec8bb8e186b3"],
+  ["ec8c85", "e1848ae185a1e186b4"],
+  ["ec8c85", "ec8bb8e186b4"],
+  ["ec8c86", "e1848ae185a1e186b5"],
+  ["ec8c86", "ec8bb8e186b5"],
+  ["ec8c87", "e1848ae185a1e186b6"],
+  ["ec8c87", "ec8bb8e186b6"],
+  ["ec8c88", "e1848ae185a1e186b7"],
+  ["ec8c88", "ec8bb8e186b7"],
+  ["ec8c89", "e1848ae185a1e186b8"],
+  ["ec8c89", "ec8bb8e186b8"],
+  ["ec8c8a", "e1848ae185a1e186b9"],
+  ["ec8c8a", "ec8bb8e186b9"],
+  ["ec8c8b", "e1848ae185a1e186ba"],
+  ["ec8c8b", "ec8bb8e186ba"],
+  ["ec8c8c", "e1848ae185a1e186bb"],
+  ["ec8c8c", "ec8bb8e186bb"],
+  ["ec8c8d", "e1848ae185a1e186bc"],
+  ["ec8c8d", "ec8bb8e186bc"],
+  ["ec8c8e", "e1848ae185a1e186bd"],
+  ["ec8c8e", "ec8bb8e186bd"],
+  ["ec8c8f", "e1848ae185a1e186be"],
+  ["ec8c8f", "ec8bb8e186be"],
+  ["ec8c90", "e1848ae185a1e186bf"],
+  ["ec8c90", "ec8bb8e186bf"],
+  ["ec8c91", "e1848ae185a1e18780"],
+  ["ec8c91", "ec8bb8e18780"],
+  ["ec8c92", "e1848ae185a1e18781"],
+  ["ec8c92", "ec8bb8e18781"],
+  ["ec8c93", "e1848ae185a1e18782"],
+  ["ec8c93", "ec8bb8e18782"],
+  ["ec8c94", "e1848ae185a2"],
+  ["ec8c95", "e1848ae185a2e186a8"],
+  ["ec8c95", "ec8c94e186a8"],
+  ["ec8c96", "e1848ae185a2e186a9"],
+  ["ec8c96", "ec8c94e186a9"],
+  ["ec8c97", "e1848ae185a2e186aa"],
+  ["ec8c97", "ec8c94e186aa"],
+  ["ec8c98", "e1848ae185a2e186ab"],
+  ["ec8c98", "ec8c94e186ab"],
+  ["ec8c99", "e1848ae185a2e186ac"],
+  ["ec8c99", "ec8c94e186ac"],
+  ["ec8c9a", "e1848ae185a2e186ad"],
+  ["ec8c9a", "ec8c94e186ad"],
+  ["ec8c9b", "e1848ae185a2e186ae"],
+  ["ec8c9b", "ec8c94e186ae"],
+  ["ec8c9c", "e1848ae185a2e186af"],
+  ["ec8c9c", "ec8c94e186af"],
+  ["ec8c9d", "e1848ae185a2e186b0"],
+  ["ec8c9d", "ec8c94e186b0"],
+  ["ec8c9e", "e1848ae185a2e186b1"],
+  ["ec8c9e", "ec8c94e186b1"],
+  ["ec8c9f", "e1848ae185a2e186b2"],
+  ["ec8c9f", "ec8c94e186b2"],
+  ["ec8ca0", "e1848ae185a2e186b3"],
+  ["ec8ca0", "ec8c94e186b3"],
+  ["ec8ca1", "e1848ae185a2e186b4"],
+  ["ec8ca1", "ec8c94e186b4"],
+  ["ec8ca2", "e1848ae185a2e186b5"],
+  ["ec8ca2", "ec8c94e186b5"],
+  ["ec8ca3", "e1848ae185a2e186b6"],
+  ["ec8ca3", "ec8c94e186b6"],
+  ["ec8ca4", "e1848ae185a2e186b7"],
+  ["ec8ca4", "ec8c94e186b7"],
+  ["ec8ca5", "e1848ae185a2e186b8"],
+  ["ec8ca5", "ec8c94e186b8"],
+  ["ec8ca6", "e1848ae185a2e186b9"],
+  ["ec8ca6", "ec8c94e186b9"],
+  ["ec8ca7", "e1848ae185a2e186ba"],
+  ["ec8ca7", "ec8c94e186ba"],
+  ["ec8ca8", "e1848ae185a2e186bb"],
+  ["ec8ca8", "ec8c94e186bb"],
+  ["ec8ca9", "e1848ae185a2e186bc"],
+  ["ec8ca9", "ec8c94e186bc"],
+  ["ec8caa", "e1848ae185a2e186bd"],
+  ["ec8caa", "ec8c94e186bd"],
+  ["ec8cab", "e1848ae185a2e186be"],
+  ["ec8cab", "ec8c94e186be"],
+  ["ec8cac", "e1848ae185a2e186bf"],
+  ["ec8cac", "ec8c94e186bf"],
+  ["ec8cad", "e1848ae185a2e18780"],
+  ["ec8cad", "ec8c94e18780"],
+  ["ec8cae", "e1848ae185a2e18781"],
+  ["ec8cae", "ec8c94e18781"],
+  ["ec8caf", "e1848ae185a2e18782"],
+  ["ec8caf", "ec8c94e18782"],
+  ["ec8cb0", "e1848ae185a3"],
+  ["ec8cb1", "e1848ae185a3e186a8"],
+  ["ec8cb1", "ec8cb0e186a8"],
+  ["ec8cb2", "e1848ae185a3e186a9"],
+  ["ec8cb2", "ec8cb0e186a9"],
+  ["ec8cb3", "e1848ae185a3e186aa"],
+  ["ec8cb3", "ec8cb0e186aa"],
+  ["ec8cb4", "e1848ae185a3e186ab"],
+  ["ec8cb4", "ec8cb0e186ab"],
+  ["ec8cb5", "e1848ae185a3e186ac"],
+  ["ec8cb5", "ec8cb0e186ac"],
+  ["ec8cb6", "e1848ae185a3e186ad"],
+  ["ec8cb6", "ec8cb0e186ad"],
+  ["ec8cb7", "e1848ae185a3e186ae"],
+  ["ec8cb7", "ec8cb0e186ae"],
+  ["ec8cb8", "e1848ae185a3e186af"],
+  ["ec8cb8", "ec8cb0e186af"],
+  ["ec8cb9", "e1848ae185a3e186b0"],
+  ["ec8cb9", "ec8cb0e186b0"],
+  ["ec8cba", "e1848ae185a3e186b1"],
+  ["ec8cba", "ec8cb0e186b1"],
+  ["ec8cbb", "e1848ae185a3e186b2"],
+  ["ec8cbb", "ec8cb0e186b2"],
+  ["ec8cbc", "e1848ae185a3e186b3"],
+  ["ec8cbc", "ec8cb0e186b3"],
+  ["ec8cbd", "e1848ae185a3e186b4"],
+  ["ec8cbd", "ec8cb0e186b4"],
+  ["ec8cbe", "e1848ae185a3e186b5"],
+  ["ec8cbe", "ec8cb0e186b5"],
+  ["ec8cbf", "e1848ae185a3e186b6"],
+  ["ec8cbf", "ec8cb0e186b6"],
+  ["ec8d80", "e1848ae185a3e186b7"],
+  ["ec8d80", "ec8cb0e186b7"],
+  ["ec8d81", "e1848ae185a3e186b8"],
+  ["ec8d81", "ec8cb0e186b8"],
+  ["ec8d82", "e1848ae185a3e186b9"],
+  ["ec8d82", "ec8cb0e186b9"],
+  ["ec8d83", "e1848ae185a3e186ba"],
+  ["ec8d83", "ec8cb0e186ba"],
+  ["ec8d84", "e1848ae185a3e186bb"],
+  ["ec8d84", "ec8cb0e186bb"],
+  ["ec8d85", "e1848ae185a3e186bc"],
+  ["ec8d85", "ec8cb0e186bc"],
+  ["ec8d86", "e1848ae185a3e186bd"],
+  ["ec8d86", "ec8cb0e186bd"],
+  ["ec8d87", "e1848ae185a3e186be"],
+  ["ec8d87", "ec8cb0e186be"],
+  ["ec8d88", "e1848ae185a3e186bf"],
+  ["ec8d88", "ec8cb0e186bf"],
+  ["ec8d89", "e1848ae185a3e18780"],
+  ["ec8d89", "ec8cb0e18780"],
+  ["ec8d8a", "e1848ae185a3e18781"],
+  ["ec8d8a", "ec8cb0e18781"],
+  ["ec8d8b", "e1848ae185a3e18782"],
+  ["ec8d8b", "ec8cb0e18782"],
+  ["ec8d8c", "e1848ae185a4"],
+  ["ec8d8d", "e1848ae185a4e186a8"],
+  ["ec8d8d", "ec8d8ce186a8"],
+  ["ec8d8e", "e1848ae185a4e186a9"],
+  ["ec8d8e", "ec8d8ce186a9"],
+  ["ec8d8f", "e1848ae185a4e186aa"],
+  ["ec8d8f", "ec8d8ce186aa"],
+  ["ec8d90", "e1848ae185a4e186ab"],
+  ["ec8d90", "ec8d8ce186ab"],
+  ["ec8d91", "e1848ae185a4e186ac"],
+  ["ec8d91", "ec8d8ce186ac"],
+  ["ec8d92", "e1848ae185a4e186ad"],
+  ["ec8d92", "ec8d8ce186ad"],
+  ["ec8d93", "e1848ae185a4e186ae"],
+  ["ec8d93", "ec8d8ce186ae"],
+  ["ec8d94", "e1848ae185a4e186af"],
+  ["ec8d94", "ec8d8ce186af"],
+  ["ec8d95", "e1848ae185a4e186b0"],
+  ["ec8d95", "ec8d8ce186b0"],
+  ["ec8d96", "e1848ae185a4e186b1"],
+  ["ec8d96", "ec8d8ce186b1"],
+  ["ec8d97", "e1848ae185a4e186b2"],
+  ["ec8d97", "ec8d8ce186b2"],
+  ["ec8d98", "e1848ae185a4e186b3"],
+  ["ec8d98", "ec8d8ce186b3"],
+  ["ec8d99", "e1848ae185a4e186b4"],
+  ["ec8d99", "ec8d8ce186b4"],
+  ["ec8d9a", "e1848ae185a4e186b5"],
+  ["ec8d9a", "ec8d8ce186b5"],
+  ["ec8d9b", "e1848ae185a4e186b6"],
+  ["ec8d9b", "ec8d8ce186b6"],
+  ["ec8d9c", "e1848ae185a4e186b7"],
+  ["ec8d9c", "ec8d8ce186b7"],
+  ["ec8d9d", "e1848ae185a4e186b8"],
+  ["ec8d9d", "ec8d8ce186b8"],
+  ["ec8d9e", "e1848ae185a4e186b9"],
+  ["ec8d9e", "ec8d8ce186b9"],
+  ["ec8d9f", "e1848ae185a4e186ba"],
+  ["ec8d9f", "ec8d8ce186ba"],
+  ["ec8da0", "e1848ae185a4e186bb"],
+  ["ec8da0", "ec8d8ce186bb"],
+  ["ec8da1", "e1848ae185a4e186bc"],
+  ["ec8da1", "ec8d8ce186bc"],
+  ["ec8da2", "e1848ae185a4e186bd"],
+  ["ec8da2", "ec8d8ce186bd"],
+  ["ec8da3", "e1848ae185a4e186be"],
+  ["ec8da3", "ec8d8ce186be"],
+  ["ec8da4", "e1848ae185a4e186bf"],
+  ["ec8da4", "ec8d8ce186bf"],
+  ["ec8da5", "e1848ae185a4e18780"],
+  ["ec8da5", "ec8d8ce18780"],
+  ["ec8da6", "e1848ae185a4e18781"],
+  ["ec8da6", "ec8d8ce18781"],
+  ["ec8da7", "e1848ae185a4e18782"],
+  ["ec8da7", "ec8d8ce18782"],
+  ["ec8da8", "e1848ae185a5"],
+  ["ec8da9", "e1848ae185a5e186a8"],
+  ["ec8da9", "ec8da8e186a8"],
+  ["ec8daa", "e1848ae185a5e186a9"],
+  ["ec8daa", "ec8da8e186a9"],
+  ["ec8dab", "e1848ae185a5e186aa"],
+  ["ec8dab", "ec8da8e186aa"],
+  ["ec8dac", "e1848ae185a5e186ab"],
+  ["ec8dac", "ec8da8e186ab"],
+  ["ec8dad", "e1848ae185a5e186ac"],
+  ["ec8dad", "ec8da8e186ac"],
+  ["ec8dae", "e1848ae185a5e186ad"],
+  ["ec8dae", "ec8da8e186ad"],
+  ["ec8daf", "e1848ae185a5e186ae"],
+  ["ec8daf", "ec8da8e186ae"],
+  ["ec8db0", "e1848ae185a5e186af"],
+  ["ec8db0", "ec8da8e186af"],
+  ["ec8db1", "e1848ae185a5e186b0"],
+  ["ec8db1", "ec8da8e186b0"],
+  ["ec8db2", "e1848ae185a5e186b1"],
+  ["ec8db2", "ec8da8e186b1"],
+  ["ec8db3", "e1848ae185a5e186b2"],
+  ["ec8db3", "ec8da8e186b2"],
+  ["ec8db4", "e1848ae185a5e186b3"],
+  ["ec8db4", "ec8da8e186b3"],
+  ["ec8db5", "e1848ae185a5e186b4"],
+  ["ec8db5", "ec8da8e186b4"],
+  ["ec8db6", "e1848ae185a5e186b5"],
+  ["ec8db6", "ec8da8e186b5"],
+  ["ec8db7", "e1848ae185a5e186b6"],
+  ["ec8db7", "ec8da8e186b6"],
+  ["ec8db8", "e1848ae185a5e186b7"],
+  ["ec8db8", "ec8da8e186b7"],
+  ["ec8db9", "e1848ae185a5e186b8"],
+  ["ec8db9", "ec8da8e186b8"],
+  ["ec8dba", "e1848ae185a5e186b9"],
+  ["ec8dba", "ec8da8e186b9"],
+  ["ec8dbb", "e1848ae185a5e186ba"],
+  ["ec8dbb", "ec8da8e186ba"],
+  ["ec8dbc", "e1848ae185a5e186bb"],
+  ["ec8dbc", "ec8da8e186bb"],
+  ["ec8dbd", "e1848ae185a5e186bc"],
+  ["ec8dbd", "ec8da8e186bc"],
+  ["ec8dbe", "e1848ae185a5e186bd"],
+  ["ec8dbe", "ec8da8e186bd"],
+  ["ec8dbf", "e1848ae185a5e186be"],
+  ["ec8dbf", "ec8da8e186be"],
+  ["ec8e80", "e1848ae185a5e186bf"],
+  ["ec8e80", "ec8da8e186bf"],
+  ["ec8e81", "e1848ae185a5e18780"],
+  ["ec8e81", "ec8da8e18780"],
+  ["ec8e82", "e1848ae185a5e18781"],
+  ["ec8e82", "ec8da8e18781"],
+  ["ec8e83", "e1848ae185a5e18782"],
+  ["ec8e83", "ec8da8e18782"],
+  ["ec8e84", "e1848ae185a6"],
+  ["ec8e85", "e1848ae185a6e186a8"],
+  ["ec8e85", "ec8e84e186a8"],
+  ["ec8e86", "e1848ae185a6e186a9"],
+  ["ec8e86", "ec8e84e186a9"],
+  ["ec8e87", "e1848ae185a6e186aa"],
+  ["ec8e87", "ec8e84e186aa"],
+  ["ec8e88", "e1848ae185a6e186ab"],
+  ["ec8e88", "ec8e84e186ab"],
+  ["ec8e89", "e1848ae185a6e186ac"],
+  ["ec8e89", "ec8e84e186ac"],
+  ["ec8e8a", "e1848ae185a6e186ad"],
+  ["ec8e8a", "ec8e84e186ad"],
+  ["ec8e8b", "e1848ae185a6e186ae"],
+  ["ec8e8b", "ec8e84e186ae"],
+  ["ec8e8c", "e1848ae185a6e186af"],
+  ["ec8e8c", "ec8e84e186af"],
+  ["ec8e8d", "e1848ae185a6e186b0"],
+  ["ec8e8d", "ec8e84e186b0"],
+  ["ec8e8e", "e1848ae185a6e186b1"],
+  ["ec8e8e", "ec8e84e186b1"],
+  ["ec8e8f", "e1848ae185a6e186b2"],
+  ["ec8e8f", "ec8e84e186b2"],
+  ["ec8e90", "e1848ae185a6e186b3"],
+  ["ec8e90", "ec8e84e186b3"],
+  ["ec8e91", "e1848ae185a6e186b4"],
+  ["ec8e91", "ec8e84e186b4"],
+  ["ec8e92", "e1848ae185a6e186b5"],
+  ["ec8e92", "ec8e84e186b5"],
+  ["ec8e93", "e1848ae185a6e186b6"],
+  ["ec8e93", "ec8e84e186b6"],
+  ["ec8e94", "e1848ae185a6e186b7"],
+  ["ec8e94", "ec8e84e186b7"],
+  ["ec8e95", "e1848ae185a6e186b8"],
+  ["ec8e95", "ec8e84e186b8"],
+  ["ec8e96", "e1848ae185a6e186b9"],
+  ["ec8e96", "ec8e84e186b9"],
+  ["ec8e97", "e1848ae185a6e186ba"],
+  ["ec8e97", "ec8e84e186ba"],
+  ["ec8e98", "e1848ae185a6e186bb"],
+  ["ec8e98", "ec8e84e186bb"],
+  ["ec8e99", "e1848ae185a6e186bc"],
+  ["ec8e99", "ec8e84e186bc"],
+  ["ec8e9a", "e1848ae185a6e186bd"],
+  ["ec8e9a", "ec8e84e186bd"],
+  ["ec8e9b", "e1848ae185a6e186be"],
+  ["ec8e9b", "ec8e84e186be"],
+  ["ec8e9c", "e1848ae185a6e186bf"],
+  ["ec8e9c", "ec8e84e186bf"],
+  ["ec8e9d", "e1848ae185a6e18780"],
+  ["ec8e9d", "ec8e84e18780"],
+  ["ec8e9e", "e1848ae185a6e18781"],
+  ["ec8e9e", "ec8e84e18781"],
+  ["ec8e9f", "e1848ae185a6e18782"],
+  ["ec8e9f", "ec8e84e18782"],
+  ["ec8ea0", "e1848ae185a7"],
+  ["ec8ea1", "e1848ae185a7e186a8"],
+  ["ec8ea1", "ec8ea0e186a8"],
+  ["ec8ea2", "e1848ae185a7e186a9"],
+  ["ec8ea2", "ec8ea0e186a9"],
+  ["ec8ea3", "e1848ae185a7e186aa"],
+  ["ec8ea3", "ec8ea0e186aa"],
+  ["ec8ea4", "e1848ae185a7e186ab"],
+  ["ec8ea4", "ec8ea0e186ab"],
+  ["ec8ea5", "e1848ae185a7e186ac"],
+  ["ec8ea5", "ec8ea0e186ac"],
+  ["ec8ea6", "e1848ae185a7e186ad"],
+  ["ec8ea6", "ec8ea0e186ad"],
+  ["ec8ea7", "e1848ae185a7e186ae"],
+  ["ec8ea7", "ec8ea0e186ae"],
+  ["ec8ea8", "e1848ae185a7e186af"],
+  ["ec8ea8", "ec8ea0e186af"],
+  ["ec8ea9", "e1848ae185a7e186b0"],
+  ["ec8ea9", "ec8ea0e186b0"],
+  ["ec8eaa", "e1848ae185a7e186b1"],
+  ["ec8eaa", "ec8ea0e186b1"],
+  ["ec8eab", "e1848ae185a7e186b2"],
+  ["ec8eab", "ec8ea0e186b2"],
+  ["ec8eac", "e1848ae185a7e186b3"],
+  ["ec8eac", "ec8ea0e186b3"],
+  ["ec8ead", "e1848ae185a7e186b4"],
+  ["ec8ead", "ec8ea0e186b4"],
+  ["ec8eae", "e1848ae185a7e186b5"],
+  ["ec8eae", "ec8ea0e186b5"],
+  ["ec8eaf", "e1848ae185a7e186b6"],
+  ["ec8eaf", "ec8ea0e186b6"],
+  ["ec8eb0", "e1848ae185a7e186b7"],
+  ["ec8eb0", "ec8ea0e186b7"],
+  ["ec8eb1", "e1848ae185a7e186b8"],
+  ["ec8eb1", "ec8ea0e186b8"],
+  ["ec8eb2", "e1848ae185a7e186b9"],
+  ["ec8eb2", "ec8ea0e186b9"],
+  ["ec8eb3", "e1848ae185a7e186ba"],
+  ["ec8eb3", "ec8ea0e186ba"],
+  ["ec8eb4", "e1848ae185a7e186bb"],
+  ["ec8eb4", "ec8ea0e186bb"],
+  ["ec8eb5", "e1848ae185a7e186bc"],
+  ["ec8eb5", "ec8ea0e186bc"],
+  ["ec8eb6", "e1848ae185a7e186bd"],
+  ["ec8eb6", "ec8ea0e186bd"],
+  ["ec8eb7", "e1848ae185a7e186be"],
+  ["ec8eb7", "ec8ea0e186be"],
+  ["ec8eb8", "e1848ae185a7e186bf"],
+  ["ec8eb8", "ec8ea0e186bf"],
+  ["ec8eb9", "e1848ae185a7e18780"],
+  ["ec8eb9", "ec8ea0e18780"],
+  ["ec8eba", "e1848ae185a7e18781"],
+  ["ec8eba", "ec8ea0e18781"],
+  ["ec8ebb", "e1848ae185a7e18782"],
+  ["ec8ebb", "ec8ea0e18782"],
+  ["ec8ebc", "e1848ae185a8"],
+  ["ec8ebd", "e1848ae185a8e186a8"],
+  ["ec8ebd", "ec8ebce186a8"],
+  ["ec8ebe", "e1848ae185a8e186a9"],
+  ["ec8ebe", "ec8ebce186a9"],
+  ["ec8ebf", "e1848ae185a8e186aa"],
+  ["ec8ebf", "ec8ebce186aa"],
+  ["ec8f80", "e1848ae185a8e186ab"],
+  ["ec8f80", "ec8ebce186ab"],
+  ["ec8f81", "e1848ae185a8e186ac"],
+  ["ec8f81", "ec8ebce186ac"],
+  ["ec8f82", "e1848ae185a8e186ad"],
+  ["ec8f82", "ec8ebce186ad"],
+  ["ec8f83", "e1848ae185a8e186ae"],
+  ["ec8f83", "ec8ebce186ae"],
+  ["ec8f84", "e1848ae185a8e186af"],
+  ["ec8f84", "ec8ebce186af"],
+  ["ec8f85", "e1848ae185a8e186b0"],
+  ["ec8f85", "ec8ebce186b0"],
+  ["ec8f86", "e1848ae185a8e186b1"],
+  ["ec8f86", "ec8ebce186b1"],
+  ["ec8f87", "e1848ae185a8e186b2"],
+  ["ec8f87", "ec8ebce186b2"],
+  ["ec8f88", "e1848ae185a8e186b3"],
+  ["ec8f88", "ec8ebce186b3"],
+  ["ec8f89", "e1848ae185a8e186b4"],
+  ["ec8f89", "ec8ebce186b4"],
+  ["ec8f8a", "e1848ae185a8e186b5"],
+  ["ec8f8a", "ec8ebce186b5"],
+  ["ec8f8b", "e1848ae185a8e186b6"],
+  ["ec8f8b", "ec8ebce186b6"],
+  ["ec8f8c", "e1848ae185a8e186b7"],
+  ["ec8f8c", "ec8ebce186b7"],
+  ["ec8f8d", "e1848ae185a8e186b8"],
+  ["ec8f8d", "ec8ebce186b8"],
+  ["ec8f8e", "e1848ae185a8e186b9"],
+  ["ec8f8e", "ec8ebce186b9"],
+  ["ec8f8f", "e1848ae185a8e186ba"],
+  ["ec8f8f", "ec8ebce186ba"],
+  ["ec8f90", "e1848ae185a8e186bb"],
+  ["ec8f90", "ec8ebce186bb"],
+  ["ec8f91", "e1848ae185a8e186bc"],
+  ["ec8f91", "ec8ebce186bc"],
+  ["ec8f92", "e1848ae185a8e186bd"],
+  ["ec8f92", "ec8ebce186bd"],
+  ["ec8f93", "e1848ae185a8e186be"],
+  ["ec8f93", "ec8ebce186be"],
+  ["ec8f94", "e1848ae185a8e186bf"],
+  ["ec8f94", "ec8ebce186bf"],
+  ["ec8f95", "e1848ae185a8e18780"],
+  ["ec8f95", "ec8ebce18780"],
+  ["ec8f96", "e1848ae185a8e18781"],
+  ["ec8f96", "ec8ebce18781"],
+  ["ec8f97", "e1848ae185a8e18782"],
+  ["ec8f97", "ec8ebce18782"],
+  ["ec8f98", "e1848ae185a9"],
+  ["ec8f99", "e1848ae185a9e186a8"],
+  ["ec8f99", "ec8f98e186a8"],
+  ["ec8f9a", "e1848ae185a9e186a9"],
+  ["ec8f9a", "ec8f98e186a9"],
+  ["ec8f9b", "e1848ae185a9e186aa"],
+  ["ec8f9b", "ec8f98e186aa"],
+  ["ec8f9c", "e1848ae185a9e186ab"],
+  ["ec8f9c", "ec8f98e186ab"],
+  ["ec8f9d", "e1848ae185a9e186ac"],
+  ["ec8f9d", "ec8f98e186ac"],
+  ["ec8f9e", "e1848ae185a9e186ad"],
+  ["ec8f9e", "ec8f98e186ad"],
+  ["ec8f9f", "e1848ae185a9e186ae"],
+  ["ec8f9f", "ec8f98e186ae"],
+  ["ec8fa0", "e1848ae185a9e186af"],
+  ["ec8fa0", "ec8f98e186af"],
+  ["ec8fa1", "e1848ae185a9e186b0"],
+  ["ec8fa1", "ec8f98e186b0"],
+  ["ec8fa2", "e1848ae185a9e186b1"],
+  ["ec8fa2", "ec8f98e186b1"],
+  ["ec8fa3", "e1848ae185a9e186b2"],
+  ["ec8fa3", "ec8f98e186b2"],
+  ["ec8fa4", "e1848ae185a9e186b3"],
+  ["ec8fa4", "ec8f98e186b3"],
+  ["ec8fa5", "e1848ae185a9e186b4"],
+  ["ec8fa5", "ec8f98e186b4"],
+  ["ec8fa6", "e1848ae185a9e186b5"],
+  ["ec8fa6", "ec8f98e186b5"],
+  ["ec8fa7", "e1848ae185a9e186b6"],
+  ["ec8fa7", "ec8f98e186b6"],
+  ["ec8fa8", "e1848ae185a9e186b7"],
+  ["ec8fa8", "ec8f98e186b7"],
+  ["ec8fa9", "e1848ae185a9e186b8"],
+  ["ec8fa9", "ec8f98e186b8"],
+  ["ec8faa", "e1848ae185a9e186b9"],
+  ["ec8faa", "ec8f98e186b9"],
+  ["ec8fab", "e1848ae185a9e186ba"],
+  ["ec8fab", "ec8f98e186ba"],
+  ["ec8fac", "e1848ae185a9e186bb"],
+  ["ec8fac", "ec8f98e186bb"],
+  ["ec8fad", "e1848ae185a9e186bc"],
+  ["ec8fad", "ec8f98e186bc"],
+  ["ec8fae", "e1848ae185a9e186bd"],
+  ["ec8fae", "ec8f98e186bd"],
+  ["ec8faf", "e1848ae185a9e186be"],
+  ["ec8faf", "ec8f98e186be"],
+  ["ec8fb0", "e1848ae185a9e186bf"],
+  ["ec8fb0", "ec8f98e186bf"],
+  ["ec8fb1", "e1848ae185a9e18780"],
+  ["ec8fb1", "ec8f98e18780"],
+  ["ec8fb2", "e1848ae185a9e18781"],
+  ["ec8fb2", "ec8f98e18781"],
+  ["ec8fb3", "e1848ae185a9e18782"],
+  ["ec8fb3", "ec8f98e18782"],
+  ["ec8fb4", "e1848ae185aa"],
+  ["ec8fb5", "e1848ae185aae186a8"],
+  ["ec8fb5", "ec8fb4e186a8"],
+  ["ec8fb6", "e1848ae185aae186a9"],
+  ["ec8fb6", "ec8fb4e186a9"],
+  ["ec8fb7", "e1848ae185aae186aa"],
+  ["ec8fb7", "ec8fb4e186aa"],
+  ["ec8fb8", "e1848ae185aae186ab"],
+  ["ec8fb8", "ec8fb4e186ab"],
+  ["ec8fb9", "e1848ae185aae186ac"],
+  ["ec8fb9", "ec8fb4e186ac"],
+  ["ec8fba", "e1848ae185aae186ad"],
+  ["ec8fba", "ec8fb4e186ad"],
+  ["ec8fbb", "e1848ae185aae186ae"],
+  ["ec8fbb", "ec8fb4e186ae"],
+  ["ec8fbc", "e1848ae185aae186af"],
+  ["ec8fbc", "ec8fb4e186af"],
+  ["ec8fbd", "e1848ae185aae186b0"],
+  ["ec8fbd", "ec8fb4e186b0"],
+  ["ec8fbe", "e1848ae185aae186b1"],
+  ["ec8fbe", "ec8fb4e186b1"],
+  ["ec8fbf", "e1848ae185aae186b2"],
+  ["ec8fbf", "ec8fb4e186b2"],
+  ["ec9080", "e1848ae185aae186b3"],
+  ["ec9080", "ec8fb4e186b3"],
+  ["ec9081", "e1848ae185aae186b4"],
+  ["ec9081", "ec8fb4e186b4"],
+  ["ec9082", "e1848ae185aae186b5"],
+  ["ec9082", "ec8fb4e186b5"],
+  ["ec9083", "e1848ae185aae186b6"],
+  ["ec9083", "ec8fb4e186b6"],
+  ["ec9084", "e1848ae185aae186b7"],
+  ["ec9084", "ec8fb4e186b7"],
+  ["ec9085", "e1848ae185aae186b8"],
+  ["ec9085", "ec8fb4e186b8"],
+  ["ec9086", "e1848ae185aae186b9"],
+  ["ec9086", "ec8fb4e186b9"],
+  ["ec9087", "e1848ae185aae186ba"],
+  ["ec9087", "ec8fb4e186ba"],
+  ["ec9088", "e1848ae185aae186bb"],
+  ["ec9088", "ec8fb4e186bb"],
+  ["ec9089", "e1848ae185aae186bc"],
+  ["ec9089", "ec8fb4e186bc"],
+  ["ec908a", "e1848ae185aae186bd"],
+  ["ec908a", "ec8fb4e186bd"],
+  ["ec908b", "e1848ae185aae186be"],
+  ["ec908b", "ec8fb4e186be"],
+  ["ec908c", "e1848ae185aae186bf"],
+  ["ec908c", "ec8fb4e186bf"],
+  ["ec908d", "e1848ae185aae18780"],
+  ["ec908d", "ec8fb4e18780"],
+  ["ec908e", "e1848ae185aae18781"],
+  ["ec908e", "ec8fb4e18781"],
+  ["ec908f", "e1848ae185aae18782"],
+  ["ec908f", "ec8fb4e18782"],
+  ["ec9090", "e1848ae185ab"],
+  ["ec9091", "e1848ae185abe186a8"],
+  ["ec9091", "ec9090e186a8"],
+  ["ec9092", "e1848ae185abe186a9"],
+  ["ec9092", "ec9090e186a9"],
+  ["ec9093", "e1848ae185abe186aa"],
+  ["ec9093", "ec9090e186aa"],
+  ["ec9094", "e1848ae185abe186ab"],
+  ["ec9094", "ec9090e186ab"],
+  ["ec9095", "e1848ae185abe186ac"],
+  ["ec9095", "ec9090e186ac"],
+  ["ec9096", "e1848ae185abe186ad"],
+  ["ec9096", "ec9090e186ad"],
+  ["ec9097", "e1848ae185abe186ae"],
+  ["ec9097", "ec9090e186ae"],
+  ["ec9098", "e1848ae185abe186af"],
+  ["ec9098", "ec9090e186af"],
+  ["ec9099", "e1848ae185abe186b0"],
+  ["ec9099", "ec9090e186b0"],
+  ["ec909a", "e1848ae185abe186b1"],
+  ["ec909a", "ec9090e186b1"],
+  ["ec909b", "e1848ae185abe186b2"],
+  ["ec909b", "ec9090e186b2"],
+  ["ec909c", "e1848ae185abe186b3"],
+  ["ec909c", "ec9090e186b3"],
+  ["ec909d", "e1848ae185abe186b4"],
+  ["ec909d", "ec9090e186b4"],
+  ["ec909e", "e1848ae185abe186b5"],
+  ["ec909e", "ec9090e186b5"],
+  ["ec909f", "e1848ae185abe186b6"],
+  ["ec909f", "ec9090e186b6"],
+  ["ec90a0", "e1848ae185abe186b7"],
+  ["ec90a0", "ec9090e186b7"],
+  ["ec90a1", "e1848ae185abe186b8"],
+  ["ec90a1", "ec9090e186b8"],
+  ["ec90a2", "e1848ae185abe186b9"],
+  ["ec90a2", "ec9090e186b9"],
+  ["ec90a3", "e1848ae185abe186ba"],
+  ["ec90a3", "ec9090e186ba"],
+  ["ec90a4", "e1848ae185abe186bb"],
+  ["ec90a4", "ec9090e186bb"],
+  ["ec90a5", "e1848ae185abe186bc"],
+  ["ec90a5", "ec9090e186bc"],
+  ["ec90a6", "e1848ae185abe186bd"],
+  ["ec90a6", "ec9090e186bd"],
+  ["ec90a7", "e1848ae185abe186be"],
+  ["ec90a7", "ec9090e186be"],
+  ["ec90a8", "e1848ae185abe186bf"],
+  ["ec90a8", "ec9090e186bf"],
+  ["ec90a9", "e1848ae185abe18780"],
+  ["ec90a9", "ec9090e18780"],
+  ["ec90aa", "e1848ae185abe18781"],
+  ["ec90aa", "ec9090e18781"],
+  ["ec90ab", "e1848ae185abe18782"],
+  ["ec90ab", "ec9090e18782"],
+  ["ec90ac", "e1848ae185ac"],
+  ["ec90ad", "e1848ae185ace186a8"],
+  ["ec90ad", "ec90ace186a8"],
+  ["ec90ae", "e1848ae185ace186a9"],
+  ["ec90ae", "ec90ace186a9"],
+  ["ec90af", "e1848ae185ace186aa"],
+  ["ec90af", "ec90ace186aa"],
+  ["ec90b0", "e1848ae185ace186ab"],
+  ["ec90b0", "ec90ace186ab"],
+  ["ec90b1", "e1848ae185ace186ac"],
+  ["ec90b1", "ec90ace186ac"],
+  ["ec90b2", "e1848ae185ace186ad"],
+  ["ec90b2", "ec90ace186ad"],
+  ["ec90b3", "e1848ae185ace186ae"],
+  ["ec90b3", "ec90ace186ae"],
+  ["ec90b4", "e1848ae185ace186af"],
+  ["ec90b4", "ec90ace186af"],
+  ["ec90b5", "e1848ae185ace186b0"],
+  ["ec90b5", "ec90ace186b0"],
+  ["ec90b6", "e1848ae185ace186b1"],
+  ["ec90b6", "ec90ace186b1"],
+  ["ec90b7", "e1848ae185ace186b2"],
+  ["ec90b7", "ec90ace186b2"],
+  ["ec90b8", "e1848ae185ace186b3"],
+  ["ec90b8", "ec90ace186b3"],
+  ["ec90b9", "e1848ae185ace186b4"],
+  ["ec90b9", "ec90ace186b4"],
+  ["ec90ba", "e1848ae185ace186b5"],
+  ["ec90ba", "ec90ace186b5"],
+  ["ec90bb", "e1848ae185ace186b6"],
+  ["ec90bb", "ec90ace186b6"],
+  ["ec90bc", "e1848ae185ace186b7"],
+  ["ec90bc", "ec90ace186b7"],
+  ["ec90bd", "e1848ae185ace186b8"],
+  ["ec90bd", "ec90ace186b8"],
+  ["ec90be", "e1848ae185ace186b9"],
+  ["ec90be", "ec90ace186b9"],
+  ["ec90bf", "e1848ae185ace186ba"],
+  ["ec90bf", "ec90ace186ba"],
+  ["ec9180", "e1848ae185ace186bb"],
+  ["ec9180", "ec90ace186bb"],
+  ["ec9181", "e1848ae185ace186bc"],
+  ["ec9181", "ec90ace186bc"],
+  ["ec9182", "e1848ae185ace186bd"],
+  ["ec9182", "ec90ace186bd"],
+  ["ec9183", "e1848ae185ace186be"],
+  ["ec9183", "ec90ace186be"],
+  ["ec9184", "e1848ae185ace186bf"],
+  ["ec9184", "ec90ace186bf"],
+  ["ec9185", "e1848ae185ace18780"],
+  ["ec9185", "ec90ace18780"],
+  ["ec9186", "e1848ae185ace18781"],
+  ["ec9186", "ec90ace18781"],
+  ["ec9187", "e1848ae185ace18782"],
+  ["ec9187", "ec90ace18782"],
+  ["ec9188", "e1848ae185ad"],
+  ["ec9189", "e1848ae185ade186a8"],
+  ["ec9189", "ec9188e186a8"],
+  ["ec918a", "e1848ae185ade186a9"],
+  ["ec918a", "ec9188e186a9"],
+  ["ec918b", "e1848ae185ade186aa"],
+  ["ec918b", "ec9188e186aa"],
+  ["ec918c", "e1848ae185ade186ab"],
+  ["ec918c", "ec9188e186ab"],
+  ["ec918d", "e1848ae185ade186ac"],
+  ["ec918d", "ec9188e186ac"],
+  ["ec918e", "e1848ae185ade186ad"],
+  ["ec918e", "ec9188e186ad"],
+  ["ec918f", "e1848ae185ade186ae"],
+  ["ec918f", "ec9188e186ae"],
+  ["ec9190", "e1848ae185ade186af"],
+  ["ec9190", "ec9188e186af"],
+  ["ec9191", "e1848ae185ade186b0"],
+  ["ec9191", "ec9188e186b0"],
+  ["ec9192", "e1848ae185ade186b1"],
+  ["ec9192", "ec9188e186b1"],
+  ["ec9193", "e1848ae185ade186b2"],
+  ["ec9193", "ec9188e186b2"],
+  ["ec9194", "e1848ae185ade186b3"],
+  ["ec9194", "ec9188e186b3"],
+  ["ec9195", "e1848ae185ade186b4"],
+  ["ec9195", "ec9188e186b4"],
+  ["ec9196", "e1848ae185ade186b5"],
+  ["ec9196", "ec9188e186b5"],
+  ["ec9197", "e1848ae185ade186b6"],
+  ["ec9197", "ec9188e186b6"],
+  ["ec9198", "e1848ae185ade186b7"],
+  ["ec9198", "ec9188e186b7"],
+  ["ec9199", "e1848ae185ade186b8"],
+  ["ec9199", "ec9188e186b8"],
+  ["ec919a", "e1848ae185ade186b9"],
+  ["ec919a", "ec9188e186b9"],
+  ["ec919b", "e1848ae185ade186ba"],
+  ["ec919b", "ec9188e186ba"],
+  ["ec919c", "e1848ae185ade186bb"],
+  ["ec919c", "ec9188e186bb"],
+  ["ec919d", "e1848ae185ade186bc"],
+  ["ec919d", "ec9188e186bc"],
+  ["ec919e", "e1848ae185ade186bd"],
+  ["ec919e", "ec9188e186bd"],
+  ["ec919f", "e1848ae185ade186be"],
+  ["ec919f", "ec9188e186be"],
+  ["ec91a0", "e1848ae185ade186bf"],
+  ["ec91a0", "ec9188e186bf"],
+  ["ec91a1", "e1848ae185ade18780"],
+  ["ec91a1", "ec9188e18780"],
+  ["ec91a2", "e1848ae185ade18781"],
+  ["ec91a2", "ec9188e18781"],
+  ["ec91a3", "e1848ae185ade18782"],
+  ["ec91a3", "ec9188e18782"],
+  ["ec91a4", "e1848ae185ae"],
+  ["ec91a5", "e1848ae185aee186a8"],
+  ["ec91a5", "ec91a4e186a8"],
+  ["ec91a6", "e1848ae185aee186a9"],
+  ["ec91a6", "ec91a4e186a9"],
+  ["ec91a7", "e1848ae185aee186aa"],
+  ["ec91a7", "ec91a4e186aa"],
+  ["ec91a8", "e1848ae185aee186ab"],
+  ["ec91a8", "ec91a4e186ab"],
+  ["ec91a9", "e1848ae185aee186ac"],
+  ["ec91a9", "ec91a4e186ac"],
+  ["ec91aa", "e1848ae185aee186ad"],
+  ["ec91aa", "ec91a4e186ad"],
+  ["ec91ab", "e1848ae185aee186ae"],
+  ["ec91ab", "ec91a4e186ae"],
+  ["ec91ac", "e1848ae185aee186af"],
+  ["ec91ac", "ec91a4e186af"],
+  ["ec91ad", "e1848ae185aee186b0"],
+  ["ec91ad", "ec91a4e186b0"],
+  ["ec91ae", "e1848ae185aee186b1"],
+  ["ec91ae", "ec91a4e186b1"],
+  ["ec91af", "e1848ae185aee186b2"],
+  ["ec91af", "ec91a4e186b2"],
+  ["ec91b0", "e1848ae185aee186b3"],
+  ["ec91b0", "ec91a4e186b3"],
+  ["ec91b1", "e1848ae185aee186b4"],
+  ["ec91b1", "ec91a4e186b4"],
+  ["ec91b2", "e1848ae185aee186b5"],
+  ["ec91b2", "ec91a4e186b5"],
+  ["ec91b3", "e1848ae185aee186b6"],
+  ["ec91b3", "ec91a4e186b6"],
+  ["ec91b4", "e1848ae185aee186b7"],
+  ["ec91b4", "ec91a4e186b7"],
+  ["ec91b5", "e1848ae185aee186b8"],
+  ["ec91b5", "ec91a4e186b8"],
+  ["ec91b6", "e1848ae185aee186b9"],
+  ["ec91b6", "ec91a4e186b9"],
+  ["ec91b7", "e1848ae185aee186ba"],
+  ["ec91b7", "ec91a4e186ba"],
+  ["ec91b8", "e1848ae185aee186bb"],
+  ["ec91b8", "ec91a4e186bb"],
+  ["ec91b9", "e1848ae185aee186bc"],
+  ["ec91b9", "ec91a4e186bc"],
+  ["ec91ba", "e1848ae185aee186bd"],
+  ["ec91ba", "ec91a4e186bd"],
+  ["ec91bb", "e1848ae185aee186be"],
+  ["ec91bb", "ec91a4e186be"],
+  ["ec91bc", "e1848ae185aee186bf"],
+  ["ec91bc", "ec91a4e186bf"],
+  ["ec91bd", "e1848ae185aee18780"],
+  ["ec91bd", "ec91a4e18780"],
+  ["ec91be", "e1848ae185aee18781"],
+  ["ec91be", "ec91a4e18781"],
+  ["ec91bf", "e1848ae185aee18782"],
+  ["ec91bf", "ec91a4e18782"],
+  ["ec9280", "e1848ae185af"],
+  ["ec9281", "e1848ae185afe186a8"],
+  ["ec9281", "ec9280e186a8"],
+  ["ec9282", "e1848ae185afe186a9"],
+  ["ec9282", "ec9280e186a9"],
+  ["ec9283", "e1848ae185afe186aa"],
+  ["ec9283", "ec9280e186aa"],
+  ["ec9284", "e1848ae185afe186ab"],
+  ["ec9284", "ec9280e186ab"],
+  ["ec9285", "e1848ae185afe186ac"],
+  ["ec9285", "ec9280e186ac"],
+  ["ec9286", "e1848ae185afe186ad"],
+  ["ec9286", "ec9280e186ad"],
+  ["ec9287", "e1848ae185afe186ae"],
+  ["ec9287", "ec9280e186ae"],
+  ["ec9288", "e1848ae185afe186af"],
+  ["ec9288", "ec9280e186af"],
+  ["ec9289", "e1848ae185afe186b0"],
+  ["ec9289", "ec9280e186b0"],
+  ["ec928a", "e1848ae185afe186b1"],
+  ["ec928a", "ec9280e186b1"],
+  ["ec928b", "e1848ae185afe186b2"],
+  ["ec928b", "ec9280e186b2"],
+  ["ec928c", "e1848ae185afe186b3"],
+  ["ec928c", "ec9280e186b3"],
+  ["ec928d", "e1848ae185afe186b4"],
+  ["ec928d", "ec9280e186b4"],
+  ["ec928e", "e1848ae185afe186b5"],
+  ["ec928e", "ec9280e186b5"],
+  ["ec928f", "e1848ae185afe186b6"],
+  ["ec928f", "ec9280e186b6"],
+  ["ec9290", "e1848ae185afe186b7"],
+  ["ec9290", "ec9280e186b7"],
+  ["ec9291", "e1848ae185afe186b8"],
+  ["ec9291", "ec9280e186b8"],
+  ["ec9292", "e1848ae185afe186b9"],
+  ["ec9292", "ec9280e186b9"],
+  ["ec9293", "e1848ae185afe186ba"],
+  ["ec9293", "ec9280e186ba"],
+  ["ec9294", "e1848ae185afe186bb"],
+  ["ec9294", "ec9280e186bb"],
+  ["ec9295", "e1848ae185afe186bc"],
+  ["ec9295", "ec9280e186bc"],
+  ["ec9296", "e1848ae185afe186bd"],
+  ["ec9296", "ec9280e186bd"],
+  ["ec9297", "e1848ae185afe186be"],
+  ["ec9297", "ec9280e186be"],
+  ["ec9298", "e1848ae185afe186bf"],
+  ["ec9298", "ec9280e186bf"],
+  ["ec9299", "e1848ae185afe18780"],
+  ["ec9299", "ec9280e18780"],
+  ["ec929a", "e1848ae185afe18781"],
+  ["ec929a", "ec9280e18781"],
+  ["ec929b", "e1848ae185afe18782"],
+  ["ec929b", "ec9280e18782"],
+  ["ec929c", "e1848ae185b0"],
+  ["ec929d", "e1848ae185b0e186a8"],
+  ["ec929d", "ec929ce186a8"],
+  ["ec929e", "e1848ae185b0e186a9"],
+  ["ec929e", "ec929ce186a9"],
+  ["ec929f", "e1848ae185b0e186aa"],
+  ["ec929f", "ec929ce186aa"],
+  ["ec92a0", "e1848ae185b0e186ab"],
+  ["ec92a0", "ec929ce186ab"],
+  ["ec92a1", "e1848ae185b0e186ac"],
+  ["ec92a1", "ec929ce186ac"],
+  ["ec92a2", "e1848ae185b0e186ad"],
+  ["ec92a2", "ec929ce186ad"],
+  ["ec92a3", "e1848ae185b0e186ae"],
+  ["ec92a3", "ec929ce186ae"],
+  ["ec92a4", "e1848ae185b0e186af"],
+  ["ec92a4", "ec929ce186af"],
+  ["ec92a5", "e1848ae185b0e186b0"],
+  ["ec92a5", "ec929ce186b0"],
+  ["ec92a6", "e1848ae185b0e186b1"],
+  ["ec92a6", "ec929ce186b1"],
+  ["ec92a7", "e1848ae185b0e186b2"],
+  ["ec92a7", "ec929ce186b2"],
+  ["ec92a8", "e1848ae185b0e186b3"],
+  ["ec92a8", "ec929ce186b3"],
+  ["ec92a9", "e1848ae185b0e186b4"],
+  ["ec92a9", "ec929ce186b4"],
+  ["ec92aa", "e1848ae185b0e186b5"],
+  ["ec92aa", "ec929ce186b5"],
+  ["ec92ab", "e1848ae185b0e186b6"],
+  ["ec92ab", "ec929ce186b6"],
+  ["ec92ac", "e1848ae185b0e186b7"],
+  ["ec92ac", "ec929ce186b7"],
+  ["ec92ad", "e1848ae185b0e186b8"],
+  ["ec92ad", "ec929ce186b8"],
+  ["ec92ae", "e1848ae185b0e186b9"],
+  ["ec92ae", "ec929ce186b9"],
+  ["ec92af", "e1848ae185b0e186ba"],
+  ["ec92af", "ec929ce186ba"],
+  ["ec92b0", "e1848ae185b0e186bb"],
+  ["ec92b0", "ec929ce186bb"],
+  ["ec92b1", "e1848ae185b0e186bc"],
+  ["ec92b1", "ec929ce186bc"],
+  ["ec92b2", "e1848ae185b0e186bd"],
+  ["ec92b2", "ec929ce186bd"],
+  ["ec92b3", "e1848ae185b0e186be"],
+  ["ec92b3", "ec929ce186be"],
+  ["ec92b4", "e1848ae185b0e186bf"],
+  ["ec92b4", "ec929ce186bf"],
+  ["ec92b5", "e1848ae185b0e18780"],
+  ["ec92b5", "ec929ce18780"],
+  ["ec92b6", "e1848ae185b0e18781"],
+  ["ec92b6", "ec929ce18781"],
+  ["ec92b7", "e1848ae185b0e18782"],
+  ["ec92b7", "ec929ce18782"],
+  ["ec92b8", "e1848ae185b1"],
+  ["ec92b9", "e1848ae185b1e186a8"],
+  ["ec92b9", "ec92b8e186a8"],
+  ["ec92ba", "e1848ae185b1e186a9"],
+  ["ec92ba", "ec92b8e186a9"],
+  ["ec92bb", "e1848ae185b1e186aa"],
+  ["ec92bb", "ec92b8e186aa"],
+  ["ec92bc", "e1848ae185b1e186ab"],
+  ["ec92bc", "ec92b8e186ab"],
+  ["ec92bd", "e1848ae185b1e186ac"],
+  ["ec92bd", "ec92b8e186ac"],
+  ["ec92be", "e1848ae185b1e186ad"],
+  ["ec92be", "ec92b8e186ad"],
+  ["ec92bf", "e1848ae185b1e186ae"],
+  ["ec92bf", "ec92b8e186ae"],
+  ["ec9380", "e1848ae185b1e186af"],
+  ["ec9380", "ec92b8e186af"],
+  ["ec9381", "e1848ae185b1e186b0"],
+  ["ec9381", "ec92b8e186b0"],
+  ["ec9382", "e1848ae185b1e186b1"],
+  ["ec9382", "ec92b8e186b1"],
+  ["ec9383", "e1848ae185b1e186b2"],
+  ["ec9383", "ec92b8e186b2"],
+  ["ec9384", "e1848ae185b1e186b3"],
+  ["ec9384", "ec92b8e186b3"],
+  ["ec9385", "e1848ae185b1e186b4"],
+  ["ec9385", "ec92b8e186b4"],
+  ["ec9386", "e1848ae185b1e186b5"],
+  ["ec9386", "ec92b8e186b5"],
+  ["ec9387", "e1848ae185b1e186b6"],
+  ["ec9387", "ec92b8e186b6"],
+  ["ec9388", "e1848ae185b1e186b7"],
+  ["ec9388", "ec92b8e186b7"],
+  ["ec9389", "e1848ae185b1e186b8"],
+  ["ec9389", "ec92b8e186b8"],
+  ["ec938a", "e1848ae185b1e186b9"],
+  ["ec938a", "ec92b8e186b9"],
+  ["ec938b", "e1848ae185b1e186ba"],
+  ["ec938b", "ec92b8e186ba"],
+  ["ec938c", "e1848ae185b1e186bb"],
+  ["ec938c", "ec92b8e186bb"],
+  ["ec938d", "e1848ae185b1e186bc"],
+  ["ec938d", "ec92b8e186bc"],
+  ["ec938e", "e1848ae185b1e186bd"],
+  ["ec938e", "ec92b8e186bd"],
+  ["ec938f", "e1848ae185b1e186be"],
+  ["ec938f", "ec92b8e186be"],
+  ["ec9390", "e1848ae185b1e186bf"],
+  ["ec9390", "ec92b8e186bf"],
+  ["ec9391", "e1848ae185b1e18780"],
+  ["ec9391", "ec92b8e18780"],
+  ["ec9392", "e1848ae185b1e18781"],
+  ["ec9392", "ec92b8e18781"],
+  ["ec9393", "e1848ae185b1e18782"],
+  ["ec9393", "ec92b8e18782"],
+  ["ec9394", "e1848ae185b2"],
+  ["ec9395", "e1848ae185b2e186a8"],
+  ["ec9395", "ec9394e186a8"],
+  ["ec9396", "e1848ae185b2e186a9"],
+  ["ec9396", "ec9394e186a9"],
+  ["ec9397", "e1848ae185b2e186aa"],
+  ["ec9397", "ec9394e186aa"],
+  ["ec9398", "e1848ae185b2e186ab"],
+  ["ec9398", "ec9394e186ab"],
+  ["ec9399", "e1848ae185b2e186ac"],
+  ["ec9399", "ec9394e186ac"],
+  ["ec939a", "e1848ae185b2e186ad"],
+  ["ec939a", "ec9394e186ad"],
+  ["ec939b", "e1848ae185b2e186ae"],
+  ["ec939b", "ec9394e186ae"],
+  ["ec939c", "e1848ae185b2e186af"],
+  ["ec939c", "ec9394e186af"],
+  ["ec939d", "e1848ae185b2e186b0"],
+  ["ec939d", "ec9394e186b0"],
+  ["ec939e", "e1848ae185b2e186b1"],
+  ["ec939e", "ec9394e186b1"],
+  ["ec939f", "e1848ae185b2e186b2"],
+  ["ec939f", "ec9394e186b2"],
+  ["ec93a0", "e1848ae185b2e186b3"],
+  ["ec93a0", "ec9394e186b3"],
+  ["ec93a1", "e1848ae185b2e186b4"],
+  ["ec93a1", "ec9394e186b4"],
+  ["ec93a2", "e1848ae185b2e186b5"],
+  ["ec93a2", "ec9394e186b5"],
+  ["ec93a3", "e1848ae185b2e186b6"],
+  ["ec93a3", "ec9394e186b6"],
+  ["ec93a4", "e1848ae185b2e186b7"],
+  ["ec93a4", "ec9394e186b7"],
+  ["ec93a5", "e1848ae185b2e186b8"],
+  ["ec93a5", "ec9394e186b8"],
+  ["ec93a6", "e1848ae185b2e186b9"],
+  ["ec93a6", "ec9394e186b9"],
+  ["ec93a7", "e1848ae185b2e186ba"],
+  ["ec93a7", "ec9394e186ba"],
+  ["ec93a8", "e1848ae185b2e186bb"],
+  ["ec93a8", "ec9394e186bb"],
+  ["ec93a9", "e1848ae185b2e186bc"],
+  ["ec93a9", "ec9394e186bc"],
+  ["ec93aa", "e1848ae185b2e186bd"],
+  ["ec93aa", "ec9394e186bd"],
+  ["ec93ab", "e1848ae185b2e186be"],
+  ["ec93ab", "ec9394e186be"],
+  ["ec93ac", "e1848ae185b2e186bf"],
+  ["ec93ac", "ec9394e186bf"],
+  ["ec93ad", "e1848ae185b2e18780"],
+  ["ec93ad", "ec9394e18780"],
+  ["ec93ae", "e1848ae185b2e18781"],
+  ["ec93ae", "ec9394e18781"],
+  ["ec93af", "e1848ae185b2e18782"],
+  ["ec93af", "ec9394e18782"],
+  ["ec93b0", "e1848ae185b3"],
+  ["ec93b1", "e1848ae185b3e186a8"],
+  ["ec93b1", "ec93b0e186a8"],
+  ["ec93b2", "e1848ae185b3e186a9"],
+  ["ec93b2", "ec93b0e186a9"],
+  ["ec93b3", "e1848ae185b3e186aa"],
+  ["ec93b3", "ec93b0e186aa"],
+  ["ec93b4", "e1848ae185b3e186ab"],
+  ["ec93b4", "ec93b0e186ab"],
+  ["ec93b5", "e1848ae185b3e186ac"],
+  ["ec93b5", "ec93b0e186ac"],
+  ["ec93b6", "e1848ae185b3e186ad"],
+  ["ec93b6", "ec93b0e186ad"],
+  ["ec93b7", "e1848ae185b3e186ae"],
+  ["ec93b7", "ec93b0e186ae"],
+  ["ec93b8", "e1848ae185b3e186af"],
+  ["ec93b8", "ec93b0e186af"],
+  ["ec93b9", "e1848ae185b3e186b0"],
+  ["ec93b9", "ec93b0e186b0"],
+  ["ec93ba", "e1848ae185b3e186b1"],
+  ["ec93ba", "ec93b0e186b1"],
+  ["ec93bb", "e1848ae185b3e186b2"],
+  ["ec93bb", "ec93b0e186b2"],
+  ["ec93bc", "e1848ae185b3e186b3"],
+  ["ec93bc", "ec93b0e186b3"],
+  ["ec93bd", "e1848ae185b3e186b4"],
+  ["ec93bd", "ec93b0e186b4"],
+  ["ec93be", "e1848ae185b3e186b5"],
+  ["ec93be", "ec93b0e186b5"],
+  ["ec93bf", "e1848ae185b3e186b6"],
+  ["ec93bf", "ec93b0e186b6"],
+  ["ec9480", "e1848ae185b3e186b7"],
+  ["ec9480", "ec93b0e186b7"],
+  ["ec9481", "e1848ae185b3e186b8"],
+  ["ec9481", "ec93b0e186b8"],
+  ["ec9482", "e1848ae185b3e186b9"],
+  ["ec9482", "ec93b0e186b9"],
+  ["ec9483", "e1848ae185b3e186ba"],
+  ["ec9483", "ec93b0e186ba"],
+  ["ec9484", "e1848ae185b3e186bb"],
+  ["ec9484", "ec93b0e186bb"],
+  ["ec9485", "e1848ae185b3e186bc"],
+  ["ec9485", "ec93b0e186bc"],
+  ["ec9486", "e1848ae185b3e186bd"],
+  ["ec9486", "ec93b0e186bd"],
+  ["ec9487", "e1848ae185b3e186be"],
+  ["ec9487", "ec93b0e186be"],
+  ["ec9488", "e1848ae185b3e186bf"],
+  ["ec9488", "ec93b0e186bf"],
+  ["ec9489", "e1848ae185b3e18780"],
+  ["ec9489", "ec93b0e18780"],
+  ["ec948a", "e1848ae185b3e18781"],
+  ["ec948a", "ec93b0e18781"],
+  ["ec948b", "e1848ae185b3e18782"],
+  ["ec948b", "ec93b0e18782"],
+  ["ec948c", "e1848ae185b4"],
+  ["ec948d", "e1848ae185b4e186a8"],
+  ["ec948d", "ec948ce186a8"],
+  ["ec948e", "e1848ae185b4e186a9"],
+  ["ec948e", "ec948ce186a9"],
+  ["ec948f", "e1848ae185b4e186aa"],
+  ["ec948f", "ec948ce186aa"],
+  ["ec9490", "e1848ae185b4e186ab"],
+  ["ec9490", "ec948ce186ab"],
+  ["ec9491", "e1848ae185b4e186ac"],
+  ["ec9491", "ec948ce186ac"],
+  ["ec9492", "e1848ae185b4e186ad"],
+  ["ec9492", "ec948ce186ad"],
+  ["ec9493", "e1848ae185b4e186ae"],
+  ["ec9493", "ec948ce186ae"],
+  ["ec9494", "e1848ae185b4e186af"],
+  ["ec9494", "ec948ce186af"],
+  ["ec9495", "e1848ae185b4e186b0"],
+  ["ec9495", "ec948ce186b0"],
+  ["ec9496", "e1848ae185b4e186b1"],
+  ["ec9496", "ec948ce186b1"],
+  ["ec9497", "e1848ae185b4e186b2"],
+  ["ec9497", "ec948ce186b2"],
+  ["ec9498", "e1848ae185b4e186b3"],
+  ["ec9498", "ec948ce186b3"],
+  ["ec9499", "e1848ae185b4e186b4"],
+  ["ec9499", "ec948ce186b4"],
+  ["ec949a", "e1848ae185b4e186b5"],
+  ["ec949a", "ec948ce186b5"],
+  ["ec949b", "e1848ae185b4e186b6"],
+  ["ec949b", "ec948ce186b6"],
+  ["ec949c", "e1848ae185b4e186b7"],
+  ["ec949c", "ec948ce186b7"],
+  ["ec949d", "e1848ae185b4e186b8"],
+  ["ec949d", "ec948ce186b8"],
+  ["ec949e", "e1848ae185b4e186b9"],
+  ["ec949e", "ec948ce186b9"],
+  ["ec949f", "e1848ae185b4e186ba"],
+  ["ec949f", "ec948ce186ba"],
+  ["ec94a0", "e1848ae185b4e186bb"],
+  ["ec94a0", "ec948ce186bb"],
+  ["ec94a1", "e1848ae185b4e186bc"],
+  ["ec94a1", "ec948ce186bc"],
+  ["ec94a2", "e1848ae185b4e186bd"],
+  ["ec94a2", "ec948ce186bd"],
+  ["ec94a3", "e1848ae185b4e186be"],
+  ["ec94a3", "ec948ce186be"],
+  ["ec94a4", "e1848ae185b4e186bf"],
+  ["ec94a4", "ec948ce186bf"],
+  ["ec94a5", "e1848ae185b4e18780"],
+  ["ec94a5", "ec948ce18780"],
+  ["ec94a6", "e1848ae185b4e18781"],
+  ["ec94a6", "ec948ce18781"],
+  ["ec94a7", "e1848ae185b4e18782"],
+  ["ec94a7", "ec948ce18782"],
+  ["ec94a8", "e1848ae185b5"],
+  ["ec94a9", "e1848ae185b5e186a8"],
+  ["ec94a9", "ec94a8e186a8"],
+  ["ec94aa", "e1848ae185b5e186a9"],
+  ["ec94aa", "ec94a8e186a9"],
+  ["ec94ab", "e1848ae185b5e186aa"],
+  ["ec94ab", "ec94a8e186aa"],
+  ["ec94ac", "e1848ae185b5e186ab"],
+  ["ec94ac", "ec94a8e186ab"],
+  ["ec94ad", "e1848ae185b5e186ac"],
+  ["ec94ad", "ec94a8e186ac"],
+  ["ec94ae", "e1848ae185b5e186ad"],
+  ["ec94ae", "ec94a8e186ad"],
+  ["ec94af", "e1848ae185b5e186ae"],
+  ["ec94af", "ec94a8e186ae"],
+  ["ec94b0", "e1848ae185b5e186af"],
+  ["ec94b0", "ec94a8e186af"],
+  ["ec94b1", "e1848ae185b5e186b0"],
+  ["ec94b1", "ec94a8e186b0"],
+  ["ec94b2", "e1848ae185b5e186b1"],
+  ["ec94b2", "ec94a8e186b1"],
+  ["ec94b3", "e1848ae185b5e186b2"],
+  ["ec94b3", "ec94a8e186b2"],
+  ["ec94b4", "e1848ae185b5e186b3"],
+  ["ec94b4", "ec94a8e186b3"],
+  ["ec94b5", "e1848ae185b5e186b4"],
+  ["ec94b5", "ec94a8e186b4"],
+  ["ec94b6", "e1848ae185b5e186b5"],
+  ["ec94b6", "ec94a8e186b5"],
+  ["ec94b7", "e1848ae185b5e186b6"],
+  ["ec94b7", "ec94a8e186b6"],
+  ["ec94b8", "e1848ae185b5e186b7"],
+  ["ec94b8", "ec94a8e186b7"],
+  ["ec94b9", "e1848ae185b5e186b8"],
+  ["ec94b9", "ec94a8e186b8"],
+  ["ec94ba", "e1848ae185b5e186b9"],
+  ["ec94ba", "ec94a8e186b9"],
+  ["ec94bb", "e1848ae185b5e186ba"],
+  ["ec94bb", "ec94a8e186ba"],
+  ["ec94bc", "e1848ae185b5e186bb"],
+  ["ec94bc", "ec94a8e186bb"],
+  ["ec94bd", "e1848ae185b5e186bc"],
+  ["ec94bd", "ec94a8e186bc"],
+  ["ec94be", "e1848ae185b5e186bd"],
+  ["ec94be", "ec94a8e186bd"],
+  ["ec94bf", "e1848ae185b5e186be"],
+  ["ec94bf", "ec94a8e186be"],
+  ["ec9580", "e1848ae185b5e186bf"],
+  ["ec9580", "ec94a8e186bf"],
+  ["ec9581", "e1848ae185b5e18780"],
+  ["ec9581", "ec94a8e18780"],
+  ["ec9582", "e1848ae185b5e18781"],
+  ["ec9582", "ec94a8e18781"],
+  ["ec9583", "e1848ae185b5e18782"],
+  ["ec9583", "ec94a8e18782"],
+  ["ec9584", "e1848be185a1"],
+  ["ec9585", "e1848be185a1e186a8"],
+  ["ec9585", "ec9584e186a8"],
+  ["ec9586", "e1848be185a1e186a9"],
+  ["ec9586", "ec9584e186a9"],
+  ["ec9587", "e1848be185a1e186aa"],
+  ["ec9587", "ec9584e186aa"],
+  ["ec9588", "e1848be185a1e186ab"],
+  ["ec9588", "ec9584e186ab"],
+  ["ec9589", "e1848be185a1e186ac"],
+  ["ec9589", "ec9584e186ac"],
+  ["ec958a", "e1848be185a1e186ad"],
+  ["ec958a", "ec9584e186ad"],
+  ["ec958b", "e1848be185a1e186ae"],
+  ["ec958b", "ec9584e186ae"],
+  ["ec958c", "e1848be185a1e186af"],
+  ["ec958c", "ec9584e186af"],
+  ["ec958d", "e1848be185a1e186b0"],
+  ["ec958d", "ec9584e186b0"],
+  ["ec958e", "e1848be185a1e186b1"],
+  ["ec958e", "ec9584e186b1"],
+  ["ec958f", "e1848be185a1e186b2"],
+  ["ec958f", "ec9584e186b2"],
+  ["ec9590", "e1848be185a1e186b3"],
+  ["ec9590", "ec9584e186b3"],
+  ["ec9591", "e1848be185a1e186b4"],
+  ["ec9591", "ec9584e186b4"],
+  ["ec9592", "e1848be185a1e186b5"],
+  ["ec9592", "ec9584e186b5"],
+  ["ec9593", "e1848be185a1e186b6"],
+  ["ec9593", "ec9584e186b6"],
+  ["ec9594", "e1848be185a1e186b7"],
+  ["ec9594", "ec9584e186b7"],
+  ["ec9595", "e1848be185a1e186b8"],
+  ["ec9595", "ec9584e186b8"],
+  ["ec9596", "e1848be185a1e186b9"],
+  ["ec9596", "ec9584e186b9"],
+  ["ec9597", "e1848be185a1e186ba"],
+  ["ec9597", "ec9584e186ba"],
+  ["ec9598", "e1848be185a1e186bb"],
+  ["ec9598", "ec9584e186bb"],
+  ["ec9599", "e1848be185a1e186bc"],
+  ["ec9599", "ec9584e186bc"],
+  ["ec959a", "e1848be185a1e186bd"],
+  ["ec959a", "ec9584e186bd"],
+  ["ec959b", "e1848be185a1e186be"],
+  ["ec959b", "ec9584e186be"],
+  ["ec959c", "e1848be185a1e186bf"],
+  ["ec959c", "ec9584e186bf"],
+  ["ec959d", "e1848be185a1e18780"],
+  ["ec959d", "ec9584e18780"],
+  ["ec959e", "e1848be185a1e18781"],
+  ["ec959e", "ec9584e18781"],
+  ["ec959f", "e1848be185a1e18782"],
+  ["ec959f", "ec9584e18782"],
+  ["ec95a0", "e1848be185a2"],
+  ["ec95a1", "e1848be185a2e186a8"],
+  ["ec95a1", "ec95a0e186a8"],
+  ["ec95a2", "e1848be185a2e186a9"],
+  ["ec95a2", "ec95a0e186a9"],
+  ["ec95a3", "e1848be185a2e186aa"],
+  ["ec95a3", "ec95a0e186aa"],
+  ["ec95a4", "e1848be185a2e186ab"],
+  ["ec95a4", "ec95a0e186ab"],
+  ["ec95a5", "e1848be185a2e186ac"],
+  ["ec95a5", "ec95a0e186ac"],
+  ["ec95a6", "e1848be185a2e186ad"],
+  ["ec95a6", "ec95a0e186ad"],
+  ["ec95a7", "e1848be185a2e186ae"],
+  ["ec95a7", "ec95a0e186ae"],
+  ["ec95a8", "e1848be185a2e186af"],
+  ["ec95a8", "ec95a0e186af"],
+  ["ec95a9", "e1848be185a2e186b0"],
+  ["ec95a9", "ec95a0e186b0"],
+  ["ec95aa", "e1848be185a2e186b1"],
+  ["ec95aa", "ec95a0e186b1"],
+  ["ec95ab", "e1848be185a2e186b2"],
+  ["ec95ab", "ec95a0e186b2"],
+  ["ec95ac", "e1848be185a2e186b3"],
+  ["ec95ac", "ec95a0e186b3"],
+  ["ec95ad", "e1848be185a2e186b4"],
+  ["ec95ad", "ec95a0e186b4"],
+  ["ec95ae", "e1848be185a2e186b5"],
+  ["ec95ae", "ec95a0e186b5"],
+  ["ec95af", "e1848be185a2e186b6"],
+  ["ec95af", "ec95a0e186b6"],
+  ["ec95b0", "e1848be185a2e186b7"],
+  ["ec95b0", "ec95a0e186b7"],
+  ["ec95b1", "e1848be185a2e186b8"],
+  ["ec95b1", "ec95a0e186b8"],
+  ["ec95b2", "e1848be185a2e186b9"],
+  ["ec95b2", "ec95a0e186b9"],
+  ["ec95b3", "e1848be185a2e186ba"],
+  ["ec95b3", "ec95a0e186ba"],
+  ["ec95b4", "e1848be185a2e186bb"],
+  ["ec95b4", "ec95a0e186bb"],
+  ["ec95b5", "e1848be185a2e186bc"],
+  ["ec95b5", "ec95a0e186bc"],
+  ["ec95b6", "e1848be185a2e186bd"],
+  ["ec95b6", "ec95a0e186bd"],
+  ["ec95b7", "e1848be185a2e186be"],
+  ["ec95b7", "ec95a0e186be"],
+  ["ec95b8", "e1848be185a2e186bf"],
+  ["ec95b8", "ec95a0e186bf"],
+  ["ec95b9", "e1848be185a2e18780"],
+  ["ec95b9", "ec95a0e18780"],
+  ["ec95ba", "e1848be185a2e18781"],
+  ["ec95ba", "ec95a0e18781"],
+  ["ec95bb", "e1848be185a2e18782"],
+  ["ec95bb", "ec95a0e18782"],
+  ["ec95bc", "e1848be185a3"],
+  ["ec95bd", "e1848be185a3e186a8"],
+  ["ec95bd", "ec95bce186a8"],
+  ["ec95be", "e1848be185a3e186a9"],
+  ["ec95be", "ec95bce186a9"],
+  ["ec95bf", "e1848be185a3e186aa"],
+  ["ec95bf", "ec95bce186aa"],
+  ["ec9680", "e1848be185a3e186ab"],
+  ["ec9680", "ec95bce186ab"],
+  ["ec9681", "e1848be185a3e186ac"],
+  ["ec9681", "ec95bce186ac"],
+  ["ec9682", "e1848be185a3e186ad"],
+  ["ec9682", "ec95bce186ad"],
+  ["ec9683", "e1848be185a3e186ae"],
+  ["ec9683", "ec95bce186ae"],
+  ["ec9684", "e1848be185a3e186af"],
+  ["ec9684", "ec95bce186af"],
+  ["ec9685", "e1848be185a3e186b0"],
+  ["ec9685", "ec95bce186b0"],
+  ["ec9686", "e1848be185a3e186b1"],
+  ["ec9686", "ec95bce186b1"],
+  ["ec9687", "e1848be185a3e186b2"],
+  ["ec9687", "ec95bce186b2"],
+  ["ec9688", "e1848be185a3e186b3"],
+  ["ec9688", "ec95bce186b3"],
+  ["ec9689", "e1848be185a3e186b4"],
+  ["ec9689", "ec95bce186b4"],
+  ["ec968a", "e1848be185a3e186b5"],
+  ["ec968a", "ec95bce186b5"],
+  ["ec968b", "e1848be185a3e186b6"],
+  ["ec968b", "ec95bce186b6"],
+  ["ec968c", "e1848be185a3e186b7"],
+  ["ec968c", "ec95bce186b7"],
+  ["ec968d", "e1848be185a3e186b8"],
+  ["ec968d", "ec95bce186b8"],
+  ["ec968e", "e1848be185a3e186b9"],
+  ["ec968e", "ec95bce186b9"],
+  ["ec968f", "e1848be185a3e186ba"],
+  ["ec968f", "ec95bce186ba"],
+  ["ec9690", "e1848be185a3e186bb"],
+  ["ec9690", "ec95bce186bb"],
+  ["ec9691", "e1848be185a3e186bc"],
+  ["ec9691", "ec95bce186bc"],
+  ["ec9692", "e1848be185a3e186bd"],
+  ["ec9692", "ec95bce186bd"],
+  ["ec9693", "e1848be185a3e186be"],
+  ["ec9693", "ec95bce186be"],
+  ["ec9694", "e1848be185a3e186bf"],
+  ["ec9694", "ec95bce186bf"],
+  ["ec9695", "e1848be185a3e18780"],
+  ["ec9695", "ec95bce18780"],
+  ["ec9696", "e1848be185a3e18781"],
+  ["ec9696", "ec95bce18781"],
+  ["ec9697", "e1848be185a3e18782"],
+  ["ec9697", "ec95bce18782"],
+  ["ec9698", "e1848be185a4"],
+  ["ec9699", "e1848be185a4e186a8"],
+  ["ec9699", "ec9698e186a8"],
+  ["ec969a", "e1848be185a4e186a9"],
+  ["ec969a", "ec9698e186a9"],
+  ["ec969b", "e1848be185a4e186aa"],
+  ["ec969b", "ec9698e186aa"],
+  ["ec969c", "e1848be185a4e186ab"],
+  ["ec969c", "ec9698e186ab"],
+  ["ec969d", "e1848be185a4e186ac"],
+  ["ec969d", "ec9698e186ac"],
+  ["ec969e", "e1848be185a4e186ad"],
+  ["ec969e", "ec9698e186ad"],
+  ["ec969f", "e1848be185a4e186ae"],
+  ["ec969f", "ec9698e186ae"],
+  ["ec96a0", "e1848be185a4e186af"],
+  ["ec96a0", "ec9698e186af"],
+  ["ec96a1", "e1848be185a4e186b0"],
+  ["ec96a1", "ec9698e186b0"],
+  ["ec96a2", "e1848be185a4e186b1"],
+  ["ec96a2", "ec9698e186b1"],
+  ["ec96a3", "e1848be185a4e186b2"],
+  ["ec96a3", "ec9698e186b2"],
+  ["ec96a4", "e1848be185a4e186b3"],
+  ["ec96a4", "ec9698e186b3"],
+  ["ec96a5", "e1848be185a4e186b4"],
+  ["ec96a5", "ec9698e186b4"],
+  ["ec96a6", "e1848be185a4e186b5"],
+  ["ec96a6", "ec9698e186b5"],
+  ["ec96a7", "e1848be185a4e186b6"],
+  ["ec96a7", "ec9698e186b6"],
+  ["ec96a8", "e1848be185a4e186b7"],
+  ["ec96a8", "ec9698e186b7"],
+  ["ec96a9", "e1848be185a4e186b8"],
+  ["ec96a9", "ec9698e186b8"],
+  ["ec96aa", "e1848be185a4e186b9"],
+  ["ec96aa", "ec9698e186b9"],
+  ["ec96ab", "e1848be185a4e186ba"],
+  ["ec96ab", "ec9698e186ba"],
+  ["ec96ac", "e1848be185a4e186bb"],
+  ["ec96ac", "ec9698e186bb"],
+  ["ec96ad", "e1848be185a4e186bc"],
+  ["ec96ad", "ec9698e186bc"],
+  ["ec96ae", "e1848be185a4e186bd"],
+  ["ec96ae", "ec9698e186bd"],
+  ["ec96af", "e1848be185a4e186be"],
+  ["ec96af", "ec9698e186be"],
+  ["ec96b0", "e1848be185a4e186bf"],
+  ["ec96b0", "ec9698e186bf"],
+  ["ec96b1", "e1848be185a4e18780"],
+  ["ec96b1", "ec9698e18780"],
+  ["ec96b2", "e1848be185a4e18781"],
+  ["ec96b2", "ec9698e18781"],
+  ["ec96b3", "e1848be185a4e18782"],
+  ["ec96b3", "ec9698e18782"],
+  ["ec96b4", "e1848be185a5"],
+  ["ec96b5", "e1848be185a5e186a8"],
+  ["ec96b5", "ec96b4e186a8"],
+  ["ec96b6", "e1848be185a5e186a9"],
+  ["ec96b6", "ec96b4e186a9"],
+  ["ec96b7", "e1848be185a5e186aa"],
+  ["ec96b7", "ec96b4e186aa"],
+  ["ec96b8", "e1848be185a5e186ab"],
+  ["ec96b8", "ec96b4e186ab"],
+  ["ec96b9", "e1848be185a5e186ac"],
+  ["ec96b9", "ec96b4e186ac"],
+  ["ec96ba", "e1848be185a5e186ad"],
+  ["ec96ba", "ec96b4e186ad"],
+  ["ec96bb", "e1848be185a5e186ae"],
+  ["ec96bb", "ec96b4e186ae"],
+  ["ec96bc", "e1848be185a5e186af"],
+  ["ec96bc", "ec96b4e186af"],
+  ["ec96bd", "e1848be185a5e186b0"],
+  ["ec96bd", "ec96b4e186b0"],
+  ["ec96be", "e1848be185a5e186b1"],
+  ["ec96be", "ec96b4e186b1"],
+  ["ec96bf", "e1848be185a5e186b2"],
+  ["ec96bf", "ec96b4e186b2"],
+  ["ec9780", "e1848be185a5e186b3"],
+  ["ec9780", "ec96b4e186b3"],
+  ["ec9781", "e1848be185a5e186b4"],
+  ["ec9781", "ec96b4e186b4"],
+  ["ec9782", "e1848be185a5e186b5"],
+  ["ec9782", "ec96b4e186b5"],
+  ["ec9783", "e1848be185a5e186b6"],
+  ["ec9783", "ec96b4e186b6"],
+  ["ec9784", "e1848be185a5e186b7"],
+  ["ec9784", "ec96b4e186b7"],
+  ["ec9785", "e1848be185a5e186b8"],
+  ["ec9785", "ec96b4e186b8"],
+  ["ec9786", "e1848be185a5e186b9"],
+  ["ec9786", "ec96b4e186b9"],
+  ["ec9787", "e1848be185a5e186ba"],
+  ["ec9787", "ec96b4e186ba"],
+  ["ec9788", "e1848be185a5e186bb"],
+  ["ec9788", "ec96b4e186bb"],
+  ["ec9789", "e1848be185a5e186bc"],
+  ["ec9789", "ec96b4e186bc"],
+  ["ec978a", "e1848be185a5e186bd"],
+  ["ec978a", "ec96b4e186bd"],
+  ["ec978b", "e1848be185a5e186be"],
+  ["ec978b", "ec96b4e186be"],
+  ["ec978c", "e1848be185a5e186bf"],
+  ["ec978c", "ec96b4e186bf"],
+  ["ec978d", "e1848be185a5e18780"],
+  ["ec978d", "ec96b4e18780"],
+  ["ec978e", "e1848be185a5e18781"],
+  ["ec978e", "ec96b4e18781"],
+  ["ec978f", "e1848be185a5e18782"],
+  ["ec978f", "ec96b4e18782"],
+  ["ec9790", "e1848be185a6"],
+  ["ec9791", "e1848be185a6e186a8"],
+  ["ec9791", "ec9790e186a8"],
+  ["ec9792", "e1848be185a6e186a9"],
+  ["ec9792", "ec9790e186a9"],
+  ["ec9793", "e1848be185a6e186aa"],
+  ["ec9793", "ec9790e186aa"],
+  ["ec9794", "e1848be185a6e186ab"],
+  ["ec9794", "ec9790e186ab"],
+  ["ec9795", "e1848be185a6e186ac"],
+  ["ec9795", "ec9790e186ac"],
+  ["ec9796", "e1848be185a6e186ad"],
+  ["ec9796", "ec9790e186ad"],
+  ["ec9797", "e1848be185a6e186ae"],
+  ["ec9797", "ec9790e186ae"],
+  ["ec9798", "e1848be185a6e186af"],
+  ["ec9798", "ec9790e186af"],
+  ["ec9799", "e1848be185a6e186b0"],
+  ["ec9799", "ec9790e186b0"],
+  ["ec979a", "e1848be185a6e186b1"],
+  ["ec979a", "ec9790e186b1"],
+  ["ec979b", "e1848be185a6e186b2"],
+  ["ec979b", "ec9790e186b2"],
+  ["ec979c", "e1848be185a6e186b3"],
+  ["ec979c", "ec9790e186b3"],
+  ["ec979d", "e1848be185a6e186b4"],
+  ["ec979d", "ec9790e186b4"],
+  ["ec979e", "e1848be185a6e186b5"],
+  ["ec979e", "ec9790e186b5"],
+  ["ec979f", "e1848be185a6e186b6"],
+  ["ec979f", "ec9790e186b6"],
+  ["ec97a0", "e1848be185a6e186b7"],
+  ["ec97a0", "ec9790e186b7"],
+  ["ec97a1", "e1848be185a6e186b8"],
+  ["ec97a1", "ec9790e186b8"],
+  ["ec97a2", "e1848be185a6e186b9"],
+  ["ec97a2", "ec9790e186b9"],
+  ["ec97a3", "e1848be185a6e186ba"],
+  ["ec97a3", "ec9790e186ba"],
+  ["ec97a4", "e1848be185a6e186bb"],
+  ["ec97a4", "ec9790e186bb"],
+  ["ec97a5", "e1848be185a6e186bc"],
+  ["ec97a5", "ec9790e186bc"],
+  ["ec97a6", "e1848be185a6e186bd"],
+  ["ec97a6", "ec9790e186bd"],
+  ["ec97a7", "e1848be185a6e186be"],
+  ["ec97a7", "ec9790e186be"],
+  ["ec97a8", "e1848be185a6e186bf"],
+  ["ec97a8", "ec9790e186bf"],
+  ["ec97a9", "e1848be185a6e18780"],
+  ["ec97a9", "ec9790e18780"],
+  ["ec97aa", "e1848be185a6e18781"],
+  ["ec97aa", "ec9790e18781"],
+  ["ec97ab", "e1848be185a6e18782"],
+  ["ec97ab", "ec9790e18782"],
+  ["ec97ac", "e1848be185a7"],
+  ["ec97ad", "e1848be185a7e186a8"],
+  ["ec97ad", "ec97ace186a8"],
+  ["ec97ae", "e1848be185a7e186a9"],
+  ["ec97ae", "ec97ace186a9"],
+  ["ec97af", "e1848be185a7e186aa"],
+  ["ec97af", "ec97ace186aa"],
+  ["ec97b0", "e1848be185a7e186ab"],
+  ["ec97b0", "ec97ace186ab"],
+  ["ec97b1", "e1848be185a7e186ac"],
+  ["ec97b1", "ec97ace186ac"],
+  ["ec97b2", "e1848be185a7e186ad"],
+  ["ec97b2", "ec97ace186ad"],
+  ["ec97b3", "e1848be185a7e186ae"],
+  ["ec97b3", "ec97ace186ae"],
+  ["ec97b4", "e1848be185a7e186af"],
+  ["ec97b4", "ec97ace186af"],
+  ["ec97b5", "e1848be185a7e186b0"],
+  ["ec97b5", "ec97ace186b0"],
+  ["ec97b6", "e1848be185a7e186b1"],
+  ["ec97b6", "ec97ace186b1"],
+  ["ec97b7", "e1848be185a7e186b2"],
+  ["ec97b7", "ec97ace186b2"],
+  ["ec97b8", "e1848be185a7e186b3"],
+  ["ec97b8", "ec97ace186b3"],
+  ["ec97b9", "e1848be185a7e186b4"],
+  ["ec97b9", "ec97ace186b4"],
+  ["ec97ba", "e1848be185a7e186b5"],
+  ["ec97ba", "ec97ace186b5"],
+  ["ec97bb", "e1848be185a7e186b6"],
+  ["ec97bb", "ec97ace186b6"],
+  ["ec97bc", "e1848be185a7e186b7"],
+  ["ec97bc", "ec97ace186b7"],
+  ["ec97bd", "e1848be185a7e186b8"],
+  ["ec97bd", "ec97ace186b8"],
+  ["ec97be", "e1848be185a7e186b9"],
+  ["ec97be", "ec97ace186b9"],
+  ["ec97bf", "e1848be185a7e186ba"],
+  ["ec97bf", "ec97ace186ba"],
+  ["ec9880", "e1848be185a7e186bb"],
+  ["ec9880", "ec97ace186bb"],
+  ["ec9881", "e1848be185a7e186bc"],
+  ["ec9881", "ec97ace186bc"],
+  ["ec9882", "e1848be185a7e186bd"],
+  ["ec9882", "ec97ace186bd"],
+  ["ec9883", "e1848be185a7e186be"],
+  ["ec9883", "ec97ace186be"],
+  ["ec9884", "e1848be185a7e186bf"],
+  ["ec9884", "ec97ace186bf"],
+  ["ec9885", "e1848be185a7e18780"],
+  ["ec9885", "ec97ace18780"],
+  ["ec9886", "e1848be185a7e18781"],
+  ["ec9886", "ec97ace18781"],
+  ["ec9887", "e1848be185a7e18782"],
+  ["ec9887", "ec97ace18782"],
+  ["ec9888", "e1848be185a8"],
+  ["ec9889", "e1848be185a8e186a8"],
+  ["ec9889", "ec9888e186a8"],
+  ["ec988a", "e1848be185a8e186a9"],
+  ["ec988a", "ec9888e186a9"],
+  ["ec988b", "e1848be185a8e186aa"],
+  ["ec988b", "ec9888e186aa"],
+  ["ec988c", "e1848be185a8e186ab"],
+  ["ec988c", "ec9888e186ab"],
+  ["ec988d", "e1848be185a8e186ac"],
+  ["ec988d", "ec9888e186ac"],
+  ["ec988e", "e1848be185a8e186ad"],
+  ["ec988e", "ec9888e186ad"],
+  ["ec988f", "e1848be185a8e186ae"],
+  ["ec988f", "ec9888e186ae"],
+  ["ec9890", "e1848be185a8e186af"],
+  ["ec9890", "ec9888e186af"],
+  ["ec9891", "e1848be185a8e186b0"],
+  ["ec9891", "ec9888e186b0"],
+  ["ec9892", "e1848be185a8e186b1"],
+  ["ec9892", "ec9888e186b1"],
+  ["ec9893", "e1848be185a8e186b2"],
+  ["ec9893", "ec9888e186b2"],
+  ["ec9894", "e1848be185a8e186b3"],
+  ["ec9894", "ec9888e186b3"],
+  ["ec9895", "e1848be185a8e186b4"],
+  ["ec9895", "ec9888e186b4"],
+  ["ec9896", "e1848be185a8e186b5"],
+  ["ec9896", "ec9888e186b5"],
+  ["ec9897", "e1848be185a8e186b6"],
+  ["ec9897", "ec9888e186b6"],
+  ["ec9898", "e1848be185a8e186b7"],
+  ["ec9898", "ec9888e186b7"],
+  ["ec9899", "e1848be185a8e186b8"],
+  ["ec9899", "ec9888e186b8"],
+  ["ec989a", "e1848be185a8e186b9"],
+  ["ec989a", "ec9888e186b9"],
+  ["ec989b", "e1848be185a8e186ba"],
+  ["ec989b", "ec9888e186ba"],
+  ["ec989c", "e1848be185a8e186bb"],
+  ["ec989c", "ec9888e186bb"],
+  ["ec989d", "e1848be185a8e186bc"],
+  ["ec989d", "ec9888e186bc"],
+  ["ec989e", "e1848be185a8e186bd"],
+  ["ec989e", "ec9888e186bd"],
+  ["ec989f", "e1848be185a8e186be"],
+  ["ec989f", "ec9888e186be"],
+  ["ec98a0", "e1848be185a8e186bf"],
+  ["ec98a0", "ec9888e186bf"],
+  ["ec98a1", "e1848be185a8e18780"],
+  ["ec98a1", "ec9888e18780"],
+  ["ec98a2", "e1848be185a8e18781"],
+  ["ec98a2", "ec9888e18781"],
+  ["ec98a3", "e1848be185a8e18782"],
+  ["ec98a3", "ec9888e18782"],
+  ["ec98a4", "e1848be185a9"],
+  ["ec98a5", "e1848be185a9e186a8"],
+  ["ec98a5", "ec98a4e186a8"],
+  ["ec98a6", "e1848be185a9e186a9"],
+  ["ec98a6", "ec98a4e186a9"],
+  ["ec98a7", "e1848be185a9e186aa"],
+  ["ec98a7", "ec98a4e186aa"],
+  ["ec98a8", "e1848be185a9e186ab"],
+  ["ec98a8", "ec98a4e186ab"],
+  ["ec98a9", "e1848be185a9e186ac"],
+  ["ec98a9", "ec98a4e186ac"],
+  ["ec98aa", "e1848be185a9e186ad"],
+  ["ec98aa", "ec98a4e186ad"],
+  ["ec98ab", "e1848be185a9e186ae"],
+  ["ec98ab", "ec98a4e186ae"],
+  ["ec98ac", "e1848be185a9e186af"],
+  ["ec98ac", "ec98a4e186af"],
+  ["ec98ad", "e1848be185a9e186b0"],
+  ["ec98ad", "ec98a4e186b0"],
+  ["ec98ae", "e1848be185a9e186b1"],
+  ["ec98ae", "ec98a4e186b1"],
+  ["ec98af", "e1848be185a9e186b2"],
+  ["ec98af", "ec98a4e186b2"],
+  ["ec98b0", "e1848be185a9e186b3"],
+  ["ec98b0", "ec98a4e186b3"],
+  ["ec98b1", "e1848be185a9e186b4"],
+  ["ec98b1", "ec98a4e186b4"],
+  ["ec98b2", "e1848be185a9e186b5"],
+  ["ec98b2", "ec98a4e186b5"],
+  ["ec98b3", "e1848be185a9e186b6"],
+  ["ec98b3", "ec98a4e186b6"],
+  ["ec98b4", "e1848be185a9e186b7"],
+  ["ec98b4", "ec98a4e186b7"],
+  ["ec98b5", "e1848be185a9e186b8"],
+  ["ec98b5", "ec98a4e186b8"],
+  ["ec98b6", "e1848be185a9e186b9"],
+  ["ec98b6", "ec98a4e186b9"],
+  ["ec98b7", "e1848be185a9e186ba"],
+  ["ec98b7", "ec98a4e186ba"],
+  ["ec98b8", "e1848be185a9e186bb"],
+  ["ec98b8", "ec98a4e186bb"],
+  ["ec98b9", "e1848be185a9e186bc"],
+  ["ec98b9", "ec98a4e186bc"],
+  ["ec98ba", "e1848be185a9e186bd"],
+  ["ec98ba", "ec98a4e186bd"],
+  ["ec98bb", "e1848be185a9e186be"],
+  ["ec98bb", "ec98a4e186be"],
+  ["ec98bc", "e1848be185a9e186bf"],
+  ["ec98bc", "ec98a4e186bf"],
+  ["ec98bd", "e1848be185a9e18780"],
+  ["ec98bd", "ec98a4e18780"],
+  ["ec98be", "e1848be185a9e18781"],
+  ["ec98be", "ec98a4e18781"],
+  ["ec98bf", "e1848be185a9e18782"],
+  ["ec98bf", "ec98a4e18782"],
+  ["ec9980", "e1848be185aa"],
+  ["ec9981", "e1848be185aae186a8"],
+  ["ec9981", "ec9980e186a8"],
+  ["ec9982", "e1848be185aae186a9"],
+  ["ec9982", "ec9980e186a9"],
+  ["ec9983", "e1848be185aae186aa"],
+  ["ec9983", "ec9980e186aa"],
+  ["ec9984", "e1848be185aae186ab"],
+  ["ec9984", "ec9980e186ab"],
+  ["ec9985", "e1848be185aae186ac"],
+  ["ec9985", "ec9980e186ac"],
+  ["ec9986", "e1848be185aae186ad"],
+  ["ec9986", "ec9980e186ad"],
+  ["ec9987", "e1848be185aae186ae"],
+  ["ec9987", "ec9980e186ae"],
+  ["ec9988", "e1848be185aae186af"],
+  ["ec9988", "ec9980e186af"],
+  ["ec9989", "e1848be185aae186b0"],
+  ["ec9989", "ec9980e186b0"],
+  ["ec998a", "e1848be185aae186b1"],
+  ["ec998a", "ec9980e186b1"],
+  ["ec998b", "e1848be185aae186b2"],
+  ["ec998b", "ec9980e186b2"],
+  ["ec998c", "e1848be185aae186b3"],
+  ["ec998c", "ec9980e186b3"],
+  ["ec998d", "e1848be185aae186b4"],
+  ["ec998d", "ec9980e186b4"],
+  ["ec998e", "e1848be185aae186b5"],
+  ["ec998e", "ec9980e186b5"],
+  ["ec998f", "e1848be185aae186b6"],
+  ["ec998f", "ec9980e186b6"],
+  ["ec9990", "e1848be185aae186b7"],
+  ["ec9990", "ec9980e186b7"],
+  ["ec9991", "e1848be185aae186b8"],
+  ["ec9991", "ec9980e186b8"],
+  ["ec9992", "e1848be185aae186b9"],
+  ["ec9992", "ec9980e186b9"],
+  ["ec9993", "e1848be185aae186ba"],
+  ["ec9993", "ec9980e186ba"],
+  ["ec9994", "e1848be185aae186bb"],
+  ["ec9994", "ec9980e186bb"],
+  ["ec9995", "e1848be185aae186bc"],
+  ["ec9995", "ec9980e186bc"],
+  ["ec9996", "e1848be185aae186bd"],
+  ["ec9996", "ec9980e186bd"],
+  ["ec9997", "e1848be185aae186be"],
+  ["ec9997", "ec9980e186be"],
+  ["ec9998", "e1848be185aae186bf"],
+  ["ec9998", "ec9980e186bf"],
+  ["ec9999", "e1848be185aae18780"],
+  ["ec9999", "ec9980e18780"],
+  ["ec999a", "e1848be185aae18781"],
+  ["ec999a", "ec9980e18781"],
+  ["ec999b", "e1848be185aae18782"],
+  ["ec999b", "ec9980e18782"],
+  ["ec999c", "e1848be185ab"],
+  ["ec999d", "e1848be185abe186a8"],
+  ["ec999d", "ec999ce186a8"],
+  ["ec999e", "e1848be185abe186a9"],
+  ["ec999e", "ec999ce186a9"],
+  ["ec999f", "e1848be185abe186aa"],
+  ["ec999f", "ec999ce186aa"],
+  ["ec99a0", "e1848be185abe186ab"],
+  ["ec99a0", "ec999ce186ab"],
+  ["ec99a1", "e1848be185abe186ac"],
+  ["ec99a1", "ec999ce186ac"],
+  ["ec99a2", "e1848be185abe186ad"],
+  ["ec99a2", "ec999ce186ad"],
+  ["ec99a3", "e1848be185abe186ae"],
+  ["ec99a3", "ec999ce186ae"],
+  ["ec99a4", "e1848be185abe186af"],
+  ["ec99a4", "ec999ce186af"],
+  ["ec99a5", "e1848be185abe186b0"],
+  ["ec99a5", "ec999ce186b0"],
+  ["ec99a6", "e1848be185abe186b1"],
+  ["ec99a6", "ec999ce186b1"],
+  ["ec99a7", "e1848be185abe186b2"],
+  ["ec99a7", "ec999ce186b2"],
+  ["ec99a8", "e1848be185abe186b3"],
+  ["ec99a8", "ec999ce186b3"],
+  ["ec99a9", "e1848be185abe186b4"],
+  ["ec99a9", "ec999ce186b4"],
+  ["ec99aa", "e1848be185abe186b5"],
+  ["ec99aa", "ec999ce186b5"],
+  ["ec99ab", "e1848be185abe186b6"],
+  ["ec99ab", "ec999ce186b6"],
+  ["ec99ac", "e1848be185abe186b7"],
+  ["ec99ac", "ec999ce186b7"],
+  ["ec99ad", "e1848be185abe186b8"],
+  ["ec99ad", "ec999ce186b8"],
+  ["ec99ae", "e1848be185abe186b9"],
+  ["ec99ae", "ec999ce186b9"],
+  ["ec99af", "e1848be185abe186ba"],
+  ["ec99af", "ec999ce186ba"],
+  ["ec99b0", "e1848be185abe186bb"],
+  ["ec99b0", "ec999ce186bb"],
+  ["ec99b1", "e1848be185abe186bc"],
+  ["ec99b1", "ec999ce186bc"],
+  ["ec99b2", "e1848be185abe186bd"],
+  ["ec99b2", "ec999ce186bd"],
+  ["ec99b3", "e1848be185abe186be"],
+  ["ec99b3", "ec999ce186be"],
+  ["ec99b4", "e1848be185abe186bf"],
+  ["ec99b4", "ec999ce186bf"],
+  ["ec99b5", "e1848be185abe18780"],
+  ["ec99b5", "ec999ce18780"],
+  ["ec99b6", "e1848be185abe18781"],
+  ["ec99b6", "ec999ce18781"],
+  ["ec99b7", "e1848be185abe18782"],
+  ["ec99b7", "ec999ce18782"],
+  ["ec99b8", "e1848be185ac"],
+  ["ec99b9", "e1848be185ace186a8"],
+  ["ec99b9", "ec99b8e186a8"],
+  ["ec99ba", "e1848be185ace186a9"],
+  ["ec99ba", "ec99b8e186a9"],
+  ["ec99bb", "e1848be185ace186aa"],
+  ["ec99bb", "ec99b8e186aa"],
+  ["ec99bc", "e1848be185ace186ab"],
+  ["ec99bc", "ec99b8e186ab"],
+  ["ec99bd", "e1848be185ace186ac"],
+  ["ec99bd", "ec99b8e186ac"],
+  ["ec99be", "e1848be185ace186ad"],
+  ["ec99be", "ec99b8e186ad"],
+  ["ec99bf", "e1848be185ace186ae"],
+  ["ec99bf", "ec99b8e186ae"],
+  ["ec9a80", "e1848be185ace186af"],
+  ["ec9a80", "ec99b8e186af"],
+  ["ec9a81", "e1848be185ace186b0"],
+  ["ec9a81", "ec99b8e186b0"],
+  ["ec9a82", "e1848be185ace186b1"],
+  ["ec9a82", "ec99b8e186b1"],
+  ["ec9a83", "e1848be185ace186b2"],
+  ["ec9a83", "ec99b8e186b2"],
+  ["ec9a84", "e1848be185ace186b3"],
+  ["ec9a84", "ec99b8e186b3"],
+  ["ec9a85", "e1848be185ace186b4"],
+  ["ec9a85", "ec99b8e186b4"],
+  ["ec9a86", "e1848be185ace186b5"],
+  ["ec9a86", "ec99b8e186b5"],
+  ["ec9a87", "e1848be185ace186b6"],
+  ["ec9a87", "ec99b8e186b6"],
+  ["ec9a88", "e1848be185ace186b7"],
+  ["ec9a88", "ec99b8e186b7"],
+  ["ec9a89", "e1848be185ace186b8"],
+  ["ec9a89", "ec99b8e186b8"],
+  ["ec9a8a", "e1848be185ace186b9"],
+  ["ec9a8a", "ec99b8e186b9"],
+  ["ec9a8b", "e1848be185ace186ba"],
+  ["ec9a8b", "ec99b8e186ba"],
+  ["ec9a8c", "e1848be185ace186bb"],
+  ["ec9a8c", "ec99b8e186bb"],
+  ["ec9a8d", "e1848be185ace186bc"],
+  ["ec9a8d", "ec99b8e186bc"],
+  ["ec9a8e", "e1848be185ace186bd"],
+  ["ec9a8e", "ec99b8e186bd"],
+  ["ec9a8f", "e1848be185ace186be"],
+  ["ec9a8f", "ec99b8e186be"],
+  ["ec9a90", "e1848be185ace186bf"],
+  ["ec9a90", "ec99b8e186bf"],
+  ["ec9a91", "e1848be185ace18780"],
+  ["ec9a91", "ec99b8e18780"],
+  ["ec9a92", "e1848be185ace18781"],
+  ["ec9a92", "ec99b8e18781"],
+  ["ec9a93", "e1848be185ace18782"],
+  ["ec9a93", "ec99b8e18782"],
+  ["ec9a94", "e1848be185ad"],
+  ["ec9a95", "e1848be185ade186a8"],
+  ["ec9a95", "ec9a94e186a8"],
+  ["ec9a96", "e1848be185ade186a9"],
+  ["ec9a96", "ec9a94e186a9"],
+  ["ec9a97", "e1848be185ade186aa"],
+  ["ec9a97", "ec9a94e186aa"],
+  ["ec9a98", "e1848be185ade186ab"],
+  ["ec9a98", "ec9a94e186ab"],
+  ["ec9a99", "e1848be185ade186ac"],
+  ["ec9a99", "ec9a94e186ac"],
+  ["ec9a9a", "e1848be185ade186ad"],
+  ["ec9a9a", "ec9a94e186ad"],
+  ["ec9a9b", "e1848be185ade186ae"],
+  ["ec9a9b", "ec9a94e186ae"],
+  ["ec9a9c", "e1848be185ade186af"],
+  ["ec9a9c", "ec9a94e186af"],
+  ["ec9a9d", "e1848be185ade186b0"],
+  ["ec9a9d", "ec9a94e186b0"],
+  ["ec9a9e", "e1848be185ade186b1"],
+  ["ec9a9e", "ec9a94e186b1"],
+  ["ec9a9f", "e1848be185ade186b2"],
+  ["ec9a9f", "ec9a94e186b2"],
+  ["ec9aa0", "e1848be185ade186b3"],
+  ["ec9aa0", "ec9a94e186b3"],
+  ["ec9aa1", "e1848be185ade186b4"],
+  ["ec9aa1", "ec9a94e186b4"],
+  ["ec9aa2", "e1848be185ade186b5"],
+  ["ec9aa2", "ec9a94e186b5"],
+  ["ec9aa3", "e1848be185ade186b6"],
+  ["ec9aa3", "ec9a94e186b6"],
+  ["ec9aa4", "e1848be185ade186b7"],
+  ["ec9aa4", "ec9a94e186b7"],
+  ["ec9aa5", "e1848be185ade186b8"],
+  ["ec9aa5", "ec9a94e186b8"],
+  ["ec9aa6", "e1848be185ade186b9"],
+  ["ec9aa6", "ec9a94e186b9"],
+  ["ec9aa7", "e1848be185ade186ba"],
+  ["ec9aa7", "ec9a94e186ba"],
+  ["ec9aa8", "e1848be185ade186bb"],
+  ["ec9aa8", "ec9a94e186bb"],
+  ["ec9aa9", "e1848be185ade186bc"],
+  ["ec9aa9", "ec9a94e186bc"],
+  ["ec9aaa", "e1848be185ade186bd"],
+  ["ec9aaa", "ec9a94e186bd"],
+  ["ec9aab", "e1848be185ade186be"],
+  ["ec9aab", "ec9a94e186be"],
+  ["ec9aac", "e1848be185ade186bf"],
+  ["ec9aac", "ec9a94e186bf"],
+  ["ec9aad", "e1848be185ade18780"],
+  ["ec9aad", "ec9a94e18780"],
+  ["ec9aae", "e1848be185ade18781"],
+  ["ec9aae", "ec9a94e18781"],
+  ["ec9aaf", "e1848be185ade18782"],
+  ["ec9aaf", "ec9a94e18782"],
+  ["ec9ab0", "e1848be185ae"],
+  ["ec9ab1", "e1848be185aee186a8"],
+  ["ec9ab1", "ec9ab0e186a8"],
+  ["ec9ab2", "e1848be185aee186a9"],
+  ["ec9ab2", "ec9ab0e186a9"],
+  ["ec9ab3", "e1848be185aee186aa"],
+  ["ec9ab3", "ec9ab0e186aa"],
+  ["ec9ab4", "e1848be185aee186ab"],
+  ["ec9ab4", "ec9ab0e186ab"],
+  ["ec9ab5", "e1848be185aee186ac"],
+  ["ec9ab5", "ec9ab0e186ac"],
+  ["ec9ab6", "e1848be185aee186ad"],
+  ["ec9ab6", "ec9ab0e186ad"],
+  ["ec9ab7", "e1848be185aee186ae"],
+  ["ec9ab7", "ec9ab0e186ae"],
+  ["ec9ab8", "e1848be185aee186af"],
+  ["ec9ab8", "ec9ab0e186af"],
+  ["ec9ab9", "e1848be185aee186b0"],
+  ["ec9ab9", "ec9ab0e186b0"],
+  ["ec9aba", "e1848be185aee186b1"],
+  ["ec9aba", "ec9ab0e186b1"],
+  ["ec9abb", "e1848be185aee186b2"],
+  ["ec9abb", "ec9ab0e186b2"],
+  ["ec9abc", "e1848be185aee186b3"],
+  ["ec9abc", "ec9ab0e186b3"],
+  ["ec9abd", "e1848be185aee186b4"],
+  ["ec9abd", "ec9ab0e186b4"],
+  ["ec9abe", "e1848be185aee186b5"],
+  ["ec9abe", "ec9ab0e186b5"],
+  ["ec9abf", "e1848be185aee186b6"],
+  ["ec9abf", "ec9ab0e186b6"],
+  ["ec9b80", "e1848be185aee186b7"],
+  ["ec9b80", "ec9ab0e186b7"],
+  ["ec9b81", "e1848be185aee186b8"],
+  ["ec9b81", "ec9ab0e186b8"],
+  ["ec9b82", "e1848be185aee186b9"],
+  ["ec9b82", "ec9ab0e186b9"],
+  ["ec9b83", "e1848be185aee186ba"],
+  ["ec9b83", "ec9ab0e186ba"],
+  ["ec9b84", "e1848be185aee186bb"],
+  ["ec9b84", "ec9ab0e186bb"],
+  ["ec9b85", "e1848be185aee186bc"],
+  ["ec9b85", "ec9ab0e186bc"],
+  ["ec9b86", "e1848be185aee186bd"],
+  ["ec9b86", "ec9ab0e186bd"],
+  ["ec9b87", "e1848be185aee186be"],
+  ["ec9b87", "ec9ab0e186be"],
+  ["ec9b88", "e1848be185aee186bf"],
+  ["ec9b88", "ec9ab0e186bf"],
+  ["ec9b89", "e1848be185aee18780"],
+  ["ec9b89", "ec9ab0e18780"],
+  ["ec9b8a", "e1848be185aee18781"],
+  ["ec9b8a", "ec9ab0e18781"],
+  ["ec9b8b", "e1848be185aee18782"],
+  ["ec9b8b", "ec9ab0e18782"],
+  ["ec9b8c", "e1848be185af"],
+  ["ec9b8d", "e1848be185afe186a8"],
+  ["ec9b8d", "ec9b8ce186a8"],
+  ["ec9b8e", "e1848be185afe186a9"],
+  ["ec9b8e", "ec9b8ce186a9"],
+  ["ec9b8f", "e1848be185afe186aa"],
+  ["ec9b8f", "ec9b8ce186aa"],
+  ["ec9b90", "e1848be185afe186ab"],
+  ["ec9b90", "ec9b8ce186ab"],
+  ["ec9b91", "e1848be185afe186ac"],
+  ["ec9b91", "ec9b8ce186ac"],
+  ["ec9b92", "e1848be185afe186ad"],
+  ["ec9b92", "ec9b8ce186ad"],
+  ["ec9b93", "e1848be185afe186ae"],
+  ["ec9b93", "ec9b8ce186ae"],
+  ["ec9b94", "e1848be185afe186af"],
+  ["ec9b94", "ec9b8ce186af"],
+  ["ec9b95", "e1848be185afe186b0"],
+  ["ec9b95", "ec9b8ce186b0"],
+  ["ec9b96", "e1848be185afe186b1"],
+  ["ec9b96", "ec9b8ce186b1"],
+  ["ec9b97", "e1848be185afe186b2"],
+  ["ec9b97", "ec9b8ce186b2"],
+  ["ec9b98", "e1848be185afe186b3"],
+  ["ec9b98", "ec9b8ce186b3"],
+  ["ec9b99", "e1848be185afe186b4"],
+  ["ec9b99", "ec9b8ce186b4"],
+  ["ec9b9a", "e1848be185afe186b5"],
+  ["ec9b9a", "ec9b8ce186b5"],
+  ["ec9b9b", "e1848be185afe186b6"],
+  ["ec9b9b", "ec9b8ce186b6"],
+  ["ec9b9c", "e1848be185afe186b7"],
+  ["ec9b9c", "ec9b8ce186b7"],
+  ["ec9b9d", "e1848be185afe186b8"],
+  ["ec9b9d", "ec9b8ce186b8"],
+  ["ec9b9e", "e1848be185afe186b9"],
+  ["ec9b9e", "ec9b8ce186b9"],
+  ["ec9b9f", "e1848be185afe186ba"],
+  ["ec9b9f", "ec9b8ce186ba"],
+  ["ec9ba0", "e1848be185afe186bb"],
+  ["ec9ba0", "ec9b8ce186bb"],
+  ["ec9ba1", "e1848be185afe186bc"],
+  ["ec9ba1", "ec9b8ce186bc"],
+  ["ec9ba2", "e1848be185afe186bd"],
+  ["ec9ba2", "ec9b8ce186bd"],
+  ["ec9ba3", "e1848be185afe186be"],
+  ["ec9ba3", "ec9b8ce186be"],
+  ["ec9ba4", "e1848be185afe186bf"],
+  ["ec9ba4", "ec9b8ce186bf"],
+  ["ec9ba5", "e1848be185afe18780"],
+  ["ec9ba5", "ec9b8ce18780"],
+  ["ec9ba6", "e1848be185afe18781"],
+  ["ec9ba6", "ec9b8ce18781"],
+  ["ec9ba7", "e1848be185afe18782"],
+  ["ec9ba7", "ec9b8ce18782"],
+  ["ec9ba8", "e1848be185b0"],
+  ["ec9ba9", "e1848be185b0e186a8"],
+  ["ec9ba9", "ec9ba8e186a8"],
+  ["ec9baa", "e1848be185b0e186a9"],
+  ["ec9baa", "ec9ba8e186a9"],
+  ["ec9bab", "e1848be185b0e186aa"],
+  ["ec9bab", "ec9ba8e186aa"],
+  ["ec9bac", "e1848be185b0e186ab"],
+  ["ec9bac", "ec9ba8e186ab"],
+  ["ec9bad", "e1848be185b0e186ac"],
+  ["ec9bad", "ec9ba8e186ac"],
+  ["ec9bae", "e1848be185b0e186ad"],
+  ["ec9bae", "ec9ba8e186ad"],
+  ["ec9baf", "e1848be185b0e186ae"],
+  ["ec9baf", "ec9ba8e186ae"],
+  ["ec9bb0", "e1848be185b0e186af"],
+  ["ec9bb0", "ec9ba8e186af"],
+  ["ec9bb1", "e1848be185b0e186b0"],
+  ["ec9bb1", "ec9ba8e186b0"],
+  ["ec9bb2", "e1848be185b0e186b1"],
+  ["ec9bb2", "ec9ba8e186b1"],
+  ["ec9bb3", "e1848be185b0e186b2"],
+  ["ec9bb3", "ec9ba8e186b2"],
+  ["ec9bb4", "e1848be185b0e186b3"],
+  ["ec9bb4", "ec9ba8e186b3"],
+  ["ec9bb5", "e1848be185b0e186b4"],
+  ["ec9bb5", "ec9ba8e186b4"],
+  ["ec9bb6", "e1848be185b0e186b5"],
+  ["ec9bb6", "ec9ba8e186b5"],
+  ["ec9bb7", "e1848be185b0e186b6"],
+  ["ec9bb7", "ec9ba8e186b6"],
+  ["ec9bb8", "e1848be185b0e186b7"],
+  ["ec9bb8", "ec9ba8e186b7"],
+  ["ec9bb9", "e1848be185b0e186b8"],
+  ["ec9bb9", "ec9ba8e186b8"],
+  ["ec9bba", "e1848be185b0e186b9"],
+  ["ec9bba", "ec9ba8e186b9"],
+  ["ec9bbb", "e1848be185b0e186ba"],
+  ["ec9bbb", "ec9ba8e186ba"],
+  ["ec9bbc", "e1848be185b0e186bb"],
+  ["ec9bbc", "ec9ba8e186bb"],
+  ["ec9bbd", "e1848be185b0e186bc"],
+  ["ec9bbd", "ec9ba8e186bc"],
+  ["ec9bbe", "e1848be185b0e186bd"],
+  ["ec9bbe", "ec9ba8e186bd"],
+  ["ec9bbf", "e1848be185b0e186be"],
+  ["ec9bbf", "ec9ba8e186be"],
+  ["ec9c80", "e1848be185b0e186bf"],
+  ["ec9c80", "ec9ba8e186bf"],
+  ["ec9c81", "e1848be185b0e18780"],
+  ["ec9c81", "ec9ba8e18780"],
+  ["ec9c82", "e1848be185b0e18781"],
+  ["ec9c82", "ec9ba8e18781"],
+  ["ec9c83", "e1848be185b0e18782"],
+  ["ec9c83", "ec9ba8e18782"],
+  ["ec9c84", "e1848be185b1"],
+  ["ec9c85", "e1848be185b1e186a8"],
+  ["ec9c85", "ec9c84e186a8"],
+  ["ec9c86", "e1848be185b1e186a9"],
+  ["ec9c86", "ec9c84e186a9"],
+  ["ec9c87", "e1848be185b1e186aa"],
+  ["ec9c87", "ec9c84e186aa"],
+  ["ec9c88", "e1848be185b1e186ab"],
+  ["ec9c88", "ec9c84e186ab"],
+  ["ec9c89", "e1848be185b1e186ac"],
+  ["ec9c89", "ec9c84e186ac"],
+  ["ec9c8a", "e1848be185b1e186ad"],
+  ["ec9c8a", "ec9c84e186ad"],
+  ["ec9c8b", "e1848be185b1e186ae"],
+  ["ec9c8b", "ec9c84e186ae"],
+  ["ec9c8c", "e1848be185b1e186af"],
+  ["ec9c8c", "ec9c84e186af"],
+  ["ec9c8d", "e1848be185b1e186b0"],
+  ["ec9c8d", "ec9c84e186b0"],
+  ["ec9c8e", "e1848be185b1e186b1"],
+  ["ec9c8e", "ec9c84e186b1"],
+  ["ec9c8f", "e1848be185b1e186b2"],
+  ["ec9c8f", "ec9c84e186b2"],
+  ["ec9c90", "e1848be185b1e186b3"],
+  ["ec9c90", "ec9c84e186b3"],
+  ["ec9c91", "e1848be185b1e186b4"],
+  ["ec9c91", "ec9c84e186b4"],
+  ["ec9c92", "e1848be185b1e186b5"],
+  ["ec9c92", "ec9c84e186b5"],
+  ["ec9c93", "e1848be185b1e186b6"],
+  ["ec9c93", "ec9c84e186b6"],
+  ["ec9c94", "e1848be185b1e186b7"],
+  ["ec9c94", "ec9c84e186b7"],
+  ["ec9c95", "e1848be185b1e186b8"],
+  ["ec9c95", "ec9c84e186b8"],
+  ["ec9c96", "e1848be185b1e186b9"],
+  ["ec9c96", "ec9c84e186b9"],
+  ["ec9c97", "e1848be185b1e186ba"],
+  ["ec9c97", "ec9c84e186ba"],
+  ["ec9c98", "e1848be185b1e186bb"],
+  ["ec9c98", "ec9c84e186bb"],
+  ["ec9c99", "e1848be185b1e186bc"],
+  ["ec9c99", "ec9c84e186bc"],
+  ["ec9c9a", "e1848be185b1e186bd"],
+  ["ec9c9a", "ec9c84e186bd"],
+  ["ec9c9b", "e1848be185b1e186be"],
+  ["ec9c9b", "ec9c84e186be"],
+  ["ec9c9c", "e1848be185b1e186bf"],
+  ["ec9c9c", "ec9c84e186bf"],
+  ["ec9c9d", "e1848be185b1e18780"],
+  ["ec9c9d", "ec9c84e18780"],
+  ["ec9c9e", "e1848be185b1e18781"],
+  ["ec9c9e", "ec9c84e18781"],
+  ["ec9c9f", "e1848be185b1e18782"],
+  ["ec9c9f", "ec9c84e18782"],
+  ["ec9ca0", "e1848be185b2"],
+  ["ec9ca1", "e1848be185b2e186a8"],
+  ["ec9ca1", "ec9ca0e186a8"],
+  ["ec9ca2", "e1848be185b2e186a9"],
+  ["ec9ca2", "ec9ca0e186a9"],
+  ["ec9ca3", "e1848be185b2e186aa"],
+  ["ec9ca3", "ec9ca0e186aa"],
+  ["ec9ca4", "e1848be185b2e186ab"],
+  ["ec9ca4", "ec9ca0e186ab"],
+  ["ec9ca5", "e1848be185b2e186ac"],
+  ["ec9ca5", "ec9ca0e186ac"],
+  ["ec9ca6", "e1848be185b2e186ad"],
+  ["ec9ca6", "ec9ca0e186ad"],
+  ["ec9ca7", "e1848be185b2e186ae"],
+  ["ec9ca7", "ec9ca0e186ae"],
+  ["ec9ca8", "e1848be185b2e186af"],
+  ["ec9ca8", "ec9ca0e186af"],
+  ["ec9ca9", "e1848be185b2e186b0"],
+  ["ec9ca9", "ec9ca0e186b0"],
+  ["ec9caa", "e1848be185b2e186b1"],
+  ["ec9caa", "ec9ca0e186b1"],
+  ["ec9cab", "e1848be185b2e186b2"],
+  ["ec9cab", "ec9ca0e186b2"],
+  ["ec9cac", "e1848be185b2e186b3"],
+  ["ec9cac", "ec9ca0e186b3"],
+  ["ec9cad", "e1848be185b2e186b4"],
+  ["ec9cad", "ec9ca0e186b4"],
+  ["ec9cae", "e1848be185b2e186b5"],
+  ["ec9cae", "ec9ca0e186b5"],
+  ["ec9caf", "e1848be185b2e186b6"],
+  ["ec9caf", "ec9ca0e186b6"],
+  ["ec9cb0", "e1848be185b2e186b7"],
+  ["ec9cb0", "ec9ca0e186b7"],
+  ["ec9cb1", "e1848be185b2e186b8"],
+  ["ec9cb1", "ec9ca0e186b8"],
+  ["ec9cb2", "e1848be185b2e186b9"],
+  ["ec9cb2", "ec9ca0e186b9"],
+  ["ec9cb3", "e1848be185b2e186ba"],
+  ["ec9cb3", "ec9ca0e186ba"],
+  ["ec9cb4", "e1848be185b2e186bb"],
+  ["ec9cb4", "ec9ca0e186bb"],
+  ["ec9cb5", "e1848be185b2e186bc"],
+  ["ec9cb5", "ec9ca0e186bc"],
+  ["ec9cb6", "e1848be185b2e186bd"],
+  ["ec9cb6", "ec9ca0e186bd"],
+  ["ec9cb7", "e1848be185b2e186be"],
+  ["ec9cb7", "ec9ca0e186be"],
+  ["ec9cb8", "e1848be185b2e186bf"],
+  ["ec9cb8", "ec9ca0e186bf"],
+  ["ec9cb9", "e1848be185b2e18780"],
+  ["ec9cb9", "ec9ca0e18780"],
+  ["ec9cba", "e1848be185b2e18781"],
+  ["ec9cba", "ec9ca0e18781"],
+  ["ec9cbb", "e1848be185b2e18782"],
+  ["ec9cbb", "ec9ca0e18782"],
+  ["ec9cbc", "e1848be185b3"],
+  ["ec9cbd", "e1848be185b3e186a8"],
+  ["ec9cbd", "ec9cbce186a8"],
+  ["ec9cbe", "e1848be185b3e186a9"],
+  ["ec9cbe", "ec9cbce186a9"],
+  ["ec9cbf", "e1848be185b3e186aa"],
+  ["ec9cbf", "ec9cbce186aa"],
+  ["ec9d80", "e1848be185b3e186ab"],
+  ["ec9d80", "ec9cbce186ab"],
+  ["ec9d81", "e1848be185b3e186ac"],
+  ["ec9d81", "ec9cbce186ac"],
+  ["ec9d82", "e1848be185b3e186ad"],
+  ["ec9d82", "ec9cbce186ad"],
+  ["ec9d83", "e1848be185b3e186ae"],
+  ["ec9d83", "ec9cbce186ae"],
+  ["ec9d84", "e1848be185b3e186af"],
+  ["ec9d84", "ec9cbce186af"],
+  ["ec9d85", "e1848be185b3e186b0"],
+  ["ec9d85", "ec9cbce186b0"],
+  ["ec9d86", "e1848be185b3e186b1"],
+  ["ec9d86", "ec9cbce186b1"],
+  ["ec9d87", "e1848be185b3e186b2"],
+  ["ec9d87", "ec9cbce186b2"],
+  ["ec9d88", "e1848be185b3e186b3"],
+  ["ec9d88", "ec9cbce186b3"],
+  ["ec9d89", "e1848be185b3e186b4"],
+  ["ec9d89", "ec9cbce186b4"],
+  ["ec9d8a", "e1848be185b3e186b5"],
+  ["ec9d8a", "ec9cbce186b5"],
+  ["ec9d8b", "e1848be185b3e186b6"],
+  ["ec9d8b", "ec9cbce186b6"],
+  ["ec9d8c", "e1848be185b3e186b7"],
+  ["ec9d8c", "ec9cbce186b7"],
+  ["ec9d8d", "e1848be185b3e186b8"],
+  ["ec9d8d", "ec9cbce186b8"],
+  ["ec9d8e", "e1848be185b3e186b9"],
+  ["ec9d8e", "ec9cbce186b9"],
+  ["ec9d8f", "e1848be185b3e186ba"],
+  ["ec9d8f", "ec9cbce186ba"],
+  ["ec9d90", "e1848be185b3e186bb"],
+  ["ec9d90", "ec9cbce186bb"],
+  ["ec9d91", "e1848be185b3e186bc"],
+  ["ec9d91", "ec9cbce186bc"],
+  ["ec9d92", "e1848be185b3e186bd"],
+  ["ec9d92", "ec9cbce186bd"],
+  ["ec9d93", "e1848be185b3e186be"],
+  ["ec9d93", "ec9cbce186be"],
+  ["ec9d94", "e1848be185b3e186bf"],
+  ["ec9d94", "ec9cbce186bf"],
+  ["ec9d95", "e1848be185b3e18780"],
+  ["ec9d95", "ec9cbce18780"],
+  ["ec9d96", "e1848be185b3e18781"],
+  ["ec9d96", "ec9cbce18781"],
+  ["ec9d97", "e1848be185b3e18782"],
+  ["ec9d97", "ec9cbce18782"],
+  ["ec9d98", "e1848be185b4"],
+  ["ec9d99", "e1848be185b4e186a8"],
+  ["ec9d99", "ec9d98e186a8"],
+  ["ec9d9a", "e1848be185b4e186a9"],
+  ["ec9d9a", "ec9d98e186a9"],
+  ["ec9d9b", "e1848be185b4e186aa"],
+  ["ec9d9b", "ec9d98e186aa"],
+  ["ec9d9c", "e1848be185b4e186ab"],
+  ["ec9d9c", "ec9d98e186ab"],
+  ["ec9d9d", "e1848be185b4e186ac"],
+  ["ec9d9d", "ec9d98e186ac"],
+  ["ec9d9e", "e1848be185b4e186ad"],
+  ["ec9d9e", "ec9d98e186ad"],
+  ["ec9d9f", "e1848be185b4e186ae"],
+  ["ec9d9f", "ec9d98e186ae"],
+  ["ec9da0", "e1848be185b4e186af"],
+  ["ec9da0", "ec9d98e186af"],
+  ["ec9da1", "e1848be185b4e186b0"],
+  ["ec9da1", "ec9d98e186b0"],
+  ["ec9da2", "e1848be185b4e186b1"],
+  ["ec9da2", "ec9d98e186b1"],
+  ["ec9da3", "e1848be185b4e186b2"],
+  ["ec9da3", "ec9d98e186b2"],
+  ["ec9da4", "e1848be185b4e186b3"],
+  ["ec9da4", "ec9d98e186b3"],
+  ["ec9da5", "e1848be185b4e186b4"],
+  ["ec9da5", "ec9d98e186b4"],
+  ["ec9da6", "e1848be185b4e186b5"],
+  ["ec9da6", "ec9d98e186b5"],
+  ["ec9da7", "e1848be185b4e186b6"],
+  ["ec9da7", "ec9d98e186b6"],
+  ["ec9da8", "e1848be185b4e186b7"],
+  ["ec9da8", "ec9d98e186b7"],
+  ["ec9da9", "e1848be185b4e186b8"],
+  ["ec9da9", "ec9d98e186b8"],
+  ["ec9daa", "e1848be185b4e186b9"],
+  ["ec9daa", "ec9d98e186b9"],
+  ["ec9dab", "e1848be185b4e186ba"],
+  ["ec9dab", "ec9d98e186ba"],
+  ["ec9dac", "e1848be185b4e186bb"],
+  ["ec9dac", "ec9d98e186bb"],
+  ["ec9dad", "e1848be185b4e186bc"],
+  ["ec9dad", "ec9d98e186bc"],
+  ["ec9dae", "e1848be185b4e186bd"],
+  ["ec9dae", "ec9d98e186bd"],
+  ["ec9daf", "e1848be185b4e186be"],
+  ["ec9daf", "ec9d98e186be"],
+  ["ec9db0", "e1848be185b4e186bf"],
+  ["ec9db0", "ec9d98e186bf"],
+  ["ec9db1", "e1848be185b4e18780"],
+  ["ec9db1", "ec9d98e18780"],
+  ["ec9db2", "e1848be185b4e18781"],
+  ["ec9db2", "ec9d98e18781"],
+  ["ec9db3", "e1848be185b4e18782"],
+  ["ec9db3", "ec9d98e18782"],
+  ["ec9db4", "e1848be185b5"],
+  ["ec9db5", "e1848be185b5e186a8"],
+  ["ec9db5", "ec9db4e186a8"],
+  ["ec9db6", "e1848be185b5e186a9"],
+  ["ec9db6", "ec9db4e186a9"],
+  ["ec9db7", "e1848be185b5e186aa"],
+  ["ec9db7", "ec9db4e186aa"],
+  ["ec9db8", "e1848be185b5e186ab"],
+  ["ec9db8", "ec9db4e186ab"],
+  ["ec9db9", "e1848be185b5e186ac"],
+  ["ec9db9", "ec9db4e186ac"],
+  ["ec9dba", "e1848be185b5e186ad"],
+  ["ec9dba", "ec9db4e186ad"],
+  ["ec9dbb", "e1848be185b5e186ae"],
+  ["ec9dbb", "ec9db4e186ae"],
+  ["ec9dbc", "e1848be185b5e186af"],
+  ["ec9dbc", "ec9db4e186af"],
+  ["ec9dbd", "e1848be185b5e186b0"],
+  ["ec9dbd", "ec9db4e186b0"],
+  ["ec9dbe", "e1848be185b5e186b1"],
+  ["ec9dbe", "ec9db4e186b1"],
+  ["ec9dbf", "e1848be185b5e186b2"],
+  ["ec9dbf", "ec9db4e186b2"],
+  ["ec9e80", "e1848be185b5e186b3"],
+  ["ec9e80", "ec9db4e186b3"],
+  ["ec9e81", "e1848be185b5e186b4"],
+  ["ec9e81", "ec9db4e186b4"],
+  ["ec9e82", "e1848be185b5e186b5"],
+  ["ec9e82", "ec9db4e186b5"],
+  ["ec9e83", "e1848be185b5e186b6"],
+  ["ec9e83", "ec9db4e186b6"],
+  ["ec9e84", "e1848be185b5e186b7"],
+  ["ec9e84", "ec9db4e186b7"],
+  ["ec9e85", "e1848be185b5e186b8"],
+  ["ec9e85", "ec9db4e186b8"],
+  ["ec9e86", "e1848be185b5e186b9"],
+  ["ec9e86", "ec9db4e186b9"],
+  ["ec9e87", "e1848be185b5e186ba"],
+  ["ec9e87", "ec9db4e186ba"],
+  ["ec9e88", "e1848be185b5e186bb"],
+  ["ec9e88", "ec9db4e186bb"],
+  ["ec9e89", "e1848be185b5e186bc"],
+  ["ec9e89", "ec9db4e186bc"],
+  ["ec9e8a", "e1848be185b5e186bd"],
+  ["ec9e8a", "ec9db4e186bd"],
+  ["ec9e8b", "e1848be185b5e186be"],
+  ["ec9e8b", "ec9db4e186be"],
+  ["ec9e8c", "e1848be185b5e186bf"],
+  ["ec9e8c", "ec9db4e186bf"],
+  ["ec9e8d", "e1848be185b5e18780"],
+  ["ec9e8d", "ec9db4e18780"],
+  ["ec9e8e", "e1848be185b5e18781"],
+  ["ec9e8e", "ec9db4e18781"],
+  ["ec9e8f", "e1848be185b5e18782"],
+  ["ec9e8f", "ec9db4e18782"],
+  ["ec9e90", "e1848ce185a1"],
+  ["ec9e91", "e1848ce185a1e186a8"],
+  ["ec9e91", "ec9e90e186a8"],
+  ["ec9e92", "e1848ce185a1e186a9"],
+  ["ec9e92", "ec9e90e186a9"],
+  ["ec9e93", "e1848ce185a1e186aa"],
+  ["ec9e93", "ec9e90e186aa"],
+  ["ec9e94", "e1848ce185a1e186ab"],
+  ["ec9e94", "ec9e90e186ab"],
+  ["ec9e95", "e1848ce185a1e186ac"],
+  ["ec9e95", "ec9e90e186ac"],
+  ["ec9e96", "e1848ce185a1e186ad"],
+  ["ec9e96", "ec9e90e186ad"],
+  ["ec9e97", "e1848ce185a1e186ae"],
+  ["ec9e97", "ec9e90e186ae"],
+  ["ec9e98", "e1848ce185a1e186af"],
+  ["ec9e98", "ec9e90e186af"],
+  ["ec9e99", "e1848ce185a1e186b0"],
+  ["ec9e99", "ec9e90e186b0"],
+  ["ec9e9a", "e1848ce185a1e186b1"],
+  ["ec9e9a", "ec9e90e186b1"],
+  ["ec9e9b", "e1848ce185a1e186b2"],
+  ["ec9e9b", "ec9e90e186b2"],
+  ["ec9e9c", "e1848ce185a1e186b3"],
+  ["ec9e9c", "ec9e90e186b3"],
+  ["ec9e9d", "e1848ce185a1e186b4"],
+  ["ec9e9d", "ec9e90e186b4"],
+  ["ec9e9e", "e1848ce185a1e186b5"],
+  ["ec9e9e", "ec9e90e186b5"],
+  ["ec9e9f", "e1848ce185a1e186b6"],
+  ["ec9e9f", "ec9e90e186b6"],
+  ["ec9ea0", "e1848ce185a1e186b7"],
+  ["ec9ea0", "ec9e90e186b7"],
+  ["ec9ea1", "e1848ce185a1e186b8"],
+  ["ec9ea1", "ec9e90e186b8"],
+  ["ec9ea2", "e1848ce185a1e186b9"],
+  ["ec9ea2", "ec9e90e186b9"],
+  ["ec9ea3", "e1848ce185a1e186ba"],
+  ["ec9ea3", "ec9e90e186ba"],
+  ["ec9ea4", "e1848ce185a1e186bb"],
+  ["ec9ea4", "ec9e90e186bb"],
+  ["ec9ea5", "e1848ce185a1e186bc"],
+  ["ec9ea5", "ec9e90e186bc"],
+  ["ec9ea6", "e1848ce185a1e186bd"],
+  ["ec9ea6", "ec9e90e186bd"],
+  ["ec9ea7", "e1848ce185a1e186be"],
+  ["ec9ea7", "ec9e90e186be"],
+  ["ec9ea8", "e1848ce185a1e186bf"],
+  ["ec9ea8", "ec9e90e186bf"],
+  ["ec9ea9", "e1848ce185a1e18780"],
+  ["ec9ea9", "ec9e90e18780"],
+  ["ec9eaa", "e1848ce185a1e18781"],
+  ["ec9eaa", "ec9e90e18781"],
+  ["ec9eab", "e1848ce185a1e18782"],
+  ["ec9eab", "ec9e90e18782"],
+  ["ec9eac", "e1848ce185a2"],
+  ["ec9ead", "e1848ce185a2e186a8"],
+  ["ec9ead", "ec9eace186a8"],
+  ["ec9eae", "e1848ce185a2e186a9"],
+  ["ec9eae", "ec9eace186a9"],
+  ["ec9eaf", "e1848ce185a2e186aa"],
+  ["ec9eaf", "ec9eace186aa"],
+  ["ec9eb0", "e1848ce185a2e186ab"],
+  ["ec9eb0", "ec9eace186ab"],
+  ["ec9eb1", "e1848ce185a2e186ac"],
+  ["ec9eb1", "ec9eace186ac"],
+  ["ec9eb2", "e1848ce185a2e186ad"],
+  ["ec9eb2", "ec9eace186ad"],
+  ["ec9eb3", "e1848ce185a2e186ae"],
+  ["ec9eb3", "ec9eace186ae"],
+  ["ec9eb4", "e1848ce185a2e186af"],
+  ["ec9eb4", "ec9eace186af"],
+  ["ec9eb5", "e1848ce185a2e186b0"],
+  ["ec9eb5", "ec9eace186b0"],
+  ["ec9eb6", "e1848ce185a2e186b1"],
+  ["ec9eb6", "ec9eace186b1"],
+  ["ec9eb7", "e1848ce185a2e186b2"],
+  ["ec9eb7", "ec9eace186b2"],
+  ["ec9eb8", "e1848ce185a2e186b3"],
+  ["ec9eb8", "ec9eace186b3"],
+  ["ec9eb9", "e1848ce185a2e186b4"],
+  ["ec9eb9", "ec9eace186b4"],
+  ["ec9eba", "e1848ce185a2e186b5"],
+  ["ec9eba", "ec9eace186b5"],
+  ["ec9ebb", "e1848ce185a2e186b6"],
+  ["ec9ebb", "ec9eace186b6"],
+  ["ec9ebc", "e1848ce185a2e186b7"],
+  ["ec9ebc", "ec9eace186b7"],
+  ["ec9ebd", "e1848ce185a2e186b8"],
+  ["ec9ebd", "ec9eace186b8"],
+  ["ec9ebe", "e1848ce185a2e186b9"],
+  ["ec9ebe", "ec9eace186b9"],
+  ["ec9ebf", "e1848ce185a2e186ba"],
+  ["ec9ebf", "ec9eace186ba"],
+  ["ec9f80", "e1848ce185a2e186bb"],
+  ["ec9f80", "ec9eace186bb"],
+  ["ec9f81", "e1848ce185a2e186bc"],
+  ["ec9f81", "ec9eace186bc"],
+  ["ec9f82", "e1848ce185a2e186bd"],
+  ["ec9f82", "ec9eace186bd"],
+  ["ec9f83", "e1848ce185a2e186be"],
+  ["ec9f83", "ec9eace186be"],
+  ["ec9f84", "e1848ce185a2e186bf"],
+  ["ec9f84", "ec9eace186bf"],
+  ["ec9f85", "e1848ce185a2e18780"],
+  ["ec9f85", "ec9eace18780"],
+  ["ec9f86", "e1848ce185a2e18781"],
+  ["ec9f86", "ec9eace18781"],
+  ["ec9f87", "e1848ce185a2e18782"],
+  ["ec9f87", "ec9eace18782"],
+  ["ec9f88", "e1848ce185a3"],
+  ["ec9f89", "e1848ce185a3e186a8"],
+  ["ec9f89", "ec9f88e186a8"],
+  ["ec9f8a", "e1848ce185a3e186a9"],
+  ["ec9f8a", "ec9f88e186a9"],
+  ["ec9f8b", "e1848ce185a3e186aa"],
+  ["ec9f8b", "ec9f88e186aa"],
+  ["ec9f8c", "e1848ce185a3e186ab"],
+  ["ec9f8c", "ec9f88e186ab"],
+  ["ec9f8d", "e1848ce185a3e186ac"],
+  ["ec9f8d", "ec9f88e186ac"],
+  ["ec9f8e", "e1848ce185a3e186ad"],
+  ["ec9f8e", "ec9f88e186ad"],
+  ["ec9f8f", "e1848ce185a3e186ae"],
+  ["ec9f8f", "ec9f88e186ae"],
+  ["ec9f90", "e1848ce185a3e186af"],
+  ["ec9f90", "ec9f88e186af"],
+  ["ec9f91", "e1848ce185a3e186b0"],
+  ["ec9f91", "ec9f88e186b0"],
+  ["ec9f92", "e1848ce185a3e186b1"],
+  ["ec9f92", "ec9f88e186b1"],
+  ["ec9f93", "e1848ce185a3e186b2"],
+  ["ec9f93", "ec9f88e186b2"],
+  ["ec9f94", "e1848ce185a3e186b3"],
+  ["ec9f94", "ec9f88e186b3"],
+  ["ec9f95", "e1848ce185a3e186b4"],
+  ["ec9f95", "ec9f88e186b4"],
+  ["ec9f96", "e1848ce185a3e186b5"],
+  ["ec9f96", "ec9f88e186b5"],
+  ["ec9f97", "e1848ce185a3e186b6"],
+  ["ec9f97", "ec9f88e186b6"],
+  ["ec9f98", "e1848ce185a3e186b7"],
+  ["ec9f98", "ec9f88e186b7"],
+  ["ec9f99", "e1848ce185a3e186b8"],
+  ["ec9f99", "ec9f88e186b8"],
+  ["ec9f9a", "e1848ce185a3e186b9"],
+  ["ec9f9a", "ec9f88e186b9"],
+  ["ec9f9b", "e1848ce185a3e186ba"],
+  ["ec9f9b", "ec9f88e186ba"],
+  ["ec9f9c", "e1848ce185a3e186bb"],
+  ["ec9f9c", "ec9f88e186bb"],
+  ["ec9f9d", "e1848ce185a3e186bc"],
+  ["ec9f9d", "ec9f88e186bc"],
+  ["ec9f9e", "e1848ce185a3e186bd"],
+  ["ec9f9e", "ec9f88e186bd"],
+  ["ec9f9f", "e1848ce185a3e186be"],
+  ["ec9f9f", "ec9f88e186be"],
+  ["ec9fa0", "e1848ce185a3e186bf"],
+  ["ec9fa0", "ec9f88e186bf"],
+  ["ec9fa1", "e1848ce185a3e18780"],
+  ["ec9fa1", "ec9f88e18780"],
+  ["ec9fa2", "e1848ce185a3e18781"],
+  ["ec9fa2", "ec9f88e18781"],
+  ["ec9fa3", "e1848ce185a3e18782"],
+  ["ec9fa3", "ec9f88e18782"],
+  ["ec9fa4", "e1848ce185a4"],
+  ["ec9fa5", "e1848ce185a4e186a8"],
+  ["ec9fa5", "ec9fa4e186a8"],
+  ["ec9fa6", "e1848ce185a4e186a9"],
+  ["ec9fa6", "ec9fa4e186a9"],
+  ["ec9fa7", "e1848ce185a4e186aa"],
+  ["ec9fa7", "ec9fa4e186aa"],
+  ["ec9fa8", "e1848ce185a4e186ab"],
+  ["ec9fa8", "ec9fa4e186ab"],
+  ["ec9fa9", "e1848ce185a4e186ac"],
+  ["ec9fa9", "ec9fa4e186ac"],
+  ["ec9faa", "e1848ce185a4e186ad"],
+  ["ec9faa", "ec9fa4e186ad"],
+  ["ec9fab", "e1848ce185a4e186ae"],
+  ["ec9fab", "ec9fa4e186ae"],
+  ["ec9fac", "e1848ce185a4e186af"],
+  ["ec9fac", "ec9fa4e186af"],
+  ["ec9fad", "e1848ce185a4e186b0"],
+  ["ec9fad", "ec9fa4e186b0"],
+  ["ec9fae", "e1848ce185a4e186b1"],
+  ["ec9fae", "ec9fa4e186b1"],
+  ["ec9faf", "e1848ce185a4e186b2"],
+  ["ec9faf", "ec9fa4e186b2"],
+  ["ec9fb0", "e1848ce185a4e186b3"],
+  ["ec9fb0", "ec9fa4e186b3"],
+  ["ec9fb1", "e1848ce185a4e186b4"],
+  ["ec9fb1", "ec9fa4e186b4"],
+  ["ec9fb2", "e1848ce185a4e186b5"],
+  ["ec9fb2", "ec9fa4e186b5"],
+  ["ec9fb3", "e1848ce185a4e186b6"],
+  ["ec9fb3", "ec9fa4e186b6"],
+  ["ec9fb4", "e1848ce185a4e186b7"],
+  ["ec9fb4", "ec9fa4e186b7"],
+  ["ec9fb5", "e1848ce185a4e186b8"],
+  ["ec9fb5", "ec9fa4e186b8"],
+  ["ec9fb6", "e1848ce185a4e186b9"],
+  ["ec9fb6", "ec9fa4e186b9"],
+  ["ec9fb7", "e1848ce185a4e186ba"],
+  ["ec9fb7", "ec9fa4e186ba"],
+  ["ec9fb8", "e1848ce185a4e186bb"],
+  ["ec9fb8", "ec9fa4e186bb"],
+  ["ec9fb9", "e1848ce185a4e186bc"],
+  ["ec9fb9", "ec9fa4e186bc"],
+  ["ec9fba", "e1848ce185a4e186bd"],
+  ["ec9fba", "ec9fa4e186bd"],
+  ["ec9fbb", "e1848ce185a4e186be"],
+  ["ec9fbb", "ec9fa4e186be"],
+  ["ec9fbc", "e1848ce185a4e186bf"],
+  ["ec9fbc", "ec9fa4e186bf"],
+  ["ec9fbd", "e1848ce185a4e18780"],
+  ["ec9fbd", "ec9fa4e18780"],
+  ["ec9fbe", "e1848ce185a4e18781"],
+  ["ec9fbe", "ec9fa4e18781"],
+  ["ec9fbf", "e1848ce185a4e18782"],
+  ["ec9fbf", "ec9fa4e18782"],
+  ["eca080", "e1848ce185a5"],
+  ["eca081", "e1848ce185a5e186a8"],
+  ["eca081", "eca080e186a8"],
+  ["eca082", "e1848ce185a5e186a9"],
+  ["eca082", "eca080e186a9"],
+  ["eca083", "e1848ce185a5e186aa"],
+  ["eca083", "eca080e186aa"],
+  ["eca084", "e1848ce185a5e186ab"],
+  ["eca084", "eca080e186ab"],
+  ["eca085", "e1848ce185a5e186ac"],
+  ["eca085", "eca080e186ac"],
+  ["eca086", "e1848ce185a5e186ad"],
+  ["eca086", "eca080e186ad"],
+  ["eca087", "e1848ce185a5e186ae"],
+  ["eca087", "eca080e186ae"],
+  ["eca088", "e1848ce185a5e186af"],
+  ["eca088", "eca080e186af"],
+  ["eca089", "e1848ce185a5e186b0"],
+  ["eca089", "eca080e186b0"],
+  ["eca08a", "e1848ce185a5e186b1"],
+  ["eca08a", "eca080e186b1"],
+  ["eca08b", "e1848ce185a5e186b2"],
+  ["eca08b", "eca080e186b2"],
+  ["eca08c", "e1848ce185a5e186b3"],
+  ["eca08c", "eca080e186b3"],
+  ["eca08d", "e1848ce185a5e186b4"],
+  ["eca08d", "eca080e186b4"],
+  ["eca08e", "e1848ce185a5e186b5"],
+  ["eca08e", "eca080e186b5"],
+  ["eca08f", "e1848ce185a5e186b6"],
+  ["eca08f", "eca080e186b6"],
+  ["eca090", "e1848ce185a5e186b7"],
+  ["eca090", "eca080e186b7"],
+  ["eca091", "e1848ce185a5e186b8"],
+  ["eca091", "eca080e186b8"],
+  ["eca092", "e1848ce185a5e186b9"],
+  ["eca092", "eca080e186b9"],
+  ["eca093", "e1848ce185a5e186ba"],
+  ["eca093", "eca080e186ba"],
+  ["eca094", "e1848ce185a5e186bb"],
+  ["eca094", "eca080e186bb"],
+  ["eca095", "e1848ce185a5e186bc"],
+  ["eca095", "eca080e186bc"],
+  ["eca096", "e1848ce185a5e186bd"],
+  ["eca096", "eca080e186bd"],
+  ["eca097", "e1848ce185a5e186be"],
+  ["eca097", "eca080e186be"],
+  ["eca098", "e1848ce185a5e186bf"],
+  ["eca098", "eca080e186bf"],
+  ["eca099", "e1848ce185a5e18780"],
+  ["eca099", "eca080e18780"],
+  ["eca09a", "e1848ce185a5e18781"],
+  ["eca09a", "eca080e18781"],
+  ["eca09b", "e1848ce185a5e18782"],
+  ["eca09b", "eca080e18782"],
+  ["eca09c", "e1848ce185a6"],
+  ["eca09d", "e1848ce185a6e186a8"],
+  ["eca09d", "eca09ce186a8"],
+  ["eca09e", "e1848ce185a6e186a9"],
+  ["eca09e", "eca09ce186a9"],
+  ["eca09f", "e1848ce185a6e186aa"],
+  ["eca09f", "eca09ce186aa"],
+  ["eca0a0", "e1848ce185a6e186ab"],
+  ["eca0a0", "eca09ce186ab"],
+  ["eca0a1", "e1848ce185a6e186ac"],
+  ["eca0a1", "eca09ce186ac"],
+  ["eca0a2", "e1848ce185a6e186ad"],
+  ["eca0a2", "eca09ce186ad"],
+  ["eca0a3", "e1848ce185a6e186ae"],
+  ["eca0a3", "eca09ce186ae"],
+  ["eca0a4", "e1848ce185a6e186af"],
+  ["eca0a4", "eca09ce186af"],
+  ["eca0a5", "e1848ce185a6e186b0"],
+  ["eca0a5", "eca09ce186b0"],
+  ["eca0a6", "e1848ce185a6e186b1"],
+  ["eca0a6", "eca09ce186b1"],
+  ["eca0a7", "e1848ce185a6e186b2"],
+  ["eca0a7", "eca09ce186b2"],
+  ["eca0a8", "e1848ce185a6e186b3"],
+  ["eca0a8", "eca09ce186b3"],
+  ["eca0a9", "e1848ce185a6e186b4"],
+  ["eca0a9", "eca09ce186b4"],
+  ["eca0aa", "e1848ce185a6e186b5"],
+  ["eca0aa", "eca09ce186b5"],
+  ["eca0ab", "e1848ce185a6e186b6"],
+  ["eca0ab", "eca09ce186b6"],
+  ["eca0ac", "e1848ce185a6e186b7"],
+  ["eca0ac", "eca09ce186b7"],
+  ["eca0ad", "e1848ce185a6e186b8"],
+  ["eca0ad", "eca09ce186b8"],
+  ["eca0ae", "e1848ce185a6e186b9"],
+  ["eca0ae", "eca09ce186b9"],
+  ["eca0af", "e1848ce185a6e186ba"],
+  ["eca0af", "eca09ce186ba"],
+  ["eca0b0", "e1848ce185a6e186bb"],
+  ["eca0b0", "eca09ce186bb"],
+  ["eca0b1", "e1848ce185a6e186bc"],
+  ["eca0b1", "eca09ce186bc"],
+  ["eca0b2", "e1848ce185a6e186bd"],
+  ["eca0b2", "eca09ce186bd"],
+  ["eca0b3", "e1848ce185a6e186be"],
+  ["eca0b3", "eca09ce186be"],
+  ["eca0b4", "e1848ce185a6e186bf"],
+  ["eca0b4", "eca09ce186bf"],
+  ["eca0b5", "e1848ce185a6e18780"],
+  ["eca0b5", "eca09ce18780"],
+  ["eca0b6", "e1848ce185a6e18781"],
+  ["eca0b6", "eca09ce18781"],
+  ["eca0b7", "e1848ce185a6e18782"],
+  ["eca0b7", "eca09ce18782"],
+  ["eca0b8", "e1848ce185a7"],
+  ["eca0b9", "e1848ce185a7e186a8"],
+  ["eca0b9", "eca0b8e186a8"],
+  ["eca0ba", "e1848ce185a7e186a9"],
+  ["eca0ba", "eca0b8e186a9"],
+  ["eca0bb", "e1848ce185a7e186aa"],
+  ["eca0bb", "eca0b8e186aa"],
+  ["eca0bc", "e1848ce185a7e186ab"],
+  ["eca0bc", "eca0b8e186ab"],
+  ["eca0bd", "e1848ce185a7e186ac"],
+  ["eca0bd", "eca0b8e186ac"],
+  ["eca0be", "e1848ce185a7e186ad"],
+  ["eca0be", "eca0b8e186ad"],
+  ["eca0bf", "e1848ce185a7e186ae"],
+  ["eca0bf", "eca0b8e186ae"],
+  ["eca180", "e1848ce185a7e186af"],
+  ["eca180", "eca0b8e186af"],
+  ["eca181", "e1848ce185a7e186b0"],
+  ["eca181", "eca0b8e186b0"],
+  ["eca182", "e1848ce185a7e186b1"],
+  ["eca182", "eca0b8e186b1"],
+  ["eca183", "e1848ce185a7e186b2"],
+  ["eca183", "eca0b8e186b2"],
+  ["eca184", "e1848ce185a7e186b3"],
+  ["eca184", "eca0b8e186b3"],
+  ["eca185", "e1848ce185a7e186b4"],
+  ["eca185", "eca0b8e186b4"],
+  ["eca186", "e1848ce185a7e186b5"],
+  ["eca186", "eca0b8e186b5"],
+  ["eca187", "e1848ce185a7e186b6"],
+  ["eca187", "eca0b8e186b6"],
+  ["eca188", "e1848ce185a7e186b7"],
+  ["eca188", "eca0b8e186b7"],
+  ["eca189", "e1848ce185a7e186b8"],
+  ["eca189", "eca0b8e186b8"],
+  ["eca18a", "e1848ce185a7e186b9"],
+  ["eca18a", "eca0b8e186b9"],
+  ["eca18b", "e1848ce185a7e186ba"],
+  ["eca18b", "eca0b8e186ba"],
+  ["eca18c", "e1848ce185a7e186bb"],
+  ["eca18c", "eca0b8e186bb"],
+  ["eca18d", "e1848ce185a7e186bc"],
+  ["eca18d", "eca0b8e186bc"],
+  ["eca18e", "e1848ce185a7e186bd"],
+  ["eca18e", "eca0b8e186bd"],
+  ["eca18f", "e1848ce185a7e186be"],
+  ["eca18f", "eca0b8e186be"],
+  ["eca190", "e1848ce185a7e186bf"],
+  ["eca190", "eca0b8e186bf"],
+  ["eca191", "e1848ce185a7e18780"],
+  ["eca191", "eca0b8e18780"],
+  ["eca192", "e1848ce185a7e18781"],
+  ["eca192", "eca0b8e18781"],
+  ["eca193", "e1848ce185a7e18782"],
+  ["eca193", "eca0b8e18782"],
+  ["eca194", "e1848ce185a8"],
+  ["eca195", "e1848ce185a8e186a8"],
+  ["eca195", "eca194e186a8"],
+  ["eca196", "e1848ce185a8e186a9"],
+  ["eca196", "eca194e186a9"],
+  ["eca197", "e1848ce185a8e186aa"],
+  ["eca197", "eca194e186aa"],
+  ["eca198", "e1848ce185a8e186ab"],
+  ["eca198", "eca194e186ab"],
+  ["eca199", "e1848ce185a8e186ac"],
+  ["eca199", "eca194e186ac"],
+  ["eca19a", "e1848ce185a8e186ad"],
+  ["eca19a", "eca194e186ad"],
+  ["eca19b", "e1848ce185a8e186ae"],
+  ["eca19b", "eca194e186ae"],
+  ["eca19c", "e1848ce185a8e186af"],
+  ["eca19c", "eca194e186af"],
+  ["eca19d", "e1848ce185a8e186b0"],
+  ["eca19d", "eca194e186b0"],
+  ["eca19e", "e1848ce185a8e186b1"],
+  ["eca19e", "eca194e186b1"],
+  ["eca19f", "e1848ce185a8e186b2"],
+  ["eca19f", "eca194e186b2"],
+  ["eca1a0", "e1848ce185a8e186b3"],
+  ["eca1a0", "eca194e186b3"],
+  ["eca1a1", "e1848ce185a8e186b4"],
+  ["eca1a1", "eca194e186b4"],
+  ["eca1a2", "e1848ce185a8e186b5"],
+  ["eca1a2", "eca194e186b5"],
+  ["eca1a3", "e1848ce185a8e186b6"],
+  ["eca1a3", "eca194e186b6"],
+  ["eca1a4", "e1848ce185a8e186b7"],
+  ["eca1a4", "eca194e186b7"],
+  ["eca1a5", "e1848ce185a8e186b8"],
+  ["eca1a5", "eca194e186b8"],
+  ["eca1a6", "e1848ce185a8e186b9"],
+  ["eca1a6", "eca194e186b9"],
+  ["eca1a7", "e1848ce185a8e186ba"],
+  ["eca1a7", "eca194e186ba"],
+  ["eca1a8", "e1848ce185a8e186bb"],
+  ["eca1a8", "eca194e186bb"],
+  ["eca1a9", "e1848ce185a8e186bc"],
+  ["eca1a9", "eca194e186bc"],
+  ["eca1aa", "e1848ce185a8e186bd"],
+  ["eca1aa", "eca194e186bd"],
+  ["eca1ab", "e1848ce185a8e186be"],
+  ["eca1ab", "eca194e186be"],
+  ["eca1ac", "e1848ce185a8e186bf"],
+  ["eca1ac", "eca194e186bf"],
+  ["eca1ad", "e1848ce185a8e18780"],
+  ["eca1ad", "eca194e18780"],
+  ["eca1ae", "e1848ce185a8e18781"],
+  ["eca1ae", "eca194e18781"],
+  ["eca1af", "e1848ce185a8e18782"],
+  ["eca1af", "eca194e18782"],
+  ["eca1b0", "e1848ce185a9"],
+  ["eca1b1", "e1848ce185a9e186a8"],
+  ["eca1b1", "eca1b0e186a8"],
+  ["eca1b2", "e1848ce185a9e186a9"],
+  ["eca1b2", "eca1b0e186a9"],
+  ["eca1b3", "e1848ce185a9e186aa"],
+  ["eca1b3", "eca1b0e186aa"],
+  ["eca1b4", "e1848ce185a9e186ab"],
+  ["eca1b4", "eca1b0e186ab"],
+  ["eca1b5", "e1848ce185a9e186ac"],
+  ["eca1b5", "eca1b0e186ac"],
+  ["eca1b6", "e1848ce185a9e186ad"],
+  ["eca1b6", "eca1b0e186ad"],
+  ["eca1b7", "e1848ce185a9e186ae"],
+  ["eca1b7", "eca1b0e186ae"],
+  ["eca1b8", "e1848ce185a9e186af"],
+  ["eca1b8", "eca1b0e186af"],
+  ["eca1b9", "e1848ce185a9e186b0"],
+  ["eca1b9", "eca1b0e186b0"],
+  ["eca1ba", "e1848ce185a9e186b1"],
+  ["eca1ba", "eca1b0e186b1"],
+  ["eca1bb", "e1848ce185a9e186b2"],
+  ["eca1bb", "eca1b0e186b2"],
+  ["eca1bc", "e1848ce185a9e186b3"],
+  ["eca1bc", "eca1b0e186b3"],
+  ["eca1bd", "e1848ce185a9e186b4"],
+  ["eca1bd", "eca1b0e186b4"],
+  ["eca1be", "e1848ce185a9e186b5"],
+  ["eca1be", "eca1b0e186b5"],
+  ["eca1bf", "e1848ce185a9e186b6"],
+  ["eca1bf", "eca1b0e186b6"],
+  ["eca280", "e1848ce185a9e186b7"],
+  ["eca280", "eca1b0e186b7"],
+  ["eca281", "e1848ce185a9e186b8"],
+  ["eca281", "eca1b0e186b8"],
+  ["eca282", "e1848ce185a9e186b9"],
+  ["eca282", "eca1b0e186b9"],
+  ["eca283", "e1848ce185a9e186ba"],
+  ["eca283", "eca1b0e186ba"],
+  ["eca284", "e1848ce185a9e186bb"],
+  ["eca284", "eca1b0e186bb"],
+  ["eca285", "e1848ce185a9e186bc"],
+  ["eca285", "eca1b0e186bc"],
+  ["eca286", "e1848ce185a9e186bd"],
+  ["eca286", "eca1b0e186bd"],
+  ["eca287", "e1848ce185a9e186be"],
+  ["eca287", "eca1b0e186be"],
+  ["eca288", "e1848ce185a9e186bf"],
+  ["eca288", "eca1b0e186bf"],
+  ["eca289", "e1848ce185a9e18780"],
+  ["eca289", "eca1b0e18780"],
+  ["eca28a", "e1848ce185a9e18781"],
+  ["eca28a", "eca1b0e18781"],
+  ["eca28b", "e1848ce185a9e18782"],
+  ["eca28b", "eca1b0e18782"],
+  ["eca28c", "e1848ce185aa"],
+  ["eca28d", "e1848ce185aae186a8"],
+  ["eca28d", "eca28ce186a8"],
+  ["eca28e", "e1848ce185aae186a9"],
+  ["eca28e", "eca28ce186a9"],
+  ["eca28f", "e1848ce185aae186aa"],
+  ["eca28f", "eca28ce186aa"],
+  ["eca290", "e1848ce185aae186ab"],
+  ["eca290", "eca28ce186ab"],
+  ["eca291", "e1848ce185aae186ac"],
+  ["eca291", "eca28ce186ac"],
+  ["eca292", "e1848ce185aae186ad"],
+  ["eca292", "eca28ce186ad"],
+  ["eca293", "e1848ce185aae186ae"],
+  ["eca293", "eca28ce186ae"],
+  ["eca294", "e1848ce185aae186af"],
+  ["eca294", "eca28ce186af"],
+  ["eca295", "e1848ce185aae186b0"],
+  ["eca295", "eca28ce186b0"],
+  ["eca296", "e1848ce185aae186b1"],
+  ["eca296", "eca28ce186b1"],
+  ["eca297", "e1848ce185aae186b2"],
+  ["eca297", "eca28ce186b2"],
+  ["eca298", "e1848ce185aae186b3"],
+  ["eca298", "eca28ce186b3"],
+  ["eca299", "e1848ce185aae186b4"],
+  ["eca299", "eca28ce186b4"],
+  ["eca29a", "e1848ce185aae186b5"],
+  ["eca29a", "eca28ce186b5"],
+  ["eca29b", "e1848ce185aae186b6"],
+  ["eca29b", "eca28ce186b6"],
+  ["eca29c", "e1848ce185aae186b7"],
+  ["eca29c", "eca28ce186b7"],
+  ["eca29d", "e1848ce185aae186b8"],
+  ["eca29d", "eca28ce186b8"],
+  ["eca29e", "e1848ce185aae186b9"],
+  ["eca29e", "eca28ce186b9"],
+  ["eca29f", "e1848ce185aae186ba"],
+  ["eca29f", "eca28ce186ba"],
+  ["eca2a0", "e1848ce185aae186bb"],
+  ["eca2a0", "eca28ce186bb"],
+  ["eca2a1", "e1848ce185aae186bc"],
+  ["eca2a1", "eca28ce186bc"],
+  ["eca2a2", "e1848ce185aae186bd"],
+  ["eca2a2", "eca28ce186bd"],
+  ["eca2a3", "e1848ce185aae186be"],
+  ["eca2a3", "eca28ce186be"],
+  ["eca2a4", "e1848ce185aae186bf"],
+  ["eca2a4", "eca28ce186bf"],
+  ["eca2a5", "e1848ce185aae18780"],
+  ["eca2a5", "eca28ce18780"],
+  ["eca2a6", "e1848ce185aae18781"],
+  ["eca2a6", "eca28ce18781"],
+  ["eca2a7", "e1848ce185aae18782"],
+  ["eca2a7", "eca28ce18782"],
+  ["eca2a8", "e1848ce185ab"],
+  ["eca2a9", "e1848ce185abe186a8"],
+  ["eca2a9", "eca2a8e186a8"],
+  ["eca2aa", "e1848ce185abe186a9"],
+  ["eca2aa", "eca2a8e186a9"],
+  ["eca2ab", "e1848ce185abe186aa"],
+  ["eca2ab", "eca2a8e186aa"],
+  ["eca2ac", "e1848ce185abe186ab"],
+  ["eca2ac", "eca2a8e186ab"],
+  ["eca2ad", "e1848ce185abe186ac"],
+  ["eca2ad", "eca2a8e186ac"],
+  ["eca2ae", "e1848ce185abe186ad"],
+  ["eca2ae", "eca2a8e186ad"],
+  ["eca2af", "e1848ce185abe186ae"],
+  ["eca2af", "eca2a8e186ae"],
+  ["eca2b0", "e1848ce185abe186af"],
+  ["eca2b0", "eca2a8e186af"],
+  ["eca2b1", "e1848ce185abe186b0"],
+  ["eca2b1", "eca2a8e186b0"],
+  ["eca2b2", "e1848ce185abe186b1"],
+  ["eca2b2", "eca2a8e186b1"],
+  ["eca2b3", "e1848ce185abe186b2"],
+  ["eca2b3", "eca2a8e186b2"],
+  ["eca2b4", "e1848ce185abe186b3"],
+  ["eca2b4", "eca2a8e186b3"],
+  ["eca2b5", "e1848ce185abe186b4"],
+  ["eca2b5", "eca2a8e186b4"],
+  ["eca2b6", "e1848ce185abe186b5"],
+  ["eca2b6", "eca2a8e186b5"],
+  ["eca2b7", "e1848ce185abe186b6"],
+  ["eca2b7", "eca2a8e186b6"],
+  ["eca2b8", "e1848ce185abe186b7"],
+  ["eca2b8", "eca2a8e186b7"],
+  ["eca2b9", "e1848ce185abe186b8"],
+  ["eca2b9", "eca2a8e186b8"],
+  ["eca2ba", "e1848ce185abe186b9"],
+  ["eca2ba", "eca2a8e186b9"],
+  ["eca2bb", "e1848ce185abe186ba"],
+  ["eca2bb", "eca2a8e186ba"],
+  ["eca2bc", "e1848ce185abe186bb"],
+  ["eca2bc", "eca2a8e186bb"],
+  ["eca2bd", "e1848ce185abe186bc"],
+  ["eca2bd", "eca2a8e186bc"],
+  ["eca2be", "e1848ce185abe186bd"],
+  ["eca2be", "eca2a8e186bd"],
+  ["eca2bf", "e1848ce185abe186be"],
+  ["eca2bf", "eca2a8e186be"],
+  ["eca380", "e1848ce185abe186bf"],
+  ["eca380", "eca2a8e186bf"],
+  ["eca381", "e1848ce185abe18780"],
+  ["eca381", "eca2a8e18780"],
+  ["eca382", "e1848ce185abe18781"],
+  ["eca382", "eca2a8e18781"],
+  ["eca383", "e1848ce185abe18782"],
+  ["eca383", "eca2a8e18782"],
+  ["eca384", "e1848ce185ac"],
+  ["eca385", "e1848ce185ace186a8"],
+  ["eca385", "eca384e186a8"],
+  ["eca386", "e1848ce185ace186a9"],
+  ["eca386", "eca384e186a9"],
+  ["eca387", "e1848ce185ace186aa"],
+  ["eca387", "eca384e186aa"],
+  ["eca388", "e1848ce185ace186ab"],
+  ["eca388", "eca384e186ab"],
+  ["eca389", "e1848ce185ace186ac"],
+  ["eca389", "eca384e186ac"],
+  ["eca38a", "e1848ce185ace186ad"],
+  ["eca38a", "eca384e186ad"],
+  ["eca38b", "e1848ce185ace186ae"],
+  ["eca38b", "eca384e186ae"],
+  ["eca38c", "e1848ce185ace186af"],
+  ["eca38c", "eca384e186af"],
+  ["eca38d", "e1848ce185ace186b0"],
+  ["eca38d", "eca384e186b0"],
+  ["eca38e", "e1848ce185ace186b1"],
+  ["eca38e", "eca384e186b1"],
+  ["eca38f", "e1848ce185ace186b2"],
+  ["eca38f", "eca384e186b2"],
+  ["eca390", "e1848ce185ace186b3"],
+  ["eca390", "eca384e186b3"],
+  ["eca391", "e1848ce185ace186b4"],
+  ["eca391", "eca384e186b4"],
+  ["eca392", "e1848ce185ace186b5"],
+  ["eca392", "eca384e186b5"],
+  ["eca393", "e1848ce185ace186b6"],
+  ["eca393", "eca384e186b6"],
+  ["eca394", "e1848ce185ace186b7"],
+  ["eca394", "eca384e186b7"],
+  ["eca395", "e1848ce185ace186b8"],
+  ["eca395", "eca384e186b8"],
+  ["eca396", "e1848ce185ace186b9"],
+  ["eca396", "eca384e186b9"],
+  ["eca397", "e1848ce185ace186ba"],
+  ["eca397", "eca384e186ba"],
+  ["eca398", "e1848ce185ace186bb"],
+  ["eca398", "eca384e186bb"],
+  ["eca399", "e1848ce185ace186bc"],
+  ["eca399", "eca384e186bc"],
+  ["eca39a", "e1848ce185ace186bd"],
+  ["eca39a", "eca384e186bd"],
+  ["eca39b", "e1848ce185ace186be"],
+  ["eca39b", "eca384e186be"],
+  ["eca39c", "e1848ce185ace186bf"],
+  ["eca39c", "eca384e186bf"],
+  ["eca39d", "e1848ce185ace18780"],
+  ["eca39d", "eca384e18780"],
+  ["eca39e", "e1848ce185ace18781"],
+  ["eca39e", "eca384e18781"],
+  ["eca39f", "e1848ce185ace18782"],
+  ["eca39f", "eca384e18782"],
+  ["eca3a0", "e1848ce185ad"],
+  ["eca3a1", "e1848ce185ade186a8"],
+  ["eca3a1", "eca3a0e186a8"],
+  ["eca3a2", "e1848ce185ade186a9"],
+  ["eca3a2", "eca3a0e186a9"],
+  ["eca3a3", "e1848ce185ade186aa"],
+  ["eca3a3", "eca3a0e186aa"],
+  ["eca3a4", "e1848ce185ade186ab"],
+  ["eca3a4", "eca3a0e186ab"],
+  ["eca3a5", "e1848ce185ade186ac"],
+  ["eca3a5", "eca3a0e186ac"],
+  ["eca3a6", "e1848ce185ade186ad"],
+  ["eca3a6", "eca3a0e186ad"],
+  ["eca3a7", "e1848ce185ade186ae"],
+  ["eca3a7", "eca3a0e186ae"],
+  ["eca3a8", "e1848ce185ade186af"],
+  ["eca3a8", "eca3a0e186af"],
+  ["eca3a9", "e1848ce185ade186b0"],
+  ["eca3a9", "eca3a0e186b0"],
+  ["eca3aa", "e1848ce185ade186b1"],
+  ["eca3aa", "eca3a0e186b1"],
+  ["eca3ab", "e1848ce185ade186b2"],
+  ["eca3ab", "eca3a0e186b2"],
+  ["eca3ac", "e1848ce185ade186b3"],
+  ["eca3ac", "eca3a0e186b3"],
+  ["eca3ad", "e1848ce185ade186b4"],
+  ["eca3ad", "eca3a0e186b4"],
+  ["eca3ae", "e1848ce185ade186b5"],
+  ["eca3ae", "eca3a0e186b5"],
+  ["eca3af", "e1848ce185ade186b6"],
+  ["eca3af", "eca3a0e186b6"],
+  ["eca3b0", "e1848ce185ade186b7"],
+  ["eca3b0", "eca3a0e186b7"],
+  ["eca3b1", "e1848ce185ade186b8"],
+  ["eca3b1", "eca3a0e186b8"],
+  ["eca3b2", "e1848ce185ade186b9"],
+  ["eca3b2", "eca3a0e186b9"],
+  ["eca3b3", "e1848ce185ade186ba"],
+  ["eca3b3", "eca3a0e186ba"],
+  ["eca3b4", "e1848ce185ade186bb"],
+  ["eca3b4", "eca3a0e186bb"],
+  ["eca3b5", "e1848ce185ade186bc"],
+  ["eca3b5", "eca3a0e186bc"],
+  ["eca3b6", "e1848ce185ade186bd"],
+  ["eca3b6", "eca3a0e186bd"],
+  ["eca3b7", "e1848ce185ade186be"],
+  ["eca3b7", "eca3a0e186be"],
+  ["eca3b8", "e1848ce185ade186bf"],
+  ["eca3b8", "eca3a0e186bf"],
+  ["eca3b9", "e1848ce185ade18780"],
+  ["eca3b9", "eca3a0e18780"],
+  ["eca3ba", "e1848ce185ade18781"],
+  ["eca3ba", "eca3a0e18781"],
+  ["eca3bb", "e1848ce185ade18782"],
+  ["eca3bb", "eca3a0e18782"],
+  ["eca3bc", "e1848ce185ae"],
+  ["eca3bd", "e1848ce185aee186a8"],
+  ["eca3bd", "eca3bce186a8"],
+  ["eca3be", "e1848ce185aee186a9"],
+  ["eca3be", "eca3bce186a9"],
+  ["eca3bf", "e1848ce185aee186aa"],
+  ["eca3bf", "eca3bce186aa"],
+  ["eca480", "e1848ce185aee186ab"],
+  ["eca480", "eca3bce186ab"],
+  ["eca481", "e1848ce185aee186ac"],
+  ["eca481", "eca3bce186ac"],
+  ["eca482", "e1848ce185aee186ad"],
+  ["eca482", "eca3bce186ad"],
+  ["eca483", "e1848ce185aee186ae"],
+  ["eca483", "eca3bce186ae"],
+  ["eca484", "e1848ce185aee186af"],
+  ["eca484", "eca3bce186af"],
+  ["eca485", "e1848ce185aee186b0"],
+  ["eca485", "eca3bce186b0"],
+  ["eca486", "e1848ce185aee186b1"],
+  ["eca486", "eca3bce186b1"],
+  ["eca487", "e1848ce185aee186b2"],
+  ["eca487", "eca3bce186b2"],
+  ["eca488", "e1848ce185aee186b3"],
+  ["eca488", "eca3bce186b3"],
+  ["eca489", "e1848ce185aee186b4"],
+  ["eca489", "eca3bce186b4"],
+  ["eca48a", "e1848ce185aee186b5"],
+  ["eca48a", "eca3bce186b5"],
+  ["eca48b", "e1848ce185aee186b6"],
+  ["eca48b", "eca3bce186b6"],
+  ["eca48c", "e1848ce185aee186b7"],
+  ["eca48c", "eca3bce186b7"],
+  ["eca48d", "e1848ce185aee186b8"],
+  ["eca48d", "eca3bce186b8"],
+  ["eca48e", "e1848ce185aee186b9"],
+  ["eca48e", "eca3bce186b9"],
+  ["eca48f", "e1848ce185aee186ba"],
+  ["eca48f", "eca3bce186ba"],
+  ["eca490", "e1848ce185aee186bb"],
+  ["eca490", "eca3bce186bb"],
+  ["eca491", "e1848ce185aee186bc"],
+  ["eca491", "eca3bce186bc"],
+  ["eca492", "e1848ce185aee186bd"],
+  ["eca492", "eca3bce186bd"],
+  ["eca493", "e1848ce185aee186be"],
+  ["eca493", "eca3bce186be"],
+  ["eca494", "e1848ce185aee186bf"],
+  ["eca494", "eca3bce186bf"],
+  ["eca495", "e1848ce185aee18780"],
+  ["eca495", "eca3bce18780"],
+  ["eca496", "e1848ce185aee18781"],
+  ["eca496", "eca3bce18781"],
+  ["eca497", "e1848ce185aee18782"],
+  ["eca497", "eca3bce18782"],
+  ["eca498", "e1848ce185af"],
+  ["eca499", "e1848ce185afe186a8"],
+  ["eca499", "eca498e186a8"],
+  ["eca49a", "e1848ce185afe186a9"],
+  ["eca49a", "eca498e186a9"],
+  ["eca49b", "e1848ce185afe186aa"],
+  ["eca49b", "eca498e186aa"],
+  ["eca49c", "e1848ce185afe186ab"],
+  ["eca49c", "eca498e186ab"],
+  ["eca49d", "e1848ce185afe186ac"],
+  ["eca49d", "eca498e186ac"],
+  ["eca49e", "e1848ce185afe186ad"],
+  ["eca49e", "eca498e186ad"],
+  ["eca49f", "e1848ce185afe186ae"],
+  ["eca49f", "eca498e186ae"],
+  ["eca4a0", "e1848ce185afe186af"],
+  ["eca4a0", "eca498e186af"],
+  ["eca4a1", "e1848ce185afe186b0"],
+  ["eca4a1", "eca498e186b0"],
+  ["eca4a2", "e1848ce185afe186b1"],
+  ["eca4a2", "eca498e186b1"],
+  ["eca4a3", "e1848ce185afe186b2"],
+  ["eca4a3", "eca498e186b2"],
+  ["eca4a4", "e1848ce185afe186b3"],
+  ["eca4a4", "eca498e186b3"],
+  ["eca4a5", "e1848ce185afe186b4"],
+  ["eca4a5", "eca498e186b4"],
+  ["eca4a6", "e1848ce185afe186b5"],
+  ["eca4a6", "eca498e186b5"],
+  ["eca4a7", "e1848ce185afe186b6"],
+  ["eca4a7", "eca498e186b6"],
+  ["eca4a8", "e1848ce185afe186b7"],
+  ["eca4a8", "eca498e186b7"],
+  ["eca4a9", "e1848ce185afe186b8"],
+  ["eca4a9", "eca498e186b8"],
+  ["eca4aa", "e1848ce185afe186b9"],
+  ["eca4aa", "eca498e186b9"],
+  ["eca4ab", "e1848ce185afe186ba"],
+  ["eca4ab", "eca498e186ba"],
+  ["eca4ac", "e1848ce185afe186bb"],
+  ["eca4ac", "eca498e186bb"],
+  ["eca4ad", "e1848ce185afe186bc"],
+  ["eca4ad", "eca498e186bc"],
+  ["eca4ae", "e1848ce185afe186bd"],
+  ["eca4ae", "eca498e186bd"],
+  ["eca4af", "e1848ce185afe186be"],
+  ["eca4af", "eca498e186be"],
+  ["eca4b0", "e1848ce185afe186bf"],
+  ["eca4b0", "eca498e186bf"],
+  ["eca4b1", "e1848ce185afe18780"],
+  ["eca4b1", "eca498e18780"],
+  ["eca4b2", "e1848ce185afe18781"],
+  ["eca4b2", "eca498e18781"],
+  ["eca4b3", "e1848ce185afe18782"],
+  ["eca4b3", "eca498e18782"],
+  ["eca4b4", "e1848ce185b0"],
+  ["eca4b5", "e1848ce185b0e186a8"],
+  ["eca4b5", "eca4b4e186a8"],
+  ["eca4b6", "e1848ce185b0e186a9"],
+  ["eca4b6", "eca4b4e186a9"],
+  ["eca4b7", "e1848ce185b0e186aa"],
+  ["eca4b7", "eca4b4e186aa"],
+  ["eca4b8", "e1848ce185b0e186ab"],
+  ["eca4b8", "eca4b4e186ab"],
+  ["eca4b9", "e1848ce185b0e186ac"],
+  ["eca4b9", "eca4b4e186ac"],
+  ["eca4ba", "e1848ce185b0e186ad"],
+  ["eca4ba", "eca4b4e186ad"],
+  ["eca4bb", "e1848ce185b0e186ae"],
+  ["eca4bb", "eca4b4e186ae"],
+  ["eca4bc", "e1848ce185b0e186af"],
+  ["eca4bc", "eca4b4e186af"],
+  ["eca4bd", "e1848ce185b0e186b0"],
+  ["eca4bd", "eca4b4e186b0"],
+  ["eca4be", "e1848ce185b0e186b1"],
+  ["eca4be", "eca4b4e186b1"],
+  ["eca4bf", "e1848ce185b0e186b2"],
+  ["eca4bf", "eca4b4e186b2"],
+  ["eca580", "e1848ce185b0e186b3"],
+  ["eca580", "eca4b4e186b3"],
+  ["eca581", "e1848ce185b0e186b4"],
+  ["eca581", "eca4b4e186b4"],
+  ["eca582", "e1848ce185b0e186b5"],
+  ["eca582", "eca4b4e186b5"],
+  ["eca583", "e1848ce185b0e186b6"],
+  ["eca583", "eca4b4e186b6"],
+  ["eca584", "e1848ce185b0e186b7"],
+  ["eca584", "eca4b4e186b7"],
+  ["eca585", "e1848ce185b0e186b8"],
+  ["eca585", "eca4b4e186b8"],
+  ["eca586", "e1848ce185b0e186b9"],
+  ["eca586", "eca4b4e186b9"],
+  ["eca587", "e1848ce185b0e186ba"],
+  ["eca587", "eca4b4e186ba"],
+  ["eca588", "e1848ce185b0e186bb"],
+  ["eca588", "eca4b4e186bb"],
+  ["eca589", "e1848ce185b0e186bc"],
+  ["eca589", "eca4b4e186bc"],
+  ["eca58a", "e1848ce185b0e186bd"],
+  ["eca58a", "eca4b4e186bd"],
+  ["eca58b", "e1848ce185b0e186be"],
+  ["eca58b", "eca4b4e186be"],
+  ["eca58c", "e1848ce185b0e186bf"],
+  ["eca58c", "eca4b4e186bf"],
+  ["eca58d", "e1848ce185b0e18780"],
+  ["eca58d", "eca4b4e18780"],
+  ["eca58e", "e1848ce185b0e18781"],
+  ["eca58e", "eca4b4e18781"],
+  ["eca58f", "e1848ce185b0e18782"],
+  ["eca58f", "eca4b4e18782"],
+  ["eca590", "e1848ce185b1"],
+  ["eca591", "e1848ce185b1e186a8"],
+  ["eca591", "eca590e186a8"],
+  ["eca592", "e1848ce185b1e186a9"],
+  ["eca592", "eca590e186a9"],
+  ["eca593", "e1848ce185b1e186aa"],
+  ["eca593", "eca590e186aa"],
+  ["eca594", "e1848ce185b1e186ab"],
+  ["eca594", "eca590e186ab"],
+  ["eca595", "e1848ce185b1e186ac"],
+  ["eca595", "eca590e186ac"],
+  ["eca596", "e1848ce185b1e186ad"],
+  ["eca596", "eca590e186ad"],
+  ["eca597", "e1848ce185b1e186ae"],
+  ["eca597", "eca590e186ae"],
+  ["eca598", "e1848ce185b1e186af"],
+  ["eca598", "eca590e186af"],
+  ["eca599", "e1848ce185b1e186b0"],
+  ["eca599", "eca590e186b0"],
+  ["eca59a", "e1848ce185b1e186b1"],
+  ["eca59a", "eca590e186b1"],
+  ["eca59b", "e1848ce185b1e186b2"],
+  ["eca59b", "eca590e186b2"],
+  ["eca59c", "e1848ce185b1e186b3"],
+  ["eca59c", "eca590e186b3"],
+  ["eca59d", "e1848ce185b1e186b4"],
+  ["eca59d", "eca590e186b4"],
+  ["eca59e", "e1848ce185b1e186b5"],
+  ["eca59e", "eca590e186b5"],
+  ["eca59f", "e1848ce185b1e186b6"],
+  ["eca59f", "eca590e186b6"],
+  ["eca5a0", "e1848ce185b1e186b7"],
+  ["eca5a0", "eca590e186b7"],
+  ["eca5a1", "e1848ce185b1e186b8"],
+  ["eca5a1", "eca590e186b8"],
+  ["eca5a2", "e1848ce185b1e186b9"],
+  ["eca5a2", "eca590e186b9"],
+  ["eca5a3", "e1848ce185b1e186ba"],
+  ["eca5a3", "eca590e186ba"],
+  ["eca5a4", "e1848ce185b1e186bb"],
+  ["eca5a4", "eca590e186bb"],
+  ["eca5a5", "e1848ce185b1e186bc"],
+  ["eca5a5", "eca590e186bc"],
+  ["eca5a6", "e1848ce185b1e186bd"],
+  ["eca5a6", "eca590e186bd"],
+  ["eca5a7", "e1848ce185b1e186be"],
+  ["eca5a7", "eca590e186be"],
+  ["eca5a8", "e1848ce185b1e186bf"],
+  ["eca5a8", "eca590e186bf"],
+  ["eca5a9", "e1848ce185b1e18780"],
+  ["eca5a9", "eca590e18780"],
+  ["eca5aa", "e1848ce185b1e18781"],
+  ["eca5aa", "eca590e18781"],
+  ["eca5ab", "e1848ce185b1e18782"],
+  ["eca5ab", "eca590e18782"],
+  ["eca5ac", "e1848ce185b2"],
+  ["eca5ad", "e1848ce185b2e186a8"],
+  ["eca5ad", "eca5ace186a8"],
+  ["eca5ae", "e1848ce185b2e186a9"],
+  ["eca5ae", "eca5ace186a9"],
+  ["eca5af", "e1848ce185b2e186aa"],
+  ["eca5af", "eca5ace186aa"],
+  ["eca5b0", "e1848ce185b2e186ab"],
+  ["eca5b0", "eca5ace186ab"],
+  ["eca5b1", "e1848ce185b2e186ac"],
+  ["eca5b1", "eca5ace186ac"],
+  ["eca5b2", "e1848ce185b2e186ad"],
+  ["eca5b2", "eca5ace186ad"],
+  ["eca5b3", "e1848ce185b2e186ae"],
+  ["eca5b3", "eca5ace186ae"],
+  ["eca5b4", "e1848ce185b2e186af"],
+  ["eca5b4", "eca5ace186af"],
+  ["eca5b5", "e1848ce185b2e186b0"],
+  ["eca5b5", "eca5ace186b0"],
+  ["eca5b6", "e1848ce185b2e186b1"],
+  ["eca5b6", "eca5ace186b1"],
+  ["eca5b7", "e1848ce185b2e186b2"],
+  ["eca5b7", "eca5ace186b2"],
+  ["eca5b8", "e1848ce185b2e186b3"],
+  ["eca5b8", "eca5ace186b3"],
+  ["eca5b9", "e1848ce185b2e186b4"],
+  ["eca5b9", "eca5ace186b4"],
+  ["eca5ba", "e1848ce185b2e186b5"],
+  ["eca5ba", "eca5ace186b5"],
+  ["eca5bb", "e1848ce185b2e186b6"],
+  ["eca5bb", "eca5ace186b6"],
+  ["eca5bc", "e1848ce185b2e186b7"],
+  ["eca5bc", "eca5ace186b7"],
+  ["eca5bd", "e1848ce185b2e186b8"],
+  ["eca5bd", "eca5ace186b8"],
+  ["eca5be", "e1848ce185b2e186b9"],
+  ["eca5be", "eca5ace186b9"],
+  ["eca5bf", "e1848ce185b2e186ba"],
+  ["eca5bf", "eca5ace186ba"],
+  ["eca680", "e1848ce185b2e186bb"],
+  ["eca680", "eca5ace186bb"],
+  ["eca681", "e1848ce185b2e186bc"],
+  ["eca681", "eca5ace186bc"],
+  ["eca682", "e1848ce185b2e186bd"],
+  ["eca682", "eca5ace186bd"],
+  ["eca683", "e1848ce185b2e186be"],
+  ["eca683", "eca5ace186be"],
+  ["eca684", "e1848ce185b2e186bf"],
+  ["eca684", "eca5ace186bf"],
+  ["eca685", "e1848ce185b2e18780"],
+  ["eca685", "eca5ace18780"],
+  ["eca686", "e1848ce185b2e18781"],
+  ["eca686", "eca5ace18781"],
+  ["eca687", "e1848ce185b2e18782"],
+  ["eca687", "eca5ace18782"],
+  ["eca688", "e1848ce185b3"],
+  ["eca689", "e1848ce185b3e186a8"],
+  ["eca689", "eca688e186a8"],
+  ["eca68a", "e1848ce185b3e186a9"],
+  ["eca68a", "eca688e186a9"],
+  ["eca68b", "e1848ce185b3e186aa"],
+  ["eca68b", "eca688e186aa"],
+  ["eca68c", "e1848ce185b3e186ab"],
+  ["eca68c", "eca688e186ab"],
+  ["eca68d", "e1848ce185b3e186ac"],
+  ["eca68d", "eca688e186ac"],
+  ["eca68e", "e1848ce185b3e186ad"],
+  ["eca68e", "eca688e186ad"],
+  ["eca68f", "e1848ce185b3e186ae"],
+  ["eca68f", "eca688e186ae"],
+  ["eca690", "e1848ce185b3e186af"],
+  ["eca690", "eca688e186af"],
+  ["eca691", "e1848ce185b3e186b0"],
+  ["eca691", "eca688e186b0"],
+  ["eca692", "e1848ce185b3e186b1"],
+  ["eca692", "eca688e186b1"],
+  ["eca693", "e1848ce185b3e186b2"],
+  ["eca693", "eca688e186b2"],
+  ["eca694", "e1848ce185b3e186b3"],
+  ["eca694", "eca688e186b3"],
+  ["eca695", "e1848ce185b3e186b4"],
+  ["eca695", "eca688e186b4"],
+  ["eca696", "e1848ce185b3e186b5"],
+  ["eca696", "eca688e186b5"],
+  ["eca697", "e1848ce185b3e186b6"],
+  ["eca697", "eca688e186b6"],
+  ["eca698", "e1848ce185b3e186b7"],
+  ["eca698", "eca688e186b7"],
+  ["eca699", "e1848ce185b3e186b8"],
+  ["eca699", "eca688e186b8"],
+  ["eca69a", "e1848ce185b3e186b9"],
+  ["eca69a", "eca688e186b9"],
+  ["eca69b", "e1848ce185b3e186ba"],
+  ["eca69b", "eca688e186ba"],
+  ["eca69c", "e1848ce185b3e186bb"],
+  ["eca69c", "eca688e186bb"],
+  ["eca69d", "e1848ce185b3e186bc"],
+  ["eca69d", "eca688e186bc"],
+  ["eca69e", "e1848ce185b3e186bd"],
+  ["eca69e", "eca688e186bd"],
+  ["eca69f", "e1848ce185b3e186be"],
+  ["eca69f", "eca688e186be"],
+  ["eca6a0", "e1848ce185b3e186bf"],
+  ["eca6a0", "eca688e186bf"],
+  ["eca6a1", "e1848ce185b3e18780"],
+  ["eca6a1", "eca688e18780"],
+  ["eca6a2", "e1848ce185b3e18781"],
+  ["eca6a2", "eca688e18781"],
+  ["eca6a3", "e1848ce185b3e18782"],
+  ["eca6a3", "eca688e18782"],
+  ["eca6a4", "e1848ce185b4"],
+  ["eca6a5", "e1848ce185b4e186a8"],
+  ["eca6a5", "eca6a4e186a8"],
+  ["eca6a6", "e1848ce185b4e186a9"],
+  ["eca6a6", "eca6a4e186a9"],
+  ["eca6a7", "e1848ce185b4e186aa"],
+  ["eca6a7", "eca6a4e186aa"],
+  ["eca6a8", "e1848ce185b4e186ab"],
+  ["eca6a8", "eca6a4e186ab"],
+  ["eca6a9", "e1848ce185b4e186ac"],
+  ["eca6a9", "eca6a4e186ac"],
+  ["eca6aa", "e1848ce185b4e186ad"],
+  ["eca6aa", "eca6a4e186ad"],
+  ["eca6ab", "e1848ce185b4e186ae"],
+  ["eca6ab", "eca6a4e186ae"],
+  ["eca6ac", "e1848ce185b4e186af"],
+  ["eca6ac", "eca6a4e186af"],
+  ["eca6ad", "e1848ce185b4e186b0"],
+  ["eca6ad", "eca6a4e186b0"],
+  ["eca6ae", "e1848ce185b4e186b1"],
+  ["eca6ae", "eca6a4e186b1"],
+  ["eca6af", "e1848ce185b4e186b2"],
+  ["eca6af", "eca6a4e186b2"],
+  ["eca6b0", "e1848ce185b4e186b3"],
+  ["eca6b0", "eca6a4e186b3"],
+  ["eca6b1", "e1848ce185b4e186b4"],
+  ["eca6b1", "eca6a4e186b4"],
+  ["eca6b2", "e1848ce185b4e186b5"],
+  ["eca6b2", "eca6a4e186b5"],
+  ["eca6b3", "e1848ce185b4e186b6"],
+  ["eca6b3", "eca6a4e186b6"],
+  ["eca6b4", "e1848ce185b4e186b7"],
+  ["eca6b4", "eca6a4e186b7"],
+  ["eca6b5", "e1848ce185b4e186b8"],
+  ["eca6b5", "eca6a4e186b8"],
+  ["eca6b6", "e1848ce185b4e186b9"],
+  ["eca6b6", "eca6a4e186b9"],
+  ["eca6b7", "e1848ce185b4e186ba"],
+  ["eca6b7", "eca6a4e186ba"],
+  ["eca6b8", "e1848ce185b4e186bb"],
+  ["eca6b8", "eca6a4e186bb"],
+  ["eca6b9", "e1848ce185b4e186bc"],
+  ["eca6b9", "eca6a4e186bc"],
+  ["eca6ba", "e1848ce185b4e186bd"],
+  ["eca6ba", "eca6a4e186bd"],
+  ["eca6bb", "e1848ce185b4e186be"],
+  ["eca6bb", "eca6a4e186be"],
+  ["eca6bc", "e1848ce185b4e186bf"],
+  ["eca6bc", "eca6a4e186bf"],
+  ["eca6bd", "e1848ce185b4e18780"],
+  ["eca6bd", "eca6a4e18780"],
+  ["eca6be", "e1848ce185b4e18781"],
+  ["eca6be", "eca6a4e18781"],
+  ["eca6bf", "e1848ce185b4e18782"],
+  ["eca6bf", "eca6a4e18782"],
+  ["eca780", "e1848ce185b5"],
+  ["eca781", "e1848ce185b5e186a8"],
+  ["eca781", "eca780e186a8"],
+  ["eca782", "e1848ce185b5e186a9"],
+  ["eca782", "eca780e186a9"],
+  ["eca783", "e1848ce185b5e186aa"],
+  ["eca783", "eca780e186aa"],
+  ["eca784", "e1848ce185b5e186ab"],
+  ["eca784", "eca780e186ab"],
+  ["eca785", "e1848ce185b5e186ac"],
+  ["eca785", "eca780e186ac"],
+  ["eca786", "e1848ce185b5e186ad"],
+  ["eca786", "eca780e186ad"],
+  ["eca787", "e1848ce185b5e186ae"],
+  ["eca787", "eca780e186ae"],
+  ["eca788", "e1848ce185b5e186af"],
+  ["eca788", "eca780e186af"],
+  ["eca789", "e1848ce185b5e186b0"],
+  ["eca789", "eca780e186b0"],
+  ["eca78a", "e1848ce185b5e186b1"],
+  ["eca78a", "eca780e186b1"],
+  ["eca78b", "e1848ce185b5e186b2"],
+  ["eca78b", "eca780e186b2"],
+  ["eca78c", "e1848ce185b5e186b3"],
+  ["eca78c", "eca780e186b3"],
+  ["eca78d", "e1848ce185b5e186b4"],
+  ["eca78d", "eca780e186b4"],
+  ["eca78e", "e1848ce185b5e186b5"],
+  ["eca78e", "eca780e186b5"],
+  ["eca78f", "e1848ce185b5e186b6"],
+  ["eca78f", "eca780e186b6"],
+  ["eca790", "e1848ce185b5e186b7"],
+  ["eca790", "eca780e186b7"],
+  ["eca791", "e1848ce185b5e186b8"],
+  ["eca791", "eca780e186b8"],
+  ["eca792", "e1848ce185b5e186b9"],
+  ["eca792", "eca780e186b9"],
+  ["eca793", "e1848ce185b5e186ba"],
+  ["eca793", "eca780e186ba"],
+  ["eca794", "e1848ce185b5e186bb"],
+  ["eca794", "eca780e186bb"],
+  ["eca795", "e1848ce185b5e186bc"],
+  ["eca795", "eca780e186bc"],
+  ["eca796", "e1848ce185b5e186bd"],
+  ["eca796", "eca780e186bd"],
+  ["eca797", "e1848ce185b5e186be"],
+  ["eca797", "eca780e186be"],
+  ["eca798", "e1848ce185b5e186bf"],
+  ["eca798", "eca780e186bf"],
+  ["eca799", "e1848ce185b5e18780"],
+  ["eca799", "eca780e18780"],
+  ["eca79a", "e1848ce185b5e18781"],
+  ["eca79a", "eca780e18781"],
+  ["eca79b", "e1848ce185b5e18782"],
+  ["eca79b", "eca780e18782"],
+  ["eca79c", "e1848de185a1"],
+  ["eca79d", "e1848de185a1e186a8"],
+  ["eca79d", "eca79ce186a8"],
+  ["eca79e", "e1848de185a1e186a9"],
+  ["eca79e", "eca79ce186a9"],
+  ["eca79f", "e1848de185a1e186aa"],
+  ["eca79f", "eca79ce186aa"],
+  ["eca7a0", "e1848de185a1e186ab"],
+  ["eca7a0", "eca79ce186ab"],
+  ["eca7a1", "e1848de185a1e186ac"],
+  ["eca7a1", "eca79ce186ac"],
+  ["eca7a2", "e1848de185a1e186ad"],
+  ["eca7a2", "eca79ce186ad"],
+  ["eca7a3", "e1848de185a1e186ae"],
+  ["eca7a3", "eca79ce186ae"],
+  ["eca7a4", "e1848de185a1e186af"],
+  ["eca7a4", "eca79ce186af"],
+  ["eca7a5", "e1848de185a1e186b0"],
+  ["eca7a5", "eca79ce186b0"],
+  ["eca7a6", "e1848de185a1e186b1"],
+  ["eca7a6", "eca79ce186b1"],
+  ["eca7a7", "e1848de185a1e186b2"],
+  ["eca7a7", "eca79ce186b2"],
+  ["eca7a8", "e1848de185a1e186b3"],
+  ["eca7a8", "eca79ce186b3"],
+  ["eca7a9", "e1848de185a1e186b4"],
+  ["eca7a9", "eca79ce186b4"],
+  ["eca7aa", "e1848de185a1e186b5"],
+  ["eca7aa", "eca79ce186b5"],
+  ["eca7ab", "e1848de185a1e186b6"],
+  ["eca7ab", "eca79ce186b6"],
+  ["eca7ac", "e1848de185a1e186b7"],
+  ["eca7ac", "eca79ce186b7"],
+  ["eca7ad", "e1848de185a1e186b8"],
+  ["eca7ad", "eca79ce186b8"],
+  ["eca7ae", "e1848de185a1e186b9"],
+  ["eca7ae", "eca79ce186b9"],
+  ["eca7af", "e1848de185a1e186ba"],
+  ["eca7af", "eca79ce186ba"],
+  ["eca7b0", "e1848de185a1e186bb"],
+  ["eca7b0", "eca79ce186bb"],
+  ["eca7b1", "e1848de185a1e186bc"],
+  ["eca7b1", "eca79ce186bc"],
+  ["eca7b2", "e1848de185a1e186bd"],
+  ["eca7b2", "eca79ce186bd"],
+  ["eca7b3", "e1848de185a1e186be"],
+  ["eca7b3", "eca79ce186be"],
+  ["eca7b4", "e1848de185a1e186bf"],
+  ["eca7b4", "eca79ce186bf"],
+  ["eca7b5", "e1848de185a1e18780"],
+  ["eca7b5", "eca79ce18780"],
+  ["eca7b6", "e1848de185a1e18781"],
+  ["eca7b6", "eca79ce18781"],
+  ["eca7b7", "e1848de185a1e18782"],
+  ["eca7b7", "eca79ce18782"],
+  ["eca7b8", "e1848de185a2"],
+  ["eca7b9", "e1848de185a2e186a8"],
+  ["eca7b9", "eca7b8e186a8"],
+  ["eca7ba", "e1848de185a2e186a9"],
+  ["eca7ba", "eca7b8e186a9"],
+  ["eca7bb", "e1848de185a2e186aa"],
+  ["eca7bb", "eca7b8e186aa"],
+  ["eca7bc", "e1848de185a2e186ab"],
+  ["eca7bc", "eca7b8e186ab"],
+  ["eca7bd", "e1848de185a2e186ac"],
+  ["eca7bd", "eca7b8e186ac"],
+  ["eca7be", "e1848de185a2e186ad"],
+  ["eca7be", "eca7b8e186ad"],
+  ["eca7bf", "e1848de185a2e186ae"],
+  ["eca7bf", "eca7b8e186ae"],
+  ["eca880", "e1848de185a2e186af"],
+  ["eca880", "eca7b8e186af"],
+  ["eca881", "e1848de185a2e186b0"],
+  ["eca881", "eca7b8e186b0"],
+  ["eca882", "e1848de185a2e186b1"],
+  ["eca882", "eca7b8e186b1"],
+  ["eca883", "e1848de185a2e186b2"],
+  ["eca883", "eca7b8e186b2"],
+  ["eca884", "e1848de185a2e186b3"],
+  ["eca884", "eca7b8e186b3"],
+  ["eca885", "e1848de185a2e186b4"],
+  ["eca885", "eca7b8e186b4"],
+  ["eca886", "e1848de185a2e186b5"],
+  ["eca886", "eca7b8e186b5"],
+  ["eca887", "e1848de185a2e186b6"],
+  ["eca887", "eca7b8e186b6"],
+  ["eca888", "e1848de185a2e186b7"],
+  ["eca888", "eca7b8e186b7"],
+  ["eca889", "e1848de185a2e186b8"],
+  ["eca889", "eca7b8e186b8"],
+  ["eca88a", "e1848de185a2e186b9"],
+  ["eca88a", "eca7b8e186b9"],
+  ["eca88b", "e1848de185a2e186ba"],
+  ["eca88b", "eca7b8e186ba"],
+  ["eca88c", "e1848de185a2e186bb"],
+  ["eca88c", "eca7b8e186bb"],
+  ["eca88d", "e1848de185a2e186bc"],
+  ["eca88d", "eca7b8e186bc"],
+  ["eca88e", "e1848de185a2e186bd"],
+  ["eca88e", "eca7b8e186bd"],
+  ["eca88f", "e1848de185a2e186be"],
+  ["eca88f", "eca7b8e186be"],
+  ["eca890", "e1848de185a2e186bf"],
+  ["eca890", "eca7b8e186bf"],
+  ["eca891", "e1848de185a2e18780"],
+  ["eca891", "eca7b8e18780"],
+  ["eca892", "e1848de185a2e18781"],
+  ["eca892", "eca7b8e18781"],
+  ["eca893", "e1848de185a2e18782"],
+  ["eca893", "eca7b8e18782"],
+  ["eca894", "e1848de185a3"],
+  ["eca895", "e1848de185a3e186a8"],
+  ["eca895", "eca894e186a8"],
+  ["eca896", "e1848de185a3e186a9"],
+  ["eca896", "eca894e186a9"],
+  ["eca897", "e1848de185a3e186aa"],
+  ["eca897", "eca894e186aa"],
+  ["eca898", "e1848de185a3e186ab"],
+  ["eca898", "eca894e186ab"],
+  ["eca899", "e1848de185a3e186ac"],
+  ["eca899", "eca894e186ac"],
+  ["eca89a", "e1848de185a3e186ad"],
+  ["eca89a", "eca894e186ad"],
+  ["eca89b", "e1848de185a3e186ae"],
+  ["eca89b", "eca894e186ae"],
+  ["eca89c", "e1848de185a3e186af"],
+  ["eca89c", "eca894e186af"],
+  ["eca89d", "e1848de185a3e186b0"],
+  ["eca89d", "eca894e186b0"],
+  ["eca89e", "e1848de185a3e186b1"],
+  ["eca89e", "eca894e186b1"],
+  ["eca89f", "e1848de185a3e186b2"],
+  ["eca89f", "eca894e186b2"],
+  ["eca8a0", "e1848de185a3e186b3"],
+  ["eca8a0", "eca894e186b3"],
+  ["eca8a1", "e1848de185a3e186b4"],
+  ["eca8a1", "eca894e186b4"],
+  ["eca8a2", "e1848de185a3e186b5"],
+  ["eca8a2", "eca894e186b5"],
+  ["eca8a3", "e1848de185a3e186b6"],
+  ["eca8a3", "eca894e186b6"],
+  ["eca8a4", "e1848de185a3e186b7"],
+  ["eca8a4", "eca894e186b7"],
+  ["eca8a5", "e1848de185a3e186b8"],
+  ["eca8a5", "eca894e186b8"],
+  ["eca8a6", "e1848de185a3e186b9"],
+  ["eca8a6", "eca894e186b9"],
+  ["eca8a7", "e1848de185a3e186ba"],
+  ["eca8a7", "eca894e186ba"],
+  ["eca8a8", "e1848de185a3e186bb"],
+  ["eca8a8", "eca894e186bb"],
+  ["eca8a9", "e1848de185a3e186bc"],
+  ["eca8a9", "eca894e186bc"],
+  ["eca8aa", "e1848de185a3e186bd"],
+  ["eca8aa", "eca894e186bd"],
+  ["eca8ab", "e1848de185a3e186be"],
+  ["eca8ab", "eca894e186be"],
+  ["eca8ac", "e1848de185a3e186bf"],
+  ["eca8ac", "eca894e186bf"],
+  ["eca8ad", "e1848de185a3e18780"],
+  ["eca8ad", "eca894e18780"],
+  ["eca8ae", "e1848de185a3e18781"],
+  ["eca8ae", "eca894e18781"],
+  ["eca8af", "e1848de185a3e18782"],
+  ["eca8af", "eca894e18782"],
+  ["eca8b0", "e1848de185a4"],
+  ["eca8b1", "e1848de185a4e186a8"],
+  ["eca8b1", "eca8b0e186a8"],
+  ["eca8b2", "e1848de185a4e186a9"],
+  ["eca8b2", "eca8b0e186a9"],
+  ["eca8b3", "e1848de185a4e186aa"],
+  ["eca8b3", "eca8b0e186aa"],
+  ["eca8b4", "e1848de185a4e186ab"],
+  ["eca8b4", "eca8b0e186ab"],
+  ["eca8b5", "e1848de185a4e186ac"],
+  ["eca8b5", "eca8b0e186ac"],
+  ["eca8b6", "e1848de185a4e186ad"],
+  ["eca8b6", "eca8b0e186ad"],
+  ["eca8b7", "e1848de185a4e186ae"],
+  ["eca8b7", "eca8b0e186ae"],
+  ["eca8b8", "e1848de185a4e186af"],
+  ["eca8b8", "eca8b0e186af"],
+  ["eca8b9", "e1848de185a4e186b0"],
+  ["eca8b9", "eca8b0e186b0"],
+  ["eca8ba", "e1848de185a4e186b1"],
+  ["eca8ba", "eca8b0e186b1"],
+  ["eca8bb", "e1848de185a4e186b2"],
+  ["eca8bb", "eca8b0e186b2"],
+  ["eca8bc", "e1848de185a4e186b3"],
+  ["eca8bc", "eca8b0e186b3"],
+  ["eca8bd", "e1848de185a4e186b4"],
+  ["eca8bd", "eca8b0e186b4"],
+  ["eca8be", "e1848de185a4e186b5"],
+  ["eca8be", "eca8b0e186b5"],
+  ["eca8bf", "e1848de185a4e186b6"],
+  ["eca8bf", "eca8b0e186b6"],
+  ["eca980", "e1848de185a4e186b7"],
+  ["eca980", "eca8b0e186b7"],
+  ["eca981", "e1848de185a4e186b8"],
+  ["eca981", "eca8b0e186b8"],
+  ["eca982", "e1848de185a4e186b9"],
+  ["eca982", "eca8b0e186b9"],
+  ["eca983", "e1848de185a4e186ba"],
+  ["eca983", "eca8b0e186ba"],
+  ["eca984", "e1848de185a4e186bb"],
+  ["eca984", "eca8b0e186bb"],
+  ["eca985", "e1848de185a4e186bc"],
+  ["eca985", "eca8b0e186bc"],
+  ["eca986", "e1848de185a4e186bd"],
+  ["eca986", "eca8b0e186bd"],
+  ["eca987", "e1848de185a4e186be"],
+  ["eca987", "eca8b0e186be"],
+  ["eca988", "e1848de185a4e186bf"],
+  ["eca988", "eca8b0e186bf"],
+  ["eca989", "e1848de185a4e18780"],
+  ["eca989", "eca8b0e18780"],
+  ["eca98a", "e1848de185a4e18781"],
+  ["eca98a", "eca8b0e18781"],
+  ["eca98b", "e1848de185a4e18782"],
+  ["eca98b", "eca8b0e18782"],
+  ["eca98c", "e1848de185a5"],
+  ["eca98d", "e1848de185a5e186a8"],
+  ["eca98d", "eca98ce186a8"],
+  ["eca98e", "e1848de185a5e186a9"],
+  ["eca98e", "eca98ce186a9"],
+  ["eca98f", "e1848de185a5e186aa"],
+  ["eca98f", "eca98ce186aa"],
+  ["eca990", "e1848de185a5e186ab"],
+  ["eca990", "eca98ce186ab"],
+  ["eca991", "e1848de185a5e186ac"],
+  ["eca991", "eca98ce186ac"],
+  ["eca992", "e1848de185a5e186ad"],
+  ["eca992", "eca98ce186ad"],
+  ["eca993", "e1848de185a5e186ae"],
+  ["eca993", "eca98ce186ae"],
+  ["eca994", "e1848de185a5e186af"],
+  ["eca994", "eca98ce186af"],
+  ["eca995", "e1848de185a5e186b0"],
+  ["eca995", "eca98ce186b0"],
+  ["eca996", "e1848de185a5e186b1"],
+  ["eca996", "eca98ce186b1"],
+  ["eca997", "e1848de185a5e186b2"],
+  ["eca997", "eca98ce186b2"],
+  ["eca998", "e1848de185a5e186b3"],
+  ["eca998", "eca98ce186b3"],
+  ["eca999", "e1848de185a5e186b4"],
+  ["eca999", "eca98ce186b4"],
+  ["eca99a", "e1848de185a5e186b5"],
+  ["eca99a", "eca98ce186b5"],
+  ["eca99b", "e1848de185a5e186b6"],
+  ["eca99b", "eca98ce186b6"],
+  ["eca99c", "e1848de185a5e186b7"],
+  ["eca99c", "eca98ce186b7"],
+  ["eca99d", "e1848de185a5e186b8"],
+  ["eca99d", "eca98ce186b8"],
+  ["eca99e", "e1848de185a5e186b9"],
+  ["eca99e", "eca98ce186b9"],
+  ["eca99f", "e1848de185a5e186ba"],
+  ["eca99f", "eca98ce186ba"],
+  ["eca9a0", "e1848de185a5e186bb"],
+  ["eca9a0", "eca98ce186bb"],
+  ["eca9a1", "e1848de185a5e186bc"],
+  ["eca9a1", "eca98ce186bc"],
+  ["eca9a2", "e1848de185a5e186bd"],
+  ["eca9a2", "eca98ce186bd"],
+  ["eca9a3", "e1848de185a5e186be"],
+  ["eca9a3", "eca98ce186be"],
+  ["eca9a4", "e1848de185a5e186bf"],
+  ["eca9a4", "eca98ce186bf"],
+  ["eca9a5", "e1848de185a5e18780"],
+  ["eca9a5", "eca98ce18780"],
+  ["eca9a6", "e1848de185a5e18781"],
+  ["eca9a6", "eca98ce18781"],
+  ["eca9a7", "e1848de185a5e18782"],
+  ["eca9a7", "eca98ce18782"],
+  ["eca9a8", "e1848de185a6"],
+  ["eca9a9", "e1848de185a6e186a8"],
+  ["eca9a9", "eca9a8e186a8"],
+  ["eca9aa", "e1848de185a6e186a9"],
+  ["eca9aa", "eca9a8e186a9"],
+  ["eca9ab", "e1848de185a6e186aa"],
+  ["eca9ab", "eca9a8e186aa"],
+  ["eca9ac", "e1848de185a6e186ab"],
+  ["eca9ac", "eca9a8e186ab"],
+  ["eca9ad", "e1848de185a6e186ac"],
+  ["eca9ad", "eca9a8e186ac"],
+  ["eca9ae", "e1848de185a6e186ad"],
+  ["eca9ae", "eca9a8e186ad"],
+  ["eca9af", "e1848de185a6e186ae"],
+  ["eca9af", "eca9a8e186ae"],
+  ["eca9b0", "e1848de185a6e186af"],
+  ["eca9b0", "eca9a8e186af"],
+  ["eca9b1", "e1848de185a6e186b0"],
+  ["eca9b1", "eca9a8e186b0"],
+  ["eca9b2", "e1848de185a6e186b1"],
+  ["eca9b2", "eca9a8e186b1"],
+  ["eca9b3", "e1848de185a6e186b2"],
+  ["eca9b3", "eca9a8e186b2"],
+  ["eca9b4", "e1848de185a6e186b3"],
+  ["eca9b4", "eca9a8e186b3"],
+  ["eca9b5", "e1848de185a6e186b4"],
+  ["eca9b5", "eca9a8e186b4"],
+  ["eca9b6", "e1848de185a6e186b5"],
+  ["eca9b6", "eca9a8e186b5"],
+  ["eca9b7", "e1848de185a6e186b6"],
+  ["eca9b7", "eca9a8e186b6"],
+  ["eca9b8", "e1848de185a6e186b7"],
+  ["eca9b8", "eca9a8e186b7"],
+  ["eca9b9", "e1848de185a6e186b8"],
+  ["eca9b9", "eca9a8e186b8"],
+  ["eca9ba", "e1848de185a6e186b9"],
+  ["eca9ba", "eca9a8e186b9"],
+  ["eca9bb", "e1848de185a6e186ba"],
+  ["eca9bb", "eca9a8e186ba"],
+  ["eca9bc", "e1848de185a6e186bb"],
+  ["eca9bc", "eca9a8e186bb"],
+  ["eca9bd", "e1848de185a6e186bc"],
+  ["eca9bd", "eca9a8e186bc"],
+  ["eca9be", "e1848de185a6e186bd"],
+  ["eca9be", "eca9a8e186bd"],
+  ["eca9bf", "e1848de185a6e186be"],
+  ["eca9bf", "eca9a8e186be"],
+  ["ecaa80", "e1848de185a6e186bf"],
+  ["ecaa80", "eca9a8e186bf"],
+  ["ecaa81", "e1848de185a6e18780"],
+  ["ecaa81", "eca9a8e18780"],
+  ["ecaa82", "e1848de185a6e18781"],
+  ["ecaa82", "eca9a8e18781"],
+  ["ecaa83", "e1848de185a6e18782"],
+  ["ecaa83", "eca9a8e18782"],
+  ["ecaa84", "e1848de185a7"],
+  ["ecaa85", "e1848de185a7e186a8"],
+  ["ecaa85", "ecaa84e186a8"],
+  ["ecaa86", "e1848de185a7e186a9"],
+  ["ecaa86", "ecaa84e186a9"],
+  ["ecaa87", "e1848de185a7e186aa"],
+  ["ecaa87", "ecaa84e186aa"],
+  ["ecaa88", "e1848de185a7e186ab"],
+  ["ecaa88", "ecaa84e186ab"],
+  ["ecaa89", "e1848de185a7e186ac"],
+  ["ecaa89", "ecaa84e186ac"],
+  ["ecaa8a", "e1848de185a7e186ad"],
+  ["ecaa8a", "ecaa84e186ad"],
+  ["ecaa8b", "e1848de185a7e186ae"],
+  ["ecaa8b", "ecaa84e186ae"],
+  ["ecaa8c", "e1848de185a7e186af"],
+  ["ecaa8c", "ecaa84e186af"],
+  ["ecaa8d", "e1848de185a7e186b0"],
+  ["ecaa8d", "ecaa84e186b0"],
+  ["ecaa8e", "e1848de185a7e186b1"],
+  ["ecaa8e", "ecaa84e186b1"],
+  ["ecaa8f", "e1848de185a7e186b2"],
+  ["ecaa8f", "ecaa84e186b2"],
+  ["ecaa90", "e1848de185a7e186b3"],
+  ["ecaa90", "ecaa84e186b3"],
+  ["ecaa91", "e1848de185a7e186b4"],
+  ["ecaa91", "ecaa84e186b4"],
+  ["ecaa92", "e1848de185a7e186b5"],
+  ["ecaa92", "ecaa84e186b5"],
+  ["ecaa93", "e1848de185a7e186b6"],
+  ["ecaa93", "ecaa84e186b6"],
+  ["ecaa94", "e1848de185a7e186b7"],
+  ["ecaa94", "ecaa84e186b7"],
+  ["ecaa95", "e1848de185a7e186b8"],
+  ["ecaa95", "ecaa84e186b8"],
+  ["ecaa96", "e1848de185a7e186b9"],
+  ["ecaa96", "ecaa84e186b9"],
+  ["ecaa97", "e1848de185a7e186ba"],
+  ["ecaa97", "ecaa84e186ba"],
+  ["ecaa98", "e1848de185a7e186bb"],
+  ["ecaa98", "ecaa84e186bb"],
+  ["ecaa99", "e1848de185a7e186bc"],
+  ["ecaa99", "ecaa84e186bc"],
+  ["ecaa9a", "e1848de185a7e186bd"],
+  ["ecaa9a", "ecaa84e186bd"],
+  ["ecaa9b", "e1848de185a7e186be"],
+  ["ecaa9b", "ecaa84e186be"],
+  ["ecaa9c", "e1848de185a7e186bf"],
+  ["ecaa9c", "ecaa84e186bf"],
+  ["ecaa9d", "e1848de185a7e18780"],
+  ["ecaa9d", "ecaa84e18780"],
+  ["ecaa9e", "e1848de185a7e18781"],
+  ["ecaa9e", "ecaa84e18781"],
+  ["ecaa9f", "e1848de185a7e18782"],
+  ["ecaa9f", "ecaa84e18782"],
+  ["ecaaa0", "e1848de185a8"],
+  ["ecaaa1", "e1848de185a8e186a8"],
+  ["ecaaa1", "ecaaa0e186a8"],
+  ["ecaaa2", "e1848de185a8e186a9"],
+  ["ecaaa2", "ecaaa0e186a9"],
+  ["ecaaa3", "e1848de185a8e186aa"],
+  ["ecaaa3", "ecaaa0e186aa"],
+  ["ecaaa4", "e1848de185a8e186ab"],
+  ["ecaaa4", "ecaaa0e186ab"],
+  ["ecaaa5", "e1848de185a8e186ac"],
+  ["ecaaa5", "ecaaa0e186ac"],
+  ["ecaaa6", "e1848de185a8e186ad"],
+  ["ecaaa6", "ecaaa0e186ad"],
+  ["ecaaa7", "e1848de185a8e186ae"],
+  ["ecaaa7", "ecaaa0e186ae"],
+  ["ecaaa8", "e1848de185a8e186af"],
+  ["ecaaa8", "ecaaa0e186af"],
+  ["ecaaa9", "e1848de185a8e186b0"],
+  ["ecaaa9", "ecaaa0e186b0"],
+  ["ecaaaa", "e1848de185a8e186b1"],
+  ["ecaaaa", "ecaaa0e186b1"],
+  ["ecaaab", "e1848de185a8e186b2"],
+  ["ecaaab", "ecaaa0e186b2"],
+  ["ecaaac", "e1848de185a8e186b3"],
+  ["ecaaac", "ecaaa0e186b3"],
+  ["ecaaad", "e1848de185a8e186b4"],
+  ["ecaaad", "ecaaa0e186b4"],
+  ["ecaaae", "e1848de185a8e186b5"],
+  ["ecaaae", "ecaaa0e186b5"],
+  ["ecaaaf", "e1848de185a8e186b6"],
+  ["ecaaaf", "ecaaa0e186b6"],
+  ["ecaab0", "e1848de185a8e186b7"],
+  ["ecaab0", "ecaaa0e186b7"],
+  ["ecaab1", "e1848de185a8e186b8"],
+  ["ecaab1", "ecaaa0e186b8"],
+  ["ecaab2", "e1848de185a8e186b9"],
+  ["ecaab2", "ecaaa0e186b9"],
+  ["ecaab3", "e1848de185a8e186ba"],
+  ["ecaab3", "ecaaa0e186ba"],
+  ["ecaab4", "e1848de185a8e186bb"],
+  ["ecaab4", "ecaaa0e186bb"],
+  ["ecaab5", "e1848de185a8e186bc"],
+  ["ecaab5", "ecaaa0e186bc"],
+  ["ecaab6", "e1848de185a8e186bd"],
+  ["ecaab6", "ecaaa0e186bd"],
+  ["ecaab7", "e1848de185a8e186be"],
+  ["ecaab7", "ecaaa0e186be"],
+  ["ecaab8", "e1848de185a8e186bf"],
+  ["ecaab8", "ecaaa0e186bf"],
+  ["ecaab9", "e1848de185a8e18780"],
+  ["ecaab9", "ecaaa0e18780"],
+  ["ecaaba", "e1848de185a8e18781"],
+  ["ecaaba", "ecaaa0e18781"],
+  ["ecaabb", "e1848de185a8e18782"],
+  ["ecaabb", "ecaaa0e18782"],
+  ["ecaabc", "e1848de185a9"],
+  ["ecaabd", "e1848de185a9e186a8"],
+  ["ecaabd", "ecaabce186a8"],
+  ["ecaabe", "e1848de185a9e186a9"],
+  ["ecaabe", "ecaabce186a9"],
+  ["ecaabf", "e1848de185a9e186aa"],
+  ["ecaabf", "ecaabce186aa"],
+  ["ecab80", "e1848de185a9e186ab"],
+  ["ecab80", "ecaabce186ab"],
+  ["ecab81", "e1848de185a9e186ac"],
+  ["ecab81", "ecaabce186ac"],
+  ["ecab82", "e1848de185a9e186ad"],
+  ["ecab82", "ecaabce186ad"],
+  ["ecab83", "e1848de185a9e186ae"],
+  ["ecab83", "ecaabce186ae"],
+  ["ecab84", "e1848de185a9e186af"],
+  ["ecab84", "ecaabce186af"],
+  ["ecab85", "e1848de185a9e186b0"],
+  ["ecab85", "ecaabce186b0"],
+  ["ecab86", "e1848de185a9e186b1"],
+  ["ecab86", "ecaabce186b1"],
+  ["ecab87", "e1848de185a9e186b2"],
+  ["ecab87", "ecaabce186b2"],
+  ["ecab88", "e1848de185a9e186b3"],
+  ["ecab88", "ecaabce186b3"],
+  ["ecab89", "e1848de185a9e186b4"],
+  ["ecab89", "ecaabce186b4"],
+  ["ecab8a", "e1848de185a9e186b5"],
+  ["ecab8a", "ecaabce186b5"],
+  ["ecab8b", "e1848de185a9e186b6"],
+  ["ecab8b", "ecaabce186b6"],
+  ["ecab8c", "e1848de185a9e186b7"],
+  ["ecab8c", "ecaabce186b7"],
+  ["ecab8d", "e1848de185a9e186b8"],
+  ["ecab8d", "ecaabce186b8"],
+  ["ecab8e", "e1848de185a9e186b9"],
+  ["ecab8e", "ecaabce186b9"],
+  ["ecab8f", "e1848de185a9e186ba"],
+  ["ecab8f", "ecaabce186ba"],
+  ["ecab90", "e1848de185a9e186bb"],
+  ["ecab90", "ecaabce186bb"],
+  ["ecab91", "e1848de185a9e186bc"],
+  ["ecab91", "ecaabce186bc"],
+  ["ecab92", "e1848de185a9e186bd"],
+  ["ecab92", "ecaabce186bd"],
+  ["ecab93", "e1848de185a9e186be"],
+  ["ecab93", "ecaabce186be"],
+  ["ecab94", "e1848de185a9e186bf"],
+  ["ecab94", "ecaabce186bf"],
+  ["ecab95", "e1848de185a9e18780"],
+  ["ecab95", "ecaabce18780"],
+  ["ecab96", "e1848de185a9e18781"],
+  ["ecab96", "ecaabce18781"],
+  ["ecab97", "e1848de185a9e18782"],
+  ["ecab97", "ecaabce18782"],
+  ["ecab98", "e1848de185aa"],
+  ["ecab99", "e1848de185aae186a8"],
+  ["ecab99", "ecab98e186a8"],
+  ["ecab9a", "e1848de185aae186a9"],
+  ["ecab9a", "ecab98e186a9"],
+  ["ecab9b", "e1848de185aae186aa"],
+  ["ecab9b", "ecab98e186aa"],
+  ["ecab9c", "e1848de185aae186ab"],
+  ["ecab9c", "ecab98e186ab"],
+  ["ecab9d", "e1848de185aae186ac"],
+  ["ecab9d", "ecab98e186ac"],
+  ["ecab9e", "e1848de185aae186ad"],
+  ["ecab9e", "ecab98e186ad"],
+  ["ecab9f", "e1848de185aae186ae"],
+  ["ecab9f", "ecab98e186ae"],
+  ["ecaba0", "e1848de185aae186af"],
+  ["ecaba0", "ecab98e186af"],
+  ["ecaba1", "e1848de185aae186b0"],
+  ["ecaba1", "ecab98e186b0"],
+  ["ecaba2", "e1848de185aae186b1"],
+  ["ecaba2", "ecab98e186b1"],
+  ["ecaba3", "e1848de185aae186b2"],
+  ["ecaba3", "ecab98e186b2"],
+  ["ecaba4", "e1848de185aae186b3"],
+  ["ecaba4", "ecab98e186b3"],
+  ["ecaba5", "e1848de185aae186b4"],
+  ["ecaba5", "ecab98e186b4"],
+  ["ecaba6", "e1848de185aae186b5"],
+  ["ecaba6", "ecab98e186b5"],
+  ["ecaba7", "e1848de185aae186b6"],
+  ["ecaba7", "ecab98e186b6"],
+  ["ecaba8", "e1848de185aae186b7"],
+  ["ecaba8", "ecab98e186b7"],
+  ["ecaba9", "e1848de185aae186b8"],
+  ["ecaba9", "ecab98e186b8"],
+  ["ecabaa", "e1848de185aae186b9"],
+  ["ecabaa", "ecab98e186b9"],
+  ["ecabab", "e1848de185aae186ba"],
+  ["ecabab", "ecab98e186ba"],
+  ["ecabac", "e1848de185aae186bb"],
+  ["ecabac", "ecab98e186bb"],
+  ["ecabad", "e1848de185aae186bc"],
+  ["ecabad", "ecab98e186bc"],
+  ["ecabae", "e1848de185aae186bd"],
+  ["ecabae", "ecab98e186bd"],
+  ["ecabaf", "e1848de185aae186be"],
+  ["ecabaf", "ecab98e186be"],
+  ["ecabb0", "e1848de185aae186bf"],
+  ["ecabb0", "ecab98e186bf"],
+  ["ecabb1", "e1848de185aae18780"],
+  ["ecabb1", "ecab98e18780"],
+  ["ecabb2", "e1848de185aae18781"],
+  ["ecabb2", "ecab98e18781"],
+  ["ecabb3", "e1848de185aae18782"],
+  ["ecabb3", "ecab98e18782"],
+  ["ecabb4", "e1848de185ab"],
+  ["ecabb5", "e1848de185abe186a8"],
+  ["ecabb5", "ecabb4e186a8"],
+  ["ecabb6", "e1848de185abe186a9"],
+  ["ecabb6", "ecabb4e186a9"],
+  ["ecabb7", "e1848de185abe186aa"],
+  ["ecabb7", "ecabb4e186aa"],
+  ["ecabb8", "e1848de185abe186ab"],
+  ["ecabb8", "ecabb4e186ab"],
+  ["ecabb9", "e1848de185abe186ac"],
+  ["ecabb9", "ecabb4e186ac"],
+  ["ecabba", "e1848de185abe186ad"],
+  ["ecabba", "ecabb4e186ad"],
+  ["ecabbb", "e1848de185abe186ae"],
+  ["ecabbb", "ecabb4e186ae"],
+  ["ecabbc", "e1848de185abe186af"],
+  ["ecabbc", "ecabb4e186af"],
+  ["ecabbd", "e1848de185abe186b0"],
+  ["ecabbd", "ecabb4e186b0"],
+  ["ecabbe", "e1848de185abe186b1"],
+  ["ecabbe", "ecabb4e186b1"],
+  ["ecabbf", "e1848de185abe186b2"],
+  ["ecabbf", "ecabb4e186b2"],
+  ["ecac80", "e1848de185abe186b3"],
+  ["ecac80", "ecabb4e186b3"],
+  ["ecac81", "e1848de185abe186b4"],
+  ["ecac81", "ecabb4e186b4"],
+  ["ecac82", "e1848de185abe186b5"],
+  ["ecac82", "ecabb4e186b5"],
+  ["ecac83", "e1848de185abe186b6"],
+  ["ecac83", "ecabb4e186b6"],
+  ["ecac84", "e1848de185abe186b7"],
+  ["ecac84", "ecabb4e186b7"],
+  ["ecac85", "e1848de185abe186b8"],
+  ["ecac85", "ecabb4e186b8"],
+  ["ecac86", "e1848de185abe186b9"],
+  ["ecac86", "ecabb4e186b9"],
+  ["ecac87", "e1848de185abe186ba"],
+  ["ecac87", "ecabb4e186ba"],
+  ["ecac88", "e1848de185abe186bb"],
+  ["ecac88", "ecabb4e186bb"],
+  ["ecac89", "e1848de185abe186bc"],
+  ["ecac89", "ecabb4e186bc"],
+  ["ecac8a", "e1848de185abe186bd"],
+  ["ecac8a", "ecabb4e186bd"],
+  ["ecac8b", "e1848de185abe186be"],
+  ["ecac8b", "ecabb4e186be"],
+  ["ecac8c", "e1848de185abe186bf"],
+  ["ecac8c", "ecabb4e186bf"],
+  ["ecac8d", "e1848de185abe18780"],
+  ["ecac8d", "ecabb4e18780"],
+  ["ecac8e", "e1848de185abe18781"],
+  ["ecac8e", "ecabb4e18781"],
+  ["ecac8f", "e1848de185abe18782"],
+  ["ecac8f", "ecabb4e18782"],
+  ["ecac90", "e1848de185ac"],
+  ["ecac91", "e1848de185ace186a8"],
+  ["ecac91", "ecac90e186a8"],
+  ["ecac92", "e1848de185ace186a9"],
+  ["ecac92", "ecac90e186a9"],
+  ["ecac93", "e1848de185ace186aa"],
+  ["ecac93", "ecac90e186aa"],
+  ["ecac94", "e1848de185ace186ab"],
+  ["ecac94", "ecac90e186ab"],
+  ["ecac95", "e1848de185ace186ac"],
+  ["ecac95", "ecac90e186ac"],
+  ["ecac96", "e1848de185ace186ad"],
+  ["ecac96", "ecac90e186ad"],
+  ["ecac97", "e1848de185ace186ae"],
+  ["ecac97", "ecac90e186ae"],
+  ["ecac98", "e1848de185ace186af"],
+  ["ecac98", "ecac90e186af"],
+  ["ecac99", "e1848de185ace186b0"],
+  ["ecac99", "ecac90e186b0"],
+  ["ecac9a", "e1848de185ace186b1"],
+  ["ecac9a", "ecac90e186b1"],
+  ["ecac9b", "e1848de185ace186b2"],
+  ["ecac9b", "ecac90e186b2"],
+  ["ecac9c", "e1848de185ace186b3"],
+  ["ecac9c", "ecac90e186b3"],
+  ["ecac9d", "e1848de185ace186b4"],
+  ["ecac9d", "ecac90e186b4"],
+  ["ecac9e", "e1848de185ace186b5"],
+  ["ecac9e", "ecac90e186b5"],
+  ["ecac9f", "e1848de185ace186b6"],
+  ["ecac9f", "ecac90e186b6"],
+  ["ecaca0", "e1848de185ace186b7"],
+  ["ecaca0", "ecac90e186b7"],
+  ["ecaca1", "e1848de185ace186b8"],
+  ["ecaca1", "ecac90e186b8"],
+  ["ecaca2", "e1848de185ace186b9"],
+  ["ecaca2", "ecac90e186b9"],
+  ["ecaca3", "e1848de185ace186ba"],
+  ["ecaca3", "ecac90e186ba"],
+  ["ecaca4", "e1848de185ace186bb"],
+  ["ecaca4", "ecac90e186bb"],
+  ["ecaca5", "e1848de185ace186bc"],
+  ["ecaca5", "ecac90e186bc"],
+  ["ecaca6", "e1848de185ace186bd"],
+  ["ecaca6", "ecac90e186bd"],
+  ["ecaca7", "e1848de185ace186be"],
+  ["ecaca7", "ecac90e186be"],
+  ["ecaca8", "e1848de185ace186bf"],
+  ["ecaca8", "ecac90e186bf"],
+  ["ecaca9", "e1848de185ace18780"],
+  ["ecaca9", "ecac90e18780"],
+  ["ecacaa", "e1848de185ace18781"],
+  ["ecacaa", "ecac90e18781"],
+  ["ecacab", "e1848de185ace18782"],
+  ["ecacab", "ecac90e18782"],
+  ["ecacac", "e1848de185ad"],
+  ["ecacad", "e1848de185ade186a8"],
+  ["ecacad", "ecacace186a8"],
+  ["ecacae", "e1848de185ade186a9"],
+  ["ecacae", "ecacace186a9"],
+  ["ecacaf", "e1848de185ade186aa"],
+  ["ecacaf", "ecacace186aa"],
+  ["ecacb0", "e1848de185ade186ab"],
+  ["ecacb0", "ecacace186ab"],
+  ["ecacb1", "e1848de185ade186ac"],
+  ["ecacb1", "ecacace186ac"],
+  ["ecacb2", "e1848de185ade186ad"],
+  ["ecacb2", "ecacace186ad"],
+  ["ecacb3", "e1848de185ade186ae"],
+  ["ecacb3", "ecacace186ae"],
+  ["ecacb4", "e1848de185ade186af"],
+  ["ecacb4", "ecacace186af"],
+  ["ecacb5", "e1848de185ade186b0"],
+  ["ecacb5", "ecacace186b0"],
+  ["ecacb6", "e1848de185ade186b1"],
+  ["ecacb6", "ecacace186b1"],
+  ["ecacb7", "e1848de185ade186b2"],
+  ["ecacb7", "ecacace186b2"],
+  ["ecacb8", "e1848de185ade186b3"],
+  ["ecacb8", "ecacace186b3"],
+  ["ecacb9", "e1848de185ade186b4"],
+  ["ecacb9", "ecacace186b4"],
+  ["ecacba", "e1848de185ade186b5"],
+  ["ecacba", "ecacace186b5"],
+  ["ecacbb", "e1848de185ade186b6"],
+  ["ecacbb", "ecacace186b6"],
+  ["ecacbc", "e1848de185ade186b7"],
+  ["ecacbc", "ecacace186b7"],
+  ["ecacbd", "e1848de185ade186b8"],
+  ["ecacbd", "ecacace186b8"],
+  ["ecacbe", "e1848de185ade186b9"],
+  ["ecacbe", "ecacace186b9"],
+  ["ecacbf", "e1848de185ade186ba"],
+  ["ecacbf", "ecacace186ba"],
+  ["ecad80", "e1848de185ade186bb"],
+  ["ecad80", "ecacace186bb"],
+  ["ecad81", "e1848de185ade186bc"],
+  ["ecad81", "ecacace186bc"],
+  ["ecad82", "e1848de185ade186bd"],
+  ["ecad82", "ecacace186bd"],
+  ["ecad83", "e1848de185ade186be"],
+  ["ecad83", "ecacace186be"],
+  ["ecad84", "e1848de185ade186bf"],
+  ["ecad84", "ecacace186bf"],
+  ["ecad85", "e1848de185ade18780"],
+  ["ecad85", "ecacace18780"],
+  ["ecad86", "e1848de185ade18781"],
+  ["ecad86", "ecacace18781"],
+  ["ecad87", "e1848de185ade18782"],
+  ["ecad87", "ecacace18782"],
+  ["ecad88", "e1848de185ae"],
+  ["ecad89", "e1848de185aee186a8"],
+  ["ecad89", "ecad88e186a8"],
+  ["ecad8a", "e1848de185aee186a9"],
+  ["ecad8a", "ecad88e186a9"],
+  ["ecad8b", "e1848de185aee186aa"],
+  ["ecad8b", "ecad88e186aa"],
+  ["ecad8c", "e1848de185aee186ab"],
+  ["ecad8c", "ecad88e186ab"],
+  ["ecad8d", "e1848de185aee186ac"],
+  ["ecad8d", "ecad88e186ac"],
+  ["ecad8e", "e1848de185aee186ad"],
+  ["ecad8e", "ecad88e186ad"],
+  ["ecad8f", "e1848de185aee186ae"],
+  ["ecad8f", "ecad88e186ae"],
+  ["ecad90", "e1848de185aee186af"],
+  ["ecad90", "ecad88e186af"],
+  ["ecad91", "e1848de185aee186b0"],
+  ["ecad91", "ecad88e186b0"],
+  ["ecad92", "e1848de185aee186b1"],
+  ["ecad92", "ecad88e186b1"],
+  ["ecad93", "e1848de185aee186b2"],
+  ["ecad93", "ecad88e186b2"],
+  ["ecad94", "e1848de185aee186b3"],
+  ["ecad94", "ecad88e186b3"],
+  ["ecad95", "e1848de185aee186b4"],
+  ["ecad95", "ecad88e186b4"],
+  ["ecad96", "e1848de185aee186b5"],
+  ["ecad96", "ecad88e186b5"],
+  ["ecad97", "e1848de185aee186b6"],
+  ["ecad97", "ecad88e186b6"],
+  ["ecad98", "e1848de185aee186b7"],
+  ["ecad98", "ecad88e186b7"],
+  ["ecad99", "e1848de185aee186b8"],
+  ["ecad99", "ecad88e186b8"],
+  ["ecad9a", "e1848de185aee186b9"],
+  ["ecad9a", "ecad88e186b9"],
+  ["ecad9b", "e1848de185aee186ba"],
+  ["ecad9b", "ecad88e186ba"],
+  ["ecad9c", "e1848de185aee186bb"],
+  ["ecad9c", "ecad88e186bb"],
+  ["ecad9d", "e1848de185aee186bc"],
+  ["ecad9d", "ecad88e186bc"],
+  ["ecad9e", "e1848de185aee186bd"],
+  ["ecad9e", "ecad88e186bd"],
+  ["ecad9f", "e1848de185aee186be"],
+  ["ecad9f", "ecad88e186be"],
+  ["ecada0", "e1848de185aee186bf"],
+  ["ecada0", "ecad88e186bf"],
+  ["ecada1", "e1848de185aee18780"],
+  ["ecada1", "ecad88e18780"],
+  ["ecada2", "e1848de185aee18781"],
+  ["ecada2", "ecad88e18781"],
+  ["ecada3", "e1848de185aee18782"],
+  ["ecada3", "ecad88e18782"],
+  ["ecada4", "e1848de185af"],
+  ["ecada5", "e1848de185afe186a8"],
+  ["ecada5", "ecada4e186a8"],
+  ["ecada6", "e1848de185afe186a9"],
+  ["ecada6", "ecada4e186a9"],
+  ["ecada7", "e1848de185afe186aa"],
+  ["ecada7", "ecada4e186aa"],
+  ["ecada8", "e1848de185afe186ab"],
+  ["ecada8", "ecada4e186ab"],
+  ["ecada9", "e1848de185afe186ac"],
+  ["ecada9", "ecada4e186ac"],
+  ["ecadaa", "e1848de185afe186ad"],
+  ["ecadaa", "ecada4e186ad"],
+  ["ecadab", "e1848de185afe186ae"],
+  ["ecadab", "ecada4e186ae"],
+  ["ecadac", "e1848de185afe186af"],
+  ["ecadac", "ecada4e186af"],
+  ["ecadad", "e1848de185afe186b0"],
+  ["ecadad", "ecada4e186b0"],
+  ["ecadae", "e1848de185afe186b1"],
+  ["ecadae", "ecada4e186b1"],
+  ["ecadaf", "e1848de185afe186b2"],
+  ["ecadaf", "ecada4e186b2"],
+  ["ecadb0", "e1848de185afe186b3"],
+  ["ecadb0", "ecada4e186b3"],
+  ["ecadb1", "e1848de185afe186b4"],
+  ["ecadb1", "ecada4e186b4"],
+  ["ecadb2", "e1848de185afe186b5"],
+  ["ecadb2", "ecada4e186b5"],
+  ["ecadb3", "e1848de185afe186b6"],
+  ["ecadb3", "ecada4e186b6"],
+  ["ecadb4", "e1848de185afe186b7"],
+  ["ecadb4", "ecada4e186b7"],
+  ["ecadb5", "e1848de185afe186b8"],
+  ["ecadb5", "ecada4e186b8"],
+  ["ecadb6", "e1848de185afe186b9"],
+  ["ecadb6", "ecada4e186b9"],
+  ["ecadb7", "e1848de185afe186ba"],
+  ["ecadb7", "ecada4e186ba"],
+  ["ecadb8", "e1848de185afe186bb"],
+  ["ecadb8", "ecada4e186bb"],
+  ["ecadb9", "e1848de185afe186bc"],
+  ["ecadb9", "ecada4e186bc"],
+  ["ecadba", "e1848de185afe186bd"],
+  ["ecadba", "ecada4e186bd"],
+  ["ecadbb", "e1848de185afe186be"],
+  ["ecadbb", "ecada4e186be"],
+  ["ecadbc", "e1848de185afe186bf"],
+  ["ecadbc", "ecada4e186bf"],
+  ["ecadbd", "e1848de185afe18780"],
+  ["ecadbd", "ecada4e18780"],
+  ["ecadbe", "e1848de185afe18781"],
+  ["ecadbe", "ecada4e18781"],
+  ["ecadbf", "e1848de185afe18782"],
+  ["ecadbf", "ecada4e18782"],
+  ["ecae80", "e1848de185b0"],
+  ["ecae81", "e1848de185b0e186a8"],
+  ["ecae81", "ecae80e186a8"],
+  ["ecae82", "e1848de185b0e186a9"],
+  ["ecae82", "ecae80e186a9"],
+  ["ecae83", "e1848de185b0e186aa"],
+  ["ecae83", "ecae80e186aa"],
+  ["ecae84", "e1848de185b0e186ab"],
+  ["ecae84", "ecae80e186ab"],
+  ["ecae85", "e1848de185b0e186ac"],
+  ["ecae85", "ecae80e186ac"],
+  ["ecae86", "e1848de185b0e186ad"],
+  ["ecae86", "ecae80e186ad"],
+  ["ecae87", "e1848de185b0e186ae"],
+  ["ecae87", "ecae80e186ae"],
+  ["ecae88", "e1848de185b0e186af"],
+  ["ecae88", "ecae80e186af"],
+  ["ecae89", "e1848de185b0e186b0"],
+  ["ecae89", "ecae80e186b0"],
+  ["ecae8a", "e1848de185b0e186b1"],
+  ["ecae8a", "ecae80e186b1"],
+  ["ecae8b", "e1848de185b0e186b2"],
+  ["ecae8b", "ecae80e186b2"],
+  ["ecae8c", "e1848de185b0e186b3"],
+  ["ecae8c", "ecae80e186b3"],
+  ["ecae8d", "e1848de185b0e186b4"],
+  ["ecae8d", "ecae80e186b4"],
+  ["ecae8e", "e1848de185b0e186b5"],
+  ["ecae8e", "ecae80e186b5"],
+  ["ecae8f", "e1848de185b0e186b6"],
+  ["ecae8f", "ecae80e186b6"],
+  ["ecae90", "e1848de185b0e186b7"],
+  ["ecae90", "ecae80e186b7"],
+  ["ecae91", "e1848de185b0e186b8"],
+  ["ecae91", "ecae80e186b8"],
+  ["ecae92", "e1848de185b0e186b9"],
+  ["ecae92", "ecae80e186b9"],
+  ["ecae93", "e1848de185b0e186ba"],
+  ["ecae93", "ecae80e186ba"],
+  ["ecae94", "e1848de185b0e186bb"],
+  ["ecae94", "ecae80e186bb"],
+  ["ecae95", "e1848de185b0e186bc"],
+  ["ecae95", "ecae80e186bc"],
+  ["ecae96", "e1848de185b0e186bd"],
+  ["ecae96", "ecae80e186bd"],
+  ["ecae97", "e1848de185b0e186be"],
+  ["ecae97", "ecae80e186be"],
+  ["ecae98", "e1848de185b0e186bf"],
+  ["ecae98", "ecae80e186bf"],
+  ["ecae99", "e1848de185b0e18780"],
+  ["ecae99", "ecae80e18780"],
+  ["ecae9a", "e1848de185b0e18781"],
+  ["ecae9a", "ecae80e18781"],
+  ["ecae9b", "e1848de185b0e18782"],
+  ["ecae9b", "ecae80e18782"],
+  ["ecae9c", "e1848de185b1"],
+  ["ecae9d", "e1848de185b1e186a8"],
+  ["ecae9d", "ecae9ce186a8"],
+  ["ecae9e", "e1848de185b1e186a9"],
+  ["ecae9e", "ecae9ce186a9"],
+  ["ecae9f", "e1848de185b1e186aa"],
+  ["ecae9f", "ecae9ce186aa"],
+  ["ecaea0", "e1848de185b1e186ab"],
+  ["ecaea0", "ecae9ce186ab"],
+  ["ecaea1", "e1848de185b1e186ac"],
+  ["ecaea1", "ecae9ce186ac"],
+  ["ecaea2", "e1848de185b1e186ad"],
+  ["ecaea2", "ecae9ce186ad"],
+  ["ecaea3", "e1848de185b1e186ae"],
+  ["ecaea3", "ecae9ce186ae"],
+  ["ecaea4", "e1848de185b1e186af"],
+  ["ecaea4", "ecae9ce186af"],
+  ["ecaea5", "e1848de185b1e186b0"],
+  ["ecaea5", "ecae9ce186b0"],
+  ["ecaea6", "e1848de185b1e186b1"],
+  ["ecaea6", "ecae9ce186b1"],
+  ["ecaea7", "e1848de185b1e186b2"],
+  ["ecaea7", "ecae9ce186b2"],
+  ["ecaea8", "e1848de185b1e186b3"],
+  ["ecaea8", "ecae9ce186b3"],
+  ["ecaea9", "e1848de185b1e186b4"],
+  ["ecaea9", "ecae9ce186b4"],
+  ["ecaeaa", "e1848de185b1e186b5"],
+  ["ecaeaa", "ecae9ce186b5"],
+  ["ecaeab", "e1848de185b1e186b6"],
+  ["ecaeab", "ecae9ce186b6"],
+  ["ecaeac", "e1848de185b1e186b7"],
+  ["ecaeac", "ecae9ce186b7"],
+  ["ecaead", "e1848de185b1e186b8"],
+  ["ecaead", "ecae9ce186b8"],
+  ["ecaeae", "e1848de185b1e186b9"],
+  ["ecaeae", "ecae9ce186b9"],
+  ["ecaeaf", "e1848de185b1e186ba"],
+  ["ecaeaf", "ecae9ce186ba"],
+  ["ecaeb0", "e1848de185b1e186bb"],
+  ["ecaeb0", "ecae9ce186bb"],
+  ["ecaeb1", "e1848de185b1e186bc"],
+  ["ecaeb1", "ecae9ce186bc"],
+  ["ecaeb2", "e1848de185b1e186bd"],
+  ["ecaeb2", "ecae9ce186bd"],
+  ["ecaeb3", "e1848de185b1e186be"],
+  ["ecaeb3", "ecae9ce186be"],
+  ["ecaeb4", "e1848de185b1e186bf"],
+  ["ecaeb4", "ecae9ce186bf"],
+  ["ecaeb5", "e1848de185b1e18780"],
+  ["ecaeb5", "ecae9ce18780"],
+  ["ecaeb6", "e1848de185b1e18781"],
+  ["ecaeb6", "ecae9ce18781"],
+  ["ecaeb7", "e1848de185b1e18782"],
+  ["ecaeb7", "ecae9ce18782"],
+  ["ecaeb8", "e1848de185b2"],
+  ["ecaeb9", "e1848de185b2e186a8"],
+  ["ecaeb9", "ecaeb8e186a8"],
+  ["ecaeba", "e1848de185b2e186a9"],
+  ["ecaeba", "ecaeb8e186a9"],
+  ["ecaebb", "e1848de185b2e186aa"],
+  ["ecaebb", "ecaeb8e186aa"],
+  ["ecaebc", "e1848de185b2e186ab"],
+  ["ecaebc", "ecaeb8e186ab"],
+  ["ecaebd", "e1848de185b2e186ac"],
+  ["ecaebd", "ecaeb8e186ac"],
+  ["ecaebe", "e1848de185b2e186ad"],
+  ["ecaebe", "ecaeb8e186ad"],
+  ["ecaebf", "e1848de185b2e186ae"],
+  ["ecaebf", "ecaeb8e186ae"],
+  ["ecaf80", "e1848de185b2e186af"],
+  ["ecaf80", "ecaeb8e186af"],
+  ["ecaf81", "e1848de185b2e186b0"],
+  ["ecaf81", "ecaeb8e186b0"],
+  ["ecaf82", "e1848de185b2e186b1"],
+  ["ecaf82", "ecaeb8e186b1"],
+  ["ecaf83", "e1848de185b2e186b2"],
+  ["ecaf83", "ecaeb8e186b2"],
+  ["ecaf84", "e1848de185b2e186b3"],
+  ["ecaf84", "ecaeb8e186b3"],
+  ["ecaf85", "e1848de185b2e186b4"],
+  ["ecaf85", "ecaeb8e186b4"],
+  ["ecaf86", "e1848de185b2e186b5"],
+  ["ecaf86", "ecaeb8e186b5"],
+  ["ecaf87", "e1848de185b2e186b6"],
+  ["ecaf87", "ecaeb8e186b6"],
+  ["ecaf88", "e1848de185b2e186b7"],
+  ["ecaf88", "ecaeb8e186b7"],
+  ["ecaf89", "e1848de185b2e186b8"],
+  ["ecaf89", "ecaeb8e186b8"],
+  ["ecaf8a", "e1848de185b2e186b9"],
+  ["ecaf8a", "ecaeb8e186b9"],
+  ["ecaf8b", "e1848de185b2e186ba"],
+  ["ecaf8b", "ecaeb8e186ba"],
+  ["ecaf8c", "e1848de185b2e186bb"],
+  ["ecaf8c", "ecaeb8e186bb"],
+  ["ecaf8d", "e1848de185b2e186bc"],
+  ["ecaf8d", "ecaeb8e186bc"],
+  ["ecaf8e", "e1848de185b2e186bd"],
+  ["ecaf8e", "ecaeb8e186bd"],
+  ["ecaf8f", "e1848de185b2e186be"],
+  ["ecaf8f", "ecaeb8e186be"],
+  ["ecaf90", "e1848de185b2e186bf"],
+  ["ecaf90", "ecaeb8e186bf"],
+  ["ecaf91", "e1848de185b2e18780"],
+  ["ecaf91", "ecaeb8e18780"],
+  ["ecaf92", "e1848de185b2e18781"],
+  ["ecaf92", "ecaeb8e18781"],
+  ["ecaf93", "e1848de185b2e18782"],
+  ["ecaf93", "ecaeb8e18782"],
+  ["ecaf94", "e1848de185b3"],
+  ["ecaf95", "e1848de185b3e186a8"],
+  ["ecaf95", "ecaf94e186a8"],
+  ["ecaf96", "e1848de185b3e186a9"],
+  ["ecaf96", "ecaf94e186a9"],
+  ["ecaf97", "e1848de185b3e186aa"],
+  ["ecaf97", "ecaf94e186aa"],
+  ["ecaf98", "e1848de185b3e186ab"],
+  ["ecaf98", "ecaf94e186ab"],
+  ["ecaf99", "e1848de185b3e186ac"],
+  ["ecaf99", "ecaf94e186ac"],
+  ["ecaf9a", "e1848de185b3e186ad"],
+  ["ecaf9a", "ecaf94e186ad"],
+  ["ecaf9b", "e1848de185b3e186ae"],
+  ["ecaf9b", "ecaf94e186ae"],
+  ["ecaf9c", "e1848de185b3e186af"],
+  ["ecaf9c", "ecaf94e186af"],
+  ["ecaf9d", "e1848de185b3e186b0"],
+  ["ecaf9d", "ecaf94e186b0"],
+  ["ecaf9e", "e1848de185b3e186b1"],
+  ["ecaf9e", "ecaf94e186b1"],
+  ["ecaf9f", "e1848de185b3e186b2"],
+  ["ecaf9f", "ecaf94e186b2"],
+  ["ecafa0", "e1848de185b3e186b3"],
+  ["ecafa0", "ecaf94e186b3"],
+  ["ecafa1", "e1848de185b3e186b4"],
+  ["ecafa1", "ecaf94e186b4"],
+  ["ecafa2", "e1848de185b3e186b5"],
+  ["ecafa2", "ecaf94e186b5"],
+  ["ecafa3", "e1848de185b3e186b6"],
+  ["ecafa3", "ecaf94e186b6"],
+  ["ecafa4", "e1848de185b3e186b7"],
+  ["ecafa4", "ecaf94e186b7"],
+  ["ecafa5", "e1848de185b3e186b8"],
+  ["ecafa5", "ecaf94e186b8"],
+  ["ecafa6", "e1848de185b3e186b9"],
+  ["ecafa6", "ecaf94e186b9"],
+  ["ecafa7", "e1848de185b3e186ba"],
+  ["ecafa7", "ecaf94e186ba"],
+  ["ecafa8", "e1848de185b3e186bb"],
+  ["ecafa8", "ecaf94e186bb"],
+  ["ecafa9", "e1848de185b3e186bc"],
+  ["ecafa9", "ecaf94e186bc"],
+  ["ecafaa", "e1848de185b3e186bd"],
+  ["ecafaa", "ecaf94e186bd"],
+  ["ecafab", "e1848de185b3e186be"],
+  ["ecafab", "ecaf94e186be"],
+  ["ecafac", "e1848de185b3e186bf"],
+  ["ecafac", "ecaf94e186bf"],
+  ["ecafad", "e1848de185b3e18780"],
+  ["ecafad", "ecaf94e18780"],
+  ["ecafae", "e1848de185b3e18781"],
+  ["ecafae", "ecaf94e18781"],
+  ["ecafaf", "e1848de185b3e18782"],
+  ["ecafaf", "ecaf94e18782"],
+  ["ecafb0", "e1848de185b4"],
+  ["ecafb1", "e1848de185b4e186a8"],
+  ["ecafb1", "ecafb0e186a8"],
+  ["ecafb2", "e1848de185b4e186a9"],
+  ["ecafb2", "ecafb0e186a9"],
+  ["ecafb3", "e1848de185b4e186aa"],
+  ["ecafb3", "ecafb0e186aa"],
+  ["ecafb4", "e1848de185b4e186ab"],
+  ["ecafb4", "ecafb0e186ab"],
+  ["ecafb5", "e1848de185b4e186ac"],
+  ["ecafb5", "ecafb0e186ac"],
+  ["ecafb6", "e1848de185b4e186ad"],
+  ["ecafb6", "ecafb0e186ad"],
+  ["ecafb7", "e1848de185b4e186ae"],
+  ["ecafb7", "ecafb0e186ae"],
+  ["ecafb8", "e1848de185b4e186af"],
+  ["ecafb8", "ecafb0e186af"],
+  ["ecafb9", "e1848de185b4e186b0"],
+  ["ecafb9", "ecafb0e186b0"],
+  ["ecafba", "e1848de185b4e186b1"],
+  ["ecafba", "ecafb0e186b1"],
+  ["ecafbb", "e1848de185b4e186b2"],
+  ["ecafbb", "ecafb0e186b2"],
+  ["ecafbc", "e1848de185b4e186b3"],
+  ["ecafbc", "ecafb0e186b3"],
+  ["ecafbd", "e1848de185b4e186b4"],
+  ["ecafbd", "ecafb0e186b4"],
+  ["ecafbe", "e1848de185b4e186b5"],
+  ["ecafbe", "ecafb0e186b5"],
+  ["ecafbf", "e1848de185b4e186b6"],
+  ["ecafbf", "ecafb0e186b6"],
+  ["ecb080", "e1848de185b4e186b7"],
+  ["ecb080", "ecafb0e186b7"],
+  ["ecb081", "e1848de185b4e186b8"],
+  ["ecb081", "ecafb0e186b8"],
+  ["ecb082", "e1848de185b4e186b9"],
+  ["ecb082", "ecafb0e186b9"],
+  ["ecb083", "e1848de185b4e186ba"],
+  ["ecb083", "ecafb0e186ba"],
+  ["ecb084", "e1848de185b4e186bb"],
+  ["ecb084", "ecafb0e186bb"],
+  ["ecb085", "e1848de185b4e186bc"],
+  ["ecb085", "ecafb0e186bc"],
+  ["ecb086", "e1848de185b4e186bd"],
+  ["ecb086", "ecafb0e186bd"],
+  ["ecb087", "e1848de185b4e186be"],
+  ["ecb087", "ecafb0e186be"],
+  ["ecb088", "e1848de185b4e186bf"],
+  ["ecb088", "ecafb0e186bf"],
+  ["ecb089", "e1848de185b4e18780"],
+  ["ecb089", "ecafb0e18780"],
+  ["ecb08a", "e1848de185b4e18781"],
+  ["ecb08a", "ecafb0e18781"],
+  ["ecb08b", "e1848de185b4e18782"],
+  ["ecb08b", "ecafb0e18782"],
+  ["ecb08c", "e1848de185b5"],
+  ["ecb08d", "e1848de185b5e186a8"],
+  ["ecb08d", "ecb08ce186a8"],
+  ["ecb08e", "e1848de185b5e186a9"],
+  ["ecb08e", "ecb08ce186a9"],
+  ["ecb08f", "e1848de185b5e186aa"],
+  ["ecb08f", "ecb08ce186aa"],
+  ["ecb090", "e1848de185b5e186ab"],
+  ["ecb090", "ecb08ce186ab"],
+  ["ecb091", "e1848de185b5e186ac"],
+  ["ecb091", "ecb08ce186ac"],
+  ["ecb092", "e1848de185b5e186ad"],
+  ["ecb092", "ecb08ce186ad"],
+  ["ecb093", "e1848de185b5e186ae"],
+  ["ecb093", "ecb08ce186ae"],
+  ["ecb094", "e1848de185b5e186af"],
+  ["ecb094", "ecb08ce186af"],
+  ["ecb095", "e1848de185b5e186b0"],
+  ["ecb095", "ecb08ce186b0"],
+  ["ecb096", "e1848de185b5e186b1"],
+  ["ecb096", "ecb08ce186b1"],
+  ["ecb097", "e1848de185b5e186b2"],
+  ["ecb097", "ecb08ce186b2"],
+  ["ecb098", "e1848de185b5e186b3"],
+  ["ecb098", "ecb08ce186b3"],
+  ["ecb099", "e1848de185b5e186b4"],
+  ["ecb099", "ecb08ce186b4"],
+  ["ecb09a", "e1848de185b5e186b5"],
+  ["ecb09a", "ecb08ce186b5"],
+  ["ecb09b", "e1848de185b5e186b6"],
+  ["ecb09b", "ecb08ce186b6"],
+  ["ecb09c", "e1848de185b5e186b7"],
+  ["ecb09c", "ecb08ce186b7"],
+  ["ecb09d", "e1848de185b5e186b8"],
+  ["ecb09d", "ecb08ce186b8"],
+  ["ecb09e", "e1848de185b5e186b9"],
+  ["ecb09e", "ecb08ce186b9"],
+  ["ecb09f", "e1848de185b5e186ba"],
+  ["ecb09f", "ecb08ce186ba"],
+  ["ecb0a0", "e1848de185b5e186bb"],
+  ["ecb0a0", "ecb08ce186bb"],
+  ["ecb0a1", "e1848de185b5e186bc"],
+  ["ecb0a1", "ecb08ce186bc"],
+  ["ecb0a2", "e1848de185b5e186bd"],
+  ["ecb0a2", "ecb08ce186bd"],
+  ["ecb0a3", "e1848de185b5e186be"],
+  ["ecb0a3", "ecb08ce186be"],
+  ["ecb0a4", "e1848de185b5e186bf"],
+  ["ecb0a4", "ecb08ce186bf"],
+  ["ecb0a5", "e1848de185b5e18780"],
+  ["ecb0a5", "ecb08ce18780"],
+  ["ecb0a6", "e1848de185b5e18781"],
+  ["ecb0a6", "ecb08ce18781"],
+  ["ecb0a7", "e1848de185b5e18782"],
+  ["ecb0a7", "ecb08ce18782"],
+  ["ecb0a8", "e1848ee185a1"],
+  ["ecb0a9", "e1848ee185a1e186a8"],
+  ["ecb0a9", "ecb0a8e186a8"],
+  ["ecb0aa", "e1848ee185a1e186a9"],
+  ["ecb0aa", "ecb0a8e186a9"],
+  ["ecb0ab", "e1848ee185a1e186aa"],
+  ["ecb0ab", "ecb0a8e186aa"],
+  ["ecb0ac", "e1848ee185a1e186ab"],
+  ["ecb0ac", "ecb0a8e186ab"],
+  ["ecb0ad", "e1848ee185a1e186ac"],
+  ["ecb0ad", "ecb0a8e186ac"],
+  ["ecb0ae", "e1848ee185a1e186ad"],
+  ["ecb0ae", "ecb0a8e186ad"],
+  ["ecb0af", "e1848ee185a1e186ae"],
+  ["ecb0af", "ecb0a8e186ae"],
+  ["ecb0b0", "e1848ee185a1e186af"],
+  ["ecb0b0", "ecb0a8e186af"],
+  ["ecb0b1", "e1848ee185a1e186b0"],
+  ["ecb0b1", "ecb0a8e186b0"],
+  ["ecb0b2", "e1848ee185a1e186b1"],
+  ["ecb0b2", "ecb0a8e186b1"],
+  ["ecb0b3", "e1848ee185a1e186b2"],
+  ["ecb0b3", "ecb0a8e186b2"],
+  ["ecb0b4", "e1848ee185a1e186b3"],
+  ["ecb0b4", "ecb0a8e186b3"],
+  ["ecb0b5", "e1848ee185a1e186b4"],
+  ["ecb0b5", "ecb0a8e186b4"],
+  ["ecb0b6", "e1848ee185a1e186b5"],
+  ["ecb0b6", "ecb0a8e186b5"],
+  ["ecb0b7", "e1848ee185a1e186b6"],
+  ["ecb0b7", "ecb0a8e186b6"],
+  ["ecb0b8", "e1848ee185a1e186b7"],
+  ["ecb0b8", "ecb0a8e186b7"],
+  ["ecb0b9", "e1848ee185a1e186b8"],
+  ["ecb0b9", "ecb0a8e186b8"],
+  ["ecb0ba", "e1848ee185a1e186b9"],
+  ["ecb0ba", "ecb0a8e186b9"],
+  ["ecb0bb", "e1848ee185a1e186ba"],
+  ["ecb0bb", "ecb0a8e186ba"],
+  ["ecb0bc", "e1848ee185a1e186bb"],
+  ["ecb0bc", "ecb0a8e186bb"],
+  ["ecb0bd", "e1848ee185a1e186bc"],
+  ["ecb0bd", "ecb0a8e186bc"],
+  ["ecb0be", "e1848ee185a1e186bd"],
+  ["ecb0be", "ecb0a8e186bd"],
+  ["ecb0bf", "e1848ee185a1e186be"],
+  ["ecb0bf", "ecb0a8e186be"],
+  ["ecb180", "e1848ee185a1e186bf"],
+  ["ecb180", "ecb0a8e186bf"],
+  ["ecb181", "e1848ee185a1e18780"],
+  ["ecb181", "ecb0a8e18780"],
+  ["ecb182", "e1848ee185a1e18781"],
+  ["ecb182", "ecb0a8e18781"],
+  ["ecb183", "e1848ee185a1e18782"],
+  ["ecb183", "ecb0a8e18782"],
+  ["ecb184", "e1848ee185a2"],
+  ["ecb185", "e1848ee185a2e186a8"],
+  ["ecb185", "ecb184e186a8"],
+  ["ecb186", "e1848ee185a2e186a9"],
+  ["ecb186", "ecb184e186a9"],
+  ["ecb187", "e1848ee185a2e186aa"],
+  ["ecb187", "ecb184e186aa"],
+  ["ecb188", "e1848ee185a2e186ab"],
+  ["ecb188", "ecb184e186ab"],
+  ["ecb189", "e1848ee185a2e186ac"],
+  ["ecb189", "ecb184e186ac"],
+  ["ecb18a", "e1848ee185a2e186ad"],
+  ["ecb18a", "ecb184e186ad"],
+  ["ecb18b", "e1848ee185a2e186ae"],
+  ["ecb18b", "ecb184e186ae"],
+  ["ecb18c", "e1848ee185a2e186af"],
+  ["ecb18c", "ecb184e186af"],
+  ["ecb18d", "e1848ee185a2e186b0"],
+  ["ecb18d", "ecb184e186b0"],
+  ["ecb18e", "e1848ee185a2e186b1"],
+  ["ecb18e", "ecb184e186b1"],
+  ["ecb18f", "e1848ee185a2e186b2"],
+  ["ecb18f", "ecb184e186b2"],
+  ["ecb190", "e1848ee185a2e186b3"],
+  ["ecb190", "ecb184e186b3"],
+  ["ecb191", "e1848ee185a2e186b4"],
+  ["ecb191", "ecb184e186b4"],
+  ["ecb192", "e1848ee185a2e186b5"],
+  ["ecb192", "ecb184e186b5"],
+  ["ecb193", "e1848ee185a2e186b6"],
+  ["ecb193", "ecb184e186b6"],
+  ["ecb194", "e1848ee185a2e186b7"],
+  ["ecb194", "ecb184e186b7"],
+  ["ecb195", "e1848ee185a2e186b8"],
+  ["ecb195", "ecb184e186b8"],
+  ["ecb196", "e1848ee185a2e186b9"],
+  ["ecb196", "ecb184e186b9"],
+  ["ecb197", "e1848ee185a2e186ba"],
+  ["ecb197", "ecb184e186ba"],
+  ["ecb198", "e1848ee185a2e186bb"],
+  ["ecb198", "ecb184e186bb"],
+  ["ecb199", "e1848ee185a2e186bc"],
+  ["ecb199", "ecb184e186bc"],
+  ["ecb19a", "e1848ee185a2e186bd"],
+  ["ecb19a", "ecb184e186bd"],
+  ["ecb19b", "e1848ee185a2e186be"],
+  ["ecb19b", "ecb184e186be"],
+  ["ecb19c", "e1848ee185a2e186bf"],
+  ["ecb19c", "ecb184e186bf"],
+  ["ecb19d", "e1848ee185a2e18780"],
+  ["ecb19d", "ecb184e18780"],
+  ["ecb19e", "e1848ee185a2e18781"],
+  ["ecb19e", "ecb184e18781"],
+  ["ecb19f", "e1848ee185a2e18782"],
+  ["ecb19f", "ecb184e18782"],
+  ["ecb1a0", "e1848ee185a3"],
+  ["ecb1a1", "e1848ee185a3e186a8"],
+  ["ecb1a1", "ecb1a0e186a8"],
+  ["ecb1a2", "e1848ee185a3e186a9"],
+  ["ecb1a2", "ecb1a0e186a9"],
+  ["ecb1a3", "e1848ee185a3e186aa"],
+  ["ecb1a3", "ecb1a0e186aa"],
+  ["ecb1a4", "e1848ee185a3e186ab"],
+  ["ecb1a4", "ecb1a0e186ab"],
+  ["ecb1a5", "e1848ee185a3e186ac"],
+  ["ecb1a5", "ecb1a0e186ac"],
+  ["ecb1a6", "e1848ee185a3e186ad"],
+  ["ecb1a6", "ecb1a0e186ad"],
+  ["ecb1a7", "e1848ee185a3e186ae"],
+  ["ecb1a7", "ecb1a0e186ae"],
+  ["ecb1a8", "e1848ee185a3e186af"],
+  ["ecb1a8", "ecb1a0e186af"],
+  ["ecb1a9", "e1848ee185a3e186b0"],
+  ["ecb1a9", "ecb1a0e186b0"],
+  ["ecb1aa", "e1848ee185a3e186b1"],
+  ["ecb1aa", "ecb1a0e186b1"],
+  ["ecb1ab", "e1848ee185a3e186b2"],
+  ["ecb1ab", "ecb1a0e186b2"],
+  ["ecb1ac", "e1848ee185a3e186b3"],
+  ["ecb1ac", "ecb1a0e186b3"],
+  ["ecb1ad", "e1848ee185a3e186b4"],
+  ["ecb1ad", "ecb1a0e186b4"],
+  ["ecb1ae", "e1848ee185a3e186b5"],
+  ["ecb1ae", "ecb1a0e186b5"],
+  ["ecb1af", "e1848ee185a3e186b6"],
+  ["ecb1af", "ecb1a0e186b6"],
+  ["ecb1b0", "e1848ee185a3e186b7"],
+  ["ecb1b0", "ecb1a0e186b7"],
+  ["ecb1b1", "e1848ee185a3e186b8"],
+  ["ecb1b1", "ecb1a0e186b8"],
+  ["ecb1b2", "e1848ee185a3e186b9"],
+  ["ecb1b2", "ecb1a0e186b9"],
+  ["ecb1b3", "e1848ee185a3e186ba"],
+  ["ecb1b3", "ecb1a0e186ba"],
+  ["ecb1b4", "e1848ee185a3e186bb"],
+  ["ecb1b4", "ecb1a0e186bb"],
+  ["ecb1b5", "e1848ee185a3e186bc"],
+  ["ecb1b5", "ecb1a0e186bc"],
+  ["ecb1b6", "e1848ee185a3e186bd"],
+  ["ecb1b6", "ecb1a0e186bd"],
+  ["ecb1b7", "e1848ee185a3e186be"],
+  ["ecb1b7", "ecb1a0e186be"],
+  ["ecb1b8", "e1848ee185a3e186bf"],
+  ["ecb1b8", "ecb1a0e186bf"],
+  ["ecb1b9", "e1848ee185a3e18780"],
+  ["ecb1b9", "ecb1a0e18780"],
+  ["ecb1ba", "e1848ee185a3e18781"],
+  ["ecb1ba", "ecb1a0e18781"],
+  ["ecb1bb", "e1848ee185a3e18782"],
+  ["ecb1bb", "ecb1a0e18782"],
+  ["ecb1bc", "e1848ee185a4"],
+  ["ecb1bd", "e1848ee185a4e186a8"],
+  ["ecb1bd", "ecb1bce186a8"],
+  ["ecb1be", "e1848ee185a4e186a9"],
+  ["ecb1be", "ecb1bce186a9"],
+  ["ecb1bf", "e1848ee185a4e186aa"],
+  ["ecb1bf", "ecb1bce186aa"],
+  ["ecb280", "e1848ee185a4e186ab"],
+  ["ecb280", "ecb1bce186ab"],
+  ["ecb281", "e1848ee185a4e186ac"],
+  ["ecb281", "ecb1bce186ac"],
+  ["ecb282", "e1848ee185a4e186ad"],
+  ["ecb282", "ecb1bce186ad"],
+  ["ecb283", "e1848ee185a4e186ae"],
+  ["ecb283", "ecb1bce186ae"],
+  ["ecb284", "e1848ee185a4e186af"],
+  ["ecb284", "ecb1bce186af"],
+  ["ecb285", "e1848ee185a4e186b0"],
+  ["ecb285", "ecb1bce186b0"],
+  ["ecb286", "e1848ee185a4e186b1"],
+  ["ecb286", "ecb1bce186b1"],
+  ["ecb287", "e1848ee185a4e186b2"],
+  ["ecb287", "ecb1bce186b2"],
+  ["ecb288", "e1848ee185a4e186b3"],
+  ["ecb288", "ecb1bce186b3"],
+  ["ecb289", "e1848ee185a4e186b4"],
+  ["ecb289", "ecb1bce186b4"],
+  ["ecb28a", "e1848ee185a4e186b5"],
+  ["ecb28a", "ecb1bce186b5"],
+  ["ecb28b", "e1848ee185a4e186b6"],
+  ["ecb28b", "ecb1bce186b6"],
+  ["ecb28c", "e1848ee185a4e186b7"],
+  ["ecb28c", "ecb1bce186b7"],
+  ["ecb28d", "e1848ee185a4e186b8"],
+  ["ecb28d", "ecb1bce186b8"],
+  ["ecb28e", "e1848ee185a4e186b9"],
+  ["ecb28e", "ecb1bce186b9"],
+  ["ecb28f", "e1848ee185a4e186ba"],
+  ["ecb28f", "ecb1bce186ba"],
+  ["ecb290", "e1848ee185a4e186bb"],
+  ["ecb290", "ecb1bce186bb"],
+  ["ecb291", "e1848ee185a4e186bc"],
+  ["ecb291", "ecb1bce186bc"],
+  ["ecb292", "e1848ee185a4e186bd"],
+  ["ecb292", "ecb1bce186bd"],
+  ["ecb293", "e1848ee185a4e186be"],
+  ["ecb293", "ecb1bce186be"],
+  ["ecb294", "e1848ee185a4e186bf"],
+  ["ecb294", "ecb1bce186bf"],
+  ["ecb295", "e1848ee185a4e18780"],
+  ["ecb295", "ecb1bce18780"],
+  ["ecb296", "e1848ee185a4e18781"],
+  ["ecb296", "ecb1bce18781"],
+  ["ecb297", "e1848ee185a4e18782"],
+  ["ecb297", "ecb1bce18782"],
+  ["ecb298", "e1848ee185a5"],
+  ["ecb299", "e1848ee185a5e186a8"],
+  ["ecb299", "ecb298e186a8"],
+  ["ecb29a", "e1848ee185a5e186a9"],
+  ["ecb29a", "ecb298e186a9"],
+  ["ecb29b", "e1848ee185a5e186aa"],
+  ["ecb29b", "ecb298e186aa"],
+  ["ecb29c", "e1848ee185a5e186ab"],
+  ["ecb29c", "ecb298e186ab"],
+  ["ecb29d", "e1848ee185a5e186ac"],
+  ["ecb29d", "ecb298e186ac"],
+  ["ecb29e", "e1848ee185a5e186ad"],
+  ["ecb29e", "ecb298e186ad"],
+  ["ecb29f", "e1848ee185a5e186ae"],
+  ["ecb29f", "ecb298e186ae"],
+  ["ecb2a0", "e1848ee185a5e186af"],
+  ["ecb2a0", "ecb298e186af"],
+  ["ecb2a1", "e1848ee185a5e186b0"],
+  ["ecb2a1", "ecb298e186b0"],
+  ["ecb2a2", "e1848ee185a5e186b1"],
+  ["ecb2a2", "ecb298e186b1"],
+  ["ecb2a3", "e1848ee185a5e186b2"],
+  ["ecb2a3", "ecb298e186b2"],
+  ["ecb2a4", "e1848ee185a5e186b3"],
+  ["ecb2a4", "ecb298e186b3"],
+  ["ecb2a5", "e1848ee185a5e186b4"],
+  ["ecb2a5", "ecb298e186b4"],
+  ["ecb2a6", "e1848ee185a5e186b5"],
+  ["ecb2a6", "ecb298e186b5"],
+  ["ecb2a7", "e1848ee185a5e186b6"],
+  ["ecb2a7", "ecb298e186b6"],
+  ["ecb2a8", "e1848ee185a5e186b7"],
+  ["ecb2a8", "ecb298e186b7"],
+  ["ecb2a9", "e1848ee185a5e186b8"],
+  ["ecb2a9", "ecb298e186b8"],
+  ["ecb2aa", "e1848ee185a5e186b9"],
+  ["ecb2aa", "ecb298e186b9"],
+  ["ecb2ab", "e1848ee185a5e186ba"],
+  ["ecb2ab", "ecb298e186ba"],
+  ["ecb2ac", "e1848ee185a5e186bb"],
+  ["ecb2ac", "ecb298e186bb"],
+  ["ecb2ad", "e1848ee185a5e186bc"],
+  ["ecb2ad", "ecb298e186bc"],
+  ["ecb2ae", "e1848ee185a5e186bd"],
+  ["ecb2ae", "ecb298e186bd"],
+  ["ecb2af", "e1848ee185a5e186be"],
+  ["ecb2af", "ecb298e186be"],
+  ["ecb2b0", "e1848ee185a5e186bf"],
+  ["ecb2b0", "ecb298e186bf"],
+  ["ecb2b1", "e1848ee185a5e18780"],
+  ["ecb2b1", "ecb298e18780"],
+  ["ecb2b2", "e1848ee185a5e18781"],
+  ["ecb2b2", "ecb298e18781"],
+  ["ecb2b3", "e1848ee185a5e18782"],
+  ["ecb2b3", "ecb298e18782"],
+  ["ecb2b4", "e1848ee185a6"],
+  ["ecb2b5", "e1848ee185a6e186a8"],
+  ["ecb2b5", "ecb2b4e186a8"],
+  ["ecb2b6", "e1848ee185a6e186a9"],
+  ["ecb2b6", "ecb2b4e186a9"],
+  ["ecb2b7", "e1848ee185a6e186aa"],
+  ["ecb2b7", "ecb2b4e186aa"],
+  ["ecb2b8", "e1848ee185a6e186ab"],
+  ["ecb2b8", "ecb2b4e186ab"],
+  ["ecb2b9", "e1848ee185a6e186ac"],
+  ["ecb2b9", "ecb2b4e186ac"],
+  ["ecb2ba", "e1848ee185a6e186ad"],
+  ["ecb2ba", "ecb2b4e186ad"],
+  ["ecb2bb", "e1848ee185a6e186ae"],
+  ["ecb2bb", "ecb2b4e186ae"],
+  ["ecb2bc", "e1848ee185a6e186af"],
+  ["ecb2bc", "ecb2b4e186af"],
+  ["ecb2bd", "e1848ee185a6e186b0"],
+  ["ecb2bd", "ecb2b4e186b0"],
+  ["ecb2be", "e1848ee185a6e186b1"],
+  ["ecb2be", "ecb2b4e186b1"],
+  ["ecb2bf", "e1848ee185a6e186b2"],
+  ["ecb2bf", "ecb2b4e186b2"],
+  ["ecb380", "e1848ee185a6e186b3"],
+  ["ecb380", "ecb2b4e186b3"],
+  ["ecb381", "e1848ee185a6e186b4"],
+  ["ecb381", "ecb2b4e186b4"],
+  ["ecb382", "e1848ee185a6e186b5"],
+  ["ecb382", "ecb2b4e186b5"],
+  ["ecb383", "e1848ee185a6e186b6"],
+  ["ecb383", "ecb2b4e186b6"],
+  ["ecb384", "e1848ee185a6e186b7"],
+  ["ecb384", "ecb2b4e186b7"],
+  ["ecb385", "e1848ee185a6e186b8"],
+  ["ecb385", "ecb2b4e186b8"],
+  ["ecb386", "e1848ee185a6e186b9"],
+  ["ecb386", "ecb2b4e186b9"],
+  ["ecb387", "e1848ee185a6e186ba"],
+  ["ecb387", "ecb2b4e186ba"],
+  ["ecb388", "e1848ee185a6e186bb"],
+  ["ecb388", "ecb2b4e186bb"],
+  ["ecb389", "e1848ee185a6e186bc"],
+  ["ecb389", "ecb2b4e186bc"],
+  ["ecb38a", "e1848ee185a6e186bd"],
+  ["ecb38a", "ecb2b4e186bd"],
+  ["ecb38b", "e1848ee185a6e186be"],
+  ["ecb38b", "ecb2b4e186be"],
+  ["ecb38c", "e1848ee185a6e186bf"],
+  ["ecb38c", "ecb2b4e186bf"],
+  ["ecb38d", "e1848ee185a6e18780"],
+  ["ecb38d", "ecb2b4e18780"],
+  ["ecb38e", "e1848ee185a6e18781"],
+  ["ecb38e", "ecb2b4e18781"],
+  ["ecb38f", "e1848ee185a6e18782"],
+  ["ecb38f", "ecb2b4e18782"],
+  ["ecb390", "e1848ee185a7"],
+  ["ecb391", "e1848ee185a7e186a8"],
+  ["ecb391", "ecb390e186a8"],
+  ["ecb392", "e1848ee185a7e186a9"],
+  ["ecb392", "ecb390e186a9"],
+  ["ecb393", "e1848ee185a7e186aa"],
+  ["ecb393", "ecb390e186aa"],
+  ["ecb394", "e1848ee185a7e186ab"],
+  ["ecb394", "ecb390e186ab"],
+  ["ecb395", "e1848ee185a7e186ac"],
+  ["ecb395", "ecb390e186ac"],
+  ["ecb396", "e1848ee185a7e186ad"],
+  ["ecb396", "ecb390e186ad"],
+  ["ecb397", "e1848ee185a7e186ae"],
+  ["ecb397", "ecb390e186ae"],
+  ["ecb398", "e1848ee185a7e186af"],
+  ["ecb398", "ecb390e186af"],
+  ["ecb399", "e1848ee185a7e186b0"],
+  ["ecb399", "ecb390e186b0"],
+  ["ecb39a", "e1848ee185a7e186b1"],
+  ["ecb39a", "ecb390e186b1"],
+  ["ecb39b", "e1848ee185a7e186b2"],
+  ["ecb39b", "ecb390e186b2"],
+  ["ecb39c", "e1848ee185a7e186b3"],
+  ["ecb39c", "ecb390e186b3"],
+  ["ecb39d", "e1848ee185a7e186b4"],
+  ["ecb39d", "ecb390e186b4"],
+  ["ecb39e", "e1848ee185a7e186b5"],
+  ["ecb39e", "ecb390e186b5"],
+  ["ecb39f", "e1848ee185a7e186b6"],
+  ["ecb39f", "ecb390e186b6"],
+  ["ecb3a0", "e1848ee185a7e186b7"],
+  ["ecb3a0", "ecb390e186b7"],
+  ["ecb3a1", "e1848ee185a7e186b8"],
+  ["ecb3a1", "ecb390e186b8"],
+  ["ecb3a2", "e1848ee185a7e186b9"],
+  ["ecb3a2", "ecb390e186b9"],
+  ["ecb3a3", "e1848ee185a7e186ba"],
+  ["ecb3a3", "ecb390e186ba"],
+  ["ecb3a4", "e1848ee185a7e186bb"],
+  ["ecb3a4", "ecb390e186bb"],
+  ["ecb3a5", "e1848ee185a7e186bc"],
+  ["ecb3a5", "ecb390e186bc"],
+  ["ecb3a6", "e1848ee185a7e186bd"],
+  ["ecb3a6", "ecb390e186bd"],
+  ["ecb3a7", "e1848ee185a7e186be"],
+  ["ecb3a7", "ecb390e186be"],
+  ["ecb3a8", "e1848ee185a7e186bf"],
+  ["ecb3a8", "ecb390e186bf"],
+  ["ecb3a9", "e1848ee185a7e18780"],
+  ["ecb3a9", "ecb390e18780"],
+  ["ecb3aa", "e1848ee185a7e18781"],
+  ["ecb3aa", "ecb390e18781"],
+  ["ecb3ab", "e1848ee185a7e18782"],
+  ["ecb3ab", "ecb390e18782"],
+  ["ecb3ac", "e1848ee185a8"],
+  ["ecb3ad", "e1848ee185a8e186a8"],
+  ["ecb3ad", "ecb3ace186a8"],
+  ["ecb3ae", "e1848ee185a8e186a9"],
+  ["ecb3ae", "ecb3ace186a9"],
+  ["ecb3af", "e1848ee185a8e186aa"],
+  ["ecb3af", "ecb3ace186aa"],
+  ["ecb3b0", "e1848ee185a8e186ab"],
+  ["ecb3b0", "ecb3ace186ab"],
+  ["ecb3b1", "e1848ee185a8e186ac"],
+  ["ecb3b1", "ecb3ace186ac"],
+  ["ecb3b2", "e1848ee185a8e186ad"],
+  ["ecb3b2", "ecb3ace186ad"],
+  ["ecb3b3", "e1848ee185a8e186ae"],
+  ["ecb3b3", "ecb3ace186ae"],
+  ["ecb3b4", "e1848ee185a8e186af"],
+  ["ecb3b4", "ecb3ace186af"],
+  ["ecb3b5", "e1848ee185a8e186b0"],
+  ["ecb3b5", "ecb3ace186b0"],
+  ["ecb3b6", "e1848ee185a8e186b1"],
+  ["ecb3b6", "ecb3ace186b1"],
+  ["ecb3b7", "e1848ee185a8e186b2"],
+  ["ecb3b7", "ecb3ace186b2"],
+  ["ecb3b8", "e1848ee185a8e186b3"],
+  ["ecb3b8", "ecb3ace186b3"],
+  ["ecb3b9", "e1848ee185a8e186b4"],
+  ["ecb3b9", "ecb3ace186b4"],
+  ["ecb3ba", "e1848ee185a8e186b5"],
+  ["ecb3ba", "ecb3ace186b5"],
+  ["ecb3bb", "e1848ee185a8e186b6"],
+  ["ecb3bb", "ecb3ace186b6"],
+  ["ecb3bc", "e1848ee185a8e186b7"],
+  ["ecb3bc", "ecb3ace186b7"],
+  ["ecb3bd", "e1848ee185a8e186b8"],
+  ["ecb3bd", "ecb3ace186b8"],
+  ["ecb3be", "e1848ee185a8e186b9"],
+  ["ecb3be", "ecb3ace186b9"],
+  ["ecb3bf", "e1848ee185a8e186ba"],
+  ["ecb3bf", "ecb3ace186ba"],
+  ["ecb480", "e1848ee185a8e186bb"],
+  ["ecb480", "ecb3ace186bb"],
+  ["ecb481", "e1848ee185a8e186bc"],
+  ["ecb481", "ecb3ace186bc"],
+  ["ecb482", "e1848ee185a8e186bd"],
+  ["ecb482", "ecb3ace186bd"],
+  ["ecb483", "e1848ee185a8e186be"],
+  ["ecb483", "ecb3ace186be"],
+  ["ecb484", "e1848ee185a8e186bf"],
+  ["ecb484", "ecb3ace186bf"],
+  ["ecb485", "e1848ee185a8e18780"],
+  ["ecb485", "ecb3ace18780"],
+  ["ecb486", "e1848ee185a8e18781"],
+  ["ecb486", "ecb3ace18781"],
+  ["ecb487", "e1848ee185a8e18782"],
+  ["ecb487", "ecb3ace18782"],
+  ["ecb488", "e1848ee185a9"],
+  ["ecb489", "e1848ee185a9e186a8"],
+  ["ecb489", "ecb488e186a8"],
+  ["ecb48a", "e1848ee185a9e186a9"],
+  ["ecb48a", "ecb488e186a9"],
+  ["ecb48b", "e1848ee185a9e186aa"],
+  ["ecb48b", "ecb488e186aa"],
+  ["ecb48c", "e1848ee185a9e186ab"],
+  ["ecb48c", "ecb488e186ab"],
+  ["ecb48d", "e1848ee185a9e186ac"],
+  ["ecb48d", "ecb488e186ac"],
+  ["ecb48e", "e1848ee185a9e186ad"],
+  ["ecb48e", "ecb488e186ad"],
+  ["ecb48f", "e1848ee185a9e186ae"],
+  ["ecb48f", "ecb488e186ae"],
+  ["ecb490", "e1848ee185a9e186af"],
+  ["ecb490", "ecb488e186af"],
+  ["ecb491", "e1848ee185a9e186b0"],
+  ["ecb491", "ecb488e186b0"],
+  ["ecb492", "e1848ee185a9e186b1"],
+  ["ecb492", "ecb488e186b1"],
+  ["ecb493", "e1848ee185a9e186b2"],
+  ["ecb493", "ecb488e186b2"],
+  ["ecb494", "e1848ee185a9e186b3"],
+  ["ecb494", "ecb488e186b3"],
+  ["ecb495", "e1848ee185a9e186b4"],
+  ["ecb495", "ecb488e186b4"],
+  ["ecb496", "e1848ee185a9e186b5"],
+  ["ecb496", "ecb488e186b5"],
+  ["ecb497", "e1848ee185a9e186b6"],
+  ["ecb497", "ecb488e186b6"],
+  ["ecb498", "e1848ee185a9e186b7"],
+  ["ecb498", "ecb488e186b7"],
+  ["ecb499", "e1848ee185a9e186b8"],
+  ["ecb499", "ecb488e186b8"],
+  ["ecb49a", "e1848ee185a9e186b9"],
+  ["ecb49a", "ecb488e186b9"],
+  ["ecb49b", "e1848ee185a9e186ba"],
+  ["ecb49b", "ecb488e186ba"],
+  ["ecb49c", "e1848ee185a9e186bb"],
+  ["ecb49c", "ecb488e186bb"],
+  ["ecb49d", "e1848ee185a9e186bc"],
+  ["ecb49d", "ecb488e186bc"],
+  ["ecb49e", "e1848ee185a9e186bd"],
+  ["ecb49e", "ecb488e186bd"],
+  ["ecb49f", "e1848ee185a9e186be"],
+  ["ecb49f", "ecb488e186be"],
+  ["ecb4a0", "e1848ee185a9e186bf"],
+  ["ecb4a0", "ecb488e186bf"],
+  ["ecb4a1", "e1848ee185a9e18780"],
+  ["ecb4a1", "ecb488e18780"],
+  ["ecb4a2", "e1848ee185a9e18781"],
+  ["ecb4a2", "ecb488e18781"],
+  ["ecb4a3", "e1848ee185a9e18782"],
+  ["ecb4a3", "ecb488e18782"],
+  ["ecb4a4", "e1848ee185aa"],
+  ["ecb4a5", "e1848ee185aae186a8"],
+  ["ecb4a5", "ecb4a4e186a8"],
+  ["ecb4a6", "e1848ee185aae186a9"],
+  ["ecb4a6", "ecb4a4e186a9"],
+  ["ecb4a7", "e1848ee185aae186aa"],
+  ["ecb4a7", "ecb4a4e186aa"],
+  ["ecb4a8", "e1848ee185aae186ab"],
+  ["ecb4a8", "ecb4a4e186ab"],
+  ["ecb4a9", "e1848ee185aae186ac"],
+  ["ecb4a9", "ecb4a4e186ac"],
+  ["ecb4aa", "e1848ee185aae186ad"],
+  ["ecb4aa", "ecb4a4e186ad"],
+  ["ecb4ab", "e1848ee185aae186ae"],
+  ["ecb4ab", "ecb4a4e186ae"],
+  ["ecb4ac", "e1848ee185aae186af"],
+  ["ecb4ac", "ecb4a4e186af"],
+  ["ecb4ad", "e1848ee185aae186b0"],
+  ["ecb4ad", "ecb4a4e186b0"],
+  ["ecb4ae", "e1848ee185aae186b1"],
+  ["ecb4ae", "ecb4a4e186b1"],
+  ["ecb4af", "e1848ee185aae186b2"],
+  ["ecb4af", "ecb4a4e186b2"],
+  ["ecb4b0", "e1848ee185aae186b3"],
+  ["ecb4b0", "ecb4a4e186b3"],
+  ["ecb4b1", "e1848ee185aae186b4"],
+  ["ecb4b1", "ecb4a4e186b4"],
+  ["ecb4b2", "e1848ee185aae186b5"],
+  ["ecb4b2", "ecb4a4e186b5"],
+  ["ecb4b3", "e1848ee185aae186b6"],
+  ["ecb4b3", "ecb4a4e186b6"],
+  ["ecb4b4", "e1848ee185aae186b7"],
+  ["ecb4b4", "ecb4a4e186b7"],
+  ["ecb4b5", "e1848ee185aae186b8"],
+  ["ecb4b5", "ecb4a4e186b8"],
+  ["ecb4b6", "e1848ee185aae186b9"],
+  ["ecb4b6", "ecb4a4e186b9"],
+  ["ecb4b7", "e1848ee185aae186ba"],
+  ["ecb4b7", "ecb4a4e186ba"],
+  ["ecb4b8", "e1848ee185aae186bb"],
+  ["ecb4b8", "ecb4a4e186bb"],
+  ["ecb4b9", "e1848ee185aae186bc"],
+  ["ecb4b9", "ecb4a4e186bc"],
+  ["ecb4ba", "e1848ee185aae186bd"],
+  ["ecb4ba", "ecb4a4e186bd"],
+  ["ecb4bb", "e1848ee185aae186be"],
+  ["ecb4bb", "ecb4a4e186be"],
+  ["ecb4bc", "e1848ee185aae186bf"],
+  ["ecb4bc", "ecb4a4e186bf"],
+  ["ecb4bd", "e1848ee185aae18780"],
+  ["ecb4bd", "ecb4a4e18780"],
+  ["ecb4be", "e1848ee185aae18781"],
+  ["ecb4be", "ecb4a4e18781"],
+  ["ecb4bf", "e1848ee185aae18782"],
+  ["ecb4bf", "ecb4a4e18782"],
+  ["ecb580", "e1848ee185ab"],
+  ["ecb581", "e1848ee185abe186a8"],
+  ["ecb581", "ecb580e186a8"],
+  ["ecb582", "e1848ee185abe186a9"],
+  ["ecb582", "ecb580e186a9"],
+  ["ecb583", "e1848ee185abe186aa"],
+  ["ecb583", "ecb580e186aa"],
+  ["ecb584", "e1848ee185abe186ab"],
+  ["ecb584", "ecb580e186ab"],
+  ["ecb585", "e1848ee185abe186ac"],
+  ["ecb585", "ecb580e186ac"],
+  ["ecb586", "e1848ee185abe186ad"],
+  ["ecb586", "ecb580e186ad"],
+  ["ecb587", "e1848ee185abe186ae"],
+  ["ecb587", "ecb580e186ae"],
+  ["ecb588", "e1848ee185abe186af"],
+  ["ecb588", "ecb580e186af"],
+  ["ecb589", "e1848ee185abe186b0"],
+  ["ecb589", "ecb580e186b0"],
+  ["ecb58a", "e1848ee185abe186b1"],
+  ["ecb58a", "ecb580e186b1"],
+  ["ecb58b", "e1848ee185abe186b2"],
+  ["ecb58b", "ecb580e186b2"],
+  ["ecb58c", "e1848ee185abe186b3"],
+  ["ecb58c", "ecb580e186b3"],
+  ["ecb58d", "e1848ee185abe186b4"],
+  ["ecb58d", "ecb580e186b4"],
+  ["ecb58e", "e1848ee185abe186b5"],
+  ["ecb58e", "ecb580e186b5"],
+  ["ecb58f", "e1848ee185abe186b6"],
+  ["ecb58f", "ecb580e186b6"],
+  ["ecb590", "e1848ee185abe186b7"],
+  ["ecb590", "ecb580e186b7"],
+  ["ecb591", "e1848ee185abe186b8"],
+  ["ecb591", "ecb580e186b8"],
+  ["ecb592", "e1848ee185abe186b9"],
+  ["ecb592", "ecb580e186b9"],
+  ["ecb593", "e1848ee185abe186ba"],
+  ["ecb593", "ecb580e186ba"],
+  ["ecb594", "e1848ee185abe186bb"],
+  ["ecb594", "ecb580e186bb"],
+  ["ecb595", "e1848ee185abe186bc"],
+  ["ecb595", "ecb580e186bc"],
+  ["ecb596", "e1848ee185abe186bd"],
+  ["ecb596", "ecb580e186bd"],
+  ["ecb597", "e1848ee185abe186be"],
+  ["ecb597", "ecb580e186be"],
+  ["ecb598", "e1848ee185abe186bf"],
+  ["ecb598", "ecb580e186bf"],
+  ["ecb599", "e1848ee185abe18780"],
+  ["ecb599", "ecb580e18780"],
+  ["ecb59a", "e1848ee185abe18781"],
+  ["ecb59a", "ecb580e18781"],
+  ["ecb59b", "e1848ee185abe18782"],
+  ["ecb59b", "ecb580e18782"],
+  ["ecb59c", "e1848ee185ac"],
+  ["ecb59d", "e1848ee185ace186a8"],
+  ["ecb59d", "ecb59ce186a8"],
+  ["ecb59e", "e1848ee185ace186a9"],
+  ["ecb59e", "ecb59ce186a9"],
+  ["ecb59f", "e1848ee185ace186aa"],
+  ["ecb59f", "ecb59ce186aa"],
+  ["ecb5a0", "e1848ee185ace186ab"],
+  ["ecb5a0", "ecb59ce186ab"],
+  ["ecb5a1", "e1848ee185ace186ac"],
+  ["ecb5a1", "ecb59ce186ac"],
+  ["ecb5a2", "e1848ee185ace186ad"],
+  ["ecb5a2", "ecb59ce186ad"],
+  ["ecb5a3", "e1848ee185ace186ae"],
+  ["ecb5a3", "ecb59ce186ae"],
+  ["ecb5a4", "e1848ee185ace186af"],
+  ["ecb5a4", "ecb59ce186af"],
+  ["ecb5a5", "e1848ee185ace186b0"],
+  ["ecb5a5", "ecb59ce186b0"],
+  ["ecb5a6", "e1848ee185ace186b1"],
+  ["ecb5a6", "ecb59ce186b1"],
+  ["ecb5a7", "e1848ee185ace186b2"],
+  ["ecb5a7", "ecb59ce186b2"],
+  ["ecb5a8", "e1848ee185ace186b3"],
+  ["ecb5a8", "ecb59ce186b3"],
+  ["ecb5a9", "e1848ee185ace186b4"],
+  ["ecb5a9", "ecb59ce186b4"],
+  ["ecb5aa", "e1848ee185ace186b5"],
+  ["ecb5aa", "ecb59ce186b5"],
+  ["ecb5ab", "e1848ee185ace186b6"],
+  ["ecb5ab", "ecb59ce186b6"],
+  ["ecb5ac", "e1848ee185ace186b7"],
+  ["ecb5ac", "ecb59ce186b7"],
+  ["ecb5ad", "e1848ee185ace186b8"],
+  ["ecb5ad", "ecb59ce186b8"],
+  ["ecb5ae", "e1848ee185ace186b9"],
+  ["ecb5ae", "ecb59ce186b9"],
+  ["ecb5af", "e1848ee185ace186ba"],
+  ["ecb5af", "ecb59ce186ba"],
+  ["ecb5b0", "e1848ee185ace186bb"],
+  ["ecb5b0", "ecb59ce186bb"],
+  ["ecb5b1", "e1848ee185ace186bc"],
+  ["ecb5b1", "ecb59ce186bc"],
+  ["ecb5b2", "e1848ee185ace186bd"],
+  ["ecb5b2", "ecb59ce186bd"],
+  ["ecb5b3", "e1848ee185ace186be"],
+  ["ecb5b3", "ecb59ce186be"],
+  ["ecb5b4", "e1848ee185ace186bf"],
+  ["ecb5b4", "ecb59ce186bf"],
+  ["ecb5b5", "e1848ee185ace18780"],
+  ["ecb5b5", "ecb59ce18780"],
+  ["ecb5b6", "e1848ee185ace18781"],
+  ["ecb5b6", "ecb59ce18781"],
+  ["ecb5b7", "e1848ee185ace18782"],
+  ["ecb5b7", "ecb59ce18782"],
+  ["ecb5b8", "e1848ee185ad"],
+  ["ecb5b9", "e1848ee185ade186a8"],
+  ["ecb5b9", "ecb5b8e186a8"],
+  ["ecb5ba", "e1848ee185ade186a9"],
+  ["ecb5ba", "ecb5b8e186a9"],
+  ["ecb5bb", "e1848ee185ade186aa"],
+  ["ecb5bb", "ecb5b8e186aa"],
+  ["ecb5bc", "e1848ee185ade186ab"],
+  ["ecb5bc", "ecb5b8e186ab"],
+  ["ecb5bd", "e1848ee185ade186ac"],
+  ["ecb5bd", "ecb5b8e186ac"],
+  ["ecb5be", "e1848ee185ade186ad"],
+  ["ecb5be", "ecb5b8e186ad"],
+  ["ecb5bf", "e1848ee185ade186ae"],
+  ["ecb5bf", "ecb5b8e186ae"],
+  ["ecb680", "e1848ee185ade186af"],
+  ["ecb680", "ecb5b8e186af"],
+  ["ecb681", "e1848ee185ade186b0"],
+  ["ecb681", "ecb5b8e186b0"],
+  ["ecb682", "e1848ee185ade186b1"],
+  ["ecb682", "ecb5b8e186b1"],
+  ["ecb683", "e1848ee185ade186b2"],
+  ["ecb683", "ecb5b8e186b2"],
+  ["ecb684", "e1848ee185ade186b3"],
+  ["ecb684", "ecb5b8e186b3"],
+  ["ecb685", "e1848ee185ade186b4"],
+  ["ecb685", "ecb5b8e186b4"],
+  ["ecb686", "e1848ee185ade186b5"],
+  ["ecb686", "ecb5b8e186b5"],
+  ["ecb687", "e1848ee185ade186b6"],
+  ["ecb687", "ecb5b8e186b6"],
+  ["ecb688", "e1848ee185ade186b7"],
+  ["ecb688", "ecb5b8e186b7"],
+  ["ecb689", "e1848ee185ade186b8"],
+  ["ecb689", "ecb5b8e186b8"],
+  ["ecb68a", "e1848ee185ade186b9"],
+  ["ecb68a", "ecb5b8e186b9"],
+  ["ecb68b", "e1848ee185ade186ba"],
+  ["ecb68b", "ecb5b8e186ba"],
+  ["ecb68c", "e1848ee185ade186bb"],
+  ["ecb68c", "ecb5b8e186bb"],
+  ["ecb68d", "e1848ee185ade186bc"],
+  ["ecb68d", "ecb5b8e186bc"],
+  ["ecb68e", "e1848ee185ade186bd"],
+  ["ecb68e", "ecb5b8e186bd"],
+  ["ecb68f", "e1848ee185ade186be"],
+  ["ecb68f", "ecb5b8e186be"],
+  ["ecb690", "e1848ee185ade186bf"],
+  ["ecb690", "ecb5b8e186bf"],
+  ["ecb691", "e1848ee185ade18780"],
+  ["ecb691", "ecb5b8e18780"],
+  ["ecb692", "e1848ee185ade18781"],
+  ["ecb692", "ecb5b8e18781"],
+  ["ecb693", "e1848ee185ade18782"],
+  ["ecb693", "ecb5b8e18782"],
+  ["ecb694", "e1848ee185ae"],
+  ["ecb695", "e1848ee185aee186a8"],
+  ["ecb695", "ecb694e186a8"],
+  ["ecb696", "e1848ee185aee186a9"],
+  ["ecb696", "ecb694e186a9"],
+  ["ecb697", "e1848ee185aee186aa"],
+  ["ecb697", "ecb694e186aa"],
+  ["ecb698", "e1848ee185aee186ab"],
+  ["ecb698", "ecb694e186ab"],
+  ["ecb699", "e1848ee185aee186ac"],
+  ["ecb699", "ecb694e186ac"],
+  ["ecb69a", "e1848ee185aee186ad"],
+  ["ecb69a", "ecb694e186ad"],
+  ["ecb69b", "e1848ee185aee186ae"],
+  ["ecb69b", "ecb694e186ae"],
+  ["ecb69c", "e1848ee185aee186af"],
+  ["ecb69c", "ecb694e186af"],
+  ["ecb69d", "e1848ee185aee186b0"],
+  ["ecb69d", "ecb694e186b0"],
+  ["ecb69e", "e1848ee185aee186b1"],
+  ["ecb69e", "ecb694e186b1"],
+  ["ecb69f", "e1848ee185aee186b2"],
+  ["ecb69f", "ecb694e186b2"],
+  ["ecb6a0", "e1848ee185aee186b3"],
+  ["ecb6a0", "ecb694e186b3"],
+  ["ecb6a1", "e1848ee185aee186b4"],
+  ["ecb6a1", "ecb694e186b4"],
+  ["ecb6a2", "e1848ee185aee186b5"],
+  ["ecb6a2", "ecb694e186b5"],
+  ["ecb6a3", "e1848ee185aee186b6"],
+  ["ecb6a3", "ecb694e186b6"],
+  ["ecb6a4", "e1848ee185aee186b7"],
+  ["ecb6a4", "ecb694e186b7"],
+  ["ecb6a5", "e1848ee185aee186b8"],
+  ["ecb6a5", "ecb694e186b8"],
+  ["ecb6a6", "e1848ee185aee186b9"],
+  ["ecb6a6", "ecb694e186b9"],
+  ["ecb6a7", "e1848ee185aee186ba"],
+  ["ecb6a7", "ecb694e186ba"],
+  ["ecb6a8", "e1848ee185aee186bb"],
+  ["ecb6a8", "ecb694e186bb"],
+  ["ecb6a9", "e1848ee185aee186bc"],
+  ["ecb6a9", "ecb694e186bc"],
+  ["ecb6aa", "e1848ee185aee186bd"],
+  ["ecb6aa", "ecb694e186bd"],
+  ["ecb6ab", "e1848ee185aee186be"],
+  ["ecb6ab", "ecb694e186be"],
+  ["ecb6ac", "e1848ee185aee186bf"],
+  ["ecb6ac", "ecb694e186bf"],
+  ["ecb6ad", "e1848ee185aee18780"],
+  ["ecb6ad", "ecb694e18780"],
+  ["ecb6ae", "e1848ee185aee18781"],
+  ["ecb6ae", "ecb694e18781"],
+  ["ecb6af", "e1848ee185aee18782"],
+  ["ecb6af", "ecb694e18782"],
+  ["ecb6b0", "e1848ee185af"],
+  ["ecb6b1", "e1848ee185afe186a8"],
+  ["ecb6b1", "ecb6b0e186a8"],
+  ["ecb6b2", "e1848ee185afe186a9"],
+  ["ecb6b2", "ecb6b0e186a9"],
+  ["ecb6b3", "e1848ee185afe186aa"],
+  ["ecb6b3", "ecb6b0e186aa"],
+  ["ecb6b4", "e1848ee185afe186ab"],
+  ["ecb6b4", "ecb6b0e186ab"],
+  ["ecb6b5", "e1848ee185afe186ac"],
+  ["ecb6b5", "ecb6b0e186ac"],
+  ["ecb6b6", "e1848ee185afe186ad"],
+  ["ecb6b6", "ecb6b0e186ad"],
+  ["ecb6b7", "e1848ee185afe186ae"],
+  ["ecb6b7", "ecb6b0e186ae"],
+  ["ecb6b8", "e1848ee185afe186af"],
+  ["ecb6b8", "ecb6b0e186af"],
+  ["ecb6b9", "e1848ee185afe186b0"],
+  ["ecb6b9", "ecb6b0e186b0"],
+  ["ecb6ba", "e1848ee185afe186b1"],
+  ["ecb6ba", "ecb6b0e186b1"],
+  ["ecb6bb", "e1848ee185afe186b2"],
+  ["ecb6bb", "ecb6b0e186b2"],
+  ["ecb6bc", "e1848ee185afe186b3"],
+  ["ecb6bc", "ecb6b0e186b3"],
+  ["ecb6bd", "e1848ee185afe186b4"],
+  ["ecb6bd", "ecb6b0e186b4"],
+  ["ecb6be", "e1848ee185afe186b5"],
+  ["ecb6be", "ecb6b0e186b5"],
+  ["ecb6bf", "e1848ee185afe186b6"],
+  ["ecb6bf", "ecb6b0e186b6"],
+  ["ecb780", "e1848ee185afe186b7"],
+  ["ecb780", "ecb6b0e186b7"],
+  ["ecb781", "e1848ee185afe186b8"],
+  ["ecb781", "ecb6b0e186b8"],
+  ["ecb782", "e1848ee185afe186b9"],
+  ["ecb782", "ecb6b0e186b9"],
+  ["ecb783", "e1848ee185afe186ba"],
+  ["ecb783", "ecb6b0e186ba"],
+  ["ecb784", "e1848ee185afe186bb"],
+  ["ecb784", "ecb6b0e186bb"],
+  ["ecb785", "e1848ee185afe186bc"],
+  ["ecb785", "ecb6b0e186bc"],
+  ["ecb786", "e1848ee185afe186bd"],
+  ["ecb786", "ecb6b0e186bd"],
+  ["ecb787", "e1848ee185afe186be"],
+  ["ecb787", "ecb6b0e186be"],
+  ["ecb788", "e1848ee185afe186bf"],
+  ["ecb788", "ecb6b0e186bf"],
+  ["ecb789", "e1848ee185afe18780"],
+  ["ecb789", "ecb6b0e18780"],
+  ["ecb78a", "e1848ee185afe18781"],
+  ["ecb78a", "ecb6b0e18781"],
+  ["ecb78b", "e1848ee185afe18782"],
+  ["ecb78b", "ecb6b0e18782"],
+  ["ecb78c", "e1848ee185b0"],
+  ["ecb78d", "e1848ee185b0e186a8"],
+  ["ecb78d", "ecb78ce186a8"],
+  ["ecb78e", "e1848ee185b0e186a9"],
+  ["ecb78e", "ecb78ce186a9"],
+  ["ecb78f", "e1848ee185b0e186aa"],
+  ["ecb78f", "ecb78ce186aa"],
+  ["ecb790", "e1848ee185b0e186ab"],
+  ["ecb790", "ecb78ce186ab"],
+  ["ecb791", "e1848ee185b0e186ac"],
+  ["ecb791", "ecb78ce186ac"],
+  ["ecb792", "e1848ee185b0e186ad"],
+  ["ecb792", "ecb78ce186ad"],
+  ["ecb793", "e1848ee185b0e186ae"],
+  ["ecb793", "ecb78ce186ae"],
+  ["ecb794", "e1848ee185b0e186af"],
+  ["ecb794", "ecb78ce186af"],
+  ["ecb795", "e1848ee185b0e186b0"],
+  ["ecb795", "ecb78ce186b0"],
+  ["ecb796", "e1848ee185b0e186b1"],
+  ["ecb796", "ecb78ce186b1"],
+  ["ecb797", "e1848ee185b0e186b2"],
+  ["ecb797", "ecb78ce186b2"],
+  ["ecb798", "e1848ee185b0e186b3"],
+  ["ecb798", "ecb78ce186b3"],
+  ["ecb799", "e1848ee185b0e186b4"],
+  ["ecb799", "ecb78ce186b4"],
+  ["ecb79a", "e1848ee185b0e186b5"],
+  ["ecb79a", "ecb78ce186b5"],
+  ["ecb79b", "e1848ee185b0e186b6"],
+  ["ecb79b", "ecb78ce186b6"],
+  ["ecb79c", "e1848ee185b0e186b7"],
+  ["ecb79c", "ecb78ce186b7"],
+  ["ecb79d", "e1848ee185b0e186b8"],
+  ["ecb79d", "ecb78ce186b8"],
+  ["ecb79e", "e1848ee185b0e186b9"],
+  ["ecb79e", "ecb78ce186b9"],
+  ["ecb79f", "e1848ee185b0e186ba"],
+  ["ecb79f", "ecb78ce186ba"],
+  ["ecb7a0", "e1848ee185b0e186bb"],
+  ["ecb7a0", "ecb78ce186bb"],
+  ["ecb7a1", "e1848ee185b0e186bc"],
+  ["ecb7a1", "ecb78ce186bc"],
+  ["ecb7a2", "e1848ee185b0e186bd"],
+  ["ecb7a2", "ecb78ce186bd"],
+  ["ecb7a3", "e1848ee185b0e186be"],
+  ["ecb7a3", "ecb78ce186be"],
+  ["ecb7a4", "e1848ee185b0e186bf"],
+  ["ecb7a4", "ecb78ce186bf"],
+  ["ecb7a5", "e1848ee185b0e18780"],
+  ["ecb7a5", "ecb78ce18780"],
+  ["ecb7a6", "e1848ee185b0e18781"],
+  ["ecb7a6", "ecb78ce18781"],
+  ["ecb7a7", "e1848ee185b0e18782"],
+  ["ecb7a7", "ecb78ce18782"],
+  ["ecb7a8", "e1848ee185b1"],
+  ["ecb7a9", "e1848ee185b1e186a8"],
+  ["ecb7a9", "ecb7a8e186a8"],
+  ["ecb7aa", "e1848ee185b1e186a9"],
+  ["ecb7aa", "ecb7a8e186a9"],
+  ["ecb7ab", "e1848ee185b1e186aa"],
+  ["ecb7ab", "ecb7a8e186aa"],
+  ["ecb7ac", "e1848ee185b1e186ab"],
+  ["ecb7ac", "ecb7a8e186ab"],
+  ["ecb7ad", "e1848ee185b1e186ac"],
+  ["ecb7ad", "ecb7a8e186ac"],
+  ["ecb7ae", "e1848ee185b1e186ad"],
+  ["ecb7ae", "ecb7a8e186ad"],
+  ["ecb7af", "e1848ee185b1e186ae"],
+  ["ecb7af", "ecb7a8e186ae"],
+  ["ecb7b0", "e1848ee185b1e186af"],
+  ["ecb7b0", "ecb7a8e186af"],
+  ["ecb7b1", "e1848ee185b1e186b0"],
+  ["ecb7b1", "ecb7a8e186b0"],
+  ["ecb7b2", "e1848ee185b1e186b1"],
+  ["ecb7b2", "ecb7a8e186b1"],
+  ["ecb7b3", "e1848ee185b1e186b2"],
+  ["ecb7b3", "ecb7a8e186b2"],
+  ["ecb7b4", "e1848ee185b1e186b3"],
+  ["ecb7b4", "ecb7a8e186b3"],
+  ["ecb7b5", "e1848ee185b1e186b4"],
+  ["ecb7b5", "ecb7a8e186b4"],
+  ["ecb7b6", "e1848ee185b1e186b5"],
+  ["ecb7b6", "ecb7a8e186b5"],
+  ["ecb7b7", "e1848ee185b1e186b6"],
+  ["ecb7b7", "ecb7a8e186b6"],
+  ["ecb7b8", "e1848ee185b1e186b7"],
+  ["ecb7b8", "ecb7a8e186b7"],
+  ["ecb7b9", "e1848ee185b1e186b8"],
+  ["ecb7b9", "ecb7a8e186b8"],
+  ["ecb7ba", "e1848ee185b1e186b9"],
+  ["ecb7ba", "ecb7a8e186b9"],
+  ["ecb7bb", "e1848ee185b1e186ba"],
+  ["ecb7bb", "ecb7a8e186ba"],
+  ["ecb7bc", "e1848ee185b1e186bb"],
+  ["ecb7bc", "ecb7a8e186bb"],
+  ["ecb7bd", "e1848ee185b1e186bc"],
+  ["ecb7bd", "ecb7a8e186bc"],
+  ["ecb7be", "e1848ee185b1e186bd"],
+  ["ecb7be", "ecb7a8e186bd"],
+  ["ecb7bf", "e1848ee185b1e186be"],
+  ["ecb7bf", "ecb7a8e186be"],
+  ["ecb880", "e1848ee185b1e186bf"],
+  ["ecb880", "ecb7a8e186bf"],
+  ["ecb881", "e1848ee185b1e18780"],
+  ["ecb881", "ecb7a8e18780"],
+  ["ecb882", "e1848ee185b1e18781"],
+  ["ecb882", "ecb7a8e18781"],
+  ["ecb883", "e1848ee185b1e18782"],
+  ["ecb883", "ecb7a8e18782"],
+  ["ecb884", "e1848ee185b2"],
+  ["ecb885", "e1848ee185b2e186a8"],
+  ["ecb885", "ecb884e186a8"],
+  ["ecb886", "e1848ee185b2e186a9"],
+  ["ecb886", "ecb884e186a9"],
+  ["ecb887", "e1848ee185b2e186aa"],
+  ["ecb887", "ecb884e186aa"],
+  ["ecb888", "e1848ee185b2e186ab"],
+  ["ecb888", "ecb884e186ab"],
+  ["ecb889", "e1848ee185b2e186ac"],
+  ["ecb889", "ecb884e186ac"],
+  ["ecb88a", "e1848ee185b2e186ad"],
+  ["ecb88a", "ecb884e186ad"],
+  ["ecb88b", "e1848ee185b2e186ae"],
+  ["ecb88b", "ecb884e186ae"],
+  ["ecb88c", "e1848ee185b2e186af"],
+  ["ecb88c", "ecb884e186af"],
+  ["ecb88d", "e1848ee185b2e186b0"],
+  ["ecb88d", "ecb884e186b0"],
+  ["ecb88e", "e1848ee185b2e186b1"],
+  ["ecb88e", "ecb884e186b1"],
+  ["ecb88f", "e1848ee185b2e186b2"],
+  ["ecb88f", "ecb884e186b2"],
+  ["ecb890", "e1848ee185b2e186b3"],
+  ["ecb890", "ecb884e186b3"],
+  ["ecb891", "e1848ee185b2e186b4"],
+  ["ecb891", "ecb884e186b4"],
+  ["ecb892", "e1848ee185b2e186b5"],
+  ["ecb892", "ecb884e186b5"],
+  ["ecb893", "e1848ee185b2e186b6"],
+  ["ecb893", "ecb884e186b6"],
+  ["ecb894", "e1848ee185b2e186b7"],
+  ["ecb894", "ecb884e186b7"],
+  ["ecb895", "e1848ee185b2e186b8"],
+  ["ecb895", "ecb884e186b8"],
+  ["ecb896", "e1848ee185b2e186b9"],
+  ["ecb896", "ecb884e186b9"],
+  ["ecb897", "e1848ee185b2e186ba"],
+  ["ecb897", "ecb884e186ba"],
+  ["ecb898", "e1848ee185b2e186bb"],
+  ["ecb898", "ecb884e186bb"],
+  ["ecb899", "e1848ee185b2e186bc"],
+  ["ecb899", "ecb884e186bc"],
+  ["ecb89a", "e1848ee185b2e186bd"],
+  ["ecb89a", "ecb884e186bd"],
+  ["ecb89b", "e1848ee185b2e186be"],
+  ["ecb89b", "ecb884e186be"],
+  ["ecb89c", "e1848ee185b2e186bf"],
+  ["ecb89c", "ecb884e186bf"],
+  ["ecb89d", "e1848ee185b2e18780"],
+  ["ecb89d", "ecb884e18780"],
+  ["ecb89e", "e1848ee185b2e18781"],
+  ["ecb89e", "ecb884e18781"],
+  ["ecb89f", "e1848ee185b2e18782"],
+  ["ecb89f", "ecb884e18782"],
+  ["ecb8a0", "e1848ee185b3"],
+  ["ecb8a1", "e1848ee185b3e186a8"],
+  ["ecb8a1", "ecb8a0e186a8"],
+  ["ecb8a2", "e1848ee185b3e186a9"],
+  ["ecb8a2", "ecb8a0e186a9"],
+  ["ecb8a3", "e1848ee185b3e186aa"],
+  ["ecb8a3", "ecb8a0e186aa"],
+  ["ecb8a4", "e1848ee185b3e186ab"],
+  ["ecb8a4", "ecb8a0e186ab"],
+  ["ecb8a5", "e1848ee185b3e186ac"],
+  ["ecb8a5", "ecb8a0e186ac"],
+  ["ecb8a6", "e1848ee185b3e186ad"],
+  ["ecb8a6", "ecb8a0e186ad"],
+  ["ecb8a7", "e1848ee185b3e186ae"],
+  ["ecb8a7", "ecb8a0e186ae"],
+  ["ecb8a8", "e1848ee185b3e186af"],
+  ["ecb8a8", "ecb8a0e186af"],
+  ["ecb8a9", "e1848ee185b3e186b0"],
+  ["ecb8a9", "ecb8a0e186b0"],
+  ["ecb8aa", "e1848ee185b3e186b1"],
+  ["ecb8aa", "ecb8a0e186b1"],
+  ["ecb8ab", "e1848ee185b3e186b2"],
+  ["ecb8ab", "ecb8a0e186b2"],
+  ["ecb8ac", "e1848ee185b3e186b3"],
+  ["ecb8ac", "ecb8a0e186b3"],
+  ["ecb8ad", "e1848ee185b3e186b4"],
+  ["ecb8ad", "ecb8a0e186b4"],
+  ["ecb8ae", "e1848ee185b3e186b5"],
+  ["ecb8ae", "ecb8a0e186b5"],
+  ["ecb8af", "e1848ee185b3e186b6"],
+  ["ecb8af", "ecb8a0e186b6"],
+  ["ecb8b0", "e1848ee185b3e186b7"],
+  ["ecb8b0", "ecb8a0e186b7"],
+  ["ecb8b1", "e1848ee185b3e186b8"],
+  ["ecb8b1", "ecb8a0e186b8"],
+  ["ecb8b2", "e1848ee185b3e186b9"],
+  ["ecb8b2", "ecb8a0e186b9"],
+  ["ecb8b3", "e1848ee185b3e186ba"],
+  ["ecb8b3", "ecb8a0e186ba"],
+  ["ecb8b4", "e1848ee185b3e186bb"],
+  ["ecb8b4", "ecb8a0e186bb"],
+  ["ecb8b5", "e1848ee185b3e186bc"],
+  ["ecb8b5", "ecb8a0e186bc"],
+  ["ecb8b6", "e1848ee185b3e186bd"],
+  ["ecb8b6", "ecb8a0e186bd"],
+  ["ecb8b7", "e1848ee185b3e186be"],
+  ["ecb8b7", "ecb8a0e186be"],
+  ["ecb8b8", "e1848ee185b3e186bf"],
+  ["ecb8b8", "ecb8a0e186bf"],
+  ["ecb8b9", "e1848ee185b3e18780"],
+  ["ecb8b9", "ecb8a0e18780"],
+  ["ecb8ba", "e1848ee185b3e18781"],
+  ["ecb8ba", "ecb8a0e18781"],
+  ["ecb8bb", "e1848ee185b3e18782"],
+  ["ecb8bb", "ecb8a0e18782"],
+  ["ecb8bc", "e1848ee185b4"],
+  ["ecb8bd", "e1848ee185b4e186a8"],
+  ["ecb8bd", "ecb8bce186a8"],
+  ["ecb8be", "e1848ee185b4e186a9"],
+  ["ecb8be", "ecb8bce186a9"],
+  ["ecb8bf", "e1848ee185b4e186aa"],
+  ["ecb8bf", "ecb8bce186aa"],
+  ["ecb980", "e1848ee185b4e186ab"],
+  ["ecb980", "ecb8bce186ab"],
+  ["ecb981", "e1848ee185b4e186ac"],
+  ["ecb981", "ecb8bce186ac"],
+  ["ecb982", "e1848ee185b4e186ad"],
+  ["ecb982", "ecb8bce186ad"],
+  ["ecb983", "e1848ee185b4e186ae"],
+  ["ecb983", "ecb8bce186ae"],
+  ["ecb984", "e1848ee185b4e186af"],
+  ["ecb984", "ecb8bce186af"],
+  ["ecb985", "e1848ee185b4e186b0"],
+  ["ecb985", "ecb8bce186b0"],
+  ["ecb986", "e1848ee185b4e186b1"],
+  ["ecb986", "ecb8bce186b1"],
+  ["ecb987", "e1848ee185b4e186b2"],
+  ["ecb987", "ecb8bce186b2"],
+  ["ecb988", "e1848ee185b4e186b3"],
+  ["ecb988", "ecb8bce186b3"],
+  ["ecb989", "e1848ee185b4e186b4"],
+  ["ecb989", "ecb8bce186b4"],
+  ["ecb98a", "e1848ee185b4e186b5"],
+  ["ecb98a", "ecb8bce186b5"],
+  ["ecb98b", "e1848ee185b4e186b6"],
+  ["ecb98b", "ecb8bce186b6"],
+  ["ecb98c", "e1848ee185b4e186b7"],
+  ["ecb98c", "ecb8bce186b7"],
+  ["ecb98d", "e1848ee185b4e186b8"],
+  ["ecb98d", "ecb8bce186b8"],
+  ["ecb98e", "e1848ee185b4e186b9"],
+  ["ecb98e", "ecb8bce186b9"],
+  ["ecb98f", "e1848ee185b4e186ba"],
+  ["ecb98f", "ecb8bce186ba"],
+  ["ecb990", "e1848ee185b4e186bb"],
+  ["ecb990", "ecb8bce186bb"],
+  ["ecb991", "e1848ee185b4e186bc"],
+  ["ecb991", "ecb8bce186bc"],
+  ["ecb992", "e1848ee185b4e186bd"],
+  ["ecb992", "ecb8bce186bd"],
+  ["ecb993", "e1848ee185b4e186be"],
+  ["ecb993", "ecb8bce186be"],
+  ["ecb994", "e1848ee185b4e186bf"],
+  ["ecb994", "ecb8bce186bf"],
+  ["ecb995", "e1848ee185b4e18780"],
+  ["ecb995", "ecb8bce18780"],
+  ["ecb996", "e1848ee185b4e18781"],
+  ["ecb996", "ecb8bce18781"],
+  ["ecb997", "e1848ee185b4e18782"],
+  ["ecb997", "ecb8bce18782"],
+  ["ecb998", "e1848ee185b5"],
+  ["ecb999", "e1848ee185b5e186a8"],
+  ["ecb999", "ecb998e186a8"],
+  ["ecb99a", "e1848ee185b5e186a9"],
+  ["ecb99a", "ecb998e186a9"],
+  ["ecb99b", "e1848ee185b5e186aa"],
+  ["ecb99b", "ecb998e186aa"],
+  ["ecb99c", "e1848ee185b5e186ab"],
+  ["ecb99c", "ecb998e186ab"],
+  ["ecb99d", "e1848ee185b5e186ac"],
+  ["ecb99d", "ecb998e186ac"],
+  ["ecb99e", "e1848ee185b5e186ad"],
+  ["ecb99e", "ecb998e186ad"],
+  ["ecb99f", "e1848ee185b5e186ae"],
+  ["ecb99f", "ecb998e186ae"],
+  ["ecb9a0", "e1848ee185b5e186af"],
+  ["ecb9a0", "ecb998e186af"],
+  ["ecb9a1", "e1848ee185b5e186b0"],
+  ["ecb9a1", "ecb998e186b0"],
+  ["ecb9a2", "e1848ee185b5e186b1"],
+  ["ecb9a2", "ecb998e186b1"],
+  ["ecb9a3", "e1848ee185b5e186b2"],
+  ["ecb9a3", "ecb998e186b2"],
+  ["ecb9a4", "e1848ee185b5e186b3"],
+  ["ecb9a4", "ecb998e186b3"],
+  ["ecb9a5", "e1848ee185b5e186b4"],
+  ["ecb9a5", "ecb998e186b4"],
+  ["ecb9a6", "e1848ee185b5e186b5"],
+  ["ecb9a6", "ecb998e186b5"],
+  ["ecb9a7", "e1848ee185b5e186b6"],
+  ["ecb9a7", "ecb998e186b6"],
+  ["ecb9a8", "e1848ee185b5e186b7"],
+  ["ecb9a8", "ecb998e186b7"],
+  ["ecb9a9", "e1848ee185b5e186b8"],
+  ["ecb9a9", "ecb998e186b8"],
+  ["ecb9aa", "e1848ee185b5e186b9"],
+  ["ecb9aa", "ecb998e186b9"],
+  ["ecb9ab", "e1848ee185b5e186ba"],
+  ["ecb9ab", "ecb998e186ba"],
+  ["ecb9ac", "e1848ee185b5e186bb"],
+  ["ecb9ac", "ecb998e186bb"],
+  ["ecb9ad", "e1848ee185b5e186bc"],
+  ["ecb9ad", "ecb998e186bc"],
+  ["ecb9ae", "e1848ee185b5e186bd"],
+  ["ecb9ae", "ecb998e186bd"],
+  ["ecb9af", "e1848ee185b5e186be"],
+  ["ecb9af", "ecb998e186be"],
+  ["ecb9b0", "e1848ee185b5e186bf"],
+  ["ecb9b0", "ecb998e186bf"],
+  ["ecb9b1", "e1848ee185b5e18780"],
+  ["ecb9b1", "ecb998e18780"],
+  ["ecb9b2", "e1848ee185b5e18781"],
+  ["ecb9b2", "ecb998e18781"],
+  ["ecb9b3", "e1848ee185b5e18782"],
+  ["ecb9b3", "ecb998e18782"],
+  ["ecb9b4", "e1848fe185a1"],
+  ["ecb9b5", "e1848fe185a1e186a8"],
+  ["ecb9b5", "ecb9b4e186a8"],
+  ["ecb9b6", "e1848fe185a1e186a9"],
+  ["ecb9b6", "ecb9b4e186a9"],
+  ["ecb9b7", "e1848fe185a1e186aa"],
+  ["ecb9b7", "ecb9b4e186aa"],
+  ["ecb9b8", "e1848fe185a1e186ab"],
+  ["ecb9b8", "ecb9b4e186ab"],
+  ["ecb9b9", "e1848fe185a1e186ac"],
+  ["ecb9b9", "ecb9b4e186ac"],
+  ["ecb9ba", "e1848fe185a1e186ad"],
+  ["ecb9ba", "ecb9b4e186ad"],
+  ["ecb9bb", "e1848fe185a1e186ae"],
+  ["ecb9bb", "ecb9b4e186ae"],
+  ["ecb9bc", "e1848fe185a1e186af"],
+  ["ecb9bc", "ecb9b4e186af"],
+  ["ecb9bd", "e1848fe185a1e186b0"],
+  ["ecb9bd", "ecb9b4e186b0"],
+  ["ecb9be", "e1848fe185a1e186b1"],
+  ["ecb9be", "ecb9b4e186b1"],
+  ["ecb9bf", "e1848fe185a1e186b2"],
+  ["ecb9bf", "ecb9b4e186b2"],
+  ["ecba80", "e1848fe185a1e186b3"],
+  ["ecba80", "ecb9b4e186b3"],
+  ["ecba81", "e1848fe185a1e186b4"],
+  ["ecba81", "ecb9b4e186b4"],
+  ["ecba82", "e1848fe185a1e186b5"],
+  ["ecba82", "ecb9b4e186b5"],
+  ["ecba83", "e1848fe185a1e186b6"],
+  ["ecba83", "ecb9b4e186b6"],
+  ["ecba84", "e1848fe185a1e186b7"],
+  ["ecba84", "ecb9b4e186b7"],
+  ["ecba85", "e1848fe185a1e186b8"],
+  ["ecba85", "ecb9b4e186b8"],
+  ["ecba86", "e1848fe185a1e186b9"],
+  ["ecba86", "ecb9b4e186b9"],
+  ["ecba87", "e1848fe185a1e186ba"],
+  ["ecba87", "ecb9b4e186ba"],
+  ["ecba88", "e1848fe185a1e186bb"],
+  ["ecba88", "ecb9b4e186bb"],
+  ["ecba89", "e1848fe185a1e186bc"],
+  ["ecba89", "ecb9b4e186bc"],
+  ["ecba8a", "e1848fe185a1e186bd"],
+  ["ecba8a", "ecb9b4e186bd"],
+  ["ecba8b", "e1848fe185a1e186be"],
+  ["ecba8b", "ecb9b4e186be"],
+  ["ecba8c", "e1848fe185a1e186bf"],
+  ["ecba8c", "ecb9b4e186bf"],
+  ["ecba8d", "e1848fe185a1e18780"],
+  ["ecba8d", "ecb9b4e18780"],
+  ["ecba8e", "e1848fe185a1e18781"],
+  ["ecba8e", "ecb9b4e18781"],
+  ["ecba8f", "e1848fe185a1e18782"],
+  ["ecba8f", "ecb9b4e18782"],
+  ["ecba90", "e1848fe185a2"],
+  ["ecba91", "e1848fe185a2e186a8"],
+  ["ecba91", "ecba90e186a8"],
+  ["ecba92", "e1848fe185a2e186a9"],
+  ["ecba92", "ecba90e186a9"],
+  ["ecba93", "e1848fe185a2e186aa"],
+  ["ecba93", "ecba90e186aa"],
+  ["ecba94", "e1848fe185a2e186ab"],
+  ["ecba94", "ecba90e186ab"],
+  ["ecba95", "e1848fe185a2e186ac"],
+  ["ecba95", "ecba90e186ac"],
+  ["ecba96", "e1848fe185a2e186ad"],
+  ["ecba96", "ecba90e186ad"],
+  ["ecba97", "e1848fe185a2e186ae"],
+  ["ecba97", "ecba90e186ae"],
+  ["ecba98", "e1848fe185a2e186af"],
+  ["ecba98", "ecba90e186af"],
+  ["ecba99", "e1848fe185a2e186b0"],
+  ["ecba99", "ecba90e186b0"],
+  ["ecba9a", "e1848fe185a2e186b1"],
+  ["ecba9a", "ecba90e186b1"],
+  ["ecba9b", "e1848fe185a2e186b2"],
+  ["ecba9b", "ecba90e186b2"],
+  ["ecba9c", "e1848fe185a2e186b3"],
+  ["ecba9c", "ecba90e186b3"],
+  ["ecba9d", "e1848fe185a2e186b4"],
+  ["ecba9d", "ecba90e186b4"],
+  ["ecba9e", "e1848fe185a2e186b5"],
+  ["ecba9e", "ecba90e186b5"],
+  ["ecba9f", "e1848fe185a2e186b6"],
+  ["ecba9f", "ecba90e186b6"],
+  ["ecbaa0", "e1848fe185a2e186b7"],
+  ["ecbaa0", "ecba90e186b7"],
+  ["ecbaa1", "e1848fe185a2e186b8"],
+  ["ecbaa1", "ecba90e186b8"],
+  ["ecbaa2", "e1848fe185a2e186b9"],
+  ["ecbaa2", "ecba90e186b9"],
+  ["ecbaa3", "e1848fe185a2e186ba"],
+  ["ecbaa3", "ecba90e186ba"],
+  ["ecbaa4", "e1848fe185a2e186bb"],
+  ["ecbaa4", "ecba90e186bb"],
+  ["ecbaa5", "e1848fe185a2e186bc"],
+  ["ecbaa5", "ecba90e186bc"],
+  ["ecbaa6", "e1848fe185a2e186bd"],
+  ["ecbaa6", "ecba90e186bd"],
+  ["ecbaa7", "e1848fe185a2e186be"],
+  ["ecbaa7", "ecba90e186be"],
+  ["ecbaa8", "e1848fe185a2e186bf"],
+  ["ecbaa8", "ecba90e186bf"],
+  ["ecbaa9", "e1848fe185a2e18780"],
+  ["ecbaa9", "ecba90e18780"],
+  ["ecbaaa", "e1848fe185a2e18781"],
+  ["ecbaaa", "ecba90e18781"],
+  ["ecbaab", "e1848fe185a2e18782"],
+  ["ecbaab", "ecba90e18782"],
+  ["ecbaac", "e1848fe185a3"],
+  ["ecbaad", "e1848fe185a3e186a8"],
+  ["ecbaad", "ecbaace186a8"],
+  ["ecbaae", "e1848fe185a3e186a9"],
+  ["ecbaae", "ecbaace186a9"],
+  ["ecbaaf", "e1848fe185a3e186aa"],
+  ["ecbaaf", "ecbaace186aa"],
+  ["ecbab0", "e1848fe185a3e186ab"],
+  ["ecbab0", "ecbaace186ab"],
+  ["ecbab1", "e1848fe185a3e186ac"],
+  ["ecbab1", "ecbaace186ac"],
+  ["ecbab2", "e1848fe185a3e186ad"],
+  ["ecbab2", "ecbaace186ad"],
+  ["ecbab3", "e1848fe185a3e186ae"],
+  ["ecbab3", "ecbaace186ae"],
+  ["ecbab4", "e1848fe185a3e186af"],
+  ["ecbab4", "ecbaace186af"],
+  ["ecbab5", "e1848fe185a3e186b0"],
+  ["ecbab5", "ecbaace186b0"],
+  ["ecbab6", "e1848fe185a3e186b1"],
+  ["ecbab6", "ecbaace186b1"],
+  ["ecbab7", "e1848fe185a3e186b2"],
+  ["ecbab7", "ecbaace186b2"],
+  ["ecbab8", "e1848fe185a3e186b3"],
+  ["ecbab8", "ecbaace186b3"],
+  ["ecbab9", "e1848fe185a3e186b4"],
+  ["ecbab9", "ecbaace186b4"],
+  ["ecbaba", "e1848fe185a3e186b5"],
+  ["ecbaba", "ecbaace186b5"],
+  ["ecbabb", "e1848fe185a3e186b6"],
+  ["ecbabb", "ecbaace186b6"],
+  ["ecbabc", "e1848fe185a3e186b7"],
+  ["ecbabc", "ecbaace186b7"],
+  ["ecbabd", "e1848fe185a3e186b8"],
+  ["ecbabd", "ecbaace186b8"],
+  ["ecbabe", "e1848fe185a3e186b9"],
+  ["ecbabe", "ecbaace186b9"],
+  ["ecbabf", "e1848fe185a3e186ba"],
+  ["ecbabf", "ecbaace186ba"],
+  ["ecbb80", "e1848fe185a3e186bb"],
+  ["ecbb80", "ecbaace186bb"],
+  ["ecbb81", "e1848fe185a3e186bc"],
+  ["ecbb81", "ecbaace186bc"],
+  ["ecbb82", "e1848fe185a3e186bd"],
+  ["ecbb82", "ecbaace186bd"],
+  ["ecbb83", "e1848fe185a3e186be"],
+  ["ecbb83", "ecbaace186be"],
+  ["ecbb84", "e1848fe185a3e186bf"],
+  ["ecbb84", "ecbaace186bf"],
+  ["ecbb85", "e1848fe185a3e18780"],
+  ["ecbb85", "ecbaace18780"],
+  ["ecbb86", "e1848fe185a3e18781"],
+  ["ecbb86", "ecbaace18781"],
+  ["ecbb87", "e1848fe185a3e18782"],
+  ["ecbb87", "ecbaace18782"],
+  ["ecbb88", "e1848fe185a4"],
+  ["ecbb89", "e1848fe185a4e186a8"],
+  ["ecbb89", "ecbb88e186a8"],
+  ["ecbb8a", "e1848fe185a4e186a9"],
+  ["ecbb8a", "ecbb88e186a9"],
+  ["ecbb8b", "e1848fe185a4e186aa"],
+  ["ecbb8b", "ecbb88e186aa"],
+  ["ecbb8c", "e1848fe185a4e186ab"],
+  ["ecbb8c", "ecbb88e186ab"],
+  ["ecbb8d", "e1848fe185a4e186ac"],
+  ["ecbb8d", "ecbb88e186ac"],
+  ["ecbb8e", "e1848fe185a4e186ad"],
+  ["ecbb8e", "ecbb88e186ad"],
+  ["ecbb8f", "e1848fe185a4e186ae"],
+  ["ecbb8f", "ecbb88e186ae"],
+  ["ecbb90", "e1848fe185a4e186af"],
+  ["ecbb90", "ecbb88e186af"],
+  ["ecbb91", "e1848fe185a4e186b0"],
+  ["ecbb91", "ecbb88e186b0"],
+  ["ecbb92", "e1848fe185a4e186b1"],
+  ["ecbb92", "ecbb88e186b1"],
+  ["ecbb93", "e1848fe185a4e186b2"],
+  ["ecbb93", "ecbb88e186b2"],
+  ["ecbb94", "e1848fe185a4e186b3"],
+  ["ecbb94", "ecbb88e186b3"],
+  ["ecbb95", "e1848fe185a4e186b4"],
+  ["ecbb95", "ecbb88e186b4"],
+  ["ecbb96", "e1848fe185a4e186b5"],
+  ["ecbb96", "ecbb88e186b5"],
+  ["ecbb97", "e1848fe185a4e186b6"],
+  ["ecbb97", "ecbb88e186b6"],
+  ["ecbb98", "e1848fe185a4e186b7"],
+  ["ecbb98", "ecbb88e186b7"],
+  ["ecbb99", "e1848fe185a4e186b8"],
+  ["ecbb99", "ecbb88e186b8"],
+  ["ecbb9a", "e1848fe185a4e186b9"],
+  ["ecbb9a", "ecbb88e186b9"],
+  ["ecbb9b", "e1848fe185a4e186ba"],
+  ["ecbb9b", "ecbb88e186ba"],
+  ["ecbb9c", "e1848fe185a4e186bb"],
+  ["ecbb9c", "ecbb88e186bb"],
+  ["ecbb9d", "e1848fe185a4e186bc"],
+  ["ecbb9d", "ecbb88e186bc"],
+  ["ecbb9e", "e1848fe185a4e186bd"],
+  ["ecbb9e", "ecbb88e186bd"],
+  ["ecbb9f", "e1848fe185a4e186be"],
+  ["ecbb9f", "ecbb88e186be"],
+  ["ecbba0", "e1848fe185a4e186bf"],
+  ["ecbba0", "ecbb88e186bf"],
+  ["ecbba1", "e1848fe185a4e18780"],
+  ["ecbba1", "ecbb88e18780"],
+  ["ecbba2", "e1848fe185a4e18781"],
+  ["ecbba2", "ecbb88e18781"],
+  ["ecbba3", "e1848fe185a4e18782"],
+  ["ecbba3", "ecbb88e18782"],
+  ["ecbba4", "e1848fe185a5"],
+  ["ecbba5", "e1848fe185a5e186a8"],
+  ["ecbba5", "ecbba4e186a8"],
+  ["ecbba6", "e1848fe185a5e186a9"],
+  ["ecbba6", "ecbba4e186a9"],
+  ["ecbba7", "e1848fe185a5e186aa"],
+  ["ecbba7", "ecbba4e186aa"],
+  ["ecbba8", "e1848fe185a5e186ab"],
+  ["ecbba8", "ecbba4e186ab"],
+  ["ecbba9", "e1848fe185a5e186ac"],
+  ["ecbba9", "ecbba4e186ac"],
+  ["ecbbaa", "e1848fe185a5e186ad"],
+  ["ecbbaa", "ecbba4e186ad"],
+  ["ecbbab", "e1848fe185a5e186ae"],
+  ["ecbbab", "ecbba4e186ae"],
+  ["ecbbac", "e1848fe185a5e186af"],
+  ["ecbbac", "ecbba4e186af"],
+  ["ecbbad", "e1848fe185a5e186b0"],
+  ["ecbbad", "ecbba4e186b0"],
+  ["ecbbae", "e1848fe185a5e186b1"],
+  ["ecbbae", "ecbba4e186b1"],
+  ["ecbbaf", "e1848fe185a5e186b2"],
+  ["ecbbaf", "ecbba4e186b2"],
+  ["ecbbb0", "e1848fe185a5e186b3"],
+  ["ecbbb0", "ecbba4e186b3"],
+  ["ecbbb1", "e1848fe185a5e186b4"],
+  ["ecbbb1", "ecbba4e186b4"],
+  ["ecbbb2", "e1848fe185a5e186b5"],
+  ["ecbbb2", "ecbba4e186b5"],
+  ["ecbbb3", "e1848fe185a5e186b6"],
+  ["ecbbb3", "ecbba4e186b6"],
+  ["ecbbb4", "e1848fe185a5e186b7"],
+  ["ecbbb4", "ecbba4e186b7"],
+  ["ecbbb5", "e1848fe185a5e186b8"],
+  ["ecbbb5", "ecbba4e186b8"],
+  ["ecbbb6", "e1848fe185a5e186b9"],
+  ["ecbbb6", "ecbba4e186b9"],
+  ["ecbbb7", "e1848fe185a5e186ba"],
+  ["ecbbb7", "ecbba4e186ba"],
+  ["ecbbb8", "e1848fe185a5e186bb"],
+  ["ecbbb8", "ecbba4e186bb"],
+  ["ecbbb9", "e1848fe185a5e186bc"],
+  ["ecbbb9", "ecbba4e186bc"],
+  ["ecbbba", "e1848fe185a5e186bd"],
+  ["ecbbba", "ecbba4e186bd"],
+  ["ecbbbb", "e1848fe185a5e186be"],
+  ["ecbbbb", "ecbba4e186be"],
+  ["ecbbbc", "e1848fe185a5e186bf"],
+  ["ecbbbc", "ecbba4e186bf"],
+  ["ecbbbd", "e1848fe185a5e18780"],
+  ["ecbbbd", "ecbba4e18780"],
+  ["ecbbbe", "e1848fe185a5e18781"],
+  ["ecbbbe", "ecbba4e18781"],
+  ["ecbbbf", "e1848fe185a5e18782"],
+  ["ecbbbf", "ecbba4e18782"],
+  ["ecbc80", "e1848fe185a6"],
+  ["ecbc81", "e1848fe185a6e186a8"],
+  ["ecbc81", "ecbc80e186a8"],
+  ["ecbc82", "e1848fe185a6e186a9"],
+  ["ecbc82", "ecbc80e186a9"],
+  ["ecbc83", "e1848fe185a6e186aa"],
+  ["ecbc83", "ecbc80e186aa"],
+  ["ecbc84", "e1848fe185a6e186ab"],
+  ["ecbc84", "ecbc80e186ab"],
+  ["ecbc85", "e1848fe185a6e186ac"],
+  ["ecbc85", "ecbc80e186ac"],
+  ["ecbc86", "e1848fe185a6e186ad"],
+  ["ecbc86", "ecbc80e186ad"],
+  ["ecbc87", "e1848fe185a6e186ae"],
+  ["ecbc87", "ecbc80e186ae"],
+  ["ecbc88", "e1848fe185a6e186af"],
+  ["ecbc88", "ecbc80e186af"],
+  ["ecbc89", "e1848fe185a6e186b0"],
+  ["ecbc89", "ecbc80e186b0"],
+  ["ecbc8a", "e1848fe185a6e186b1"],
+  ["ecbc8a", "ecbc80e186b1"],
+  ["ecbc8b", "e1848fe185a6e186b2"],
+  ["ecbc8b", "ecbc80e186b2"],
+  ["ecbc8c", "e1848fe185a6e186b3"],
+  ["ecbc8c", "ecbc80e186b3"],
+  ["ecbc8d", "e1848fe185a6e186b4"],
+  ["ecbc8d", "ecbc80e186b4"],
+  ["ecbc8e", "e1848fe185a6e186b5"],
+  ["ecbc8e", "ecbc80e186b5"],
+  ["ecbc8f", "e1848fe185a6e186b6"],
+  ["ecbc8f", "ecbc80e186b6"],
+  ["ecbc90", "e1848fe185a6e186b7"],
+  ["ecbc90", "ecbc80e186b7"],
+  ["ecbc91", "e1848fe185a6e186b8"],
+  ["ecbc91", "ecbc80e186b8"],
+  ["ecbc92", "e1848fe185a6e186b9"],
+  ["ecbc92", "ecbc80e186b9"],
+  ["ecbc93", "e1848fe185a6e186ba"],
+  ["ecbc93", "ecbc80e186ba"],
+  ["ecbc94", "e1848fe185a6e186bb"],
+  ["ecbc94", "ecbc80e186bb"],
+  ["ecbc95", "e1848fe185a6e186bc"],
+  ["ecbc95", "ecbc80e186bc"],
+  ["ecbc96", "e1848fe185a6e186bd"],
+  ["ecbc96", "ecbc80e186bd"],
+  ["ecbc97", "e1848fe185a6e186be"],
+  ["ecbc97", "ecbc80e186be"],
+  ["ecbc98", "e1848fe185a6e186bf"],
+  ["ecbc98", "ecbc80e186bf"],
+  ["ecbc99", "e1848fe185a6e18780"],
+  ["ecbc99", "ecbc80e18780"],
+  ["ecbc9a", "e1848fe185a6e18781"],
+  ["ecbc9a", "ecbc80e18781"],
+  ["ecbc9b", "e1848fe185a6e18782"],
+  ["ecbc9b", "ecbc80e18782"],
+  ["ecbc9c", "e1848fe185a7"],
+  ["ecbc9d", "e1848fe185a7e186a8"],
+  ["ecbc9d", "ecbc9ce186a8"],
+  ["ecbc9e", "e1848fe185a7e186a9"],
+  ["ecbc9e", "ecbc9ce186a9"],
+  ["ecbc9f", "e1848fe185a7e186aa"],
+  ["ecbc9f", "ecbc9ce186aa"],
+  ["ecbca0", "e1848fe185a7e186ab"],
+  ["ecbca0", "ecbc9ce186ab"],
+  ["ecbca1", "e1848fe185a7e186ac"],
+  ["ecbca1", "ecbc9ce186ac"],
+  ["ecbca2", "e1848fe185a7e186ad"],
+  ["ecbca2", "ecbc9ce186ad"],
+  ["ecbca3", "e1848fe185a7e186ae"],
+  ["ecbca3", "ecbc9ce186ae"],
+  ["ecbca4", "e1848fe185a7e186af"],
+  ["ecbca4", "ecbc9ce186af"],
+  ["ecbca5", "e1848fe185a7e186b0"],
+  ["ecbca5", "ecbc9ce186b0"],
+  ["ecbca6", "e1848fe185a7e186b1"],
+  ["ecbca6", "ecbc9ce186b1"],
+  ["ecbca7", "e1848fe185a7e186b2"],
+  ["ecbca7", "ecbc9ce186b2"],
+  ["ecbca8", "e1848fe185a7e186b3"],
+  ["ecbca8", "ecbc9ce186b3"],
+  ["ecbca9", "e1848fe185a7e186b4"],
+  ["ecbca9", "ecbc9ce186b4"],
+  ["ecbcaa", "e1848fe185a7e186b5"],
+  ["ecbcaa", "ecbc9ce186b5"],
+  ["ecbcab", "e1848fe185a7e186b6"],
+  ["ecbcab", "ecbc9ce186b6"],
+  ["ecbcac", "e1848fe185a7e186b7"],
+  ["ecbcac", "ecbc9ce186b7"],
+  ["ecbcad", "e1848fe185a7e186b8"],
+  ["ecbcad", "ecbc9ce186b8"],
+  ["ecbcae", "e1848fe185a7e186b9"],
+  ["ecbcae", "ecbc9ce186b9"],
+  ["ecbcaf", "e1848fe185a7e186ba"],
+  ["ecbcaf", "ecbc9ce186ba"],
+  ["ecbcb0", "e1848fe185a7e186bb"],
+  ["ecbcb0", "ecbc9ce186bb"],
+  ["ecbcb1", "e1848fe185a7e186bc"],
+  ["ecbcb1", "ecbc9ce186bc"],
+  ["ecbcb2", "e1848fe185a7e186bd"],
+  ["ecbcb2", "ecbc9ce186bd"],
+  ["ecbcb3", "e1848fe185a7e186be"],
+  ["ecbcb3", "ecbc9ce186be"],
+  ["ecbcb4", "e1848fe185a7e186bf"],
+  ["ecbcb4", "ecbc9ce186bf"],
+  ["ecbcb5", "e1848fe185a7e18780"],
+  ["ecbcb5", "ecbc9ce18780"],
+  ["ecbcb6", "e1848fe185a7e18781"],
+  ["ecbcb6", "ecbc9ce18781"],
+  ["ecbcb7", "e1848fe185a7e18782"],
+  ["ecbcb7", "ecbc9ce18782"],
+  ["ecbcb8", "e1848fe185a8"],
+  ["ecbcb9", "e1848fe185a8e186a8"],
+  ["ecbcb9", "ecbcb8e186a8"],
+  ["ecbcba", "e1848fe185a8e186a9"],
+  ["ecbcba", "ecbcb8e186a9"],
+  ["ecbcbb", "e1848fe185a8e186aa"],
+  ["ecbcbb", "ecbcb8e186aa"],
+  ["ecbcbc", "e1848fe185a8e186ab"],
+  ["ecbcbc", "ecbcb8e186ab"],
+  ["ecbcbd", "e1848fe185a8e186ac"],
+  ["ecbcbd", "ecbcb8e186ac"],
+  ["ecbcbe", "e1848fe185a8e186ad"],
+  ["ecbcbe", "ecbcb8e186ad"],
+  ["ecbcbf", "e1848fe185a8e186ae"],
+  ["ecbcbf", "ecbcb8e186ae"],
+  ["ecbd80", "e1848fe185a8e186af"],
+  ["ecbd80", "ecbcb8e186af"],
+  ["ecbd81", "e1848fe185a8e186b0"],
+  ["ecbd81", "ecbcb8e186b0"],
+  ["ecbd82", "e1848fe185a8e186b1"],
+  ["ecbd82", "ecbcb8e186b1"],
+  ["ecbd83", "e1848fe185a8e186b2"],
+  ["ecbd83", "ecbcb8e186b2"],
+  ["ecbd84", "e1848fe185a8e186b3"],
+  ["ecbd84", "ecbcb8e186b3"],
+  ["ecbd85", "e1848fe185a8e186b4"],
+  ["ecbd85", "ecbcb8e186b4"],
+  ["ecbd86", "e1848fe185a8e186b5"],
+  ["ecbd86", "ecbcb8e186b5"],
+  ["ecbd87", "e1848fe185a8e186b6"],
+  ["ecbd87", "ecbcb8e186b6"],
+  ["ecbd88", "e1848fe185a8e186b7"],
+  ["ecbd88", "ecbcb8e186b7"],
+  ["ecbd89", "e1848fe185a8e186b8"],
+  ["ecbd89", "ecbcb8e186b8"],
+  ["ecbd8a", "e1848fe185a8e186b9"],
+  ["ecbd8a", "ecbcb8e186b9"],
+  ["ecbd8b", "e1848fe185a8e186ba"],
+  ["ecbd8b", "ecbcb8e186ba"],
+  ["ecbd8c", "e1848fe185a8e186bb"],
+  ["ecbd8c", "ecbcb8e186bb"],
+  ["ecbd8d", "e1848fe185a8e186bc"],
+  ["ecbd8d", "ecbcb8e186bc"],
+  ["ecbd8e", "e1848fe185a8e186bd"],
+  ["ecbd8e", "ecbcb8e186bd"],
+  ["ecbd8f", "e1848fe185a8e186be"],
+  ["ecbd8f", "ecbcb8e186be"],
+  ["ecbd90", "e1848fe185a8e186bf"],
+  ["ecbd90", "ecbcb8e186bf"],
+  ["ecbd91", "e1848fe185a8e18780"],
+  ["ecbd91", "ecbcb8e18780"],
+  ["ecbd92", "e1848fe185a8e18781"],
+  ["ecbd92", "ecbcb8e18781"],
+  ["ecbd93", "e1848fe185a8e18782"],
+  ["ecbd93", "ecbcb8e18782"],
+  ["ecbd94", "e1848fe185a9"],
+  ["ecbd95", "e1848fe185a9e186a8"],
+  ["ecbd95", "ecbd94e186a8"],
+  ["ecbd96", "e1848fe185a9e186a9"],
+  ["ecbd96", "ecbd94e186a9"],
+  ["ecbd97", "e1848fe185a9e186aa"],
+  ["ecbd97", "ecbd94e186aa"],
+  ["ecbd98", "e1848fe185a9e186ab"],
+  ["ecbd98", "ecbd94e186ab"],
+  ["ecbd99", "e1848fe185a9e186ac"],
+  ["ecbd99", "ecbd94e186ac"],
+  ["ecbd9a", "e1848fe185a9e186ad"],
+  ["ecbd9a", "ecbd94e186ad"],
+  ["ecbd9b", "e1848fe185a9e186ae"],
+  ["ecbd9b", "ecbd94e186ae"],
+  ["ecbd9c", "e1848fe185a9e186af"],
+  ["ecbd9c", "ecbd94e186af"],
+  ["ecbd9d", "e1848fe185a9e186b0"],
+  ["ecbd9d", "ecbd94e186b0"],
+  ["ecbd9e", "e1848fe185a9e186b1"],
+  ["ecbd9e", "ecbd94e186b1"],
+  ["ecbd9f", "e1848fe185a9e186b2"],
+  ["ecbd9f", "ecbd94e186b2"],
+  ["ecbda0", "e1848fe185a9e186b3"],
+  ["ecbda0", "ecbd94e186b3"],
+  ["ecbda1", "e1848fe185a9e186b4"],
+  ["ecbda1", "ecbd94e186b4"],
+  ["ecbda2", "e1848fe185a9e186b5"],
+  ["ecbda2", "ecbd94e186b5"],
+  ["ecbda3", "e1848fe185a9e186b6"],
+  ["ecbda3", "ecbd94e186b6"],
+  ["ecbda4", "e1848fe185a9e186b7"],
+  ["ecbda4", "ecbd94e186b7"],
+  ["ecbda5", "e1848fe185a9e186b8"],
+  ["ecbda5", "ecbd94e186b8"],
+  ["ecbda6", "e1848fe185a9e186b9"],
+  ["ecbda6", "ecbd94e186b9"],
+  ["ecbda7", "e1848fe185a9e186ba"],
+  ["ecbda7", "ecbd94e186ba"],
+  ["ecbda8", "e1848fe185a9e186bb"],
+  ["ecbda8", "ecbd94e186bb"],
+  ["ecbda9", "e1848fe185a9e186bc"],
+  ["ecbda9", "ecbd94e186bc"],
+  ["ecbdaa", "e1848fe185a9e186bd"],
+  ["ecbdaa", "ecbd94e186bd"],
+  ["ecbdab", "e1848fe185a9e186be"],
+  ["ecbdab", "ecbd94e186be"],
+  ["ecbdac", "e1848fe185a9e186bf"],
+  ["ecbdac", "ecbd94e186bf"],
+  ["ecbdad", "e1848fe185a9e18780"],
+  ["ecbdad", "ecbd94e18780"],
+  ["ecbdae", "e1848fe185a9e18781"],
+  ["ecbdae", "ecbd94e18781"],
+  ["ecbdaf", "e1848fe185a9e18782"],
+  ["ecbdaf", "ecbd94e18782"],
+  ["ecbdb0", "e1848fe185aa"],
+  ["ecbdb1", "e1848fe185aae186a8"],
+  ["ecbdb1", "ecbdb0e186a8"],
+  ["ecbdb2", "e1848fe185aae186a9"],
+  ["ecbdb2", "ecbdb0e186a9"],
+  ["ecbdb3", "e1848fe185aae186aa"],
+  ["ecbdb3", "ecbdb0e186aa"],
+  ["ecbdb4", "e1848fe185aae186ab"],
+  ["ecbdb4", "ecbdb0e186ab"],
+  ["ecbdb5", "e1848fe185aae186ac"],
+  ["ecbdb5", "ecbdb0e186ac"],
+  ["ecbdb6", "e1848fe185aae186ad"],
+  ["ecbdb6", "ecbdb0e186ad"],
+  ["ecbdb7", "e1848fe185aae186ae"],
+  ["ecbdb7", "ecbdb0e186ae"],
+  ["ecbdb8", "e1848fe185aae186af"],
+  ["ecbdb8", "ecbdb0e186af"],
+  ["ecbdb9", "e1848fe185aae186b0"],
+  ["ecbdb9", "ecbdb0e186b0"],
+  ["ecbdba", "e1848fe185aae186b1"],
+  ["ecbdba", "ecbdb0e186b1"],
+  ["ecbdbb", "e1848fe185aae186b2"],
+  ["ecbdbb", "ecbdb0e186b2"],
+  ["ecbdbc", "e1848fe185aae186b3"],
+  ["ecbdbc", "ecbdb0e186b3"],
+  ["ecbdbd", "e1848fe185aae186b4"],
+  ["ecbdbd", "ecbdb0e186b4"],
+  ["ecbdbe", "e1848fe185aae186b5"],
+  ["ecbdbe", "ecbdb0e186b5"],
+  ["ecbdbf", "e1848fe185aae186b6"],
+  ["ecbdbf", "ecbdb0e186b6"],
+  ["ecbe80", "e1848fe185aae186b7"],
+  ["ecbe80", "ecbdb0e186b7"],
+  ["ecbe81", "e1848fe185aae186b8"],
+  ["ecbe81", "ecbdb0e186b8"],
+  ["ecbe82", "e1848fe185aae186b9"],
+  ["ecbe82", "ecbdb0e186b9"],
+  ["ecbe83", "e1848fe185aae186ba"],
+  ["ecbe83", "ecbdb0e186ba"],
+  ["ecbe84", "e1848fe185aae186bb"],
+  ["ecbe84", "ecbdb0e186bb"],
+  ["ecbe85", "e1848fe185aae186bc"],
+  ["ecbe85", "ecbdb0e186bc"],
+  ["ecbe86", "e1848fe185aae186bd"],
+  ["ecbe86", "ecbdb0e186bd"],
+  ["ecbe87", "e1848fe185aae186be"],
+  ["ecbe87", "ecbdb0e186be"],
+  ["ecbe88", "e1848fe185aae186bf"],
+  ["ecbe88", "ecbdb0e186bf"],
+  ["ecbe89", "e1848fe185aae18780"],
+  ["ecbe89", "ecbdb0e18780"],
+  ["ecbe8a", "e1848fe185aae18781"],
+  ["ecbe8a", "ecbdb0e18781"],
+  ["ecbe8b", "e1848fe185aae18782"],
+  ["ecbe8b", "ecbdb0e18782"],
+  ["ecbe8c", "e1848fe185ab"],
+  ["ecbe8d", "e1848fe185abe186a8"],
+  ["ecbe8d", "ecbe8ce186a8"],
+  ["ecbe8e", "e1848fe185abe186a9"],
+  ["ecbe8e", "ecbe8ce186a9"],
+  ["ecbe8f", "e1848fe185abe186aa"],
+  ["ecbe8f", "ecbe8ce186aa"],
+  ["ecbe90", "e1848fe185abe186ab"],
+  ["ecbe90", "ecbe8ce186ab"],
+  ["ecbe91", "e1848fe185abe186ac"],
+  ["ecbe91", "ecbe8ce186ac"],
+  ["ecbe92", "e1848fe185abe186ad"],
+  ["ecbe92", "ecbe8ce186ad"],
+  ["ecbe93", "e1848fe185abe186ae"],
+  ["ecbe93", "ecbe8ce186ae"],
+  ["ecbe94", "e1848fe185abe186af"],
+  ["ecbe94", "ecbe8ce186af"],
+  ["ecbe95", "e1848fe185abe186b0"],
+  ["ecbe95", "ecbe8ce186b0"],
+  ["ecbe96", "e1848fe185abe186b1"],
+  ["ecbe96", "ecbe8ce186b1"],
+  ["ecbe97", "e1848fe185abe186b2"],
+  ["ecbe97", "ecbe8ce186b2"],
+  ["ecbe98", "e1848fe185abe186b3"],
+  ["ecbe98", "ecbe8ce186b3"],
+  ["ecbe99", "e1848fe185abe186b4"],
+  ["ecbe99", "ecbe8ce186b4"],
+  ["ecbe9a", "e1848fe185abe186b5"],
+  ["ecbe9a", "ecbe8ce186b5"],
+  ["ecbe9b", "e1848fe185abe186b6"],
+  ["ecbe9b", "ecbe8ce186b6"],
+  ["ecbe9c", "e1848fe185abe186b7"],
+  ["ecbe9c", "ecbe8ce186b7"],
+  ["ecbe9d", "e1848fe185abe186b8"],
+  ["ecbe9d", "ecbe8ce186b8"],
+  ["ecbe9e", "e1848fe185abe186b9"],
+  ["ecbe9e", "ecbe8ce186b9"],
+  ["ecbe9f", "e1848fe185abe186ba"],
+  ["ecbe9f", "ecbe8ce186ba"],
+  ["ecbea0", "e1848fe185abe186bb"],
+  ["ecbea0", "ecbe8ce186bb"],
+  ["ecbea1", "e1848fe185abe186bc"],
+  ["ecbea1", "ecbe8ce186bc"],
+  ["ecbea2", "e1848fe185abe186bd"],
+  ["ecbea2", "ecbe8ce186bd"],
+  ["ecbea3", "e1848fe185abe186be"],
+  ["ecbea3", "ecbe8ce186be"],
+  ["ecbea4", "e1848fe185abe186bf"],
+  ["ecbea4", "ecbe8ce186bf"],
+  ["ecbea5", "e1848fe185abe18780"],
+  ["ecbea5", "ecbe8ce18780"],
+  ["ecbea6", "e1848fe185abe18781"],
+  ["ecbea6", "ecbe8ce18781"],
+  ["ecbea7", "e1848fe185abe18782"],
+  ["ecbea7", "ecbe8ce18782"],
+  ["ecbea8", "e1848fe185ac"],
+  ["ecbea9", "e1848fe185ace186a8"],
+  ["ecbea9", "ecbea8e186a8"],
+  ["ecbeaa", "e1848fe185ace186a9"],
+  ["ecbeaa", "ecbea8e186a9"],
+  ["ecbeab", "e1848fe185ace186aa"],
+  ["ecbeab", "ecbea8e186aa"],
+  ["ecbeac", "e1848fe185ace186ab"],
+  ["ecbeac", "ecbea8e186ab"],
+  ["ecbead", "e1848fe185ace186ac"],
+  ["ecbead", "ecbea8e186ac"],
+  ["ecbeae", "e1848fe185ace186ad"],
+  ["ecbeae", "ecbea8e186ad"],
+  ["ecbeaf", "e1848fe185ace186ae"],
+  ["ecbeaf", "ecbea8e186ae"],
+  ["ecbeb0", "e1848fe185ace186af"],
+  ["ecbeb0", "ecbea8e186af"],
+  ["ecbeb1", "e1848fe185ace186b0"],
+  ["ecbeb1", "ecbea8e186b0"],
+  ["ecbeb2", "e1848fe185ace186b1"],
+  ["ecbeb2", "ecbea8e186b1"],
+  ["ecbeb3", "e1848fe185ace186b2"],
+  ["ecbeb3", "ecbea8e186b2"],
+  ["ecbeb4", "e1848fe185ace186b3"],
+  ["ecbeb4", "ecbea8e186b3"],
+  ["ecbeb5", "e1848fe185ace186b4"],
+  ["ecbeb5", "ecbea8e186b4"],
+  ["ecbeb6", "e1848fe185ace186b5"],
+  ["ecbeb6", "ecbea8e186b5"],
+  ["ecbeb7", "e1848fe185ace186b6"],
+  ["ecbeb7", "ecbea8e186b6"],
+  ["ecbeb8", "e1848fe185ace186b7"],
+  ["ecbeb8", "ecbea8e186b7"],
+  ["ecbeb9", "e1848fe185ace186b8"],
+  ["ecbeb9", "ecbea8e186b8"],
+  ["ecbeba", "e1848fe185ace186b9"],
+  ["ecbeba", "ecbea8e186b9"],
+  ["ecbebb", "e1848fe185ace186ba"],
+  ["ecbebb", "ecbea8e186ba"],
+  ["ecbebc", "e1848fe185ace186bb"],
+  ["ecbebc", "ecbea8e186bb"],
+  ["ecbebd", "e1848fe185ace186bc"],
+  ["ecbebd", "ecbea8e186bc"],
+  ["ecbebe", "e1848fe185ace186bd"],
+  ["ecbebe", "ecbea8e186bd"],
+  ["ecbebf", "e1848fe185ace186be"],
+  ["ecbebf", "ecbea8e186be"],
+  ["ecbf80", "e1848fe185ace186bf"],
+  ["ecbf80", "ecbea8e186bf"],
+  ["ecbf81", "e1848fe185ace18780"],
+  ["ecbf81", "ecbea8e18780"],
+  ["ecbf82", "e1848fe185ace18781"],
+  ["ecbf82", "ecbea8e18781"],
+  ["ecbf83", "e1848fe185ace18782"],
+  ["ecbf83", "ecbea8e18782"],
+  ["ecbf84", "e1848fe185ad"],
+  ["ecbf85", "e1848fe185ade186a8"],
+  ["ecbf85", "ecbf84e186a8"],
+  ["ecbf86", "e1848fe185ade186a9"],
+  ["ecbf86", "ecbf84e186a9"],
+  ["ecbf87", "e1848fe185ade186aa"],
+  ["ecbf87", "ecbf84e186aa"],
+  ["ecbf88", "e1848fe185ade186ab"],
+  ["ecbf88", "ecbf84e186ab"],
+  ["ecbf89", "e1848fe185ade186ac"],
+  ["ecbf89", "ecbf84e186ac"],
+  ["ecbf8a", "e1848fe185ade186ad"],
+  ["ecbf8a", "ecbf84e186ad"],
+  ["ecbf8b", "e1848fe185ade186ae"],
+  ["ecbf8b", "ecbf84e186ae"],
+  ["ecbf8c", "e1848fe185ade186af"],
+  ["ecbf8c", "ecbf84e186af"],
+  ["ecbf8d", "e1848fe185ade186b0"],
+  ["ecbf8d", "ecbf84e186b0"],
+  ["ecbf8e", "e1848fe185ade186b1"],
+  ["ecbf8e", "ecbf84e186b1"],
+  ["ecbf8f", "e1848fe185ade186b2"],
+  ["ecbf8f", "ecbf84e186b2"],
+  ["ecbf90", "e1848fe185ade186b3"],
+  ["ecbf90", "ecbf84e186b3"],
+  ["ecbf91", "e1848fe185ade186b4"],
+  ["ecbf91", "ecbf84e186b4"],
+  ["ecbf92", "e1848fe185ade186b5"],
+  ["ecbf92", "ecbf84e186b5"],
+  ["ecbf93", "e1848fe185ade186b6"],
+  ["ecbf93", "ecbf84e186b6"],
+  ["ecbf94", "e1848fe185ade186b7"],
+  ["ecbf94", "ecbf84e186b7"],
+  ["ecbf95", "e1848fe185ade186b8"],
+  ["ecbf95", "ecbf84e186b8"],
+  ["ecbf96", "e1848fe185ade186b9"],
+  ["ecbf96", "ecbf84e186b9"],
+  ["ecbf97", "e1848fe185ade186ba"],
+  ["ecbf97", "ecbf84e186ba"],
+  ["ecbf98", "e1848fe185ade186bb"],
+  ["ecbf98", "ecbf84e186bb"],
+  ["ecbf99", "e1848fe185ade186bc"],
+  ["ecbf99", "ecbf84e186bc"],
+  ["ecbf9a", "e1848fe185ade186bd"],
+  ["ecbf9a", "ecbf84e186bd"],
+  ["ecbf9b", "e1848fe185ade186be"],
+  ["ecbf9b", "ecbf84e186be"],
+  ["ecbf9c", "e1848fe185ade186bf"],
+  ["ecbf9c", "ecbf84e186bf"],
+  ["ecbf9d", "e1848fe185ade18780"],
+  ["ecbf9d", "ecbf84e18780"],
+  ["ecbf9e", "e1848fe185ade18781"],
+  ["ecbf9e", "ecbf84e18781"],
+  ["ecbf9f", "e1848fe185ade18782"],
+  ["ecbf9f", "ecbf84e18782"],
+  ["ecbfa0", "e1848fe185ae"],
+  ["ecbfa1", "e1848fe185aee186a8"],
+  ["ecbfa1", "ecbfa0e186a8"],
+  ["ecbfa2", "e1848fe185aee186a9"],
+  ["ecbfa2", "ecbfa0e186a9"],
+  ["ecbfa3", "e1848fe185aee186aa"],
+  ["ecbfa3", "ecbfa0e186aa"],
+  ["ecbfa4", "e1848fe185aee186ab"],
+  ["ecbfa4", "ecbfa0e186ab"],
+  ["ecbfa5", "e1848fe185aee186ac"],
+  ["ecbfa5", "ecbfa0e186ac"],
+  ["ecbfa6", "e1848fe185aee186ad"],
+  ["ecbfa6", "ecbfa0e186ad"],
+  ["ecbfa7", "e1848fe185aee186ae"],
+  ["ecbfa7", "ecbfa0e186ae"],
+  ["ecbfa8", "e1848fe185aee186af"],
+  ["ecbfa8", "ecbfa0e186af"],
+  ["ecbfa9", "e1848fe185aee186b0"],
+  ["ecbfa9", "ecbfa0e186b0"],
+  ["ecbfaa", "e1848fe185aee186b1"],
+  ["ecbfaa", "ecbfa0e186b1"],
+  ["ecbfab", "e1848fe185aee186b2"],
+  ["ecbfab", "ecbfa0e186b2"],
+  ["ecbfac", "e1848fe185aee186b3"],
+  ["ecbfac", "ecbfa0e186b3"],
+  ["ecbfad", "e1848fe185aee186b4"],
+  ["ecbfad", "ecbfa0e186b4"],
+  ["ecbfae", "e1848fe185aee186b5"],
+  ["ecbfae", "ecbfa0e186b5"],
+  ["ecbfaf", "e1848fe185aee186b6"],
+  ["ecbfaf", "ecbfa0e186b6"],
+  ["ecbfb0", "e1848fe185aee186b7"],
+  ["ecbfb0", "ecbfa0e186b7"],
+  ["ecbfb1", "e1848fe185aee186b8"],
+  ["ecbfb1", "ecbfa0e186b8"],
+  ["ecbfb2", "e1848fe185aee186b9"],
+  ["ecbfb2", "ecbfa0e186b9"],
+  ["ecbfb3", "e1848fe185aee186ba"],
+  ["ecbfb3", "ecbfa0e186ba"],
+  ["ecbfb4", "e1848fe185aee186bb"],
+  ["ecbfb4", "ecbfa0e186bb"],
+  ["ecbfb5", "e1848fe185aee186bc"],
+  ["ecbfb5", "ecbfa0e186bc"],
+  ["ecbfb6", "e1848fe185aee186bd"],
+  ["ecbfb6", "ecbfa0e186bd"],
+  ["ecbfb7", "e1848fe185aee186be"],
+  ["ecbfb7", "ecbfa0e186be"],
+  ["ecbfb8", "e1848fe185aee186bf"],
+  ["ecbfb8", "ecbfa0e186bf"],
+  ["ecbfb9", "e1848fe185aee18780"],
+  ["ecbfb9", "ecbfa0e18780"],
+  ["ecbfba", "e1848fe185aee18781"],
+  ["ecbfba", "ecbfa0e18781"],
+  ["ecbfbb", "e1848fe185aee18782"],
+  ["ecbfbb", "ecbfa0e18782"],
+  ["ecbfbc", "e1848fe185af"],
+  ["ecbfbd", "e1848fe185afe186a8"],
+  ["ecbfbd", "ecbfbce186a8"],
+  ["ecbfbe", "e1848fe185afe186a9"],
+  ["ecbfbe", "ecbfbce186a9"],
+  ["ecbfbf", "e1848fe185afe186aa"],
+  ["ecbfbf", "ecbfbce186aa"],
+  ["ed8080", "e1848fe185afe186ab"],
+  ["ed8080", "ecbfbce186ab"],
+  ["ed8081", "e1848fe185afe186ac"],
+  ["ed8081", "ecbfbce186ac"],
+  ["ed8082", "e1848fe185afe186ad"],
+  ["ed8082", "ecbfbce186ad"],
+  ["ed8083", "e1848fe185afe186ae"],
+  ["ed8083", "ecbfbce186ae"],
+  ["ed8084", "e1848fe185afe186af"],
+  ["ed8084", "ecbfbce186af"],
+  ["ed8085", "e1848fe185afe186b0"],
+  ["ed8085", "ecbfbce186b0"],
+  ["ed8086", "e1848fe185afe186b1"],
+  ["ed8086", "ecbfbce186b1"],
+  ["ed8087", "e1848fe185afe186b2"],
+  ["ed8087", "ecbfbce186b2"],
+  ["ed8088", "e1848fe185afe186b3"],
+  ["ed8088", "ecbfbce186b3"],
+  ["ed8089", "e1848fe185afe186b4"],
+  ["ed8089", "ecbfbce186b4"],
+  ["ed808a", "e1848fe185afe186b5"],
+  ["ed808a", "ecbfbce186b5"],
+  ["ed808b", "e1848fe185afe186b6"],
+  ["ed808b", "ecbfbce186b6"],
+  ["ed808c", "e1848fe185afe186b7"],
+  ["ed808c", "ecbfbce186b7"],
+  ["ed808d", "e1848fe185afe186b8"],
+  ["ed808d", "ecbfbce186b8"],
+  ["ed808e", "e1848fe185afe186b9"],
+  ["ed808e", "ecbfbce186b9"],
+  ["ed808f", "e1848fe185afe186ba"],
+  ["ed808f", "ecbfbce186ba"],
+  ["ed8090", "e1848fe185afe186bb"],
+  ["ed8090", "ecbfbce186bb"],
+  ["ed8091", "e1848fe185afe186bc"],
+  ["ed8091", "ecbfbce186bc"],
+  ["ed8092", "e1848fe185afe186bd"],
+  ["ed8092", "ecbfbce186bd"],
+  ["ed8093", "e1848fe185afe186be"],
+  ["ed8093", "ecbfbce186be"],
+  ["ed8094", "e1848fe185afe186bf"],
+  ["ed8094", "ecbfbce186bf"],
+  ["ed8095", "e1848fe185afe18780"],
+  ["ed8095", "ecbfbce18780"],
+  ["ed8096", "e1848fe185afe18781"],
+  ["ed8096", "ecbfbce18781"],
+  ["ed8097", "e1848fe185afe18782"],
+  ["ed8097", "ecbfbce18782"],
+  ["ed8098", "e1848fe185b0"],
+  ["ed8099", "e1848fe185b0e186a8"],
+  ["ed8099", "ed8098e186a8"],
+  ["ed809a", "e1848fe185b0e186a9"],
+  ["ed809a", "ed8098e186a9"],
+  ["ed809b", "e1848fe185b0e186aa"],
+  ["ed809b", "ed8098e186aa"],
+  ["ed809c", "e1848fe185b0e186ab"],
+  ["ed809c", "ed8098e186ab"],
+  ["ed809d", "e1848fe185b0e186ac"],
+  ["ed809d", "ed8098e186ac"],
+  ["ed809e", "e1848fe185b0e186ad"],
+  ["ed809e", "ed8098e186ad"],
+  ["ed809f", "e1848fe185b0e186ae"],
+  ["ed809f", "ed8098e186ae"],
+  ["ed80a0", "e1848fe185b0e186af"],
+  ["ed80a0", "ed8098e186af"],
+  ["ed80a1", "e1848fe185b0e186b0"],
+  ["ed80a1", "ed8098e186b0"],
+  ["ed80a2", "e1848fe185b0e186b1"],
+  ["ed80a2", "ed8098e186b1"],
+  ["ed80a3", "e1848fe185b0e186b2"],
+  ["ed80a3", "ed8098e186b2"],
+  ["ed80a4", "e1848fe185b0e186b3"],
+  ["ed80a4", "ed8098e186b3"],
+  ["ed80a5", "e1848fe185b0e186b4"],
+  ["ed80a5", "ed8098e186b4"],
+  ["ed80a6", "e1848fe185b0e186b5"],
+  ["ed80a6", "ed8098e186b5"],
+  ["ed80a7", "e1848fe185b0e186b6"],
+  ["ed80a7", "ed8098e186b6"],
+  ["ed80a8", "e1848fe185b0e186b7"],
+  ["ed80a8", "ed8098e186b7"],
+  ["ed80a9", "e1848fe185b0e186b8"],
+  ["ed80a9", "ed8098e186b8"],
+  ["ed80aa", "e1848fe185b0e186b9"],
+  ["ed80aa", "ed8098e186b9"],
+  ["ed80ab", "e1848fe185b0e186ba"],
+  ["ed80ab", "ed8098e186ba"],
+  ["ed80ac", "e1848fe185b0e186bb"],
+  ["ed80ac", "ed8098e186bb"],
+  ["ed80ad", "e1848fe185b0e186bc"],
+  ["ed80ad", "ed8098e186bc"],
+  ["ed80ae", "e1848fe185b0e186bd"],
+  ["ed80ae", "ed8098e186bd"],
+  ["ed80af", "e1848fe185b0e186be"],
+  ["ed80af", "ed8098e186be"],
+  ["ed80b0", "e1848fe185b0e186bf"],
+  ["ed80b0", "ed8098e186bf"],
+  ["ed80b1", "e1848fe185b0e18780"],
+  ["ed80b1", "ed8098e18780"],
+  ["ed80b2", "e1848fe185b0e18781"],
+  ["ed80b2", "ed8098e18781"],
+  ["ed80b3", "e1848fe185b0e18782"],
+  ["ed80b3", "ed8098e18782"],
+  ["ed80b4", "e1848fe185b1"],
+  ["ed80b5", "e1848fe185b1e186a8"],
+  ["ed80b5", "ed80b4e186a8"],
+  ["ed80b6", "e1848fe185b1e186a9"],
+  ["ed80b6", "ed80b4e186a9"],
+  ["ed80b7", "e1848fe185b1e186aa"],
+  ["ed80b7", "ed80b4e186aa"],
+  ["ed80b8", "e1848fe185b1e186ab"],
+  ["ed80b8", "ed80b4e186ab"],
+  ["ed80b9", "e1848fe185b1e186ac"],
+  ["ed80b9", "ed80b4e186ac"],
+  ["ed80ba", "e1848fe185b1e186ad"],
+  ["ed80ba", "ed80b4e186ad"],
+  ["ed80bb", "e1848fe185b1e186ae"],
+  ["ed80bb", "ed80b4e186ae"],
+  ["ed80bc", "e1848fe185b1e186af"],
+  ["ed80bc", "ed80b4e186af"],
+  ["ed80bd", "e1848fe185b1e186b0"],
+  ["ed80bd", "ed80b4e186b0"],
+  ["ed80be", "e1848fe185b1e186b1"],
+  ["ed80be", "ed80b4e186b1"],
+  ["ed80bf", "e1848fe185b1e186b2"],
+  ["ed80bf", "ed80b4e186b2"],
+  ["ed8180", "e1848fe185b1e186b3"],
+  ["ed8180", "ed80b4e186b3"],
+  ["ed8181", "e1848fe185b1e186b4"],
+  ["ed8181", "ed80b4e186b4"],
+  ["ed8182", "e1848fe185b1e186b5"],
+  ["ed8182", "ed80b4e186b5"],
+  ["ed8183", "e1848fe185b1e186b6"],
+  ["ed8183", "ed80b4e186b6"],
+  ["ed8184", "e1848fe185b1e186b7"],
+  ["ed8184", "ed80b4e186b7"],
+  ["ed8185", "e1848fe185b1e186b8"],
+  ["ed8185", "ed80b4e186b8"],
+  ["ed8186", "e1848fe185b1e186b9"],
+  ["ed8186", "ed80b4e186b9"],
+  ["ed8187", "e1848fe185b1e186ba"],
+  ["ed8187", "ed80b4e186ba"],
+  ["ed8188", "e1848fe185b1e186bb"],
+  ["ed8188", "ed80b4e186bb"],
+  ["ed8189", "e1848fe185b1e186bc"],
+  ["ed8189", "ed80b4e186bc"],
+  ["ed818a", "e1848fe185b1e186bd"],
+  ["ed818a", "ed80b4e186bd"],
+  ["ed818b", "e1848fe185b1e186be"],
+  ["ed818b", "ed80b4e186be"],
+  ["ed818c", "e1848fe185b1e186bf"],
+  ["ed818c", "ed80b4e186bf"],
+  ["ed818d", "e1848fe185b1e18780"],
+  ["ed818d", "ed80b4e18780"],
+  ["ed818e", "e1848fe185b1e18781"],
+  ["ed818e", "ed80b4e18781"],
+  ["ed818f", "e1848fe185b1e18782"],
+  ["ed818f", "ed80b4e18782"],
+  ["ed8190", "e1848fe185b2"],
+  ["ed8191", "e1848fe185b2e186a8"],
+  ["ed8191", "ed8190e186a8"],
+  ["ed8192", "e1848fe185b2e186a9"],
+  ["ed8192", "ed8190e186a9"],
+  ["ed8193", "e1848fe185b2e186aa"],
+  ["ed8193", "ed8190e186aa"],
+  ["ed8194", "e1848fe185b2e186ab"],
+  ["ed8194", "ed8190e186ab"],
+  ["ed8195", "e1848fe185b2e186ac"],
+  ["ed8195", "ed8190e186ac"],
+  ["ed8196", "e1848fe185b2e186ad"],
+  ["ed8196", "ed8190e186ad"],
+  ["ed8197", "e1848fe185b2e186ae"],
+  ["ed8197", "ed8190e186ae"],
+  ["ed8198", "e1848fe185b2e186af"],
+  ["ed8198", "ed8190e186af"],
+  ["ed8199", "e1848fe185b2e186b0"],
+  ["ed8199", "ed8190e186b0"],
+  ["ed819a", "e1848fe185b2e186b1"],
+  ["ed819a", "ed8190e186b1"],
+  ["ed819b", "e1848fe185b2e186b2"],
+  ["ed819b", "ed8190e186b2"],
+  ["ed819c", "e1848fe185b2e186b3"],
+  ["ed819c", "ed8190e186b3"],
+  ["ed819d", "e1848fe185b2e186b4"],
+  ["ed819d", "ed8190e186b4"],
+  ["ed819e", "e1848fe185b2e186b5"],
+  ["ed819e", "ed8190e186b5"],
+  ["ed819f", "e1848fe185b2e186b6"],
+  ["ed819f", "ed8190e186b6"],
+  ["ed81a0", "e1848fe185b2e186b7"],
+  ["ed81a0", "ed8190e186b7"],
+  ["ed81a1", "e1848fe185b2e186b8"],
+  ["ed81a1", "ed8190e186b8"],
+  ["ed81a2", "e1848fe185b2e186b9"],
+  ["ed81a2", "ed8190e186b9"],
+  ["ed81a3", "e1848fe185b2e186ba"],
+  ["ed81a3", "ed8190e186ba"],
+  ["ed81a4", "e1848fe185b2e186bb"],
+  ["ed81a4", "ed8190e186bb"],
+  ["ed81a5", "e1848fe185b2e186bc"],
+  ["ed81a5", "ed8190e186bc"],
+  ["ed81a6", "e1848fe185b2e186bd"],
+  ["ed81a6", "ed8190e186bd"],
+  ["ed81a7", "e1848fe185b2e186be"],
+  ["ed81a7", "ed8190e186be"],
+  ["ed81a8", "e1848fe185b2e186bf"],
+  ["ed81a8", "ed8190e186bf"],
+  ["ed81a9", "e1848fe185b2e18780"],
+  ["ed81a9", "ed8190e18780"],
+  ["ed81aa", "e1848fe185b2e18781"],
+  ["ed81aa", "ed8190e18781"],
+  ["ed81ab", "e1848fe185b2e18782"],
+  ["ed81ab", "ed8190e18782"],
+  ["ed81ac", "e1848fe185b3"],
+  ["ed81ad", "e1848fe185b3e186a8"],
+  ["ed81ad", "ed81ace186a8"],
+  ["ed81ae", "e1848fe185b3e186a9"],
+  ["ed81ae", "ed81ace186a9"],
+  ["ed81af", "e1848fe185b3e186aa"],
+  ["ed81af", "ed81ace186aa"],
+  ["ed81b0", "e1848fe185b3e186ab"],
+  ["ed81b0", "ed81ace186ab"],
+  ["ed81b1", "e1848fe185b3e186ac"],
+  ["ed81b1", "ed81ace186ac"],
+  ["ed81b2", "e1848fe185b3e186ad"],
+  ["ed81b2", "ed81ace186ad"],
+  ["ed81b3", "e1848fe185b3e186ae"],
+  ["ed81b3", "ed81ace186ae"],
+  ["ed81b4", "e1848fe185b3e186af"],
+  ["ed81b4", "ed81ace186af"],
+  ["ed81b5", "e1848fe185b3e186b0"],
+  ["ed81b5", "ed81ace186b0"],
+  ["ed81b6", "e1848fe185b3e186b1"],
+  ["ed81b6", "ed81ace186b1"],
+  ["ed81b7", "e1848fe185b3e186b2"],
+  ["ed81b7", "ed81ace186b2"],
+  ["ed81b8", "e1848fe185b3e186b3"],
+  ["ed81b8", "ed81ace186b3"],
+  ["ed81b9", "e1848fe185b3e186b4"],
+  ["ed81b9", "ed81ace186b4"],
+  ["ed81ba", "e1848fe185b3e186b5"],
+  ["ed81ba", "ed81ace186b5"],
+  ["ed81bb", "e1848fe185b3e186b6"],
+  ["ed81bb", "ed81ace186b6"],
+  ["ed81bc", "e1848fe185b3e186b7"],
+  ["ed81bc", "ed81ace186b7"],
+  ["ed81bd", "e1848fe185b3e186b8"],
+  ["ed81bd", "ed81ace186b8"],
+  ["ed81be", "e1848fe185b3e186b9"],
+  ["ed81be", "ed81ace186b9"],
+  ["ed81bf", "e1848fe185b3e186ba"],
+  ["ed81bf", "ed81ace186ba"],
+  ["ed8280", "e1848fe185b3e186bb"],
+  ["ed8280", "ed81ace186bb"],
+  ["ed8281", "e1848fe185b3e186bc"],
+  ["ed8281", "ed81ace186bc"],
+  ["ed8282", "e1848fe185b3e186bd"],
+  ["ed8282", "ed81ace186bd"],
+  ["ed8283", "e1848fe185b3e186be"],
+  ["ed8283", "ed81ace186be"],
+  ["ed8284", "e1848fe185b3e186bf"],
+  ["ed8284", "ed81ace186bf"],
+  ["ed8285", "e1848fe185b3e18780"],
+  ["ed8285", "ed81ace18780"],
+  ["ed8286", "e1848fe185b3e18781"],
+  ["ed8286", "ed81ace18781"],
+  ["ed8287", "e1848fe185b3e18782"],
+  ["ed8287", "ed81ace18782"],
+  ["ed8288", "e1848fe185b4"],
+  ["ed8289", "e1848fe185b4e186a8"],
+  ["ed8289", "ed8288e186a8"],
+  ["ed828a", "e1848fe185b4e186a9"],
+  ["ed828a", "ed8288e186a9"],
+  ["ed828b", "e1848fe185b4e186aa"],
+  ["ed828b", "ed8288e186aa"],
+  ["ed828c", "e1848fe185b4e186ab"],
+  ["ed828c", "ed8288e186ab"],
+  ["ed828d", "e1848fe185b4e186ac"],
+  ["ed828d", "ed8288e186ac"],
+  ["ed828e", "e1848fe185b4e186ad"],
+  ["ed828e", "ed8288e186ad"],
+  ["ed828f", "e1848fe185b4e186ae"],
+  ["ed828f", "ed8288e186ae"],
+  ["ed8290", "e1848fe185b4e186af"],
+  ["ed8290", "ed8288e186af"],
+  ["ed8291", "e1848fe185b4e186b0"],
+  ["ed8291", "ed8288e186b0"],
+  ["ed8292", "e1848fe185b4e186b1"],
+  ["ed8292", "ed8288e186b1"],
+  ["ed8293", "e1848fe185b4e186b2"],
+  ["ed8293", "ed8288e186b2"],
+  ["ed8294", "e1848fe185b4e186b3"],
+  ["ed8294", "ed8288e186b3"],
+  ["ed8295", "e1848fe185b4e186b4"],
+  ["ed8295", "ed8288e186b4"],
+  ["ed8296", "e1848fe185b4e186b5"],
+  ["ed8296", "ed8288e186b5"],
+  ["ed8297", "e1848fe185b4e186b6"],
+  ["ed8297", "ed8288e186b6"],
+  ["ed8298", "e1848fe185b4e186b7"],
+  ["ed8298", "ed8288e186b7"],
+  ["ed8299", "e1848fe185b4e186b8"],
+  ["ed8299", "ed8288e186b8"],
+  ["ed829a", "e1848fe185b4e186b9"],
+  ["ed829a", "ed8288e186b9"],
+  ["ed829b", "e1848fe185b4e186ba"],
+  ["ed829b", "ed8288e186ba"],
+  ["ed829c", "e1848fe185b4e186bb"],
+  ["ed829c", "ed8288e186bb"],
+  ["ed829d", "e1848fe185b4e186bc"],
+  ["ed829d", "ed8288e186bc"],
+  ["ed829e", "e1848fe185b4e186bd"],
+  ["ed829e", "ed8288e186bd"],
+  ["ed829f", "e1848fe185b4e186be"],
+  ["ed829f", "ed8288e186be"],
+  ["ed82a0", "e1848fe185b4e186bf"],
+  ["ed82a0", "ed8288e186bf"],
+  ["ed82a1", "e1848fe185b4e18780"],
+  ["ed82a1", "ed8288e18780"],
+  ["ed82a2", "e1848fe185b4e18781"],
+  ["ed82a2", "ed8288e18781"],
+  ["ed82a3", "e1848fe185b4e18782"],
+  ["ed82a3", "ed8288e18782"],
+  ["ed82a4", "e1848fe185b5"],
+  ["ed82a5", "e1848fe185b5e186a8"],
+  ["ed82a5", "ed82a4e186a8"],
+  ["ed82a6", "e1848fe185b5e186a9"],
+  ["ed82a6", "ed82a4e186a9"],
+  ["ed82a7", "e1848fe185b5e186aa"],
+  ["ed82a7", "ed82a4e186aa"],
+  ["ed82a8", "e1848fe185b5e186ab"],
+  ["ed82a8", "ed82a4e186ab"],
+  ["ed82a9", "e1848fe185b5e186ac"],
+  ["ed82a9", "ed82a4e186ac"],
+  ["ed82aa", "e1848fe185b5e186ad"],
+  ["ed82aa", "ed82a4e186ad"],
+  ["ed82ab", "e1848fe185b5e186ae"],
+  ["ed82ab", "ed82a4e186ae"],
+  ["ed82ac", "e1848fe185b5e186af"],
+  ["ed82ac", "ed82a4e186af"],
+  ["ed82ad", "e1848fe185b5e186b0"],
+  ["ed82ad", "ed82a4e186b0"],
+  ["ed82ae", "e1848fe185b5e186b1"],
+  ["ed82ae", "ed82a4e186b1"],
+  ["ed82af", "e1848fe185b5e186b2"],
+  ["ed82af", "ed82a4e186b2"],
+  ["ed82b0", "e1848fe185b5e186b3"],
+  ["ed82b0", "ed82a4e186b3"],
+  ["ed82b1", "e1848fe185b5e186b4"],
+  ["ed82b1", "ed82a4e186b4"],
+  ["ed82b2", "e1848fe185b5e186b5"],
+  ["ed82b2", "ed82a4e186b5"],
+  ["ed82b3", "e1848fe185b5e186b6"],
+  ["ed82b3", "ed82a4e186b6"],
+  ["ed82b4", "e1848fe185b5e186b7"],
+  ["ed82b4", "ed82a4e186b7"],
+  ["ed82b5", "e1848fe185b5e186b8"],
+  ["ed82b5", "ed82a4e186b8"],
+  ["ed82b6", "e1848fe185b5e186b9"],
+  ["ed82b6", "ed82a4e186b9"],
+  ["ed82b7", "e1848fe185b5e186ba"],
+  ["ed82b7", "ed82a4e186ba"],
+  ["ed82b8", "e1848fe185b5e186bb"],
+  ["ed82b8", "ed82a4e186bb"],
+  ["ed82b9", "e1848fe185b5e186bc"],
+  ["ed82b9", "ed82a4e186bc"],
+  ["ed82ba", "e1848fe185b5e186bd"],
+  ["ed82ba", "ed82a4e186bd"],
+  ["ed82bb", "e1848fe185b5e186be"],
+  ["ed82bb", "ed82a4e186be"],
+  ["ed82bc", "e1848fe185b5e186bf"],
+  ["ed82bc", "ed82a4e186bf"],
+  ["ed82bd", "e1848fe185b5e18780"],
+  ["ed82bd", "ed82a4e18780"],
+  ["ed82be", "e1848fe185b5e18781"],
+  ["ed82be", "ed82a4e18781"],
+  ["ed82bf", "e1848fe185b5e18782"],
+  ["ed82bf", "ed82a4e18782"],
+  ["ed8380", "e18490e185a1"],
+  ["ed8381", "e18490e185a1e186a8"],
+  ["ed8381", "ed8380e186a8"],
+  ["ed8382", "e18490e185a1e186a9"],
+  ["ed8382", "ed8380e186a9"],
+  ["ed8383", "e18490e185a1e186aa"],
+  ["ed8383", "ed8380e186aa"],
+  ["ed8384", "e18490e185a1e186ab"],
+  ["ed8384", "ed8380e186ab"],
+  ["ed8385", "e18490e185a1e186ac"],
+  ["ed8385", "ed8380e186ac"],
+  ["ed8386", "e18490e185a1e186ad"],
+  ["ed8386", "ed8380e186ad"],
+  ["ed8387", "e18490e185a1e186ae"],
+  ["ed8387", "ed8380e186ae"],
+  ["ed8388", "e18490e185a1e186af"],
+  ["ed8388", "ed8380e186af"],
+  ["ed8389", "e18490e185a1e186b0"],
+  ["ed8389", "ed8380e186b0"],
+  ["ed838a", "e18490e185a1e186b1"],
+  ["ed838a", "ed8380e186b1"],
+  ["ed838b", "e18490e185a1e186b2"],
+  ["ed838b", "ed8380e186b2"],
+  ["ed838c", "e18490e185a1e186b3"],
+  ["ed838c", "ed8380e186b3"],
+  ["ed838d", "e18490e185a1e186b4"],
+  ["ed838d", "ed8380e186b4"],
+  ["ed838e", "e18490e185a1e186b5"],
+  ["ed838e", "ed8380e186b5"],
+  ["ed838f", "e18490e185a1e186b6"],
+  ["ed838f", "ed8380e186b6"],
+  ["ed8390", "e18490e185a1e186b7"],
+  ["ed8390", "ed8380e186b7"],
+  ["ed8391", "e18490e185a1e186b8"],
+  ["ed8391", "ed8380e186b8"],
+  ["ed8392", "e18490e185a1e186b9"],
+  ["ed8392", "ed8380e186b9"],
+  ["ed8393", "e18490e185a1e186ba"],
+  ["ed8393", "ed8380e186ba"],
+  ["ed8394", "e18490e185a1e186bb"],
+  ["ed8394", "ed8380e186bb"],
+  ["ed8395", "e18490e185a1e186bc"],
+  ["ed8395", "ed8380e186bc"],
+  ["ed8396", "e18490e185a1e186bd"],
+  ["ed8396", "ed8380e186bd"],
+  ["ed8397", "e18490e185a1e186be"],
+  ["ed8397", "ed8380e186be"],
+  ["ed8398", "e18490e185a1e186bf"],
+  ["ed8398", "ed8380e186bf"],
+  ["ed8399", "e18490e185a1e18780"],
+  ["ed8399", "ed8380e18780"],
+  ["ed839a", "e18490e185a1e18781"],
+  ["ed839a", "ed8380e18781"],
+  ["ed839b", "e18490e185a1e18782"],
+  ["ed839b", "ed8380e18782"],
+  ["ed839c", "e18490e185a2"],
+  ["ed839d", "e18490e185a2e186a8"],
+  ["ed839d", "ed839ce186a8"],
+  ["ed839e", "e18490e185a2e186a9"],
+  ["ed839e", "ed839ce186a9"],
+  ["ed839f", "e18490e185a2e186aa"],
+  ["ed839f", "ed839ce186aa"],
+  ["ed83a0", "e18490e185a2e186ab"],
+  ["ed83a0", "ed839ce186ab"],
+  ["ed83a1", "e18490e185a2e186ac"],
+  ["ed83a1", "ed839ce186ac"],
+  ["ed83a2", "e18490e185a2e186ad"],
+  ["ed83a2", "ed839ce186ad"],
+  ["ed83a3", "e18490e185a2e186ae"],
+  ["ed83a3", "ed839ce186ae"],
+  ["ed83a4", "e18490e185a2e186af"],
+  ["ed83a4", "ed839ce186af"],
+  ["ed83a5", "e18490e185a2e186b0"],
+  ["ed83a5", "ed839ce186b0"],
+  ["ed83a6", "e18490e185a2e186b1"],
+  ["ed83a6", "ed839ce186b1"],
+  ["ed83a7", "e18490e185a2e186b2"],
+  ["ed83a7", "ed839ce186b2"],
+  ["ed83a8", "e18490e185a2e186b3"],
+  ["ed83a8", "ed839ce186b3"],
+  ["ed83a9", "e18490e185a2e186b4"],
+  ["ed83a9", "ed839ce186b4"],
+  ["ed83aa", "e18490e185a2e186b5"],
+  ["ed83aa", "ed839ce186b5"],
+  ["ed83ab", "e18490e185a2e186b6"],
+  ["ed83ab", "ed839ce186b6"],
+  ["ed83ac", "e18490e185a2e186b7"],
+  ["ed83ac", "ed839ce186b7"],
+  ["ed83ad", "e18490e185a2e186b8"],
+  ["ed83ad", "ed839ce186b8"],
+  ["ed83ae", "e18490e185a2e186b9"],
+  ["ed83ae", "ed839ce186b9"],
+  ["ed83af", "e18490e185a2e186ba"],
+  ["ed83af", "ed839ce186ba"],
+  ["ed83b0", "e18490e185a2e186bb"],
+  ["ed83b0", "ed839ce186bb"],
+  ["ed83b1", "e18490e185a2e186bc"],
+  ["ed83b1", "ed839ce186bc"],
+  ["ed83b2", "e18490e185a2e186bd"],
+  ["ed83b2", "ed839ce186bd"],
+  ["ed83b3", "e18490e185a2e186be"],
+  ["ed83b3", "ed839ce186be"],
+  ["ed83b4", "e18490e185a2e186bf"],
+  ["ed83b4", "ed839ce186bf"],
+  ["ed83b5", "e18490e185a2e18780"],
+  ["ed83b5", "ed839ce18780"],
+  ["ed83b6", "e18490e185a2e18781"],
+  ["ed83b6", "ed839ce18781"],
+  ["ed83b7", "e18490e185a2e18782"],
+  ["ed83b7", "ed839ce18782"],
+  ["ed83b8", "e18490e185a3"],
+  ["ed83b9", "e18490e185a3e186a8"],
+  ["ed83b9", "ed83b8e186a8"],
+  ["ed83ba", "e18490e185a3e186a9"],
+  ["ed83ba", "ed83b8e186a9"],
+  ["ed83bb", "e18490e185a3e186aa"],
+  ["ed83bb", "ed83b8e186aa"],
+  ["ed83bc", "e18490e185a3e186ab"],
+  ["ed83bc", "ed83b8e186ab"],
+  ["ed83bd", "e18490e185a3e186ac"],
+  ["ed83bd", "ed83b8e186ac"],
+  ["ed83be", "e18490e185a3e186ad"],
+  ["ed83be", "ed83b8e186ad"],
+  ["ed83bf", "e18490e185a3e186ae"],
+  ["ed83bf", "ed83b8e186ae"],
+  ["ed8480", "e18490e185a3e186af"],
+  ["ed8480", "ed83b8e186af"],
+  ["ed8481", "e18490e185a3e186b0"],
+  ["ed8481", "ed83b8e186b0"],
+  ["ed8482", "e18490e185a3e186b1"],
+  ["ed8482", "ed83b8e186b1"],
+  ["ed8483", "e18490e185a3e186b2"],
+  ["ed8483", "ed83b8e186b2"],
+  ["ed8484", "e18490e185a3e186b3"],
+  ["ed8484", "ed83b8e186b3"],
+  ["ed8485", "e18490e185a3e186b4"],
+  ["ed8485", "ed83b8e186b4"],
+  ["ed8486", "e18490e185a3e186b5"],
+  ["ed8486", "ed83b8e186b5"],
+  ["ed8487", "e18490e185a3e186b6"],
+  ["ed8487", "ed83b8e186b6"],
+  ["ed8488", "e18490e185a3e186b7"],
+  ["ed8488", "ed83b8e186b7"],
+  ["ed8489", "e18490e185a3e186b8"],
+  ["ed8489", "ed83b8e186b8"],
+  ["ed848a", "e18490e185a3e186b9"],
+  ["ed848a", "ed83b8e186b9"],
+  ["ed848b", "e18490e185a3e186ba"],
+  ["ed848b", "ed83b8e186ba"],
+  ["ed848c", "e18490e185a3e186bb"],
+  ["ed848c", "ed83b8e186bb"],
+  ["ed848d", "e18490e185a3e186bc"],
+  ["ed848d", "ed83b8e186bc"],
+  ["ed848e", "e18490e185a3e186bd"],
+  ["ed848e", "ed83b8e186bd"],
+  ["ed848f", "e18490e185a3e186be"],
+  ["ed848f", "ed83b8e186be"],
+  ["ed8490", "e18490e185a3e186bf"],
+  ["ed8490", "ed83b8e186bf"],
+  ["ed8491", "e18490e185a3e18780"],
+  ["ed8491", "ed83b8e18780"],
+  ["ed8492", "e18490e185a3e18781"],
+  ["ed8492", "ed83b8e18781"],
+  ["ed8493", "e18490e185a3e18782"],
+  ["ed8493", "ed83b8e18782"],
+  ["ed8494", "e18490e185a4"],
+  ["ed8495", "e18490e185a4e186a8"],
+  ["ed8495", "ed8494e186a8"],
+  ["ed8496", "e18490e185a4e186a9"],
+  ["ed8496", "ed8494e186a9"],
+  ["ed8497", "e18490e185a4e186aa"],
+  ["ed8497", "ed8494e186aa"],
+  ["ed8498", "e18490e185a4e186ab"],
+  ["ed8498", "ed8494e186ab"],
+  ["ed8499", "e18490e185a4e186ac"],
+  ["ed8499", "ed8494e186ac"],
+  ["ed849a", "e18490e185a4e186ad"],
+  ["ed849a", "ed8494e186ad"],
+  ["ed849b", "e18490e185a4e186ae"],
+  ["ed849b", "ed8494e186ae"],
+  ["ed849c", "e18490e185a4e186af"],
+  ["ed849c", "ed8494e186af"],
+  ["ed849d", "e18490e185a4e186b0"],
+  ["ed849d", "ed8494e186b0"],
+  ["ed849e", "e18490e185a4e186b1"],
+  ["ed849e", "ed8494e186b1"],
+  ["ed849f", "e18490e185a4e186b2"],
+  ["ed849f", "ed8494e186b2"],
+  ["ed84a0", "e18490e185a4e186b3"],
+  ["ed84a0", "ed8494e186b3"],
+  ["ed84a1", "e18490e185a4e186b4"],
+  ["ed84a1", "ed8494e186b4"],
+  ["ed84a2", "e18490e185a4e186b5"],
+  ["ed84a2", "ed8494e186b5"],
+  ["ed84a3", "e18490e185a4e186b6"],
+  ["ed84a3", "ed8494e186b6"],
+  ["ed84a4", "e18490e185a4e186b7"],
+  ["ed84a4", "ed8494e186b7"],
+  ["ed84a5", "e18490e185a4e186b8"],
+  ["ed84a5", "ed8494e186b8"],
+  ["ed84a6", "e18490e185a4e186b9"],
+  ["ed84a6", "ed8494e186b9"],
+  ["ed84a7", "e18490e185a4e186ba"],
+  ["ed84a7", "ed8494e186ba"],
+  ["ed84a8", "e18490e185a4e186bb"],
+  ["ed84a8", "ed8494e186bb"],
+  ["ed84a9", "e18490e185a4e186bc"],
+  ["ed84a9", "ed8494e186bc"],
+  ["ed84aa", "e18490e185a4e186bd"],
+  ["ed84aa", "ed8494e186bd"],
+  ["ed84ab", "e18490e185a4e186be"],
+  ["ed84ab", "ed8494e186be"],
+  ["ed84ac", "e18490e185a4e186bf"],
+  ["ed84ac", "ed8494e186bf"],
+  ["ed84ad", "e18490e185a4e18780"],
+  ["ed84ad", "ed8494e18780"],
+  ["ed84ae", "e18490e185a4e18781"],
+  ["ed84ae", "ed8494e18781"],
+  ["ed84af", "e18490e185a4e18782"],
+  ["ed84af", "ed8494e18782"],
+  ["ed84b0", "e18490e185a5"],
+  ["ed84b1", "e18490e185a5e186a8"],
+  ["ed84b1", "ed84b0e186a8"],
+  ["ed84b2", "e18490e185a5e186a9"],
+  ["ed84b2", "ed84b0e186a9"],
+  ["ed84b3", "e18490e185a5e186aa"],
+  ["ed84b3", "ed84b0e186aa"],
+  ["ed84b4", "e18490e185a5e186ab"],
+  ["ed84b4", "ed84b0e186ab"],
+  ["ed84b5", "e18490e185a5e186ac"],
+  ["ed84b5", "ed84b0e186ac"],
+  ["ed84b6", "e18490e185a5e186ad"],
+  ["ed84b6", "ed84b0e186ad"],
+  ["ed84b7", "e18490e185a5e186ae"],
+  ["ed84b7", "ed84b0e186ae"],
+  ["ed84b8", "e18490e185a5e186af"],
+  ["ed84b8", "ed84b0e186af"],
+  ["ed84b9", "e18490e185a5e186b0"],
+  ["ed84b9", "ed84b0e186b0"],
+  ["ed84ba", "e18490e185a5e186b1"],
+  ["ed84ba", "ed84b0e186b1"],
+  ["ed84bb", "e18490e185a5e186b2"],
+  ["ed84bb", "ed84b0e186b2"],
+  ["ed84bc", "e18490e185a5e186b3"],
+  ["ed84bc", "ed84b0e186b3"],
+  ["ed84bd", "e18490e185a5e186b4"],
+  ["ed84bd", "ed84b0e186b4"],
+  ["ed84be", "e18490e185a5e186b5"],
+  ["ed84be", "ed84b0e186b5"],
+  ["ed84bf", "e18490e185a5e186b6"],
+  ["ed84bf", "ed84b0e186b6"],
+  ["ed8580", "e18490e185a5e186b7"],
+  ["ed8580", "ed84b0e186b7"],
+  ["ed8581", "e18490e185a5e186b8"],
+  ["ed8581", "ed84b0e186b8"],
+  ["ed8582", "e18490e185a5e186b9"],
+  ["ed8582", "ed84b0e186b9"],
+  ["ed8583", "e18490e185a5e186ba"],
+  ["ed8583", "ed84b0e186ba"],
+  ["ed8584", "e18490e185a5e186bb"],
+  ["ed8584", "ed84b0e186bb"],
+  ["ed8585", "e18490e185a5e186bc"],
+  ["ed8585", "ed84b0e186bc"],
+  ["ed8586", "e18490e185a5e186bd"],
+  ["ed8586", "ed84b0e186bd"],
+  ["ed8587", "e18490e185a5e186be"],
+  ["ed8587", "ed84b0e186be"],
+  ["ed8588", "e18490e185a5e186bf"],
+  ["ed8588", "ed84b0e186bf"],
+  ["ed8589", "e18490e185a5e18780"],
+  ["ed8589", "ed84b0e18780"],
+  ["ed858a", "e18490e185a5e18781"],
+  ["ed858a", "ed84b0e18781"],
+  ["ed858b", "e18490e185a5e18782"],
+  ["ed858b", "ed84b0e18782"],
+  ["ed858c", "e18490e185a6"],
+  ["ed858d", "e18490e185a6e186a8"],
+  ["ed858d", "ed858ce186a8"],
+  ["ed858e", "e18490e185a6e186a9"],
+  ["ed858e", "ed858ce186a9"],
+  ["ed858f", "e18490e185a6e186aa"],
+  ["ed858f", "ed858ce186aa"],
+  ["ed8590", "e18490e185a6e186ab"],
+  ["ed8590", "ed858ce186ab"],
+  ["ed8591", "e18490e185a6e186ac"],
+  ["ed8591", "ed858ce186ac"],
+  ["ed8592", "e18490e185a6e186ad"],
+  ["ed8592", "ed858ce186ad"],
+  ["ed8593", "e18490e185a6e186ae"],
+  ["ed8593", "ed858ce186ae"],
+  ["ed8594", "e18490e185a6e186af"],
+  ["ed8594", "ed858ce186af"],
+  ["ed8595", "e18490e185a6e186b0"],
+  ["ed8595", "ed858ce186b0"],
+  ["ed8596", "e18490e185a6e186b1"],
+  ["ed8596", "ed858ce186b1"],
+  ["ed8597", "e18490e185a6e186b2"],
+  ["ed8597", "ed858ce186b2"],
+  ["ed8598", "e18490e185a6e186b3"],
+  ["ed8598", "ed858ce186b3"],
+  ["ed8599", "e18490e185a6e186b4"],
+  ["ed8599", "ed858ce186b4"],
+  ["ed859a", "e18490e185a6e186b5"],
+  ["ed859a", "ed858ce186b5"],
+  ["ed859b", "e18490e185a6e186b6"],
+  ["ed859b", "ed858ce186b6"],
+  ["ed859c", "e18490e185a6e186b7"],
+  ["ed859c", "ed858ce186b7"],
+  ["ed859d", "e18490e185a6e186b8"],
+  ["ed859d", "ed858ce186b8"],
+  ["ed859e", "e18490e185a6e186b9"],
+  ["ed859e", "ed858ce186b9"],
+  ["ed859f", "e18490e185a6e186ba"],
+  ["ed859f", "ed858ce186ba"],
+  ["ed85a0", "e18490e185a6e186bb"],
+  ["ed85a0", "ed858ce186bb"],
+  ["ed85a1", "e18490e185a6e186bc"],
+  ["ed85a1", "ed858ce186bc"],
+  ["ed85a2", "e18490e185a6e186bd"],
+  ["ed85a2", "ed858ce186bd"],
+  ["ed85a3", "e18490e185a6e186be"],
+  ["ed85a3", "ed858ce186be"],
+  ["ed85a4", "e18490e185a6e186bf"],
+  ["ed85a4", "ed858ce186bf"],
+  ["ed85a5", "e18490e185a6e18780"],
+  ["ed85a5", "ed858ce18780"],
+  ["ed85a6", "e18490e185a6e18781"],
+  ["ed85a6", "ed858ce18781"],
+  ["ed85a7", "e18490e185a6e18782"],
+  ["ed85a7", "ed858ce18782"],
+  ["ed85a8", "e18490e185a7"],
+  ["ed85a9", "e18490e185a7e186a8"],
+  ["ed85a9", "ed85a8e186a8"],
+  ["ed85aa", "e18490e185a7e186a9"],
+  ["ed85aa", "ed85a8e186a9"],
+  ["ed85ab", "e18490e185a7e186aa"],
+  ["ed85ab", "ed85a8e186aa"],
+  ["ed85ac", "e18490e185a7e186ab"],
+  ["ed85ac", "ed85a8e186ab"],
+  ["ed85ad", "e18490e185a7e186ac"],
+  ["ed85ad", "ed85a8e186ac"],
+  ["ed85ae", "e18490e185a7e186ad"],
+  ["ed85ae", "ed85a8e186ad"],
+  ["ed85af", "e18490e185a7e186ae"],
+  ["ed85af", "ed85a8e186ae"],
+  ["ed85b0", "e18490e185a7e186af"],
+  ["ed85b0", "ed85a8e186af"],
+  ["ed85b1", "e18490e185a7e186b0"],
+  ["ed85b1", "ed85a8e186b0"],
+  ["ed85b2", "e18490e185a7e186b1"],
+  ["ed85b2", "ed85a8e186b1"],
+  ["ed85b3", "e18490e185a7e186b2"],
+  ["ed85b3", "ed85a8e186b2"],
+  ["ed85b4", "e18490e185a7e186b3"],
+  ["ed85b4", "ed85a8e186b3"],
+  ["ed85b5", "e18490e185a7e186b4"],
+  ["ed85b5", "ed85a8e186b4"],
+  ["ed85b6", "e18490e185a7e186b5"],
+  ["ed85b6", "ed85a8e186b5"],
+  ["ed85b7", "e18490e185a7e186b6"],
+  ["ed85b7", "ed85a8e186b6"],
+  ["ed85b8", "e18490e185a7e186b7"],
+  ["ed85b8", "ed85a8e186b7"],
+  ["ed85b9", "e18490e185a7e186b8"],
+  ["ed85b9", "ed85a8e186b8"],
+  ["ed85ba", "e18490e185a7e186b9"],
+  ["ed85ba", "ed85a8e186b9"],
+  ["ed85bb", "e18490e185a7e186ba"],
+  ["ed85bb", "ed85a8e186ba"],
+  ["ed85bc", "e18490e185a7e186bb"],
+  ["ed85bc", "ed85a8e186bb"],
+  ["ed85bd", "e18490e185a7e186bc"],
+  ["ed85bd", "ed85a8e186bc"],
+  ["ed85be", "e18490e185a7e186bd"],
+  ["ed85be", "ed85a8e186bd"],
+  ["ed85bf", "e18490e185a7e186be"],
+  ["ed85bf", "ed85a8e186be"],
+  ["ed8680", "e18490e185a7e186bf"],
+  ["ed8680", "ed85a8e186bf"],
+  ["ed8681", "e18490e185a7e18780"],
+  ["ed8681", "ed85a8e18780"],
+  ["ed8682", "e18490e185a7e18781"],
+  ["ed8682", "ed85a8e18781"],
+  ["ed8683", "e18490e185a7e18782"],
+  ["ed8683", "ed85a8e18782"],
+  ["ed8684", "e18490e185a8"],
+  ["ed8685", "e18490e185a8e186a8"],
+  ["ed8685", "ed8684e186a8"],
+  ["ed8686", "e18490e185a8e186a9"],
+  ["ed8686", "ed8684e186a9"],
+  ["ed8687", "e18490e185a8e186aa"],
+  ["ed8687", "ed8684e186aa"],
+  ["ed8688", "e18490e185a8e186ab"],
+  ["ed8688", "ed8684e186ab"],
+  ["ed8689", "e18490e185a8e186ac"],
+  ["ed8689", "ed8684e186ac"],
+  ["ed868a", "e18490e185a8e186ad"],
+  ["ed868a", "ed8684e186ad"],
+  ["ed868b", "e18490e185a8e186ae"],
+  ["ed868b", "ed8684e186ae"],
+  ["ed868c", "e18490e185a8e186af"],
+  ["ed868c", "ed8684e186af"],
+  ["ed868d", "e18490e185a8e186b0"],
+  ["ed868d", "ed8684e186b0"],
+  ["ed868e", "e18490e185a8e186b1"],
+  ["ed868e", "ed8684e186b1"],
+  ["ed868f", "e18490e185a8e186b2"],
+  ["ed868f", "ed8684e186b2"],
+  ["ed8690", "e18490e185a8e186b3"],
+  ["ed8690", "ed8684e186b3"],
+  ["ed8691", "e18490e185a8e186b4"],
+  ["ed8691", "ed8684e186b4"],
+  ["ed8692", "e18490e185a8e186b5"],
+  ["ed8692", "ed8684e186b5"],
+  ["ed8693", "e18490e185a8e186b6"],
+  ["ed8693", "ed8684e186b6"],
+  ["ed8694", "e18490e185a8e186b7"],
+  ["ed8694", "ed8684e186b7"],
+  ["ed8695", "e18490e185a8e186b8"],
+  ["ed8695", "ed8684e186b8"],
+  ["ed8696", "e18490e185a8e186b9"],
+  ["ed8696", "ed8684e186b9"],
+  ["ed8697", "e18490e185a8e186ba"],
+  ["ed8697", "ed8684e186ba"],
+  ["ed8698", "e18490e185a8e186bb"],
+  ["ed8698", "ed8684e186bb"],
+  ["ed8699", "e18490e185a8e186bc"],
+  ["ed8699", "ed8684e186bc"],
+  ["ed869a", "e18490e185a8e186bd"],
+  ["ed869a", "ed8684e186bd"],
+  ["ed869b", "e18490e185a8e186be"],
+  ["ed869b", "ed8684e186be"],
+  ["ed869c", "e18490e185a8e186bf"],
+  ["ed869c", "ed8684e186bf"],
+  ["ed869d", "e18490e185a8e18780"],
+  ["ed869d", "ed8684e18780"],
+  ["ed869e", "e18490e185a8e18781"],
+  ["ed869e", "ed8684e18781"],
+  ["ed869f", "e18490e185a8e18782"],
+  ["ed869f", "ed8684e18782"],
+  ["ed86a0", "e18490e185a9"],
+  ["ed86a1", "e18490e185a9e186a8"],
+  ["ed86a1", "ed86a0e186a8"],
+  ["ed86a2", "e18490e185a9e186a9"],
+  ["ed86a2", "ed86a0e186a9"],
+  ["ed86a3", "e18490e185a9e186aa"],
+  ["ed86a3", "ed86a0e186aa"],
+  ["ed86a4", "e18490e185a9e186ab"],
+  ["ed86a4", "ed86a0e186ab"],
+  ["ed86a5", "e18490e185a9e186ac"],
+  ["ed86a5", "ed86a0e186ac"],
+  ["ed86a6", "e18490e185a9e186ad"],
+  ["ed86a6", "ed86a0e186ad"],
+  ["ed86a7", "e18490e185a9e186ae"],
+  ["ed86a7", "ed86a0e186ae"],
+  ["ed86a8", "e18490e185a9e186af"],
+  ["ed86a8", "ed86a0e186af"],
+  ["ed86a9", "e18490e185a9e186b0"],
+  ["ed86a9", "ed86a0e186b0"],
+  ["ed86aa", "e18490e185a9e186b1"],
+  ["ed86aa", "ed86a0e186b1"],
+  ["ed86ab", "e18490e185a9e186b2"],
+  ["ed86ab", "ed86a0e186b2"],
+  ["ed86ac", "e18490e185a9e186b3"],
+  ["ed86ac", "ed86a0e186b3"],
+  ["ed86ad", "e18490e185a9e186b4"],
+  ["ed86ad", "ed86a0e186b4"],
+  ["ed86ae", "e18490e185a9e186b5"],
+  ["ed86ae", "ed86a0e186b5"],
+  ["ed86af", "e18490e185a9e186b6"],
+  ["ed86af", "ed86a0e186b6"],
+  ["ed86b0", "e18490e185a9e186b7"],
+  ["ed86b0", "ed86a0e186b7"],
+  ["ed86b1", "e18490e185a9e186b8"],
+  ["ed86b1", "ed86a0e186b8"],
+  ["ed86b2", "e18490e185a9e186b9"],
+  ["ed86b2", "ed86a0e186b9"],
+  ["ed86b3", "e18490e185a9e186ba"],
+  ["ed86b3", "ed86a0e186ba"],
+  ["ed86b4", "e18490e185a9e186bb"],
+  ["ed86b4", "ed86a0e186bb"],
+  ["ed86b5", "e18490e185a9e186bc"],
+  ["ed86b5", "ed86a0e186bc"],
+  ["ed86b6", "e18490e185a9e186bd"],
+  ["ed86b6", "ed86a0e186bd"],
+  ["ed86b7", "e18490e185a9e186be"],
+  ["ed86b7", "ed86a0e186be"],
+  ["ed86b8", "e18490e185a9e186bf"],
+  ["ed86b8", "ed86a0e186bf"],
+  ["ed86b9", "e18490e185a9e18780"],
+  ["ed86b9", "ed86a0e18780"],
+  ["ed86ba", "e18490e185a9e18781"],
+  ["ed86ba", "ed86a0e18781"],
+  ["ed86bb", "e18490e185a9e18782"],
+  ["ed86bb", "ed86a0e18782"],
+  ["ed86bc", "e18490e185aa"],
+  ["ed86bd", "e18490e185aae186a8"],
+  ["ed86bd", "ed86bce186a8"],
+  ["ed86be", "e18490e185aae186a9"],
+  ["ed86be", "ed86bce186a9"],
+  ["ed86bf", "e18490e185aae186aa"],
+  ["ed86bf", "ed86bce186aa"],
+  ["ed8780", "e18490e185aae186ab"],
+  ["ed8780", "ed86bce186ab"],
+  ["ed8781", "e18490e185aae186ac"],
+  ["ed8781", "ed86bce186ac"],
+  ["ed8782", "e18490e185aae186ad"],
+  ["ed8782", "ed86bce186ad"],
+  ["ed8783", "e18490e185aae186ae"],
+  ["ed8783", "ed86bce186ae"],
+  ["ed8784", "e18490e185aae186af"],
+  ["ed8784", "ed86bce186af"],
+  ["ed8785", "e18490e185aae186b0"],
+  ["ed8785", "ed86bce186b0"],
+  ["ed8786", "e18490e185aae186b1"],
+  ["ed8786", "ed86bce186b1"],
+  ["ed8787", "e18490e185aae186b2"],
+  ["ed8787", "ed86bce186b2"],
+  ["ed8788", "e18490e185aae186b3"],
+  ["ed8788", "ed86bce186b3"],
+  ["ed8789", "e18490e185aae186b4"],
+  ["ed8789", "ed86bce186b4"],
+  ["ed878a", "e18490e185aae186b5"],
+  ["ed878a", "ed86bce186b5"],
+  ["ed878b", "e18490e185aae186b6"],
+  ["ed878b", "ed86bce186b6"],
+  ["ed878c", "e18490e185aae186b7"],
+  ["ed878c", "ed86bce186b7"],
+  ["ed878d", "e18490e185aae186b8"],
+  ["ed878d", "ed86bce186b8"],
+  ["ed878e", "e18490e185aae186b9"],
+  ["ed878e", "ed86bce186b9"],
+  ["ed878f", "e18490e185aae186ba"],
+  ["ed878f", "ed86bce186ba"],
+  ["ed8790", "e18490e185aae186bb"],
+  ["ed8790", "ed86bce186bb"],
+  ["ed8791", "e18490e185aae186bc"],
+  ["ed8791", "ed86bce186bc"],
+  ["ed8792", "e18490e185aae186bd"],
+  ["ed8792", "ed86bce186bd"],
+  ["ed8793", "e18490e185aae186be"],
+  ["ed8793", "ed86bce186be"],
+  ["ed8794", "e18490e185aae186bf"],
+  ["ed8794", "ed86bce186bf"],
+  ["ed8795", "e18490e185aae18780"],
+  ["ed8795", "ed86bce18780"],
+  ["ed8796", "e18490e185aae18781"],
+  ["ed8796", "ed86bce18781"],
+  ["ed8797", "e18490e185aae18782"],
+  ["ed8797", "ed86bce18782"],
+  ["ed8798", "e18490e185ab"],
+  ["ed8799", "e18490e185abe186a8"],
+  ["ed8799", "ed8798e186a8"],
+  ["ed879a", "e18490e185abe186a9"],
+  ["ed879a", "ed8798e186a9"],
+  ["ed879b", "e18490e185abe186aa"],
+  ["ed879b", "ed8798e186aa"],
+  ["ed879c", "e18490e185abe186ab"],
+  ["ed879c", "ed8798e186ab"],
+  ["ed879d", "e18490e185abe186ac"],
+  ["ed879d", "ed8798e186ac"],
+  ["ed879e", "e18490e185abe186ad"],
+  ["ed879e", "ed8798e186ad"],
+  ["ed879f", "e18490e185abe186ae"],
+  ["ed879f", "ed8798e186ae"],
+  ["ed87a0", "e18490e185abe186af"],
+  ["ed87a0", "ed8798e186af"],
+  ["ed87a1", "e18490e185abe186b0"],
+  ["ed87a1", "ed8798e186b0"],
+  ["ed87a2", "e18490e185abe186b1"],
+  ["ed87a2", "ed8798e186b1"],
+  ["ed87a3", "e18490e185abe186b2"],
+  ["ed87a3", "ed8798e186b2"],
+  ["ed87a4", "e18490e185abe186b3"],
+  ["ed87a4", "ed8798e186b3"],
+  ["ed87a5", "e18490e185abe186b4"],
+  ["ed87a5", "ed8798e186b4"],
+  ["ed87a6", "e18490e185abe186b5"],
+  ["ed87a6", "ed8798e186b5"],
+  ["ed87a7", "e18490e185abe186b6"],
+  ["ed87a7", "ed8798e186b6"],
+  ["ed87a8", "e18490e185abe186b7"],
+  ["ed87a8", "ed8798e186b7"],
+  ["ed87a9", "e18490e185abe186b8"],
+  ["ed87a9", "ed8798e186b8"],
+  ["ed87aa", "e18490e185abe186b9"],
+  ["ed87aa", "ed8798e186b9"],
+  ["ed87ab", "e18490e185abe186ba"],
+  ["ed87ab", "ed8798e186ba"],
+  ["ed87ac", "e18490e185abe186bb"],
+  ["ed87ac", "ed8798e186bb"],
+  ["ed87ad", "e18490e185abe186bc"],
+  ["ed87ad", "ed8798e186bc"],
+  ["ed87ae", "e18490e185abe186bd"],
+  ["ed87ae", "ed8798e186bd"],
+  ["ed87af", "e18490e185abe186be"],
+  ["ed87af", "ed8798e186be"],
+  ["ed87b0", "e18490e185abe186bf"],
+  ["ed87b0", "ed8798e186bf"],
+  ["ed87b1", "e18490e185abe18780"],
+  ["ed87b1", "ed8798e18780"],
+  ["ed87b2", "e18490e185abe18781"],
+  ["ed87b2", "ed8798e18781"],
+  ["ed87b3", "e18490e185abe18782"],
+  ["ed87b3", "ed8798e18782"],
+  ["ed87b4", "e18490e185ac"],
+  ["ed87b5", "e18490e185ace186a8"],
+  ["ed87b5", "ed87b4e186a8"],
+  ["ed87b6", "e18490e185ace186a9"],
+  ["ed87b6", "ed87b4e186a9"],
+  ["ed87b7", "e18490e185ace186aa"],
+  ["ed87b7", "ed87b4e186aa"],
+  ["ed87b8", "e18490e185ace186ab"],
+  ["ed87b8", "ed87b4e186ab"],
+  ["ed87b9", "e18490e185ace186ac"],
+  ["ed87b9", "ed87b4e186ac"],
+  ["ed87ba", "e18490e185ace186ad"],
+  ["ed87ba", "ed87b4e186ad"],
+  ["ed87bb", "e18490e185ace186ae"],
+  ["ed87bb", "ed87b4e186ae"],
+  ["ed87bc", "e18490e185ace186af"],
+  ["ed87bc", "ed87b4e186af"],
+  ["ed87bd", "e18490e185ace186b0"],
+  ["ed87bd", "ed87b4e186b0"],
+  ["ed87be", "e18490e185ace186b1"],
+  ["ed87be", "ed87b4e186b1"],
+  ["ed87bf", "e18490e185ace186b2"],
+  ["ed87bf", "ed87b4e186b2"],
+  ["ed8880", "e18490e185ace186b3"],
+  ["ed8880", "ed87b4e186b3"],
+  ["ed8881", "e18490e185ace186b4"],
+  ["ed8881", "ed87b4e186b4"],
+  ["ed8882", "e18490e185ace186b5"],
+  ["ed8882", "ed87b4e186b5"],
+  ["ed8883", "e18490e185ace186b6"],
+  ["ed8883", "ed87b4e186b6"],
+  ["ed8884", "e18490e185ace186b7"],
+  ["ed8884", "ed87b4e186b7"],
+  ["ed8885", "e18490e185ace186b8"],
+  ["ed8885", "ed87b4e186b8"],
+  ["ed8886", "e18490e185ace186b9"],
+  ["ed8886", "ed87b4e186b9"],
+  ["ed8887", "e18490e185ace186ba"],
+  ["ed8887", "ed87b4e186ba"],
+  ["ed8888", "e18490e185ace186bb"],
+  ["ed8888", "ed87b4e186bb"],
+  ["ed8889", "e18490e185ace186bc"],
+  ["ed8889", "ed87b4e186bc"],
+  ["ed888a", "e18490e185ace186bd"],
+  ["ed888a", "ed87b4e186bd"],
+  ["ed888b", "e18490e185ace186be"],
+  ["ed888b", "ed87b4e186be"],
+  ["ed888c", "e18490e185ace186bf"],
+  ["ed888c", "ed87b4e186bf"],
+  ["ed888d", "e18490e185ace18780"],
+  ["ed888d", "ed87b4e18780"],
+  ["ed888e", "e18490e185ace18781"],
+  ["ed888e", "ed87b4e18781"],
+  ["ed888f", "e18490e185ace18782"],
+  ["ed888f", "ed87b4e18782"],
+  ["ed8890", "e18490e185ad"],
+  ["ed8891", "e18490e185ade186a8"],
+  ["ed8891", "ed8890e186a8"],
+  ["ed8892", "e18490e185ade186a9"],
+  ["ed8892", "ed8890e186a9"],
+  ["ed8893", "e18490e185ade186aa"],
+  ["ed8893", "ed8890e186aa"],
+  ["ed8894", "e18490e185ade186ab"],
+  ["ed8894", "ed8890e186ab"],
+  ["ed8895", "e18490e185ade186ac"],
+  ["ed8895", "ed8890e186ac"],
+  ["ed8896", "e18490e185ade186ad"],
+  ["ed8896", "ed8890e186ad"],
+  ["ed8897", "e18490e185ade186ae"],
+  ["ed8897", "ed8890e186ae"],
+  ["ed8898", "e18490e185ade186af"],
+  ["ed8898", "ed8890e186af"],
+  ["ed8899", "e18490e185ade186b0"],
+  ["ed8899", "ed8890e186b0"],
+  ["ed889a", "e18490e185ade186b1"],
+  ["ed889a", "ed8890e186b1"],
+  ["ed889b", "e18490e185ade186b2"],
+  ["ed889b", "ed8890e186b2"],
+  ["ed889c", "e18490e185ade186b3"],
+  ["ed889c", "ed8890e186b3"],
+  ["ed889d", "e18490e185ade186b4"],
+  ["ed889d", "ed8890e186b4"],
+  ["ed889e", "e18490e185ade186b5"],
+  ["ed889e", "ed8890e186b5"],
+  ["ed889f", "e18490e185ade186b6"],
+  ["ed889f", "ed8890e186b6"],
+  ["ed88a0", "e18490e185ade186b7"],
+  ["ed88a0", "ed8890e186b7"],
+  ["ed88a1", "e18490e185ade186b8"],
+  ["ed88a1", "ed8890e186b8"],
+  ["ed88a2", "e18490e185ade186b9"],
+  ["ed88a2", "ed8890e186b9"],
+  ["ed88a3", "e18490e185ade186ba"],
+  ["ed88a3", "ed8890e186ba"],
+  ["ed88a4", "e18490e185ade186bb"],
+  ["ed88a4", "ed8890e186bb"],
+  ["ed88a5", "e18490e185ade186bc"],
+  ["ed88a5", "ed8890e186bc"],
+  ["ed88a6", "e18490e185ade186bd"],
+  ["ed88a6", "ed8890e186bd"],
+  ["ed88a7", "e18490e185ade186be"],
+  ["ed88a7", "ed8890e186be"],
+  ["ed88a8", "e18490e185ade186bf"],
+  ["ed88a8", "ed8890e186bf"],
+  ["ed88a9", "e18490e185ade18780"],
+  ["ed88a9", "ed8890e18780"],
+  ["ed88aa", "e18490e185ade18781"],
+  ["ed88aa", "ed8890e18781"],
+  ["ed88ab", "e18490e185ade18782"],
+  ["ed88ab", "ed8890e18782"],
+  ["ed88ac", "e18490e185ae"],
+  ["ed88ad", "e18490e185aee186a8"],
+  ["ed88ad", "ed88ace186a8"],
+  ["ed88ae", "e18490e185aee186a9"],
+  ["ed88ae", "ed88ace186a9"],
+  ["ed88af", "e18490e185aee186aa"],
+  ["ed88af", "ed88ace186aa"],
+  ["ed88b0", "e18490e185aee186ab"],
+  ["ed88b0", "ed88ace186ab"],
+  ["ed88b1", "e18490e185aee186ac"],
+  ["ed88b1", "ed88ace186ac"],
+  ["ed88b2", "e18490e185aee186ad"],
+  ["ed88b2", "ed88ace186ad"],
+  ["ed88b3", "e18490e185aee186ae"],
+  ["ed88b3", "ed88ace186ae"],
+  ["ed88b4", "e18490e185aee186af"],
+  ["ed88b4", "ed88ace186af"],
+  ["ed88b5", "e18490e185aee186b0"],
+  ["ed88b5", "ed88ace186b0"],
+  ["ed88b6", "e18490e185aee186b1"],
+  ["ed88b6", "ed88ace186b1"],
+  ["ed88b7", "e18490e185aee186b2"],
+  ["ed88b7", "ed88ace186b2"],
+  ["ed88b8", "e18490e185aee186b3"],
+  ["ed88b8", "ed88ace186b3"],
+  ["ed88b9", "e18490e185aee186b4"],
+  ["ed88b9", "ed88ace186b4"],
+  ["ed88ba", "e18490e185aee186b5"],
+  ["ed88ba", "ed88ace186b5"],
+  ["ed88bb", "e18490e185aee186b6"],
+  ["ed88bb", "ed88ace186b6"],
+  ["ed88bc", "e18490e185aee186b7"],
+  ["ed88bc", "ed88ace186b7"],
+  ["ed88bd", "e18490e185aee186b8"],
+  ["ed88bd", "ed88ace186b8"],
+  ["ed88be", "e18490e185aee186b9"],
+  ["ed88be", "ed88ace186b9"],
+  ["ed88bf", "e18490e185aee186ba"],
+  ["ed88bf", "ed88ace186ba"],
+  ["ed8980", "e18490e185aee186bb"],
+  ["ed8980", "ed88ace186bb"],
+  ["ed8981", "e18490e185aee186bc"],
+  ["ed8981", "ed88ace186bc"],
+  ["ed8982", "e18490e185aee186bd"],
+  ["ed8982", "ed88ace186bd"],
+  ["ed8983", "e18490e185aee186be"],
+  ["ed8983", "ed88ace186be"],
+  ["ed8984", "e18490e185aee186bf"],
+  ["ed8984", "ed88ace186bf"],
+  ["ed8985", "e18490e185aee18780"],
+  ["ed8985", "ed88ace18780"],
+  ["ed8986", "e18490e185aee18781"],
+  ["ed8986", "ed88ace18781"],
+  ["ed8987", "e18490e185aee18782"],
+  ["ed8987", "ed88ace18782"],
+  ["ed8988", "e18490e185af"],
+  ["ed8989", "e18490e185afe186a8"],
+  ["ed8989", "ed8988e186a8"],
+  ["ed898a", "e18490e185afe186a9"],
+  ["ed898a", "ed8988e186a9"],
+  ["ed898b", "e18490e185afe186aa"],
+  ["ed898b", "ed8988e186aa"],
+  ["ed898c", "e18490e185afe186ab"],
+  ["ed898c", "ed8988e186ab"],
+  ["ed898d", "e18490e185afe186ac"],
+  ["ed898d", "ed8988e186ac"],
+  ["ed898e", "e18490e185afe186ad"],
+  ["ed898e", "ed8988e186ad"],
+  ["ed898f", "e18490e185afe186ae"],
+  ["ed898f", "ed8988e186ae"],
+  ["ed8990", "e18490e185afe186af"],
+  ["ed8990", "ed8988e186af"],
+  ["ed8991", "e18490e185afe186b0"],
+  ["ed8991", "ed8988e186b0"],
+  ["ed8992", "e18490e185afe186b1"],
+  ["ed8992", "ed8988e186b1"],
+  ["ed8993", "e18490e185afe186b2"],
+  ["ed8993", "ed8988e186b2"],
+  ["ed8994", "e18490e185afe186b3"],
+  ["ed8994", "ed8988e186b3"],
+  ["ed8995", "e18490e185afe186b4"],
+  ["ed8995", "ed8988e186b4"],
+  ["ed8996", "e18490e185afe186b5"],
+  ["ed8996", "ed8988e186b5"],
+  ["ed8997", "e18490e185afe186b6"],
+  ["ed8997", "ed8988e186b6"],
+  ["ed8998", "e18490e185afe186b7"],
+  ["ed8998", "ed8988e186b7"],
+  ["ed8999", "e18490e185afe186b8"],
+  ["ed8999", "ed8988e186b8"],
+  ["ed899a", "e18490e185afe186b9"],
+  ["ed899a", "ed8988e186b9"],
+  ["ed899b", "e18490e185afe186ba"],
+  ["ed899b", "ed8988e186ba"],
+  ["ed899c", "e18490e185afe186bb"],
+  ["ed899c", "ed8988e186bb"],
+  ["ed899d", "e18490e185afe186bc"],
+  ["ed899d", "ed8988e186bc"],
+  ["ed899e", "e18490e185afe186bd"],
+  ["ed899e", "ed8988e186bd"],
+  ["ed899f", "e18490e185afe186be"],
+  ["ed899f", "ed8988e186be"],
+  ["ed89a0", "e18490e185afe186bf"],
+  ["ed89a0", "ed8988e186bf"],
+  ["ed89a1", "e18490e185afe18780"],
+  ["ed89a1", "ed8988e18780"],
+  ["ed89a2", "e18490e185afe18781"],
+  ["ed89a2", "ed8988e18781"],
+  ["ed89a3", "e18490e185afe18782"],
+  ["ed89a3", "ed8988e18782"],
+  ["ed89a4", "e18490e185b0"],
+  ["ed89a5", "e18490e185b0e186a8"],
+  ["ed89a5", "ed89a4e186a8"],
+  ["ed89a6", "e18490e185b0e186a9"],
+  ["ed89a6", "ed89a4e186a9"],
+  ["ed89a7", "e18490e185b0e186aa"],
+  ["ed89a7", "ed89a4e186aa"],
+  ["ed89a8", "e18490e185b0e186ab"],
+  ["ed89a8", "ed89a4e186ab"],
+  ["ed89a9", "e18490e185b0e186ac"],
+  ["ed89a9", "ed89a4e186ac"],
+  ["ed89aa", "e18490e185b0e186ad"],
+  ["ed89aa", "ed89a4e186ad"],
+  ["ed89ab", "e18490e185b0e186ae"],
+  ["ed89ab", "ed89a4e186ae"],
+  ["ed89ac", "e18490e185b0e186af"],
+  ["ed89ac", "ed89a4e186af"],
+  ["ed89ad", "e18490e185b0e186b0"],
+  ["ed89ad", "ed89a4e186b0"],
+  ["ed89ae", "e18490e185b0e186b1"],
+  ["ed89ae", "ed89a4e186b1"],
+  ["ed89af", "e18490e185b0e186b2"],
+  ["ed89af", "ed89a4e186b2"],
+  ["ed89b0", "e18490e185b0e186b3"],
+  ["ed89b0", "ed89a4e186b3"],
+  ["ed89b1", "e18490e185b0e186b4"],
+  ["ed89b1", "ed89a4e186b4"],
+  ["ed89b2", "e18490e185b0e186b5"],
+  ["ed89b2", "ed89a4e186b5"],
+  ["ed89b3", "e18490e185b0e186b6"],
+  ["ed89b3", "ed89a4e186b6"],
+  ["ed89b4", "e18490e185b0e186b7"],
+  ["ed89b4", "ed89a4e186b7"],
+  ["ed89b5", "e18490e185b0e186b8"],
+  ["ed89b5", "ed89a4e186b8"],
+  ["ed89b6", "e18490e185b0e186b9"],
+  ["ed89b6", "ed89a4e186b9"],
+  ["ed89b7", "e18490e185b0e186ba"],
+  ["ed89b7", "ed89a4e186ba"],
+  ["ed89b8", "e18490e185b0e186bb"],
+  ["ed89b8", "ed89a4e186bb"],
+  ["ed89b9", "e18490e185b0e186bc"],
+  ["ed89b9", "ed89a4e186bc"],
+  ["ed89ba", "e18490e185b0e186bd"],
+  ["ed89ba", "ed89a4e186bd"],
+  ["ed89bb", "e18490e185b0e186be"],
+  ["ed89bb", "ed89a4e186be"],
+  ["ed89bc", "e18490e185b0e186bf"],
+  ["ed89bc", "ed89a4e186bf"],
+  ["ed89bd", "e18490e185b0e18780"],
+  ["ed89bd", "ed89a4e18780"],
+  ["ed89be", "e18490e185b0e18781"],
+  ["ed89be", "ed89a4e18781"],
+  ["ed89bf", "e18490e185b0e18782"],
+  ["ed89bf", "ed89a4e18782"],
+  ["ed8a80", "e18490e185b1"],
+  ["ed8a81", "e18490e185b1e186a8"],
+  ["ed8a81", "ed8a80e186a8"],
+  ["ed8a82", "e18490e185b1e186a9"],
+  ["ed8a82", "ed8a80e186a9"],
+  ["ed8a83", "e18490e185b1e186aa"],
+  ["ed8a83", "ed8a80e186aa"],
+  ["ed8a84", "e18490e185b1e186ab"],
+  ["ed8a84", "ed8a80e186ab"],
+  ["ed8a85", "e18490e185b1e186ac"],
+  ["ed8a85", "ed8a80e186ac"],
+  ["ed8a86", "e18490e185b1e186ad"],
+  ["ed8a86", "ed8a80e186ad"],
+  ["ed8a87", "e18490e185b1e186ae"],
+  ["ed8a87", "ed8a80e186ae"],
+  ["ed8a88", "e18490e185b1e186af"],
+  ["ed8a88", "ed8a80e186af"],
+  ["ed8a89", "e18490e185b1e186b0"],
+  ["ed8a89", "ed8a80e186b0"],
+  ["ed8a8a", "e18490e185b1e186b1"],
+  ["ed8a8a", "ed8a80e186b1"],
+  ["ed8a8b", "e18490e185b1e186b2"],
+  ["ed8a8b", "ed8a80e186b2"],
+  ["ed8a8c", "e18490e185b1e186b3"],
+  ["ed8a8c", "ed8a80e186b3"],
+  ["ed8a8d", "e18490e185b1e186b4"],
+  ["ed8a8d", "ed8a80e186b4"],
+  ["ed8a8e", "e18490e185b1e186b5"],
+  ["ed8a8e", "ed8a80e186b5"],
+  ["ed8a8f", "e18490e185b1e186b6"],
+  ["ed8a8f", "ed8a80e186b6"],
+  ["ed8a90", "e18490e185b1e186b7"],
+  ["ed8a90", "ed8a80e186b7"],
+  ["ed8a91", "e18490e185b1e186b8"],
+  ["ed8a91", "ed8a80e186b8"],
+  ["ed8a92", "e18490e185b1e186b9"],
+  ["ed8a92", "ed8a80e186b9"],
+  ["ed8a93", "e18490e185b1e186ba"],
+  ["ed8a93", "ed8a80e186ba"],
+  ["ed8a94", "e18490e185b1e186bb"],
+  ["ed8a94", "ed8a80e186bb"],
+  ["ed8a95", "e18490e185b1e186bc"],
+  ["ed8a95", "ed8a80e186bc"],
+  ["ed8a96", "e18490e185b1e186bd"],
+  ["ed8a96", "ed8a80e186bd"],
+  ["ed8a97", "e18490e185b1e186be"],
+  ["ed8a97", "ed8a80e186be"],
+  ["ed8a98", "e18490e185b1e186bf"],
+  ["ed8a98", "ed8a80e186bf"],
+  ["ed8a99", "e18490e185b1e18780"],
+  ["ed8a99", "ed8a80e18780"],
+  ["ed8a9a", "e18490e185b1e18781"],
+  ["ed8a9a", "ed8a80e18781"],
+  ["ed8a9b", "e18490e185b1e18782"],
+  ["ed8a9b", "ed8a80e18782"],
+  ["ed8a9c", "e18490e185b2"],
+  ["ed8a9d", "e18490e185b2e186a8"],
+  ["ed8a9d", "ed8a9ce186a8"],
+  ["ed8a9e", "e18490e185b2e186a9"],
+  ["ed8a9e", "ed8a9ce186a9"],
+  ["ed8a9f", "e18490e185b2e186aa"],
+  ["ed8a9f", "ed8a9ce186aa"],
+  ["ed8aa0", "e18490e185b2e186ab"],
+  ["ed8aa0", "ed8a9ce186ab"],
+  ["ed8aa1", "e18490e185b2e186ac"],
+  ["ed8aa1", "ed8a9ce186ac"],
+  ["ed8aa2", "e18490e185b2e186ad"],
+  ["ed8aa2", "ed8a9ce186ad"],
+  ["ed8aa3", "e18490e185b2e186ae"],
+  ["ed8aa3", "ed8a9ce186ae"],
+  ["ed8aa4", "e18490e185b2e186af"],
+  ["ed8aa4", "ed8a9ce186af"],
+  ["ed8aa5", "e18490e185b2e186b0"],
+  ["ed8aa5", "ed8a9ce186b0"],
+  ["ed8aa6", "e18490e185b2e186b1"],
+  ["ed8aa6", "ed8a9ce186b1"],
+  ["ed8aa7", "e18490e185b2e186b2"],
+  ["ed8aa7", "ed8a9ce186b2"],
+  ["ed8aa8", "e18490e185b2e186b3"],
+  ["ed8aa8", "ed8a9ce186b3"],
+  ["ed8aa9", "e18490e185b2e186b4"],
+  ["ed8aa9", "ed8a9ce186b4"],
+  ["ed8aaa", "e18490e185b2e186b5"],
+  ["ed8aaa", "ed8a9ce186b5"],
+  ["ed8aab", "e18490e185b2e186b6"],
+  ["ed8aab", "ed8a9ce186b6"],
+  ["ed8aac", "e18490e185b2e186b7"],
+  ["ed8aac", "ed8a9ce186b7"],
+  ["ed8aad", "e18490e185b2e186b8"],
+  ["ed8aad", "ed8a9ce186b8"],
+  ["ed8aae", "e18490e185b2e186b9"],
+  ["ed8aae", "ed8a9ce186b9"],
+  ["ed8aaf", "e18490e185b2e186ba"],
+  ["ed8aaf", "ed8a9ce186ba"],
+  ["ed8ab0", "e18490e185b2e186bb"],
+  ["ed8ab0", "ed8a9ce186bb"],
+  ["ed8ab1", "e18490e185b2e186bc"],
+  ["ed8ab1", "ed8a9ce186bc"],
+  ["ed8ab2", "e18490e185b2e186bd"],
+  ["ed8ab2", "ed8a9ce186bd"],
+  ["ed8ab3", "e18490e185b2e186be"],
+  ["ed8ab3", "ed8a9ce186be"],
+  ["ed8ab4", "e18490e185b2e186bf"],
+  ["ed8ab4", "ed8a9ce186bf"],
+  ["ed8ab5", "e18490e185b2e18780"],
+  ["ed8ab5", "ed8a9ce18780"],
+  ["ed8ab6", "e18490e185b2e18781"],
+  ["ed8ab6", "ed8a9ce18781"],
+  ["ed8ab7", "e18490e185b2e18782"],
+  ["ed8ab7", "ed8a9ce18782"],
+  ["ed8ab8", "e18490e185b3"],
+  ["ed8ab9", "e18490e185b3e186a8"],
+  ["ed8ab9", "ed8ab8e186a8"],
+  ["ed8aba", "e18490e185b3e186a9"],
+  ["ed8aba", "ed8ab8e186a9"],
+  ["ed8abb", "e18490e185b3e186aa"],
+  ["ed8abb", "ed8ab8e186aa"],
+  ["ed8abc", "e18490e185b3e186ab"],
+  ["ed8abc", "ed8ab8e186ab"],
+  ["ed8abd", "e18490e185b3e186ac"],
+  ["ed8abd", "ed8ab8e186ac"],
+  ["ed8abe", "e18490e185b3e186ad"],
+  ["ed8abe", "ed8ab8e186ad"],
+  ["ed8abf", "e18490e185b3e186ae"],
+  ["ed8abf", "ed8ab8e186ae"],
+  ["ed8b80", "e18490e185b3e186af"],
+  ["ed8b80", "ed8ab8e186af"],
+  ["ed8b81", "e18490e185b3e186b0"],
+  ["ed8b81", "ed8ab8e186b0"],
+  ["ed8b82", "e18490e185b3e186b1"],
+  ["ed8b82", "ed8ab8e186b1"],
+  ["ed8b83", "e18490e185b3e186b2"],
+  ["ed8b83", "ed8ab8e186b2"],
+  ["ed8b84", "e18490e185b3e186b3"],
+  ["ed8b84", "ed8ab8e186b3"],
+  ["ed8b85", "e18490e185b3e186b4"],
+  ["ed8b85", "ed8ab8e186b4"],
+  ["ed8b86", "e18490e185b3e186b5"],
+  ["ed8b86", "ed8ab8e186b5"],
+  ["ed8b87", "e18490e185b3e186b6"],
+  ["ed8b87", "ed8ab8e186b6"],
+  ["ed8b88", "e18490e185b3e186b7"],
+  ["ed8b88", "ed8ab8e186b7"],
+  ["ed8b89", "e18490e185b3e186b8"],
+  ["ed8b89", "ed8ab8e186b8"],
+  ["ed8b8a", "e18490e185b3e186b9"],
+  ["ed8b8a", "ed8ab8e186b9"],
+  ["ed8b8b", "e18490e185b3e186ba"],
+  ["ed8b8b", "ed8ab8e186ba"],
+  ["ed8b8c", "e18490e185b3e186bb"],
+  ["ed8b8c", "ed8ab8e186bb"],
+  ["ed8b8d", "e18490e185b3e186bc"],
+  ["ed8b8d", "ed8ab8e186bc"],
+  ["ed8b8e", "e18490e185b3e186bd"],
+  ["ed8b8e", "ed8ab8e186bd"],
+  ["ed8b8f", "e18490e185b3e186be"],
+  ["ed8b8f", "ed8ab8e186be"],
+  ["ed8b90", "e18490e185b3e186bf"],
+  ["ed8b90", "ed8ab8e186bf"],
+  ["ed8b91", "e18490e185b3e18780"],
+  ["ed8b91", "ed8ab8e18780"],
+  ["ed8b92", "e18490e185b3e18781"],
+  ["ed8b92", "ed8ab8e18781"],
+  ["ed8b93", "e18490e185b3e18782"],
+  ["ed8b93", "ed8ab8e18782"],
+  ["ed8b94", "e18490e185b4"],
+  ["ed8b95", "e18490e185b4e186a8"],
+  ["ed8b95", "ed8b94e186a8"],
+  ["ed8b96", "e18490e185b4e186a9"],
+  ["ed8b96", "ed8b94e186a9"],
+  ["ed8b97", "e18490e185b4e186aa"],
+  ["ed8b97", "ed8b94e186aa"],
+  ["ed8b98", "e18490e185b4e186ab"],
+  ["ed8b98", "ed8b94e186ab"],
+  ["ed8b99", "e18490e185b4e186ac"],
+  ["ed8b99", "ed8b94e186ac"],
+  ["ed8b9a", "e18490e185b4e186ad"],
+  ["ed8b9a", "ed8b94e186ad"],
+  ["ed8b9b", "e18490e185b4e186ae"],
+  ["ed8b9b", "ed8b94e186ae"],
+  ["ed8b9c", "e18490e185b4e186af"],
+  ["ed8b9c", "ed8b94e186af"],
+  ["ed8b9d", "e18490e185b4e186b0"],
+  ["ed8b9d", "ed8b94e186b0"],
+  ["ed8b9e", "e18490e185b4e186b1"],
+  ["ed8b9e", "ed8b94e186b1"],
+  ["ed8b9f", "e18490e185b4e186b2"],
+  ["ed8b9f", "ed8b94e186b2"],
+  ["ed8ba0", "e18490e185b4e186b3"],
+  ["ed8ba0", "ed8b94e186b3"],
+  ["ed8ba1", "e18490e185b4e186b4"],
+  ["ed8ba1", "ed8b94e186b4"],
+  ["ed8ba2", "e18490e185b4e186b5"],
+  ["ed8ba2", "ed8b94e186b5"],
+  ["ed8ba3", "e18490e185b4e186b6"],
+  ["ed8ba3", "ed8b94e186b6"],
+  ["ed8ba4", "e18490e185b4e186b7"],
+  ["ed8ba4", "ed8b94e186b7"],
+  ["ed8ba5", "e18490e185b4e186b8"],
+  ["ed8ba5", "ed8b94e186b8"],
+  ["ed8ba6", "e18490e185b4e186b9"],
+  ["ed8ba6", "ed8b94e186b9"],
+  ["ed8ba7", "e18490e185b4e186ba"],
+  ["ed8ba7", "ed8b94e186ba"],
+  ["ed8ba8", "e18490e185b4e186bb"],
+  ["ed8ba8", "ed8b94e186bb"],
+  ["ed8ba9", "e18490e185b4e186bc"],
+  ["ed8ba9", "ed8b94e186bc"],
+  ["ed8baa", "e18490e185b4e186bd"],
+  ["ed8baa", "ed8b94e186bd"],
+  ["ed8bab", "e18490e185b4e186be"],
+  ["ed8bab", "ed8b94e186be"],
+  ["ed8bac", "e18490e185b4e186bf"],
+  ["ed8bac", "ed8b94e186bf"],
+  ["ed8bad", "e18490e185b4e18780"],
+  ["ed8bad", "ed8b94e18780"],
+  ["ed8bae", "e18490e185b4e18781"],
+  ["ed8bae", "ed8b94e18781"],
+  ["ed8baf", "e18490e185b4e18782"],
+  ["ed8baf", "ed8b94e18782"],
+  ["ed8bb0", "e18490e185b5"],
+  ["ed8bb1", "e18490e185b5e186a8"],
+  ["ed8bb1", "ed8bb0e186a8"],
+  ["ed8bb2", "e18490e185b5e186a9"],
+  ["ed8bb2", "ed8bb0e186a9"],
+  ["ed8bb3", "e18490e185b5e186aa"],
+  ["ed8bb3", "ed8bb0e186aa"],
+  ["ed8bb4", "e18490e185b5e186ab"],
+  ["ed8bb4", "ed8bb0e186ab"],
+  ["ed8bb5", "e18490e185b5e186ac"],
+  ["ed8bb5", "ed8bb0e186ac"],
+  ["ed8bb6", "e18490e185b5e186ad"],
+  ["ed8bb6", "ed8bb0e186ad"],
+  ["ed8bb7", "e18490e185b5e186ae"],
+  ["ed8bb7", "ed8bb0e186ae"],
+  ["ed8bb8", "e18490e185b5e186af"],
+  ["ed8bb8", "ed8bb0e186af"],
+  ["ed8bb9", "e18490e185b5e186b0"],
+  ["ed8bb9", "ed8bb0e186b0"],
+  ["ed8bba", "e18490e185b5e186b1"],
+  ["ed8bba", "ed8bb0e186b1"],
+  ["ed8bbb", "e18490e185b5e186b2"],
+  ["ed8bbb", "ed8bb0e186b2"],
+  ["ed8bbc", "e18490e185b5e186b3"],
+  ["ed8bbc", "ed8bb0e186b3"],
+  ["ed8bbd", "e18490e185b5e186b4"],
+  ["ed8bbd", "ed8bb0e186b4"],
+  ["ed8bbe", "e18490e185b5e186b5"],
+  ["ed8bbe", "ed8bb0e186b5"],
+  ["ed8bbf", "e18490e185b5e186b6"],
+  ["ed8bbf", "ed8bb0e186b6"],
+  ["ed8c80", "e18490e185b5e186b7"],
+  ["ed8c80", "ed8bb0e186b7"],
+  ["ed8c81", "e18490e185b5e186b8"],
+  ["ed8c81", "ed8bb0e186b8"],
+  ["ed8c82", "e18490e185b5e186b9"],
+  ["ed8c82", "ed8bb0e186b9"],
+  ["ed8c83", "e18490e185b5e186ba"],
+  ["ed8c83", "ed8bb0e186ba"],
+  ["ed8c84", "e18490e185b5e186bb"],
+  ["ed8c84", "ed8bb0e186bb"],
+  ["ed8c85", "e18490e185b5e186bc"],
+  ["ed8c85", "ed8bb0e186bc"],
+  ["ed8c86", "e18490e185b5e186bd"],
+  ["ed8c86", "ed8bb0e186bd"],
+  ["ed8c87", "e18490e185b5e186be"],
+  ["ed8c87", "ed8bb0e186be"],
+  ["ed8c88", "e18490e185b5e186bf"],
+  ["ed8c88", "ed8bb0e186bf"],
+  ["ed8c89", "e18490e185b5e18780"],
+  ["ed8c89", "ed8bb0e18780"],
+  ["ed8c8a", "e18490e185b5e18781"],
+  ["ed8c8a", "ed8bb0e18781"],
+  ["ed8c8b", "e18490e185b5e18782"],
+  ["ed8c8b", "ed8bb0e18782"],
+  ["ed8c8c", "e18491e185a1"],
+  ["ed8c8d", "e18491e185a1e186a8"],
+  ["ed8c8d", "ed8c8ce186a8"],
+  ["ed8c8e", "e18491e185a1e186a9"],
+  ["ed8c8e", "ed8c8ce186a9"],
+  ["ed8c8f", "e18491e185a1e186aa"],
+  ["ed8c8f", "ed8c8ce186aa"],
+  ["ed8c90", "e18491e185a1e186ab"],
+  ["ed8c90", "ed8c8ce186ab"],
+  ["ed8c91", "e18491e185a1e186ac"],
+  ["ed8c91", "ed8c8ce186ac"],
+  ["ed8c92", "e18491e185a1e186ad"],
+  ["ed8c92", "ed8c8ce186ad"],
+  ["ed8c93", "e18491e185a1e186ae"],
+  ["ed8c93", "ed8c8ce186ae"],
+  ["ed8c94", "e18491e185a1e186af"],
+  ["ed8c94", "ed8c8ce186af"],
+  ["ed8c95", "e18491e185a1e186b0"],
+  ["ed8c95", "ed8c8ce186b0"],
+  ["ed8c96", "e18491e185a1e186b1"],
+  ["ed8c96", "ed8c8ce186b1"],
+  ["ed8c97", "e18491e185a1e186b2"],
+  ["ed8c97", "ed8c8ce186b2"],
+  ["ed8c98", "e18491e185a1e186b3"],
+  ["ed8c98", "ed8c8ce186b3"],
+  ["ed8c99", "e18491e185a1e186b4"],
+  ["ed8c99", "ed8c8ce186b4"],
+  ["ed8c9a", "e18491e185a1e186b5"],
+  ["ed8c9a", "ed8c8ce186b5"],
+  ["ed8c9b", "e18491e185a1e186b6"],
+  ["ed8c9b", "ed8c8ce186b6"],
+  ["ed8c9c", "e18491e185a1e186b7"],
+  ["ed8c9c", "ed8c8ce186b7"],
+  ["ed8c9d", "e18491e185a1e186b8"],
+  ["ed8c9d", "ed8c8ce186b8"],
+  ["ed8c9e", "e18491e185a1e186b9"],
+  ["ed8c9e", "ed8c8ce186b9"],
+  ["ed8c9f", "e18491e185a1e186ba"],
+  ["ed8c9f", "ed8c8ce186ba"],
+  ["ed8ca0", "e18491e185a1e186bb"],
+  ["ed8ca0", "ed8c8ce186bb"],
+  ["ed8ca1", "e18491e185a1e186bc"],
+  ["ed8ca1", "ed8c8ce186bc"],
+  ["ed8ca2", "e18491e185a1e186bd"],
+  ["ed8ca2", "ed8c8ce186bd"],
+  ["ed8ca3", "e18491e185a1e186be"],
+  ["ed8ca3", "ed8c8ce186be"],
+  ["ed8ca4", "e18491e185a1e186bf"],
+  ["ed8ca4", "ed8c8ce186bf"],
+  ["ed8ca5", "e18491e185a1e18780"],
+  ["ed8ca5", "ed8c8ce18780"],
+  ["ed8ca6", "e18491e185a1e18781"],
+  ["ed8ca6", "ed8c8ce18781"],
+  ["ed8ca7", "e18491e185a1e18782"],
+  ["ed8ca7", "ed8c8ce18782"],
+  ["ed8ca8", "e18491e185a2"],
+  ["ed8ca9", "e18491e185a2e186a8"],
+  ["ed8ca9", "ed8ca8e186a8"],
+  ["ed8caa", "e18491e185a2e186a9"],
+  ["ed8caa", "ed8ca8e186a9"],
+  ["ed8cab", "e18491e185a2e186aa"],
+  ["ed8cab", "ed8ca8e186aa"],
+  ["ed8cac", "e18491e185a2e186ab"],
+  ["ed8cac", "ed8ca8e186ab"],
+  ["ed8cad", "e18491e185a2e186ac"],
+  ["ed8cad", "ed8ca8e186ac"],
+  ["ed8cae", "e18491e185a2e186ad"],
+  ["ed8cae", "ed8ca8e186ad"],
+  ["ed8caf", "e18491e185a2e186ae"],
+  ["ed8caf", "ed8ca8e186ae"],
+  ["ed8cb0", "e18491e185a2e186af"],
+  ["ed8cb0", "ed8ca8e186af"],
+  ["ed8cb1", "e18491e185a2e186b0"],
+  ["ed8cb1", "ed8ca8e186b0"],
+  ["ed8cb2", "e18491e185a2e186b1"],
+  ["ed8cb2", "ed8ca8e186b1"],
+  ["ed8cb3", "e18491e185a2e186b2"],
+  ["ed8cb3", "ed8ca8e186b2"],
+  ["ed8cb4", "e18491e185a2e186b3"],
+  ["ed8cb4", "ed8ca8e186b3"],
+  ["ed8cb5", "e18491e185a2e186b4"],
+  ["ed8cb5", "ed8ca8e186b4"],
+  ["ed8cb6", "e18491e185a2e186b5"],
+  ["ed8cb6", "ed8ca8e186b5"],
+  ["ed8cb7", "e18491e185a2e186b6"],
+  ["ed8cb7", "ed8ca8e186b6"],
+  ["ed8cb8", "e18491e185a2e186b7"],
+  ["ed8cb8", "ed8ca8e186b7"],
+  ["ed8cb9", "e18491e185a2e186b8"],
+  ["ed8cb9", "ed8ca8e186b8"],
+  ["ed8cba", "e18491e185a2e186b9"],
+  ["ed8cba", "ed8ca8e186b9"],
+  ["ed8cbb", "e18491e185a2e186ba"],
+  ["ed8cbb", "ed8ca8e186ba"],
+  ["ed8cbc", "e18491e185a2e186bb"],
+  ["ed8cbc", "ed8ca8e186bb"],
+  ["ed8cbd", "e18491e185a2e186bc"],
+  ["ed8cbd", "ed8ca8e186bc"],
+  ["ed8cbe", "e18491e185a2e186bd"],
+  ["ed8cbe", "ed8ca8e186bd"],
+  ["ed8cbf", "e18491e185a2e186be"],
+  ["ed8cbf", "ed8ca8e186be"],
+  ["ed8d80", "e18491e185a2e186bf"],
+  ["ed8d80", "ed8ca8e186bf"],
+  ["ed8d81", "e18491e185a2e18780"],
+  ["ed8d81", "ed8ca8e18780"],
+  ["ed8d82", "e18491e185a2e18781"],
+  ["ed8d82", "ed8ca8e18781"],
+  ["ed8d83", "e18491e185a2e18782"],
+  ["ed8d83", "ed8ca8e18782"],
+  ["ed8d84", "e18491e185a3"],
+  ["ed8d85", "e18491e185a3e186a8"],
+  ["ed8d85", "ed8d84e186a8"],
+  ["ed8d86", "e18491e185a3e186a9"],
+  ["ed8d86", "ed8d84e186a9"],
+  ["ed8d87", "e18491e185a3e186aa"],
+  ["ed8d87", "ed8d84e186aa"],
+  ["ed8d88", "e18491e185a3e186ab"],
+  ["ed8d88", "ed8d84e186ab"],
+  ["ed8d89", "e18491e185a3e186ac"],
+  ["ed8d89", "ed8d84e186ac"],
+  ["ed8d8a", "e18491e185a3e186ad"],
+  ["ed8d8a", "ed8d84e186ad"],
+  ["ed8d8b", "e18491e185a3e186ae"],
+  ["ed8d8b", "ed8d84e186ae"],
+  ["ed8d8c", "e18491e185a3e186af"],
+  ["ed8d8c", "ed8d84e186af"],
+  ["ed8d8d", "e18491e185a3e186b0"],
+  ["ed8d8d", "ed8d84e186b0"],
+  ["ed8d8e", "e18491e185a3e186b1"],
+  ["ed8d8e", "ed8d84e186b1"],
+  ["ed8d8f", "e18491e185a3e186b2"],
+  ["ed8d8f", "ed8d84e186b2"],
+  ["ed8d90", "e18491e185a3e186b3"],
+  ["ed8d90", "ed8d84e186b3"],
+  ["ed8d91", "e18491e185a3e186b4"],
+  ["ed8d91", "ed8d84e186b4"],
+  ["ed8d92", "e18491e185a3e186b5"],
+  ["ed8d92", "ed8d84e186b5"],
+  ["ed8d93", "e18491e185a3e186b6"],
+  ["ed8d93", "ed8d84e186b6"],
+  ["ed8d94", "e18491e185a3e186b7"],
+  ["ed8d94", "ed8d84e186b7"],
+  ["ed8d95", "e18491e185a3e186b8"],
+  ["ed8d95", "ed8d84e186b8"],
+  ["ed8d96", "e18491e185a3e186b9"],
+  ["ed8d96", "ed8d84e186b9"],
+  ["ed8d97", "e18491e185a3e186ba"],
+  ["ed8d97", "ed8d84e186ba"],
+  ["ed8d98", "e18491e185a3e186bb"],
+  ["ed8d98", "ed8d84e186bb"],
+  ["ed8d99", "e18491e185a3e186bc"],
+  ["ed8d99", "ed8d84e186bc"],
+  ["ed8d9a", "e18491e185a3e186bd"],
+  ["ed8d9a", "ed8d84e186bd"],
+  ["ed8d9b", "e18491e185a3e186be"],
+  ["ed8d9b", "ed8d84e186be"],
+  ["ed8d9c", "e18491e185a3e186bf"],
+  ["ed8d9c", "ed8d84e186bf"],
+  ["ed8d9d", "e18491e185a3e18780"],
+  ["ed8d9d", "ed8d84e18780"],
+  ["ed8d9e", "e18491e185a3e18781"],
+  ["ed8d9e", "ed8d84e18781"],
+  ["ed8d9f", "e18491e185a3e18782"],
+  ["ed8d9f", "ed8d84e18782"],
+  ["ed8da0", "e18491e185a4"],
+  ["ed8da1", "e18491e185a4e186a8"],
+  ["ed8da1", "ed8da0e186a8"],
+  ["ed8da2", "e18491e185a4e186a9"],
+  ["ed8da2", "ed8da0e186a9"],
+  ["ed8da3", "e18491e185a4e186aa"],
+  ["ed8da3", "ed8da0e186aa"],
+  ["ed8da4", "e18491e185a4e186ab"],
+  ["ed8da4", "ed8da0e186ab"],
+  ["ed8da5", "e18491e185a4e186ac"],
+  ["ed8da5", "ed8da0e186ac"],
+  ["ed8da6", "e18491e185a4e186ad"],
+  ["ed8da6", "ed8da0e186ad"],
+  ["ed8da7", "e18491e185a4e186ae"],
+  ["ed8da7", "ed8da0e186ae"],
+  ["ed8da8", "e18491e185a4e186af"],
+  ["ed8da8", "ed8da0e186af"],
+  ["ed8da9", "e18491e185a4e186b0"],
+  ["ed8da9", "ed8da0e186b0"],
+  ["ed8daa", "e18491e185a4e186b1"],
+  ["ed8daa", "ed8da0e186b1"],
+  ["ed8dab", "e18491e185a4e186b2"],
+  ["ed8dab", "ed8da0e186b2"],
+  ["ed8dac", "e18491e185a4e186b3"],
+  ["ed8dac", "ed8da0e186b3"],
+  ["ed8dad", "e18491e185a4e186b4"],
+  ["ed8dad", "ed8da0e186b4"],
+  ["ed8dae", "e18491e185a4e186b5"],
+  ["ed8dae", "ed8da0e186b5"],
+  ["ed8daf", "e18491e185a4e186b6"],
+  ["ed8daf", "ed8da0e186b6"],
+  ["ed8db0", "e18491e185a4e186b7"],
+  ["ed8db0", "ed8da0e186b7"],
+  ["ed8db1", "e18491e185a4e186b8"],
+  ["ed8db1", "ed8da0e186b8"],
+  ["ed8db2", "e18491e185a4e186b9"],
+  ["ed8db2", "ed8da0e186b9"],
+  ["ed8db3", "e18491e185a4e186ba"],
+  ["ed8db3", "ed8da0e186ba"],
+  ["ed8db4", "e18491e185a4e186bb"],
+  ["ed8db4", "ed8da0e186bb"],
+  ["ed8db5", "e18491e185a4e186bc"],
+  ["ed8db5", "ed8da0e186bc"],
+  ["ed8db6", "e18491e185a4e186bd"],
+  ["ed8db6", "ed8da0e186bd"],
+  ["ed8db7", "e18491e185a4e186be"],
+  ["ed8db7", "ed8da0e186be"],
+  ["ed8db8", "e18491e185a4e186bf"],
+  ["ed8db8", "ed8da0e186bf"],
+  ["ed8db9", "e18491e185a4e18780"],
+  ["ed8db9", "ed8da0e18780"],
+  ["ed8dba", "e18491e185a4e18781"],
+  ["ed8dba", "ed8da0e18781"],
+  ["ed8dbb", "e18491e185a4e18782"],
+  ["ed8dbb", "ed8da0e18782"],
+  ["ed8dbc", "e18491e185a5"],
+  ["ed8dbd", "e18491e185a5e186a8"],
+  ["ed8dbd", "ed8dbce186a8"],
+  ["ed8dbe", "e18491e185a5e186a9"],
+  ["ed8dbe", "ed8dbce186a9"],
+  ["ed8dbf", "e18491e185a5e186aa"],
+  ["ed8dbf", "ed8dbce186aa"],
+  ["ed8e80", "e18491e185a5e186ab"],
+  ["ed8e80", "ed8dbce186ab"],
+  ["ed8e81", "e18491e185a5e186ac"],
+  ["ed8e81", "ed8dbce186ac"],
+  ["ed8e82", "e18491e185a5e186ad"],
+  ["ed8e82", "ed8dbce186ad"],
+  ["ed8e83", "e18491e185a5e186ae"],
+  ["ed8e83", "ed8dbce186ae"],
+  ["ed8e84", "e18491e185a5e186af"],
+  ["ed8e84", "ed8dbce186af"],
+  ["ed8e85", "e18491e185a5e186b0"],
+  ["ed8e85", "ed8dbce186b0"],
+  ["ed8e86", "e18491e185a5e186b1"],
+  ["ed8e86", "ed8dbce186b1"],
+  ["ed8e87", "e18491e185a5e186b2"],
+  ["ed8e87", "ed8dbce186b2"],
+  ["ed8e88", "e18491e185a5e186b3"],
+  ["ed8e88", "ed8dbce186b3"],
+  ["ed8e89", "e18491e185a5e186b4"],
+  ["ed8e89", "ed8dbce186b4"],
+  ["ed8e8a", "e18491e185a5e186b5"],
+  ["ed8e8a", "ed8dbce186b5"],
+  ["ed8e8b", "e18491e185a5e186b6"],
+  ["ed8e8b", "ed8dbce186b6"],
+  ["ed8e8c", "e18491e185a5e186b7"],
+  ["ed8e8c", "ed8dbce186b7"],
+  ["ed8e8d", "e18491e185a5e186b8"],
+  ["ed8e8d", "ed8dbce186b8"],
+  ["ed8e8e", "e18491e185a5e186b9"],
+  ["ed8e8e", "ed8dbce186b9"],
+  ["ed8e8f", "e18491e185a5e186ba"],
+  ["ed8e8f", "ed8dbce186ba"],
+  ["ed8e90", "e18491e185a5e186bb"],
+  ["ed8e90", "ed8dbce186bb"],
+  ["ed8e91", "e18491e185a5e186bc"],
+  ["ed8e91", "ed8dbce186bc"],
+  ["ed8e92", "e18491e185a5e186bd"],
+  ["ed8e92", "ed8dbce186bd"],
+  ["ed8e93", "e18491e185a5e186be"],
+  ["ed8e93", "ed8dbce186be"],
+  ["ed8e94", "e18491e185a5e186bf"],
+  ["ed8e94", "ed8dbce186bf"],
+  ["ed8e95", "e18491e185a5e18780"],
+  ["ed8e95", "ed8dbce18780"],
+  ["ed8e96", "e18491e185a5e18781"],
+  ["ed8e96", "ed8dbce18781"],
+  ["ed8e97", "e18491e185a5e18782"],
+  ["ed8e97", "ed8dbce18782"],
+  ["ed8e98", "e18491e185a6"],
+  ["ed8e99", "e18491e185a6e186a8"],
+  ["ed8e99", "ed8e98e186a8"],
+  ["ed8e9a", "e18491e185a6e186a9"],
+  ["ed8e9a", "ed8e98e186a9"],
+  ["ed8e9b", "e18491e185a6e186aa"],
+  ["ed8e9b", "ed8e98e186aa"],
+  ["ed8e9c", "e18491e185a6e186ab"],
+  ["ed8e9c", "ed8e98e186ab"],
+  ["ed8e9d", "e18491e185a6e186ac"],
+  ["ed8e9d", "ed8e98e186ac"],
+  ["ed8e9e", "e18491e185a6e186ad"],
+  ["ed8e9e", "ed8e98e186ad"],
+  ["ed8e9f", "e18491e185a6e186ae"],
+  ["ed8e9f", "ed8e98e186ae"],
+  ["ed8ea0", "e18491e185a6e186af"],
+  ["ed8ea0", "ed8e98e186af"],
+  ["ed8ea1", "e18491e185a6e186b0"],
+  ["ed8ea1", "ed8e98e186b0"],
+  ["ed8ea2", "e18491e185a6e186b1"],
+  ["ed8ea2", "ed8e98e186b1"],
+  ["ed8ea3", "e18491e185a6e186b2"],
+  ["ed8ea3", "ed8e98e186b2"],
+  ["ed8ea4", "e18491e185a6e186b3"],
+  ["ed8ea4", "ed8e98e186b3"],
+  ["ed8ea5", "e18491e185a6e186b4"],
+  ["ed8ea5", "ed8e98e186b4"],
+  ["ed8ea6", "e18491e185a6e186b5"],
+  ["ed8ea6", "ed8e98e186b5"],
+  ["ed8ea7", "e18491e185a6e186b6"],
+  ["ed8ea7", "ed8e98e186b6"],
+  ["ed8ea8", "e18491e185a6e186b7"],
+  ["ed8ea8", "ed8e98e186b7"],
+  ["ed8ea9", "e18491e185a6e186b8"],
+  ["ed8ea9", "ed8e98e186b8"],
+  ["ed8eaa", "e18491e185a6e186b9"],
+  ["ed8eaa", "ed8e98e186b9"],
+  ["ed8eab", "e18491e185a6e186ba"],
+  ["ed8eab", "ed8e98e186ba"],
+  ["ed8eac", "e18491e185a6e186bb"],
+  ["ed8eac", "ed8e98e186bb"],
+  ["ed8ead", "e18491e185a6e186bc"],
+  ["ed8ead", "ed8e98e186bc"],
+  ["ed8eae", "e18491e185a6e186bd"],
+  ["ed8eae", "ed8e98e186bd"],
+  ["ed8eaf", "e18491e185a6e186be"],
+  ["ed8eaf", "ed8e98e186be"],
+  ["ed8eb0", "e18491e185a6e186bf"],
+  ["ed8eb0", "ed8e98e186bf"],
+  ["ed8eb1", "e18491e185a6e18780"],
+  ["ed8eb1", "ed8e98e18780"],
+  ["ed8eb2", "e18491e185a6e18781"],
+  ["ed8eb2", "ed8e98e18781"],
+  ["ed8eb3", "e18491e185a6e18782"],
+  ["ed8eb3", "ed8e98e18782"],
+  ["ed8eb4", "e18491e185a7"],
+  ["ed8eb5", "e18491e185a7e186a8"],
+  ["ed8eb5", "ed8eb4e186a8"],
+  ["ed8eb6", "e18491e185a7e186a9"],
+  ["ed8eb6", "ed8eb4e186a9"],
+  ["ed8eb7", "e18491e185a7e186aa"],
+  ["ed8eb7", "ed8eb4e186aa"],
+  ["ed8eb8", "e18491e185a7e186ab"],
+  ["ed8eb8", "ed8eb4e186ab"],
+  ["ed8eb9", "e18491e185a7e186ac"],
+  ["ed8eb9", "ed8eb4e186ac"],
+  ["ed8eba", "e18491e185a7e186ad"],
+  ["ed8eba", "ed8eb4e186ad"],
+  ["ed8ebb", "e18491e185a7e186ae"],
+  ["ed8ebb", "ed8eb4e186ae"],
+  ["ed8ebc", "e18491e185a7e186af"],
+  ["ed8ebc", "ed8eb4e186af"],
+  ["ed8ebd", "e18491e185a7e186b0"],
+  ["ed8ebd", "ed8eb4e186b0"],
+  ["ed8ebe", "e18491e185a7e186b1"],
+  ["ed8ebe", "ed8eb4e186b1"],
+  ["ed8ebf", "e18491e185a7e186b2"],
+  ["ed8ebf", "ed8eb4e186b2"],
+  ["ed8f80", "e18491e185a7e186b3"],
+  ["ed8f80", "ed8eb4e186b3"],
+  ["ed8f81", "e18491e185a7e186b4"],
+  ["ed8f81", "ed8eb4e186b4"],
+  ["ed8f82", "e18491e185a7e186b5"],
+  ["ed8f82", "ed8eb4e186b5"],
+  ["ed8f83", "e18491e185a7e186b6"],
+  ["ed8f83", "ed8eb4e186b6"],
+  ["ed8f84", "e18491e185a7e186b7"],
+  ["ed8f84", "ed8eb4e186b7"],
+  ["ed8f85", "e18491e185a7e186b8"],
+  ["ed8f85", "ed8eb4e186b8"],
+  ["ed8f86", "e18491e185a7e186b9"],
+  ["ed8f86", "ed8eb4e186b9"],
+  ["ed8f87", "e18491e185a7e186ba"],
+  ["ed8f87", "ed8eb4e186ba"],
+  ["ed8f88", "e18491e185a7e186bb"],
+  ["ed8f88", "ed8eb4e186bb"],
+  ["ed8f89", "e18491e185a7e186bc"],
+  ["ed8f89", "ed8eb4e186bc"],
+  ["ed8f8a", "e18491e185a7e186bd"],
+  ["ed8f8a", "ed8eb4e186bd"],
+  ["ed8f8b", "e18491e185a7e186be"],
+  ["ed8f8b", "ed8eb4e186be"],
+  ["ed8f8c", "e18491e185a7e186bf"],
+  ["ed8f8c", "ed8eb4e186bf"],
+  ["ed8f8d", "e18491e185a7e18780"],
+  ["ed8f8d", "ed8eb4e18780"],
+  ["ed8f8e", "e18491e185a7e18781"],
+  ["ed8f8e", "ed8eb4e18781"],
+  ["ed8f8f", "e18491e185a7e18782"],
+  ["ed8f8f", "ed8eb4e18782"],
+  ["ed8f90", "e18491e185a8"],
+  ["ed8f91", "e18491e185a8e186a8"],
+  ["ed8f91", "ed8f90e186a8"],
+  ["ed8f92", "e18491e185a8e186a9"],
+  ["ed8f92", "ed8f90e186a9"],
+  ["ed8f93", "e18491e185a8e186aa"],
+  ["ed8f93", "ed8f90e186aa"],
+  ["ed8f94", "e18491e185a8e186ab"],
+  ["ed8f94", "ed8f90e186ab"],
+  ["ed8f95", "e18491e185a8e186ac"],
+  ["ed8f95", "ed8f90e186ac"],
+  ["ed8f96", "e18491e185a8e186ad"],
+  ["ed8f96", "ed8f90e186ad"],
+  ["ed8f97", "e18491e185a8e186ae"],
+  ["ed8f97", "ed8f90e186ae"],
+  ["ed8f98", "e18491e185a8e186af"],
+  ["ed8f98", "ed8f90e186af"],
+  ["ed8f99", "e18491e185a8e186b0"],
+  ["ed8f99", "ed8f90e186b0"],
+  ["ed8f9a", "e18491e185a8e186b1"],
+  ["ed8f9a", "ed8f90e186b1"],
+  ["ed8f9b", "e18491e185a8e186b2"],
+  ["ed8f9b", "ed8f90e186b2"],
+  ["ed8f9c", "e18491e185a8e186b3"],
+  ["ed8f9c", "ed8f90e186b3"],
+  ["ed8f9d", "e18491e185a8e186b4"],
+  ["ed8f9d", "ed8f90e186b4"],
+  ["ed8f9e", "e18491e185a8e186b5"],
+  ["ed8f9e", "ed8f90e186b5"],
+  ["ed8f9f", "e18491e185a8e186b6"],
+  ["ed8f9f", "ed8f90e186b6"],
+  ["ed8fa0", "e18491e185a8e186b7"],
+  ["ed8fa0", "ed8f90e186b7"],
+  ["ed8fa1", "e18491e185a8e186b8"],
+  ["ed8fa1", "ed8f90e186b8"],
+  ["ed8fa2", "e18491e185a8e186b9"],
+  ["ed8fa2", "ed8f90e186b9"],
+  ["ed8fa3", "e18491e185a8e186ba"],
+  ["ed8fa3", "ed8f90e186ba"],
+  ["ed8fa4", "e18491e185a8e186bb"],
+  ["ed8fa4", "ed8f90e186bb"],
+  ["ed8fa5", "e18491e185a8e186bc"],
+  ["ed8fa5", "ed8f90e186bc"],
+  ["ed8fa6", "e18491e185a8e186bd"],
+  ["ed8fa6", "ed8f90e186bd"],
+  ["ed8fa7", "e18491e185a8e186be"],
+  ["ed8fa7", "ed8f90e186be"],
+  ["ed8fa8", "e18491e185a8e186bf"],
+  ["ed8fa8", "ed8f90e186bf"],
+  ["ed8fa9", "e18491e185a8e18780"],
+  ["ed8fa9", "ed8f90e18780"],
+  ["ed8faa", "e18491e185a8e18781"],
+  ["ed8faa", "ed8f90e18781"],
+  ["ed8fab", "e18491e185a8e18782"],
+  ["ed8fab", "ed8f90e18782"],
+  ["ed8fac", "e18491e185a9"],
+  ["ed8fad", "e18491e185a9e186a8"],
+  ["ed8fad", "ed8face186a8"],
+  ["ed8fae", "e18491e185a9e186a9"],
+  ["ed8fae", "ed8face186a9"],
+  ["ed8faf", "e18491e185a9e186aa"],
+  ["ed8faf", "ed8face186aa"],
+  ["ed8fb0", "e18491e185a9e186ab"],
+  ["ed8fb0", "ed8face186ab"],
+  ["ed8fb1", "e18491e185a9e186ac"],
+  ["ed8fb1", "ed8face186ac"],
+  ["ed8fb2", "e18491e185a9e186ad"],
+  ["ed8fb2", "ed8face186ad"],
+  ["ed8fb3", "e18491e185a9e186ae"],
+  ["ed8fb3", "ed8face186ae"],
+  ["ed8fb4", "e18491e185a9e186af"],
+  ["ed8fb4", "ed8face186af"],
+  ["ed8fb5", "e18491e185a9e186b0"],
+  ["ed8fb5", "ed8face186b0"],
+  ["ed8fb6", "e18491e185a9e186b1"],
+  ["ed8fb6", "ed8face186b1"],
+  ["ed8fb7", "e18491e185a9e186b2"],
+  ["ed8fb7", "ed8face186b2"],
+  ["ed8fb8", "e18491e185a9e186b3"],
+  ["ed8fb8", "ed8face186b3"],
+  ["ed8fb9", "e18491e185a9e186b4"],
+  ["ed8fb9", "ed8face186b4"],
+  ["ed8fba", "e18491e185a9e186b5"],
+  ["ed8fba", "ed8face186b5"],
+  ["ed8fbb", "e18491e185a9e186b6"],
+  ["ed8fbb", "ed8face186b6"],
+  ["ed8fbc", "e18491e185a9e186b7"],
+  ["ed8fbc", "ed8face186b7"],
+  ["ed8fbd", "e18491e185a9e186b8"],
+  ["ed8fbd", "ed8face186b8"],
+  ["ed8fbe", "e18491e185a9e186b9"],
+  ["ed8fbe", "ed8face186b9"],
+  ["ed8fbf", "e18491e185a9e186ba"],
+  ["ed8fbf", "ed8face186ba"],
+  ["ed9080", "e18491e185a9e186bb"],
+  ["ed9080", "ed8face186bb"],
+  ["ed9081", "e18491e185a9e186bc"],
+  ["ed9081", "ed8face186bc"],
+  ["ed9082", "e18491e185a9e186bd"],
+  ["ed9082", "ed8face186bd"],
+  ["ed9083", "e18491e185a9e186be"],
+  ["ed9083", "ed8face186be"],
+  ["ed9084", "e18491e185a9e186bf"],
+  ["ed9084", "ed8face186bf"],
+  ["ed9085", "e18491e185a9e18780"],
+  ["ed9085", "ed8face18780"],
+  ["ed9086", "e18491e185a9e18781"],
+  ["ed9086", "ed8face18781"],
+  ["ed9087", "e18491e185a9e18782"],
+  ["ed9087", "ed8face18782"],
+  ["ed9088", "e18491e185aa"],
+  ["ed9089", "e18491e185aae186a8"],
+  ["ed9089", "ed9088e186a8"],
+  ["ed908a", "e18491e185aae186a9"],
+  ["ed908a", "ed9088e186a9"],
+  ["ed908b", "e18491e185aae186aa"],
+  ["ed908b", "ed9088e186aa"],
+  ["ed908c", "e18491e185aae186ab"],
+  ["ed908c", "ed9088e186ab"],
+  ["ed908d", "e18491e185aae186ac"],
+  ["ed908d", "ed9088e186ac"],
+  ["ed908e", "e18491e185aae186ad"],
+  ["ed908e", "ed9088e186ad"],
+  ["ed908f", "e18491e185aae186ae"],
+  ["ed908f", "ed9088e186ae"],
+  ["ed9090", "e18491e185aae186af"],
+  ["ed9090", "ed9088e186af"],
+  ["ed9091", "e18491e185aae186b0"],
+  ["ed9091", "ed9088e186b0"],
+  ["ed9092", "e18491e185aae186b1"],
+  ["ed9092", "ed9088e186b1"],
+  ["ed9093", "e18491e185aae186b2"],
+  ["ed9093", "ed9088e186b2"],
+  ["ed9094", "e18491e185aae186b3"],
+  ["ed9094", "ed9088e186b3"],
+  ["ed9095", "e18491e185aae186b4"],
+  ["ed9095", "ed9088e186b4"],
+  ["ed9096", "e18491e185aae186b5"],
+  ["ed9096", "ed9088e186b5"],
+  ["ed9097", "e18491e185aae186b6"],
+  ["ed9097", "ed9088e186b6"],
+  ["ed9098", "e18491e185aae186b7"],
+  ["ed9098", "ed9088e186b7"],
+  ["ed9099", "e18491e185aae186b8"],
+  ["ed9099", "ed9088e186b8"],
+  ["ed909a", "e18491e185aae186b9"],
+  ["ed909a", "ed9088e186b9"],
+  ["ed909b", "e18491e185aae186ba"],
+  ["ed909b", "ed9088e186ba"],
+  ["ed909c", "e18491e185aae186bb"],
+  ["ed909c", "ed9088e186bb"],
+  ["ed909d", "e18491e185aae186bc"],
+  ["ed909d", "ed9088e186bc"],
+  ["ed909e", "e18491e185aae186bd"],
+  ["ed909e", "ed9088e186bd"],
+  ["ed909f", "e18491e185aae186be"],
+  ["ed909f", "ed9088e186be"],
+  ["ed90a0", "e18491e185aae186bf"],
+  ["ed90a0", "ed9088e186bf"],
+  ["ed90a1", "e18491e185aae18780"],
+  ["ed90a1", "ed9088e18780"],
+  ["ed90a2", "e18491e185aae18781"],
+  ["ed90a2", "ed9088e18781"],
+  ["ed90a3", "e18491e185aae18782"],
+  ["ed90a3", "ed9088e18782"],
+  ["ed90a4", "e18491e185ab"],
+  ["ed90a5", "e18491e185abe186a8"],
+  ["ed90a5", "ed90a4e186a8"],
+  ["ed90a6", "e18491e185abe186a9"],
+  ["ed90a6", "ed90a4e186a9"],
+  ["ed90a7", "e18491e185abe186aa"],
+  ["ed90a7", "ed90a4e186aa"],
+  ["ed90a8", "e18491e185abe186ab"],
+  ["ed90a8", "ed90a4e186ab"],
+  ["ed90a9", "e18491e185abe186ac"],
+  ["ed90a9", "ed90a4e186ac"],
+  ["ed90aa", "e18491e185abe186ad"],
+  ["ed90aa", "ed90a4e186ad"],
+  ["ed90ab", "e18491e185abe186ae"],
+  ["ed90ab", "ed90a4e186ae"],
+  ["ed90ac", "e18491e185abe186af"],
+  ["ed90ac", "ed90a4e186af"],
+  ["ed90ad", "e18491e185abe186b0"],
+  ["ed90ad", "ed90a4e186b0"],
+  ["ed90ae", "e18491e185abe186b1"],
+  ["ed90ae", "ed90a4e186b1"],
+  ["ed90af", "e18491e185abe186b2"],
+  ["ed90af", "ed90a4e186b2"],
+  ["ed90b0", "e18491e185abe186b3"],
+  ["ed90b0", "ed90a4e186b3"],
+  ["ed90b1", "e18491e185abe186b4"],
+  ["ed90b1", "ed90a4e186b4"],
+  ["ed90b2", "e18491e185abe186b5"],
+  ["ed90b2", "ed90a4e186b5"],
+  ["ed90b3", "e18491e185abe186b6"],
+  ["ed90b3", "ed90a4e186b6"],
+  ["ed90b4", "e18491e185abe186b7"],
+  ["ed90b4", "ed90a4e186b7"],
+  ["ed90b5", "e18491e185abe186b8"],
+  ["ed90b5", "ed90a4e186b8"],
+  ["ed90b6", "e18491e185abe186b9"],
+  ["ed90b6", "ed90a4e186b9"],
+  ["ed90b7", "e18491e185abe186ba"],
+  ["ed90b7", "ed90a4e186ba"],
+  ["ed90b8", "e18491e185abe186bb"],
+  ["ed90b8", "ed90a4e186bb"],
+  ["ed90b9", "e18491e185abe186bc"],
+  ["ed90b9", "ed90a4e186bc"],
+  ["ed90ba", "e18491e185abe186bd"],
+  ["ed90ba", "ed90a4e186bd"],
+  ["ed90bb", "e18491e185abe186be"],
+  ["ed90bb", "ed90a4e186be"],
+  ["ed90bc", "e18491e185abe186bf"],
+  ["ed90bc", "ed90a4e186bf"],
+  ["ed90bd", "e18491e185abe18780"],
+  ["ed90bd", "ed90a4e18780"],
+  ["ed90be", "e18491e185abe18781"],
+  ["ed90be", "ed90a4e18781"],
+  ["ed90bf", "e18491e185abe18782"],
+  ["ed90bf", "ed90a4e18782"],
+  ["ed9180", "e18491e185ac"],
+  ["ed9181", "e18491e185ace186a8"],
+  ["ed9181", "ed9180e186a8"],
+  ["ed9182", "e18491e185ace186a9"],
+  ["ed9182", "ed9180e186a9"],
+  ["ed9183", "e18491e185ace186aa"],
+  ["ed9183", "ed9180e186aa"],
+  ["ed9184", "e18491e185ace186ab"],
+  ["ed9184", "ed9180e186ab"],
+  ["ed9185", "e18491e185ace186ac"],
+  ["ed9185", "ed9180e186ac"],
+  ["ed9186", "e18491e185ace186ad"],
+  ["ed9186", "ed9180e186ad"],
+  ["ed9187", "e18491e185ace186ae"],
+  ["ed9187", "ed9180e186ae"],
+  ["ed9188", "e18491e185ace186af"],
+  ["ed9188", "ed9180e186af"],
+  ["ed9189", "e18491e185ace186b0"],
+  ["ed9189", "ed9180e186b0"],
+  ["ed918a", "e18491e185ace186b1"],
+  ["ed918a", "ed9180e186b1"],
+  ["ed918b", "e18491e185ace186b2"],
+  ["ed918b", "ed9180e186b2"],
+  ["ed918c", "e18491e185ace186b3"],
+  ["ed918c", "ed9180e186b3"],
+  ["ed918d", "e18491e185ace186b4"],
+  ["ed918d", "ed9180e186b4"],
+  ["ed918e", "e18491e185ace186b5"],
+  ["ed918e", "ed9180e186b5"],
+  ["ed918f", "e18491e185ace186b6"],
+  ["ed918f", "ed9180e186b6"],
+  ["ed9190", "e18491e185ace186b7"],
+  ["ed9190", "ed9180e186b7"],
+  ["ed9191", "e18491e185ace186b8"],
+  ["ed9191", "ed9180e186b8"],
+  ["ed9192", "e18491e185ace186b9"],
+  ["ed9192", "ed9180e186b9"],
+  ["ed9193", "e18491e185ace186ba"],
+  ["ed9193", "ed9180e186ba"],
+  ["ed9194", "e18491e185ace186bb"],
+  ["ed9194", "ed9180e186bb"],
+  ["ed9195", "e18491e185ace186bc"],
+  ["ed9195", "ed9180e186bc"],
+  ["ed9196", "e18491e185ace186bd"],
+  ["ed9196", "ed9180e186bd"],
+  ["ed9197", "e18491e185ace186be"],
+  ["ed9197", "ed9180e186be"],
+  ["ed9198", "e18491e185ace186bf"],
+  ["ed9198", "ed9180e186bf"],
+  ["ed9199", "e18491e185ace18780"],
+  ["ed9199", "ed9180e18780"],
+  ["ed919a", "e18491e185ace18781"],
+  ["ed919a", "ed9180e18781"],
+  ["ed919b", "e18491e185ace18782"],
+  ["ed919b", "ed9180e18782"],
+  ["ed919c", "e18491e185ad"],
+  ["ed919d", "e18491e185ade186a8"],
+  ["ed919d", "ed919ce186a8"],
+  ["ed919e", "e18491e185ade186a9"],
+  ["ed919e", "ed919ce186a9"],
+  ["ed919f", "e18491e185ade186aa"],
+  ["ed919f", "ed919ce186aa"],
+  ["ed91a0", "e18491e185ade186ab"],
+  ["ed91a0", "ed919ce186ab"],
+  ["ed91a1", "e18491e185ade186ac"],
+  ["ed91a1", "ed919ce186ac"],
+  ["ed91a2", "e18491e185ade186ad"],
+  ["ed91a2", "ed919ce186ad"],
+  ["ed91a3", "e18491e185ade186ae"],
+  ["ed91a3", "ed919ce186ae"],
+  ["ed91a4", "e18491e185ade186af"],
+  ["ed91a4", "ed919ce186af"],
+  ["ed91a5", "e18491e185ade186b0"],
+  ["ed91a5", "ed919ce186b0"],
+  ["ed91a6", "e18491e185ade186b1"],
+  ["ed91a6", "ed919ce186b1"],
+  ["ed91a7", "e18491e185ade186b2"],
+  ["ed91a7", "ed919ce186b2"],
+  ["ed91a8", "e18491e185ade186b3"],
+  ["ed91a8", "ed919ce186b3"],
+  ["ed91a9", "e18491e185ade186b4"],
+  ["ed91a9", "ed919ce186b4"],
+  ["ed91aa", "e18491e185ade186b5"],
+  ["ed91aa", "ed919ce186b5"],
+  ["ed91ab", "e18491e185ade186b6"],
+  ["ed91ab", "ed919ce186b6"],
+  ["ed91ac", "e18491e185ade186b7"],
+  ["ed91ac", "ed919ce186b7"],
+  ["ed91ad", "e18491e185ade186b8"],
+  ["ed91ad", "ed919ce186b8"],
+  ["ed91ae", "e18491e185ade186b9"],
+  ["ed91ae", "ed919ce186b9"],
+  ["ed91af", "e18491e185ade186ba"],
+  ["ed91af", "ed919ce186ba"],
+  ["ed91b0", "e18491e185ade186bb"],
+  ["ed91b0", "ed919ce186bb"],
+  ["ed91b1", "e18491e185ade186bc"],
+  ["ed91b1", "ed919ce186bc"],
+  ["ed91b2", "e18491e185ade186bd"],
+  ["ed91b2", "ed919ce186bd"],
+  ["ed91b3", "e18491e185ade186be"],
+  ["ed91b3", "ed919ce186be"],
+  ["ed91b4", "e18491e185ade186bf"],
+  ["ed91b4", "ed919ce186bf"],
+  ["ed91b5", "e18491e185ade18780"],
+  ["ed91b5", "ed919ce18780"],
+  ["ed91b6", "e18491e185ade18781"],
+  ["ed91b6", "ed919ce18781"],
+  ["ed91b7", "e18491e185ade18782"],
+  ["ed91b7", "ed919ce18782"],
+  ["ed91b8", "e18491e185ae"],
+  ["ed91b9", "e18491e185aee186a8"],
+  ["ed91b9", "ed91b8e186a8"],
+  ["ed91ba", "e18491e185aee186a9"],
+  ["ed91ba", "ed91b8e186a9"],
+  ["ed91bb", "e18491e185aee186aa"],
+  ["ed91bb", "ed91b8e186aa"],
+  ["ed91bc", "e18491e185aee186ab"],
+  ["ed91bc", "ed91b8e186ab"],
+  ["ed91bd", "e18491e185aee186ac"],
+  ["ed91bd", "ed91b8e186ac"],
+  ["ed91be", "e18491e185aee186ad"],
+  ["ed91be", "ed91b8e186ad"],
+  ["ed91bf", "e18491e185aee186ae"],
+  ["ed91bf", "ed91b8e186ae"],
+  ["ed9280", "e18491e185aee186af"],
+  ["ed9280", "ed91b8e186af"],
+  ["ed9281", "e18491e185aee186b0"],
+  ["ed9281", "ed91b8e186b0"],
+  ["ed9282", "e18491e185aee186b1"],
+  ["ed9282", "ed91b8e186b1"],
+  ["ed9283", "e18491e185aee186b2"],
+  ["ed9283", "ed91b8e186b2"],
+  ["ed9284", "e18491e185aee186b3"],
+  ["ed9284", "ed91b8e186b3"],
+  ["ed9285", "e18491e185aee186b4"],
+  ["ed9285", "ed91b8e186b4"],
+  ["ed9286", "e18491e185aee186b5"],
+  ["ed9286", "ed91b8e186b5"],
+  ["ed9287", "e18491e185aee186b6"],
+  ["ed9287", "ed91b8e186b6"],
+  ["ed9288", "e18491e185aee186b7"],
+  ["ed9288", "ed91b8e186b7"],
+  ["ed9289", "e18491e185aee186b8"],
+  ["ed9289", "ed91b8e186b8"],
+  ["ed928a", "e18491e185aee186b9"],
+  ["ed928a", "ed91b8e186b9"],
+  ["ed928b", "e18491e185aee186ba"],
+  ["ed928b", "ed91b8e186ba"],
+  ["ed928c", "e18491e185aee186bb"],
+  ["ed928c", "ed91b8e186bb"],
+  ["ed928d", "e18491e185aee186bc"],
+  ["ed928d", "ed91b8e186bc"],
+  ["ed928e", "e18491e185aee186bd"],
+  ["ed928e", "ed91b8e186bd"],
+  ["ed928f", "e18491e185aee186be"],
+  ["ed928f", "ed91b8e186be"],
+  ["ed9290", "e18491e185aee186bf"],
+  ["ed9290", "ed91b8e186bf"],
+  ["ed9291", "e18491e185aee18780"],
+  ["ed9291", "ed91b8e18780"],
+  ["ed9292", "e18491e185aee18781"],
+  ["ed9292", "ed91b8e18781"],
+  ["ed9293", "e18491e185aee18782"],
+  ["ed9293", "ed91b8e18782"],
+  ["ed9294", "e18491e185af"],
+  ["ed9295", "e18491e185afe186a8"],
+  ["ed9295", "ed9294e186a8"],
+  ["ed9296", "e18491e185afe186a9"],
+  ["ed9296", "ed9294e186a9"],
+  ["ed9297", "e18491e185afe186aa"],
+  ["ed9297", "ed9294e186aa"],
+  ["ed9298", "e18491e185afe186ab"],
+  ["ed9298", "ed9294e186ab"],
+  ["ed9299", "e18491e185afe186ac"],
+  ["ed9299", "ed9294e186ac"],
+  ["ed929a", "e18491e185afe186ad"],
+  ["ed929a", "ed9294e186ad"],
+  ["ed929b", "e18491e185afe186ae"],
+  ["ed929b", "ed9294e186ae"],
+  ["ed929c", "e18491e185afe186af"],
+  ["ed929c", "ed9294e186af"],
+  ["ed929d", "e18491e185afe186b0"],
+  ["ed929d", "ed9294e186b0"],
+  ["ed929e", "e18491e185afe186b1"],
+  ["ed929e", "ed9294e186b1"],
+  ["ed929f", "e18491e185afe186b2"],
+  ["ed929f", "ed9294e186b2"],
+  ["ed92a0", "e18491e185afe186b3"],
+  ["ed92a0", "ed9294e186b3"],
+  ["ed92a1", "e18491e185afe186b4"],
+  ["ed92a1", "ed9294e186b4"],
+  ["ed92a2", "e18491e185afe186b5"],
+  ["ed92a2", "ed9294e186b5"],
+  ["ed92a3", "e18491e185afe186b6"],
+  ["ed92a3", "ed9294e186b6"],
+  ["ed92a4", "e18491e185afe186b7"],
+  ["ed92a4", "ed9294e186b7"],
+  ["ed92a5", "e18491e185afe186b8"],
+  ["ed92a5", "ed9294e186b8"],
+  ["ed92a6", "e18491e185afe186b9"],
+  ["ed92a6", "ed9294e186b9"],
+  ["ed92a7", "e18491e185afe186ba"],
+  ["ed92a7", "ed9294e186ba"],
+  ["ed92a8", "e18491e185afe186bb"],
+  ["ed92a8", "ed9294e186bb"],
+  ["ed92a9", "e18491e185afe186bc"],
+  ["ed92a9", "ed9294e186bc"],
+  ["ed92aa", "e18491e185afe186bd"],
+  ["ed92aa", "ed9294e186bd"],
+  ["ed92ab", "e18491e185afe186be"],
+  ["ed92ab", "ed9294e186be"],
+  ["ed92ac", "e18491e185afe186bf"],
+  ["ed92ac", "ed9294e186bf"],
+  ["ed92ad", "e18491e185afe18780"],
+  ["ed92ad", "ed9294e18780"],
+  ["ed92ae", "e18491e185afe18781"],
+  ["ed92ae", "ed9294e18781"],
+  ["ed92af", "e18491e185afe18782"],
+  ["ed92af", "ed9294e18782"],
+  ["ed92b0", "e18491e185b0"],
+  ["ed92b1", "e18491e185b0e186a8"],
+  ["ed92b1", "ed92b0e186a8"],
+  ["ed92b2", "e18491e185b0e186a9"],
+  ["ed92b2", "ed92b0e186a9"],
+  ["ed92b3", "e18491e185b0e186aa"],
+  ["ed92b3", "ed92b0e186aa"],
+  ["ed92b4", "e18491e185b0e186ab"],
+  ["ed92b4", "ed92b0e186ab"],
+  ["ed92b5", "e18491e185b0e186ac"],
+  ["ed92b5", "ed92b0e186ac"],
+  ["ed92b6", "e18491e185b0e186ad"],
+  ["ed92b6", "ed92b0e186ad"],
+  ["ed92b7", "e18491e185b0e186ae"],
+  ["ed92b7", "ed92b0e186ae"],
+  ["ed92b8", "e18491e185b0e186af"],
+  ["ed92b8", "ed92b0e186af"],
+  ["ed92b9", "e18491e185b0e186b0"],
+  ["ed92b9", "ed92b0e186b0"],
+  ["ed92ba", "e18491e185b0e186b1"],
+  ["ed92ba", "ed92b0e186b1"],
+  ["ed92bb", "e18491e185b0e186b2"],
+  ["ed92bb", "ed92b0e186b2"],
+  ["ed92bc", "e18491e185b0e186b3"],
+  ["ed92bc", "ed92b0e186b3"],
+  ["ed92bd", "e18491e185b0e186b4"],
+  ["ed92bd", "ed92b0e186b4"],
+  ["ed92be", "e18491e185b0e186b5"],
+  ["ed92be", "ed92b0e186b5"],
+  ["ed92bf", "e18491e185b0e186b6"],
+  ["ed92bf", "ed92b0e186b6"],
+  ["ed9380", "e18491e185b0e186b7"],
+  ["ed9380", "ed92b0e186b7"],
+  ["ed9381", "e18491e185b0e186b8"],
+  ["ed9381", "ed92b0e186b8"],
+  ["ed9382", "e18491e185b0e186b9"],
+  ["ed9382", "ed92b0e186b9"],
+  ["ed9383", "e18491e185b0e186ba"],
+  ["ed9383", "ed92b0e186ba"],
+  ["ed9384", "e18491e185b0e186bb"],
+  ["ed9384", "ed92b0e186bb"],
+  ["ed9385", "e18491e185b0e186bc"],
+  ["ed9385", "ed92b0e186bc"],
+  ["ed9386", "e18491e185b0e186bd"],
+  ["ed9386", "ed92b0e186bd"],
+  ["ed9387", "e18491e185b0e186be"],
+  ["ed9387", "ed92b0e186be"],
+  ["ed9388", "e18491e185b0e186bf"],
+  ["ed9388", "ed92b0e186bf"],
+  ["ed9389", "e18491e185b0e18780"],
+  ["ed9389", "ed92b0e18780"],
+  ["ed938a", "e18491e185b0e18781"],
+  ["ed938a", "ed92b0e18781"],
+  ["ed938b", "e18491e185b0e18782"],
+  ["ed938b", "ed92b0e18782"],
+  ["ed938c", "e18491e185b1"],
+  ["ed938d", "e18491e185b1e186a8"],
+  ["ed938d", "ed938ce186a8"],
+  ["ed938e", "e18491e185b1e186a9"],
+  ["ed938e", "ed938ce186a9"],
+  ["ed938f", "e18491e185b1e186aa"],
+  ["ed938f", "ed938ce186aa"],
+  ["ed9390", "e18491e185b1e186ab"],
+  ["ed9390", "ed938ce186ab"],
+  ["ed9391", "e18491e185b1e186ac"],
+  ["ed9391", "ed938ce186ac"],
+  ["ed9392", "e18491e185b1e186ad"],
+  ["ed9392", "ed938ce186ad"],
+  ["ed9393", "e18491e185b1e186ae"],
+  ["ed9393", "ed938ce186ae"],
+  ["ed9394", "e18491e185b1e186af"],
+  ["ed9394", "ed938ce186af"],
+  ["ed9395", "e18491e185b1e186b0"],
+  ["ed9395", "ed938ce186b0"],
+  ["ed9396", "e18491e185b1e186b1"],
+  ["ed9396", "ed938ce186b1"],
+  ["ed9397", "e18491e185b1e186b2"],
+  ["ed9397", "ed938ce186b2"],
+  ["ed9398", "e18491e185b1e186b3"],
+  ["ed9398", "ed938ce186b3"],
+  ["ed9399", "e18491e185b1e186b4"],
+  ["ed9399", "ed938ce186b4"],
+  ["ed939a", "e18491e185b1e186b5"],
+  ["ed939a", "ed938ce186b5"],
+  ["ed939b", "e18491e185b1e186b6"],
+  ["ed939b", "ed938ce186b6"],
+  ["ed939c", "e18491e185b1e186b7"],
+  ["ed939c", "ed938ce186b7"],
+  ["ed939d", "e18491e185b1e186b8"],
+  ["ed939d", "ed938ce186b8"],
+  ["ed939e", "e18491e185b1e186b9"],
+  ["ed939e", "ed938ce186b9"],
+  ["ed939f", "e18491e185b1e186ba"],
+  ["ed939f", "ed938ce186ba"],
+  ["ed93a0", "e18491e185b1e186bb"],
+  ["ed93a0", "ed938ce186bb"],
+  ["ed93a1", "e18491e185b1e186bc"],
+  ["ed93a1", "ed938ce186bc"],
+  ["ed93a2", "e18491e185b1e186bd"],
+  ["ed93a2", "ed938ce186bd"],
+  ["ed93a3", "e18491e185b1e186be"],
+  ["ed93a3", "ed938ce186be"],
+  ["ed93a4", "e18491e185b1e186bf"],
+  ["ed93a4", "ed938ce186bf"],
+  ["ed93a5", "e18491e185b1e18780"],
+  ["ed93a5", "ed938ce18780"],
+  ["ed93a6", "e18491e185b1e18781"],
+  ["ed93a6", "ed938ce18781"],
+  ["ed93a7", "e18491e185b1e18782"],
+  ["ed93a7", "ed938ce18782"],
+  ["ed93a8", "e18491e185b2"],
+  ["ed93a9", "e18491e185b2e186a8"],
+  ["ed93a9", "ed93a8e186a8"],
+  ["ed93aa", "e18491e185b2e186a9"],
+  ["ed93aa", "ed93a8e186a9"],
+  ["ed93ab", "e18491e185b2e186aa"],
+  ["ed93ab", "ed93a8e186aa"],
+  ["ed93ac", "e18491e185b2e186ab"],
+  ["ed93ac", "ed93a8e186ab"],
+  ["ed93ad", "e18491e185b2e186ac"],
+  ["ed93ad", "ed93a8e186ac"],
+  ["ed93ae", "e18491e185b2e186ad"],
+  ["ed93ae", "ed93a8e186ad"],
+  ["ed93af", "e18491e185b2e186ae"],
+  ["ed93af", "ed93a8e186ae"],
+  ["ed93b0", "e18491e185b2e186af"],
+  ["ed93b0", "ed93a8e186af"],
+  ["ed93b1", "e18491e185b2e186b0"],
+  ["ed93b1", "ed93a8e186b0"],
+  ["ed93b2", "e18491e185b2e186b1"],
+  ["ed93b2", "ed93a8e186b1"],
+  ["ed93b3", "e18491e185b2e186b2"],
+  ["ed93b3", "ed93a8e186b2"],
+  ["ed93b4", "e18491e185b2e186b3"],
+  ["ed93b4", "ed93a8e186b3"],
+  ["ed93b5", "e18491e185b2e186b4"],
+  ["ed93b5", "ed93a8e186b4"],
+  ["ed93b6", "e18491e185b2e186b5"],
+  ["ed93b6", "ed93a8e186b5"],
+  ["ed93b7", "e18491e185b2e186b6"],
+  ["ed93b7", "ed93a8e186b6"],
+  ["ed93b8", "e18491e185b2e186b7"],
+  ["ed93b8", "ed93a8e186b7"],
+  ["ed93b9", "e18491e185b2e186b8"],
+  ["ed93b9", "ed93a8e186b8"],
+  ["ed93ba", "e18491e185b2e186b9"],
+  ["ed93ba", "ed93a8e186b9"],
+  ["ed93bb", "e18491e185b2e186ba"],
+  ["ed93bb", "ed93a8e186ba"],
+  ["ed93bc", "e18491e185b2e186bb"],
+  ["ed93bc", "ed93a8e186bb"],
+  ["ed93bd", "e18491e185b2e186bc"],
+  ["ed93bd", "ed93a8e186bc"],
+  ["ed93be", "e18491e185b2e186bd"],
+  ["ed93be", "ed93a8e186bd"],
+  ["ed93bf", "e18491e185b2e186be"],
+  ["ed93bf", "ed93a8e186be"],
+  ["ed9480", "e18491e185b2e186bf"],
+  ["ed9480", "ed93a8e186bf"],
+  ["ed9481", "e18491e185b2e18780"],
+  ["ed9481", "ed93a8e18780"],
+  ["ed9482", "e18491e185b2e18781"],
+  ["ed9482", "ed93a8e18781"],
+  ["ed9483", "e18491e185b2e18782"],
+  ["ed9483", "ed93a8e18782"],
+  ["ed9484", "e18491e185b3"],
+  ["ed9485", "e18491e185b3e186a8"],
+  ["ed9485", "ed9484e186a8"],
+  ["ed9486", "e18491e185b3e186a9"],
+  ["ed9486", "ed9484e186a9"],
+  ["ed9487", "e18491e185b3e186aa"],
+  ["ed9487", "ed9484e186aa"],
+  ["ed9488", "e18491e185b3e186ab"],
+  ["ed9488", "ed9484e186ab"],
+  ["ed9489", "e18491e185b3e186ac"],
+  ["ed9489", "ed9484e186ac"],
+  ["ed948a", "e18491e185b3e186ad"],
+  ["ed948a", "ed9484e186ad"],
+  ["ed948b", "e18491e185b3e186ae"],
+  ["ed948b", "ed9484e186ae"],
+  ["ed948c", "e18491e185b3e186af"],
+  ["ed948c", "ed9484e186af"],
+  ["ed948d", "e18491e185b3e186b0"],
+  ["ed948d", "ed9484e186b0"],
+  ["ed948e", "e18491e185b3e186b1"],
+  ["ed948e", "ed9484e186b1"],
+  ["ed948f", "e18491e185b3e186b2"],
+  ["ed948f", "ed9484e186b2"],
+  ["ed9490", "e18491e185b3e186b3"],
+  ["ed9490", "ed9484e186b3"],
+  ["ed9491", "e18491e185b3e186b4"],
+  ["ed9491", "ed9484e186b4"],
+  ["ed9492", "e18491e185b3e186b5"],
+  ["ed9492", "ed9484e186b5"],
+  ["ed9493", "e18491e185b3e186b6"],
+  ["ed9493", "ed9484e186b6"],
+  ["ed9494", "e18491e185b3e186b7"],
+  ["ed9494", "ed9484e186b7"],
+  ["ed9495", "e18491e185b3e186b8"],
+  ["ed9495", "ed9484e186b8"],
+  ["ed9496", "e18491e185b3e186b9"],
+  ["ed9496", "ed9484e186b9"],
+  ["ed9497", "e18491e185b3e186ba"],
+  ["ed9497", "ed9484e186ba"],
+  ["ed9498", "e18491e185b3e186bb"],
+  ["ed9498", "ed9484e186bb"],
+  ["ed9499", "e18491e185b3e186bc"],
+  ["ed9499", "ed9484e186bc"],
+  ["ed949a", "e18491e185b3e186bd"],
+  ["ed949a", "ed9484e186bd"],
+  ["ed949b", "e18491e185b3e186be"],
+  ["ed949b", "ed9484e186be"],
+  ["ed949c", "e18491e185b3e186bf"],
+  ["ed949c", "ed9484e186bf"],
+  ["ed949d", "e18491e185b3e18780"],
+  ["ed949d", "ed9484e18780"],
+  ["ed949e", "e18491e185b3e18781"],
+  ["ed949e", "ed9484e18781"],
+  ["ed949f", "e18491e185b3e18782"],
+  ["ed949f", "ed9484e18782"],
+  ["ed94a0", "e18491e185b4"],
+  ["ed94a1", "e18491e185b4e186a8"],
+  ["ed94a1", "ed94a0e186a8"],
+  ["ed94a2", "e18491e185b4e186a9"],
+  ["ed94a2", "ed94a0e186a9"],
+  ["ed94a3", "e18491e185b4e186aa"],
+  ["ed94a3", "ed94a0e186aa"],
+  ["ed94a4", "e18491e185b4e186ab"],
+  ["ed94a4", "ed94a0e186ab"],
+  ["ed94a5", "e18491e185b4e186ac"],
+  ["ed94a5", "ed94a0e186ac"],
+  ["ed94a6", "e18491e185b4e186ad"],
+  ["ed94a6", "ed94a0e186ad"],
+  ["ed94a7", "e18491e185b4e186ae"],
+  ["ed94a7", "ed94a0e186ae"],
+  ["ed94a8", "e18491e185b4e186af"],
+  ["ed94a8", "ed94a0e186af"],
+  ["ed94a9", "e18491e185b4e186b0"],
+  ["ed94a9", "ed94a0e186b0"],
+  ["ed94aa", "e18491e185b4e186b1"],
+  ["ed94aa", "ed94a0e186b1"],
+  ["ed94ab", "e18491e185b4e186b2"],
+  ["ed94ab", "ed94a0e186b2"],
+  ["ed94ac", "e18491e185b4e186b3"],
+  ["ed94ac", "ed94a0e186b3"],
+  ["ed94ad", "e18491e185b4e186b4"],
+  ["ed94ad", "ed94a0e186b4"],
+  ["ed94ae", "e18491e185b4e186b5"],
+  ["ed94ae", "ed94a0e186b5"],
+  ["ed94af", "e18491e185b4e186b6"],
+  ["ed94af", "ed94a0e186b6"],
+  ["ed94b0", "e18491e185b4e186b7"],
+  ["ed94b0", "ed94a0e186b7"],
+  ["ed94b1", "e18491e185b4e186b8"],
+  ["ed94b1", "ed94a0e186b8"],
+  ["ed94b2", "e18491e185b4e186b9"],
+  ["ed94b2", "ed94a0e186b9"],
+  ["ed94b3", "e18491e185b4e186ba"],
+  ["ed94b3", "ed94a0e186ba"],
+  ["ed94b4", "e18491e185b4e186bb"],
+  ["ed94b4", "ed94a0e186bb"],
+  ["ed94b5", "e18491e185b4e186bc"],
+  ["ed94b5", "ed94a0e186bc"],
+  ["ed94b6", "e18491e185b4e186bd"],
+  ["ed94b6", "ed94a0e186bd"],
+  ["ed94b7", "e18491e185b4e186be"],
+  ["ed94b7", "ed94a0e186be"],
+  ["ed94b8", "e18491e185b4e186bf"],
+  ["ed94b8", "ed94a0e186bf"],
+  ["ed94b9", "e18491e185b4e18780"],
+  ["ed94b9", "ed94a0e18780"],
+  ["ed94ba", "e18491e185b4e18781"],
+  ["ed94ba", "ed94a0e18781"],
+  ["ed94bb", "e18491e185b4e18782"],
+  ["ed94bb", "ed94a0e18782"],
+  ["ed94bc", "e18491e185b5"],
+  ["ed94bd", "e18491e185b5e186a8"],
+  ["ed94bd", "ed94bce186a8"],
+  ["ed94be", "e18491e185b5e186a9"],
+  ["ed94be", "ed94bce186a9"],
+  ["ed94bf", "e18491e185b5e186aa"],
+  ["ed94bf", "ed94bce186aa"],
+  ["ed9580", "e18491e185b5e186ab"],
+  ["ed9580", "ed94bce186ab"],
+  ["ed9581", "e18491e185b5e186ac"],
+  ["ed9581", "ed94bce186ac"],
+  ["ed9582", "e18491e185b5e186ad"],
+  ["ed9582", "ed94bce186ad"],
+  ["ed9583", "e18491e185b5e186ae"],
+  ["ed9583", "ed94bce186ae"],
+  ["ed9584", "e18491e185b5e186af"],
+  ["ed9584", "ed94bce186af"],
+  ["ed9585", "e18491e185b5e186b0"],
+  ["ed9585", "ed94bce186b0"],
+  ["ed9586", "e18491e185b5e186b1"],
+  ["ed9586", "ed94bce186b1"],
+  ["ed9587", "e18491e185b5e186b2"],
+  ["ed9587", "ed94bce186b2"],
+  ["ed9588", "e18491e185b5e186b3"],
+  ["ed9588", "ed94bce186b3"],
+  ["ed9589", "e18491e185b5e186b4"],
+  ["ed9589", "ed94bce186b4"],
+  ["ed958a", "e18491e185b5e186b5"],
+  ["ed958a", "ed94bce186b5"],
+  ["ed958b", "e18491e185b5e186b6"],
+  ["ed958b", "ed94bce186b6"],
+  ["ed958c", "e18491e185b5e186b7"],
+  ["ed958c", "ed94bce186b7"],
+  ["ed958d", "e18491e185b5e186b8"],
+  ["ed958d", "ed94bce186b8"],
+  ["ed958e", "e18491e185b5e186b9"],
+  ["ed958e", "ed94bce186b9"],
+  ["ed958f", "e18491e185b5e186ba"],
+  ["ed958f", "ed94bce186ba"],
+  ["ed9590", "e18491e185b5e186bb"],
+  ["ed9590", "ed94bce186bb"],
+  ["ed9591", "e18491e185b5e186bc"],
+  ["ed9591", "ed94bce186bc"],
+  ["ed9592", "e18491e185b5e186bd"],
+  ["ed9592", "ed94bce186bd"],
+  ["ed9593", "e18491e185b5e186be"],
+  ["ed9593", "ed94bce186be"],
+  ["ed9594", "e18491e185b5e186bf"],
+  ["ed9594", "ed94bce186bf"],
+  ["ed9595", "e18491e185b5e18780"],
+  ["ed9595", "ed94bce18780"],
+  ["ed9596", "e18491e185b5e18781"],
+  ["ed9596", "ed94bce18781"],
+  ["ed9597", "e18491e185b5e18782"],
+  ["ed9597", "ed94bce18782"],
+  ["ed9598", "e18492e185a1"],
+  ["ed9599", "e18492e185a1e186a8"],
+  ["ed9599", "ed9598e186a8"],
+  ["ed959a", "e18492e185a1e186a9"],
+  ["ed959a", "ed9598e186a9"],
+  ["ed959b", "e18492e185a1e186aa"],
+  ["ed959b", "ed9598e186aa"],
+  ["ed959c", "e18492e185a1e186ab"],
+  ["ed959c", "ed9598e186ab"],
+  ["ed959d", "e18492e185a1e186ac"],
+  ["ed959d", "ed9598e186ac"],
+  ["ed959e", "e18492e185a1e186ad"],
+  ["ed959e", "ed9598e186ad"],
+  ["ed959f", "e18492e185a1e186ae"],
+  ["ed959f", "ed9598e186ae"],
+  ["ed95a0", "e18492e185a1e186af"],
+  ["ed95a0", "ed9598e186af"],
+  ["ed95a1", "e18492e185a1e186b0"],
+  ["ed95a1", "ed9598e186b0"],
+  ["ed95a2", "e18492e185a1e186b1"],
+  ["ed95a2", "ed9598e186b1"],
+  ["ed95a3", "e18492e185a1e186b2"],
+  ["ed95a3", "ed9598e186b2"],
+  ["ed95a4", "e18492e185a1e186b3"],
+  ["ed95a4", "ed9598e186b3"],
+  ["ed95a5", "e18492e185a1e186b4"],
+  ["ed95a5", "ed9598e186b4"],
+  ["ed95a6", "e18492e185a1e186b5"],
+  ["ed95a6", "ed9598e186b5"],
+  ["ed95a7", "e18492e185a1e186b6"],
+  ["ed95a7", "ed9598e186b6"],
+  ["ed95a8", "e18492e185a1e186b7"],
+  ["ed95a8", "ed9598e186b7"],
+  ["ed95a9", "e18492e185a1e186b8"],
+  ["ed95a9", "ed9598e186b8"],
+  ["ed95aa", "e18492e185a1e186b9"],
+  ["ed95aa", "ed9598e186b9"],
+  ["ed95ab", "e18492e185a1e186ba"],
+  ["ed95ab", "ed9598e186ba"],
+  ["ed95ac", "e18492e185a1e186bb"],
+  ["ed95ac", "ed9598e186bb"],
+  ["ed95ad", "e18492e185a1e186bc"],
+  ["ed95ad", "ed9598e186bc"],
+  ["ed95ae", "e18492e185a1e186bd"],
+  ["ed95ae", "ed9598e186bd"],
+  ["ed95af", "e18492e185a1e186be"],
+  ["ed95af", "ed9598e186be"],
+  ["ed95b0", "e18492e185a1e186bf"],
+  ["ed95b0", "ed9598e186bf"],
+  ["ed95b1", "e18492e185a1e18780"],
+  ["ed95b1", "ed9598e18780"],
+  ["ed95b2", "e18492e185a1e18781"],
+  ["ed95b2", "ed9598e18781"],
+  ["ed95b3", "e18492e185a1e18782"],
+  ["ed95b3", "ed9598e18782"],
+  ["ed95b4", "e18492e185a2"],
+  ["ed95b5", "e18492e185a2e186a8"],
+  ["ed95b5", "ed95b4e186a8"],
+  ["ed95b6", "e18492e185a2e186a9"],
+  ["ed95b6", "ed95b4e186a9"],
+  ["ed95b7", "e18492e185a2e186aa"],
+  ["ed95b7", "ed95b4e186aa"],
+  ["ed95b8", "e18492e185a2e186ab"],
+  ["ed95b8", "ed95b4e186ab"],
+  ["ed95b9", "e18492e185a2e186ac"],
+  ["ed95b9", "ed95b4e186ac"],
+  ["ed95ba", "e18492e185a2e186ad"],
+  ["ed95ba", "ed95b4e186ad"],
+  ["ed95bb", "e18492e185a2e186ae"],
+  ["ed95bb", "ed95b4e186ae"],
+  ["ed95bc", "e18492e185a2e186af"],
+  ["ed95bc", "ed95b4e186af"],
+  ["ed95bd", "e18492e185a2e186b0"],
+  ["ed95bd", "ed95b4e186b0"],
+  ["ed95be", "e18492e185a2e186b1"],
+  ["ed95be", "ed95b4e186b1"],
+  ["ed95bf", "e18492e185a2e186b2"],
+  ["ed95bf", "ed95b4e186b2"],
+  ["ed9680", "e18492e185a2e186b3"],
+  ["ed9680", "ed95b4e186b3"],
+  ["ed9681", "e18492e185a2e186b4"],
+  ["ed9681", "ed95b4e186b4"],
+  ["ed9682", "e18492e185a2e186b5"],
+  ["ed9682", "ed95b4e186b5"],
+  ["ed9683", "e18492e185a2e186b6"],
+  ["ed9683", "ed95b4e186b6"],
+  ["ed9684", "e18492e185a2e186b7"],
+  ["ed9684", "ed95b4e186b7"],
+  ["ed9685", "e18492e185a2e186b8"],
+  ["ed9685", "ed95b4e186b8"],
+  ["ed9686", "e18492e185a2e186b9"],
+  ["ed9686", "ed95b4e186b9"],
+  ["ed9687", "e18492e185a2e186ba"],
+  ["ed9687", "ed95b4e186ba"],
+  ["ed9688", "e18492e185a2e186bb"],
+  ["ed9688", "ed95b4e186bb"],
+  ["ed9689", "e18492e185a2e186bc"],
+  ["ed9689", "ed95b4e186bc"],
+  ["ed968a", "e18492e185a2e186bd"],
+  ["ed968a", "ed95b4e186bd"],
+  ["ed968b", "e18492e185a2e186be"],
+  ["ed968b", "ed95b4e186be"],
+  ["ed968c", "e18492e185a2e186bf"],
+  ["ed968c", "ed95b4e186bf"],
+  ["ed968d", "e18492e185a2e18780"],
+  ["ed968d", "ed95b4e18780"],
+  ["ed968e", "e18492e185a2e18781"],
+  ["ed968e", "ed95b4e18781"],
+  ["ed968f", "e18492e185a2e18782"],
+  ["ed968f", "ed95b4e18782"],
+  ["ed9690", "e18492e185a3"],
+  ["ed9691", "e18492e185a3e186a8"],
+  ["ed9691", "ed9690e186a8"],
+  ["ed9692", "e18492e185a3e186a9"],
+  ["ed9692", "ed9690e186a9"],
+  ["ed9693", "e18492e185a3e186aa"],
+  ["ed9693", "ed9690e186aa"],
+  ["ed9694", "e18492e185a3e186ab"],
+  ["ed9694", "ed9690e186ab"],
+  ["ed9695", "e18492e185a3e186ac"],
+  ["ed9695", "ed9690e186ac"],
+  ["ed9696", "e18492e185a3e186ad"],
+  ["ed9696", "ed9690e186ad"],
+  ["ed9697", "e18492e185a3e186ae"],
+  ["ed9697", "ed9690e186ae"],
+  ["ed9698", "e18492e185a3e186af"],
+  ["ed9698", "ed9690e186af"],
+  ["ed9699", "e18492e185a3e186b0"],
+  ["ed9699", "ed9690e186b0"],
+  ["ed969a", "e18492e185a3e186b1"],
+  ["ed969a", "ed9690e186b1"],
+  ["ed969b", "e18492e185a3e186b2"],
+  ["ed969b", "ed9690e186b2"],
+  ["ed969c", "e18492e185a3e186b3"],
+  ["ed969c", "ed9690e186b3"],
+  ["ed969d", "e18492e185a3e186b4"],
+  ["ed969d", "ed9690e186b4"],
+  ["ed969e", "e18492e185a3e186b5"],
+  ["ed969e", "ed9690e186b5"],
+  ["ed969f", "e18492e185a3e186b6"],
+  ["ed969f", "ed9690e186b6"],
+  ["ed96a0", "e18492e185a3e186b7"],
+  ["ed96a0", "ed9690e186b7"],
+  ["ed96a1", "e18492e185a3e186b8"],
+  ["ed96a1", "ed9690e186b8"],
+  ["ed96a2", "e18492e185a3e186b9"],
+  ["ed96a2", "ed9690e186b9"],
+  ["ed96a3", "e18492e185a3e186ba"],
+  ["ed96a3", "ed9690e186ba"],
+  ["ed96a4", "e18492e185a3e186bb"],
+  ["ed96a4", "ed9690e186bb"],
+  ["ed96a5", "e18492e185a3e186bc"],
+  ["ed96a5", "ed9690e186bc"],
+  ["ed96a6", "e18492e185a3e186bd"],
+  ["ed96a6", "ed9690e186bd"],
+  ["ed96a7", "e18492e185a3e186be"],
+  ["ed96a7", "ed9690e186be"],
+  ["ed96a8", "e18492e185a3e186bf"],
+  ["ed96a8", "ed9690e186bf"],
+  ["ed96a9", "e18492e185a3e18780"],
+  ["ed96a9", "ed9690e18780"],
+  ["ed96aa", "e18492e185a3e18781"],
+  ["ed96aa", "ed9690e18781"],
+  ["ed96ab", "e18492e185a3e18782"],
+  ["ed96ab", "ed9690e18782"],
+  ["ed96ac", "e18492e185a4"],
+  ["ed96ad", "e18492e185a4e186a8"],
+  ["ed96ad", "ed96ace186a8"],
+  ["ed96ae", "e18492e185a4e186a9"],
+  ["ed96ae", "ed96ace186a9"],
+  ["ed96af", "e18492e185a4e186aa"],
+  ["ed96af", "ed96ace186aa"],
+  ["ed96b0", "e18492e185a4e186ab"],
+  ["ed96b0", "ed96ace186ab"],
+  ["ed96b1", "e18492e185a4e186ac"],
+  ["ed96b1", "ed96ace186ac"],
+  ["ed96b2", "e18492e185a4e186ad"],
+  ["ed96b2", "ed96ace186ad"],
+  ["ed96b3", "e18492e185a4e186ae"],
+  ["ed96b3", "ed96ace186ae"],
+  ["ed96b4", "e18492e185a4e186af"],
+  ["ed96b4", "ed96ace186af"],
+  ["ed96b5", "e18492e185a4e186b0"],
+  ["ed96b5", "ed96ace186b0"],
+  ["ed96b6", "e18492e185a4e186b1"],
+  ["ed96b6", "ed96ace186b1"],
+  ["ed96b7", "e18492e185a4e186b2"],
+  ["ed96b7", "ed96ace186b2"],
+  ["ed96b8", "e18492e185a4e186b3"],
+  ["ed96b8", "ed96ace186b3"],
+  ["ed96b9", "e18492e185a4e186b4"],
+  ["ed96b9", "ed96ace186b4"],
+  ["ed96ba", "e18492e185a4e186b5"],
+  ["ed96ba", "ed96ace186b5"],
+  ["ed96bb", "e18492e185a4e186b6"],
+  ["ed96bb", "ed96ace186b6"],
+  ["ed96bc", "e18492e185a4e186b7"],
+  ["ed96bc", "ed96ace186b7"],
+  ["ed96bd", "e18492e185a4e186b8"],
+  ["ed96bd", "ed96ace186b8"],
+  ["ed96be", "e18492e185a4e186b9"],
+  ["ed96be", "ed96ace186b9"],
+  ["ed96bf", "e18492e185a4e186ba"],
+  ["ed96bf", "ed96ace186ba"],
+  ["ed9780", "e18492e185a4e186bb"],
+  ["ed9780", "ed96ace186bb"],
+  ["ed9781", "e18492e185a4e186bc"],
+  ["ed9781", "ed96ace186bc"],
+  ["ed9782", "e18492e185a4e186bd"],
+  ["ed9782", "ed96ace186bd"],
+  ["ed9783", "e18492e185a4e186be"],
+  ["ed9783", "ed96ace186be"],
+  ["ed9784", "e18492e185a4e186bf"],
+  ["ed9784", "ed96ace186bf"],
+  ["ed9785", "e18492e185a4e18780"],
+  ["ed9785", "ed96ace18780"],
+  ["ed9786", "e18492e185a4e18781"],
+  ["ed9786", "ed96ace18781"],
+  ["ed9787", "e18492e185a4e18782"],
+  ["ed9787", "ed96ace18782"],
+  ["ed9788", "e18492e185a5"],
+  ["ed9789", "e18492e185a5e186a8"],
+  ["ed9789", "ed9788e186a8"],
+  ["ed978a", "e18492e185a5e186a9"],
+  ["ed978a", "ed9788e186a9"],
+  ["ed978b", "e18492e185a5e186aa"],
+  ["ed978b", "ed9788e186aa"],
+  ["ed978c", "e18492e185a5e186ab"],
+  ["ed978c", "ed9788e186ab"],
+  ["ed978d", "e18492e185a5e186ac"],
+  ["ed978d", "ed9788e186ac"],
+  ["ed978e", "e18492e185a5e186ad"],
+  ["ed978e", "ed9788e186ad"],
+  ["ed978f", "e18492e185a5e186ae"],
+  ["ed978f", "ed9788e186ae"],
+  ["ed9790", "e18492e185a5e186af"],
+  ["ed9790", "ed9788e186af"],
+  ["ed9791", "e18492e185a5e186b0"],
+  ["ed9791", "ed9788e186b0"],
+  ["ed9792", "e18492e185a5e186b1"],
+  ["ed9792", "ed9788e186b1"],
+  ["ed9793", "e18492e185a5e186b2"],
+  ["ed9793", "ed9788e186b2"],
+  ["ed9794", "e18492e185a5e186b3"],
+  ["ed9794", "ed9788e186b3"],
+  ["ed9795", "e18492e185a5e186b4"],
+  ["ed9795", "ed9788e186b4"],
+  ["ed9796", "e18492e185a5e186b5"],
+  ["ed9796", "ed9788e186b5"],
+  ["ed9797", "e18492e185a5e186b6"],
+  ["ed9797", "ed9788e186b6"],
+  ["ed9798", "e18492e185a5e186b7"],
+  ["ed9798", "ed9788e186b7"],
+  ["ed9799", "e18492e185a5e186b8"],
+  ["ed9799", "ed9788e186b8"],
+  ["ed979a", "e18492e185a5e186b9"],
+  ["ed979a", "ed9788e186b9"],
+  ["ed979b", "e18492e185a5e186ba"],
+  ["ed979b", "ed9788e186ba"],
+  ["ed979c", "e18492e185a5e186bb"],
+  ["ed979c", "ed9788e186bb"],
+  ["ed979d", "e18492e185a5e186bc"],
+  ["ed979d", "ed9788e186bc"],
+  ["ed979e", "e18492e185a5e186bd"],
+  ["ed979e", "ed9788e186bd"],
+  ["ed979f", "e18492e185a5e186be"],
+  ["ed979f", "ed9788e186be"],
+  ["ed97a0", "e18492e185a5e186bf"],
+  ["ed97a0", "ed9788e186bf"],
+  ["ed97a1", "e18492e185a5e18780"],
+  ["ed97a1", "ed9788e18780"],
+  ["ed97a2", "e18492e185a5e18781"],
+  ["ed97a2", "ed9788e18781"],
+  ["ed97a3", "e18492e185a5e18782"],
+  ["ed97a3", "ed9788e18782"],
+  ["ed97a4", "e18492e185a6"],
+  ["ed97a5", "e18492e185a6e186a8"],
+  ["ed97a5", "ed97a4e186a8"],
+  ["ed97a6", "e18492e185a6e186a9"],
+  ["ed97a6", "ed97a4e186a9"],
+  ["ed97a7", "e18492e185a6e186aa"],
+  ["ed97a7", "ed97a4e186aa"],
+  ["ed97a8", "e18492e185a6e186ab"],
+  ["ed97a8", "ed97a4e186ab"],
+  ["ed97a9", "e18492e185a6e186ac"],
+  ["ed97a9", "ed97a4e186ac"],
+  ["ed97aa", "e18492e185a6e186ad"],
+  ["ed97aa", "ed97a4e186ad"],
+  ["ed97ab", "e18492e185a6e186ae"],
+  ["ed97ab", "ed97a4e186ae"],
+  ["ed97ac", "e18492e185a6e186af"],
+  ["ed97ac", "ed97a4e186af"],
+  ["ed97ad", "e18492e185a6e186b0"],
+  ["ed97ad", "ed97a4e186b0"],
+  ["ed97ae", "e18492e185a6e186b1"],
+  ["ed97ae", "ed97a4e186b1"],
+  ["ed97af", "e18492e185a6e186b2"],
+  ["ed97af", "ed97a4e186b2"],
+  ["ed97b0", "e18492e185a6e186b3"],
+  ["ed97b0", "ed97a4e186b3"],
+  ["ed97b1", "e18492e185a6e186b4"],
+  ["ed97b1", "ed97a4e186b4"],
+  ["ed97b2", "e18492e185a6e186b5"],
+  ["ed97b2", "ed97a4e186b5"],
+  ["ed97b3", "e18492e185a6e186b6"],
+  ["ed97b3", "ed97a4e186b6"],
+  ["ed97b4", "e18492e185a6e186b7"],
+  ["ed97b4", "ed97a4e186b7"],
+  ["ed97b5", "e18492e185a6e186b8"],
+  ["ed97b5", "ed97a4e186b8"],
+  ["ed97b6", "e18492e185a6e186b9"],
+  ["ed97b6", "ed97a4e186b9"],
+  ["ed97b7", "e18492e185a6e186ba"],
+  ["ed97b7", "ed97a4e186ba"],
+  ["ed97b8", "e18492e185a6e186bb"],
+  ["ed97b8", "ed97a4e186bb"],
+  ["ed97b9", "e18492e185a6e186bc"],
+  ["ed97b9", "ed97a4e186bc"],
+  ["ed97ba", "e18492e185a6e186bd"],
+  ["ed97ba", "ed97a4e186bd"],
+  ["ed97bb", "e18492e185a6e186be"],
+  ["ed97bb", "ed97a4e186be"],
+  ["ed97bc", "e18492e185a6e186bf"],
+  ["ed97bc", "ed97a4e186bf"],
+  ["ed97bd", "e18492e185a6e18780"],
+  ["ed97bd", "ed97a4e18780"],
+  ["ed97be", "e18492e185a6e18781"],
+  ["ed97be", "ed97a4e18781"],
+  ["ed97bf", "e18492e185a6e18782"],
+  ["ed97bf", "ed97a4e18782"],
+  ["ed9880", "e18492e185a7"],
+  ["ed9881", "e18492e185a7e186a8"],
+  ["ed9881", "ed9880e186a8"],
+  ["ed9882", "e18492e185a7e186a9"],
+  ["ed9882", "ed9880e186a9"],
+  ["ed9883", "e18492e185a7e186aa"],
+  ["ed9883", "ed9880e186aa"],
+  ["ed9884", "e18492e185a7e186ab"],
+  ["ed9884", "ed9880e186ab"],
+  ["ed9885", "e18492e185a7e186ac"],
+  ["ed9885", "ed9880e186ac"],
+  ["ed9886", "e18492e185a7e186ad"],
+  ["ed9886", "ed9880e186ad"],
+  ["ed9887", "e18492e185a7e186ae"],
+  ["ed9887", "ed9880e186ae"],
+  ["ed9888", "e18492e185a7e186af"],
+  ["ed9888", "ed9880e186af"],
+  ["ed9889", "e18492e185a7e186b0"],
+  ["ed9889", "ed9880e186b0"],
+  ["ed988a", "e18492e185a7e186b1"],
+  ["ed988a", "ed9880e186b1"],
+  ["ed988b", "e18492e185a7e186b2"],
+  ["ed988b", "ed9880e186b2"],
+  ["ed988c", "e18492e185a7e186b3"],
+  ["ed988c", "ed9880e186b3"],
+  ["ed988d", "e18492e185a7e186b4"],
+  ["ed988d", "ed9880e186b4"],
+  ["ed988e", "e18492e185a7e186b5"],
+  ["ed988e", "ed9880e186b5"],
+  ["ed988f", "e18492e185a7e186b6"],
+  ["ed988f", "ed9880e186b6"],
+  ["ed9890", "e18492e185a7e186b7"],
+  ["ed9890", "ed9880e186b7"],
+  ["ed9891", "e18492e185a7e186b8"],
+  ["ed9891", "ed9880e186b8"],
+  ["ed9892", "e18492e185a7e186b9"],
+  ["ed9892", "ed9880e186b9"],
+  ["ed9893", "e18492e185a7e186ba"],
+  ["ed9893", "ed9880e186ba"],
+  ["ed9894", "e18492e185a7e186bb"],
+  ["ed9894", "ed9880e186bb"],
+  ["ed9895", "e18492e185a7e186bc"],
+  ["ed9895", "ed9880e186bc"],
+  ["ed9896", "e18492e185a7e186bd"],
+  ["ed9896", "ed9880e186bd"],
+  ["ed9897", "e18492e185a7e186be"],
+  ["ed9897", "ed9880e186be"],
+  ["ed9898", "e18492e185a7e186bf"],
+  ["ed9898", "ed9880e186bf"],
+  ["ed9899", "e18492e185a7e18780"],
+  ["ed9899", "ed9880e18780"],
+  ["ed989a", "e18492e185a7e18781"],
+  ["ed989a", "ed9880e18781"],
+  ["ed989b", "e18492e185a7e18782"],
+  ["ed989b", "ed9880e18782"],
+  ["ed989c", "e18492e185a8"],
+  ["ed989d", "e18492e185a8e186a8"],
+  ["ed989d", "ed989ce186a8"],
+  ["ed989e", "e18492e185a8e186a9"],
+  ["ed989e", "ed989ce186a9"],
+  ["ed989f", "e18492e185a8e186aa"],
+  ["ed989f", "ed989ce186aa"],
+  ["ed98a0", "e18492e185a8e186ab"],
+  ["ed98a0", "ed989ce186ab"],
+  ["ed98a1", "e18492e185a8e186ac"],
+  ["ed98a1", "ed989ce186ac"],
+  ["ed98a2", "e18492e185a8e186ad"],
+  ["ed98a2", "ed989ce186ad"],
+  ["ed98a3", "e18492e185a8e186ae"],
+  ["ed98a3", "ed989ce186ae"],
+  ["ed98a4", "e18492e185a8e186af"],
+  ["ed98a4", "ed989ce186af"],
+  ["ed98a5", "e18492e185a8e186b0"],
+  ["ed98a5", "ed989ce186b0"],
+  ["ed98a6", "e18492e185a8e186b1"],
+  ["ed98a6", "ed989ce186b1"],
+  ["ed98a7", "e18492e185a8e186b2"],
+  ["ed98a7", "ed989ce186b2"],
+  ["ed98a8", "e18492e185a8e186b3"],
+  ["ed98a8", "ed989ce186b3"],
+  ["ed98a9", "e18492e185a8e186b4"],
+  ["ed98a9", "ed989ce186b4"],
+  ["ed98aa", "e18492e185a8e186b5"],
+  ["ed98aa", "ed989ce186b5"],
+  ["ed98ab", "e18492e185a8e186b6"],
+  ["ed98ab", "ed989ce186b6"],
+  ["ed98ac", "e18492e185a8e186b7"],
+  ["ed98ac", "ed989ce186b7"],
+  ["ed98ad", "e18492e185a8e186b8"],
+  ["ed98ad", "ed989ce186b8"],
+  ["ed98ae", "e18492e185a8e186b9"],
+  ["ed98ae", "ed989ce186b9"],
+  ["ed98af", "e18492e185a8e186ba"],
+  ["ed98af", "ed989ce186ba"],
+  ["ed98b0", "e18492e185a8e186bb"],
+  ["ed98b0", "ed989ce186bb"],
+  ["ed98b1", "e18492e185a8e186bc"],
+  ["ed98b1", "ed989ce186bc"],
+  ["ed98b2", "e18492e185a8e186bd"],
+  ["ed98b2", "ed989ce186bd"],
+  ["ed98b3", "e18492e185a8e186be"],
+  ["ed98b3", "ed989ce186be"],
+  ["ed98b4", "e18492e185a8e186bf"],
+  ["ed98b4", "ed989ce186bf"],
+  ["ed98b5", "e18492e185a8e18780"],
+  ["ed98b5", "ed989ce18780"],
+  ["ed98b6", "e18492e185a8e18781"],
+  ["ed98b6", "ed989ce18781"],
+  ["ed98b7", "e18492e185a8e18782"],
+  ["ed98b7", "ed989ce18782"],
+  ["ed98b8", "e18492e185a9"],
+  ["ed98b9", "e18492e185a9e186a8"],
+  ["ed98b9", "ed98b8e186a8"],
+  ["ed98ba", "e18492e185a9e186a9"],
+  ["ed98ba", "ed98b8e186a9"],
+  ["ed98bb", "e18492e185a9e186aa"],
+  ["ed98bb", "ed98b8e186aa"],
+  ["ed98bc", "e18492e185a9e186ab"],
+  ["ed98bc", "ed98b8e186ab"],
+  ["ed98bd", "e18492e185a9e186ac"],
+  ["ed98bd", "ed98b8e186ac"],
+  ["ed98be", "e18492e185a9e186ad"],
+  ["ed98be", "ed98b8e186ad"],
+  ["ed98bf", "e18492e185a9e186ae"],
+  ["ed98bf", "ed98b8e186ae"],
+  ["ed9980", "e18492e185a9e186af"],
+  ["ed9980", "ed98b8e186af"],
+  ["ed9981", "e18492e185a9e186b0"],
+  ["ed9981", "ed98b8e186b0"],
+  ["ed9982", "e18492e185a9e186b1"],
+  ["ed9982", "ed98b8e186b1"],
+  ["ed9983", "e18492e185a9e186b2"],
+  ["ed9983", "ed98b8e186b2"],
+  ["ed9984", "e18492e185a9e186b3"],
+  ["ed9984", "ed98b8e186b3"],
+  ["ed9985", "e18492e185a9e186b4"],
+  ["ed9985", "ed98b8e186b4"],
+  ["ed9986", "e18492e185a9e186b5"],
+  ["ed9986", "ed98b8e186b5"],
+  ["ed9987", "e18492e185a9e186b6"],
+  ["ed9987", "ed98b8e186b6"],
+  ["ed9988", "e18492e185a9e186b7"],
+  ["ed9988", "ed98b8e186b7"],
+  ["ed9989", "e18492e185a9e186b8"],
+  ["ed9989", "ed98b8e186b8"],
+  ["ed998a", "e18492e185a9e186b9"],
+  ["ed998a", "ed98b8e186b9"],
+  ["ed998b", "e18492e185a9e186ba"],
+  ["ed998b", "ed98b8e186ba"],
+  ["ed998c", "e18492e185a9e186bb"],
+  ["ed998c", "ed98b8e186bb"],
+  ["ed998d", "e18492e185a9e186bc"],
+  ["ed998d", "ed98b8e186bc"],
+  ["ed998e", "e18492e185a9e186bd"],
+  ["ed998e", "ed98b8e186bd"],
+  ["ed998f", "e18492e185a9e186be"],
+  ["ed998f", "ed98b8e186be"],
+  ["ed9990", "e18492e185a9e186bf"],
+  ["ed9990", "ed98b8e186bf"],
+  ["ed9991", "e18492e185a9e18780"],
+  ["ed9991", "ed98b8e18780"],
+  ["ed9992", "e18492e185a9e18781"],
+  ["ed9992", "ed98b8e18781"],
+  ["ed9993", "e18492e185a9e18782"],
+  ["ed9993", "ed98b8e18782"],
+  ["ed9994", "e18492e185aa"],
+  ["ed9995", "e18492e185aae186a8"],
+  ["ed9995", "ed9994e186a8"],
+  ["ed9996", "e18492e185aae186a9"],
+  ["ed9996", "ed9994e186a9"],
+  ["ed9997", "e18492e185aae186aa"],
+  ["ed9997", "ed9994e186aa"],
+  ["ed9998", "e18492e185aae186ab"],
+  ["ed9998", "ed9994e186ab"],
+  ["ed9999", "e18492e185aae186ac"],
+  ["ed9999", "ed9994e186ac"],
+  ["ed999a", "e18492e185aae186ad"],
+  ["ed999a", "ed9994e186ad"],
+  ["ed999b", "e18492e185aae186ae"],
+  ["ed999b", "ed9994e186ae"],
+  ["ed999c", "e18492e185aae186af"],
+  ["ed999c", "ed9994e186af"],
+  ["ed999d", "e18492e185aae186b0"],
+  ["ed999d", "ed9994e186b0"],
+  ["ed999e", "e18492e185aae186b1"],
+  ["ed999e", "ed9994e186b1"],
+  ["ed999f", "e18492e185aae186b2"],
+  ["ed999f", "ed9994e186b2"],
+  ["ed99a0", "e18492e185aae186b3"],
+  ["ed99a0", "ed9994e186b3"],
+  ["ed99a1", "e18492e185aae186b4"],
+  ["ed99a1", "ed9994e186b4"],
+  ["ed99a2", "e18492e185aae186b5"],
+  ["ed99a2", "ed9994e186b5"],
+  ["ed99a3", "e18492e185aae186b6"],
+  ["ed99a3", "ed9994e186b6"],
+  ["ed99a4", "e18492e185aae186b7"],
+  ["ed99a4", "ed9994e186b7"],
+  ["ed99a5", "e18492e185aae186b8"],
+  ["ed99a5", "ed9994e186b8"],
+  ["ed99a6", "e18492e185aae186b9"],
+  ["ed99a6", "ed9994e186b9"],
+  ["ed99a7", "e18492e185aae186ba"],
+  ["ed99a7", "ed9994e186ba"],
+  ["ed99a8", "e18492e185aae186bb"],
+  ["ed99a8", "ed9994e186bb"],
+  ["ed99a9", "e18492e185aae186bc"],
+  ["ed99a9", "ed9994e186bc"],
+  ["ed99aa", "e18492e185aae186bd"],
+  ["ed99aa", "ed9994e186bd"],
+  ["ed99ab", "e18492e185aae186be"],
+  ["ed99ab", "ed9994e186be"],
+  ["ed99ac", "e18492e185aae186bf"],
+  ["ed99ac", "ed9994e186bf"],
+  ["ed99ad", "e18492e185aae18780"],
+  ["ed99ad", "ed9994e18780"],
+  ["ed99ae", "e18492e185aae18781"],
+  ["ed99ae", "ed9994e18781"],
+  ["ed99af", "e18492e185aae18782"],
+  ["ed99af", "ed9994e18782"],
+  ["ed99b0", "e18492e185ab"],
+  ["ed99b1", "e18492e185abe186a8"],
+  ["ed99b1", "ed99b0e186a8"],
+  ["ed99b2", "e18492e185abe186a9"],
+  ["ed99b2", "ed99b0e186a9"],
+  ["ed99b3", "e18492e185abe186aa"],
+  ["ed99b3", "ed99b0e186aa"],
+  ["ed99b4", "e18492e185abe186ab"],
+  ["ed99b4", "ed99b0e186ab"],
+  ["ed99b5", "e18492e185abe186ac"],
+  ["ed99b5", "ed99b0e186ac"],
+  ["ed99b6", "e18492e185abe186ad"],
+  ["ed99b6", "ed99b0e186ad"],
+  ["ed99b7", "e18492e185abe186ae"],
+  ["ed99b7", "ed99b0e186ae"],
+  ["ed99b8", "e18492e185abe186af"],
+  ["ed99b8", "ed99b0e186af"],
+  ["ed99b9", "e18492e185abe186b0"],
+  ["ed99b9", "ed99b0e186b0"],
+  ["ed99ba", "e18492e185abe186b1"],
+  ["ed99ba", "ed99b0e186b1"],
+  ["ed99bb", "e18492e185abe186b2"],
+  ["ed99bb", "ed99b0e186b2"],
+  ["ed99bc", "e18492e185abe186b3"],
+  ["ed99bc", "ed99b0e186b3"],
+  ["ed99bd", "e18492e185abe186b4"],
+  ["ed99bd", "ed99b0e186b4"],
+  ["ed99be", "e18492e185abe186b5"],
+  ["ed99be", "ed99b0e186b5"],
+  ["ed99bf", "e18492e185abe186b6"],
+  ["ed99bf", "ed99b0e186b6"],
+  ["ed9a80", "e18492e185abe186b7"],
+  ["ed9a80", "ed99b0e186b7"],
+  ["ed9a81", "e18492e185abe186b8"],
+  ["ed9a81", "ed99b0e186b8"],
+  ["ed9a82", "e18492e185abe186b9"],
+  ["ed9a82", "ed99b0e186b9"],
+  ["ed9a83", "e18492e185abe186ba"],
+  ["ed9a83", "ed99b0e186ba"],
+  ["ed9a84", "e18492e185abe186bb"],
+  ["ed9a84", "ed99b0e186bb"],
+  ["ed9a85", "e18492e185abe186bc"],
+  ["ed9a85", "ed99b0e186bc"],
+  ["ed9a86", "e18492e185abe186bd"],
+  ["ed9a86", "ed99b0e186bd"],
+  ["ed9a87", "e18492e185abe186be"],
+  ["ed9a87", "ed99b0e186be"],
+  ["ed9a88", "e18492e185abe186bf"],
+  ["ed9a88", "ed99b0e186bf"],
+  ["ed9a89", "e18492e185abe18780"],
+  ["ed9a89", "ed99b0e18780"],
+  ["ed9a8a", "e18492e185abe18781"],
+  ["ed9a8a", "ed99b0e18781"],
+  ["ed9a8b", "e18492e185abe18782"],
+  ["ed9a8b", "ed99b0e18782"],
+  ["ed9a8c", "e18492e185ac"],
+  ["ed9a8d", "e18492e185ace186a8"],
+  ["ed9a8d", "ed9a8ce186a8"],
+  ["ed9a8e", "e18492e185ace186a9"],
+  ["ed9a8e", "ed9a8ce186a9"],
+  ["ed9a8f", "e18492e185ace186aa"],
+  ["ed9a8f", "ed9a8ce186aa"],
+  ["ed9a90", "e18492e185ace186ab"],
+  ["ed9a90", "ed9a8ce186ab"],
+  ["ed9a91", "e18492e185ace186ac"],
+  ["ed9a91", "ed9a8ce186ac"],
+  ["ed9a92", "e18492e185ace186ad"],
+  ["ed9a92", "ed9a8ce186ad"],
+  ["ed9a93", "e18492e185ace186ae"],
+  ["ed9a93", "ed9a8ce186ae"],
+  ["ed9a94", "e18492e185ace186af"],
+  ["ed9a94", "ed9a8ce186af"],
+  ["ed9a95", "e18492e185ace186b0"],
+  ["ed9a95", "ed9a8ce186b0"],
+  ["ed9a96", "e18492e185ace186b1"],
+  ["ed9a96", "ed9a8ce186b1"],
+  ["ed9a97", "e18492e185ace186b2"],
+  ["ed9a97", "ed9a8ce186b2"],
+  ["ed9a98", "e18492e185ace186b3"],
+  ["ed9a98", "ed9a8ce186b3"],
+  ["ed9a99", "e18492e185ace186b4"],
+  ["ed9a99", "ed9a8ce186b4"],
+  ["ed9a9a", "e18492e185ace186b5"],
+  ["ed9a9a", "ed9a8ce186b5"],
+  ["ed9a9b", "e18492e185ace186b6"],
+  ["ed9a9b", "ed9a8ce186b6"],
+  ["ed9a9c", "e18492e185ace186b7"],
+  ["ed9a9c", "ed9a8ce186b7"],
+  ["ed9a9d", "e18492e185ace186b8"],
+  ["ed9a9d", "ed9a8ce186b8"],
+  ["ed9a9e", "e18492e185ace186b9"],
+  ["ed9a9e", "ed9a8ce186b9"],
+  ["ed9a9f", "e18492e185ace186ba"],
+  ["ed9a9f", "ed9a8ce186ba"],
+  ["ed9aa0", "e18492e185ace186bb"],
+  ["ed9aa0", "ed9a8ce186bb"],
+  ["ed9aa1", "e18492e185ace186bc"],
+  ["ed9aa1", "ed9a8ce186bc"],
+  ["ed9aa2", "e18492e185ace186bd"],
+  ["ed9aa2", "ed9a8ce186bd"],
+  ["ed9aa3", "e18492e185ace186be"],
+  ["ed9aa3", "ed9a8ce186be"],
+  ["ed9aa4", "e18492e185ace186bf"],
+  ["ed9aa4", "ed9a8ce186bf"],
+  ["ed9aa5", "e18492e185ace18780"],
+  ["ed9aa5", "ed9a8ce18780"],
+  ["ed9aa6", "e18492e185ace18781"],
+  ["ed9aa6", "ed9a8ce18781"],
+  ["ed9aa7", "e18492e185ace18782"],
+  ["ed9aa7", "ed9a8ce18782"],
+  ["ed9aa8", "e18492e185ad"],
+  ["ed9aa9", "e18492e185ade186a8"],
+  ["ed9aa9", "ed9aa8e186a8"],
+  ["ed9aaa", "e18492e185ade186a9"],
+  ["ed9aaa", "ed9aa8e186a9"],
+  ["ed9aab", "e18492e185ade186aa"],
+  ["ed9aab", "ed9aa8e186aa"],
+  ["ed9aac", "e18492e185ade186ab"],
+  ["ed9aac", "ed9aa8e186ab"],
+  ["ed9aad", "e18492e185ade186ac"],
+  ["ed9aad", "ed9aa8e186ac"],
+  ["ed9aae", "e18492e185ade186ad"],
+  ["ed9aae", "ed9aa8e186ad"],
+  ["ed9aaf", "e18492e185ade186ae"],
+  ["ed9aaf", "ed9aa8e186ae"],
+  ["ed9ab0", "e18492e185ade186af"],
+  ["ed9ab0", "ed9aa8e186af"],
+  ["ed9ab1", "e18492e185ade186b0"],
+  ["ed9ab1", "ed9aa8e186b0"],
+  ["ed9ab2", "e18492e185ade186b1"],
+  ["ed9ab2", "ed9aa8e186b1"],
+  ["ed9ab3", "e18492e185ade186b2"],
+  ["ed9ab3", "ed9aa8e186b2"],
+  ["ed9ab4", "e18492e185ade186b3"],
+  ["ed9ab4", "ed9aa8e186b3"],
+  ["ed9ab5", "e18492e185ade186b4"],
+  ["ed9ab5", "ed9aa8e186b4"],
+  ["ed9ab6", "e18492e185ade186b5"],
+  ["ed9ab6", "ed9aa8e186b5"],
+  ["ed9ab7", "e18492e185ade186b6"],
+  ["ed9ab7", "ed9aa8e186b6"],
+  ["ed9ab8", "e18492e185ade186b7"],
+  ["ed9ab8", "ed9aa8e186b7"],
+  ["ed9ab9", "e18492e185ade186b8"],
+  ["ed9ab9", "ed9aa8e186b8"],
+  ["ed9aba", "e18492e185ade186b9"],
+  ["ed9aba", "ed9aa8e186b9"],
+  ["ed9abb", "e18492e185ade186ba"],
+  ["ed9abb", "ed9aa8e186ba"],
+  ["ed9abc", "e18492e185ade186bb"],
+  ["ed9abc", "ed9aa8e186bb"],
+  ["ed9abd", "e18492e185ade186bc"],
+  ["ed9abd", "ed9aa8e186bc"],
+  ["ed9abe", "e18492e185ade186bd"],
+  ["ed9abe", "ed9aa8e186bd"],
+  ["ed9abf", "e18492e185ade186be"],
+  ["ed9abf", "ed9aa8e186be"],
+  ["ed9b80", "e18492e185ade186bf"],
+  ["ed9b80", "ed9aa8e186bf"],
+  ["ed9b81", "e18492e185ade18780"],
+  ["ed9b81", "ed9aa8e18780"],
+  ["ed9b82", "e18492e185ade18781"],
+  ["ed9b82", "ed9aa8e18781"],
+  ["ed9b83", "e18492e185ade18782"],
+  ["ed9b83", "ed9aa8e18782"],
+  ["ed9b84", "e18492e185ae"],
+  ["ed9b85", "e18492e185aee186a8"],
+  ["ed9b85", "ed9b84e186a8"],
+  ["ed9b86", "e18492e185aee186a9"],
+  ["ed9b86", "ed9b84e186a9"],
+  ["ed9b87", "e18492e185aee186aa"],
+  ["ed9b87", "ed9b84e186aa"],
+  ["ed9b88", "e18492e185aee186ab"],
+  ["ed9b88", "ed9b84e186ab"],
+  ["ed9b89", "e18492e185aee186ac"],
+  ["ed9b89", "ed9b84e186ac"],
+  ["ed9b8a", "e18492e185aee186ad"],
+  ["ed9b8a", "ed9b84e186ad"],
+  ["ed9b8b", "e18492e185aee186ae"],
+  ["ed9b8b", "ed9b84e186ae"],
+  ["ed9b8c", "e18492e185aee186af"],
+  ["ed9b8c", "ed9b84e186af"],
+  ["ed9b8d", "e18492e185aee186b0"],
+  ["ed9b8d", "ed9b84e186b0"],
+  ["ed9b8e", "e18492e185aee186b1"],
+  ["ed9b8e", "ed9b84e186b1"],
+  ["ed9b8f", "e18492e185aee186b2"],
+  ["ed9b8f", "ed9b84e186b2"],
+  ["ed9b90", "e18492e185aee186b3"],
+  ["ed9b90", "ed9b84e186b3"],
+  ["ed9b91", "e18492e185aee186b4"],
+  ["ed9b91", "ed9b84e186b4"],
+  ["ed9b92", "e18492e185aee186b5"],
+  ["ed9b92", "ed9b84e186b5"],
+  ["ed9b93", "e18492e185aee186b6"],
+  ["ed9b93", "ed9b84e186b6"],
+  ["ed9b94", "e18492e185aee186b7"],
+  ["ed9b94", "ed9b84e186b7"],
+  ["ed9b95", "e18492e185aee186b8"],
+  ["ed9b95", "ed9b84e186b8"],
+  ["ed9b96", "e18492e185aee186b9"],
+  ["ed9b96", "ed9b84e186b9"],
+  ["ed9b97", "e18492e185aee186ba"],
+  ["ed9b97", "ed9b84e186ba"],
+  ["ed9b98", "e18492e185aee186bb"],
+  ["ed9b98", "ed9b84e186bb"],
+  ["ed9b99", "e18492e185aee186bc"],
+  ["ed9b99", "ed9b84e186bc"],
+  ["ed9b9a", "e18492e185aee186bd"],
+  ["ed9b9a", "ed9b84e186bd"],
+  ["ed9b9b", "e18492e185aee186be"],
+  ["ed9b9b", "ed9b84e186be"],
+  ["ed9b9c", "e18492e185aee186bf"],
+  ["ed9b9c", "ed9b84e186bf"],
+  ["ed9b9d", "e18492e185aee18780"],
+  ["ed9b9d", "ed9b84e18780"],
+  ["ed9b9e", "e18492e185aee18781"],
+  ["ed9b9e", "ed9b84e18781"],
+  ["ed9b9f", "e18492e185aee18782"],
+  ["ed9b9f", "ed9b84e18782"],
+  ["ed9ba0", "e18492e185af"],
+  ["ed9ba1", "e18492e185afe186a8"],
+  ["ed9ba1", "ed9ba0e186a8"],
+  ["ed9ba2", "e18492e185afe186a9"],
+  ["ed9ba2", "ed9ba0e186a9"],
+  ["ed9ba3", "e18492e185afe186aa"],
+  ["ed9ba3", "ed9ba0e186aa"],
+  ["ed9ba4", "e18492e185afe186ab"],
+  ["ed9ba4", "ed9ba0e186ab"],
+  ["ed9ba5", "e18492e185afe186ac"],
+  ["ed9ba5", "ed9ba0e186ac"],
+  ["ed9ba6", "e18492e185afe186ad"],
+  ["ed9ba6", "ed9ba0e186ad"],
+  ["ed9ba7", "e18492e185afe186ae"],
+  ["ed9ba7", "ed9ba0e186ae"],
+  ["ed9ba8", "e18492e185afe186af"],
+  ["ed9ba8", "ed9ba0e186af"],
+  ["ed9ba9", "e18492e185afe186b0"],
+  ["ed9ba9", "ed9ba0e186b0"],
+  ["ed9baa", "e18492e185afe186b1"],
+  ["ed9baa", "ed9ba0e186b1"],
+  ["ed9bab", "e18492e185afe186b2"],
+  ["ed9bab", "ed9ba0e186b2"],
+  ["ed9bac", "e18492e185afe186b3"],
+  ["ed9bac", "ed9ba0e186b3"],
+  ["ed9bad", "e18492e185afe186b4"],
+  ["ed9bad", "ed9ba0e186b4"],
+  ["ed9bae", "e18492e185afe186b5"],
+  ["ed9bae", "ed9ba0e186b5"],
+  ["ed9baf", "e18492e185afe186b6"],
+  ["ed9baf", "ed9ba0e186b6"],
+  ["ed9bb0", "e18492e185afe186b7"],
+  ["ed9bb0", "ed9ba0e186b7"],
+  ["ed9bb1", "e18492e185afe186b8"],
+  ["ed9bb1", "ed9ba0e186b8"],
+  ["ed9bb2", "e18492e185afe186b9"],
+  ["ed9bb2", "ed9ba0e186b9"],
+  ["ed9bb3", "e18492e185afe186ba"],
+  ["ed9bb3", "ed9ba0e186ba"],
+  ["ed9bb4", "e18492e185afe186bb"],
+  ["ed9bb4", "ed9ba0e186bb"],
+  ["ed9bb5", "e18492e185afe186bc"],
+  ["ed9bb5", "ed9ba0e186bc"],
+  ["ed9bb6", "e18492e185afe186bd"],
+  ["ed9bb6", "ed9ba0e186bd"],
+  ["ed9bb7", "e18492e185afe186be"],
+  ["ed9bb7", "ed9ba0e186be"],
+  ["ed9bb8", "e18492e185afe186bf"],
+  ["ed9bb8", "ed9ba0e186bf"],
+  ["ed9bb9", "e18492e185afe18780"],
+  ["ed9bb9", "ed9ba0e18780"],
+  ["ed9bba", "e18492e185afe18781"],
+  ["ed9bba", "ed9ba0e18781"],
+  ["ed9bbb", "e18492e185afe18782"],
+  ["ed9bbb", "ed9ba0e18782"],
+  ["ed9bbc", "e18492e185b0"],
+  ["ed9bbd", "e18492e185b0e186a8"],
+  ["ed9bbd", "ed9bbce186a8"],
+  ["ed9bbe", "e18492e185b0e186a9"],
+  ["ed9bbe", "ed9bbce186a9"],
+  ["ed9bbf", "e18492e185b0e186aa"],
+  ["ed9bbf", "ed9bbce186aa"],
+  ["ed9c80", "e18492e185b0e186ab"],
+  ["ed9c80", "ed9bbce186ab"],
+  ["ed9c81", "e18492e185b0e186ac"],
+  ["ed9c81", "ed9bbce186ac"],
+  ["ed9c82", "e18492e185b0e186ad"],
+  ["ed9c82", "ed9bbce186ad"],
+  ["ed9c83", "e18492e185b0e186ae"],
+  ["ed9c83", "ed9bbce186ae"],
+  ["ed9c84", "e18492e185b0e186af"],
+  ["ed9c84", "ed9bbce186af"],
+  ["ed9c85", "e18492e185b0e186b0"],
+  ["ed9c85", "ed9bbce186b0"],
+  ["ed9c86", "e18492e185b0e186b1"],
+  ["ed9c86", "ed9bbce186b1"],
+  ["ed9c87", "e18492e185b0e186b2"],
+  ["ed9c87", "ed9bbce186b2"],
+  ["ed9c88", "e18492e185b0e186b3"],
+  ["ed9c88", "ed9bbce186b3"],
+  ["ed9c89", "e18492e185b0e186b4"],
+  ["ed9c89", "ed9bbce186b4"],
+  ["ed9c8a", "e18492e185b0e186b5"],
+  ["ed9c8a", "ed9bbce186b5"],
+  ["ed9c8b", "e18492e185b0e186b6"],
+  ["ed9c8b", "ed9bbce186b6"],
+  ["ed9c8c", "e18492e185b0e186b7"],
+  ["ed9c8c", "ed9bbce186b7"],
+  ["ed9c8d", "e18492e185b0e186b8"],
+  ["ed9c8d", "ed9bbce186b8"],
+  ["ed9c8e", "e18492e185b0e186b9"],
+  ["ed9c8e", "ed9bbce186b9"],
+  ["ed9c8f", "e18492e185b0e186ba"],
+  ["ed9c8f", "ed9bbce186ba"],
+  ["ed9c90", "e18492e185b0e186bb"],
+  ["ed9c90", "ed9bbce186bb"],
+  ["ed9c91", "e18492e185b0e186bc"],
+  ["ed9c91", "ed9bbce186bc"],
+  ["ed9c92", "e18492e185b0e186bd"],
+  ["ed9c92", "ed9bbce186bd"],
+  ["ed9c93", "e18492e185b0e186be"],
+  ["ed9c93", "ed9bbce186be"],
+  ["ed9c94", "e18492e185b0e186bf"],
+  ["ed9c94", "ed9bbce186bf"],
+  ["ed9c95", "e18492e185b0e18780"],
+  ["ed9c95", "ed9bbce18780"],
+  ["ed9c96", "e18492e185b0e18781"],
+  ["ed9c96", "ed9bbce18781"],
+  ["ed9c97", "e18492e185b0e18782"],
+  ["ed9c97", "ed9bbce18782"],
+  ["ed9c98", "e18492e185b1"],
+  ["ed9c99", "e18492e185b1e186a8"],
+  ["ed9c99", "ed9c98e186a8"],
+  ["ed9c9a", "e18492e185b1e186a9"],
+  ["ed9c9a", "ed9c98e186a9"],
+  ["ed9c9b", "e18492e185b1e186aa"],
+  ["ed9c9b", "ed9c98e186aa"],
+  ["ed9c9c", "e18492e185b1e186ab"],
+  ["ed9c9c", "ed9c98e186ab"],
+  ["ed9c9d", "e18492e185b1e186ac"],
+  ["ed9c9d", "ed9c98e186ac"],
+  ["ed9c9e", "e18492e185b1e186ad"],
+  ["ed9c9e", "ed9c98e186ad"],
+  ["ed9c9f", "e18492e185b1e186ae"],
+  ["ed9c9f", "ed9c98e186ae"],
+  ["ed9ca0", "e18492e185b1e186af"],
+  ["ed9ca0", "ed9c98e186af"],
+  ["ed9ca1", "e18492e185b1e186b0"],
+  ["ed9ca1", "ed9c98e186b0"],
+  ["ed9ca2", "e18492e185b1e186b1"],
+  ["ed9ca2", "ed9c98e186b1"],
+  ["ed9ca3", "e18492e185b1e186b2"],
+  ["ed9ca3", "ed9c98e186b2"],
+  ["ed9ca4", "e18492e185b1e186b3"],
+  ["ed9ca4", "ed9c98e186b3"],
+  ["ed9ca5", "e18492e185b1e186b4"],
+  ["ed9ca5", "ed9c98e186b4"],
+  ["ed9ca6", "e18492e185b1e186b5"],
+  ["ed9ca6", "ed9c98e186b5"],
+  ["ed9ca7", "e18492e185b1e186b6"],
+  ["ed9ca7", "ed9c98e186b6"],
+  ["ed9ca8", "e18492e185b1e186b7"],
+  ["ed9ca8", "ed9c98e186b7"],
+  ["ed9ca9", "e18492e185b1e186b8"],
+  ["ed9ca9", "ed9c98e186b8"],
+  ["ed9caa", "e18492e185b1e186b9"],
+  ["ed9caa", "ed9c98e186b9"],
+  ["ed9cab", "e18492e185b1e186ba"],
+  ["ed9cab", "ed9c98e186ba"],
+  ["ed9cac", "e18492e185b1e186bb"],
+  ["ed9cac", "ed9c98e186bb"],
+  ["ed9cad", "e18492e185b1e186bc"],
+  ["ed9cad", "ed9c98e186bc"],
+  ["ed9cae", "e18492e185b1e186bd"],
+  ["ed9cae", "ed9c98e186bd"],
+  ["ed9caf", "e18492e185b1e186be"],
+  ["ed9caf", "ed9c98e186be"],
+  ["ed9cb0", "e18492e185b1e186bf"],
+  ["ed9cb0", "ed9c98e186bf"],
+  ["ed9cb1", "e18492e185b1e18780"],
+  ["ed9cb1", "ed9c98e18780"],
+  ["ed9cb2", "e18492e185b1e18781"],
+  ["ed9cb2", "ed9c98e18781"],
+  ["ed9cb3", "e18492e185b1e18782"],
+  ["ed9cb3", "ed9c98e18782"],
+  ["ed9cb4", "e18492e185b2"],
+  ["ed9cb5", "e18492e185b2e186a8"],
+  ["ed9cb5", "ed9cb4e186a8"],
+  ["ed9cb6", "e18492e185b2e186a9"],
+  ["ed9cb6", "ed9cb4e186a9"],
+  ["ed9cb7", "e18492e185b2e186aa"],
+  ["ed9cb7", "ed9cb4e186aa"],
+  ["ed9cb8", "e18492e185b2e186ab"],
+  ["ed9cb8", "ed9cb4e186ab"],
+  ["ed9cb9", "e18492e185b2e186ac"],
+  ["ed9cb9", "ed9cb4e186ac"],
+  ["ed9cba", "e18492e185b2e186ad"],
+  ["ed9cba", "ed9cb4e186ad"],
+  ["ed9cbb", "e18492e185b2e186ae"],
+  ["ed9cbb", "ed9cb4e186ae"],
+  ["ed9cbc", "e18492e185b2e186af"],
+  ["ed9cbc", "ed9cb4e186af"],
+  ["ed9cbd", "e18492e185b2e186b0"],
+  ["ed9cbd", "ed9cb4e186b0"],
+  ["ed9cbe", "e18492e185b2e186b1"],
+  ["ed9cbe", "ed9cb4e186b1"],
+  ["ed9cbf", "e18492e185b2e186b2"],
+  ["ed9cbf", "ed9cb4e186b2"],
+  ["ed9d80", "e18492e185b2e186b3"],
+  ["ed9d80", "ed9cb4e186b3"],
+  ["ed9d81", "e18492e185b2e186b4"],
+  ["ed9d81", "ed9cb4e186b4"],
+  ["ed9d82", "e18492e185b2e186b5"],
+  ["ed9d82", "ed9cb4e186b5"],
+  ["ed9d83", "e18492e185b2e186b6"],
+  ["ed9d83", "ed9cb4e186b6"],
+  ["ed9d84", "e18492e185b2e186b7"],
+  ["ed9d84", "ed9cb4e186b7"],
+  ["ed9d85", "e18492e185b2e186b8"],
+  ["ed9d85", "ed9cb4e186b8"],
+  ["ed9d86", "e18492e185b2e186b9"],
+  ["ed9d86", "ed9cb4e186b9"],
+  ["ed9d87", "e18492e185b2e186ba"],
+  ["ed9d87", "ed9cb4e186ba"],
+  ["ed9d88", "e18492e185b2e186bb"],
+  ["ed9d88", "ed9cb4e186bb"],
+  ["ed9d89", "e18492e185b2e186bc"],
+  ["ed9d89", "ed9cb4e186bc"],
+  ["ed9d8a", "e18492e185b2e186bd"],
+  ["ed9d8a", "ed9cb4e186bd"],
+  ["ed9d8b", "e18492e185b2e186be"],
+  ["ed9d8b", "ed9cb4e186be"],
+  ["ed9d8c", "e18492e185b2e186bf"],
+  ["ed9d8c", "ed9cb4e186bf"],
+  ["ed9d8d", "e18492e185b2e18780"],
+  ["ed9d8d", "ed9cb4e18780"],
+  ["ed9d8e", "e18492e185b2e18781"],
+  ["ed9d8e", "ed9cb4e18781"],
+  ["ed9d8f", "e18492e185b2e18782"],
+  ["ed9d8f", "ed9cb4e18782"],
+  ["ed9d90", "e18492e185b3"],
+  ["ed9d91", "e18492e185b3e186a8"],
+  ["ed9d91", "ed9d90e186a8"],
+  ["ed9d92", "e18492e185b3e186a9"],
+  ["ed9d92", "ed9d90e186a9"],
+  ["ed9d93", "e18492e185b3e186aa"],
+  ["ed9d93", "ed9d90e186aa"],
+  ["ed9d94", "e18492e185b3e186ab"],
+  ["ed9d94", "ed9d90e186ab"],
+  ["ed9d95", "e18492e185b3e186ac"],
+  ["ed9d95", "ed9d90e186ac"],
+  ["ed9d96", "e18492e185b3e186ad"],
+  ["ed9d96", "ed9d90e186ad"],
+  ["ed9d97", "e18492e185b3e186ae"],
+  ["ed9d97", "ed9d90e186ae"],
+  ["ed9d98", "e18492e185b3e186af"],
+  ["ed9d98", "ed9d90e186af"],
+  ["ed9d99", "e18492e185b3e186b0"],
+  ["ed9d99", "ed9d90e186b0"],
+  ["ed9d9a", "e18492e185b3e186b1"],
+  ["ed9d9a", "ed9d90e186b1"],
+  ["ed9d9b", "e18492e185b3e186b2"],
+  ["ed9d9b", "ed9d90e186b2"],
+  ["ed9d9c", "e18492e185b3e186b3"],
+  ["ed9d9c", "ed9d90e186b3"],
+  ["ed9d9d", "e18492e185b3e186b4"],
+  ["ed9d9d", "ed9d90e186b4"],
+  ["ed9d9e", "e18492e185b3e186b5"],
+  ["ed9d9e", "ed9d90e186b5"],
+  ["ed9d9f", "e18492e185b3e186b6"],
+  ["ed9d9f", "ed9d90e186b6"],
+  ["ed9da0", "e18492e185b3e186b7"],
+  ["ed9da0", "ed9d90e186b7"],
+  ["ed9da1", "e18492e185b3e186b8"],
+  ["ed9da1", "ed9d90e186b8"],
+  ["ed9da2", "e18492e185b3e186b9"],
+  ["ed9da2", "ed9d90e186b9"],
+  ["ed9da3", "e18492e185b3e186ba"],
+  ["ed9da3", "ed9d90e186ba"],
+  ["ed9da4", "e18492e185b3e186bb"],
+  ["ed9da4", "ed9d90e186bb"],
+  ["ed9da5", "e18492e185b3e186bc"],
+  ["ed9da5", "ed9d90e186bc"],
+  ["ed9da6", "e18492e185b3e186bd"],
+  ["ed9da6", "ed9d90e186bd"],
+  ["ed9da7", "e18492e185b3e186be"],
+  ["ed9da7", "ed9d90e186be"],
+  ["ed9da8", "e18492e185b3e186bf"],
+  ["ed9da8", "ed9d90e186bf"],
+  ["ed9da9", "e18492e185b3e18780"],
+  ["ed9da9", "ed9d90e18780"],
+  ["ed9daa", "e18492e185b3e18781"],
+  ["ed9daa", "ed9d90e18781"],
+  ["ed9dab", "e18492e185b3e18782"],
+  ["ed9dab", "ed9d90e18782"],
+  ["ed9dac", "e18492e185b4"],
+  ["ed9dad", "e18492e185b4e186a8"],
+  ["ed9dad", "ed9dace186a8"],
+  ["ed9dae", "e18492e185b4e186a9"],
+  ["ed9dae", "ed9dace186a9"],
+  ["ed9daf", "e18492e185b4e186aa"],
+  ["ed9daf", "ed9dace186aa"],
+  ["ed9db0", "e18492e185b4e186ab"],
+  ["ed9db0", "ed9dace186ab"],
+  ["ed9db1", "e18492e185b4e186ac"],
+  ["ed9db1", "ed9dace186ac"],
+  ["ed9db2", "e18492e185b4e186ad"],
+  ["ed9db2", "ed9dace186ad"],
+  ["ed9db3", "e18492e185b4e186ae"],
+  ["ed9db3", "ed9dace186ae"],
+  ["ed9db4", "e18492e185b4e186af"],
+  ["ed9db4", "ed9dace186af"],
+  ["ed9db5", "e18492e185b4e186b0"],
+  ["ed9db5", "ed9dace186b0"],
+  ["ed9db6", "e18492e185b4e186b1"],
+  ["ed9db6", "ed9dace186b1"],
+  ["ed9db7", "e18492e185b4e186b2"],
+  ["ed9db7", "ed9dace186b2"],
+  ["ed9db8", "e18492e185b4e186b3"],
+  ["ed9db8", "ed9dace186b3"],
+  ["ed9db9", "e18492e185b4e186b4"],
+  ["ed9db9", "ed9dace186b4"],
+  ["ed9dba", "e18492e185b4e186b5"],
+  ["ed9dba", "ed9dace186b5"],
+  ["ed9dbb", "e18492e185b4e186b6"],
+  ["ed9dbb", "ed9dace186b6"],
+  ["ed9dbc", "e18492e185b4e186b7"],
+  ["ed9dbc", "ed9dace186b7"],
+  ["ed9dbd", "e18492e185b4e186b8"],
+  ["ed9dbd", "ed9dace186b8"],
+  ["ed9dbe", "e18492e185b4e186b9"],
+  ["ed9dbe", "ed9dace186b9"],
+  ["ed9dbf", "e18492e185b4e186ba"],
+  ["ed9dbf", "ed9dace186ba"],
+  ["ed9e80", "e18492e185b4e186bb"],
+  ["ed9e80", "ed9dace186bb"],
+  ["ed9e81", "e18492e185b4e186bc"],
+  ["ed9e81", "ed9dace186bc"],
+  ["ed9e82", "e18492e185b4e186bd"],
+  ["ed9e82", "ed9dace186bd"],
+  ["ed9e83", "e18492e185b4e186be"],
+  ["ed9e83", "ed9dace186be"],
+  ["ed9e84", "e18492e185b4e186bf"],
+  ["ed9e84", "ed9dace186bf"],
+  ["ed9e85", "e18492e185b4e18780"],
+  ["ed9e85", "ed9dace18780"],
+  ["ed9e86", "e18492e185b4e18781"],
+  ["ed9e86", "ed9dace18781"],
+  ["ed9e87", "e18492e185b4e18782"],
+  ["ed9e87", "ed9dace18782"],
+  ["ed9e88", "e18492e185b5"],
+  ["ed9e89", "e18492e185b5e186a8"],
+  ["ed9e89", "ed9e88e186a8"],
+  ["ed9e8a", "e18492e185b5e186a9"],
+  ["ed9e8a", "ed9e88e186a9"],
+  ["ed9e8b", "e18492e185b5e186aa"],
+  ["ed9e8b", "ed9e88e186aa"],
+  ["ed9e8c", "e18492e185b5e186ab"],
+  ["ed9e8c", "ed9e88e186ab"],
+  ["ed9e8d", "e18492e185b5e186ac"],
+  ["ed9e8d", "ed9e88e186ac"],
+  ["ed9e8e", "e18492e185b5e186ad"],
+  ["ed9e8e", "ed9e88e186ad"],
+  ["ed9e8f", "e18492e185b5e186ae"],
+  ["ed9e8f", "ed9e88e186ae"],
+  ["ed9e90", "e18492e185b5e186af"],
+  ["ed9e90", "ed9e88e186af"],
+  ["ed9e91", "e18492e185b5e186b0"],
+  ["ed9e91", "ed9e88e186b0"],
+  ["ed9e92", "e18492e185b5e186b1"],
+  ["ed9e92", "ed9e88e186b1"],
+  ["ed9e93", "e18492e185b5e186b2"],
+  ["ed9e93", "ed9e88e186b2"],
+  ["ed9e94", "e18492e185b5e186b3"],
+  ["ed9e94", "ed9e88e186b3"],
+  ["ed9e95", "e18492e185b5e186b4"],
+  ["ed9e95", "ed9e88e186b4"],
+  ["ed9e96", "e18492e185b5e186b5"],
+  ["ed9e96", "ed9e88e186b5"],
+  ["ed9e97", "e18492e185b5e186b6"],
+  ["ed9e97", "ed9e88e186b6"],
+  ["ed9e98", "e18492e185b5e186b7"],
+  ["ed9e98", "ed9e88e186b7"],
+  ["ed9e99", "e18492e185b5e186b8"],
+  ["ed9e99", "ed9e88e186b8"],
+  ["ed9e9a", "e18492e185b5e186b9"],
+  ["ed9e9a", "ed9e88e186b9"],
+  ["ed9e9b", "e18492e185b5e186ba"],
+  ["ed9e9b", "ed9e88e186ba"],
+  ["ed9e9c", "e18492e185b5e186bb"],
+  ["ed9e9c", "ed9e88e186bb"],
+  ["ed9e9d", "e18492e185b5e186bc"],
+  ["ed9e9d", "ed9e88e186bc"],
+  ["ed9e9e", "e18492e185b5e186bd"],
+  ["ed9e9e", "ed9e88e186bd"],
+  ["ed9e9f", "e18492e185b5e186be"],
+  ["ed9e9f", "ed9e88e186be"],
+  ["ed9ea0", "e18492e185b5e186bf"],
+  ["ed9ea0", "ed9e88e186bf"],
+  ["ed9ea1", "e18492e185b5e18780"],
+  ["ed9ea1", "ed9e88e18780"],
+  ["ed9ea2", "e18492e185b5e18781"],
+  ["ed9ea2", "ed9e88e18781"],
+  ["ed9ea3", "e18492e185b5e18782"],
+  ["ed9ea3", "ed9e88e18782"],
+  ["e1bf8d", "e1bebfcc80"],
+  ["e1bf8e", "e1bebfcc81"],
+  ["e1bf8f", "e1bebfcd82"],
+  ["e1bf9d", "e1bfbecc80"],
+  ["e1bf9e", "e1bfbecc81"],
+  ["e1bf9f", "e1bfbecd82"],
+  ["e38294", "e38186e38299"],
   ["e3818c", "e3818be38299"],
   ["e3818e", "e3818de38299"],
   ["e38190", "e3818fe38299"],
@@ -876,8 +23119,8 @@ MAC_DECOMPOSE_TBL = [
   ["e381ba", "e381b8e3829a"],
   ["e381bc", "e381bbe38299"],
   ["e381bd", "e381bbe3829a"],
-  ["e38294", "e38186e38299"],
   ["e3829e", "e3829de38299"],
+  ["e383b4", "e382a6e38299"],
   ["e382ac", "e382abe38299"],
   ["e382ae", "e382ade38299"],
   ["e382b0", "e382afe38299"],
@@ -903,43 +23146,9 @@ MAC_DECOMPOSE_TBL = [
   ["e3839a", "e38398e3829a"],
   ["e3839c", "e3839be38299"],
   ["e3839d", "e3839be3829a"],
-  ["e383b4", "e382a6e38299"],
   ["e383b7", "e383afe38299"],
   ["e383b8", "e383b0e38299"],
   ["e383b9", "e383b1e38299"],
   ["e383ba", "e383b2e38299"],
   ["e383be", "e383bde38299"],
-  ["efac9f", "d7b2d6b7"],
-  ["efacaa", "d7a9d781"],
-  ["efacab", "d7a9d782"],
-  ["efacac", "d7a9d6bcd781"],
-  ["efacad", "d7a9d6bcd782"],
-  ["efacae", "d790d6b7"],
-  ["efacaf", "d790d6b8"],
-  ["efacb0", "d790d6bc"],
-  ["efacb1", "d791d6bc"],
-  ["efacb2", "d792d6bc"],
-  ["efacb3", "d793d6bc"],
-  ["efacb4", "d794d6bc"],
-  ["efacb5", "d795d6bc"],
-  ["efacb6", "d796d6bc"],
-  ["efacb8", "d798d6bc"],
-  ["efacb9", "d799d6bc"],
-  ["efacba", "d79ad6bc"],
-  ["efacbb", "d79bd6bc"],
-  ["efacbc", "d79cd6bc"],
-  ["efacbe", "d79ed6bc"],
-  ["efad80", "d7a0d6bc"],
-  ["efad81", "d7a1d6bc"],
-  ["efad83", "d7a3d6bc"],
-  ["efad84", "d7a4d6bc"],
-  ["efad86", "d7a6d6bc"],
-  ["efad87", "d7a7d6bc"],
-  ["efad88", "d7a8d6bc"],
-  ["efad89", "d7a9d6bc"],
-  ["efad8a", "d7aad6bc"],
-  ["efad8b", "d795d6b9"],
-  ["efad8c", "d791d6bf"],
-  ["efad8d", "d79bd6bf"],
-  ["efad8e", "d7a4d6bf"],
 ]
diff --git a/enc/trans/utf8_mac.trans b/enc/trans/utf8_mac.trans
index 8ea0afd73f..bcaa785ead 100644
--- a/enc/trans/utf8_mac.trans
+++ b/enc/trans/utf8_mac.trans
@@ -3,8 +3,18 @@
 <%
   require 'utf8_mac-tbl'
 
+  def charlen(v)
+    v.gsub(/[0-7].|[c-d].{3}|e.{5}/, '.').size
+  end
+
+  map = {}
+  MAC_DECOMPOSE_TBL.each do |c, d|
+    v = map[c]
+    next if v && charlen(v) > charlen(d)
+    map[c] = d
+  end
   transcode_tblgen("UTF-8", "UTF8-MAC",
-    MAC_DECOMPOSE_TBL + [
+    map.to_a + [
     ["{00-7F}", :nomap],
     ["{c2-df}{80-bf}", :nomap0],
     ["e0{a0-bf}{80-bf}", :nomap0],
@@ -27,11 +37,41 @@
   map["f4{80-8f}{80-bf}{80-bf}"] = :func_so
   transcode_generate_node(ActionMap.parse(map), "from_UTF8_MAC")
 
-  ary = MAC_DECOMPOSE_TBL.select{|k,v|v.scan(/[0-7C-F].(?:[89AB].)*/i).length == 3}
-  transcode_generate_node(ActionMap.parse(ary.map{|k,v|[v,k]}), "from_utf8_mac_nfc3")
-
-  ary = MAC_DECOMPOSE_TBL.select{|k,v|v.scan(/[0-7C-F].(?:[89AB].)*/i).length == 2}
-  transcode_generate_node(ActionMap.parse(ary.map{|k,v|[v,k]}), "from_utf8_mac_nfc2")
+  # http://www.unicode.org/Public/UNIDATA/CompositionExclusions.txt
+  composition_exclusions = [
+    0x0958,0x0959,0x095A,0x095B,0x095C,0x095D,0x095E,0x095F,
+    0x09DC,0x09DD,0x09DF,0x0A33,0x0A36,0x0A59,0x0A5A,0x0A5B,
+    0x0A5E,0x0B5C,0x0B5D,0x0F43,0x0F4D,0x0F52,0x0F57,0x0F5C,
+    0x0F69,0x0F76,0x0F78,0x0F93,0x0F9D,0x0FA2,0x0FA7,0x0FAC,
+    0x0FB9,0xFB1D,0xFB1F,0xFB2A,0xFB2B,0xFB2C,0xFB2D,0xFB2E,
+    0xFB2F,0xFB30,0xFB31,0xFB32,0xFB33,0xFB34,0xFB35,0xFB36,
+    0xFB38,0xFB39,0xFB3A,0xFB3B,0xFB3C,0xFB3E,0xFB40,0xFB41,
+    0xFB43,0xFB44,0xFB46,0xFB47,0xFB48,0xFB49,0xFB4A,0xFB4B,
+    0xFB4C,0xFB4D,0xFB4E,0x2ADC,
+#    0x1D15E,0x1D15F,0x1D160,0x1D161,0x1D162,0x1D163,0x1D164,
+#    0x1D1BB,0x1D1BC,0x1D1BD,0x1D1BE,0x1D1BF,0x1D1C0,
+    0x0340..0x0341,0x0343,0x0374,0x037E,0x0387,
+    0x1F71,0x1F73,0x1F75,0x1F77,0x1F79,0x1F7B,0x1F7D,0x1FBB,
+    0x1FBE,0x1FC9,0x1FCB,0x1FD3,0x1FDB,0x1FE3,0x1FEB,0x1FEE..0x1FEF,
+    0x1FF9,0x1FFB,0x1FFD,0x2000..0x2001,0x2126,0x212A..0x212B,0x2329,0x232A,
+    0xF900..0xFA0D,0xFA10,0xFA12,0xFA15..0xFA1E,0xFA20,0xFA22,0xFA25..0xFA26,
+    0xFA2A..0xFA6D,0xFA70..0xFAD9,
+#    0x2F800..0x2FA1D,
+    0x0344,0x0F73,0x0F75,0x0F81
+  ]
+  extbl = {}
+  composition_exclusions.each do |x|
+    case x
+    when Range
+      x.each do |n|
+        extbl[[n].pack("U").unpack("H*")[0]] = true
+      end
+    when Integer
+      extbl[[x].pack("U").unpack("H*")[0]] = true
+    end
+  end
+  ary = MAC_DECOMPOSE_TBL.reject{|k,v|charlen(v)!=2||extbl[k]}.map{|k,v|[v,k]}
+  transcode_generate_node(ActionMap.parse(ary), "from_utf8_mac_nfc2")
 %>
 
 <%= transcode_generated_code %>
@@ -50,54 +90,38 @@ struct from_utf8_mac_status {
     unsigned char buf[STATUS_BUF_SIZE];
     int beg;
     int end;
-    int len;
 };
-#define buf_length(sp) ((sp)->len)
-
-int
-buf_bytesize(struct from_utf8_mac_status *sp)
-{
-    int size = sp->end - sp->beg + STATUS_BUF_SIZE;
-    size %= STATUS_BUF_SIZE;
-    return size;
-}
+#define buf_empty_p(p) ((p)->beg == (p)->end)
+#define buf_bytesize(p) (((p)->end - (p)->beg + STATUS_BUF_SIZE) % STATUS_BUF_SIZE)
+#define utf8_trailbyte(c) (((c) & 0xC0) == 0x80)
 
-void
+static void
 buf_push(struct from_utf8_mac_status *sp, const unsigned char *p, ssize_t l)
 {
     const unsigned char *pend = p + l;
     while (p < pend) {
+        /* if (sp->beg == sp->end) */
         sp->buf[sp->end++] = *p++;
         sp->end %= STATUS_BUF_SIZE;
     }
-    sp->len++;
 }
 
-unsigned char
+static unsigned char
 buf_shift(struct from_utf8_mac_status *sp)
 {
+    /* if (sp->beg == sp->end) */
     unsigned char c = sp->buf[sp->beg++];
     sp->beg %= STATUS_BUF_SIZE;
-    if ((c & 0xC0) != 0x80) sp->len--;
     return c;
 }
 
-void
-buf_shift_char(struct from_utf8_mac_status *sp)
-{
-    if (sp->beg == sp->end) return;
-    do {
-        buf_shift(sp);
-    } while (sp->beg != sp->end && (sp->buf[sp->beg] & 0xC0) == 0x80);
-}
-
-void
+static void
 buf_clear(struct from_utf8_mac_status *sp)
 {
-    sp->beg = sp->end = sp->len = 0;
+    sp->beg = sp->end = 0;
 }
 
-unsigned char
+static unsigned char
 buf_at(struct from_utf8_mac_status *sp, int pos)
 {
     pos += sp->beg;
@@ -105,28 +129,28 @@ buf_at(struct from_utf8_mac_status *sp, int pos)
     return sp->buf[pos];
 }
 
-int
+static size_t
 buf_output_char(struct from_utf8_mac_status *sp, unsigned char *o)
 {
-    int n = 0;
-    while (sp->beg != sp->end) {
+    size_t n = 0;
+    while (!buf_empty_p(sp)) {
         o[n++] = buf_shift(sp);
-        if ((sp->buf[sp->beg] & 0xC0) != 0x80) break;
+        if (!utf8_trailbyte(sp->buf[sp->beg])) break;
     }
     return n;
 }
 
-int
+static size_t
 buf_output_all(struct from_utf8_mac_status *sp, unsigned char *o)
 {
-    int n = 0;
-    while (sp->beg != sp->end) {
+    size_t n = 0;
+    while (!buf_empty_p(sp)) {
         o[n++] = buf_shift(sp);
     }
     return n;
 }
 
-VALUE
+static VALUE
 get_info(VALUE next_info, struct from_utf8_mac_status *sp) {
     int pos = 0;
     while (pos < buf_bytesize(sp)) {
@@ -142,30 +166,32 @@ get_info(VALUE next_info, struct from_utf8_mac_status *sp) {
     return next_info;
 }
 
-int
-buf_apply(int mode, struct from_utf8_mac_status *sp, unsigned char *o)
+static size_t
+buf_apply(struct from_utf8_mac_status *sp, unsigned char *o)
 {
-    int n = 0;
-    VALUE next_info = mode == 3 ? from_utf8_mac_nfc3 : from_utf8_mac_nfc2;
-    next_info = get_info(next_info, sp);
+    size_t n = 0;
+    VALUE next_info;
+    unsigned char buf[3];
+    if (buf_bytesize(sp) < 3 || (buf_bytesize(sp) == 3 && buf_at(sp, 0) >= 0xE0)) {
+        /* char length is less than 2 */
+        return 0;
+    }
+    next_info = get_info(from_utf8_mac_nfc2, sp);
     switch (next_info & 0x1F) {
       case THREEbt:
       case TWObt:
-        o[n++] = getBT1(next_info);
-        o[n++] = getBT2(next_info);
-        if (THREEbt == (next_info & 0x1F)) o[n++] = getBT3(next_info);
-        if (mode == 3) {
-            buf_clear(sp);
-        }
-        else {
-            buf_shift_char(sp);
-            buf_shift_char(sp);
-        }
+        buf[n++] = getBT1(next_info);
+        buf[n++] = getBT2(next_info);
+        if (THREEbt == (next_info & 0x1F))
+            buf[n++] = getBT3(next_info);
+        buf_clear(sp);
+        buf_push(sp, buf, n);
+        return 0;
         break;
       default:
-        return 0;
+        return buf_output_char(sp, o);
+        break;
     }
-    return n;
 }
 
 static int
@@ -181,10 +207,7 @@ from_utf8_mac_finish(void *statep,
         unsigned char *o, size_t osize)
 {
     struct from_utf8_mac_status *sp = statep;
-    int n;
-    if (buf_length(sp) == 0) return 0;
-    n = buf_apply(2, sp, o) + buf_output_all(sp, o);
-    return n;
+    return buf_output_all(sp, o);
 }
 
 static ssize_t
@@ -209,15 +232,8 @@ fun_so_from_utf8_mac(void *statep,
     }
 
     buf_push(sp, s, l);
-    if (buf_length(sp) < 3) return n;
-
-    n = buf_apply(3, sp, o);
-    if (n > 0) return n;
-
-    n = buf_apply(2, sp, o);
-    if (n > 0) return n;
-
-    return buf_output_char(sp, o);
+    n += buf_apply(sp, o);
+    return n;
 }
 
 static const rb_transcoder
@@ -233,10 +249,8 @@ rb_from_UTF8_MAC = {
     from_utf8_mac_finish
 };
 
-void
-Init_utf8_mac(void)
+TRANS_INIT(utf8_mac)
 {
 <%= transcode_register_code %>
     rb_register_transcoder(&rb_from_UTF8_MAC);
 }
-
diff --git a/enc/trans/utf_16_32.trans b/enc/trans/utf_16_32.trans
index c841df035f..632c8808ef 100644
--- a/enc/trans/utf_16_32.trans
+++ b/enc/trans/utf_16_32.trans
@@ -539,8 +539,7 @@ rb_to_UTF_32 = {
     NULL, NULL, NULL, fun_so_to_utf_32
 };
 
-void
-Init_utf_16_32(void)
+TRANS_INIT(utf_16_32)
 {
     rb_register_transcoder(&rb_from_UTF_16BE);
     rb_register_transcoder(&rb_to_UTF_16BE);
diff --git a/enc/trans/windows-1255-tbl.rb b/enc/trans/windows-1255-tbl.rb
index 9084a56a10..4d4cafe0d8 100644
--- a/enc/trans/windows-1255-tbl.rb
+++ b/enc/trans/windows-1255-tbl.rb
@@ -43,6 +43,7 @@ WINDOWS_1255_TO_UCS_TBL = [
   ["C7",0x5B7],
   ["C8",0x5B8],
   ["C9",0x5B9],
+  ["CA",0x5BA],
   ["CB",0x5BB],
   ["CC",0x5BC],
   ["CD",0x5BD],
@@ -138,4 +139,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 beb5fa39f0..6e8c3d8816 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -2,7 +2,7 @@
   unicode.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2013  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
 
 static const unsigned short EncUNICODE_ISO_8859_1_CtypeTable[256] = {
   0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x428c, 0x4289, 0x4288, 0x4288, 0x4288, 0x4008, 0x4008,
+  0x4008, 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,
@@ -71,8 +71,6 @@ static const unsigned short EncUNICODE_ISO_8859_1_CtypeTable[256] = {
   0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
 };
 
-#include "enc/unicode/name2ctype.h"
-
 typedef struct {
   int n;
   OnigCodePoint code[3];
@@ -103,1939 +101,81 @@ typedef struct {
   CodePointList2 to;
 } CaseUnfold_13_Type;
 
-static const CaseFold_11_Type CaseFold[] = {
- { 0x0041, {1, {0x0061}}},
- { 0x0042, {1, {0x0062}}},
- { 0x0043, {1, {0x0063}}},
- { 0x0044, {1, {0x0064}}},
- { 0x0045, {1, {0x0065}}},
- { 0x0046, {1, {0x0066}}},
- { 0x0047, {1, {0x0067}}},
- { 0x0048, {1, {0x0068}}},
- { 0x004a, {1, {0x006a}}},
- { 0x004b, {1, {0x006b}}},
- { 0x004c, {1, {0x006c}}},
- { 0x004d, {1, {0x006d}}},
- { 0x004e, {1, {0x006e}}},
- { 0x004f, {1, {0x006f}}},
- { 0x0050, {1, {0x0070}}},
- { 0x0051, {1, {0x0071}}},
- { 0x0052, {1, {0x0072}}},
- { 0x0053, {1, {0x0073}}},
- { 0x0054, {1, {0x0074}}},
- { 0x0055, {1, {0x0075}}},
- { 0x0056, {1, {0x0076}}},
- { 0x0057, {1, {0x0077}}},
- { 0x0058, {1, {0x0078}}},
- { 0x0059, {1, {0x0079}}},
- { 0x005a, {1, {0x007a}}},
- { 0x00b5, {1, {0x03bc}}},
- { 0x00c0, {1, {0x00e0}}},
- { 0x00c1, {1, {0x00e1}}},
- { 0x00c2, {1, {0x00e2}}},
- { 0x00c3, {1, {0x00e3}}},
- { 0x00c4, {1, {0x00e4}}},
- { 0x00c5, {1, {0x00e5}}},
- { 0x00c6, {1, {0x00e6}}},
- { 0x00c7, {1, {0x00e7}}},
- { 0x00c8, {1, {0x00e8}}},
- { 0x00c9, {1, {0x00e9}}},
- { 0x00ca, {1, {0x00ea}}},
- { 0x00cb, {1, {0x00eb}}},
- { 0x00cc, {1, {0x00ec}}},
- { 0x00cd, {1, {0x00ed}}},
- { 0x00ce, {1, {0x00ee}}},
- { 0x00cf, {1, {0x00ef}}},
- { 0x00d0, {1, {0x00f0}}},
- { 0x00d1, {1, {0x00f1}}},
- { 0x00d2, {1, {0x00f2}}},
- { 0x00d3, {1, {0x00f3}}},
- { 0x00d4, {1, {0x00f4}}},
- { 0x00d5, {1, {0x00f5}}},
- { 0x00d6, {1, {0x00f6}}},
- { 0x00d8, {1, {0x00f8}}},
- { 0x00d9, {1, {0x00f9}}},
- { 0x00da, {1, {0x00fa}}},
- { 0x00db, {1, {0x00fb}}},
- { 0x00dc, {1, {0x00fc}}},
- { 0x00dd, {1, {0x00fd}}},
- { 0x00de, {1, {0x00fe}}},
- { 0x00df, {2, {0x0073, 0x0073}}},
- { 0x0100, {1, {0x0101}}},
- { 0x0102, {1, {0x0103}}},
- { 0x0104, {1, {0x0105}}},
- { 0x0106, {1, {0x0107}}},
- { 0x0108, {1, {0x0109}}},
- { 0x010a, {1, {0x010b}}},
- { 0x010c, {1, {0x010d}}},
- { 0x010e, {1, {0x010f}}},
- { 0x0110, {1, {0x0111}}},
- { 0x0112, {1, {0x0113}}},
- { 0x0114, {1, {0x0115}}},
- { 0x0116, {1, {0x0117}}},
- { 0x0118, {1, {0x0119}}},
- { 0x011a, {1, {0x011b}}},
- { 0x011c, {1, {0x011d}}},
- { 0x011e, {1, {0x011f}}},
- { 0x0120, {1, {0x0121}}},
- { 0x0122, {1, {0x0123}}},
- { 0x0124, {1, {0x0125}}},
- { 0x0126, {1, {0x0127}}},
- { 0x0128, {1, {0x0129}}},
- { 0x012a, {1, {0x012b}}},
- { 0x012c, {1, {0x012d}}},
- { 0x012e, {1, {0x012f}}},
- { 0x0132, {1, {0x0133}}},
- { 0x0134, {1, {0x0135}}},
- { 0x0136, {1, {0x0137}}},
- { 0x0139, {1, {0x013a}}},
- { 0x013b, {1, {0x013c}}},
- { 0x013d, {1, {0x013e}}},
- { 0x013f, {1, {0x0140}}},
- { 0x0141, {1, {0x0142}}},
- { 0x0143, {1, {0x0144}}},
- { 0x0145, {1, {0x0146}}},
- { 0x0147, {1, {0x0148}}},
- { 0x0149, {2, {0x02bc, 0x006e}}},
- { 0x014a, {1, {0x014b}}},
- { 0x014c, {1, {0x014d}}},
- { 0x014e, {1, {0x014f}}},
- { 0x0150, {1, {0x0151}}},
- { 0x0152, {1, {0x0153}}},
- { 0x0154, {1, {0x0155}}},
- { 0x0156, {1, {0x0157}}},
- { 0x0158, {1, {0x0159}}},
- { 0x015a, {1, {0x015b}}},
- { 0x015c, {1, {0x015d}}},
- { 0x015e, {1, {0x015f}}},
- { 0x0160, {1, {0x0161}}},
- { 0x0162, {1, {0x0163}}},
- { 0x0164, {1, {0x0165}}},
- { 0x0166, {1, {0x0167}}},
- { 0x0168, {1, {0x0169}}},
- { 0x016a, {1, {0x016b}}},
- { 0x016c, {1, {0x016d}}},
- { 0x016e, {1, {0x016f}}},
- { 0x0170, {1, {0x0171}}},
- { 0x0172, {1, {0x0173}}},
- { 0x0174, {1, {0x0175}}},
- { 0x0176, {1, {0x0177}}},
- { 0x0178, {1, {0x00ff}}},
- { 0x0179, {1, {0x017a}}},
- { 0x017b, {1, {0x017c}}},
- { 0x017d, {1, {0x017e}}},
- { 0x017f, {1, {0x0073}}},
- { 0x0181, {1, {0x0253}}},
- { 0x0182, {1, {0x0183}}},
- { 0x0184, {1, {0x0185}}},
- { 0x0186, {1, {0x0254}}},
- { 0x0187, {1, {0x0188}}},
- { 0x0189, {1, {0x0256}}},
- { 0x018a, {1, {0x0257}}},
- { 0x018b, {1, {0x018c}}},
- { 0x018e, {1, {0x01dd}}},
- { 0x018f, {1, {0x0259}}},
- { 0x0190, {1, {0x025b}}},
- { 0x0191, {1, {0x0192}}},
- { 0x0193, {1, {0x0260}}},
- { 0x0194, {1, {0x0263}}},
- { 0x0196, {1, {0x0269}}},
- { 0x0197, {1, {0x0268}}},
- { 0x0198, {1, {0x0199}}},
- { 0x019c, {1, {0x026f}}},
- { 0x019d, {1, {0x0272}}},
- { 0x019f, {1, {0x0275}}},
- { 0x01a0, {1, {0x01a1}}},
- { 0x01a2, {1, {0x01a3}}},
- { 0x01a4, {1, {0x01a5}}},
- { 0x01a6, {1, {0x0280}}},
- { 0x01a7, {1, {0x01a8}}},
- { 0x01a9, {1, {0x0283}}},
- { 0x01ac, {1, {0x01ad}}},
- { 0x01ae, {1, {0x0288}}},
- { 0x01af, {1, {0x01b0}}},
- { 0x01b1, {1, {0x028a}}},
- { 0x01b2, {1, {0x028b}}},
- { 0x01b3, {1, {0x01b4}}},
- { 0x01b5, {1, {0x01b6}}},
- { 0x01b7, {1, {0x0292}}},
- { 0x01b8, {1, {0x01b9}}},
- { 0x01bc, {1, {0x01bd}}},
- { 0x01c4, {1, {0x01c6}}},
- { 0x01c5, {1, {0x01c6}}},
- { 0x01c7, {1, {0x01c9}}},
- { 0x01c8, {1, {0x01c9}}},
- { 0x01ca, {1, {0x01cc}}},
- { 0x01cb, {1, {0x01cc}}},
- { 0x01cd, {1, {0x01ce}}},
- { 0x01cf, {1, {0x01d0}}},
- { 0x01d1, {1, {0x01d2}}},
- { 0x01d3, {1, {0x01d4}}},
- { 0x01d5, {1, {0x01d6}}},
- { 0x01d7, {1, {0x01d8}}},
- { 0x01d9, {1, {0x01da}}},
- { 0x01db, {1, {0x01dc}}},
- { 0x01de, {1, {0x01df}}},
- { 0x01e0, {1, {0x01e1}}},
- { 0x01e2, {1, {0x01e3}}},
- { 0x01e4, {1, {0x01e5}}},
- { 0x01e6, {1, {0x01e7}}},
- { 0x01e8, {1, {0x01e9}}},
- { 0x01ea, {1, {0x01eb}}},
- { 0x01ec, {1, {0x01ed}}},
- { 0x01ee, {1, {0x01ef}}},
- { 0x01f0, {2, {0x006a, 0x030c}}},
- { 0x01f1, {1, {0x01f3}}},
- { 0x01f2, {1, {0x01f3}}},
- { 0x01f4, {1, {0x01f5}}},
- { 0x01f6, {1, {0x0195}}},
- { 0x01f7, {1, {0x01bf}}},
- { 0x01f8, {1, {0x01f9}}},
- { 0x01fa, {1, {0x01fb}}},
- { 0x01fc, {1, {0x01fd}}},
- { 0x01fe, {1, {0x01ff}}},
- { 0x0200, {1, {0x0201}}},
- { 0x0202, {1, {0x0203}}},
- { 0x0204, {1, {0x0205}}},
- { 0x0206, {1, {0x0207}}},
- { 0x0208, {1, {0x0209}}},
- { 0x020a, {1, {0x020b}}},
- { 0x020c, {1, {0x020d}}},
- { 0x020e, {1, {0x020f}}},
- { 0x0210, {1, {0x0211}}},
- { 0x0212, {1, {0x0213}}},
- { 0x0214, {1, {0x0215}}},
- { 0x0216, {1, {0x0217}}},
- { 0x0218, {1, {0x0219}}},
- { 0x021a, {1, {0x021b}}},
- { 0x021c, {1, {0x021d}}},
- { 0x021e, {1, {0x021f}}},
- { 0x0220, {1, {0x019e}}},
- { 0x0222, {1, {0x0223}}},
- { 0x0224, {1, {0x0225}}},
- { 0x0226, {1, {0x0227}}},
- { 0x0228, {1, {0x0229}}},
- { 0x022a, {1, {0x022b}}},
- { 0x022c, {1, {0x022d}}},
- { 0x022e, {1, {0x022f}}},
- { 0x0230, {1, {0x0231}}},
- { 0x0232, {1, {0x0233}}},
- { 0x023b, {1, {0x023c}}},
- { 0x023d, {1, {0x019a}}},
- { 0x0241, {1, {0x0294}}},
- { 0x0345, {1, {0x03b9}}},
- { 0x0386, {1, {0x03ac}}},
- { 0x0388, {1, {0x03ad}}},
- { 0x0389, {1, {0x03ae}}},
- { 0x038a, {1, {0x03af}}},
- { 0x038c, {1, {0x03cc}}},
- { 0x038e, {1, {0x03cd}}},
- { 0x038f, {1, {0x03ce}}},
- { 0x0390, {3, {0x03b9, 0x0308, 0x0301}}},
- { 0x0391, {1, {0x03b1}}},
- { 0x0392, {1, {0x03b2}}},
- { 0x0393, {1, {0x03b3}}},
- { 0x0394, {1, {0x03b4}}},
- { 0x0395, {1, {0x03b5}}},
- { 0x0396, {1, {0x03b6}}},
- { 0x0397, {1, {0x03b7}}},
- { 0x0398, {1, {0x03b8}}},
- { 0x0399, {1, {0x03b9}}},
- { 0x039a, {1, {0x03ba}}},
- { 0x039b, {1, {0x03bb}}},
- { 0x039c, {1, {0x03bc}}},
- { 0x039d, {1, {0x03bd}}},
- { 0x039e, {1, {0x03be}}},
- { 0x039f, {1, {0x03bf}}},
- { 0x03a0, {1, {0x03c0}}},
- { 0x03a1, {1, {0x03c1}}},
- { 0x03a3, {1, {0x03c3}}},
- { 0x03a4, {1, {0x03c4}}},
- { 0x03a5, {1, {0x03c5}}},
- { 0x03a6, {1, {0x03c6}}},
- { 0x03a7, {1, {0x03c7}}},
- { 0x03a8, {1, {0x03c8}}},
- { 0x03a9, {1, {0x03c9}}},
- { 0x03aa, {1, {0x03ca}}},
- { 0x03ab, {1, {0x03cb}}},
- { 0x03b0, {3, {0x03c5, 0x0308, 0x0301}}},
- { 0x03c2, {1, {0x03c3}}},
- { 0x03d0, {1, {0x03b2}}},
- { 0x03d1, {1, {0x03b8}}},
- { 0x03d5, {1, {0x03c6}}},
- { 0x03d6, {1, {0x03c0}}},
- { 0x03d8, {1, {0x03d9}}},
- { 0x03da, {1, {0x03db}}},
- { 0x03dc, {1, {0x03dd}}},
- { 0x03de, {1, {0x03df}}},
- { 0x03e0, {1, {0x03e1}}},
- { 0x03e2, {1, {0x03e3}}},
- { 0x03e4, {1, {0x03e5}}},
- { 0x03e6, {1, {0x03e7}}},
- { 0x03e8, {1, {0x03e9}}},
- { 0x03ea, {1, {0x03eb}}},
- { 0x03ec, {1, {0x03ed}}},
- { 0x03ee, {1, {0x03ef}}},
- { 0x03f0, {1, {0x03ba}}},
- { 0x03f1, {1, {0x03c1}}},
- { 0x03f4, {1, {0x03b8}}},
- { 0x03f5, {1, {0x03b5}}},
- { 0x03f7, {1, {0x03f8}}},
- { 0x03f9, {1, {0x03f2}}},
- { 0x03fa, {1, {0x03fb}}},
- { 0x0400, {1, {0x0450}}},
- { 0x0401, {1, {0x0451}}},
- { 0x0402, {1, {0x0452}}},
- { 0x0403, {1, {0x0453}}},
- { 0x0404, {1, {0x0454}}},
- { 0x0405, {1, {0x0455}}},
- { 0x0406, {1, {0x0456}}},
- { 0x0407, {1, {0x0457}}},
- { 0x0408, {1, {0x0458}}},
- { 0x0409, {1, {0x0459}}},
- { 0x040a, {1, {0x045a}}},
- { 0x040b, {1, {0x045b}}},
- { 0x040c, {1, {0x045c}}},
- { 0x040d, {1, {0x045d}}},
- { 0x040e, {1, {0x045e}}},
- { 0x040f, {1, {0x045f}}},
- { 0x0410, {1, {0x0430}}},
- { 0x0411, {1, {0x0431}}},
- { 0x0412, {1, {0x0432}}},
- { 0x0413, {1, {0x0433}}},
- { 0x0414, {1, {0x0434}}},
- { 0x0415, {1, {0x0435}}},
- { 0x0416, {1, {0x0436}}},
- { 0x0417, {1, {0x0437}}},
- { 0x0418, {1, {0x0438}}},
- { 0x0419, {1, {0x0439}}},
- { 0x041a, {1, {0x043a}}},
- { 0x041b, {1, {0x043b}}},
- { 0x041c, {1, {0x043c}}},
- { 0x041d, {1, {0x043d}}},
- { 0x041e, {1, {0x043e}}},
- { 0x041f, {1, {0x043f}}},
- { 0x0420, {1, {0x0440}}},
- { 0x0421, {1, {0x0441}}},
- { 0x0422, {1, {0x0442}}},
- { 0x0423, {1, {0x0443}}},
- { 0x0424, {1, {0x0444}}},
- { 0x0425, {1, {0x0445}}},
- { 0x0426, {1, {0x0446}}},
- { 0x0427, {1, {0x0447}}},
- { 0x0428, {1, {0x0448}}},
- { 0x0429, {1, {0x0449}}},
- { 0x042a, {1, {0x044a}}},
- { 0x042b, {1, {0x044b}}},
- { 0x042c, {1, {0x044c}}},
- { 0x042d, {1, {0x044d}}},
- { 0x042e, {1, {0x044e}}},
- { 0x042f, {1, {0x044f}}},
- { 0x0460, {1, {0x0461}}},
- { 0x0462, {1, {0x0463}}},
- { 0x0464, {1, {0x0465}}},
- { 0x0466, {1, {0x0467}}},
- { 0x0468, {1, {0x0469}}},
- { 0x046a, {1, {0x046b}}},
- { 0x046c, {1, {0x046d}}},
- { 0x046e, {1, {0x046f}}},
- { 0x0470, {1, {0x0471}}},
- { 0x0472, {1, {0x0473}}},
- { 0x0474, {1, {0x0475}}},
- { 0x0476, {1, {0x0477}}},
- { 0x0478, {1, {0x0479}}},
- { 0x047a, {1, {0x047b}}},
- { 0x047c, {1, {0x047d}}},
- { 0x047e, {1, {0x047f}}},
- { 0x0480, {1, {0x0481}}},
- { 0x048a, {1, {0x048b}}},
- { 0x048c, {1, {0x048d}}},
- { 0x048e, {1, {0x048f}}},
- { 0x0490, {1, {0x0491}}},
- { 0x0492, {1, {0x0493}}},
- { 0x0494, {1, {0x0495}}},
- { 0x0496, {1, {0x0497}}},
- { 0x0498, {1, {0x0499}}},
- { 0x049a, {1, {0x049b}}},
- { 0x049c, {1, {0x049d}}},
- { 0x049e, {1, {0x049f}}},
- { 0x04a0, {1, {0x04a1}}},
- { 0x04a2, {1, {0x04a3}}},
- { 0x04a4, {1, {0x04a5}}},
- { 0x04a6, {1, {0x04a7}}},
- { 0x04a8, {1, {0x04a9}}},
- { 0x04aa, {1, {0x04ab}}},
- { 0x04ac, {1, {0x04ad}}},
- { 0x04ae, {1, {0x04af}}},
- { 0x04b0, {1, {0x04b1}}},
- { 0x04b2, {1, {0x04b3}}},
- { 0x04b4, {1, {0x04b5}}},
- { 0x04b6, {1, {0x04b7}}},
- { 0x04b8, {1, {0x04b9}}},
- { 0x04ba, {1, {0x04bb}}},
- { 0x04bc, {1, {0x04bd}}},
- { 0x04be, {1, {0x04bf}}},
- { 0x04c1, {1, {0x04c2}}},
- { 0x04c3, {1, {0x04c4}}},
- { 0x04c5, {1, {0x04c6}}},
- { 0x04c7, {1, {0x04c8}}},
- { 0x04c9, {1, {0x04ca}}},
- { 0x04cb, {1, {0x04cc}}},
- { 0x04cd, {1, {0x04ce}}},
- { 0x04d0, {1, {0x04d1}}},
- { 0x04d2, {1, {0x04d3}}},
- { 0x04d4, {1, {0x04d5}}},
- { 0x04d6, {1, {0x04d7}}},
- { 0x04d8, {1, {0x04d9}}},
- { 0x04da, {1, {0x04db}}},
- { 0x04dc, {1, {0x04dd}}},
- { 0x04de, {1, {0x04df}}},
- { 0x04e0, {1, {0x04e1}}},
- { 0x04e2, {1, {0x04e3}}},
- { 0x04e4, {1, {0x04e5}}},
- { 0x04e6, {1, {0x04e7}}},
- { 0x04e8, {1, {0x04e9}}},
- { 0x04ea, {1, {0x04eb}}},
- { 0x04ec, {1, {0x04ed}}},
- { 0x04ee, {1, {0x04ef}}},
- { 0x04f0, {1, {0x04f1}}},
- { 0x04f2, {1, {0x04f3}}},
- { 0x04f4, {1, {0x04f5}}},
- { 0x04f6, {1, {0x04f7}}},
- { 0x04f8, {1, {0x04f9}}},
- { 0x0500, {1, {0x0501}}},
- { 0x0502, {1, {0x0503}}},
- { 0x0504, {1, {0x0505}}},
- { 0x0506, {1, {0x0507}}},
- { 0x0508, {1, {0x0509}}},
- { 0x050a, {1, {0x050b}}},
- { 0x050c, {1, {0x050d}}},
- { 0x050e, {1, {0x050f}}},
- { 0x0531, {1, {0x0561}}},
- { 0x0532, {1, {0x0562}}},
- { 0x0533, {1, {0x0563}}},
- { 0x0534, {1, {0x0564}}},
- { 0x0535, {1, {0x0565}}},
- { 0x0536, {1, {0x0566}}},
- { 0x0537, {1, {0x0567}}},
- { 0x0538, {1, {0x0568}}},
- { 0x0539, {1, {0x0569}}},
- { 0x053a, {1, {0x056a}}},
- { 0x053b, {1, {0x056b}}},
- { 0x053c, {1, {0x056c}}},
- { 0x053d, {1, {0x056d}}},
- { 0x053e, {1, {0x056e}}},
- { 0x053f, {1, {0x056f}}},
- { 0x0540, {1, {0x0570}}},
- { 0x0541, {1, {0x0571}}},
- { 0x0542, {1, {0x0572}}},
- { 0x0543, {1, {0x0573}}},
- { 0x0544, {1, {0x0574}}},
- { 0x0545, {1, {0x0575}}},
- { 0x0546, {1, {0x0576}}},
- { 0x0547, {1, {0x0577}}},
- { 0x0548, {1, {0x0578}}},
- { 0x0549, {1, {0x0579}}},
- { 0x054a, {1, {0x057a}}},
- { 0x054b, {1, {0x057b}}},
- { 0x054c, {1, {0x057c}}},
- { 0x054d, {1, {0x057d}}},
- { 0x054e, {1, {0x057e}}},
- { 0x054f, {1, {0x057f}}},
- { 0x0550, {1, {0x0580}}},
- { 0x0551, {1, {0x0581}}},
- { 0x0552, {1, {0x0582}}},
- { 0x0553, {1, {0x0583}}},
- { 0x0554, {1, {0x0584}}},
- { 0x0555, {1, {0x0585}}},
- { 0x0556, {1, {0x0586}}},
- { 0x0587, {2, {0x0565, 0x0582}}},
- { 0x10a0, {1, {0x2d00}}},
- { 0x10a1, {1, {0x2d01}}},
- { 0x10a2, {1, {0x2d02}}},
- { 0x10a3, {1, {0x2d03}}},
- { 0x10a4, {1, {0x2d04}}},
- { 0x10a5, {1, {0x2d05}}},
- { 0x10a6, {1, {0x2d06}}},
- { 0x10a7, {1, {0x2d07}}},
- { 0x10a8, {1, {0x2d08}}},
- { 0x10a9, {1, {0x2d09}}},
- { 0x10aa, {1, {0x2d0a}}},
- { 0x10ab, {1, {0x2d0b}}},
- { 0x10ac, {1, {0x2d0c}}},
- { 0x10ad, {1, {0x2d0d}}},
- { 0x10ae, {1, {0x2d0e}}},
- { 0x10af, {1, {0x2d0f}}},
- { 0x10b0, {1, {0x2d10}}},
- { 0x10b1, {1, {0x2d11}}},
- { 0x10b2, {1, {0x2d12}}},
- { 0x10b3, {1, {0x2d13}}},
- { 0x10b4, {1, {0x2d14}}},
- { 0x10b5, {1, {0x2d15}}},
- { 0x10b6, {1, {0x2d16}}},
- { 0x10b7, {1, {0x2d17}}},
- { 0x10b8, {1, {0x2d18}}},
- { 0x10b9, {1, {0x2d19}}},
- { 0x10ba, {1, {0x2d1a}}},
- { 0x10bb, {1, {0x2d1b}}},
- { 0x10bc, {1, {0x2d1c}}},
- { 0x10bd, {1, {0x2d1d}}},
- { 0x10be, {1, {0x2d1e}}},
- { 0x10bf, {1, {0x2d1f}}},
- { 0x10c0, {1, {0x2d20}}},
- { 0x10c1, {1, {0x2d21}}},
- { 0x10c2, {1, {0x2d22}}},
- { 0x10c3, {1, {0x2d23}}},
- { 0x10c4, {1, {0x2d24}}},
- { 0x10c5, {1, {0x2d25}}},
- { 0x1e00, {1, {0x1e01}}},
- { 0x1e02, {1, {0x1e03}}},
- { 0x1e04, {1, {0x1e05}}},
- { 0x1e06, {1, {0x1e07}}},
- { 0x1e08, {1, {0x1e09}}},
- { 0x1e0a, {1, {0x1e0b}}},
- { 0x1e0c, {1, {0x1e0d}}},
- { 0x1e0e, {1, {0x1e0f}}},
- { 0x1e10, {1, {0x1e11}}},
- { 0x1e12, {1, {0x1e13}}},
- { 0x1e14, {1, {0x1e15}}},
- { 0x1e16, {1, {0x1e17}}},
- { 0x1e18, {1, {0x1e19}}},
- { 0x1e1a, {1, {0x1e1b}}},
- { 0x1e1c, {1, {0x1e1d}}},
- { 0x1e1e, {1, {0x1e1f}}},
- { 0x1e20, {1, {0x1e21}}},
- { 0x1e22, {1, {0x1e23}}},
- { 0x1e24, {1, {0x1e25}}},
- { 0x1e26, {1, {0x1e27}}},
- { 0x1e28, {1, {0x1e29}}},
- { 0x1e2a, {1, {0x1e2b}}},
- { 0x1e2c, {1, {0x1e2d}}},
- { 0x1e2e, {1, {0x1e2f}}},
- { 0x1e30, {1, {0x1e31}}},
- { 0x1e32, {1, {0x1e33}}},
- { 0x1e34, {1, {0x1e35}}},
- { 0x1e36, {1, {0x1e37}}},
- { 0x1e38, {1, {0x1e39}}},
- { 0x1e3a, {1, {0x1e3b}}},
- { 0x1e3c, {1, {0x1e3d}}},
- { 0x1e3e, {1, {0x1e3f}}},
- { 0x1e40, {1, {0x1e41}}},
- { 0x1e42, {1, {0x1e43}}},
- { 0x1e44, {1, {0x1e45}}},
- { 0x1e46, {1, {0x1e47}}},
- { 0x1e48, {1, {0x1e49}}},
- { 0x1e4a, {1, {0x1e4b}}},
- { 0x1e4c, {1, {0x1e4d}}},
- { 0x1e4e, {1, {0x1e4f}}},
- { 0x1e50, {1, {0x1e51}}},
- { 0x1e52, {1, {0x1e53}}},
- { 0x1e54, {1, {0x1e55}}},
- { 0x1e56, {1, {0x1e57}}},
- { 0x1e58, {1, {0x1e59}}},
- { 0x1e5a, {1, {0x1e5b}}},
- { 0x1e5c, {1, {0x1e5d}}},
- { 0x1e5e, {1, {0x1e5f}}},
- { 0x1e60, {1, {0x1e61}}},
- { 0x1e62, {1, {0x1e63}}},
- { 0x1e64, {1, {0x1e65}}},
- { 0x1e66, {1, {0x1e67}}},
- { 0x1e68, {1, {0x1e69}}},
- { 0x1e6a, {1, {0x1e6b}}},
- { 0x1e6c, {1, {0x1e6d}}},
- { 0x1e6e, {1, {0x1e6f}}},
- { 0x1e70, {1, {0x1e71}}},
- { 0x1e72, {1, {0x1e73}}},
- { 0x1e74, {1, {0x1e75}}},
- { 0x1e76, {1, {0x1e77}}},
- { 0x1e78, {1, {0x1e79}}},
- { 0x1e7a, {1, {0x1e7b}}},
- { 0x1e7c, {1, {0x1e7d}}},
- { 0x1e7e, {1, {0x1e7f}}},
- { 0x1e80, {1, {0x1e81}}},
- { 0x1e82, {1, {0x1e83}}},
- { 0x1e84, {1, {0x1e85}}},
- { 0x1e86, {1, {0x1e87}}},
- { 0x1e88, {1, {0x1e89}}},
- { 0x1e8a, {1, {0x1e8b}}},
- { 0x1e8c, {1, {0x1e8d}}},
- { 0x1e8e, {1, {0x1e8f}}},
- { 0x1e90, {1, {0x1e91}}},
- { 0x1e92, {1, {0x1e93}}},
- { 0x1e94, {1, {0x1e95}}},
- { 0x1e96, {2, {0x0068, 0x0331}}},
- { 0x1e97, {2, {0x0074, 0x0308}}},
- { 0x1e98, {2, {0x0077, 0x030a}}},
- { 0x1e99, {2, {0x0079, 0x030a}}},
- { 0x1e9a, {2, {0x0061, 0x02be}}},
- { 0x1e9b, {1, {0x1e61}}},
- { 0x1ea0, {1, {0x1ea1}}},
- { 0x1ea2, {1, {0x1ea3}}},
- { 0x1ea4, {1, {0x1ea5}}},
- { 0x1ea6, {1, {0x1ea7}}},
- { 0x1ea8, {1, {0x1ea9}}},
- { 0x1eaa, {1, {0x1eab}}},
- { 0x1eac, {1, {0x1ead}}},
- { 0x1eae, {1, {0x1eaf}}},
- { 0x1eb0, {1, {0x1eb1}}},
- { 0x1eb2, {1, {0x1eb3}}},
- { 0x1eb4, {1, {0x1eb5}}},
- { 0x1eb6, {1, {0x1eb7}}},
- { 0x1eb8, {1, {0x1eb9}}},
- { 0x1eba, {1, {0x1ebb}}},
- { 0x1ebc, {1, {0x1ebd}}},
- { 0x1ebe, {1, {0x1ebf}}},
- { 0x1ec0, {1, {0x1ec1}}},
- { 0x1ec2, {1, {0x1ec3}}},
- { 0x1ec4, {1, {0x1ec5}}},
- { 0x1ec6, {1, {0x1ec7}}},
- { 0x1ec8, {1, {0x1ec9}}},
- { 0x1eca, {1, {0x1ecb}}},
- { 0x1ecc, {1, {0x1ecd}}},
- { 0x1ece, {1, {0x1ecf}}},
- { 0x1ed0, {1, {0x1ed1}}},
- { 0x1ed2, {1, {0x1ed3}}},
- { 0x1ed4, {1, {0x1ed5}}},
- { 0x1ed6, {1, {0x1ed7}}},
- { 0x1ed8, {1, {0x1ed9}}},
- { 0x1eda, {1, {0x1edb}}},
- { 0x1edc, {1, {0x1edd}}},
- { 0x1ede, {1, {0x1edf}}},
- { 0x1ee0, {1, {0x1ee1}}},
- { 0x1ee2, {1, {0x1ee3}}},
- { 0x1ee4, {1, {0x1ee5}}},
- { 0x1ee6, {1, {0x1ee7}}},
- { 0x1ee8, {1, {0x1ee9}}},
- { 0x1eea, {1, {0x1eeb}}},
- { 0x1eec, {1, {0x1eed}}},
- { 0x1eee, {1, {0x1eef}}},
- { 0x1ef0, {1, {0x1ef1}}},
- { 0x1ef2, {1, {0x1ef3}}},
- { 0x1ef4, {1, {0x1ef5}}},
- { 0x1ef6, {1, {0x1ef7}}},
- { 0x1ef8, {1, {0x1ef9}}},
- { 0x1f08, {1, {0x1f00}}},
- { 0x1f09, {1, {0x1f01}}},
- { 0x1f0a, {1, {0x1f02}}},
- { 0x1f0b, {1, {0x1f03}}},
- { 0x1f0c, {1, {0x1f04}}},
- { 0x1f0d, {1, {0x1f05}}},
- { 0x1f0e, {1, {0x1f06}}},
- { 0x1f0f, {1, {0x1f07}}},
- { 0x1f18, {1, {0x1f10}}},
- { 0x1f19, {1, {0x1f11}}},
- { 0x1f1a, {1, {0x1f12}}},
- { 0x1f1b, {1, {0x1f13}}},
- { 0x1f1c, {1, {0x1f14}}},
- { 0x1f1d, {1, {0x1f15}}},
- { 0x1f28, {1, {0x1f20}}},
- { 0x1f29, {1, {0x1f21}}},
- { 0x1f2a, {1, {0x1f22}}},
- { 0x1f2b, {1, {0x1f23}}},
- { 0x1f2c, {1, {0x1f24}}},
- { 0x1f2d, {1, {0x1f25}}},
- { 0x1f2e, {1, {0x1f26}}},
- { 0x1f2f, {1, {0x1f27}}},
- { 0x1f38, {1, {0x1f30}}},
- { 0x1f39, {1, {0x1f31}}},
- { 0x1f3a, {1, {0x1f32}}},
- { 0x1f3b, {1, {0x1f33}}},
- { 0x1f3c, {1, {0x1f34}}},
- { 0x1f3d, {1, {0x1f35}}},
- { 0x1f3e, {1, {0x1f36}}},
- { 0x1f3f, {1, {0x1f37}}},
- { 0x1f48, {1, {0x1f40}}},
- { 0x1f49, {1, {0x1f41}}},
- { 0x1f4a, {1, {0x1f42}}},
- { 0x1f4b, {1, {0x1f43}}},
- { 0x1f4c, {1, {0x1f44}}},
- { 0x1f4d, {1, {0x1f45}}},
- { 0x1f50, {2, {0x03c5, 0x0313}}},
- { 0x1f52, {3, {0x03c5, 0x0313, 0x0300}}},
- { 0x1f54, {3, {0x03c5, 0x0313, 0x0301}}},
- { 0x1f56, {3, {0x03c5, 0x0313, 0x0342}}},
- { 0x1f59, {1, {0x1f51}}},
- { 0x1f5b, {1, {0x1f53}}},
- { 0x1f5d, {1, {0x1f55}}},
- { 0x1f5f, {1, {0x1f57}}},
- { 0x1f68, {1, {0x1f60}}},
- { 0x1f69, {1, {0x1f61}}},
- { 0x1f6a, {1, {0x1f62}}},
- { 0x1f6b, {1, {0x1f63}}},
- { 0x1f6c, {1, {0x1f64}}},
- { 0x1f6d, {1, {0x1f65}}},
- { 0x1f6e, {1, {0x1f66}}},
- { 0x1f6f, {1, {0x1f67}}},
- { 0x1f80, {2, {0x1f00, 0x03b9}}},
- { 0x1f81, {2, {0x1f01, 0x03b9}}},
- { 0x1f82, {2, {0x1f02, 0x03b9}}},
- { 0x1f83, {2, {0x1f03, 0x03b9}}},
- { 0x1f84, {2, {0x1f04, 0x03b9}}},
- { 0x1f85, {2, {0x1f05, 0x03b9}}},
- { 0x1f86, {2, {0x1f06, 0x03b9}}},
- { 0x1f87, {2, {0x1f07, 0x03b9}}},
- { 0x1f88, {2, {0x1f00, 0x03b9}}},
- { 0x1f89, {2, {0x1f01, 0x03b9}}},
- { 0x1f8a, {2, {0x1f02, 0x03b9}}},
- { 0x1f8b, {2, {0x1f03, 0x03b9}}},
- { 0x1f8c, {2, {0x1f04, 0x03b9}}},
- { 0x1f8d, {2, {0x1f05, 0x03b9}}},
- { 0x1f8e, {2, {0x1f06, 0x03b9}}},
- { 0x1f8f, {2, {0x1f07, 0x03b9}}},
- { 0x1f90, {2, {0x1f20, 0x03b9}}},
- { 0x1f91, {2, {0x1f21, 0x03b9}}},
- { 0x1f92, {2, {0x1f22, 0x03b9}}},
- { 0x1f93, {2, {0x1f23, 0x03b9}}},
- { 0x1f94, {2, {0x1f24, 0x03b9}}},
- { 0x1f95, {2, {0x1f25, 0x03b9}}},
- { 0x1f96, {2, {0x1f26, 0x03b9}}},
- { 0x1f97, {2, {0x1f27, 0x03b9}}},
- { 0x1f98, {2, {0x1f20, 0x03b9}}},
- { 0x1f99, {2, {0x1f21, 0x03b9}}},
- { 0x1f9a, {2, {0x1f22, 0x03b9}}},
- { 0x1f9b, {2, {0x1f23, 0x03b9}}},
- { 0x1f9c, {2, {0x1f24, 0x03b9}}},
- { 0x1f9d, {2, {0x1f25, 0x03b9}}},
- { 0x1f9e, {2, {0x1f26, 0x03b9}}},
- { 0x1f9f, {2, {0x1f27, 0x03b9}}},
- { 0x1fa0, {2, {0x1f60, 0x03b9}}},
- { 0x1fa1, {2, {0x1f61, 0x03b9}}},
- { 0x1fa2, {2, {0x1f62, 0x03b9}}},
- { 0x1fa3, {2, {0x1f63, 0x03b9}}},
- { 0x1fa4, {2, {0x1f64, 0x03b9}}},
- { 0x1fa5, {2, {0x1f65, 0x03b9}}},
- { 0x1fa6, {2, {0x1f66, 0x03b9}}},
- { 0x1fa7, {2, {0x1f67, 0x03b9}}},
- { 0x1fa8, {2, {0x1f60, 0x03b9}}},
- { 0x1fa9, {2, {0x1f61, 0x03b9}}},
- { 0x1faa, {2, {0x1f62, 0x03b9}}},
- { 0x1fab, {2, {0x1f63, 0x03b9}}},
- { 0x1fac, {2, {0x1f64, 0x03b9}}},
- { 0x1fad, {2, {0x1f65, 0x03b9}}},
- { 0x1fae, {2, {0x1f66, 0x03b9}}},
- { 0x1faf, {2, {0x1f67, 0x03b9}}},
- { 0x1fb2, {2, {0x1f70, 0x03b9}}},
- { 0x1fb3, {2, {0x03b1, 0x03b9}}},
- { 0x1fb4, {2, {0x03ac, 0x03b9}}},
- { 0x1fb6, {2, {0x03b1, 0x0342}}},
- { 0x1fb7, {3, {0x03b1, 0x0342, 0x03b9}}},
- { 0x1fb8, {1, {0x1fb0}}},
- { 0x1fb9, {1, {0x1fb1}}},
- { 0x1fba, {1, {0x1f70}}},
- { 0x1fbb, {1, {0x1f71}}},
- { 0x1fbc, {2, {0x03b1, 0x03b9}}},
- { 0x1fbe, {1, {0x03b9}}},
- { 0x1fc2, {2, {0x1f74, 0x03b9}}},
- { 0x1fc3, {2, {0x03b7, 0x03b9}}},
- { 0x1fc4, {2, {0x03ae, 0x03b9}}},
- { 0x1fc6, {2, {0x03b7, 0x0342}}},
- { 0x1fc7, {3, {0x03b7, 0x0342, 0x03b9}}},
- { 0x1fc8, {1, {0x1f72}}},
- { 0x1fc9, {1, {0x1f73}}},
- { 0x1fca, {1, {0x1f74}}},
- { 0x1fcb, {1, {0x1f75}}},
- { 0x1fcc, {2, {0x03b7, 0x03b9}}},
- { 0x1fd2, {3, {0x03b9, 0x0308, 0x0300}}},
- { 0x1fd3, {3, {0x03b9, 0x0308, 0x0301}}},
- { 0x1fd6, {2, {0x03b9, 0x0342}}},
- { 0x1fd7, {3, {0x03b9, 0x0308, 0x0342}}},
- { 0x1fd8, {1, {0x1fd0}}},
- { 0x1fd9, {1, {0x1fd1}}},
- { 0x1fda, {1, {0x1f76}}},
- { 0x1fdb, {1, {0x1f77}}},
- { 0x1fe2, {3, {0x03c5, 0x0308, 0x0300}}},
- { 0x1fe3, {3, {0x03c5, 0x0308, 0x0301}}},
- { 0x1fe4, {2, {0x03c1, 0x0313}}},
- { 0x1fe6, {2, {0x03c5, 0x0342}}},
- { 0x1fe7, {3, {0x03c5, 0x0308, 0x0342}}},
- { 0x1fe8, {1, {0x1fe0}}},
- { 0x1fe9, {1, {0x1fe1}}},
- { 0x1fea, {1, {0x1f7a}}},
- { 0x1feb, {1, {0x1f7b}}},
- { 0x1fec, {1, {0x1fe5}}},
- { 0x1ff2, {2, {0x1f7c, 0x03b9}}},
- { 0x1ff3, {2, {0x03c9, 0x03b9}}},
- { 0x1ff4, {2, {0x03ce, 0x03b9}}},
- { 0x1ff6, {2, {0x03c9, 0x0342}}},
- { 0x1ff7, {3, {0x03c9, 0x0342, 0x03b9}}},
- { 0x1ff8, {1, {0x1f78}}},
- { 0x1ff9, {1, {0x1f79}}},
- { 0x1ffa, {1, {0x1f7c}}},
- { 0x1ffb, {1, {0x1f7d}}},
- { 0x1ffc, {2, {0x03c9, 0x03b9}}},
- { 0x2126, {1, {0x03c9}}},
- { 0x212a, {1, {0x006b}}},
- { 0x212b, {1, {0x00e5}}},
- { 0x2160, {1, {0x2170}}},
- { 0x2161, {1, {0x2171}}},
- { 0x2162, {1, {0x2172}}},
- { 0x2163, {1, {0x2173}}},
- { 0x2164, {1, {0x2174}}},
- { 0x2165, {1, {0x2175}}},
- { 0x2166, {1, {0x2176}}},
- { 0x2167, {1, {0x2177}}},
- { 0x2168, {1, {0x2178}}},
- { 0x2169, {1, {0x2179}}},
- { 0x216a, {1, {0x217a}}},
- { 0x216b, {1, {0x217b}}},
- { 0x216c, {1, {0x217c}}},
- { 0x216d, {1, {0x217d}}},
- { 0x216e, {1, {0x217e}}},
- { 0x216f, {1, {0x217f}}},
- { 0x24b6, {1, {0x24d0}}},
- { 0x24b7, {1, {0x24d1}}},
- { 0x24b8, {1, {0x24d2}}},
- { 0x24b9, {1, {0x24d3}}},
- { 0x24ba, {1, {0x24d4}}},
- { 0x24bb, {1, {0x24d5}}},
- { 0x24bc, {1, {0x24d6}}},
- { 0x24bd, {1, {0x24d7}}},
- { 0x24be, {1, {0x24d8}}},
- { 0x24bf, {1, {0x24d9}}},
- { 0x24c0, {1, {0x24da}}},
- { 0x24c1, {1, {0x24db}}},
- { 0x24c2, {1, {0x24dc}}},
- { 0x24c3, {1, {0x24dd}}},
- { 0x24c4, {1, {0x24de}}},
- { 0x24c5, {1, {0x24df}}},
- { 0x24c6, {1, {0x24e0}}},
- { 0x24c7, {1, {0x24e1}}},
- { 0x24c8, {1, {0x24e2}}},
- { 0x24c9, {1, {0x24e3}}},
- { 0x24ca, {1, {0x24e4}}},
- { 0x24cb, {1, {0x24e5}}},
- { 0x24cc, {1, {0x24e6}}},
- { 0x24cd, {1, {0x24e7}}},
- { 0x24ce, {1, {0x24e8}}},
- { 0x24cf, {1, {0x24e9}}},
- { 0x2c00, {1, {0x2c30}}},
- { 0x2c01, {1, {0x2c31}}},
- { 0x2c02, {1, {0x2c32}}},
- { 0x2c03, {1, {0x2c33}}},
- { 0x2c04, {1, {0x2c34}}},
- { 0x2c05, {1, {0x2c35}}},
- { 0x2c06, {1, {0x2c36}}},
- { 0x2c07, {1, {0x2c37}}},
- { 0x2c08, {1, {0x2c38}}},
- { 0x2c09, {1, {0x2c39}}},
- { 0x2c0a, {1, {0x2c3a}}},
- { 0x2c0b, {1, {0x2c3b}}},
- { 0x2c0c, {1, {0x2c3c}}},
- { 0x2c0d, {1, {0x2c3d}}},
- { 0x2c0e, {1, {0x2c3e}}},
- { 0x2c0f, {1, {0x2c3f}}},
- { 0x2c10, {1, {0x2c40}}},
- { 0x2c11, {1, {0x2c41}}},
- { 0x2c12, {1, {0x2c42}}},
- { 0x2c13, {1, {0x2c43}}},
- { 0x2c14, {1, {0x2c44}}},
- { 0x2c15, {1, {0x2c45}}},
- { 0x2c16, {1, {0x2c46}}},
- { 0x2c17, {1, {0x2c47}}},
- { 0x2c18, {1, {0x2c48}}},
- { 0x2c19, {1, {0x2c49}}},
- { 0x2c1a, {1, {0x2c4a}}},
- { 0x2c1b, {1, {0x2c4b}}},
- { 0x2c1c, {1, {0x2c4c}}},
- { 0x2c1d, {1, {0x2c4d}}},
- { 0x2c1e, {1, {0x2c4e}}},
- { 0x2c1f, {1, {0x2c4f}}},
- { 0x2c20, {1, {0x2c50}}},
- { 0x2c21, {1, {0x2c51}}},
- { 0x2c22, {1, {0x2c52}}},
- { 0x2c23, {1, {0x2c53}}},
- { 0x2c24, {1, {0x2c54}}},
- { 0x2c25, {1, {0x2c55}}},
- { 0x2c26, {1, {0x2c56}}},
- { 0x2c27, {1, {0x2c57}}},
- { 0x2c28, {1, {0x2c58}}},
- { 0x2c29, {1, {0x2c59}}},
- { 0x2c2a, {1, {0x2c5a}}},
- { 0x2c2b, {1, {0x2c5b}}},
- { 0x2c2c, {1, {0x2c5c}}},
- { 0x2c2d, {1, {0x2c5d}}},
- { 0x2c2e, {1, {0x2c5e}}},
- { 0x2c80, {1, {0x2c81}}},
- { 0x2c82, {1, {0x2c83}}},
- { 0x2c84, {1, {0x2c85}}},
- { 0x2c86, {1, {0x2c87}}},
- { 0x2c88, {1, {0x2c89}}},
- { 0x2c8a, {1, {0x2c8b}}},
- { 0x2c8c, {1, {0x2c8d}}},
- { 0x2c8e, {1, {0x2c8f}}},
- { 0x2c90, {1, {0x2c91}}},
- { 0x2c92, {1, {0x2c93}}},
- { 0x2c94, {1, {0x2c95}}},
- { 0x2c96, {1, {0x2c97}}},
- { 0x2c98, {1, {0x2c99}}},
- { 0x2c9a, {1, {0x2c9b}}},
- { 0x2c9c, {1, {0x2c9d}}},
- { 0x2c9e, {1, {0x2c9f}}},
- { 0x2ca0, {1, {0x2ca1}}},
- { 0x2ca2, {1, {0x2ca3}}},
- { 0x2ca4, {1, {0x2ca5}}},
- { 0x2ca6, {1, {0x2ca7}}},
- { 0x2ca8, {1, {0x2ca9}}},
- { 0x2caa, {1, {0x2cab}}},
- { 0x2cac, {1, {0x2cad}}},
- { 0x2cae, {1, {0x2caf}}},
- { 0x2cb0, {1, {0x2cb1}}},
- { 0x2cb2, {1, {0x2cb3}}},
- { 0x2cb4, {1, {0x2cb5}}},
- { 0x2cb6, {1, {0x2cb7}}},
- { 0x2cb8, {1, {0x2cb9}}},
- { 0x2cba, {1, {0x2cbb}}},
- { 0x2cbc, {1, {0x2cbd}}},
- { 0x2cbe, {1, {0x2cbf}}},
- { 0x2cc0, {1, {0x2cc1}}},
- { 0x2cc2, {1, {0x2cc3}}},
- { 0x2cc4, {1, {0x2cc5}}},
- { 0x2cc6, {1, {0x2cc7}}},
- { 0x2cc8, {1, {0x2cc9}}},
- { 0x2cca, {1, {0x2ccb}}},
- { 0x2ccc, {1, {0x2ccd}}},
- { 0x2cce, {1, {0x2ccf}}},
- { 0x2cd0, {1, {0x2cd1}}},
- { 0x2cd2, {1, {0x2cd3}}},
- { 0x2cd4, {1, {0x2cd5}}},
- { 0x2cd6, {1, {0x2cd7}}},
- { 0x2cd8, {1, {0x2cd9}}},
- { 0x2cda, {1, {0x2cdb}}},
- { 0x2cdc, {1, {0x2cdd}}},
- { 0x2cde, {1, {0x2cdf}}},
- { 0x2ce0, {1, {0x2ce1}}},
- { 0x2ce2, {1, {0x2ce3}}},
- { 0xfb00, {2, {0x0066, 0x0066}}},
- { 0xfb01, {2, {0x0066, 0x0069}}},
- { 0xfb02, {2, {0x0066, 0x006c}}},
- { 0xfb03, {3, {0x0066, 0x0066, 0x0069}}},
- { 0xfb04, {3, {0x0066, 0x0066, 0x006c}}},
- { 0xfb05, {2, {0x0073, 0x0074}}},
- { 0xfb06, {2, {0x0073, 0x0074}}},
- { 0xfb13, {2, {0x0574, 0x0576}}},
- { 0xfb14, {2, {0x0574, 0x0565}}},
- { 0xfb15, {2, {0x0574, 0x056b}}},
- { 0xfb16, {2, {0x057e, 0x0576}}},
- { 0xfb17, {2, {0x0574, 0x056d}}},
- { 0xff21, {1, {0xff41}}},
- { 0xff22, {1, {0xff42}}},
- { 0xff23, {1, {0xff43}}},
- { 0xff24, {1, {0xff44}}},
- { 0xff25, {1, {0xff45}}},
- { 0xff26, {1, {0xff46}}},
- { 0xff27, {1, {0xff47}}},
- { 0xff28, {1, {0xff48}}},
- { 0xff29, {1, {0xff49}}},
- { 0xff2a, {1, {0xff4a}}},
- { 0xff2b, {1, {0xff4b}}},
- { 0xff2c, {1, {0xff4c}}},
- { 0xff2d, {1, {0xff4d}}},
- { 0xff2e, {1, {0xff4e}}},
- { 0xff2f, {1, {0xff4f}}},
- { 0xff30, {1, {0xff50}}},
- { 0xff31, {1, {0xff51}}},
- { 0xff32, {1, {0xff52}}},
- { 0xff33, {1, {0xff53}}},
- { 0xff34, {1, {0xff54}}},
- { 0xff35, {1, {0xff55}}},
- { 0xff36, {1, {0xff56}}},
- { 0xff37, {1, {0xff57}}},
- { 0xff38, {1, {0xff58}}},
- { 0xff39, {1, {0xff59}}},
- { 0xff3a, {1, {0xff5a}}},
- { 0x10400, {1, {0x10428}}},
- { 0x10401, {1, {0x10429}}},
- { 0x10402, {1, {0x1042a}}},
- { 0x10403, {1, {0x1042b}}},
- { 0x10404, {1, {0x1042c}}},
- { 0x10405, {1, {0x1042d}}},
- { 0x10406, {1, {0x1042e}}},
- { 0x10407, {1, {0x1042f}}},
- { 0x10408, {1, {0x10430}}},
- { 0x10409, {1, {0x10431}}},
- { 0x1040a, {1, {0x10432}}},
- { 0x1040b, {1, {0x10433}}},
- { 0x1040c, {1, {0x10434}}},
- { 0x1040d, {1, {0x10435}}},
- { 0x1040e, {1, {0x10436}}},
- { 0x1040f, {1, {0x10437}}},
- { 0x10410, {1, {0x10438}}},
- { 0x10411, {1, {0x10439}}},
- { 0x10412, {1, {0x1043a}}},
- { 0x10413, {1, {0x1043b}}},
- { 0x10414, {1, {0x1043c}}},
- { 0x10415, {1, {0x1043d}}},
- { 0x10416, {1, {0x1043e}}},
- { 0x10417, {1, {0x1043f}}},
- { 0x10418, {1, {0x10440}}},
- { 0x10419, {1, {0x10441}}},
- { 0x1041a, {1, {0x10442}}},
- { 0x1041b, {1, {0x10443}}},
- { 0x1041c, {1, {0x10444}}},
- { 0x1041d, {1, {0x10445}}},
- { 0x1041e, {1, {0x10446}}},
- { 0x1041f, {1, {0x10447}}},
- { 0x10420, {1, {0x10448}}},
- { 0x10421, {1, {0x10449}}},
- { 0x10422, {1, {0x1044a}}},
- { 0x10423, {1, {0x1044b}}},
- { 0x10424, {1, {0x1044c}}},
- { 0x10425, {1, {0x1044d}}},
- { 0x10426, {1, {0x1044e}}},
- { 0x10427, {1, {0x1044f}}}
-};
-
-static const CaseFold_11_Type CaseFold_Locale[] = {
- { 0x0049, {1, {0x0069}}},
- { 0x0130, {2, {0x0069, 0x0307}}}
-};
+static inline int
+bits_of(const OnigCodePoint c, const int n)
+{
+  return (c >> (2 - n) * 7) & 127;
+}
 
-static const CaseUnfold_11_Type CaseUnfold_11[] = {
- { 0x0061, {1, {0x0041 }}},
- { 0x0062, {1, {0x0042 }}},
- { 0x0063, {1, {0x0043 }}},
- { 0x0064, {1, {0x0044 }}},
- { 0x0065, {1, {0x0045 }}},
- { 0x0066, {1, {0x0046 }}},
- { 0x0067, {1, {0x0047 }}},
- { 0x0068, {1, {0x0048 }}},
- { 0x006a, {1, {0x004a }}},
- { 0x006b, {2, {0x212a, 0x004b }}},
- { 0x006c, {1, {0x004c }}},
- { 0x006d, {1, {0x004d }}},
- { 0x006e, {1, {0x004e }}},
- { 0x006f, {1, {0x004f }}},
- { 0x0070, {1, {0x0050 }}},
- { 0x0071, {1, {0x0051 }}},
- { 0x0072, {1, {0x0052 }}},
- { 0x0073, {2, {0x0053, 0x017f }}},
- { 0x0074, {1, {0x0054 }}},
- { 0x0075, {1, {0x0055 }}},
- { 0x0076, {1, {0x0056 }}},
- { 0x0077, {1, {0x0057 }}},
- { 0x0078, {1, {0x0058 }}},
- { 0x0079, {1, {0x0059 }}},
- { 0x007a, {1, {0x005a }}},
- { 0x00e0, {1, {0x00c0 }}},
- { 0x00e1, {1, {0x00c1 }}},
- { 0x00e2, {1, {0x00c2 }}},
- { 0x00e3, {1, {0x00c3 }}},
- { 0x00e4, {1, {0x00c4 }}},
- { 0x00e5, {2, {0x212b, 0x00c5 }}},
- { 0x00e6, {1, {0x00c6 }}},
- { 0x00e7, {1, {0x00c7 }}},
- { 0x00e8, {1, {0x00c8 }}},
- { 0x00e9, {1, {0x00c9 }}},
- { 0x00ea, {1, {0x00ca }}},
- { 0x00eb, {1, {0x00cb }}},
- { 0x00ec, {1, {0x00cc }}},
- { 0x00ed, {1, {0x00cd }}},
- { 0x00ee, {1, {0x00ce }}},
- { 0x00ef, {1, {0x00cf }}},
- { 0x00f0, {1, {0x00d0 }}},
- { 0x00f1, {1, {0x00d1 }}},
- { 0x00f2, {1, {0x00d2 }}},
- { 0x00f3, {1, {0x00d3 }}},
- { 0x00f4, {1, {0x00d4 }}},
- { 0x00f5, {1, {0x00d5 }}},
- { 0x00f6, {1, {0x00d6 }}},
- { 0x00f8, {1, {0x00d8 }}},
- { 0x00f9, {1, {0x00d9 }}},
- { 0x00fa, {1, {0x00da }}},
- { 0x00fb, {1, {0x00db }}},
- { 0x00fc, {1, {0x00dc }}},
- { 0x00fd, {1, {0x00dd }}},
- { 0x00fe, {1, {0x00de }}},
- { 0x00ff, {1, {0x0178 }}},
- { 0x0101, {1, {0x0100 }}},
- { 0x0103, {1, {0x0102 }}},
- { 0x0105, {1, {0x0104 }}},
- { 0x0107, {1, {0x0106 }}},
- { 0x0109, {1, {0x0108 }}},
- { 0x010b, {1, {0x010a }}},
- { 0x010d, {1, {0x010c }}},
- { 0x010f, {1, {0x010e }}},
- { 0x0111, {1, {0x0110 }}},
- { 0x0113, {1, {0x0112 }}},
- { 0x0115, {1, {0x0114 }}},
- { 0x0117, {1, {0x0116 }}},
- { 0x0119, {1, {0x0118 }}},
- { 0x011b, {1, {0x011a }}},
- { 0x011d, {1, {0x011c }}},
- { 0x011f, {1, {0x011e }}},
- { 0x0121, {1, {0x0120 }}},
- { 0x0123, {1, {0x0122 }}},
- { 0x0125, {1, {0x0124 }}},
- { 0x0127, {1, {0x0126 }}},
- { 0x0129, {1, {0x0128 }}},
- { 0x012b, {1, {0x012a }}},
- { 0x012d, {1, {0x012c }}},
- { 0x012f, {1, {0x012e }}},
- { 0x0133, {1, {0x0132 }}},
- { 0x0135, {1, {0x0134 }}},
- { 0x0137, {1, {0x0136 }}},
- { 0x013a, {1, {0x0139 }}},
- { 0x013c, {1, {0x013b }}},
- { 0x013e, {1, {0x013d }}},
- { 0x0140, {1, {0x013f }}},
- { 0x0142, {1, {0x0141 }}},
- { 0x0144, {1, {0x0143 }}},
- { 0x0146, {1, {0x0145 }}},
- { 0x0148, {1, {0x0147 }}},
- { 0x014b, {1, {0x014a }}},
- { 0x014d, {1, {0x014c }}},
- { 0x014f, {1, {0x014e }}},
- { 0x0151, {1, {0x0150 }}},
- { 0x0153, {1, {0x0152 }}},
- { 0x0155, {1, {0x0154 }}},
- { 0x0157, {1, {0x0156 }}},
- { 0x0159, {1, {0x0158 }}},
- { 0x015b, {1, {0x015a }}},
- { 0x015d, {1, {0x015c }}},
- { 0x015f, {1, {0x015e }}},
- { 0x0161, {1, {0x0160 }}},
- { 0x0163, {1, {0x0162 }}},
- { 0x0165, {1, {0x0164 }}},
- { 0x0167, {1, {0x0166 }}},
- { 0x0169, {1, {0x0168 }}},
- { 0x016b, {1, {0x016a }}},
- { 0x016d, {1, {0x016c }}},
- { 0x016f, {1, {0x016e }}},
- { 0x0171, {1, {0x0170 }}},
- { 0x0173, {1, {0x0172 }}},
- { 0x0175, {1, {0x0174 }}},
- { 0x0177, {1, {0x0176 }}},
- { 0x017a, {1, {0x0179 }}},
- { 0x017c, {1, {0x017b }}},
- { 0x017e, {1, {0x017d }}},
- { 0x0183, {1, {0x0182 }}},
- { 0x0185, {1, {0x0184 }}},
- { 0x0188, {1, {0x0187 }}},
- { 0x018c, {1, {0x018b }}},
- { 0x0192, {1, {0x0191 }}},
- { 0x0195, {1, {0x01f6 }}},
- { 0x0199, {1, {0x0198 }}},
- { 0x019a, {1, {0x023d }}},
- { 0x019e, {1, {0x0220 }}},
- { 0x01a1, {1, {0x01a0 }}},
- { 0x01a3, {1, {0x01a2 }}},
- { 0x01a5, {1, {0x01a4 }}},
- { 0x01a8, {1, {0x01a7 }}},
- { 0x01ad, {1, {0x01ac }}},
- { 0x01b0, {1, {0x01af }}},
- { 0x01b4, {1, {0x01b3 }}},
- { 0x01b6, {1, {0x01b5 }}},
- { 0x01b9, {1, {0x01b8 }}},
- { 0x01bd, {1, {0x01bc }}},
- { 0x01bf, {1, {0x01f7 }}},
- { 0x01c6, {2, {0x01c4, 0x01c5 }}},
- { 0x01c9, {2, {0x01c7, 0x01c8 }}},
- { 0x01cc, {2, {0x01ca, 0x01cb }}},
- { 0x01ce, {1, {0x01cd }}},
- { 0x01d0, {1, {0x01cf }}},
- { 0x01d2, {1, {0x01d1 }}},
- { 0x01d4, {1, {0x01d3 }}},
- { 0x01d6, {1, {0x01d5 }}},
- { 0x01d8, {1, {0x01d7 }}},
- { 0x01da, {1, {0x01d9 }}},
- { 0x01dc, {1, {0x01db }}},
- { 0x01dd, {1, {0x018e }}},
- { 0x01df, {1, {0x01de }}},
- { 0x01e1, {1, {0x01e0 }}},
- { 0x01e3, {1, {0x01e2 }}},
- { 0x01e5, {1, {0x01e4 }}},
- { 0x01e7, {1, {0x01e6 }}},
- { 0x01e9, {1, {0x01e8 }}},
- { 0x01eb, {1, {0x01ea }}},
- { 0x01ed, {1, {0x01ec }}},
- { 0x01ef, {1, {0x01ee }}},
- { 0x01f3, {2, {0x01f1, 0x01f2 }}},
- { 0x01f5, {1, {0x01f4 }}},
- { 0x01f9, {1, {0x01f8 }}},
- { 0x01fb, {1, {0x01fa }}},
- { 0x01fd, {1, {0x01fc }}},
- { 0x01ff, {1, {0x01fe }}},
- { 0x0201, {1, {0x0200 }}},
- { 0x0203, {1, {0x0202 }}},
- { 0x0205, {1, {0x0204 }}},
- { 0x0207, {1, {0x0206 }}},
- { 0x0209, {1, {0x0208 }}},
- { 0x020b, {1, {0x020a }}},
- { 0x020d, {1, {0x020c }}},
- { 0x020f, {1, {0x020e }}},
- { 0x0211, {1, {0x0210 }}},
- { 0x0213, {1, {0x0212 }}},
- { 0x0215, {1, {0x0214 }}},
- { 0x0217, {1, {0x0216 }}},
- { 0x0219, {1, {0x0218 }}},
- { 0x021b, {1, {0x021a }}},
- { 0x021d, {1, {0x021c }}},
- { 0x021f, {1, {0x021e }}},
- { 0x0223, {1, {0x0222 }}},
- { 0x0225, {1, {0x0224 }}},
- { 0x0227, {1, {0x0226 }}},
- { 0x0229, {1, {0x0228 }}},
- { 0x022b, {1, {0x022a }}},
- { 0x022d, {1, {0x022c }}},
- { 0x022f, {1, {0x022e }}},
- { 0x0231, {1, {0x0230 }}},
- { 0x0233, {1, {0x0232 }}},
- { 0x023c, {1, {0x023b }}},
- { 0x0253, {1, {0x0181 }}},
- { 0x0254, {1, {0x0186 }}},
- { 0x0256, {1, {0x0189 }}},
- { 0x0257, {1, {0x018a }}},
- { 0x0259, {1, {0x018f }}},
- { 0x025b, {1, {0x0190 }}},
- { 0x0260, {1, {0x0193 }}},
- { 0x0263, {1, {0x0194 }}},
- { 0x0268, {1, {0x0197 }}},
- { 0x0269, {1, {0x0196 }}},
- { 0x026f, {1, {0x019c }}},
- { 0x0272, {1, {0x019d }}},
- { 0x0275, {1, {0x019f }}},
- { 0x0280, {1, {0x01a6 }}},
- { 0x0283, {1, {0x01a9 }}},
- { 0x0288, {1, {0x01ae }}},
- { 0x028a, {1, {0x01b1 }}},
- { 0x028b, {1, {0x01b2 }}},
- { 0x0292, {1, {0x01b7 }}},
- { 0x0294, {1, {0x0241 }}},
- { 0x03ac, {1, {0x0386 }}},
- { 0x03ad, {1, {0x0388 }}},
- { 0x03ae, {1, {0x0389 }}},
- { 0x03af, {1, {0x038a }}},
- { 0x03b1, {1, {0x0391 }}},
- { 0x03b2, {2, {0x0392, 0x03d0 }}},
- { 0x03b3, {1, {0x0393 }}},
- { 0x03b4, {1, {0x0394 }}},
- { 0x03b5, {2, {0x03f5, 0x0395 }}},
- { 0x03b6, {1, {0x0396 }}},
- { 0x03b7, {1, {0x0397 }}},
- { 0x03b8, {3, {0x03f4, 0x0398, 0x03d1 }}},
- { 0x03b9, {3, {0x1fbe, 0x0399, 0x0345 }}},
- { 0x03ba, {2, {0x03f0, 0x039a }}},
- { 0x03bb, {1, {0x039b }}},
- { 0x03bc, {2, {0x00b5, 0x039c }}},
- { 0x03bd, {1, {0x039d }}},
- { 0x03be, {1, {0x039e }}},
- { 0x03bf, {1, {0x039f }}},
- { 0x03c0, {2, {0x03a0, 0x03d6 }}},
- { 0x03c1, {2, {0x03f1, 0x03a1 }}},
- { 0x03c3, {2, {0x03a3, 0x03c2 }}},
- { 0x03c4, {1, {0x03a4 }}},
- { 0x03c5, {1, {0x03a5 }}},
- { 0x03c6, {2, {0x03a6, 0x03d5 }}},
- { 0x03c7, {1, {0x03a7 }}},
- { 0x03c8, {1, {0x03a8 }}},
- { 0x03c9, {2, {0x03a9, 0x2126 }}},
- { 0x03ca, {1, {0x03aa }}},
- { 0x03cb, {1, {0x03ab }}},
- { 0x03cc, {1, {0x038c }}},
- { 0x03cd, {1, {0x038e }}},
- { 0x03ce, {1, {0x038f }}},
- { 0x03d9, {1, {0x03d8 }}},
- { 0x03db, {1, {0x03da }}},
- { 0x03dd, {1, {0x03dc }}},
- { 0x03df, {1, {0x03de }}},
- { 0x03e1, {1, {0x03e0 }}},
- { 0x03e3, {1, {0x03e2 }}},
- { 0x03e5, {1, {0x03e4 }}},
- { 0x03e7, {1, {0x03e6 }}},
- { 0x03e9, {1, {0x03e8 }}},
- { 0x03eb, {1, {0x03ea }}},
- { 0x03ed, {1, {0x03ec }}},
- { 0x03ef, {1, {0x03ee }}},
- { 0x03f2, {1, {0x03f9 }}},
- { 0x03f8, {1, {0x03f7 }}},
- { 0x03fb, {1, {0x03fa }}},
- { 0x0430, {1, {0x0410 }}},
- { 0x0431, {1, {0x0411 }}},
- { 0x0432, {1, {0x0412 }}},
- { 0x0433, {1, {0x0413 }}},
- { 0x0434, {1, {0x0414 }}},
- { 0x0435, {1, {0x0415 }}},
- { 0x0436, {1, {0x0416 }}},
- { 0x0437, {1, {0x0417 }}},
- { 0x0438, {1, {0x0418 }}},
- { 0x0439, {1, {0x0419 }}},
- { 0x043a, {1, {0x041a }}},
- { 0x043b, {1, {0x041b }}},
- { 0x043c, {1, {0x041c }}},
- { 0x043d, {1, {0x041d }}},
- { 0x043e, {1, {0x041e }}},
- { 0x043f, {1, {0x041f }}},
- { 0x0440, {1, {0x0420 }}},
- { 0x0441, {1, {0x0421 }}},
- { 0x0442, {1, {0x0422 }}},
- { 0x0443, {1, {0x0423 }}},
- { 0x0444, {1, {0x0424 }}},
- { 0x0445, {1, {0x0425 }}},
- { 0x0446, {1, {0x0426 }}},
- { 0x0447, {1, {0x0427 }}},
- { 0x0448, {1, {0x0428 }}},
- { 0x0449, {1, {0x0429 }}},
- { 0x044a, {1, {0x042a }}},
- { 0x044b, {1, {0x042b }}},
- { 0x044c, {1, {0x042c }}},
- { 0x044d, {1, {0x042d }}},
- { 0x044e, {1, {0x042e }}},
- { 0x044f, {1, {0x042f }}},
- { 0x0450, {1, {0x0400 }}},
- { 0x0451, {1, {0x0401 }}},
- { 0x0452, {1, {0x0402 }}},
- { 0x0453, {1, {0x0403 }}},
- { 0x0454, {1, {0x0404 }}},
- { 0x0455, {1, {0x0405 }}},
- { 0x0456, {1, {0x0406 }}},
- { 0x0457, {1, {0x0407 }}},
- { 0x0458, {1, {0x0408 }}},
- { 0x0459, {1, {0x0409 }}},
- { 0x045a, {1, {0x040a }}},
- { 0x045b, {1, {0x040b }}},
- { 0x045c, {1, {0x040c }}},
- { 0x045d, {1, {0x040d }}},
- { 0x045e, {1, {0x040e }}},
- { 0x045f, {1, {0x040f }}},
- { 0x0461, {1, {0x0460 }}},
- { 0x0463, {1, {0x0462 }}},
- { 0x0465, {1, {0x0464 }}},
- { 0x0467, {1, {0x0466 }}},
- { 0x0469, {1, {0x0468 }}},
- { 0x046b, {1, {0x046a }}},
- { 0x046d, {1, {0x046c }}},
- { 0x046f, {1, {0x046e }}},
- { 0x0471, {1, {0x0470 }}},
- { 0x0473, {1, {0x0472 }}},
- { 0x0475, {1, {0x0474 }}},
- { 0x0477, {1, {0x0476 }}},
- { 0x0479, {1, {0x0478 }}},
- { 0x047b, {1, {0x047a }}},
- { 0x047d, {1, {0x047c }}},
- { 0x047f, {1, {0x047e }}},
- { 0x0481, {1, {0x0480 }}},
- { 0x048b, {1, {0x048a }}},
- { 0x048d, {1, {0x048c }}},
- { 0x048f, {1, {0x048e }}},
- { 0x0491, {1, {0x0490 }}},
- { 0x0493, {1, {0x0492 }}},
- { 0x0495, {1, {0x0494 }}},
- { 0x0497, {1, {0x0496 }}},
- { 0x0499, {1, {0x0498 }}},
- { 0x049b, {1, {0x049a }}},
- { 0x049d, {1, {0x049c }}},
- { 0x049f, {1, {0x049e }}},
- { 0x04a1, {1, {0x04a0 }}},
- { 0x04a3, {1, {0x04a2 }}},
- { 0x04a5, {1, {0x04a4 }}},
- { 0x04a7, {1, {0x04a6 }}},
- { 0x04a9, {1, {0x04a8 }}},
- { 0x04ab, {1, {0x04aa }}},
- { 0x04ad, {1, {0x04ac }}},
- { 0x04af, {1, {0x04ae }}},
- { 0x04b1, {1, {0x04b0 }}},
- { 0x04b3, {1, {0x04b2 }}},
- { 0x04b5, {1, {0x04b4 }}},
- { 0x04b7, {1, {0x04b6 }}},
- { 0x04b9, {1, {0x04b8 }}},
- { 0x04bb, {1, {0x04ba }}},
- { 0x04bd, {1, {0x04bc }}},
- { 0x04bf, {1, {0x04be }}},
- { 0x04c2, {1, {0x04c1 }}},
- { 0x04c4, {1, {0x04c3 }}},
- { 0x04c6, {1, {0x04c5 }}},
- { 0x04c8, {1, {0x04c7 }}},
- { 0x04ca, {1, {0x04c9 }}},
- { 0x04cc, {1, {0x04cb }}},
- { 0x04ce, {1, {0x04cd }}},
- { 0x04d1, {1, {0x04d0 }}},
- { 0x04d3, {1, {0x04d2 }}},
- { 0x04d5, {1, {0x04d4 }}},
- { 0x04d7, {1, {0x04d6 }}},
- { 0x04d9, {1, {0x04d8 }}},
- { 0x04db, {1, {0x04da }}},
- { 0x04dd, {1, {0x04dc }}},
- { 0x04df, {1, {0x04de }}},
- { 0x04e1, {1, {0x04e0 }}},
- { 0x04e3, {1, {0x04e2 }}},
- { 0x04e5, {1, {0x04e4 }}},
- { 0x04e7, {1, {0x04e6 }}},
- { 0x04e9, {1, {0x04e8 }}},
- { 0x04eb, {1, {0x04ea }}},
- { 0x04ed, {1, {0x04ec }}},
- { 0x04ef, {1, {0x04ee }}},
- { 0x04f1, {1, {0x04f0 }}},
- { 0x04f3, {1, {0x04f2 }}},
- { 0x04f5, {1, {0x04f4 }}},
- { 0x04f7, {1, {0x04f6 }}},
- { 0x04f9, {1, {0x04f8 }}},
- { 0x0501, {1, {0x0500 }}},
- { 0x0503, {1, {0x0502 }}},
- { 0x0505, {1, {0x0504 }}},
- { 0x0507, {1, {0x0506 }}},
- { 0x0509, {1, {0x0508 }}},
- { 0x050b, {1, {0x050a }}},
- { 0x050d, {1, {0x050c }}},
- { 0x050f, {1, {0x050e }}},
- { 0x0561, {1, {0x0531 }}},
- { 0x0562, {1, {0x0532 }}},
- { 0x0563, {1, {0x0533 }}},
- { 0x0564, {1, {0x0534 }}},
- { 0x0565, {1, {0x0535 }}},
- { 0x0566, {1, {0x0536 }}},
- { 0x0567, {1, {0x0537 }}},
- { 0x0568, {1, {0x0538 }}},
- { 0x0569, {1, {0x0539 }}},
- { 0x056a, {1, {0x053a }}},
- { 0x056b, {1, {0x053b }}},
- { 0x056c, {1, {0x053c }}},
- { 0x056d, {1, {0x053d }}},
- { 0x056e, {1, {0x053e }}},
- { 0x056f, {1, {0x053f }}},
- { 0x0570, {1, {0x0540 }}},
- { 0x0571, {1, {0x0541 }}},
- { 0x0572, {1, {0x0542 }}},
- { 0x0573, {1, {0x0543 }}},
- { 0x0574, {1, {0x0544 }}},
- { 0x0575, {1, {0x0545 }}},
- { 0x0576, {1, {0x0546 }}},
- { 0x0577, {1, {0x0547 }}},
- { 0x0578, {1, {0x0548 }}},
- { 0x0579, {1, {0x0549 }}},
- { 0x057a, {1, {0x054a }}},
- { 0x057b, {1, {0x054b }}},
- { 0x057c, {1, {0x054c }}},
- { 0x057d, {1, {0x054d }}},
- { 0x057e, {1, {0x054e }}},
- { 0x057f, {1, {0x054f }}},
- { 0x0580, {1, {0x0550 }}},
- { 0x0581, {1, {0x0551 }}},
- { 0x0582, {1, {0x0552 }}},
- { 0x0583, {1, {0x0553 }}},
- { 0x0584, {1, {0x0554 }}},
- { 0x0585, {1, {0x0555 }}},
- { 0x0586, {1, {0x0556 }}},
- { 0x1e01, {1, {0x1e00 }}},
- { 0x1e03, {1, {0x1e02 }}},
- { 0x1e05, {1, {0x1e04 }}},
- { 0x1e07, {1, {0x1e06 }}},
- { 0x1e09, {1, {0x1e08 }}},
- { 0x1e0b, {1, {0x1e0a }}},
- { 0x1e0d, {1, {0x1e0c }}},
- { 0x1e0f, {1, {0x1e0e }}},
- { 0x1e11, {1, {0x1e10 }}},
- { 0x1e13, {1, {0x1e12 }}},
- { 0x1e15, {1, {0x1e14 }}},
- { 0x1e17, {1, {0x1e16 }}},
- { 0x1e19, {1, {0x1e18 }}},
- { 0x1e1b, {1, {0x1e1a }}},
- { 0x1e1d, {1, {0x1e1c }}},
- { 0x1e1f, {1, {0x1e1e }}},
- { 0x1e21, {1, {0x1e20 }}},
- { 0x1e23, {1, {0x1e22 }}},
- { 0x1e25, {1, {0x1e24 }}},
- { 0x1e27, {1, {0x1e26 }}},
- { 0x1e29, {1, {0x1e28 }}},
- { 0x1e2b, {1, {0x1e2a }}},
- { 0x1e2d, {1, {0x1e2c }}},
- { 0x1e2f, {1, {0x1e2e }}},
- { 0x1e31, {1, {0x1e30 }}},
- { 0x1e33, {1, {0x1e32 }}},
- { 0x1e35, {1, {0x1e34 }}},
- { 0x1e37, {1, {0x1e36 }}},
- { 0x1e39, {1, {0x1e38 }}},
- { 0x1e3b, {1, {0x1e3a }}},
- { 0x1e3d, {1, {0x1e3c }}},
- { 0x1e3f, {1, {0x1e3e }}},
- { 0x1e41, {1, {0x1e40 }}},
- { 0x1e43, {1, {0x1e42 }}},
- { 0x1e45, {1, {0x1e44 }}},
- { 0x1e47, {1, {0x1e46 }}},
- { 0x1e49, {1, {0x1e48 }}},
- { 0x1e4b, {1, {0x1e4a }}},
- { 0x1e4d, {1, {0x1e4c }}},
- { 0x1e4f, {1, {0x1e4e }}},
- { 0x1e51, {1, {0x1e50 }}},
- { 0x1e53, {1, {0x1e52 }}},
- { 0x1e55, {1, {0x1e54 }}},
- { 0x1e57, {1, {0x1e56 }}},
- { 0x1e59, {1, {0x1e58 }}},
- { 0x1e5b, {1, {0x1e5a }}},
- { 0x1e5d, {1, {0x1e5c }}},
- { 0x1e5f, {1, {0x1e5e }}},
- { 0x1e61, {2, {0x1e9b, 0x1e60 }}},
- { 0x1e63, {1, {0x1e62 }}},
- { 0x1e65, {1, {0x1e64 }}},
- { 0x1e67, {1, {0x1e66 }}},
- { 0x1e69, {1, {0x1e68 }}},
- { 0x1e6b, {1, {0x1e6a }}},
- { 0x1e6d, {1, {0x1e6c }}},
- { 0x1e6f, {1, {0x1e6e }}},
- { 0x1e71, {1, {0x1e70 }}},
- { 0x1e73, {1, {0x1e72 }}},
- { 0x1e75, {1, {0x1e74 }}},
- { 0x1e77, {1, {0x1e76 }}},
- { 0x1e79, {1, {0x1e78 }}},
- { 0x1e7b, {1, {0x1e7a }}},
- { 0x1e7d, {1, {0x1e7c }}},
- { 0x1e7f, {1, {0x1e7e }}},
- { 0x1e81, {1, {0x1e80 }}},
- { 0x1e83, {1, {0x1e82 }}},
- { 0x1e85, {1, {0x1e84 }}},
- { 0x1e87, {1, {0x1e86 }}},
- { 0x1e89, {1, {0x1e88 }}},
- { 0x1e8b, {1, {0x1e8a }}},
- { 0x1e8d, {1, {0x1e8c }}},
- { 0x1e8f, {1, {0x1e8e }}},
- { 0x1e91, {1, {0x1e90 }}},
- { 0x1e93, {1, {0x1e92 }}},
- { 0x1e95, {1, {0x1e94 }}},
- { 0x1ea1, {1, {0x1ea0 }}},
- { 0x1ea3, {1, {0x1ea2 }}},
- { 0x1ea5, {1, {0x1ea4 }}},
- { 0x1ea7, {1, {0x1ea6 }}},
- { 0x1ea9, {1, {0x1ea8 }}},
- { 0x1eab, {1, {0x1eaa }}},
- { 0x1ead, {1, {0x1eac }}},
- { 0x1eaf, {1, {0x1eae }}},
- { 0x1eb1, {1, {0x1eb0 }}},
- { 0x1eb3, {1, {0x1eb2 }}},
- { 0x1eb5, {1, {0x1eb4 }}},
- { 0x1eb7, {1, {0x1eb6 }}},
- { 0x1eb9, {1, {0x1eb8 }}},
- { 0x1ebb, {1, {0x1eba }}},
- { 0x1ebd, {1, {0x1ebc }}},
- { 0x1ebf, {1, {0x1ebe }}},
- { 0x1ec1, {1, {0x1ec0 }}},
- { 0x1ec3, {1, {0x1ec2 }}},
- { 0x1ec5, {1, {0x1ec4 }}},
- { 0x1ec7, {1, {0x1ec6 }}},
- { 0x1ec9, {1, {0x1ec8 }}},
- { 0x1ecb, {1, {0x1eca }}},
- { 0x1ecd, {1, {0x1ecc }}},
- { 0x1ecf, {1, {0x1ece }}},
- { 0x1ed1, {1, {0x1ed0 }}},
- { 0x1ed3, {1, {0x1ed2 }}},
- { 0x1ed5, {1, {0x1ed4 }}},
- { 0x1ed7, {1, {0x1ed6 }}},
- { 0x1ed9, {1, {0x1ed8 }}},
- { 0x1edb, {1, {0x1eda }}},
- { 0x1edd, {1, {0x1edc }}},
- { 0x1edf, {1, {0x1ede }}},
- { 0x1ee1, {1, {0x1ee0 }}},
- { 0x1ee3, {1, {0x1ee2 }}},
- { 0x1ee5, {1, {0x1ee4 }}},
- { 0x1ee7, {1, {0x1ee6 }}},
- { 0x1ee9, {1, {0x1ee8 }}},
- { 0x1eeb, {1, {0x1eea }}},
- { 0x1eed, {1, {0x1eec }}},
- { 0x1eef, {1, {0x1eee }}},
- { 0x1ef1, {1, {0x1ef0 }}},
- { 0x1ef3, {1, {0x1ef2 }}},
- { 0x1ef5, {1, {0x1ef4 }}},
- { 0x1ef7, {1, {0x1ef6 }}},
- { 0x1ef9, {1, {0x1ef8 }}},
- { 0x1f00, {1, {0x1f08 }}},
- { 0x1f01, {1, {0x1f09 }}},
- { 0x1f02, {1, {0x1f0a }}},
- { 0x1f03, {1, {0x1f0b }}},
- { 0x1f04, {1, {0x1f0c }}},
- { 0x1f05, {1, {0x1f0d }}},
- { 0x1f06, {1, {0x1f0e }}},
- { 0x1f07, {1, {0x1f0f }}},
- { 0x1f10, {1, {0x1f18 }}},
- { 0x1f11, {1, {0x1f19 }}},
- { 0x1f12, {1, {0x1f1a }}},
- { 0x1f13, {1, {0x1f1b }}},
- { 0x1f14, {1, {0x1f1c }}},
- { 0x1f15, {1, {0x1f1d }}},
- { 0x1f20, {1, {0x1f28 }}},
- { 0x1f21, {1, {0x1f29 }}},
- { 0x1f22, {1, {0x1f2a }}},
- { 0x1f23, {1, {0x1f2b }}},
- { 0x1f24, {1, {0x1f2c }}},
- { 0x1f25, {1, {0x1f2d }}},
- { 0x1f26, {1, {0x1f2e }}},
- { 0x1f27, {1, {0x1f2f }}},
- { 0x1f30, {1, {0x1f38 }}},
- { 0x1f31, {1, {0x1f39 }}},
- { 0x1f32, {1, {0x1f3a }}},
- { 0x1f33, {1, {0x1f3b }}},
- { 0x1f34, {1, {0x1f3c }}},
- { 0x1f35, {1, {0x1f3d }}},
- { 0x1f36, {1, {0x1f3e }}},
- { 0x1f37, {1, {0x1f3f }}},
- { 0x1f40, {1, {0x1f48 }}},
- { 0x1f41, {1, {0x1f49 }}},
- { 0x1f42, {1, {0x1f4a }}},
- { 0x1f43, {1, {0x1f4b }}},
- { 0x1f44, {1, {0x1f4c }}},
- { 0x1f45, {1, {0x1f4d }}},
- { 0x1f51, {1, {0x1f59 }}},
- { 0x1f53, {1, {0x1f5b }}},
- { 0x1f55, {1, {0x1f5d }}},
- { 0x1f57, {1, {0x1f5f }}},
- { 0x1f60, {1, {0x1f68 }}},
- { 0x1f61, {1, {0x1f69 }}},
- { 0x1f62, {1, {0x1f6a }}},
- { 0x1f63, {1, {0x1f6b }}},
- { 0x1f64, {1, {0x1f6c }}},
- { 0x1f65, {1, {0x1f6d }}},
- { 0x1f66, {1, {0x1f6e }}},
- { 0x1f67, {1, {0x1f6f }}},
- { 0x1f70, {1, {0x1fba }}},
- { 0x1f71, {1, {0x1fbb }}},
- { 0x1f72, {1, {0x1fc8 }}},
- { 0x1f73, {1, {0x1fc9 }}},
- { 0x1f74, {1, {0x1fca }}},
- { 0x1f75, {1, {0x1fcb }}},
- { 0x1f76, {1, {0x1fda }}},
- { 0x1f77, {1, {0x1fdb }}},
- { 0x1f78, {1, {0x1ff8 }}},
- { 0x1f79, {1, {0x1ff9 }}},
- { 0x1f7a, {1, {0x1fea }}},
- { 0x1f7b, {1, {0x1feb }}},
- { 0x1f7c, {1, {0x1ffa }}},
- { 0x1f7d, {1, {0x1ffb }}},
- { 0x1fb0, {1, {0x1fb8 }}},
- { 0x1fb1, {1, {0x1fb9 }}},
- { 0x1fd0, {1, {0x1fd8 }}},
- { 0x1fd1, {1, {0x1fd9 }}},
- { 0x1fe0, {1, {0x1fe8 }}},
- { 0x1fe1, {1, {0x1fe9 }}},
- { 0x1fe5, {1, {0x1fec }}},
- { 0x2170, {1, {0x2160 }}},
- { 0x2171, {1, {0x2161 }}},
- { 0x2172, {1, {0x2162 }}},
- { 0x2173, {1, {0x2163 }}},
- { 0x2174, {1, {0x2164 }}},
- { 0x2175, {1, {0x2165 }}},
- { 0x2176, {1, {0x2166 }}},
- { 0x2177, {1, {0x2167 }}},
- { 0x2178, {1, {0x2168 }}},
- { 0x2179, {1, {0x2169 }}},
- { 0x217a, {1, {0x216a }}},
- { 0x217b, {1, {0x216b }}},
- { 0x217c, {1, {0x216c }}},
- { 0x217d, {1, {0x216d }}},
- { 0x217e, {1, {0x216e }}},
- { 0x217f, {1, {0x216f }}},
- { 0x24d0, {1, {0x24b6 }}},
- { 0x24d1, {1, {0x24b7 }}},
- { 0x24d2, {1, {0x24b8 }}},
- { 0x24d3, {1, {0x24b9 }}},
- { 0x24d4, {1, {0x24ba }}},
- { 0x24d5, {1, {0x24bb }}},
- { 0x24d6, {1, {0x24bc }}},
- { 0x24d7, {1, {0x24bd }}},
- { 0x24d8, {1, {0x24be }}},
- { 0x24d9, {1, {0x24bf }}},
- { 0x24da, {1, {0x24c0 }}},
- { 0x24db, {1, {0x24c1 }}},
- { 0x24dc, {1, {0x24c2 }}},
- { 0x24dd, {1, {0x24c3 }}},
- { 0x24de, {1, {0x24c4 }}},
- { 0x24df, {1, {0x24c5 }}},
- { 0x24e0, {1, {0x24c6 }}},
- { 0x24e1, {1, {0x24c7 }}},
- { 0x24e2, {1, {0x24c8 }}},
- { 0x24e3, {1, {0x24c9 }}},
- { 0x24e4, {1, {0x24ca }}},
- { 0x24e5, {1, {0x24cb }}},
- { 0x24e6, {1, {0x24cc }}},
- { 0x24e7, {1, {0x24cd }}},
- { 0x24e8, {1, {0x24ce }}},
- { 0x24e9, {1, {0x24cf }}},
- { 0x2c30, {1, {0x2c00 }}},
- { 0x2c31, {1, {0x2c01 }}},
- { 0x2c32, {1, {0x2c02 }}},
- { 0x2c33, {1, {0x2c03 }}},
- { 0x2c34, {1, {0x2c04 }}},
- { 0x2c35, {1, {0x2c05 }}},
- { 0x2c36, {1, {0x2c06 }}},
- { 0x2c37, {1, {0x2c07 }}},
- { 0x2c38, {1, {0x2c08 }}},
- { 0x2c39, {1, {0x2c09 }}},
- { 0x2c3a, {1, {0x2c0a }}},
- { 0x2c3b, {1, {0x2c0b }}},
- { 0x2c3c, {1, {0x2c0c }}},
- { 0x2c3d, {1, {0x2c0d }}},
- { 0x2c3e, {1, {0x2c0e }}},
- { 0x2c3f, {1, {0x2c0f }}},
- { 0x2c40, {1, {0x2c10 }}},
- { 0x2c41, {1, {0x2c11 }}},
- { 0x2c42, {1, {0x2c12 }}},
- { 0x2c43, {1, {0x2c13 }}},
- { 0x2c44, {1, {0x2c14 }}},
- { 0x2c45, {1, {0x2c15 }}},
- { 0x2c46, {1, {0x2c16 }}},
- { 0x2c47, {1, {0x2c17 }}},
- { 0x2c48, {1, {0x2c18 }}},
- { 0x2c49, {1, {0x2c19 }}},
- { 0x2c4a, {1, {0x2c1a }}},
- { 0x2c4b, {1, {0x2c1b }}},
- { 0x2c4c, {1, {0x2c1c }}},
- { 0x2c4d, {1, {0x2c1d }}},
- { 0x2c4e, {1, {0x2c1e }}},
- { 0x2c4f, {1, {0x2c1f }}},
- { 0x2c50, {1, {0x2c20 }}},
- { 0x2c51, {1, {0x2c21 }}},
- { 0x2c52, {1, {0x2c22 }}},
- { 0x2c53, {1, {0x2c23 }}},
- { 0x2c54, {1, {0x2c24 }}},
- { 0x2c55, {1, {0x2c25 }}},
- { 0x2c56, {1, {0x2c26 }}},
- { 0x2c57, {1, {0x2c27 }}},
- { 0x2c58, {1, {0x2c28 }}},
- { 0x2c59, {1, {0x2c29 }}},
- { 0x2c5a, {1, {0x2c2a }}},
- { 0x2c5b, {1, {0x2c2b }}},
- { 0x2c5c, {1, {0x2c2c }}},
- { 0x2c5d, {1, {0x2c2d }}},
- { 0x2c5e, {1, {0x2c2e }}},
- { 0x2c81, {1, {0x2c80 }}},
- { 0x2c83, {1, {0x2c82 }}},
- { 0x2c85, {1, {0x2c84 }}},
- { 0x2c87, {1, {0x2c86 }}},
- { 0x2c89, {1, {0x2c88 }}},
- { 0x2c8b, {1, {0x2c8a }}},
- { 0x2c8d, {1, {0x2c8c }}},
- { 0x2c8f, {1, {0x2c8e }}},
- { 0x2c91, {1, {0x2c90 }}},
- { 0x2c93, {1, {0x2c92 }}},
- { 0x2c95, {1, {0x2c94 }}},
- { 0x2c97, {1, {0x2c96 }}},
- { 0x2c99, {1, {0x2c98 }}},
- { 0x2c9b, {1, {0x2c9a }}},
- { 0x2c9d, {1, {0x2c9c }}},
- { 0x2c9f, {1, {0x2c9e }}},
- { 0x2ca1, {1, {0x2ca0 }}},
- { 0x2ca3, {1, {0x2ca2 }}},
- { 0x2ca5, {1, {0x2ca4 }}},
- { 0x2ca7, {1, {0x2ca6 }}},
- { 0x2ca9, {1, {0x2ca8 }}},
- { 0x2cab, {1, {0x2caa }}},
- { 0x2cad, {1, {0x2cac }}},
- { 0x2caf, {1, {0x2cae }}},
- { 0x2cb1, {1, {0x2cb0 }}},
- { 0x2cb3, {1, {0x2cb2 }}},
- { 0x2cb5, {1, {0x2cb4 }}},
- { 0x2cb7, {1, {0x2cb6 }}},
- { 0x2cb9, {1, {0x2cb8 }}},
- { 0x2cbb, {1, {0x2cba }}},
- { 0x2cbd, {1, {0x2cbc }}},
- { 0x2cbf, {1, {0x2cbe }}},
- { 0x2cc1, {1, {0x2cc0 }}},
- { 0x2cc3, {1, {0x2cc2 }}},
- { 0x2cc5, {1, {0x2cc4 }}},
- { 0x2cc7, {1, {0x2cc6 }}},
- { 0x2cc9, {1, {0x2cc8 }}},
- { 0x2ccb, {1, {0x2cca }}},
- { 0x2ccd, {1, {0x2ccc }}},
- { 0x2ccf, {1, {0x2cce }}},
- { 0x2cd1, {1, {0x2cd0 }}},
- { 0x2cd3, {1, {0x2cd2 }}},
- { 0x2cd5, {1, {0x2cd4 }}},
- { 0x2cd7, {1, {0x2cd6 }}},
- { 0x2cd9, {1, {0x2cd8 }}},
- { 0x2cdb, {1, {0x2cda }}},
- { 0x2cdd, {1, {0x2cdc }}},
- { 0x2cdf, {1, {0x2cde }}},
- { 0x2ce1, {1, {0x2ce0 }}},
- { 0x2ce3, {1, {0x2ce2 }}},
- { 0x2d00, {1, {0x10a0 }}},
- { 0x2d01, {1, {0x10a1 }}},
- { 0x2d02, {1, {0x10a2 }}},
- { 0x2d03, {1, {0x10a3 }}},
- { 0x2d04, {1, {0x10a4 }}},
- { 0x2d05, {1, {0x10a5 }}},
- { 0x2d06, {1, {0x10a6 }}},
- { 0x2d07, {1, {0x10a7 }}},
- { 0x2d08, {1, {0x10a8 }}},
- { 0x2d09, {1, {0x10a9 }}},
- { 0x2d0a, {1, {0x10aa }}},
- { 0x2d0b, {1, {0x10ab }}},
- { 0x2d0c, {1, {0x10ac }}},
- { 0x2d0d, {1, {0x10ad }}},
- { 0x2d0e, {1, {0x10ae }}},
- { 0x2d0f, {1, {0x10af }}},
- { 0x2d10, {1, {0x10b0 }}},
- { 0x2d11, {1, {0x10b1 }}},
- { 0x2d12, {1, {0x10b2 }}},
- { 0x2d13, {1, {0x10b3 }}},
- { 0x2d14, {1, {0x10b4 }}},
- { 0x2d15, {1, {0x10b5 }}},
- { 0x2d16, {1, {0x10b6 }}},
- { 0x2d17, {1, {0x10b7 }}},
- { 0x2d18, {1, {0x10b8 }}},
- { 0x2d19, {1, {0x10b9 }}},
- { 0x2d1a, {1, {0x10ba }}},
- { 0x2d1b, {1, {0x10bb }}},
- { 0x2d1c, {1, {0x10bc }}},
- { 0x2d1d, {1, {0x10bd }}},
- { 0x2d1e, {1, {0x10be }}},
- { 0x2d1f, {1, {0x10bf }}},
- { 0x2d20, {1, {0x10c0 }}},
- { 0x2d21, {1, {0x10c1 }}},
- { 0x2d22, {1, {0x10c2 }}},
- { 0x2d23, {1, {0x10c3 }}},
- { 0x2d24, {1, {0x10c4 }}},
- { 0x2d25, {1, {0x10c5 }}},
- { 0xff41, {1, {0xff21 }}},
- { 0xff42, {1, {0xff22 }}},
- { 0xff43, {1, {0xff23 }}},
- { 0xff44, {1, {0xff24 }}},
- { 0xff45, {1, {0xff25 }}},
- { 0xff46, {1, {0xff26 }}},
- { 0xff47, {1, {0xff27 }}},
- { 0xff48, {1, {0xff28 }}},
- { 0xff49, {1, {0xff29 }}},
- { 0xff4a, {1, {0xff2a }}},
- { 0xff4b, {1, {0xff2b }}},
- { 0xff4c, {1, {0xff2c }}},
- { 0xff4d, {1, {0xff2d }}},
- { 0xff4e, {1, {0xff2e }}},
- { 0xff4f, {1, {0xff2f }}},
- { 0xff50, {1, {0xff30 }}},
- { 0xff51, {1, {0xff31 }}},
- { 0xff52, {1, {0xff32 }}},
- { 0xff53, {1, {0xff33 }}},
- { 0xff54, {1, {0xff34 }}},
- { 0xff55, {1, {0xff35 }}},
- { 0xff56, {1, {0xff36 }}},
- { 0xff57, {1, {0xff37 }}},
- { 0xff58, {1, {0xff38 }}},
- { 0xff59, {1, {0xff39 }}},
- { 0xff5a, {1, {0xff3a }}},
- { 0x10428, {1, {0x10400 }}},
- { 0x10429, {1, {0x10401 }}},
- { 0x1042a, {1, {0x10402 }}},
- { 0x1042b, {1, {0x10403 }}},
- { 0x1042c, {1, {0x10404 }}},
- { 0x1042d, {1, {0x10405 }}},
- { 0x1042e, {1, {0x10406 }}},
- { 0x1042f, {1, {0x10407 }}},
- { 0x10430, {1, {0x10408 }}},
- { 0x10431, {1, {0x10409 }}},
- { 0x10432, {1, {0x1040a }}},
- { 0x10433, {1, {0x1040b }}},
- { 0x10434, {1, {0x1040c }}},
- { 0x10435, {1, {0x1040d }}},
- { 0x10436, {1, {0x1040e }}},
- { 0x10437, {1, {0x1040f }}},
- { 0x10438, {1, {0x10410 }}},
- { 0x10439, {1, {0x10411 }}},
- { 0x1043a, {1, {0x10412 }}},
- { 0x1043b, {1, {0x10413 }}},
- { 0x1043c, {1, {0x10414 }}},
- { 0x1043d, {1, {0x10415 }}},
- { 0x1043e, {1, {0x10416 }}},
- { 0x1043f, {1, {0x10417 }}},
- { 0x10440, {1, {0x10418 }}},
- { 0x10441, {1, {0x10419 }}},
- { 0x10442, {1, {0x1041a }}},
- { 0x10443, {1, {0x1041b }}},
- { 0x10444, {1, {0x1041c }}},
- { 0x10445, {1, {0x1041d }}},
- { 0x10446, {1, {0x1041e }}},
- { 0x10447, {1, {0x1041f }}},
- { 0x10448, {1, {0x10420 }}},
- { 0x10449, {1, {0x10421 }}},
- { 0x1044a, {1, {0x10422 }}},
- { 0x1044b, {1, {0x10423 }}},
- { 0x1044c, {1, {0x10424 }}},
- { 0x1044d, {1, {0x10425 }}},
- { 0x1044e, {1, {0x10426 }}},
- { 0x1044f, {1, {0x10427 }}}
-};
+static inline int
+bits_at(const OnigCodePoint *c, const int n)
+{
+  return bits_of(c[n / 3], n % 3);
+}
 
-static const CaseUnfold_11_Type CaseUnfold_11_Locale[] = {
- { 0x0069, {1, {0x0049 }}}
-};
+static int
+code1_equal(const OnigCodePoint x, const OnigCodePoint y)
+{
+  if (x != y) return 0;
+  return 1;
+}
 
-static const CaseUnfold_12_Type CaseUnfold_12[] = {
- { {0x0061, 0x02be}, {1, {0x1e9a }}},
- { {0x0066, 0x0066}, {1, {0xfb00 }}},
- { {0x0066, 0x0069}, {1, {0xfb01 }}},
- { {0x0066, 0x006c}, {1, {0xfb02 }}},
- { {0x0068, 0x0331}, {1, {0x1e96 }}},
- { {0x006a, 0x030c}, {1, {0x01f0 }}},
- { {0x0073, 0x0073}, {1, {0x00df }}},
- { {0x0073, 0x0074}, {2, {0xfb05, 0xfb06 }}},
- { {0x0074, 0x0308}, {1, {0x1e97 }}},
- { {0x0077, 0x030a}, {1, {0x1e98 }}},
- { {0x0079, 0x030a}, {1, {0x1e99 }}},
- { {0x02bc, 0x006e}, {1, {0x0149 }}},
- { {0x03ac, 0x03b9}, {1, {0x1fb4 }}},
- { {0x03ae, 0x03b9}, {1, {0x1fc4 }}},
- { {0x03b1, 0x0342}, {1, {0x1fb6 }}},
- { {0x03b1, 0x03b9}, {2, {0x1fb3, 0x1fbc }}},
- { {0x03b7, 0x0342}, {1, {0x1fc6 }}},
- { {0x03b7, 0x03b9}, {2, {0x1fc3, 0x1fcc }}},
- { {0x03b9, 0x0342}, {1, {0x1fd6 }}},
- { {0x03c1, 0x0313}, {1, {0x1fe4 }}},
- { {0x03c5, 0x0313}, {1, {0x1f50 }}},
- { {0x03c5, 0x0342}, {1, {0x1fe6 }}},
- { {0x03c9, 0x0342}, {1, {0x1ff6 }}},
- { {0x03c9, 0x03b9}, {2, {0x1ff3, 0x1ffc }}},
- { {0x03ce, 0x03b9}, {1, {0x1ff4 }}},
- { {0x0565, 0x0582}, {1, {0x0587 }}},
- { {0x0574, 0x0565}, {1, {0xfb14 }}},
- { {0x0574, 0x056b}, {1, {0xfb15 }}},
- { {0x0574, 0x056d}, {1, {0xfb17 }}},
- { {0x0574, 0x0576}, {1, {0xfb13 }}},
- { {0x057e, 0x0576}, {1, {0xfb16 }}},
- { {0x1f00, 0x03b9}, {2, {0x1f88, 0x1f80 }}},
- { {0x1f01, 0x03b9}, {2, {0x1f81, 0x1f89 }}},
- { {0x1f02, 0x03b9}, {2, {0x1f82, 0x1f8a }}},
- { {0x1f03, 0x03b9}, {2, {0x1f83, 0x1f8b }}},
- { {0x1f04, 0x03b9}, {2, {0x1f84, 0x1f8c }}},
- { {0x1f05, 0x03b9}, {2, {0x1f85, 0x1f8d }}},
- { {0x1f06, 0x03b9}, {2, {0x1f86, 0x1f8e }}},
- { {0x1f07, 0x03b9}, {2, {0x1f87, 0x1f8f }}},
- { {0x1f20, 0x03b9}, {2, {0x1f90, 0x1f98 }}},
- { {0x1f21, 0x03b9}, {2, {0x1f91, 0x1f99 }}},
- { {0x1f22, 0x03b9}, {2, {0x1f92, 0x1f9a }}},
- { {0x1f23, 0x03b9}, {2, {0x1f93, 0x1f9b }}},
- { {0x1f24, 0x03b9}, {2, {0x1f94, 0x1f9c }}},
- { {0x1f25, 0x03b9}, {2, {0x1f95, 0x1f9d }}},
- { {0x1f26, 0x03b9}, {2, {0x1f96, 0x1f9e }}},
- { {0x1f27, 0x03b9}, {2, {0x1f97, 0x1f9f }}},
- { {0x1f60, 0x03b9}, {2, {0x1fa0, 0x1fa8 }}},
- { {0x1f61, 0x03b9}, {2, {0x1fa1, 0x1fa9 }}},
- { {0x1f62, 0x03b9}, {2, {0x1fa2, 0x1faa }}},
- { {0x1f63, 0x03b9}, {2, {0x1fa3, 0x1fab }}},
- { {0x1f64, 0x03b9}, {2, {0x1fa4, 0x1fac }}},
- { {0x1f65, 0x03b9}, {2, {0x1fa5, 0x1fad }}},
- { {0x1f66, 0x03b9}, {2, {0x1fa6, 0x1fae }}},
- { {0x1f67, 0x03b9}, {2, {0x1fa7, 0x1faf }}},
- { {0x1f70, 0x03b9}, {1, {0x1fb2 }}},
- { {0x1f74, 0x03b9}, {1, {0x1fc2 }}},
- { {0x1f7c, 0x03b9}, {1, {0x1ff2 }}}
-};
+static int
+code2_equal(const OnigCodePoint *x, const OnigCodePoint *y)
+{
+  if (x[0] != y[0]) return 0;
+  if (x[1] != y[1]) return 0;
+  return 1;
+}
 
-static const CaseUnfold_12_Type CaseUnfold_12_Locale[] = {
- { {0x0069, 0x0307}, {1, {0x0130 }}}
-};
+static int
+code3_equal(const OnigCodePoint *x, const OnigCodePoint *y)
+{
+  if (x[0] != y[0]) return 0;
+  if (x[1] != y[1]) return 0;
+  if (x[2] != y[2]) return 0;
+  return 1;
+}
 
-static const CaseUnfold_13_Type CaseUnfold_13[] = {
- { {0x0066, 0x0066, 0x0069}, {1, {0xfb03 }}},
- { {0x0066, 0x0066, 0x006c}, {1, {0xfb04 }}},
- { {0x03b1, 0x0342, 0x03b9}, {1, {0x1fb7 }}},
- { {0x03b7, 0x0342, 0x03b9}, {1, {0x1fc7 }}},
- { {0x03b9, 0x0308, 0x0300}, {1, {0x1fd2 }}},
- { {0x03b9, 0x0308, 0x0301}, {2, {0x0390, 0x1fd3 }}},
- { {0x03b9, 0x0308, 0x0342}, {1, {0x1fd7 }}},
- { {0x03c5, 0x0308, 0x0300}, {1, {0x1fe2 }}},
- { {0x03c5, 0x0308, 0x0301}, {2, {0x03b0, 0x1fe3 }}},
- { {0x03c5, 0x0308, 0x0342}, {1, {0x1fe7 }}},
- { {0x03c5, 0x0313, 0x0300}, {1, {0x1f52 }}},
- { {0x03c5, 0x0313, 0x0301}, {1, {0x1f54 }}},
- { {0x03c5, 0x0313, 0x0342}, {1, {0x1f56 }}},
- { {0x03c9, 0x0342, 0x03b9}, {1, {0x1ff7 }}}
-};
+/* 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"
 
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
 #define CODE_RANGES_NUM numberof(CodeRanges)
 
 extern int
@@ -2072,23 +212,21 @@ onigenc_unicode_ctype_code_range(int ctype, const OnigCodePoint* ranges[])
 extern int
 onigenc_utf16_32_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
                                       const OnigCodePoint* ranges[],
-				      struct OnigEncodingTypeST* enc ARG_UNUSED)
+				      OnigEncoding enc ARG_UNUSED)
 {
   *sb_out = 0x00;
   return onigenc_unicode_ctype_code_range(ctype, ranges);
 }
 
-#include "ruby/st.h"
-
-#define PROPERTY_NAME_MAX_SIZE    MAX_WORD_LENGTH
+#define PROPERTY_NAME_MAX_SIZE    (MAX_WORD_LENGTH + 1)
 
 extern int
-onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end)
+onigenc_unicode_property_name_to_ctype(OnigEncoding enc, const UChar* name, const UChar* end)
 {
   int len;
   int ctype;
   UChar buf[PROPERTY_NAME_MAX_SIZE];
-  UChar *p;
+  const UChar *p;
   OnigCodePoint code;
 
   len = 0;
@@ -2099,7 +237,7 @@ onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end
     if (code >= 0x80)
       return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
 
-    buf[len++] = (UChar )TOLOWER((unsigned char)code);
+    buf[len++] = ONIGENC_ASCII_CODE_TO_LOWER_CASE(code);
     if (len >= PROPERTY_NAME_MAX_SIZE)
       return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
   }
@@ -2113,137 +251,44 @@ onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end
   return ctype;
 }
 
+#define onigenc_unicode_fold_lookup onigenc_unicode_CaseFold_11_lookup
+#define onigenc_unicode_unfold1_lookup onigenc_unicode_CaseUnfold_11_lookup
+#define onigenc_unicode_unfold2_lookup onigenc_unicode_CaseUnfold_12_lookup
+#define onigenc_unicode_unfold3_lookup onigenc_unicode_CaseUnfold_13_lookup
 
-static int
-code2_cmp(OnigCodePoint* x, OnigCodePoint* y)
-{
-  if (x[0] == y[0] && x[1] == y[1]) return 0;
-  return 1;
-}
-
-static st_index_t
-code2_hash(OnigCodePoint* x)
-{
-  return (st_index_t )(x[0] + x[1]);
-}
-
-static const struct st_hash_type type_code2_hash = {
-  code2_cmp,
-  code2_hash,
+enum {
+  I_WITH_DOT_ABOVE = 0x0130,
+  DOTLESS_i = 0x0131,
+  DOT_ABOVE = 0x0307
 };
 
-static int
-code3_cmp(OnigCodePoint* x, OnigCodePoint* y)
-{
-  if (x[0] == y[0] && x[1] == y[1] && x[2] == y[2]) return 0;
-  return 1;
-}
-
-static st_index_t
-code3_hash(OnigCodePoint* x)
-{
-  return (st_index_t )(x[0] + x[1] + x[2]);
-}
-
-static const struct st_hash_type type_code3_hash = {
-  code3_cmp,
-  code3_hash,
-};
-
-
-static st_table* FoldTable;    /* fold-1, fold-2, fold-3 */
-static st_table* Unfold1Table;
-static st_table* Unfold2Table;
-static st_table* Unfold3Table;
-static int CaseFoldInited = 0;
-
-static int init_case_fold_table(void)
-{
-  const CaseFold_11_Type   *p;
-  const CaseUnfold_11_Type *p1;
-  const CaseUnfold_12_Type *p2;
-  const CaseUnfold_13_Type *p3;
-  int i;
-
-  THREAD_ATOMIC_START;
-
-  FoldTable = st_init_numtable_with_size(1200);
-  if (ONIG_IS_NULL(FoldTable)) return ONIGERR_MEMORY;
-  for (i = 0; i < numberof(CaseFold); i++) {
-    p = &CaseFold[i];
-    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
-  }
-  for (i = 0; i < numberof(CaseFold_Locale); i++) {
-    p = &CaseFold_Locale[i];
-    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
-  }
-
-  Unfold1Table = st_init_numtable_with_size(1000);
-  if (ONIG_IS_NULL(Unfold1Table)) return ONIGERR_MEMORY;
-
-  for (i = 0; i < numberof(CaseUnfold_11); i++) {
-    p1 = &CaseUnfold_11[i];
-    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
-  }
-  for (i = 0; i < numberof(CaseUnfold_11_Locale); i++) {
-    p1 = &CaseUnfold_11_Locale[i];
-    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
-  }
-
-  Unfold2Table = st_init_table_with_size(&type_code2_hash, 200);
-  if (ONIG_IS_NULL(Unfold2Table)) return ONIGERR_MEMORY;
-
-  for (i = 0; i < numberof(CaseUnfold_12); i++) {
-    p2 = &CaseUnfold_12[i];
-    st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
-  }
-  for (i = 0; i < numberof(CaseUnfold_12_Locale); i++) {
-    p2 = &CaseUnfold_12_Locale[i];
-    st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
-  }
-
-  Unfold3Table = st_init_table_with_size(&type_code3_hash, 30);
-  if (ONIG_IS_NULL(Unfold3Table)) return ONIGERR_MEMORY;
-
-  for (i = 0; i < numberof(CaseUnfold_13); i++) {
-    p3 = &CaseUnfold_13[i];
-    st_add_direct(Unfold3Table, (st_data_t )p3->from, (st_data_t )(&p3->to));
-  }
-
-  CaseFoldInited = 1;
-  THREAD_ATOMIC_END;
-  return 0;
-}
-
 extern int
 onigenc_unicode_mbc_case_fold(OnigEncoding enc,
     OnigCaseFoldType flag ARG_UNUSED, const UChar** pp, const UChar* end,
     UChar* fold)
 {
-  CodePointList3 *to;
+  const CodePointList3 *to;
   OnigCodePoint code;
   int i, len, rlen;
   const UChar *p = *pp;
 
-  if (CaseFoldInited == 0) init_case_fold_table();
-
   code = ONIGENC_MBC_TO_CODE(enc, p, end);
   len = enclen(enc, p, end);
   *pp += len;
 
 #ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
   if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
-    if (code == 0x0049) {
-      return ONIGENC_CODE_TO_MBC(enc, 0x0131, fold);
+    if (code == 'I') {
+      return ONIGENC_CODE_TO_MBC(enc, DOTLESS_i, fold);
     }
-    else if (code == 0x0130) {
-      return ONIGENC_CODE_TO_MBC(enc, 0x0069, fold);
+    else if (code == I_WITH_DOT_ABOVE) {
+      return ONIGENC_CODE_TO_MBC(enc, 'i', fold);
     }
   }
 #endif
 
-  if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0) {
-    if (to->n == 1) {
+  if ((to = onigenc_unicode_fold_lookup(code)) != 0) {
+    if (OnigCodePointCount(to->n) == 1) {
       return ONIGENC_CODE_TO_MBC(enc, to->code[0], fold);
     }
 #if 0
@@ -2254,7 +299,7 @@ onigenc_unicode_mbc_case_fold(OnigEncoding enc,
 #endif
     {
       rlen = 0;
-      for (i = 0; i < to->n; i++) {
+      for (i = 0; i < OnigCodePointCount(to->n); i++) {
 	len = ONIGENC_CODE_TO_MBC(enc, to->code[i], fold);
 	fold += len;
 	rlen += len;
@@ -2278,11 +323,9 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
   OnigCodePoint code;
   int i, j, k, r;
 
-  /* if (CaseFoldInited == 0) init_case_fold_table(); */
-
   for (i = 0; i < numberof(CaseUnfold_11); i++) {
     p11 = &CaseUnfold_11[i];
-    for (j = 0; j < p11->to.n; j++) {
+    for (j = 0; j < OnigCodePointCount(p11->to.n); j++) {
       code = p11->from;
       r = (*f)(p11->to.code[j], &code, 1, arg);
       if (r != 0) return r;
@@ -2303,25 +346,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 = 0x0131;
-    r = (*f)(0x0049, &code, 1, arg);
+    code = DOTLESS_i;
+    r = (*f)('I', &code, 1, arg);
     if (r != 0) return r;
-    code = 0x0049;
-    r = (*f)(0x0131, &code, 1, arg);
+    code = 'I';
+    r = (*f)(DOTLESS_i, &code, 1, arg);
     if (r != 0) return r;
 
-    code = 0x0130;
-    r = (*f)(0x0069, &code, 1, arg);
+    code = I_WITH_DOT_ABOVE;
+    r = (*f)('i', &code, 1, arg);
     if (r != 0) return r;
-    code = 0x0069;
-    r = (*f)(0x0130, &code, 1, arg);
+    code = 'i';
+    r = (*f)(I_WITH_DOT_ABOVE, &code, 1, arg);
     if (r != 0) return r;
   }
   else {
 #endif
     for (i = 0; i < numberof(CaseUnfold_11_Locale); i++) {
       p11 = &CaseUnfold_11_Locale[i];
-      for (j = 0; j < p11->to.n; j++) {
+      for (j = 0; j < OnigCodePointCount(p11->to.n); j++) {
 	code = p11->from;
 	r = (*f)(p11->to.code[j], &code, 1, arg);
 	if (r != 0) return r;
@@ -2347,12 +390,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 < CaseUnfold_12[i].to.n; j++) {
+      for (j = 0; j < OnigCodePointCount(CaseUnfold_12[i].to.n); j++) {
 	r = (*f)(CaseUnfold_12[i].to.code[j],
 		 (OnigCodePoint* )CaseUnfold_12[i].from, 2, arg);
 	if (r != 0) return r;
 
-	for (k = 0; k < CaseUnfold_12[i].to.n; k++) {
+	for (k = 0; k < OnigCodePointCount(CaseUnfold_12[i].to.n); k++) {
 	  if (k == j) continue;
 
 	  r = (*f)(CaseUnfold_12[i].to.code[j],
@@ -2366,12 +409,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 < CaseUnfold_12_Locale[i].to.n; j++) {
+	for (j = 0; j < OnigCodePointCount(CaseUnfold_12_Locale[i].to.n); j++) {
 	  r = (*f)(CaseUnfold_12_Locale[i].to.code[j],
 		   (OnigCodePoint* )CaseUnfold_12_Locale[i].from, 2, arg);
 	  if (r != 0) return r;
 
-	  for (k = 0; k < CaseUnfold_12_Locale[i].to.n; k++) {
+	  for (k = 0; k < OnigCodePointCount(CaseUnfold_12_Locale[i].to.n); k++) {
 	    if (k == j) continue;
 
 	    r = (*f)(CaseUnfold_12_Locale[i].to.code[j],
@@ -2386,12 +429,12 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
 #endif
 
     for (i = 0; i < numberof(CaseUnfold_13); i++) {
-      for (j = 0; j < CaseUnfold_13[i].to.n; j++) {
+      for (j = 0; j < OnigCodePointCount(CaseUnfold_13[i].to.n); j++) {
 	r = (*f)(CaseUnfold_13[i].to.code[j],
 		 (OnigCodePoint* )CaseUnfold_13[i].from, 3, arg);
 	if (r != 0) return r;
 
-	for (k = 0; k < CaseUnfold_13[i].to.n; k++) {
+	for (k = 0; k < OnigCodePointCount(CaseUnfold_13[i].to.n); k++) {
 	  if (k == j) continue;
 
 	  r = (*f)(CaseUnfold_13[i].to.code[j],
@@ -2405,6 +448,8 @@ 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,
@@ -2412,10 +457,8 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 {
   int n, i, j, k, len;
   OnigCodePoint code, codes[3];
-  CodePointList3 *to, *z3;
-  CodePointList2 *z2;
-
-  if (CaseFoldInited == 0) init_case_fold_table();
+  const CodePointList3 *to, *z3;
+  const CodePointList2 *z2;
 
   n = 0;
 
@@ -2424,35 +467,33 @@ 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) {
-    if (code == 0x0049) {
+    switch (code) {
+    case 'I':
       items[0].byte_len = len;
       items[0].code_len = 1;
-      items[0].code[0]  = 0x0131;
+      items[0].code[0]  = DOTLESS_i;
       return 1;
-    }
-    else if (code == 0x0130) {
+    case I_WITH_DOT_ABOVE:
       items[0].byte_len = len;
       items[0].code_len = 1;
-      items[0].code[0]  = 0x0069;
+      items[0].code[0]  = 'i';
       return 1;
-    }
-    else if (code == 0x0131) {
+    case DOTLESS_i:
       items[0].byte_len = len;
       items[0].code_len = 1;
-      items[0].code[0]  = 0x0049;
+      items[0].code[0]  = 'I';
       return 1;
-    }
-    else if (code == 0x0069) {
+    case 'i':
       items[0].byte_len = len;
       items[0].code_len = 1;
-      items[0].code[0]  = 0x0130;
+      items[0].code[0]  = I_WITH_DOT_ABOVE;
       return 1;
     }
   }
 #endif
 
-  if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0) {
-    if (to->n == 1) {
+  if ((to = onigenc_unicode_fold_lookup(code)) != 0) {
+    if (OnigCodePointCount(to->n) == 1) {
       OnigCodePoint orig_code = code;
 
       items[0].byte_len = len;
@@ -2461,8 +502,9 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
       n++;
 
       code = to->code[0];
-      if (onig_st_lookup(Unfold1Table, (st_data_t )code, (void* )&to) != 0) {
-	for (i = 0; i < to->n; i++) {
+      if ((to = onigenc_unicode_unfold1_lookup(code)) != 0 &&
+	  CodePointListValidP(to)) {
+	for (i = 0; i < OnigCodePointCount(to->n); i++) {
 	  if (to->code[i] != orig_code) {
 	    items[n].byte_len = len;
 	    items[n].code_len = 1;
@@ -2476,14 +518,13 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
       OnigCodePoint cs[3][4];
       int fn, ncs[3];
 
-      for (fn = 0; fn < to->n; fn++) {
+      for (fn = 0; fn < OnigCodePointCount(to->n); fn++) {
 	cs[fn][0] = to->code[fn];
-	if (onig_st_lookup(Unfold1Table, (st_data_t )cs[fn][0],
-			   (void* )&z3) != 0) {
-	  for (i = 0; i < z3->n; i++) {
+	if ((z3 = onigenc_unicode_unfold1_lookup(cs[fn][0])) != 0) {
+	  for (i = 0; i < OnigCodePointCount(z3->n); i++) {
 	    cs[fn][i+1] = z3->code[i];
 	  }
-	  ncs[fn] = z3->n + 1;
+	  ncs[fn] = OnigCodePointCount(z3->n) + 1;
 	}
 	else
 	  ncs[fn] = 1;
@@ -2500,9 +541,9 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 	  }
 	}
 
-	if (onig_st_lookup(Unfold2Table, (st_data_t )to->code,
-			   (void* )&z2) != 0) {
-	  for (i = 0; i < z2->n; i++) {
+	if ((z2 = onigenc_unicode_unfold2_lookup(to->code)) != 0 &&
+	    CodePointListValidP(z2)) {
+	  for (i = 0; i < OnigCodePointCount(z2->n); i++) {
 	    if (z2->code[i] == code) continue;
 
 	    items[n].byte_len = len;
@@ -2526,9 +567,9 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 	  }
 	}
 
-	if (onig_st_lookup(Unfold3Table, (st_data_t )to->code,
-			   (void* )&z2) != 0) {
-	  for (i = 0; i < z2->n; i++) {
+	if ((z2 = onigenc_unicode_unfold3_lookup(to->code)) != 0 &&
+	    CodePointListValidP(z2)) {
+	  for (i = 0; i < OnigCodePointCount(z2->n); i++) {
 	    if (z2->code[i] == code) continue;
 
 	    items[n].byte_len = len;
@@ -2544,8 +585,9 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
     }
   }
   else {
-    if (onig_st_lookup(Unfold1Table, (st_data_t )code, (void* )&to) != 0) {
-      for (i = 0; i < to->n; i++) {
+    if ((to = onigenc_unicode_unfold1_lookup(code)) != 0 &&
+	CodePointListValidP(to)) {
+      for (i = 0; i < OnigCodePointCount(to->n); i++) {
 	items[n].byte_len = len;
 	items[n].code_len = 1;
 	items[n].code[0]  = to->code[i];
@@ -2562,8 +604,8 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 
       codes[0] = code;
       code = ONIGENC_MBC_TO_CODE(enc, p, end);
-      if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0
-	  && to->n == 1) {
+      if ((to = onigenc_unicode_fold_lookup(code)) != 0
+	  && OnigCodePointCount(to->n) == 1) {
 	codes[1] = to->code[0];
       }
       else
@@ -2571,8 +613,9 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 
       clen = enclen(enc, p, end);
       len += clen;
-      if (onig_st_lookup(Unfold2Table, (st_data_t )codes, (void* )&z2) != 0) {
-	for (i = 0; i < z2->n; i++) {
+      if ((z2 = onigenc_unicode_unfold2_lookup(codes)) != 0 &&
+	  CodePointListValidP(z2)) {
+	for (i = 0; i < OnigCodePointCount(z2->n); i++) {
 	  items[n].byte_len = len;
 	  items[n].code_len = 1;
 	  items[n].code[0]  = z2->code[i];
@@ -2583,8 +626,8 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
       p += clen;
       if (p < end) {
 	code = ONIGENC_MBC_TO_CODE(enc, p, end);
-	if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0
-	    && to->n == 1) {
+	if ((to = onigenc_unicode_fold_lookup(code)) != 0
+	    && OnigCodePointCount(to->n) == 1) {
 	  codes[2] = to->code[0];
 	}
 	else
@@ -2592,9 +635,9 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 
 	clen = enclen(enc, p, end);
 	len += clen;
-	if (onig_st_lookup(Unfold3Table, (st_data_t )codes,
-			   (void* )&z2) != 0) {
-	  for (i = 0; i < z2->n; i++) {
+	if ((z2 = onigenc_unicode_unfold3_lookup(codes)) != 0 &&
+	    CodePointListValidP(z2)) {
+	  for (i = 0; i < OnigCodePointCount(z2->n); i++) {
 	    items[n].byte_len = len;
 	    items[n].code_len = 1;
 	    items[n].code[0]  = z2->code[i];
@@ -2607,3 +650,167 @@ 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';
+            code += '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) && code>=0x1C90 && code<=0x1CBF) { /* Georgian MTAVRULI */
+          MODIFIED;
+	  code += 0x10D0 - 0x1C90;
+        }
+        else 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 */
+	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 */
+	  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/12.1.0/casefold.h b/enc/unicode/12.1.0/casefold.h
new file mode 100644
index 0000000000..4c62f0faee
--- /dev/null
+++ b/enc/unicode/12.1.0/casefold.h
@@ -0,0 +1,7428 @@
+/* DO NOT EDIT THIS FILE. */
+/* Generated by enc/unicode/case-folding.rb */
+
+#if defined ONIG_UNICODE_VERSION_STRING && !( \
+      ONIG_UNICODE_VERSION_MAJOR == 12 && \
+      ONIG_UNICODE_VERSION_MINOR == 1 && \
+      ONIG_UNICODE_VERSION_TEENY == 0 && \
+      1)
+# error ONIG_UNICODE_VERSION_STRING mismatch
+#endif
+#define ONIG_UNICODE_VERSION_STRING "12.1.0"
+#define ONIG_UNICODE_VERSION_MAJOR 12
+#define ONIG_UNICODE_VERSION_MINOR 1
+#define ONIG_UNICODE_VERSION_TEENY 0
+
+static const CaseFold_11_Type CaseFold_11_Table[] = {
+#define CaseFold (*(CaseFold_11_Type (*)[1485])(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}}},
+  {0x1c90, {1|F|D, {0x10d0}}},
+  {0x1c91, {1|F|D, {0x10d1}}},
+  {0x1c92, {1|F|D, {0x10d2}}},
+  {0x1c93, {1|F|D, {0x10d3}}},
+  {0x1c94, {1|F|D, {0x10d4}}},
+  {0x1c95, {1|F|D, {0x10d5}}},
+  {0x1c96, {1|F|D, {0x10d6}}},
+  {0x1c97, {1|F|D, {0x10d7}}},
+  {0x1c98, {1|F|D, {0x10d8}}},
+  {0x1c99, {1|F|D, {0x10d9}}},
+  {0x1c9a, {1|F|D, {0x10da}}},
+  {0x1c9b, {1|F|D, {0x10db}}},
+  {0x1c9c, {1|F|D, {0x10dc}}},
+  {0x1c9d, {1|F|D, {0x10dd}}},
+  {0x1c9e, {1|F|D, {0x10de}}},
+  {0x1c9f, {1|F|D, {0x10df}}},
+  {0x1ca0, {1|F|D, {0x10e0}}},
+  {0x1ca1, {1|F|D, {0x10e1}}},
+  {0x1ca2, {1|F|D, {0x10e2}}},
+  {0x1ca3, {1|F|D, {0x10e3}}},
+  {0x1ca4, {1|F|D, {0x10e4}}},
+  {0x1ca5, {1|F|D, {0x10e5}}},
+  {0x1ca6, {1|F|D, {0x10e6}}},
+  {0x1ca7, {1|F|D, {0x10e7}}},
+  {0x1ca8, {1|F|D, {0x10e8}}},
+  {0x1ca9, {1|F|D, {0x10e9}}},
+  {0x1caa, {1|F|D, {0x10ea}}},
+  {0x1cab, {1|F|D, {0x10eb}}},
+  {0x1cac, {1|F|D, {0x10ec}}},
+  {0x1cad, {1|F|D, {0x10ed}}},
+  {0x1cae, {1|F|D, {0x10ee}}},
+  {0x1caf, {1|F|D, {0x10ef}}},
+  {0x1cb0, {1|F|D, {0x10f0}}},
+  {0x1cb1, {1|F|D, {0x10f1}}},
+  {0x1cb2, {1|F|D, {0x10f2}}},
+  {0x1cb3, {1|F|D, {0x10f3}}},
+  {0x1cb4, {1|F|D, {0x10f4}}},
+  {0x1cb5, {1|F|D, {0x10f5}}},
+  {0x1cb6, {1|F|D, {0x10f6}}},
+  {0x1cb7, {1|F|D, {0x10f7}}},
+  {0x1cb8, {1|F|D, {0x10f8}}},
+  {0x1cb9, {1|F|D, {0x10f9}}},
+  {0x1cba, {1|F|D, {0x10fa}}},
+  {0x1cbd, {1|F|D, {0x10fd}}},
+  {0x1cbe, {1|F|D, {0x10fe}}},
+  {0x1cbf, {1|F|D, {0x10ff}}},
+  {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}}},
+  {0xa7b8, {1|F|D, {0xa7b9}}},
+  {0xa7ba, {1|F|D, {0xa7bb}}},
+  {0xa7bc, {1|F|D, {0xa7bd}}},
+  {0xa7be, {1|F|D, {0xa7bf}}},
+  {0xa7c2, {1|F|D, {0xa7c3}}},
+  {0xa7c4, {1|F|D, {0xa794}}},
+  {0xa7c5, {1|F|D, {0x0282}}},
+  {0xa7c6, {1|F|D, {0x1d8e}}},
+  {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}}},
+  {0x16e40, {1|F|D, {0x16e60}}},
+  {0x16e41, {1|F|D, {0x16e61}}},
+  {0x16e42, {1|F|D, {0x16e62}}},
+  {0x16e43, {1|F|D, {0x16e63}}},
+  {0x16e44, {1|F|D, {0x16e64}}},
+  {0x16e45, {1|F|D, {0x16e65}}},
+  {0x16e46, {1|F|D, {0x16e66}}},
+  {0x16e47, {1|F|D, {0x16e67}}},
+  {0x16e48, {1|F|D, {0x16e68}}},
+  {0x16e49, {1|F|D, {0x16e69}}},
+  {0x16e4a, {1|F|D, {0x16e6a}}},
+  {0x16e4b, {1|F|D, {0x16e6b}}},
+  {0x16e4c, {1|F|D, {0x16e6c}}},
+  {0x16e4d, {1|F|D, {0x16e6d}}},
+  {0x16e4e, {1|F|D, {0x16e6e}}},
+  {0x16e4f, {1|F|D, {0x16e6f}}},
+  {0x16e50, {1|F|D, {0x16e70}}},
+  {0x16e51, {1|F|D, {0x16e71}}},
+  {0x16e52, {1|F|D, {0x16e72}}},
+  {0x16e53, {1|F|D, {0x16e73}}},
+  {0x16e54, {1|F|D, {0x16e74}}},
+  {0x16e55, {1|F|D, {0x16e75}}},
+  {0x16e56, {1|F|D, {0x16e76}}},
+  {0x16e57, {1|F|D, {0x16e77}}},
+  {0x16e58, {1|F|D, {0x16e78}}},
+  {0x16e59, {1|F|D, {0x16e79}}},
+  {0x16e5a, {1|F|D, {0x16e7a}}},
+  {0x16e5b, {1|F|D, {0x16e7b}}},
+  {0x16e5c, {1|F|D, {0x16e7c}}},
+  {0x16e5d, {1|F|D, {0x16e7d}}},
+  {0x16e5e, {1|F|D, {0x16e7e}}},
+  {0x16e5f, {1|F|D, {0x16e7f}}},
+  {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+1485))
+  {0x0049, {1|F|D, {0x0069}}},
+  {0x0130, {2|F|D, {0x0069, 0x0307}}},
+};
+
+/* ANSI-C code produced by gperf version 3.1 */
+/* 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 = 3500, 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[] =
+    {
+         5,  273,    4,    8,    3,    1,   86,    9,    2,  289,
+       290,    3, 3510, 3510, 3510, 3510, 3510, 3510, 3510, 3510,
+      3510, 3510, 3510, 3510, 3510,   50, 3510, 3510, 3510, 3510,
+      3510, 3510, 3510,  225, 3510, 3510, 3510, 3510, 3510,   28,
+      3510, 3510, 3510, 3510, 3510, 3510, 3510, 3510, 3510,  394,
+      3510, 3510, 3510, 3510, 3510, 3510, 3510,   47, 3510, 3510,
+       255,   40,  286,    1, 3510, 3510,  599,    8, 3510, 3510,
+      3510, 3510, 3510,  282, 3510, 3510,  267,  667,  473,   39,
+      2019,  189,   47,  175, 2001,  107, 1626,    6,   12,   25,
+      1961,  678, 1128,  526, 1945,  148, 1923,  371, 1720,  134,
+      1857,   80, 1375,   66, 1705,  300, 1635,  445, 1611,  472,
+      1795,  216, 1303,  499, 1552,  270, 1511,  243,  121,  619,
+      1284,  540,  875,  592, 1484,  567,  412,  703, 1692,  387,
+      1782,  781, 1767,  664, 1718,  648, 1316,  608, 1647,  715,
+      1592,  771, 1544, 1029, 1563,  887, 1296,  861, 1194,  978,
+        95,  899, 1257,  835, 1335,  765, 1529,  984,  862,  938,
+      1460,  759,  329, 1079, 1159,  940,  234, 1101, 1204,  990,
+       949, 1493,   92, 1438,   77, 1391,    7, 1073,   44, 1377,
+         2, 1435,    4, 1321,  428, 1274,  332, 1206,   11, 1426,
+        46,  478,  200, 1502,   31, 1400,  153, 1663,  352, 1820,
+       229, 1733,  265, 1405,  315, 1879,  198
+    };
+  return asso_values[bits_of(code, 2)+79] + asso_values[bits_of(code, 1)] + asso_values[bits_of(code, 0)];
+}
+
+static const CodePointList3 *
+onigenc_unicode_CaseFold_11_lookup(const OnigCodePoint code)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x41,
+      MAX_CODE_VALUE = 0x1e921,
+      TOTAL_KEYWORDS = 1487,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 3,
+      MIN_HASH_VALUE = 10,
+      MAX_HASH_VALUE = 3509
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x1fe7*/ 848,
+      /*0x10408*/ 1268,
+      /*0x1f88*/ 775,
+      /*0x0408*/ 305,
+      /*0x0208*/ 194,
+      /*0x0108*/ 61,
+      /*0xab88*/ 1166,
+      /*0x10409*/ 1269,
+      /*0x1f89*/ 776,
+      /*0x0409*/ 306,
+      /*0x0388*/ 235,
+      /*0x2c67*/ 962,
+      /*0xab89*/ 1167,
+      /*0x2c08*/ 919,
+      -1,
+      /*0x0189*/ 126,
+      /*0x0389*/ 236,
+      -1,
+      /*0x2c6d*/ 965,
+      /*0x2c09*/ 920,
+      /*0x1040a*/ 1270,
+      /*0x1f8a*/ 777,
+      /*0x040a*/ 307,
+      /*0x020a*/ 195,
+      /*0x010a*/ 62,
+      /*0xab8a*/ 1168,
+      /*0x2c88*/ 977,
+      /*0x1ff3*/ 855,
+      /*0x018a*/ 127,
+      /*0x038a*/ 237,
+      -1,
+      /*0x2ced*/ 1024,
+      /*0x2c0a*/ 921,
+      -1,
+      /*0x10400*/ 1260,
+      /*0x1f80*/ 767,
+      /*0x0400*/ 297,
+      /*0x0200*/ 190,
+      /*0x0100*/ 57,
+      /*0xab80*/ 1158,
+      /*0x1fe3*/ 845,
+      /*0x1e88*/ 653,
+      /*0x10403*/ 1263,
+      /*0x1f83*/ 770,
+      /*0x0403*/ 300,
+      /*0x2c8a*/ 978,
+      /*0x2c00*/ 911,
+      /*0xab83*/ 1161,
+      /*0x1c88*/ 538,
+      /*0x10c88*/ 1344,
+      /*0x2183*/ 884,
+      /*0x2c63*/ 960,
+      /*0x1e908*/ 1459,
+      /*0x2c6f*/ 967,
+      /*0x2c03*/ 914,
+      /*0x10c89*/ 1345,
+      -1, -1,
+      /*0x1e909*/ 1460,
+      /*0x2c80*/ 973,
+      /*0x1e8a*/ 654,
+      /*0x10418*/ 1284,
+      /*0x1f98*/ 791,
+      /*0x0418*/ 321,
+      /*0x0218*/ 202,
+      /*0x0118*/ 69,
+      /*0xab98*/ 1182,
+      -1,
+      /*0x10c8a*/ 1346,
+      /*0x0198*/ 137,
+      /*0x0398*/ 249,
+      /*0x1e90a*/ 1461,
+      /*0xa780*/ 1105,
+      /*0x2c18*/ 935,
+      /*0x1e80*/ 649,
+      /*0x10416*/ 1282,
+      /*0x1f96*/ 789,
+      /*0x0416*/ 319,
+      /*0x0216*/ 201,
+      /*0x0116*/ 68,
+      /*0xab96*/ 1180,
+      /*0x1c80*/ 530,
+      /*0x10c80*/ 1336,
+      /*0x0196*/ 135,
+      /*0x0396*/ 247,
+      /*0x1e900*/ 1451,
+      /*0x2c98*/ 985,
+      /*0x2c16*/ 933,
+      -1,
+      /*0x1c83*/ 533,
+      /*0x10c83*/ 1339,
+      /*0x1fc7*/ 830,
+      -1,
+      /*0x1e903*/ 1454,
+      /*0x0147*/ 91,
+      /*0x0047*/ 6,
+      -1, -1,
+      /*0x01c7*/ 159,
+      /*0xa798*/ 1114,
+      /*0x2c96*/ 984,
+      /*0x1e98*/ 662,
+      /*0x10406*/ 1266,
+      /*0x1f86*/ 773,
+      /*0x0406*/ 303,
+      /*0x0206*/ 193,
+      /*0x0106*/ 60,
+      /*0xab86*/ 1164,
+      /*0x1c98*/ 547,
+      /*0x10c98*/ 1360,
+      /*0x0186*/ 124,
+      /*0x0386*/ 234,
+      /*0x1e918*/ 1475,
+      /*0xa796*/ 1113,
+      /*0x2c06*/ 917,
+      /*0x1e96*/ 660,
+      /*0x10427*/ 1299,
+      /*0x1fa7*/ 806,
+      /*0x0427*/ 336,
+      -1, -1,
+      /*0xaba7*/ 1197,
+      /*0x1c96*/ 545,
+      /*0x10c96*/ 1358,
+      /*0x01a7*/ 145,
+      /*0x03a7*/ 263,
+      /*0x1e916*/ 1473,
+      /*0x2c86*/ 976,
+      /*0x2c27*/ 950,
+      /*0x10414*/ 1280,
+      /*0x1f94*/ 787,
+      /*0x0414*/ 317,
+      /*0x0214*/ 200,
+      /*0x0114*/ 67,
+      /*0xab94*/ 1178,
+      -1, -1,
+      /*0x0194*/ 134,
+      /*0x0394*/ 245,
+      -1,
+      /*0xa786*/ 1108,
+      /*0x2c14*/ 931,
+      /*0x1e86*/ 652,
+      /*0x10410*/ 1276,
+      /*0x1f90*/ 783,
+      /*0x0410*/ 313,
+      /*0x0210*/ 198,
+      /*0x0110*/ 65,
+      /*0xab90*/ 1174,
+      /*0x1c86*/ 536,
+      /*0x10c86*/ 1342,
+      /*0x0190*/ 131,
+      /*0x0390*/ 241,
+      /*0x1e906*/ 1457,
+      /*0x2c94*/ 983,
+      /*0x2c10*/ 927,
+      -1,
+      /*0x03f5*/ 290,
+      /*0xfb00*/ 1222,
+      -1,
+      /*0x2c75*/ 970,
+      -1, -1,
+      /*0x1ca7*/ 562,
+      /*0x10ca7*/ 1375,
+      -1,
+      /*0xfb03*/ 1225,
+      -1,
+      /*0x2c90*/ 981,
+      /*0x1e94*/ 659,
+      /*0x10404*/ 1264,
+      /*0x1f84*/ 771,
+      /*0x0404*/ 301,
+      /*0x0204*/ 192,
+      /*0x0104*/ 59,
+      /*0xab84*/ 1162,
+      /*0x1c94*/ 543,
+      /*0x10c94*/ 1356,
+      /*0x0184*/ 123,
+      -1,
+      /*0x1e914*/ 1471,
+      /*0xa790*/ 1111,
+      /*0x2c04*/ 915,
+      /*0x1e90*/ 657,
+      /*0x10402*/ 1262,
+      /*0x1f82*/ 769,
+      /*0x0402*/ 299,
+      /*0x0202*/ 191,
+      /*0x0102*/ 58,
+      /*0xab82*/ 1160,
+      /*0x1c90*/ 539,
+      /*0x10c90*/ 1352,
+      /*0x0182*/ 122,
+      -1,
+      /*0x1e910*/ 1467,
+      /*0x2c84*/ 975,
+      /*0x2c02*/ 913,
+      /*0x017f*/ 120,
+      -1,
+      /*0xfb16*/ 1232,
+      -1, -1,
+      /*0x03ff*/ 296,
+      /*0x01f1*/ 181,
+      /*0x03f1*/ 288,
+      /*0x2c7f*/ 972,
+      -1, -1,
+      /*0xa784*/ 1107,
+      /*0x2c82*/ 974,
+      /*0x1e84*/ 651,
+      /*0x10420*/ 1292,
+      /*0x1fa0*/ 799,
+      /*0x0420*/ 329,
+      /*0x0220*/ 206,
+      /*0x0120*/ 73,
+      /*0xaba0*/ 1190,
+      /*0x1c84*/ 534,
+      /*0x10c84*/ 1340,
+      /*0x01a0*/ 141,
+      /*0x03a0*/ 257,
+      /*0x1e904*/ 1455,
+      /*0xa782*/ 1106,
+      /*0x2c20*/ 943,
+      /*0x1e82*/ 650,
+      /*0x1ff9*/ 860,
+      /*0xfb06*/ 1228,
+      -1,
+      /*0x0179*/ 117,
+      -1,
+      /*0x1fd7*/ 839,
+      /*0x1c82*/ 532,
+      /*0x10c82*/ 1338,
+      /*0x03f9*/ 292,
+      /*0x0057*/ 21,
+      /*0x1e902*/ 1453,
+      /*0x2ca0*/ 989,
+      /*0x01d7*/ 168,
+      /*0x10426*/ 1298,
+      /*0x1fa6*/ 805,
+      /*0x0426*/ 335,
+      /*0x0226*/ 209,
+      /*0x0126*/ 76,
+      /*0xaba6*/ 1196,
+      -1, -1,
+      /*0x01a6*/ 144,
+      /*0x03a6*/ 262,
+      -1,
+      /*0xa7a0*/ 1118,
+      /*0x2c26*/ 949,
+      /*0x1ea0*/ 667,
+      /*0x13f9*/ 525,
+      /*0xfb14*/ 1230,
+      -1, -1,
+      /*0x1e08*/ 589,
+      -1,
+      /*0x1ca0*/ 555,
+      /*0x10ca0*/ 1368,
+      -1,
+      /*0x1ffb*/ 862,
+      /*0x1e920*/ 1483,
+      /*0x2ca6*/ 992,
+      /*0x017b*/ 118,
+      /*0x10424*/ 1296,
+      /*0x1fa4*/ 803,
+      /*0x0424*/ 333,
+      /*0x0224*/ 208,
+      /*0x0124*/ 75,
+      /*0xaba4*/ 1194,
+      -1, -1,
+      /*0x01a4*/ 143,
+      /*0x03a4*/ 260,
+      /*0x1e0a*/ 590,
+      /*0xa7a6*/ 1121,
+      /*0x2c24*/ 947,
+      /*0x1ea6*/ 670,
+      /*0x037f*/ 233,
+      -1, -1, -1, -1, -1,
+      /*0x1ca6*/ 561,
+      /*0x10ca6*/ 1374,
+      /*0x1f08*/ 715,
+      /*0x13fb*/ 527,
+      /*0x1e00*/ 585,
+      /*0x2ca4*/ 991,
+      /*0x0508*/ 425,
+      /*0x1f6d*/ 764,
+      /*0x1f09*/ 716,
+      /*0xfb04*/ 1226,
+      /*0x1041a*/ 1286,
+      /*0x1f9a*/ 793,
+      /*0x041a*/ 323,
+      /*0x021a*/ 203,
+      /*0x011a*/ 70,
+      /*0xab9a*/ 1184,
+      -1, -1,
+      /*0xa7a4*/ 1120,
+      /*0x039a*/ 251,
+      /*0x1ea4*/ 669,
+      /*0x1f0a*/ 717,
+      /*0x2c1a*/ 937,
+      /*0xfb02*/ 1224,
+      /*0x048a*/ 362,
+      /*0x050a*/ 426,
+      -1,
+      /*0x1ca4*/ 559,
+      /*0x10ca4*/ 1372,
+      /*0x017d*/ 119,
+      /*0x10c7*/ 522,
+      /*0x1e18*/ 597,
+      -1, -1,
+      /*0x03fd*/ 294,
+      /*0x2c9a*/ 986,
+      -1, -1,
+      /*0x0480*/ 361,
+      /*0x0500*/ 421,
+      /*0x1fd3*/ 837,
+      -1,
+      /*0x1f6f*/ 766,
+      /*0x1feb*/ 852,
+      /*0x0053*/ 17,
+      /*0x1e16*/ 596,
+      -1,
+      /*0x01d3*/ 166,
+      /*0xa79a*/ 1115,
+      -1,
+      /*0x1e9a*/ 664,
+      -1, -1,
+      /*0x13fd*/ 529,
+      /*0x2c6b*/ 964,
+      -1,
+      /*0x10a7*/ 491,
+      /*0x1c9a*/ 549,
+      /*0x10c9a*/ 1362,
+      -1,
+      /*0x00df*/ 56,
+      /*0x1e91a*/ 1477,
+      /*0x1f18*/ 723,
+      /*0x1ff7*/ 858,
+      -1,
+      /*0x0498*/ 369,
+      /*0x0518*/ 433,
+      /*0x2ceb*/ 1023,
+      -1, -1,
+      /*0x01f7*/ 185,
+      /*0x03f7*/ 291,
+      /*0x1e06*/ 588,
+      /*0x1f5f*/ 758,
+      -1,
+      /*0x00dd*/ 54,
+      -1, -1,
+      /*0x00c7*/ 33,
+      /*0x0496*/ 368,
+      /*0x0516*/ 432,
+      /*0x10412*/ 1278,
+      /*0x1f92*/ 785,
+      /*0x0412*/ 315,
+      /*0x0212*/ 199,
+      /*0x0112*/ 66,
+      /*0xab92*/ 1176,
+      /*0x24c7*/ 902,
+      /*0x1f5d*/ 757,
+      -1,
+      /*0x0392*/ 243,
+      -1,
+      /*0x104c7*/ 1323,
+      /*0x2c12*/ 929,
+      /*0x04c7*/ 393,
+      /*0x0547*/ 467,
+      -1, -1,
+      /*0x1fb2*/ 815,
+      /*0x1e14*/ 595,
+      /*0x0232*/ 215,
+      /*0x0132*/ 81,
+      /*0xabb2*/ 1208,
+      -1, -1,
+      /*0x01b2*/ 151,
+      /*0x2c92*/ 982,
+      /*0x0506*/ 424,
+      -1, -1, -1, -1, -1,
+      /*0x1e10*/ 593,
+      -1, -1, -1, -1, -1,
+      /*0xa792*/ 1112,
+      -1,
+      /*0x1e92*/ 658,
+      /*0x2cb2*/ 998,
+      /*0x1faf*/ 814,
+      /*0x042f*/ 344,
+      -1, -1,
+      /*0xabaf*/ 1205,
+      /*0x1c92*/ 541,
+      /*0x10c92*/ 1354,
+      /*0x01af*/ 149,
+      -1,
+      /*0x1e912*/ 1469,
+      /*0x0494*/ 367,
+      /*0x0514*/ 431,
+      /*0xa7b2*/ 1130,
+      -1,
+      /*0x1eb2*/ 676,
+      -1,
+      /*0x1fe9*/ 850,
+      /*0x1e04*/ 587,
+      -1, -1, -1,
+      /*0x1cb2*/ 573,
+      /*0x10cb2*/ 1386,
+      -1,
+      /*0x0490*/ 365,
+      /*0x0510*/ 429,
+      -1,
+      /*0x2c69*/ 963,
+      /*0x10a0*/ 484,
+      -1, -1,
+      /*0x1e02*/ 586,
+      /*0x1041c*/ 1288,
+      /*0x1f9c*/ 795,
+      /*0x041c*/ 325,
+      /*0x021c*/ 204,
+      /*0x011c*/ 71,
+      /*0xab9c*/ 1186,
+      -1, -1,
+      /*0x019c*/ 138,
+      /*0x039c*/ 253,
+      -1, -1,
+      /*0x2c1c*/ 939,
+      -1,
+      /*0x1caf*/ 570,
+      /*0x10caf*/ 1383,
+      -1, -1, -1, -1,
+      /*0x0504*/ 423,
+      -1, -1,
+      /*0x10a6*/ 490,
+      -1,
+      /*0x2c9c*/ 987,
+      /*0x1e20*/ 601,
+      /*0x1041e*/ 1290,
+      /*0x1f9e*/ 797,
+      /*0x041e*/ 327,
+      /*0x021e*/ 205,
+      /*0x011e*/ 72,
+      /*0xab9e*/ 1188,
+      -1,
+      /*0x0502*/ 422,
+      /*0x0470*/ 353,
+      /*0x039e*/ 255,
+      /*0x0170*/ 112,
+      /*0xa79c*/ 1116,
+      /*0x2c1e*/ 941,
+      -1,
+      /*0x01f0*/ 180,
+      /*0x03f0*/ 287,
+      -1, -1,
+      /*0x2c70*/ 968,
+      -1,
+      /*0x1c9c*/ 551,
+      /*0x10c9c*/ 1364,
+      -1,
+      /*0x10a4*/ 488,
+      /*0x1e91c*/ 1479,
+      /*0x2c9e*/ 988,
+      /*0x1e26*/ 604,
+      /*0x10422*/ 1294,
+      /*0x1fa2*/ 801,
+      /*0x0422*/ 331,
+      /*0x0222*/ 207,
+      /*0x0122*/ 74,
+      /*0xaba2*/ 1192,
+      /*0x04a0*/ 373,
+      /*0x0520*/ 437,
+      /*0x01a2*/ 142,
+      -1, -1,
+      /*0xa79e*/ 1117,
+      /*0x2c22*/ 945,
+      /*0x1e9e*/ 666,
+      /*0x118a7*/ 1394,
+      -1, -1, -1, -1,
+      /*0x1ef0*/ 707,
+      /*0x1c9e*/ 553,
+      /*0x10c9e*/ 1366,
+      -1, -1,
+      /*0x1e91e*/ 1481,
+      /*0x2ca2*/ 990,
+      /*0x1e24*/ 603,
+      /*0x1040e*/ 1274,
+      /*0x1f8e*/ 781,
+      /*0x040e*/ 311,
+      /*0x020e*/ 197,
+      /*0x010e*/ 64,
+      /*0xab8e*/ 1172,
+      /*0x04a6*/ 376,
+      /*0x0526*/ 440,
+      /*0x018e*/ 129,
+      /*0x038e*/ 239,
+      /*0xff27*/ 1240,
+      /*0xa7a2*/ 1119,
+      /*0x2c0e*/ 925,
+      /*0x1ea2*/ 668,
+      -1,
+      /*0x1faa*/ 809,
+      /*0x042a*/ 339,
+      /*0x022a*/ 211,
+      /*0x012a*/ 78,
+      /*0xabaa*/ 1200,
+      /*0x1ca2*/ 557,
+      /*0x10ca2*/ 1370,
+      -1,
+      /*0x03aa*/ 266,
+      -1,
+      /*0x2c8e*/ 980,
+      /*0x2c2a*/ 953,
+      -1, -1,
+      /*0x1e1a*/ 598,
+      -1, -1, -1,
+      /*0x04a4*/ 375,
+      /*0x0524*/ 439,
+      -1, -1, -1,
+      /*0x0370*/ 230,
+      /*0x2caa*/ 994,
+      /*0x1e8e*/ 656,
+      -1,
+      /*0x1fae*/ 813,
+      /*0x042e*/ 343,
+      /*0x022e*/ 213,
+      /*0x012e*/ 80,
+      /*0xabae*/ 1204,
+      -1,
+      /*0x10c8e*/ 1350,
+      /*0x01ae*/ 148,
+      -1,
+      /*0x1e90e*/ 1465,
+      /*0xa7aa*/ 1123,
+      /*0x2c2e*/ 957,
+      /*0x1eaa*/ 672,
+      -1, -1, -1, -1, -1,
+      /*0x1f1a*/ 725,
+      /*0x1caa*/ 565,
+      /*0x10caa*/ 1378,
+      /*0x049a*/ 370,
+      /*0x051a*/ 434,
+      -1,
+      /*0x2cae*/ 996,
+      /*0x1fac*/ 811,
+      /*0x042c*/ 341,
+      /*0x022c*/ 212,
+      /*0x012c*/ 79,
+      /*0xabac*/ 1202,
+      -1, -1,
+      /*0x01ac*/ 147,
+      /*0x2165*/ 873,
+      /*0x00d3*/ 45,
+      /*0x2167*/ 875,
+      /*0x2c2c*/ 955,
+      /*0xa7ae*/ 1127,
+      /*0x2161*/ 869,
+      /*0x1eae*/ 674,
+      /*0x118a0*/ 1387,
+      /*0x1fba*/ 822,
+      /*0x216d*/ 881,
+      /*0x023a*/ 216,
+      /*0x10b2*/ 502,
+      /*0xabba*/ 1216,
+      /*0x1cae*/ 569,
+      /*0x10cae*/ 1382,
+      /*0x104d3*/ 1335,
+      /*0x2cac*/ 995,
+      /*0x1f6b*/ 762,
+      /*0x0553*/ 479,
+      /*0x1fa8*/ 807,
+      /*0x0428*/ 337,
+      /*0x0228*/ 210,
+      /*0x0128*/ 77,
+      /*0xaba8*/ 1198,
+      -1,
+      /*0x1e12*/ 594,
+      -1,
+      /*0x03a8*/ 264,
+      -1,
+      /*0xa7ac*/ 1125,
+      /*0x2c28*/ 951,
+      /*0x1eac*/ 673,
+      /*0x2cba*/ 1002,
+      -1,
+      /*0x118a6*/ 1393,
+      -1,
+      /*0x10af*/ 499,
+      -1,
+      /*0x1cac*/ 567,
+      /*0x10cac*/ 1380,
+      -1,
+      /*0x1e32*/ 610,
+      /*0x2163*/ 871,
+      /*0x2ca8*/ 993,
+      /*0x216f*/ 883,
+      /*0xa7ba*/ 1135,
+      -1,
+      /*0x1eba*/ 680,
+      /*0x1fb8*/ 820,
+      -1, -1, -1,
+      /*0xabb8*/ 1214,
+      -1,
+      /*0x1cba*/ 581,
+      /*0x01b8*/ 155,
+      /*0xa7a8*/ 1122,
+      /*0xff26*/ 1239,
+      /*0x1ea8*/ 671,
+      /*0x0492*/ 366,
+      /*0x0512*/ 430,
+      /*0x118a4*/ 1391,
+      -1, -1,
+      /*0x1fb6*/ 818,
+      /*0x1ca8*/ 563,
+      /*0x10ca8*/ 1376,
+      /*0x0136*/ 83,
+      /*0xabb6*/ 1212,
+      -1, -1,
+      /*0xa688*/ 1053,
+      /*0x2cb8*/ 1001,
+      /*0x104b2*/ 1302,
+      -1,
+      /*0x04b2*/ 382,
+      /*0x0532*/ 446,
+      /*0x1040c*/ 1272,
+      /*0x1f8c*/ 779,
+      /*0x040c*/ 309,
+      /*0x020c*/ 196,
+      /*0x010c*/ 63,
+      /*0xab8c*/ 1170,
+      -1,
+      /*0xff24*/ 1237,
+      /*0xa7b8*/ 1134,
+      /*0x038c*/ 238,
+      /*0x1eb8*/ 679,
+      /*0x2cb6*/ 1000,
+      /*0x2c0c*/ 923,
+      /*0xa68a*/ 1054,
+      -1, -1, -1,
+      /*0x1cb8*/ 579,
+      -1, -1,
+      /*0x1f2f*/ 736,
+      -1,
+      /*0x1e1c*/ 599,
+      /*0xa779*/ 1101,
+      /*0xa7b6*/ 1133,
+      /*0x2c8c*/ 979,
+      /*0x1eb6*/ 678,
+      /*0xa680*/ 1049,
+      /*0x0230*/ 214,
+      /*0x0130*/ 1486,
+      /*0xabb0*/ 1206,
+      -1, -1,
+      /*0x1cb6*/ 577,
+      /*0x03b0*/ 268,
+      -1,
+      /*0x1f69*/ 760,
+      /*0xa726*/ 1065,
+      /*0x1fbc*/ 824,
+      -1,
+      /*0x1e8c*/ 655,
+      -1,
+      /*0xabbc*/ 1218,
+      -1, -1,
+      /*0x01bc*/ 156,
+      /*0x10a2*/ 486,
+      -1,
+      /*0x10c8c*/ 1348,
+      /*0x1e1e*/ 600,
+      /*0x2cb0*/ 997,
+      /*0x1e90c*/ 1463,
+      -1,
+      /*0x1f1c*/ 727,
+      /*0xa698*/ 1061,
+      /*0x1e70*/ 641,
+      /*0x049c*/ 371,
+      /*0x051c*/ 435,
+      -1,
+      /*0xa77b*/ 1102,
+      -1, -1,
+      /*0x2cbc*/ 1003,
+      /*0xa7b0*/ 1128,
+      /*0xa724*/ 1064,
+      /*0x1eb0*/ 675,
+      -1, -1,
+      /*0xa696*/ 1060,
+      -1, -1, -1,
+      /*0x1cb0*/ 571,
+      /*0x10cb0*/ 1384,
+      -1,
+      /*0xa7bc*/ 1136,
+      /*0x1e22*/ 602,
+      /*0x1ebc*/ 681,
+      -1, -1, -1, -1,
+      /*0x1fd2*/ 836,
+      /*0x049e*/ 372,
+      /*0x051e*/ 436,
+      /*0x0152*/ 97,
+      /*0x0052*/ 16,
+      /*0x10aa*/ 494,
+      /*0x1fcc*/ 835,
+      /*0x04f0*/ 413,
+      /*0x024c*/ 227,
+      /*0x014c*/ 94,
+      /*0x004c*/ 10,
+      -1,
+      /*0x1fbe*/ 825,
+      /*0xa686*/ 1052,
+      /*0x023e*/ 219,
+      -1,
+      /*0xabbe*/ 1220,
+      -1, -1,
+      /*0x118b2*/ 1405,
+      -1,
+      /*0x1e0e*/ 592,
+      /*0x1fb4*/ 817,
+      -1,
+      /*0x2cd2*/ 1014,
+      /*0x0134*/ 82,
+      /*0xabb4*/ 1210,
+      /*0xa77d*/ 1103,
+      /*0x04a2*/ 374,
+      /*0x0522*/ 438,
+      /*0x2ccc*/ 1011,
+      -1,
+      /*0x10ae*/ 498,
+      -1, -1,
+      /*0x1e2a*/ 606,
+      /*0x2cbe*/ 1004,
+      -1, -1,
+      /*0x1ed2*/ 692,
+      /*0xa694*/ 1059,
+      -1,
+      /*0xff32*/ 1251,
+      -1,
+      /*0x118af*/ 1402,
+      /*0x1ecc*/ 689,
+      /*0x2cb4*/ 999,
+      -1, -1,
+      /*0xa7be*/ 1137,
+      -1,
+      /*0x1ebe*/ 682,
+      /*0x1f0e*/ 721,
+      -1,
+      /*0xa690*/ 1057,
+      /*0x048e*/ 364,
+      /*0x050e*/ 428,
+      /*0x10ac*/ 496,
+      /*0x1cbe*/ 583,
+      /*0xa7b4*/ 1132,
+      -1,
+      /*0x1eb4*/ 677,
+      /*0x1e2e*/ 608,
+      -1, -1, -1,
+      /*0x1f2a*/ 731,
+      /*0xff2f*/ 1248,
+      /*0x1cb4*/ 575,
+      /*0x04aa*/ 378,
+      /*0x052a*/ 442,
+      -1, -1,
+      /*0x10ba*/ 510,
+      -1, -1,
+      /*0x1fca*/ 833,
+      -1,
+      /*0x024a*/ 226,
+      /*0x014a*/ 93,
+      /*0x004a*/ 8,
+      /*0xa684*/ 1051,
+      /*0x2126*/ 864,
+      /*0x01ca*/ 161,
+      /*0x10a8*/ 492,
+      -1, -1,
+      /*0x1e2c*/ 607,
+      -1, -1, -1, -1, -1,
+      /*0x1f2e*/ 735,
+      -1,
+      /*0xa682*/ 1050,
+      /*0x04ae*/ 380,
+      /*0x052e*/ 444,
+      -1,
+      /*0xa732*/ 1070,
+      /*0x2cca*/ 1010,
+      -1,
+      /*0x1fc4*/ 828,
+      /*0x1e3a*/ 614,
+      /*0x0244*/ 222,
+      -1,
+      /*0x0044*/ 3,
+      /*0x004f*/ 13,
+      -1,
+      /*0x01c4*/ 157,
+      /*0x01cf*/ 164,
+      /*0x03cf*/ 270,
+      -1,
+      /*0x10b8*/ 508,
+      /*0x1e28*/ 605,
+      /*0x1eca*/ 688,
+      /*0x1fab*/ 810,
+      /*0x042b*/ 340,
+      /*0x1f2c*/ 733,
+      -1,
+      /*0xabab*/ 1201,
+      /*0x04ac*/ 379,
+      /*0x052c*/ 443,
+      -1,
+      /*0x03ab*/ 267,
+      -1,
+      /*0x2cc4*/ 1007,
+      /*0x2c2b*/ 954,
+      /*0x1fc2*/ 826,
+      /*0x10b6*/ 506,
+      /*0x24ba*/ 889,
+      /*0x118a2*/ 1389,
+      /*0x0042*/ 1,
+      -1,
+      /*0x1f3a*/ 739,
+      /*0x104ba*/ 1310,
+      /*0x03c2*/ 269,
+      /*0x04ba*/ 386,
+      /*0x053a*/ 454,
+      /*0xa7c4*/ 1139,
+      /*0x1fc8*/ 831,
+      /*0x1ec4*/ 685,
+      /*0x0248*/ 225,
+      /*0x1e38*/ 613,
+      /*0x0048*/ 7,
+      /*0x1f28*/ 729,
+      -1,
+      /*0x01c8*/ 160,
+      /*0x04a8*/ 377,
+      /*0x0528*/ 441,
+      -1, -1,
+      /*0x2cc2*/ 1006,
+      /*0xa7ab*/ 1124,
+      /*0xff22*/ 1235,
+      -1, -1, -1, -1,
+      /*0x1e36*/ 612,
+      -1, -1,
+      /*0x1cab*/ 566,
+      /*0x10cab*/ 1379,
+      /*0x2cc8*/ 1009,
+      /*0xa7c2*/ 1138,
+      -1,
+      /*0x1ec2*/ 684,
+      /*0x10b0*/ 500,
+      -1,
+      /*0x24b8*/ 887,
+      /*0x216b*/ 879,
+      /*0x118aa*/ 1397,
+      /*0x1e0c*/ 591,
+      /*0x1f38*/ 737,
+      /*0x104b8*/ 1308,
+      -1,
+      /*0x04b8*/ 385,
+      /*0x0538*/ 452,
+      /*0x1ec8*/ 687,
+      /*0x10bc*/ 512,
+      /*0x1fd6*/ 838,
+      /*0x0150*/ 96,
+      /*0x0050*/ 14,
+      /*0x0156*/ 99,
+      /*0x0056*/ 20,
+      /*0x24b6*/ 885,
+      /*0x03d0*/ 271,
+      -1,
+      /*0x03d6*/ 274,
+      /*0x1fdb*/ 843,
+      /*0x104b6*/ 1306,
+      -1,
+      /*0x04b6*/ 384,
+      /*0x0536*/ 450,
+      /*0xff2a*/ 1243,
+      -1,
+      /*0x01db*/ 170,
+      /*0x1e30*/ 609,
+      /*0x118ae*/ 1401,
+      -1, -1, -1,
+      /*0x2cd0*/ 1013,
+      /*0x1f0c*/ 719,
+      /*0x2cd6*/ 1016,
+      /*0xa69a*/ 1062,
+      /*0x048c*/ 363,
+      /*0x050c*/ 427,
+      -1,
+      /*0x1e3c*/ 615,
+      /*0xa722*/ 1063,
+      -1, -1, -1, -1, -1, -1,
+      /*0x1ed0*/ 691,
+      /*0x1fc6*/ 829,
+      /*0x1ed6*/ 694,
+      /*0x0246*/ 224,
+      /*0xff2e*/ 1247,
+      /*0x0046*/ 5,
+      /*0x118ac*/ 1399,
+      -1,
+      /*0x2132*/ 867,
+      /*0x024e*/ 228,
+      /*0x014e*/ 95,
+      /*0x004e*/ 12,
+      /*0x104b0*/ 1300,
+      /*0x1fda*/ 842,
+      /*0x04b0*/ 381,
+      -1,
+      /*0x015a*/ 101,
+      /*0x005a*/ 24,
+      /*0x10be*/ 514,
+      /*0x24bc*/ 891,
+      -1,
+      /*0x03da*/ 276,
+      /*0x118ba*/ 1413,
+      /*0x1f3c*/ 741,
+      /*0x104bc*/ 1312,
+      /*0x2cc6*/ 1008,
+      /*0x04bc*/ 387,
+      /*0x053c*/ 456,
+      /*0x10b4*/ 504,
+      /*0xff2c*/ 1245,
+      -1,
+      /*0x2cce*/ 1012,
+      -1,
+      /*0x118a8*/ 1395,
+      /*0xa72a*/ 1067,
+      -1,
+      /*0x1e52*/ 626,
+      /*0x2cda*/ 1018,
+      /*0xa7c6*/ 1141,
+      -1,
+      /*0x1ec6*/ 686,
+      -1,
+      /*0x1e4c*/ 623,
+      -1, -1,
+      /*0xff3a*/ 1259,
+      /*0x1ece*/ 690,
+      /*0xa652*/ 1035,
+      /*0x1e3e*/ 616,
+      /*0x2169*/ 877,
+      -1, -1,
+      /*0x1eda*/ 696,
+      /*0xa64c*/ 1032,
+      /*0x00d2*/ 44,
+      -1,
+      /*0xff28*/ 1241,
+      -1,
+      /*0x1e34*/ 611,
+      /*0xa692*/ 1058,
+      /*0x00cc*/ 38,
+      /*0xa72e*/ 1069,
+      /*0x118b8*/ 1411,
+      -1, -1, -1, -1,
+      /*0x1f52*/ 752,
+      /*0x104d2*/ 1334,
+      /*0x24cc*/ 907,
+      /*0x04d2*/ 398,
+      /*0x0552*/ 478,
+      -1,
+      /*0x1f4c*/ 749,
+      /*0x104cc*/ 1328,
+      /*0x24be*/ 893,
+      /*0x2cc0*/ 1005,
+      /*0x054c*/ 472,
+      /*0x118b6*/ 1409,
+      /*0x1f3e*/ 743,
+      /*0x104be*/ 1314,
+      -1,
+      /*0x04be*/ 388,
+      /*0x053e*/ 458,
+      -1,
+      /*0xff38*/ 1257,
+      /*0xa72c*/ 1068,
+      -1, -1, -1,
+      /*0x104b4*/ 1304,
+      /*0x1ec0*/ 683,
+      /*0x04b4*/ 383,
+      /*0x0534*/ 448,
+      -1, -1,
+      /*0x1fe2*/ 844,
+      /*0x0462*/ 346,
+      -1,
+      /*0x0162*/ 105,
+      -1,
+      /*0xff36*/ 1255,
+      /*0xa73a*/ 1074,
+      /*0x01e2*/ 173,
+      /*0x03e2*/ 280,
+      /*0x0154*/ 98,
+      /*0x0054*/ 18,
+      /*0x2c62*/ 959,
+      /*0x10c4*/ 520,
+      -1, -1, -1,
+      /*0x1e4a*/ 622,
+      /*0xa728*/ 1066,
+      -1, -1, -1,
+      /*0x118b0*/ 1403,
+      -1, -1,
+      /*0x2ce2*/ 1022,
+      -1,
+      /*0x10ab*/ 495,
+      /*0xa64a*/ 1031,
+      /*0x1fd8*/ 840,
+      -1,
+      /*0x2cd4*/ 1015,
+      /*0x0158*/ 100,
+      /*0x0058*/ 22,
+      /*0x118bc*/ 1415,
+      /*0x00ca*/ 36,
+      -1,
+      /*0x03d8*/ 275,
+      -1,
+      /*0x10c2*/ 518,
+      /*0x1ee2*/ 700,
+      -1, -1,
+      /*0x1e44*/ 619,
+      /*0x24ca*/ 905,
+      /*0xff30*/ 1249,
+      /*0x1ed4*/ 693,
+      /*0xa738*/ 1073,
+      /*0x1f4a*/ 747,
+      /*0x104ca*/ 1326,
+      -1, -1,
+      /*0x054a*/ 470,
+      /*0x2cd8*/ 1017,
+      /*0xa644*/ 1028,
+      /*0x1040d*/ 1273,
+      /*0x1f8d*/ 780,
+      /*0x040d*/ 310,
+      -1, -1,
+      /*0xab8d*/ 1171,
+      /*0x00c4*/ 30,
+      /*0x00cf*/ 41,
+      /*0xa736*/ 1072,
+      -1, -1,
+      /*0x212a*/ 865,
+      /*0x2c0d*/ 924,
+      /*0x1ed8*/ 695,
+      /*0x1e42*/ 618,
+      /*0x24c4*/ 899,
+      /*0x24cf*/ 910,
+      -1, -1, -1,
+      /*0x104c4*/ 1320,
+      /*0x104cf*/ 1331,
+      -1,
+      /*0x0544*/ 464,
+      /*0x054f*/ 475,
+      /*0xa642*/ 1027,
+      /*0x1e48*/ 621,
+      -1, -1, -1, -1, -1,
+      /*0x00c2*/ 28,
+      /*0x1f2b*/ 732,
+      -1,
+      /*0x118be*/ 1417,
+      /*0x0055*/ 19,
+      /*0xa648*/ 1030,
+      /*0xa78d*/ 1110,
+      /*0x01d5*/ 167,
+      /*0x03d5*/ 273,
+      /*0x24c2*/ 897,
+      -1, -1,
+      /*0x00c8*/ 34,
+      /*0x118b4*/ 1407,
+      /*0x104c2*/ 1318,
+      -1,
+      /*0x10c8d*/ 1349,
+      /*0x0542*/ 462,
+      -1,
+      /*0x1e90d*/ 1464,
+      -1,
+      /*0x24c8*/ 903,
+      -1, -1, -1,
+      /*0x1f48*/ 745,
+      /*0x104c8*/ 1324,
+      /*0xa73c*/ 1075,
+      -1,
+      /*0x0548*/ 468,
+      -1, -1,
+      /*0xa68e*/ 1056,
+      /*0x1e50*/ 625,
+      -1,
+      /*0x1e56*/ 628,
+      /*0xff34*/ 1253,
+      /*0x0245*/ 223,
+      /*0x0145*/ 90,
+      /*0x0045*/ 4,
+      -1,
+      /*0x16e5f*/ 1450,
+      /*0x01c5*/ 158,
+      -1,
+      /*0xa650*/ 1034,
+      /*0x1fd9*/ 841,
+      /*0xa656*/ 1037,
+      /*0x1fec*/ 853,
+      /*0x046c*/ 351,
+      /*0x0059*/ 23,
+      /*0x016c*/ 110,
+      /*0x00d0*/ 42,
+      /*0x01d9*/ 169,
+      /*0x00d6*/ 48,
+      /*0x01ec*/ 178,
+      /*0x03ec*/ 285,
+      /*0x16e5d*/ 1448,
+      -1, -1,
+      /*0x16e47*/ 1426,
+      -1, -1,
+      /*0x00db*/ 52,
+      -1,
+      /*0x1f50*/ 751,
+      /*0x104d0*/ 1332,
+      /*0x1f56*/ 754,
+      /*0x04d0*/ 397,
+      /*0x0550*/ 476,
+      /*0x04d6*/ 400,
+      /*0x0556*/ 482,
+      /*0xa752*/ 1086,
+      /*0xa7c5*/ 1140,
+      /*0x1e46*/ 620,
+      -1,
+      /*0x1f5b*/ 756,
+      -1,
+      /*0xa74c*/ 1083,
+      -1,
+      /*0x1e4e*/ 624,
+      -1, -1, -1,
+      /*0xa73e*/ 1076,
+      /*0xa646*/ 1029,
+      /*0x1e5a*/ 630,
+      /*0x1eec*/ 705,
+      -1, -1, -1,
+      /*0xa64e*/ 1033,
+      /*0x00c6*/ 32,
+      -1,
+      /*0xa734*/ 1071,
+      /*0x10c0*/ 516,
+      -1,
+      /*0xa65a*/ 1039,
+      /*0x00ce*/ 40,
+      /*0x1fc9*/ 832,
+      -1,
+      /*0x24c6*/ 901,
+      /*0x0149*/ 92,
+      /*0x0049*/ 1485,
+      /*0x00da*/ 51,
+      -1,
+      /*0x104c6*/ 1322,
+      /*0x24ce*/ 909,
+      /*0x118ab*/ 1398,
+      /*0x0546*/ 466,
+      -1, -1,
+      /*0x104ce*/ 1330,
+      -1, -1,
+      /*0x054e*/ 474,
+      /*0x1fea*/ 851,
+      /*0x046a*/ 350,
+      -1,
+      /*0x016a*/ 109,
+      /*0x04da*/ 402,
+      /*0x0345*/ 229,
+      -1,
+      /*0x01ea*/ 177,
+      /*0x03ea*/ 284,
+      /*0x1e40*/ 617,
+      /*0x1fa9*/ 808,
+      /*0x0429*/ 338,
+      -1, -1,
+      /*0xaba9*/ 1199,
+      /*0xff2b*/ 1244,
+      -1,
+      /*0x01a9*/ 146,
+      /*0x03a9*/ 265,
+      -1,
+      /*0xa640*/ 1026,
+      /*0x2c29*/ 952,
+      /*0x1fc3*/ 827,
+      -1,
+      /*0x0243*/ 221,
+      /*0x0143*/ 89,
+      /*0x0043*/ 2,
+      /*0x00c0*/ 26,
+      /*0x10421*/ 1293,
+      /*0x1fa1*/ 800,
+      /*0x0421*/ 330,
+      -1,
+      /*0xa74a*/ 1082,
+      /*0xaba1*/ 1191,
+      -1, -1,
+      /*0x24c0*/ 895,
+      /*0x03a1*/ 258,
+      -1,
+      /*0x1eea*/ 704,
+      /*0x2c21*/ 944,
+      /*0x104c0*/ 1316,
+      /*0x1fb9*/ 821,
+      /*0x04c0*/ 389,
+      /*0x0540*/ 460,
+      /*0x0139*/ 84,
+      /*0xabb9*/ 1215,
+      /*0x1fe8*/ 849,
+      /*0x0468*/ 349,
+      -1,
+      /*0x0168*/ 108,
+      -1, -1,
+      /*0x1e62*/ 634,
+      /*0x01e8*/ 176,
+      /*0x03e8*/ 283,
+      /*0x1ca9*/ 564,
+      /*0x10ca9*/ 1377,
+      /*0xa744*/ 1079,
+      /*0x1e54*/ 627,
+      -1,
+      /*0x1fcb*/ 834,
+      -1, -1,
+      /*0xa662*/ 1043,
+      /*0x004b*/ 9,
+      -1, -1,
+      /*0x01cb*/ 162,
+      /*0xa68c*/ 1055,
+      /*0xa654*/ 1036,
+      -1, -1, -1, -1,
+      /*0x1ca1*/ 556,
+      /*0x10ca1*/ 1369,
+      /*0x00d4*/ 46,
+      -1,
+      /*0x1e921*/ 1484,
+      -1,
+      /*0x1e58*/ 629,
+      -1,
+      /*0x16e57*/ 1442,
+      /*0xa742*/ 1078,
+      -1,
+      /*0x1ee8*/ 703,
+      /*0x04e2*/ 406,
+      /*0x1cb9*/ 580,
+      -1,
+      /*0x1f54*/ 753,
+      -1,
+      /*0xa658*/ 1038,
+      /*0x04d4*/ 399,
+      /*0x0554*/ 480,
+      -1,
+      /*0xa748*/ 1081,
+      -1, -1,
+      /*0x00d8*/ 49,
+      /*0x10417*/ 1283,
+      /*0x1f97*/ 790,
+      /*0x0417*/ 320,
+      /*0x1fe4*/ 846,
+      /*0x0464*/ 347,
+      /*0xab97*/ 1181,
+      /*0x0164*/ 106,
+      -1,
+      /*0x0197*/ 136,
+      /*0x0397*/ 248,
+      /*0x01e4*/ 174,
+      /*0x03e4*/ 281,
+      /*0x2c17*/ 934,
+      -1,
+      /*0x2c64*/ 961,
+      /*0x04d8*/ 401,
+      -1, -1,
+      /*0x0460*/ 345,
+      -1,
+      /*0x0160*/ 104,
+      -1, -1, -1,
+      /*0x01e0*/ 172,
+      /*0x03e0*/ 279,
+      /*0x1ff4*/ 856,
+      /*0x0474*/ 355,
+      /*0x2c60*/ 958,
+      /*0x0174*/ 114,
+      -1,
+      /*0x1ffc*/ 863,
+      /*0x047c*/ 359,
+      /*0x01f4*/ 183,
+      /*0x03f4*/ 289,
+      /*0xa750*/ 1085,
+      -1,
+      /*0xa756*/ 1088,
+      /*0x01fc*/ 188,
+      /*0x1f0d*/ 720,
+      /*0x1e97*/ 661,
+      /*0x2ce0*/ 1021,
+      /*0x1ee4*/ 701,
+      -1,
+      /*0x10c5*/ 521,
+      -1, -1,
+      /*0x1c97*/ 546,
+      /*0x10c97*/ 1359,
+      -1, -1,
+      /*0x1e917*/ 1474,
+      -1,
+      /*0x046e*/ 352,
+      -1,
+      /*0x016e*/ 111,
+      /*0x1ee0*/ 699,
+      /*0x00d5*/ 47,
+      /*0x13fc*/ 528,
+      /*0x01ee*/ 179,
+      /*0x03ee*/ 286,
+      /*0x1fe6*/ 847,
+      /*0x0466*/ 348,
+      /*0x2c6e*/ 966,
+      /*0x0166*/ 107,
+      /*0x1ef4*/ 709,
+      -1,
+      /*0x015e*/ 103,
+      /*0x01e6*/ 175,
+      /*0x03e6*/ 282,
+      /*0x1efc*/ 713,
+      /*0x01de*/ 171,
+      /*0x03de*/ 278,
+      -1,
+      /*0x0555*/ 481,
+      /*0xa746*/ 1080,
+      -1, -1,
+      /*0x16e53*/ 1438,
+      -1, -1,
+      /*0xa74e*/ 1084,
+      -1, -1, -1, -1,
+      /*0x1e6c*/ 639,
+      /*0xa75a*/ 1090,
+      /*0x2cde*/ 1020,
+      -1,
+      /*0x0051*/ 15,
+      /*0x1eee*/ 706,
+      /*0x00c5*/ 31,
+      /*0x01d1*/ 165,
+      /*0x03d1*/ 272,
+      -1, -1,
+      /*0xa66c*/ 1048,
+      -1,
+      /*0x212b*/ 866,
+      /*0x1ee6*/ 702,
+      /*0x24c5*/ 900,
+      /*0x00d9*/ 50,
+      /*0x1ede*/ 698,
+      -1, -1,
+      /*0x104c5*/ 1321,
+      -1,
+      /*0x04c5*/ 392,
+      /*0x0545*/ 465,
+      /*0x1fad*/ 812,
+      /*0x042d*/ 342,
+      -1, -1,
+      /*0xabad*/ 1203,
+      /*0x1f59*/ 755,
+      -1,
+      /*0x1f6c*/ 763,
+      -1, -1,
+      /*0x04ec*/ 411,
+      /*0x2c2d*/ 956,
+      /*0x015c*/ 102,
+      -1,
+      /*0xfb17*/ 1233,
+      -1,
+      /*0xa740*/ 1077,
+      /*0x03dc*/ 277,
+      /*0x1ff2*/ 854,
+      /*0x0472*/ 354,
+      -1,
+      /*0x0172*/ 113,
+      -1, -1,
+      /*0x10a9*/ 493,
+      /*0x01f2*/ 182,
+      /*0x10425*/ 1297,
+      /*0x1fa5*/ 804,
+      /*0x0425*/ 334,
+      /*0x2c72*/ 969,
+      -1,
+      /*0xaba5*/ 1195,
+      -1,
+      /*0x2cdc*/ 1019,
+      -1,
+      /*0x03a5*/ 261,
+      /*0x10c3*/ 519,
+      /*0xa7ad*/ 1126,
+      /*0x2c25*/ 948,
+      -1, -1, -1,
+      /*0x2cf2*/ 1025,
+      /*0x10a1*/ 485,
+      /*0x1e6a*/ 638,
+      /*0x00c9*/ 35,
+      /*0x1cad*/ 568,
+      /*0x10cad*/ 1381,
+      /*0x1edc*/ 697,
+      /*0x004d*/ 11,
+      -1, -1,
+      /*0x01cd*/ 163,
+      -1,
+      /*0x24c9*/ 904,
+      /*0xa66a*/ 1047,
+      /*0x10b9*/ 509,
+      /*0x1ef2*/ 708,
+      /*0x1f49*/ 746,
+      /*0x104c9*/ 1325,
+      /*0xa762*/ 1094,
+      /*0x04c9*/ 394,
+      /*0x0549*/ 469,
+      /*0x013f*/ 87,
+      /*0xabbf*/ 1221,
+      -1,
+      /*0xa754*/ 1087,
+      /*0x10423*/ 1295,
+      /*0x1fa3*/ 802,
+      /*0x0423*/ 332,
+      -1, -1,
+      /*0xaba3*/ 1193,
+      /*0x1ca5*/ 560,
+      /*0x10ca5*/ 1373,
+      /*0x1f6a*/ 761,
+      /*0x03a3*/ 259,
+      -1,
+      /*0x04ea*/ 410,
+      /*0x2c23*/ 946,
+      -1,
+      /*0x0241*/ 220,
+      /*0x0141*/ 88,
+      /*0x0041*/ 0,
+      /*0x00c3*/ 29,
+      /*0x1f29*/ 730,
+      -1, -1,
+      /*0xa758*/ 1089,
+      -1, -1,
+      /*0x1e68*/ 637,
+      -1,
+      /*0x24c3*/ 898,
+      -1, -1, -1, -1,
+      /*0x104c3*/ 1319,
+      -1,
+      /*0x04c3*/ 391,
+      /*0x0543*/ 463,
+      /*0xa668*/ 1046,
+      /*0x0372*/ 231,
+      -1, -1,
+      /*0x1cbf*/ 584,
+      -1, -1, -1,
+      /*0x023d*/ 218,
+      /*0x013d*/ 86,
+      /*0xabbd*/ 1219,
+      /*0x24b9*/ 888,
+      /*0x1ca3*/ 558,
+      /*0x10ca3*/ 1371,
+      -1,
+      /*0x1f39*/ 738,
+      /*0x104b9*/ 1309,
+      -1, -1,
+      /*0x0539*/ 453,
+      /*0x1f68*/ 759,
+      /*0x00cb*/ 37,
+      -1,
+      /*0x04e8*/ 409,
+      /*0x1041d*/ 1289,
+      /*0x1f9d*/ 796,
+      /*0x041d*/ 326,
+      -1, -1,
+      /*0xab9d*/ 1187,
+      /*0x24cb*/ 906,
+      -1,
+      /*0x019d*/ 139,
+      /*0x039d*/ 254,
+      /*0x1f4b*/ 748,
+      /*0x104cb*/ 1327,
+      /*0x2c1d*/ 940,
+      /*0x04cb*/ 395,
+      /*0x054b*/ 471,
+      /*0x10407*/ 1267,
+      /*0x1f87*/ 774,
+      /*0x0407*/ 304,
+      /*0x0587*/ 483,
+      -1,
+      /*0xab87*/ 1165,
+      /*0x1e64*/ 635,
+      -1,
+      /*0x0187*/ 125,
+      /*0x1041b*/ 1287,
+      /*0x1f9b*/ 794,
+      /*0x041b*/ 324,
+      /*0x2c07*/ 918,
+      /*0x1cbd*/ 582,
+      /*0xab9b*/ 1185,
+      -1, -1,
+      /*0xa664*/ 1044,
+      /*0x039b*/ 252,
+      -1,
+      /*0x1e60*/ 633,
+      /*0x2c1b*/ 938,
+      /*0x1fbb*/ 823,
+      -1,
+      /*0x023b*/ 217,
+      /*0x013b*/ 85,
+      /*0xabbb*/ 1217,
+      -1, -1,
+      /*0x1e74*/ 643,
+      /*0xab73*/ 1145,
+      /*0xa660*/ 1042,
+      /*0x1c9d*/ 552,
+      /*0x10c9d*/ 1365,
+      /*0x1e7c*/ 647,
+      -1,
+      /*0x1e91d*/ 1480,
+      -1,
+      /*0x1ff6*/ 857,
+      /*0x0476*/ 356,
+      /*0x04e4*/ 407,
+      /*0x0176*/ 115,
+      -1, -1, -1,
+      /*0x01f6*/ 184,
+      /*0x2162*/ 870,
+      /*0x1c87*/ 537,
+      /*0x10c87*/ 1343,
+      /*0x1e9b*/ 665,
+      /*0x118a9*/ 1396,
+      /*0x1e907*/ 1458,
+      /*0xa76c*/ 1099,
+      -1,
+      /*0x04e0*/ 405,
+      /*0x1e6e*/ 640,
+      /*0x1c9b*/ 550,
+      /*0x10c9b*/ 1363,
+      -1, -1,
+      /*0x1e91b*/ 1478,
+      -1, -1,
+      /*0x04f4*/ 415,
+      /*0x1e66*/ 636,
+      -1, -1,
+      /*0x1e5e*/ 632,
+      /*0x04fc*/ 419,
+      /*0x118a1*/ 1388,
+      -1,
+      /*0xabb1*/ 1207,
+      -1,
+      /*0xff29*/ 1242,
+      /*0x01b1*/ 150,
+      /*0xa666*/ 1045,
+      -1,
+      /*0x1ef6*/ 710,
+      /*0xa65e*/ 1041,
+      /*0x10419*/ 1285,
+      /*0x1f99*/ 792,
+      /*0x0419*/ 322,
+      /*0x118b9*/ 1412,
+      /*0x10ad*/ 497,
+      /*0xab99*/ 1183,
+      /*0x00de*/ 55,
+      /*0x1f6e*/ 765,
+      -1,
+      /*0x0399*/ 250,
+      /*0x04ee*/ 412,
+      -1,
+      /*0x2c19*/ 936,
+      /*0xff21*/ 1234,
+      /*0x1fb7*/ 819,
+      /*0x10413*/ 1279,
+      /*0x1f93*/ 786,
+      /*0x0413*/ 316,
+      /*0xabb7*/ 1213,
+      /*0x04e6*/ 408,
+      /*0xab93*/ 1177,
+      /*0x01b7*/ 154,
+      /*0x04de*/ 404,
+      /*0x0193*/ 133,
+      /*0x0393*/ 244,
+      /*0xa7b1*/ 1129,
+      /*0xff39*/ 1258,
+      /*0x2c13*/ 930,
+      /*0x00d1*/ 43,
+      /*0x1ffa*/ 861,
+      /*0x047a*/ 358,
+      /*0x10a5*/ 489,
+      -1, -1,
+      /*0x1cb1*/ 572,
+      /*0x10cb1*/ 1385,
+      /*0x01fa*/ 187,
+      /*0x03fa*/ 293,
+      -1, -1,
+      /*0x1e99*/ 663,
+      /*0xa76a*/ 1098,
+      /*0x104d1*/ 1333,
+      /*0x1e5c*/ 631,
+      /*0x0376*/ 232,
+      /*0x0551*/ 477,
+      -1,
+      /*0x1c99*/ 548,
+      /*0x10c99*/ 1361,
+      /*0x10cd*/ 523,
+      -1,
+      /*0x1e919*/ 1476,
+      /*0x1e72*/ 642,
+      -1,
+      /*0xa65c*/ 1040,
+      -1,
+      /*0x13fa*/ 526,
+      -1, -1, -1,
+      /*0x1cb7*/ 578,
+      /*0x00dc*/ 53,
+      /*0x1c93*/ 542,
+      /*0x10c93*/ 1355,
+      /*0x10bf*/ 515,
+      /*0x1f2d*/ 734,
+      /*0x1e913*/ 1470,
+      /*0xabb5*/ 1211,
+      /*0x1efa*/ 712,
+      -1,
+      /*0x01b5*/ 153,
+      -1,
+      /*0x10a3*/ 487,
+      /*0xab75*/ 1147,
+      -1, -1, -1,
+      /*0x04dc*/ 403,
+      /*0x1fb3*/ 816,
+      -1, -1, -1,
+      /*0xabb3*/ 1209,
+      /*0x10c1*/ 517,
+      -1,
+      /*0x01b3*/ 152,
+      /*0x04f2*/ 414,
+      -1,
+      /*0xa768*/ 1097,
+      -1,
+      /*0x1041f*/ 1291,
+      /*0x1f9f*/ 798,
+      /*0x041f*/ 328,
+      -1, -1,
+      /*0xab9f*/ 1189,
+      -1,
+      /*0x00cd*/ 39,
+      /*0x019f*/ 140,
+      /*0x039f*/ 256,
+      /*0x216c*/ 880,
+      -1,
+      /*0x2c1f*/ 942,
+      -1, -1, -1,
+      /*0x24cd*/ 908,
+      -1, -1,
+      /*0x1cb5*/ 576,
+      /*0x1f4d*/ 750,
+      /*0x104cd*/ 1329,
+      /*0x10bd*/ 513,
+      /*0x04cd*/ 396,
+      /*0x054d*/ 473,
+      /*0xa7b3*/ 1131,
+      /*0x1ff8*/ 859,
+      /*0x0478*/ 357,
+      /*0xab7f*/ 1157,
+      /*0x0178*/ 116,
+      /*0xab71*/ 1143,
+      /*0x24bf*/ 894,
+      -1,
+      /*0x01f8*/ 186,
+      /*0x1cb3*/ 574,
+      /*0x1f3f*/ 744,
+      /*0x104bf*/ 1315,
+      -1, -1,
+      /*0x053f*/ 459,
+      -1,
+      /*0x00c1*/ 27,
+      -1, -1, -1, -1, -1,
+      /*0x1c9f*/ 554,
+      /*0x10c9f*/ 1367,
+      /*0xfb13*/ 1229,
+      /*0x24c1*/ 896,
+      /*0x1e91f*/ 1482,
+      -1,
+      /*0x13f8*/ 524,
+      /*0xa764*/ 1095,
+      /*0x104c1*/ 1317,
+      -1,
+      /*0x04c1*/ 390,
+      /*0x0541*/ 461,
+      /*0xab79*/ 1151,
+      -1, -1,
+      /*0x10415*/ 1281,
+      /*0x1f95*/ 788,
+      /*0x0415*/ 318,
+      /*0x1ef8*/ 711,
+      -1,
+      /*0xab95*/ 1179,
+      /*0xa760*/ 1093,
+      -1, -1,
+      /*0x0395*/ 246,
+      -1, -1,
+      /*0x2c15*/ 932,
+      -1, -1,
+      /*0x10bb*/ 511,
+      /*0x216a*/ 878,
+      /*0x24bd*/ 892,
+      -1,
+      /*0x118ad*/ 1400,
+      -1,
+      /*0x1f3d*/ 742,
+      /*0x104bd*/ 1313,
+      -1,
+      /*0x047e*/ 360,
+      /*0x053d*/ 457,
+      /*0x16e52*/ 1437,
+      -1, -1, -1,
+      /*0x01fe*/ 189,
+      /*0x03fe*/ 295,
+      /*0x16e4c*/ 1431,
+      /*0xab7b*/ 1153,
+      /*0x2c7e*/ 971,
+      -1, -1, -1, -1, -1,
+      /*0x1f1d*/ 728,
+      /*0xa76e*/ 1100,
+      /*0xff2d*/ 1246,
+      -1, -1, -1,
+      /*0x118a5*/ 1392,
+      /*0x1c95*/ 544,
+      /*0x10c95*/ 1357,
+      -1,
+      /*0xa766*/ 1096,
+      /*0x1e915*/ 1472,
+      -1,
+      /*0xa75e*/ 1092,
+      -1, -1, -1, -1, -1, -1,
+      /*0x10b1*/ 501,
+      /*0x1e76*/ 644,
+      /*0x1efe*/ 714,
+      /*0x2168*/ 876,
+      /*0x1f1b*/ 726,
+      -1,
+      /*0x10411*/ 1277,
+      /*0x1f91*/ 784,
+      /*0x0411*/ 314,
+      /*0xff25*/ 1238,
+      -1,
+      /*0xab91*/ 1175,
+      /*0x24bb*/ 890,
+      -1,
+      /*0x0191*/ 132,
+      /*0x0391*/ 242,
+      /*0x1f3b*/ 740,
+      /*0x104bb*/ 1311,
+      /*0x2c11*/ 928,
+      /*0x118bf*/ 1418,
+      /*0x053b*/ 455,
+      -1, -1,
+      /*0xab7d*/ 1155,
+      -1, -1,
+      /*0x10b7*/ 507,
+      /*0x118a3*/ 1390,
+      /*0x1040f*/ 1275,
+      /*0x1f8f*/ 782,
+      /*0x040f*/ 312,
+      -1, -1,
+      /*0xab8f*/ 1173,
+      -1,
+      /*0x04f6*/ 416,
+      /*0x018f*/ 130,
+      /*0x038f*/ 240,
+      -1, -1,
+      /*0x2c0f*/ 926,
+      -1,
+      /*0x16e4a*/ 1429,
+      -1,
+      /*0x1040b*/ 1271,
+      /*0x1f8b*/ 778,
+      /*0x040b*/ 308,
+      -1,
+      /*0xa75c*/ 1091,
+      /*0xab8b*/ 1169,
+      /*0xff23*/ 1236,
+      -1,
+      /*0x018b*/ 128,
+      /*0x1c91*/ 540,
+      /*0x10c91*/ 1353,
+      -1,
+      /*0x2c0b*/ 922,
+      /*0x1e911*/ 1468,
+      -1,
+      /*0x2164*/ 872,
+      /*0xab77*/ 1149,
+      -1,
+      /*0x104b1*/ 1301,
+      -1,
+      /*0xfb15*/ 1231,
+      /*0x0531*/ 445,
+      -1,
+      /*0x118bd*/ 1416,
+      /*0x16e44*/ 1423,
+      /*0x16e4f*/ 1434,
+      -1,
+      /*0x1e7a*/ 646,
+      -1,
+      /*0x2160*/ 868,
+      /*0x1f19*/ 724,
+      /*0x10b5*/ 505,
+      /*0x10c8f*/ 1351,
+      -1, -1,
+      /*0x1e90f*/ 1466,
+      -1, -1,
+      /*0xa78b*/ 1109,
+      /*0x24b7*/ 886,
+      /*0x10405*/ 1265,
+      /*0x1f85*/ 772,
+      /*0x0405*/ 302,
+      -1,
+      /*0x104b7*/ 1307,
+      /*0xab85*/ 1163,
+      /*0x10b3*/ 503,
+      /*0x0537*/ 451,
+      /*0x10c8b*/ 1347,
+      -1,
+      /*0x16e42*/ 1421,
+      /*0x1e90b*/ 1462,
+      /*0x2c05*/ 916,
+      -1, -1, -1, -1, -1,
+      /*0x10401*/ 1261,
+      /*0x1f81*/ 768,
+      /*0x0401*/ 298,
+      /*0x04fa*/ 418,
+      /*0x16e48*/ 1427,
+      /*0xab81*/ 1159,
+      /*0x216e*/ 882,
+      -1,
+      /*0x0181*/ 121,
+      -1, -1, -1,
+      /*0x2c01*/ 912,
+      -1, -1,
+      /*0x2166*/ 874,
+      -1, -1, -1, -1,
+      /*0x118bb*/ 1414,
+      /*0x00b5*/ 25,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x1c85*/ 535,
+      /*0x10c85*/ 1341,
+      -1, -1,
+      /*0x1e905*/ 1456,
+      -1,
+      /*0x104b5*/ 1305,
+      -1, -1,
+      /*0x0535*/ 449,
+      -1, -1, -1, -1,
+      /*0x16e50*/ 1435,
+      -1,
+      /*0x16e56*/ 1441,
+      -1,
+      /*0x1c81*/ 531,
+      /*0x10c81*/ 1337,
+      -1,
+      /*0x104b3*/ 1303,
+      /*0x1e901*/ 1452,
+      -1,
+      /*0x0533*/ 447,
+      /*0x16e5b*/ 1446,
+      -1,
+      /*0x1e78*/ 645,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x118b1*/ 1404,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x16e46*/ 1425,
+      /*0xab70*/ 1142,
+      -1, -1, -1,
+      /*0xff31*/ 1250,
+      /*0x16e4e*/ 1433,
+      /*0x04f8*/ 417,
+      /*0x118b7*/ 1410,
+      -1, -1, -1,
+      /*0x16e5a*/ 1445,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xfb05*/ 1227,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff37*/ 1256,
+      /*0x1e7e*/ 648,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xfb01*/ 1223,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e40*/ 1419,
+      -1, -1, -1, -1, -1,
+      /*0x118b5*/ 1408,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x04fe*/ 420,
+      -1, -1, -1, -1, -1,
+      /*0x118b3*/ 1406,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff35*/ 1254,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xff33*/ 1252,
+      -1, -1, -1, -1, -1,
+      /*0x16e54*/ 1439,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e58*/ 1443,
+      -1, -1, -1, -1, -1,
+      /*0x1f0f*/ 722,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x1f0b*/ 718,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x16e55*/ 1440,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x16e45*/ 1424,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e59*/ 1444,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xa77e*/ 1104,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x16e49*/ 1428,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x16e43*/ 1422,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x16e4b*/ 1430,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x16e5e*/ 1449,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e51*/ 1436,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x16e5c*/ 1447,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x16e4d*/ 1432,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e41*/ 1420,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -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*/ 1146,
+      -1, -1, -1, -1,
+      /*0xab7c*/ 1154,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0xab72*/ 1144,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xab76*/ 1148,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -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*/ 1152,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -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*/ 1150,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xab7e*/ 1156
+    };
+
+  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
+    {
+      register unsigned int key = onigenc_unicode_CaseFold_11_hash(code);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          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 (*)[1352])(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}}},
+  {0x0282, {1|U, {0xa7c5}}},
+  {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}}},
+  {0x10d0, {1|U|IT, {0x1c90}}},
+  {0x10d1, {1|U|IT, {0x1c91}}},
+  {0x10d2, {1|U|IT, {0x1c92}}},
+  {0x10d3, {1|U|IT, {0x1c93}}},
+  {0x10d4, {1|U|IT, {0x1c94}}},
+  {0x10d5, {1|U|IT, {0x1c95}}},
+  {0x10d6, {1|U|IT, {0x1c96}}},
+  {0x10d7, {1|U|IT, {0x1c97}}},
+  {0x10d8, {1|U|IT, {0x1c98}}},
+  {0x10d9, {1|U|IT, {0x1c99}}},
+  {0x10da, {1|U|IT, {0x1c9a}}},
+  {0x10db, {1|U|IT, {0x1c9b}}},
+  {0x10dc, {1|U|IT, {0x1c9c}}},
+  {0x10dd, {1|U|IT, {0x1c9d}}},
+  {0x10de, {1|U|IT, {0x1c9e}}},
+  {0x10df, {1|U|IT, {0x1c9f}}},
+  {0x10e0, {1|U|IT, {0x1ca0}}},
+  {0x10e1, {1|U|IT, {0x1ca1}}},
+  {0x10e2, {1|U|IT, {0x1ca2}}},
+  {0x10e3, {1|U|IT, {0x1ca3}}},
+  {0x10e4, {1|U|IT, {0x1ca4}}},
+  {0x10e5, {1|U|IT, {0x1ca5}}},
+  {0x10e6, {1|U|IT, {0x1ca6}}},
+  {0x10e7, {1|U|IT, {0x1ca7}}},
+  {0x10e8, {1|U|IT, {0x1ca8}}},
+  {0x10e9, {1|U|IT, {0x1ca9}}},
+  {0x10ea, {1|U|IT, {0x1caa}}},
+  {0x10eb, {1|U|IT, {0x1cab}}},
+  {0x10ec, {1|U|IT, {0x1cac}}},
+  {0x10ed, {1|U|IT, {0x1cad}}},
+  {0x10ee, {1|U|IT, {0x1cae}}},
+  {0x10ef, {1|U|IT, {0x1caf}}},
+  {0x10f0, {1|U|IT, {0x1cb0}}},
+  {0x10f1, {1|U|IT, {0x1cb1}}},
+  {0x10f2, {1|U|IT, {0x1cb2}}},
+  {0x10f3, {1|U|IT, {0x1cb3}}},
+  {0x10f4, {1|U|IT, {0x1cb4}}},
+  {0x10f5, {1|U|IT, {0x1cb5}}},
+  {0x10f6, {1|U|IT, {0x1cb6}}},
+  {0x10f7, {1|U|IT, {0x1cb7}}},
+  {0x10f8, {1|U|IT, {0x1cb8}}},
+  {0x10f9, {1|U|IT, {0x1cb9}}},
+  {0x10fa, {1|U|IT, {0x1cba}}},
+  {0x10fd, {1|U|IT, {0x1cbd}}},
+  {0x10fe, {1|U|IT, {0x1cbe}}},
+  {0x10ff, {1|U|IT, {0x1cbf}}},
+  {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}}},
+  {0x1d8e, {1|U, {0xa7c6}}},
+  {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}}},
+  {0xa794, {1|U, {0xa7c4}}},
+  {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}}},
+  {0xa7b9, {1|U, {0xa7b8}}},
+  {0xa7bb, {1|U, {0xa7ba}}},
+  {0xa7bd, {1|U, {0xa7bc}}},
+  {0xa7bf, {1|U, {0xa7be}}},
+  {0xa7c3, {1|U, {0xa7c2}}},
+  {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}}},
+  {0x16e60, {1|U, {0x16e40}}},
+  {0x16e61, {1|U, {0x16e41}}},
+  {0x16e62, {1|U, {0x16e42}}},
+  {0x16e63, {1|U, {0x16e43}}},
+  {0x16e64, {1|U, {0x16e44}}},
+  {0x16e65, {1|U, {0x16e45}}},
+  {0x16e66, {1|U, {0x16e46}}},
+  {0x16e67, {1|U, {0x16e47}}},
+  {0x16e68, {1|U, {0x16e48}}},
+  {0x16e69, {1|U, {0x16e49}}},
+  {0x16e6a, {1|U, {0x16e4a}}},
+  {0x16e6b, {1|U, {0x16e4b}}},
+  {0x16e6c, {1|U, {0x16e4c}}},
+  {0x16e6d, {1|U, {0x16e4d}}},
+  {0x16e6e, {1|U, {0x16e4e}}},
+  {0x16e6f, {1|U, {0x16e4f}}},
+  {0x16e70, {1|U, {0x16e50}}},
+  {0x16e71, {1|U, {0x16e51}}},
+  {0x16e72, {1|U, {0x16e52}}},
+  {0x16e73, {1|U, {0x16e53}}},
+  {0x16e74, {1|U, {0x16e54}}},
+  {0x16e75, {1|U, {0x16e55}}},
+  {0x16e76, {1|U, {0x16e56}}},
+  {0x16e77, {1|U, {0x16e57}}},
+  {0x16e78, {1|U, {0x16e58}}},
+  {0x16e79, {1|U, {0x16e59}}},
+  {0x16e7a, {1|U, {0x16e5a}}},
+  {0x16e7b, {1|U, {0x16e5b}}},
+  {0x16e7c, {1|U, {0x16e5c}}},
+  {0x16e7d, {1|U, {0x16e5d}}},
+  {0x16e7e, {1|U, {0x16e5e}}},
+  {0x16e7f, {1|U, {0x16e5f}}},
+  {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+1352))
+  {0x0069, {1|U, {0x0049}}},
+};
+
+/* ANSI-C code produced by gperf version 3.1 */
+/* 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 = 2507, 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, 2510,    2,    7,    4,  582,    9,  308,  197,  674,
+       297,   20,    2,    3,  303,  351, 2510, 2510, 2510, 2510,
+      2510, 2510, 2510, 2510, 2510, 2510, 2510, 2510, 2510,  112,
+      2510, 2510, 2510, 2510, 2510, 2510, 2510,  120, 2510, 2510,
+      2510, 2510, 2510,    1, 2510, 2510, 2510, 2510, 2510, 2510,
+      2510, 2510, 2510,  278, 2510, 2510, 2510, 2510, 2510, 2510,
+      2510, 2510,   12,    1,    7,    8,  218,  878,  222, 1178,
+       480, 1102,   54, 1340,  151, 1615,    8,   15,  106, 1607,
+       225,  854,   87,  490,   44, 1351,    5, 1281,    3, 1470,
+        11, 1215,  377,   10,  441,  599,  152, 1642,  127, 1334,
+       702,  841,  594,  827,  123,  916,  146, 1118,  117, 1363,
+       254,  812,  249, 1096, 1630,  945,  437,  745, 1600,  718,
+      1593,  704,  152, 1005,  383, 1064, 1493,  975,  236,  676,
+       761,  579, 1017,  557, 1241,  628, 1195,  614, 1506,  464,
+      1576,  535, 1432,  513, 1159,  423, 1026,  276, 1460,  291,
+      1453,  392, 1263,  201, 1442,   85, 1412,   70, 1430,  100,
+      1632,  129, 1410,    1, 1386,   25, 1373,   35,  656,   55,
+      1188,   45, 1308,  160,  687,  227,  355,  175, 1201,  328,
+      1030,  367, 1483,  414, 1479, 1166, 1418,  783,  994,  937,
+      1083,  959, 1463,  967
+    };
+  return asso_values[bits_of(code, 2)+66] + asso_values[bits_of(code, 1)+4] + asso_values[bits_of(code, 0)];
+}
+
+static const CodePointList3 *
+onigenc_unicode_CaseUnfold_11_lookup(const OnigCodePoint code)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x61,
+      MAX_CODE_VALUE = 0x1e943,
+      TOTAL_KEYWORDS = 1353,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 3,
+      MIN_HASH_VALUE = 3,
+      MAX_HASH_VALUE = 2509
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1,
+      /*0x13e1*/ 589,
+      /*0x0461*/ 340,
+      /*0x04e1*/ 400,
+      /*0x0061*/ 0,
+      -1,
+      /*0x104e1*/ 1176,
+      /*0x1e61*/ 661,
+      /*0x1ee1*/ 720,
+      /*0x0161*/ 102,
+      /*0x2ce1*/ 952,
+      -1,
+      /*0x049b*/ 365,
+      -1, -1,
+      /*0x24e1*/ 840,
+      /*0x1e1b*/ 626,
+      /*0x048b*/ 357,
+      /*0x011b*/ 69,
+      /*0x2c9b*/ 917,
+      /*0x03e1*/ 280,
+      /*0x1e0b*/ 618,
+      /*0x1e8b*/ 682,
+      /*0x010b*/ 61,
+      /*0x2c8b*/ 909,
+      /*0x13e3*/ 591,
+      /*0x0463*/ 341,
+      /*0x04e3*/ 401,
+      /*0x0063*/ 2,
+      -1,
+      /*0x104e3*/ 1178,
+      /*0x1e63*/ 662,
+      /*0x1ee3*/ 721,
+      /*0x0163*/ 103,
+      /*0x2ce3*/ 953,
+      /*0x13e5*/ 593,
+      /*0x0465*/ 342,
+      /*0x04e5*/ 402,
+      /*0x0065*/ 4,
+      /*0x24e3*/ 842,
+      /*0x104e5*/ 1180,
+      /*0x1e65*/ 663,
+      /*0x1ee5*/ 722,
+      /*0x0165*/ 104,
+      /*0x03e3*/ 281,
+      /*0x13e9*/ 597,
+      /*0x0469*/ 344,
+      /*0x04e9*/ 404,
+      /*0x0069*/ 1352,
+      /*0x24e5*/ 844,
+      /*0x104e9*/ 1184,
+      /*0x1e69*/ 665,
+      /*0x1ee9*/ 724,
+      /*0x0169*/ 106,
+      /*0x03e5*/ 282,
+      /*0x13e7*/ 595,
+      /*0x0467*/ 343,
+      /*0x04e7*/ 403,
+      /*0x0067*/ 6,
+      /*0x24e9*/ 848,
+      /*0x104e7*/ 1182,
+      /*0x1e67*/ 664,
+      /*0x1ee7*/ 723,
+      /*0x0167*/ 105,
+      /*0x03e9*/ 284,
+      -1, -1, -1, -1,
+      /*0x24e7*/ 846,
+      /*0x13db*/ 583,
+      /*0x045b*/ 335,
+      /*0x04db*/ 397,
+      -1,
+      /*0x03e7*/ 283,
+      /*0x104db*/ 1170,
+      /*0x1e5b*/ 658,
+      /*0x1edb*/ 717,
+      /*0x015b*/ 99,
+      /*0x2cdb*/ 949,
+      -1, -1, -1, -1,
+      /*0x24db*/ 834,
+      /*0x13d9*/ 581,
+      /*0x0459*/ 333,
+      /*0x04d9*/ 396,
+      /*0xa761*/ 1064,
+      /*0x03db*/ 277,
+      /*0x104d9*/ 1168,
+      /*0x1e59*/ 657,
+      /*0x1ed9*/ 716,
+      /*0x0159*/ 98,
+      /*0x2cd9*/ 948,
+      -1, -1, -1, -1,
+      /*0x24d9*/ 832,
+      /*0x13dd*/ 585,
+      /*0x045d*/ 337,
+      /*0x04dd*/ 398,
+      -1,
+      /*0x03d9*/ 276,
+      /*0x104dd*/ 1172,
+      /*0x1e5d*/ 659,
+      /*0x1edd*/ 718,
+      /*0x015d*/ 100,
+      /*0x2cdd*/ 950,
+      -1, -1,
+      /*0xa763*/ 1065,
+      -1,
+      /*0x24dd*/ 836,
+      /*0x10ce1*/ 1236,
+      -1,
+      /*0x13aa*/ 534,
+      -1,
+      /*0x03dd*/ 278,
+      /*0x10e1*/ 495,
+      /*0x1042a*/ 1129,
+      /*0xa765*/ 1066,
+      /*0x13a6*/ 530,
+      -1, -1, -1,
+      /*0x13a0*/ 524,
+      -1,
+      /*0x13df*/ 587,
+      /*0x045f*/ 339,
+      /*0x04df*/ 399,
+      /*0xa769*/ 1068,
+      -1,
+      /*0x104df*/ 1174,
+      /*0x1e5f*/ 660,
+      /*0x1edf*/ 719,
+      /*0x015f*/ 101,
+      /*0x2cdf*/ 951,
+      /*0x10ce3*/ 1238,
+      -1, -1,
+      /*0xa767*/ 1067,
+      /*0x24df*/ 838,
+      /*0x10e3*/ 497,
+      -1,
+      /*0x13a8*/ 532,
+      -1,
+      /*0x03df*/ 279,
+      /*0x10ce5*/ 1240,
+      /*0x10428*/ 1127,
+      -1,
+      /*0x13b8*/ 548,
+      /*0x0438*/ 300,
+      /*0x10e5*/ 499,
+      -1,
+      /*0x10438*/ 1143,
+      /*0xa75b*/ 1061,
+      -1,
+      /*0x10ce9*/ 1244,
+      /*0x13eb*/ 599,
+      /*0x046b*/ 345,
+      /*0x04eb*/ 405,
+      /*0x006b*/ 9,
+      /*0x10e9*/ 503,
+      /*0x104eb*/ 1186,
+      /*0x1e6b*/ 666,
+      /*0x1eeb*/ 725,
+      /*0x016b*/ 107,
+      /*0x10ce7*/ 1242,
+      -1,
+      /*0x03b8*/ 253,
+      /*0xa759*/ 1060,
+      -1,
+      /*0x10e7*/ 501,
+      /*0x13ef*/ 603,
+      /*0x046f*/ 347,
+      /*0x04ef*/ 407,
+      /*0x006f*/ 13,
+      /*0x03eb*/ 285,
+      /*0x104ef*/ 1190,
+      /*0x1e6f*/ 668,
+      /*0x1eef*/ 727,
+      /*0x016f*/ 109,
+      /*0x10cdb*/ 1230,
+      -1, -1,
+      /*0xa75d*/ 1062,
+      -1,
+      /*0x10db*/ 489,
+      -1, -1, -1, -1,
+      /*0x03ef*/ 287,
+      -1, -1,
+      /*0x0261*/ 210,
+      -1,
+      /*0x10cd9*/ 1228,
+      -1,
+      /*0x13d7*/ 579,
+      /*0x0457*/ 331,
+      /*0x04d7*/ 395,
+      /*0x10d9*/ 487,
+      -1,
+      /*0x021b*/ 178,
+      /*0x1e57*/ 656,
+      /*0x1ed7*/ 715,
+      /*0x0157*/ 97,
+      /*0x2cd7*/ 947,
+      /*0x020b*/ 170,
+      -1, -1,
+      /*0x10cdd*/ 1232,
+      /*0x24d7*/ 830,
+      /*0xa75f*/ 1063,
+      -1,
+      /*0x1f61*/ 777,
+      /*0x10dd*/ 491,
+      /*0x03d7*/ 275,
+      /*0x0263*/ 211,
+      /*0x1f14*/ 748,
+      -1, -1,
+      /*0x1d8e*/ 612,
+      /*0xa661*/ 1013,
+      /*0x13ed*/ 601,
+      /*0x046d*/ 346,
+      /*0x04ed*/ 406,
+      /*0x006d*/ 11,
+      /*0x0265*/ 212,
+      /*0x104ed*/ 1188,
+      /*0x1e6d*/ 667,
+      /*0x1eed*/ 726,
+      /*0x016d*/ 108,
+      /*0x13be*/ 554,
+      /*0x043e*/ 306,
+      -1, -1,
+      /*0x1043e*/ 1149,
+      /*0x0269*/ 215,
+      /*0x1f63*/ 779,
+      /*0x10cdf*/ 1234,
+      /*0x013e*/ 85,
+      -1,
+      /*0x03ed*/ 286,
+      /*0xa76b*/ 1069,
+      /*0x10df*/ 493,
+      /*0x13ae*/ 538,
+      /*0xa663*/ 1014,
+      -1,
+      /*0x1f65*/ 781,
+      /*0x1042e*/ 1133,
+      /*0x13ac*/ 536,
+      /*0x03be*/ 259,
+      -1, -1,
+      /*0x1042c*/ 1131,
+      -1,
+      /*0xa665*/ 1015,
+      /*0x1f12*/ 746,
+      /*0xa76f*/ 1071,
+      -1, -1, -1,
+      /*0x025b*/ 207,
+      -1,
+      /*0x03ae*/ 244,
+      -1,
+      /*0xa669*/ 1017,
+      /*0x1f06*/ 742,
+      /*0x1f67*/ 783,
+      /*0x03ac*/ 242,
+      /*0x10ceb*/ 1246,
+      -1,
+      /*0x13d1*/ 573,
+      /*0x0451*/ 325,
+      /*0x04d1*/ 392,
+      /*0x10eb*/ 505,
+      /*0xa667*/ 1016,
+      /*0x0259*/ 206,
+      /*0x1e51*/ 653,
+      /*0x1ed1*/ 712,
+      /*0x0151*/ 94,
+      /*0x2cd1*/ 944,
+      -1, -1,
+      /*0xa757*/ 1059,
+      /*0x10cef*/ 1250,
+      /*0x24d1*/ 824,
+      /*0x13d3*/ 575,
+      /*0x0453*/ 327,
+      /*0x04d3*/ 393,
+      /*0x10ef*/ 509,
+      /*0xa65b*/ 1010,
+      -1,
+      /*0x1e53*/ 654,
+      /*0x1ed3*/ 713,
+      /*0x0153*/ 95,
+      /*0x2cd3*/ 945,
+      -1,
+      /*0xab53*/ 1100,
+      /*0x0561*/ 440,
+      /*0x1f10*/ 744,
+      /*0x24d3*/ 826,
+      -1, -1,
+      /*0x01e1*/ 151,
+      -1,
+      /*0xa659*/ 1009,
+      -1,
+      /*0x051b*/ 429,
+      -1,
+      /*0xa76d*/ 1070,
+      /*0x10cd7*/ 1226,
+      -1,
+      /*0x050b*/ 421,
+      -1, -1,
+      /*0x10d7*/ 485,
+      -1, -1, -1, -1,
+      /*0xa65d*/ 1011,
+      -1,
+      /*0x0563*/ 442,
+      /*0x13f1*/ 605,
+      /*0x0471*/ 348,
+      /*0x04f1*/ 408,
+      /*0x0071*/ 15,
+      /*0x01e3*/ 152,
+      /*0x104f1*/ 1192,
+      /*0x1e71*/ 669,
+      /*0x1ef1*/ 728,
+      /*0x0171*/ 110,
+      /*0x0565*/ 444,
+      -1, -1,
+      /*0x1f26*/ 756,
+      /*0x10ced*/ 1248,
+      /*0x01e5*/ 153,
+      -1,
+      /*0x1f20*/ 750,
+      -1,
+      /*0x10ed*/ 507,
+      /*0x0569*/ 448,
+      -1, -1,
+      /*0x118db*/ 1281,
+      /*0x0192*/ 122,
+      /*0x01e9*/ 155,
+      -1,
+      /*0xa65f*/ 1012,
+      /*0x13ee*/ 602,
+      /*0x026b*/ 217,
+      /*0x0567*/ 446,
+      /*0x006e*/ 12,
+      -1,
+      /*0x104ee*/ 1189,
+      -1,
+      /*0x01e7*/ 154,
+      /*0xa751*/ 1056,
+      /*0x2cee*/ 955,
+      /*0x118d9*/ 1279,
+      -1,
+      /*0x13f3*/ 607,
+      /*0x0473*/ 349,
+      /*0x04f3*/ 409,
+      /*0x0073*/ 17,
+      /*0x026f*/ 219,
+      /*0x104f3*/ 1194,
+      /*0x1e73*/ 670,
+      /*0x1ef3*/ 729,
+      /*0x0173*/ 111,
+      /*0x2cf3*/ 956,
+      /*0x2c61*/ 896,
+      /*0xa753*/ 1057,
+      -1,
+      /*0x118dd*/ 1283,
+      -1, -1,
+      /*0x13ba*/ 550,
+      /*0x043a*/ 302,
+      /*0xa66b*/ 1018,
+      /*0x03f3*/ 289,
+      /*0x1043a*/ 1145,
+      -1, -1,
+      /*0x10cd1*/ 1220,
+      /*0x013a*/ 83,
+      /*0x13d5*/ 577,
+      /*0x0455*/ 329,
+      /*0x04d5*/ 394,
+      /*0x10d1*/ 479,
+      -1,
+      /*0x0257*/ 205,
+      /*0x1e55*/ 655,
+      /*0x1ed5*/ 714,
+      /*0x0155*/ 96,
+      /*0x2cd5*/ 946,
+      /*0x03ba*/ 255,
+      -1,
+      /*0x0586*/ 477,
+      /*0x10cd3*/ 1222,
+      /*0x24d5*/ 828,
+      /*0x01dd*/ 149,
+      -1,
+      /*0x118df*/ 1285,
+      /*0x10d3*/ 481,
+      /*0x2c65*/ 897,
+      -1,
+      /*0x018c*/ 121,
+      /*0x13f5*/ 609,
+      /*0x0475*/ 350,
+      /*0x04f5*/ 410,
+      /*0x0075*/ 19,
+      /*0x1f57*/ 775,
+      /*0x104f5*/ 1196,
+      /*0x1e75*/ 671,
+      /*0x1ef5*/ 730,
+      /*0x0175*/ 112,
+      /*0x13cf*/ 571,
+      /*0x044f*/ 323,
+      /*0x04cf*/ 391,
+      /*0xa657*/ 1008,
+      /*0x1044f*/ 1166,
+      /*0x1e92a*/ 1326,
+      /*0x1e4f*/ 652,
+      /*0x1ecf*/ 711,
+      /*0x014f*/ 93,
+      /*0x2ccf*/ 943,
+      -1,
+      /*0x1e926*/ 1322,
+      /*0x1f00*/ 736,
+      /*0x01df*/ 150,
+      /*0x13b2*/ 542,
+      /*0x0432*/ 294,
+      /*0x1f02*/ 738,
+      -1,
+      /*0x10432*/ 1137,
+      /*0x10cf1*/ 1252,
+      /*0x2d16*/ 979,
+      -1,
+      /*0x2d14*/ 977,
+      /*0x2c5b*/ 892,
+      /*0x10f1*/ 511,
+      /*0x2d0a*/ 967,
+      -1,
+      /*0x2d1b*/ 984,
+      /*0x2d18*/ 981,
+      /*0xa66d*/ 1019,
+      /*0x01a8*/ 130,
+      -1,
+      /*0x2d0b*/ 968,
+      /*0x03b2*/ 247,
+      /*0x1e928*/ 1324,
+      /*0x0188*/ 120,
+      /*0x019e*/ 126,
+      -1,
+      /*0x2c59*/ 890,
+      /*0x056b*/ 450,
+      /*0x1e938*/ 1340,
+      /*0x13c9*/ 565,
+      /*0x0449*/ 317,
+      -1,
+      /*0x01eb*/ 156,
+      /*0x10449*/ 1160,
+      /*0x10cee*/ 1249,
+      /*0x1e49*/ 649,
+      /*0x1ec9*/ 708,
+      /*0x0251*/ 200,
+      /*0x2cc9*/ 940,
+      /*0x10ee*/ 508,
+      -1,
+      /*0x2c5d*/ 894,
+      /*0x056f*/ 454,
+      -1,
+      /*0xa755*/ 1058,
+      -1,
+      /*0x118d7*/ 1277,
+      /*0x01ef*/ 158,
+      /*0x03c9*/ 269,
+      /*0x2d12*/ 975,
+      -1,
+      /*0x10f3*/ 513,
+      /*0x0253*/ 202,
+      -1, -1, -1, -1,
+      /*0x0491*/ 360,
+      /*0x1f51*/ 772,
+      /*0x2d06*/ 963,
+      /*0xa794*/ 1082,
+      /*0x1e11*/ 621,
+      /*0x1e91*/ 685,
+      /*0x0111*/ 64,
+      /*0x2c91*/ 912,
+      /*0xa79b*/ 1085,
+      /*0xa651*/ 1005,
+      -1, -1, -1, -1,
+      /*0x10cd5*/ 1224,
+      -1,
+      /*0x1f53*/ 773,
+      -1,
+      /*0xa74f*/ 1055,
+      /*0x10d5*/ 483,
+      -1,
+      /*0x13cd*/ 569,
+      /*0x044d*/ 321,
+      -1,
+      /*0xa653*/ 1006,
+      /*0x1044d*/ 1164,
+      -1,
+      /*0x1e4d*/ 651,
+      /*0x1ecd*/ 710,
+      /*0x014d*/ 92,
+      /*0x2ccd*/ 942,
+      -1,
+      /*0x0271*/ 220,
+      /*0x0180*/ 117,
+      -1,
+      /*0x2d10*/ 973,
+      /*0x2c38*/ 857,
+      /*0x056d*/ 452,
+      -1, -1,
+      /*0x03cd*/ 273,
+      /*0x10f5*/ 515,
+      /*0x01ed*/ 157,
+      /*0x13cb*/ 567,
+      /*0x044b*/ 319,
+      /*0x10ccf*/ 1218,
+      -1,
+      /*0x1044b*/ 1162,
+      -1,
+      /*0x1e4b*/ 650,
+      /*0x1ecb*/ 709,
+      /*0x014b*/ 91,
+      /*0x2ccb*/ 941,
+      /*0x1f71*/ 785,
+      /*0x2d0c*/ 969,
+      /*0x1e93e*/ 1346,
+      -1, -1, -1,
+      /*0xa749*/ 1052,
+      -1, -1,
+      /*0x03cb*/ 271,
+      -1,
+      /*0x118d1*/ 1271,
+      /*0x13c3*/ 559,
+      /*0x0443*/ 311,
+      -1,
+      /*0x1e92e*/ 1330,
+      /*0x10443*/ 1154,
+      -1,
+      /*0x1e43*/ 646,
+      /*0x1ec3*/ 705,
+      /*0x1e92c*/ 1328,
+      /*0x2cc3*/ 937,
+      /*0x2d20*/ 989,
+      /*0x0580*/ 471,
+      -1, -1,
+      /*0x118d3*/ 1273,
+      /*0x0582*/ 473,
+      -1, -1, -1,
+      /*0x03c3*/ 263,
+      /*0x2c57*/ 888,
+      /*0x10cc9*/ 1212,
+      /*0x13c1*/ 557,
+      /*0x0441*/ 309,
+      -1,
+      /*0x00e1*/ 26,
+      /*0x10441*/ 1152,
+      /*0x1f73*/ 787,
+      /*0x1e41*/ 645,
+      /*0x1ec1*/ 704,
+      -1,
+      /*0x2cc1*/ 936,
+      -1, -1,
+      /*0x2d08*/ 965,
+      /*0x2d1e*/ 987,
+      -1,
+      /*0x13a4*/ 528,
+      -1,
+      /*0xa78c*/ 1079,
+      -1,
+      /*0x03c1*/ 262,
+      -1,
+      /*0xa74d*/ 1054,
+      /*0x049d*/ 366,
+      -1, -1, -1,
+      /*0x1e1d*/ 627,
+      /*0x00e3*/ 28,
+      /*0x011d*/ 70,
+      /*0x2c9d*/ 918,
+      /*0x1f55*/ 774,
+      /*0x0275*/ 222,
+      -1,
+      /*0x2c3e*/ 863,
+      -1,
+      /*0x13c7*/ 563,
+      /*0x0447*/ 315,
+      /*0x00e5*/ 30,
+      /*0xa655*/ 1007,
+      /*0x10447*/ 1158,
+      /*0x024f*/ 198,
+      /*0x1e47*/ 648,
+      /*0x1ec7*/ 707,
+      /*0xa74b*/ 1053,
+      /*0x2cc7*/ 939,
+      /*0x0371*/ 236,
+      -1,
+      /*0x00e9*/ 34,
+      /*0x10ccd*/ 1216,
+      /*0x13c5*/ 561,
+      /*0x0445*/ 313,
+      /*0x0571*/ 456,
+      /*0x1f75*/ 789,
+      /*0x10445*/ 1156,
+      /*0x03c7*/ 267,
+      /*0x1e45*/ 647,
+      /*0x1ec5*/ 706,
+      /*0x00e7*/ 32,
+      /*0x2cc5*/ 938,
+      -1, -1, -1, -1, -1, -1,
+      /*0xa743*/ 1049,
+      -1, -1,
+      /*0x03c5*/ 265,
+      /*0xa64f*/ 1004,
+      /*0x10ccb*/ 1214,
+      -1, -1,
+      /*0x2c51*/ 882,
+      -1,
+      /*0x1f32*/ 760,
+      -1,
+      /*0x13e6*/ 594,
+      /*0x056e*/ 453,
+      /*0x2d00*/ 957,
+      /*0x0066*/ 5,
+      /*0x0249*/ 195,
+      /*0x104e6*/ 1181,
+      /*0x2d02*/ 959,
+      /*0x0373*/ 237,
+      -1,
+      /*0x2d0e*/ 971,
+      /*0xa741*/ 1048,
+      /*0x2c53*/ 884,
+      -1,
+      /*0x0573*/ 458,
+      /*0x24e6*/ 845,
+      /*0x10cc3*/ 1206,
+      /*0x118d5*/ 1275,
+      -1,
+      /*0x01f3*/ 159,
+      -1,
+      /*0x13bf*/ 555,
+      /*0x043f*/ 307,
+      /*0x04bf*/ 383,
+      -1,
+      /*0x1043f*/ 1150,
+      /*0x028a*/ 230,
+      /*0x1e3f*/ 644,
+      /*0x1ebf*/ 703,
+      /*0x019a*/ 125,
+      /*0x2cbf*/ 935,
+      /*0x0211*/ 173,
+      /*0x13ec*/ 600,
+      /*0x028b*/ 231,
+      /*0xa649*/ 1001,
+      /*0x006c*/ 10,
+      -1,
+      /*0x104ec*/ 1187,
+      /*0x10cc1*/ 1204,
+      /*0x1e93a*/ 1342,
+      /*0x03bf*/ 260,
+      /*0x2cec*/ 954,
+      /*0x1f04*/ 740,
+      -1, -1, -1,
+      /*0xa747*/ 1051,
+      /*0x13a2*/ 526,
+      /*0x118cf*/ 1269,
+      /*0x13b7*/ 547,
+      /*0x0437*/ 299,
+      /*0x04b7*/ 379,
+      /*0x1f11*/ 745,
+      /*0x10437*/ 1142,
+      /*0x024d*/ 197,
+      /*0x1e37*/ 640,
+      /*0x1eb7*/ 699,
+      /*0x0137*/ 82,
+      /*0x2cb7*/ 931,
+      -1,
+      /*0xa745*/ 1050,
+      /*0x0575*/ 460,
+      /*0x0292*/ 233,
+      /*0x13b5*/ 545,
+      /*0x0435*/ 297,
+      /*0x04b5*/ 378,
+      /*0x01f5*/ 160,
+      /*0x10435*/ 1140,
+      /*0x03b7*/ 252,
+      /*0x1e35*/ 639,
+      /*0x1eb5*/ 698,
+      /*0x0135*/ 81,
+      /*0x2cb5*/ 930,
+      /*0x10cc7*/ 1210,
+      -1, -1,
+      /*0x024b*/ 196,
+      -1,
+      /*0x16e61*/ 1287,
+      -1, -1, -1,
+      /*0x03b5*/ 250,
+      /*0xa64d*/ 1003,
+      -1, -1,
+      /*0x00eb*/ 36,
+      /*0x10cc5*/ 1208,
+      /*0x2c73*/ 902,
+      /*0x118c9*/ 1263,
+      /*0x13b3*/ 543,
+      /*0x0433*/ 295,
+      /*0x04b3*/ 377,
+      /*0x1e932*/ 1334,
+      /*0x10433*/ 1138,
+      -1,
+      /*0x1e33*/ 638,
+      /*0x1eb3*/ 697,
+      /*0x0133*/ 80,
+      /*0x2cb3*/ 929,
+      -1,
+      /*0x00ef*/ 40,
+      /*0x16e63*/ 1289,
+      -1,
+      /*0x2c3a*/ 859,
+      /*0xa64b*/ 1002,
+      /*0x13c0*/ 556,
+      /*0x0440*/ 308,
+      /*0xa73f*/ 1047,
+      /*0x03b3*/ 248,
+      /*0x10440*/ 1151,
+      -1,
+      /*0x16e65*/ 1291,
+      /*0x2c55*/ 886,
+      /*0x0140*/ 86,
+      /*0x10ce6*/ 1241,
+      /*0x01c9*/ 139,
+      -1, -1,
+      /*0x1f43*/ 769,
+      /*0x10e6*/ 500,
+      -1,
+      /*0x16e69*/ 1295,
+      -1,
+      /*0x028c*/ 232,
+      /*0x03c0*/ 261,
+      -1,
+      /*0xa643*/ 998,
+      -1,
+      /*0x0479*/ 352,
+      /*0x04f9*/ 412,
+      /*0x0079*/ 23,
+      /*0x16e67*/ 1293,
+      /*0x104f9*/ 1200,
+      /*0x1e79*/ 673,
+      /*0x1ef9*/ 732,
+      /*0xa737*/ 1043,
+      /*0x0511*/ 424,
+      /*0x118cd*/ 1267,
+      /*0x1d79*/ 610,
+      /*0x021d*/ 179,
+      /*0x1f41*/ 767,
+      -1, -1,
+      /*0x2c4f*/ 880,
+      -1,
+      /*0x10cec*/ 1247,
+      -1, -1,
+      /*0xa641*/ 997,
+      /*0xa735*/ 1042,
+      /*0x10ec*/ 506,
+      /*0x2171*/ 807,
+      /*0x00ed*/ 38,
+      -1,
+      /*0x0247*/ 194,
+      /*0x1f24*/ 754,
+      /*0x13ad*/ 537,
+      /*0x2c32*/ 851,
+      /*0x04ad*/ 374,
+      /*0x118cb*/ 1265,
+      /*0x1042d*/ 1132,
+      /*0x2d1a*/ 983,
+      /*0x1e2d*/ 635,
+      /*0x1ead*/ 694,
+      /*0x012d*/ 78,
+      /*0x2cad*/ 926,
+      -1, -1,
+      /*0x0288*/ 228,
+      /*0x029e*/ 235,
+      -1,
+      /*0x13a5*/ 529,
+      -1,
+      /*0x04a5*/ 370,
+      /*0x0584*/ 475,
+      /*0x03ad*/ 243,
+      /*0xa733*/ 1041,
+      /*0x1e25*/ 631,
+      /*0x1ea5*/ 690,
+      /*0x0125*/ 74,
+      /*0x2ca5*/ 922,
+      /*0x118c3*/ 1257,
+      -1,
+      /*0xa647*/ 1000,
+      /*0x2c49*/ 874,
+      /*0x13a3*/ 527,
+      -1,
+      /*0x04a3*/ 369,
+      -1,
+      /*0x1f45*/ 771,
+      /*0x2173*/ 809,
+      /*0x1e23*/ 630,
+      /*0x1ea3*/ 689,
+      /*0x0123*/ 73,
+      /*0x2ca3*/ 921,
+      /*0xff59*/ 1125,
+      /*0x0266*/ 213,
+      /*0xa645*/ 999,
+      -1, -1,
+      /*0x048f*/ 359,
+      -1, -1,
+      /*0x118c1*/ 1255,
+      /*0x1e0f*/ 620,
+      /*0x1e8f*/ 684,
+      /*0x010f*/ 63,
+      /*0x2c8f*/ 911,
+      /*0xa69b*/ 1033,
+      -1, -1, -1,
+      /*0x1e943*/ 1351,
+      /*0xa68b*/ 1025,
+      -1, -1,
+      /*0x023f*/ 191,
+      /*0x1f66*/ 782,
+      -1,
+      /*0x10cc0*/ 1203,
+      -1, -1,
+      /*0x1fe1*/ 803,
+      -1,
+      /*0x0481*/ 356,
+      /*0x2d1c*/ 985,
+      -1,
+      /*0x026c*/ 218,
+      /*0x1e01*/ 613,
+      /*0x1e81*/ 677,
+      /*0x0101*/ 56,
+      /*0x2c81*/ 904,
+      -1,
+      /*0x2c4d*/ 878,
+      /*0x1e941*/ 1349,
+      /*0x0280*/ 224,
+      /*0x16e6b*/ 1297,
+      /*0x2175*/ 811,
+      /*0x118c7*/ 1261,
+      /*0x0282*/ 225,
+      -1, -1, -1,
+      /*0xa72d*/ 1039,
+      -1,
+      /*0x051d*/ 430,
+      /*0x10f9*/ 519,
+      -1, -1,
+      /*0x1e924*/ 1320,
+      -1,
+      /*0x16e6f*/ 1301,
+      /*0x118c5*/ 1259,
+      /*0x00f1*/ 42,
+      -1,
+      /*0x2c4b*/ 876,
+      /*0x1fe5*/ 804,
+      -1,
+      /*0xa725*/ 1035,
+      -1,
+      /*0x13a7*/ 531,
+      -1,
+      /*0x04a7*/ 371,
+      /*0x1f22*/ 752,
+      /*0x2d04*/ 961,
+      /*0x1f37*/ 765,
+      /*0x1e27*/ 632,
+      /*0x1ea7*/ 691,
+      /*0x0127*/ 75,
+      /*0x2ca7*/ 923,
+      -1, -1,
+      /*0xa723*/ 1034,
+      -1,
+      /*0x2d11*/ 974,
+      -1, -1,
+      /*0x2c43*/ 868,
+      -1,
+      /*0x1f35*/ 763,
+      /*0x00ee*/ 39,
+      -1,
+      /*0x047b*/ 353,
+      /*0x04fb*/ 413,
+      -1,
+      /*0x0233*/ 189,
+      /*0x104fb*/ 1202,
+      /*0x1e7b*/ 674,
+      /*0x1efb*/ 733,
+      /*0x13b1*/ 541,
+      /*0x0431*/ 293,
+      /*0x04b1*/ 376,
+      /*0x00f3*/ 44,
+      /*0x10431*/ 1136,
+      -1,
+      /*0x1e31*/ 637,
+      /*0x1eb1*/ 696,
+      -1,
+      /*0x2cb1*/ 928,
+      /*0x2c41*/ 866,
+      /*0x03fb*/ 291,
+      /*0x0240*/ 192,
+      /*0x0566*/ 445,
+      /*0x16e6d*/ 1299,
+      /*0x047d*/ 354,
+      /*0x04fd*/ 414,
+      /*0x1f33*/ 761,
+      -1,
+      /*0x03b1*/ 246,
+      /*0x1e7d*/ 675,
+      /*0x1efd*/ 734,
+      /*0xff57*/ 1123,
+      /*0x047f*/ 355,
+      /*0x04ff*/ 415,
+      /*0x1d7d*/ 611,
+      -1, -1,
+      /*0x1e7f*/ 676,
+      /*0x1eff*/ 735,
+      /*0x13bd*/ 553,
+      /*0x043d*/ 305,
+      /*0x04bd*/ 382,
+      /*0x1f40*/ 766,
+      /*0x1043d*/ 1148,
+      /*0xa791*/ 1080,
+      /*0x1e3d*/ 643,
+      /*0x1ebd*/ 702,
+      /*0x01bf*/ 137,
+      /*0x2cbd*/ 934,
+      -1, -1,
+      /*0x1e93f*/ 1347,
+      -1,
+      /*0x056c*/ 451,
+      /*0x2c47*/ 872,
+      -1, -1, -1,
+      /*0x03bd*/ 258,
+      /*0x00f5*/ 46,
+      -1,
+      /*0x007a*/ 24,
+      -1,
+      /*0x104fa*/ 1201,
+      /*0x1f79*/ 793,
+      -1,
+      /*0x017a*/ 114,
+      /*0xa727*/ 1036,
+      /*0x2c45*/ 870,
+      /*0x13b9*/ 549,
+      /*0x0439*/ 301,
+      /*0x04b9*/ 380,
+      /*0x022d*/ 186,
+      /*0x10439*/ 1144,
+      -1,
+      /*0x1e39*/ 641,
+      /*0x1eb9*/ 700,
+      /*0x1e922*/ 1318,
+      /*0x2cb9*/ 932,
+      /*0x1e937*/ 1339,
+      -1,
+      /*0x13c2*/ 558,
+      /*0x0442*/ 310,
+      /*0x04c2*/ 384,
+      -1,
+      /*0x10442*/ 1153,
+      -1,
+      /*0x0225*/ 182,
+      /*0x03b9*/ 254,
+      /*0x0142*/ 87,
+      /*0x13d0*/ 572,
+      /*0x0450*/ 324,
+      -1,
+      /*0x1e935*/ 1337,
+      /*0x13f2*/ 606,
+      -1,
+      /*0x2c66*/ 898,
+      /*0x0072*/ 16,
+      /*0x2d24*/ 993,
+      /*0x104f2*/ 1193,
+      -1,
+      /*0x0223*/ 181,
+      -1,
+      /*0x2d1d*/ 986,
+      /*0x24d0*/ 823,
+      /*0x118c0*/ 1254,
+      /*0xff51*/ 1117,
+      -1,
+      /*0x1f25*/ 755,
+      -1, -1,
+      /*0xa7c3*/ 1099,
+      -1,
+      /*0x03f2*/ 288,
+      /*0x020f*/ 172,
+      -1,
+      /*0x2c3f*/ 864,
+      -1,
+      /*0xa77f*/ 1074,
+      -1,
+      /*0x1e933*/ 1335,
+      /*0xff53*/ 1119,
+      /*0x1f23*/ 753,
+      -1,
+      /*0x16e71*/ 1303,
+      -1,
+      /*0xa73d*/ 1046,
+      /*0x2c6c*/ 901,
+      /*0x13bb*/ 551,
+      /*0x043b*/ 303,
+      /*0x04bb*/ 381,
+      -1,
+      /*0x1043b*/ 1146,
+      -1,
+      /*0x1e3b*/ 642,
+      /*0x1ebb*/ 701,
+      /*0x1e940*/ 1348,
+      /*0x2cbb*/ 933,
+      /*0x0201*/ 165,
+      -1, -1, -1,
+      /*0x10fd*/ 521,
+      -1,
+      /*0x2c37*/ 856,
+      /*0xa77a*/ 1072,
+      -1,
+      /*0x03bb*/ 256,
+      -1,
+      /*0x0579*/ 464,
+      /*0x10ff*/ 523,
+      /*0x16e6e*/ 1300,
+      -1,
+      /*0xa79d*/ 1086,
+      /*0x01f9*/ 161,
+      /*0x017c*/ 115,
+      /*0xa739*/ 1044,
+      -1,
+      /*0x2c35*/ 854,
+      /*0x1f01*/ 737,
+      /*0x13af*/ 539,
+      -1,
+      /*0x04af*/ 375,
+      /*0x16e73*/ 1305,
+      /*0x1042f*/ 1134,
+      -1,
+      /*0x1e2f*/ 636,
+      /*0x1eaf*/ 695,
+      /*0x012f*/ 79,
+      /*0x2caf*/ 927,
+      -1, -1,
+      /*0x1e05*/ 615,
+      /*0x1e85*/ 679,
+      /*0x0105*/ 58,
+      /*0x2c85*/ 906,
+      /*0x0227*/ 183,
+      /*0x10fa*/ 520,
+      /*0x052d*/ 438,
+      /*0x03af*/ 245,
+      -1, -1,
+      /*0x13a9*/ 533,
+      /*0x01ad*/ 131,
+      /*0x04a9*/ 372,
+      /*0x2c33*/ 852,
+      /*0x10429*/ 1128,
+      /*0x1e92d*/ 1329,
+      /*0x1e29*/ 633,
+      /*0x1ea9*/ 692,
+      /*0x0129*/ 76,
+      /*0x2ca9*/ 924,
+      -1,
+      /*0x0525*/ 434,
+      -1,
+      /*0x10cc2*/ 1205,
+      -1,
+      /*0x1f27*/ 757,
+      /*0x01a5*/ 129,
+      -1, -1,
+      /*0x2c40*/ 865,
+      /*0x1e925*/ 1321,
+      -1,
+      /*0x10cd0*/ 1219,
+      /*0x0231*/ 188,
+      /*0x2d22*/ 991,
+      /*0x0523*/ 433,
+      /*0x10cf2*/ 1253,
+      /*0x10d0*/ 478,
+      /*0x16e75*/ 1307,
+      -1,
+      /*0x01a3*/ 128,
+      /*0x10f2*/ 512,
+      -1,
+      /*0xa73b*/ 1045,
+      /*0x1e923*/ 1319,
+      /*0x1fd1*/ 801,
+      /*0x1f7b*/ 795,
+      /*0x027d*/ 223,
+      /*0x050f*/ 423,
+      -1,
+      /*0xff55*/ 1121,
+      /*0x13ce*/ 570,
+      /*0x044e*/ 322,
+      /*0x04ce*/ 390,
+      /*0x1f31*/ 759,
+      /*0x1044e*/ 1165,
+      -1, -1,
+      /*0xa7bf*/ 1098,
+      /*0x0477*/ 351,
+      /*0x04f7*/ 411,
+      /*0x0077*/ 21,
+      /*0xa77c*/ 1073,
+      /*0x104f7*/ 1198,
+      /*0x1e77*/ 672,
+      /*0x1ef7*/ 731,
+      /*0x0177*/ 113,
+      -1,
+      /*0x1f7d*/ 797,
+      -1,
+      /*0x03ce*/ 274,
+      -1,
+      /*0x0501*/ 416,
+      -1, -1,
+      /*0xa72f*/ 1040,
+      /*0x1e03*/ 614,
+      /*0x1e83*/ 678,
+      /*0x0103*/ 57,
+      /*0x2c83*/ 905,
+      /*0x13e8*/ 596,
+      /*0xff4f*/ 1115,
+      -1,
+      /*0x0068*/ 7,
+      -1,
+      /*0x104e8*/ 1183,
+      /*0xa7b7*/ 1094,
+      /*0x13c6*/ 562,
+      /*0x0446*/ 314,
+      /*0x04c6*/ 386,
+      -1,
+      /*0x10446*/ 1157,
+      -1,
+      /*0x13f0*/ 604,
+      /*0x24e8*/ 847,
+      /*0x0146*/ 89,
+      /*0x0070*/ 14,
+      /*0xa729*/ 1037,
+      /*0x104f0*/ 1191,
+      -1,
+      /*0xa7b5*/ 1093,
+      -1, -1,
+      /*0x1f7a*/ 794,
+      -1,
+      /*0x0242*/ 193,
+      /*0x03c6*/ 266,
+      -1, -1,
+      /*0x0499*/ 364,
+      /*0x0527*/ 435,
+      -1, -1,
+      /*0x1e19*/ 625,
+      /*0x0250*/ 199,
+      /*0x0119*/ 68,
+      /*0x2c99*/ 916,
+      -1,
+      /*0x0272*/ 221,
+      /*0x1e927*/ 1323,
+      /*0x0581*/ 472,
+      -1,
+      /*0xff49*/ 1109,
+      -1, -1,
+      /*0x037b*/ 239,
+      /*0x1f42*/ 768,
+      -1, -1,
+      /*0x00e6*/ 31,
+      -1,
+      /*0x057b*/ 466,
+      -1,
+      /*0x13c4*/ 560,
+      /*0x0444*/ 312,
+      /*0x04c4*/ 385,
+      /*0x01fb*/ 162,
+      /*0x10444*/ 1155,
+      -1,
+      /*0x1f72*/ 786,
+      -1,
+      /*0x0144*/ 88,
+      -1, -1,
+      /*0x2d2d*/ 996,
+      -1, -1,
+      /*0x037d*/ 241,
+      /*0x1e931*/ 1333,
+      -1, -1, -1,
+      /*0x03c4*/ 264,
+      /*0x057d*/ 468,
+      /*0x2179*/ 815,
+      /*0x13d6*/ 578,
+      /*0x0456*/ 330,
+      -1,
+      /*0x01fd*/ 163,
+      /*0x2d25*/ 994,
+      /*0x00ec*/ 37,
+      /*0x057f*/ 470,
+      -1, -1,
+      /*0x029d*/ 234,
+      /*0x10cce*/ 1217,
+      /*0x01ff*/ 164,
+      -1, -1,
+      /*0x24d6*/ 829,
+      -1,
+      /*0xff4d*/ 1113,
+      -1,
+      /*0x2d23*/ 992,
+      /*0x01bd*/ 136,
+      /*0x0495*/ 362,
+      -1,
+      /*0x10f7*/ 517,
+      /*0x1e93d*/ 1345,
+      /*0x1e15*/ 623,
+      /*0x1e95*/ 687,
+      /*0x0115*/ 66,
+      /*0x2c95*/ 914,
+      -1,
+      /*0x022f*/ 187,
+      -1,
+      /*0x2d0f*/ 972,
+      -1,
+      /*0x057a*/ 465,
+      /*0x118c2*/ 1256,
+      /*0x0205*/ 167,
+      -1,
+      /*0x1f7c*/ 796,
+      /*0xff4b*/ 1111,
+      /*0x10ce8*/ 1243,
+      -1, -1, -1,
+      /*0x118d0*/ 1270,
+      /*0x10e8*/ 502,
+      /*0x13ea*/ 598,
+      /*0x10cc6*/ 1209,
+      -1,
+      /*0x006a*/ 8,
+      /*0x01b9*/ 135,
+      /*0x104ea*/ 1185,
+      /*0x0229*/ 184,
+      /*0x10cf0*/ 1251,
+      /*0x1e939*/ 1341,
+      /*0xa7a5*/ 1090,
+      /*0x2d01*/ 958,
+      /*0x1f05*/ 741,
+      /*0x10f0*/ 510,
+      /*0x2c31*/ 850,
+      -1,
+      /*0xff43*/ 1103,
+      -1, -1, -1, -1,
+      /*0x1e942*/ 1350,
+      -1, -1,
+      /*0xa7a3*/ 1089,
+      /*0x0572*/ 457,
+      /*0x01d0*/ 142,
+      /*0x13a1*/ 525,
+      -1,
+      /*0x04a1*/ 368,
+      -1, -1, -1,
+      /*0x1e21*/ 629,
+      /*0x1ea1*/ 688,
+      /*0x0121*/ 72,
+      /*0x2ca1*/ 920,
+      /*0xa691*/ 1028,
+      /*0xff41*/ 1101,
+      /*0x1e07*/ 616,
+      /*0x1e87*/ 680,
+      /*0x0107*/ 59,
+      /*0x2c87*/ 907,
+      -1,
+      /*0x2c3d*/ 862,
+      -1,
+      /*0x0493*/ 361,
+      -1,
+      /*0x10cc4*/ 1207,
+      /*0x2d27*/ 995,
+      /*0x1e13*/ 622,
+      /*0x1e93*/ 686,
+      /*0x0113*/ 65,
+      /*0x2c93*/ 913,
+      -1, -1,
+      /*0x13ab*/ 535,
+      /*0x00f9*/ 49,
+      /*0x04ab*/ 373,
+      -1,
+      /*0x1042b*/ 1130,
+      /*0xa781*/ 1075,
+      /*0x1e2b*/ 634,
+      /*0x1eab*/ 693,
+      /*0x012b*/ 77,
+      /*0x2cab*/ 925,
+      /*0x13e4*/ 592,
+      /*0x0203*/ 166,
+      /*0x1e93b*/ 1343,
+      /*0x0064*/ 3,
+      /*0x10cd6*/ 1225,
+      /*0x104e4*/ 1179,
+      /*0x037c*/ 240,
+      /*0xff47*/ 1107,
+      /*0x2c39*/ 858,
+      /*0x10d6*/ 484,
+      /*0x1f77*/ 791,
+      /*0x0268*/ 214,
+      /*0x057c*/ 467,
+      /*0x13e2*/ 590,
+      /*0x24e4*/ 843,
+      /*0x16e66*/ 1292,
+      /*0x0062*/ 1,
+      -1,
+      /*0x104e2*/ 1177,
+      -1,
+      /*0x2c42*/ 867,
+      /*0xff45*/ 1105,
+      /*0x1f03*/ 739,
+      -1, -1,
+      /*0x052f*/ 439,
+      -1,
+      /*0x24e2*/ 841,
+      -1,
+      /*0x2c50*/ 881,
+      -1,
+      /*0x0505*/ 418,
+      -1,
+      /*0xa7a7*/ 1091,
+      /*0x1e92f*/ 1331,
+      -1,
+      /*0x0185*/ 119,
+      /*0x13e0*/ 588,
+      /*0x0219*/ 177,
+      /*0x13da*/ 582,
+      /*0x045a*/ 334,
+      -1,
+      /*0x104e0*/ 1175,
+      /*0x217b*/ 817,
+      /*0x104da*/ 1169,
+      /*0x1f70*/ 784,
+      /*0x16e6c*/ 1298,
+      /*0x0529*/ 436,
+      /*0x0078*/ 22,
+      /*0x10cea*/ 1245,
+      /*0x104f8*/ 1199,
+      /*0x24e0*/ 839,
+      -1,
+      /*0x24da*/ 833,
+      /*0x10ea*/ 504,
+      -1,
+      /*0x1e929*/ 1325,
+      /*0x13dc*/ 584,
+      /*0x045c*/ 336,
+      /*0x13cc*/ 568,
+      /*0x044c*/ 320,
+      /*0x04cc*/ 389,
+      /*0x104dc*/ 1171,
+      /*0x1044c*/ 1163,
+      /*0x03f8*/ 290,
+      /*0x217d*/ 819,
+      /*0x118ce*/ 1268,
+      /*0x2c3b*/ 860,
+      -1,
+      /*0x13d8*/ 580,
+      /*0x0458*/ 332,
+      /*0x24dc*/ 835,
+      -1,
+      /*0x217f*/ 821,
+      /*0x104d8*/ 1167,
+      -1, -1,
+      /*0xa72b*/ 1038,
+      /*0x03cc*/ 272,
+      /*0x0585*/ 476,
+      /*0x13d4*/ 576,
+      /*0x0454*/ 328,
+      -1,
+      /*0x24d8*/ 831,
+      -1,
+      /*0x1f44*/ 770,
+      /*0x0256*/ 204,
+      /*0x13d2*/ 574,
+      /*0x0452*/ 326,
+      /*0x0377*/ 238,
+      -1, -1,
+      /*0xa7bd*/ 1097,
+      /*0x01ce*/ 141,
+      /*0x24d4*/ 827,
+      /*0x0577*/ 462,
+      -1, -1,
+      /*0x017e*/ 116,
+      /*0x0497*/ 363,
+      /*0x217a*/ 816,
+      /*0x24d2*/ 825,
+      /*0x118c6*/ 1260,
+      /*0x1e17*/ 624,
+      /*0x0215*/ 175,
+      /*0x0117*/ 67,
+      /*0x2c97*/ 915,
+      /*0x0503*/ 417,
+      -1,
+      /*0x0076*/ 20,
+      /*0x13f4*/ 608,
+      /*0x104f6*/ 1197,
+      /*0x0183*/ 118,
+      /*0x0074*/ 18,
+      /*0x10ce4*/ 1239,
+      /*0x104f4*/ 1195,
+      -1,
+      /*0x0568*/ 447,
+      -1,
+      /*0x10e4*/ 498,
+      /*0x13bc*/ 552,
+      /*0x043c*/ 304,
+      /*0xa7b9*/ 1095,
+      -1,
+      /*0x1043c*/ 1147,
+      /*0x1f15*/ 749,
+      -1,
+      /*0x10ce2*/ 1237,
+      /*0x013c*/ 84,
+      /*0x01c6*/ 138,
+      /*0x0570*/ 455,
+      /*0x026a*/ 216,
+      /*0x10e2*/ 496,
+      /*0x13c8*/ 564,
+      /*0x0448*/ 316,
+      /*0x04c8*/ 387,
+      /*0x2172*/ 808,
+      /*0x10448*/ 1159,
+      -1,
+      /*0x03bc*/ 257,
+      -1,
+      /*0x0148*/ 90,
+      /*0x16e79*/ 1311,
+      -1,
+      /*0x0519*/ 428,
+      /*0x00fb*/ 51,
+      -1, -1,
+      /*0x118c4*/ 1258,
+      /*0x0199*/ 124,
+      -1,
+      /*0x10ce0*/ 1235,
+      /*0x03c8*/ 268,
+      /*0x10cda*/ 1229,
+      -1,
+      /*0x0583*/ 474,
+      /*0x10e0*/ 494,
+      -1,
+      /*0x10da*/ 488,
+      -1, -1, -1,
+      /*0x2c4e*/ 879,
+      /*0x0207*/ 168,
+      /*0x10f8*/ 518,
+      -1, -1,
+      /*0x00fd*/ 53,
+      -1,
+      /*0x2d05*/ 962,
+      /*0x118d6*/ 1276,
+      /*0x10cdc*/ 1231,
+      -1,
+      /*0x10ccc*/ 1215,
+      /*0x0213*/ 174,
+      /*0x00ff*/ 55,
+      /*0x10dc*/ 490,
+      -1,
+      /*0x1f21*/ 751,
+      -1, -1,
+      /*0xa7bb*/ 1096,
+      -1,
+      /*0x10cd8*/ 1227,
+      /*0x1f07*/ 743,
+      -1,
+      /*0x022b*/ 185,
+      -1,
+      /*0x10d8*/ 486,
+      /*0x217c*/ 818,
+      -1,
+      /*0x2c68*/ 899,
+      -1, -1,
+      /*0x10cd4*/ 1223,
+      /*0x1f13*/ 747,
+      -1,
+      /*0x01d6*/ 145,
+      /*0x2c46*/ 871,
+      /*0x10d4*/ 482,
+      -1,
+      /*0x10cd2*/ 1221,
+      /*0x00fa*/ 50,
+      /*0x13ca*/ 566,
+      /*0x044a*/ 318,
+      /*0x04ca*/ 388,
+      /*0x10d2*/ 480,
+      /*0x1044a*/ 1161,
+      /*0x2184*/ 822,
+      /*0x10fe*/ 522,
+      /*0x0515*/ 426,
+      -1, -1, -1, -1,
+      /*0x0195*/ 123,
+      -1,
+      /*0x1f64*/ 780,
+      -1,
+      /*0xa785*/ 1077,
+      /*0x13b6*/ 546,
+      /*0x0436*/ 298,
+      /*0x03ca*/ 270,
+      -1,
+      /*0x10436*/ 1141,
+      /*0x10f6*/ 516,
+      -1,
+      /*0x13b4*/ 544,
+      /*0x0434*/ 296,
+      /*0x10f4*/ 514,
+      /*0x1f62*/ 778,
+      /*0x10434*/ 1139,
+      -1,
+      /*0x0260*/ 209,
+      -1,
+      /*0xa7a9*/ 1092,
+      /*0x048d*/ 358,
+      /*0x056a*/ 449,
+      /*0x00f2*/ 43,
+      /*0x03b6*/ 251,
+      /*0x1e0d*/ 619,
+      /*0x1e8d*/ 683,
+      /*0x010d*/ 62,
+      /*0x2c8d*/ 910,
+      /*0x2c44*/ 869,
+      /*0x2d03*/ 960,
+      /*0x03b4*/ 249,
+      /*0x10cc8*/ 1211,
+      /*0x1e09*/ 617,
+      /*0x1e89*/ 681,
+      /*0x0109*/ 60,
+      /*0x2c89*/ 908,
+      -1,
+      /*0x025c*/ 208,
+      /*0x1f60*/ 776,
+      -1, -1,
+      /*0x13b0*/ 540,
+      /*0x0430*/ 292,
+      /*0x13de*/ 586,
+      /*0x045e*/ 338,
+      /*0x10430*/ 1135,
+      /*0x1f78*/ 792,
+      /*0x0521*/ 432,
+      /*0x104de*/ 1173,
+      /*0x214e*/ 805,
+      /*0x2c56*/ 887,
+      -1,
+      /*0x01a1*/ 127,
+      /*0x0507*/ 419,
+      -1,
+      /*0x049f*/ 367,
+      /*0x2177*/ 813,
+      /*0x24de*/ 837,
+      -1,
+      /*0x1e1f*/ 628,
+      /*0x0254*/ 203,
+      /*0x011f*/ 71,
+      /*0x2c9f*/ 919,
+      -1,
+      /*0x0513*/ 425,
+      -1,
+      /*0x2d19*/ 982,
+      /*0x0252*/ 201,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x00fc*/ 52,
+      /*0x052b*/ 437,
+      /*0x0217*/ 176,
+      -1,
+      /*0xa783*/ 1076,
+      /*0x16e7b*/ 1313,
+      -1, -1, -1, -1,
+      /*0x1e92b*/ 1327,
+      /*0x0564*/ 443,
+      -1, -1, -1, -1,
+      /*0x2170*/ 806,
+      -1, -1, -1,
+      /*0x2c6a*/ 900,
+      -1, -1, -1,
+      /*0x0562*/ 441,
+      /*0x023c*/ 190,
+      /*0x10cca*/ 1213,
+      /*0x16e7d*/ 1315,
+      /*0x118da*/ 1280,
+      -1, -1, -1,
+      /*0x1f76*/ 790,
+      -1, -1,
+      /*0x16e7f*/ 1317,
+      /*0x1f74*/ 788,
+      -1, -1, -1, -1,
+      /*0xa799*/ 1084,
+      -1, -1,
+      /*0xa68f*/ 1027,
+      -1,
+      /*0x118dc*/ 1282,
+      -1,
+      /*0x118cc*/ 1266,
+      -1, -1, -1, -1, -1, -1,
+      /*0x01da*/ 147,
+      /*0x0578*/ 463,
+      /*0x2d15*/ 978,
+      /*0x118d8*/ 1278,
+      -1, -1, -1,
+      /*0x16e7a*/ 1312,
+      -1, -1, -1, -1, -1,
+      /*0xa681*/ 1020,
+      /*0x118d4*/ 1274,
+      -1, -1, -1,
+      /*0x01dc*/ 148,
+      -1,
+      /*0x01cc*/ 140,
+      /*0x118d2*/ 1272,
+      -1, -1, -1, -1, -1,
+      /*0x10cde*/ 1233,
+      -1, -1,
+      /*0x01d8*/ 146,
+      -1,
+      /*0x10de*/ 492,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x01d4*/ 144,
+      -1,
+      /*0x16e72*/ 1304,
+      -1, -1,
+      /*0x057e*/ 469,
+      -1,
+      /*0x01d2*/ 143,
+      -1,
+      /*0x00e8*/ 33,
+      -1, -1,
+      /*0x0517*/ 427,
+      -1,
+      /*0x2d21*/ 990,
+      -1, -1, -1, -1, -1,
+      /*0x2d07*/ 964,
+      /*0x0576*/ 461,
+      /*0x00f0*/ 41,
+      /*0xff42*/ 1102,
+      -1,
+      /*0x0574*/ 459,
+      /*0x118c8*/ 1262,
+      -1,
+      /*0x2c5a*/ 891,
+      -1, -1,
+      /*0x2d13*/ 976,
+      /*0xff50*/ 1116,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x020d*/ 171,
+      /*0x1e93c*/ 1344,
+      -1,
+      /*0x2c5c*/ 893,
+      -1,
+      /*0x2c4c*/ 877,
+      -1,
+      /*0x1f36*/ 764,
+      /*0x0209*/ 169,
+      -1, -1, -1,
+      /*0x16e7c*/ 1314,
+      -1,
+      /*0x1f34*/ 762,
+      /*0x2c58*/ 889,
+      -1, -1, -1,
+      /*0x1fb1*/ 799,
+      -1,
+      /*0xa7a1*/ 1088,
+      -1, -1, -1, -1,
+      /*0x2c54*/ 885,
+      /*0xa787*/ 1078,
+      -1, -1, -1, -1, -1,
+      /*0x2c52*/ 883,
+      -1,
+      /*0x021f*/ 180,
+      -1, -1,
+      /*0xa793*/ 1081,
+      -1, -1, -1, -1, -1,
+      /*0x1f30*/ 758,
+      -1, -1, -1,
+      /*0x0283*/ 226,
+      -1, -1, -1,
+      /*0x2c76*/ 903,
+      /*0x118ca*/ 1264,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2c3c*/ 861,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2c48*/ 873,
+      -1, -1, -1, -1, -1, -1,
+      /*0x00ea*/ 35,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x2178*/ 814,
+      /*0x16e77*/ 1309,
+      -1,
+      /*0x01b6*/ 134,
+      -1, -1,
+      /*0x1fd0*/ 800,
+      /*0x1e936*/ 1338,
+      -1, -1,
+      /*0x01b4*/ 133,
+      -1,
+      /*0x050d*/ 422,
+      /*0x2d17*/ 980,
+      /*0x1e934*/ 1336,
+      /*0x118de*/ 1284,
+      -1, -1, -1, -1,
+      /*0x0509*/ 420,
+      -1, -1,
+      /*0x16e68*/ 1294,
+      -1, -1, -1, -1,
+      /*0xff4e*/ 1114,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x16e70*/ 1302,
+      -1, -1, -1,
+      /*0x01b0*/ 132,
+      -1, -1, -1,
+      /*0x1e930*/ 1332,
+      /*0x217e*/ 820,
+      -1,
+      /*0x051f*/ 431,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x2c4a*/ 875,
+      -1,
+      /*0x00e4*/ 29,
+      -1,
+      /*0xa685*/ 1022,
+      -1,
+      /*0x2176*/ 812,
+      -1,
+      /*0xa797*/ 1083,
+      /*0xff46*/ 1106,
+      /*0x2174*/ 810,
+      -1, -1, -1, -1,
+      /*0x00e2*/ 27,
+      -1,
+      /*0x2c36*/ 855,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2c34*/ 853,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x00e0*/ 25,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x00f8*/ 48,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2c30*/ 849,
+      /*0xff44*/ 1104,
+      /*0x2c5e*/ 895,
+      -1, -1, -1, -1,
+      /*0x0287*/ 227,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xff56*/ 1122,
+      -1, -1,
+      /*0xa683*/ 1021,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x16e6a*/ 1296,
+      -1, -1, -1,
+      /*0x00fe*/ 54,
+      -1, -1,
+      /*0x2d0d*/ 970,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x2d09*/ 966,
+      -1, -1, -1, -1,
+      /*0x00f6*/ 47,
+      -1, -1, -1,
+      /*0x00f4*/ 45,
+      -1, -1, -1, -1,
+      /*0xa699*/ 1032,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2d1f*/ 988,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x16e64*/ 1290,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x16e62*/ 1288,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xa79f*/ 1087,
+      -1, -1,
+      /*0xa695*/ 1030,
+      -1, -1, -1, -1, -1, -1,
+      /*0x16e60*/ 1286,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x16e78*/ 1310,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xff5a*/ 1126,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xa687*/ 1023,
+      /*0x16e7e*/ 1316,
+      -1, -1,
+      /*0xff4c*/ 1112,
+      -1, -1, -1, -1, -1, -1,
+      /*0xa693*/ 1029,
+      -1, -1,
+      /*0xff58*/ 1124,
+      -1, -1,
+      /*0x16e76*/ 1308,
+      -1, -1, -1,
+      /*0x16e74*/ 1306,
+      -1, -1, -1,
+      /*0xff54*/ 1120,
+      -1, -1, -1, -1, -1, -1,
+      /*0xff52*/ 1118,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xff48*/ 1108,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x1fe0*/ 802,
+      /*0x0289*/ 229,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0xa697*/ 1031,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0xff4a*/ 1110,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xa68d*/ 1026,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xa689*/ 1024,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x1fb0*/ 798
+    };
+
+  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
+    {
+      register unsigned int key = onigenc_unicode_CaseUnfold_11_hash(code);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          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}}},
+};
+
+/* ANSI-C code produced by gperf version 3.1 */
+/* 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)];
+}
+
+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 unsigned int key = onigenc_unicode_CaseUnfold_12_hash(codes);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          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}}},
+};
+
+/* ANSI-C code produced by gperf version 3.1 */
+/* 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)];
+}
+
+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 unsigned int key = onigenc_unicode_CaseUnfold_13_hash(codes);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          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/12.1.0/name2ctype.h b/enc/unicode/12.1.0/name2ctype.h
new file mode 100644
index 0000000000..b2270d5cac
--- /dev/null
+++ b/enc/unicode/12.1.0/name2ctype.h
@@ -0,0 +1,41810 @@
+/* ANSI-C code produced by gperf version 3.1 */
+/* 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-gperf@gnu.org>."
+#endif
+
+
+
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+	1,
+	0x000a, 0x000a,
+}; /* CR_NEWLINE */
+
+/* 'Alpha': [[:Alpha:]] */
+static const OnigCodePoint CR_Alpha[] = {
+	679,
+	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,
+	0x0560, 0x0588,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 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,
+	0x0860, 0x086a,
+	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,
+	0x09fc, 0x09fc,
+	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, 0x0afc,
+	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,
+	0x0d00, 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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x108f,
+	0x109a, 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,
+	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, 0x1878,
+	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, 0x1c36,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1cfa, 0x1cfa,
+	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, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa674, 0xa67b,
+	0xa67f, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa805,
+	0xa807, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8c5, 0xa8c5,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa8ff,
+	0xa90a, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
+	0xa9cf, 0xa9cf,
+	0xa9e0, 0xa9ef,
+	0xa9fa, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d27,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x11045,
+	0x11082, 0x110b8,
+	0x110d0, 0x110e8,
+	0x11100, 0x11132,
+	0x11144, 0x11146,
+	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,
+	0x1145f, 0x1145f,
+	0x11480, 0x114c1,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115b5,
+	0x115b8, 0x115be,
+	0x115d8, 0x115dd,
+	0x11600, 0x1163e,
+	0x11640, 0x11640,
+	0x11644, 0x11644,
+	0x11680, 0x116b5,
+	0x116b8, 0x116b8,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172a,
+	0x11800, 0x11838,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119df,
+	0x119e1, 0x119e1,
+	0x119e3, 0x119e4,
+	0x11a00, 0x11a32,
+	0x11a35, 0x11a3e,
+	0x11a50, 0x11a97,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c3e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d41,
+	0x11d43, 0x11d43,
+	0x11d46, 0x11d47,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d96,
+	0x11d98, 0x11d98,
+	0x11ee0, 0x11ef6,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e137, 0x1e13d,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2eb,
+	0x1e800, 0x1e8c4,
+	0x1e900, 0x1e943,
+	0x1e947, 0x1e947,
+	0x1e94b, 0x1e94b,
+	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,
+	0x2ceb0, 0x2ebe0,
+	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[] = {
+	59,
+	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,
+	0x10d30, 0x10d39,
+	0x11066, 0x1106f,
+	0x110f0, 0x110f9,
+	0x11136, 0x1113f,
+	0x111d0, 0x111d9,
+	0x112f0, 0x112f9,
+	0x11450, 0x11459,
+	0x114d0, 0x114d9,
+	0x11650, 0x11659,
+	0x116c0, 0x116c9,
+	0x11730, 0x11739,
+	0x118e0, 0x118e9,
+	0x11c50, 0x11c59,
+	0x11d50, 0x11d59,
+	0x11da0, 0x11da9,
+	0x16a60, 0x16a69,
+	0x16b50, 0x16b59,
+	0x1d7ce, 0x1d7ff,
+	0x1e140, 0x1e149,
+	0x1e2f0, 0x1e2f9,
+	0x1e950, 0x1e959,
+}; /* CR_Digit */
+
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+	671,
+	0x0021, 0x007e,
+	0x00a1, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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, 0x09fe,
+	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, 0x0a76,
+	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, 0x0aff,
+	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, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 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,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x1878,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
+	0x1d00, 0x1df9,
+	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, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 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, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3001, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 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, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	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, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	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,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145f,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	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, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Graph */
+
+/* 'Lower': [[:Lower:]] */
+static const OnigCodePoint CR_Lower[] = {
+	649,
+	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,
+	0x0560, 0x0588,
+	0x10d0, 0x10fa,
+	0x10fd, 0x10ff,
+	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,
+	0xa7af, 0xa7af,
+	0xa7b5, 0xa7b5,
+	0xa7b7, 0xa7b7,
+	0xa7b9, 0xa7b9,
+	0xa7bb, 0xa7bb,
+	0xa7bd, 0xa7bd,
+	0xa7bf, 0xa7bf,
+	0xa7c3, 0xa7c3,
+	0xa7f8, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x104d8, 0x104fb,
+	0x10cc0, 0x10cf2,
+	0x118c0, 0x118df,
+	0x16e60, 0x16e7f,
+	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[] = {
+	668,
+	0x0020, 0x007e,
+	0x00a0, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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, 0x09fe,
+	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, 0x0a76,
+	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, 0x0aff,
+	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, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 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,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x1878,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
+	0x1d00, 0x1df9,
+	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, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 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, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 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, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	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, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	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,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145f,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	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, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Print */
+
+/* 'XPosixPunct': [[:Punct:]] */
+static const OnigCodePoint CR_XPosixPunct[] = {
+	177,
+	0x0021, 0x002f,
+	0x003a, 0x0040,
+	0x005b, 0x0060,
+	0x007b, 0x007e,
+	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,
+	0x09fd, 0x09fd,
+	0x0a76, 0x0a76,
+	0x0af0, 0x0af0,
+	0x0c77, 0x0c77,
+	0x0c84, 0x0c84,
+	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,
+	0x166e, 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, 0x2e4f,
+	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,
+	0x10f55, 0x10f59,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x11174, 0x11175,
+	0x111c5, 0x111c8,
+	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,
+	0x1183b, 0x1183b,
+	0x119e2, 0x119e2,
+	0x11a3f, 0x11a46,
+	0x11a9a, 0x11a9c,
+	0x11a9e, 0x11aa2,
+	0x11c41, 0x11c45,
+	0x11c70, 0x11c71,
+	0x11ef7, 0x11ef8,
+	0x11fff, 0x11fff,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b3b,
+	0x16b44, 0x16b44,
+	0x16e97, 0x16e9a,
+	0x16fe2, 0x16fe2,
+	0x1bc9f, 0x1bc9f,
+	0x1da87, 0x1da8b,
+	0x1e95e, 0x1e95f,
+}; /* CR_XPosixPunct */
+
+/* '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[] = {
+	641,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	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,
+	0xa7b8, 0xa7b8,
+	0xa7ba, 0xa7ba,
+	0xa7bc, 0xa7bc,
+	0xa7be, 0xa7be,
+	0xa7c2, 0xa7c2,
+	0xa7c4, 0xa7c6,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x104b0, 0x104d3,
+	0x10c80, 0x10cb2,
+	0x118a0, 0x118bf,
+	0x16e40, 0x16e5f,
+	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[] = {
+	716,
+	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,
+	0x0560, 0x0588,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x07fd, 0x07fd,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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,
+	0x09fc, 0x09fc,
+	0x09fe, 0x09fe,
+	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, 0x0aff,
+	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, 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,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x1878,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cfa,
+	0x1d00, 0x1df9,
+	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, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa672,
+	0xa674, 0xa67d,
+	0xa67f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c5,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 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, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	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,
+	0x10d00, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f50,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x1107f, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11144, 0x11146,
+	0x11150, 0x11173,
+	0x11176, 0x11176,
+	0x11180, 0x111c4,
+	0x111c9, 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,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x1144a,
+	0x11450, 0x11459,
+	0x1145e, 0x1145f,
+	0x11480, 0x114c5,
+	0x114c7, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c0,
+	0x115d8, 0x115dd,
+	0x11600, 0x11640,
+	0x11644, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x11739,
+	0x11800, 0x1183a,
+	0x118a0, 0x118e9,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e1,
+	0x119e3, 0x119e4,
+	0x11a00, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a50, 0x11a99,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c40,
+	0x11c50, 0x11c59,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef6,
+	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,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2f9,
+	0x1e800, 0x1e8c4,
+	0x1e8d0, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	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,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_Word */
+
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+	715,
+	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,
+	0x0560, 0x0588,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 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,
+	0x0860, 0x086a,
+	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,
+	0x09fc, 0x09fc,
+	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, 0x0afc,
+	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,
+	0x0d00, 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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 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,
+	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, 0x1878,
+	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, 0x1c36,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1cfa, 0x1cfa,
+	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, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66e,
+	0xa674, 0xa67b,
+	0xa67f, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa805,
+	0xa807, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8c5, 0xa8c5,
+	0xa8d0, 0xa8d9,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
+	0xa9cf, 0xa9d9,
+	0xa9e0, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x11045,
+	0x11066, 0x1106f,
+	0x11082, 0x110b8,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11132,
+	0x11136, 0x1113f,
+	0x11144, 0x11146,
+	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,
+	0x1145f, 0x1145f,
+	0x11480, 0x114c1,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115be,
+	0x115d8, 0x115dd,
+	0x11600, 0x1163e,
+	0x11640, 0x11640,
+	0x11644, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b5,
+	0x116b8, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172a,
+	0x11730, 0x11739,
+	0x11800, 0x11838,
+	0x118a0, 0x118e9,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119df,
+	0x119e1, 0x119e1,
+	0x119e3, 0x119e4,
+	0x11a00, 0x11a32,
+	0x11a35, 0x11a3e,
+	0x11a50, 0x11a97,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c3e,
+	0x11c40, 0x11c40,
+	0x11c50, 0x11c59,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d41,
+	0x11d43, 0x11d43,
+	0x11d46, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d96,
+	0x11d98, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef6,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b50, 0x16b59,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e137, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2eb,
+	0x1e2f0, 0x1e2f9,
+	0x1e800, 0x1e8c4,
+	0x1e900, 0x1e943,
+	0x1e947, 0x1e947,
+	0x1e94b, 0x1e94b,
+	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,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alnum */
+
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
+	1,
+	0x0000, 0x007f,
+}; /* CR_ASCII */
+
+/* 'Punct' */
+static const OnigCodePoint CR_Punct[] = {
+	182,
+	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,
+	0x09fd, 0x09fd,
+	0x0a76, 0x0a76,
+	0x0af0, 0x0af0,
+	0x0c77, 0x0c77,
+	0x0c84, 0x0c84,
+	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,
+	0x166e, 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, 0x2e4f,
+	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,
+	0x10f55, 0x10f59,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x11174, 0x11175,
+	0x111c5, 0x111c8,
+	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,
+	0x1183b, 0x1183b,
+	0x119e2, 0x119e2,
+	0x11a3f, 0x11a46,
+	0x11a9a, 0x11a9c,
+	0x11a9e, 0x11aa2,
+	0x11c41, 0x11c45,
+	0x11c70, 0x11c71,
+	0x11ef7, 0x11ef8,
+	0x11fff, 0x11fff,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b3b,
+	0x16b44, 0x16b44,
+	0x16e97, 0x16e9a,
+	0x16fe2, 0x16fe2,
+	0x1bc9f, 0x1bc9f,
+	0x1da87, 0x1da8b,
+	0x1e95e, 0x1e95f,
+}; /* CR_Punct */
+
+#ifdef USE_UNICODE_PROPERTIES
+/* 'Any': - */
+static const OnigCodePoint CR_Any[] = {
+	1,
+	0x0000, 0x10ffff,
+}; /* CR_Any */
+
+/* 'Assigned': - */
+static const OnigCodePoint CR_Assigned[] = {
+	666,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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, 0x09fe,
+	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, 0x0a76,
+	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, 0x0aff,
+	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, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 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,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x1878,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
+	0x1d00, 0x1df9,
+	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, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 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, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 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, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	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, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	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,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145f,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	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, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Assigned */
+
+/* 'C': Major Category */
+static const OnigCodePoint CR_C[] = {
+	668,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+	0x00ad, 0x00ad,
+	0x0378, 0x0379,
+	0x0380, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0530, 0x0530,
+	0x0557, 0x0558,
+	0x058b, 0x058c,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ee,
+	0x05f5, 0x0605,
+	0x061c, 0x061d,
+	0x06dd, 0x06dd,
+	0x070e, 0x070f,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07fc,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x085f,
+	0x086b, 0x089f,
+	0x08b5, 0x08b5,
+	0x08be, 0x08d2,
+	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,
+	0x09ff, 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,
+	0x0a77, 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,
+	0x0b00, 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,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5b, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c76,
+	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, 0x0cff,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	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, 0x0e85,
+	0x0e8b, 0x0e8b,
+	0x0ea4, 0x0ea4,
+	0x0ea6, 0x0ea6,
+	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,
+	0x1879, 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, 0x1c8f,
+	0x1cbb, 0x1cbc,
+	0x1cc8, 0x1ccf,
+	0x1cfb, 0x1cff,
+	0x1dfa, 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,
+	0x20c0, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218c, 0x218f,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2b74, 0x2b75,
+	0x2b96, 0x2b97,
+	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,
+	0x2e50, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x3130, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x4db6, 0x4dbf,
+	0x9ff0, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa6f8, 0xa6ff,
+	0xa7c0, 0xa7c1,
+	0xa7c7, 0xa7f6,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c6, 0xa8cd,
+	0xa8da, 0xa8df,
+	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,
+	0xab68, 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, 0x1032c,
+	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,
+	0x10a36, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a49, 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,
+	0x10d28, 0x10d2f,
+	0x10d3a, 0x10e5f,
+	0x10e7f, 0x10eff,
+	0x10f28, 0x10f2f,
+	0x10f5a, 0x10fdf,
+	0x10ff7, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107e,
+	0x110bd, 0x110bd,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11147, 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, 0x1133a,
+	0x11345, 0x11346,
+	0x11349, 0x1134a,
+	0x1134e, 0x1134f,
+	0x11351, 0x11356,
+	0x11358, 0x1135c,
+	0x11364, 0x11365,
+	0x1136d, 0x1136f,
+	0x11375, 0x113ff,
+	0x1145a, 0x1145a,
+	0x1145c, 0x1145c,
+	0x11460, 0x1147f,
+	0x114c8, 0x114cf,
+	0x114da, 0x1157f,
+	0x115b6, 0x115b7,
+	0x115de, 0x115ff,
+	0x11645, 0x1164f,
+	0x1165a, 0x1165f,
+	0x1166d, 0x1167f,
+	0x116b9, 0x116bf,
+	0x116ca, 0x116ff,
+	0x1171b, 0x1171c,
+	0x1172c, 0x1172f,
+	0x11740, 0x117ff,
+	0x1183c, 0x1189f,
+	0x118f3, 0x118fe,
+	0x11900, 0x1199f,
+	0x119a8, 0x119a9,
+	0x119d8, 0x119d9,
+	0x119e5, 0x119ff,
+	0x11a48, 0x11a4f,
+	0x11aa3, 0x11abf,
+	0x11af9, 0x11bff,
+	0x11c09, 0x11c09,
+	0x11c37, 0x11c37,
+	0x11c46, 0x11c4f,
+	0x11c6d, 0x11c6f,
+	0x11c90, 0x11c91,
+	0x11ca8, 0x11ca8,
+	0x11cb7, 0x11cff,
+	0x11d07, 0x11d07,
+	0x11d0a, 0x11d0a,
+	0x11d37, 0x11d39,
+	0x11d3b, 0x11d3b,
+	0x11d3e, 0x11d3e,
+	0x11d48, 0x11d4f,
+	0x11d5a, 0x11d5f,
+	0x11d66, 0x11d66,
+	0x11d69, 0x11d69,
+	0x11d8f, 0x11d8f,
+	0x11d92, 0x11d92,
+	0x11d99, 0x11d9f,
+	0x11daa, 0x11edf,
+	0x11ef9, 0x11fbf,
+	0x11ff2, 0x11ffe,
+	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, 0x16e3f,
+	0x16e9b, 0x16eff,
+	0x16f4b, 0x16f4e,
+	0x16f88, 0x16f8e,
+	0x16fa0, 0x16fdf,
+	0x16fe4, 0x16fff,
+	0x187f8, 0x187ff,
+	0x18af3, 0x1afff,
+	0x1b11f, 0x1b14f,
+	0x1b153, 0x1b163,
+	0x1b168, 0x1b16f,
+	0x1b2fc, 0x1bbff,
+	0x1bc6b, 0x1bc6f,
+	0x1bc7d, 0x1bc7f,
+	0x1bc89, 0x1bc8f,
+	0x1bc9a, 0x1bc9b,
+	0x1bca0, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d173, 0x1d17a,
+	0x1d1e9, 0x1d1ff,
+	0x1d246, 0x1d2df,
+	0x1d2f4, 0x1d2ff,
+	0x1d357, 0x1d35f,
+	0x1d379, 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, 0x1e0ff,
+	0x1e12d, 0x1e12f,
+	0x1e13e, 0x1e13f,
+	0x1e14a, 0x1e14d,
+	0x1e150, 0x1e2bf,
+	0x1e2fa, 0x1e2fe,
+	0x1e300, 0x1e7ff,
+	0x1e8c5, 0x1e8c6,
+	0x1e8d7, 0x1e8ff,
+	0x1e94c, 0x1e94f,
+	0x1e95a, 0x1e95d,
+	0x1e960, 0x1ec70,
+	0x1ecb5, 0x1ed00,
+	0x1ed3e, 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,
+	0x1f16d, 0x1f16f,
+	0x1f1ad, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23c, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f25f,
+	0x1f266, 0x1f2ff,
+	0x1f6d6, 0x1f6df,
+	0x1f6ed, 0x1f6ef,
+	0x1f6fb, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d9, 0x1f7df,
+	0x1f7ec, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1f8ff,
+	0x1f90c, 0x1f90c,
+	0x1f972, 0x1f972,
+	0x1f977, 0x1f979,
+	0x1f9a3, 0x1f9a4,
+	0x1f9ab, 0x1f9ad,
+	0x1f9cb, 0x1f9cc,
+	0x1fa54, 0x1fa5f,
+	0x1fa6e, 0x1fa6f,
+	0x1fa74, 0x1fa77,
+	0x1fa7b, 0x1fa7f,
+	0x1fa83, 0x1fa8f,
+	0x1fa96, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2b81f,
+	0x2cea2, 0x2ceaf,
+	0x2ebe1, 0x2f7ff,
+	0x2fa1e, 0xe00ff,
+	0xe01f0, 0x10ffff,
+}; /* CR_C */
+
+/* 'Cc': General Category */
+#define CR_Cc CR_Cntrl
+
+/* 'Cf': General Category */
+static const OnigCodePoint CR_Cf[] = {
+	20,
+	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,
+	0x110cd, 0x110cd,
+	0x13430, 0x13438,
+	0x1bca0, 0x1bca3,
+	0x1d173, 0x1d17a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Cf */
+
+/* 'Cn': General Category */
+static const OnigCodePoint CR_Cn[] = {
+	666,
+	0x0378, 0x0379,
+	0x0380, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0530, 0x0530,
+	0x0557, 0x0558,
+	0x058b, 0x058c,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ee,
+	0x05f5, 0x05ff,
+	0x061d, 0x061d,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07fc,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x085f,
+	0x086b, 0x089f,
+	0x08b5, 0x08b5,
+	0x08be, 0x08d2,
+	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,
+	0x09ff, 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,
+	0x0a77, 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,
+	0x0b00, 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,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5b, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c76,
+	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, 0x0cff,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	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, 0x0e85,
+	0x0e8b, 0x0e8b,
+	0x0ea4, 0x0ea4,
+	0x0ea6, 0x0ea6,
+	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,
+	0x1879, 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, 0x1c8f,
+	0x1cbb, 0x1cbc,
+	0x1cc8, 0x1ccf,
+	0x1cfb, 0x1cff,
+	0x1dfa, 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,
+	0x20c0, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218c, 0x218f,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2b74, 0x2b75,
+	0x2b96, 0x2b97,
+	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,
+	0x2e50, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x3130, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x4db6, 0x4dbf,
+	0x9ff0, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa6f8, 0xa6ff,
+	0xa7c0, 0xa7c1,
+	0xa7c7, 0xa7f6,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c6, 0xa8cd,
+	0xa8da, 0xa8df,
+	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,
+	0xab68, 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, 0x1032c,
+	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,
+	0x10a36, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a49, 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,
+	0x10d28, 0x10d2f,
+	0x10d3a, 0x10e5f,
+	0x10e7f, 0x10eff,
+	0x10f28, 0x10f2f,
+	0x10f5a, 0x10fdf,
+	0x10ff7, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107e,
+	0x110c2, 0x110cc,
+	0x110ce, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11147, 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, 0x1133a,
+	0x11345, 0x11346,
+	0x11349, 0x1134a,
+	0x1134e, 0x1134f,
+	0x11351, 0x11356,
+	0x11358, 0x1135c,
+	0x11364, 0x11365,
+	0x1136d, 0x1136f,
+	0x11375, 0x113ff,
+	0x1145a, 0x1145a,
+	0x1145c, 0x1145c,
+	0x11460, 0x1147f,
+	0x114c8, 0x114cf,
+	0x114da, 0x1157f,
+	0x115b6, 0x115b7,
+	0x115de, 0x115ff,
+	0x11645, 0x1164f,
+	0x1165a, 0x1165f,
+	0x1166d, 0x1167f,
+	0x116b9, 0x116bf,
+	0x116ca, 0x116ff,
+	0x1171b, 0x1171c,
+	0x1172c, 0x1172f,
+	0x11740, 0x117ff,
+	0x1183c, 0x1189f,
+	0x118f3, 0x118fe,
+	0x11900, 0x1199f,
+	0x119a8, 0x119a9,
+	0x119d8, 0x119d9,
+	0x119e5, 0x119ff,
+	0x11a48, 0x11a4f,
+	0x11aa3, 0x11abf,
+	0x11af9, 0x11bff,
+	0x11c09, 0x11c09,
+	0x11c37, 0x11c37,
+	0x11c46, 0x11c4f,
+	0x11c6d, 0x11c6f,
+	0x11c90, 0x11c91,
+	0x11ca8, 0x11ca8,
+	0x11cb7, 0x11cff,
+	0x11d07, 0x11d07,
+	0x11d0a, 0x11d0a,
+	0x11d37, 0x11d39,
+	0x11d3b, 0x11d3b,
+	0x11d3e, 0x11d3e,
+	0x11d48, 0x11d4f,
+	0x11d5a, 0x11d5f,
+	0x11d66, 0x11d66,
+	0x11d69, 0x11d69,
+	0x11d8f, 0x11d8f,
+	0x11d92, 0x11d92,
+	0x11d99, 0x11d9f,
+	0x11daa, 0x11edf,
+	0x11ef9, 0x11fbf,
+	0x11ff2, 0x11ffe,
+	0x1239a, 0x123ff,
+	0x1246f, 0x1246f,
+	0x12475, 0x1247f,
+	0x12544, 0x12fff,
+	0x1342f, 0x1342f,
+	0x13439, 0x143ff,
+	0x14647, 0x167ff,
+	0x16a39, 0x16a3f,
+	0x16a5f, 0x16a5f,
+	0x16a6a, 0x16a6d,
+	0x16a70, 0x16acf,
+	0x16aee, 0x16aef,
+	0x16af6, 0x16aff,
+	0x16b46, 0x16b4f,
+	0x16b5a, 0x16b5a,
+	0x16b62, 0x16b62,
+	0x16b78, 0x16b7c,
+	0x16b90, 0x16e3f,
+	0x16e9b, 0x16eff,
+	0x16f4b, 0x16f4e,
+	0x16f88, 0x16f8e,
+	0x16fa0, 0x16fdf,
+	0x16fe4, 0x16fff,
+	0x187f8, 0x187ff,
+	0x18af3, 0x1afff,
+	0x1b11f, 0x1b14f,
+	0x1b153, 0x1b163,
+	0x1b168, 0x1b16f,
+	0x1b2fc, 0x1bbff,
+	0x1bc6b, 0x1bc6f,
+	0x1bc7d, 0x1bc7f,
+	0x1bc89, 0x1bc8f,
+	0x1bc9a, 0x1bc9b,
+	0x1bca4, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d1e9, 0x1d1ff,
+	0x1d246, 0x1d2df,
+	0x1d2f4, 0x1d2ff,
+	0x1d357, 0x1d35f,
+	0x1d379, 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, 0x1e0ff,
+	0x1e12d, 0x1e12f,
+	0x1e13e, 0x1e13f,
+	0x1e14a, 0x1e14d,
+	0x1e150, 0x1e2bf,
+	0x1e2fa, 0x1e2fe,
+	0x1e300, 0x1e7ff,
+	0x1e8c5, 0x1e8c6,
+	0x1e8d7, 0x1e8ff,
+	0x1e94c, 0x1e94f,
+	0x1e95a, 0x1e95d,
+	0x1e960, 0x1ec70,
+	0x1ecb5, 0x1ed00,
+	0x1ed3e, 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,
+	0x1f16d, 0x1f16f,
+	0x1f1ad, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23c, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f25f,
+	0x1f266, 0x1f2ff,
+	0x1f6d6, 0x1f6df,
+	0x1f6ed, 0x1f6ef,
+	0x1f6fb, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d9, 0x1f7df,
+	0x1f7ec, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1f8ff,
+	0x1f90c, 0x1f90c,
+	0x1f972, 0x1f972,
+	0x1f977, 0x1f979,
+	0x1f9a3, 0x1f9a4,
+	0x1f9ab, 0x1f9ad,
+	0x1f9cb, 0x1f9cc,
+	0x1fa54, 0x1fa5f,
+	0x1fa6e, 0x1fa6f,
+	0x1fa74, 0x1fa77,
+	0x1fa7b, 0x1fa7f,
+	0x1fa83, 0x1fa8f,
+	0x1fa96, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2b81f,
+	0x2cea2, 0x2ceaf,
+	0x2ebe1, 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[] = {
+	609,
+	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,
+	0x0560, 0x0588,
+	0x05d0, 0x05ea,
+	0x05ef, 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,
+	0x0860, 0x086a,
+	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,
+	0x09fc, 0x09fc,
+	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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x1878,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1cfa, 0x1cfa,
+	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, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa69d,
+	0xa6a0, 0xa6e5,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa8fe,
+	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, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d23,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10fe0, 0x10ff6,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11144, 0x11144,
+	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,
+	0x1145f, 0x1145f,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x115d8, 0x115db,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x116b8, 0x116b8,
+	0x11700, 0x1171a,
+	0x11800, 0x1182b,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d0,
+	0x119e1, 0x119e1,
+	0x119e3, 0x119e3,
+	0x11a00, 0x11a00,
+	0x11a0b, 0x11a32,
+	0x11a3a, 0x11a3a,
+	0x11a50, 0x11a50,
+	0x11a5c, 0x11a89,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d30,
+	0x11d46, 0x11d46,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d89,
+	0x11d98, 0x11d98,
+	0x11ee0, 0x11ef2,
+	0x12000, 0x12399,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e137, 0x1e13d,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2eb,
+	0x1e800, 0x1e8c4,
+	0x1e900, 0x1e943,
+	0x1e94b, 0x1e94b,
+	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,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_L */
+
+/* 'LC': General Category */
+static const OnigCodePoint CR_LC[] = {
+	131,
+	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,
+	0x0560, 0x0588,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fd, 0x10ff,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	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, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7fa, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab60, 0xab67,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x118a0, 0x118df,
+	0x16e40, 0x16e7f,
+	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[] = {
+	642,
+	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,
+	0x0560, 0x0588,
+	0x10d0, 0x10fa,
+	0x10fd, 0x10ff,
+	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,
+	0xa7af, 0xa7af,
+	0xa7b5, 0xa7b5,
+	0xa7b7, 0xa7b7,
+	0xa7b9, 0xa7b9,
+	0xa7bb, 0xa7bb,
+	0xa7bd, 0xa7bd,
+	0xa7bf, 0xa7bf,
+	0xa7c3, 0xa7c3,
+	0xa7fa, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab60, 0xab67,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x104d8, 0x104fb,
+	0x10cc0, 0x10cf2,
+	0x118c0, 0x118df,
+	0x16e60, 0x16e7f,
+	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[] = {
+	60,
+	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, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x1e137, 0x1e13d,
+	0x1e94b, 0x1e94b,
+}; /* CR_Lm */
+
+/* 'Lo': General Category */
+static const OnigCodePoint CR_Lo[] = {
+	476,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x01bb, 0x01bb,
+	0x01c0, 0x01c3,
+	0x0294, 0x0294,
+	0x05d0, 0x05ea,
+	0x05ef, 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,
+	0x0860, 0x086a,
+	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,
+	0x09fc, 0x09fc,
+	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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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,
+	0x1100, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12d6,
+	0x12d8, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x135a,
+	0x1380, 0x138f,
+	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, 0x1878,
+	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, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1cfa, 0x1cfa,
+	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, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	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, 0xa8fe,
+	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,
+	0x1032d, 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, 0x10a35,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10d00, 0x10d23,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10fe0, 0x10ff6,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11144, 0x11144,
+	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,
+	0x1145f, 0x1145f,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x115d8, 0x115db,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x116b8, 0x116b8,
+	0x11700, 0x1171a,
+	0x11800, 0x1182b,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d0,
+	0x119e1, 0x119e1,
+	0x119e3, 0x119e3,
+	0x11a00, 0x11a00,
+	0x11a0b, 0x11a32,
+	0x11a3a, 0x11a3a,
+	0x11a50, 0x11a50,
+	0x11a5c, 0x11a89,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d30,
+	0x11d46, 0x11d46,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d89,
+	0x11d98, 0x11d98,
+	0x11ee0, 0x11ef2,
+	0x12000, 0x12399,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f4a,
+	0x16f50, 0x16f50,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1e100, 0x1e12c,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2eb,
+	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,
+	0x2ceb0, 0x2ebe0,
+	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[] = {
+	636,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	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,
+	0xa7b8, 0xa7b8,
+	0xa7ba, 0xa7ba,
+	0xa7bc, 0xa7bc,
+	0xa7be, 0xa7be,
+	0xa7c2, 0xa7c2,
+	0xa7c4, 0xa7c6,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x104b0, 0x104d3,
+	0x10c80, 0x10cb2,
+	0x118a0, 0x118bf,
+	0x16e40, 0x16e5f,
+	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[] = {
+	280,
+	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,
+	0x07fd, 0x07fd,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0859, 0x085b,
+	0x08d3, 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,
+	0x09fe, 0x09fe,
+	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,
+	0x0afa, 0x0aff,
+	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, 0x0c04,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c83,
+	0x0cbc, 0x0cbc,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d00, 0x0d03,
+	0x0d3b, 0x0d3c,
+	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, 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,
+	0x1cf4, 0x1cf4,
+	0x1cf7, 0x1cf9,
+	0x1dc0, 0x1df9,
+	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,
+	0xa8ff, 0xa8ff,
+	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,
+	0x10d24, 0x10d27,
+	0x10f46, 0x10f50,
+	0x11000, 0x11002,
+	0x11038, 0x11046,
+	0x1107f, 0x11082,
+	0x110b0, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x11134,
+	0x11145, 0x11146,
+	0x11173, 0x11173,
+	0x11180, 0x11182,
+	0x111b3, 0x111c0,
+	0x111c9, 0x111cc,
+	0x1122c, 0x11237,
+	0x1123e, 0x1123e,
+	0x112df, 0x112ea,
+	0x11300, 0x11303,
+	0x1133b, 0x1133c,
+	0x1133e, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x11362, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11435, 0x11446,
+	0x1145e, 0x1145e,
+	0x114b0, 0x114c3,
+	0x115af, 0x115b5,
+	0x115b8, 0x115c0,
+	0x115dc, 0x115dd,
+	0x11630, 0x11640,
+	0x116ab, 0x116b7,
+	0x1171d, 0x1172b,
+	0x1182c, 0x1183a,
+	0x119d1, 0x119d7,
+	0x119da, 0x119e0,
+	0x119e4, 0x119e4,
+	0x11a01, 0x11a0a,
+	0x11a33, 0x11a39,
+	0x11a3b, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a51, 0x11a5b,
+	0x11a8a, 0x11a99,
+	0x11c2f, 0x11c36,
+	0x11c38, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d45,
+	0x11d47, 0x11d47,
+	0x11d8a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d97,
+	0x11ef3, 0x11ef6,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f4f, 0x16f4f,
+	0x16f51, 0x16f87,
+	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,
+	0x1e130, 0x1e136,
+	0x1e2ec, 0x1e2ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0xe0100, 0xe01ef,
+}; /* CR_M */
+
+/* 'Mc': General Category */
+static const OnigCodePoint CR_Mc[] = {
+	168,
+	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,
+	0x1cf7, 0x1cf7,
+	0x302e, 0x302f,
+	0xa823, 0xa824,
+	0xa827, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa952, 0xa953,
+	0xa983, 0xa983,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9be, 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,
+	0x11145, 0x11146,
+	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,
+	0x1182c, 0x1182e,
+	0x11838, 0x11838,
+	0x119d1, 0x119d3,
+	0x119dc, 0x119df,
+	0x119e4, 0x119e4,
+	0x11a39, 0x11a39,
+	0x11a57, 0x11a58,
+	0x11a97, 0x11a97,
+	0x11c2f, 0x11c2f,
+	0x11c3e, 0x11c3e,
+	0x11ca9, 0x11ca9,
+	0x11cb1, 0x11cb1,
+	0x11cb4, 0x11cb4,
+	0x11d8a, 0x11d8e,
+	0x11d93, 0x11d94,
+	0x11d96, 0x11d96,
+	0x11ef5, 0x11ef6,
+	0x16f51, 0x16f87,
+	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[] = {
+	318,
+	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,
+	0x07fd, 0x07fd,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0859, 0x085b,
+	0x08d3, 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,
+	0x09fe, 0x09fe,
+	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,
+	0x0afa, 0x0aff,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3f, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b56,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0c00, 0x0c00,
+	0x0c04, 0x0c04,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c81,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d00, 0x0d01,
+	0x0d3b, 0x0d3c,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 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, 0x1df9,
+	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,
+	0xa8ff, 0xa8ff,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bd,
+	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,
+	0x10d24, 0x10d27,
+	0x10f46, 0x10f50,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x1107f, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x111c9, 0x111cc,
+	0x1122f, 0x11231,
+	0x11234, 0x11234,
+	0x11236, 0x11237,
+	0x1123e, 0x1123e,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11300, 0x11301,
+	0x1133b, 0x1133c,
+	0x11340, 0x11340,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11438, 0x1143f,
+	0x11442, 0x11444,
+	0x11446, 0x11446,
+	0x1145e, 0x1145e,
+	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,
+	0x1182f, 0x11837,
+	0x11839, 0x1183a,
+	0x119d4, 0x119d7,
+	0x119da, 0x119db,
+	0x119e0, 0x119e0,
+	0x11a01, 0x11a0a,
+	0x11a33, 0x11a38,
+	0x11a3b, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a51, 0x11a56,
+	0x11a59, 0x11a5b,
+	0x11a8a, 0x11a96,
+	0x11a98, 0x11a99,
+	0x11c30, 0x11c36,
+	0x11c38, 0x11c3d,
+	0x11c3f, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11caa, 0x11cb0,
+	0x11cb2, 0x11cb3,
+	0x11cb5, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d45,
+	0x11d47, 0x11d47,
+	0x11d90, 0x11d91,
+	0x11d95, 0x11d95,
+	0x11d97, 0x11d97,
+	0x11ef3, 0x11ef4,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f4f, 0x16f4f,
+	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,
+	0x1e130, 0x1e136,
+	0x1e2ec, 0x1e2ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0xe0100, 0xe01ef,
+}; /* CR_Mn */
+
+/* 'N': Major Category */
+static const OnigCodePoint CR_N[] = {
+	130,
+	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, 0x10a48,
+	0x10a7d, 0x10a7e,
+	0x10a9d, 0x10a9f,
+	0x10aeb, 0x10aef,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10ba9, 0x10baf,
+	0x10cfa, 0x10cff,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f1d, 0x10f26,
+	0x10f51, 0x10f54,
+	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,
+	0x11d50, 0x11d59,
+	0x11da0, 0x11da9,
+	0x11fc0, 0x11fd4,
+	0x12400, 0x1246e,
+	0x16a60, 0x16a69,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16e80, 0x16e96,
+	0x1d2e0, 0x1d2f3,
+	0x1d360, 0x1d378,
+	0x1d7ce, 0x1d7ff,
+	0x1e140, 0x1e149,
+	0x1e2f0, 0x1e2f9,
+	0x1e8c7, 0x1e8cf,
+	0x1e950, 0x1e959,
+	0x1ec71, 0x1ecab,
+	0x1ecad, 0x1ecaf,
+	0x1ecb1, 0x1ecb4,
+	0x1ed01, 0x1ed2d,
+	0x1ed2f, 0x1ed3d,
+	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[] = {
+	70,
+	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, 0x10a48,
+	0x10a7d, 0x10a7e,
+	0x10a9d, 0x10a9f,
+	0x10aeb, 0x10aef,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10ba9, 0x10baf,
+	0x10cfa, 0x10cff,
+	0x10e60, 0x10e7e,
+	0x10f1d, 0x10f26,
+	0x10f51, 0x10f54,
+	0x11052, 0x11065,
+	0x111e1, 0x111f4,
+	0x1173a, 0x1173b,
+	0x118ea, 0x118f2,
+	0x11c5a, 0x11c6c,
+	0x11fc0, 0x11fd4,
+	0x16b5b, 0x16b61,
+	0x16e80, 0x16e96,
+	0x1d2e0, 0x1d2f3,
+	0x1d360, 0x1d378,
+	0x1e8c7, 0x1e8cf,
+	0x1ec71, 0x1ecab,
+	0x1ecad, 0x1ecaf,
+	0x1ecb1, 0x1ecb4,
+	0x1ed01, 0x1ed2d,
+	0x1ed2f, 0x1ed3d,
+	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[] = {
+	179,
+	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,
+	0x09fd, 0x09fd,
+	0x0a76, 0x0a76,
+	0x0af0, 0x0af0,
+	0x0c77, 0x0c77,
+	0x0c84, 0x0c84,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f14, 0x0f14,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1360, 0x1368,
+	0x166e, 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, 0x2e4f,
+	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,
+	0x10f55, 0x10f59,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x11174, 0x11175,
+	0x111c5, 0x111c8,
+	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,
+	0x1183b, 0x1183b,
+	0x119e2, 0x119e2,
+	0x11a3f, 0x11a46,
+	0x11a9a, 0x11a9c,
+	0x11a9e, 0x11aa2,
+	0x11c41, 0x11c45,
+	0x11c70, 0x11c71,
+	0x11ef7, 0x11ef8,
+	0x11fff, 0x11fff,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b3b,
+	0x16b44, 0x16b44,
+	0x16e97, 0x16e9a,
+	0x16fe2, 0x16fe2,
+	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[] = {
+	226,
+	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,
+	0x07fe, 0x07ff,
+	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,
+	0x166d, 0x166d,
+	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, 0x20bf,
+	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, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x2767,
+	0x2794, 0x27c4,
+	0x27c7, 0x27e5,
+	0x27f0, 0x2982,
+	0x2999, 0x29d7,
+	0x29dc, 0x29fb,
+	0x29fe, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bff,
+	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, 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,
+	0x11fd5, 0x11ff1,
+	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,
+	0x1e14f, 0x1e14f,
+	0x1e2ff, 0x1e2ff,
+	0x1ecac, 0x1ecac,
+	0x1ecb0, 0x1ecb0,
+	0x1ed2e, 0x1ed2e,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+}; /* CR_S */
+
+/* 'Sc': General Category */
+static const OnigCodePoint CR_Sc[] = {
+	21,
+	0x0024, 0x0024,
+	0x00a2, 0x00a5,
+	0x058f, 0x058f,
+	0x060b, 0x060b,
+	0x07fe, 0x07ff,
+	0x09f2, 0x09f3,
+	0x09fb, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0bf9, 0x0bf9,
+	0x0e3f, 0x0e3f,
+	0x17db, 0x17db,
+	0x20a0, 0x20bf,
+	0xa838, 0xa838,
+	0xfdfc, 0xfdfc,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xffe0, 0xffe1,
+	0xffe5, 0xffe6,
+	0x11fdd, 0x11fe0,
+	0x1e2ff, 0x1e2ff,
+	0x1ecb0, 0x1ecb0,
+}; /* 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[] = {
+	180,
+	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,
+	0x166d, 0x166d,
+	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, 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, 0x2bff,
+	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, 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,
+	0x11fd5, 0x11fdc,
+	0x11fe1, 0x11ff1,
+	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,
+	0x1e14f, 0x1e14f,
+	0x1ecac, 0x1ecac,
+	0x1ed2e, 0x1ed2e,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f3fa,
+	0x1f400, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+}; /* 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[] = {
+	140,
+	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,
+	0x0560, 0x0588,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fd, 0x10ff,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	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, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f8, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x118a0, 0x118df,
+	0x16e40, 0x16e7f,
+	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[] = {
+	401,
+	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,
+	0x07fd, 0x07fd,
+	0x0816, 0x082d,
+	0x0859, 0x085b,
+	0x08d3, 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,
+	0x09fe, 0x09fe,
+	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,
+	0x0afa, 0x0aff,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3f, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b56,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0c00, 0x0c00,
+	0x0c04, 0x0c04,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c81,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d00, 0x0d01,
+	0x0d3b, 0x0d3c,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e46, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 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, 0x1df9,
+	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,
+	0xa8ff, 0xa8ff,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bd,
+	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,
+	0x10d24, 0x10d27,
+	0x10f46, 0x10f50,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x1107f, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x110bd, 0x110bd,
+	0x110cd, 0x110cd,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x111c9, 0x111cc,
+	0x1122f, 0x11231,
+	0x11234, 0x11234,
+	0x11236, 0x11237,
+	0x1123e, 0x1123e,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11300, 0x11301,
+	0x1133b, 0x1133c,
+	0x11340, 0x11340,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11438, 0x1143f,
+	0x11442, 0x11444,
+	0x11446, 0x11446,
+	0x1145e, 0x1145e,
+	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,
+	0x1182f, 0x11837,
+	0x11839, 0x1183a,
+	0x119d4, 0x119d7,
+	0x119da, 0x119db,
+	0x119e0, 0x119e0,
+	0x11a01, 0x11a0a,
+	0x11a33, 0x11a38,
+	0x11a3b, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a51, 0x11a56,
+	0x11a59, 0x11a5b,
+	0x11a8a, 0x11a96,
+	0x11a98, 0x11a99,
+	0x11c30, 0x11c36,
+	0x11c38, 0x11c3d,
+	0x11c3f, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11caa, 0x11cb0,
+	0x11cb2, 0x11cb3,
+	0x11cb5, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d45,
+	0x11d47, 0x11d47,
+	0x11d90, 0x11d91,
+	0x11d95, 0x11d95,
+	0x11d97, 0x11d97,
+	0x11ef3, 0x11ef4,
+	0x13430, 0x13438,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16b40, 0x16b43,
+	0x16f4f, 0x16f4f,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	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,
+	0x1e130, 0x1e13d,
+	0x1e2ec, 0x1e2ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94b,
+	0x1f3fb, 0x1f3ff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Case_Ignorable */
+
+/* 'Changes_When_Lowercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Lowercased[] = {
+	599,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	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,
+	0xa7b8, 0xa7b8,
+	0xa7ba, 0xa7ba,
+	0xa7bc, 0xa7bc,
+	0xa7be, 0xa7be,
+	0xa7c2, 0xa7c2,
+	0xa7c4, 0xa7c6,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x104b0, 0x104d3,
+	0x10c80, 0x10cb2,
+	0x118a0, 0x118bf,
+	0x16e40, 0x16e5f,
+	0x1e900, 0x1e921,
+}; /* CR_Changes_When_Lowercased */
+
+/* 'Changes_When_Uppercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Uppercased[] = {
+	616,
+	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,
+	0x0282, 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,
+	0x10d0, 0x10fa,
+	0x10fd, 0x10ff,
+	0x13f8, 0x13fd,
+	0x1c80, 0x1c88,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1d8e, 0x1d8e,
+	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, 0xa794,
+	0xa797, 0xa797,
+	0xa799, 0xa799,
+	0xa79b, 0xa79b,
+	0xa79d, 0xa79d,
+	0xa79f, 0xa79f,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7b5, 0xa7b5,
+	0xa7b7, 0xa7b7,
+	0xa7b9, 0xa7b9,
+	0xa7bb, 0xa7bb,
+	0xa7bd, 0xa7bd,
+	0xa7bf, 0xa7bf,
+	0xa7c3, 0xa7c3,
+	0xab53, 0xab53,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x104d8, 0x104fb,
+	0x10cc0, 0x10cf2,
+	0x118c0, 0x118df,
+	0x16e60, 0x16e7f,
+	0x1e922, 0x1e943,
+}; /* CR_Changes_When_Uppercased */
+
+/* 'Changes_When_Titlecased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Titlecased[] = {
+	615,
+	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,
+	0x0282, 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,
+	0x1d8e, 0x1d8e,
+	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, 0xa794,
+	0xa797, 0xa797,
+	0xa799, 0xa799,
+	0xa79b, 0xa79b,
+	0xa79d, 0xa79d,
+	0xa79f, 0xa79f,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7b5, 0xa7b5,
+	0xa7b7, 0xa7b7,
+	0xa7b9, 0xa7b9,
+	0xa7bb, 0xa7bb,
+	0xa7bd, 0xa7bd,
+	0xa7bf, 0xa7bf,
+	0xa7c3, 0xa7c3,
+	0xab53, 0xab53,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x104d8, 0x104fb,
+	0x10cc0, 0x10cf2,
+	0x118c0, 0x118df,
+	0x16e60, 0x16e7f,
+	0x1e922, 0x1e943,
+}; /* CR_Changes_When_Titlecased */
+
+/* 'Changes_When_Casefolded': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casefolded[] = {
+	612,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	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,
+	0xa7b8, 0xa7b8,
+	0xa7ba, 0xa7ba,
+	0xa7bc, 0xa7bc,
+	0xa7be, 0xa7be,
+	0xa7c2, 0xa7c2,
+	0xa7c4, 0xa7c6,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x104b0, 0x104d3,
+	0x10c80, 0x10cb2,
+	0x118a0, 0x118bf,
+	0x16e40, 0x16e5f,
+	0x1e900, 0x1e921,
+}; /* CR_Changes_When_Casefolded */
+
+/* 'Changes_When_Casemapped': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casemapped[] = {
+	123,
+	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,
+	0x0282, 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,
+	0x10d0, 0x10fa,
+	0x10fd, 0x10ff,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1d8e, 0x1d8e,
+	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, 0xa794,
+	0xa796, 0xa7ae,
+	0xa7b0, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xab53, 0xab53,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x118a0, 0x118df,
+	0x16e40, 0x16e7f,
+	0x1e900, 0x1e943,
+}; /* CR_Changes_When_Casemapped */
+
+/* 'ID_Start': Derived Property */
+static const OnigCodePoint CR_ID_Start[] = {
+	609,
+	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,
+	0x0560, 0x0588,
+	0x05d0, 0x05ea,
+	0x05ef, 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,
+	0x0860, 0x086a,
+	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,
+	0x09fc, 0x09fc,
+	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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x1878,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1cfa, 0x1cfa,
+	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, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa69d,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa8fe,
+	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, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d23,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10fe0, 0x10ff6,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11144, 0x11144,
+	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,
+	0x1145f, 0x1145f,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x115d8, 0x115db,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x116b8, 0x116b8,
+	0x11700, 0x1171a,
+	0x11800, 0x1182b,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d0,
+	0x119e1, 0x119e1,
+	0x119e3, 0x119e3,
+	0x11a00, 0x11a00,
+	0x11a0b, 0x11a32,
+	0x11a3a, 0x11a3a,
+	0x11a50, 0x11a50,
+	0x11a5c, 0x11a89,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d30,
+	0x11d46, 0x11d46,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d89,
+	0x11d98, 0x11d98,
+	0x11ee0, 0x11ef2,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e137, 0x1e13d,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2eb,
+	0x1e800, 0x1e8c4,
+	0x1e900, 0x1e943,
+	0x1e94b, 0x1e94b,
+	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,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_ID_Start */
+
+/* 'ID_Continue': Derived Property */
+static const OnigCodePoint CR_ID_Continue[] = {
+	713,
+	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,
+	0x0560, 0x0588,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x07fd, 0x07fd,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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,
+	0x09fc, 0x09fc,
+	0x09fe, 0x09fe,
+	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, 0x0aff,
+	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, 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,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x1878,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cfa,
+	0x1d00, 0x1df9,
+	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, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66f,
+	0xa674, 0xa67d,
+	0xa67f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c5,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 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, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	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,
+	0x10d00, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f50,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x1107f, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11144, 0x11146,
+	0x11150, 0x11173,
+	0x11176, 0x11176,
+	0x11180, 0x111c4,
+	0x111c9, 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,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x1144a,
+	0x11450, 0x11459,
+	0x1145e, 0x1145f,
+	0x11480, 0x114c5,
+	0x114c7, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c0,
+	0x115d8, 0x115dd,
+	0x11600, 0x11640,
+	0x11644, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x11739,
+	0x11800, 0x1183a,
+	0x118a0, 0x118e9,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e1,
+	0x119e3, 0x119e4,
+	0x11a00, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a50, 0x11a99,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c40,
+	0x11c50, 0x11c59,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef6,
+	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,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2f9,
+	0x1e800, 0x1e8c4,
+	0x1e8d0, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	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,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_ID_Continue */
+
+/* 'XID_Start': Derived Property */
+static const OnigCodePoint CR_XID_Start[] = {
+	616,
+	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,
+	0x0560, 0x0588,
+	0x05d0, 0x05ea,
+	0x05ef, 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,
+	0x0860, 0x086a,
+	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,
+	0x09fc, 0x09fc,
+	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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x1878,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1cfa, 0x1cfa,
+	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, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa69d,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa8fe,
+	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, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d23,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10fe0, 0x10ff6,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11144, 0x11144,
+	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,
+	0x1145f, 0x1145f,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x115d8, 0x115db,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x116b8, 0x116b8,
+	0x11700, 0x1171a,
+	0x11800, 0x1182b,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d0,
+	0x119e1, 0x119e1,
+	0x119e3, 0x119e3,
+	0x11a00, 0x11a00,
+	0x11a0b, 0x11a32,
+	0x11a3a, 0x11a3a,
+	0x11a50, 0x11a50,
+	0x11a5c, 0x11a89,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d30,
+	0x11d46, 0x11d46,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d89,
+	0x11d98, 0x11d98,
+	0x11ee0, 0x11ef2,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e137, 0x1e13d,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2eb,
+	0x1e800, 0x1e8c4,
+	0x1e900, 0x1e943,
+	0x1e94b, 0x1e94b,
+	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,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_XID_Start */
+
+/* 'XID_Continue': Derived Property */
+static const OnigCodePoint CR_XID_Continue[] = {
+	720,
+	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,
+	0x0560, 0x0588,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x07fd, 0x07fd,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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,
+	0x09fc, 0x09fc,
+	0x09fe, 0x09fe,
+	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, 0x0aff,
+	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, 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,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x1878,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cfa,
+	0x1d00, 0x1df9,
+	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, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66f,
+	0xa674, 0xa67d,
+	0xa67f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c5,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 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, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	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,
+	0x10d00, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f50,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x1107f, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11144, 0x11146,
+	0x11150, 0x11173,
+	0x11176, 0x11176,
+	0x11180, 0x111c4,
+	0x111c9, 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,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x1144a,
+	0x11450, 0x11459,
+	0x1145e, 0x1145f,
+	0x11480, 0x114c5,
+	0x114c7, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c0,
+	0x115d8, 0x115dd,
+	0x11600, 0x11640,
+	0x11644, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x11739,
+	0x11800, 0x1183a,
+	0x118a0, 0x118e9,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e1,
+	0x119e3, 0x119e4,
+	0x11a00, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a50, 0x11a99,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c40,
+	0x11c50, 0x11c59,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef6,
+	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,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2f9,
+	0x1e800, 0x1e8c4,
+	0x1e8d0, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	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,
+	0x2ceb0, 0x2ebe0,
+	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[] = {
+	335,
+	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,
+	0x07fd, 0x07fd,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0859, 0x085b,
+	0x08d3, 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,
+	0x09fe, 0x09fe,
+	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,
+	0x0afa, 0x0aff,
+	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,
+	0x0c04, 0x0c04,
+	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,
+	0x0d00, 0x0d01,
+	0x0d3b, 0x0d3c,
+	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, 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, 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, 0x1df9,
+	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,
+	0xa8ff, 0xa8ff,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bd,
+	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,
+	0x10d24, 0x10d27,
+	0x10f46, 0x10f50,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x1107f, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x111c9, 0x111cc,
+	0x1122f, 0x11231,
+	0x11234, 0x11234,
+	0x11236, 0x11237,
+	0x1123e, 0x1123e,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11300, 0x11301,
+	0x1133b, 0x1133c,
+	0x1133e, 0x1133e,
+	0x11340, 0x11340,
+	0x11357, 0x11357,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11438, 0x1143f,
+	0x11442, 0x11444,
+	0x11446, 0x11446,
+	0x1145e, 0x1145e,
+	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,
+	0x1182f, 0x11837,
+	0x11839, 0x1183a,
+	0x119d4, 0x119d7,
+	0x119da, 0x119db,
+	0x119e0, 0x119e0,
+	0x11a01, 0x11a0a,
+	0x11a33, 0x11a38,
+	0x11a3b, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a51, 0x11a56,
+	0x11a59, 0x11a5b,
+	0x11a8a, 0x11a96,
+	0x11a98, 0x11a99,
+	0x11c30, 0x11c36,
+	0x11c38, 0x11c3d,
+	0x11c3f, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11caa, 0x11cb0,
+	0x11cb2, 0x11cb3,
+	0x11cb5, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d45,
+	0x11d47, 0x11d47,
+	0x11d90, 0x11d91,
+	0x11d95, 0x11d95,
+	0x11d97, 0x11d97,
+	0x11ef3, 0x11ef4,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f4f, 0x16f4f,
+	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,
+	0x1e130, 0x1e136,
+	0x1e2ec, 0x1e2ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Grapheme_Extend */
+
+/* 'Grapheme_Base': Derived Property */
+static const OnigCodePoint CR_Grapheme_Base[] = {
+	819,
+	0x0020, 0x007e,
+	0x00a0, 0x00ac,
+	0x00ae, 0x02ff,
+	0x0370, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0482,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05d0, 0x05ea,
+	0x05ef, 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,
+	0x07fe, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0830, 0x083e,
+	0x0840, 0x0858,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	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, 0x09fd,
+	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,
+	0x0a76, 0x0a76,
+	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,
+	0x0c77, 0x0c80,
+	0x0c82, 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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x1878,
+	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,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf7,
+	0x1cfa, 0x1cfa,
+	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, 0x20bf,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 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, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3029,
+	0x3030, 0x303f,
+	0x3041, 0x3096,
+	0x309b, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa66e,
+	0xa673, 0xa673,
+	0xa67e, 0xa69d,
+	0xa6a0, 0xa6ef,
+	0xa6f2, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa824,
+	0xa827, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c3,
+	0xa8ce, 0xa8d9,
+	0xa8f2, 0xa8fe,
+	0xa900, 0xa925,
+	0xa92e, 0xa946,
+	0xa952, 0xa953,
+	0xa95f, 0xa97c,
+	0xa983, 0xa9b2,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9be, 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, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	0x10a40, 0x10a48,
+	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, 0x10d23,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10f51, 0x10f59,
+	0x10fe0, 0x10ff6,
+	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, 0x11146,
+	0x11150, 0x11172,
+	0x11174, 0x11176,
+	0x11182, 0x111b5,
+	0x111bf, 0x111c8,
+	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,
+	0x1145f, 0x1145f,
+	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,
+	0x116b8, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x11720, 0x11721,
+	0x11726, 0x11726,
+	0x11730, 0x1173f,
+	0x11800, 0x1182e,
+	0x11838, 0x11838,
+	0x1183b, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d3,
+	0x119dc, 0x119df,
+	0x119e1, 0x119e4,
+	0x11a00, 0x11a00,
+	0x11a0b, 0x11a32,
+	0x11a39, 0x11a3a,
+	0x11a3f, 0x11a46,
+	0x11a50, 0x11a50,
+	0x11a57, 0x11a58,
+	0x11a5c, 0x11a89,
+	0x11a97, 0x11a97,
+	0x11a9a, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2f,
+	0x11c3e, 0x11c3e,
+	0x11c40, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11ca9, 0x11ca9,
+	0x11cb1, 0x11cb1,
+	0x11cb4, 0x11cb4,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d30,
+	0x11d46, 0x11d46,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d93, 0x11d94,
+	0x11d96, 0x11d96,
+	0x11d98, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef2,
+	0x11ef5, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 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,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f50, 0x16f87,
+	0x16f93, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	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,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e137, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2eb,
+	0x1e2f0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8cf,
+	0x1e900, 0x1e943,
+	0x1e94b, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	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, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_Grapheme_Base */
+
+/* 'Grapheme_Link': Derived Property */
+static const OnigCodePoint CR_Grapheme_Link[] = {
+	52,
+	0x094d, 0x094d,
+	0x09cd, 0x09cd,
+	0x0a4d, 0x0a4d,
+	0x0acd, 0x0acd,
+	0x0b4d, 0x0b4d,
+	0x0bcd, 0x0bcd,
+	0x0c4d, 0x0c4d,
+	0x0ccd, 0x0ccd,
+	0x0d3b, 0x0d3c,
+	0x0d4d, 0x0d4d,
+	0x0dca, 0x0dca,
+	0x0e3a, 0x0e3a,
+	0x0eba, 0x0eba,
+	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,
+	0x11839, 0x11839,
+	0x119e0, 0x119e0,
+	0x11a34, 0x11a34,
+	0x11a47, 0x11a47,
+	0x11a99, 0x11a99,
+	0x11c3f, 0x11c3f,
+	0x11d44, 0x11d45,
+	0x11d97, 0x11d97,
+}; /* CR_Grapheme_Link */
+
+/* 'Common': Script */
+static const OnigCodePoint CR_Common[] = {
+	172,
+	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, 0x061b,
+	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, 0x1cf7,
+	0x1cfa, 0x1cfa,
+	0x2000, 0x200b,
+	0x200e, 0x2064,
+	0x2066, 0x2070,
+	0x2074, 0x207e,
+	0x2080, 0x208e,
+	0x20a0, 0x20bf,
+	0x2100, 0x2125,
+	0x2127, 0x2129,
+	0x212c, 0x2131,
+	0x2133, 0x214d,
+	0x214f, 0x215f,
+	0x2189, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x27ff,
+	0x2900, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bff,
+	0x2e00, 0x2e4f,
+	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,
+	0x32ff, 0x32ff,
+	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,
+	0x16fe2, 0x16fe3,
+	0x1bca0, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d166,
+	0x1d16a, 0x1d17a,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1e8,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Common */
+
+/* 'Latin': Script */
+static const OnigCodePoint CR_Latin[] = {
+	32,
+	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, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa7ff,
+	0xab30, 0xab5a,
+	0xab5c, 0xab64,
+	0xab66, 0xab67,
+	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[] = {
+	5,
+	0x0531, 0x0556,
+	0x0559, 0x0588,
+	0x058a, 0x058a,
+	0x058d, 0x058f,
+	0xfb13, 0xfb17,
+}; /* CR_Armenian */
+
+/* 'Hebrew': Script */
+static const OnigCodePoint CR_Hebrew[] = {
+	9,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfb4f,
+}; /* CR_Hebrew */
+
+/* 'Arabic': Script */
+static const OnigCodePoint CR_Arabic[] = {
+	57,
+	0x0600, 0x0604,
+	0x0606, 0x060b,
+	0x060d, 0x061a,
+	0x061c, 0x061c,
+	0x061e, 0x061e,
+	0x0620, 0x063f,
+	0x0641, 0x064a,
+	0x0656, 0x066f,
+	0x0671, 0x06dc,
+	0x06de, 0x06ff,
+	0x0750, 0x077f,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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[] = {
+	4,
+	0x0700, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x074f,
+	0x0860, 0x086a,
+}; /* CR_Syriac */
+
+/* 'Thaana': Script */
+static const OnigCodePoint CR_Thaana[] = {
+	1,
+	0x0780, 0x07b1,
+}; /* CR_Thaana */
+
+/* 'Devanagari': Script */
+static const OnigCodePoint CR_Devanagari[] = {
+	4,
+	0x0900, 0x0950,
+	0x0955, 0x0963,
+	0x0966, 0x097f,
+	0xa8e0, 0xa8ff,
+}; /* 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, 0x09fe,
+}; /* 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, 0x0a76,
+}; /* 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, 0x0aff,
+}; /* 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[] = {
+	18,
+	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,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x11fff,
+}; /* CR_Tamil */
+
+/* 'Telugu': Script */
+static const OnigCodePoint CR_Telugu[] = {
+	12,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 0x0c7f,
+}; /* CR_Telugu */
+
+/* 'Kannada': Script */
+static const OnigCodePoint CR_Kannada[] = {
+	13,
+	0x0c80, 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[] = {
+	8,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 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[] = {
+	11,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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[] = {
+	10,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10ff,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	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, 0x1878,
+	0x1880, 0x18aa,
+	0x11660, 0x1166c,
+}; /* CR_Mongolian */
+
+/* 'Hiragana': Script */
+static const OnigCodePoint CR_Hiragana[] = {
+	5,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x1b001, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1f200, 0x1f200,
+}; /* CR_Hiragana */
+
+/* 'Katakana': Script */
+static const OnigCodePoint CR_Katakana[] = {
+	9,
+	0x30a1, 0x30fa,
+	0x30fd, 0x30ff,
+	0x31f0, 0x31ff,
+	0x32d0, 0x32fe,
+	0x3300, 0x3357,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+	0x1b000, 0x1b000,
+	0x1b164, 0x1b167,
+}; /* CR_Katakana */
+
+/* 'Bopomofo': Script */
+static const OnigCodePoint CR_Bopomofo[] = {
+	3,
+	0x02ea, 0x02eb,
+	0x3105, 0x312f,
+	0x31a0, 0x31ba,
+}; /* CR_Bopomofo */
+
+/* 'Han': Script */
+static const OnigCodePoint CR_Han[] = {
+	17,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x3005, 0x3005,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303b,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	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, 0x10323,
+	0x1032d, 0x1032f,
+}; /* 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[] = {
+	28,
+	0x0300, 0x036f,
+	0x0485, 0x0486,
+	0x064b, 0x0655,
+	0x0670, 0x0670,
+	0x0951, 0x0954,
+	0x1ab0, 0x1abe,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1dc0, 0x1df9,
+	0x1dfb, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x302a, 0x302d,
+	0x3099, 0x309a,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe2d,
+	0x101fd, 0x101fd,
+	0x102e0, 0x102e0,
+	0x1133b, 0x1133b,
+	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, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	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[] = {
+	2,
+	0x07c0, 0x07fa,
+	0x07fd, 0x07ff,
+}; /* 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[] = {
+	2,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+}; /* 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[] = {
+	2,
+	0x11080, 0x110c1,
+	0x110cd, 0x110cd,
+}; /* 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, 0x11146,
+}; /* 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, 0x16f4a,
+	0x16f4f, 0x16f87,
+	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, 0x116b8,
+	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, 0x1171a,
+	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, 0x1e94b,
+	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, 0x1145f,
+}; /* 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, 0x187f7,
+	0x18800, 0x18af2,
+}; /* CR_Tangut */
+
+/* 'Masaram_Gondi': Script */
+static const OnigCodePoint CR_Masaram_Gondi[] = {
+	7,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+}; /* CR_Masaram_Gondi */
+
+/* 'Nushu': Script */
+static const OnigCodePoint CR_Nushu[] = {
+	2,
+	0x16fe1, 0x16fe1,
+	0x1b170, 0x1b2fb,
+}; /* CR_Nushu */
+
+/* 'Soyombo': Script */
+static const OnigCodePoint CR_Soyombo[] = {
+	1,
+	0x11a50, 0x11aa2,
+}; /* CR_Soyombo */
+
+/* 'Zanabazar_Square': Script */
+static const OnigCodePoint CR_Zanabazar_Square[] = {
+	1,
+	0x11a00, 0x11a47,
+}; /* CR_Zanabazar_Square */
+
+/* 'Dogra': Script */
+static const OnigCodePoint CR_Dogra[] = {
+	1,
+	0x11800, 0x1183b,
+}; /* CR_Dogra */
+
+/* 'Gunjala_Gondi': Script */
+static const OnigCodePoint CR_Gunjala_Gondi[] = {
+	6,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+}; /* CR_Gunjala_Gondi */
+
+/* 'Makasar': Script */
+static const OnigCodePoint CR_Makasar[] = {
+	1,
+	0x11ee0, 0x11ef8,
+}; /* CR_Makasar */
+
+/* 'Medefaidrin': Script */
+static const OnigCodePoint CR_Medefaidrin[] = {
+	1,
+	0x16e40, 0x16e9a,
+}; /* CR_Medefaidrin */
+
+/* 'Hanifi_Rohingya': Script */
+static const OnigCodePoint CR_Hanifi_Rohingya[] = {
+	2,
+	0x10d00, 0x10d27,
+	0x10d30, 0x10d39,
+}; /* CR_Hanifi_Rohingya */
+
+/* 'Sogdian': Script */
+static const OnigCodePoint CR_Sogdian[] = {
+	1,
+	0x10f30, 0x10f59,
+}; /* CR_Sogdian */
+
+/* 'Old_Sogdian': Script */
+static const OnigCodePoint CR_Old_Sogdian[] = {
+	1,
+	0x10f00, 0x10f27,
+}; /* CR_Old_Sogdian */
+
+/* 'Elymaic': Script */
+static const OnigCodePoint CR_Elymaic[] = {
+	1,
+	0x10fe0, 0x10ff6,
+}; /* CR_Elymaic */
+
+/* 'Nandinagari': Script */
+static const OnigCodePoint CR_Nandinagari[] = {
+	3,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+}; /* CR_Nandinagari */
+
+/* 'Nyiakeng_Puachue_Hmong': Script */
+static const OnigCodePoint CR_Nyiakeng_Puachue_Hmong[] = {
+	4,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+}; /* CR_Nyiakeng_Puachue_Hmong */
+
+/* 'Wancho': Script */
+static const OnigCodePoint CR_Wancho[] = {
+	2,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+}; /* CR_Wancho */
+
+/* '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[] = {
+	102,
+	0x0021, 0x0021,
+	0x002c, 0x002c,
+	0x002e, 0x002e,
+	0x003a, 0x003b,
+	0x003f, 0x003f,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x05c3, 0x05c3,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061e, 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,
+	0x166e, 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,
+	0x2e4c, 0x2e4c,
+	0x2e4e, 0x2e4f,
+	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,
+	0x10f55, 0x10f59,
+	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,
+	0x11a42, 0x11a43,
+	0x11a9b, 0x11a9c,
+	0x11aa1, 0x11aa2,
+	0x11c41, 0x11c43,
+	0x11c71, 0x11c71,
+	0x11ef7, 0x11ef8,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b39,
+	0x16b44, 0x16b44,
+	0x16e97, 0x16e98,
+	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[] = {
+	221,
+	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,
+	0x0afa, 0x0afc,
+	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,
+	0x0d00, 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, 0x1064,
+	0x1067, 0x106d,
+	0x1071, 0x1074,
+	0x1082, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109d,
+	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, 0x1c36,
+	0x1de7, 0x1df4,
+	0x24b6, 0x24e9,
+	0x2de0, 0x2dff,
+	0xa674, 0xa67b,
+	0xa69e, 0xa69f,
+	0xa802, 0xa802,
+	0xa80b, 0xa80b,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa8c5, 0xa8c5,
+	0xa8ff, 0xa8ff,
+	0xa926, 0xa92a,
+	0xa947, 0xa952,
+	0xa980, 0xa983,
+	0xa9b4, 0xa9bf,
+	0xa9e5, 0xa9e5,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaa7b, 0xaa7d,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabe,
+	0xaaeb, 0xaaef,
+	0xaaf5, 0xaaf5,
+	0xabe3, 0xabea,
+	0xfb1e, 0xfb1e,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10d24, 0x10d27,
+	0x11000, 0x11002,
+	0x11038, 0x11045,
+	0x11082, 0x11082,
+	0x110b0, 0x110b8,
+	0x11100, 0x11102,
+	0x11127, 0x11132,
+	0x11145, 0x11146,
+	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,
+	0x1182c, 0x11838,
+	0x119d1, 0x119d7,
+	0x119da, 0x119df,
+	0x119e4, 0x119e4,
+	0x11a01, 0x11a0a,
+	0x11a35, 0x11a39,
+	0x11a3b, 0x11a3e,
+	0x11a51, 0x11a5b,
+	0x11a8a, 0x11a97,
+	0x11c2f, 0x11c36,
+	0x11c38, 0x11c3e,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d41,
+	0x11d43, 0x11d43,
+	0x11d47, 0x11d47,
+	0x11d8a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d96,
+	0x11ef3, 0x11ef6,
+	0x16f4f, 0x16f4f,
+	0x16f51, 0x16f87,
+	0x16f8f, 0x16f92,
+	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[] = {
+	16,
+	0x3006, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b170, 0x1b2fb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_Ideographic */
+
+/* 'Diacritic': Binary Property */
+static const OnigCodePoint CR_Diacritic[] = {
+	171,
+	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,
+	0x0afd, 0x0aff,
+	0x0b3c, 0x0b3c,
+	0x0b4d, 0x0b4d,
+	0x0bcd, 0x0bcd,
+	0x0c4d, 0x0c4d,
+	0x0cbc, 0x0cbc,
+	0x0ccd, 0x0ccd,
+	0x0d3b, 0x0d3c,
+	0x0d4d, 0x0d4d,
+	0x0dca, 0x0dca,
+	0x0e47, 0x0e4c,
+	0x0e4e, 0x0e4e,
+	0x0eba, 0x0eba,
+	0x0ec8, 0x0ecc,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f3f,
+	0x0f82, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0fc6, 0x0fc6,
+	0x1037, 0x1037,
+	0x1039, 0x103a,
+	0x1063, 0x1064,
+	0x1069, 0x106d,
+	0x1087, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109b,
+	0x135d, 0x135f,
+	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,
+	0x1cf7, 0x1cf9,
+	0x1d2c, 0x1d6a,
+	0x1dc4, 0x1dcf,
+	0x1df5, 0x1df9,
+	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,
+	0xa700, 0xa721,
+	0xa788, 0xa78a,
+	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,
+	0x10d22, 0x10d27,
+	0x10f46, 0x10f50,
+	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,
+	0x11839, 0x1183a,
+	0x119e0, 0x119e0,
+	0x11a34, 0x11a34,
+	0x11a47, 0x11a47,
+	0x11a99, 0x11a99,
+	0x11c3f, 0x11c3f,
+	0x11d42, 0x11d42,
+	0x11d44, 0x11d45,
+	0x11d97, 0x11d97,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f8f, 0x16f9f,
+	0x1d167, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1e130, 0x1e136,
+	0x1e2ec, 0x1e2ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e946,
+	0x1e948, 0x1e94a,
+}; /* CR_Diacritic */
+
+/* 'Extender': Binary Property */
+static const OnigCodePoint CR_Extender[] = {
+	31,
+	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,
+	0x11a98, 0x11a98,
+	0x16b42, 0x16b43,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x1e13c, 0x1e13d,
+	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[] = {
+	24,
+	0x09be, 0x09be,
+	0x09d7, 0x09d7,
+	0x0b3e, 0x0b3e,
+	0x0b57, 0x0b57,
+	0x0bbe, 0x0bbe,
+	0x0bd7, 0x0bd7,
+	0x0cc2, 0x0cc2,
+	0x0cd5, 0x0cd6,
+	0x0d3e, 0x0d3e,
+	0x0d57, 0x0d57,
+	0x0dcf, 0x0dcf,
+	0x0ddf, 0x0ddf,
+	0x1b35, 0x1b35,
+	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[] = {
+	14,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xfa0e, 0xfa0f,
+	0xfa11, 0xfa11,
+	0xfa13, 0xfa14,
+	0xfa1f, 0xfa1f,
+	0xfa21, 0xfa21,
+	0xfa23, 0xfa24,
+	0xfa27, 0xfa29,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+}; /* 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[] = {
+	74,
+	0x0021, 0x0021,
+	0x002e, 0x002e,
+	0x003f, 0x003f,
+	0x0589, 0x0589,
+	0x061e, 0x061f,
+	0x06d4, 0x06d4,
+	0x0700, 0x0702,
+	0x07f9, 0x07f9,
+	0x0837, 0x0837,
+	0x0839, 0x0839,
+	0x083d, 0x083e,
+	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,
+	0x10f55, 0x10f59,
+	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,
+	0x11a42, 0x11a43,
+	0x11a9b, 0x11a9c,
+	0x11c41, 0x11c42,
+	0x11ef7, 0x11ef8,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b38,
+	0x16b44, 0x16b44,
+	0x16e98, 0x16e98,
+	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[] = {
+	6,
+	0x0600, 0x0605,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x08e2, 0x08e2,
+	0x110bd, 0x110bd,
+	0x110cd, 0x110cd,
+}; /* CR_Prepended_Concatenation_Mark */
+
+/* 'Regional_Indicator': Binary Property */
+static const OnigCodePoint CR_Regional_Indicator[] = {
+	1,
+	0x1f1e6, 0x1f1ff,
+}; /* CR_Regional_Indicator */
+
+/* 'Emoji': Emoji */
+static const OnigCodePoint CR_Emoji[] = {
+	151,
+	0x0023, 0x0023,
+	0x002a, 0x002a,
+	0x0030, 0x0039,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x203c, 0x203c,
+	0x2049, 0x2049,
+	0x2122, 0x2122,
+	0x2139, 0x2139,
+	0x2194, 0x2199,
+	0x21a9, 0x21aa,
+	0x231a, 0x231b,
+	0x2328, 0x2328,
+	0x23cf, 0x23cf,
+	0x23e9, 0x23f3,
+	0x23f8, 0x23fa,
+	0x24c2, 0x24c2,
+	0x25aa, 0x25ab,
+	0x25b6, 0x25b6,
+	0x25c0, 0x25c0,
+	0x25fb, 0x25fe,
+	0x2600, 0x2604,
+	0x260e, 0x260e,
+	0x2611, 0x2611,
+	0x2614, 0x2615,
+	0x2618, 0x2618,
+	0x261d, 0x261d,
+	0x2620, 0x2620,
+	0x2622, 0x2623,
+	0x2626, 0x2626,
+	0x262a, 0x262a,
+	0x262e, 0x262f,
+	0x2638, 0x263a,
+	0x2640, 0x2640,
+	0x2642, 0x2642,
+	0x2648, 0x2653,
+	0x265f, 0x2660,
+	0x2663, 0x2663,
+	0x2665, 0x2666,
+	0x2668, 0x2668,
+	0x267b, 0x267b,
+	0x267e, 0x267f,
+	0x2692, 0x2697,
+	0x2699, 0x2699,
+	0x269b, 0x269c,
+	0x26a0, 0x26a1,
+	0x26aa, 0x26ab,
+	0x26b0, 0x26b1,
+	0x26bd, 0x26be,
+	0x26c4, 0x26c5,
+	0x26c8, 0x26c8,
+	0x26ce, 0x26cf,
+	0x26d1, 0x26d1,
+	0x26d3, 0x26d4,
+	0x26e9, 0x26ea,
+	0x26f0, 0x26f5,
+	0x26f7, 0x26fa,
+	0x26fd, 0x26fd,
+	0x2702, 0x2702,
+	0x2705, 0x2705,
+	0x2708, 0x270d,
+	0x270f, 0x270f,
+	0x2712, 0x2712,
+	0x2714, 0x2714,
+	0x2716, 0x2716,
+	0x271d, 0x271d,
+	0x2721, 0x2721,
+	0x2728, 0x2728,
+	0x2733, 0x2734,
+	0x2744, 0x2744,
+	0x2747, 0x2747,
+	0x274c, 0x274c,
+	0x274e, 0x274e,
+	0x2753, 0x2755,
+	0x2757, 0x2757,
+	0x2763, 0x2764,
+	0x2795, 0x2797,
+	0x27a1, 0x27a1,
+	0x27b0, 0x27b0,
+	0x27bf, 0x27bf,
+	0x2934, 0x2935,
+	0x2b05, 0x2b07,
+	0x2b1b, 0x2b1c,
+	0x2b50, 0x2b50,
+	0x2b55, 0x2b55,
+	0x3030, 0x3030,
+	0x303d, 0x303d,
+	0x3297, 0x3297,
+	0x3299, 0x3299,
+	0x1f004, 0x1f004,
+	0x1f0cf, 0x1f0cf,
+	0x1f170, 0x1f171,
+	0x1f17e, 0x1f17f,
+	0x1f18e, 0x1f18e,
+	0x1f191, 0x1f19a,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f21a, 0x1f21a,
+	0x1f22f, 0x1f22f,
+	0x1f232, 0x1f23a,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f321,
+	0x1f324, 0x1f393,
+	0x1f396, 0x1f397,
+	0x1f399, 0x1f39b,
+	0x1f39e, 0x1f3f0,
+	0x1f3f3, 0x1f3f5,
+	0x1f3f7, 0x1f4fd,
+	0x1f4ff, 0x1f53d,
+	0x1f549, 0x1f54e,
+	0x1f550, 0x1f567,
+	0x1f56f, 0x1f570,
+	0x1f573, 0x1f57a,
+	0x1f587, 0x1f587,
+	0x1f58a, 0x1f58d,
+	0x1f590, 0x1f590,
+	0x1f595, 0x1f596,
+	0x1f5a4, 0x1f5a5,
+	0x1f5a8, 0x1f5a8,
+	0x1f5b1, 0x1f5b2,
+	0x1f5bc, 0x1f5bc,
+	0x1f5c2, 0x1f5c4,
+	0x1f5d1, 0x1f5d3,
+	0x1f5dc, 0x1f5de,
+	0x1f5e1, 0x1f5e1,
+	0x1f5e3, 0x1f5e3,
+	0x1f5e8, 0x1f5e8,
+	0x1f5ef, 0x1f5ef,
+	0x1f5f3, 0x1f5f3,
+	0x1f5fa, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f6cb, 0x1f6d2,
+	0x1f6d5, 0x1f6d5,
+	0x1f6e0, 0x1f6e5,
+	0x1f6e9, 0x1f6e9,
+	0x1f6eb, 0x1f6ec,
+	0x1f6f0, 0x1f6f0,
+	0x1f6f3, 0x1f6fa,
+	0x1f7e0, 0x1f7eb,
+	0x1f90d, 0x1f93a,
+	0x1f93c, 0x1f945,
+	0x1f947, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1f9ff,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+}; /* CR_Emoji */
+
+/* 'Emoji_Presentation': Emoji */
+static const OnigCodePoint CR_Emoji_Presentation[] = {
+	81,
+	0x231a, 0x231b,
+	0x23e9, 0x23ec,
+	0x23f0, 0x23f0,
+	0x23f3, 0x23f3,
+	0x25fd, 0x25fe,
+	0x2614, 0x2615,
+	0x2648, 0x2653,
+	0x267f, 0x267f,
+	0x2693, 0x2693,
+	0x26a1, 0x26a1,
+	0x26aa, 0x26ab,
+	0x26bd, 0x26be,
+	0x26c4, 0x26c5,
+	0x26ce, 0x26ce,
+	0x26d4, 0x26d4,
+	0x26ea, 0x26ea,
+	0x26f2, 0x26f3,
+	0x26f5, 0x26f5,
+	0x26fa, 0x26fa,
+	0x26fd, 0x26fd,
+	0x2705, 0x2705,
+	0x270a, 0x270b,
+	0x2728, 0x2728,
+	0x274c, 0x274c,
+	0x274e, 0x274e,
+	0x2753, 0x2755,
+	0x2757, 0x2757,
+	0x2795, 0x2797,
+	0x27b0, 0x27b0,
+	0x27bf, 0x27bf,
+	0x2b1b, 0x2b1c,
+	0x2b50, 0x2b50,
+	0x2b55, 0x2b55,
+	0x1f004, 0x1f004,
+	0x1f0cf, 0x1f0cf,
+	0x1f18e, 0x1f18e,
+	0x1f191, 0x1f19a,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f201,
+	0x1f21a, 0x1f21a,
+	0x1f22f, 0x1f22f,
+	0x1f232, 0x1f236,
+	0x1f238, 0x1f23a,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f32d, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f37e, 0x1f393,
+	0x1f3a0, 0x1f3ca,
+	0x1f3cf, 0x1f3d3,
+	0x1f3e0, 0x1f3f0,
+	0x1f3f4, 0x1f3f4,
+	0x1f3f8, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4fc,
+	0x1f4ff, 0x1f53d,
+	0x1f54b, 0x1f54e,
+	0x1f550, 0x1f567,
+	0x1f57a, 0x1f57a,
+	0x1f595, 0x1f596,
+	0x1f5a4, 0x1f5a4,
+	0x1f5fb, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f6cc, 0x1f6cc,
+	0x1f6d0, 0x1f6d2,
+	0x1f6d5, 0x1f6d5,
+	0x1f6eb, 0x1f6ec,
+	0x1f6f4, 0x1f6fa,
+	0x1f7e0, 0x1f7eb,
+	0x1f90d, 0x1f93a,
+	0x1f93c, 0x1f945,
+	0x1f947, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1f9ff,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+}; /* CR_Emoji_Presentation */
+
+/* 'Emoji_Modifier': Emoji */
+static const OnigCodePoint CR_Emoji_Modifier[] = {
+	1,
+	0x1f3fb, 0x1f3ff,
+}; /* CR_Emoji_Modifier */
+
+/* 'Emoji_Modifier_Base': Emoji */
+static const OnigCodePoint CR_Emoji_Modifier_Base[] = {
+	36,
+	0x261d, 0x261d,
+	0x26f9, 0x26f9,
+	0x270a, 0x270d,
+	0x1f385, 0x1f385,
+	0x1f3c2, 0x1f3c4,
+	0x1f3c7, 0x1f3c7,
+	0x1f3ca, 0x1f3cc,
+	0x1f442, 0x1f443,
+	0x1f446, 0x1f450,
+	0x1f466, 0x1f478,
+	0x1f47c, 0x1f47c,
+	0x1f481, 0x1f483,
+	0x1f485, 0x1f487,
+	0x1f48f, 0x1f48f,
+	0x1f491, 0x1f491,
+	0x1f4aa, 0x1f4aa,
+	0x1f574, 0x1f575,
+	0x1f57a, 0x1f57a,
+	0x1f590, 0x1f590,
+	0x1f595, 0x1f596,
+	0x1f645, 0x1f647,
+	0x1f64b, 0x1f64f,
+	0x1f6a3, 0x1f6a3,
+	0x1f6b4, 0x1f6b6,
+	0x1f6c0, 0x1f6c0,
+	0x1f6cc, 0x1f6cc,
+	0x1f90f, 0x1f90f,
+	0x1f918, 0x1f91f,
+	0x1f926, 0x1f926,
+	0x1f930, 0x1f939,
+	0x1f93c, 0x1f93e,
+	0x1f9b5, 0x1f9b6,
+	0x1f9b8, 0x1f9b9,
+	0x1f9bb, 0x1f9bb,
+	0x1f9cd, 0x1f9cf,
+	0x1f9d1, 0x1f9dd,
+}; /* CR_Emoji_Modifier_Base */
+
+/* 'Emoji_Component': Emoji */
+static const OnigCodePoint CR_Emoji_Component[] = {
+	10,
+	0x0023, 0x0023,
+	0x002a, 0x002a,
+	0x0030, 0x0039,
+	0x200d, 0x200d,
+	0x20e3, 0x20e3,
+	0xfe0f, 0xfe0f,
+	0x1f1e6, 0x1f1ff,
+	0x1f3fb, 0x1f3ff,
+	0x1f9b0, 0x1f9b3,
+	0xe0020, 0xe007f,
+}; /* CR_Emoji_Component */
+
+/* 'Extended_Pictographic': Emoji */
+static const OnigCodePoint CR_Extended_Pictographic[] = {
+	77,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x203c, 0x203c,
+	0x2049, 0x2049,
+	0x2122, 0x2122,
+	0x2139, 0x2139,
+	0x2194, 0x2199,
+	0x21a9, 0x21aa,
+	0x231a, 0x231b,
+	0x2328, 0x2328,
+	0x2388, 0x2388,
+	0x23cf, 0x23cf,
+	0x23e9, 0x23f3,
+	0x23f8, 0x23fa,
+	0x24c2, 0x24c2,
+	0x25aa, 0x25ab,
+	0x25b6, 0x25b6,
+	0x25c0, 0x25c0,
+	0x25fb, 0x25fe,
+	0x2600, 0x2605,
+	0x2607, 0x2612,
+	0x2614, 0x2685,
+	0x2690, 0x2705,
+	0x2708, 0x2712,
+	0x2714, 0x2714,
+	0x2716, 0x2716,
+	0x271d, 0x271d,
+	0x2721, 0x2721,
+	0x2728, 0x2728,
+	0x2733, 0x2734,
+	0x2744, 0x2744,
+	0x2747, 0x2747,
+	0x274c, 0x274c,
+	0x274e, 0x274e,
+	0x2753, 0x2755,
+	0x2757, 0x2757,
+	0x2763, 0x2767,
+	0x2795, 0x2797,
+	0x27a1, 0x27a1,
+	0x27b0, 0x27b0,
+	0x27bf, 0x27bf,
+	0x2934, 0x2935,
+	0x2b05, 0x2b07,
+	0x2b1b, 0x2b1c,
+	0x2b50, 0x2b50,
+	0x2b55, 0x2b55,
+	0x3030, 0x3030,
+	0x303d, 0x303d,
+	0x3297, 0x3297,
+	0x3299, 0x3299,
+	0x1f000, 0x1f0ff,
+	0x1f10d, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f171,
+	0x1f17e, 0x1f17f,
+	0x1f18e, 0x1f18e,
+	0x1f191, 0x1f19a,
+	0x1f1ad, 0x1f1e5,
+	0x1f201, 0x1f20f,
+	0x1f21a, 0x1f21a,
+	0x1f22f, 0x1f22f,
+	0x1f232, 0x1f23a,
+	0x1f23c, 0x1f23f,
+	0x1f249, 0x1f3fa,
+	0x1f400, 0x1f53d,
+	0x1f546, 0x1f64f,
+	0x1f680, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d5, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1f8ff,
+	0x1f90c, 0x1f93a,
+	0x1f93c, 0x1f945,
+	0x1f947, 0x1fffd,
+}; /* CR_Extended_Pictographic */
+
+/* 'Unknown': Script */
+static const OnigCodePoint CR_Unknown[] = {
+	664,
+	0x0378, 0x0379,
+	0x0380, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0530, 0x0530,
+	0x0557, 0x0558,
+	0x058b, 0x058c,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ee,
+	0x05f5, 0x05ff,
+	0x061d, 0x061d,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07fc,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x085f,
+	0x086b, 0x089f,
+	0x08b5, 0x08b5,
+	0x08be, 0x08d2,
+	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,
+	0x09ff, 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,
+	0x0a77, 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,
+	0x0b00, 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,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5b, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c76,
+	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, 0x0cff,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	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, 0x0e85,
+	0x0e8b, 0x0e8b,
+	0x0ea4, 0x0ea4,
+	0x0ea6, 0x0ea6,
+	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,
+	0x1879, 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, 0x1c8f,
+	0x1cbb, 0x1cbc,
+	0x1cc8, 0x1ccf,
+	0x1cfb, 0x1cff,
+	0x1dfa, 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,
+	0x20c0, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218c, 0x218f,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2b74, 0x2b75,
+	0x2b96, 0x2b97,
+	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,
+	0x2e50, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x3130, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x4db6, 0x4dbf,
+	0x9ff0, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa6f8, 0xa6ff,
+	0xa7c0, 0xa7c1,
+	0xa7c7, 0xa7f6,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c6, 0xa8cd,
+	0xa8da, 0xa8df,
+	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,
+	0xab68, 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, 0x1032c,
+	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,
+	0x10a36, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a49, 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,
+	0x10d28, 0x10d2f,
+	0x10d3a, 0x10e5f,
+	0x10e7f, 0x10eff,
+	0x10f28, 0x10f2f,
+	0x10f5a, 0x10fdf,
+	0x10ff7, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107e,
+	0x110c2, 0x110cc,
+	0x110ce, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11147, 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, 0x1133a,
+	0x11345, 0x11346,
+	0x11349, 0x1134a,
+	0x1134e, 0x1134f,
+	0x11351, 0x11356,
+	0x11358, 0x1135c,
+	0x11364, 0x11365,
+	0x1136d, 0x1136f,
+	0x11375, 0x113ff,
+	0x1145a, 0x1145a,
+	0x1145c, 0x1145c,
+	0x11460, 0x1147f,
+	0x114c8, 0x114cf,
+	0x114da, 0x1157f,
+	0x115b6, 0x115b7,
+	0x115de, 0x115ff,
+	0x11645, 0x1164f,
+	0x1165a, 0x1165f,
+	0x1166d, 0x1167f,
+	0x116b9, 0x116bf,
+	0x116ca, 0x116ff,
+	0x1171b, 0x1171c,
+	0x1172c, 0x1172f,
+	0x11740, 0x117ff,
+	0x1183c, 0x1189f,
+	0x118f3, 0x118fe,
+	0x11900, 0x1199f,
+	0x119a8, 0x119a9,
+	0x119d8, 0x119d9,
+	0x119e5, 0x119ff,
+	0x11a48, 0x11a4f,
+	0x11aa3, 0x11abf,
+	0x11af9, 0x11bff,
+	0x11c09, 0x11c09,
+	0x11c37, 0x11c37,
+	0x11c46, 0x11c4f,
+	0x11c6d, 0x11c6f,
+	0x11c90, 0x11c91,
+	0x11ca8, 0x11ca8,
+	0x11cb7, 0x11cff,
+	0x11d07, 0x11d07,
+	0x11d0a, 0x11d0a,
+	0x11d37, 0x11d39,
+	0x11d3b, 0x11d3b,
+	0x11d3e, 0x11d3e,
+	0x11d48, 0x11d4f,
+	0x11d5a, 0x11d5f,
+	0x11d66, 0x11d66,
+	0x11d69, 0x11d69,
+	0x11d8f, 0x11d8f,
+	0x11d92, 0x11d92,
+	0x11d99, 0x11d9f,
+	0x11daa, 0x11edf,
+	0x11ef9, 0x11fbf,
+	0x11ff2, 0x11ffe,
+	0x1239a, 0x123ff,
+	0x1246f, 0x1246f,
+	0x12475, 0x1247f,
+	0x12544, 0x12fff,
+	0x1342f, 0x1342f,
+	0x13439, 0x143ff,
+	0x14647, 0x167ff,
+	0x16a39, 0x16a3f,
+	0x16a5f, 0x16a5f,
+	0x16a6a, 0x16a6d,
+	0x16a70, 0x16acf,
+	0x16aee, 0x16aef,
+	0x16af6, 0x16aff,
+	0x16b46, 0x16b4f,
+	0x16b5a, 0x16b5a,
+	0x16b62, 0x16b62,
+	0x16b78, 0x16b7c,
+	0x16b90, 0x16e3f,
+	0x16e9b, 0x16eff,
+	0x16f4b, 0x16f4e,
+	0x16f88, 0x16f8e,
+	0x16fa0, 0x16fdf,
+	0x16fe4, 0x16fff,
+	0x187f8, 0x187ff,
+	0x18af3, 0x1afff,
+	0x1b11f, 0x1b14f,
+	0x1b153, 0x1b163,
+	0x1b168, 0x1b16f,
+	0x1b2fc, 0x1bbff,
+	0x1bc6b, 0x1bc6f,
+	0x1bc7d, 0x1bc7f,
+	0x1bc89, 0x1bc8f,
+	0x1bc9a, 0x1bc9b,
+	0x1bca4, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d1e9, 0x1d1ff,
+	0x1d246, 0x1d2df,
+	0x1d2f4, 0x1d2ff,
+	0x1d357, 0x1d35f,
+	0x1d379, 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, 0x1e0ff,
+	0x1e12d, 0x1e12f,
+	0x1e13e, 0x1e13f,
+	0x1e14a, 0x1e14d,
+	0x1e150, 0x1e2bf,
+	0x1e2fa, 0x1e2fe,
+	0x1e300, 0x1e7ff,
+	0x1e8c5, 0x1e8c6,
+	0x1e8d7, 0x1e8ff,
+	0x1e94c, 0x1e94f,
+	0x1e95a, 0x1e95d,
+	0x1e960, 0x1ec70,
+	0x1ecb5, 0x1ed00,
+	0x1ed3e, 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,
+	0x1f16d, 0x1f16f,
+	0x1f1ad, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23c, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f25f,
+	0x1f266, 0x1f2ff,
+	0x1f6d6, 0x1f6df,
+	0x1f6ed, 0x1f6ef,
+	0x1f6fb, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d9, 0x1f7df,
+	0x1f7ec, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1f8ff,
+	0x1f90c, 0x1f90c,
+	0x1f972, 0x1f972,
+	0x1f977, 0x1f979,
+	0x1f9a3, 0x1f9a4,
+	0x1f9ab, 0x1f9ad,
+	0x1f9cb, 0x1f9cc,
+	0x1fa54, 0x1fa5f,
+	0x1fa6e, 0x1fa6f,
+	0x1fa74, 0x1fa77,
+	0x1fa7b, 0x1fa7f,
+	0x1fa83, 0x1fa8f,
+	0x1fa96, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2b81f,
+	0x2cea2, 0x2ceaf,
+	0x2ebe1, 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 */
+
+/* 'Age_10_0': Derived Age 10.0 */
+static const OnigCodePoint CR_Age_10_0[] = {
+	659,
+	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,
+	0x0860, 0x086a,
+	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, 0x09fd,
+	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, 0x0aff,
+	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,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 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, 0x1cf9,
+	0x1d00, 0x1df9,
+	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, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd2,
+	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, 0x2e49,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312e,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fea,
+	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,
+	0x1032d, 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,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11a83,
+	0x11a86, 0x11a9c,
+	0x11a9e, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	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, 0x16fe1,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b170, 0x1b2fb,
+	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,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d4,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f8,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f910, 0x1f93e,
+	0x1f940, 0x1f94c,
+	0x1f950, 0x1f96b,
+	0x1f980, 0x1f997,
+	0x1f9c0, 0x1f9c0,
+	0x1f9d0, 0x1f9e6,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	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_10_0 */
+
+/* 'Age_11_0': Derived Age 11.0 */
+static const OnigCodePoint CR_Age_11_0[] = {
+	668,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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, 0x09fe,
+	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, 0x0a76,
+	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, 0x0aff,
+	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, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 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,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 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, 0x1878,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cf9,
+	0x1d00, 0x1df9,
+	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, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bc8,
+	0x2bca, 0x2bfe,
+	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, 0x2e4e,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7b9,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 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,
+	0x1032d, 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, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	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, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	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,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145e,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11a83,
+	0x11a86, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	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,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x17000, 0x187f1,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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,
+	0x1ec71, 0x1ecb4,
+	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, 0x1f16b,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d4,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f9,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f910, 0x1f93e,
+	0x1f940, 0x1f970,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f97a,
+	0x1f97c, 0x1f9a2,
+	0x1f9b0, 0x1f9b9,
+	0x1f9c0, 0x1f9c2,
+	0x1f9d0, 0x1f9ff,
+	0x1fa60, 0x1fa6d,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	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_11_0 */
+
+/* 'Age_12_0': Derived Age 12.0 */
+static const OnigCodePoint CR_Age_12_0[] = {
+	677,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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, 0x09fe,
+	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, 0x0a76,
+	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, 0x0aff,
+	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, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 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,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x1878,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
+	0x1d00, 0x1df9,
+	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, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 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, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 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, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	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, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	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,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145f,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	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, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	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_12_0 */
+
+/* 'Age_12_1': Derived Age 12.1 */
+static const OnigCodePoint CR_Age_12_1[] = {
+	676,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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, 0x09fe,
+	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, 0x0a76,
+	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, 0x0aff,
+	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, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 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,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 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,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 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, 0x1878,
+	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,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
+	0x1d00, 0x1df9,
+	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, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 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, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 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, 0xab67,
+	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,
+	0x1032d, 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, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	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, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	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,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145f,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	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, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	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_12_1 */
+
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+/* 'Grapheme_Cluster_Break_Prepend': Grapheme_Cluster_Break=Prepend */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_Prepend[] = {
+	11,
+	0x0600, 0x0605,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x08e2, 0x08e2,
+	0x0d4e, 0x0d4e,
+	0x110bd, 0x110bd,
+	0x110cd, 0x110cd,
+	0x111c2, 0x111c3,
+	0x11a3a, 0x11a3a,
+	0x11a84, 0x11a89,
+	0x11d46, 0x11d46,
+}; /* 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,
+	0xfeff, 0xfeff,
+	0xfff0, 0xfffb,
+	0x13430, 0x13438,
+	0x1bca0, 0x1bca3,
+	0x1d173, 0x1d17a,
+	0xe0000, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xe0fff,
+}; /* CR_Grapheme_Cluster_Break_Control */
+
+/* 'Grapheme_Cluster_Break_Extend': Grapheme_Cluster_Break=Extend */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
+	336,
+	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,
+	0x07fd, 0x07fd,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0859, 0x085b,
+	0x08d3, 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,
+	0x09fe, 0x09fe,
+	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,
+	0x0afa, 0x0aff,
+	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,
+	0x0c04, 0x0c04,
+	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,
+	0x0d00, 0x0d01,
+	0x0d3b, 0x0d3c,
+	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, 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, 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, 0x1df9,
+	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,
+	0xa8ff, 0xa8ff,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bd,
+	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,
+	0x10d24, 0x10d27,
+	0x10f46, 0x10f50,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x1107f, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x111c9, 0x111cc,
+	0x1122f, 0x11231,
+	0x11234, 0x11234,
+	0x11236, 0x11237,
+	0x1123e, 0x1123e,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11300, 0x11301,
+	0x1133b, 0x1133c,
+	0x1133e, 0x1133e,
+	0x11340, 0x11340,
+	0x11357, 0x11357,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11438, 0x1143f,
+	0x11442, 0x11444,
+	0x11446, 0x11446,
+	0x1145e, 0x1145e,
+	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,
+	0x1182f, 0x11837,
+	0x11839, 0x1183a,
+	0x119d4, 0x119d7,
+	0x119da, 0x119db,
+	0x119e0, 0x119e0,
+	0x11a01, 0x11a0a,
+	0x11a33, 0x11a38,
+	0x11a3b, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a51, 0x11a56,
+	0x11a59, 0x11a5b,
+	0x11a8a, 0x11a96,
+	0x11a98, 0x11a99,
+	0x11c30, 0x11c36,
+	0x11c38, 0x11c3d,
+	0x11c3f, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11caa, 0x11cb0,
+	0x11cb2, 0x11cb3,
+	0x11cb5, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d45,
+	0x11d47, 0x11d47,
+	0x11d90, 0x11d91,
+	0x11d95, 0x11d95,
+	0x11d97, 0x11d97,
+	0x11ef3, 0x11ef4,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f4f, 0x16f4f,
+	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,
+	0x1e130, 0x1e136,
+	0x1e2ec, 0x1e2ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0x1f3fb, 0x1f3ff,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Grapheme_Cluster_Break_Extend */
+
+/* 'Grapheme_Cluster_Break_Regional_Indicator': Grapheme_Cluster_Break=Regional_Indicator */
+#define CR_Grapheme_Cluster_Break_Regional_Indicator CR_Regional_Indicator
+
+/* 'Grapheme_Cluster_Break_SpacingMark': Grapheme_Cluster_Break=SpacingMark */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
+	152,
+	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,
+	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,
+	0x1cf7, 0x1cf7,
+	0xa823, 0xa824,
+	0xa827, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa952, 0xa953,
+	0xa983, 0xa983,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9be, 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,
+	0x11145, 0x11146,
+	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,
+	0x1182c, 0x1182e,
+	0x11838, 0x11838,
+	0x119d1, 0x119d3,
+	0x119dc, 0x119df,
+	0x119e4, 0x119e4,
+	0x11a39, 0x11a39,
+	0x11a57, 0x11a58,
+	0x11a97, 0x11a97,
+	0x11c2f, 0x11c2f,
+	0x11c3e, 0x11c3e,
+	0x11ca9, 0x11ca9,
+	0x11cb1, 0x11cb1,
+	0x11cb4, 0x11cb4,
+	0x11d8a, 0x11d8e,
+	0x11d93, 0x11d94,
+	0x11d96, 0x11d96,
+	0x11ef5, 0x11ef6,
+	0x16f51, 0x16f87,
+	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_ZWJ': Grapheme_Cluster_Break=ZWJ */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_ZWJ[] = {
+	1,
+	0x200d, 0x200d,
+}; /* CR_Grapheme_Cluster_Break_ZWJ */
+
+/* '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_Syriac_Supplement': Block */
+static const OnigCodePoint CR_In_Syriac_Supplement[] = {
+	1,
+	0x0860, 0x086f,
+}; /* CR_In_Syriac_Supplement */
+
+/* '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_Georgian_Extended': Block */
+static const OnigCodePoint CR_In_Georgian_Extended[] = {
+	1,
+	0x1c90, 0x1cbf,
+}; /* CR_In_Georgian_Extended */
+
+/* '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_Hanifi_Rohingya': Block */
+static const OnigCodePoint CR_In_Hanifi_Rohingya[] = {
+	1,
+	0x10d00, 0x10d3f,
+}; /* CR_In_Hanifi_Rohingya */
+
+/* 'In_Rumi_Numeral_Symbols': Block */
+static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
+	1,
+	0x10e60, 0x10e7f,
+}; /* CR_In_Rumi_Numeral_Symbols */
+
+/* 'In_Old_Sogdian': Block */
+static const OnigCodePoint CR_In_Old_Sogdian[] = {
+	1,
+	0x10f00, 0x10f2f,
+}; /* CR_In_Old_Sogdian */
+
+/* 'In_Sogdian': Block */
+static const OnigCodePoint CR_In_Sogdian[] = {
+	1,
+	0x10f30, 0x10f6f,
+}; /* CR_In_Sogdian */
+
+/* 'In_Elymaic': Block */
+static const OnigCodePoint CR_In_Elymaic[] = {
+	1,
+	0x10fe0, 0x10fff,
+}; /* CR_In_Elymaic */
+
+/* '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_Dogra': Block */
+static const OnigCodePoint CR_In_Dogra[] = {
+	1,
+	0x11800, 0x1184f,
+}; /* CR_In_Dogra */
+
+/* 'In_Warang_Citi': Block */
+static const OnigCodePoint CR_In_Warang_Citi[] = {
+	1,
+	0x118a0, 0x118ff,
+}; /* CR_In_Warang_Citi */
+
+/* 'In_Nandinagari': Block */
+static const OnigCodePoint CR_In_Nandinagari[] = {
+	1,
+	0x119a0, 0x119ff,
+}; /* CR_In_Nandinagari */
+
+/* 'In_Zanabazar_Square': Block */
+static const OnigCodePoint CR_In_Zanabazar_Square[] = {
+	1,
+	0x11a00, 0x11a4f,
+}; /* CR_In_Zanabazar_Square */
+
+/* 'In_Soyombo': Block */
+static const OnigCodePoint CR_In_Soyombo[] = {
+	1,
+	0x11a50, 0x11aaf,
+}; /* CR_In_Soyombo */
+
+/* '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_Masaram_Gondi': Block */
+static const OnigCodePoint CR_In_Masaram_Gondi[] = {
+	1,
+	0x11d00, 0x11d5f,
+}; /* CR_In_Masaram_Gondi */
+
+/* 'In_Gunjala_Gondi': Block */
+static const OnigCodePoint CR_In_Gunjala_Gondi[] = {
+	1,
+	0x11d60, 0x11daf,
+}; /* CR_In_Gunjala_Gondi */
+
+/* 'In_Makasar': Block */
+static const OnigCodePoint CR_In_Makasar[] = {
+	1,
+	0x11ee0, 0x11eff,
+}; /* CR_In_Makasar */
+
+/* 'In_Tamil_Supplement': Block */
+static const OnigCodePoint CR_In_Tamil_Supplement[] = {
+	1,
+	0x11fc0, 0x11fff,
+}; /* CR_In_Tamil_Supplement */
+
+/* '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_Egyptian_Hieroglyph_Format_Controls': Block */
+static const OnigCodePoint CR_In_Egyptian_Hieroglyph_Format_Controls[] = {
+	1,
+	0x13430, 0x1343f,
+}; /* CR_In_Egyptian_Hieroglyph_Format_Controls */
+
+/* '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_Medefaidrin': Block */
+static const OnigCodePoint CR_In_Medefaidrin[] = {
+	1,
+	0x16e40, 0x16e9f,
+}; /* CR_In_Medefaidrin */
+
+/* '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_Kana_Extended_A': Block */
+static const OnigCodePoint CR_In_Kana_Extended_A[] = {
+	1,
+	0x1b100, 0x1b12f,
+}; /* CR_In_Kana_Extended_A */
+
+/* 'In_Small_Kana_Extension': Block */
+static const OnigCodePoint CR_In_Small_Kana_Extension[] = {
+	1,
+	0x1b130, 0x1b16f,
+}; /* CR_In_Small_Kana_Extension */
+
+/* 'In_Nushu': Block */
+static const OnigCodePoint CR_In_Nushu[] = {
+	1,
+	0x1b170, 0x1b2ff,
+}; /* CR_In_Nushu */
+
+/* '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_Mayan_Numerals': Block */
+static const OnigCodePoint CR_In_Mayan_Numerals[] = {
+	1,
+	0x1d2e0, 0x1d2ff,
+}; /* CR_In_Mayan_Numerals */
+
+/* '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_Nyiakeng_Puachue_Hmong': Block */
+static const OnigCodePoint CR_In_Nyiakeng_Puachue_Hmong[] = {
+	1,
+	0x1e100, 0x1e14f,
+}; /* CR_In_Nyiakeng_Puachue_Hmong */
+
+/* 'In_Wancho': Block */
+static const OnigCodePoint CR_In_Wancho[] = {
+	1,
+	0x1e2c0, 0x1e2ff,
+}; /* CR_In_Wancho */
+
+/* '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_Indic_Siyaq_Numbers': Block */
+static const OnigCodePoint CR_In_Indic_Siyaq_Numbers[] = {
+	1,
+	0x1ec70, 0x1ecbf,
+}; /* CR_In_Indic_Siyaq_Numbers */
+
+/* 'In_Ottoman_Siyaq_Numbers': Block */
+static const OnigCodePoint CR_In_Ottoman_Siyaq_Numbers[] = {
+	1,
+	0x1ed00, 0x1ed4f,
+}; /* CR_In_Ottoman_Siyaq_Numbers */
+
+/* '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_Chess_Symbols': Block */
+static const OnigCodePoint CR_In_Chess_Symbols[] = {
+	1,
+	0x1fa00, 0x1fa6f,
+}; /* CR_In_Chess_Symbols */
+
+/* 'In_Symbols_and_Pictographs_Extended_A': Block */
+static const OnigCodePoint CR_In_Symbols_and_Pictographs_Extended_A[] = {
+	1,
+	0x1fa70, 0x1faff,
+}; /* CR_In_Symbols_and_Pictographs_Extended_A */
+
+/* '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_Unified_Ideographs_Extension_F': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_F[] = {
+	1,
+	0x2ceb0, 0x2ebef,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_F */
+
+/* '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[] = {
+	53,
+	0x0870, 0x089f,
+	0x2fe0, 0x2fef,
+	0x10200, 0x1027f,
+	0x103e0, 0x103ff,
+	0x10570, 0x105ff,
+	0x10780, 0x107ff,
+	0x108b0, 0x108df,
+	0x10940, 0x1097f,
+	0x10aa0, 0x10abf,
+	0x10bb0, 0x10bff,
+	0x10c50, 0x10c7f,
+	0x10d40, 0x10e5f,
+	0x10e80, 0x10eff,
+	0x10f70, 0x10fdf,
+	0x11250, 0x1127f,
+	0x11380, 0x113ff,
+	0x114e0, 0x1157f,
+	0x116d0, 0x116ff,
+	0x11740, 0x117ff,
+	0x11850, 0x1189f,
+	0x11900, 0x1199f,
+	0x11ab0, 0x11abf,
+	0x11b00, 0x11bff,
+	0x11cc0, 0x11cff,
+	0x11db0, 0x11edf,
+	0x11f00, 0x11fbf,
+	0x12550, 0x12fff,
+	0x13440, 0x143ff,
+	0x14680, 0x167ff,
+	0x16a70, 0x16acf,
+	0x16b90, 0x16e3f,
+	0x16ea0, 0x16eff,
+	0x16fa0, 0x16fdf,
+	0x18b00, 0x1afff,
+	0x1b300, 0x1bbff,
+	0x1bcb0, 0x1cfff,
+	0x1d250, 0x1d2df,
+	0x1d380, 0x1d3ff,
+	0x1dab0, 0x1dfff,
+	0x1e030, 0x1e0ff,
+	0x1e150, 0x1e2bf,
+	0x1e300, 0x1e7ff,
+	0x1e8e0, 0x1e8ff,
+	0x1e960, 0x1ec6f,
+	0x1ecc0, 0x1ecff,
+	0x1ed50, 0x1edff,
+	0x1ef00, 0x1efff,
+	0x1fb00, 0x1ffff,
+	0x2a6e0, 0x2a6ff,
+	0x2ebf0, 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_XPosixPunct,
+  CR_Space,
+  CR_Upper,
+  CR_XDigit,
+  CR_Word,
+  CR_Alnum,
+  CR_ASCII,
+  CR_Punct,
+#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_Masaram_Gondi,
+  CR_Nushu,
+  CR_Soyombo,
+  CR_Zanabazar_Square,
+  CR_Dogra,
+  CR_Gunjala_Gondi,
+  CR_Makasar,
+  CR_Medefaidrin,
+  CR_Hanifi_Rohingya,
+  CR_Sogdian,
+  CR_Old_Sogdian,
+  CR_Elymaic,
+  CR_Nandinagari,
+  CR_Nyiakeng_Puachue_Hmong,
+  CR_Wancho,
+  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_Regional_Indicator,
+  CR_Emoji,
+  CR_Emoji_Presentation,
+  CR_Emoji_Modifier,
+  CR_Emoji_Modifier_Base,
+  CR_Emoji_Component,
+  CR_Extended_Pictographic,
+  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,
+  CR_Age_10_0,
+  CR_Age_11_0,
+  CR_Age_12_0,
+  CR_Age_12_1,
+#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_ZWJ,
+  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_Syriac_Supplement,
+  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_Georgian_Extended,
+  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_Hanifi_Rohingya,
+  CR_In_Rumi_Numeral_Symbols,
+  CR_In_Old_Sogdian,
+  CR_In_Sogdian,
+  CR_In_Elymaic,
+  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_Dogra,
+  CR_In_Warang_Citi,
+  CR_In_Nandinagari,
+  CR_In_Zanabazar_Square,
+  CR_In_Soyombo,
+  CR_In_Pau_Cin_Hau,
+  CR_In_Bhaiksuki,
+  CR_In_Marchen,
+  CR_In_Masaram_Gondi,
+  CR_In_Gunjala_Gondi,
+  CR_In_Makasar,
+  CR_In_Tamil_Supplement,
+  CR_In_Cuneiform,
+  CR_In_Cuneiform_Numbers_and_Punctuation,
+  CR_In_Early_Dynastic_Cuneiform,
+  CR_In_Egyptian_Hieroglyphs,
+  CR_In_Egyptian_Hieroglyph_Format_Controls,
+  CR_In_Anatolian_Hieroglyphs,
+  CR_In_Bamum_Supplement,
+  CR_In_Mro,
+  CR_In_Bassa_Vah,
+  CR_In_Pahawh_Hmong,
+  CR_In_Medefaidrin,
+  CR_In_Miao,
+  CR_In_Ideographic_Symbols_and_Punctuation,
+  CR_In_Tangut,
+  CR_In_Tangut_Components,
+  CR_In_Kana_Supplement,
+  CR_In_Kana_Extended_A,
+  CR_In_Small_Kana_Extension,
+  CR_In_Nushu,
+  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_Mayan_Numerals,
+  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_Nyiakeng_Puachue_Hmong,
+  CR_In_Wancho,
+  CR_In_Mende_Kikakui,
+  CR_In_Adlam,
+  CR_In_Indic_Siyaq_Numbers,
+  CR_In_Ottoman_Siyaq_Numbers,
+  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_Chess_Symbols,
+  CR_In_Symbols_and_Pictographs_Extended_A,
+  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_Unified_Ideographs_Extension_F,
+  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;
+};
+#define uniname2ctype_offset(str) offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_##str)
+
+static const struct uniname2ctype_struct *uniname2ctype_p(
+#if !(1+0) /* if ANSI, old style not to conflict with generated prototype */
+    const char *, unsigned int
+#endif
+);
+
+#ifndef USE_UNICODE_PROPERTIES
+#define TOTAL_KEYWORDS 15
+#define MIN_WORD_LENGTH 4
+#define MAX_WORD_LENGTH 11
+#define MIN_HASH_VALUE 6
+#define MAX_HASH_VALUE 20
+/* maximum key range = 15, duplicates = 0 */
+#else /* USE_UNICODE_PROPERTIES */
+#ifndef USE_UNICODE_AGE_PROPERTIES
+#define TOTAL_KEYWORDS 814
+#else /* USE_UNICODE_AGE_PROPERTIES */
+#define TOTAL_KEYWORDS 836
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+#define MIN_WORD_LENGTH 1
+#define MAX_WORD_LENGTH 44
+#define MIN_HASH_VALUE 11
+#define MAX_HASH_VALUE 6098
+/* maximum key range = 6088, duplicates = 0 */
+#endif /* USE_UNICODE_PROPERTIES */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+uniname2ctype_hash (register const char *str, register size_t 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
+      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+      21, 21, 21, 21, 21, 21, 21,  3, 12,  5,
+       4, 21, 21, 10, 21,  1, 21, 21, 11, 21,
+       2,  1,  1, 21,  1,  7,  4,  6, 21,  1,
+       4, 21, 21, 21, 21, 21, 21, 21
+#else /* USE_UNICODE_PROPERTIES */
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      6099, 6099, 6099, 6099, 6099, 6099,   17, 6099,    3,    1,
+         4,   13,    3,   22,    9,   16,   12,    5, 6099, 6099,
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099,    1, 1425,  113,
+       437,   37, 1023, 1071, 1051,    4, 1492,    9,  500,   88,
+         8,   18, 1371,  797,   54,  203,  310,  619, 1608,  603,
+       364, 1438,   20,    1,    3, 6099, 6099, 6099, 6099, 6099
+#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 unsigned int hval = (unsigned int)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]+2];
+        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("xposixpunct")];
+    char uniname2ctype_pool_str17[sizeof("lower")];
+    char uniname2ctype_pool_str18[sizeof("graph")];
+    char uniname2ctype_pool_str19[sizeof("digit")];
+    char uniname2ctype_pool_str20[sizeof("blank")];
+#else /* USE_UNICODE_PROPERTIES */
+    char uniname2ctype_pool_str11[sizeof("yi")];
+    char uniname2ctype_pool_str17[sizeof("yiii")];
+    char uniname2ctype_pool_str22[sizeof("lana")];
+    char uniname2ctype_pool_str24[sizeof("z")];
+    char uniname2ctype_pool_str25[sizeof("lina")];
+    char uniname2ctype_pool_str33[sizeof("maka")];
+    char uniname2ctype_pool_str35[sizeof("mani")];
+    char uniname2ctype_pool_str36[sizeof("mn")];
+    char uniname2ctype_pool_str45[sizeof("miao")];
+    char uniname2ctype_pool_str46[sizeof("lo")];
+    char uniname2ctype_pool_str47[sizeof("ci")];
+    char uniname2ctype_pool_str48[sizeof("lao")];
+    char uniname2ctype_pool_str49[sizeof("laoo")];
+    char uniname2ctype_pool_str52[sizeof("inkannada")];
+    char uniname2ctype_pool_str55[sizeof("cn")];
+    char uniname2ctype_pool_str64[sizeof("pi")];
+    char uniname2ctype_pool_str66[sizeof("innko")];
+    char uniname2ctype_pool_str67[sizeof("zzzz")];
+    char uniname2ctype_pool_str71[sizeof("gran")];
+    char uniname2ctype_pool_str75[sizeof("co")];
+    char uniname2ctype_pool_str83[sizeof("lineara")];
+    char uniname2ctype_pool_str86[sizeof("mark")];
+    char uniname2ctype_pool_str92[sizeof("po")];
+    char uniname2ctype_pool_str94[sizeof("me")];
+    char uniname2ctype_pool_str100[sizeof("cari")];
+    char uniname2ctype_pool_str101[sizeof("inkharoshthi")];
+    char uniname2ctype_pool_str102[sizeof("kana")];
+    char uniname2ctype_pool_str103[sizeof("loe")];
+    char uniname2ctype_pool_str107[sizeof("m")];
+    char uniname2ctype_pool_str108[sizeof("grek")];
+    char uniname2ctype_pool_str111[sizeof("mro")];
+    char uniname2ctype_pool_str112[sizeof("mroo")];
+    char uniname2ctype_pool_str115[sizeof("carian")];
+    char uniname2ctype_pool_str117[sizeof("geor")];
+    char uniname2ctype_pool_str118[sizeof("greek")];
+    char uniname2ctype_pool_str122[sizeof("gonm")];
+    char uniname2ctype_pool_str129[sizeof("mendekikakui")];
+    char uniname2ctype_pool_str130[sizeof("pe")];
+    char uniname2ctype_pool_str131[sizeof("mero")];
+    char uniname2ctype_pool_str134[sizeof("inosmanya")];
+    char uniname2ctype_pool_str139[sizeof("cakm")];
+    char uniname2ctype_pool_str145[sizeof("inmanichaean")];
+    char uniname2ctype_pool_str146[sizeof("inmro")];
+    char uniname2ctype_pool_str148[sizeof("inmiao")];
+    char uniname2ctype_pool_str149[sizeof("inchakma")];
+    char uniname2ctype_pool_str151[sizeof("c")];
+    char uniname2ctype_pool_str152[sizeof("mandaic")];
+    char uniname2ctype_pool_str153[sizeof("meeteimayek")];
+    char uniname2ctype_pool_str161[sizeof("inarmenian")];
+    char uniname2ctype_pool_str177[sizeof("inmyanmar")];
+    char uniname2ctype_pool_str178[sizeof("inmakasar")];
+    char uniname2ctype_pool_str183[sizeof("common")];
+    char uniname2ctype_pool_str186[sizeof("lm")];
+    char uniname2ctype_pool_str190[sizeof("marc")];
+    char uniname2ctype_pool_str203[sizeof("inrunic")];
+    char uniname2ctype_pool_str204[sizeof("incarian")];
+    char uniname2ctype_pool_str210[sizeof("inideographicsymbolsandpunctuation")];
+    char uniname2ctype_pool_str212[sizeof("inkhmer")];
+    char uniname2ctype_pool_str213[sizeof("qaai")];
+    char uniname2ctype_pool_str218[sizeof("inahom")];
+    char uniname2ctype_pool_str226[sizeof("merc")];
+    char uniname2ctype_pool_str231[sizeof("combiningmark")];
+    char uniname2ctype_pool_str236[sizeof("lc")];
+    char uniname2ctype_pool_str237[sizeof("perm")];
+    char uniname2ctype_pool_str246[sizeof("mc")];
+    char uniname2ctype_pool_str250[sizeof("connectorpunctuation")];
+    char uniname2ctype_pool_str253[sizeof("cans")];
+    char uniname2ctype_pool_str260[sizeof("incuneiformnumbersandpunctuation")];
+    char uniname2ctype_pool_str263[sizeof("armi")];
+    char uniname2ctype_pool_str265[sizeof("cc")];
+    char uniname2ctype_pool_str267[sizeof("armn")];
+    char uniname2ctype_pool_str268[sizeof("incherokee")];
+    char uniname2ctype_pool_str270[sizeof("prependedconcatenationmark")];
+    char uniname2ctype_pool_str274[sizeof("incuneiform")];
+    char uniname2ctype_pool_str275[sizeof("inavestan")];
+    char uniname2ctype_pool_str281[sizeof("inipaextensions")];
+    char uniname2ctype_pool_str282[sizeof("pc")];
+    char uniname2ctype_pool_str283[sizeof("armenian")];
+    char uniname2ctype_pool_str285[sizeof("insharada")];
+    char uniname2ctype_pool_str289[sizeof("inmarchen")];
+    char uniname2ctype_pool_str293[sizeof("makasar")];
+    char uniname2ctype_pool_str297[sizeof("masaramgondi")];
+    char uniname2ctype_pool_str301[sizeof("inarrows")];
+    char uniname2ctype_pool_str311[sizeof("incyrillic")];
+    char uniname2ctype_pool_str313[sizeof("incham")];
+    char uniname2ctype_pool_str315[sizeof("qmark")];
+    char uniname2ctype_pool_str320[sizeof("ri")];
+    char uniname2ctype_pool_str322[sizeof("qaac")];
+    char uniname2ctype_pool_str328[sizeof("insamaritan")];
+    char uniname2ctype_pool_str331[sizeof("latn")];
+    char uniname2ctype_pool_str335[sizeof("inmasaramgondi")];
+    char uniname2ctype_pool_str338[sizeof("inthaana")];
+    char uniname2ctype_pool_str340[sizeof("latin")];
+    char uniname2ctype_pool_str342[sizeof("inthai")];
+    char uniname2ctype_pool_str345[sizeof("lineseparator")];
+    char uniname2ctype_pool_str346[sizeof("pcm")];
+    char uniname2ctype_pool_str348[sizeof("inkatakana")];
+    char uniname2ctype_pool_str352[sizeof("inkaithi")];
+    char uniname2ctype_pool_str357[sizeof("inzanabazarsquare")];
+    char uniname2ctype_pool_str362[sizeof("inscriptionalparthian")];
+    char uniname2ctype_pool_str366[sizeof("initialpunctuation")];
+    char uniname2ctype_pool_str373[sizeof("mtei")];
+    char uniname2ctype_pool_str376[sizeof("vai")];
+    char uniname2ctype_pool_str377[sizeof("vaii")];
+    char uniname2ctype_pool_str386[sizeof("inkhmersymbols")];
+    char uniname2ctype_pool_str399[sizeof("insyriac")];
+    char uniname2ctype_pool_str401[sizeof("intakri")];
+    char uniname2ctype_pool_str404[sizeof("arabic")];
+    char uniname2ctype_pool_str411[sizeof("zs")];
+    char uniname2ctype_pool_str418[sizeof("katakana")];
+    char uniname2ctype_pool_str426[sizeof("prti")];
+    char uniname2ctype_pool_str442[sizeof("ascii")];
+    char uniname2ctype_pool_str445[sizeof("cs")];
+    char uniname2ctype_pool_str462[sizeof("ps")];
+    char uniname2ctype_pool_str468[sizeof("mand")];
+    char uniname2ctype_pool_str470[sizeof("privateuse")];
+    char uniname2ctype_pool_str475[sizeof("inruminumeralsymbols")];
+    char uniname2ctype_pool_str480[sizeof("inmyanmarextendeda")];
+    char uniname2ctype_pool_str481[sizeof("modi")];
+    char uniname2ctype_pool_str486[sizeof("incjkcompatibilityforms")];
+    char uniname2ctype_pool_str488[sizeof("inkanaextendeda")];
+    char uniname2ctype_pool_str491[sizeof("incjkcompatibilityideographs")];
+    char uniname2ctype_pool_str500[sizeof("brai")];
+    char uniname2ctype_pool_str504[sizeof("mend")];
+    char uniname2ctype_pool_str505[sizeof("ideo")];
+    char uniname2ctype_pool_str506[sizeof("letter")];
+    char uniname2ctype_pool_str509[sizeof("l")];
+    char uniname2ctype_pool_str511[sizeof("inmeeteimayek")];
+    char uniname2ctype_pool_str520[sizeof("inideographicdescriptioncharacters")];
+    char uniname2ctype_pool_str535[sizeof("xidcontinue")];
+    char uniname2ctype_pool_str538[sizeof("knda")];
+    char uniname2ctype_pool_str541[sizeof("innandinagari")];
+    char uniname2ctype_pool_str543[sizeof("kannada")];
+    char uniname2ctype_pool_str556[sizeof("inmodi")];
+    char uniname2ctype_pool_str558[sizeof("inlao")];
+    char uniname2ctype_pool_str560[sizeof("inoldnortharabian")];
+    char uniname2ctype_pool_str565[sizeof("intransportandmapsymbols")];
+    char uniname2ctype_pool_str566[sizeof("letternumber")];
+    char uniname2ctype_pool_str568[sizeof("gothic")];
+    char uniname2ctype_pool_str572[sizeof("inlineara")];
+    char uniname2ctype_pool_str577[sizeof("inmendekikakui")];
+    char uniname2ctype_pool_str578[sizeof("xidc")];
+    char uniname2ctype_pool_str579[sizeof("mongolian")];
+    char uniname2ctype_pool_str582[sizeof("inmiscellaneousmathematicalsymbolsa")];
+    char uniname2ctype_pool_str583[sizeof("inspecials")];
+    char uniname2ctype_pool_str590[sizeof("grlink")];
+    char uniname2ctype_pool_str594[sizeof("brahmi")];
+    char uniname2ctype_pool_str596[sizeof("inemoticons")];
+    char uniname2ctype_pool_str597[sizeof("kali")];
+    char uniname2ctype_pool_str600[sizeof("inolditalic")];
+    char uniname2ctype_pool_str604[sizeof("inmedefaidrin")];
+    char uniname2ctype_pool_str605[sizeof("inchesssymbols")];
+    char uniname2ctype_pool_str608[sizeof("incjkcompatibilityideographssupplement")];
+    char uniname2ctype_pool_str614[sizeof("inadlam")];
+    char uniname2ctype_pool_str624[sizeof("psalterpahlavi")];
+    char uniname2ctype_pool_str625[sizeof("incommonindicnumberforms")];
+    char uniname2ctype_pool_str630[sizeof("lt")];
+    char uniname2ctype_pool_str636[sizeof("innewa")];
+    char uniname2ctype_pool_str639[sizeof("sk")];
+    char uniname2ctype_pool_str642[sizeof("control")];
+    char uniname2ctype_pool_str645[sizeof("inancientsymbols")];
+    char uniname2ctype_pool_str647[sizeof("palm")];
+    char uniname2ctype_pool_str650[sizeof("inlycian")];
+    char uniname2ctype_pool_str657[sizeof("so")];
+    char uniname2ctype_pool_str660[sizeof("patternwhitespace")];
+    char uniname2ctype_pool_str668[sizeof("xids")];
+    char uniname2ctype_pool_str672[sizeof("inmandaic")];
+    char uniname2ctype_pool_str675[sizeof("idc")];
+    char uniname2ctype_pool_str678[sizeof("meroiticcursive")];
+    char uniname2ctype_pool_str695[sizeof("inwarangciti")];
+    char uniname2ctype_pool_str696[sizeof("sora")];
+    char uniname2ctype_pool_str697[sizeof("inopticalcharacterrecognition")];
+    char uniname2ctype_pool_str703[sizeof("inoldsogdian")];
+    char uniname2ctype_pool_str705[sizeof("inmalayalam")];
+    char uniname2ctype_pool_str707[sizeof("bamum")];
+    char uniname2ctype_pool_str708[sizeof("inkanasupplement")];
+    char uniname2ctype_pool_str713[sizeof("insundanese")];
+    char uniname2ctype_pool_str720[sizeof("grext")];
+    char uniname2ctype_pool_str737[sizeof("print")];
+    char uniname2ctype_pool_str738[sizeof("intaitham")];
+    char uniname2ctype_pool_str742[sizeof("lower")];
+    char uniname2ctype_pool_str753[sizeof("joinc")];
+    char uniname2ctype_pool_str755[sizeof("inoldsoutharabian")];
+    char uniname2ctype_pool_str760[sizeof("incjkstrokes")];
+    char uniname2ctype_pool_str761[sizeof("batk")];
+    char uniname2ctype_pool_str766[sizeof("samr")];
+    char uniname2ctype_pool_str767[sizeof("inwancho")];
+    char uniname2ctype_pool_str771[sizeof("batak")];
+    char uniname2ctype_pool_str772[sizeof("vs")];
+    char uniname2ctype_pool_str776[sizeof("patws")];
+    char uniname2ctype_pool_str783[sizeof("samaritan")];
+    char uniname2ctype_pool_str787[sizeof("idsbinaryoperator")];
+    char uniname2ctype_pool_str791[sizeof("pauc")];
+    char uniname2ctype_pool_str794[sizeof("insmallkanaextension")];
+    char uniname2ctype_pool_str797[sizeof("sm")];
+    char uniname2ctype_pool_str799[sizeof("indominotiles")];
+    char uniname2ctype_pool_str802[sizeof("alnum")];
+    char uniname2ctype_pool_str809[sizeof("insylotinagri")];
+    char uniname2ctype_pool_str814[sizeof("inugaritic")];
+    char uniname2ctype_pool_str818[sizeof("incontrolpictures")];
+    char uniname2ctype_pool_str821[sizeof("inlinearbideograms")];
+    char uniname2ctype_pool_str822[sizeof("inmusicalsymbols")];
+    char uniname2ctype_pool_str823[sizeof("s")];
+    char uniname2ctype_pool_str824[sizeof("ital")];
+    char uniname2ctype_pool_str825[sizeof("inmodifiertoneletters")];
+    char uniname2ctype_pool_str828[sizeof("inancientgreekmusicalnotation")];
+    char uniname2ctype_pool_str834[sizeof("patternsyntax")];
+    char uniname2ctype_pool_str838[sizeof("lisu")];
+    char uniname2ctype_pool_str842[sizeof("lowercase")];
+    char uniname2ctype_pool_str845[sizeof("cwcm")];
+    char uniname2ctype_pool_str847[sizeof("sc")];
+    char uniname2ctype_pool_str848[sizeof("bass")];
+    char uniname2ctype_pool_str855[sizeof("ids")];
+    char uniname2ctype_pool_str857[sizeof("inlatinextendeda")];
+    char uniname2ctype_pool_str862[sizeof("oriya")];
+    char uniname2ctype_pool_str875[sizeof("intaile")];
+    char uniname2ctype_pool_str886[sizeof("inmiscellaneoussymbols")];
+    char uniname2ctype_pool_str895[sizeof("inmiscellaneoussymbolsandarrows")];
+    char uniname2ctype_pool_str898[sizeof("incaucasianalbanian")];
+    char uniname2ctype_pool_str900[sizeof("inmiscellaneoussymbolsandpictographs")];
+    char uniname2ctype_pool_str906[sizeof("inoldturkic")];
+    char uniname2ctype_pool_str907[sizeof("insaurashtra")];
+    char uniname2ctype_pool_str924[sizeof("idcontinue")];
+    char uniname2ctype_pool_str926[sizeof("intamil")];
+    char uniname2ctype_pool_str928[sizeof("inmultani")];
+    char uniname2ctype_pool_str929[sizeof("inlatinextendede")];
+    char uniname2ctype_pool_str930[sizeof("pd")];
+    char uniname2ctype_pool_str946[sizeof("bali")];
+    char uniname2ctype_pool_str961[sizeof("blank")];
+    char uniname2ctype_pool_str963[sizeof("idst")];
+    char uniname2ctype_pool_str974[sizeof("inlydian")];
+    char uniname2ctype_pool_str986[sizeof("innewtailue")];
+    char uniname2ctype_pool_str994[sizeof("bengali")];
+    char uniname2ctype_pool_str995[sizeof("runr")];
+    char uniname2ctype_pool_str1005[sizeof("zl")];
+    char uniname2ctype_pool_str1009[sizeof("incyrillicextendeda")];
+    char uniname2ctype_pool_str1010[sizeof("ll")];
+    char uniname2ctype_pool_str1013[sizeof("indeseret")];
+    char uniname2ctype_pool_str1014[sizeof("intaixuanjingsymbols")];
+    char uniname2ctype_pool_str1015[sizeof("inancientgreeknumbers")];
+    char uniname2ctype_pool_str1021[sizeof("idstart")];
+    char uniname2ctype_pool_str1025[sizeof("inmeeteimayekextensions")];
+    char uniname2ctype_pool_str1028[sizeof("balinese")];
+    char uniname2ctype_pool_str1032[sizeof("dia")];
+    char uniname2ctype_pool_str1033[sizeof("di")];
+    char uniname2ctype_pool_str1035[sizeof("inspacingmodifierletters")];
+    char uniname2ctype_pool_str1036[sizeof("inearlydynasticcuneiform")];
+    char uniname2ctype_pool_str1049[sizeof("plrd")];
+    char uniname2ctype_pool_str1067[sizeof("canadianaboriginal")];
+    char uniname2ctype_pool_str1070[sizeof("zinh")];
+    char uniname2ctype_pool_str1072[sizeof("sind")];
+    char uniname2ctype_pool_str1080[sizeof("osage")];
+    char uniname2ctype_pool_str1081[sizeof("inlatinextendedc")];
+    char uniname2ctype_pool_str1085[sizeof("uideo")];
+    char uniname2ctype_pool_str1087[sizeof("incountingrodnumerals")];
+    char uniname2ctype_pool_str1090[sizeof("xidstart")];
+    char uniname2ctype_pool_str1091[sizeof("xdigit")];
+    char uniname2ctype_pool_str1093[sizeof("osma")];
+    char uniname2ctype_pool_str1097[sizeof("inkhudawadi")];
+    char uniname2ctype_pool_str1102[sizeof("inhanifirohingya")];
+    char uniname2ctype_pool_str1105[sizeof("gong")];
+    char uniname2ctype_pool_str1107[sizeof("ingrantha")];
+    char uniname2ctype_pool_str1109[sizeof("bidic")];
+    char uniname2ctype_pool_str1119[sizeof("mong")];
+    char uniname2ctype_pool_str1120[sizeof("cased")];
+    char uniname2ctype_pool_str1121[sizeof("incyrillicextendedc")];
+    char uniname2ctype_pool_str1134[sizeof("inhiragana")];
+    char uniname2ctype_pool_str1140[sizeof("sinhala")];
+    char uniname2ctype_pool_str1142[sizeof("adlm")];
+    char uniname2ctype_pool_str1146[sizeof("glagolitic")];
+    char uniname2ctype_pool_str1147[sizeof("sterm")];
+    char uniname2ctype_pool_str1149[sizeof("bamu")];
+    char uniname2ctype_pool_str1150[sizeof("georgian")];
+    char uniname2ctype_pool_str1151[sizeof("inosage")];
+    char uniname2ctype_pool_str1152[sizeof("gunjalagondi")];
+    char uniname2ctype_pool_str1153[sizeof("phoenician")];
+    char uniname2ctype_pool_str1157[sizeof("multani")];
+    char uniname2ctype_pool_str1158[sizeof("kaithi")];
+    char uniname2ctype_pool_str1164[sizeof("joincontrol")];
+    char uniname2ctype_pool_str1168[sizeof("runic")];
+    char uniname2ctype_pool_str1170[sizeof("ingeneralpunctuation")];
+    char uniname2ctype_pool_str1171[sizeof("inmahajani")];
+    char uniname2ctype_pool_str1174[sizeof("incyrillicsupplement")];
+    char uniname2ctype_pool_str1175[sizeof("lowercaseletter")];
+    char uniname2ctype_pool_str1176[sizeof("marchen")];
+    char uniname2ctype_pool_str1177[sizeof("graphemelink")];
+    char uniname2ctype_pool_str1178[sizeof("ingeorgian")];
+    char uniname2ctype_pool_str1180[sizeof("khojki")];
+    char uniname2ctype_pool_str1181[sizeof("cham")];
+    char uniname2ctype_pool_str1182[sizeof("inogham")];
+    char uniname2ctype_pool_str1183[sizeof("cher")];
+    char uniname2ctype_pool_str1185[sizeof("chakma")];
+    char uniname2ctype_pool_str1190[sizeof("emoji")];
+    char uniname2ctype_pool_str1191[sizeof("insiddham")];
+    char uniname2ctype_pool_str1197[sizeof("cherokee")];
+    char uniname2ctype_pool_str1198[sizeof("khar")];
+    char uniname2ctype_pool_str1203[sizeof("inmongolian")];
+    char uniname2ctype_pool_str1207[sizeof("incherokeesupplement")];
+    char uniname2ctype_pool_str1208[sizeof("diacritic")];
+    char uniname2ctype_pool_str1209[sizeof("manichaean")];
+    char uniname2ctype_pool_str1210[sizeof("xsux")];
+    char uniname2ctype_pool_str1212[sizeof("inolchiki")];
+    char uniname2ctype_pool_str1227[sizeof("quotationmark")];
+    char uniname2ctype_pool_str1231[sizeof("adlam")];
+    char uniname2ctype_pool_str1232[sizeof("inethiopic")];
+    char uniname2ctype_pool_str1233[sizeof("graphemebase")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1234[sizeof("age=11.0")];
+    char uniname2ctype_pool_str1235[sizeof("age=12.1")];
+    char uniname2ctype_pool_str1236[sizeof("age=10.0")];
+    char uniname2ctype_pool_str1237[sizeof("age=12.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1243[sizeof("casedletter")];
+    char uniname2ctype_pool_str1244[sizeof("ingurmukhi")];
+    char uniname2ctype_pool_str1245[sizeof("odi")];
+    char uniname2ctype_pool_str1246[sizeof("incjkunifiedideographsextensiona")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1247[sizeof("age=1.1")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1248[sizeof("lu")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1249[sizeof("age=4.1")];
+    char uniname2ctype_pool_str1250[sizeof("age=2.1")];
+    char uniname2ctype_pool_str1251[sizeof("age=4.0")];
+    char uniname2ctype_pool_str1252[sizeof("age=2.0")];
+    char uniname2ctype_pool_str1253[sizeof("age=9.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1254[sizeof("intamilsupplement")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1255[sizeof("age=6.1")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1256[sizeof("unknown")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1257[sizeof("age=6.0")];
+    char uniname2ctype_pool_str1258[sizeof("age=6.2")];
+    char uniname2ctype_pool_str1259[sizeof("age=3.1")];
+    char uniname2ctype_pool_str1260[sizeof("age=8.0")];
+    char uniname2ctype_pool_str1261[sizeof("age=3.0")];
+    char uniname2ctype_pool_str1262[sizeof("age=3.2")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1263[sizeof("cwt")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1264[sizeof("age=7.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1266[sizeof("unassigned")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1267[sizeof("age=6.3")];
+    char uniname2ctype_pool_str1268[sizeof("age=5.1")];
+    char uniname2ctype_pool_str1270[sizeof("age=5.0")];
+    char uniname2ctype_pool_str1271[sizeof("age=5.2")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1274[sizeof("ahom")];
+    char uniname2ctype_pool_str1282[sizeof("incjkunifiedideographsextensione")];
+    char uniname2ctype_pool_str1285[sizeof("khmr")];
+    char uniname2ctype_pool_str1289[sizeof("insinhala")];
+    char uniname2ctype_pool_str1292[sizeof("inmiscellaneoustechnical")];
+    char uniname2ctype_pool_str1297[sizeof("saur")];
+    char uniname2ctype_pool_str1300[sizeof("guru")];
+    char uniname2ctype_pool_str1301[sizeof("sundanese")];
+    char uniname2ctype_pool_str1306[sizeof("punct")];
+    char uniname2ctype_pool_str1314[sizeof("paucinhau")];
+    char uniname2ctype_pool_str1317[sizeof("gurmukhi")];
+    char uniname2ctype_pool_str1319[sizeof("variationselector")];
+    char uniname2ctype_pool_str1331[sizeof("logicalorderexception")];
+    char uniname2ctype_pool_str1340[sizeof("khmer")];
+    char uniname2ctype_pool_str1343[sizeof("limbu")];
+    char uniname2ctype_pool_str1354[sizeof("inscriptionalpahlavi")];
+    char uniname2ctype_pool_str1355[sizeof("oidc")];
+    char uniname2ctype_pool_str1358[sizeof("incjkunifiedideographsextensionc")];
+    char uniname2ctype_pool_str1360[sizeof("cntrl")];
+    char uniname2ctype_pool_str1365[sizeof("inlatinextendedadditional")];
+    char uniname2ctype_pool_str1366[sizeof("decimalnumber")];
+    char uniname2ctype_pool_str1367[sizeof("insorasompeng")];
+    char uniname2ctype_pool_str1369[sizeof("radical")];
+    char uniname2ctype_pool_str1373[sizeof("emojimodifier")];
+    char uniname2ctype_pool_str1375[sizeof("kharoshthi")];
+    char uniname2ctype_pool_str1380[sizeof("n")];
+    char uniname2ctype_pool_str1384[sizeof("math")];
+    char uniname2ctype_pool_str1387[sizeof("goth")];
+    char uniname2ctype_pool_str1400[sizeof("anatolianhieroglyphs")];
+    char uniname2ctype_pool_str1401[sizeof("inenclosedalphanumerics")];
+    char uniname2ctype_pool_str1407[sizeof("nandinagari")];
+    char uniname2ctype_pool_str1409[sizeof("no")];
+    char uniname2ctype_pool_str1419[sizeof("nko")];
+    char uniname2ctype_pool_str1420[sizeof("nkoo")];
+    char uniname2ctype_pool_str1422[sizeof("ingreekandcoptic")];
+    char uniname2ctype_pool_str1423[sizeof("olck")];
+    char uniname2ctype_pool_str1426[sizeof("p")];
+    char uniname2ctype_pool_str1428[sizeof("grantha")];
+    char uniname2ctype_pool_str1434[sizeof("olchiki")];
+    char uniname2ctype_pool_str1438[sizeof("incjkunifiedideographs")];
+    char uniname2ctype_pool_str1441[sizeof("zanb")];
+    char uniname2ctype_pool_str1442[sizeof("intirhuta")];
+    char uniname2ctype_pool_str1445[sizeof("oids")];
+    char uniname2ctype_pool_str1448[sizeof("inhatran")];
+    char uniname2ctype_pool_str1449[sizeof("linb")];
+    char uniname2ctype_pool_str1450[sizeof("xpeo")];
+    char uniname2ctype_pool_str1451[sizeof("mult")];
+    char uniname2ctype_pool_str1454[sizeof("saurashtra")];
+    char uniname2ctype_pool_str1457[sizeof("kthi")];
+    char uniname2ctype_pool_str1462[sizeof("inbhaiksuki")];
+    char uniname2ctype_pool_str1466[sizeof("olower")];
+    char uniname2ctype_pool_str1470[sizeof("innabataean")];
+    char uniname2ctype_pool_str1471[sizeof("inphoenician")];
+    char uniname2ctype_pool_str1475[sizeof("inkanbun")];
+    char uniname2ctype_pool_str1476[sizeof("inmeroitichieroglyphs")];
+    char uniname2ctype_pool_str1478[sizeof("inkayahli")];
+    char uniname2ctype_pool_str1481[sizeof("phnx")];
+    char uniname2ctype_pool_str1485[sizeof("inoriya")];
+    char uniname2ctype_pool_str1489[sizeof("enclosingmark")];
+    char uniname2ctype_pool_str1495[sizeof("sd")];
+    char uniname2ctype_pool_str1497[sizeof("inelbasan")];
+    char uniname2ctype_pool_str1498[sizeof("wara")];
+    char uniname2ctype_pool_str1499[sizeof("inenclosedideographicsupplement")];
+    char uniname2ctype_pool_str1501[sizeof("sidd")];
+    char uniname2ctype_pool_str1507[sizeof("linearb")];
+    char uniname2ctype_pool_str1509[sizeof("hani")];
+    char uniname2ctype_pool_str1512[sizeof("han")];
+    char uniname2ctype_pool_str1517[sizeof("inenclosedalphanumericsupplement")];
+    char uniname2ctype_pool_str1519[sizeof("medf")];
+    char uniname2ctype_pool_str1520[sizeof("bidicontrol")];
+    char uniname2ctype_pool_str1523[sizeof("hano")];
+    char uniname2ctype_pool_str1524[sizeof("inphaistosdisc")];
+    char uniname2ctype_pool_str1529[sizeof("limb")];
+    char uniname2ctype_pool_str1531[sizeof("inkangxiradicals")];
+    char uniname2ctype_pool_str1533[sizeof("lepc")];
+    char uniname2ctype_pool_str1535[sizeof("medefaidrin")];
+    char uniname2ctype_pool_str1536[sizeof("braille")];
+    char uniname2ctype_pool_str1537[sizeof("regionalindicator")];
+    char uniname2ctype_pool_str1542[sizeof("inlowsurrogates")];
+    char uniname2ctype_pool_str1544[sizeof("inshorthandformatcontrols")];
+    char uniname2ctype_pool_str1547[sizeof("brah")];
+    char uniname2ctype_pool_str1548[sizeof("inkhojki")];
+    char uniname2ctype_pool_str1549[sizeof("inoldhungarian")];
+    char uniname2ctype_pool_str1552[sizeof("hanunoo")];
+    char uniname2ctype_pool_str1555[sizeof("hira")];
+    char uniname2ctype_pool_str1557[sizeof("beng")];
+    char uniname2ctype_pool_str1563[sizeof("emojimodifierbase")];
+    char uniname2ctype_pool_str1565[sizeof("inarabic")];
+    char uniname2ctype_pool_str1567[sizeof("lyci")];
+    char uniname2ctype_pool_str1569[sizeof("ahex")];
+    char uniname2ctype_pool_str1572[sizeof("inherited")];
+    char uniname2ctype_pool_str1580[sizeof("glag")];
+    char uniname2ctype_pool_str1582[sizeof("lycian")];
+    char uniname2ctype_pool_str1587[sizeof("indogra")];
+    char uniname2ctype_pool_str1594[sizeof("dsrt")];
+    char uniname2ctype_pool_str1597[sizeof("arab")];
+    char uniname2ctype_pool_str1602[sizeof("mymr")];
+    char uniname2ctype_pool_str1607[sizeof("myanmar")];
+    char uniname2ctype_pool_str1613[sizeof("phli")];
+    char uniname2ctype_pool_str1617[sizeof("inimperialaramaic")];
+    char uniname2ctype_pool_str1622[sizeof("ingreekextended")];
+    char uniname2ctype_pool_str1623[sizeof("inanatolianhieroglyphs")];
+    char uniname2ctype_pool_str1629[sizeof("punctuation")];
+    char uniname2ctype_pool_str1631[sizeof("takri")];
+    char uniname2ctype_pool_str1635[sizeof("graphemeextend")];
+    char uniname2ctype_pool_str1638[sizeof("invai")];
+    char uniname2ctype_pool_str1643[sizeof("cwl")];
+    char uniname2ctype_pool_str1654[sizeof("ingeometricshapes")];
+    char uniname2ctype_pool_str1655[sizeof("emojicomponent")];
+    char uniname2ctype_pool_str1662[sizeof("coptic")];
+    char uniname2ctype_pool_str1671[sizeof("deseret")];
+    char uniname2ctype_pool_str1675[sizeof("inarabicpresentationformsa")];
+    char uniname2ctype_pool_str1676[sizeof("takr")];
+    char uniname2ctype_pool_str1677[sizeof("inbasiclatin")];
+    char uniname2ctype_pool_str1682[sizeof("incjkunifiedideographsextensiond")];
+    char uniname2ctype_pool_str1686[sizeof("sinh")];
+    char uniname2ctype_pool_str1687[sizeof("sund")];
+    char uniname2ctype_pool_str1691[sizeof("shavian")];
+    char uniname2ctype_pool_str1692[sizeof("taile")];
+    char uniname2ctype_pool_str1699[sizeof("insundanesesupplement")];
+    char uniname2ctype_pool_str1702[sizeof("inelymaic")];
+    char uniname2ctype_pool_str1703[sizeof("insoyombo")];
+    char uniname2ctype_pool_str1704[sizeof("bhks")];
+    char uniname2ctype_pool_str1714[sizeof("bhaiksuki")];
+    char uniname2ctype_pool_str1716[sizeof("incjkcompatibility")];
+    char uniname2ctype_pool_str1722[sizeof("inhanunoo")];
+    char uniname2ctype_pool_str1724[sizeof("intangut")];
+    char uniname2ctype_pool_str1728[sizeof("sogdian")];
+    char uniname2ctype_pool_str1729[sizeof("inlatinextendedd")];
+    char uniname2ctype_pool_str1730[sizeof("sogo")];
+    char uniname2ctype_pool_str1731[sizeof("insinhalaarchaicnumbers")];
+    char uniname2ctype_pool_str1732[sizeof("ideographic")];
+    char uniname2ctype_pool_str1733[sizeof("ugar")];
+    char uniname2ctype_pool_str1740[sizeof("copt")];
+    char uniname2ctype_pool_str1742[sizeof("imperialaramaic")];
+    char uniname2ctype_pool_str1745[sizeof("insogdian")];
+    char uniname2ctype_pool_str1746[sizeof("indingbats")];
+    char uniname2ctype_pool_str1750[sizeof("format")];
+    char uniname2ctype_pool_str1752[sizeof("ininscriptionalpahlavi")];
+    char uniname2ctype_pool_str1757[sizeof("ininscriptionalparthian")];
+    char uniname2ctype_pool_str1766[sizeof("grbase")];
+    char uniname2ctype_pool_str1769[sizeof("inbatak")];
+    char uniname2ctype_pool_str1776[sizeof("cprt")];
+    char uniname2ctype_pool_str1780[sizeof("cwcf")];
+    char uniname2ctype_pool_str1788[sizeof("cuneiform")];
+    char uniname2ctype_pool_str1791[sizeof("term")];
+    char uniname2ctype_pool_str1806[sizeof("intibetan")];
+    char uniname2ctype_pool_str1810[sizeof("intags")];
+    char uniname2ctype_pool_str1811[sizeof("asciihexdigit")];
+    char uniname2ctype_pool_str1813[sizeof("sentenceterminal")];
+    char uniname2ctype_pool_str1816[sizeof("inmayannumerals")];
+    char uniname2ctype_pool_str1821[sizeof("nand")];
+    char uniname2ctype_pool_str1825[sizeof("patsyn")];
+    char uniname2ctype_pool_str1826[sizeof("hatran")];
+    char uniname2ctype_pool_str1828[sizeof("inblockelements")];
+    char uniname2ctype_pool_str1838[sizeof("inornamentaldingbats")];
+    char uniname2ctype_pool_str1842[sizeof("innumberforms")];
+    char uniname2ctype_pool_str1843[sizeof("oldpersian")];
+    char uniname2ctype_pool_str1846[sizeof("inshavian")];
+    char uniname2ctype_pool_str1848[sizeof("bopo")];
+    char uniname2ctype_pool_str1861[sizeof("hatr")];
+    char uniname2ctype_pool_str1866[sizeof("caseignorable")];
+    char uniname2ctype_pool_str1871[sizeof("inoldpersian")];
+    char uniname2ctype_pool_str1878[sizeof("modifierletter")];
+    char uniname2ctype_pool_str1881[sizeof("cwu")];
+    char uniname2ctype_pool_str1891[sizeof("lydi")];
+    char uniname2ctype_pool_str1892[sizeof("inbyzantinemusicalsymbols")];
+    char uniname2ctype_pool_str1896[sizeof("ingeometricshapesextended")];
+    char uniname2ctype_pool_str1904[sizeof("inmyanmarextendedb")];
+    char uniname2ctype_pool_str1905[sizeof("innushu")];
+    char uniname2ctype_pool_str1906[sizeof("lydian")];
+    char uniname2ctype_pool_str1911[sizeof("inunifiedcanadianaboriginalsyllabics")];
+    char uniname2ctype_pool_str1915[sizeof("orkh")];
+    char uniname2ctype_pool_str1928[sizeof("inyiradicals")];
+    char uniname2ctype_pool_str1929[sizeof("inkatakanaphoneticextensions")];
+    char uniname2ctype_pool_str1930[sizeof("inethiopicextendeda")];
+    char uniname2ctype_pool_str1932[sizeof("incoptic")];
+    char uniname2ctype_pool_str1936[sizeof("inarabicextendeda")];
+    char uniname2ctype_pool_str1947[sizeof("oldpermic")];
+    char uniname2ctype_pool_str1950[sizeof("incjksymbolsandpunctuation")];
+    char uniname2ctype_pool_str1951[sizeof("word")];
+    char uniname2ctype_pool_str1958[sizeof("bopomofo")];
+    char uniname2ctype_pool_str1961[sizeof("ogam")];
+    char uniname2ctype_pool_str1964[sizeof("inlisu")];
+    char uniname2ctype_pool_str1967[sizeof("inoldpermic")];
+    char uniname2ctype_pool_str1968[sizeof("innoblock")];
+    char uniname2ctype_pool_str1971[sizeof("taiviet")];
+    char uniname2ctype_pool_str1985[sizeof("inbraillepatterns")];
+    char uniname2ctype_pool_str1991[sizeof("alpha")];
+    char uniname2ctype_pool_str1993[sizeof("inbalinese")];
+    char uniname2ctype_pool_str1994[sizeof("sorasompeng")];
+    char uniname2ctype_pool_str1996[sizeof("closepunctuation")];
+    char uniname2ctype_pool_str2006[sizeof("inmiscellaneousmathematicalsymbolsb")];
+    char uniname2ctype_pool_str2010[sizeof("inlepcha")];
+    char uniname2ctype_pool_str2014[sizeof("insyriacsupplement")];
+    char uniname2ctype_pool_str2016[sizeof("newa")];
+    char uniname2ctype_pool_str2023[sizeof("spacingmark")];
+    char uniname2ctype_pool_str2024[sizeof("inpalmyrene")];
+    char uniname2ctype_pool_str2033[sizeof("cyrl")];
+    char uniname2ctype_pool_str2043[sizeof("assigned")];
+    char uniname2ctype_pool_str2048[sizeof("mlym")];
+    char uniname2ctype_pool_str2055[sizeof("malayalam")];
+    char uniname2ctype_pool_str2058[sizeof("ext")];
+    char uniname2ctype_pool_str2062[sizeof("newtailue")];
+    char uniname2ctype_pool_str2070[sizeof("space")];
+    char uniname2ctype_pool_str2073[sizeof("intelugu")];
+    char uniname2ctype_pool_str2078[sizeof("idsb")];
+    char uniname2ctype_pool_str2083[sizeof("indevanagari")];
+    char uniname2ctype_pool_str2084[sizeof("avestan")];
+    char uniname2ctype_pool_str2085[sizeof("cf")];
+    char uniname2ctype_pool_str2093[sizeof("palmyrene")];
+    char uniname2ctype_pool_str2095[sizeof("inethiopicsupplement")];
+    char uniname2ctype_pool_str2097[sizeof("soyo")];
+    char uniname2ctype_pool_str2098[sizeof("xposixpunct")];
+    char uniname2ctype_pool_str2102[sizeof("pf")];
+    char uniname2ctype_pool_str2103[sizeof("sarb")];
+    char uniname2ctype_pool_str2109[sizeof("zanabazarsquare")];
+    char uniname2ctype_pool_str2110[sizeof("ugaritic")];
+    char uniname2ctype_pool_str2112[sizeof("osge")];
+    char uniname2ctype_pool_str2114[sizeof("java")];
+    char uniname2ctype_pool_str2117[sizeof("sharada")];
+    char uniname2ctype_pool_str2119[sizeof("dogra")];
+    char uniname2ctype_pool_str2135[sizeof("bugi")];
+    char uniname2ctype_pool_str2137[sizeof("meroitichieroglyphs")];
+    char uniname2ctype_pool_str2145[sizeof("separator")];
+    char uniname2ctype_pool_str2146[sizeof("ingeorgiansupplement")];
+    char uniname2ctype_pool_str2149[sizeof("sogd")];
+    char uniname2ctype_pool_str2150[sizeof("tale")];
+    char uniname2ctype_pool_str2153[sizeof("inunifiedcanadianaboriginalsyllabicsextended")];
+    char uniname2ctype_pool_str2161[sizeof("terminalpunctuation")];
+    char uniname2ctype_pool_str2165[sizeof("shrd")];
+    char uniname2ctype_pool_str2166[sizeof("graph")];
+    char uniname2ctype_pool_str2167[sizeof("olditalic")];
+    char uniname2ctype_pool_str2170[sizeof("dogr")];
+    char uniname2ctype_pool_str2173[sizeof("gujr")];
+    char uniname2ctype_pool_str2181[sizeof("phag")];
+    char uniname2ctype_pool_str2182[sizeof("gujarati")];
+    char uniname2ctype_pool_str2195[sizeof("inhanguljamo")];
+    char uniname2ctype_pool_str2199[sizeof("javanese")];
+    char uniname2ctype_pool_str2201[sizeof("taml")];
+    char uniname2ctype_pool_str2204[sizeof("inphoneticextensions")];
+    char uniname2ctype_pool_str2207[sizeof("siddham")];
+    char uniname2ctype_pool_str2217[sizeof("buginese")];
+    char uniname2ctype_pool_str2218[sizeof("inmongoliansupplement")];
+    char uniname2ctype_pool_str2222[sizeof("invariationselectors")];
+    char uniname2ctype_pool_str2224[sizeof("inhanguljamoextendeda")];
+    char uniname2ctype_pool_str2225[sizeof("inverticalforms")];
+    char uniname2ctype_pool_str2228[sizeof("syrc")];
+    char uniname2ctype_pool_str2229[sizeof("number")];
+    char uniname2ctype_pool_str2235[sizeof("incopticepactnumbers")];
+    char uniname2ctype_pool_str2238[sizeof("avst")];
+    char uniname2ctype_pool_str2244[sizeof("inbamum")];
+    char uniname2ctype_pool_str2247[sizeof("nd")];
+    char uniname2ctype_pool_str2248[sizeof("insuttonsignwriting")];
+    char uniname2ctype_pool_str2252[sizeof("extender")];
+    char uniname2ctype_pool_str2258[sizeof("intaiviet")];
+    char uniname2ctype_pool_str2260[sizeof("hex")];
+    char uniname2ctype_pool_str2268[sizeof("incjkunifiedideographsextensionf")];
+    char uniname2ctype_pool_str2271[sizeof("other")];
+    char uniname2ctype_pool_str2272[sizeof("otheridcontinue")];
+    char uniname2ctype_pool_str2278[sizeof("shaw")];
+    char uniname2ctype_pool_str2282[sizeof("dash")];
+    char uniname2ctype_pool_str2285[sizeof("othernumber")];
+    char uniname2ctype_pool_str2294[sizeof("orya")];
+    char uniname2ctype_pool_str2302[sizeof("invedicextensions")];
+    char uniname2ctype_pool_str2305[sizeof("sgnw")];
+    char uniname2ctype_pool_str2312[sizeof("caucasianalbanian")];
+    char uniname2ctype_pool_str2315[sizeof("inmathematicalalphanumericsymbols")];
+    char uniname2ctype_pool_str2321[sizeof("inphoneticextensionssupplement")];
+    char uniname2ctype_pool_str2339[sizeof("invariationselectorssupplement")];
+    char uniname2ctype_pool_str2343[sizeof("induployan")];
+    char uniname2ctype_pool_str2344[sizeof("syriac")];
+    char uniname2ctype_pool_str2357[sizeof("oalpha")];
+    char uniname2ctype_pool_str2361[sizeof("innyiakengpuachuehmong")];
+    char uniname2ctype_pool_str2364[sizeof("incombiningdiacriticalmarks")];
+    char uniname2ctype_pool_str2365[sizeof("inethiopicextended")];
+    char uniname2ctype_pool_str2373[sizeof("nl")];
+    char uniname2ctype_pool_str2374[sizeof("incombiningdiacriticalmarksforsymbols")];
+    char uniname2ctype_pool_str2375[sizeof("khudawadi")];
+    char uniname2ctype_pool_str2378[sizeof("otheralphabetic")];
+    char uniname2ctype_pool_str2389[sizeof("oldhungarian")];
+    char uniname2ctype_pool_str2396[sizeof("incurrencysymbols")];
+    char uniname2ctype_pool_str2397[sizeof("incjkradicalssupplement")];
+    char uniname2ctype_pool_str2398[sizeof("inglagolitic")];
+    char uniname2ctype_pool_str2415[sizeof("intifinagh")];
+    char uniname2ctype_pool_str2416[sizeof("ingeorgianextended")];
+    char uniname2ctype_pool_str2427[sizeof("surrogate")];
+    char uniname2ctype_pool_str2433[sizeof("incyrillicextendedb")];
+    char uniname2ctype_pool_str2440[sizeof("ethi")];
+    char uniname2ctype_pool_str2451[sizeof("titlecaseletter")];
+    char uniname2ctype_pool_str2454[sizeof("rohg")];
+    char uniname2ctype_pool_str2458[sizeof("inmeroiticcursive")];
+    char uniname2ctype_pool_str2460[sizeof("idstrinaryoperator")];
+    char uniname2ctype_pool_str2470[sizeof("inphagspa")];
+    char uniname2ctype_pool_str2475[sizeof("lepcha")];
+    char uniname2ctype_pool_str2479[sizeof("intagalog")];
+    char uniname2ctype_pool_str2480[sizeof("mathsymbol")];
+    char uniname2ctype_pool_str2481[sizeof("incombiningdiacriticalmarkssupplement")];
+    char uniname2ctype_pool_str2506[sizeof("inbrahmi")];
+    char uniname2ctype_pool_str2513[sizeof("insymbolsandpictographsextendeda")];
+    char uniname2ctype_pool_str2519[sizeof("inlinearbsyllabary")];
+    char uniname2ctype_pool_str2529[sizeof("oldturkic")];
+    char uniname2ctype_pool_str2534[sizeof("inbengali")];
+    char uniname2ctype_pool_str2540[sizeof("wancho")];
+    char uniname2ctype_pool_str2542[sizeof("osmanya")];
+    char uniname2ctype_pool_str2548[sizeof("buhd")];
+    char uniname2ctype_pool_str2552[sizeof("insmallformvariants")];
+    char uniname2ctype_pool_str2561[sizeof("indevanagariextended")];
+    char uniname2ctype_pool_str2562[sizeof("softdotted")];
+    char uniname2ctype_pool_str2564[sizeof("inbuginese")];
+    char uniname2ctype_pool_str2566[sizeof("mahj")];
+    char uniname2ctype_pool_str2567[sizeof("inlatin1supplement")];
+    char uniname2ctype_pool_str2570[sizeof("ingothic")];
+    char uniname2ctype_pool_str2575[sizeof("mahajani")];
+    char uniname2ctype_pool_str2576[sizeof("hang")];
+    char uniname2ctype_pool_str2579[sizeof("sylo")];
+    char uniname2ctype_pool_str2586[sizeof("warangciti")];
+    char uniname2ctype_pool_str2595[sizeof("ingujarati")];
+    char uniname2ctype_pool_str2603[sizeof("tirhuta")];
+    char uniname2ctype_pool_str2606[sizeof("incombiningdiacriticalmarksextended")];
+    char uniname2ctype_pool_str2609[sizeof("spaceseparator")];
+    char uniname2ctype_pool_str2614[sizeof("ingunjalagondi")];
+    char uniname2ctype_pool_str2624[sizeof("wcho")];
+    char uniname2ctype_pool_str2631[sizeof("hiragana")];
+    char uniname2ctype_pool_str2634[sizeof("extendedpictographic")];
+    char uniname2ctype_pool_str2643[sizeof("inrejang")];
+    char uniname2ctype_pool_str2644[sizeof("inottomansiyaqnumbers")];
+    char uniname2ctype_pool_str2648[sizeof("nchar")];
+    char uniname2ctype_pool_str2650[sizeof("cyrillic")];
+    char uniname2ctype_pool_str2653[sizeof("khoj")];
+    char uniname2ctype_pool_str2656[sizeof("inlimbu")];
+    char uniname2ctype_pool_str2663[sizeof("hmng")];
+    char uniname2ctype_pool_str2665[sizeof("thaa")];
+    char uniname2ctype_pool_str2668[sizeof("thai")];
+    char uniname2ctype_pool_str2670[sizeof("incjkunifiedideographsextensionb")];
+    char uniname2ctype_pool_str2673[sizeof("deva")];
+    char uniname2ctype_pool_str2676[sizeof("thaana")];
+    char uniname2ctype_pool_str2688[sizeof("phagspa")];
+    char uniname2ctype_pool_str2691[sizeof("devanagari")];
+    char uniname2ctype_pool_str2692[sizeof("tang")];
+    char uniname2ctype_pool_str2694[sizeof("currencysymbol")];
+    char uniname2ctype_pool_str2698[sizeof("tagbanwa")];
+    char uniname2ctype_pool_str2701[sizeof("inenclosedcjklettersandmonths")];
+    char uniname2ctype_pool_str2702[sizeof("tamil")];
+    char uniname2ctype_pool_str2721[sizeof("tirh")];
+    char uniname2ctype_pool_str2723[sizeof("digit")];
+    char uniname2ctype_pool_str2732[sizeof("talu")];
+    char uniname2ctype_pool_str2747[sizeof("zp")];
+    char uniname2ctype_pool_str2750[sizeof("inpaucinhau")];
+    char uniname2ctype_pool_str2760[sizeof("taitham")];
+    char uniname2ctype_pool_str2764[sizeof("otherlowercase")];
+    char uniname2ctype_pool_str2768[sizeof("telu")];
+    char uniname2ctype_pool_str2769[sizeof("inaegeannumbers")];
+    char uniname2ctype_pool_str2777[sizeof("otherletter")];
+    char uniname2ctype_pool_str2780[sizeof("whitespace")];
+    char uniname2ctype_pool_str2793[sizeof("nonspacingmark")];
+    char uniname2ctype_pool_str2816[sizeof("graphemeclusterbreak=spacingmark")];
+    char uniname2ctype_pool_str2821[sizeof("inletterlikesymbols")];
+    char uniname2ctype_pool_str2834[sizeof("intagbanwa")];
+    char uniname2ctype_pool_str2841[sizeof("oldsogdian")];
+    char uniname2ctype_pool_str2848[sizeof("otheridstart")];
+    char uniname2ctype_pool_str2852[sizeof("graphemeclusterbreak=cr")];
+    char uniname2ctype_pool_str2855[sizeof("narb")];
+    char uniname2ctype_pool_str2856[sizeof("changeswhencasemapped")];
+    char uniname2ctype_pool_str2859[sizeof("inbopomofo")];
+    char uniname2ctype_pool_str2862[sizeof("tangut")];
+    char uniname2ctype_pool_str2867[sizeof("graphemeclusterbreak=regionalindicator")];
+    char uniname2ctype_pool_str2871[sizeof("noncharactercodepoint")];
+    char uniname2ctype_pool_str2883[sizeof("otheruppercase")];
+    char uniname2ctype_pool_str2885[sizeof("rjng")];
+    char uniname2ctype_pool_str2886[sizeof("sylotinagri")];
+    char uniname2ctype_pool_str2904[sizeof("inhangulsyllables")];
+    char uniname2ctype_pool_str2905[sizeof("emojipresentation")];
+    char uniname2ctype_pool_str2906[sizeof("inindicsiyaqnumbers")];
+    char uniname2ctype_pool_str2909[sizeof("inbassavah")];
+    char uniname2ctype_pool_str2912[sizeof("ogrext")];
+    char uniname2ctype_pool_str2926[sizeof("othersymbol")];
+    char uniname2ctype_pool_str2938[sizeof("oupper")];
+    char uniname2ctype_pool_str2941[sizeof("inbuhid")];
+    char uniname2ctype_pool_str2963[sizeof("hmnp")];
+    char uniname2ctype_pool_str2964[sizeof("inpsalterpahlavi")];
+    char uniname2ctype_pool_str2967[sizeof("finalpunctuation")];
+    char uniname2ctype_pool_str2980[sizeof("phlp")];
+    char uniname2ctype_pool_str2984[sizeof("inbamumsupplement")];
+    char uniname2ctype_pool_str2986[sizeof("buhid")];
+    char uniname2ctype_pool_str2987[sizeof("paragraphseparator")];
+    char uniname2ctype_pool_str2988[sizeof("inalphabeticpresentationforms")];
+    char uniname2ctype_pool_str2993[sizeof("omath")];
+    char uniname2ctype_pool_str3000[sizeof("any")];
+    char uniname2ctype_pool_str3001[sizeof("elba")];
+    char uniname2ctype_pool_str3002[sizeof("changeswhentitlecased")];
+    char uniname2ctype_pool_str3005[sizeof("incombininghalfmarks")];
+    char uniname2ctype_pool_str3006[sizeof("intangutcomponents")];
+    char uniname2ctype_pool_str3012[sizeof("hebr")];
+    char uniname2ctype_pool_str3028[sizeof("deprecated")];
+    char uniname2ctype_pool_str3045[sizeof("inarabicmathematicalalphabeticsymbols")];
+    char uniname2ctype_pool_str3055[sizeof("inprivateusearea")];
+    char uniname2ctype_pool_str3089[sizeof("kayahli")];
+    char uniname2ctype_pool_str3098[sizeof("inplayingcards")];
+    char uniname2ctype_pool_str3099[sizeof("inarabicpresentationformsb")];
+    char uniname2ctype_pool_str3100[sizeof("ogham")];
+    char uniname2ctype_pool_str3101[sizeof("elym")];
+    char uniname2ctype_pool_str3107[sizeof("graphemeclusterbreak=t")];
+    char uniname2ctype_pool_str3109[sizeof("graphemeclusterbreak=lvt")];
+    char uniname2ctype_pool_str3111[sizeof("nbat")];
+    char uniname2ctype_pool_str3125[sizeof("nabataean")];
+    char uniname2ctype_pool_str3126[sizeof("hangul")];
+    char uniname2ctype_pool_str3134[sizeof("elymaic")];
+    char uniname2ctype_pool_str3158[sizeof("inhebrew")];
+    char uniname2ctype_pool_str3165[sizeof("injavanese")];
+    char uniname2ctype_pool_str3169[sizeof("symbol")];
+    char uniname2ctype_pool_str3176[sizeof("inmathematicaloperators")];
+    char uniname2ctype_pool_str3180[sizeof("inarabicsupplement")];
+    char uniname2ctype_pool_str3185[sizeof("cypriot")];
+    char uniname2ctype_pool_str3194[sizeof("hung")];
+    char uniname2ctype_pool_str3205[sizeof("wspace")];
+    char uniname2ctype_pool_str3209[sizeof("changeswhenlowercased")];
+    char uniname2ctype_pool_str3215[sizeof("elbasan")];
+    char uniname2ctype_pool_str3218[sizeof("hluw")];
+    char uniname2ctype_pool_str3237[sizeof("insuperscriptsandsubscripts")];
+    char uniname2ctype_pool_str3239[sizeof("graphemeclusterbreak=extend")];
+    char uniname2ctype_pool_str3240[sizeof("graphemeclusterbreak=prepend")];
+    char uniname2ctype_pool_str3248[sizeof("nshu")];
+    char uniname2ctype_pool_str3254[sizeof("oldnortharabian")];
+    char uniname2ctype_pool_str3266[sizeof("inyijinghexagramsymbols")];
+    char uniname2ctype_pool_str3286[sizeof("hexdigit")];
+    char uniname2ctype_pool_str3297[sizeof("graphemeclusterbreak=l")];
+    char uniname2ctype_pool_str3303[sizeof("graphemeclusterbreak=control")];
+    char uniname2ctype_pool_str3309[sizeof("bassavah")];
+    char uniname2ctype_pool_str3317[sizeof("otherdefaultignorablecodepoint")];
+    char uniname2ctype_pool_str3328[sizeof("changeswhenuppercased")];
+    char uniname2ctype_pool_str3329[sizeof("inalchemicalsymbols")];
+    char uniname2ctype_pool_str3348[sizeof("insupplementalarrowsa")];
+    char uniname2ctype_pool_str3349[sizeof("inyisyllables")];
+    char uniname2ctype_pool_str3351[sizeof("tibt")];
+    char uniname2ctype_pool_str3360[sizeof("othermath")];
+    char uniname2ctype_pool_str3363[sizeof("tibetan")];
+    char uniname2ctype_pool_str3365[sizeof("inmahjongtiles")];
+    char uniname2ctype_pool_str3433[sizeof("signwriting")];
+    char uniname2ctype_pool_str3436[sizeof("nushu")];
+    char uniname2ctype_pool_str3439[sizeof("modifiersymbol")];
+    char uniname2ctype_pool_str3442[sizeof("inhalfwidthandfullwidthforms")];
+    char uniname2ctype_pool_str3458[sizeof("upper")];
+    char uniname2ctype_pool_str3460[sizeof("insupplementalarrowsc")];
+    char uniname2ctype_pool_str3511[sizeof("insupplementalmathematicaloperators")];
+    char uniname2ctype_pool_str3512[sizeof("incypriotsyllabary")];
+    char uniname2ctype_pool_str3517[sizeof("dupl")];
+    char uniname2ctype_pool_str3531[sizeof("tavt")];
+    char uniname2ctype_pool_str3532[sizeof("inpahawhhmong")];
+    char uniname2ctype_pool_str3533[sizeof("alphabetic")];
+    char uniname2ctype_pool_str3550[sizeof("dashpunctuation")];
+    char uniname2ctype_pool_str3558[sizeof("uppercase")];
+    char uniname2ctype_pool_str3613[sizeof("soyombo")];
+    char uniname2ctype_pool_str3614[sizeof("hanifirohingya")];
+    char uniname2ctype_pool_str3616[sizeof("otherpunctuation")];
+    char uniname2ctype_pool_str3628[sizeof("defaultignorablecodepoint")];
+    char uniname2ctype_pool_str3648[sizeof("inhanguljamoextendedb")];
+    char uniname2ctype_pool_str3664[sizeof("aghb")];
+    char uniname2ctype_pool_str3703[sizeof("tifinagh")];
+    char uniname2ctype_pool_str3705[sizeof("inlatinextendedb")];
+    char uniname2ctype_pool_str3714[sizeof("tfng")];
+    char uniname2ctype_pool_str3766[sizeof("inhighprivateusesurrogates")];
+    char uniname2ctype_pool_str3791[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str3805[sizeof("dep")];
+    char uniname2ctype_pool_str3819[sizeof("oldsoutharabian")];
+    char uniname2ctype_pool_str3821[sizeof("graphemeclusterbreak=lf")];
+    char uniname2ctype_pool_str3842[sizeof("pahawhhmong")];
+    char uniname2ctype_pool_str3845[sizeof("unifiedideograph")];
+    char uniname2ctype_pool_str3891[sizeof("uppercaseletter")];
+    char uniname2ctype_pool_str3924[sizeof("insupplementalpunctuation")];
+    char uniname2ctype_pool_str3942[sizeof("ethiopic")];
+    char uniname2ctype_pool_str3976[sizeof("inglagoliticsupplement")];
+    char uniname2ctype_pool_str3995[sizeof("rejang")];
+    char uniname2ctype_pool_str4087[sizeof("inbopomofoextended")];
+    char uniname2ctype_pool_str4109[sizeof("tagb")];
+    char uniname2ctype_pool_str4137[sizeof("othergraphemeextend")];
+    char uniname2ctype_pool_str4162[sizeof("inegyptianhieroglyphs")];
+    char uniname2ctype_pool_str4175[sizeof("inegyptianhieroglyphformatcontrols")];
+    char uniname2ctype_pool_str4203[sizeof("hebrew")];
+    char uniname2ctype_pool_str4254[sizeof("tglg")];
+    char uniname2ctype_pool_str4276[sizeof("tagalog")];
+    char uniname2ctype_pool_str4291[sizeof("graphemeclusterbreak=zwj")];
+    char uniname2ctype_pool_str4321[sizeof("zyyy")];
+    char uniname2ctype_pool_str4360[sizeof("hyphen")];
+    char uniname2ctype_pool_str4397[sizeof("inboxdrawing")];
+    char uniname2ctype_pool_str4405[sizeof("graphemeclusterbreak=v")];
+    char uniname2ctype_pool_str4406[sizeof("graphemeclusterbreak=lv")];
+    char uniname2ctype_pool_str4460[sizeof("telugu")];
+    char uniname2ctype_pool_str4485[sizeof("duployan")];
+    char uniname2ctype_pool_str4528[sizeof("openpunctuation")];
+    char uniname2ctype_pool_str4674[sizeof("insupplementaryprivateuseareaa")];
+    char uniname2ctype_pool_str4683[sizeof("inhighsurrogates")];
+    char uniname2ctype_pool_str4772[sizeof("insupplementalarrowsb")];
+    char uniname2ctype_pool_str4948[sizeof("insupplementalsymbolsandpictographs")];
+    char uniname2ctype_pool_str4955[sizeof("egyp")];
+    char uniname2ctype_pool_str4986[sizeof("inhangulcompatibilityjamo")];
+    char uniname2ctype_pool_str5114[sizeof("nyiakengpuachuehmong")];
+    char uniname2ctype_pool_str5608[sizeof("egyptianhieroglyphs")];
+    char uniname2ctype_pool_str6098[sizeof("insupplementaryprivateuseareab")];
+#endif /* USE_UNICODE_PROPERTIES */
+  };
+static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
+  {
+#ifndef USE_UNICODE_PROPERTIES
+    "word",
+#else /* USE_UNICODE_PROPERTIES */
+    "yi",
+    "yiii",
+    "lana",
+    "z",
+    "lina",
+    "maka",
+    "mani",
+    "mn",
+    "miao",
+    "lo",
+    "ci",
+    "lao",
+    "laoo",
+    "inkannada",
+    "cn",
+    "pi",
+    "innko",
+    "zzzz",
+    "gran",
+    "co",
+    "lineara",
+    "mark",
+    "po",
+    "me",
+    "cari",
+    "inkharoshthi",
+    "kana",
+    "loe",
+    "m",
+    "grek",
+    "mro",
+    "mroo",
+    "carian",
+    "geor",
+    "greek",
+    "gonm",
+    "mendekikakui",
+    "pe",
+    "mero",
+    "inosmanya",
+    "cakm",
+    "inmanichaean",
+    "inmro",
+    "inmiao",
+    "inchakma",
+    "c",
+    "mandaic",
+    "meeteimayek",
+    "inarmenian",
+    "inmyanmar",
+    "inmakasar",
+    "common",
+    "lm",
+    "marc",
+    "inrunic",
+    "incarian",
+    "inideographicsymbolsandpunctuation",
+    "inkhmer",
+    "qaai",
+    "inahom",
+    "merc",
+    "combiningmark",
+    "lc",
+    "perm",
+    "mc",
+    "connectorpunctuation",
+    "cans",
+    "incuneiformnumbersandpunctuation",
+    "armi",
+    "cc",
+    "armn",
+    "incherokee",
+    "prependedconcatenationmark",
+    "incuneiform",
+    "inavestan",
+    "inipaextensions",
+    "pc",
+    "armenian",
+    "insharada",
+    "inmarchen",
+    "makasar",
+    "masaramgondi",
+    "inarrows",
+    "incyrillic",
+    "incham",
+    "qmark",
+    "ri",
+    "qaac",
+    "insamaritan",
+    "latn",
+    "inmasaramgondi",
+    "inthaana",
+    "latin",
+    "inthai",
+    "lineseparator",
+    "pcm",
+    "inkatakana",
+    "inkaithi",
+    "inzanabazarsquare",
+    "inscriptionalparthian",
+    "initialpunctuation",
+    "mtei",
+    "vai",
+    "vaii",
+    "inkhmersymbols",
+    "insyriac",
+    "intakri",
+    "arabic",
+    "zs",
+    "katakana",
+    "prti",
+    "ascii",
+    "cs",
+    "ps",
+    "mand",
+    "privateuse",
+    "inruminumeralsymbols",
+    "inmyanmarextendeda",
+    "modi",
+    "incjkcompatibilityforms",
+    "inkanaextendeda",
+    "incjkcompatibilityideographs",
+    "brai",
+    "mend",
+    "ideo",
+    "letter",
+    "l",
+    "inmeeteimayek",
+    "inideographicdescriptioncharacters",
+    "xidcontinue",
+    "knda",
+    "innandinagari",
+    "kannada",
+    "inmodi",
+    "inlao",
+    "inoldnortharabian",
+    "intransportandmapsymbols",
+    "letternumber",
+    "gothic",
+    "inlineara",
+    "inmendekikakui",
+    "xidc",
+    "mongolian",
+    "inmiscellaneousmathematicalsymbolsa",
+    "inspecials",
+    "grlink",
+    "brahmi",
+    "inemoticons",
+    "kali",
+    "inolditalic",
+    "inmedefaidrin",
+    "inchesssymbols",
+    "incjkcompatibilityideographssupplement",
+    "inadlam",
+    "psalterpahlavi",
+    "incommonindicnumberforms",
+    "lt",
+    "innewa",
+    "sk",
+    "control",
+    "inancientsymbols",
+    "palm",
+    "inlycian",
+    "so",
+    "patternwhitespace",
+    "xids",
+    "inmandaic",
+    "idc",
+    "meroiticcursive",
+    "inwarangciti",
+    "sora",
+    "inopticalcharacterrecognition",
+    "inoldsogdian",
+    "inmalayalam",
+    "bamum",
+    "inkanasupplement",
+    "insundanese",
+    "grext",
+#endif /* USE_UNICODE_PROPERTIES */
+    "print",
+#ifndef USE_UNICODE_PROPERTIES
+    "punct",
+    "alpha",
+#else /* USE_UNICODE_PROPERTIES */
+    "intaitham",
+    "lower",
+    "joinc",
+    "inoldsoutharabian",
+    "incjkstrokes",
+    "batk",
+    "samr",
+    "inwancho",
+    "batak",
+    "vs",
+    "patws",
+    "samaritan",
+    "idsbinaryoperator",
+    "pauc",
+    "insmallkanaextension",
+    "sm",
+    "indominotiles",
+#endif /* USE_UNICODE_PROPERTIES */
+    "alnum",
+#ifdef USE_UNICODE_PROPERTIES
+    "insylotinagri",
+    "inugaritic",
+    "incontrolpictures",
+    "inlinearbideograms",
+    "inmusicalsymbols",
+    "s",
+    "ital",
+    "inmodifiertoneletters",
+    "inancientgreekmusicalnotation",
+    "patternsyntax",
+    "lisu",
+    "lowercase",
+    "cwcm",
+    "sc",
+    "bass",
+    "ids",
+    "inlatinextendeda",
+    "oriya",
+    "intaile",
+    "inmiscellaneoussymbols",
+    "inmiscellaneoussymbolsandarrows",
+    "incaucasianalbanian",
+    "inmiscellaneoussymbolsandpictographs",
+    "inoldturkic",
+    "insaurashtra",
+    "idcontinue",
+    "intamil",
+    "inmultani",
+    "inlatinextendede",
+    "pd",
+    "bali",
+    "blank",
+    "idst",
+    "inlydian",
+    "innewtailue",
+    "bengali",
+    "runr",
+    "zl",
+    "incyrillicextendeda",
+    "ll",
+    "indeseret",
+    "intaixuanjingsymbols",
+    "inancientgreeknumbers",
+    "idstart",
+    "inmeeteimayekextensions",
+    "balinese",
+    "dia",
+    "di",
+    "inspacingmodifierletters",
+    "inearlydynasticcuneiform",
+    "plrd",
+    "canadianaboriginal",
+    "zinh",
+    "sind",
+    "osage",
+    "inlatinextendedc",
+    "uideo",
+    "incountingrodnumerals",
+    "xidstart",
+#endif /* USE_UNICODE_PROPERTIES */
+    "xdigit",
+#ifndef USE_UNICODE_PROPERTIES
+    "upper",
+    "ascii",
+#else /* USE_UNICODE_PROPERTIES */
+    "osma",
+    "inkhudawadi",
+    "inhanifirohingya",
+    "gong",
+    "ingrantha",
+    "bidic",
+    "mong",
+    "cased",
+    "incyrillicextendedc",
+    "inhiragana",
+    "sinhala",
+    "adlm",
+    "glagolitic",
+    "sterm",
+    "bamu",
+    "georgian",
+    "inosage",
+    "gunjalagondi",
+    "phoenician",
+    "multani",
+    "kaithi",
+    "joincontrol",
+    "runic",
+    "ingeneralpunctuation",
+    "inmahajani",
+    "incyrillicsupplement",
+    "lowercaseletter",
+    "marchen",
+    "graphemelink",
+    "ingeorgian",
+    "khojki",
+    "cham",
+    "inogham",
+    "cher",
+    "chakma",
+    "emoji",
+    "insiddham",
+    "cherokee",
+    "khar",
+    "inmongolian",
+    "incherokeesupplement",
+    "diacritic",
+    "manichaean",
+    "xsux",
+    "inolchiki",
+    "quotationmark",
+    "adlam",
+    "inethiopic",
+    "graphemebase",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=11.0",
+    "age=12.1",
+    "age=10.0",
+    "age=12.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "casedletter",
+    "ingurmukhi",
+    "odi",
+    "incjkunifiedideographsextensiona",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=1.1",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "lu",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=4.1",
+    "age=2.1",
+    "age=4.0",
+    "age=2.0",
+    "age=9.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "intamilsupplement",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=6.1",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "unknown",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=6.0",
+    "age=6.2",
+    "age=3.1",
+    "age=8.0",
+    "age=3.0",
+    "age=3.2",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "cwt",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=7.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "unassigned",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=6.3",
+    "age=5.1",
+    "age=5.0",
+    "age=5.2",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "ahom",
+    "incjkunifiedideographsextensione",
+    "khmr",
+    "insinhala",
+    "inmiscellaneoustechnical",
+    "saur",
+    "guru",
+    "sundanese",
+    "punct",
+    "paucinhau",
+    "gurmukhi",
+    "variationselector",
+    "logicalorderexception",
+    "khmer",
+    "limbu",
+    "inscriptionalpahlavi",
+    "oidc",
+    "incjkunifiedideographsextensionc",
+#endif /* USE_UNICODE_PROPERTIES */
+    "cntrl",
+#ifdef USE_UNICODE_PROPERTIES
+    "inlatinextendedadditional",
+    "decimalnumber",
+    "insorasompeng",
+    "radical",
+    "emojimodifier",
+    "kharoshthi",
+    "n",
+    "math",
+    "goth",
+    "anatolianhieroglyphs",
+    "inenclosedalphanumerics",
+    "nandinagari",
+    "no",
+    "nko",
+    "nkoo",
+    "ingreekandcoptic",
+    "olck",
+    "p",
+    "grantha",
+    "olchiki",
+    "incjkunifiedideographs",
+    "zanb",
+    "intirhuta",
+    "oids",
+    "inhatran",
+    "linb",
+    "xpeo",
+    "mult",
+    "saurashtra",
+    "kthi",
+    "inbhaiksuki",
+    "olower",
+    "innabataean",
+    "inphoenician",
+    "inkanbun",
+    "inmeroitichieroglyphs",
+    "inkayahli",
+    "phnx",
+    "inoriya",
+    "enclosingmark",
+    "sd",
+    "inelbasan",
+    "wara",
+    "inenclosedideographicsupplement",
+    "sidd",
+    "linearb",
+    "hani",
+    "han",
+    "inenclosedalphanumericsupplement",
+    "medf",
+    "bidicontrol",
+    "hano",
+    "inphaistosdisc",
+    "limb",
+    "inkangxiradicals",
+    "lepc",
+    "medefaidrin",
+    "braille",
+    "regionalindicator",
+    "inlowsurrogates",
+    "inshorthandformatcontrols",
+    "brah",
+    "inkhojki",
+    "inoldhungarian",
+    "hanunoo",
+    "hira",
+    "beng",
+    "emojimodifierbase",
+    "inarabic",
+    "lyci",
+    "ahex",
+    "inherited",
+    "glag",
+    "lycian",
+    "indogra",
+    "dsrt",
+    "arab",
+    "mymr",
+    "myanmar",
+    "phli",
+    "inimperialaramaic",
+    "ingreekextended",
+    "inanatolianhieroglyphs",
+    "punctuation",
+    "takri",
+    "graphemeextend",
+    "invai",
+    "cwl",
+    "ingeometricshapes",
+    "emojicomponent",
+    "coptic",
+    "deseret",
+    "inarabicpresentationformsa",
+    "takr",
+    "inbasiclatin",
+    "incjkunifiedideographsextensiond",
+    "sinh",
+    "sund",
+    "shavian",
+    "taile",
+    "insundanesesupplement",
+    "inelymaic",
+    "insoyombo",
+    "bhks",
+    "bhaiksuki",
+    "incjkcompatibility",
+    "inhanunoo",
+    "intangut",
+    "sogdian",
+    "inlatinextendedd",
+    "sogo",
+    "insinhalaarchaicnumbers",
+    "ideographic",
+    "ugar",
+    "copt",
+    "imperialaramaic",
+    "insogdian",
+    "indingbats",
+    "format",
+    "ininscriptionalpahlavi",
+    "ininscriptionalparthian",
+    "grbase",
+    "inbatak",
+    "cprt",
+    "cwcf",
+    "cuneiform",
+    "term",
+    "intibetan",
+    "intags",
+    "asciihexdigit",
+    "sentenceterminal",
+    "inmayannumerals",
+    "nand",
+    "patsyn",
+    "hatran",
+    "inblockelements",
+    "inornamentaldingbats",
+    "innumberforms",
+    "oldpersian",
+    "inshavian",
+    "bopo",
+    "hatr",
+    "caseignorable",
+    "inoldpersian",
+    "modifierletter",
+    "cwu",
+    "lydi",
+    "inbyzantinemusicalsymbols",
+    "ingeometricshapesextended",
+    "inmyanmarextendedb",
+    "innushu",
+    "lydian",
+    "inunifiedcanadianaboriginalsyllabics",
+    "orkh",
+    "inyiradicals",
+    "inkatakanaphoneticextensions",
+    "inethiopicextendeda",
+    "incoptic",
+    "inarabicextendeda",
+    "oldpermic",
+    "incjksymbolsandpunctuation",
+    "word",
+    "bopomofo",
+    "ogam",
+    "inlisu",
+    "inoldpermic",
+    "innoblock",
+    "taiviet",
+    "inbraillepatterns",
+    "alpha",
+    "inbalinese",
+    "sorasompeng",
+    "closepunctuation",
+    "inmiscellaneousmathematicalsymbolsb",
+    "inlepcha",
+    "insyriacsupplement",
+    "newa",
+    "spacingmark",
+    "inpalmyrene",
+    "cyrl",
+    "assigned",
+    "mlym",
+    "malayalam",
+    "ext",
+    "newtailue",
+#endif /* USE_UNICODE_PROPERTIES */
+    "space",
+#ifdef USE_UNICODE_PROPERTIES
+    "intelugu",
+    "idsb",
+    "indevanagari",
+    "avestan",
+    "cf",
+    "palmyrene",
+    "inethiopicsupplement",
+    "soyo",
+#endif /* USE_UNICODE_PROPERTIES */
+    "xposixpunct",
+#ifndef USE_UNICODE_PROPERTIES
+    "lower",
+#else /* USE_UNICODE_PROPERTIES */
+    "pf",
+    "sarb",
+    "zanabazarsquare",
+    "ugaritic",
+    "osge",
+    "java",
+    "sharada",
+    "dogra",
+    "bugi",
+    "meroitichieroglyphs",
+    "separator",
+    "ingeorgiansupplement",
+    "sogd",
+    "tale",
+    "inunifiedcanadianaboriginalsyllabicsextended",
+    "terminalpunctuation",
+    "shrd",
+#endif /* USE_UNICODE_PROPERTIES */
+    "graph",
+#ifdef USE_UNICODE_PROPERTIES
+    "olditalic",
+    "dogr",
+    "gujr",
+    "phag",
+    "gujarati",
+    "inhanguljamo",
+    "javanese",
+    "taml",
+    "inphoneticextensions",
+    "siddham",
+    "buginese",
+    "inmongoliansupplement",
+    "invariationselectors",
+    "inhanguljamoextendeda",
+    "inverticalforms",
+    "syrc",
+    "number",
+    "incopticepactnumbers",
+    "avst",
+    "inbamum",
+    "nd",
+    "insuttonsignwriting",
+    "extender",
+    "intaiviet",
+    "hex",
+    "incjkunifiedideographsextensionf",
+    "other",
+    "otheridcontinue",
+    "shaw",
+    "dash",
+    "othernumber",
+    "orya",
+    "invedicextensions",
+    "sgnw",
+    "caucasianalbanian",
+    "inmathematicalalphanumericsymbols",
+    "inphoneticextensionssupplement",
+    "invariationselectorssupplement",
+    "induployan",
+    "syriac",
+    "oalpha",
+    "innyiakengpuachuehmong",
+    "incombiningdiacriticalmarks",
+    "inethiopicextended",
+    "nl",
+    "incombiningdiacriticalmarksforsymbols",
+    "khudawadi",
+    "otheralphabetic",
+    "oldhungarian",
+    "incurrencysymbols",
+    "incjkradicalssupplement",
+    "inglagolitic",
+    "intifinagh",
+    "ingeorgianextended",
+    "surrogate",
+    "incyrillicextendedb",
+    "ethi",
+    "titlecaseletter",
+    "rohg",
+    "inmeroiticcursive",
+    "idstrinaryoperator",
+    "inphagspa",
+    "lepcha",
+    "intagalog",
+    "mathsymbol",
+    "incombiningdiacriticalmarkssupplement",
+    "inbrahmi",
+    "insymbolsandpictographsextendeda",
+    "inlinearbsyllabary",
+    "oldturkic",
+    "inbengali",
+    "wancho",
+    "osmanya",
+    "buhd",
+    "insmallformvariants",
+    "indevanagariextended",
+    "softdotted",
+    "inbuginese",
+    "mahj",
+    "inlatin1supplement",
+    "ingothic",
+    "mahajani",
+    "hang",
+    "sylo",
+    "warangciti",
+    "ingujarati",
+    "tirhuta",
+    "incombiningdiacriticalmarksextended",
+    "spaceseparator",
+    "ingunjalagondi",
+    "wcho",
+    "hiragana",
+    "extendedpictographic",
+    "inrejang",
+    "inottomansiyaqnumbers",
+    "nchar",
+    "cyrillic",
+    "khoj",
+    "inlimbu",
+    "hmng",
+    "thaa",
+    "thai",
+    "incjkunifiedideographsextensionb",
+    "deva",
+    "thaana",
+    "phagspa",
+    "devanagari",
+    "tang",
+    "currencysymbol",
+    "tagbanwa",
+    "inenclosedcjklettersandmonths",
+    "tamil",
+    "tirh",
+#endif /* USE_UNICODE_PROPERTIES */
+    "digit",
+#ifndef USE_UNICODE_PROPERTIES
+    "blank"
+#else /* USE_UNICODE_PROPERTIES */
+    "talu",
+    "zp",
+    "inpaucinhau",
+    "taitham",
+    "otherlowercase",
+    "telu",
+    "inaegeannumbers",
+    "otherletter",
+    "whitespace",
+    "nonspacingmark",
+    "graphemeclusterbreak=spacingmark",
+    "inletterlikesymbols",
+    "intagbanwa",
+    "oldsogdian",
+    "otheridstart",
+    "graphemeclusterbreak=cr",
+    "narb",
+    "changeswhencasemapped",
+    "inbopomofo",
+    "tangut",
+    "graphemeclusterbreak=regionalindicator",
+    "noncharactercodepoint",
+    "otheruppercase",
+    "rjng",
+    "sylotinagri",
+    "inhangulsyllables",
+    "emojipresentation",
+    "inindicsiyaqnumbers",
+    "inbassavah",
+    "ogrext",
+    "othersymbol",
+    "oupper",
+    "inbuhid",
+    "hmnp",
+    "inpsalterpahlavi",
+    "finalpunctuation",
+    "phlp",
+    "inbamumsupplement",
+    "buhid",
+    "paragraphseparator",
+    "inalphabeticpresentationforms",
+    "omath",
+    "any",
+    "elba",
+    "changeswhentitlecased",
+    "incombininghalfmarks",
+    "intangutcomponents",
+    "hebr",
+    "deprecated",
+    "inarabicmathematicalalphabeticsymbols",
+    "inprivateusearea",
+    "kayahli",
+    "inplayingcards",
+    "inarabicpresentationformsb",
+    "ogham",
+    "elym",
+    "graphemeclusterbreak=t",
+    "graphemeclusterbreak=lvt",
+    "nbat",
+    "nabataean",
+    "hangul",
+    "elymaic",
+    "inhebrew",
+    "injavanese",
+    "symbol",
+    "inmathematicaloperators",
+    "inarabicsupplement",
+    "cypriot",
+    "hung",
+    "wspace",
+    "changeswhenlowercased",
+    "elbasan",
+    "hluw",
+    "insuperscriptsandsubscripts",
+    "graphemeclusterbreak=extend",
+    "graphemeclusterbreak=prepend",
+    "nshu",
+    "oldnortharabian",
+    "inyijinghexagramsymbols",
+    "hexdigit",
+    "graphemeclusterbreak=l",
+    "graphemeclusterbreak=control",
+    "bassavah",
+    "otherdefaultignorablecodepoint",
+    "changeswhenuppercased",
+    "inalchemicalsymbols",
+    "insupplementalarrowsa",
+    "inyisyllables",
+    "tibt",
+    "othermath",
+    "tibetan",
+    "inmahjongtiles",
+    "signwriting",
+    "nushu",
+    "modifiersymbol",
+    "inhalfwidthandfullwidthforms",
+    "upper",
+    "insupplementalarrowsc",
+    "insupplementalmathematicaloperators",
+    "incypriotsyllabary",
+    "dupl",
+    "tavt",
+    "inpahawhhmong",
+    "alphabetic",
+    "dashpunctuation",
+    "uppercase",
+    "soyombo",
+    "hanifirohingya",
+    "otherpunctuation",
+    "defaultignorablecodepoint",
+    "inhanguljamoextendedb",
+    "aghb",
+    "tifinagh",
+    "inlatinextendedb",
+    "tfng",
+    "inhighprivateusesurrogates",
+    "changeswhencasefolded",
+    "dep",
+    "oldsoutharabian",
+    "graphemeclusterbreak=lf",
+    "pahawhhmong",
+    "unifiedideograph",
+    "uppercaseletter",
+    "insupplementalpunctuation",
+    "ethiopic",
+    "inglagoliticsupplement",
+    "rejang",
+    "inbopomofoextended",
+    "tagb",
+    "othergraphemeextend",
+    "inegyptianhieroglyphs",
+    "inegyptianhieroglyphformatcontrols",
+    "hebrew",
+    "tglg",
+    "tagalog",
+    "graphemeclusterbreak=zwj",
+    "zyyy",
+    "hyphen",
+    "inboxdrawing",
+    "graphemeclusterbreak=v",
+    "graphemeclusterbreak=lv",
+    "telugu",
+    "duployan",
+    "openpunctuation",
+    "insupplementaryprivateuseareaa",
+    "inhighsurrogates",
+    "insupplementalarrowsb",
+    "insupplementalsymbolsandpictographs",
+    "egyp",
+    "inhangulcompatibilityjamo",
+    "nyiakengpuachuehmong",
+    "egyptianhieroglyphs",
+    "insupplementaryprivateuseareab"
+#endif /* USE_UNICODE_PROPERTIES */
+  };
+#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
+const struct uniname2ctype_struct *
+uniname2ctype_p (register const char *str, register size_t len)
+{
+  static const struct uniname2ctype_struct wordlist[] =
+    {
+#ifdef USE_UNICODE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str11), 111},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str17), 111},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str22), 152},
+      {-1},
+      {uniname2ctype_offset(str24), 52},
+      {uniname2ctype_offset(str25), 184},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str33), 218},
+      {-1},
+      {uniname2ctype_offset(str35), 186},
+      {uniname2ctype_offset(str36), 34},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str45), 173},
+      {uniname2ctype_offset(str46), 28},
+      {uniname2ctype_offset(str47), 61},
+      {uniname2ctype_offset(str48), 95},
+      {uniname2ctype_offset(str49), 95},
+      {-1}, {-1},
+      {uniname2ctype_offset(str52), 331},
+      {-1}, {-1},
+      {uniname2ctype_offset(str55), 21},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str64), 44},
+      {-1},
+      {uniname2ctype_offset(str66), 319},
+      {uniname2ctype_offset(str67), 267},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str71), 181},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str75), 22},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str83), 184},
+      {-1}, {-1},
+      {uniname2ctype_offset(str86), 31},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str92), 45},
+      {-1},
+      {uniname2ctype_offset(str94), 33},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str100), 149},
+      {uniname2ctype_offset(str101), 496},
+      {uniname2ctype_offset(str102), 108},
+      {uniname2ctype_offset(str103), 252},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str107), 31},
+      {uniname2ctype_offset(str108), 77},
+      {-1}, {-1},
+      {uniname2ctype_offset(str111), 189},
+      {uniname2ctype_offset(str112), 189},
+      {-1}, {-1},
+      {uniname2ctype_offset(str115), 149},
+      {-1},
+      {uniname2ctype_offset(str117), 98},
+      {uniname2ctype_offset(str118), 77},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str122), 212},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str129), 187},
+      {uniname2ctype_offset(str130), 42},
+      {uniname2ctype_offset(str131), 172},
+      {-1}, {-1},
+      {uniname2ctype_offset(str134), 482},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str139), 170},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str145), 499},
+      {uniname2ctype_offset(str146), 548},
+      {-1},
+      {uniname2ctype_offset(str148), 552},
+      {uniname2ctype_offset(str149), 514},
+      {-1},
+      {uniname2ctype_offset(str151), 18},
+      {uniname2ctype_offset(str152), 169},
+      {uniname2ctype_offset(str153), 160},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str161), 313},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str177), 337},
+      {uniname2ctype_offset(str178), 539},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str183), 75},
+      {-1}, {-1},
+      {uniname2ctype_offset(str186), 27},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str190), 208},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str203), 345},
+      {uniname2ctype_offset(str204), 473},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str210), 553},
+      {-1},
+      {uniname2ctype_offset(str212), 350},
+      {uniname2ctype_offset(str213), 115},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str218), 528},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str226), 171},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str231), 31},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str236), 25},
+      {uniname2ctype_offset(str237), 194},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str246), 32},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str250), 40},
+      {-1}, {-1},
+      {uniname2ctype_offset(str253), 102},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str260), 542},
+      {-1}, {-1},
+      {uniname2ctype_offset(str263), 161},
+      {-1},
+      {uniname2ctype_offset(str265), 19},
+      {-1},
+      {uniname2ctype_offset(str267), 79},
+      {uniname2ctype_offset(str268), 342},
+      {-1},
+      {uniname2ctype_offset(str270), 259},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str274), 541},
+      {uniname2ctype_offset(str275), 500},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str281), 307},
+      {uniname2ctype_offset(str282), 40},
+      {uniname2ctype_offset(str283), 79},
+      {-1},
+      {uniname2ctype_offset(str285), 516},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str289), 536},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str293), 218},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str297), 212},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str301), 380},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str311), 311},
+      {-1},
+      {uniname2ctype_offset(str313), 441},
+      {-1},
+      {uniname2ctype_offset(str315), 232},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str320), 260},
+      {-1},
+      {uniname2ctype_offset(str322), 129},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str328), 320},
+      {-1}, {-1},
+      {uniname2ctype_offset(str331), 76},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str335), 537},
+      {-1}, {-1},
+      {uniname2ctype_offset(str338), 318},
+      {-1},
+      {uniname2ctype_offset(str340), 76},
+      {-1},
+      {uniname2ctype_offset(str342), 334},
+      {-1}, {-1},
+      {uniname2ctype_offset(str345), 53},
+      {uniname2ctype_offset(str346), 259},
+      {-1},
+      {uniname2ctype_offset(str348), 411},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str352), 512},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str357), 532},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str362), 163},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str366), 44},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str373), 160},
+      {-1}, {-1},
+      {uniname2ctype_offset(str376), 144},
+      {uniname2ctype_offset(str377), 144},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str386), 356},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str399), 316},
+      {-1},
+      {uniname2ctype_offset(str401), 527},
+      {-1}, {-1},
+      {uniname2ctype_offset(str404), 81},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str411), 55},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str418), 108},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str426), 163},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str442), 14},
+      {-1}, {-1},
+      {uniname2ctype_offset(str445), 23},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str462), 46},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str468), 169},
+      {-1},
+      {uniname2ctype_offset(str470), 22},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str475), 507},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str480), 442},
+      {uniname2ctype_offset(str481), 188},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str486), 461},
+      {-1},
+      {uniname2ctype_offset(str488), 557},
+      {-1}, {-1},
+      {uniname2ctype_offset(str491), 455},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str500), 127},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str504), 187},
+      {uniname2ctype_offset(str505), 238},
+      {uniname2ctype_offset(str506), 24},
+      {-1}, {-1},
+      {uniname2ctype_offset(str509), 24},
+      {-1},
+      {uniname2ctype_offset(str511), 448},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str520), 408},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str535), 70},
+      {-1}, {-1},
+      {uniname2ctype_offset(str538), 91},
+      {-1}, {-1},
+      {uniname2ctype_offset(str541), 531},
+      {-1},
+      {uniname2ctype_offset(str543), 91},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str556), 525},
+      {-1},
+      {uniname2ctype_offset(str558), 335},
+      {-1},
+      {uniname2ctype_offset(str560), 498},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str565), 586},
+      {uniname2ctype_offset(str566), 37},
+      {-1},
+      {uniname2ctype_offset(str568), 113},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str572), 486},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str577), 573},
+      {uniname2ctype_offset(str578), 70},
+      {uniname2ctype_offset(str579), 106},
+      {-1}, {-1},
+      {uniname2ctype_offset(str582), 391},
+      {uniname2ctype_offset(str583), 465},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str590), 74},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str594), 168},
+      {-1},
+      {uniname2ctype_offset(str596), 584},
+      {uniname2ctype_offset(str597), 146},
+      {-1}, {-1},
+      {uniname2ctype_offset(str600), 475},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str604), 551},
+      {uniname2ctype_offset(str605), 591},
+      {-1}, {-1},
+      {uniname2ctype_offset(str608), 598},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str614), 574},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str624), 195},
+      {uniname2ctype_offset(str625), 432},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str630), 29},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str636), 522},
+      {-1}, {-1},
+      {uniname2ctype_offset(str639), 49},
+      {-1}, {-1},
+      {uniname2ctype_offset(str642), 19},
+      {-1}, {-1},
+      {uniname2ctype_offset(str645), 470},
+      {-1},
+      {uniname2ctype_offset(str647), 192},
+      {-1}, {-1},
+      {uniname2ctype_offset(str650), 472},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str657), 51},
+      {-1}, {-1},
+      {uniname2ctype_offset(str660), 257},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str668), 69},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str672), 321},
+      {-1}, {-1},
+      {uniname2ctype_offset(str675), 68},
+      {-1}, {-1},
+      {uniname2ctype_offset(str678), 171},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str695), 530},
+      {uniname2ctype_offset(str696), 175},
+      {uniname2ctype_offset(str697), 384},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str703), 508},
+      {-1},
+      {uniname2ctype_offset(str705), 332},
+      {-1},
+      {uniname2ctype_offset(str707), 158},
+      {uniname2ctype_offset(str708), 556},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str713), 361},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str720), 72},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str737), 7},
+      {uniname2ctype_offset(str738), 358},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str742), 6},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str753), 229},
+      {-1},
+      {uniname2ctype_offset(str755), 497},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str760), 416},
+      {uniname2ctype_offset(str761), 167},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str766), 156},
+      {uniname2ctype_offset(str767), 572},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str771), 167},
+      {uniname2ctype_offset(str772), 256},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str776), 257},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str783), 156},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str787), 245},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str791), 193},
+      {-1}, {-1},
+      {uniname2ctype_offset(str794), 558},
+      {-1}, {-1},
+      {uniname2ctype_offset(str797), 50},
+      {-1},
+      {uniname2ctype_offset(str799), 579},
+      {-1}, {-1},
+      {uniname2ctype_offset(str802), 13},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str809), 431},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str814), 478},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str818), 383},
+      {-1}, {-1},
+      {uniname2ctype_offset(str821), 467},
+      {uniname2ctype_offset(str822), 563},
+      {uniname2ctype_offset(str823), 47},
+      {uniname2ctype_offset(str824), 112},
+      {uniname2ctype_offset(str825), 429},
+      {-1}, {-1},
+      {uniname2ctype_offset(str828), 564},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str834), 258},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str838), 157},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str842), 58},
+      {-1}, {-1},
+      {uniname2ctype_offset(str845), 66},
+      {-1},
+      {uniname2ctype_offset(str847), 48},
+      {uniname2ctype_offset(str848), 178},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str855), 67},
+      {-1},
+      {uniname2ctype_offset(str857), 305},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str862), 88},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str875), 354},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str886), 389},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str895), 397},
+      {-1}, {-1},
+      {uniname2ctype_offset(str898), 485},
+      {-1},
+      {uniname2ctype_offset(str900), 583},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str906), 504},
+      {uniname2ctype_offset(str907), 434},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str924), 68},
+      {-1},
+      {uniname2ctype_offset(str926), 329},
+      {-1},
+      {uniname2ctype_offset(str928), 519},
+      {uniname2ctype_offset(str929), 446},
+      {uniname2ctype_offset(str930), 41},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str946), 136},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str961), 2},
+      {-1},
+      {uniname2ctype_offset(str963), 246},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str974), 493},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str986), 355},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str994), 85},
+      {uniname2ctype_offset(str995), 104},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1005), 53},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1009), 404},
+      {uniname2ctype_offset(str1010), 26},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1013), 480},
+      {uniname2ctype_offset(str1014), 566},
+      {uniname2ctype_offset(str1015), 469},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1021), 67},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1025), 444},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1028), 136},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1032), 239},
+      {uniname2ctype_offset(str1033), 71},
+      {-1},
+      {uniname2ctype_offset(str1035), 308},
+      {uniname2ctype_offset(str1036), 543},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1049), 173},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1067), 102},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1070), 115},
+      {-1},
+      {uniname2ctype_offset(str1072), 197},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1080), 210},
+      {uniname2ctype_offset(str1081), 399},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1085), 248},
+      {-1},
+      {uniname2ctype_offset(str1087), 567},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1090), 69},
+      {uniname2ctype_offset(str1091), 11},
+      {-1},
+      {uniname2ctype_offset(str1093), 125},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1097), 520},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1102), 506},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1105), 217},
+      {-1},
+      {uniname2ctype_offset(str1107), 521},
+      {-1},
+      {uniname2ctype_offset(str1109), 228},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1119), 106},
+      {uniname2ctype_offset(str1120), 60},
+      {uniname2ctype_offset(str1121), 365},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1134), 410},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1140), 93},
+      {-1},
+      {uniname2ctype_offset(str1142), 206},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1146), 131},
+      {uniname2ctype_offset(str1147), 255},
+      {-1},
+      {uniname2ctype_offset(str1149), 158},
+      {uniname2ctype_offset(str1150), 98},
+      {uniname2ctype_offset(str1151), 483},
+      {uniname2ctype_offset(str1152), 217},
+      {uniname2ctype_offset(str1153), 138},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1157), 203},
+      {uniname2ctype_offset(str1158), 166},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1164), 229},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1168), 104},
+      {-1},
+      {uniname2ctype_offset(str1170), 374},
+      {uniname2ctype_offset(str1171), 515},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1174), 312},
+      {uniname2ctype_offset(str1175), 26},
+      {uniname2ctype_offset(str1176), 208},
+      {uniname2ctype_offset(str1177), 74},
+      {uniname2ctype_offset(str1178), 338},
+      {-1},
+      {uniname2ctype_offset(str1180), 183},
+      {uniname2ctype_offset(str1181), 151},
+      {uniname2ctype_offset(str1182), 344},
+      {uniname2ctype_offset(str1183), 101},
+      {-1},
+      {uniname2ctype_offset(str1185), 170},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1190), 261},
+      {uniname2ctype_offset(str1191), 524},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1197), 101},
+      {uniname2ctype_offset(str1198), 135},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1203), 351},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1207), 447},
+      {uniname2ctype_offset(str1208), 239},
+      {uniname2ctype_offset(str1209), 186},
+      {uniname2ctype_offset(str1210), 137},
+      {-1},
+      {uniname2ctype_offset(str1212), 364},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1227), 232},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1231), 206},
+      {uniname2ctype_offset(str1232), 340},
+      {uniname2ctype_offset(str1233), 73},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1234), 287},
+      {uniname2ctype_offset(str1235), 289},
+      {uniname2ctype_offset(str1236), 286},
+      {uniname2ctype_offset(str1237), 288},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1243), 25},
+      {uniname2ctype_offset(str1244), 326},
+      {uniname2ctype_offset(str1245), 249},
+      {uniname2ctype_offset(str1246), 420},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1247), 268},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1248), 30},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1249), 275},
+      {uniname2ctype_offset(str1250), 270},
+      {uniname2ctype_offset(str1251), 274},
+      {uniname2ctype_offset(str1252), 269},
+      {uniname2ctype_offset(str1253), 285},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1254), 540},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1255), 280},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1256), 267},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1257), 279},
+      {uniname2ctype_offset(str1258), 281},
+      {uniname2ctype_offset(str1259), 272},
+      {uniname2ctype_offset(str1260), 284},
+      {uniname2ctype_offset(str1261), 271},
+      {uniname2ctype_offset(str1262), 273},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1263), 64},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1264), 283},
+      {-1},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1266), 21},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1267), 282},
+      {uniname2ctype_offset(str1268), 277},
+      {-1},
+      {uniname2ctype_offset(str1270), 276},
+      {uniname2ctype_offset(str1271), 278},
+      {-1}, {-1},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1274), 200},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1282), 596},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1285), 105},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1289), 333},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1292), 382},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1297), 145},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1300), 86},
+      {uniname2ctype_offset(str1301), 141},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1306), 15},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1314), 193},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1317), 86},
+      {-1},
+      {uniname2ctype_offset(str1319), 256},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1331), 252},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1340), 105},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1343), 120},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str1354), 164},
+      {uniname2ctype_offset(str1355), 254},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1358), 594},
+      {-1},
+      {uniname2ctype_offset(str1360), 3},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1365), 372},
+      {uniname2ctype_offset(str1366), 36},
+      {uniname2ctype_offset(str1367), 513},
+      {-1},
+      {uniname2ctype_offset(str1369), 247},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1373), 263},
+      {-1},
+      {uniname2ctype_offset(str1375), 135},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1380), 35},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1384), 56},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1387), 113},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1400), 201},
+      {uniname2ctype_offset(str1401), 385},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1407), 224},
+      {-1},
+      {uniname2ctype_offset(str1409), 38},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1419), 140},
+      {uniname2ctype_offset(str1420), 140},
+      {-1},
+      {uniname2ctype_offset(str1422), 310},
+      {uniname2ctype_offset(str1423), 143},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1426), 39},
+      {-1},
+      {uniname2ctype_offset(str1428), 181},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1434), 143},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1438), 422},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1441), 215},
+      {uniname2ctype_offset(str1442), 523},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1445), 253},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1448), 491},
+      {uniname2ctype_offset(str1449), 122},
+      {uniname2ctype_offset(str1450), 134},
+      {uniname2ctype_offset(str1451), 203},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1454), 145},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1457), 166},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1462), 535},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1466), 241},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1470), 490},
+      {uniname2ctype_offset(str1471), 492},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1475), 414},
+      {uniname2ctype_offset(str1476), 494},
+      {-1},
+      {uniname2ctype_offset(str1478), 436},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1481), 138},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1485), 328},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1489), 33},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1495), 251},
+      {-1},
+      {uniname2ctype_offset(str1497), 484},
+      {uniname2ctype_offset(str1498), 199},
+      {uniname2ctype_offset(str1499), 582},
+      {-1},
+      {uniname2ctype_offset(str1501), 196},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1507), 122},
+      {-1},
+      {uniname2ctype_offset(str1509), 110},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1512), 110},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1517), 581},
+      {-1},
+      {uniname2ctype_offset(str1519), 219},
+      {uniname2ctype_offset(str1520), 228},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1523), 117},
+      {uniname2ctype_offset(str1524), 471},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1529), 120},
+      {-1},
+      {uniname2ctype_offset(str1531), 407},
+      {-1},
+      {uniname2ctype_offset(str1533), 142},
+      {-1},
+      {uniname2ctype_offset(str1535), 219},
+      {uniname2ctype_offset(str1536), 127},
+      {uniname2ctype_offset(str1537), 260},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1542), 453},
+      {-1},
+      {uniname2ctype_offset(str1544), 561},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1547), 168},
+      {uniname2ctype_offset(str1548), 518},
+      {uniname2ctype_offset(str1549), 505},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1552), 117},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1555), 107},
+      {-1},
+      {uniname2ctype_offset(str1557), 85},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1563), 264},
+      {-1},
+      {uniname2ctype_offset(str1565), 315},
+      {-1},
+      {uniname2ctype_offset(str1567), 148},
+      {-1},
+      {uniname2ctype_offset(str1569), 236},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1572), 115},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1580), 131},
+      {-1},
+      {uniname2ctype_offset(str1582), 148},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1587), 529},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1594), 114},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1597), 81},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1602), 97},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1607), 97},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1613), 164},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1617), 488},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1622), 373},
+      {uniname2ctype_offset(str1623), 546},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1629), 39},
+      {-1},
+      {uniname2ctype_offset(str1631), 176},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1635), 72},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1638), 426},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1643), 62},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str1654), 388},
+      {uniname2ctype_offset(str1655), 265},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1662), 129},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1671), 114},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1675), 457},
+      {uniname2ctype_offset(str1676), 176},
+      {uniname2ctype_offset(str1677), 303},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1682), 595},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1686), 93},
+      {uniname2ctype_offset(str1687), 141},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1691), 124},
+      {uniname2ctype_offset(str1692), 121},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1699), 367},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1702), 510},
+      {uniname2ctype_offset(str1703), 533},
+      {uniname2ctype_offset(str1704), 207},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1714), 207},
+      {-1},
+      {uniname2ctype_offset(str1716), 419},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1722), 347},
+      {-1},
+      {uniname2ctype_offset(str1724), 554},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1728), 221},
+      {uniname2ctype_offset(str1729), 430},
+      {uniname2ctype_offset(str1730), 222},
+      {uniname2ctype_offset(str1731), 517},
+      {uniname2ctype_offset(str1732), 238},
+      {uniname2ctype_offset(str1733), 123},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1740), 129},
+      {-1},
+      {uniname2ctype_offset(str1742), 161},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1745), 509},
+      {uniname2ctype_offset(str1746), 390},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1750), 20},
+      {-1},
+      {uniname2ctype_offset(str1752), 502},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1757), 501},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1766), 73},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1769), 362},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1776), 126},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1780), 65},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1788), 137},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1791), 233},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1806), 336},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1810), 599},
+      {uniname2ctype_offset(str1811), 236},
+      {-1},
+      {uniname2ctype_offset(str1813), 255},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1816), 565},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1821), 224},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1825), 258},
+      {uniname2ctype_offset(str1826), 202},
+      {-1},
+      {uniname2ctype_offset(str1828), 387},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1838), 585},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1842), 379},
+      {uniname2ctype_offset(str1843), 134},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1846), 481},
+      {-1},
+      {uniname2ctype_offset(str1848), 109},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1861), 202},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1866), 61},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1871), 479},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1878), 27},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1881), 63},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1891), 150},
+      {uniname2ctype_offset(str1892), 562},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1896), 588},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1904), 440},
+      {uniname2ctype_offset(str1905), 559},
+      {uniname2ctype_offset(str1906), 150},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1911), 343},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1915), 165},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1928), 424},
+      {uniname2ctype_offset(str1929), 417},
+      {uniname2ctype_offset(str1930), 445},
+      {-1},
+      {uniname2ctype_offset(str1932), 400},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1936), 323},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str1947), 194},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1950), 409},
+      {uniname2ctype_offset(str1951), 12},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1958), 109},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1961), 103},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1964), 425},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1967), 477},
+      {uniname2ctype_offset(str1968), 603},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1971), 153},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1985), 393},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1991), 1},
+      {-1},
+      {uniname2ctype_offset(str1993), 360},
+      {uniname2ctype_offset(str1994), 175},
+      {-1},
+      {uniname2ctype_offset(str1996), 42},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2006), 395},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2010), 363},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2014), 322},
+      {-1},
+      {uniname2ctype_offset(str2016), 209},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2023), 32},
+      {uniname2ctype_offset(str2024), 489},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2033), 78},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2043), 17},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2048), 92},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2055), 92},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2058), 240},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2062), 130},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2070), 9},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2073), 330},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2078), 245},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2083), 324},
+      {uniname2ctype_offset(str2084), 154},
+      {uniname2ctype_offset(str2085), 20},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2093), 192},
+      {-1},
+      {uniname2ctype_offset(str2095), 341},
+      {-1},
+      {uniname2ctype_offset(str2097), 214},
+      {uniname2ctype_offset(str2098), 8},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2102), 43},
+      {uniname2ctype_offset(str2103), 162},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2109), 215},
+      {uniname2ctype_offset(str2110), 123},
+      {-1},
+      {uniname2ctype_offset(str2112), 210},
+      {-1},
+      {uniname2ctype_offset(str2114), 159},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2117), 174},
+      {-1},
+      {uniname2ctype_offset(str2119), 216},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2135), 128},
+      {-1},
+      {uniname2ctype_offset(str2137), 172},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2145), 52},
+      {uniname2ctype_offset(str2146), 401},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2149), 221},
+      {uniname2ctype_offset(str2150), 121},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2153), 352},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2161), 233},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2165), 174},
+      {uniname2ctype_offset(str2166), 5},
+      {uniname2ctype_offset(str2167), 112},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2170), 216},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2173), 87},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2181), 139},
+      {uniname2ctype_offset(str2182), 87},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2195), 339},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2199), 159},
+      {-1},
+      {uniname2ctype_offset(str2201), 89},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2204), 369},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2207), 196},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2217), 128},
+      {uniname2ctype_offset(str2218), 526},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2222), 458},
+      {-1},
+      {uniname2ctype_offset(str2224), 438},
+      {uniname2ctype_offset(str2225), 459},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2228), 82},
+      {uniname2ctype_offset(str2229), 35},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2235), 474},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2238), 154},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2244), 428},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2247), 36},
+      {uniname2ctype_offset(str2248), 569},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2252), 240},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2258), 443},
+      {-1},
+      {uniname2ctype_offset(str2260), 235},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2268), 597},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2271), 18},
+      {uniname2ctype_offset(str2272), 254},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2278), 124},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2282), 230},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2285), 38},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2294), 88},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2302), 368},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2305), 205},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2312), 177},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2315), 568},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2321), 370},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2339), 600},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2343), 560},
+      {uniname2ctype_offset(str2344), 82},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2357), 237},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2361), 571},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2364), 309},
+      {uniname2ctype_offset(str2365), 403},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2373), 37},
+      {uniname2ctype_offset(str2374), 377},
+      {uniname2ctype_offset(str2375), 197},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2378), 237},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str2389), 204},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2396), 376},
+      {uniname2ctype_offset(str2397), 406},
+      {uniname2ctype_offset(str2398), 398},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2415), 402},
+      {uniname2ctype_offset(str2416), 366},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str2427), 23},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2433), 427},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2440), 100},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str2451), 29},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2454), 220},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2458), 495},
+      {-1},
+      {uniname2ctype_offset(str2460), 246},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2470), 433},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2475), 142},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2479), 346},
+      {uniname2ctype_offset(str2480), 50},
+      {uniname2ctype_offset(str2481), 371},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2506), 511},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2513), 592},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2519), 466},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2529), 165},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2534), 325},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2540), 226},
+      {-1},
+      {uniname2ctype_offset(str2542), 125},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2548), 118},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2552), 462},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2561), 435},
+      {uniname2ctype_offset(str2562), 251},
+      {-1},
+      {uniname2ctype_offset(str2564), 357},
+      {-1},
+      {uniname2ctype_offset(str2566), 185},
+      {uniname2ctype_offset(str2567), 304},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2570), 476},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2575), 185},
+      {uniname2ctype_offset(str2576), 99},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2579), 133},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2586), 199},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2595), 327},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2603), 198},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2606), 359},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2609), 55},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2614), 538},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2624), 226},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2631), 107},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2634), 266},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2643), 437},
+      {uniname2ctype_offset(str2644), 576},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2648), 243},
+      {-1},
+      {uniname2ctype_offset(str2650), 78},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2653), 183},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2656), 353},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2663), 182},
+      {-1},
+      {uniname2ctype_offset(str2665), 83},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2668), 94},
+      {-1},
+      {uniname2ctype_offset(str2670), 593},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2673), 84},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2676), 83},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2688), 139},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2691), 84},
+      {uniname2ctype_offset(str2692), 211},
+      {-1},
+      {uniname2ctype_offset(str2694), 48},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2698), 119},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2701), 418},
+      {uniname2ctype_offset(str2702), 89},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2721), 198},
+      {-1},
+      {uniname2ctype_offset(str2723), 4},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2732), 130},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2747), 54},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2750), 534},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2760), 152},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2764), 241},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2768), 90},
+      {uniname2ctype_offset(str2769), 468},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2777), 28},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2780), 227},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2793), 34},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2816), 296},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2821), 378},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2834), 349},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2841), 222},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2848), 253},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2852), 291},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2855), 190},
+      {uniname2ctype_offset(str2856), 66},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2859), 412},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2862), 211},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2867), 295},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2871), 243},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2883), 242},
+      {-1},
+      {uniname2ctype_offset(str2885), 147},
+      {uniname2ctype_offset(str2886), 133},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2904), 449},
+      {uniname2ctype_offset(str2905), 262},
+      {uniname2ctype_offset(str2906), 575},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2909), 549},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2912), 244},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2926), 51},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2938), 242},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2941), 348},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2963), 225},
+      {uniname2ctype_offset(str2964), 503},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2967), 43},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2980), 195},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2984), 547},
+      {-1},
+      {uniname2ctype_offset(str2986), 118},
+      {uniname2ctype_offset(str2987), 54},
+      {uniname2ctype_offset(str2988), 456},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2993), 234},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3000), 16},
+      {uniname2ctype_offset(str3001), 180},
+      {uniname2ctype_offset(str3002), 64},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3005), 460},
+      {uniname2ctype_offset(str3006), 555},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3012), 80},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3028), 250},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3045), 577},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3055), 454},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3089), 146},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3098), 580},
+      {uniname2ctype_offset(str3099), 463},
+      {uniname2ctype_offset(str3100), 103},
+      {uniname2ctype_offset(str3101), 223},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3107), 299},
+      {-1},
+      {uniname2ctype_offset(str3109), 301},
+      {-1},
+      {uniname2ctype_offset(str3111), 191},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3125), 191},
+      {uniname2ctype_offset(str3126), 99},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3134), 223},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3158), 314},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3165), 439},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3169), 47},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3176), 381},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3180), 317},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3185), 126},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3194), 204},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str3205), 227},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3209), 62},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3215), 180},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3218), 201},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3237), 375},
+      {-1},
+      {uniname2ctype_offset(str3239), 294},
+      {uniname2ctype_offset(str3240), 290},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3248), 213},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3254), 190},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3266), 421},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str3286), 235},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str3297), 297},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3303), 293},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3309), 178},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3317), 249},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str3328), 63},
+      {uniname2ctype_offset(str3329), 587},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3348), 392},
+      {uniname2ctype_offset(str3349), 423},
+      {-1},
+      {uniname2ctype_offset(str3351), 96},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3360), 234},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3363), 96},
+      {-1},
+      {uniname2ctype_offset(str3365), 578},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3433), 205},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3436), 213},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3439), 49},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3442), 464},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3458), 10},
+      {-1},
+      {uniname2ctype_offset(str3460), 589},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3511), 396},
+      {uniname2ctype_offset(str3512), 487},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3517), 179},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3531), 153},
+      {uniname2ctype_offset(str3532), 550},
+      {uniname2ctype_offset(str3533), 57},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3550), 41},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3558), 59},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3613), 214},
+      {uniname2ctype_offset(str3614), 220},
+      {-1},
+      {uniname2ctype_offset(str3616), 45},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3628), 71},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str3648), 450},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3664), 177},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3703), 132},
+      {-1},
+      {uniname2ctype_offset(str3705), 306},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3714), 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}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3766), 452},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3791), 65},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3805), 250},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3819), 162},
+      {-1},
+      {uniname2ctype_offset(str3821), 292},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3842), 182},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3845), 248},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3891), 30},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3924), 405},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3942), 100},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3976), 570},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3995), 147},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str4087), 415},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4109), 119},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4137), 244},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4162), 544},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4175), 545},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4203), 80},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4254), 116},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4276), 116},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4291), 302},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str4321), 75},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str4360), 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},
+      {uniname2ctype_offset(str4397), 386},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4405), 298},
+      {uniname2ctype_offset(str4406), 300},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4460), 90},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4485), 179},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4528), 46},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str4674), 601},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4683), 451},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4772), 394},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4948), 590},
+#endif /* USE_UNICODE_PROPERTIES */
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#ifndef USE_UNICODE_PROPERTIES
+      {uniname2ctype_offset(str6), 12},
+      {uniname2ctype_offset(str7), 7},
+      {uniname2ctype_offset(str8), 15},
+      {uniname2ctype_offset(str9), 1},
+      {uniname2ctype_offset(str10), 13},
+      {uniname2ctype_offset(str11), 11},
+      {uniname2ctype_offset(str12), 10},
+      {uniname2ctype_offset(str13), 14},
+      {uniname2ctype_offset(str14), 3},
+      {uniname2ctype_offset(str15), 9},
+      {uniname2ctype_offset(str16), 8},
+      {uniname2ctype_offset(str17), 6},
+      {uniname2ctype_offset(str18), 5},
+      {uniname2ctype_offset(str19), 4},
+      {uniname2ctype_offset(str20), 2}
+#else /* USE_UNICODE_PROPERTIES */
+      {uniname2ctype_offset(str4955), 155},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4986), 413},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str5114), 225},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str5608), 155},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str6098), 602}
+#endif /* USE_UNICODE_PROPERTIES */
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register unsigned int key = uniname2ctype_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          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 == 12 && \
+      ONIG_UNICODE_VERSION_MINOR == 1 && \
+      ONIG_UNICODE_VERSION_TEENY == 0 && \
+      1)
+# error ONIG_UNICODE_VERSION_STRING mismatch
+#endif
+#define ONIG_UNICODE_VERSION_STRING "12.1.0"
+#define ONIG_UNICODE_VERSION_MAJOR 12
+#define ONIG_UNICODE_VERSION_MINOR 1
+#define ONIG_UNICODE_VERSION_TEENY 0
+#if defined ONIG_UNICODE_EMOJI_VERSION_STRING && !( \
+      ONIG_UNICODE_EMOJI_VERSION_MAJOR == 12 && \
+      ONIG_UNICODE_EMOJI_VERSION_MINOR == 0 && \
+      1)
+# error ONIG_UNICODE_EMOJI_VERSION_STRING mismatch
+#endif
+#define ONIG_UNICODE_EMOJI_VERSION_STRING "12.0"
+#define ONIG_UNICODE_EMOJI_VERSION_MAJOR 12
+#define ONIG_UNICODE_EMOJI_VERSION_MINOR 0
diff --git a/enc/unicode/case-folding.rb b/enc/unicode/case-folding.rb
new file mode 100755
index 0000000000..362d6ebfd9
--- /dev/null
+++ b/enc/unicode/case-folding.rb
@@ -0,0 +1,418 @@
+#!/usr/bin/ruby
+require 'stringio'
+
+# Usage (for case folding only):
+#   $ 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(", ")
+    end
+
+    def print_table_1(dest, type, mapping_data, 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")
+      end
+      data
+    end
+
+    def print_table(dest, type, mapping_data, 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))
+      end
+      dest.print("};\n\n")
+      ret
+    end
+  end
+
+  include Util
+
+  attr_reader :fold, :fold_locale, :unfold, :unfold_locale, :version
+
+  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]
+      next unless res = pattern.match(line)
+      ch_from = res[1].to_i(16)
+
+      if res[2] == 'T'
+        # Turkic case folding
+        turkic << ch_from
+        next
+      end
+
+      # store folding data
+      ch_to = res[3..6].inject([]) do |a, i|
+        break a unless i
+        a << i.to_i(16)
+      end
+      fold[ch_from] = ch_to
+
+      # store unfolding data
+      i = ch_to.length - 1
+      (unfold[i][ch_to] ||= []) << ch_from
+    end
+
+    # move locale dependent data to (un)fold_locale
+    @fold_locale = fold_locale = {}
+    @unfold_locale = unfold_locale = [{}, {}]
+    for ch_from in turkic
+      key = fold[ch_from]
+      i = key.length - 1
+      unfold_locale[i][i == 0 ? key[0] : key] = unfold[i].delete(key)
+      fold_locale[ch_from] = fold.delete(ch_from)
+    end
+    self
+  end
+
+  def range_check(code)
+    "#{code} <= MAX_CODE_VALUE && #{code} >= MIN_CODE_VALUE"
+  end
+
+  def lookup_hash(key, type, data)
+    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"
+    argname = arity > 1 ? "codes" : "code"
+    argdecl = "const OnigCodePoint #{arity > 1 ? "*": ""}#{argname}"
+    n = 7
+    m = (1 << n) - 1
+    min, max = data.map {|c, *|c}.flatten.minmax
+    src = IO.popen(gperf, "r+") {|f|
+      f << "short\n%%\n"
+      data.each_with_index {|(k, _), i|
+        k = Array(k)
+        ks = k.map {|j| [(j >> n*2) & m, (j >> n) & m, (j) & m]}.flatten.map {|c| "\\x%.2x" % c}.join("")
+        f.printf "\"%s\", ::::/*%s*/ %d\n", ks, k.map {|c| "0x%.4x" % c}.join(","), i
+      }
+      f << "%%\n"
+      f.close_write
+      f.read
+    }
+    src.sub!(/^(#{hash})\s*\(.*?\).*?\n\{\n(.*)^\}/m) {
+      name = $1
+      body = $2
+      body.gsub!(/\(unsigned char\)str\[(\d+)\]/, "bits_#{arity > 1 ? 'at' : 'of'}(#{argname}, \\1)")
+      "#{name}(#{argdecl})\n{\n#{body}}"
+    }
+    src.sub!(/const short *\*\n^(#{lookup})\s*\(.*?\).*?\n\{\n(.*)^\}/m) {
+      name = $1
+      body = $2
+      body.sub!(/\benum\s+\{(\n[ \t]+)/, "\\&MIN_CODE_VALUE = 0x#{min.to_s(16)},\\1""MAX_CODE_VALUE = 0x#{max.to_s(16)},\\1")
+      body.gsub!(/(#{hash})\s*\(.*?\)/, "\\1(#{argname})")
+      body.gsub!(/\{"",-1}/, "-1")
+      body.gsub!(/\{"(?:[^"]|\\")+", *::::(.*)\}/, '\1')
+      body.sub!(/(\s+if\s)\(len\b.*\)/) do
+        "#$1(" <<
+          (arity > 1 ? (0...arity).map {|i| range_check("#{argname}[#{i}]")}.join(" &&\n      ") : range_check(argname)) <<
+          ")"
+      end
+      v = nil
+      body.sub!(/(if\s*\(.*MAX_HASH_VALUE.*\)\n([ \t]*))\{(.*?)\n\2\}/m) {
+        pre = $1
+        indent = $2
+        s = $3
+        s.sub!(/const char *\* *(\w+)( *= *wordlist\[\w+\]).\w+/, 'short \1 = wordlist[key]')
+        v = $1
+        s.sub!(/\bif *\(.*\)/, "if (#{v} >= 0 && code#{arity}_equal(#{argname}, #{key}_Table[#{v}].from))")
+        "#{pre}{#{s}\n#{indent}}"
+      }
+      body.sub!(/\b(return\s+&)([^;]+);/, '\1'"#{key}_Table[#{v}].to;")
+      "static const #{type} *\n#{name}(#{argdecl})\n{\n#{body}}"
+    }
+    src
+  end
+
+  def display(dest, mapping_data)
+    # 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)
+    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])
+    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])
+    dest.print lookup_hash(name, "CodePointList2", data)
+
+    # CaseUnfold_13
+    name = "CaseUnfold_13"
+    data = print_table(dest, name, mapping_data, 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)
+    new.load(*args)
+  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 = []
+    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
+            flags += '|IT'   # was unpredicted case 1
+          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'
+  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 |file|
+      file.print(s)
+    end
+  else
+    STDOUT.print(s)
+  end
+end
diff --git a/enc/unicode/name2ctype.h b/enc/unicode/name2ctype.h
deleted file mode 100644
index a45ea59a4b..0000000000
--- a/enc/unicode/name2ctype.h
+++ /dev/null
@@ -1,23866 +0,0 @@
-/* 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
-
-#ifdef USE_UNICODE_PROPERTIES
-#ifdef USE_UNICODE_PROPERTIES
-/* 'Any': - */
-static const OnigCodePoint CR_Any[] = {
-	1,
-	0x0000, 0x10ffff,
-}; /* CR_Any */
-
-/* 'Assigned': - */
-static const OnigCodePoint CR_Assigned[] = {
-	501,
-	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,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	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,
-	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[] = {
-	20,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-	0x00ad, 0x00ad,
-	0x0600, 0x0603,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x17b4, 0x17b5,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x206a, 0x206f,
-	0xd800, 0xf8ff,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xf0000, 0xffffd,
-	0x100000, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-static const OnigCodePoint CR_Cc[] = {
-	2,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-}; /* CR_Cc */
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
-	15,
-	0x00ad, 0x00ad,
-	0x0600, 0x0603,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x17b4, 0x17b5,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x206a, 0x206f,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
-	501,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x0604, 0x0605,
-	0x061c, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 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,
-	0x0af0, 0x0af0,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	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,
-	0x0ede, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10cf,
-	0x10fd, 0x10ff,
-	0x1249, 0x1249,
-	0x124e, 0x124f,
-	0x1257, 0x1257,
-	0x1259, 0x1259,
-	0x125e, 0x125f,
-	0x1289, 0x1289,
-	0x128e, 0x128f,
-	0x12b1, 0x12b1,
-	0x12b6, 0x12b7,
-	0x12bf, 0x12bf,
-	0x12c1, 0x12c1,
-	0x12c6, 0x12c7,
-	0x12d7, 0x12d7,
-	0x1311, 0x1311,
-	0x1316, 0x1317,
-	0x135b, 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,
-	0x1bab, 0x1bad,
-	0x1bba, 0x1bbf,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1ccf,
-	0x1cf3, 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,
-	0x27cb, 0x27cb,
-	0x27cd, 0x27cd,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf2, 0x2cf8,
-	0x2d26, 0x2d2f,
-	0x2d66, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e32, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcc, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa674, 0xa67b,
-	0xa698, 0xa69f,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa792, 0xa79f,
-	0xa7aa, 0xa7f9,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaae0, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xd7ff,
-	0xfa2e, 0xfa2f,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	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, 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, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 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, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16a, 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, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f600, 0x1f600,
-	0x1f611, 0x1f611,
-	0x1f615, 0x1f615,
-	0x1f617, 0x1f617,
-	0x1f619, 0x1f619,
-	0x1f61b, 0x1f61b,
-	0x1f61f, 0x1f61f,
-	0x1f626, 0x1f627,
-	0x1f62c, 0x1f62c,
-	0x1f62e, 0x1f62f,
-	0x1f634, 0x1f634,
-	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[] = {
-	435,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3006,
-	0x3031, 0x3035,
-	0x303b, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6e5,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
-	609,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00df, 0x00f6,
-	0x00f8, 0x00ff,
-	0x0101, 0x0101,
-	0x0103, 0x0103,
-	0x0105, 0x0105,
-	0x0107, 0x0107,
-	0x0109, 0x0109,
-	0x010b, 0x010b,
-	0x010d, 0x010d,
-	0x010f, 0x010f,
-	0x0111, 0x0111,
-	0x0113, 0x0113,
-	0x0115, 0x0115,
-	0x0117, 0x0117,
-	0x0119, 0x0119,
-	0x011b, 0x011b,
-	0x011d, 0x011d,
-	0x011f, 0x011f,
-	0x0121, 0x0121,
-	0x0123, 0x0123,
-	0x0125, 0x0125,
-	0x0127, 0x0127,
-	0x0129, 0x0129,
-	0x012b, 0x012b,
-	0x012d, 0x012d,
-	0x012f, 0x012f,
-	0x0131, 0x0131,
-	0x0133, 0x0133,
-	0x0135, 0x0135,
-	0x0137, 0x0138,
-	0x013a, 0x013a,
-	0x013c, 0x013c,
-	0x013e, 0x013e,
-	0x0140, 0x0140,
-	0x0142, 0x0142,
-	0x0144, 0x0144,
-	0x0146, 0x0146,
-	0x0148, 0x0149,
-	0x014b, 0x014b,
-	0x014d, 0x014d,
-	0x014f, 0x014f,
-	0x0151, 0x0151,
-	0x0153, 0x0153,
-	0x0155, 0x0155,
-	0x0157, 0x0157,
-	0x0159, 0x0159,
-	0x015b, 0x015b,
-	0x015d, 0x015d,
-	0x015f, 0x015f,
-	0x0161, 0x0161,
-	0x0163, 0x0163,
-	0x0165, 0x0165,
-	0x0167, 0x0167,
-	0x0169, 0x0169,
-	0x016b, 0x016b,
-	0x016d, 0x016d,
-	0x016f, 0x016f,
-	0x0171, 0x0171,
-	0x0173, 0x0173,
-	0x0175, 0x0175,
-	0x0177, 0x0177,
-	0x017a, 0x017a,
-	0x017c, 0x017c,
-	0x017e, 0x0180,
-	0x0183, 0x0183,
-	0x0185, 0x0185,
-	0x0188, 0x0188,
-	0x018c, 0x018d,
-	0x0192, 0x0192,
-	0x0195, 0x0195,
-	0x0199, 0x019b,
-	0x019e, 0x019e,
-	0x01a1, 0x01a1,
-	0x01a3, 0x01a3,
-	0x01a5, 0x01a5,
-	0x01a8, 0x01a8,
-	0x01aa, 0x01ab,
-	0x01ad, 0x01ad,
-	0x01b0, 0x01b0,
-	0x01b4, 0x01b4,
-	0x01b6, 0x01b6,
-	0x01b9, 0x01ba,
-	0x01bd, 0x01bf,
-	0x01c6, 0x01c6,
-	0x01c9, 0x01c9,
-	0x01cc, 0x01cc,
-	0x01ce, 0x01ce,
-	0x01d0, 0x01d0,
-	0x01d2, 0x01d2,
-	0x01d4, 0x01d4,
-	0x01d6, 0x01d6,
-	0x01d8, 0x01d8,
-	0x01da, 0x01da,
-	0x01dc, 0x01dd,
-	0x01df, 0x01df,
-	0x01e1, 0x01e1,
-	0x01e3, 0x01e3,
-	0x01e5, 0x01e5,
-	0x01e7, 0x01e7,
-	0x01e9, 0x01e9,
-	0x01eb, 0x01eb,
-	0x01ed, 0x01ed,
-	0x01ef, 0x01f0,
-	0x01f3, 0x01f3,
-	0x01f5, 0x01f5,
-	0x01f9, 0x01f9,
-	0x01fb, 0x01fb,
-	0x01fd, 0x01fd,
-	0x01ff, 0x01ff,
-	0x0201, 0x0201,
-	0x0203, 0x0203,
-	0x0205, 0x0205,
-	0x0207, 0x0207,
-	0x0209, 0x0209,
-	0x020b, 0x020b,
-	0x020d, 0x020d,
-	0x020f, 0x020f,
-	0x0211, 0x0211,
-	0x0213, 0x0213,
-	0x0215, 0x0215,
-	0x0217, 0x0217,
-	0x0219, 0x0219,
-	0x021b, 0x021b,
-	0x021d, 0x021d,
-	0x021f, 0x021f,
-	0x0221, 0x0221,
-	0x0223, 0x0223,
-	0x0225, 0x0225,
-	0x0227, 0x0227,
-	0x0229, 0x0229,
-	0x022b, 0x022b,
-	0x022d, 0x022d,
-	0x022f, 0x022f,
-	0x0231, 0x0231,
-	0x0233, 0x0239,
-	0x023c, 0x023c,
-	0x023f, 0x0240,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0293,
-	0x0295, 0x02af,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	0x0390, 0x0390,
-	0x03ac, 0x03ce,
-	0x03d0, 0x03d1,
-	0x03d5, 0x03d7,
-	0x03d9, 0x03d9,
-	0x03db, 0x03db,
-	0x03dd, 0x03dd,
-	0x03df, 0x03df,
-	0x03e1, 0x03e1,
-	0x03e3, 0x03e3,
-	0x03e5, 0x03e5,
-	0x03e7, 0x03e7,
-	0x03e9, 0x03e9,
-	0x03eb, 0x03eb,
-	0x03ed, 0x03ed,
-	0x03ef, 0x03f3,
-	0x03f5, 0x03f5,
-	0x03f8, 0x03f8,
-	0x03fb, 0x03fc,
-	0x0430, 0x045f,
-	0x0461, 0x0461,
-	0x0463, 0x0463,
-	0x0465, 0x0465,
-	0x0467, 0x0467,
-	0x0469, 0x0469,
-	0x046b, 0x046b,
-	0x046d, 0x046d,
-	0x046f, 0x046f,
-	0x0471, 0x0471,
-	0x0473, 0x0473,
-	0x0475, 0x0475,
-	0x0477, 0x0477,
-	0x0479, 0x0479,
-	0x047b, 0x047b,
-	0x047d, 0x047d,
-	0x047f, 0x047f,
-	0x0481, 0x0481,
-	0x048b, 0x048b,
-	0x048d, 0x048d,
-	0x048f, 0x048f,
-	0x0491, 0x0491,
-	0x0493, 0x0493,
-	0x0495, 0x0495,
-	0x0497, 0x0497,
-	0x0499, 0x0499,
-	0x049b, 0x049b,
-	0x049d, 0x049d,
-	0x049f, 0x049f,
-	0x04a1, 0x04a1,
-	0x04a3, 0x04a3,
-	0x04a5, 0x04a5,
-	0x04a7, 0x04a7,
-	0x04a9, 0x04a9,
-	0x04ab, 0x04ab,
-	0x04ad, 0x04ad,
-	0x04af, 0x04af,
-	0x04b1, 0x04b1,
-	0x04b3, 0x04b3,
-	0x04b5, 0x04b5,
-	0x04b7, 0x04b7,
-	0x04b9, 0x04b9,
-	0x04bb, 0x04bb,
-	0x04bd, 0x04bd,
-	0x04bf, 0x04bf,
-	0x04c2, 0x04c2,
-	0x04c4, 0x04c4,
-	0x04c6, 0x04c6,
-	0x04c8, 0x04c8,
-	0x04ca, 0x04ca,
-	0x04cc, 0x04cc,
-	0x04ce, 0x04cf,
-	0x04d1, 0x04d1,
-	0x04d3, 0x04d3,
-	0x04d5, 0x04d5,
-	0x04d7, 0x04d7,
-	0x04d9, 0x04d9,
-	0x04db, 0x04db,
-	0x04dd, 0x04dd,
-	0x04df, 0x04df,
-	0x04e1, 0x04e1,
-	0x04e3, 0x04e3,
-	0x04e5, 0x04e5,
-	0x04e7, 0x04e7,
-	0x04e9, 0x04e9,
-	0x04eb, 0x04eb,
-	0x04ed, 0x04ed,
-	0x04ef, 0x04ef,
-	0x04f1, 0x04f1,
-	0x04f3, 0x04f3,
-	0x04f5, 0x04f5,
-	0x04f7, 0x04f7,
-	0x04f9, 0x04f9,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0561, 0x0587,
-	0x1d00, 0x1d2b,
-	0x1d62, 0x1d77,
-	0x1d79, 0x1d9a,
-	0x1e01, 0x1e01,
-	0x1e03, 0x1e03,
-	0x1e05, 0x1e05,
-	0x1e07, 0x1e07,
-	0x1e09, 0x1e09,
-	0x1e0b, 0x1e0b,
-	0x1e0d, 0x1e0d,
-	0x1e0f, 0x1e0f,
-	0x1e11, 0x1e11,
-	0x1e13, 0x1e13,
-	0x1e15, 0x1e15,
-	0x1e17, 0x1e17,
-	0x1e19, 0x1e19,
-	0x1e1b, 0x1e1b,
-	0x1e1d, 0x1e1d,
-	0x1e1f, 0x1e1f,
-	0x1e21, 0x1e21,
-	0x1e23, 0x1e23,
-	0x1e25, 0x1e25,
-	0x1e27, 0x1e27,
-	0x1e29, 0x1e29,
-	0x1e2b, 0x1e2b,
-	0x1e2d, 0x1e2d,
-	0x1e2f, 0x1e2f,
-	0x1e31, 0x1e31,
-	0x1e33, 0x1e33,
-	0x1e35, 0x1e35,
-	0x1e37, 0x1e37,
-	0x1e39, 0x1e39,
-	0x1e3b, 0x1e3b,
-	0x1e3d, 0x1e3d,
-	0x1e3f, 0x1e3f,
-	0x1e41, 0x1e41,
-	0x1e43, 0x1e43,
-	0x1e45, 0x1e45,
-	0x1e47, 0x1e47,
-	0x1e49, 0x1e49,
-	0x1e4b, 0x1e4b,
-	0x1e4d, 0x1e4d,
-	0x1e4f, 0x1e4f,
-	0x1e51, 0x1e51,
-	0x1e53, 0x1e53,
-	0x1e55, 0x1e55,
-	0x1e57, 0x1e57,
-	0x1e59, 0x1e59,
-	0x1e5b, 0x1e5b,
-	0x1e5d, 0x1e5d,
-	0x1e5f, 0x1e5f,
-	0x1e61, 0x1e61,
-	0x1e63, 0x1e63,
-	0x1e65, 0x1e65,
-	0x1e67, 0x1e67,
-	0x1e69, 0x1e69,
-	0x1e6b, 0x1e6b,
-	0x1e6d, 0x1e6d,
-	0x1e6f, 0x1e6f,
-	0x1e71, 0x1e71,
-	0x1e73, 0x1e73,
-	0x1e75, 0x1e75,
-	0x1e77, 0x1e77,
-	0x1e79, 0x1e79,
-	0x1e7b, 0x1e7b,
-	0x1e7d, 0x1e7d,
-	0x1e7f, 0x1e7f,
-	0x1e81, 0x1e81,
-	0x1e83, 0x1e83,
-	0x1e85, 0x1e85,
-	0x1e87, 0x1e87,
-	0x1e89, 0x1e89,
-	0x1e8b, 0x1e8b,
-	0x1e8d, 0x1e8d,
-	0x1e8f, 0x1e8f,
-	0x1e91, 0x1e91,
-	0x1e93, 0x1e93,
-	0x1e95, 0x1e9d,
-	0x1e9f, 0x1e9f,
-	0x1ea1, 0x1ea1,
-	0x1ea3, 0x1ea3,
-	0x1ea5, 0x1ea5,
-	0x1ea7, 0x1ea7,
-	0x1ea9, 0x1ea9,
-	0x1eab, 0x1eab,
-	0x1ead, 0x1ead,
-	0x1eaf, 0x1eaf,
-	0x1eb1, 0x1eb1,
-	0x1eb3, 0x1eb3,
-	0x1eb5, 0x1eb5,
-	0x1eb7, 0x1eb7,
-	0x1eb9, 0x1eb9,
-	0x1ebb, 0x1ebb,
-	0x1ebd, 0x1ebd,
-	0x1ebf, 0x1ebf,
-	0x1ec1, 0x1ec1,
-	0x1ec3, 0x1ec3,
-	0x1ec5, 0x1ec5,
-	0x1ec7, 0x1ec7,
-	0x1ec9, 0x1ec9,
-	0x1ecb, 0x1ecb,
-	0x1ecd, 0x1ecd,
-	0x1ecf, 0x1ecf,
-	0x1ed1, 0x1ed1,
-	0x1ed3, 0x1ed3,
-	0x1ed5, 0x1ed5,
-	0x1ed7, 0x1ed7,
-	0x1ed9, 0x1ed9,
-	0x1edb, 0x1edb,
-	0x1edd, 0x1edd,
-	0x1edf, 0x1edf,
-	0x1ee1, 0x1ee1,
-	0x1ee3, 0x1ee3,
-	0x1ee5, 0x1ee5,
-	0x1ee7, 0x1ee7,
-	0x1ee9, 0x1ee9,
-	0x1eeb, 0x1eeb,
-	0x1eed, 0x1eed,
-	0x1eef, 0x1eef,
-	0x1ef1, 0x1ef1,
-	0x1ef3, 0x1ef3,
-	0x1ef5, 0x1ef5,
-	0x1ef7, 0x1ef7,
-	0x1ef9, 0x1ef9,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 0x1f07,
-	0x1f10, 0x1f15,
-	0x1f20, 0x1f27,
-	0x1f30, 0x1f37,
-	0x1f40, 0x1f45,
-	0x1f50, 0x1f57,
-	0x1f60, 0x1f67,
-	0x1f70, 0x1f7d,
-	0x1f80, 0x1f87,
-	0x1f90, 0x1f97,
-	0x1fa0, 0x1fa7,
-	0x1fb0, 0x1fb4,
-	0x1fb6, 0x1fb7,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fc7,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fd7,
-	0x1fe0, 0x1fe7,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ff7,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2184, 0x2184,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7c,
-	0x2c81, 0x2c81,
-	0x2c83, 0x2c83,
-	0x2c85, 0x2c85,
-	0x2c87, 0x2c87,
-	0x2c89, 0x2c89,
-	0x2c8b, 0x2c8b,
-	0x2c8d, 0x2c8d,
-	0x2c8f, 0x2c8f,
-	0x2c91, 0x2c91,
-	0x2c93, 0x2c93,
-	0x2c95, 0x2c95,
-	0x2c97, 0x2c97,
-	0x2c99, 0x2c99,
-	0x2c9b, 0x2c9b,
-	0x2c9d, 0x2c9d,
-	0x2c9f, 0x2c9f,
-	0x2ca1, 0x2ca1,
-	0x2ca3, 0x2ca3,
-	0x2ca5, 0x2ca5,
-	0x2ca7, 0x2ca7,
-	0x2ca9, 0x2ca9,
-	0x2cab, 0x2cab,
-	0x2cad, 0x2cad,
-	0x2caf, 0x2caf,
-	0x2cb1, 0x2cb1,
-	0x2cb3, 0x2cb3,
-	0x2cb5, 0x2cb5,
-	0x2cb7, 0x2cb7,
-	0x2cb9, 0x2cb9,
-	0x2cbb, 0x2cbb,
-	0x2cbd, 0x2cbd,
-	0x2cbf, 0x2cbf,
-	0x2cc1, 0x2cc1,
-	0x2cc3, 0x2cc3,
-	0x2cc5, 0x2cc5,
-	0x2cc7, 0x2cc7,
-	0x2cc9, 0x2cc9,
-	0x2ccb, 0x2ccb,
-	0x2ccd, 0x2ccd,
-	0x2ccf, 0x2ccf,
-	0x2cd1, 0x2cd1,
-	0x2cd3, 0x2cd3,
-	0x2cd5, 0x2cd5,
-	0x2cd7, 0x2cd7,
-	0x2cd9, 0x2cd9,
-	0x2cdb, 0x2cdb,
-	0x2cdd, 0x2cdd,
-	0x2cdf, 0x2cdf,
-	0x2ce1, 0x2ce1,
-	0x2ce3, 0x2ce4,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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[] = {
-	49,
-	0x02b0, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0374, 0x0374,
-	0x037a, 0x037a,
-	0x0559, 0x0559,
-	0x0640, 0x0640,
-	0x06e5, 0x06e6,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0971, 0x0971,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x10fc, 0x10fc,
-	0x17d7, 0x17d7,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c78, 0x1c7d,
-	0x1d2c, 0x1d61,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2c7d, 0x2c7d,
-	0x2d6f, 0x2d6f,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa67f, 0xa67f,
-	0xa717, 0xa71f,
-	0xa770, 0xa770,
-	0xa788, 0xa788,
-	0xa9cf, 0xa9cf,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
-	323,
-	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,
-	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, 0x0edd,
-	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,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17dc, 0x17dc,
-	0x1820, 0x1842,
-	0x1844, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c77,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x2135, 0x2138,
-	0x2d30, 0x2d65,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3006, 0x3006,
-	0x303c, 0x303c,
-	0x3041, 0x3096,
-	0x309f, 0x309f,
-	0x30a1, 0x30fa,
-	0x30ff, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa014,
-	0xa016, 0xa48c,
-	0xa4d0, 0xa4f7,
-	0xa500, 0xa60b,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa66e, 0xa66e,
-	0xa6a0, 0xa6e5,
-	0xa7fb, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa6f,
-	0xaa71, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadc,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff66, 0xff6f,
-	0xff71, 0xff9d,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10450, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x1b000, 0x1b001,
-	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[] = {
-	603,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1fb8, 0x1fbb,
-	0x1fc8, 0x1fcb,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffb,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210b, 0x210d,
-	0x2110, 0x2112,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x2130, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2183, 0x2183,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	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[] = {
-	193,
-	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,
-	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,
-	0x17b6, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b00, 0x1b04,
-	0x1b34, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1baa,
-	0x1be6, 0x1bf3,
-	0x1c24, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf2, 0x1cf2,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa67c, 0xa67d,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa953,
-	0xa980, 0xa983,
-	0xa9b3, 0xa9c0,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xabe3, 0xabea,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11000, 0x11002,
-	0x11038, 0x11046,
-	0x11080, 0x11082,
-	0x110b0, 0x110ba,
-	0x1d165, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
-	113,
-	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,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1c24, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1ce1, 0x1ce1,
-	0x1cf2, 0x1cf2,
-	0xa823, 0xa824,
-	0xa827, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa952, 0xa953,
-	0xa983, 0xa983,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9c0,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa4d, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xabe3, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabea,
-	0xabec, 0xabec,
-	0x11000, 0x11000,
-	0x11002, 0x11002,
-	0x11082, 0x11082,
-	0x110b0, 0x110b2,
-	0x110b7, 0x110b8,
-	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[] = {
-	203,
-	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,
-	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,
-	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,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
-	83,
-	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,
-	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,
-	0x12400, 0x12462,
-	0x1d360, 0x1d371,
-	0x1d7ce, 0x1d7ff,
-	0x1f100, 0x1f10a,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-static const OnigCodePoint CR_Nd[] = {
-	38,
-	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,
-	0x1d7ce, 0x1d7ff,
-}; /* CR_Nd */
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
-	12,
-	0x16ee, 0x16f0,
-	0x2160, 0x2182,
-	0x2185, 0x2188,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0xa6e6, 0xa6ef,
-	0x10140, 0x10174,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x12400, 0x12462,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
-	41,
-	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,
-	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 */
-static const OnigCodePoint CR_P[] = {
-	133,
-	0x0021, 0x0023,
-	0x0025, 0x002a,
-	0x002c, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005b, 0x005d,
-	0x005f, 0x005f,
-	0x007b, 0x007b,
-	0x007d, 0x007d,
-	0x00a1, 0x00a1,
-	0x00ab, 0x00ab,
-	0x00b7, 0x00b7,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x058a,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f3a, 0x0f3d,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1361, 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,
-	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, 0x2e31,
-	0x3001, 0x3003,
-	0x3008, 0x3011,
-	0x3014, 0x301f,
-	0x3030, 0x3030,
-	0x303d, 0x303d,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xabeb, 0xabeb,
-	0xfd3e, 0xfd3f,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe61,
-	0xfe63, 0xfe63,
-	0xfe68, 0xfe68,
-	0xfe6a, 0xfe6b,
-	0xff01, 0xff03,
-	0xff05, 0xff0a,
-	0xff0c, 0xff0f,
-	0xff1a, 0xff1b,
-	0xff1f, 0xff20,
-	0xff3b, 0xff3d,
-	0xff3f, 0xff3f,
-	0xff5b, 0xff5b,
-	0xff5d, 0xff5d,
-	0xff5f, 0xff65,
-	0x10100, 0x10101,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10b39, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x12470, 0x12473,
-}; /* CR_P */
-
-/* 'Pc': General Category */
-static const OnigCodePoint CR_Pc[] = {
-	6,
-	0x005f, 0x005f,
-	0x203f, 0x2040,
-	0x2054, 0x2054,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xff3f, 0xff3f,
-}; /* CR_Pc */
-
-/* 'Pd': General Category */
-static const OnigCodePoint CR_Pd[] = {
-	15,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
-	70,
-	0x0029, 0x0029,
-	0x005d, 0x005d,
-	0x007d, 0x007d,
-	0x0f3b, 0x0f3b,
-	0x0f3d, 0x0f3d,
-	0x169c, 0x169c,
-	0x2046, 0x2046,
-	0x207e, 0x207e,
-	0x208e, 0x208e,
-	0x232a, 0x232a,
-	0x2769, 0x2769,
-	0x276b, 0x276b,
-	0x276d, 0x276d,
-	0x276f, 0x276f,
-	0x2771, 0x2771,
-	0x2773, 0x2773,
-	0x2775, 0x2775,
-	0x27c6, 0x27c6,
-	0x27e7, 0x27e7,
-	0x27e9, 0x27e9,
-	0x27eb, 0x27eb,
-	0x27ed, 0x27ed,
-	0x27ef, 0x27ef,
-	0x2984, 0x2984,
-	0x2986, 0x2986,
-	0x2988, 0x2988,
-	0x298a, 0x298a,
-	0x298c, 0x298c,
-	0x298e, 0x298e,
-	0x2990, 0x2990,
-	0x2992, 0x2992,
-	0x2994, 0x2994,
-	0x2996, 0x2996,
-	0x2998, 0x2998,
-	0x29d9, 0x29d9,
-	0x29db, 0x29db,
-	0x29fd, 0x29fd,
-	0x2e23, 0x2e23,
-	0x2e25, 0x2e25,
-	0x2e27, 0x2e27,
-	0x2e29, 0x2e29,
-	0x3009, 0x3009,
-	0x300b, 0x300b,
-	0x300d, 0x300d,
-	0x300f, 0x300f,
-	0x3011, 0x3011,
-	0x3015, 0x3015,
-	0x3017, 0x3017,
-	0x3019, 0x3019,
-	0x301b, 0x301b,
-	0x301e, 0x301f,
-	0xfd3f, 0xfd3f,
-	0xfe18, 0xfe18,
-	0xfe36, 0xfe36,
-	0xfe38, 0xfe38,
-	0xfe3a, 0xfe3a,
-	0xfe3c, 0xfe3c,
-	0xfe3e, 0xfe3e,
-	0xfe40, 0xfe40,
-	0xfe42, 0xfe42,
-	0xfe44, 0xfe44,
-	0xfe48, 0xfe48,
-	0xfe5a, 0xfe5a,
-	0xfe5c, 0xfe5c,
-	0xfe5e, 0xfe5e,
-	0xff09, 0xff09,
-	0xff3d, 0xff3d,
-	0xff5d, 0xff5d,
-	0xff60, 0xff60,
-	0xff63, 0xff63,
-}; /* CR_Pe */
-
-/* 'Pf': General Category */
-static const OnigCodePoint CR_Pf[] = {
-	10,
-	0x00bb, 0x00bb,
-	0x2019, 0x2019,
-	0x201d, 0x201d,
-	0x203a, 0x203a,
-	0x2e03, 0x2e03,
-	0x2e05, 0x2e05,
-	0x2e0a, 0x2e0a,
-	0x2e0d, 0x2e0d,
-	0x2e1d, 0x2e1d,
-	0x2e21, 0x2e21,
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
-	11,
-	0x00ab, 0x00ab,
-	0x2018, 0x2018,
-	0x201b, 0x201c,
-	0x201f, 0x201f,
-	0x2039, 0x2039,
-	0x2e02, 0x2e02,
-	0x2e04, 0x2e04,
-	0x2e09, 0x2e09,
-	0x2e0c, 0x2e0c,
-	0x2e1c, 0x2e1c,
-	0x2e20, 0x2e20,
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
-	128,
-	0x0021, 0x0023,
-	0x0025, 0x0027,
-	0x002a, 0x002a,
-	0x002c, 0x002c,
-	0x002e, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005c, 0x005c,
-	0x00a1, 0x00a1,
-	0x00b7, 0x00b7,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x0589,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1361, 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,
-	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, 0x2e31,
-	0x3001, 0x3003,
-	0x303d, 0x303d,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xabeb, 0xabeb,
-	0xfe10, 0xfe16,
-	0xfe19, 0xfe19,
-	0xfe30, 0xfe30,
-	0xfe45, 0xfe46,
-	0xfe49, 0xfe4c,
-	0xfe50, 0xfe52,
-	0xfe54, 0xfe57,
-	0xfe5f, 0xfe61,
-	0xfe68, 0xfe68,
-	0xfe6a, 0xfe6b,
-	0xff01, 0xff03,
-	0xff05, 0xff07,
-	0xff0a, 0xff0a,
-	0xff0c, 0xff0c,
-	0xff0e, 0xff0f,
-	0xff1a, 0xff1b,
-	0xff1f, 0xff20,
-	0xff3c, 0xff3c,
-	0xff61, 0xff61,
-	0xff64, 0xff65,
-	0x10100, 0x10101,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10b39, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x12470, 0x12473,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
-	72,
-	0x0028, 0x0028,
-	0x005b, 0x005b,
-	0x007b, 0x007b,
-	0x0f3a, 0x0f3a,
-	0x0f3c, 0x0f3c,
-	0x169b, 0x169b,
-	0x201a, 0x201a,
-	0x201e, 0x201e,
-	0x2045, 0x2045,
-	0x207d, 0x207d,
-	0x208d, 0x208d,
-	0x2329, 0x2329,
-	0x2768, 0x2768,
-	0x276a, 0x276a,
-	0x276c, 0x276c,
-	0x276e, 0x276e,
-	0x2770, 0x2770,
-	0x2772, 0x2772,
-	0x2774, 0x2774,
-	0x27c5, 0x27c5,
-	0x27e6, 0x27e6,
-	0x27e8, 0x27e8,
-	0x27ea, 0x27ea,
-	0x27ec, 0x27ec,
-	0x27ee, 0x27ee,
-	0x2983, 0x2983,
-	0x2985, 0x2985,
-	0x2987, 0x2987,
-	0x2989, 0x2989,
-	0x298b, 0x298b,
-	0x298d, 0x298d,
-	0x298f, 0x298f,
-	0x2991, 0x2991,
-	0x2993, 0x2993,
-	0x2995, 0x2995,
-	0x2997, 0x2997,
-	0x29d8, 0x29d8,
-	0x29da, 0x29da,
-	0x29fc, 0x29fc,
-	0x2e22, 0x2e22,
-	0x2e24, 0x2e24,
-	0x2e26, 0x2e26,
-	0x2e28, 0x2e28,
-	0x3008, 0x3008,
-	0x300a, 0x300a,
-	0x300c, 0x300c,
-	0x300e, 0x300e,
-	0x3010, 0x3010,
-	0x3014, 0x3014,
-	0x3016, 0x3016,
-	0x3018, 0x3018,
-	0x301a, 0x301a,
-	0x301d, 0x301d,
-	0xfd3e, 0xfd3e,
-	0xfe17, 0xfe17,
-	0xfe35, 0xfe35,
-	0xfe37, 0xfe37,
-	0xfe39, 0xfe39,
-	0xfe3b, 0xfe3b,
-	0xfe3d, 0xfe3d,
-	0xfe3f, 0xfe3f,
-	0xfe41, 0xfe41,
-	0xfe43, 0xfe43,
-	0xfe47, 0xfe47,
-	0xfe59, 0xfe59,
-	0xfe5b, 0xfe5b,
-	0xfe5d, 0xfe5d,
-	0xff08, 0xff08,
-	0xff3b, 0xff3b,
-	0xff5b, 0xff5b,
-	0xff5f, 0xff5f,
-	0xff62, 0xff62,
-}; /* CR_Ps */
-
-/* 'S': Major Category */
-static const OnigCodePoint CR_S[] = {
-	208,
-	0x0024, 0x0024,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00a2, 0x00a9,
-	0x00ac, 0x00ac,
-	0x00ae, 0x00b1,
-	0x00b4, 0x00b4,
-	0x00b6, 0x00b6,
-	0x00b8, 0x00b8,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x03f6, 0x03f6,
-	0x0482, 0x0482,
-	0x0606, 0x0608,
-	0x060b, 0x060b,
-	0x060e, 0x060f,
-	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, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1360, 0x1360,
-	0x1390, 0x1399,
-	0x17db, 0x17db,
-	0x1940, 0x1940,
-	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, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27e5,
-	0x27f0, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2ce5, 0x2cea,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3004, 0x3004,
-	0x3012, 0x3013,
-	0x3020, 0x3020,
-	0x3036, 0x3037,
-	0x303e, 0x303f,
-	0x309b, 0x309c,
-	0x3190, 0x3191,
-	0x3196, 0x319f,
-	0x31c0, 0x31e3,
-	0x3200, 0x321e,
-	0x322a, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa700, 0xa716,
-	0xa720, 0xa721,
-	0xa789, 0xa78a,
-	0xa828, 0xa82b,
-	0xa836, 0xa839,
-	0xaa77, 0xaa79,
-	0xfb29, 0xfb29,
-	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,
-	0x10102, 0x10102,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d6c1, 0x1d6c1,
-	0x1d6db, 0x1d6db,
-	0x1d6fb, 0x1d6fb,
-	0x1d715, 0x1d715,
-	0x1d735, 0x1d735,
-	0x1d74f, 0x1d74f,
-	0x1d76f, 0x1d76f,
-	0x1d789, 0x1d789,
-	0x1d7a9, 0x1d7a9,
-	0x1d7c3, 0x1d7c3,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	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,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
-	16,
-	0x0024, 0x0024,
-	0x00a2, 0x00a5,
-	0x060b, 0x060b,
-	0x09f2, 0x09f3,
-	0x09fb, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0bf9, 0x0bf9,
-	0x0e3f, 0x0e3f,
-	0x17db, 0x17db,
-	0x20a0, 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[] = {
-	66,
-	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, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27e5,
-	0x27f0, 0x27ff,
-	0x2900, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	0xfb29, 0xfb29,
-	0xfe62, 0xfe62,
-	0xfe64, 0xfe66,
-	0xff0b, 0xff0b,
-	0xff1c, 0xff1e,
-	0xff5c, 0xff5c,
-	0xff5e, 0xff5e,
-	0xffe2, 0xffe2,
-	0xffe9, 0xffec,
-	0x1d6c1, 0x1d6c1,
-	0x1d6db, 0x1d6db,
-	0x1d6fb, 0x1d6fb,
-	0x1d715, 0x1d715,
-	0x1d735, 0x1d735,
-	0x1d74f, 0x1d74f,
-	0x1d76f, 0x1d76f,
-	0x1d789, 0x1d789,
-	0x1d7a9, 0x1d7a9,
-	0x1d7c3, 0x1d7c3,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
-	164,
-	0x00a6, 0x00a7,
-	0x00a9, 0x00a9,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b0,
-	0x00b6, 0x00b6,
-	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, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1360, 0x1360,
-	0x1390, 0x1399,
-	0x1940, 0x1940,
-	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, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa828, 0xa82b,
-	0xa836, 0xa837,
-	0xa839, 0xa839,
-	0xaa77, 0xaa79,
-	0xfdfd, 0xfdfd,
-	0xffe4, 0xffe4,
-	0xffe8, 0xffe8,
-	0xffed, 0xffee,
-	0xfffc, 0xfffd,
-	0x10102, 0x10102,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	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,
-}; /* 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[] = {
-	106,
-	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, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27ff,
-	0x2900, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	0xfb29, 0xfb29,
-	0xfe61, 0xfe66,
-	0xfe68, 0xfe68,
-	0xff0b, 0xff0b,
-	0xff1c, 0xff1e,
-	0xff3c, 0xff3c,
-	0xff3e, 0xff3e,
-	0xff5c, 0xff5c,
-	0xff5e, 0xff5e,
-	0xffe2, 0xffe2,
-	0xffe9, 0xffec,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a5,
-	0x1d6a8, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-}; /* CR_Math */
-
-/* 'Alphabetic': Derived Property */
-static const OnigCodePoint CR_Alphabetic[] = {
-	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,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x135f, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b80, 0x1ba9,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11082, 0x110b8,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Alphabetic */
-
-/* 'Lowercase': Derived Property */
-static const OnigCodePoint CR_Lowercase[] = {
-	612,
-	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,
-	0x2090, 0x2094,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7d,
-	0x2c81, 0x2c81,
-	0x2c83, 0x2c83,
-	0x2c85, 0x2c85,
-	0x2c87, 0x2c87,
-	0x2c89, 0x2c89,
-	0x2c8b, 0x2c8b,
-	0x2c8d, 0x2c8d,
-	0x2c8f, 0x2c8f,
-	0x2c91, 0x2c91,
-	0x2c93, 0x2c93,
-	0x2c95, 0x2c95,
-	0x2c97, 0x2c97,
-	0x2c99, 0x2c99,
-	0x2c9b, 0x2c9b,
-	0x2c9d, 0x2c9d,
-	0x2c9f, 0x2c9f,
-	0x2ca1, 0x2ca1,
-	0x2ca3, 0x2ca3,
-	0x2ca5, 0x2ca5,
-	0x2ca7, 0x2ca7,
-	0x2ca9, 0x2ca9,
-	0x2cab, 0x2cab,
-	0x2cad, 0x2cad,
-	0x2caf, 0x2caf,
-	0x2cb1, 0x2cb1,
-	0x2cb3, 0x2cb3,
-	0x2cb5, 0x2cb5,
-	0x2cb7, 0x2cb7,
-	0x2cb9, 0x2cb9,
-	0x2cbb, 0x2cbb,
-	0x2cbd, 0x2cbd,
-	0x2cbf, 0x2cbf,
-	0x2cc1, 0x2cc1,
-	0x2cc3, 0x2cc3,
-	0x2cc5, 0x2cc5,
-	0x2cc7, 0x2cc7,
-	0x2cc9, 0x2cc9,
-	0x2ccb, 0x2ccb,
-	0x2ccd, 0x2ccd,
-	0x2ccf, 0x2ccf,
-	0x2cd1, 0x2cd1,
-	0x2cd3, 0x2cd3,
-	0x2cd5, 0x2cd5,
-	0x2cd7, 0x2cd7,
-	0x2cd9, 0x2cd9,
-	0x2cdb, 0x2cdb,
-	0x2cdd, 0x2cdd,
-	0x2cdf, 0x2cdf,
-	0x2ce1, 0x2ce1,
-	0x2ce3, 0x2ce4,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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_Lowercase */
-
-/* 'Uppercase': Derived Property */
-static const OnigCodePoint CR_Uppercase[] = {
-	605,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1fb8, 0x1fbb,
-	0x1fc8, 0x1fcb,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffb,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210b, 0x210d,
-	0x2110, 0x2112,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x2130, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x1d400, 0x1d419,
-	0x1d434, 0x1d44d,
-	0x1d468, 0x1d481,
-	0x1d49c, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b5,
-	0x1d4d0, 0x1d4e9,
-	0x1d504, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d538, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d56c, 0x1d585,
-	0x1d5a0, 0x1d5b9,
-	0x1d5d4, 0x1d5ed,
-	0x1d608, 0x1d621,
-	0x1d63c, 0x1d655,
-	0x1d670, 0x1d689,
-	0x1d6a8, 0x1d6c0,
-	0x1d6e2, 0x1d6fa,
-	0x1d71c, 0x1d734,
-	0x1d756, 0x1d76e,
-	0x1d790, 0x1d7a8,
-	0x1d7ca, 0x1d7ca,
-}; /* CR_Uppercase */
-
-/* 'Cased': Derived Property */
-static const OnigCodePoint CR_Cased[] = {
-	112,
-	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,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2090, 0x2094,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	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_Cased */
-
-/* 'Case_Ignorable': Derived Property */
-static const OnigCodePoint CR_Case_Ignorable[] = {
-	277,
-	0x0027, 0x0027,
-	0x002e, 0x002e,
-	0x003a, 0x003a,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00ad, 0x00ad,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0387, 0x0387,
-	0x0483, 0x0489,
-	0x0559, 0x0559,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05f4, 0x05f4,
-	0x0600, 0x0603,
-	0x0610, 0x061a,
-	0x0640, 0x0640,
-	0x064b, 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,
-	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,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1d2c, 0x1d61,
-	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,
-	0x2c7d, 0x2c7d,
-	0x2cef, 0x2cf1,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x302a, 0x302f,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x3099, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa66f, 0xa672,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa6f0, 0xa6f1,
-	0xa700, 0xa721,
-	0xa770, 0xa770,
-	0xa788, 0xa78a,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9cf, 0xa9cf,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa70, 0xaa70,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaadd, 0xaadd,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	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,
-	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[] = {
-	566,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f88, 0x1f8f,
-	0x1f98, 0x1f9f,
-	0x1fa8, 0x1faf,
-	0x1fb8, 0x1fbc,
-	0x1fc8, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-}; /* CR_Changes_When_Lowercased */
-
-/* 'Changes_When_Uppercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	582,
-	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, 0x0265,
-	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,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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[] = {
-	583,
-	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, 0x0265,
-	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,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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[] = {
-	577,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9a, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f80, 0x1faf,
-	0x1fb2, 0x1fb4,
-	0x1fb7, 0x1fbc,
-	0x1fc2, 0x1fc4,
-	0x1fc7, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff7, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-}; /* CR_Changes_When_Casefolded */
-
-/* 'Changes_When_Casemapped': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	99,
-	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, 0x0265,
-	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,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	0x1e00, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c70,
-	0x2c72, 0x2c73,
-	0x2c75, 0x2c76,
-	0x2c7e, 0x2ce3,
-	0x2ceb, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa72f,
-	0xa732, 0xa76f,
-	0xa779, 0xa787,
-	0xa78b, 0xa78d,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-}; /* CR_Changes_When_Casemapped */
-
-/* 'ID_Start': Derived Property */
-static const OnigCodePoint CR_ID_Start[] = {
-	437,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309b, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_ID_Start */
-
-/* 'ID_Continue': Derived Property */
-static const OnigCodePoint CR_ID_Continue[] = {
-	514,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	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, 0x17b3,
-	0x17b6, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf2,
-	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, 0x2cf1,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	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, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff3f, 0xff3f,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_ID_Continue */
-
-/* 'XID_Start': Derived Property */
-static const OnigCodePoint CR_XID_Start[] = {
-	444,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xff9d,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_XID_Start */
-
-/* 'XID_Continue': Derived Property */
-static const OnigCodePoint CR_XID_Continue[] = {
-	521,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	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, 0x17b3,
-	0x17b6, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf2,
-	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, 0x2cf1,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	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, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff3f, 0xff3f,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	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[] = {
-	215,
-	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,
-	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,
-	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,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa67c, 0xa67d,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xff9e, 0xff9f,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x1d165, 0x1d165,
-	0x1d167, 0x1d169,
-	0x1d16e, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_Grapheme_Extend */
-
-/* 'Grapheme_Base': Derived Property */
-static const OnigCodePoint CR_Grapheme_Base[] = {
-	596,
-	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,
-	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,
-	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, 0x0aef,
-	0x0af1, 0x0af1,
-	0x0b02, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b3d,
-	0x0b40, 0x0b40,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 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, 0x0edd,
-	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,
-	0x10d0, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1360, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1735, 0x1736,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x17d4, 0x17dc,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1800, 0x180a,
-	0x180e, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a16,
-	0x1a19, 0x1a1b,
-	0x1a1e, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a61, 0x1a61,
-	0x1a63, 0x1a64,
-	0x1a6d, 0x1a72,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b04, 0x1b33,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b4b,
-	0x1b50, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x1b82, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1be5,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1bfc, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fc4,
-	0x1fc6, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fdd, 0x1fef,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffe,
-	0x2000, 0x200a,
-	0x2010, 0x2027,
-	0x202f, 0x205f,
-	0x2070, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cee,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d70,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e00, 0x2e31,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3029,
-	0x3030, 0x303f,
-	0x3041, 0x3096,
-	0x309b, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa66e,
-	0xa673, 0xa673,
-	0xa67e, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa6f2, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa824,
-	0xa827, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c3,
-	0xa8ce, 0xa8d9,
-	0xa8f2, 0xa8fb,
-	0xa900, 0xa925,
-	0xa92e, 0xa946,
-	0xa952, 0xa953,
-	0xa95f, 0xa97c,
-	0xa983, 0xa9b2,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa28,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa4d, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadf,
-	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, 0xfa2d,
-	0xfa30, 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,
-	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,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Grapheme_Base */
-
-/* 'Grapheme_Link': Derived Property */
-static const OnigCodePoint CR_Grapheme_Link[] = {
-	29,
-	0x094d, 0x094d,
-	0x09cd, 0x09cd,
-	0x0a4d, 0x0a4d,
-	0x0acd, 0x0acd,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e3a, 0x0e3a,
-	0x0f84, 0x0f84,
-	0x1039, 0x103a,
-	0x1714, 0x1714,
-	0x1734, 0x1734,
-	0x17d2, 0x17d2,
-	0x1a60, 0x1a60,
-	0x1b44, 0x1b44,
-	0x1baa, 0x1baa,
-	0x1bf2, 0x1bf3,
-	0x2d7f, 0x2d7f,
-	0xa806, 0xa806,
-	0xa8c4, 0xa8c4,
-	0xa953, 0xa953,
-	0xa9c0, 0xa9c0,
-	0xabed, 0xabed,
-	0x10a3f, 0x10a3f,
-	0x11046, 0x11046,
-	0x110b9, 0x110b9,
-}; /* CR_Grapheme_Link */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
-	169,
-	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,
-	0x0970, 0x0970,
-	0x0e3f, 0x0e3f,
-	0x0fd5, 0x0fd8,
-	0x10fb, 0x10fb,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x1802, 0x1803,
-	0x1805, 0x1805,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x2000, 0x200b,
-	0x200e, 0x2064,
-	0x206a, 0x2070,
-	0x2074, 0x207e,
-	0x2080, 0x208e,
-	0x20a0, 0x20b9,
-	0x2100, 0x2125,
-	0x2127, 0x2129,
-	0x212c, 0x2131,
-	0x2133, 0x214d,
-	0x214f, 0x215f,
-	0x2189, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27ff,
-	0x2900, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2e00, 0x2e31,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3004,
-	0x3006, 0x3006,
-	0x3008, 0x3020,
-	0x3030, 0x3037,
-	0x303c, 0x303f,
-	0x309b, 0x309c,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fc,
-	0x3190, 0x319f,
-	0x31c0, 0x31e3,
-	0x3220, 0x325f,
-	0x327f, 0x32cf,
-	0x3358, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa700, 0xa721,
-	0xa788, 0xa78a,
-	0xa830, 0xa839,
-	0xfd3e, 0xfd3f,
-	0xfdfd, 0xfdfd,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfeff, 0xfeff,
-	0xff01, 0xff20,
-	0xff3b, 0xff40,
-	0xff5b, 0xff65,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1013f,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d166,
-	0x1d16a, 0x1d17a,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a5,
-	0x1d6a8, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f169,
-	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,
-	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,
-	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, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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, 0xa673,
-	0xa67c, 0xa697,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
-	5,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x058a, 0x058a,
-	0xfb13, 0xfb17,
-}; /* CR_Armenian */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
-	9,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfb4f,
-}; /* CR_Hebrew */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
-	19,
-	0x0600, 0x0603,
-	0x0606, 0x060b,
-	0x060d, 0x061a,
-	0x061e, 0x061e,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x0656, 0x065e,
-	0x066a, 0x066f,
-	0x0671, 0x06dc,
-	0x06de, 0x06ff,
-	0x0750, 0x077f,
-	0xfb50, 0xfbc1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfc,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0x10e60, 0x10e7e,
-}; /* CR_Arabic */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
-	3,
-	0x0700, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-}; /* CR_Syriac */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
-	1,
-	0x0780, 0x07b1,
-}; /* CR_Thaana */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
-	6,
-	0x0900, 0x0950,
-	0x0953, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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[] = {
-	14,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae3,
-	0x0ae6, 0x0aef,
-	0x0af1, 0x0af1,
-}; /* CR_Gujarati */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
-	14,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 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, 0x0edd,
-}; /* 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[] = {
-	4,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x2d00, 0x2d25,
-}; /* 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[] = {
-	16,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x3005, 0x3005,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303b,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	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[] = {
-	24,
-	0x0300, 0x036f,
-	0x0485, 0x0486,
-	0x064b, 0x0655,
-	0x065f, 0x065f,
-	0x0670, 0x0670,
-	0x0951, 0x0952,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	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, 0x2cf1,
-	0x2cf9, 0x2cff,
-}; /* CR_Coptic */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
-	4,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x19df,
-}; /* CR_New_Tai_Lue */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
-	2,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
-	3,
-	0x2d30, 0x2d65,
-	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, 0x1baa,
-	0x1bae, 0x1bb9,
-}; /* CR_Sundanese */
-
-/* 'Lepcha': Script */
-static const OnigCodePoint CR_Lepcha[] = {
-	3,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c4f,
-}; /* CR_Lepcha */
-
-/* 'Ol_Chiki': Script */
-static const OnigCodePoint CR_Ol_Chiki[] = {
-	1,
-	0x1c50, 0x1c7f,
-}; /* CR_Ol_Chiki */
-
-/* 'Vai': Script */
-static const OnigCodePoint CR_Vai[] = {
-	1,
-	0xa500, 0xa62b,
-}; /* CR_Vai */
-
-/* 'Saurashtra': Script */
-static const OnigCodePoint CR_Saurashtra[] = {
-	2,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
-	1,
-	0xa900, 0xa92f,
-}; /* CR_Kayah_Li */
-
-/* 'Rejang': Script */
-static const OnigCodePoint CR_Rejang[] = {
-	2,
-	0xa930, 0xa953,
-	0xa95f, 0xa95f,
-}; /* CR_Rejang */
-
-/* 'Lycian': Script */
-static const OnigCodePoint CR_Lycian[] = {
-	1,
-	0x10280, 0x1029c,
-}; /* CR_Lycian */
-
-/* 'Carian': Script */
-static const OnigCodePoint CR_Carian[] = {
-	1,
-	0x102a0, 0x102d0,
-}; /* CR_Carian */
-
-/* 'Lydian': Script */
-static const OnigCodePoint CR_Lydian[] = {
-	2,
-	0x10920, 0x10939,
-	0x1093f, 0x1093f,
-}; /* CR_Lydian */
-
-/* 'Cham': Script */
-static const OnigCodePoint CR_Cham[] = {
-	4,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-}; /* CR_Cham */
-
-/* 'Tai_Tham': Script */
-static const OnigCodePoint CR_Tai_Tham[] = {
-	5,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-}; /* CR_Tai_Tham */
-
-/* 'Tai_Viet': Script */
-static const OnigCodePoint CR_Tai_Viet[] = {
-	2,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-}; /* CR_Tai_Viet */
-
-/* 'Avestan': Script */
-static const OnigCodePoint CR_Avestan[] = {
-	2,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b3f,
-}; /* CR_Avestan */
-
-/* 'Egyptian_Hieroglyphs': Script */
-static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342e,
-}; /* CR_Egyptian_Hieroglyphs */
-
-/* 'Samaritan': Script */
-static const OnigCodePoint CR_Samaritan[] = {
-	2,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-}; /* CR_Samaritan */
-
-/* 'Lisu': Script */
-static const OnigCodePoint CR_Lisu[] = {
-	1,
-	0xa4d0, 0xa4ff,
-}; /* CR_Lisu */
-
-/* 'Bamum': Script */
-static const OnigCodePoint CR_Bamum[] = {
-	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[] = {
-	2,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-}; /* CR_Meetei_Mayek */
-
-/* 'Imperial_Aramaic': Script */
-static const OnigCodePoint CR_Imperial_Aramaic[] = {
-	2,
-	0x10840, 0x10855,
-	0x10857, 0x1085f,
-}; /* CR_Imperial_Aramaic */
-
-/* 'Old_South_Arabian': Script */
-static const OnigCodePoint CR_Old_South_Arabian[] = {
-	1,
-	0x10a60, 0x10a7f,
-}; /* CR_Old_South_Arabian */
-
-/* 'Inscriptional_Parthian': Script */
-static const OnigCodePoint CR_Inscriptional_Parthian[] = {
-	2,
-	0x10b40, 0x10b55,
-	0x10b58, 0x10b5f,
-}; /* CR_Inscriptional_Parthian */
-
-/* 'Inscriptional_Pahlavi': Script */
-static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
-	2,
-	0x10b60, 0x10b72,
-	0x10b78, 0x10b7f,
-}; /* CR_Inscriptional_Pahlavi */
-
-/* 'Old_Turkic': Script */
-static const OnigCodePoint CR_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c48,
-}; /* CR_Old_Turkic */
-
-/* 'Kaithi': Script */
-static const OnigCodePoint CR_Kaithi[] = {
-	1,
-	0x11080, 0x110c1,
-}; /* CR_Kaithi */
-
-/* '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 */
-
-/* 'White_Space': Binary Property */
-static const OnigCodePoint CR_White_Space[] = {
-	11,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x180e, 0x180e,
-	0x2000, 0x200a,
-	0x2028, 0x2029,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_White_Space */
-
-/* 'Bidi_Control': Binary Property */
-static const OnigCodePoint CR_Bidi_Control[] = {
-	2,
-	0x200e, 0x200f,
-	0x202a, 0x202e,
-}; /* CR_Bidi_Control */
-
-/* 'Join_Control': Binary Property */
-static const OnigCodePoint CR_Join_Control[] = {
-	1,
-	0x200c, 0x200d,
-}; /* CR_Join_Control */
-
-/* 'Dash': Binary Property */
-static const OnigCodePoint CR_Dash[] = {
-	19,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2053, 0x2053,
-	0x207b, 0x207b,
-	0x208b, 0x208b,
-	0x2212, 0x2212,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Dash */
-
-/* 'Hyphen': Binary Property */
-static const OnigCodePoint CR_Hyphen[] = {
-	10,
-	0x002d, 0x002d,
-	0x00ad, 0x00ad,
-	0x058a, 0x058a,
-	0x1806, 0x1806,
-	0x2010, 0x2011,
-	0x2e17, 0x2e17,
-	0x30fb, 0x30fb,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-	0xff65, 0xff65,
-}; /* CR_Hyphen */
-
-/* 'Quotation_Mark': Binary Property */
-static const OnigCodePoint CR_Quotation_Mark[] = {
-	12,
-	0x0022, 0x0022,
-	0x0027, 0x0027,
-	0x00ab, 0x00ab,
-	0x00bb, 0x00bb,
-	0x2018, 0x201f,
-	0x2039, 0x203a,
-	0x300c, 0x300f,
-	0x301d, 0x301f,
-	0xfe41, 0xfe44,
-	0xff02, 0xff02,
-	0xff07, 0xff07,
-	0xff62, 0xff63,
-}; /* CR_Quotation_Mark */
-
-/* 'Terminal_Punctuation': Binary Property */
-static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	67,
-	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,
-	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,
-	0x12470, 0x12473,
-}; /* CR_Terminal_Punctuation */
-
-/* 'Other_Math': Binary Property */
-static const OnigCodePoint CR_Other_Math[] = {
-	100,
-	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,
-}; /* CR_Other_Math */
-
-/* 'Hex_Digit': Binary Property */
-static const OnigCodePoint CR_Hex_Digit[] = {
-	6,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-	0xff10, 0xff19,
-	0xff21, 0xff26,
-	0xff41, 0xff46,
-}; /* CR_Hex_Digit */
-
-/* 'ASCII_Hex_Digit': Binary Property */
-static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
-	3,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-}; /* CR_ASCII_Hex_Digit */
-
-/* 'Other_Alphabetic': Binary Property */
-static const OnigCodePoint CR_Other_Alphabetic[] = {
-	145,
-	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,
-	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,
-	0x1be7, 0x1bf1,
-	0x1c24, 0x1c35,
-	0x1cf2, 0x1cf2,
-	0x24b6, 0x24e9,
-	0x2de0, 0x2dff,
-	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,
-	0xabe3, 0xabea,
-	0xfb1e, 0xfb1e,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x11000, 0x11002,
-	0x11038, 0x11045,
-	0x11082, 0x11082,
-	0x110b0, 0x110b8,
-}; /* CR_Other_Alphabetic */
-
-/* 'Ideographic': Binary Property */
-static const OnigCodePoint CR_Ideographic[] = {
-	12,
-	0x3006, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Ideographic */
-
-/* 'Diacritic': Binary Property */
-static const OnigCodePoint CR_Diacritic[] = {
-	117,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x034e,
-	0x0350, 0x0357,
-	0x035d, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0483, 0x0487,
-	0x0559, 0x0559,
-	0x0591, 0x05a1,
-	0x05a3, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c4,
-	0x064b, 0x0652,
-	0x0657, 0x0658,
-	0x06df, 0x06e0,
-	0x06e5, 0x06e6,
-	0x06ea, 0x06ec,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x0818, 0x0819,
-	0x093c, 0x093c,
-	0x094d, 0x094d,
-	0x0951, 0x0954,
-	0x0971, 0x0971,
-	0x09bc, 0x09bc,
-	0x09cd, 0x09cd,
-	0x0a3c, 0x0a3c,
-	0x0a4d, 0x0a4d,
-	0x0abc, 0x0abc,
-	0x0acd, 0x0acd,
-	0x0b3c, 0x0b3c,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0cbc, 0x0cbc,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e47, 0x0e4c,
-	0x0e4e, 0x0e4e,
-	0x0ec8, 0x0ecc,
-	0x0f18, 0x0f19,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f3f,
-	0x0f82, 0x0f84,
-	0x0f86, 0x0f87,
-	0x0fc6, 0x0fc6,
-	0x1037, 0x1037,
-	0x1039, 0x103a,
-	0x1087, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109b,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x1939, 0x193b,
-	0x1a75, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b34, 0x1b34,
-	0x1b44, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1baa, 0x1baa,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1d2c, 0x1d6a,
-	0x1dc4, 0x1dcf,
-	0x1dfd, 0x1dff,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x2cef, 0x2cf1,
-	0x2e2f, 0x2e2f,
-	0x302a, 0x302f,
-	0x3099, 0x309c,
-	0x30fc, 0x30fc,
-	0xa66f, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa6f0, 0xa6f1,
-	0xa717, 0xa721,
-	0xa788, 0xa788,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa92b, 0xa92e,
-	0xa953, 0xa953,
-	0xa9b3, 0xa9b3,
-	0xa9c0, 0xa9c0,
-	0xaa7b, 0xaa7b,
-	0xaabf, 0xaac2,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe20, 0xfe26,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0x110b9, 0x110ba,
-	0x1d167, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-}; /* CR_Diacritic */
-
-/* 'Extender': Binary Property */
-static const OnigCodePoint CR_Extender[] = {
-	20,
-	0x00b7, 0x00b7,
-	0x02d0, 0x02d1,
-	0x0640, 0x0640,
-	0x07fa, 0x07fa,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c36, 0x1c36,
-	0x1c7b, 0x1c7b,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa60c, 0xa60c,
-	0xa9cf, 0xa9cf,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xff70, 0xff70,
-}; /* CR_Extender */
-
-/* 'Other_Lowercase': Binary Property */
-static const OnigCodePoint CR_Other_Lowercase[] = {
-	13,
-	0x02b0, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x037a, 0x037a,
-	0x1d2c, 0x1d61,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2090, 0x2094,
-	0x2170, 0x217f,
-	0x24d0, 0x24e9,
-	0x2c7d, 0x2c7d,
-	0xa770, 0xa770,
-}; /* CR_Other_Lowercase */
-
-/* 'Other_Uppercase': Binary Property */
-static const OnigCodePoint CR_Other_Uppercase[] = {
-	2,
-	0x2160, 0x216f,
-	0x24b6, 0x24cf,
-}; /* CR_Other_Uppercase */
-
-/* 'Noncharacter_Code_Point': Binary Property */
-static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
-	18,
-	0xfdd0, 0xfdef,
-	0xfffe, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0xeffff,
-	0xffffe, 0xfffff,
-	0x10fffe, 0x10ffff,
-}; /* CR_Noncharacter_Code_Point */
-
-/* 'Other_Grapheme_Extend': Binary Property */
-static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
-	16,
-	0x09be, 0x09be,
-	0x09d7, 0x09d7,
-	0x0b3e, 0x0b3e,
-	0x0b57, 0x0b57,
-	0x0bbe, 0x0bbe,
-	0x0bd7, 0x0bd7,
-	0x0cc2, 0x0cc2,
-	0x0cd5, 0x0cd6,
-	0x0d3e, 0x0d3e,
-	0x0d57, 0x0d57,
-	0x0dcf, 0x0dcf,
-	0x0ddf, 0x0ddf,
-	0x200c, 0x200d,
-	0xff9e, 0xff9f,
-	0x1d165, 0x1d165,
-	0x1d16e, 0x1d172,
-}; /* CR_Other_Grapheme_Extend */
-
-/* 'IDS_Binary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Binary_Operator[] = {
-	2,
-	0x2ff0, 0x2ff1,
-	0x2ff4, 0x2ffb,
-}; /* CR_IDS_Binary_Operator */
-
-/* 'IDS_Trinary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
-	1,
-	0x2ff2, 0x2ff3,
-}; /* CR_IDS_Trinary_Operator */
-
-/* 'Radical': Binary Property */
-static const OnigCodePoint CR_Radical[] = {
-	3,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-}; /* CR_Radical */
-
-/* 'Unified_Ideograph': Binary Property */
-static const OnigCodePoint CR_Unified_Ideograph[] = {
-	12,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	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[] = {
-	10,
-	0x034f, 0x034f,
-	0x115f, 0x1160,
-	0x2065, 0x2069,
-	0x3164, 0x3164,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0xe0000, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xe0fff,
-}; /* CR_Other_Default_Ignorable_Code_Point */
-
-/* 'Deprecated': Binary Property */
-static const OnigCodePoint CR_Deprecated[] = {
-	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[] = {
-	47,
-	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,
-	0xabeb, 0xabeb,
-	0xfe52, 0xfe52,
-	0xfe56, 0xfe57,
-	0xff01, 0xff01,
-	0xff0e, 0xff0e,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0x10a56, 0x10a57,
-	0x11047, 0x11048,
-	0x110be, 0x110c1,
-}; /* CR_STerm */
-
-/* 'Variation_Selector': Binary Property */
-static const OnigCodePoint CR_Variation_Selector[] = {
-	3,
-	0x180b, 0x180d,
-	0xfe00, 0xfe0f,
-	0xe0100, 0xe01ef,
-}; /* CR_Variation_Selector */
-
-/* 'Pattern_White_Space': Binary Property */
-static const OnigCodePoint CR_Pattern_White_Space[] = {
-	5,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x200e, 0x200f,
-	0x2028, 0x2029,
-}; /* CR_Pattern_White_Space */
-
-/* 'Pattern_Syntax': Binary Property */
-static const OnigCodePoint CR_Pattern_Syntax[] = {
-	28,
-	0x0021, 0x002f,
-	0x003a, 0x0040,
-	0x005b, 0x005e,
-	0x0060, 0x0060,
-	0x007b, 0x007e,
-	0x00a1, 0x00a7,
-	0x00a9, 0x00a9,
-	0x00ab, 0x00ac,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b1,
-	0x00b6, 0x00b6,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x2010, 0x2027,
-	0x2030, 0x203e,
-	0x2041, 0x2053,
-	0x2055, 0x205e,
-	0x2190, 0x245f,
-	0x2500, 0x2775,
-	0x2794, 0x2bff,
-	0x2e00, 0x2e7f,
-	0x3001, 0x3003,
-	0x3008, 0x3020,
-	0x3030, 0x3030,
-	0xfd3e, 0xfd3f,
-	0xfe45, 0xfe46,
-}; /* CR_Pattern_Syntax */
-
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
-	499,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x0604, 0x0605,
-	0x061c, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 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,
-	0x0af0, 0x0af0,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	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,
-	0x0ede, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10cf,
-	0x10fd, 0x10ff,
-	0x1249, 0x1249,
-	0x124e, 0x124f,
-	0x1257, 0x1257,
-	0x1259, 0x1259,
-	0x125e, 0x125f,
-	0x1289, 0x1289,
-	0x128e, 0x128f,
-	0x12b1, 0x12b1,
-	0x12b6, 0x12b7,
-	0x12bf, 0x12bf,
-	0x12c1, 0x12c1,
-	0x12c6, 0x12c7,
-	0x12d7, 0x12d7,
-	0x1311, 0x1311,
-	0x1316, 0x1317,
-	0x135b, 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,
-	0x1bab, 0x1bad,
-	0x1bba, 0x1bbf,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1ccf,
-	0x1cf3, 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,
-	0x27cb, 0x27cb,
-	0x27cd, 0x27cd,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf2, 0x2cf8,
-	0x2d26, 0x2d2f,
-	0x2d66, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e32, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcc, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa674, 0xa67b,
-	0xa698, 0xa69f,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa792, 0xa79f,
-	0xa7aa, 0xa7f9,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaae0, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa2e, 0xfa2f,
-	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, 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, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 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, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16a, 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, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f600, 0x1f600,
-	0x1f611, 0x1f611,
-	0x1f615, 0x1f615,
-	0x1f617, 0x1f617,
-	0x1f619, 0x1f619,
-	0x1f61b, 0x1f61b,
-	0x1f61f, 0x1f61f,
-	0x1f626, 0x1f627,
-	0x1f62c, 0x1f62c,
-	0x1f62e, 0x1f62f,
-	0x1f634, 0x1f634,
-	0x1f641, 0x1f644,
-	0x1f650, 0x1f67f,
-	0x1f6c6, 0x1f6ff,
-	0x1f774, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2f7ff,
-	0x2fa1e, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-#endif /* USE_UNICODE_PROPERTIES */
-#endif /* USE_UNICODE_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 */
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
-	1,
-	0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-#define CR_Alpha CR_Alphabetic
-
-/* 'Blank': [[:Blank:]] */
-static const OnigCodePoint CR_Blank[] = {
-	9,
-	0x0009, 0x0009,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x180e, 0x180e,
-	0x2000, 0x200a,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Blank */
-
-/* 'Cntrl': [[:Cntrl:]] */
-#define CR_Cntrl CR_Cc
-
-/* 'Digit': [[:Digit:]] */
-#define CR_Digit CR_Nd
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
-	506,
-	0x0021, 0x007e,
-	0x00a1, 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, 0x167f,
-	0x1681, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1736,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17dd,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1800, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	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,
-	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, 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,
-	0x3001, 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,
-	0xe000, 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,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-#define CR_Lower CR_Lowercase
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
-	503,
-	0x0020, 0x007e,
-	0x00a0, 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, 0x2027,
-	0x202a, 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,
-	0xe000, 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,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-#define CR_Punct CR_P
-
-/* 'Space': [[:Space:]] */
-#define CR_Space CR_White_Space
-
-/* 'Upper': [[:Upper:]] */
-#define CR_Upper CR_Uppercase
-
-/* 'XDigit': [[:XDigit:]] */
-#define CR_XDigit CR_ASCII_Hex_Digit
-
-/* 'Word': [[:Word:]] */
-static const OnigCodePoint CR_Word[] = {
-	514,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	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, 0x17b3,
-	0x17b6, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf2,
-	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, 0x2cf1,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	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, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa672,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff3f, 0xff3f,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
-	509,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x135f, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b80, 0x1ba9,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11066, 0x1106f,
-	0x11082, 0x110b8,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Alnum */
-
-/* 'ASCII': [[:ASCII:]] */
-static const OnigCodePoint CR_ASCII[] = {
-	1,
-	0x0000, 0x007f,
-}; /* CR_ASCII */
-
-static const OnigCodePoint* const CodeRanges[] = {
-  CR_NEWLINE,
-  CR_Alpha,
-  CR_Blank,
-  CR_Cntrl,
-  CR_Digit,
-  CR_Graph,
-  CR_Lower,
-  CR_Print,
-  CR_Punct,
-  CR_Space,
-  CR_Upper,
-  CR_XDigit,
-  CR_Word,
-  CR_Alnum,
-  CR_ASCII,
-#ifdef USE_UNICODE_PROPERTIES
-#ifdef USE_UNICODE_PROPERTIES
-  CR_Any,
-  CR_Assigned,
-  CR_C,
-  CR_Cc,
-  CR_Cf,
-  CR_Cn,
-  CR_Co,
-  CR_Cs,
-  CR_L,
-  CR_Ll,
-  CR_Lm,
-  CR_Lo,
-  CR_Lt,
-  CR_Lu,
-  CR_M,
-  CR_Mc,
-  CR_Me,
-  CR_Mn,
-  CR_N,
-  CR_Nd,
-  CR_Nl,
-  CR_No,
-  CR_P,
-  CR_Pc,
-  CR_Pd,
-  CR_Pe,
-  CR_Pf,
-  CR_Pi,
-  CR_Po,
-  CR_Ps,
-  CR_S,
-  CR_Sc,
-  CR_Sk,
-  CR_Sm,
-  CR_So,
-  CR_Z,
-  CR_Zl,
-  CR_Zp,
-  CR_Zs,
-  CR_Math,
-  CR_Alphabetic,
-  CR_Lowercase,
-  CR_Uppercase,
-  CR_Cased,
-  CR_Case_Ignorable,
-  CR_Changes_When_Lowercased,
-  CR_Changes_When_Uppercased,
-  CR_Changes_When_Titlecased,
-  CR_Changes_When_Casefolded,
-  CR_Changes_When_Casemapped,
-  CR_ID_Start,
-  CR_ID_Continue,
-  CR_XID_Start,
-  CR_XID_Continue,
-  CR_Default_Ignorable_Code_Point,
-  CR_Grapheme_Extend,
-  CR_Grapheme_Base,
-  CR_Grapheme_Link,
-  CR_Common,
-  CR_Latin,
-  CR_Greek,
-  CR_Cyrillic,
-  CR_Armenian,
-  CR_Hebrew,
-  CR_Arabic,
-  CR_Syriac,
-  CR_Thaana,
-  CR_Devanagari,
-  CR_Bengali,
-  CR_Gurmukhi,
-  CR_Gujarati,
-  CR_Oriya,
-  CR_Tamil,
-  CR_Telugu,
-  CR_Kannada,
-  CR_Malayalam,
-  CR_Sinhala,
-  CR_Thai,
-  CR_Lao,
-  CR_Tibetan,
-  CR_Myanmar,
-  CR_Georgian,
-  CR_Hangul,
-  CR_Ethiopic,
-  CR_Cherokee,
-  CR_Canadian_Aboriginal,
-  CR_Ogham,
-  CR_Runic,
-  CR_Khmer,
-  CR_Mongolian,
-  CR_Hiragana,
-  CR_Katakana,
-  CR_Bopomofo,
-  CR_Han,
-  CR_Yi,
-  CR_Old_Italic,
-  CR_Gothic,
-  CR_Deseret,
-  CR_Inherited,
-  CR_Tagalog,
-  CR_Hanunoo,
-  CR_Buhid,
-  CR_Tagbanwa,
-  CR_Limbu,
-  CR_Tai_Le,
-  CR_Linear_B,
-  CR_Ugaritic,
-  CR_Shavian,
-  CR_Osmanya,
-  CR_Cypriot,
-  CR_Braille,
-  CR_Buginese,
-  CR_Coptic,
-  CR_New_Tai_Lue,
-  CR_Glagolitic,
-  CR_Tifinagh,
-  CR_Syloti_Nagri,
-  CR_Old_Persian,
-  CR_Kharoshthi,
-  CR_Balinese,
-  CR_Cuneiform,
-  CR_Phoenician,
-  CR_Phags_Pa,
-  CR_Nko,
-  CR_Sundanese,
-  CR_Lepcha,
-  CR_Ol_Chiki,
-  CR_Vai,
-  CR_Saurashtra,
-  CR_Kayah_Li,
-  CR_Rejang,
-  CR_Lycian,
-  CR_Carian,
-  CR_Lydian,
-  CR_Cham,
-  CR_Tai_Tham,
-  CR_Tai_Viet,
-  CR_Avestan,
-  CR_Egyptian_Hieroglyphs,
-  CR_Samaritan,
-  CR_Lisu,
-  CR_Bamum,
-  CR_Javanese,
-  CR_Meetei_Mayek,
-  CR_Imperial_Aramaic,
-  CR_Old_South_Arabian,
-  CR_Inscriptional_Parthian,
-  CR_Inscriptional_Pahlavi,
-  CR_Old_Turkic,
-  CR_Kaithi,
-  CR_Batak,
-  CR_Brahmi,
-  CR_Mandaic,
-  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,
-#endif /* USE_UNICODE_PROPERTIES */
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
-  int name, ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-
-#ifndef USE_UNICODE_PROPERTIES
-#define TOTAL_KEYWORDS 15
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 7
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 21
-/* maximum key range = 15, duplicates = 0 */
-#else /* USE_UNICODE_PROPERTIES */
-#define TOTAL_KEYWORDS 387
-#define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 30
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 1741
-/* maximum key range = 1739, duplicates = 0 */
-#endif /* USE_UNICODE_PROPERTIES */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-uniname2ctype_hash (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-#ifndef USE_UNICODE_PROPERTIES
-  static const unsigned char asso_values[] =
-#else /* USE_UNICODE_PROPERTIES */
-  static const unsigned short asso_values[] =
-#endif /* USE_UNICODE_PROPERTIES */
-    {
-#ifndef USE_UNICODE_PROPERTIES
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22,  3, 13,  6,
-       4, 22, 22, 11, 22,  1, 22, 22, 10, 22,
-       2, 22,  1, 22, 10,  8,  4,  7, 22,  3,
-       4, 22, 22, 22, 22, 22, 22, 22
-#else /* USE_UNICODE_PROPERTIES */
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742,    2, 1742,    9,    1,
-         2,   18,    5,    3,    4, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742,    8,  280,    6,
-        96,   67,  362,  294,   38,    9,   63,  517,    2,  213,
-         1,    4,  192,    3,   10,   57,   31,  316,    1,  549,
-       330,  567,   36, 1742, 1742, 1742, 1742, 1742
-#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_str7[sizeof("print")];
-    char uniname2ctype_pool_str8[sizeof("punct")];
-    char uniname2ctype_pool_str9[sizeof("alpha")];
-    char uniname2ctype_pool_str10[sizeof("alnum")];
-    char uniname2ctype_pool_str11[sizeof("xdigit")];
-    char uniname2ctype_pool_str12[sizeof("newline")];
-    char uniname2ctype_pool_str13[sizeof("upper")];
-    char uniname2ctype_pool_str14[sizeof("ascii")];
-    char uniname2ctype_pool_str15[sizeof("cntrl")];
-    char uniname2ctype_pool_str16[sizeof("space")];
-    char uniname2ctype_pool_str17[sizeof("word")];
-    char uniname2ctype_pool_str18[sizeof("lower")];
-    char uniname2ctype_pool_str19[sizeof("graph")];
-    char uniname2ctype_pool_str20[sizeof("digit")];
-    char uniname2ctype_pool_str21[sizeof("blank")];
-#else /* USE_UNICODE_PROPERTIES */
-    char uniname2ctype_pool_str3[sizeof("n")];
-    char uniname2ctype_pool_str5[sizeof("l")];
-    char uniname2ctype_pool_str7[sizeof("nl")];
-    char uniname2ctype_pool_str8[sizeof("ll")];
-    char uniname2ctype_pool_str10[sizeof("cn")];
-    char uniname2ctype_pool_str11[sizeof("no")];
-    char uniname2ctype_pool_str12[sizeof("lo")];
-    char uniname2ctype_pool_str13[sizeof("c")];
-    char uniname2ctype_pool_str16[sizeof("co")];
-    char uniname2ctype_pool_str20[sizeof("cc")];
-    char uniname2ctype_pool_str21[sizeof("lao")];
-    char uniname2ctype_pool_str22[sizeof("laoo")];
-    char uniname2ctype_pool_str23[sizeof("lana")];
-    char uniname2ctype_pool_str26[sizeof("ci")];
-    char uniname2ctype_pool_str29[sizeof("qaac")];
-    char uniname2ctype_pool_str30[sizeof("vai")];
-    char uniname2ctype_pool_str31[sizeof("vaii")];
-    char uniname2ctype_pool_str32[sizeof("qaai")];
-    char uniname2ctype_pool_str34[sizeof("control")];
-    char uniname2ctype_pool_str37[sizeof("cari")];
-    char uniname2ctype_pool_str40[sizeof("carian")];
-    char uniname2ctype_pool_str42[sizeof("zl")];
-    char uniname2ctype_pool_str44[sizeof("oriya")];
-    char uniname2ctype_pool_str46[sizeof("latn")];
-    char uniname2ctype_pool_str47[sizeof("cntrl")];
-    char uniname2ctype_pool_str48[sizeof("latin")];
-    char uniname2ctype_pool_str51[sizeof("han")];
-    char uniname2ctype_pool_str53[sizeof("arabic")];
-    char uniname2ctype_pool_str54[sizeof("ital")];
-    char uniname2ctype_pool_str55[sizeof("hano")];
-    char uniname2ctype_pool_str60[sizeof("hani")];
-    char uniname2ctype_pool_str63[sizeof("hanunoo")];
-    char uniname2ctype_pool_str66[sizeof("lt")];
-    char uniname2ctype_pool_str67[sizeof("so")];
-    char uniname2ctype_pool_str69[sizeof("hira")];
-    char uniname2ctype_pool_str70[sizeof("nchar")];
-    char uniname2ctype_pool_str71[sizeof("sc")];
-    char uniname2ctype_pool_str73[sizeof("z")];
-    char uniname2ctype_pool_str74[sizeof("oalpha")];
-    char uniname2ctype_pool_str75[sizeof("tavt")];
-    char uniname2ctype_pool_str76[sizeof("cans")];
-    char uniname2ctype_pool_str84[sizeof("java")];
-    char uniname2ctype_pool_str88[sizeof("zinh")];
-    char uniname2ctype_pool_str89[sizeof("thaa")];
-    char uniname2ctype_pool_str90[sizeof("thai")];
-    char uniname2ctype_pool_str91[sizeof("variationselector")];
-    char uniname2ctype_pool_str92[sizeof("sinhala")];
-    char uniname2ctype_pool_str93[sizeof("joinc")];
-    char uniname2ctype_pool_str94[sizeof("ascii")];
-    char uniname2ctype_pool_str95[sizeof("initialpunctuation")];
-    char uniname2ctype_pool_str98[sizeof("other")];
-    char uniname2ctype_pool_str99[sizeof("joincontrol")];
-    char uniname2ctype_pool_str100[sizeof("thaana")];
-    char uniname2ctype_pool_str101[sizeof("avst")];
-    char uniname2ctype_pool_str103[sizeof("olower")];
-    char uniname2ctype_pool_str105[sizeof("othernumber")];
-    char uniname2ctype_pool_str106[sizeof("otherletter")];
-    char uniname2ctype_pool_str109[sizeof("sinh")];
-    char uniname2ctype_pool_str112[sizeof("tale")];
-    char uniname2ctype_pool_str114[sizeof("connectorpunctuation")];
-    char uniname2ctype_pool_str115[sizeof("s")];
-    char uniname2ctype_pool_str116[sizeof("di")];
-    char uniname2ctype_pool_str117[sizeof("vs")];
-    char uniname2ctype_pool_str119[sizeof("oidc")];
-    char uniname2ctype_pool_str120[sizeof("idc")];
-    char uniname2ctype_pool_str121[sizeof("odi")];
-    char uniname2ctype_pool_str122[sizeof("cs")];
-    char uniname2ctype_pool_str123[sizeof("avestan")];
-    char uniname2ctype_pool_str124[sizeof("dia")];
-    char uniname2ctype_pool_str125[sizeof("cher")];
-    char uniname2ctype_pool_str126[sizeof("inscriptionalparthian")];
-    char uniname2ctype_pool_str128[sizeof("shavian")];
-    char uniname2ctype_pool_str137[sizeof("radical")];
-    char uniname2ctype_pool_str143[sizeof("loe")];
-    char uniname2ctype_pool_str147[sizeof("diacritic")];
-    char uniname2ctype_pool_str148[sizeof("zzzz")];
-    char uniname2ctype_pool_str149[sizeof("ethi")];
-    char uniname2ctype_pool_str151[sizeof("canadianaboriginal")];
-    char uniname2ctype_pool_str152[sizeof("zs")];
-    char uniname2ctype_pool_str153[sizeof("othersymbol")];
-    char uniname2ctype_pool_str156[sizeof("olditalic")];
-    char uniname2ctype_pool_str161[sizeof("inscriptionalpahlavi")];
-    char uniname2ctype_pool_str162[sizeof("taiviet")];
-    char uniname2ctype_pool_str163[sizeof("lineseparator")];
-    char uniname2ctype_pool_str166[sizeof("otheridstart")];
-    char uniname2ctype_pool_str170[sizeof("oids")];
-    char uniname2ctype_pool_str171[sizeof("asciihexdigit")];
-    char uniname2ctype_pool_str172[sizeof("inherited")];
-    char uniname2ctype_pool_str174[sizeof("otherlowercase")];
-    char uniname2ctype_pool_str175[sizeof("terminalpunctuation")];
-    char uniname2ctype_pool_str176[sizeof("deva")];
-    char uniname2ctype_pool_str179[sizeof("otheralphabetic")];
-    char uniname2ctype_pool_str180[sizeof("ideo")];
-    char uniname2ctype_pool_str181[sizeof("noncharactercodepoint")];
-    char uniname2ctype_pool_str183[sizeof("otheridcontinue")];
-    char uniname2ctype_pool_str187[sizeof("taile")];
-    char uniname2ctype_pool_str190[sizeof("oldpersian")];
-    char uniname2ctype_pool_str192[sizeof("devanagari")];
-    char uniname2ctype_pool_str193[sizeof("letter")];
-    char uniname2ctype_pool_str195[sizeof("nd")];
-    char uniname2ctype_pool_str197[sizeof("idst")];
-    char uniname2ctype_pool_str198[sizeof("dsrt")];
-    char uniname2ctype_pool_str200[sizeof("titlecaseletter")];
-    char uniname2ctype_pool_str202[sizeof("po")];
-    char uniname2ctype_pool_str203[sizeof("dash")];
-    char uniname2ctype_pool_str206[sizeof("pc")];
-    char uniname2ctype_pool_str209[sizeof("letternumber")];
-    char uniname2ctype_pool_str212[sizeof("pi")];
-    char uniname2ctype_pool_str215[sizeof("javanese")];
-    char uniname2ctype_pool_str217[sizeof("mn")];
-    char uniname2ctype_pool_str218[sizeof("idstart")];
-    char uniname2ctype_pool_str220[sizeof("idcontinue")];
-    char uniname2ctype_pool_str222[sizeof("ids")];
-    char uniname2ctype_pool_str223[sizeof("alpha")];
-    char uniname2ctype_pool_str227[sizeof("mc")];
-    char uniname2ctype_pool_str229[sizeof("coptic")];
-    char uniname2ctype_pool_str234[sizeof("mongolian")];
-    char uniname2ctype_pool_str235[sizeof("common")];
-    char uniname2ctype_pool_str236[sizeof("armn")];
-    char uniname2ctype_pool_str237[sizeof("copt")];
-    char uniname2ctype_pool_str243[sizeof("cprt")];
-    char uniname2ctype_pool_str244[sizeof("armi")];
-    char uniname2ctype_pool_str245[sizeof("phli")];
-    char uniname2ctype_pool_str246[sizeof("prti")];
-    char uniname2ctype_pool_str250[sizeof("armenian")];
-    char uniname2ctype_pool_str251[sizeof("sd")];
-    char uniname2ctype_pool_str252[sizeof("mandaic")];
-    char uniname2ctype_pool_str255[sizeof("phoenician")];
-    char uniname2ctype_pool_str258[sizeof("taml")];
-    char uniname2ctype_pool_str261[sizeof("tamil")];
-    char uniname2ctype_pool_str268[sizeof("cased")];
-    char uniname2ctype_pool_str269[sizeof("cham")];
-    char uniname2ctype_pool_str270[sizeof("idsbinaryoperator")];
-    char uniname2ctype_pool_str271[sizeof("lepc")];
-    char uniname2ctype_pool_str275[sizeof("otherdefaultignorablecodepoint")];
-    char uniname2ctype_pool_str278[sizeof("print")];
-    char uniname2ctype_pool_str286[sizeof("osma")];
-    char uniname2ctype_pool_str292[sizeof("samr")];
-    char uniname2ctype_pool_str294[sizeof("math")];
-    char uniname2ctype_pool_str296[sizeof("linb")];
-    char uniname2ctype_pool_str297[sizeof("closepunctuation")];
-    char uniname2ctype_pool_str301[sizeof("otherpunctuation")];
-    char uniname2ctype_pool_str303[sizeof("bali")];
-    char uniname2ctype_pool_str306[sizeof("omath")];
-    char uniname2ctype_pool_str307[sizeof("samaritan")];
-    char uniname2ctype_pool_str308[sizeof("ps")];
-    char uniname2ctype_pool_str310[sizeof("arab")];
-    char uniname2ctype_pool_str311[sizeof("brai")];
-    char uniname2ctype_pool_str314[sizeof("taitham")];
-    char uniname2ctype_pool_str317[sizeof("linearb")];
-    char uniname2ctype_pool_str321[sizeof("lepcha")];
-    char uniname2ctype_pool_str322[sizeof("mand")];
-    char uniname2ctype_pool_str324[sizeof("mtei")];
-    char uniname2ctype_pool_str325[sizeof("term")];
-    char uniname2ctype_pool_str326[sizeof("glagolitic")];
-    char uniname2ctype_pool_str327[sizeof("privateuse")];
-    char uniname2ctype_pool_str328[sizeof("pe")];
-    char uniname2ctype_pool_str335[sizeof("deseret")];
-    char uniname2ctype_pool_str340[sizeof("brah")];
-    char uniname2ctype_pool_str341[sizeof("runr")];
-    char uniname2ctype_pool_str343[sizeof("othermath")];
-    char uniname2ctype_pool_str344[sizeof("runic")];
-    char uniname2ctype_pool_str345[sizeof("hang")];
-    char uniname2ctype_pool_str346[sizeof("ethiopic")];
-    char uniname2ctype_pool_str349[sizeof("me")];
-    char uniname2ctype_pool_str350[sizeof("patws")];
-    char uniname2ctype_pool_str353[sizeof("separator")];
-    char uniname2ctype_pool_str355[sizeof("tibt")];
-    char uniname2ctype_pool_str356[sizeof("gothic")];
-    char uniname2ctype_pool_str358[sizeof("tagbanwa")];
-    char uniname2ctype_pool_str359[sizeof("sarb")];
-    char uniname2ctype_pool_str361[sizeof("talu")];
-    char uniname2ctype_pool_str367[sizeof("tibetan")];
-    char uniname2ctype_pool_str371[sizeof("goth")];
-    char uniname2ctype_pool_str372[sizeof("rjng")];
-    char uniname2ctype_pool_str373[sizeof("hangul")];
-    char uniname2ctype_pool_str374[sizeof("bengali")];
-    char uniname2ctype_pool_str375[sizeof("hiragana")];
-    char uniname2ctype_pool_str376[sizeof("braille")];
-    char uniname2ctype_pool_str379[sizeof("geor")];
-    char uniname2ctype_pool_str380[sizeof("age=1.1")];
-    char uniname2ctype_pool_str381[sizeof("age=2.1")];
-    char uniname2ctype_pool_str382[sizeof("age=5.1")];
-    char uniname2ctype_pool_str383[sizeof("age=5.2")];
-    char uniname2ctype_pool_str384[sizeof("age=4.1")];
-    char uniname2ctype_pool_str385[sizeof("p")];
-    char uniname2ctype_pool_str386[sizeof("pd")];
-    char uniname2ctype_pool_str388[sizeof("lisu")];
-    char uniname2ctype_pool_str389[sizeof("age=2.0")];
-    char uniname2ctype_pool_str390[sizeof("age=5.0")];
-    char uniname2ctype_pool_str391[sizeof("age=6.0")];
-    char uniname2ctype_pool_str392[sizeof("age=4.0")];
-    char uniname2ctype_pool_str393[sizeof("graph")];
-    char uniname2ctype_pool_str395[sizeof("saur")];
-    char uniname2ctype_pool_str396[sizeof("space")];
-    char uniname2ctype_pool_str397[sizeof("age=3.1")];
-    char uniname2ctype_pool_str398[sizeof("age=3.2")];
-    char uniname2ctype_pool_str399[sizeof("hebr")];
-    char uniname2ctype_pool_str402[sizeof("bidic")];
-    char uniname2ctype_pool_str405[sizeof("age=3.0")];
-    char uniname2ctype_pool_str408[sizeof("bidicontrol")];
-    char uniname2ctype_pool_str413[sizeof("logicalorderexception")];
-    char uniname2ctype_pool_str420[sizeof("telu")];
-    char uniname2ctype_pool_str422[sizeof("zp")];
-    char uniname2ctype_pool_str427[sizeof("m")];
-    char uniname2ctype_pool_str430[sizeof("lm")];
-    char uniname2ctype_pool_str432[sizeof("idstrinaryoperator")];
-    char uniname2ctype_pool_str433[sizeof("balinese")];
-    char uniname2ctype_pool_str434[sizeof("uideo")];
-    char uniname2ctype_pool_str436[sizeof("spaceseparator")];
-    char uniname2ctype_pool_str438[sizeof("grext")];
-    char uniname2ctype_pool_str442[sizeof("alnum")];
-    char uniname2ctype_pool_str443[sizeof("oldturkic")];
-    char uniname2ctype_pool_str445[sizeof("xidc")];
-    char uniname2ctype_pool_str446[sizeof("idsb")];
-    char uniname2ctype_pool_str447[sizeof("ahex")];
-    char uniname2ctype_pool_str452[sizeof("format")];
-    char uniname2ctype_pool_str456[sizeof("caseignorable")];
-    char uniname2ctype_pool_str457[sizeof("tifinagh")];
-    char uniname2ctype_pool_str459[sizeof("sundanese")];
-    char uniname2ctype_pool_str462[sizeof("ext")];
-    char uniname2ctype_pool_str464[sizeof("saurashtra")];
-    char uniname2ctype_pool_str465[sizeof("patternwhitespace")];
-    char uniname2ctype_pool_str466[sizeof("digit")];
-    char uniname2ctype_pool_str474[sizeof("sund")];
-    char uniname2ctype_pool_str480[sizeof("decimalnumber")];
-    char uniname2ctype_pool_str484[sizeof("bopo")];
-    char uniname2ctype_pool_str485[sizeof("sm")];
-    char uniname2ctype_pool_str488[sizeof("otheruppercase")];
-    char uniname2ctype_pool_str493[sizeof("ideographic")];
-    char uniname2ctype_pool_str496[sizeof("xids")];
-    char uniname2ctype_pool_str497[sizeof("unassigned")];
-    char uniname2ctype_pool_str502[sizeof("phagspa")];
-    char uniname2ctype_pool_str506[sizeof("alphabetic")];
-    char uniname2ctype_pool_str508[sizeof("limb")];
-    char uniname2ctype_pool_str512[sizeof("xdigit")];
-    char uniname2ctype_pool_str513[sizeof("xidstart")];
-    char uniname2ctype_pool_str516[sizeof("mong")];
-    char uniname2ctype_pool_str518[sizeof("xidcontinue")];
-    char uniname2ctype_pool_str521[sizeof("assigned")];
-    char uniname2ctype_pool_str523[sizeof("ogam")];
-    char uniname2ctype_pool_str529[sizeof("nko")];
-    char uniname2ctype_pool_str530[sizeof("nkoo")];
-    char uniname2ctype_pool_str533[sizeof("olck")];
-    char uniname2ctype_pool_str534[sizeof("deprecated")];
-    char uniname2ctype_pool_str535[sizeof("brahmi")];
-    char uniname2ctype_pool_str536[sizeof("phag")];
-    char uniname2ctype_pool_str538[sizeof("kana")];
-    char uniname2ctype_pool_str540[sizeof("kali")];
-    char uniname2ctype_pool_str542[sizeof("changeswhenlowercased")];
-    char uniname2ctype_pool_str543[sizeof("extender")];
-    char uniname2ctype_pool_str550[sizeof("dep")];
-    char uniname2ctype_pool_str554[sizeof("olchiki")];
-    char uniname2ctype_pool_str562[sizeof("cwl")];
-    char uniname2ctype_pool_str563[sizeof("graphemebase")];
-    char uniname2ctype_pool_str565[sizeof("phnx")];
-    char uniname2ctype_pool_str573[sizeof("orkh")];
-    char uniname2ctype_pool_str576[sizeof("punct")];
-    char uniname2ctype_pool_str577[sizeof("khar")];
-    char uniname2ctype_pool_str580[sizeof("lower")];
-    char uniname2ctype_pool_str586[sizeof("sterm")];
-    char uniname2ctype_pool_str587[sizeof("yi")];
-    char uniname2ctype_pool_str588[sizeof("lyci")];
-    char uniname2ctype_pool_str589[sizeof("cyrl")];
-    char uniname2ctype_pool_str591[sizeof("lycian")];
-    char uniname2ctype_pool_str592[sizeof("finalpunctuation")];
-    char uniname2ctype_pool_str593[sizeof("orya")];
-    char uniname2ctype_pool_str594[sizeof("graphemeextend")];
-    char uniname2ctype_pool_str596[sizeof("kaithi")];
-    char uniname2ctype_pool_str597[sizeof("xpeo")];
-    char uniname2ctype_pool_str598[sizeof("yiii")];
-    char uniname2ctype_pool_str599[sizeof("kthi")];
-    char uniname2ctype_pool_str601[sizeof("cyrillic")];
-    char uniname2ctype_pool_str602[sizeof("glag")];
-    char uniname2ctype_pool_str605[sizeof("oupper")];
-    char uniname2ctype_pool_str617[sizeof("tagb")];
-    char uniname2ctype_pool_str620[sizeof("cwt")];
-    char uniname2ctype_pool_str623[sizeof("number")];
-    char uniname2ctype_pool_str625[sizeof("tglg")];
-    char uniname2ctype_pool_str626[sizeof("knda")];
-    char uniname2ctype_pool_str627[sizeof("lowercaseletter")];
-    char uniname2ctype_pool_str628[sizeof("changeswhentitlecased")];
-    char uniname2ctype_pool_str629[sizeof("softdotted")];
-    char uniname2ctype_pool_str632[sizeof("ugar")];
-    char uniname2ctype_pool_str634[sizeof("sylo")];
-    char uniname2ctype_pool_str636[sizeof("lu")];
-    char uniname2ctype_pool_str640[sizeof("tagalog")];
-    char uniname2ctype_pool_str643[sizeof("kharoshthi")];
-    char uniname2ctype_pool_str644[sizeof("syrc")];
-    char uniname2ctype_pool_str645[sizeof("kannada")];
-    char uniname2ctype_pool_str646[sizeof("beng")];
-    char uniname2ctype_pool_str647[sizeof("lowercase")];
-    char uniname2ctype_pool_str656[sizeof("shaw")];
-    char uniname2ctype_pool_str659[sizeof("patternsyntax")];
-    char uniname2ctype_pool_str660[sizeof("syriac")];
-    char uniname2ctype_pool_str663[sizeof("word")];
-    char uniname2ctype_pool_str667[sizeof("imperialaramaic")];
-    char uniname2ctype_pool_str672[sizeof("ugaritic")];
-    char uniname2ctype_pool_str675[sizeof("enclosingmark")];
-    char uniname2ctype_pool_str677[sizeof("georgian")];
-    char uniname2ctype_pool_str678[sizeof("lydi")];
-    char uniname2ctype_pool_str681[sizeof("lydian")];
-    char uniname2ctype_pool_str686[sizeof("sylotinagri")];
-    char uniname2ctype_pool_str687[sizeof("gujr")];
-    char uniname2ctype_pool_str692[sizeof("tfng")];
-    char uniname2ctype_pool_str696[sizeof("currencysymbol")];
-    char uniname2ctype_pool_str701[sizeof("newline")];
-    char uniname2ctype_pool_str705[sizeof("bopomofo")];
-    char uniname2ctype_pool_str706[sizeof("ogrext")];
-    char uniname2ctype_pool_str707[sizeof("cherokee")];
-    char uniname2ctype_pool_str708[sizeof("gujarati")];
-    char uniname2ctype_pool_str710[sizeof("newtailue")];
-    char uniname2ctype_pool_str716[sizeof("dashpunctuation")];
-    char uniname2ctype_pool_str718[sizeof("oldsoutharabian")];
-    char uniname2ctype_pool_str725[sizeof("upper")];
-    char uniname2ctype_pool_str732[sizeof("cf")];
-    char uniname2ctype_pool_str734[sizeof("buhd")];
-    char uniname2ctype_pool_str735[sizeof("rejang")];
-    char uniname2ctype_pool_str736[sizeof("othergraphemeextend")];
-    char uniname2ctype_pool_str739[sizeof("modifierletter")];
-    char uniname2ctype_pool_str745[sizeof("nonspacingmark")];
-    char uniname2ctype_pool_str749[sizeof("changeswhencasemapped")];
-    char uniname2ctype_pool_str752[sizeof("mark")];
-    char uniname2ctype_pool_str757[sizeof("surrogate")];
-    char uniname2ctype_pool_str765[sizeof("paragraphseparator")];
-    char uniname2ctype_pool_str767[sizeof("ogham")];
-    char uniname2ctype_pool_str768[sizeof("hex")];
-    char uniname2ctype_pool_str772[sizeof("uppercaseletter")];
-    char uniname2ctype_pool_str777[sizeof("hexdigit")];
-    char uniname2ctype_pool_str778[sizeof("cwcm")];
-    char uniname2ctype_pool_str781[sizeof("grbase")];
-    char uniname2ctype_pool_str782[sizeof("khmr")];
-    char uniname2ctype_pool_str788[sizeof("unifiedideograph")];
-    char uniname2ctype_pool_str792[sizeof("uppercase")];
-    char uniname2ctype_pool_str793[sizeof("khmer")];
-    char uniname2ctype_pool_str795[sizeof("spacingmark")];
-    char uniname2ctype_pool_str797[sizeof("whitespace")];
-    char uniname2ctype_pool_str806[sizeof("patsyn")];
-    char uniname2ctype_pool_str816[sizeof("cypriot")];
-    char uniname2ctype_pool_str818[sizeof("openpunctuation")];
-    char uniname2ctype_pool_str821[sizeof("bamu")];
-    char uniname2ctype_pool_str831[sizeof("buhid")];
-    char uniname2ctype_pool_str840[sizeof("batk")];
-    char uniname2ctype_pool_str851[sizeof("symbol")];
-    char uniname2ctype_pool_str856[sizeof("changeswhenuppercased")];
-    char uniname2ctype_pool_str857[sizeof("osmanya")];
-    char uniname2ctype_pool_str861[sizeof("limbu")];
-    char uniname2ctype_pool_str868[sizeof("punctuation")];
-    char uniname2ctype_pool_str872[sizeof("hyphen")];
-    char uniname2ctype_pool_str888[sizeof("mathsymbol")];
-    char uniname2ctype_pool_str892[sizeof("grek")];
-    char uniname2ctype_pool_str898[sizeof("changeswhencasefolded")];
-    char uniname2ctype_pool_str902[sizeof("quotationmark")];
-    char uniname2ctype_pool_str903[sizeof("bugi")];
-    char uniname2ctype_pool_str916[sizeof("cuneiform")];
-    char uniname2ctype_pool_str918[sizeof("pf")];
-    char uniname2ctype_pool_str927[sizeof("cwcf")];
-    char uniname2ctype_pool_str932[sizeof("bamum")];
-    char uniname2ctype_pool_str940[sizeof("guru")];
-    char uniname2ctype_pool_str944[sizeof("wspace")];
-    char uniname2ctype_pool_str951[sizeof("meeteimayek")];
-    char uniname2ctype_pool_str976[sizeof("defaultignorablecodepoint")];
-    char uniname2ctype_pool_str980[sizeof("modifiersymbol")];
-    char uniname2ctype_pool_str999[sizeof("mlym")];
-    char uniname2ctype_pool_str1007[sizeof("mymr")];
-    char uniname2ctype_pool_str1020[sizeof("malayalam")];
-    char uniname2ctype_pool_str1026[sizeof("myanmar")];
-    char uniname2ctype_pool_str1032[sizeof("telugu")];
-    char uniname2ctype_pool_str1033[sizeof("buginese")];
-    char uniname2ctype_pool_str1037[sizeof("xsux")];
-    char uniname2ctype_pool_str1093[sizeof("sk")];
-    char uniname2ctype_pool_str1097[sizeof("katakana")];
-    char uniname2ctype_pool_str1124[sizeof("egyp")];
-    char uniname2ctype_pool_str1146[sizeof("any")];
-    char uniname2ctype_pool_str1148[sizeof("kayahli")];
-    char uniname2ctype_pool_str1190[sizeof("cwu")];
-    char uniname2ctype_pool_str1263[sizeof("qmark")];
-    char uniname2ctype_pool_str1329[sizeof("blank")];
-    char uniname2ctype_pool_str1347[sizeof("grlink")];
-    char uniname2ctype_pool_str1358[sizeof("batak")];
-    char uniname2ctype_pool_str1395[sizeof("unknown")];
-    char uniname2ctype_pool_str1410[sizeof("greek")];
-    char uniname2ctype_pool_str1463[sizeof("graphemelink")];
-    char uniname2ctype_pool_str1470[sizeof("gurmukhi")];
-    char uniname2ctype_pool_str1556[sizeof("hebrew")];
-    char uniname2ctype_pool_str1621[sizeof("egyptianhieroglyphs")];
-    char uniname2ctype_pool_str1741[sizeof("zyyy")];
-#endif /* USE_UNICODE_PROPERTIES */
-  };
-static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
-  {
-#ifndef USE_UNICODE_PROPERTIES
-    "print",
-    "punct",
-#else /* USE_UNICODE_PROPERTIES */
-    "n",
-    "l",
-    "nl",
-    "ll",
-    "cn",
-    "no",
-    "lo",
-    "c",
-    "co",
-    "cc",
-    "lao",
-    "laoo",
-    "lana",
-    "ci",
-    "qaac",
-    "vai",
-    "vaii",
-    "qaai",
-    "control",
-    "cari",
-    "carian",
-    "zl",
-    "oriya",
-    "latn",
-    "cntrl",
-    "latin",
-    "han",
-    "arabic",
-    "ital",
-    "hano",
-    "hani",
-    "hanunoo",
-    "lt",
-    "so",
-    "hira",
-    "nchar",
-    "sc",
-    "z",
-    "oalpha",
-    "tavt",
-    "cans",
-    "java",
-    "zinh",
-    "thaa",
-    "thai",
-    "variationselector",
-    "sinhala",
-    "joinc",
-    "ascii",
-    "initialpunctuation",
-    "other",
-    "joincontrol",
-    "thaana",
-    "avst",
-    "olower",
-    "othernumber",
-    "otherletter",
-    "sinh",
-    "tale",
-    "connectorpunctuation",
-    "s",
-    "di",
-    "vs",
-    "oidc",
-    "idc",
-    "odi",
-    "cs",
-    "avestan",
-    "dia",
-    "cher",
-    "inscriptionalparthian",
-    "shavian",
-    "radical",
-    "loe",
-    "diacritic",
-    "zzzz",
-    "ethi",
-    "canadianaboriginal",
-    "zs",
-    "othersymbol",
-    "olditalic",
-    "inscriptionalpahlavi",
-    "taiviet",
-    "lineseparator",
-    "otheridstart",
-    "oids",
-    "asciihexdigit",
-    "inherited",
-    "otherlowercase",
-    "terminalpunctuation",
-    "deva",
-    "otheralphabetic",
-    "ideo",
-    "noncharactercodepoint",
-    "otheridcontinue",
-    "taile",
-    "oldpersian",
-    "devanagari",
-    "letter",
-    "nd",
-    "idst",
-    "dsrt",
-    "titlecaseletter",
-    "po",
-    "dash",
-    "pc",
-    "letternumber",
-    "pi",
-    "javanese",
-    "mn",
-    "idstart",
-    "idcontinue",
-    "ids",
-#endif /* USE_UNICODE_PROPERTIES */
-    "alpha",
-#ifdef USE_UNICODE_PROPERTIES
-    "mc",
-    "coptic",
-    "mongolian",
-    "common",
-    "armn",
-    "copt",
-    "cprt",
-    "armi",
-    "phli",
-    "prti",
-    "armenian",
-    "sd",
-    "mandaic",
-    "phoenician",
-    "taml",
-    "tamil",
-    "cased",
-    "cham",
-    "idsbinaryoperator",
-    "lepc",
-    "otherdefaultignorablecodepoint",
-    "print",
-    "osma",
-    "samr",
-    "math",
-    "linb",
-    "closepunctuation",
-    "otherpunctuation",
-    "bali",
-    "omath",
-    "samaritan",
-    "ps",
-    "arab",
-    "brai",
-    "taitham",
-    "linearb",
-    "lepcha",
-    "mand",
-    "mtei",
-    "term",
-    "glagolitic",
-    "privateuse",
-    "pe",
-    "deseret",
-    "brah",
-    "runr",
-    "othermath",
-    "runic",
-    "hang",
-    "ethiopic",
-    "me",
-    "patws",
-    "separator",
-    "tibt",
-    "gothic",
-    "tagbanwa",
-    "sarb",
-    "talu",
-    "tibetan",
-    "goth",
-    "rjng",
-    "hangul",
-    "bengali",
-    "hiragana",
-    "braille",
-    "geor",
-    "age=1.1",
-    "age=2.1",
-    "age=5.1",
-    "age=5.2",
-    "age=4.1",
-    "p",
-    "pd",
-    "lisu",
-    "age=2.0",
-    "age=5.0",
-    "age=6.0",
-    "age=4.0",
-    "graph",
-    "saur",
-    "space",
-    "age=3.1",
-    "age=3.2",
-    "hebr",
-    "bidic",
-    "age=3.0",
-    "bidicontrol",
-    "logicalorderexception",
-    "telu",
-    "zp",
-    "m",
-    "lm",
-    "idstrinaryoperator",
-    "balinese",
-    "uideo",
-    "spaceseparator",
-    "grext",
-#endif /* USE_UNICODE_PROPERTIES */
-    "alnum",
-#ifdef USE_UNICODE_PROPERTIES
-    "oldturkic",
-    "xidc",
-    "idsb",
-    "ahex",
-    "format",
-    "caseignorable",
-    "tifinagh",
-    "sundanese",
-    "ext",
-    "saurashtra",
-    "patternwhitespace",
-    "digit",
-    "sund",
-    "decimalnumber",
-    "bopo",
-    "sm",
-    "otheruppercase",
-    "ideographic",
-    "xids",
-    "unassigned",
-    "phagspa",
-    "alphabetic",
-    "limb",
-#endif /* USE_UNICODE_PROPERTIES */
-    "xdigit",
-#ifdef USE_UNICODE_PROPERTIES
-    "xidstart",
-    "mong",
-    "xidcontinue",
-    "assigned",
-    "ogam",
-    "nko",
-    "nkoo",
-    "olck",
-    "deprecated",
-    "brahmi",
-    "phag",
-    "kana",
-    "kali",
-    "changeswhenlowercased",
-    "extender",
-    "dep",
-    "olchiki",
-    "cwl",
-    "graphemebase",
-    "phnx",
-    "orkh",
-    "punct",
-    "khar",
-    "lower",
-    "sterm",
-    "yi",
-    "lyci",
-    "cyrl",
-    "lycian",
-    "finalpunctuation",
-    "orya",
-    "graphemeextend",
-    "kaithi",
-    "xpeo",
-    "yiii",
-    "kthi",
-    "cyrillic",
-    "glag",
-    "oupper",
-    "tagb",
-    "cwt",
-    "number",
-    "tglg",
-    "knda",
-    "lowercaseletter",
-    "changeswhentitlecased",
-    "softdotted",
-    "ugar",
-    "sylo",
-    "lu",
-    "tagalog",
-    "kharoshthi",
-    "syrc",
-    "kannada",
-    "beng",
-    "lowercase",
-    "shaw",
-    "patternsyntax",
-    "syriac",
-    "word",
-    "imperialaramaic",
-    "ugaritic",
-    "enclosingmark",
-    "georgian",
-    "lydi",
-    "lydian",
-    "sylotinagri",
-    "gujr",
-    "tfng",
-    "currencysymbol",
-#endif /* USE_UNICODE_PROPERTIES */
-    "newline",
-#ifdef USE_UNICODE_PROPERTIES
-    "bopomofo",
-    "ogrext",
-    "cherokee",
-    "gujarati",
-    "newtailue",
-    "dashpunctuation",
-    "oldsoutharabian",
-#endif /* USE_UNICODE_PROPERTIES */
-    "upper",
-#ifndef USE_UNICODE_PROPERTIES
-    "ascii",
-    "cntrl",
-    "space",
-    "word",
-    "lower",
-    "graph",
-    "digit",
-    "blank"
-#else /* USE_UNICODE_PROPERTIES */
-    "cf",
-    "buhd",
-    "rejang",
-    "othergraphemeextend",
-    "modifierletter",
-    "nonspacingmark",
-    "changeswhencasemapped",
-    "mark",
-    "surrogate",
-    "paragraphseparator",
-    "ogham",
-    "hex",
-    "uppercaseletter",
-    "hexdigit",
-    "cwcm",
-    "grbase",
-    "khmr",
-    "unifiedideograph",
-    "uppercase",
-    "khmer",
-    "spacingmark",
-    "whitespace",
-    "patsyn",
-    "cypriot",
-    "openpunctuation",
-    "bamu",
-    "buhid",
-    "batk",
-    "symbol",
-    "changeswhenuppercased",
-    "osmanya",
-    "limbu",
-    "punctuation",
-    "hyphen",
-    "mathsymbol",
-    "grek",
-    "changeswhencasefolded",
-    "quotationmark",
-    "bugi",
-    "cuneiform",
-    "pf",
-    "cwcf",
-    "bamum",
-    "guru",
-    "wspace",
-    "meeteimayek",
-    "defaultignorablecodepoint",
-    "modifiersymbol",
-    "mlym",
-    "mymr",
-    "malayalam",
-    "myanmar",
-    "telugu",
-    "buginese",
-    "xsux",
-    "sk",
-    "katakana",
-    "egyp",
-    "any",
-    "kayahli",
-    "cwu",
-    "qmark",
-    "blank",
-    "grlink",
-    "batak",
-    "unknown",
-    "greek",
-    "graphemelink",
-    "gurmukhi",
-    "hebrew",
-    "egyptianhieroglyphs",
-    "zyyy"
-#endif /* USE_UNICODE_PROPERTIES */
-  };
-#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
-#ifdef __GNUC__
-__inline
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct uniname2ctype_struct *
-uniname2ctype_p (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static const struct uniname2ctype_struct wordlist[] =
-    {
-#ifdef USE_UNICODE_PROPERTIES
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3,                                        33},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5,                                        23},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7,                                       35},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8,                                       24},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10,                                       20},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11,                                       36},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12,                                       26},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                        17},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                       21},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                       18},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21,                                      93},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22,                                     93},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str23,                                    150},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str26,                                       59},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29,                                    127},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30,                                     142},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str31,                                    142},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str32,                                    113},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34,                                  18},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37,                                    147},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40,                                  147},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str42,                                       51},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44,                                    86},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46,                                     74},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str47,                                     3},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str48,                                    74},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51,                                     108},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str53,                                   79},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str54,                                    110},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str55,                                    115},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str60,                                    108},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str63,                                 115},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66,                                       27},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str67,                                       49},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69,                                    105},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70,                                   184},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71,                                       46},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73,                                        50},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74,                                  178},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str75,                                    151},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76,                                    100},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str84,                                    157},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str88,                                    113},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str89,                                     81},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str90,                                     92},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91,                       197},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92,                                  91},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str93,                                   170},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94,                                    14},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str95,                       42},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98,                                    17},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99,                             170},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100,                                   81},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101,                                    152},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103,                                  182},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str105,                              36},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106,                              26},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str109,                                     91},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str112,                                    119},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114,                     38},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str115,                                        45},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116,                                       69},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str117,                                      197},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str119,                                    195},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str120,                                      66},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str121,                                     190},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str122,                                       22},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123,                                 152},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str124,                                     180},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str125,                                     99},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str126,                   161},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128,                                 122},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str137,                                 188},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str143,                                     193},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147,                               180},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str148,                                    200},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str149,                                     98},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151,                      100},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152,                                       53},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str153,                              49},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156,                               110},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str161,                    162},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str162,                                 151},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str163,                            51},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str166,                            194},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str170,                                    194},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str171,                           177},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str172,                               113},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str174,                          182},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str175,                     174},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str176,                                     82},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str179,                         178},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str180,                                    179},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str181,                   184},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str183,                         195},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str187,                                   119},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str190,                              132},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str192,                               82},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str193,                                   23},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str195,                                       34},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str197,                                    187},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str198,                                    112},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str200,                          27},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str202,                                       43},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203,                                    171},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str206,                                       38},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str209,                             35},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str212,                                       42},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str215,                                157},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str217,                                       32},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218,                                  65},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220,                               66},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str222,                                      65},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str223,                                     1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227,                                       30},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str229,                                  127},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str234,                               104},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str235,                                   73},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str236,                                     77},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str237,                                    127},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str243,                                    124},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str244,                                    159},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245,                                    162},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str246,                                    161},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str250,                                 77},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str251,                                      192},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str252,                                 167},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str255,                              136},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str258,                                     87},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str261,                                    87},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str268,                                    58},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str269,                                    149},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str270,                       186},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str271,                                    140},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str275,          190},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str278,                                     7},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str286,                                    123},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str292,                                    154},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str294,                                     54},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str296,                                    120},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str297,                         40},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str301,                         43},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str303,                                    134},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str306,                                   175},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str307,                               154},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str308,                                       44},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str310,                                     79},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str311,                                    125},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str314,                                 150},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317,                                 120},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str321,                                  140},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str322,                                    167},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str324,                                    158},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str325,                                    174},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str326,                              129},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str327,                               21},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str328,                                       40},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str335,                                 112},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str340,                                    166},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str341,                                    102},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str343,                               175},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str344,                                   102},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str345,                                     97},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str346,                                 98},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str349,                                       31},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str350,                                   198},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353,                                50},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str355,                                     94},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str356,                                  111},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str358,                                117},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str359,                                    160},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str361,                                    128},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str367,                                  94},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str371,                                    111},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372,                                    145},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str373,                                   97},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str374,                                  83},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375,                                105},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str376,                                 125},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str379,                                     96},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str380,                                 201},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str381,                                 203},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str382,                                 210},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str383,                                 211},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str384,                                 208},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str385,                                        37},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str386,                                       39},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str388,                                    155},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str389,                                 202},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str390,                                 209},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str391,                                 212},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str392,                                 207},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str393,                                     5},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str395,                                    143},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str396,                                     9},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str397,                                 205},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str398,                                 206},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str399,                                     78},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str402,                                   169},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str405,                                 204},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str408,                             169},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str413,                   193},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str420,                                     88},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str422,                                       52},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427,                                        29},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430,                                       25},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str432,                      187},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str433,                                134},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str434,                                   189},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str436,                           53},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str438,                                    70},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str442,                                    13},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str443,                               163},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445,                                     68},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str446,                                    186},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str447,                                    177},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str452,                                   19},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str456,                            59},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str457,                                130},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str459,                               139},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str462,                                     181},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str464,                              143},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str465,                       198},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str466,                                     4},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474,                                    139},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str480,                            34},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str484,                                    107},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485,                                       48},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str488,                          183},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str493,                             179},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str496,                                     67},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str497,                               20},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502,                                 137},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str506,                               55},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str508,                                    118},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str512,                                   11},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str513,                                 67},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str516,                                    104},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str518,                              68},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str521,                                 16},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str523,                                    101},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str529,                                     138},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str530,                                    138},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str533,                                    141},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str534,                              191},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str535,                                  166},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str536,                                    137},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str538,                                    106},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str540,                                    144},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str542,                    60},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str543,                                181},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str550,                                     191},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str554,                                 141},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str562,                                      60},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str563,                             71},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str565,                                    136},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str573,                                    163},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str576,                                     8},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str577,                                    133},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str580,                                     6},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str586,                                   196},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587,                                      109},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str588,                                    146},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str589,                                     76},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str591,                                  146},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str592,                         41},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str593,                                     86},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594,                           70},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str596,                                  164},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str597,                                    132},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str598,                                    109},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str599,                                    164},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str601,                                 76},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str602,                                    129},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str605,                                  183},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str617,                                    117},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str620,                                      62},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623,                                   33},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str625,                                    114},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str626,                                     89},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str627,                          24},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str628,                    62},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str629,                              192},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str632,                                    121},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str634,                                    131},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str636,                                       28},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640,                                 114},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str643,                              133},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str644,                                     80},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str645,                                  89},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646,                                     83},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str647,                                56},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str656,                                    122},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str659,                           199},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660,                                   80},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str663,                                     12},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str667,                         159},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str672,                                121},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str675,                            31},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str677,                                 96},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str678,                                    148},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str681,                                  148},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str686,                             131},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str687,                                     85},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str692,                                    130},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str696,                           46},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701,                                   0},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str705,                                107},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str706,                                  185},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str707,                                 99},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str708,                                 85},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str710,                               128},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str716,                          39},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str718,                         160},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str725,                                    10},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str732,                                       19},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str734,                                    116},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str735,                                  145},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str736,                     185},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str739,                           25},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str745,                           32},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str749,                    64},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str752,                                     29},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str757,                                22},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str765,                       52},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str767,                                   101},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str768,                                     176},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str772,                          28},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str777,                                176},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str778,                                     64},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str781,                                   71},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str782,                                    103},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str788,                        189},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str792,                                57},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str793,                                   103},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str795,                              30},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str797,                              168},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str806,                                  199},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str816,                                 124},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str818,                          44},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str821,                                    156},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str831,                                   116},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str840,                                    165},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str851,                                   45},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str856,                    61},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str857,                                 123},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str861,                                   118},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str868,                              37},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str872,                                  172},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str888,                               48},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str892,                                     75},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str898,                    63},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str902,                           173},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str903,                                    126},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str916,                               135},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str918,                                       41},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str927,                                     63},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str932,                                   156},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str940,                                     84},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str944,                                  168},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str951,                             158},
-      {-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_str976,                69},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str980,                           47},
-      {-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_str999,                                     90},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1007,                                     95},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1020,                                90},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1026,                                  95},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1032,                                   88},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1033,                                126},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1037,                                    135},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str1093,                                       47},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1097,                                106},
-      {-1}, {-1}, {-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_str1124,                                    153},
-      {-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_str1146,                                      15},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1148,                                 144},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str1190,                                      61},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-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_str1263,                                   173},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str1329,                                     2},
-      {-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_str1347,                                   72},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1358,                                   165},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-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_str1395,                                 200},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1410,                                    75},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#endif /* USE_UNICODE_PROPERTIES */
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#ifndef USE_UNICODE_PROPERTIES
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7,                                     7},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8,                                     8},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9,                                     1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10,                                    13},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11,                                   11},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12,                                   0},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                    10},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14,                                    14},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                     3},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                     9},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17,                                     12},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                     6},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19,                                     5},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                     4},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21,                                     2}
-#else /* USE_UNICODE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1463,                             72},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1470,                                 84},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str1556,                                   78},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1621,                     153},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1741,                                     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
deleted file mode 100644
index a45ea59a4b..0000000000
--- a/enc/unicode/name2ctype.h.blt
+++ /dev/null
@@ -1,23866 +0,0 @@
-/* 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
-
-#ifdef USE_UNICODE_PROPERTIES
-#ifdef USE_UNICODE_PROPERTIES
-/* 'Any': - */
-static const OnigCodePoint CR_Any[] = {
-	1,
-	0x0000, 0x10ffff,
-}; /* CR_Any */
-
-/* 'Assigned': - */
-static const OnigCodePoint CR_Assigned[] = {
-	501,
-	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,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	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,
-	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[] = {
-	20,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-	0x00ad, 0x00ad,
-	0x0600, 0x0603,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x17b4, 0x17b5,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x206a, 0x206f,
-	0xd800, 0xf8ff,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xf0000, 0xffffd,
-	0x100000, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-static const OnigCodePoint CR_Cc[] = {
-	2,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-}; /* CR_Cc */
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
-	15,
-	0x00ad, 0x00ad,
-	0x0600, 0x0603,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x17b4, 0x17b5,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x206a, 0x206f,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
-	501,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x0604, 0x0605,
-	0x061c, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 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,
-	0x0af0, 0x0af0,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	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,
-	0x0ede, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10cf,
-	0x10fd, 0x10ff,
-	0x1249, 0x1249,
-	0x124e, 0x124f,
-	0x1257, 0x1257,
-	0x1259, 0x1259,
-	0x125e, 0x125f,
-	0x1289, 0x1289,
-	0x128e, 0x128f,
-	0x12b1, 0x12b1,
-	0x12b6, 0x12b7,
-	0x12bf, 0x12bf,
-	0x12c1, 0x12c1,
-	0x12c6, 0x12c7,
-	0x12d7, 0x12d7,
-	0x1311, 0x1311,
-	0x1316, 0x1317,
-	0x135b, 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,
-	0x1bab, 0x1bad,
-	0x1bba, 0x1bbf,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1ccf,
-	0x1cf3, 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,
-	0x27cb, 0x27cb,
-	0x27cd, 0x27cd,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf2, 0x2cf8,
-	0x2d26, 0x2d2f,
-	0x2d66, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e32, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcc, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa674, 0xa67b,
-	0xa698, 0xa69f,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa792, 0xa79f,
-	0xa7aa, 0xa7f9,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaae0, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xd7ff,
-	0xfa2e, 0xfa2f,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	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, 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, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 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, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16a, 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, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f600, 0x1f600,
-	0x1f611, 0x1f611,
-	0x1f615, 0x1f615,
-	0x1f617, 0x1f617,
-	0x1f619, 0x1f619,
-	0x1f61b, 0x1f61b,
-	0x1f61f, 0x1f61f,
-	0x1f626, 0x1f627,
-	0x1f62c, 0x1f62c,
-	0x1f62e, 0x1f62f,
-	0x1f634, 0x1f634,
-	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[] = {
-	435,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3006,
-	0x3031, 0x3035,
-	0x303b, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6e5,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
-	609,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00df, 0x00f6,
-	0x00f8, 0x00ff,
-	0x0101, 0x0101,
-	0x0103, 0x0103,
-	0x0105, 0x0105,
-	0x0107, 0x0107,
-	0x0109, 0x0109,
-	0x010b, 0x010b,
-	0x010d, 0x010d,
-	0x010f, 0x010f,
-	0x0111, 0x0111,
-	0x0113, 0x0113,
-	0x0115, 0x0115,
-	0x0117, 0x0117,
-	0x0119, 0x0119,
-	0x011b, 0x011b,
-	0x011d, 0x011d,
-	0x011f, 0x011f,
-	0x0121, 0x0121,
-	0x0123, 0x0123,
-	0x0125, 0x0125,
-	0x0127, 0x0127,
-	0x0129, 0x0129,
-	0x012b, 0x012b,
-	0x012d, 0x012d,
-	0x012f, 0x012f,
-	0x0131, 0x0131,
-	0x0133, 0x0133,
-	0x0135, 0x0135,
-	0x0137, 0x0138,
-	0x013a, 0x013a,
-	0x013c, 0x013c,
-	0x013e, 0x013e,
-	0x0140, 0x0140,
-	0x0142, 0x0142,
-	0x0144, 0x0144,
-	0x0146, 0x0146,
-	0x0148, 0x0149,
-	0x014b, 0x014b,
-	0x014d, 0x014d,
-	0x014f, 0x014f,
-	0x0151, 0x0151,
-	0x0153, 0x0153,
-	0x0155, 0x0155,
-	0x0157, 0x0157,
-	0x0159, 0x0159,
-	0x015b, 0x015b,
-	0x015d, 0x015d,
-	0x015f, 0x015f,
-	0x0161, 0x0161,
-	0x0163, 0x0163,
-	0x0165, 0x0165,
-	0x0167, 0x0167,
-	0x0169, 0x0169,
-	0x016b, 0x016b,
-	0x016d, 0x016d,
-	0x016f, 0x016f,
-	0x0171, 0x0171,
-	0x0173, 0x0173,
-	0x0175, 0x0175,
-	0x0177, 0x0177,
-	0x017a, 0x017a,
-	0x017c, 0x017c,
-	0x017e, 0x0180,
-	0x0183, 0x0183,
-	0x0185, 0x0185,
-	0x0188, 0x0188,
-	0x018c, 0x018d,
-	0x0192, 0x0192,
-	0x0195, 0x0195,
-	0x0199, 0x019b,
-	0x019e, 0x019e,
-	0x01a1, 0x01a1,
-	0x01a3, 0x01a3,
-	0x01a5, 0x01a5,
-	0x01a8, 0x01a8,
-	0x01aa, 0x01ab,
-	0x01ad, 0x01ad,
-	0x01b0, 0x01b0,
-	0x01b4, 0x01b4,
-	0x01b6, 0x01b6,
-	0x01b9, 0x01ba,
-	0x01bd, 0x01bf,
-	0x01c6, 0x01c6,
-	0x01c9, 0x01c9,
-	0x01cc, 0x01cc,
-	0x01ce, 0x01ce,
-	0x01d0, 0x01d0,
-	0x01d2, 0x01d2,
-	0x01d4, 0x01d4,
-	0x01d6, 0x01d6,
-	0x01d8, 0x01d8,
-	0x01da, 0x01da,
-	0x01dc, 0x01dd,
-	0x01df, 0x01df,
-	0x01e1, 0x01e1,
-	0x01e3, 0x01e3,
-	0x01e5, 0x01e5,
-	0x01e7, 0x01e7,
-	0x01e9, 0x01e9,
-	0x01eb, 0x01eb,
-	0x01ed, 0x01ed,
-	0x01ef, 0x01f0,
-	0x01f3, 0x01f3,
-	0x01f5, 0x01f5,
-	0x01f9, 0x01f9,
-	0x01fb, 0x01fb,
-	0x01fd, 0x01fd,
-	0x01ff, 0x01ff,
-	0x0201, 0x0201,
-	0x0203, 0x0203,
-	0x0205, 0x0205,
-	0x0207, 0x0207,
-	0x0209, 0x0209,
-	0x020b, 0x020b,
-	0x020d, 0x020d,
-	0x020f, 0x020f,
-	0x0211, 0x0211,
-	0x0213, 0x0213,
-	0x0215, 0x0215,
-	0x0217, 0x0217,
-	0x0219, 0x0219,
-	0x021b, 0x021b,
-	0x021d, 0x021d,
-	0x021f, 0x021f,
-	0x0221, 0x0221,
-	0x0223, 0x0223,
-	0x0225, 0x0225,
-	0x0227, 0x0227,
-	0x0229, 0x0229,
-	0x022b, 0x022b,
-	0x022d, 0x022d,
-	0x022f, 0x022f,
-	0x0231, 0x0231,
-	0x0233, 0x0239,
-	0x023c, 0x023c,
-	0x023f, 0x0240,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0293,
-	0x0295, 0x02af,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	0x0390, 0x0390,
-	0x03ac, 0x03ce,
-	0x03d0, 0x03d1,
-	0x03d5, 0x03d7,
-	0x03d9, 0x03d9,
-	0x03db, 0x03db,
-	0x03dd, 0x03dd,
-	0x03df, 0x03df,
-	0x03e1, 0x03e1,
-	0x03e3, 0x03e3,
-	0x03e5, 0x03e5,
-	0x03e7, 0x03e7,
-	0x03e9, 0x03e9,
-	0x03eb, 0x03eb,
-	0x03ed, 0x03ed,
-	0x03ef, 0x03f3,
-	0x03f5, 0x03f5,
-	0x03f8, 0x03f8,
-	0x03fb, 0x03fc,
-	0x0430, 0x045f,
-	0x0461, 0x0461,
-	0x0463, 0x0463,
-	0x0465, 0x0465,
-	0x0467, 0x0467,
-	0x0469, 0x0469,
-	0x046b, 0x046b,
-	0x046d, 0x046d,
-	0x046f, 0x046f,
-	0x0471, 0x0471,
-	0x0473, 0x0473,
-	0x0475, 0x0475,
-	0x0477, 0x0477,
-	0x0479, 0x0479,
-	0x047b, 0x047b,
-	0x047d, 0x047d,
-	0x047f, 0x047f,
-	0x0481, 0x0481,
-	0x048b, 0x048b,
-	0x048d, 0x048d,
-	0x048f, 0x048f,
-	0x0491, 0x0491,
-	0x0493, 0x0493,
-	0x0495, 0x0495,
-	0x0497, 0x0497,
-	0x0499, 0x0499,
-	0x049b, 0x049b,
-	0x049d, 0x049d,
-	0x049f, 0x049f,
-	0x04a1, 0x04a1,
-	0x04a3, 0x04a3,
-	0x04a5, 0x04a5,
-	0x04a7, 0x04a7,
-	0x04a9, 0x04a9,
-	0x04ab, 0x04ab,
-	0x04ad, 0x04ad,
-	0x04af, 0x04af,
-	0x04b1, 0x04b1,
-	0x04b3, 0x04b3,
-	0x04b5, 0x04b5,
-	0x04b7, 0x04b7,
-	0x04b9, 0x04b9,
-	0x04bb, 0x04bb,
-	0x04bd, 0x04bd,
-	0x04bf, 0x04bf,
-	0x04c2, 0x04c2,
-	0x04c4, 0x04c4,
-	0x04c6, 0x04c6,
-	0x04c8, 0x04c8,
-	0x04ca, 0x04ca,
-	0x04cc, 0x04cc,
-	0x04ce, 0x04cf,
-	0x04d1, 0x04d1,
-	0x04d3, 0x04d3,
-	0x04d5, 0x04d5,
-	0x04d7, 0x04d7,
-	0x04d9, 0x04d9,
-	0x04db, 0x04db,
-	0x04dd, 0x04dd,
-	0x04df, 0x04df,
-	0x04e1, 0x04e1,
-	0x04e3, 0x04e3,
-	0x04e5, 0x04e5,
-	0x04e7, 0x04e7,
-	0x04e9, 0x04e9,
-	0x04eb, 0x04eb,
-	0x04ed, 0x04ed,
-	0x04ef, 0x04ef,
-	0x04f1, 0x04f1,
-	0x04f3, 0x04f3,
-	0x04f5, 0x04f5,
-	0x04f7, 0x04f7,
-	0x04f9, 0x04f9,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0561, 0x0587,
-	0x1d00, 0x1d2b,
-	0x1d62, 0x1d77,
-	0x1d79, 0x1d9a,
-	0x1e01, 0x1e01,
-	0x1e03, 0x1e03,
-	0x1e05, 0x1e05,
-	0x1e07, 0x1e07,
-	0x1e09, 0x1e09,
-	0x1e0b, 0x1e0b,
-	0x1e0d, 0x1e0d,
-	0x1e0f, 0x1e0f,
-	0x1e11, 0x1e11,
-	0x1e13, 0x1e13,
-	0x1e15, 0x1e15,
-	0x1e17, 0x1e17,
-	0x1e19, 0x1e19,
-	0x1e1b, 0x1e1b,
-	0x1e1d, 0x1e1d,
-	0x1e1f, 0x1e1f,
-	0x1e21, 0x1e21,
-	0x1e23, 0x1e23,
-	0x1e25, 0x1e25,
-	0x1e27, 0x1e27,
-	0x1e29, 0x1e29,
-	0x1e2b, 0x1e2b,
-	0x1e2d, 0x1e2d,
-	0x1e2f, 0x1e2f,
-	0x1e31, 0x1e31,
-	0x1e33, 0x1e33,
-	0x1e35, 0x1e35,
-	0x1e37, 0x1e37,
-	0x1e39, 0x1e39,
-	0x1e3b, 0x1e3b,
-	0x1e3d, 0x1e3d,
-	0x1e3f, 0x1e3f,
-	0x1e41, 0x1e41,
-	0x1e43, 0x1e43,
-	0x1e45, 0x1e45,
-	0x1e47, 0x1e47,
-	0x1e49, 0x1e49,
-	0x1e4b, 0x1e4b,
-	0x1e4d, 0x1e4d,
-	0x1e4f, 0x1e4f,
-	0x1e51, 0x1e51,
-	0x1e53, 0x1e53,
-	0x1e55, 0x1e55,
-	0x1e57, 0x1e57,
-	0x1e59, 0x1e59,
-	0x1e5b, 0x1e5b,
-	0x1e5d, 0x1e5d,
-	0x1e5f, 0x1e5f,
-	0x1e61, 0x1e61,
-	0x1e63, 0x1e63,
-	0x1e65, 0x1e65,
-	0x1e67, 0x1e67,
-	0x1e69, 0x1e69,
-	0x1e6b, 0x1e6b,
-	0x1e6d, 0x1e6d,
-	0x1e6f, 0x1e6f,
-	0x1e71, 0x1e71,
-	0x1e73, 0x1e73,
-	0x1e75, 0x1e75,
-	0x1e77, 0x1e77,
-	0x1e79, 0x1e79,
-	0x1e7b, 0x1e7b,
-	0x1e7d, 0x1e7d,
-	0x1e7f, 0x1e7f,
-	0x1e81, 0x1e81,
-	0x1e83, 0x1e83,
-	0x1e85, 0x1e85,
-	0x1e87, 0x1e87,
-	0x1e89, 0x1e89,
-	0x1e8b, 0x1e8b,
-	0x1e8d, 0x1e8d,
-	0x1e8f, 0x1e8f,
-	0x1e91, 0x1e91,
-	0x1e93, 0x1e93,
-	0x1e95, 0x1e9d,
-	0x1e9f, 0x1e9f,
-	0x1ea1, 0x1ea1,
-	0x1ea3, 0x1ea3,
-	0x1ea5, 0x1ea5,
-	0x1ea7, 0x1ea7,
-	0x1ea9, 0x1ea9,
-	0x1eab, 0x1eab,
-	0x1ead, 0x1ead,
-	0x1eaf, 0x1eaf,
-	0x1eb1, 0x1eb1,
-	0x1eb3, 0x1eb3,
-	0x1eb5, 0x1eb5,
-	0x1eb7, 0x1eb7,
-	0x1eb9, 0x1eb9,
-	0x1ebb, 0x1ebb,
-	0x1ebd, 0x1ebd,
-	0x1ebf, 0x1ebf,
-	0x1ec1, 0x1ec1,
-	0x1ec3, 0x1ec3,
-	0x1ec5, 0x1ec5,
-	0x1ec7, 0x1ec7,
-	0x1ec9, 0x1ec9,
-	0x1ecb, 0x1ecb,
-	0x1ecd, 0x1ecd,
-	0x1ecf, 0x1ecf,
-	0x1ed1, 0x1ed1,
-	0x1ed3, 0x1ed3,
-	0x1ed5, 0x1ed5,
-	0x1ed7, 0x1ed7,
-	0x1ed9, 0x1ed9,
-	0x1edb, 0x1edb,
-	0x1edd, 0x1edd,
-	0x1edf, 0x1edf,
-	0x1ee1, 0x1ee1,
-	0x1ee3, 0x1ee3,
-	0x1ee5, 0x1ee5,
-	0x1ee7, 0x1ee7,
-	0x1ee9, 0x1ee9,
-	0x1eeb, 0x1eeb,
-	0x1eed, 0x1eed,
-	0x1eef, 0x1eef,
-	0x1ef1, 0x1ef1,
-	0x1ef3, 0x1ef3,
-	0x1ef5, 0x1ef5,
-	0x1ef7, 0x1ef7,
-	0x1ef9, 0x1ef9,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 0x1f07,
-	0x1f10, 0x1f15,
-	0x1f20, 0x1f27,
-	0x1f30, 0x1f37,
-	0x1f40, 0x1f45,
-	0x1f50, 0x1f57,
-	0x1f60, 0x1f67,
-	0x1f70, 0x1f7d,
-	0x1f80, 0x1f87,
-	0x1f90, 0x1f97,
-	0x1fa0, 0x1fa7,
-	0x1fb0, 0x1fb4,
-	0x1fb6, 0x1fb7,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fc7,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fd7,
-	0x1fe0, 0x1fe7,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ff7,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2184, 0x2184,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7c,
-	0x2c81, 0x2c81,
-	0x2c83, 0x2c83,
-	0x2c85, 0x2c85,
-	0x2c87, 0x2c87,
-	0x2c89, 0x2c89,
-	0x2c8b, 0x2c8b,
-	0x2c8d, 0x2c8d,
-	0x2c8f, 0x2c8f,
-	0x2c91, 0x2c91,
-	0x2c93, 0x2c93,
-	0x2c95, 0x2c95,
-	0x2c97, 0x2c97,
-	0x2c99, 0x2c99,
-	0x2c9b, 0x2c9b,
-	0x2c9d, 0x2c9d,
-	0x2c9f, 0x2c9f,
-	0x2ca1, 0x2ca1,
-	0x2ca3, 0x2ca3,
-	0x2ca5, 0x2ca5,
-	0x2ca7, 0x2ca7,
-	0x2ca9, 0x2ca9,
-	0x2cab, 0x2cab,
-	0x2cad, 0x2cad,
-	0x2caf, 0x2caf,
-	0x2cb1, 0x2cb1,
-	0x2cb3, 0x2cb3,
-	0x2cb5, 0x2cb5,
-	0x2cb7, 0x2cb7,
-	0x2cb9, 0x2cb9,
-	0x2cbb, 0x2cbb,
-	0x2cbd, 0x2cbd,
-	0x2cbf, 0x2cbf,
-	0x2cc1, 0x2cc1,
-	0x2cc3, 0x2cc3,
-	0x2cc5, 0x2cc5,
-	0x2cc7, 0x2cc7,
-	0x2cc9, 0x2cc9,
-	0x2ccb, 0x2ccb,
-	0x2ccd, 0x2ccd,
-	0x2ccf, 0x2ccf,
-	0x2cd1, 0x2cd1,
-	0x2cd3, 0x2cd3,
-	0x2cd5, 0x2cd5,
-	0x2cd7, 0x2cd7,
-	0x2cd9, 0x2cd9,
-	0x2cdb, 0x2cdb,
-	0x2cdd, 0x2cdd,
-	0x2cdf, 0x2cdf,
-	0x2ce1, 0x2ce1,
-	0x2ce3, 0x2ce4,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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[] = {
-	49,
-	0x02b0, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0374, 0x0374,
-	0x037a, 0x037a,
-	0x0559, 0x0559,
-	0x0640, 0x0640,
-	0x06e5, 0x06e6,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0971, 0x0971,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x10fc, 0x10fc,
-	0x17d7, 0x17d7,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c78, 0x1c7d,
-	0x1d2c, 0x1d61,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2c7d, 0x2c7d,
-	0x2d6f, 0x2d6f,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa67f, 0xa67f,
-	0xa717, 0xa71f,
-	0xa770, 0xa770,
-	0xa788, 0xa788,
-	0xa9cf, 0xa9cf,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
-	323,
-	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,
-	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, 0x0edd,
-	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,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17dc, 0x17dc,
-	0x1820, 0x1842,
-	0x1844, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c77,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x2135, 0x2138,
-	0x2d30, 0x2d65,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3006, 0x3006,
-	0x303c, 0x303c,
-	0x3041, 0x3096,
-	0x309f, 0x309f,
-	0x30a1, 0x30fa,
-	0x30ff, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa014,
-	0xa016, 0xa48c,
-	0xa4d0, 0xa4f7,
-	0xa500, 0xa60b,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa66e, 0xa66e,
-	0xa6a0, 0xa6e5,
-	0xa7fb, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa6f,
-	0xaa71, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadc,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff66, 0xff6f,
-	0xff71, 0xff9d,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10450, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x1b000, 0x1b001,
-	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[] = {
-	603,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1fb8, 0x1fbb,
-	0x1fc8, 0x1fcb,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffb,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210b, 0x210d,
-	0x2110, 0x2112,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x2130, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2183, 0x2183,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	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[] = {
-	193,
-	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,
-	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,
-	0x17b6, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b00, 0x1b04,
-	0x1b34, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1baa,
-	0x1be6, 0x1bf3,
-	0x1c24, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf2, 0x1cf2,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa67c, 0xa67d,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa953,
-	0xa980, 0xa983,
-	0xa9b3, 0xa9c0,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xabe3, 0xabea,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11000, 0x11002,
-	0x11038, 0x11046,
-	0x11080, 0x11082,
-	0x110b0, 0x110ba,
-	0x1d165, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
-	113,
-	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,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1c24, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1ce1, 0x1ce1,
-	0x1cf2, 0x1cf2,
-	0xa823, 0xa824,
-	0xa827, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa952, 0xa953,
-	0xa983, 0xa983,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9c0,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa4d, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xabe3, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabea,
-	0xabec, 0xabec,
-	0x11000, 0x11000,
-	0x11002, 0x11002,
-	0x11082, 0x11082,
-	0x110b0, 0x110b2,
-	0x110b7, 0x110b8,
-	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[] = {
-	203,
-	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,
-	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,
-	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,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
-	83,
-	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,
-	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,
-	0x12400, 0x12462,
-	0x1d360, 0x1d371,
-	0x1d7ce, 0x1d7ff,
-	0x1f100, 0x1f10a,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-static const OnigCodePoint CR_Nd[] = {
-	38,
-	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,
-	0x1d7ce, 0x1d7ff,
-}; /* CR_Nd */
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
-	12,
-	0x16ee, 0x16f0,
-	0x2160, 0x2182,
-	0x2185, 0x2188,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0xa6e6, 0xa6ef,
-	0x10140, 0x10174,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x12400, 0x12462,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
-	41,
-	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,
-	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 */
-static const OnigCodePoint CR_P[] = {
-	133,
-	0x0021, 0x0023,
-	0x0025, 0x002a,
-	0x002c, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005b, 0x005d,
-	0x005f, 0x005f,
-	0x007b, 0x007b,
-	0x007d, 0x007d,
-	0x00a1, 0x00a1,
-	0x00ab, 0x00ab,
-	0x00b7, 0x00b7,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x058a,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f3a, 0x0f3d,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1361, 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,
-	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, 0x2e31,
-	0x3001, 0x3003,
-	0x3008, 0x3011,
-	0x3014, 0x301f,
-	0x3030, 0x3030,
-	0x303d, 0x303d,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xabeb, 0xabeb,
-	0xfd3e, 0xfd3f,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe61,
-	0xfe63, 0xfe63,
-	0xfe68, 0xfe68,
-	0xfe6a, 0xfe6b,
-	0xff01, 0xff03,
-	0xff05, 0xff0a,
-	0xff0c, 0xff0f,
-	0xff1a, 0xff1b,
-	0xff1f, 0xff20,
-	0xff3b, 0xff3d,
-	0xff3f, 0xff3f,
-	0xff5b, 0xff5b,
-	0xff5d, 0xff5d,
-	0xff5f, 0xff65,
-	0x10100, 0x10101,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10b39, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x12470, 0x12473,
-}; /* CR_P */
-
-/* 'Pc': General Category */
-static const OnigCodePoint CR_Pc[] = {
-	6,
-	0x005f, 0x005f,
-	0x203f, 0x2040,
-	0x2054, 0x2054,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xff3f, 0xff3f,
-}; /* CR_Pc */
-
-/* 'Pd': General Category */
-static const OnigCodePoint CR_Pd[] = {
-	15,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
-	70,
-	0x0029, 0x0029,
-	0x005d, 0x005d,
-	0x007d, 0x007d,
-	0x0f3b, 0x0f3b,
-	0x0f3d, 0x0f3d,
-	0x169c, 0x169c,
-	0x2046, 0x2046,
-	0x207e, 0x207e,
-	0x208e, 0x208e,
-	0x232a, 0x232a,
-	0x2769, 0x2769,
-	0x276b, 0x276b,
-	0x276d, 0x276d,
-	0x276f, 0x276f,
-	0x2771, 0x2771,
-	0x2773, 0x2773,
-	0x2775, 0x2775,
-	0x27c6, 0x27c6,
-	0x27e7, 0x27e7,
-	0x27e9, 0x27e9,
-	0x27eb, 0x27eb,
-	0x27ed, 0x27ed,
-	0x27ef, 0x27ef,
-	0x2984, 0x2984,
-	0x2986, 0x2986,
-	0x2988, 0x2988,
-	0x298a, 0x298a,
-	0x298c, 0x298c,
-	0x298e, 0x298e,
-	0x2990, 0x2990,
-	0x2992, 0x2992,
-	0x2994, 0x2994,
-	0x2996, 0x2996,
-	0x2998, 0x2998,
-	0x29d9, 0x29d9,
-	0x29db, 0x29db,
-	0x29fd, 0x29fd,
-	0x2e23, 0x2e23,
-	0x2e25, 0x2e25,
-	0x2e27, 0x2e27,
-	0x2e29, 0x2e29,
-	0x3009, 0x3009,
-	0x300b, 0x300b,
-	0x300d, 0x300d,
-	0x300f, 0x300f,
-	0x3011, 0x3011,
-	0x3015, 0x3015,
-	0x3017, 0x3017,
-	0x3019, 0x3019,
-	0x301b, 0x301b,
-	0x301e, 0x301f,
-	0xfd3f, 0xfd3f,
-	0xfe18, 0xfe18,
-	0xfe36, 0xfe36,
-	0xfe38, 0xfe38,
-	0xfe3a, 0xfe3a,
-	0xfe3c, 0xfe3c,
-	0xfe3e, 0xfe3e,
-	0xfe40, 0xfe40,
-	0xfe42, 0xfe42,
-	0xfe44, 0xfe44,
-	0xfe48, 0xfe48,
-	0xfe5a, 0xfe5a,
-	0xfe5c, 0xfe5c,
-	0xfe5e, 0xfe5e,
-	0xff09, 0xff09,
-	0xff3d, 0xff3d,
-	0xff5d, 0xff5d,
-	0xff60, 0xff60,
-	0xff63, 0xff63,
-}; /* CR_Pe */
-
-/* 'Pf': General Category */
-static const OnigCodePoint CR_Pf[] = {
-	10,
-	0x00bb, 0x00bb,
-	0x2019, 0x2019,
-	0x201d, 0x201d,
-	0x203a, 0x203a,
-	0x2e03, 0x2e03,
-	0x2e05, 0x2e05,
-	0x2e0a, 0x2e0a,
-	0x2e0d, 0x2e0d,
-	0x2e1d, 0x2e1d,
-	0x2e21, 0x2e21,
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
-	11,
-	0x00ab, 0x00ab,
-	0x2018, 0x2018,
-	0x201b, 0x201c,
-	0x201f, 0x201f,
-	0x2039, 0x2039,
-	0x2e02, 0x2e02,
-	0x2e04, 0x2e04,
-	0x2e09, 0x2e09,
-	0x2e0c, 0x2e0c,
-	0x2e1c, 0x2e1c,
-	0x2e20, 0x2e20,
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
-	128,
-	0x0021, 0x0023,
-	0x0025, 0x0027,
-	0x002a, 0x002a,
-	0x002c, 0x002c,
-	0x002e, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005c, 0x005c,
-	0x00a1, 0x00a1,
-	0x00b7, 0x00b7,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x0589,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1361, 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,
-	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, 0x2e31,
-	0x3001, 0x3003,
-	0x303d, 0x303d,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xabeb, 0xabeb,
-	0xfe10, 0xfe16,
-	0xfe19, 0xfe19,
-	0xfe30, 0xfe30,
-	0xfe45, 0xfe46,
-	0xfe49, 0xfe4c,
-	0xfe50, 0xfe52,
-	0xfe54, 0xfe57,
-	0xfe5f, 0xfe61,
-	0xfe68, 0xfe68,
-	0xfe6a, 0xfe6b,
-	0xff01, 0xff03,
-	0xff05, 0xff07,
-	0xff0a, 0xff0a,
-	0xff0c, 0xff0c,
-	0xff0e, 0xff0f,
-	0xff1a, 0xff1b,
-	0xff1f, 0xff20,
-	0xff3c, 0xff3c,
-	0xff61, 0xff61,
-	0xff64, 0xff65,
-	0x10100, 0x10101,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10b39, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x12470, 0x12473,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
-	72,
-	0x0028, 0x0028,
-	0x005b, 0x005b,
-	0x007b, 0x007b,
-	0x0f3a, 0x0f3a,
-	0x0f3c, 0x0f3c,
-	0x169b, 0x169b,
-	0x201a, 0x201a,
-	0x201e, 0x201e,
-	0x2045, 0x2045,
-	0x207d, 0x207d,
-	0x208d, 0x208d,
-	0x2329, 0x2329,
-	0x2768, 0x2768,
-	0x276a, 0x276a,
-	0x276c, 0x276c,
-	0x276e, 0x276e,
-	0x2770, 0x2770,
-	0x2772, 0x2772,
-	0x2774, 0x2774,
-	0x27c5, 0x27c5,
-	0x27e6, 0x27e6,
-	0x27e8, 0x27e8,
-	0x27ea, 0x27ea,
-	0x27ec, 0x27ec,
-	0x27ee, 0x27ee,
-	0x2983, 0x2983,
-	0x2985, 0x2985,
-	0x2987, 0x2987,
-	0x2989, 0x2989,
-	0x298b, 0x298b,
-	0x298d, 0x298d,
-	0x298f, 0x298f,
-	0x2991, 0x2991,
-	0x2993, 0x2993,
-	0x2995, 0x2995,
-	0x2997, 0x2997,
-	0x29d8, 0x29d8,
-	0x29da, 0x29da,
-	0x29fc, 0x29fc,
-	0x2e22, 0x2e22,
-	0x2e24, 0x2e24,
-	0x2e26, 0x2e26,
-	0x2e28, 0x2e28,
-	0x3008, 0x3008,
-	0x300a, 0x300a,
-	0x300c, 0x300c,
-	0x300e, 0x300e,
-	0x3010, 0x3010,
-	0x3014, 0x3014,
-	0x3016, 0x3016,
-	0x3018, 0x3018,
-	0x301a, 0x301a,
-	0x301d, 0x301d,
-	0xfd3e, 0xfd3e,
-	0xfe17, 0xfe17,
-	0xfe35, 0xfe35,
-	0xfe37, 0xfe37,
-	0xfe39, 0xfe39,
-	0xfe3b, 0xfe3b,
-	0xfe3d, 0xfe3d,
-	0xfe3f, 0xfe3f,
-	0xfe41, 0xfe41,
-	0xfe43, 0xfe43,
-	0xfe47, 0xfe47,
-	0xfe59, 0xfe59,
-	0xfe5b, 0xfe5b,
-	0xfe5d, 0xfe5d,
-	0xff08, 0xff08,
-	0xff3b, 0xff3b,
-	0xff5b, 0xff5b,
-	0xff5f, 0xff5f,
-	0xff62, 0xff62,
-}; /* CR_Ps */
-
-/* 'S': Major Category */
-static const OnigCodePoint CR_S[] = {
-	208,
-	0x0024, 0x0024,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00a2, 0x00a9,
-	0x00ac, 0x00ac,
-	0x00ae, 0x00b1,
-	0x00b4, 0x00b4,
-	0x00b6, 0x00b6,
-	0x00b8, 0x00b8,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x03f6, 0x03f6,
-	0x0482, 0x0482,
-	0x0606, 0x0608,
-	0x060b, 0x060b,
-	0x060e, 0x060f,
-	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, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1360, 0x1360,
-	0x1390, 0x1399,
-	0x17db, 0x17db,
-	0x1940, 0x1940,
-	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, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27e5,
-	0x27f0, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2ce5, 0x2cea,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3004, 0x3004,
-	0x3012, 0x3013,
-	0x3020, 0x3020,
-	0x3036, 0x3037,
-	0x303e, 0x303f,
-	0x309b, 0x309c,
-	0x3190, 0x3191,
-	0x3196, 0x319f,
-	0x31c0, 0x31e3,
-	0x3200, 0x321e,
-	0x322a, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa700, 0xa716,
-	0xa720, 0xa721,
-	0xa789, 0xa78a,
-	0xa828, 0xa82b,
-	0xa836, 0xa839,
-	0xaa77, 0xaa79,
-	0xfb29, 0xfb29,
-	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,
-	0x10102, 0x10102,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d6c1, 0x1d6c1,
-	0x1d6db, 0x1d6db,
-	0x1d6fb, 0x1d6fb,
-	0x1d715, 0x1d715,
-	0x1d735, 0x1d735,
-	0x1d74f, 0x1d74f,
-	0x1d76f, 0x1d76f,
-	0x1d789, 0x1d789,
-	0x1d7a9, 0x1d7a9,
-	0x1d7c3, 0x1d7c3,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	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,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
-	16,
-	0x0024, 0x0024,
-	0x00a2, 0x00a5,
-	0x060b, 0x060b,
-	0x09f2, 0x09f3,
-	0x09fb, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0bf9, 0x0bf9,
-	0x0e3f, 0x0e3f,
-	0x17db, 0x17db,
-	0x20a0, 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[] = {
-	66,
-	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, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27e5,
-	0x27f0, 0x27ff,
-	0x2900, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	0xfb29, 0xfb29,
-	0xfe62, 0xfe62,
-	0xfe64, 0xfe66,
-	0xff0b, 0xff0b,
-	0xff1c, 0xff1e,
-	0xff5c, 0xff5c,
-	0xff5e, 0xff5e,
-	0xffe2, 0xffe2,
-	0xffe9, 0xffec,
-	0x1d6c1, 0x1d6c1,
-	0x1d6db, 0x1d6db,
-	0x1d6fb, 0x1d6fb,
-	0x1d715, 0x1d715,
-	0x1d735, 0x1d735,
-	0x1d74f, 0x1d74f,
-	0x1d76f, 0x1d76f,
-	0x1d789, 0x1d789,
-	0x1d7a9, 0x1d7a9,
-	0x1d7c3, 0x1d7c3,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
-	164,
-	0x00a6, 0x00a7,
-	0x00a9, 0x00a9,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b0,
-	0x00b6, 0x00b6,
-	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, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1360, 0x1360,
-	0x1390, 0x1399,
-	0x1940, 0x1940,
-	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, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa828, 0xa82b,
-	0xa836, 0xa837,
-	0xa839, 0xa839,
-	0xaa77, 0xaa79,
-	0xfdfd, 0xfdfd,
-	0xffe4, 0xffe4,
-	0xffe8, 0xffe8,
-	0xffed, 0xffee,
-	0xfffc, 0xfffd,
-	0x10102, 0x10102,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	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,
-}; /* 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[] = {
-	106,
-	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, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27ff,
-	0x2900, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	0xfb29, 0xfb29,
-	0xfe61, 0xfe66,
-	0xfe68, 0xfe68,
-	0xff0b, 0xff0b,
-	0xff1c, 0xff1e,
-	0xff3c, 0xff3c,
-	0xff3e, 0xff3e,
-	0xff5c, 0xff5c,
-	0xff5e, 0xff5e,
-	0xffe2, 0xffe2,
-	0xffe9, 0xffec,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a5,
-	0x1d6a8, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-}; /* CR_Math */
-
-/* 'Alphabetic': Derived Property */
-static const OnigCodePoint CR_Alphabetic[] = {
-	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,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x135f, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b80, 0x1ba9,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11082, 0x110b8,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Alphabetic */
-
-/* 'Lowercase': Derived Property */
-static const OnigCodePoint CR_Lowercase[] = {
-	612,
-	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,
-	0x2090, 0x2094,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7d,
-	0x2c81, 0x2c81,
-	0x2c83, 0x2c83,
-	0x2c85, 0x2c85,
-	0x2c87, 0x2c87,
-	0x2c89, 0x2c89,
-	0x2c8b, 0x2c8b,
-	0x2c8d, 0x2c8d,
-	0x2c8f, 0x2c8f,
-	0x2c91, 0x2c91,
-	0x2c93, 0x2c93,
-	0x2c95, 0x2c95,
-	0x2c97, 0x2c97,
-	0x2c99, 0x2c99,
-	0x2c9b, 0x2c9b,
-	0x2c9d, 0x2c9d,
-	0x2c9f, 0x2c9f,
-	0x2ca1, 0x2ca1,
-	0x2ca3, 0x2ca3,
-	0x2ca5, 0x2ca5,
-	0x2ca7, 0x2ca7,
-	0x2ca9, 0x2ca9,
-	0x2cab, 0x2cab,
-	0x2cad, 0x2cad,
-	0x2caf, 0x2caf,
-	0x2cb1, 0x2cb1,
-	0x2cb3, 0x2cb3,
-	0x2cb5, 0x2cb5,
-	0x2cb7, 0x2cb7,
-	0x2cb9, 0x2cb9,
-	0x2cbb, 0x2cbb,
-	0x2cbd, 0x2cbd,
-	0x2cbf, 0x2cbf,
-	0x2cc1, 0x2cc1,
-	0x2cc3, 0x2cc3,
-	0x2cc5, 0x2cc5,
-	0x2cc7, 0x2cc7,
-	0x2cc9, 0x2cc9,
-	0x2ccb, 0x2ccb,
-	0x2ccd, 0x2ccd,
-	0x2ccf, 0x2ccf,
-	0x2cd1, 0x2cd1,
-	0x2cd3, 0x2cd3,
-	0x2cd5, 0x2cd5,
-	0x2cd7, 0x2cd7,
-	0x2cd9, 0x2cd9,
-	0x2cdb, 0x2cdb,
-	0x2cdd, 0x2cdd,
-	0x2cdf, 0x2cdf,
-	0x2ce1, 0x2ce1,
-	0x2ce3, 0x2ce4,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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_Lowercase */
-
-/* 'Uppercase': Derived Property */
-static const OnigCodePoint CR_Uppercase[] = {
-	605,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1fb8, 0x1fbb,
-	0x1fc8, 0x1fcb,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffb,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210b, 0x210d,
-	0x2110, 0x2112,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x2130, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x1d400, 0x1d419,
-	0x1d434, 0x1d44d,
-	0x1d468, 0x1d481,
-	0x1d49c, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b5,
-	0x1d4d0, 0x1d4e9,
-	0x1d504, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d538, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d56c, 0x1d585,
-	0x1d5a0, 0x1d5b9,
-	0x1d5d4, 0x1d5ed,
-	0x1d608, 0x1d621,
-	0x1d63c, 0x1d655,
-	0x1d670, 0x1d689,
-	0x1d6a8, 0x1d6c0,
-	0x1d6e2, 0x1d6fa,
-	0x1d71c, 0x1d734,
-	0x1d756, 0x1d76e,
-	0x1d790, 0x1d7a8,
-	0x1d7ca, 0x1d7ca,
-}; /* CR_Uppercase */
-
-/* 'Cased': Derived Property */
-static const OnigCodePoint CR_Cased[] = {
-	112,
-	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,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2090, 0x2094,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	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_Cased */
-
-/* 'Case_Ignorable': Derived Property */
-static const OnigCodePoint CR_Case_Ignorable[] = {
-	277,
-	0x0027, 0x0027,
-	0x002e, 0x002e,
-	0x003a, 0x003a,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00ad, 0x00ad,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0387, 0x0387,
-	0x0483, 0x0489,
-	0x0559, 0x0559,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05f4, 0x05f4,
-	0x0600, 0x0603,
-	0x0610, 0x061a,
-	0x0640, 0x0640,
-	0x064b, 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,
-	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,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1d2c, 0x1d61,
-	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,
-	0x2c7d, 0x2c7d,
-	0x2cef, 0x2cf1,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x302a, 0x302f,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x3099, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa66f, 0xa672,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa6f0, 0xa6f1,
-	0xa700, 0xa721,
-	0xa770, 0xa770,
-	0xa788, 0xa78a,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9cf, 0xa9cf,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa70, 0xaa70,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaadd, 0xaadd,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	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,
-	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[] = {
-	566,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f88, 0x1f8f,
-	0x1f98, 0x1f9f,
-	0x1fa8, 0x1faf,
-	0x1fb8, 0x1fbc,
-	0x1fc8, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-}; /* CR_Changes_When_Lowercased */
-
-/* 'Changes_When_Uppercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	582,
-	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, 0x0265,
-	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,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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[] = {
-	583,
-	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, 0x0265,
-	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,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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[] = {
-	577,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9a, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f80, 0x1faf,
-	0x1fb2, 0x1fb4,
-	0x1fb7, 0x1fbc,
-	0x1fc2, 0x1fc4,
-	0x1fc7, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff7, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-}; /* CR_Changes_When_Casefolded */
-
-/* 'Changes_When_Casemapped': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	99,
-	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, 0x0265,
-	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,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	0x1e00, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c70,
-	0x2c72, 0x2c73,
-	0x2c75, 0x2c76,
-	0x2c7e, 0x2ce3,
-	0x2ceb, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa72f,
-	0xa732, 0xa76f,
-	0xa779, 0xa787,
-	0xa78b, 0xa78d,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-}; /* CR_Changes_When_Casemapped */
-
-/* 'ID_Start': Derived Property */
-static const OnigCodePoint CR_ID_Start[] = {
-	437,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309b, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_ID_Start */
-
-/* 'ID_Continue': Derived Property */
-static const OnigCodePoint CR_ID_Continue[] = {
-	514,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	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, 0x17b3,
-	0x17b6, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf2,
-	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, 0x2cf1,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	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, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff3f, 0xff3f,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_ID_Continue */
-
-/* 'XID_Start': Derived Property */
-static const OnigCodePoint CR_XID_Start[] = {
-	444,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xff9d,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_XID_Start */
-
-/* 'XID_Continue': Derived Property */
-static const OnigCodePoint CR_XID_Continue[] = {
-	521,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	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, 0x17b3,
-	0x17b6, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf2,
-	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, 0x2cf1,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	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, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff3f, 0xff3f,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	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[] = {
-	215,
-	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,
-	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,
-	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,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa67c, 0xa67d,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xff9e, 0xff9f,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x1d165, 0x1d165,
-	0x1d167, 0x1d169,
-	0x1d16e, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_Grapheme_Extend */
-
-/* 'Grapheme_Base': Derived Property */
-static const OnigCodePoint CR_Grapheme_Base[] = {
-	596,
-	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,
-	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,
-	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, 0x0aef,
-	0x0af1, 0x0af1,
-	0x0b02, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b3d,
-	0x0b40, 0x0b40,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 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, 0x0edd,
-	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,
-	0x10d0, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1360, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1735, 0x1736,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x17d4, 0x17dc,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1800, 0x180a,
-	0x180e, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a16,
-	0x1a19, 0x1a1b,
-	0x1a1e, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a61, 0x1a61,
-	0x1a63, 0x1a64,
-	0x1a6d, 0x1a72,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b04, 0x1b33,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b4b,
-	0x1b50, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x1b82, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1be5,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1bfc, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fc4,
-	0x1fc6, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fdd, 0x1fef,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffe,
-	0x2000, 0x200a,
-	0x2010, 0x2027,
-	0x202f, 0x205f,
-	0x2070, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cee,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d70,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e00, 0x2e31,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3029,
-	0x3030, 0x303f,
-	0x3041, 0x3096,
-	0x309b, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa66e,
-	0xa673, 0xa673,
-	0xa67e, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa6f2, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa824,
-	0xa827, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c3,
-	0xa8ce, 0xa8d9,
-	0xa8f2, 0xa8fb,
-	0xa900, 0xa925,
-	0xa92e, 0xa946,
-	0xa952, 0xa953,
-	0xa95f, 0xa97c,
-	0xa983, 0xa9b2,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa28,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa4d, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadf,
-	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, 0xfa2d,
-	0xfa30, 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,
-	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,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Grapheme_Base */
-
-/* 'Grapheme_Link': Derived Property */
-static const OnigCodePoint CR_Grapheme_Link[] = {
-	29,
-	0x094d, 0x094d,
-	0x09cd, 0x09cd,
-	0x0a4d, 0x0a4d,
-	0x0acd, 0x0acd,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e3a, 0x0e3a,
-	0x0f84, 0x0f84,
-	0x1039, 0x103a,
-	0x1714, 0x1714,
-	0x1734, 0x1734,
-	0x17d2, 0x17d2,
-	0x1a60, 0x1a60,
-	0x1b44, 0x1b44,
-	0x1baa, 0x1baa,
-	0x1bf2, 0x1bf3,
-	0x2d7f, 0x2d7f,
-	0xa806, 0xa806,
-	0xa8c4, 0xa8c4,
-	0xa953, 0xa953,
-	0xa9c0, 0xa9c0,
-	0xabed, 0xabed,
-	0x10a3f, 0x10a3f,
-	0x11046, 0x11046,
-	0x110b9, 0x110b9,
-}; /* CR_Grapheme_Link */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
-	169,
-	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,
-	0x0970, 0x0970,
-	0x0e3f, 0x0e3f,
-	0x0fd5, 0x0fd8,
-	0x10fb, 0x10fb,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x1802, 0x1803,
-	0x1805, 0x1805,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x2000, 0x200b,
-	0x200e, 0x2064,
-	0x206a, 0x2070,
-	0x2074, 0x207e,
-	0x2080, 0x208e,
-	0x20a0, 0x20b9,
-	0x2100, 0x2125,
-	0x2127, 0x2129,
-	0x212c, 0x2131,
-	0x2133, 0x214d,
-	0x214f, 0x215f,
-	0x2189, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27ff,
-	0x2900, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2e00, 0x2e31,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3004,
-	0x3006, 0x3006,
-	0x3008, 0x3020,
-	0x3030, 0x3037,
-	0x303c, 0x303f,
-	0x309b, 0x309c,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fc,
-	0x3190, 0x319f,
-	0x31c0, 0x31e3,
-	0x3220, 0x325f,
-	0x327f, 0x32cf,
-	0x3358, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa700, 0xa721,
-	0xa788, 0xa78a,
-	0xa830, 0xa839,
-	0xfd3e, 0xfd3f,
-	0xfdfd, 0xfdfd,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfeff, 0xfeff,
-	0xff01, 0xff20,
-	0xff3b, 0xff40,
-	0xff5b, 0xff65,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1013f,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d166,
-	0x1d16a, 0x1d17a,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a5,
-	0x1d6a8, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f169,
-	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,
-	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,
-	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, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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, 0xa673,
-	0xa67c, 0xa697,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
-	5,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x058a, 0x058a,
-	0xfb13, 0xfb17,
-}; /* CR_Armenian */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
-	9,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfb4f,
-}; /* CR_Hebrew */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
-	19,
-	0x0600, 0x0603,
-	0x0606, 0x060b,
-	0x060d, 0x061a,
-	0x061e, 0x061e,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x0656, 0x065e,
-	0x066a, 0x066f,
-	0x0671, 0x06dc,
-	0x06de, 0x06ff,
-	0x0750, 0x077f,
-	0xfb50, 0xfbc1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfc,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0x10e60, 0x10e7e,
-}; /* CR_Arabic */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
-	3,
-	0x0700, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-}; /* CR_Syriac */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
-	1,
-	0x0780, 0x07b1,
-}; /* CR_Thaana */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
-	6,
-	0x0900, 0x0950,
-	0x0953, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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[] = {
-	14,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae3,
-	0x0ae6, 0x0aef,
-	0x0af1, 0x0af1,
-}; /* CR_Gujarati */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
-	14,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 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, 0x0edd,
-}; /* 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[] = {
-	4,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x2d00, 0x2d25,
-}; /* 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[] = {
-	16,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x3005, 0x3005,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303b,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	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[] = {
-	24,
-	0x0300, 0x036f,
-	0x0485, 0x0486,
-	0x064b, 0x0655,
-	0x065f, 0x065f,
-	0x0670, 0x0670,
-	0x0951, 0x0952,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	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, 0x2cf1,
-	0x2cf9, 0x2cff,
-}; /* CR_Coptic */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
-	4,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x19df,
-}; /* CR_New_Tai_Lue */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
-	2,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
-	3,
-	0x2d30, 0x2d65,
-	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, 0x1baa,
-	0x1bae, 0x1bb9,
-}; /* CR_Sundanese */
-
-/* 'Lepcha': Script */
-static const OnigCodePoint CR_Lepcha[] = {
-	3,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c4f,
-}; /* CR_Lepcha */
-
-/* 'Ol_Chiki': Script */
-static const OnigCodePoint CR_Ol_Chiki[] = {
-	1,
-	0x1c50, 0x1c7f,
-}; /* CR_Ol_Chiki */
-
-/* 'Vai': Script */
-static const OnigCodePoint CR_Vai[] = {
-	1,
-	0xa500, 0xa62b,
-}; /* CR_Vai */
-
-/* 'Saurashtra': Script */
-static const OnigCodePoint CR_Saurashtra[] = {
-	2,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
-	1,
-	0xa900, 0xa92f,
-}; /* CR_Kayah_Li */
-
-/* 'Rejang': Script */
-static const OnigCodePoint CR_Rejang[] = {
-	2,
-	0xa930, 0xa953,
-	0xa95f, 0xa95f,
-}; /* CR_Rejang */
-
-/* 'Lycian': Script */
-static const OnigCodePoint CR_Lycian[] = {
-	1,
-	0x10280, 0x1029c,
-}; /* CR_Lycian */
-
-/* 'Carian': Script */
-static const OnigCodePoint CR_Carian[] = {
-	1,
-	0x102a0, 0x102d0,
-}; /* CR_Carian */
-
-/* 'Lydian': Script */
-static const OnigCodePoint CR_Lydian[] = {
-	2,
-	0x10920, 0x10939,
-	0x1093f, 0x1093f,
-}; /* CR_Lydian */
-
-/* 'Cham': Script */
-static const OnigCodePoint CR_Cham[] = {
-	4,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-}; /* CR_Cham */
-
-/* 'Tai_Tham': Script */
-static const OnigCodePoint CR_Tai_Tham[] = {
-	5,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-}; /* CR_Tai_Tham */
-
-/* 'Tai_Viet': Script */
-static const OnigCodePoint CR_Tai_Viet[] = {
-	2,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-}; /* CR_Tai_Viet */
-
-/* 'Avestan': Script */
-static const OnigCodePoint CR_Avestan[] = {
-	2,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b3f,
-}; /* CR_Avestan */
-
-/* 'Egyptian_Hieroglyphs': Script */
-static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342e,
-}; /* CR_Egyptian_Hieroglyphs */
-
-/* 'Samaritan': Script */
-static const OnigCodePoint CR_Samaritan[] = {
-	2,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-}; /* CR_Samaritan */
-
-/* 'Lisu': Script */
-static const OnigCodePoint CR_Lisu[] = {
-	1,
-	0xa4d0, 0xa4ff,
-}; /* CR_Lisu */
-
-/* 'Bamum': Script */
-static const OnigCodePoint CR_Bamum[] = {
-	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[] = {
-	2,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-}; /* CR_Meetei_Mayek */
-
-/* 'Imperial_Aramaic': Script */
-static const OnigCodePoint CR_Imperial_Aramaic[] = {
-	2,
-	0x10840, 0x10855,
-	0x10857, 0x1085f,
-}; /* CR_Imperial_Aramaic */
-
-/* 'Old_South_Arabian': Script */
-static const OnigCodePoint CR_Old_South_Arabian[] = {
-	1,
-	0x10a60, 0x10a7f,
-}; /* CR_Old_South_Arabian */
-
-/* 'Inscriptional_Parthian': Script */
-static const OnigCodePoint CR_Inscriptional_Parthian[] = {
-	2,
-	0x10b40, 0x10b55,
-	0x10b58, 0x10b5f,
-}; /* CR_Inscriptional_Parthian */
-
-/* 'Inscriptional_Pahlavi': Script */
-static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
-	2,
-	0x10b60, 0x10b72,
-	0x10b78, 0x10b7f,
-}; /* CR_Inscriptional_Pahlavi */
-
-/* 'Old_Turkic': Script */
-static const OnigCodePoint CR_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c48,
-}; /* CR_Old_Turkic */
-
-/* 'Kaithi': Script */
-static const OnigCodePoint CR_Kaithi[] = {
-	1,
-	0x11080, 0x110c1,
-}; /* CR_Kaithi */
-
-/* '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 */
-
-/* 'White_Space': Binary Property */
-static const OnigCodePoint CR_White_Space[] = {
-	11,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x180e, 0x180e,
-	0x2000, 0x200a,
-	0x2028, 0x2029,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_White_Space */
-
-/* 'Bidi_Control': Binary Property */
-static const OnigCodePoint CR_Bidi_Control[] = {
-	2,
-	0x200e, 0x200f,
-	0x202a, 0x202e,
-}; /* CR_Bidi_Control */
-
-/* 'Join_Control': Binary Property */
-static const OnigCodePoint CR_Join_Control[] = {
-	1,
-	0x200c, 0x200d,
-}; /* CR_Join_Control */
-
-/* 'Dash': Binary Property */
-static const OnigCodePoint CR_Dash[] = {
-	19,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2053, 0x2053,
-	0x207b, 0x207b,
-	0x208b, 0x208b,
-	0x2212, 0x2212,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Dash */
-
-/* 'Hyphen': Binary Property */
-static const OnigCodePoint CR_Hyphen[] = {
-	10,
-	0x002d, 0x002d,
-	0x00ad, 0x00ad,
-	0x058a, 0x058a,
-	0x1806, 0x1806,
-	0x2010, 0x2011,
-	0x2e17, 0x2e17,
-	0x30fb, 0x30fb,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-	0xff65, 0xff65,
-}; /* CR_Hyphen */
-
-/* 'Quotation_Mark': Binary Property */
-static const OnigCodePoint CR_Quotation_Mark[] = {
-	12,
-	0x0022, 0x0022,
-	0x0027, 0x0027,
-	0x00ab, 0x00ab,
-	0x00bb, 0x00bb,
-	0x2018, 0x201f,
-	0x2039, 0x203a,
-	0x300c, 0x300f,
-	0x301d, 0x301f,
-	0xfe41, 0xfe44,
-	0xff02, 0xff02,
-	0xff07, 0xff07,
-	0xff62, 0xff63,
-}; /* CR_Quotation_Mark */
-
-/* 'Terminal_Punctuation': Binary Property */
-static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	67,
-	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,
-	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,
-	0x12470, 0x12473,
-}; /* CR_Terminal_Punctuation */
-
-/* 'Other_Math': Binary Property */
-static const OnigCodePoint CR_Other_Math[] = {
-	100,
-	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,
-}; /* CR_Other_Math */
-
-/* 'Hex_Digit': Binary Property */
-static const OnigCodePoint CR_Hex_Digit[] = {
-	6,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-	0xff10, 0xff19,
-	0xff21, 0xff26,
-	0xff41, 0xff46,
-}; /* CR_Hex_Digit */
-
-/* 'ASCII_Hex_Digit': Binary Property */
-static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
-	3,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-}; /* CR_ASCII_Hex_Digit */
-
-/* 'Other_Alphabetic': Binary Property */
-static const OnigCodePoint CR_Other_Alphabetic[] = {
-	145,
-	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,
-	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,
-	0x1be7, 0x1bf1,
-	0x1c24, 0x1c35,
-	0x1cf2, 0x1cf2,
-	0x24b6, 0x24e9,
-	0x2de0, 0x2dff,
-	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,
-	0xabe3, 0xabea,
-	0xfb1e, 0xfb1e,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x11000, 0x11002,
-	0x11038, 0x11045,
-	0x11082, 0x11082,
-	0x110b0, 0x110b8,
-}; /* CR_Other_Alphabetic */
-
-/* 'Ideographic': Binary Property */
-static const OnigCodePoint CR_Ideographic[] = {
-	12,
-	0x3006, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Ideographic */
-
-/* 'Diacritic': Binary Property */
-static const OnigCodePoint CR_Diacritic[] = {
-	117,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x034e,
-	0x0350, 0x0357,
-	0x035d, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0483, 0x0487,
-	0x0559, 0x0559,
-	0x0591, 0x05a1,
-	0x05a3, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c4,
-	0x064b, 0x0652,
-	0x0657, 0x0658,
-	0x06df, 0x06e0,
-	0x06e5, 0x06e6,
-	0x06ea, 0x06ec,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x0818, 0x0819,
-	0x093c, 0x093c,
-	0x094d, 0x094d,
-	0x0951, 0x0954,
-	0x0971, 0x0971,
-	0x09bc, 0x09bc,
-	0x09cd, 0x09cd,
-	0x0a3c, 0x0a3c,
-	0x0a4d, 0x0a4d,
-	0x0abc, 0x0abc,
-	0x0acd, 0x0acd,
-	0x0b3c, 0x0b3c,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0cbc, 0x0cbc,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e47, 0x0e4c,
-	0x0e4e, 0x0e4e,
-	0x0ec8, 0x0ecc,
-	0x0f18, 0x0f19,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f3f,
-	0x0f82, 0x0f84,
-	0x0f86, 0x0f87,
-	0x0fc6, 0x0fc6,
-	0x1037, 0x1037,
-	0x1039, 0x103a,
-	0x1087, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109b,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x1939, 0x193b,
-	0x1a75, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b34, 0x1b34,
-	0x1b44, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1baa, 0x1baa,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1d2c, 0x1d6a,
-	0x1dc4, 0x1dcf,
-	0x1dfd, 0x1dff,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x2cef, 0x2cf1,
-	0x2e2f, 0x2e2f,
-	0x302a, 0x302f,
-	0x3099, 0x309c,
-	0x30fc, 0x30fc,
-	0xa66f, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa6f0, 0xa6f1,
-	0xa717, 0xa721,
-	0xa788, 0xa788,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa92b, 0xa92e,
-	0xa953, 0xa953,
-	0xa9b3, 0xa9b3,
-	0xa9c0, 0xa9c0,
-	0xaa7b, 0xaa7b,
-	0xaabf, 0xaac2,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe20, 0xfe26,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0x110b9, 0x110ba,
-	0x1d167, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-}; /* CR_Diacritic */
-
-/* 'Extender': Binary Property */
-static const OnigCodePoint CR_Extender[] = {
-	20,
-	0x00b7, 0x00b7,
-	0x02d0, 0x02d1,
-	0x0640, 0x0640,
-	0x07fa, 0x07fa,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c36, 0x1c36,
-	0x1c7b, 0x1c7b,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa60c, 0xa60c,
-	0xa9cf, 0xa9cf,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xff70, 0xff70,
-}; /* CR_Extender */
-
-/* 'Other_Lowercase': Binary Property */
-static const OnigCodePoint CR_Other_Lowercase[] = {
-	13,
-	0x02b0, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x037a, 0x037a,
-	0x1d2c, 0x1d61,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2090, 0x2094,
-	0x2170, 0x217f,
-	0x24d0, 0x24e9,
-	0x2c7d, 0x2c7d,
-	0xa770, 0xa770,
-}; /* CR_Other_Lowercase */
-
-/* 'Other_Uppercase': Binary Property */
-static const OnigCodePoint CR_Other_Uppercase[] = {
-	2,
-	0x2160, 0x216f,
-	0x24b6, 0x24cf,
-}; /* CR_Other_Uppercase */
-
-/* 'Noncharacter_Code_Point': Binary Property */
-static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
-	18,
-	0xfdd0, 0xfdef,
-	0xfffe, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0xeffff,
-	0xffffe, 0xfffff,
-	0x10fffe, 0x10ffff,
-}; /* CR_Noncharacter_Code_Point */
-
-/* 'Other_Grapheme_Extend': Binary Property */
-static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
-	16,
-	0x09be, 0x09be,
-	0x09d7, 0x09d7,
-	0x0b3e, 0x0b3e,
-	0x0b57, 0x0b57,
-	0x0bbe, 0x0bbe,
-	0x0bd7, 0x0bd7,
-	0x0cc2, 0x0cc2,
-	0x0cd5, 0x0cd6,
-	0x0d3e, 0x0d3e,
-	0x0d57, 0x0d57,
-	0x0dcf, 0x0dcf,
-	0x0ddf, 0x0ddf,
-	0x200c, 0x200d,
-	0xff9e, 0xff9f,
-	0x1d165, 0x1d165,
-	0x1d16e, 0x1d172,
-}; /* CR_Other_Grapheme_Extend */
-
-/* 'IDS_Binary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Binary_Operator[] = {
-	2,
-	0x2ff0, 0x2ff1,
-	0x2ff4, 0x2ffb,
-}; /* CR_IDS_Binary_Operator */
-
-/* 'IDS_Trinary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
-	1,
-	0x2ff2, 0x2ff3,
-}; /* CR_IDS_Trinary_Operator */
-
-/* 'Radical': Binary Property */
-static const OnigCodePoint CR_Radical[] = {
-	3,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-}; /* CR_Radical */
-
-/* 'Unified_Ideograph': Binary Property */
-static const OnigCodePoint CR_Unified_Ideograph[] = {
-	12,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	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[] = {
-	10,
-	0x034f, 0x034f,
-	0x115f, 0x1160,
-	0x2065, 0x2069,
-	0x3164, 0x3164,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0xe0000, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xe0fff,
-}; /* CR_Other_Default_Ignorable_Code_Point */
-
-/* 'Deprecated': Binary Property */
-static const OnigCodePoint CR_Deprecated[] = {
-	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[] = {
-	47,
-	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,
-	0xabeb, 0xabeb,
-	0xfe52, 0xfe52,
-	0xfe56, 0xfe57,
-	0xff01, 0xff01,
-	0xff0e, 0xff0e,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0x10a56, 0x10a57,
-	0x11047, 0x11048,
-	0x110be, 0x110c1,
-}; /* CR_STerm */
-
-/* 'Variation_Selector': Binary Property */
-static const OnigCodePoint CR_Variation_Selector[] = {
-	3,
-	0x180b, 0x180d,
-	0xfe00, 0xfe0f,
-	0xe0100, 0xe01ef,
-}; /* CR_Variation_Selector */
-
-/* 'Pattern_White_Space': Binary Property */
-static const OnigCodePoint CR_Pattern_White_Space[] = {
-	5,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x200e, 0x200f,
-	0x2028, 0x2029,
-}; /* CR_Pattern_White_Space */
-
-/* 'Pattern_Syntax': Binary Property */
-static const OnigCodePoint CR_Pattern_Syntax[] = {
-	28,
-	0x0021, 0x002f,
-	0x003a, 0x0040,
-	0x005b, 0x005e,
-	0x0060, 0x0060,
-	0x007b, 0x007e,
-	0x00a1, 0x00a7,
-	0x00a9, 0x00a9,
-	0x00ab, 0x00ac,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b1,
-	0x00b6, 0x00b6,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x2010, 0x2027,
-	0x2030, 0x203e,
-	0x2041, 0x2053,
-	0x2055, 0x205e,
-	0x2190, 0x245f,
-	0x2500, 0x2775,
-	0x2794, 0x2bff,
-	0x2e00, 0x2e7f,
-	0x3001, 0x3003,
-	0x3008, 0x3020,
-	0x3030, 0x3030,
-	0xfd3e, 0xfd3f,
-	0xfe45, 0xfe46,
-}; /* CR_Pattern_Syntax */
-
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
-	499,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x0604, 0x0605,
-	0x061c, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 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,
-	0x0af0, 0x0af0,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	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,
-	0x0ede, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10cf,
-	0x10fd, 0x10ff,
-	0x1249, 0x1249,
-	0x124e, 0x124f,
-	0x1257, 0x1257,
-	0x1259, 0x1259,
-	0x125e, 0x125f,
-	0x1289, 0x1289,
-	0x128e, 0x128f,
-	0x12b1, 0x12b1,
-	0x12b6, 0x12b7,
-	0x12bf, 0x12bf,
-	0x12c1, 0x12c1,
-	0x12c6, 0x12c7,
-	0x12d7, 0x12d7,
-	0x1311, 0x1311,
-	0x1316, 0x1317,
-	0x135b, 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,
-	0x1bab, 0x1bad,
-	0x1bba, 0x1bbf,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1ccf,
-	0x1cf3, 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,
-	0x27cb, 0x27cb,
-	0x27cd, 0x27cd,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf2, 0x2cf8,
-	0x2d26, 0x2d2f,
-	0x2d66, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e32, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcc, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa674, 0xa67b,
-	0xa698, 0xa69f,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa792, 0xa79f,
-	0xa7aa, 0xa7f9,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaae0, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa2e, 0xfa2f,
-	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, 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, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 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, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16a, 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, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f600, 0x1f600,
-	0x1f611, 0x1f611,
-	0x1f615, 0x1f615,
-	0x1f617, 0x1f617,
-	0x1f619, 0x1f619,
-	0x1f61b, 0x1f61b,
-	0x1f61f, 0x1f61f,
-	0x1f626, 0x1f627,
-	0x1f62c, 0x1f62c,
-	0x1f62e, 0x1f62f,
-	0x1f634, 0x1f634,
-	0x1f641, 0x1f644,
-	0x1f650, 0x1f67f,
-	0x1f6c6, 0x1f6ff,
-	0x1f774, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2f7ff,
-	0x2fa1e, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-#endif /* USE_UNICODE_PROPERTIES */
-#endif /* USE_UNICODE_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 */
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
-	1,
-	0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-#define CR_Alpha CR_Alphabetic
-
-/* 'Blank': [[:Blank:]] */
-static const OnigCodePoint CR_Blank[] = {
-	9,
-	0x0009, 0x0009,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x180e, 0x180e,
-	0x2000, 0x200a,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Blank */
-
-/* 'Cntrl': [[:Cntrl:]] */
-#define CR_Cntrl CR_Cc
-
-/* 'Digit': [[:Digit:]] */
-#define CR_Digit CR_Nd
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
-	506,
-	0x0021, 0x007e,
-	0x00a1, 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, 0x167f,
-	0x1681, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1736,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17dd,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1800, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	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,
-	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, 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,
-	0x3001, 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,
-	0xe000, 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,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-#define CR_Lower CR_Lowercase
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
-	503,
-	0x0020, 0x007e,
-	0x00a0, 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, 0x2027,
-	0x202a, 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,
-	0xe000, 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,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-#define CR_Punct CR_P
-
-/* 'Space': [[:Space:]] */
-#define CR_Space CR_White_Space
-
-/* 'Upper': [[:Upper:]] */
-#define CR_Upper CR_Uppercase
-
-/* 'XDigit': [[:XDigit:]] */
-#define CR_XDigit CR_ASCII_Hex_Digit
-
-/* 'Word': [[:Word:]] */
-static const OnigCodePoint CR_Word[] = {
-	514,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	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, 0x17b3,
-	0x17b6, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf2,
-	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, 0x2cf1,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	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, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa672,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff3f, 0xff3f,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
-	509,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x135f, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b80, 0x1ba9,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11066, 0x1106f,
-	0x11082, 0x110b8,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Alnum */
-
-/* 'ASCII': [[:ASCII:]] */
-static const OnigCodePoint CR_ASCII[] = {
-	1,
-	0x0000, 0x007f,
-}; /* CR_ASCII */
-
-static const OnigCodePoint* const CodeRanges[] = {
-  CR_NEWLINE,
-  CR_Alpha,
-  CR_Blank,
-  CR_Cntrl,
-  CR_Digit,
-  CR_Graph,
-  CR_Lower,
-  CR_Print,
-  CR_Punct,
-  CR_Space,
-  CR_Upper,
-  CR_XDigit,
-  CR_Word,
-  CR_Alnum,
-  CR_ASCII,
-#ifdef USE_UNICODE_PROPERTIES
-#ifdef USE_UNICODE_PROPERTIES
-  CR_Any,
-  CR_Assigned,
-  CR_C,
-  CR_Cc,
-  CR_Cf,
-  CR_Cn,
-  CR_Co,
-  CR_Cs,
-  CR_L,
-  CR_Ll,
-  CR_Lm,
-  CR_Lo,
-  CR_Lt,
-  CR_Lu,
-  CR_M,
-  CR_Mc,
-  CR_Me,
-  CR_Mn,
-  CR_N,
-  CR_Nd,
-  CR_Nl,
-  CR_No,
-  CR_P,
-  CR_Pc,
-  CR_Pd,
-  CR_Pe,
-  CR_Pf,
-  CR_Pi,
-  CR_Po,
-  CR_Ps,
-  CR_S,
-  CR_Sc,
-  CR_Sk,
-  CR_Sm,
-  CR_So,
-  CR_Z,
-  CR_Zl,
-  CR_Zp,
-  CR_Zs,
-  CR_Math,
-  CR_Alphabetic,
-  CR_Lowercase,
-  CR_Uppercase,
-  CR_Cased,
-  CR_Case_Ignorable,
-  CR_Changes_When_Lowercased,
-  CR_Changes_When_Uppercased,
-  CR_Changes_When_Titlecased,
-  CR_Changes_When_Casefolded,
-  CR_Changes_When_Casemapped,
-  CR_ID_Start,
-  CR_ID_Continue,
-  CR_XID_Start,
-  CR_XID_Continue,
-  CR_Default_Ignorable_Code_Point,
-  CR_Grapheme_Extend,
-  CR_Grapheme_Base,
-  CR_Grapheme_Link,
-  CR_Common,
-  CR_Latin,
-  CR_Greek,
-  CR_Cyrillic,
-  CR_Armenian,
-  CR_Hebrew,
-  CR_Arabic,
-  CR_Syriac,
-  CR_Thaana,
-  CR_Devanagari,
-  CR_Bengali,
-  CR_Gurmukhi,
-  CR_Gujarati,
-  CR_Oriya,
-  CR_Tamil,
-  CR_Telugu,
-  CR_Kannada,
-  CR_Malayalam,
-  CR_Sinhala,
-  CR_Thai,
-  CR_Lao,
-  CR_Tibetan,
-  CR_Myanmar,
-  CR_Georgian,
-  CR_Hangul,
-  CR_Ethiopic,
-  CR_Cherokee,
-  CR_Canadian_Aboriginal,
-  CR_Ogham,
-  CR_Runic,
-  CR_Khmer,
-  CR_Mongolian,
-  CR_Hiragana,
-  CR_Katakana,
-  CR_Bopomofo,
-  CR_Han,
-  CR_Yi,
-  CR_Old_Italic,
-  CR_Gothic,
-  CR_Deseret,
-  CR_Inherited,
-  CR_Tagalog,
-  CR_Hanunoo,
-  CR_Buhid,
-  CR_Tagbanwa,
-  CR_Limbu,
-  CR_Tai_Le,
-  CR_Linear_B,
-  CR_Ugaritic,
-  CR_Shavian,
-  CR_Osmanya,
-  CR_Cypriot,
-  CR_Braille,
-  CR_Buginese,
-  CR_Coptic,
-  CR_New_Tai_Lue,
-  CR_Glagolitic,
-  CR_Tifinagh,
-  CR_Syloti_Nagri,
-  CR_Old_Persian,
-  CR_Kharoshthi,
-  CR_Balinese,
-  CR_Cuneiform,
-  CR_Phoenician,
-  CR_Phags_Pa,
-  CR_Nko,
-  CR_Sundanese,
-  CR_Lepcha,
-  CR_Ol_Chiki,
-  CR_Vai,
-  CR_Saurashtra,
-  CR_Kayah_Li,
-  CR_Rejang,
-  CR_Lycian,
-  CR_Carian,
-  CR_Lydian,
-  CR_Cham,
-  CR_Tai_Tham,
-  CR_Tai_Viet,
-  CR_Avestan,
-  CR_Egyptian_Hieroglyphs,
-  CR_Samaritan,
-  CR_Lisu,
-  CR_Bamum,
-  CR_Javanese,
-  CR_Meetei_Mayek,
-  CR_Imperial_Aramaic,
-  CR_Old_South_Arabian,
-  CR_Inscriptional_Parthian,
-  CR_Inscriptional_Pahlavi,
-  CR_Old_Turkic,
-  CR_Kaithi,
-  CR_Batak,
-  CR_Brahmi,
-  CR_Mandaic,
-  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,
-#endif /* USE_UNICODE_PROPERTIES */
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
-  int name, ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-
-#ifndef USE_UNICODE_PROPERTIES
-#define TOTAL_KEYWORDS 15
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 7
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 21
-/* maximum key range = 15, duplicates = 0 */
-#else /* USE_UNICODE_PROPERTIES */
-#define TOTAL_KEYWORDS 387
-#define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 30
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 1741
-/* maximum key range = 1739, duplicates = 0 */
-#endif /* USE_UNICODE_PROPERTIES */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-uniname2ctype_hash (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-#ifndef USE_UNICODE_PROPERTIES
-  static const unsigned char asso_values[] =
-#else /* USE_UNICODE_PROPERTIES */
-  static const unsigned short asso_values[] =
-#endif /* USE_UNICODE_PROPERTIES */
-    {
-#ifndef USE_UNICODE_PROPERTIES
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-      22, 22, 22, 22, 22, 22, 22,  3, 13,  6,
-       4, 22, 22, 11, 22,  1, 22, 22, 10, 22,
-       2, 22,  1, 22, 10,  8,  4,  7, 22,  3,
-       4, 22, 22, 22, 22, 22, 22, 22
-#else /* USE_UNICODE_PROPERTIES */
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742,    2, 1742,    9,    1,
-         2,   18,    5,    3,    4, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742,
-      1742, 1742, 1742, 1742, 1742, 1742, 1742,    8,  280,    6,
-        96,   67,  362,  294,   38,    9,   63,  517,    2,  213,
-         1,    4,  192,    3,   10,   57,   31,  316,    1,  549,
-       330,  567,   36, 1742, 1742, 1742, 1742, 1742
-#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_str7[sizeof("print")];
-    char uniname2ctype_pool_str8[sizeof("punct")];
-    char uniname2ctype_pool_str9[sizeof("alpha")];
-    char uniname2ctype_pool_str10[sizeof("alnum")];
-    char uniname2ctype_pool_str11[sizeof("xdigit")];
-    char uniname2ctype_pool_str12[sizeof("newline")];
-    char uniname2ctype_pool_str13[sizeof("upper")];
-    char uniname2ctype_pool_str14[sizeof("ascii")];
-    char uniname2ctype_pool_str15[sizeof("cntrl")];
-    char uniname2ctype_pool_str16[sizeof("space")];
-    char uniname2ctype_pool_str17[sizeof("word")];
-    char uniname2ctype_pool_str18[sizeof("lower")];
-    char uniname2ctype_pool_str19[sizeof("graph")];
-    char uniname2ctype_pool_str20[sizeof("digit")];
-    char uniname2ctype_pool_str21[sizeof("blank")];
-#else /* USE_UNICODE_PROPERTIES */
-    char uniname2ctype_pool_str3[sizeof("n")];
-    char uniname2ctype_pool_str5[sizeof("l")];
-    char uniname2ctype_pool_str7[sizeof("nl")];
-    char uniname2ctype_pool_str8[sizeof("ll")];
-    char uniname2ctype_pool_str10[sizeof("cn")];
-    char uniname2ctype_pool_str11[sizeof("no")];
-    char uniname2ctype_pool_str12[sizeof("lo")];
-    char uniname2ctype_pool_str13[sizeof("c")];
-    char uniname2ctype_pool_str16[sizeof("co")];
-    char uniname2ctype_pool_str20[sizeof("cc")];
-    char uniname2ctype_pool_str21[sizeof("lao")];
-    char uniname2ctype_pool_str22[sizeof("laoo")];
-    char uniname2ctype_pool_str23[sizeof("lana")];
-    char uniname2ctype_pool_str26[sizeof("ci")];
-    char uniname2ctype_pool_str29[sizeof("qaac")];
-    char uniname2ctype_pool_str30[sizeof("vai")];
-    char uniname2ctype_pool_str31[sizeof("vaii")];
-    char uniname2ctype_pool_str32[sizeof("qaai")];
-    char uniname2ctype_pool_str34[sizeof("control")];
-    char uniname2ctype_pool_str37[sizeof("cari")];
-    char uniname2ctype_pool_str40[sizeof("carian")];
-    char uniname2ctype_pool_str42[sizeof("zl")];
-    char uniname2ctype_pool_str44[sizeof("oriya")];
-    char uniname2ctype_pool_str46[sizeof("latn")];
-    char uniname2ctype_pool_str47[sizeof("cntrl")];
-    char uniname2ctype_pool_str48[sizeof("latin")];
-    char uniname2ctype_pool_str51[sizeof("han")];
-    char uniname2ctype_pool_str53[sizeof("arabic")];
-    char uniname2ctype_pool_str54[sizeof("ital")];
-    char uniname2ctype_pool_str55[sizeof("hano")];
-    char uniname2ctype_pool_str60[sizeof("hani")];
-    char uniname2ctype_pool_str63[sizeof("hanunoo")];
-    char uniname2ctype_pool_str66[sizeof("lt")];
-    char uniname2ctype_pool_str67[sizeof("so")];
-    char uniname2ctype_pool_str69[sizeof("hira")];
-    char uniname2ctype_pool_str70[sizeof("nchar")];
-    char uniname2ctype_pool_str71[sizeof("sc")];
-    char uniname2ctype_pool_str73[sizeof("z")];
-    char uniname2ctype_pool_str74[sizeof("oalpha")];
-    char uniname2ctype_pool_str75[sizeof("tavt")];
-    char uniname2ctype_pool_str76[sizeof("cans")];
-    char uniname2ctype_pool_str84[sizeof("java")];
-    char uniname2ctype_pool_str88[sizeof("zinh")];
-    char uniname2ctype_pool_str89[sizeof("thaa")];
-    char uniname2ctype_pool_str90[sizeof("thai")];
-    char uniname2ctype_pool_str91[sizeof("variationselector")];
-    char uniname2ctype_pool_str92[sizeof("sinhala")];
-    char uniname2ctype_pool_str93[sizeof("joinc")];
-    char uniname2ctype_pool_str94[sizeof("ascii")];
-    char uniname2ctype_pool_str95[sizeof("initialpunctuation")];
-    char uniname2ctype_pool_str98[sizeof("other")];
-    char uniname2ctype_pool_str99[sizeof("joincontrol")];
-    char uniname2ctype_pool_str100[sizeof("thaana")];
-    char uniname2ctype_pool_str101[sizeof("avst")];
-    char uniname2ctype_pool_str103[sizeof("olower")];
-    char uniname2ctype_pool_str105[sizeof("othernumber")];
-    char uniname2ctype_pool_str106[sizeof("otherletter")];
-    char uniname2ctype_pool_str109[sizeof("sinh")];
-    char uniname2ctype_pool_str112[sizeof("tale")];
-    char uniname2ctype_pool_str114[sizeof("connectorpunctuation")];
-    char uniname2ctype_pool_str115[sizeof("s")];
-    char uniname2ctype_pool_str116[sizeof("di")];
-    char uniname2ctype_pool_str117[sizeof("vs")];
-    char uniname2ctype_pool_str119[sizeof("oidc")];
-    char uniname2ctype_pool_str120[sizeof("idc")];
-    char uniname2ctype_pool_str121[sizeof("odi")];
-    char uniname2ctype_pool_str122[sizeof("cs")];
-    char uniname2ctype_pool_str123[sizeof("avestan")];
-    char uniname2ctype_pool_str124[sizeof("dia")];
-    char uniname2ctype_pool_str125[sizeof("cher")];
-    char uniname2ctype_pool_str126[sizeof("inscriptionalparthian")];
-    char uniname2ctype_pool_str128[sizeof("shavian")];
-    char uniname2ctype_pool_str137[sizeof("radical")];
-    char uniname2ctype_pool_str143[sizeof("loe")];
-    char uniname2ctype_pool_str147[sizeof("diacritic")];
-    char uniname2ctype_pool_str148[sizeof("zzzz")];
-    char uniname2ctype_pool_str149[sizeof("ethi")];
-    char uniname2ctype_pool_str151[sizeof("canadianaboriginal")];
-    char uniname2ctype_pool_str152[sizeof("zs")];
-    char uniname2ctype_pool_str153[sizeof("othersymbol")];
-    char uniname2ctype_pool_str156[sizeof("olditalic")];
-    char uniname2ctype_pool_str161[sizeof("inscriptionalpahlavi")];
-    char uniname2ctype_pool_str162[sizeof("taiviet")];
-    char uniname2ctype_pool_str163[sizeof("lineseparator")];
-    char uniname2ctype_pool_str166[sizeof("otheridstart")];
-    char uniname2ctype_pool_str170[sizeof("oids")];
-    char uniname2ctype_pool_str171[sizeof("asciihexdigit")];
-    char uniname2ctype_pool_str172[sizeof("inherited")];
-    char uniname2ctype_pool_str174[sizeof("otherlowercase")];
-    char uniname2ctype_pool_str175[sizeof("terminalpunctuation")];
-    char uniname2ctype_pool_str176[sizeof("deva")];
-    char uniname2ctype_pool_str179[sizeof("otheralphabetic")];
-    char uniname2ctype_pool_str180[sizeof("ideo")];
-    char uniname2ctype_pool_str181[sizeof("noncharactercodepoint")];
-    char uniname2ctype_pool_str183[sizeof("otheridcontinue")];
-    char uniname2ctype_pool_str187[sizeof("taile")];
-    char uniname2ctype_pool_str190[sizeof("oldpersian")];
-    char uniname2ctype_pool_str192[sizeof("devanagari")];
-    char uniname2ctype_pool_str193[sizeof("letter")];
-    char uniname2ctype_pool_str195[sizeof("nd")];
-    char uniname2ctype_pool_str197[sizeof("idst")];
-    char uniname2ctype_pool_str198[sizeof("dsrt")];
-    char uniname2ctype_pool_str200[sizeof("titlecaseletter")];
-    char uniname2ctype_pool_str202[sizeof("po")];
-    char uniname2ctype_pool_str203[sizeof("dash")];
-    char uniname2ctype_pool_str206[sizeof("pc")];
-    char uniname2ctype_pool_str209[sizeof("letternumber")];
-    char uniname2ctype_pool_str212[sizeof("pi")];
-    char uniname2ctype_pool_str215[sizeof("javanese")];
-    char uniname2ctype_pool_str217[sizeof("mn")];
-    char uniname2ctype_pool_str218[sizeof("idstart")];
-    char uniname2ctype_pool_str220[sizeof("idcontinue")];
-    char uniname2ctype_pool_str222[sizeof("ids")];
-    char uniname2ctype_pool_str223[sizeof("alpha")];
-    char uniname2ctype_pool_str227[sizeof("mc")];
-    char uniname2ctype_pool_str229[sizeof("coptic")];
-    char uniname2ctype_pool_str234[sizeof("mongolian")];
-    char uniname2ctype_pool_str235[sizeof("common")];
-    char uniname2ctype_pool_str236[sizeof("armn")];
-    char uniname2ctype_pool_str237[sizeof("copt")];
-    char uniname2ctype_pool_str243[sizeof("cprt")];
-    char uniname2ctype_pool_str244[sizeof("armi")];
-    char uniname2ctype_pool_str245[sizeof("phli")];
-    char uniname2ctype_pool_str246[sizeof("prti")];
-    char uniname2ctype_pool_str250[sizeof("armenian")];
-    char uniname2ctype_pool_str251[sizeof("sd")];
-    char uniname2ctype_pool_str252[sizeof("mandaic")];
-    char uniname2ctype_pool_str255[sizeof("phoenician")];
-    char uniname2ctype_pool_str258[sizeof("taml")];
-    char uniname2ctype_pool_str261[sizeof("tamil")];
-    char uniname2ctype_pool_str268[sizeof("cased")];
-    char uniname2ctype_pool_str269[sizeof("cham")];
-    char uniname2ctype_pool_str270[sizeof("idsbinaryoperator")];
-    char uniname2ctype_pool_str271[sizeof("lepc")];
-    char uniname2ctype_pool_str275[sizeof("otherdefaultignorablecodepoint")];
-    char uniname2ctype_pool_str278[sizeof("print")];
-    char uniname2ctype_pool_str286[sizeof("osma")];
-    char uniname2ctype_pool_str292[sizeof("samr")];
-    char uniname2ctype_pool_str294[sizeof("math")];
-    char uniname2ctype_pool_str296[sizeof("linb")];
-    char uniname2ctype_pool_str297[sizeof("closepunctuation")];
-    char uniname2ctype_pool_str301[sizeof("otherpunctuation")];
-    char uniname2ctype_pool_str303[sizeof("bali")];
-    char uniname2ctype_pool_str306[sizeof("omath")];
-    char uniname2ctype_pool_str307[sizeof("samaritan")];
-    char uniname2ctype_pool_str308[sizeof("ps")];
-    char uniname2ctype_pool_str310[sizeof("arab")];
-    char uniname2ctype_pool_str311[sizeof("brai")];
-    char uniname2ctype_pool_str314[sizeof("taitham")];
-    char uniname2ctype_pool_str317[sizeof("linearb")];
-    char uniname2ctype_pool_str321[sizeof("lepcha")];
-    char uniname2ctype_pool_str322[sizeof("mand")];
-    char uniname2ctype_pool_str324[sizeof("mtei")];
-    char uniname2ctype_pool_str325[sizeof("term")];
-    char uniname2ctype_pool_str326[sizeof("glagolitic")];
-    char uniname2ctype_pool_str327[sizeof("privateuse")];
-    char uniname2ctype_pool_str328[sizeof("pe")];
-    char uniname2ctype_pool_str335[sizeof("deseret")];
-    char uniname2ctype_pool_str340[sizeof("brah")];
-    char uniname2ctype_pool_str341[sizeof("runr")];
-    char uniname2ctype_pool_str343[sizeof("othermath")];
-    char uniname2ctype_pool_str344[sizeof("runic")];
-    char uniname2ctype_pool_str345[sizeof("hang")];
-    char uniname2ctype_pool_str346[sizeof("ethiopic")];
-    char uniname2ctype_pool_str349[sizeof("me")];
-    char uniname2ctype_pool_str350[sizeof("patws")];
-    char uniname2ctype_pool_str353[sizeof("separator")];
-    char uniname2ctype_pool_str355[sizeof("tibt")];
-    char uniname2ctype_pool_str356[sizeof("gothic")];
-    char uniname2ctype_pool_str358[sizeof("tagbanwa")];
-    char uniname2ctype_pool_str359[sizeof("sarb")];
-    char uniname2ctype_pool_str361[sizeof("talu")];
-    char uniname2ctype_pool_str367[sizeof("tibetan")];
-    char uniname2ctype_pool_str371[sizeof("goth")];
-    char uniname2ctype_pool_str372[sizeof("rjng")];
-    char uniname2ctype_pool_str373[sizeof("hangul")];
-    char uniname2ctype_pool_str374[sizeof("bengali")];
-    char uniname2ctype_pool_str375[sizeof("hiragana")];
-    char uniname2ctype_pool_str376[sizeof("braille")];
-    char uniname2ctype_pool_str379[sizeof("geor")];
-    char uniname2ctype_pool_str380[sizeof("age=1.1")];
-    char uniname2ctype_pool_str381[sizeof("age=2.1")];
-    char uniname2ctype_pool_str382[sizeof("age=5.1")];
-    char uniname2ctype_pool_str383[sizeof("age=5.2")];
-    char uniname2ctype_pool_str384[sizeof("age=4.1")];
-    char uniname2ctype_pool_str385[sizeof("p")];
-    char uniname2ctype_pool_str386[sizeof("pd")];
-    char uniname2ctype_pool_str388[sizeof("lisu")];
-    char uniname2ctype_pool_str389[sizeof("age=2.0")];
-    char uniname2ctype_pool_str390[sizeof("age=5.0")];
-    char uniname2ctype_pool_str391[sizeof("age=6.0")];
-    char uniname2ctype_pool_str392[sizeof("age=4.0")];
-    char uniname2ctype_pool_str393[sizeof("graph")];
-    char uniname2ctype_pool_str395[sizeof("saur")];
-    char uniname2ctype_pool_str396[sizeof("space")];
-    char uniname2ctype_pool_str397[sizeof("age=3.1")];
-    char uniname2ctype_pool_str398[sizeof("age=3.2")];
-    char uniname2ctype_pool_str399[sizeof("hebr")];
-    char uniname2ctype_pool_str402[sizeof("bidic")];
-    char uniname2ctype_pool_str405[sizeof("age=3.0")];
-    char uniname2ctype_pool_str408[sizeof("bidicontrol")];
-    char uniname2ctype_pool_str413[sizeof("logicalorderexception")];
-    char uniname2ctype_pool_str420[sizeof("telu")];
-    char uniname2ctype_pool_str422[sizeof("zp")];
-    char uniname2ctype_pool_str427[sizeof("m")];
-    char uniname2ctype_pool_str430[sizeof("lm")];
-    char uniname2ctype_pool_str432[sizeof("idstrinaryoperator")];
-    char uniname2ctype_pool_str433[sizeof("balinese")];
-    char uniname2ctype_pool_str434[sizeof("uideo")];
-    char uniname2ctype_pool_str436[sizeof("spaceseparator")];
-    char uniname2ctype_pool_str438[sizeof("grext")];
-    char uniname2ctype_pool_str442[sizeof("alnum")];
-    char uniname2ctype_pool_str443[sizeof("oldturkic")];
-    char uniname2ctype_pool_str445[sizeof("xidc")];
-    char uniname2ctype_pool_str446[sizeof("idsb")];
-    char uniname2ctype_pool_str447[sizeof("ahex")];
-    char uniname2ctype_pool_str452[sizeof("format")];
-    char uniname2ctype_pool_str456[sizeof("caseignorable")];
-    char uniname2ctype_pool_str457[sizeof("tifinagh")];
-    char uniname2ctype_pool_str459[sizeof("sundanese")];
-    char uniname2ctype_pool_str462[sizeof("ext")];
-    char uniname2ctype_pool_str464[sizeof("saurashtra")];
-    char uniname2ctype_pool_str465[sizeof("patternwhitespace")];
-    char uniname2ctype_pool_str466[sizeof("digit")];
-    char uniname2ctype_pool_str474[sizeof("sund")];
-    char uniname2ctype_pool_str480[sizeof("decimalnumber")];
-    char uniname2ctype_pool_str484[sizeof("bopo")];
-    char uniname2ctype_pool_str485[sizeof("sm")];
-    char uniname2ctype_pool_str488[sizeof("otheruppercase")];
-    char uniname2ctype_pool_str493[sizeof("ideographic")];
-    char uniname2ctype_pool_str496[sizeof("xids")];
-    char uniname2ctype_pool_str497[sizeof("unassigned")];
-    char uniname2ctype_pool_str502[sizeof("phagspa")];
-    char uniname2ctype_pool_str506[sizeof("alphabetic")];
-    char uniname2ctype_pool_str508[sizeof("limb")];
-    char uniname2ctype_pool_str512[sizeof("xdigit")];
-    char uniname2ctype_pool_str513[sizeof("xidstart")];
-    char uniname2ctype_pool_str516[sizeof("mong")];
-    char uniname2ctype_pool_str518[sizeof("xidcontinue")];
-    char uniname2ctype_pool_str521[sizeof("assigned")];
-    char uniname2ctype_pool_str523[sizeof("ogam")];
-    char uniname2ctype_pool_str529[sizeof("nko")];
-    char uniname2ctype_pool_str530[sizeof("nkoo")];
-    char uniname2ctype_pool_str533[sizeof("olck")];
-    char uniname2ctype_pool_str534[sizeof("deprecated")];
-    char uniname2ctype_pool_str535[sizeof("brahmi")];
-    char uniname2ctype_pool_str536[sizeof("phag")];
-    char uniname2ctype_pool_str538[sizeof("kana")];
-    char uniname2ctype_pool_str540[sizeof("kali")];
-    char uniname2ctype_pool_str542[sizeof("changeswhenlowercased")];
-    char uniname2ctype_pool_str543[sizeof("extender")];
-    char uniname2ctype_pool_str550[sizeof("dep")];
-    char uniname2ctype_pool_str554[sizeof("olchiki")];
-    char uniname2ctype_pool_str562[sizeof("cwl")];
-    char uniname2ctype_pool_str563[sizeof("graphemebase")];
-    char uniname2ctype_pool_str565[sizeof("phnx")];
-    char uniname2ctype_pool_str573[sizeof("orkh")];
-    char uniname2ctype_pool_str576[sizeof("punct")];
-    char uniname2ctype_pool_str577[sizeof("khar")];
-    char uniname2ctype_pool_str580[sizeof("lower")];
-    char uniname2ctype_pool_str586[sizeof("sterm")];
-    char uniname2ctype_pool_str587[sizeof("yi")];
-    char uniname2ctype_pool_str588[sizeof("lyci")];
-    char uniname2ctype_pool_str589[sizeof("cyrl")];
-    char uniname2ctype_pool_str591[sizeof("lycian")];
-    char uniname2ctype_pool_str592[sizeof("finalpunctuation")];
-    char uniname2ctype_pool_str593[sizeof("orya")];
-    char uniname2ctype_pool_str594[sizeof("graphemeextend")];
-    char uniname2ctype_pool_str596[sizeof("kaithi")];
-    char uniname2ctype_pool_str597[sizeof("xpeo")];
-    char uniname2ctype_pool_str598[sizeof("yiii")];
-    char uniname2ctype_pool_str599[sizeof("kthi")];
-    char uniname2ctype_pool_str601[sizeof("cyrillic")];
-    char uniname2ctype_pool_str602[sizeof("glag")];
-    char uniname2ctype_pool_str605[sizeof("oupper")];
-    char uniname2ctype_pool_str617[sizeof("tagb")];
-    char uniname2ctype_pool_str620[sizeof("cwt")];
-    char uniname2ctype_pool_str623[sizeof("number")];
-    char uniname2ctype_pool_str625[sizeof("tglg")];
-    char uniname2ctype_pool_str626[sizeof("knda")];
-    char uniname2ctype_pool_str627[sizeof("lowercaseletter")];
-    char uniname2ctype_pool_str628[sizeof("changeswhentitlecased")];
-    char uniname2ctype_pool_str629[sizeof("softdotted")];
-    char uniname2ctype_pool_str632[sizeof("ugar")];
-    char uniname2ctype_pool_str634[sizeof("sylo")];
-    char uniname2ctype_pool_str636[sizeof("lu")];
-    char uniname2ctype_pool_str640[sizeof("tagalog")];
-    char uniname2ctype_pool_str643[sizeof("kharoshthi")];
-    char uniname2ctype_pool_str644[sizeof("syrc")];
-    char uniname2ctype_pool_str645[sizeof("kannada")];
-    char uniname2ctype_pool_str646[sizeof("beng")];
-    char uniname2ctype_pool_str647[sizeof("lowercase")];
-    char uniname2ctype_pool_str656[sizeof("shaw")];
-    char uniname2ctype_pool_str659[sizeof("patternsyntax")];
-    char uniname2ctype_pool_str660[sizeof("syriac")];
-    char uniname2ctype_pool_str663[sizeof("word")];
-    char uniname2ctype_pool_str667[sizeof("imperialaramaic")];
-    char uniname2ctype_pool_str672[sizeof("ugaritic")];
-    char uniname2ctype_pool_str675[sizeof("enclosingmark")];
-    char uniname2ctype_pool_str677[sizeof("georgian")];
-    char uniname2ctype_pool_str678[sizeof("lydi")];
-    char uniname2ctype_pool_str681[sizeof("lydian")];
-    char uniname2ctype_pool_str686[sizeof("sylotinagri")];
-    char uniname2ctype_pool_str687[sizeof("gujr")];
-    char uniname2ctype_pool_str692[sizeof("tfng")];
-    char uniname2ctype_pool_str696[sizeof("currencysymbol")];
-    char uniname2ctype_pool_str701[sizeof("newline")];
-    char uniname2ctype_pool_str705[sizeof("bopomofo")];
-    char uniname2ctype_pool_str706[sizeof("ogrext")];
-    char uniname2ctype_pool_str707[sizeof("cherokee")];
-    char uniname2ctype_pool_str708[sizeof("gujarati")];
-    char uniname2ctype_pool_str710[sizeof("newtailue")];
-    char uniname2ctype_pool_str716[sizeof("dashpunctuation")];
-    char uniname2ctype_pool_str718[sizeof("oldsoutharabian")];
-    char uniname2ctype_pool_str725[sizeof("upper")];
-    char uniname2ctype_pool_str732[sizeof("cf")];
-    char uniname2ctype_pool_str734[sizeof("buhd")];
-    char uniname2ctype_pool_str735[sizeof("rejang")];
-    char uniname2ctype_pool_str736[sizeof("othergraphemeextend")];
-    char uniname2ctype_pool_str739[sizeof("modifierletter")];
-    char uniname2ctype_pool_str745[sizeof("nonspacingmark")];
-    char uniname2ctype_pool_str749[sizeof("changeswhencasemapped")];
-    char uniname2ctype_pool_str752[sizeof("mark")];
-    char uniname2ctype_pool_str757[sizeof("surrogate")];
-    char uniname2ctype_pool_str765[sizeof("paragraphseparator")];
-    char uniname2ctype_pool_str767[sizeof("ogham")];
-    char uniname2ctype_pool_str768[sizeof("hex")];
-    char uniname2ctype_pool_str772[sizeof("uppercaseletter")];
-    char uniname2ctype_pool_str777[sizeof("hexdigit")];
-    char uniname2ctype_pool_str778[sizeof("cwcm")];
-    char uniname2ctype_pool_str781[sizeof("grbase")];
-    char uniname2ctype_pool_str782[sizeof("khmr")];
-    char uniname2ctype_pool_str788[sizeof("unifiedideograph")];
-    char uniname2ctype_pool_str792[sizeof("uppercase")];
-    char uniname2ctype_pool_str793[sizeof("khmer")];
-    char uniname2ctype_pool_str795[sizeof("spacingmark")];
-    char uniname2ctype_pool_str797[sizeof("whitespace")];
-    char uniname2ctype_pool_str806[sizeof("patsyn")];
-    char uniname2ctype_pool_str816[sizeof("cypriot")];
-    char uniname2ctype_pool_str818[sizeof("openpunctuation")];
-    char uniname2ctype_pool_str821[sizeof("bamu")];
-    char uniname2ctype_pool_str831[sizeof("buhid")];
-    char uniname2ctype_pool_str840[sizeof("batk")];
-    char uniname2ctype_pool_str851[sizeof("symbol")];
-    char uniname2ctype_pool_str856[sizeof("changeswhenuppercased")];
-    char uniname2ctype_pool_str857[sizeof("osmanya")];
-    char uniname2ctype_pool_str861[sizeof("limbu")];
-    char uniname2ctype_pool_str868[sizeof("punctuation")];
-    char uniname2ctype_pool_str872[sizeof("hyphen")];
-    char uniname2ctype_pool_str888[sizeof("mathsymbol")];
-    char uniname2ctype_pool_str892[sizeof("grek")];
-    char uniname2ctype_pool_str898[sizeof("changeswhencasefolded")];
-    char uniname2ctype_pool_str902[sizeof("quotationmark")];
-    char uniname2ctype_pool_str903[sizeof("bugi")];
-    char uniname2ctype_pool_str916[sizeof("cuneiform")];
-    char uniname2ctype_pool_str918[sizeof("pf")];
-    char uniname2ctype_pool_str927[sizeof("cwcf")];
-    char uniname2ctype_pool_str932[sizeof("bamum")];
-    char uniname2ctype_pool_str940[sizeof("guru")];
-    char uniname2ctype_pool_str944[sizeof("wspace")];
-    char uniname2ctype_pool_str951[sizeof("meeteimayek")];
-    char uniname2ctype_pool_str976[sizeof("defaultignorablecodepoint")];
-    char uniname2ctype_pool_str980[sizeof("modifiersymbol")];
-    char uniname2ctype_pool_str999[sizeof("mlym")];
-    char uniname2ctype_pool_str1007[sizeof("mymr")];
-    char uniname2ctype_pool_str1020[sizeof("malayalam")];
-    char uniname2ctype_pool_str1026[sizeof("myanmar")];
-    char uniname2ctype_pool_str1032[sizeof("telugu")];
-    char uniname2ctype_pool_str1033[sizeof("buginese")];
-    char uniname2ctype_pool_str1037[sizeof("xsux")];
-    char uniname2ctype_pool_str1093[sizeof("sk")];
-    char uniname2ctype_pool_str1097[sizeof("katakana")];
-    char uniname2ctype_pool_str1124[sizeof("egyp")];
-    char uniname2ctype_pool_str1146[sizeof("any")];
-    char uniname2ctype_pool_str1148[sizeof("kayahli")];
-    char uniname2ctype_pool_str1190[sizeof("cwu")];
-    char uniname2ctype_pool_str1263[sizeof("qmark")];
-    char uniname2ctype_pool_str1329[sizeof("blank")];
-    char uniname2ctype_pool_str1347[sizeof("grlink")];
-    char uniname2ctype_pool_str1358[sizeof("batak")];
-    char uniname2ctype_pool_str1395[sizeof("unknown")];
-    char uniname2ctype_pool_str1410[sizeof("greek")];
-    char uniname2ctype_pool_str1463[sizeof("graphemelink")];
-    char uniname2ctype_pool_str1470[sizeof("gurmukhi")];
-    char uniname2ctype_pool_str1556[sizeof("hebrew")];
-    char uniname2ctype_pool_str1621[sizeof("egyptianhieroglyphs")];
-    char uniname2ctype_pool_str1741[sizeof("zyyy")];
-#endif /* USE_UNICODE_PROPERTIES */
-  };
-static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
-  {
-#ifndef USE_UNICODE_PROPERTIES
-    "print",
-    "punct",
-#else /* USE_UNICODE_PROPERTIES */
-    "n",
-    "l",
-    "nl",
-    "ll",
-    "cn",
-    "no",
-    "lo",
-    "c",
-    "co",
-    "cc",
-    "lao",
-    "laoo",
-    "lana",
-    "ci",
-    "qaac",
-    "vai",
-    "vaii",
-    "qaai",
-    "control",
-    "cari",
-    "carian",
-    "zl",
-    "oriya",
-    "latn",
-    "cntrl",
-    "latin",
-    "han",
-    "arabic",
-    "ital",
-    "hano",
-    "hani",
-    "hanunoo",
-    "lt",
-    "so",
-    "hira",
-    "nchar",
-    "sc",
-    "z",
-    "oalpha",
-    "tavt",
-    "cans",
-    "java",
-    "zinh",
-    "thaa",
-    "thai",
-    "variationselector",
-    "sinhala",
-    "joinc",
-    "ascii",
-    "initialpunctuation",
-    "other",
-    "joincontrol",
-    "thaana",
-    "avst",
-    "olower",
-    "othernumber",
-    "otherletter",
-    "sinh",
-    "tale",
-    "connectorpunctuation",
-    "s",
-    "di",
-    "vs",
-    "oidc",
-    "idc",
-    "odi",
-    "cs",
-    "avestan",
-    "dia",
-    "cher",
-    "inscriptionalparthian",
-    "shavian",
-    "radical",
-    "loe",
-    "diacritic",
-    "zzzz",
-    "ethi",
-    "canadianaboriginal",
-    "zs",
-    "othersymbol",
-    "olditalic",
-    "inscriptionalpahlavi",
-    "taiviet",
-    "lineseparator",
-    "otheridstart",
-    "oids",
-    "asciihexdigit",
-    "inherited",
-    "otherlowercase",
-    "terminalpunctuation",
-    "deva",
-    "otheralphabetic",
-    "ideo",
-    "noncharactercodepoint",
-    "otheridcontinue",
-    "taile",
-    "oldpersian",
-    "devanagari",
-    "letter",
-    "nd",
-    "idst",
-    "dsrt",
-    "titlecaseletter",
-    "po",
-    "dash",
-    "pc",
-    "letternumber",
-    "pi",
-    "javanese",
-    "mn",
-    "idstart",
-    "idcontinue",
-    "ids",
-#endif /* USE_UNICODE_PROPERTIES */
-    "alpha",
-#ifdef USE_UNICODE_PROPERTIES
-    "mc",
-    "coptic",
-    "mongolian",
-    "common",
-    "armn",
-    "copt",
-    "cprt",
-    "armi",
-    "phli",
-    "prti",
-    "armenian",
-    "sd",
-    "mandaic",
-    "phoenician",
-    "taml",
-    "tamil",
-    "cased",
-    "cham",
-    "idsbinaryoperator",
-    "lepc",
-    "otherdefaultignorablecodepoint",
-    "print",
-    "osma",
-    "samr",
-    "math",
-    "linb",
-    "closepunctuation",
-    "otherpunctuation",
-    "bali",
-    "omath",
-    "samaritan",
-    "ps",
-    "arab",
-    "brai",
-    "taitham",
-    "linearb",
-    "lepcha",
-    "mand",
-    "mtei",
-    "term",
-    "glagolitic",
-    "privateuse",
-    "pe",
-    "deseret",
-    "brah",
-    "runr",
-    "othermath",
-    "runic",
-    "hang",
-    "ethiopic",
-    "me",
-    "patws",
-    "separator",
-    "tibt",
-    "gothic",
-    "tagbanwa",
-    "sarb",
-    "talu",
-    "tibetan",
-    "goth",
-    "rjng",
-    "hangul",
-    "bengali",
-    "hiragana",
-    "braille",
-    "geor",
-    "age=1.1",
-    "age=2.1",
-    "age=5.1",
-    "age=5.2",
-    "age=4.1",
-    "p",
-    "pd",
-    "lisu",
-    "age=2.0",
-    "age=5.0",
-    "age=6.0",
-    "age=4.0",
-    "graph",
-    "saur",
-    "space",
-    "age=3.1",
-    "age=3.2",
-    "hebr",
-    "bidic",
-    "age=3.0",
-    "bidicontrol",
-    "logicalorderexception",
-    "telu",
-    "zp",
-    "m",
-    "lm",
-    "idstrinaryoperator",
-    "balinese",
-    "uideo",
-    "spaceseparator",
-    "grext",
-#endif /* USE_UNICODE_PROPERTIES */
-    "alnum",
-#ifdef USE_UNICODE_PROPERTIES
-    "oldturkic",
-    "xidc",
-    "idsb",
-    "ahex",
-    "format",
-    "caseignorable",
-    "tifinagh",
-    "sundanese",
-    "ext",
-    "saurashtra",
-    "patternwhitespace",
-    "digit",
-    "sund",
-    "decimalnumber",
-    "bopo",
-    "sm",
-    "otheruppercase",
-    "ideographic",
-    "xids",
-    "unassigned",
-    "phagspa",
-    "alphabetic",
-    "limb",
-#endif /* USE_UNICODE_PROPERTIES */
-    "xdigit",
-#ifdef USE_UNICODE_PROPERTIES
-    "xidstart",
-    "mong",
-    "xidcontinue",
-    "assigned",
-    "ogam",
-    "nko",
-    "nkoo",
-    "olck",
-    "deprecated",
-    "brahmi",
-    "phag",
-    "kana",
-    "kali",
-    "changeswhenlowercased",
-    "extender",
-    "dep",
-    "olchiki",
-    "cwl",
-    "graphemebase",
-    "phnx",
-    "orkh",
-    "punct",
-    "khar",
-    "lower",
-    "sterm",
-    "yi",
-    "lyci",
-    "cyrl",
-    "lycian",
-    "finalpunctuation",
-    "orya",
-    "graphemeextend",
-    "kaithi",
-    "xpeo",
-    "yiii",
-    "kthi",
-    "cyrillic",
-    "glag",
-    "oupper",
-    "tagb",
-    "cwt",
-    "number",
-    "tglg",
-    "knda",
-    "lowercaseletter",
-    "changeswhentitlecased",
-    "softdotted",
-    "ugar",
-    "sylo",
-    "lu",
-    "tagalog",
-    "kharoshthi",
-    "syrc",
-    "kannada",
-    "beng",
-    "lowercase",
-    "shaw",
-    "patternsyntax",
-    "syriac",
-    "word",
-    "imperialaramaic",
-    "ugaritic",
-    "enclosingmark",
-    "georgian",
-    "lydi",
-    "lydian",
-    "sylotinagri",
-    "gujr",
-    "tfng",
-    "currencysymbol",
-#endif /* USE_UNICODE_PROPERTIES */
-    "newline",
-#ifdef USE_UNICODE_PROPERTIES
-    "bopomofo",
-    "ogrext",
-    "cherokee",
-    "gujarati",
-    "newtailue",
-    "dashpunctuation",
-    "oldsoutharabian",
-#endif /* USE_UNICODE_PROPERTIES */
-    "upper",
-#ifndef USE_UNICODE_PROPERTIES
-    "ascii",
-    "cntrl",
-    "space",
-    "word",
-    "lower",
-    "graph",
-    "digit",
-    "blank"
-#else /* USE_UNICODE_PROPERTIES */
-    "cf",
-    "buhd",
-    "rejang",
-    "othergraphemeextend",
-    "modifierletter",
-    "nonspacingmark",
-    "changeswhencasemapped",
-    "mark",
-    "surrogate",
-    "paragraphseparator",
-    "ogham",
-    "hex",
-    "uppercaseletter",
-    "hexdigit",
-    "cwcm",
-    "grbase",
-    "khmr",
-    "unifiedideograph",
-    "uppercase",
-    "khmer",
-    "spacingmark",
-    "whitespace",
-    "patsyn",
-    "cypriot",
-    "openpunctuation",
-    "bamu",
-    "buhid",
-    "batk",
-    "symbol",
-    "changeswhenuppercased",
-    "osmanya",
-    "limbu",
-    "punctuation",
-    "hyphen",
-    "mathsymbol",
-    "grek",
-    "changeswhencasefolded",
-    "quotationmark",
-    "bugi",
-    "cuneiform",
-    "pf",
-    "cwcf",
-    "bamum",
-    "guru",
-    "wspace",
-    "meeteimayek",
-    "defaultignorablecodepoint",
-    "modifiersymbol",
-    "mlym",
-    "mymr",
-    "malayalam",
-    "myanmar",
-    "telugu",
-    "buginese",
-    "xsux",
-    "sk",
-    "katakana",
-    "egyp",
-    "any",
-    "kayahli",
-    "cwu",
-    "qmark",
-    "blank",
-    "grlink",
-    "batak",
-    "unknown",
-    "greek",
-    "graphemelink",
-    "gurmukhi",
-    "hebrew",
-    "egyptianhieroglyphs",
-    "zyyy"
-#endif /* USE_UNICODE_PROPERTIES */
-  };
-#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
-#ifdef __GNUC__
-__inline
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct uniname2ctype_struct *
-uniname2ctype_p (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static const struct uniname2ctype_struct wordlist[] =
-    {
-#ifdef USE_UNICODE_PROPERTIES
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3,                                        33},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5,                                        23},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7,                                       35},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8,                                       24},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10,                                       20},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11,                                       36},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12,                                       26},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                        17},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                       21},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                       18},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21,                                      93},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22,                                     93},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str23,                                    150},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str26,                                       59},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29,                                    127},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30,                                     142},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str31,                                    142},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str32,                                    113},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34,                                  18},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37,                                    147},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40,                                  147},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str42,                                       51},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44,                                    86},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46,                                     74},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str47,                                     3},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str48,                                    74},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51,                                     108},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str53,                                   79},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str54,                                    110},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str55,                                    115},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str60,                                    108},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str63,                                 115},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66,                                       27},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str67,                                       49},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69,                                    105},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70,                                   184},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71,                                       46},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73,                                        50},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74,                                  178},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str75,                                    151},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76,                                    100},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str84,                                    157},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str88,                                    113},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str89,                                     81},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str90,                                     92},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91,                       197},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92,                                  91},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str93,                                   170},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94,                                    14},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str95,                       42},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98,                                    17},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99,                             170},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100,                                   81},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101,                                    152},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103,                                  182},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str105,                              36},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106,                              26},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str109,                                     91},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str112,                                    119},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114,                     38},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str115,                                        45},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116,                                       69},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str117,                                      197},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str119,                                    195},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str120,                                      66},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str121,                                     190},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str122,                                       22},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123,                                 152},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str124,                                     180},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str125,                                     99},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str126,                   161},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128,                                 122},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str137,                                 188},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str143,                                     193},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147,                               180},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str148,                                    200},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str149,                                     98},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151,                      100},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152,                                       53},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str153,                              49},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156,                               110},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str161,                    162},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str162,                                 151},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str163,                            51},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str166,                            194},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str170,                                    194},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str171,                           177},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str172,                               113},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str174,                          182},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str175,                     174},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str176,                                     82},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str179,                         178},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str180,                                    179},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str181,                   184},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str183,                         195},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str187,                                   119},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str190,                              132},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str192,                               82},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str193,                                   23},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str195,                                       34},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str197,                                    187},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str198,                                    112},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str200,                          27},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str202,                                       43},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203,                                    171},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str206,                                       38},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str209,                             35},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str212,                                       42},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str215,                                157},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str217,                                       32},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218,                                  65},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220,                               66},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str222,                                      65},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str223,                                     1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227,                                       30},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str229,                                  127},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str234,                               104},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str235,                                   73},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str236,                                     77},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str237,                                    127},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str243,                                    124},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str244,                                    159},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245,                                    162},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str246,                                    161},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str250,                                 77},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str251,                                      192},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str252,                                 167},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str255,                              136},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str258,                                     87},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str261,                                    87},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str268,                                    58},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str269,                                    149},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str270,                       186},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str271,                                    140},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str275,          190},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str278,                                     7},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str286,                                    123},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str292,                                    154},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str294,                                     54},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str296,                                    120},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str297,                         40},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str301,                         43},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str303,                                    134},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str306,                                   175},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str307,                               154},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str308,                                       44},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str310,                                     79},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str311,                                    125},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str314,                                 150},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317,                                 120},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str321,                                  140},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str322,                                    167},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str324,                                    158},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str325,                                    174},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str326,                              129},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str327,                               21},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str328,                                       40},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str335,                                 112},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str340,                                    166},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str341,                                    102},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str343,                               175},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str344,                                   102},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str345,                                     97},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str346,                                 98},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str349,                                       31},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str350,                                   198},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353,                                50},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str355,                                     94},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str356,                                  111},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str358,                                117},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str359,                                    160},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str361,                                    128},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str367,                                  94},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str371,                                    111},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372,                                    145},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str373,                                   97},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str374,                                  83},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375,                                105},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str376,                                 125},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str379,                                     96},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str380,                                 201},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str381,                                 203},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str382,                                 210},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str383,                                 211},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str384,                                 208},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str385,                                        37},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str386,                                       39},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str388,                                    155},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str389,                                 202},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str390,                                 209},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str391,                                 212},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str392,                                 207},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str393,                                     5},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str395,                                    143},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str396,                                     9},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str397,                                 205},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str398,                                 206},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str399,                                     78},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str402,                                   169},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str405,                                 204},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str408,                             169},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str413,                   193},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str420,                                     88},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str422,                                       52},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427,                                        29},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430,                                       25},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str432,                      187},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str433,                                134},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str434,                                   189},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str436,                           53},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str438,                                    70},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str442,                                    13},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str443,                               163},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445,                                     68},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str446,                                    186},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str447,                                    177},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str452,                                   19},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str456,                            59},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str457,                                130},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str459,                               139},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str462,                                     181},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str464,                              143},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str465,                       198},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str466,                                     4},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474,                                    139},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str480,                            34},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str484,                                    107},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485,                                       48},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str488,                          183},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str493,                             179},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str496,                                     67},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str497,                               20},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502,                                 137},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str506,                               55},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str508,                                    118},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str512,                                   11},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str513,                                 67},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str516,                                    104},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str518,                              68},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str521,                                 16},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str523,                                    101},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str529,                                     138},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str530,                                    138},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str533,                                    141},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str534,                              191},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str535,                                  166},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str536,                                    137},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str538,                                    106},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str540,                                    144},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str542,                    60},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str543,                                181},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str550,                                     191},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str554,                                 141},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str562,                                      60},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str563,                             71},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str565,                                    136},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str573,                                    163},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str576,                                     8},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str577,                                    133},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str580,                                     6},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str586,                                   196},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587,                                      109},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str588,                                    146},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str589,                                     76},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str591,                                  146},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str592,                         41},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str593,                                     86},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594,                           70},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str596,                                  164},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str597,                                    132},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str598,                                    109},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str599,                                    164},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str601,                                 76},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str602,                                    129},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str605,                                  183},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str617,                                    117},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str620,                                      62},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623,                                   33},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str625,                                    114},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str626,                                     89},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str627,                          24},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str628,                    62},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str629,                              192},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str632,                                    121},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str634,                                    131},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str636,                                       28},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640,                                 114},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str643,                              133},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str644,                                     80},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str645,                                  89},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646,                                     83},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str647,                                56},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str656,                                    122},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str659,                           199},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660,                                   80},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str663,                                     12},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str667,                         159},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str672,                                121},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str675,                            31},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str677,                                 96},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str678,                                    148},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str681,                                  148},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str686,                             131},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str687,                                     85},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str692,                                    130},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str696,                           46},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701,                                   0},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str705,                                107},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str706,                                  185},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str707,                                 99},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str708,                                 85},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str710,                               128},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str716,                          39},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str718,                         160},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str725,                                    10},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str732,                                       19},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str734,                                    116},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str735,                                  145},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str736,                     185},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str739,                           25},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str745,                           32},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str749,                    64},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str752,                                     29},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str757,                                22},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str765,                       52},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str767,                                   101},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str768,                                     176},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str772,                          28},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str777,                                176},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str778,                                     64},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str781,                                   71},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str782,                                    103},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str788,                        189},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str792,                                57},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str793,                                   103},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str795,                              30},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str797,                              168},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str806,                                  199},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str816,                                 124},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str818,                          44},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str821,                                    156},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str831,                                   116},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str840,                                    165},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str851,                                   45},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str856,                    61},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str857,                                 123},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str861,                                   118},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str868,                              37},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str872,                                  172},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str888,                               48},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str892,                                     75},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str898,                    63},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str902,                           173},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str903,                                    126},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str916,                               135},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str918,                                       41},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str927,                                     63},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str932,                                   156},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str940,                                     84},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str944,                                  168},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str951,                             158},
-      {-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_str976,                69},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str980,                           47},
-      {-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_str999,                                     90},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1007,                                     95},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1020,                                90},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1026,                                  95},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1032,                                   88},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1033,                                126},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1037,                                    135},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str1093,                                       47},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1097,                                106},
-      {-1}, {-1}, {-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_str1124,                                    153},
-      {-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_str1146,                                      15},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1148,                                 144},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str1190,                                      61},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-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_str1263,                                   173},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str1329,                                     2},
-      {-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_str1347,                                   72},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1358,                                   165},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-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_str1395,                                 200},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1410,                                    75},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#endif /* USE_UNICODE_PROPERTIES */
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#ifndef USE_UNICODE_PROPERTIES
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7,                                     7},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8,                                     8},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9,                                     1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10,                                    13},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11,                                   11},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12,                                   0},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                    10},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14,                                    14},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                     3},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                     9},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17,                                     12},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                     6},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19,                                     5},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                     4},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21,                                     2}
-#else /* USE_UNICODE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1463,                             72},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1470,                                 84},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str1556,                                   78},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1621,                     153},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1741,                                     73}
-#endif /* USE_UNICODE_PROPERTIES */
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = uniname2ctype_hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register int o = wordlist[key].name;
-          if (o >= 0)
-            {
-              register const char *s = o + uniname2ctype_pool;
-
-              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-                return &wordlist[key];
-            }
-        }
-    }
-  return 0;
-}
-
-static int
-uniname2ctype(const UChar *name, unsigned int len)
-{
-  const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
-  if (p) return p->ctype;
-  return -1;
-}
diff --git a/enc/unicode/name2ctype.kwd b/enc/unicode/name2ctype.kwd
deleted file mode 100644
index 2e27f3f7de..0000000000
--- a/enc/unicode/name2ctype.kwd
+++ /dev/null
@@ -1,22543 +0,0 @@
-%{
-#define long size_t
-
-#ifdef USE_UNICODE_PROPERTIES
-/* 'Any': - */
-static const OnigCodePoint CR_Any[] = {
-	1,
-	0x0000, 0x10ffff,
-}; /* CR_Any */
-
-/* 'Assigned': - */
-static const OnigCodePoint CR_Assigned[] = {
-	501,
-	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,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	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,
-	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[] = {
-	20,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-	0x00ad, 0x00ad,
-	0x0600, 0x0603,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x17b4, 0x17b5,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x206a, 0x206f,
-	0xd800, 0xf8ff,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xf0000, 0xffffd,
-	0x100000, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-static const OnigCodePoint CR_Cc[] = {
-	2,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-}; /* CR_Cc */
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
-	15,
-	0x00ad, 0x00ad,
-	0x0600, 0x0603,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x17b4, 0x17b5,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x206a, 0x206f,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
-	501,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x0604, 0x0605,
-	0x061c, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 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,
-	0x0af0, 0x0af0,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	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,
-	0x0ede, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10cf,
-	0x10fd, 0x10ff,
-	0x1249, 0x1249,
-	0x124e, 0x124f,
-	0x1257, 0x1257,
-	0x1259, 0x1259,
-	0x125e, 0x125f,
-	0x1289, 0x1289,
-	0x128e, 0x128f,
-	0x12b1, 0x12b1,
-	0x12b6, 0x12b7,
-	0x12bf, 0x12bf,
-	0x12c1, 0x12c1,
-	0x12c6, 0x12c7,
-	0x12d7, 0x12d7,
-	0x1311, 0x1311,
-	0x1316, 0x1317,
-	0x135b, 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,
-	0x1bab, 0x1bad,
-	0x1bba, 0x1bbf,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1ccf,
-	0x1cf3, 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,
-	0x27cb, 0x27cb,
-	0x27cd, 0x27cd,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf2, 0x2cf8,
-	0x2d26, 0x2d2f,
-	0x2d66, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e32, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcc, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa674, 0xa67b,
-	0xa698, 0xa69f,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa792, 0xa79f,
-	0xa7aa, 0xa7f9,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaae0, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xd7ff,
-	0xfa2e, 0xfa2f,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	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, 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, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 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, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16a, 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, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f600, 0x1f600,
-	0x1f611, 0x1f611,
-	0x1f615, 0x1f615,
-	0x1f617, 0x1f617,
-	0x1f619, 0x1f619,
-	0x1f61b, 0x1f61b,
-	0x1f61f, 0x1f61f,
-	0x1f626, 0x1f627,
-	0x1f62c, 0x1f62c,
-	0x1f62e, 0x1f62f,
-	0x1f634, 0x1f634,
-	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[] = {
-	435,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3006,
-	0x3031, 0x3035,
-	0x303b, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6e5,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
-	609,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00df, 0x00f6,
-	0x00f8, 0x00ff,
-	0x0101, 0x0101,
-	0x0103, 0x0103,
-	0x0105, 0x0105,
-	0x0107, 0x0107,
-	0x0109, 0x0109,
-	0x010b, 0x010b,
-	0x010d, 0x010d,
-	0x010f, 0x010f,
-	0x0111, 0x0111,
-	0x0113, 0x0113,
-	0x0115, 0x0115,
-	0x0117, 0x0117,
-	0x0119, 0x0119,
-	0x011b, 0x011b,
-	0x011d, 0x011d,
-	0x011f, 0x011f,
-	0x0121, 0x0121,
-	0x0123, 0x0123,
-	0x0125, 0x0125,
-	0x0127, 0x0127,
-	0x0129, 0x0129,
-	0x012b, 0x012b,
-	0x012d, 0x012d,
-	0x012f, 0x012f,
-	0x0131, 0x0131,
-	0x0133, 0x0133,
-	0x0135, 0x0135,
-	0x0137, 0x0138,
-	0x013a, 0x013a,
-	0x013c, 0x013c,
-	0x013e, 0x013e,
-	0x0140, 0x0140,
-	0x0142, 0x0142,
-	0x0144, 0x0144,
-	0x0146, 0x0146,
-	0x0148, 0x0149,
-	0x014b, 0x014b,
-	0x014d, 0x014d,
-	0x014f, 0x014f,
-	0x0151, 0x0151,
-	0x0153, 0x0153,
-	0x0155, 0x0155,
-	0x0157, 0x0157,
-	0x0159, 0x0159,
-	0x015b, 0x015b,
-	0x015d, 0x015d,
-	0x015f, 0x015f,
-	0x0161, 0x0161,
-	0x0163, 0x0163,
-	0x0165, 0x0165,
-	0x0167, 0x0167,
-	0x0169, 0x0169,
-	0x016b, 0x016b,
-	0x016d, 0x016d,
-	0x016f, 0x016f,
-	0x0171, 0x0171,
-	0x0173, 0x0173,
-	0x0175, 0x0175,
-	0x0177, 0x0177,
-	0x017a, 0x017a,
-	0x017c, 0x017c,
-	0x017e, 0x0180,
-	0x0183, 0x0183,
-	0x0185, 0x0185,
-	0x0188, 0x0188,
-	0x018c, 0x018d,
-	0x0192, 0x0192,
-	0x0195, 0x0195,
-	0x0199, 0x019b,
-	0x019e, 0x019e,
-	0x01a1, 0x01a1,
-	0x01a3, 0x01a3,
-	0x01a5, 0x01a5,
-	0x01a8, 0x01a8,
-	0x01aa, 0x01ab,
-	0x01ad, 0x01ad,
-	0x01b0, 0x01b0,
-	0x01b4, 0x01b4,
-	0x01b6, 0x01b6,
-	0x01b9, 0x01ba,
-	0x01bd, 0x01bf,
-	0x01c6, 0x01c6,
-	0x01c9, 0x01c9,
-	0x01cc, 0x01cc,
-	0x01ce, 0x01ce,
-	0x01d0, 0x01d0,
-	0x01d2, 0x01d2,
-	0x01d4, 0x01d4,
-	0x01d6, 0x01d6,
-	0x01d8, 0x01d8,
-	0x01da, 0x01da,
-	0x01dc, 0x01dd,
-	0x01df, 0x01df,
-	0x01e1, 0x01e1,
-	0x01e3, 0x01e3,
-	0x01e5, 0x01e5,
-	0x01e7, 0x01e7,
-	0x01e9, 0x01e9,
-	0x01eb, 0x01eb,
-	0x01ed, 0x01ed,
-	0x01ef, 0x01f0,
-	0x01f3, 0x01f3,
-	0x01f5, 0x01f5,
-	0x01f9, 0x01f9,
-	0x01fb, 0x01fb,
-	0x01fd, 0x01fd,
-	0x01ff, 0x01ff,
-	0x0201, 0x0201,
-	0x0203, 0x0203,
-	0x0205, 0x0205,
-	0x0207, 0x0207,
-	0x0209, 0x0209,
-	0x020b, 0x020b,
-	0x020d, 0x020d,
-	0x020f, 0x020f,
-	0x0211, 0x0211,
-	0x0213, 0x0213,
-	0x0215, 0x0215,
-	0x0217, 0x0217,
-	0x0219, 0x0219,
-	0x021b, 0x021b,
-	0x021d, 0x021d,
-	0x021f, 0x021f,
-	0x0221, 0x0221,
-	0x0223, 0x0223,
-	0x0225, 0x0225,
-	0x0227, 0x0227,
-	0x0229, 0x0229,
-	0x022b, 0x022b,
-	0x022d, 0x022d,
-	0x022f, 0x022f,
-	0x0231, 0x0231,
-	0x0233, 0x0239,
-	0x023c, 0x023c,
-	0x023f, 0x0240,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0293,
-	0x0295, 0x02af,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	0x0390, 0x0390,
-	0x03ac, 0x03ce,
-	0x03d0, 0x03d1,
-	0x03d5, 0x03d7,
-	0x03d9, 0x03d9,
-	0x03db, 0x03db,
-	0x03dd, 0x03dd,
-	0x03df, 0x03df,
-	0x03e1, 0x03e1,
-	0x03e3, 0x03e3,
-	0x03e5, 0x03e5,
-	0x03e7, 0x03e7,
-	0x03e9, 0x03e9,
-	0x03eb, 0x03eb,
-	0x03ed, 0x03ed,
-	0x03ef, 0x03f3,
-	0x03f5, 0x03f5,
-	0x03f8, 0x03f8,
-	0x03fb, 0x03fc,
-	0x0430, 0x045f,
-	0x0461, 0x0461,
-	0x0463, 0x0463,
-	0x0465, 0x0465,
-	0x0467, 0x0467,
-	0x0469, 0x0469,
-	0x046b, 0x046b,
-	0x046d, 0x046d,
-	0x046f, 0x046f,
-	0x0471, 0x0471,
-	0x0473, 0x0473,
-	0x0475, 0x0475,
-	0x0477, 0x0477,
-	0x0479, 0x0479,
-	0x047b, 0x047b,
-	0x047d, 0x047d,
-	0x047f, 0x047f,
-	0x0481, 0x0481,
-	0x048b, 0x048b,
-	0x048d, 0x048d,
-	0x048f, 0x048f,
-	0x0491, 0x0491,
-	0x0493, 0x0493,
-	0x0495, 0x0495,
-	0x0497, 0x0497,
-	0x0499, 0x0499,
-	0x049b, 0x049b,
-	0x049d, 0x049d,
-	0x049f, 0x049f,
-	0x04a1, 0x04a1,
-	0x04a3, 0x04a3,
-	0x04a5, 0x04a5,
-	0x04a7, 0x04a7,
-	0x04a9, 0x04a9,
-	0x04ab, 0x04ab,
-	0x04ad, 0x04ad,
-	0x04af, 0x04af,
-	0x04b1, 0x04b1,
-	0x04b3, 0x04b3,
-	0x04b5, 0x04b5,
-	0x04b7, 0x04b7,
-	0x04b9, 0x04b9,
-	0x04bb, 0x04bb,
-	0x04bd, 0x04bd,
-	0x04bf, 0x04bf,
-	0x04c2, 0x04c2,
-	0x04c4, 0x04c4,
-	0x04c6, 0x04c6,
-	0x04c8, 0x04c8,
-	0x04ca, 0x04ca,
-	0x04cc, 0x04cc,
-	0x04ce, 0x04cf,
-	0x04d1, 0x04d1,
-	0x04d3, 0x04d3,
-	0x04d5, 0x04d5,
-	0x04d7, 0x04d7,
-	0x04d9, 0x04d9,
-	0x04db, 0x04db,
-	0x04dd, 0x04dd,
-	0x04df, 0x04df,
-	0x04e1, 0x04e1,
-	0x04e3, 0x04e3,
-	0x04e5, 0x04e5,
-	0x04e7, 0x04e7,
-	0x04e9, 0x04e9,
-	0x04eb, 0x04eb,
-	0x04ed, 0x04ed,
-	0x04ef, 0x04ef,
-	0x04f1, 0x04f1,
-	0x04f3, 0x04f3,
-	0x04f5, 0x04f5,
-	0x04f7, 0x04f7,
-	0x04f9, 0x04f9,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0561, 0x0587,
-	0x1d00, 0x1d2b,
-	0x1d62, 0x1d77,
-	0x1d79, 0x1d9a,
-	0x1e01, 0x1e01,
-	0x1e03, 0x1e03,
-	0x1e05, 0x1e05,
-	0x1e07, 0x1e07,
-	0x1e09, 0x1e09,
-	0x1e0b, 0x1e0b,
-	0x1e0d, 0x1e0d,
-	0x1e0f, 0x1e0f,
-	0x1e11, 0x1e11,
-	0x1e13, 0x1e13,
-	0x1e15, 0x1e15,
-	0x1e17, 0x1e17,
-	0x1e19, 0x1e19,
-	0x1e1b, 0x1e1b,
-	0x1e1d, 0x1e1d,
-	0x1e1f, 0x1e1f,
-	0x1e21, 0x1e21,
-	0x1e23, 0x1e23,
-	0x1e25, 0x1e25,
-	0x1e27, 0x1e27,
-	0x1e29, 0x1e29,
-	0x1e2b, 0x1e2b,
-	0x1e2d, 0x1e2d,
-	0x1e2f, 0x1e2f,
-	0x1e31, 0x1e31,
-	0x1e33, 0x1e33,
-	0x1e35, 0x1e35,
-	0x1e37, 0x1e37,
-	0x1e39, 0x1e39,
-	0x1e3b, 0x1e3b,
-	0x1e3d, 0x1e3d,
-	0x1e3f, 0x1e3f,
-	0x1e41, 0x1e41,
-	0x1e43, 0x1e43,
-	0x1e45, 0x1e45,
-	0x1e47, 0x1e47,
-	0x1e49, 0x1e49,
-	0x1e4b, 0x1e4b,
-	0x1e4d, 0x1e4d,
-	0x1e4f, 0x1e4f,
-	0x1e51, 0x1e51,
-	0x1e53, 0x1e53,
-	0x1e55, 0x1e55,
-	0x1e57, 0x1e57,
-	0x1e59, 0x1e59,
-	0x1e5b, 0x1e5b,
-	0x1e5d, 0x1e5d,
-	0x1e5f, 0x1e5f,
-	0x1e61, 0x1e61,
-	0x1e63, 0x1e63,
-	0x1e65, 0x1e65,
-	0x1e67, 0x1e67,
-	0x1e69, 0x1e69,
-	0x1e6b, 0x1e6b,
-	0x1e6d, 0x1e6d,
-	0x1e6f, 0x1e6f,
-	0x1e71, 0x1e71,
-	0x1e73, 0x1e73,
-	0x1e75, 0x1e75,
-	0x1e77, 0x1e77,
-	0x1e79, 0x1e79,
-	0x1e7b, 0x1e7b,
-	0x1e7d, 0x1e7d,
-	0x1e7f, 0x1e7f,
-	0x1e81, 0x1e81,
-	0x1e83, 0x1e83,
-	0x1e85, 0x1e85,
-	0x1e87, 0x1e87,
-	0x1e89, 0x1e89,
-	0x1e8b, 0x1e8b,
-	0x1e8d, 0x1e8d,
-	0x1e8f, 0x1e8f,
-	0x1e91, 0x1e91,
-	0x1e93, 0x1e93,
-	0x1e95, 0x1e9d,
-	0x1e9f, 0x1e9f,
-	0x1ea1, 0x1ea1,
-	0x1ea3, 0x1ea3,
-	0x1ea5, 0x1ea5,
-	0x1ea7, 0x1ea7,
-	0x1ea9, 0x1ea9,
-	0x1eab, 0x1eab,
-	0x1ead, 0x1ead,
-	0x1eaf, 0x1eaf,
-	0x1eb1, 0x1eb1,
-	0x1eb3, 0x1eb3,
-	0x1eb5, 0x1eb5,
-	0x1eb7, 0x1eb7,
-	0x1eb9, 0x1eb9,
-	0x1ebb, 0x1ebb,
-	0x1ebd, 0x1ebd,
-	0x1ebf, 0x1ebf,
-	0x1ec1, 0x1ec1,
-	0x1ec3, 0x1ec3,
-	0x1ec5, 0x1ec5,
-	0x1ec7, 0x1ec7,
-	0x1ec9, 0x1ec9,
-	0x1ecb, 0x1ecb,
-	0x1ecd, 0x1ecd,
-	0x1ecf, 0x1ecf,
-	0x1ed1, 0x1ed1,
-	0x1ed3, 0x1ed3,
-	0x1ed5, 0x1ed5,
-	0x1ed7, 0x1ed7,
-	0x1ed9, 0x1ed9,
-	0x1edb, 0x1edb,
-	0x1edd, 0x1edd,
-	0x1edf, 0x1edf,
-	0x1ee1, 0x1ee1,
-	0x1ee3, 0x1ee3,
-	0x1ee5, 0x1ee5,
-	0x1ee7, 0x1ee7,
-	0x1ee9, 0x1ee9,
-	0x1eeb, 0x1eeb,
-	0x1eed, 0x1eed,
-	0x1eef, 0x1eef,
-	0x1ef1, 0x1ef1,
-	0x1ef3, 0x1ef3,
-	0x1ef5, 0x1ef5,
-	0x1ef7, 0x1ef7,
-	0x1ef9, 0x1ef9,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 0x1f07,
-	0x1f10, 0x1f15,
-	0x1f20, 0x1f27,
-	0x1f30, 0x1f37,
-	0x1f40, 0x1f45,
-	0x1f50, 0x1f57,
-	0x1f60, 0x1f67,
-	0x1f70, 0x1f7d,
-	0x1f80, 0x1f87,
-	0x1f90, 0x1f97,
-	0x1fa0, 0x1fa7,
-	0x1fb0, 0x1fb4,
-	0x1fb6, 0x1fb7,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fc7,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fd7,
-	0x1fe0, 0x1fe7,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ff7,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2184, 0x2184,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7c,
-	0x2c81, 0x2c81,
-	0x2c83, 0x2c83,
-	0x2c85, 0x2c85,
-	0x2c87, 0x2c87,
-	0x2c89, 0x2c89,
-	0x2c8b, 0x2c8b,
-	0x2c8d, 0x2c8d,
-	0x2c8f, 0x2c8f,
-	0x2c91, 0x2c91,
-	0x2c93, 0x2c93,
-	0x2c95, 0x2c95,
-	0x2c97, 0x2c97,
-	0x2c99, 0x2c99,
-	0x2c9b, 0x2c9b,
-	0x2c9d, 0x2c9d,
-	0x2c9f, 0x2c9f,
-	0x2ca1, 0x2ca1,
-	0x2ca3, 0x2ca3,
-	0x2ca5, 0x2ca5,
-	0x2ca7, 0x2ca7,
-	0x2ca9, 0x2ca9,
-	0x2cab, 0x2cab,
-	0x2cad, 0x2cad,
-	0x2caf, 0x2caf,
-	0x2cb1, 0x2cb1,
-	0x2cb3, 0x2cb3,
-	0x2cb5, 0x2cb5,
-	0x2cb7, 0x2cb7,
-	0x2cb9, 0x2cb9,
-	0x2cbb, 0x2cbb,
-	0x2cbd, 0x2cbd,
-	0x2cbf, 0x2cbf,
-	0x2cc1, 0x2cc1,
-	0x2cc3, 0x2cc3,
-	0x2cc5, 0x2cc5,
-	0x2cc7, 0x2cc7,
-	0x2cc9, 0x2cc9,
-	0x2ccb, 0x2ccb,
-	0x2ccd, 0x2ccd,
-	0x2ccf, 0x2ccf,
-	0x2cd1, 0x2cd1,
-	0x2cd3, 0x2cd3,
-	0x2cd5, 0x2cd5,
-	0x2cd7, 0x2cd7,
-	0x2cd9, 0x2cd9,
-	0x2cdb, 0x2cdb,
-	0x2cdd, 0x2cdd,
-	0x2cdf, 0x2cdf,
-	0x2ce1, 0x2ce1,
-	0x2ce3, 0x2ce4,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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[] = {
-	49,
-	0x02b0, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0374, 0x0374,
-	0x037a, 0x037a,
-	0x0559, 0x0559,
-	0x0640, 0x0640,
-	0x06e5, 0x06e6,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0971, 0x0971,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x10fc, 0x10fc,
-	0x17d7, 0x17d7,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c78, 0x1c7d,
-	0x1d2c, 0x1d61,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2c7d, 0x2c7d,
-	0x2d6f, 0x2d6f,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa67f, 0xa67f,
-	0xa717, 0xa71f,
-	0xa770, 0xa770,
-	0xa788, 0xa788,
-	0xa9cf, 0xa9cf,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
-	323,
-	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,
-	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, 0x0edd,
-	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,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17dc, 0x17dc,
-	0x1820, 0x1842,
-	0x1844, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c77,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x2135, 0x2138,
-	0x2d30, 0x2d65,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3006, 0x3006,
-	0x303c, 0x303c,
-	0x3041, 0x3096,
-	0x309f, 0x309f,
-	0x30a1, 0x30fa,
-	0x30ff, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa014,
-	0xa016, 0xa48c,
-	0xa4d0, 0xa4f7,
-	0xa500, 0xa60b,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa66e, 0xa66e,
-	0xa6a0, 0xa6e5,
-	0xa7fb, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa6f,
-	0xaa71, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadc,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff66, 0xff6f,
-	0xff71, 0xff9d,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10450, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x1b000, 0x1b001,
-	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[] = {
-	603,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1fb8, 0x1fbb,
-	0x1fc8, 0x1fcb,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffb,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210b, 0x210d,
-	0x2110, 0x2112,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x2130, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2183, 0x2183,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	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[] = {
-	193,
-	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,
-	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,
-	0x17b6, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b00, 0x1b04,
-	0x1b34, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1baa,
-	0x1be6, 0x1bf3,
-	0x1c24, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf2, 0x1cf2,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa67c, 0xa67d,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa953,
-	0xa980, 0xa983,
-	0xa9b3, 0xa9c0,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xabe3, 0xabea,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11000, 0x11002,
-	0x11038, 0x11046,
-	0x11080, 0x11082,
-	0x110b0, 0x110ba,
-	0x1d165, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
-	113,
-	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,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1c24, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1ce1, 0x1ce1,
-	0x1cf2, 0x1cf2,
-	0xa823, 0xa824,
-	0xa827, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa952, 0xa953,
-	0xa983, 0xa983,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9c0,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa4d, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xabe3, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabea,
-	0xabec, 0xabec,
-	0x11000, 0x11000,
-	0x11002, 0x11002,
-	0x11082, 0x11082,
-	0x110b0, 0x110b2,
-	0x110b7, 0x110b8,
-	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[] = {
-	203,
-	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,
-	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,
-	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,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
-	83,
-	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,
-	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,
-	0x12400, 0x12462,
-	0x1d360, 0x1d371,
-	0x1d7ce, 0x1d7ff,
-	0x1f100, 0x1f10a,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-static const OnigCodePoint CR_Nd[] = {
-	38,
-	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,
-	0x1d7ce, 0x1d7ff,
-}; /* CR_Nd */
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
-	12,
-	0x16ee, 0x16f0,
-	0x2160, 0x2182,
-	0x2185, 0x2188,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0xa6e6, 0xa6ef,
-	0x10140, 0x10174,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x12400, 0x12462,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
-	41,
-	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,
-	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 */
-static const OnigCodePoint CR_P[] = {
-	133,
-	0x0021, 0x0023,
-	0x0025, 0x002a,
-	0x002c, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005b, 0x005d,
-	0x005f, 0x005f,
-	0x007b, 0x007b,
-	0x007d, 0x007d,
-	0x00a1, 0x00a1,
-	0x00ab, 0x00ab,
-	0x00b7, 0x00b7,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x058a,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f3a, 0x0f3d,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1361, 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,
-	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, 0x2e31,
-	0x3001, 0x3003,
-	0x3008, 0x3011,
-	0x3014, 0x301f,
-	0x3030, 0x3030,
-	0x303d, 0x303d,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xabeb, 0xabeb,
-	0xfd3e, 0xfd3f,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe61,
-	0xfe63, 0xfe63,
-	0xfe68, 0xfe68,
-	0xfe6a, 0xfe6b,
-	0xff01, 0xff03,
-	0xff05, 0xff0a,
-	0xff0c, 0xff0f,
-	0xff1a, 0xff1b,
-	0xff1f, 0xff20,
-	0xff3b, 0xff3d,
-	0xff3f, 0xff3f,
-	0xff5b, 0xff5b,
-	0xff5d, 0xff5d,
-	0xff5f, 0xff65,
-	0x10100, 0x10101,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10b39, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x12470, 0x12473,
-}; /* CR_P */
-
-/* 'Pc': General Category */
-static const OnigCodePoint CR_Pc[] = {
-	6,
-	0x005f, 0x005f,
-	0x203f, 0x2040,
-	0x2054, 0x2054,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xff3f, 0xff3f,
-}; /* CR_Pc */
-
-/* 'Pd': General Category */
-static const OnigCodePoint CR_Pd[] = {
-	15,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
-	70,
-	0x0029, 0x0029,
-	0x005d, 0x005d,
-	0x007d, 0x007d,
-	0x0f3b, 0x0f3b,
-	0x0f3d, 0x0f3d,
-	0x169c, 0x169c,
-	0x2046, 0x2046,
-	0x207e, 0x207e,
-	0x208e, 0x208e,
-	0x232a, 0x232a,
-	0x2769, 0x2769,
-	0x276b, 0x276b,
-	0x276d, 0x276d,
-	0x276f, 0x276f,
-	0x2771, 0x2771,
-	0x2773, 0x2773,
-	0x2775, 0x2775,
-	0x27c6, 0x27c6,
-	0x27e7, 0x27e7,
-	0x27e9, 0x27e9,
-	0x27eb, 0x27eb,
-	0x27ed, 0x27ed,
-	0x27ef, 0x27ef,
-	0x2984, 0x2984,
-	0x2986, 0x2986,
-	0x2988, 0x2988,
-	0x298a, 0x298a,
-	0x298c, 0x298c,
-	0x298e, 0x298e,
-	0x2990, 0x2990,
-	0x2992, 0x2992,
-	0x2994, 0x2994,
-	0x2996, 0x2996,
-	0x2998, 0x2998,
-	0x29d9, 0x29d9,
-	0x29db, 0x29db,
-	0x29fd, 0x29fd,
-	0x2e23, 0x2e23,
-	0x2e25, 0x2e25,
-	0x2e27, 0x2e27,
-	0x2e29, 0x2e29,
-	0x3009, 0x3009,
-	0x300b, 0x300b,
-	0x300d, 0x300d,
-	0x300f, 0x300f,
-	0x3011, 0x3011,
-	0x3015, 0x3015,
-	0x3017, 0x3017,
-	0x3019, 0x3019,
-	0x301b, 0x301b,
-	0x301e, 0x301f,
-	0xfd3f, 0xfd3f,
-	0xfe18, 0xfe18,
-	0xfe36, 0xfe36,
-	0xfe38, 0xfe38,
-	0xfe3a, 0xfe3a,
-	0xfe3c, 0xfe3c,
-	0xfe3e, 0xfe3e,
-	0xfe40, 0xfe40,
-	0xfe42, 0xfe42,
-	0xfe44, 0xfe44,
-	0xfe48, 0xfe48,
-	0xfe5a, 0xfe5a,
-	0xfe5c, 0xfe5c,
-	0xfe5e, 0xfe5e,
-	0xff09, 0xff09,
-	0xff3d, 0xff3d,
-	0xff5d, 0xff5d,
-	0xff60, 0xff60,
-	0xff63, 0xff63,
-}; /* CR_Pe */
-
-/* 'Pf': General Category */
-static const OnigCodePoint CR_Pf[] = {
-	10,
-	0x00bb, 0x00bb,
-	0x2019, 0x2019,
-	0x201d, 0x201d,
-	0x203a, 0x203a,
-	0x2e03, 0x2e03,
-	0x2e05, 0x2e05,
-	0x2e0a, 0x2e0a,
-	0x2e0d, 0x2e0d,
-	0x2e1d, 0x2e1d,
-	0x2e21, 0x2e21,
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
-	11,
-	0x00ab, 0x00ab,
-	0x2018, 0x2018,
-	0x201b, 0x201c,
-	0x201f, 0x201f,
-	0x2039, 0x2039,
-	0x2e02, 0x2e02,
-	0x2e04, 0x2e04,
-	0x2e09, 0x2e09,
-	0x2e0c, 0x2e0c,
-	0x2e1c, 0x2e1c,
-	0x2e20, 0x2e20,
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
-	128,
-	0x0021, 0x0023,
-	0x0025, 0x0027,
-	0x002a, 0x002a,
-	0x002c, 0x002c,
-	0x002e, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005c, 0x005c,
-	0x00a1, 0x00a1,
-	0x00b7, 0x00b7,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x0589,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1361, 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,
-	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, 0x2e31,
-	0x3001, 0x3003,
-	0x303d, 0x303d,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xabeb, 0xabeb,
-	0xfe10, 0xfe16,
-	0xfe19, 0xfe19,
-	0xfe30, 0xfe30,
-	0xfe45, 0xfe46,
-	0xfe49, 0xfe4c,
-	0xfe50, 0xfe52,
-	0xfe54, 0xfe57,
-	0xfe5f, 0xfe61,
-	0xfe68, 0xfe68,
-	0xfe6a, 0xfe6b,
-	0xff01, 0xff03,
-	0xff05, 0xff07,
-	0xff0a, 0xff0a,
-	0xff0c, 0xff0c,
-	0xff0e, 0xff0f,
-	0xff1a, 0xff1b,
-	0xff1f, 0xff20,
-	0xff3c, 0xff3c,
-	0xff61, 0xff61,
-	0xff64, 0xff65,
-	0x10100, 0x10101,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10b39, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x12470, 0x12473,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
-	72,
-	0x0028, 0x0028,
-	0x005b, 0x005b,
-	0x007b, 0x007b,
-	0x0f3a, 0x0f3a,
-	0x0f3c, 0x0f3c,
-	0x169b, 0x169b,
-	0x201a, 0x201a,
-	0x201e, 0x201e,
-	0x2045, 0x2045,
-	0x207d, 0x207d,
-	0x208d, 0x208d,
-	0x2329, 0x2329,
-	0x2768, 0x2768,
-	0x276a, 0x276a,
-	0x276c, 0x276c,
-	0x276e, 0x276e,
-	0x2770, 0x2770,
-	0x2772, 0x2772,
-	0x2774, 0x2774,
-	0x27c5, 0x27c5,
-	0x27e6, 0x27e6,
-	0x27e8, 0x27e8,
-	0x27ea, 0x27ea,
-	0x27ec, 0x27ec,
-	0x27ee, 0x27ee,
-	0x2983, 0x2983,
-	0x2985, 0x2985,
-	0x2987, 0x2987,
-	0x2989, 0x2989,
-	0x298b, 0x298b,
-	0x298d, 0x298d,
-	0x298f, 0x298f,
-	0x2991, 0x2991,
-	0x2993, 0x2993,
-	0x2995, 0x2995,
-	0x2997, 0x2997,
-	0x29d8, 0x29d8,
-	0x29da, 0x29da,
-	0x29fc, 0x29fc,
-	0x2e22, 0x2e22,
-	0x2e24, 0x2e24,
-	0x2e26, 0x2e26,
-	0x2e28, 0x2e28,
-	0x3008, 0x3008,
-	0x300a, 0x300a,
-	0x300c, 0x300c,
-	0x300e, 0x300e,
-	0x3010, 0x3010,
-	0x3014, 0x3014,
-	0x3016, 0x3016,
-	0x3018, 0x3018,
-	0x301a, 0x301a,
-	0x301d, 0x301d,
-	0xfd3e, 0xfd3e,
-	0xfe17, 0xfe17,
-	0xfe35, 0xfe35,
-	0xfe37, 0xfe37,
-	0xfe39, 0xfe39,
-	0xfe3b, 0xfe3b,
-	0xfe3d, 0xfe3d,
-	0xfe3f, 0xfe3f,
-	0xfe41, 0xfe41,
-	0xfe43, 0xfe43,
-	0xfe47, 0xfe47,
-	0xfe59, 0xfe59,
-	0xfe5b, 0xfe5b,
-	0xfe5d, 0xfe5d,
-	0xff08, 0xff08,
-	0xff3b, 0xff3b,
-	0xff5b, 0xff5b,
-	0xff5f, 0xff5f,
-	0xff62, 0xff62,
-}; /* CR_Ps */
-
-/* 'S': Major Category */
-static const OnigCodePoint CR_S[] = {
-	208,
-	0x0024, 0x0024,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00a2, 0x00a9,
-	0x00ac, 0x00ac,
-	0x00ae, 0x00b1,
-	0x00b4, 0x00b4,
-	0x00b6, 0x00b6,
-	0x00b8, 0x00b8,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x03f6, 0x03f6,
-	0x0482, 0x0482,
-	0x0606, 0x0608,
-	0x060b, 0x060b,
-	0x060e, 0x060f,
-	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, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1360, 0x1360,
-	0x1390, 0x1399,
-	0x17db, 0x17db,
-	0x1940, 0x1940,
-	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, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27e5,
-	0x27f0, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2ce5, 0x2cea,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3004, 0x3004,
-	0x3012, 0x3013,
-	0x3020, 0x3020,
-	0x3036, 0x3037,
-	0x303e, 0x303f,
-	0x309b, 0x309c,
-	0x3190, 0x3191,
-	0x3196, 0x319f,
-	0x31c0, 0x31e3,
-	0x3200, 0x321e,
-	0x322a, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa700, 0xa716,
-	0xa720, 0xa721,
-	0xa789, 0xa78a,
-	0xa828, 0xa82b,
-	0xa836, 0xa839,
-	0xaa77, 0xaa79,
-	0xfb29, 0xfb29,
-	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,
-	0x10102, 0x10102,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d6c1, 0x1d6c1,
-	0x1d6db, 0x1d6db,
-	0x1d6fb, 0x1d6fb,
-	0x1d715, 0x1d715,
-	0x1d735, 0x1d735,
-	0x1d74f, 0x1d74f,
-	0x1d76f, 0x1d76f,
-	0x1d789, 0x1d789,
-	0x1d7a9, 0x1d7a9,
-	0x1d7c3, 0x1d7c3,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	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,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
-	16,
-	0x0024, 0x0024,
-	0x00a2, 0x00a5,
-	0x060b, 0x060b,
-	0x09f2, 0x09f3,
-	0x09fb, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0bf9, 0x0bf9,
-	0x0e3f, 0x0e3f,
-	0x17db, 0x17db,
-	0x20a0, 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[] = {
-	66,
-	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, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27e5,
-	0x27f0, 0x27ff,
-	0x2900, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	0xfb29, 0xfb29,
-	0xfe62, 0xfe62,
-	0xfe64, 0xfe66,
-	0xff0b, 0xff0b,
-	0xff1c, 0xff1e,
-	0xff5c, 0xff5c,
-	0xff5e, 0xff5e,
-	0xffe2, 0xffe2,
-	0xffe9, 0xffec,
-	0x1d6c1, 0x1d6c1,
-	0x1d6db, 0x1d6db,
-	0x1d6fb, 0x1d6fb,
-	0x1d715, 0x1d715,
-	0x1d735, 0x1d735,
-	0x1d74f, 0x1d74f,
-	0x1d76f, 0x1d76f,
-	0x1d789, 0x1d789,
-	0x1d7a9, 0x1d7a9,
-	0x1d7c3, 0x1d7c3,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
-	164,
-	0x00a6, 0x00a7,
-	0x00a9, 0x00a9,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b0,
-	0x00b6, 0x00b6,
-	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, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1360, 0x1360,
-	0x1390, 0x1399,
-	0x1940, 0x1940,
-	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, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa828, 0xa82b,
-	0xa836, 0xa837,
-	0xa839, 0xa839,
-	0xaa77, 0xaa79,
-	0xfdfd, 0xfdfd,
-	0xffe4, 0xffe4,
-	0xffe8, 0xffe8,
-	0xffed, 0xffee,
-	0xfffc, 0xfffd,
-	0x10102, 0x10102,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	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,
-}; /* 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[] = {
-	106,
-	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, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27ff,
-	0x2900, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	0xfb29, 0xfb29,
-	0xfe61, 0xfe66,
-	0xfe68, 0xfe68,
-	0xff0b, 0xff0b,
-	0xff1c, 0xff1e,
-	0xff3c, 0xff3c,
-	0xff3e, 0xff3e,
-	0xff5c, 0xff5c,
-	0xff5e, 0xff5e,
-	0xffe2, 0xffe2,
-	0xffe9, 0xffec,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a5,
-	0x1d6a8, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-}; /* CR_Math */
-
-/* 'Alphabetic': Derived Property */
-static const OnigCodePoint CR_Alphabetic[] = {
-	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,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x135f, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b80, 0x1ba9,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11082, 0x110b8,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Alphabetic */
-
-/* 'Lowercase': Derived Property */
-static const OnigCodePoint CR_Lowercase[] = {
-	612,
-	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,
-	0x2090, 0x2094,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7d,
-	0x2c81, 0x2c81,
-	0x2c83, 0x2c83,
-	0x2c85, 0x2c85,
-	0x2c87, 0x2c87,
-	0x2c89, 0x2c89,
-	0x2c8b, 0x2c8b,
-	0x2c8d, 0x2c8d,
-	0x2c8f, 0x2c8f,
-	0x2c91, 0x2c91,
-	0x2c93, 0x2c93,
-	0x2c95, 0x2c95,
-	0x2c97, 0x2c97,
-	0x2c99, 0x2c99,
-	0x2c9b, 0x2c9b,
-	0x2c9d, 0x2c9d,
-	0x2c9f, 0x2c9f,
-	0x2ca1, 0x2ca1,
-	0x2ca3, 0x2ca3,
-	0x2ca5, 0x2ca5,
-	0x2ca7, 0x2ca7,
-	0x2ca9, 0x2ca9,
-	0x2cab, 0x2cab,
-	0x2cad, 0x2cad,
-	0x2caf, 0x2caf,
-	0x2cb1, 0x2cb1,
-	0x2cb3, 0x2cb3,
-	0x2cb5, 0x2cb5,
-	0x2cb7, 0x2cb7,
-	0x2cb9, 0x2cb9,
-	0x2cbb, 0x2cbb,
-	0x2cbd, 0x2cbd,
-	0x2cbf, 0x2cbf,
-	0x2cc1, 0x2cc1,
-	0x2cc3, 0x2cc3,
-	0x2cc5, 0x2cc5,
-	0x2cc7, 0x2cc7,
-	0x2cc9, 0x2cc9,
-	0x2ccb, 0x2ccb,
-	0x2ccd, 0x2ccd,
-	0x2ccf, 0x2ccf,
-	0x2cd1, 0x2cd1,
-	0x2cd3, 0x2cd3,
-	0x2cd5, 0x2cd5,
-	0x2cd7, 0x2cd7,
-	0x2cd9, 0x2cd9,
-	0x2cdb, 0x2cdb,
-	0x2cdd, 0x2cdd,
-	0x2cdf, 0x2cdf,
-	0x2ce1, 0x2ce1,
-	0x2ce3, 0x2ce4,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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_Lowercase */
-
-/* 'Uppercase': Derived Property */
-static const OnigCodePoint CR_Uppercase[] = {
-	605,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1fb8, 0x1fbb,
-	0x1fc8, 0x1fcb,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffb,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210b, 0x210d,
-	0x2110, 0x2112,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x2130, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x1d400, 0x1d419,
-	0x1d434, 0x1d44d,
-	0x1d468, 0x1d481,
-	0x1d49c, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b5,
-	0x1d4d0, 0x1d4e9,
-	0x1d504, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d538, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d56c, 0x1d585,
-	0x1d5a0, 0x1d5b9,
-	0x1d5d4, 0x1d5ed,
-	0x1d608, 0x1d621,
-	0x1d63c, 0x1d655,
-	0x1d670, 0x1d689,
-	0x1d6a8, 0x1d6c0,
-	0x1d6e2, 0x1d6fa,
-	0x1d71c, 0x1d734,
-	0x1d756, 0x1d76e,
-	0x1d790, 0x1d7a8,
-	0x1d7ca, 0x1d7ca,
-}; /* CR_Uppercase */
-
-/* 'Cased': Derived Property */
-static const OnigCodePoint CR_Cased[] = {
-	112,
-	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,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2090, 0x2094,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	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_Cased */
-
-/* 'Case_Ignorable': Derived Property */
-static const OnigCodePoint CR_Case_Ignorable[] = {
-	277,
-	0x0027, 0x0027,
-	0x002e, 0x002e,
-	0x003a, 0x003a,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00ad, 0x00ad,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0387, 0x0387,
-	0x0483, 0x0489,
-	0x0559, 0x0559,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05f4, 0x05f4,
-	0x0600, 0x0603,
-	0x0610, 0x061a,
-	0x0640, 0x0640,
-	0x064b, 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,
-	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,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1d2c, 0x1d61,
-	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,
-	0x2c7d, 0x2c7d,
-	0x2cef, 0x2cf1,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x302a, 0x302f,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x3099, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa66f, 0xa672,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa6f0, 0xa6f1,
-	0xa700, 0xa721,
-	0xa770, 0xa770,
-	0xa788, 0xa78a,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9cf, 0xa9cf,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa70, 0xaa70,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaadd, 0xaadd,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	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,
-	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[] = {
-	566,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f88, 0x1f8f,
-	0x1f98, 0x1f9f,
-	0x1fa8, 0x1faf,
-	0x1fb8, 0x1fbc,
-	0x1fc8, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-}; /* CR_Changes_When_Lowercased */
-
-/* 'Changes_When_Uppercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	582,
-	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, 0x0265,
-	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,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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[] = {
-	583,
-	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, 0x0265,
-	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,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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[] = {
-	577,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9a, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f80, 0x1faf,
-	0x1fb2, 0x1fb4,
-	0x1fb7, 0x1fbc,
-	0x1fc2, 0x1fc4,
-	0x1fc7, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff7, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-}; /* CR_Changes_When_Casefolded */
-
-/* 'Changes_When_Casemapped': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	99,
-	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, 0x0265,
-	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,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	0x1e00, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c70,
-	0x2c72, 0x2c73,
-	0x2c75, 0x2c76,
-	0x2c7e, 0x2ce3,
-	0x2ceb, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa72f,
-	0xa732, 0xa76f,
-	0xa779, 0xa787,
-	0xa78b, 0xa78d,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-}; /* CR_Changes_When_Casemapped */
-
-/* 'ID_Start': Derived Property */
-static const OnigCodePoint CR_ID_Start[] = {
-	437,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309b, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_ID_Start */
-
-/* 'ID_Continue': Derived Property */
-static const OnigCodePoint CR_ID_Continue[] = {
-	514,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	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, 0x17b3,
-	0x17b6, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf2,
-	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, 0x2cf1,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	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, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff3f, 0xff3f,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_ID_Continue */
-
-/* 'XID_Start': Derived Property */
-static const OnigCodePoint CR_XID_Start[] = {
-	444,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xff9d,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_XID_Start */
-
-/* 'XID_Continue': Derived Property */
-static const OnigCodePoint CR_XID_Continue[] = {
-	521,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	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, 0x17b3,
-	0x17b6, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf2,
-	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, 0x2cf1,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	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, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff3f, 0xff3f,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	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[] = {
-	215,
-	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,
-	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,
-	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,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa67c, 0xa67d,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xff9e, 0xff9f,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x1d165, 0x1d165,
-	0x1d167, 0x1d169,
-	0x1d16e, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_Grapheme_Extend */
-
-/* 'Grapheme_Base': Derived Property */
-static const OnigCodePoint CR_Grapheme_Base[] = {
-	596,
-	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,
-	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,
-	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, 0x0aef,
-	0x0af1, 0x0af1,
-	0x0b02, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b3d,
-	0x0b40, 0x0b40,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 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, 0x0edd,
-	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,
-	0x10d0, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1360, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1735, 0x1736,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x17d4, 0x17dc,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1800, 0x180a,
-	0x180e, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a16,
-	0x1a19, 0x1a1b,
-	0x1a1e, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a61, 0x1a61,
-	0x1a63, 0x1a64,
-	0x1a6d, 0x1a72,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b04, 0x1b33,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b4b,
-	0x1b50, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x1b82, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1be5,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1bfc, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fc4,
-	0x1fc6, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fdd, 0x1fef,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffe,
-	0x2000, 0x200a,
-	0x2010, 0x2027,
-	0x202f, 0x205f,
-	0x2070, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cee,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d70,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e00, 0x2e31,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3029,
-	0x3030, 0x303f,
-	0x3041, 0x3096,
-	0x309b, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa66e,
-	0xa673, 0xa673,
-	0xa67e, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa6f2, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa824,
-	0xa827, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c3,
-	0xa8ce, 0xa8d9,
-	0xa8f2, 0xa8fb,
-	0xa900, 0xa925,
-	0xa92e, 0xa946,
-	0xa952, 0xa953,
-	0xa95f, 0xa97c,
-	0xa983, 0xa9b2,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa28,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa4d, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadf,
-	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, 0xfa2d,
-	0xfa30, 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,
-	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,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Grapheme_Base */
-
-/* 'Grapheme_Link': Derived Property */
-static const OnigCodePoint CR_Grapheme_Link[] = {
-	29,
-	0x094d, 0x094d,
-	0x09cd, 0x09cd,
-	0x0a4d, 0x0a4d,
-	0x0acd, 0x0acd,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e3a, 0x0e3a,
-	0x0f84, 0x0f84,
-	0x1039, 0x103a,
-	0x1714, 0x1714,
-	0x1734, 0x1734,
-	0x17d2, 0x17d2,
-	0x1a60, 0x1a60,
-	0x1b44, 0x1b44,
-	0x1baa, 0x1baa,
-	0x1bf2, 0x1bf3,
-	0x2d7f, 0x2d7f,
-	0xa806, 0xa806,
-	0xa8c4, 0xa8c4,
-	0xa953, 0xa953,
-	0xa9c0, 0xa9c0,
-	0xabed, 0xabed,
-	0x10a3f, 0x10a3f,
-	0x11046, 0x11046,
-	0x110b9, 0x110b9,
-}; /* CR_Grapheme_Link */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
-	169,
-	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,
-	0x0970, 0x0970,
-	0x0e3f, 0x0e3f,
-	0x0fd5, 0x0fd8,
-	0x10fb, 0x10fb,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x1802, 0x1803,
-	0x1805, 0x1805,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x2000, 0x200b,
-	0x200e, 0x2064,
-	0x206a, 0x2070,
-	0x2074, 0x207e,
-	0x2080, 0x208e,
-	0x20a0, 0x20b9,
-	0x2100, 0x2125,
-	0x2127, 0x2129,
-	0x212c, 0x2131,
-	0x2133, 0x214d,
-	0x214f, 0x215f,
-	0x2189, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27ff,
-	0x2900, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2e00, 0x2e31,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3004,
-	0x3006, 0x3006,
-	0x3008, 0x3020,
-	0x3030, 0x3037,
-	0x303c, 0x303f,
-	0x309b, 0x309c,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fc,
-	0x3190, 0x319f,
-	0x31c0, 0x31e3,
-	0x3220, 0x325f,
-	0x327f, 0x32cf,
-	0x3358, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa700, 0xa721,
-	0xa788, 0xa78a,
-	0xa830, 0xa839,
-	0xfd3e, 0xfd3f,
-	0xfdfd, 0xfdfd,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfeff, 0xfeff,
-	0xff01, 0xff20,
-	0xff3b, 0xff40,
-	0xff5b, 0xff65,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1013f,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d166,
-	0x1d16a, 0x1d17a,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a5,
-	0x1d6a8, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f169,
-	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,
-	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,
-	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, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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, 0xa673,
-	0xa67c, 0xa697,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
-	5,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x058a, 0x058a,
-	0xfb13, 0xfb17,
-}; /* CR_Armenian */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
-	9,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfb4f,
-}; /* CR_Hebrew */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
-	19,
-	0x0600, 0x0603,
-	0x0606, 0x060b,
-	0x060d, 0x061a,
-	0x061e, 0x061e,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x0656, 0x065e,
-	0x066a, 0x066f,
-	0x0671, 0x06dc,
-	0x06de, 0x06ff,
-	0x0750, 0x077f,
-	0xfb50, 0xfbc1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfc,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0x10e60, 0x10e7e,
-}; /* CR_Arabic */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
-	3,
-	0x0700, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-}; /* CR_Syriac */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
-	1,
-	0x0780, 0x07b1,
-}; /* CR_Thaana */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
-	6,
-	0x0900, 0x0950,
-	0x0953, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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[] = {
-	14,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae3,
-	0x0ae6, 0x0aef,
-	0x0af1, 0x0af1,
-}; /* CR_Gujarati */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
-	14,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 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, 0x0edd,
-}; /* 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[] = {
-	4,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x2d00, 0x2d25,
-}; /* 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[] = {
-	16,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x3005, 0x3005,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303b,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	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[] = {
-	24,
-	0x0300, 0x036f,
-	0x0485, 0x0486,
-	0x064b, 0x0655,
-	0x065f, 0x065f,
-	0x0670, 0x0670,
-	0x0951, 0x0952,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	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, 0x2cf1,
-	0x2cf9, 0x2cff,
-}; /* CR_Coptic */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
-	4,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x19df,
-}; /* CR_New_Tai_Lue */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
-	2,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
-	3,
-	0x2d30, 0x2d65,
-	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, 0x1baa,
-	0x1bae, 0x1bb9,
-}; /* CR_Sundanese */
-
-/* 'Lepcha': Script */
-static const OnigCodePoint CR_Lepcha[] = {
-	3,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c4f,
-}; /* CR_Lepcha */
-
-/* 'Ol_Chiki': Script */
-static const OnigCodePoint CR_Ol_Chiki[] = {
-	1,
-	0x1c50, 0x1c7f,
-}; /* CR_Ol_Chiki */
-
-/* 'Vai': Script */
-static const OnigCodePoint CR_Vai[] = {
-	1,
-	0xa500, 0xa62b,
-}; /* CR_Vai */
-
-/* 'Saurashtra': Script */
-static const OnigCodePoint CR_Saurashtra[] = {
-	2,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
-	1,
-	0xa900, 0xa92f,
-}; /* CR_Kayah_Li */
-
-/* 'Rejang': Script */
-static const OnigCodePoint CR_Rejang[] = {
-	2,
-	0xa930, 0xa953,
-	0xa95f, 0xa95f,
-}; /* CR_Rejang */
-
-/* 'Lycian': Script */
-static const OnigCodePoint CR_Lycian[] = {
-	1,
-	0x10280, 0x1029c,
-}; /* CR_Lycian */
-
-/* 'Carian': Script */
-static const OnigCodePoint CR_Carian[] = {
-	1,
-	0x102a0, 0x102d0,
-}; /* CR_Carian */
-
-/* 'Lydian': Script */
-static const OnigCodePoint CR_Lydian[] = {
-	2,
-	0x10920, 0x10939,
-	0x1093f, 0x1093f,
-}; /* CR_Lydian */
-
-/* 'Cham': Script */
-static const OnigCodePoint CR_Cham[] = {
-	4,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-}; /* CR_Cham */
-
-/* 'Tai_Tham': Script */
-static const OnigCodePoint CR_Tai_Tham[] = {
-	5,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-}; /* CR_Tai_Tham */
-
-/* 'Tai_Viet': Script */
-static const OnigCodePoint CR_Tai_Viet[] = {
-	2,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-}; /* CR_Tai_Viet */
-
-/* 'Avestan': Script */
-static const OnigCodePoint CR_Avestan[] = {
-	2,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b3f,
-}; /* CR_Avestan */
-
-/* 'Egyptian_Hieroglyphs': Script */
-static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342e,
-}; /* CR_Egyptian_Hieroglyphs */
-
-/* 'Samaritan': Script */
-static const OnigCodePoint CR_Samaritan[] = {
-	2,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-}; /* CR_Samaritan */
-
-/* 'Lisu': Script */
-static const OnigCodePoint CR_Lisu[] = {
-	1,
-	0xa4d0, 0xa4ff,
-}; /* CR_Lisu */
-
-/* 'Bamum': Script */
-static const OnigCodePoint CR_Bamum[] = {
-	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[] = {
-	2,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-}; /* CR_Meetei_Mayek */
-
-/* 'Imperial_Aramaic': Script */
-static const OnigCodePoint CR_Imperial_Aramaic[] = {
-	2,
-	0x10840, 0x10855,
-	0x10857, 0x1085f,
-}; /* CR_Imperial_Aramaic */
-
-/* 'Old_South_Arabian': Script */
-static const OnigCodePoint CR_Old_South_Arabian[] = {
-	1,
-	0x10a60, 0x10a7f,
-}; /* CR_Old_South_Arabian */
-
-/* 'Inscriptional_Parthian': Script */
-static const OnigCodePoint CR_Inscriptional_Parthian[] = {
-	2,
-	0x10b40, 0x10b55,
-	0x10b58, 0x10b5f,
-}; /* CR_Inscriptional_Parthian */
-
-/* 'Inscriptional_Pahlavi': Script */
-static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
-	2,
-	0x10b60, 0x10b72,
-	0x10b78, 0x10b7f,
-}; /* CR_Inscriptional_Pahlavi */
-
-/* 'Old_Turkic': Script */
-static const OnigCodePoint CR_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c48,
-}; /* CR_Old_Turkic */
-
-/* 'Kaithi': Script */
-static const OnigCodePoint CR_Kaithi[] = {
-	1,
-	0x11080, 0x110c1,
-}; /* CR_Kaithi */
-
-/* '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 */
-
-/* 'White_Space': Binary Property */
-static const OnigCodePoint CR_White_Space[] = {
-	11,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x180e, 0x180e,
-	0x2000, 0x200a,
-	0x2028, 0x2029,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_White_Space */
-
-/* 'Bidi_Control': Binary Property */
-static const OnigCodePoint CR_Bidi_Control[] = {
-	2,
-	0x200e, 0x200f,
-	0x202a, 0x202e,
-}; /* CR_Bidi_Control */
-
-/* 'Join_Control': Binary Property */
-static const OnigCodePoint CR_Join_Control[] = {
-	1,
-	0x200c, 0x200d,
-}; /* CR_Join_Control */
-
-/* 'Dash': Binary Property */
-static const OnigCodePoint CR_Dash[] = {
-	19,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2053, 0x2053,
-	0x207b, 0x207b,
-	0x208b, 0x208b,
-	0x2212, 0x2212,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Dash */
-
-/* 'Hyphen': Binary Property */
-static const OnigCodePoint CR_Hyphen[] = {
-	10,
-	0x002d, 0x002d,
-	0x00ad, 0x00ad,
-	0x058a, 0x058a,
-	0x1806, 0x1806,
-	0x2010, 0x2011,
-	0x2e17, 0x2e17,
-	0x30fb, 0x30fb,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-	0xff65, 0xff65,
-}; /* CR_Hyphen */
-
-/* 'Quotation_Mark': Binary Property */
-static const OnigCodePoint CR_Quotation_Mark[] = {
-	12,
-	0x0022, 0x0022,
-	0x0027, 0x0027,
-	0x00ab, 0x00ab,
-	0x00bb, 0x00bb,
-	0x2018, 0x201f,
-	0x2039, 0x203a,
-	0x300c, 0x300f,
-	0x301d, 0x301f,
-	0xfe41, 0xfe44,
-	0xff02, 0xff02,
-	0xff07, 0xff07,
-	0xff62, 0xff63,
-}; /* CR_Quotation_Mark */
-
-/* 'Terminal_Punctuation': Binary Property */
-static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	67,
-	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,
-	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,
-	0x12470, 0x12473,
-}; /* CR_Terminal_Punctuation */
-
-/* 'Other_Math': Binary Property */
-static const OnigCodePoint CR_Other_Math[] = {
-	100,
-	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,
-}; /* CR_Other_Math */
-
-/* 'Hex_Digit': Binary Property */
-static const OnigCodePoint CR_Hex_Digit[] = {
-	6,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-	0xff10, 0xff19,
-	0xff21, 0xff26,
-	0xff41, 0xff46,
-}; /* CR_Hex_Digit */
-
-/* 'ASCII_Hex_Digit': Binary Property */
-static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
-	3,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-}; /* CR_ASCII_Hex_Digit */
-
-/* 'Other_Alphabetic': Binary Property */
-static const OnigCodePoint CR_Other_Alphabetic[] = {
-	145,
-	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,
-	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,
-	0x1be7, 0x1bf1,
-	0x1c24, 0x1c35,
-	0x1cf2, 0x1cf2,
-	0x24b6, 0x24e9,
-	0x2de0, 0x2dff,
-	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,
-	0xabe3, 0xabea,
-	0xfb1e, 0xfb1e,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x11000, 0x11002,
-	0x11038, 0x11045,
-	0x11082, 0x11082,
-	0x110b0, 0x110b8,
-}; /* CR_Other_Alphabetic */
-
-/* 'Ideographic': Binary Property */
-static const OnigCodePoint CR_Ideographic[] = {
-	12,
-	0x3006, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Ideographic */
-
-/* 'Diacritic': Binary Property */
-static const OnigCodePoint CR_Diacritic[] = {
-	117,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x034e,
-	0x0350, 0x0357,
-	0x035d, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0483, 0x0487,
-	0x0559, 0x0559,
-	0x0591, 0x05a1,
-	0x05a3, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c4,
-	0x064b, 0x0652,
-	0x0657, 0x0658,
-	0x06df, 0x06e0,
-	0x06e5, 0x06e6,
-	0x06ea, 0x06ec,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x0818, 0x0819,
-	0x093c, 0x093c,
-	0x094d, 0x094d,
-	0x0951, 0x0954,
-	0x0971, 0x0971,
-	0x09bc, 0x09bc,
-	0x09cd, 0x09cd,
-	0x0a3c, 0x0a3c,
-	0x0a4d, 0x0a4d,
-	0x0abc, 0x0abc,
-	0x0acd, 0x0acd,
-	0x0b3c, 0x0b3c,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0cbc, 0x0cbc,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e47, 0x0e4c,
-	0x0e4e, 0x0e4e,
-	0x0ec8, 0x0ecc,
-	0x0f18, 0x0f19,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f3f,
-	0x0f82, 0x0f84,
-	0x0f86, 0x0f87,
-	0x0fc6, 0x0fc6,
-	0x1037, 0x1037,
-	0x1039, 0x103a,
-	0x1087, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109b,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x1939, 0x193b,
-	0x1a75, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b34, 0x1b34,
-	0x1b44, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1baa, 0x1baa,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1d2c, 0x1d6a,
-	0x1dc4, 0x1dcf,
-	0x1dfd, 0x1dff,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x2cef, 0x2cf1,
-	0x2e2f, 0x2e2f,
-	0x302a, 0x302f,
-	0x3099, 0x309c,
-	0x30fc, 0x30fc,
-	0xa66f, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa6f0, 0xa6f1,
-	0xa717, 0xa721,
-	0xa788, 0xa788,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa92b, 0xa92e,
-	0xa953, 0xa953,
-	0xa9b3, 0xa9b3,
-	0xa9c0, 0xa9c0,
-	0xaa7b, 0xaa7b,
-	0xaabf, 0xaac2,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe20, 0xfe26,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0x110b9, 0x110ba,
-	0x1d167, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-}; /* CR_Diacritic */
-
-/* 'Extender': Binary Property */
-static const OnigCodePoint CR_Extender[] = {
-	20,
-	0x00b7, 0x00b7,
-	0x02d0, 0x02d1,
-	0x0640, 0x0640,
-	0x07fa, 0x07fa,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c36, 0x1c36,
-	0x1c7b, 0x1c7b,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa60c, 0xa60c,
-	0xa9cf, 0xa9cf,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xff70, 0xff70,
-}; /* CR_Extender */
-
-/* 'Other_Lowercase': Binary Property */
-static const OnigCodePoint CR_Other_Lowercase[] = {
-	13,
-	0x02b0, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x037a, 0x037a,
-	0x1d2c, 0x1d61,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2090, 0x2094,
-	0x2170, 0x217f,
-	0x24d0, 0x24e9,
-	0x2c7d, 0x2c7d,
-	0xa770, 0xa770,
-}; /* CR_Other_Lowercase */
-
-/* 'Other_Uppercase': Binary Property */
-static const OnigCodePoint CR_Other_Uppercase[] = {
-	2,
-	0x2160, 0x216f,
-	0x24b6, 0x24cf,
-}; /* CR_Other_Uppercase */
-
-/* 'Noncharacter_Code_Point': Binary Property */
-static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
-	18,
-	0xfdd0, 0xfdef,
-	0xfffe, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0xeffff,
-	0xffffe, 0xfffff,
-	0x10fffe, 0x10ffff,
-}; /* CR_Noncharacter_Code_Point */
-
-/* 'Other_Grapheme_Extend': Binary Property */
-static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
-	16,
-	0x09be, 0x09be,
-	0x09d7, 0x09d7,
-	0x0b3e, 0x0b3e,
-	0x0b57, 0x0b57,
-	0x0bbe, 0x0bbe,
-	0x0bd7, 0x0bd7,
-	0x0cc2, 0x0cc2,
-	0x0cd5, 0x0cd6,
-	0x0d3e, 0x0d3e,
-	0x0d57, 0x0d57,
-	0x0dcf, 0x0dcf,
-	0x0ddf, 0x0ddf,
-	0x200c, 0x200d,
-	0xff9e, 0xff9f,
-	0x1d165, 0x1d165,
-	0x1d16e, 0x1d172,
-}; /* CR_Other_Grapheme_Extend */
-
-/* 'IDS_Binary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Binary_Operator[] = {
-	2,
-	0x2ff0, 0x2ff1,
-	0x2ff4, 0x2ffb,
-}; /* CR_IDS_Binary_Operator */
-
-/* 'IDS_Trinary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
-	1,
-	0x2ff2, 0x2ff3,
-}; /* CR_IDS_Trinary_Operator */
-
-/* 'Radical': Binary Property */
-static const OnigCodePoint CR_Radical[] = {
-	3,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-}; /* CR_Radical */
-
-/* 'Unified_Ideograph': Binary Property */
-static const OnigCodePoint CR_Unified_Ideograph[] = {
-	12,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	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[] = {
-	10,
-	0x034f, 0x034f,
-	0x115f, 0x1160,
-	0x2065, 0x2069,
-	0x3164, 0x3164,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0xe0000, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xe0fff,
-}; /* CR_Other_Default_Ignorable_Code_Point */
-
-/* 'Deprecated': Binary Property */
-static const OnigCodePoint CR_Deprecated[] = {
-	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[] = {
-	47,
-	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,
-	0xabeb, 0xabeb,
-	0xfe52, 0xfe52,
-	0xfe56, 0xfe57,
-	0xff01, 0xff01,
-	0xff0e, 0xff0e,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0x10a56, 0x10a57,
-	0x11047, 0x11048,
-	0x110be, 0x110c1,
-}; /* CR_STerm */
-
-/* 'Variation_Selector': Binary Property */
-static const OnigCodePoint CR_Variation_Selector[] = {
-	3,
-	0x180b, 0x180d,
-	0xfe00, 0xfe0f,
-	0xe0100, 0xe01ef,
-}; /* CR_Variation_Selector */
-
-/* 'Pattern_White_Space': Binary Property */
-static const OnigCodePoint CR_Pattern_White_Space[] = {
-	5,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x200e, 0x200f,
-	0x2028, 0x2029,
-}; /* CR_Pattern_White_Space */
-
-/* 'Pattern_Syntax': Binary Property */
-static const OnigCodePoint CR_Pattern_Syntax[] = {
-	28,
-	0x0021, 0x002f,
-	0x003a, 0x0040,
-	0x005b, 0x005e,
-	0x0060, 0x0060,
-	0x007b, 0x007e,
-	0x00a1, 0x00a7,
-	0x00a9, 0x00a9,
-	0x00ab, 0x00ac,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b1,
-	0x00b6, 0x00b6,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x2010, 0x2027,
-	0x2030, 0x203e,
-	0x2041, 0x2053,
-	0x2055, 0x205e,
-	0x2190, 0x245f,
-	0x2500, 0x2775,
-	0x2794, 0x2bff,
-	0x2e00, 0x2e7f,
-	0x3001, 0x3003,
-	0x3008, 0x3020,
-	0x3030, 0x3030,
-	0xfd3e, 0xfd3f,
-	0xfe45, 0xfe46,
-}; /* CR_Pattern_Syntax */
-
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
-	499,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x0604, 0x0605,
-	0x061c, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 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,
-	0x0af0, 0x0af0,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	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,
-	0x0ede, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10cf,
-	0x10fd, 0x10ff,
-	0x1249, 0x1249,
-	0x124e, 0x124f,
-	0x1257, 0x1257,
-	0x1259, 0x1259,
-	0x125e, 0x125f,
-	0x1289, 0x1289,
-	0x128e, 0x128f,
-	0x12b1, 0x12b1,
-	0x12b6, 0x12b7,
-	0x12bf, 0x12bf,
-	0x12c1, 0x12c1,
-	0x12c6, 0x12c7,
-	0x12d7, 0x12d7,
-	0x1311, 0x1311,
-	0x1316, 0x1317,
-	0x135b, 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,
-	0x1bab, 0x1bad,
-	0x1bba, 0x1bbf,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1ccf,
-	0x1cf3, 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,
-	0x27cb, 0x27cb,
-	0x27cd, 0x27cd,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf2, 0x2cf8,
-	0x2d26, 0x2d2f,
-	0x2d66, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e32, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcc, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa674, 0xa67b,
-	0xa698, 0xa69f,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa792, 0xa79f,
-	0xa7aa, 0xa7f9,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaae0, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa2e, 0xfa2f,
-	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, 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, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 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, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16a, 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, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f600, 0x1f600,
-	0x1f611, 0x1f611,
-	0x1f615, 0x1f615,
-	0x1f617, 0x1f617,
-	0x1f619, 0x1f619,
-	0x1f61b, 0x1f61b,
-	0x1f61f, 0x1f61f,
-	0x1f626, 0x1f627,
-	0x1f62c, 0x1f62c,
-	0x1f62e, 0x1f62f,
-	0x1f634, 0x1f634,
-	0x1f641, 0x1f644,
-	0x1f650, 0x1f67f,
-	0x1f6c6, 0x1f6ff,
-	0x1f774, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2f7ff,
-	0x2fa1e, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-#endif /* USE_UNICODE_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 */
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
-	1,
-	0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-#define CR_Alpha CR_Alphabetic
-
-/* 'Blank': [[:Blank:]] */
-static const OnigCodePoint CR_Blank[] = {
-	9,
-	0x0009, 0x0009,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x180e, 0x180e,
-	0x2000, 0x200a,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Blank */
-
-/* 'Cntrl': [[:Cntrl:]] */
-#define CR_Cntrl CR_Cc
-
-/* 'Digit': [[:Digit:]] */
-#define CR_Digit CR_Nd
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
-	506,
-	0x0021, 0x007e,
-	0x00a1, 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, 0x167f,
-	0x1681, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1736,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17dd,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1800, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	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,
-	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, 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,
-	0x3001, 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,
-	0xe000, 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,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-#define CR_Lower CR_Lowercase
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
-	503,
-	0x0020, 0x007e,
-	0x00a0, 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, 0x2027,
-	0x202a, 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,
-	0xe000, 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,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-#define CR_Punct CR_P
-
-/* 'Space': [[:Space:]] */
-#define CR_Space CR_White_Space
-
-/* 'Upper': [[:Upper:]] */
-#define CR_Upper CR_Uppercase
-
-/* 'XDigit': [[:XDigit:]] */
-#define CR_XDigit CR_ASCII_Hex_Digit
-
-/* 'Word': [[:Word:]] */
-static const OnigCodePoint CR_Word[] = {
-	514,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	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, 0x17b3,
-	0x17b6, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf2,
-	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, 0x2cf1,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	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, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa672,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff3f, 0xff3f,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
-	509,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x135f, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b80, 0x1ba9,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11066, 0x1106f,
-	0x11082, 0x110b8,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Alnum */
-
-/* 'ASCII': [[:ASCII:]] */
-static const OnigCodePoint CR_ASCII[] = {
-	1,
-	0x0000, 0x007f,
-}; /* CR_ASCII */
-
-static const OnigCodePoint* const CodeRanges[] = {
-  CR_NEWLINE,
-  CR_Alpha,
-  CR_Blank,
-  CR_Cntrl,
-  CR_Digit,
-  CR_Graph,
-  CR_Lower,
-  CR_Print,
-  CR_Punct,
-  CR_Space,
-  CR_Upper,
-  CR_XDigit,
-  CR_Word,
-  CR_Alnum,
-  CR_ASCII,
-#ifdef USE_UNICODE_PROPERTIES
-  CR_Any,
-  CR_Assigned,
-  CR_C,
-  CR_Cc,
-  CR_Cf,
-  CR_Cn,
-  CR_Co,
-  CR_Cs,
-  CR_L,
-  CR_Ll,
-  CR_Lm,
-  CR_Lo,
-  CR_Lt,
-  CR_Lu,
-  CR_M,
-  CR_Mc,
-  CR_Me,
-  CR_Mn,
-  CR_N,
-  CR_Nd,
-  CR_Nl,
-  CR_No,
-  CR_P,
-  CR_Pc,
-  CR_Pd,
-  CR_Pe,
-  CR_Pf,
-  CR_Pi,
-  CR_Po,
-  CR_Ps,
-  CR_S,
-  CR_Sc,
-  CR_Sk,
-  CR_Sm,
-  CR_So,
-  CR_Z,
-  CR_Zl,
-  CR_Zp,
-  CR_Zs,
-  CR_Math,
-  CR_Alphabetic,
-  CR_Lowercase,
-  CR_Uppercase,
-  CR_Cased,
-  CR_Case_Ignorable,
-  CR_Changes_When_Lowercased,
-  CR_Changes_When_Uppercased,
-  CR_Changes_When_Titlecased,
-  CR_Changes_When_Casefolded,
-  CR_Changes_When_Casemapped,
-  CR_ID_Start,
-  CR_ID_Continue,
-  CR_XID_Start,
-  CR_XID_Continue,
-  CR_Default_Ignorable_Code_Point,
-  CR_Grapheme_Extend,
-  CR_Grapheme_Base,
-  CR_Grapheme_Link,
-  CR_Common,
-  CR_Latin,
-  CR_Greek,
-  CR_Cyrillic,
-  CR_Armenian,
-  CR_Hebrew,
-  CR_Arabic,
-  CR_Syriac,
-  CR_Thaana,
-  CR_Devanagari,
-  CR_Bengali,
-  CR_Gurmukhi,
-  CR_Gujarati,
-  CR_Oriya,
-  CR_Tamil,
-  CR_Telugu,
-  CR_Kannada,
-  CR_Malayalam,
-  CR_Sinhala,
-  CR_Thai,
-  CR_Lao,
-  CR_Tibetan,
-  CR_Myanmar,
-  CR_Georgian,
-  CR_Hangul,
-  CR_Ethiopic,
-  CR_Cherokee,
-  CR_Canadian_Aboriginal,
-  CR_Ogham,
-  CR_Runic,
-  CR_Khmer,
-  CR_Mongolian,
-  CR_Hiragana,
-  CR_Katakana,
-  CR_Bopomofo,
-  CR_Han,
-  CR_Yi,
-  CR_Old_Italic,
-  CR_Gothic,
-  CR_Deseret,
-  CR_Inherited,
-  CR_Tagalog,
-  CR_Hanunoo,
-  CR_Buhid,
-  CR_Tagbanwa,
-  CR_Limbu,
-  CR_Tai_Le,
-  CR_Linear_B,
-  CR_Ugaritic,
-  CR_Shavian,
-  CR_Osmanya,
-  CR_Cypriot,
-  CR_Braille,
-  CR_Buginese,
-  CR_Coptic,
-  CR_New_Tai_Lue,
-  CR_Glagolitic,
-  CR_Tifinagh,
-  CR_Syloti_Nagri,
-  CR_Old_Persian,
-  CR_Kharoshthi,
-  CR_Balinese,
-  CR_Cuneiform,
-  CR_Phoenician,
-  CR_Phags_Pa,
-  CR_Nko,
-  CR_Sundanese,
-  CR_Lepcha,
-  CR_Ol_Chiki,
-  CR_Vai,
-  CR_Saurashtra,
-  CR_Kayah_Li,
-  CR_Rejang,
-  CR_Lycian,
-  CR_Carian,
-  CR_Lydian,
-  CR_Cham,
-  CR_Tai_Tham,
-  CR_Tai_Viet,
-  CR_Avestan,
-  CR_Egyptian_Hieroglyphs,
-  CR_Samaritan,
-  CR_Lisu,
-  CR_Bamum,
-  CR_Javanese,
-  CR_Meetei_Mayek,
-  CR_Imperial_Aramaic,
-  CR_Old_South_Arabian,
-  CR_Inscriptional_Parthian,
-  CR_Inscriptional_Pahlavi,
-  CR_Old_Turkic,
-  CR_Kaithi,
-  CR_Batak,
-  CR_Brahmi,
-  CR_Mandaic,
-  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,
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
-  int name, ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-%}
-struct uniname2ctype_struct;
-%%
-newline,                                   0
-alpha,                                     1
-blank,                                     2
-cntrl,                                     3
-digit,                                     4
-graph,                                     5
-lower,                                     6
-print,                                     7
-punct,                                     8
-space,                                     9
-upper,                                    10
-xdigit,                                   11
-word,                                     12
-alnum,                                    13
-ascii,                                    14
-#ifdef USE_UNICODE_PROPERTIES
-any,                                      15
-assigned,                                 16
-c,                                        17
-cc,                                       18
-cf,                                       19
-cn,                                       20
-co,                                       21
-cs,                                       22
-l,                                        23
-ll,                                       24
-lm,                                       25
-lo,                                       26
-lt,                                       27
-lu,                                       28
-m,                                        29
-mc,                                       30
-me,                                       31
-mn,                                       32
-n,                                        33
-nd,                                       34
-nl,                                       35
-no,                                       36
-p,                                        37
-pc,                                       38
-pd,                                       39
-pe,                                       40
-pf,                                       41
-pi,                                       42
-po,                                       43
-ps,                                       44
-s,                                        45
-sc,                                       46
-sk,                                       47
-sm,                                       48
-so,                                       49
-z,                                        50
-zl,                                       51
-zp,                                       52
-zs,                                       53
-math,                                     54
-alphabetic,                               55
-lowercase,                                56
-uppercase,                                57
-cased,                                    58
-caseignorable,                            59
-changeswhenlowercased,                    60
-changeswhenuppercased,                    61
-changeswhentitlecased,                    62
-changeswhencasefolded,                    63
-changeswhencasemapped,                    64
-idstart,                                  65
-idcontinue,                               66
-xidstart,                                 67
-xidcontinue,                              68
-defaultignorablecodepoint,                69
-graphemeextend,                           70
-graphemebase,                             71
-graphemelink,                             72
-common,                                   73
-latin,                                    74
-greek,                                    75
-cyrillic,                                 76
-armenian,                                 77
-hebrew,                                   78
-arabic,                                   79
-syriac,                                   80
-thaana,                                   81
-devanagari,                               82
-bengali,                                  83
-gurmukhi,                                 84
-gujarati,                                 85
-oriya,                                    86
-tamil,                                    87
-telugu,                                   88
-kannada,                                  89
-malayalam,                                90
-sinhala,                                  91
-thai,                                     92
-lao,                                      93
-tibetan,                                  94
-myanmar,                                  95
-georgian,                                 96
-hangul,                                   97
-ethiopic,                                 98
-cherokee,                                 99
-canadianaboriginal,                      100
-ogham,                                   101
-runic,                                   102
-khmer,                                   103
-mongolian,                               104
-hiragana,                                105
-katakana,                                106
-bopomofo,                                107
-han,                                     108
-yi,                                      109
-olditalic,                               110
-gothic,                                  111
-deseret,                                 112
-inherited,                               113
-tagalog,                                 114
-hanunoo,                                 115
-buhid,                                   116
-tagbanwa,                                117
-limbu,                                   118
-taile,                                   119
-linearb,                                 120
-ugaritic,                                121
-shavian,                                 122
-osmanya,                                 123
-cypriot,                                 124
-braille,                                 125
-buginese,                                126
-coptic,                                  127
-newtailue,                               128
-glagolitic,                              129
-tifinagh,                                130
-sylotinagri,                             131
-oldpersian,                              132
-kharoshthi,                              133
-balinese,                                134
-cuneiform,                               135
-phoenician,                              136
-phagspa,                                 137
-nko,                                     138
-sundanese,                               139
-lepcha,                                  140
-olchiki,                                 141
-vai,                                     142
-saurashtra,                              143
-kayahli,                                 144
-rejang,                                  145
-lycian,                                  146
-carian,                                  147
-lydian,                                  148
-cham,                                    149
-taitham,                                 150
-taiviet,                                 151
-avestan,                                 152
-egyptianhieroglyphs,                     153
-samaritan,                               154
-lisu,                                    155
-bamum,                                   156
-javanese,                                157
-meeteimayek,                             158
-imperialaramaic,                         159
-oldsoutharabian,                         160
-inscriptionalparthian,                   161
-inscriptionalpahlavi,                    162
-oldturkic,                               163
-kaithi,                                  164
-batak,                                   165
-brahmi,                                  166
-mandaic,                                 167
-whitespace,                              168
-bidicontrol,                             169
-joincontrol,                             170
-dash,                                    171
-hyphen,                                  172
-quotationmark,                           173
-terminalpunctuation,                     174
-othermath,                               175
-hexdigit,                                176
-asciihexdigit,                           177
-otheralphabetic,                         178
-ideographic,                             179
-diacritic,                               180
-extender,                                181
-otherlowercase,                          182
-otheruppercase,                          183
-noncharactercodepoint,                   184
-othergraphemeextend,                     185
-idsbinaryoperator,                       186
-idstrinaryoperator,                      187
-radical,                                 188
-unifiedideograph,                        189
-otherdefaultignorablecodepoint,          190
-deprecated,                              191
-softdotted,                              192
-logicalorderexception,                   193
-otheridstart,                            194
-otheridcontinue,                         195
-sterm,                                   196
-variationselector,                       197
-patternwhitespace,                       198
-patternsyntax,                           199
-unknown,                                 200
-ahex,                                    177
-bidic,                                   169
-ci,                                       59
-cwcf,                                     63
-cwcm,                                     64
-cwl,                                      60
-cwt,                                      62
-cwu,                                      61
-dep,                                     191
-di,                                       69
-dia,                                     180
-ext,                                     181
-grbase,                                   71
-grext,                                    70
-grlink,                                   72
-hex,                                     176
-idc,                                      66
-ideo,                                    179
-ids,                                      65
-idsb,                                    186
-idst,                                    187
-joinc,                                   170
-loe,                                     193
-nchar,                                   184
-oalpha,                                  178
-odi,                                     190
-ogrext,                                  185
-oidc,                                    195
-oids,                                    194
-olower,                                  182
-omath,                                   175
-oupper,                                  183
-patsyn,                                  199
-patws,                                   198
-qmark,                                   173
-sd,                                      192
-term,                                    174
-uideo,                                   189
-vs,                                      197
-wspace,                                  168
-xidc,                                     68
-xids,                                     67
-other,                                    17
-control,                                  18
-format,                                   19
-unassigned,                               20
-privateuse,                               21
-surrogate,                                22
-letter,                                   23
-lowercaseletter,                          24
-modifierletter,                           25
-otherletter,                              26
-titlecaseletter,                          27
-uppercaseletter,                          28
-mark,                                     29
-spacingmark,                              30
-enclosingmark,                            31
-nonspacingmark,                           32
-number,                                   33
-decimalnumber,                            34
-letternumber,                             35
-othernumber,                              36
-punctuation,                              37
-connectorpunctuation,                     38
-dashpunctuation,                          39
-closepunctuation,                         40
-finalpunctuation,                         41
-initialpunctuation,                       42
-otherpunctuation,                         43
-openpunctuation,                          44
-symbol,                                   45
-currencysymbol,                           46
-modifiersymbol,                           47
-mathsymbol,                               48
-othersymbol,                              49
-separator,                                50
-lineseparator,                            51
-paragraphseparator,                       52
-spaceseparator,                           53
-arab,                                     79
-armi,                                    159
-armn,                                     77
-avst,                                    152
-bali,                                    134
-bamu,                                    156
-batk,                                    165
-beng,                                     83
-bopo,                                    107
-brah,                                    166
-brai,                                    125
-bugi,                                    126
-buhd,                                    116
-cans,                                    100
-cari,                                    147
-cher,                                     99
-copt,                                    127
-qaac,                                    127
-cprt,                                    124
-cyrl,                                     76
-deva,                                     82
-dsrt,                                    112
-egyp,                                    153
-ethi,                                     98
-geor,                                     96
-glag,                                    129
-goth,                                    111
-grek,                                     75
-gujr,                                     85
-guru,                                     84
-hang,                                     97
-hani,                                    108
-hano,                                    115
-hebr,                                     78
-hira,                                    105
-ital,                                    110
-java,                                    157
-kali,                                    144
-kana,                                    106
-khar,                                    133
-khmr,                                    103
-knda,                                     89
-kthi,                                    164
-lana,                                    150
-laoo,                                     93
-latn,                                     74
-lepc,                                    140
-limb,                                    118
-linb,                                    120
-lyci,                                    146
-lydi,                                    148
-mand,                                    167
-mlym,                                     90
-mong,                                    104
-mtei,                                    158
-mymr,                                     95
-nkoo,                                    138
-ogam,                                    101
-olck,                                    141
-orkh,                                    163
-orya,                                     86
-osma,                                    123
-phag,                                    137
-phli,                                    162
-phnx,                                    136
-prti,                                    161
-rjng,                                    145
-runr,                                    102
-samr,                                    154
-sarb,                                    160
-saur,                                    143
-shaw,                                    122
-sinh,                                     91
-sund,                                    139
-sylo,                                    131
-syrc,                                     80
-tagb,                                    117
-tale,                                    119
-talu,                                    128
-taml,                                     87
-tavt,                                    151
-telu,                                     88
-tfng,                                    130
-tglg,                                    114
-thaa,                                     81
-tibt,                                     94
-ugar,                                    121
-vaii,                                    142
-xpeo,                                    132
-xsux,                                    135
-yiii,                                    109
-zinh,                                    113
-qaai,                                    113
-zyyy,                                     73
-zzzz,                                    200
-age=1.1,                                 201
-age=2.0,                                 202
-age=2.1,                                 203
-age=3.0,                                 204
-age=3.1,                                 205
-age=3.2,                                 206
-age=4.0,                                 207
-age=4.1,                                 208
-age=5.0,                                 209
-age=5.1,                                 210
-age=5.2,                                 211
-age=6.0,                                 212
-#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
deleted file mode 100644
index 2e27f3f7de..0000000000
--- a/enc/unicode/name2ctype.src
+++ /dev/null
@@ -1,22543 +0,0 @@
-%{
-#define long size_t
-
-#ifdef USE_UNICODE_PROPERTIES
-/* 'Any': - */
-static const OnigCodePoint CR_Any[] = {
-	1,
-	0x0000, 0x10ffff,
-}; /* CR_Any */
-
-/* 'Assigned': - */
-static const OnigCodePoint CR_Assigned[] = {
-	501,
-	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,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	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,
-	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[] = {
-	20,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-	0x00ad, 0x00ad,
-	0x0600, 0x0603,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x17b4, 0x17b5,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x206a, 0x206f,
-	0xd800, 0xf8ff,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xf0000, 0xffffd,
-	0x100000, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-static const OnigCodePoint CR_Cc[] = {
-	2,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-}; /* CR_Cc */
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
-	15,
-	0x00ad, 0x00ad,
-	0x0600, 0x0603,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x17b4, 0x17b5,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x206a, 0x206f,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
-	501,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x0604, 0x0605,
-	0x061c, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 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,
-	0x0af0, 0x0af0,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	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,
-	0x0ede, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10cf,
-	0x10fd, 0x10ff,
-	0x1249, 0x1249,
-	0x124e, 0x124f,
-	0x1257, 0x1257,
-	0x1259, 0x1259,
-	0x125e, 0x125f,
-	0x1289, 0x1289,
-	0x128e, 0x128f,
-	0x12b1, 0x12b1,
-	0x12b6, 0x12b7,
-	0x12bf, 0x12bf,
-	0x12c1, 0x12c1,
-	0x12c6, 0x12c7,
-	0x12d7, 0x12d7,
-	0x1311, 0x1311,
-	0x1316, 0x1317,
-	0x135b, 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,
-	0x1bab, 0x1bad,
-	0x1bba, 0x1bbf,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1ccf,
-	0x1cf3, 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,
-	0x27cb, 0x27cb,
-	0x27cd, 0x27cd,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf2, 0x2cf8,
-	0x2d26, 0x2d2f,
-	0x2d66, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e32, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcc, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa674, 0xa67b,
-	0xa698, 0xa69f,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa792, 0xa79f,
-	0xa7aa, 0xa7f9,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaae0, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xd7ff,
-	0xfa2e, 0xfa2f,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	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, 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, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 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, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16a, 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, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f600, 0x1f600,
-	0x1f611, 0x1f611,
-	0x1f615, 0x1f615,
-	0x1f617, 0x1f617,
-	0x1f619, 0x1f619,
-	0x1f61b, 0x1f61b,
-	0x1f61f, 0x1f61f,
-	0x1f626, 0x1f627,
-	0x1f62c, 0x1f62c,
-	0x1f62e, 0x1f62f,
-	0x1f634, 0x1f634,
-	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[] = {
-	435,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3006,
-	0x3031, 0x3035,
-	0x303b, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6e5,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
-	609,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00df, 0x00f6,
-	0x00f8, 0x00ff,
-	0x0101, 0x0101,
-	0x0103, 0x0103,
-	0x0105, 0x0105,
-	0x0107, 0x0107,
-	0x0109, 0x0109,
-	0x010b, 0x010b,
-	0x010d, 0x010d,
-	0x010f, 0x010f,
-	0x0111, 0x0111,
-	0x0113, 0x0113,
-	0x0115, 0x0115,
-	0x0117, 0x0117,
-	0x0119, 0x0119,
-	0x011b, 0x011b,
-	0x011d, 0x011d,
-	0x011f, 0x011f,
-	0x0121, 0x0121,
-	0x0123, 0x0123,
-	0x0125, 0x0125,
-	0x0127, 0x0127,
-	0x0129, 0x0129,
-	0x012b, 0x012b,
-	0x012d, 0x012d,
-	0x012f, 0x012f,
-	0x0131, 0x0131,
-	0x0133, 0x0133,
-	0x0135, 0x0135,
-	0x0137, 0x0138,
-	0x013a, 0x013a,
-	0x013c, 0x013c,
-	0x013e, 0x013e,
-	0x0140, 0x0140,
-	0x0142, 0x0142,
-	0x0144, 0x0144,
-	0x0146, 0x0146,
-	0x0148, 0x0149,
-	0x014b, 0x014b,
-	0x014d, 0x014d,
-	0x014f, 0x014f,
-	0x0151, 0x0151,
-	0x0153, 0x0153,
-	0x0155, 0x0155,
-	0x0157, 0x0157,
-	0x0159, 0x0159,
-	0x015b, 0x015b,
-	0x015d, 0x015d,
-	0x015f, 0x015f,
-	0x0161, 0x0161,
-	0x0163, 0x0163,
-	0x0165, 0x0165,
-	0x0167, 0x0167,
-	0x0169, 0x0169,
-	0x016b, 0x016b,
-	0x016d, 0x016d,
-	0x016f, 0x016f,
-	0x0171, 0x0171,
-	0x0173, 0x0173,
-	0x0175, 0x0175,
-	0x0177, 0x0177,
-	0x017a, 0x017a,
-	0x017c, 0x017c,
-	0x017e, 0x0180,
-	0x0183, 0x0183,
-	0x0185, 0x0185,
-	0x0188, 0x0188,
-	0x018c, 0x018d,
-	0x0192, 0x0192,
-	0x0195, 0x0195,
-	0x0199, 0x019b,
-	0x019e, 0x019e,
-	0x01a1, 0x01a1,
-	0x01a3, 0x01a3,
-	0x01a5, 0x01a5,
-	0x01a8, 0x01a8,
-	0x01aa, 0x01ab,
-	0x01ad, 0x01ad,
-	0x01b0, 0x01b0,
-	0x01b4, 0x01b4,
-	0x01b6, 0x01b6,
-	0x01b9, 0x01ba,
-	0x01bd, 0x01bf,
-	0x01c6, 0x01c6,
-	0x01c9, 0x01c9,
-	0x01cc, 0x01cc,
-	0x01ce, 0x01ce,
-	0x01d0, 0x01d0,
-	0x01d2, 0x01d2,
-	0x01d4, 0x01d4,
-	0x01d6, 0x01d6,
-	0x01d8, 0x01d8,
-	0x01da, 0x01da,
-	0x01dc, 0x01dd,
-	0x01df, 0x01df,
-	0x01e1, 0x01e1,
-	0x01e3, 0x01e3,
-	0x01e5, 0x01e5,
-	0x01e7, 0x01e7,
-	0x01e9, 0x01e9,
-	0x01eb, 0x01eb,
-	0x01ed, 0x01ed,
-	0x01ef, 0x01f0,
-	0x01f3, 0x01f3,
-	0x01f5, 0x01f5,
-	0x01f9, 0x01f9,
-	0x01fb, 0x01fb,
-	0x01fd, 0x01fd,
-	0x01ff, 0x01ff,
-	0x0201, 0x0201,
-	0x0203, 0x0203,
-	0x0205, 0x0205,
-	0x0207, 0x0207,
-	0x0209, 0x0209,
-	0x020b, 0x020b,
-	0x020d, 0x020d,
-	0x020f, 0x020f,
-	0x0211, 0x0211,
-	0x0213, 0x0213,
-	0x0215, 0x0215,
-	0x0217, 0x0217,
-	0x0219, 0x0219,
-	0x021b, 0x021b,
-	0x021d, 0x021d,
-	0x021f, 0x021f,
-	0x0221, 0x0221,
-	0x0223, 0x0223,
-	0x0225, 0x0225,
-	0x0227, 0x0227,
-	0x0229, 0x0229,
-	0x022b, 0x022b,
-	0x022d, 0x022d,
-	0x022f, 0x022f,
-	0x0231, 0x0231,
-	0x0233, 0x0239,
-	0x023c, 0x023c,
-	0x023f, 0x0240,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0293,
-	0x0295, 0x02af,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	0x0390, 0x0390,
-	0x03ac, 0x03ce,
-	0x03d0, 0x03d1,
-	0x03d5, 0x03d7,
-	0x03d9, 0x03d9,
-	0x03db, 0x03db,
-	0x03dd, 0x03dd,
-	0x03df, 0x03df,
-	0x03e1, 0x03e1,
-	0x03e3, 0x03e3,
-	0x03e5, 0x03e5,
-	0x03e7, 0x03e7,
-	0x03e9, 0x03e9,
-	0x03eb, 0x03eb,
-	0x03ed, 0x03ed,
-	0x03ef, 0x03f3,
-	0x03f5, 0x03f5,
-	0x03f8, 0x03f8,
-	0x03fb, 0x03fc,
-	0x0430, 0x045f,
-	0x0461, 0x0461,
-	0x0463, 0x0463,
-	0x0465, 0x0465,
-	0x0467, 0x0467,
-	0x0469, 0x0469,
-	0x046b, 0x046b,
-	0x046d, 0x046d,
-	0x046f, 0x046f,
-	0x0471, 0x0471,
-	0x0473, 0x0473,
-	0x0475, 0x0475,
-	0x0477, 0x0477,
-	0x0479, 0x0479,
-	0x047b, 0x047b,
-	0x047d, 0x047d,
-	0x047f, 0x047f,
-	0x0481, 0x0481,
-	0x048b, 0x048b,
-	0x048d, 0x048d,
-	0x048f, 0x048f,
-	0x0491, 0x0491,
-	0x0493, 0x0493,
-	0x0495, 0x0495,
-	0x0497, 0x0497,
-	0x0499, 0x0499,
-	0x049b, 0x049b,
-	0x049d, 0x049d,
-	0x049f, 0x049f,
-	0x04a1, 0x04a1,
-	0x04a3, 0x04a3,
-	0x04a5, 0x04a5,
-	0x04a7, 0x04a7,
-	0x04a9, 0x04a9,
-	0x04ab, 0x04ab,
-	0x04ad, 0x04ad,
-	0x04af, 0x04af,
-	0x04b1, 0x04b1,
-	0x04b3, 0x04b3,
-	0x04b5, 0x04b5,
-	0x04b7, 0x04b7,
-	0x04b9, 0x04b9,
-	0x04bb, 0x04bb,
-	0x04bd, 0x04bd,
-	0x04bf, 0x04bf,
-	0x04c2, 0x04c2,
-	0x04c4, 0x04c4,
-	0x04c6, 0x04c6,
-	0x04c8, 0x04c8,
-	0x04ca, 0x04ca,
-	0x04cc, 0x04cc,
-	0x04ce, 0x04cf,
-	0x04d1, 0x04d1,
-	0x04d3, 0x04d3,
-	0x04d5, 0x04d5,
-	0x04d7, 0x04d7,
-	0x04d9, 0x04d9,
-	0x04db, 0x04db,
-	0x04dd, 0x04dd,
-	0x04df, 0x04df,
-	0x04e1, 0x04e1,
-	0x04e3, 0x04e3,
-	0x04e5, 0x04e5,
-	0x04e7, 0x04e7,
-	0x04e9, 0x04e9,
-	0x04eb, 0x04eb,
-	0x04ed, 0x04ed,
-	0x04ef, 0x04ef,
-	0x04f1, 0x04f1,
-	0x04f3, 0x04f3,
-	0x04f5, 0x04f5,
-	0x04f7, 0x04f7,
-	0x04f9, 0x04f9,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0561, 0x0587,
-	0x1d00, 0x1d2b,
-	0x1d62, 0x1d77,
-	0x1d79, 0x1d9a,
-	0x1e01, 0x1e01,
-	0x1e03, 0x1e03,
-	0x1e05, 0x1e05,
-	0x1e07, 0x1e07,
-	0x1e09, 0x1e09,
-	0x1e0b, 0x1e0b,
-	0x1e0d, 0x1e0d,
-	0x1e0f, 0x1e0f,
-	0x1e11, 0x1e11,
-	0x1e13, 0x1e13,
-	0x1e15, 0x1e15,
-	0x1e17, 0x1e17,
-	0x1e19, 0x1e19,
-	0x1e1b, 0x1e1b,
-	0x1e1d, 0x1e1d,
-	0x1e1f, 0x1e1f,
-	0x1e21, 0x1e21,
-	0x1e23, 0x1e23,
-	0x1e25, 0x1e25,
-	0x1e27, 0x1e27,
-	0x1e29, 0x1e29,
-	0x1e2b, 0x1e2b,
-	0x1e2d, 0x1e2d,
-	0x1e2f, 0x1e2f,
-	0x1e31, 0x1e31,
-	0x1e33, 0x1e33,
-	0x1e35, 0x1e35,
-	0x1e37, 0x1e37,
-	0x1e39, 0x1e39,
-	0x1e3b, 0x1e3b,
-	0x1e3d, 0x1e3d,
-	0x1e3f, 0x1e3f,
-	0x1e41, 0x1e41,
-	0x1e43, 0x1e43,
-	0x1e45, 0x1e45,
-	0x1e47, 0x1e47,
-	0x1e49, 0x1e49,
-	0x1e4b, 0x1e4b,
-	0x1e4d, 0x1e4d,
-	0x1e4f, 0x1e4f,
-	0x1e51, 0x1e51,
-	0x1e53, 0x1e53,
-	0x1e55, 0x1e55,
-	0x1e57, 0x1e57,
-	0x1e59, 0x1e59,
-	0x1e5b, 0x1e5b,
-	0x1e5d, 0x1e5d,
-	0x1e5f, 0x1e5f,
-	0x1e61, 0x1e61,
-	0x1e63, 0x1e63,
-	0x1e65, 0x1e65,
-	0x1e67, 0x1e67,
-	0x1e69, 0x1e69,
-	0x1e6b, 0x1e6b,
-	0x1e6d, 0x1e6d,
-	0x1e6f, 0x1e6f,
-	0x1e71, 0x1e71,
-	0x1e73, 0x1e73,
-	0x1e75, 0x1e75,
-	0x1e77, 0x1e77,
-	0x1e79, 0x1e79,
-	0x1e7b, 0x1e7b,
-	0x1e7d, 0x1e7d,
-	0x1e7f, 0x1e7f,
-	0x1e81, 0x1e81,
-	0x1e83, 0x1e83,
-	0x1e85, 0x1e85,
-	0x1e87, 0x1e87,
-	0x1e89, 0x1e89,
-	0x1e8b, 0x1e8b,
-	0x1e8d, 0x1e8d,
-	0x1e8f, 0x1e8f,
-	0x1e91, 0x1e91,
-	0x1e93, 0x1e93,
-	0x1e95, 0x1e9d,
-	0x1e9f, 0x1e9f,
-	0x1ea1, 0x1ea1,
-	0x1ea3, 0x1ea3,
-	0x1ea5, 0x1ea5,
-	0x1ea7, 0x1ea7,
-	0x1ea9, 0x1ea9,
-	0x1eab, 0x1eab,
-	0x1ead, 0x1ead,
-	0x1eaf, 0x1eaf,
-	0x1eb1, 0x1eb1,
-	0x1eb3, 0x1eb3,
-	0x1eb5, 0x1eb5,
-	0x1eb7, 0x1eb7,
-	0x1eb9, 0x1eb9,
-	0x1ebb, 0x1ebb,
-	0x1ebd, 0x1ebd,
-	0x1ebf, 0x1ebf,
-	0x1ec1, 0x1ec1,
-	0x1ec3, 0x1ec3,
-	0x1ec5, 0x1ec5,
-	0x1ec7, 0x1ec7,
-	0x1ec9, 0x1ec9,
-	0x1ecb, 0x1ecb,
-	0x1ecd, 0x1ecd,
-	0x1ecf, 0x1ecf,
-	0x1ed1, 0x1ed1,
-	0x1ed3, 0x1ed3,
-	0x1ed5, 0x1ed5,
-	0x1ed7, 0x1ed7,
-	0x1ed9, 0x1ed9,
-	0x1edb, 0x1edb,
-	0x1edd, 0x1edd,
-	0x1edf, 0x1edf,
-	0x1ee1, 0x1ee1,
-	0x1ee3, 0x1ee3,
-	0x1ee5, 0x1ee5,
-	0x1ee7, 0x1ee7,
-	0x1ee9, 0x1ee9,
-	0x1eeb, 0x1eeb,
-	0x1eed, 0x1eed,
-	0x1eef, 0x1eef,
-	0x1ef1, 0x1ef1,
-	0x1ef3, 0x1ef3,
-	0x1ef5, 0x1ef5,
-	0x1ef7, 0x1ef7,
-	0x1ef9, 0x1ef9,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 0x1f07,
-	0x1f10, 0x1f15,
-	0x1f20, 0x1f27,
-	0x1f30, 0x1f37,
-	0x1f40, 0x1f45,
-	0x1f50, 0x1f57,
-	0x1f60, 0x1f67,
-	0x1f70, 0x1f7d,
-	0x1f80, 0x1f87,
-	0x1f90, 0x1f97,
-	0x1fa0, 0x1fa7,
-	0x1fb0, 0x1fb4,
-	0x1fb6, 0x1fb7,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fc7,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fd7,
-	0x1fe0, 0x1fe7,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ff7,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2184, 0x2184,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7c,
-	0x2c81, 0x2c81,
-	0x2c83, 0x2c83,
-	0x2c85, 0x2c85,
-	0x2c87, 0x2c87,
-	0x2c89, 0x2c89,
-	0x2c8b, 0x2c8b,
-	0x2c8d, 0x2c8d,
-	0x2c8f, 0x2c8f,
-	0x2c91, 0x2c91,
-	0x2c93, 0x2c93,
-	0x2c95, 0x2c95,
-	0x2c97, 0x2c97,
-	0x2c99, 0x2c99,
-	0x2c9b, 0x2c9b,
-	0x2c9d, 0x2c9d,
-	0x2c9f, 0x2c9f,
-	0x2ca1, 0x2ca1,
-	0x2ca3, 0x2ca3,
-	0x2ca5, 0x2ca5,
-	0x2ca7, 0x2ca7,
-	0x2ca9, 0x2ca9,
-	0x2cab, 0x2cab,
-	0x2cad, 0x2cad,
-	0x2caf, 0x2caf,
-	0x2cb1, 0x2cb1,
-	0x2cb3, 0x2cb3,
-	0x2cb5, 0x2cb5,
-	0x2cb7, 0x2cb7,
-	0x2cb9, 0x2cb9,
-	0x2cbb, 0x2cbb,
-	0x2cbd, 0x2cbd,
-	0x2cbf, 0x2cbf,
-	0x2cc1, 0x2cc1,
-	0x2cc3, 0x2cc3,
-	0x2cc5, 0x2cc5,
-	0x2cc7, 0x2cc7,
-	0x2cc9, 0x2cc9,
-	0x2ccb, 0x2ccb,
-	0x2ccd, 0x2ccd,
-	0x2ccf, 0x2ccf,
-	0x2cd1, 0x2cd1,
-	0x2cd3, 0x2cd3,
-	0x2cd5, 0x2cd5,
-	0x2cd7, 0x2cd7,
-	0x2cd9, 0x2cd9,
-	0x2cdb, 0x2cdb,
-	0x2cdd, 0x2cdd,
-	0x2cdf, 0x2cdf,
-	0x2ce1, 0x2ce1,
-	0x2ce3, 0x2ce4,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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[] = {
-	49,
-	0x02b0, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0374, 0x0374,
-	0x037a, 0x037a,
-	0x0559, 0x0559,
-	0x0640, 0x0640,
-	0x06e5, 0x06e6,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0971, 0x0971,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x10fc, 0x10fc,
-	0x17d7, 0x17d7,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c78, 0x1c7d,
-	0x1d2c, 0x1d61,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2c7d, 0x2c7d,
-	0x2d6f, 0x2d6f,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa67f, 0xa67f,
-	0xa717, 0xa71f,
-	0xa770, 0xa770,
-	0xa788, 0xa788,
-	0xa9cf, 0xa9cf,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
-	323,
-	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,
-	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, 0x0edd,
-	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,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17dc, 0x17dc,
-	0x1820, 0x1842,
-	0x1844, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c77,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x2135, 0x2138,
-	0x2d30, 0x2d65,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3006, 0x3006,
-	0x303c, 0x303c,
-	0x3041, 0x3096,
-	0x309f, 0x309f,
-	0x30a1, 0x30fa,
-	0x30ff, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa014,
-	0xa016, 0xa48c,
-	0xa4d0, 0xa4f7,
-	0xa500, 0xa60b,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa66e, 0xa66e,
-	0xa6a0, 0xa6e5,
-	0xa7fb, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa6f,
-	0xaa71, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadc,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff66, 0xff6f,
-	0xff71, 0xff9d,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10450, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x1b000, 0x1b001,
-	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[] = {
-	603,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1fb8, 0x1fbb,
-	0x1fc8, 0x1fcb,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffb,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210b, 0x210d,
-	0x2110, 0x2112,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x2130, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2183, 0x2183,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	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[] = {
-	193,
-	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,
-	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,
-	0x17b6, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b00, 0x1b04,
-	0x1b34, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1baa,
-	0x1be6, 0x1bf3,
-	0x1c24, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf2, 0x1cf2,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa67c, 0xa67d,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa953,
-	0xa980, 0xa983,
-	0xa9b3, 0xa9c0,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xabe3, 0xabea,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11000, 0x11002,
-	0x11038, 0x11046,
-	0x11080, 0x11082,
-	0x110b0, 0x110ba,
-	0x1d165, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
-	113,
-	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,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1c24, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1ce1, 0x1ce1,
-	0x1cf2, 0x1cf2,
-	0xa823, 0xa824,
-	0xa827, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa952, 0xa953,
-	0xa983, 0xa983,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9c0,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa4d, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xabe3, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabea,
-	0xabec, 0xabec,
-	0x11000, 0x11000,
-	0x11002, 0x11002,
-	0x11082, 0x11082,
-	0x110b0, 0x110b2,
-	0x110b7, 0x110b8,
-	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[] = {
-	203,
-	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,
-	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,
-	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,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
-	83,
-	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,
-	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,
-	0x12400, 0x12462,
-	0x1d360, 0x1d371,
-	0x1d7ce, 0x1d7ff,
-	0x1f100, 0x1f10a,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-static const OnigCodePoint CR_Nd[] = {
-	38,
-	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,
-	0x1d7ce, 0x1d7ff,
-}; /* CR_Nd */
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
-	12,
-	0x16ee, 0x16f0,
-	0x2160, 0x2182,
-	0x2185, 0x2188,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0xa6e6, 0xa6ef,
-	0x10140, 0x10174,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x12400, 0x12462,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
-	41,
-	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,
-	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 */
-static const OnigCodePoint CR_P[] = {
-	133,
-	0x0021, 0x0023,
-	0x0025, 0x002a,
-	0x002c, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005b, 0x005d,
-	0x005f, 0x005f,
-	0x007b, 0x007b,
-	0x007d, 0x007d,
-	0x00a1, 0x00a1,
-	0x00ab, 0x00ab,
-	0x00b7, 0x00b7,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x058a,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f3a, 0x0f3d,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1361, 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,
-	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, 0x2e31,
-	0x3001, 0x3003,
-	0x3008, 0x3011,
-	0x3014, 0x301f,
-	0x3030, 0x3030,
-	0x303d, 0x303d,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xabeb, 0xabeb,
-	0xfd3e, 0xfd3f,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe61,
-	0xfe63, 0xfe63,
-	0xfe68, 0xfe68,
-	0xfe6a, 0xfe6b,
-	0xff01, 0xff03,
-	0xff05, 0xff0a,
-	0xff0c, 0xff0f,
-	0xff1a, 0xff1b,
-	0xff1f, 0xff20,
-	0xff3b, 0xff3d,
-	0xff3f, 0xff3f,
-	0xff5b, 0xff5b,
-	0xff5d, 0xff5d,
-	0xff5f, 0xff65,
-	0x10100, 0x10101,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10b39, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x12470, 0x12473,
-}; /* CR_P */
-
-/* 'Pc': General Category */
-static const OnigCodePoint CR_Pc[] = {
-	6,
-	0x005f, 0x005f,
-	0x203f, 0x2040,
-	0x2054, 0x2054,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xff3f, 0xff3f,
-}; /* CR_Pc */
-
-/* 'Pd': General Category */
-static const OnigCodePoint CR_Pd[] = {
-	15,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
-	70,
-	0x0029, 0x0029,
-	0x005d, 0x005d,
-	0x007d, 0x007d,
-	0x0f3b, 0x0f3b,
-	0x0f3d, 0x0f3d,
-	0x169c, 0x169c,
-	0x2046, 0x2046,
-	0x207e, 0x207e,
-	0x208e, 0x208e,
-	0x232a, 0x232a,
-	0x2769, 0x2769,
-	0x276b, 0x276b,
-	0x276d, 0x276d,
-	0x276f, 0x276f,
-	0x2771, 0x2771,
-	0x2773, 0x2773,
-	0x2775, 0x2775,
-	0x27c6, 0x27c6,
-	0x27e7, 0x27e7,
-	0x27e9, 0x27e9,
-	0x27eb, 0x27eb,
-	0x27ed, 0x27ed,
-	0x27ef, 0x27ef,
-	0x2984, 0x2984,
-	0x2986, 0x2986,
-	0x2988, 0x2988,
-	0x298a, 0x298a,
-	0x298c, 0x298c,
-	0x298e, 0x298e,
-	0x2990, 0x2990,
-	0x2992, 0x2992,
-	0x2994, 0x2994,
-	0x2996, 0x2996,
-	0x2998, 0x2998,
-	0x29d9, 0x29d9,
-	0x29db, 0x29db,
-	0x29fd, 0x29fd,
-	0x2e23, 0x2e23,
-	0x2e25, 0x2e25,
-	0x2e27, 0x2e27,
-	0x2e29, 0x2e29,
-	0x3009, 0x3009,
-	0x300b, 0x300b,
-	0x300d, 0x300d,
-	0x300f, 0x300f,
-	0x3011, 0x3011,
-	0x3015, 0x3015,
-	0x3017, 0x3017,
-	0x3019, 0x3019,
-	0x301b, 0x301b,
-	0x301e, 0x301f,
-	0xfd3f, 0xfd3f,
-	0xfe18, 0xfe18,
-	0xfe36, 0xfe36,
-	0xfe38, 0xfe38,
-	0xfe3a, 0xfe3a,
-	0xfe3c, 0xfe3c,
-	0xfe3e, 0xfe3e,
-	0xfe40, 0xfe40,
-	0xfe42, 0xfe42,
-	0xfe44, 0xfe44,
-	0xfe48, 0xfe48,
-	0xfe5a, 0xfe5a,
-	0xfe5c, 0xfe5c,
-	0xfe5e, 0xfe5e,
-	0xff09, 0xff09,
-	0xff3d, 0xff3d,
-	0xff5d, 0xff5d,
-	0xff60, 0xff60,
-	0xff63, 0xff63,
-}; /* CR_Pe */
-
-/* 'Pf': General Category */
-static const OnigCodePoint CR_Pf[] = {
-	10,
-	0x00bb, 0x00bb,
-	0x2019, 0x2019,
-	0x201d, 0x201d,
-	0x203a, 0x203a,
-	0x2e03, 0x2e03,
-	0x2e05, 0x2e05,
-	0x2e0a, 0x2e0a,
-	0x2e0d, 0x2e0d,
-	0x2e1d, 0x2e1d,
-	0x2e21, 0x2e21,
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
-	11,
-	0x00ab, 0x00ab,
-	0x2018, 0x2018,
-	0x201b, 0x201c,
-	0x201f, 0x201f,
-	0x2039, 0x2039,
-	0x2e02, 0x2e02,
-	0x2e04, 0x2e04,
-	0x2e09, 0x2e09,
-	0x2e0c, 0x2e0c,
-	0x2e1c, 0x2e1c,
-	0x2e20, 0x2e20,
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
-	128,
-	0x0021, 0x0023,
-	0x0025, 0x0027,
-	0x002a, 0x002a,
-	0x002c, 0x002c,
-	0x002e, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005c, 0x005c,
-	0x00a1, 0x00a1,
-	0x00b7, 0x00b7,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x0589,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1361, 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,
-	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, 0x2e31,
-	0x3001, 0x3003,
-	0x303d, 0x303d,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xabeb, 0xabeb,
-	0xfe10, 0xfe16,
-	0xfe19, 0xfe19,
-	0xfe30, 0xfe30,
-	0xfe45, 0xfe46,
-	0xfe49, 0xfe4c,
-	0xfe50, 0xfe52,
-	0xfe54, 0xfe57,
-	0xfe5f, 0xfe61,
-	0xfe68, 0xfe68,
-	0xfe6a, 0xfe6b,
-	0xff01, 0xff03,
-	0xff05, 0xff07,
-	0xff0a, 0xff0a,
-	0xff0c, 0xff0c,
-	0xff0e, 0xff0f,
-	0xff1a, 0xff1b,
-	0xff1f, 0xff20,
-	0xff3c, 0xff3c,
-	0xff61, 0xff61,
-	0xff64, 0xff65,
-	0x10100, 0x10101,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10b39, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x12470, 0x12473,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
-	72,
-	0x0028, 0x0028,
-	0x005b, 0x005b,
-	0x007b, 0x007b,
-	0x0f3a, 0x0f3a,
-	0x0f3c, 0x0f3c,
-	0x169b, 0x169b,
-	0x201a, 0x201a,
-	0x201e, 0x201e,
-	0x2045, 0x2045,
-	0x207d, 0x207d,
-	0x208d, 0x208d,
-	0x2329, 0x2329,
-	0x2768, 0x2768,
-	0x276a, 0x276a,
-	0x276c, 0x276c,
-	0x276e, 0x276e,
-	0x2770, 0x2770,
-	0x2772, 0x2772,
-	0x2774, 0x2774,
-	0x27c5, 0x27c5,
-	0x27e6, 0x27e6,
-	0x27e8, 0x27e8,
-	0x27ea, 0x27ea,
-	0x27ec, 0x27ec,
-	0x27ee, 0x27ee,
-	0x2983, 0x2983,
-	0x2985, 0x2985,
-	0x2987, 0x2987,
-	0x2989, 0x2989,
-	0x298b, 0x298b,
-	0x298d, 0x298d,
-	0x298f, 0x298f,
-	0x2991, 0x2991,
-	0x2993, 0x2993,
-	0x2995, 0x2995,
-	0x2997, 0x2997,
-	0x29d8, 0x29d8,
-	0x29da, 0x29da,
-	0x29fc, 0x29fc,
-	0x2e22, 0x2e22,
-	0x2e24, 0x2e24,
-	0x2e26, 0x2e26,
-	0x2e28, 0x2e28,
-	0x3008, 0x3008,
-	0x300a, 0x300a,
-	0x300c, 0x300c,
-	0x300e, 0x300e,
-	0x3010, 0x3010,
-	0x3014, 0x3014,
-	0x3016, 0x3016,
-	0x3018, 0x3018,
-	0x301a, 0x301a,
-	0x301d, 0x301d,
-	0xfd3e, 0xfd3e,
-	0xfe17, 0xfe17,
-	0xfe35, 0xfe35,
-	0xfe37, 0xfe37,
-	0xfe39, 0xfe39,
-	0xfe3b, 0xfe3b,
-	0xfe3d, 0xfe3d,
-	0xfe3f, 0xfe3f,
-	0xfe41, 0xfe41,
-	0xfe43, 0xfe43,
-	0xfe47, 0xfe47,
-	0xfe59, 0xfe59,
-	0xfe5b, 0xfe5b,
-	0xfe5d, 0xfe5d,
-	0xff08, 0xff08,
-	0xff3b, 0xff3b,
-	0xff5b, 0xff5b,
-	0xff5f, 0xff5f,
-	0xff62, 0xff62,
-}; /* CR_Ps */
-
-/* 'S': Major Category */
-static const OnigCodePoint CR_S[] = {
-	208,
-	0x0024, 0x0024,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00a2, 0x00a9,
-	0x00ac, 0x00ac,
-	0x00ae, 0x00b1,
-	0x00b4, 0x00b4,
-	0x00b6, 0x00b6,
-	0x00b8, 0x00b8,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x03f6, 0x03f6,
-	0x0482, 0x0482,
-	0x0606, 0x0608,
-	0x060b, 0x060b,
-	0x060e, 0x060f,
-	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, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1360, 0x1360,
-	0x1390, 0x1399,
-	0x17db, 0x17db,
-	0x1940, 0x1940,
-	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, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27e5,
-	0x27f0, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2ce5, 0x2cea,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3004, 0x3004,
-	0x3012, 0x3013,
-	0x3020, 0x3020,
-	0x3036, 0x3037,
-	0x303e, 0x303f,
-	0x309b, 0x309c,
-	0x3190, 0x3191,
-	0x3196, 0x319f,
-	0x31c0, 0x31e3,
-	0x3200, 0x321e,
-	0x322a, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa700, 0xa716,
-	0xa720, 0xa721,
-	0xa789, 0xa78a,
-	0xa828, 0xa82b,
-	0xa836, 0xa839,
-	0xaa77, 0xaa79,
-	0xfb29, 0xfb29,
-	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,
-	0x10102, 0x10102,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d6c1, 0x1d6c1,
-	0x1d6db, 0x1d6db,
-	0x1d6fb, 0x1d6fb,
-	0x1d715, 0x1d715,
-	0x1d735, 0x1d735,
-	0x1d74f, 0x1d74f,
-	0x1d76f, 0x1d76f,
-	0x1d789, 0x1d789,
-	0x1d7a9, 0x1d7a9,
-	0x1d7c3, 0x1d7c3,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	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,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
-	16,
-	0x0024, 0x0024,
-	0x00a2, 0x00a5,
-	0x060b, 0x060b,
-	0x09f2, 0x09f3,
-	0x09fb, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0bf9, 0x0bf9,
-	0x0e3f, 0x0e3f,
-	0x17db, 0x17db,
-	0x20a0, 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[] = {
-	66,
-	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, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27e5,
-	0x27f0, 0x27ff,
-	0x2900, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	0xfb29, 0xfb29,
-	0xfe62, 0xfe62,
-	0xfe64, 0xfe66,
-	0xff0b, 0xff0b,
-	0xff1c, 0xff1e,
-	0xff5c, 0xff5c,
-	0xff5e, 0xff5e,
-	0xffe2, 0xffe2,
-	0xffe9, 0xffec,
-	0x1d6c1, 0x1d6c1,
-	0x1d6db, 0x1d6db,
-	0x1d6fb, 0x1d6fb,
-	0x1d715, 0x1d715,
-	0x1d735, 0x1d735,
-	0x1d74f, 0x1d74f,
-	0x1d76f, 0x1d76f,
-	0x1d789, 0x1d789,
-	0x1d7a9, 0x1d7a9,
-	0x1d7c3, 0x1d7c3,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
-	164,
-	0x00a6, 0x00a7,
-	0x00a9, 0x00a9,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b0,
-	0x00b6, 0x00b6,
-	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, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1360, 0x1360,
-	0x1390, 0x1399,
-	0x1940, 0x1940,
-	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, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa828, 0xa82b,
-	0xa836, 0xa837,
-	0xa839, 0xa839,
-	0xaa77, 0xaa79,
-	0xfdfd, 0xfdfd,
-	0xffe4, 0xffe4,
-	0xffe8, 0xffe8,
-	0xffed, 0xffee,
-	0xfffc, 0xfffd,
-	0x10102, 0x10102,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	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,
-}; /* 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[] = {
-	106,
-	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, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27ff,
-	0x2900, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	0xfb29, 0xfb29,
-	0xfe61, 0xfe66,
-	0xfe68, 0xfe68,
-	0xff0b, 0xff0b,
-	0xff1c, 0xff1e,
-	0xff3c, 0xff3c,
-	0xff3e, 0xff3e,
-	0xff5c, 0xff5c,
-	0xff5e, 0xff5e,
-	0xffe2, 0xffe2,
-	0xffe9, 0xffec,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a5,
-	0x1d6a8, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-}; /* CR_Math */
-
-/* 'Alphabetic': Derived Property */
-static const OnigCodePoint CR_Alphabetic[] = {
-	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,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x135f, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b80, 0x1ba9,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11082, 0x110b8,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Alphabetic */
-
-/* 'Lowercase': Derived Property */
-static const OnigCodePoint CR_Lowercase[] = {
-	612,
-	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,
-	0x2090, 0x2094,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7d,
-	0x2c81, 0x2c81,
-	0x2c83, 0x2c83,
-	0x2c85, 0x2c85,
-	0x2c87, 0x2c87,
-	0x2c89, 0x2c89,
-	0x2c8b, 0x2c8b,
-	0x2c8d, 0x2c8d,
-	0x2c8f, 0x2c8f,
-	0x2c91, 0x2c91,
-	0x2c93, 0x2c93,
-	0x2c95, 0x2c95,
-	0x2c97, 0x2c97,
-	0x2c99, 0x2c99,
-	0x2c9b, 0x2c9b,
-	0x2c9d, 0x2c9d,
-	0x2c9f, 0x2c9f,
-	0x2ca1, 0x2ca1,
-	0x2ca3, 0x2ca3,
-	0x2ca5, 0x2ca5,
-	0x2ca7, 0x2ca7,
-	0x2ca9, 0x2ca9,
-	0x2cab, 0x2cab,
-	0x2cad, 0x2cad,
-	0x2caf, 0x2caf,
-	0x2cb1, 0x2cb1,
-	0x2cb3, 0x2cb3,
-	0x2cb5, 0x2cb5,
-	0x2cb7, 0x2cb7,
-	0x2cb9, 0x2cb9,
-	0x2cbb, 0x2cbb,
-	0x2cbd, 0x2cbd,
-	0x2cbf, 0x2cbf,
-	0x2cc1, 0x2cc1,
-	0x2cc3, 0x2cc3,
-	0x2cc5, 0x2cc5,
-	0x2cc7, 0x2cc7,
-	0x2cc9, 0x2cc9,
-	0x2ccb, 0x2ccb,
-	0x2ccd, 0x2ccd,
-	0x2ccf, 0x2ccf,
-	0x2cd1, 0x2cd1,
-	0x2cd3, 0x2cd3,
-	0x2cd5, 0x2cd5,
-	0x2cd7, 0x2cd7,
-	0x2cd9, 0x2cd9,
-	0x2cdb, 0x2cdb,
-	0x2cdd, 0x2cdd,
-	0x2cdf, 0x2cdf,
-	0x2ce1, 0x2ce1,
-	0x2ce3, 0x2ce4,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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_Lowercase */
-
-/* 'Uppercase': Derived Property */
-static const OnigCodePoint CR_Uppercase[] = {
-	605,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1fb8, 0x1fbb,
-	0x1fc8, 0x1fcb,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffb,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210b, 0x210d,
-	0x2110, 0x2112,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x2130, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x1d400, 0x1d419,
-	0x1d434, 0x1d44d,
-	0x1d468, 0x1d481,
-	0x1d49c, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b5,
-	0x1d4d0, 0x1d4e9,
-	0x1d504, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d538, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d56c, 0x1d585,
-	0x1d5a0, 0x1d5b9,
-	0x1d5d4, 0x1d5ed,
-	0x1d608, 0x1d621,
-	0x1d63c, 0x1d655,
-	0x1d670, 0x1d689,
-	0x1d6a8, 0x1d6c0,
-	0x1d6e2, 0x1d6fa,
-	0x1d71c, 0x1d734,
-	0x1d756, 0x1d76e,
-	0x1d790, 0x1d7a8,
-	0x1d7ca, 0x1d7ca,
-}; /* CR_Uppercase */
-
-/* 'Cased': Derived Property */
-static const OnigCodePoint CR_Cased[] = {
-	112,
-	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,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2090, 0x2094,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	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_Cased */
-
-/* 'Case_Ignorable': Derived Property */
-static const OnigCodePoint CR_Case_Ignorable[] = {
-	277,
-	0x0027, 0x0027,
-	0x002e, 0x002e,
-	0x003a, 0x003a,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00ad, 0x00ad,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0387, 0x0387,
-	0x0483, 0x0489,
-	0x0559, 0x0559,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05f4, 0x05f4,
-	0x0600, 0x0603,
-	0x0610, 0x061a,
-	0x0640, 0x0640,
-	0x064b, 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,
-	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,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1d2c, 0x1d61,
-	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,
-	0x2c7d, 0x2c7d,
-	0x2cef, 0x2cf1,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x302a, 0x302f,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x3099, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa66f, 0xa672,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa6f0, 0xa6f1,
-	0xa700, 0xa721,
-	0xa770, 0xa770,
-	0xa788, 0xa78a,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9cf, 0xa9cf,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa70, 0xaa70,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaadd, 0xaadd,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	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,
-	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[] = {
-	566,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f88, 0x1f8f,
-	0x1f98, 0x1f9f,
-	0x1fa8, 0x1faf,
-	0x1fb8, 0x1fbc,
-	0x1fc8, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-}; /* CR_Changes_When_Lowercased */
-
-/* 'Changes_When_Uppercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	582,
-	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, 0x0265,
-	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,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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[] = {
-	583,
-	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, 0x0265,
-	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,
-	0x2d00, 0x2d25,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	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,
-	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[] = {
-	577,
-	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,
-	0x1e00, 0x1e00,
-	0x1e02, 0x1e02,
-	0x1e04, 0x1e04,
-	0x1e06, 0x1e06,
-	0x1e08, 0x1e08,
-	0x1e0a, 0x1e0a,
-	0x1e0c, 0x1e0c,
-	0x1e0e, 0x1e0e,
-	0x1e10, 0x1e10,
-	0x1e12, 0x1e12,
-	0x1e14, 0x1e14,
-	0x1e16, 0x1e16,
-	0x1e18, 0x1e18,
-	0x1e1a, 0x1e1a,
-	0x1e1c, 0x1e1c,
-	0x1e1e, 0x1e1e,
-	0x1e20, 0x1e20,
-	0x1e22, 0x1e22,
-	0x1e24, 0x1e24,
-	0x1e26, 0x1e26,
-	0x1e28, 0x1e28,
-	0x1e2a, 0x1e2a,
-	0x1e2c, 0x1e2c,
-	0x1e2e, 0x1e2e,
-	0x1e30, 0x1e30,
-	0x1e32, 0x1e32,
-	0x1e34, 0x1e34,
-	0x1e36, 0x1e36,
-	0x1e38, 0x1e38,
-	0x1e3a, 0x1e3a,
-	0x1e3c, 0x1e3c,
-	0x1e3e, 0x1e3e,
-	0x1e40, 0x1e40,
-	0x1e42, 0x1e42,
-	0x1e44, 0x1e44,
-	0x1e46, 0x1e46,
-	0x1e48, 0x1e48,
-	0x1e4a, 0x1e4a,
-	0x1e4c, 0x1e4c,
-	0x1e4e, 0x1e4e,
-	0x1e50, 0x1e50,
-	0x1e52, 0x1e52,
-	0x1e54, 0x1e54,
-	0x1e56, 0x1e56,
-	0x1e58, 0x1e58,
-	0x1e5a, 0x1e5a,
-	0x1e5c, 0x1e5c,
-	0x1e5e, 0x1e5e,
-	0x1e60, 0x1e60,
-	0x1e62, 0x1e62,
-	0x1e64, 0x1e64,
-	0x1e66, 0x1e66,
-	0x1e68, 0x1e68,
-	0x1e6a, 0x1e6a,
-	0x1e6c, 0x1e6c,
-	0x1e6e, 0x1e6e,
-	0x1e70, 0x1e70,
-	0x1e72, 0x1e72,
-	0x1e74, 0x1e74,
-	0x1e76, 0x1e76,
-	0x1e78, 0x1e78,
-	0x1e7a, 0x1e7a,
-	0x1e7c, 0x1e7c,
-	0x1e7e, 0x1e7e,
-	0x1e80, 0x1e80,
-	0x1e82, 0x1e82,
-	0x1e84, 0x1e84,
-	0x1e86, 0x1e86,
-	0x1e88, 0x1e88,
-	0x1e8a, 0x1e8a,
-	0x1e8c, 0x1e8c,
-	0x1e8e, 0x1e8e,
-	0x1e90, 0x1e90,
-	0x1e92, 0x1e92,
-	0x1e94, 0x1e94,
-	0x1e9a, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1ea0,
-	0x1ea2, 0x1ea2,
-	0x1ea4, 0x1ea4,
-	0x1ea6, 0x1ea6,
-	0x1ea8, 0x1ea8,
-	0x1eaa, 0x1eaa,
-	0x1eac, 0x1eac,
-	0x1eae, 0x1eae,
-	0x1eb0, 0x1eb0,
-	0x1eb2, 0x1eb2,
-	0x1eb4, 0x1eb4,
-	0x1eb6, 0x1eb6,
-	0x1eb8, 0x1eb8,
-	0x1eba, 0x1eba,
-	0x1ebc, 0x1ebc,
-	0x1ebe, 0x1ebe,
-	0x1ec0, 0x1ec0,
-	0x1ec2, 0x1ec2,
-	0x1ec4, 0x1ec4,
-	0x1ec6, 0x1ec6,
-	0x1ec8, 0x1ec8,
-	0x1eca, 0x1eca,
-	0x1ecc, 0x1ecc,
-	0x1ece, 0x1ece,
-	0x1ed0, 0x1ed0,
-	0x1ed2, 0x1ed2,
-	0x1ed4, 0x1ed4,
-	0x1ed6, 0x1ed6,
-	0x1ed8, 0x1ed8,
-	0x1eda, 0x1eda,
-	0x1edc, 0x1edc,
-	0x1ede, 0x1ede,
-	0x1ee0, 0x1ee0,
-	0x1ee2, 0x1ee2,
-	0x1ee4, 0x1ee4,
-	0x1ee6, 0x1ee6,
-	0x1ee8, 0x1ee8,
-	0x1eea, 0x1eea,
-	0x1eec, 0x1eec,
-	0x1eee, 0x1eee,
-	0x1ef0, 0x1ef0,
-	0x1ef2, 0x1ef2,
-	0x1ef4, 0x1ef4,
-	0x1ef6, 0x1ef6,
-	0x1ef8, 0x1ef8,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f80, 0x1faf,
-	0x1fb2, 0x1fb4,
-	0x1fb7, 0x1fbc,
-	0x1fc2, 0x1fc4,
-	0x1fc7, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff7, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 0x2c80,
-	0x2c82, 0x2c82,
-	0x2c84, 0x2c84,
-	0x2c86, 0x2c86,
-	0x2c88, 0x2c88,
-	0x2c8a, 0x2c8a,
-	0x2c8c, 0x2c8c,
-	0x2c8e, 0x2c8e,
-	0x2c90, 0x2c90,
-	0x2c92, 0x2c92,
-	0x2c94, 0x2c94,
-	0x2c96, 0x2c96,
-	0x2c98, 0x2c98,
-	0x2c9a, 0x2c9a,
-	0x2c9c, 0x2c9c,
-	0x2c9e, 0x2c9e,
-	0x2ca0, 0x2ca0,
-	0x2ca2, 0x2ca2,
-	0x2ca4, 0x2ca4,
-	0x2ca6, 0x2ca6,
-	0x2ca8, 0x2ca8,
-	0x2caa, 0x2caa,
-	0x2cac, 0x2cac,
-	0x2cae, 0x2cae,
-	0x2cb0, 0x2cb0,
-	0x2cb2, 0x2cb2,
-	0x2cb4, 0x2cb4,
-	0x2cb6, 0x2cb6,
-	0x2cb8, 0x2cb8,
-	0x2cba, 0x2cba,
-	0x2cbc, 0x2cbc,
-	0x2cbe, 0x2cbe,
-	0x2cc0, 0x2cc0,
-	0x2cc2, 0x2cc2,
-	0x2cc4, 0x2cc4,
-	0x2cc6, 0x2cc6,
-	0x2cc8, 0x2cc8,
-	0x2cca, 0x2cca,
-	0x2ccc, 0x2ccc,
-	0x2cce, 0x2cce,
-	0x2cd0, 0x2cd0,
-	0x2cd2, 0x2cd2,
-	0x2cd4, 0x2cd4,
-	0x2cd6, 0x2cd6,
-	0x2cd8, 0x2cd8,
-	0x2cda, 0x2cda,
-	0x2cdc, 0x2cdc,
-	0x2cde, 0x2cde,
-	0x2ce0, 0x2ce0,
-	0x2ce2, 0x2ce2,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	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,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-}; /* CR_Changes_When_Casefolded */
-
-/* 'Changes_When_Casemapped': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	99,
-	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, 0x0265,
-	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,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	0x1e00, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c70,
-	0x2c72, 0x2c73,
-	0x2c75, 0x2c76,
-	0x2c7e, 0x2ce3,
-	0x2ceb, 0x2cee,
-	0x2d00, 0x2d25,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa72f,
-	0xa732, 0xa76f,
-	0xa779, 0xa787,
-	0xa78b, 0xa78d,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-}; /* CR_Changes_When_Casemapped */
-
-/* 'ID_Start': Derived Property */
-static const OnigCodePoint CR_ID_Start[] = {
-	437,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309b, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_ID_Start */
-
-/* 'ID_Continue': Derived Property */
-static const OnigCodePoint CR_ID_Continue[] = {
-	514,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	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, 0x17b3,
-	0x17b6, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf2,
-	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, 0x2cf1,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	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, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff3f, 0xff3f,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_ID_Continue */
-
-/* 'XID_Start': Derived Property */
-static const OnigCodePoint CR_XID_Start[] = {
-	444,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bc0, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xff9d,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_XID_Start */
-
-/* 'XID_Continue': Derived Property */
-static const OnigCodePoint CR_XID_Continue[] = {
-	521,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	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, 0x17b3,
-	0x17b6, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf2,
-	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, 0x2cf1,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	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, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff3f, 0xff3f,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	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[] = {
-	215,
-	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,
-	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,
-	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,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa67c, 0xa67d,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xff9e, 0xff9f,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x1d165, 0x1d165,
-	0x1d167, 0x1d169,
-	0x1d16e, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_Grapheme_Extend */
-
-/* 'Grapheme_Base': Derived Property */
-static const OnigCodePoint CR_Grapheme_Base[] = {
-	596,
-	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,
-	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,
-	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, 0x0aef,
-	0x0af1, 0x0af1,
-	0x0b02, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b3d,
-	0x0b40, 0x0b40,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 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, 0x0edd,
-	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,
-	0x10d0, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x1360, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1735, 0x1736,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x17d4, 0x17dc,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1800, 0x180a,
-	0x180e, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a16,
-	0x1a19, 0x1a1b,
-	0x1a1e, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a61, 0x1a61,
-	0x1a63, 0x1a64,
-	0x1a6d, 0x1a72,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b04, 0x1b33,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b4b,
-	0x1b50, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x1b82, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1be5,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1bfc, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fc4,
-	0x1fc6, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fdd, 0x1fef,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffe,
-	0x2000, 0x200a,
-	0x2010, 0x2027,
-	0x202f, 0x205f,
-	0x2070, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cee,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d70,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e00, 0x2e31,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3029,
-	0x3030, 0x303f,
-	0x3041, 0x3096,
-	0x309b, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa66e,
-	0xa673, 0xa673,
-	0xa67e, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa6f2, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa824,
-	0xa827, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c3,
-	0xa8ce, 0xa8d9,
-	0xa8f2, 0xa8fb,
-	0xa900, 0xa925,
-	0xa92e, 0xa946,
-	0xa952, 0xa953,
-	0xa95f, 0xa97c,
-	0xa983, 0xa9b2,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa28,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa4d, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadf,
-	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, 0xfa2d,
-	0xfa30, 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,
-	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,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Grapheme_Base */
-
-/* 'Grapheme_Link': Derived Property */
-static const OnigCodePoint CR_Grapheme_Link[] = {
-	29,
-	0x094d, 0x094d,
-	0x09cd, 0x09cd,
-	0x0a4d, 0x0a4d,
-	0x0acd, 0x0acd,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e3a, 0x0e3a,
-	0x0f84, 0x0f84,
-	0x1039, 0x103a,
-	0x1714, 0x1714,
-	0x1734, 0x1734,
-	0x17d2, 0x17d2,
-	0x1a60, 0x1a60,
-	0x1b44, 0x1b44,
-	0x1baa, 0x1baa,
-	0x1bf2, 0x1bf3,
-	0x2d7f, 0x2d7f,
-	0xa806, 0xa806,
-	0xa8c4, 0xa8c4,
-	0xa953, 0xa953,
-	0xa9c0, 0xa9c0,
-	0xabed, 0xabed,
-	0x10a3f, 0x10a3f,
-	0x11046, 0x11046,
-	0x110b9, 0x110b9,
-}; /* CR_Grapheme_Link */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
-	169,
-	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,
-	0x0970, 0x0970,
-	0x0e3f, 0x0e3f,
-	0x0fd5, 0x0fd8,
-	0x10fb, 0x10fb,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x1802, 0x1803,
-	0x1805, 0x1805,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x2000, 0x200b,
-	0x200e, 0x2064,
-	0x206a, 0x2070,
-	0x2074, 0x207e,
-	0x2080, 0x208e,
-	0x20a0, 0x20b9,
-	0x2100, 0x2125,
-	0x2127, 0x2129,
-	0x212c, 0x2131,
-	0x2133, 0x214d,
-	0x214f, 0x215f,
-	0x2189, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x27ff,
-	0x2900, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2e00, 0x2e31,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3004,
-	0x3006, 0x3006,
-	0x3008, 0x3020,
-	0x3030, 0x3037,
-	0x303c, 0x303f,
-	0x309b, 0x309c,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fc,
-	0x3190, 0x319f,
-	0x31c0, 0x31e3,
-	0x3220, 0x325f,
-	0x327f, 0x32cf,
-	0x3358, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa700, 0xa721,
-	0xa788, 0xa78a,
-	0xa830, 0xa839,
-	0xfd3e, 0xfd3f,
-	0xfdfd, 0xfdfd,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfeff, 0xfeff,
-	0xff01, 0xff20,
-	0xff3b, 0xff40,
-	0xff5b, 0xff65,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1013f,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d166,
-	0x1d16a, 0x1d17a,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a5,
-	0x1d6a8, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f169,
-	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,
-	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,
-	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, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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, 0xa673,
-	0xa67c, 0xa697,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
-	5,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x058a, 0x058a,
-	0xfb13, 0xfb17,
-}; /* CR_Armenian */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
-	9,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfb4f,
-}; /* CR_Hebrew */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
-	19,
-	0x0600, 0x0603,
-	0x0606, 0x060b,
-	0x060d, 0x061a,
-	0x061e, 0x061e,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x0656, 0x065e,
-	0x066a, 0x066f,
-	0x0671, 0x06dc,
-	0x06de, 0x06ff,
-	0x0750, 0x077f,
-	0xfb50, 0xfbc1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfc,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0x10e60, 0x10e7e,
-}; /* CR_Arabic */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
-	3,
-	0x0700, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-}; /* CR_Syriac */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
-	1,
-	0x0780, 0x07b1,
-}; /* CR_Thaana */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
-	6,
-	0x0900, 0x0950,
-	0x0953, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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[] = {
-	14,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae3,
-	0x0ae6, 0x0aef,
-	0x0af1, 0x0af1,
-}; /* CR_Gujarati */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
-	14,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 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, 0x0edd,
-}; /* 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[] = {
-	4,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x2d00, 0x2d25,
-}; /* 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[] = {
-	16,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x3005, 0x3005,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303b,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	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[] = {
-	24,
-	0x0300, 0x036f,
-	0x0485, 0x0486,
-	0x064b, 0x0655,
-	0x065f, 0x065f,
-	0x0670, 0x0670,
-	0x0951, 0x0952,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	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, 0x2cf1,
-	0x2cf9, 0x2cff,
-}; /* CR_Coptic */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
-	4,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x19df,
-}; /* CR_New_Tai_Lue */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
-	2,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
-	3,
-	0x2d30, 0x2d65,
-	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, 0x1baa,
-	0x1bae, 0x1bb9,
-}; /* CR_Sundanese */
-
-/* 'Lepcha': Script */
-static const OnigCodePoint CR_Lepcha[] = {
-	3,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c4f,
-}; /* CR_Lepcha */
-
-/* 'Ol_Chiki': Script */
-static const OnigCodePoint CR_Ol_Chiki[] = {
-	1,
-	0x1c50, 0x1c7f,
-}; /* CR_Ol_Chiki */
-
-/* 'Vai': Script */
-static const OnigCodePoint CR_Vai[] = {
-	1,
-	0xa500, 0xa62b,
-}; /* CR_Vai */
-
-/* 'Saurashtra': Script */
-static const OnigCodePoint CR_Saurashtra[] = {
-	2,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
-	1,
-	0xa900, 0xa92f,
-}; /* CR_Kayah_Li */
-
-/* 'Rejang': Script */
-static const OnigCodePoint CR_Rejang[] = {
-	2,
-	0xa930, 0xa953,
-	0xa95f, 0xa95f,
-}; /* CR_Rejang */
-
-/* 'Lycian': Script */
-static const OnigCodePoint CR_Lycian[] = {
-	1,
-	0x10280, 0x1029c,
-}; /* CR_Lycian */
-
-/* 'Carian': Script */
-static const OnigCodePoint CR_Carian[] = {
-	1,
-	0x102a0, 0x102d0,
-}; /* CR_Carian */
-
-/* 'Lydian': Script */
-static const OnigCodePoint CR_Lydian[] = {
-	2,
-	0x10920, 0x10939,
-	0x1093f, 0x1093f,
-}; /* CR_Lydian */
-
-/* 'Cham': Script */
-static const OnigCodePoint CR_Cham[] = {
-	4,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-}; /* CR_Cham */
-
-/* 'Tai_Tham': Script */
-static const OnigCodePoint CR_Tai_Tham[] = {
-	5,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-}; /* CR_Tai_Tham */
-
-/* 'Tai_Viet': Script */
-static const OnigCodePoint CR_Tai_Viet[] = {
-	2,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-}; /* CR_Tai_Viet */
-
-/* 'Avestan': Script */
-static const OnigCodePoint CR_Avestan[] = {
-	2,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b3f,
-}; /* CR_Avestan */
-
-/* 'Egyptian_Hieroglyphs': Script */
-static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342e,
-}; /* CR_Egyptian_Hieroglyphs */
-
-/* 'Samaritan': Script */
-static const OnigCodePoint CR_Samaritan[] = {
-	2,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-}; /* CR_Samaritan */
-
-/* 'Lisu': Script */
-static const OnigCodePoint CR_Lisu[] = {
-	1,
-	0xa4d0, 0xa4ff,
-}; /* CR_Lisu */
-
-/* 'Bamum': Script */
-static const OnigCodePoint CR_Bamum[] = {
-	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[] = {
-	2,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-}; /* CR_Meetei_Mayek */
-
-/* 'Imperial_Aramaic': Script */
-static const OnigCodePoint CR_Imperial_Aramaic[] = {
-	2,
-	0x10840, 0x10855,
-	0x10857, 0x1085f,
-}; /* CR_Imperial_Aramaic */
-
-/* 'Old_South_Arabian': Script */
-static const OnigCodePoint CR_Old_South_Arabian[] = {
-	1,
-	0x10a60, 0x10a7f,
-}; /* CR_Old_South_Arabian */
-
-/* 'Inscriptional_Parthian': Script */
-static const OnigCodePoint CR_Inscriptional_Parthian[] = {
-	2,
-	0x10b40, 0x10b55,
-	0x10b58, 0x10b5f,
-}; /* CR_Inscriptional_Parthian */
-
-/* 'Inscriptional_Pahlavi': Script */
-static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
-	2,
-	0x10b60, 0x10b72,
-	0x10b78, 0x10b7f,
-}; /* CR_Inscriptional_Pahlavi */
-
-/* 'Old_Turkic': Script */
-static const OnigCodePoint CR_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c48,
-}; /* CR_Old_Turkic */
-
-/* 'Kaithi': Script */
-static const OnigCodePoint CR_Kaithi[] = {
-	1,
-	0x11080, 0x110c1,
-}; /* CR_Kaithi */
-
-/* '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 */
-
-/* 'White_Space': Binary Property */
-static const OnigCodePoint CR_White_Space[] = {
-	11,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x180e, 0x180e,
-	0x2000, 0x200a,
-	0x2028, 0x2029,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_White_Space */
-
-/* 'Bidi_Control': Binary Property */
-static const OnigCodePoint CR_Bidi_Control[] = {
-	2,
-	0x200e, 0x200f,
-	0x202a, 0x202e,
-}; /* CR_Bidi_Control */
-
-/* 'Join_Control': Binary Property */
-static const OnigCodePoint CR_Join_Control[] = {
-	1,
-	0x200c, 0x200d,
-}; /* CR_Join_Control */
-
-/* 'Dash': Binary Property */
-static const OnigCodePoint CR_Dash[] = {
-	19,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2053, 0x2053,
-	0x207b, 0x207b,
-	0x208b, 0x208b,
-	0x2212, 0x2212,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Dash */
-
-/* 'Hyphen': Binary Property */
-static const OnigCodePoint CR_Hyphen[] = {
-	10,
-	0x002d, 0x002d,
-	0x00ad, 0x00ad,
-	0x058a, 0x058a,
-	0x1806, 0x1806,
-	0x2010, 0x2011,
-	0x2e17, 0x2e17,
-	0x30fb, 0x30fb,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-	0xff65, 0xff65,
-}; /* CR_Hyphen */
-
-/* 'Quotation_Mark': Binary Property */
-static const OnigCodePoint CR_Quotation_Mark[] = {
-	12,
-	0x0022, 0x0022,
-	0x0027, 0x0027,
-	0x00ab, 0x00ab,
-	0x00bb, 0x00bb,
-	0x2018, 0x201f,
-	0x2039, 0x203a,
-	0x300c, 0x300f,
-	0x301d, 0x301f,
-	0xfe41, 0xfe44,
-	0xff02, 0xff02,
-	0xff07, 0xff07,
-	0xff62, 0xff63,
-}; /* CR_Quotation_Mark */
-
-/* 'Terminal_Punctuation': Binary Property */
-static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	67,
-	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,
-	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,
-	0x12470, 0x12473,
-}; /* CR_Terminal_Punctuation */
-
-/* 'Other_Math': Binary Property */
-static const OnigCodePoint CR_Other_Math[] = {
-	100,
-	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,
-}; /* CR_Other_Math */
-
-/* 'Hex_Digit': Binary Property */
-static const OnigCodePoint CR_Hex_Digit[] = {
-	6,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-	0xff10, 0xff19,
-	0xff21, 0xff26,
-	0xff41, 0xff46,
-}; /* CR_Hex_Digit */
-
-/* 'ASCII_Hex_Digit': Binary Property */
-static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
-	3,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-}; /* CR_ASCII_Hex_Digit */
-
-/* 'Other_Alphabetic': Binary Property */
-static const OnigCodePoint CR_Other_Alphabetic[] = {
-	145,
-	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,
-	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,
-	0x1be7, 0x1bf1,
-	0x1c24, 0x1c35,
-	0x1cf2, 0x1cf2,
-	0x24b6, 0x24e9,
-	0x2de0, 0x2dff,
-	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,
-	0xabe3, 0xabea,
-	0xfb1e, 0xfb1e,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x11000, 0x11002,
-	0x11038, 0x11045,
-	0x11082, 0x11082,
-	0x110b0, 0x110b8,
-}; /* CR_Other_Alphabetic */
-
-/* 'Ideographic': Binary Property */
-static const OnigCodePoint CR_Ideographic[] = {
-	12,
-	0x3006, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Ideographic */
-
-/* 'Diacritic': Binary Property */
-static const OnigCodePoint CR_Diacritic[] = {
-	117,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x034e,
-	0x0350, 0x0357,
-	0x035d, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0483, 0x0487,
-	0x0559, 0x0559,
-	0x0591, 0x05a1,
-	0x05a3, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c4,
-	0x064b, 0x0652,
-	0x0657, 0x0658,
-	0x06df, 0x06e0,
-	0x06e5, 0x06e6,
-	0x06ea, 0x06ec,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x0818, 0x0819,
-	0x093c, 0x093c,
-	0x094d, 0x094d,
-	0x0951, 0x0954,
-	0x0971, 0x0971,
-	0x09bc, 0x09bc,
-	0x09cd, 0x09cd,
-	0x0a3c, 0x0a3c,
-	0x0a4d, 0x0a4d,
-	0x0abc, 0x0abc,
-	0x0acd, 0x0acd,
-	0x0b3c, 0x0b3c,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0cbc, 0x0cbc,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e47, 0x0e4c,
-	0x0e4e, 0x0e4e,
-	0x0ec8, 0x0ecc,
-	0x0f18, 0x0f19,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f3f,
-	0x0f82, 0x0f84,
-	0x0f86, 0x0f87,
-	0x0fc6, 0x0fc6,
-	0x1037, 0x1037,
-	0x1039, 0x103a,
-	0x1087, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109b,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x1939, 0x193b,
-	0x1a75, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b34, 0x1b34,
-	0x1b44, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1baa, 0x1baa,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1d2c, 0x1d6a,
-	0x1dc4, 0x1dcf,
-	0x1dfd, 0x1dff,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x2cef, 0x2cf1,
-	0x2e2f, 0x2e2f,
-	0x302a, 0x302f,
-	0x3099, 0x309c,
-	0x30fc, 0x30fc,
-	0xa66f, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa6f0, 0xa6f1,
-	0xa717, 0xa721,
-	0xa788, 0xa788,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa92b, 0xa92e,
-	0xa953, 0xa953,
-	0xa9b3, 0xa9b3,
-	0xa9c0, 0xa9c0,
-	0xaa7b, 0xaa7b,
-	0xaabf, 0xaac2,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe20, 0xfe26,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0x110b9, 0x110ba,
-	0x1d167, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-}; /* CR_Diacritic */
-
-/* 'Extender': Binary Property */
-static const OnigCodePoint CR_Extender[] = {
-	20,
-	0x00b7, 0x00b7,
-	0x02d0, 0x02d1,
-	0x0640, 0x0640,
-	0x07fa, 0x07fa,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c36, 0x1c36,
-	0x1c7b, 0x1c7b,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa60c, 0xa60c,
-	0xa9cf, 0xa9cf,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xff70, 0xff70,
-}; /* CR_Extender */
-
-/* 'Other_Lowercase': Binary Property */
-static const OnigCodePoint CR_Other_Lowercase[] = {
-	13,
-	0x02b0, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x037a, 0x037a,
-	0x1d2c, 0x1d61,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2090, 0x2094,
-	0x2170, 0x217f,
-	0x24d0, 0x24e9,
-	0x2c7d, 0x2c7d,
-	0xa770, 0xa770,
-}; /* CR_Other_Lowercase */
-
-/* 'Other_Uppercase': Binary Property */
-static const OnigCodePoint CR_Other_Uppercase[] = {
-	2,
-	0x2160, 0x216f,
-	0x24b6, 0x24cf,
-}; /* CR_Other_Uppercase */
-
-/* 'Noncharacter_Code_Point': Binary Property */
-static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
-	18,
-	0xfdd0, 0xfdef,
-	0xfffe, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0xeffff,
-	0xffffe, 0xfffff,
-	0x10fffe, 0x10ffff,
-}; /* CR_Noncharacter_Code_Point */
-
-/* 'Other_Grapheme_Extend': Binary Property */
-static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
-	16,
-	0x09be, 0x09be,
-	0x09d7, 0x09d7,
-	0x0b3e, 0x0b3e,
-	0x0b57, 0x0b57,
-	0x0bbe, 0x0bbe,
-	0x0bd7, 0x0bd7,
-	0x0cc2, 0x0cc2,
-	0x0cd5, 0x0cd6,
-	0x0d3e, 0x0d3e,
-	0x0d57, 0x0d57,
-	0x0dcf, 0x0dcf,
-	0x0ddf, 0x0ddf,
-	0x200c, 0x200d,
-	0xff9e, 0xff9f,
-	0x1d165, 0x1d165,
-	0x1d16e, 0x1d172,
-}; /* CR_Other_Grapheme_Extend */
-
-/* 'IDS_Binary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Binary_Operator[] = {
-	2,
-	0x2ff0, 0x2ff1,
-	0x2ff4, 0x2ffb,
-}; /* CR_IDS_Binary_Operator */
-
-/* 'IDS_Trinary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
-	1,
-	0x2ff2, 0x2ff3,
-}; /* CR_IDS_Trinary_Operator */
-
-/* 'Radical': Binary Property */
-static const OnigCodePoint CR_Radical[] = {
-	3,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-}; /* CR_Radical */
-
-/* 'Unified_Ideograph': Binary Property */
-static const OnigCodePoint CR_Unified_Ideograph[] = {
-	12,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	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[] = {
-	10,
-	0x034f, 0x034f,
-	0x115f, 0x1160,
-	0x2065, 0x2069,
-	0x3164, 0x3164,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0xe0000, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xe0fff,
-}; /* CR_Other_Default_Ignorable_Code_Point */
-
-/* 'Deprecated': Binary Property */
-static const OnigCodePoint CR_Deprecated[] = {
-	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[] = {
-	47,
-	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,
-	0xabeb, 0xabeb,
-	0xfe52, 0xfe52,
-	0xfe56, 0xfe57,
-	0xff01, 0xff01,
-	0xff0e, 0xff0e,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0x10a56, 0x10a57,
-	0x11047, 0x11048,
-	0x110be, 0x110c1,
-}; /* CR_STerm */
-
-/* 'Variation_Selector': Binary Property */
-static const OnigCodePoint CR_Variation_Selector[] = {
-	3,
-	0x180b, 0x180d,
-	0xfe00, 0xfe0f,
-	0xe0100, 0xe01ef,
-}; /* CR_Variation_Selector */
-
-/* 'Pattern_White_Space': Binary Property */
-static const OnigCodePoint CR_Pattern_White_Space[] = {
-	5,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x200e, 0x200f,
-	0x2028, 0x2029,
-}; /* CR_Pattern_White_Space */
-
-/* 'Pattern_Syntax': Binary Property */
-static const OnigCodePoint CR_Pattern_Syntax[] = {
-	28,
-	0x0021, 0x002f,
-	0x003a, 0x0040,
-	0x005b, 0x005e,
-	0x0060, 0x0060,
-	0x007b, 0x007e,
-	0x00a1, 0x00a7,
-	0x00a9, 0x00a9,
-	0x00ab, 0x00ac,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b1,
-	0x00b6, 0x00b6,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x2010, 0x2027,
-	0x2030, 0x203e,
-	0x2041, 0x2053,
-	0x2055, 0x205e,
-	0x2190, 0x245f,
-	0x2500, 0x2775,
-	0x2794, 0x2bff,
-	0x2e00, 0x2e7f,
-	0x3001, 0x3003,
-	0x3008, 0x3020,
-	0x3030, 0x3030,
-	0xfd3e, 0xfd3f,
-	0xfe45, 0xfe46,
-}; /* CR_Pattern_Syntax */
-
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
-	499,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x0604, 0x0605,
-	0x061c, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 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,
-	0x0af0, 0x0af0,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	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,
-	0x0ede, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10cf,
-	0x10fd, 0x10ff,
-	0x1249, 0x1249,
-	0x124e, 0x124f,
-	0x1257, 0x1257,
-	0x1259, 0x1259,
-	0x125e, 0x125f,
-	0x1289, 0x1289,
-	0x128e, 0x128f,
-	0x12b1, 0x12b1,
-	0x12b6, 0x12b7,
-	0x12bf, 0x12bf,
-	0x12c1, 0x12c1,
-	0x12c6, 0x12c7,
-	0x12d7, 0x12d7,
-	0x1311, 0x1311,
-	0x1316, 0x1317,
-	0x135b, 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,
-	0x1bab, 0x1bad,
-	0x1bba, 0x1bbf,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1ccf,
-	0x1cf3, 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,
-	0x27cb, 0x27cb,
-	0x27cd, 0x27cd,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf2, 0x2cf8,
-	0x2d26, 0x2d2f,
-	0x2d66, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e32, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcc, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa674, 0xa67b,
-	0xa698, 0xa69f,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa792, 0xa79f,
-	0xa7aa, 0xa7f9,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaae0, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa2e, 0xfa2f,
-	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, 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, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 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, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16a, 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, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f600, 0x1f600,
-	0x1f611, 0x1f611,
-	0x1f615, 0x1f615,
-	0x1f617, 0x1f617,
-	0x1f619, 0x1f619,
-	0x1f61b, 0x1f61b,
-	0x1f61f, 0x1f61f,
-	0x1f626, 0x1f627,
-	0x1f62c, 0x1f62c,
-	0x1f62e, 0x1f62f,
-	0x1f634, 0x1f634,
-	0x1f641, 0x1f644,
-	0x1f650, 0x1f67f,
-	0x1f6c6, 0x1f6ff,
-	0x1f774, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2f7ff,
-	0x2fa1e, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-#endif /* USE_UNICODE_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 */
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
-	1,
-	0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-#define CR_Alpha CR_Alphabetic
-
-/* 'Blank': [[:Blank:]] */
-static const OnigCodePoint CR_Blank[] = {
-	9,
-	0x0009, 0x0009,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x180e, 0x180e,
-	0x2000, 0x200a,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Blank */
-
-/* 'Cntrl': [[:Cntrl:]] */
-#define CR_Cntrl CR_Cc
-
-/* 'Digit': [[:Digit:]] */
-#define CR_Digit CR_Nd
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
-	506,
-	0x0021, 0x007e,
-	0x00a1, 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, 0x167f,
-	0x1681, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1736,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17dd,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1800, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	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,
-	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, 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,
-	0x3001, 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,
-	0xe000, 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,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-#define CR_Lower CR_Lowercase
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
-	503,
-	0x0020, 0x007e,
-	0x00a0, 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, 0x2027,
-	0x202a, 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,
-	0xe000, 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,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-#define CR_Punct CR_P
-
-/* 'Space': [[:Space:]] */
-#define CR_Space CR_White_Space
-
-/* 'Upper': [[:Upper:]] */
-#define CR_Upper CR_Uppercase
-
-/* 'XDigit': [[:XDigit:]] */
-#define CR_XDigit CR_ASCII_Hex_Digit
-
-/* 'Word': [[:Word:]] */
-static const OnigCodePoint CR_Word[] = {
-	514,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	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, 0x17b3,
-	0x17b6, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf2,
-	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, 0x2cf1,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	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, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa672,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff3f, 0xff3f,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
-	509,
-	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,
-	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, 0x0edd,
-	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,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10fc,
-	0x1100, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12d6,
-	0x12d8, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x135a,
-	0x135f, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b80, 0x1ba9,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf2,
-	0x1d00, 0x1dbf,
-	0x1e00, 0x1f15,
-	0x1f18, 0x1f1d,
-	0x1f20, 0x1f45,
-	0x1f48, 0x1f4d,
-	0x1f50, 0x1f57,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fdb,
-	0x1fe0, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ffc,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 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,
-	0x2d00, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff10, 0xff19,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11066, 0x1106f,
-	0x11082, 0x110b8,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	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,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Alnum */
-
-/* 'ASCII': [[:ASCII:]] */
-static const OnigCodePoint CR_ASCII[] = {
-	1,
-	0x0000, 0x007f,
-}; /* CR_ASCII */
-
-static const OnigCodePoint* const CodeRanges[] = {
-  CR_NEWLINE,
-  CR_Alpha,
-  CR_Blank,
-  CR_Cntrl,
-  CR_Digit,
-  CR_Graph,
-  CR_Lower,
-  CR_Print,
-  CR_Punct,
-  CR_Space,
-  CR_Upper,
-  CR_XDigit,
-  CR_Word,
-  CR_Alnum,
-  CR_ASCII,
-#ifdef USE_UNICODE_PROPERTIES
-  CR_Any,
-  CR_Assigned,
-  CR_C,
-  CR_Cc,
-  CR_Cf,
-  CR_Cn,
-  CR_Co,
-  CR_Cs,
-  CR_L,
-  CR_Ll,
-  CR_Lm,
-  CR_Lo,
-  CR_Lt,
-  CR_Lu,
-  CR_M,
-  CR_Mc,
-  CR_Me,
-  CR_Mn,
-  CR_N,
-  CR_Nd,
-  CR_Nl,
-  CR_No,
-  CR_P,
-  CR_Pc,
-  CR_Pd,
-  CR_Pe,
-  CR_Pf,
-  CR_Pi,
-  CR_Po,
-  CR_Ps,
-  CR_S,
-  CR_Sc,
-  CR_Sk,
-  CR_Sm,
-  CR_So,
-  CR_Z,
-  CR_Zl,
-  CR_Zp,
-  CR_Zs,
-  CR_Math,
-  CR_Alphabetic,
-  CR_Lowercase,
-  CR_Uppercase,
-  CR_Cased,
-  CR_Case_Ignorable,
-  CR_Changes_When_Lowercased,
-  CR_Changes_When_Uppercased,
-  CR_Changes_When_Titlecased,
-  CR_Changes_When_Casefolded,
-  CR_Changes_When_Casemapped,
-  CR_ID_Start,
-  CR_ID_Continue,
-  CR_XID_Start,
-  CR_XID_Continue,
-  CR_Default_Ignorable_Code_Point,
-  CR_Grapheme_Extend,
-  CR_Grapheme_Base,
-  CR_Grapheme_Link,
-  CR_Common,
-  CR_Latin,
-  CR_Greek,
-  CR_Cyrillic,
-  CR_Armenian,
-  CR_Hebrew,
-  CR_Arabic,
-  CR_Syriac,
-  CR_Thaana,
-  CR_Devanagari,
-  CR_Bengali,
-  CR_Gurmukhi,
-  CR_Gujarati,
-  CR_Oriya,
-  CR_Tamil,
-  CR_Telugu,
-  CR_Kannada,
-  CR_Malayalam,
-  CR_Sinhala,
-  CR_Thai,
-  CR_Lao,
-  CR_Tibetan,
-  CR_Myanmar,
-  CR_Georgian,
-  CR_Hangul,
-  CR_Ethiopic,
-  CR_Cherokee,
-  CR_Canadian_Aboriginal,
-  CR_Ogham,
-  CR_Runic,
-  CR_Khmer,
-  CR_Mongolian,
-  CR_Hiragana,
-  CR_Katakana,
-  CR_Bopomofo,
-  CR_Han,
-  CR_Yi,
-  CR_Old_Italic,
-  CR_Gothic,
-  CR_Deseret,
-  CR_Inherited,
-  CR_Tagalog,
-  CR_Hanunoo,
-  CR_Buhid,
-  CR_Tagbanwa,
-  CR_Limbu,
-  CR_Tai_Le,
-  CR_Linear_B,
-  CR_Ugaritic,
-  CR_Shavian,
-  CR_Osmanya,
-  CR_Cypriot,
-  CR_Braille,
-  CR_Buginese,
-  CR_Coptic,
-  CR_New_Tai_Lue,
-  CR_Glagolitic,
-  CR_Tifinagh,
-  CR_Syloti_Nagri,
-  CR_Old_Persian,
-  CR_Kharoshthi,
-  CR_Balinese,
-  CR_Cuneiform,
-  CR_Phoenician,
-  CR_Phags_Pa,
-  CR_Nko,
-  CR_Sundanese,
-  CR_Lepcha,
-  CR_Ol_Chiki,
-  CR_Vai,
-  CR_Saurashtra,
-  CR_Kayah_Li,
-  CR_Rejang,
-  CR_Lycian,
-  CR_Carian,
-  CR_Lydian,
-  CR_Cham,
-  CR_Tai_Tham,
-  CR_Tai_Viet,
-  CR_Avestan,
-  CR_Egyptian_Hieroglyphs,
-  CR_Samaritan,
-  CR_Lisu,
-  CR_Bamum,
-  CR_Javanese,
-  CR_Meetei_Mayek,
-  CR_Imperial_Aramaic,
-  CR_Old_South_Arabian,
-  CR_Inscriptional_Parthian,
-  CR_Inscriptional_Pahlavi,
-  CR_Old_Turkic,
-  CR_Kaithi,
-  CR_Batak,
-  CR_Brahmi,
-  CR_Mandaic,
-  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,
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
-  int name, ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-%}
-struct uniname2ctype_struct;
-%%
-newline,                                   0
-alpha,                                     1
-blank,                                     2
-cntrl,                                     3
-digit,                                     4
-graph,                                     5
-lower,                                     6
-print,                                     7
-punct,                                     8
-space,                                     9
-upper,                                    10
-xdigit,                                   11
-word,                                     12
-alnum,                                    13
-ascii,                                    14
-#ifdef USE_UNICODE_PROPERTIES
-any,                                      15
-assigned,                                 16
-c,                                        17
-cc,                                       18
-cf,                                       19
-cn,                                       20
-co,                                       21
-cs,                                       22
-l,                                        23
-ll,                                       24
-lm,                                       25
-lo,                                       26
-lt,                                       27
-lu,                                       28
-m,                                        29
-mc,                                       30
-me,                                       31
-mn,                                       32
-n,                                        33
-nd,                                       34
-nl,                                       35
-no,                                       36
-p,                                        37
-pc,                                       38
-pd,                                       39
-pe,                                       40
-pf,                                       41
-pi,                                       42
-po,                                       43
-ps,                                       44
-s,                                        45
-sc,                                       46
-sk,                                       47
-sm,                                       48
-so,                                       49
-z,                                        50
-zl,                                       51
-zp,                                       52
-zs,                                       53
-math,                                     54
-alphabetic,                               55
-lowercase,                                56
-uppercase,                                57
-cased,                                    58
-caseignorable,                            59
-changeswhenlowercased,                    60
-changeswhenuppercased,                    61
-changeswhentitlecased,                    62
-changeswhencasefolded,                    63
-changeswhencasemapped,                    64
-idstart,                                  65
-idcontinue,                               66
-xidstart,                                 67
-xidcontinue,                              68
-defaultignorablecodepoint,                69
-graphemeextend,                           70
-graphemebase,                             71
-graphemelink,                             72
-common,                                   73
-latin,                                    74
-greek,                                    75
-cyrillic,                                 76
-armenian,                                 77
-hebrew,                                   78
-arabic,                                   79
-syriac,                                   80
-thaana,                                   81
-devanagari,                               82
-bengali,                                  83
-gurmukhi,                                 84
-gujarati,                                 85
-oriya,                                    86
-tamil,                                    87
-telugu,                                   88
-kannada,                                  89
-malayalam,                                90
-sinhala,                                  91
-thai,                                     92
-lao,                                      93
-tibetan,                                  94
-myanmar,                                  95
-georgian,                                 96
-hangul,                                   97
-ethiopic,                                 98
-cherokee,                                 99
-canadianaboriginal,                      100
-ogham,                                   101
-runic,                                   102
-khmer,                                   103
-mongolian,                               104
-hiragana,                                105
-katakana,                                106
-bopomofo,                                107
-han,                                     108
-yi,                                      109
-olditalic,                               110
-gothic,                                  111
-deseret,                                 112
-inherited,                               113
-tagalog,                                 114
-hanunoo,                                 115
-buhid,                                   116
-tagbanwa,                                117
-limbu,                                   118
-taile,                                   119
-linearb,                                 120
-ugaritic,                                121
-shavian,                                 122
-osmanya,                                 123
-cypriot,                                 124
-braille,                                 125
-buginese,                                126
-coptic,                                  127
-newtailue,                               128
-glagolitic,                              129
-tifinagh,                                130
-sylotinagri,                             131
-oldpersian,                              132
-kharoshthi,                              133
-balinese,                                134
-cuneiform,                               135
-phoenician,                              136
-phagspa,                                 137
-nko,                                     138
-sundanese,                               139
-lepcha,                                  140
-olchiki,                                 141
-vai,                                     142
-saurashtra,                              143
-kayahli,                                 144
-rejang,                                  145
-lycian,                                  146
-carian,                                  147
-lydian,                                  148
-cham,                                    149
-taitham,                                 150
-taiviet,                                 151
-avestan,                                 152
-egyptianhieroglyphs,                     153
-samaritan,                               154
-lisu,                                    155
-bamum,                                   156
-javanese,                                157
-meeteimayek,                             158
-imperialaramaic,                         159
-oldsoutharabian,                         160
-inscriptionalparthian,                   161
-inscriptionalpahlavi,                    162
-oldturkic,                               163
-kaithi,                                  164
-batak,                                   165
-brahmi,                                  166
-mandaic,                                 167
-whitespace,                              168
-bidicontrol,                             169
-joincontrol,                             170
-dash,                                    171
-hyphen,                                  172
-quotationmark,                           173
-terminalpunctuation,                     174
-othermath,                               175
-hexdigit,                                176
-asciihexdigit,                           177
-otheralphabetic,                         178
-ideographic,                             179
-diacritic,                               180
-extender,                                181
-otherlowercase,                          182
-otheruppercase,                          183
-noncharactercodepoint,                   184
-othergraphemeextend,                     185
-idsbinaryoperator,                       186
-idstrinaryoperator,                      187
-radical,                                 188
-unifiedideograph,                        189
-otherdefaultignorablecodepoint,          190
-deprecated,                              191
-softdotted,                              192
-logicalorderexception,                   193
-otheridstart,                            194
-otheridcontinue,                         195
-sterm,                                   196
-variationselector,                       197
-patternwhitespace,                       198
-patternsyntax,                           199
-unknown,                                 200
-ahex,                                    177
-bidic,                                   169
-ci,                                       59
-cwcf,                                     63
-cwcm,                                     64
-cwl,                                      60
-cwt,                                      62
-cwu,                                      61
-dep,                                     191
-di,                                       69
-dia,                                     180
-ext,                                     181
-grbase,                                   71
-grext,                                    70
-grlink,                                   72
-hex,                                     176
-idc,                                      66
-ideo,                                    179
-ids,                                      65
-idsb,                                    186
-idst,                                    187
-joinc,                                   170
-loe,                                     193
-nchar,                                   184
-oalpha,                                  178
-odi,                                     190
-ogrext,                                  185
-oidc,                                    195
-oids,                                    194
-olower,                                  182
-omath,                                   175
-oupper,                                  183
-patsyn,                                  199
-patws,                                   198
-qmark,                                   173
-sd,                                      192
-term,                                    174
-uideo,                                   189
-vs,                                      197
-wspace,                                  168
-xidc,                                     68
-xids,                                     67
-other,                                    17
-control,                                  18
-format,                                   19
-unassigned,                               20
-privateuse,                               21
-surrogate,                                22
-letter,                                   23
-lowercaseletter,                          24
-modifierletter,                           25
-otherletter,                              26
-titlecaseletter,                          27
-uppercaseletter,                          28
-mark,                                     29
-spacingmark,                              30
-enclosingmark,                            31
-nonspacingmark,                           32
-number,                                   33
-decimalnumber,                            34
-letternumber,                             35
-othernumber,                              36
-punctuation,                              37
-connectorpunctuation,                     38
-dashpunctuation,                          39
-closepunctuation,                         40
-finalpunctuation,                         41
-initialpunctuation,                       42
-otherpunctuation,                         43
-openpunctuation,                          44
-symbol,                                   45
-currencysymbol,                           46
-modifiersymbol,                           47
-mathsymbol,                               48
-othersymbol,                              49
-separator,                                50
-lineseparator,                            51
-paragraphseparator,                       52
-spaceseparator,                           53
-arab,                                     79
-armi,                                    159
-armn,                                     77
-avst,                                    152
-bali,                                    134
-bamu,                                    156
-batk,                                    165
-beng,                                     83
-bopo,                                    107
-brah,                                    166
-brai,                                    125
-bugi,                                    126
-buhd,                                    116
-cans,                                    100
-cari,                                    147
-cher,                                     99
-copt,                                    127
-qaac,                                    127
-cprt,                                    124
-cyrl,                                     76
-deva,                                     82
-dsrt,                                    112
-egyp,                                    153
-ethi,                                     98
-geor,                                     96
-glag,                                    129
-goth,                                    111
-grek,                                     75
-gujr,                                     85
-guru,                                     84
-hang,                                     97
-hani,                                    108
-hano,                                    115
-hebr,                                     78
-hira,                                    105
-ital,                                    110
-java,                                    157
-kali,                                    144
-kana,                                    106
-khar,                                    133
-khmr,                                    103
-knda,                                     89
-kthi,                                    164
-lana,                                    150
-laoo,                                     93
-latn,                                     74
-lepc,                                    140
-limb,                                    118
-linb,                                    120
-lyci,                                    146
-lydi,                                    148
-mand,                                    167
-mlym,                                     90
-mong,                                    104
-mtei,                                    158
-mymr,                                     95
-nkoo,                                    138
-ogam,                                    101
-olck,                                    141
-orkh,                                    163
-orya,                                     86
-osma,                                    123
-phag,                                    137
-phli,                                    162
-phnx,                                    136
-prti,                                    161
-rjng,                                    145
-runr,                                    102
-samr,                                    154
-sarb,                                    160
-saur,                                    143
-shaw,                                    122
-sinh,                                     91
-sund,                                    139
-sylo,                                    131
-syrc,                                     80
-tagb,                                    117
-tale,                                    119
-talu,                                    128
-taml,                                     87
-tavt,                                    151
-telu,                                     88
-tfng,                                    130
-tglg,                                    114
-thaa,                                     81
-tibt,                                     94
-ugar,                                    121
-vaii,                                    142
-xpeo,                                    132
-xsux,                                    135
-yiii,                                    109
-zinh,                                    113
-qaai,                                    113
-zyyy,                                     73
-zzzz,                                    200
-age=1.1,                                 201
-age=2.0,                                 202
-age=2.1,                                 203
-age=3.0,                                 204
-age=3.1,                                 205
-age=3.2,                                 206
-age=4.0,                                 207
-age=4.1,                                 208
-age=5.0,                                 209
-age=5.1,                                 210
-age=5.2,                                 211
-age=6.0,                                 212
-#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 2e96dd3846..08f9072c43 100644
--- a/enc/us_ascii.c
+++ b/enc/us_ascii.c
@@ -1,11 +1,18 @@
 #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)
 {
-    if (*p & 0x80)
-        return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-    return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1);
+  if (*p & 0x80)
+    return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+  return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1);
 }
 
 OnigEncodingDefine(us_ascii, US_ASCII) = {
@@ -24,7 +31,10 @@ OnigEncodingDefine(us_ascii, US_ASCII) = {
   onigenc_ascii_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  onigenc_single_byte_ascii_only_case_map,
+  ENCINDEX_US_ASCII,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ASCII", "US-ASCII")
 ENC_ALIAS("ANSI_X3.4-1968", "US-ASCII")
diff --git a/enc/utf_16_32.h b/enc/utf_16_32.h
index b028a1a12e..9f9216d8ff 100644
--- a/enc/utf_16_32.h
+++ b/enc/utf_16_32.h
@@ -1,4 +1,5 @@
 #include "regenc.h"
-/* dummy for unsupported, statefull encoding */
-ENC_DUMMY("UTF-16");
-ENC_DUMMY("UTF-32");
+/* dummy for unsupported, stateful 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 1e33c2ec7d..f9dd7119d6 100644
--- a/enc/utf_16be.c
+++ b/enc/utf_16be.c
@@ -28,11 +28,9 @@
  */
 
 #include "regenc.h"
+#include "iso_8859.h"
 
-#define UTF16_IS_SURROGATE_FIRST(c)    (((c) & 0xfc) == 0xd8)
-#define UTF16_IS_SURROGATE_SECOND(c)   (((c) & 0xfc) == 0xdc)
-#define UTF16_IS_SURROGATE(c)          (((c) & 0xf8) == 0xd8)
-
+#if 0
 static const int EncLen_UTF16[] = {
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -51,6 +49,7 @@ static const int EncLen_UTF16[] = {
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
 };
+#endif
 
 static int
 utf16be_mbc_enc_len(const UChar* p, const OnigUChar* e ARG_UNUSED,
@@ -88,11 +87,8 @@ utf16be_is_mbc_newline(const UChar* p, const UChar* end,
     if (*(p+1) == 0x0a && *p == 0x00)
       return 1;
 #ifdef USE_UNICODE_ALL_LINE_TERMINATORS
-    if ((
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
-	 *(p+1) == 0x0d ||
-#endif
-	 *(p+1) == 0x85) && *p == 0x00)
+    if ((*(p+1) == 0x0b || *(p+1) == 0x0c || *(p+1) == 0x0d || *(p+1) == 0x85)
+	&& *p == 0x00)
       return 1;
     if (*p == 0x20 && (*(p+1) == 0x29 || *(p+1) == 0x28))
       return 1;
@@ -188,7 +184,7 @@ utf16be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* e
     int c, v;
 
     p++;
-    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
       return TRUE;
     }
 
@@ -252,6 +248,9 @@ OnigEncodingDefine(utf_16be, UTF_16BE) = {
   onigenc_unicode_is_code_ctype,
   onigenc_utf16_32_get_ctype_code_range,
   utf16be_left_adjust_char_head,
-  onigenc_always_false_is_allowed_reverse_match
+  onigenc_always_false_is_allowed_reverse_match,
+  onigenc_unicode_case_map,
+  0,
+  ONIGENC_FLAG_UNICODE,
 };
 ENC_ALIAS("UCS-2BE", "UTF-16BE")
diff --git a/enc/utf_16le.c b/enc/utf_16le.c
index e972cb95f0..2c8438d0be 100644
--- a/enc/utf_16le.c
+++ b/enc/utf_16le.c
@@ -28,11 +28,9 @@
  */
 
 #include "regenc.h"
+#include "iso_8859.h"
 
-#define UTF16_IS_SURROGATE_FIRST(c)    (((c) & 0xfc) == 0xd8)
-#define UTF16_IS_SURROGATE_SECOND(c)   (((c) & 0xfc) == 0xdc)
-#define UTF16_IS_SURROGATE(c)          (((c) & 0xf8) == 0xd8)
-
+#if 0
 static const int EncLen_UTF16[] = {
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -51,6 +49,7 @@ static const int EncLen_UTF16[] = {
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
 };
+#endif
 
 static int
 utf16le_mbc_enc_len(const UChar* p, const OnigUChar* e,
@@ -81,11 +80,8 @@ utf16le_is_mbc_newline(const UChar* p, const UChar* end,
     if (*p == 0x0a && *(p+1) == 0x00)
       return 1;
 #ifdef USE_UNICODE_ALL_LINE_TERMINATORS
-    if ((
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
-	 *p == 0x0d ||
-#endif
-	 *p == 0x85) && *(p+1) == 0x00)
+    if ((*p == 0x0b || *p == 0x0c || *p == 0x0d || *p == 0x85)
+	&& *(p+1) == 0x00)
       return 1;
     if (*(p+1) == 0x20 && (*p == 0x29 || *p == 0x28))
       return 1;
@@ -182,7 +178,7 @@ utf16le_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp,
   if (*(p+1) == 0) {
     int c, v;
 
-    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
       return TRUE;
     }
 
@@ -245,5 +241,8 @@ OnigEncodingDefine(utf_16le, UTF_16LE) = {
   onigenc_unicode_is_code_ctype,
   onigenc_utf16_32_get_ctype_code_range,
   utf16le_left_adjust_char_head,
-  onigenc_always_false_is_allowed_reverse_match
+  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 2671448d44..17841e52a4 100644
--- a/enc/utf_32be.c
+++ b/enc/utf_32be.c
@@ -28,12 +28,25 @@
  */
 
 #include "regenc.h"
+#include "iso_8859.h"
 
+static OnigCodePoint utf32be_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc);
 static int
-utf32be_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
-		    OnigEncoding enc ARG_UNUSED)
+utf32be_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e,
+		    OnigEncoding enc)
 {
-  return 4;
+  if (e < p) {
+    return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+  }
+  else if (e-p < 4) {
+    return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-(int)(e-p));
+  }
+  else {
+    OnigCodePoint c = utf32be_mbc_to_code(p, e, enc);
+    if (!UNICODE_VALID_CODEPOINT_P(c))
+      return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+    return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4);
+  }
 }
 
 static int
@@ -44,11 +57,7 @@ utf32be_is_mbc_newline(const UChar* p, const UChar* end,
     if (*(p+3) == 0x0a && *(p+2) == 0 && *(p+1) == 0 && *p == 0)
       return 1;
 #ifdef USE_UNICODE_ALL_LINE_TERMINATORS
-    if ((
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
-	 *(p+3) == 0x0d ||
-#endif
-	 *(p+3) == 0x85)
+    if ((*(p+3) == 0x0b || *(p+3) == 0x0c || *(p+3) == 0x0d || *(p+3) == 0x85)
 	&& *(p+2) == 0 && *(p+1) == 0 && *p == 0x00)
       return 1;
     if (*(p+2) == 0x20 && (*(p+3) == 0x29 || *(p+3) == 0x28)
@@ -130,7 +139,7 @@ utf32be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* e
     int c, v;
 
     p += 3;
-    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
       return TRUE;
     }
 
@@ -159,7 +168,7 @@ utf32be_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* e
 
   if (s <= start) return (UChar* )s;
 
-  rem = (s - start) % 4;
+  rem = (int )((s - start) % 4);
   return (UChar* )(s - rem);
 }
 
@@ -189,7 +198,9 @@ OnigEncodingDefine(utf_32be, UTF_32BE) = {
   onigenc_unicode_is_code_ctype,
   onigenc_utf16_32_get_ctype_code_range,
   utf32be_left_adjust_char_head,
-  onigenc_always_false_is_allowed_reverse_match
+  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 aa448200c6..18b798f102 100644
--- a/enc/utf_32le.c
+++ b/enc/utf_32le.c
@@ -28,12 +28,25 @@
  */
 
 #include "regenc.h"
+#include "iso_8859.h"
 
+static OnigCodePoint utf32le_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc);
 static int
-utf32le_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
-		    OnigEncoding enc ARG_UNUSED)
+utf32le_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e,
+		    OnigEncoding enc)
 {
-  return 4;
+  if (e < p) {
+    return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+  }
+  else if (e-p < 4) {
+    return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-(int)(e-p));
+  }
+  else {
+    OnigCodePoint c = utf32le_mbc_to_code(p, e, enc);
+    if (!UNICODE_VALID_CODEPOINT_P(c))
+      return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+    return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4);
+  }
 }
 
 static int
@@ -44,11 +57,7 @@ utf32le_is_mbc_newline(const UChar* p, const UChar* end,
     if (*p == 0x0a && *(p+1) == 0 && *(p+2) == 0 && *(p+3) == 0)
       return 1;
 #ifdef USE_UNICODE_ALL_LINE_TERMINATORS
-    if ((
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
-	 *p == 0x0d ||
-#endif
-	 *p == 0x85)
+    if ((*p == 0x0b ||*p == 0x0c ||*p == 0x0d || *p == 0x85)
 	&& *(p+1) == 0x00 && (p+2) == 0x00 && *(p+3) == 0x00)
       return 1;
     if (*(p+1) == 0x20 && (*p == 0x29 || *p == 0x28)
@@ -130,7 +139,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 == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
       return TRUE;
     }
 
@@ -159,7 +168,7 @@ utf32le_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* e
 
   if (s <= start) return (UChar* )s;
 
-  rem = (s - start) % 4;
+  rem = (int )((s - start) % 4);
   return (UChar* )(s - rem);
 }
 
@@ -189,6 +198,9 @@ OnigEncodingDefine(utf_32le, UTF_32LE) = {
   onigenc_unicode_is_code_ctype,
   onigenc_utf16_32_get_ctype_code_range,
   utf32le_left_adjust_char_head,
-  onigenc_always_false_is_allowed_reverse_match
+  onigenc_always_false_is_allowed_reverse_match,
+  onigenc_unicode_case_map,
+  0,
+  ONIGENC_FLAG_UNICODE,
 };
 ENC_ALIAS("UCS-4LE", "UTF-32LE")
diff --git a/enc/utf_7.h b/enc/utf_7.h
index fa9f06b1b3..823b317740 100644
--- a/enc/utf_7.h
+++ b/enc/utf_7.h
@@ -1,5 +1,5 @@
 #include "regenc.h"
-/* dummy for unsupported, statefull encoding */
+/* dummy for unsupported, stateful encoding */
 ENC_DUMMY("UTF-7");
 ENC_ALIAS("CP65000", "UTF-7");
 
diff --git a/enc/utf_8.c b/enc/utf_8.c
index 83f8701205..cdf2510d84 100644
--- a/enc/utf_8.c
+++ b/enc/utf_8.c
@@ -28,15 +28,22 @@
  */
 
 #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 VALID_CODE_LIMIT  0x7fffffff
+# define INVALID_CODE_FE  0xfffffffe
+# define INVALID_CODE_FF  0xffffffff
 #endif
+#define VALID_CODE_LIMIT  0x0010ffff
 
 #define utf8_islead(c)     ((UChar )((c) & 0xc0) != 0x80)
 
@@ -248,9 +255,7 @@ is_mbc_newline(const UChar* p, const UChar* end, OnigEncoding enc)
     if (*p == 0x0a) return 1;
 
 #ifdef USE_UNICODE_ALL_LINE_TERMINATORS
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
-    if (*p == 0x0d) return 1;
-#endif
+    if (*p == 0x0b || *p == 0x0c || *p == 0x0d) return 1;
     if (p + 1 < end) {
       if (*(p+1) == 0x85 && *p == 0xc2) /* U+0085 */
 	return 1;
@@ -272,7 +277,7 @@ mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
   int c, len;
   OnigCodePoint n;
 
-  len = enclen(enc, p, end);
+  len = mbc_enc_len(p, end, enc);
   c = *p++;
   if (len > 1) {
     len--;
@@ -299,9 +304,7 @@ code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
   if      ((code & 0xffffff80) == 0) return 1;
   else if ((code & 0xfffff800) == 0) return 2;
   else if ((code & 0xffff0000) == 0) return 3;
-  else if ((code & 0xffe00000) == 0) return 4;
-  else if ((code & 0xfc000000) == 0) return 5;
-  else if ((code & 0x80000000) == 0) return 6;
+  else if (code <= VALID_CODE_LIMIT) return 4;
 #ifdef USE_INVALID_CODE_SCHEME
   else if (code == INVALID_CODE_FE) return 1;
   else if (code == INVALID_CODE_FF) return 1;
@@ -330,24 +333,11 @@ 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 & 0xffe00000) == 0) {
+    else if (code <= VALID_CODE_LIMIT) {
       *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;
@@ -363,13 +353,13 @@ code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc ARG_UNUSED)
     }
 
     *p++ = UTF8_TRAIL0(code);
-    return (int)(p - buf);
+    return (int )(p - buf);
   }
 }
 
 static int
 mbc_case_fold(OnigCaseFoldType flag, const UChar** pp,
-		   const UChar* end, UChar* fold, OnigEncoding enc)
+	      const UChar* end, UChar* fold, OnigEncoding enc)
 {
   const UChar* p = *pp;
 
@@ -397,7 +387,7 @@ mbc_case_fold(OnigCaseFoldType flag, const UChar** pp,
 
 static int
 get_ctype_code_range(OnigCtype ctype, OnigCodePoint *sb_out,
-			  const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
+		     const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
 {
   *sb_out = 0x80;
   return onigenc_unicode_ctype_code_range(ctype, ranges);
@@ -427,7 +417,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 OnigEncodingDefine(utf_8, UTF_8) = {
   mbc_enc_len,
   "UTF-8",     /* name */
-  6,           /* max byte length */
+  4,           /* max byte length */
   1,           /* min byte length */
   is_mbc_newline,
   mbc_to_code,
@@ -440,7 +430,10 @@ OnigEncodingDefine(utf_8, UTF_8) = {
   onigenc_unicode_is_code_ctype,
   get_ctype_code_range,
   left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  onigenc_unicode_case_map,
+  ENCINDEX_UTF_8,
+  ONIGENC_FLAG_UNICODE,
 };
 ENC_ALIAS("CP65001", "UTF-8")
 
@@ -454,4 +447,3 @@ 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
new file mode 100644
index 0000000000..d2cf7b16bc
--- /dev/null
+++ b/enc/windows_1250.c
@@ -0,0 +1,271 @@
+/**********************************************************************
+  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 1cb4da4960..fcd0f1015d 100644
--- a/enc/windows_1251.c
+++ b/enc/windows_1251.c
@@ -1,5 +1,5 @@
 /**********************************************************************
-  cp1251.c -  Oniguruma (regular expression library)
+  windows_1251.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2006-2007  Byte      <byte AT mail DOT kna DOT ru>
@@ -167,7 +167,7 @@ cp1251_apply_all_case_fold(OnigCaseFoldType flag,
 			       OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             numberof(CaseFoldMap), CaseFoldMap, 0,
              flag, f, arg);
 }
 
@@ -176,13 +176,55 @@ cp1251_get_case_fold_codes_by_str(OnigCaseFoldType flag,
     const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     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 ((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,
@@ -196,7 +238,10 @@ OnigEncodingDefine(windows_1251, Windows_1251) = {
   cp1251_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  case_map,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 /*
  * Name: windows-1251
diff --git a/enc/windows_1252.c b/enc/windows_1252.c
new file mode 100644
index 0000000000..5f90c15601
--- /dev/null
+++ b/enc/windows_1252.c
@@ -0,0 +1,260 @@
+/**********************************************************************
+  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
new file mode 100644
index 0000000000..9e9c63a581
--- /dev/null
+++ b/enc/windows_1253.c
@@ -0,0 +1,297 @@
+/**********************************************************************
+  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
new file mode 100644
index 0000000000..9ae66978a2
--- /dev/null
+++ b/enc/windows_1254.c
@@ -0,0 +1,302 @@
+/**********************************************************************
+  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
new file mode 100644
index 0000000000..936a94ac76
--- /dev/null
+++ b/enc/windows_1257.c
@@ -0,0 +1,304 @@
+/**********************************************************************
+  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
new file mode 100644
index 0000000000..e3a468f414
--- /dev/null
+++ b/enc/windows_31j.c
@@ -0,0 +1,81 @@
+/**********************************************************************
+  windows_31j.c -  Onigmo (Oniguruma-mod) (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2009  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011       K.Takata  <kentkt AT csc 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.
+ */
+
+#define ENC_CP932
+#include "shift_jis.h"
+
+OnigEncodingDefine(windows_31j, Windows_31J) = {
+  mbc_enc_len,
+  "Windows-31J", /* name */
+  2,             /* max byte length */
+  1,             /* min byte length */
+  onigenc_is_mbc_newline_0x0a,
+  mbc_to_code,
+  code_to_mbclen,
+  code_to_mbc,
+  mbc_case_fold,
+  apply_all_case_fold,
+  get_case_fold_codes_by_str,
+  property_name_to_ctype,
+  is_code_ctype,
+  get_ctype_code_range,
+  left_adjust_char_head,
+  is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
+};
+/*
+ * Name: Windows-31J
+ * MIBenum: 2024
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/dbcs/932.mspx
+ * Link: http://ja.wikipedia.org/wiki/Windows-31J
+ * Link: http://source.icu-project.org/repos/icu/data/trunk/charset/data/ucm/windows-932-2000.ucm
+ *
+ * Windows Standard Character Set and its mapping to Unicode by Microsoft.
+ * Since 1.9.3, SJIS is the alias of Windows-31J because its character
+ * set is usually this one even if its mapping may differ.
+ */
+ENC_ALIAS("CP932", "Windows-31J")
+ENC_ALIAS("csWindows31J", "Windows-31J") /* IANA.  IE6 don't accept Windows-31J but csWindows31J. */
+ENC_ALIAS("SJIS", "Windows-31J")
+
+/*
+ * Name: PCK
+ * Link: http://download.oracle.com/docs/cd/E19253-01/819-0606/x-2chn0/index.html
+ * Link: http://download.oracle.com/docs/cd/E19253-01/819-0606/appb-pckwarn-1/index.html
+ *
+ * Solaris's SJIS variant. Its set is Windows Standard Character Set; it
+ * consists JIS X 0201 Latin (US-ASCII), JIS X 0201 Katakana, JIS X 0208, NEC
+ * special characters, NEC-selected IBM extended characters, and IBM extended
+ * characters. Solaris's iconv seems to use SJIS-open.
+ */
+ENC_ALIAS("PCK", "Windows-31J")
diff --git a/enc/x_emoji.h b/enc/x_emoji.h
index 92c9bccafd..c0a3613f1b 100644
--- a/enc/x_emoji.h
+++ b/enc/x_emoji.h
@@ -2,8 +2,8 @@
 
 /*
  * Name: UTF8-DoCoMo, SJIS-DoCoMo
- * Link: http://www.nttdocomo.co.jp/english/service/imode/make/content/pictograph/basic/index.html
- * Link: http://www.nttdocomo.co.jp/english/service/imode/make/content/pictograph/extention/index.html
+ * Link: https://www.nttdocomo.co.jp/service/developer/make/content/pictograph/basic/index.html
+ * Link: https://www.nttdocomo.co.jp/service/developer/make/content/pictograph/extent%69on/index.html
  */
 ENC_REPLICATE("UTF8-DoCoMo", "UTF-8")
 ENC_REPLICATE("SJIS-DoCoMo", "Windows-31J")
diff --git a/encindex.h b/encindex.h
new file mode 100644
index 0000000000..658b60a9fd
--- /dev/null
+++ b/encindex.h
@@ -0,0 +1,69 @@
+/**********************************************************************
+
+  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
+
+int rb_enc_find_index2(const char *name, long len);
+
+#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 629fa04ee5..69015cc8fd 100644
--- a/encoding.c
+++ b/encoding.c
@@ -9,29 +9,36 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
 #include "ruby/encoding.h"
 #include "internal.h"
+#include "encindex.h"
 #include "regenc.h"
 #include <ctype.h>
-#ifndef NO_LOCALE_CHARMAP
-#ifdef __CYGWIN__
-#include <windows.h>
-#endif
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-#endif
 #include "ruby/util.h"
 
+#include "ruby_assert.h"
+#ifndef ENC_DEBUG
+#define ENC_DEBUG 0
+#endif
+#define ENC_ASSERT(expr) RUBY_ASSERT_WHEN(ENC_DEBUG, expr)
+#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
+
+typedef OnigEncodingType rb_raw_encoding;
+
 #if defined __GNUC__ && __GNUC__ >= 4
 #pragma GCC visibility push(default)
 int rb_enc_register(const char *name, rb_encoding *encoding);
 void rb_enc_set_base(const char *name, const char *orig);
+int rb_enc_set_dummy(int index);
 void rb_encdb_declare(const char *name);
 int rb_encdb_replicate(const char *name, const char *orig);
 int rb_encdb_dummy(const char *name);
 int rb_encdb_alias(const char *alias, const char *orig);
+void rb_encdb_set_unicode(int index);
 #pragma GCC visibility pop
 #endif
 
@@ -52,7 +59,12 @@ static struct {
     st_table *names;
 } enc_table;
 
-void rb_enc_init(void);
+#define ENC_DUMMY_FLAG (1<<24)
+#define ENC_INDEX_MASK (~(~0U<<24))
+
+#define ENC_TO_ENCINDEX(enc) (int)((enc)->ruby_encoding_index & ENC_INDEX_MASK)
+#define ENC_DUMMY_P(enc) ((enc)->ruby_encoding_index & ENC_DUMMY_FLAG)
+#define ENC_SET_DUMMY(enc) ((enc)->ruby_encoding_index |= ENC_DUMMY_FLAG)
 
 #define ENCODING_COUNT ENCINDEX_BUILTIN_MAX
 #define UNSPECIFIED_ENCODING INT_MAX
@@ -64,23 +76,25 @@ 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, enc_memsize,},
+    {0, 0, 0,},
+    0, 0, 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)
 {
-    return TypedData_Wrap_Struct(rb_cEncoding, &encoding_data_type, encoding);
+    return TypedData_Wrap_Struct(rb_cEncoding, &encoding_data_type, (void *)encoding);
 }
 
 static VALUE
@@ -107,6 +121,18 @@ rb_enc_from_encoding(rb_encoding *encoding)
     return rb_enc_from_encoding_index(idx);
 }
 
+int
+rb_enc_to_index(rb_encoding *enc)
+{
+    return enc ? ENC_TO_ENCINDEX(enc) : 0;
+}
+
+int
+rb_enc_dummy_p(rb_encoding *enc)
+{
+    return ENC_DUMMY_P(enc) != 0;
+}
+
 static int enc_autoload(rb_encoding *);
 
 static int
@@ -124,21 +150,47 @@ check_encoding(rb_encoding *enc)
 static int
 enc_check_encoding(VALUE obj)
 {
-    if (SPECIAL_CONST_P(obj) || !rb_typeddata_is_kind_of(obj, &encoding_data_type)) {
+    if (!is_obj_encoding(obj)) {
 	return -1;
     }
     return check_encoding(RDATA(obj)->data);
 }
 
-static int
+NORETURN(static void not_encoding(VALUE enc));
+static void
+not_encoding(VALUE enc)
+{
+    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected Encoding)",
+	     rb_obj_class(enc));
+}
+
+static rb_encoding *
 must_encoding(VALUE enc)
 {
     int index = enc_check_encoding(enc);
     if (index < 0) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected Encoding)",
-		 rb_obj_classname(enc));
+	not_encoding(enc);
     }
-    return index;
+    return DATA_PTR(enc);
+}
+
+static rb_encoding *
+must_encindex(int index)
+{
+    rb_encoding *enc = rb_enc_from_index(index);
+    if (!enc) {
+	rb_raise(rb_eEncodingError, "encoding index out of bound: %d",
+		 index);
+    }
+    if (ENC_TO_ENCINDEX(enc) != (int)(index & ENC_INDEX_MASK)) {
+	rb_raise(rb_eEncodingError, "wrong encoding index %d for %s (expected %d)",
+		 index, rb_enc_name(enc), ENC_TO_ENCINDEX(enc));
+    }
+    if (enc_autoload_p(enc) && enc_autoload(enc) == -1) {
+	rb_loaderror("failed to load encoding (%s)",
+		     rb_enc_name(enc));
+    }
+    return enc;
 }
 
 int
@@ -159,8 +211,9 @@ rb_to_encoding_index(VALUE enc)
     return rb_enc_find_index(StringValueCStr(enc));
 }
 
-static rb_encoding *
-to_encoding(VALUE enc)
+/* Returns encoding index or UNSPECIFIED_ENCODING */
+static int
+str_find_encindex(VALUE enc)
 {
     int idx;
 
@@ -169,22 +222,40 @@ to_encoding(VALUE enc)
 	rb_raise(rb_eArgError, "invalid name encoding (non ASCII)");
     }
     idx = rb_enc_find_index(StringValueCStr(enc));
+    return idx;
+}
+
+static int
+str_to_encindex(VALUE enc)
+{
+    int idx = str_find_encindex(enc);
     if (idx < 0) {
-	rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc));
+	rb_raise(rb_eArgError, "unknown encoding name - %"PRIsVALUE, enc);
     }
-    return rb_enc_from_index(idx);
+    return idx;
+}
+
+static rb_encoding *
+str_to_encoding(VALUE enc)
+{
+    return rb_enc_from_index(str_to_encindex(enc));
 }
 
 rb_encoding *
 rb_to_encoding(VALUE enc)
 {
     if (enc_check_encoding(enc) >= 0) return RDATA(enc)->data;
-    return to_encoding(enc);
+    return str_to_encoding(enc);
 }
 
-void
-rb_gc_mark_encodings(void)
+rb_encoding *
+rb_find_encoding(VALUE enc)
 {
+    int idx;
+    if (enc_check_encoding(enc) >= 0) return RDATA(enc)->data;
+    idx = str_find_encindex(enc);
+    if (idx < 0) return NULL;
+    return rb_enc_from_index(idx);
 }
 
 static int
@@ -195,8 +266,7 @@ enc_table_expand(int newsize)
 
     if (enc_table.size >= newsize) return newsize;
     newsize = (newsize + 7) / 8 * 8;
-    ent = realloc(enc_table.list, sizeof(*enc_table.list) * newsize);
-    if (!ent) return -1;
+    ent = REALLOC_N(enc_table.list, struct rb_encoding_entry, newsize);
     memset(ent + enc_table.size, 0, sizeof(*ent)*(newsize - enc_table.size));
     enc_table.list = ent;
     enc_table.size = newsize;
@@ -204,9 +274,10 @@ enc_table_expand(int newsize)
 }
 
 static int
-enc_register_at(int index, const char *name, rb_encoding *encoding)
+enc_register_at(int index, const char *name, rb_encoding *base_encoding)
 {
     struct rb_encoding_entry *ent = &enc_table.list[index];
+    rb_raw_encoding *encoding;
     VALUE list;
 
     if (!valid_encoding_name_p(name)) return -1;
@@ -216,18 +287,19 @@ enc_register_at(int index, const char *name, rb_encoding *encoding)
     else if (STRCASECMP(name, ent->name)) {
 	return -1;
     }
-    if (!ent->enc) {
-	ent->enc = xmalloc(sizeof(rb_encoding));
+    encoding = (rb_raw_encoding *)ent->enc;
+    if (!encoding) {
+	encoding = xmalloc(sizeof(rb_encoding));
     }
-    if (encoding) {
-	*ent->enc = *encoding;
+    if (base_encoding) {
+	*encoding = *base_encoding;
     }
     else {
-	memset(ent->enc, 0, sizeof(*ent->enc));
+	memset(encoding, 0, sizeof(*ent->enc));
     }
-    encoding = ent->enc;
     encoding->name = name;
     encoding->ruby_encoding_index = index;
+    ent->enc = encoding;
     st_insert(enc_table.names, (st_data_t)name, (st_data_t)index);
     list = rb_encoding_list;
     if (list && NIL_P(rb_ary_entry(list, index))) {
@@ -298,7 +370,7 @@ set_base_encoding(int index, rb_encoding *base)
     rb_encoding *enc = enc_table.list[index].enc;
 
     enc_table.list[index].base = base;
-    if (rb_enc_dummy_p(base)) ENC_SET_DUMMY(enc);
+    if (ENC_DUMMY_P(base)) ENC_SET_DUMMY((rb_raw_encoding *)enc);
     return enc;
 }
 
@@ -314,6 +386,18 @@ rb_enc_set_base(const char *name, const char *orig)
     set_base_encoding(idx, rb_enc_from_index(origidx));
 }
 
+/* for encdb.h
+ * Set encoding dummy.
+ */
+int
+rb_enc_set_dummy(int index)
+{
+    rb_encoding *enc = enc_table.list[index].enc;
+
+    ENC_SET_DUMMY((rb_raw_encoding *)enc);
+    return index;
+}
+
 int
 rb_enc_replicate(const char *name, rb_encoding *encoding)
 {
@@ -356,6 +440,9 @@ enc_replicate_with_index(const char *name, rb_encoding *origenc, int idx)
 	set_base_encoding(idx, origenc);
 	set_encoding_const(name, rb_enc_from_index(idx));
     }
+    else {
+        rb_raise(rb_eArgError, "failed to replicate encoding");
+    }
     return idx;
 }
 
@@ -377,7 +464,7 @@ rb_define_dummy_encoding(const char *name)
     int index = rb_enc_replicate(name, rb_ascii8bit_encoding());
     rb_encoding *enc = enc_table.list[index].enc;
 
-    ENC_SET_DUMMY(enc);
+    ENC_SET_DUMMY((rb_raw_encoding *)enc);
     return index;
 }
 
@@ -388,7 +475,7 @@ rb_encdb_dummy(const char *name)
 					 rb_enc_registered(name));
     rb_encoding *enc = enc_table.list[index].enc;
 
-    ENC_SET_DUMMY(enc);
+    ENC_SET_DUMMY((rb_raw_encoding *)enc);
     return index;
 }
 
@@ -408,7 +495,7 @@ rb_encdb_dummy(const char *name)
 static VALUE
 enc_dummy_p(VALUE enc)
 {
-    return ENC_DUMMY_P(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse;
+    return ENC_DUMMY_P(must_encoding(enc)) ? Qtrue : Qfalse;
 }
 
 /*
@@ -424,17 +511,22 @@ enc_dummy_p(VALUE enc)
 static VALUE
 enc_ascii_compatible_p(VALUE enc)
 {
-    return rb_enc_asciicompat(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse;
+    return rb_enc_asciicompat(must_encoding(enc)) ? Qtrue : Qfalse;
 }
 
 /*
- * Returns 1 when the encoding is Unicode series other than UTF-7 else 0.
+ * Returns non-zero when the encoding is Unicode series other than UTF-7 else 0.
  */
 int
 rb_enc_unicode_p(rb_encoding *enc)
 {
-    const char *name = rb_enc_name(enc);
-    return name[0] == 'U' && name[1] == 'T' && name[2] == 'F' && name[4] != '7';
+    return ONIGENC_IS_UNICODE(enc);
+}
+
+static st_data_t
+enc_dup_name(st_data_t name)
+{
+    return (st_data_t)strdup((const char *)name);
 }
 
 /*
@@ -445,7 +537,7 @@ static int
 enc_alias_internal(const char *alias, int idx)
 {
     return st_insert2(enc_table.names, (st_data_t)alias, (st_data_t)idx,
-	    (st_data_t(*)(st_data_t))strdup);
+		      enc_dup_name);
 }
 
 static int
@@ -463,9 +555,6 @@ rb_enc_alias(const char *alias, const char *orig)
     int idx;
 
     enc_check_duplication(alias);
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
     if ((idx = rb_enc_find_index(orig)) < 0) {
 	return -1;
     }
@@ -483,15 +572,11 @@ rb_encdb_alias(const char *alias, const char *orig)
     return enc_alias(alias, idx);
 }
 
-enum {
-    ENCINDEX_ASCII,
-    ENCINDEX_UTF_8,
-    ENCINDEX_US_ASCII,
-    ENCINDEX_BUILTIN_MAX
-};
-
-extern rb_encoding OnigEncodingUTF_8;
-extern rb_encoding OnigEncodingUS_ASCII;
+void
+rb_encdb_set_unicode(int index)
+{
+    ((rb_raw_encoding *)rb_enc_from_index(index))->flags |= ONIGENC_FLAG_UNICODE;
+}
 
 void
 rb_enc_init(void)
@@ -505,21 +590,36 @@ rb_enc_init(void)
     ENC_REGISTER(UTF_8);
     ENC_REGISTER(US_ASCII);
 #undef ENC_REGISTER
+#define ENCDB_REGISTER(name, enc) enc_register_at(ENCINDEX_##enc, name, NULL)
+    ENCDB_REGISTER("UTF-16BE", UTF_16BE);
+    ENCDB_REGISTER("UTF-16LE", UTF_16LE);
+    ENCDB_REGISTER("UTF-32BE", UTF_32BE);
+    ENCDB_REGISTER("UTF-32LE", UTF_32LE);
+    ENCDB_REGISTER("UTF-16", UTF_16);
+    ENCDB_REGISTER("UTF-32", UTF_32);
+    ENCDB_REGISTER("UTF8-MAC", UTF8_MAC);
+
+    ENCDB_REGISTER("EUC-JP", EUC_JP);
+    ENCDB_REGISTER("Windows-31J", Windows_31J);
+#undef ENCDB_REGISTER
     enc_table.count = ENCINDEX_BUILTIN_MAX;
 }
 
 rb_encoding *
 rb_enc_from_index(int index)
 {
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
-    if (index < 0 || enc_table.count <= index) {
+    if (UNLIKELY(index < 0 || enc_table.count <= (index &= ENC_INDEX_MASK))) {
 	return 0;
     }
     return enc_table.list[index].enc;
 }
 
+rb_encoding *
+rb_enc_get_from_index(int index)
+{
+    return must_encindex(index);
+}
+
 int
 rb_enc_registered(const char *name)
 {
@@ -533,36 +633,31 @@ rb_enc_registered(const char *name)
     return -1;
 }
 
-static VALUE
-require_enc(VALUE enclib)
-{
-    return rb_require_safe(enclib, rb_safe_level());
-}
-
 static int
 load_encoding(const char *name)
 {
     VALUE enclib = rb_sprintf("enc/%s.so", name);
     VALUE verbose = ruby_verbose;
     VALUE debug = ruby_debug;
-    VALUE loaded;
+    VALUE errinfo;
     char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib) - 3;
+    int loaded;
     int idx;
 
     while (s < e) {
 	if (!ISALNUM(*s)) *s = '_';
-	else if (ISUPPER(*s)) *s = TOLOWER(*s);
+	else if (ISUPPER(*s)) *s = (char)TOLOWER(*s);
 	++s;
     }
-    FL_UNSET(enclib, FL_TAINT|FL_UNTRUSTED);
-    OBJ_FREEZE(enclib);
+    enclib = rb_fstring(enclib);
     ruby_verbose = Qfalse;
     ruby_debug = Qfalse;
-    loaded = rb_protect(require_enc, enclib, 0);
+    errinfo = rb_errinfo();
+    loaded = rb_require_internal(enclib);
     ruby_verbose = verbose;
     ruby_debug = debug;
-    rb_set_errinfo(Qnil);
-    if (NIL_P(loaded)) return -1;
+    rb_set_errinfo(errinfo);
+    if (loaded < 0 || 1 < 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;
@@ -582,8 +677,10 @@ enc_autoload(rb_encoding *enc)
 	if (enc_autoload_p(base)) {
 	    if (enc_autoload(base) < 0) return -1;
 	}
-	i = ENC_TO_ENCINDEX(enc);
-	enc_register_at(i, rb_enc_name(enc), base);
+	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));
@@ -591,6 +688,7 @@ enc_autoload(rb_encoding *enc)
     return i;
 }
 
+/* Return encoding index or UNSPECIFIED_ENCODING from encoding name */
 int
 rb_enc_find_index(const char *name)
 {
@@ -615,6 +713,17 @@ rb_enc_find_index(const char *name)
     return i;
 }
 
+int
+rb_enc_find_index2(const char *name, long len)
+{
+    char buf[ENCODING_NAMELEN_MAX+1];
+
+    if (len > ENCODING_NAMELEN_MAX) return -1;
+    memcpy(buf, name, len);
+    buf[len] = '\0';
+    return rb_enc_find_index(buf);
+}
+
 rb_encoding *
 rb_enc_find(const char *name)
 {
@@ -631,6 +740,7 @@ enc_capable(VALUE obj)
       case T_STRING:
       case T_REGEXP:
       case T_FILE:
+      case T_SYMBOL:
 	return TRUE;
       case T_DATA:
 	if (is_data_encoding(obj)) return TRUE;
@@ -639,6 +749,12 @@ enc_capable(VALUE obj)
     }
 }
 
+int
+rb_enc_capable(VALUE obj)
+{
+    return enc_capable(obj);
+}
+
 ID
 rb_id_encoding(void)
 {
@@ -646,6 +762,19 @@ 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)
 {
@@ -654,33 +783,29 @@ rb_enc_get_index(VALUE obj)
 
     if (SPECIAL_CONST_P(obj)) {
 	if (!SYMBOL_P(obj)) return -1;
-	obj = rb_id2str(SYM2ID(obj));
+	obj = rb_sym2str(obj);
     }
     switch (BUILTIN_TYPE(obj)) {
-      as_default:
-      default:
       case T_STRING:
+      case T_SYMBOL:
       case T_REGEXP:
-	i = ENCODING_GET_INLINED(obj);
-	if (i == ENCODING_INLINE_MAX) {
-	    VALUE iv;
-
-	    iv = rb_ivar_get(obj, rb_id_encoding());
-	    i = NUM2INT(iv);
-	}
+	i = enc_get_index_str(obj);
 	break;
       case T_FILE:
-	tmp = rb_funcall(obj, rb_intern("internal_encoding"), 0, 0);
-	if (NIL_P(tmp)) obj = rb_funcall(obj, rb_intern("external_encoding"), 0, 0);
-	else obj = tmp;
-	if (NIL_P(obj)) break;
+	tmp = rb_funcallv(obj, rb_intern("internal_encoding"), 0, 0);
+	if (NIL_P(tmp)) {
+	    tmp = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0);
+	}
+	if (is_obj_encoding(tmp)) {
+	    i = enc_check_encoding(tmp);
+	}
+	break;
       case T_DATA:
 	if (is_data_encoding(obj)) {
 	    i = enc_check_encoding(obj);
 	}
-	else {
-	    goto as_default;
-	}
+	break;
+      default:
 	break;
     }
     return i;
@@ -689,6 +814,10 @@ rb_enc_get_index(VALUE obj)
 static void
 enc_set_index(VALUE obj, int idx)
 {
+    if (!enc_capable(obj)) {
+        rb_raise(rb_eArgError, "cannot set encoding on non-encoding capable object");
+    }
+
     if (idx < ENCODING_INLINE_MAX) {
 	ENCODING_SET_INLINED(obj, idx);
 	return;
@@ -701,23 +830,34 @@ void
 rb_enc_set_index(VALUE obj, int idx)
 {
     rb_check_frozen(obj);
+    must_encindex(idx);
     enc_set_index(obj, idx);
 }
 
 VALUE
 rb_enc_associate_index(VALUE obj, int idx)
 {
+    rb_encoding *enc;
+    int oldidx, oldtermlen, termlen;
+
 /*    enc_check_capable(obj);*/
     rb_check_frozen(obj);
-    if (rb_enc_get_index(obj) == idx)
+    oldidx = rb_enc_get_index(obj);
+    if (oldidx == idx)
 	return obj;
     if (SPECIAL_CONST_P(obj)) {
 	rb_raise(rb_eArgError, "cannot set encoding");
     }
+    enc = must_encindex(idx);
     if (!ENC_CODERANGE_ASCIIONLY(obj) ||
-	!rb_enc_asciicompat(rb_enc_from_index(idx))) {
+	!rb_enc_asciicompat(enc)) {
 	ENC_CODERANGE_CLEAR(obj);
     }
+    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);
+    }
     enc_set_index(obj, idx);
     return obj;
 }
@@ -734,10 +874,12 @@ 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(VALUE str1, VALUE str2)
+rb_enc_check_str(VALUE str1, VALUE str2)
 {
-    rb_encoding *enc = rb_enc_compatible(str1, 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)),
@@ -746,50 +888,55 @@ rb_enc_check(VALUE str1, VALUE str2)
 }
 
 rb_encoding*
-rb_enc_compatible(VALUE str1, VALUE str2)
+rb_enc_check(VALUE str1, VALUE str2)
 {
-    int idx1, idx2;
-    rb_encoding *enc1, *enc2;
-
-    idx1 = rb_enc_get_index(str1);
-    idx2 = rb_enc_get_index(str2);
-
-    if (idx1 < 0 || idx2 < 0)
-        return 0;
+    rb_encoding *enc = rb_enc_compatible(str1, str2);
+    if (!enc)
+	rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s",
+		 rb_enc_name(rb_enc_get(str1)),
+		 rb_enc_name(rb_enc_get(str2)));
+    return enc;
+}
 
-    if (idx1 == idx2) {
-	return rb_enc_from_index(idx1);
-    }
-    enc1 = rb_enc_from_index(idx1);
-    enc2 = rb_enc_from_index(idx2);
+static rb_encoding*
+enc_compatible_latter(VALUE str1, VALUE str2, int idx1, int idx2)
+{
+    int isstr1, isstr2;
+    rb_encoding *enc1 = rb_enc_from_index(idx1);
+    rb_encoding *enc2 = rb_enc_from_index(idx2);
 
-    if (BUILTIN_TYPE(str2) == T_STRING && RSTRING_LEN(str2) == 0)
+    isstr2 = RB_TYPE_P(str2, T_STRING);
+    if (isstr2 && RSTRING_LEN(str2) == 0)
 	return enc1;
-    if (BUILTIN_TYPE(str1) == T_STRING && RSTRING_LEN(str1) == 0)
+    isstr1 = RB_TYPE_P(str1, T_STRING);
+    if (isstr1 && RSTRING_LEN(str1) == 0)
 	return (rb_enc_asciicompat(enc1) && rb_enc_str_asciionly_p(str2)) ? enc1 : enc2;
     if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) {
 	return 0;
     }
 
     /* objects whose encoding is the same of contents */
-    if (BUILTIN_TYPE(str2) != T_STRING && idx2 == ENCINDEX_US_ASCII)
+    if (!isstr2 && idx2 == ENCINDEX_US_ASCII)
 	return enc1;
-    if (BUILTIN_TYPE(str1) != T_STRING && idx1 == ENCINDEX_US_ASCII)
+    if (!isstr1 && idx1 == ENCINDEX_US_ASCII)
 	return enc2;
 
-    if (BUILTIN_TYPE(str1) != T_STRING) {
+    if (!isstr1) {
 	VALUE tmp = str1;
 	int idx0 = idx1;
 	str1 = str2;
 	str2 = tmp;
 	idx1 = idx2;
 	idx2 = idx0;
+	idx0 = isstr1;
+	isstr1 = isstr2;
+	isstr2 = idx0;
     }
-    if (BUILTIN_TYPE(str1) == T_STRING) {
+    if (isstr1) {
 	int cr1, cr2;
 
 	cr1 = rb_enc_str_coderange(str1);
-	if (BUILTIN_TYPE(str2) == T_STRING) {
+	if (isstr2) {
 	    cr2 = rb_enc_str_coderange(str2);
 	    if (cr1 != cr2) {
 		/* may need to handle ENC_CODERANGE_BROKEN */
@@ -797,7 +944,6 @@ rb_enc_compatible(VALUE str1, VALUE str2)
 		if (cr2 == ENC_CODERANGE_7BIT) return enc1;
 	    }
 	    if (cr2 == ENC_CODERANGE_7BIT) {
-		if (idx1 == ENCINDEX_ASCII) return enc2;
 		return enc1;
 	    }
 	}
@@ -807,6 +953,39 @@ rb_enc_compatible(VALUE str1, VALUE str2)
     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)
 {
@@ -824,11 +1003,11 @@ rb_enc_copy(VALUE obj1, VALUE obj2)
 VALUE
 rb_obj_encoding(VALUE obj)
 {
-    rb_encoding *enc = rb_enc_get(obj);
-    if (!enc) {
+    int idx = rb_enc_get_index(obj);
+    if (idx < 0) {
 	rb_raise(rb_eTypeError, "unknown encoding");
     }
-    return rb_enc_from_encoding(enc);
+    return rb_enc_from_encoding_index(idx & ENC_INDEX_MASK);
 }
 
 int
@@ -864,7 +1043,8 @@ 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, l;
+    unsigned int c;
+    int l;
     if (e <= p)
         return -1;
     if (rb_enc_asciicompat(enc)) {
@@ -891,12 +1071,11 @@ rb_enc_codepoint_len(const char *p, const char *e, int *len_p, rb_encoding *enc)
     if (e <= p)
         rb_raise(rb_eArgError, "empty string");
     r = rb_enc_precise_mbclen(p, e, enc);
-    if (MBCLEN_CHARFOUND_P(r)) {
-	if (len_p) *len_p = MBCLEN_CHARFOUND_LEN(r);
-        return rb_enc_mbc_to_codepoint(p, e, enc);
-    }
-    else
+    if (!MBCLEN_CHARFOUND_P(r)) {
 	rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc));
+    }
+    if (len_p) *len_p = MBCLEN_CHARFOUND_LEN(r);
+    return rb_enc_mbc_to_codepoint(p, e, enc);
 }
 
 #undef rb_enc_codepoint
@@ -916,6 +1095,13 @@ rb_enc_codelen(int c, rb_encoding *enc)
     return n;
 }
 
+#undef rb_enc_code_to_mbclen
+int
+rb_enc_code_to_mbclen(int code, rb_encoding *enc)
+{
+    return ONIGENC_CODE_TO_MBCLEN(enc, code);
+}
+
 int
 rb_enc_toupper(int c, rb_encoding *enc)
 {
@@ -940,16 +1126,25 @@ rb_enc_tolower(int c, rb_encoding *enc)
 static VALUE
 enc_inspect(VALUE self)
 {
-    VALUE str = rb_sprintf("#<%s:%s%s>", rb_obj_classname(self),
-		      rb_enc_name((rb_encoding*)DATA_PTR(self)),
-		      (enc_dummy_p(self) ? " (dummy)" : ""));
-    ENCODING_CODERANGE_SET(str, rb_usascii_encindex(), ENC_CODERANGE_7BIT);
-    return str;
+    rb_encoding *enc;
+
+    if (!is_data_encoding(self)) {
+	not_encoding(self);
+    }
+    if (!(enc = DATA_PTR(self)) || rb_enc_from_index(rb_enc_to_index(enc)) != enc) {
+	rb_raise(rb_eTypeError, "broken Encoding");
+    }
+    return rb_enc_sprintf(rb_usascii_encoding(),
+			  "#<%"PRIsVALUE":%s%s%s>", rb_obj_class(self),
+			  rb_enc_name(enc),
+			  (ENC_DUMMY_P(enc) ? " (dummy)" : ""),
+			  enc_autoload_p(enc) ? " (autoload)" : "");
 }
 
 /*
  * call-seq:
  *   enc.name -> string
+ *   enc.to_s -> string
  *
  * Returns the name of the encoding.
  *
@@ -958,7 +1153,7 @@ enc_inspect(VALUE self)
 static VALUE
 enc_name(VALUE self)
 {
-    return rb_usascii_str_new2(rb_enc_name((rb_encoding*)DATA_PTR(self)));
+    return rb_fstring_cstr(rb_enc_name((rb_encoding*)DATA_PTR(self)));
 }
 
 static int
@@ -967,8 +1162,7 @@ enc_names_i(st_data_t name, st_data_t idx, st_data_t args)
     VALUE *arg = (VALUE *)args;
 
     if ((int)idx == (int)arg[0]) {
-	VALUE str = rb_usascii_str_new2((char *)name);
-	OBJ_FREEZE(str);
+	VALUE str = rb_fstring_cstr((char *)name);
 	rb_ary_push(arg[1], str);
     }
     return ST_CONTINUE;
@@ -980,7 +1174,7 @@ enc_names_i(st_data_t name, st_data_t idx, st_data_t args)
  *
  * Returns the list of name and aliases of the encoding.
  *
- *   Encoding::WINDOWS_31J.names  #=> ["Windows-31J", "CP932", "csWindows31J"]
+ *   Encoding::WINDOWS_31J.names  #=> ["Windows-31J", "CP932", "csWindows31J", "SJIS", "PCK"]
  */
 static VALUE
 enc_names(VALUE self)
@@ -1022,13 +1216,11 @@ enc_list(VALUE klass)
 /*
  * call-seq:
  *   Encoding.find(string) -> enc
- *   Encoding.find(symbol) -> enc
  *
  * Search the encoding with specified <i>name</i>.
- * <i>name</i> should be a string or symbol.
+ * <i>name</i> should be a string.
  *
  *   Encoding.find("US-ASCII")  #=> #<Encoding:US-ASCII>
- *   Encoding.find(:Shift_JIS)  #=> #<Encoding:Shift_JIS>
  *
  * Names which this method accept are encoding names and aliases
  * including following special aliases
@@ -1046,7 +1238,12 @@ enc_list(VALUE klass)
 static VALUE
 enc_find(VALUE klass, VALUE enc)
 {
-    return rb_enc_from_encoding(rb_to_encoding(enc));
+    int idx;
+    if (is_obj_encoding(enc))
+	return enc;
+    idx = str_to_encindex(enc);
+    if (idx == UNSPECIFIED_ENCODING) return Qnil;
+    return rb_enc_from_encoding_index(idx);
 }
 
 /*
@@ -1069,7 +1266,7 @@ enc_find(VALUE klass, VALUE enc)
  *
  * If the objects are non-strings their encodings are compatible when they
  * have an encoding and:
- * * Either encoding is US ASCII compatible
+ * * Either encoding is US-ASCII compatible
  * * One of the encodings is a 7-bit encoding
  *
  */
@@ -1087,9 +1284,17 @@ 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_scan_args(argc, argv, "01", 0);
+    rb_check_arity(argc, 0, 1);
     return enc_name(self);
 }
 
@@ -1097,15 +1302,19 @@ 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);
 }
 
 rb_encoding *
 rb_ascii8bit_encoding(void)
 {
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
     return enc_table.list[ENCINDEX_ASCII].enc;
 }
 
@@ -1118,9 +1327,6 @@ rb_ascii8bit_encindex(void)
 rb_encoding *
 rb_utf8_encoding(void)
 {
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
     return enc_table.list[ENCINDEX_UTF_8].enc;
 }
 
@@ -1133,9 +1339,6 @@ rb_utf8_encindex(void)
 rb_encoding *
 rb_usascii_encoding(void)
 {
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
     return enc_table.list[ENCINDEX_US_ASCII].enc;
 }
 
@@ -1145,18 +1348,22 @@ rb_usascii_encindex(void)
     return ENCINDEX_US_ASCII;
 }
 
+int rb_locale_charmap_index(void);
+
 int
 rb_locale_encindex(void)
 {
-    VALUE charmap = rb_locale_charmap(rb_cEncoding);
-    int idx;
+    int idx = rb_locale_charmap_index();
 
-    if (NIL_P(charmap))
-        idx = rb_usascii_encindex();
-    else if ((idx = rb_enc_find_index(StringValueCStr(charmap))) < 0)
-        idx = rb_ascii8bit_encindex();
+    if (idx < 0) idx = ENCINDEX_ASCII;
 
-    if (rb_enc_registered("locale") < 0) enc_alias_internal("locale", idx);
+    if (rb_enc_registered("locale") < 0) {
+# if defined _WIN32
+	void Init_w32_codepage(void);
+	Init_w32_codepage();
+# endif
+	enc_alias_internal("locale", idx);
+    }
 
     return idx;
 }
@@ -1167,31 +1374,12 @@ rb_locale_encoding(void)
     return rb_enc_from_index(rb_locale_encindex());
 }
 
-static int
-enc_set_filesystem_encoding(void)
-{
-    int idx;
-#if defined NO_LOCALE_CHARMAP
-    idx = rb_enc_to_index(rb_default_external_encoding());
-#elif defined _WIN32 || defined __CYGWIN__
-    char cp[sizeof(int) * 8 / 3 + 4];
-    snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP());
-    idx = rb_enc_find_index(cp);
-    if (idx < 0) idx = rb_ascii8bit_encindex();
-#else
-    idx = rb_enc_to_index(rb_default_external_encoding());
-#endif
-
-    enc_alias_internal("filesystem", idx);
-    return idx;
-}
-
 int
 rb_filesystem_encindex(void)
 {
     int idx = rb_enc_registered("filesystem");
     if (idx < 0)
-	idx = rb_ascii8bit_encindex();
+	idx = ENCINDEX_ASCII;
     return idx;
 }
 
@@ -1230,7 +1418,7 @@ enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const cha
     }
 
     if (def == &default_external)
-	enc_set_filesystem_encoding();
+	enc_alias_internal("filesystem", Init_enc_set_filesystem_encoding());
 
     return overridden;
 }
@@ -1303,7 +1491,7 @@ rb_enc_set_default_external(VALUE encoding)
  *
  * Sets default external encoding.  You should not set
  * Encoding::default_external in ruby code as strings created before changing
- * the value may have a different encoding from strings created after thevalue
+ * the value may have a different encoding from strings created after the value
  * was changed., instead you should use <tt>ruby -E</tt> to invoke ruby with
  * the correct default_external.
  *
@@ -1350,18 +1538,16 @@ rb_enc_default_internal(void)
  * * File names from Dir
  * * Integer#chr
  * * String#inspect and Regexp#inspect
- * * Strings returned from Curses
  * * Strings returned from Readline
  * * Strings returned from SDBM
  * * Time#zone
  * * Values from ENV
  * * Values in ARGV including $PROGRAM_NAME
- * * __FILE__
  *
  * Additionally String#encode and String#encode! use the default internal
  * encoding if no encoding is given.
  *
- * The locale encoding (__ENCODING__), not default_internal, is used as the
+ * The script encoding (__ENCODING__), not default_internal, is used as the
  * encoding of created strings.
  *
  * Encoding::default_internal is initialized by the source file's
@@ -1401,56 +1587,6 @@ 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)
-{
-#if defined NO_LOCALE_CHARMAP
-    return rb_usascii_str_new2("ASCII-8BIT");
-#elif defined _WIN32 || defined __CYGWIN__
-    const char *nl_langinfo_codeset(void);
-    const char *codeset = nl_langinfo_codeset();
-    char cp[sizeof(int) * 3 + 4];
-    if (!codeset) {
-	UINT codepage = GetConsoleCP();
-	if(!codepage) codepage = GetACP();
-	snprintf(cp, sizeof(cp), "CP%d", codepage);
-	codeset = cp;
-    }
-    return rb_usascii_str_new2(codeset);
-#elif defined HAVE_LANGINFO_H
-    char *codeset;
-    codeset = nl_langinfo(CODESET);
-    return rb_usascii_str_new2(codeset);
-#else
-    return Qnil;
-#endif
-}
-
 static void
 set_encoding_const(const char *name, rb_encoding *enc)
 {
@@ -1506,8 +1642,7 @@ static int
 rb_enc_name_list_i(st_data_t name, st_data_t idx, st_data_t arg)
 {
     VALUE ary = (VALUE)arg;
-    VALUE str = rb_usascii_str_new2((char *)name);
-    OBJ_FREEZE(str);
+    VALUE str = rb_fstring_cstr((char *)name);
     rb_ary_push(ary, str);
     return ST_CONTINUE;
 }
@@ -1549,12 +1684,10 @@ 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_usascii_str_new2(rb_enc_name(enc));
-	OBJ_FREEZE(str);
+	str = rb_fstring_cstr(rb_enc_name(enc));
 	rb_ary_store(ary, idx, str);
     }
-    key = rb_usascii_str_new2((char *)name);
-    OBJ_FREEZE(key);
+    key = rb_fstring_cstr((char *)name);
     rb_hash_aset(aliases, key, str);
     return ST_CONTINUE;
 }
@@ -1566,8 +1699,8 @@ rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg)
  * Returns the hash of available encoding alias and original encoding name.
  *
  *   Encoding.aliases
- *   #=> {"BINARY"=>"ASCII-8BIT", "ASCII"=>"US-ASCII", "ANSI_X3.4-1986"=>"US-ASCII",
- *         "SJIS"=>"Shift_JIS", "eucJP"=>"EUC-JP", "CP932"=>"Windows-31J"}
+ *   #=> {"BINARY"=>"ASCII-8BIT", "ASCII"=>"US-ASCII", "ANSI_X3.4-1968"=>"US-ASCII",
+ *         "SJIS"=>"Windows-31J", "eucJP"=>"EUC-JP", "CP932"=>"Windows-31J"}
  *
  */
 
@@ -1581,6 +1714,207 @@ rb_enc_aliases(VALUE klass)
     return aliases[0];
 }
 
+/*
+ * An Encoding instance represents a character encoding usable in Ruby. It is
+ * defined as a constant under the Encoding namespace. It has a name and
+ * optionally, aliases:
+ *
+ *   Encoding::ISO_8859_1.name
+ *   #=> "ISO-8859-1"
+ *
+ *   Encoding::ISO_8859_1.names
+ *   #=> ["ISO-8859-1", "ISO8859-1"]
+ *
+ * Ruby methods dealing with encodings return or accept Encoding instances as
+ * arguments (when a method accepts an Encoding instance as an argument, it
+ * can be passed an Encoding name or alias instead).
+ *
+ *   "some string".encoding
+ *   #=> #<Encoding:UTF-8>
+ *
+ *   string = "some string".encode(Encoding::ISO_8859_1)
+ *   #=> "some string"
+ *   string.encoding
+ *   #=> #<Encoding:ISO-8859-1>
+ *
+ *   "some string".encode "ISO-8859-1"
+ *   #=> "some string"
+ *
+ * Encoding::ASCII_8BIT is a special encoding that is usually used for
+ * a byte string, not a character string. But as the name insists, its
+ * characters in the range of ASCII are considered as ASCII
+ * characters.  This is useful when you use ASCII-8BIT characters with
+ * other ASCII compatible characters.
+ *
+ * == Changing an encoding
+ *
+ * The associated Encoding of a String can be changed in two different ways.
+ *
+ * First, it is possible to set the Encoding of a string to a new Encoding
+ * without changing the internal byte representation of the string, with
+ * String#force_encoding. This is how you can tell Ruby the correct encoding
+ * of a string.
+ *
+ *   string
+ *   #=> "R\xC3\xA9sum\xC3\xA9"
+ *   string.encoding
+ *   #=> #<Encoding:ISO-8859-1>
+ *   string.force_encoding(Encoding::UTF_8)
+ *   #=> "R\u00E9sum\u00E9"
+ *
+ * Second, it is possible to transcode a string, i.e. translate its internal
+ * byte representation to another encoding. Its associated encoding is also
+ * set to the other encoding. See String#encode for the various forms of
+ * transcoding, and the Encoding::Converter class for additional control over
+ * the transcoding process.
+ *
+ *   string
+ *   #=> "R\u00E9sum\u00E9"
+ *   string.encoding
+ *   #=> #<Encoding:UTF-8>
+ *   string = string.encode!(Encoding::ISO_8859_1)
+ *   #=> "R\xE9sum\xE9"
+ *   string.encoding
+ *   #=> #<Encoding::ISO-8859-1>
+ *
+ * == Script encoding
+ *
+ * All Ruby script code has an associated Encoding which any String literal
+ * created in the source code will be associated to.
+ *
+ * The default script encoding is Encoding::UTF_8 after v2.0, but it
+ * can be changed by a magic comment on the first line of the source
+ * code file (or second line, if there is a shebang line on the
+ * first). The comment must contain the word <code>coding</code> or
+ * <code>encoding</code>, followed by a colon, space and the Encoding
+ * name or alias:
+ *
+ *   # encoding: UTF-8
+ *
+ *   "some string".encoding
+ *   #=> #<Encoding:UTF-8>
+ *
+ * The <code>__ENCODING__</code> keyword returns the script encoding of the file
+ * which the keyword is written:
+ *
+ *   # encoding: ISO-8859-1
+ *
+ *   __ENCODING__
+ *   #=> #<Encoding:ISO-8859-1>
+ *
+ * <code>ruby -K</code> will change the default locale encoding, but this is
+ * not recommended. Ruby source files should declare its script encoding by a
+ * magic comment even when they only depend on US-ASCII strings or regular
+ * expressions.
+ *
+ * == Locale encoding
+ *
+ * The default encoding of the environment. Usually derived from locale.
+ *
+ * see Encoding.locale_charmap, Encoding.find('locale')
+ *
+ * == Filesystem encoding
+ *
+ * The default encoding of strings from the filesystem of the environment.
+ * This is used for strings of file names or paths.
+ *
+ * see Encoding.find('filesystem')
+ *
+ * == External encoding
+ *
+ * Each IO object has an external encoding which indicates the encoding that
+ * Ruby will use to read its data. By default Ruby sets the external encoding
+ * of an IO object to the default external encoding. The default external
+ * encoding is set by locale encoding or the interpreter <code>-E</code> option.
+ * Encoding.default_external returns the current value of the external
+ * encoding.
+ *
+ *   ENV["LANG"]
+ *   #=> "UTF-8"
+ *   Encoding.default_external
+ *   #=> #<Encoding:UTF-8>
+ *
+ *   $ ruby -E ISO-8859-1 -e "p Encoding.default_external"
+ *   #<Encoding:ISO-8859-1>
+ *
+ *   $ LANG=C ruby -e 'p Encoding.default_external'
+ *   #<Encoding:US-ASCII>
+ *
+ * The default external encoding may also be set through
+ * Encoding.default_external=, but you should not do this as strings created
+ * before and after the change will have inconsistent encodings.  Instead use
+ * <code>ruby -E</code> to invoke ruby with the correct external encoding.
+ *
+ * When you know that the actual encoding of the data of an IO object is not
+ * the default external encoding, you can reset its external encoding with
+ * IO#set_encoding or set it at IO object creation (see IO.new options).
+ *
+ * == Internal encoding
+ *
+ * To process the data of an IO object which has an encoding different
+ * from its external encoding, you can set its internal encoding. Ruby will use
+ * this internal encoding to transcode the data when it is read from the IO
+ * object.
+ *
+ * Conversely, when data is written to the IO object it is transcoded from the
+ * internal encoding to the external encoding of the IO object.
+ *
+ * The internal encoding of an IO object can be set with
+ * IO#set_encoding or at IO object creation (see IO.new options).
+ *
+ * The internal encoding is optional and when not set, the Ruby default
+ * internal encoding is used. If not explicitly set this default internal
+ * encoding is +nil+ meaning that by default, no transcoding occurs.
+ *
+ * The default internal encoding can be set with the interpreter option
+ * <code>-E</code>. Encoding.default_internal returns the current internal
+ * encoding.
+ *
+ *    $ ruby -e 'p Encoding.default_internal'
+ *    nil
+ *
+ *    $ ruby -E ISO-8859-1:UTF-8 -e "p [Encoding.default_external, \
+ *      Encoding.default_internal]"
+ *    [#<Encoding:ISO-8859-1>, #<Encoding:UTF-8>]
+ *
+ * The default internal encoding may also be set through
+ * Encoding.default_internal=, but you should not do this as strings created
+ * before and after the change will have inconsistent encodings.  Instead use
+ * <code>ruby -E</code> to invoke ruby with the correct internal encoding.
+ *
+ * == IO encoding example
+ *
+ * In the following example a UTF-8 encoded string "R\u00E9sum\u00E9" is transcoded for
+ * output to ISO-8859-1 encoding, then read back in and transcoded to UTF-8:
+ *
+ *   string = "R\u00E9sum\u00E9"
+ *
+ *   open("transcoded.txt", "w:ISO-8859-1") do |io|
+ *     io.write(string)
+ *   end
+ *
+ *   puts "raw text:"
+ *   p File.binread("transcoded.txt")
+ *   puts
+ *
+ *   open("transcoded.txt", "r:ISO-8859-1:UTF-8") do |io|
+ *     puts "transcoded text:"
+ *     p io.read
+ *   end
+ *
+ * While writing the file, the internal encoding is not specified as it is
+ * only necessary for reading.  While reading the file both the internal and
+ * external encoding must be specified to obtain the correct result.
+ *
+ *   $ ruby t.rb
+ *   raw text:
+ *   "R\xE9sum\xE9"
+ *
+ *   transcoded text:
+ *   "R\u00E9sum\u00E9"
+ *
+ */
+
 void
 Init_Encoding(void)
 {
@@ -1590,7 +1924,7 @@ Init_Encoding(void)
     int i;
 
     rb_cEncoding = rb_define_class("Encoding", rb_cObject);
-    rb_undef_alloc_func(rb_cEncoding);
+    rb_define_alloc_func(rb_cEncoding, enc_s_alloc);
     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);
@@ -1612,45 +1946,30 @@ 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);
+    rb_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0); /* in localeinit.c */
 
     list = rb_ary_new2(enc_table.count);
-    RBASIC(list)->klass = 0;
+    RBASIC_CLEAR_CLASS(list);
     rb_encoding_list = list;
     rb_gc_register_mark_object(list);
 
     for (i = 0; i < enc_table.count; ++i) {
 	rb_ary_push(list, enc_new(enc_table.list[i].enc));
     }
-}
-
-/* locale insensitive 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); }
+    rb_marshal_define_compat(rb_cEncoding, Qnil, NULL, enc_m_loader);
+}
 
-int
-rb_tolower(int c)
+void
+Init_encodings(void)
 {
-    return rb_isascii(c) ? ONIGENC_ASCII_CODE_TO_LOWER_CASE(c) : c;
+    rb_enc_init();
 }
 
-int
-rb_toupper(int c)
+/* locale insensitive ctype functions */
+
+void
+rb_enc_foreach_name(int (*func)(st_data_t name, st_data_t idx, st_data_t arg), st_data_t arg)
 {
-    return rb_isascii(c) ? ONIGENC_ASCII_CODE_TO_UPPER_CASE(c) : c;
+    st_foreach(enc_table.names, func, arg);
 }
-
diff --git a/enum.c b/enum.c
index de954c938f..cc77964ff9 100644
--- a/enum.c
+++ b/enum.c
@@ -9,19 +9,28 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "ruby/encoding.h"
+#include "internal.h"
 #include "ruby/util.h"
-#include "node.h"
 #include "id.h"
+#include "symbol.h"
+
+#include <assert.h>
 
 VALUE rb_mEnumerable;
+
 static ID id_next;
+
+#define id_div idDiv
 #define id_each idEach
 #define id_eqq  idEqq
 #define id_cmp  idCmp
+#define id_lshift idLTLT
+#define id_call idCall
+#define id_size idSize
 
-static VALUE
-enum_values_pack(int argc, VALUE *argv)
+VALUE
+rb_enum_values_pack(int argc, const VALUE *argv)
 {
     if (argc == 0) return Qnil;
     if (argc == 1) return argv[0];
@@ -29,39 +38,59 @@ enum_values_pack(int argc, VALUE *argv)
 }
 
 #define ENUM_WANT_SVALUE() do { \
-    i = enum_values_pack(argc, argv); \
+    i = rb_enum_values_pack(argc, argv); \
 } while (0)
 
-#define enum_yield rb_yield_values2
+static VALUE
+enum_yield(int argc, VALUE ary)
+{
+    if (argc > 1)
+	return rb_yield_force_blockarg(ary);
+    if (argc == 1)
+	return rb_yield(ary);
+    return rb_yield_values2(0, 0);
+}
 
 static VALUE
-grep_i(VALUE i, VALUE args, int argc, VALUE *argv)
+enum_yield_array(VALUE ary)
 {
-    VALUE *arg = (VALUE *)args;
+    long len = RARRAY_LEN(ary);
+
+    if (len > 1)
+	return rb_yield_force_blockarg(ary);
+    if (len == 1)
+	return rb_yield(RARRAY_AREF(ary, 0));
+    return rb_yield_values2(0, 0);
+}
+
+static VALUE
+grep_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
+{
+    struct MEMO *memo = MEMO_CAST(args);
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
-	rb_ary_push(arg[1], i);
+    if (RTEST(rb_funcallv(memo->v1, id_eqq, 1, &i)) == RTEST(memo->u3.value)) {
+	rb_ary_push(memo->v2, i);
     }
     return Qnil;
 }
 
 static VALUE
-grep_iter_i(VALUE i, VALUE args, int argc, VALUE *argv)
+grep_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    VALUE *arg = (VALUE *)args;
+    struct MEMO *memo = MEMO_CAST(args);
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
-	rb_ary_push(arg[1], rb_yield(i));
+    if (RTEST(rb_funcallv(memo->v1, id_eqq, 1, &i)) == RTEST(memo->u3.value)) {
+	rb_ary_push(memo->v2, enum_yield(argc, i));
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.grep(pattern)                   -> array
- *     enum.grep(pattern) {| obj | block }  -> array
+ *     enum.grep(pattern)                  -> array
+ *     enum.grep(pattern) { |obj| block }  -> array
  *
  *  Returns an array of every element in <i>enum</i> for which
  *  <code>Pattern === element</code>. If the optional <em>block</em> is
@@ -71,7 +100,7 @@ grep_iter_i(VALUE i, VALUE args, int argc, VALUE *argv)
  *     (1..100).grep 38..44   #=> [38, 39, 40, 41, 42, 43, 44]
  *     c = IO.constants
  *     c.grep(/SEEK/)         #=> [:SEEK_SET, :SEEK_CUR, :SEEK_END]
- *     res = c.grep(/SEEK/) {|v| IO.const_get(v) }
+ *     res = c.grep(/SEEK/) { |v| IO.const_get(v) }
  *     res                    #=> [0, 1, 2]
  *
  */
@@ -80,72 +109,123 @@ static VALUE
 enum_grep(VALUE obj, VALUE pat)
 {
     VALUE ary = rb_ary_new();
-    VALUE arg[2];
+    struct MEMO *memo = MEMO_NEW(pat, ary, Qtrue);
 
-    arg[0] = pat;
-    arg[1] = ary;
+    rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)memo);
 
-    rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
+    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);
+
+    rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)memo);
 
     return ary;
 }
 
+#define COUNT_BIGNUM IMEMO_FL_USER0
+#define MEMO_V3_SET(m, v) RB_OBJ_WRITE((m), &(m)->u3.value, (v))
+
+static void
+imemo_count_up(struct MEMO *memo)
+{
+    if (memo->flags & COUNT_BIGNUM) {
+	MEMO_V3_SET(memo, rb_int_succ(memo->u3.value));
+    }
+    else if (++memo->u3.cnt == 0) {
+	/* overflow */
+	unsigned long buf[2] = {0, 1};
+	MEMO_V3_SET(memo, rb_big_unpack(buf, 2));
+	memo->flags |= COUNT_BIGNUM;
+    }
+}
+
+static VALUE
+imemo_count_value(struct MEMO *memo)
+{
+    if (memo->flags & COUNT_BIGNUM) {
+	return memo->u3.value;
+    }
+    else {
+	return ULONG2NUM(memo->u3.cnt);
+    }
+}
+
 static VALUE
-count_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+count_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
-    VALUE *memo = (VALUE*)memop;
+    struct MEMO *memo = MEMO_CAST(memop);
 
     ENUM_WANT_SVALUE();
 
-    if (rb_equal(i, memo[1])) {
-	memo[0]++;
+    if (rb_equal(i, memo->v1)) {
+	imemo_count_up(memo);
     }
     return Qnil;
 }
 
 static VALUE
-count_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+count_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
-    VALUE *memo = (VALUE*)memop;
+    struct MEMO *memo = MEMO_CAST(memop);
 
-    if (RTEST(enum_yield(argc, argv))) {
-	memo[0]++;
+    if (RTEST(rb_yield_values2(argc, argv))) {
+	imemo_count_up(memo);
     }
     return Qnil;
 }
 
 static VALUE
-count_all_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+count_all_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
-    VALUE *memo = (VALUE*)memop;
+    struct MEMO *memo = MEMO_CAST(memop);
 
-    memo[0]++;
+    imemo_count_up(memo);
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.count                   -> int
- *     enum.count(item)             -> int
- *     enum.count {| obj | block }  -> int
+ *     enum.count                 -> int
+ *     enum.count(item)           -> int
+ *     enum.count { |obj| block } -> int
  *
- *  Returns the number of items in <i>enum</i>, where #size is called
- *  if it responds to it, otherwise the items are counted through
- *  enumeration.  If an argument is given, counts the number of items
- *  in <i>enum</i>, for which equals to <i>item</i>.  If a block is
- *  given, counts the number of elements yielding a true value.
+ *  Returns the number of items in +enum+ through enumeration.
+ *  If an argument is given, the number of items in +enum+ that
+ *  are equal to +item+ are counted.  If a block is given, it
+ *  counts the number of elements yielding a true value.
  *
  *     ary = [1, 2, 4, 2]
- *     ary.count             #=> 4
- *     ary.count(2)          #=> 2
- *     ary.count{|x|x%2==0}  #=> 3
+ *     ary.count               #=> 4
+ *     ary.count(2)            #=> 2
+ *     ary.count{ |x| x%2==0 } #=> 3
  *
  */
 
 static VALUE
 enum_count(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE memo[2];	/* [count, condition value] */
+    VALUE item = Qnil;
+    struct MEMO *memo;
     rb_block_call_func *func;
 
     if (argc == 0) {
@@ -157,25 +237,27 @@ enum_count(int argc, VALUE *argv, VALUE obj)
 	}
     }
     else {
-	rb_scan_args(argc, argv, "1", &memo[1]);
+	rb_scan_args(argc, argv, "1", &item);
 	if (rb_block_given_p()) {
 	    rb_warn("given block not used");
 	}
         func = count_i;
     }
 
-    memo[0] = 0;
-    rb_block_call(obj, id_each, 0, 0, func, (VALUE)&memo);
-    return INT2NUM(memo[0]);
+    memo = MEMO_NEW(item, 0, 0);
+    rb_block_call(obj, id_each, 0, 0, func, (VALUE)memo);
+    return imemo_count_value(memo);
 }
 
 static VALUE
-find_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+find_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_yield(i))) {
-	*memo = i;
+    if (RTEST(enum_yield(argc, i))) {
+	struct MEMO *memo = MEMO_CAST(memop);
+	MEMO_V1_SET(memo, i);
+	memo->u3.cnt = 1;
 	rb_iter_break();
     }
     return Qnil;
@@ -183,10 +265,10 @@ find_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *     enum.detect(ifnone = nil) {| obj | block }  -> obj or nil
- *     enum.find(ifnone = nil)   {| obj | block }  -> obj or nil
- *     enum.detect(ifnone = nil)                   -> an_enumerator
- *     enum.find(ifnone = nil)                     -> an_enumerator
+ *     enum.detect(ifnone = nil) { |obj| block } -> obj or nil
+ *     enum.find(ifnone = nil)   { |obj| block } -> obj or nil
+ *     enum.detect(ifnone = nil)                 -> an_enumerator
+ *     enum.find(ifnone = nil)                   -> an_enumerator
  *
  *  Passes each entry in <i>enum</i> to <em>block</em>. Returns the
  *  first for which <em>block</em> is not false.  If no
@@ -195,62 +277,70 @@ find_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
  *
  *  If no block is given, an enumerator is returned instead.
  *
- *     (1..10).detect  {|i| i % 5 == 0 and i % 7 == 0 }   #=> nil
- *     (1..100).detect {|i| i % 5 == 0 and i % 7 == 0 }   #=> 35
+ *     (1..100).detect  #=> #<Enumerator: 1..100:detect>
+ *     (1..100).find    #=> #<Enumerator: 1..100:find>
+ *
+ *     (1..10).detect         { |i| i % 5 == 0 && i % 7 == 0 }   #=> nil
+ *     (1..10).find           { |i| i % 5 == 0 && i % 7 == 0 }   #=> nil
+ *     (1..10).detect(-> {0}) { |i| i % 5 == 0 && i % 7 == 0 }   #=> 0
+ *     (1..10).find(-> {0})   { |i| i % 5 == 0 && i % 7 == 0 }   #=> 0
+ *     (1..100).detect        { |i| i % 5 == 0 && i % 7 == 0 }   #=> 35
+ *     (1..100).find          { |i| i % 5 == 0 && i % 7 == 0 }   #=> 35
  *
  */
 
 static VALUE
 enum_find(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE memo = Qundef;
+    struct MEMO *memo;
     VALUE if_none;
 
-    rb_scan_args(argc, argv, "01", &if_none);
+    if_none = rb_check_arity(argc, 0, 1) ? argv[0] : Qnil;
     RETURN_ENUMERATOR(obj, argc, argv);
-    rb_block_call(obj, id_each, 0, 0, find_i, (VALUE)&memo);
-    if (memo != Qundef) {
-	return memo;
+    memo = MEMO_NEW(Qundef, 0, 0);
+    rb_block_call(obj, id_each, 0, 0, find_i, (VALUE)memo);
+    if (memo->u3.cnt) {
+	return memo->v1;
     }
     if (!NIL_P(if_none)) {
-	return rb_funcall(if_none, rb_intern("call"), 0, 0);
+	return rb_funcallv(if_none, id_call, 0, 0);
     }
     return Qnil;
 }
 
 static VALUE
-find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+find_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
-    VALUE *memo = (VALUE*)memop;
+    struct MEMO *memo = MEMO_CAST(memop);
 
     ENUM_WANT_SVALUE();
 
-    if (rb_equal(i, memo[2])) {
-	memo[0] = UINT2NUM(memo[1]);
+    if (rb_equal(i, memo->v2)) {
+	MEMO_V1_SET(memo, imemo_count_value(memo));
 	rb_iter_break();
     }
-    memo[1]++;
+    imemo_count_up(memo);
     return Qnil;
 }
 
 static VALUE
-find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+find_index_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
-    VALUE *memo = (VALUE*)memop;
+    struct MEMO *memo = MEMO_CAST(memop);
 
-    if (RTEST(enum_yield(argc, argv))) {
-	memo[0] = UINT2NUM(memo[1]);
+    if (RTEST(rb_yield_values2(argc, argv))) {
+	MEMO_V1_SET(memo, imemo_count_value(memo));
 	rb_iter_break();
     }
-    memo[1]++;
+    imemo_count_up(memo);
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.find_index(value)            -> int or nil
- *     enum.find_index {| obj | block }  -> int or nil
- *     enum.find_index                   -> an_enumerator
+ *     enum.find_index(value)          -> int or nil
+ *     enum.find_index { |obj| block } -> int or nil
+ *     enum.find_index                 -> an_enumerator
  *
  *  Compares each entry in <i>enum</i> with <em>value</em> or passes
  *  to <em>block</em>.  Returns the index for the first for which the
@@ -259,16 +349,17 @@ find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
  *
  *  If neither block nor argument is given, an enumerator is returned instead.
  *
- *     (1..10).find_index  {|i| i % 5 == 0 and i % 7 == 0 }   #=> nil
- *     (1..100).find_index {|i| i % 5 == 0 and i % 7 == 0 }   #=> 34
- *     (1..100).find_index(50)                                #=> 49
+ *     (1..10).find_index  { |i| i % 5 == 0 && i % 7 == 0 }  #=> nil
+ *     (1..100).find_index { |i| i % 5 == 0 && i % 7 == 0 }  #=> 34
+ *     (1..100).find_index(50)                               #=> 49
  *
  */
 
 static VALUE
 enum_find_index(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE memo[3];	/* [return value, current index, condition value] */
+    struct MEMO *memo;	/* [return value, current index, ] */
+    VALUE condition_value = Qnil;
     rb_block_call_func *func;
 
     if (argc == 0) {
@@ -276,46 +367,78 @@ enum_find_index(int argc, VALUE *argv, VALUE obj)
         func = find_index_iter_i;
     }
     else {
-	rb_scan_args(argc, argv, "1", &memo[2]);
+	rb_scan_args(argc, argv, "1", &condition_value);
 	if (rb_block_given_p()) {
 	    rb_warn("given block not used");
 	}
         func = find_index_i;
     }
 
-    memo[0] = Qnil;
-    memo[1] = 0;
+    memo = MEMO_NEW(Qnil, condition_value, 0);
     rb_block_call(obj, id_each, 0, 0, func, (VALUE)memo);
-    return memo[0];
+    return memo->v1;
 }
 
 static VALUE
-find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+find_all_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_yield(i))) {
+    if (RTEST(enum_yield(argc, i))) {
 	rb_ary_push(ary, i);
     }
     return Qnil;
 }
 
+static VALUE
+enum_size(VALUE self, VALUE args, VALUE eobj)
+{
+    return rb_check_funcall_default(self, id_size, 0, 0, Qnil);
+}
+
+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
- *     enum.select   {| obj | block }  -> array
- *     enum.find_all                   -> an_enumerator
- *     enum.select                     -> an_enumerator
+ *     enum.find_all { |obj| block } -> array
+ *     enum.select   { |obj| block } -> array
+ *     enum.filter   { |obj| block } -> array
+ *     enum.find_all                 -> an_enumerator
+ *     enum.select                   -> an_enumerator
+ *     enum.filter                   -> an_enumerator
  *
- *  Returns an array containing all elements of <i>enum</i> for which
- *  <em>block</em> is not <code>false</code> (see also
- *  <code>Enumerable#reject</code>).
+ *  Returns an array containing all elements of +enum+
+ *  for which the given +block+ returns a true value.
+ *
+ *  The <i>find_all</i> and <i>select</i> methods are aliases.
+ *  There is no performance benefit to either.
+ *
+ *  If no block is given, an Enumerator is returned instead.
  *
- *  If no block is given, an enumerator is returned instead.
  *
+ *     (1..10).find_all { |i|  i % 3 == 0 }   #=> [3, 6, 9]
  *
- *     (1..10).find_all {|i|  i % 3 == 0 }   #=> [3, 6, 9]
+ *     [1,2,3,4,5].select { |num|  num.even?  }   #=> [2, 4]
  *
+ *     [:foo, :bar].filter { |x| x == :foo }   #=> [:foo]
+ *
+ *  See also Enumerable#reject, Enumerable#grep.
  */
 
 static VALUE
@@ -323,7 +446,7 @@ enum_find_all(VALUE obj)
 {
     VALUE ary;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
+    RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
 
     ary = rb_ary_new();
     rb_block_call(obj, id_each, 0, 0, find_all_i, ary);
@@ -332,11 +455,51 @@ enum_find_all(VALUE obj)
 }
 
 static VALUE
-reject_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+filter_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
+{
+    i = rb_yield_values2(argc, argv);
+
+    if (RTEST(i)) {
+        rb_ary_push(ary, i);
+    }
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.filter_map { |obj| block } -> array
+ *     enum.filter_map                 -> an_enumerator
+ *
+ *  Returns a new array containing the truthy results (everything except
+ *  +false+ or +nil+) of running the +block+ for every element in +enum+.
+ *
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *
+ *     (1..10).filter_map { |i| i * 2 if i.even? } #=> [4, 8, 12, 16, 20]
+ *
+ */
+static VALUE
+enum_filter_map(VALUE obj)
+{
+    VALUE ary;
+
+    RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+
+    ary = rb_ary_new();
+    rb_block_call(obj, id_each, 0, 0, filter_map_i, ary);
+
+    return ary;
+}
+
+
+static VALUE
+reject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
     ENUM_WANT_SVALUE();
 
-    if (!RTEST(rb_yield(i))) {
+    if (!RTEST(enum_yield(argc, i))) {
 	rb_ary_push(ary, i);
     }
     return Qnil;
@@ -344,16 +507,19 @@ reject_i(VALUE i, VALUE ary, int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *     enum.reject {| obj | block }  -> array
- *     enum.reject                   -> an_enumerator
+ *     enum.reject { |obj| block } -> array
+ *     enum.reject                 -> an_enumerator
  *
- *  Returns an array for all elements of <i>enum</i> for which
- *  <em>block</em> is false (see also <code>Enumerable#find_all</code>).
+ *  Returns an array for all elements of +enum+ for which the given
+ *  +block+ returns <code>false</code>.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *     (1..10).reject { |i|  i % 3 == 0 }   #=> [1, 2, 4, 5, 7, 8, 10]
  *
- *     (1..10).reject {|i|  i % 3 == 0 }   #=> [1, 2, 4, 5, 7, 8, 10]
+ *     [1, 2, 3, 4, 5].reject { |num| num.even? } #=> [1, 3, 5]
  *
+ *  See also Enumerable#find_all.
  */
 
 static VALUE
@@ -361,7 +527,7 @@ enum_reject(VALUE obj)
 {
     VALUE ary;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
+    RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
 
     ary = rb_ary_new();
     rb_block_call(obj, id_each, 0, 0, reject_i, ary);
@@ -370,35 +536,34 @@ enum_reject(VALUE obj)
 }
 
 static VALUE
-collect_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+collect_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
-    rb_ary_push(ary, enum_yield(argc, argv));
+    rb_ary_push(ary, rb_yield_values2(argc, argv));
 
     return Qnil;
 }
 
 static VALUE
-collect_all(VALUE i, VALUE ary, int argc, VALUE *argv)
+collect_all(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
-    rb_thread_check_ints();
-    rb_ary_push(ary, enum_values_pack(argc, argv));
+    rb_ary_push(ary, rb_enum_values_pack(argc, argv));
 
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.collect {| obj | block }  -> array
- *     enum.map     {| obj | block }  -> array
- *     enum.collect                   -> an_enumerator
- *     enum.map                       -> an_enumerator
+ *     enum.collect { |obj| block } -> array
+ *     enum.map     { |obj| block } -> array
+ *     enum.collect                 -> an_enumerator
+ *     enum.map                     -> an_enumerator
  *
  *  Returns a new array with the results of running <em>block</em> once
  *  for every element in <i>enum</i>.
  *
  *  If no block is given, an enumerator is returned instead.
  *
- *     (1..4).collect {|i| i*i }   #=> [1, 4, 9, 16]
+ *     (1..4).map { |i| i*i }      #=> [1, 4, 9, 16]
  *     (1..4).collect { "cat"  }   #=> ["cat", "cat", "cat", "cat"]
  *
  */
@@ -407,21 +572,23 @@ static VALUE
 enum_collect(VALUE obj)
 {
     VALUE ary;
+    int min_argc, max_argc;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
+    RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
 
     ary = rb_ary_new();
-    rb_block_call(obj, id_each, 0, 0, collect_i, ary);
+    min_argc = rb_block_min_max_arity(&max_argc);
+    rb_lambda_call(obj, id_each, 0, 0, collect_i, min_argc, max_argc, ary);
 
     return ary;
 }
 
 static VALUE
-flat_map_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+flat_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
     VALUE tmp;
 
-    i = enum_yield(argc, argv);
+    i = rb_yield_values2(argc, argv);
     tmp = rb_check_array_type(i);
 
     if (NIL_P(tmp)) {
@@ -435,17 +602,18 @@ flat_map_i(VALUE i, VALUE ary, int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *     enum.flat_map       {| obj | block }  -> array
- *     enum.collect_concat {| obj | block }  -> array
- *     enum.flat_map                         -> an_enumerator
- *     enum.collect_concat                   -> an_enumerator
+ *     enum.flat_map       { |obj| block } -> array
+ *     enum.collect_concat { |obj| block } -> array
+ *     enum.flat_map                       -> an_enumerator
+ *     enum.collect_concat                 -> an_enumerator
  *
  *  Returns a new array with the concatenated results of running
  *  <em>block</em> once for every element in <i>enum</i>.
  *
  *  If no block is given, an enumerator is returned instead.
  *
- *     [[1,2],[3,4]].flat_map {|i| i }   #=> [1, 2, 3, 4]
+ *     [1, 2, 3, 4].flat_map { |e| [e, -e] } #=> [1, -1, 2, -2, 3, -3, 4, -4]
+ *     [[1, 2], [3, 4]].flat_map { |e| e + [100] } #=> [1, 2, 100, 3, 4, 100]
  *
  */
 
@@ -454,7 +622,7 @@ enum_flat_map(VALUE obj)
 {
     VALUE ary;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
+    RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
 
     ary = rb_ary_new();
     rb_block_call(obj, id_each, 0, 0, flat_map_i, ary);
@@ -464,13 +632,16 @@ enum_flat_map(VALUE obj)
 
 /*
  *  call-seq:
- *     enum.to_a      ->    array
- *     enum.entries   ->    array
+ *     enum.to_a(*args)      -> array
+ *     enum.entries(*args)   -> array
  *
  *  Returns an array containing the items in <i>enum</i>.
  *
  *     (1..7).to_a                       #=> [1, 2, 3, 4, 5, 6, 7]
  *     { 'a'=>1, 'b'=>2, 'c'=>3 }.to_a   #=> [["a", 1], ["b", 2], ["c", 3]]
+ *
+ *     require 'prime'
+ *     Prime.entries 10                  #=> [2, 3, 5, 7]
  */
 static VALUE
 enum_to_a(int argc, VALUE *argv, VALUE obj)
@@ -478,58 +649,171 @@ enum_to_a(int argc, VALUE *argv, VALUE obj)
     VALUE ary = rb_ary_new();
 
     rb_block_call(obj, id_each, argc, argv, collect_all, ary);
-    OBJ_INFECT(ary, obj);
 
     return ary;
 }
 
 static VALUE
-inject_i(VALUE i, VALUE p, int argc, VALUE *argv)
+enum_hashify(VALUE obj, int argc, const VALUE *argv, rb_block_call_func *iter)
 {
-    VALUE *memo = (VALUE *)p;
+    VALUE hash = rb_hash_new();
+    rb_block_call(obj, id_each, argc, argv, iter, hash);
+    return hash;
+}
 
+static VALUE
+enum_to_h_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
+{
     ENUM_WANT_SVALUE();
+    return rb_hash_set_pair(hash, i);
+}
+
+static VALUE
+enum_to_h_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
+{
+    return rb_hash_set_pair(hash, rb_yield_values2(argc, argv));
+}
 
-    if (memo[0] == Qundef) {
-	memo[0] = i;
+/*
+ *  call-seq:
+ *     enum.to_h(*args)        -> hash
+ *     enum.to_h(*args) {...}  -> hash
+ *
+ *  Returns the result of interpreting <i>enum</i> as a list of
+ *  <tt>[key, value]</tt> pairs.
+ *
+ *     %i[hello world].each_with_index.to_h
+ *       # => {:hello => 0, :world => 1}
+ *
+ *  If a block is given, the results of the block on each element of
+ *  the enum will be used as pairs.
+ *
+ *     (1..5).to_h {|x| [x, x ** 2]}
+ *       #=> {1=>1, 2=>4, 3=>9, 4=>16, 5=>25}
+ */
+
+static VALUE
+enum_to_h(int argc, VALUE *argv, VALUE obj)
+{
+    rb_block_call_func *iter = rb_block_given_p() ? enum_to_h_ii : enum_to_h_i;
+    return enum_hashify(obj, argc, argv, iter);
+}
+
+static VALUE
+inject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
+{
+    struct MEMO *memo = MEMO_CAST(p);
+
+    ENUM_WANT_SVALUE();
+
+    if (memo->v1 == Qundef) {
+	MEMO_V1_SET(memo, i);
     }
     else {
-	memo[0] = rb_yield_values(2, memo[0], i);
+	MEMO_V1_SET(memo, rb_yield_values(2, memo->v1, i));
     }
     return Qnil;
 }
 
 static VALUE
-inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv)
+inject_op_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
 {
-    VALUE *memo = (VALUE *)p;
+    struct MEMO *memo = MEMO_CAST(p);
+    VALUE name;
 
     ENUM_WANT_SVALUE();
 
-    if (memo[0] == Qundef) {
-	memo[0] = i;
+    if (memo->v1 == Qundef) {
+	MEMO_V1_SET(memo, i);
+    }
+    else if (SYMBOL_P(name = memo->u3.value)) {
+	const ID mid = SYM2ID(name);
+	MEMO_V1_SET(memo, rb_funcallv(memo->v1, mid, 1, &i));
     }
     else {
-	memo[0] = rb_funcall(memo[0], (ID)memo[1], 1, i);
+	VALUE args[2];
+	args[0] = name;
+	args[1] = i;
+	MEMO_V1_SET(memo, rb_f_send(numberof(args), args, memo->v1));
     }
     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 (RB_INTEGER_TYPE_P(v) &&
+	    rb_method_basic_definition_p(rb_cInteger, idPLUS) &&
+	    rb_obj_respond_to(v, idPLUS, FALSE)) {
+            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(ULONG2NUM(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++) {
+        VALUE arg = RARRAY_AREF(ary, i);
+        v = rb_funcallv_public(v, id, 1, &arg);
+    }
+    return v;
+}
+
 /*
  *  call-seq:
  *     enum.inject(initial, sym) -> obj
  *     enum.inject(sym)          -> obj
- *     enum.inject(initial) {| memo, obj | block }  -> obj
- *     enum.inject          {| memo, obj | block }  -> obj
+ *     enum.inject(initial) { |memo, obj| block }  -> obj
+ *     enum.inject          { |memo, obj| block }  -> obj
  *     enum.reduce(initial, sym) -> obj
  *     enum.reduce(sym)          -> obj
- *     enum.reduce(initial) {| memo, obj | block }  -> obj
- *     enum.reduce          {| memo, obj | block }  -> obj
+ *     enum.reduce(initial) { |memo, obj| block }  -> obj
+ *     enum.reduce          { |memo, obj| block }  -> obj
  *
  *  Combines all elements of <i>enum</i> by applying a binary
  *  operation, specified by a block or a symbol that names a
  *  method or operator.
  *
+ *  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
@@ -539,75 +823,90 @@ inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv)
  *  return value for the method.
  *
  *  If you do not explicitly specify an <i>initial</i> value for <i>memo</i>,
- *  then uses the first element of collection is used as the initial value
+ *  then the first element of collection is used as the initial value
  *  of <i>memo</i>.
  *
- *  Examples:
  *
  *     # Sum some numbers
- *     (5..10).reduce(:+)                            #=> 45
+ *     (5..10).reduce(:+)                             #=> 45
  *     # Same using a block and inject
- *     (5..10).inject {|sum, n| sum + n }            #=> 45
+ *     (5..10).inject { |sum, n| sum + n }            #=> 45
  *     # Multiply some numbers
- *     (5..10).reduce(1, :*)                         #=> 151200
+ *     (5..10).reduce(1, :*)                          #=> 151200
  *     # Same using a block
- *     (5..10).inject(1) {|product, n| product * n } #=> 151200
+ *     (5..10).inject(1) { |product, n| product * n } #=> 151200
  *     # find the longest word
- *     longest = %w{ cat sheep bear }.inject do |memo,word|
+ *     longest = %w{ cat sheep bear }.inject do |memo, word|
  *        memo.length > word.length ? memo : word
  *     end
- *     longest                                       #=> "sheep"
+ *     longest                                        #=> "sheep"
  *
  */
 static VALUE
 enum_inject(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE memo[2];
-    VALUE (*iter)(VALUE, VALUE, int, VALUE*) = inject_i;
+    struct MEMO *memo;
+    VALUE init, op;
+    rb_block_call_func *iter = inject_i;
+    ID id;
 
-    switch (rb_scan_args(argc, argv, "02", &memo[0], &memo[1])) {
+    switch (rb_scan_args(argc, argv, "02", &init, &op)) {
       case 0:
-	memo[0] = Qundef;
+	init = Qundef;
 	break;
       case 1:
 	if (rb_block_given_p()) {
 	    break;
 	}
-	memo[1] = (VALUE)rb_to_id(memo[0]);
-	memo[0] = Qundef;
+	id = rb_check_id(&init);
+	op = id ? ID2SYM(id) : init;
+	init = Qundef;
 	iter = inject_op_i;
 	break;
       case 2:
 	if (rb_block_given_p()) {
 	    rb_warning("given block not used");
 	}
-	memo[1] = (VALUE)rb_to_id(memo[1]);
+	id = rb_check_id(&op);
+	if (id) op = ID2SYM(id);
 	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);
     rb_block_call(obj, id_each, 0, 0, iter, (VALUE)memo);
-    if (memo[0] == Qundef) return Qnil;
-    return memo[0];
+    if (memo->v1 == Qundef) return Qnil;
+    return memo->v1;
 }
 
 static VALUE
-partition_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
+partition_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arys))
 {
+    struct MEMO *memo = MEMO_CAST(arys);
+    VALUE ary;
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_yield(i))) {
-	rb_ary_push(ary[0], i);
+    if (RTEST(enum_yield(argc, i))) {
+	ary = memo->v1;
     }
     else {
-	rb_ary_push(ary[1], i);
+	ary = memo->v2;
     }
+    rb_ary_push(ary, i);
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.partition {| obj | block }  -> [ true_array, false_array ]
- *     enum.partition                   -> an_enumerator
+ *     enum.partition { |obj| block } -> [ true_array, false_array ]
+ *     enum.partition                 -> an_enumerator
  *
  *  Returns two arrays, the first containing the elements of
  *  <i>enum</i> for which the block evaluates to true, the second
@@ -615,35 +914,34 @@ partition_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
  *
  *  If no block is given, an enumerator is returned instead.
  *
- *     (1..6).partition {|v| v.even? }  #=> [[2, 4, 6], [1, 3, 5]]
+ *     (1..6).partition { |v| v.even? }  #=> [[2, 4, 6], [1, 3, 5]]
  *
  */
 
 static VALUE
 enum_partition(VALUE obj)
 {
-    VALUE ary[2];
+    struct MEMO *memo;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
+    RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
 
-    ary[0] = rb_ary_new();
-    ary[1] = rb_ary_new();
-    rb_block_call(obj, id_each, 0, 0, partition_i, (VALUE)ary);
+    memo = MEMO_NEW(rb_ary_new(), rb_ary_new(), 0);
+    rb_block_call(obj, id_each, 0, 0, partition_i, (VALUE)memo);
 
-    return rb_assoc_new(ary[0], ary[1]);
+    return rb_assoc_new(memo->v1, memo->v2);
 }
 
 static VALUE
-group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv)
+group_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 {
     VALUE group;
     VALUE values;
 
     ENUM_WANT_SVALUE();
 
-    group = rb_yield(i);
+    group = enum_yield(argc, i);
     values = rb_hash_aref(hash, group);
-    if (NIL_P(values)) {
+    if (!RB_TYPE_P(values, T_ARRAY)) {
 	values = rb_ary_new3(1, i);
 	rb_hash_aset(hash, group, values);
     }
@@ -655,55 +953,82 @@ group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *     enum.group_by {| obj | block }  -> a_hash
- *     enum.group_by                   -> an_enumerator
+ *     enum.group_by { |obj| block } -> a_hash
+ *     enum.group_by                 -> an_enumerator
  *
- *  Returns a hash, which keys are evaluated result from the
- *  block, and values are arrays of elements in <i>enum</i>
- *  corresponding to the key.
+ *  Groups the collection by result of the block.  Returns a hash where the
+ *  keys are the evaluated result from the block and the values are
+ *  arrays of elements in the collection that correspond to the key.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  If no block is given an enumerator is returned.
  *
- *     (1..6).group_by {|i| i%3}   #=> {0=>[3, 6], 1=>[1, 4], 2=>[2, 5]}
+ *     (1..6).group_by { |i| i%3 }   #=> {0=>[3, 6], 1=>[1, 4], 2=>[2, 5]}
  *
  */
 
 static VALUE
 enum_group_by(VALUE obj)
 {
-    VALUE hash;
+    RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
 
-    RETURN_ENUMERATOR(obj, 0, 0);
+    return enum_hashify(obj, 0, 0, group_by_i);
+}
 
-    hash = rb_hash_new();
-    rb_block_call(obj, id_each, 0, 0, group_by_i, hash);
-    OBJ_INFECT(hash, obj);
+static void
+tally_up(VALUE hash, VALUE group)
+{
+    VALUE tally = rb_hash_aref(hash, group);
+    if (NIL_P(tally)) {
+        tally = INT2FIX(1);
+    }
+    else if (FIXNUM_P(tally) && tally < INT2FIX(FIXNUM_MAX)) {
+        tally += INT2FIX(1) & ~FIXNUM_FLAG;
+    }
+    else {
+        tally = rb_big_plus(tally, INT2FIX(1));
+    }
+    rb_hash_aset(hash, group, tally);
+}
 
-    return hash;
+static VALUE
+tally_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
+{
+    ENUM_WANT_SVALUE();
+    tally_up(hash, i);
+    return Qnil;
 }
 
+/*
+ *  call-seq:
+ *     enum.tally -> a_hash
+ *
+ *  Tallies the collection, i.e., counts the occurrences of each element.
+ *  Returns a hash with the elements of the collection as keys and the
+ *  corresponding counts as values.
+ *
+ *     ["a", "b", "c", "b"].tally  #=> {"a"=>1, "b"=>2, "c"=>1}
+ */
+
 static VALUE
-first_i(VALUE i, VALUE *params, int argc, VALUE *argv)
+enum_tally(VALUE obj)
 {
+    return enum_hashify(obj, 0, 0, tally_i);
+}
+
+static VALUE
+first_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, params))
+{
+    struct MEMO *memo = MEMO_CAST(params);
     ENUM_WANT_SVALUE();
 
-    if (NIL_P(params[1])) {
-	params[1] = i;
-	rb_iter_break();
-    }
-    else {
-	long n = params[0];
+    MEMO_V1_SET(memo, i);
+    rb_iter_break();
 
-	rb_ary_push(params[1], i);
-	n--;
-	if (n <= 0) {
-	    rb_iter_break();
-	}
-	params[0] = n;
-    }
-    return Qnil;
+    UNREACHABLE_RETURN(Qnil);
 }
 
+static VALUE enum_take(VALUE obj, VALUE n);
+
 /*
  *  call-seq:
  *     enum.first       ->  obj or nil
@@ -717,75 +1042,73 @@ first_i(VALUE i, VALUE *params, int argc, VALUE *argv)
  *    %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)
 {
-    VALUE n, params[2];
-
-    if (argc == 0) {
-	params[0] = params[1] = Qnil;
+    struct MEMO *memo;
+    rb_check_arity(argc, 0, 1);
+    if (argc > 0) {
+	return enum_take(obj, argv[0]);
     }
     else {
-	long len;
-
-	rb_scan_args(argc, argv, "01", &n);
-	len = NUM2LONG(n);
-	if (len == 0) return rb_ary_new2(0);
-	if (len < 0) {
-	    rb_raise(rb_eArgError, "negative length");
-	}
-	params[0] = len;
-	params[1] = rb_ary_new2(len);
+	memo = MEMO_NEW(Qnil, 0, 0);
+	rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)memo);
+	return memo->v1;
     }
-    rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)params);
-
-    return params[1];
 }
 
 
 /*
  *  call-seq:
- *     enum.sort                     -> array
- *     enum.sort {| a, b | block }   -> array
- *
- *  Returns an array containing the items in <i>enum</i> sorted,
- *  either according to their own <code><=></code> method, or by using
- *  the results of the supplied block. The block should return -1, 0, or
- *  +1 depending on the comparison between <i>a</i> and <i>b</i>. As of
- *  Ruby 1.8, the method <code>Enumerable#sort_by</code> implements a
- *  built-in Schwartzian Transform, useful when key computation or
- *  comparison is expensive.
- *
- *     %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]
+ *     enum.sort                  -> array
+ *     enum.sort { |a, b| block } -> array
+ *
+ *  Returns an array containing the items in <i>enum</i> sorted.
+ *
+ *  Comparisons for the sort will be done using the items' own
+ *  <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 to be stable.  When the 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]
+ *
+ *  See also Enumerable#sort_by. It implements a Schwartzian transform
+ *  which is useful when key computation or comparison is expensive.
  */
 
 static VALUE
 enum_sort(VALUE obj)
 {
-    return rb_ary_sort(enum_to_a(0, 0, obj));
+    return rb_ary_sort_bang(enum_to_a(0, 0, obj));
 }
 
 #define SORT_BY_BUFSIZE 16
 struct sort_by_data {
-    VALUE ary;
-    VALUE buf;
-    int n;
+    const VALUE ary;
+    const VALUE buf;
+    long n;
 };
 
 static VALUE
-sort_by_i(VALUE i, VALUE _data, int argc, VALUE *argv)
+sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data))
 {
-    struct sort_by_data *data = (struct sort_by_data *)_data;
+    struct sort_by_data *data = (struct sort_by_data *)&MEMO_CAST(_data)->v1;
     VALUE ary = data->ary;
     VALUE v;
 
     ENUM_WANT_SVALUE();
 
-    v = rb_yield(i);
+    v = enum_yield(argc, i);
 
     if (RBASIC(ary)->klass) {
 	rb_raise(rb_eRuntimeError, "sort_by reentered");
@@ -794,8 +1117,8 @@ sort_by_i(VALUE i, VALUE _data, int argc, VALUE *argv)
 	rb_raise(rb_eRuntimeError, "sort_by reentered");
     }
 
-    RARRAY_PTR(data->buf)[data->n*2] = v;
-    RARRAY_PTR(data->buf)[data->n*2+1] = i;
+    RARRAY_ASET(data->buf, data->n*2, v);
+    RARRAY_ASET(data->buf, data->n*2+1, i);
     data->n++;
     if (data->n == SORT_BY_BUFSIZE) {
 	rb_ary_concat(ary, data->buf);
@@ -807,6 +1130,7 @@ sort_by_i(VALUE i, VALUE _data, int argc, VALUE *argv)
 static int
 sort_by_cmp(const void *ap, const void *bp, void *data)
 {
+    struct cmp_opt_data cmp_opt = { 0, 0 };
     VALUE a;
     VALUE b;
     VALUE ary = (VALUE)data;
@@ -818,34 +1142,37 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
     a = *(VALUE *)ap;
     b = *(VALUE *)bp;
 
-    return rb_cmpint(rb_funcall(a, id_cmp, 1, b), a, b);
+    return OPTIMIZED_CMP(a, b, cmp_opt);
 }
 
 /*
  *  call-seq:
- *     enum.sort_by {| obj | block }    -> array
- *     enum.sort_by                     -> an_enumerator
+ *     enum.sort_by { |obj| block }   -> array
+ *     enum.sort_by                   -> an_enumerator
  *
  *  Sorts <i>enum</i> using a set of keys generated by mapping the
  *  values in <i>enum</i> through the given block.
  *
+ *  The result is not guaranteed to be 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}
+ *     %w{apple pear fig}.sort_by { |word| word.length }
  *                   #=> ["fig", "pear", "apple"]
  *
- *  The current implementation of <code>sort_by</code> generates an
- *  array of tuples containing the original collection element and the
- *  mapped value. This makes <code>sort_by</code> fairly expensive when
- *  the keysets are simple
+ *  The current implementation of #sort_by generates an array of
+ *  tuples containing the original collection element and the mapped
+ *  value. This makes #sort_by fairly expensive when the keysets are
+ *  simple.
  *
  *     require 'benchmark'
  *
- *     a = (1..100000).map {rand(100000)}
+ *     a = (1..100000).map { rand(100000) }
  *
  *     Benchmark.bm(10) do |b|
  *       b.report("Sort")    { a.sort }
- *       b.report("Sort by") { a.sort_by {|a| a} }
+ *       b.report("Sort by") { a.sort_by { |a| a } }
  *     end
  *
  *  <em>produces:</em>
@@ -856,108 +1183,133 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
  *
  *  However, consider the case where comparing the keys is a non-trivial
  *  operation. The following code sorts some files on modification time
- *  using the basic <code>sort</code> method.
+ *  using the basic #sort method.
  *
  *     files = Dir["*"]
- *     sorted = files.sort {|a,b| File.new(a).mtime <=> File.new(b).mtime}
+ *     sorted = files.sort { |a, b| File.new(a).mtime <=> File.new(b).mtime }
  *     sorted   #=> ["mon", "tues", "wed", "thurs"]
  *
- *  This sort is inefficient: it generates two new <code>File</code>
+ *  This sort is inefficient: it generates two new File
  *  objects during every comparison. A slightly better technique is to
- *  use the <code>Kernel#test</code> method to generate the modification
+ *  use the Kernel#test method to generate the modification
  *  times directly.
  *
  *     files = Dir["*"]
- *     sorted = files.sort { |a,b|
+ *     sorted = files.sort { |a, b|
  *       test(?M, a) <=> test(?M, b)
  *     }
  *     sorted   #=> ["mon", "tues", "wed", "thurs"]
  *
- *  This still generates many unnecessary <code>Time</code> objects. A
- *  more efficient technique is to cache the sort keys (modification
- *  times in this case) before the sort. Perl users often call this
- *  approach a Schwartzian Transform, after Randal Schwartz. We
- *  construct a temporary array, where each element is an array
- *  containing our sort key along with the filename. We sort this array,
- *  and then extract the filename from the result.
+ *  This still generates many unnecessary Time objects. A more
+ *  efficient technique is to cache the sort keys (modification times
+ *  in this case) before the sort. Perl users often call this approach
+ *  a Schwartzian transform, after Randal Schwartz. We construct a
+ *  temporary array, where each element is an array containing our
+ *  sort key along with the filename. We sort this array, and then
+ *  extract the filename from the result.
  *
  *     sorted = Dir["*"].collect { |f|
  *        [test(?M, f), f]
  *     }.sort.collect { |f| f[1] }
  *     sorted   #=> ["mon", "tues", "wed", "thurs"]
  *
- *  This is exactly what <code>sort_by</code> does internally.
+ *  This is exactly what #sort_by does internally.
  *
- *     sorted = Dir["*"].sort_by {|f| test(?M, f)}
+ *     sorted = Dir["*"].sort_by { |f| test(?M, f) }
  *     sorted   #=> ["mon", "tues", "wed", "thurs"]
+ *
+ *  To produce the reverse of a specific order, the following can be used:
+ *
+ *    ary.sort_by { ... }.reverse!
  */
 
 static VALUE
 enum_sort_by(VALUE obj)
 {
-    VALUE ary;
+    VALUE ary, buf;
+    struct MEMO *memo;
     long i;
-    struct sort_by_data data;
+    struct sort_by_data *data;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
+    RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
 
-    if (TYPE(obj) == T_ARRAY && RARRAY_LEN(obj) <= LONG_MAX/2) {
+    if (RB_TYPE_P(obj, T_ARRAY) && RARRAY_LEN(obj) <= LONG_MAX/2) {
 	ary = rb_ary_new2(RARRAY_LEN(obj)*2);
     }
     else {
 	ary = rb_ary_new();
     }
-    RBASIC(ary)->klass = 0;
-    data.ary = ary;
-    data.buf = rb_ary_tmp_new(SORT_BY_BUFSIZE*2);
-    data.n = 0;
-    rb_ary_store(data.buf, SORT_BY_BUFSIZE*2-1, Qnil);
-    rb_block_call(obj, id_each, 0, 0, sort_by_i, (VALUE)&data);
-    if (data.n) {
-	rb_ary_resize(data.buf, data.n*2);
-	rb_ary_concat(ary, data.buf);
+    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);
+    data = (struct sort_by_data *)&memo->v1;
+    RB_OBJ_WRITE(memo, &data->ary, ary);
+    RB_OBJ_WRITE(memo, &data->buf, buf);
+    data->n = 0;
+    rb_block_call(obj, id_each, 0, 0, sort_by_i, (VALUE)memo);
+    ary = data->ary;
+    buf = data->buf;
+    if (data->n) {
+	rb_ary_resize(buf, data->n*2);
+	rb_ary_concat(ary, buf);
     }
     if (RARRAY_LEN(ary) > 2) {
-	ruby_qsort(RARRAY_PTR(ary), RARRAY_LEN(ary)/2, 2*sizeof(VALUE),
-		   sort_by_cmp, (void *)ary);
+        RARRAY_PTR_USE(ary, ptr,
+                       ruby_qsort(ptr, RARRAY_LEN(ary)/2, 2*sizeof(VALUE),
+                                  sort_by_cmp, (void *)ary));
     }
     if (RBASIC(ary)->klass) {
 	rb_raise(rb_eRuntimeError, "sort_by reentered");
     }
     for (i=1; i<RARRAY_LEN(ary); i+=2) {
-	RARRAY_PTR(ary)[i/2] = RARRAY_PTR(ary)[i];
+	RARRAY_ASET(ary, i/2, RARRAY_AREF(ary, i));
     }
     rb_ary_resize(ary, RARRAY_LEN(ary)/2);
-    RBASIC(ary)->klass = rb_cArray;
-    OBJ_INFECT(ary, obj);
+    RBASIC_SET_CLASS_RAW(ary, rb_cArray);
 
     return ary;
 }
 
-#define ENUMFUNC(name) rb_block_given_p() ? name##_iter_i : name##_i
+#define ENUMFUNC(name) argc ? name##_eqq : rb_block_given_p() ? name##_iter_i : name##_i
+
+#define MEMO_ENUM_NEW(v1) (rb_check_arity(argc, 0, 1), MEMO_NEW((v1), (argc ? *argv : 0), 0))
 
 #define DEFINE_ENUMFUNCS(name) \
-static VALUE enum_##name##_func(VALUE result, VALUE *memo); \
+static VALUE enum_##name##_func(VALUE result, struct MEMO *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)); \
+} \
 \
 static VALUE \
-name##_i(VALUE i, VALUE *memo, int argc, VALUE *argv) \
+name##_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo)) \
 { \
-    return enum_##name##_func(enum_values_pack(argc, argv), memo); \
+    return enum_##name##_func(rb_yield_values2(argc, argv), MEMO_CAST(memo));	\
 } \
 \
 static VALUE \
-name##_iter_i(VALUE i, VALUE *memo, int argc, VALUE *argv) \
+name##_eqq(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo)) \
 { \
-    return enum_##name##_func(enum_yield(argc, argv), memo); \
+    ENUM_WANT_SVALUE(); \
+    return enum_##name##_func(rb_funcallv(MEMO_CAST(memo)->v2, id_eqq, 1, &i), MEMO_CAST(memo)); \
 } \
 \
 static VALUE \
-enum_##name##_func(VALUE result, VALUE *memo)
+enum_##name##_func(VALUE result, struct MEMO *memo)
+
+#define WARN_UNUSED_BLOCK(argc) do { \
+    if ((argc) > 0 && rb_block_given_p()) { \
+        rb_warn("given block not used"); \
+    } \
+} while (0)
 
 DEFINE_ENUMFUNCS(all)
 {
     if (!RTEST(result)) {
-	*memo = Qfalse;
+	MEMO_V1_SET(memo, Qfalse);
 	rb_iter_break();
     }
     return Qnil;
@@ -965,34 +1317,41 @@ DEFINE_ENUMFUNCS(all)
 
 /*
  *  call-seq:
- *     enum.all? [{|obj| block } ]   -> true or false
+ *     enum.all? [{ |obj| block } ]   -> true or false
+ *     enum.all?(pattern)             -> true or false
  *
  *  Passes each element of the collection to the given block. The method
  *  returns <code>true</code> if the block never returns
  *  <code>false</code> or <code>nil</code>. If the block is not given,
- *  Ruby adds an implicit block of <code>{|obj| obj}</code> (that is
- *  <code>all?</code> will return <code>true</code> only if none of the
- *  collection members are <code>false</code> or <code>nil</code>.)
+ *  Ruby adds an implicit block of <code>{ |obj| obj }</code> which will
+ *  cause #all? to return +true+ when none of the collection members are
+ *  +false+ or +nil+.
  *
- *     %w{ant bear cat}.all? {|word| word.length >= 3}   #=> true
- *     %w{ant bear cat}.all? {|word| word.length >= 4}   #=> false
- *     [ nil, true, 99 ].all?                            #=> false
+ *  If instead a pattern is supplied, the method returns whether
+ *  <code>pattern === element</code> for every collection member.
+ *
+ *     %w[ant bear cat].all? { |word| word.length >= 3 } #=> true
+ *     %w[ant bear cat].all? { |word| word.length >= 4 } #=> false
+ *     %w[ant bear cat].all?(/t/)                        #=> false
+ *     [1, 2i, 3.14].all?(Numeric)                       #=> true
+ *     [nil, true, 99].all?                              #=> false
+ *     [].all?                                           #=> true
  *
  */
 
 static VALUE
-enum_all(VALUE obj)
+enum_all(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE result = Qtrue;
-
-    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(all), (VALUE)&result);
-    return result;
+    struct MEMO *memo = MEMO_ENUM_NEW(Qtrue);
+    WARN_UNUSED_BLOCK(argc);
+    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(all), (VALUE)memo);
+    return memo->v1;
 }
 
 DEFINE_ENUMFUNCS(any)
 {
     if (RTEST(result)) {
-	*memo = Qtrue;
+	MEMO_V1_SET(memo, Qtrue);
 	rb_iter_break();
     }
     return Qnil;
@@ -1000,48 +1359,277 @@ DEFINE_ENUMFUNCS(any)
 
 /*
  *  call-seq:
- *     enum.any? [{|obj| block } ]   -> true or false
+ *     enum.any? [{ |obj| block }]   -> true or false
+ *     enum.any?(pattern)            -> true or false
  *
  *  Passes each element of the collection to the given block. The method
  *  returns <code>true</code> if the block ever returns a value other
  *  than <code>false</code> or <code>nil</code>. If the block is not
- *  given, Ruby adds an implicit block of <code>{|obj| obj}</code> (that
- *  is <code>any?</code> will return <code>true</code> if at least one
- *  of the collection members is not <code>false</code> or
- *  <code>nil</code>.
+ *  given, Ruby adds an implicit block of <code>{ |obj| obj }</code> that
+ *  will cause #any? to return +true+ if at least one of the collection
+ *  members is not +false+ or +nil+.
  *
- *     %w{ant bear cat}.any? {|word| word.length >= 3}   #=> true
- *     %w{ant bear cat}.any? {|word| word.length >= 4}   #=> true
- *     [ nil, true, 99 ].any?                            #=> true
+ *  If instead a pattern is supplied, the method returns whether
+ *  <code>pattern === element</code> for any collection member.
+ *
+ *     %w[ant bear cat].any? { |word| word.length >= 3 } #=> true
+ *     %w[ant bear cat].any? { |word| word.length >= 4 } #=> true
+ *     %w[ant bear cat].any?(/d/)                        #=> false
+ *     [nil, true, 99].any?(Integer)                     #=> true
+ *     [nil, true, 99].any?                              #=> true
+ *     [].any?                                           #=> false
  *
  */
 
 static VALUE
-enum_any(VALUE obj)
+enum_any(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE result = Qfalse;
-
-    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(any), (VALUE)&result);
-    return result;
+    struct MEMO *memo = MEMO_ENUM_NEW(Qfalse);
+    WARN_UNUSED_BLOCK(argc);
+    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(any), (VALUE)memo);
+    return memo->v1;
 }
 
 DEFINE_ENUMFUNCS(one)
 {
     if (RTEST(result)) {
-	if (*memo == Qundef) {
-	    *memo = Qtrue;
+	if (memo->v1 == Qundef) {
+	    MEMO_V1_SET(memo, Qtrue);
 	}
-	else if (*memo == Qtrue) {
-	    *memo = Qfalse;
+	else if (memo->v1 == Qtrue) {
+	    MEMO_V1_SET(memo, Qfalse);
 	    rb_iter_break();
 	}
     }
     return Qnil;
 }
 
+struct nmin_data {
+    long n;
+    long bufmax;
+    long curlen;
+    VALUE buf;
+    VALUE limit;
+    int (*cmpfunc)(const void *, const void *, void *);
+    int rev: 1; /* max if 1 */
+    int by: 1; /* min_by if 1 */
+};
+
+static VALUE
+cmpint_reenter_check(struct nmin_data *data, VALUE val)
+{
+    if (RBASIC(data->buf)->klass) {
+        rb_raise(rb_eRuntimeError, "%s%s reentered",
+                 data->rev ? "max" : "min",
+                 data->by ? "_by" : "");
+    }
+    return val;
+}
+
+static int
+nmin_cmp(const void *ap, const void *bp, void *_data)
+{
+    struct cmp_opt_data cmp_opt = { 0, 0 };
+    struct nmin_data *data = (struct nmin_data *)_data;
+    VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
+#define rb_cmpint(cmp, a, b) rb_cmpint(cmpint_reenter_check(data, (cmp)), a, b)
+    return OPTIMIZED_CMP(a, b, cmp_opt);
+#undef rb_cmpint
+}
+
+static int
+nmin_block_cmp(const void *ap, const void *bp, void *_data)
+{
+    struct nmin_data *data = (struct nmin_data *)_data;
+    VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
+    VALUE cmp = rb_yield_values(2, a, b);
+    cmpint_reenter_check(data, cmp);
+    return rb_cmpint(cmp, a, b);
+}
+
+static void
+nmin_filter(struct nmin_data *data)
+{
+    long n;
+    VALUE *beg;
+    int eltsize;
+    long numelts;
+
+    long left, right;
+    long store_index;
+
+    long i, j;
+
+    if (data->curlen <= data->n)
+	return;
+
+    n = data->n;
+    beg = RARRAY_PTR(data->buf);
+    eltsize = data->by ? 2 : 1;
+    numelts = data->curlen;
+
+    left = 0;
+    right = numelts-1;
+
+#define GETPTR(i) (beg+(i)*eltsize)
+
+#define SWAP(i, j) do { \
+    VALUE tmp[2]; \
+    memcpy(tmp, GETPTR(i), sizeof(VALUE)*eltsize); \
+    memcpy(GETPTR(i), GETPTR(j), sizeof(VALUE)*eltsize); \
+    memcpy(GETPTR(j), tmp, sizeof(VALUE)*eltsize); \
+} while (0)
+
+    while (1) {
+	long pivot_index = left + (right-left)/2;
+	long num_pivots = 1;
+
+	SWAP(pivot_index, right);
+	pivot_index = right;
+
+	store_index = left;
+	i = left;
+	while (i <= right-num_pivots) {
+	    int c = data->cmpfunc(GETPTR(i), GETPTR(pivot_index), data);
+	    if (data->rev)
+		c = -c;
+	    if (c == 0) {
+	        SWAP(i, right-num_pivots);
+		num_pivots++;
+		continue;
+	    }
+	    if (c < 0) {
+		SWAP(i, store_index);
+		store_index++;
+	    }
+	    i++;
+	}
+	j = store_index;
+	for (i = right; right-num_pivots < i; i--) {
+	    if (i <= j)
+	        break;
+	    SWAP(j, i);
+	    j++;
+	}
+
+	if (store_index <= n && n <= store_index+num_pivots)
+	    break;
+
+	if (n < store_index) {
+	    right = store_index-1;
+	}
+	else {
+	    left = store_index+num_pivots;
+	}
+    }
+#undef GETPTR
+#undef SWAP
+
+    data->limit = RARRAY_AREF(data->buf, store_index*eltsize); /* the last pivot */
+    data->curlen = data->n;
+    rb_ary_resize(data->buf, data->n * eltsize);
+}
+
+static VALUE
+nmin_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data))
+{
+    struct nmin_data *data = (struct nmin_data *)_data;
+    VALUE cmpv;
+
+    ENUM_WANT_SVALUE();
+
+    if (data->by)
+	cmpv = enum_yield(argc, 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, i);
+
+    data->curlen++;
+
+    if (data->curlen == data->bufmax) {
+	nmin_filter(data);
+    }
+
+    return Qnil;
+}
+
+VALUE
+rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
+{
+    VALUE result;
+    struct nmin_data data;
+
+    data.n = NUM2LONG(num);
+    if (data.n < 0)
+        rb_raise(rb_eArgError, "negative size (%ld)", data.n);
+    if (data.n == 0)
+        return rb_ary_new2(0);
+    if (LONG_MAX/4/(by ? 2 : 1) < data.n)
+        rb_raise(rb_eArgError, "too big size");
+    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;
+    data.rev = rev;
+    data.by = by;
+    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, Qundef);
+	}
+    }
+    else {
+	rb_block_call(obj, id_each, 0, 0, nmin_i, (VALUE)&data);
+    }
+    nmin_filter(&data);
+    result = data.buf;
+    if (by) {
+	long i;
+        RARRAY_PTR_USE(result, ptr, {
+            ruby_qsort(ptr,
+                       RARRAY_LEN(result)/2,
+                       sizeof(VALUE)*2,
+                       data.cmpfunc, (void *)&data);
+            for (i=1; i<RARRAY_LEN(result); i+=2) {
+                ptr[i/2] = ptr[i];
+            }
+        });
+	rb_ary_resize(result, RARRAY_LEN(result)/2);
+    }
+    else {
+        RARRAY_PTR_USE(result, ptr, {
+            ruby_qsort(ptr, RARRAY_LEN(result), sizeof(VALUE),
+                       data.cmpfunc, (void *)&data);
+        });
+    }
+    if (rev) {
+        rb_ary_reverse(result);
+    }
+    RBASIC_SET_CLASS(result, rb_cArray);
+    return result;
+
+}
+
 /*
  *  call-seq:
- *     enum.one? [{|obj| block }]   -> true or false
+ *     enum.one? [{ |obj| block }]   -> true or false
+ *     enum.one?(pattern)            -> true or false
  *
  *  Passes each element of the collection to the given block. The method
  *  returns <code>true</code> if the block returns <code>true</code>
@@ -1049,20 +1637,28 @@ DEFINE_ENUMFUNCS(one)
  *  <code>true</code> only if exactly one of the collection members is
  *  true.
  *
- *     %w{ant bear cat}.one? {|word| word.length == 4}   #=> true
- *     %w{ant bear cat}.one? {|word| word.length > 4}    #=> false
- *     %w{ant bear cat}.one? {|word| word.length < 4}    #=> false
- *     [ nil, true, 99 ].one?                            #=> false
- *     [ nil, true, false ].one?                         #=> true
+ *  If instead a pattern is supplied, the method returns whether
+ *  <code>pattern === element</code> for exactly one collection member.
+ *
+ *     %w{ant bear cat}.one? { |word| word.length == 4 }  #=> true
+ *     %w{ant bear cat}.one? { |word| word.length > 4 }   #=> false
+ *     %w{ant bear cat}.one? { |word| word.length < 4 }   #=> false
+ *     %w{ant bear cat}.one?(/t/)                         #=> false
+ *     [ nil, true, 99 ].one?                             #=> false
+ *     [ nil, true, false ].one?                          #=> true
+ *     [ nil, true, 99 ].one?(Integer)                    #=> true
+ *     [].one?                                            #=> false
  *
  */
-
 static VALUE
-enum_one(VALUE obj)
+enum_one(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE result = Qundef;
+    struct MEMO *memo = MEMO_ENUM_NEW(Qundef);
+    VALUE result;
 
-    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(one), (VALUE)&result);
+    WARN_UNUSED_BLOCK(argc);
+    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(one), (VALUE)memo);
+    result = memo->v1;
     if (result == Qundef) return Qfalse;
     return result;
 }
@@ -1070,7 +1666,7 @@ enum_one(VALUE obj)
 DEFINE_ENUMFUNCS(none)
 {
     if (RTEST(result)) {
-	*memo = Qfalse;
+	MEMO_V1_SET(memo, Qfalse);
 	rb_iter_break();
     }
     return Qnil;
@@ -1078,61 +1674,74 @@ DEFINE_ENUMFUNCS(none)
 
 /*
  *  call-seq:
- *     enum.none? [{|obj| block }]   -> true or false
+ *     enum.none? [{ |obj| block }]   -> true or false
+ *     enum.none?(pattern)            -> true or false
  *
  *  Passes each element of the collection to the given block. The method
  *  returns <code>true</code> if the block never returns <code>true</code>
  *  for all elements. If the block is not given, <code>none?</code> will return
  *  <code>true</code> only if none of the collection members is true.
  *
- *     %w{ant bear cat}.none? {|word| word.length == 5}  #=> true
- *     %w{ant bear cat}.none? {|word| word.length >= 4}  #=> false
- *     [].none?                                          #=> true
- *     [nil].none?                                       #=> true
- *     [nil,false].none?                                 #=> true
+ *  If instead a pattern is supplied, the method returns whether
+ *  <code>pattern === element</code> for none of the collection members.
+ *
+ *     %w{ant bear cat}.none? { |word| word.length == 5 } #=> true
+ *     %w{ant bear cat}.none? { |word| word.length >= 4 } #=> false
+ *     %w{ant bear cat}.none?(/d/)                        #=> true
+ *     [1, 3.14, 42].none?(Float)                         #=> false
+ *     [].none?                                           #=> true
+ *     [nil].none?                                        #=> true
+ *     [nil, false].none?                                 #=> true
+ *     [nil, false, true].none?                           #=> false
  */
 static VALUE
-enum_none(VALUE obj)
+enum_none(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE result = Qtrue;
+    struct MEMO *memo = MEMO_ENUM_NEW(Qtrue);
 
-    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(none), (VALUE)&result);
-    return result;
+    WARN_UNUSED_BLOCK(argc);
+    rb_block_call(obj, id_each, 0, 0, ENUMFUNC(none), (VALUE)memo);
+    return memo->v1;
 }
 
+struct min_t {
+    VALUE min;
+    struct cmp_opt_data cmp_opt;
+};
+
 static VALUE
-min_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+min_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    VALUE cmp;
+    struct min_t *memo = MEMO_FOR(struct min_t, args);
 
     ENUM_WANT_SVALUE();
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (memo->min == Qundef) {
+	memo->min = i;
     }
     else {
-	cmp = rb_funcall(i, id_cmp, 1, *memo);
-	if (rb_cmpint(cmp, i, *memo) < 0) {
-	    *memo = i;
+	if (OPTIMIZED_CMP(i, memo->min, memo->cmp_opt) < 0) {
+	    memo->min = i;
 	}
     }
     return Qnil;
 }
 
 static VALUE
-min_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
+min_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
     VALUE cmp;
+    struct min_t *memo = MEMO_FOR(struct min_t, args);
 
     ENUM_WANT_SVALUE();
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (memo->min == Qundef) {
+	memo->min = i;
     }
     else {
-	cmp = rb_yield_values(2, i, *memo);
-	if (rb_cmpint(cmp, i, *memo) < 0) {
-	    *memo = i;
+	cmp = rb_yield_values(2, i, memo->min);
+	if (rb_cmpint(cmp, i, memo->min) < 0) {
+	    memo->min = i;
 	}
     }
     return Qnil;
@@ -1141,66 +1750,91 @@ min_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *     enum.min                    -> obj
- *     enum.min {| a,b | block }   -> obj
+ *     enum.min                     -> obj
+ *     enum.min { |a, b| block }    -> obj
+ *     enum.min(n)                  -> array
+ *     enum.min(n) { |a, b| block } -> array
  *
- *  Returns the object in <i>enum</i> with the minimum value. The
- *  first form assumes all objects implement <code>Comparable</code>;
+ *  Returns the object in _enum_ with the minimum value. The
+ *  first form assumes all objects implement Comparable;
  *  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"
+ *     a.min                                   #=> "albatross"
+ *     a.min { |a, b| a.length <=> b.length }  #=> "dog"
+ *
+ *  If the +n+ argument is given, minimum +n+ elements are returned
+ *  as a sorted array.
+ *
+ *     a = %w[albatross dog horse]
+ *     a.min(2)                                  #=> ["albatross", "dog"]
+ *     a.min(2) {|a, b| a.length <=> b.length }  #=> ["dog", "horse"]
+ *     [5, 1, 3, 4, 2].min(3)                    #=> [1, 2, 3]
  */
 
 static VALUE
-enum_min(VALUE obj)
+enum_min(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE result = Qundef;
+    VALUE memo;
+    struct min_t *m = NEW_CMP_OPT_MEMO(struct min_t, memo);
+    VALUE result;
+    VALUE num;
 
+    if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0]))
+       return rb_nmin_run(obj, num, 0, 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, (VALUE)&result);
+	rb_block_call(obj, id_each, 0, 0, min_ii, memo);
     }
     else {
-	rb_block_call(obj, id_each, 0, 0, min_i, (VALUE)&result);
+	rb_block_call(obj, id_each, 0, 0, min_i, memo);
     }
+    result = m->min;
     if (result == Qundef) return Qnil;
     return result;
 }
 
+struct max_t {
+    VALUE max;
+    struct cmp_opt_data cmp_opt;
+};
+
 static VALUE
-max_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+max_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    VALUE cmp;
+    struct max_t *memo = MEMO_FOR(struct max_t, args);
 
     ENUM_WANT_SVALUE();
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (memo->max == Qundef) {
+	memo->max = i;
     }
     else {
-	cmp = rb_funcall(i, id_cmp, 1, *memo);
-	if (rb_cmpint(cmp, i, *memo) > 0) {
-	    *memo = i;
+	if (OPTIMIZED_CMP(i, memo->max, memo->cmp_opt) > 0) {
+	    memo->max = i;
 	}
     }
     return Qnil;
 }
 
 static VALUE
-max_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
+max_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
+    struct max_t *memo = MEMO_FOR(struct max_t, args);
     VALUE cmp;
 
     ENUM_WANT_SVALUE();
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (memo->max == Qundef) {
+	memo->max = i;
     }
     else {
-	cmp = rb_yield_values(2, i, *memo);
-	if (rb_cmpint(cmp, i, *memo) > 0) {
-	    *memo = i;
+	cmp = rb_yield_values(2, i, memo->max);
+	if (rb_cmpint(cmp, i, memo->max) > 0) {
+	    memo->max = i;
 	}
     }
     return Qnil;
@@ -1208,29 +1842,49 @@ max_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *     enum.max                   -> obj
- *     enum.max {|a,b| block }    -> obj
+ *     enum.max                     -> obj
+ *     enum.max { |a, b| block }    -> obj
+ *     enum.max(n)                  -> array
+ *     enum.max(n) { |a, b| block } -> array
  *
  *  Returns the object in _enum_ with the maximum value. The
- *  first form assumes all objects implement <code>Comparable</code>;
+ *  first form assumes all objects implement Comparable;
  *  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"
+ *     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, sorted in descending order.
+ *
+ *     a = %w[albatross dog horse]
+ *     a.max(2)                                  #=> ["horse", "dog"]
+ *     a.max(2) {|a, b| a.length <=> b.length }  #=> ["albatross", "horse"]
+ *     [5, 1, 3, 4, 2].max(3)                    #=> [5, 4, 3]
  */
 
 static VALUE
-enum_max(VALUE obj)
+enum_max(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE result = Qundef;
+    VALUE memo;
+    struct max_t *m = NEW_CMP_OPT_MEMO(struct max_t, memo);
+    VALUE result;
+    VALUE num;
+
+    if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0]))
+       return rb_nmin_run(obj, num, 0, 1, 0);
 
+    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)&result);
+	rb_block_call(obj, id_each, 0, 0, max_ii, (VALUE)memo);
     }
     else {
-	rb_block_call(obj, id_each, 0, 0, max_i, (VALUE)&result);
+	rb_block_call(obj, id_each, 0, 0, max_i, (VALUE)memo);
     }
+    result = m->max;
     if (result == Qundef) return Qnil;
     return result;
 }
@@ -1239,6 +1893,7 @@ struct minmax_t {
     VALUE min;
     VALUE max;
     VALUE last;
+    struct cmp_opt_data cmp_opt;
 };
 
 static void
@@ -1251,11 +1906,11 @@ minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
 	memo->max = j;
     }
     else {
-	n = rb_cmpint(rb_funcall(i, id_cmp, 1, memo->min), i, memo->min);
+	n = OPTIMIZED_CMP(i, memo->min, memo->cmp_opt);
 	if (n < 0) {
 	    memo->min = i;
 	}
-	n = rb_cmpint(rb_funcall(j, id_cmp, 1, memo->max), j, memo->max);
+	n = OPTIMIZED_CMP(j, memo->max, memo->cmp_opt);
 	if (n > 0) {
 	    memo->max = j;
 	}
@@ -1263,9 +1918,9 @@ minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
 }
 
 static VALUE
-minmax_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
+minmax_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
 {
-    struct minmax_t *memo = (struct minmax_t *)_memo;
+    struct minmax_t *memo = MEMO_FOR(struct minmax_t, _memo);
     int n;
     VALUE j;
 
@@ -1278,7 +1933,7 @@ minmax_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
     j = memo->last;
     memo->last = Qundef;
 
-    n = rb_cmpint(rb_funcall(j, id_cmp, 1, i), j, i);
+    n = OPTIMIZED_CMP(j, i, memo->cmp_opt);
     if (n == 0)
         i = j;
     else if (n < 0) {
@@ -1315,9 +1970,9 @@ minmax_ii_update(VALUE i, VALUE j, struct minmax_t *memo)
 }
 
 static VALUE
-minmax_ii(VALUE i, VALUE _memo, int argc, VALUE *argv)
+minmax_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
 {
-    struct minmax_t *memo = (struct minmax_t *)_memo;
+    struct minmax_t *memo = MEMO_FOR(struct minmax_t, _memo);
     int n;
     VALUE j;
 
@@ -1347,67 +2002,72 @@ minmax_ii(VALUE i, VALUE _memo, int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *     enum.minmax                   -> [min,max]
- *     enum.minmax {|a,b| block }    -> [min,max]
+ *     enum.minmax                  -> [min, max]
+ *     enum.minmax { |a, b| block } -> [min, max]
  *
- *  Returns two elements array which contains the minimum and the
+ *  Returns a two element 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
+ *  objects implement Comparable; the second uses the
  *  block to return <em>a <=> b</em>.
  *
  *     a = %w(albatross dog horse)
  *     a.minmax                                  #=> ["albatross", "horse"]
- *     a.minmax {|a,b| a.length <=> b.length }   #=> ["dog", "albatross"]
+ *     a.minmax { |a, b| a.length <=> b.length } #=> ["dog", "albatross"]
  */
 
 static VALUE
 enum_minmax(VALUE obj)
 {
-    struct minmax_t memo;
-    VALUE ary = rb_ary_new3(2, Qnil, Qnil);
+    VALUE memo;
+    struct minmax_t *m = NEW_CMP_OPT_MEMO(struct minmax_t, memo);
 
-    memo.min = Qundef;
-    memo.last = Qundef;
+    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, (VALUE)&memo);
-        if (memo.last != Qundef)
-            minmax_ii_update(memo.last, memo.last, &memo);
+	rb_block_call(obj, id_each, 0, 0, minmax_ii, memo);
+	if (m->last != Qundef)
+	    minmax_ii_update(m->last, m->last, m);
     }
     else {
-	rb_block_call(obj, id_each, 0, 0, minmax_i, (VALUE)&memo);
-        if (memo.last != Qundef)
-            minmax_i_update(memo.last, memo.last, &memo);
+	rb_block_call(obj, id_each, 0, 0, minmax_i, memo);
+	if (m->last != Qundef)
+	    minmax_i_update(m->last, m->last, m);
     }
-    if (memo.min != Qundef) {
-        rb_ary_store(ary, 0, memo.min);
-        rb_ary_store(ary, 1, memo.max);
+    if (m->min != Qundef) {
+	return rb_assoc_new(m->min, m->max);
     }
-    return ary;
+    return rb_assoc_new(Qnil, Qnil);
 }
 
 static VALUE
-min_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+min_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
+    struct cmp_opt_data cmp_opt = { 0, 0 };
+    struct MEMO *memo = MEMO_CAST(args);
     VALUE v;
 
     ENUM_WANT_SVALUE();
 
-    v = rb_yield(i);
-    if (memo[0] == Qundef) {
-	memo[0] = v;
-	memo[1] = i;
+    v = enum_yield(argc, i);
+    if (memo->v1 == Qundef) {
+	MEMO_V1_SET(memo, v);
+	MEMO_V2_SET(memo, i);
     }
-    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo[0]), v, memo[0]) < 0) {
-	memo[0] = v;
-	memo[1] = i;
+    else if (OPTIMIZED_CMP(v, memo->v1, cmp_opt) < 0) {
+	MEMO_V1_SET(memo, v);
+	MEMO_V2_SET(memo, i);
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.min_by {|obj| block }   -> obj
- *     enum.min_by                  -> an_enumerator
+ *     enum.min_by {|obj| block }      -> obj
+ *     enum.min_by                     -> an_enumerator
+ *     enum.min_by(n) {|obj| block }   -> array
+ *     enum.min_by(n)                  -> an_enumerator
  *
  *  Returns the object in <i>enum</i> that gives the minimum
  *  value from the given block.
@@ -1415,45 +2075,61 @@ min_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
  *  If no block is given, an enumerator is returned instead.
  *
  *     a = %w(albatross dog horse)
- *     a.min_by {|x| x.length }   #=> "dog"
+ *     a.min_by { |x| x.length }   #=> "dog"
+ *
+ *  If the +n+ argument is given, minimum +n+ elements are returned
+ *  as an array. These +n+ elements are sorted by the value from the
+ *  given block.
+ *
+ *     a = %w[albatross dog horse]
+ *     p a.min_by(2) {|x| x.length } #=> ["dog", "horse"]
  */
 
 static VALUE
-enum_min_by(VALUE obj)
+enum_min_by(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE memo[2];
+    struct MEMO *memo;
+    VALUE num;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
+    rb_check_arity(argc, 0, 1);
+
+    RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
-    memo[0] = Qundef;
-    memo[1] = Qnil;
+    if (argc && !NIL_P(num = argv[0]))
+        return rb_nmin_run(obj, num, 1, 0, 0);
+
+    memo = MEMO_NEW(Qundef, Qnil, 0);
     rb_block_call(obj, id_each, 0, 0, min_by_i, (VALUE)memo);
-    return memo[1];
+    return memo->v2;
 }
 
 static VALUE
-max_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+max_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
+    struct cmp_opt_data cmp_opt = { 0, 0 };
+    struct MEMO *memo = MEMO_CAST(args);
     VALUE v;
 
     ENUM_WANT_SVALUE();
 
-    v = rb_yield(i);
-    if (memo[0] == Qundef) {
-	memo[0] = v;
-	memo[1] = i;
+    v = enum_yield(argc, i);
+    if (memo->v1 == Qundef) {
+	MEMO_V1_SET(memo, v);
+	MEMO_V2_SET(memo, i);
     }
-    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo[0]), v, memo[0]) > 0) {
-	memo[0] = v;
-	memo[1] = i;
+    else if (OPTIMIZED_CMP(v, memo->v1, cmp_opt) > 0) {
+	MEMO_V1_SET(memo, v);
+	MEMO_V2_SET(memo, i);
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.max_by {|obj| block }   -> obj
- *     enum.max_by                  -> an_enumerator
+ *     enum.max_by {|obj| block }      -> obj
+ *     enum.max_by                     -> an_enumerator
+ *     enum.max_by(n) {|obj| block }   -> obj
+ *     enum.max_by(n)                  -> an_enumerator
  *
  *  Returns the object in <i>enum</i> that gives the maximum
  *  value from the given block.
@@ -1461,20 +2137,77 @@ max_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
  *  If no block is given, an enumerator is returned instead.
  *
  *     a = %w(albatross dog horse)
- *     a.max_by {|x| x.length }   #=> "albatross"
+ *     a.max_by { |x| x.length }   #=> "albatross"
+ *
+ *  If the +n+ argument is given, maximum +n+ elements are returned
+ *  as an array. These +n+ elements are sorted by the value from the
+ *  given block, in descending order.
+ *
+ *     a = %w[albatross dog horse]
+ *     a.max_by(2) {|x| x.length } #=> ["albatross", "horse"]
+ *
+ *  enum.max_by(n) can be used to implement weighted random sampling.
+ *  Following example implements and use Enumerable#wsample.
+ *
+ *     module Enumerable
+ *       # weighted random sampling.
+ *       #
+ *       # Pavlos S. Efraimidis, Paul G. Spirakis
+ *       # Weighted random sampling with a reservoir
+ *       # Information Processing Letters
+ *       # Volume 97, Issue 5 (16 March 2006)
+ *       def wsample(n)
+ *         self.max_by(n) {|v| rand ** (1.0/yield(v)) }
+ *       end
+ *     end
+ *     e = (-20..20).to_a*10000
+ *     a = e.wsample(20000) {|x|
+ *       Math.exp(-(x/5.0)**2) # normal distribution
+ *     }
+ *     # a is 20000 samples from e.
+ *     p a.length #=> 20000
+ *     h = a.group_by {|x| x }
+ *     -10.upto(10) {|x| puts "*" * (h[x].length/30.0).to_i if h[x] }
+ *     #=> *
+ *     #   ***
+ *     #   ******
+ *     #   ***********
+ *     #   ******************
+ *     #   *****************************
+ *     #   *****************************************
+ *     #   ****************************************************
+ *     #   ***************************************************************
+ *     #   ********************************************************************
+ *     #   ***********************************************************************
+ *     #   ***********************************************************************
+ *     #   **************************************************************
+ *     #   ****************************************************
+ *     #   ***************************************
+ *     #   ***************************
+ *     #   ******************
+ *     #   ***********
+ *     #   *******
+ *     #   ***
+ *     #   *
+ *
  */
 
 static VALUE
-enum_max_by(VALUE obj)
+enum_max_by(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE memo[2];
+    struct MEMO *memo;
+    VALUE num;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
+    rb_check_arity(argc, 0, 1);
+
+    RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
-    memo[0] = Qundef;
-    memo[1] = Qnil;
+    if (argc && !NIL_P(num = argv[0]))
+        return rb_nmin_run(obj, num, 1, 1, 0);
+
+    memo = MEMO_NEW(Qundef, Qnil, 0);
     rb_block_call(obj, id_each, 0, 0, max_by_i, (VALUE)memo);
-    return memo[1];
+    return memo->v2;
 }
 
 struct minmax_by_t {
@@ -1489,6 +2222,8 @@ struct minmax_by_t {
 static void
 minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *memo)
 {
+    struct cmp_opt_data cmp_opt = { 0, 0 };
+
     if (memo->min_bv == Qundef) {
 	memo->min_bv = v1;
 	memo->max_bv = v2;
@@ -1496,11 +2231,11 @@ minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *m
 	memo->max = i2;
     }
     else {
-	if (rb_cmpint(rb_funcall(v1, id_cmp, 1, memo->min_bv), v1, memo->min_bv) < 0) {
+	if (OPTIMIZED_CMP(v1, memo->min_bv, cmp_opt) < 0) {
 	    memo->min_bv = v1;
 	    memo->min = i1;
 	}
-	if (rb_cmpint(rb_funcall(v2, id_cmp, 1, memo->max_bv), v2, memo->max_bv) > 0) {
+	if (OPTIMIZED_CMP(v2, memo->max_bv, cmp_opt) > 0) {
 	    memo->max_bv = v2;
 	    memo->max = i2;
 	}
@@ -1508,15 +2243,16 @@ minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *m
 }
 
 static VALUE
-minmax_by_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
+minmax_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
 {
-    struct minmax_by_t *memo = (struct minmax_by_t *)_memo;
+    struct cmp_opt_data cmp_opt = { 0, 0 };
+    struct minmax_by_t *memo = MEMO_FOR(struct minmax_by_t, _memo);
     VALUE vi, vj, j;
     int n;
 
     ENUM_WANT_SVALUE();
 
-    vi = rb_yield(i);
+    vi = enum_yield(argc, i);
 
     if (memo->last_bv == Qundef) {
         memo->last_bv = vi;
@@ -1527,7 +2263,7 @@ minmax_by_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
     j = memo->last;
     memo->last_bv = Qundef;
 
-    n = rb_cmpint(rb_funcall(vj, id_cmp, 1, vi), vj, vi);
+    n = OPTIMIZED_CMP(vj, vi, cmp_opt);
     if (n == 0) {
         i = j;
         vi = vj;
@@ -1549,43 +2285,47 @@ minmax_by_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *     enum.minmax_by {|obj| block }   -> [min, max]
- *     enum.minmax_by                  -> an_enumerator
+ *     enum.minmax_by { |obj| block } -> [min, max]
+ *     enum.minmax_by                 -> an_enumerator
  *
- *  Returns two elements array array containing the objects in
- *  <i>enum</i> that gives the minimum and maximum values respectively
+ *  Returns a two element array containing the objects in
+ *  <i>enum</i> that correspond to the minimum and maximum values respectively
  *  from the given block.
  *
  *  If no block is given, an enumerator is returned instead.
  *
  *     a = %w(albatross dog horse)
- *     a.minmax_by {|x| x.length }   #=> ["dog", "albatross"]
+ *     a.minmax_by { |x| x.length }   #=> ["dog", "albatross"]
  */
 
 static VALUE
 enum_minmax_by(VALUE obj)
 {
-    struct minmax_by_t memo;
-
-    RETURN_ENUMERATOR(obj, 0, 0);
-
-    memo.min_bv = Qundef;
-    memo.max_bv = Qundef;
-    memo.min = Qnil;
-    memo.max = Qnil;
-    memo.last_bv = Qundef;
-    memo.last = Qundef;
-    rb_block_call(obj, id_each, 0, 0, minmax_by_i, (VALUE)&memo);
-    if (memo.last_bv != Qundef)
-        minmax_by_i_update(memo.last_bv, memo.last_bv, memo.last, memo.last, &memo);
-    return rb_assoc_new(memo.min, memo.max);
+    VALUE memo;
+    struct minmax_by_t *m = NEW_MEMO_FOR(struct minmax_by_t, memo);
+
+    RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+
+    m->min_bv = Qundef;
+    m->max_bv = Qundef;
+    m->min = Qnil;
+    m->max = Qnil;
+    m->last_bv = Qundef;
+    m->last = Qundef;
+    rb_block_call(obj, id_each, 0, 0, minmax_by_i, memo);
+    if (m->last_bv != Qundef)
+        minmax_by_i_update(m->last_bv, m->last_bv, m->last, m->last, m);
+    m = MEMO_FOR(struct minmax_by_t, memo);
+    return rb_assoc_new(m->min, m->max);
 }
 
 static VALUE
-member_i(VALUE iter, VALUE *memo, int argc, VALUE *argv)
+member_i(RB_BLOCK_CALL_FUNC_ARGLIST(iter, args))
 {
-    if (rb_equal(enum_values_pack(argc, argv), memo[0])) {
-	memo[1] = Qtrue;
+    struct MEMO *memo = MEMO_CAST(args);
+
+    if (rb_equal(rb_enum_values_pack(argc, argv), memo->v1)) {
+	MEMO_V2_SET(memo, Qtrue);
 	rb_iter_break();
     }
     return Qnil;
@@ -1599,34 +2339,36 @@ member_i(VALUE iter, VALUE *memo, int argc, VALUE *argv)
  *  Returns <code>true</code> if any member of <i>enum</i> equals
  *  <i>obj</i>. Equality is tested using <code>==</code>.
  *
- *     IO.constants.include? :SEEK_SET          #=> true
- *     IO.constants.include? :SEEK_NO_FURTHER   #=> false
+ *     (1..10).include? 5  #=> true
+ *     (1..10).include? 15 #=> false
+ *     (1..10).member? 5   #=> true
+ *     (1..10).member? 15  #=> false
  *
  */
 
 static VALUE
 enum_member(VALUE obj, VALUE val)
 {
-    VALUE memo[2];
+    struct MEMO *memo = MEMO_NEW(val, Qfalse, 0);
 
-    memo[0] = val;
-    memo[1] = Qfalse;
     rb_block_call(obj, id_each, 0, 0, member_i, (VALUE)memo);
-    return memo[1];
+    return memo->v2;
 }
 
 static VALUE
-each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv)
+each_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo))
 {
-    long n = (*(VALUE *)memo)++;
+    struct MEMO *m = MEMO_CAST(memo);
+    VALUE n = imemo_count_value(m);
 
-    return rb_yield_values(2, enum_values_pack(argc, argv), INT2NUM(n));
+    imemo_count_up(m);
+    return rb_yield_values(2, rb_enum_values_pack(argc, argv), n);
 }
 
 /*
  *  call-seq:
- *     enum.each_with_index(*args) {|obj, i| block }   ->  enum
- *     enum.each_with_index(*args)                     ->  an_enumerator
+ *     enum.each_with_index(*args) { |obj, i| block } ->  enum
+ *     enum.each_with_index(*args)                    ->  an_enumerator
  *
  *  Calls <em>block</em> with two arguments, the item and its index,
  *  for each item in <i>enum</i>.  Given arguments are passed through
@@ -1635,7 +2377,7 @@ each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv)
  *  If no block is given, an enumerator is returned instead.
  *
  *     hash = Hash.new
- *     %w(cat dog wombat).each_with_index {|item, index|
+ *     %w(cat dog wombat).each_with_index { |item, index|
  *       hash[item] = index
  *     }
  *     hash   #=> {"cat"=>0, "dog"=>1, "wombat"=>2}
@@ -1645,46 +2387,52 @@ each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv)
 static VALUE
 enum_each_with_index(int argc, VALUE *argv, VALUE obj)
 {
-    long memo;
+    struct MEMO *memo;
 
-    RETURN_ENUMERATOR(obj, argc, argv);
+    RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
-    memo = 0;
-    rb_block_call(obj, id_each, argc, argv, each_with_index_i, (VALUE)&memo);
+    memo = MEMO_NEW(0, 0, 0);
+    rb_block_call(obj, id_each, argc, argv, each_with_index_i, (VALUE)memo);
     return obj;
 }
 
 
 /*
  *  call-seq:
- *     enum.reverse_each(*args) {|item| block }   ->  enum
- *     enum.reverse_each(*args)                   ->  an_enumerator
+ *     enum.reverse_each(*args) { |item| block } ->  enum
+ *     enum.reverse_each(*args)                  ->  an_enumerator
  *
  *  Builds a temporary array and traverses that array in reverse order.
  *
  *  If no block is given, an enumerator is returned instead.
  *
- *      (1..3).reverse_each {|v| p v }
+ *     (1..3).reverse_each { |v| p v }
  *
- *    produces:
+ *  produces:
  *
- *      3
- *      2
- *      1
+ *     3
+ *     2
+ *     1
  */
 
 static VALUE
 enum_reverse_each(int argc, VALUE *argv, VALUE obj)
 {
     VALUE ary;
-    long i;
+    long len;
 
-    RETURN_ENUMERATOR(obj, argc, argv);
+    RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
     ary = enum_to_a(argc, argv, obj);
 
-    for (i = RARRAY_LEN(ary); --i >= 0; ) {
-	rb_yield(RARRAY_PTR(ary)[i]);
+    len = RARRAY_LEN(ary);
+    while (len--) {
+        long nlen;
+        rb_yield(RARRAY_AREF(ary, len));
+        nlen = RARRAY_LEN(ary);
+        if (nlen < len) {
+            len = nlen;
+        }
     }
 
     return obj;
@@ -1692,17 +2440,17 @@ enum_reverse_each(int argc, VALUE *argv, VALUE obj)
 
 
 static VALUE
-each_val_i(VALUE i, VALUE p, int argc, VALUE *argv)
+each_val_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
 {
     ENUM_WANT_SVALUE();
-    rb_yield(i);
+    enum_yield(argc, i);
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.each_entry {|obj| block}  -> enum
- *     enum.each_entry                -> an_enumerator
+ *     enum.each_entry { |obj| block }  -> enum
+ *     enum.each_entry                  -> an_enumerator
  *
  *  Calls <i>block</i> once for each element in +self+, passing that
  *  element as a parameter, converting multiple values from yield to an
@@ -1714,11 +2462,11 @@ each_val_i(VALUE i, VALUE p, int argc, VALUE *argv)
  *       include Enumerable
  *       def each
  *         yield 1
- *         yield 1,2
+ *         yield 1, 2
  *         yield
  *       end
  *     end
- *     Foo.new.each_entry{|o| p o }
+ *     Foo.new.each_entry{ |o| p o }
  *
  *  produces:
  *
@@ -1731,39 +2479,82 @@ each_val_i(VALUE i, VALUE p, int argc, VALUE *argv)
 static VALUE
 enum_each_entry(int argc, VALUE *argv, VALUE obj)
 {
-    RETURN_ENUMERATOR(obj, argc, argv);
+    RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
     rb_block_call(obj, id_each, argc, argv, each_val_i, 0);
     return obj;
 }
 
 static VALUE
-each_slice_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+add_int(VALUE x, long n)
+{
+    const VALUE y = LONG2NUM(n);
+    if (RB_INTEGER_TYPE_P(x)) return rb_int_plus(x, y);
+    return rb_funcallv(x, '+', 1, &y);
+}
+
+static VALUE
+div_int(VALUE x, long n)
 {
-    VALUE ary = memo[0];
+    const VALUE y = LONG2NUM(n);
+    if (RB_INTEGER_TYPE_P(x)) return rb_int_idiv(x, y);
+    return rb_funcallv(x, id_div, 1, &y);
+}
+
+#define dont_recycle_block_arg(arity) ((arity) == 1 || (arity) < 0)
+
+static VALUE
+each_slice_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, m))
+{
+    struct MEMO *memo = MEMO_CAST(m);
+    VALUE ary = memo->v1;
     VALUE v = Qnil;
-    long size = (long)memo[1];
+    long size = memo->u3.cnt;
     ENUM_WANT_SVALUE();
 
     rb_ary_push(ary, i);
 
     if (RARRAY_LEN(ary) == size) {
 	v = rb_yield(ary);
-	memo[0] = rb_ary_new2(size);
+
+	if (memo->v2) {
+	    MEMO_V1_SET(memo, rb_ary_new2(size));
+	}
+	else {
+	    rb_ary_clear(ary);
+	}
     }
 
     return v;
 }
 
+static VALUE
+enum_each_slice_size(VALUE obj, VALUE args, VALUE eobj)
+{
+    VALUE n, size;
+    long slice_size = NUM2LONG(RARRAY_AREF(args, 0));
+    ID infinite_p;
+    CONST_ID(infinite_p, "infinite?");
+    if (slice_size <= 0) rb_raise(rb_eArgError, "invalid slice size");
+
+    size = enum_size(obj, 0, 0);
+    if (size == Qnil) return Qnil;
+    if (RB_FLOAT_TYPE_P(size) && RTEST(rb_funcall(size, infinite_p, 0))) {
+        return size;
+    }
+
+    n = add_int(size, slice_size-1);
+    return div_int(n, slice_size);
+}
+
 /*
  *  call-seq:
- *    enum.each_slice(n) {...}  ->  nil
- *    enum.each_slice(n)        ->  an_enumerator
+ *    enum.each_slice(n) { ... }  ->  nil
+ *    enum.each_slice(n)          ->  an_enumerator
  *
  *  Iterates the given block for each slice of <n> elements.  If no
  *  block is given, returns an enumerator.
  *
- *  e.g.:
- *      (1..10).each_slice(3) {|a| p a}
+ *      (1..10).each_slice(3) { |a| p a }
  *      # outputs below
  *      [1, 2, 3]
  *      [4, 5, 6]
@@ -1775,27 +2566,30 @@ static VALUE
 enum_each_slice(VALUE obj, VALUE n)
 {
     long size = NUM2LONG(n);
-    VALUE args[2], ary;
+    VALUE ary;
+    struct MEMO *memo;
+    int arity;
 
     if (size <= 0) rb_raise(rb_eArgError, "invalid slice size");
-    RETURN_ENUMERATOR(obj, 1, &n);
-    args[0] = rb_ary_new2(size);
-    args[1] = (VALUE)size;
-
-    rb_block_call(obj, id_each, 0, 0, each_slice_i, (VALUE)args);
-
-    ary = args[0];
+    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);
+    rb_block_call(obj, id_each, 0, 0, each_slice_i, (VALUE)memo);
+    ary = memo->v1;
     if (RARRAY_LEN(ary) > 0) rb_yield(ary);
 
     return Qnil;
 }
 
 static VALUE
-each_cons_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+each_cons_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    VALUE ary = memo[0];
+    struct MEMO *memo = MEMO_CAST(args);
+    VALUE ary = memo->v1;
     VALUE v = Qnil;
-    long size = (long)memo[1];
+    long size = memo->u3.cnt;
     ENUM_WANT_SVALUE();
 
     if (RARRAY_LEN(ary) == size) {
@@ -1803,21 +2597,40 @@ each_cons_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
     }
     rb_ary_push(ary, i);
     if (RARRAY_LEN(ary) == size) {
-	v = rb_yield(rb_ary_dup(ary));
+	if (memo->v2) {
+	    ary = rb_ary_dup(ary);
+	}
+	v = rb_yield(ary);
     }
     return v;
 }
 
+static VALUE
+enum_each_cons_size(VALUE obj, VALUE args, VALUE eobj)
+{
+    struct cmp_opt_data cmp_opt = { 0, 0 };
+    const VALUE zero = LONG2FIX(0);
+    VALUE n, size;
+    long cons_size = NUM2LONG(RARRAY_AREF(args, 0));
+    if (cons_size <= 0) rb_raise(rb_eArgError, "invalid size");
+
+    size = enum_size(obj, 0, 0);
+    if (size == Qnil) return Qnil;
+
+    n = add_int(size, 1 - cons_size);
+    return (OPTIMIZED_CMP(n, zero, cmp_opt) == -1) ? zero : n;
+}
+
 /*
  *  call-seq:
- *    enum.each_cons(n) {...}   ->  nil
+ *    enum.each_cons(n) { ... } ->  nil
  *    enum.each_cons(n)         ->  an_enumerator
  *
  *  Iterates the given block for each array of consecutive <n>
  *  elements.  If no block is given, returns an enumerator.
  *
  *  e.g.:
- *      (1..10).each_cons(3) {|a| p a}
+ *      (1..10).each_cons(3) { |a| p a }
  *      # outputs below
  *      [1, 2, 3]
  *      [2, 3, 4]
@@ -1833,20 +2646,21 @@ static VALUE
 enum_each_cons(VALUE obj, VALUE n)
 {
     long size = NUM2LONG(n);
-    VALUE args[2];
+    struct MEMO *memo;
+    int arity;
 
     if (size <= 0) rb_raise(rb_eArgError, "invalid size");
-    RETURN_ENUMERATOR(obj, 1, &n);
-    args[0] = rb_ary_new2(size);
-    args[1] = (VALUE)size;
-
-    rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)args);
+    RETURN_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);
+    rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)memo);
 
     return Qnil;
 }
 
 static VALUE
-each_with_object_i(VALUE i, VALUE memo, int argc, VALUE *argv)
+each_with_object_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo))
 {
     ENUM_WANT_SVALUE();
     return rb_yield_values(2, i, memo);
@@ -1854,23 +2668,22 @@ each_with_object_i(VALUE i, VALUE memo, int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *    enum.each_with_object(obj) {|(*args), memo_obj| ... }  ->  obj
- *    enum.each_with_object(obj)                             ->  an_enumerator
+ *    enum.each_with_object(obj) { |(*args), memo_obj| ... }  ->  obj
+ *    enum.each_with_object(obj)                              ->  an_enumerator
  *
  *  Iterates the given block for each element with an arbitrary
  *  object given, and returns the initially given object.
  *
  *  If no block is given, returns an enumerator.
  *
- *  e.g.:
- *      evens = (1..10).each_with_object([]) {|i, a| a << i*2 }
+ *      evens = (1..10).each_with_object([]) { |i, a| a << i*2 }
  *      #=> [2, 4, 6, 8, 10, 12, 14, 16, 18, 20]
  *
  */
 static VALUE
 enum_each_with_object(VALUE obj, VALUE memo)
 {
-    RETURN_ENUMERATOR(obj, 1, &memo);
+    RETURN_SIZED_ENUMERATOR(obj, 1, &memo, enum_size);
 
     rb_block_call(obj, id_each, 0, 0, each_with_object_i, memo);
 
@@ -1878,86 +2691,96 @@ enum_each_with_object(VALUE obj, VALUE memo)
 }
 
 static VALUE
-zip_ary(VALUE val, NODE *memo, int argc, VALUE *argv)
+zip_ary(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
 {
-    volatile VALUE result = memo->u1.value;
-    volatile VALUE args = memo->u2.value;
+    struct MEMO *memo = (struct MEMO *)memoval;
+    VALUE result = memo->v1;
+    VALUE args = memo->v2;
     long n = memo->u3.cnt++;
-    volatile VALUE tmp;
+    VALUE tmp;
     int i;
 
     tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
-    rb_ary_store(tmp, 0, enum_values_pack(argc, argv));
+    rb_ary_store(tmp, 0, rb_enum_values_pack(argc, argv));
     for (i=0; i<RARRAY_LEN(args); i++) {
-	VALUE e = RARRAY_PTR(args)[i];
+	VALUE e = RARRAY_AREF(args, i);
 
 	if (RARRAY_LEN(e) <= n) {
 	    rb_ary_push(tmp, Qnil);
 	}
 	else {
-	    rb_ary_push(tmp, RARRAY_PTR(e)[n]);
+	    rb_ary_push(tmp, RARRAY_AREF(e, n));
 	}
     }
     if (NIL_P(result)) {
-	rb_yield(tmp);
+	enum_yield_array(tmp);
     }
     else {
 	rb_ary_push(result, tmp);
     }
+
+    RB_GC_GUARD(args);
+
     return Qnil;
 }
 
 static VALUE
-call_next(VALUE *v)
+call_next(VALUE w)
 {
-    return v[0] = rb_funcall(v[1], id_next, 0, 0);
+    VALUE *v = (VALUE *)w;
+    return v[0] = rb_funcallv(v[1], id_next, 0, 0);
 }
 
 static VALUE
-call_stop(VALUE *v)
+call_stop(VALUE w, VALUE _)
 {
+    VALUE *v = (VALUE *)w;
     return v[0] = Qundef;
 }
 
 static VALUE
-zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
+zip_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
 {
-    volatile VALUE result = memo->u1.value;
-    volatile VALUE args = memo->u2.value;
-    volatile VALUE tmp;
+    struct MEMO *memo = (struct MEMO *)memoval;
+    VALUE result = memo->v1;
+    VALUE args = memo->v2;
+    VALUE tmp;
     int i;
 
     tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
-    rb_ary_store(tmp, 0, enum_values_pack(argc, argv));
+    rb_ary_store(tmp, 0, rb_enum_values_pack(argc, argv));
     for (i=0; i<RARRAY_LEN(args); i++) {
-	if (NIL_P(RARRAY_PTR(args)[i])) {
+	if (NIL_P(RARRAY_AREF(args, i))) {
 	    rb_ary_push(tmp, Qnil);
 	}
 	else {
 	    VALUE v[2];
 
-	    v[1] = RARRAY_PTR(args)[i];
-	    rb_rescue2(call_next, (VALUE)v, call_stop, (VALUE)v, rb_eStopIteration, 0);
+	    v[1] = RARRAY_AREF(args, i);
+	    rb_rescue2(call_next, (VALUE)v, call_stop, (VALUE)v, rb_eStopIteration, (VALUE)0);
 	    if (v[0] == Qundef) {
-		RARRAY_PTR(args)[i] = Qnil;
+		RARRAY_ASET(args, i, Qnil);
 		v[0] = Qnil;
 	    }
 	    rb_ary_push(tmp, v[0]);
 	}
     }
     if (NIL_P(result)) {
-	rb_yield(tmp);
+	enum_yield_array(tmp);
     }
     else {
 	rb_ary_push(result, tmp);
     }
+
+    RB_GC_GUARD(args);
+
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.zip(arg, ...)                   -> an_array_of_array
- *     enum.zip(arg, ...) {|arr| block }    -> nil
+ *     enum.zip(arg, ...)                  -> an_array_of_array
+ *     enum.zip(arg, ...) { |arr| block }  -> nil
  *
  *  Takes one element from <i>enum</i> and merges corresponding
  *  elements from each <i>args</i>.  This generates a sequence of
@@ -1971,9 +2794,14 @@ zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
  *     a = [ 4, 5, 6 ]
  *     b = [ 7, 8, 9 ]
  *
- *     [1,2,3].zip(a, b)      #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
- *     [1,2].zip(a,b)         #=> [[1, 4, 7], [2, 5, 8]]
- *     a.zip([1,2],[8])       #=> [[4, 1, 8], [5, 2, nil], [6, nil, nil]]
+ *     a.zip(b)                 #=> [[4, 7], [5, 8], [6, 9]]
+ *     [1, 2, 3].zip(a, b)      #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
+ *     [1, 2].zip(a, b)         #=> [[1, 4, 7], [2, 5, 8]]
+ *     a.zip([1, 2], [8])       #=> [[4, 1, 8], [5, 2, nil], [6, nil, nil]]
+ *
+ *     c = []
+ *     a.zip(b) { |x, y| c << x + y }  #=> nil
+ *     c                               #=> [11, 13, 15]
  *
  */
 
@@ -1982,7 +2810,7 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
 {
     int i;
     ID conv;
-    NODE *memo;
+    struct MEMO *memo;
     VALUE result = Qnil;
     VALUE args = rb_ary_new4(argc, argv);
     int allary = TRUE;
@@ -1997,26 +2825,33 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
 	argv[i] = ary;
     }
     if (!allary) {
+	static const VALUE sym_each = STATIC_ID2SYM(id_each);
 	CONST_ID(conv, "to_enum");
 	for (i=0; i<argc; i++) {
-	    argv[i] = rb_funcall(argv[i], conv, 1, ID2SYM(id_each));
+	    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]));
+            }
+	    argv[i] = rb_funcallv(argv[i], conv, 1, &sym_each);
 	}
     }
     if (!rb_block_given_p()) {
 	result = rb_ary_new();
     }
-    /* use NODE_DOT2 as memo(v, v, -) */
-    memo = rb_node_newnode(NODE_DOT2, result, args, 0);
+
+    /* TODO: use NODE_DOT2 as memo(v, v, -) */
+    memo = MEMO_NEW(result, args, 0);
     rb_block_call(obj, id_each, 0, 0, allary ? zip_ary : zip_i, (VALUE)memo);
 
     return result;
 }
 
 static VALUE
-take_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
+take_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    rb_ary_push(arg[0], enum_values_pack(argc, argv));
-    if (--arg[1] == 0) rb_iter_break();
+    struct MEMO *memo = MEMO_CAST(args);
+    rb_ary_push(memo->v1, rb_enum_values_pack(argc, argv));
+    if (--memo->u3.cnt == 0) rb_iter_break();
     return Qnil;
 }
 
@@ -2028,13 +2863,15 @@ take_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
  *
  *     a = [1, 2, 3, 4, 5, 0]
  *     a.take(3)             #=> [1, 2, 3]
+ *     a.take(30)            #=> [1, 2, 3, 4, 5, 0]
  *
  */
 
 static VALUE
 enum_take(VALUE obj, VALUE n)
 {
-    VALUE args[2];
+    struct MEMO *memo;
+    VALUE result;
     long len = NUM2LONG(n);
 
     if (len < 0) {
@@ -2042,25 +2879,25 @@ enum_take(VALUE obj, VALUE n)
     }
 
     if (len == 0) return rb_ary_new2(0);
-    args[0] = rb_ary_new();
-    args[1] = len;
-    rb_block_call(obj, id_each, 0, 0, take_i, (VALUE)args);
-    return args[0];
+    result = rb_ary_new2(len);
+    memo = MEMO_NEW(result, 0, len);
+    rb_block_call(obj, id_each, 0, 0, take_i, (VALUE)memo);
+    return result;
 }
 
 
 static VALUE
-take_while_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
+take_while_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
-    if (!RTEST(enum_yield(argc, argv))) rb_iter_break();
-    rb_ary_push(*ary, enum_values_pack(argc, argv));
+    if (!RTEST(rb_yield_values2(argc, argv))) rb_iter_break();
+    rb_ary_push(ary, rb_enum_values_pack(argc, argv));
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.take_while {|arr| block }   -> array
- *     enum.take_while                  -> an_enumerator
+ *     enum.take_while { |obj| block } -> array
+ *     enum.take_while                 -> an_enumerator
  *
  *  Passes elements to the block until the block returns +nil+ or +false+,
  *  then stops iterating and returns an array of all prior elements.
@@ -2068,7 +2905,7 @@ take_while_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
  *  If no block is given, an enumerator is returned instead.
  *
  *     a = [1, 2, 3, 4, 5, 0]
- *     a.take_while {|i| i < 3 }   #=> [1, 2]
+ *     a.take_while { |i| i < 3 }   #=> [1, 2]
  *
  */
 
@@ -2079,18 +2916,19 @@ enum_take_while(VALUE obj)
 
     RETURN_ENUMERATOR(obj, 0, 0);
     ary = rb_ary_new();
-    rb_block_call(obj, id_each, 0, 0, take_while_i, (VALUE)&ary);
+    rb_block_call(obj, id_each, 0, 0, take_while_i, ary);
     return ary;
 }
 
 static VALUE
-drop_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
+drop_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    if (arg[1] == 0) {
-	rb_ary_push(arg[0], enum_values_pack(argc, argv));
+    struct MEMO *memo = MEMO_CAST(args);
+    if (memo->u3.cnt == 0) {
+	rb_ary_push(memo->v1, rb_enum_values_pack(argc, argv));
     }
     else {
-	arg[1]--;
+	memo->u3.cnt--;
     }
     return Qnil;
 }
@@ -2110,37 +2948,39 @@ drop_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
 static VALUE
 enum_drop(VALUE obj, VALUE n)
 {
-    VALUE args[2];
+    VALUE result;
+    struct MEMO *memo;
     long len = NUM2LONG(n);
 
     if (len < 0) {
 	rb_raise(rb_eArgError, "attempt to drop negative size");
     }
 
-    args[1] = len;
-    args[0] = rb_ary_new();
-    rb_block_call(obj, id_each, 0, 0, drop_i, (VALUE)args);
-    return args[0];
+    result = rb_ary_new();
+    memo = MEMO_NEW(result, 0, len);
+    rb_block_call(obj, id_each, 0, 0, drop_i, (VALUE)memo);
+    return result;
 }
 
 
 static VALUE
-drop_while_i(VALUE i, VALUE *args, int argc, VALUE *argv)
+drop_while_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
+    struct MEMO *memo = MEMO_CAST(args);
     ENUM_WANT_SVALUE();
 
-    if (!args[1] && !RTEST(rb_yield(i))) {
-	args[1] = Qtrue;
+    if (!memo->u3.state && !RTEST(enum_yield(argc, i))) {
+	memo->u3.state = TRUE;
     }
-    if (args[1]) {
-	rb_ary_push(args[0], i);
+    if (memo->u3.state) {
+	rb_ary_push(memo->v1, i);
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.drop_while {|arr| block }   -> array
+ *     enum.drop_while { |obj| block }  -> array
  *     enum.drop_while                  -> an_enumerator
  *
  *  Drops elements up to, but not including, the first element for
@@ -2150,35 +2990,57 @@ drop_while_i(VALUE i, VALUE *args, int argc, VALUE *argv)
  *  If no block is given, an enumerator is returned instead.
  *
  *     a = [1, 2, 3, 4, 5, 0]
- *     a.drop_while {|i| i < 3 }   #=> [3, 4, 5, 0]
+ *     a.drop_while { |i| i < 3 }   #=> [3, 4, 5, 0]
  *
  */
 
 static VALUE
 enum_drop_while(VALUE obj)
 {
-    VALUE args[2];
+    VALUE result;
+    struct MEMO *memo;
 
     RETURN_ENUMERATOR(obj, 0, 0);
-    args[0] = rb_ary_new();
-    args[1] = Qfalse;
-    rb_block_call(obj, id_each, 0, 0, drop_while_i, (VALUE)args);
-    return args[0];
+    result = rb_ary_new();
+    memo = MEMO_NEW(result, 0, FALSE);
+    rb_block_call(obj, id_each, 0, 0, drop_while_i, (VALUE)memo);
+    return result;
 }
 
 static VALUE
-cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+cycle_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
     ENUM_WANT_SVALUE();
 
-    rb_ary_push(ary, i);
-    rb_yield(i);
+    rb_ary_push(ary, argc > 1 ? i : rb_ary_new_from_values(argc, argv));
+    enum_yield(argc, i);
     return Qnil;
 }
 
+static VALUE
+enum_cycle_size(VALUE self, VALUE args, VALUE eobj)
+{
+    long mul = 0;
+    VALUE n = Qnil;
+    VALUE size;
+
+    if (args && (RARRAY_LEN(args) > 0)) {
+	n = RARRAY_AREF(args, 0);
+	if (!NIL_P(n)) mul = NUM2LONG(n);
+    }
+
+    size = enum_size(self, args, 0);
+    if (NIL_P(size) || FIXNUM_ZERO_P(size)) return size;
+
+    if (NIL_P(n)) return DBL2NUM(HUGE_VAL);
+    if (mul <= 0) return INT2FIX(0);
+    n = LONG2FIX(mul);
+    return rb_funcallv(size, '*', 1, &n);
+}
+
 /*
  *  call-seq:
- *     enum.cycle(n=nil) {|obj| block }   ->  nil
+ *     enum.cycle(n=nil) { |obj| block }  ->  nil
  *     enum.cycle(n=nil)                  ->  an_enumerator
  *
  *  Calls <i>block</i> for each element of <i>enum</i> repeatedly _n_
@@ -2192,8 +3054,8 @@ cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv)
  *  If no block is given, an enumerator is returned instead.
  *
  *     a = ["a", "b", "c"]
- *     a.cycle {|x| puts x }  # print, a, b, c, a, b, c,.. forever.
- *     a.cycle(2) {|x| puts x }  # print, a, b, c, a, b, c.
+ *     a.cycle { |x| puts x }  # print, a, b, c, a, b, c,.. forever.
+ *     a.cycle(2) { |x| puts x }  # print, a, b, c, a, b, c.
  *
  */
 
@@ -2204,10 +3066,10 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
     VALUE nv = Qnil;
     long n, i, len;
 
-    rb_scan_args(argc, argv, "01", &nv);
+    rb_check_arity(argc, 0, 1);
 
-    RETURN_ENUMERATOR(obj, argc, argv);
-    if (NIL_P(nv)) {
+    RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_cycle_size);
+    if (!argc || NIL_P(nv = argv[0])) {
         n = -1;
     }
     else {
@@ -2215,13 +3077,13 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
         if (n <= 0) return Qnil;
     }
     ary = rb_ary_new();
-    RBASIC(ary)->klass = 0;
+    RBASIC_CLEAR_CLASS(ary);
     rb_block_call(obj, id_each, 0, 0, cycle_i, ary);
     len = RARRAY_LEN(ary);
     if (len == 0) return Qnil;
     while (n < 0 || 0 < --n) {
         for (i=0; i<len; i++) {
-            rb_yield(RARRAY_PTR(ary)[i]);
+	    enum_yield_array(RARRAY_AREF(ary, i));
         }
     }
     return Qnil;
@@ -2229,42 +3091,41 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
 
 struct chunk_arg {
     VALUE categorize;
-    VALUE state;
     VALUE prev_value;
     VALUE prev_elts;
     VALUE yielder;
 };
 
 static VALUE
-chunk_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
+chunk_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp))
 {
-    struct chunk_arg *argp = (struct chunk_arg *)_argp;
-    VALUE v;
+    struct chunk_arg *argp = MEMO_FOR(struct chunk_arg, _argp);
+    VALUE v, s;
     VALUE alone = ID2SYM(rb_intern("_alone"));
     VALUE separator = ID2SYM(rb_intern("_separator"));
 
     ENUM_WANT_SVALUE();
 
-    if (NIL_P(argp->state))
-        v = rb_funcall(argp->categorize, rb_intern("call"), 1, i);
-    else
-        v = rb_funcall(argp->categorize, rb_intern("call"), 2, i, argp->state);
+    v = rb_funcallv(argp->categorize, id_call, 1, &i);
 
     if (v == alone) {
         if (!NIL_P(argp->prev_value)) {
-            rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
+	    s = rb_assoc_new(argp->prev_value, argp->prev_elts);
+            rb_funcallv(argp->yielder, id_lshift, 1, &s);
             argp->prev_value = argp->prev_elts = Qnil;
         }
-        rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(v, rb_ary_new3(1, i)));
+	v = rb_assoc_new(v, rb_ary_new3(1, i));
+        rb_funcallv(argp->yielder, id_lshift, 1, &v);
     }
     else if (NIL_P(v) || v == separator) {
         if (!NIL_P(argp->prev_value)) {
-            rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
+	    v = rb_assoc_new(argp->prev_value, argp->prev_elts);
+            rb_funcallv(argp->yielder, id_lshift, 1, &v);
             argp->prev_value = argp->prev_elts = Qnil;
         }
     }
-    else if (SYMBOL_P(v) && rb_id2name(SYM2ID(v))[0] == '_') {
-	rb_raise(rb_eRuntimeError, "symbol begins with an underscore is reserved");
+    else if (SYMBOL_P(v) && (s = rb_sym2str(v), RSTRING_PTR(s)[0] == '_')) {
+	rb_raise(rb_eRuntimeError, "symbols beginning with an underscore are reserved");
     }
     else {
         if (NIL_P(argp->prev_value)) {
@@ -2276,7 +3137,8 @@ chunk_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
                 rb_ary_push(argp->prev_elts, i);
             }
             else {
-                rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
+		s = rb_assoc_new(argp->prev_value, argp->prev_elts);
+                rb_funcallv(argp->yielder, id_lshift, 1, &s);
                 argp->prev_value = v;
                 argp->prev_elts = rb_ary_new3(1, i);
             }
@@ -2286,47 +3148,42 @@ chunk_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
 }
 
 static VALUE
-chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
+chunk_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
 {
     VALUE enumerable;
-    struct chunk_arg arg;
+    VALUE arg;
+    struct chunk_arg *memo = NEW_MEMO_FOR(struct chunk_arg, arg);
 
     enumerable = rb_ivar_get(enumerator, rb_intern("chunk_enumerable"));
-    arg.categorize = rb_ivar_get(enumerator, rb_intern("chunk_categorize"));
-    arg.state = rb_ivar_get(enumerator, rb_intern("chunk_initial_state"));
-    arg.prev_value = Qnil;
-    arg.prev_elts = Qnil;
-    arg.yielder = yielder;
-
-    if (!NIL_P(arg.state))
-        arg.state = rb_obj_dup(arg.state);
-
-    rb_block_call(enumerable, id_each, 0, 0, chunk_ii, (VALUE)&arg);
-    if (!NIL_P(arg.prev_elts))
-        rb_funcall(arg.yielder, rb_intern("<<"), 1, rb_assoc_new(arg.prev_value, arg.prev_elts));
+    memo->categorize = rb_ivar_get(enumerator, rb_intern("chunk_categorize"));
+    memo->prev_value = Qnil;
+    memo->prev_elts = Qnil;
+    memo->yielder = yielder;
+
+    rb_block_call(enumerable, id_each, 0, 0, chunk_ii, arg);
+    memo = MEMO_FOR(struct chunk_arg, arg);
+    if (!NIL_P(memo->prev_elts)) {
+	arg = rb_assoc_new(memo->prev_value, memo->prev_elts);
+	rb_funcallv(memo->yielder, id_lshift, 1, &arg);
+    }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.chunk {|elt| ... }                       -> an_enumerator
- *     enum.chunk(initial_state) {|elt, state| ... } -> an_enumerator
+ *     enum.chunk { |elt| ... }                       -> an_enumerator
  *
- *  Creates an enumerator for each chunked elements.
- *  The consecutive elements which have same block value are chunked.
- *
- *  The result enumerator yields the block value and an array of chunked elements.
- *  So "each" method can be called as follows.
+ *  Enumerates over the items, chunking them together based on the return
+ *  value of the block.
  *
- *    enum.chunk {|elt| key }.each {|key, ary| ... }
- *    enum.chunk(initial_state) {|elt, state| key }.each {|key, ary| ... }
+ *  Consecutive elements which return the same block value are chunked together.
  *
  *  For example, consecutive even numbers and odd numbers can be
- *  splitted as follows.
+ *  chunked as follows.
  *
- *    [3,1,4,1,5,9,2,6,5,3,5].chunk {|n|
+ *    [3, 1, 4, 1, 5, 9, 2, 6, 5, 3, 5].chunk { |n|
  *      n.even?
- *    }.each {|even, ary|
+ *    }.each { |even, ary|
  *      p [even, ary]
  *    }
  *    #=> [false, [3, 1]]
@@ -2338,8 +3195,8 @@ chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
  *  This method is especially useful for sorted series of elements.
  *  The following example counts words for each initial letter.
  *
- *    open("/usr/share/dict/words", "r:iso-8859-1") {|f|
- *      f.chunk {|line| line.ord }.each {|ch, lines| p [ch.chr, lines.length] }
+ *    open("/usr/share/dict/words", "r:iso-8859-1") { |f|
+ *      f.chunk { |line| line.ord }.each { |ch, lines| p [ch.chr, lines.length] }
  *    }
  *    #=> ["\n", 1]
  *    #   ["A", 1327]
@@ -2348,19 +3205,24 @@ chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
  *    #   ["D", 791]
  *    #   ...
  *
- *  The following key values has special meaning:
- *  - nil and :_separator specifies that the elements are dropped.
- *  - :_alone specifies that the element should be chunked as a singleton.
- *  Other symbols which begins an underscore are reserved.
+ *  The following key values have special meaning:
+ *  - +nil+ and +:_separator+ specifies that the elements should be dropped.
+ *  - +:_alone+ specifies that the element should be chunked by itself.
+ *
+ *  Any other symbols that begin with an underscore will raise an error:
+ *
+ *    items.chunk { |item| :_underscore }
+ *    #=> RuntimeError: symbols beginning with an underscore are reserved
+ *
+ *  +nil+ and +:_separator+ can be used to ignore some elements.
  *
- *  nil and :_separator can be used to ignore some elements.
- *  For example, the sequence of hyphens in svn log can be eliminated as follows.
+ *  For example, the sequence of hyphens in svn log can be eliminated as follows:
  *
  *    sep = "-"*72 + "\n"
- *    IO.popen("svn log README") {|f|
- *      f.chunk {|line|
+ *    IO.popen("svn log README") { |f|
+ *      f.chunk { |line|
  *        line != sep || nil
- *      }.each {|_, lines|
+ *      }.each { |_, lines|
  *        pp lines
  *      }
  *    }
@@ -2374,51 +3236,38 @@ chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
  *    #    "\n"]
  *    #   ...
  *
- *  paragraphs separated by empty lines can be parsed as follows.
+ *  Paragraphs separated by empty lines can be parsed as follows:
  *
- *    File.foreach("README").chunk {|line|
+ *    File.foreach("README").chunk { |line|
  *      /\A\s*\z/ !~ line || nil
- *    }.each {|_, lines|
+ *    }.each { |_, lines|
  *      pp lines
  *    }
  *
- *  :_alone can be used to pass through bunch of elements.
- *  For example, sort consecutive lines formed as Foo#bar and
- *  pass other lines, chunk can be used as follows.
- *
- *    pat = /\A[A-Z][A-Za-z0-9_]+\#/
- *    open(filename) {|f|
- *      f.chunk {|line| pat =~ line ? $& : :_alone }.each {|key, lines|
- *        if key != :_alone
- *          print lines.sort.join('')
- *        else
- *          print lines.join('')
- *        end
+ *  +:_alone+ can be used to force items into their own chunk.
+ *  For example, you can put lines that contain a URL by themselves,
+ *  and chunk the rest of the lines together, like this:
+ *
+ *    pattern = /http/
+ *    open(filename) { |f|
+ *      f.chunk { |line| line =~ pattern ? :_alone : true }.each { |key, lines|
+ *        pp lines
  *      }
  *    }
  *
- *  If the block needs to maintain state over multiple elements,
- *  _initial_state_ argument can be used.
- *  If non-nil value is given,
- *  it is duplicated for each "each" method invocation of the enumerator.
- *  The duplicated object is passed to 2nd argument of the block for "chunk" method.
- *
+ *  If no block is given, an enumerator to `chunk` is returned instead.
  */
 static VALUE
-enum_chunk(int argc, VALUE *argv, VALUE enumerable)
+enum_chunk(VALUE enumerable)
 {
-    VALUE initial_state;
     VALUE enumerator;
 
-    if(!rb_block_given_p())
-	rb_raise(rb_eArgError, "no block given");
-    rb_scan_args(argc, argv, "01", &initial_state);
+    RETURN_SIZED_ENUMERATOR(enumerable, 0, 0, enum_size);
 
     enumerator = rb_obj_alloc(rb_cEnumerator);
     rb_ivar_set(enumerator, rb_intern("chunk_enumerable"), enumerable);
     rb_ivar_set(enumerator, rb_intern("chunk_categorize"), rb_block_proc());
-    rb_ivar_set(enumerator, rb_intern("chunk_initial_state"), initial_state);
-    rb_block_call(enumerator, rb_intern("initialize"), 0, 0, chunk_i, enumerator);
+    rb_block_call(enumerator, idInitialize, 0, 0, chunk_i, enumerator);
     return enumerator;
 }
 
@@ -2426,28 +3275,25 @@ enum_chunk(int argc, VALUE *argv, VALUE enumerable)
 struct slicebefore_arg {
     VALUE sep_pred;
     VALUE sep_pat;
-    VALUE state;
     VALUE prev_elts;
     VALUE yielder;
 };
 
 static VALUE
-slicebefore_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
+slicebefore_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp))
 {
-    struct slicebefore_arg *argp = (struct slicebefore_arg *)_argp;
+    struct slicebefore_arg *argp = MEMO_FOR(struct slicebefore_arg, _argp);
     VALUE header_p;
 
     ENUM_WANT_SVALUE();
 
     if (!NIL_P(argp->sep_pat))
-        header_p = rb_funcall(argp->sep_pat, id_eqq, 1, i);
-    else if (NIL_P(argp->state))
-        header_p = rb_funcall(argp->sep_pred, rb_intern("call"), 1, i);
+        header_p = rb_funcallv(argp->sep_pat, id_eqq, 1, &i);
     else
-        header_p = rb_funcall(argp->sep_pred, rb_intern("call"), 2, i, argp->state);
+        header_p = rb_funcallv(argp->sep_pred, id_call, 1, &i);
     if (RTEST(header_p)) {
         if (!NIL_P(argp->prev_elts))
-            rb_funcall(argp->yielder, rb_intern("<<"), 1, argp->prev_elts);
+            rb_funcallv(argp->yielder, id_lshift, 1, &argp->prev_elts);
         argp->prev_elts = rb_ary_new3(1, i);
     }
     else {
@@ -2461,72 +3307,68 @@ slicebefore_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
 }
 
 static VALUE
-slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
+slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
 {
     VALUE enumerable;
-    struct slicebefore_arg arg;
+    VALUE arg;
+    struct slicebefore_arg *memo = NEW_MEMO_FOR(struct slicebefore_arg, arg);
 
     enumerable = rb_ivar_get(enumerator, rb_intern("slicebefore_enumerable"));
-    arg.sep_pred = rb_attr_get(enumerator, rb_intern("slicebefore_sep_pred"));
-    arg.sep_pat = NIL_P(arg.sep_pred) ? rb_ivar_get(enumerator, rb_intern("slicebefore_sep_pat")) : Qnil;
-    arg.state = rb_ivar_get(enumerator, rb_intern("slicebefore_initial_state"));
-    arg.prev_elts = Qnil;
-    arg.yielder = yielder;
-
-    if (!NIL_P(arg.state))
-        arg.state = rb_obj_dup(arg.state);
-
-    rb_block_call(enumerable, id_each, 0, 0, slicebefore_ii, (VALUE)&arg);
-    if (!NIL_P(arg.prev_elts))
-        rb_funcall(arg.yielder, rb_intern("<<"), 1, arg.prev_elts);
+    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->prev_elts = Qnil;
+    memo->yielder = yielder;
+
+    rb_block_call(enumerable, id_each, 0, 0, slicebefore_ii, arg);
+    memo = MEMO_FOR(struct slicebefore_arg, arg);
+    if (!NIL_P(memo->prev_elts))
+        rb_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.slice_before(pattern)                            -> an_enumerator
- *     enum.slice_before {|elt| bool }                       -> an_enumerator
- *     enum.slice_before(initial_state) {|elt, state| bool } -> an_enumerator
+ *     enum.slice_before(pattern)                             -> an_enumerator
+ *     enum.slice_before { |elt| bool }                       -> an_enumerator
  *
  *  Creates an enumerator for each chunked elements.
  *  The beginnings of chunks are defined by _pattern_ and the block.
- *  If _pattern_ === _elt_ returns true or
- *  the block returns true for the element,
- *  the element is beginning of a chunk.
- *
- *  The === and block is called from the first element to the last element
- *  of _enum_.
- *  The result for the first element is ignored.
- *
- *  The result enumerator yields the chunked elements as an array for +each+
- *  method.
- *  +each+ method can be called as follows.
+
+ *  If <code>_pattern_ === _elt_</code> returns <code>true</code> or the block
+ *  returns <code>true</code> for the element, the element is beginning of a
+ *  chunk.
+
+ *  The <code>===</code> and _block_ is called from the first element to the last
+ *  element of _enum_.  The result for the first element is ignored.
+
+ *  The result enumerator yields the chunked elements as an array.
+ *  So +each+ method can be called as follows:
  *
- *    enum.slice_before(pattern).each {|ary| ... }
- *    enum.slice_before {|elt| bool }.each {|ary| ... }
- *    enum.slice_before(initial_state) {|elt, state| bool }.each {|ary| ... }
+ *    enum.slice_before(pattern).each { |ary| ... }
+ *    enum.slice_before { |elt| bool }.each { |ary| ... }
  *
- *  Other methods of Enumerator class and Enumerable module,
- *  such as map, etc., are also usable.
+ *  Other methods of the Enumerator class and Enumerable module,
+ *  such as +to_a+, +map+, etc., are also usable.
  *
  *  For example, iteration over ChangeLog entries can be implemented as
- *  follows.
+ *  follows:
  *
  *    # iterate over ChangeLog entries.
- *    open("ChangeLog") {|f|
- *      f.slice_before(/\A\S/).each {|e| pp e}
+ *    open("ChangeLog") { |f|
+ *      f.slice_before(/\A\S/).each { |e| pp e }
  *    }
  *
  *    # same as above.  block is used instead of pattern argument.
- *    open("ChangeLog") {|f|
- *      f.slice_before {|line| /\A\S/ === line }.each {|e| pp e}
+ *    open("ChangeLog") { |f|
+ *      f.slice_before { |line| /\A\S/ === line }.each { |e| pp e }
  *    }
  *
- * "svn proplist -R" produces multiline output for each file.
- * They can be chunked as follows:
  *
- *    IO.popen([{"LC_ALL"=>"C"}, "svn", "proplist", "-R"]) {|f|
- *      f.lines.slice_before(/\AProp/).each {|lines| p lines }
+ *  "svn proplist -R" produces multiline output for each file.
+ *  They can be chunked as follows:
+ *
+ *    IO.popen([{"LC_ALL"=>"C"}, "svn", "proplist", "-R"]) { |f|
+ *      f.lines.slice_before(/\AProp/).each { |lines| p lines }
  *    }
  *    #=> ["Properties on '.':\n", "  svn:ignore\n", "  svk:merge\n"]
  *    #   ["Properties on 'goruby.c':\n", "  svn:eol-style\n"]
@@ -2537,46 +3379,46 @@ slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
  *  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:
+ *  as follows (see +chunk_while+ for a better way):
  *
- *    a = [0,2,3,4,6,7,9]
+ *    a = [0, 2, 3, 4, 6, 7, 9]
  *    prev = a[0]
- *    p a.slice_before {|e|
+ *    p a.slice_before { |e|
  *      prev, prev2 = e, prev
  *      prev2 + 1 != e
- *    }.map {|es|
+ *    }.map { |es|
  *      es.length <= 2 ? es.join(",") : "#{es.first}-#{es.last}"
  *    }.join(",")
  *    #=> "0,2-4,6,7,9"
  *
- *  However local variables are not appropriate to maintain state
- *  if the result enumerator is used twice or more.
- *  In such case, the last state of the 1st +each+ is used in 2nd +each+.
- *  _initial_state_ argument can be used to avoid this problem.
- *  If non-nil value is given as _initial_state_,
- *  it is duplicated for each "each" method invocation of the enumerator.
- *  The duplicated object is passed to 2nd argument of the block for
- *  +slice_before+ method.
- *
- *    # word wrapping.
- *    # this assumes all characters have same width.
+ *  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.
+ *
+ *    # Word wrapping.  This assumes all characters have same width.
  *    def wordwrap(words, maxwidth)
- *      # if cols is a local variable, 2nd "each" may start with non-zero cols.
- *      words.slice_before(cols: 0) {|w, h|
- *        h[:cols] += 1 if h[:cols] != 0
- *        h[:cols] += w.length
- *        if maxwidth < h[:cols]
- *          h[:cols] = w.length
- *          true
- *        else
- *          false
- *        end
+ *      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 }
  *      }
  *    end
  *    text = (1..20).to_a.join(" ")
  *    enum = wordwrap(text.split(/\s+/), 10)
  *    puts "-"*10
- *    enum.each {|ws| puts ws.join(" ") }
+ *    enum.each { |ws| puts ws.join(" ") } # first enumeration.
+ *    puts "-"*10
+ *    enum.each { |ws| puts ws.join(" ") } # second enumeration generates same result as the first.
  *    puts "-"*10
  *    #=> ----------
  *    #   1 2 3 4 5
@@ -2586,21 +3428,28 @@ slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
  *    #   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.
+ *  mbox contains series of mails which start with Unix From line.
+ *  So each mail can be extracted by slice before Unix From line.
  *
  *    # parse mbox
- *    open("mbox") {|f|
- *      f.slice_before {|line|
+ *    open("mbox") { |f|
+ *      f.slice_before { |line|
  *        line.start_with? "From "
- *      }.each {|mail|
+ *      }.each { |mail|
  *        unix_from = mail.shift
  *        i = mail.index("\n")
  *        header = mail[0...i]
  *        body = mail[(i+1)..-1]
  *        body.pop if body.last == "\n"
- *        fields = header.slice_before {|line| !" \t".include?(line[0]) }.to_a
+ *        fields = header.slice_before { |line| !" \t".include?(line[0]) }.to_a
  *        p unix_from
  *        pp fields
  *        pp body
@@ -2608,12 +3457,13 @@ slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
  *    }
  *
  *    # split mails in mbox (slice before Unix From line after an empty line)
- *    open("mbox") {|f|
- *      f.slice_before(emp: true) {|line,h|
- *        prevemp = h[:emp]
- *        h[:emp] = line == "\n"
+ *    open("mbox") { |f|
+ *      emp = true
+ *      f.slice_before { |line|
+ *        prevemp = emp
+ *        emp = line == "\n"
  *        prevemp && line.start_with?("From ")
- *      }.each {|mail|
+ *      }.each { |mail|
  *        mail.pop if mail.last == "\n"
  *        pp mail
  *      }
@@ -2626,11 +3476,10 @@ enum_slice_before(int argc, VALUE *argv, VALUE enumerable)
     VALUE enumerator;
 
     if (rb_block_given_p()) {
-        VALUE initial_state;
-        rb_scan_args(argc, argv, "01", &initial_state);
+        if (argc != 0)
+            rb_error_arity(argc, 0, 0);
         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;
@@ -2639,19 +3488,656 @@ enum_slice_before(int argc, VALUE *argv, VALUE enumerable)
         rb_ivar_set(enumerator, rb_intern("slicebefore_sep_pat"), sep_pat);
     }
     rb_ivar_set(enumerator, rb_intern("slicebefore_enumerable"), enumerable);
-    rb_block_call(enumerator, rb_intern("initialize"), 0, 0, slicebefore_i, enumerator);
+    rb_block_call(enumerator, idInitialize, 0, 0, slicebefore_i, enumerator);
     return enumerator;
 }
 
+
+struct sliceafter_arg {
+    VALUE pat;
+    VALUE pred;
+    VALUE prev_elts;
+    VALUE yielder;
+};
+
+static VALUE
+sliceafter_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
+{
+#define UPDATE_MEMO ((void)(memo = MEMO_FOR(struct sliceafter_arg, _memo)))
+    struct sliceafter_arg *memo;
+    int split_p;
+    UPDATE_MEMO;
+
+    ENUM_WANT_SVALUE();
+
+    if (NIL_P(memo->prev_elts)) {
+        memo->prev_elts = rb_ary_new3(1, i);
+    }
+    else {
+        rb_ary_push(memo->prev_elts, i);
+    }
+
+    if (NIL_P(memo->pred)) {
+        split_p = RTEST(rb_funcallv(memo->pat, id_eqq, 1, &i));
+        UPDATE_MEMO;
+    }
+    else {
+        split_p = RTEST(rb_funcallv(memo->pred, id_call, 1, &i));
+        UPDATE_MEMO;
+    }
+
+    if (split_p) {
+        rb_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
+        UPDATE_MEMO;
+        memo->prev_elts = Qnil;
+    }
+
+    return Qnil;
+#undef UPDATE_MEMO
+}
+
+static VALUE
+sliceafter_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
+{
+    VALUE enumerable;
+    VALUE arg;
+    struct sliceafter_arg *memo = NEW_MEMO_FOR(struct sliceafter_arg, arg);
+
+    enumerable = rb_ivar_get(enumerator, rb_intern("sliceafter_enum"));
+    memo->pat = rb_ivar_get(enumerator, rb_intern("sliceafter_pat"));
+    memo->pred = rb_attr_get(enumerator, rb_intern("sliceafter_pred"));
+    memo->prev_elts = Qnil;
+    memo->yielder = yielder;
+
+    rb_block_call(enumerable, id_each, 0, 0, sliceafter_ii, arg);
+    memo = MEMO_FOR(struct sliceafter_arg, arg);
+    if (!NIL_P(memo->prev_elts))
+        rb_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.slice_after(pattern)       -> an_enumerator
+ *     enum.slice_after { |elt| bool } -> an_enumerator
+ *
+ *  Creates an enumerator for each chunked elements.
+ *  The ends of chunks are defined by _pattern_ and the block.
+ *
+ *  If <code>_pattern_ === _elt_</code> returns <code>true</code> or the block
+ *  returns <code>true</code> for the element, the element is end of a
+ *  chunk.
+ *
+ *  The <code>===</code> and _block_ is called from the first element to the last
+ *  element of _enum_.
+ *
+ *  The result enumerator yields the chunked elements as an array.
+ *  So +each+ method can be called as follows:
+ *
+ *    enum.slice_after(pattern).each { |ary| ... }
+ *    enum.slice_after { |elt| bool }.each { |ary| ... }
+ *
+ *  Other methods of the Enumerator class and Enumerable module,
+ *  such as +map+, etc., are also usable.
+ *
+ *  For example, continuation lines (lines end with backslash) can be
+ *  concatenated as follows:
+ *
+ *    lines = ["foo\n", "bar\\\n", "baz\n", "\n", "qux\n"]
+ *    e = lines.slice_after(/(?<!\\)\n\z/)
+ *    p e.to_a
+ *    #=> [["foo\n"], ["bar\\\n", "baz\n"], ["\n"], ["qux\n"]]
+ *    p e.map {|ll| ll[0...-1].map {|l| l.sub(/\\\n\z/, "") }.join + ll.last }
+ *    #=>["foo\n", "barbaz\n", "\n", "qux\n"]
+ *
+ */
+
+static VALUE
+enum_slice_after(int argc, VALUE *argv, VALUE enumerable)
+{
+    VALUE enumerator;
+    VALUE pat = Qnil, pred = Qnil;
+
+    if (rb_block_given_p()) {
+        if (0 < argc)
+            rb_raise(rb_eArgError, "both pattern and block are given");
+        pred = rb_block_proc();
+    }
+    else {
+        rb_scan_args(argc, argv, "1", &pat);
+    }
+
+    enumerator = rb_obj_alloc(rb_cEnumerator);
+    rb_ivar_set(enumerator, rb_intern("sliceafter_enum"), enumerable);
+    rb_ivar_set(enumerator, rb_intern("sliceafter_pat"), pat);
+    rb_ivar_set(enumerator, rb_intern("sliceafter_pred"), pred);
+
+    rb_block_call(enumerator, idInitialize, 0, 0, sliceafter_i, enumerator);
+    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 {
+	VALUE args[2];
+	args[0] = memo->prev_elt;
+	args[1] = i;
+        split_p = RTEST(rb_funcallv(memo->pred, id_call, 2, args));
+        UPDATE_MEMO;
+
+        if (memo->inverted)
+            split_p = !split_p;
+
+        if (split_p) {
+            rb_funcallv(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_funcallv(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;
+        }
+
+        if (isnan(f)) return;
+        if (isnan(x)) {
+            memo->v = i;
+            memo->f = x;
+            return;
+        }
+        if (isinf(x)) {
+            if (isinf(f) && signbit(x) != signbit(f)) {
+                memo->f = NAN;
+                memo->v = DBL2NUM(f);
+            }
+            else {
+                memo->f = x;
+                memo->v = i;
+            }
+            return;
+        }
+        if (isinf(f)) return;
+
+        t = f + x;
+        if (fabs(f) >= fabs(x))
+            c += ((f - t) + x);
+        else
+            c += ((x - t) + f);
+        f = t;
+    }
+    else {
+      some_value:
+        v = rb_funcallv(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
+ *   ('a'..'z').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"
+ *
+ * If the method is applied to an Integer range without a block,
+ * the sum is not done by iteration, but instead using Gauss's summation
+ * formula.
+ *
+ * Enumerable#sum method may not respect method redefinition of "+"
+ * methods such as Integer#+, or "each" methods such as Range#each.
+ */
+static VALUE
+enum_sum(int argc, VALUE* argv, VALUE obj)
+{
+    struct enum_sum_memo memo;
+    VALUE beg, end;
+    int excl;
+
+    memo.v = (rb_check_arity(argc, 0, 1) == 0) ? LONG2FIX(0) : argv[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;
+    }
+    else {
+        memo.f = 0.0;
+        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))
+{
+    ENUM_WANT_SVALUE();
+    rb_hash_add_new_element(hash, i, i);
+    return Qnil;
+}
+
+static VALUE
+uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
+{
+    ENUM_WANT_SVALUE();
+    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
- *  sort. The class must provide a method <code>each</code>, which
- *  yields successive members of the collection. If
- *  <code>Enumerable#max</code>, <code>#min</code>, or
- *  <code>#sort</code> is used, the objects in the collection must also
- *  implement a meaningful <code><=></code> operator, as these methods
- *  rely on an ordering between members of the collection.
+ *  The Enumerable mixin provides collection classes with several
+ *  traversal and searching methods, and with the ability to sort. The
+ *  class must provide a method #each, which yields
+ *  successive members of the collection. If Enumerable#max, #min, or
+ *  #sort is used, the objects in the collection must also implement a
+ *  meaningful <code><=></code> operator, as these methods rely on an
+ *  ordering between members of the collection.
  */
 
 void
@@ -2664,16 +4150,20 @@ Init_Enumerable(void)
 
     rb_define_method(rb_mEnumerable, "to_a", enum_to_a, -1);
     rb_define_method(rb_mEnumerable, "entries", enum_to_a, -1);
+    rb_define_method(rb_mEnumerable, "to_h", enum_to_h, -1);
 
     rb_define_method(rb_mEnumerable, "sort", enum_sort, 0);
     rb_define_method(rb_mEnumerable, "sort_by", enum_sort_by, 0);
     rb_define_method(rb_mEnumerable, "grep", enum_grep, 1);
+    rb_define_method(rb_mEnumerable, "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);
     rb_define_method(rb_mEnumerable, "find_index", enum_find_index, -1);
     rb_define_method(rb_mEnumerable, "find_all", enum_find_all, 0);
     rb_define_method(rb_mEnumerable, "select", enum_find_all, 0);
+    rb_define_method(rb_mEnumerable, "filter", enum_find_all, 0);
+    rb_define_method(rb_mEnumerable, "filter_map", enum_filter_map, 0);
     rb_define_method(rb_mEnumerable, "reject", enum_reject, 0);
     rb_define_method(rb_mEnumerable, "collect", enum_collect, 0);
     rb_define_method(rb_mEnumerable, "map", enum_collect, 0);
@@ -2683,16 +4173,17 @@ Init_Enumerable(void)
     rb_define_method(rb_mEnumerable, "reduce", enum_inject, -1);
     rb_define_method(rb_mEnumerable, "partition", enum_partition, 0);
     rb_define_method(rb_mEnumerable, "group_by", enum_group_by, 0);
+    rb_define_method(rb_mEnumerable, "tally", enum_tally, 0);
     rb_define_method(rb_mEnumerable, "first", enum_first, -1);
-    rb_define_method(rb_mEnumerable, "all?", enum_all, 0);
-    rb_define_method(rb_mEnumerable, "any?", enum_any, 0);
-    rb_define_method(rb_mEnumerable, "one?", enum_one, 0);
-    rb_define_method(rb_mEnumerable, "none?", enum_none, 0);
-    rb_define_method(rb_mEnumerable, "min", enum_min, 0);
-    rb_define_method(rb_mEnumerable, "max", enum_max, 0);
+    rb_define_method(rb_mEnumerable, "all?", enum_all, -1);
+    rb_define_method(rb_mEnumerable, "any?", enum_any, -1);
+    rb_define_method(rb_mEnumerable, "one?", enum_one, -1);
+    rb_define_method(rb_mEnumerable, "none?", enum_none, -1);
+    rb_define_method(rb_mEnumerable, "min", enum_min, -1);
+    rb_define_method(rb_mEnumerable, "max", enum_max, -1);
     rb_define_method(rb_mEnumerable, "minmax", enum_minmax, 0);
-    rb_define_method(rb_mEnumerable, "min_by", enum_min_by, 0);
-    rb_define_method(rb_mEnumerable, "max_by", enum_max_by, 0);
+    rb_define_method(rb_mEnumerable, "min_by", enum_min_by, -1);
+    rb_define_method(rb_mEnumerable, "max_by", enum_max_by, -1);
     rb_define_method(rb_mEnumerable, "minmax_by", enum_minmax_by, 0);
     rb_define_method(rb_mEnumerable, "member?", enum_member, 1);
     rb_define_method(rb_mEnumerable, "include?", enum_member, 1);
@@ -2708,8 +4199,13 @@ 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, -1);
+    rb_define_method(rb_mEnumerable, "chunk", enum_chunk, 0);
     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");
 }
diff --git a/enumerator.c b/enumerator.c
index 8b1add254a..9d0547da05 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -13,6 +13,12 @@
 ************************************************/
 
 #include "ruby/ruby.h"
+#include "internal.h"
+#include "id.h"
+
+#ifdef HAVE_FLOAT_H
+#include <float.h>
+#endif
 
 /*
  * Document-class: Enumerator
@@ -20,8 +26,8 @@
  * A class which allows both internal and external iteration.
  *
  * An Enumerator can be created by the following methods.
- * - Kernel#to_enum
- * - Kernel#enum_for
+ * - Object#to_enum
+ * - Object#enum_for
  * - Enumerator.new
  *
  * Most methods have two forms: a block form where the contents
@@ -30,17 +36,22 @@
  *
  *   enumerator = %w(one two three).each
  *   puts enumerator.class # => Enumerator
- *   enumerator.each_with_object("foo") do |item,obj|
+ *
+ *   enumerator.each_with_object("foo") do |item, obj|
  *     puts "#{obj}: #{item}"
  *   end
+ *
  *   # foo: one
  *   # foo: two
  *   # foo: three
+ *
  *   enum_with_obj = enumerator.each_with_object("foo")
  *   puts enum_with_obj.class # => Enumerator
- *   enum_with_obj.each do |item,obj|
- *     puts "#{obj: #{item}"
+ *
+ *   enum_with_obj.each do |item, obj|
+ *     puts "#{obj}: #{item}"
  *   end
+ *
  *   # foo: one
  *   # foo: two
  *   # foo: three
@@ -49,7 +60,7 @@
  * can map a list's elements to strings containing the index
  * and the element as a string via:
  *
- *   puts %w[foo bar baz].map.with_index {|w,i| "#{i}:#{w}" }
+ *   puts %w[foo bar baz].map.with_index { |w, i| "#{i}:#{w}" }
  *   # => ["0:foo", "1:bar", "2:baz"]
  *
  * An Enumerator can also be used as an external iterator.
@@ -96,8 +107,19 @@
  *
  */
 VALUE rb_cEnumerator;
-static ID id_rewind, id_each;
-static VALUE sym_each;
+static VALUE rb_cLazy;
+static ID id_rewind, id_new, id_to_enum;
+static ID id_next, id_result, id_receiver, id_arguments, id_memo, id_method, id_force;
+static ID id_begin, id_end, id_step, id_exclude_end;
+static VALUE sym_each, sym_cycle, sym_yield;
+
+static VALUE lazy_use_super_method;
+
+#define id_call idCall
+#define id_each idEach
+#define id_eqq idEqq
+#define id_initialize idInitialize
+#define id_size idSize
 
 VALUE rb_eStopIteration;
 
@@ -110,21 +132,53 @@ struct enumerator {
     VALUE lookahead;
     VALUE feedvalue;
     VALUE stop_exc;
+    VALUE size;
+    VALUE procs;
+    rb_enumerator_size_func *size_fn;
+    int kw_splat;
 };
 
-static VALUE rb_cGenerator, rb_cYielder;
+static VALUE rb_cGenerator, rb_cYielder, rb_cEnumProducer;
 
 struct generator {
     VALUE proc;
+    VALUE obj;
 };
 
 struct yielder {
     VALUE proc;
 };
 
+struct producer {
+    VALUE init;
+    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);
 
+static VALUE rb_cEnumChain;
+
+struct enum_chain {
+    VALUE enums;
+    long pos;
+};
+
+VALUE rb_cArithSeq;
+
 /*
  * Enumerator
  */
@@ -132,13 +186,30 @@ static void
 enumerator_mark(void *p)
 {
     struct enumerator *ptr = p;
-    rb_gc_mark(ptr->obj);
-    rb_gc_mark(ptr->args);
-    rb_gc_mark(ptr->fib);
-    rb_gc_mark(ptr->dst);
-    rb_gc_mark(ptr->lookahead);
-    rb_gc_mark(ptr->feedvalue);
-    rb_gc_mark(ptr->stop_exc);
+    rb_gc_mark_movable(ptr->obj);
+    rb_gc_mark_movable(ptr->args);
+    rb_gc_mark_movable(ptr->fib);
+    rb_gc_mark_movable(ptr->dst);
+    rb_gc_mark_movable(ptr->lookahead);
+    rb_gc_mark_movable(ptr->feedvalue);
+    rb_gc_mark_movable(ptr->stop_exc);
+    rb_gc_mark_movable(ptr->size);
+    rb_gc_mark_movable(ptr->procs);
+}
+
+static void
+enumerator_compact(void *p)
+{
+    struct enumerator *ptr = p;
+    ptr->obj = rb_gc_location(ptr->obj);
+    ptr->args = rb_gc_location(ptr->args);
+    ptr->fib = rb_gc_location(ptr->fib);
+    ptr->dst = rb_gc_location(ptr->dst);
+    ptr->lookahead = rb_gc_location(ptr->lookahead);
+    ptr->feedvalue = rb_gc_location(ptr->feedvalue);
+    ptr->stop_exc = rb_gc_location(ptr->stop_exc);
+    ptr->size = rb_gc_location(ptr->size);
+    ptr->procs = rb_gc_location(ptr->procs);
 }
 
 #define enumerator_free RUBY_TYPED_DEFAULT_FREE
@@ -146,7 +217,7 @@ enumerator_mark(void *p)
 static size_t
 enumerator_memsize(const void *p)
 {
-    return p ? sizeof(struct enumerator) : 0;
+    return sizeof(struct enumerator);
 }
 
 static const rb_data_type_t enumerator_data_type = {
@@ -155,7 +226,9 @@ static const rb_data_type_t enumerator_data_type = {
 	enumerator_mark,
 	enumerator_free,
 	enumerator_memsize,
+        enumerator_compact,
     },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static struct enumerator *
@@ -170,20 +243,65 @@ enumerator_ptr(VALUE obj)
     return ptr;
 }
 
+static void
+proc_entry_mark(void *p)
+{
+    struct proc_entry *ptr = p;
+    rb_gc_mark_movable(ptr->proc);
+    rb_gc_mark_movable(ptr->memo);
+}
+
+static void
+proc_entry_compact(void *p)
+{
+    struct proc_entry *ptr = p;
+    ptr->proc = rb_gc_location(ptr->proc);
+    ptr->memo = rb_gc_location(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,
+        proc_entry_compact,
+    },
+};
+
+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)
- *   obj.enum_for(method = :each, *args)
+ *   obj.to_enum(method = :each, *args)                 -> enum
+ *   obj.enum_for(method = :each, *args)                -> enum
+ *   obj.to_enum(method = :each, *args) {|*args| block} -> enum
+ *   obj.enum_for(method = :each, *args){|*args| block} -> enum
  *
- * Creates a new Enumerator which will enumerate by on calling +method+ on
- * +obj+.
+ * Creates a new Enumerator which will enumerate by calling +method+ on
+ * +obj+, passing +args+ if any. What was _yielded_ by method becomes
+ * values of enumerator.
  *
- * +method+:: the method to call on +obj+ to generate the enumeration
- * +args+:: arguments that will be passed in +method+ <i>in addition</i>
- *          to the item itself.  Note that the number of args
- *          must not exceed the number expected by +method+
+ * If a block is given, it will be used to calculate the size of
+ * the enumerator without the need to iterate it (see Enumerator#size).
  *
- * === Example
+ * === Examples
  *
  *   str = "xyz"
  *
@@ -197,17 +315,53 @@ enumerator_ptr(VALUE obj)
  *   a = [1, 2, 3]
  *   some_method(a.to_enum)
  *
+ *   # String#split in block form is more memory-effective:
+ *   very_large_string.split("|") { |chunk| return chunk if chunk.include?('DATE') }
+ *   # This could be rewritten more idiomatically with to_enum:
+ *   very_large_string.to_enum(:split, "|").lazy.grep(/DATE/).first
+ *
+ * It is typical to call to_enum when defining methods for
+ * a generic Enumerable, in case no block is passed.
+ *
+ * Here is such an example, with parameter passing and a sizing block:
+ *
+ *   module Enumerable
+ *     # a generic method to repeat the values of any enumerable
+ *     def repeat(n)
+ *       raise ArgumentError, "#{n} is negative!" if n < 0
+ *       unless block_given?
+ *         return to_enum(__method__, n) do # __method__ is :repeat here
+ *           sz = size     # Call size and multiply by n...
+ *           sz * n if sz  # but return nil if size itself is nil
+ *         end
+ *       end
+ *       each do |*val|
+ *         n.times { yield *val }
+ *       end
+ *     end
+ *   end
+ *
+ *   %i[hello world].repeat(2) { |w| puts w }
+ *     # => Prints 'hello', 'hello', 'world', 'world'
+ *   enum = (1..14).repeat(3)
+ *     # => returns an Enumerator when called without a block
+ *   enum.first(4) # => [1, 1, 1, 2]
+ *   enum.size # => 42
  */
 static VALUE
 obj_to_enum(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE meth = sym_each;
+    VALUE enumerator, meth = sym_each;
 
     if (argc > 0) {
 	--argc;
 	meth = *argv++;
     }
-    return rb_enumeratorize(obj, meth, argc, argv);
+    enumerator = rb_enumeratorize_with_size(obj, meth, argc, argv, 0);
+    if (rb_block_given_p()) {
+	enumerator_ptr(enumerator)->size = rb_block_proc();
+    }
+    return enumerator;
 }
 
 static VALUE
@@ -222,11 +376,14 @@ enumerator_allocate(VALUE klass)
     return enum_obj;
 }
 
+#define PASS_KW_SPLAT (rb_empty_keyword_given_p() ? RB_PASS_EMPTY_KEYWORDS : rb_keyword_given_p())
+
 static VALUE
-enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
+enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, VALUE size, int kw_splat)
 {
     struct enumerator *ptr;
 
+    rb_check_frozen(enum_obj);
     TypedData_Get_Struct(enum_obj, struct enumerator, &enumerator_data_type, ptr);
 
     if (!ptr) {
@@ -241,13 +398,16 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
     ptr->lookahead = Qundef;
     ptr->feedvalue = Qundef;
     ptr->stop_exc = Qfalse;
+    ptr->size = size;
+    ptr->size_fn = size_fn;
+    ptr->kw_splat = kw_splat;
 
     return enum_obj;
 }
 
 /*
  * call-seq:
- *   Enumerator.new { |yielder| ... }
+ *   Enumerator.new(size = nil) { |yielder| ... }
  *   Enumerator.new(obj, method = :each, *args)
  *
  * Creates a new Enumerator object, which can be used as an
@@ -255,7 +415,7 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
  *
  * In the first form, iteration is defined by the given block, in
  * which a "yielder" object, given as block parameter, can be used to
- * yield a value by calling the +yield+ method (aliased as +<<+):
+ * yield a value by calling the +yield+ method (aliased as <code><<</code>):
  *
  *   fib = Enumerator.new do |y|
  *     a = b = 1
@@ -265,40 +425,57 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
  *     end
  *   end
  *
- *   p fib.take(10) # => [1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
+ *   fib.take(10) # => [1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
+ *
+ * The optional parameter can be used to specify how to calculate the size
+ * in a lazy fashion (see Enumerator#size). It can either be a value or
+ * a callable object.
  *
- * In the second, deprecated, form, a generated Enumerator iterates over the
+ * In the deprecated second form, a generated Enumerator iterates over the
  * given object using the given method with the given arguments passed.
  *
- * Use of this form is discouraged.  Use Kernel#enum_for or Kernel#to_enum
+ * Use of this form is discouraged.  Use Object#enum_for or Object#to_enum
  * instead.
  *
  *   e = Enumerator.new(ObjectSpace, :each_object)
  *       #-> ObjectSpace.enum_for(:each_object)
  *
- *   e.select { |obj| obj.is_a?(Class) }  #=> array of all classes
+ *   e.select { |obj| obj.is_a?(Class) }  # => array of all classes
  *
  */
 static VALUE
 enumerator_initialize(int argc, VALUE *argv, VALUE obj)
 {
     VALUE recv, meth = sym_each;
+    VALUE size = Qnil;
+    int kw_splat = 0;
 
-    if (argc == 0) {
-	if (!rb_block_given_p())
-	    rb_raise(rb_eArgError, "wrong number of argument (0 for 1+)");
-
+    if (rb_block_given_p()) {
+	rb_check_arity(argc, 0, 1);
 	recv = generator_init(generator_allocate(rb_cGenerator), rb_block_proc());
+	if (argc) {
+            if (NIL_P(argv[0]) || rb_respond_to(argv[0], id_call) ||
+                (RB_TYPE_P(argv[0], T_FLOAT) && RFLOAT_VALUE(argv[0]) == HUGE_VAL)) {
+                size = argv[0];
+            }
+            else {
+                size = rb_to_int(argv[0]);
+            }
+            argc = 0;
+        }
     }
     else {
+	rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
+	rb_warn_deprecated("Enumerator.new without a block", "Object#to_enum");
 	recv = *argv++;
 	if (--argc) {
 	    meth = *argv++;
 	    --argc;
 	}
+        kw_splat = PASS_KW_SPLAT;
     }
 
-    return enumerator_init(obj, recv, meth, argc, argv);
+    return enumerator_init(obj, recv, meth, argc, argv, 0, size, kw_splat);
 }
 
 /* :nodoc: */
@@ -307,6 +484,7 @@ enumerator_init_copy(VALUE obj, VALUE orig)
 {
     struct enumerator *ptr0, *ptr1;
 
+    if (!OBJ_INIT_COPY(obj, orig)) return obj;
     ptr0 = enumerator_ptr(orig);
     if (ptr0->fib) {
 	/* Fibers cannot be copied */
@@ -325,54 +503,130 @@ enumerator_init_copy(VALUE obj, VALUE orig)
     ptr1->fib  = 0;
     ptr1->lookahead  = Qundef;
     ptr1->feedvalue  = Qundef;
+    ptr1->size  = ptr0->size;
+    ptr1->size_fn  = ptr0->size_fn;
 
     return obj;
 }
 
+/*
+ * For backwards compatibility; use rb_enumeratorize_with_size
+ */
 VALUE
-rb_enumeratorize(VALUE obj, VALUE meth, int argc, VALUE *argv)
+rb_enumeratorize(VALUE obj, VALUE meth, int argc, const VALUE *argv)
 {
-    return enumerator_init(enumerator_allocate(rb_cEnumerator), obj, meth, argc, argv);
+    return rb_enumeratorize_with_size(obj, meth, argc, argv, 0);
+}
+
+static VALUE
+lazy_to_enum_i(VALUE self, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, int kw_splat);
+
+VALUE
+rb_enumeratorize_with_size(VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn)
+{
+    /* Similar effect as calling obj.to_enum, i.e. dispatching to either
+       Kernel#to_enum vs Lazy#to_enum */
+    if (RTEST(rb_obj_is_kind_of(obj, rb_cLazy)))
+        return lazy_to_enum_i(obj, meth, argc, argv, size_fn, PASS_KW_SPLAT);
+    else
+	return enumerator_init(enumerator_allocate(rb_cEnumerator),
+                               obj, meth, argc, argv, size_fn, Qnil, PASS_KW_SPLAT);
+}
+
+VALUE
+rb_enumeratorize_with_size_kw(VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, int kw_splat)
+{
+    /* Similar effect as calling obj.to_enum, i.e. dispatching to either
+       Kernel#to_enum vs Lazy#to_enum */
+    if (RTEST(rb_obj_is_kind_of(obj, rb_cLazy)))
+        return lazy_to_enum_i(obj, meth, argc, argv, size_fn, kw_splat);
+    else
+        return enumerator_init(enumerator_allocate(rb_cEnumerator),
+                               obj, meth, argc, argv, size_fn, Qnil, kw_splat);
 }
 
 static VALUE
 enumerator_block_call(VALUE obj, rb_block_call_func *func, VALUE arg)
 {
     int argc = 0;
-    VALUE *argv = 0;
+    const VALUE *argv = 0;
     const struct enumerator *e = enumerator_ptr(obj);
     ID meth = e->meth;
 
     if (e->args) {
 	argc = RARRAY_LENINT(e->args);
-	argv = RARRAY_PTR(e->args);
+	argv = RARRAY_CONST_PTR(e->args);
     }
-    return rb_block_call(e->obj, meth, argc, argv, func, arg);
+    return rb_block_call_kw(e->obj, meth, argc, argv, func, arg, e->kw_splat);
 }
 
 /*
  * call-seq:
- *   enum.each {...}
+ *   enum.each { |elm| block }                    -> obj
+ *   enum.each                                    -> enum
+ *   enum.each(*appending_args) { |elm| block }   -> obj
+ *   enum.each(*appending_args)                   -> an_enumerator
+ *
+ * Iterates over the block according to how this Enumerator was constructed.
+ * If no block and no arguments are given, returns self.
+ *
+ * === Examples
+ *
+ *   "Hello, world!".scan(/\w+/)                     #=> ["Hello", "world"]
+ *   "Hello, world!".to_enum(:scan, /\w+/).to_a      #=> ["Hello", "world"]
+ *   "Hello, world!".to_enum(:scan).each(/\w+/).to_a #=> ["Hello", "world"]
+ *
+ *   obj = Object.new
  *
- * Iterates over the block according to how this Enumerable was constructed.
- * If no block is given, returns self.
+ *   def obj.each_arg(a, b=:b, *rest)
+ *     yield a
+ *     yield b
+ *     yield rest
+ *     :method_returned
+ *   end
+ *
+ *   enum = obj.to_enum :each_arg, :a, :x
+ *
+ *   enum.each.to_a                  #=> [:a, :x, []]
+ *   enum.each.equal?(enum)          #=> true
+ *   enum.each { |elm| elm }         #=> :method_returned
+ *
+ *   enum.each(:y, :z).to_a          #=> [:a, :x, [:y, :z]]
+ *   enum.each(:y, :z).equal?(enum)  #=> false
+ *   enum.each(:y, :z) { |elm| elm } #=> :method_returned
  *
  */
 static VALUE
-enumerator_each(VALUE obj)
+enumerator_each(int argc, VALUE *argv, VALUE obj)
 {
+    if (argc > 0) {
+	struct enumerator *e = enumerator_ptr(obj = rb_obj_dup(obj));
+	VALUE args = e->args;
+	if (args) {
+#if SIZEOF_INT < SIZEOF_LONG
+	    /* check int range overflow */
+	    rb_long2int(RARRAY_LEN(args) + argc);
+#endif
+	    args = rb_ary_dup(args);
+	    rb_ary_cat(args, argv, argc);
+	}
+	else {
+	    args = rb_ary_new4(argc, argv);
+	}
+	e->args = args;
+        e->size = Qnil;
+        e->size_fn = 0;
+    }
     if (!rb_block_given_p()) return obj;
     return enumerator_block_call(obj, 0, obj);
 }
 
 static VALUE
-enumerator_with_index_i(VALUE val, VALUE m, int argc, VALUE *argv)
+enumerator_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
-    VALUE idx;
-    VALUE *memo = (VALUE *)m;
-
-    idx = INT2FIX(*memo);
-    ++*memo;
+    struct MEMO *memo = (struct MEMO *)m;
+    VALUE idx = memo->v1;
+    MEMO_V1_SET(memo, rb_int_succ(idx));
 
     if (argc <= 1)
 	return rb_yield_values(2, val, idx);
@@ -380,6 +634,15 @@ enumerator_with_index_i(VALUE val, VALUE m, int argc, VALUE *argv)
     return rb_yield_values(2, rb_ary_new4(argc, argv), idx);
 }
 
+static VALUE
+enumerator_size(VALUE obj);
+
+static VALUE
+enumerator_enum_size(VALUE obj, VALUE args, VALUE eobj)
+{
+    return enumerator_size(obj);
+}
+
 /*
  * call-seq:
  *   e.with_index(offset = 0) {|(*args), idx| ... }
@@ -397,10 +660,10 @@ enumerator_with_index(int argc, VALUE *argv, VALUE obj)
 {
     VALUE memo;
 
-    rb_scan_args(argc, argv, "01", &memo);
-    RETURN_ENUMERATOR(obj, argc, argv);
-    memo = NIL_P(memo) ? 0 : (VALUE)NUM2LONG(memo);
-    return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)&memo);
+    rb_check_arity(argc, 0, 1);
+    RETURN_SIZED_ENUMERATOR(obj, argc, argv, enumerator_enum_size);
+    memo = (!argc || NIL_P(memo = argv[0])) ? INT2FIX(0) : rb_to_int(memo);
+    return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)MEMO_NEW(memo, 0, 0));
 }
 
 /*
@@ -420,7 +683,7 @@ enumerator_each_with_index(VALUE obj)
 }
 
 static VALUE
-enumerator_with_object_i(VALUE val, VALUE memo, int argc, VALUE *argv)
+enumerator_with_object_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memo))
 {
     if (argc <= 1)
 	return rb_yield_values(2, val, memo);
@@ -430,6 +693,8 @@ enumerator_with_object_i(VALUE val, VALUE memo, int argc, VALUE *argv)
 
 /*
  * call-seq:
+ *   e.each_with_object(obj) {|(*args), obj| ... }
+ *   e.each_with_object(obj)
  *   e.with_object(obj) {|(*args), obj| ... }
  *   e.with_object(obj)
  *
@@ -458,14 +723,14 @@ enumerator_with_object_i(VALUE val, VALUE memo, int argc, VALUE *argv)
 static VALUE
 enumerator_with_object(VALUE obj, VALUE memo)
 {
-    RETURN_ENUMERATOR(obj, 1, &memo);
+    RETURN_SIZED_ENUMERATOR(obj, 1, &memo, enumerator_enum_size);
     enumerator_block_call(obj, enumerator_with_object_i, memo);
 
     return memo;
 }
 
 static VALUE
-next_ii(VALUE i, VALUE obj, int argc, VALUE *argv)
+next_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, obj))
 {
     struct enumerator *e = enumerator_ptr(obj);
     VALUE feedvalue = Qnil;
@@ -479,7 +744,7 @@ next_ii(VALUE i, VALUE obj, int argc, VALUE *argv)
 }
 
 static VALUE
-next_i(VALUE curr, VALUE obj)
+next_i(RB_BLOCK_CALL_FUNC_ARGLIST(_, obj))
 {
     struct enumerator *e = enumerator_ptr(obj);
     VALUE nil = Qnil;
@@ -487,7 +752,7 @@ next_i(VALUE curr, VALUE obj)
 
     result = rb_block_call(obj, id_each, 0, 0, next_ii, obj);
     e->stop_exc = rb_exc_new2(rb_eStopIteration, "iteration reached an end");
-    rb_ivar_set(e->stop_exc, rb_intern("result"), result);
+    rb_ivar_set(e->stop_exc, id_result, result);
     return rb_fiber_yield(1, &nil);
 }
 
@@ -590,7 +855,7 @@ enumerator_next_values(VALUE obj)
 static VALUE
 ary2sv(VALUE args, int dup)
 {
-    if (TYPE(args) != T_ARRAY)
+    if (!RB_TYPE_P(args, T_ARRAY))
         return args;
 
     switch (RARRAY_LEN(args)) {
@@ -598,7 +863,7 @@ ary2sv(VALUE args, int dup)
         return Qnil;
 
       case 1:
-        return RARRAY_PTR(args)[0];
+        return RARRAY_AREF(args, 0);
 
       default:
         if (dup)
@@ -699,7 +964,7 @@ enumerator_peek_values_m(VALUE obj)
  *   p e.peek   #=> 2
  *   p e.next   #=> 2
  *   p e.next   #=> 3
- *   p e.next   #raises StopIteration
+ *   p e.peek   #raises StopIteration
  *
  */
 
@@ -720,6 +985,24 @@ enumerator_peek(VALUE obj)
  *
  * This value is cleared after being yielded.
  *
+ *   # Array#map passes the array's elements to "yield" and collects the
+ *   # results of "yield" as an array.
+ *   # Following example shows that "next" returns the passed elements and
+ *   # values passed to "feed" are collected as an array which can be
+ *   # obtained by StopIteration#result.
+ *   e = [1,2,3].map
+ *   p e.next           #=> 1
+ *   e.feed "a"
+ *   p e.next           #=> 2
+ *   e.feed "b"
+ *   p e.next           #=> 3
+ *   e.feed "c"
+ *   begin
+ *     e.next
+ *   rescue StopIteration
+ *     p $!.result      #=> ["a", "b", "c"]
+ *   end
+ *
  *   o = Object.new
  *   def o.each
  *     x = yield         # (2) blocks
@@ -755,7 +1038,7 @@ enumerator_feed(VALUE obj, VALUE v)
  * call-seq:
  *   e.rewind   -> e
  *
- * Rewinds the enumeration sequence by one step.
+ * Rewinds the enumeration sequence to the beginning.
  *
  * If the enclosed object responds to a "rewind" method, it is called.
  */
@@ -775,60 +1058,128 @@ 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
 inspect_enumerator(VALUE obj, VALUE dummy, int recur)
 {
     struct enumerator *e;
-    const char *cname;
-    VALUE eobj, str;
-    int tainted, untrusted;
+    VALUE eobj, str, cname;
 
     TypedData_Get_Struct(obj, struct enumerator, &enumerator_data_type, e);
 
-    cname = rb_obj_classname(obj);
+    cname = rb_obj_class(obj);
 
     if (!e || e->obj == Qundef) {
-	return rb_sprintf("#<%s: uninitialized>", cname);
+	return rb_sprintf("#<%"PRIsVALUE": uninitialized>", rb_class_path(cname));
     }
 
     if (recur) {
-	str = rb_sprintf("#<%s: ...>", cname);
-	OBJ_TAINT(str);
+	str = rb_sprintf("#<%"PRIsVALUE": ...>", rb_class_path(cname));
 	return str;
     }
 
-    eobj = e->obj;
+    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;
+    }
 
-    tainted   = OBJ_TAINTED(eobj);
-    untrusted = OBJ_UNTRUSTED(eobj);
+    eobj = rb_attr_get(obj, id_receiver);
+    if (NIL_P(eobj)) {
+	eobj = e->obj;
+    }
 
     /* (1..100).each_cons(2) => "#<Enumerator: 1..100:each_cons(2)>" */
-    str = rb_sprintf("#<%s: ", cname);
-    rb_str_concat(str, rb_inspect(eobj));
-    rb_str_buf_cat2(str, ":");
-    rb_str_buf_cat2(str, rb_id2name(e->meth));
+    str = rb_sprintf("#<%"PRIsVALUE": %+"PRIsVALUE, rb_class_path(cname), eobj);
+    append_method(obj, str, e->meth, e->args);
 
-    if (e->args) {
-	long   argc = RARRAY_LEN(e->args);
-	VALUE *argv = RARRAY_PTR(e->args);
+    rb_str_buf_cat2(str, ">");
+
+    return str;
+}
 
-	rb_str_buf_cat2(str, "(");
+static int
+key_symbol_p(VALUE key, VALUE val, VALUE arg)
+{
+    if (SYMBOL_P(key)) return ST_CONTINUE;
+    *(int *)arg = FALSE;
+    return ST_STOP;
+}
 
-	while (argc--) {
-	    VALUE arg = *argv++;
+static int
+kwd_append(VALUE key, VALUE val, VALUE str)
+{
+    if (!SYMBOL_P(key)) rb_raise(rb_eRuntimeError, "non-symbol key inserted");
+    rb_str_catf(str, "% "PRIsVALUE": %"PRIsVALUE", ", key, val);
+    return ST_CONTINUE;
+}
 
-	    rb_str_concat(str, rb_inspect(arg));
-	    rb_str_buf_cat2(str, argc > 0 ? ", " : ")");
+static VALUE
+append_method(VALUE obj, VALUE str, ID default_method, VALUE default_args)
+{
+    VALUE method, eargs;
 
-	    if (OBJ_TAINTED(arg)) tainted = TRUE;
-	    if (OBJ_UNTRUSTED(arg)) untrusted = TRUE;
+    method = rb_attr_get(obj, id_method);
+    if (method != Qfalse) {
+	if (!NIL_P(method)) {
+	    Check_Type(method, T_SYMBOL);
+	    method = rb_sym2str(method);
 	}
+	else {
+	    method = rb_id2str(default_method);
+	}
+	rb_str_buf_cat2(str, ":");
+	rb_str_buf_append(str, method);
     }
 
-    rb_str_buf_cat2(str, ">");
+    eargs = rb_attr_get(obj, id_arguments);
+    if (NIL_P(eargs)) {
+	eargs = default_args;
+    }
+    if (eargs != Qfalse) {
+	long   argc = RARRAY_LEN(eargs);
+	const VALUE *argv = RARRAY_CONST_PTR(eargs); /* WB: no new reference */
+
+	if (argc > 0) {
+	    VALUE kwds = Qnil;
+
+	    rb_str_buf_cat2(str, "(");
+
+            if (RB_TYPE_P(argv[argc-1], T_HASH) && !RHASH_EMPTY_P(argv[argc-1])) {
+		int all_key = TRUE;
+		rb_hash_foreach(argv[argc-1], key_symbol_p, (VALUE)&all_key);
+		if (all_key) kwds = argv[--argc];
+	    }
+
+	    while (argc--) {
+		VALUE arg = *argv++;
+
+		rb_str_append(str, rb_inspect(arg));
+		rb_str_buf_cat2(str, ", ");
+	    }
+	    if (!NIL_P(kwds)) {
+		rb_hash_foreach(kwds, kwd_append, str);
+	    }
+	    rb_str_set_len(str, RSTRING_LEN(str)-2);
+	    rb_str_buf_cat2(str, ")");
+	}
+    }
 
-    if (tainted) OBJ_TAINT(str);
-    if (untrusted) OBJ_UNTRUST(str);
     return str;
 }
 
@@ -846,13 +1197,68 @@ enumerator_inspect(VALUE obj)
 }
 
 /*
+ * call-seq:
+ *   e.size          -> int, Float::INFINITY or nil
+ *
+ * Returns the size of the enumerator, or +nil+ if it can't be calculated lazily.
+ *
+ *   (1..100).to_a.permutation(4).size # => 94109400
+ *   loop.size # => Float::INFINITY
+ *   (1..100).drop_while.size # => nil
+ */
+
+static VALUE
+enumerator_size(VALUE obj)
+{
+    struct enumerator *e = enumerator_ptr(obj);
+    int argc = 0;
+    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_fn = entry->fn->size;
+	    if (!size_fn) {
+		return Qnil;
+	    }
+	    receiver = (*size_fn)(proc, receiver);
+	}
+	return receiver;
+    }
+
+    if (e->size_fn) {
+	return (*e->size_fn)(e->obj, e->args, obj);
+    }
+    if (e->args) {
+	argc = (int)RARRAY_LEN(e->args);
+	argv = RARRAY_CONST_PTR(e->args);
+    }
+    size = rb_check_funcall_kw(e->size, id_call, argc, argv, e->kw_splat);
+    if (size != Qundef) return size;
+    return e->size;
+}
+
+/*
  * Yielder
  */
 static void
 yielder_mark(void *p)
 {
     struct yielder *ptr = p;
-    rb_gc_mark(ptr->proc);
+    rb_gc_mark_movable(ptr->proc);
+}
+
+static void
+yielder_compact(void *p)
+{
+    struct yielder *ptr = p;
+    ptr->proc = rb_gc_location(ptr->proc);
 }
 
 #define yielder_free RUBY_TYPED_DEFAULT_FREE
@@ -860,7 +1266,7 @@ yielder_mark(void *p)
 static size_t
 yielder_memsize(const void *p)
 {
-    return p ? sizeof(struct yielder) : 0;
+    return sizeof(struct yielder);
 }
 
 static const rb_data_type_t yielder_data_type = {
@@ -869,7 +1275,9 @@ static const rb_data_type_t yielder_data_type = {
 	yielder_mark,
 	yielder_free,
 	yielder_memsize,
+        yielder_compact,
     },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static struct yielder *
@@ -928,20 +1336,44 @@ yielder_yield(VALUE obj, VALUE args)
 {
     struct yielder *ptr = yielder_ptr(obj);
 
-    return rb_proc_call(ptr->proc, args);
+    return rb_proc_call_kw(ptr->proc, args, RB_PASS_CALLED_KEYWORDS);
 }
 
 /* :nodoc: */
-static VALUE yielder_yield_push(VALUE obj, VALUE args)
+static VALUE
+yielder_yield_push(VALUE obj, VALUE arg)
 {
-    yielder_yield(obj, args);
+    struct yielder *ptr = yielder_ptr(obj);
+
+    rb_proc_call_with_block(ptr->proc, 1, &arg, Qnil);
+
     return obj;
 }
 
+/*
+ * Returns a Proc object that takes an argument and yields it.
+ *
+ * This method is implemented so that a Yielder object can be directly
+ * passed to another method as a block argument.
+ *
+ *   enum = Enumerator.new { |y|
+ *     Dir.glob("*.rb") { |file|
+ *       File.open(file) { |f| f.each_line(&y) }
+ *     }
+ *   }
+ */
 static VALUE
-yielder_yield_i(VALUE obj, VALUE memo, int argc, VALUE *argv)
+yielder_to_proc(VALUE obj)
 {
-    return rb_yield_values2(argc, argv);
+    VALUE method = rb_obj_method(obj, sym_yield);
+
+    return rb_funcall(method, idTo_proc, 0);
+}
+
+static VALUE
+yielder_yield_i(RB_BLOCK_CALL_FUNC_ARGLIST(obj, memo))
+{
+    return rb_yield_values_kw(argc, argv, RB_PASS_CALLED_KEYWORDS);
 }
 
 static VALUE
@@ -957,7 +1389,16 @@ static void
 generator_mark(void *p)
 {
     struct generator *ptr = p;
-    rb_gc_mark(ptr->proc);
+    rb_gc_mark_movable(ptr->proc);
+    rb_gc_mark_movable(ptr->obj);
+}
+
+static void
+generator_compact(void *p)
+{
+    struct generator *ptr = p;
+    ptr->proc = rb_gc_location(ptr->proc);
+    ptr->obj = rb_gc_location(ptr->obj);
 }
 
 #define generator_free RUBY_TYPED_DEFAULT_FREE
@@ -965,7 +1406,7 @@ generator_mark(void *p)
 static size_t
 generator_memsize(const void *p)
 {
-    return p ? sizeof(struct generator) : 0;
+    return sizeof(struct generator);
 }
 
 static const rb_data_type_t generator_data_type = {
@@ -974,7 +1415,9 @@ static const rb_data_type_t generator_data_type = {
 	generator_mark,
 	generator_free,
 	generator_memsize,
+        generator_compact,
     },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static struct generator *
@@ -1007,6 +1450,7 @@ generator_init(VALUE obj, VALUE proc)
 {
     struct generator *ptr;
 
+    rb_check_frozen(obj);
     TypedData_Get_Struct(obj, struct generator, &generator_data_type, ptr);
 
     if (!ptr) {
@@ -1028,13 +1472,14 @@ generator_initialize(int argc, VALUE *argv, VALUE obj)
 	rb_need_block();
 
 	proc = rb_block_proc();
-    } else {
+    }
+    else {
 	rb_scan_args(argc, argv, "1", &proc);
 
 	if (!rb_obj_is_proc(proc))
 	    rb_raise(rb_eTypeError,
-		     "wrong argument type %s (expected Proc)",
-		     rb_obj_classname(proc));
+		     "wrong argument type %"PRIsVALUE" (expected Proc)",
+		     rb_obj_class(proc));
 
 	if (rb_block_given_p()) {
 	    rb_warn("given block not used");
@@ -1050,6 +1495,8 @@ generator_init_copy(VALUE obj, VALUE orig)
 {
     struct generator *ptr0, *ptr1;
 
+    if (!OBJ_INIT_COPY(obj, orig)) return obj;
+
     ptr0 = generator_ptr(orig);
 
     TypedData_Get_Struct(obj, struct generator, &generator_data_type, ptr1);
@@ -1065,14 +1512,1268 @@ generator_init_copy(VALUE obj, VALUE orig)
 
 /* :nodoc: */
 static VALUE
-generator_each(VALUE obj)
+generator_each(int argc, VALUE *argv, VALUE obj)
 {
     struct generator *ptr = generator_ptr(obj);
-    VALUE yielder;
+    VALUE args = rb_ary_new2(argc + 1);
+
+    rb_ary_push(args, yielder_new());
+    if (argc > 0) {
+	rb_ary_cat(args, argv, argc);
+    }
+
+    return rb_proc_call_kw(ptr->proc, args, RB_PASS_CALLED_KEYWORDS);
+}
+
+/* Lazy Enumerator methods */
+static VALUE
+enum_size(VALUE self)
+{
+    VALUE r = rb_check_funcall(self, id_size, 0, 0);
+    return (r == Qundef) ? Qnil : r;
+}
+
+static VALUE
+lazyenum_size(VALUE self, VALUE args, VALUE eobj)
+{
+    return enum_size(self);
+}
+
+static VALUE
+lazy_size(VALUE self)
+{
+    return enum_size(rb_ivar_get(self, id_receiver));
+}
+
+static VALUE
+lazy_receiver_size(VALUE generator, VALUE args, VALUE lazy)
+{
+    return lazy_size(lazy);
+}
+
+static VALUE
+lazy_init_iterator(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+{
+    VALUE result;
+    if (argc == 1) {
+	VALUE args[2];
+	args[0] = m;
+	args[1] = val;
+	result = rb_yield_values2(2, args);
+    }
+    else {
+	VALUE args;
+	int len = rb_long2int((long)argc + 1);
+	VALUE *nargv = ALLOCV_N(VALUE, args, len);
+
+	nargv[0] = m;
+	if (argc > 0) {
+	    MEMCPY(nargv + 1, argv, VALUE, argc);
+	}
+	result = rb_yield_values2(len, nargv);
+	ALLOCV_END(args);
+    }
+    if (result == Qundef) rb_iter_break();
+    return Qnil;
+}
+
+static VALUE
+lazy_init_block_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+{
+    rb_block_call(m, id_each, argc-1, argv+1, lazy_init_iterator, val);
+    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)
+#define LAZY_MEMO_SET_PACKED(memo) ((memo)->memo_flags |= LAZY_MEMO_PACKED)
+#define LAZY_MEMO_RESET_PACKED(memo) ((memo)->memo_flags &= ~LAZY_MEMO_PACKED)
+
+static VALUE
+lazy_init_yielder(RB_BLOCK_CALL_FUNC_ARGLIST(_, m))
+{
+    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, idLTLT, 1, &(result->memo_value));
+    }
+    if (LAZY_MEMO_BREAK_P(result)) {
+	rb_iter_break();
+    }
+    return result->memo_value;
+}
+
+static VALUE
+lazy_init_block(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+{
+    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;
+}
+
+/*
+ * Document-class: Enumerator::Lazy
+ *
+ * Enumerator::Lazy is a special type of Enumerator, that allows constructing
+ * chains of operations without evaluating them immediately, and evaluating
+ * values on as-needed basis. In order to do so it redefines most of Enumerable
+ * methods so that they just construct another lazy enumerator.
+ *
+ * Enumerator::Lazy can be constructed from any Enumerable with the
+ * Enumerable#lazy method.
+ *
+ *    lazy = (1..Float::INFINITY).lazy.select(&:odd?).drop(10).take_while { |i| i < 30 }
+ *    # => #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: 1..Infinity>:select>:drop(10)>:take_while>
+ *
+ * The real enumeration is performed when any non-redefined Enumerable method
+ * is called, like Enumerable#first or Enumerable#to_a (the latter is aliased
+ * as #force for more semantic code):
+ *
+ *    lazy.first(2)
+ *    #=> [21, 23]
+ *
+ *    lazy.force
+ *    #=> [21, 23, 25, 27, 29]
+ *
+ * Note that most Enumerable methods that could be called with or without
+ * a block, on Enumerator::Lazy will always require a block:
+ *
+ *    [1, 2, 3].map       #=> #<Enumerator: [1, 2, 3]:map>
+ *    [1, 2, 3].lazy.map  # ArgumentError: tried to call lazy map without a block
+ *
+ * This class allows idiomatic calculations on long or infinite sequences, as well
+ * as chaining of calculations without constructing intermediate arrays.
+ *
+ * Example for working with a slowly calculated sequence:
+ *
+ *    require 'open-uri'
+ *
+ *    # This will fetch all URLs before selecting
+ *    # necessary data
+ *    URLS.map { |u| JSON.parse(open(u).read) }
+ *      .select { |data| data.key?('stats') }
+ *      .first(5)
+ *
+ *    # This will fetch URLs one-by-one, only till
+ *    # there is enough data to satisfy the condition
+ *    URLS.lazy.map { |u| JSON.parse(open(u).read) }
+ *      .select { |data| data.key?('stats') }
+ *      .first(5)
+ *
+ * Ending a chain with ".eager" generates a non-lazy enumerator, which
+ * is suitable for returning or passing to another method that expects
+ * a normal enumerator.
+ *
+ *    def active_items
+ *      groups
+ *        .lazy
+ *        .flat_map(&:items)
+ *        .reject(&:disabled)
+ *        .eager
+ *    end
+ *
+ *    # This works lazily; if a checked item is found, it stops
+ *    # iteration and does not look into remaining groups.
+ *    first_checked = active_items.find(&:checked)
+ *
+ *    # This returns an array of items like a normal enumerator does.
+ *    all_checked = active_items.select(&:checked)
+ *
+ */
+
+/*
+ * call-seq:
+ *   Lazy.new(obj, size=nil) { |yielder, *values| block }
+ *
+ * Creates a new Lazy enumerator. When the enumerator is actually enumerated
+ * (e.g. by calling #force), +obj+ will be enumerated and each value passed
+ * to the given block. The block can yield values back using +yielder+.
+ * For example, to create a "filter+map" enumerator:
+ *
+ *   def filter_map(sequence)
+ *     Lazy.new(sequence) do |yielder, *values|
+ *       result = yield *values
+ *       yielder << result if result
+ *     end
+ *   end
+ *
+ *   filter_map(1..Float::INFINITY) {|i| i*i if i.even?}.first(5)
+ *   #=> [4, 16, 36, 64, 100]
+ */
+static VALUE
+lazy_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE obj, size = Qnil;
+    VALUE generator;
+
+    rb_check_arity(argc, 1, 2);
+    if (!rb_block_given_p()) {
+	rb_raise(rb_eArgError, "tried to call lazy new without a block");
+    }
+    obj = argv[0];
+    if (argc > 1) {
+	size = argv[1];
+    }
+    generator = generator_allocate(rb_cGenerator);
+    rb_block_call(generator, id_initialize, 0, 0, lazy_init_block_i, obj);
+    enumerator_init(self, generator, sym_each, 0, 0, 0, size, 0);
+    rb_ivar_set(self, id_receiver, obj);
+
+    return self;
+}
+
+#if 0 /* for RDoc */
+/*
+ * call-seq:
+ *   lazy.to_a  -> array
+ *   lazy.force -> array
+ *
+ * Expands +lazy+ enumerator to an array.
+ * See Enumerable#to_a.
+ */
+static VALUE lazy_to_a(VALUE self)
+{
+}
+#endif
+
+static void
+lazy_set_args(VALUE lazy, VALUE args)
+{
+    ID id = rb_frame_this_func();
+    rb_ivar_set(lazy, id_method, ID2SYM(id));
+    if (NIL_P(args)) {
+	/* Qfalse indicates that the arguments are empty */
+	rb_ivar_set(lazy, id_arguments, Qfalse);
+    }
+    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 an Enumerator::Lazy, which redefines most Enumerable
+ * methods to postpone enumeration and enumerate values only on an
+ * as-needed basis.
+ *
+ * === Example
+ *
+ * The following program finds pythagorean triples:
+ *
+ *   def pythagorean_triples
+ *     (1..Float::INFINITY).lazy.flat_map {|z|
+ *       (1..z).flat_map {|x|
+ *         (x..z).select {|y|
+ *           x**2 + y**2 == z**2
+ *         }.map {|y|
+ *           [x, y, z]
+ *         }
+ *       }
+ *     }
+ *   end
+ *   # show first ten pythagorean triples
+ *   p pythagorean_triples.take(10).force # take is lazy, so force is needed
+ *   p pythagorean_triples.first(10)      # first is eager
+ *   # show pythagorean triples less than 100
+ *   p pythagorean_triples.take_while { |*, z| z < 100 }.force
+ */
+static VALUE
+enumerable_lazy(VALUE obj)
+{
+    VALUE result = lazy_to_enum_i(obj, sym_each, 0, 0, lazyenum_size, PASS_KW_SPLAT);
+    /* Qfalse indicates that the Enumerator::Lazy has no method name */
+    rb_ivar_set(result, id_method, Qfalse);
+    return result;
+}
+
+static VALUE
+lazy_to_enum_i(VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, int kw_splat)
+{
+    return enumerator_init(enumerator_allocate(rb_cLazy),
+                           obj, meth, argc, argv, size_fn, Qnil, kw_splat);
+}
+
+/*
+ * call-seq:
+ *   lzy.to_enum(method = :each, *args)                   -> lazy_enum
+ *   lzy.enum_for(method = :each, *args)                  -> lazy_enum
+ *   lzy.to_enum(method = :each, *args) {|*args| block }  -> lazy_enum
+ *   lzy.enum_for(method = :each, *args) {|*args| block } -> lazy_enum
+ *
+ * Similar to Object#to_enum, except it returns a lazy enumerator.
+ * This makes it easy to define Enumerable methods that will
+ * naturally remain lazy if called from a lazy enumerator.
+ *
+ * For example, continuing from the example in Object#to_enum:
+ *
+ *   # See Object#to_enum for the definition of repeat
+ *   r = 1..Float::INFINITY
+ *   r.repeat(2).first(5) # => [1, 1, 2, 2, 3]
+ *   r.repeat(2).class # => Enumerator
+ *   r.repeat(2).map{|n| n ** 2}.first(5) # => endless loop!
+ *   # works naturally on lazy enumerator:
+ *   r.lazy.repeat(2).class # => Enumerator::Lazy
+ *   r.lazy.repeat(2).map{|n| n ** 2}.first(5) # => [1, 1, 4, 4, 9]
+ */
+
+static VALUE
+lazy_to_enum(int argc, VALUE *argv, VALUE self)
+{
+    VALUE lazy, meth = sym_each, super_meth;
+
+    if (argc > 0) {
+	--argc;
+	meth = *argv++;
+    }
+    if (RTEST((super_meth = rb_hash_aref(lazy_use_super_method, meth)))) {
+        meth = super_meth;
+    }
+    lazy = lazy_to_enum_i(self, meth, argc, argv, 0, PASS_KW_SPLAT);
+    if (rb_block_given_p()) {
+	enumerator_ptr(lazy)->size = rb_block_proc();
+    }
+    return lazy;
+}
+
+static VALUE
+lazy_eager_size(VALUE self, VALUE args, VALUE eobj)
+{
+    return enum_size(self);
+}
+
+/*
+ * call-seq:
+ *   lzy.eager -> enum
+ *
+ * Returns a non-lazy Enumerator converted from the lazy enumerator.
+ */
+
+static VALUE
+lazy_eager(VALUE self)
+{
+    return enumerator_init(enumerator_allocate(rb_cEnumerator),
+                           self, sym_each, 0, 0, lazy_eager_size, Qnil, 0);
+}
+
+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)
+{
+    VALUE value = lazyenum_yield_values(proc_entry, result);
+    LAZY_MEMO_SET_VALUE(result, value);
+    LAZY_MEMO_RESET_PACKED(result);
+    return result;
+}
+
+static VALUE
+lazy_map_size(VALUE entry, VALUE receiver)
+{
+    return receiver;
+}
+
+static const lazyenum_funcs lazy_map_funcs = {
+    lazy_map_proc, lazy_map_size,
+};
+
+/*
+ *  call-seq:
+ *     lazy.collect { |obj| block } -> lazy_enumerator
+ *     lazy.map     { |obj| block } -> lazy_enumerator
+ *
+ *  Like Enumerable#map, but chains operation to be lazy-evaluated.
+ *
+ *     (1..Float::INFINITY).lazy.map {|i| i**2 }
+ *     #=> #<Enumerator::Lazy: #<Enumerator::Lazy: 1..Infinity>:map>
+ *     (1..Float::INFINITY).lazy.map {|i| i**2 }.first(3)
+ *     #=> [1, 4, 9]
+ */
+
+static VALUE
+lazy_map(VALUE obj)
+{
+    if (!rb_block_given_p()) {
+	rb_raise(rb_eArgError, "tried to call lazy map without a block");
+    }
+
+    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_map_funcs);
+}
+
+static VALUE
+lazy_flat_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, yielder))
+{
+    VALUE arg = rb_enum_values_pack(argc, argv);
+
+    return rb_funcallv(yielder, idLTLT, 1, &arg);
+}
+
+static VALUE
+lazy_flat_map_each(VALUE obj, VALUE yielder)
+{
+    rb_block_call(obj, id_each, 0, 0, lazy_flat_map_i, yielder);
+    return Qnil;
+}
+
+static VALUE
+lazy_flat_map_to_ary(VALUE obj, VALUE yielder)
+{
+    VALUE ary = rb_check_array_type(obj);
+    if (NIL_P(ary)) {
+	rb_funcall(yielder, idLTLT, 1, obj);
+    }
+    else {
+	long i;
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    rb_funcall(yielder, idLTLT, 1, RARRAY_AREF(ary, i));
+	}
+    }
+    return Qnil;
+}
+
+static VALUE
+lazy_flat_map_proc(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+{
+    VALUE result = rb_yield_values2(argc - 1, &argv[1]);
+    if (RB_TYPE_P(result, T_ARRAY)) {
+	long i;
+	for (i = 0; i < RARRAY_LEN(result); i++) {
+	    rb_funcall(argv[0], idLTLT, 1, RARRAY_AREF(result, i));
+	}
+    }
+    else {
+	if (rb_respond_to(result, id_force) && rb_respond_to(result, id_each)) {
+	    lazy_flat_map_each(result, argv[0]);
+	}
+	else {
+	    lazy_flat_map_to_ary(result, argv[0]);
+	}
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     lazy.collect_concat { |obj| block } -> a_lazy_enumerator
+ *     lazy.flat_map       { |obj| block } -> a_lazy_enumerator
+ *
+ *  Returns a new lazy enumerator with the concatenated results of running
+ *  +block+ once for every element in the lazy enumerator.
+ *
+ *    ["foo", "bar"].lazy.flat_map {|i| i.each_char.lazy}.force
+ *    #=> ["f", "o", "o", "b", "a", "r"]
+ *
+ *  A value +x+ returned by +block+ is decomposed if either of
+ *  the following conditions is true:
+ *
+ *  * +x+ responds to both each and force, which means that
+ *    +x+ is a lazy enumerator.
+ *  * +x+ is an array or responds to to_ary.
+ *
+ *  Otherwise, +x+ is contained as-is in the return value.
+ *
+ *    [{a:1}, {b:2}].lazy.flat_map {|i| i}.force
+ *    #=> [{:a=>1}, {:b=>2}]
+ */
+static VALUE
+lazy_flat_map(VALUE obj)
+{
+    if (!rb_block_given_p()) {
+	rb_raise(rb_eArgError, "tried to call lazy flat_map without a block");
+    }
+
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_flat_map_proc, 0),
+			   Qnil, 0);
+}
+
+static struct MEMO *
+lazy_select_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    VALUE chain = lazyenum_yield(proc_entry, result);
+    if (!RTEST(chain)) return 0;
+    return result;
+}
+
+static const lazyenum_funcs lazy_select_funcs = {
+    lazy_select_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.find_all { |obj| block } -> lazy_enumerator
+ *     lazy.select   { |obj| block } -> lazy_enumerator
+ *     lazy.filter   { |obj| block } -> lazy_enumerator
+ *
+ *  Like Enumerable#select, but chains operation to be lazy-evaluated.
+ */
+static VALUE
+lazy_select(VALUE obj)
+{
+    if (!rb_block_given_p()) {
+	rb_raise(rb_eArgError, "tried to call lazy select without a block");
+    }
+
+    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_select_funcs);
+}
+
+static struct MEMO *
+lazy_filter_map_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    VALUE value = lazyenum_yield_values(proc_entry, result);
+    if (!RTEST(value)) return 0;
+    LAZY_MEMO_SET_VALUE(result, value);
+    LAZY_MEMO_RESET_PACKED(result);
+    return result;
+}
+
+static const lazyenum_funcs lazy_filter_map_funcs = {
+    lazy_filter_map_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.filter_map { |obj| block } -> lazy_enumerator
+ *
+ *  Like Enumerable#filter_map, but chains operation to be lazy-evaluated.
+ *
+ *    (1..).lazy.filter_map { |i| i * 2 if i.even? }.first(5)
+ *    #=> [4, 8, 12, 16, 20]
+ */
+
+static VALUE
+lazy_filter_map(VALUE obj)
+{
+    if (!rb_block_given_p()) {
+        rb_raise(rb_eArgError, "tried to call lazy filter_map without a block");
+    }
+
+    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_filter_map_funcs);
+}
+
+static struct MEMO *
+lazy_reject_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    VALUE chain = lazyenum_yield(proc_entry, result);
+    if (RTEST(chain)) return 0;
+    return result;
+}
+
+static const lazyenum_funcs lazy_reject_funcs = {
+    lazy_reject_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.reject { |obj| block } -> lazy_enumerator
+ *
+ *  Like Enumerable#reject, but chains operation to be lazy-evaluated.
+ */
+
+static VALUE
+lazy_reject(VALUE obj)
+{
+    if (!rb_block_given_p()) {
+	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);
+    LAZY_MEMO_RESET_PACKED(result);
+
+    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,
+};
+
+/*
+ *  call-seq:
+ *     lazy.grep(pattern)                  -> lazy_enumerator
+ *     lazy.grep(pattern) { |obj| block }  -> lazy_enumerator
+ *
+ *  Like Enumerable#grep, but chains operation to be lazy-evaluated.
+ */
+
+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);
+}
+
+static struct MEMO *
+lazy_grep_v_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_v_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);
+    LAZY_MEMO_RESET_PACKED(result);
+
+    return result;
+}
+
+static const lazyenum_funcs lazy_grep_v_iter_funcs = {
+    lazy_grep_v_iter_proc, 0,
+};
+
+static const lazyenum_funcs lazy_grep_v_funcs = {
+    lazy_grep_v_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.grep_v(pattern)                  -> lazy_enumerator
+ *     lazy.grep_v(pattern) { |obj| block }  -> lazy_enumerator
+ *
+ *  Like Enumerable#grep_v, but chains operation to be lazy-evaluated.
+ */
+
+static VALUE
+lazy_grep_v(VALUE obj, VALUE pattern)
+{
+    const lazyenum_funcs *const funcs = rb_block_given_p() ?
+        &lazy_grep_v_iter_funcs : &lazy_grep_v_funcs;
+    return lazy_add_method(obj, 0, 0, pattern, rb_ary_new3(1, pattern), funcs);
+}
+
+static VALUE
+call_next(VALUE obj)
+{
+    return rb_funcall(obj, id_next, 0);
+}
+
+static VALUE
+next_stopped(VALUE obj, VALUE _)
+{
+    return Qnil;
+}
+
+static VALUE
+lazy_zip_arrays_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, arrays))
+{
+    VALUE yielder, ary, memo;
+    long i, count;
+
+    yielder = argv[0];
+    memo = rb_attr_get(yielder, id_memo);
+    count = NIL_P(memo) ? 0 : NUM2LONG(memo);
+
+    ary = rb_ary_new2(RARRAY_LEN(arrays) + 1);
+    rb_ary_push(ary, argv[1]);
+    for (i = 0; i < RARRAY_LEN(arrays); i++) {
+	rb_ary_push(ary, rb_ary_entry(RARRAY_AREF(arrays, i), count));
+    }
+    rb_funcall(yielder, idLTLT, 1, ary);
+    rb_ivar_set(yielder, id_memo, LONG2NUM(++count));
+    return Qnil;
+}
+
+static VALUE
+lazy_zip_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, zip_args))
+{
+    VALUE yielder, ary, arg, v;
+    long i;
+
+    yielder = argv[0];
+    arg = rb_attr_get(yielder, id_memo);
+    if (NIL_P(arg)) {
+	arg = rb_ary_new2(RARRAY_LEN(zip_args));
+	for (i = 0; i < RARRAY_LEN(zip_args); i++) {
+	    rb_ary_push(arg, rb_funcall(RARRAY_AREF(zip_args, i), id_to_enum, 0));
+	}
+	rb_ivar_set(yielder, id_memo, arg);
+    }
+
+    ary = rb_ary_new2(RARRAY_LEN(arg) + 1);
+    v = Qnil;
+    if (--argc > 0) {
+	++argv;
+	v = argc > 1 ? rb_ary_new_from_values(argc, argv) : *argv;
+    }
+    rb_ary_push(ary, v);
+    for (i = 0; i < RARRAY_LEN(arg); i++) {
+	v = rb_rescue2(call_next, RARRAY_AREF(arg, i), next_stopped, 0,
+		       rb_eStopIteration, (VALUE)0);
+	rb_ary_push(ary, v);
+    }
+    rb_funcall(yielder, idLTLT, 1, ary);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     lazy.zip(arg, ...)                  -> lazy_enumerator
+ *     lazy.zip(arg, ...) { |arr| block }  -> nil
+ *
+ *  Like Enumerable#zip, but chains operation to be lazy-evaluated.
+ *  However, if a block is given to zip, values are enumerated immediately.
+ */
+static VALUE
+lazy_zip(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE ary, v;
+    long i;
+    rb_block_call_func *func = lazy_zip_arrays_func;
+
+    if (rb_block_given_p()) {
+	return rb_call_super(argc, argv);
+    }
+
+    ary = rb_ary_new2(argc);
+    for (i = 0; i < argc; i++) {
+	v = rb_check_array_type(argv[i]);
+	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]));
+		}
+	    }
+	    ary = rb_ary_new4(argc, argv);
+	    func = lazy_zip_func;
+	    break;
+	}
+	rb_ary_push(ary, v);
+    }
+
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 func, ary),
+			   ary, lazy_receiver_size);
+}
+
+static struct MEMO *
+lazy_take_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    long remain;
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE memo = rb_ary_entry(memos, memo_index);
+
+    if (NIL_P(memo)) {
+	memo = entry->memo;
+    }
+
+    remain = NUM2LONG(memo);
+    if (remain == 0) {
+	LAZY_MEMO_SET_BREAK(result);
+    }
+    else {
+	if (--remain == 0) LAZY_MEMO_SET_BREAK(result);
+	rb_ary_store(memos, memo_index, LONG2NUM(remain));
+    }
+    return result;
+}
+
+static VALUE
+lazy_take_size(VALUE entry, VALUE receiver)
+{
+    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(entry, 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,
+};
+
+/*
+ *  call-seq:
+ *     lazy.take(n)               -> lazy_enumerator
+ *
+ *  Like Enumerable#take, but chains operation to be lazy-evaluated.
+ */
+
+static VALUE
+lazy_take(VALUE obj, VALUE n)
+{
+    long len = NUM2LONG(n);
+    int argc = 0;
+    VALUE argv[2];
+
+    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;
+    }
+
+    return lazy_add_method(obj, argc, argv, n, rb_ary_new3(1, n), &lazy_take_funcs);
+}
+
+static struct MEMO *
+lazy_take_while_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    VALUE take = lazyenum_yield_values(proc_entry, result);
+    if (!RTEST(take)) {
+	LAZY_MEMO_SET_BREAK(result);
+	return 0;
+    }
+    return result;
+}
+
+static const lazyenum_funcs lazy_take_while_funcs = {
+    lazy_take_while_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.take_while { |obj| block } -> lazy_enumerator
+ *
+ *  Like Enumerable#take_while, but chains operation to be lazy-evaluated.
+ */
+
+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);
+}
+
+static VALUE
+lazy_drop_size(VALUE proc_entry, VALUE receiver)
+{
+    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(proc_entry, id_arguments), 0));
+    if (NIL_P(receiver))
+	return receiver;
+    if (FIXNUM_P(receiver)) {
+	len = FIX2LONG(receiver) - len;
+	return LONG2FIX(len < 0 ? 0 : len);
+    }
+    return rb_funcall(receiver, '-', 1, LONG2NUM(len));
+}
+
+static struct MEMO *
+lazy_drop_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    long remain;
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE memo = rb_ary_entry(memos, memo_index);
+
+    if (NIL_P(memo)) {
+	memo = entry->memo;
+    }
+    remain = NUM2LONG(memo);
+    if (remain > 0) {
+	--remain;
+	rb_ary_store(memos, memo_index, LONG2NUM(remain));
+	return 0;
+    }
+
+    return result;
+}
+
+static const lazyenum_funcs lazy_drop_funcs = {
+    lazy_drop_proc, lazy_drop_size,
+};
+
+/*
+ *  call-seq:
+ *     lazy.drop(n)               -> lazy_enumerator
+ *
+ *  Like Enumerable#drop, but chains operation to be lazy-evaluated.
+ */
+
+static VALUE
+lazy_drop(VALUE obj, VALUE n)
+{
+    long len = NUM2LONG(n);
+    VALUE argv[2];
+    argv[0] = sym_each;
+    argv[1] = n;
 
-    yielder = yielder_new();
+    if (len < 0) {
+	rb_raise(rb_eArgError, "attempt to drop negative size");
+    }
 
-    return rb_proc_call(ptr->proc, rb_ary_new3(1, yielder));
+    return lazy_add_method(obj, 2, argv, n, rb_ary_new3(1, n), &lazy_drop_funcs);
+}
+
+static struct MEMO *
+lazy_drop_while_proc(VALUE proc_entry, struct MEMO* result, VALUE memos, long memo_index)
+{
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE memo = rb_ary_entry(memos, memo_index);
+
+    if (NIL_P(memo)) {
+	memo = entry->memo;
+    }
+
+    if (!RTEST(memo)) {
+	VALUE drop = lazyenum_yield_values(proc_entry, result);
+	if (RTEST(drop)) return 0;
+	rb_ary_store(memos, memo_index, Qtrue);
+    }
+    return result;
+}
+
+static const lazyenum_funcs lazy_drop_while_funcs = {
+    lazy_drop_while_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.drop_while { |obj| block }  -> lazy_enumerator
+ *
+ *  Like Enumerable#drop_while, but chains operation to be lazy-evaluated.
+ */
+
+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 int
+lazy_uniq_check(VALUE chain, VALUE memos, long memo_index)
+{
+    VALUE hash = rb_ary_entry(memos, memo_index);
+
+    if (NIL_P(hash)) {
+        hash = rb_obj_hide(rb_hash_new());
+        rb_ary_store(memos, memo_index, hash);
+    }
+
+    return rb_hash_add_new_element(hash, chain, Qfalse);
+}
+
+static struct MEMO *
+lazy_uniq_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    if (lazy_uniq_check(result->memo_value, memos, memo_index)) return 0;
+    return result;
+}
+
+static struct MEMO *
+lazy_uniq_iter_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    VALUE chain = lazyenum_yield(proc_entry, result);
+
+    if (lazy_uniq_check(chain, memos, memo_index)) return 0;
+    return result;
+}
+
+static const lazyenum_funcs lazy_uniq_iter_funcs = {
+    lazy_uniq_iter_proc, 0,
+};
+
+static const lazyenum_funcs lazy_uniq_funcs = {
+    lazy_uniq_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.uniq                  -> lazy_enumerator
+ *     lazy.uniq { |item| block } -> lazy_enumerator
+ *
+ *  Like Enumerable#uniq, but chains operation to be lazy-evaluated.
+ */
+
+static VALUE
+lazy_uniq(VALUE obj)
+{
+    const lazyenum_funcs *const funcs =
+        rb_block_given_p() ? &lazy_uniq_iter_funcs : &lazy_uniq_funcs;
+    return lazy_add_method(obj, 0, 0, Qnil, Qnil, funcs);
+}
+
+static struct MEMO *
+lazy_with_index_proc(VALUE proc_entry, struct MEMO* result, VALUE memos, long memo_index)
+{
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE memo = rb_ary_entry(memos, memo_index);
+    VALUE argv[2];
+
+    if (NIL_P(memo)) {
+        memo = entry->memo;
+    }
+
+    argv[0] = result->memo_value;
+    argv[1] = memo;
+    if (entry->proc) {
+        rb_proc_call_with_block(entry->proc, 2, argv, Qnil);
+        LAZY_MEMO_RESET_PACKED(result);
+    } else {
+        LAZY_MEMO_SET_VALUE(result, rb_ary_new_from_values(2, argv));
+        LAZY_MEMO_SET_PACKED(result);
+    }
+    rb_ary_store(memos, memo_index, LONG2NUM(NUM2LONG(memo) + 1));
+    return result;
+}
+
+static const lazyenum_funcs lazy_with_index_funcs = {
+    lazy_with_index_proc, 0,
+};
+
+/*
+ * call-seq:
+ *   lazy.with_index(offset = 0) {|(*args), idx| block }
+ *   lazy.with_index(offset = 0)
+ *
+ * If a block is given, iterates the given block for each element
+ * with an index, which starts from +offset+, and returns a
+ * lazy enumerator that yields the same values (without the index).
+ *
+ * If a block is not given, returns a new lazy enumerator that
+ * includes the index, starting from +offset+.
+ *
+ * +offset+:: the starting index to use
+ *
+ * See Enumerator#with_index.
+ */
+static VALUE
+lazy_with_index(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE memo;
+
+    rb_scan_args(argc, argv, "01", &memo);
+    if (NIL_P(memo))
+        memo = LONG2NUM(0);
+
+    return lazy_add_method(obj, 0, 0, memo, rb_ary_new_from_values(1, &memo), &lazy_with_index_funcs);
+}
+
+#if 0 /* for RDoc */
+
+/*
+ *  call-seq:
+ *     lazy.chunk { |elt| ... }                       -> lazy_enumerator
+ *
+ *  Like Enumerable#chunk, but chains operation to be lazy-evaluated.
+ */
+static VALUE lazy_chunk(VALUE self)
+{
+}
+
+/*
+ *  call-seq:
+ *     lazy.chunk_while {|elt_before, elt_after| bool } -> lazy_enumerator
+ *
+ *  Like Enumerable#chunk_while, but chains operation to be lazy-evaluated.
+ */
+static VALUE lazy_chunk_while(VALUE self)
+{
+}
+
+/*
+ *  call-seq:
+ *     lazy.slice_after(pattern)       -> lazy_enumerator
+ *     lazy.slice_after { |elt| bool } -> lazy_enumerator
+ *
+ *  Like Enumerable#slice_after, but chains operation to be lazy-evaluated.
+ */
+static VALUE lazy_slice_after(VALUE self)
+{
+}
+
+/*
+ *  call-seq:
+ *     lazy.slice_before(pattern)       -> lazy_enumerator
+ *     lazy.slice_before { |elt| bool } -> lazy_enumerator
+ *
+ *  Like Enumerable#slice_before, but chains operation to be lazy-evaluated.
+ */
+static VALUE lazy_slice_before(VALUE self)
+{
+}
+
+/*
+ *  call-seq:
+ *     lazy.slice_when {|elt_before, elt_after| bool } -> lazy_enumerator
+ *
+ *  Like Enumerable#slice_when, but chains operation to be lazy-evaluated.
+ */
+static VALUE lazy_slice_when(VALUE self)
+{
+}
+# endif
+
+static VALUE
+lazy_super(int argc, VALUE *argv, VALUE lazy)
+{
+    return enumerable_lazy(rb_call_super(argc, argv));
+}
+
+/*
+ *  call-seq:
+ *     enum.lazy -> lazy_enumerator
+ *
+ *  Returns self.
+ */
+
+static VALUE
+lazy_lazy(VALUE obj)
+{
+    return obj;
 }
 
 /*
@@ -1121,15 +2822,1085 @@ generator_each(VALUE obj)
  *   end
  *
  */
+
 static VALUE
 stop_result(VALUE self)
 {
-    return rb_attr_get(self, rb_intern("result"));
+    return rb_attr_get(self, id_result);
+}
+
+/*
+ * Producer
+ */
+
+static void
+producer_mark(void *p)
+{
+    struct producer *ptr = p;
+    rb_gc_mark_movable(ptr->init);
+    rb_gc_mark_movable(ptr->proc);
+}
+
+static void
+producer_compact(void *p)
+{
+    struct producer *ptr = p;
+    ptr->init = rb_gc_location(ptr->init);
+    ptr->proc = rb_gc_location(ptr->proc);
+}
+
+#define producer_free RUBY_TYPED_DEFAULT_FREE
+
+static size_t
+producer_memsize(const void *p)
+{
+    return sizeof(struct producer);
+}
+
+static const rb_data_type_t producer_data_type = {
+    "producer",
+    {
+        producer_mark,
+        producer_free,
+        producer_memsize,
+        producer_compact,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static struct producer *
+producer_ptr(VALUE obj)
+{
+    struct producer *ptr;
+
+    TypedData_Get_Struct(obj, struct producer, &producer_data_type, ptr);
+    if (!ptr || ptr->proc == Qundef) {
+        rb_raise(rb_eArgError, "uninitialized producer");
+    }
+    return ptr;
+}
+
+/* :nodoc: */
+static VALUE
+producer_allocate(VALUE klass)
+{
+    struct producer *ptr;
+    VALUE obj;
+
+    obj = TypedData_Make_Struct(klass, struct producer, &producer_data_type, ptr);
+    ptr->init = Qundef;
+    ptr->proc = Qundef;
+
+    return obj;
+}
+
+static VALUE
+producer_init(VALUE obj, VALUE init, VALUE proc)
+{
+    struct producer *ptr;
+
+    TypedData_Get_Struct(obj, struct producer, &producer_data_type, ptr);
+
+    if (!ptr) {
+        rb_raise(rb_eArgError, "unallocated producer");
+    }
+
+    ptr->init = init;
+    ptr->proc = proc;
+
+    return obj;
+}
+
+static VALUE
+producer_each_stop(VALUE dummy, VALUE exc)
+{
+    return rb_attr_get(exc, id_result);
+}
+
+static VALUE
+producer_each_i(VALUE obj)
+{
+    struct producer *ptr;
+    VALUE init, proc, curr;
+
+    ptr = producer_ptr(obj);
+    init = ptr->init;
+    proc = ptr->proc;
+
+    if (init == Qundef) {
+        curr = Qnil;
+    } else {
+        rb_yield(init);
+        curr = init;
+    }
+
+    for (;;) {
+        curr = rb_funcall(proc, id_call, 1, curr);
+        rb_yield(curr);
+    }
+
+    return Qnil;
+}
+
+/* :nodoc: */
+static VALUE
+producer_each(VALUE obj)
+{
+    rb_need_block();
+
+    return rb_rescue2(producer_each_i, obj, producer_each_stop, (VALUE)0, rb_eStopIteration, (VALUE)0);
+}
+
+static VALUE
+producer_size(VALUE obj, VALUE args, VALUE eobj)
+{
+    return DBL2NUM(HUGE_VAL);
+}
+
+/*
+ * call-seq:
+ *    Enumerator.produce(initial = nil) { |prev| block } -> enumerator
+ *
+ * Creates an infinite enumerator from any block, just called over and
+ * over.  The result of the previous iteration is passed to the next one.
+ * If +initial+ is provided, it is passed to the first iteration, and
+ * becomes the first element of the enumerator; if it is not provided,
+ * the first iteration receives +nil+, and its result becomes the first
+ * element of the iterator.
+ *
+ * Raising StopIteration from the block stops an iteration.
+ *
+ *   Enumerator.produce(1, &:succ)   # => enumerator of 1, 2, 3, 4, ....
+ *
+ *   Enumerator.produce { rand(10) } # => infinite random number sequence
+ *
+ *   ancestors = Enumerator.produce(node) { |prev| node = prev.parent or raise StopIteration }
+ *   enclosing_section = ancestors.find { |n| n.type == :section }
+ *
+ * Using ::produce together with Enumerable methods like Enumerable#detect,
+ * Enumerable#slice, Enumerable#take_while can provide Enumerator-based alternatives
+ * for +while+ and +until+ cycles:
+ *
+ *   # Find next Tuesday
+ *   require "date"
+ *   Enumerator.produce(Date.today, &:succ).detect(&:tuesday?)
+ *
+ *   # Simple lexer:
+ *   require "strscan"
+ *   scanner = StringScanner.new("7+38/6")
+ *   PATTERN = %r{\d+|[-/+*]}
+ *   Enumerator.produce { scanner.scan(PATTERN) }.slice_after { scanner.eos? }.first
+ *   # => ["7", "+", "38", "/", "6"]
+ */
+static VALUE
+enumerator_s_produce(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE init, producer;
+
+    if (!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+
+    if (rb_scan_args(argc, argv, "01", &init) == 0) {
+        init = Qundef;
+    }
+
+    producer = producer_init(producer_allocate(rb_cEnumProducer), init, rb_block_proc());
+
+    return rb_enumeratorize_with_size_kw(producer, sym_each, 0, 0, producer_size, RB_NO_KEYWORDS);
+}
+
+/*
+ * Document-class: Enumerator::Chain
+ *
+ * Enumerator::Chain is a subclass of Enumerator, which represents a
+ * chain of enumerables that works as a single enumerator.
+ *
+ * This type of objects can be created by Enumerable#chain and
+ * Enumerator#+.
+ */
+
+static void
+enum_chain_mark(void *p)
+{
+    struct enum_chain *ptr = p;
+    rb_gc_mark_movable(ptr->enums);
+}
+
+static void
+enum_chain_compact(void *p)
+{
+    struct enum_chain *ptr = p;
+    ptr->enums = rb_gc_location(ptr->enums);
+}
+
+#define enum_chain_free RUBY_TYPED_DEFAULT_FREE
+
+static size_t
+enum_chain_memsize(const void *p)
+{
+    return sizeof(struct enum_chain);
+}
+
+static const rb_data_type_t enum_chain_data_type = {
+    "chain",
+    {
+        enum_chain_mark,
+        enum_chain_free,
+        enum_chain_memsize,
+        enum_chain_compact,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static struct enum_chain *
+enum_chain_ptr(VALUE obj)
+{
+    struct enum_chain *ptr;
+
+    TypedData_Get_Struct(obj, struct enum_chain, &enum_chain_data_type, ptr);
+    if (!ptr || ptr->enums == Qundef) {
+        rb_raise(rb_eArgError, "uninitialized chain");
+    }
+    return ptr;
+}
+
+/* :nodoc: */
+static VALUE
+enum_chain_allocate(VALUE klass)
+{
+    struct enum_chain *ptr;
+    VALUE obj;
+
+    obj = TypedData_Make_Struct(klass, struct enum_chain, &enum_chain_data_type, ptr);
+    ptr->enums = Qundef;
+    ptr->pos = -1;
+
+    return obj;
+}
+
+/*
+ * call-seq:
+ *   Enumerator::Chain.new(*enums) -> enum
+ *
+ * Generates a new enumerator object that iterates over the elements
+ * of given enumerable objects in sequence.
+ *
+ *   e = Enumerator::Chain.new(1..3, [4, 5])
+ *   e.to_a #=> [1, 2, 3, 4, 5]
+ *   e.size #=> 5
+ */
+static VALUE
+enum_chain_initialize(VALUE obj, VALUE enums)
+{
+    struct enum_chain *ptr;
+
+    rb_check_frozen(obj);
+    TypedData_Get_Struct(obj, struct enum_chain, &enum_chain_data_type, ptr);
+
+    if (!ptr) rb_raise(rb_eArgError, "unallocated chain");
+
+    ptr->enums = rb_obj_freeze(enums);
+    ptr->pos = -1;
+
+    return obj;
+}
+
+/* :nodoc: */
+static VALUE
+enum_chain_init_copy(VALUE obj, VALUE orig)
+{
+    struct enum_chain *ptr0, *ptr1;
+
+    if (!OBJ_INIT_COPY(obj, orig)) return obj;
+    ptr0 = enum_chain_ptr(orig);
+
+    TypedData_Get_Struct(obj, struct enum_chain, &enum_chain_data_type, ptr1);
+
+    if (!ptr1) rb_raise(rb_eArgError, "unallocated chain");
+
+    ptr1->enums = ptr0->enums;
+    ptr1->pos = ptr0->pos;
+
+    return obj;
+}
+
+static VALUE
+enum_chain_total_size(VALUE enums)
+{
+    VALUE total = INT2FIX(0);
+    long i;
+
+    for (i = 0; i < RARRAY_LEN(enums); i++) {
+        VALUE size = enum_size(RARRAY_AREF(enums, i));
+
+        if (NIL_P(size) || (RB_TYPE_P(size, T_FLOAT) && isinf(NUM2DBL(size)))) {
+            return size;
+        }
+        if (!RB_INTEGER_TYPE_P(size)) {
+            return Qnil;
+        }
+
+        total = rb_funcall(total, '+', 1, size);
+    }
+
+    return total;
+}
+
+/*
+ * call-seq:
+ *   obj.size -> int, Float::INFINITY or nil
+ *
+ * Returns the total size of the enumerator chain calculated by
+ * summing up the size of each enumerable in the chain.  If any of the
+ * enumerables reports its size as nil or Float::INFINITY, that value
+ * is returned as the total size.
+ */
+static VALUE
+enum_chain_size(VALUE obj)
+{
+    return enum_chain_total_size(enum_chain_ptr(obj)->enums);
+}
+
+static VALUE
+enum_chain_enum_size(VALUE obj, VALUE args, VALUE eobj)
+{
+    return enum_chain_size(obj);
+}
+
+static VALUE
+enum_chain_enum_no_size(VALUE obj, VALUE args, VALUE eobj)
+{
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   obj.each(*args) { |...| ... } -> obj
+ *   obj.each(*args) -> enumerator
+ *
+ * Iterates over the elements of the first enumerable by calling the
+ * "each" method on it with the given arguments, then proceeds to the
+ * following enumerables in sequence until all of the enumerables are
+ * exhausted.
+ *
+ * If no block is given, returns an enumerator.
+ */
+static VALUE
+enum_chain_each(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE enums, block;
+    struct enum_chain *objptr;
+    long i;
+
+    RETURN_SIZED_ENUMERATOR(obj, argc, argv, argc > 0 ? enum_chain_enum_no_size : enum_chain_enum_size);
+
+    objptr = enum_chain_ptr(obj);
+    enums = objptr->enums;
+    block = rb_block_proc();
+
+    for (i = 0; i < RARRAY_LEN(enums); i++) {
+        objptr->pos = i;
+        rb_funcall_with_block(RARRAY_AREF(enums, i), id_each, argc, argv, block);
+    }
+
+    return obj;
+}
+
+/*
+ * call-seq:
+ *   obj.rewind -> obj
+ *
+ * Rewinds the enumerator chain by calling the "rewind" method on each
+ * enumerable in reverse order.  Each call is performed only if the
+ * enumerable responds to the method.
+ */
+static VALUE
+enum_chain_rewind(VALUE obj)
+{
+    struct enum_chain *objptr = enum_chain_ptr(obj);
+    VALUE enums = objptr->enums;
+    long i;
+
+    for (i = objptr->pos; 0 <= i && i < RARRAY_LEN(enums); objptr->pos = --i) {
+        rb_check_funcall(RARRAY_AREF(enums, i), id_rewind, 0, 0);
+    }
+
+    return obj;
+}
+
+static VALUE
+inspect_enum_chain(VALUE obj, VALUE dummy, int recur)
+{
+    VALUE klass = rb_obj_class(obj);
+    struct enum_chain *ptr;
+
+    TypedData_Get_Struct(obj, struct enum_chain, &enum_chain_data_type, ptr);
+
+    if (!ptr || ptr->enums == Qundef) {
+        return rb_sprintf("#<%"PRIsVALUE": uninitialized>", rb_class_path(klass));
+    }
+
+    if (recur) {
+        return rb_sprintf("#<%"PRIsVALUE": ...>", rb_class_path(klass));
+    }
+
+    return rb_sprintf("#<%"PRIsVALUE": %+"PRIsVALUE">", rb_class_path(klass), ptr->enums);
+}
+
+/*
+ * call-seq:
+ *   obj.inspect -> string
+ *
+ * Returns a printable version of the enumerator chain.
+ */
+static VALUE
+enum_chain_inspect(VALUE obj)
+{
+    return rb_exec_recursive(inspect_enum_chain, obj, 0);
+}
+
+/*
+ * call-seq:
+ *   e.chain(*enums) -> enumerator
+ *
+ * Returns an enumerator object generated from this enumerator and
+ * given enumerables.
+ *
+ *   e = (1..3).chain([4, 5])
+ *   e.to_a #=> [1, 2, 3, 4, 5]
+ */
+static VALUE
+enum_chain(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE enums = rb_ary_new_from_values(1, &obj);
+    rb_ary_cat(enums, argv, argc);
+
+    return enum_chain_initialize(enum_chain_allocate(rb_cEnumChain), enums);
+}
+
+/*
+ * call-seq:
+ *   e + enum -> enumerator
+ *
+ * Returns an enumerator object generated from this enumerator and a
+ * given enumerable.
+ *
+ *   e = (1..3).each + [4, 5]
+ *   e.to_a #=> [1, 2, 3, 4, 5]
+ */
+static VALUE
+enumerator_plus(VALUE obj, VALUE eobj)
+{
+    VALUE enums = rb_ary_new_from_args(2, obj, eobj);
+
+    return enum_chain_initialize(enum_chain_allocate(rb_cEnumChain), enums);
+}
+
+/*
+ * Document-class: Enumerator::ArithmeticSequence
+ *
+ * Enumerator::ArithmeticSequence is a subclass of Enumerator,
+ * that is a representation of sequences of numbers with common difference.
+ * Instances of this class can be generated by the Range#step and Numeric#step
+ * methods.
+ */
+
+VALUE
+rb_arith_seq_new(VALUE obj, VALUE meth, int argc, VALUE const *argv,
+                 rb_enumerator_size_func *size_fn,
+                 VALUE beg, VALUE end, VALUE step, int excl)
+{
+    VALUE aseq = enumerator_init(enumerator_allocate(rb_cArithSeq),
+                                 obj, meth, argc, argv, size_fn, Qnil, PASS_KW_SPLAT);
+    rb_ivar_set(aseq, id_begin, beg);
+    rb_ivar_set(aseq, id_end, end);
+    rb_ivar_set(aseq, id_step, step);
+    rb_ivar_set(aseq, id_exclude_end, excl ? Qtrue : Qfalse);
+    return aseq;
+}
+
+/*
+ * call-seq: aseq.begin -> num or nil
+ *
+ * Returns the number that defines the first element of this arithmetic
+ * sequence.
+ */
+static inline VALUE
+arith_seq_begin(VALUE self)
+{
+    return rb_ivar_get(self, id_begin);
+}
+
+/*
+ * call-seq: aseq.end -> num or nil
+ *
+ * Returns the number that defines the end of this arithmetic sequence.
+ */
+static inline VALUE
+arith_seq_end(VALUE self)
+{
+    return rb_ivar_get(self, id_end);
+}
+
+/*
+ * call-seq: aseq.step -> num
+ *
+ * Returns the number that defines the common difference between
+ * two adjacent elements in this arithmetic sequence.
+ */
+static inline VALUE
+arith_seq_step(VALUE self)
+{
+    return rb_ivar_get(self, id_step);
+}
+
+/*
+ * call-seq: aseq.exclude_end? -> true or false
+ *
+ * Returns <code>true</code> if this arithmetic sequence excludes its end value.
+ */
+static inline VALUE
+arith_seq_exclude_end(VALUE self)
+{
+    return rb_ivar_get(self, id_exclude_end);
+}
+
+static inline int
+arith_seq_exclude_end_p(VALUE self)
+{
+    return RTEST(arith_seq_exclude_end(self));
+}
+
+int
+rb_arithmetic_sequence_extract(VALUE obj, rb_arithmetic_sequence_components_t *component)
+{
+    if (rb_obj_is_kind_of(obj, rb_cArithSeq)) {
+        component->begin = arith_seq_begin(obj);
+        component->end   = arith_seq_end(obj);
+        component->step  = arith_seq_step(obj);
+        component->exclude_end = arith_seq_exclude_end_p(obj);
+        return 1;
+    }
+    else if (rb_obj_is_kind_of(obj, rb_cRange)) {
+        component->begin = RANGE_BEG(obj);
+        component->end   = RANGE_END(obj);
+        component->step  = INT2FIX(1);
+        component->exclude_end = RTEST(RANGE_EXCL(obj));
+        return 1;
+    }
+
+    return 0;
+}
+
+/*
+ * call-seq:
+ *   aseq.first -> num or nil
+ *   aseq.first(n) -> an_array
+ *
+ * Returns the first number in this arithmetic sequence,
+ * or an array of the first +n+ elements.
+ */
+static VALUE
+arith_seq_first(int argc, VALUE *argv, VALUE self)
+{
+    VALUE b, e, s, ary;
+    long n;
+    int x;
+
+    rb_check_arity(argc, 0, 1);
+
+    b = arith_seq_begin(self);
+    e = arith_seq_end(self);
+    s = arith_seq_step(self);
+    if (argc == 0) {
+        if (NIL_P(b)) {
+            return Qnil;
+        }
+        if (!NIL_P(e)) {
+            VALUE zero = INT2FIX(0);
+            int r = rb_cmpint(rb_num_coerce_cmp(s, zero, idCmp), s, zero);
+            if (r > 0 && RTEST(rb_funcall(b, '>', 1, e))) {
+                return Qnil;
+            }
+            if (r < 0 && RTEST(rb_funcall(b, '<', 1, e))) {
+                return Qnil;
+            }
+        }
+        return b;
+    }
+
+    // TODO: the following code should be extracted as arith_seq_take
+
+    n = NUM2LONG(argv[0]);
+    if (n < 0) {
+        rb_raise(rb_eArgError, "attempt to take negative size");
+    }
+    if (n == 0) {
+        return rb_ary_new_capa(0);
+    }
+
+    x = arith_seq_exclude_end_p(self);
+
+    if (FIXNUM_P(b) && NIL_P(e) && FIXNUM_P(s)) {
+        long i = FIX2LONG(b), unit = FIX2LONG(s);
+        ary = rb_ary_new_capa(n);
+        while (n > 0 && FIXABLE(i)) {
+            rb_ary_push(ary, LONG2FIX(i));
+            i += unit;  // FIXABLE + FIXABLE never overflow;
+            --n;
+        }
+        if (n > 0) {
+            b = LONG2NUM(i);
+            while (n > 0) {
+                rb_ary_push(ary, b);
+                b = rb_big_plus(b, s);
+                --n;
+            }
+        }
+        return ary;
+    }
+    else if (FIXNUM_P(b) && FIXNUM_P(e) && FIXNUM_P(s)) {
+        long i = FIX2LONG(b);
+        long end = FIX2LONG(e);
+        long unit = FIX2LONG(s);
+        long len;
+
+        if (unit >= 0) {
+            if (!x) end += 1;
+
+            len = end - i;
+            if (len < 0) len = 0;
+            ary = rb_ary_new_capa((n < len) ? n : len);
+            while (n > 0 && i < end) {
+                rb_ary_push(ary, LONG2FIX(i));
+                if (i + unit < i) break;
+                i += unit;
+                --n;
+            }
+        }
+        else {
+            if (!x) end -= 1;
+
+            len = i - end;
+            if (len < 0) len = 0;
+            ary = rb_ary_new_capa((n < len) ? n : len);
+            while (n > 0 && i > end) {
+                rb_ary_push(ary, LONG2FIX(i));
+                if (i + unit > i) break;
+                i += unit;
+                --n;
+            }
+        }
+        return ary;
+    }
+    else if (RB_FLOAT_TYPE_P(b) || RB_FLOAT_TYPE_P(e) || RB_FLOAT_TYPE_P(s)) {
+        /* generate values like ruby_float_step */
+
+        double unit = NUM2DBL(s);
+        double beg = NUM2DBL(b);
+        double end = NIL_P(e) ? (unit < 0 ? -1 : 1)*HUGE_VAL : NUM2DBL(e);
+        double len = ruby_float_step_size(beg, end, unit, x);
+        long i;
+
+        if (n > len)
+            n = (long)len;
+
+        if (isinf(unit)) {
+            if (len > 0) {
+                ary = rb_ary_new_capa(1);
+                rb_ary_push(ary, DBL2NUM(beg));
+            }
+            else {
+                ary = rb_ary_new_capa(0);
+            }
+        }
+        else if (unit == 0) {
+            VALUE val = DBL2NUM(beg);
+            ary = rb_ary_new_capa(n);
+            for (i = 0; i < len; ++i) {
+                rb_ary_push(ary, val);
+            }
+        }
+        else {
+            ary = rb_ary_new_capa(n);
+            for (i = 0; i < n; ++i) {
+                double d = i*unit+beg;
+                if (unit >= 0 ? end < d : d < end) d = end;
+                rb_ary_push(ary, DBL2NUM(d));
+            }
+        }
+
+        return ary;
+    }
+
+    return rb_call_super(argc, argv);
+}
+
+/*
+ * call-seq:
+ *   aseq.last    -> num or nil
+ *   aseq.last(n) -> an_array
+ *
+ * Returns the last number in this arithmetic sequence,
+ * or an array of the last +n+ elements.
+ */
+static VALUE
+arith_seq_last(int argc, VALUE *argv, VALUE self)
+{
+    VALUE b, e, s, len_1, len, last, nv, ary;
+    int last_is_adjusted;
+    long n;
+
+    e = arith_seq_end(self);
+    if (NIL_P(e)) {
+        rb_raise(rb_eRangeError,
+                 "cannot get the last element of endless arithmetic sequence");
+    }
+
+    b = arith_seq_begin(self);
+    s = arith_seq_step(self);
+
+    len_1 = rb_int_idiv(rb_int_minus(e, b), s);
+    if (rb_num_negative_int_p(len_1)) {
+        if (argc == 0) {
+            return Qnil;
+        }
+        return rb_ary_new_capa(0);
+    }
+
+    last = rb_int_plus(b, rb_int_mul(s, len_1));
+    if ((last_is_adjusted = arith_seq_exclude_end_p(self) && rb_equal(last, e))) {
+        last = rb_int_minus(last, s);
+    }
+
+    if (argc == 0) {
+        return last;
+    }
+
+    if (last_is_adjusted) {
+        len = len_1;
+    }
+    else {
+        len = rb_int_plus(len_1, INT2FIX(1));
+    }
+
+    rb_scan_args(argc, argv, "1", &nv);
+    if (!RB_INTEGER_TYPE_P(nv)) {
+        nv = rb_to_int(nv);
+    }
+    if (RTEST(rb_int_gt(nv, len))) {
+        nv = len;
+    }
+    n = NUM2LONG(nv);
+    if (n < 0) {
+        rb_raise(rb_eArgError, "negative array size");
+    }
+
+    ary = rb_ary_new_capa(n);
+    b = rb_int_minus(last, rb_int_mul(s, nv));
+    while (n) {
+        b = rb_int_plus(b, s);
+        rb_ary_push(ary, b);
+        --n;
+    }
+
+    return ary;
+}
+
+/*
+ * call-seq:
+ *   aseq.inspect -> string
+ *
+ * Convert this arithmetic sequence to a printable form.
+ */
+static VALUE
+arith_seq_inspect(VALUE self)
+{
+    struct enumerator *e;
+    VALUE eobj, str, eargs;
+    int range_p;
+
+    TypedData_Get_Struct(self, struct enumerator, &enumerator_data_type, e);
+
+    eobj = rb_attr_get(self, id_receiver);
+    if (NIL_P(eobj)) {
+        eobj = e->obj;
+    }
+
+    range_p = RTEST(rb_obj_is_kind_of(eobj, rb_cRange));
+    str = rb_sprintf("(%s%"PRIsVALUE"%s.", range_p ? "(" : "", eobj, range_p ? ")" : "");
+
+    rb_str_buf_append(str, rb_id2str(e->meth));
+
+    eargs = rb_attr_get(eobj, id_arguments);
+    if (NIL_P(eargs)) {
+        eargs = e->args;
+    }
+    if (eargs != Qfalse) {
+        long argc = RARRAY_LEN(eargs);
+        const VALUE *argv = RARRAY_CONST_PTR(eargs); /* WB: no new reference */
+
+        if (argc > 0) {
+            VALUE kwds = Qnil;
+
+            rb_str_buf_cat2(str, "(");
+
+            if (RB_TYPE_P(argv[argc-1], T_HASH)) {
+                int all_key = TRUE;
+                rb_hash_foreach(argv[argc-1], key_symbol_p, (VALUE)&all_key);
+                if (all_key) kwds = argv[--argc];
+            }
+
+            while (argc--) {
+                VALUE arg = *argv++;
+
+                rb_str_append(str, rb_inspect(arg));
+                rb_str_buf_cat2(str, ", ");
+            }
+            if (!NIL_P(kwds)) {
+                rb_hash_foreach(kwds, kwd_append, str);
+            }
+            rb_str_set_len(str, RSTRING_LEN(str)-2); /* drop the last ", " */
+            rb_str_buf_cat2(str, ")");
+        }
+    }
+
+    rb_str_buf_cat2(str, ")");
+
+    return str;
+}
+
+/*
+ * call-seq:
+ *   aseq == obj  -> true or false
+ *
+ * Returns <code>true</code> only if +obj+ is an Enumerator::ArithmeticSequence,
+ * has equivalent begin, end, step, and exclude_end? settings.
+ */
+static VALUE
+arith_seq_eq(VALUE self, VALUE other)
+{
+    if (!RTEST(rb_obj_is_kind_of(other, rb_cArithSeq))) {
+        return Qfalse;
+    }
+
+    if (!rb_equal(arith_seq_begin(self), arith_seq_begin(other))) {
+        return Qfalse;
+    }
+
+    if (!rb_equal(arith_seq_end(self), arith_seq_end(other))) {
+        return Qfalse;
+    }
+
+    if (!rb_equal(arith_seq_step(self), arith_seq_step(other))) {
+        return Qfalse;
+    }
+
+    if (arith_seq_exclude_end_p(self) != arith_seq_exclude_end_p(other)) {
+        return Qfalse;
+    }
+
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *   aseq.hash  -> integer
+ *
+ * Compute a hash-value for this arithmetic sequence.
+ * Two arithmetic sequences with same begin, end, step, and exclude_end?
+ * values will generate the same hash-value.
+ *
+ * See also Object#hash.
+ */
+static VALUE
+arith_seq_hash(VALUE self)
+{
+    st_index_t hash;
+    VALUE v;
+
+    hash = rb_hash_start(arith_seq_exclude_end_p(self));
+    v = rb_hash(arith_seq_begin(self));
+    hash = rb_hash_uint(hash, NUM2LONG(v));
+    v = rb_hash(arith_seq_end(self));
+    hash = rb_hash_uint(hash, NUM2LONG(v));
+    v = rb_hash(arith_seq_step(self));
+    hash = rb_hash_uint(hash, NUM2LONG(v));
+    hash = rb_hash_end(hash);
+
+    return ST2FIX(hash);
+}
+
+#define NUM_GE(x, y) RTEST(rb_num_coerce_relop((x), (y), idGE))
+
+struct arith_seq_gen {
+    VALUE current;
+    VALUE end;
+    VALUE step;
+    int excl;
+};
+
+/*
+ * call-seq:
+ *   aseq.each {|i| block } -> aseq
+ *   aseq.each              -> aseq
+ */
+static VALUE
+arith_seq_each(VALUE self)
+{
+    VALUE c, e, s, len_1, last;
+    int x;
+
+    if (!rb_block_given_p()) return self;
+
+    c = arith_seq_begin(self);
+    e = arith_seq_end(self);
+    s = arith_seq_step(self);
+    x = arith_seq_exclude_end_p(self);
+
+    if (!RB_TYPE_P(s, T_COMPLEX) && ruby_float_step(c, e, s, x, TRUE)) {
+        return self;
+    }
+
+    if (NIL_P(e)) {
+        while (1) {
+            rb_yield(c);
+            c = rb_int_plus(c, s);
+        }
+
+        return self;
+    }
+
+    if (rb_equal(s, INT2FIX(0))) {
+        while (1) {
+            rb_yield(c);
+        }
+
+        return self;
+    }
+
+    len_1 = rb_int_idiv(rb_int_minus(e, c), s);
+    last = rb_int_plus(c, rb_int_mul(s, len_1));
+    if (x && rb_equal(last, e)) {
+        last = rb_int_minus(last, s);
+    }
+
+    if (rb_num_negative_int_p(s)) {
+        while (NUM_GE(c, last)) {
+            rb_yield(c);
+            c = rb_int_plus(c, s);
+        }
+    }
+    else {
+        while (NUM_GE(last, c)) {
+            rb_yield(c);
+            c = rb_int_plus(c, s);
+        }
+    }
+
+    return self;
+}
+
+static double
+arith_seq_float_step_size(double beg, double end, double step, int excl)
+{
+    double const epsilon = DBL_EPSILON;
+    double n, err;
+
+    if (step == 0) {
+        return HUGE_VAL;
+    }
+    n = (end - beg) / step;
+    err = (fabs(beg) + fabs(end) + fabs(end - beg)) / fabs(step) * epsilon;
+    if (isinf(step)) {
+        return step > 0 ? beg <= end : beg >= end;
+    }
+    if (err > 0.5) err = 0.5;
+    if (excl) {
+        if (n <= 0) return 0;
+        if (n < 1)
+            n = 0;
+        else
+            n = floor(n - err);
+    }
+    else {
+        if (n < 0) return 0;
+        n = floor(n + err);
+    }
+    return n + 1;
+}
+
+/*
+ * call-seq:
+ *   aseq.size -> num or nil
+ *
+ * Returns the number of elements in this arithmetic sequence if it is a finite
+ * sequence.  Otherwise, returns <code>nil</code>.
+ */
+static VALUE
+arith_seq_size(VALUE self)
+{
+    VALUE b, e, s, len_1, len, last;
+    int x;
+
+    b = arith_seq_begin(self);
+    e = arith_seq_end(self);
+    s = arith_seq_step(self);
+    x = arith_seq_exclude_end_p(self);
+
+    if (RB_FLOAT_TYPE_P(b) || RB_FLOAT_TYPE_P(e) || RB_FLOAT_TYPE_P(s)) {
+        double ee, n;
+
+        if (NIL_P(e)) {
+            if (rb_num_negative_int_p(s)) {
+                ee = -HUGE_VAL;
+            }
+            else {
+                ee = HUGE_VAL;
+            }
+        }
+        else {
+            ee = NUM2DBL(e);
+        }
+
+        n = arith_seq_float_step_size(NUM2DBL(b), ee, NUM2DBL(s), x);
+        if (isinf(n)) return DBL2NUM(n);
+        if (POSFIXABLE(n)) return LONG2FIX(n);
+        return rb_dbl2big(n);
+    }
+
+    if (NIL_P(e)) {
+        return DBL2NUM(HUGE_VAL);
+    }
+
+    if (!rb_obj_is_kind_of(s, rb_cNumeric)) {
+        s = rb_to_int(s);
+    }
+
+    if (rb_equal(s, INT2FIX(0))) {
+        return DBL2NUM(HUGE_VAL);
+    }
+
+    len_1 = rb_int_idiv(rb_int_minus(e, b), s);
+    if (rb_num_negative_int_p(len_1)) {
+        return INT2FIX(0);
+    }
+
+    last = rb_int_plus(b, rb_int_mul(s, len_1));
+    if (x && rb_equal(last, e)) {
+        len = len_1;
+    }
+    else {
+        len = rb_int_plus(len_1, INT2FIX(1));
+    }
+
+    return len;
 }
 
 void
-Init_Enumerator(void)
+InitVM_Enumerator(void)
 {
+    ID id_private = rb_intern("private");
+
     rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -1);
     rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -1);
 
@@ -1139,7 +3910,7 @@ Init_Enumerator(void)
     rb_define_alloc_func(rb_cEnumerator, enumerator_allocate);
     rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1);
     rb_define_method(rb_cEnumerator, "initialize_copy", enumerator_init_copy, 1);
-    rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
+    rb_define_method(rb_cEnumerator, "each", enumerator_each, -1);
     rb_define_method(rb_cEnumerator, "each_with_index", enumerator_each_with_index, 0);
     rb_define_method(rb_cEnumerator, "each_with_object", enumerator_with_object, 1);
     rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, -1);
@@ -1151,6 +3922,111 @@ Init_Enumerator(void)
     rb_define_method(rb_cEnumerator, "feed", enumerator_feed, 1);
     rb_define_method(rb_cEnumerator, "rewind", enumerator_rewind, 0);
     rb_define_method(rb_cEnumerator, "inspect", enumerator_inspect, 0);
+    rb_define_method(rb_cEnumerator, "size", enumerator_size, 0);
+    rb_define_method(rb_cEnumerator, "+", enumerator_plus, 1);
+    rb_define_method(rb_mEnumerable, "chain", enum_chain, -1);
+
+    /* Lazy */
+    rb_cLazy = rb_define_class_under(rb_cEnumerator, "Lazy", rb_cEnumerator);
+    rb_define_method(rb_mEnumerable, "lazy", enumerable_lazy, 0);
+
+    rb_define_alias(rb_cLazy, "_enumerable_map", "map");
+    rb_define_alias(rb_cLazy, "_enumerable_collect", "collect");
+    rb_define_alias(rb_cLazy, "_enumerable_flat_map", "flat_map");
+    rb_define_alias(rb_cLazy, "_enumerable_collect_concat", "collect_concat");
+    rb_define_alias(rb_cLazy, "_enumerable_select", "select");
+    rb_define_alias(rb_cLazy, "_enumerable_find_all", "find_all");
+    rb_define_alias(rb_cLazy, "_enumerable_filter", "filter");
+    rb_define_alias(rb_cLazy, "_enumerable_filter_map", "filter_map");
+    rb_define_alias(rb_cLazy, "_enumerable_reject", "reject");
+    rb_define_alias(rb_cLazy, "_enumerable_grep", "grep");
+    rb_define_alias(rb_cLazy, "_enumerable_grep_v", "grep_v");
+    rb_define_alias(rb_cLazy, "_enumerable_zip", "zip");
+    rb_define_alias(rb_cLazy, "_enumerable_take", "take");
+    rb_define_alias(rb_cLazy, "_enumerable_take_while", "take_while");
+    rb_define_alias(rb_cLazy, "_enumerable_drop", "drop");
+    rb_define_alias(rb_cLazy, "_enumerable_drop_while", "drop_while");
+    rb_define_alias(rb_cLazy, "_enumerable_uniq", "uniq");
+    rb_define_private_method(rb_cLazy, "_enumerable_with_index", enumerator_with_index, -1);
+
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_map")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_collect")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_flat_map")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_collect_concat")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_select")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_find_all")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_filter")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_filter_map")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_reject")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_grep")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_grep_v")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_zip")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_take")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_take_while")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_drop")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_drop_while")));
+    rb_funcall(rb_cLazy, id_private, 1, ID2SYM(rb_intern("_enumerable_uniq")));
+
+    rb_define_method(rb_cLazy, "initialize", lazy_initialize, -1);
+    rb_define_method(rb_cLazy, "to_enum", lazy_to_enum, -1);
+    rb_define_method(rb_cLazy, "enum_for", lazy_to_enum, -1);
+    rb_define_method(rb_cLazy, "eager", lazy_eager, 0);
+    rb_define_method(rb_cLazy, "map", lazy_map, 0);
+    rb_define_method(rb_cLazy, "collect", lazy_map, 0);
+    rb_define_method(rb_cLazy, "flat_map", lazy_flat_map, 0);
+    rb_define_method(rb_cLazy, "collect_concat", lazy_flat_map, 0);
+    rb_define_method(rb_cLazy, "select", lazy_select, 0);
+    rb_define_method(rb_cLazy, "find_all", lazy_select, 0);
+    rb_define_method(rb_cLazy, "filter", lazy_select, 0);
+    rb_define_method(rb_cLazy, "filter_map", lazy_filter_map, 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);
+    rb_define_method(rb_cLazy, "drop", lazy_drop, 1);
+    rb_define_method(rb_cLazy, "drop_while", lazy_drop_while, 0);
+    rb_define_method(rb_cLazy, "lazy", lazy_lazy, 0);
+    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_method(rb_cLazy, "with_index", lazy_with_index, -1);
+
+    lazy_use_super_method = rb_hash_new_with_size(18);
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("map")), ID2SYM(rb_intern("_enumerable_map")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("collect")), ID2SYM(rb_intern("_enumerable_collect")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("flat_map")), ID2SYM(rb_intern("_enumerable_flat_map")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("collect_concat")), ID2SYM(rb_intern("_enumerable_collect_concat")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("select")), ID2SYM(rb_intern("_enumerable_select")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("find_all")), ID2SYM(rb_intern("_enumerable_find_all")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("filter")), ID2SYM(rb_intern("_enumerable_filter")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("filter_map")), ID2SYM(rb_intern("_enumerable_filter_map")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("reject")), ID2SYM(rb_intern("_enumerable_reject")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("grep")), ID2SYM(rb_intern("_enumerable_grep")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("grep_v")), ID2SYM(rb_intern("_enumerable_grep_v")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("zip")), ID2SYM(rb_intern("_enumerable_zip")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("take")), ID2SYM(rb_intern("_enumerable_take")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("take_while")), ID2SYM(rb_intern("_enumerable_take_while")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("drop")), ID2SYM(rb_intern("_enumerable_drop")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("drop_while")), ID2SYM(rb_intern("_enumerable_drop_while")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("uniq")), ID2SYM(rb_intern("_enumerable_uniq")));
+    rb_hash_aset(lazy_use_super_method, ID2SYM(rb_intern("with_index")), ID2SYM(rb_intern("_enumerable_with_index")));
+    rb_obj_freeze(lazy_use_super_method);
+    rb_gc_register_mark_object(lazy_use_super_method);
+
+#if 0 /* for RDoc */
+    rb_define_method(rb_cLazy, "to_a", lazy_to_a, 0);
+    rb_define_method(rb_cLazy, "chunk", lazy_chunk, 0);
+    rb_define_method(rb_cLazy, "chunk_while", lazy_chunk_while, 0);
+    rb_define_method(rb_cLazy, "slice_after", lazy_slice_after, 0);
+    rb_define_method(rb_cLazy, "slice_before", lazy_slice_before, 0);
+    rb_define_method(rb_cLazy, "slice_when", lazy_slice_when, 0);
+#endif
+    rb_define_alias(rb_cLazy, "force", "to_a");
 
     rb_eStopIteration = rb_define_class("StopIteration", rb_eIndexError);
     rb_define_method(rb_eStopIteration, "result", stop_result, 0);
@@ -1161,18 +4037,74 @@ Init_Enumerator(void)
     rb_define_alloc_func(rb_cGenerator, generator_allocate);
     rb_define_method(rb_cGenerator, "initialize", generator_initialize, -1);
     rb_define_method(rb_cGenerator, "initialize_copy", generator_init_copy, 1);
-    rb_define_method(rb_cGenerator, "each", generator_each, 0);
+    rb_define_method(rb_cGenerator, "each", generator_each, -1);
 
     /* Yielder */
     rb_cYielder = rb_define_class_under(rb_cEnumerator, "Yielder", rb_cObject);
     rb_define_alloc_func(rb_cYielder, yielder_allocate);
     rb_define_method(rb_cYielder, "initialize", yielder_initialize, 0);
     rb_define_method(rb_cYielder, "yield", yielder_yield, -2);
-    rb_define_method(rb_cYielder, "<<", yielder_yield_push, -2);
+    rb_define_method(rb_cYielder, "<<", yielder_yield_push, 1);
+    rb_define_method(rb_cYielder, "to_proc", yielder_to_proc, 0);
+
+    /* Producer */
+    rb_cEnumProducer = rb_define_class_under(rb_cEnumerator, "Producer", rb_cObject);
+    rb_define_alloc_func(rb_cEnumProducer, producer_allocate);
+    rb_define_method(rb_cEnumProducer, "each", producer_each, 0);
+    rb_define_singleton_method(rb_cEnumerator, "produce", enumerator_s_produce, -1);
+
+    /* Chain */
+    rb_cEnumChain = rb_define_class_under(rb_cEnumerator, "Chain", rb_cEnumerator);
+    rb_define_alloc_func(rb_cEnumChain, enum_chain_allocate);
+    rb_define_method(rb_cEnumChain, "initialize", enum_chain_initialize, -2);
+    rb_define_method(rb_cEnumChain, "initialize_copy", enum_chain_init_copy, 1);
+    rb_define_method(rb_cEnumChain, "each", enum_chain_each, -1);
+    rb_define_method(rb_cEnumChain, "size", enum_chain_size, 0);
+    rb_define_method(rb_cEnumChain, "rewind", enum_chain_rewind, 0);
+    rb_define_method(rb_cEnumChain, "inspect", enum_chain_inspect, 0);
+
+    /* ArithmeticSequence */
+    rb_cArithSeq = rb_define_class_under(rb_cEnumerator, "ArithmeticSequence", rb_cEnumerator);
+    rb_undef_alloc_func(rb_cArithSeq);
+    rb_undef_method(CLASS_OF(rb_cArithSeq), "new");
+    rb_define_method(rb_cArithSeq, "begin", arith_seq_begin, 0);
+    rb_define_method(rb_cArithSeq, "end", arith_seq_end, 0);
+    rb_define_method(rb_cArithSeq, "exclude_end?", arith_seq_exclude_end, 0);
+    rb_define_method(rb_cArithSeq, "step", arith_seq_step, 0);
+    rb_define_method(rb_cArithSeq, "first", arith_seq_first, -1);
+    rb_define_method(rb_cArithSeq, "last", arith_seq_last, -1);
+    rb_define_method(rb_cArithSeq, "inspect", arith_seq_inspect, 0);
+    rb_define_method(rb_cArithSeq, "==", arith_seq_eq, 1);
+    rb_define_method(rb_cArithSeq, "===", arith_seq_eq, 1);
+    rb_define_method(rb_cArithSeq, "eql?", arith_seq_eq, 1);
+    rb_define_method(rb_cArithSeq, "hash", arith_seq_hash, 0);
+    rb_define_method(rb_cArithSeq, "each", arith_seq_each, 0);
+    rb_define_method(rb_cArithSeq, "size", arith_seq_size, 0);
+
+    rb_provide("enumerator.so");	/* for backward compatibility */
+}
 
+#undef rb_intern
+void
+Init_Enumerator(void)
+{
     id_rewind = rb_intern("rewind");
-    id_each = rb_intern("each");
+    id_new = rb_intern("new");
+    id_next = rb_intern("next");
+    id_result = rb_intern("result");
+    id_receiver = rb_intern("receiver");
+    id_arguments = rb_intern("arguments");
+    id_memo = rb_intern("memo");
+    id_method = rb_intern("method");
+    id_force = rb_intern("force");
+    id_to_enum = rb_intern("to_enum");
+    id_begin = rb_intern("begin");
+    id_end = rb_intern("end");
+    id_step = rb_intern("step");
+    id_exclude_end = rb_intern("exclude_end");
     sym_each = ID2SYM(id_each);
+    sym_cycle = ID2SYM(rb_intern("cycle"));
+    sym_yield = ID2SYM(rb_intern("yield"));
 
-    rb_provide("enumerator.so");	/* for backward compatibility */
+    InitVM(Enumerator);
 }
diff --git a/error.c b/error.c
index ce959fc221..9557d8552b 100644
--- a/error.c
+++ b/error.c
@@ -9,11 +9,12 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/st.h"
 #include "ruby/encoding.h"
+#include "ruby/st.h"
 #include "internal.h"
+#include "ruby_assert.h"
 #include "vm_core.h"
+#include "builtin.h"
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -25,6 +26,15 @@
 #include <unistd.h>
 #endif
 
+#if defined __APPLE__
+# include <AvailabilityMacros.h>
+#endif
+
+/*!
+ * \defgroup exception Exception handlings
+ * \{
+ */
+
 #ifndef EXIT_SUCCESS
 #define EXIT_SUCCESS 0
 #endif
@@ -37,14 +47,19 @@
 #define WEXITSTATUS(status) (status)
 #endif
 
-extern const char ruby_description[];
+VALUE rb_iseqw_local_variables(VALUE iseqval);
+VALUE rb_iseqw_new(const rb_iseq_t *);
+int rb_str_end_with_asciichar(VALUE str, int c);
+
+VALUE rb_eEAGAIN;
+VALUE rb_eEWOULDBLOCK;
+VALUE rb_eEINPROGRESS;
+static VALUE rb_mWarning;
+static VALUE rb_cWarningBuffer;
+
+static ID id_warn;
 
-#define REPORTBUG_MSG \
-	"[NOTE]\n" \
-	"You may have encountered a bug in the Ruby interpreter" \
-	" or extension libraries.\n" \
-	"Bug reports are welcome.\n" \
-	"For details: http://www.ruby-lang.org/bugreport.html\n\n" \
+extern const char ruby_description[];
 
 static const char *
 rb_strerrno(int err)
@@ -71,219 +86,583 @@ err_position_0(char *buf, long len, const char *file, int line)
     }
 }
 
-static int
-err_position(char *buf, long len)
+static VALUE
+err_vcatf(VALUE str, const char *pre, const char *file, int line,
+	  const char *fmt, va_list args)
 {
-    return err_position_0(buf, len, rb_sourcefile(), rb_sourceline());
+    if (file) {
+	rb_str_cat2(str, file);
+	if (line) rb_str_catf(str, ":%d", line);
+	rb_str_cat2(str, ": ");
+    }
+    if (pre) rb_str_cat2(str, pre);
+    rb_str_vcatf(str, fmt, args);
+    return str;
 }
 
-static void
-err_snprintf(char *buf, long len, const char *fmt, va_list args)
-{
-    long n;
-
-    n = err_position(buf, len);
-    if (len > n) {
-	vsnprintf((char*)buf+n, len-n, fmt, args);
+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);
+    }
+    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");
+	}
+	err_vcatf(mesg, NULL, fn, line, fmt, args);
     }
+
+    return exc;
 }
 
-static void
-compile_snprintf(char *buf, long len, const char *file, int line, const char *fmt, va_list args)
+static unsigned int warning_disabled_categories;
+
+static unsigned int
+rb_warning_category_mask(VALUE category)
 {
-    long n;
+    return 1U << rb_warning_category_from_name(category);
+}
 
-    n = err_position_0(buf, len, file, line);
-    if (len > n) {
-	vsnprintf((char*)buf+n, len-n, fmt, args);
+rb_warning_category_t
+rb_warning_category_from_name(VALUE category)
+{
+    rb_warning_category_t cat = RB_WARN_CATEGORY_NONE;
+    Check_Type(category, T_SYMBOL);
+    if (category == ID2SYM(rb_intern("deprecated"))) {
+        cat = RB_WARN_CATEGORY_DEPRECATED;
     }
+    else if (category == ID2SYM(rb_intern("experimental"))) {
+        cat = RB_WARN_CATEGORY_EXPERIMENTAL;
+    }
+    else {
+        rb_raise(rb_eArgError, "unknown category: %"PRIsVALUE, category);
+    }
+    return cat;
 }
 
-static void err_append(const char*, rb_encoding *);
-
 void
-rb_compile_error_with_enc(const char *file, int line, void *enc, const char *fmt, ...)
+rb_warning_category_update(unsigned int mask, unsigned int bits)
 {
-    va_list args;
-    char buf[BUFSIZ];
+    warning_disabled_categories &= ~mask;
+    warning_disabled_categories |= mask & ~bits;
+}
 
-    va_start(args, fmt);
-    compile_snprintf(buf, BUFSIZ, file, line, fmt, args);
-    va_end(args);
-    err_append(buf, (rb_encoding *)enc);
+MJIT_FUNC_EXPORTED bool
+rb_warning_category_enabled_p(rb_warning_category_t category)
+{
+    return !(warning_disabled_categories & (1U << category));
 }
 
-void
-rb_compile_error(const char *file, int line, const char *fmt, ...)
+/*
+ * call-seq
+ *    Warning[category]  -> true or false
+ *
+ * Returns the flag to show the warning messages for +category+.
+ * Supported categories are:
+ *
+ * +:deprecated+ :: deprecation warnings
+ * * assignment of non-nil value to <code>$,</code> and <code>$;</code>
+ * * keyword arguments
+ * * proc/lambda without block
+ * etc.
+ *
+ * +:experimental+ :: experimental features
+ * * Pattern matching
+ */
+
+static VALUE
+rb_warning_s_aref(VALUE mod, VALUE category)
 {
-    va_list args;
-    char buf[BUFSIZ];
+    rb_warning_category_t cat = rb_warning_category_from_name(category);
+    if (rb_warning_category_enabled_p(cat))
+        return Qtrue;
+    return Qfalse;
+}
 
-    va_start(args, fmt);
-    compile_snprintf(buf, BUFSIZ, file, line, fmt, args);
-    va_end(args);
-    err_append(buf, NULL);
+/*
+ * call-seq
+ *    Warning[category] = flag -> flag
+ *
+ * Sets the warning flags for +category+.
+ * See Warning.[] for the categories.
+ */
+
+static VALUE
+rb_warning_s_aset(VALUE mod, VALUE category, VALUE flag)
+{
+    unsigned int mask = rb_warning_category_mask(category);
+    unsigned int disabled = warning_disabled_categories;
+    if (!RTEST(flag))
+        disabled |= mask;
+    else
+        disabled &= ~mask;
+    warning_disabled_categories = disabled;
+    return flag;
 }
 
-void
-rb_compile_error_append(const char *fmt, ...)
+/*
+ * call-seq:
+ *    warn(msg)  -> nil
+ *
+ * Writes warning message +msg+ to $stderr. This method is called by
+ * Ruby for all emitted warnings.
+ */
+
+static VALUE
+rb_warning_s_warn(VALUE mod, VALUE str)
 {
-    va_list args;
-    char buf[BUFSIZ];
+    Check_Type(str, T_STRING);
+    rb_must_asciicompat(str);
+    rb_write_error_str(str);
+    return Qnil;
+}
 
-    va_start(args, fmt);
-    vsnprintf(buf, BUFSIZ, fmt, args);
-    va_end(args);
-    err_append(buf, NULL);
+/*
+ *  Document-module: Warning
+ *
+ *  The Warning module contains a single method named #warn, and the
+ *  module extends itself, making Warning.warn available.
+ *  Warning.warn is called for all warnings issued by Ruby.
+ *  By default, warnings are printed to $stderr.
+ *
+ *  By overriding Warning.warn, you can change how warnings are
+ *  handled by Ruby, either filtering some warnings, and/or outputting
+ *  warnings somewhere other than $stderr.  When Warning.warn is
+ *  overridden, super can be called to get the default behavior of
+ *  printing the warning to $stderr.
+ */
+
+static VALUE
+rb_warning_warn(VALUE mod, VALUE str)
+{
+    return rb_funcallv(mod, id_warn, 1, &str);
 }
 
 static void
-compile_warn_print(const char *file, int line, const char *fmt, va_list args)
+rb_write_warning_str(VALUE str)
 {
-    char buf[BUFSIZ];
-    int len;
+    rb_warning_warn(rb_mWarning, str);
+}
 
-    compile_snprintf(buf, BUFSIZ, file, line, fmt, args);
-    len = (int)strlen(buf);
-    buf[len++] = '\n';
-    rb_write_error2(buf, len);
+static VALUE
+warn_vsprintf(rb_encoding *enc, const char *file, int line, const char *fmt, va_list args)
+{
+    VALUE str = rb_enc_str_new(0, 0, enc);
+
+    err_vcatf(str, "warning: ", file, line, fmt, args);
+    return rb_str_cat2(str, "\n");
 }
 
 void
 rb_compile_warn(const char *file, int line, const char *fmt, ...)
 {
-    char buf[BUFSIZ];
+    VALUE str;
     va_list args;
 
     if (NIL_P(ruby_verbose)) return;
 
-    snprintf(buf, BUFSIZ, "warning: %s", fmt);
-
     va_start(args, fmt);
-    compile_warn_print(file, line, buf, args);
+    str = warn_vsprintf(NULL, 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, ...)
 {
-    char buf[BUFSIZ];
+    VALUE str;
     va_list args;
 
     if (!RTEST(ruby_verbose)) return;
 
-    snprintf(buf, BUFSIZ, "warning: %s", fmt);
-
     va_start(args, fmt);
-    compile_warn_print(file, line, buf, args);
+    str = warn_vsprintf(NULL, file, line, fmt, args);
     va_end(args);
+    rb_write_warning_str(str);
 }
 
-static void
-warn_print(const char *fmt, va_list args)
+static VALUE
+warning_string(rb_encoding *enc, const char *fmt, va_list args)
 {
-    char buf[BUFSIZ];
-    int len;
-
-    err_snprintf(buf, BUFSIZ, fmt, args);
-    len = (int)strlen(buf);
-    buf[len++] = '\n';
-    rb_write_error2(buf, len);
+    int line;
+    const char *file = rb_source_location_cstr(&line);
+    return warn_vsprintf(enc, file, line, fmt, args);
 }
 
+#define with_warning_string(mesg, enc, fmt) \
+    VALUE mesg; \
+    va_list args; va_start(args, fmt); \
+    mesg = warning_string(enc, fmt, args); \
+    va_end(args);
+
 void
 rb_warn(const char *fmt, ...)
 {
-    char buf[BUFSIZ];
-    va_list args;
-
-    if (NIL_P(ruby_verbose)) return;
-
-    snprintf(buf, BUFSIZ, "warning: %s", fmt);
+    if (!NIL_P(ruby_verbose)) {
+	with_warning_string(mesg, 0, fmt) {
+	    rb_write_warning_str(mesg);
+	}
+    }
+}
 
-    va_start(args, fmt);
-    warn_print(buf, args);
-    va_end(args);
+void
+rb_enc_warn(rb_encoding *enc, const char *fmt, ...)
+{
+    if (!NIL_P(ruby_verbose)) {
+	with_warning_string(mesg, enc, fmt) {
+	    rb_write_warning_str(mesg);
+	}
+    }
 }
 
 /* rb_warning() reports only in verbose mode */
 void
 rb_warning(const char *fmt, ...)
 {
-    char buf[BUFSIZ];
-    va_list args;
+    if (RTEST(ruby_verbose)) {
+	with_warning_string(mesg, 0, fmt) {
+	    rb_write_warning_str(mesg);
+	}
+    }
+}
 
-    if (!RTEST(ruby_verbose)) return;
+VALUE
+rb_warning_string(const char *fmt, ...)
+{
+    with_warning_string(mesg, 0, fmt) {
+    }
+    return mesg;
+}
 
-    snprintf(buf, BUFSIZ, "warning: %s", fmt);
+#if 0
+void
+rb_enc_warning(rb_encoding *enc, const char *fmt, ...)
+{
+    if (RTEST(ruby_verbose)) {
+	with_warning_string(mesg, enc, fmt) {
+	    rb_write_warning_str(mesg);
+	}
+    }
+}
+#endif
 
-    va_start(args, fmt);
-    warn_print(buf, args);
+void
+rb_warn_deprecated(const char *fmt, const char *suggest, ...)
+{
+    if (NIL_P(ruby_verbose)) return;
+    if (!rb_warning_category_enabled_p(RB_WARN_CATEGORY_DEPRECATED)) return;
+    va_list args;
+    va_start(args, suggest);
+    VALUE mesg = warning_string(0, fmt, args);
     va_end(args);
+    rb_str_set_len(mesg, RSTRING_LEN(mesg) - 1);
+    rb_str_cat_cstr(mesg, " is deprecated");
+    if (suggest) rb_str_catf(mesg, "; use %s instead", suggest);
+    rb_str_cat_cstr(mesg, "\n");
+    rb_write_warning_str(mesg);
 }
 
-/*
- * call-seq:
- *    warn(msg)   -> nil
- *
- * Display the given message (followed by a newline) on STDERR unless
- * warnings are disabled (for example with the <code>-W0</code> flag).
- */
+static inline int
+end_with_asciichar(VALUE str, int c)
+{
+    return RB_TYPE_P(str, T_STRING) &&
+	rb_str_end_with_asciichar(str, c);
+}
 
+/* :nodoc: */
 static VALUE
-rb_warn_m(VALUE self, VALUE mesg)
+warning_write(int argc, VALUE *argv, VALUE buf)
 {
-    if (!NIL_P(ruby_verbose)) {
-	rb_io_write(rb_stderr, mesg);
-	rb_io_write(rb_stderr, rb_default_rs);
+    while (argc-- > 0) {
+	rb_str_append(buf, *argv++);
+    }
+    return buf;
+}
+
+VALUE rb_ec_backtrace_location_ary(rb_execution_context_t *ec, long lev, long n);
+static VALUE
+rb_warn_m(rb_execution_context_t *ec, VALUE exc, VALUE msgs, VALUE uplevel)
+{
+    VALUE location = Qnil;
+    int argc = RARRAY_LENINT(msgs);
+    const VALUE *argv = RARRAY_CONST_PTR(msgs);
+
+    if (!NIL_P(ruby_verbose) && argc > 0) {
+        VALUE str = argv[0];
+        if (!NIL_P(uplevel)) {
+            long lev = NUM2LONG(uplevel);
+            if (lev < 0) {
+                rb_raise(rb_eArgError, "negative level (%ld)", lev);
+            }
+            location = rb_ec_backtrace_location_ary(ec, lev + 1, 1);
+            if (!NIL_P(location)) {
+                location = rb_ary_entry(location, 0);
+            }
+	}
+	if (argc > 1 || !NIL_P(uplevel) || !end_with_asciichar(str, '\n')) {
+	    VALUE path;
+	    if (NIL_P(uplevel)) {
+		str = rb_str_tmp_new(0);
+	    }
+	    else if (NIL_P(location) ||
+		     NIL_P(path = rb_funcall(location, rb_intern("path"), 0))) {
+		str = rb_str_new_cstr("warning: ");
+	    }
+	    else {
+		str = rb_sprintf("%s:%ld: warning: ",
+		    rb_string_value_ptr(&path),
+		    NUM2LONG(rb_funcall(location, rb_intern("lineno"), 0)));
+	    }
+	    RBASIC_SET_CLASS(str, rb_cWarningBuffer);
+	    rb_io_puts(argc, argv, str);
+	    RBASIC_SET_CLASS(str, rb_cString);
+	}
+	if (exc == rb_mWarning) {
+	    rb_must_asciicompat(str);
+	    rb_write_error_str(str);
+	}
+	else {
+	    rb_write_warning_str(str);
+	}
     }
     return Qnil;
 }
 
-static void
-report_bug(const char *file, int line, const char *fmt, va_list args)
+#define MAX_BUG_REPORTERS 0x100
+
+static struct bug_reporters {
+    void (*func)(FILE *out, void *data);
+    void *data;
+} bug_reporters[MAX_BUG_REPORTERS];
+
+static int bug_reporters_size;
+
+int
+rb_bug_reporter_add(void (*func)(FILE *, void *), void *data)
 {
-    char buf[BUFSIZ];
+    struct bug_reporters *reporter;
+    if (bug_reporters_size >= MAX_BUG_REPORTERS) {
+	return 0; /* failed to register */
+    }
+    reporter = &bug_reporters[bug_reporters_size++];
+    reporter->func = func;
+    reporter->data = data;
+
+    return 1;
+}
+
+/* SIGSEGV handler might have a very small stack. Thus we need to use it carefully. */
+#define REPORT_BUG_BUFSIZ 256
+static FILE *
+bug_report_file(const char *file, int line)
+{
+    char buf[REPORT_BUG_BUFSIZ];
     FILE *out = stderr;
-    int len = err_position_0(buf, BUFSIZ, file, line);
+    int len = err_position_0(buf, sizeof(buf), file, line);
 
     if ((ssize_t)fwrite(buf, 1, len, out) == (ssize_t)len ||
 	(ssize_t)fwrite(buf, 1, len, (out = stdout)) == (ssize_t)len) {
+        return out;
+    }
 
-	fputs("[BUG] ", out);
-	vfprintf(out, fmt, args);
-	fprintf(out, "\n%s\n\n", ruby_description);
+    return NULL;
+}
 
-	rb_vm_bugreport();
+FUNC_MINIMIZED(static void bug_important_message(FILE *out, const char *const msg, size_t len));
 
-	fprintf(out, REPORTBUG_MSG);
+static void
+bug_important_message(FILE *out, const char *const msg, size_t len)
+{
+    const char *const endmsg = msg + len;
+    const char *p = msg;
+
+    if (!len) return;
+    if (isatty(fileno(out))) {
+	static const char red[] = "\033[;31;1;7m";
+	static const char green[] = "\033[;32;7m";
+	static const char reset[] = "\033[m";
+	const char *e = strchr(p, '\n');
+	const int w = (int)(e - p);
+	do {
+	    int i = (int)(e - p);
+	    fputs(*p == ' ' ? green : red, out);
+	    fwrite(p, 1, e - p, out);
+	    for (; i < w; ++i) fputc(' ', out);
+	    fputs(reset, out);
+	    fputc('\n', out);
+	} while ((p = e + 1) < endmsg && (e = strchr(p, '\n')) != 0 && e > p + 1);
     }
+    fwrite(p, 1, endmsg - p, out);
+}
+
+static void
+preface_dump(FILE *out)
+{
+#if defined __APPLE__
+    static const char msg[] = ""
+	"-- Crash Report log information "
+	"--------------------------------------------\n"
+	"   See Crash Report log file under the one of following:\n"
+# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
+	"     * ~/Library/Logs/CrashReporter\n"
+	"     * /Library/Logs/CrashReporter\n"
+# endif
+	"     * ~/Library/Logs/DiagnosticReports\n"
+	"     * /Library/Logs/DiagnosticReports\n"
+	"   for more details.\n"
+	"Don't forget to include the above Crash Report log file in bug reports.\n"
+	"\n";
+    const size_t msglen = sizeof(msg) - 1;
+#else
+    const char *msg = NULL;
+    const size_t msglen = 0;
+#endif
+    bug_important_message(out, msg, msglen);
+}
+
+static void
+postscript_dump(FILE *out)
+{
+#if defined __APPLE__
+    static const char msg[] = ""
+	"[IMPORTANT]"
+	/*" ------------------------------------------------"*/
+	"\n""Don't forget to include the Crash Report log file under\n"
+# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
+	"CrashReporter or "
+# endif
+	"DiagnosticReports directory in bug reports.\n"
+	/*"------------------------------------------------------------\n"*/
+	"\n";
+    const size_t msglen = sizeof(msg) - 1;
+#else
+    const char *msg = NULL;
+    const size_t msglen = 0;
+#endif
+    bug_important_message(out, msg, msglen);
+}
+
+static void
+bug_report_begin_valist(FILE *out, const char *fmt, va_list args)
+{
+    char buf[REPORT_BUG_BUFSIZ];
+
+    fputs("[BUG] ", out);
+    vsnprintf(buf, sizeof(buf), fmt, args);
+    fputs(buf, out);
+    snprintf(buf, sizeof(buf), "\n%s\n\n", ruby_description);
+    fputs(buf, out);
+    preface_dump(out);
+
+#if RUBY_DEVEL
+    const char *cmd = getenv("RUBY_ON_BUG");
+    if (cmd) {
+        snprintf(buf, sizeof(buf), "%s %"PRI_PIDT_PREFIX"d", cmd, getpid());
+        int r = system(buf);
+        if (r == -1) {
+            snprintf(buf, sizeof(buf), "Launching RUBY_ON_BUG command failed.");
+        }
+    }
+#endif
+}
+
+#define bug_report_begin(out, fmt) do { \
+    va_list args; \
+    va_start(args, fmt); \
+    bug_report_begin_valist(out, fmt, args); \
+    va_end(args); \
+} while (0)
+
+static void
+bug_report_end(FILE *out)
+{
+    /* call additional bug reporters */
+    {
+	int i;
+	for (i=0; i<bug_reporters_size; i++) {
+	    struct bug_reporters *reporter = &bug_reporters[i];
+	    (*reporter->func)(out, reporter->data);
+	}
+    }
+    postscript_dump(out);
+}
+
+#define report_bug(file, line, fmt, ctx) do { \
+    FILE *out = bug_report_file(file, line); \
+    if (out) { \
+	bug_report_begin(out, fmt); \
+	rb_vm_bugreport(ctx); \
+	bug_report_end(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)
+{
+#if defined(_WIN32) && defined(RUBY_MSVCRT_VERSION) && RUBY_MSVCRT_VERSION >= 80
+    _set_abort_behavior( 0, _CALL_REPORTFAULT);
+#endif
+
+    abort();
 }
 
 void
 rb_bug(const char *fmt, ...)
 {
-    va_list args;
     const char *file = NULL;
     int line = 0;
 
-    if (GET_THREAD()) {
-	file = rb_sourcefile();
-	line = rb_sourceline();
+    if (GET_EC()) {
+	file = rb_source_location_cstr(&line);
     }
 
-    va_start(args, fmt);
-    report_bug(file, line, fmt, args);
-    va_end(args);
+    report_bug(file, line, fmt, NULL);
 
-#if defined(_WIN32) && defined(RT_VER) && RT_VER >= 80
-    _set_abort_behavior( 0, _CALL_REPORTFAULT);
-#endif
+    die();
+}
 
-    abort();
+void
+rb_bug_for_fatal_signal(ruby_sighandler_t default_sighandler, int sig, const void *ctx, const char *fmt, ...)
+{
+    const char *file = NULL;
+    int line = 0;
+
+    if (GET_EC()) {
+	file = rb_source_location_cstr(&line);
+    }
+
+    report_bug(file, line, fmt, ctx);
+
+    if (default_sighandler) default_sighandler(sig);
+
+    die();
 }
 
+
 void
 rb_bug_errno(const char *mesg, int errno_arg)
 {
@@ -324,98 +703,161 @@ rb_async_bug_errno(const char *mesg, int errno_arg)
     }
     WRITE_CONST(2, "\n\n");
     write_or_abort(2, ruby_description, strlen(ruby_description));
-    WRITE_CONST(2, "\n\n");
-    WRITE_CONST(2, REPORTBUG_MSG);
     abort();
 }
 
 void
-rb_compile_bug(const char *file, int line, const char *fmt, ...)
+rb_report_bug_valist(VALUE file, int line, const char *fmt, va_list args)
 {
-    va_list args;
+    report_bug_valist(RSTRING_PTR(file), line, fmt, NULL, args);
+}
 
-    va_start(args, fmt);
-    report_bug(file, line, fmt, args);
-    va_end(args);
+MJIT_FUNC_EXPORTED 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);
+    preface_dump(out);
+    rb_vm_bugreport(NULL);
+    bug_report_end(out);
+    die();
+}
+
+static const char builtin_types[][10] = {
+    "", 			/* 0x00, */
+    "Object",
+    "Class",
+    "Module",
+    "Float",
+    "String",
+    "Regexp",
+    "Array",
+    "Hash",
+    "Struct",
+    "Bignum",
+    "File",
+    "Data",			/* internal use: wrapped C pointers */
+    "MatchData",		/* data of $~ */
+    "Complex",
+    "Rational",
+    "",				/* 0x10 */
+    "nil",
+    "true",
+    "false",
+    "Symbol",			/* :symbol */
+    "Fixnum",
+    "undef",			/* internal use: #undef; should not happen */
+    "",				/* 0x17 */
+    "",				/* 0x18 */
+    "",				/* 0x19 */
+    "Memo",			/* internal use: general memo */
+    "Node",			/* internal use: syntax tree node */
+    "iClass",			/* internal use: mixed-in module holder */
+};
 
-    abort();
+const char *
+rb_builtin_type_name(int t)
+{
+    const char *name;
+    if ((unsigned int)t >= numberof(builtin_types)) return 0;
+    name = builtin_types[t];
+    if (*name) return name;
+    return 0;
 }
 
-static const struct types {
-    int type;
-    const char *name;
-} builtin_types[] = {
-    {T_NIL,	"nil"},
-    {T_OBJECT,	"Object"},
-    {T_CLASS,	"Class"},
-    {T_ICLASS,	"iClass"},	/* internal use: mixed-in module holder */
-    {T_MODULE,	"Module"},
-    {T_FLOAT,	"Float"},
-    {T_STRING,	"String"},
-    {T_REGEXP,	"Regexp"},
-    {T_ARRAY,	"Array"},
-    {T_FIXNUM,	"Fixnum"},
-    {T_HASH,	"Hash"},
-    {T_STRUCT,	"Struct"},
-    {T_BIGNUM,	"Bignum"},
-    {T_FILE,	"File"},
-    {T_RATIONAL,"Rational"},
-    {T_COMPLEX, "Complex"},
-    {T_TRUE,	"true"},
-    {T_FALSE,	"false"},
-    {T_SYMBOL,	"Symbol"},	/* :symbol */
-    {T_DATA,	"Data"},	/* internal use: wrapped C pointers */
-    {T_MATCH,	"MatchData"},	/* data of $~ */
-    {T_NODE,	"Node"},	/* internal use: syntax tree node */
-    {T_UNDEF,	"undef"},	/* internal use: #undef; should not happen */
-};
+static const char *
+builtin_class_name(VALUE x)
+{
+    const char *etype;
+
+    if (NIL_P(x)) {
+	etype = "nil";
+    }
+    else if (FIXNUM_P(x)) {
+	etype = "Integer";
+    }
+    else if (SYMBOL_P(x)) {
+	etype = "Symbol";
+    }
+    else if (RB_TYPE_P(x, T_TRUE)) {
+	etype = "true";
+    }
+    else if (RB_TYPE_P(x, T_FALSE)) {
+	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)
 {
-    const struct types *type = builtin_types;
-    const struct types *const typeend = builtin_types +
-	sizeof(builtin_types) / sizeof(builtin_types[0]);
     int xt;
 
     if (x == Qundef) {
-	rb_bug("undef leaked to the Ruby space");
+	rb_bug(UNDEF_LEAKED);
     }
 
     xt = TYPE(x);
     if (xt != t || (xt == T_DATA && RTYPEDDATA_P(x))) {
-	while (type < typeend) {
-	    if (type->type == t) {
-		const char *etype;
-
-		if (NIL_P(x)) {
-		    etype = "nil";
-		}
-		else if (FIXNUM_P(x)) {
-		    etype = "Fixnum";
-		}
-		else if (SYMBOL_P(x)) {
-		    etype = "Symbol";
-		}
-		else if (rb_special_const_p(x)) {
-		    x = rb_obj_as_string(x);
-		    etype = StringValuePtr(x);
-		}
-		else {
-		    etype = rb_obj_classname(x);
-		}
-		rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
-			 etype, type->name);
-	    }
-	    type++;
-	}
-	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, xt, t);
     }
 }
 
+void
+rb_unexpected_type(VALUE x, int t)
+{
+    if (x == Qundef) {
+	rb_bug(UNDEF_LEAKED);
+    }
+
+    unexpected_type(x, TYPE(x), t);
+}
+
 int
 rb_typeddata_inherited_p(const rb_data_type_t *child, const rb_data_type_t *parent)
 {
@@ -429,29 +871,41 @@ rb_typeddata_inherited_p(const rb_data_type_t *child, const rb_data_type_t *pare
 int
 rb_typeddata_is_kind_of(VALUE obj, const rb_data_type_t *data_type)
 {
-    if (SPECIAL_CONST_P(obj) || BUILTIN_TYPE(obj) != T_DATA ||
+    if (!RB_TYPE_P(obj, T_DATA) ||
 	!RTYPEDDATA_P(obj) || !rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) {
 	return 0;
     }
     return 1;
 }
 
+#undef rb_typeddata_is_instance_of
+int
+rb_typeddata_is_instance_of(VALUE obj, const rb_data_type_t *data_type)
+{
+    return rb_typeddata_is_instance_of_inline(obj, data_type);
+}
+
 void *
 rb_check_typeddata(VALUE obj, const rb_data_type_t *data_type)
 {
     const char *etype;
-    static const char mesg[] = "wrong argument type %s (expected %s)";
 
-    if (SPECIAL_CONST_P(obj) || BUILTIN_TYPE(obj) != T_DATA) {
-	Check_Type(obj, T_DATA);
+    if (!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);
     }
     if (!RTYPEDDATA_P(obj)) {
-	etype = rb_obj_classname(obj);
-	rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name);
+	goto wrong_type;
     }
     else if (!rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) {
 	etype = RTYPEDDATA_TYPE(obj)->wrap_struct_name;
-	rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name);
+	goto wrong_datatype;
     }
     return DATA_PTR(obj);
 }
@@ -464,6 +918,7 @@ VALUE rb_eSignal;
 VALUE rb_eFatal;
 VALUE rb_eStandardError;
 VALUE rb_eRuntimeError;
+VALUE rb_eFrozenError;
 VALUE rb_eTypeError;
 VALUE rb_eArgError;
 VALUE rb_eIndexError;
@@ -477,6 +932,7 @@ VALUE rb_eSecurityError;
 VALUE rb_eNotImpError;
 VALUE rb_eNoMemError;
 VALUE rb_cNameErrorMesg;
+VALUE rb_eNoMatchingPatternError;
 
 VALUE rb_eScriptError;
 VALUE rb_eSyntaxError;
@@ -486,25 +942,46 @@ VALUE rb_eSystemCallError;
 VALUE rb_mErrno;
 static VALUE rb_eNOERROR;
 
-#undef rb_exc_new2
+ID ruby_static_id_cause;
+#define id_cause ruby_static_id_cause
+static ID id_message, id_backtrace;
+static ID id_key, id_args, id_Errno, id_errno, id_i_path;
+static ID id_receiver, id_recv, id_iseq, id_local_variables;
+static ID id_private_call_p, id_top, id_bottom;
+#define id_bt idBt
+#define id_bt_locations idBt_locations
+#define id_mesg idMesg
+#define id_name idName
+
+#undef rb_exc_new_cstr
 
 VALUE
 rb_exc_new(VALUE etype, const char *ptr, long len)
 {
-    return rb_funcall(etype, rb_intern("new"), 1, rb_str_new(ptr, len));
+    VALUE mesg = rb_str_new(ptr, len);
+    return rb_class_new_instance(1, &mesg, etype);
 }
 
 VALUE
-rb_exc_new2(VALUE etype, const char *s)
+rb_exc_new_cstr(VALUE etype, const char *s)
 {
     return rb_exc_new(etype, s, strlen(s));
 }
 
 VALUE
-rb_exc_new3(VALUE etype, VALUE str)
+rb_exc_new_str(VALUE etype, VALUE str)
 {
     StringValue(str);
-    return rb_funcall(etype, rb_intern("new"), 1, str);
+    return rb_class_new_instance(1, &str, etype);
+}
+
+static VALUE
+exc_init(VALUE exc, VALUE mesg)
+{
+    rb_ivar_set(exc, id_mesg, mesg);
+    rb_ivar_set(exc, id_bt, Qnil);
+
+    return exc;
 }
 
 /*
@@ -520,11 +997,8 @@ exc_initialize(int argc, VALUE *argv, VALUE exc)
 {
     VALUE arg;
 
-    rb_scan_args(argc, argv, "01", &arg);
-    rb_iv_set(exc, "mesg", arg);
-    rb_iv_set(exc, "bt", Qnil);
-
-    return exc;
+    arg = (!rb_check_arity(argc, 0, 1) ? Qnil : argv[0]);
+    return exc_init(exc, arg);
 }
 
 /*
@@ -545,11 +1019,11 @@ exc_exception(int argc, VALUE *argv, VALUE self)
 {
     VALUE exc;
 
+    argc = rb_check_arity(argc, 0, 1);
     if (argc == 0) return self;
     if (argc == 1 && self == argv[0]) return self;
     exc = rb_obj_clone(self);
-    exc_initialize(argc, argv, exc);
-
+    rb_ivar_set(exc, id_mesg, argv[0]);
     return exc;
 }
 
@@ -564,13 +1038,97 @@ exc_exception(int argc, VALUE *argv, VALUE self)
 static VALUE
 exc_to_s(VALUE exc)
 {
-    VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
-    VALUE r = Qnil;
+    VALUE mesg = rb_attr_get(exc, idMesg);
 
     if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
-    r = rb_String(mesg);
-    OBJ_INFECT(r, exc);
-    return r;
+    return rb_String(mesg);
+}
+
+/* FIXME: Include eval_error.c */
+void rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE highlight, VALUE reverse);
+
+VALUE
+rb_get_message(VALUE exc)
+{
+    VALUE e = rb_check_funcall(exc, id_message, 0, 0);
+    if (e == Qundef) return Qnil;
+    if (!RB_TYPE_P(e, T_STRING)) e = rb_check_string_type(e);
+    return e;
+}
+
+/*
+ * call-seq:
+ *    Exception.to_tty?   ->  true or false
+ *
+ * Returns +true+ if exception messages will be sent to a tty.
+ */
+static VALUE
+exc_s_to_tty_p(VALUE self)
+{
+    return rb_stderr_tty_p() ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *   exception.full_message(highlight: bool, order: [:top or :bottom]) ->  string
+ *
+ * Returns formatted string of _exception_.
+ * The returned string is formatted using the same format that Ruby uses
+ * when printing an uncaught exceptions to stderr.
+ *
+ * If _highlight_ is +true+ the default error handler will send the
+ * messages to a tty.
+ *
+ * _order_ must be either of +:top+ or +:bottom+, and places the error
+ * message and the innermost backtrace come at the top or the bottom.
+ *
+ * The default values of these options depend on <code>$stderr</code>
+ * and its +tty?+ at the timing of a call.
+ */
+
+static VALUE
+exc_full_message(int argc, VALUE *argv, VALUE exc)
+{
+    VALUE opt, str, emesg, errat;
+    enum {kw_highlight, kw_order, kw_max_};
+    static ID kw[kw_max_];
+    VALUE args[kw_max_] = {Qnil, Qnil};
+
+    rb_scan_args(argc, argv, "0:", &opt);
+    if (!NIL_P(opt)) {
+	if (!kw[0]) {
+#define INIT_KW(n) kw[kw_##n] = rb_intern_const(#n)
+	    INIT_KW(highlight);
+	    INIT_KW(order);
+#undef INIT_KW
+	}
+	rb_get_kwargs(opt, kw, 0, kw_max_, args);
+	switch (args[kw_highlight]) {
+	  default:
+	    rb_raise(rb_eArgError, "expected true or false as "
+		     "highlight: %+"PRIsVALUE, args[kw_highlight]);
+	  case Qundef: args[kw_highlight] = Qnil; break;
+	  case Qtrue: case Qfalse: case Qnil: break;
+	}
+	if (args[kw_order] == Qundef) {
+	    args[kw_order] = Qnil;
+	}
+	else {
+	    ID id = rb_check_id(&args[kw_order]);
+	    if (id == id_bottom) args[kw_order] = Qtrue;
+	    else if (id == id_top) args[kw_order] = Qfalse;
+	    else {
+		rb_raise(rb_eArgError, "expected :top or :bottom as "
+			 "order: %+"PRIsVALUE, args[kw_order]);
+	    }
+	}
+    }
+    str = rb_str_new2("");
+    errat = rb_get_backtrace(exc);
+    emesg = rb_get_message(exc);
+
+    rb_error_write(exc, emesg, errat, str, args[kw_highlight], args[kw_order]);
+    return str;
 }
 
 /*
@@ -578,22 +1136,20 @@ exc_to_s(VALUE exc)
  *   exception.message   ->  string
  *
  * Returns the result of invoking <code>exception.to_s</code>.
- * Normally this returns the exception's message or name. By
- * supplying a to_str method, exceptions are agreeing to
- * be used where Strings are expected.
+ * Normally this returns the exception's message or name.
  */
 
 static VALUE
 exc_message(VALUE exc)
 {
-    return rb_funcall(exc, rb_intern("to_s"), 0, 0);
+    return rb_funcallv(exc, idTo_s, 0, 0);
 }
 
 /*
  * call-seq:
  *   exception.inspect   -> string
  *
- * Return this exception's class name an message
+ * Return this exception's class name and message.
  */
 
 static VALUE
@@ -604,7 +1160,7 @@ exc_inspect(VALUE exc)
     klass = CLASS_OF(exc);
     exc = rb_obj_as_string(exc);
     if (RSTRING_LEN(exc) == 0) {
-	return rb_str_dup(rb_class_name(klass));
+        return rb_class_name(klass);
     }
 
     str = rb_str_buf_new2("#<");
@@ -619,7 +1175,7 @@ exc_inspect(VALUE exc)
 
 /*
  *  call-seq:
- *     exception.backtrace    -> array
+ *     exception.backtrace    -> array or nil
  *
  *  Returns any backtrace associated with the exception. The backtrace
  *  is an array of strings, each containing either ``filename:lineNo: in
@@ -644,32 +1200,89 @@ exc_inspect(VALUE exc)
  *     prog.rb:2:in `a'
  *     prog.rb:6:in `b'
  *     prog.rb:10
+ *
+ *  In the case no backtrace has been set, +nil+ is returned
+ *
+ *    ex = StandardError.new
+ *    ex.backtrace
+ *    #=> nil
 */
 
 static VALUE
 exc_backtrace(VALUE exc)
 {
-    ID bt;
+    VALUE obj;
+
+    obj = rb_attr_get(exc, id_bt);
 
-    CONST_ID(bt, "bt");
-    return rb_attr_get(exc, bt);
+    if (rb_backtrace_p(obj)) {
+	obj = rb_backtrace_to_str_ary(obj);
+	/* rb_ivar_set(exc, id_bt, obj); */
+    }
+
+    return obj;
 }
 
+static VALUE rb_check_backtrace(VALUE);
+
 VALUE
+rb_get_backtrace(VALUE exc)
+{
+    ID mid = id_backtrace;
+    VALUE info;
+    if (rb_method_basic_definition_p(CLASS_OF(exc), id_backtrace)) {
+	VALUE klass = rb_eException;
+	rb_execution_context_t *ec = GET_EC();
+	if (NIL_P(exc))
+	    return Qnil;
+	EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, exc, mid, mid, klass, Qundef);
+	info = exc_backtrace(exc);
+	EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, exc, mid, mid, klass, info);
+    }
+    else {
+	info = rb_funcallv(exc, mid, 0, 0);
+    }
+    if (NIL_P(info)) return Qnil;
+    return rb_check_backtrace(info);
+}
+
+/*
+ *  call-seq:
+ *     exception.backtrace_locations    -> array or nil
+ *
+ *  Returns any backtrace associated with the exception. This method is
+ *  similar to Exception#backtrace, but the backtrace is an array of
+ *  Thread::Backtrace::Location.
+ *
+ *  This method is not affected by Exception#set_backtrace().
+ */
+static VALUE
+exc_backtrace_locations(VALUE exc)
+{
+    VALUE obj;
+
+    obj = rb_attr_get(exc, id_bt_locations);
+    if (!NIL_P(obj)) {
+	obj = rb_backtrace_to_location_ary(obj);
+    }
+    return obj;
+}
+
+static VALUE
 rb_check_backtrace(VALUE bt)
 {
     long i;
     static const char err[] = "backtrace must be Array of String";
 
     if (!NIL_P(bt)) {
-	int t = TYPE(bt);
-
-	if (t == T_STRING) return rb_ary_new3(1, bt);
-	if (t != T_ARRAY) {
+	if (RB_TYPE_P(bt, T_STRING)) return rb_ary_new3(1, bt);
+	if (rb_backtrace_p(bt)) return bt;
+	if (!RB_TYPE_P(bt, T_ARRAY)) {
 	    rb_raise(rb_eTypeError, err);
 	}
 	for (i=0;i<RARRAY_LEN(bt);i++) {
-	    if (TYPE(RARRAY_PTR(bt)[i]) != T_STRING) {
+	    VALUE e = RARRAY_AREF(bt, i);
+	    if (!RB_TYPE_P(e, T_STRING)) {
 		rb_raise(rb_eTypeError, err);
 	    }
 	}
@@ -679,25 +1292,52 @@ rb_check_backtrace(VALUE bt)
 
 /*
  *  call-seq:
- *     exc.set_backtrace(array)   ->  array
+ *     exc.set_backtrace(backtrace)   ->  array
  *
- *  Sets the backtrace information associated with <i>exc</i>. The
- *  argument must be an array of <code>String</code> objects in the
- *  format described in <code>Exception#backtrace</code>.
+ *  Sets the backtrace information associated with +exc+. The +backtrace+ must
+ *  be an array of String objects or a single String in the format described
+ *  in Exception#backtrace.
  *
  */
 
 static VALUE
 exc_set_backtrace(VALUE exc, VALUE bt)
 {
-    return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
+    return rb_ivar_set(exc, id_bt, rb_check_backtrace(bt));
+}
+
+MJIT_FUNC_EXPORTED VALUE
+rb_exc_set_backtrace(VALUE exc, VALUE bt)
+{
+    return exc_set_backtrace(exc, bt);
+}
+
+/*
+ * call-seq:
+ *   exception.cause   -> an_exception or nil
+ *
+ * Returns the previous exception ($!) at the time this exception was raised.
+ * This is useful for wrapping exceptions and retaining the original exception
+ * information.
+ */
+
+static VALUE
+exc_cause(VALUE exc)
+{
+    return rb_attr_get(exc, id_cause);
+}
+
+static VALUE
+try_convert_to_exception(VALUE obj)
+{
+    return rb_check_funcall(obj, idException, 0, 0);
 }
 
 /*
  *  call-seq:
  *     exc == obj   -> true or false
  *
- *  Equality---If <i>obj</i> is not an <code>Exception</code>, returns
+ *  Equality---If <i>obj</i> is not an Exception, returns
  *  <code>false</code>. Otherwise, returns <code>true</code> if <i>exc</i> and
  *  <i>obj</i> share same class, messages, and backtrace.
  */
@@ -706,16 +1346,18 @@ static VALUE
 exc_equal(VALUE exc, VALUE obj)
 {
     VALUE mesg, backtrace;
-    ID id_mesg;
 
     if (exc == obj) return Qtrue;
-    CONST_ID(id_mesg, "mesg");
 
     if (rb_obj_class(exc) != rb_obj_class(obj)) {
-	ID id_message, id_backtrace;
-	CONST_ID(id_message, "message");
-	CONST_ID(id_backtrace, "backtrace");
+	int state;
 
+	obj = rb_protect(try_convert_to_exception, obj, &state);
+	if (state || obj == Qundef) {
+	    rb_set_errinfo(Qnil);
+	    return Qfalse;
+	}
+	if (rb_obj_class(exc) != rb_obj_class(obj)) return Qfalse;
 	mesg = rb_check_funcall(obj, id_message, 0, 0);
 	if (mesg == Qundef) return Qfalse;
 	backtrace = rb_check_funcall(obj, id_backtrace, 0, 0);
@@ -735,28 +1377,62 @@ exc_equal(VALUE exc, VALUE obj)
 
 /*
  * call-seq:
- *   SystemExit.new(status=0)   -> system_exit
- *
- * Create a new +SystemExit+ exception with the given status.
+ *   SystemExit.new              -> system_exit
+ *   SystemExit.new(status)      -> system_exit
+ *   SystemExit.new(status, msg) -> system_exit
+ *   SystemExit.new(msg)         -> system_exit
+ *
+ * Create a new +SystemExit+ exception with the given status and message.
+ * Status is true, false, or an integer.
+ * If status is not given, true is used.
  */
 
 static VALUE
 exit_initialize(int argc, VALUE *argv, VALUE exc)
 {
-    VALUE status = INT2FIX(EXIT_SUCCESS);
-    if (argc > 0 && FIXNUM_P(argv[0])) {
-	status = *argv++;
-	--argc;
+    VALUE status;
+    if (argc > 0) {
+	status = *argv;
+
+	switch (status) {
+	  case Qtrue:
+	    status = INT2FIX(EXIT_SUCCESS);
+	    ++argv;
+	    --argc;
+	    break;
+	  case Qfalse:
+	    status = INT2FIX(EXIT_FAILURE);
+	    ++argv;
+	    --argc;
+	    break;
+	  default:
+	    status = rb_check_to_int(status);
+	    if (NIL_P(status)) {
+		status = INT2FIX(EXIT_SUCCESS);
+	    }
+	    else {
+#if EXIT_SUCCESS != 0
+		if (status == INT2FIX(0))
+		    status = INT2FIX(EXIT_SUCCESS);
+#endif
+		++argv;
+		--argc;
+	    }
+	    break;
+	}
+    }
+    else {
+	status = INT2FIX(EXIT_SUCCESS);
     }
     rb_call_super(argc, argv);
-    rb_iv_set(exc, "status", status);
+    rb_ivar_set(exc, id_status, status);
     return exc;
 }
 
 
 /*
  * call-seq:
- *   system_exit.status   -> fixnum
+ *   system_exit.status   -> integer
  *
  * Return the status value associated with this system exit.
  */
@@ -764,7 +1440,7 @@ exit_initialize(int argc, VALUE *argv, VALUE exc)
 static VALUE
 exit_status(VALUE exc)
 {
-    return rb_attr_get(exc, rb_intern("status"));
+    return rb_attr_get(exc, id_status);
 }
 
 
@@ -778,7 +1454,7 @@ exit_status(VALUE exc)
 static VALUE
 exit_success_p(VALUE exc)
 {
-    VALUE status_val = rb_attr_get(exc, rb_intern("status"));
+    VALUE status_val = rb_attr_get(exc, id_status);
     int status;
 
     if (NIL_P(status_val))
@@ -790,6 +1466,49 @@ exit_success_p(VALUE exc)
     return Qfalse;
 }
 
+static VALUE
+err_init_recv(VALUE exc, VALUE recv)
+{
+    if (recv != Qundef) rb_ivar_set(exc, id_recv, recv);
+    return exc;
+}
+
+/*
+ * call-seq:
+ *   FrozenError.new(msg=nil, receiver: nil)  -> frozen_error
+ *
+ * Construct a new FrozenError exception. If given the <i>receiver</i>
+ * parameter may subsequently be examined using the FrozenError#receiver
+ * method.
+ *
+ *    a = [].freeze
+ *    raise FrozenError.new("can't modify frozen array", receiver: a)
+ */
+
+static VALUE
+frozen_err_initialize(int argc, VALUE *argv, VALUE self)
+{
+    ID keywords[1];
+    VALUE values[numberof(keywords)], options;
+
+    argc = rb_scan_args(argc, argv, "*:", NULL, &options);
+    keywords[0] = id_receiver;
+    rb_get_kwargs(options, keywords, 0, numberof(values), values);
+    rb_call_super(argc, argv);
+    err_init_recv(self, values[0]);
+    return self;
+}
+
+/*
+ * Document-method: FrozenError#receiver
+ * call-seq:
+ *   frozen_error.receiver  -> object
+ *
+ * Return the receiver associated with this FrozenError exception.
+ */
+
+#define frozen_err_receiver name_err_receiver
+
 void
 rb_name_error(ID id, const char *fmt, ...)
 {
@@ -805,26 +1524,77 @@ rb_name_error(ID id, const char *fmt, ...)
     rb_exc_raise(exc);
 }
 
+void
+rb_name_error_str(VALUE str, const char *fmt, ...)
+{
+    VALUE exc, argv[2];
+    va_list args;
+
+    va_start(args, fmt);
+    argv[0] = rb_vsprintf(fmt, args);
+    va_end(args);
+
+    argv[1] = str;
+    exc = rb_class_new_instance(2, argv, rb_eNameError);
+    rb_exc_raise(exc);
+}
+
+static VALUE
+name_err_init_attr(VALUE exc, VALUE recv, VALUE method)
+{
+    const rb_execution_context_t *ec = GET_EC();
+    rb_control_frame_t *cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(ec->cfp);
+    cfp = rb_vm_get_ruby_level_next_cfp(ec, cfp);
+    rb_ivar_set(exc, id_name, method);
+    err_init_recv(exc, recv);
+    if (cfp) rb_ivar_set(exc, id_iseq, rb_iseqw_new(cfp->iseq));
+    return exc;
+}
+
 /*
  * call-seq:
- *   NameError.new(msg [, name])  -> name_error
+ *   NameError.new(msg=nil, name=nil, receiver: nil)  -> name_error
  *
  * Construct a new NameError exception. If given the <i>name</i>
- * parameter may subsequently be examined using the <code>NameError.name</code>
- * method.
+ * parameter may subsequently be examined using the NameError#name
+ * method. <i>receiver</i> parameter allows to pass object in
+ * context of which the error happened. Example:
+ *
+ *    [1, 2, 3].method(:rject) # NameError with name "rject" and receiver: Array
+ *    [1, 2, 3].singleton_method(:rject) # NameError with name "rject" and receiver: [1, 2, 3]
  */
 
 static VALUE
 name_err_initialize(int argc, VALUE *argv, VALUE self)
 {
-    VALUE name;
+    ID keywords[1];
+    VALUE values[numberof(keywords)], name, options;
 
+    argc = rb_scan_args(argc, argv, "*:", NULL, &options);
+    keywords[0] = id_receiver;
+    rb_get_kwargs(options, keywords, 0, numberof(values), values);
     name = (argc > 1) ? argv[--argc] : Qnil;
     rb_call_super(argc, argv);
-    rb_iv_set(self, "name", name);
+    name_err_init_attr(self, values[0], name);
     return self;
 }
 
+static VALUE rb_name_err_mesg_new(VALUE mesg, VALUE recv, VALUE method);
+
+static VALUE
+name_err_init(VALUE exc, VALUE mesg, VALUE recv, VALUE method)
+{
+    exc_init(exc, rb_name_err_mesg_new(mesg, recv, method));
+    return name_err_init_attr(exc, recv, method);
+}
+
+VALUE
+rb_name_err_new(VALUE mesg, VALUE recv, VALUE method)
+{
+    VALUE exc = rb_obj_alloc(rb_eNameError);
+    return name_err_init(exc, mesg, recv, method);
+}
+
 /*
  *  call-seq:
  *    name_error.name    ->  string or nil
@@ -835,52 +1605,85 @@ name_err_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 name_err_name(VALUE self)
 {
-    return rb_attr_get(self, rb_intern("name"));
+    return rb_attr_get(self, id_name);
 }
 
 /*
- * call-seq:
- *  name_error.to_s   -> string
+ *  call-seq:
+ *    name_error.local_variables  ->  array
+ *
+ *  Return a list of the local variable names defined where this
+ *  NameError exception was raised.
  *
- * Produce a nicely-formatted string representing the +NameError+.
+ *  Internal use only.
  */
 
 static VALUE
-name_err_to_s(VALUE exc)
+name_err_local_variables(VALUE self)
 {
-    VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
-    VALUE str = mesg;
+    VALUE vars = rb_attr_get(self, id_local_variables);
 
-    if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
-    StringValue(str);
-    if (str != mesg) {
-	rb_iv_set(exc, "mesg", mesg = str);
+    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);
     }
-    OBJ_INFECT(mesg, exc);
-    return mesg;
+    return vars;
+}
+
+static VALUE
+nometh_err_init_attr(VALUE exc, VALUE args, int priv)
+{
+    rb_ivar_set(exc, id_args, args);
+    rb_ivar_set(exc, id_private_call_p, priv ? Qtrue : Qfalse);
+    return exc;
 }
 
 /*
  * call-seq:
- *   NoMethodError.new(msg, name [, args])  -> no_method_error
+ *   NoMethodError.new(msg=nil, name=nil, args=nil, private=false, receiver: nil)  -> 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
  * the <code>#name</code> method on the resulting object, and the
  * arguments using the <code>#args</code> method.
+ *
+ * If <i>private</i> argument were passed, it designates method was
+ * attempted to call in private context, and can be accessed with
+ * <code>#private_call?</code> method.
+ *
+ * <i>receiver</i> argument stores an object whose method was called.
  */
 
 static VALUE
 nometh_err_initialize(int argc, VALUE *argv, VALUE self)
 {
-    VALUE args = (argc > 2) ? argv[--argc] : Qnil;
-    name_err_initialize(argc, argv, self);
-    rb_iv_set(self, "args", args);
-    return self;
+    int priv;
+    VALUE args, options;
+    argc = rb_scan_args(argc, argv, "*:", NULL, &options);
+    priv = (argc > 3) && (--argc, RTEST(argv[argc]));
+    args = (argc > 2) ? argv[--argc] : Qnil;
+    if (!NIL_P(options)) argv[argc++] = options;
+    rb_call_super_kw(argc, argv, RB_PASS_CALLED_KEYWORDS);
+    return nometh_err_init_attr(self, args, priv);
+}
+
+VALUE
+rb_nomethod_err_new(VALUE mesg, VALUE recv, VALUE method, VALUE args, int priv)
+{
+    VALUE exc = rb_obj_alloc(rb_eNoMethodError);
+    name_err_init(exc, mesg, recv, method);
+    return nometh_err_init_attr(exc, args, priv);
 }
 
 /* :nodoc: */
-#define NAME_ERR_MESG_COUNT 3
+enum {
+    NAME_ERR_MESG__MESG,
+    NAME_ERR_MESG__RECV,
+    NAME_ERR_MESG__NAME,
+    NAME_ERR_MESG_COUNT
+};
 
 static void
 name_err_mesg_mark(void *p)
@@ -894,7 +1697,7 @@ name_err_mesg_mark(void *p)
 static size_t
 name_err_mesg_memsize(const void *p)
 {
-    return p ? (NAME_ERR_MESG_COUNT * sizeof(VALUE)) : 0;
+    return NAME_ERR_MESG_COUNT * sizeof(VALUE);
 }
 
 static const rb_data_type_t name_err_mesg_data_type = {
@@ -904,22 +1707,20 @@ 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
 };
 
 /* :nodoc: */
-VALUE
-rb_name_err_mesg_new(VALUE obj, VALUE mesg, VALUE recv, VALUE method)
+static VALUE
+rb_name_err_mesg_new(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);
-    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);
+
+    ptr[NAME_ERR_MESG__MESG] = mesg;
+    ptr[NAME_ERR_MESG__RECV] = recv;
+    ptr[NAME_ERR_MESG__NAME] = method;
+    RTYPEDDATA_DATA(result) = ptr;
     return result;
 }
 
@@ -950,47 +1751,61 @@ name_err_mesg_to_str(VALUE obj)
     VALUE *ptr, mesg;
     TypedData_Get_Struct(obj, VALUE, &name_err_mesg_data_type, ptr);
 
-    mesg = ptr[0];
+    mesg = ptr[NAME_ERR_MESG__MESG];
     if (NIL_P(mesg)) return Qnil;
     else {
-	const char *desc = 0;
-	VALUE d = 0, args[NAME_ERR_MESG_COUNT];
-
-	obj = ptr[1];
-	switch (TYPE(obj)) {
-	  case T_NIL:
-	    desc = "nil";
+	struct RString s_str, d_str;
+	VALUE c, s, d = 0, args[4];
+	int state = 0, singleton = 0;
+	rb_encoding *usascii = rb_usascii_encoding();
+
+#define FAKE_CSTR(v, str) rb_setup_fake_str((v), (str), rb_strlen_lit(str), usascii)
+	obj = ptr[NAME_ERR_MESG__RECV];
+	switch (obj) {
+	  case Qnil:
+	    d = FAKE_CSTR(&d_str, "nil");
 	    break;
-	  case T_TRUE:
-	    desc = "true";
+	  case Qtrue:
+	    d = FAKE_CSTR(&d_str, "true");
 	    break;
-	  case T_FALSE:
-	    desc = "false";
+	  case Qfalse:
+	    d = FAKE_CSTR(&d_str, "false");
 	    break;
 	  default:
-	    d = rb_protect(rb_inspect, obj, 0);
+	    d = rb_protect(rb_inspect, obj, &state);
+	    if (state)
+		rb_set_errinfo(Qnil);
 	    if (NIL_P(d) || RSTRING_LEN(d) > 65) {
 		d = rb_any_to_s(obj);
 	    }
-	    desc = RSTRING_PTR(d);
+	    singleton = (RSTRING_LEN(d) > 0 && RSTRING_PTR(d)[0] == '#');
 	    break;
 	}
-	if (desc && desc[0] != '#') {
-	    d = d ? rb_str_dup(d) : rb_str_new2(desc);
-	    rb_str_cat2(d, ":");
-	    rb_str_cat2(d, rb_obj_classname(obj));
+	if (!singleton) {
+	    s = FAKE_CSTR(&s_str, ":");
+	    c = rb_class_name(CLASS_OF(obj));
 	}
-	args[0] = mesg;
-	args[1] = ptr[2];
-	args[2] = d;
-	mesg = rb_f_sprintf(NAME_ERR_MESG_COUNT, args);
+	else {
+	    c = s = FAKE_CSTR(&s_str, "");
+	}
+        args[0] = 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);
     }
-    OBJ_INFECT(mesg, obj);
     return mesg;
 }
 
 /* :nodoc: */
 static VALUE
+name_err_mesg_dump(VALUE obj, VALUE limit)
+{
+    return name_err_mesg_to_str(obj);
+}
+
+/* :nodoc: */
+static VALUE
 name_err_mesg_load(VALUE klass, VALUE str)
 {
     return str;
@@ -998,6 +1813,29 @@ 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_recv, 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
@@ -1007,33 +1845,141 @@ name_err_mesg_load(VALUE klass, VALUE str)
 static VALUE
 nometh_err_args(VALUE self)
 {
-    return rb_attr_get(self, rb_intern("args"));
+    return rb_attr_get(self, id_args);
+}
+
+/*
+ * call-seq:
+ *   no_method_error.private_call?  -> true or false
+ *
+ * Return true if the caused method was called as private.
+ */
+
+static VALUE
+nometh_err_private_call_p(VALUE self)
+{
+    return rb_attr_get(self, id_private_call_p);
 }
 
 void
 rb_invalid_str(const char *str, const char *type)
 {
-    volatile VALUE s = rb_str_inspect(rb_str_new2(str));
+    VALUE s = rb_str_new2(str);
+
+    rb_raise(rb_eArgError, "invalid value for %s: %+"PRIsVALUE, type, s);
+}
+
+/*
+ * call-seq:
+ *   key_error.receiver  -> object
+ *
+ * Return the receiver associated with this KeyError exception.
+ */
+
+static VALUE
+key_err_receiver(VALUE self)
+{
+    VALUE recv;
+
+    recv = rb_ivar_lookup(self, id_receiver, Qundef);
+    if (recv != Qundef) return recv;
+    rb_raise(rb_eArgError, "no receiver is available");
+}
+
+/*
+ * call-seq:
+ *   key_error.key  -> object
+ *
+ * Return the key caused this KeyError exception.
+ */
+
+static VALUE
+key_err_key(VALUE self)
+{
+    VALUE key;
+
+    key = rb_ivar_lookup(self, id_key, Qundef);
+    if (key != Qundef) return key;
+    rb_raise(rb_eArgError, "no key is available");
+}
+
+VALUE
+rb_key_err_new(VALUE mesg, VALUE recv, VALUE key)
+{
+    VALUE exc = rb_obj_alloc(rb_eKeyError);
+    rb_ivar_set(exc, id_mesg, mesg);
+    rb_ivar_set(exc, id_bt, Qnil);
+    rb_ivar_set(exc, id_key, key);
+    rb_ivar_set(exc, id_receiver, recv);
+    return exc;
+}
+
+/*
+ * call-seq:
+ *   KeyError.new(message=nil, receiver: nil, key: nil) -> key_error
+ *
+ * Construct a new +KeyError+ exception with the given message,
+ * receiver and key.
+ */
+
+static VALUE
+key_err_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE options;
+
+    rb_call_super(rb_scan_args(argc, argv, "01:", NULL, &options), argv);
+
+    if (!NIL_P(options)) {
+	ID keywords[2];
+	VALUE values[numberof(keywords)];
+	int i;
+	keywords[0] = id_receiver;
+	keywords[1] = id_key;
+	rb_get_kwargs(options, keywords, 0, numberof(values), values);
+	for (i = 0; i < numberof(values); ++i) {
+	    if (values[i] != Qundef) {
+		rb_ivar_set(self, keywords[i], values[i]);
+	    }
+	}
+    }
+
+    return self;
+}
+
+/*
+ * call-seq:
+ *   SyntaxError.new([msg])  -> syntax_error
+ *
+ * Construct a SyntaxError exception.
+ */
 
-    rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING_PTR(s));
+static VALUE
+syntax_error_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE mesg;
+    if (argc == 0) {
+	mesg = rb_fstring_lit("compile error");
+	argc = 1;
+	argv = &mesg;
+    }
+    return rb_call_super(argc, argv);
 }
 
 /*
  *  Document-module: Errno
  *
- *  Ruby exception objects are subclasses of <code>Exception</code>.
- *  However, operating systems typically report errors using plain
- *  integers. Module <code>Errno</code> is created dynamically to map
- *  these operating system errors to Ruby classes, with each error
- *  number generating its own subclass of <code>SystemCallError</code>.
- *  As the subclass is created in module <code>Errno</code>, its name
- *  will start <code>Errno::</code>.
+ *  Ruby exception objects are subclasses of Exception.  However,
+ *  operating systems typically report errors using plain
+ *  integers. Module Errno is created dynamically to map these
+ *  operating system errors to Ruby classes, with each error number
+ *  generating its own subclass of SystemCallError.  As the subclass
+ *  is created in module Errno, its name will start
+ *  <code>Errno::</code>.
  *
- *  The names of the <code>Errno::</code> classes depend on
- *  the environment in which Ruby runs. On a typical Unix or Windows
- *  platform, there are <code>Errno</code> classes such as
- *  <code>Errno::EACCES</code>, <code>Errno::EAGAIN</code>,
- *  <code>Errno::EINTR</code>, and so on.
+ *  The names of the <code>Errno::</code> classes depend on the
+ *  environment in which Ruby runs. On a typical Unix or Windows
+ *  platform, there are Errno classes such as Errno::EACCES,
+ *  Errno::EAGAIN, Errno::EINTR, and so on.
  *
  *  The integer operating system error number corresponding to a
  *  particular error is available as the class constant
@@ -1044,7 +1990,7 @@ rb_invalid_str(const char *str, const char *type)
  *     Errno::EINTR::Errno    #=> 4
  *
  *  The full list of operating system errors on your particular platform
- *  are available as the constants of <code>Errno</code>.
+ *  are available as the constants of Errno.
  *
  *     Errno.constants   #=> :E2BIG, :EACCES, :EADDRINUSE, :EADDRNOTAVAIL, ...
  */
@@ -1058,6 +2004,24 @@ set_syserr(int n, const char *name)
 
     if (!st_lookup(syserr_tbl, n, &error)) {
 	error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError);
+
+	/* capture nonblock errnos for WaitReadable/WaitWritable subclasses */
+	switch (n) {
+	  case EAGAIN:
+	    rb_eEAGAIN = error;
+
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+	    break;
+	  case EWOULDBLOCK:
+#endif
+
+	    rb_eEWOULDBLOCK = error;
+	    break;
+	  case EINPROGRESS:
+	    rb_eEINPROGRESS = error;
+	    break;
+	}
+
 	rb_define_const(error, "Errno", INT2NUM(n));
 	st_add_direct(syserr_tbl, n, error);
     }
@@ -1085,11 +2049,10 @@ get_syserr(int n)
  * call-seq:
  *   SystemCallError.new(msg, errno)  -> system_call_error_subclass
  *
- * If _errno_ corresponds to a known system error code, constructs
- * the appropriate <code>Errno</code> class for that error, otherwise
- * constructs a generic <code>SystemCallError</code> object. The
- * error number is subsequently available via the <code>errno</code>
- * method.
+ * If _errno_ corresponds to a known system error code, constructs the
+ * appropriate Errno class for that error, otherwise constructs a
+ * generic SystemCallError object. The error number is subsequently
+ * available via the #errno method.
  */
 
 static VALUE
@@ -1099,57 +2062,48 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
     char *strerror();
 #endif
     const char *err;
-    VALUE mesg, error;
+    VALUE mesg, error, func, errmsg;
     VALUE klass = rb_obj_class(self);
 
     if (klass == rb_eSystemCallError) {
 	st_data_t data = (st_data_t)klass;
-	rb_scan_args(argc, argv, "11", &mesg, &error);
+	rb_scan_args(argc, argv, "12", &mesg, &error, &func);
 	if (argc == 1 && FIXNUM_P(mesg)) {
 	    error = mesg; mesg = Qnil;
 	}
 	if (!NIL_P(error) && st_lookup(syserr_tbl, NUM2LONG(error), &data)) {
 	    klass = (VALUE)data;
 	    /* change class */
-	    if (TYPE(self) != T_OBJECT) { /* insurance to avoid type crash */
+	    if (!RB_TYPE_P(self, T_OBJECT)) { /* insurance to avoid type crash */
 		rb_raise(rb_eTypeError, "invalid instance type");
 	    }
-	    RBASIC(self)->klass = klass;
+	    RBASIC_SET_CLASS(self, klass);
 	}
     }
     else {
-	rb_scan_args(argc, argv, "01", &mesg);
-	error = rb_const_get(klass, rb_intern("Errno"));
+	rb_scan_args(argc, argv, "02", &mesg, &func);
+	error = rb_const_get(klass, id_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 = mesg;
-
-	StringValue(str);
-	mesg = rb_sprintf("%s - %.*s", err,
-			  (int)RSTRING_LEN(str), RSTRING_PTR(str));
-	if (le == rb_usascii_encoding()) {
-	    rb_encoding *me = rb_enc_get(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());
+	VALUE str = StringValue(mesg);
+
+	if (!NIL_P(func)) rb_str_catf(errmsg, " @ %"PRIsVALUE, func);
+	rb_str_catf(errmsg, " - %"PRIsVALUE, str);
     }
+    mesg = errmsg;
+
     rb_call_super(1, &mesg);
-    rb_iv_set(self, "errno", error);
+    rb_ivar_set(self, id_errno, error);
     return self;
 }
 
 /*
  * call-seq:
- *   system_call_error.errno   -> fixnum
+ *   system_call_error.errno   -> integer
  *
  * Return this SystemCallError's error number.
  */
@@ -1157,7 +2111,7 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 syserr_errno(VALUE self)
 {
-    return rb_attr_get(self, rb_intern("errno"));
+    return rb_attr_get(self, id_errno);
 }
 
 /*
@@ -1172,20 +2126,17 @@ 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, en)) return Qfalse;
+	if (!rb_respond_to(exc, id_errno)) return Qfalse;
     }
     else if (self == rb_eSystemCallError) return Qtrue;
 
-    num = rb_attr_get(exc, rb_intern("errno"));
+    num = rb_attr_get(exc, id_errno);
     if (NIL_P(num)) {
-	num = rb_funcall(exc, en, 0, 0);
+	num = rb_funcallv(exc, id_errno, 0, 0);
     }
-    e = rb_const_get(self, rb_intern("Errno"));
+    e = rb_const_get(self, id_Errno);
     if (FIXNUM_P(num) ? num == e : rb_equal(num, e))
 	return Qtrue;
     return Qfalse;
@@ -1227,6 +2178,7 @@ syserr_eqq(VALUE self, VALUE exc)
  *
  *     begin
  *       Process.kill('HUP',Process.pid)
+ *       sleep # wait for receiver to handle signal sent by Process.kill
  *     rescue SignalException => e
  *       puts "received Exception #{e}"
  *     end
@@ -1239,8 +2191,8 @@ syserr_eqq(VALUE self, VALUE exc)
 /*
  *  Document-class: Interrupt
  *
- *  Raised with the interrupt signal is received, typically because the
- *  user pressed on Control-C (on most posix platforms). As such, it is a
+ *  Raised when the interrupt signal is received, typically because the
+ *  user has pressed Control-C (on most posix platforms). As such, it is a
  *  subclass of +SignalException+.
  *
  *     begin
@@ -1268,7 +2220,7 @@ syserr_eqq(VALUE self, VALUE exc)
  *
  *  <em>raises the exception:</em>
  *
- *     TypeError: can't convert String into Integer
+ *     TypeError: no implicit conversion of String into Integer
  *
  */
 
@@ -1284,7 +2236,7 @@ syserr_eqq(VALUE self, VALUE exc)
  *
  *  <em>raises the exception:</em>
  *
- *     ArgumentError: wrong number of arguments (2 for 1)
+ *     ArgumentError: wrong number of arguments (given 2, expected 1)
  *
  *  Ex: passing an argument that is not acceptable:
  *
@@ -1392,7 +2344,7 @@ syserr_eqq(VALUE self, VALUE exc)
  *
  *  Since constant names must start with a capital:
  *
- *     Fixnum.const_set :answer, 42
+ *     Integer.const_set :answer, 42
  *
  *  <em>raises the exception:</em>
  *
@@ -1413,17 +2365,22 @@ syserr_eqq(VALUE self, VALUE exc)
  */
 
 /*
- *  Document-class: RuntimeError
+ *  Document-class: FrozenError
  *
- *  A generic error class raised when an invalid operation is attempted.
+ *  Raised when there is an attempt to modify a frozen object.
  *
  *     [1, 2, 3].freeze << 4
  *
  *  <em>raises the exception:</em>
  *
- *     RuntimeError: can't modify frozen array
+ *     FrozenError: can't modify frozen Array
+ */
+
+/*
+ *  Document-class: RuntimeError
  *
- *  Kernel.raise will raise a RuntimeError if no Exception class is
+ *  A generic error class raised when an invalid operation is attempted.
+ *  Kernel#raise will raise a RuntimeError if no Exception class is
  *  specified.
  *
  *     raise "ouch"
@@ -1436,19 +2393,7 @@ syserr_eqq(VALUE self, VALUE exc)
 /*
  *  Document-class: SecurityError
  *
- *  Raised when attempting a potential unsafe operation, typically when
- *  the $SAFE level is raised above 0.
- *
- *     foo = "bar"
- *     proc = Proc.new do
- *       $SAFE = 4
- *       foo.gsub! "a", "*"
- *     end
- *     proc.call
- *
- *  <em>raises the exception:</em>
- *
- *     SecurityError: Insecure: can't modify string
+ *  No longer used by internal code.
  */
 
 /*
@@ -1489,8 +2434,8 @@ syserr_eqq(VALUE self, VALUE exc)
 /*
  * Document-class: fatal
  *
- * fatal is an Exception that is raised when ruby has encountered a fatal
- * error and must exit.  You are not able to rescue fatal.
+ * fatal is an Exception that is raised when Ruby has encountered a fatal
+ * error and must exit.
  */
 
 /*
@@ -1499,14 +2444,98 @@ syserr_eqq(VALUE self, VALUE exc)
  */
 
 /*
- *  Descendants of class <code>Exception</code> are used to communicate
- *  between <code>raise</code> methods and <code>rescue</code>
- *  statements in <code>begin/end</code> blocks. <code>Exception</code>
- *  objects carry information about the exception---its type (the
- *  exception's class name), an optional descriptive string, and
- *  optional traceback information. Programs may subclass
- *  <code>Exception</code>, or more typically <code>StandardError</code>
- *  to provide custom classes and add additional information.
+ *  \Class Exception and its subclasses are used to communicate between
+ *  Kernel#raise and +rescue+ statements in <code>begin ... end</code> blocks.
+ *
+ *  An Exception object carries information about an exception:
+ *  - Its type (the exception's class).
+ *  - An optional descriptive message.
+ *  - Optional backtrace information.
+ *
+ *  Some built-in subclasses of Exception have additional methods: e.g., NameError#name.
+ *
+ *  == Defaults
+ *
+ *  Two Ruby statements have default exception classes:
+ *  - +raise+: defaults to RuntimeError.
+ *  - +rescue+: defaults to StandardError.
+ *
+ *  == Global Variables
+ *
+ *  When an exception has been raised but not yet handled (in +rescue+,
+ *  +ensure+, +at_exit+ and +END+ blocks), two global variables are set:
+ *  - <code>$!</code> contains the current exception.
+ *  - <code>$@</code> contains its backtrace.
+ *
+ *  == Custom Exceptions
+ *
+ *  To provide additional or alternate information,
+ *  a program may create custom exception classes
+ *  that derive from the built-in exception classes.
+ *
+ *  A good practice is for a library to create a single "generic" exception class
+ *  (typically a subclass of StandardError or RuntimeError)
+ *  and have its other exception classes derive from that class.
+ *  This allows the user to rescue the generic exception, thus catching all exceptions
+ *  the library may raise even if future versions of the library add new
+ *  exception subclasses.
+ *
+ *  For example:
+ *
+ *    class MyLibrary
+ *      class Error < ::StandardError
+ *      end
+ *
+ *      class WidgetError < Error
+ *      end
+ *
+ *      class FrobError < Error
+ *      end
+ *
+ *    end
+ *
+ *  To handle both MyLibrary::WidgetError and MyLibrary::FrobError the library
+ *  user can rescue MyLibrary::Error.
+ *
+ *  == Built-In Exception Classes
+ *
+ *  The built-in subclasses of Exception are:
+ *
+ *  * NoMemoryError
+ *  * ScriptError
+ *    * LoadError
+ *    * NotImplementedError
+ *    * SyntaxError
+ *  * SecurityError
+ *  * SignalException
+ *    * Interrupt
+ *  * StandardError
+ *    * ArgumentError
+ *      * UncaughtThrowError
+ *    * EncodingError
+ *    * FiberError
+ *    * IOError
+ *      * EOFError
+ *    * IndexError
+ *      * KeyError
+ *      * StopIteration
+ *        * ClosedQueueError
+ *    * LocalJumpError
+ *    * NameError
+ *      * NoMethodError
+ *    * RangeError
+ *      * FloatDomainError
+ *    * RegexpError
+ *    * RuntimeError
+ *      * FrozenError
+ *    * SystemCallError
+ *      * Errno::*
+ *    * ThreadError
+ *    * TypeError
+ *    * ZeroDivisionError
+ *  * SystemExit
+ *  * SystemStackError
+ *  * fatal
  */
 
 void
@@ -1514,14 +2543,18 @@ Init_Exception(void)
 {
     rb_eException   = rb_define_class("Exception", rb_cObject);
     rb_define_singleton_method(rb_eException, "exception", rb_class_new_instance, -1);
+    rb_define_singleton_method(rb_eException, "to_tty?", exc_s_to_tty_p, 0);
     rb_define_method(rb_eException, "exception", exc_exception, -1);
     rb_define_method(rb_eException, "initialize", exc_initialize, -1);
     rb_define_method(rb_eException, "==", exc_equal, 1);
     rb_define_method(rb_eException, "to_s", exc_to_s, 0);
     rb_define_method(rb_eException, "message", exc_message, 0);
+    rb_define_method(rb_eException, "full_message", exc_full_message, -1);
     rb_define_method(rb_eException, "inspect", exc_inspect, 0);
     rb_define_method(rb_eException, "backtrace", exc_backtrace, 0);
+    rb_define_method(rb_eException, "backtrace_locations", exc_backtrace_locations, 0);
     rb_define_method(rb_eException, "set_backtrace", exc_set_backtrace, 1);
+    rb_define_method(rb_eException, "cause", exc_cause, 0);
 
     rb_eSystemExit  = rb_define_class("SystemExit", rb_eException);
     rb_define_method(rb_eSystemExit, "initialize", exit_initialize, -1);
@@ -1537,32 +2570,45 @@ Init_Exception(void)
     rb_eArgError      = rb_define_class("ArgumentError", rb_eStandardError);
     rb_eIndexError    = rb_define_class("IndexError", rb_eStandardError);
     rb_eKeyError      = rb_define_class("KeyError", rb_eIndexError);
+    rb_define_method(rb_eKeyError, "initialize", key_err_initialize, -1);
+    rb_define_method(rb_eKeyError, "receiver", key_err_receiver, 0);
+    rb_define_method(rb_eKeyError, "key", key_err_key, 0);
     rb_eRangeError    = rb_define_class("RangeError", rb_eStandardError);
 
     rb_eScriptError = rb_define_class("ScriptError", rb_eException);
     rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
+    rb_define_method(rb_eSyntaxError, "initialize", syntax_error_initialize, -1);
+
     rb_eLoadError   = rb_define_class("LoadError", rb_eScriptError);
+    /* the path failed to load */
+    rb_attr(rb_eLoadError, rb_intern_const("path"), 1, 0, Qfalse);
+
     rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
 
     rb_eNameError     = rb_define_class("NameError", rb_eStandardError);
     rb_define_method(rb_eNameError, "initialize", name_err_initialize, -1);
     rb_define_method(rb_eNameError, "name", name_err_name, 0);
-    rb_define_method(rb_eNameError, "to_s", name_err_to_s, 0);
+    rb_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_to_str, 1);
+    rb_define_method(rb_cNameErrorMesg, "_dump", name_err_mesg_dump, 1);
     rb_define_singleton_method(rb_cNameErrorMesg, "_load", name_err_mesg_load, 1);
     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_eFrozenError = rb_define_class("FrozenError", rb_eRuntimeError);
+    rb_define_method(rb_eFrozenError, "initialize", frozen_err_initialize, -1);
+    rb_define_method(rb_eFrozenError, "receiver", frozen_err_receiver, 0);
     rb_eSecurityError = rb_define_class("SecurityError", rb_eException);
     rb_eNoMemError = rb_define_class("NoMemoryError", rb_eException);
     rb_eEncodingError = rb_define_class("EncodingError", rb_eStandardError);
     rb_eEncCompatError = rb_define_class_under(rb_cEncoding, "CompatibilityError", rb_eEncodingError);
+    rb_eNoMatchingPatternError = rb_define_class("NoMatchingPatternError", rb_eRuntimeError);
 
     syserr_tbl = st_init_numtable();
     rb_eSystemCallError = rb_define_class("SystemCallError", rb_eStandardError);
@@ -1572,22 +2618,73 @@ Init_Exception(void)
 
     rb_mErrno = rb_define_module("Errno");
 
-    rb_define_global_function("warn", rb_warn_m, 1);
+    rb_mWarning = rb_define_module("Warning");
+    rb_define_singleton_method(rb_mWarning, "[]", rb_warning_s_aref, 1);
+    rb_define_singleton_method(rb_mWarning, "[]=", rb_warning_s_aset, 2);
+    rb_define_method(rb_mWarning, "warn", rb_warning_s_warn, 1);
+    rb_extend_object(rb_mWarning, rb_mWarning);
+
+    /* :nodoc: */
+    rb_cWarningBuffer = rb_define_class_under(rb_mWarning, "buffer", rb_cString);
+    rb_define_method(rb_cWarningBuffer, "write", warning_write, -1);
+
+    id_cause = rb_intern_const("cause");
+    id_message = rb_intern_const("message");
+    id_backtrace = rb_intern_const("backtrace");
+    id_key = rb_intern_const("key");
+    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_top = rb_intern_const("top");
+    id_bottom = rb_intern_const("bottom");
+    id_iseq = rb_make_internal_id();
+    id_recv = rb_make_internal_id();
 }
 
 void
-rb_raise(VALUE exc, const char *fmt, ...)
+rb_enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
 {
     va_list args;
     VALUE mesg;
 
     va_start(args, fmt);
-    mesg = rb_vsprintf(fmt, args);
+    mesg = rb_enc_vsprintf(enc, fmt, args);
     va_end(args);
+
     rb_exc_raise(rb_exc_new3(exc, mesg));
 }
 
 void
+rb_vraise(VALUE exc, const char *fmt, va_list ap)
+{
+    rb_exc_raise(rb_exc_new3(exc, rb_vsprintf(fmt, ap)));
+}
+
+void
+rb_raise(VALUE exc, const char *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    rb_vraise(exc, fmt, args);
+    va_end(args);
+}
+
+NORETURN(static void raise_loaderror(VALUE path, VALUE mesg));
+
+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_exc_raise(err);
+}
+
+void
 rb_loaderror(const char *fmt, ...)
 {
     va_list args;
@@ -1596,15 +2693,27 @@ rb_loaderror(const char *fmt, ...)
     va_start(args, fmt);
     mesg = rb_enc_vsprintf(rb_locale_encoding(), fmt, args);
     va_end(args);
-    rb_exc_raise(rb_exc_new3(rb_eLoadError, mesg));
+    raise_loaderror(Qnil, mesg);
+}
+
+void
+rb_loaderror_with_path(VALUE path, const char *fmt, ...)
+{
+    va_list args;
+    VALUE mesg;
+
+    va_start(args, fmt);
+    mesg = rb_enc_vsprintf(rb_locale_encoding(), fmt, args);
+    va_end(args);
+    raise_loaderror(path, mesg);
 }
 
 void
 rb_notimplement(void)
 {
     rb_raise(rb_eNotImpError,
-	     "%s() function is unimplemented on this machine",
-	     rb_id2name(rb_frame_this_func()));
+	     "%"PRIsVALUE"() function is unimplemented on this machine",
+	     rb_id2str(rb_frame_this_func()));
 }
 
 void
@@ -1613,6 +2722,14 @@ rb_fatal(const char *fmt, ...)
     va_list args;
     VALUE mesg;
 
+    if (! ruby_thread_has_gvl_p()) {
+        /* The thread has no GVL.  Object allocation impossible (cant run GC),
+         * thus no message can be printed out. */
+        fprintf(stderr, "[FATAL] rb_fatal() outside of GVL\n");
+        rb_print_backtrace();
+        die();
+    }
+
     va_start(args, fmt);
     mesg = rb_vsprintf(fmt, args);
     va_end(args);
@@ -1632,11 +2749,31 @@ make_errno_exc(const char *mesg)
     return rb_syserr_new(n, mesg);
 }
 
+static VALUE
+make_errno_exc_str(VALUE mesg)
+{
+    int n = errno;
+
+    errno = 0;
+    if (!mesg) mesg = Qnil;
+    if (n == 0) {
+	const char *s = !NIL_P(mesg) ? RSTRING_PTR(mesg) : "";
+	rb_bug("rb_sys_fail_str(%s) - errno == 0", s);
+    }
+    return rb_syserr_new_str(n, mesg);
+}
+
 VALUE
 rb_syserr_new(int n, const char *mesg)
 {
     VALUE arg;
     arg = mesg ? rb_str_new2(mesg) : Qnil;
+    return rb_syserr_new_str(n, arg);
+}
+
+VALUE
+rb_syserr_new_str(int n, VALUE arg)
+{
     return rb_class_new_instance(1, &arg, get_syserr(n));
 }
 
@@ -1647,12 +2784,52 @@ rb_syserr_fail(int e, const char *mesg)
 }
 
 void
+rb_syserr_fail_str(int e, VALUE mesg)
+{
+    rb_exc_raise(rb_syserr_new_str(e, mesg));
+}
+
+void
 rb_sys_fail(const char *mesg)
 {
     rb_exc_raise(make_errno_exc(mesg));
 }
 
 void
+rb_sys_fail_str(VALUE mesg)
+{
+    rb_exc_raise(make_errno_exc_str(mesg));
+}
+
+#ifdef RUBY_FUNCTION_NAME_STRING
+void
+rb_sys_fail_path_in(const char *func_name, VALUE path)
+{
+    int n = errno;
+
+    errno = 0;
+    rb_syserr_fail_path_in(func_name, n, path);
+}
+
+void
+rb_syserr_fail_path_in(const char *func_name, int n, VALUE path)
+{
+    VALUE args[2];
+
+    if (!path) path = Qnil;
+    if (n == 0) {
+	const char *s = !NIL_P(path) ? RSTRING_PTR(path) : "";
+	if (!func_name) func_name = "(null)";
+	rb_bug("rb_sys_fail_path_in(%s, %s) - errno == 0",
+	       func_name, s);
+    }
+    args[0] = path;
+    args[1] = rb_str_new_cstr(func_name);
+    rb_exc_raise(rb_class_new_instance(2, args, get_syserr(n)));
+}
+#endif
+
+void
 rb_mod_sys_fail(VALUE mod, const char *mesg)
 {
     VALUE exc = make_errno_exc(mesg);
@@ -1661,6 +2838,14 @@ rb_mod_sys_fail(VALUE mod, const char *mesg)
 }
 
 void
+rb_mod_sys_fail_str(VALUE mod, VALUE mesg)
+{
+    VALUE exc = make_errno_exc_str(mesg);
+    rb_extend_object(exc, mod);
+    rb_exc_raise(exc);
+}
+
+void
 rb_mod_syserr_fail(VALUE mod, int e, const char *mesg)
 {
     VALUE exc = rb_syserr_new(e, mesg);
@@ -1669,35 +2854,173 @@ rb_mod_syserr_fail(VALUE mod, int e, const char *mesg)
 }
 
 void
+rb_mod_syserr_fail_str(VALUE mod, int e, VALUE mesg)
+{
+    VALUE exc = rb_syserr_new_str(e, mesg);
+    rb_extend_object(exc, mod);
+    rb_exc_raise(exc);
+}
+
+static void
+syserr_warning(VALUE mesg, int err)
+{
+    rb_str_set_len(mesg, RSTRING_LEN(mesg)-1);
+    rb_str_catf(mesg, ": %s\n", strerror(err));
+    rb_write_warning_str(mesg);
+}
+
+#if 0
+void
+rb_sys_warn(const char *fmt, ...)
+{
+    if (!NIL_P(ruby_verbose)) {
+	int errno_save = errno;
+	with_warning_string(mesg, 0, fmt) {
+	    syserr_warning(mesg, errno_save);
+	}
+	errno = errno_save;
+    }
+}
+
+void
+rb_syserr_warn(int err, const char *fmt, ...)
+{
+    if (!NIL_P(ruby_verbose)) {
+	with_warning_string(mesg, 0, fmt) {
+	    syserr_warning(mesg, err);
+	}
+    }
+}
+
+void
+rb_sys_enc_warn(rb_encoding *enc, const char *fmt, ...)
+{
+    if (!NIL_P(ruby_verbose)) {
+	int errno_save = errno;
+	with_warning_string(mesg, enc, fmt) {
+	    syserr_warning(mesg, errno_save);
+	}
+	errno = errno_save;
+    }
+}
+
+void
+rb_syserr_enc_warn(int err, rb_encoding *enc, const char *fmt, ...)
+{
+    if (!NIL_P(ruby_verbose)) {
+	with_warning_string(mesg, enc, fmt) {
+	    syserr_warning(mesg, err);
+	}
+    }
+}
+#endif
+
+void
 rb_sys_warning(const char *fmt, ...)
 {
-    char buf[BUFSIZ];
-    va_list args;
-    int errno_save;
+    if (RTEST(ruby_verbose)) {
+	int errno_save = errno;
+	with_warning_string(mesg, 0, fmt) {
+	    syserr_warning(mesg, errno_save);
+	}
+	errno = errno_save;
+    }
+}
 
-    errno_save = errno;
+#if 0
+void
+rb_syserr_warning(int err, const char *fmt, ...)
+{
+    if (RTEST(ruby_verbose)) {
+	with_warning_string(mesg, 0, fmt) {
+	    syserr_warning(mesg, err);
+	}
+    }
+}
+#endif
 
-    if (!RTEST(ruby_verbose)) return;
+void
+rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...)
+{
+    if (RTEST(ruby_verbose)) {
+	int errno_save = errno;
+	with_warning_string(mesg, enc, fmt) {
+	    syserr_warning(mesg, errno_save);
+	}
+	errno = errno_save;
+    }
+}
+
+void
+rb_syserr_enc_warning(int err, rb_encoding *enc, const char *fmt, ...)
+{
+    if (RTEST(ruby_verbose)) {
+	with_warning_string(mesg, enc, fmt) {
+	    syserr_warning(mesg, err);
+	}
+    }
+}
+
+void
+rb_load_fail(VALUE path, const char *err)
+{
+    VALUE mesg = rb_str_buf_new_cstr(err);
+    rb_str_cat2(mesg, " -- ");
+    rb_str_append(mesg, path);	/* should be ASCII compatible */
+    raise_loaderror(path, mesg);
+}
+
+void
+rb_error_frozen(const char *what)
+{
+    rb_raise(rb_eFrozenError, "can't modify frozen %s", what);
+}
 
-    snprintf(buf, BUFSIZ, "warning: %s", fmt);
-    snprintf(buf+strlen(buf), BUFSIZ-strlen(buf), ": %s", strerror(errno_save));
+void
+rb_frozen_error_raise(VALUE frozen_obj, const char *fmt, ...)
+{
+    va_list args;
+    VALUE exc, mesg;
 
     va_start(args, fmt);
-    warn_print(buf, args);
+    mesg = rb_vsprintf(fmt, args);
     va_end(args);
-    errno = errno_save;
+    exc = rb_exc_new3(rb_eFrozenError, mesg);
+    rb_ivar_set(exc, id_recv, frozen_obj);
+    rb_exc_raise(exc);
 }
 
-void
-rb_load_fail(const char *path)
+static VALUE
+inspect_frozen_obj(VALUE obj, VALUE mesg, int recur)
 {
-    rb_loaderror("%s -- %s", strerror(errno), path);
+    if (recur) {
+        rb_str_cat_cstr(mesg, " ...");
+    }
+    else {
+        rb_str_append(mesg, rb_inspect(obj));
+    }
+    return mesg;
 }
 
 void
-rb_error_frozen(const char *what)
+rb_error_frozen_object(VALUE frozen_obj)
 {
-    rb_raise(rb_eRuntimeError, "can't modify frozen %s", what);
+    VALUE debug_info;
+    const ID created_info = id_debug_created_info;
+    VALUE mesg = rb_sprintf("can't modify frozen %"PRIsVALUE": ",
+                            CLASS_OF(frozen_obj));
+    VALUE exc = rb_exc_new_str(rb_eFrozenError, mesg);
+
+    rb_ivar_set(exc, id_recv, frozen_obj);
+    rb_exec_recursive(inspect_frozen_obj, frozen_obj, mesg);
+
+    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_str_catf(mesg, ", created at %"PRIsVALUE":%"PRIsVALUE, path, line);
+    }
+    rb_exc_raise(exc);
 }
 
 #undef rb_check_frozen
@@ -1708,6 +3031,27 @@ rb_check_frozen(VALUE obj)
 }
 
 void
+rb_error_untrusted(VALUE obj)
+{
+    rb_warning("rb_error_untrusted is deprecated and will be removed in Ruby 3.2.");
+}
+
+#undef rb_check_trusted
+void
+rb_check_trusted(VALUE obj)
+{
+    rb_warning("rb_check_trusted is deprecated and will be removed in Ruby 3.2.");
+}
+
+void
+rb_check_copyable(VALUE obj, VALUE orig)
+{
+    if (!FL_ABLE(obj)) return;
+    rb_check_frozen_internal(obj);
+    if (!FL_ABLE(orig)) return;
+}
+
+void
 Init_syserr(void)
 {
     rb_eNOERROR = set_syserr(0, "NOERROR");
@@ -1718,32 +3062,14 @@ Init_syserr(void)
 #undef undefined_error
 }
 
-static void
-err_append(const char *s, rb_encoding *enc)
-{
-    rb_thread_t *th = GET_THREAD();
-    VALUE err = th->errinfo;
-
-    if (th->mild_compile_error) {
-	if (!RTEST(err)) {
-	    err = rb_exc_new3(rb_eSyntaxError,
-			      rb_enc_str_new(s, strlen(s), enc));
-	    th->errinfo = err;
-	}
-	else {
-	    VALUE str = rb_obj_as_string(err);
+#include "warning.rbinc"
 
-	    rb_str_cat2(str, "\n");
-	    rb_str_cat2(str, s);
-	    th->errinfo = rb_exc_new3(rb_eSyntaxError, str);
-	}
-    }
-    else {
-	if (!RTEST(err)) {
-	    err = rb_exc_new2(rb_eSyntaxError, "compile error");
-	    th->errinfo = err;
-	}
-	rb_write_error(s);
-	rb_write_error("\n");
-    }
+void
+Init_warning(void)
+{
+    load_warning();
 }
+
+/*!
+ * \}
+ */
diff --git a/eval.c b/eval.c
index 5b5b4662c0..f2fde81e19 100644
--- a/eval.c
+++ b/eval.c
@@ -11,211 +11,296 @@
 
 **********************************************************************/
 
+#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 "mjit.h"
+#include "probes.h"
+#include "probes_helper.h"
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
 
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+NORETURN(void rb_raise_jump(VALUE, VALUE));
+void rb_ec_clear_current_thread_trace_func(const rb_execution_context_t *ec);
 
-NORETURN(void rb_raise_jump(VALUE));
+static int rb_ec_cleanup(rb_execution_context_t *ec, volatile int ex);
+static int rb_ec_exec_node(rb_execution_context_t *ec, void *n);
 
 VALUE rb_eLocalJumpError;
 VALUE rb_eSysStackError;
 
+ID ruby_static_id_signo, ruby_static_id_status;
+extern ID ruby_static_id_cause;
+#define id_cause ruby_static_id_cause
+
 #define exception_error GET_VM()->special_exceptions[ruby_error_reenter]
 
 #include "eval_error.c"
 #include "eval_jump.c"
 
-/* initialize ruby */
+#define CLASS_OR_MODULE_P(obj) \
+    (!SPECIAL_CONST_P(obj) && \
+     (BUILTIN_TYPE(obj) == T_CLASS || BUILTIN_TYPE(obj) == T_MODULE))
 
-void
-ruby_init(void)
+/*!
+ * Initializes the VM and builtin libraries.
+ * @retval 0 if succeeded.
+ * @retval non-zero an error occurred.
+ */
+int
+ruby_setup(void)
 {
-    static int initialized = 0;
-    int state;
+    enum ruby_tag_type state;
 
-    if (initialized)
-	return;
-    initialized = 1;
+    if (GET_VM())
+	return 0;
 
     ruby_init_stack((void *)&state);
+
+    /*
+     * Disable THP early before mallocs happen because we want this to
+     * affect as many future pages as possible for CoW-friendliness
+     */
+#if defined(__linux__) && defined(PR_SET_THP_DISABLE)
+    prctl(PR_SET_THP_DISABLE, 1, 0, 0, 0);
+#endif
     Init_BareVM();
     Init_heap();
+    rb_vm_encoded_insn_data_table_init();
+    Init_vm_objects();
 
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
+    EC_PUSH_TAG(GET_EC());
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
 	rb_call_inits();
 	ruby_prog_init();
+	GET_VM()->running = 1;
     }
-    POP_TAG();
+    EC_POP_TAG();
+
+    return state;
+}
 
+/*!
+ * Calls ruby_setup() and check error.
+ *
+ * Prints errors and calls exit(3) if an error occurred.
+ */
+void
+ruby_init(void)
+{
+    int state = ruby_setup();
     if (state) {
-	error_print();
+        if (RTEST(ruby_debug))
+            error_print(GET_EC());
 	exit(EXIT_FAILURE);
     }
-    GET_VM()->running = 1;
 }
 
+/*! Processes command line arguments and compiles the Ruby source to execute.
+ *
+ * This function does:
+ * \li Processes the given command line flags and arguments for ruby(1)
+ * \li compiles the source code from the given argument, -e or stdin, and
+ * \li returns the compiled source as an opaque pointer to an internal data structure
+ *
+ * @return an opaque pointer to the compiled source or an internal special value.
+ * @sa ruby_executable_node().
+ */
 void *
 ruby_options(int argc, char **argv)
 {
-    int state;
+    rb_execution_context_t *ec = GET_EC();
+    enum ruby_tag_type state;
     void *volatile iseq = 0;
 
     ruby_init_stack((void *)&iseq);
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
 	SAVE_ROOT_JMPBUF(GET_THREAD(), iseq = ruby_process_options(argc, argv));
     }
     else {
-	rb_clear_trace_func();
-	state = error_handle(state);
+        rb_ec_clear_current_thread_trace_func(ec);
+        state = error_handle(ec, state);
 	iseq = (void *)INT2FIX(state);
     }
-    POP_TAG();
+    EC_POP_TAG();
     return iseq;
 }
 
 static void
-ruby_finalize_0(void)
+rb_ec_teardown(rb_execution_context_t *ec)
 {
-    PUSH_TAG();
-    if (EXEC_TAG() == 0) {
-	rb_trap_exit();
+    EC_PUSH_TAG(ec);
+    if (EC_EXEC_TAG() == TAG_NONE) {
+        rb_vm_trap_exit(rb_ec_vm_ptr(ec));
     }
-    POP_TAG();
-    rb_exec_end_proc();
-    rb_clear_trace_func();
+    EC_POP_TAG();
+    rb_ec_exec_end_proc(ec);
+    rb_ec_clear_current_thread_trace_func(ec);
 }
 
 static void
-ruby_finalize_1(void)
+rb_ec_finalize(rb_execution_context_t *ec)
 {
     ruby_sig_finalize();
-    GET_THREAD()->errinfo = Qnil;
-    rb_gc_call_finalizer_at_exit();
+    ec->errinfo = Qnil;
+    rb_objspace_call_finalizer(rb_ec_vm_ptr(ec)->objspace);
 }
 
+/** Runs the VM finalization processes.
+ *
+ * <code>END{}</code> and procs registered by <code>Kernel.#at_exit</code> are
+ * executed here. See the Ruby language spec for more details.
+ *
+ * @note This function is allowed to raise an exception if an error occurred.
+ */
 void
 ruby_finalize(void)
 {
-    ruby_finalize_0();
-    ruby_finalize_1();
+    rb_execution_context_t *ec = GET_EC();
+    rb_ec_teardown(ec);
+    rb_ec_finalize(ec);
 }
 
+/** Destructs the VM.
+ *
+ * Runs the VM finalization processes as well as ruby_finalize(), and frees
+ * resources used by the VM.
+ *
+ * @param ex Default value to the return value.
+ * @return If an error occurred returns a non-zero. If otherwise, returns the
+ *         given ex.
+ * @note This function does not raise any exception.
+ */
 int
 ruby_cleanup(volatile int ex)
 {
+    return rb_ec_cleanup(GET_EC(), ex);
+}
+
+static int
+rb_ec_cleanup(rb_execution_context_t *ec, volatile int ex)
+{
     int state;
-    volatile VALUE errs[2];
-    rb_thread_t *th = GET_THREAD();
+    volatile VALUE errs[2] = { Qundef, Qundef };
     int nerr;
+    rb_thread_t *th = rb_ec_thread_ptr(ec);
+    rb_thread_t *const volatile th0 = th;
+    volatile int sysex = EXIT_SUCCESS;
+    volatile int step = 0;
 
     rb_threadptr_interrupt(th);
     rb_threadptr_check_signal(th);
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
-	SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(); });
-    }
-    POP_TAG();
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+        th = th0;
+        SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(ec); });
 
-    errs[1] = th->errinfo;
-    th->safe_level = 0;
-    ruby_init_stack(&errs[STACK_UPPER(errs, 0, 1)]);
+      step_0: step++;
+        th = th0;
+        errs[1] = ec->errinfo;
+        if (THROW_DATA_P(ec->errinfo)) ec->errinfo = Qnil;
+	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();
+        SAVE_ROOT_JMPBUF(th, rb_ec_teardown(ec));
+
+      step_1: step++;
+        th = th0;
+	/* protect from Thread#raise */
+	th->status = THREAD_KILLED;
 
-    errs[0] = th->errinfo;
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
+        errs[0] = ec->errinfo;
 	SAVE_ROOT_JMPBUF(th, rb_thread_terminate_all());
     }
-    else if (ex == 0) {
-	ex = state;
-    }
-    th->errinfo = errs[1];
-    ex = error_handle(ex);
-    ruby_finalize_1();
-
-    /* unlock again if finalizer took mutexes. */
-    rb_threadptr_unlock_all_locking_mutexes(GET_THREAD());
-    POP_TAG();
-    rb_thread_stop_timer_thread(1);
-
-#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
+    else {
+	switch (step) {
+	  case 0: goto step_0;
+	  case 1: goto step_1;
+	}
+	if (ex == 0) ex = state;
     }
-#endif
+    th = th0;
+    ec->errinfo = errs[1];
+    sysex = error_handle(ec, ex);
 
     state = 0;
     for (nerr = 0; nerr < numberof(errs); ++nerr) {
-	VALUE err = errs[nerr];
+	VALUE err = ATOMIC_VALUE_EXCHANGE(errs[nerr], Qnil);
 
 	if (!RTEST(err)) continue;
 
-	/* th->errinfo contains a NODE while break'ing */
-	if (TYPE(err) == T_NODE) continue;
+        /* ec->errinfo contains a NODE while break'ing */
+	if (THROW_DATA_P(err)) continue;
 
 	if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
-	    ex = sysexit_status(err);
+	    sysex = sysexit_status(err);
 	    break;
 	}
 	else if (rb_obj_is_kind_of(err, rb_eSignal)) {
-	    VALUE sig = rb_iv_get(err, "signo");
+	    VALUE sig = rb_ivar_get(err, id_signo);
 	    state = NUM2INT(sig);
 	    break;
 	}
-	else if (ex == EXIT_SUCCESS) {
-	    ex = EXIT_FAILURE;
+	else if (sysex == EXIT_SUCCESS) {
+	    sysex = EXIT_FAILURE;
 	}
     }
-    ruby_vm_destruct(GET_VM());
+
+    mjit_finish(true); // We still need ISeqs here.
+
+    rb_ec_finalize(ec);
+
+    /* unlock again if finalizer took mutexes. */
+    rb_threadptr_unlock_all_locking_mutexes(th);
+    EC_POP_TAG();
+    rb_thread_stop_timer_thread();
+    ruby_vm_destruct(th->vm);
     if (state) ruby_default_signal(state);
 
-    return ex;
+    return sysex;
 }
 
 static int
-ruby_exec_internal(void *n)
+rb_ec_exec_node(rb_execution_context_t *ec, void *n)
 {
     volatile int state;
-    VALUE iseq = (VALUE)n;
-    rb_thread_t *th = GET_THREAD();
-
+    rb_iseq_t *iseq = (rb_iseq_t *)n;
     if (!n) return 0;
 
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+        rb_thread_t *const th = rb_ec_thread_ptr(ec);
 	SAVE_ROOT_JMPBUF(th, {
-	    th->base_block = 0;
 	    rb_iseq_eval_main(iseq);
 	});
     }
-    POP_TAG();
+    EC_POP_TAG();
     return state;
 }
 
+/*! Calls ruby_cleanup() and exits the process */
 void
 ruby_stop(int ex)
 {
     exit(ruby_cleanup(ex));
 }
 
+/*! Checks the return value of ruby_options().
+ * @param n return value of ruby_options().
+ * @param status pointer to the exit status of this process.
+ *
+ * ruby_options() sometimes returns a special value to indicate this process
+ * should immediately exit. This function checks if the case. Also stores the
+ * exit status that the caller have to pass to exit(3) into
+ * <code>*status</code>.
+ *
+ * @retval non-zero if the given opaque pointer is actually a compiled source.
+ * @retval 0 if the given value is such a special value.
+ */
 int
 ruby_executable_node(void *n, int *status)
 {
@@ -233,22 +318,29 @@ ruby_executable_node(void *n, int *status)
     return FALSE;
 }
 
+/*! Runs the given compiled source and exits this process.
+ * @retval 0 if successfully run the source
+ * @retval non-zero if an error occurred.
+*/
 int
 ruby_run_node(void *n)
 {
+    rb_execution_context_t *ec = GET_EC();
     int status;
     if (!ruby_executable_node(n, &status)) {
-	ruby_cleanup(0);
+        rb_ec_cleanup(ec, 0);
 	return status;
     }
-    return ruby_cleanup(ruby_exec_node(n));
+    ruby_init_stack((void *)&status);
+    return rb_ec_cleanup(ec, rb_ec_exec_node(ec, n));
 }
 
+/*! Runs the given compiled source */
 int
 ruby_exec_node(void *n)
 {
     ruby_init_stack((void *)&n);
-    return ruby_exec_internal(n);
+    return rb_ec_exec_node(GET_EC(), n);
 }
 
 /*
@@ -267,18 +359,18 @@ ruby_exec_node(void *n)
  */
 
 static VALUE
-rb_mod_nesting(void)
+rb_mod_nesting(VALUE _)
 {
     VALUE ary = rb_ary_new();
-    const NODE *cref = rb_vm_cref();
+    const rb_cref_t *cref = rb_vm_cref();
 
-    while (cref && cref->nd_next) {
-	VALUE klass = cref->nd_clss;
-	if (!(cref->flags & NODE_FL_CREF_PUSHED_BY_EVAL) &&
+    while (cref && CREF_NEXT(cref)) {
+	VALUE klass = CREF_CLASS(cref);
+	if (!CREF_PUSHED_BY_EVAL(cref) &&
 	    !NIL_P(klass)) {
 	    rb_ary_push(ary, klass);
 	}
-	cref = cref->nd_next;
+	cref = CREF_NEXT(cref);
     }
     return ary;
 }
@@ -286,39 +378,47 @@ rb_mod_nesting(void)
 /*
  *  call-seq:
  *     Module.constants   -> array
+ *     Module.constants(inherited)   -> array
  *
- *  Returns an array of the names of all constants defined in the
- *  system. This list includes the names of all modules and classes.
+ *  In the first form, returns an array of the names of all
+ *  constants accessible from the point of call.
+ *  This list includes the names of all modules and classes
+ *  defined in the global scope.
  *
- *     p Module.constants.sort[1..5]
+ *     Module.constants.first(4)
+ *        # => [:ARGF, :ARGV, :ArgumentError, :Array]
  *
- *  <em>produces:</em>
+ *     Module.constants.include?(:SEEK_SET)   # => false
+ *
+ *     class IO
+ *       Module.constants.include?(:SEEK_SET) # => true
+ *     end
  *
- *     ["ARGV", "ArgumentError", "Array", "Bignum", "Binding"]
+ *  The second form calls the instance method +constants+.
  */
 
 static VALUE
 rb_mod_s_constants(int argc, VALUE *argv, VALUE mod)
 {
-    const NODE *cref = rb_vm_cref();
+    const rb_cref_t *cref = rb_vm_cref();
     VALUE klass;
     VALUE cbase = 0;
     void *data = 0;
 
-    if (argc > 0) {
-	return rb_mod_constants(argc, argv, rb_cModule);
+    if (argc > 0 || mod != rb_cModule) {
+	return rb_mod_constants(argc, argv, mod);
     }
 
     while (cref) {
-	klass = cref->nd_clss;
-	if (!(cref->flags & NODE_FL_CREF_PUSHED_BY_EVAL) &&
+	klass = CREF_CLASS(cref);
+	if (!CREF_PUSHED_BY_EVAL(cref) &&
 	    !NIL_P(klass)) {
-	    data = rb_mod_const_at(cref->nd_clss, data);
+	    data = rb_mod_const_at(CREF_CLASS(cref), data);
 	    if (!cbase) {
 		cbase = klass;
 	    }
 	}
-	cref = cref->nd_next;
+	cref = CREF_NEXT(cref);
     }
 
     if (cbase) {
@@ -327,16 +427,39 @@ rb_mod_s_constants(int argc, VALUE *argv, VALUE mod)
     return rb_const_list(data);
 }
 
+/*!
+ * Asserts that \a klass is not a frozen class.
+ * \param[in] klass a \c Module object
+ * \exception RuntimeError if \a klass is not a class or frozen.
+ * \ingroup class
+ */
 void
-rb_frozen_class_p(VALUE klass)
+rb_class_modify_check(VALUE klass)
 {
-    const char *desc = "something(?!)";
-
+    if (SPECIAL_CONST_P(klass)) {
+      noclass:
+	Check_Type(klass, T_CLASS);
+    }
     if (OBJ_FROZEN(klass)) {
-	if (FL_TEST(klass, FL_SINGLETON))
+	const char *desc;
+
+	if (FL_TEST(klass, FL_SINGLETON)) {
 	    desc = "object";
+	    klass = rb_ivar_get(klass, id__attached__);
+	    if (!SPECIAL_CONST_P(klass)) {
+		switch (BUILTIN_TYPE(klass)) {
+		  case T_MODULE:
+		  case T_ICLASS:
+		    desc = "Module";
+		    break;
+		  case T_CLASS:
+		    desc = "Class";
+		    break;
+		}
+	    }
+	}
 	else {
-	    switch (TYPE(klass)) {
+	    switch (BUILTIN_TYPE(klass)) {
 	      case T_MODULE:
 	      case T_ICLASS:
 		desc = "module";
@@ -344,180 +467,322 @@ rb_frozen_class_p(VALUE klass)
 	      case T_CLASS:
 		desc = "class";
 		break;
+	      default:
+		goto noclass;
 	    }
 	}
-	rb_error_frozen(desc);
+        rb_frozen_error_raise(klass, "can't modify frozen %s: %"PRIsVALUE, desc, klass);
     }
 }
 
-NORETURN(static void rb_longjmp(int, volatile VALUE));
+NORETURN(static void rb_longjmp(rb_execution_context_t *, int, volatile VALUE, VALUE));
+static VALUE get_errinfo(void);
+#define get_ec_errinfo(ec) rb_ec_get_errinfo(ec)
 
-static void
-setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg)
+static VALUE
+exc_setup_cause(VALUE exc, VALUE cause)
 {
-    VALUE at;
-    VALUE e;
-    const char *file;
-    volatile int line = 0;
+#if OPT_SUPPORT_JOKE
+    if (NIL_P(cause)) {
+	ID id_true_cause;
+	CONST_ID(id_true_cause, "true_cause");
+
+	cause = rb_attr_get(rb_eFatal, id_true_cause);
+	if (NIL_P(cause)) {
+	    cause = rb_exc_new_cstr(rb_eFatal, "because using such Ruby");
+	    rb_ivar_set(cause, id_cause, INT2FIX(42)); /* the answer */
+	    OBJ_FREEZE(cause);
+	    rb_ivar_set(rb_eFatal, id_true_cause, 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;
+}
+
+static inline VALUE
+exc_setup_message(const rb_execution_context_t *ec, VALUE mesg, VALUE *cause)
+{
+    int nocause = 0;
+    int nocircular = 0;
 
     if (NIL_P(mesg)) {
-	mesg = th->errinfo;
-	if (INTERNAL_EXCEPTION_P(mesg)) JUMP_TAG(TAG_FATAL);
+	mesg = ec->errinfo;
+	if (INTERNAL_EXCEPTION_P(mesg)) EC_JUMP_TAG(ec, TAG_FATAL);
+	nocause = 1;
     }
     if (NIL_P(mesg)) {
 	mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
+	nocause = 0;
+        nocircular = 1;
     }
-
-    file = rb_sourcefile();
-    if (file) line = rb_sourceline();
-    if (file && !NIL_P(mesg)) {
-	if (mesg == sysstack_error) {
-	    at = rb_enc_sprintf(rb_usascii_encoding(), "%s:%d", file, line);
-	    at = rb_ary_new3(1, at);
-	    rb_iv_set(mesg, "bt", at);
+    if (*cause == Qundef) {
+	if (nocause) {
+	    *cause = Qnil;
+            nocircular = 1;
 	}
-	else {
-	    at = get_backtrace(mesg);
-	    if (NIL_P(at)) {
-		at = rb_make_backtrace();
+	else if (!rb_ivar_defined(mesg, id_cause)) {
+	    *cause = get_ec_errinfo(ec);
+	}
+        else {
+            nocircular = 1;
+        }
+    }
+    else if (!NIL_P(*cause) && !rb_obj_is_kind_of(*cause, rb_eException)) {
+        rb_raise(rb_eTypeError, "exception object expected");
+    }
+
+    if (!nocircular && !NIL_P(*cause) && *cause != Qundef && *cause != mesg) {
+        VALUE c = *cause;
+        while (!NIL_P(c = rb_attr_get(c, id_cause))) {
+            if (c == mesg) {
+                rb_raise(rb_eArgError, "circular causes");
+            }
+        }
+    }
+    return mesg;
+}
+
+static void
+setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE cause)
+{
+    VALUE e;
+    int line;
+    const char *file = rb_source_location_cstr(&line);
+    const char *const volatile file0 = file;
+
+    if ((file && !NIL_P(mesg)) || (cause != Qundef))  {
+	volatile int state = 0;
+
+	EC_PUSH_TAG(ec);
+	if (EC_EXEC_TAG() == TAG_NONE && !(state = rb_ec_set_raised(ec))) {
+	    VALUE bt = rb_get_backtrace(mesg);
+	    if (!NIL_P(bt) || cause == Qundef) {
 		if (OBJ_FROZEN(mesg)) {
 		    mesg = rb_obj_dup(mesg);
 		}
+	    }
+            if (cause != Qundef && !THROW_DATA_P(cause)) {
+		exc_setup_cause(mesg, cause);
+	    }
+	    if (NIL_P(bt)) {
+		VALUE at = rb_ec_backtrace_object(ec);
+		rb_ivar_set(mesg, idBt_locations, at);
 		set_backtrace(mesg, at);
 	    }
+	    rb_ec_reset_raised(ec);
 	}
+	EC_POP_TAG();
+        file = file0;
+	if (state) goto fatal;
     }
+
     if (!NIL_P(mesg)) {
-	th->errinfo = mesg;
+	ec->errinfo = mesg;
     }
 
-    if (RTEST(ruby_debug) && !NIL_P(e = th->errinfo) &&
+    if (RTEST(ruby_debug) && !NIL_P(e = ec->errinfo) &&
 	!rb_obj_is_kind_of(e, rb_eSystemExit)) {
-	int status;
-
-	PUSH_TAG();
-	if ((status = EXEC_TAG()) == 0) {
-	    RB_GC_GUARD(e) = rb_obj_as_string(e);
+	enum ruby_tag_type state;
+
+	mesg = e;
+	EC_PUSH_TAG(ec);
+	if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+	    ec->errinfo = Qnil;
+	    e = rb_obj_as_string(mesg);
+	    ec->errinfo = mesg;
 	    if (file && line) {
-		warn_printf("Exception `%s' at %s:%d - %s\n",
-			    rb_obj_classname(th->errinfo),
-			    file, line, RSTRING_PTR(e));
+		e = rb_sprintf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n",
+			       rb_obj_class(mesg), file, line, e);
 	    }
 	    else if (file) {
-		warn_printf("Exception `%s' at %s - %s\n",
-			    rb_obj_classname(th->errinfo),
-			    file, RSTRING_PTR(e));
+		e = rb_sprintf("Exception `%"PRIsVALUE"' at %s - %"PRIsVALUE"\n",
+			       rb_obj_class(mesg), file, e);
 	    }
 	    else {
-		warn_printf("Exception `%s' - %s\n",
-			    rb_obj_classname(th->errinfo),
-			    RSTRING_PTR(e));
+		e = rb_sprintf("Exception `%"PRIsVALUE"' - %"PRIsVALUE"\n",
+			       rb_obj_class(mesg), e);
 	    }
+	    warn_print_str(e);
 	}
-	POP_TAG();
-	if (status == TAG_FATAL && th->errinfo == exception_error) {
-	    th->errinfo = mesg;
+	EC_POP_TAG();
+	if (state == TAG_FATAL && ec->errinfo == exception_error) {
+	    ec->errinfo = mesg;
 	}
-	else if (status) {
-	    rb_threadptr_reset_raised(th);
-	    JUMP_TAG(status);
+	else if (state) {
+	    rb_ec_reset_raised(ec);
+	    EC_JUMP_TAG(ec, state);
 	}
     }
 
-    if (rb_threadptr_set_raised(th)) {
-	th->errinfo = exception_error;
-	rb_threadptr_reset_raised(th);
-	JUMP_TAG(TAG_FATAL);
+    if (rb_ec_set_raised(ec)) {
+      fatal:
+	ec->errinfo = exception_error;
+	rb_ec_reset_raised(ec);
+	EC_JUMP_TAG(ec, TAG_FATAL);
     }
 
-    rb_trap_restore_mask();
-
     if (tag != TAG_FATAL) {
-	EXEC_EVENT_HOOK(th, RUBY_EVENT_RAISE, th->cfp->self, 0, 0);
+	RUBY_DTRACE_HOOK(RAISE, rb_obj_classname(ec->errinfo));
+	EXEC_EVENT_HOOK(ec, RUBY_EVENT_RAISE, ec->cfp->self, 0, 0, 0, mesg);
+    }
+}
+
+/*! \private */
+void
+rb_ec_setup_exception(const rb_execution_context_t *ec, VALUE mesg, VALUE cause)
+{
+    if (cause == Qundef) {
+	cause = get_ec_errinfo(ec);
+    }
+    if (cause != mesg) {
+	rb_ivar_set(mesg, id_cause, cause);
     }
 }
 
 static void
-rb_longjmp(int tag, volatile VALUE mesg)
+rb_longjmp(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE cause)
 {
-    rb_thread_t *th = GET_THREAD();
-    setup_exception(th, tag, mesg);
-    rb_thread_raised_clear(th);
-    JUMP_TAG(tag);
+    mesg = exc_setup_message(ec, mesg, &cause);
+    setup_exception(ec, tag, mesg, cause);
+    rb_ec_raised_clear(ec);
+    EC_JUMP_TAG(ec, tag);
 }
 
-static VALUE make_exception(int argc, VALUE *argv, int isstr);
+static VALUE make_exception(int argc, const VALUE *argv, int isstr);
 
+/*!
+ * Raises an exception in the current thread.
+ * \param[in] mesg an Exception class or an \c Exception object.
+ * \exception always raises an instance of the given exception class or
+ *   the given \c Exception object.
+ * \ingroup exception
+ */
 void
 rb_exc_raise(VALUE mesg)
 {
     if (!NIL_P(mesg)) {
 	mesg = make_exception(1, &mesg, FALSE);
     }
-    rb_longjmp(TAG_RAISE, mesg);
+    rb_longjmp(GET_EC(), TAG_RAISE, mesg, Qundef);
 }
 
+/*!
+ * Raises a fatal error in the current thread.
+ *
+ * Same as rb_exc_raise() but raises a fatal error, which Ruby codes
+ * cannot rescue.
+ * \ingroup exception
+ */
 void
 rb_exc_fatal(VALUE mesg)
 {
     if (!NIL_P(mesg)) {
 	mesg = make_exception(1, &mesg, FALSE);
     }
-    rb_longjmp(TAG_FATAL, mesg);
+    rb_longjmp(GET_EC(), TAG_FATAL, mesg, Qnil);
 }
 
+/*!
+ * Raises an \c Interrupt exception.
+ * \ingroup exception
+ */
 void
 rb_interrupt(void)
 {
-    rb_raise(rb_eInterrupt, "%s", "");
+    rb_exc_raise(rb_exc_new(rb_eInterrupt, 0, 0));
 }
 
-static VALUE get_errinfo(void);
+enum {raise_opt_cause, raise_max_opt}; /*< \private */
+
+static int
+extract_raise_opts(int argc, const VALUE *argv, VALUE *opts)
+{
+    int i;
+    if (argc > 0) {
+	VALUE opt = argv[argc-1];
+	if (RB_TYPE_P(opt, T_HASH)) {
+	    if (!RHASH_EMPTY_P(opt)) {
+		ID keywords[1];
+		CONST_ID(keywords[0], "cause");
+		rb_get_kwargs(opt, keywords, 0, -1-raise_max_opt, opts);
+		if (RHASH_EMPTY_P(opt)) --argc;
+		return argc;
+	    }
+	}
+    }
+    for (i = 0; i < raise_max_opt; ++i) {
+	opts[i] = Qundef;
+    }
+    return argc;
+}
+
+VALUE
+rb_f_raise(int argc, VALUE *argv)
+{
+    VALUE err;
+    VALUE opts[raise_max_opt], *const cause = &opts[raise_opt_cause];
+
+    argc = extract_raise_opts(argc, argv, opts);
+    if (argc == 0) {
+        if (*cause != Qundef) {
+            rb_raise(rb_eArgError, "only cause is given with no arguments");
+        }
+        err = get_errinfo();
+        if (!NIL_P(err)) {
+            argc = 1;
+            argv = &err;
+        }
+    }
+    rb_raise_jump(rb_make_exception(argc, argv), *cause);
+
+    UNREACHABLE_RETURN(Qnil);
+}
 
 /*
  *  call-seq:
  *     raise
- *     raise(string)
- *     raise(exception [, string [, array]])
+ *     raise(string, cause: $!)
+ *     raise(exception [, string [, array]], cause: $!)
  *     fail
- *     fail(string)
- *     fail(exception [, string [, array]])
+ *     fail(string, cause: $!)
+ *     fail(exception [, string [, array]], cause: $!)
  *
  *  With no arguments, raises the exception in <code>$!</code> or raises
- *  a <code>RuntimeError</code> if <code>$!</code> is +nil+.
- *  With a single +String+ argument, raises a
- *  +RuntimeError+ with the string as a message. Otherwise,
- *  the first parameter should be the name of an +Exception+
- *  class (or an object that returns an +Exception+ object when sent
- *  an +exception+ message). The optional second parameter sets the
- *  message associated with the exception, and the third parameter is an
- *  array of callback information. Exceptions are caught by the
- *  +rescue+ clause of <code>begin...end</code> blocks.
+ *  a RuntimeError if <code>$!</code> is +nil+.  With a single +String+
+ *  argument, raises a +RuntimeError+ with the string as a message. Otherwise,
+ *  the first parameter should be an +Exception+ class (or another
+ *  object that returns an +Exception+ object when sent an +exception+
+ *  message).  The optional second parameter sets the message associated with
+ *  the exception (accessible via Exception#message), and the third parameter
+ *  is an array of callback information (accessible via Exception#backtrace).
+ *  The +cause+ of the generated exception (accessible via Exception#cause)
+ *  is automatically set to the "current" exception (<code>$!</code>), if any.
+ *  An alternative value, either an +Exception+ object or +nil+, can be
+ *  specified via the +:cause+ argument.
+ *
+ *  Exceptions are caught by the +rescue+ clause of
+ *  <code>begin...end</code> blocks.
  *
  *     raise "Failed to create socket"
  *     raise ArgumentError, "No parameters", caller
  */
 
 static VALUE
-rb_f_raise(int argc, VALUE *argv)
+f_raise(int c, VALUE *v, VALUE _)
 {
-    VALUE err;
-    if (argc == 0) {
-	err = get_errinfo();
-	if (!NIL_P(err)) {
-	    argc = 1;
-	    argv = &err;
-	}
-    }
-    rb_raise_jump(rb_make_exception(argc, argv));
-    return Qnil;		/* not reached */
+    return rb_f_raise(c, v);
 }
 
 static VALUE
-make_exception(int argc, VALUE *argv, int isstr)
+make_exception(int argc, const VALUE *argv, int isstr)
 {
-    VALUE mesg;
-    ID exception;
+    VALUE mesg, exc;
     int n;
 
     mesg = Qnil;
@@ -525,10 +790,11 @@ make_exception(int argc, VALUE *argv, int isstr)
       case 0:
 	break;
       case 1:
-	if (NIL_P(argv[0]))
+	exc = argv[0];
+	if (NIL_P(exc))
 	    break;
 	if (isstr) {
-	    mesg = rb_check_string_type(argv[0]);
+	    mesg = rb_check_string_type(exc);
 	    if (!NIL_P(mesg)) {
 		mesg = rb_exc_new3(rb_eRuntimeError, mesg);
 		break;
@@ -539,18 +805,16 @@ make_exception(int argc, VALUE *argv, int isstr)
 
       case 2:
       case 3:
+	exc = argv[0];
 	n = 1;
       exception_call:
-	if (argv[0] == sysstack_error) return argv[0];
-	CONST_ID(exception, "exception");
-	mesg = rb_check_funcall(argv[0], exception, n, argv+1);
+	mesg = rb_check_funcall(exc, idException, n, argv+1);
 	if (mesg == Qundef) {
 	    rb_raise(rb_eTypeError, "exception class/object expected");
 	}
 	break;
       default:
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..3)", argc);
-	break;
+        rb_error_arity(argc, 0, 3);
     }
     if (argc > 0) {
 	if (!rb_obj_is_kind_of(mesg, rb_eException))
@@ -562,58 +826,107 @@ make_exception(int argc, VALUE *argv, int isstr)
     return mesg;
 }
 
+/*!
+ * Make an \c Exception object from the list of arguments in a manner
+ * similar to \c Kernel\#raise.
+ *
+ * \param[in] argc the number of arguments
+ * \param[in] argv a pointer to the array of arguments.
+ *
+ * The first form of this function takes a \c String argument. Then
+ * it returns a \c RuntimeError whose error message is the given value.
+ *
+ * The second from of this function takes an \c Exception object. Then
+ * it just returns the given value.
+ *
+ * The last form takes an exception class, an optional error message and
+ * an optional array of backtrace. Then it passes the optional arguments
+ * to \c #exception method of the exception class.
+ *
+ * \return the exception object, or \c Qnil if \c argc is 0.
+ * \ingroup exception
+ */
 VALUE
-rb_make_exception(int argc, VALUE *argv)
+rb_make_exception(int argc, const VALUE *argv)
 {
     return make_exception(argc, argv, TRUE);
 }
 
+/*! \private
+ * \todo can be static?
+ */
 void
-rb_raise_jump(VALUE mesg)
+rb_raise_jump(VALUE mesg, VALUE cause)
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp = th->cfp;
-    VALUE klass = cfp->me->klass;
+    rb_execution_context_t *ec = GET_EC();
+    const rb_control_frame_t *cfp = ec->cfp;
+    const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
+    VALUE klass = me->owner;
     VALUE self = cfp->self;
-    ID mid = cfp->me->called_id;
-
-    th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
+    ID mid = me->called_id;
 
-    setup_exception(th, TAG_RAISE, mesg);
+    rb_vm_pop_frame(ec);
+    EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, self, me->def->original_id, mid, klass, Qnil);
 
-    EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, self, mid, klass);
-    rb_thread_raised_clear(th);
-    JUMP_TAG(TAG_RAISE);
+    rb_longjmp(ec, TAG_RAISE, mesg, cause);
 }
 
+/*!
+ * Continues the exception caught by rb_protect() and rb_eval_string_protect().
+ *
+ * This function never return to the caller.
+ * \param[in] the value of \c *state which the protect function has set to the
+ *   their last parameter.
+ * \ingroup exception
+ */
 void
 rb_jump_tag(int tag)
 {
-    JUMP_TAG(tag);
+    if (UNLIKELY(tag < TAG_RETURN || tag > TAG_FATAL)) {
+	unknown_longjmp_status(tag);
+    }
+    EC_JUMP_TAG(GET_EC(), tag);
 }
 
+/*! Determines if the current method is given a block.
+ * \retval zero if not given
+ * \retval non-zero if given
+ * \ingroup defmethod
+ */
 int
 rb_block_given_p(void)
 {
-    rb_thread_t *th = GET_THREAD();
-
-    if ((th->cfp->lfp[0] & 0x02) == 0 &&
-	GC_GUARDED_PTR_REF(th->cfp->lfp[0])) {
-	return TRUE;
+    if (rb_vm_frame_block_handler(GET_EC()->cfp) == VM_BLOCK_HANDLER_NONE) {
+	return FALSE;
     }
     else {
-	return FALSE;
+	return TRUE;
     }
 }
 
+int rb_vm_cframe_keyword_p(const rb_control_frame_t *cfp);
+
+int
+rb_keyword_given_p(void)
+{
+    return rb_vm_cframe_keyword_p(GET_EC()->cfp);
+}
+
+/* -- Remove In 3.0 -- */
+int rb_vm_cframe_empty_keyword_p(const rb_control_frame_t *cfp);
 int
-rb_iterator_p(void)
+rb_empty_keyword_given_p(void)
 {
-    return rb_block_given_p();
+    return rb_vm_cframe_empty_keyword_p(GET_EC()->cfp);
 }
 
 VALUE rb_eThreadError;
 
+/*! Declares that the current method needs a block.
+ *
+ * Raises a \c LocalJumpError if not given a block.
+ * \ingroup defmethod
+ */
 void
 rb_need_block(void)
 {
@@ -622,202 +935,316 @@ rb_need_block(void)
     }
 }
 
+/*! An equivalent of \c rescue clause.
+ *
+ * Equivalent to <code>begin .. rescue err_type .. end</code>
+ *
+ * \param[in] b_proc a function which potentially raises an exception.
+ * \param[in] data1 the argument of \a b_proc
+ * \param[in] r_proc a function which rescues an exception in \a b_proc.
+ * \param[in] data2 the first argument of \a r_proc
+ * \param[in] ... 1 or more exception classes. Must be terminated by \c (VALUE)0.
+ *
+ * First it calls the function \a b_proc, with \a data1 as the argument.
+ * When \a b_proc raises an exception, it calls \a r_proc with \a data2 and
+ * the exception object if the exception is a kind of one of the given
+ * exception classes.
+ *
+ * \return the return value of \a b_proc if no exception occurs,
+ *   or the return value of \a r_proc if otherwise.
+ * \sa rb_rescue
+ * \sa rb_ensure
+ * \sa rb_protect
+ * \ingroup exception
+ */
 VALUE
-rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
-	   VALUE (* r_proc) (ANYARGS), VALUE data2, ...)
+rb_rescue2(VALUE (* b_proc) (VALUE), VALUE data1,
+           VALUE (* r_proc) (VALUE, VALUE), VALUE data2, ...)
 {
-    int state;
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp = th->cfp;
-    volatile VALUE result;
-    volatile VALUE e_info = th->errinfo;
-    va_list args;
+    va_list ap;
+    va_start(ap, data2);
+    VALUE ret = rb_vrescue2(b_proc, data1, r_proc, data2, ap);
+    va_end(ap);
+    return ret;
+}
 
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
+/*!
+ * \copydoc rb_rescue2
+ * \param[in] args exception classes, terminated by 0.
+ */
+VALUE
+rb_vrescue2(VALUE (* b_proc) (VALUE), VALUE data1,
+            VALUE (* r_proc) (VALUE, VALUE), VALUE data2,
+            va_list args)
+{
+    enum ruby_tag_type state;
+    rb_execution_context_t * volatile ec = GET_EC();
+    rb_control_frame_t *volatile cfp = ec->cfp;
+    volatile VALUE result = Qfalse;
+    volatile VALUE e_info = ec->errinfo;
+
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
       retry_entry:
 	result = (*b_proc) (data1);
     }
+    else if (result) {
+	/* escape from r_proc */
+	if (state == TAG_RETRY) {
+	    state = 0;
+	    ec->errinfo = Qnil;
+	    result = Qfalse;
+	    goto retry_entry;
+	}
+    }
     else {
-	th->cfp = cfp; /* restore */
+	rb_vm_rewind_cfp(ec, cfp);
 
 	if (state == TAG_RAISE) {
 	    int handle = FALSE;
 	    VALUE eclass;
 
-	    va_init_list(args, data2);
 	    while ((eclass = va_arg(args, VALUE)) != 0) {
-		if (rb_obj_is_kind_of(th->errinfo, eclass)) {
+		if (rb_obj_is_kind_of(ec->errinfo, eclass)) {
 		    handle = TRUE;
 		    break;
 		}
 	    }
-	    va_end(args);
 
 	    if (handle) {
+		result = Qnil;
+		state = 0;
 		if (r_proc) {
-		    PUSH_TAG();
-		    if ((state = EXEC_TAG()) == 0) {
-			result = (*r_proc) (data2, th->errinfo);
-		    }
-		    POP_TAG();
-		    if (state == TAG_RETRY) {
-			state = 0;
-			th->errinfo = Qnil;
-			goto retry_entry;
-		    }
-		}
-		else {
-		    result = Qnil;
-		    state = 0;
-		}
-		if (state == 0) {
-		    th->errinfo = e_info;
+		    result = (*r_proc) (data2, ec->errinfo);
 		}
+		ec->errinfo = e_info;
 	    }
 	}
     }
-    POP_TAG();
+    EC_POP_TAG();
     if (state)
-	JUMP_TAG(state);
+	EC_JUMP_TAG(ec, state);
 
     return result;
 }
 
+/*! An equivalent of \c rescue clause.
+ *
+ * Equivalent to <code>begin .. rescue .. end</code>.
+ *
+ * It is same as
+ * \code{cpp}
+ * rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError, (VALUE)0);
+ * \endcode
+ *
+ * \sa rb_rescue2
+ * \sa rb_ensure
+ * \sa rb_protect
+ * \ingroup exception
+ */
 VALUE
-rb_rescue(VALUE (* b_proc)(ANYARGS), VALUE data1,
-	  VALUE (* r_proc)(ANYARGS), VALUE data2)
+rb_rescue(VALUE (* b_proc)(VALUE), VALUE data1,
+          VALUE (* r_proc)(VALUE, VALUE), VALUE data2)
 {
     return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError,
 		      (VALUE)0);
 }
 
+/*! Protects a function call from potential global escapes from the function.
+ *
+ * Such global escapes include exceptions, \c Kernel\#throw, \c break in
+ * an iterator, for example.
+ * It first 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.
+ * \ingroup exception
+ * \sa rb_rescue
+ * \sa rb_rescue2
+ * \sa rb_ensure
+ */
 VALUE
-rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
+rb_protect(VALUE (* proc) (VALUE), VALUE data, int *pstate)
 {
     volatile VALUE result = Qnil;
-    int status;
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp = th->cfp;
+    volatile enum ruby_tag_type state;
+    rb_execution_context_t * volatile ec = GET_EC();
+    rb_control_frame_t *volatile cfp = ec->cfp;
     struct rb_vm_protect_tag protect_tag;
     rb_jmpbuf_t org_jmpbuf;
 
-    protect_tag.prev = th->protect_tag;
-
-    PUSH_TAG();
-    th->protect_tag = &protect_tag;
-    MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1);
-    if ((status = EXEC_TAG()) == 0) {
-	SAVE_ROOT_JMPBUF(th, result = (*proc) (data));
-    }
-    MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
-    th->protect_tag = protect_tag.prev;
-    POP_TAG();
+    protect_tag.prev = ec->protect_tag;
 
-    if (state) {
-	*state = status;
+    EC_PUSH_TAG(ec);
+    ec->protect_tag = &protect_tag;
+    MEMCPY(&org_jmpbuf, &rb_ec_thread_ptr(ec)->root_jmpbuf, rb_jmpbuf_t, 1);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+	SAVE_ROOT_JMPBUF(rb_ec_thread_ptr(ec), result = (*proc) (data));
     }
-    if (status != 0) {
-	th->cfp = cfp;
-	return Qnil;
+    else {
+	rb_vm_rewind_cfp(ec, cfp);
     }
+    MEMCPY(&rb_ec_thread_ptr(ec)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
+    ec->protect_tag = protect_tag.prev;
+    EC_POP_TAG();
 
+    if (pstate != NULL) *pstate = state;
     return result;
 }
 
+/*!
+ * An equivalent to \c ensure clause.
+ *
+ * Equivalent to <code>begin .. ensure .. end</code>.
+ *
+ * Calls the function \a b_proc with \a data1 as the argument,
+ * then calls \a e_proc with \a data2 when execution terminated.
+ * \return The return value of \a b_proc if no exception occurred,
+ *   or \c Qnil if otherwise.
+ * \sa rb_rescue
+ * \sa rb_rescue2
+ * \sa rb_protect
+ * \ingroup exception
+ */
 VALUE
-rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE data2)
+rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2)
 {
     int state;
     volatile VALUE result = Qnil;
-
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
+    VALUE errinfo;
+    rb_execution_context_t * volatile ec = GET_EC();
+    rb_ensure_list_t ensure_list;
+    ensure_list.entry.marker = 0;
+    ensure_list.entry.e_proc = e_proc;
+    ensure_list.entry.data2 = data2;
+    ensure_list.next = ec->ensure_list;
+    ec->ensure_list = &ensure_list;
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
 	result = (*b_proc) (data1);
     }
-    POP_TAG();
-    /* TODO: fix me */
-    /* retval = prot_tag ? prot_tag->retval : Qnil; */     /* save retval */
-    (*e_proc) (data2);
+    EC_POP_TAG();
+    errinfo = ec->errinfo;
+    if (!NIL_P(errinfo) && !RB_TYPE_P(errinfo, T_OBJECT)) {
+	ec->errinfo = Qnil;
+    }
+    ec->ensure_list=ensure_list.next;
+    (*ensure_list.entry.e_proc)(ensure_list.entry.data2);
+    ec->errinfo = errinfo;
     if (state)
-	JUMP_TAG(state);
+	EC_JUMP_TAG(ec, state);
     return result;
 }
 
-static const rb_method_entry_t *
-method_entry_of_iseq(rb_control_frame_t *cfp, rb_iseq_t *iseq)
+static ID
+frame_func_id(const rb_control_frame_t *cfp)
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp_limit;
+    const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
 
-    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);
+    if (me) {
+	return me->def->original_id;
+    }
+    else {
+	return 0;
     }
-    return 0;
 }
 
 static ID
-frame_func_id(rb_control_frame_t *cfp)
-{
-    const rb_method_entry_t *me_local;
-    rb_iseq_t *iseq = cfp->iseq;
-    if (cfp->me) {
-	return cfp->me->def->original_id;
-    }
-    while (iseq) {
-	if (RUBY_VM_IFUNC_P(iseq)) {
-	    NODE *ifunc = (NODE *)iseq;
-	    if (ifunc->nd_aid) return ifunc->nd_aid;
-	    return rb_intern("<ifunc>");
-	}
-	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;
+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;
+    }
+    else {
+	return 0;
     }
-    return 0;
 }
 
+/*!
+ * The original name of the current method.
+ *
+ * The function returns the original name of the method even if
+ * an alias of the method is called.
+ * The function can also return 0 if it is not in a method. This
+ * case can happen in a toplevel of a source file, for example.
+ *
+ * \returns the ID of the name or 0
+ * \sa rb_frame_callee
+ * \ingroup defmethod
+ */
 ID
 rb_frame_this_func(void)
 {
-    return frame_func_id(GET_THREAD()->cfp);
+    return frame_func_id(GET_EC()->cfp);
 }
 
+/*!
+ * The name of the current method.
+ *
+ * The function returns the alias if an alias of the method is called.
+ * The function can also return 0 if it is not in a method. This
+ * case can happen in a toplevel of a source file, for example.
+ *
+ * \returns the ID of the name or 0.
+ * \sa rb_frame_this_func
+ * \ingroup defmethod
+ */
 ID
 rb_frame_callee(void)
 {
-    return frame_func_id(GET_THREAD()->cfp);
+    return frame_called_id(GET_EC()->cfp);
 }
 
-static ID
-rb_frame_caller(void)
+static rb_control_frame_t *
+previous_frame(const rb_execution_context_t *ec)
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *prev_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
+    rb_control_frame_t *prev_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(ec->cfp);
     /* check if prev_cfp can be accessible */
-    if ((void *)(th->stack + th->stack_size) == (void *)(prev_cfp)) {
+    if ((void *)(ec->vm_stack + ec->vm_stack_size) == (void *)(prev_cfp)) {
         return 0;
     }
+    return prev_cfp;
+}
+
+static ID
+prev_frame_callee(void)
+{
+    rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
+    if (!prev_cfp) return 0;
+    return frame_called_id(prev_cfp);
+}
+
+static ID
+prev_frame_func(void)
+{
+    rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
+    if (!prev_cfp) return 0;
     return frame_func_id(prev_cfp);
 }
 
-void
-rb_frame_pop(void)
+/*!
+ * \private
+ * Returns the ID of the last method in the call stack.
+ * \sa rb_frame_this_func
+ * \ingroup defmethod
+ */
+ID
+rb_frame_last_func(void)
 {
-    rb_thread_t *th = GET_THREAD();
-    th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
+    const rb_execution_context_t *ec = GET_EC();
+    const rb_control_frame_t *cfp = ec->cfp;
+    ID mid;
+
+    while (!(mid = frame_func_id(cfp)) &&
+	   (cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp),
+	    !RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(ec, cfp)));
+    return mid;
 }
 
 /*
@@ -825,23 +1252,18 @@ rb_frame_pop(void)
  *     append_features(mod)   -> mod
  *
  *  When this module is included in another, Ruby calls
- *  <code>append_features</code> in this module, passing it the
- *  receiving module in _mod_. Ruby's default implementation is
- *  to add the constants, methods, and module variables of this module
- *  to _mod_ if this module has not already been added to
- *  _mod_ or one of its ancestors. See also <code>Module#include</code>.
+ *  #append_features in this module, passing it the receiving module
+ *  in _mod_. Ruby's default implementation is to add the constants,
+ *  methods, and module variables of this module to _mod_ if this
+ *  module has not already been added to _mod_ or one of its
+ *  ancestors. See also Module#include.
  */
 
 static VALUE
 rb_mod_append_features(VALUE module, VALUE include)
 {
-    switch (TYPE(include)) {
-      case T_CLASS:
-      case T_MODULE:
-	break;
-      default:
+    if (!CLASS_OR_MODULE_P(include)) {
 	Check_Type(include, T_CLASS);
-	break;
     }
     rb_include_module(include, module);
 
@@ -852,30 +1274,428 @@ rb_mod_append_features(VALUE module, VALUE include)
  *  call-seq:
  *     include(module, ...)    -> self
  *
- *  Invokes <code>Module.append_features</code> on each parameter in reverse order.
+ *  Invokes Module.append_features on each parameter in reverse order.
  */
 
 static VALUE
 rb_mod_include(int argc, VALUE *argv, VALUE module)
 {
     int i;
+    ID id_append_features, id_included;
+
+    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--) {
-	rb_funcall(argv[argc], rb_intern("append_features"), 1, module);
-	rb_funcall(argv[argc], rb_intern("included"), 1, module);
+	rb_funcall(argv[argc], id_append_features, 1, module);
+	rb_funcall(argv[argc], id_included, 1, module);
+    }
+    return module;
+}
+
+/*
+ *  call-seq:
+ *     prepend_features(mod)   -> mod
+ *
+ *  When this module is prepended in another, Ruby calls
+ *  #prepend_features in this module, passing it the receiving module
+ *  in _mod_. Ruby's default implementation is to overlay the
+ *  constants, methods, and module variables of this module to _mod_
+ *  if this module has not already been added to _mod_ or one of its
+ *  ancestors. See also Module#prepend.
+ */
+
+static VALUE
+rb_mod_prepend_features(VALUE module, VALUE prepend)
+{
+    if (!CLASS_OR_MODULE_P(prepend)) {
+	Check_Type(prepend, T_CLASS);
     }
+    rb_prepend_module(prepend, module);
+
     return module;
 }
 
+/*
+ *  call-seq:
+ *     prepend(module, ...)    -> self
+ *
+ *  Invokes Module.prepend_features on each parameter in reverse order.
+ */
+
+static VALUE
+rb_mod_prepend(int argc, VALUE *argv, VALUE module)
+{
+    int i;
+    ID id_prepend_features, id_prepended;
+
+    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--) {
+	rb_funcall(argv[argc], id_prepend_features, 1, module);
+	rb_funcall(argv[argc], id_prepended, 1, 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)
+{
+    VALUE hash = rb_ident_hash_new();
+
+    RBASIC_CLEAR_CLASS(hash); /* hide from ObjectSpace */
+    return hash;
+}
+
+static VALUE
+refinement_superclass(VALUE superclass)
+{
+    if (RB_TYPE_P(superclass, T_MODULE)) {
+	/* FIXME: Should ancestors of superclass be used here? */
+	return rb_include_class_new(superclass, rb_cBasicObject);
+    }
+    else {
+	return superclass;
+    }
+}
+
+/*!
+ * \private
+ * \todo can be static?
+ */
+void
+rb_using_refinement(rb_cref_t *cref, VALUE klass, VALUE module)
+{
+    VALUE iclass, c, superclass = klass;
+
+    ensure_class_or_module(klass);
+    Check_Type(module, T_MODULE);
+    if (NIL_P(CREF_REFINEMENTS(cref))) {
+	CREF_REFINEMENTS_SET(cref, 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 (!NIL_P(c = rb_hash_lookup(CREF_REFINEMENTS(cref), klass))) {
+	    superclass = c;
+	    while (c && RB_TYPE_P(c, T_ICLASS)) {
+		if (RBASIC(c)->klass == module) {
+		    /* already used refinement */
+		    return;
+		}
+		c = RCLASS_SUPER(c);
+	    }
+	}
+    }
+    FL_SET(module, RMODULE_IS_OVERLAID);
+    superclass = refinement_superclass(superclass);
+    c = iclass = rb_include_class_new(module, superclass);
+    RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
+
+    RCLASS_M_TBL(OBJ_WB_UNPROTECT(c)) =
+      RCLASS_M_TBL(OBJ_WB_UNPROTECT(module)); /* TODO: check unprotecting */
+
+    module = RCLASS_SUPER(module);
+    while (module && module != klass) {
+	FL_SET(module, RMODULE_IS_OVERLAID);
+	c = RCLASS_SET_SUPER(c, rb_include_class_new(module, RCLASS_SUPER(c)));
+        RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
+        module = RCLASS_SUPER(module);
+    }
+    rb_hash_aset(CREF_REFINEMENTS(cref), klass, iclass);
+}
+
+static int
+using_refinement(VALUE klass, VALUE module, VALUE arg)
+{
+    rb_cref_t *cref = (rb_cref_t *) arg;
+
+    rb_using_refinement(cref, klass, module);
+    return ST_CONTINUE;
+}
+
+static void
+using_module_recursive(const rb_cref_t *cref, VALUE klass)
+{
+    ID id_refinements;
+    VALUE super, module, refinements;
+
+    super = RCLASS_SUPER(klass);
+    if (super) {
+	using_module_recursive(cref, super);
+    }
+    switch (BUILTIN_TYPE(klass)) {
+      case T_MODULE:
+	module = klass;
+	break;
+
+      case T_ICLASS:
+	module = RBASIC(klass)->klass;
+	break;
+
+      default:
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected Module)",
+		 rb_obj_classname(klass));
+	break;
+    }
+    CONST_ID(id_refinements, "__refinements__");
+    refinements = rb_attr_get(module, id_refinements);
+    if (NIL_P(refinements)) return;
+    rb_hash_foreach(refinements, using_refinement, (VALUE) cref);
+}
+
+/*!
+ * \private
+ * \todo can be static?
+ */
+void
+rb_using_module(const rb_cref_t *cref, VALUE module)
+{
+    Check_Type(module, T_MODULE);
+    using_module_recursive(cref, module);
+    rb_clear_method_cache_by_class(rb_cObject);
+}
+
+/*! \private */
+VALUE
+rb_refinement_module_get_refined_class(VALUE module)
+{
+    ID id_refined_class;
+
+    CONST_ID(id_refined_class, "__refined_class__");
+    return rb_attr_get(module, id_refined_class);
+}
+
+static void
+add_activated_refinement(VALUE activated_refinements,
+			 VALUE klass, VALUE refinement)
+{
+    VALUE iclass, c, superclass = klass;
+
+    if (!NIL_P(c = rb_hash_lookup(activated_refinements, klass))) {
+	superclass = c;
+	while (c && RB_TYPE_P(c, T_ICLASS)) {
+	    if (RBASIC(c)->klass == refinement) {
+		/* already used refinement */
+		return;
+	    }
+	    c = RCLASS_SUPER(c);
+	}
+    }
+    FL_SET(refinement, RMODULE_IS_OVERLAID);
+    superclass = refinement_superclass(superclass);
+    c = iclass = rb_include_class_new(refinement, superclass);
+    RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
+    refinement = RCLASS_SUPER(refinement);
+    while (refinement && refinement != klass) {
+	FL_SET(refinement, RMODULE_IS_OVERLAID);
+	c = RCLASS_SET_SUPER(c, rb_include_class_new(refinement, RCLASS_SUPER(c)));
+        RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
+	refinement = RCLASS_SUPER(refinement);
+    }
+    rb_hash_aset(activated_refinements, klass, iclass);
+}
+
+/*
+ *  call-seq:
+ *     refine(mod) { block }   -> module
+ *
+ *  Refine <i>mod</i> in the receiver.
+ *
+ *  Returns a module, where refined methods are defined.
+ */
+
+static VALUE
+rb_mod_refine(VALUE module, VALUE klass)
+{
+    VALUE refinement;
+    ID id_refinements, id_activated_refinements,
+       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->ec->cfp);
+
+    if (block_handler == VM_BLOCK_HANDLER_NONE) {
+	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");
+    }
+
+    ensure_class_or_module(klass);
+    if (RB_TYPE_P(klass, T_MODULE)) {
+        FL_SET(klass, RCLASS_REFINED_BY_ANY);
+    }
+    CONST_ID(id_refinements, "__refinements__");
+    refinements = rb_attr_get(module, id_refinements);
+    if (NIL_P(refinements)) {
+	refinements = hidden_identity_hash_new();
+	rb_ivar_set(module, id_refinements, refinements);
+    }
+    CONST_ID(id_activated_refinements, "__activated_refinements__");
+    activated_refinements = rb_attr_get(module, id_activated_refinements);
+    if (NIL_P(activated_refinements)) {
+	activated_refinements = hidden_identity_hash_new();
+	rb_ivar_set(module, id_activated_refinements,
+		    activated_refinements);
+    }
+    refinement = rb_hash_lookup(refinements, klass);
+    if (NIL_P(refinement)) {
+	VALUE superclass = refinement_superclass(klass);
+	refinement = rb_module_new();
+	RCLASS_SET_SUPER(refinement, superclass);
+	FL_SET(refinement, RMODULE_IS_REFINEMENT);
+	CONST_ID(id_refined_class, "__refined_class__");
+	rb_ivar_set(refinement, id_refined_class, klass);
+	CONST_ID(id_defined_at, "__defined_at__");
+	rb_ivar_set(refinement, id_defined_at, module);
+	rb_hash_aset(refinements, klass, refinement);
+	add_activated_refinement(activated_refinements, klass, refinement);
+    }
+    rb_yield_refine_block(refinement, activated_refinements);
+    return refinement;
+}
+
+static void
+ignored_block(VALUE module, const char *klass)
+{
+    const char *anon = "";
+    Check_Type(module, T_MODULE);
+    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
+ *
+ *  Import class refinements from <i>module</i> into the current class or
+ *  module definition.
+ */
+
+static VALUE
+mod_using(VALUE self, VALUE module)
+{
+    rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
+
+    if (prev_frame_func()) {
+	rb_raise(rb_eRuntimeError,
+		 "Module#using is not permitted in methods");
+    }
+    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);
+    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(VALUE _)
+{
+    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);
+}
+
+/*!
+ * Calls \c #initialize method of \a obj with the given arguments.
+ *
+ * It also forwards the given block to \c #initialize if given.
+ *
+ * \param[in] obj the receiver object
+ * \param[in] argc the number of arguments
+ * \param[in] argv a pointer to the array of arguments
+ * \ingroup object
+ */
+void
+rb_obj_call_init(VALUE obj, int argc, const VALUE *argv)
+{
+    PASS_PASSED_BLOCK_HANDLER();
+    rb_funcallv_kw(obj, idInitialize, argc, argv, RB_NO_KEYWORDS);
+}
+
 void
-rb_obj_call_init(VALUE obj, int argc, VALUE *argv)
+rb_obj_call_init_kw(VALUE obj, int argc, const VALUE *argv, int kw_splat)
 {
-    PASS_PASSED_BLOCK();
-    rb_funcall2(obj, idInitialize, argc, argv);
+    PASS_PASSED_BLOCK_HANDLER();
+    rb_funcallv_kw(obj, idInitialize, argc, argv, kw_splat);
 }
 
+/*!
+ * Extend the object with the module.
+ *
+ * Same as \c Module\#extend_object.
+ * \ingroup class
+ */
 void
 rb_extend_object(VALUE obj, VALUE module)
 {
@@ -888,7 +1708,7 @@ rb_extend_object(VALUE obj, VALUE module)
  *
  *  Extends the specified object by adding this module's constants and
  *  methods (which are added as singleton methods). This is the callback
- *  method used by <code>Object#extend</code>.
+ *  method used by Object#extend.
  *
  *     module Picky
  *       def Picky.extend_object(o)
@@ -945,15 +1765,17 @@ static VALUE
 rb_obj_extend(int argc, VALUE *argv, VALUE obj)
 {
     int i;
+    ID id_extend_object, id_extended;
 
-    if (argc == 0) {
-	rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
-    }
+    CONST_ID(id_extend_object, "extend_object");
+    CONST_ID(id_extended, "extended");
+
+    rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     for (i = 0; i < argc; i++)
 	Check_Type(argv[i], T_MODULE);
     while (argc--) {
-	rb_funcall(argv[argc], rb_intern("extend_object"), 1, obj);
-	rb_funcall(argv[argc], rb_intern("extended"), 1, obj);
+	rb_funcall(argv[argc], id_extend_object, 1, obj);
+	rb_funcall(argv[argc], id_extended, 1, obj);
     }
     return obj;
 }
@@ -962,9 +1784,9 @@ rb_obj_extend(int argc, VALUE *argv, VALUE obj)
  *  call-seq:
  *     include(module, ...)   -> self
  *
- *  Invokes <code>Module.append_features</code>
- *  on each parameter in turn. Effectively adds the methods and constants
- *  in each module to the receiver.
+ *  Invokes Module.append_features on each parameter in turn.
+ *  Effectively adds the methods and constants in each module to the
+ *  receiver.
  */
 
 static VALUE
@@ -972,30 +1794,52 @@ top_include(int argc, VALUE *argv, VALUE self)
 {
     rb_thread_t *th = GET_THREAD();
 
-    rb_secure(4);
     if (th->top_wrapper) {
-	rb_warning
-	    ("main#include in the wrapped load is effective only in wrapper module");
+	rb_warning("main.include in the wrapped load is effective only in wrapper module");
 	return rb_mod_include(argc, argv, th->top_wrapper);
     }
     return rb_mod_include(argc, argv, rb_cObject);
 }
 
-static VALUE *
-errinfo_place(rb_thread_t *th)
+/*
+ *  call-seq:
+ *     using(module)    -> self
+ *
+ *  Import class refinements from <i>module</i> into the scope where
+ *  #using is called.
+ */
+
+static VALUE
+top_using(VALUE self, VALUE module)
+{
+    const rb_cref_t *cref = rb_vm_cref();
+    rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
+
+    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.");
+    }
+    rb_using_module(rb_vm_cref_replace_with_duplicated_cref(), module);
+    return self;
+}
+
+static const VALUE *
+errinfo_place(const rb_execution_context_t *ec)
 {
-    rb_control_frame_t *cfp = th->cfp;
-    rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(th);
+    const rb_control_frame_t *cfp = ec->cfp;
+    const rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(ec);
 
     while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, end_cfp)) {
-	if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
-	    if (cfp->iseq->type == ISEQ_TYPE_RESCUE) {
-		return &cfp->dfp[-2];
+	if (VM_FRAME_RUBYFRAME_P(cfp)) {
+	    if (cfp->iseq->body->type == ISEQ_TYPE_RESCUE) {
+		return &cfp->ep[VM_ENV_INDEX_LAST_LVAR];
 	    }
-	    else if (cfp->iseq->type == ISEQ_TYPE_ENSURE &&
-		     TYPE(cfp->dfp[-2]) != T_NODE &&
-		     !FIXNUM_P(cfp->dfp[-2])) {
-		return &cfp->dfp[-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];
 	    }
 	}
 	cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
@@ -1003,77 +1847,65 @@ errinfo_place(rb_thread_t *th)
     return 0;
 }
 
-static VALUE
-get_thread_errinfo(rb_thread_t *th)
+VALUE
+rb_ec_get_errinfo(const rb_execution_context_t *ec)
 {
-    VALUE *ptr = errinfo_place(th);
+    const VALUE *ptr = errinfo_place(ec);
     if (ptr) {
 	return *ptr;
     }
     else {
-	return th->errinfo;
+	return ec->errinfo;
     }
 }
 
 static VALUE
 get_errinfo(void)
 {
-    return get_thread_errinfo(GET_THREAD());
+    return get_ec_errinfo(GET_EC());
 }
 
 static VALUE
-errinfo_getter(ID id)
+errinfo_getter(ID id, VALUE *_)
 {
     return get_errinfo();
 }
 
-#if 0
-static void
-errinfo_setter(VALUE val, ID id, VALUE *var)
-{
-    if (!NIL_P(val) && !rb_obj_is_kind_of(val, rb_eException)) {
-	rb_raise(rb_eTypeError, "assigning non-exception to $!");
-    }
-    else {
-	VALUE *ptr = errinfo_place(GET_THREAD());
-	if (ptr) {
-	    *ptr = val;
-	}
-	else {
-	    rb_raise(rb_eRuntimeError, "errinfo_setter: not in rescue clause.");
-	}
-    }
-}
-#endif
-
+/*! The current exception in the current thread.
+ *
+ * Same as \c $! in Ruby.
+ * \return the current exception or \c Qnil
+ * \ingroup exception
+ */
 VALUE
 rb_errinfo(void)
 {
-    rb_thread_t *th = GET_THREAD();
-    return th->errinfo;
+    return GET_EC()->errinfo;
 }
 
+/*! Sets the current exception (\c $!) to the given value
+ *
+ * \param[in] err an \c Exception object or \c Qnil.
+ * \exception TypeError if \a err is neither an exception nor \c nil.
+ * \note this function does not raise the exception.
+ *   Use \c rb_raise() when you want to raise.
+ * \ingroup exception
+ */
 void
 rb_set_errinfo(VALUE err)
 {
     if (!NIL_P(err) && !rb_obj_is_kind_of(err, rb_eException)) {
 	rb_raise(rb_eTypeError, "assigning non-exception to $!");
     }
-    GET_THREAD()->errinfo = err;
-}
-
-VALUE
-rb_rubylevel_errinfo(void)
-{
-    return get_errinfo();
+    GET_EC()->errinfo = err;
 }
 
 static VALUE
-errat_getter(ID id)
+errat_getter(ID id, VALUE *_)
 {
     VALUE err = get_errinfo();
     if (!NIL_P(err)) {
-	return get_backtrace(err);
+	return rb_get_backtrace(err);
     }
     else {
 	return Qnil;
@@ -1093,17 +1925,39 @@ errat_setter(VALUE val, ID id, VALUE *var)
 /*
  *  call-seq:
  *     __method__         -> symbol
+ *
+ *  Returns the name at the definition of the current method as a
+ *  Symbol.
+ *  If called outside of a method, it returns <code>nil</code>.
+ *
+ */
+
+static VALUE
+rb_f_method_name(VALUE _)
+{
+    ID fname = prev_frame_func(); /* need *method* ID */
+
+    if (fname) {
+	return ID2SYM(fname);
+    }
+    else {
+	return Qnil;
+    }
+}
+
+/*
+ *  call-seq:
  *     __callee__         -> symbol
  *
- *  Returns the name of the current method as a Symbol.
+ *  Returns the called name of the current method as a Symbol.
  *  If called outside of a method, it returns <code>nil</code>.
  *
  */
 
 static VALUE
-rb_f_method_name(void)
+rb_f_callee_name(VALUE _)
 {
-    ID fname = rb_frame_caller(); /* need *caller* ID */
+    ID fname = prev_frame_callee(); /* need *callee* ID */
 
     if (fname) {
 	return ID2SYM(fname);
@@ -1113,23 +1967,113 @@ rb_f_method_name(void)
     }
 }
 
+/*
+ *  call-seq:
+ *     __dir__         -> string
+ *
+ *  Returns the canonicalized absolute path of the directory of the file from
+ *  which this method is called. It means symlinks in the path is resolved.
+ *  If <code>__FILE__</code> is <code>nil</code>, it returns <code>nil</code>.
+ *  The return value equals to <code>File.dirname(File.realpath(__FILE__))</code>.
+ *
+ */
+static VALUE
+f_current_dirname(VALUE _)
+{
+    VALUE base = rb_current_realfilepath();
+    if (NIL_P(base)) {
+	return Qnil;
+    }
+    base = rb_file_dirname(base);
+    return base;
+}
+
+/*
+ *  call-seq:
+ *     global_variables    -> array
+ *
+ *  Returns an array of the names of global variables.
+ *
+ *     global_variables.grep /std/   #=> [:$stdin, :$stdout, :$stderr]
+ */
+
+static VALUE
+f_global_variables(VALUE _)
+{
+    return rb_f_global_variables();
+}
+
+/*
+ *  call-seq:
+ *     trace_var(symbol, cmd )             -> nil
+ *     trace_var(symbol) {|val| block }    -> nil
+ *
+ *  Controls tracing of assignments to global variables. The parameter
+ *  +symbol+ identifies the variable (as either a string name or a
+ *  symbol identifier). _cmd_ (which may be a string or a
+ *  +Proc+ object) or block is executed whenever the variable
+ *  is assigned. The block or +Proc+ object receives the
+ *  variable's new value as a parameter. Also see
+ *  Kernel::untrace_var.
+ *
+ *     trace_var :$_, proc {|v| puts "$_ is now '#{v}'" }
+ *     $_ = "hello"
+ *     $_ = ' there'
+ *
+ *  <em>produces:</em>
+ *
+ *     $_ is now 'hello'
+ *     $_ is now ' there'
+ */
+
+static VALUE
+f_trace_var(int c, const VALUE *a, VALUE _)
+{
+    return rb_f_trace_var(c, a);
+}
+
+/*
+ *  call-seq:
+ *     untrace_var(symbol [, cmd] )   -> array or nil
+ *
+ *  Removes tracing for the specified command on the given global
+ *  variable and returns +nil+. If no command is specified,
+ *  removes all tracing for that variable and returns an array
+ *  containing the commands actually removed.
+ */
+
+static VALUE
+f_untrace_var(int c, const VALUE *a, VALUE _)
+{
+    return rb_f_untrace_var(c, a);
+}
+
 void
 Init_eval(void)
 {
     rb_define_virtual_variable("$@", errat_getter, errat_setter);
     rb_define_virtual_variable("$!", errinfo_getter, 0);
 
-    rb_define_global_function("raise", rb_f_raise, -1);
-    rb_define_global_function("fail", rb_f_raise, -1);
+    rb_define_global_function("raise", f_raise, -1);
+    rb_define_global_function("fail", f_raise, -1);
 
-    rb_define_global_function("global_variables", rb_f_global_variables, 0);	/* in variable.c */
+    rb_define_global_function("global_variables", f_global_variables, 0);
 
     rb_define_global_function("__method__", rb_f_method_name, 0);
-    rb_define_global_function("__callee__", rb_f_method_name, 0);
+    rb_define_global_function("__callee__", rb_f_callee_name, 0);
+    rb_define_global_function("__dir__", f_current_dirname, 0);
+
+    rb_define_method(rb_cModule, "include", rb_mod_include, -1);
+    rb_define_method(rb_cModule, "prepend", rb_mod_prepend, -1);
 
     rb_define_private_method(rb_cModule, "append_features", rb_mod_append_features, 1);
     rb_define_private_method(rb_cModule, "extend_object", rb_mod_extend_object, 1);
-    rb_define_private_method(rb_cModule, "include", rb_mod_include, -1);
+    rb_define_private_method(rb_cModule, "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");
 
@@ -1139,15 +2083,19 @@ Init_eval(void)
     rb_define_singleton_method(rb_cModule, "nesting", rb_mod_nesting, 0);
     rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, -1);
 
-    rb_define_singleton_method(rb_vm_top_self(), "include", top_include, -1);
+    rb_define_private_method(rb_singleton_class(rb_vm_top_self()),
+			     "include", top_include, -1);
+    rb_define_private_method(rb_singleton_class(rb_vm_top_self()),
+			     "using", top_using, 1);
 
     rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
 
-    rb_define_global_function("trace_var", rb_f_trace_var, -1);	/* in variable.c */
-    rb_define_global_function("untrace_var", rb_f_untrace_var, -1);	/* in variable.c */
+    rb_define_global_function("trace_var", f_trace_var, -1);
+    rb_define_global_function("untrace_var", f_untrace_var, -1);
+
+    rb_vm_register_special_exception(ruby_error_reenter, rb_eFatal, "exception reentered");
+    rb_vm_register_special_exception(ruby_error_stackfatal, rb_eFatal, "machine stack overflow in critical region");
 
-    exception_error = rb_exc_new3(rb_eFatal,
-				  rb_obj_freeze(rb_str_new2("exception reentered")));
-    OBJ_TAINT(exception_error);
-    OBJ_FREEZE(exception_error);
+    id_signo = rb_intern_const("signo");
+    id_status = rb_intern_const("status");
 }
diff --git a/eval_error.c b/eval_error.c
index fd06adf92d..847072ab98 100644
--- a/eval_error.c
+++ b/eval_error.c
@@ -3,223 +3,437 @@
  * included by eval.c
  */
 
-static void
-warn_printf(const char *fmt, ...)
-{
-    char buf[BUFSIZ];
-    va_list args;
-
-    va_init_list(args, fmt);
-    vsnprintf(buf, BUFSIZ, fmt, args);
-    va_end(args);
-    rb_write_error(buf);
-}
-
+#define write_warn(str, x) \
+    (NIL_P(str) ? warn_print(x) : (void)rb_str_cat_cstr(str, x))
+#define write_warn2(str, x, l) \
+    (NIL_P(str) ? warn_print2(x, l) : (void)rb_str_cat(str, x, l))
+#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
 #define warn_print(x) rb_write_error(x)
+#endif
+
 #define warn_print2(x,l) rb_write_error2((x),(l))
 
+#define write_warn_str(str,x) NIL_P(str) ? rb_write_error_str(x) : (void)rb_str_concat((str), (x))
+#define warn_print_str(x) rb_write_error_str(x)
+
+static VALUE error_pos_str(void);
+
 static void
-error_pos(void)
+error_pos(const VALUE str)
+{
+    VALUE pos = error_pos_str();
+    if (!NIL_P(pos)) {
+	write_warn_str(str, pos);
+    }
+}
+
+static VALUE
+error_pos_str(void)
 {
-    const char *sourcefile = rb_sourcefile();
-    int sourceline = rb_sourceline();
+    int sourceline;
+    VALUE sourcefile = rb_source_location(&sourceline);
 
-    if (sourcefile) {
+    if (!NIL_P(sourcefile)) {
+	ID caller_name;
 	if (sourceline == 0) {
-	    warn_printf("%s", sourcefile);
+	    return rb_sprintf("%"PRIsVALUE": ", sourcefile);
 	}
-	else if (rb_frame_callee()) {
-	    warn_printf("%s:%d:in `%s'", sourcefile, sourceline,
-			rb_id2name(rb_frame_callee()));
+	else if ((caller_name = rb_frame_callee()) != 0) {
+	    return rb_sprintf("%"PRIsVALUE":%d:in `%"PRIsVALUE"': ",
+			      sourcefile, sourceline,
+			      rb_id2str(caller_name));
 	}
 	else {
-	    warn_printf("%s:%d", sourcefile, sourceline);
+	    return rb_sprintf("%"PRIsVALUE":%d: ", sourcefile, sourceline);
 	}
     }
+    return Qnil;
 }
 
-static VALUE
-get_backtrace(VALUE info)
+static void
+set_backtrace(VALUE info, VALUE bt)
 {
-    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);
-}
+    ID set_backtrace = rb_intern("set_backtrace");
 
-VALUE
-rb_get_backtrace(VALUE info)
-{
-    return get_backtrace(info);
+    if (rb_backtrace_p(bt)) {
+	if (rb_method_basic_definition_p(CLASS_OF(info), set_backtrace)) {
+	    rb_exc_set_backtrace(info, bt);
+	    return;
+	}
+	else {
+	    bt = rb_backtrace_to_str_ary(bt);
+	}
+    }
+    rb_check_funcall(info, set_backtrace, 1, &bt);
 }
 
 static void
-set_backtrace(VALUE info, VALUE bt)
+error_print(rb_execution_context_t *ec)
 {
-    rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
+    rb_ec_error_print(ec, ec->errinfo);
 }
 
 static void
-error_print(void)
+write_warnq(VALUE out, VALUE str, const char *ptr, long len)
 {
-    volatile VALUE errat = Qnil;		/* OK */
-    rb_thread_t *th = GET_THREAD();
-    VALUE errinfo = th->errinfo;
-    int raised_flag = th->raised_flag;
-    volatile VALUE eclass, e;
-    const char *volatile einfo;
-    volatile long elen;
-
-    if (NIL_P(errinfo))
-	return;
-    rb_thread_raised_clear(th);
-
-    PUSH_TAG();
-    if (EXEC_TAG() == 0) {
-	errat = get_backtrace(errinfo);
+    if (NIL_P(out)) {
+        const char *beg = ptr;
+        const long olen = len;
+        for (; len > 0; --len, ++ptr) {
+            unsigned char c = *ptr;
+            switch (c) {
+              case '\n': case '\t': continue;
+            }
+            if (rb_iscntrl(c)) {
+                char buf[5];
+                const char *cc = 0;
+                if (ptr > beg) rb_write_error2(beg, ptr - beg);
+                beg = ptr + 1;
+                cc = ruby_escaped_char(c);
+                if (cc) {
+                    rb_write_error2(cc, strlen(cc));
+                }
+                else {
+                    rb_write_error2(buf, snprintf(buf, sizeof(buf), "\\x%02X", c));
+                }
+            }
+            else if (c == '\\') {
+                rb_write_error2(beg, ptr - beg + 1);
+                beg = ptr;
+            }
+        }
+        if (ptr > beg) {
+            if (beg == RSTRING_PTR(str) && olen == RSTRING_LEN(str))
+                rb_write_error_str(str);
+            else
+                rb_write_error2(beg, ptr - beg);
+        }
     }
     else {
-	errat = Qnil;
-    }
-    if (EXEC_TAG())
-	goto error;
-    if (NIL_P(errat)) {
-	const char *file = rb_sourcefile();
-	int line = rb_sourceline();
-	if (!file)
-	    warn_printf("%d", line);
-	else if (!line)
-	    warn_printf("%s", file);
-	else
-	    warn_printf("%s:%d", file, line);
-    }
-    else if (RARRAY_LEN(errat) == 0) {
-	error_pos();
+        rb_str_cat(out, ptr, len);
     }
-    else {
-	VALUE mesg = RARRAY_PTR(errat)[0];
+}
+
+#define CSI_BEGIN "\033["
+#define CSI_SGR "m"
+
+static const char underline[] = CSI_BEGIN"1;4"CSI_SGR;
+static const char bold[] = CSI_BEGIN"1"CSI_SGR;
+static const char reset[] = CSI_BEGIN""CSI_SGR;
+
+static void
+print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, const VALUE str, int highlight)
+{
+    const char *einfo = "";
+    long elen = 0;
+    VALUE mesg;
 
-	if (NIL_P(mesg))
-	    error_pos();
+    if (emesg != Qundef) {
+	if (NIL_P(errat) || RARRAY_LEN(errat) == 0 ||
+	    NIL_P(mesg = RARRAY_AREF(errat, 0))) {
+	    error_pos(str);
+	}
 	else {
-	    warn_print2(RSTRING_PTR(mesg), RSTRING_LEN(mesg));
+	    write_warn_str(str, mesg);
+	    write_warn(str, ": ");
 	}
-    }
 
-    eclass = CLASS_OF(errinfo);
-    if (EXEC_TAG() == 0) {
-	e = rb_funcall(errinfo, rb_intern("message"), 0, 0);
-	StringValue(e);
-	einfo = RSTRING_PTR(e);
-	elen = RSTRING_LEN(e);
-    }
-    else {
-	einfo = "";
-	elen = 0;
+	if (!NIL_P(emesg)) {
+	    einfo = RSTRING_PTR(emesg);
+            elen = RSTRING_LEN(emesg);
+	}
     }
-    if (EXEC_TAG())
-	goto error;
+
     if (eclass == rb_eRuntimeError && elen == 0) {
-	warn_print(": unhandled exception\n");
+	if (highlight) write_warn(str, underline);
+	write_warn(str, "unhandled exception");
+	if (highlight) write_warn(str, reset);
+	write_warn2(str, "\n", 1);
     }
     else {
 	VALUE epath;
 
 	epath = rb_class_name(eclass);
 	if (elen == 0) {
-	    warn_print(": ");
-	    warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
-	    warn_print("\n");
+	    if (highlight) write_warn(str, underline);
+	    write_warn_str(str, epath);
+	    if (highlight) write_warn(str, reset);
+	    write_warn(str, "\n");
 	}
 	else {
-	    char *tail = 0;
-	    long len = elen;
+            /* emesg is a String instance */
+	    const char *tail = 0;
 
+            if (highlight) write_warn(str, bold);
 	    if (RSTRING_PTR(epath)[0] == '#')
 		epath = 0;
 	    if ((tail = memchr(einfo, '\n', elen)) != 0) {
-		len = tail - einfo;
+                write_warnq(str, emesg, einfo, tail - einfo);
 		tail++;		/* skip newline */
 	    }
-	    warn_print(": ");
-	    warn_print2(einfo, len);
+	    else {
+                write_warnq(str, emesg, einfo, elen);
+	    }
 	    if (epath) {
-		warn_print(" (");
-		warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
-		warn_print(")\n");
+		write_warn(str, " (");
+		if (highlight) write_warn(str, underline);
+                write_warn_str(str, epath);
+		if (highlight) {
+		    write_warn(str, reset);
+		    write_warn(str, bold);
+		}
+		write_warn2(str, ")", 1);
+		if (highlight) write_warn(str, reset);
+		write_warn2(str, "\n", 1);
 	    }
-	    if (tail) {
-		warn_print2(tail, elen - len - 1);
-		if (einfo[elen-1] != '\n') warn_print2("\n", 1);
+	    if (tail && einfo+elen > tail) {
+		if (!highlight) {
+                    write_warnq(str, emesg, tail, einfo+elen-tail);
+		    if (einfo[elen-1] != '\n') write_warn2(str, "\n", 1);
+		}
+		else {
+		    elen -= tail - einfo;
+		    einfo = tail;
+		    while (elen > 0) {
+			tail = memchr(einfo, '\n', elen);
+			if (!tail || tail > einfo) {
+			    write_warn(str, bold);
+                            write_warnq(str, emesg, einfo, tail ? tail-einfo : elen);
+			    write_warn(str, reset);
+			    if (!tail) {
+				write_warn2(str, "\n", 1);
+				break;
+			    }
+			}
+			elen -= tail - einfo;
+			einfo = tail;
+			do ++tail; while (tail < einfo+elen && *tail == '\n');
+                        write_warnq(str, emesg, einfo, tail-einfo);
+			elen -= tail - einfo;
+			einfo = tail;
+		    }
+		}
+	    }
+	    else if (!epath) {
+		write_warn2(str, "\n", 1);
 	    }
 	}
     }
+}
 
+static void
+print_backtrace(const VALUE eclass, const VALUE errat, const VALUE str, int reverse)
+{
     if (!NIL_P(errat)) {
 	long i;
 	long len = RARRAY_LEN(errat);
-	VALUE *ptr = RARRAY_PTR(errat);
         int skip = eclass == rb_eSysStackError;
+	const int threshold = 1000000000;
+        int width = (len <= 1) ? INT_MIN : ((int)log10((double)(len > threshold ?
+					 ((len - 1) / threshold) :
+					 len - 1)) +
+		     (len < threshold ? 0 : 9) + 1);
 
 #define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
 #define TRACE_HEAD 8
 #define TRACE_TAIL 5
 
 	for (i = 1; i < len; i++) {
-	    if (TYPE(ptr[i]) == T_STRING) {
-		warn_printf("\tfrom %s\n", RSTRING_PTR(ptr[i]));
+	    VALUE line = RARRAY_AREF(errat, reverse ? len - i : i);
+	    if (RB_TYPE_P(line, T_STRING)) {
+		VALUE bt = rb_str_new_cstr("\t");
+		if (reverse) rb_str_catf(bt, "%*ld: ", width, len - i);
+		write_warn_str(str, rb_str_catf(bt, "from %"PRIsVALUE"\n", line));
 	    }
 	    if (skip && i == TRACE_HEAD && len > TRACE_MAX) {
-		warn_printf("\t ... %ld levels...\n",
-			    len - TRACE_HEAD - TRACE_TAIL);
+		write_warn_str(str, rb_sprintf("\t ... %ld levels...\n",
+					  len - TRACE_HEAD - TRACE_TAIL));
 		i = len - TRACE_TAIL;
 	    }
 	}
     }
-  error:
-    POP_TAG();
-    rb_thread_raised_set(th, raised_flag);
 }
 
+VALUE rb_get_message(VALUE exc);
+
+static int
+shown_cause_p(VALUE cause, VALUE *shown_causes)
+{
+    VALUE shown = *shown_causes;
+    if (!shown) {
+        *shown_causes = shown = rb_obj_hide(rb_ident_hash_new());
+    }
+    if (rb_hash_has_key(shown, cause)) return TRUE;
+    rb_hash_aset(shown, cause, Qtrue);
+    return FALSE;
+}
+
+static void
+show_cause(VALUE errinfo, VALUE str, VALUE highlight, VALUE reverse, VALUE *shown_causes)
+{
+    VALUE cause = rb_attr_get(errinfo, id_cause);
+    if (!NIL_P(cause) && rb_obj_is_kind_of(cause, rb_eException) &&
+        !shown_cause_p(cause, shown_causes)) {
+        volatile VALUE eclass = CLASS_OF(cause);
+        VALUE errat = rb_get_backtrace(cause);
+        VALUE emesg = rb_get_message(cause);
+        if (reverse) {
+            show_cause(cause, str, highlight, reverse, shown_causes);
+            print_backtrace(eclass, errat, str, TRUE);
+            print_errinfo(eclass, errat, emesg, str, highlight!=0);
+        }
+        else {
+            print_errinfo(eclass, errat, emesg, str, highlight!=0);
+            print_backtrace(eclass, errat, str, FALSE);
+            show_cause(cause, str, highlight, reverse, shown_causes);
+        }
+    }
+}
+
+void
+rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE highlight, VALUE reverse)
+{
+    volatile VALUE eclass;
+    VALUE shown_causes = 0;
+
+    if (NIL_P(errinfo))
+	return;
+
+    if (errat == Qundef) {
+	errat = Qnil;
+    }
+    eclass = CLASS_OF(errinfo);
+    if (NIL_P(reverse) || NIL_P(highlight)) {
+	VALUE tty = (VALUE)rb_stderr_tty_p();
+	if (NIL_P(reverse)) reverse = tty;
+	if (NIL_P(highlight)) highlight = tty;
+    }
+    if (reverse) {
+	static const char traceback[] = "Traceback "
+	    "(most recent call last):\n";
+	const int bold_part = rb_strlen_lit("Traceback");
+	char buff[sizeof(traceback)+sizeof(bold)+sizeof(reset)-2], *p = buff;
+	const char *msg = traceback;
+	long len = sizeof(traceback) - 1;
+	if (highlight) {
+#define APPEND(s, l) (memcpy(p, s, l), p += (l))
+	    APPEND(bold, sizeof(bold)-1);
+	    APPEND(traceback, bold_part);
+	    APPEND(reset, sizeof(reset)-1);
+	    APPEND(traceback + bold_part, sizeof(traceback)-bold_part-1);
+#undef APPEND
+	    len = p - (msg = buff);
+	}
+	write_warn2(str, msg, len);
+        show_cause(errinfo, str, highlight, reverse, &shown_causes);
+	print_backtrace(eclass, errat, str, TRUE);
+	print_errinfo(eclass, errat, emesg, str, highlight!=0);
+    }
+    else {
+	print_errinfo(eclass, errat, emesg, str, highlight!=0);
+	print_backtrace(eclass, errat, str, FALSE);
+        show_cause(errinfo, str, highlight, reverse, &shown_causes);
+    }
+}
+
+void
+rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo)
+{
+    volatile uint8_t raised_flag = ec->raised_flag;
+    volatile VALUE errat = Qundef;
+    volatile VALUE emesg = Qundef;
+
+    if (NIL_P(errinfo))
+	return;
+    rb_ec_raised_clear(ec);
+
+    EC_PUSH_TAG(ec);
+    if (EC_EXEC_TAG() == TAG_NONE) {
+	errat = rb_get_backtrace(errinfo);
+    }
+    if (emesg == Qundef) {
+	emesg = Qnil;
+	emesg = rb_get_message(errinfo);
+    }
+
+    rb_error_write(errinfo, emesg, errat, Qnil, Qnil, Qnil);
+
+    EC_POP_TAG();
+    ec->errinfo = errinfo;
+    rb_ec_raised_set(ec, raised_flag);
+}
+
+#define undef_mesg_for(v, k) rb_fstring_lit("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"))
+
 void
-ruby_error_print(void)
+rb_print_undef(VALUE klass, ID id, rb_method_visibility_t visi)
 {
-    error_print();
+    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));
 }
 
 void
-rb_print_undef(VALUE klass, ID id, int scope)
+rb_print_undef_str(VALUE klass, VALUE name)
 {
-    const char *v;
+    const int is_mod = RB_TYPE_P(klass, T_MODULE);
+    rb_name_err_raise_str(undef_mesg(""), klass, name);
+}
 
-    switch (scope) {
-      default:
-      case NOEX_PUBLIC: v = ""; break;
-      case NOEX_PRIVATE: v = " private"; break;
-      case NOEX_PROTECTED: v = " protected"; break;
+#define inaccessible_mesg_for(v, k) rb_fstring_lit("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)
+{
+    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_error(id, "undefined%s method `%s' for %s `%s'", v,
-		  rb_id2name(id),
-		  (TYPE(klass) == T_MODULE) ? "module" : "class",
-		  rb_class2name(klass));
+    rb_name_err_raise_str(mesg, klass, ID2SYM(id));
 }
 
 static int
 sysexit_status(VALUE err)
 {
-    VALUE st = rb_iv_get(err, "status");
+    VALUE st = rb_ivar_get(err, id_status);
     return NUM2INT(st);
 }
 
+#define unknown_longjmp_status(status) \
+    rb_bug("Unknown longjmp status %d", status)
+
 static int
-error_handle(int ex)
+error_handle(rb_execution_context_t *ec, int ex)
 {
     int status = EXIT_FAILURE;
-    rb_thread_t *th = GET_THREAD();
 
-    if (rb_threadptr_set_raised(th))
+    if (rb_ec_set_raised(ec))
 	return EXIT_FAILURE;
     switch (ex & TAG_MASK) {
       case 0:
@@ -227,50 +441,51 @@ error_handle(int ex)
 	break;
 
       case TAG_RETURN:
-	error_pos();
-	warn_print(": unexpected return\n");
+	error_pos(Qnil);
+	warn_print("unexpected return\n");
 	break;
       case TAG_NEXT:
-	error_pos();
-	warn_print(": unexpected next\n");
+	error_pos(Qnil);
+	warn_print("unexpected next\n");
 	break;
       case TAG_BREAK:
-	error_pos();
-	warn_print(": unexpected break\n");
+	error_pos(Qnil);
+	warn_print("unexpected break\n");
 	break;
       case TAG_REDO:
-	error_pos();
-	warn_print(": unexpected redo\n");
+	error_pos(Qnil);
+	warn_print("unexpected redo\n");
 	break;
       case TAG_RETRY:
-	error_pos();
-	warn_print(": retry outside of rescue clause\n");
+	error_pos(Qnil);
+	warn_print("retry outside of rescue clause\n");
 	break;
       case TAG_THROW:
 	/* TODO: fix me */
-	error_pos();
-	warn_printf(": unexpected throw\n");
+	error_pos(Qnil);
+	warn_print("unexpected throw\n");
 	break;
       case TAG_RAISE: {
-	VALUE errinfo = GET_THREAD()->errinfo;
+	VALUE errinfo = ec->errinfo;
 	if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {
 	    status = sysexit_status(errinfo);
 	}
-	else if (rb_obj_is_instance_of(errinfo, rb_eSignal)) {
+	else if (rb_obj_is_instance_of(errinfo, rb_eSignal) &&
+		 rb_ivar_get(errinfo, id_signo) != INT2FIX(SIGSEGV)) {
 	    /* no message when exiting by signal */
 	}
 	else {
-	    error_print();
+	    rb_ec_error_print(ec, errinfo);
 	}
 	break;
       }
       case TAG_FATAL:
-	error_print();
+	error_print(ec);
 	break;
       default:
-	rb_bug("Unknown longjmp status %d", ex);
+	unknown_longjmp_status(ex);
 	break;
     }
-    rb_threadptr_reset_raised(th);
+    rb_ec_reset_raised(ec);
     return status;
 }
diff --git a/eval_intern.h b/eval_intern.h
index 483e711c34..aa07ce30ed 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -4,15 +4,23 @@
 #include "ruby/ruby.h"
 #include "vm_core.h"
 
-#define PASS_PASSED_BLOCK_TH(th) do { \
-    (th)->passed_block = GC_GUARDED_PTR_REF((rb_block_t *)(th)->cfp->lfp[0]); \
-    (th)->cfp->flag |= VM_FRAME_FLAG_PASSED; \
-} while (0)
+static inline void
+vm_passed_block_handler_set(rb_execution_context_t *ec, VALUE block_handler)
+{
+    vm_block_handler_verify(block_handler);
+    ec->passed_block_handler = block_handler;
+}
 
-#define PASS_PASSED_BLOCK() do { \
-    rb_thread_t * const __th__ = GET_THREAD(); \
-    PASS_PASSED_BLOCK_TH(__th__); \
-} while (0)
+static inline void
+pass_passed_block_handler(rb_execution_context_t *ec)
+{
+    VALUE block_handler = rb_vm_frame_block_handler(ec->cfp);
+    vm_passed_block_handler_set(ec, block_handler);
+    VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_PASSED);
+}
+
+#define PASS_PASSED_BLOCK_HANDLER_EC(ec) pass_passed_block_handler(ec)
+#define PASS_PASSED_BLOCK_HANDLER() pass_passed_block_handler(GET_EC())
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -28,29 +36,12 @@
 #include <setjmp.h>
 
 #ifdef __APPLE__
-#include <crt_externs.h>
-#endif
-
-/* Make alloca work the best possible way.  */
-#ifdef __GNUC__
-# ifndef atarist
-#  ifndef alloca
-#   define alloca __builtin_alloca
-#  endif
-# endif	/* atarist */
-#else
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
+# ifdef HAVE_CRT_EXTERNS_H
+#  include <crt_externs.h>
 # else
-#  ifdef _AIX
-#pragma alloca
-#  else
-#   ifndef alloca		/* predefined by HP cc +Olibcalls */
-void *alloca();
-#   endif
-#  endif /* AIX */
-# endif	/* HAVE_ALLOCA_H */
-#endif /* __GNUC__ */
+#  include "missing/crt_externs.h"
+# endif
+#endif
 
 #ifndef HAVE_STRING_H
 char *strrchr(const char *, const char);
@@ -100,123 +91,210 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval
 
 #include <sys/stat.h>
 
+#ifdef _MSC_VER
+#define SAVE_ROOT_JMPBUF_BEFORE_STMT \
+    __try {
+#define SAVE_ROOT_JMPBUF_AFTER_STMT \
+    } \
+    __except (GetExceptionCode() == EXCEPTION_STACK_OVERFLOW ? \
+	      (rb_ec_raised_set(GET_EC(), RAISED_STACKOVERFLOW), \
+	       raise(SIGSEGV), \
+	       EXCEPTION_EXECUTE_HANDLER) : \
+	      EXCEPTION_CONTINUE_SEARCH) { \
+	/* never reaches here */ \
+    }
+#elif defined(__MINGW32__)
+LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *);
+#define SAVE_ROOT_JMPBUF_BEFORE_STMT \
+    do { \
+	PVOID _handler = AddVectoredExceptionHandler(1, rb_w32_stack_overflow_handler);
+
+#define SAVE_ROOT_JMPBUF_AFTER_STMT \
+	RemoveVectoredExceptionHandler(_handler); \
+    } while (0);
+#else
+#define SAVE_ROOT_JMPBUF_BEFORE_STMT
+#define SAVE_ROOT_JMPBUF_AFTER_STMT
+#endif
+
 #define SAVE_ROOT_JMPBUF(th, stmt) do \
   if (ruby_setjmp((th)->root_jmpbuf) == 0) { \
+      SAVE_ROOT_JMPBUF_BEFORE_STMT \
       stmt; \
+      SAVE_ROOT_JMPBUF_AFTER_STMT \
   } \
   else { \
       rb_fiber_start(); \
   } while (0)
 
-#define TH_PUSH_TAG(th) do { \
-  rb_thread_t * const _th = (th); \
+#define EC_PUSH_TAG(ec) do { \
+  rb_execution_context_t * const _ec = (ec); \
   struct rb_vm_tag _tag; \
-  _tag.tag = 0; \
-  _tag.prev = _th->tag; \
-  _th->tag = &_tag;
+  _tag.state = TAG_NONE; \
+  _tag.tag = Qundef; \
+  _tag.prev = _ec->tag;
 
-#define TH_POP_TAG() \
-  _th->tag = _tag.prev; \
+#define EC_POP_TAG() \
+  _ec->tag = _tag.prev; \
 } while (0)
 
-#define TH_POP_TAG2() \
-  _th->tag = _tag.prev
+#define EC_TMPPOP_TAG() \
+  _ec->tag = _tag.prev
 
-#define PUSH_TAG() TH_PUSH_TAG(GET_THREAD())
-#define POP_TAG()      TH_POP_TAG()
+#define EC_REPUSH_TAG() (void)(_ec->tag = &_tag)
 
-#define TH_EXEC_TAG() ruby_setjmp(_th->tag->buf)
+#if defined __GNUC__ && __GNUC__ == 4 && (__GNUC_MINOR__ >= 6 && __GNUC_MINOR__ <= 8) || __clang__
+/* This macro prevents GCC 4.6--4.8 from emitting maybe-uninitialized warnings.
+ * This macro also prevents Clang from dumping core in EC_EXEC_TAG().
+ * (I confirmed Clang 4.0.1 and 5.0.0.)
+ */
+# 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
 
-#define EXEC_TAG() \
-  TH_EXEC_TAG()
+/* clear ec->tag->state, and return the value */
+static inline int
+rb_ec_tag_state(const rb_execution_context_t *ec)
+{
+    enum ruby_tag_type state = ec->tag->state;
+    ec->tag->state = TAG_NONE;
+    return state;
+}
 
-#define TH_JUMP_TAG(th, st) do { \
-  ruby_longjmp((th)->tag->buf,(st)); \
-} while (0)
+NORETURN(static inline void rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st));
+static inline void
+rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st)
+{
+    ec->tag->state = st;
+    ruby_longjmp(ec->tag->buf, 1);
+}
 
-#define JUMP_TAG(st) TH_JUMP_TAG(GET_THREAD(), (st))
+/*
+  setjmp() in assignment expression rhs is undefined behavior
+  [ISO/IEC 9899:1999] 7.13.1.1
+*/
+#define EC_EXEC_TAG() \
+    (ruby_setjmp(_tag.buf) ? rb_ec_tag_state(VAR_FROM_MEMORY(_ec)) : (EC_REPUSH_TAG(), 0))
+
+#define EC_JUMP_TAG(ec, st) rb_ec_tag_jump(ec, st)
 
 #define INTERNAL_EXCEPTION_P(exc) FIXNUM_P(exc)
 
-enum ruby_tag_type {
-    RUBY_TAG_RETURN	= 0x1,
-    RUBY_TAG_BREAK	= 0x2,
-    RUBY_TAG_NEXT	= 0x3,
-    RUBY_TAG_RETRY	= 0x4,
-    RUBY_TAG_REDO	= 0x5,
-    RUBY_TAG_RAISE	= 0x6,
-    RUBY_TAG_THROW	= 0x7,
-    RUBY_TAG_FATAL	= 0x8,
-    RUBY_TAG_MASK	= 0xf
-};
-#define TAG_RETURN	RUBY_TAG_RETURN
-#define TAG_BREAK	RUBY_TAG_BREAK
-#define TAG_NEXT	RUBY_TAG_NEXT
-#define TAG_RETRY	RUBY_TAG_RETRY
-#define TAG_REDO	RUBY_TAG_REDO
-#define TAG_RAISE	RUBY_TAG_RAISE
-#define TAG_THROW	RUBY_TAG_THROW
-#define TAG_FATAL	RUBY_TAG_FATAL
-#define TAG_MASK	RUBY_TAG_MASK
-
-#define NEW_THROW_OBJECT(val, pt, st) \
-  ((VALUE)rb_node_newnode(NODE_LIT, (VALUE)(val), (VALUE)(pt), (VALUE)(st)))
-#define SET_THROWOBJ_CATCH_POINT(obj, val) \
-  (RNODE((obj))->u2.value = (val))
-#define SET_THROWOBJ_STATE(obj, val) \
-  (RNODE((obj))->u3.value = (val))
-
-#define GET_THROWOBJ_VAL(obj)         ((VALUE)RNODE((obj))->u1.value)
-#define GET_THROWOBJ_CATCH_POINT(obj) ((VALUE*)RNODE((obj))->u2.value)
-#define GET_THROWOBJ_STATE(obj)       ((int)RNODE((obj))->u3.value)
-
-#define SCOPE_TEST(f)  (rb_vm_cref()->nd_visi & (f))
-#define SCOPE_CHECK(f) (rb_vm_cref()->nd_visi == (f))
-#define SCOPE_SET(f)   (rb_vm_cref()->nd_visi = (f))
-
-#define CHECK_STACK_OVERFLOW(cfp, margin) do \
-  if ((VALUE *)((char *)(((VALUE *)(cfp)->sp) + (margin)) + sizeof(rb_control_frame_t)) >= ((VALUE *)(cfp))) { \
-      rb_exc_raise(sysstack_error); \
-  } \
-while (0)
+/* CREF operators */
 
-void rb_thread_cleanup(void);
-void rb_thread_wait_other_threads(void);
+#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 {
     RAISED_EXCEPTION = 1,
     RAISED_STACKOVERFLOW = 2,
     RAISED_NOMEMORY = 4
 };
-int rb_threadptr_set_raised(rb_thread_t *th);
-int rb_threadptr_reset_raised(rb_thread_t *th);
-#define rb_thread_raised_set(th, f)   ((th)->raised_flag |= (f))
-#define rb_thread_raised_reset(th, f) ((th)->raised_flag &= ~(f))
-#define rb_thread_raised_p(th, f)     (((th)->raised_flag & (f)) != 0)
-#define rb_thread_raised_clear(th)    ((th)->raised_flag = 0)
+#define rb_ec_raised_set(ec, f)   ((ec)->raised_flag |= (f))
+#define rb_ec_raised_reset(ec, f) ((ec)->raised_flag &= ~(f))
+#define rb_ec_raised_p(ec, f)    (((ec)->raised_flag & (f)) != 0)
+#define rb_ec_raised_clear(ec)    ((ec)->raised_flag = 0)
+int rb_ec_set_raised(rb_execution_context_t *ec);
+int rb_ec_reset_raised(rb_execution_context_t *ec);
+int rb_ec_stack_check(rb_execution_context_t *ec);
 
-VALUE rb_f_eval(int argc, VALUE *argv, VALUE self);
-VALUE rb_make_exception(int argc, VALUE *argv);
+VALUE rb_f_eval(int argc, const VALUE *argv, VALUE self);
+VALUE rb_make_exception(int argc, const VALUE *argv);
+
+NORETURN(void rb_method_name_error(VALUE, VALUE));
 
 NORETURN(void rb_fiber_start(void));
 
-NORETURN(void rb_print_undef(VALUE, ID, int));
+NORETURN(void rb_print_undef(VALUE, ID, rb_method_visibility_t));
+NORETURN(void rb_print_undef_str(VALUE, VALUE));
+NORETURN(void rb_print_inaccessible(VALUE, ID, rb_method_visibility_t));
 NORETURN(void rb_vm_localjump_error(const char *,VALUE, int));
-NORETURN(void rb_vm_jump_tag_but_local_jump(int, VALUE));
-NORETURN(void rb_raise_method_missing(rb_thread_t *th, int argc, VALUE *argv,
-				      VALUE obj, int call_status));
+NORETURN(void rb_vm_jump_tag_but_local_jump(int));
 
 VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val);
-NODE *rb_vm_cref(void);
-VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename);
+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);
 void rb_vm_set_progname(VALUE filename);
 void rb_thread_terminate_all(void);
-VALUE rb_vm_top_self();
 VALUE rb_vm_cbase(void);
-void rb_trap_restore_mask(void);
+
+/* vm_backtrace.c */
+VALUE rb_ec_backtrace_object(const rb_execution_context_t *ec);
+VALUE rb_ec_backtrace_str_ary(const rb_execution_context_t *ec, long lev, long n);
+VALUE rb_ec_backtrace_location_ary(const rb_execution_context_t *ec, long lev, long n);
 
 #ifndef CharNext		/* defined as CharNext[AW] on Windows. */
-#define CharNext(p) ((p) + mblen((p), RUBY_MBCHAR_MAXSIZE))
+# ifdef HAVE_MBLEN
+#  define CharNext(p) ((p) + mblen((p), RUBY_MBCHAR_MAXSIZE))
+# else
+#  define CharNext(p) ((p) + 1)
+# endif
 #endif
 
 #if defined DOSISH || defined __CYGWIN__
diff --git a/eval_jump.c b/eval_jump.c
index a8f04808ca..75d4ad0207 100644
--- a/eval_jump.c
+++ b/eval_jump.c
@@ -35,7 +35,7 @@ rb_call_end_proc(VALUE data)
  */
 
 static VALUE
-rb_f_at_exit(void)
+rb_f_at_exit(VALUE _)
 {
     VALUE proc;
 
@@ -50,7 +50,6 @@ rb_f_at_exit(void)
 struct end_proc_data {
     void (*func) ();
     VALUE data;
-    int safe;
     struct end_proc_data *next;
 };
 
@@ -72,7 +71,6 @@ rb_set_end_proc(void (*func)(VALUE), VALUE data)
     link->next = *list;
     link->func = func;
     link->data = data;
-    link->safe = rb_safe_level();
     *list = link;
 }
 
@@ -93,45 +91,44 @@ rb_mark_end_proc(void)
     }
 }
 
-void
-rb_exec_end_proc(void)
+static void
+exec_end_procs_chain(struct end_proc_data *volatile *procs, VALUE *errp)
 {
-    struct end_proc_data *volatile link;
-    int status;
-    volatile int safe = rb_safe_level();
-
-    while (ephemeral_end_procs) {
-	link = ephemeral_end_procs;
-	ephemeral_end_procs = link->next;
-
-	PUSH_TAG();
-	if ((status = EXEC_TAG()) == 0) {
-	    rb_set_safe_level_force(link->safe);
-	    (*link->func) (link->data);
-	}
-	POP_TAG();
-	if (status) {
-	    error_handle(status);
-	}
+    struct end_proc_data volatile endproc;
+    struct end_proc_data *link;
+    VALUE errinfo = *errp;
+
+    while ((link = *procs) != 0) {
+	*procs = link->next;
+	endproc = *link;
 	xfree(link);
+	(*endproc.func) (endproc.data);
+	*errp = errinfo;
     }
+}
 
-    while (end_procs) {
-	link = end_procs;
-	end_procs = link->next;
-
-	PUSH_TAG();
-	if ((status = EXEC_TAG()) == 0) {
-	    rb_set_safe_level_force(link->safe);
-	    (*link->func) (link->data);
-	}
-	POP_TAG();
-	if (status) {
-	    error_handle(status);
-	}
-	xfree(link);
+static void
+rb_ec_exec_end_proc(rb_execution_context_t * ec)
+{
+    enum ruby_tag_type state;
+    volatile VALUE errinfo = ec->errinfo;
+
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+      again:
+	exec_end_procs_chain(&ephemeral_end_procs, &ec->errinfo);
+	exec_end_procs_chain(&end_procs, &ec->errinfo);
+    }
+    else {
+	EC_TMPPOP_TAG();
+        error_handle(ec, state);
+	if (!NIL_P(ec->errinfo)) errinfo = ec->errinfo;
+	EC_REPUSH_TAG();
+	goto again;
     }
-    rb_set_safe_level_force(safe);
+    EC_POP_TAG();
+
+    ec->errinfo = errinfo;
 }
 
 void
diff --git a/ext/-test-/add_suffix/bug.c b/ext/-test-/add_suffix/bug.c
deleted file mode 100644
index cd215338e0..0000000000
--- a/ext/-test-/add_suffix/bug.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "ruby.h"
-#include "ruby/defines.h"
-#include "ruby/util.h"
-#ifndef HAVE_RUBY_ADD_SUFFIX
-#define _WIN32 1
-#include "util.c"
-#endif
-
-static VALUE
-add_suffix(VALUE self, VALUE path, VALUE suffix)
-{
-    StringValueCStr(path);
-    ruby_add_suffix(path, StringValueCStr(suffix));
-    return path;
-}
-
-void
-Init_bug(void)
-{
-    VALUE mBug = rb_define_module("Bug");
-    rb_define_module_function(mBug, "add_suffix", add_suffix, 2);
-}
diff --git a/ext/-test-/add_suffix/depend b/ext/-test-/add_suffix/depend
deleted file mode 100644
index 943d0d9f21..0000000000
--- a/ext/-test-/add_suffix/depend
+++ /dev/null
@@ -1 +0,0 @@
-bug.o: $(hdrdir)/ruby/util.h $(top_srcdir)/util.c
diff --git a/ext/-test-/add_suffix/extconf.rb b/ext/-test-/add_suffix/extconf.rb
deleted file mode 100644
index bffd1550f3..0000000000
--- a/ext/-test-/add_suffix/extconf.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-unless have_func("ruby_add_suffix", "ruby/util.h")
-  $INCFLAGS << " -I$(top_srcdir)"
-end
-create_makefile("-test-/add_suffix/bug")
diff --git a/ext/-test-/arith_seq/extract/depend b/ext/-test-/arith_seq/extract/depend
new file mode 100644
index 0000000000..bb0719941f
--- /dev/null
+++ b/ext/-test-/arith_seq/extract/depend
@@ -0,0 +1,13 @@
+# AUTOGENERATED DEPENDENCIES START
+extract.o: $(RUBY_EXTCONF_H)
+extract.o: $(arch_hdrdir)/ruby/config.h
+extract.o: $(hdrdir)/ruby/assert.h
+extract.o: $(hdrdir)/ruby/backward.h
+extract.o: $(hdrdir)/ruby/defines.h
+extract.o: $(hdrdir)/ruby/intern.h
+extract.o: $(hdrdir)/ruby/missing.h
+extract.o: $(hdrdir)/ruby/ruby.h
+extract.o: $(hdrdir)/ruby/st.h
+extract.o: $(hdrdir)/ruby/subst.h
+extract.o: extract.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/arith_seq/extract/extconf.rb b/ext/-test-/arith_seq/extract/extconf.rb
new file mode 100644
index 0000000000..9c368bf50e
--- /dev/null
+++ b/ext/-test-/arith_seq/extract/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/arith_seq/extract")
diff --git a/ext/-test-/arith_seq/extract/extract.c b/ext/-test-/arith_seq/extract/extract.c
new file mode 100644
index 0000000000..93b89c239a
--- /dev/null
+++ b/ext/-test-/arith_seq/extract/extract.c
@@ -0,0 +1,27 @@
+#include "ruby/ruby.h"
+
+static VALUE
+arith_seq_s_extract(VALUE mod, VALUE obj)
+{
+  rb_arithmetic_sequence_components_t x;
+  VALUE ret;
+  int r;
+
+  r = rb_arithmetic_sequence_extract(obj, &x);
+
+  ret = rb_ary_new2(5);
+  rb_ary_store(ret, 0, r ? x.begin : Qnil);
+  rb_ary_store(ret, 1, r ? x.end   : Qnil);
+  rb_ary_store(ret, 2, r ? x.step  : Qnil);
+  rb_ary_store(ret, 3, r ? INT2FIX(x.exclude_end) : Qnil);
+  rb_ary_store(ret, 4, INT2FIX(r));
+
+  return ret;
+}
+
+void
+Init_extract(void)
+{
+    VALUE cArithSeq = rb_path2class("Enumerator::ArithmeticSequence");
+    rb_define_singleton_method(cArithSeq, "__extract__", arith_seq_s_extract, 1);
+}
diff --git a/ext/-test-/array/resize/depend b/ext/-test-/array/resize/depend
new file mode 100644
index 0000000000..a03cc47d51
--- /dev/null
+++ b/ext/-test-/array/resize/depend
@@ -0,0 +1,13 @@
+# AUTOGENERATED DEPENDENCIES START
+resize.o: $(RUBY_EXTCONF_H)
+resize.o: $(arch_hdrdir)/ruby/config.h
+resize.o: $(hdrdir)/ruby/assert.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 6500a878fc..bc827e1170 100644
--- a/ext/-test-/array/resize/extconf.rb
+++ b/ext/-test-/array/resize/extconf.rb
@@ -1 +1,2 @@
+# frozen_string_literal: false
 create_makefile("-test-/array/resize")
diff --git a/ext/-test-/auto_ext.rb b/ext/-test-/auto_ext.rb
new file mode 100644
index 0000000000..71606a9dd1
--- /dev/null
+++ b/ext/-test-/auto_ext.rb
@@ -0,0 +1,10 @@
+# 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
new file mode 100644
index 0000000000..ec4bde2915
--- /dev/null
+++ b/ext/-test-/bignum/big2str.c
@@ -0,0 +1,53 @@
+#include "internal.h"
+
+static VALUE
+big(VALUE x)
+{
+    if (FIXNUM_P(x))
+        return rb_int2big(FIX2LONG(x));
+    if (RB_TYPE_P(x, T_BIGNUM))
+        return x;
+    rb_raise(rb_eTypeError, "can't convert %s to Bignum",
+            rb_obj_classname(x));
+}
+
+static VALUE
+big2str_generic(VALUE x, VALUE vbase)
+{
+    int base = NUM2INT(vbase);
+    if (base < 2 || 36 < base)
+        rb_raise(rb_eArgError, "invalid radix %d", base);
+    return rb_big2str_generic(big(x), base);
+}
+
+#define POW2_P(x) (((x)&((x)-1))==0)
+
+static VALUE
+big2str_poweroftwo(VALUE x, VALUE vbase)
+{
+    int base = NUM2INT(vbase);
+    if (base < 2 || 36 < base || !POW2_P(base))
+        rb_raise(rb_eArgError, "invalid radix %d", base);
+    return rb_big2str_poweroftwo(big(x), base);
+}
+
+#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
+static VALUE
+big2str_gmp(VALUE x, VALUE vbase)
+{
+    int base = NUM2INT(vbase);
+    if (base < 2 || 36 < base)
+        rb_raise(rb_eArgError, "invalid radix %d", base);
+    return rb_big2str_gmp(big(x), base);
+}
+#else
+#define big2str_gmp rb_f_notimplement
+#endif
+
+void
+Init_big2str(VALUE klass)
+{
+    rb_define_method(rb_cInteger, "big2str_generic", big2str_generic, 1);
+    rb_define_method(rb_cInteger, "big2str_poweroftwo", big2str_poweroftwo, 1);
+    rb_define_method(rb_cInteger, "big2str_gmp", big2str_gmp, 1);
+}
diff --git a/ext/-test-/bignum/bigzero.c b/ext/-test-/bignum/bigzero.c
new file mode 100644
index 0000000000..35117db7ae
--- /dev/null
+++ b/ext/-test-/bignum/bigzero.c
@@ -0,0 +1,26 @@
+#include "internal.h"
+
+static VALUE
+bug_big_zero(VALUE self, VALUE length)
+{
+    long len = NUM2ULONG(length);
+    VALUE z = rb_big_new(len, 1);
+    MEMZERO(BIGNUM_DIGITS(z), BDIGIT, len);
+    return z;
+}
+
+static VALUE
+bug_big_negzero(VALUE self, VALUE length)
+{
+    long len = NUM2ULONG(length);
+    VALUE z = rb_big_new(len, 0);
+    MEMZERO(BIGNUM_DIGITS(z), BDIGIT, len);
+    return z;
+}
+
+void
+Init_bigzero(VALUE klass)
+{
+    rb_define_singleton_method(klass, "zero", bug_big_zero, 1);
+    rb_define_singleton_method(klass, "negzero", bug_big_negzero, 1);
+}
diff --git a/ext/-test-/bignum/depend b/ext/-test-/bignum/depend
new file mode 100644
index 0000000000..38c9f6114e
--- /dev/null
+++ b/ext/-test-/bignum/depend
@@ -0,0 +1,92 @@
+# AUTOGENERATED DEPENDENCIES START
+big2str.o: $(RUBY_EXTCONF_H)
+big2str.o: $(arch_hdrdir)/ruby/config.h
+big2str.o: $(hdrdir)/ruby.h
+big2str.o: $(hdrdir)/ruby/assert.h
+big2str.o: $(hdrdir)/ruby/backward.h
+big2str.o: $(hdrdir)/ruby/defines.h
+big2str.o: $(hdrdir)/ruby/intern.h
+big2str.o: $(hdrdir)/ruby/missing.h
+big2str.o: $(hdrdir)/ruby/ruby.h
+big2str.o: $(hdrdir)/ruby/st.h
+big2str.o: $(hdrdir)/ruby/subst.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.h
+bigzero.o: $(hdrdir)/ruby/assert.h
+bigzero.o: $(hdrdir)/ruby/backward.h
+bigzero.o: $(hdrdir)/ruby/defines.h
+bigzero.o: $(hdrdir)/ruby/intern.h
+bigzero.o: $(hdrdir)/ruby/missing.h
+bigzero.o: $(hdrdir)/ruby/ruby.h
+bigzero.o: $(hdrdir)/ruby/st.h
+bigzero.o: $(hdrdir)/ruby/subst.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.h
+div.o: $(hdrdir)/ruby/assert.h
+div.o: $(hdrdir)/ruby/backward.h
+div.o: $(hdrdir)/ruby/defines.h
+div.o: $(hdrdir)/ruby/intern.h
+div.o: $(hdrdir)/ruby/missing.h
+div.o: $(hdrdir)/ruby/ruby.h
+div.o: $(hdrdir)/ruby/st.h
+div.o: $(hdrdir)/ruby/subst.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.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+intpack.o: $(RUBY_EXTCONF_H)
+intpack.o: $(arch_hdrdir)/ruby/config.h
+intpack.o: $(hdrdir)/ruby.h
+intpack.o: $(hdrdir)/ruby/assert.h
+intpack.o: $(hdrdir)/ruby/backward.h
+intpack.o: $(hdrdir)/ruby/defines.h
+intpack.o: $(hdrdir)/ruby/intern.h
+intpack.o: $(hdrdir)/ruby/missing.h
+intpack.o: $(hdrdir)/ruby/ruby.h
+intpack.o: $(hdrdir)/ruby/st.h
+intpack.o: $(hdrdir)/ruby/subst.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.h
+mul.o: $(hdrdir)/ruby/assert.h
+mul.o: $(hdrdir)/ruby/backward.h
+mul.o: $(hdrdir)/ruby/defines.h
+mul.o: $(hdrdir)/ruby/intern.h
+mul.o: $(hdrdir)/ruby/missing.h
+mul.o: $(hdrdir)/ruby/ruby.h
+mul.o: $(hdrdir)/ruby/st.h
+mul.o: $(hdrdir)/ruby/subst.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.h
+str2big.o: $(hdrdir)/ruby/assert.h
+str2big.o: $(hdrdir)/ruby/backward.h
+str2big.o: $(hdrdir)/ruby/defines.h
+str2big.o: $(hdrdir)/ruby/intern.h
+str2big.o: $(hdrdir)/ruby/missing.h
+str2big.o: $(hdrdir)/ruby/ruby.h
+str2big.o: $(hdrdir)/ruby/st.h
+str2big.o: $(hdrdir)/ruby/subst.h
+str2big.o: $(top_srcdir)/internal.h
+str2big.o: str2big.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/bignum/div.c b/ext/-test-/bignum/div.c
new file mode 100644
index 0000000000..a1db21dc30
--- /dev/null
+++ b/ext/-test-/bignum/div.c
@@ -0,0 +1,35 @@
+#include "internal.h"
+
+static VALUE
+big(VALUE x)
+{
+    if (FIXNUM_P(x))
+        return rb_int2big(FIX2LONG(x));
+    if (RB_TYPE_P(x, T_BIGNUM))
+        return x;
+    rb_raise(rb_eTypeError, "can't convert %s to Bignum",
+            rb_obj_classname(x));
+}
+
+static VALUE
+divrem_normal(VALUE x, VALUE y)
+{
+    return rb_big_norm(rb_big_divrem_normal(big(x), big(y)));
+}
+
+#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
+static VALUE
+divrem_gmp(VALUE x, VALUE y)
+{
+    return rb_big_norm(rb_big_divrem_gmp(big(x), big(y)));
+}
+#else
+#define divrem_gmp rb_f_notimplement
+#endif
+
+void
+Init_div(VALUE klass)
+{
+    rb_define_method(rb_cInteger, "big_divrem_normal", divrem_normal, 1);
+    rb_define_method(rb_cInteger, "big_divrem_gmp", divrem_gmp, 1);
+}
diff --git a/ext/-test-/bignum/extconf.rb b/ext/-test-/bignum/extconf.rb
new file mode 100644
index 0000000000..d786b15db9
--- /dev/null
+++ b/ext/-test-/bignum/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext(inc: true)
diff --git a/ext/-test-/bignum/init.c b/ext/-test-/bignum/init.c
new file mode 100644
index 0000000000..82a159bf1d
--- /dev/null
+++ b/ext/-test-/bignum/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+void
+Init_bignum(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_class_under(mBug, "Bignum", rb_cString);
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/bignum/intpack.c b/ext/-test-/bignum/intpack.c
new file mode 100644
index 0000000000..2d19442cf2
--- /dev/null
+++ b/ext/-test-/bignum/intpack.c
@@ -0,0 +1,87 @@
+#include "internal.h"
+
+static VALUE
+rb_integer_pack_raw_m(VALUE val, VALUE buf, VALUE numwords_arg, VALUE wordsize_arg, VALUE nails, VALUE flags)
+{
+  int sign;
+  size_t numwords = 0;
+  size_t wordsize = NUM2SIZET(wordsize_arg);
+
+  StringValue(buf);
+  rb_str_modify(buf);
+  sign = rb_integer_pack(val,
+      RSTRING_PTR(buf), NUM2SIZET(numwords_arg),
+      NUM2SIZET(wordsize_arg), NUM2SIZET(nails), NUM2INT(flags));
+
+  return rb_ary_new_from_args(2, INT2NUM(sign), rb_str_new(RSTRING_PTR(buf), wordsize * numwords));
+}
+
+static VALUE
+rb_integer_pack_m(VALUE val, VALUE numwords_arg, VALUE wordsize_arg, VALUE nails, VALUE flags)
+{
+  int sign;
+  size_t numwords = NUM2SIZET(numwords_arg);
+  size_t wordsize = NUM2SIZET(wordsize_arg);
+  VALUE buf;
+
+  if (numwords != 0 && wordsize != 0 && LONG_MAX / wordsize < numwords)
+      rb_raise(rb_eArgError, "too big numwords * wordsize");
+  buf = rb_str_new(NULL, numwords * wordsize);
+  sign = rb_integer_pack(val,
+      RSTRING_PTR(buf), numwords,
+      wordsize, NUM2SIZET(nails), NUM2INT(flags));
+
+  return rb_assoc_new(INT2NUM(sign), buf);
+}
+
+static VALUE
+rb_integer_unpack_m(VALUE klass, VALUE buf, VALUE numwords, VALUE wordsize, VALUE nails, VALUE flags)
+{
+    StringValue(buf);
+
+    return rb_integer_unpack(RSTRING_PTR(buf),
+            NUM2SIZET(numwords), NUM2SIZET(wordsize),
+            NUM2SIZET(nails), NUM2INT(flags));
+}
+
+static VALUE
+rb_integer_test_numbits_2comp_without_sign(VALUE val)
+{
+  size_t size;
+  int neg = FIXNUM_P(val) ? FIX2LONG(val) < 0 : BIGNUM_NEGATIVE_P(val);
+  size = rb_absint_numwords(val, 1, NULL) - (neg && rb_absint_singlebit_p(val));
+  return SIZET2NUM(size);
+}
+
+static VALUE
+rb_integer_test_numbytes_2comp_with_sign(VALUE val)
+{
+  int neg = FIXNUM_P(val) ? FIX2LONG(val) < 0 : BIGNUM_NEGATIVE_P(val);
+  int nlz_bits;
+  size_t size = rb_absint_size(val, &nlz_bits);
+  if (nlz_bits == 0 && !(neg && rb_absint_singlebit_p(val)))
+    size++;
+  return SIZET2NUM(size);
+}
+
+void
+Init_intpack(VALUE klass)
+{
+    rb_define_method(rb_cInteger, "test_pack_raw", rb_integer_pack_raw_m, 5);
+    rb_define_method(rb_cInteger, "test_pack", rb_integer_pack_m, 4);
+    rb_define_singleton_method(rb_cInteger, "test_unpack", rb_integer_unpack_m, 5);
+    rb_define_const(rb_cInteger, "INTEGER_PACK_MSWORD_FIRST", INT2NUM(INTEGER_PACK_MSWORD_FIRST));
+    rb_define_const(rb_cInteger, "INTEGER_PACK_LSWORD_FIRST", INT2NUM(INTEGER_PACK_LSWORD_FIRST));
+    rb_define_const(rb_cInteger, "INTEGER_PACK_MSBYTE_FIRST", INT2NUM(INTEGER_PACK_MSBYTE_FIRST));
+    rb_define_const(rb_cInteger, "INTEGER_PACK_LSBYTE_FIRST", INT2NUM(INTEGER_PACK_LSBYTE_FIRST));
+    rb_define_const(rb_cInteger, "INTEGER_PACK_NATIVE_BYTE_ORDER", INT2NUM(INTEGER_PACK_NATIVE_BYTE_ORDER));
+    rb_define_const(rb_cInteger, "INTEGER_PACK_2COMP", INT2NUM(INTEGER_PACK_2COMP));
+    rb_define_const(rb_cInteger, "INTEGER_PACK_LITTLE_ENDIAN", INT2NUM(INTEGER_PACK_LITTLE_ENDIAN));
+    rb_define_const(rb_cInteger, "INTEGER_PACK_BIG_ENDIAN", INT2NUM(INTEGER_PACK_BIG_ENDIAN));
+    rb_define_const(rb_cInteger, "INTEGER_PACK_FORCE_BIGNUM", INT2NUM(INTEGER_PACK_FORCE_BIGNUM));
+    rb_define_const(rb_cInteger, "INTEGER_PACK_NEGATIVE", INT2NUM(INTEGER_PACK_NEGATIVE));
+    rb_define_const(rb_cInteger, "INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION", INT2NUM(INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION));
+
+    rb_define_method(rb_cInteger, "test_numbits_2comp_without_sign", rb_integer_test_numbits_2comp_without_sign, 0);
+    rb_define_method(rb_cInteger, "test_numbytes_2comp_with_sign", rb_integer_test_numbytes_2comp_with_sign, 0);
+}
diff --git a/ext/-test-/bignum/mul.c b/ext/-test-/bignum/mul.c
new file mode 100644
index 0000000000..b922f34437
--- /dev/null
+++ b/ext/-test-/bignum/mul.c
@@ -0,0 +1,65 @@
+#include "internal.h"
+
+static VALUE
+big(VALUE x)
+{
+    if (FIXNUM_P(x))
+        return rb_int2big(FIX2LONG(x));
+    if (RB_TYPE_P(x, T_BIGNUM))
+        return x;
+    rb_raise(rb_eTypeError, "can't convert %s to Bignum",
+            rb_obj_classname(x));
+}
+
+static VALUE
+mul_normal(VALUE x, VALUE y)
+{
+    return rb_big_norm(rb_big_mul_normal(big(x), big(y)));
+}
+
+static VALUE
+sq_fast(VALUE x)
+{
+    return rb_big_norm(rb_big_sq_fast(big(x)));
+}
+
+static VALUE
+mul_balance(VALUE x, VALUE y)
+{
+    return rb_big_norm(rb_big_mul_balance(big(x), big(y)));
+}
+
+static VALUE
+mul_karatsuba(VALUE x, VALUE y)
+{
+    return rb_big_norm(rb_big_mul_karatsuba(big(x), big(y)));
+}
+
+static VALUE
+mul_toom3(VALUE x, VALUE y)
+{
+    return rb_big_norm(rb_big_mul_toom3(big(x), big(y)));
+}
+
+#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
+static VALUE
+mul_gmp(VALUE x, VALUE y)
+{
+    return rb_big_norm(rb_big_mul_gmp(big(x), big(y)));
+}
+#else
+#define mul_gmp rb_f_notimplement
+#endif
+
+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_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);
+    rb_define_method(rb_cInteger, "big_mul_karatsuba", mul_karatsuba, 1);
+    rb_define_method(rb_cInteger, "big_mul_toom3", mul_toom3, 1);
+    rb_define_method(rb_cInteger, "big_mul_gmp", mul_gmp, 1);
+}
diff --git a/ext/-test-/bignum/str2big.c b/ext/-test-/bignum/str2big.c
new file mode 100644
index 0000000000..bc79ef0329
--- /dev/null
+++ b/ext/-test-/bignum/str2big.c
@@ -0,0 +1,38 @@
+#include "internal.h"
+
+static VALUE
+str2big_poweroftwo(VALUE str, VALUE vbase, VALUE badcheck)
+{
+    return rb_str2big_poweroftwo(str, NUM2INT(vbase), RTEST(badcheck));
+}
+
+static VALUE
+str2big_normal(VALUE str, VALUE vbase, VALUE badcheck)
+{
+    return rb_str2big_normal(str, NUM2INT(vbase), RTEST(badcheck));
+}
+
+static VALUE
+str2big_karatsuba(VALUE str, VALUE vbase, VALUE badcheck)
+{
+    return rb_str2big_karatsuba(str, NUM2INT(vbase), RTEST(badcheck));
+}
+
+#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
+static VALUE
+str2big_gmp(VALUE str, VALUE vbase, VALUE badcheck)
+{
+    return rb_str2big_gmp(str, NUM2INT(vbase), RTEST(badcheck));
+}
+#else
+#define str2big_gmp rb_f_notimplement
+#endif
+
+void
+Init_str2big(VALUE klass)
+{
+    rb_define_method(rb_cString, "str2big_poweroftwo", str2big_poweroftwo, 2);
+    rb_define_method(rb_cString, "str2big_normal", str2big_normal, 2);
+    rb_define_method(rb_cString, "str2big_karatsuba", str2big_karatsuba, 2);
+    rb_define_method(rb_cString, "str2big_gmp", str2big_gmp, 2);
+}
diff --git a/ext/-test-/bug-14834/bug-14384.c b/ext/-test-/bug-14834/bug-14384.c
new file mode 100644
index 0000000000..3a16a2d222
--- /dev/null
+++ b/ext/-test-/bug-14834/bug-14384.c
@@ -0,0 +1,39 @@
+#include <ruby/ruby.h>
+#include <ruby/debug.h>
+
+#ifndef MAYBE_UNUSED
+# define MAYBE_UNUSED(x) x
+#endif
+
+static NOINLINE(VALUE f(VALUE));
+static NOINLINE(void g(VALUE, void*));
+extern NOINLINE(void Init_bug_14384(void));
+
+void
+Init_bug_14834(void)
+{
+    VALUE q = rb_define_module("Bug");
+    rb_define_module_function(q, "bug_14834", f, 0);
+}
+
+VALUE
+f(VALUE q)
+{
+    int   w[] = { 0, 1024 };
+    VALUE e   = rb_tracepoint_new(Qnil, RUBY_INTERNAL_EVENT_NEWOBJ, g, w);
+
+    rb_tracepoint_enable(e);
+    return rb_ensure(rb_yield, q, rb_tracepoint_disable, e);
+}
+
+void
+g(MAYBE_UNUSED(VALUE q), void* w)
+{
+    const int *e = (const int *)w;
+    const int  r = *e++;
+    const int  t = *e++;
+    VALUE     *y = ALLOCA_N(VALUE, t);
+    int       *u = ALLOCA_N(int, t);
+
+    rb_profile_frames(r, t, y, u);
+}
diff --git a/ext/-test-/bug-14834/depend b/ext/-test-/bug-14834/depend
new file mode 100644
index 0000000000..5206f995be
--- /dev/null
+++ b/ext/-test-/bug-14834/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+bug-14384.o: $(RUBY_EXTCONF_H)
+bug-14384.o: $(arch_hdrdir)/ruby/config.h
+bug-14384.o: $(hdrdir)/ruby/assert.h
+bug-14384.o: $(hdrdir)/ruby/backward.h
+bug-14384.o: $(hdrdir)/ruby/debug.h
+bug-14384.o: $(hdrdir)/ruby/defines.h
+bug-14384.o: $(hdrdir)/ruby/intern.h
+bug-14384.o: $(hdrdir)/ruby/missing.h
+bug-14384.o: $(hdrdir)/ruby/ruby.h
+bug-14384.o: $(hdrdir)/ruby/st.h
+bug-14384.o: $(hdrdir)/ruby/subst.h
+bug-14384.o: bug-14384.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/bug-14834/extconf.rb b/ext/-test-/bug-14834/extconf.rb
new file mode 100644
index 0000000000..e8f3f1f437
--- /dev/null
+++ b/ext/-test-/bug-14834/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: true
+create_makefile("-test-/bug_14834")
diff --git a/ext/-test-/bug-3571/bug.c b/ext/-test-/bug-3571/bug.c
index 72d6bd1021..dd3c85cd79 100644
--- a/ext/-test-/bug-3571/bug.c
+++ b/ext/-test-/bug-3571/bug.c
@@ -1,14 +1,14 @@
 #include <ruby.h>
 
 static VALUE
-bug_i(VALUE i, VALUE arg)
+bug_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg))
 {
     rb_notimplement();
     return ID2SYM(rb_frame_this_func());
 }
 
 static VALUE
-bug_start(VALUE self, VALUE hash)
+bug_start(VALUE self)
 {
     VALUE ary = rb_ary_new3(1, Qnil);
     rb_block_call(ary, rb_intern("map"), 0, 0, bug_i, self);
@@ -16,7 +16,7 @@ bug_start(VALUE self, VALUE hash)
 }
 
 void
-Init_bug(void)
+Init_bug_3571(void)
 {
     VALUE mBug = rb_define_module("Bug");
     rb_define_module_function(mBug, "start", bug_start, 0);
diff --git a/ext/-test-/bug-3571/depend b/ext/-test-/bug-3571/depend
new file mode 100644
index 0000000000..74911f0af4
--- /dev/null
+++ b/ext/-test-/bug-3571/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+bug.o: $(RUBY_EXTCONF_H)
+bug.o: $(arch_hdrdir)/ruby/config.h
+bug.o: $(hdrdir)/ruby.h
+bug.o: $(hdrdir)/ruby/assert.h
+bug.o: $(hdrdir)/ruby/backward.h
+bug.o: $(hdrdir)/ruby/defines.h
+bug.o: $(hdrdir)/ruby/intern.h
+bug.o: $(hdrdir)/ruby/missing.h
+bug.o: $(hdrdir)/ruby/ruby.h
+bug.o: $(hdrdir)/ruby/st.h
+bug.o: $(hdrdir)/ruby/subst.h
+bug.o: bug.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/bug-3571/extconf.rb b/ext/-test-/bug-3571/extconf.rb
index 6390fce219..7e76ebded6 100644
--- a/ext/-test-/bug-3571/extconf.rb
+++ b/ext/-test-/bug-3571/extconf.rb
@@ -1 +1,2 @@
-create_makefile("-test-/bug-3571/bug")
+# frozen_string_literal: false
+create_makefile("-test-/bug_3571")
diff --git a/ext/-test-/bug-3662/bug.c b/ext/-test-/bug-3662/bug.c
deleted file mode 100644
index 9375dace10..0000000000
--- a/ext/-test-/bug-3662/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_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
deleted file mode 100644
index 7a1b73023c..0000000000
--- a/ext/-test-/bug-3662/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/bug-3662/bug")
diff --git a/ext/-test-/bug-5832/bug.c b/ext/-test-/bug-5832/bug.c
new file mode 100644
index 0000000000..a2c3965640
--- /dev/null
+++ b/ext/-test-/bug-5832/bug.c
@@ -0,0 +1,14 @@
+#include <ruby.h>
+
+static VALUE
+bug_funcall_callback(VALUE self, VALUE obj)
+{
+    return rb_funcall(obj, rb_intern("callback"), 0);
+}
+
+void
+Init_bug_5832(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/depend b/ext/-test-/bug-5832/depend
new file mode 100644
index 0000000000..74911f0af4
--- /dev/null
+++ b/ext/-test-/bug-5832/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+bug.o: $(RUBY_EXTCONF_H)
+bug.o: $(arch_hdrdir)/ruby/config.h
+bug.o: $(hdrdir)/ruby.h
+bug.o: $(hdrdir)/ruby/assert.h
+bug.o: $(hdrdir)/ruby/backward.h
+bug.o: $(hdrdir)/ruby/defines.h
+bug.o: $(hdrdir)/ruby/intern.h
+bug.o: $(hdrdir)/ruby/missing.h
+bug.o: $(hdrdir)/ruby/ruby.h
+bug.o: $(hdrdir)/ruby/st.h
+bug.o: $(hdrdir)/ruby/subst.h
+bug.o: bug.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/bug-5832/extconf.rb b/ext/-test-/bug-5832/extconf.rb
new file mode 100644
index 0000000000..b8452b4f8f
--- /dev/null
+++ b/ext/-test-/bug-5832/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/bug_5832")
diff --git a/ext/-test-/bug_reporter/bug_reporter.c b/ext/-test-/bug_reporter/bug_reporter.c
new file mode 100644
index 0000000000..e9ea9e3db0
--- /dev/null
+++ b/ext/-test-/bug_reporter/bug_reporter.c
@@ -0,0 +1,24 @@
+#include <ruby.h>
+#include <stdio.h>
+
+int rb_bug_reporter_add(void (*func)(FILE *, void *), void *data);
+
+static void
+sample_bug_reporter(FILE *out, void *ptr)
+{
+    int n = (int)(uintptr_t)ptr;
+    fprintf(out, "Sample bug reporter: %d\n", n);
+}
+
+static VALUE
+register_sample_bug_reporter(VALUE self, VALUE obj)
+{
+    rb_bug_reporter_add(sample_bug_reporter, (void *)(uintptr_t)NUM2INT(obj));
+    return Qnil;
+}
+
+void
+Init_bug_reporter(void)
+{
+    rb_define_global_function("register_sample_bug_reporter", register_sample_bug_reporter, 1);
+}
diff --git a/ext/-test-/bug_reporter/depend b/ext/-test-/bug_reporter/depend
new file mode 100644
index 0000000000..62bac03566
--- /dev/null
+++ b/ext/-test-/bug_reporter/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+bug_reporter.o: $(RUBY_EXTCONF_H)
+bug_reporter.o: $(arch_hdrdir)/ruby/config.h
+bug_reporter.o: $(hdrdir)/ruby.h
+bug_reporter.o: $(hdrdir)/ruby/assert.h
+bug_reporter.o: $(hdrdir)/ruby/backward.h
+bug_reporter.o: $(hdrdir)/ruby/defines.h
+bug_reporter.o: $(hdrdir)/ruby/intern.h
+bug_reporter.o: $(hdrdir)/ruby/missing.h
+bug_reporter.o: $(hdrdir)/ruby/ruby.h
+bug_reporter.o: $(hdrdir)/ruby/st.h
+bug_reporter.o: $(hdrdir)/ruby/subst.h
+bug_reporter.o: bug_reporter.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/bug_reporter/extconf.rb b/ext/-test-/bug_reporter/extconf.rb
new file mode 100644
index 0000000000..d9d49bb23e
--- /dev/null
+++ b/ext/-test-/bug_reporter/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/bug_reporter")
diff --git a/ext/-test-/class/class2name.c b/ext/-test-/class/class2name.c
new file mode 100644
index 0000000000..c48df6fb2a
--- /dev/null
+++ b/ext/-test-/class/class2name.c
@@ -0,0 +1,14 @@
+#include <ruby/ruby.h>
+
+static VALUE
+class2name(VALUE self, VALUE klass)
+{
+    const char *name = rb_class2name(klass);
+    return name ? rb_str_new_cstr(name) : Qnil;
+}
+
+void
+Init_class2name(VALUE klass)
+{
+    rb_define_singleton_method(klass, "class2name", class2name, 1);
+}
diff --git a/ext/-test-/class/depend b/ext/-test-/class/depend
new file mode 100644
index 0000000000..451256cc75
--- /dev/null
+++ b/ext/-test-/class/depend
@@ -0,0 +1,25 @@
+# AUTOGENERATED DEPENDENCIES START
+class2name.o: $(RUBY_EXTCONF_H)
+class2name.o: $(arch_hdrdir)/ruby/config.h
+class2name.o: $(hdrdir)/ruby/assert.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.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/class/extconf.rb b/ext/-test-/class/extconf.rb
new file mode 100644
index 0000000000..d786b15db9
--- /dev/null
+++ b/ext/-test-/class/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext(inc: true)
diff --git a/ext/-test-/class/init.c b/ext/-test-/class/init.c
new file mode 100644
index 0000000000..ed715c1942
--- /dev/null
+++ b/ext/-test-/class/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE mod); Init_##n(mod);}
+
+void
+Init_class(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE mod = rb_define_module_under(mBug, "Class");
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/cxxanyargs/cxxanyargs.cpp b/ext/-test-/cxxanyargs/cxxanyargs.cpp
new file mode 100644
index 0000000000..efe35fa359
--- /dev/null
+++ b/ext/-test-/cxxanyargs/cxxanyargs.cpp
@@ -0,0 +1,619 @@
+#include <ruby/ruby.h>
+
+#if 0 // Warnings expected, should just suppress them
+
+#elif defined(_MSC_VER)
+#pragma warning(disable : 4996)
+
+#elif defined(__clang__)
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
+#elif defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+#else
+// :FIXME: improve here for your compiler.
+
+#endif
+
+namespace test_rb_define_virtual_variable {
+    VALUE
+    getter(ID, VALUE *data)
+    {
+        return *data;
+    }
+
+    void
+    setter(VALUE val, ID, VALUE *data)
+    {
+        *data = val;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        rb_define_virtual_variable("test",
+            RUBY_METHOD_FUNC(getter),
+            reinterpret_cast<void(*)(ANYARGS)>(setter)); // old
+        rb_define_virtual_variable("test", getter, setter); // new
+        return self;
+    }
+}
+
+struct test_rb_define_hooked_variable {
+    static VALUE v;
+
+    static VALUE
+    getter(ID, VALUE *data)
+    {
+        return *data;
+    }
+
+    static void
+    setter(VALUE val, ID, VALUE *data)
+    {
+        *data = val;
+    }
+
+    static VALUE
+    test(VALUE self)
+    {
+        rb_define_hooked_variable("test", &v,
+            RUBY_METHOD_FUNC(getter),
+            reinterpret_cast<void(*)(ANYARGS)>(setter)); // old
+        rb_define_hooked_variable("test", &v, getter, setter); // new
+        return self;
+    }
+};
+VALUE test_rb_define_hooked_variable::v = Qundef;
+
+namespace test_rb_iterate {
+    VALUE
+    iter(VALUE self)
+    {
+        return rb_funcall(self, rb_intern("yield"), 0);
+    }
+
+    VALUE
+    block(RB_BLOCK_CALL_FUNC_ARGLIST(arg, param))
+    {
+        return rb_funcall(arg, rb_intern("=="), 1, param);
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        rb_iterate(iter, self, RUBY_METHOD_FUNC(block), self); // old
+        return rb_iterate(iter, self, block, self); // new
+    }
+}
+
+namespace test_rb_block_call {
+    VALUE
+    block(RB_BLOCK_CALL_FUNC_ARGLIST(arg, param))
+    {
+        return rb_funcall(arg, rb_intern("=="), 1, param);
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        const ID mid = rb_intern("each");
+        const VALUE argv[] = { Qundef };
+        rb_block_call(self, mid, 0, argv, RUBY_METHOD_FUNC(block), self); // old
+        return rb_block_call(self, mid, 0, argv, block, self); // new
+    }
+}
+
+namespace test_rb_rescue {
+    VALUE
+    begin(VALUE arg)
+    {
+        return arg;
+    }
+
+    VALUE
+    rescue(VALUE arg, VALUE exc)
+    {
+        return exc;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        rb_rescue(RUBY_METHOD_FUNC(begin), self, RUBY_METHOD_FUNC(rescue), self); // old
+        return rb_rescue(begin, self, rescue, self); // new
+    }
+}
+
+namespace test_rb_rescue2 {
+    VALUE
+    begin(VALUE arg)
+    {
+        return arg;
+    }
+
+    VALUE
+    rescue(VALUE arg, VALUE exc)
+    {
+        return exc;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        rb_rescue2(RUBY_METHOD_FUNC(begin), self, RUBY_METHOD_FUNC(rescue), self,
+                   rb_eStandardError, rb_eFatal, 0); // old
+        return rb_rescue2(begin, self, rescue, self, rb_eStandardError, rb_eFatal, 0); // new
+    }
+}
+
+namespace test_rb_ensure {
+    VALUE
+    begin(VALUE arg)
+    {
+        return arg;
+    }
+
+    VALUE
+    ensure(VALUE arg)
+    {
+        return arg;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        rb_ensure(RUBY_METHOD_FUNC(begin), self, RUBY_METHOD_FUNC(ensure), self); // old
+        return rb_ensure(begin, self, ensure, self); // new
+    }
+}
+
+namespace test_rb_catch {
+    VALUE
+    catcher(RB_BLOCK_CALL_FUNC_ARGLIST(arg, param))
+    {
+        return arg;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        static const char *zero = 0;
+        rb_catch(zero, RUBY_METHOD_FUNC(catcher), self); // old
+        return rb_catch(zero, catcher, self); // new
+    }
+}
+
+namespace test_rb_catch_obj {
+    VALUE
+    catcher(RB_BLOCK_CALL_FUNC_ARGLIST(arg, param))
+    {
+        return arg;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        rb_catch_obj(self, RUBY_METHOD_FUNC(catcher), self); // old
+        return rb_catch_obj(self, catcher, self); // new
+    }
+}
+
+namespace test_rb_fiber_new {
+    VALUE
+    fiber(RB_BLOCK_CALL_FUNC_ARGLIST(arg, param))
+    {
+        return arg;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        rb_fiber_new(RUBY_METHOD_FUNC(fiber), self); // old
+        return rb_fiber_new(fiber, self); // new
+    }
+}
+
+namespace test_rb_proc_new {
+    VALUE
+    proc(RB_BLOCK_CALL_FUNC_ARGLIST(arg, param))
+    {
+        return arg;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        rb_fiber_new(RUBY_METHOD_FUNC(proc), self); // old
+        return rb_fiber_new(proc, self); // new
+    }
+}
+
+struct test_rb_thread_create {
+    static VALUE v;
+
+    static VALUE
+    thread(void *ptr)
+    {
+        const VALUE *w = reinterpret_cast<const VALUE*>(ptr);
+        return *w;
+    }
+
+    static VALUE
+    test(VALUE self)
+    {
+        v = self;
+        rb_thread_create(RUBY_METHOD_FUNC(thread), &v); // old
+        return rb_thread_create(thread, &v); // new
+    }
+};
+VALUE test_rb_thread_create::v = Qundef;
+
+namespace test_st_foreach {
+    static int
+    iter(st_data_t, st_data_t, st_data_t)
+    {
+        return ST_CONTINUE;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        st_data_t data = 0;
+        st_table *st = st_init_numtable();
+        st_foreach(st, reinterpret_cast<int(*)(ANYARGS)>(iter), data); // old
+        st_foreach(st, iter, data); // new
+        return self;
+    }
+}
+
+namespace test_st_foreach_check {
+    static int
+    iter(st_data_t, st_data_t, st_data_t, int x)
+    {
+        return x ? ST_STOP : ST_CONTINUE;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        st_data_t data = 0;
+        st_table *st = st_init_numtable();
+        st_foreach_check(st, reinterpret_cast<int(*)(ANYARGS)>(iter), data, data); // old
+        st_foreach_check(st, iter, data, data); // new
+        return self;
+    }
+}
+
+namespace test_st_foreach_safe {
+    static int
+    iter(st_data_t, st_data_t, st_data_t)
+    {
+        return ST_CONTINUE;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        st_data_t data = 0;
+        st_table *st = st_init_numtable();
+        st_foreach_safe(st, reinterpret_cast<int(*)(ANYARGS)>(iter), data); // old
+        st_foreach_safe(st, iter, data); // new
+        return self;
+    }
+}
+
+namespace test_rb_hash_foreach {
+    static int
+    iter(VALUE, VALUE, VALUE)
+    {
+        return ST_CONTINUE;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        VALUE h = rb_hash_new();
+        rb_hash_foreach(h, reinterpret_cast<int(*)(ANYARGS)>(iter), self); // old
+        rb_hash_foreach(h, iter, self); // new
+        return self;
+    }
+}
+
+namespace test_rb_ivar_foreach {
+    static int
+    iter(VALUE, VALUE, VALUE)
+    {
+        return ST_CONTINUE;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        rb_ivar_foreach(self, reinterpret_cast<int(*)(ANYARGS)>(iter), self); // old
+        rb_ivar_foreach(self, iter, self); // new
+        return self;
+    }
+}
+
+namespace test_rb_define_method {
+    static VALUE
+    m1(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    m2(VALUE, VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    ma(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mv(int, VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        // No cast
+        rb_define_method(self, "m1", m1, 1);
+        rb_define_method(self, "m2", m2, 2);
+        rb_define_method(self, "ma", ma, -2);
+        rb_define_method(self, "mv", mv, -1);
+
+        // Cast by RUBY_METHOD_FUNC
+        rb_define_method(self, "m1", RUBY_METHOD_FUNC(m1), 1);
+        rb_define_method(self, "m2", RUBY_METHOD_FUNC(m2), 2);
+        rb_define_method(self, "ma", RUBY_METHOD_FUNC(ma), -2);
+        rb_define_method(self, "mv", RUBY_METHOD_FUNC(mv), -1);
+
+        // Explicit cast instead of RUBY_METHOD_FUNC
+        rb_define_method(self, "m1", (VALUE (*)(...))(m1), 1);
+        rb_define_method(self, "m2", (VALUE (*)(...))(m2), 2);
+        rb_define_method(self, "ma", (VALUE (*)(...))(ma), -2);
+        rb_define_method(self, "mv", (VALUE (*)(...))(mv), -1);
+
+        return self;
+    }
+}
+
+namespace test_rb_define_module_function {
+    static VALUE
+    m1(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    m2(VALUE, VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    ma(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mv(int, VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        // No cast
+        rb_define_module_function(self, "m1", m1, 1);
+        rb_define_module_function(self, "m2", m2, 2);
+        rb_define_module_function(self, "ma", ma, -2);
+        rb_define_module_function(self, "mv", mv, -1);
+
+        // Cast by RUBY_METHOD_FUNC
+        rb_define_module_function(self, "m1", RUBY_METHOD_FUNC(m1), 1);
+        rb_define_module_function(self, "m2", RUBY_METHOD_FUNC(m2), 2);
+        rb_define_module_function(self, "ma", RUBY_METHOD_FUNC(ma), -2);
+        rb_define_module_function(self, "mv", RUBY_METHOD_FUNC(mv), -1);
+
+        // Explicit cast instead of RUBY_METHOD_FUNC
+        rb_define_module_function(self, "m1", (VALUE (*)(...))(m1), 1);
+        rb_define_module_function(self, "m2", (VALUE (*)(...))(m2), 2);
+        rb_define_module_function(self, "ma", (VALUE (*)(...))(ma), -2);
+        rb_define_module_function(self, "mv", (VALUE (*)(...))(mv), -1);
+
+        return self;
+    }
+}
+
+namespace test_rb_define_singleton_method {
+    static VALUE
+    m1(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    m2(VALUE, VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    ma(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mv(int, VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        // No cast
+        rb_define_singleton_method(self, "m1", m1, 1);
+        rb_define_singleton_method(self, "m2", m2, 2);
+        rb_define_singleton_method(self, "ma", ma, -2);
+        rb_define_singleton_method(self, "mv", mv, -1);
+
+        // Cast by RUBY_METHOD_FUNC
+        rb_define_singleton_method(self, "m1", RUBY_METHOD_FUNC(m1), 1);
+        rb_define_singleton_method(self, "m2", RUBY_METHOD_FUNC(m2), 2);
+        rb_define_singleton_method(self, "ma", RUBY_METHOD_FUNC(ma), -2);
+        rb_define_singleton_method(self, "mv", RUBY_METHOD_FUNC(mv), -1);
+
+        // Explicit cast instead of RUBY_METHOD_FUNC
+        rb_define_singleton_method(self, "m1", (VALUE (*)(...))(m1), 1);
+        rb_define_singleton_method(self, "m2", (VALUE (*)(...))(m2), 2);
+        rb_define_singleton_method(self, "ma", (VALUE (*)(...))(ma), -2);
+        rb_define_singleton_method(self, "mv", (VALUE (*)(...))(mv), -1);
+
+        return self;
+    }
+}
+
+namespace test_rb_define_protected_method {
+    static VALUE
+    m1(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    m2(VALUE, VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    ma(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mv(int, VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        // No cast
+        rb_define_protected_method(self, "m1", m1, 1);
+        rb_define_protected_method(self, "m2", m2, 2);
+        rb_define_protected_method(self, "ma", ma, -2);
+        rb_define_protected_method(self, "mv", mv, -1);
+
+        // Cast by RUBY_METHOD_FUNC
+        rb_define_protected_method(self, "m1", RUBY_METHOD_FUNC(m1), 1);
+        rb_define_protected_method(self, "m2", RUBY_METHOD_FUNC(m2), 2);
+        rb_define_protected_method(self, "ma", RUBY_METHOD_FUNC(ma), -2);
+        rb_define_protected_method(self, "mv", RUBY_METHOD_FUNC(mv), -1);
+
+        // Explicit cast instead of RUBY_METHOD_FUNC
+        rb_define_protected_method(self, "m1", (VALUE (*)(...))(m1), 1);
+        rb_define_protected_method(self, "m2", (VALUE (*)(...))(m2), 2);
+        rb_define_protected_method(self, "ma", (VALUE (*)(...))(ma), -2);
+        rb_define_protected_method(self, "mv", (VALUE (*)(...))(mv), -1);
+
+        return self;
+    }
+}
+
+namespace test_rb_define_private_method {
+    static VALUE
+    m1(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    m2(VALUE, VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    ma(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mv(int, VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        // No cast
+        rb_define_private_method(self, "m1", m1, 1);
+        rb_define_private_method(self, "m2", m2, 2);
+        rb_define_private_method(self, "ma", ma, -2);
+        rb_define_private_method(self, "mv", mv, -1);
+
+        // Cast by RUBY_METHOD_FUNC
+        rb_define_private_method(self, "m1", RUBY_METHOD_FUNC(m1), 1);
+        rb_define_private_method(self, "m2", RUBY_METHOD_FUNC(m2), 2);
+        rb_define_private_method(self, "ma", RUBY_METHOD_FUNC(ma), -2);
+        rb_define_private_method(self, "mv", RUBY_METHOD_FUNC(mv), -1);
+
+        // Explicit cast instead of RUBY_METHOD_FUNC
+        rb_define_private_method(self, "m1", (VALUE (*)(...))(m1), 1);
+        rb_define_private_method(self, "m2", (VALUE (*)(...))(m2), 2);
+        rb_define_private_method(self, "ma", (VALUE (*)(...))(ma), -2);
+        rb_define_private_method(self, "mv", (VALUE (*)(...))(mv), -1);
+
+        return self;
+    }
+}
+
+extern "C" void
+Init_cxxanyargs(void)
+{
+    VALUE b = rb_define_module("Bug");
+#define test(sym) \
+    rb_define_module_function(b, #sym, RUBY_METHOD_FUNC(test_ ## sym::test), 0)
+
+    test(rb_define_virtual_variable);
+    test(rb_define_hooked_variable);
+    test(rb_iterate);
+    test(rb_block_call);
+    test(rb_rescue);
+    test(rb_rescue2);
+    test(rb_ensure);
+    test(rb_catch);
+    test(rb_catch_obj);
+    test(rb_fiber_new);
+    test(rb_proc_new);
+    test(rb_thread_create);
+    test(st_foreach);
+    test(st_foreach_check);
+    test(st_foreach_safe);
+    test(rb_hash_foreach);
+    test(rb_ivar_foreach);
+    test(rb_define_method);
+    test(rb_define_module_function);
+    test(rb_define_singleton_method);
+    test(rb_define_protected_method);
+    test(rb_define_private_method);
+}
diff --git a/ext/-test-/cxxanyargs/depend b/ext/-test-/cxxanyargs/depend
new file mode 100644
index 0000000000..02113b6c26
--- /dev/null
+++ b/ext/-test-/cxxanyargs/depend
@@ -0,0 +1,25 @@
+$(TARGET_SO) $(STATIC_LIB): $(FAILURES:.cpp=.failed)
+
+.SUFFIXES: .failed
+
+.cpp.failed:
+	$(Q)$(RUBY) -rfileutils \
+	  -e "t = ARGV.shift" \
+	  -e "err = IO.popen(ARGV, err:[:child, :out], &:read)" \
+	  -e "abort err unless /rb_define_method/ =~ err" \
+	  -e "File.write(t, err)" $@ $(MAKE) $(*F).o
+
+# AUTOGENERATED DEPENDENCIES START
+cxxanyargs.o: $(RUBY_EXTCONF_H)
+cxxanyargs.o: $(arch_hdrdir)/ruby/config.h
+cxxanyargs.o: $(hdrdir)/ruby/assert.h
+cxxanyargs.o: $(hdrdir)/ruby/backward.h
+cxxanyargs.o: $(hdrdir)/ruby/backward/cxxanyargs.hpp
+cxxanyargs.o: $(hdrdir)/ruby/defines.h
+cxxanyargs.o: $(hdrdir)/ruby/intern.h
+cxxanyargs.o: $(hdrdir)/ruby/missing.h
+cxxanyargs.o: $(hdrdir)/ruby/ruby.h
+cxxanyargs.o: $(hdrdir)/ruby/st.h
+cxxanyargs.o: $(hdrdir)/ruby/subst.h
+cxxanyargs.o: cxxanyargs.cpp
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/cxxanyargs/extconf.rb b/ext/-test-/cxxanyargs/extconf.rb
new file mode 100644
index 0000000000..d2a740b989
--- /dev/null
+++ b/ext/-test-/cxxanyargs/extconf.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: false
+
+cxx = MakeMakefile["C++"]
+
+ok = cxx.try_compile(<<~'begin', "") do |x|
+  #include "ruby/config.h"
+
+  namespace {
+      typedef int conftest[SIZEOF_LONG == sizeof(long) ? 1 : -1];
+      typedef int conftest[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
+  }
+
+  int
+  main(int argc, const char** argv)
+  {
+      return !!argv[argc];
+  }
+begin
+  # We are wiping ruby.h from the source because that header file is the
+  # subject we are going to test in this extension library.
+  x.sub! %<#include "ruby.h">, ''
+end
+
+if ok
+  $srcs = %w[cxxanyargs.cpp]
+  failures = Dir.glob($srcdir + "/failure*.cpp").map {|n| File.basename(n)}
+  $cleanfiles << "$(FAILURES:.cpp=.failed)"
+  create_makefile("-test-/cxxanyargs") do |mk|
+    mk << "FAILURES #{['=', failures].join(' ')}\n"
+  end
+end
diff --git a/ext/-test-/cxxanyargs/failure.cpp b/ext/-test-/cxxanyargs/failure.cpp
new file mode 100644
index 0000000000..039beb1633
--- /dev/null
+++ b/ext/-test-/cxxanyargs/failure.cpp
@@ -0,0 +1,13 @@
+#include <ruby/ruby.h>
+
+static VALUE
+func_arg1(VALUE self, VALUE arg1)
+{
+    return arg1;
+}
+
+extern "C" void
+Init_failure(void)
+{
+    rb_define_method(rb_cObject, "arg1", func_arg1, 0);
+}
diff --git a/ext/-test-/cxxanyargs/failurem1.cpp b/ext/-test-/cxxanyargs/failurem1.cpp
new file mode 100644
index 0000000000..e58a0f4e0d
--- /dev/null
+++ b/ext/-test-/cxxanyargs/failurem1.cpp
@@ -0,0 +1,13 @@
+#include <ruby/ruby.h>
+
+static VALUE
+func_argm1(int argc, VALUE *argv, VALUE self)
+{
+    return argc > 0 ? argv[0] : Qnil;
+}
+
+extern "C" void
+Init_failure(void)
+{
+    rb_define_method(rb_cObject, "argm1", func_argm1, 0);
+}
diff --git a/ext/-test-/debug/depend b/ext/-test-/debug/depend
new file mode 100644
index 0000000000..662ed87510
--- /dev/null
+++ b/ext/-test-/debug/depend
@@ -0,0 +1,38 @@
+# AUTOGENERATED DEPENDENCIES START
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+inspector.o: $(RUBY_EXTCONF_H)
+inspector.o: $(arch_hdrdir)/ruby/config.h
+inspector.o: $(hdrdir)/ruby/assert.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/assert.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
diff --git a/ext/-test-/debug/extconf.rb b/ext/-test-/debug/extconf.rb
new file mode 100644
index 0000000000..ca51178a18
--- /dev/null
+++ b/ext/-test-/debug/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext
diff --git a/ext/-test-/debug/init.c b/ext/-test-/debug/init.c
new file mode 100644
index 0000000000..fe3979cbc5
--- /dev/null
+++ b/ext/-test-/debug/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+void
+Init_debug(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_module_under(mBug, "Debug");
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/debug/inspector.c b/ext/-test-/debug/inspector.c
new file mode 100644
index 0000000000..f0c58e59f9
--- /dev/null
+++ b/ext/-test-/debug/inspector.c
@@ -0,0 +1,32 @@
+#include "ruby/ruby.h"
+#include "ruby/debug.h"
+
+static VALUE
+callback(const rb_debug_inspector_t *dbg_context, void *data)
+{
+    VALUE locs = rb_debug_inspector_backtrace_locations(dbg_context);
+    long i, len = RARRAY_LEN(locs);
+    VALUE binds = rb_ary_new();
+    for (i = 0; i < len; ++i) {
+	VALUE entry = rb_ary_new();
+	rb_ary_push(binds, entry);
+	rb_ary_push(entry, rb_debug_inspector_frame_self_get(dbg_context, i));
+	rb_ary_push(entry, rb_debug_inspector_frame_binding_get(dbg_context, i));
+	rb_ary_push(entry, rb_debug_inspector_frame_class_get(dbg_context, i));
+	rb_ary_push(entry, rb_debug_inspector_frame_iseq_get(dbg_context, i));
+	rb_ary_push(entry, rb_ary_entry(locs, i));
+    }
+    return binds;
+}
+
+static VALUE
+debug_inspector(VALUE self)
+{
+    return rb_debug_inspector_open(callback, NULL);
+}
+
+void
+Init_inspector(VALUE klass)
+{
+    rb_define_module_function(klass, "inspector", debug_inspector, 0);
+}
diff --git a/ext/-test-/debug/profile_frames.c b/ext/-test-/debug/profile_frames.c
new file mode 100644
index 0000000000..1656ff7d4b
--- /dev/null
+++ b/ext/-test-/debug/profile_frames.c
@@ -0,0 +1,43 @@
+#include "ruby/ruby.h"
+#include "ruby/debug.h"
+
+#define MAX_BUF_SIZE 0x100
+
+static VALUE
+profile_frames(VALUE self, VALUE start_v, VALUE num_v)
+{
+    int i, collected_size;
+    int start = NUM2INT(start_v);
+    int buff_size = NUM2INT(num_v);
+    VALUE buff[MAX_BUF_SIZE];
+    int lines[MAX_BUF_SIZE];
+    VALUE result = rb_ary_new();
+
+    if (buff_size > MAX_BUF_SIZE) rb_raise(rb_eRuntimeError, "too long buff_size");
+
+    collected_size = rb_profile_frames(start, buff_size, buff, lines);
+
+    for (i=0; i<collected_size; i++) {
+	VALUE ary = rb_ary_new();
+	rb_ary_push(ary, rb_profile_frame_path(buff[i]));
+	rb_ary_push(ary, rb_profile_frame_absolute_path(buff[i]));
+	rb_ary_push(ary, rb_profile_frame_label(buff[i]));
+	rb_ary_push(ary, rb_profile_frame_base_label(buff[i]));
+	rb_ary_push(ary, rb_profile_frame_full_label(buff[i]));
+	rb_ary_push(ary, rb_profile_frame_first_lineno(buff[i]));
+	rb_ary_push(ary, rb_profile_frame_classpath(buff[i]));
+	rb_ary_push(ary, rb_profile_frame_singleton_method_p(buff[i]));
+	rb_ary_push(ary, rb_profile_frame_method_name(buff[i]));
+	rb_ary_push(ary, rb_profile_frame_qualified_method_name(buff[i]));
+
+	rb_ary_push(result, ary);
+    }
+
+    return result;
+}
+
+void
+Init_profile_frames(VALUE klass)
+{
+    rb_define_module_function(klass, "profile_frames", profile_frames, 2);
+}
diff --git a/ext/-test-/dln/empty/depend b/ext/-test-/dln/empty/depend
new file mode 100644
index 0000000000..99151fa055
--- /dev/null
+++ b/ext/-test-/dln/empty/depend
@@ -0,0 +1,3 @@
+# AUTOGENERATED DEPENDENCIES START
+empty.o: empty.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/dln/empty/empty.c b/ext/-test-/dln/empty/empty.c
new file mode 100644
index 0000000000..c4f94f1644
--- /dev/null
+++ b/ext/-test-/dln/empty/empty.c
@@ -0,0 +1,4 @@
+void
+Init_empty(void)
+{
+}
diff --git a/ext/-test-/dln/empty/extconf.rb b/ext/-test-/dln/empty/extconf.rb
new file mode 100644
index 0000000000..20310b6dde
--- /dev/null
+++ b/ext/-test-/dln/empty/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/dln/empty")
diff --git a/ext/-test-/enumerator_kw/depend b/ext/-test-/enumerator_kw/depend
new file mode 100644
index 0000000000..b7489eaf73
--- /dev/null
+++ b/ext/-test-/enumerator_kw/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+enumerator_kw.o: $(RUBY_EXTCONF_H)
+enumerator_kw.o: $(arch_hdrdir)/ruby/config.h
+enumerator_kw.o: $(hdrdir)/ruby.h
+enumerator_kw.o: $(hdrdir)/ruby/assert.h
+enumerator_kw.o: $(hdrdir)/ruby/backward.h
+enumerator_kw.o: $(hdrdir)/ruby/defines.h
+enumerator_kw.o: $(hdrdir)/ruby/intern.h
+enumerator_kw.o: $(hdrdir)/ruby/missing.h
+enumerator_kw.o: $(hdrdir)/ruby/ruby.h
+enumerator_kw.o: $(hdrdir)/ruby/st.h
+enumerator_kw.o: $(hdrdir)/ruby/subst.h
+enumerator_kw.o: enumerator_kw.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/enumerator_kw/enumerator_kw.c b/ext/-test-/enumerator_kw/enumerator_kw.c
new file mode 100644
index 0000000000..947d2b37e6
--- /dev/null
+++ b/ext/-test-/enumerator_kw/enumerator_kw.c
@@ -0,0 +1,21 @@
+#include <ruby.h>
+
+static VALUE
+enumerator_kw(int argc, VALUE *argv, VALUE self)
+{
+    VALUE opt, enum_args[4];
+    enum_args[0] = Qnil;
+    enum_args[1] = Qnil;
+    rb_scan_args(argc, argv, "01*:", enum_args, enum_args+1, &opt);
+    enum_args[3] = self;
+    enum_args[2] = opt;
+    RETURN_SIZED_ENUMERATOR_KW(self, 4, enum_args, 0, RB_NO_KEYWORDS);
+    return rb_yield_values_kw(4, enum_args, RB_NO_KEYWORDS);
+}
+
+void
+Init_enumerator_kw(void) {
+    VALUE module = rb_define_module("Bug");
+    module = rb_define_module_under(module, "EnumeratorKw");
+    rb_define_method(module, "m", enumerator_kw, -1);
+}
diff --git a/ext/-test-/enumerator_kw/extconf.rb b/ext/-test-/enumerator_kw/extconf.rb
new file mode 100644
index 0000000000..ab2be73fa8
--- /dev/null
+++ b/ext/-test-/enumerator_kw/extconf.rb
@@ -0,0 +1 @@
+create_makefile("-test-/enumerator_kw")
diff --git a/ext/-test-/exception/dataerror.c b/ext/-test-/exception/dataerror.c
new file mode 100644
index 0000000000..d8beba8aa4
--- /dev/null
+++ b/ext/-test-/exception/dataerror.c
@@ -0,0 +1,31 @@
+#include <ruby/ruby.h>
+
+static void
+dataerror_mark(void *ptr)
+{
+    rb_gc_mark((VALUE)ptr);
+}
+
+static void
+dataerror_free(void *ptr)
+{
+}
+
+static const rb_data_type_t dataerror_type = {
+    "Bug #9167",
+    {dataerror_mark, dataerror_free},
+};
+
+static VALUE
+dataerror_alloc(VALUE klass)
+{
+    VALUE n = rb_str_new_cstr("[Bug #9167] error");
+    return TypedData_Wrap_Struct(klass, &dataerror_type, (void *)n);
+}
+
+void
+Init_dataerror(VALUE klass)
+{
+    VALUE rb_eDataErr = rb_define_class_under(klass, "DataError", rb_eStandardError);
+    rb_define_alloc_func(rb_eDataErr, dataerror_alloc);
+}
diff --git a/ext/-test-/exception/depend b/ext/-test-/exception/depend
new file mode 100644
index 0000000000..d0958de9b8
--- /dev/null
+++ b/ext/-test-/exception/depend
@@ -0,0 +1,52 @@
+# AUTOGENERATED DEPENDENCIES START
+dataerror.o: $(RUBY_EXTCONF_H)
+dataerror.o: $(arch_hdrdir)/ruby/config.h
+dataerror.o: $(hdrdir)/ruby/assert.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.h
+enc_raise.o: $(hdrdir)/ruby/assert.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/onigmo.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: enc_raise.c
+ensured.o: $(RUBY_EXTCONF_H)
+ensured.o: $(arch_hdrdir)/ruby/config.h
+ensured.o: $(hdrdir)/ruby.h
+ensured.o: $(hdrdir)/ruby/assert.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: ensured.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/exception/enc_raise.c b/ext/-test-/exception/enc_raise.c
new file mode 100644
index 0000000000..68d7b4ebc1
--- /dev/null
+++ b/ext/-test-/exception/enc_raise.c
@@ -0,0 +1,15 @@
+#include <ruby.h>
+#include <ruby/encoding.h>
+
+static VALUE
+enc_raise(VALUE exc, VALUE encoding, VALUE mesg)
+{
+    rb_enc_raise(rb_to_encoding(encoding), exc, "%s", StringValueCStr(mesg));
+    UNREACHABLE_RETURN(Qnil);
+}
+
+void
+Init_enc_raise(VALUE klass)
+{
+    rb_define_module_function(klass, "enc_raise", enc_raise, 2);
+}
diff --git a/ext/-test-/exception/ensured.c b/ext/-test-/exception/ensured.c
new file mode 100644
index 0000000000..7dcc9b78ef
--- /dev/null
+++ b/ext/-test-/exception/ensured.c
@@ -0,0 +1,39 @@
+#include <ruby.h>
+
+static VALUE
+begin(VALUE object)
+{
+    return rb_funcall(object, rb_intern("try_method"), 0);
+}
+
+static VALUE
+ensure(VALUE object)
+{
+    return rb_funcall(object, rb_intern("ensured_method"), 0);
+}
+
+static VALUE
+ensured(VALUE module, VALUE object)
+{
+    return rb_ensure(begin, object, ensure, object);
+}
+
+static VALUE
+exc_raise(VALUE exc)
+{
+    rb_exc_raise(exc);
+    return Qnil;
+}
+
+static VALUE
+ensure_raise(VALUE module, VALUE object, VALUE exc)
+{
+    return rb_ensure(rb_yield, object, exc_raise, exc);
+}
+
+void
+Init_ensured(VALUE klass)
+{
+    rb_define_module_function(klass, "ensured", ensured, 1);
+    rb_define_module_function(klass, "ensure_raise", ensure_raise, 2);
+}
diff --git a/ext/-test-/exception/extconf.rb b/ext/-test-/exception/extconf.rb
new file mode 100644
index 0000000000..ca51178a18
--- /dev/null
+++ b/ext/-test-/exception/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext
diff --git a/ext/-test-/exception/init.c b/ext/-test-/exception/init.c
new file mode 100644
index 0000000000..853bb68f79
--- /dev/null
+++ b/ext/-test-/exception/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+void
+Init_exception(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_class_under(mBug, "Exception", rb_eStandardError);
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/fatal/depend b/ext/-test-/fatal/depend
new file mode 100644
index 0000000000..c74360fdf9
--- /dev/null
+++ b/ext/-test-/fatal/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+rb_fatal.o: $(RUBY_EXTCONF_H)
+rb_fatal.o: $(arch_hdrdir)/ruby/config.h
+rb_fatal.o: $(hdrdir)/ruby.h
+rb_fatal.o: $(hdrdir)/ruby/assert.h
+rb_fatal.o: $(hdrdir)/ruby/backward.h
+rb_fatal.o: $(hdrdir)/ruby/defines.h
+rb_fatal.o: $(hdrdir)/ruby/intern.h
+rb_fatal.o: $(hdrdir)/ruby/missing.h
+rb_fatal.o: $(hdrdir)/ruby/ruby.h
+rb_fatal.o: $(hdrdir)/ruby/st.h
+rb_fatal.o: $(hdrdir)/ruby/subst.h
+rb_fatal.o: rb_fatal.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/fatal/extconf.rb b/ext/-test-/fatal/extconf.rb
new file mode 100644
index 0000000000..d5849c0733
--- /dev/null
+++ b/ext/-test-/fatal/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/fatal/rb_fatal")
diff --git a/ext/-test-/fatal/rb_fatal.c b/ext/-test-/fatal/rb_fatal.c
new file mode 100644
index 0000000000..71aef4658a
--- /dev/null
+++ b/ext/-test-/fatal/rb_fatal.c
@@ -0,0 +1,19 @@
+#include <ruby.h>
+
+static VALUE
+ruby_fatal(VALUE obj, VALUE msg)
+{
+    const char *cmsg = NULL;
+
+    (void)obj;
+
+    cmsg = RSTRING_PTR(msg);
+    rb_fatal("%s", cmsg);
+    return 0; /* never reached */
+}
+
+void
+Init_rb_fatal(void)
+{
+    rb_define_method(rb_mKernel, "rb_fatal", ruby_fatal, 1);
+}
diff --git a/ext/-test-/file/depend b/ext/-test-/file/depend
new file mode 100644
index 0000000000..afdf116a9d
--- /dev/null
+++ b/ext/-test-/file/depend
@@ -0,0 +1,44 @@
+# AUTOGENERATED DEPENDENCIES START
+fs.o: $(RUBY_EXTCONF_H)
+fs.o: $(arch_hdrdir)/ruby/config.h
+fs.o: $(hdrdir)/ruby/assert.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/onigmo.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.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+stat.o: $(RUBY_EXTCONF_H)
+stat.o: $(arch_hdrdir)/ruby/config.h
+stat.o: $(hdrdir)/ruby/assert.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/onigmo.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
diff --git a/ext/-test-/file/extconf.rb b/ext/-test-/file/extconf.rb
new file mode 100644
index 0000000000..9027ed1c3e
--- /dev/null
+++ b/ext/-test-/file/extconf.rb
@@ -0,0 +1,18 @@
+# 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)
diff --git a/ext/-test-/file/fs.c b/ext/-test-/file/fs.c
new file mode 100644
index 0000000000..63d2356d76
--- /dev/null
+++ b/ext/-test-/file/fs.c
@@ -0,0 +1,111 @@
+#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>
+#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
+#endif
+
+VALUE
+get_fsname(VALUE self, VALUE str)
+{
+#ifdef STATFS
+    statfs_t st;
+# define CSTR(s) rb_str_new_cstr(s)
+
+    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;
+}
+
+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);
+    }
+# ifdef HAVE_STRUCT_STATFS_F_FLAGS
+#  ifdef MNT_STRICTATIME
+    if (!(st.f_flags & MNT_STRICTATIME)) return Qtrue;
+#  endif
+#  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
+    return Qnil;
+}
+
+void
+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-/file/init.c b/ext/-test-/file/init.c
new file mode 100644
index 0000000000..1117993d6c
--- /dev/null
+++ b/ext/-test-/file/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(module);}
+
+void
+Init_file(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE module = rb_define_module_under(mBug, "File");
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/file/stat.c b/ext/-test-/file/stat.c
new file mode 100644
index 0000000000..fed5d389eb
--- /dev/null
+++ b/ext/-test-/file/stat.c
@@ -0,0 +1,27 @@
+#include "ruby/ruby.h"
+#include "ruby/io.h"
+
+static VALUE
+stat_for_fd(VALUE self, VALUE fileno)
+{
+    struct stat st;
+    if (fstat(NUM2INT(fileno), &st)) rb_sys_fail(0);
+    return rb_stat_new(&st);
+}
+
+static VALUE
+stat_for_path(VALUE self, VALUE path)
+{
+    struct stat st;
+    FilePathValue(path);
+    if (stat(RSTRING_PTR(path), &st)) rb_sys_fail(0);
+    return rb_stat_new(&st);
+}
+
+void
+Init_stat(VALUE module)
+{
+    VALUE st = rb_define_module_under(module, "Stat");
+    rb_define_module_function(st, "for_fd", stat_for_fd, 1);
+    rb_define_module_function(st, "for_path", stat_for_path, 1);
+}
diff --git a/ext/-test-/float/depend b/ext/-test-/float/depend
new file mode 100644
index 0000000000..6007bd3c0b
--- /dev/null
+++ b/ext/-test-/float/depend
@@ -0,0 +1,30 @@
+# for FreeBSD make
+nextafter.o: nextafter.c $(top_srcdir)/missing/nextafter.c
+
+# AUTOGENERATED DEPENDENCIES START
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+nextafter.o: $(RUBY_EXTCONF_H)
+nextafter.o: $(arch_hdrdir)/ruby/config.h
+nextafter.o: $(hdrdir)/ruby.h
+nextafter.o: $(hdrdir)/ruby/assert.h
+nextafter.o: $(hdrdir)/ruby/backward.h
+nextafter.o: $(hdrdir)/ruby/defines.h
+nextafter.o: $(hdrdir)/ruby/intern.h
+nextafter.o: $(hdrdir)/ruby/missing.h
+nextafter.o: $(hdrdir)/ruby/ruby.h
+nextafter.o: $(hdrdir)/ruby/st.h
+nextafter.o: $(hdrdir)/ruby/subst.h
+nextafter.o: $(top_srcdir)/missing/nextafter.c
+nextafter.o: nextafter.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/float/extconf.rb b/ext/-test-/float/extconf.rb
new file mode 100644
index 0000000000..d786b15db9
--- /dev/null
+++ b/ext/-test-/float/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext(inc: true)
diff --git a/ext/-test-/float/init.c b/ext/-test-/float/init.c
new file mode 100644
index 0000000000..d962108e39
--- /dev/null
+++ b/ext/-test-/float/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+void
+Init_float(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_class_under(mBug, "Float", rb_cObject);
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/float/nextafter.c b/ext/-test-/float/nextafter.c
new file mode 100644
index 0000000000..30fb71f520
--- /dev/null
+++ b/ext/-test-/float/nextafter.c
@@ -0,0 +1,36 @@
+#include "ruby.h"
+
+static VALUE
+system_nextafter_m(VALUE klass, VALUE vx, VALUE vy)
+{
+    double x, y, z;
+
+    x = NUM2DBL(vx);
+    y = NUM2DBL(vy);
+    z = nextafter(x, y);
+
+    return DBL2NUM(z);
+}
+
+#define nextafter missing_nextafter
+#include "../../../missing/nextafter.c"
+#undef nextafter
+
+static VALUE
+missing_nextafter_m(VALUE klass, VALUE vx, VALUE vy)
+{
+    double x, y, z;
+
+    x = NUM2DBL(vx);
+    y = NUM2DBL(vy);
+    z = missing_nextafter(x, y);
+
+    return DBL2NUM(z);
+}
+
+void
+Init_nextafter(VALUE klass)
+{
+    rb_define_singleton_method(klass, "system_nextafter", system_nextafter_m, 2);
+    rb_define_singleton_method(klass, "missing_nextafter", missing_nextafter_m, 2);
+}
diff --git a/ext/-test-/funcall/depend b/ext/-test-/funcall/depend
new file mode 100644
index 0000000000..a5f43a8046
--- /dev/null
+++ b/ext/-test-/funcall/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+funcall.o: $(RUBY_EXTCONF_H)
+funcall.o: $(arch_hdrdir)/ruby/config.h
+funcall.o: $(hdrdir)/ruby.h
+funcall.o: $(hdrdir)/ruby/assert.h
+funcall.o: $(hdrdir)/ruby/backward.h
+funcall.o: $(hdrdir)/ruby/defines.h
+funcall.o: $(hdrdir)/ruby/intern.h
+funcall.o: $(hdrdir)/ruby/missing.h
+funcall.o: $(hdrdir)/ruby/ruby.h
+funcall.o: $(hdrdir)/ruby/st.h
+funcall.o: $(hdrdir)/ruby/subst.h
+funcall.o: funcall.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/funcall/extconf.rb b/ext/-test-/funcall/extconf.rb
index 8a9179ab2f..39d6134cba 100644
--- a/ext/-test-/funcall/extconf.rb
+++ b/ext/-test-/funcall/extconf.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: false
 require 'mkmf'
-create_makefile("-test-/funcall/funcall")
+create_makefile("-test-/funcall")
diff --git a/ext/-test-/funcall/funcall.c b/ext/-test-/funcall/funcall.c
new file mode 100644
index 0000000000..43521bf2e9
--- /dev/null
+++ b/ext/-test-/funcall/funcall.c
@@ -0,0 +1,72 @@
+#include "ruby.h"
+
+static VALUE
+with_funcall2(int argc, VALUE *argv, VALUE self)
+{
+    return rb_funcallv(self, rb_intern("target"), argc, argv);
+}
+
+static VALUE
+with_funcall_passing_block(int argc, VALUE *argv, VALUE self)
+{
+    return rb_funcall_passing_block(self, rb_intern("target"), argc, argv);
+}
+
+static VALUE
+with_funcall_passing_block_kw(int argc, VALUE *argv, VALUE self)
+{
+    return rb_funcall_passing_block_kw(self, rb_intern("target"), argc-1, argv+1, FIX2INT(argv[0]));
+}
+
+static VALUE
+with_funcallv_public_kw(int argc, VALUE *argv, VALUE self)
+{
+    return rb_funcallv_public_kw(argv[0], SYM2ID(argv[1]), argc-3, argv+3, FIX2INT(argv[2]));
+}
+
+static VALUE
+with_yield_splat_kw(int argc, VALUE *argv, VALUE self)
+{
+    return rb_yield_splat_kw(argv[1], FIX2INT(argv[0]));
+}
+
+static VALUE
+extra_args_name(VALUE self)
+{
+    /*
+     * at least clang 5.x gets tripped by the extra 0 arg
+     * [ruby-core:85266] [Bug #14425]
+     */
+    return rb_funcall(self, rb_intern("name"), 0, 0);
+}
+
+void
+Init_funcall(void)
+{
+    VALUE cTestFuncall = rb_path2class("TestFuncall");
+    VALUE cRelay = rb_define_module_under(cTestFuncall, "Relay");
+
+    rb_define_singleton_method(cRelay,
+			       "with_funcall2",
+			       with_funcall2,
+			       -1);
+    rb_define_singleton_method(cRelay,
+                               "with_funcall_passing_block_kw",
+                               with_funcall_passing_block_kw,
+                               -1);
+    rb_define_singleton_method(cRelay,
+			       "with_funcall_passing_block",
+			       with_funcall_passing_block,
+			       -1);
+    rb_define_singleton_method(cRelay,
+                               "with_funcallv_public_kw",
+                               with_funcallv_public_kw,
+                               -1);
+    rb_define_singleton_method(cRelay,
+                               "with_yield_splat_kw",
+                               with_yield_splat_kw,
+                               -1);
+    rb_define_singleton_method(cTestFuncall, "extra_args_name",
+                                extra_args_name,
+                                0);
+}
diff --git a/ext/-test-/funcall/passing_block.c b/ext/-test-/funcall/passing_block.c
deleted file mode 100644
index 0200f80369..0000000000
--- a/ext/-test-/funcall/passing_block.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "ruby.h"
-
-VALUE rb_funcall_passing_block(VALUE, ID, int, const VALUE*);
-
-static VALUE
-with_funcall2(int argc, VALUE *argv, VALUE self)
-{
-    return rb_funcall2(self, rb_intern("target"), argc, argv);
-}
-
-static VALUE
-with_funcall_passing_block(int argc, VALUE *argv, VALUE self)
-{
-    return rb_funcall_passing_block(self, rb_intern("target"), argc, argv);
-}
-
-void
-Init_funcall(void)
-{
-    VALUE cRelay = rb_path2class("TestFuncall::Relay");
-
-    rb_define_singleton_method(cRelay,
-			       "with_funcall2",
-			       with_funcall2,
-			       -1);
-    rb_define_singleton_method(cRelay,
-			       "with_funcall_passing_block",
-			       with_funcall_passing_block,
-			       -1);
-}
diff --git a/ext/-test-/gvl/call_without_gvl/call_without_gvl.c b/ext/-test-/gvl/call_without_gvl/call_without_gvl.c
new file mode 100644
index 0000000000..d77c2f323e
--- /dev/null
+++ b/ext/-test-/gvl/call_without_gvl/call_without_gvl.c
@@ -0,0 +1,76 @@
+#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;
+}
+
+struct loop_ctl {
+    int notify_fd;
+    volatile int stop;
+};
+
+static void *
+do_loop(void *p)
+{
+    struct loop_ctl *ctl = p;
+
+    /* tell the waiting process they can interrupt us, now */
+    ssize_t err = write(ctl->notify_fd, "", 1);
+    if (err == -1) rb_bug("write error");
+
+    while (!ctl->stop) {
+        struct timeval tv = { 0, 10000 };
+        select(0, NULL, NULL, NULL, &tv);
+    }
+    return 0;
+}
+
+static void
+stop_set(void *p)
+{
+    struct loop_ctl *ctl = p;
+
+    ctl->stop = 1;
+}
+
+static VALUE
+thread_ubf_async_safe(VALUE thread, VALUE notify_fd)
+{
+    struct loop_ctl ctl;
+
+    ctl.notify_fd = NUM2INT(notify_fd);
+    ctl.stop = 0;
+
+    rb_nogvl(do_loop, &ctl, stop_set, &ctl, RB_NOGVL_UBF_ASYNC_SAFE);
+    return thread;
+}
+
+void
+Init_call_without_gvl(void)
+{
+    rb_define_method(rb_cThread, "__runnable_sleep__", thread_runnable_sleep, 1);
+    rb_define_method(rb_cThread, "__ubf_async_safe__", thread_ubf_async_safe, 1);
+}
diff --git a/ext/-test-/gvl/call_without_gvl/depend b/ext/-test-/gvl/call_without_gvl/depend
new file mode 100644
index 0000000000..3d4253b977
--- /dev/null
+++ b/ext/-test-/gvl/call_without_gvl/depend
@@ -0,0 +1,14 @@
+# 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/assert.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
new file mode 100644
index 0000000000..56181b6773
--- /dev/null
+++ b/ext/-test-/gvl/call_without_gvl/extconf.rb
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000000..10d4aec6e7
--- /dev/null
+++ b/ext/-test-/hash/delete.c
@@ -0,0 +1,16 @@
+#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/depend b/ext/-test-/hash/depend
new file mode 100644
index 0000000000..5e2b8056c8
--- /dev/null
+++ b/ext/-test-/hash/depend
@@ -0,0 +1,26 @@
+# AUTOGENERATED DEPENDENCIES START
+delete.o: $(RUBY_EXTCONF_H)
+delete.o: $(arch_hdrdir)/ruby/config.h
+delete.o: $(hdrdir)/ruby.h
+delete.o: $(hdrdir)/ruby/assert.h
+delete.o: $(hdrdir)/ruby/backward.h
+delete.o: $(hdrdir)/ruby/defines.h
+delete.o: $(hdrdir)/ruby/intern.h
+delete.o: $(hdrdir)/ruby/missing.h
+delete.o: $(hdrdir)/ruby/ruby.h
+delete.o: $(hdrdir)/ruby/st.h
+delete.o: $(hdrdir)/ruby/subst.h
+delete.o: delete.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/hash/extconf.rb b/ext/-test-/hash/extconf.rb
new file mode 100644
index 0000000000..d786b15db9
--- /dev/null
+++ b/ext/-test-/hash/extconf.rb
@@ -0,0 +1,3 @@
+# 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
new file mode 100644
index 0000000000..9f6cbde652
--- /dev/null
+++ b/ext/-test-/hash/init.c
@@ -0,0 +1,11 @@
+#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
new file mode 100644
index 0000000000..510ba4a1e6
--- /dev/null
+++ b/ext/-test-/integer/core_ext.c
@@ -0,0 +1,36 @@
+#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;
+}
+
+static VALUE
+positive_pow(VALUE x, VALUE y)
+{
+    return rb_int_positive_pow(NUM2LONG(x), NUM2ULONG(y));
+}
+
+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);
+    rb_define_method(rb_cInteger, "positive_pow", positive_pow, 1);
+}
diff --git a/ext/-test-/integer/depend b/ext/-test-/integer/depend
new file mode 100644
index 0000000000..5c9d581389
--- /dev/null
+++ b/ext/-test-/integer/depend
@@ -0,0 +1,39 @@
+# AUTOGENERATED DEPENDENCIES START
+core_ext.o: $(RUBY_EXTCONF_H)
+core_ext.o: $(arch_hdrdir)/ruby/config.h
+core_ext.o: $(hdrdir)/ruby.h
+core_ext.o: $(hdrdir)/ruby/assert.h
+core_ext.o: $(hdrdir)/ruby/backward.h
+core_ext.o: $(hdrdir)/ruby/defines.h
+core_ext.o: $(hdrdir)/ruby/intern.h
+core_ext.o: $(hdrdir)/ruby/missing.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)/internal.h
+core_ext.o: core_ext.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+my_integer.o: $(RUBY_EXTCONF_H)
+my_integer.o: $(arch_hdrdir)/ruby/config.h
+my_integer.o: $(hdrdir)/ruby.h
+my_integer.o: $(hdrdir)/ruby/assert.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: my_integer.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/integer/extconf.rb b/ext/-test-/integer/extconf.rb
new file mode 100644
index 0000000000..d786b15db9
--- /dev/null
+++ b/ext/-test-/integer/extconf.rb
@@ -0,0 +1,3 @@
+# 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
new file mode 100644
index 0000000000..fc256ea16b
--- /dev/null
+++ b/ext/-test-/integer/init.c
@@ -0,0 +1,11 @@
+#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
new file mode 100644
index 0000000000..d86474bd7d
--- /dev/null
+++ b/ext/-test-/integer/my_integer.c
@@ -0,0 +1,16 @@
+#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/depend b/ext/-test-/iseq_load/depend
new file mode 100644
index 0000000000..ac549546ec
--- /dev/null
+++ b/ext/-test-/iseq_load/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+iseq_load.o: $(RUBY_EXTCONF_H)
+iseq_load.o: $(arch_hdrdir)/ruby/config.h
+iseq_load.o: $(hdrdir)/ruby.h
+iseq_load.o: $(hdrdir)/ruby/assert.h
+iseq_load.o: $(hdrdir)/ruby/backward.h
+iseq_load.o: $(hdrdir)/ruby/defines.h
+iseq_load.o: $(hdrdir)/ruby/intern.h
+iseq_load.o: $(hdrdir)/ruby/missing.h
+iseq_load.o: $(hdrdir)/ruby/ruby.h
+iseq_load.o: $(hdrdir)/ruby/st.h
+iseq_load.o: $(hdrdir)/ruby/subst.h
+iseq_load.o: iseq_load.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/iseq_load/extconf.rb b/ext/-test-/iseq_load/extconf.rb
new file mode 100644
index 0000000000..5858870138
--- /dev/null
+++ b/ext/-test-/iseq_load/extconf.rb
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000000..b4b9a8aa3d
--- /dev/null
+++ b/ext/-test-/iseq_load/iseq_load.c
@@ -0,0 +1,21 @@
+#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/break.c b/ext/-test-/iter/break.c
new file mode 100644
index 0000000000..4d43c5d0cf
--- /dev/null
+++ b/ext/-test-/iter/break.c
@@ -0,0 +1,25 @@
+#include <ruby.h>
+
+static VALUE
+iter_break(VALUE self)
+{
+    rb_iter_break();
+
+    UNREACHABLE_RETURN(Qnil);
+}
+
+static VALUE
+iter_break_value(VALUE self, VALUE val)
+{
+    rb_iter_break_value(val);
+
+    UNREACHABLE_RETURN(Qnil);
+}
+
+void
+Init_break(VALUE klass)
+{
+    VALUE breakable = rb_define_module_under(klass, "Breakable");
+    rb_define_module_function(breakable, "iter_break", iter_break, 0);
+    rb_define_module_function(breakable, "iter_break_value", iter_break_value, 1);
+}
diff --git a/ext/-test-/iter/depend b/ext/-test-/iter/depend
new file mode 100644
index 0000000000..5e754950c1
--- /dev/null
+++ b/ext/-test-/iter/depend
@@ -0,0 +1,38 @@
+# AUTOGENERATED DEPENDENCIES START
+break.o: $(RUBY_EXTCONF_H)
+break.o: $(arch_hdrdir)/ruby/config.h
+break.o: $(hdrdir)/ruby.h
+break.o: $(hdrdir)/ruby/assert.h
+break.o: $(hdrdir)/ruby/backward.h
+break.o: $(hdrdir)/ruby/defines.h
+break.o: $(hdrdir)/ruby/intern.h
+break.o: $(hdrdir)/ruby/missing.h
+break.o: $(hdrdir)/ruby/ruby.h
+break.o: $(hdrdir)/ruby/st.h
+break.o: $(hdrdir)/ruby/subst.h
+break.o: break.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+yield.o: $(RUBY_EXTCONF_H)
+yield.o: $(arch_hdrdir)/ruby/config.h
+yield.o: $(hdrdir)/ruby.h
+yield.o: $(hdrdir)/ruby/assert.h
+yield.o: $(hdrdir)/ruby/backward.h
+yield.o: $(hdrdir)/ruby/defines.h
+yield.o: $(hdrdir)/ruby/intern.h
+yield.o: $(hdrdir)/ruby/missing.h
+yield.o: $(hdrdir)/ruby/ruby.h
+yield.o: $(hdrdir)/ruby/st.h
+yield.o: $(hdrdir)/ruby/subst.h
+yield.o: yield.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/iter/extconf.rb b/ext/-test-/iter/extconf.rb
new file mode 100644
index 0000000000..d786b15db9
--- /dev/null
+++ b/ext/-test-/iter/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext(inc: true)
diff --git a/ext/-test-/iter/init.c b/ext/-test-/iter/init.c
new file mode 100644
index 0000000000..a074ec46a9
--- /dev/null
+++ b/ext/-test-/iter/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+void
+Init_iter(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_module_under(mBug, "Iter");
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/iter/yield.c b/ext/-test-/iter/yield.c
new file mode 100644
index 0000000000..0f6f3e87eb
--- /dev/null
+++ b/ext/-test-/iter/yield.c
@@ -0,0 +1,16 @@
+#include <ruby.h>
+
+static VALUE
+yield_block(int argc, VALUE *argv, VALUE self)
+{
+    rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
+    return rb_block_call_kw(self, rb_to_id(argv[0]), argc-1, argv+1, rb_yield_block, 0, RB_PASS_CALLED_KEYWORDS);
+}
+
+void
+Init_yield(VALUE klass)
+{
+    VALUE yield = rb_define_module_under(klass, "Yield");
+
+    rb_define_method(yield, "yield_block", yield_block, -1);
+}
diff --git a/ext/-test-/load/dot.dot/depend b/ext/-test-/load/dot.dot/depend
new file mode 100644
index 0000000000..a0445e288b
--- /dev/null
+++ b/ext/-test-/load/dot.dot/depend
@@ -0,0 +1,3 @@
+# 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 6287db6bd8..13ebb1ffb4 100644
--- a/ext/-test-/load/dot.dot/extconf.rb
+++ b/ext/-test-/load/dot.dot/extconf.rb
@@ -1 +1,2 @@
-create_makefile("-test-/load/dot.dot/dot.dot")
+# frozen_string_literal: false
+create_makefile("-test-/load/dot.dot")
diff --git a/ext/-test-/load/protect/depend b/ext/-test-/load/protect/depend
new file mode 100644
index 0000000000..b62393f1cb
--- /dev/null
+++ b/ext/-test-/load/protect/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+protect.o: $(RUBY_EXTCONF_H)
+protect.o: $(arch_hdrdir)/ruby/config.h
+protect.o: $(hdrdir)/ruby.h
+protect.o: $(hdrdir)/ruby/assert.h
+protect.o: $(hdrdir)/ruby/backward.h
+protect.o: $(hdrdir)/ruby/defines.h
+protect.o: $(hdrdir)/ruby/intern.h
+protect.o: $(hdrdir)/ruby/missing.h
+protect.o: $(hdrdir)/ruby/ruby.h
+protect.o: $(hdrdir)/ruby/st.h
+protect.o: $(hdrdir)/ruby/subst.h
+protect.o: protect.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/load/protect/extconf.rb b/ext/-test-/load/protect/extconf.rb
new file mode 100644
index 0000000000..83c080de9c
--- /dev/null
+++ b/ext/-test-/load/protect/extconf.rb
@@ -0,0 +1 @@
+create_makefile('-test-/load/protect')
diff --git a/ext/-test-/load/protect/protect.c b/ext/-test-/load/protect/protect.c
new file mode 100644
index 0000000000..ccfbbb9ea0
--- /dev/null
+++ b/ext/-test-/load/protect/protect.c
@@ -0,0 +1,19 @@
+#include <ruby.h>
+
+static VALUE
+load_protect(int argc, VALUE *argv, VALUE self)
+{
+    int state;
+    VALUE path, wrap;
+    rb_scan_args(argc, argv, "11", &path, &wrap);
+    rb_load_protect(path, RTEST(wrap), &state);
+    if (state) rb_jump_tag(state);
+    return Qnil;
+}
+
+void
+Init_protect(void)
+{
+    VALUE mod = rb_define_module("Bug");
+    rb_define_singleton_method(mod, "load_protect", load_protect, -1);
+}
diff --git a/ext/-test-/marshal/compat/depend b/ext/-test-/marshal/compat/depend
new file mode 100644
index 0000000000..f159506960
--- /dev/null
+++ b/ext/-test-/marshal/compat/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+usrcompat.o: $(RUBY_EXTCONF_H)
+usrcompat.o: $(arch_hdrdir)/ruby/config.h
+usrcompat.o: $(hdrdir)/ruby.h
+usrcompat.o: $(hdrdir)/ruby/assert.h
+usrcompat.o: $(hdrdir)/ruby/backward.h
+usrcompat.o: $(hdrdir)/ruby/defines.h
+usrcompat.o: $(hdrdir)/ruby/intern.h
+usrcompat.o: $(hdrdir)/ruby/missing.h
+usrcompat.o: $(hdrdir)/ruby/ruby.h
+usrcompat.o: $(hdrdir)/ruby/st.h
+usrcompat.o: $(hdrdir)/ruby/subst.h
+usrcompat.o: usrcompat.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/marshal/compat/extconf.rb b/ext/-test-/marshal/compat/extconf.rb
new file mode 100644
index 0000000000..9bf44b473a
--- /dev/null
+++ b/ext/-test-/marshal/compat/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/marshal/compat")
diff --git a/ext/-test-/marshal/compat/usrcompat.c b/ext/-test-/marshal/compat/usrcompat.c
new file mode 100644
index 0000000000..f812df5631
--- /dev/null
+++ b/ext/-test-/marshal/compat/usrcompat.c
@@ -0,0 +1,32 @@
+#include <ruby.h>
+
+static VALUE
+usr_dumper(VALUE self)
+{
+    return self;
+}
+
+static VALUE
+usr_loader(VALUE self, VALUE m)
+{
+    VALUE val = rb_ivar_get(m, rb_intern("@value"));
+    *(int *)DATA_PTR(self) = NUM2INT(val);
+    return self;
+}
+
+static VALUE
+compat_mload(VALUE self, VALUE data)
+{
+    rb_ivar_set(self, rb_intern("@value"), data);
+    return self;
+}
+
+void
+Init_compat(void)
+{
+    VALUE newclass = rb_path2class("Bug::Marshal::UsrMarshal");
+    VALUE oldclass = rb_define_class_under(newclass, "compat", rb_cObject);
+
+    rb_define_method(oldclass, "marshal_load", compat_mload, 1);
+    rb_marshal_define_compat(newclass, oldclass, usr_dumper, usr_loader);
+}
diff --git a/ext/-test-/marshal/internal_ivar/depend b/ext/-test-/marshal/internal_ivar/depend
new file mode 100644
index 0000000000..f280347c01
--- /dev/null
+++ b/ext/-test-/marshal/internal_ivar/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+internal_ivar.o: $(RUBY_EXTCONF_H)
+internal_ivar.o: $(arch_hdrdir)/ruby/config.h
+internal_ivar.o: $(hdrdir)/ruby.h
+internal_ivar.o: $(hdrdir)/ruby/assert.h
+internal_ivar.o: $(hdrdir)/ruby/backward.h
+internal_ivar.o: $(hdrdir)/ruby/defines.h
+internal_ivar.o: $(hdrdir)/ruby/intern.h
+internal_ivar.o: $(hdrdir)/ruby/missing.h
+internal_ivar.o: $(hdrdir)/ruby/ruby.h
+internal_ivar.o: $(hdrdir)/ruby/st.h
+internal_ivar.o: $(hdrdir)/ruby/subst.h
+internal_ivar.o: internal_ivar.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/marshal/internal_ivar/extconf.rb b/ext/-test-/marshal/internal_ivar/extconf.rb
new file mode 100644
index 0000000000..cb3f825dbd
--- /dev/null
+++ b/ext/-test-/marshal/internal_ivar/extconf.rb
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000000..de0cf711aa
--- /dev/null
+++ b/ext/-test-/marshal/internal_ivar/internal_ivar.c
@@ -0,0 +1,48 @@
+#include <ruby.h>
+
+static ID id_normal_ivar, id_internal_ivar, id_encoding_short;
+
+static VALUE
+init(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3)
+{
+    rb_ivar_set(self, id_normal_ivar, arg1);
+    rb_ivar_set(self, id_internal_ivar, arg2);
+    rb_ivar_set(self, id_encoding_short, arg3);
+    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);
+}
+
+static VALUE
+get_encoding_short(VALUE self)
+{
+    return rb_attr_get(self, id_encoding_short);
+}
+
+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
+    id_encoding_short = rb_intern_const("E");
+    rb_define_method(newclass, "initialize", init, 3);
+    rb_define_method(newclass, "normal", get_normal, 0);
+    rb_define_method(newclass, "internal", get_internal, 0);
+    rb_define_method(newclass, "encoding_short", get_encoding_short, 0);
+}
diff --git a/ext/-test-/marshal/usr/depend b/ext/-test-/marshal/usr/depend
new file mode 100644
index 0000000000..21c0c2d744
--- /dev/null
+++ b/ext/-test-/marshal/usr/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+usrmarshal.o: $(RUBY_EXTCONF_H)
+usrmarshal.o: $(arch_hdrdir)/ruby/config.h
+usrmarshal.o: $(hdrdir)/ruby.h
+usrmarshal.o: $(hdrdir)/ruby/assert.h
+usrmarshal.o: $(hdrdir)/ruby/backward.h
+usrmarshal.o: $(hdrdir)/ruby/defines.h
+usrmarshal.o: $(hdrdir)/ruby/intern.h
+usrmarshal.o: $(hdrdir)/ruby/missing.h
+usrmarshal.o: $(hdrdir)/ruby/ruby.h
+usrmarshal.o: $(hdrdir)/ruby/st.h
+usrmarshal.o: $(hdrdir)/ruby/subst.h
+usrmarshal.o: usrmarshal.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/marshal/usr/extconf.rb b/ext/-test-/marshal/usr/extconf.rb
new file mode 100644
index 0000000000..b7886b9eea
--- /dev/null
+++ b/ext/-test-/marshal/usr/extconf.rb
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000000..0c9e079af2
--- /dev/null
+++ b/ext/-test-/marshal/usr/usrmarshal.c
@@ -0,0 +1,50 @@
+#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);
+}
+
+static VALUE
+usr_init(VALUE self, VALUE val)
+{
+    int *ptr = Check_TypedStruct(self, &usrmarshal_type);
+    *ptr = NUM2INT(val);
+    return self;
+}
+
+static VALUE
+usr_value(VALUE self)
+{
+    int *ptr = Check_TypedStruct(self, &usrmarshal_type);
+    int val = *ptr;
+    return INT2NUM(val);
+}
+
+void
+Init_usr(void)
+{
+    VALUE mMarshal = rb_define_module_under(rb_define_module("Bug"), "Marshal");
+    VALUE newclass = rb_define_class_under(mMarshal, "UsrMarshal", rb_cObject);
+
+    rb_define_alloc_func(newclass, usr_alloc);
+    rb_define_method(newclass, "initialize", usr_init, 1);
+    rb_define_method(newclass, "value", usr_value, 0);
+    rb_define_method(newclass, "marshal_load", usr_init, 1);
+    rb_define_method(newclass, "marshal_dump", usr_value, 0);
+}
diff --git a/ext/-test-/memory_status/depend b/ext/-test-/memory_status/depend
new file mode 100644
index 0000000000..657ef59c35
--- /dev/null
+++ b/ext/-test-/memory_status/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+memory_status.o: $(RUBY_EXTCONF_H)
+memory_status.o: $(arch_hdrdir)/ruby/config.h
+memory_status.o: $(hdrdir)/ruby.h
+memory_status.o: $(hdrdir)/ruby/assert.h
+memory_status.o: $(hdrdir)/ruby/backward.h
+memory_status.o: $(hdrdir)/ruby/defines.h
+memory_status.o: $(hdrdir)/ruby/intern.h
+memory_status.o: $(hdrdir)/ruby/missing.h
+memory_status.o: $(hdrdir)/ruby/ruby.h
+memory_status.o: $(hdrdir)/ruby/st.h
+memory_status.o: $(hdrdir)/ruby/subst.h
+memory_status.o: memory_status.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/memory_status/extconf.rb b/ext/-test-/memory_status/extconf.rb
new file mode 100644
index 0000000000..1c1096d8f4
--- /dev/null
+++ b/ext/-test-/memory_status/extconf.rb
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000..5775fa56f3
--- /dev/null
+++ b/ext/-test-/memory_status/memory_status.c
@@ -0,0 +1,69 @@
+#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;
+# if defined MACH_TASK_BASIC_INFO
+    const task_flavor_t flavor = MACH_TASK_BASIC_INFO;
+    mach_msg_type_number_t out_count = MACH_TASK_BASIC_INFO_COUNT;
+    mach_task_basic_info_data_t taskinfo;
+# else
+    const task_flavor_t flavor = TASK_BASIC_INFO;
+    mach_msg_type_number_t out_count = TASK_BASIC_INFO_COUNT;
+    task_basic_info_data_t taskinfo;
+# endif
+
+    taskinfo.virtual_size = 0;
+    taskinfo.resident_size = 0;
+    error = task_info(mach_task_self(), flavor,
+		      (task_info_t)&taskinfo, &out_count);
+    if (error != KERN_SUCCESS) return Qnil;
+#ifndef ULL2NUM
+/* "long long" does not exist here, use size_t instead.  */
+#define ULL2NUM SIZET2NUM
+#endif
+    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/arity.c b/ext/-test-/method/arity.c
new file mode 100644
index 0000000000..239b9f7f10
--- /dev/null
+++ b/ext/-test-/method/arity.c
@@ -0,0 +1,22 @@
+#include "ruby.h"
+
+static VALUE
+obj_method_arity(VALUE self, VALUE obj, VALUE mid)
+{
+    int arity = rb_obj_method_arity(obj, rb_check_id(&mid));
+    return INT2FIX(arity);
+}
+
+static VALUE
+mod_method_arity(VALUE self, VALUE mod, VALUE mid)
+{
+    int arity = rb_mod_method_arity(mod, rb_check_id(&mid));
+    return INT2FIX(arity);
+}
+
+void
+Init_arity(VALUE mod)
+{
+    rb_define_module_function(mod, "obj_method_arity", obj_method_arity, 2);
+    rb_define_module_function(mod, "mod_method_arity", mod_method_arity, 2);
+}
diff --git a/ext/-test-/method/depend b/ext/-test-/method/depend
new file mode 100644
index 0000000000..028d97e1a9
--- /dev/null
+++ b/ext/-test-/method/depend
@@ -0,0 +1,26 @@
+# AUTOGENERATED DEPENDENCIES START
+arity.o: $(RUBY_EXTCONF_H)
+arity.o: $(arch_hdrdir)/ruby/config.h
+arity.o: $(hdrdir)/ruby.h
+arity.o: $(hdrdir)/ruby/assert.h
+arity.o: $(hdrdir)/ruby/backward.h
+arity.o: $(hdrdir)/ruby/defines.h
+arity.o: $(hdrdir)/ruby/intern.h
+arity.o: $(hdrdir)/ruby/missing.h
+arity.o: $(hdrdir)/ruby/ruby.h
+arity.o: $(hdrdir)/ruby/st.h
+arity.o: $(hdrdir)/ruby/subst.h
+arity.o: arity.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/method/extconf.rb b/ext/-test-/method/extconf.rb
new file mode 100644
index 0000000000..ca51178a18
--- /dev/null
+++ b/ext/-test-/method/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext
diff --git a/ext/-test-/method/init.c b/ext/-test-/method/init.c
new file mode 100644
index 0000000000..cea2346240
--- /dev/null
+++ b/ext/-test-/method/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+void
+Init_method(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_module_under(mBug, "Method");
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/notimplement/bug.c b/ext/-test-/notimplement/bug.c
new file mode 100644
index 0000000000..82e243a81d
--- /dev/null
+++ b/ext/-test-/notimplement/bug.c
@@ -0,0 +1,18 @@
+#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");
+    VALUE klass = rb_define_class_under(mBug, "NotImplement", rb_cObject);
+    rb_define_module_function(mBug, "funcall", bug_funcall, -1);
+    rb_define_module_function(mBug, "notimplement", rb_f_notimplement, -1);
+    rb_define_method(klass, "notimplement", rb_f_notimplement, -1);
+}
diff --git a/ext/-test-/notimplement/depend b/ext/-test-/notimplement/depend
new file mode 100644
index 0000000000..74911f0af4
--- /dev/null
+++ b/ext/-test-/notimplement/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+bug.o: $(RUBY_EXTCONF_H)
+bug.o: $(arch_hdrdir)/ruby/config.h
+bug.o: $(hdrdir)/ruby.h
+bug.o: $(hdrdir)/ruby/assert.h
+bug.o: $(hdrdir)/ruby/backward.h
+bug.o: $(hdrdir)/ruby/defines.h
+bug.o: $(hdrdir)/ruby/intern.h
+bug.o: $(hdrdir)/ruby/missing.h
+bug.o: $(hdrdir)/ruby/ruby.h
+bug.o: $(hdrdir)/ruby/st.h
+bug.o: $(hdrdir)/ruby/subst.h
+bug.o: bug.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/notimplement/extconf.rb b/ext/-test-/notimplement/extconf.rb
new file mode 100644
index 0000000000..54403cd7ce
--- /dev/null
+++ b/ext/-test-/notimplement/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/notimplement")
diff --git a/ext/-test-/num2int/depend b/ext/-test-/num2int/depend
new file mode 100644
index 0000000000..76b69de851
--- /dev/null
+++ b/ext/-test-/num2int/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+num2int.o: $(RUBY_EXTCONF_H)
+num2int.o: $(arch_hdrdir)/ruby/config.h
+num2int.o: $(hdrdir)/ruby.h
+num2int.o: $(hdrdir)/ruby/assert.h
+num2int.o: $(hdrdir)/ruby/backward.h
+num2int.o: $(hdrdir)/ruby/defines.h
+num2int.o: $(hdrdir)/ruby/intern.h
+num2int.o: $(hdrdir)/ruby/missing.h
+num2int.o: $(hdrdir)/ruby/ruby.h
+num2int.o: $(hdrdir)/ruby/st.h
+num2int.o: $(hdrdir)/ruby/subst.h
+num2int.o: num2int.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/num2int/extconf.rb b/ext/-test-/num2int/extconf.rb
new file mode 100644
index 0000000000..425f261f58
--- /dev/null
+++ b/ext/-test-/num2int/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/num2int")
diff --git a/ext/-test-/num2int/num2int.c b/ext/-test-/num2int/num2int.c
new file mode 100644
index 0000000000..3aec3ccf3b
--- /dev/null
+++ b/ext/-test-/num2int/num2int.c
@@ -0,0 +1,136 @@
+#include <ruby.h>
+
+static VALUE
+test_num2short(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%d", NUM2SHORT(num));
+    return rb_str_new_cstr(buf);
+}
+
+static VALUE
+test_num2ushort(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%u", NUM2USHORT(num));
+    return rb_str_new_cstr(buf);
+}
+
+static VALUE
+test_num2int(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%d", NUM2INT(num));
+    return rb_str_new_cstr(buf);
+}
+
+static VALUE
+test_num2uint(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%u", NUM2UINT(num));
+    return rb_str_new_cstr(buf);
+}
+
+static VALUE
+test_num2long(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%ld", NUM2LONG(num));
+    return rb_str_new_cstr(buf);
+}
+
+static VALUE
+test_num2ulong(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%lu", NUM2ULONG(num));
+    return rb_str_new_cstr(buf);
+}
+
+#ifdef HAVE_LONG_LONG
+static VALUE
+test_num2ll(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%"PRI_LL_PREFIX"d", NUM2LL(num));
+    return rb_str_new_cstr(buf);
+}
+
+static VALUE
+test_num2ull(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%"PRI_LL_PREFIX"u", NUM2ULL(num));
+    return rb_str_new_cstr(buf);
+}
+#endif
+
+static VALUE
+test_fix2short(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%d", FIX2SHORT(num));
+    return rb_str_new_cstr(buf);
+}
+
+static VALUE
+test_fix2int(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%d", FIX2INT(num));
+    return rb_str_new_cstr(buf);
+}
+
+static VALUE
+test_fix2uint(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%u", FIX2UINT(num));
+    return rb_str_new_cstr(buf);
+}
+
+static VALUE
+test_fix2long(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%ld", FIX2LONG(num));
+    return rb_str_new_cstr(buf);
+}
+
+static VALUE
+test_fix2ulong(VALUE obj, VALUE num)
+{
+    char buf[128];
+    sprintf(buf, "%lu", FIX2ULONG(num));
+    return rb_str_new_cstr(buf);
+}
+
+void
+Init_num2int(void)
+{
+    VALUE mNum2int = rb_define_module("Num2int");
+
+    rb_define_module_function(mNum2int, "NUM2SHORT", test_num2short, 1);
+    rb_define_module_function(mNum2int, "NUM2USHORT", test_num2ushort, 1);
+
+    rb_define_module_function(mNum2int, "NUM2INT", test_num2int, 1);
+    rb_define_module_function(mNum2int, "NUM2UINT", test_num2uint, 1);
+
+    rb_define_module_function(mNum2int, "NUM2LONG", test_num2long, 1);
+    rb_define_module_function(mNum2int, "NUM2ULONG", test_num2ulong, 1);
+
+#ifdef HAVE_LONG_LONG
+    rb_define_module_function(mNum2int, "NUM2LL", test_num2ll, 1);
+    rb_define_module_function(mNum2int, "NUM2ULL", test_num2ull, 1);
+#endif
+
+    rb_define_module_function(mNum2int, "FIX2SHORT", test_fix2short, 1);
+
+    rb_define_module_function(mNum2int, "FIX2INT", test_fix2int, 1);
+    rb_define_module_function(mNum2int, "FIX2UINT", test_fix2uint, 1);
+
+    rb_define_module_function(mNum2int, "FIX2LONG", test_fix2long, 1);
+    rb_define_module_function(mNum2int, "FIX2ULONG", test_fix2ulong, 1);
+}
+
diff --git a/ext/-test-/old_thread_select/depend b/ext/-test-/old_thread_select/depend
deleted file mode 100644
index a2bc836e1f..0000000000
--- a/ext/-test-/old_thread_select/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-old_thread_select.o: $(top_srcdir)/thread.c \
-  $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/io.h
diff --git a/ext/-test-/old_thread_select/extconf.rb b/ext/-test-/old_thread_select/extconf.rb
deleted file mode 100644
index 8b410218fa..0000000000
--- a/ext/-test-/old_thread_select/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/old_thread_select/old_thread_select")
diff --git a/ext/-test-/old_thread_select/old_thread_select.c b/ext/-test-/old_thread_select/old_thread_select.c
deleted file mode 100644
index e374f02355..0000000000
--- a/ext/-test-/old_thread_select/old_thread_select.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* test case for deprecated C API */
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-
-static fd_set * array2fdset(fd_set *fds, VALUE ary, int *max)
-{
-    long i;
-
-    if (NIL_P(ary))
-	return NULL;
-
-    FD_ZERO(fds);
-    Check_Type(ary, T_ARRAY);
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
-	VALUE val = RARRAY_PTR(ary)[i];
-	int fd;
-
-	Check_Type(val, T_FIXNUM);
-	fd = FIX2INT(val);
-	if (fd >= *max)
-	    *max = fd + 1;
-	FD_SET(fd, fds);
-    }
-
-    return fds;
-}
-
-static void fdset2array(VALUE dst, fd_set *fds, int max)
-{
-    int i;
-
-    rb_ary_clear(dst);
-
-    for (i = 0; i < max; i++) {
-	if (FD_ISSET(i, fds))
-	    rb_ary_push(dst, INT2NUM(i));
-    }
-}
-
-static VALUE
-old_thread_select(VALUE klass, VALUE r, VALUE w, VALUE e, VALUE timeout)
-{
-    struct timeval tv;
-    struct timeval *tvp = NULL;
-    fd_set rfds, wfds, efds;
-    fd_set *rp, *wp, *ep;
-    int rc;
-    int max = 0;
-
-    if (!NIL_P(timeout)) {
-	tv = rb_time_timeval(timeout);
-	tvp = &tv;
-    }
-    rp = array2fdset(&rfds, r, &max);
-    wp = array2fdset(&wfds, w, &max);
-    ep = array2fdset(&efds, e, &max);
-    rc = rb_thread_select(max, rp, wp, ep, tvp);
-    if (rc == -1)
-	rb_sys_fail("rb_wait_for_single_fd");
-
-    if (rp)
-	fdset2array(r, &rfds, max);
-    if (wp)
-	fdset2array(w, &wfds, max);
-    if (ep)
-	fdset2array(e, &efds, max);
-    return INT2NUM(rc);
-}
-
-void
-Init_old_thread_select(void)
-{
-    rb_define_singleton_method(rb_cIO, "old_thread_select",
-                               old_thread_select, 4);
-}
diff --git a/ext/-test-/path_to_class/depend b/ext/-test-/path_to_class/depend
new file mode 100644
index 0000000000..9a7f7d0176
--- /dev/null
+++ b/ext/-test-/path_to_class/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+path_to_class.o: $(RUBY_EXTCONF_H)
+path_to_class.o: $(arch_hdrdir)/ruby/config.h
+path_to_class.o: $(hdrdir)/ruby.h
+path_to_class.o: $(hdrdir)/ruby/assert.h
+path_to_class.o: $(hdrdir)/ruby/backward.h
+path_to_class.o: $(hdrdir)/ruby/defines.h
+path_to_class.o: $(hdrdir)/ruby/intern.h
+path_to_class.o: $(hdrdir)/ruby/missing.h
+path_to_class.o: $(hdrdir)/ruby/ruby.h
+path_to_class.o: $(hdrdir)/ruby/st.h
+path_to_class.o: $(hdrdir)/ruby/subst.h
+path_to_class.o: path_to_class.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/path_to_class/extconf.rb b/ext/-test-/path_to_class/extconf.rb
new file mode 100644
index 0000000000..d465b36d9c
--- /dev/null
+++ b/ext/-test-/path_to_class/extconf.rb
@@ -0,0 +1,7 @@
+# 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")
diff --git a/ext/-test-/path_to_class/path_to_class.c b/ext/-test-/path_to_class/path_to_class.c
new file mode 100644
index 0000000000..c8c2831b09
--- /dev/null
+++ b/ext/-test-/path_to_class/path_to_class.c
@@ -0,0 +1,15 @@
+#include "ruby.h"
+
+static VALUE
+path_to_class(VALUE klass, VALUE path)
+{
+    return rb_path_to_class(path);
+}
+
+void
+Init_path_to_class(void)
+{
+    VALUE klass = rb_path2class("Test_PathToClass");
+
+    rb_define_singleton_method(klass, "path_to_class", path_to_class, 1);
+}
diff --git a/ext/-test-/popen_deadlock/depend b/ext/-test-/popen_deadlock/depend
new file mode 100644
index 0000000000..4c3f3853fd
--- /dev/null
+++ b/ext/-test-/popen_deadlock/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+infinite_loop_dlsym.o: $(RUBY_EXTCONF_H)
+infinite_loop_dlsym.o: $(arch_hdrdir)/ruby/config.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/assert.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/backward.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/defines.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/intern.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/missing.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/ruby.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/st.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/subst.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/thread.h
+infinite_loop_dlsym.o: infinite_loop_dlsym.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/popen_deadlock/extconf.rb b/ext/-test-/popen_deadlock/extconf.rb
new file mode 100644
index 0000000000..24a7d79931
--- /dev/null
+++ b/ext/-test-/popen_deadlock/extconf.rb
@@ -0,0 +1,5 @@
+# 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
new file mode 100644
index 0000000000..1d95a7cc9a
--- /dev/null
+++ b/ext/-test-/popen_deadlock/infinite_loop_dlsym.c
@@ -0,0 +1,50 @@
+#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/depend b/ext/-test-/postponed_job/depend
new file mode 100644
index 0000000000..998e2dcc9e
--- /dev/null
+++ b/ext/-test-/postponed_job/depend
@@ -0,0 +1,15 @@
+# AUTOGENERATED DEPENDENCIES START
+postponed_job.o: $(RUBY_EXTCONF_H)
+postponed_job.o: $(arch_hdrdir)/ruby/config.h
+postponed_job.o: $(hdrdir)/ruby.h
+postponed_job.o: $(hdrdir)/ruby/assert.h
+postponed_job.o: $(hdrdir)/ruby/backward.h
+postponed_job.o: $(hdrdir)/ruby/debug.h
+postponed_job.o: $(hdrdir)/ruby/defines.h
+postponed_job.o: $(hdrdir)/ruby/intern.h
+postponed_job.o: $(hdrdir)/ruby/missing.h
+postponed_job.o: $(hdrdir)/ruby/ruby.h
+postponed_job.o: $(hdrdir)/ruby/st.h
+postponed_job.o: $(hdrdir)/ruby/subst.h
+postponed_job.o: postponed_job.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/postponed_job/extconf.rb b/ext/-test-/postponed_job/extconf.rb
new file mode 100644
index 0000000000..58fbd3b461
--- /dev/null
+++ b/ext/-test-/postponed_job/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile('-test-/postponed_job')
diff --git a/ext/-test-/postponed_job/postponed_job.c b/ext/-test-/postponed_job/postponed_job.c
new file mode 100644
index 0000000000..d8684d475a
--- /dev/null
+++ b/ext/-test-/postponed_job/postponed_job.c
@@ -0,0 +1,69 @@
+#include "ruby.h"
+#include "ruby/debug.h"
+
+static int counter;
+
+static void
+pjob_callback(void *data)
+{
+    VALUE ary = (VALUE)data;
+    Check_Type(ary, T_ARRAY);
+
+    rb_ary_push(ary, INT2FIX(counter));
+}
+
+static VALUE
+pjob_register(VALUE self, VALUE obj)
+{
+    counter = 0;
+    rb_postponed_job_register(0, pjob_callback, (void *)obj);
+    rb_gc_start();
+    counter++;
+    rb_gc_start();
+    counter++;
+    rb_gc_start();
+    counter++;
+    return self;
+}
+
+static void
+pjob_one_callback(void *data)
+{
+    VALUE ary = (VALUE)data;
+    Check_Type(ary, T_ARRAY);
+
+    rb_ary_push(ary, INT2FIX(1));
+}
+
+static VALUE
+pjob_register_one(VALUE self, VALUE obj)
+{
+    rb_postponed_job_register_one(0, pjob_one_callback, (void *)obj);
+    rb_postponed_job_register_one(0, pjob_one_callback, (void *)obj);
+    rb_postponed_job_register_one(0, pjob_one_callback, (void *)obj);
+    return self;
+}
+
+static VALUE
+pjob_call_direct(VALUE self, VALUE obj)
+{
+    counter = 0;
+    pjob_callback((void *)obj);
+    rb_gc_start();
+    counter++;
+    rb_gc_start();
+    counter++;
+    rb_gc_start();
+    counter++;
+    return self;
+}
+
+void
+Init_postponed_job(VALUE self)
+{
+    VALUE mBug = rb_define_module("Bug");
+    rb_define_module_function(mBug, "postponed_job_register", pjob_register, 1);
+    rb_define_module_function(mBug, "postponed_job_register_one", pjob_register_one, 1);
+    rb_define_module_function(mBug, "postponed_job_call_direct", pjob_call_direct, 1);
+}
+
diff --git a/ext/-test-/printf/depend b/ext/-test-/printf/depend
new file mode 100644
index 0000000000..7860797f50
--- /dev/null
+++ b/ext/-test-/printf/depend
@@ -0,0 +1,17 @@
+# AUTOGENERATED DEPENDENCIES START
+printf.o: $(RUBY_EXTCONF_H)
+printf.o: $(arch_hdrdir)/ruby/config.h
+printf.o: $(hdrdir)/ruby.h
+printf.o: $(hdrdir)/ruby/assert.h
+printf.o: $(hdrdir)/ruby/backward.h
+printf.o: $(hdrdir)/ruby/defines.h
+printf.o: $(hdrdir)/ruby/encoding.h
+printf.o: $(hdrdir)/ruby/intern.h
+printf.o: $(hdrdir)/ruby/missing.h
+printf.o: $(hdrdir)/ruby/onigmo.h
+printf.o: $(hdrdir)/ruby/oniguruma.h
+printf.o: $(hdrdir)/ruby/ruby.h
+printf.o: $(hdrdir)/ruby/st.h
+printf.o: $(hdrdir)/ruby/subst.h
+printf.o: printf.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/printf/extconf.rb b/ext/-test-/printf/extconf.rb
new file mode 100644
index 0000000000..fb8fa8de36
--- /dev/null
+++ b/ext/-test-/printf/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/printf")
diff --git a/ext/-test-/printf/printf.c b/ext/-test-/printf/printf.c
new file mode 100644
index 0000000000..e793bb7a48
--- /dev/null
+++ b/ext/-test-/printf/printf.c
@@ -0,0 +1,109 @@
+#include <ruby.h>
+#include <ruby/encoding.h>
+
+static VALUE
+printf_test_s(VALUE self, VALUE obj)
+{
+    return rb_enc_sprintf(rb_usascii_encoding(), "<%"PRIsVALUE">", obj);
+}
+
+static VALUE
+printf_test_v(VALUE self, VALUE obj)
+{
+    return rb_enc_sprintf(rb_usascii_encoding(), "{%+"PRIsVALUE"}", obj);
+}
+
+static VALUE
+printf_test_q(VALUE self, VALUE obj)
+{
+    return rb_enc_sprintf(rb_usascii_encoding(), "[% "PRIsVALUE"]", obj);
+}
+
+static char *
+uint_to_str(char *p, char *e, unsigned int x)
+{
+    char *e0 = e;
+    if (e <= p) return p;
+    do {
+	*--e = x % 10 + '0';
+    } while ((x /= 10) != 0 && e > p);
+    memmove(p, e, e0 - e);
+    return p + (e0 - e);
+}
+
+static VALUE
+printf_test_call(int argc, VALUE *argv, VALUE self)
+{
+    VALUE opt, type, num, result;
+    char format[sizeof(int) * 6 + 8], *p = format, cnv;
+    int n = 0;
+    const char *s = 0;
+
+    rb_scan_args(argc, argv, "2:", &type, &num, &opt);
+    Check_Type(type, T_STRING);
+    if (RSTRING_LEN(type) != 1) rb_raise(rb_eArgError, "wrong length(%ld)", RSTRING_LEN(type));
+    switch (cnv = RSTRING_PTR(type)[0]) {
+      case 'd': case 'x': case 'o': case 'X':
+	n = NUM2INT(num);
+	break;
+      case 's':
+	s = StringValueCStr(num);
+	break;
+      default: rb_raise(rb_eArgError, "wrong conversion(%c)", cnv);
+    }
+    *p++ = '%';
+    if (!NIL_P(opt)) {
+	VALUE v;
+	Check_Type(opt, T_HASH);
+	if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("space"))))) {
+	    *p++ = ' ';
+	}
+	if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("hash"))))) {
+	    *p++ = '#';
+	}
+	if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("plus"))))) {
+	    *p++ = '+';
+	}
+	if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("minus"))))) {
+	    *p++ = '-';
+	}
+	if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("zero"))))) {
+	    *p++ = '0';
+	}
+	if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("width"))))) {
+	    p = uint_to_str(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++ = cnv;
+    *p++ = '\0';
+    if (cnv == 's') {
+	result = rb_enc_sprintf(rb_usascii_encoding(), format, s);
+    }
+    else {
+	result = rb_enc_sprintf(rb_usascii_encoding(), format, n);
+    }
+    return rb_assoc_new(result, rb_usascii_str_new_cstr(format));
+}
+
+static VALUE
+snprintf_count(VALUE self, VALUE str)
+{
+    int n = ruby_snprintf(NULL, 0, "%s", StringValueCStr(str));
+    return INT2FIX(n);
+}
+
+void
+Init_printf(void)
+{
+    VALUE m = rb_define_module_under(rb_define_module("Bug"), "Printf");
+    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);
+    rb_define_singleton_method(m, "call", printf_test_call, -1);
+    rb_define_singleton_method(m, "sncount", snprintf_count, 1);
+}
diff --git a/ext/-test-/proc/depend b/ext/-test-/proc/depend
new file mode 100644
index 0000000000..5946e4ca0d
--- /dev/null
+++ b/ext/-test-/proc/depend
@@ -0,0 +1,38 @@
+# AUTOGENERATED DEPENDENCIES START
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+receiver.o: $(RUBY_EXTCONF_H)
+receiver.o: $(arch_hdrdir)/ruby/config.h
+receiver.o: $(hdrdir)/ruby.h
+receiver.o: $(hdrdir)/ruby/assert.h
+receiver.o: $(hdrdir)/ruby/backward.h
+receiver.o: $(hdrdir)/ruby/defines.h
+receiver.o: $(hdrdir)/ruby/intern.h
+receiver.o: $(hdrdir)/ruby/missing.h
+receiver.o: $(hdrdir)/ruby/ruby.h
+receiver.o: $(hdrdir)/ruby/st.h
+receiver.o: $(hdrdir)/ruby/subst.h
+receiver.o: receiver.c
+super.o: $(RUBY_EXTCONF_H)
+super.o: $(arch_hdrdir)/ruby/config.h
+super.o: $(hdrdir)/ruby.h
+super.o: $(hdrdir)/ruby/assert.h
+super.o: $(hdrdir)/ruby/backward.h
+super.o: $(hdrdir)/ruby/defines.h
+super.o: $(hdrdir)/ruby/intern.h
+super.o: $(hdrdir)/ruby/missing.h
+super.o: $(hdrdir)/ruby/ruby.h
+super.o: $(hdrdir)/ruby/st.h
+super.o: $(hdrdir)/ruby/subst.h
+super.o: super.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/proc/extconf.rb b/ext/-test-/proc/extconf.rb
new file mode 100644
index 0000000000..d786b15db9
--- /dev/null
+++ b/ext/-test-/proc/extconf.rb
@@ -0,0 +1,3 @@
+# 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
new file mode 100644
index 0000000000..814c55d98b
--- /dev/null
+++ b/ext/-test-/proc/init.c
@@ -0,0 +1,11 @@
+#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
new file mode 100644
index 0000000000..fe44a2246c
--- /dev/null
+++ b/ext/-test-/proc/receiver.c
@@ -0,0 +1,21 @@
+#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
new file mode 100644
index 0000000000..dbe8af08f1
--- /dev/null
+++ b/ext/-test-/proc/super.c
@@ -0,0 +1,27 @@
+#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
new file mode 100644
index 0000000000..39e65933f3
--- /dev/null
+++ b/ext/-test-/rational/depend
@@ -0,0 +1,19 @@
+$(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.h
+rat.o: $(hdrdir)/ruby/assert.h
+rat.o: $(hdrdir)/ruby/backward.h
+rat.o: $(hdrdir)/ruby/defines.h
+rat.o: $(hdrdir)/ruby/intern.h
+rat.o: $(hdrdir)/ruby/missing.h
+rat.o: $(hdrdir)/ruby/ruby.h
+rat.o: $(hdrdir)/ruby/st.h
+rat.o: $(hdrdir)/ruby/subst.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
new file mode 100644
index 0000000000..28c5d690c1
--- /dev/null
+++ b/ext/-test-/rational/extconf.rb
@@ -0,0 +1,8 @@
+# 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, ".*")}
+inits.delete("init")
+inits.map! {|s|"X(#{s})"}
+$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\""
+create_makefile("-test-/rational")
diff --git a/ext/-test-/rational/rat.c b/ext/-test-/rational/rat.c
new file mode 100644
index 0000000000..772546fca8
--- /dev/null
+++ b/ext/-test-/rational/rat.c
@@ -0,0 +1,37 @@
+#include "internal.h"
+
+#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
+static VALUE
+big(VALUE x)
+{
+    if (FIXNUM_P(x))
+        return rb_int2big(FIX2LONG(x));
+    if (RB_TYPE_P(x, T_BIGNUM))
+        return x;
+    rb_raise(rb_eTypeError, "can't convert %s to Bignum",
+            rb_obj_classname(x));
+}
+#endif
+
+static VALUE
+gcd_normal(VALUE x, VALUE y)
+{
+    return rb_big_norm(rb_gcd_normal(rb_to_int(x), rb_to_int(y)));
+}
+
+#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
+static VALUE
+gcd_gmp(VALUE x, VALUE y)
+{
+    return rb_big_norm(rb_gcd_gmp(big(x), big(y)));
+}
+#else
+#define gcd_gmp rb_f_notimplement
+#endif
+
+void
+Init_rational(VALUE klass)
+{
+    rb_define_method(rb_cInteger, "gcd_normal", gcd_normal, 1);
+    rb_define_method(rb_cInteger, "gcd_gmp", gcd_gmp, 1);
+}
diff --git a/ext/-test-/rb_call_super_kw/depend b/ext/-test-/rb_call_super_kw/depend
new file mode 100644
index 0000000000..f65dcf9694
--- /dev/null
+++ b/ext/-test-/rb_call_super_kw/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+rb_call_super_kw.o: $(RUBY_EXTCONF_H)
+rb_call_super_kw.o: $(arch_hdrdir)/ruby/config.h
+rb_call_super_kw.o: $(hdrdir)/ruby.h
+rb_call_super_kw.o: $(hdrdir)/ruby/assert.h
+rb_call_super_kw.o: $(hdrdir)/ruby/backward.h
+rb_call_super_kw.o: $(hdrdir)/ruby/defines.h
+rb_call_super_kw.o: $(hdrdir)/ruby/intern.h
+rb_call_super_kw.o: $(hdrdir)/ruby/missing.h
+rb_call_super_kw.o: $(hdrdir)/ruby/ruby.h
+rb_call_super_kw.o: $(hdrdir)/ruby/st.h
+rb_call_super_kw.o: $(hdrdir)/ruby/subst.h
+rb_call_super_kw.o: rb_call_super_kw.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/rb_call_super_kw/extconf.rb b/ext/-test-/rb_call_super_kw/extconf.rb
new file mode 100644
index 0000000000..c6a5c720d7
--- /dev/null
+++ b/ext/-test-/rb_call_super_kw/extconf.rb
@@ -0,0 +1 @@
+create_makefile("-test-/rb_call_super_kw")
diff --git a/ext/-test-/rb_call_super_kw/rb_call_super_kw.c b/ext/-test-/rb_call_super_kw/rb_call_super_kw.c
new file mode 100644
index 0000000000..7f094545d2
--- /dev/null
+++ b/ext/-test-/rb_call_super_kw/rb_call_super_kw.c
@@ -0,0 +1,14 @@
+#include <ruby.h>
+
+static VALUE
+rb_call_super_kw_m(int argc, VALUE *argv, VALUE self)
+{
+    return rb_call_super_kw(argc, argv, RB_PASS_CALLED_KEYWORDS);
+}
+
+void
+Init_rb_call_super_kw(void) {
+    VALUE module = rb_define_module("Bug");
+    module = rb_define_module_under(module, "RbCallSuperKw");
+    rb_define_method(module, "m", rb_call_super_kw_m, -1);
+}
diff --git a/ext/-test-/recursion/depend b/ext/-test-/recursion/depend
new file mode 100644
index 0000000000..bf8005724a
--- /dev/null
+++ b/ext/-test-/recursion/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+recursion.o: $(RUBY_EXTCONF_H)
+recursion.o: $(arch_hdrdir)/ruby/config.h
+recursion.o: $(hdrdir)/ruby.h
+recursion.o: $(hdrdir)/ruby/assert.h
+recursion.o: $(hdrdir)/ruby/backward.h
+recursion.o: $(hdrdir)/ruby/defines.h
+recursion.o: $(hdrdir)/ruby/intern.h
+recursion.o: $(hdrdir)/ruby/missing.h
+recursion.o: $(hdrdir)/ruby/ruby.h
+recursion.o: $(hdrdir)/ruby/st.h
+recursion.o: $(hdrdir)/ruby/subst.h
+recursion.o: recursion.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/recursion/extconf.rb b/ext/-test-/recursion/extconf.rb
new file mode 100644
index 0000000000..13828113f0
--- /dev/null
+++ b/ext/-test-/recursion/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require 'mkmf'
+create_makefile("-test-/recursion")
diff --git a/ext/-test-/recursion/recursion.c b/ext/-test-/recursion/recursion.c
new file mode 100644
index 0000000000..13d41f0ba8
--- /dev/null
+++ b/ext/-test-/recursion/recursion.c
@@ -0,0 +1,28 @@
+#include <ruby.h>
+
+static VALUE
+recursive_i(VALUE obj, VALUE mid, int recur)
+{
+    if (recur) return Qnil;
+    return rb_funcallv(obj, rb_to_id(mid), 0, 0);
+}
+
+static VALUE
+exec_recursive(VALUE self, VALUE mid)
+{
+    return rb_exec_recursive(recursive_i, self, mid);
+}
+
+static VALUE
+exec_recursive_outer(VALUE self, VALUE mid)
+{
+    return rb_exec_recursive_outer(recursive_i, self, mid);
+}
+
+void
+Init_recursion(void)
+{
+    VALUE m = rb_define_module_under(rb_define_module("Bug"), "Recursive");
+    rb_define_method(m, "exec_recursive", exec_recursive, 1);
+    rb_define_method(m, "exec_recursive_outer", exec_recursive_outer, 1);
+}
diff --git a/ext/-test-/regexp/depend b/ext/-test-/regexp/depend
new file mode 100644
index 0000000000..7c88e1235c
--- /dev/null
+++ b/ext/-test-/regexp/depend
@@ -0,0 +1,27 @@
+# AUTOGENERATED DEPENDENCIES START
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+parse_depth_limit.o: $(RUBY_EXTCONF_H)
+parse_depth_limit.o: $(arch_hdrdir)/ruby/config.h
+parse_depth_limit.o: $(hdrdir)/ruby.h
+parse_depth_limit.o: $(hdrdir)/ruby/assert.h
+parse_depth_limit.o: $(hdrdir)/ruby/backward.h
+parse_depth_limit.o: $(hdrdir)/ruby/defines.h
+parse_depth_limit.o: $(hdrdir)/ruby/intern.h
+parse_depth_limit.o: $(hdrdir)/ruby/missing.h
+parse_depth_limit.o: $(hdrdir)/ruby/onigmo.h
+parse_depth_limit.o: $(hdrdir)/ruby/ruby.h
+parse_depth_limit.o: $(hdrdir)/ruby/st.h
+parse_depth_limit.o: $(hdrdir)/ruby/subst.h
+parse_depth_limit.o: parse_depth_limit.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/regexp/extconf.rb b/ext/-test-/regexp/extconf.rb
new file mode 100644
index 0000000000..ca51178a18
--- /dev/null
+++ b/ext/-test-/regexp/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext
diff --git a/ext/-test-/regexp/init.c b/ext/-test-/regexp/init.c
new file mode 100644
index 0000000000..906abe940f
--- /dev/null
+++ b/ext/-test-/regexp/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+void
+Init_regexp(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_class_under(mBug, "Regexp", rb_cRegexp);
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/regexp/parse_depth_limit.c b/ext/-test-/regexp/parse_depth_limit.c
new file mode 100644
index 0000000000..8e08a5c789
--- /dev/null
+++ b/ext/-test-/regexp/parse_depth_limit.c
@@ -0,0 +1,23 @@
+#include <ruby.h>
+#include <ruby/onigmo.h>
+
+static VALUE
+get_parse_depth_limit(VALUE self)
+{
+    unsigned int depth = onig_get_parse_depth_limit();
+    return UINT2NUM(depth);
+}
+
+static VALUE
+set_parse_depth_limit(VALUE self, VALUE depth)
+{
+    onig_set_parse_depth_limit(NUM2UINT(depth));
+    return depth;
+}
+
+void
+Init_parse_depth_limit(VALUE klass)
+{
+    rb_define_singleton_method(klass, "parse_depth_limit", get_parse_depth_limit, 0);
+    rb_define_singleton_method(klass, "parse_depth_limit=", set_parse_depth_limit, 1);
+}
diff --git a/ext/-test-/scan_args/depend b/ext/-test-/scan_args/depend
new file mode 100644
index 0000000000..c230961ae3
--- /dev/null
+++ b/ext/-test-/scan_args/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+scan_args.o: $(RUBY_EXTCONF_H)
+scan_args.o: $(arch_hdrdir)/ruby/config.h
+scan_args.o: $(hdrdir)/ruby.h
+scan_args.o: $(hdrdir)/ruby/assert.h
+scan_args.o: $(hdrdir)/ruby/backward.h
+scan_args.o: $(hdrdir)/ruby/defines.h
+scan_args.o: $(hdrdir)/ruby/intern.h
+scan_args.o: $(hdrdir)/ruby/missing.h
+scan_args.o: $(hdrdir)/ruby/ruby.h
+scan_args.o: $(hdrdir)/ruby/st.h
+scan_args.o: $(hdrdir)/ruby/subst.h
+scan_args.o: scan_args.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/scan_args/extconf.rb b/ext/-test-/scan_args/extconf.rb
new file mode 100644
index 0000000000..6cae9c2779
--- /dev/null
+++ b/ext/-test-/scan_args/extconf.rb
@@ -0,0 +1 @@
+create_makefile("-test-/scan_args")
diff --git a/ext/-test-/scan_args/scan_args.c b/ext/-test-/scan_args/scan_args.c
new file mode 100644
index 0000000000..9c374da66f
--- /dev/null
+++ b/ext/-test-/scan_args/scan_args.c
@@ -0,0 +1,315 @@
+#include <ruby.h>
+
+#ifndef numberof
+#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+#endif
+
+static VALUE
+scan_args_lead(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[2];
+    int n = rb_scan_args(argc, argv, "1", args+1);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[2];
+    int n = rb_scan_args(argc, argv, "01", args+1);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "11", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+/* var */
+static VALUE
+scan_args_var(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[2];
+    int n = rb_scan_args(argc, argv, "*", args+1);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_var(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "1*", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt_var(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "01*", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_var(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "11*", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+/* trail */
+static VALUE
+scan_args_opt_trail(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "011", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_trail(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "111", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_var_trail(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "*1", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_var_trail(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "1*1", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt_var_trail(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "01*1", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_var_trail(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[5];
+    int n = rb_scan_args(argc, argv, "11*1", args+1, args+2, args+3, args+4);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+/* hash */
+static VALUE
+scan_args_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[2];
+    int n = rb_scan_args(argc, argv, ":", args+1);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "1:", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "01:", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "11:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_var_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "*:", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_var_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "1*:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt_var_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "01*:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_var_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[5];
+    int n = rb_scan_args(argc, argv, "11*:", args+1, args+2, args+3, args+4);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt_trail_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "011:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_trail_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[5];
+    int n = rb_scan_args(argc, argv, "111:", args+1, args+2, args+3, args+4);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_var_trail_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "*1:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_var_trail_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[5];
+    int n = rb_scan_args(argc, argv, "1*1:", args+1, args+2, args+3, args+4);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt_var_trail_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[5];
+    int n = rb_scan_args(argc, argv, "01*1:", args+1, args+2, args+3, args+4);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_var_trail_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[6];
+    int n = rb_scan_args(argc, argv, "11*1:", args+1, args+2, args+3, args+4, args+5);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_k_lead_opt_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args_kw(RB_SCAN_ARGS_KEYWORDS, argc, argv, "11:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_e_lead_opt_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args_kw(RB_SCAN_ARGS_EMPTY_KEYWORDS, argc, argv, "11:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_n_lead_opt_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args_kw(RB_SCAN_ARGS_LAST_HASH_KEYWORDS, argc, argv, "11:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+void
+Init_scan_args(void)
+{
+    VALUE module = rb_define_module("Bug");
+    module = rb_define_module_under(module, "ScanArgs");
+    rb_define_singleton_method(module, "lead", scan_args_lead, -1);
+    rb_define_singleton_method(module, "opt", scan_args_opt, -1);
+    rb_define_singleton_method(module, "lead_opt", scan_args_lead_opt, -1);
+    rb_define_singleton_method(module, "var", scan_args_var, -1);
+    rb_define_singleton_method(module, "lead_var", scan_args_lead_var, -1);
+    rb_define_singleton_method(module, "opt_var", scan_args_opt_var, -1);
+    rb_define_singleton_method(module, "lead_opt_var", scan_args_lead_opt_var, -1);
+    rb_define_singleton_method(module, "opt_trail", scan_args_opt_trail, -1);
+    rb_define_singleton_method(module, "lead_opt_trail", scan_args_lead_opt_trail, -1);
+    rb_define_singleton_method(module, "var_trail", scan_args_var_trail, -1);
+    rb_define_singleton_method(module, "lead_var_trail", scan_args_lead_var_trail, -1);
+    rb_define_singleton_method(module, "opt_var_trail", scan_args_opt_var_trail, -1);
+    rb_define_singleton_method(module, "lead_opt_var_trail", scan_args_lead_opt_var_trail, -1);
+    rb_define_singleton_method(module, "hash", scan_args_hash, -1);
+    rb_define_singleton_method(module, "lead_hash", scan_args_lead_hash, -1);
+    rb_define_singleton_method(module, "opt_hash", scan_args_opt_hash, -1);
+    rb_define_singleton_method(module, "lead_opt_hash", scan_args_lead_opt_hash, -1);
+    rb_define_singleton_method(module, "var_hash", scan_args_var_hash, -1);
+    rb_define_singleton_method(module, "lead_var_hash", scan_args_lead_var_hash, -1);
+    rb_define_singleton_method(module, "opt_var_hash", scan_args_opt_var_hash, -1);
+    rb_define_singleton_method(module, "lead_opt_var_hash", scan_args_lead_opt_var_hash, -1);
+    rb_define_singleton_method(module, "opt_trail_hash", scan_args_opt_trail_hash, -1);
+    rb_define_singleton_method(module, "lead_opt_trail_hash", scan_args_lead_opt_trail_hash, -1);
+    rb_define_singleton_method(module, "var_trail_hash", scan_args_var_trail_hash, -1);
+    rb_define_singleton_method(module, "lead_var_trail_hash", scan_args_lead_var_trail_hash, -1);
+    rb_define_singleton_method(module, "opt_var_trail_hash", scan_args_opt_var_trail_hash, -1);
+    rb_define_singleton_method(module, "lead_opt_var_trail_hash", scan_args_lead_opt_var_trail_hash, -1);
+    rb_define_singleton_method(module, "k_lead_opt_hash", scan_args_k_lead_opt_hash, -1);
+    rb_define_singleton_method(module, "e_lead_opt_hash", scan_args_e_lead_opt_hash, -1);
+    rb_define_singleton_method(module, "n_lead_opt_hash", scan_args_n_lead_opt_hash, -1);
+}
diff --git a/ext/-test-/st/foreach/depend b/ext/-test-/st/foreach/depend
new file mode 100644
index 0000000000..42d3909f49
--- /dev/null
+++ b/ext/-test-/st/foreach/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+foreach.o: $(RUBY_EXTCONF_H)
+foreach.o: $(arch_hdrdir)/ruby/config.h
+foreach.o: $(hdrdir)/ruby.h
+foreach.o: $(hdrdir)/ruby/assert.h
+foreach.o: $(hdrdir)/ruby/backward.h
+foreach.o: $(hdrdir)/ruby/defines.h
+foreach.o: $(hdrdir)/ruby/intern.h
+foreach.o: $(hdrdir)/ruby/missing.h
+foreach.o: $(hdrdir)/ruby/ruby.h
+foreach.o: $(hdrdir)/ruby/st.h
+foreach.o: $(hdrdir)/ruby/subst.h
+foreach.o: foreach.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/st/foreach/extconf.rb b/ext/-test-/st/foreach/extconf.rb
new file mode 100644
index 0000000000..a7346203c4
--- /dev/null
+++ b/ext/-test-/st/foreach/extconf.rb
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000000..27ac18046f
--- /dev/null
+++ b/ext/-test-/st/foreach/foreach.c
@@ -0,0 +1,175 @@
+#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)
+{
+    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/depend b/ext/-test-/st/numhash/depend
new file mode 100644
index 0000000000..98dcef881b
--- /dev/null
+++ b/ext/-test-/st/numhash/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+numhash.o: $(RUBY_EXTCONF_H)
+numhash.o: $(arch_hdrdir)/ruby/config.h
+numhash.o: $(hdrdir)/ruby.h
+numhash.o: $(hdrdir)/ruby/assert.h
+numhash.o: $(hdrdir)/ruby/backward.h
+numhash.o: $(hdrdir)/ruby/defines.h
+numhash.o: $(hdrdir)/ruby/intern.h
+numhash.o: $(hdrdir)/ruby/missing.h
+numhash.o: $(hdrdir)/ruby/ruby.h
+numhash.o: $(hdrdir)/ruby/st.h
+numhash.o: $(hdrdir)/ruby/subst.h
+numhash.o: numhash.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/st/numhash/extconf.rb b/ext/-test-/st/numhash/extconf.rb
new file mode 100644
index 0000000000..27d28a0a77
--- /dev/null
+++ b/ext/-test-/st/numhash/extconf.rb
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000000..71eeed4910
--- /dev/null
+++ b/ext/-test-/st/numhash/numhash.c
@@ -0,0 +1,137 @@
+#include <ruby.h>
+#include <ruby/st.h>
+
+static void
+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);
+}
+
+static VALUE
+numhash_init(VALUE self)
+{
+    st_table *tbl = (st_table *)Check_TypedStruct(self, &numhash_type);
+    if (tbl) st_free_table(tbl);
+    DATA_PTR(self) = st_init_numtable();
+    return self;
+}
+
+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))
+	return (VALUE)data;
+    return Qnil;
+}
+
+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);
+    return self;
+}
+
+static int
+numhash_i(st_data_t key, st_data_t value, st_data_t arg, int _)
+{
+    VALUE ret;
+    ret = rb_yield_values(3, (VALUE)key, (VALUE)value, (VALUE)arg);
+    if (ret == Qtrue) return ST_CHECK;
+    return ST_CONTINUE;
+}
+
+static VALUE
+numhash_each(VALUE self)
+{
+    st_table *table = (st_table *)Check_TypedStruct(self, &numhash_type);
+    st_data_t data = (st_data_t)self;
+    return st_foreach_check(table, numhash_i, data, data) ? Qtrue : Qfalse;
+}
+
+static int
+update_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
+{
+    VALUE ret = rb_yield_values(existing ? 2 : 1, (VALUE)*key, (VALUE)*value);
+    switch (ret) {
+      case Qfalse:
+	return ST_STOP;
+      case Qnil:
+	return ST_DELETE;
+      default:
+	*value = ret;
+	return ST_CONTINUE;
+    }
+}
+
+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))
+	return Qtrue;
+    else
+	return Qfalse;
+}
+
+#if SIZEOF_LONG == SIZEOF_VOIDP
+# define ST2NUM(x) ULONG2NUM(x)
+#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
+# define ST2NUM(x) ULL2NUM(x)
+#endif
+
+static VALUE
+numhash_size(VALUE self)
+{
+    st_table *table = (st_table *)Check_TypedStruct(self, &numhash_type);
+    return ST2NUM(table->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)) {
+	return val;
+    }
+    return Qnil;
+}
+
+void
+Init_numhash(void)
+{
+    VALUE st = rb_define_class_under(rb_define_module("Bug"), "StNumHash", rb_cData);
+    rb_define_alloc_func(st, numhash_alloc);
+    rb_define_method(st, "initialize", numhash_init, 0);
+    rb_define_method(st, "[]", numhash_aref, 1);
+    rb_define_method(st, "[]=", numhash_aset, 2);
+    rb_define_method(st, "each", numhash_each, 0);
+    rb_define_method(st, "update", numhash_update, 1);
+    rb_define_method(st, "size", numhash_size, 0);
+    rb_define_method(st, "delete_safe", numhash_delete_safe, 1);
+}
diff --git a/ext/-test-/st/update/depend b/ext/-test-/st/update/depend
new file mode 100644
index 0000000000..241e6f9e6d
--- /dev/null
+++ b/ext/-test-/st/update/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+update.o: $(RUBY_EXTCONF_H)
+update.o: $(arch_hdrdir)/ruby/config.h
+update.o: $(hdrdir)/ruby.h
+update.o: $(hdrdir)/ruby/assert.h
+update.o: $(hdrdir)/ruby/backward.h
+update.o: $(hdrdir)/ruby/defines.h
+update.o: $(hdrdir)/ruby/intern.h
+update.o: $(hdrdir)/ruby/missing.h
+update.o: $(hdrdir)/ruby/ruby.h
+update.o: $(hdrdir)/ruby/st.h
+update.o: $(hdrdir)/ruby/subst.h
+update.o: update.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/st/update/extconf.rb b/ext/-test-/st/update/extconf.rb
new file mode 100644
index 0000000000..5152b24229
--- /dev/null
+++ b/ext/-test-/st/update/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/st/update")
diff --git a/ext/-test-/st/update/update.c b/ext/-test-/st/update/update.c
new file mode 100644
index 0000000000..979ad3e334
--- /dev/null
+++ b/ext/-test-/st/update/update.c
@@ -0,0 +1,34 @@
+#include <ruby.h>
+#include <ruby/st.h>
+
+static int
+update_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
+{
+    VALUE ret = rb_yield_values(existing ? 2 : 1, (VALUE)*key, (VALUE)*value);
+    switch (ret) {
+      case Qfalse:
+	return ST_STOP;
+      case Qnil:
+	return ST_DELETE;
+      default:
+	*value = ret;
+	return ST_CONTINUE;
+    }
+}
+
+static VALUE
+test_st_update(VALUE self, VALUE key)
+{
+    if (st_update(RHASH_TBL(self), (st_data_t)key, update_func, 0))
+	return Qtrue;
+    else
+	return Qfalse;
+}
+
+void
+Init_update(void)
+{
+    VALUE st = rb_define_class_under(rb_define_module("Bug"), "StTable", rb_cHash);
+    rb_define_method(st, "st_update", test_st_update, 1);
+}
+
diff --git a/ext/-test-/string/capacity.c b/ext/-test-/string/capacity.c
new file mode 100644
index 0000000000..f5277bf4e6
--- /dev/null
+++ b/ext/-test-/string/capacity.c
@@ -0,0 +1,17 @@
+#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_string_capacity(VALUE klass)
+{
+    rb_define_singleton_method(klass, "capacity", bug_str_capacity, 1);
+}
diff --git a/ext/-test-/string/coderange.c b/ext/-test-/string/coderange.c
new file mode 100644
index 0000000000..1342ce20da
--- /dev/null
+++ b/ext/-test-/string/coderange.c
@@ -0,0 +1,47 @@
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
+
+static VALUE sym_7bit, sym_valid, sym_unknown, sym_broken;
+
+static VALUE
+coderange_int2sym(int coderange)
+{
+    switch (coderange) {
+      case ENC_CODERANGE_7BIT:
+	return sym_7bit;
+      case ENC_CODERANGE_VALID:
+	return sym_valid;
+      case ENC_CODERANGE_UNKNOWN:
+	return sym_unknown;
+      case ENC_CODERANGE_BROKEN:
+	return sym_broken;
+    }
+    rb_bug("wrong condition of coderange");
+    UNREACHABLE_RETURN(Qnil);
+}
+
+/* return coderange without scan */
+static VALUE
+str_coderange(VALUE str)
+{
+    return coderange_int2sym(ENC_CODERANGE(str));
+}
+
+/* scan coderange and return the result */
+static VALUE
+str_coderange_scan(VALUE str)
+{
+    ENC_CODERANGE_SET(str, ENC_CODERANGE_UNKNOWN);
+    return coderange_int2sym(rb_enc_str_coderange(str));
+}
+
+void
+Init_string_coderange(VALUE klass)
+{
+    sym_7bit = ID2SYM(rb_intern("7bit"));
+    sym_valid = ID2SYM(rb_intern("valid"));
+    sym_unknown = ID2SYM(rb_intern("unknown"));
+    sym_broken = ID2SYM(rb_intern("broken"));
+    rb_define_method(klass, "coderange", str_coderange, 0);
+    rb_define_method(klass, "coderange_scan", str_coderange_scan, 0);
+}
diff --git a/ext/-test-/string/cstr.c b/ext/-test-/string/cstr.c
index d4ff360575..71eafdb703 100644
--- a/ext/-test-/string/cstr.c
+++ b/ext/-test-/string/cstr.c
@@ -1,20 +1,147 @@
-#include "ruby.h"
+#include "ruby/encoding.h"
+#include "internal.h"
 
 static VALUE
 bug_str_cstr_term(VALUE str)
 {
     long len;
     char *s;
-    rb_str_modify(str);
+    int c;
+    rb_encoding *enc;
+
     len = RSTRING_LEN(str);
-    RSTRING_PTR(str)[len] = 'x';
     s = StringValueCStr(str);
     rb_gc();
-    return INT2NUM(s[len]);
+    enc = rb_enc_get(str);
+    c = rb_enc_codepoint(&s[len], &s[len+rb_enc_mbminlen(enc)], enc);
+    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)
+Init_string_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
new file mode 100644
index 0000000000..f6888b5da7
--- /dev/null
+++ b/ext/-test-/string/depend
@@ -0,0 +1,202 @@
+# AUTOGENERATED DEPENDENCIES START
+capacity.o: $(RUBY_EXTCONF_H)
+capacity.o: $(arch_hdrdir)/ruby/config.h
+capacity.o: $(hdrdir)/ruby.h
+capacity.o: $(hdrdir)/ruby/assert.h
+capacity.o: $(hdrdir)/ruby/backward.h
+capacity.o: $(hdrdir)/ruby/defines.h
+capacity.o: $(hdrdir)/ruby/intern.h
+capacity.o: $(hdrdir)/ruby/missing.h
+capacity.o: $(hdrdir)/ruby/ruby.h
+capacity.o: $(hdrdir)/ruby/st.h
+capacity.o: $(hdrdir)/ruby/subst.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/assert.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/onigmo.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.h
+cstr.o: $(hdrdir)/ruby/assert.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/missing.h
+cstr.o: $(hdrdir)/ruby/onigmo.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)/internal.h
+cstr.o: cstr.c
+ellipsize.o: $(RUBY_EXTCONF_H)
+ellipsize.o: $(arch_hdrdir)/ruby/config.h
+ellipsize.o: $(hdrdir)/ruby.h
+ellipsize.o: $(hdrdir)/ruby/assert.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: ellipsize.c
+enc_associate.o: $(RUBY_EXTCONF_H)
+enc_associate.o: $(arch_hdrdir)/ruby/config.h
+enc_associate.o: $(hdrdir)/ruby.h
+enc_associate.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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/assert.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/onigmo.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.h
+fstring.o: $(hdrdir)/ruby/assert.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: fstring.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+modify.o: $(RUBY_EXTCONF_H)
+modify.o: $(arch_hdrdir)/ruby/config.h
+modify.o: $(hdrdir)/ruby.h
+modify.o: $(hdrdir)/ruby/assert.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: modify.c
+new.o: $(RUBY_EXTCONF_H)
+new.o: $(arch_hdrdir)/ruby/config.h
+new.o: $(hdrdir)/ruby.h
+new.o: $(hdrdir)/ruby/assert.h
+new.o: $(hdrdir)/ruby/backward.h
+new.o: $(hdrdir)/ruby/defines.h
+new.o: $(hdrdir)/ruby/encoding.h
+new.o: $(hdrdir)/ruby/intern.h
+new.o: $(hdrdir)/ruby/missing.h
+new.o: $(hdrdir)/ruby/onigmo.h
+new.o: $(hdrdir)/ruby/oniguruma.h
+new.o: $(hdrdir)/ruby/ruby.h
+new.o: $(hdrdir)/ruby/st.h
+new.o: $(hdrdir)/ruby/subst.h
+new.o: new.c
+nofree.o: $(RUBY_EXTCONF_H)
+nofree.o: $(arch_hdrdir)/ruby/config.h
+nofree.o: $(hdrdir)/ruby.h
+nofree.o: $(hdrdir)/ruby/assert.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: nofree.c
+normalize.o: $(RUBY_EXTCONF_H)
+normalize.o: $(arch_hdrdir)/ruby/config.h
+normalize.o: $(hdrdir)/ruby.h
+normalize.o: $(hdrdir)/ruby/assert.h
+normalize.o: $(hdrdir)/ruby/backward.h
+normalize.o: $(hdrdir)/ruby/defines.h
+normalize.o: $(hdrdir)/ruby/intern.h
+normalize.o: $(hdrdir)/ruby/missing.h
+normalize.o: $(hdrdir)/ruby/ruby.h
+normalize.o: $(hdrdir)/ruby/st.h
+normalize.o: $(hdrdir)/ruby/subst.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.h
+qsort.o: $(hdrdir)/ruby/assert.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/onigmo.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
+qsort.o: $(hdrdir)/ruby/util.h
+qsort.o: qsort.c
+rb_str_dup.o: $(RUBY_EXTCONF_H)
+rb_str_dup.o: $(arch_hdrdir)/ruby/config.h
+rb_str_dup.o: $(hdrdir)/ruby.h
+rb_str_dup.o: $(hdrdir)/ruby/assert.h
+rb_str_dup.o: $(hdrdir)/ruby/backward.h
+rb_str_dup.o: $(hdrdir)/ruby/defines.h
+rb_str_dup.o: $(hdrdir)/ruby/intern.h
+rb_str_dup.o: $(hdrdir)/ruby/missing.h
+rb_str_dup.o: $(hdrdir)/ruby/ruby.h
+rb_str_dup.o: $(hdrdir)/ruby/st.h
+rb_str_dup.o: $(hdrdir)/ruby/subst.h
+rb_str_dup.o: rb_str_dup.c
+set_len.o: $(RUBY_EXTCONF_H)
+set_len.o: $(arch_hdrdir)/ruby/config.h
+set_len.o: $(hdrdir)/ruby.h
+set_len.o: $(hdrdir)/ruby/assert.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: set_len.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/string/ellipsize.c b/ext/-test-/string/ellipsize.c
index 0451519492..6034408724 100644
--- a/ext/-test-/string/ellipsize.c
+++ b/ext/-test-/string/ellipsize.c
@@ -7,7 +7,7 @@ bug_str_ellipsize(VALUE str, VALUE len)
 }
 
 void
-Init_ellipsize(VALUE klass)
+Init_string_ellipsize(VALUE klass)
 {
     rb_define_method(klass, "ellipsize", bug_str_ellipsize, 1);
 }
diff --git a/ext/-test-/string/enc_associate.c b/ext/-test-/string/enc_associate.c
index d6614fb298..594d8a43a4 100644
--- a/ext/-test-/string/enc_associate.c
+++ b/ext/-test-/string/enc_associate.c
@@ -7,8 +7,16 @@ 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)
+Init_string_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/enc_str_buf_cat.c b/ext/-test-/string/enc_str_buf_cat.c
new file mode 100644
index 0000000000..9ac4a298be
--- /dev/null
+++ b/ext/-test-/string/enc_str_buf_cat.c
@@ -0,0 +1,14 @@
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
+
+static VALUE
+enc_str_buf_cat(VALUE str, VALUE str2)
+{
+    return rb_enc_str_buf_cat(str, RSTRING_PTR(str2), RSTRING_LEN(str2), rb_enc_get(str2));
+}
+
+void
+Init_string_enc_str_buf_cat(VALUE klass)
+{
+    rb_define_method(klass, "enc_str_buf_cat", enc_str_buf_cat, 1);
+}
diff --git a/ext/-test-/string/extconf.rb b/ext/-test-/string/extconf.rb
index 42c10b994b..d786b15db9 100644
--- a/ext/-test-/string/extconf.rb
+++ b/ext/-test-/string/extconf.rb
@@ -1,6 +1,3 @@
-$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")
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext(inc: true)
diff --git a/ext/-test-/string/fstring.c b/ext/-test-/string/fstring.c
new file mode 100644
index 0000000000..30120b42f6
--- /dev/null
+++ b/ext/-test-/string/fstring.c
@@ -0,0 +1,15 @@
+#include "ruby.h"
+
+VALUE rb_fstring(VALUE str);
+
+VALUE
+bug_s_fstring(VALUE self, VALUE str)
+{
+    return rb_fstring(str);
+}
+
+void
+Init_string_fstring(VALUE klass)
+{
+    rb_define_singleton_method(klass, "fstring", bug_s_fstring, 1);
+}
diff --git a/ext/-test-/string/init.c b/ext/-test-/string/init.c
index 0b3e4a6ff2..a74245c8d7 100644
--- a/ext/-test-/string/init.c
+++ b/ext/-test-/string/init.c
@@ -1,6 +1,6 @@
 #include "ruby.h"
 
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+#define init(n) {void Init_string_##n(VALUE klass); Init_string_##n(klass);}
 
 void
 Init_string(void)
diff --git a/ext/-test-/string/modify.c b/ext/-test-/string/modify.c
index a6930051b6..945febc7e3 100644
--- a/ext/-test-/string/modify.c
+++ b/ext/-test-/string/modify.c
@@ -7,8 +7,16 @@ bug_str_modify(VALUE str)
     return str;
 }
 
+VALUE
+bug_str_modify_expand(VALUE str, VALUE expand)
+{
+    rb_str_modify_expand(str, NUM2LONG(expand));
+    return str;
+}
+
 void
-Init_modify(VALUE klass)
+Init_string_modify(VALUE klass)
 {
     rb_define_method(klass, "modify!", bug_str_modify, 0);
+    rb_define_method(klass, "modify_expand!", bug_str_modify_expand, 1);
 }
diff --git a/ext/-test-/string/new.c b/ext/-test-/string/new.c
new file mode 100644
index 0000000000..60625b8300
--- /dev/null
+++ b/ext/-test-/string/new.c
@@ -0,0 +1,21 @@
+#include "ruby.h"
+#include "ruby/encoding.h"
+
+static VALUE
+bug_str_buf_new(VALUE self, VALUE len)
+{
+    return rb_str_buf_new(NUM2LONG(len));
+}
+
+static VALUE
+bug_external_str_new(VALUE self, VALUE len, VALUE enc)
+{
+    return rb_external_str_new_with_enc(NULL, NUM2LONG(len), rb_to_encoding(enc));
+}
+
+void
+Init_string_new(VALUE klass)
+{
+    rb_define_singleton_method(klass, "buf_new", bug_str_buf_new, 1);
+    rb_define_singleton_method(klass, "external_new", bug_external_str_new, 2);
+}
diff --git a/ext/-test-/string/nofree.c b/ext/-test-/string/nofree.c
new file mode 100644
index 0000000000..fdf810c741
--- /dev/null
+++ b/ext/-test-/string/nofree.c
@@ -0,0 +1,13 @@
+#include "ruby.h"
+
+VALUE
+bug_str_nofree(VALUE self)
+{
+    return rb_str_new_cstr("abcdef");
+}
+
+void
+Init_string_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
new file mode 100644
index 0000000000..0ba1797631
--- /dev/null
+++ b/ext/-test-/string/normalize.c
@@ -0,0 +1,17 @@
+#include "internal.h"
+
+#ifdef __APPLE__
+static VALUE
+normalize_ospath(VALUE str)
+{
+    return rb_str_normalize_ospath(RSTRING_PTR(str), RSTRING_LEN(str));
+}
+#else
+#define normalize_ospath rb_f_notimplement
+#endif
+
+void
+Init_string_normalize(VALUE klass)
+{
+    rb_define_method(klass, "normalize_ospath", normalize_ospath, 0);
+}
diff --git a/ext/-test-/string/qsort.c b/ext/-test-/string/qsort.c
new file mode 100644
index 0000000000..fb7ea3d8cb
--- /dev/null
+++ b/ext/-test-/string/qsort.c
@@ -0,0 +1,61 @@
+#include "ruby.h"
+#include "ruby/util.h"
+#include "ruby/encoding.h"
+
+struct sort_data {
+    rb_encoding *enc;
+    long elsize;
+};
+
+static int
+cmp_1(const void *ap, const void *bp, void *dummy)
+{
+    struct sort_data *d = dummy;
+    VALUE a = rb_enc_str_new(ap, d->elsize, d->enc);
+    VALUE b = rb_enc_str_new(bp, d->elsize, d->enc);
+    VALUE retval = rb_yield_values(2, a, b);
+    return rb_cmpint(retval, a, b);
+}
+
+static int
+cmp_2(const void *ap, const void *bp, void *dummy)
+{
+    int a = *(const unsigned char *)ap;
+    int b = *(const unsigned char *)bp;
+    return a - b;
+}
+
+static VALUE
+bug_str_qsort_bang(int argc, VALUE *argv, VALUE str)
+{
+    VALUE beg, len, size;
+    long l, b = 0, n, s = 1;
+    struct sort_data d;
+
+    rb_scan_args(argc, argv, "03", &beg, &len, &size);
+    l = RSTRING_LEN(str);
+    if (!NIL_P(beg) && (b = NUM2INT(beg)) < 0 && (b += l) < 0) {
+	rb_raise(rb_eArgError, "out of bounds");
+    }
+    if (!NIL_P(size) && (s = NUM2INT(size)) < 0) {
+	rb_raise(rb_eArgError, "negative size");
+    }
+    if (NIL_P(len) ||
+	(((n = NUM2INT(len)) < 0) ?
+	 (rb_raise(rb_eArgError, "negative length"), 0) :
+	 (b + n * s > l))) {
+	n = (l - b) / s;
+    }
+    rb_str_modify(str);
+    d.enc = rb_enc_get(str);
+    d.elsize = s;
+    ruby_qsort(RSTRING_PTR(str) + b, n, s,
+	       rb_block_given_p() ? cmp_1 : cmp_2, &d);
+    return str;
+}
+
+void
+Init_string_qsort(VALUE klass)
+{
+    rb_define_method(klass, "qsort!", bug_str_qsort_bang, -1);
+}
diff --git a/ext/-test-/string/rb_str_dup.c b/ext/-test-/string/rb_str_dup.c
new file mode 100644
index 0000000000..a0bd65820f
--- /dev/null
+++ b/ext/-test-/string/rb_str_dup.c
@@ -0,0 +1,35 @@
+#include "ruby.h"
+
+VALUE rb_str_dup(VALUE str);
+
+static VALUE
+bug_rb_str_dup(VALUE self, VALUE str)
+{
+    rb_check_type(str, T_STRING);
+    return rb_str_dup(str);
+}
+
+static VALUE
+bug_shared_string_p(VALUE self, VALUE str)
+{
+    rb_check_type(str, T_STRING);
+    return RB_FL_TEST(str, RUBY_ELTS_SHARED) && RB_FL_TEST(str, RSTRING_NOEMBED) ? Qtrue : Qfalse;
+}
+
+static VALUE
+bug_sharing_with_shared_p(VALUE self, VALUE str)
+{
+    rb_check_type(str, T_STRING);
+    if (bug_shared_string_p(self, str)) {
+        return bug_shared_string_p(self, RSTRING(str)->as.heap.aux.shared);
+    }
+    return Qfalse;
+}
+
+void
+Init_string_rb_str_dup(VALUE klass)
+{
+    rb_define_singleton_method(klass, "rb_str_dup", bug_rb_str_dup, 1);
+    rb_define_singleton_method(klass, "shared_string?", bug_shared_string_p, 1);
+    rb_define_singleton_method(klass, "sharing_with_shared?", bug_sharing_with_shared_p, 1);
+}
diff --git a/ext/-test-/string/set_len.c b/ext/-test-/string/set_len.c
index 3c7d19d778..219cea404c 100644
--- a/ext/-test-/string/set_len.c
+++ b/ext/-test-/string/set_len.c
@@ -8,7 +8,7 @@ bug_str_set_len(VALUE str, VALUE len)
 }
 
 void
-Init_set_len(VALUE klass)
+Init_string_set_len(VALUE klass)
 {
     rb_define_method(klass, "set_len", bug_str_set_len, 1);
 }
diff --git a/ext/-test-/struct/depend b/ext/-test-/struct/depend
new file mode 100644
index 0000000000..552daf0ac5
--- /dev/null
+++ b/ext/-test-/struct/depend
@@ -0,0 +1,50 @@
+# AUTOGENERATED DEPENDENCIES START
+duplicate.o: $(RUBY_EXTCONF_H)
+duplicate.o: $(arch_hdrdir)/ruby/config.h
+duplicate.o: $(hdrdir)/ruby.h
+duplicate.o: $(hdrdir)/ruby/assert.h
+duplicate.o: $(hdrdir)/ruby/backward.h
+duplicate.o: $(hdrdir)/ruby/defines.h
+duplicate.o: $(hdrdir)/ruby/intern.h
+duplicate.o: $(hdrdir)/ruby/missing.h
+duplicate.o: $(hdrdir)/ruby/ruby.h
+duplicate.o: $(hdrdir)/ruby/st.h
+duplicate.o: $(hdrdir)/ruby/subst.h
+duplicate.o: duplicate.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+len.o: $(RUBY_EXTCONF_H)
+len.o: $(arch_hdrdir)/ruby/config.h
+len.o: $(hdrdir)/ruby.h
+len.o: $(hdrdir)/ruby/assert.h
+len.o: $(hdrdir)/ruby/backward.h
+len.o: $(hdrdir)/ruby/defines.h
+len.o: $(hdrdir)/ruby/intern.h
+len.o: $(hdrdir)/ruby/missing.h
+len.o: $(hdrdir)/ruby/ruby.h
+len.o: $(hdrdir)/ruby/st.h
+len.o: $(hdrdir)/ruby/subst.h
+len.o: len.c
+member.o: $(RUBY_EXTCONF_H)
+member.o: $(arch_hdrdir)/ruby/config.h
+member.o: $(hdrdir)/ruby.h
+member.o: $(hdrdir)/ruby/assert.h
+member.o: $(hdrdir)/ruby/backward.h
+member.o: $(hdrdir)/ruby/defines.h
+member.o: $(hdrdir)/ruby/intern.h
+member.o: $(hdrdir)/ruby/missing.h
+member.o: $(hdrdir)/ruby/ruby.h
+member.o: $(hdrdir)/ruby/st.h
+member.o: $(hdrdir)/ruby/subst.h
+member.o: member.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/struct/duplicate.c b/ext/-test-/struct/duplicate.c
new file mode 100644
index 0000000000..596d32aad8
--- /dev/null
+++ b/ext/-test-/struct/duplicate.c
@@ -0,0 +1,24 @@
+#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
new file mode 100644
index 0000000000..d786b15db9
--- /dev/null
+++ b/ext/-test-/struct/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext(inc: true)
diff --git a/ext/-test-/struct/init.c b/ext/-test-/struct/init.c
new file mode 100644
index 0000000000..459a939e79
--- /dev/null
+++ b/ext/-test-/struct/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+void
+Init_struct(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_class_under(mBug, "Struct", rb_cStruct);
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/struct/len.c b/ext/-test-/struct/len.c
new file mode 100644
index 0000000000..6153c720b2
--- /dev/null
+++ b/ext/-test-/struct/len.c
@@ -0,0 +1,13 @@
+#include "ruby.h"
+
+static VALUE
+bug_struct_len(VALUE obj)
+{
+    return LONG2NUM(RSTRUCT_LEN(obj));
+}
+
+void
+Init_len(VALUE klass)
+{
+    rb_define_method(klass, "rstruct_len", bug_struct_len, 0);
+}
diff --git a/ext/-test-/struct/member.c b/ext/-test-/struct/member.c
new file mode 100644
index 0000000000..1d404039b4
--- /dev/null
+++ b/ext/-test-/struct/member.c
@@ -0,0 +1,18 @@
+#include "ruby.h"
+
+static VALUE
+bug_struct_get(VALUE obj, VALUE name)
+{
+    ID id = rb_check_id(&name);
+
+    if (!id) {
+	rb_name_error_str(name, "`%"PRIsVALUE"' is not a struct member", name);
+    }
+    return rb_struct_getmember(obj, id);
+}
+
+void
+Init_member(VALUE klass)
+{
+    rb_define_method(klass, "get", bug_struct_get, 1);
+}
diff --git a/ext/-test-/symbol/depend b/ext/-test-/symbol/depend
new file mode 100644
index 0000000000..bccb4afc15
--- /dev/null
+++ b/ext/-test-/symbol/depend
@@ -0,0 +1,26 @@
+# AUTOGENERATED DEPENDENCIES START
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+type.o: $(RUBY_EXTCONF_H)
+type.o: $(arch_hdrdir)/ruby/config.h
+type.o: $(hdrdir)/ruby.h
+type.o: $(hdrdir)/ruby/assert.h
+type.o: $(hdrdir)/ruby/backward.h
+type.o: $(hdrdir)/ruby/defines.h
+type.o: $(hdrdir)/ruby/intern.h
+type.o: $(hdrdir)/ruby/missing.h
+type.o: $(hdrdir)/ruby/ruby.h
+type.o: $(hdrdir)/ruby/st.h
+type.o: $(hdrdir)/ruby/subst.h
+type.o: type.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/symbol/extconf.rb b/ext/-test-/symbol/extconf.rb
new file mode 100644
index 0000000000..ecebdb7d6b
--- /dev/null
+++ b/ext/-test-/symbol/extconf.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+have_func("rb_pin_dynamic_symbol")
+auto_ext
diff --git a/ext/-test-/symbol/init.c b/ext/-test-/symbol/init.c
new file mode 100644
index 0000000000..4038701ac9
--- /dev/null
+++ b/ext/-test-/symbol/init.c
@@ -0,0 +1,39 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+static VALUE
+sym_find(VALUE dummy, VALUE sym)
+{
+    return rb_check_symbol(&sym);
+}
+
+static VALUE
+sym_pinneddown_p(VALUE dummy, VALUE sym)
+{
+    ID id = rb_check_id(&sym);
+    if (!id) return Qnil;
+#ifdef ULL2NUM
+    return ULL2NUM(id);
+#else
+    return ULONG2NUM(id);
+#endif
+}
+
+static VALUE
+sym_iv_get(VALUE dummy, VALUE obj, VALUE name)
+{
+    const char *n = StringValueCStr(name);
+    return rb_iv_get(obj, n);
+}
+
+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);
+    rb_define_singleton_method(klass, "iv_get", sym_iv_get, 2);
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/symbol/type.c b/ext/-test-/symbol/type.c
new file mode 100644
index 0000000000..e51e09eb26
--- /dev/null
+++ b/ext/-test-/symbol/type.c
@@ -0,0 +1,78 @@
+#include "ruby.h"
+
+#ifdef HAVE_RB_IS_CONST_NAME
+# define get_symbol_type(type, t, name) do { \
+	ID id = rb_check_id(&name); \
+	t = (id ? rb_is_##type##_id(id) : rb_is_##type##_name(name)); \
+    } while (0)
+#else
+# define get_symbol_type(type, t, name) do { \
+	t = rb_is_##type##_id(rb_to_id(name)); \
+    } while (0)
+#endif
+
+#define define_symbol_type_p(type) \
+static VALUE \
+bug_sym_##type##_p(VALUE self, VALUE name) \
+{ \
+    int t; \
+    get_symbol_type(type, t, name); \
+    return (t ? Qtrue : Qfalse); \
+}
+
+#define declare_symbol_type_p(type) \
+    rb_define_singleton_method(klass, #type"?", bug_sym_##type##_p, 1);
+
+#define FOREACH_ID_TYPES(x) x(const) x(class) x(global) x(instance) x(attrset) x(local) x(junk)
+
+FOREACH_ID_TYPES(define_symbol_type_p)
+
+static VALUE
+bug_sym_attrset(VALUE self, VALUE name)
+{
+    ID id = rb_to_id(name);
+    id = rb_id_attrset(id);
+    return ID2SYM(id);
+}
+
+static VALUE
+bug_id2str(VALUE self, VALUE sym)
+{
+    return rb_sym2str(sym);
+}
+
+static VALUE
+bug_static_p(VALUE self, VALUE sym)
+{
+    return STATIC_SYM_P(sym) ? Qtrue : Qfalse;
+}
+
+static VALUE
+bug_dynamic_p(VALUE self, VALUE sym)
+{
+    return DYNAMIC_SYM_P(sym) ? Qtrue : Qfalse;
+}
+
+#ifdef HAVE_RB_PIN_DYNAMIC_SYMBOL
+ID rb_pin_dynamic_symbol(VALUE);
+
+static VALUE
+bug_pindown(VALUE self, VALUE sym)
+{
+    rb_pin_dynamic_symbol(sym);
+    return sym;
+}
+#endif
+
+void
+Init_type(VALUE klass)
+{
+    FOREACH_ID_TYPES(declare_symbol_type_p);
+    rb_define_singleton_method(klass, "attrset", bug_sym_attrset, 1);
+    rb_define_singleton_method(klass, "id2str", bug_id2str, 1);
+    rb_define_singleton_method(klass, "static?", bug_static_p, 1);
+    rb_define_singleton_method(klass, "dynamic?", bug_dynamic_p, 1);
+#ifdef HAVE_RB_PIN_DYNAMIC_SYMBOL
+    rb_define_singleton_method(klass, "pindown", bug_pindown, 1);
+#endif
+}
diff --git a/ext/-test-/thread_fd_close/depend b/ext/-test-/thread_fd_close/depend
new file mode 100644
index 0000000000..8c49c2d4fe
--- /dev/null
+++ b/ext/-test-/thread_fd_close/depend
@@ -0,0 +1,13 @@
+# AUTOGENERATED DEPENDENCIES START
+thread_fd_close.o: $(RUBY_EXTCONF_H)
+thread_fd_close.o: $(arch_hdrdir)/ruby/config.h
+thread_fd_close.o: $(hdrdir)/ruby/assert.h
+thread_fd_close.o: $(hdrdir)/ruby/backward.h
+thread_fd_close.o: $(hdrdir)/ruby/defines.h
+thread_fd_close.o: $(hdrdir)/ruby/intern.h
+thread_fd_close.o: $(hdrdir)/ruby/missing.h
+thread_fd_close.o: $(hdrdir)/ruby/ruby.h
+thread_fd_close.o: $(hdrdir)/ruby/st.h
+thread_fd_close.o: $(hdrdir)/ruby/subst.h
+thread_fd_close.o: thread_fd_close.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/thread_fd_close/extconf.rb b/ext/-test-/thread_fd_close/extconf.rb
new file mode 100644
index 0000000000..0d9694539c
--- /dev/null
+++ b/ext/-test-/thread_fd_close/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: true
+create_makefile('-test-/thread_fd_close')
diff --git a/ext/-test-/thread_fd_close/thread_fd_close.c b/ext/-test-/thread_fd_close/thread_fd_close.c
new file mode 100644
index 0000000000..4fd967c5b3
--- /dev/null
+++ b/ext/-test-/thread_fd_close/thread_fd_close.c
@@ -0,0 +1,14 @@
+#include "ruby/ruby.h"
+
+static VALUE
+thread_fd_close(VALUE ign, VALUE fd)
+{
+    rb_thread_fd_close(NUM2INT(fd));
+    return Qnil;
+}
+
+void
+Init_thread_fd_close(void)
+{
+    rb_define_singleton_method(rb_cIO, "thread_fd_close", thread_fd_close, 1);
+}
diff --git a/ext/-test-/time/depend b/ext/-test-/time/depend
new file mode 100644
index 0000000000..2f4b8d1f13
--- /dev/null
+++ b/ext/-test-/time/depend
@@ -0,0 +1,38 @@
+# AUTOGENERATED DEPENDENCIES START
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+leap_second.o: $(RUBY_EXTCONF_H)
+leap_second.o: $(arch_hdrdir)/ruby/config.h
+leap_second.o: $(hdrdir)/ruby.h
+leap_second.o: $(hdrdir)/ruby/assert.h
+leap_second.o: $(hdrdir)/ruby/backward.h
+leap_second.o: $(hdrdir)/ruby/defines.h
+leap_second.o: $(hdrdir)/ruby/intern.h
+leap_second.o: $(hdrdir)/ruby/missing.h
+leap_second.o: $(hdrdir)/ruby/ruby.h
+leap_second.o: $(hdrdir)/ruby/st.h
+leap_second.o: $(hdrdir)/ruby/subst.h
+leap_second.o: leap_second.c
+new.o: $(RUBY_EXTCONF_H)
+new.o: $(arch_hdrdir)/ruby/config.h
+new.o: $(hdrdir)/ruby.h
+new.o: $(hdrdir)/ruby/assert.h
+new.o: $(hdrdir)/ruby/backward.h
+new.o: $(hdrdir)/ruby/defines.h
+new.o: $(hdrdir)/ruby/intern.h
+new.o: $(hdrdir)/ruby/missing.h
+new.o: $(hdrdir)/ruby/ruby.h
+new.o: $(hdrdir)/ruby/st.h
+new.o: $(hdrdir)/ruby/subst.h
+new.o: new.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/time/extconf.rb b/ext/-test-/time/extconf.rb
new file mode 100644
index 0000000000..d786b15db9
--- /dev/null
+++ b/ext/-test-/time/extconf.rb
@@ -0,0 +1,3 @@
+# 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
new file mode 100644
index 0000000000..91f8bf825b
--- /dev/null
+++ b/ext/-test-/time/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_time_##n(VALUE klass); Init_time_##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/leap_second.c b/ext/-test-/time/leap_second.c
new file mode 100644
index 0000000000..7eed421b73
--- /dev/null
+++ b/ext/-test-/time/leap_second.c
@@ -0,0 +1,15 @@
+#include "ruby.h"
+
+void ruby_reset_leap_second_info(void);
+static VALUE
+bug_time_s_reset_leap_second_info(VALUE klass)
+{
+    ruby_reset_leap_second_info();
+    return Qnil;
+}
+
+void
+Init_time_leap_second(VALUE klass)
+{
+    rb_define_singleton_method(klass, "reset_leap_second_info", bug_time_s_reset_leap_second_info, 0);
+}
diff --git a/ext/-test-/time/new.c b/ext/-test-/time/new.c
new file mode 100644
index 0000000000..6f894417b6
--- /dev/null
+++ b/ext/-test-/time/new.c
@@ -0,0 +1,34 @@
+#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_time_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
new file mode 100644
index 0000000000..b811df4472
--- /dev/null
+++ b/ext/-test-/tracepoint/depend
@@ -0,0 +1,26 @@
+# AUTOGENERATED DEPENDENCIES START
+gc_hook.o: $(RUBY_EXTCONF_H)
+gc_hook.o: $(arch_hdrdir)/ruby/config.h
+gc_hook.o: $(hdrdir)/ruby/assert.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/assert.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
diff --git a/ext/-test-/tracepoint/extconf.rb b/ext/-test-/tracepoint/extconf.rb
new file mode 100644
index 0000000000..2b7258d072
--- /dev/null
+++ b/ext/-test-/tracepoint/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/tracepoint")
diff --git a/ext/-test-/tracepoint/gc_hook.c b/ext/-test-/tracepoint/gc_hook.c
new file mode 100644
index 0000000000..2e695a9fba
--- /dev/null
+++ b/ext/-test-/tracepoint/gc_hook.c
@@ -0,0 +1,80 @@
+#include "ruby/ruby.h"
+#include "ruby/debug.h"
+
+static int invoking; /* TODO: should not be global variable */
+
+static VALUE
+invoke_proc_ensure(VALUE _)
+{
+    invoking = 0;
+    return Qnil;
+}
+
+static VALUE
+invoke_proc_begin(VALUE proc)
+{
+    return rb_proc_call(proc, rb_ary_new());
+}
+
+static void
+invoke_proc(void *data)
+{
+    VALUE proc = (VALUE)data;
+    invoking += 1;
+    rb_ensure(invoke_proc_begin, proc, invoke_proc_ensure, 0);
+}
+
+static void
+gc_start_end_i(VALUE tpval, void *data)
+{
+    if (0) {
+	rb_trace_arg_t *tparg = rb_tracearg_from_tracepoint(tpval);
+	fprintf(stderr, "trace: %s\n", rb_tracearg_event_flag(tparg) == RUBY_INTERNAL_EVENT_GC_START ? "gc_start" : "gc_end");
+    }
+
+    if (invoking == 0) {
+	rb_postponed_job_register(0, invoke_proc, data);
+    }
+}
+
+static VALUE
+set_gc_hook(VALUE module, VALUE proc, rb_event_flag_t event, const char *tp_str, const char *proc_str)
+{
+    VALUE tpval;
+    ID tp_key = rb_intern(tp_str);
+    ID proc_key = rb_intern(proc_str);
+
+    /* disable previous keys */
+    if (rb_ivar_defined(module, tp_key) != 0 &&
+	RTEST(tpval = rb_ivar_get(module, tp_key))) {
+	rb_tracepoint_disable(tpval);
+	rb_ivar_set(module, tp_key, Qnil);
+	rb_ivar_set(module, proc_key, Qnil);
+    }
+
+    if (RTEST(proc)) {
+	if (!rb_obj_is_proc(proc)) {
+	    rb_raise(rb_eTypeError, "trace_func needs to be Proc");
+	}
+
+	tpval = rb_tracepoint_new(0, event, gc_start_end_i, (void *)proc);
+	rb_ivar_set(module, tp_key, tpval);
+	rb_ivar_set(module, proc_key, proc); /* GC guard */
+	rb_tracepoint_enable(tpval);
+    }
+
+    return proc;
+}
+
+static VALUE
+set_after_gc_start(VALUE module, VALUE proc)
+{
+    return set_gc_hook(module, proc, RUBY_INTERNAL_EVENT_GC_START,
+		       "__set_after_gc_start_tpval__", "__set_after_gc_start_proc__");
+}
+
+void
+Init_gc_hook(VALUE module)
+{
+    rb_define_module_function(module, "after_gc_start_hook=", set_after_gc_start, 1);
+}
diff --git a/ext/-test-/tracepoint/tracepoint.c b/ext/-test-/tracepoint/tracepoint.c
new file mode 100644
index 0000000000..aa8c212f99
--- /dev/null
+++ b/ext/-test-/tracepoint/tracepoint.c
@@ -0,0 +1,96 @@
+#include "ruby/ruby.h"
+#include "ruby/debug.h"
+
+struct tracepoint_track {
+    size_t newobj_count;
+    size_t free_count;
+    size_t gc_start_count;
+    size_t gc_end_mark_count;
+    size_t gc_end_sweep_count;
+    size_t objects_count;
+    VALUE objects[10];
+};
+
+#define objects_max (sizeof(((struct tracepoint_track *)NULL)->objects)/sizeof(VALUE))
+
+static void
+tracepoint_track_objspace_events_i(VALUE tpval, void *data)
+{
+    rb_trace_arg_t *tparg = rb_tracearg_from_tracepoint(tpval);
+    struct tracepoint_track *track = data;
+
+    switch (rb_tracearg_event_flag(tparg)) {
+      case RUBY_INTERNAL_EVENT_NEWOBJ:
+	{
+	    VALUE obj = rb_tracearg_object(tparg);
+	    if (track->objects_count < objects_max)
+		track->objects[track->objects_count++] = obj;
+	    track->newobj_count++;
+	    break;
+	}
+      case RUBY_INTERNAL_EVENT_FREEOBJ:
+	{
+	    track->free_count++;
+	    break;
+	}
+      case RUBY_INTERNAL_EVENT_GC_START:
+	{
+	    track->gc_start_count++;
+	    break;
+	}
+      case RUBY_INTERNAL_EVENT_GC_END_MARK:
+	{
+	    track->gc_end_mark_count++;
+	    break;
+	}
+      case RUBY_INTERNAL_EVENT_GC_END_SWEEP:
+	{
+	    track->gc_end_sweep_count++;
+	    break;
+	}
+      default:
+	rb_raise(rb_eRuntimeError, "unknown event");
+    }
+}
+
+static VALUE
+tracepoint_track_objspace_events(VALUE self)
+{
+    struct tracepoint_track track = {0, 0, 0, 0, 0,};
+    VALUE tpval = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_NEWOBJ | RUBY_INTERNAL_EVENT_FREEOBJ |
+				    RUBY_INTERNAL_EVENT_GC_START | RUBY_INTERNAL_EVENT_GC_END_MARK |
+				    RUBY_INTERNAL_EVENT_GC_END_SWEEP,
+				    tracepoint_track_objspace_events_i, &track);
+    VALUE result = rb_ary_new();
+
+    rb_tracepoint_enable(tpval);
+    rb_ensure(rb_yield, Qundef, rb_tracepoint_disable, tpval);
+
+    rb_ary_push(result, SIZET2NUM(track.newobj_count));
+    rb_ary_push(result, SIZET2NUM(track.free_count));
+    rb_ary_push(result, SIZET2NUM(track.gc_start_count));
+    rb_ary_push(result, SIZET2NUM(track.gc_end_mark_count));
+    rb_ary_push(result, SIZET2NUM(track.gc_end_sweep_count));
+    rb_ary_cat(result, track.objects, track.objects_count);
+
+    return result;
+}
+
+static VALUE
+tracepoint_specify_normal_and_internal_events(VALUE self)
+{
+    VALUE tpval = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_NEWOBJ | RUBY_EVENT_CALL, 0, 0);
+    rb_tracepoint_enable(tpval);
+    return Qnil; /* should not be reached */
+}
+
+void Init_gc_hook(VALUE);
+
+void
+Init_tracepoint(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    Init_gc_hook(mBug);
+    rb_define_module_function(mBug, "tracepoint_track_objspace_events", tracepoint_track_objspace_events, 0);
+    rb_define_module_function(mBug, "tracepoint_specify_normal_and_internal_events", tracepoint_specify_normal_and_internal_events, 0);
+}
diff --git a/ext/-test-/typeddata/depend b/ext/-test-/typeddata/depend
new file mode 100644
index 0000000000..e0dd0653a8
--- /dev/null
+++ b/ext/-test-/typeddata/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+typeddata.o: $(RUBY_EXTCONF_H)
+typeddata.o: $(arch_hdrdir)/ruby/config.h
+typeddata.o: $(hdrdir)/ruby.h
+typeddata.o: $(hdrdir)/ruby/assert.h
+typeddata.o: $(hdrdir)/ruby/backward.h
+typeddata.o: $(hdrdir)/ruby/defines.h
+typeddata.o: $(hdrdir)/ruby/intern.h
+typeddata.o: $(hdrdir)/ruby/missing.h
+typeddata.o: $(hdrdir)/ruby/ruby.h
+typeddata.o: $(hdrdir)/ruby/st.h
+typeddata.o: $(hdrdir)/ruby/subst.h
+typeddata.o: typeddata.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/typeddata/extconf.rb b/ext/-test-/typeddata/extconf.rb
new file mode 100644
index 0000000000..731701111b
--- /dev/null
+++ b/ext/-test-/typeddata/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/typeddata")
diff --git a/ext/-test-/typeddata/typeddata.c b/ext/-test-/typeddata/typeddata.c
new file mode 100644
index 0000000000..ae060960cd
--- /dev/null
+++ b/ext/-test-/typeddata/typeddata.c
@@ -0,0 +1,44 @@
+#include <ruby.h>
+
+static const rb_data_type_t test_data = {
+    "typed_data",
+    {NULL, ruby_xfree, NULL},
+    NULL, NULL,
+    0/* deferred free */,
+};
+
+static VALUE
+test_alloc(VALUE klass)
+{
+    char *p;
+    return TypedData_Make_Struct(klass, char, &test_data, p);
+}
+
+static VALUE
+test_check(VALUE self, VALUE obj)
+{
+    rb_check_typeddata(obj, &test_data);
+    return obj;
+}
+
+static VALUE
+test_make(VALUE klass, VALUE num)
+{
+    unsigned long i, n = NUM2UINT(num);
+
+    for (i = 0; i < n; i++) {
+	test_alloc(klass);
+    }
+
+    return Qnil;
+}
+
+void
+Init_typeddata(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_class_under(mBug, "TypedData", rb_cData);
+    rb_define_alloc_func(klass, test_alloc);
+    rb_define_singleton_method(klass, "check", test_check, 1);
+    rb_define_singleton_method(klass, "make", test_make, 1);
+}
diff --git a/ext/-test-/vm/at_exit.c b/ext/-test-/vm/at_exit.c
new file mode 100644
index 0000000000..6cfbfafa9e
--- /dev/null
+++ b/ext/-test-/vm/at_exit.c
@@ -0,0 +1,44 @@
+#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
new file mode 100644
index 0000000000..0f85d69bb0
--- /dev/null
+++ b/ext/-test-/vm/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+at_exit.o: $(RUBY_EXTCONF_H)
+at_exit.o: $(arch_hdrdir)/ruby/config.h
+at_exit.o: $(hdrdir)/ruby/assert.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
new file mode 100644
index 0000000000..614ec960d8
--- /dev/null
+++ b/ext/-test-/vm/extconf.rb
@@ -0,0 +1 @@
+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 d9cd50a542..8549fca781 100644
--- a/ext/-test-/wait_for_single_fd/depend
+++ b/ext/-test-/wait_for_single_fd/depend
@@ -1,2 +1,17 @@
-wait_for_single_fd.o: $(top_srcdir)/thread.c \
-  $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/io.h
+# 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/assert.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/onigmo.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
diff --git a/ext/-test-/wait_for_single_fd/extconf.rb b/ext/-test-/wait_for_single_fd/extconf.rb
index 1a28b23da3..2a976c8f4b 100644
--- a/ext/-test-/wait_for_single_fd/extconf.rb
+++ b/ext/-test-/wait_for_single_fd/extconf.rb
@@ -1 +1,4 @@
-create_makefile("-test-/wait_for_single_fd/wait_for_single_fd")
+# frozen_string_literal: false
+headers = %w(sys/types.h sys/time.h sys/event.h).select { |h| have_header(h) }
+have_func('kqueue', headers)
+create_makefile("-test-/wait_for_single_fd")
diff --git a/ext/-test-/wait_for_single_fd/wait_for_single_fd.c b/ext/-test-/wait_for_single_fd/wait_for_single_fd.c
index d406724a3f..b8a33979bc 100644
--- a/ext/-test-/wait_for_single_fd/wait_for_single_fd.c
+++ b/ext/-test-/wait_for_single_fd/wait_for_single_fd.c
@@ -19,6 +19,67 @@ wait_for_single_fd(VALUE ign, VALUE fd, VALUE events, VALUE timeout)
     return INT2NUM(rc);
 }
 
+#ifdef HAVE_KQUEUE
+/* ensure rb_wait_for_single_fd works on kqueue descriptors */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/event.h>
+static VALUE
+kqueue_test_wait(VALUE klass)
+{
+    int kqfd = -1;
+    int p[2] = { -1, -1 };
+    struct timeval tv = { 0, 0 };
+    const struct timespec ts = { 1, 0 };
+    struct kevent kev;
+    const char *msg;
+    VALUE ret = Qfalse;
+    int e = 0;
+    int n;
+
+    msg = "pipe";
+    if (rb_cloexec_pipe(p) < 0) goto err;
+
+    msg = "kqueue";
+    kqfd = kqueue();
+    if (kqfd < 0) goto err;
+
+    n = rb_wait_for_single_fd(kqfd, RB_WAITFD_IN, &tv);
+    if (n != 0) {
+        msg = "spurious wakeup";
+        errno = 0;
+        goto err;
+    }
+
+    msg = "write";
+    if (write(p[1], "", 1) < 0) goto err;
+
+    EV_SET(&kev, p[0], EVFILT_READ, EV_ADD, 0, 0, 0);
+
+    msg = "kevent";
+    n = kevent(kqfd, &kev, 1, &kev, 1, &ts);
+    if (n < 0) goto err;
+    msg = NULL;
+    if (n == 1) {
+        n = rb_wait_for_single_fd(kqfd, RB_WAITFD_IN, &tv);
+        ret = INT2NUM(n);
+    }
+    else {
+        rb_warn("kevent did not return readiness");
+    }
+err:
+    if (msg) e = errno;
+    if (p[0] >= 0) close(p[0]);
+    if (p[1] >= 0) close(p[1]);
+    if (kqfd >= 0) close(kqfd);
+    if (msg) {
+        if (e) rb_syserr_fail(e, msg);
+        rb_raise(rb_eRuntimeError, "%s", msg);
+    }
+    return ret;
+}
+#endif /* HAVE_KQUEUE */
+
 void
 Init_wait_for_single_fd(void)
 {
@@ -27,4 +88,7 @@ Init_wait_for_single_fd(void)
     rb_define_const(rb_cObject, "RB_WAITFD_PRI", INT2NUM(RB_WAITFD_PRI));
     rb_define_singleton_method(rb_cIO, "wait_for_single_fd",
                                wait_for_single_fd, 3);
+#ifdef HAVE_KQUEUE
+    rb_define_singleton_method(rb_cIO, "kqueue_test_wait", kqueue_test_wait, 0);
+#endif
 }
diff --git a/ext/-test-/win32/console/attribute.c b/ext/-test-/win32/console/attribute.c
new file mode 100644
index 0000000000..a5f80fcaff
--- /dev/null
+++ b/ext/-test-/win32/console/attribute.c
@@ -0,0 +1,69 @@
+#include <ruby.h>
+
+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);
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+
+    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.wAttributes));
+}
+
+static VALUE
+console_set_attribute(VALUE io, VALUE attr)
+{
+    HANDLE h = io_handle(io);
+
+    SetConsoleTextAttribute(h, (WORD)NUM2INT(attr));
+    return Qnil;
+}
+
+#define FOREGROUND_MASK (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY)
+#define BACKGROUND_MASK (BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY)
+
+void
+Init_attribute(VALUE m)
+{
+    rb_cConsoleScreenBufferInfo = rb_struct_define_under(m, "ConsoleScreenBufferInfo",
+							 "size_x", "size_y",
+							 "cur_x", "cur_y",
+							 "attr", NULL);
+    rb_define_method(rb_cIO, "console_info", console_info, 0);
+    rb_define_method(rb_cIO, "console_attribute", console_set_attribute, 1);
+
+    rb_define_const(m, "FOREGROUND_MASK", INT2FIX(FOREGROUND_MASK));
+    rb_define_const(m, "FOREGROUND_BLUE", INT2FIX(FOREGROUND_BLUE));
+    rb_define_const(m, "FOREGROUND_GREEN", INT2FIX(FOREGROUND_GREEN));
+    rb_define_const(m, "FOREGROUND_RED", INT2FIX(FOREGROUND_RED));
+    rb_define_const(m, "FOREGROUND_INTENSITY", INT2FIX(FOREGROUND_INTENSITY));
+
+    rb_define_const(m, "BACKGROUND_MASK", INT2FIX(BACKGROUND_MASK));
+    rb_define_const(m, "BACKGROUND_BLUE", INT2FIX(BACKGROUND_BLUE));
+    rb_define_const(m, "BACKGROUND_GREEN", INT2FIX(BACKGROUND_GREEN));
+    rb_define_const(m, "BACKGROUND_RED", INT2FIX(BACKGROUND_RED));
+    rb_define_const(m, "BACKGROUND_INTENSITY", INT2FIX(BACKGROUND_INTENSITY));
+
+#ifndef COMMON_LVB_REVERSE_VIDEO
+#define COMMON_LVB_REVERSE_VIDEO 0x4000
+#endif
+    rb_define_const(m, "REVERSE_VIDEO", INT2FIX(COMMON_LVB_REVERSE_VIDEO));
+}
diff --git a/ext/-test-/win32/console/depend b/ext/-test-/win32/console/depend
new file mode 100644
index 0000000000..f4f65adf9a
--- /dev/null
+++ b/ext/-test-/win32/console/depend
@@ -0,0 +1 @@
+attribute.o: $(ruby_headers) $(hdrdir)/ruby/win32.h
diff --git a/ext/-test-/win32/console/extconf.rb b/ext/-test-/win32/console/extconf.rb
new file mode 100644
index 0000000000..5162172890
--- /dev/null
+++ b/ext/-test-/win32/console/extconf.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: false
+if $mingw or $mswin
+  require_relative "../../auto_ext.rb"
+  auto_ext
+end
diff --git a/ext/-test-/win32/console/init.c b/ext/-test-/win32/console/init.c
new file mode 100644
index 0000000000..f2e0d1c821
--- /dev/null
+++ b/ext/-test-/win32/console/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE m); Init_##n(m);}
+
+void
+Init_console(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE m = rb_define_module_under(mBug, "Win32");
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/win32/dln/depend b/ext/-test-/win32/dln/depend
new file mode 100644
index 0000000000..c3f14db4f7
--- /dev/null
+++ b/ext/-test-/win32/dln/depend
@@ -0,0 +1,9 @@
+$(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-/win32/dln/dlntest.c b/ext/-test-/win32/dln/dlntest.c
new file mode 100644
index 0000000000..3e6037ac07
--- /dev/null
+++ b/ext/-test-/win32/dln/dlntest.c
@@ -0,0 +1,17 @@
+#include <ruby.h>
+
+extern __declspec(dllimport) void dlntest_ordinal(void);
+
+static VALUE
+dln_dlntest(VALUE self)
+{
+    dlntest_ordinal();
+    return self;
+}
+
+void
+Init_dln(void)
+{
+    VALUE m = rb_define_module_under(rb_define_module("Bug"), "Win32");
+    rb_define_module_function(m, "dlntest", dln_dlntest, 0);
+}
diff --git a/ext/-test-/win32/dln/extconf.rb b/ext/-test-/win32/dln/extconf.rb
new file mode 100644
index 0000000000..d72b6a868c
--- /dev/null
+++ b/ext/-test-/win32/dln/extconf.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: false
+if $mingw or $mswin
+  dlntestlib = "dlntest.#{$LIBEXT}"
+  $LOCAL_LIBS << " #{dlntestlib}"
+  $srcs = ["dlntest.c"]
+  $objs = ["dlntest.o"]
+  testdll = "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"
+    if $mingw
+      m << "\n"
+      m << "dlntest.dll: DEFFILE := $(srcdir)/libdlntest.def\n"
+      m << "dlntest.dll: DLDFLAGS += -Wl,--out-implib,$(DLNTESTLIB)\n"
+    end
+    m
+  end
+  m = File.read("Makefile")
+  m.sub!(/(.*)\$\(DLNTEST_LDSHARED\)$/) do
+    pre = $1
+    link_so = LINK_SO.gsub(/^/) {pre}
+    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))
+end
diff --git a/ext/-test-/win32/dln/libdlntest.c b/ext/-test-/win32/dln/libdlntest.c
new file mode 100644
index 0000000000..5923b732c8
--- /dev/null
+++ b/ext/-test-/win32/dln/libdlntest.c
@@ -0,0 +1,4 @@
+void
+dlntest_ordinal(void)
+{
+}
diff --git a/ext/-test-/win32/dln/libdlntest.def b/ext/-test-/win32/dln/libdlntest.def
new file mode 100644
index 0000000000..85bc9c7a55
--- /dev/null
+++ b/ext/-test-/win32/dln/libdlntest.def
@@ -0,0 +1,2 @@
+EXPORTS
+dlntest_ordinal @1 NONAME
diff --git a/ext/-test-/win32/fd_setsize/depend b/ext/-test-/win32/fd_setsize/depend
new file mode 100644
index 0000000000..7d40e8d572
--- /dev/null
+++ b/ext/-test-/win32/fd_setsize/depend
@@ -0,0 +1 @@
+fd_setsize.o: $(ruby_headers) $(hdrdir)/ruby/win32.h
diff --git a/ext/-test-/win32/fd_setsize/extconf.rb b/ext/-test-/win32/fd_setsize/extconf.rb
new file mode 100644
index 0000000000..caa4b85a1b
--- /dev/null
+++ b/ext/-test-/win32/fd_setsize/extconf.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: false
+if $mingw or $mswin
+  create_makefile("-test-/win32/fd_setsize")
+end
diff --git a/ext/-test-/win32/fd_setsize/fd_setsize.c b/ext/-test-/win32/fd_setsize/fd_setsize.c
new file mode 100644
index 0000000000..8da8b1eaa0
--- /dev/null
+++ b/ext/-test-/win32/fd_setsize/fd_setsize.c
@@ -0,0 +1,55 @@
+#undef FD_SETSIZE
+/* redefine smaller size then default 64 */
+#define FD_SETSIZE 32
+#include <ruby.h>
+
+static VALUE
+test_select(VALUE self)
+{
+    int sd = socket(AF_INET, SOCK_DGRAM, 0);
+    struct timeval zero;
+    fd_set read;
+    fd_set write;
+    fd_set error;
+
+    zero.tv_sec = 0;
+    zero.tv_usec = 0;
+
+    FD_ZERO(&read);
+    FD_ZERO(&write);
+    FD_ZERO(&error);
+
+    FD_SET(sd, &read);
+    FD_SET(sd, &write);
+    FD_SET(sd, &error);
+
+    select(sd+1, &read, &write, &error, &zero);
+
+    return Qtrue;
+}
+
+static VALUE
+test_fdset(VALUE self)
+{
+    int i;
+    fd_set set;
+
+    FD_ZERO(&set);
+
+    for (i = 0; i < FD_SETSIZE * 2; i++) {
+	int sd = socket(AF_INET, SOCK_DGRAM, 0);
+	FD_SET(sd, &set);
+	if (set.fd_count > FD_SETSIZE) {
+	    return Qfalse;
+	}
+    }
+    return Qtrue;
+}
+
+void
+Init_fd_setsize(void)
+{
+    VALUE m = rb_define_module_under(rb_define_module("Bug"), "Win32");
+    rb_define_module_function(m, "test_select", test_select, 0);
+    rb_define_module_function(m, "test_fdset", test_fdset, 0);
+}
diff --git a/ext/.document b/ext/.document
index c51b8a7b63..6a491576a1 100644
--- a/ext/.document
+++ b/ext/.document
@@ -2,8 +2,8 @@
 
 bigdecimal/bigdecimal.c
 bigdecimal/lib
+continuation/continuation.c
 coverage/coverage.c
-curses/curses.c
 date/date_core.c
 dbm/dbm.c
 digest/bubblebabble/bubblebabble.c
@@ -13,44 +13,42 @@ digest/md5/md5init.c
 digest/rmd160/rmd160init.c
 digest/sha1/sha1init.c
 digest/sha2/sha2init.c
-dl/cfunc.c
-dl/cptr.c
-dl/dl.c
-dl/handle.c
-dl/lib
-dl/win32/lib
 etc/etc.c
 fcntl/fcntl.c
+fiber/fiber.c
 fiddle/closure.c
 fiddle/conversions.c
 fiddle/fiddle.c
 fiddle/function.c
+fiddle/pointer.c
+fiddle/handle.c
 fiddle/lib
 gdbm/gdbm.c
-iconv/iconv.c
 io/console/console.c
 io/nonblock/nonblock.c
-io/wait/lib
 io/wait/wait.c
-json/ext/generator/generator.c
-json/ext/parser/parser.c
+json/generator/generator.c
 json/lib
+json/parser/parser.c
 nkf/lib
 nkf/nkf.c
 objspace/objspace.c
+objspace/objspace_dump.c
+objspace/object_tracing.c
 openssl/lib
 openssl/ossl.c
 openssl/ossl_asn1.c
+openssl/ossl_bio.c
 openssl/ossl_bn.c
 openssl/ossl_cipher.c
 openssl/ossl_config.c
 openssl/ossl_digest.c
 openssl/ossl_engine.c
 openssl/ossl_hmac.c
+openssl/ossl_kdf.c
 openssl/ossl_ns_spki.c
 openssl/ossl_ocsp.c
 openssl/ossl_pkcs12.c
-openssl/ossl_pkcs5.c
 openssl/ossl_pkcs7.c
 openssl/ossl_pkey.c
 openssl/ossl_pkey_dh.c
@@ -71,22 +69,23 @@ openssl/ossl_x509revoked.c
 openssl/ossl_x509store.c
 pathname/lib
 pathname/pathname.c
-psych/emitter.c
 psych/lib
-psych/parser.c
 psych/psych.c
-psych/to_ruby.c
-psych/yaml_tree.c
+psych/psych_emitter.c
+psych/psych_parser.c
+psych/psych_to_ruby.c
+psych/psych_yaml_tree.c
 pty/lib
 pty/pty.c
+racc/cparse/cparse.c
 readline/readline.c
 ripper/lib
-ripper/ripper.c
 sdbm/init.c
 socket
 stringio/stringio.c
 strscan/strscan.c
 syslog/syslog.c
+syslog/lib
 win32ole/lib
-win32ole/win32ole.c
+win32ole/*.c
 zlib/zlib.c
diff --git a/ext/Setup b/ext/Setup
index b0f29b9f7b..ac79c86f84 100644
--- a/ext/Setup
+++ b/ext/Setup
@@ -1,32 +1,43 @@
 #option nodynamic
 
-#Win32API
 #bigdecimal
-#curses
+#cgi/escape
+#continuation
+#coverage
+#date
 #dbm
+#digest/bubblebabble
 #digest
 #digest/md5
 #digest/rmd160
 #digest/sha1
 #digest/sha2
-#dl
 #etc
 #fcntl
+#fiber
+#fiddle
 #gdbm
-#iconv
+#io/console
+#io/nonblock
 #io/wait
+#json
+#json/generator
+#json/parser
 #nkf
+#objspace
 #openssl
+#pathname
+#psych
 #pty
 #racc/cparse
+#rbconfig/sizeof
 #readline
 #ripper
 #sdbm
 #socket
 #stringio
 #strscan
-#syck
 #syslog
-#tk
+#win32
 #win32ole
 #zlib
diff --git a/ext/Setup.atheos b/ext/Setup.atheos
index 6e0b8ae5a6..90a7d01348 100644
--- a/ext/Setup.atheos
+++ b/ext/Setup.atheos
@@ -2,19 +2,17 @@ option nodynamic
 
 #Win32API
 bigdecimal
-curses
+cgi/escape
 dbm
 digest
 digest/md5
 digest/rmd160
 digest/sha1
 digest/sha2
-dl
 enumerator
 etc
 fcntl
 gdbm
-iconv
 io/wait
 nkf
 #openssl
@@ -26,8 +24,6 @@ sdbm
 socket
 stringio
 strscan
-syck
 syslog
-#tk
 #win32ole
 zlib
diff --git a/ext/Setup.emx b/ext/Setup.emx
deleted file mode 100644
index fade917e92..0000000000
--- a/ext/Setup.emx
+++ /dev/null
@@ -1,33 +0,0 @@
-option nodynamic
-
-#Win32API
-bigdecimal
-curses
-#dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-#dl
-enumerator
-etc
-fcntl
-#gdbm
-#iconv
-#io/wait
-nkf
-#openssl
-#pty
-racc/cparse
-#readline
-#ripper
-#sdbm
-socket
-stringio
-strscan
-#syck
-#syslog
-#tk
-#win32ole
-#zlib
diff --git a/ext/Setup.nt b/ext/Setup.nt
index c8574ba70a..fb5989b87f 100644
--- a/ext/Setup.nt
+++ b/ext/Setup.nt
@@ -1,20 +1,19 @@
+#option platform cygwin|mingw|mswin
 #option nodynamic
 
 Win32API
 bigdecimal
-#curses
+cgi/escape
 #dbm
 digest
 digest/md5
 digest/rmd160
 digest/sha1
 digest/sha2
-dl
 enumerator
 etc
 fcntl
 #gdbm
-#iconv
 #io/wait
 nkf
 #openssl
@@ -26,8 +25,6 @@ sdbm
 socket
 stringio
 strscan
-syck
 #syslog
-#tk
 win32ole
 #zlib
diff --git a/ext/bigdecimal/README b/ext/bigdecimal/README
deleted file mode 100644
index ae65b014cf..0000000000
--- a/ext/bigdecimal/README
+++ /dev/null
@@ -1,60 +0,0 @@
-
-  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 author.  Here is the
-author's latest mail address:
-
-  shigeo@tinyforest.gr.jp
-
--------------------------------------------------------
-created at: Thu Dec 22 1999
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index a02bcc98aa..7ac883730d 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -4,13 +4,6 @@
  *
  * 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 */
@@ -18,6 +11,7 @@
 # define BIGDECIMAL_ENABLE_VPRINT 1
 #endif
 #include "bigdecimal.h"
+#include "ruby/util.h"
 
 #ifndef BIGDECIMAL_DEBUG
 # define NDEBUG
@@ -38,6 +32,16 @@
 
 /* #define ENABLE_NUMERIC_STRING */
 
+#define MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, min, max) ( \
+    (a) == 0 ? 0 : \
+    (a) == -1 ? (b) < -(max) : \
+    (a) > 0 ? \
+      ((b) > 0 ? (max) / (a) < (b) : (min) / (a) > (b)) : \
+      ((b) > 0 ? (min) / (a) < (b) : (max) / (a) > (b)))
+#define SIGNED_VALUE_MAX INTPTR_MAX
+#define SIGNED_VALUE_MIN INTPTR_MIN
+#define MUL_OVERFLOW_SIGNED_VALUE_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, SIGNED_VALUE_MIN, SIGNED_VALUE_MAX)
+
 VALUE rb_cBigDecimal;
 VALUE rb_mBigMath;
 
@@ -58,12 +62,13 @@ 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 vStack[n];int iStack=0
-#define PUSH(x)  vStack[iStack++] = (unsigned long)(x);
-#define SAVE(p)  PUSH(p->obj);
-#define GUARD_OBJ(p,y) {p=y;SAVE(p);}
+#define ENTER(n) volatile VALUE RB_UNUSED_VAR(vStack[n]);int iStack=0
+#define PUSH(x)  (vStack[iStack++] = (VALUE)(x))
+#define SAVE(p)  PUSH((p)->obj)
+#define GUARD_OBJ(p,y) ((p)=(y), SAVE(p))
 
 #define BASE_FIG  RMPD_COMPONENT_FIGURES
 #define BASE      RMPD_BASE
@@ -75,63 +80,73 @@ static ID id_eq;
 #define DBLE_FIG (DBL_DIG+1)    /* figure of double */
 #endif
 
-#ifndef RBIGNUM_ZERO_P
-# define RBIGNUM_ZERO_P(x) (RBIGNUM_LEN(x) == 0 || \
-			    (RBIGNUM_DIGITS(x)[0] == 0 && \
-			     (RBIGNUM_LEN(x) == 1 || bigzero_p(x))))
+#ifndef RRATIONAL_ZERO_P
+# define RRATIONAL_ZERO_P(x) (FIXNUM_P(rb_rational_num(x)) && \
+			      FIX2LONG(rb_rational_num(x)) == 0)
 #endif
 
-static inline int
-bigzero_p(VALUE x)
-{
-    long i;
-    BDIGIT *ds = RBIGNUM_DIGITS(x);
+#ifndef RRATIONAL_NEGATIVE_P
+# define RRATIONAL_NEGATIVE_P(x) RTEST(rb_funcall((x), '<', 1, INT2FIX(0)))
+#endif
 
-    for (i = RBIGNUM_LEN(x) - 1; 0 <= i; i--) {
-	if (ds[i]) return 0;
-    }
-    return 1;
-}
+#ifndef DECIMAL_SIZE_OF_BITS
+#define DECIMAL_SIZE_OF_BITS(n) (((n) * 3010 + 9998) / 9999)
+/* an approximation of ceil(n * log10(2)), upto 65536 at least */
+#endif
 
-#ifndef RRATIONAL_ZERO_P
-# define RRATIONAL_ZERO_P(x) (FIXNUM_P(RRATIONAL(x)->num) && \
-			      FIX2LONG(RRATIONAL(x)->num) == 0)
+#ifdef PRIsVALUE
+# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
+# define RB_OBJ_STRING(obj) (obj)
+#else
+# define PRIsVALUE "s"
+# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
+# define RB_OBJ_STRING(obj) StringValueCStr(obj)
 #endif
 
-#ifndef RRATIONAL_NEGATIVE_P
-# define RRATIONAL_NEGATIVE_P(x) RTEST(rb_funcall((x), '<', 1, INT2FIX(0)))
+#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"), 0);
+#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"), 0);
+#endif
+}
+#endif
+
+#define BIGDECIMAL_POSITIVE_P(bd) ((bd)->sign > 0)
+#define BIGDECIMAL_NEGATIVE_P(bd) ((bd)->sign < 0)
+
 /*
  * ================== Ruby Interface part ==========================
  */
 #define DoSomeOne(x,y,f) rb_num_coerce_bin(x,y,f)
 
 /*
- * Returns the BigDecimal version number.
- *
- * Ruby 1.8.0 returns 1.0.0.
- * Ruby 1.8.1 thru 1.8.3 return 1.0.1.
- */
-static VALUE
-BigDecimal_version(VALUE self)
-{
-    /*
-     * 1.0.0: Ruby 1.8.0
-     * 1.0.1: Ruby 1.8.1
-     * 1.1.0: Ruby 1.9.3
-    */
-    return rb_str_new2("1.1.0");
-}
-
-/*
  *   VP routines used in BigDecimal part
  */
 static unsigned short VpGetException(void);
 static void  VpSetException(unsigned short f);
 static void  VpInternalRound(Real *c, size_t ixDigit, BDIGIT vPrev, BDIGIT v);
 static int   VpLimitRound(Real *c, size_t ixDigit);
-static Real *VpDup(Real const* const x);
+static Real *VpCopy(Real *pv, Real const* const x);
+
+#ifdef BIGDECIMAL_ENABLE_VPRINT
+static int VPrint(FILE *fp,const char *cntl_chr,Real *a);
+#endif
 
 /*
  *  **** BigDecimal part ****
@@ -147,12 +162,15 @@ static size_t
 BigDecimal_memsize(const void *ptr)
 {
     const Real *pv = ptr;
-    return pv ? (sizeof(*pv) + pv->MaxPrec * sizeof(BDIGIT)) : 0;
+    return (sizeof(*pv) + pv->MaxPrec * sizeof(BDIGIT));
 }
 
 static const rb_data_type_t BigDecimal_data_type = {
     "BigDecimal",
-    {0, BigDecimal_delete, BigDecimal_memsize,},
+    { 0, BigDecimal_delete, BigDecimal_memsize, },
+#ifdef RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+#endif
 };
 
 static inline int
@@ -164,12 +182,14 @@ is_kind_of_BigDecimal(VALUE const v)
 static VALUE
 ToValue(Real *p)
 {
-    if(VpIsNaN(p)) {
-        VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",0);
-    } else if(VpIsPosInf(p)) {
-        VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
-    } else if(VpIsNegInf(p)) {
-        VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",0);
+    if (VpIsNaN(p)) {
+        VpException(VP_EXCEPTION_NaN, "Computation results to 'NaN'(Not a Number)", 0);
+    }
+    else if (VpIsPosInf(p)) {
+        VpException(VP_EXCEPTION_INFINITY, "Computation results to 'Infinity'", 0);
+    }
+    else if (VpIsNegInf(p)) {
+        VpException(VP_EXCEPTION_INFINITY, "Computation results to '-Infinity'", 0);
     }
     return p->obj;
 }
@@ -182,46 +202,57 @@ cannot_be_coerced_into_BigDecimal(VALUE exc_class, VALUE v)
     VALUE str;
 
     if (rb_special_const_p(v)) {
-	str = rb_str_cat2(rb_str_dup(rb_inspect(v)),
-			  " can't be coerced into BigDecimal");
+	str = rb_inspect(v);
     }
     else {
-	str = rb_str_cat2(rb_str_dup(rb_class_name(rb_obj_class(v))),
-			  " can't be coerced into BigDecimal");
+	str = rb_class_name(rb_obj_class(v));
     }
 
+    str = rb_str_cat2(rb_str_dup(str), " can't be coerced into BigDecimal");
     rb_exc_raise(rb_exc_new3(exc_class, str));
 }
 
-static VALUE BigDecimal_div2(int, VALUE*, VALUE);
+static inline VALUE BigDecimal_div2(VALUE, VALUE, VALUE);
 
 static Real*
 GetVpValueWithPrec(VALUE v, long prec, int must)
 {
+    ENTER(1);
     Real *pv;
-    VALUE num, bg, args[2];
+    VALUE num, bg;
     char szD[128];
     VALUE orig = Qundef;
+    double d;
 
 again:
-    switch(TYPE(v))
-    {
+    switch(TYPE(v)) {
       case T_FLOAT:
 	if (prec < 0) goto unable_to_coerce_without_prec;
-	if (prec > DBL_DIG+1)goto SomeOneMayDoIt;
-	v = rb_funcall(v, id_to_r, 0);
-	/* fall through */
+	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;
+	}
+	if (1/d < 0.0) {
+	    return VpCreateRbObject(prec, "-0");
+	}
+	return VpCreateRbObject(prec, "0");
+
       case T_RATIONAL:
 	if (prec < 0) goto unable_to_coerce_without_prec;
 
 	if (orig == Qundef ? (orig = v, 1) : orig != v) {
-	    num = RRATIONAL(v)->num;
+	    num = rb_rational_num(v);
 	    pv = GetVpValueWithPrec(num, -1, must);
 	    if (pv == NULL) goto SomeOneMayDoIt;
 
-	    args[0] = RRATIONAL(v)->den;
-	    args[1] = LONG2NUM(prec);
-	    v = BigDecimal_div2(2, args, ToValue(pv));
+	    v = BigDecimal_div2(ToValue(pv), rb_rational_den(v), LONG2NUM(prec));
 	    goto again;
 	}
 
@@ -244,13 +275,14 @@ again:
 
 #ifdef ENABLE_NUMERIC_STRING
       case T_STRING:
-	SafeStringValue(v);
-	return VpCreateRbObject(strlen(RSTRING_PTR(v)) + VpBaseFig() + 1,
+	StringValueCStr(v);
+	return VpCreateRbObject(RSTRING_LEN(v) + VpBaseFig() + 1,
 				RSTRING_PTR(v));
 #endif /* ENABLE_NUMERIC_STRING */
 
       case T_BIGNUM:
 	bg = rb_big2str(v, 10);
+	PUSH(bg);
 	return VpCreateRbObject(strlen(RSTRING_PTR(bg)) + VpBaseFig() + 1,
 				RSTRING_PTR(bg));
       default:
@@ -266,8 +298,8 @@ SomeOneMayDoIt:
 unable_to_coerce_without_prec:
     if (must) {
 	rb_raise(rb_eArgError,
-		 "%s can't be coerced into BigDecimal without a precision",
-		 rb_obj_classname(v));
+		 "%"PRIsVALUE" can't be coerced into BigDecimal without a precision",
+		 RB_OBJ_CLASSNAME(v));
     }
     return NULL;
 }
@@ -291,15 +323,18 @@ BigDecimal_double_fig(VALUE self)
     return INT2FIX(VpDblFig());
 }
 
-/* call-seq:
- * precs
+/*  call-seq:
+ *     big_decimal.precs  ->  array
  *
- * Returns an Array of two Integer values.
+ *  Returns an Array of two Integer values.
  *
- * 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.
+ *  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.
+ *
+ *     BigDecimal('5').precs #=> [9, 18]
  */
+
 static VALUE
 BigDecimal_prec(VALUE self)
 {
@@ -307,12 +342,20 @@ BigDecimal_prec(VALUE self)
     Real *p;
     VALUE obj;
 
-    GUARD_OBJ(p,GetVpValue(self,1));
+    GUARD_OBJ(p, GetVpValue(self, 1));
     obj = rb_assoc_new(INT2NUM(p->Prec*VpBaseFig()),
 		       INT2NUM(p->MaxPrec*VpBaseFig()));
     return obj;
 }
 
+/*
+ * call-seq: hash
+ *
+ * Creates a hash for this BigDecimal.
+ *
+ * Two BigDecimals with equal sign,
+ * fractional part and exponent have the same hash.
+ */
 static VALUE
 BigDecimal_hash(VALUE self)
 {
@@ -320,16 +363,28 @@ BigDecimal_hash(VALUE self)
     Real *p;
     st_index_t hash;
 
-    GUARD_OBJ(p,GetVpValue(self,1));
+    GUARD_OBJ(p, GetVpValue(self, 1));
     hash = (st_index_t)p->sign;
     /* hash!=2: the case for 0(1),NaN(0) or +-Infinity(3) is sign itself */
     if(hash == 2 || hash == (st_index_t)-2) {
 	hash ^= rb_memhash(p->frac, sizeof(BDIGIT)*p->Prec);
 	hash += p->exponent;
     }
-    return INT2FIX(hash);
+    return ST2FIX(hash);
 }
 
+/*
+ * call-seq: _dump
+ *
+ * Method used to provide marshalling support.
+ *
+ *      inf = BigDecimal('Infinity')
+ *        #=> Infinity
+ *      BigDecimal._load(inf._dump)
+ *        #=> Infinity
+ *
+ * See the Marshal module.
+ */
 static VALUE
 BigDecimal_dump(int argc, VALUE *argv, VALUE self)
 {
@@ -340,8 +395,8 @@ BigDecimal_dump(int argc, VALUE *argv, VALUE self)
     volatile VALUE dump;
 
     rb_scan_args(argc, argv, "01", &dummy);
-    GUARD_OBJ(vp,GetVpValue(self,1));
-    dump = rb_str_new(0,VpNumOfChars(vp,"E")+50);
+    GUARD_OBJ(vp,GetVpValue(self, 1));
+    dump = rb_str_new(0, VpNumOfChars(vp, "E")+50);
     psz = RSTRING_PTR(dump);
     sprintf(psz, "%"PRIuSIZE":", VpMaxPrec(vp)*VpBaseFig());
     VpToString(vp, psz+strlen(psz), 0, 0);
@@ -361,23 +416,73 @@ BigDecimal_load(VALUE self, VALUE str)
     unsigned char ch;
     unsigned long m=0;
 
-    SafeStringValue(str);
-    pch = (unsigned char *)RSTRING_PTR(str);
+    pch = (unsigned char *)StringValueCStr(str);
     /* First get max prec */
-    while((*pch)!=(unsigned char)'\0' && (ch=*pch++)!=(unsigned char)':') {
+    while((*pch) != (unsigned char)'\0' && (ch = *pch++) != (unsigned char)':') {
         if(!ISDIGIT(ch)) {
             rb_raise(rb_eTypeError, "load failed: invalid character in the marshaled string");
         }
         m = m*10 + (unsigned long)(ch-'0');
     }
-    if(m>VpBaseFig()) m -= VpBaseFig();
-    GUARD_OBJ(pv,VpNewRbClass(m,(char *)pch,self));
+    if (m > VpBaseFig()) m -= VpBaseFig();
+    GUARD_OBJ(pv, VpNewRbClass(m, (char *)pch, self));
     m /= VpBaseFig();
-    if(m && pv->MaxPrec>m) pv->MaxPrec = m+1;
+    if (m && pv->MaxPrec > m) {
+	pv->MaxPrec = m+1;
+    }
     return ToValue(pv);
 }
 
 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;
@@ -405,8 +510,7 @@ check_rounding_mode(VALUE const v)
 	break;
     }
 
-    Check_Type(v, T_FIXNUM);
-    sw = (unsigned short)FIX2UINT(v);
+    sw = NUM2USHORT(v);
     if (!VpIsRoundMode(sw)) {
 	rb_raise(rb_eArgError, "invalid rounding mode");
     }
@@ -434,10 +538,10 @@ check_rounding_mode(VALUE const v)
  * When computation continues, results are as follows:
  *
  * EXCEPTION_NaN:: NaN
- * EXCEPTION_INFINITY:: +infinity or -infinity
+ * EXCEPTION_INFINITY:: +Infinity or -Infinity
  * EXCEPTION_UNDERFLOW:: 0
- * EXCEPTION_OVERFLOW:: +infinity or -infinity
- * EXCEPTION_ZERODIVIDE:: +infinity or -infinity
+ * EXCEPTION_OVERFLOW:: +Infinity or -Infinity
+ * EXCEPTION_ZERODIVIDE:: +Infinity or -Infinity
  *
  * One value of the mode parameter controls the rounding of numeric values:
  * BigDecimal::ROUND_MODE. The values it can take are:
@@ -458,40 +562,38 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
     VALUE val;
     unsigned long f,fo;
 
-    if(rb_scan_args(argc,argv,"11",&which,&val)==1) val = Qnil;
-
-    Check_Type(which, T_FIXNUM);
-    f = (unsigned long)FIX2INT(which);
+    rb_scan_args(argc, argv, "11", &which, &val);
+    f = (unsigned long)NUM2INT(which);
 
-    if(f&VP_EXCEPTION_ALL) {
-        /* Exception mode setting */
-        fo = VpGetException();
-        if(val==Qnil) return INT2FIX(fo);
-        if(val!=Qfalse && val!=Qtrue) {
-            rb_raise(rb_eArgError, "second argument must be true or false");
-            return Qnil; /* Not reached */
-        }
-        if(f&VP_EXCEPTION_INFINITY) {
-            VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_INFINITY):
-                           (fo&(~VP_EXCEPTION_INFINITY))));
-        }
-        fo = VpGetException();
-        if(f&VP_EXCEPTION_NaN) {
-            VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_NaN):
-                           (fo&(~VP_EXCEPTION_NaN))));
-        }
-        fo = VpGetException();
-        if(f&VP_EXCEPTION_UNDERFLOW) {
-            VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_UNDERFLOW):
-                           (fo&(~VP_EXCEPTION_UNDERFLOW))));
-        }
-        fo = VpGetException();
-        if(f&VP_EXCEPTION_ZERODIVIDE) {
-            VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_ZERODIVIDE):
-                           (fo&(~VP_EXCEPTION_ZERODIVIDE))));
-        }
-        fo = VpGetException();
-        return INT2FIX(fo);
+    if (f & VP_EXCEPTION_ALL) {
+	/* Exception mode setting */
+	fo = VpGetException();
+	if (val == Qnil) return INT2FIX(fo);
+	if (val != Qfalse && val!=Qtrue) {
+	    rb_raise(rb_eArgError, "second argument must be true or false");
+	    return Qnil; /* Not reached */
+	}
+	if (f & VP_EXCEPTION_INFINITY) {
+	    VpSetException((unsigned short)((val == Qtrue) ? (fo | VP_EXCEPTION_INFINITY) :
+			(fo & (~VP_EXCEPTION_INFINITY))));
+	}
+	fo = VpGetException();
+	if (f & VP_EXCEPTION_NaN) {
+	    VpSetException((unsigned short)((val == Qtrue) ? (fo | VP_EXCEPTION_NaN) :
+			(fo & (~VP_EXCEPTION_NaN))));
+	}
+	fo = VpGetException();
+	if (f & VP_EXCEPTION_UNDERFLOW) {
+	    VpSetException((unsigned short)((val == Qtrue) ? (fo | VP_EXCEPTION_UNDERFLOW) :
+			(fo & (~VP_EXCEPTION_UNDERFLOW))));
+	}
+	fo = VpGetException();
+	if(f & VP_EXCEPTION_ZERODIVIDE) {
+	    VpSetException((unsigned short)((val == Qtrue) ? (fo | VP_EXCEPTION_ZERODIVIDE) :
+			(fo & (~VP_EXCEPTION_ZERODIVIDE))));
+	}
+	fo = VpGetException();
+	return INT2FIX(fo);
     }
     if (VP_ROUND_MODE == f) {
 	/* Rounding mode setting */
@@ -502,7 +604,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;
 }
 
@@ -513,28 +615,27 @@ GetAddSubPrec(Real *a, Real *b)
     size_t mx = a->Prec;
     SIGNED_VALUE d;
 
-    if(!VpIsDef(a) || !VpIsDef(b)) return (size_t)-1L;
-    if(mx < b->Prec) mx = b->Prec;
-    if(a->exponent!=b->exponent) {
-        mxs = mx;
-        d = a->exponent - b->exponent;
-        if (d < 0) d = -d;
-        mx = mx + (size_t)d;
-        if (mx<mxs) {
-            return VpException(VP_EXCEPTION_INFINITY,"Exponent overflow",0);
-        }
+    if (!VpIsDef(a) || !VpIsDef(b)) return (size_t)-1L;
+    if (mx < b->Prec) mx = b->Prec;
+    if (a->exponent != b->exponent) {
+	mxs = mx;
+	d = a->exponent - b->exponent;
+	if (d < 0) d = -d;
+	mx = mx + (size_t)d;
+	if (mx < mxs) {
+	    return VpException(VP_EXCEPTION_INFINITY, "Exponent overflow", 0);
+	}
     }
     return mx;
 }
 
 static SIGNED_VALUE
-GetPositiveInt(VALUE v)
+GetPrecisionInt(VALUE v)
 {
     SIGNED_VALUE n;
-    Check_Type(v, T_FIXNUM);
-    n = FIX2INT(v);
+    n = NUM2INT(v);
     if (n < 0) {
-        rb_raise(rb_eArgError, "argument must be positive");
+	rb_raise(rb_eArgError, "negative precision");
     }
     return n;
 }
@@ -542,27 +643,29 @@ GetPositiveInt(VALUE v)
 VP_EXPORT Real *
 VpNewRbClass(size_t mx, const char *str, VALUE klass)
 {
-    Real *pv = VpAlloc(mx,str);
-    pv->obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, pv);
+    VALUE obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, 0);
+    Real *pv = VpAlloc(mx, str, 1, 1);
+    RTYPEDDATA_DATA(obj) = pv;
+    pv->obj = obj;
+    RB_OBJ_FREEZE(obj);
     return pv;
 }
 
 VP_EXPORT Real *
 VpCreateRbObject(size_t mx, const char *str)
 {
-    Real *pv = VpAlloc(mx,str);
-    pv->obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, pv);
-    return pv;
+    return VpNewRbClass(mx, str, rb_cBigDecimal);
 }
 
+#define VpAllocReal(prec) (Real *)VpMemAlloc(offsetof(Real, frac) + (prec) * sizeof(BDIGIT))
+#define VpReallocReal(ptr, prec) (Real *)VpMemRealloc((ptr), offsetof(Real, frac) + (prec) * sizeof(BDIGIT))
+
 static Real *
-VpDup(Real const* const x)
+VpCopy(Real *pv, Real const* const x)
 {
-    Real *pv;
-
     assert(x != NULL);
 
-    pv = VpMemAlloc(sizeof(Real) + x->MaxPrec * sizeof(BDIGIT));
+    pv = VpReallocReal(pv, x->MaxPrec);
     pv->MaxPrec = x->MaxPrec;
     pv->Prec = x->Prec;
     pv->exponent = x->exponent;
@@ -570,60 +673,59 @@ VpDup(Real const* const x)
     pv->flag = x->flag;
     MEMCPY(pv->frac, x->frac, BDIGIT, pv->MaxPrec);
 
-    pv->obj = TypedData_Wrap_Struct(
-	rb_obj_class(x->obj), &BigDecimal_data_type, pv);
-
     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)
 {
-    Real *p = GetVpValue(self,1);
-    if(VpIsNaN(p))  return Qtrue;
+    Real *p = GetVpValue(self, 1);
+    if (VpIsNaN(p))  return Qtrue;
     return Qfalse;
 }
 
 /* Returns nil, -1, or +1 depending on whether the value is finite,
- * -infinity, or +infinity.
+ * -Infinity, or +Infinity.
  */
 static VALUE
 BigDecimal_IsInfinite(VALUE self)
 {
-    Real *p = GetVpValue(self,1);
-    if(VpIsPosInf(p)) return INT2FIX(1);
-    if(VpIsNegInf(p)) return INT2FIX(-1);
+    Real *p = GetVpValue(self, 1);
+    if (VpIsPosInf(p)) return INT2FIX(1);
+    if (VpIsNegInf(p)) return INT2FIX(-1);
     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)
 {
-    Real *p = GetVpValue(self,1);
-    if(VpIsNaN(p)) return Qfalse;
-    if(VpIsInf(p)) return Qfalse;
+    Real *p = GetVpValue(self, 1);
+    if (VpIsNaN(p)) return Qfalse;
+    if (VpIsInf(p)) return Qfalse;
     return Qtrue;
 }
 
 static void
 BigDecimal_check_num(Real *p)
 {
-    if(VpIsNaN(p)) {
-       VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",1);
-    } else if(VpIsPosInf(p)) {
-       VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",1);
-    } else if(VpIsNegInf(p)) {
-       VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",1);
+    if (VpIsNaN(p)) {
+	VpException(VP_EXCEPTION_NaN, "Computation results to 'NaN'(Not a Number)", 1);
+    }
+    else if (VpIsPosInf(p)) {
+	VpException(VP_EXCEPTION_INFINITY, "Computation results to 'Infinity'", 1);
+    }
+    else if (VpIsNegInf(p)) {
+	VpException(VP_EXCEPTION_INFINITY, "Computation results to '-Infinity'", 1);
     }
 }
 
 static VALUE BigDecimal_split(VALUE self);
 
-/* Returns the value as an integer (Fixnum or Bignum).
+/* Returns the value as an Integer.
  *
- * If the BigNumber is infinity or NaN, raises FloatDomainError.
+ * If the BigDecimal is infinity or NaN, raises FloatDomainError.
  */
 static VALUE
 BigDecimal_to_i(VALUE self)
@@ -632,23 +734,23 @@ BigDecimal_to_i(VALUE self)
     ssize_t e, nf;
     Real *p;
 
-    GUARD_OBJ(p,GetVpValue(self,1));
+    GUARD_OBJ(p, GetVpValue(self, 1));
     BigDecimal_check_num(p);
 
     e = VpExponent10(p);
-    if(e<=0) return INT2FIX(0);
+    if (e <= 0) return INT2FIX(0);
     nf = VpBaseFig();
-    if(e<=nf) {
-        return LONG2NUM((long)(VpGetSign(p)*(BDIGIT_DBL_SIGNED)p->frac[0]));
+    if (e <= nf) {
+        return LONG2NUM((long)(VpGetSign(p) * (BDIGIT_DBL_SIGNED)p->frac[0]));
     }
     else {
 	VALUE a = BigDecimal_split(self);
-	VALUE digits = RARRAY_PTR(a)[1];
+	VALUE digits = RARRAY_AREF(a, 1);
 	VALUE numerator = rb_funcall(digits, rb_intern("to_i"), 0);
 	VALUE ret;
 	ssize_t dpower = e - (ssize_t)RSTRING_LEN(digits);
 
-	if (VpGetSign(p) < 0) {
+	if (BIGDECIMAL_NEGATIVE_P(p)) {
 	    numerator = rb_funcall(numerator, '*', 1, INT2FIX(-1));
 	}
 	if (dpower < 0) {
@@ -656,12 +758,14 @@ BigDecimal_to_i(VALUE self)
 			      rb_funcall(INT2FIX(10), rb_intern("**"), 1,
 					 INT2FIX(-dpower)));
 	}
-	else
+	else {
 	    ret = rb_funcall(numerator, '*', 1,
 			     rb_funcall(INT2FIX(10), rb_intern("**"), 1,
 					INT2FIX(dpower)));
-	if (TYPE(ret) == T_FLOAT)
+	}
+	if (RB_TYPE_P(ret, T_FLOAT)) {
 	    rb_raise(rb_eFloatDomainError, "Infinity");
+	}
 	return ret;
     }
 }
@@ -688,28 +792,30 @@ BigDecimal_to_f(VALUE self)
     if (e < (SIGNED_VALUE)(DBL_MIN_10_EXP-BASE_FIG))
 	goto underflow;
 
-    str = rb_str_new(0, VpNumOfChars(p,"E"));
+    str = rb_str_new(0, VpNumOfChars(p, "E"));
     buf = RSTRING_PTR(str);
     VpToString(p, buf, 0, 0);
     errno = 0;
     d = strtod(buf, 0);
-    if (errno == ERANGE)
-	goto overflow;
+    if (errno == ERANGE) {
+	if (d == 0.0) goto underflow;
+	if (fabs(d) >= HUGE_VAL) goto overflow;
+    }
     return rb_float_new(d);
 
 overflow:
     VpException(VP_EXCEPTION_OVERFLOW, "BigDecimal to Float conversion", 0);
-    if (d > 0.0)
-	return rb_float_new(VpGetDoublePosInf());
-    else
+    if (BIGDECIMAL_NEGATIVE_P(p))
 	return rb_float_new(VpGetDoubleNegInf());
+    else
+	return rb_float_new(VpGetDoublePosInf());
 
 underflow:
     VpException(VP_EXCEPTION_UNDERFLOW, "BigDecimal to Float conversion", 0);
-    if (d > 0.0)
-	return rb_float_new(0.0);
-    else
+    if (BIGDECIMAL_NEGATIVE_P(p))
 	return rb_float_new(-0.0);
+    else
+	return rb_float_new(0.0);
 }
 
 
@@ -722,13 +828,13 @@ BigDecimal_to_r(VALUE self)
     ssize_t sign, power, denomi_power;
     VALUE a, digits, numerator;
 
-    p = GetVpValue(self,1);
+    p = GetVpValue(self, 1);
     BigDecimal_check_num(p);
 
     sign = VpGetSign(p);
     power = VpExponent10(p);
     a = BigDecimal_split(self);
-    digits = RARRAY_PTR(a)[1];
+    digits = RARRAY_AREF(a, 1);
     denomi_power = power - RSTRING_LEN(digits);
     numerator = rb_funcall(digits, rb_intern("to_i"), 0);
 
@@ -741,7 +847,7 @@ BigDecimal_to_r(VALUE self)
 				      INT2FIX(-denomi_power)));
     }
     else {
-        return rb_Rational1(rb_funcall(numerator, '*', 1,
+	return rb_Rational1(rb_funcall(numerator, '*', 1,
 				       rb_funcall(INT2FIX(10), rb_intern("**"), 1,
 						  INT2FIX(denomi_power))));
     }
@@ -755,8 +861,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("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.
@@ -768,11 +874,12 @@ BigDecimal_coerce(VALUE self, VALUE other)
     VALUE obj;
     Real *b;
 
-    if (TYPE(other) == T_FLOAT) {
-	obj = rb_assoc_new(other, BigDecimal_to_f(self));
+    if (RB_TYPE_P(other, T_FLOAT)) {
+	GUARD_OBJ(b, GetVpValueWithPrec(other, DBL_DIG+1, 1));
+	obj = rb_assoc_new(ToValue(b), self);
     }
     else {
-	if (TYPE(other) == T_RATIONAL) {
+	if (RB_TYPE_P(other, T_RATIONAL)) {
 	    Real* pv = DATA_PTR(self);
 	    GUARD_OBJ(b, GetVpValueWithPrec(other, pv->Prec*VpBaseFig(), 1));
 	}
@@ -785,13 +892,26 @@ BigDecimal_coerce(VALUE self, VALUE other)
     return obj;
 }
 
+/*
+ * call-seq:
+ *    +big_decimal  ->  big_decimal
+ *
+ * Return self.
+ *
+ *     +BigDecimal('5')  #=> 0.5e1
+ */
+
 static VALUE
 BigDecimal_uplus(VALUE self)
 {
     return self;
 }
 
- /* call-seq:
+ /*
+  * Document-method: BigDecimal#add
+  * Document-method: BigDecimal#+
+  *
+  * call-seq:
   * add(value, digits)
   *
   * Add the specified value.
@@ -800,7 +920,9 @@ BigDecimal_uplus(VALUE self)
   *   c = a.add(b,n)
   *   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.
+  * 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.
   */
 static VALUE
 BigDecimal_add(VALUE self, VALUE r)
@@ -808,37 +930,57 @@ BigDecimal_add(VALUE self, VALUE r)
     ENTER(5);
     Real *c, *a, *b;
     size_t mx;
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r,'+');
+
+    GUARD_OBJ(a, GetVpValue(self, 1));
+    if (RB_TYPE_P(r, T_FLOAT)) {
+	b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
+    }
+    else if (RB_TYPE_P(r, T_RATIONAL)) {
+	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
+    }
+    else {
+	b = GetVpValue(r, 0);
+    }
+
+    if (!b) return DoSomeOne(self,r,'+');
     SAVE(b);
-    if(VpIsNaN(b)) return b->obj;
-    if(VpIsNaN(a)) return a->obj;
-    mx = GetAddSubPrec(a,b);
+
+    if (VpIsNaN(b)) return b->obj;
+    if (VpIsNaN(a)) return a->obj;
+
+    mx = GetAddSubPrec(a, b);
     if (mx == (size_t)-1L) {
-        GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
-        VpAddSub(c, a, b, 1);
-    } else {
-        GUARD_OBJ(c,VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
-        if(!mx) {
-            VpSetInf(c,VpGetSign(a));
-        } else {
-            VpAddSub(c, a, b, 1);
-        }
+	GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
+	VpAddSub(c, a, b, 1);
+    }
+    else {
+	GUARD_OBJ(c, VpCreateRbObject(mx * (VpBaseFig() + 1), "0"));
+	if(!mx) {
+	    VpSetInf(c, VpGetSign(a));
+	}
+	else {
+	    VpAddSub(c, a, b, 1);
+	}
     }
     return ToValue(c);
 }
 
  /* call-seq:
-  * sub(value, digits)
+  * a - b   -> bigdecimal
   *
   * Subtract the specified value.
   *
   * e.g.
-  *   c = a.sub(b,n)
   *   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.
+  * The precision of the result value depends on the type of +b+.
+  *
+  * If +b+ is a Float, the precision of the result is Float::DIG+1.
+  *
+  * If +b+ is a BigDecimal, the precision of the result is +b+'s precision of
+  * internal representation from platform. So, it's return value is platform
+  * dependent.
+  *
   */
 static VALUE
 BigDecimal_sub(VALUE self, VALUE r)
@@ -847,25 +989,36 @@ BigDecimal_sub(VALUE self, VALUE r)
     Real *c, *a, *b;
     size_t mx;
 
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r,'-');
+    GUARD_OBJ(a, GetVpValue(self,1));
+    if (RB_TYPE_P(r, T_FLOAT)) {
+	b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
+    }
+    else if (RB_TYPE_P(r, T_RATIONAL)) {
+	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
+    }
+    else {
+	b = GetVpValue(r,0);
+    }
+
+    if (!b) return DoSomeOne(self,r,'-');
     SAVE(b);
 
-    if(VpIsNaN(b)) return b->obj;
-    if(VpIsNaN(a)) return a->obj;
+    if (VpIsNaN(b)) return b->obj;
+    if (VpIsNaN(a)) return a->obj;
 
     mx = GetAddSubPrec(a,b);
     if (mx == (size_t)-1L) {
-        GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
-        VpAddSub(c, a, b, -1);
-    } else {
-        GUARD_OBJ(c,VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
-        if(!mx) {
-            VpSetInf(c,VpGetSign(a));
-        } else {
-            VpAddSub(c, a, b, -1);
-        }
+	GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
+	VpAddSub(c, a, b, -1);
+    }
+    else {
+	GUARD_OBJ(c,VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
+	if (!mx) {
+	    VpSetInf(c,VpGetSign(a));
+	}
+	else {
+	    VpAddSub(c, a, b, -1);
+	}
     }
     return ToValue(c);
 }
@@ -876,7 +1029,7 @@ BigDecimalCmp(VALUE self, VALUE r,char op)
     ENTER(5);
     SIGNED_VALUE e;
     Real *a, *b=0;
-    GUARD_OBJ(a,GetVpValue(self,1));
+    GUARD_OBJ(a, GetVpValue(self, 1));
     switch (TYPE(r)) {
     case T_DATA:
 	if (!is_kind_of_BigDecimal(r)) break;
@@ -884,7 +1037,7 @@ BigDecimalCmp(VALUE self, VALUE r,char op)
     case T_FIXNUM:
 	/* fall through */
     case T_BIGNUM:
-	GUARD_OBJ(b, GetVpValue(r,0));
+	GUARD_OBJ(b, GetVpValue(r, 0));
 	break;
 
     case T_FLOAT:
@@ -936,23 +1089,23 @@ BigDecimalCmp(VALUE self, VALUE r,char op)
 	return   INT2FIX(e); /* any op */
 
     case '=':
-	if(e==0) return Qtrue;
+	if (e == 0) return Qtrue;
 	return Qfalse;
 
     case 'G':
-	if(e>=0) return Qtrue;
+	if (e >= 0) return Qtrue;
 	return Qfalse;
 
     case '>':
-	if(e> 0) return Qtrue;
+	if (e >  0) return Qtrue;
 	return Qfalse;
 
     case 'L':
-	if(e<=0) return Qtrue;
+	if (e <= 0) return Qtrue;
 	return Qfalse;
 
     case '<':
-	if(e< 0) return Qtrue;
+	if (e <  0) return Qtrue;
 	return Qfalse;
 
     default:
@@ -960,13 +1113,15 @@ BigDecimalCmp(VALUE self, VALUE r,char op)
     }
 
     rb_bug("Undefined operation in BigDecimalCmp()");
+
+    UNREACHABLE;
 }
 
 /* Returns True if the value is zero. */
 static VALUE
 BigDecimal_zero(VALUE self)
 {
-    Real *a = GetVpValue(self,1);
+    Real *a = GetVpValue(self, 1);
     return VpIsZero(a) ? Qtrue : Qfalse;
 }
 
@@ -974,7 +1129,7 @@ BigDecimal_zero(VALUE self)
 static VALUE
 BigDecimal_nonzero(VALUE self)
 {
-    Real *a = GetVpValue(self,1);
+    Real *a = GetVpValue(self, 1);
     return VpIsZero(a) ? Qnil : self;
 }
 
@@ -995,7 +1150,7 @@ BigDecimal_comp(VALUE self, VALUE r)
  *
  * Values may be coerced to perform the comparison:
  *
- * BigDecimal.new('1.0') == 1.0  -> true
+ *   BigDecimal('1.0') == 1.0  #=> true
  */
 static VALUE
 BigDecimal_eq(VALUE self, VALUE r)
@@ -1006,8 +1161,9 @@ BigDecimal_eq(VALUE self, VALUE r)
 /* call-seq:
  * a < b
  *
- * Returns true if a is less than b. Values may be coerced to perform the
- * comparison (see ==, coerce).
+ * Returns true if a is less than b.
+ *
+ * Values may be coerced to perform the comparison (see ==, BigDecimal#coerce).
  */
 static VALUE
 BigDecimal_lt(VALUE self, VALUE r)
@@ -1018,8 +1174,9 @@ BigDecimal_lt(VALUE self, VALUE r)
 /* call-seq:
  * a <= b
  *
- * Returns true if a is less than or equal to b. Values may be coerced to
- * perform the comparison (see ==, coerce).
+ * Returns true if a is less than or equal to b.
+ *
+ * Values may be coerced to perform the comparison (see ==, BigDecimal#coerce).
  */
 static VALUE
 BigDecimal_le(VALUE self, VALUE r)
@@ -1030,8 +1187,9 @@ BigDecimal_le(VALUE self, VALUE r)
 /* call-seq:
  * a > b
  *
- * Returns true if a is greater than b.  Values may be coerced to
- * perform the comparison (see ==, coerce).
+ * Returns true if a is greater than b.
+ *
+ * Values may be coerced to perform the comparison (see ==, BigDecimal#coerce).
  */
 static VALUE
 BigDecimal_gt(VALUE self, VALUE r)
@@ -1042,8 +1200,9 @@ BigDecimal_gt(VALUE self, VALUE r)
 /* call-seq:
  * a >= b
  *
- * Returns true if a is greater than or equal to b. Values may be coerced to
- * perform the comparison (see ==, coerce)
+ * Returns true if a is greater than or equal to b.
+ *
+ * Values may be coerced to perform the comparison (see ==, BigDecimal#coerce)
  */
 static VALUE
 BigDecimal_ge(VALUE self, VALUE r)
@@ -1051,19 +1210,30 @@ BigDecimal_ge(VALUE self, VALUE r)
     return BigDecimalCmp(self, r, 'G');
 }
 
+/*
+ *  call-seq:
+ *     -big_decimal  ->  big_decimal
+ *
+ *  Return the negation of self.
+ *
+ *    -BigDecimal('5')  #=> -0.5e1
+ */
+
 static VALUE
 BigDecimal_neg(VALUE self)
 {
     ENTER(5);
     Real *c, *a;
-    GUARD_OBJ(a,GetVpValue(self,1));
-    GUARD_OBJ(c,VpCreateRbObject(a->Prec *(VpBaseFig() + 1), "0"));
+    GUARD_OBJ(a, GetVpValue(self, 1));
+    GUARD_OBJ(c, VpCreateRbObject(a->Prec *(VpBaseFig() + 1), "0"));
     VpAsgn(c, a, -1);
     return ToValue(c);
 }
 
- /* call-seq:
-  * mult(value, digits)
+ /*
+  * Document-method: BigDecimal#mult
+  *
+  * call-seq: mult(value, digits)
   *
   * Multiply by the specified value.
   *
@@ -1071,7 +1241,9 @@ BigDecimal_neg(VALUE self)
   *   c = a.mult(b,n)
   *   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.
+  * 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.
   */
 static VALUE
 BigDecimal_mult(VALUE self, VALUE r)
@@ -1080,13 +1252,22 @@ BigDecimal_mult(VALUE self, VALUE r)
     Real *c, *a, *b;
     size_t mx;
 
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r,'*');
+    GUARD_OBJ(a, GetVpValue(self, 1));
+    if (RB_TYPE_P(r, T_FLOAT)) {
+	b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
+    }
+    else if (RB_TYPE_P(r, T_RATIONAL)) {
+	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
+    }
+    else {
+	b = GetVpValue(r,0);
+    }
+
+    if (!b) return DoSomeOne(self, r, '*');
     SAVE(b);
 
     mx = a->Prec + b->Prec;
-    GUARD_OBJ(c,VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
+    GUARD_OBJ(c, VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
     VpMult(c, a, b);
     return ToValue(c);
 }
@@ -1099,37 +1280,40 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
     Real *a, *b;
     size_t mx;
 
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r,'/');
+    GUARD_OBJ(a, GetVpValue(self, 1));
+    if (RB_TYPE_P(r, T_FLOAT)) {
+	b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
+    }
+    else if (RB_TYPE_P(r, T_RATIONAL)) {
+	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
+     }
+    else {
+	b = GetVpValue(r, 0);
+    }
+
+    if (!b) return DoSomeOne(self, r, '/');
     SAVE(b);
+
     *div = b;
     mx = a->Prec + vabs(a->exponent);
-    if(mx<b->Prec + vabs(b->exponent)) mx = b->Prec + vabs(b->exponent);
-    mx =(mx + 1) * VpBaseFig();
-    GUARD_OBJ((*c),VpCreateRbObject(mx, "#0"));
-    GUARD_OBJ((*res),VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
+    if (mx < b->Prec + vabs(b->exponent)) mx = b->Prec + vabs(b->exponent);
+    mx++; /* NOTE: An additional digit is needed for the compatibility to
+                   the version 1.2.1 and the former.  */
+    mx = (mx + 1) * VpBaseFig();
+    GUARD_OBJ((*c), VpCreateRbObject(mx, "#0"));
+    GUARD_OBJ((*res), VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
     VpDivd(*c, *res, a, b);
-    return (VALUE)0;
+    return Qnil;
 }
 
- /* call-seq:
-  * div(value, digits)
-  * quo(value)
-  *
-  * Divide by the specified value.
-  *
-  * e.g.
-  *   c = a.div(b,n)
-  *
-  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
-  *
-  * If digits is 0, the result is the same as the / operator. If not, the
-  * result is an integer BigDecimal, by analogy with Float#div.
-  *
-  * The alias quo is provided since div(value, 0) is the same as computing
-  * the quotient; see divmod.
-  */
+/* call-seq:
+ *   a / b       -> bigdecimal
+ *   quo(value)  -> bigdecimal
+ *
+ * Divide by the specified value.
+ *
+ * See BigDecimal#div.
+ */
 static VALUE
 BigDecimal_div(VALUE self, VALUE r)
 /* For c = self/r: with round operation */
@@ -1137,15 +1321,15 @@ BigDecimal_div(VALUE self, VALUE r)
     ENTER(5);
     Real *c=NULL, *res=NULL, *div = NULL;
     r = BigDecimal_divide(&c, &res, &div, self, r);
-    if(r!=(VALUE)0) return r; /* coerced by other */
-    SAVE(c);SAVE(res);SAVE(div);
+    if (!NIL_P(r)) return r; /* coerced by other */
+    SAVE(c); SAVE(res); SAVE(div);
     /* a/b = c + r/b */
     /* c xxxxx
        r 00000yyyyy  ==> (y/b)*BASE >= HALF_BASE
      */
     /* Round */
-    if(VpHasVal(div)) { /* frac[0] must be zero for NaN,INF,Zero */
-	VpInternalRound(c, 0, c->frac[c->Prec-1], (BDIGIT)(VpBaseVal()*(BDIGIT_DBL)res->frac[0]/div->frac[0]));
+    if (VpHasVal(div)) { /* frac[0] must be zero for NaN,INF,Zero */
+	VpInternalRound(c, 0, c->frac[c->Prec-1], (BDIGIT)(VpBaseVal() * (BDIGIT_DBL)res->frac[0] / div->frac[0]));
     }
     return ToValue(c);
 }
@@ -1162,64 +1346,73 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
     Real *a, *b;
     size_t mx;
 
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return Qfalse;
+    GUARD_OBJ(a, GetVpValue(self, 1));
+    if (RB_TYPE_P(r, T_FLOAT)) {
+	b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
+    }
+    else if (RB_TYPE_P(r, T_RATIONAL)) {
+	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
+    }
+    else {
+	b = GetVpValue(r, 0);
+    }
+
+    if (!b) return Qfalse;
     SAVE(b);
 
-    if(VpIsNaN(a) || VpIsNaN(b)) goto NaN;
-    if(VpIsInf(a) && VpIsInf(b)) goto NaN;
-    if(VpIsZero(b)) {
+    if (VpIsNaN(a) || VpIsNaN(b)) goto NaN;
+    if (VpIsInf(a) && VpIsInf(b)) goto NaN;
+    if (VpIsZero(b)) {
 	rb_raise(rb_eZeroDivError, "divided by 0");
     }
-    if(VpIsInf(a)) {
-       GUARD_OBJ(d,VpCreateRbObject(1, "0"));
-       VpSetInf(d, (SIGNED_VALUE)(VpGetSign(a) == VpGetSign(b) ? 1 : -1));
-       GUARD_OBJ(c,VpCreateRbObject(1, "NaN"));
-       *div = d;
-       *mod = c;
-       return Qtrue;
+    if (VpIsInf(a)) {
+	GUARD_OBJ(d, VpCreateRbObject(1, "0"));
+	VpSetInf(d, (SIGNED_VALUE)(VpGetSign(a) == VpGetSign(b) ? 1 : -1));
+	GUARD_OBJ(c, VpCreateRbObject(1, "NaN"));
+	*div = d;
+	*mod = c;
+	return Qtrue;
     }
-    if(VpIsInf(b)) {
-       GUARD_OBJ(d,VpCreateRbObject(1, "0"));
-       *div = d;
-       *mod = a;
-       return Qtrue;
+    if (VpIsInf(b)) {
+	GUARD_OBJ(d, VpCreateRbObject(1, "0"));
+	*div = d;
+	*mod = a;
+	return Qtrue;
     }
-    if(VpIsZero(a)) {
-       GUARD_OBJ(c,VpCreateRbObject(1, "0"));
-       GUARD_OBJ(d,VpCreateRbObject(1, "0"));
-       *div = d;
-       *mod = c;
-       return Qtrue;
+    if (VpIsZero(a)) {
+	GUARD_OBJ(c, VpCreateRbObject(1, "0"));
+	GUARD_OBJ(d, VpCreateRbObject(1, "0"));
+	*div = d;
+	*mod = c;
+	return Qtrue;
     }
 
     mx = a->Prec + vabs(a->exponent);
-    if(mx<b->Prec + vabs(b->exponent)) mx = b->Prec + vabs(b->exponent);
-    mx =(mx + 1) * VpBaseFig();
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
-    GUARD_OBJ(res,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
+    if (mx<b->Prec + vabs(b->exponent)) mx = b->Prec + vabs(b->exponent);
+    mx = (mx + 1) * VpBaseFig();
+    GUARD_OBJ(c, VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(res, VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
     VpDivd(c, res, a, b);
-    mx = c->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(d,VpCreateRbObject(mx, "0"));
-    VpActiveRound(d,c,VP_ROUND_DOWN,0);
-    VpMult(res,d,b);
-    VpAddSub(c,a,res,-1);
-    if(!VpIsZero(c) && (VpGetSign(a)*VpGetSign(b)<0)) {
-        VpAddSub(res,d,VpOne(),-1);
-	GUARD_OBJ(d,VpCreateRbObject(GetAddSubPrec(c, b)*(VpBaseFig() + 1), "0"));
-        VpAddSub(d  ,c,b,       1);
-        *div = res;
-        *mod = d;
+    mx = c->Prec * (VpBaseFig() + 1);
+    GUARD_OBJ(d, VpCreateRbObject(mx, "0"));
+    VpActiveRound(d, c, VP_ROUND_DOWN, 0);
+    VpMult(res, d, b);
+    VpAddSub(c, a, res, -1);
+    if (!VpIsZero(c) && (VpGetSign(a) * VpGetSign(b) < 0)) {
+	VpAddSub(res, d, VpOne(), -1);
+	GUARD_OBJ(d, VpCreateRbObject(GetAddSubPrec(c, b)*(VpBaseFig() + 1), "0"));
+	VpAddSub(d, c, b, 1);
+	*div = res;
+	*mod = d;
     } else {
-        *div = d;
-        *mod = c;
+	*div = d;
+	*mod = c;
     }
     return Qtrue;
 
 NaN:
-    GUARD_OBJ(c,VpCreateRbObject(1, "NaN"));
-    GUARD_OBJ(d,VpCreateRbObject(1, "NaN"));
+    GUARD_OBJ(c, VpCreateRbObject(1, "NaN"));
+    GUARD_OBJ(d, VpCreateRbObject(1, "NaN"));
     *div = d;
     *mod = c;
     return Qtrue;
@@ -1229,19 +1422,21 @@ NaN:
  * a % b
  * a.modulo(b)
  *
- * Returns the modulus from dividing by b. See divmod.
+ * Returns the modulus from dividing by b.
+ *
+ * See BigDecimal#divmod.
  */
 static VALUE
 BigDecimal_mod(VALUE self, VALUE r) /* %: a%b = a - (a.to_f/b).floor * b */
 {
     ENTER(3);
-    Real *div=NULL, *mod=NULL;
+    Real *div = NULL, *mod = NULL;
 
-    if(BigDecimal_DoDivmod(self,r,&div,&mod)) {
+    if (BigDecimal_DoDivmod(self, r, &div, &mod)) {
 	SAVE(div); SAVE(mod);
 	return ToValue(mod);
     }
-    return DoSomeOne(self,r,'%');
+    return DoSomeOne(self, r, '%');
 }
 
 static VALUE
@@ -1249,39 +1444,51 @@ BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
 {
     ENTER(10);
     size_t mx;
-    Real *a=NULL, *b=NULL, *c=NULL, *res=NULL, *d=NULL, *rr=NULL, *ff=NULL;
-    Real *f=NULL;
+    Real *a = NULL, *b = NULL, *c = NULL, *res = NULL, *d = NULL, *rr = NULL, *ff = NULL;
+    Real *f = NULL;
+
+    GUARD_OBJ(a, GetVpValue(self, 1));
+    if (RB_TYPE_P(r, T_FLOAT)) {
+	b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
+    }
+    else if (RB_TYPE_P(r, T_RATIONAL)) {
+	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
+    }
+    else {
+	b = GetVpValue(r, 0);
+    }
 
-    GUARD_OBJ(a,GetVpValue(self,1));
-    b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r,rb_intern("remainder"));
+    if (!b) return DoSomeOne(self, r, rb_intern("remainder"));
     SAVE(b);
 
-    mx  =(a->MaxPrec + b->MaxPrec) *VpBaseFig();
-    GUARD_OBJ(c  ,VpCreateRbObject(mx, "0"));
-    GUARD_OBJ(res,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
-    GUARD_OBJ(rr ,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
-    GUARD_OBJ(ff ,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
+    mx = (a->MaxPrec + b->MaxPrec) *VpBaseFig();
+    GUARD_OBJ(c,   VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(res, VpCreateRbObject((mx+1) * 2 + (VpBaseFig() + 1), "#0"));
+    GUARD_OBJ(rr,  VpCreateRbObject((mx+1) * 2 + (VpBaseFig() + 1), "#0"));
+    GUARD_OBJ(ff,  VpCreateRbObject((mx+1) * 2 + (VpBaseFig() + 1), "#0"));
 
     VpDivd(c, res, a, b);
 
     mx = c->Prec *(VpBaseFig() + 1);
 
-    GUARD_OBJ(d,VpCreateRbObject(mx, "0"));
-    GUARD_OBJ(f,VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(d, VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(f, VpCreateRbObject(mx, "0"));
 
-    VpActiveRound(d,c,VP_ROUND_DOWN,0); /* 0: round off */
+    VpActiveRound(d, c, VP_ROUND_DOWN, 0); /* 0: round off */
 
     VpFrac(f, c);
-    VpMult(rr,f,b);
-    VpAddSub(ff,res,rr,1);
+    VpMult(rr, f, b);
+    VpAddSub(ff, res, rr, 1);
 
     *dv = d;
     *rv = ff;
-    return (VALUE)0;
+    return Qnil;
 }
 
-/* Returns the remainder from dividing by the value.
+/* call-seq:
+ * remainder(value)
+ *
+ * Returns the remainder from dividing by the value.
  *
  * x.remainder(y) means x-y*(x/y).truncate
  */
@@ -1289,27 +1496,30 @@ static VALUE
 BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
 {
     VALUE  f;
-    Real  *d,*rv=0;
-    f = BigDecimal_divremain(self,r,&d,&rv);
-    if(f!=(VALUE)0) return f;
+    Real  *d, *rv = 0;
+    f = BigDecimal_divremain(self, r, &d, &rv);
+    if (!NIL_P(f)) return f;
     return ToValue(rv);
 }
 
-/* Divides by the specified value, and returns the quotient and modulus
+/* call-seq:
+ * divmod(value)
+ *
+ * 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("42")
+ *   b = BigDecimal("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.
@@ -1318,108 +1528,173 @@ static VALUE
 BigDecimal_divmod(VALUE self, VALUE r)
 {
     ENTER(5);
-    Real *div=NULL, *mod=NULL;
+    Real *div = NULL, *mod = NULL;
 
-    if(BigDecimal_DoDivmod(self,r,&div,&mod)) {
+    if (BigDecimal_DoDivmod(self, r, &div, &mod)) {
 	SAVE(div); SAVE(mod);
 	return rb_assoc_new(ToValue(div), ToValue(mod));
     }
     return DoSomeOne(self,r,rb_intern("divmod"));
 }
 
-static VALUE
-BigDecimal_div2(int argc, VALUE *argv, VALUE self)
+/*
+ * See BigDecimal#quo
+ */
+static inline VALUE
+BigDecimal_div2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(5);
-    VALUE b,n;
-    int na = rb_scan_args(argc,argv,"11",&b,&n);
-    if(na==1) { /* div in Float sense */
-       Real *div=NULL;
-       Real *mod;
-       if(BigDecimal_DoDivmod(self,b,&div,&mod)) {
-	  return BigDecimal_to_i(ToValue(div));
-       }
-       return DoSomeOne(self,b,rb_intern("div"));
-    } else {    /* div in BigDecimal sense */
-       SIGNED_VALUE ix = GetPositiveInt(n);
-       if (ix == 0) return BigDecimal_div(self, b);
-       else {
-          Real *res=NULL;
-          Real *av=NULL, *bv=NULL, *cv=NULL;
-          size_t mx = (ix+VpBaseFig()*2);
-          size_t pl = VpSetPrecLimit(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;
-          if(mx <= cv->MaxPrec) mx = cv->MaxPrec+1;
-          GUARD_OBJ(res,VpCreateRbObject((mx * 2  + 2)*VpBaseFig(), "#0"));
-          VpDivd(cv,res,av,bv);
-          VpSetPrecLimit(pl);
-          VpLeftRound(cv,VpGetRoundMode(),ix);
-          return ToValue(cv);
-       }
+    SIGNED_VALUE ix;
+
+    if (NIL_P(n)) { /* div in Float sense */
+        Real *div = NULL;
+        Real *mod;
+        if (BigDecimal_DoDivmod(self, b, &div, &mod)) {
+            return BigDecimal_to_i(ToValue(div));
+        }
+        return DoSomeOne(self, b, rb_intern("div"));
+    }
+
+    /* div in BigDecimal sense */
+    ix = GetPrecisionInt(n);
+    if (ix == 0) {
+        return BigDecimal_div(self, b);
     }
+    else {
+        Real *res = NULL;
+        Real *av = NULL, *bv = NULL, *cv = NULL;
+        size_t mx = ix + VpBaseFig()*2;
+        size_t pl = VpSetPrecLimit(0);
+
+        GUARD_OBJ(cv, VpCreateRbObject(mx + VpBaseFig(), "0"));
+        GUARD_OBJ(av, GetVpValue(self, 1));
+        GUARD_OBJ(bv, GetVpValue(b, 1));
+        mx = av->Prec + bv->Prec + 2;
+        if (mx <= cv->MaxPrec) mx = cv->MaxPrec + 1;
+        GUARD_OBJ(res, VpCreateRbObject((mx * 2  + 2)*VpBaseFig(), "#0"));
+        VpDivd(cv, res, av, bv);
+        VpSetPrecLimit(pl);
+        VpLeftRound(cv, VpGetRoundMode(), ix);
+        return ToValue(cv);
+    }
+}
+
+ /*
+  * Document-method: BigDecimal#div
+  *
+  * call-seq:
+  *   div(value, digits)  -> bigdecimal or integer
+  *
+  * Divide by the specified value.
+  *
+  * digits:: If specified and less than the number of significant digits of the
+  *          result, the result is rounded to that number of digits, according
+  *          to BigDecimal.mode.
+  *
+  *          If digits is 0, the result is the same as for the / operator
+  *          or #quo.
+  *
+  *          If digits is not specified, the result is an integer,
+  *          by analogy with Float#div; see also BigDecimal#divmod.
+  *
+  * Examples:
+  *
+  *   a = BigDecimal("4")
+  *   b = BigDecimal("3")
+  *
+  *   a.div(b, 3)  # => 0.133e1
+  *
+  *   a.div(b, 0)  # => 0.1333333333333333333e1
+  *   a / b        # => 0.1333333333333333333e1
+  *   a.quo(b)     # => 0.1333333333333333333e1
+  *
+  *   a.div(b)     # => 1
+  */
+static VALUE
+BigDecimal_div3(int argc, VALUE *argv, VALUE self)
+{
+    VALUE b,n;
+
+    rb_scan_args(argc, argv, "11", &b, &n);
+
+    return BigDecimal_div2(self, b, n);
 }
 
 static VALUE
 BigDecimal_add2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(2);
-    Real   *cv;
-    SIGNED_VALUE mx = GetPositiveInt(n);
+    Real *cv;
+    SIGNED_VALUE mx = GetPrecisionInt(n);
     if (mx == 0) return BigDecimal_add(self, b);
     else {
-       size_t pl = VpSetPrecLimit(0);
-       VALUE   c = BigDecimal_add(self,b);
-       VpSetPrecLimit(pl);
-       GUARD_OBJ(cv,GetVpValue(c,1));
-       VpLeftRound(cv,VpGetRoundMode(),mx);
-       return ToValue(cv);
+	size_t pl = VpSetPrecLimit(0);
+	VALUE   c = BigDecimal_add(self, b);
+	VpSetPrecLimit(pl);
+	GUARD_OBJ(cv, GetVpValue(c, 1));
+	VpLeftRound(cv, VpGetRoundMode(), mx);
+	return ToValue(cv);
     }
 }
 
+/* call-seq:
+ * sub(value, digits)  -> bigdecimal
+ *
+ * Subtract the specified value.
+ *
+ * e.g.
+ *   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.
+ *
+ */
 static VALUE
 BigDecimal_sub2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(2);
     Real *cv;
-    SIGNED_VALUE mx = GetPositiveInt(n);
+    SIGNED_VALUE mx = GetPrecisionInt(n);
     if (mx == 0) return BigDecimal_sub(self, b);
     else {
-       size_t pl = VpSetPrecLimit(0);
-       VALUE   c = BigDecimal_sub(self,b);
-       VpSetPrecLimit(pl);
-       GUARD_OBJ(cv,GetVpValue(c,1));
-       VpLeftRound(cv,VpGetRoundMode(),mx);
-       return ToValue(cv);
+	size_t pl = VpSetPrecLimit(0);
+	VALUE   c = BigDecimal_sub(self, b);
+	VpSetPrecLimit(pl);
+	GUARD_OBJ(cv, GetVpValue(c, 1));
+	VpLeftRound(cv, VpGetRoundMode(), mx);
+	return ToValue(cv);
     }
 }
 
+
 static VALUE
 BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(2);
     Real *cv;
-    SIGNED_VALUE mx = GetPositiveInt(n);
+    SIGNED_VALUE mx = GetPrecisionInt(n);
     if (mx == 0) return BigDecimal_mult(self, b);
     else {
-       size_t pl = VpSetPrecLimit(0);
-       VALUE   c = BigDecimal_mult(self,b);
-       VpSetPrecLimit(pl);
-       GUARD_OBJ(cv,GetVpValue(c,1));
-       VpLeftRound(cv,VpGetRoundMode(),mx);
-       return ToValue(cv);
+	size_t pl = VpSetPrecLimit(0);
+	VALUE   c = BigDecimal_mult(self, b);
+	VpSetPrecLimit(pl);
+	GUARD_OBJ(cv, GetVpValue(c, 1));
+	VpLeftRound(cv, VpGetRoundMode(), mx);
+	return ToValue(cv);
     }
 }
 
-/* Returns the absolute value.
+/*
+ *  call-seq:
+ *     big_decimal.abs  ->  big_decimal
  *
- * BigDecimal('5').abs -> 5
+ *  Returns the absolute value, as a BigDecimal.
  *
- * BigDecimal('-3').abs -> 3
+ *     BigDecimal('5').abs  #=> 0.5e1
+ *     BigDecimal('-3').abs #=> 0.3e1
  */
+
 static VALUE
 BigDecimal_abs(VALUE self)
 {
@@ -1427,9 +1702,9 @@ BigDecimal_abs(VALUE self)
     Real *c, *a;
     size_t mx;
 
-    GUARD_OBJ(a,GetVpValue(self,1));
+    GUARD_OBJ(a, GetVpValue(self, 1));
     mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(c, VpCreateRbObject(mx, "0"));
     VpAsgn(c, a, 1);
     VpChangeSign(c, 1);
     return ToValue(c);
@@ -1440,7 +1715,7 @@ BigDecimal_abs(VALUE self)
  *
  * Returns the square root of the value.
  *
- * If n is specified, returns at least that many significant digits.
+ * Result has at least n significant digits.
  */
 static VALUE
 BigDecimal_sqrt(VALUE self, VALUE nFig)
@@ -1449,17 +1724,17 @@ BigDecimal_sqrt(VALUE self, VALUE nFig)
     Real *c, *a;
     size_t mx, n;
 
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
+    GUARD_OBJ(a, GetVpValue(self, 1));
+    mx = a->Prec * (VpBaseFig() + 1);
 
-    n = GetPositiveInt(nFig) + VpDblFig() + 1;
-    if(mx <= n) mx = n;
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    n = GetPrecisionInt(nFig) + VpDblFig() + BASE_FIG;
+    if (mx <= n) mx = n;
+    GUARD_OBJ(c, VpCreateRbObject(mx, "0"));
     VpSqrt(c, a);
     return ToValue(c);
 }
 
-/* Return the integer part of the number.
+/* Return the integer part of the number, as a BigDecimal.
  */
 static VALUE
 BigDecimal_fix(VALUE self)
@@ -1468,21 +1743,25 @@ BigDecimal_fix(VALUE self)
     Real *c, *a;
     size_t mx;
 
-    GUARD_OBJ(a,GetVpValue(self,1));
+    GUARD_OBJ(a, GetVpValue(self, 1));
     mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
-    VpActiveRound(c,a,VP_ROUND_DOWN,0); /* 0: round off */
+    GUARD_OBJ(c, VpCreateRbObject(mx, "0"));
+    VpActiveRound(c, a, VP_ROUND_DOWN, 0); /* 0: round off */
     return ToValue(c);
 }
 
 /* call-seq:
  * round(n, mode)
  *
- * Round to the nearest 1 (by default), returning the result as a BigDecimal.
+ * Round to the nearest integer (by default), returning the result as a
+ * BigDecimal if n is specified, or as an Integer if it isn't.
  *
- * BigDecimal('3.14159').round -> 3
+ *	BigDecimal('3.14159').round #=> 3
+ *	BigDecimal('8.7').round #=> 9
+ *	BigDecimal('-9.9').round #=> -10
  *
- * BigDecimal('8.7').round -> 9
+ *	BigDecimal('3.14159').round(2).class.name #=> "BigDecimal"
+ *	BigDecimal('3.14159').round.class.name #=> "Integer"
  *
  * If n is specified and positive, the fractional part of the result has no
  * more than that many digits.
@@ -1490,9 +1769,8 @@ BigDecimal_fix(VALUE self)
  * If n is specified and negative, at least that many digits to the left of the
  * decimal point will be 0 in the result.
  *
- * BigDecimal('3.14159').round(3) -> 3.142
- *
- * BigDecimal('13345.234').round(-2) -> 13300.0
+ *	BigDecimal('3.14159').round(3) #=> 3.142
+ *	BigDecimal('13345.234').round(-2) #=> 13300.0
  *
  * The value of the optional mode argument can be used to determine how
  * rounding is performed; see BigDecimal.mode.
@@ -1510,26 +1788,36 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
     unsigned short sw = VpGetRoundMode();
 
     switch (rb_scan_args(argc, argv, "02", &vLoc, &vRound)) {
-    case 0:
-        iLoc = 0;
-        break;
-    case 1:
-        Check_Type(vLoc, T_FIXNUM);
-        iLoc = FIX2INT(vLoc);
-        break;
-    case 2:
-	Check_Type(vLoc, T_FIXNUM);
-	iLoc = FIX2INT(vLoc);
-	sw = check_rounding_mode(vRound);
+      case 0:
+	iLoc = 0;
+	break;
+      case 1:
+        if (RB_TYPE_P(vLoc, T_HASH)) {
+	    sw = check_rounding_mode_option(vLoc);
+	}
+	else {
+	    iLoc = NUM2INT(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);
+	}
+	break;
+      default:
 	break;
     }
 
     pl = VpSetPrecLimit(0);
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(a, GetVpValue(self, 1));
+    mx = a->Prec * (VpBaseFig() + 1);
+    GUARD_OBJ(c, VpCreateRbObject(mx, "0"));
     VpSetPrecLimit(pl);
-    VpActiveRound(c,a,sw,iLoc);
+    VpActiveRound(c, a, sw, iLoc);
     if (argc == 0) {
 	return BigDecimal_to_i(ToValue(c));
     }
@@ -1539,11 +1827,12 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
 /* call-seq:
  * truncate(n)
  *
- * Truncate to the nearest 1, returning the result as a BigDecimal.
+ * Truncate to the nearest integer (by default), returning the result as a
+ * BigDecimal.
  *
- * BigDecimal('3.14159').truncate -> 3
- *
- * BigDecimal('8.7').truncate -> 8
+ *	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.
@@ -1551,9 +1840,8 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
  * If n is specified and negative, at least that many digits to the left of the
  * decimal point will be 0 in the result.
  *
- * BigDecimal('3.14159').truncate(3) -> 3.141
- *
- * BigDecimal('13345.234').truncate(-2) -> 13300.0
+ *	BigDecimal('3.14159').truncate(3) #=> 3.141
+ *	BigDecimal('13345.234').truncate(-2) #=> 13300.0
  */
 static VALUE
 BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
@@ -1564,25 +1852,25 @@ BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
     VALUE vLoc;
     size_t mx, pl = VpSetPrecLimit(0);
 
-    if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
-        iLoc = 0;
-    } else {
-        Check_Type(vLoc, T_FIXNUM);
-        iLoc = FIX2INT(vLoc);
+    if (rb_scan_args(argc, argv, "01", &vLoc) == 0) {
+	iLoc = 0;
+    }
+    else {
+	iLoc = NUM2INT(vLoc);
     }
 
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(a, GetVpValue(self, 1));
+    mx = a->Prec * (VpBaseFig() + 1);
+    GUARD_OBJ(c, VpCreateRbObject(mx, "0"));
     VpSetPrecLimit(pl);
-    VpActiveRound(c,a,VP_ROUND_DOWN,iLoc); /* 0: truncate */
+    VpActiveRound(c, a, VP_ROUND_DOWN, iLoc); /* 0: truncate */
     if (argc == 0) {
 	return BigDecimal_to_i(ToValue(c));
     }
     return ToValue(c);
 }
 
-/* Return the fractional part of the number.
+/* Return the fractional part of the number, as a BigDecimal.
  */
 static VALUE
 BigDecimal_frac(VALUE self)
@@ -1591,9 +1879,9 @@ BigDecimal_frac(VALUE self)
     Real *c, *a;
     size_t mx;
 
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(a, GetVpValue(self, 1));
+    mx = a->Prec * (VpBaseFig() + 1);
+    GUARD_OBJ(c, VpCreateRbObject(mx, "0"));
     VpFrac(c, a);
     return ToValue(c);
 }
@@ -1603,9 +1891,8 @@ BigDecimal_frac(VALUE self)
  *
  * Return the largest integer less than or equal to the value, as a BigDecimal.
  *
- * BigDecimal('3.14159').floor -> 3
- *
- * BigDecimal('-9.1').floor -> -10
+ *	BigDecimal('3.14159').floor #=> 3
+ *	BigDecimal('-9.1').floor #=> -10
  *
  * If n is specified and positive, the fractional part of the result has no
  * more than that many digits.
@@ -1613,9 +1900,8 @@ BigDecimal_frac(VALUE self)
  * If n is specified and negative, at least that
  * many digits to the left of the decimal point will be 0 in the result.
  *
- * BigDecimal('3.14159').floor(3) -> 3.141
- *
- * BigDecimal('13345.234').floor(-2) -> 13300.0
+ *	BigDecimal('3.14159').floor(3) #=> 3.141
+ *	BigDecimal('13345.234').floor(-2) #=> 13300.0
  */
 static VALUE
 BigDecimal_floor(int argc, VALUE *argv, VALUE self)
@@ -1626,18 +1912,18 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
     VALUE vLoc;
     size_t mx, pl = VpSetPrecLimit(0);
 
-    if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
-        iLoc = 0;
-    } else {
-        Check_Type(vLoc, T_FIXNUM);
-        iLoc = FIX2INT(vLoc);
+    if (rb_scan_args(argc, argv, "01", &vLoc)==0) {
+	iLoc = 0;
+    }
+    else {
+	iLoc = NUM2INT(vLoc);
     }
 
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(a, GetVpValue(self, 1));
+    mx = a->Prec * (VpBaseFig() + 1);
+    GUARD_OBJ(c, VpCreateRbObject(mx, "0"));
     VpSetPrecLimit(pl);
-    VpActiveRound(c,a,VP_ROUND_FLOOR,iLoc);
+    VpActiveRound(c, a, VP_ROUND_FLOOR, iLoc);
 #ifdef BIGDECIMAL_DEBUG
     VPrint(stderr, "floor: c=%\n", c);
 #endif
@@ -1652,9 +1938,8 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
  *
  * Return the smallest integer greater than or equal to the value, as a BigDecimal.
  *
- * BigDecimal('3.14159').ceil -> 4
- *
- * BigDecimal('-9.1').ceil -> -9
+ *	BigDecimal('3.14159').ceil #=> 4
+ *	BigDecimal('-9.1').ceil #=> -9
  *
  * If n is specified and positive, the fractional part of the result has no
  * more than that many digits.
@@ -1662,9 +1947,8 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
  * If n is specified and negative, at least that
  * many digits to the left of the decimal point will be 0 in the result.
  *
- * BigDecimal('3.14159').ceil(3) -> 3.142
- *
- * BigDecimal('13345.234').ceil(-2) -> 13400.0
+ *	BigDecimal('3.14159').ceil(3) #=> 3.142
+ *	BigDecimal('13345.234').ceil(-2) #=> 13400.0
  */
 static VALUE
 BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
@@ -1675,18 +1959,17 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
     VALUE vLoc;
     size_t mx, pl = VpSetPrecLimit(0);
 
-    if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
-        iLoc = 0;
+    if (rb_scan_args(argc, argv, "01", &vLoc) == 0) {
+	iLoc = 0;
     } else {
-        Check_Type(vLoc, T_FIXNUM);
-        iLoc = FIX2INT(vLoc);
+	iLoc = NUM2INT(vLoc);
     }
 
-    GUARD_OBJ(a,GetVpValue(self,1));
-    mx = a->Prec *(VpBaseFig() + 1);
-    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(a, GetVpValue(self, 1));
+    mx = a->Prec * (VpBaseFig() + 1);
+    GUARD_OBJ(c, VpCreateRbObject(mx, "0"));
     VpSetPrecLimit(pl);
-    VpActiveRound(c,a,VP_ROUND_CEIL,iLoc);
+    VpActiveRound(c, a, VP_ROUND_CEIL, iLoc);
     if (argc == 0) {
 	return BigDecimal_to_i(ToValue(c));
     }
@@ -1717,63 +2000,81 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
  *
  * Examples:
  *
- * BigDecimal.new('-123.45678901234567890').to_s('5F') -> '-123.45678 90123 45678 9'
+ *   BigDecimal('-123.45678901234567890').to_s('5F')
+ *     #=> '-123.45678 90123 45678 9'
  *
- * BigDecimal.new('123.45678901234567890').to_s('+8F') -> '+123.45678901 23456789'
+ *   BigDecimal('123.45678901234567890').to_s('+8F')
+ *     #=> '+123.45678901 23456789'
  *
- * BigDecimal.new('123.45678901234567890').to_s(' F') -> ' 123.4567890123456789'
+ *   BigDecimal('123.45678901234567890').to_s(' F')
+ *     #=> ' 123.4567890123456789'
  */
 static VALUE
 BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
 {
     ENTER(5);
-    int   fmt=0;   /* 0:E format */
-    int   fPlus=0; /* =0:default,=1: set ' ' before digits ,set '+' before digits. */
+    int   fmt = 0;   /* 0: E format, 1: F format */
+    int   fPlus = 0; /* 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
     Real  *vp;
     volatile VALUE str;
     char  *psz;
     char   ch;
     size_t nc, mc = 0;
+    SIGNED_VALUE m;
     VALUE  f;
 
-    GUARD_OBJ(vp,GetVpValue(self,1));
+    GUARD_OBJ(vp, GetVpValue(self, 1));
 
-    if(rb_scan_args(argc,argv,"01",&f)==1) {
-        if(TYPE(f)==T_STRING) {
-            SafeStringValue(f);
-            psz = RSTRING_PTR(f);
-            if(*psz==' ') {
-                fPlus = 1; psz++;
-            } else if(*psz=='+') {
-                fPlus = 2; psz++;
-            }
-            while((ch=*psz++)!=0) {
-                if(ISSPACE(ch)) continue;
-                if(!ISDIGIT(ch)) {
-                    if(ch=='F' || ch=='f') fmt = 1; /* F format */
-                    break;
-                }
-                mc = mc * 10 + ch - '0';
-            }
-        }
+    if (rb_scan_args(argc, argv, "01", &f) == 1) {
+	if (RB_TYPE_P(f, T_STRING)) {
+	    psz = StringValueCStr(f);
+	    if (*psz == ' ') {
+		fPlus = 1;
+		psz++;
+	    }
+	    else if (*psz == '+') {
+		fPlus = 2;
+		psz++;
+	    }
+	    while ((ch = *psz++) != 0) {
+		if (ISSPACE(ch)) {
+		    continue;
+		}
+		if (!ISDIGIT(ch)) {
+		    if (ch == 'F' || ch == 'f') {
+			fmt = 1; /* F format */
+		    }
+		    break;
+		}
+		mc = mc*10 + ch - '0';
+	    }
+	}
 	else {
-            mc = (size_t)GetPositiveInt(f);
-        }
+	    m = NUM2INT(f);
+	    if (m <= 0) {
+		rb_raise(rb_eArgError, "argument must be positive");
+	    }
+	    mc = (size_t)m;
+	}
     }
-    if(fmt) {
-        nc = VpNumOfChars(vp,"F");
-    } else {
-        nc = VpNumOfChars(vp,"E");
+    if (fmt) {
+	nc = VpNumOfChars(vp, "F");
+    }
+    else {
+	nc = VpNumOfChars(vp, "E");
+    }
+    if (mc > 0) {
+	nc += (nc + mc - 1) / mc + 1;
     }
-    if(mc>0) nc += (nc + mc - 1) / mc + 1;
 
     str = rb_str_new(0, nc);
     psz = RSTRING_PTR(str);
 
-    if(fmt) {
-        VpToFString(vp, psz, mc, fPlus);
-    } else {
-        VpToString (vp, psz, mc, fPlus);
+    if (fmt) {
+	VpToFString(vp, psz, mc, fPlus);
+    }
+    else {
+	VpToString (vp, psz, mc, fPlus);
     }
     rb_str_resize(str, strlen(psz));
     return str;
@@ -1812,21 +2113,21 @@ BigDecimal_split(VALUE self)
     ssize_t e, s;
     char *psz1;
 
-    GUARD_OBJ(vp,GetVpValue(self,1));
-    str = rb_str_new(0, VpNumOfChars(vp,"E"));
+    GUARD_OBJ(vp, GetVpValue(self, 1));
+    str = rb_str_new(0, VpNumOfChars(vp, "E"));
     psz1 = RSTRING_PTR(str);
-    VpSzMantissa(vp,psz1);
+    VpSzMantissa(vp, psz1);
     s = 1;
-    if(psz1[0]=='-') {
-	size_t len = strlen(psz1+1);
+    if(psz1[0] == '-') {
+	size_t len = strlen(psz1 + 1);
 
-	memmove(psz1, psz1+1, len);
+	memmove(psz1, psz1 + 1, len);
 	psz1[len] = '\0';
         s = -1;
     }
-    if(psz1[0]=='N') s=0; /* NaN */
+    if (psz1[0] == 'N') s = 0; /* NaN */
     e = VpExponent10(vp);
-    obj  = rb_ary_new2(4);
+    obj = rb_ary_new2(4);
     rb_ary_push(obj, INT2FIX(s));
     rb_ary_push(obj, str);
     rb_str_resize(str, strlen(psz1));
@@ -1847,38 +2148,26 @@ BigDecimal_exponent(VALUE self)
     return INT2NUM(e);
 }
 
-/* Returns debugging information about the value as a string of comma-separated
- * values in angle brackets with a leading #:
+/* Returns a string representation of self.
  *
- * 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
- * maximum number of significant digits, respectively.
+ *   BigDecimal("1234.5678").inspect
+ *     #=> "0.12345678e4"
  */
 static VALUE
 BigDecimal_inspect(VALUE self)
 {
     ENTER(5);
     Real *vp;
-    volatile VALUE obj;
+    volatile VALUE str;
     size_t nc;
-    char *psz, *tmp;
-
-    GUARD_OBJ(vp,GetVpValue(self,1));
-    nc = VpNumOfChars(vp,"E");
-    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;
+
+    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;
 }
 
 static VALUE BigMath_s_exp(VALUE, VALUE, VALUE);
@@ -1890,7 +2179,7 @@ static VALUE BigMath_s_log(VALUE, VALUE, VALUE);
 inline static int
 is_integer(VALUE x)
 {
-    return (TYPE(x) == T_FIXNUM || TYPE(x) == T_BIGNUM);
+    return (RB_TYPE_P(x, T_FIXNUM) || RB_TYPE_P(x, T_BIGNUM));
 }
 
 inline static int
@@ -1899,10 +2188,10 @@ is_negative(VALUE x)
     if (FIXNUM_P(x)) {
 	return FIX2LONG(x) < 0;
     }
-    else if (TYPE(x) == T_BIGNUM) {
-	return RBIGNUM_NEGATIVE_P(x);
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return FIX2INT(rb_big_cmp(x, INT2FIX(0))) < 0;
     }
-    else if (TYPE(x) == T_FLOAT) {
+    else if (RB_TYPE_P(x, T_FLOAT)) {
 	return RFLOAT_VALUE(x) < 0.0;
     }
     return RTEST(rb_funcall(x, '<', 1, INT2FIX(0)));
@@ -1923,7 +2212,7 @@ is_zero(VALUE x)
 	return Qfalse;
 
       case T_RATIONAL:
-	num = RRATIONAL(x)->num;
+	num = rb_rational_num(x);
 	return FIXNUM_P(num) && FIX2LONG(num) == 0;
 
       default:
@@ -1946,8 +2235,8 @@ is_one(VALUE x)
 	return Qfalse;
 
       case T_RATIONAL:
-	num = RRATIONAL(x)->num;
-	den = RRATIONAL(x)->den;
+	num = rb_rational_num(x);
+	den = rb_rational_den(x);
 	return FIXNUM_P(den) && FIX2LONG(den) == 1 &&
 	       FIXNUM_P(num) && FIX2LONG(num) == 1;
 
@@ -1966,7 +2255,11 @@ is_even(VALUE x)
 	return (FIX2LONG(x) % 2) == 0;
 
       case T_BIGNUM:
-	return (RBIGNUM_DIGITS(x)[0] % 2) == 0;
+        {
+            unsigned long l;
+            rb_big_pack(x, &l, 1);
+            return l % 2 == 0;
+        }
 
       default:
 	break;
@@ -1978,7 +2271,8 @@ is_even(VALUE x)
 static VALUE
 rmpd_power_by_big_decimal(Real const* x, Real const* exp, ssize_t const n)
 {
-    VALUE log_x, multiplied, y, vn;
+    VALUE log_x, multiplied, y;
+    volatile VALUE obj = exp->obj;
 
     if (VpIsZero(exp)) {
 	return ToValue(VpCreateRbObject(n, "1"));
@@ -1987,6 +2281,7 @@ rmpd_power_by_big_decimal(Real const* x, Real const* exp, ssize_t const n)
     log_x = BigMath_log(x->obj, SSIZET2NUM(n+1));
     multiplied = BigDecimal_mult2(exp->obj, log_x, SSIZET2NUM(n+1));
     y = BigMath_exp(multiplied, SSIZET2NUM(n));
+    RB_GC_GUARD(obj);
 
     return y;
 }
@@ -1995,9 +2290,11 @@ rmpd_power_by_big_decimal(Real const* x, Real const* exp, ssize_t const n)
  * power(n)
  * power(n, prec)
  *
- * Returns the value raised to the power of n. Note that n must be an Integer.
+ * Returns the value raised to the power of n.
  *
- * Also available as the operator **
+ * Note that n must be an Integer.
+ *
+ * Also available as the operator **.
  */
 static VALUE
 BigDecimal_power(int argc, VALUE*argv, VALUE self)
@@ -2016,13 +2313,13 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
     n = NIL_P(prec) ? (ssize_t)(x->Prec*VpBaseFig()) : NUM2SSIZET(prec);
 
     if (VpIsNaN(x)) {
-	y = VpCreateRbObject(n, "0#");
+	y = VpCreateRbObject(n, "0");
 	RB_GC_GUARD(y->obj);
 	VpSetNaN(y);
 	return ToValue(y);
     }
 
-retry:
+  retry:
     switch (TYPE(vexp)) {
       case T_FIXNUM:
 	break;
@@ -2033,21 +2330,26 @@ retry:
       case T_FLOAT:
 	d = RFLOAT_VALUE(vexp);
 	if (d == round(d)) {
-	    vexp = LL2NUM((LONG_LONG)round(d));
+	    if (FIXABLE(d)) {
+		vexp = LONG2FIX((long)d);
+	    }
+	    else {
+		vexp = rb_dbl2big(d);
+	    }
 	    goto retry;
 	}
 	exp = GetVpValueWithPrec(vexp, DBL_DIG+1, 1);
 	break;
 
       case T_RATIONAL:
-	if (is_zero(RRATIONAL(vexp)->num)) {
+	if (is_zero(rb_rational_num(vexp))) {
 	    if (is_positive(vexp)) {
 		vexp = INT2FIX(0);
 		goto retry;
 	    }
 	}
-	else if (is_one(RRATIONAL(vexp)->den)) {
-	    vexp = RRATIONAL(vexp)->num;
+	else if (is_one(rb_rational_den(vexp))) {
+	    vexp = rb_rational_num(vexp);
 	    goto retry;
 	}
 	exp = GetVpValueWithPrec(vexp, n, 1);
@@ -2067,15 +2369,15 @@ retry:
 	/* fall through */
       default:
 	rb_raise(rb_eTypeError,
-		 "wrong argument type %s (expected scalar Numeric)",
-		 rb_obj_classname(vexp));
+		 "wrong argument type %"PRIsVALUE" (expected scalar Numeric)",
+		 RB_OBJ_CLASSNAME(vexp));
     }
 
     if (VpIsZero(x)) {
 	if (is_negative(vexp)) {
 	    y = VpCreateRbObject(n, "#0");
 	    RB_GC_GUARD(y->obj);
-	    if (VpGetSign(x) < 0) {
+	    if (BIGDECIMAL_NEGATIVE_P(x)) {
 		if (is_integer(vexp)) {
 		    if (is_even(vexp)) {
 			/* (-0) ** (-even_integer)  -> Infinity */
@@ -2114,7 +2416,7 @@ retry:
 
     if (VpIsInf(x)) {
 	if (is_negative(vexp)) {
-	    if (VpGetSign(x) < 0) {
+	    if (BIGDECIMAL_NEGATIVE_P(x)) {
 		if (is_integer(vexp)) {
 		    if (is_even(vexp)) {
 			/* (-Infinity) ** (-even_integer) -> +0 */
@@ -2135,8 +2437,8 @@ retry:
 	    }
 	}
 	else {
-	    y = VpCreateRbObject(n, "0#");
-	    if (VpGetSign(x) < 0) {
+	    y = VpCreateRbObject(n, "0");
+	    if (BIGDECIMAL_NEGATIVE_P(x)) {
 		if (is_integer(vexp)) {
 		    if (is_even(vexp)) {
 			VpSetPosInf(y);
@@ -2161,14 +2463,14 @@ retry:
     if (exp != NULL) {
 	return rmpd_power_by_big_decimal(x, exp, n);
     }
-    else if (TYPE(vexp) == T_BIGNUM) {
+    else if (RB_TYPE_P(vexp, T_BIGNUM)) {
 	VALUE abs_value = BigDecimal_abs(self);
 	if (is_one(abs_value)) {
 	    return ToValue(VpCreateRbObject(n, "1"));
 	}
 	else if (RTEST(rb_funcall(abs_value, '<', 1, INT2FIX(1)))) {
 	    if (is_negative(vexp)) {
-		y = VpCreateRbObject(n, "0#");
+		y = VpCreateRbObject(n, "0");
 		if (is_even(vexp)) {
 		    VpSetInf(y, VpGetSign(x));
 		}
@@ -2177,7 +2479,7 @@ retry:
 		}
 		return ToValue(y);
 	    }
-	    else if (VpGetSign(x) < 0 && is_even(vexp)) {
+	    else if (BIGDECIMAL_NEGATIVE_P(x) && is_even(vexp)) {
 		return ToValue(VpCreateRbObject(n, "-0"));
 	    }
 	    else {
@@ -2186,7 +2488,7 @@ retry:
 	}
 	else {
 	    if (is_positive(vexp)) {
-		y = VpCreateRbObject(n, "0#");
+		y = VpCreateRbObject(n, "0");
 		if (is_even(vexp)) {
 		    VpSetInf(y, VpGetSign(x));
 		}
@@ -2195,7 +2497,7 @@ retry:
 		}
 		return ToValue(y);
 	    }
-	    else if (VpGetSign(x) < 0 && is_even(vexp)) {
+	    else if (BIGDECIMAL_NEGATIVE_P(x) && is_even(vexp)) {
 		return ToValue(VpCreateRbObject(n, "-0"));
 	    }
 	    else {
@@ -2204,26 +2506,31 @@ retry:
 	}
     }
 
-    int_exp = FIX2INT(vexp);
+    int_exp = FIX2LONG(vexp);
     ma = int_exp;
-    if (ma < 0)  ma = -ma;
+    if (ma <  0) ma = -ma;
     if (ma == 0) ma = 1;
 
     if (VpIsDef(x)) {
-        mp = x->Prec * (VpBaseFig() + 1);
-        GUARD_OBJ(y, VpCreateRbObject(mp * (ma + 1), "0"));
+	mp = x->Prec * (VpBaseFig() + 1);
+	GUARD_OBJ(y, VpCreateRbObject(mp * (ma + 1), "0"));
     }
     else {
-        GUARD_OBJ(y, VpCreateRbObject(1, "0"));
+	GUARD_OBJ(y, VpCreateRbObject(1, "0"));
     }
     VpPower(y, x, int_exp);
+    if (!NIL_P(prec) && VpIsDef(y)) {
+	VpMidRound(y, VpGetRoundMode(), n);
+    }
     return ToValue(y);
 }
 
 /* call-seq:
- *   big_decimal ** exp  -> big_decimal
+ *   a ** n  -> bigdecimal
+ *
+ * Returns the value raised to the power of n.
  *
- * It is a synonym of big_decimal.power(exp).
+ * See BigDecimal#power.
  */
 static VALUE
 BigDecimal_power_op(VALUE self, VALUE exp)
@@ -2231,78 +2538,215 @@ BigDecimal_power_op(VALUE self, VALUE exp)
     return BigDecimal_power(1, &exp, self);
 }
 
-/* call-seq:
- *   new(initial, digits)
- *
- * Create a new BigDecimal object.
- *
- * initial:: The initial value, as an Integer, a Float, a Rational,
- *           a BigDecimal, or a String.
- *           If it is a String, spaces are ignored and unrecognized characters
- *           terminate the value.
- *
- * digits:: The number of significant digits, as a Fixnum. If omitted or 0,
- *          the number of significant digits is determined from the initial
- *          value.
+/* :nodoc:
  *
- * The actual number of significant digits used in computation is usually
- * larger than the specified number.
+ * private method for dup and clone the provided BigDecimal +other+
  */
 static VALUE
-BigDecimal_new(int argc, VALUE *argv, VALUE self)
+BigDecimal_initialize_copy(VALUE self, VALUE other)
+{
+    Real *pv = rb_check_typeddata(self, &BigDecimal_data_type);
+    Real *x = rb_check_typeddata(other, &BigDecimal_data_type);
+
+    if (self != other) {
+	DATA_PTR(self) = VpCopy(pv, x);
+    }
+    return self;
+}
+
+static VALUE
+BigDecimal_clone(VALUE self)
+{
+  return self;
+}
+
+#ifdef HAVE_RB_OPTS_EXCEPTION_P
+int rb_opts_exception_p(VALUE opts, int default_value);
+#define opts_exception_p(opts) rb_opts_exception_p((opts), 1)
+#else
+static int
+opts_exception_p(VALUE opts)
+{
+    static ID kwds[1];
+    VALUE exception;
+    if (!kwds[0]) {
+        kwds[0] = rb_intern_const("exception");
+    }
+    if (!rb_get_kwargs(opts, kwds, 0, 1, &exception)) return 1;
+    switch (exception) {
+      case Qtrue: case Qfalse:
+        break;
+      default:
+        rb_raise(rb_eArgError, "true or false is expected as exception: %+"PRIsVALUE,
+                 exception);
+    }
+    return exception != Qfalse;
+}
+#endif
+
+static Real *
+VpNewVarArg(int argc, VALUE *argv)
 {
-    ENTER(5);
-    Real *pv;
     size_t mf;
+    VALUE  opts = Qnil;
     VALUE  nFig;
     VALUE  iniValue;
+    double d;
+    int    exc;
 
-    if (rb_scan_args(argc, argv, "11", &iniValue, &nFig) == 1) {
+    argc = rb_scan_args(argc, argv, "11:", &iniValue, &nFig, &opts);
+    exc = opts_exception_p(opts);
+
+    if (argc == 1) {
         mf = 0;
     }
     else {
-        mf = GetPositiveInt(nFig);
+        /* expand GetPrecisionInt for exception suppression */
+        ssize_t n = NUM2INT(nFig);
+        if (n < 0) {
+            if (!exc) {
+                return NULL;
+            }
+            rb_raise(rb_eArgError, "negative precision");
+        }
+        mf = (size_t)n;
+    }
+
+    if (SPECIAL_CONST_P(iniValue)) {
+        switch (iniValue) {
+          case Qnil:
+            if (!exc) return NULL;
+            rb_raise(rb_eTypeError, "can't convert nil into BigDecimal");
+          case Qtrue:
+            if (!exc) return NULL;
+            rb_raise(rb_eTypeError, "can't convert true into BigDecimal");
+          case Qfalse:
+            if (!exc) return NULL;
+            rb_raise(rb_eTypeError, "can't convert false into BigDecimal");
+          default:
+            break;
+        }
     }
 
     switch (TYPE(iniValue)) {
       case T_DATA:
 	if (is_kind_of_BigDecimal(iniValue)) {
-	    pv = VpDup(DATA_PTR(iniValue));
-	    return ToValue(pv);
+	    return DATA_PTR(iniValue);
 	}
 	break;
 
       case T_FIXNUM:
 	/* fall through */
       case T_BIGNUM:
-	return ToValue(GetVpValue(iniValue, 1));
+	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) {
+            if (!exc) {
+                return NULL;
+            }
 	    rb_raise(rb_eArgError, "precision too large.");
 	}
 	/* fall through */
       case T_RATIONAL:
 	if (NIL_P(nFig)) {
-	    rb_raise(rb_eArgError, "can't omit precision for a Rational.");
+            if (!exc) {
+                return NULL;
+            }
+	    rb_raise(rb_eArgError,
+		     "can't omit precision for a %"PRIsVALUE".",
+		     RB_OBJ_CLASSNAME(iniValue));
 	}
-	return ToValue(GetVpValueWithPrec(iniValue, mf, 1));
+	return GetVpValueWithPrec(iniValue, mf, 1);
 
       case T_STRING:
 	/* fall through */
       default:
 	break;
     }
-    SafeStringValue(iniValue);
-    GUARD_OBJ(pv, VpNewRbClass(mf, RSTRING_PTR(iniValue),self));
+    /* TODO: support to_d */
+    if (!exc) {
+        iniValue = rb_check_convert_type(iniValue, T_STRING, "String", "to_str");
+        if (NIL_P(iniValue)) return NULL;
+    }
+    StringValueCStr(iniValue);
+    return VpAlloc(mf, RSTRING_PTR(iniValue), 1, exc);
+}
 
-    return ToValue(pv);
+/* call-seq:
+ *   BigDecimal(initial, digits, exception: true)
+ *
+ * Create a new BigDecimal object.
+ *
+ * initial:: The initial value, as an Integer, a Float, a Rational,
+ *           a BigDecimal, or a String.
+ *
+ *           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,
+ *          the number of significant digits is determined from the initial
+ *          value.
+ *
+ *          The actual number of significant digits used in computation is
+ *          usually larger than the specified number.
+ *
+ * exception:: Whether an exception should be raised on invalid arguments.
+ *             +true+ by default, if passed +false+, just returns +nil+
+ *             for invalid.
+ *
+ *
+ * ==== Exceptions
+ *
+ * TypeError:: If the +initial+ type is neither Integer, Float,
+ *             Rational, nor BigDecimal, this exception is raised.
+ *
+ * TypeError:: If the +digits+ is not an Integer, this exception is raised.
+ *
+ * ArgumentError:: If +initial+ is a Float, and the +digits+ is larger than
+ *                 Float::DIG + 1, this exception is raised.
+ *
+ * ArgumentError:: If the +initial+ is a Float or Rational, and the +digits+
+ *                 value is omitted, this exception is raised.
+ */
+static VALUE
+f_BigDecimal(int argc, VALUE *argv, VALUE self)
+{
+    ENTER(1);
+    Real *pv;
+    VALUE obj;
+
+    if (argc > 0 && CLASS_OF(argv[0]) == rb_cBigDecimal) {
+        if (argc == 1 || (argc == 2 && RB_TYPE_P(argv[1], T_HASH))) return argv[0];
+    }
+    obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, 0);
+    pv = VpNewVarArg(argc, argv);
+    if (pv == NULL) return Qnil;
+    SAVE(pv);
+    if (ToValue(pv)) pv = VpCopy(NULL, pv);
+    RTYPEDDATA_DATA(obj) = pv;
+    RB_OBJ_FREEZE(obj);
+    return pv->obj = obj;
 }
 
 static VALUE
-BigDecimal_global_new(int argc, VALUE *argv, VALUE self)
+BigDecimal_s_interpret_loosely(VALUE klass, VALUE str)
 {
-    return BigDecimal_new(argc, argv, rb_cBigDecimal);
+    ENTER(1);
+    char const *c_str;
+    Real *pv;
+
+    c_str = StringValueCStr(str);
+    GUARD_OBJ(pv, VpAlloc(0, c_str, 0, 1));
+    pv->obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, pv);
+    RB_OBJ_FREEZE(pv->obj);
+    return pv->obj;
 }
 
  /* call-seq:
@@ -2323,15 +2767,14 @@ BigDecimal_limit(int argc, VALUE *argv, VALUE self)
     VALUE  nFig;
     VALUE  nCur = INT2NUM(VpGetPrecLimit());
 
-    if(rb_scan_args(argc,argv,"01",&nFig)==1) {
-        int nf;
-        if(nFig==Qnil) return nCur;
-        Check_Type(nFig, T_FIXNUM);
-        nf = FIX2INT(nFig);
-        if(nf<0) {
-            rb_raise(rb_eArgError, "argument must be positive");
-        }
-        VpSetPrecLimit(nf);
+    if (rb_scan_args(argc, argv, "01", &nFig) == 1) {
+	int nf;
+	if (NIL_P(nFig)) return nCur;
+	nf = NUM2INT(nFig);
+	if (nf < 0) {
+	    rb_raise(rb_eArgError, "argument must be positive");
+	}
+	VpSetPrecLimit(nf);
     }
     return nCur;
 }
@@ -2347,20 +2790,35 @@ BigDecimal_limit(int argc, VALUE *argv, VALUE self)
  * BigDecimal::SIGN_NaN:: value is Not a Number
  * BigDecimal::SIGN_POSITIVE_ZERO:: value is +0
  * BigDecimal::SIGN_NEGATIVE_ZERO:: value is -0
- * BigDecimal::SIGN_POSITIVE_INFINITE:: value is +infinity
- * BigDecimal::SIGN_NEGATIVE_INFINITE:: value is -infinity
+ * BigDecimal::SIGN_POSITIVE_INFINITE:: value is +Infinity
+ * BigDecimal::SIGN_NEGATIVE_INFINITE:: value is -Infinity
  * BigDecimal::SIGN_POSITIVE_FINITE:: value is positive
  * BigDecimal::SIGN_NEGATIVE_FINITE:: value is negative
  */
 static VALUE
 BigDecimal_sign(VALUE self)
 { /* sign */
-    int s = GetVpValue(self,1)->sign;
+    int s = GetVpValue(self, 1)->sign;
     return INT2FIX(s);
 }
 
-/* call-seq:
- * BigDecimal.save_exception_mode { ... }
+/*
+ * call-seq: BigDecimal.save_exception_mode { ... }
+ *
+ * Execute the provided block, but preserve the exception mode
+ *
+ *     BigDecimal.save_exception_mode do
+ *       BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
+ *       BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
+ *
+ *       BigDecimal(BigDecimal('Infinity'))
+ *       BigDecimal(BigDecimal('-Infinity'))
+ *       BigDecimal(BigDecimal('NaN'))
+ *     end
+ *
+ * For use with the BigDecimal::EXCEPTION_*
+ *
+ * See BigDecimal.mode
  */
 static VALUE
 BigDecimal_save_exception_mode(VALUE self)
@@ -2373,8 +2831,19 @@ BigDecimal_save_exception_mode(VALUE self)
     return ret;
 }
 
-/* call-seq:
- * BigDecimal.save_rounding_mode { ... }
+/*
+ * call-seq: BigDecimal.save_rounding_mode { ... }
+ *
+ * Execute the provided block, but preserve the rounding mode
+ *
+ *     BigDecimal.save_rounding_mode do
+ *       BigDecimal.mode(BigDecimal::ROUND_MODE, :up)
+ *       puts BigDecimal.mode(BigDecimal::ROUND_MODE)
+ *     end
+ *
+ * For use with the BigDecimal::ROUND_*
+ *
+ * See BigDecimal.mode
  */
 static VALUE
 BigDecimal_save_rounding_mode(VALUE self)
@@ -2387,8 +2856,19 @@ BigDecimal_save_rounding_mode(VALUE self)
     return ret;
 }
 
-/* call-seq:
- * BigDecimal.save_limit { ... }
+/*
+ * call-seq: BigDecimal.save_limit { ... }
+ *
+ * Execute the provided block, but preserve the precision limit
+ *
+ *      BigDecimal.limit(100)
+ *      puts BigDecimal.limit
+ *      BigDecimal.save_limit do
+ *          BigDecimal.limit(200)
+ *          puts BigDecimal.limit
+ *      end
+ *      puts BigDecimal.limit
+ *
  */
 static VALUE
 BigDecimal_save_limit(VALUE self)
@@ -2402,21 +2882,21 @@ BigDecimal_save_limit(VALUE self)
 }
 
 /* call-seq:
- * BigMath.exp(x, prec)
+ * BigMath.exp(decimal, numeric)    -> BigDecimal
  *
  * Computes the value of e (the base of natural logarithms) raised to the
- * power of x, to the specified number of digits of precision.
+ * power of +decimal+, to the specified number of digits of precision.
  *
- * If x is infinite, returns Infinity.
+ * If +decimal+ is infinity, returns Infinity.
  *
- * If x is NaN, returns NaN.
+ * If +decimal+ is NaN, returns NaN.
  */
 static VALUE
 BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
 {
     ssize_t prec, n, i;
     Real* vx = NULL;
-    VALUE one, d, x1, y, z;
+    VALUE one, d, y;
     int negative = 0;
     int infinite = 0;
     int nan = 0;
@@ -2427,22 +2907,22 @@ 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 almostly the same as one in the
+    /* TODO: the following switch statement is almost 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 = VpGetSign(vx) < 0;
-	  infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
-	  nan = VpIsNaN(vx);
-	  break;
+	if (!is_kind_of_BigDecimal(x)) break;
+	vx = DATA_PTR(x);
+	negative = BIGDECIMAL_NEGATIVE_P(vx);
+	infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
+	nan = VpIsNaN(vx);
+	break;
 
       case T_FIXNUM:
-	  /* fall through */
+	/* fall through */
       case T_BIGNUM:
-	  vx = GetVpValue(x, 0);
-	  break;
+	vx = GetVpValue(x, 0);
+	break;
 
       case T_FLOAT:
 	flo = RFLOAT_VALUE(x);
@@ -2463,46 +2943,50 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
     }
     if (infinite) {
 	if (negative) {
-	    return ToValue(GetVpValueWithPrec(INT2NUM(0), prec, 1));
+	    return ToValue(GetVpValueWithPrec(INT2FIX(0), prec, 1));
 	}
 	else {
 	    Real* vy;
 	    vy = VpCreateRbObject(prec, "#0");
-	    RB_GC_GUARD(vy->obj);
 	    VpSetInf(vy, VP_SIGN_POSITIVE_INFINITE);
+	    RB_GC_GUARD(vy->obj);
 	    return ToValue(vy);
 	}
     }
     else if (nan) {
 	Real* vy;
 	vy = VpCreateRbObject(prec, "#0");
-	RB_GC_GUARD(vy->obj);
 	VpSetNaN(vy);
+	RB_GC_GUARD(vy->obj);
 	return ToValue(vy);
     }
     else if (vx == NULL) {
 	cannot_be_coerced_into_BigDecimal(rb_eArgError, x);
     }
-    RB_GC_GUARD(vx->obj);
+    x = vx->obj;
 
     n = prec + rmpd_double_figures();
-    negative = VpGetSign(vx) < 0;
+    negative = BIGDECIMAL_NEGATIVE_P(vx);
     if (negative) {
+        VALUE x_zero = INT2NUM(1);
+        VALUE x_copy = f_BigDecimal(1, &x_zero, klass);
+        x = BigDecimal_initialize_copy(x_copy, x);
+        vx = DATA_PTR(x);
 	VpSetSign(vx, 1);
     }
 
-    RB_GC_GUARD(one) = ToValue(VpCreateRbObject(1, "1"));
-    RB_GC_GUARD(x1) = one;
-    RB_GC_GUARD(y)  = one;
-    RB_GC_GUARD(d)  = y;
-    RB_GC_GUARD(z)  = one;
-    i  = 0;
+    one = ToValue(VpCreateRbObject(1, "1"));
+    y   = one;
+    d   = y;
+    i   = 1;
 
     while (!VpIsZero((Real*)DATA_PTR(d))) {
-	VALUE argv[2];
 	SIGNED_VALUE const ey = VpExponent10(DATA_PTR(y));
 	SIGNED_VALUE const ed = VpExponent10(DATA_PTR(d));
 	ssize_t m = n - vabs(ey - ed);
+
+	rb_thread_check_ints();
+
 	if (m <= 0) {
 	    break;
 	}
@@ -2510,38 +2994,37 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
 	    m = rmpd_double_figures();
 	}
 
-	x1 = BigDecimal_mult2(x1, x, SSIZET2NUM(n));
-	++i;
-	z = BigDecimal_mult(z, SSIZET2NUM(i));
-	argv[0] = z;
-	argv[1] = SSIZET2NUM(m);
-	d = BigDecimal_div2(2, argv, x1);
-	y = BigDecimal_add(y, d);
+	d = BigDecimal_mult(d, x);                             /* d <- d * x */
+	d = BigDecimal_div2(d, SSIZET2NUM(i), SSIZET2NUM(m));  /* d <- d / i */
+	y = BigDecimal_add(y, d);                              /* y <- y + d  */
+	++i;                                                   /* i  <- i + 1 */
     }
 
     if (negative) {
-	VALUE argv[2];
-	argv[0] = y;
-	argv[1] = vprec;
-	return BigDecimal_div2(2, argv, one);
+	return BigDecimal_div2(one, y, vprec);
     }
     else {
 	vprec = SSIZET2NUM(prec - VpExponent10(DATA_PTR(y)));
 	return BigDecimal_round(1, &vprec, y);
     }
+
+    RB_GC_GUARD(one);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    RB_GC_GUARD(d);
 }
 
 /* call-seq:
- * BigMath.log(x, prec)
+ * BigMath.log(decimal, numeric)    -> BigDecimal
  *
- * Computes the natural logarithm of x to the specified number of digits of
- * precision.
+ * Computes the natural logarithm of +decimal+ to the specified number of
+ * digits of precision, +numeric+.
  *
- * If x is zero or negative, raises Math::DomainError.
+ * If +decimal+ is zero or negative, raises Math::DomainError.
  *
- * If x is positive infinite, returns Infinity.
+ * If +decimal+ is positive infinity, returns Infinity.
  *
- * If x is NaN, returns NaN.
+ * If +decimal+ is NaN, returns NaN.
  */
 static VALUE
 BigMath_s_log(VALUE klass, VALUE x, VALUE vprec)
@@ -2549,7 +3032,7 @@ BigMath_s_log(VALUE klass, VALUE x, VALUE vprec)
     ssize_t prec, n, i;
     SIGNED_VALUE expo;
     Real* vx = NULL;
-    VALUE argv[2], vn, one, two, w, x2, y, d;
+    VALUE vn, one, two, w, x2, y, d;
     int zero = 0;
     int negative = 0;
     int infinite = 0;
@@ -2557,7 +3040,7 @@ BigMath_s_log(VALUE klass, VALUE x, VALUE vprec)
     double flo;
     long fix;
 
-    if (TYPE(vprec) != T_FIXNUM && TYPE(vprec) != T_BIGNUM) {
+    if (!is_integer(vprec)) {
 	rb_raise(rb_eArgError, "precision must be an Integer");
     }
 
@@ -2566,14 +3049,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 almostly the same as one in the
+    /* TODO: the following switch statement is almost 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 = VpGetSign(vx) < 0;
+	  negative = BIGDECIMAL_NEGATIVE_P(vx);
 	  infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
 	  nan = VpIsNaN(vx);
 	  break;
@@ -2585,8 +3068,9 @@ BigMath_s_log(VALUE klass, VALUE x, VALUE vprec)
 	goto get_vp_value;
 
       case T_BIGNUM:
-	zero = RBIGNUM_ZERO_P(x);
-	negative = RBIGNUM_NEGATIVE_P(x);
+        i = FIX2INT(rb_big_cmp(x, INT2FIX(0)));
+	zero = i == 0;
+	negative = i < 0;
 get_vp_value:
 	if (zero || negative) break;
 	vx = GetVpValue(x, 0);
@@ -2647,17 +3131,15 @@ get_vp_value:
     RB_GC_GUARD(vn) = SSIZET2NUM(n);
     expo = VpExponent10(vx);
     if (expo < 0 || expo >= 3) {
-	char buf[16];
-	snprintf(buf, 16, "1E%ld", -expo);
+	char buf[DECIMAL_SIZE_OF_BITS(SIZEOF_VALUE * CHAR_BIT) + 4];
+	snprintf(buf, sizeof(buf), "1E%"PRIdVALUE, -expo);
 	x = BigDecimal_mult2(x, ToValue(VpCreateRbObject(1, buf)), vn);
     }
     else {
 	expo = 0;
     }
     w = BigDecimal_sub(x, one);
-    argv[0] = BigDecimal_add(x, one);
-    argv[1] = vn;
-    x = BigDecimal_div2(2, argv, w);
+    x = BigDecimal_div2(w, BigDecimal_add(x, one), vn);
     RB_GC_GUARD(x2) = BigDecimal_mult2(x, x, vn);
     RB_GC_GUARD(y)  = x;
     RB_GC_GUARD(d)  = y;
@@ -2675,9 +3157,7 @@ get_vp_value:
 
 	x = BigDecimal_mult2(x2, x, vn);
 	i += 2;
-	argv[0] = SSIZET2NUM(i);
-	argv[1] = SSIZET2NUM(m);
-	d = BigDecimal_div2(2, argv, x);
+	d = BigDecimal_div2(x, SSIZET2NUM(i), SSIZET2NUM(m));
 	y = BigDecimal_add(y, d);
     }
 
@@ -2696,19 +3176,13 @@ get_vp_value:
 /* Document-class: BigDecimal
  * BigDecimal provides arbitrary-precision floating point decimal arithmetic.
  *
- * Copyright (C) 2002 by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
- * You may distribute under the terms of either the GNU General Public
- * License or the Artistic License, as specified in the README file
- * of the BigDecimal distribution.
- *
- * Documented by mathew <meta@pobox.com>.
- *
- * = Introduction
+ * == Introduction
  *
  * Ruby provides built-in support for arbitrary precision integer arithmetic.
+ *
  * For example:
  *
- * 42**13   ->   1265437718438866624512
+ *	42**13  #=>   1265437718438866624512
  *
  * BigDecimal provides similar support for very large or very accurate floating
  * point numbers.
@@ -2716,108 +3190,140 @@ get_vp_value:
  * Decimal arithmetic is also useful for general calculation, because it
  * provides the correct answers people expect--whereas normal binary floating
  * point arithmetic often introduces subtle errors because of the conversion
- * between base 10 and base 2. For example, try:
+ * between base 10 and base 2.
+ *
+ * For example, try:
  *
  *   sum = 0
- *   for i in (1..10000)
+ *   10_000.times do
  *     sum = sum + 0.0001
  *   end
- *   print sum
+ *   print sum #=> 0.9999999999999062
  *
  * and contrast with the output from:
  *
  *   require 'bigdecimal'
  *
- *   sum = BigDecimal.new("0")
- *   for i in (1..10000)
- *     sum = sum + BigDecimal.new("0.0001")
+ *   sum = BigDecimal("0")
+ *   10_000.times do
+ *     sum = sum + BigDecimal("0.0001")
  *   end
- *   print sum
+ *   print sum #=> 0.1E1
  *
  * Similarly:
  *
- * (BigDecimal.new("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") -> true
+ *	(BigDecimal("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") #=> true
  *
- * (1.2 - 1.0) == 0.2 -> false
+ *	(1.2 - 1.0) == 0.2 #=> false
  *
- * = Special features of accurate decimal arithmetic
+ * == Special features of accurate decimal arithmetic
  *
  * Because BigDecimal is more accurate than normal binary floating point
  * arithmetic, it requires some special values.
  *
- * == Infinity
+ * === Infinity
  *
  * BigDecimal sometimes needs to return infinity, for example if you divide
  * a value by zero.
  *
- * BigDecimal.new("1.0") / BigDecimal.new("0.0")  -> infinity
- *
- * BigDecimal.new("-1.0") / BigDecimal.new("0.0")  -> -infinity
+ *	BigDecimal("1.0") / BigDecimal("0.0")  #=> Infinity
+ *	BigDecimal("-1.0") / BigDecimal("0.0")  #=> -Infinity
  *
  * You can represent infinite numbers to BigDecimal using the strings
- * 'Infinity', '+Infinity' and '-Infinity' (case-sensitive)
+ * <code>'Infinity'</code>, <code>'+Infinity'</code> and
+ * <code>'-Infinity'</code> (case-sensitive)
  *
- * == Not a Number
+ * === Not a Number
  *
- * When a computation results in an undefined value, the special value NaN
+ * When a computation results in an undefined value, the special value +NaN+
  * (for 'not a number') is returned.
  *
  * Example:
  *
- * BigDecimal.new("0.0") / BigDecimal.new("0.0") -> NaN
- *
- * You can also create undefined values.  NaN is never considered to be the
- * same as any other value, even NaN itself:
+ *	BigDecimal("0.0") / BigDecimal("0.0") #=> NaN
  *
- * n = BigDecimal.new('NaN')
+ * You can also create undefined values.
  *
- * n == 0.0 -> nil
+ * NaN is never considered to be the same as any other value, even NaN itself:
  *
- * n == n -> nil
+ *	n = BigDecimal('NaN')
+ *	n == 0.0 #=> false
+ *	n == n #=> false
  *
- * == Positive and negative zero
+ * === Positive and negative zero
  *
  * If a computation results in a value which is too small to be represented as
  * a BigDecimal within the currently specified limits of precision, zero must
  * be returned.
  *
  * If the value which is too small to be represented is negative, a BigDecimal
- * value of negative zero is returned. If the value is positive, a value of
- * positive zero is returned.
+ * value of negative zero is returned.
  *
- * BigDecimal.new("1.0") / BigDecimal.new("-Infinity") -> -0.0
+ *	BigDecimal("1.0") / BigDecimal("-Infinity") #=> -0.0
  *
- * BigDecimal.new("1.0") / BigDecimal.new("Infinity") -> 0.0
+ * If the value is positive, a value of positive zero is returned.
+ *
+ *	BigDecimal("1.0") / BigDecimal("Infinity") #=> 0.0
  *
  * (See BigDecimal.mode for how to specify limits of precision.)
  *
- * Note that -0.0 and 0.0 are considered to be the same for the purposes of
+ * Note that +-0.0+ and +0.0+ are considered to be the same for the purposes of
  * comparison.
  *
  * Note also that in mathematics, there is no particular concept of negative
  * or positive zero; true mathematical zero has no sign.
+ *
+ * == bigdecimal/util
+ *
+ * When you require +bigdecimal/util+, the #to_d method will be
+ * available on BigDecimal and the native Integer, Float, Rational,
+ * and String classes:
+ *
+ *	require 'bigdecimal/util'
+ *
+ *      42.to_d         # => 0.42e2
+ *      0.5.to_d        # => 0.5e0
+ *      (2/3r).to_d(3)  # => 0.667e0
+ *      "0.5".to_d      # => 0.5e0
+ *
+ * == License
+ *
+ * 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.
+ *
+ * Maintained by mrkn <mrkn@mrkn.jp> and ruby-core members.
+ *
+ * Documented by zzak <zachary@zacharyscott.net>, mathew <meta@pobox.com>, and
+ * many other contributors.
  */
 void
 Init_bigdecimal(void)
 {
     VALUE arg;
 
+    id_BigDecimal_exception_mode = rb_intern_const("BigDecimal.exception_mode");
+    id_BigDecimal_rounding_mode = rb_intern_const("BigDecimal.rounding_mode");
+    id_BigDecimal_precision_limit = rb_intern_const("BigDecimal.precision_limit");
+
     /* Initialize VP routines */
     VpInit(0UL);
 
     /* Class and method registration */
-    rb_cBigDecimal = rb_define_class("BigDecimal",rb_cNumeric);
+    rb_cBigDecimal = rb_define_class("BigDecimal", rb_cNumeric);
 
     /* Global function */
-    rb_define_global_function("BigDecimal", BigDecimal_global_new, -1);
+    rb_define_global_function("BigDecimal", f_BigDecimal, -1);
 
     /* Class methods */
-    rb_define_singleton_method(rb_cBigDecimal, "new", BigDecimal_new, -1);
+    rb_undef_method(CLASS_OF(rb_cBigDecimal), "allocate");
+    rb_undef_method(CLASS_OF(rb_cBigDecimal), "new");
+    rb_define_singleton_method(rb_cBigDecimal, "interpret_loosely", BigDecimal_s_interpret_loosely, 1);
     rb_define_singleton_method(rb_cBigDecimal, "mode", BigDecimal_mode, -1);
     rb_define_singleton_method(rb_cBigDecimal, "limit", BigDecimal_limit, -1);
     rb_define_singleton_method(rb_cBigDecimal, "double_fig", BigDecimal_double_fig, 0);
     rb_define_singleton_method(rb_cBigDecimal, "_load", BigDecimal_load, 1);
-    rb_define_singleton_method(rb_cBigDecimal, "ver", BigDecimal_version, 0);
 
     rb_define_singleton_method(rb_cBigDecimal, "save_exception_mode", BigDecimal_save_exception_mode, 0);
     rb_define_singleton_method(rb_cBigDecimal, "save_rounding_mode", BigDecimal_save_rounding_mode, 0);
@@ -2825,6 +3331,14 @@ Init_bigdecimal(void)
 
     /* Constants definition */
 
+#ifndef RUBY_BIGDECIMAL_VERSION
+# error RUBY_BIGDECIMAL_VERSION is not defined
+#endif
+    /*
+     * The version of bigdecimal library
+     */
+    rb_define_const(rb_cBigDecimal, "VERSION", rb_str_new2(RUBY_BIGDECIMAL_VERSION));
+
     /*
      * Base value used in internal calculations.  On a 32 bit system, BASE
      * is 10000, indicating that calculation is done in groups of 4 digits.
@@ -2840,106 +3354,109 @@ Init_bigdecimal(void)
      * 0xff: Determines whether overflow, underflow or zero divide result in
      * an exception being thrown. See BigDecimal.mode.
      */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_ALL",INT2FIX(VP_EXCEPTION_ALL));
+    rb_define_const(rb_cBigDecimal, "EXCEPTION_ALL", INT2FIX(VP_EXCEPTION_ALL));
 
     /*
      * 0x02: Determines what happens when the result of a computation is not a
      * number (NaN). See BigDecimal.mode.
      */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_NaN",INT2FIX(VP_EXCEPTION_NaN));
+    rb_define_const(rb_cBigDecimal, "EXCEPTION_NaN", INT2FIX(VP_EXCEPTION_NaN));
 
     /*
      * 0x01: Determines what happens when the result of a computation is
      * infinity.  See BigDecimal.mode.
      */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_INFINITY",INT2FIX(VP_EXCEPTION_INFINITY));
+    rb_define_const(rb_cBigDecimal, "EXCEPTION_INFINITY", INT2FIX(VP_EXCEPTION_INFINITY));
 
     /*
      * 0x04: Determines what happens when the result of a computation is an
      * underflow (a result too small to be represented). See BigDecimal.mode.
      */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_UNDERFLOW",INT2FIX(VP_EXCEPTION_UNDERFLOW));
+    rb_define_const(rb_cBigDecimal, "EXCEPTION_UNDERFLOW", INT2FIX(VP_EXCEPTION_UNDERFLOW));
 
     /*
      * 0x01: Determines what happens when the result of a computation is an
      * overflow (a result too large to be represented). See BigDecimal.mode.
      */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW",INT2FIX(VP_EXCEPTION_OVERFLOW));
+    rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW", INT2FIX(VP_EXCEPTION_OVERFLOW));
 
     /*
-     * 0x01: Determines what happens when a division by zero is performed.
+     * 0x10: Determines what happens when a division by zero is performed.
      * See BigDecimal.mode.
      */
-    rb_define_const(rb_cBigDecimal, "EXCEPTION_ZERODIVIDE",INT2FIX(VP_EXCEPTION_ZERODIVIDE));
+    rb_define_const(rb_cBigDecimal, "EXCEPTION_ZERODIVIDE", INT2FIX(VP_EXCEPTION_ZERODIVIDE));
 
     /*
      * 0x100: Determines what happens when a result must be rounded in order to
      * fit in the appropriate number of significant digits. See
      * BigDecimal.mode.
      */
-    rb_define_const(rb_cBigDecimal, "ROUND_MODE",INT2FIX(VP_ROUND_MODE));
+    rb_define_const(rb_cBigDecimal, "ROUND_MODE", INT2FIX(VP_ROUND_MODE));
 
     /* 1: Indicates that values should be rounded away from zero. See
      * BigDecimal.mode.
      */
-    rb_define_const(rb_cBigDecimal, "ROUND_UP",INT2FIX(VP_ROUND_UP));
+    rb_define_const(rb_cBigDecimal, "ROUND_UP", INT2FIX(VP_ROUND_UP));
 
     /* 2: Indicates that values should be rounded towards zero. See
      * BigDecimal.mode.
      */
-    rb_define_const(rb_cBigDecimal, "ROUND_DOWN",INT2FIX(VP_ROUND_DOWN));
+    rb_define_const(rb_cBigDecimal, "ROUND_DOWN", INT2FIX(VP_ROUND_DOWN));
 
     /* 3: Indicates that digits >= 5 should be rounded up, others rounded down.
      * See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_HALF_UP",INT2FIX(VP_ROUND_HALF_UP));
+    rb_define_const(rb_cBigDecimal, "ROUND_HALF_UP", INT2FIX(VP_ROUND_HALF_UP));
 
     /* 4: Indicates that digits >= 6 should be rounded up, others rounded down.
      * See BigDecimal.mode.
      */
-    rb_define_const(rb_cBigDecimal, "ROUND_HALF_DOWN",INT2FIX(VP_ROUND_HALF_DOWN));
-    /* 5: Round towards +infinity. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_CEILING",INT2FIX(VP_ROUND_CEIL));
+    rb_define_const(rb_cBigDecimal, "ROUND_HALF_DOWN", INT2FIX(VP_ROUND_HALF_DOWN));
+    /* 5: Round towards +Infinity. See BigDecimal.mode. */
+    rb_define_const(rb_cBigDecimal, "ROUND_CEILING", INT2FIX(VP_ROUND_CEIL));
 
-    /* 6: Round towards -infinity. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_FLOOR",INT2FIX(VP_ROUND_FLOOR));
+    /* 6: Round towards -Infinity. See BigDecimal.mode. */
+    rb_define_const(rb_cBigDecimal, "ROUND_FLOOR", INT2FIX(VP_ROUND_FLOOR));
 
     /* 7: Round towards the even neighbor. See BigDecimal.mode. */
-    rb_define_const(rb_cBigDecimal, "ROUND_HALF_EVEN",INT2FIX(VP_ROUND_HALF_EVEN));
+    rb_define_const(rb_cBigDecimal, "ROUND_HALF_EVEN", INT2FIX(VP_ROUND_HALF_EVEN));
 
     /* 0: Indicates that a value is not a number. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_NaN",INT2FIX(VP_SIGN_NaN));
+    rb_define_const(rb_cBigDecimal, "SIGN_NaN", INT2FIX(VP_SIGN_NaN));
 
     /* 1: Indicates that a value is +0. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_ZERO",INT2FIX(VP_SIGN_POSITIVE_ZERO));
+    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_ZERO", INT2FIX(VP_SIGN_POSITIVE_ZERO));
 
     /* -1: Indicates that a value is -0. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_ZERO",INT2FIX(VP_SIGN_NEGATIVE_ZERO));
+    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_ZERO", INT2FIX(VP_SIGN_NEGATIVE_ZERO));
 
     /* 2: Indicates that a value is positive and finite. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_FINITE",INT2FIX(VP_SIGN_POSITIVE_FINITE));
+    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_FINITE", INT2FIX(VP_SIGN_POSITIVE_FINITE));
 
     /* -2: Indicates that a value is negative and finite. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_FINITE",INT2FIX(VP_SIGN_NEGATIVE_FINITE));
+    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_FINITE", INT2FIX(VP_SIGN_NEGATIVE_FINITE));
 
     /* 3: Indicates that a value is positive and infinite. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_INFINITE",INT2FIX(VP_SIGN_POSITIVE_INFINITE));
+    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_INFINITE", INT2FIX(VP_SIGN_POSITIVE_INFINITE));
 
     /* -3: Indicates that a value is negative and infinite. See BigDecimal.sign. */
-    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_INFINITE",INT2FIX(VP_SIGN_NEGATIVE_INFINITE));
+    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_INFINITE", INT2FIX(VP_SIGN_NEGATIVE_INFINITE));
 
     arg = rb_str_new2("+Infinity");
-    rb_define_const(rb_cBigDecimal, "INFINITY", BigDecimal_global_new(1, &arg, rb_cBigDecimal));
+    /* Positive infinity value. */
+    rb_define_const(rb_cBigDecimal, "INFINITY", f_BigDecimal(1, &arg, rb_cBigDecimal));
     arg = rb_str_new2("NaN");
-    rb_define_const(rb_cBigDecimal, "NAN", BigDecimal_global_new(1, &arg, rb_cBigDecimal));
+    /* 'Not a Number' value. */
+    rb_define_const(rb_cBigDecimal, "NAN", f_BigDecimal(1, &arg, rb_cBigDecimal));
 
 
     /* instance methods */
+    rb_define_method(rb_cBigDecimal, "initialize_copy", BigDecimal_initialize_copy, 1);
     rb_define_method(rb_cBigDecimal, "precs", BigDecimal_prec, 0);
 
     rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
     rb_define_method(rb_cBigDecimal, "sub", BigDecimal_sub2, 2);
     rb_define_method(rb_cBigDecimal, "mult", BigDecimal_mult2, 2);
-    rb_define_method(rb_cBigDecimal, "div", BigDecimal_div2, -1);
+    rb_define_method(rb_cBigDecimal, "div", BigDecimal_div3, -1);
     rb_define_method(rb_cBigDecimal, "hash", BigDecimal_hash, 0);
     rb_define_method(rb_cBigDecimal, "to_s", BigDecimal_to_s, -1);
     rb_define_method(rb_cBigDecimal, "to_i", BigDecimal_to_i, 0);
@@ -2957,7 +3474,8 @@ Init_bigdecimal(void)
     rb_define_method(rb_cBigDecimal, "modulo", BigDecimal_mod, 1);
     rb_define_method(rb_cBigDecimal, "remainder", BigDecimal_remainder, 1);
     rb_define_method(rb_cBigDecimal, "divmod", BigDecimal_divmod, 1);
-    /* rb_define_method(rb_cBigDecimal, "dup", BigDecimal_dup, 0); */
+    rb_define_method(rb_cBigDecimal, "clone", BigDecimal_clone, 0);
+    rb_define_method(rb_cBigDecimal, "dup", BigDecimal_clone, 0);
     rb_define_method(rb_cBigDecimal, "to_f", BigDecimal_to_f, 0);
     rb_define_method(rb_cBigDecimal, "abs", BigDecimal_abs, 0);
     rb_define_method(rb_cBigDecimal, "sqrt", BigDecimal_sqrt, 1);
@@ -2988,15 +3506,10 @@ Init_bigdecimal(void)
     rb_define_method(rb_cBigDecimal, "truncate",  BigDecimal_truncate, -1);
     rb_define_method(rb_cBigDecimal, "_dump", BigDecimal_dump, -1);
 
-    /* mathematical functions */
     rb_mBigMath = rb_define_module("BigMath");
     rb_define_singleton_method(rb_mBigMath, "exp", BigMath_s_exp, 2);
     rb_define_singleton_method(rb_mBigMath, "log", BigMath_s_log, 2);
 
-    id_BigDecimal_exception_mode = rb_intern_const("BigDecimal.exception_mode");
-    id_BigDecimal_rounding_mode = rb_intern_const("BigDecimal.rounding_mode");
-    id_BigDecimal_precision_limit = rb_intern_const("BigDecimal.precision_limit");
-
     id_up = rb_intern_const("up");
     id_down = rb_intern_const("down");
     id_truncate = rb_intern_const("truncate");
@@ -3010,6 +3523,7 @@ 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");
 }
 
 /*
@@ -3030,14 +3544,21 @@ static int gfCheckVal = 1;      /* Value checking flag in VpNmlz()  */
 
 static Real *VpConstOne;    /* constant 1.0 */
 static Real *VpPt5;        /* constant 0.5 */
-#define maxnr 100UL    /* Maximum iterations for calcurating sqrt. */
+#define maxnr 100UL    /* Maximum iterations for calculating sqrt. */
                 /* used in VpSqrt() */
 
 /* ETC */
 #define MemCmp(x,y,z) memcmp(x,y,z)
 #define StrCmp(x,y)   strcmp(x,y)
 
-static int VpIsDefOP(Real *c,Real *a,Real *b,int sw);
+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 AddExponent(Real *a, SIGNED_VALUE n);
 static BDIGIT VpAddAbs(Real *a,Real *b,Real *c);
 static BDIGIT VpSubAbs(Real *a,Real *b,Real *c);
@@ -3047,7 +3568,7 @@ static void VpFormatSt(char *psz, size_t fFmt);
 static int VpRdup(Real *m, size_t ind_m);
 
 #ifdef BIGDECIMAL_DEBUG
-static int gnAlloc=0; /* Memory allocation counter */
+static int gnAlloc = 0; /* Memory allocation counter */
 #endif /* BIGDECIMAL_DEBUG */
 
 VP_EXPORT void *
@@ -3055,7 +3576,7 @@ VpMemAlloc(size_t mb)
 {
     void *p = xmalloc(mb);
     if (!p) {
-        VpException(VP_EXCEPTION_MEMORY, "failed to allocate memory", 1);
+	VpException(VP_EXCEPTION_MEMORY, "failed to allocate memory", 1);
     }
     memset(p, 0, mb);
 #ifdef BIGDECIMAL_DEBUG
@@ -3064,21 +3585,31 @@ VpMemAlloc(size_t mb)
     return p;
 }
 
+VP_EXPORT void *
+VpMemRealloc(void *ptr, size_t mb)
+{
+    void *p = xrealloc(ptr, mb);
+    if (!p) {
+	VpException(VP_EXCEPTION_MEMORY, "failed to allocate memory", 1);
+    }
+    return p;
+}
+
 VP_EXPORT void
 VpFree(Real *pv)
 {
-    if(pv != NULL) {
-        xfree(pv);
+    if (pv != NULL) {
+	xfree(pv);
 #ifdef BIGDECIMAL_DEBUG
-        gnAlloc--; /* Decrement allocation count */
-        if(gnAlloc==0) {
-            printf(" *************** All memories allocated freed ****************");
-            getchar();
-        }
-        if(gnAlloc<0) {
-            printf(" ??????????? Too many memory free calls(%d) ?????????????\n",gnAlloc);
-            getchar();
-        }
+	gnAlloc--; /* Decrement allocation count */
+	if (gnAlloc == 0) {
+	    printf(" *************** All memories allocated freed ****************\n");
+	    /*getchar();*/
+	}
+	if (gnAlloc <  0) {
+	    printf(" ??????????? Too many memory free calls(%d) ?????????????\n", gnAlloc);
+	    /*getchar();*/
+	}
 #endif /* BIGDECIMAL_DEBUG */
     }
 }
@@ -3107,7 +3638,7 @@ VpGetException (void)
 	return RMPD_EXCEPTION_MODE_DEFAULT;
     }
 
-    return (unsigned short)FIX2UINT(vmode);
+    return NUM2USHORT(vmode);
 }
 
 static void
@@ -3177,7 +3708,7 @@ VpGetRoundMode(void)
 	return RMPD_ROUNDING_MODE_DEFAULT;
     }
 
-    return (unsigned short)FIX2INT(vmode);
+    return NUM2USHORT(vmode);
 }
 
 VP_EXPORT int
@@ -3217,13 +3748,7 @@ VpSetRoundMode(unsigned short n)
  *    (to let the compiler know they may be changed in outside
  *    (... but not actually..)).
  */
-volatile const double gZero_ABCED9B1_CE73__00400511F31D = 0.0;
 volatile const double gOne_ABCED9B4_CE73__00400511F31D  = 1.0;
-static double
-Zero(void)
-{
-    return gZero_ABCED9B1_CE73__00400511F31D;
-}
 
 static double
 One(void)
@@ -3248,32 +3773,26 @@ One(void)
 VP_EXPORT double
 VpGetDoubleNaN(void) /* Returns the value of NaN */
 {
-    static double fNaN = 0.0;
-    if(fNaN==0.0) fNaN = Zero()/Zero();
-    return fNaN;
+    return nan("");
 }
 
 VP_EXPORT double
 VpGetDoublePosInf(void) /* Returns the value of +Infinity */
 {
-    static double fInf = 0.0;
-    if(fInf==0.0) fInf = One()/Zero();
-    return fInf;
+    return HUGE_VAL;
 }
 
 VP_EXPORT double
 VpGetDoubleNegInf(void) /* Returns the value of -Infinity */
 {
-    static double fInf = 0.0;
-    if(fInf==0.0) fInf = -(One()/Zero());
-    return fInf;
+    return -HUGE_VAL;
 }
 
 VP_EXPORT double
 VpGetDoubleNegZero(void) /* Returns the value of -0 */
 {
     static double nzero = 1000.0;
-    if(nzero!=0.0) nzero = (One()/VpGetDoubleNegInf());
+    if (nzero != 0.0) nzero = (One()/VpGetDoubleNegInf());
     return nzero;
 }
 
@@ -3289,131 +3808,121 @@ VpIsNegDoubleZero(double v)
 VP_EXPORT int
 VpException(unsigned short f, const char *str,int always)
 {
-    VALUE exc;
-    int   fatal=0;
     unsigned short const exception_mode = VpGetException();
 
-    if(f==VP_EXCEPTION_OP || f==VP_EXCEPTION_MEMORY) always = 1;
+    if (f == VP_EXCEPTION_OP || f == VP_EXCEPTION_MEMORY) always = 1;
 
     if (always || (exception_mode & f)) {
-        switch(f)
-        {
-        /*
-        case VP_EXCEPTION_OVERFLOW:
-        */
-        case VP_EXCEPTION_ZERODIVIDE:
-        case VP_EXCEPTION_INFINITY:
-        case VP_EXCEPTION_NaN:
-        case VP_EXCEPTION_UNDERFLOW:
-        case VP_EXCEPTION_OP:
-             exc = rb_eFloatDomainError;
-             goto raise;
-        case VP_EXCEPTION_MEMORY:
-             fatal = 1;
-             goto raise;
-        default:
-             fatal = 1;
-             goto raise;
-        }
+	switch(f) {
+	  /* case VP_EXCEPTION_OVERFLOW: */
+	  case VP_EXCEPTION_ZERODIVIDE:
+	  case VP_EXCEPTION_INFINITY:
+	  case VP_EXCEPTION_NaN:
+	  case VP_EXCEPTION_UNDERFLOW:
+	  case VP_EXCEPTION_OP:
+	    rb_raise(rb_eFloatDomainError, "%s", str);
+	    break;
+	  case VP_EXCEPTION_MEMORY:
+	  default:
+	    rb_fatal("%s", str);
+	}
     }
     return 0; /* 0 Means VpException() raised no exception */
-
-raise:
-    if(fatal) rb_fatal("%s", str);
-    else   rb_raise(exc, "%s", str);
-    return 0;
 }
 
 /* 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,int sw)
-{
-    if(VpIsNaN(a) || VpIsNaN(b)) {
-        /* at least a or b is NaN */
-        VpSetNaN(c);
-        goto NaN;
-    }
-
-    if(VpIsInf(a)) {
-        if(VpIsInf(b)) {
-            switch(sw)
-            {
-            case 1: /* + */
-                if(VpGetSign(a)==VpGetSign(b)) {
-                    VpSetInf(c,VpGetSign(a));
-                    goto Inf;
-                } else {
-                    VpSetNaN(c);
-                    goto NaN;
-                }
-            case 2: /* - */
-                if(VpGetSign(a)!=VpGetSign(b)) {
-                    VpSetInf(c,VpGetSign(a));
-                    goto Inf;
-                } else {
-                    VpSetNaN(c);
-                    goto NaN;
-                }
-                break;
-            case 3: /* * */
-                VpSetInf(c,VpGetSign(a)*VpGetSign(b));
-                goto Inf;
-                break;
-            case 4: /* / */
-                VpSetNaN(c);
-                goto NaN;
-            }
-            VpSetNaN(c);
-            goto NaN;
-        }
-        /* Inf op Finite */
-        switch(sw)
-        {
-        case 1: /* + */
-        case 2: /* - */
-                VpSetInf(c,VpGetSign(a));
-                break;
-        case 3: /* * */
-                if(VpIsZero(b)) {
-                    VpSetNaN(c);
-                    goto NaN;
-                }
-                VpSetInf(c,VpGetSign(a)*VpGetSign(b));
-                break;
-        case 4: /* / */
-                VpSetInf(c,VpGetSign(a)*VpGetSign(b));
-        }
-        goto Inf;
+VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
+{
+    if (VpIsNaN(a) || VpIsNaN(b)) {
+	/* at least a or b is NaN */
+	VpSetNaN(c);
+	goto NaN;
     }
 
-    if(VpIsInf(b)) {
-        switch(sw)
-        {
-        case 1: /* + */
-                VpSetInf(c,VpGetSign(b));
-                break;
-        case 2: /* - */
-                VpSetInf(c,-VpGetSign(b));
-                break;
-        case 3: /* * */
-                if(VpIsZero(a)) {
-                    VpSetNaN(c);
-                    goto NaN;
-                }
-                VpSetInf(c,VpGetSign(a)*VpGetSign(b));
-                break;
-        case 4: /* / */
-                VpSetZero(c,VpGetSign(a)*VpGetSign(b));
-        }
-        goto Inf;
+    if (VpIsInf(a)) {
+	if (VpIsInf(b)) {
+	    switch(sw) {
+	      case OP_SW_ADD: /* + */
+		if (VpGetSign(a) == VpGetSign(b)) {
+		    VpSetInf(c, VpGetSign(a));
+		    goto Inf;
+		}
+		else {
+		    VpSetNaN(c);
+		    goto NaN;
+		}
+	      case OP_SW_SUB: /* - */
+		if (VpGetSign(a) != VpGetSign(b)) {
+		    VpSetInf(c, VpGetSign(a));
+		    goto Inf;
+		}
+		else {
+		    VpSetNaN(c);
+		    goto NaN;
+		}
+	      case OP_SW_MULT: /* * */
+		VpSetInf(c, VpGetSign(a)*VpGetSign(b));
+		goto Inf;
+	      case OP_SW_DIV: /* / */
+		VpSetNaN(c);
+		goto NaN;
+	    }
+	    VpSetNaN(c);
+	    goto NaN;
+	}
+	/* Inf op Finite */
+	switch(sw) {
+	  case OP_SW_ADD: /* + */
+	  case OP_SW_SUB: /* - */
+	    VpSetInf(c, VpGetSign(a));
+	    break;
+	  case OP_SW_MULT: /* * */
+	    if (VpIsZero(b)) {
+		VpSetNaN(c);
+		goto NaN;
+	    }
+	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
+	    break;
+	  case OP_SW_DIV: /* / */
+	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
+	}
+	goto Inf;
+    }
+
+    if (VpIsInf(b)) {
+	switch(sw) {
+	  case OP_SW_ADD: /* + */
+	    VpSetInf(c, VpGetSign(b));
+	    break;
+	  case OP_SW_SUB: /* - */
+	    VpSetInf(c, -VpGetSign(b));
+	    break;
+	  case OP_SW_MULT: /* * */
+	    if (VpIsZero(a)) {
+		VpSetNaN(c);
+		goto NaN;
+	    }
+	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
+	    break;
+	  case OP_SW_DIV: /* / */
+	    VpSetZero(c, VpGetSign(a)*VpGetSign(b));
+	}
+	goto Inf;
     }
     return 1; /* Results OK */
 
 Inf:
-    return VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
+    if (VpIsPosInf(c)) {
+	return VpException(VP_EXCEPTION_INFINITY, "Computation results to 'Infinity'", 0);
+    }
+    else {
+	return VpException(VP_EXCEPTION_INFINITY, "Computation results to '-Infinity'", 0);
+    }
+
 NaN:
-    return VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'",0);
+    return VpException(VP_EXCEPTION_NaN, "Computation results to 'NaN'", 0);
 }
 
 /*
@@ -3429,26 +3938,26 @@ VpNumOfChars(Real *vp,const char *pszFmt)
     SIGNED_VALUE  ex;
     size_t nc;
 
-    if(vp == NULL)   return BASE_FIG*2+6;
-    if(!VpIsDef(vp)) return 32; /* not sure,may be OK */
-
-    switch(*pszFmt)
-    {
-    case 'F':
-         nc = BASE_FIG*(vp->Prec + 1)+2;
-         ex = vp->exponent;
-         if(ex < 0) {
-             nc += BASE_FIG*(size_t)(-ex);
-         }
-	 else {
-             if((size_t)ex > vp->Prec) {
-                 nc += BASE_FIG*((size_t)ex - vp->Prec);
-             }
-         }
-         break;
-    case 'E':
-    default:
-         nc = BASE_FIG*(vp->Prec + 2)+6; /* 3: sign + exponent chars */
+    if (vp == NULL)   return BASE_FIG*2+6;
+    if (!VpIsDef(vp)) return 32; /* not sure,may be OK */
+
+    switch(*pszFmt) {
+      case 'F':
+	nc = BASE_FIG*(vp->Prec + 1)+2;
+	ex = vp->exponent;
+	if (ex < 0) {
+	    nc += BASE_FIG*(size_t)(-ex);
+	}
+	else {
+	    if ((size_t)ex > vp->Prec) {
+		nc += BASE_FIG*((size_t)ex - vp->Prec);
+	    }
+	}
+	break;
+      case 'E':
+	/* fall through */
+      default:
+	nc = BASE_FIG*(vp->Prec + 2)+6; /* 3: sign + exponent chars */
     }
     return nc;
 }
@@ -3458,7 +3967,7 @@ VpNumOfChars(Real *vp,const char *pszFmt)
  * [Input]
  *   BaseVal: Base value(assigned to BASE) for Vp calculation.
  *   It must be the form BaseVal=10**n.(n=1,2,3,...)
- *   If Base <= 0L,then the BASE will be calcurated so
+ *   If Base <= 0L,then the BASE will be calculated so
  *   that BASE is as large as possible satisfying the
  *   relation MaxVal <= BASE*(BASE+1). Where the value
  *   MaxVal is the largest value which can be represented
@@ -3471,27 +3980,24 @@ VP_EXPORT size_t
 VpInit(BDIGIT BaseVal)
 {
     /* Setup +/- Inf  NaN -0 */
-    VpGetDoubleNaN();
-    VpGetDoublePosInf();
-    VpGetDoubleNegInf();
     VpGetDoubleNegZero();
 
     /* Allocates Vp constants. */
-    VpConstOne = VpAlloc(1UL, "1");
-    VpPt5 = VpAlloc(1UL, ".5");
+    VpConstOne = VpAlloc(1UL, "1", 1, 1);
+    VpPt5 = VpAlloc(1UL, ".5", 1, 1);
 
 #ifdef BIGDECIMAL_DEBUG
     gnAlloc = 0;
 #endif /* BIGDECIMAL_DEBUG */
 
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        printf("VpInit: BaseVal   = %lu\n", BaseVal);
-        printf("  BASE   = %lu\n", BASE);
-        printf("  HALF_BASE = %lu\n", HALF_BASE);
-        printf("  BASE1  = %lu\n", BASE1);
-        printf("  BASE_FIG  = %u\n", BASE_FIG);
-        printf("  DBLE_FIG  = %d\n", DBLE_FIG);
+    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);
     }
 #endif /* BIGDECIMAL_DEBUG */
 
@@ -3511,28 +4017,81 @@ AddExponent(Real *a, SIGNED_VALUE n)
     SIGNED_VALUE e = a->exponent;
     SIGNED_VALUE m = e+n;
     SIGNED_VALUE eb, mb;
-    if(e>0) {
-        if(n>0) {
-            mb = m*(SIGNED_VALUE)BASE_FIG;
-            eb = e*(SIGNED_VALUE)BASE_FIG;
-            if(mb<eb) goto overflow;
-        }
-    } else if(n<0) {
-        mb = m*(SIGNED_VALUE)BASE_FIG;
-        eb = e*(SIGNED_VALUE)BASE_FIG;
-        if(mb>eb) goto underflow;
+    if (e > 0) {
+	if (n > 0) {
+            if (MUL_OVERFLOW_SIGNED_VALUE_P(m, (SIGNED_VALUE)BASE_FIG) ||
+                MUL_OVERFLOW_SIGNED_VALUE_P(e, (SIGNED_VALUE)BASE_FIG))
+                goto overflow;
+	    mb = m*(SIGNED_VALUE)BASE_FIG;
+	    eb = e*(SIGNED_VALUE)BASE_FIG;
+	    if (eb - mb > 0) goto overflow;
+	}
+    }
+    else if (n < 0) {
+        if (MUL_OVERFLOW_SIGNED_VALUE_P(m, (SIGNED_VALUE)BASE_FIG) ||
+            MUL_OVERFLOW_SIGNED_VALUE_P(e, (SIGNED_VALUE)BASE_FIG))
+            goto underflow;
+	mb = m*(SIGNED_VALUE)BASE_FIG;
+	eb = e*(SIGNED_VALUE)BASE_FIG;
+	if (mb - eb > 0) goto underflow;
     }
     a->exponent = m;
     return 1;
 
 /* Overflow/Underflow ==> Raise exception or returns 0 */
 underflow:
-    VpSetZero(a,VpGetSign(a));
-    return VpException(VP_EXCEPTION_UNDERFLOW,"Exponent underflow",0);
+    VpSetZero(a, VpGetSign(a));
+    return VpException(VP_EXCEPTION_UNDERFLOW, "Exponent underflow", 0);
 
 overflow:
-    VpSetInf(a,VpGetSign(a));
-    return VpException(VP_EXCEPTION_OVERFLOW,"Exponent overflow",0);
+    VpSetInf(a, VpGetSign(a));
+    return VpException(VP_EXCEPTION_OVERFLOW, "Exponent overflow", 0);
+}
+
+Real *
+rmpd_parse_special_string(const char *str)
+{
+    static const struct {
+        const char *str;
+        size_t len;
+        int sign;
+    } table[] = {
+        { SZ_INF,  sizeof(SZ_INF)  - 1, VP_SIGN_POSITIVE_INFINITE },
+        { SZ_PINF, sizeof(SZ_PINF) - 1, VP_SIGN_POSITIVE_INFINITE },
+        { SZ_NINF, sizeof(SZ_NINF) - 1, VP_SIGN_NEGATIVE_INFINITE },
+        { SZ_NaN,  sizeof(SZ_NaN)  - 1, VP_SIGN_NaN               }
+    };
+    static const size_t table_length = sizeof(table) / sizeof(table[0]);
+    size_t i;
+
+    for (i = 0; i < table_length; ++i) {
+        const char *p;
+        if (strncmp(str, table[i].str, table[i].len) != 0) {
+            continue;
+        }
+
+        p = str + table[i].len;
+        while (*p && ISSPACE(*p)) ++p;
+        if (*p == '\0') {
+            Real *vp = VpAllocReal(1);
+            vp->MaxPrec = 1;
+            switch (table[i].sign) {
+              default:
+                UNREACHABLE; break;
+              case VP_SIGN_POSITIVE_INFINITE:
+                VpSetPosInf(vp);
+                return vp;
+              case VP_SIGN_NEGATIVE_INFINITE:
+                VpSetNegInf(vp);
+                return vp;
+              case VP_SIGN_NaN:
+                VpSetNaN(vp);
+                return vp;
+            }
+        }
+    }
+
+    return NULL;
 }
 
 /*
@@ -3549,142 +4108,222 @@ overflow:
  *   NULL be returned if memory allocation is failed,or any error.
  */
 VP_EXPORT Real *
-VpAlloc(size_t mx, const char *szVal)
+VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
 {
-    size_t i, ni, ipn, ipf, nf, ipe, ne, nalloc;
-    char v,*psz;
+    const char *orig_szVal = szVal;
+    size_t i, j, ni, ipf, nf, ipe, ne, dot_seen, exp_seen, nalloc;
+    char v, *psz;
     int  sign=1;
     Real *vp = NULL;
     size_t mf = VpGetPrecLimit();
     VALUE buf;
 
-    mx = (mx + BASE_FIG - 1) / BASE_FIG + 1;    /* Determine allocation unit. */
+    mx = (mx + BASE_FIG - 1) / BASE_FIG;    /* Determine allocation unit. */
+    if (mx == 0) ++mx;
+
     if (szVal) {
+        /* Skipping leading spaces */
         while (ISSPACE(*szVal)) szVal++;
+
+        /* Processing the leading one `#` */
         if (*szVal != '#') {
-             if (mf) {
+            if (mf) {
                 mf = (mf + BASE_FIG - 1) / BASE_FIG + 2; /* Needs 1 more for div */
                 if (mx > mf) {
                     mx = mf;
                 }
             }
         }
-	else {
+        else {
             ++szVal;
         }
     }
     else {
-       /* necessary to be able to store */
-       /* at least mx digits. */
-       /* szVal==NULL ==> allocate zero value. */
-       vp = (Real *) VpMemAlloc(sizeof(Real) + mx * sizeof(BDIGIT));
-       /* 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 */
-    ni = 0;
-    buf = rb_str_tmp_new(strlen(szVal)+1);
-    psz = RSTRING_PTR(buf);
-    i   = 0;
-    ipn = 0;
-    while ((psz[i]=szVal[ipn]) != 0) {
-        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;
+      return_zero:
+        /* 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;
     }
-    szVal = psz;
 
     /* Check on Inf & NaN */
-    if (StrCmp(szVal, SZ_PINF) == 0 ||
-        StrCmp(szVal, SZ_INF)  == 0 ) {
-        vp = (Real *) VpMemAlloc(sizeof(Real) + sizeof(BDIGIT));
-        vp->MaxPrec = 1;    /* set max precision */
-        VpSetPosInf(vp);
-        return vp;
-    }
-    if (StrCmp(szVal, SZ_NINF) == 0) {
-        vp = (Real *) VpMemAlloc(sizeof(Real) + sizeof(BDIGIT));
-        vp->MaxPrec = 1;    /* set max precision */
-        VpSetNegInf(vp);
-        return vp;
-    }
-    if (StrCmp(szVal, SZ_NaN) == 0) {
-        vp = (Real *) VpMemAlloc(sizeof(Real) + sizeof(BDIGIT));
-        vp->MaxPrec = 1;    /* set max precision */
-        VpSetNaN(vp);
+    if ((vp = rmpd_parse_special_string(szVal)) != NULL) {
         return vp;
     }
 
-    /* check on number szVal[] */
-    ipn = i = 0;
-    if      (szVal[i] == '-') { sign=-1; ++i; }
-    else if (szVal[i] == '+')            ++i;
-    /* Skip digits */
-    ni = 0;            /* digits in mantissa */
-    while ((v = szVal[i]) != 0) {
-        if (!ISDIGIT(v)) break;
+    /* Scanning digits */
+
+    /* A buffer for keeping scanned digits */
+    buf = rb_str_tmp_new(strlen(szVal) + 1);
+    psz = RSTRING_PTR(buf);
+
+    /* cursor: i for psz, and j for szVal */
+    i = j = 0;
+
+    /* Scanning: sign part */
+    v = psz[i] = szVal[j];
+    if ((v == '-') || (v == '+')) {
+        sign = -(v == '-');
         ++i;
+        ++j;
+    }
+
+    /* Scanning: integer part */
+    ni  = 0; /* number of digits in the integer part */
+    while ((v = psz[i] = szVal[j]) != '\0') {
+        if (!strict_p && ISSPACE(v)) {
+            v = psz[i] = '\0';
+            break;
+        }
+        if (v == '_') {
+            if (ni > 0) {
+                v = szVal[j+1];
+                if (v == '\0' || ISSPACE(v) || ISDIGIT(v)) {
+                    ++j;
+                    continue;
+                }
+                if (!strict_p) {
+                    v = psz[i] = '\0';
+                    break;
+                }
+            }
+            goto invalid_value;
+        }
+        if (!ISDIGIT(v)) {
+            break;
+        }
         ++ni;
+        ++i;
+        ++j;
     }
-    nf  = 0;
-    ipf = 0;
-    ipe = 0;
-    ne  = 0;
-    if (v) {
-        /* other than digit nor \0 */
-        if (szVal[i] == '.') {    /* xxx. */
+
+    /* Scanning: fractional part */
+    nf  = 0; /* number of digits in the fractional part */
+    ne  = 0; /* number of digits in the exponential part */
+    ipf = 0; /* index of the beginning of the fractional part */
+    ipe = 0; /* index of the beginning of the exponential part */
+    dot_seen = 0;
+    exp_seen = 0;
+
+    if (v != '\0') {
+        /* Scanning fractional part */
+        if ((psz[i] = szVal[j]) == '.') {
+            dot_seen = 1;
             ++i;
+            ++j;
             ipf = i;
-            while ((v = szVal[i]) != 0) {    /* get fraction part. */
+            while ((v = psz[i] = szVal[j]) != '\0') {
+                if (!strict_p && ISSPACE(v)) {
+                    v = psz[i] = '\0';
+                    break;
+                }
+                if (v == '_') {
+                    if (nf > 0 && ISDIGIT(szVal[j+1])) {
+                        ++j;
+                        continue;
+                    }
+                    if (!strict_p) {
+                        v = psz[i] = '\0';
+                        if (nf == 0) {
+                            dot_seen = 0;
+                        }
+                        break;
+                    }
+                    goto invalid_value;
+                }
                 if (!ISDIGIT(v)) break;
                 ++i;
+                ++j;
                 ++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;
+        /* Scanning exponential part */
+        if (v != '\0') {
+            switch ((psz[i] = szVal[j])) {
+                case '\0':
+                    break;
+                case 'e': case 'E':
+                case 'd': case 'D':
+                    exp_seen = 1;
+                    ++i;
+                    ++j;
+                    ipe = i;
+                    v = psz[i] = szVal[j];
+                    if ((v == '-') || (v == '+')) {
+                        ++i;
+                        ++j;
+                    }
+                    while ((v = psz[i] = szVal[j]) != '\0') {
+                        if (!strict_p && ISSPACE(v)) {
+                            v = psz[i] = '\0';
+                            break;
+                        }
+                        if (v == '_') {
+                            if (ne > 0 && ISDIGIT(szVal[j+1])) {
+                                ++j;
+                                continue;
+                            }
+                            if (!strict_p) {
+                                v = psz[i] = '\0';
+                                if (ne == 0) {
+                                    exp_seen = 0;
+                                }
+                                break;
+                            }
+                            goto invalid_value;
+                        }
+                        if (!ISDIGIT(v)) break;
+                        ++i;
+                        ++j;
+                        ++ne;
+                    }
+                    break;
+                default:
+                    break;
             }
-            break;
-        default:
-            break;
         }
+
+        if (v != '\0') {
+            /* Scanning trailing spaces */
+            while (ISSPACE(szVal[j])) ++j;
+
+            /* Invalid character */
+            if (szVal[j] && strict_p) {
+                goto invalid_value;
+            }
+        }
+    }
+
+    psz[i] = '\0';
+
+    if (strict_p && (((ni == 0 || dot_seen) && nf == 0) || (exp_seen && ne == 0))) {
+        VALUE str;
+      invalid_value:
+        if (!strict_p) {
+            goto return_zero;
+        }
+        if (!exc) {
+            return NULL;
+        }
+        str = rb_str_new2(orig_szVal);
+        rb_raise(rb_eArgError, "invalid value for BigDecimal(): \"%"PRIsVALUE"\"", str);
     }
+
     nalloc = (ni + nf + BASE_FIG - 1) / BASE_FIG + 1;    /* set effective allocation  */
     /* units for szVal[]  */
-    if (mx <= 0) mx = 1;
+    if (mx == 0) mx = 1;
     nalloc = Max(nalloc, mx);
     mx = nalloc;
-    vp = (Real *) VpMemAlloc(sizeof(Real) + mx * sizeof(BDIGIT));
+    vp = VpAllocReal(mx);
     /* xmalloc() alway returns(or throw interruption) */
     vp->MaxPrec = mx;        /* set max precision */
     VpSetZero(vp, sign);
-    VpCtoV(vp, &szVal[ipn], ni, &szVal[ipf], nf, &szVal[ipe], ne);
+    VpCtoV(vp, psz, ni, psz + ipf, nf, psz + ipe, ne);
     rb_str_resize(buf, 0);
     return vp;
 }
@@ -3705,42 +4344,44 @@ VP_EXPORT size_t
 VpAsgn(Real *c, Real *a, int isw)
 {
     size_t n;
-    if(VpIsNaN(a)) {
-        VpSetNaN(c);
-        return 0;
+    if (VpIsNaN(a)) {
+	VpSetNaN(c);
+	return 0;
     }
-    if(VpIsInf(a)) {
-        VpSetInf(c,isw*VpGetSign(a));
-        return 0;
+    if (VpIsInf(a)) {
+	VpSetInf(c, isw * VpGetSign(a));
+	return 0;
     }
 
     /* check if the RHS is zero */
-    if(!VpIsZero(a)) {
-        c->exponent = a->exponent;    /* store  exponent */
-        VpSetSign(c,(isw*VpGetSign(a)));    /* set sign */
-        n =(a->Prec < c->MaxPrec) ?(a->Prec) :(c->MaxPrec);
-        c->Prec = n;
-        memcpy(c->frac, a->frac, n * sizeof(BDIGIT));
-        /* Needs round ? */
-        if(isw!=10) {
-            /* Not in ActiveRound */
-            if(c->Prec < a->Prec) {
-		VpInternalRound(c,n,(n>0)?a->frac[n-1]:0,a->frac[n]);
-            } else {
+    if (!VpIsZero(a)) {
+	c->exponent = a->exponent;    /* store  exponent */
+	VpSetSign(c, isw * VpGetSign(a));    /* set sign */
+	n = (a->Prec < c->MaxPrec) ? (a->Prec) : (c->MaxPrec);
+	c->Prec = n;
+	memcpy(c->frac, a->frac, n * sizeof(BDIGIT));
+	/* Needs round ? */
+	if (isw != 10) {
+	    /* Not in ActiveRound */
+	    if(c->Prec < a->Prec) {
+		VpInternalRound(c, n, (n>0) ? a->frac[n-1] : 0, a->frac[n]);
+	    }
+	    else {
 		VpLimitRound(c,0);
-            }
-        }
-    } else {
-        /* The value of 'a' is zero.  */
-        VpSetZero(c,isw*VpGetSign(a));
-        return 1;
+	    }
+	}
     }
-    return c->Prec*BASE_FIG;
+    else {
+	/* The value of 'a' is zero.  */
+	VpSetZero(c, isw * VpGetSign(a));
+	return 1;
+    }
+    return c->Prec * BASE_FIG;
 }
 
 /*
  *   c = a + b  when operation =  1 or 2
- *  = a - b  when operation = -1 or -2.
+ *   c = a - b  when operation = -1 or -2.
  *   Returns number of significant digits of c
  */
 VP_EXPORT size_t
@@ -3752,83 +4393,87 @@ VpAddSub(Real *c, Real *a, Real *b, int operation)
     BDIGIT mrv;
 
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpAddSub(enter) a=% \n", a);
-        VPrint(stdout, "     b=% \n", b);
-        printf(" operation=%d\n", operation);
+    if (gfDebug) {
+	VPrint(stdout, "VpAddSub(enter) a=% \n", a);
+	VPrint(stdout, "     b=% \n", b);
+	printf(" operation=%d\n", operation);
     }
 #endif /* BIGDECIMAL_DEBUG */
 
-    if(!VpIsDefOP(c,a,b,(operation>0)?1:2)) return 0; /* No significant digits */
+    if (!VpIsDefOP(c, a, b, (operation > 0) ? OP_SW_ADD : OP_SW_SUB)) return 0; /* No significant digits */
 
     /* check if a or b is zero  */
-    if(VpIsZero(a)) {
-        /* a is zero,then assign b to c */
-        if(!VpIsZero(b)) {
-            VpAsgn(c, b, operation);
-        } else {
-            /* Both a and b are zero. */
-            if(VpGetSign(a)<0 && operation*VpGetSign(b)<0) {
-                /* -0 -0 */
-                VpSetZero(c,-1);
-            } else {
-                VpSetZero(c,1);
-            }
-            return 1; /* 0: 1 significant digits */
-        }
-        return c->Prec*BASE_FIG;
+    if (VpIsZero(a)) {
+	/* a is zero,then assign b to c */
+	if (!VpIsZero(b)) {
+	    VpAsgn(c, b, operation);
+	}
+	else {
+	    /* Both a and b are zero. */
+	    if (VpGetSign(a) < 0 && operation * VpGetSign(b) < 0) {
+		/* -0 -0 */
+		VpSetZero(c, -1);
+	    }
+	    else {
+		VpSetZero(c, 1);
+	    }
+	    return 1; /* 0: 1 significant digits */
+	}
+	return c->Prec * BASE_FIG;
     }
-    if(VpIsZero(b)) {
-        /* b is zero,then assign a to c. */
-        VpAsgn(c, a, 1);
-        return c->Prec*BASE_FIG;
+    if (VpIsZero(b)) {
+	/* b is zero,then assign a to c. */
+	VpAsgn(c, a, 1);
+	return c->Prec*BASE_FIG;
     }
 
-    if(operation < 0) sw = -1;
-    else              sw =  1;
+    if (operation < 0) sw = -1;
+    else               sw =  1;
 
     /* compare absolute value. As a result,|a_ptr|>=|b_ptr| */
-    if(a->exponent > b->exponent) {
-        a_ptr = a;
-        b_ptr = b;
+    if (a->exponent > b->exponent) {
+	a_ptr = a;
+	b_ptr = b;
     }         /* |a|>|b| */
-    else if(a->exponent < b->exponent) {
-        a_ptr = b;
-        b_ptr = a;
+    else if (a->exponent < b->exponent) {
+	a_ptr = b;
+	b_ptr = a;
     }                /* |a|<|b| */
     else {
-        /* Exponent part of a and b is the same,then compare fraction */
-        /* part */
-        na = a->Prec;
-        nb = b->Prec;
-        n = Min(na, nb);
-        for(i=0;i < n; ++i) {
-            if(a->frac[i] > b->frac[i]) {
-                a_ptr = a;
-                b_ptr = b;
-                goto end_if;
-            } else if(a->frac[i] < b->frac[i]) {
-                a_ptr = b;
-                b_ptr = a;
-                goto end_if;
-            }
-        }
-        if(na > nb) {
-         a_ptr = a;
-            b_ptr = b;
-            goto end_if;
-        } else if(na < nb) {
-            a_ptr = b;
-            b_ptr = a;
-            goto end_if;
-        }
-        /* |a| == |b| */
-        if(VpGetSign(a) + sw *VpGetSign(b) == 0) {
-            VpSetZero(c,1);        /* abs(a)=abs(b) and operation = '-'  */
-            return c->Prec*BASE_FIG;
-        }
-        a_ptr = a;
-        b_ptr = b;
+	/* Exponent part of a and b is the same,then compare fraction */
+	/* part */
+	na = a->Prec;
+	nb = b->Prec;
+	n  = Min(na, nb);
+	for (i=0; i < n; ++i) {
+	    if (a->frac[i] > b->frac[i]) {
+		a_ptr = a;
+		b_ptr = b;
+		goto end_if;
+	    }
+	    else if (a->frac[i] < b->frac[i]) {
+		a_ptr = b;
+		b_ptr = a;
+		goto end_if;
+	    }
+	}
+	if (na > nb) {
+	    a_ptr = a;
+	    b_ptr = b;
+	    goto end_if;
+	}
+	else if (na < nb) {
+	    a_ptr = b;
+	    b_ptr = a;
+	    goto end_if;
+	}
+	/* |a| == |b| */
+	if (VpGetSign(a) + sw *VpGetSign(b) == 0) {
+	    VpSetZero(c, 1);        /* abs(a)=abs(b) and operation = '-'  */
+	    return c->Prec * BASE_FIG;
+	}
+	a_ptr = a;
+	b_ptr = b;
     }
 
 end_if:
@@ -3839,35 +4484,37 @@ end_if:
      *      =-2 ...(-1)+(-1),(-1)-( 1)
      *   If isw==0, then c =(Sign a_ptr)(|a_ptr|-|b_ptr|)
      *              else c =(Sign ofisw)(|a_ptr|+|b_ptr|)
-    */
-    if(isw) {            /* addition */
-        VpSetSign(c, 1);
-        mrv = VpAddAbs(a_ptr, b_ptr, c);
-        VpSetSign(c, isw / 2);
-    } else {            /* subtraction */
-        VpSetSign(c, 1);
-        mrv = VpSubAbs(a_ptr, b_ptr, c);
-        if(a_ptr == a) {
-            VpSetSign(c,VpGetSign(a));
-        } else    {
-            VpSetSign(c,VpGetSign(a_ptr) * sw);
-        }
+     */
+    if (isw) {            /* addition */
+	VpSetSign(c, 1);
+	mrv = VpAddAbs(a_ptr, b_ptr, c);
+	VpSetSign(c, isw / 2);
+    }
+    else {            /* subtraction */
+	VpSetSign(c, 1);
+	mrv = VpSubAbs(a_ptr, b_ptr, c);
+	if (a_ptr == a) {
+	    VpSetSign(c,VpGetSign(a));
+	}
+	else {
+	    VpSetSign(c, VpGetSign(a_ptr) * sw);
+	}
     }
-    VpInternalRound(c,0,(c->Prec>0)?c->frac[c->Prec-1]:0,mrv);
+    VpInternalRound(c, 0, (c->Prec > 0) ? c->frac[c->Prec-1] : 0, mrv);
 
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpAddSub(result) c=% \n", c);
-        VPrint(stdout, "     a=% \n", a);
-        VPrint(stdout, "     b=% \n", b);
-        printf(" operation=%d\n", operation);
+    if (gfDebug) {
+	VPrint(stdout, "VpAddSub(result) c=% \n", c);
+	VPrint(stdout, "     a=% \n", a);
+	VPrint(stdout, "     b=% \n", b);
+	printf(" operation=%d\n", operation);
     }
 #endif /* BIGDECIMAL_DEBUG */
-    return c->Prec*BASE_FIG;
+    return c->Prec * BASE_FIG;
 }
 
 /*
- * Addition of two variable precisional variables
+ * Addition of two values with variable precision
  * a and b assuming abs(a)>abs(b).
  *   c = abs(a) + abs(b) ; where |a|>=|b|
  */
@@ -3884,9 +4531,9 @@ VpAddAbs(Real *a, Real *b, Real *c)
     BDIGIT av, bv, carry, mrv;
 
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpAddAbs called: a = %\n", a);
-        VPrint(stdout, "     b = %\n", b);
+    if (gfDebug) {
+	VPrint(stdout, "VpAddAbs called: a = %\n", a);
+	VPrint(stdout, "     b = %\n", b);
     }
 #endif /* BIGDECIMAL_DEBUG */
 
@@ -3894,55 +4541,59 @@ VpAddAbs(Real *a, Real *b, Real *c)
     a_pos = ap;
     b_pos = bp;
     c_pos = cp;
-    if(word_shift==(size_t)-1L) return 0; /* Overflow */
-    if(b_pos == (size_t)-1L) goto Assign_a;
+
+    if (word_shift == (size_t)-1L) return 0; /* Overflow */
+    if (b_pos == (size_t)-1L) goto Assign_a;
 
     mrv = av + bv; /* Most right val. Used for round. */
 
     /* Just assign the last few digits of b to c because a has no  */
     /* corresponding digits to be added. */
-    while(b_pos + word_shift > a_pos) {
-        --c_pos;
-        if(b_pos > 0) {
-            c->frac[c_pos] = b->frac[--b_pos];
-        } else {
-            --word_shift;
-            c->frac[c_pos] = 0;
-        }
+    if (b_pos > 0) {
+	while (b_pos > 0 && b_pos + word_shift > a_pos) {
+	    c->frac[--c_pos] = b->frac[--b_pos];
+	}
+    }
+    if (b_pos == 0 && word_shift > a_pos) {
+	while (word_shift-- > a_pos) {
+	    c->frac[--c_pos] = 0;
+	}
     }
 
     /* Just assign the last few digits of a to c because b has no */
     /* corresponding digits to be added. */
     b_pos_with_word_shift = b_pos + word_shift;
-    while(a_pos > b_pos_with_word_shift) {
-        c->frac[--c_pos] = a->frac[--a_pos];
+    while (a_pos > b_pos_with_word_shift) {
+	c->frac[--c_pos] = a->frac[--a_pos];
     }
     carry = 0;    /* set first carry be zero */
 
     /* Now perform addition until every digits of b will be */
     /* exhausted. */
-    while(b_pos > 0) {
-        c->frac[--c_pos] = a->frac[--a_pos] + b->frac[--b_pos] + carry;
-        if(c->frac[c_pos] >= BASE) {
-            c->frac[c_pos] -= BASE;
-            carry = 1;
-        } else {
-            carry = 0;
-        }
+    while (b_pos > 0) {
+	c->frac[--c_pos] = a->frac[--a_pos] + b->frac[--b_pos] + carry;
+	if (c->frac[c_pos] >= BASE) {
+	    c->frac[c_pos] -= BASE;
+	    carry = 1;
+	}
+	else {
+	    carry = 0;
+	}
     }
 
     /* Just assign the first few digits of a with considering */
     /* the carry obtained so far because b has been exhausted. */
-    while(a_pos > 0) {
-        c->frac[--c_pos] = a->frac[--a_pos] + carry;
-        if(c->frac[c_pos] >= BASE) {
-            c->frac[c_pos] -= BASE;
-            carry = 1;
-        } else {
-            carry = 0;
-        }
+    while (a_pos > 0) {
+	c->frac[--c_pos] = a->frac[--a_pos] + carry;
+	if (c->frac[c_pos] >= BASE) {
+	    c->frac[c_pos] -= BASE;
+	    carry = 1;
+	}
+	else {
+	    carry = 0;
+	}
     }
-    if(c_pos) c->frac[c_pos - 1] += carry;
+    if (c_pos) c->frac[c_pos - 1] += carry;
     goto Exit;
 
 Assign_a:
@@ -3952,8 +4603,8 @@ Assign_a:
 Exit:
 
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpAddAbs exit: c=% \n", c);
+    if (gfDebug) {
+	VPrint(stdout, "VpAddAbs exit: c=% \n", c);
     }
 #endif /* BIGDECIMAL_DEBUG */
     return mrv;
@@ -3975,9 +4626,9 @@ VpSubAbs(Real *a, Real *b, Real *c)
     BDIGIT av, bv, borrow, mrv;
 
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpSubAbs called: a = %\n", a);
-        VPrint(stdout, "     b = %\n", b);
+    if (gfDebug) {
+	VPrint(stdout, "VpSubAbs called: a = %\n", a);
+	VPrint(stdout, "     b = %\n", b);
     }
 #endif /* BIGDECIMAL_DEBUG */
 
@@ -3985,66 +4636,70 @@ VpSubAbs(Real *a, Real *b, Real *c)
     a_pos = ap;
     b_pos = bp;
     c_pos = cp;
-    if(word_shift==(size_t)-1L) return 0; /* Overflow */
-    if(b_pos == (size_t)-1L) goto Assign_a;
+    if (word_shift == (size_t)-1L) return 0; /* Overflow */
+    if (b_pos == (size_t)-1L) goto Assign_a;
 
-    if(av >= bv) {
-        mrv = av - bv;
-        borrow = 0;
-    } else {
-        mrv    = 0;
-        borrow = 1;
+    if (av >= bv) {
+	mrv = av - bv;
+	borrow = 0;
+    }
+    else {
+	mrv    = 0;
+	borrow = 1;
     }
 
     /* Just assign the values which are the BASE subtracted by   */
     /* each of the last few digits of the b because the a has no */
     /* corresponding digits to be subtracted. */
-    if(b_pos + word_shift > a_pos) {
-        while(b_pos + word_shift > a_pos) {
-            --c_pos;
-            if(b_pos > 0) {
-                c->frac[c_pos] = BASE - b->frac[--b_pos] - borrow;
-            } else {
-                --word_shift;
-                c->frac[c_pos] = BASE - borrow;
-            }
-            borrow = 1;
-        }
+    if (b_pos + word_shift > a_pos) {
+	while (b_pos > 0 && b_pos + word_shift > a_pos) {
+	    c->frac[--c_pos] = BASE - b->frac[--b_pos] - borrow;
+	    borrow = 1;
+	}
+	if (b_pos == 0) {
+	    while (word_shift > a_pos) {
+		--word_shift;
+		c->frac[--c_pos] = BASE - borrow;
+		borrow = 1;
+	    }
+	}
     }
     /* Just assign the last few digits of a to c because b has no */
     /* corresponding digits to subtract. */
 
     b_pos_with_word_shift = b_pos + word_shift;
-    while(a_pos > b_pos_with_word_shift) {
-        c->frac[--c_pos] = a->frac[--a_pos];
+    while (a_pos > b_pos_with_word_shift) {
+	c->frac[--c_pos] = a->frac[--a_pos];
     }
 
     /* Now perform subtraction until every digits of b will be */
     /* exhausted. */
-    while(b_pos > 0) {
-        --c_pos;
-        if(a->frac[--a_pos] < b->frac[--b_pos] + borrow) {
-            c->frac[c_pos] = BASE + a->frac[a_pos] - b->frac[b_pos] - borrow;
-            borrow = 1;
-        } else {
-            c->frac[c_pos] = a->frac[a_pos] - b->frac[b_pos] - borrow;
-            borrow = 0;
-        }
+    while (b_pos > 0) {
+	--c_pos;
+	if (a->frac[--a_pos] < b->frac[--b_pos] + borrow) {
+	    c->frac[c_pos] = BASE + a->frac[a_pos] - b->frac[b_pos] - borrow;
+	    borrow = 1;
+	}
+	else {
+	    c->frac[c_pos] = a->frac[a_pos] - b->frac[b_pos] - borrow;
+	    borrow = 0;
+	}
     }
 
     /* Just assign the first few digits of a with considering */
     /* the borrow obtained so far because b has been exhausted. */
-    while(a_pos > 0) {
-        --c_pos;
-        if(a->frac[--a_pos] < borrow) {
-            c->frac[c_pos] = BASE + a->frac[a_pos] - borrow;
-            borrow = 1;
-        } else {
-            c->frac[c_pos] = a->frac[a_pos] - borrow;
-            borrow = 0;
-        }
+    while (a_pos > 0) {
+	--c_pos;
+	if (a->frac[--a_pos] < borrow) {
+	    c->frac[c_pos] = BASE + a->frac[a_pos] - borrow;
+	    borrow = 1;
+	}
+	else {
+	    c->frac[c_pos] = a->frac[a_pos] - borrow;
+	    borrow = 0;
+	}
     }
-    if(c_pos) c->frac[c_pos - 1] -= borrow;
+    if (c_pos) c->frac[c_pos - 1] -= borrow;
     goto Exit;
 
 Assign_a:
@@ -4053,8 +4708,8 @@ Assign_a:
 
 Exit:
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpSubAbs exit: c=% \n", c);
+    if (gfDebug) {
+	VPrint(stdout, "VpSubAbs exit: c=% \n", c);
     }
 #endif /* BIGDECIMAL_DEBUG */
     return mrv;
@@ -4078,84 +4733,99 @@ static size_t
 VpSetPTR(Real *a, Real *b, Real *c, size_t *a_pos, size_t *b_pos, size_t *c_pos, BDIGIT *av, BDIGIT *bv)
 {
     size_t left_word, right_word, word_shift;
+
+    size_t const round_limit = (VpGetPrecLimit() + BASE_FIG - 1) / BASE_FIG;
+
+    assert(a->exponent >= b->exponent);
+
     c->frac[0] = 0;
     *av = *bv = 0;
-    word_shift =((a->exponent) -(b->exponent));
+
+    word_shift = (a->exponent - b->exponent);
     left_word = b->Prec + word_shift;
-    right_word = Max((a->Prec),left_word);
-    left_word =(c->MaxPrec) - 1;    /* -1 ... prepare for round up */
+    right_word = Max(a->Prec, left_word);
+    left_word = c->MaxPrec - 1;    /* -1 ... prepare for round up */
+
     /*
      * check if 'round' is needed.
      */
-    if(right_word > left_word) {    /* round ? */
-        /*---------------------------------
-         *  Actual size of a = xxxxxxAxx
-         *  Actual size of b = xxxBxxxxx
-         *  Max. size of   c = xxxxxx
-         *  Round off        =   |-----|
-         *  c_pos            =   |
-         *  right_word       =   |
-         *  a_pos            =    |
-         */
-        *c_pos = right_word = left_word + 1;    /* Set resulting precision */
-        /* be equal to that of c */
-        if((a->Prec) >=(c->MaxPrec)) {
-            /*
-             *   a =  xxxxxxAxxx
-             *   c =  xxxxxx
-             *   a_pos =    |
-             */
-            *a_pos = left_word;
-            *av = a->frac[*a_pos];    /* av is 'A' shown in above. */
-        } else {
-            /*
-             *   a = xxxxxxx
-             *   c = xxxxxxxxxx
-             *  a_pos =     |
-             */
-            *a_pos = a->Prec;
-        }
-        if((b->Prec + word_shift) >= c->MaxPrec) {
-            /*
-             *   a = xxxxxxxxx
-             *   b =  xxxxxxxBxxx
-             *   c = xxxxxxxxxxx
-             *  b_pos =   |
-             */
-            if(c->MaxPrec >=(word_shift + 1)) {
-                *b_pos = c->MaxPrec - word_shift - 1;
-                *bv = b->frac[*b_pos];
-            } else {
-                *b_pos = -1L;
-            }
-        } else {
-            /*
-             *   a = xxxxxxxxxxxxxxxx
-             *   b =  xxxxxx
-             *   c = xxxxxxxxxxxxx
-             *  b_pos =     |
-             */
-            *b_pos = b->Prec;
-        }
-    } else {            /* The MaxPrec of c - 1 > The Prec of a + b  */
-        /*
-         *    a =   xxxxxxx
-         *    b =   xxxxxx
-         *    c = xxxxxxxxxxx
-         *   c_pos =   |
-         */
-        *b_pos = b->Prec;
-        *a_pos = a->Prec;
-        *c_pos = right_word + 1;
+    if (right_word > left_word) {    /* round ? */
+	/*---------------------------------
+	 *  Actual size of a = xxxxxxAxx
+	 *  Actual size of b = xxxBxxxxx
+	 *  Max. size of   c = xxxxxx
+	 *  Round off        =   |-----|
+	 *  c_pos            =   |
+	 *  right_word       =   |
+	 *  a_pos            =    |
+	 */
+	*c_pos = right_word = left_word + 1;    /* Set resulting precision */
+	/* be equal to that of c */
+	if (a->Prec >= c->MaxPrec) {
+	    /*
+	     *   a =  xxxxxxAxxx
+	     *   c =  xxxxxx
+	     *   a_pos =    |
+	     */
+	    *a_pos = left_word;
+	    if (*a_pos <= round_limit) {
+		*av = a->frac[*a_pos];    /* av is 'A' shown in above. */
+	    }
+	}
+	else {
+	    /*
+	     *   a = xxxxxxx
+	     *   c = xxxxxxxxxx
+	     *  a_pos =     |
+	     */
+	    *a_pos = a->Prec;
+	}
+	if (b->Prec + word_shift >= c->MaxPrec) {
+	    /*
+	     *   a = xxxxxxxxx
+	     *   b =  xxxxxxxBxxx
+	     *   c = xxxxxxxxxxx
+	     *  b_pos =   |
+	     */
+	    if (c->MaxPrec >= word_shift + 1) {
+		*b_pos = c->MaxPrec - word_shift - 1;
+		if (*b_pos + word_shift <= round_limit) {
+		    *bv = b->frac[*b_pos];
+		}
+	    }
+	    else {
+		*b_pos = -1L;
+	    }
+	}
+	else {
+	    /*
+	     *   a = xxxxxxxxxxxxxxxx
+	     *   b =  xxxxxx
+	     *   c = xxxxxxxxxxxxx
+	     *  b_pos =     |
+	     */
+	    *b_pos = b->Prec;
+	}
+    }
+    else {            /* The MaxPrec of c - 1 > The Prec of a + b  */
+	/*
+	 *    a =   xxxxxxx
+	 *    b =   xxxxxx
+	 *    c = xxxxxxxxxxx
+	 *   c_pos =   |
+	 */
+	*b_pos = b->Prec;
+	*a_pos = a->Prec;
+	*c_pos = right_word + 1;
     }
     c->Prec = *c_pos;
     c->exponent = a->exponent;
-    if(!AddExponent(c,1)) return (size_t)-1L;
+    if (!AddExponent(c, 1)) return (size_t)-1L;
     return word_shift;
 }
 
 /*
- * Return number og significant digits
+ * Return number of significant digits
  *       c = a * b , Where a = a0a1a2 ... an
  *             b = b0b1b2 ... bm
  *             c = c0c1c2 ... cl
@@ -4174,39 +4844,39 @@ VpMult(Real *c, Real *a, Real *b)
 {
     size_t MxIndA, MxIndB, MxIndAB, MxIndC;
     size_t ind_c, i, ii, nc;
-    size_t ind_as, ind_ae, ind_bs, ind_be;
+    size_t ind_as, ind_ae, ind_bs;
     BDIGIT carry;
     BDIGIT_DBL s;
     Real *w;
 
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpMult(Enter): a=% \n", a);
-        VPrint(stdout, "      b=% \n", b);
+    if (gfDebug) {
+	VPrint(stdout, "VpMult(Enter): a=% \n", a);
+	VPrint(stdout, "      b=% \n", b);
     }
 #endif /* BIGDECIMAL_DEBUG */
 
-    if(!VpIsDefOP(c,a,b,3)) return 0; /* No significant digit */
+    if (!VpIsDefOP(c, a, b, OP_SW_MULT)) return 0; /* No significant digit */
 
-    if(VpIsZero(a) || VpIsZero(b)) {
-        /* at least a or b is zero */
-        VpSetZero(c,VpGetSign(a)*VpGetSign(b));
-        return 1; /* 0: 1 significant digit */
+    if (VpIsZero(a) || VpIsZero(b)) {
+	/* at least a or b is zero */
+	VpSetZero(c, VpGetSign(a) * VpGetSign(b));
+	return 1; /* 0: 1 significant digit */
     }
 
-    if(VpIsOne(a)) {
-        VpAsgn(c, b, VpGetSign(a));
-        goto Exit;
+    if (VpIsOne(a)) {
+	VpAsgn(c, b, VpGetSign(a));
+	goto Exit;
     }
-    if(VpIsOne(b)) {
-        VpAsgn(c, a, VpGetSign(b));
-        goto Exit;
+    if (VpIsOne(b)) {
+	VpAsgn(c, a, VpGetSign(b));
+	goto Exit;
     }
-    if((b->Prec) >(a->Prec)) {
-        /* Adjust so that digits(a)>digits(b) */
-        w = a;
-        a = b;
-        b = w;
+    if (b->Prec > a->Prec) {
+	/* Adjust so that digits(a)>digits(b) */
+	w = a;
+	a = b;
+	b = w;
     }
     w = NULL;
     MxIndA = a->Prec - 1;
@@ -4214,81 +4884,82 @@ VpMult(Real *c, Real *a, Real *b)
     MxIndC = c->MaxPrec - 1;
     MxIndAB = a->Prec + b->Prec - 1;
 
-    if(MxIndC < MxIndAB) {    /* The Max. prec. of c < Prec(a)+Prec(b) */
-        w = c;
-        c = VpAlloc((size_t)((MxIndAB + 1) * BASE_FIG), "#0");
-        MxIndC = MxIndAB;
+    if (MxIndC < MxIndAB) {    /* The Max. prec. of c < Prec(a)+Prec(b) */
+	w = c;
+	c = VpAlloc((size_t)((MxIndAB + 1) * BASE_FIG), "#0", 1, 1);
+	MxIndC = MxIndAB;
     }
 
     /* set LHSV c info */
 
     c->exponent = a->exponent;    /* set exponent */
-    if(!AddExponent(c,b->exponent)) {
-	if(w) VpFree(c);
+    if (!AddExponent(c, b->exponent)) {
+	if (w) VpFree(c);
 	return 0;
     }
-    VpSetSign(c,VpGetSign(a)*VpGetSign(b));    /* set sign  */
+    VpSetSign(c, VpGetSign(a) * VpGetSign(b));    /* set sign  */
     carry = 0;
     nc = ind_c = MxIndAB;
     memset(c->frac, 0, (nc + 1) * sizeof(BDIGIT));        /* Initialize c  */
     c->Prec = nc + 1;        /* set precision */
-    for(nc = 0; nc < MxIndAB; ++nc, --ind_c) {
-        if(nc < MxIndB) {    /* The left triangle of the Fig. */
-            ind_as = MxIndA - nc;
-            ind_ae = MxIndA;
-            ind_bs = MxIndB;
-            ind_be = MxIndB - nc;
-        } else if(nc <= MxIndA) {    /* The middle rectangular of the Fig. */
-            ind_as = MxIndA - nc;
-            ind_ae = MxIndA -(nc - MxIndB);
-            ind_bs = MxIndB;
-            ind_be = 0;
-        } else if(nc > MxIndA) {    /*  The right triangle of the Fig. */
-            ind_as = 0;
-            ind_ae = MxIndAB - nc - 1;
-            ind_bs = MxIndB -(nc - MxIndA);
-            ind_be = 0;
-        }
+    for (nc = 0; nc < MxIndAB; ++nc, --ind_c) {
+	if (nc < MxIndB) {    /* The left triangle of the Fig. */
+	    ind_as = MxIndA - nc;
+	    ind_ae = MxIndA;
+	    ind_bs = MxIndB;
+	}
+	else if (nc <= MxIndA) {    /* The middle rectangular of the Fig. */
+	    ind_as = MxIndA - nc;
+	    ind_ae = MxIndA - (nc - MxIndB);
+	    ind_bs = MxIndB;
+	}
+	else /* if (nc > MxIndA) */ {    /*  The right triangle of the Fig. */
+	    ind_as = 0;
+	    ind_ae = MxIndAB - nc - 1;
+	    ind_bs = MxIndB - (nc - MxIndA);
+	}
 
-        for(i = ind_as; i <= ind_ae; ++i) {
-            s = (BDIGIT_DBL)a->frac[i] * b->frac[ind_bs--];
-            carry = (BDIGIT)(s / BASE);
-            s -= (BDIGIT_DBL)carry * BASE;
-            c->frac[ind_c] += (BDIGIT)s;
-            if(c->frac[ind_c] >= BASE) {
-                s = c->frac[ind_c] / BASE;
-                carry += (BDIGIT)s;
-                c->frac[ind_c] -= (BDIGIT)(s * BASE);
-            }
-            if(carry) {
-                ii = ind_c;
-                while(ii-- > 0) {
-                    c->frac[ii] += carry;
-                    if(c->frac[ii] >= BASE) {
-                        carry = c->frac[ii] / BASE;
-                        c->frac[ii] -= (carry * BASE);
-                    } else {
-                        break;
-                    }
-                }
-            }
-        }
+	for (i = ind_as; i <= ind_ae; ++i) {
+	    s = (BDIGIT_DBL)a->frac[i] * b->frac[ind_bs--];
+	    carry = (BDIGIT)(s / BASE);
+	    s -= (BDIGIT_DBL)carry * BASE;
+	    c->frac[ind_c] += (BDIGIT)s;
+	    if (c->frac[ind_c] >= BASE) {
+		s = c->frac[ind_c] / BASE;
+		carry += (BDIGIT)s;
+		c->frac[ind_c] -= (BDIGIT)(s * BASE);
+	    }
+	    if (carry) {
+		ii = ind_c;
+		while (ii-- > 0) {
+		    c->frac[ii] += carry;
+		    if (c->frac[ii] >= BASE) {
+			carry = c->frac[ii] / BASE;
+			c->frac[ii] -= (carry * BASE);
+		    }
+		    else {
+			break;
+		    }
+		}
+	    }
+	}
     }
-    if(w != NULL) {        /* free work variable */
-        VpNmlz(c);
-        VpAsgn(w, c, 1);
-        VpFree(c);
-        c = w;
-    } else {
-        VpLimitRound(c,0);
+    if (w != NULL) {        /* free work variable */
+	VpNmlz(c);
+	VpAsgn(w, c, 1);
+	VpFree(c);
+	c = w;
+    }
+    else {
+	VpLimitRound(c,0);
     }
 
 Exit:
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpMult(c=a*b): c=% \n", c);
-        VPrint(stdout, "      a=% \n", a);
-        VPrint(stdout, "      b=% \n", b);
+    if (gfDebug) {
+	VPrint(stdout, "VpMult(c=a*b): c=% \n", c);
+	VPrint(stdout, "      a=% \n", a);
+	VPrint(stdout, "      b=% \n", b);
     }
 #endif /*BIGDECIMAL_DEBUG */
     return c->Prec*BASE_FIG;
@@ -4308,34 +4979,34 @@ VpDivd(Real *c, Real *r, Real *a, Real *b)
     BDIGIT_DBL qb;
 
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, " VpDivd(c=a/b)  a=% \n", a);
-        VPrint(stdout, "    b=% \n", b);
+    if (gfDebug) {
+	VPrint(stdout, " VpDivd(c=a/b)  a=% \n", a);
+	VPrint(stdout, "    b=% \n", b);
     }
 #endif /*BIGDECIMAL_DEBUG */
 
     VpSetNaN(r);
-    if(!VpIsDefOP(c,a,b,4)) goto Exit;
-    if(VpIsZero(a)&&VpIsZero(b)) {
-        VpSetNaN(c);
-        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,"(VpDivd) Divide by zero",0);
-    }
-    if(VpIsZero(a)) {
-        /* numerator a is zero  */
-        VpSetZero(c,VpGetSign(a)*VpGetSign(b));
-        VpSetZero(r,VpGetSign(a)*VpGetSign(b));
-        goto Exit;
-    }
-    if(VpIsOne(b)) {
-        /* divide by one  */
-        VpAsgn(c, a, VpGetSign(b));
-        VpSetZero(r,VpGetSign(a));
-        goto Exit;
-    } 
+    if (!VpIsDefOP(c, a, b, OP_SW_DIV)) goto Exit;
+    if (VpIsZero(a) && VpIsZero(b)) {
+	VpSetNaN(c);
+	return VpException(VP_EXCEPTION_NaN, "Computation results to 'NaN'", 0);
+    }
+    if (VpIsZero(b)) {
+	VpSetInf(c, VpGetSign(a) * VpGetSign(b));
+	return VpException(VP_EXCEPTION_ZERODIVIDE, "Divide by zero", 0);
+    }
+    if (VpIsZero(a)) {
+	/* numerator a is zero  */
+	VpSetZero(c, VpGetSign(a) * VpGetSign(b));
+	VpSetZero(r, VpGetSign(a) * VpGetSign(b));
+	goto Exit;
+    }
+    if (VpIsOne(b)) {
+	/* divide by one  */
+	VpAsgn(c, a, VpGetSign(b));
+	VpSetZero(r, VpGetSign(a));
+	goto Exit;
+    }
 
     word_a = a->Prec;
     word_b = b->Prec;
@@ -4345,25 +5016,26 @@ VpDivd(Real *c, Real *r, Real *a, Real *b)
     ind_c = 0;
     ind_r = 1;
 
-    if(word_a >= word_r) goto space_error;
+    if (word_a >= word_r) goto space_error;
 
     r->frac[0] = 0;
-    while(ind_r <= word_a) {
-        r->frac[ind_r] = a->frac[ind_r - 1];
-        ++ind_r;
+    while (ind_r <= word_a) {
+	r->frac[ind_r] = a->frac[ind_r - 1];
+	++ind_r;
     }
 
-    while(ind_r < word_r) r->frac[ind_r++] = 0;
-    while(ind_c < word_c) c->frac[ind_c++] = 0;
+    while (ind_r < word_r) r->frac[ind_r++] = 0;
+    while (ind_c < word_c) c->frac[ind_c++] = 0;
 
     /* initial procedure */
     b1 = b1p1 = b->frac[0];
-    if(b->Prec <= 1) {
-        b1b2p1 = b1b2 = b1p1 * BASE;
-    } else {
-        b1p1 = b1 + 1;
-        b1b2p1 = b1b2 = b1 * BASE + b->frac[1];
-        if(b->Prec > 2) ++b1b2p1;
+    if (b->Prec <= 1) {
+	b1b2p1 = b1b2 = b1p1 * BASE;
+    }
+    else {
+	b1p1 = b1 + 1;
+	b1b2p1 = b1b2 = b1 * BASE + b->frac[1];
+	if (b->Prec > 2) ++b1b2p1;
     }
 
     /* */
@@ -4371,141 +5043,144 @@ VpDivd(Real *c, Real *r, Real *a, Real *b)
     ind_c = word_r - 1;
     nLoop = Min(word_c,ind_c);
     ind_c = 1;
-    while(ind_c < nLoop) {
-        if(r->frac[ind_c] == 0) {
-            ++ind_c;
-            continue;
-        }
-        r1r2 = (BDIGIT_DBL)r->frac[ind_c] * BASE + r->frac[ind_c + 1];
-        if(r1r2 == b1b2) {
-            /* The first two word digits is the same */
-            ind_b = 2;
-            ind_a = ind_c + 2;
-            while(ind_b < word_b) {
-                if(r->frac[ind_a] < b->frac[ind_b]) goto div_b1p1;
-                if(r->frac[ind_a] > b->frac[ind_b]) break;
-                ++ind_a;
-                ++ind_b;
-            }
-            /* The first few word digits of r and b is the same and */
-            /* the first different word digit of w is greater than that */
-            /* of b, so quotinet is 1 and just subtract b from r. */
-            borrow = 0;        /* quotient=1, then just r-b */
-            ind_b = b->Prec - 1;
-            ind_r = ind_c + ind_b;
-            if(ind_r >= word_r) goto space_error;
-            n = ind_b;
-            for(i = 0; i <= n; ++i) {
-                if(r->frac[ind_r] < b->frac[ind_b] + borrow) {
-                    r->frac[ind_r] += (BASE - (b->frac[ind_b] + borrow));
-                    borrow = 1;
-                } else {
-                    r->frac[ind_r] = r->frac[ind_r] - b->frac[ind_b] - borrow;
-                    borrow = 0;
-                }
-                --ind_r;
-                --ind_b;
-            }
-            ++c->frac[ind_c];
-            goto carry;
-        }
-        /* The first two word digits is not the same, */
-        /* then compare magnitude, and divide actually. */
-        if(r1r2 >= b1b2p1) {
-            q = r1r2 / b1b2p1;  /* q == (BDIGIT)q  */
-            c->frac[ind_c] += (BDIGIT)q;
-            ind_r = b->Prec + ind_c - 1;
-            goto sub_mult;
-        }
+    while (ind_c < nLoop) {
+	if (r->frac[ind_c] == 0) {
+	    ++ind_c;
+	    continue;
+	}
+	r1r2 = (BDIGIT_DBL)r->frac[ind_c] * BASE + r->frac[ind_c + 1];
+	if (r1r2 == b1b2) {
+	    /* The first two word digits is the same */
+	    ind_b = 2;
+	    ind_a = ind_c + 2;
+	    while (ind_b < word_b) {
+		if (r->frac[ind_a] < b->frac[ind_b]) goto div_b1p1;
+		if (r->frac[ind_a] > b->frac[ind_b]) break;
+		++ind_a;
+		++ind_b;
+	    }
+	    /* The first few word digits of r and b is the same and */
+	    /* the first different word digit of w is greater than that */
+	    /* of b, so quotient is 1 and just subtract b from r. */
+	    borrow = 0;        /* quotient=1, then just r-b */
+	    ind_b = b->Prec - 1;
+	    ind_r = ind_c + ind_b;
+	    if (ind_r >= word_r) goto space_error;
+	    n = ind_b;
+	    for (i = 0; i <= n; ++i) {
+		if (r->frac[ind_r] < b->frac[ind_b] + borrow) {
+		    r->frac[ind_r] += (BASE - (b->frac[ind_b] + borrow));
+		    borrow = 1;
+		}
+		else {
+		    r->frac[ind_r] = r->frac[ind_r] - b->frac[ind_b] - borrow;
+		    borrow = 0;
+		}
+		--ind_r;
+		--ind_b;
+	    }
+	    ++c->frac[ind_c];
+	    goto carry;
+	}
+	/* The first two word digits is not the same, */
+	/* then compare magnitude, and divide actually. */
+	if (r1r2 >= b1b2p1) {
+	    q = r1r2 / b1b2p1;  /* q == (BDIGIT)q  */
+	    c->frac[ind_c] += (BDIGIT)q;
+	    ind_r = b->Prec + ind_c - 1;
+	    goto sub_mult;
+	}
 
 div_b1p1:
-        if(ind_c + 1 >= word_c) goto out_side;
-        q = r1r2 / b1p1;  /* q == (BDIGIT)q */
-        c->frac[ind_c + 1] += (BDIGIT)q;
-        ind_r = b->Prec + ind_c;
+	if (ind_c + 1 >= word_c) goto out_side;
+	q = r1r2 / b1p1;  /* q == (BDIGIT)q */
+	c->frac[ind_c + 1] += (BDIGIT)q;
+	ind_r = b->Prec + ind_c;
 
 sub_mult:
-        borrow1 = borrow2 = 0;
-        ind_b = word_b - 1;
-        if(ind_r >= word_r) goto space_error;
-        n = ind_b;
-        for(i = 0; i <= n; ++i) {
-            /* now, perform r = r - q * b */
-            qb = q * b->frac[ind_b];
-            if (qb < BASE) borrow1 = 0;
-            else {
-                borrow1 = (BDIGIT)(qb / BASE);
-                qb -= (BDIGIT_DBL)borrow1 * BASE;	/* get qb < BASE */
-            }
-            if(r->frac[ind_r] < qb) {
-                r->frac[ind_r] += (BDIGIT)(BASE - qb);
-                borrow2 = borrow2 + borrow1 + 1;
-            } else {
-                r->frac[ind_r] -= (BDIGIT)qb;
-                borrow2 += borrow1;
-            }
-            if(borrow2) {
-                if(r->frac[ind_r - 1] < borrow2) {
-                    r->frac[ind_r - 1] += (BASE - borrow2);
-                    borrow2 = 1;
-                } else {
-                    r->frac[ind_r - 1] -= borrow2;
-                    borrow2 = 0;
-                }
-            }
-            --ind_r;
-            --ind_b;
-        }
+	borrow1 = borrow2 = 0;
+	ind_b = word_b - 1;
+	if (ind_r >= word_r) goto space_error;
+	n = ind_b;
+	for (i = 0; i <= n; ++i) {
+	    /* now, perform r = r - q * b */
+	    qb = q * b->frac[ind_b];
+	    if (qb < BASE) borrow1 = 0;
+	    else {
+		borrow1 = (BDIGIT)(qb / BASE);
+		qb -= (BDIGIT_DBL)borrow1 * BASE;	/* get qb < BASE */
+	    }
+	    if(r->frac[ind_r] < qb) {
+		r->frac[ind_r] += (BDIGIT)(BASE - qb);
+		borrow2 = borrow2 + borrow1 + 1;
+	    }
+	    else {
+		r->frac[ind_r] -= (BDIGIT)qb;
+		borrow2 += borrow1;
+	    }
+	    if (borrow2) {
+		if(r->frac[ind_r - 1] < borrow2) {
+		    r->frac[ind_r - 1] += (BASE - borrow2);
+		    borrow2 = 1;
+		}
+		else {
+		    r->frac[ind_r - 1] -= borrow2;
+		    borrow2 = 0;
+		}
+	    }
+	    --ind_r;
+	    --ind_b;
+	}
 
-        r->frac[ind_r] -= borrow2;
+	r->frac[ind_r] -= borrow2;
 carry:
-        ind_r = ind_c;
-        while(c->frac[ind_r] >= BASE) {
-            c->frac[ind_r] -= BASE;
-            --ind_r;
-            ++c->frac[ind_r];
-        }
+	ind_r = ind_c;
+	while (c->frac[ind_r] >= BASE) {
+	    c->frac[ind_r] -= BASE;
+	    --ind_r;
+	    ++c->frac[ind_r];
+	}
     }
     /* End of operation, now final arrangement */
 out_side:
     c->Prec = word_c;
     c->exponent = a->exponent;
-    if(!AddExponent(c,2))   return 0;
-    if(!AddExponent(c,-(b->exponent))) return 0;
+    if (!AddExponent(c, 2)) return 0;
+    if (!AddExponent(c, -(b->exponent))) return 0;
 
-    VpSetSign(c,VpGetSign(a)*VpGetSign(b));
+    VpSetSign(c, VpGetSign(a) * VpGetSign(b));
     VpNmlz(c);            /* normalize c */
     r->Prec = word_r;
     r->exponent = a->exponent;
-    if(!AddExponent(r,1)) return 0;
-    VpSetSign(r,VpGetSign(a));
+    if (!AddExponent(r, 1)) return 0;
+    VpSetSign(r, VpGetSign(a));
     VpNmlz(r);            /* normalize r(remainder) */
     goto Exit;
 
 space_error:
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        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);
+    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);
     }
 #endif /* BIGDECIMAL_DEBUG */
     rb_bug("ERROR(VpDivd): space for remainder too small.");
 
 Exit:
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, " VpDivd(c=a/b), c=% \n", c);
-        VPrint(stdout, "    r=% \n", r);
+    if (gfDebug) {
+	VPrint(stdout, " VpDivd(c=a/b), c=% \n", c);
+	VPrint(stdout, "    r=% \n", r);
     }
 #endif /* BIGDECIMAL_DEBUG */
-    return c->Prec*BASE_FIG;
+    return c->Prec * BASE_FIG;
 }
 
 /*
- *  Input  a = 00000xxxxxxxx En(5 preceeding zeros)
+ *  Input  a = 00000xxxxxxxx En(5 preceding zeros)
  *  Output a = xxxxxxxx En-5
  */
 static int
@@ -4518,17 +5193,17 @@ VpNmlz(Real *a)
 
     ind_a = a->Prec;
     while (ind_a--) {
-        if (a->frac[ind_a]) {
-            a->Prec = ind_a + 1;
-            i = 0;
-            while (a->frac[i] == 0) ++i;        /* skip the first few zeros */
-            if (i) {
-                a->Prec -= i;
-                if (!AddExponent(a, -(SIGNED_VALUE)i)) return 0;
-                memmove(&a->frac[0], &a->frac[i], a->Prec*sizeof(BDIGIT));
-            }
-            return 1;
-        }
+	if (a->frac[ind_a]) {
+	    a->Prec = ind_a + 1;
+	    i = 0;
+	    while (a->frac[i] == 0) ++i;        /* skip the first few zeros */
+	    if (i) {
+		a->Prec -= i;
+		if (!AddExponent(a, -(SIGNED_VALUE)i)) return 0;
+		memmove(&a->frac[0], &a->frac[i], a->Prec*sizeof(BDIGIT));
+	    }
+	    return 1;
+	}
     }
     /* a is zero(no non-zero digit) */
     VpSetZero(a, VpGetSign(a));
@@ -4553,187 +5228,198 @@ VpComp(Real *a, Real *b)
     size_t mx, ind;
     int e;
     val = 0;
-    if(VpIsNaN(a)||VpIsNaN(b)) return 999;
-    if(!VpIsDef(a)) {
-        if(!VpIsDef(b)) e = a->sign - b->sign;
-        else             e = a->sign;
-        if(e>0)   return  1;
-        else if(e<0) return -1;
-        else   return  0;
-    }
-    if(!VpIsDef(b)) {
-        e = -b->sign;
-        if(e>0) return  1;
-        else return -1;
+    if (VpIsNaN(a) || VpIsNaN(b)) return 999;
+    if (!VpIsDef(a)) {
+	if (!VpIsDef(b)) e = a->sign - b->sign;
+	else             e = a->sign;
+
+	if (e > 0)      return  1;
+	else if (e < 0) return -1;
+	else            return  0;
+    }
+    if (!VpIsDef(b)) {
+	e = -b->sign;
+	if (e > 0) return  1;
+	else       return -1;
     }
     /* Zero check */
-    if(VpIsZero(a)) {
-        if(VpIsZero(b))      return 0; /* both zero */
-        val = -VpGetSign(b);
-        goto Exit;
+    if (VpIsZero(a)) {
+	if (VpIsZero(b)) return 0; /* both zero */
+	val = -VpGetSign(b);
+	goto Exit;
     }
-    if(VpIsZero(b)) {
-        val = VpGetSign(a);
-        goto Exit;
+    if (VpIsZero(b)) {
+	val = VpGetSign(a);
+	goto Exit;
     }
 
     /* compare sign */
-    if(VpGetSign(a) > VpGetSign(b)) {
-        val = 1;        /* a>b */
-        goto Exit;
+    if (VpGetSign(a) > VpGetSign(b)) {
+	val = 1;        /* a>b */
+	goto Exit;
     }
-    if(VpGetSign(a) < VpGetSign(b)) {
-        val = -1;        /* a<b */
-        goto Exit;
+    if (VpGetSign(a) < VpGetSign(b)) {
+	val = -1;        /* a<b */
+	goto Exit;
     }
 
-    /* a and b have same sign, && signe!=0,then compare exponent */
-    if((a->exponent) >(b->exponent)) {
-        val = VpGetSign(a);
-        goto Exit;
+    /* a and b have same sign, && sign!=0,then compare exponent */
+    if (a->exponent > b->exponent) {
+	val = VpGetSign(a);
+	goto Exit;
     }
-    if((a->exponent) <(b->exponent)) {
-        val = -VpGetSign(b);
-        goto Exit;
+    if (a->exponent < b->exponent) {
+	val = -VpGetSign(b);
+	goto Exit;
     }
 
-    /* a and b have same exponent, then compare significand. */
-    mx =((a->Prec) <(b->Prec)) ?(a->Prec) :(b->Prec);
+    /* a and b have same exponent, then compare their significand. */
+    mx = (a->Prec < b->Prec) ? a->Prec : b->Prec;
     ind = 0;
-    while(ind < mx) {
-        if((a->frac[ind]) >(b->frac[ind])) {
-            val = VpGetSign(a);
-         goto Exit;
-        }
-        if((a->frac[ind]) <(b->frac[ind])) {
-            val = -VpGetSign(b);
-            goto Exit;
-        }
-        ++ind;
+    while (ind < mx) {
+	if (a->frac[ind] > b->frac[ind]) {
+	    val = VpGetSign(a);
+	    goto Exit;
+	}
+	if (a->frac[ind] < b->frac[ind]) {
+	    val = -VpGetSign(b);
+	    goto Exit;
+	}
+	++ind;
     }
-    if((a->Prec) >(b->Prec)) {
-        val = VpGetSign(a);
-    } else if((a->Prec) <(b->Prec)) {
-        val = -VpGetSign(b);
+    if (a->Prec > b->Prec) {
+	val = VpGetSign(a);
+    }
+    else if (a->Prec < b->Prec) {
+	val = -VpGetSign(b);
     }
 
 Exit:
-    if  (val> 1) val =  1;
-    else if(val<-1) val = -1;
+    if      (val >  1) val =  1;
+    else if (val < -1) val = -1;
 
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, " VpComp a=%\n", a);
-        VPrint(stdout, "  b=%\n", b);
-        printf("  ans=%d\n", val);
+    if (gfDebug) {
+	VPrint(stdout, " VpComp a=%\n", a);
+	VPrint(stdout, "  b=%\n", b);
+	printf("  ans=%d\n", val);
     }
 #endif /* BIGDECIMAL_DEBUG */
     return (int)val;
 }
 
-#ifdef BIGDECIMAL_ENABLE_VPRINT
 /*
  *    cntl_chr ... ASCIIZ Character, print control characters
  *     Available control codes:
  *      %  ... VP variable. To print '%', use '%%'.
  *      \n ... new line
  *      \b ... backspace
- *           ... tab
- *     Note: % must must not appear more than once
+ *      \t ... tab
+ *     Note: % must not appear more than once
  *    a  ... VP variable to be printed
  */
-VP_EXPORT int
+#ifdef BIGDECIMAL_ENABLE_VPRINT
+static int
 VPrint(FILE *fp, const char *cntl_chr, Real *a)
 {
-    size_t i, j, nc, nd, ZeroSup;
+    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). */
-    /*  nc : number of caracters printed  */
+    /*  nc : number of characters printed  */
     ZeroSup = 1;        /* Flag not to print the leading zeros as 0.00xxxxEnn */
-    while(*(cntl_chr + j)) {
-        if((*(cntl_chr + j) == '%') &&(*(cntl_chr + j + 1) != '%')) {
-         nc = 0;
-         if(!VpIsZero(a)) {
-                if(VpGetSign(a) < 0) {
-                    fprintf(fp, "-");
-                    ++nc;
-                }
-                nc += fprintf(fp, "0.");
-                for(i=0; i < a->Prec; ++i) {
+    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)) {
+		    fprintf(fp, "-");
+		    ++nc;
+		}
+		nc += fprintf(fp, "0.");
+		switch (*(cntl_chr + j + 1)) {
+		default:
+		    break;
+
+		case '0': case 'z':
+		    ZeroSup = 0;
+		    ++j;
+		    sep = cntl_chr[j] == 'z' ? RMPD_COMPONENT_FIGURES : 10;
+		    break;
+		}
+		for (i = 0; i < a->Prec; ++i) {
 		    m = BASE1;
-                    e = a->frac[i];
-                    while(m) {
-                        nn = e / m;
-                        if((!ZeroSup) || nn) {
-                            nc += fprintf(fp, "%lu", (unsigned long)nn);    /* The leading zero(s) */
-                            /* as 0.00xx will not */
-                            /* be printed. */
-                            ++nd;
-                            ZeroSup = 0;    /* Set to print succeeding zeros */
-                        }
-                        if(nd >= 10) {    /* print ' ' after every 10 digits */
-                            nd = 0;
-                            nc += fprintf(fp, " ");
-                        }
-                        e = e - nn * m;
-                        m /= 10;
-                    }
-                }
-                nc += fprintf(fp, "E%"PRIdSIZE, VpExponent10(a));
-            } else {
-                nc += fprintf(fp, "0.0");
-            }
-        } else {
-            ++nc;
-            if(*(cntl_chr + j) == '\\') {
-                switch(*(cntl_chr + j + 1)) {
-                case 'n':
-                    fprintf(fp, "\n");
-                    ++j;
-                    break;
-                case 't':
-                    fprintf(fp, "\t");
-                    ++j;
-                 break;
-                case 'b':
-                    fprintf(fp, "\n");
-                    ++j;
-                    break;
-                default:
-                    fprintf(fp, "%c", *(cntl_chr + j));
-                    break;
-                }
-            } else {
-                fprintf(fp, "%c", *(cntl_chr + j));
-                if(*(cntl_chr + j) == '%') ++j;
-            }
-        }
-        j++;
+		    e = a->frac[i];
+		    while (m) {
+			nn = e / m;
+			if (!ZeroSup || nn) {
+			    nc += fprintf(fp, "%lu", (unsigned long)nn);    /* The leading zero(s) */
+			    /* as 0.00xx will not */
+			    /* be printed. */
+			    ++nd;
+			    ZeroSup = 0;    /* Set to print succeeding zeros */
+			}
+			if (nd >= sep) {    /* print ' ' after every 10 digits */
+			    nd = 0;
+			    nc += fprintf(fp, " ");
+			}
+			e = e - nn * m;
+			m /= 10;
+		    }
+		}
+		nc += fprintf(fp, "E%"PRIdSIZE, VpExponent10(a));
+		nc += fprintf(fp, " (%"PRIdVALUE", %lu, %lu)", a->exponent, a->Prec, a->MaxPrec);
+	    }
+	    else {
+		nc += fprintf(fp, "0.0");
+	    }
+	}
+	else {
+	    ++nc;
+	    if (*(cntl_chr + j) == '\\') {
+		switch (*(cntl_chr + j + 1)) {
+		  case 'n':
+		    fprintf(fp, "\n");
+		    ++j;
+		    break;
+		  case 't':
+		    fprintf(fp, "\t");
+		    ++j;
+		    break;
+		  case 'b':
+		    fprintf(fp, "\n");
+		    ++j;
+		    break;
+		  default:
+		    fprintf(fp, "%c", *(cntl_chr + j));
+		    break;
+		}
+	    }
+	    else {
+		fprintf(fp, "%c", *(cntl_chr + j));
+		if (*(cntl_chr + j) == '%') ++j;
+	    }
+	}
+	j++;
     }
+
     return (int)nc;
 }
-#endif /* BIGDECIMAL_ENABLE_VPRINT */
+#endif
 
 static void
 VpFormatSt(char *psz, size_t fFmt)
@@ -4741,22 +5427,22 @@ VpFormatSt(char *psz, size_t fFmt)
     size_t ie, i, nf = 0;
     char ch;
 
-    if(fFmt<=0) return;
+    if (fFmt == 0) return;
 
     ie = strlen(psz);
-    for(i = 0; i < ie; ++i) {
-        ch = psz[i];
-        if(!ch) break;
-        if(ISSPACE(ch) || ch=='-' || ch=='+') continue;
-        if(ch == '.')                { nf = 0;continue;}
-        if(ch == 'E') break;
-        nf++;
-        if(nf > fFmt) {
-            memmove(psz + i + 1, psz + i, ie - i + 1);
-            ++ie;
-            nf = 0;
-            psz[i] = ' ';
-        }
+    for (i = 0; i < ie; ++i) {
+	ch = psz[i];
+	if (!ch) break;
+	if (ISSPACE(ch) || ch=='-' || ch=='+') continue;
+	if (ch == '.') { nf = 0; continue; }
+	if (ch == 'E' || ch == 'e') break;
+
+	if (++nf > fFmt) {
+	    memmove(psz + i + 1, psz + i, ie - i + 1);
+	    ++ie;
+	    nf = 0;
+	    psz[i] = ' ';
+	}
     }
 }
 
@@ -4771,8 +5457,8 @@ VpExponent10(Real *a)
     ex = a->exponent * (ssize_t)BASE_FIG;
     n = BASE1;
     while ((a->frac[0] / n) == 0) {
-         --ex;
-         n /= 10;
+	--ex;
+	n /= 10;
     }
     return ex;
 }
@@ -4783,82 +5469,85 @@ VpSzMantissa(Real *a,char *psz)
     size_t i, n, ZeroSup;
     BDIGIT_DBL m, e, nn;
 
-    if(VpIsNaN(a)) {
-        sprintf(psz,SZ_NaN);
-        return;
+    if (VpIsNaN(a)) {
+	sprintf(psz, SZ_NaN);
+	return;
     }
-    if(VpIsPosInf(a)) {
-        sprintf(psz,SZ_INF);
-        return;
+    if (VpIsPosInf(a)) {
+	sprintf(psz, SZ_INF);
+	return;
     }
-    if(VpIsNegInf(a)) {
-        sprintf(psz,SZ_NINF);
-        return;
+    if (VpIsNegInf(a)) {
+	sprintf(psz, SZ_NINF);
+	return;
     }
 
     ZeroSup = 1;        /* Flag not to print the leading zeros as 0.00xxxxEnn */
-    if(!VpIsZero(a)) {
-        if(VpGetSign(a) < 0) *psz++ = '-';
-        n = a->Prec;
-        for (i=0; i < n; ++i) {
-            m = BASE1;
-            e = a->frac[i];
-            while (m) {
-                nn = e / m;
-                if((!ZeroSup) || nn) {
-                    sprintf(psz, "%lu", (unsigned long)nn);    /* The leading zero(s) */
-                    psz += strlen(psz);
-                    /* as 0.00xx will be ignored. */
-                    ZeroSup = 0;    /* Set to print succeeding zeros */
-                }
-                e = e - nn * m;
-                m /= 10;
-            }
-        }
-        *psz = 0;
-        while(psz[-1]=='0') *(--psz) = 0;
-    } else {
-        if(VpIsPosZero(a)) sprintf(psz, "0");
-        else      sprintf(psz, "-0");
+    if (!VpIsZero(a)) {
+	if (BIGDECIMAL_NEGATIVE_P(a)) *psz++ = '-';
+	n = a->Prec;
+	for (i = 0; i < n; ++i) {
+	    m = BASE1;
+	    e = a->frac[i];
+	    while (m) {
+		nn = e / m;
+		if (!ZeroSup || nn) {
+		    sprintf(psz, "%lu", (unsigned long)nn); /* The leading zero(s) */
+		    psz += strlen(psz);
+		    /* as 0.00xx will be ignored. */
+		    ZeroSup = 0; /* Set to print succeeding zeros */
+		}
+		e = e - nn * m;
+		m /= 10;
+	    }
+	}
+	*psz = 0;
+	while (psz[-1] == '0') *(--psz) = 0;
+    }
+    else {
+	if (VpIsPosZero(a)) sprintf(psz, "0");
+	else                sprintf(psz, "-0");
     }
 }
 
 VP_EXPORT int
 VpToSpecialString(Real *a,char *psz,int fPlus)
-/* fPlus =0:default, =1: set ' ' before digits , =2: set '+' before digits. */
+/* fPlus = 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
 {
-    if(VpIsNaN(a)) {
-        sprintf(psz,SZ_NaN);
-        return 1;
+    if (VpIsNaN(a)) {
+	sprintf(psz,SZ_NaN);
+	return 1;
     }
 
-    if(VpIsPosInf(a)) {
-        if(fPlus==1) {
-           *psz++ = ' ';
-        } else if(fPlus==2) {
-           *psz++ = '+';
-        }
-        sprintf(psz,SZ_INF);
-        return 1;
+    if (VpIsPosInf(a)) {
+	if (fPlus == 1) {
+	    *psz++ = ' ';
+	}
+	else if (fPlus == 2) {
+	    *psz++ = '+';
+	}
+	sprintf(psz, SZ_INF);
+	return 1;
     }
-    if(VpIsNegInf(a)) {
-        sprintf(psz,SZ_NINF);
-        return 1;
+    if (VpIsNegInf(a)) {
+	sprintf(psz, SZ_NINF);
+	return 1;
     }
-    if(VpIsZero(a)) {
-        if(VpIsPosZero(a)) {
-            if(fPlus==1)      sprintf(psz, " 0.0");
-            else if(fPlus==2) sprintf(psz, "+0.0");
-            else              sprintf(psz, "0.0");
-        } else    sprintf(psz, "-0.0");
-        return 1;
+    if (VpIsZero(a)) {
+	if (VpIsPosZero(a)) {
+	    if (fPlus == 1)      sprintf(psz, " 0.0");
+	    else if (fPlus == 2) sprintf(psz, "+0.0");
+	    else                 sprintf(psz,  "0.0");
+	}
+	else                     sprintf(psz, "-0.0");
+	return 1;
     }
     return 0;
 }
 
 VP_EXPORT void
 VpToString(Real *a, char *psz, size_t fFmt, int fPlus)
-/* fPlus =0:default, =1: set ' ' before digits , =2:set '+' before digits. */
+/* fPlus = 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
 {
     size_t i, n, ZeroSup;
     BDIGIT shift, m, e, nn;
@@ -4869,91 +5558,94 @@ VpToString(Real *a, char *psz, size_t fFmt, int fPlus)
 
     ZeroSup = 1;    /* Flag not to print the leading zeros as 0.00xxxxEnn */
 
-    if (VpGetSign(a) < 0) *psz++ = '-';
+    if (BIGDECIMAL_NEGATIVE_P(a)) *psz++ = '-';
     else if (fPlus == 1)  *psz++ = ' ';
     else if (fPlus == 2)  *psz++ = '+';
 
     *psz++ = '0';
     *psz++ = '.';
     n = a->Prec;
-    for(i=0;i < n;++i) {
-        m = BASE1;
-        e = a->frac[i];
-        while(m) {
-            nn = e / m;
-            if((!ZeroSup) || nn) {
-                sprintf(psz, "%lu", (unsigned long)nn);    /* The reading zero(s) */
-                psz += strlen(psz);
-                /* as 0.00xx will be ignored. */
-                ZeroSup = 0;    /* Set to print succeeding zeros */
-            }
-            e = e - nn * m;
-            m /= 10;
-        }
+    for (i = 0; i < n; ++i) {
+	m = BASE1;
+	e = a->frac[i];
+	while (m) {
+	    nn = e / m;
+	    if (!ZeroSup || nn) {
+		sprintf(psz, "%lu", (unsigned long)nn);    /* The reading zero(s) */
+		psz += strlen(psz);
+		/* as 0.00xx will be ignored. */
+		ZeroSup = 0;    /* Set to print succeeding zeros */
+	    }
+	    e = e - nn * m;
+	    m /= 10;
+	}
     }
     ex = a->exponent * (ssize_t)BASE_FIG;
     shift = BASE1;
-    while(a->frac[0] / shift == 0) {
-        --ex;
-        shift /= 10;
+    while (a->frac[0] / shift == 0) {
+	--ex;
+	shift /= 10;
+    }
+    while (psz[-1] == '0') {
+	*(--psz) = 0;
     }
-    while(psz[-1]=='0') *(--psz) = 0;
-    sprintf(psz, "E%"PRIdSIZE, ex);
-    if(fFmt) VpFormatSt(pszSav, fFmt);
+    sprintf(psz, "e%"PRIdSIZE, ex);
+    if (fFmt) VpFormatSt(pszSav, fFmt);
 }
 
 VP_EXPORT void
 VpToFString(Real *a, char *psz, size_t fFmt, int fPlus)
-/* fPlus =0:default,=1: set ' ' before digits ,set '+' before digits. */
+/* fPlus = 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
 {
     size_t i, n;
     BDIGIT m, e, nn;
     char *pszSav = psz;
     ssize_t ex;
 
-    if(VpToSpecialString(a,psz,fPlus)) return;
+    if (VpToSpecialString(a, psz, fPlus)) return;
 
-    if(VpGetSign(a) < 0) *psz++ = '-';
-    else if(fPlus==1)    *psz++ = ' ';
-    else if(fPlus==2)    *psz++ = '+';
+    if (BIGDECIMAL_NEGATIVE_P(a)) *psz++ = '-';
+    else if (fPlus == 1)  *psz++ = ' ';
+    else if (fPlus == 2)  *psz++ = '+';
 
     n  = a->Prec;
     ex = a->exponent;
-    if(ex<=0) {
-       *psz++ = '0';*psz++ = '.';
-       while(ex<0) {
-          for(i=0;i<BASE_FIG;++i) *psz++ = '0';
-          ++ex;
-       }
-       ex = -1;
-    }
-
-    for(i=0;i < n;++i) {
-       --ex;
-       if(i==0 && ex >= 0) {
-           sprintf(psz, "%lu", (unsigned long)a->frac[i]);
-           psz += strlen(psz);
-       } else {
-           m = BASE1;
-           e = a->frac[i];
-           while(m) {
-               nn = e / m;
-               *psz++ = (char)(nn + '0');
-               e = e - nn * m;
-               m /= 10;
-           }
-       }
-       if(ex == 0) *psz++ = '.';
-    }
-    while(--ex>=0) {
-       m = BASE;
-       while(m/=10) *psz++ = '0';
-       if(ex == 0) *psz++ = '.';
+    if (ex <= 0) {
+	*psz++ = '0';*psz++ = '.';
+	while (ex < 0) {
+	    for (i=0; i < BASE_FIG; ++i) *psz++ = '0';
+	    ++ex;
+	}
+	ex = -1;
+    }
+
+    for (i = 0; i < n; ++i) {
+	--ex;
+	if (i == 0 && ex >= 0) {
+	    sprintf(psz, "%lu", (unsigned long)a->frac[i]);
+	    psz += strlen(psz);
+	}
+	else {
+	    m = BASE1;
+	    e = a->frac[i];
+	    while (m) {
+		nn = e / m;
+		*psz++ = (char)(nn + '0');
+		e = e - nn * m;
+		m /= 10;
+	    }
+	}
+	if (ex == 0) *psz++ = '.';
+    }
+    while (--ex>=0) {
+	m = BASE;
+	while (m /= 10) *psz++ = '0';
+	if (ex == 0)    *psz++ = '.';
     }
     *psz = 0;
-    while(psz[-1]=='0') *(--psz) = 0;
-    if(psz[-1]=='.') sprintf(psz, "0");
-    if(fFmt) VpFormatSt(pszSav, fFmt);
+    while (psz[-1] == '0') *(--psz) = 0;
+    if (psz[-1] == '.') sprintf(psz, "0");
+    if (fFmt) VpFormatSt(pszSav, fFmt);
 }
 
 /*
@@ -4971,7 +5663,6 @@ VP_EXPORT int
 VpCtoV(Real *a, const char *int_chr, size_t ni, const char *frac, size_t nf, const char *exp_chr, size_t ne)
 {
     size_t i, j, ind_a, ma, mi, me;
-    size_t loc;
     SIGNED_VALUE e, es, eb, ef;
     int  sign, signe, exponent_overflow;
 
@@ -4984,40 +5675,51 @@ VpCtoV(Real *a, const char *int_chr, size_t ni, const char *frac, size_t nf, con
     exponent_overflow = 0;
     memset(a->frac, 0, ma * sizeof(BDIGIT));
     if (ne > 0) {
-        i = 0;
-        if (exp_chr[0] == '-') {
-            signe = -1;
-            ++i;
-            ++me;
-        }
+	i = 0;
+	if (exp_chr[0] == '-') {
+	    signe = -1;
+	    ++i;
+	    ++me;
+	}
 	else if (exp_chr[0] == '+') {
-            ++i;
-            ++me;
-        }
-        while (i < me) {
-            es = e * (SIGNED_VALUE)BASE_FIG;
-            e = e * 10 + exp_chr[i] - '0';
-            if (es > (SIGNED_VALUE)(e*BASE_FIG)) {
+	    ++i;
+	    ++me;
+	}
+	while (i < me) {
+            if (MUL_OVERFLOW_SIGNED_VALUE_P(e, (SIGNED_VALUE)BASE_FIG)) {
+                es = e;
+                goto exp_overflow;
+            }
+	    es = e * (SIGNED_VALUE)BASE_FIG;
+            if (MUL_OVERFLOW_SIGNED_VALUE_P(e, 10) ||
+                SIGNED_VALUE_MAX - (exp_chr[i] - '0') < e * 10)
+                goto exp_overflow;
+	    e = e * 10 + exp_chr[i] - '0';
+            if (MUL_OVERFLOW_SIGNED_VALUE_P(e, (SIGNED_VALUE)BASE_FIG))
+                goto exp_overflow;
+	    if (es > (SIGNED_VALUE)(e * BASE_FIG)) {
+              exp_overflow:
 		exponent_overflow = 1;
 		e = es; /* keep sign */
 		break;
-            }
-            ++i;
-        }
+	    }
+	    ++i;
+	}
     }
 
     /* get integer part */
     i = 0;
     sign = 1;
-    if(1 /*ni >= 0*/) {
-        if(int_chr[0] == '-') {
-            sign = -1;
-            ++i;
-            ++mi;
-        } else if(int_chr[0] == '+') {
-            ++i;
-            ++mi;
-        }
+    if (1 /*ni >= 0*/) {
+	if (int_chr[0] == '-') {
+	    sign = -1;
+	    ++i;
+	    ++mi;
+	}
+	else if (int_chr[0] == '+') {
+	    ++i;
+	    ++mi;
+	}
     }
 
     e = signe * e;        /* e: The value of exponent part. */
@@ -5030,14 +5732,14 @@ VpCtoV(Real *a, const char *int_chr, size_t ni, const char *frac, size_t nf, con
     j = 0;
     ef = 1;
     while (ef) {
-        if (e >= 0) eb =  e;
-        else        eb = -e;
-        ef = eb / (SIGNED_VALUE)BASE_FIG;
-        ef = eb - ef * (SIGNED_VALUE)BASE_FIG;
-        if (ef) {
-            ++j;        /* Means to add one more preceeding zero */
-            ++e;
-        }
+	if (e >= 0) eb =  e;
+	else        eb = -e;
+	ef = eb / (SIGNED_VALUE)BASE_FIG;
+	ef = eb - ef * (SIGNED_VALUE)BASE_FIG;
+	if (ef) {
+	    ++j;        /* Means to add one more preceding zero */
+	    ++e;
+	}
     }
 
     eb = e / (SIGNED_VALUE)BASE_FIG;
@@ -5056,34 +5758,33 @@ VpCtoV(Real *a, const char *int_chr, size_t ni, const char *frac, size_t nf, con
 
     ind_a = 0;
     while (i < mi) {
-        a->frac[ind_a] = 0;
-        while ((j < BASE_FIG) && (i < mi)) {
-            a->frac[ind_a] = a->frac[ind_a] * 10 + int_chr[i] - '0';
-            ++j;
-            ++i;
-        }
-        if (i < mi) {
-            ++ind_a;
-            if (ind_a >= ma) goto over_flow;
-            j = 0;
-        }
+	a->frac[ind_a] = 0;
+	while (j < BASE_FIG && i < mi) {
+	    a->frac[ind_a] = a->frac[ind_a] * 10 + int_chr[i] - '0';
+	    ++j;
+	    ++i;
+	}
+	if (i < mi) {
+	    ++ind_a;
+	    if (ind_a >= ma) goto over_flow;
+	    j = 0;
+	}
     }
-    loc = 1;
 
     /* get fraction part */
 
     i = 0;
-    while(i < nf) {
-        while((j < BASE_FIG) && (i < nf)) {
-            a->frac[ind_a] = a->frac[ind_a] * 10 + frac[i] - '0';
-            ++j;
-            ++i;
-        }
-        if(i < nf) {
-            ++ind_a;
-            if(ind_a >= ma) goto over_flow;
-            j = 0;
-        }
+    while (i < nf) {
+	while (j < BASE_FIG && i < nf) {
+	    a->frac[ind_a] = a->frac[ind_a] * 10 + frac[i] - '0';
+	    ++j;
+	    ++i;
+	}
+	if (i < nf) {
+	    ++ind_a;
+	    if (ind_a >= ma) goto over_flow;
+	    j = 0;
+	}
     }
     goto Final;
 
@@ -5093,12 +5794,12 @@ over_flow:
 Final:
     if (ind_a >= ma) ind_a = ma - 1;
     while (j < BASE_FIG) {
-        a->frac[ind_a] = a->frac[ind_a] * 10;
-        ++j;
+	a->frac[ind_a] = a->frac[ind_a] * 10;
+	++j;
     }
     a->Prec = ind_a + 1;
     a->exponent = eb;
-    VpSetSign(a,sign);
+    VpSetSign(a, sign);
     VpNmlz(a);
     return 1;
 }
@@ -5125,55 +5826,55 @@ VpVtoD(double *d, SIGNED_VALUE *e, Real *m)
     double div;
     int    f = 1;
 
-    if(VpIsNaN(m)) {
-        *d = VpGetDoubleNaN();
-        *e = 0;
-        f = -1; /* NaN */
-        goto Exit;
-    } else
-    if(VpIsPosZero(m)) {
-        *d = 0.0;
-        *e = 0;
-        f  = 0;
-        goto Exit;
-    } else
-    if(VpIsNegZero(m)) {
-        *d = VpGetDoubleNegZero();
-        *e = 0;
-        f  = 0;
-        goto Exit;
-    } else
-    if(VpIsPosInf(m)) {
-        *d = VpGetDoublePosInf();
-        *e = 0;
-        f  = 2;
-        goto Exit;
-    } else
-    if(VpIsNegInf(m)) {
-        *d = VpGetDoubleNegInf();
-        *e = 0;
-        f  = 2;
-        goto Exit;
+    if (VpIsNaN(m)) {
+	*d = VpGetDoubleNaN();
+	*e = 0;
+	f = -1; /* NaN */
+	goto Exit;
+    }
+    else if (VpIsPosZero(m)) {
+	*d = 0.0;
+	*e = 0;
+	f  = 0;
+	goto Exit;
+    }
+    else if (VpIsNegZero(m)) {
+	*d = VpGetDoubleNegZero();
+	*e = 0;
+	f  = 0;
+	goto Exit;
+    }
+    else if (VpIsPosInf(m)) {
+	*d = VpGetDoublePosInf();
+	*e = 0;
+	f  = 2;
+	goto Exit;
+    }
+    else if (VpIsNegInf(m)) {
+	*d = VpGetDoubleNegInf();
+	*e = 0;
+	f  = 2;
+	goto Exit;
     }
     /* Normal number */
-    fig =(DBLE_FIG + BASE_FIG - 1) / BASE_FIG;
+    fig = (DBLE_FIG + BASE_FIG - 1) / BASE_FIG;
     ind_m = 0;
-    mm = Min(fig,(m->Prec));
+    mm = Min(fig, m->Prec);
     *d = 0.0;
     div = 1.;
-    while(ind_m < mm) {
-        div /= (double)BASE;
-        *d = *d + (double)m->frac[ind_m++] * div;
+    while (ind_m < mm) {
+	div /= (double)BASE;
+	*d = *d + (double)m->frac[ind_m++] * div;
     }
     *e = m->exponent * (SIGNED_VALUE)BASE_FIG;
     *d *= VpGetSign(m);
 
 Exit:
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, " VpVtoD: m=%\n", m);
-        printf("   d=%e * 10 **%ld\n", *d, *e);
-        printf("   DBLE_FIG = %d\n", DBLE_FIG);
+    if (gfDebug) {
+	VPrint(stdout, " VpVtoD: m=%\n", m);
+	printf("   d=%e * 10 **%ld\n", *d, *e);
+	printf("   DBLE_FIG = %d\n", DBLE_FIG);
     }
 #endif /*BIGDECIMAL_DEBUG */
     return f;
@@ -5190,57 +5891,58 @@ VpDtoV(Real *m, double d)
     BDIGIT i;
     double  val, val2;
 
-    if(isnan(d)) {
-        VpSetNaN(m);
-        goto Exit;
+    if (isnan(d)) {
+	VpSetNaN(m);
+	goto Exit;
     }
-    if(isinf(d)) {
-        if(d>0.0) VpSetPosInf(m);
-        else   VpSetNegInf(m);
-        goto Exit;
+    if (isinf(d)) {
+	if (d > 0.0) VpSetPosInf(m);
+	else VpSetNegInf(m);
+	goto Exit;
     }
 
-    if(d == 0.0) {
-        VpSetZero(m,1);
-        goto Exit;
+    if (d == 0.0) {
+	VpSetZero(m, 1);
+	goto Exit;
     }
-    val =(d > 0.) ? d :(-d);
+    val = (d > 0.) ? d : -d;
     ne = 0;
-    if(val >= 1.0) {
-        while(val >= 1.0) {
-            val /= (double)BASE;
-            ++ne;
-        }
-    } else {
-        val2 = 1.0 /(double)BASE;
-        while(val < val2) {
-            val *= (double)BASE;
-            --ne;
-        }
+    if (val >= 1.0) {
+	while (val >= 1.0) {
+	    val /= (double)BASE;
+	    ++ne;
+	}
+    }
+    else {
+	val2 = 1.0 / (double)BASE;
+	while (val < val2) {
+	    val *= (double)BASE;
+	    --ne;
+	}
     }
     /* Now val = 0.xxxxx*BASE**ne */
 
     mm = m->MaxPrec;
     memset(m->frac, 0, mm * sizeof(BDIGIT));
-    for(ind_m = 0;val > 0.0 && ind_m < mm;ind_m++) {
-        val *= (double)BASE;
-        i = (BDIGIT)val;
-        val -= (double)i;
-        m->frac[ind_m] = i;
+    for (ind_m = 0; val > 0.0 && ind_m < mm; ind_m++) {
+	val *= (double)BASE;
+	i = (BDIGIT)val;
+	val -= (double)i;
+	m->frac[ind_m] = i;
     }
-    if(ind_m >= mm) ind_m = mm - 1;
+    if (ind_m >= mm) ind_m = mm - 1;
     VpSetSign(m, (d > 0.0) ? 1 : -1);
     m->Prec = ind_m + 1;
     m->exponent = ne;
 
     VpInternalRound(m, 0, (m->Prec > 0) ? m->frac[m->Prec-1] : 0,
-                      (BDIGIT)(val*(double)BASE));
+		    (BDIGIT)(val*(double)BASE));
 
 Exit:
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        printf("VpDtoV d=%30.30e\n", d);
-        VPrint(stdout, "  m=%\n", m);
+    if (gfDebug) {
+	printf("VpDtoV d=%30.30e\n", d);
+	VPrint(stdout, "  m=%\n", m);
     }
 #endif /* BIGDECIMAL_DEBUG */
     return;
@@ -5258,51 +5960,52 @@ VpItoV(Real *m, SIGNED_VALUE ival)
     int isign;
     SIGNED_VALUE ne;
 
-    if(ival == 0) {
-        VpSetZero(m,1);
-        goto Exit;
+    if (ival == 0) {
+	VpSetZero(m, 1);
+	goto Exit;
     }
     isign = 1;
     val = ival;
-    if(ival < 0) {
-        isign = -1;
-        val =(size_t)(-ival);
+    if (ival < 0) {
+	isign = -1;
+	val  =(size_t)(-ival);
     }
     ne = 0;
     ind_m = 0;
     mm = m->MaxPrec;
-    while(ind_m < mm) {
-        m->frac[ind_m] = 0;
-        ++ind_m;
+    while (ind_m < mm) {
+	m->frac[ind_m] = 0;
+	++ind_m;
     }
     ind_m = 0;
-    while(val > 0) {
-        if(val) {
-         v1 = val;
-         v2 = 1;
-            while(v1 >= BASE) {
-                v1 /= BASE;
-                v2 *= BASE;
-            }
-            val = val - v2 * v1;
-            v = v1;
-        } else {
-            v = 0;
-        }
-        m->frac[ind_m] = v;
-        ++ind_m;
-        ++ne;
+    while (val > 0) {
+	if (val) {
+	    v1 = val;
+	    v2 = 1;
+	    while (v1 >= BASE) {
+		v1 /= BASE;
+		v2 *= BASE;
+	    }
+	    val = val - v2 * v1;
+	    v = v1;
+	}
+	else {
+	    v = 0;
+	}
+	m->frac[ind_m] = v;
+	++ind_m;
+	++ne;
     }
     m->Prec = ind_m - 1;
     m->exponent = ne;
-    VpSetSign(m,isign);
+    VpSetSign(m, isign);
     VpNmlz(m);
 
 Exit:
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        printf(" VpItoV i=%d\n", ival);
-        VPrint(stdout, "  m=%\n", m);
+    if (gfDebug) {
+	printf(" VpItoV i=%d\n", ival);
+	VPrint(stdout, "  m=%\n", m);
     }
 #endif /* BIGDECIMAL_DEBUG */
     return;
@@ -5317,44 +6020,45 @@ VpSqrt(Real *y, Real *x)
 {
     Real *f = NULL;
     Real *r = NULL;
-    size_t y_prec, f_prec;
+    size_t y_prec;
     SIGNED_VALUE n, e;
     SIGNED_VALUE prec;
     ssize_t nr;
     double val;
 
-    /* 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;
+    /* Zero or +Infinity ? */
+    if (VpIsZero(x) || VpIsPosInf(x)) {
+	VpAsgn(y,x,1);
+	goto Exit;
+    }
+
+    /* Negative ? */
+    if (BIGDECIMAL_NEGATIVE_P(x)) {
+	VpSetNaN(y);
+	return VpException(VP_EXCEPTION_OP, "sqrt of negative value", 0);
     }
 
-     /* Negative ? */
-    if(VpGetSign(x) < 0) {
-        VpSetNaN(y);
-        return VpException(VP_EXCEPTION_OP,"(VpSqrt) SQRT(negative value)",0);
+    /* NaN ? */
+    if (VpIsNaN(x)) {
+	VpSetNaN(y);
+	return VpException(VP_EXCEPTION_OP, "sqrt of 'NaN'(Not a Number)", 0);
     }
 
     /* One ? */
-    if(VpIsOne(x)) {
-        VpSetOne(y);
-        goto Exit;
+    if (VpIsOne(x)) {
+	VpSetOne(y);
+	goto Exit;
     }
 
     n = (SIGNED_VALUE)y->MaxPrec;
     if (x->MaxPrec > (size_t)n) n = (ssize_t)x->MaxPrec;
+
     /* allocate temporally variables  */
-    f = VpAlloc(y->MaxPrec * (BASE_FIG + 2), "#1");
-    r = VpAlloc((n + n) * (BASE_FIG + 2), "#1");
+    f = VpAlloc(y->MaxPrec * (BASE_FIG + 2), "#1", 1, 1);
+    r = VpAlloc((n + n) * (BASE_FIG + 2), "#1", 1, 1);
 
     nr = 0;
     y_prec = y->MaxPrec;
-    f_prec = f->MaxPrec;
 
     prec = x->exponent - (ssize_t)y_prec;
     if (x->exponent > 0)
@@ -5366,8 +6070,8 @@ VpSqrt(Real *y, Real *x)
     e /= (SIGNED_VALUE)BASE_FIG;
     n = e / 2;
     if (e - n * 2 != 0) {
-        val /= BASE;
-        n = (e + 1) / 2;
+	val /= BASE;
+	n = (e + 1) / 2;
     }
     VpDtoV(y, sqrt(val));    /* y <- sqrt(val) */
     y->exponent += n;
@@ -5377,22 +6081,20 @@ VpSqrt(Real *y, Real *x)
     n = (SIGNED_VALUE)(y_prec * BASE_FIG);
     if (n < (SIGNED_VALUE)maxnr) n = (SIGNED_VALUE)maxnr;
     do {
-        y->MaxPrec *= 2;
-        if (y->MaxPrec > y_prec) y->MaxPrec = y_prec;
-        f->MaxPrec = y->MaxPrec;
-        VpDivd(f, r, x, y);     /* f = x/y    */
-        VpAddSub(r, f, y, -1);  /* r = f - y  */
-        VpMult(f, VpPt5, r);    /* f = 0.5*r  */
-        if(VpIsZero(f))         goto converge;
-        VpAddSub(r, f, y, 1);   /* r = y + f  */
-        VpAsgn(y, r, 1);        /* y = r      */
-        if(f->exponent <= prec) goto converge;
-    } while(++nr < n);
-    /* */
+	y->MaxPrec *= 2;
+	if (y->MaxPrec > y_prec) y->MaxPrec = y_prec;
+	f->MaxPrec = y->MaxPrec;
+	VpDivd(f, r, x, y);      /* f = x/y    */
+	VpAddSub(r, f, y, -1);   /* r = f - y  */
+	VpMult(f, VpPt5, r);     /* f = 0.5*r  */
+	if (VpIsZero(f))         goto converge;
+	VpAddSub(r, f, y, 1);    /* r = y + f  */
+	VpAsgn(y, r, 1);         /* y = r      */
+    } while (++nr < n);
+
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        printf("ERROR(VpSqrt): did not converge within %ld iterations.\n",
-            nr);
+    if (gfDebug) {
+	printf("ERROR(VpSqrt): did not converge within %ld iterations.\n", nr);
     }
 #endif /* BIGDECIMAL_DEBUG */
     y->MaxPrec = y_prec;
@@ -5400,13 +6102,13 @@ VpSqrt(Real *y, Real *x)
 converge:
     VpChangeSign(y, 1);
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VpMult(r, y, y);
-        VpAddSub(f, x, r, -1);
-        printf("VpSqrt: iterations = %"PRIdSIZE"\n", nr);
-        VPrint(stdout, "  y =% \n", y);
-        VPrint(stdout, "  x =% \n", x);
-        VPrint(stdout, "  x-y*y = % \n", f);
+    if (gfDebug) {
+	VpMult(r, y, y);
+	VpAddSub(f, x, r, -1);
+	printf("VpSqrt: iterations = %"PRIdSIZE"\n", nr);
+	VPrint(stdout, "  y =% \n", y);
+	VPrint(stdout, "  x =% \n", x);
+	VPrint(stdout, "  x-y*y = % \n", f);
     }
 #endif /* BIGDECIMAL_DEBUG */
     y->MaxPrec = y_prec;
@@ -5418,17 +6120,12 @@ Exit:
 }
 
 /*
- *
- * nf: digit position for operation.
- *
+ * Round relatively from the decimal point.
+ *    f: rounding mode
+ *   nf: digit location to round from the decimal point.
  */
 VP_EXPORT int
 VpMidRound(Real *y, unsigned short f, ssize_t nf)
-/*
- * Round reletively from the decimal point.
- *    f: rounding mode
- *   nf: digit location to round from the the decimal point.
- */
 {
     /* fracf: any positive digit under rounding position? */
     /* fracf_1further: any positive digits under one further than the rounding position? */
@@ -5442,8 +6139,8 @@ VpMidRound(Real *y, unsigned short f, ssize_t nf)
     exptoadd=0;
     if (nf < 0) {
 	/* rounding position too left(large). */
-	if((f!=VP_ROUND_CEIL) && (f!=VP_ROUND_FLOOR)) {
-	    VpSetZero(y,VpGetSign(y)); /* truncate everything */
+	if (f != VP_ROUND_CEIL && f != VP_ROUND_FLOOR) {
+	    VpSetZero(y, VpGetSign(y)); /* truncate everything */
 	    return 0;
 	}
 	exptoadd = -nf;
@@ -5456,7 +6153,7 @@ VpMidRound(Real *y, unsigned short f, ssize_t nf)
 
     ioffset = nf - ix*(ssize_t)BASE_FIG;
     n = (ssize_t)BASE_FIG - ioffset - 1;
-    for (shifter=1,i=0; i<n; ++i) shifter *= 10;
+    for (shifter = 1, i = 0; i < n; ++i) shifter *= 10;
 
     /* so the representation used (in y->frac) is an array of BDIGIT, where
        each BDIGIT contains a value between 0 and BASE-1, consisting of BASE_FIG
@@ -5465,20 +6162,25 @@ VpMidRound(Real *y, unsigned short f, ssize_t nf)
        (that numbers of decimal places are typed as ssize_t is somewhat confusing)
 
        nf is now position (in decimal places) of the digit from the start of
-          the array.
+       the array.
+
        ix is the position (in BDIGITS) of the BDIGIT containing the decimal digit,
-          from the start of the array.
+       from the start of the array.
+
        v is the value of this BDIGIT
+
        ioffset is the number of extra decimal places along of this decimal digit
-          within v.
+       within v.
+
        n is the number of decimal digits remaining within v after this decimal digit
        shifter is 10**n,
+
        v % shifter are the remaining digits within v
        v % (shifter * 10) are the digit together with the remaining digits within v
        v / shifter are the digit's predecessors together with the digit
        div = v / shifter / 10 is just the digit's precessors
        (v / shifter) - div*10 is just the digit, which is what v ends up being reassigned to.
-    */
+       */
 
     fracf = (v % (shifter * 10) > 0);
     fracf_1further = ((v % shifter) > 0);
@@ -5489,15 +6191,15 @@ VpMidRound(Real *y, unsigned short f, ssize_t nf)
     /* now v is just the digit required.
        now fracf is whether the digit or any of the remaining digits within v are non-zero
        now fracf_1further is whether any of the remaining digits within v are non-zero
-    */
+       */
 
     /* now check all the remaining BDIGITS for zero-ness a whole BDIGIT at a time.
-       if we spot any non-zeroness, that means that we foudn a positive digit under
+       if we spot any non-zeroness, that means that we found a positive digit under
        rounding position, and we also found a positive digit under one further than
        the rounding position, so both searches (to see if any such non-zero digit exists)
        can stop */
 
-    for (i=ix+1; (size_t)i < y->Prec; i++) {
+    for (i = ix + 1; (size_t)i < y->Prec; i++) {
 	if (y->frac[i] % BASE) {
 	    fracf = fracf_1further = 1;
 	    break;
@@ -5510,31 +6212,31 @@ VpMidRound(Real *y, unsigned short f, ssize_t nf)
        now v = the first digit under the rounding position */
 
     /* drop digits after pointed digit */
-    memset(y->frac+ix+1, 0, (y->Prec - (ix+1)) * sizeof(BDIGIT));
+    memset(y->frac + ix + 1, 0, (y->Prec - (ix + 1)) * sizeof(BDIGIT));
 
-    switch(f) {
-    case VP_ROUND_DOWN: /* Truncate */
-         break;
-    case VP_ROUND_UP:   /* Roundup */
-        if (fracf) ++div;
+    switch (f) {
+      case VP_ROUND_DOWN: /* Truncate */
 	break;
-    case VP_ROUND_HALF_UP:
-        if (v>=5) ++div;
-        break;
-    case VP_ROUND_HALF_DOWN:
+      case VP_ROUND_UP:   /* Roundup */
+	if (fracf) ++div;
+	break;
+      case VP_ROUND_HALF_UP:
+	if (v>=5) ++div;
+	break;
+      case VP_ROUND_HALF_DOWN:
 	if (v > 5 || (v == 5 && fracf_1further)) ++div;
-        break;
-    case VP_ROUND_CEIL:
-        if (fracf && (VpGetSign(y)>0)) ++div;
-        break;
-    case VP_ROUND_FLOOR:
-        if (fracf && (VpGetSign(y)<0)) ++div;
-        break;
-    case VP_ROUND_HALF_EVEN: /* Banker's rounding */
+	break;
+      case VP_ROUND_CEIL:
+	if (fracf && BIGDECIMAL_POSITIVE_P(y)) ++div;
+	break;
+      case VP_ROUND_FLOOR:
+	if (fracf && BIGDECIMAL_NEGATIVE_P(y)) ++div;
+	break;
+      case VP_ROUND_HALF_EVEN: /* Banker's rounding */
 	if (v > 5) ++div;
 	else if (v == 5) {
 	    if (fracf_1further) {
-	      ++div;
+		++div;
 	    }
 	    else {
 		if (ioffset == 0) {
@@ -5552,32 +6254,34 @@ VpMidRound(Real *y, unsigned short f, ssize_t nf)
 	}
 	break;
     }
-    for (i=0; i<=n; ++i) div *= 10;
-    if (div>=BASE) {
-        if(ix) {
-            y->frac[ix] = 0;
-            VpRdup(y,ix);
-        } else {
-            short s = VpGetSign(y);
-            SIGNED_VALUE e = y->exponent;
-            VpSetOne(y);
-            VpSetSign(y, s);
-            y->exponent = e+1;
-        }
-    } else {
-        y->frac[ix] = div;
-        VpNmlz(y);
+    for (i = 0; i <= n; ++i) div *= 10;
+    if (div >= BASE) {
+	if (ix) {
+	    y->frac[ix] = 0;
+	    VpRdup(y, ix);
+	}
+	else {
+	    short s = VpGetSign(y);
+	    SIGNED_VALUE e = y->exponent;
+	    VpSetOne(y);
+	    VpSetSign(y, s);
+	    y->exponent = e + 1;
+	}
+    }
+    else {
+	y->frac[ix] = div;
+	VpNmlz(y);
     }
     if (exptoadd > 0) {
-        y->exponent += (SIGNED_VALUE)(exptoadd/BASE_FIG);
-        exptoadd %= (ssize_t)BASE_FIG;
-        for(i=0;i<exptoadd;i++) {
-            y->frac[0] *= 10;
-            if (y->frac[0] >= BASE) {
-                y->frac[0] /= BASE;
-                y->exponent++;
-            }
-        }
+	y->exponent += (SIGNED_VALUE)(exptoadd / BASE_FIG);
+	exptoadd %= (ssize_t)BASE_FIG;
+	for (i = 0; i < exptoadd; i++) {
+	    y->frac[0] *= 10;
+	    if (y->frac[0] >= BASE) {
+		y->frac[0] /= BASE;
+		y->exponent++;
+	    }
+	}
     }
     return 1;
 }
@@ -5591,10 +6295,10 @@ VpLeftRound(Real *y, unsigned short f, ssize_t nf)
     BDIGIT v;
     if (!VpHasVal(y)) return 0; /* Unable to round */
     v = y->frac[0];
-    nf -= VpExponent(y)*(ssize_t)BASE_FIG;
+    nf -= VpExponent(y) * (ssize_t)BASE_FIG;
     while ((v /= 10) != 0) nf--;
     nf += (ssize_t)BASE_FIG-1;
-    return VpMidRound(y,f,nf);
+    return VpMidRound(y, f, nf);
 }
 
 VP_EXPORT int
@@ -5602,17 +6306,17 @@ VpActiveRound(Real *y, Real *x, unsigned short f, ssize_t nf)
 {
     /* First,assign whole value in truncation mode */
     if (VpAsgn(y, x, 10) <= 1) return 0; /* Zero,NaN,or Infinity */
-    return VpMidRound(y,f,nf);
+    return VpMidRound(y, f, nf);
 }
 
 static int
 VpLimitRound(Real *c, size_t ixDigit)
 {
     size_t ix = VpGetPrecLimit();
-    if(!VpNmlz(c))    return -1;
-    if(!ix)           return 0;
-    if(!ixDigit) ixDigit = c->Prec-1;
-    if((ix+BASE_FIG-1)/BASE_FIG > ixDigit+1) return 0;
+    if (!VpNmlz(c)) return -1;
+    if (!ix)        return  0;
+    if (!ixDigit) ixDigit = c->Prec-1;
+    if ((ix + BASE_FIG - 1) / BASE_FIG > ixDigit + 1) return 0;
     return VpLeftRound(c, VpGetRoundMode(), (ssize_t)ix);
 }
 
@@ -5630,27 +6334,27 @@ VpInternalRound(Real *c, size_t ixDigit, BDIGIT vPrev, BDIGIT v)
 
     v /= BASE1;
     switch (rounding_mode) {
-    case VP_ROUND_DOWN:
+      case VP_ROUND_DOWN:
 	break;
-    case VP_ROUND_UP:
+      case VP_ROUND_UP:
 	if (v) f = 1;
 	break;
-    case VP_ROUND_HALF_UP:
+      case VP_ROUND_HALF_UP:
 	if (v >= 5) f = 1;
 	break;
-    case VP_ROUND_HALF_DOWN:
+      case VP_ROUND_HALF_DOWN:
 	/* this is ok - because this is the last digit of precision,
 	   the case where v == 5 and some further digits are nonzero
 	   will never occur */
 	if (v >= 6) f = 1;
 	break;
-    case VP_ROUND_CEIL:
-	if (v && (VpGetSign(c) > 0)) f = 1;
+      case VP_ROUND_CEIL:
+	if (v && BIGDECIMAL_POSITIVE_P(c)) f = 1;
 	break;
-    case VP_ROUND_FLOOR:
-	if (v && (VpGetSign(c) < 0)) f = 1;
+      case VP_ROUND_FLOOR:
+	if (v && BIGDECIMAL_NEGATIVE_P(c)) f = 1;
 	break;
-    case VP_ROUND_HALF_EVEN:  /* Banker's rounding */
+      case VP_ROUND_HALF_EVEN:  /* Banker's rounding */
 	/* as per VP_ROUND_HALF_DOWN, because this is the last digit of precision,
 	   there is no case to worry about where v == 5 and some further digits are nonzero */
 	if (v > 5) f = 1;
@@ -5674,16 +6378,17 @@ VpRdup(Real *m, size_t ind_m)
     if (!ind_m) ind_m = m->Prec;
 
     carry = 1;
-    while (carry > 0 && (ind_m--)) {
-        m->frac[ind_m] += carry;
-        if (m->frac[ind_m] >= BASE) m->frac[ind_m] -= BASE;
-        else                        carry = 0;
-    }
-    if(carry > 0) {        /* Overflow,count exponent and set fraction part be 1  */
-        if (!AddExponent(m, 1)) return 0;
-        m->Prec = m->frac[0] = 1;
-    } else {
-        VpNmlz(m);
+    while (carry > 0 && ind_m--) {
+	m->frac[ind_m] += carry;
+	if (m->frac[ind_m] >= BASE) m->frac[ind_m] -= BASE;
+	else                        carry = 0;
+    }
+    if (carry > 0) { /* Overflow,count exponent and set fraction part be 1  */
+	if (!AddExponent(m, 1)) return 0;
+	m->Prec = m->frac[0] = 1;
+    }
+    else {
+	VpNmlz(m);
     }
     return 1;
 }
@@ -5696,18 +6401,18 @@ VpFrac(Real *y, Real *x)
 {
     size_t my, ind_y, ind_x;
 
-    if(!VpHasVal(x)) {
-        VpAsgn(y,x,1);
-        goto Exit;
+    if (!VpHasVal(x)) {
+	VpAsgn(y, x, 1);
+	goto Exit;
     }
 
     if (x->exponent > 0 && (size_t)x->exponent >= x->Prec) {
-        VpSetZero(y,VpGetSign(x));
-        goto Exit;
+	VpSetZero(y, VpGetSign(x));
+	goto Exit;
     }
-    else if(x->exponent <= 0) {
-        VpAsgn(y, x, 1);
-        goto Exit;
+    else if (x->exponent <= 0) {
+	VpAsgn(y, x, 1);
+	goto Exit;
     }
 
     /* satisfy: x->exponent > 0 */
@@ -5715,22 +6420,22 @@ VpFrac(Real *y, Real *x)
     y->Prec = x->Prec - (size_t)x->exponent;
     y->Prec = Min(y->Prec, y->MaxPrec);
     y->exponent = 0;
-    VpSetSign(y,VpGetSign(x));
+    VpSetSign(y, VpGetSign(x));
     ind_y = 0;
     my = y->Prec;
     ind_x = x->exponent;
-    while(ind_y < my) {
-        y->frac[ind_y] = x->frac[ind_x];
-        ++ind_y;
-        ++ind_x;
+    while (ind_y < my) {
+	y->frac[ind_y] = x->frac[ind_x];
+	++ind_y;
+	++ind_x;
     }
     VpNmlz(y);
 
 Exit:
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpFrac y=%\n", y);
-        VPrint(stdout, "    x=%\n", x);
+    if (gfDebug) {
+	VPrint(stdout, "VpFrac y=%\n", y);
+	VPrint(stdout, "    x=%\n", x);
     }
 #endif /* BIGDECIMAL_DEBUG */
     return;
@@ -5747,87 +6452,89 @@ VpPower(Real *y, Real *x, SIGNED_VALUE n)
     Real *w1 = NULL;
     Real *w2 = NULL;
 
-    if(VpIsZero(x)) {
-        if(n==0) {
-           VpSetOne(y);
-           goto Exit;
-        }
-        sign = VpGetSign(x);
-        if(n<0) {
-           n = -n;
-           if(sign<0) sign = (n%2)?(-1):(1);
-           VpSetInf (y,sign);
-        } else {
-           if(sign<0) sign = (n%2)?(-1):(1);
-           VpSetZero(y,sign);
-        }
-        goto Exit;
+    if (VpIsZero(x)) {
+	if (n == 0) {
+	    VpSetOne(y);
+	    goto Exit;
+	}
+	sign = VpGetSign(x);
+	if (n < 0) {
+	    n = -n;
+	    if (sign < 0) sign = (n % 2) ? -1 : 1;
+	    VpSetInf(y, sign);
+	}
+	else {
+	    if (sign < 0) sign = (n % 2) ? -1 : 1;
+	    VpSetZero(y,sign);
+	}
+	goto Exit;
     }
-    if(VpIsNaN(x)) {
-        VpSetNaN(y);
-        goto Exit;
+    if (VpIsNaN(x)) {
+	VpSetNaN(y);
+	goto Exit;
     }
-    if(VpIsInf(x)) {
-        if(n==0) {
-            VpSetOne(y);
-            goto Exit;
-        }
-        if(n>0) {
-            VpSetInf(y, (n%2==0 || VpIsPosInf(x)) ? 1 : -1);
-            goto Exit;
-        }
-        VpSetZero(y, (n%2==0 || VpIsPosInf(x)) ? 1 : -1);
-        goto Exit;
+    if (VpIsInf(x)) {
+	if (n == 0) {
+	    VpSetOne(y);
+	    goto Exit;
+	}
+	if (n > 0) {
+	    VpSetInf(y, (n % 2 == 0 || VpIsPosInf(x)) ? 1 : -1);
+	    goto Exit;
+	}
+	VpSetZero(y, (n % 2 == 0 || VpIsPosInf(x)) ? 1 : -1);
+	goto Exit;
     }
 
-    if((x->exponent == 1) &&(x->Prec == 1) &&(x->frac[0] == 1)) {
-        /* abs(x) = 1 */
-        VpSetOne(y);
-        if(VpGetSign(x) > 0) goto Exit;
-        if((n % 2) == 0) goto Exit;
-        VpSetSign(y, -1);
-        goto Exit;
+    if (x->exponent == 1 && x->Prec == 1 && x->frac[0] == 1) {
+	/* abs(x) = 1 */
+	VpSetOne(y);
+	if (BIGDECIMAL_POSITIVE_P(x)) goto Exit;
+	if ((n % 2) == 0) goto Exit;
+	VpSetSign(y, -1);
+	goto Exit;
     }
 
-    if(n > 0) sign = 1;
-    else if(n < 0) {
-        sign = -1;
-        n = -n;
-    } else {
-        VpSetOne(y);
-        goto Exit;
+    if (n > 0) sign = 1;
+    else if (n < 0) {
+	sign = -1;
+	n = -n;
+    }
+    else {
+	VpSetOne(y);
+	goto Exit;
     }
 
     /* Allocate working variables  */
 
-    w1 = VpAlloc((y->MaxPrec + 2) * BASE_FIG, "#0");
-    w2 = VpAlloc((w1->MaxPrec * 2 + 1) * BASE_FIG, "#0");
+    w1 = VpAlloc((y->MaxPrec + 2) * BASE_FIG, "#0", 1, 1);
+    w2 = VpAlloc((w1->MaxPrec * 2 + 1) * BASE_FIG, "#0", 1, 1);
     /* calculation start */
 
     VpAsgn(y, x, 1);
     --n;
-    while(n > 0) {
-        VpAsgn(w1, x, 1);
-        s = 1;
+    while (n > 0) {
+	VpAsgn(w1, x, 1);
+	s = 1;
 	while (ss = s, (s += s) <= (size_t)n) {
 	    VpMult(w2, w1, w1);
 	    VpAsgn(w1, w2, 1);
 	}
-        n -= (SIGNED_VALUE)ss;
-        VpMult(w2, y, w1);
-        VpAsgn(y, w2, 1);
+	n -= (SIGNED_VALUE)ss;
+	VpMult(w2, y, w1);
+	VpAsgn(y, w2, 1);
     }
-    if(sign < 0) {
-        VpDivd(w1, w2, VpConstOne, y);
-        VpAsgn(y, w1, 1);
+    if (sign < 0) {
+	VpDivd(w1, w2, VpConstOne, y);
+	VpAsgn(y, w1, 1);
     }
 
 Exit:
 #ifdef BIGDECIMAL_DEBUG
-    if(gfDebug) {
-        VPrint(stdout, "VpPower y=%\n", y);
-        VPrint(stdout, "VpPower x=%\n", x);
-        printf("  n=%d\n", n);
+    if (gfDebug) {
+	VPrint(stdout, "VpPower y=%\n", y);
+	VPrint(stdout, "VpPower x=%\n", x);
+	printf("  n=%"PRIdVALUE"\n", n);
     }
 #endif /* BIGDECIMAL_DEBUG */
     VpFree(w2);
@@ -5849,25 +6556,25 @@ VpVarCheck(Real * v)
 {
     size_t i;
 
-    if(v->MaxPrec <= 0) {
-        printf("ERROR(VpVarCheck): Illegal Max. Precision(=%"PRIuSIZE")\n",
-            v->MaxPrec);
-        return 1;
-    }
-    if((v->Prec <= 0) ||((v->Prec) >(v->MaxPrec))) {
-        printf("ERROR(VpVarCheck): Illegal Precision(=%"PRIuSIZE")\n", v->Prec);
-        printf("       Max. Prec.=%"PRIuSIZE"\n", v->MaxPrec);
-        return 2;
-    }
-    for(i = 0; i < v->Prec; ++i) {
-        if((v->frac[i] >= BASE)) {
-            printf("ERROR(VpVarCheck): Illegal fraction\n");
-            printf("       Frac[%"PRIuSIZE"]=%lu\n", i, v->frac[i]);
-            printf("       Prec.   =%"PRIuSIZE"\n", v->Prec);
-            printf("       Exp. =%"PRIdVALUE"\n", v->exponent);
-            printf("       BASE =%lu\n", BASE);
-            return 3;
-        }
+    if (v->MaxPrec == 0) {
+	printf("ERROR(VpVarCheck): Illegal Max. Precision(=%"PRIuSIZE")\n",
+	       v->MaxPrec);
+	return 1;
+    }
+    if (v->Prec == 0 || v->Prec > v->MaxPrec) {
+	printf("ERROR(VpVarCheck): Illegal Precision(=%"PRIuSIZE")\n", v->Prec);
+	printf("       Max. Prec.=%"PRIuSIZE"\n", v->MaxPrec);
+	return 2;
+    }
+    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("       Prec.   =%"PRIuSIZE"\n", v->Prec);
+	    printf("       Exp. =%"PRIdVALUE"\n", v->exponent);
+	    printf("       BASE =%"PRIuBDIGIT"\n", BASE);
+	    return 3;
+	}
     }
     return 0;
 }
diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
index c8bd0aef18..7d767f598b 100644
--- a/ext/bigdecimal/bigdecimal.gemspec
+++ b/ext/bigdecimal/bigdecimal.gemspec
@@ -1,30 +1,39 @@
-# -*- ruby -*-
-_VERSION = "1.1.0"
+# coding: utf-8
+
+bigdecimal_version = '2.0.0'
 
 Gem::Specification.new do |s|
-  s.name = "bigdecimal"
-  s.version = _VERSION
-  s.date = "2011-07-30"
-  s.summary = "Arbitrary-precision decimal floating-point number library."
-  s.email = "mrkn@mrkn.jp"
-  s.description = "This library provides arbitrary-precision decimal floating-point number class."
-  s.authors = ["Kenta Murata", "Shigeo Kobayashi"]
-  s.require_path = %[.]
-  s.files = %w[
+  s.name          = "bigdecimal"
+  s.version       = bigdecimal_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[
     bigdecimal.gemspec
-    bigdecimal.c
-    bigdecimal.h
-    README
-    depend extconf.rb
+    ext/bigdecimal/bigdecimal.c
+    ext/bigdecimal/bigdecimal.h
+    lib/bigdecimal.rb
     lib/bigdecimal/jacobian.rb
-    lib/bigdecimal/lcdcmp.rb
+    lib/bigdecimal/ludcmp.rb
     lib/bigdecimal/math.rb
     lib/bigdecimal/newton.rb
     lib/bigdecimal/util.rb
-    lib/bigdecimal/version.rb
     sample/linear.rb
     sample/nlsolve.rb
     sample/pi.rb
   ]
-  s.extensions = %w[extconf.rb]
+
+  s.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+
+  s.add_development_dependency "rake", "~> 10.0"
+  s.add_development_dependency "rake-compiler", ">= 0.9"
+  s.add_development_dependency "minitest", "< 5.0.0"
+  s.add_development_dependency "pry"
 end
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
index d6a3f337c6..e3eae06e67 100644
--- a/ext/bigdecimal/bigdecimal.h
+++ b/ext/bigdecimal/bigdecimal.h
@@ -4,23 +4,74 @@
  *
  * 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
 #define  RUBY_BIG_DECIMAL_H 1
 
+#define RUBY_NO_OLD_COMPATIBILITY
+
 #include "ruby/ruby.h"
 #include <float.h>
 
+#ifndef RB_UNUSED_VAR
+# ifdef __GNUC__
+#  define RB_UNUSED_VAR(x) x __attribute__ ((unused))
+# else
+#  define RB_UNUSED_VAR(x) x
+# endif
+#endif
+
+#ifndef UNREACHABLE
+# define UNREACHABLE		/* unreachable */
+#endif
+
+#undef BDIGIT
+#undef SIZEOF_BDIGITS
+#undef BDIGIT_DBL
+#undef BDIGIT_DBL_SIGNED
+#undef PRI_BDIGIT_PREFIX
+#undef PRI_BDIGIT_DBL_PREFIX
+
+#ifdef HAVE_INT64_T
+# define BDIGIT uint32_t
+# 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
+} /* satisfy cc-mode */
+#endif
 #endif
 
 #ifndef HAVE_LABS
@@ -41,6 +92,62 @@ 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
+
+#ifndef ST2FIX
+# undef RB_ST2FIX
+# define RB_ST2FIX(h) LONG2FIX((long)(h))
+# define ST2FIX(h) RB_ST2FIX(h)
+#endif
+
 #ifdef vabs
 # undef vabs
 #endif
@@ -94,7 +201,7 @@ extern VALUE rb_cBigDecimal;
 #define VP_EXCEPTION_OVERFLOW   ((unsigned short)0x0001) /* 0x0008) */
 #define VP_EXCEPTION_ZERODIVIDE ((unsigned short)0x0010)
 
-/* Following 2 exceptions cann't controlled by user */
+/* Following 2 exceptions can't controlled by user */
 #define VP_EXCEPTION_OP         ((unsigned short)0x0020)
 #define VP_EXCEPTION_MEMORY     ((unsigned short)0x0040)
 
@@ -120,6 +227,14 @@ extern VALUE rb_cBigDecimal;
 #define VP_SIGN_POSITIVE_INFINITE  3 /* Positive infinite number */
 #define VP_SIGN_NEGATIVE_INFINITE -3 /* Negative infinite number */
 
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#define	FLEXIBLE_ARRAY_SIZE /* */
+#elif defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#define	FLEXIBLE_ARRAY_SIZE 0
+#else
+#define	FLEXIBLE_ARRAY_SIZE 1
+#endif
+
 /*
  * VP representation
  *  r = 0.xxxxxxxxx *BASE**exponent
@@ -127,11 +242,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 pfrac[]       */
+                    /* This is the actual size of frac[]        */
                     /*(frac[0] to frac[MaxPrec] are available). */
     size_t Prec;    /* Current precision size.                  */
-                    /* This indicates how much the.             */
-                    /* the array frac[] is actually used.       */
+                    /* This indicates how much the              */
+                    /* array frac[] is actually used.           */
     SIGNED_VALUE exponent; /* Exponent part.                    */
     short  sign;    /* Attributes of the value.                 */
                     /*
@@ -144,7 +259,7 @@ typedef struct {
                      *         -3 : Negative infinite number
                      */
     short  flag;    /* Not used in vp_routines,space for user.  */
-    BDIGIT frac[1]; /* Pointer to array of fraction part.       */
+    BDIGIT frac[FLEXIBLE_ARRAY_SIZE]; /* Array of fraction part. */
 } Real;
 
 /*
@@ -191,8 +306,9 @@ VP_EXPORT int VpIsNegDoubleZero(double v);
 VP_EXPORT size_t VpNumOfChars(Real *vp,const char *pszFmt);
 VP_EXPORT size_t VpInit(BDIGIT BaseVal);
 VP_EXPORT void *VpMemAlloc(size_t mb);
+VP_EXPORT void *VpMemRealloc(void *ptr, size_t mb);
 VP_EXPORT void VpFree(Real *pv);
-VP_EXPORT Real *VpAlloc(size_t mx, const char *szVal);
+VP_EXPORT Real *VpAlloc(size_t mx, const char *szVal, int strict_p, int exc);
 VP_EXPORT size_t VpAsgn(Real *c, Real *a, int isw);
 VP_EXPORT size_t VpAddSub(Real *c,Real *a,Real *b,int operation);
 VP_EXPORT size_t VpMult(Real *c,Real *a,Real *b);
@@ -250,7 +366,7 @@ VP_EXPORT Real *VpOne(void);
 #define VpIsZero(a)     (VpIsPosZero(a) || VpIsNegZero(a))
 #define VpSetPosZero(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_POSITIVE_ZERO)
 #define VpSetNegZero(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NEGATIVE_ZERO)
-#define VpSetZero(a,s)  ( ((s)>0)?VpSetPosZero(a):VpSetNegZero(a) )
+#define VpSetZero(a,s)  (void)(((s)>0)?VpSetPosZero(a):VpSetNegZero(a))
 
 /* NaN */
 #define VpIsNaN(a)      ((a)->sign==VP_SIGN_NaN)
@@ -263,16 +379,18 @@ VP_EXPORT Real *VpOne(void);
 #define VpIsDef(a)      ( !(VpIsNaN(a)||VpIsInf(a)) )
 #define VpSetPosInf(a)  ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_POSITIVE_INFINITE)
 #define VpSetNegInf(a)  ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NEGATIVE_INFINITE)
-#define VpSetInf(a,s)   ( ((s)>0)?VpSetPosInf(a):VpSetNegInf(a) )
+#define VpSetInf(a,s)   (void)(((s)>0)?VpSetPosInf(a):VpSetNegInf(a))
 #define VpHasVal(a)     (a->frac[0])
 #define VpIsOne(a)      ((a->Prec==1)&&(a->frac[0]==1)&&(a->exponent==1))
 #define VpExponent(a)   (a->exponent)
 #ifdef BIGDECIMAL_DEBUG
 int VpVarCheck(Real * v);
-VP_EXPORT int VPrint(FILE *fp,const char *cntl_chr,Real *a);
 #endif /* BIGDECIMAL_DEBUG */
 
 #if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
 }  /* extern "C" { */
 #endif
 #endif /* RUBY_BIG_DECIMAL_H */
diff --git a/ext/bigdecimal/bigdecimal_en.html b/ext/bigdecimal/bigdecimal_en.html
deleted file mode 100644
index afaf8eca86..0000000000
--- a/ext/bigdecimal/bigdecimal_en.html
+++ /dev/null
@@ -1,792 +0,0 @@
-<HTML>
-<HEAD>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html">
-<style type="text/css"><!--
-body {  color: #3f0f0f;  background: #fefeff;  margin-left: 2em; margin-right: 2em;}
-h1 {  color: #ffffff;  background-color: #3939AD;  border-color: #FF00FF;  width: 100%;  border-style: solid;
-  border-top-width: 0.1em;  border-bottom-width: 0.1em;  border-right: none;  border-left: none;
-  padding: 0.1em;  font-weight: bold;  font-size: 160%;  text-align: center;}
-h2 {  color: #00007f;  background-color: #e7e7ff;  border-color: #000094;  width: 100%;  border-style: solid;  border-le  ft: none;  border-right: none;  border-top-width: 0.1em;  border-bottom-width: 0.1em;  padding: 0.1em;
-  font-weight: bold;  font-size: 110%;
-}
-h3 {  color: #00007f;  padding: 0.2em;  font-size: 110%;}
-h4, h5 {  color: #000000;  padding: 0.2em;  font-size: 100%;}
-table {  margin-top: 0.2em; margin-bottom: 0.2em;  margin-left: 2em; margin-right: 2em;}
-caption {  color: #7f0000;  font-weight: bold;}
-th {  background: #e7e7ff;  padding-left: 0.2em; padding-right: 0.2em;}
-td {  background: #f3f7ff;  padding-left: 0.2em; padding-right: 0.2em;}
-code {  color: #0000df;}
-dt {  margin-top: 0.2em;}
-li {  margin-top: 0.2em;}
-pre
-{    BACKGROUND-COLOR: #d0d0d0;    BORDER-BOTTOM: medium none;    BORDER-LEFT: medium none;
-    BORDER-RIGHT: medium none;    BORDER-TOP: medium none;    LINE-HEIGHT: 100%;    MARGIN: 12px 12px 12px 12px;
-    PADDING-BOTTOM: 12px;    PADDING-LEFT: 12px;    PADDING-RIGHT: 12px;    PADDING-TOP: 12px;
-    WHITE-SPACE: pre;    WIDTH: 100%
-}
---></style>
-
-<TITLE>BigDecimal:An extension library for Ruby</TITLE>
-</HEAD>
-<BODY BGCOLOR=#FFFFE0>
-<H1>BigDecimal(Variable Precision Floating Library for Ruby)</H1>
-<DIV align="right"><A HREF="./bigdecimal_ja.html">Japanese</A></DIV><BR>
-BigDecimal is an extension library for the Ruby interpreter.
-Using BigDecimal class, you can obtain any number of significant digits in computation.
-For the details about Ruby see:<BR>
-<UL>
-<LI><A HREF="http://www.ruby-lang.org/en/">http://www.ruby-lang.org/en/</A>:Official Ruby page(English).</LI>
-<LI><A HREF="http://kahori.com/ruby/ring/">http://kahori.com/ruby/ring/</A>:Mutually linked pages relating to Ruby(Japanese).
-</LI>
-</UL>
-NOTE:<BR>
- This software is provided "AS IS" and without any express or
- implied warranties,including,without limitation,the implied
- warranties of merchantability and fitness for a particular
- purpose. For the details,see COPYING and README included in this
- distribution.
-<BR>
-<hr>
-
-<H2>Contents</H2>
-<UL>
-<LI><A HREF="#INTRO">Introduction</LI>
-<LI><A HREF="#SPEC">Usage and methods</A></LI>
-<LI><A HREF="#UNDEF">Infinity,NaN,Zero</A></LI>
-<LI><A HREF="#STRUCT">Internal structure</A></LI>
-<LI><A HREF="#BASE">Binary or decimal number representation</A></LI>
-<LI><A HREF="#PREC">Resulting number of significant digits</A></LI>
-</UL>
-<HR>
-
-<A NAME="#INTRO">
-<H2>Introduction</H2>
-Ruby already has builtin (variable length integer number) class Bignum. Using Bignum class,you can obtain
- any integer value in magnitude. But, variable length decimal number class is not yet built in.
-This is why I made variable length floating class BigDecimal.
-Feel free to send any comments or bug reports to me.
-<A HREF="mailto:shigeo@tinyforest.gr.jp">shigeo@tinyforest.gr.jp</A>
-I will try(but can't promise) to fix bugs reported.
-<hr>
-<H2>Installation</H2>
-The Ruby latest version can be downloaded from <A HREF="http://www.ruby-lang.org/en/">Official Ruby page</A>.
-Once decompress the downloaded Ruby archive,follow the normal installation procedures according to the
-documents included.
-
-<A NAME="#SPEC">
-<H2>Usage and methods</H2>
-Suppose you already know Ruby programming,
-to create BigDecimal objects,the program would like:<BR>
-
-<CODE><PRE>
-   require 'bigdecimal'
-   a=BigDecimal::new("0.123456789123456789")
-   b=BigDecimal("123456.78912345678",40)
-   c=a+b
-</PRE></CODE>
-
-<H3>List of methods</H3>
-In 32 bits integer system,every 4 digits(in decimal) are computed simultaneously.
-This means the number of significant digits in BigDecimal is always a multiple of 4.
-<P>
-Some more methods are available in Ruby code (not C code).
-Functions such as sin,cos ...,are in math.rb in bigdecimal directory.
-To use them,require math.rb as:
-<CODE><PRE>
-require "bigdecimal/math.rb"
-</PRE></CODE>
-For details,see the math.rb code and comments.
-Other utility methods are in util.rb.
-To use util.rb, require it as:
-<CODE><PRE>
-require "bigdecimal/util.rb"
-</PRE></CODE>
-For details,see the util.rb code.
-
-<H4><U>Class methods</U></H4>
-<UL>
-<LI><B>new</B></LI><BLOCKQUOTE>
-"new" method creates a new BigDecimal object.<BR>
-a=BigDecimal::new(s[,n]) or<BR>
-a=BigDecimal(s[,n]) or<BR>
-where:<BR>
-s: Initial value string. Spaces will be ignored. Any unrecognizable character for
-representing initial value terminates the string.<BR>
-n: Maximum number of significant digits of a. n must be a Fixnum object.
-If n is omitted or is equal to 0,then the maximum number of significant digits of a is determined from the length of s.
-Actual number of digits handled in computations are usually greater than n.<BR>
-n is useful when performing divisions like
-<CODE><PRE>
-BigDecimal("1")    / BigDecimal("3")    # => 0.3333333333 33E0
-BigDecimal("1",10) / BigDecimal("3",10) # => 0.3333333333 3333333333 33333333E0
-</PRE></CODE>
-but the resulting digits obtained may differ in future version.
-</BLOCKQUOTE>
-
-<LI><B>mode</B></LI><BLOCKQUOTE>
-f = BigDecimal.mode(s[,v])<BR>
-mode method controls BigDecimal computation. If the second argument is not given or is nil,then the value
-of current setting is returned.
-Following usage are defined.<BR>
-<P><B>[EXCEPTION control]</B><P>
-Actions when computation results NaN or Infinity can be defined as follows.
-<P>
-<BLOCKQUOTE>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_NaN,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_INFINITY,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_UNDERFLOW,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_OVERFLOW,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_ZERODIVIDE,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_ALL,flag)<BR>
-</BLOCKQUOTE>
-EXCEPTION_NaN controls the execution when computation results to NaN.<BR>
-EXCEPTION_INFINITY controls the execution when computation results to Infinity.<BR>
-EXCEPTION_UNDERFLOW controls the execution when computation underflows.<BR>
-EXCEPTION_OVERFLOW controls the execution when computation overflows.<BR>
-EXCEPTION_ZERODIVIDE controls the execution when zero-division occurs.<BR>
-EXCEPTION_ALL controls the execution when any defined exception occurs.<BR>
-If the flag is true,then the relating exception is thrown.<BR>
-No exception is thrown when the flag is false(default) and computation
-continues with the result:<BR>
-<BLOCKQUOTE>
-EXCEPTION_NaN results to NaN<BR>
-EXCEPTION_INFINITY results to +Infinity or -Infinity<BR>
-EXCEPTION_UNDERFLOW results to 0.<BR>
-EXCEPTION_OVERFLOW results to +Infinity or -Infinity<BR>
-EXCEPTION_ZERODIVIDE results to +Infinity or -Infinity<BR>
-</BLOCKQUOTE>
-EXCEPTION_INFINITY,EXCEPTION_OVERFLOW, and EXCEPTION_ZERODIVIDE are
- currently the same.<BR>
-The return value of mode method is the value set.<BR>
-If nil is specified for the second argument,then current setting is returned.<BR>
-Suppose the return value of the mode method is f,then
- f &amp; BigDecimal::EXCEPTION_NaN !=0 means EXCEPTION_NaN is set to on.
-<P>
-<B>[ROUND error control]</B><P>
-Rounding operation can be controlled as:
-<BLOCKQUOTE>
-f = BigDecimal::mode(BigDecimal::ROUND_MODE,flag)
-</BLOCKQUOTE>
-where flag must be one of:
-<TABLE>
-
-<TR><TD>ROUND_UP</TD><TD>round away from zero.</TD></TR>
-<TR><TD>ROUND_DOWN</TD><TD>round towards zero(truncate).</TD></TR>
-<TR><TD>ROUND_HALF_UP</TD><TD>round up if the digit &gt;= 5 otherwise truncated(default).</TD></TR>
-<TR><TD>ROUND_HALF_DOWN</TD><TD>round up if the digit &gt;= 6 otherwise truncated.</TD></TR>
-<TR><TD>ROUND_HALF_EVEN</TD><TD>round towards the even neighbor(Banker's rounding).
-<TR><TD>ROUND_CEILING</TD><TD>round towards positive infinity(ceil).</TD></TR>
-<TR><TD>ROUND_FLOOR</TD><TD>round towards negative infinity(floor).</TD></TR>
-</TABLE>
-New rounding mode is returned. If nil is specified for the second argument,then current setting is returned.<BR>
-The digit location for rounding operation can not be specified by this mode method,
-use truncate/round/ceil/floor/add/sub/mult/div methods for each instance instead.
-</BLOCKQUOTE>
-
-<LI><B>limit[(n)]</B></LI><BLOCKQUOTE>
-Limits the maximum digits that the newly created BigDecimal objects can hold never exceed n.
-This means the rounding operation specified by BigDecimal.mode is
-performed if necessary.
-limit returns the value before set if n is nil or is not specified.
-Zero,the default value,means no upper limit.<BR>
-The limit has no more priority than instance methods such as truncate,round,ceil,floor,add,sub,mult,and div. <BR>
-mf = BigDecimal::limit(n)<BR>
-</BLOCKQUOTE>
-
-<LI><B>double_fig</B></LI><BLOCKQUOTE>
-double_fig is a class method which returns the number of digits
-the Float class can have.
-<CODE><PRE>
-  p BigDecimal::double_fig  # ==> 20 (depends on the CPU etc.)
-</PRE></CODE>
-The equivalent C programs which calculates the value of
-double_fig is:
-<CODE><PRE>
- double v          = 1.0;
- int    double_fig = 0;
- while(v + 1.0 > 1.0) {
-    ++double_fig;
-    v /= 10;
- }
-</PRE></CODE>
-</BLOCKQUOTE>
-
-<LI><B>BASE</B></LI><BLOCKQUOTE>
-Base value used in the BigDecimal calculation.
-On 32 bits integer system,the value of BASE is 10000.<BR>
-b = BigDecimal::BASE<BR>
-</BLOCKQUOTE>
-</UL>
-
-<H4><U>Instance methods</U></H4>
-<UL>
-<LI><B>+</B></LI><BLOCKQUOTE>
-addition(c = a + b)<BR>
-For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
-
-</BLOCKQUOTE>
-<LI><B>-</B></LI><BLOCKQUOTE>
-subtraction (c = a - b) or negation (c = -a)<BR>
-For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
-
-</BLOCKQUOTE>
-<LI><B>*</B></LI><BLOCKQUOTE>
-multiplication(c = a * b)<BR>
-For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
-
-</BLOCKQUOTE>
-<LI><B>/</B></LI><BLOCKQUOTE>
-division(c = a / b)<BR>
-For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
-</BLOCKQUOTE>
-
-<LI><B>add(b,n)</B></LI><BLOCKQUOTE>
-c = a.add(b,n)<BR>
-c = a.add(b,n) performs c = a + b.<BR>
-If n is less than the actual significant digits of a + b,
-then c is rounded properly according to the BigDecimal.limit.<BR>
-If n is zero,then the result is the same as +'s.
-</BLOCKQUOTE>
-<LI><B>sub(b,n)</B></LI><BLOCKQUOTE>
-c = a.sub(b,n)<BR>
-c = a.sub(b,n) performs c = a - b.<BR>
-If n is less than the actual significant digits of a - b,
-then c is rounded properly according to the BigDecimal.limit.<BR>
-If n is zero,then the result is the same as -'s.
-
-</BLOCKQUOTE>
-<LI><B>mult(b,n)</B></LI><BLOCKQUOTE>
-c = a.mult(b,n)<BR>
-c = a.mult(b,n) performs c = a * b.<BR>
-If n is less than the actual significant digits of a * b,
-then c is rounded properly according to the BigDecimal.limit.<BR>
-If n is zero,then the result is the same as *'s.
-
-</BLOCKQUOTE>
-<LI><B>div(b[,n])</B></LI><BLOCKQUOTE>
-c = a.div(b,n)<BR>
-c = a.div(b,n) performs c = a / b.<BR>
-If n is less than the actual significant digits of a / b,
-then c is rounded properly according to the BigDecimal.limit.<BR>
-If n is zero,then the result is the same as /'s.
-If n is not given,then the result will be an integer(BigDecimal) like Float#div.
-</BLOCKQUOTE>
-
-<LI><B>fix</B></LI><BLOCKQUOTE>
-c = a.fix<BR>
-returns integer part of a.<BR>
-
-</BLOCKQUOTE>
-<LI><B>frac</B></LI><BLOCKQUOTE>
-c = a.frac<BR>
-returns fraction part of a.<BR>
-
-</BLOCKQUOTE>
-<LI><B>floor[(n)]</B></LI><BLOCKQUOTE>
-c = a.floor<BR>
-returns the maximum integer value (in BigDecimal) which is less than or equal to a.
-<CODE><PRE>
- c = BigDecimal("1.23456").floor  #  ==> 1
- c = BigDecimal("-1.23456").floor #  ==> -2
-</PRE></CODE>
-
-As shown in the following example,an optional integer argument (n) specifying the position
-of the target digit can be given.<BR>
-If n> 0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
-If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
-<CODE><PRE>
- c = BigDecimal("1.23456").floor(4)   #  ==> 1.2345
- c = BigDecimal("15.23456").floor(-1) #  ==> 10.0
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>ceil[(n)]</B></LI><BLOCKQUOTE>
-c = a.ceil<BR>
-returns the minimum integer value (in BigDecimal) which is greater than or equal to a.
-<CODE><PRE>
- c = BigDecimal("1.23456").ceil  #  ==> 2
- c = BigDecimal("-1.23456").ceil #  ==> -1
-</PRE></CODE>
-
-As shown in the following example,an optional integer argument (n) specifying the position
-of the target digit can be given.<BR>
-If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
-If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
-<CODE><PRE>
- c = BigDecimal("1.23456").ceil(4)   # ==> 1.2346
- c = BigDecimal("15.23456").ceil(-1) # ==> 20.0
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>round[(n[,b])]</B></LI><BLOCKQUOTE>
-c = a.round<BR>
-round a to the nearest 1(default)ÅD<BR>
-<CODE><PRE>
- c = BigDecimal("1.23456").round  #  ==> 1
- c = BigDecimal("-1.23456").round #  ==> -1
-</PRE></CODE>
-The rounding operation changes according to BigDecimal::mode(BigDecimal::ROUND_MODE,flag) if specified.
-
-As shown in the following example,an optional integer argument (n) specifying the position
-of the target digit can be given.<BR>
-If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction  part digits is less than or equal to n).<BR>
-If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
-<CODE><PRE>
-c = BigDecimal::new("1.23456").round(4)   #  ==> 1.2346
-c = BigDecimal::new("15.23456").round(-1) #  ==> 20.0
-</PRE></CODE>
-
-Rounding operation can be specified by setting the second optional argument b with the valid ROUND_MODE.<BR>
-<CODE><PRE>
-c = BigDecimal::new("1.23456").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.234
-c = BigDecimal::new("1.23356").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.234
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>truncate[(n)]</B></LI><BLOCKQUOTE>
-c = a.truncate<BR>
-truncate a to the nearest 1ÅD<BR>
-As shown in the following example,an optional integer argument (n) specifying the position
-of the target digit can be given.<BR>
-If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
-If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
-
-<CODE><PRE>
-c = BigDecimal::new("1.23456").truncate(4)   #  ==> 1.2345
-c = BigDecimal::new("15.23456").truncate(-1) #  ==> 10.0
-</PRE></CODE>
-</BLOCKQUOTE>
-<LI><B>abs</B></LI><BLOCKQUOTE>
-c = a.abs<BR>
-returns an absolute value of a.<BR>
-
-</BLOCKQUOTE>
-<LI><B>to_i</B></LI><BLOCKQUOTE>
-changes a to an integer.<BR>
-i = a.to_i<BR>
-i becomes to Fixnum or Bignum.
-If a is Infinity or NaN,then i becomes to nil.
-
-</BLOCKQUOTE>
-<LI><B>to_s[(n)]</B></LI><BLOCKQUOTE>
-converts to string(default results look like "0.xxxxxEn").
-<CODE><PRE>
-BigDecimal("1.23456").to_s  #  ==> "0.123456E1"
-</PRE></CODE>
-If n(>0) is given,then a space is inserted to each of two parts divided by the decimal point
-after every n digits for readability.
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s(10)   #  ==> "0.1234567890 123456789E0"
-</PRE></CODE>
-n can be a string representing a positive integer number.
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s("10") #  ==> "0.1234567890 123456789E0"
-</PRE></CODE>
-If the first character is '+'(or ' '),then '+'(or ' ') will be set before value string
-when the value is positive.
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s(" 10") #  ==> " 0.1234567890 123456789E0"
-BigDecimal("0.1234567890123456789").to_s("+10") #  ==> "+0.1234567890 123456789E0"
-BigDecimal("-0.1234567890123456789").to_s("10") #  ==> "-0.1234567890 123456789E0"
-</PRE></CODE>
-
-At the end of the string,'E'(or 'e') or 'F'(or 'f') can be specified to change
-number representation.
-<CODE><PRE>
-BigDecimal("1234567890.123456789").to_s("E")  #  ==> "0.1234567890123456789E10"
-BigDecimal("1234567890.123456789").to_s("F")  #  ==> "1234567890.123456789"
-BigDecimal("1234567890.123456789").to_s("5E") #  ==> "0.12345 67890 12345 6789E10"
-BigDecimal("1234567890.123456789").to_s("5F") #  ==> "12345 67890.12345 6789"
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>exponent</B></LI><BLOCKQUOTE>
-returns an integer holding exponent value of a.<BR>
-n = a.exponent <BR>
-means a = 0.xxxxxxx*10**n.
-</BLOCKQUOTE>
-
-<LI><B>precs</B></LI><BLOCKQUOTE>
-n,m = a.precs <BR>
-precs returns number of significant digits (n) and maximum number of
-significant digits (m) of a.
-</BLOCKQUOTE>
-
-<LI><B>to_f</B></LI><BLOCKQUOTE>
-Creates a new Float object having (nearly) the same value.
-Use split method if you want to convert by yourself.
-</BLOCKQUOTE>
-
-</BLOCKQUOTE>
-<LI><B>sign</B></LI><BLOCKQUOTE>
-n = a.sign <BR>
-returns positive value if a &gt; 0,negative value if a &lt; 0,
-otherwise zero if a == 0.<BR>
-where the value of n means that a is:<BR>
-n = BigDecimal::SIGN_NaN(0) : a is NaN<BR>
-n = BigDecimal::SIGN_POSITIVE_ZERO(1) : a is +0<BR>
-n = BigDecimal::SIGN_NEGATIVE_ZERO(-1) : a is -0<BR>
-n = BigDecimal::SIGN_POSITIVE_FINITE(2) : a is positive<BR>
-n = BigDecimal::SIGN_NEGATIVE_FINITE(-2) : a is negative<BR>
-n = BigDecimal::SIGN_POSITIVE_INFINITE(3) : a is +Infinity<BR>
-n = BigDecimal::SIGN_NEGATIVE_INFINITE(-3) : a is -Infinity<BR>
-The value in () is the actual value,see (<A HREF="#STRUCT">Internal structure</A>.<BR>
-
-</BLOCKQUOTE>
-<LI><B>nan?</B></LI><BLOCKQUOTE>
-a.nan? returns True when a is NaN.
-
-</BLOCKQUOTE>
-<LI><B>infinite?</B></LI><BLOCKQUOTE>
-a.infinite? returns 1 when a is Infinity, -1 when a is -Infinity, nil otherwise.
-
-</BLOCKQUOTE>
-<LI><B>finite?</B></LI><BLOCKQUOTE>
-a.finite? returns true when a is neither Infinity nor NaN.
-</BLOCKQUOTE>
-
-<LI><B>zero?</B></LI><BLOCKQUOTE>
-c = a.zero?<BR>
-returns true if a is equal to 0,otherwise returns false<BR>
-</BLOCKQUOTE>
-<LI><B>nonzero?</B></LI><BLOCKQUOTE>
-c = a.nonzero?<BR>
-returns nil if a is 0,otherwise returns a itself.<BR>
-</BLOCKQUOTE>
-
-<LI><B>split</B></LI><BLOCKQUOTE>
-decomposes a BigDecimal value to 4 parts.
-All 4 parts are returned as an array.<BR>
-Parts consist of a sign(0 when the value is NaN,+1 for positive and
- -1 for negative value), a string representing fraction part,base value(always 10 currently),and an integer(Fixnum) for exponent respectively.
-a=BigDecimal::new("3.14159265")<BR>
-f,x,y,z = a.split<BR>
-where f=+1,x="314159265",y=10 and z=1<BR>
-therefore,you can translate BigDecimal value to Float as:<BR>
-s = "0."+x<BR>
-b = f*(s.to_f)*(y**z)<BR>
-
-</BLOCKQUOTE>
-<LI><B>inspect</B></LI><BLOCKQUOTE>
-is used for debugging output.<BR>
-p a=BigDecimal::new("3.14",10)<BR>
-should produce output like "#&lt;0x112344:'0.314E1',4(12)%gt;".
-where "0x112344" is the address,
-'0.314E1' is the value,4 is the number of the significant digits,
-and 12 is the maximum number of the significant digits
-the object can hold.
-</BLOCKQUOTE>
-
-<LI><B>sqrt</B></LI><BLOCKQUOTE>
-c = a.sqrt(n)<BR>
-computes square root value of a with significant digit number n at least.<BR>
-</BLOCKQUOTE>
-
-<LI><B>**</B></LI><BLOCKQUOTE>
-c = a ** n<BR>
-returns the value of a powered by n.
-n must be an integer.<BR>
-
-</BLOCKQUOTE>
-<LI><B>power</B></LI><BLOCKQUOTE>
-The same as ** method.<BR>
-c = a.power(n)<BR>
-returns the value of a powered by n(c=a**n).
-n must be an integer.<BR>
-</BLOCKQUOTE>
-
-<LI><B>divmod,quo,modulo,%,remainder</B></LI><BLOCKQUOTE>
-See,corresponding methods in Float class.
-</BLOCKQUOTE>
-
-</BLOCKQUOTE>
-<LI><B>&lt;=&gt;</B></LI><BLOCKQUOTE>
-c = a &lt;=&gt; b <BR>
-returns 0 if a==b,1 if a &gt b,and returns -1 if a &lt b.<BR>
-</BLOCKQUOTE>
-</UL>
-
-Following methods need no explanation.<BR>
-<UL>
-<LI>==</LI>
-<LI>===</LI>
-same as ==,used in case statement.
-<LI>!=</LI>
-<LI>&lt;</LI>
-<LI>&lt;=</LI>
-<LI>&gt;</LI>
-<LI>&gt;=</LI>
-</UL>
-
-<HR>
-<H3>About 'coerce'</H3>
-<B>For the binary operation like A op B:</B>
-<DL>
-<DT> 1.Both A and B are BigDecimal objects</DT>
-<DD> A op B is normally performed.</DD>
-<DT> 2.A is the BigDecimal object but B is other than BigDecimal object</DT>
-<DD> Operation is performed,after B is translated to corresponding BigDecimal object(because BigDecimal supports coerce method).</DD>
-<DT> 3.A is not the BigDecimal object but B is BigDecimal object</DT>
-<DD>If A has coerce method,then B will translate A to corresponding
-BigDecimal object and the operation is performed,otherwise an error occures.</DD>
-</DL>
-
-String is not translated to BigDecimal in default.
-Uncomment /* #define ENABLE_NUMERIC_STRING */ in bigdecimal.c, compile and install
-again if you want to enable string to BigDecimal conversion.
-Translation stops without error at the character representing non digit.
-For instance,"10XX" is translated to 10,"XXXX" is translated to 0.<BR>
-String representing zero or infinity such as "Infinity","+Infinity","-Infinity",and "NaN" can also be translated to BigDecimal unless false is specified by mode method.<BR>
-
-BigDecimal class supports coerce method(for the details about coerce method,see Ruby documentations). This means the most binary operation can be performed if the BigDecimal object is at the left hand side of the operation.<BR><BR>
-
- For example:
-<CODE><PRE>
-  a = BigDecimal.E(20)
-  c = a * "0.123456789123456789123456789" # A String is changed to BigDecimal object.
-</PRE></CODE>
-is performed normally.<BR>
- But,because String does not have coerce method,the following example can not be performed.<BR>
-
-<CODE><PRE>
-  a = BigDecimal.E(20)
-  c = "0.123456789123456789123456789" * a # ERROR
-</PRE></CODE>
-
-If you actually have any inconvenience about the error above.
-You can define a new class derived from String class,
-and define coerce method within the new class.<BR>
-
-<hr>
-<A NAME="#UNDEF">
-<H2>Infinity,Not a Number(NaN),Zero</H2>
-Infinite numbers and NaN can be represented by string writing "+Infinity"(or "Infinity"),"-Infinity",and "NaN" respectively in your program.
-Infinite numbers can be obtained by 1.0/0.0(=Infinity) or -1.0/0.0(=-Infinity).
-<BR><BR>
-NaN(Not a number) can be obtained by undefined computation like 0.0/0.0
-or Infinity-Infinity.
-Any computation including NaN results to NaN.
-Comparisons with NaN never become true,including comparison with NaN itself.
-<BR><BR>
-Zero has two different variations as +0.0 and -0.0.
-But,still, +0.0==-0.0 is true.
-<BR><BR>
-Computation results including Infinity,NaN,+0.0 or -0.0 become complicated.
-Run following program and confirm the results.
-Send me any incorrect result if you find.
-
-<CODE><PRE>
- require "bigdecimal"
- aa  = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
- ba  = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
- opa = %w(+ - * / <=> > >=  < == != <=)
- for a in aa
-  for b in ba
-    for op in opa
-      x = BigDecimal::new(a)
-      y = BigDecimal::new(b)
-      eval("ans= x #{op} y;print a,' ',op,' ',b,' ==> ',ans.to_s,\"\n\"")
-    end
-  end
- end
-</PRE></CODE>
-<hr>
-
-<A NAME="#STRUCT">
-<H2>Internal structure</H2>
-BigDecimal number is defined by the structure Real in BigDecimal.h.
-Digits representing a float number are kept in the array frac[] defined in the structure.
-In the program,any floating number(BigDecimal number) is represented as:<BR>
- <BigDecimal number> = 0.xxxxxxxxx*BASE**n<BR><BR>
-where 'x' is any digit representing mantissa(kept in the array frac[]),
-BASE is base value(=10000 in 32 bit integer system),
-and n is the exponent value.<BR>
-Larger BASE value enables smaller size of the array frac[],and increases computation speed.
-The value of BASE is defined ind VpInit(). In 32 bit integer system, this value is
-10000. In 64 bit integer system, the value is 1000000000.
-When BASE is 10000,an element of the array frac[] can have value of from 0 to 9999.
-(up to 4 digits).<BR>
-The structure Real is defined in bigdecimal.h as:<BR>
-<CODE><PRE>
-  typedef struct {
-     VALUE  obj;     /* Back pointer(VALUE) for Ruby object.         */
-     unsigned long MaxPrec; /* The size of the array frac[]          */
-     unsigned long Prec;    /* Current size of frac[] actually used. */
-     short    sign;         /* Attribute of the value.  */
-                            /*  ==0 : NaN               */
-                            /*    1 : +0                */
-                            /*   -1 : -0                */
-                            /*    2 : Positive number   */
-                            /*   -2 : Negative number   */
-                            /*    3 : +Infinity         */
-                            /*   -3 : -Infinity         */
-     unsigned short flag;   /* Control flag             */
-     int      exponent;     /* Exponent value(0.xxxx*BASE**exponent) */
-     unsigned long frac[1]; /* An array holding mantissa(Variable)   */
-  } Real;
-</CODE></PRE>
-The decimal value 1234.56784321 is represented as(BASE=10000):<BR>
-<PRE>
-    0.1234 5678 4321*(10000)**1
-</PRE>
-where frac[0]=1234,frac[1]=5678,frac[2]=4321,
-Prec=3,sign=2,exponent=1. MaxPrec can be any value greater than or equal to
-Prec.
-<hr>
-
-<A NAME="#BASE">
-<H2>Binary or decimal number representation</H2>
-I adopted decimal number representation for BigDecimal implementation.
-Of cource,binary number representation is common on the most computers.
-
-<H3>Advantages using decimal representation</H3>
-The reason why I adopted decimal number representation for BigDecimal is:<BR>
-<DL>
-<DT>Easy for debugging
-<DD>The floating number 1234.56784321 can be easily represented as:<BR>
-  frac[0]=1234,frac[1]=5678,frac[2]=4321,exponent=1,and sign=2.
-<DT>Exact representation
-<DD>Following program can add all numbers(in decimal) in a file
- without any error(no round operation).<BR>
-
-<CODE><PRE>
-   file = File::open(....,"r")
-   s = BigDecimal::new("0")
-   while line = file.gets
-      s = s + line
-   end
-</PRE></CODE>
-
-If the internal representation is binary,translation from decimal to
-binary is required and the translation error is inevitable.
-For example, 0.1 can not exactly be represented in binary.<BR>
-0.1 => b1*2**(-1)+b1*2**(-2)+b3*2**(-3)+b4*2**(-4)....<BR>
-where b1=0,b2=0,b3=0,b4=1...<BR>
-bn(n=1,2,3,...) is infinite series of digit with value of 0 or 1,
-and rounding operation is necessary but where we should round the series ?
-Of course, exact "0.1" is printed if the rounding operation is properly done,
-<DT>Significant digit we can have is automatically determined
-<DD>In binary representation,0.1 can not be represented in finite series of digit.
-
-But we only need one element(frac[0]=1) in decimal representation.
-This means that we can always determine the size of the array frac[] in Real
-structure.
-</DL>
-
-<H3>Disadvantage of decimal representation</H3>
-Because most computers have no internal decimal representation.
-Once you use BigDecimal,you need to keep using it without
-considering computation cost if exact computation is required.
-
-<H4>Which is the first input?</H4>
-Because most people uses decimal notation for numeric data representation,
-BigDecimal can handle numeric data without loss of translation error.
-<hr>
-
-<A NAME="#PREC">
-<H2>Resulting number of significant digits</H2>
-For the fundamental arithmetics such as addition,subtraction,
-multiplication,and division,I prepared 2 group of methods<BR>
-
-<H3>1. +,-,*,/</H3>
-For the operation + - * /,you can not specify the resulting
-number of significant digits.<BR>
-Resulting number of significant digits are defined as:<BR>
-1.1 For *,resulting number of significant digits is the sum of the
-significant digits of both side of the operator. For / ,resulting number of significant digits is the sum of the
-maximum significant digits of both side of the operator.<BR>
-1.2 For + and -,resulting number of significant digits is determined so that
- no round operation is needed. <br>
-For example, c has more than 100 significant digits if c is computed as:<BR>
-c = 0.1+0.1*10**(-100)<br>
-<BR>
-As +,-,and * are always exact(no round operation is performed unless BigDecimal.limit is specified),
-which means more memory is required to keep computation results.
-But,the division such as c=1.0/3.0 will always be rounded.<BR>
-
-<H3>2. add,sub,mult,div</H3>
-The length of the significant digits obtained from +,-,*,/
-is always defined by that of right and left side of the operator.
-To specify the length of the significant digits by your self,
-use methos add,sub,mult,div.
-<CODE><PRE>
- BigDecimal("2").div(3,12) # 2.0/3.0 => 0.6666666666 67E0
-</PRE></CODE>
-</BLOCKQUOTE>
-
-<H3>3. truncate,round,ceil,floor</H3>
-Using these methods,you can specify rounding location relatively from
-decimal point.
-<CODE><PRE>
- BigDecimal("6.66666666666666").round(12) # => 0.6666666666 667E1
-</PRE></CODE>
-</BLOCKQUOTE>
-
-
-<H3>4. Example</H3>
-Following example compute the ratio of the circumference of a circle to
-its diameter(pi=3.14159265358979....) using J.Machin's formula.
-<BR><BR>
-<CODE><PRE>
-#!/usr/local/bin/ruby
-
-require "bigdecimal"
-#
-# Calculates 3.1415.... (the number of times that a circle's diameter
-# will fit around the circle) using J. Machin's formula.
-#
-def big_pi(sig) # sig: Number of significant figures
-  exp    = -sig
-  pi     = BigDecimal::new("0")
-  two    = BigDecimal::new("2")
-  m25    = BigDecimal::new("-0.04")
-  m57121 = BigDecimal::new("-57121")
-
-  u = BigDecimal::new("1")
-  k = BigDecimal::new("1")
-  w = BigDecimal::new("1")
-  t = BigDecimal::new("-80")
-  while (u.nonzero? && u.exponent >= exp)
-    t   = t*m25
-    u   = t.div(k,sig)
-    pi  = pi + u
-    k   = k+two
-  end
-
-  u = BigDecimal::new("1")
-  k = BigDecimal::new("1")
-  w = BigDecimal::new("1")
-  t = BigDecimal::new("956")
-  while (u.nonzero? && u.exponent >= exp )
-    t   = t.div(m57121,sig)
-    u   = t.div(k,sig)
-    pi  = pi + u
-    k   = k+two
-  end
-  pi
-end
-
-if $0 == __FILE__
-  if ARGV.size == 1
-    print "PI("+ARGV[0]+"):\n"
-    p big_pi(ARGV[0].to_i)
-  else
-    print "TRY: ruby pi.rb 1000 \n"
-  end
-end
-
-</PRE></CODE>
-<HR>
-<FONT size=2>
-<I>
-<A HREF="http://www.tinyforest.gr.jp">
-Shigeo Kobayashi
-</A>
-(E-Mail:<A HREF="mailto:shigeo@tinyforest.gr.jp">&lt;shigeo@tinyforest.gr.jp&gt;</U></A>)
-</I>
-</FONT>
-</TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/ext/bigdecimal/bigdecimal_ja.html b/ext/bigdecimal/bigdecimal_ja.html
deleted file mode 100644
index cc44d61917..0000000000
--- a/ext/bigdecimal/bigdecimal_ja.html
+++ /dev/null
@@ -1,799 +0,0 @@
-<!-- saved from url=(0022)http://internet.e-mail -->
-<HTML>
-<HEAD>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=Shift_JIS">
-<style type="text/css"><!--
-body { color: #3f0f0f;  background: #fefeff; margin-left: 2em; margin-right: 2em;}
-h1 { color: #ffffff;  background-color: #3939AD;  border-color: #FF00FF;  width: 100%;
-  border-style: solid;  border-top-width: 0.1em;  border-bottom-width: 0.1em;  border-right: none;
-  border-left: none;  padding: 0.1em;  font-weight: bold;  font-size: 160%;  text-align: center;
-}
-h2 {  color: #00007f;  background-color: #e7e7ff;  border-color: #000094;  width: 100%;
-  border-style: solid; border-left: none;  border-right: none;  border-top-width: 0.1em;  border-bottom-width: 0.1em;
-  padding: 0.1em;
-  font-weight: bold;  font-size: 110%;
-}
-h3 {  color: #00007f;  padding: 0.2em;  font-size: 110%;}
-h4, h5 {  color: #000000;  padding: 0.2em;  font-size: 100%;}
-table {  margin-top: 0.2em; margin-bottom: 0.2em;  margin-left: 2em; margin-right: 2em;}
-caption {  color: #7f0000;  font-weight: bold;}
-th {  background: #e7e7ff;  padding-left: 0.2em; padding-right: 0.2em;}
-td {  background: #f3f7ff;  padding-left: 0.2em; padding-right: 0.2em;}
-code {  color: #0000df;}
-dt {  margin-top: 0.2em;}
-li {  margin-top: 0.2em;}
-pre
-{    BACKGROUND-COLOR: #d0d0d0;    BORDER-BOTTOM: medium none;    BORDER-LEFT: medium none;
-    BORDER-RIGHT: medium none;    BORDER-TOP: medium none;    LINE-HEIGHT: 100%;    MARGIN: 12px 12px 12px 12px;
-    PADDING-BOTTOM: 12px;    PADDING-LEFT: 12px;    PADDING-RIGHT: 12px;    PADDING-TOP: 12px;
-    WHITE-SPACE: pre;    WIDTH: 100%
-}
---></style>
-
-<TITLE>BigDecimal:An extension library for Ruby</TITLE>
-</HEAD>
-<BODY BGCOLOR=#FFFFE0>
-<H1>BigDecimal(�ϒ����������_���Z�p�g�����C�u����)</H1>
-<DIV align="right"><A HREF="./bigdecimal_en.html">English</A></DIV><BR>
-BigDecimal �̓I�u�W�F�N�g�w���̋��͂ȃX�N���v�g����ł��� Ruby �ɉϒ����������_
-�v�Z�@�\��ǉ����邽�߂̊g�����C�u�����ł��B
-Ruby �ɂ��Ă̏ڂ������e�͈ȉ���URL���Q�Ƃ��Ă��������B
-<UL>
-<LI><A HREF="http://www.ruby-lang.org/ja/">http://www.ruby-lang.org/ja/</A>�FRuby�����y�[�W</LI>
-<LI><A HREF="http://kahori.com/ruby/ring/">http://kahori.com/ruby/ring/</A>�FRuby�Ɋւ���y�[�W��H��܂�</LI>
-</UL>
-<hr>
-<H2>�ڎ�</H2>
-<UL>
-<LI><A HREF="#INTRO">�͂��߂�</LI>
-<LI><A HREF="#SPEC">�g�p���@�ƃ��\�b�h�̈ꗗ</A></LI>
-<LI><A HREF="#UNDEF">�����A�񐔁A�[���̈���</A></LI>
-<LI><A HREF="#STRUCT">�����\��</A></LI>
-<LI><A HREF="#BASE">2�i��10�i</A></LI>
-<LI><A HREF="#PREC">�v�Z���x�ɂ���</A></LI>
-</UL>
-
-<HR>
-<A NAME="#INTRO">
-<H2>�͂��߂�</H2>
-Ruby �ɂ� Bignum �Ƃ����N���X������A���S���̐����ł��v�Z���邱�Ƃ��ł��܂��B
-�����A�C�ӌ��̕��������_���Z�p�N���X�������悤�ł��B�����ŁA
-�C�ӌ��̕��������_���Z�p�g�����C�u���� BigDecimal ���쐬���܂����B
-�s��⏕���E��Ă�����ꍇ�ǂ��ǂ��A
-<A HREF="mailto:shigeo@tinyforest.gr.jp">shigeo@tinyforest.gr.jp</A>
-�܂ł��m�点���������B�s��𒼂��C�͑傢�ɂ���܂��B�����A���ԂȂǂ̊֌W�Ŗ�
-�͂ł��܂���B�܂��A���ʂɂ��Ă��ۏ؂ł�����̂ł͂���܂���B
-�\�߁A���������������B
-<BR><BR>
-���̃v���O�����́A���R�ɔz�z�E���ς��č\���܂���B�������A���쌠�͕������Ă��܂���B
-�z�z�E���ϓ��̌����� Ruby �̂���ɏ����܂��B�ڂ����� README ��ǂ�ł��������B
-
-<hr>
-<H2>�C���X�g�[���ɂ���</H2>
-BigDecimal ���܂� Ruby �̍ŐV�ł�<A HREF="http://www.ruby-lang.org/ja/">Ruby�����y�[�W</A>����_�E�����[�h�ł��܂��B
-�_�E�����[�h�����ŐV�ł��𓀂�����A�ʏ�̃C���X�g�[���菇�����s���ĉ������B
-Ruby ���������C���X�g�[�������΁A������ BigDecimal �����p�ł���悤�ɂȂ�͂��ł��B
-�\�[�X�t�@�C����
-bigdecimal.c,bigdecimal.h
-�̂Q�݂̂ł��B<BR>
-
-<hr>
-<A NAME="#SPEC">
-<H2>�g�p���@�ƃ��\�b�h�̈ꗗ</H2>
-�uRuby�͊��ɏ�����v�Ƃ����O��ŁA
-<CODE><PRE>
-require 'bigdecimal'
-a=BigDecimal::new("0.123456789123456789")
-b=BigDecimal("123456.78912345678",40)
-c=a+b
-</PRE></CODE>
-<br>
-�Ƃ����悤�Ȋ����Ŏg�p���܂��B
-
-<H3>���\�b�h�ꗗ</H3>
-�ȉ��̃��\�b�h�����p�\�ł��B
-�u�L�������v�Ƃ� BigDecimal �����x��ۏ؂��錅���ł��B
-�҂�����ł͂���܂���A�኱�̗]�T�������Čv�Z����܂��B
-�܂��A�Ⴆ�΂R�Q�r�b�g�̃V�X�e���ł͂P�O�i�łS�����Ɍv�Z���܂��B�]���āA����ł́A
-�����́u�L�������v�͂S�̔{���ƂȂ��Ă��܂��B
-<P>
-�ȉ��̃��\�b�h�ȊO�ɂ��A(C �ł͂Ȃ�) Ruby �\�[�X�̌`��
-�񋟂���Ă�����̂�����܂��B�Ⴆ�΁A
-<CODE><PRE>
-require "bigdecimal/math.rb"
-</PRE></CODE>
-�Ƃ��邱�ƂŁAsin �� cos �Ƃ������֐����g�p�ł���悤�ɂȂ�܂��B
-�g�p���@�ȂǁA�ڍׂ� math.rb �̓��e���Q�Ƃ��ĉ������B
-
-���̑��AFloat �Ƃ̑��ݕϊ��Ȃǂ̃��\�b�h�� util.rb �ŃT�|�[�g����Ă��܂��B
-���p����ɂ�
-<CODE><PRE>
-require "bigdecimal/util.rb"
-</PRE></CODE>
-�̂悤�ɂ��܂��B�ڍׂ� util.rb �̓��e���Q�Ƃ��ĉ������B
-
-<H4><U>�N���X���\�b�h</U></H4>
-<UL>
-<LI><B>new</B></LI><BLOCKQUOTE>
-�V���� BigDecimal �I�u�W�F�N�g�𐶐����܂��B<BR>
-a=BigDecimal::new(s[,n]) �܂���<BR>
-a=BigDecimal(s[,n])<BR>
-s �͐�����\�����鏉���l�𕶎���Ŏw�肵�܂��B
-�X�y�[�X�͖�������܂��B�܂��A���f�ł��Ȃ��������o���������_��
-������͏I���������̂Ƃ݂Ȃ���܂��B
-n �͕K�v�ȗL�������ia �̍ő�L�������j�𐮐��Ŏw�肵�܂��B
-n �� 0 �܂��͏ȗ����ꂽ�Ƃ��́An �̒l�� s �̗L�������Ƃ݂Ȃ���܂��B
-s �̗L��������� n ���������Ƃ��� n=0 �̂Ƃ��Ɠ����ł��B
-a �̍ő�L�������� n ���኱�傢�l���̗p����܂��B
-�ő�L�������͈ȉ��̂悤�Ȋ���Z�����s����Ƃ����ɈӖ��������܂��B
-<CODE><PRE>
-BigDecimal("1")    / BigDecimal("3")    # => 0.3333333333 33E0
-BigDecimal("1",10) / BigDecimal("3",10) # => 0.3333333333 3333333333 33333333E0
-</PRE></CODE>
-�������A�X�̉��Z�ɂ�����ő�L������ n �̎�舵���͏����̃o�[�W������
-�኱�ύX�����\��������܂��B
-</BLOCKQUOTE>
-
-<LI><B>mode</B></LI><BLOCKQUOTE>
-f = BigDecimal.mode(s[,v])<BR>
-BigDecimal�̎��s���ʂ𐧌䂵�܂��B��Q�������ȗ��A�܂��� nil ���w�肷���
-����̐ݒ�l���߂�܂��B<BR>
-�ȉ��̎g�p���@����`����Ă��܂��B
-<P>
-<B>[��O����]</B><P>
-�v�Z���ʂ���(NaN)��[���ɂ�鏜�Z�ɂȂ����Ƃ��̏������`���邱�Ƃ��ł��܂��B
-<BLOCKQUOTE>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_NaN,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_INFINITY,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_UNDERFLOW,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_OVERFLOW,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_ZERODIVIDE,flag)<BR>
-f = BigDecimal::mode(BigDecimal::EXCEPTION_ALL,flag)<BR>
-</BLOCKQUOTE>
-
-EXCEPTION_NaN �͌��ʂ� NaN �ɂȂ����Ƃ��̎w��ł��B<BR>
-EXCEPTION_INFINITY �͌��ʂ�������(�}Infinity)�ɂȂ����Ƃ��̎w��ł��B<BR>
-EXCEPTION_UNDERFLOW �͎w�������A���_�[�t���[����Ƃ��̎w��ł��B<BR>
-EXCEPTION_OVERFLOW �͎w�������I�[�o�[�t���[����Ƃ��̎w��ł��B<BR>
-EXCEPTION_ZERODIVIDE �̓[���ɂ�銄��Z�����s�����Ƃ��̎w��ł��B<BR>
-EXCEPTION_ALL �́A�\�ȑS�Ăɑ΂��Ĉꊇ���Đݒ肷��Ƃ��Ɏg�p���܂��B<BR><BR>
-
-flag �� true �̂Ƃ��́A�w�肵����ԂɂȂ����Ƃ��ɗ�O�𔭍s����悤�ɂȂ�܂��B<BR>
-flag �� false�i�f�t�H���g�j�Ȃ�A��O�͔��s����܂���B�v�Z���ʂ͈ȉ��̂悤�ɂȂ�܂��B<BR>
-<BLOCKQUOTE>
-EXCEPTION_NaN �̂Ƃ��A��(NaN)<BR>
-EXCEPTION_INFINITY �̂Ƃ��A����(+ or -Infinity)<BR>
-EXCEPTION_UNDERFLOW �̂Ƃ��A�[��<BR>
-EXCEPTION_OVERFLOW �̂Ƃ��A+Infinity �� -Infinity<BR>
-EXCEPTION_ZERODIVIDE �̂Ƃ��A+Infinity �� -Infinity<BR>
-</BLOCKQUOTE>
-EXCEPTION_INFINITY�AEXCEPTION_OVERFLOW�AEXCEPTION_ZERODIVIDE
-�͍��̂Ƃ��듯���ł��B<BR>
-�߂�l�́A�ݒ��̒l�ł��B�u�l�v�̈Ӗ��́A�Ⴆ��
-BigDecimal::EXCEPTION_NaN�Ɓu�l�v�� & �� �[���ȊO�Ȃ��
-EXCEPTION_NaN���ݒ肳��Ă���Ƃ����Ӗ��ł��B
-
-<P>
-<B>[�ۂߏ����w��]</B><P>
-�v�Z�r���̊ۂߑ���̎w�肪�ł��܂��B
-<BLOCKQUOTE>
-f = BigDecimal::mode(BigDecimal::ROUND_MODE,flag)
-</BLOCKQUOTE>
-�̌`���Ŏw�肵�܂��B<BR>
-�����ŁAflag �͈ȉ�(���ʓ��͑Ή�����C���X�^���X���\�b�h)�̈���w�肵�܂��B
-<TABLE>
-<TR><TD>ROUND_UP</TD><TD>�S�Đ؂�グ�܂��B</TD></TR>
-<TR><TD>ROUND_DOWN</TD><TD>�S�Đ؂�̂Ă܂�(truncate)�B</TD></TR>
-<TR><TD>ROUND_HALF_UP</TD><TD>�l�̌ܓ����܂�(�f�t�H���g)�B</TD></TR>
-<TR><TD>ROUND_HALF_DOWN</TD><TD>�܎̘Z�����܂��B</TD></TR>
-<TR><TD>ROUND_HALF_EVEN</TD><TD>�l�̘Z�����܂��B�T�̎��͏�ʂP������̎��̂݌J��グ�܂�(Banker's rounding)�B</TD></TR>
-<TR><TD>ROUND_CEILING</TD><TD>���l�̑傫�����ɌJ��グ�܂�(ceil)�B</TD></TR>
-<TR><TD>ROUND_FLOOR</TD><TD>���l�̏��������ɌJ�艺���܂�(floor)�B</TD></TR>
-
-</TABLE>
-�߂�l�͎w���� flag �̒l�ł��B
-��Q������ nil ���w�肷��ƁA����̐ݒ�l���Ԃ�܂��B
-mode ���\�b�h�ł͊ۂߑ���̈ʒu�����[�U���w�肷�邱�Ƃ͂ł��܂���B
-�ۂߑ���ƈʒu�������Ő��䂵�����ꍇ�� BigDecimal::limit �� truncate/round/ceil/floor�A
-add/sub/mult/div �Ƃ������C���X�^���X���\�b�h���g�p���ĉ������B
-</BLOCKQUOTE>
-<LI><B>limit([n])</B></LI><BLOCKQUOTE>
-���������BigDecimal�I�u�W�F�N�g�̍ő包����n���ɐ������܂��B
-�߂�l�͐ݒ肷��O�̒l�ł��B�ݒ�l�̃f�t�H���g�l�͂O�ŁA�����������Ƃ����Ӗ��ł��B
-n ���w�肵�Ȃ��A�܂��� n �� nil �̏ꍇ�́A����̍ő包�����Ԃ�܂��B<BR>
-�v�Z�𑱍s����ԂɁA�����̌������������ɑ����Ă��܂��悤�ȏꍇ
- limit �ŗ\�ߌ����𐧌��ł��܂��B���̏ꍇ BigDecimal.mode �Ŏw�肳�ꂽ
-�ۂߏ��������s����܂��B
-�������A�C���X�^���X���\�b�h (truncate/round/ceil/floor/add/sub/mult/div) ��
-���������� limit ���D�悳��܂��B<BR>
-mf = BigDecimal::limit(n)<BR>
-</BLOCKQUOTE>
-
-<LI><B>double_fig</B></LI><BLOCKQUOTE>
-Ruby �� Float �N���X���ێ��ł���L�������̐���Ԃ��܂��B
-<CODE><PRE>
-  p BigDecimal::double_fig  # ==> 20 (depends on the CPU etc.)
-</PRE></CODE>
-double_fig�͈ȉ��� C �v���O�����̌��ʂƓ����ł��B
-<CODE><PRE>
- double v          = 1.0;
- int    double_fig = 0;
- while(v + 1.0 > 1.0) {
-    ++double_fig;
-    v /= 10;
- }
-</PRE></CODE>
-</BLOCKQUOTE>
-
-<LI><B>BASE</B></LI><BLOCKQUOTE>
-�����Ŏg�p������̒l�ł��B������ 32 �r�b�g�̏����n�ł�10000�ł��B<BR>
-b = BigDecimal::BASE<BR>
-</BLOCKQUOTE>
-</UL>
-
-<H4><U>�C���X�^���X���\�b�h</U></H4>
-<UL>
-<LI><B>+</B></LI><BLOCKQUOTE>
-���Z�ic = a + b�j<BR>
-c �̐��x�ɂ��Ắu<A HREF="#PREC">�v�Z���x�ɂ���</A>�v���Q�Ƃ��Ă��������B
-</BLOCKQUOTE>
-
-<LI><B>-</B></LI><BLOCKQUOTE>
-���Z�ic = a - b�j�A�܂��͕������]�ic = -a�j<BR>
-c �̐��x�ɂ��Ắu<A HREF="#PREC">�v�Z���x�ɂ���</A>�v���Q�Ƃ��Ă��������B
-
-</BLOCKQUOTE>
-<LI><B>*</B></LI><BLOCKQUOTE>
-��Z(c = a * b)<BR>
-c�̐��x��(a�̐��x)+(b�̐��x)���x�ł��B<br>
-�ڂ����́u<A HREF="#PREC">�v�Z���x�ɂ���</A>�v���Q�Ƃ��Ă��������B
-
-</BLOCKQUOTE>
-<LI><B>/</B></LI><BLOCKQUOTE>
-���Z(c = a / b)<BR>
-c �̐��x�ɂ��Ắu<A HREF="#PREC">�v�Z���x�ɂ���</A>�v���Q�Ƃ��Ă��������B
-
-</BLOCKQUOTE>
-
-<LI><B>add(b,n)</B></LI><BLOCKQUOTE>
-�ȉ��̂悤�Ɏg�p���܂��B<BR>
-c = a.add(b,n)<BR>
-c = a + b ���ő�� n ���܂Ōv�Z���܂��B<BR>
-a + b �̐��x�� n ���傫���Ƃ��� BigDecimal.mode �Ŏw�肳�ꂽ���@�Ŋۂ߂��܂��B<BR>
-n ���[���Ȃ� + �Ɠ����ł��B
-</BLOCKQUOTE>
-<LI><B>sub(b,n)</B></LI><BLOCKQUOTE>
-�ȉ��̂悤�Ɏg�p���܂��B<BR>
-c = a.sub(b,n)<BR>
-c = a - b ���ő�� n ���܂Ōv�Z���܂��B<BR>
-a - b �̐��x�� n ���傫���Ƃ��� BigDecimal.mode �Ŏw�肳�ꂽ���@�Ŋۂ߂��܂��B<BR>
-n ���[���Ȃ� - �Ɠ����ł��B
-
-</BLOCKQUOTE>
-<LI><B>mult(b,n)</B></LI><BLOCKQUOTE>
-�ȉ��̂悤�Ɏg�p���܂��B<BR>
-c = a.mult(b,n)<BR>
-c = a * b ���ő�� n ���܂Ōv�Z���܂��B<BR>
-a * b �̐��x�� n ���傫���Ƃ��� BigDecimal.mode �Ŏw�肳�ꂽ���@�Ŋۂ߂��܂��B<BR>
-n ���[���Ȃ� * �Ɠ����ł��B
-
-</BLOCKQUOTE>
-<LI><B>div(b[,n])</B></LI><BLOCKQUOTE>
-�ȉ��̂悤�Ɏg�p���܂��B<BR>
-c = a.div(b,n)<BR>
-c = a / b ���ő�� n ���܂Ōv�Z���܂��B
-a / b �̐��x�� n ���傫���Ƃ��� BigDecimal.mode �Ŏw�肳�ꂽ���@�Ŋۂ߂��܂��B<BR>
-n ���[���Ȃ� / �Ɠ����ł��B<BR>
-n ���ȗ����ꂽ�Ƃ��� Float#div �Ɠ��l�Ɍ��ʂ�����(BigDecimal)�ɂȂ�܂��B
-</BLOCKQUOTE>
-
-<LI><B>fix</B></LI><BLOCKQUOTE>
-a �̏����_�ȉ��̐؂�̂āB<BR>
-c = a.fix
-</BLOCKQUOTE>
-<LI><B>frac</B></LI><BLOCKQUOTE>
-a �̐��������̐؂�̂āB<BR>
-c = a.frac
-</BLOCKQUOTE>
-
-<LI><B>floor[(n)]</B></LI><BLOCKQUOTE>
-c = a.floor<BR>
-a �ȉ��̍ő吮���iBigDecimal �l�j��Ԃ��܂��B
-<CODE><PRE>
-c = BigDecimal("1.23456").floor  #  ==> 1
-c = BigDecimal("-1.23456").floor #  ==> -2
-</PRE></CODE>
-�ȉ��̂悤�Ɉ��� n ��^���邱�Ƃ��ł��܂��B<BR>
-n>=0 �Ȃ�A�����_�ȉ� n+1 �ʂ̐����𑀍삵�܂�(�����_�ȉ����A�ő� n ���ɂ��܂�)�B<BR>
-n �����̂Ƃ��͏����_�ȏ� n ���ڂ𑀍삵�܂�(�����_�ʒu���獶�ɏ��Ȃ��Ƃ� n �� 0 �����т܂�)�B<BR>
-<CODE><PRE>
- c = BigDecimal("1.23456").floor(4)   #  ==> 1.2345
- c = BigDecimal("15.23456").floor(-1) #  ==> 10.0
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>ceil[(n)]</B></LI><BLOCKQUOTE>
-c = a.ceil<BR>
-a �ȏ�̐����̂����A�ł��������������v�Z���A���̒l�iBigDecimal �l�j��Ԃ��܂��B
-<CODE><PRE>
-c = BigDecimal("1.23456").ceil  #  ==> 2
-c = BigDecimal("-1.23456").ceil #  ==> -1
-</PRE></CODE>
-
-�ȉ��̂悤�Ɉ�����^���āA�����_�ȉ� n+1 �ʂ̐����𑀍삷�邱�Ƃ��ł��܂��B<BR>
-n>=0 �Ȃ�A�����_�ȉ� n+1 �ʂ̐����𑀍삵�܂�(�����_�ȉ����A�ő� n ���ɂ��܂�)�B<BR>
- n �����̂Ƃ��͏����_�ȏ� n ���ڂ��𑀍삵�܂�(�����_�ʒu���獶�ɏ��Ȃ��Ƃ� n �� 0 �����т܂�)�B<BR>
-<CODE><PRE>
- c = BigDecimal("1.23456").ceil(4)   # ==> 1.2346
- c = BigDecimal("15.23456").ceil(-1) # ==> 20.0
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>round[(n[,b])]</B></LI><BLOCKQUOTE>
-c = a.round<BR>
-
-�N���X���\�b�h BigDecimal::mode(BigDecimal::ROUND_MODE,flag) �Ŏw�肵��
-ROUND_MODE �ɏ]���Ċۂߑ�������s���܂��B
-BigDecimal::mode(BigDecimal::ROUND_MODE,flag) �ŉ����w�肹���A���A����
-���w�肵�Ȃ��ꍇ�́u�����_�ȉ����ʂ̐����l�̌ܓ����Đ����iBigDecimal �l�j�v�ɂ��܂��B<BR>
-<CODE><PRE>
- c = BigDecimal("1.23456").round  #  ==> 1
- c = BigDecimal("-1.23456").round #  ==> -1
-</PRE></CODE>
-
-�ȉ��̂悤�Ɉ�����^���āA�����_�ȉ� n+1 �ʂ̐����𑀍삷�邱�Ƃ��ł��܂��B<BR>
-n �����̎��́A�����_�ȉ� n+1 �ʂ̐������ۂ߂܂�(�����_�ȉ����A�ő� n ���ɂ��܂�)�B<BR>
-n �����̂Ƃ��͏����_�ȏ� n ���ڂ��ۂ߂܂�(�����_�ʒu���獶�ɏ��Ȃ��Ƃ� n �� 0 �����т܂�)�B
-<CODE><PRE>
-c = BigDecimal("1.23456").round(4)   #  ==> 1.2346
-c = BigDecimal("15.23456").round(-1) #  ==> 20.0
-</PRE></CODE>
-�Q�Ԗڂ̈������w�肷��ƁABigDecimal#mode �̎w��𖳎����āA�w�肳�ꂽ���@��
-�ۂߑ�������s���܂��B
-<CODE><PRE>
-c = BigDecimal("1.23456").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.234
-c = BigDecimal("1.23356").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.234
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>truncate</B></LI><BLOCKQUOTE>
-c = a.truncate<BR>
-�����_�ȉ��̐���؂�̂ĂĐ����iBigDecimal �l�j�ɂ��܂��B<BR>
-�ȉ��̂悤�Ɉ�����^���āA�����_�ȉ� n+1 �ʂ̐����𑀍삷�邱�Ƃ��ł��܂��B<BR>
-n �����̎��́A�����_�ȉ� n+1 �ʂ̐�����؂�̂Ă܂�(�����_�ȉ����A�ő� n ���ɂ��܂�)�B
-n �����̂Ƃ��͏����_�ȏ� n ���ڂ��𑀍삵�܂�(�����_�ʒu���獶�ɏ��Ȃ��Ƃ� n �� 0 �����т܂�)�B<BR>
-<CODE><PRE>
-c = BigDecimal("1.23456").truncate(4)   #  ==> 1.2345
-c = BigDecimal("15.23456").truncate(-1) #  ==> 10.0
-</PRE></CODE>
-</BLOCKQUOTE>
-
-</BLOCKQUOTE>
-<LI><B>abs</B></LI><BLOCKQUOTE>
-���̐�Βl<BR>
-c = a.abs<BR>
-
-</BLOCKQUOTE>
-<LI><B>to_i</B></LI><BLOCKQUOTE>
-�����_�ȉ���؂�̂ĂĐ����ɕϊ����܂��B<BR>
-i = a.to_i<BR>
-i �͒l�ɉ����� Fixnum �� Bignum �ɂȂ�܂��B
-a �� Infinity �� NaN �̂Ƃ��Ai �� nil �ɂȂ�܂��B
-</BLOCKQUOTE>
-<LI><B>to_f</B></LI><BLOCKQUOTE>
-Float �I�u�W�F�N�g�ɕϊ����܂��B
-��肫�ߍׂ����l���K�v�Ȃ�� split ���\�b�h�𗘗p����
-���������B
-</BLOCKQUOTE>
-<LI><B>to_s[(n)]</B></LI><BLOCKQUOTE>
-������ɕϊ����܂�(�f�t�H���g�� "0.xxxxxEn" �̌`�ɂȂ�܂��j�B
-<CODE><PRE>
-BigDecimal("1.23456").to_s  #  ==> "0.123456E1"
-</PRE></CODE>
-���� n �ɐ��̐������w�肳�ꂽ�Ƃ��́A�����_�ŕ������鍶�E�������A���ꂼ�� n ����
-�ɋ󔒂ŋ�؂�܂��B
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s(10)   #  ==> "0.1234567890 123456789E0"
-</PRE></CODE>
-���� n �ɐ��̐�����\����������w�肷�邱�Ƃ��ł��܂��B
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s("10") #  ==> "0.1234567890 123456789E0"
-</PRE></CODE>
-������̍ŏ��� '+'�i�܂��� ' '�j��t����ƁA�l�����̏ꍇ�A�擪�� '+'�i�܂��� ' '�j���t���܂�
-�i���̏ꍇ�́A��� '-' ���t���܂��B�j�B
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s(" 10") #  ==> " 0.1234567890 123456789E0"
-BigDecimal("0.1234567890123456789").to_s("+10") #  ==> "+0.1234567890 123456789E0"
-BigDecimal("-0.1234567890123456789").to_s("10") #  ==> "-0.1234567890 123456789E0"
-</PRE></CODE>
-
-����ɕ�����̍Ō�� E(�܂��� e) �� F(�܂��� f) ���w�肷�邱�ƂŁA�ȉ��̂悤��
-�\���`����ύX���邱�Ƃ��ł��܂��B
-<CODE><PRE>
-BigDecimal("1234567890.123456789").to_s("E")  #  ==> "0.1234567890123456789E10"
-BigDecimal("1234567890.123456789").to_s("F")  #  ==> "1234567890.123456789"
-BigDecimal("1234567890.123456789").to_s("5E") #  ==> "0.12345 67890 12345 6789E10"
-BigDecimal("1234567890.123456789").to_s("5F") #  ==> "12345 67890.12345 6789"
-</PRE></CODE>
-
-</BLOCKQUOTE>
-<LI><B>exponent</B></LI><BLOCKQUOTE>
-�w�����𐮐��l�ŕԂ��܂��B
-n = a.exponent <BR>
-�� a �̒l�� 0.xxxxxxx*10**n ���Ӗ����܂��B
-</BLOCKQUOTE>
-
-<LI><B>precs</B></LI><BLOCKQUOTE>
-n,m  = a.precs<BR>
-a �̗L������ (n) �ƍő�L������ (m) �̔z���Ԃ��܂��B
-
-</BLOCKQUOTE>
-
-<LI><B>sign</B></LI><BLOCKQUOTE>
-�l����(sign &gt; 0)�A��(sign &lt; 0)�A���̑�(sigh==0)�ł��邩�̏���Ԃ��܂��B
-n = a.sign <BR>
-�Ƃ����Ƃ� n �̒l�� a ���ȉ��̂Ƃ����Ӗ����܂��B<BR>
-() �̒��̐����́A���ۂ̒l�ł�(<A HREF="#STRUCT">�u�����\���v</A>���Q��)�B<BR>
-n = BigDecimal::SIGN_NaN(0) : a �� NaN<BR>
-n = BigDecimal::SIGN_POSITIVE_ZERO(1) : a �� +0<BR>
-n = BigDecimal::SIGN_NEGATIVE_ZERO(-1) : a �� -0<BR>
-n = BigDecimal::SIGN_POSITIVE_FINITE(2) : a �͐��̒l<BR>
-n = BigDecimal::SIGN_NEGATIVE_FINITE(-2) : a �͕��̒l<BR>
-n = BigDecimal::SIGN_POSITIVE_INFINITE(3) : a ��+Infinity<BR>
-n = BigDecimal::SIGN_NEGATIVE_INFINITE(-3) : a ��-Infinity<BR>
-
-</BLOCKQUOTE>
-<LI><B>nan?</B></LI><BLOCKQUOTE>
-a.nan? �� a ��NaN�̂Ƃ��^��Ԃ��܂��B
-</BLOCKQUOTE>
-<LI><B>infinite?</B></LI><BLOCKQUOTE>
-a.infinite? �� a ��+���̂Ƃ� 1 �A-���̂Ƃ��� -1�A����ȊO�̂Ƃ��� nil ��Ԃ��܂��B
-</BLOCKQUOTE>
-<LI><B>finite?</B></LI><BLOCKQUOTE>
-a.finite? �� a �����܂��� NaN �łȂ��Ƃ��^��Ԃ��܂��B
-</BLOCKQUOTE>
-
-<LI><B>zero?</B></LI><BLOCKQUOTE>
-a �� 0 �Ȃ� true �ɂȂ�܂��B<BR>
-c = a.zero?
-</BLOCKQUOTE>
-<LI><B>nonzero?</B></LI><BLOCKQUOTE>
-a �� 0 �Ȃ� nil�A0 �ȊO�Ȃ� a ���̂��̂��Ԃ�܂��B<BR>
-c = a.nonzero?
-
-</BLOCKQUOTE>
-<LI><B>split</B></LI><BLOCKQUOTE>
-BigDecimal �l�� 0.xxxxxxx*10**n �ƕ\�������Ƃ��ɁA�����iNaN�̂Ƃ���
-0�A����ȊO��+1��-1�ɂȂ�܂��j�A
-���������̕�����i"xxxxxxx"�j�ƁA��i10�j�A�X�Ɏw�� n ��z���
-�Ԃ��܂��B<BR>
-a=BigDecimal::new("3.14159265")<BR>
-f,x,y,z = a.split<BR>
-�Ƃ���ƁAf=+1�Ax="314159265"�Ay=10�Az=1�ɂȂ�܂��B<BR>
-�]���āA<BR>
-s = "0."+x<BR>
-b = f*(s.to_f)*(y**z)<BR>
-�� Float �ɕϊ����邱�Ƃ��ł��܂��B
-</BLOCKQUOTE>
-<LI><B>inspect</B></LI><BLOCKQUOTE>
-�f�o�b�O�o�͂Ɏg�p����܂��B<BR>
-p a=BigDecimal::new("3.14",10)<BR>
-�Ƃ���ƁA[0x112344:'0.314E1',4(12)]�̂悤�ɏo�͂���܂��B
-�ŏ���16�i���̓I�u�W�F�N�g�̃A�h���X�A���� '0.314E1' �͒l�A
-����4�͌��݂̗L������(�\�����኱�傫�����Ƃ�����܂�)�A
-�Ō�̓I�u�W�F�N�g����蓾��ő包���ɂȂ�܂��B
-</BLOCKQUOTE>
-<LI><B>**</B></LI><BLOCKQUOTE>
-a �� n ����v�Z���܂��B���͐����B<BR>
-c = a ** n<BR>
-���ʂƂ��� c �̗L������ a �� n �{�ȏ�ɂȂ�̂Œ��ӁB
-</BLOCKQUOTE>
-<LI><B>power</B></LI><BLOCKQUOTE>
-** �Ɠ����ŁAa �� n ����v�Z���܂��B���͐����B<BR>
-c = a.power(n)<BR>
-���ʂƂ��� c �̗L������ a �� n �{�ȏ�ɂȂ�̂Œ��ӁB
-</BLOCKQUOTE>
-<LI><B>sqrt</B></LI><BLOCKQUOTE>
-a�̗L���� n ���̕������in �̕������ł͂���܂���j��
-�j���[�g���@�Ōv�Z���܂��B<BR>
-c = a.sqrt(n)<BR>
-</BLOCKQUOTE>
-
-<LI><B>divmod,quo,modulo,%,remainder</B></LI><BLOCKQUOTE>
-�ڍׂ͑Ή����� Float �̊e���\�b�h���Q�Ƃ��ĉ������B
-</BLOCKQUOTE>
-
-<LI><B>&lt=&gt</B></LI><BLOCKQUOTE>
-a==b �Ȃ� 0�Aa &gt b �Ȃ� 1�Aa &lt b �Ȃ� -1 �ɂȂ�܂��B<BR>
-c = a &lt=&gt b
-</BLOCKQUOTE>
-</UL>
-��́A�ǂ�Ŏ��̔@���ł��B<BR>
-<UL>
-<LI><B>==</B></LI>
-<LI><B>===</B></LI>
-�u==�v�Ɠ����ł��� case ���Ŏg�p����܂��B
-<LI><B>!=</B></LI>
-<LI><B>&lt</B></LI>
-<LI><B>&lt=</B></LI>
-<LI><B>&gt</B></LI>
-<LI><B>&gt=</B></LI>
-</UL>
-
-<H3>coerce�ɂ���</H3>
-BigDecimal �I�u�W�F�N�g���Z�p���Z�q�̍��ɂ���Ƃ��́ABigDecimal �I�u�W�F�N�g��
-�E�ɂ���I�u�W�F�N�g��(�K�v�Ȃ�) BigDecimal �ɕϊ����Ă���v�Z���܂��B
-�]���āABigDecimal �I�u�W�F�N�g�ȊO�ł����l���Ӗ�������̂Ȃ�E�ɒu����
-���Z�͉\�ł��B<BR>
-�������A������́i�ʏ�j���l�Ɏ����ϊ����邱�Ƃ͂ł��܂���B
-������𐔒l�Ɏ����ϊ��������ꍇ�� bigfloat.c ��
-�u/* #define ENABLE_NUMERIC_STRING */�v�̃R�����g���O���Ă���A
-�ăR���p�C���A�ăC���X�g�[������K�v������܂��B
-������Ő��l��^����ꍇ�͒��ӂ��K�v�ł��B���l�ɕϊ��ł��Ȃ�����������ƁA
-�P�ɕϊ����~�߂邾���ŃG���[�ɂ͂Ȃ�܂���B"10XX"�Ȃ�P�O�A"XXXX"�͂O
-�ƈ����܂��B<BR>
-<CODE><PRE>
-   a = BigDecimal.E(20)
-   c = a * "0.123456789123456789123456789" # ������ BigDecimal �ɕϊ����Ă���v�Z
-</PRE></CODE>
-�������񐔂�\�������Ƃ��āA"Infinity"�A"+Infinity"�A"-Infinity"�A"NaN"
-���g�p�ł��܂�(�啶���E����������ʂ��܂�)�B�������Amode ���\�b�h�� false ��
-�w�肵���ꍇ�͗�O���������܂��B
-<BR>
-�܂��ABigDecimal�N���X�� coerce�iRuby�{�Q�Ɓj���T�|�[�g���Ă��܂��B
-�]���āABigDecimal �I�u�W�F�N�g���E�ɂ���ꍇ�����͑��v�ł��B
-�����A���݂� Ruby �C���^�v���^�̎d�l��A�����񂪍��ɂ���ƌv�Z�ł��܂���B<BR>
-<CODE><PRE>
-  a = BigDecimal.E(20)
-  c = "0.123456789123456789123456789" * a # �G���[
-</PRE></CODE>
-�K�v��������Ƃ͎v���܂��񂪁A�ǂ����Ă��ƌ����l��
- String �I�u�W�F�N�g���p�������V���ȃN���X���쐬���Ă���A
-���̃N���X�� coerce ���T�|�[�g���Ă��������B
-
-<hr>
-<A NAME="#UNDEF">
-<H2>�����A�񐔁A�[���̈���</H2>
-�u�����v�Ƃ͕\���ł��Ȃ����炢�傫�Ȑ��ł��B���ʂɈ������߂�
- +Infinity�i���̖�����j�� -Infinity�i���̖�����j�Ƃ���
-�悤�ɕ\�L����܂��B
-������ 1.0/0.0 �̂悤�Ƀ[���Ŋ���悤�Ȍv�Z�������Ƃ��ɐ�������܂��B
-<BR><BR>
-�u�񐔁v�� 0.0/0.0 �� Infinity-Infinity ���̌��ʂ���`�ł��Ȃ�
-�v�Z�������Ƃ��ɐ�������܂��B�񐔂� NaN�iNot a Number�j�ƕ\�L����܂��B
-NaN ���܂ތv�Z�͑S�� NaN �ɂȂ�܂��B�܂� NaN �͎������܂߂āA�ǂ�Ȑ�
-�Ƃ���v���܂���B
-<BR><BR>
-�[���� +0.0 �� -0.0 �����݂��܂��B�������A+0.0==-0.0 �� true �ł��B
-<BR><BR>
-Infinity�ANaN�A +0.0 �� -0.0 �����܂񂾌v�Z���ʂ͑g�ݍ��킹��
-��蕡�G�ł��B�����̂���l�́A�ȉ��̃v���O���������s���Č��ʂ�
-�m�F���Ă��������i���ʂɂ��āA�^���ԈႢ�𔭌����ꂽ����
-���m�点�肢�܂��j�B
-
-<PRE>
-<CODE>
-require "bigdecimal"
-
-aa  = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
-ba  = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
-opa = %w(+ - * / <=> > >=  < == != <=)
-
-for a in aa
-  for b in ba
-    for op in opa
-      x = BigDecimal::new(a)
-      y = BigDecimal::new(b)
-      eval("ans= x #{op} y;print a,' ',op,' ',b,' ==> ',ans.to_s,\"\n\"")
-    end
-  end
-end
-</CODE>
-</PRE>
-
-<hr>
-<A NAME="#STRUCT">
-<H2>�����\��</H2>
-BigDecimal�����ŕ��������_�͍\����(Real)�ŕ\������܂��B
-���̂����������� unsigned long �̔z��(�ȉ��̍\���̗v�ffrac)�ŊǗ�����܂��B
-�T�O�I�ɂ́A�ȉ��̂悤�ɂȂ�܂��B<BR><BR>
- <���������_��> = 0.xxxxxxxxx*BASE**n<BR><BR>
-�����ŁAx�͉�������\�������ABASE�͊�i�P�O�i�Ȃ�P�O�j�An�͎w������\��
-�����l�ł��BBASE���傫���قǁA�傫�Ȑ��l���\���ł��܂��B�܂�A�z��̃T�C�Y��
-���Ȃ��ł��܂��BBASE�͑傫���قǓs�����悢�킯�ł����A�f�o�b�O�̂��₷���Ȃǂ�
-�l�����āA10000�ɂȂ��Ă��܂��iBASE��VpInit()�֐��Ŏ����I�Ɍv�Z���܂��j�B
-����́A32�r�b�g�����̏ꍇ�ł��B64�r�b�g�����̏ꍇ�͂����Ƒ傫�Ȓl�ɂȂ�܂��B
-�c�O�Ȃ���A64�r�b�g�����ł̃e�X�g�͂܂�����Ă��܂���i�����A���ꂽ���������
-���ʂ������Ă���������΂��肪�����ł��j�B
-BASE��10000�̂Ƃ��́A�ȉ��̉������̔z��(frac)�̊e�v�f�ɂ͍ő�łS����
-�������i�[����܂��B<BR><BR>
-���������_�\����(Real)�͈ȉ��̂悤�ɂȂ��Ă��܂��B
-<BR>
-<CODE><PRE>
-  typedef struct {
-     unsigned long MaxPrec; // �ő吸�x(frac[]�̔z��T�C�Y)
-     unsigned long Prec;    // ���x(frac[]�̎g�p�T�C�Y)
-     short    sign;         // �ȉ��̂悤�ɕ������̏�Ԃ��`���܂��B
-                            //  ==0 : NaN
-                            //    1 : +0
-                            //   -1 : -0
-                            //    2 : ���̒l
-                            //   -2 : ���̒l
-                            //    3 : +Infinity
-                            //   -3 : -Infinity
-     unsigned short flag;   // �e��̐���t���b�O
-     int      exponent;     // �w�����̒l(������*BASE**exponent)
-     unsigned long frac[1]; // �������̔z��(��)
-  } Real;
-</CODE></PRE>
-�Ⴆ�� 1234.56784321 �Ƃ���������(BASE=10000�Ȃ�)<BR>
-<PRE>
-    0.1234 5678 4321*(10000)**1
-</PRE>
-�ł����� frac[0]=1234�Afrac[1]=5678�Afrac[2]=4321�A
-Prec=3�Asign=2�Aexponent=1 �ƂȂ�܂��BMaxPrec��
-Prec ���傫����΂����ł����܂��܂���Bflag ��
-�g�p���@�͎����Ɉˑ����ē����Ŏg�p����܂��B
-
-<hr>
-<A NAME="#BASE">
-<H2>2�i��10�i</H2>
-BigDecimal �� <���������_��> = 0.xxxxxxxxx*10**n �Ƃ���10�i�`���Ő��l��ێ����܂��B
-�������A�v�Z�@�̕��������_���̓����\���́A�����܂ł��Ȃ� <���������_��> = 0.bbbbbbbb*2**n �Ƃ���
-2�i�`�������ʂł�(x �� 0 ���� 9 �܂ŁAb �� 0 �� 1 �̐���)�B
-BigDecimal ���Ȃ�10�i�̓����\���`�����̗p�����̂����ȉ��ɐ������܂��B
-<H4>10�i�̃����b�g</H4>
-<DL>
-<DT>�f�o�b�O�̂��₷��
-<DD>�܂��A�v���O�����쐬���y�ł��Bfrac[0]=1234�Afrac[1]=5678�Afrac[2]=4321�A
-exponent=1�Asign=2 �Ȃ琔�l�� 1234.56784321 �ł���̂͌���Β����ɕ�����܂��B
-
-<DT>10�i�\�L���ꂽ���l�Ȃ�m���ɓ����\���ɕϊ��ł���
-<DD>�Ⴆ�΁A�ȉ��̂悤�ȃv���O�����͑S���덷������
-�v�Z���邱�Ƃ��ł��܂��B�ȉ��̗�́A��s�Ɉ�̐��l
-�������Ă���t�@�C�� file �̍��v���l�����߂���̂ł��B
-<CODE><PRE>
-   file = File::open(....,"r")
-   s = BigDecimal::new("0")
-   while line = file.gets
-      s = s + line
-   end
-</PRE></CODE>
-���̗��2�i���ł��ƌ덷�����荞�މ\��������܂��B
-�Ⴆ�� 0.1 ��2�i�ŕ\������� 0.1 = b1*2**(-1)+b1*2**(-2)+b3*2**(-3)+b4*2**(-4)....
-�Ɩ����ɑ����Ă��܂��܂�(b1=0,b2=0,b3=0,b4=1...)�B������ bn(n=1,2,3,...) ��
-2�i��\������ 0 �� 1 �̐�����ł��B�]���āA�ǂ����őł��؂�K�v������܂��B
-�����ŕϊ��덷������܂��B�������A������ēx10�i�\�L�ɂ��Ĉ������悤��
-�ꍇ�͓K�؂Ȋۂߑ���i�l�̌ܓ��j�ɂ���čĂ� "0.1" �ƕ\������܂��B�������A
-�����ł͐��m�� 0.1 �ł͂���܂���B
-
-<DT>�L�������͗L���ł���i�܂莩������ł���j
-<DD>0.1 ��\�����邽�߂̗̈�͂�������̔z��v�f�i frac[0]=1 �j�ōς݂܂��B
-�z��v�f�̐���10�i���l���玩���I�Ɍ���ł��܂��B����́A�ϒ����������_���Z�ł�
-�厖�Ȃ��Ƃł��B�t�� 0.1 ��2�i�\�������Ƃ��ɂ�2�i�̗L�����������ɂ���̂� 0.1 ��
-���������ł͌���ł��܂���B
-</DL>
-
-<H3>10�i�̃f�����b�g</H3>
-���͍��܂ł̃����b�g�́A���̂܂܃f�����b�g�ɂ��Ȃ�܂��B
-���������A10�i��2�i�ɕϊ�����悤�ȑ���͕ϊ��덷
-�𔺂��ꍇ��������邱�Ƃ͂ł��܂���B
-��T�̃R���s���[�^��10�i�̓����\���������Ă��Ȃ��̂ŁA
-BigDecimal �𗘗p���Č덷�����̌v�Z������ꍇ�́A�v�Z���x
-�𖳎����Ă��Ō�܂� BigDecimal ���g�p������K�v������܂��B
-
-<H3>�ŏ��͉����H</H3>
-�����Ōv�Z����Ƃ��ɂ킴�킴2�i�����g���l�͋ɂ߂Ă܂�ł��B
-�v�Z�@�Ƀf�[�^����͂���Ƃ����قƂ�ǂ̏ꍇ�A
-10�i���œ��͂��܂��B���̌��ʁAdouble ���̌v�Z�@����
-�\���͍ŏ�����덷�������Ă���ꍇ������܂��B
-BigDecimal �̓��[�U���͂��덷�����Ŏ�荞�ނ��Ƃ��ł��܂��B
-�f�o�b�O�����₷���̂ƁA�f�[�^�ǂ݂��ݎ��Ɍ덷������Ȃ�
-�Ƃ����̂����ۂ̃����b�g�ł��B
-
-<hr>
-<A NAME="#PREC">
-<H2>�v�Z���x�ɂ���</H2>
-c = a op b �Ƃ����v�Z(op �� + - * /)�������Ƃ��̓����
-�ȉ��̂悤�ɂȂ�܂��B<BR><BR>
-�P�D��Z��(a �̗L������)+(b �̗L������)�A
-���Z��(a �̍ő�L������)+(b �̍ő�L������)���̍ő包���i���ۂ́A�]�T�������āA
-���������傫���Ȃ�܂��j�����ϐ� c ��V���ɐ������܂��B
-�����Z�̏ꍇ�́A�덷���o�Ȃ������̐��x������ c �𐶐����܂��B�Ⴆ��
- c = 0.1+0.1*10**(-100) �̂悤�ȏꍇ�Ac �̐��x�͂P�O�O���ȏ�̐��x��
-���悤�ɂȂ�܂��B
-<BR><BR>
-�Q�D���� c = a op b �̌v�Z�����s���܂��B<BR><BR>
-���̂悤�ɁA�����Z�Ə�Z�ł� c �͕K���u�덷���o�Ȃ��v�����̐��x��
-�����Đ�������܂�(BigDecimal.limit ���w�肵�Ȃ��ꍇ)�B
-���Z��(a �̍ő�L������)+(b �̍ő�L������)���̍ő包��
-������ c ����������܂����Ac = 1.0/3.0 �̂悤�Ȍv�Z�Ŗ��炩�Ȃ悤�ɁA
- c �̍ő吸�x�𒴂���Ƃ���Ōv�Z���ł��؂���ꍇ������܂��B<BR><BR>
-������ɂ���Ac �̍ő吸�x�� a �� b ���傫���Ȃ�܂��̂� c ���K�v�Ƃ���
-�������[�̈�͑傫���Ȃ邱�Ƃɒ��ӂ��ĉ������B
-<BR><BR>
-���ӁF�u+,-,*,/�v�ł͌��ʂ̐��x�i�L�������j�������Ŏw��ł��܂���B
-���x���R���g���[���������ꍇ�́A�ȉ��̃C���X�^���X���\�b�h���g�p���܂��B<BR>
-<UL>
-<LI>add,sub,mult,div</LI><BLOCKQUOTE>
-�����̃��\�b�h�͐擪(�ō�)�̐�������̌������w��ł��܂��B
-<CODE><PRE>
- BigDecimal("2").div(3,12) # 2.0/3.0 => 0.6666666666 67E0
-</PRE></CODE>
-</BLOCKQUOTE>
-<LI>truncate,round,ceil,floor</LI><BLOCKQUOTE>
-�����̃��\�b�h�͏����_����̑��Έʒu���w�肵�Č��������肵�܂��B
-<CODE><PRE>
- BigDecimal("6.66666666666666").round(12) # => 0.6666666666 667E1
-</PRE></CODE>
-</BLOCKQUOTE>
-</UL>
-<H3>�����Ő��x���R���g���[���������ꍇ</H3>
-�����Ő��x(�L������)���R���g���[���������ꍇ�� add�Asub�Amult�Adiv ���̃��\�b�h
-���g�p�ł��܂��B
-�ȉ��̉~�������v�Z����v���O������̂悤�ɁA
-���߂錅���͎����Ŏw�肷�邱�Ƃ��ł��܂��B
-<BR><BR>
-<CODE><PRE>
-#!/usr/local/bin/ruby
-
-require "bigdecimal"
-#
-# Calculates 3.1415.... (the number of times that a circle's diameter
-# will fit around the circle) using J. Machin's formula.
-#
-def big_pi(sig) # sig: Number of significant figures
-  exp    = -sig
-  pi     = BigDecimal::new("0")
-  two    = BigDecimal::new("2")
-  m25    = BigDecimal::new("-0.04")
-  m57121 = BigDecimal::new("-57121")
-
-  u = BigDecimal::new("1")
-  k = BigDecimal::new("1")
-  w = BigDecimal::new("1")
-  t = BigDecimal::new("-80")
-  while (u.nonzero? && u.exponent >= exp)
-    t   = t*m25
-    u   = t.div(k,sig)
-    pi  = pi + u
-    k   = k+two
-  end
-
-  u = BigDecimal::new("1")
-  k = BigDecimal::new("1")
-  w = BigDecimal::new("1")
-  t = BigDecimal::new("956")
-  while (u.nonzero? && u.exponent >= exp )
-    t   = t.div(m57121,sig)
-    u   = t.div(k,sig)
-    pi  = pi + u
-    k   = k+two
-  end
-  pi
-end
-
-if $0 == __FILE__
-  if ARGV.size == 1
-    print "PI("+ARGV[0]+"):\n"
-    p big_pi(ARGV[0].to_i)
-  else
-    print "TRY: ruby pi.rb 1000 \n"
-  end
-end
-
-</PRE></CODE>
-<HR>
-<FONT size=2>
-<I>
-<A HREF="http://www.tinyforest.gr.jp">
-���� �ΗY
-</A>
-(E-Mail:<A HREF="mailto:shigeo@tinyforest.gr.jp">&ltshigeo@tinyforest.gr.jp&gt</U></A>)
-</I>
-</FONT>
-</TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/ext/bigdecimal/depend b/ext/bigdecimal/depend
index 402cae95dd..ffd61b8960 100644
--- a/ext/bigdecimal/depend
+++ b/ext/bigdecimal/depend
@@ -1 +1,17 @@
-bigdecimal.o: bigdecimal.c bigdecimal.h $(hdrdir)/ruby.h
+extconf.h: $(srcdir)/$(GEMSPEC)
+Makefile: $(BIGDECIMAL_RB)
+
+# AUTOGENERATED DEPENDENCIES START
+bigdecimal.o: $(RUBY_EXTCONF_H)
+bigdecimal.o: $(arch_hdrdir)/ruby/config.h
+bigdecimal.o: $(hdrdir)/ruby/assert.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
diff --git a/ext/bigdecimal/extconf.rb b/ext/bigdecimal/extconf.rb
index d6be3e584e..b4098fdacf 100644
--- a/ext/bigdecimal/extconf.rb
+++ b/ext/bigdecimal/extconf.rb
@@ -1,6 +1,52 @@
+# frozen_string_literal: false
 require 'mkmf'
 
+def check_bigdecimal_version(gemspec_path)
+  message "checking RUBY_BIGDECIMAL_VERSION... "
+
+  bigdecimal_version =
+    IO.readlines(gemspec_path)
+      .grep(/\Abigdecimal_version\s+=\s+/)[0][/\'([^\']+)\'/, 1]
+
+  version_components = bigdecimal_version.split('.')
+  bigdecimal_version = version_components[0, 3].join('.')
+  bigdecimal_version << "-#{version_components[3]}" if version_components[3]
+  $defs << %Q[-DRUBY_BIGDECIMAL_VERSION=\\"#{bigdecimal_version}\\"]
+
+  message "#{bigdecimal_version}\n"
+end
+
+gemspec_name = gemspec_path = nil
+unless ['', '../../'].any? {|dir|
+         gemspec_name = "#{dir}bigdecimal.gemspec"
+         gemspec_path = File.expand_path("../#{gemspec_name}", __FILE__)
+         File.file?(gemspec_path)
+       }
+  $stderr.puts "Unable to find bigdecimal.gemspec"
+  abort
+end
+
+check_bigdecimal_version(gemspec_path)
+
 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_func("rb_opts_exception_p", "ruby.h")
+
+if File.file?(File.expand_path('../lib/bigdecimal.rb', __FILE__))
+  bigdecimal_rb = "$(srcdir)/lib/bigdecimal.rb"
+else
+  bigdecimal_rb = "$(srcdir)/../../lib/bigdecimal.rb"
+end
 
-create_makefile('bigdecimal')
+create_makefile('bigdecimal') {|mf|
+  mf << "GEMSPEC = #{gemspec_name}\n"
+  mf << "BIGDECIMAL_RB = #{bigdecimal_rb}\n"
+}
diff --git a/ext/bigdecimal/lib/bigdecimal.rb b/ext/bigdecimal/lib/bigdecimal.rb
new file mode 100644
index 0000000000..8fd2587c84
--- /dev/null
+++ b/ext/bigdecimal/lib/bigdecimal.rb
@@ -0,0 +1 @@
+require 'bigdecimal.so'
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
index 8ab836259a..5e29304299 100644
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
@@ -1,4 +1,7 @@
-#
+# frozen_string_literal: false
+
+require 'bigdecimal'
+
 # require 'bigdecimal/jacobian'
 #
 # Provides methods to compute the Jacobian matrix of a set of equations at a
@@ -11,7 +14,7 @@
 #
 # f.zero:: returns 0.0
 # f.one:: returns 1.0
-# f.two:: returns 1.0
+# f.two:: returns 2.0
 # f.ten:: returns 10.0
 #
 # f.eps:: returns the convergence criterion (epsilon value) used to determine whether two values are considered equal. If |a-b| < epsilon, the two values are considered equal.
@@ -51,9 +54,9 @@ module Jacobian
     dx = fx[i].abs/ratio if isEqual(dx,f.zero,f.zero,f.eps)
     dx = f.one/f.ten     if isEqual(dx,f.zero,f.zero,f.eps)
     until ok>0 do
-      s = f.zero
       deriv = []
-      if(nRetry>100) then
+      nRetry += 1
+      if nRetry > 100
         raise "Singular Jacobian matrix. No change at x[" + i.to_s + "]"
       end
       dx = dx*f.two
@@ -75,7 +78,7 @@ module Jacobian
   # Computes the Jacobian of f at x. fx is the value of f at x.
   def jacobian(f,fx,x)
     n = x.size
-    dfdx = Array::new(n*n)
+    dfdx = Array.new(n*n)
     for i in 0...n do
       df = dfdxi(f,fx,x,i)
       for j in 0...n do
diff --git a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
index 6cbe29b6da..dd265e482a 100644
--- a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
+++ b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'bigdecimal'
 
 #
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
index 03c59bfccb..0b9d0648bb 100644
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ b/ext/bigdecimal/lib/bigdecimal/math.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'bigdecimal'
 
 #
@@ -7,7 +8,6 @@ require 'bigdecimal'
 #   sin (x, prec)
 #   cos (x, prec)
 #   atan(x, prec)  Note: |x|<1, x=0.9999 may not converge.
-#   log (x, prec)
 #   PI  (prec)
 #   E   (prec) == exp(1.0,prec)
 #
@@ -21,30 +21,40 @@ require 'bigdecimal'
 #
 # Example:
 #
-#   require "bigdecimal"
 #   require "bigdecimal/math"
 #
 #   include BigMath
 #
 #   a = BigDecimal((PI(100)/2).to_s)
-#   puts sin(a,100) # -> 0.10000000000000000000......E1
+#   puts sin(a,100) # => 0.99999999999999999999......e0
 #
 module BigMath
   module_function
 
-  # Computes the square root of x to the specified number of digits of
-  # precision.
+  # call-seq:
+  #   sqrt(decimal, numeric) -> BigDecimal
   #
-  # BigDecimal.new('2').sqrt(16).to_s
-  #  -> "0.14142135623730950488016887242096975E1"
+  # Computes the square root of +decimal+ to the specified number of digits of
+  # precision, +numeric+.
   #
-  def sqrt(x,prec)
+  #   BigMath.sqrt(BigDecimal('2'), 16).to_s
+  #   #=> "0.1414213562373095048801688724e1"
+  #
+  def sqrt(x, prec)
     x.sqrt(prec)
   end
 
-  # Computes the sine of x to the specified number of digits of precision.
+  # call-seq:
+  #   sin(decimal, numeric) -> BigDecimal
+  #
+  # Computes the sine of +decimal+ to the specified number of digits of
+  # precision, +numeric+.
+  #
+  # If +decimal+ is Infinity or NaN, returns NaN.
+  #
+  #   BigMath.sin(BigMath.PI(5)/4, 5).to_s
+  #   #=> "0.70710678118654752440082036563292800375e0"
   #
-  # If x is infinite or NaN, returns NaN.
   def sin(x, prec)
     raise ArgumentError, "Zero or negative precision for sin" if prec <= 0
     return BigDecimal("NaN") if x.infinite? || x.nan?
@@ -78,9 +88,17 @@ module BigMath
     neg ? -y : y
   end
 
-  # Computes the cosine of x to the specified number of digits of precision.
+  # call-seq:
+  #   cos(decimal, numeric) -> BigDecimal
+  #
+  # Computes the cosine of +decimal+ to the specified number of digits of
+  # precision, +numeric+.
+  #
+  # If +decimal+ is Infinity or NaN, returns NaN.
+  #
+  #   BigMath.cos(BigMath.PI(4), 16).to_s
+  #   #=> "-0.999999999999999999999999999999856613163740061349e0"
   #
-  # If x is infinite or NaN, returns NaN.
   def cos(x, prec)
     raise ArgumentError, "Zero or negative precision for cos" if prec <= 0
     return BigDecimal("NaN") if x.infinite? || x.nan?
@@ -114,9 +132,17 @@ module BigMath
     y
   end
 
-  # Computes the arctangent of x to the specified number of digits of precision.
+  # call-seq:
+  #   atan(decimal, numeric) -> BigDecimal
+  #
+  # Computes the arctangent of +decimal+ to the specified number of digits of
+  # precision, +numeric+.
+  #
+  # If +decimal+ is NaN, returns NaN.
+  #
+  #   BigMath.atan(BigDecimal('-1'), 16).to_s
+  #   #=> "-0.785398163397448309615660845819878471907514682065e0"
   #
-  # If x is NaN, returns NaN.
   def atan(x, prec)
     raise ArgumentError, "Zero or negative precision for atan" if prec <= 0
     return BigDecimal("NaN") if x.nan?
@@ -145,9 +171,17 @@ module BigMath
     y
   end
 
-  # Computes the value of pi to the specified number of digits of precision.
+  # call-seq:
+  #   PI(numeric) -> BigDecimal
+  #
+  # Computes the value of pi to the specified number of digits of precision,
+  # +numeric+.
+  #
+  #   BigMath.PI(10).to_s
+  #   #=> "0.3141592653589793238462643388813853786957412e1"
+  #
   def PI(prec)
-    raise ArgumentError, "Zero or negative argument for PI" if prec <= 0
+    raise ArgumentError, "Zero or negative precision for PI" if prec <= 0
     n      = prec + BigDecimal.double_fig
     zero   = BigDecimal("0")
     one    = BigDecimal("1")
@@ -160,7 +194,6 @@ module BigMath
 
     d = one
     k = one
-    w = one
     t = BigDecimal("-80")
     while d.nonzero? && ((m = n - (pi.exponent - d.exponent).abs) > 0)
       m = BigDecimal.double_fig if m < BigDecimal.double_fig
@@ -172,7 +205,6 @@ module BigMath
 
     d = one
     k = one
-    w = one
     t = BigDecimal("956")
     while d.nonzero? && ((m = n - (pi.exponent - d.exponent).abs) > 0)
       m = BigDecimal.double_fig if m < BigDecimal.double_fig
@@ -184,23 +216,17 @@ module BigMath
     pi
   end
 
+  # call-seq:
+  #   E(numeric) -> BigDecimal
+  #
   # Computes e (the base of natural logarithms) to the specified number of
-  # digits of precision.
+  # digits of precision, +numeric+.
+  #
+  #   BigMath.E(10).to_s
+  #   #=> "0.271828182845904523536028752390026306410273e1"
+  #
   def E(prec)
     raise ArgumentError, "Zero or negative precision for E" if prec <= 0
-    n    = prec + BigDecimal.double_fig
-    one  = BigDecimal("1")
-    y  = one
-    d  = y
-    z  = one
-    i  = 0
-    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      i += 1
-      z *= i
-      d  = one.div(z,m)
-      y += d
-    end
-    y
+    BigMath.exp(1, prec)
   end
 end
diff --git a/ext/bigdecimal/lib/bigdecimal/newton.rb b/ext/bigdecimal/lib/bigdecimal/newton.rb
index 96defc3c06..85bacb7f2e 100644
--- a/ext/bigdecimal/lib/bigdecimal/newton.rb
+++ b/ext/bigdecimal/lib/bigdecimal/newton.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require "bigdecimal/ludcmp"
 require "bigdecimal/jacobian"
 
@@ -18,7 +19,7 @@ require "bigdecimal/jacobian"
 #
 # f.zero:: returns 0.0
 # f.one:: returns 1.0
-# f.two:: returns 1.0
+# f.two:: returns 2.0
 # f.ten:: returns 10.0
 #
 # f.eps:: returns the convergence criterion (epsilon value) used to determine whether two values are considered equal. If |a-b| < epsilon, the two values are considered equal.
@@ -30,7 +31,7 @@ module Newton
   include Jacobian
   module_function
 
-  def norm(fv,zero=0.0)
+  def norm(fv,zero=0.0) # :nodoc:
     s = zero
     n = fv.size
     for i in 0...n do
@@ -39,6 +40,7 @@ module Newton
     s
   end
 
+  # See also Newton
   def nlsolve(f,x)
     nRetry = 0
     n = x.size
diff --git a/ext/bigdecimal/lib/bigdecimal/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
index b4b02b191d..4ece8347bd 100644
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ b/ext/bigdecimal/lib/bigdecimal/util.rb
@@ -1,54 +1,76 @@
+# frozen_string_literal: false
+#
+#--
+# bigdecimal/util extends various native classes to provide the #to_d method,
+# and provides BigDecimal#to_d and BigDecimal#to_digits.
+#++
+
+require 'bigdecimal'
+
 class Integer < Numeric
   # call-seq:
   #     int.to_d  -> bigdecimal
   #
-  # Convert +int+ to a BigDecimal and return it.
+  # Returns the value of +int+ as a BigDecimal.
   #
   #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     42.to_d
-  #     # => #<BigDecimal:1008ef070,'0.42E2',9(36)>
+  #     42.to_d   # => 0.42e2
+  #
+  # See also BigDecimal::new.
   #
   def to_d
     BigDecimal(self)
   end
 end
 
+
 class Float < Numeric
   # call-seq:
-  #     flt.to_d(precision=nil)  -> bigdecimal
+  #     float.to_d             -> bigdecimal
+  #     float.to_d(precision)  -> bigdecimal
   #
-  # Convert +flt+ to a BigDecimal and return it.
+  # Returns the value of +float+ as a BigDecimal.
+  # The +precision+ parameter is used to determine the number of
+  # significant digits for the result (the default is Float::DIG).
   #
   #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     0.5.to_d
-  #     # => #<BigDecimal:1dc69e0,'0.5E0',9(18)>
+  #     0.5.to_d         # => 0.5e0
+  #     1.234.to_d(2)    # => 0.12e1
+  #
+  # See also BigDecimal::new.
   #
-  def to_d(precision=nil)
-    BigDecimal(self, precision || Float::DIG+1)
+  def to_d(precision=Float::DIG)
+    BigDecimal(self, precision)
   end
 end
 
+
 class String
   # call-seq:
-  #     string.to_d  -> bigdecimal
+  #     str.to_d  -> bigdecimal
   #
-  # Convert +string+ to a BigDecimal and return it.
+  # Returns the result of interpreting leading characters in +str+
+  # as a BigDecimal.
   #
   #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     "0.5".to_d
-  #     # => #<BigDecimal:1dc69e0,'0.5E0',9(18)>
+  #     "0.5".to_d             # => 0.5e0
+  #     "123.45e1".to_d        # => 0.12345e4
+  #     "45.67 degrees".to_d   # => 0.4567e2
+  #
+  # See also BigDecimal::new.
   #
   def to_d
-    BigDecimal(self)
+    BigDecimal.interpret_loosely(self)
   end
 end
 
+
 class BigDecimal < Numeric
   # call-seq:
   #     a.to_digits -> string
@@ -56,12 +78,11 @@ class BigDecimal < Numeric
   # Converts a BigDecimal to a String of the form "nnnnnn.mmm".
   # This method is deprecated; use BigDecimal#to_s("F") instead.
   #
-  #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     d = BigDecimal.new("3.14")
-  #     d.to_digits
-  #     # => "3.14"
+  #     d = BigDecimal("3.14")
+  #     d.to_digits                  # => "3.14"
+  #
   def to_digits
     if self.nan? || self.infinite? || self.zero?
       self.to_s
@@ -76,34 +97,52 @@ class BigDecimal < Numeric
   #     a.to_d -> bigdecimal
   #
   # Returns self.
+  #
+  #     require 'bigdecimal/util'
+  #
+  #     d = BigDecimal("3.14")
+  #     d.to_d                       # => 0.314e1
+  #
   def to_d
     self
   end
 end
 
+
 class Rational < Numeric
   # call-seq:
-  #   r.to_d(sig)   -> bigdecimal
-  #
-  # Converts a Rational to a BigDecimal. Takes an optional parameter +sig+ to
-  # limit the amount of significant digits.
-  # If a negative precision is given, raise ArgumentError.
-  # The zero precision and implicit precision is deprecated.
-  #
-  #   r = (22/7.0).to_r
-  #   # => (7077085128725065/2251799813685248)
-  #   r.to_d
-  #   # => #<BigDecimal:1a52bd8,'0.3142857142 8571427937 0154144999 105E1',45(63)>
-  #   r.to_d(3)
-  #   # => #<BigDecimal:1a44d08,'0.314E1',18(36)>
-  def to_d(precision=0)
-    if precision < 0
-      raise ArgumentError, "negative precision"
-    elsif precision == 0
-      warn "zero and implicit precision is deprecated."
-      precision = BigDecimal.double_fig*2+1
-    end
-    num = self.numerator
-    BigDecimal(num).div(self.denominator, precision)
+  #     rat.to_d(precision)  -> bigdecimal
+  #
+  # Returns the value as a BigDecimal.
+  #
+  # The required +precision+ parameter is used to determine the number of
+  # significant digits for the result.
+  #
+  #     require 'bigdecimal'
+  #     require 'bigdecimal/util'
+  #
+  #     Rational(22, 7).to_d(3)   # => 0.314e1
+  #
+  # See also BigDecimal::new.
+  #
+  def to_d(precision)
+    BigDecimal(self, precision)
+  end
+end
+
+
+class NilClass
+  # call-seq:
+  #     nil.to_d -> bigdecimal
+  #
+  # Returns nil represented as a BigDecimal.
+  #
+  #     require 'bigdecimal'
+  #     require 'bigdecimal/util'
+  #
+  #     nil.to_d   # => 0.0
+  #
+  def to_d
+    BigDecimal(0)
   end
 end
diff --git a/ext/bigdecimal/sample/linear.rb b/ext/bigdecimal/sample/linear.rb
index 88a62ffa71..516c2473be 100644
--- a/ext/bigdecimal/sample/linear.rb
+++ b/ext/bigdecimal/sample/linear.rb
@@ -1,4 +1,5 @@
 #!/usr/local/bin/ruby
+# frozen_string_literal: false
 
 #
 # linear.rb
@@ -10,13 +11,14 @@
 #   ruby linear.rb [input file solved]
 #
 
+# :stopdoc:
 require "bigdecimal"
 require "bigdecimal/ludcmp"
 
 #
 # NOTE:
-#   Change following BigDecimal::limit() if needed.
-BigDecimal::limit(100)
+#   Change following BigDecimal.limit() if needed.
+BigDecimal.limit(100)
 #
 
 include LUSolve
@@ -26,8 +28,8 @@ def rd_order(na)
 end
 
 na   = ARGV.size
-zero = BigDecimal::new("0.0")
-one  = BigDecimal::new("1.0")
+zero = BigDecimal("0.0")
+one  = BigDecimal("1.0")
 
 while (n=rd_order(na))>0
   a = []
@@ -35,27 +37,28 @@ while (n=rd_order(na))>0
   b = []
   if na <= 0
      # Read data from console.
-     printf("\nEnter coefficient matrix element A[i,j]\n");
+     printf("\nEnter coefficient matrix element A[i,j]\n")
      for i in 0...n do
        for j in 0...n do
          printf("A[%d,%d]? ",i,j); s = ARGF.gets
-         a  << BigDecimal::new(s);
-         as << BigDecimal::new(s);
+         a  << BigDecimal(s)
+         as << BigDecimal(s)
        end
-       printf("Contatant vector element b[%d] ? ",i); b << BigDecimal::new(ARGF.gets);
+       printf("Contatant vector element b[%d] ? ",i)
+       b << BigDecimal(ARGF.gets)
      end
   else
      # Read data from specified file.
-     printf("Coefficient matrix and constant vector.\n");
+     printf("Coefficient matrix and constant vector.\n")
      for i in 0...n do
        s = ARGF.gets
        printf("%d) %s",i,s)
        s = s.split
        for j in 0...n do
-         a  << BigDecimal::new(s[j]);
-         as << BigDecimal::new(s[j]);
+         a  << BigDecimal(s[j])
+         as << BigDecimal(s[j])
        end
-       b << BigDecimal::new(s[n]);
+       b << BigDecimal(s[n])
      end
   end
   x = lusolve(a,b,ludecomp(a,n,zero,one),zero)
diff --git a/ext/bigdecimal/sample/nlsolve.rb b/ext/bigdecimal/sample/nlsolve.rb
index 7f729e6aaa..c2227dac73 100644
--- a/ext/bigdecimal/sample/nlsolve.rb
+++ b/ext/bigdecimal/sample/nlsolve.rb
@@ -1,4 +1,5 @@
 #!/usr/local/bin/ruby
+# frozen_string_literal: false
 
 #
 # nlsolve.rb
@@ -9,13 +10,13 @@ require "bigdecimal"
 require "bigdecimal/newton"
 include Newton
 
-class Function
+class Function # :nodoc: all
   def initialize()
-    @zero = BigDecimal::new("0.0")
-    @one  = BigDecimal::new("1.0")
-    @two  = BigDecimal::new("2.0")
-    @ten  = BigDecimal::new("10.0")
-    @eps  = BigDecimal::new("1.0e-16")
+    @zero = BigDecimal("0.0")
+    @one  = BigDecimal("1.0")
+    @two  = BigDecimal("2.0")
+    @ten  = BigDecimal("10.0")
+    @eps  = BigDecimal("1.0e-16")
   end
   def zero;@zero;end
   def one ;@one ;end
@@ -31,8 +32,9 @@ class Function
     f
   end
 end
- f = BigDecimal::limit(100)
- f = Function.new
- x = [f.zero,f.zero]      # Initial values
- n = nlsolve(f,x)
- p x
+
+f = BigDecimal.limit(100)
+f = Function.new
+x = [f.zero,f.zero]      # Initial values
+n = nlsolve(f,x)
+p x
diff --git a/ext/bigdecimal/sample/pi.rb b/ext/bigdecimal/sample/pi.rb
index 2f7dd27d60..ea9663896c 100644
--- a/ext/bigdecimal/sample/pi.rb
+++ b/ext/bigdecimal/sample/pi.rb
@@ -1,4 +1,5 @@
 #!/usr/local/bin/ruby
+# frozen_string_literal: false
 
 #
 # pi.rb
diff --git a/ext/bigdecimal/util/depend b/ext/bigdecimal/util/depend
new file mode 100644
index 0000000000..96b6a7fea0
--- /dev/null
+++ b/ext/bigdecimal/util/depend
@@ -0,0 +1,14 @@
+# AUTOGENERATED DEPENDENCIES START
+util.o: $(RUBY_EXTCONF_H)
+util.o: $(arch_hdrdir)/ruby/config.h
+util.o: $(hdrdir)/ruby.h
+util.o: $(hdrdir)/ruby/assert.h
+util.o: $(hdrdir)/ruby/backward.h
+util.o: $(hdrdir)/ruby/defines.h
+util.o: $(hdrdir)/ruby/intern.h
+util.o: $(hdrdir)/ruby/missing.h
+util.o: $(hdrdir)/ruby/ruby.h
+util.o: $(hdrdir)/ruby/st.h
+util.o: $(hdrdir)/ruby/subst.h
+util.o: util.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/cgi/escape/depend b/ext/cgi/escape/depend
new file mode 100644
index 0000000000..8d4736616f
--- /dev/null
+++ b/ext/cgi/escape/depend
@@ -0,0 +1,17 @@
+# AUTOGENERATED DEPENDENCIES START
+escape.o: $(RUBY_EXTCONF_H)
+escape.o: $(arch_hdrdir)/ruby/config.h
+escape.o: $(hdrdir)/ruby.h
+escape.o: $(hdrdir)/ruby/assert.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/onigmo.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: escape.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/cgi/escape/escape.c b/ext/cgi/escape/escape.c
new file mode 100644
index 0000000000..47188819cd
--- /dev/null
+++ b/ext/cgi/escape/escape.c
@@ -0,0 +1,407 @@
+#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;
+
+#define HTML_ESCAPE_MAX_LEN 6
+
+static const struct {
+    uint8_t len;
+    char str[HTML_ESCAPE_MAX_LEN+1];
+} html_escape_table[UCHAR_MAX+1] = {
+#define HTML_ESCAPE(c, str) [c] = {rb_strlen_lit(str), str}
+    HTML_ESCAPE('\'', "&#39;"),
+    HTML_ESCAPE('&', "&amp;"),
+    HTML_ESCAPE('"', "&quot;"),
+    HTML_ESCAPE('<', "&lt;"),
+    HTML_ESCAPE('>', "&gt;"),
+#undef HTML_ESCAPE
+};
+
+static inline void
+preserve_original_state(VALUE orig, VALUE dest)
+{
+    rb_enc_associate(dest, rb_enc_get(orig));
+}
+
+static VALUE
+optimized_escape_html(VALUE str)
+{
+    VALUE vbuf;
+    char *buf = ALLOCV_N(char, vbuf, RSTRING_LEN(str) * HTML_ESCAPE_MAX_LEN);
+    const char *cstr = RSTRING_PTR(str);
+    const char *end = cstr + RSTRING_LEN(str);
+
+    char *dest = buf;
+    while (cstr < end) {
+        const unsigned char c = *cstr++;
+        uint8_t len = html_escape_table[c].len;
+        if (len) {
+            memcpy(dest, html_escape_table[c].str, len);
+            dest += len;
+        }
+        else {
+            *dest++ = c;
+        }
+    }
+
+    VALUE escaped;
+    if (RSTRING_LEN(str) < (dest - buf)) {
+        escaped = rb_str_new(buf, dest - buf);
+        preserve_original_state(str, escaped);
+    }
+    else {
+        escaped = rb_str_dup(str);
+    }
+    ALLOCV_END(vbuf);
+    return escaped;
+}
+
+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 '_': 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;
+    rb_encoding *enc = rb_to_encoding(encoding);
+    int cr, origenc, encidx = rb_enc_to_index(enc);
+
+    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
new file mode 100644
index 0000000000..16e8ff224d
--- /dev/null
+++ b/ext/cgi/escape/extconf.rb
@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile 'cgi/escape'
diff --git a/ext/continuation/continuation.c b/ext/continuation/continuation.c
index ae69b66cd8..c678371cca 100644
--- a/ext/continuation/continuation.c
+++ b/ext/continuation/continuation.c
@@ -1,8 +1,13 @@
 
+#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
new file mode 100644
index 0000000000..08844aa6bb
--- /dev/null
+++ b/ext/continuation/depend
@@ -0,0 +1,13 @@
+# AUTOGENERATED DEPENDENCIES START
+continuation.o: $(RUBY_EXTCONF_H)
+continuation.o: $(arch_hdrdir)/ruby/config.h
+continuation.o: $(hdrdir)/ruby/assert.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 17e2d056db..6d54ec01a5 100644
--- a/ext/continuation/extconf.rb
+++ b/ext/continuation/extconf.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'mkmf'
 create_makefile('continuation')
 
diff --git a/ext/coverage/coverage.c b/ext/coverage/coverage.c
index 529fac256a..8503c9d6c6 100644
--- a/ext/coverage/coverage.c
+++ b/ext/coverage/coverage.c
@@ -10,8 +10,10 @@
 
 #include "ruby.h"
 #include "vm_core.h"
+#include "gc.h"
 
-static VALUE rb_coverages = Qundef;
+static int current_mode;
+static VALUE me2counter = Qnil;
 
 /*
  * call-seq:
@@ -20,62 +22,292 @@ static VALUE rb_coverages = Qundef;
  * Enables coverage measurement.
  */
 static VALUE
-rb_coverage_start(VALUE klass)
+rb_coverage_start(int argc, VALUE *argv, VALUE klass)
 {
-    if (!RTEST(rb_get_coverages())) {
-	if (rb_coverages == Qundef) {
-	    rb_coverages = rb_hash_new();
-	    RBASIC(rb_coverages)->klass = 0;
-	}
-	rb_set_coverages(rb_coverages);
+    VALUE coverages, opt;
+    int mode;
+
+    rb_scan_args(argc, argv, "01", &opt);
+
+    if (argc == 0) {
+	mode = 0; /* compatible mode */
+    }
+    else if (opt == ID2SYM(rb_intern("all"))) {
+	mode = COVERAGE_TARGET_LINES | COVERAGE_TARGET_BRANCHES | COVERAGE_TARGET_METHODS;
+    }
+    else {
+	mode = 0;
+	opt = rb_convert_type(opt, T_HASH, "Hash", "to_hash");
+
+	if (RTEST(rb_hash_lookup(opt, ID2SYM(rb_intern("lines")))))
+	    mode |= COVERAGE_TARGET_LINES;
+	if (RTEST(rb_hash_lookup(opt, ID2SYM(rb_intern("branches")))))
+	    mode |= COVERAGE_TARGET_BRANCHES;
+	if (RTEST(rb_hash_lookup(opt, ID2SYM(rb_intern("methods")))))
+	    mode |= COVERAGE_TARGET_METHODS;
+        if (RTEST(rb_hash_lookup(opt, ID2SYM(rb_intern("oneshot_lines"))))) {
+            if (mode & COVERAGE_TARGET_LINES)
+                rb_raise(rb_eRuntimeError, "cannot enable lines and oneshot_lines simultaneously");
+            mode |= COVERAGE_TARGET_LINES;
+            mode |= COVERAGE_TARGET_ONESHOT_LINES;
+        }
+    }
+
+    if (mode & COVERAGE_TARGET_METHODS) {
+        me2counter = rb_ident_hash_new();
+    }
+    else {
+	me2counter = Qnil;
+    }
+
+    coverages = rb_get_coverages();
+    if (!RTEST(coverages)) {
+	coverages = rb_hash_new();
+	rb_obj_hide(coverages);
+	current_mode = mode;
+	if (mode == 0) mode = COVERAGE_TARGET_LINES;
+	rb_set_coverages(coverages, mode, me2counter);
+    }
+    else if (current_mode != mode) {
+	rb_raise(rb_eRuntimeError, "cannot change the measuring target during coverage measurement");
     }
     return Qnil;
 }
 
+static VALUE
+branch_coverage(VALUE branches)
+{
+    VALUE ret = rb_hash_new();
+    VALUE structure = rb_ary_dup(RARRAY_AREF(branches, 0));
+    VALUE counters = rb_ary_dup(RARRAY_AREF(branches, 1));
+    int i, j;
+    long id = 0;
+
+    for (i = 0; i < RARRAY_LEN(structure); i++) {
+	VALUE branches = RARRAY_AREF(structure, i);
+	VALUE base_type = RARRAY_AREF(branches, 0);
+	VALUE base_first_lineno = RARRAY_AREF(branches, 1);
+	VALUE base_first_column = RARRAY_AREF(branches, 2);
+	VALUE base_last_lineno = RARRAY_AREF(branches, 3);
+	VALUE base_last_column = RARRAY_AREF(branches, 4);
+	VALUE children = rb_hash_new();
+	rb_hash_aset(ret, rb_ary_new_from_args(6, base_type, LONG2FIX(id++), base_first_lineno, base_first_column, base_last_lineno, base_last_column), children);
+	for (j = 5; j < RARRAY_LEN(branches); j += 6) {
+	    VALUE target_label = RARRAY_AREF(branches, j);
+	    VALUE target_first_lineno = RARRAY_AREF(branches, j + 1);
+	    VALUE target_first_column = RARRAY_AREF(branches, j + 2);
+	    VALUE target_last_lineno = RARRAY_AREF(branches, j + 3);
+	    VALUE target_last_column = RARRAY_AREF(branches, j + 4);
+	    int idx = FIX2INT(RARRAY_AREF(branches, j + 5));
+	    rb_hash_aset(children, rb_ary_new_from_args(6, target_label, LONG2FIX(id++), target_first_lineno, target_first_column, target_last_lineno, target_last_column), RARRAY_AREF(counters, idx));
+	}
+    }
+
+    return ret;
+}
+
 static int
-coverage_result_i(st_data_t key, st_data_t val, st_data_t h)
+method_coverage_i(void *vstart, void *vend, size_t stride, void *data)
+{
+    /*
+     * ObjectSpace.each_object(Module){|mod|
+     *   mod.instance_methods.each{|mid|
+     *     m = mod.instance_method(mid)
+     *     if loc = m.source_location
+     *       p [m.name, loc, $g_method_cov_counts[m]]
+     *     end
+     *   }
+     * }
+     */
+    VALUE ncoverages = *(VALUE*)data, v;
+
+    for (v = (VALUE)vstart; v != (VALUE)vend; v += stride) {
+	if (RB_TYPE_P(v, T_IMEMO) && imemo_type(v) == imemo_ment) {
+	    const rb_method_entry_t *me = (rb_method_entry_t *) v;
+	    VALUE path, first_lineno, first_column, last_lineno, last_column;
+	    VALUE data[5], ncoverage, methods;
+	    VALUE methods_id = ID2SYM(rb_intern("methods"));
+	    VALUE klass;
+	    const rb_method_entry_t *me2 = rb_resolve_me_location(me, data);
+	    if (me != me2) continue;
+	    klass = me->owner;
+	    if (RB_TYPE_P(klass, T_ICLASS)) {
+		rb_bug("T_ICLASS");
+	    }
+	    path = data[0];
+	    first_lineno = data[1];
+	    first_column = data[2];
+	    last_lineno = data[3];
+	    last_column = data[4];
+	    if (FIX2LONG(first_lineno) <= 0) continue;
+	    ncoverage = rb_hash_aref(ncoverages, path);
+	    if (NIL_P(ncoverage)) continue;
+	    methods = rb_hash_aref(ncoverage, methods_id);
+
+	    {
+		VALUE method_id = ID2SYM(me->def->original_id);
+		VALUE rcount = rb_hash_aref(me2counter, (VALUE) me);
+		VALUE key = rb_ary_new_from_args(6, klass, method_id, first_lineno, first_column, last_lineno, last_column);
+		VALUE rcount2 = rb_hash_aref(methods, key);
+
+		if (NIL_P(rcount)) rcount = LONG2FIX(0);
+		if (NIL_P(rcount2)) rcount2 = LONG2FIX(0);
+		if (!POSFIXABLE(FIX2LONG(rcount) + FIX2LONG(rcount2))) {
+		    rcount = LONG2FIX(FIXNUM_MAX);
+		}
+		else {
+		    rcount = LONG2FIX(FIX2LONG(rcount) + FIX2LONG(rcount2));
+		}
+		rb_hash_aset(methods, key, rcount);
+	    }
+	}
+    }
+    return 0;
+}
+
+static int
+coverage_peek_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);
+    if (current_mode == 0) {
+	/* compatible mode */
+	VALUE lines = rb_ary_dup(RARRAY_AREF(coverage, COVERAGE_INDEX_LINES));
+	rb_ary_freeze(lines);
+	coverage = lines;
+    }
+    else {
+	VALUE h = rb_hash_new();
+
+	if (current_mode & COVERAGE_TARGET_LINES) {
+	    VALUE lines = RARRAY_AREF(coverage, COVERAGE_INDEX_LINES);
+            const char *kw = (current_mode & COVERAGE_TARGET_ONESHOT_LINES) ? "oneshot_lines" : "lines";
+	    lines = rb_ary_dup(lines);
+	    rb_ary_freeze(lines);
+            rb_hash_aset(h, ID2SYM(rb_intern(kw)), lines);
+	}
+
+	if (current_mode & COVERAGE_TARGET_BRANCHES) {
+	    VALUE branches = RARRAY_AREF(coverage, COVERAGE_INDEX_BRANCHES);
+	    rb_hash_aset(h, ID2SYM(rb_intern("branches")), branch_coverage(branches));
+	}
+
+	if (current_mode & COVERAGE_TARGET_METHODS) {
+	    rb_hash_aset(h, ID2SYM(rb_intern("methods")), rb_hash_new());
+	}
+
+	coverage = h;
+    }
+
     rb_hash_aset(coverages, path, coverage);
     return ST_CONTINUE;
 }
 
 /*
  *  call-seq:
- *     Coverage.result  => hash
+ *     Coverage.peek_result  => hash
+ *
+ * Returns a hash that contains filename as key and coverage array as value.
+ * This is the same as `Coverage.result(stop: false, clear: false)`.
  *
- * Returns a hash that contains filename as key and coverage array as value
- * and disables coverage measurement.
+ *   {
+ *     "file.rb" => [1, 2, nil],
+ *     ...
+ *   }
  */
 static VALUE
-rb_coverage_result(VALUE klass)
+rb_coverage_peek_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_result_i, ncoverages);
+    st_foreach(RHASH_TBL(coverages), coverage_peek_result_i, ncoverages);
+
+    if (current_mode & COVERAGE_TARGET_METHODS) {
+	rb_objspace_each_objects(method_coverage_i, &ncoverages);
+    }
+
     rb_hash_freeze(ncoverages);
-    rb_reset_coverages();
     return ncoverages;
 }
 
+
+static int
+clear_me2counter_i(VALUE key, VALUE value, VALUE unused)
+{
+    rb_hash_aset(me2counter, key, INT2FIX(0));
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     Coverage.result(stop: true, clear: true)  => hash
+ *
+ * Returns a hash that contains filename as key and coverage array as value.
+ * If +clear+ is true, it clears the counters to zero.
+ * If +stop+ is true, it disables coverage measurement.
+ */
+static VALUE
+rb_coverage_result(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE ncoverages;
+    VALUE opt;
+    int stop = 1, clear = 1;
+
+    rb_scan_args(argc, argv, "01", &opt);
+
+    if (argc == 1) {
+        opt = rb_convert_type(opt, T_HASH, "Hash", "to_hash");
+        stop = RTEST(rb_hash_lookup(opt, ID2SYM(rb_intern("stop"))));
+        clear = RTEST(rb_hash_lookup(opt, ID2SYM(rb_intern("clear"))));
+    }
+
+    ncoverages = rb_coverage_peek_result(klass);
+    if (stop && !clear) {
+        rb_warn("stop implies clear");
+        clear = 1;
+    }
+    if (clear) {
+        rb_clear_coverages();
+        if (!NIL_P(me2counter)) rb_hash_foreach(me2counter, clear_me2counter_i, Qnil);
+    }
+    if (stop) {
+        rb_reset_coverages();
+        me2counter = Qnil;
+    }
+    return ncoverages;
+}
+
+
+/*
+ *  call-seq:
+ *     Coverage.running?  => bool
+ *
+ * Returns true if coverage stats are currently being collected (after
+ * Coverage.start call, but before Coverage.result call)
+ */
+static VALUE
+rb_coverage_running(VALUE klass)
+{
+    VALUE coverages = rb_get_coverages();
+    return RTEST(coverages) ? Qtrue : Qfalse;
+}
+
 /* Coverage provides coverage measurement feature for Ruby.
  * This feature is experimental, so these APIs may be changed in future.
  *
  * = Usage
  *
- * (1) require "coverage.so"
- * (2) do Coverage.start
- * (3) require or load Ruby source file
- * (4) Coverage.result will return a hash that contains filename as key and
- *     coverage array as value.
+ * 1. require "coverage"
+ * 2. do Coverage.start
+ * 3. require or load Ruby source file
+ * 4. Coverage.result will return a hash that contains filename as key and
+ *    coverage array as value. A coverage array gives, for each line, the
+ *    number of line execution by the interpreter. A +nil+ value means
+ *    coverage is disabled for this line (lines like +else+ and +end+).
  *
  * = Example
  *
@@ -92,7 +324,7 @@ rb_coverage_result(VALUE klass)
  *   end
  *   [EOF]
  *
- *   require "coverage.so"
+ *   require "coverage"
  *   Coverage.start
  *   require "foo.rb"
  *   p Coverage.result  #=> {"foo.rb"=>[1, 1, 10, nil, nil, 1, 1, nil, 0, nil]}
@@ -101,7 +333,9 @@ void
 Init_coverage(void)
 {
     VALUE rb_mCoverage = rb_define_module("Coverage");
-    rb_define_module_function(rb_mCoverage, "start", rb_coverage_start, 0);
-    rb_define_module_function(rb_mCoverage, "result", rb_coverage_result, 0);
-    rb_gc_register_address(&rb_coverages);
+    rb_define_module_function(rb_mCoverage, "start", rb_coverage_start, -1);
+    rb_define_module_function(rb_mCoverage, "result", rb_coverage_result, -1);
+    rb_define_module_function(rb_mCoverage, "peek_result", rb_coverage_peek_result, 0);
+    rb_define_module_function(rb_mCoverage, "running?", rb_coverage_running, 0);
+    rb_global_variable(&me2counter);
 }
diff --git a/ext/coverage/depend b/ext/coverage/depend
new file mode 100644
index 0000000000..20b76be04c
--- /dev/null
+++ b/ext/coverage/depend
@@ -0,0 +1,29 @@
+# AUTOGENERATED DEPENDENCIES START
+coverage.o: $(RUBY_EXTCONF_H)
+coverage.o: $(arch_hdrdir)/ruby/config.h
+coverage.o: $(hdrdir)/ruby.h
+coverage.o: $(hdrdir)/ruby/assert.h
+coverage.o: $(hdrdir)/ruby/backward.h
+coverage.o: $(hdrdir)/ruby/defines.h
+coverage.o: $(hdrdir)/ruby/intern.h
+coverage.o: $(hdrdir)/ruby/missing.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)/gc.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_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 cf10ca89c5..3a6f530a92 100644
--- a/ext/coverage/extconf.rb
+++ b/ext/coverage/extconf.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: false
 require 'mkmf'
+$VPATH << '$(topdir)' << '$(top_srcdir)'
 $INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
 create_makefile('coverage')
diff --git a/ext/coverage/lib/coverage.rb b/ext/coverage/lib/coverage.rb
new file mode 100644
index 0000000000..f1923ef366
--- /dev/null
+++ b/ext/coverage/lib/coverage.rb
@@ -0,0 +1,14 @@
+require "coverage.so"
+
+module Coverage
+  def self.line_stub(file)
+    lines = File.foreach(file).map { nil }
+    iseqs = [RubyVM::InstructionSequence.compile_file(file)]
+    until iseqs.empty?
+      iseq = iseqs.pop
+      iseq.trace_points.each {|n, type| lines[n - 1] = 0 if type == :line }
+      iseq.each_child {|child| iseqs << child }
+    end
+    lines
+  end
+end
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
deleted file mode 100644
index ff0c64e258..0000000000
--- a/ext/curses/curses.c
+++ /dev/null
@@ -1,4115 +0,0 @@
-/* -*- C -*-
- * $Id$
- *
- * ext/curses/curses.c
- *
- * by MAEDA Shugo (ender@pic-internet.or.jp)
- * modified by Yukihiro Matsumoto (matz@netlab.co.jp),
- *         Toki Yoshinori,
- *         Hitoshi Takahashi,
- *         and Takaaki Tateishi (ttate@kt.jaist.ac.jp)
- *
- * maintainers:
- * - Takaaki Tateishi (ttate@kt.jaist.ac.jp)
- *
- * doumentation:
- * - Vincent Batts (vbatts@hashbangbash.com)
- */
-
-#include "ruby.h"
-#include "ruby/io.h"
-
-#if defined(HAVE_NCURSES_H)
-# include <ncurses.h>
-#elif defined(HAVE_NCURSES_CURSES_H)
-# include <ncurses/curses.h>
-#elif defined(HAVE_CURSES_COLR_CURSES_H)
-# ifdef HAVE_STDARG_PROTOTYPES
-#  include <stdarg.h>
-# else
-#  include <varargs.h>
-# endif
-# include <curses_colr/curses.h>
-#else
-# include <curses.h>
-# if defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)
-#  if !defined(_maxx)
-#  define _maxx maxx
-#  endif
-#  if !defined(_maxy)
-#  define _maxy maxy
-#  endif
-#  if !defined(_begx)
-#  define _begx begx
-#  endif
-#  if !defined(_begy)
-#  define _begy begy
-#  endif
-# endif
-#endif
-
-#ifdef HAVE_INIT_COLOR
-# define USE_COLOR 1
-#endif
-
-/* supports only ncurses mouse routines */
-#ifdef NCURSES_MOUSE_VERSION
-# define USE_MOUSE 1
-#endif
-
-#define NUM2CH NUM2CHR
-#define CH2FIX CHR2FIX
-
-static VALUE mCurses;
-static VALUE mKey;
-static VALUE cWindow;
-#ifdef USE_MOUSE
-static VALUE cMouseEvent;
-#endif
-
-static VALUE rb_stdscr;
-
-struct windata {
-    WINDOW *window;
-};
-
-static VALUE window_attroff(VALUE obj, VALUE attrs);
-static VALUE window_attron(VALUE obj, VALUE attrs);
-static VALUE window_attrset(VALUE obj, VALUE attrs);
-
-static void
-no_window(void)
-{
-    rb_raise(rb_eRuntimeError, "already closed window");
-}
-
-#define GetWINDOW(obj, winp) do {\
-    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted window");\
-    Data_Get_Struct((obj), struct windata, (winp));\
-    if ((winp)->window == 0) no_window();\
-} while (0)
-
-static void
-free_window(struct windata *winp)
-{
-    if (winp->window && winp->window != stdscr) delwin(winp->window);
-    winp->window = 0;
-    xfree(winp);
-}
-
-static VALUE
-prep_window(VALUE class, WINDOW *window)
-{
-    VALUE obj;
-    struct windata *winp;
-
-    if (window == NULL) {
-	rb_raise(rb_eRuntimeError, "failed to create window");
-    }
-
-    obj = rb_obj_alloc(class);
-    Data_Get_Struct(obj, struct windata, winp);
-    winp->window = window;
-
-    return obj;
-}
-
-/*-------------------------- module Curses --------------------------*/
-
-/*
- * Document-method: Curses.init_screen
- *
- * Initialize a standard screen
- *
- * see also Curses.stdscr
- */
-static VALUE
-curses_init_screen(void)
-{
-    rb_secure(4);
-    if (rb_stdscr) return rb_stdscr;
-    initscr();
-    if (stdscr == 0) {
-	rb_raise(rb_eRuntimeError, "can't initialize curses");
-    }
-    clear();
-    rb_stdscr = prep_window(cWindow, stdscr);
-    return rb_stdscr;
-}
-
-/*
- * Document-method: Curses.stdscr
- *
- * The Standard Screen.
- *
- * Upon initializing curses, a default window called stdscr,
- * which is the size of the terminal screen, is created.
- *
- * Many curses functions use this window.
- */
-#define curses_stdscr curses_init_screen
-
-/*
- * Document-method: Curses.close_screen
- *
- * A program should always call Curses.close_screen before exiting or
- * escaping from curses mode temporarily. This routine
- * restores tty modes, moves the cursor to the lower
- * left-hand corner of the screen and resets the terminal
- * into the proper non-visual mode.
- *
- * Calling Curses.refresh or Curses.doupdate after a temporary
- * escape causes the program to resume visual mode.
- *
- */
-static VALUE
-curses_close_screen(void)
-{
-    curses_stdscr();
-#ifdef HAVE_ISENDWIN
-    if (!isendwin())
-#endif
-	endwin();
-    rb_stdscr = 0;
-    return Qnil;
-}
-
-/*
- * This is no runtime method,
- * but a function called before the proc ends
- *
- * Similar to Curses.close_screen, except that it also
- * garbage collects/unregisters the Curses.stdscr
- */
-static void
-curses_finalize(VALUE dummy)
-{
-    if (stdscr
-#ifdef HAVE_ISENDWIN
-	&& !isendwin()
-#endif
-	)
-	endwin();
-    rb_stdscr = 0;
-    rb_gc_unregister_address(&rb_stdscr);
-}
-
-#ifdef HAVE_ISENDWIN
-/*
- * Document-method: Curses.closed?
- *
- * Returns +true+ if the window/screen has been closed,
- * without any subsequent Curses.refresh calls,
- * returns +false+ otherwise.
- */
-static VALUE
-curses_closed(void)
-{
-    curses_stdscr();
-    if (isendwin()) {
-	return Qtrue;
-    }
-    return Qfalse;
-}
-#else
-#define curses_closed rb_f_notimplement
-#endif
-
-/*
- * Document-method: Curses.clear
- *
- * Clears every position on the screen completely,
- * so that a subsequent call by Curses.refresh for the screen/window
- * will be repainted from scratch.
- */
-static VALUE
-curses_clear(VALUE obj)
-{
-    curses_stdscr();
-    wclear(stdscr);
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.clrtoeol
- *
- * Clears to the end of line, that the cursor is currently on.
- */
-static VALUE
-curses_clrtoeol(void)
-{
-    curses_stdscr();
-    clrtoeol();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.refresh
- *
- * Refreshes the windows and lines.
- *
- */
-static VALUE
-curses_refresh(VALUE obj)
-{
-    curses_stdscr();
-    refresh();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.doupdate
- *
- * Refreshes the windows and lines.
- *
- * Curses.doupdate allows multiple updates with
- * more efficiency than Curses.refresh alone.
- */
-static VALUE
-curses_doupdate(VALUE obj)
-{
-    curses_stdscr();
-#ifdef HAVE_DOUPDATE
-    doupdate();
-#else
-    refresh();
-#endif
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.echo
- *
- * Enables characters typed by the user
- * to be echoed by Curses.getch as they are typed.
- */
-static VALUE
-curses_echo(VALUE obj)
-{
-    curses_stdscr();
-    echo();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.noecho
- *
- * Disables characters typed by the user
- * to be echoed by Curses.getch as they are typed.
- */
-static VALUE
-curses_noecho(VALUE obj)
-{
-    curses_stdscr();
-    noecho();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.raw
- *
- * Put the terminal into raw mode.
- *
- * Raw mode is similar to Curses.cbreak mode, in that characters typed
- * are immediately passed through to the user program.
- *
- * The differences are that in raw mode, the interrupt, quit,
- * suspend, and flow control characters are all passed through
- * uninterpreted, instead of generating a signal. The behavior
- * of the BREAK key depends on other bits in the tty driver
- * that are not set by curses.
- */
-static VALUE
-curses_raw(VALUE obj)
-{
-    curses_stdscr();
-    raw();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.noraw
- *
- * Put the terminal out of raw mode.
- *
- * see Curses.raw for more detail
- */
-static VALUE
-curses_noraw(VALUE obj)
-{
-    curses_stdscr();
-    noraw();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.cbreak
- *
- * Put the terminal into cbreak mode.
- *
- * Normally, the tty driver buffers typed characters until
- * a newline or carriage return is typed. The Curses.cbreak
- * routine disables line buffering and erase/kill
- * character-processing (interrupt and flow control characters
- * are unaffected), making characters typed by the user
- * immediately available to the program.
- *
- * The Curses.nocbreak routine returns the terminal to normal (cooked) mode.
- *
- * Initially the terminal may or may not be in cbreak mode,
- * as the mode is inherited; therefore, a program should
- * call Curses.cbreak or Curses.nocbreak explicitly.
- * Most interactive programs using curses set the cbreak mode.
- * Note that Curses.cbreak overrides Curses.raw.
- *
- * see also Curses.raw
- */
-static VALUE
-curses_cbreak(VALUE obj)
-{
-    curses_stdscr();
-    cbreak();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.nocbreak
- *
- * Put the terminal into normal mode (out of cbreak mode).
- *
- * See Curses.cbreak for more detail.
- */
-static VALUE
-curses_nocbreak(VALUE obj)
-{
-    curses_stdscr();
-    nocbreak();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.nl
- *
- * Enable the underlying display device to translate
- * the return key into newline on input, and whether it
- * translates newline into return and line-feed on output
- * (in either case, the call Curses.addch('\n') does the
- * equivalent of return and line feed on the virtual screen).
- *
- * Initially, these translations do occur. If you disable
- * them using Curses.nonl, curses will be able to make better use
- * of the line-feed capability, resulting in faster cursor
- * motion. Also, curses will then be able to detect the return key.
- */
-static VALUE
-curses_nl(VALUE obj)
-{
-    curses_stdscr();
-    nl();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.nl
- *
- * Disable the underlying display device to translate
- * the return key into newline on input
- *
- * See Curses.nl for more detail
- */
-static VALUE
-curses_nonl(VALUE obj)
-{
-    curses_stdscr();
-    nonl();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.beep
- *
- * Sounds an audible alarm on the terminal, if possible;
- * otherwise it flashes the screen (visual bell).
- *
- * see also Curses.flash
- */
-static VALUE
-curses_beep(VALUE obj)
-{
-#ifdef HAVE_BEEP
-    curses_stdscr();
-    beep();
-#endif
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.flash
- *
- * Flashs the screen, for visual alarm on the terminal, if possible;
- * otherwise it sounds the alert.
- *
- * see also Curses.beep
- */
-static VALUE
-curses_flash(VALUE obj)
-{
-#ifdef HAVE_FLASH
-    curses_stdscr();
-    flash();
-#endif
-    return Qnil;
-}
-
-static int
-curses_char(VALUE c)
-{
-    if (FIXNUM_P(c)) {
-	return NUM2INT(c);
-    }
-    else {
-	int cc;
-
-	StringValue(c);
-	if (RSTRING_LEN(c) == 0 || RSTRING_LEN(c) > 1) {
-	    rb_raise(rb_eArgError, "string not corresponding a character");
-	}
-	cc = RSTRING_PTR(c)[0];
-	if (cc > 0x7f) {
-	    rb_raise(rb_eArgError, "no multibyte string supported (yet)");
-	}
-	return cc;
-    }
-}
-
-#ifdef HAVE_UNGETCH
-/*
- * Document-method: Curses.ungetch
- * call-seq: ungetch(ch)
- *
- * Places +ch+ back onto the input queue to be returned by
- * the next call to Curses.getch.
- *
- * There is just one input queue for all windows.
- */
-static VALUE
-curses_ungetch(VALUE obj, VALUE ch)
-{
-    int c = curses_char(ch);
-    curses_stdscr();
-    ungetch(c);
-    return Qnil;
-}
-#else
-#define curses_ungetch rb_f_notimplement
-#endif
-
-/*
- * Document-method: Curses.setpos
- * call-seq: setpos(y, x)
- *
- * A setter for the position of the cursor,
- * using coordinates +x+ and +y+
- *
- */
-static VALUE
-curses_setpos(VALUE obj, VALUE y, VALUE x)
-{
-    curses_stdscr();
-    move(NUM2INT(y), NUM2INT(x));
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.standout
- *
- * Enables the best highlighting mode of the terminal.
- *
- * This is equivalent to Curses:Window.attron(A_STANDOUT)
- *
- * see also Curses::Window.attrset additional information
- */
-static VALUE
-curses_standout(VALUE obj)
-{
-    curses_stdscr();
-    standout();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.standend
- *
- * Enables the Normal display (no highlight)
- *
- * This is equivalent to Curses.attron(A_NORMAL)
- *
- * see also Curses::Window.attrset for additional information.
- */
-static VALUE
-curses_standend(VALUE obj)
-{
-    curses_stdscr();
-    standend();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.inch
- *
- * Returns the character at the current position.
- */
-static VALUE
-curses_inch(VALUE obj)
-{
-    curses_stdscr();
-    return CH2FIX(inch());
-}
-
-/*
- * Document-method: Curses.addch
- * call-seq: addch(ch)
- *
- * Add a character +ch+, with attributes, then advance the cursor.
- *
- * see also the system manual for curs_addch(3)
- */
-static VALUE
-curses_addch(VALUE obj, VALUE ch)
-{
-    curses_stdscr();
-    addch(NUM2CH(ch));
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.insch
- * call-seq: insch(ch)
- *
- * Insert a character +ch+, before the cursor.
- *
- */
-static VALUE
-curses_insch(VALUE obj, VALUE ch)
-{
-    curses_stdscr();
-    insch(NUM2CH(ch));
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.addstr
- * call-seq: addstr(str)
- *
- * add a string of characters +str+, to the window and advance cursor
- *
- */
-static VALUE
-curses_addstr(VALUE obj, VALUE str)
-{
-    StringValue(str);
-    str = rb_str_export_locale(str);
-    curses_stdscr();
-    if (!NIL_P(str)) {
-	addstr(StringValueCStr(str));
-    }
-    return Qnil;
-}
-
-static VALUE
-getch_func(void *arg)
-{
-    int *ip = (int *)arg;
-    *ip = getch();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.getch
- *
- * Read and returns a character from the window.
- *
- * See Curses::Key to all the function KEY_* available
- *
- */
-static VALUE
-curses_getch(VALUE obj)
-{
-    int c;
-
-    curses_stdscr();
-    rb_thread_blocking_region(getch_func, (void *)&c, RUBY_UBF_IO, 0);
-    if (c == EOF) return Qnil;
-    if (rb_isprint(c)) {
-	char ch = (char)c;
-
-	return rb_locale_str_new(&ch, 1);
-    }
-    return UINT2NUM(c);
-}
-
-/* This should be big enough.. I hope */
-#define GETSTR_BUF_SIZE 1024
-
-static VALUE
-getstr_func(void *arg)
-{
-    char *rtn = (char *)arg;
-#if defined(HAVE_GETNSTR)
-    getnstr(rtn,GETSTR_BUF_SIZE-1);
-#else
-    getstr(rtn);
-#endif
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.getstr
- *
- * This is equivalent to a series f Curses::Window.getch calls
- *
- */
-static VALUE
-curses_getstr(VALUE obj)
-{
-    char rtn[GETSTR_BUF_SIZE];
-
-    curses_stdscr();
-    rb_thread_blocking_region(getstr_func, (void *)rtn, RUBY_UBF_IO, 0);
-    return rb_locale_str_new_cstr(rtn);
-}
-
-/*
- * Document-method: Curses.delch
- *
- * Delete the character under the cursor
- *
- */
-static VALUE
-curses_delch(VALUE obj)
-{
-    curses_stdscr();
-    delch();
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.deleteln
- *
- * Delete the line under the cursor.
- *
- */
-static VALUE
-curses_deleteln(VALUE obj)
-{
-    curses_stdscr();
-#if defined(HAVE_DELETELN) || defined(deleteln)
-    deleteln();
-#endif
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.insertln
- *
- * Inserts a line above the cursor, and the bottom line is lost
- *
- */
-static VALUE
-curses_insertln(VALUE obj)
-{
-    curses_stdscr();
-#if defined(HAVE_INSERTLN) || defined(insertln)
-    insertln();
-#endif
-    return Qnil;
-}
-
-/*
- * Document-method: Curses.keyname
- * call-seq: keyname(c)
- *
- * Returns the character string corresponding to key +c+
- */
-static VALUE
-curses_keyname(VALUE obj, VALUE c)
-{
-#ifdef HAVE_KEYNAME
-    int cc = curses_char(c);
-    const char *name;
-
-    curses_stdscr();
-    name = keyname(cc);
-    if (name) {
-	return rb_str_new_cstr(name);
-    }
-    else {
-	return Qnil;
-    }
-#else
-    return Qnil;
-#endif
-}
-
-/*
- * Document-method: Curses.lines
- *
- * Returns the number of lines on the screen
- */
-static VALUE
-curses_lines(void)
-{
-    return INT2FIX(LINES);
-}
-
-/*
- * Document-method: Curses.cols
- *
- * Returns the number of columns on the screen
- */
-static VALUE
-curses_cols(void)
-{
-    return INT2FIX(COLS);
-}
-
-/*
- * Document-method: Curses.curs_set
- * call-seq: curs_set(visibility)
- *
- * Sets Cursor Visibility.
- * 0: invisible
- * 1: visible
- * 2: very visible
- */
-static VALUE
-curses_curs_set(VALUE obj, VALUE visibility)
-{
-#ifdef HAVE_CURS_SET
-    int n;
-    curses_stdscr();
-    return (n = curs_set(NUM2INT(visibility)) != ERR) ? INT2FIX(n) : Qnil;
-#else
-    return Qnil;
-#endif
-}
-
-/*
- * Document-method: Curses.scrl
- * call-seq: scrl(num)
- *
- * Scrolls the current window Fixnum +num+ lines.
- * The current cursor position is not changed.
- *
- * For positive +num+, it scrolls up.
- *
- * For negative +num+, it scrolls down.
- *
- */
-static VALUE
-curses_scrl(VALUE obj, VALUE n)
-{
-    /* may have to raise exception on ERR */
-#ifdef HAVE_SCRL
-    curses_stdscr();
-    return (scrl(NUM2INT(n)) == OK) ? Qtrue : Qfalse;
-#else
-    return Qfalse;
-#endif
-}
-
-/*
- * Document-method: Curses.setscrreg
- *
- * call-seq:
- *   setscrreg(top, bottom)
- *
- * Set a software scrolling region in a window.
- * +top+ and +bottom+ are lines numbers of the margin.
- *
- * If this option and Curses.scrollok are enabled, an attempt to move off
- * the bottom margin line causes all lines in the scrolling region
- * to scroll one line in the direction of the first line.
- * Only the text of the window is scrolled.
- *
- */
-static VALUE
-curses_setscrreg(VALUE obj, VALUE top, VALUE bottom)
-{
-    /* may have to raise exception on ERR */
-#ifdef HAVE_SETSCRREG
-    curses_stdscr();
-    return (setscrreg(NUM2INT(top), NUM2INT(bottom)) == OK) ? Qtrue : Qfalse;
-#else
-    return Qfalse;
-#endif
-}
-
-/*
- * Document-method: Curses.attroff
- * call-seq: attroff(attrs)
- *
- * Turns on the named attributes +attrs+ without affecting any others.
- *
- * See also Curses::Window.attrset for additional information.
- */
-static VALUE
-curses_attroff(VALUE obj, VALUE attrs)
-{
-    curses_stdscr();
-    return window_attroff(rb_stdscr,attrs);
-    /* return INT2FIX(attroff(NUM2INT(attrs))); */
-}
-
-/*
- * Document-method: Curses.attron
- * call-seq: attron(attrs)
- *
- * Turns off the named attributes +attrs+
- * without turning any other attributes on or off.
- *
- * See also Curses::Window.attrset for additional information.
- */
-static VALUE
-curses_attron(VALUE obj, VALUE attrs)
-{
-    curses_stdscr();
-    return window_attron(rb_stdscr,attrs);
-    /* return INT2FIX(attroff(NUM2INT(attrs))); */
-}
-
-/*
- * Document-method: Curses.attrset
- * call-seq: attrset(attrs)
- *
- * Sets the current attributes of the given window to +attrs+.
- *
- * see also Curses::Window.attrset
- *
- */
-static VALUE
-curses_attrset(VALUE obj, VALUE attrs)
-{
-    curses_stdscr();
-    return window_attrset(rb_stdscr,attrs);
-    /* return INT2FIX(attroff(NUM2INT(attrs))); */
-}
-
-/*
- * Document-method: Curses.bkgdset
- * call-seq: bkgdset(ch)
- *
- * Manipulate the background of the named window
- * with character Integer +ch+
- *
- * The background becomes a property of the character
- * and moves with the character through any scrolling
- * and insert/delete line/character operations.
- *
- * see also the system manual for curs_bkgd(3)
- */
-static VALUE
-curses_bkgdset(VALUE obj, VALUE ch)
-{
-#ifdef HAVE_BKGDSET
-    curses_stdscr();
-    bkgdset(NUM2CH(ch));
-#endif
-    return Qnil;
-}
-
-/*
- * call-seq: bkgd(ch)
- *
- * Window background manipulation routines.
- *
- * Set the background property of the current
- * and then apply the character Integer +ch+ setting
- * to every character position in that window.
- *
- * see also the system manual for curs_bkgd(3)
- */
-static VALUE
-curses_bkgd(VALUE obj, VALUE ch)
-{
-#ifdef HAVE_BKGD
-    curses_stdscr();
-    return (bkgd(NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
-#else
-    return Qfalse;
-#endif
-}
-
-#if defined(HAVE_USE_DEFAULT_COLORS)
-/*
- * tells the curses library to use terminal's default colors.
- *
- * see also the system manual for default_colors(3)
- */
-static VALUE
-curses_use_default_colors(VALUE obj)
-{
-    curses_stdscr();
-    use_default_colors();
-    return Qnil;
-}
-#else
-#define curses_use_default_colors rb_f_notimplement
-#endif
-
-#if defined(HAVE_TABSIZE)
-/*
- * Document-method: Curses.TABSIZE=
- * call-seq: TABSIZE=(value)
- *
- * Sets the TABSIZE to Integer +value+
- */
-static VALUE
-curses_tabsize_set(VALUE obj, VALUE val)
-{
-    TABSIZE = NUM2INT(val);
-    return INT2NUM(TABSIZE);
-}
-#else
-#define curses_tabsize_set rb_f_notimplement
-#endif
-
-#if defined(HAVE_TABSIZE)
-/*
- * Returns the number of positions in a tab.
- */
-static VALUE
-curses_tabsize_get(VALUE ojb)
-{
-    return INT2NUM(TABSIZE);
-}
-#else
-#define curses_tabsize_get rb_f_notimplement
-#endif
-
-#if defined(HAVE_ESCDELAY)
-/*
- * call-seq: Curses.ESCDELAY=(value)
- *
- * Sets the ESCDELAY to Integer +value+
- */
-static VALUE
-curses_escdelay_set(VALUE obj, VALUE val)
-{
-    ESCDELAY = NUM2INT(val);
-    return INT2NUM(ESCDELAY);
-}
-#else
-#define curses_escdelay_set rb_f_notimplement
-#endif
-
-#if defined(HAVE_ESCDELAY)
-/*
- * Returns the total time, in milliseconds, for which
- * curses will await a character sequence, e.g., a function key
- */
-static VALUE
-curses_escdelay_get(VALUE obj)
-{
-    return INT2NUM(ESCDELAY);
-}
-#else
-#define curses_escdelay_get rb_f_notimplement
-#endif
-
-/*
- * Document-method: Curses.resize
- * call-seq: resize(lines, cols)
- *
- * alias for Curses.resizeterm
- *
- */
-
-/*
- * Document-method: Curses.resizeterm
- * call-seq: resizeterm(lines, cols)
- *
- * Resize the current term to Fixnum +lines+ and Fixnum +cols+
- *
- */
-static VALUE
-curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
-{
-#if defined(HAVE_RESIZETERM)
-    curses_stdscr();
-    return (resizeterm(NUM2INT(lin),NUM2INT(col)) == OK) ? Qtrue : Qfalse;
-#else
-    return Qnil;
-#endif
-}
-
-#ifdef USE_COLOR
-/*
- * Document-method: Curses.start_color
- *
- * Initializes the color attributes, for terminals that support it.
- *
- * This must be called, in order to use color attributes.
- * It is good practice to call it just after Curses.init_screen
- */
-static VALUE
-curses_start_color(VALUE obj)
-{
-    /* may have to raise exception on ERR */
-    curses_stdscr();
-    return (start_color() == OK) ? Qtrue : Qfalse;
-}
-
-/*
- * Document-method: Curses.init_pair
- * call-seq: init_pair(pair, f, b)
- *
- * Changes the definition of a color-pair.
- *
- * It takes three arguments: the number of the color-pair to be changed +pair+,
- * the foreground color number +f+, and the background color number +b+.
- *
- * If the color-pair was previously initialized, the screen is
- * refreshed and all occurrences of that color-pair are changed
- * to the new definition.
- *
- */
-static VALUE
-curses_init_pair(VALUE obj, VALUE pair, VALUE f, VALUE b)
-{
-    /* may have to raise exception on ERR */
-    curses_stdscr();
-    return (init_pair(NUM2INT(pair),NUM2INT(f),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
-}
-
-/*
- * Document-method: Curses.init_color
- * call-seq: init_color(color, r, g, b)
- *
- * Changes the definition of a color. It takes four arguments:
- * * the number of the color to be changed, +color+
- * * the amount of red, +r+
- * * the amount of green, +g+
- * * the amount of blue, +b+
- *
- * The value of the first argument must be between 0 and  COLORS.
- * (See the section Colors for the default color index.)  Each
- * of the last three arguments must be a value between 0 and 1000.
- * When Curses.init_color is used, all occurrences of that color
- * on the screen immediately change to the new definition.
- */
-static VALUE
-curses_init_color(VALUE obj, VALUE color, VALUE r, VALUE g, VALUE b)
-{
-    /* may have to raise exception on ERR */
-    curses_stdscr();
-    return (init_color(NUM2INT(color),NUM2INT(r),
-		       NUM2INT(g),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
-}
-
-/*
- * Document-method: Curses.has_colors?
- *
- * Returns +true+ or +false+ depending on whether the terminal has color capbilities.
- */
-static VALUE
-curses_has_colors(VALUE obj)
-{
-    curses_stdscr();
-    return has_colors() ? Qtrue : Qfalse;
-}
-
-/*
- * Document-method: Curses.can_change_color?
- *
- * Returns +true+ or +false+ depending on whether the terminal can change color attributes
- */
-static VALUE
-curses_can_change_color(VALUE obj)
-{
-    curses_stdscr();
-    return can_change_color() ? Qtrue : Qfalse;
-}
-
-#if defined(HAVE_COLORS)
-/*
- * Document-method: Curses.color
- *
- * returns COLORS
- */
-static VALUE
-curses_colors(VALUE obj)
-{
-    return INT2FIX(COLORS);
-}
-#else
-#define curses_colors rb_f_notimplement
-#endif
-
-/*
- * Document-method: Curses.color_content
- * call-seq: color_content(color)
- *
- * Returns an 3 item Array of the RGB values in +color+
- */
-static VALUE
-curses_color_content(VALUE obj, VALUE color)
-{
-    short r,g,b;
-
-    curses_stdscr();
-    color_content(NUM2INT(color),&r,&g,&b);
-    return rb_ary_new3(3,INT2FIX(r),INT2FIX(g),INT2FIX(b));
-}
-
-
-#if defined(HAVE_COLOR_PAIRS)
-/*
- * Document-method: Curses.color_pairs
- *
- * Returns the COLOR_PAIRS available, if the curses library supports it.
- */
-static VALUE
-curses_color_pairs(VALUE obj)
-{
-    return INT2FIX(COLOR_PAIRS);
-}
-#else
-#define curses_color_pairs rb_f_notimplement
-#endif
-
-/*
- * Document-method: Curses.pair_content
- * call-seq: pair_content(pair)
- *
- * Returns a 2 item Array, with the foreground and
- * background color, in +pair+
- */
-static VALUE
-curses_pair_content(VALUE obj, VALUE pair)
-{
-    short f,b;
-
-    curses_stdscr();
-    pair_content(NUM2INT(pair),&f,&b);
-    return rb_ary_new3(2,INT2FIX(f),INT2FIX(b));
-}
-
-/*
- * Document-method: Curses.color_pair
- * call-seq: color_pair(attrs)
- *
- * Sets the color pair attributes to +attrs+.
- *
- * This should be equivalent to Curses.attrset(COLOR_PAIR(+attrs+))
- *
- * TODO: validate that equivalency
- */
-static VALUE
-curses_color_pair(VALUE obj, VALUE attrs)
-{
-    return INT2FIX(COLOR_PAIR(NUM2INT(attrs)));
-}
-
-/*
- * Document-method: Curses.pair_number
- * call-seq: pair_number(attrs)
- *
- * Returns the Fixnum color pair number of attributes +attrs+.
- */
-static VALUE
-curses_pair_number(VALUE obj, VALUE attrs)
-{
-    curses_stdscr();
-    return INT2FIX(PAIR_NUMBER(NUM2INT(attrs)));
-}
-#endif /* USE_COLOR */
-
-#ifdef USE_MOUSE
-struct mousedata {
-    MEVENT *mevent;
-};
-
-static void
-no_mevent(void)
-{
-    rb_raise(rb_eRuntimeError, "no such mouse event");
-}
-
-#define GetMOUSE(obj, data) do {\
-    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted mouse");\
-    Data_Get_Struct((obj), struct mousedata, (data));\
-    if ((data)->mevent == 0) no_mevent();\
-} while (0)
-
-static void
-curses_mousedata_free(struct mousedata *mdata)
-{
-    if (mdata->mevent)
-	xfree(mdata->mevent);
-}
-
-/*
- * Document-method: Curses.getmouse
- *
- * Returns coordinates of the mouse.
- *
- * This will read and pop the mouse event data off the queue
- *
- * See the BUTTON*, ALL_MOUSE_EVENTS and REPORT_MOUSE_POSITION constants, to examine the mask of the event
- */
-static VALUE
-curses_getmouse(VALUE obj)
-{
-    struct mousedata *mdata;
-    VALUE val;
-
-    curses_stdscr();
-    val = Data_Make_Struct(cMouseEvent,struct mousedata,
-			   0,curses_mousedata_free,mdata);
-    mdata->mevent = (MEVENT*)xmalloc(sizeof(MEVENT));
-    return (getmouse(mdata->mevent) == OK) ? val : Qnil;
-}
-
-/*
- * Document-method: Curses.ungetmouse
- *
- * It pushes a KEY_MOUSE event onto the input queue, and associates with that
- * event the given state data and screen-relative character-cell coordinates.
- *
- * The Curses.ungetmouse function behaves analogously to Curses.ungetch.
- */
-static VALUE
-curses_ungetmouse(VALUE obj, VALUE mevent)
-{
-    struct mousedata *mdata;
-
-    curses_stdscr();
-    GetMOUSE(mevent,mdata);
-    return (ungetmouse(mdata->mevent) == OK) ? Qtrue : Qfalse;
-}
-
-/*
- * Document-method: Curses.mouseinterval
- * call-seq: mouseinterval(interval)
- *
- * The Curses.mouseinterval function sets the maximum time
- * (in thousands of a second) that can elapse between press
- * and release events for them to be recognized as a click.
- *
- * Use Curses.mouseinterval(0) to disable click resolution.
- * This function returns the previous interval value.
- *
- * Use Curses.mouseinterval(-1) to obtain the interval without
- * altering it.
- *
- * The default is one sixth of a second.
- */
-static VALUE
-curses_mouseinterval(VALUE obj, VALUE interval)
-{
-    curses_stdscr();
-    return mouseinterval(NUM2INT(interval)) ? Qtrue : Qfalse;
-}
-
-/*
- * Document-method: Curses.mousemask
- * call-seq: mousemask(mask)
- *
- * Returns the +mask+ of the reportable events
- */
-static VALUE
-curses_mousemask(VALUE obj, VALUE mask)
-{
-    curses_stdscr();
-    return INT2NUM(mousemask(NUM2UINT(mask),NULL));
-}
-
-#define DEFINE_MOUSE_GET_MEMBER(func_name,mem) \
-static VALUE func_name (VALUE mouse) \
-{ \
-    struct mousedata *mdata; \
-    GetMOUSE(mouse, mdata); \
-    return (UINT2NUM(mdata->mevent -> mem)); \
-}
-
-/*
- * Document-method: Curses::MouseEvent.eid
- *
- * Returns the current mouse id
- */
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_id, id)
-/*
- * Document-method: Curses::MouseEvent.x
- *
- * Returns the current mouse's X coordinate
- */
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_x, x)
-/*
- * Document-method: Curses::MouseEvent.y
- *
- * Returns the current mouse's Y coordinate
- */
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_y, y)
-/*
- * Document-method: Curses::MouseEvent.z
- *
- * Returns the current mouse's Z coordinate
- */
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_z, z)
-/*
- * Document-method: Curses::MouseEvent.bstate
- *
- * Returns the current mouse's button state.  Use this with the button state
- * constants to determine which buttons were pressed.
- */
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_bstate, bstate)
-#undef define_curs_mouse_member
-#endif /* USE_MOUSE */
-
-#ifdef HAVE_TIMEOUT
-/*
- * Document-method: Curses.timeout=
- * call-seq: timeout=(delay)
- *
- * Sets block and non-blocking reads for the window.
- * - If delay is negative, blocking read is used (i.e., waits indefinitely for input).
- * - If delay is zero, then non-blocking read is used (i.e., read returns ERR if no input is waiting).
- * - If delay is positive, then read blocks for delay milliseconds, and returns ERR if there is still no input.
- *
- */
-static VALUE
-curses_timeout(VALUE obj, VALUE delay)
-{
-    curses_stdscr();
-    timeout(NUM2INT(delay));
-    return Qnil;
-}
-#else
-#define curses_timeout rb_f_notimplement
-#endif
-
-#ifdef HAVE_DEF_PROG_MODE
-/*
- * Document-method: Curses.def_prog_mode
- *
- * Save the current terminal modes as the "program"
- * state for use by the Curses.reset_prog_mode
- *
- * This is done automatically by Curses.init_screen
- */
-static VALUE
-curses_def_prog_mode(VALUE obj)
-{
-    curses_stdscr();
-    return def_prog_mode() == OK ? Qtrue : Qfalse;
-}
-#else
-#define curses_def_prog_mode rb_f_notimplement
-#endif
-
-#ifdef HAVE_RESET_PROG_MODE
-/*
- * Document-method: Curses.reset_prog_mode
- *
- * Reset the current terminal modes to the saved state
- * by the Curses.def_prog_mode
- *
- * This is done automatically by Curses.close_screen
- */
-static VALUE
-curses_reset_prog_mode(VALUE obj)
-{
-    curses_stdscr();
-    return reset_prog_mode() == OK ? Qtrue : Qfalse;
-}
-#else
-#define curses_reset_prog_mode rb_f_notimplement
-#endif
-
-/*-------------------------- class Window --------------------------*/
-
-/* returns a Curses::Window object */
-static VALUE
-window_s_allocate(VALUE class)
-{
-    struct windata *winp;
-
-    return Data_Make_Struct(class, struct windata, 0, free_window, winp);
-}
-
-/*
- * Document-method: Curses::Window.new
- * call-seq: new(height, width, top, left)
- *
- * Contruct a new Curses::Window with constraints of
- * +height+ lines, +width+ columns, begin at +top+ line, and begin +left+ most column.
- *
- * A new window using full screen is called as
- * 	Curses::Window.new(0,0,0,0)
- *
- */
-static VALUE
-window_initialize(VALUE obj, VALUE h, VALUE w, VALUE top, VALUE left)
-{
-    struct windata *winp;
-    WINDOW *window;
-
-    rb_secure(4);
-    curses_init_screen();
-    Data_Get_Struct(obj, struct windata, winp);
-    if (winp->window) delwin(winp->window);
-    window = newwin(NUM2INT(h), NUM2INT(w), NUM2INT(top), NUM2INT(left));
-    wclear(window);
-    winp->window = window;
-
-    return obj;
-}
-
-/*
- * Document-method: Curses::Window.subwin
- * call-seq: subwin(height, width, top, left)
- *
- * Contruct a new subwindow with constraints of
- * +height+ lines, +width+ columns, begin at +top+ line, and begin +left+ most column.
- *
- */
-static VALUE
-window_subwin(VALUE obj, VALUE height, VALUE width, VALUE top, VALUE left)
-{
-    struct windata *winp;
-    WINDOW *window;
-    VALUE win;
-    int h, w, t, l;
-
-    h = NUM2INT(height);
-    w = NUM2INT(width);
-    t = NUM2INT(top);
-    l = NUM2INT(left);
-    GetWINDOW(obj, winp);
-    window = subwin(winp->window, h, w, t, l);
-    win = prep_window(rb_obj_class(obj), window);
-
-    return win;
-}
-
-/*
- * Document-method: Curses::Window.close
- *
- * Deletes the window, and frees the memory
- */
-static VALUE
-window_close(VALUE obj)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    delwin(winp->window);
-    winp->window = 0;
-
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.clear
- *
- * Clear the window.
- */
-static VALUE
-window_clear(VALUE obj)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    wclear(winp->window);
-
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.clrtoeol
- *
- * Clear the window to the end of line, that the cursor is currently on.
- */
-static VALUE
-window_clrtoeol(VALUE obj)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    wclrtoeol(winp->window);
-
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.refresh
- *
- * Refreshes the windows and lines.
- *
- */
-static VALUE
-window_refresh(VALUE obj)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    wrefresh(winp->window);
-
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.noutrefresh
- *
- * Refreshes the windows and lines.
- *
- * Curses::Window.noutrefresh allows multiple updates with
- * more efficiency than Curses::Window.refresh alone.
- */
-static VALUE
-window_noutrefresh(VALUE obj)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-#ifdef HAVE_DOUPDATE
-    wnoutrefresh(winp->window);
-#else
-    wrefresh(winp->window);
-#endif
-
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.move
- * call-seq: move(y,x)
- *
- * Moves the window so that the upper left-hand corner is at position (+y+, +x+)
- */
-static VALUE
-window_move(VALUE obj, VALUE y, VALUE x)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    mvwin(winp->window, NUM2INT(y), NUM2INT(x));
-
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.setpos
- * call-seq: setpos(y, x)
- *
- * A setter for the position of the cursor
- * in the current window,
- * using coordinates +x+ and +y+
- *
- */
-static VALUE
-window_setpos(VALUE obj, VALUE y, VALUE x)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    wmove(winp->window, NUM2INT(y), NUM2INT(x));
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.cury
- *
- * A getter for the current line (Y coord) of the window
- */
-static VALUE
-window_cury(VALUE obj)
-{
-    struct windata *winp;
-    int x, y;
-
-    GetWINDOW(obj, winp);
-    getyx(winp->window, y, x);
-    return INT2FIX(y);
-}
-
-/*
- * Document-method: Curses::Window.curx
- *
- * A getter for the current column (X coord) of the window
- */
-static VALUE
-window_curx(VALUE obj)
-{
-    struct windata *winp;
-    int x, y;
-
-    GetWINDOW(obj, winp);
-    getyx(winp->window, y, x);
-    return INT2FIX(x);
-}
-
-/*
- * Document-method: Curses::Window.maxy
- *
- * A getter for the maximum lines for the window
- */
-static VALUE
-window_maxy(VALUE obj)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-#if defined(getmaxy)
-    return INT2FIX(getmaxy(winp->window));
-#elif defined(getmaxyx)
-    {
-	int x, y;
-	getmaxyx(winp->window, y, x);
-	return INT2FIX(y);
-    }
-#else
-    return INT2FIX(winp->window->_maxy+1);
-#endif
-}
-
-/*
- * Document-method: Curses::Window.maxx
- *
- * A getter for the maximum columns for the window
- */
-static VALUE
-window_maxx(VALUE obj)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-#if defined(getmaxx)
-    return INT2FIX(getmaxx(winp->window));
-#elif defined(getmaxyx)
-    {
-	int x, y;
-	getmaxyx(winp->window, y, x);
-	return INT2FIX(x);
-    }
-#else
-    return INT2FIX(winp->window->_maxx+1);
-#endif
-}
-
-/*
- * Document-method: Curses::Window.begy
- *
- * A getter for the beginning line (Y coord) of the window
- */
-static VALUE
-window_begy(VALUE obj)
-{
-    struct windata *winp;
-    int x, y;
-
-    GetWINDOW(obj, winp);
-#ifdef getbegyx
-    getbegyx(winp->window, y, x);
-    return INT2FIX(y);
-#else
-    return INT2FIX(winp->window->_begy);
-#endif
-}
-
-/*
- * Document-method: Curses::Window.begx
- *
- * A getter for the beginning column (X coord) of the window
- */
-static VALUE
-window_begx(VALUE obj)
-{
-    struct windata *winp;
-    int x, y;
-
-    GetWINDOW(obj, winp);
-#ifdef getbegyx
-    getbegyx(winp->window, y, x);
-    return INT2FIX(x);
-#else
-    return INT2FIX(winp->window->_begx);
-#endif
-}
-
-/*
- * Document-method: Curses::Window.box
- * call-seq: box(vert, hor)
- *
- * set the characters to frame the window in.
- * The vertical +vert+ and horizontal +hor+ character.
- *
- * 	win = Curses::Window.new(5,5,5,5)
- * 	win.box(?|, ?-)
- *
- */
-static VALUE
-window_box(int argc, VALUE *argv, VALUE self)
-{
-    struct windata *winp;
-    VALUE vert, hor, corn;
-
-    rb_scan_args(argc, argv, "21", &vert, &hor, &corn);
-
-    GetWINDOW(self, winp);
-    box(winp->window, NUM2CH(vert), NUM2CH(hor));
-
-    if (!NIL_P(corn)) {
-	int cur_x, cur_y, x, y;
-	chtype c;
-
-	c = NUM2CH(corn);
-	getyx(winp->window, cur_y, cur_x);
-	x = NUM2INT(window_maxx(self)) - 1;
-	y = NUM2INT(window_maxy(self)) - 1;
-	wmove(winp->window, 0, 0);
-	waddch(winp->window, c);
-	wmove(winp->window, y, 0);
-	waddch(winp->window, c);
-	wmove(winp->window, y, x);
-	waddch(winp->window, c);
-	wmove(winp->window, 0, x);
-	waddch(winp->window, c);
-	wmove(winp->window, cur_y, cur_x);
-    }
-
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.standout
- *
- * Enables the best highlighting mode of the terminal.
- *
- * This is equivalent to Curses::Window.attron(A_STANDOUT)
- *
- * see also Curses::Window.attrset
- */
-static VALUE
-window_standout(VALUE obj)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    wstandout(winp->window);
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.standend
- *
- * Enables the Normal display (no highlight)
- *
- * This is equivalent to Curses::Window.attron(A_NORMAL)
- *
- * see also Curses::Window.attrset
- */
-static VALUE
-window_standend(VALUE obj)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    wstandend(winp->window);
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.inch
- *
- * Returns the character at the current position of the window.
- */
-static VALUE
-window_inch(VALUE obj)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    return CH2FIX(winch(winp->window));
-}
-
-/*
- * Document-method: Curses::Window.addch
- * call-seq: addch(ch)
- *
- * Add a character +ch+, with attributes, to the window, then advance the cursor.
- *
- * see also the system manual for curs_addch(3)
- */
-static VALUE
-window_addch(VALUE obj, VALUE ch)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    waddch(winp->window, NUM2CH(ch));
-
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.insch
- * call-seq: insch(ch)
- *
- * Insert a character +ch+, before the cursor, in the current window
- *
- */
-static VALUE
-window_insch(VALUE obj, VALUE ch)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    winsch(winp->window, NUM2CH(ch));
-
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.addstr
- * call-seq: addstr(str)
- *
- * add a string of characters +str+, to the window and advance cursor
- *
- */
-static VALUE
-window_addstr(VALUE obj, VALUE str)
-{
-    if (!NIL_P(str)) {
-	struct windata *winp;
-
-	StringValue(str);
-	str = rb_str_export_locale(str);
-	GetWINDOW(obj, winp);
-	waddstr(winp->window, StringValueCStr(str));
-    }
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.<<
- *
- * call-seq:
- *   <<(str)
- *
- * Add String +str+ to the current string.
- *
- * See also Curses::Window.addstr
- */
-static VALUE
-window_addstr2(VALUE obj, VALUE str)
-{
-    window_addstr(obj, str);
-    return obj;
-}
-
-struct wgetch_arg {
-    WINDOW *win;
-    int c;
-};
-
-static VALUE
-wgetch_func(void *_arg)
-{
-    struct wgetch_arg *arg = (struct wgetch_arg *)_arg;
-    arg->c = wgetch(arg->win);
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.getch
- *
- * Read and returns a character from the window.
- *
- * See Curses::Key to all the function KEY_* available
- *
- */
-static VALUE
-window_getch(VALUE obj)
-{
-    struct windata *winp;
-    struct wgetch_arg arg;
-    int c;
-
-    GetWINDOW(obj, winp);
-    arg.win = winp->window;
-    rb_thread_blocking_region(wgetch_func, (void *)&arg, RUBY_UBF_IO, 0);
-    c = arg.c;
-    if (c == EOF) return Qnil;
-    if (rb_isprint(c)) {
-	char ch = (char)c;
-
-	return rb_locale_str_new(&ch, 1);
-    }
-    return UINT2NUM(c);
-}
-
-struct wgetstr_arg {
-    WINDOW *win;
-    char rtn[GETSTR_BUF_SIZE];
-};
-
-static VALUE
-wgetstr_func(void *_arg)
-{
-    struct wgetstr_arg *arg = (struct wgetstr_arg *)_arg;
-#if defined(HAVE_WGETNSTR)
-    wgetnstr(arg->win, arg->rtn, GETSTR_BUF_SIZE-1);
-#else
-    wgetstr(arg->win, arg->rtn);
-#endif
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.getstr
- *
- * This is equivalent to a series f Curses::Window.getch calls
- *
- */
-static VALUE
-window_getstr(VALUE obj)
-{
-    struct windata *winp;
-    struct wgetstr_arg arg;
-
-    GetWINDOW(obj, winp);
-    arg.win = winp->window;
-    rb_thread_blocking_region(wgetstr_func, (void *)&arg, RUBY_UBF_IO, 0);
-    return rb_locale_str_new_cstr(arg.rtn);
-}
-
-/*
- * Document-method: Curses::Window.delch
- *
- * Delete the character under the cursor
- *
- */
-static VALUE
-window_delch(VALUE obj)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    wdelch(winp->window);
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.deleteln
- *
- * Delete the line under the cursor.
- *
- */
-static VALUE
-window_deleteln(VALUE obj)
-{
-#if defined(HAVE_WDELETELN) || defined(wdeleteln)
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    wdeleteln(winp->window);
-#endif
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.insertln
- *
- * Inserts a line above the cursor, and the bottom line is lost
- *
- */
-static VALUE
-window_insertln(VALUE obj)
-{
-#if defined(HAVE_WINSERTLN) || defined(winsertln)
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    winsertln(winp->window);
-#endif
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.scrollok
- * call-seq: scrollok(bool)
- *
- * Controls what happens when the cursor of a window
- * is moved off the edge of the window or scrolling region,
- * either as a result of a newline action on the bottom line,
- * or typing the last character of the last line.
- *
- * If disabled, (+bool+ is false), the cursor is left on the bottom line.
- *
- * If enabled, (+bool+ is true), the window is scrolled up one line
- * (Note that to get the physical scrolling effect on the terminal,
- * it is also necessary to call Curses::Window.idlok)
- */
-static VALUE
-window_scrollok(VALUE obj, VALUE bf)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    scrollok(winp->window, RTEST(bf) ? TRUE : FALSE);
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.idlok
- * call-seq: idlok(bool)
- *
- * If +bool+ is +true+ curses considers using the hardware insert/delete
- * line feature of terminals so equipped.
- *
- * If +bool+ is +false+, disables use of line insertion and deletion.
- * This option should be enabled only if the application needs insert/delete
- * line, for example, for a screen editor.
- *
- * It is disabled by default because insert/delete line tends to be visually
- * annoying when used in applications where it is not really needed.
- * If insert/delete line cannot be used, curses redraws the changed portions of all lines.
- *
- */
-static VALUE
-window_idlok(VALUE obj, VALUE bf)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    idlok(winp->window, RTEST(bf) ? TRUE : FALSE);
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.setscrreg
- * call-seq:
- *   setscrreg(top, bottom)
- *
- * Set a software scrolling region in a window.
- * +top+ and +bottom+ are lines numbers of the margin.
- *
- * If this option and Curses::Window.scrollok are enabled, an attempt to move
- * off the bottom margin line causes all lines in the scrolling region to
- * scroll one line in the direction of the first line.  Only the text of the
- * window is scrolled.
- *
- */
-static VALUE
-window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
-{
-#ifdef HAVE_WSETSCRREG
-    struct windata *winp;
-    int res;
-
-    GetWINDOW(obj, winp);
-    res = wsetscrreg(winp->window, NUM2INT(top), NUM2INT(bottom));
-    /* may have to raise exception on ERR */
-    return (res == OK) ? Qtrue : Qfalse;
-#else
-    return Qfalse;
-#endif
-}
-
-#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
-/*
- * Document-method: Curses::Window.color_set
- * call-seq: color_set(col)
- *
- * Sets the current color of the given window to the
- * foreground/background combination described by the Fixnum +col+.
- */
-static VALUE
-window_color_set(VALUE obj, VALUE col)
-{
-    struct windata *winp;
-    int res;
-
-    GetWINDOW(obj, winp);
-    res = wcolor_set(winp->window, NUM2INT(col), NULL);
-    return (res == OK) ? Qtrue : Qfalse;
-}
-#endif /* defined(USE_COLOR) && defined(HAVE_WCOLOR_SET) */
-
-/*
- * Document-method: Curses::Window.scroll
- *
- * Scrolls the current window up one line.
- */
-static VALUE
-window_scroll(VALUE obj)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    /* may have to raise exception on ERR */
-    return (scroll(winp->window) == OK) ? Qtrue : Qfalse;
-}
-
-/*
- * Document-method: Curses::Window.scrl
- * call-seq: scrl(num)
- *
- * Scrolls the current window Fixnum +num+ lines.
- * The current cursor position is not changed.
- *
- * For positive +num+, it scrolls up.
- *
- * For negative +num+, it scrolls down.
- *
- */
-static VALUE
-window_scrl(VALUE obj, VALUE n)
-{
-#ifdef HAVE_WSCRL
-    struct windata *winp;
-
-    GetWINDOW(obj, winp);
-    /* may have to raise exception on ERR */
-    return (wscrl(winp->window,NUM2INT(n)) == OK) ? Qtrue : Qfalse;
-#else
-    return Qfalse;
-#endif
-}
-
-/*
- * Document-method: Curses::Window.attroff
- * call-seq: attroff(attrs)
- *
- * Turns on the named attributes +attrs+ without affecting any others.
- *
- * See also Curses::Window.attrset
- */
-static VALUE
-window_attroff(VALUE obj, VALUE attrs)
-{
-#ifdef HAVE_WATTROFF
-    struct windata *winp;
-
-    GetWINDOW(obj,winp);
-    return INT2FIX(wattroff(winp->window,NUM2INT(attrs)));
-#else
-    return Qtrue;
-#endif
-}
-
-/*
- * Document-method: Curses::Window.attron
- * call-seq: attron(attrs)
- *
- * Turns off the named attributes +attrs+
- * without turning any other attributes on or off.
- *
- * See also Curses::Window.attrset
- */
-static VALUE
-window_attron(VALUE obj, VALUE attrs)
-{
-#ifdef HAVE_WATTRON
-    struct windata *winp;
-    VALUE val;
-
-    GetWINDOW(obj,winp);
-    val = INT2FIX(wattron(winp->window,NUM2INT(attrs)));
-    if (rb_block_given_p()) {
-	rb_yield(val);
-	wattroff(winp->window,NUM2INT(attrs));
-	return val;
-    }
-    else{
-	return val;
-    }
-#else
-    return Qtrue;
-#endif
-}
-
-/*
- * Document-method: Curses::Window.attrset
- * call-seq: attrset(attrs)
- *
- * Sets the current attributes of the given window to +attrs+.
- *
- * The following video attributes, defined in <curses.h>, can
- * be passed to the routines Curses::Window.attron, Curses::Window.attroff,
- * and Curses::Window.attrset, or OR'd with the characters passed to addch.
- *   A_NORMAL        Normal display (no highlight)
- *   A_STANDOUT      Best highlighting mode of the terminal.
- *   A_UNDERLINE     Underlining
- *   A_REVERSE       Reverse video
- *   A_BLINK         Blinking
- *   A_DIM           Half bright
- *   A_BOLD          Extra bright or bold
- *   A_PROTECT       Protected mode
- *   A_INVIS         Invisible or blank mode
- *   A_ALTCHARSET    Alternate character set
- *   A_CHARTEXT      Bit-mask to extract a character
- *   COLOR_PAIR(n)   Color-pair number n
- *
- * TODO: provide some examples here.
- *
- * see also system manual curs_attr(3)
- */
-static VALUE
-window_attrset(VALUE obj, VALUE attrs)
-{
-#ifdef HAVE_WATTRSET
-    struct windata *winp;
-
-    GetWINDOW(obj,winp);
-    return INT2FIX(wattrset(winp->window,NUM2INT(attrs)));
-#else
-    return Qtrue;
-#endif
-}
-
-/*
- * Document-method: Curses::Window.bkgdset
- * call-seq: bkgdset(ch)
- *
- * Manipulate the background of the current window
- * with character Integer +ch+
- *
- * see also Curses.bkgdset
- */
-static VALUE
-window_bkgdset(VALUE obj, VALUE ch)
-{
-#ifdef HAVE_WBKGDSET
-    struct windata *winp;
-
-    GetWINDOW(obj,winp);
-    wbkgdset(winp->window, NUM2CH(ch));
-#endif
-    return Qnil;
-}
-
-/*
- * Document-method: Curses::Window.bkgd
- * call-seq: bkgd(ch)
- *
- * Set the background of the current window
- * and apply character Integer +ch+ to every character.
- *
- * see also Curses.bkgd
- */
-static VALUE
-window_bkgd(VALUE obj, VALUE ch)
-{
-#ifdef HAVE_WBKGD
-    struct windata *winp;
-
-    GetWINDOW(obj,winp);
-    return (wbkgd(winp->window, NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
-#else
-    return Qfalse;
-#endif
-}
-
-/*
- * Document-method: Curses::Window.getbkgd
- *
- * Returns an Interer (+ch+) for the character property in the current window.
- */
-static VALUE
-window_getbkgd(VALUE obj)
-{
-#ifdef HAVE_WGETBKGD
-    chtype c;
-    struct windata *winp;
-
-    GetWINDOW(obj,winp);
-    return (c = getbkgd(winp->window) != ERR) ? CH2FIX(c) : Qnil;
-#else
-    return Qnil;
-#endif
-}
-
-/*
- * Document-method: Curses::Window.resize
- * call-seq: resize(lines, cols)
- *
- * Resize the current window to Fixnum +lines+ and Fixnum +cols+
- *
- */
-static VALUE
-window_resize(VALUE obj, VALUE lin, VALUE col)
-{
-#if defined(HAVE_WRESIZE)
-    struct windata *winp;
-
-    GetWINDOW(obj,winp);
-    return wresize(winp->window, NUM2INT(lin), NUM2INT(col)) == OK ? Qtrue : Qfalse;
-#else
-    return Qnil;
-#endif
-}
-
-
-#ifdef HAVE_KEYPAD
-/*
- * Document-method: Curses::Window.keypad=
- * call-seq:
- *   keypad=(bool)
- *
- * See Curses::Window.keypad
- */
-
-/*
- * Document-method: Curses::Window.keypad
- * call-seq:
- *   keypad(bool)
- *
- * Enables the keypad of the user's terminal.
- *
- * If enabled (+bool+ is +true+), the user can press a function key
- * (such as an arrow key) and wgetch returns a single value representing
- * the function key, as in KEY_LEFT.  If disabled (+bool+ is +false+),
- * curses does not treat function keys specially and the program has to
- * interpret the escape sequences itself.  If the keypad in the terminal
- * can be turned on (made to transmit) and off (made to work locally),
- * turning on this option causes the terminal keypad to be turned on when
- * Curses::Window.getch is called.
- *
- * The default value for keypad is false.
- *
- */
-static VALUE
-window_keypad(VALUE obj, VALUE val)
-{
-    struct windata *winp;
-
-    GetWINDOW(obj,winp);
-    /* keypad() of NetBSD's libcurses returns no value */
-#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
-    keypad(winp->window,(RTEST(val) ? TRUE : FALSE));
-    return Qnil;
-#else
-    /* may have to raise exception on ERR */
-    return (keypad(winp->window,RTEST(val) ? TRUE : FALSE)) == OK ?
-	Qtrue : Qfalse;
-#endif
-}
-#else
-#define window_keypad rb_f_notimplement
-#endif
-
-#ifdef HAVE_NODELAY
-/*
- * Document-method: Curses::Window.nodelay
- * call-seq: nodelay(bool)
- *
- * Causes Curses::Window.getch to be a non-blocking call.  If no input is ready, getch returns ERR.
- *
- * If disabled (+bool+ is +false+), Curses::Window.getch waits until a key is pressed.
- *
- */
-static VALUE
-window_nodelay(VALUE obj, VALUE val)
-{
-    struct windata *winp;
-    GetWINDOW(obj,winp);
-
-    /* nodelay() of NetBSD's libcurses returns no value */
-#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
-    nodelay(winp->window, RTEST(val) ? TRUE : FALSE);
-    return Qnil;
-#else
-    return nodelay(winp->window,RTEST(val) ? TRUE : FALSE) == OK ? Qtrue : Qfalse;
-#endif
-}
-#else
-#define window_nodelay rb_f_notimplement
-#endif
-
-#ifdef HAVE_WTIMEOUT
-/*
- * Document-method: Curses::Window.timeout=
- * call-seq: timeout=(delay)
- *
- * Sets block and non-blocking reads for the window.
- * - If delay is negative, blocking read is used (i.e., waits indefinitely for input).
- * - If delay is zero, then non-blocking read is used (i.e., read returns ERR if no input is waiting).
- * - If delay is positive, then read blocks for delay milliseconds, and returns ERR if there is still no input.
- *
- */
-static VALUE
-window_timeout(VALUE obj, VALUE delay)
-{
-    struct windata *winp;
-    GetWINDOW(obj,winp);
-
-    wtimeout(winp->window,NUM2INT(delay));
-    return Qnil;
-}
-#else
-#define window_timeout rb_f_notimplement
-#endif
-
-/*------------------------- Initialization -------------------------*/
-
-/*
- * Document-module: Curses
- *
- * == Description
- * An implementation of the CRT screen handling and optimization library.
- *
- * == Structures and such
- *
- * === Classes
- *
- * * Curses::Window - class with the means to draw a window or box
- * * Curses::MouseEvent - class for collecting mouse events
- *
- * === Modules
- *
- * Curses:: The curses implementation
- * Curses::Key:: Collection of constants for keypress events
- *
- * == Examples
- *
- * * hello.rb
- *     :include: hello.rb
- *
- *
- * * rain.rb
- *     :include: rain.rb
- *
- *
- */
-void
-Init_curses(void)
-{
-    mCurses    = rb_define_module("Curses");
-
-    /*
-     * Document-module: Curses::Key
-     *
-     *
-     * a container for the KEY_* values.
-     *
-     * See also system manual for getch(3)
-     *
-     */
-    mKey       = rb_define_module_under(mCurses, "Key");
-
-    rb_gc_register_address(&rb_stdscr);
-
-#ifdef USE_MOUSE
-    /*
-     * Document-class: Curses::MouseEvent
-     *
-     * == Description
-     *
-     * Curses::MouseEvent
-     *
-     * == Example
-     *
-     * * mouse.rb
-     *     :include: mouse.rb
-     *
-     */
-    cMouseEvent = rb_define_class_under(mCurses,"MouseEvent",rb_cObject);
-    rb_undef_method(CLASS_OF(cMouseEvent),"new");
-    rb_define_method(cMouseEvent, "eid", curs_mouse_id, 0);
-    rb_define_method(cMouseEvent, "x", curs_mouse_x, 0);
-    rb_define_method(cMouseEvent, "y", curs_mouse_y, 0);
-    rb_define_method(cMouseEvent, "z", curs_mouse_z, 0);
-    rb_define_method(cMouseEvent, "bstate", curs_mouse_bstate, 0);
-#endif /* USE_MOUSE */
-
-    rb_define_module_function(mCurses, "ESCDELAY=", curses_escdelay_set, 1);
-    rb_define_module_function(mCurses, "ESCDELAY", curses_escdelay_get, 0);
-    rb_define_module_function(mCurses, "TABSIZE", curses_tabsize_get, 0);
-    rb_define_module_function(mCurses, "TABSIZE=", curses_tabsize_set, 1);
-
-    rb_define_module_function(mCurses, "use_default_colors", curses_use_default_colors, 0);
-    rb_define_module_function(mCurses, "init_screen", curses_init_screen, 0);
-    rb_define_module_function(mCurses, "close_screen", curses_close_screen, 0);
-    rb_define_module_function(mCurses, "closed?", curses_closed, 0);
-    rb_define_module_function(mCurses, "stdscr", curses_stdscr, 0);
-    rb_define_module_function(mCurses, "refresh", curses_refresh, 0);
-    rb_define_module_function(mCurses, "doupdate", curses_doupdate, 0);
-    rb_define_module_function(mCurses, "clear", curses_clear, 0);
-    rb_define_module_function(mCurses, "clrtoeol", curses_clrtoeol, 0);
-    rb_define_module_function(mCurses, "echo", curses_echo, 0);
-    rb_define_module_function(mCurses, "noecho", curses_noecho, 0);
-    rb_define_module_function(mCurses, "raw", curses_raw, 0);
-    rb_define_module_function(mCurses, "noraw", curses_noraw, 0);
-    rb_define_module_function(mCurses, "cbreak", curses_cbreak, 0);
-    rb_define_module_function(mCurses, "nocbreak", curses_nocbreak, 0);
-    rb_define_module_function(mCurses, "crmode", curses_nocbreak, 0);
-    rb_define_module_function(mCurses, "nocrmode", curses_nocbreak, 0);
-    rb_define_module_function(mCurses, "nl", curses_nl, 0);
-    rb_define_module_function(mCurses, "nonl", curses_nonl, 0);
-    rb_define_module_function(mCurses, "beep", curses_beep, 0);
-    rb_define_module_function(mCurses, "flash", curses_flash, 0);
-    rb_define_module_function(mCurses, "ungetch", curses_ungetch, 1);
-    rb_define_module_function(mCurses, "setpos", curses_setpos, 2);
-    rb_define_module_function(mCurses, "standout", curses_standout, 0);
-    rb_define_module_function(mCurses, "standend", curses_standend, 0);
-    rb_define_module_function(mCurses, "inch", curses_inch, 0);
-    rb_define_module_function(mCurses, "addch", curses_addch, 1);
-    rb_define_module_function(mCurses, "insch", curses_insch, 1);
-    rb_define_module_function(mCurses, "addstr", curses_addstr, 1);
-    rb_define_module_function(mCurses, "getch", curses_getch, 0);
-    rb_define_module_function(mCurses, "getstr", curses_getstr, 0);
-    rb_define_module_function(mCurses, "delch", curses_delch, 0);
-    rb_define_module_function(mCurses, "deleteln", curses_deleteln, 0);
-    rb_define_module_function(mCurses, "insertln", curses_insertln, 0);
-    rb_define_module_function(mCurses, "keyname", curses_keyname, 1);
-    rb_define_module_function(mCurses, "lines", curses_lines, 0);
-    rb_define_module_function(mCurses, "cols", curses_cols, 0);
-    rb_define_module_function(mCurses, "curs_set", curses_curs_set, 1);
-    rb_define_module_function(mCurses, "scrl", curses_scrl, 1);
-    rb_define_module_function(mCurses, "setscrreg", curses_setscrreg, 2);
-    rb_define_module_function(mCurses, "attroff", curses_attroff, 1);
-    rb_define_module_function(mCurses, "attron", curses_attron, 1);
-    rb_define_module_function(mCurses, "attrset", curses_attrset, 1);
-    rb_define_module_function(mCurses, "bkgdset", curses_bkgdset, 1);
-    rb_define_module_function(mCurses, "bkgd", curses_bkgd, 1);
-    rb_define_module_function(mCurses, "resizeterm", curses_resizeterm, 2);
-    rb_define_module_function(mCurses, "resize", curses_resizeterm, 2);
-#ifdef USE_COLOR
-    rb_define_module_function(mCurses, "start_color", curses_start_color, 0);
-    rb_define_module_function(mCurses, "init_pair", curses_init_pair, 3);
-    rb_define_module_function(mCurses, "init_color", curses_init_color, 4);
-    rb_define_module_function(mCurses, "has_colors?", curses_has_colors, 0);
-    rb_define_module_function(mCurses, "can_change_color?",
-			      curses_can_change_color, 0);
-    rb_define_module_function(mCurses, "colors", curses_colors, 0);
-    rb_define_module_function(mCurses, "color_content", curses_color_content, 1);
-    rb_define_module_function(mCurses, "color_pairs", curses_color_pairs, 0);
-    rb_define_module_function(mCurses, "pair_content", curses_pair_content, 1);
-    rb_define_module_function(mCurses, "color_pair", curses_color_pair, 1);
-    rb_define_module_function(mCurses, "pair_number", curses_pair_number, 1);
-#endif /* USE_COLOR */
-#ifdef USE_MOUSE
-    rb_define_module_function(mCurses, "getmouse", curses_getmouse, 0);
-    rb_define_module_function(mCurses, "ungetmouse", curses_ungetmouse, 1);
-    rb_define_module_function(mCurses, "mouseinterval", curses_mouseinterval, 1);
-    rb_define_module_function(mCurses, "mousemask", curses_mousemask, 1);
-#endif /* USE_MOUSE */
-
-    rb_define_module_function(mCurses, "timeout=", curses_timeout, 1);
-    rb_define_module_function(mCurses, "def_prog_mode", curses_def_prog_mode, 0);
-    rb_define_module_function(mCurses, "reset_prog_mode", curses_reset_prog_mode, 0);
-
-    /*
-     * Document-class: Curses::Window
-     *
-     * == Description
-     *
-     * The means by which to create and manage frames or windows.
-     * While there may be more than one window at a time, only one window
-     * will receive input.
-     *
-     * == Usage
-     *
-     *   require 'curses'
-     *
-     *   Curses.init_screen()
-     *
-     *   my_str = "LOOK! PONIES!"
-     *   win = Curses::Window.new( 8, (my_str.length + 10),
-     *                             (Curses.lines - 8) / 2,
-     *                             (Curses.cols - (my_str.length + 10)) / 2 )
-     *   win.box("|", "-")
-     *   win.setpos(2,3)
-     *   win.addstr(my_str)
-     *   # or even
-     *   win << "\nORLY"
-     *   win << "\nYES!! " + my_str
-     *   win.refresh
-     *   win.getch
-     *   win.close
-     *
-     */
-    cWindow = rb_define_class_under(mCurses, "Window", rb_cData);
-    rb_define_alloc_func(cWindow, window_s_allocate);
-    rb_define_method(cWindow, "initialize", window_initialize, 4);
-    rb_define_method(cWindow, "subwin", window_subwin, 4);
-    rb_define_method(cWindow, "close", window_close, 0);
-    rb_define_method(cWindow, "clear", window_clear, 0);
-    rb_define_method(cWindow, "clrtoeol", window_clrtoeol, 0);
-    rb_define_method(cWindow, "refresh", window_refresh, 0);
-    rb_define_method(cWindow, "noutrefresh", window_noutrefresh, 0);
-    rb_define_method(cWindow, "box", window_box, -1);
-    rb_define_method(cWindow, "move", window_move, 2);
-    rb_define_method(cWindow, "setpos", window_setpos, 2);
-#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
-    rb_define_method(cWindow, "color_set", window_color_set, 1);
-#endif /* USE_COLOR && HAVE_WCOLOR_SET */
-    rb_define_method(cWindow, "cury", window_cury, 0);
-    rb_define_method(cWindow, "curx", window_curx, 0);
-    rb_define_method(cWindow, "maxy", window_maxy, 0);
-    rb_define_method(cWindow, "maxx", window_maxx, 0);
-    rb_define_method(cWindow, "begy", window_begy, 0);
-    rb_define_method(cWindow, "begx", window_begx, 0);
-    rb_define_method(cWindow, "standout", window_standout, 0);
-    rb_define_method(cWindow, "standend", window_standend, 0);
-    rb_define_method(cWindow, "inch", window_inch, 0);
-    rb_define_method(cWindow, "addch", window_addch, 1);
-    rb_define_method(cWindow, "insch", window_insch, 1);
-    rb_define_method(cWindow, "addstr", window_addstr, 1);
-    rb_define_method(cWindow, "<<", window_addstr2, 1);
-    rb_define_method(cWindow, "getch", window_getch, 0);
-    rb_define_method(cWindow, "getstr", window_getstr, 0);
-    rb_define_method(cWindow, "delch", window_delch, 0);
-    rb_define_method(cWindow, "deleteln", window_deleteln, 0);
-    rb_define_method(cWindow, "insertln", window_insertln, 0);
-    rb_define_method(cWindow, "scroll", window_scroll, 0);
-    rb_define_method(cWindow, "scrollok", window_scrollok, 1);
-    rb_define_method(cWindow, "idlok", window_idlok, 1);
-    rb_define_method(cWindow, "setscrreg", window_setscrreg, 2);
-    rb_define_method(cWindow, "scrl", window_scrl, 1);
-    rb_define_method(cWindow, "resize", window_resize, 2);
-    rb_define_method(cWindow, "keypad", window_keypad, 1);
-    rb_define_method(cWindow, "keypad=", window_keypad, 1);
-
-    rb_define_method(cWindow, "attroff", window_attroff, 1);
-    rb_define_method(cWindow, "attron", window_attron, 1);
-    rb_define_method(cWindow, "attrset", window_attrset, 1);
-    rb_define_method(cWindow, "bkgdset", window_bkgdset, 1);
-    rb_define_method(cWindow, "bkgd", window_bkgd, 1);
-    rb_define_method(cWindow, "getbkgd", window_getbkgd, 0);
-
-    rb_define_method(cWindow, "nodelay=", window_nodelay, 1);
-    rb_define_method(cWindow, "timeout=", window_timeout, 1);
-
-#define rb_curses_define_const(c) rb_define_const(mCurses,#c,UINT2NUM(c))
-
-#ifdef USE_COLOR
-    /* Document-const: A_ATTRIBUTES
-     *
-     * Character attribute mask:
-     * Bit-mask to extract attributes
-     *
-     * See Curses.inch or Curses::Window.inch
-     */
-    rb_curses_define_const(A_ATTRIBUTES);
-#ifdef A_NORMAL
-    /* Document-const: A_NORMAL
-     *
-     * Attribute mask:
-     * Normal display (no highlight)
-     *
-     * See Curses.attrset
-     */
-    rb_curses_define_const(A_NORMAL);
-#endif
-    /* Document-const: A_STANDOUT
-     *
-     * Attribute mask:
-     * Best highlighting mode of the terminal.
-     *
-     * See Curses.attrset
-     */
-    rb_curses_define_const(A_STANDOUT);
-    /* Document-const: A_UNDERLINE
-     *
-     * Attribute mask:
-     * Underlining
-     *
-     * See Curses.attrset
-     */
-    rb_curses_define_const(A_UNDERLINE);
-    /* Document-const: A_REVERSE
-     *
-     * Attribute mask:
-     * Reverse video
-     *
-     * See Curses.attrset
-     */
-    rb_curses_define_const(A_REVERSE);
-    /* Document-const: A_BLINK
-     *
-     * Attribute mask:
-     * Blinking
-     *
-     * See Curses.attrset
-     */
-    rb_curses_define_const(A_BLINK);
-    /* Document-const: A_DIM
-     *
-     * Attribute mask:
-     * Half bright
-     *
-     * See Curses.attrset
-     */
-    rb_curses_define_const(A_DIM);
-    /* Document-const: A_BOLD
-     *
-     * Attribute mask:
-     * Extra bright or bold
-     *
-     * See Curses.attrset
-     */
-    rb_curses_define_const(A_BOLD);
-    /* Document-const: A_PROTECT
-     *
-     * Attribute mask:
-     * Protected mode
-     *
-     * See Curses.attrset
-     */
-    rb_curses_define_const(A_PROTECT);
-#ifdef A_INVIS /* for NetBSD */
-    /* Document-const: A_INVIS
-     *
-     * Attribute mask:
-     * Invisible or blank mode
-     *
-     * See Curses.attrset
-     */
-    rb_curses_define_const(A_INVIS);
-#endif
-    /* Document-const: A_ALTCHARSET
-     *
-     * Attribute mask:
-     * Alternate character set
-     *
-     * See Curses.attrset
-     */
-    rb_curses_define_const(A_ALTCHARSET);
-    /* Document-const: A_CHARTEXT
-     *
-     * Attribute mask:
-     * Bit-mask to extract a character
-     *
-     * See Curses.attrset
-     */
-    rb_curses_define_const(A_CHARTEXT);
-#ifdef A_HORIZONTAL
-    /* Document-const: A_HORIZONTAL
-     *
-     * Attribute mask:
-     * horizontal highlight
-     *
-     * Check system curs_attr(3x) for support
-     */
-    rb_curses_define_const(A_HORIZONTAL);
-#endif
-#ifdef A_LEFT
-    /* Document-const: A_LEFT
-     *
-     * Attribute mask:
-     * left highlight
-     *
-     * Check system curs_attr(3x) for support
-     */
-    rb_curses_define_const(A_LEFT);
-#endif
-#ifdef A_LOW
-    /* Document-const: A_LOW
-     *
-     * Attribute mask:
-     * low highlight
-     *
-     * Check system curs_attr(3x) for support
-     */
-    rb_curses_define_const(A_LOW);
-#endif
-#ifdef A_RIGHT
-    /* Document-const: A_RIGHT
-     *
-     * Attribute mask:
-     * right highlight
-     *
-     * Check system curs_attr(3x) for support
-     */
-    rb_curses_define_const(A_RIGHT);
-#endif
-#ifdef A_TOP
-    /* Document-const: A_TOP
-     *
-     * Attribute mask:
-     * top highlight
-     *
-     * Check system curs_attr(3x) for support
-     */
-    rb_curses_define_const(A_TOP);
-#endif
-#ifdef A_VERTICAL
-    /* Document-const: A_VERTICAL
-     *
-     * Attribute mask:
-     * vertical highlight
-     *
-     * Check system curs_attr(3x) for support
-     */
-    rb_curses_define_const(A_VERTICAL);
-#endif
-    /* Document-const: A_COLOR
-     *
-     * Character attribute mask:
-     * Bit-mask to extract color-pair field information
-     *
-     * See Curses.inch or Curses::Window.inch
-     */
-    rb_curses_define_const(A_COLOR);
-
-#ifdef COLORS
-    /*
-     * Document-const: Curses::COLORS
-     *
-     * Number of the colors available
-     */
-    rb_curses_define_const(COLORS);
-#endif
-    /*
-     * Document-const: Curses::COLOR_BLACK
-     *
-     * Value of the color black
-     */
-    rb_curses_define_const(COLOR_BLACK);
-    /*
-     * Document-const: COLOR_RED
-     *
-     * Value of the color red
-     */
-    rb_curses_define_const(COLOR_RED);
-    /*
-     * Document-const: COLOR_GREEN
-     *
-     * Value of the color green
-     */
-    rb_curses_define_const(COLOR_GREEN);
-    /*
-     * Document-const: COLOR_YELLOW
-     *
-     * Value of the color yellow
-     */
-    rb_curses_define_const(COLOR_YELLOW);
-    /*
-     * Document-const: COLOR_BLUE
-     *
-     * Value of the color blue
-     */
-    rb_curses_define_const(COLOR_BLUE);
-    /*
-     * Document-const: COLOR_MAGENTA
-     *
-     * Value of the color magenta
-     */
-    rb_curses_define_const(COLOR_MAGENTA);
-    /*
-     * Document-const: COLOR_CYAN
-     *
-     * Value of the color cyan
-     */
-    rb_curses_define_const(COLOR_CYAN);
-    /*
-     * Document-const: COLOR_WHITE
-     *
-     * Value of the color white
-     */
-    rb_curses_define_const(COLOR_WHITE);
-#endif /* USE_COLOR */
-#ifdef USE_MOUSE
-#ifdef BUTTON1_PRESSED
-    /* Document-const: BUTTON1_PRESSED
-     *
-     * Mouse event mask:
-     * mouse button 1 down
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON1_PRESSED);
-#endif
-#ifdef BUTTON1_RELEASED
-    /* Document-const: BUTTON1_RELEASED
-     *
-     * Mouse event mask:
-     * mouse button 1 up
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON1_RELEASED);
-#endif
-#ifdef BUTTON1_CLICKED
-    /* Document-const: BUTTON1_CLICKED
-     *
-     * Mouse event mask:
-     * mouse button 1 clicked
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON1_CLICKED);
-#endif
-#ifdef BUTTON1_DOUBLE_CLICKED
-    /* Document-const: BUTTON1_DOUBLE_CLICKED
-     *
-     * Mouse event mask:
-     * mouse button 1 double clicked
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON1_DOUBLE_CLICKED);
-#endif
-#ifdef BUTTON1_TRIPLE_CLICKED
-    /* Document-const: BUTTON1_TRIPLE_CLICKED
-     *
-     * Mouse event mask:
-     * mouse button 1 triple clicked
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON1_TRIPLE_CLICKED);
-#endif
-#ifdef BUTTON2_PRESSED
-    /* Document-const: BUTTON2_PRESSED
-     *
-     * Mouse event mask:
-     * mouse button 2 down
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON2_PRESSED);
-#endif
-#ifdef BUTTON2_RELEASED
-    /* Document-const: BUTTON2_RELEASED
-     *
-     * Mouse event mask:
-     * mouse button 2 up
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON2_RELEASED);
-#endif
-#ifdef BUTTON2_CLICKED
-    /* Document-const: BUTTON2_CLICKED
-     *
-     * Mouse event mask:
-     * mouse button 2 clicked
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON2_CLICKED);
-#endif
-#ifdef BUTTON2_DOUBLE_CLICKED
-    /* Document-const: BUTTON2_DOUBLE_CLICKED
-     *
-     * Mouse event mask:
-     * mouse button 2 double clicked
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON2_DOUBLE_CLICKED);
-#endif
-#ifdef BUTTON2_TRIPLE_CLICKED
-    /* Document-const: BUTTON2_TRIPLE_CLICKED
-     *
-     * Mouse event mask:
-     * mouse button 2 triple clicked
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON2_TRIPLE_CLICKED);
-#endif
-#ifdef BUTTON3_PRESSED
-    /* Document-const: BUTTON3_PRESSED
-     *
-     * Mouse event mask:
-     * mouse button 3 down
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON3_PRESSED);
-#endif
-#ifdef BUTTON3_RELEASED
-    /* Document-const: BUTTON3_RELEASED
-     *
-     * Mouse event mask:
-     * mouse button 3 up
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON3_RELEASED);
-#endif
-#ifdef BUTTON3_CLICKED
-    /* Document-const: BUTTON3_CLICKED
-     *
-     * Mouse event mask:
-     * mouse button 3 clicked
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON3_CLICKED);
-#endif
-#ifdef BUTTON3_DOUBLE_CLICKED
-    /* Document-const: BUTTON3_DOUBLE_CLICKED
-     *
-     * Mouse event mask:
-     * mouse button 3 double clicked
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON3_DOUBLE_CLICKED);
-#endif
-#ifdef BUTTON3_TRIPLE_CLICKED
-    /* Document-const: BUTTON3_TRIPLE_CLICKED
-     *
-     * Mouse event mask:
-     * mouse button 3 triple clicked
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON3_TRIPLE_CLICKED);
-#endif
-#ifdef BUTTON4_PRESSED
-    /* Document-const: BUTTON4_PRESSED
-     *
-     * Mouse event mask:
-     * mouse button 4 down
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON4_PRESSED);
-#endif
-#ifdef BUTTON4_RELEASED
-    /* Document-const: BUTTON4_RELEASED
-     *
-     * Mouse event mask:
-     * mouse button 4 up
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON4_RELEASED);
-#endif
-#ifdef BUTTON4_CLICKED
-    /* Document-const: BUTTON4_CLICKED
-     *
-     * Mouse event mask:
-     * mouse button 4 clicked
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON4_CLICKED);
-#endif
-#ifdef BUTTON4_DOUBLE_CLICKED
-    /* Document-const: BUTTON4_DOUBLE_CLICKED
-     *
-     * Mouse event mask:
-     * mouse button 4 double clicked
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON4_DOUBLE_CLICKED);
-#endif
-#ifdef BUTTON4_TRIPLE_CLICKED
-    /* Document-const: BUTTON4_TRIPLE_CLICKED
-     *
-     * Mouse event mask:
-     * mouse button 4 triple clicked
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON4_TRIPLE_CLICKED);
-#endif
-#ifdef BUTTON_SHIFT
-    /* Document-const: BUTTON_SHIFT
-     *
-     * Mouse event mask:
-     * shift was down during button state change
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON_SHIFT);
-#endif
-#ifdef BUTTON_CTRL
-    /* Document-const: BUTTON_CTRL
-     *
-     * Mouse event mask:
-     * control was down during button state change
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON_CTRL);
-#endif
-#ifdef BUTTON_ALT
-    /* Document-const: BUTTON_ALT
-     *
-     * Mouse event mask:
-     * alt was down during button state change
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(BUTTON_ALT);
-#endif
-#ifdef ALL_MOUSE_EVENTS
-    /* Document-const: ALL_MOUSE_EVENTS
-     *
-     * Mouse event mask:
-     * report all button state changes
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(ALL_MOUSE_EVENTS);
-#endif
-#ifdef REPORT_MOUSE_POSITION
-    /* Document-const: REPORT_MOUSE_POSITION
-     *
-     * Mouse event mask:
-     * report mouse movement
-     *
-     * See Curses.getmouse
-     */
-    rb_curses_define_const(REPORT_MOUSE_POSITION);
-#endif
-#endif /* USE_MOUSE */
-
-#if defined(KEY_MOUSE) && defined(USE_MOUSE)
-    /* Document-const: KEY_MOUSE
-     * Mouse event read
-     */
-    /* Document-const: MOUSE
-     * Mouse event read
-     */
-    rb_curses_define_const(KEY_MOUSE);
-    rb_define_const(mKey, "MOUSE", INT2NUM(KEY_MOUSE));
-#endif
-#ifdef KEY_MIN
-    /* Document-const: KEY_MIN
-     * The minimum allowed curses key value.
-     */
-    /* Document-const: MIN
-     * The minimum allowed curses key value.
-     */
-    rb_curses_define_const(KEY_MIN);
-    rb_define_const(mKey, "MIN", INT2NUM(KEY_MIN));
-#endif
-#ifdef KEY_BREAK
-    /* Document-const: KEY_BREAK
-     * Break key
-     */
-    /* Document-const: BREAK
-     * Break key
-     */
-    rb_curses_define_const(KEY_BREAK);
-    rb_define_const(mKey, "BREAK", INT2NUM(KEY_BREAK));
-#endif
-#ifdef KEY_DOWN
-    /* Document-const: KEY_DOWN
-     * the down arrow key
-     */
-    /* Document-const: DOWN
-     * the down arrow key
-     */
-    rb_curses_define_const(KEY_DOWN);
-    rb_define_const(mKey, "DOWN", INT2NUM(KEY_DOWN));
-#endif
-#ifdef KEY_UP
-    /* Document-const: KEY_UP
-     * the up arrow key
-     */
-    /* Document-const: UP
-     * the up arrow key
-     */
-    rb_curses_define_const(KEY_UP);
-    rb_define_const(mKey, "UP", INT2NUM(KEY_UP));
-#endif
-#ifdef KEY_LEFT
-    /* Document-const: KEY_LEFT
-     * the left arrow key
-     */
-    /* Document-const: LEFT
-     * the left arrow key
-     */
-    rb_curses_define_const(KEY_LEFT);
-    rb_define_const(mKey, "LEFT", INT2NUM(KEY_LEFT));
-#endif
-#ifdef KEY_RIGHT
-    /* Document-const: KEY_RIGHT
-     * the right arrow key
-     */
-    /* Document-const: RIGHT
-     * the right arrow key
-     */
-    rb_curses_define_const(KEY_RIGHT);
-    rb_define_const(mKey, "RIGHT", INT2NUM(KEY_RIGHT));
-#endif
-#ifdef KEY_HOME
-    /* Document-const: KEY_HOME
-     * Home key (upward+left arrow)
-     */
-    /* Document-const: HOME
-     * Home key (upward+left arrow)
-     */
-    rb_curses_define_const(KEY_HOME);
-    rb_define_const(mKey, "HOME", INT2NUM(KEY_HOME));
-#endif
-#ifdef KEY_BACKSPACE
-    /* Document-const: KEY_BACKSPACE
-     * Backspace
-     */
-    /* Document-const: BACKSPACE
-     * Backspace
-     */
-    rb_curses_define_const(KEY_BACKSPACE);
-    rb_define_const(mKey, "BACKSPACE", INT2NUM(KEY_BACKSPACE));
-#endif
-#ifdef KEY_F
-    /* KEY_F(n) : 0 <= n <= 63 */
-    {
-	int i;
-	char c[8];
-	for (i=0; i<64; i++) {
-	    sprintf(c, "KEY_F%d", i);
-	    rb_define_const(mCurses, c, INT2NUM(KEY_F(i)));
-	    sprintf(c, "F%d", i);
-	    rb_define_const(mKey, c, INT2NUM(KEY_F(i)));
-	}
-    }
-#endif
-#ifdef KEY_DL
-    /* Document-const: KEY_DL
-     * Delete line
-     */
-    /* Document-const: DL
-     * Delete line
-     */
-    rb_curses_define_const(KEY_DL);
-    rb_define_const(mKey, "DL", INT2NUM(KEY_DL));
-#endif
-#ifdef KEY_IL
-    /* Document-const: KEY_IL
-     * Insert line
-     */
-    /* Document-const: IL
-     * Insert line
-     */
-    rb_curses_define_const(KEY_IL);
-    rb_define_const(mKey, "IL", INT2NUM(KEY_IL));
-#endif
-#ifdef KEY_DC
-    /* Document-const: KEY_DC
-     * Delete character
-     */
-    /* Document-const: DC
-     * Delete character
-     */
-    rb_curses_define_const(KEY_DC);
-    rb_define_const(mKey, "DC", INT2NUM(KEY_DC));
-#endif
-#ifdef KEY_IC
-    /* Document-const: KEY_IC
-     * Insert char or enter insert mode
-     */
-    /* Document-const: IC
-     * Insert char or enter insert mode
-     */
-    rb_curses_define_const(KEY_IC);
-    rb_define_const(mKey, "IC", INT2NUM(KEY_IC));
-#endif
-#ifdef KEY_EIC
-    /* Document-const: KEY_EIC
-     * Enter insert char mode
-     */
-    /* Document-const: EIC
-     * Enter insert char mode
-     */
-    rb_curses_define_const(KEY_EIC);
-    rb_define_const(mKey, "EIC", INT2NUM(KEY_EIC));
-#endif
-#ifdef KEY_CLEAR
-    /* Document-const: KEY_CLEAR
-     * Clear Screen
-     */
-    /* Document-const: CLEAR
-     * Clear Screen
-     */
-    rb_curses_define_const(KEY_CLEAR);
-    rb_define_const(mKey, "CLEAR", INT2NUM(KEY_CLEAR));
-#endif
-#ifdef KEY_EOS
-    /* Document-const: KEY_EOS
-     * Clear to end of screen
-     */
-    /* Document-const: EOS
-     * Clear to end of screen
-     */
-    rb_curses_define_const(KEY_EOS);
-    rb_define_const(mKey, "EOS", INT2NUM(KEY_EOS));
-#endif
-#ifdef KEY_EOL
-    /* Document-const: KEY_EOL
-     * Clear to end of line
-     */
-    /* Document-const: EOL
-     * Clear to end of line
-     */
-    rb_curses_define_const(KEY_EOL);
-    rb_define_const(mKey, "EOL", INT2NUM(KEY_EOL));
-#endif
-#ifdef KEY_SF
-    /* Document-const: KEY_SF
-     * Scroll 1 line forward
-     */
-    /* Document-const: SF
-     * Scroll 1 line forward
-     */
-    rb_curses_define_const(KEY_SF);
-    rb_define_const(mKey, "SF", INT2NUM(KEY_SF));
-#endif
-#ifdef KEY_SR
-    /* Document-const: KEY_SR
-     * Scroll 1 line backware (reverse)
-     */
-    /* Document-const: SR
-     * Scroll 1 line backware (reverse)
-     */
-    rb_curses_define_const(KEY_SR);
-    rb_define_const(mKey, "SR", INT2NUM(KEY_SR));
-#endif
-#ifdef KEY_NPAGE
-    /* Document-const: KEY_NPAGE
-     * Next page
-     */
-    /* Document-const: NPAGE
-     * Next page
-     */
-    rb_curses_define_const(KEY_NPAGE);
-    rb_define_const(mKey, "NPAGE", INT2NUM(KEY_NPAGE));
-#endif
-#ifdef KEY_PPAGE
-    /* Document-const: KEY_PPAGE
-     * Previous page
-     */
-    /* Document-const: PPAGE
-     * Previous page
-     */
-    rb_curses_define_const(KEY_PPAGE);
-    rb_define_const(mKey, "PPAGE", INT2NUM(KEY_PPAGE));
-#endif
-#ifdef KEY_STAB
-    /* Document-const: KEY_STAB
-     * Set tab
-     */
-    /* Document-const: STAB
-     * Set tab
-     */
-    rb_curses_define_const(KEY_STAB);
-    rb_define_const(mKey, "STAB", INT2NUM(KEY_STAB));
-#endif
-#ifdef KEY_CTAB
-    /* Document-const: KEY_CTAB
-     * Clear tab
-     */
-    /* Document-const: CTAB
-     * Clear tab
-     */
-    rb_curses_define_const(KEY_CTAB);
-    rb_define_const(mKey, "CTAB", INT2NUM(KEY_CTAB));
-#endif
-#ifdef KEY_CATAB
-    /* Document-const: KEY_CATAB
-     * Clear all tabs
-     */
-    /* Document-const: CATAB
-     * Clear all tabs
-     */
-    rb_curses_define_const(KEY_CATAB);
-    rb_define_const(mKey, "CATAB", INT2NUM(KEY_CATAB));
-#endif
-#ifdef KEY_ENTER
-    /* Document-const: KEY_ENTER
-     * Enter or send
-     */
-    /* Document-const: ENTER
-     * Enter or send
-     */
-    rb_curses_define_const(KEY_ENTER);
-    rb_define_const(mKey, "ENTER", INT2NUM(KEY_ENTER));
-#endif
-#ifdef KEY_SRESET
-    /* Document-const: KEY_SRESET
-     * Soft (partial) reset
-     */
-    /* Document-const: SRESET
-     * Soft (partial) reset
-     */
-    rb_curses_define_const(KEY_SRESET);
-    rb_define_const(mKey, "SRESET", INT2NUM(KEY_SRESET));
-#endif
-#ifdef KEY_RESET
-    /* Document-const: KEY_RESET
-     * Reset or hard reset
-     */
-    /* Document-const: RESET
-     * Reset or hard reset
-     */
-    rb_curses_define_const(KEY_RESET);
-    rb_define_const(mKey, "RESET", INT2NUM(KEY_RESET));
-#endif
-#ifdef KEY_PRINT
-    /* Document-const: KEY_PRINT
-     * Print or copy
-     */
-    /* Document-const: PRINT
-     * Print or copy
-     */
-    rb_curses_define_const(KEY_PRINT);
-    rb_define_const(mKey, "PRINT", INT2NUM(KEY_PRINT));
-#endif
-#ifdef KEY_LL
-    /* Document-const: KEY_LL
-     * Home down or bottom (lower left)
-     */
-    /* Document-const: LL
-     * Home down or bottom (lower left)
-     */
-    rb_curses_define_const(KEY_LL);
-    rb_define_const(mKey, "LL", INT2NUM(KEY_LL));
-#endif
-#ifdef KEY_A1
-    /* Document-const: KEY_A1
-     * Upper left of keypad
-     */
-    /* Document-const: A1
-     * Upper left of keypad
-     */
-    rb_curses_define_const(KEY_A1);
-    rb_define_const(mKey, "A1", INT2NUM(KEY_A1));
-#endif
-#ifdef KEY_A3
-    /* Document-const: KEY_A3
-     * Upper right of keypad
-     */
-    /* Document-const: A3
-     * Upper right of keypad
-     */
-    rb_curses_define_const(KEY_A3);
-    rb_define_const(mKey, "A3", INT2NUM(KEY_A3));
-#endif
-#ifdef KEY_B2
-    /* Document-const: KEY_B2
-     * Center of keypad
-     */
-    /* Document-const: B2
-     * Center of keypad
-     */
-    rb_curses_define_const(KEY_B2);
-    rb_define_const(mKey, "B2", INT2NUM(KEY_B2));
-#endif
-#ifdef KEY_C1
-    /* Document-const: KEY_C1
-     * Lower left of keypad
-     */
-    /* Document-const: C1
-     * Lower left of keypad
-     */
-    rb_curses_define_const(KEY_C1);
-    rb_define_const(mKey, "C1", INT2NUM(KEY_C1));
-#endif
-#ifdef KEY_C3
-    /* Document-const: KEY_C3
-     * Lower right of keypad
-     */
-    /* Document-const: C3
-     * Lower right of keypad
-     */
-    rb_curses_define_const(KEY_C3);
-    rb_define_const(mKey, "C3", INT2NUM(KEY_C3));
-#endif
-#ifdef KEY_BTAB
-    /* Document-const: BTAB
-     * Back tab key
-     */
-    /* Document-const: KEY_BTAB
-     * Back tab key
-     */
-    rb_curses_define_const(KEY_BTAB);
-    rb_define_const(mKey, "BTAB", INT2NUM(KEY_BTAB));
-#endif
-#ifdef KEY_BEG
-    /* Document-const: KEY_BEG
-     * Beginning key
-     */
-    /* Document-const: BEG
-     * Beginning key
-     */
-    rb_curses_define_const(KEY_BEG);
-    rb_define_const(mKey, "BEG", INT2NUM(KEY_BEG));
-#endif
-#ifdef KEY_CANCEL
-    /* Document-const: KEY_CANCEL
-     * Cancel key
-     */
-    /* Document-const: CANCEL
-     * Cancel key
-     */
-    rb_curses_define_const(KEY_CANCEL);
-    rb_define_const(mKey, "CANCEL", INT2NUM(KEY_CANCEL));
-#endif
-#ifdef KEY_CLOSE
-    /* Document-const: KEY_CLOSE
-     * Close key
-     */
-    /* Document-const: CLOSE
-     * Close key
-     */
-    rb_curses_define_const(KEY_CLOSE);
-    rb_define_const(mKey, "CLOSE", INT2NUM(KEY_CLOSE));
-#endif
-#ifdef KEY_COMMAND
-    /* Document-const: KEY_COMMAND
-     * Cmd (command) key
-     */
-    /* Document-const: COMMAND
-     * Cmd (command) key
-     */
-    rb_curses_define_const(KEY_COMMAND);
-    rb_define_const(mKey, "COMMAND", INT2NUM(KEY_COMMAND));
-#endif
-#ifdef KEY_COPY
-    /* Document-const: KEY_COPY
-     * Copy key
-     */
-    /* Document-const: COPY
-     * Copy key
-     */
-    rb_curses_define_const(KEY_COPY);
-    rb_define_const(mKey, "COPY", INT2NUM(KEY_COPY));
-#endif
-#ifdef KEY_CREATE
-    /* Document-const: KEY_CREATE
-     * Create key
-     */
-    /* Document-const: CREATE
-     * Create key
-     */
-    rb_curses_define_const(KEY_CREATE);
-    rb_define_const(mKey, "CREATE", INT2NUM(KEY_CREATE));
-#endif
-#ifdef KEY_END
-    /* Document-const: KEY_END
-     * End key
-     */
-    /* Document-const: END
-     * End key
-     */
-    rb_curses_define_const(KEY_END);
-    rb_define_const(mKey, "END", INT2NUM(KEY_END));
-#endif
-#ifdef KEY_EXIT
-    /* Document-const: KEY_EXIT
-     * Exit key
-     */
-    /* Document-const: EXIT
-     * Exit key
-     */
-    rb_curses_define_const(KEY_EXIT);
-    rb_define_const(mKey, "EXIT", INT2NUM(KEY_EXIT));
-#endif
-#ifdef KEY_FIND
-    /* Document-const: KEY_FIND
-     * Find key
-     */
-    /* Document-const: FIND
-     * Find key
-     */
-    rb_curses_define_const(KEY_FIND);
-    rb_define_const(mKey, "FIND", INT2NUM(KEY_FIND));
-#endif
-#ifdef KEY_HELP
-    /* Document-const: KEY_HELP
-     * Help key
-     */
-    /* Document-const: HELP
-     * Help key
-     */
-    rb_curses_define_const(KEY_HELP);
-    rb_define_const(mKey, "HELP", INT2NUM(KEY_HELP));
-#endif
-#ifdef KEY_MARK
-    /* Document-const: KEY_MARK
-     * Mark key
-     */
-    /* Document-const: MARK
-     * Mark key
-     */
-    rb_curses_define_const(KEY_MARK);
-    rb_define_const(mKey, "MARK", INT2NUM(KEY_MARK));
-#endif
-#ifdef KEY_MESSAGE
-    /* Document-const: KEY_MESSAGE
-     * Message key
-     */
-    /* Document-const: MESSAGE
-     * Message key
-     */
-    rb_curses_define_const(KEY_MESSAGE);
-    rb_define_const(mKey, "MESSAGE", INT2NUM(KEY_MESSAGE));
-#endif
-#ifdef KEY_MOVE
-    /* Document-const: KEY_MOVE
-     * Move key
-     */
-    /* Document-const: MOVE
-     * Move key
-     */
-    rb_curses_define_const(KEY_MOVE);
-    rb_define_const(mKey, "MOVE", INT2NUM(KEY_MOVE));
-#endif
-#ifdef KEY_NEXT
-    /* Document-const: KEY_NEXT
-     * Next object key
-     */
-    /* Document-const: NEXT
-     * Next object key
-     */
-    rb_curses_define_const(KEY_NEXT);
-    rb_define_const(mKey, "NEXT", INT2NUM(KEY_NEXT));
-#endif
-#ifdef KEY_OPEN
-    /* Document-const: KEY_OPEN
-     * Open key
-     */
-    /* Document-const: OPEN
-     * Open key
-     */
-    rb_curses_define_const(KEY_OPEN);
-    rb_define_const(mKey, "OPEN", INT2NUM(KEY_OPEN));
-#endif
-#ifdef KEY_OPTIONS
-    /* Document-const: KEY_OPTIONS
-     * Options key
-     */
-    /* Document-const: OPTIONS
-     * Options key
-     */
-    rb_curses_define_const(KEY_OPTIONS);
-    rb_define_const(mKey, "OPTIONS", INT2NUM(KEY_OPTIONS));
-#endif
-#ifdef KEY_PREVIOUS
-    /* Document-const: KEY_PREVIOUS
-     * Previous object key
-     */
-    /* Document-const: PREVIOUS
-     * Previous object key
-     */
-    rb_curses_define_const(KEY_PREVIOUS);
-    rb_define_const(mKey, "PREVIOUS", INT2NUM(KEY_PREVIOUS));
-#endif
-#ifdef KEY_REDO
-    /* Document-const: KEY_REDO
-     * Redo key
-     */
-    /* Document-const: REDO
-     * Redo key
-     */
-    rb_curses_define_const(KEY_REDO);
-    rb_define_const(mKey, "REDO", INT2NUM(KEY_REDO));
-#endif
-#ifdef KEY_REFERENCE
-    /* Document-const: KEY_REFERENCE
-     * Reference key
-     */
-    /* Document-const: REFERENCE
-     * Reference key
-     */
-    rb_curses_define_const(KEY_REFERENCE);
-    rb_define_const(mKey, "REFERENCE", INT2NUM(KEY_REFERENCE));
-#endif
-#ifdef KEY_REFRESH
-    /* Document-const: KEY_REFRESH
-     * Refresh key
-     */
-    /* Document-const: REFRESH
-     * Refresh key
-     */
-    rb_curses_define_const(KEY_REFRESH);
-    rb_define_const(mKey, "REFRESH", INT2NUM(KEY_REFRESH));
-#endif
-#ifdef KEY_REPLACE
-    /* Document-const: KEY_REPLACE
-     * Replace key
-     */
-    /* Document-const: REPLACE
-     * Replace key
-     */
-    rb_curses_define_const(KEY_REPLACE);
-    rb_define_const(mKey, "REPLACE", INT2NUM(KEY_REPLACE));
-#endif
-#ifdef KEY_RESTART
-    /* Document-const: KEY_RESTART
-     * Restart key
-     */
-    /* Document-const: RESTART
-     * Restart key
-     */
-    rb_curses_define_const(KEY_RESTART);
-    rb_define_const(mKey, "RESTART", INT2NUM(KEY_RESTART));
-#endif
-#ifdef KEY_RESUME
-    /* Document-const: KEY_RESUME
-     * Resume key
-     */
-    /* Document-const: RESUME
-     * Resume key
-     */
-    rb_curses_define_const(KEY_RESUME);
-    rb_define_const(mKey, "RESUME", INT2NUM(KEY_RESUME));
-#endif
-#ifdef KEY_SAVE
-    /* Document-const: KEY_SAVE
-     * Save key
-     */
-    /* Document-const: SAVE
-     * Save key
-     */
-    rb_curses_define_const(KEY_SAVE);
-    rb_define_const(mKey, "SAVE", INT2NUM(KEY_SAVE));
-#endif
-#ifdef KEY_SBEG
-    /* Document-const: KEY_SBEG
-     * Shifted beginning key
-     */
-    /* Document-const: SBEG
-     * Shifted beginning key
-     */
-    rb_curses_define_const(KEY_SBEG);
-    rb_define_const(mKey, "SBEG", INT2NUM(KEY_SBEG));
-#endif
-#ifdef KEY_SCANCEL
-    /* Document-const: KEY_SCANCEL
-     * Shifted cancel key
-     */
-    /* Document-const: SCANCEL
-     * Shifted cancel key
-     */
-    rb_curses_define_const(KEY_SCANCEL);
-    rb_define_const(mKey, "SCANCEL", INT2NUM(KEY_SCANCEL));
-#endif
-#ifdef KEY_SCOMMAND
-    /* Document-const: KEY_SCOMMAND
-     * Shifted command key
-     */
-    /* Document-const: SCOMMAND
-     * Shifted command key
-     */
-    rb_curses_define_const(KEY_SCOMMAND);
-    rb_define_const(mKey, "SCOMMAND", INT2NUM(KEY_SCOMMAND));
-#endif
-#ifdef KEY_SCOPY
-    /* Document-const: KEY_SCOPY
-     * Shifted copy key
-     */
-    /* Document-const: SCOPY
-     * Shifted copy key
-     */
-    rb_curses_define_const(KEY_SCOPY);
-    rb_define_const(mKey, "SCOPY", INT2NUM(KEY_SCOPY));
-#endif
-#ifdef KEY_SCREATE
-    /* Document-const: KEY_SCREATE
-     * Shifted create key
-     */
-    /* Document-const: SCREATE
-     * Shifted create key
-     */
-    rb_curses_define_const(KEY_SCREATE);
-    rb_define_const(mKey, "SCREATE", INT2NUM(KEY_SCREATE));
-#endif
-#ifdef KEY_SDC
-    /* Document-const: KEY_SDC
-     * Shifted delete char key
-     */
-    /* Document-const: SDC
-     * Shifted delete char key
-     */
-    rb_curses_define_const(KEY_SDC);
-    rb_define_const(mKey, "SDC", INT2NUM(KEY_SDC));
-#endif
-#ifdef KEY_SDL
-    /* Document-const: KEY_SDL
-     * Shifted delete line key
-     */
-    /* Document-const: SDL
-     * Shifted delete line key
-     */
-    rb_curses_define_const(KEY_SDL);
-    rb_define_const(mKey, "SDL", INT2NUM(KEY_SDL));
-#endif
-#ifdef KEY_SELECT
-    /* Document-const: KEY_SELECT
-     * Select key
-     */
-    /* Document-const: SELECT
-     * Select key
-     */
-    rb_curses_define_const(KEY_SELECT);
-    rb_define_const(mKey, "SELECT", INT2NUM(KEY_SELECT));
-#endif
-#ifdef KEY_SEND
-    /* Document-const: KEY_SEND
-     * Shifted end key
-     */
-    /* Document-const: SEND
-     * Shifted end key
-     */
-    rb_curses_define_const(KEY_SEND);
-    rb_define_const(mKey, "SEND", INT2NUM(KEY_SEND));
-#endif
-#ifdef KEY_SEOL
-    /* Document-const: KEY_SEOL
-     * Shifted clear line key
-     */
-    /* Document-const: SEOL
-     * Shifted clear line key
-     */
-    rb_curses_define_const(KEY_SEOL);
-    rb_define_const(mKey, "SEOL", INT2NUM(KEY_SEOL));
-#endif
-#ifdef KEY_SEXIT
-    /* Document-const: KEY_SEXIT
-     * Shifted exit key
-     */
-    /* Document-const: SEXIT
-     * Shifted exit key
-     */
-    rb_curses_define_const(KEY_SEXIT);
-    rb_define_const(mKey, "SEXIT", INT2NUM(KEY_SEXIT));
-#endif
-#ifdef KEY_SFIND
-    /* Document-const: KEY_SFIND
-     * Shifted find key
-     */
-    /* Document-const: SFIND
-     * Shifted find key
-     */
-    rb_curses_define_const(KEY_SFIND);
-    rb_define_const(mKey, "SFIND", INT2NUM(KEY_SFIND));
-#endif
-#ifdef KEY_SHELP
-    /* Document-const: KEY_SHELP
-     * Shifted help key
-     */
-    /* Document-const: SHELP
-     * Shifted help key
-     */
-    rb_curses_define_const(KEY_SHELP);
-    rb_define_const(mKey, "SHELP", INT2NUM(KEY_SHELP));
-#endif
-#ifdef KEY_SHOME
-    /* Document-const: KEY_SHOME
-     * Shifted home key
-     */
-    /* Document-const: SHOME
-     * Shifted home key
-     */
-    rb_curses_define_const(KEY_SHOME);
-    rb_define_const(mKey, "SHOME", INT2NUM(KEY_SHOME));
-#endif
-#ifdef KEY_SIC
-    /* Document-const: KEY_SIC
-     * Shifted input key
-     */
-    /* Document-const: SIC
-     * Shifted input key
-     */
-    rb_curses_define_const(KEY_SIC);
-    rb_define_const(mKey, "SIC", INT2NUM(KEY_SIC));
-#endif
-#ifdef KEY_SLEFT
-    /* Document-const: KEY_SLEFT
-     * Shifted left arrow key
-     */
-    /* Document-const: SLEFT
-     * Shifted left arrow key
-     */
-    rb_curses_define_const(KEY_SLEFT);
-    rb_define_const(mKey, "SLEFT", INT2NUM(KEY_SLEFT));
-#endif
-#ifdef KEY_SMESSAGE
-    /* Document-const: KEY_SMESSAGE
-     * Shifted message key
-     */
-    /* Document-const: SMESSAGE
-     * Shifted message key
-     */
-    rb_curses_define_const(KEY_SMESSAGE);
-    rb_define_const(mKey, "SMESSAGE", INT2NUM(KEY_SMESSAGE));
-#endif
-#ifdef KEY_SMOVE
-    /* Document-const: KEY_SMOVE
-     * Shifted move key
-     */
-    /* Document-const: SMOVE
-     * Shifted move key
-     */
-    rb_curses_define_const(KEY_SMOVE);
-    rb_define_const(mKey, "SMOVE", INT2NUM(KEY_SMOVE));
-#endif
-#ifdef KEY_SNEXT
-    /* Document-const: KEY_SNEXT
-     * Shifted next key
-     */
-    /* Document-const: SNEXT
-     * Shifted next key
-     */
-    rb_curses_define_const(KEY_SNEXT);
-    rb_define_const(mKey, "SNEXT", INT2NUM(KEY_SNEXT));
-#endif
-#ifdef KEY_SOPTIONS
-    /* Document-const: KEY_SOPTIONS
-     * Shifted options key
-     */
-    /* Document-const: SOPTIONS
-     * Shifted options key
-     */
-    rb_curses_define_const(KEY_SOPTIONS);
-    rb_define_const(mKey, "SOPTIONS", INT2NUM(KEY_SOPTIONS));
-#endif
-#ifdef KEY_SPREVIOUS
-    /* Document-const: KEY_SPREVIOUS
-     * Shifted previous key
-     */
-    /* Document-const: SPREVIOUS
-     * Shifted previous key
-     */
-    rb_curses_define_const(KEY_SPREVIOUS);
-    rb_define_const(mKey, "SPREVIOUS", INT2NUM(KEY_SPREVIOUS));
-#endif
-#ifdef KEY_SPRINT
-    /* Document-const: KEY_SPRINT
-     * Shifted print key
-     */
-    /* Document-const: SPRINT
-     * Shifted print key
-     */
-    rb_curses_define_const(KEY_SPRINT);
-    rb_define_const(mKey, "SPRINT", INT2NUM(KEY_SPRINT));
-#endif
-#ifdef KEY_SREDO
-    /* Document-const: KEY_SREDO
-     * Shifted redo key
-     */
-    /* Document-const: SREDO
-     * Shifted redo key
-     */
-    rb_curses_define_const(KEY_SREDO);
-    rb_define_const(mKey, "SREDO", INT2NUM(KEY_SREDO));
-#endif
-#ifdef KEY_SREPLACE
-    /* Document-const: KEY_SREPLACE
-     * Shifted replace key
-     */
-    /* Document-const: SREPLACE
-     * Shifted replace key
-     */
-    rb_curses_define_const(KEY_SREPLACE);
-    rb_define_const(mKey, "SREPLACE", INT2NUM(KEY_SREPLACE));
-#endif
-#ifdef KEY_SRIGHT
-    /* Document-const: KEY_SRIGHT
-     * Shifted right arrow key
-     */
-    /* Document-const: SRIGHT
-     * Shifted right arrow key
-     */
-    rb_curses_define_const(KEY_SRIGHT);
-    rb_define_const(mKey, "SRIGHT", INT2NUM(KEY_SRIGHT));
-#endif
-#ifdef KEY_SRSUME
-    /* Document-const: KEY_SRSUME
-     * Shifted resume key
-     */
-    /* Document-const: SRSUME
-     * Shifted resume key
-     */
-    rb_curses_define_const(KEY_SRSUME);
-    rb_define_const(mKey, "SRSUME", INT2NUM(KEY_SRSUME));
-#endif
-#ifdef KEY_SSAVE
-    /* Document-const: KEY_SSAVE
-     * Shifted save key
-     */
-    /* Document-const: SSAVE
-     * Shifted save key
-     */
-    rb_curses_define_const(KEY_SSAVE);
-    rb_define_const(mKey, "SSAVE", INT2NUM(KEY_SSAVE));
-#endif
-#ifdef KEY_SSUSPEND
-    /* Document-const: KEY_SSUSPEND
-     * Shifted suspend key
-     */
-    /* Document-const: SSUSPEND
-     * Shifted suspend key
-     */
-    rb_curses_define_const(KEY_SSUSPEND);
-    rb_define_const(mKey, "SSUSPEND", INT2NUM(KEY_SSUSPEND));
-#endif
-#ifdef KEY_SUNDO
-    /* Document-const: KEY_SUNDO
-     * Shifted undo key
-     */
-    /* Document-const: SUNDO
-     * Shifted undo key
-     */
-    rb_curses_define_const(KEY_SUNDO);
-    rb_define_const(mKey, "SUNDO", INT2NUM(KEY_SUNDO));
-#endif
-#ifdef KEY_SUSPEND
-    /* Document-const: KEY_SUSPEND
-     * Suspend key
-     */
-    /* Document-const: SUSPEND
-     * Suspend key
-     */
-    rb_curses_define_const(KEY_SUSPEND);
-    rb_define_const(mKey, "SUSPEND", INT2NUM(KEY_SUSPEND));
-#endif
-#ifdef KEY_UNDO
-    /* Document-const: KEY_UNDO
-     * Undo key
-     */
-    /* Document-const: UNDO
-     * Undo key
-     */
-    rb_curses_define_const(KEY_UNDO);
-    rb_define_const(mKey, "UNDO", INT2NUM(KEY_UNDO));
-#endif
-#ifdef KEY_RESIZE
-    /* Document-const: KEY_RESIZE
-     * Screen Resized
-     */
-    /* Document-const: RESIZE
-     * Screen Resized
-     */
-    rb_curses_define_const(KEY_RESIZE);
-    rb_define_const(mKey, "RESIZE", INT2NUM(KEY_RESIZE));
-#endif
-#ifdef KEY_MAX
-    /* Document-const: KEY_MAX
-     * The maximum allowed curses key value.
-     */
-    /* Document-const: MAX
-     * The maximum allowed curses key value.
-     */
-    rb_curses_define_const(KEY_MAX);
-    rb_define_const(mKey, "MAX", INT2NUM(KEY_MAX));
-#endif
-    {
-	int c;
-	char name[] = "KEY_CTRL_x";
-	for (c = 'A'; c <= 'Z'; c++) {
-	    name[sizeof(name) - 2] = c;
-	    rb_define_const(mCurses, name, INT2FIX(c - 'A' + 1));
-	}
-    }
-#undef rb_curses_define_const
-
-    rb_set_end_proc(curses_finalize, 0);
-}
diff --git a/ext/curses/depend b/ext/curses/depend
deleted file mode 100644
index ecb79e512d..0000000000
--- a/ext/curses/depend
+++ /dev/null
@@ -1 +0,0 @@
-curses.o: curses.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
deleted file mode 100644
index 4172c8a6b6..0000000000
--- a/ext/curses/extconf.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'mkmf'
-
-dir_config('curses')
-dir_config('ncurses')
-dir_config('termcap')
-
-make=false
-headers = []
-
-have_library("mytinfo", "tgetent") if /bow/ =~ RUBY_PLATFORM
-have_library("tinfo", "tgetent") or have_library("termcap", "tgetent")
-if have_header(*curses=%w"ncurses.h") and (have_library("ncursesw", "initscr") or have_library("ncurses", "initscr"))
-  make=true
-elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "initscr")
-  make=true
-elsif have_header(*curses=%w"curses_colr/curses.h") and have_library("cur_colr", "initscr")
-  curses.unshift("varargs.h")
-  make=true
-elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
-  make=true
-end
-
-if make
-  for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color wcolor_set use_default_colors)
-    have_func(f) || (have_macro(f, curses) && $defs.push(format("-DHAVE_%s", f.upcase)))
-  end
-  flag = "-D_XOPEN_SOURCE_EXTENDED"
-  if try_static_assert("sizeof(char*)>sizeof(int)", %w[stdio.h stdlib.h]+curses , flag)
-    $defs << flag
-  end
-  have_var("ESCDELAY", curses)
-  have_var("TABSIZE", curses)
-  have_var("COLORS", curses)
-  have_var("COLOR_PAIRS", curses)
-  create_makefile("curses")
-end
diff --git a/ext/curses/hello.rb b/ext/curses/hello.rb
deleted file mode 100644
index 7f57d801a3..0000000000
--- a/ext/curses/hello.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/local/bin/ruby
-
-require "curses"
-include Curses
-
-def show_message(message)
-  width = message.length + 6
-  win = Window.new(5, width,
-		   (lines - 5) / 2, (cols - width) / 2)
-  win.box(?|, ?-)
-  win.setpos(2, 3)
-  win.addstr(message)
-  win.refresh
-  win.getch
-  win.close
-end
-
-init_screen
-begin
-  crmode
-#  show_message("Hit any key")
-  setpos((lines - 5) / 2, (cols - 10) / 2)
-  addstr("Hit any key")
-  refresh
-  getch
-  show_message("Hello, World!")
-  refresh
-ensure
-  close_screen
-end
diff --git a/ext/curses/mouse.rb b/ext/curses/mouse.rb
deleted file mode 100644
index c42bc31f33..0000000000
--- a/ext/curses/mouse.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/local/bin/ruby
-
-require "curses"
-include Curses
-
-def show_message(*msgs)
-  message = msgs.join
-  width = message.length + 6
-  win = Window.new(5, width,
-		   (lines - 5) / 2, (cols - width) / 2)
-  win.keypad = true
-  win.attron(color_pair(COLOR_RED)){
-    win.box(?|, ?-, ?+)
-  }
-  win.setpos(2, 3)
-  win.addstr(message)
-  win.refresh
-  win.getch
-  win.close
-end
-
-init_screen
-start_color
-init_pair(COLOR_BLUE,COLOR_BLUE,COLOR_WHITE)
-init_pair(COLOR_RED,COLOR_RED,COLOR_WHITE)
-crmode
-noecho
-stdscr.keypad(true)
-
-begin
-  mousemask(BUTTON1_CLICKED|BUTTON2_CLICKED|BUTTON3_CLICKED|BUTTON4_CLICKED)
-  setpos((lines - 5) / 2, (cols - 10) / 2)
-  attron(color_pair(COLOR_BLUE)|A_BOLD){
-    addstr("click")
-  }
-  refresh
-  while( true )
-    c = getch
-    case c
-    when KEY_MOUSE
-      m = getmouse
-      if( m )
-	show_message("getch = #{c.inspect}, ",
-		     "mouse event = #{'0x%x' % m.bstate}, ",
-		     "axis = (#{m.x},#{m.y},#{m.z})")
-      end
-      break
-    end
-  end
-  refresh
-ensure
-  close_screen
-end
diff --git a/ext/curses/rain.rb b/ext/curses/rain.rb
deleted file mode 100644
index 36f0f84de2..0000000000
--- a/ext/curses/rain.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/local/bin/ruby
-# rain for a curses test
-
-require "curses"
-include Curses
-
-def onsig(sig)
-  close_screen
-  exit sig
-end
-
-def ranf
-  rand(32767).to_f / 32767
-end
-
-# main #
-for i in 1 .. 15  # SIGHUP .. SIGTERM
-  if trap(i, "SIG_IGN") != 0 then  # 0 for SIG_IGN
-    trap(i) {|sig| onsig(sig) }
-  end
-end
-
-init_screen
-nl
-noecho
-srand
-
-xpos = {}
-ypos = {}
-r = lines - 4
-c = cols - 4
-for i in 0 .. 4
-  xpos[i] = (c * ranf).to_i + 2
-  ypos[i] = (r * ranf).to_i + 2
-end
-
-i = 0
-while TRUE
-  x = (c * ranf).to_i + 2
-  y = (r * ranf).to_i + 2
-
-
-  setpos(y, x); addstr(".")
-
-  setpos(ypos[i], xpos[i]); addstr("o")
-
-  i = if i == 0 then 4 else i - 1 end
-  setpos(ypos[i], xpos[i]); addstr("O")
-
-  i = if i == 0 then 4 else i - 1 end
-  setpos(ypos[i] - 1, xpos[i]);      addstr("-")
-  setpos(ypos[i],     xpos[i] - 1); addstr("|.|")
-  setpos(ypos[i] + 1, xpos[i]);      addstr("-")
-
-  i = if i == 0 then 4 else i - 1 end
-  setpos(ypos[i] - 2, xpos[i]);       addstr("-")
-  setpos(ypos[i] - 1, xpos[i] - 1);  addstr("/ \\")
-  setpos(ypos[i],     xpos[i] - 2); addstr("| O |")
-  setpos(ypos[i] + 1, xpos[i] - 1); addstr("\\ /")
-  setpos(ypos[i] + 2, xpos[i]);       addstr("-")
-
-  i = if i == 0 then 4 else i - 1 end
-  setpos(ypos[i] - 2, xpos[i]);       addstr(" ")
-  setpos(ypos[i] - 1, xpos[i] - 1);  addstr("   ")
-  setpos(ypos[i],     xpos[i] - 2); addstr("     ")
-  setpos(ypos[i] + 1, xpos[i] - 1);  addstr("   ")
-  setpos(ypos[i] + 2, xpos[i]);       addstr(" ")
-
-
-  xpos[i] = x
-  ypos[i] = y
-  refresh
-  sleep(0.5)
-end
-
-# end of main
diff --git a/ext/curses/view.rb b/ext/curses/view.rb
deleted file mode 100644
index e033fd8ae2..0000000000
--- a/ext/curses/view.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/local/bin/ruby
-
-require "curses"
-include Curses
-
-#
-# main
-#
-
-if ARGV.size != 1 then
-  printf("usage: view file\n");
-  exit
-end
-begin
-  fp = open(ARGV[0], "r")
-rescue
-  raise "cannot open file: #{ARGV[1]}"
-end
-
-# signal(SIGINT, finish)
-
-init_screen
-#keypad(stdscr, TRUE)
-nonl
-cbreak
-noecho
-#scrollok(stdscr, TRUE)
-
-# slurp the file
-data_lines = []
-fp.each_line { |l|
-  data_lines.push(l)
-}
-fp.close
-
-
-lptr = 0
-while TRUE
-  i = 0
-  while i < lines
-    setpos(i, 0)
-    #clrtoeol
-    addstr(data_lines[lptr + i]) #if data_lines[lptr + i]
-    i += 1
-  end
-  refresh
-
-  explicit = FALSE
-  n = 0
-  while TRUE
-    c = getch
-    if c =~ /[0-9]/
-      n = 10 * n + c.to_i
-    else
-      break
-    end
-  end
-
-  n = 1 if !explicit && n == 0
-
-  case c
-  when "n"  #when KEY_DOWN
-    i = 0
-    while i < n
-      if lptr + lines < data_lines.size then
-	lptr += 1
-      else
-	break
-      end
-      i += 1
-    end
-    #wscrl(i)
-
-  when "p"  #when KEY_UP
-    i = 0
-    while i < n
-      if lptr > 0 then
-	lptr -= 1
-      else
-	break
-      end
-      i += 1
-    end
-    #wscrl(-i)
-
-  when "q"
-    break
-  end
-
-end
-close_screen
diff --git a/ext/curses/view2.rb b/ext/curses/view2.rb
deleted file mode 100644
index 037771a226..0000000000
--- a/ext/curses/view2.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/usr/local/bin/ruby
-
-require "curses"
-
-
-# A curses based file viewer
-class FileViewer
-
-  # Create a new fileviewer, and view the file.
-  def initialize(filename)
-    @data_lines = []
-    @screen = nil
-    @top = nil
-    init_curses
-    load_file(filename)
-    interact
-  end
-
-  # Perform the curses setup
-  def init_curses
-    # signal(SIGINT, finish)
-
-    Curses.init_screen
-    Curses.nonl
-    Curses.cbreak
-    Curses.noecho
-
-    @screen = Curses.stdscr
-
-    @screen.scrollok(true)
-    #$screen.keypad(true)
-  end
-
-  # Load the file into memory, and put
-  # the first part on the curses display.
-  def load_file(filename)
-    fp = open(filename, "r") do |fp|
-    # slurp the file
-    fp.each_line { |l|
-      @data_lines.push(l.chop)
-    }
-    end
-    @top = 0
-    @data_lines[0..@screen.maxy-1].each_with_index{|line, idx|
-      @screen.setpos(idx, 0)
-      @screen.addstr(line)
-    }
-    @screen.setpos(0,0)
-    @screen.refresh
-  rescue
-    raise "cannot open file '#{filename}' for reading"
-  end
-
-
-  # Scroll the display up by one line
-  def scroll_up
-    if( @top > 0 )
-      @screen.scrl(-1)
-      @top -= 1
-      str = @data_lines[@top]
-      if( str )
-        @screen.setpos(0, 0)
-        @screen.addstr(str)
-      end
-      return true
-    else
-      return false
-    end
-  end
-
-  # Scroll the display down by one line
-  def scroll_down
-    if( @top + @screen.maxy < @data_lines.length )
-      @screen.scrl(1)
-      @top += 1
-      str = @data_lines[@top + @screen.maxy - 1]
-      if( str )
-        @screen.setpos(@screen.maxy - 1, 0)
-        @screen.addstr(str)
-      end
-      return true
-    else
-      return false
-    end
-  end
-
-  # Allow the user to interact with the display.
-  # This uses EMACS-like keybindings, and also
-  # vi-like keybindings as well, except that left
-  # and right move to the beginning and end of the
-  # file, respectively.
-  def interact
-    while true
-      result = true
-      c = Curses.getch
-      case c
-      when Curses::KEY_DOWN, Curses::KEY_CTRL_N, ?j
-        result = scroll_down
-      when Curses::KEY_UP, Curses::KEY_CTRL_P, ?k
-        result = scroll_up
-      when Curses::KEY_NPAGE, ?\s  # white space
-        for i in 0..(@screen.maxy - 2)
-          if( ! scroll_down )
-            if( i == 0 )
-              result = false
-            end
-            break
-          end
-        end
-      when Curses::KEY_PPAGE
-        for i in 0..(@screen.maxy - 2)
-          if( ! scroll_up )
-            if( i == 0 )
-              result = false
-            end
-            break
-          end
-        end
-      when Curses::KEY_LEFT, Curses::KEY_CTRL_T, ?h
-        while( scroll_up )
-        end
-      when Curses::KEY_RIGHT, Curses::KEY_CTRL_B, ?l
-        while( scroll_down )
-        end
-      when ?q
-        break
-      else
-        @screen.setpos(0,0)
-        @screen.addstr("[unknown key `#{Curses.keyname(c)}'=#{c}] ")
-      end
-      if( !result )
-        Curses.beep
-      end
-      @screen.setpos(0,0)
-    end
-    Curses.close_screen
-  end
-end
-
-
-# If we are being run as a main program...
-if __FILE__ == $0
-  if ARGV.size != 1 then
-    printf("usage: #{$0} file\n");
-    exit
-  end
-
-  viewer = FileViewer.new(ARGV[0])
-end
diff --git a/ext/date/date.gemspec b/ext/date/date.gemspec
new file mode 100644
index 0000000000..bd323b7a06
--- /dev/null
+++ b/ext/date/date.gemspec
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+Gem::Specification.new do |s|
+  s.name = "date"
+  s.version = '3.0.0'
+  s.summary = "A subclass of Object includes Comparable module for handling dates."
+  s.description = "A subclass of Object includes Comparable module for handling dates."
+
+  s.require_path = %w{lib}
+  s.files = [
+    "lib/date.rb", "ext/date/date_core.c", "ext/date/date_parse.c", "ext/date/date_strftime.c",
+    "ext/date/date_strptime.c", "ext/date/date_tmx.h", "ext/date/extconf.rb", "ext/date/prereq.mk",
+    "ext/date/zonetab.h", "ext/date/zonetab.list"
+  ]
+  s.extensions = "ext/date/extconf.rb"
+  s.required_ruby_version = ">= 2.4.0"
+
+  s.authors = ["Tadayoshi Funaba"]
+  s.email = [nil]
+  s.homepage = "https://github.com/ruby/date"
+  s.license = "BSD-2-Clause"
+end
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index 251d025b12..ccac90a32e 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -1,11 +1,15 @@
 /*
-  date_core.c: Coded by Tadayoshi Funaba 2010, 2011
+  date_core.c: Coded by Tadayoshi Funaba 2010-2014
 */
 
 #include "ruby.h"
 #include "ruby/encoding.h"
+#include "ruby/util.h"
 #include <math.h>
 #include <time.h>
+#if defined(HAVE_SYS_TIME_H)
+#include <sys/time.h>
+#endif
 
 #define NDEBUG
 #include <assert.h>
@@ -18,6 +22,7 @@
 
 static ID id_cmp, id_le_p, id_ge_p, id_eqeq_p;
 static VALUE cDate, cDateTime;
+static VALUE eDateError;
 static VALUE half_days_in_day, day_in_nanoseconds;
 static double positive_inf, negative_inf;
 
@@ -39,6 +44,7 @@ static double positive_inf, negative_inf;
 #define f_truncate(x) rb_funcall(x, rb_intern("truncate"), 0)
 #define f_round(x) rb_funcall(x, rb_intern("round"), 0)
 
+#define f_to_i(x) rb_funcall(x, rb_intern("to_i"), 0)
 #define f_to_r(x) rb_funcall(x, rb_intern("to_r"), 0)
 #define f_to_s(x) rb_funcall(x, rb_intern("to_s"), 0)
 #define f_inspect(x) rb_funcall(x, rb_intern("inspect"), 0)
@@ -46,18 +52,29 @@ static double positive_inf, negative_inf;
 #define f_add3(x,y,z) f_add(f_add(x, y), z)
 #define f_sub3(x,y,z) f_sub(f_sub(x, y), z)
 
-inline static VALUE
+static VALUE date_initialize(int argc, VALUE *argv, VALUE self);
+static VALUE datetime_initialize(int argc, VALUE *argv, VALUE self);
+
+#define RETURN_FALSE_UNLESS_NUMERIC(obj) if(!RTEST(rb_obj_is_kind_of((obj), rb_cNumeric))) return Qfalse
+inline static void
+check_numeric(VALUE obj, const char* field) {
+    if(!RTEST(rb_obj_is_kind_of(obj, rb_cNumeric))) {
+        rb_raise(rb_eTypeError, "invalid %s (not numeric)", field);
+    }
+}
+
+inline static int
 f_cmp(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y)) {
 	long c = FIX2LONG(x) - FIX2LONG(y);
 	if (c > 0)
-	    c = 1;
+	    return 1;
 	else if (c < 0)
-	    c = -1;
-	return INT2FIX(c);
+	    return -1;
+	return 0;
     }
-    return rb_funcall(x, id_cmp, 1, y);
+    return rb_cmpint(rb_funcallv(x, id_cmp, 1, &y), x, y);
 }
 
 inline static VALUE
@@ -89,7 +106,7 @@ f_ge_p(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y))
 	return f_boolcast(FIX2LONG(x) >= FIX2LONG(y));
-    return rb_funcall(x, rb_intern(">="), 1, y);
+    return rb_funcall(x, id_ge_p, 1, y);
 }
 
 inline static VALUE
@@ -97,7 +114,7 @@ f_eqeq_p(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y))
 	return f_boolcast(FIX2LONG(x) == FIX2LONG(y));
-    return rb_funcall(x, rb_intern("=="), 1, y);
+    return rb_funcall(x, id_eqeq_p, 1, y);
 }
 
 inline static VALUE
@@ -110,7 +127,7 @@ f_zero_p(VALUE x)
 	return Qfalse;
       case T_RATIONAL:
 	{
-	    VALUE num = RRATIONAL(x)->num;
+	    VALUE num = rb_rational_num(x);
 	    return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 0);
 	}
     }
@@ -217,13 +234,10 @@ f_negative_p(VALUE x)
 #include <float.h>
 #endif
 
-#if defined(FLT_RADIX) && defined(FLT_MANT_DIG)
-#if FLT_RADIX == 2 && FLT_MANT_DIG > 22
-#define USE_FLOAT
-#define sg_cast float
+#if defined(FLT_RADIX) && defined(FLT_MANT_DIG) && FLT_RADIX == 2 && FLT_MANT_DIG > 22
+#define date_sg_t float
 #else
-#define sg_cast double
-#endif
+#define date_sg_t double
 #endif
 
 /* A set of nth, jd, df and sf denote ajd + 1/2.  Each ajd begin at
@@ -234,16 +248,9 @@ f_negative_p(VALUE x)
 struct SimpleDateData
 {
     unsigned flags;
-    VALUE nth;	/* not always canonicalized */
     int jd;	/* as utc */
-    /* df is zero */
-    /* sf is zero */
-    /* of is zero */
-#ifndef USE_FLOAT
-    double sg;  /* 2298874..2426355 or -/+oo */
-#else
-    float sg;	/* at most 22 bits */
-#endif
+    VALUE nth;	/* not always canonicalized */
+    date_sg_t sg;  /* 2298874..2426355 or -/+oo -- at most 22 bits */
     /* decoded as utc=local */
     int year;	/* truncated */
 #ifndef USE_PACK
@@ -261,16 +268,9 @@ struct SimpleDateData
 struct ComplexDateData
 {
     unsigned flags;
-    VALUE nth;	/* not always canonicalized */
     int jd; 	/* as utc */
-    int df;	/* as utc, in secs */
-    VALUE sf;	/* in nano secs */
-    int of;	/* in secs */
-#ifndef USE_FLOAT
-    double sg;  /* 2298874..2426355 or -/+oo */
-#else
-    float sg;	/* at most 22 bits */
-#endif
+    VALUE nth;	/* not always canonicalized */
+    date_sg_t sg;  /* 2298874..2426355 or -/+oo -- at most 22 bits */
     /* decoded as local */
     int year;	/* truncated */
 #ifndef USE_PACK
@@ -283,6 +283,9 @@ struct ComplexDateData
     /* packed civil */
     unsigned pc;
 #endif
+    int df;	/* as utc, in secs */
+    int of;	/* in secs */
+    VALUE sf;	/* in nano secs */
 };
 
 union DateData {
@@ -293,98 +296,98 @@ union DateData {
 
 #define get_d1(x)\
     union DateData *dat;\
-    Data_Get_Struct(x, union DateData, dat);
+    TypedData_Get_Struct(x, union DateData, &d_lite_type, dat);
 
 #define get_d1a(x)\
     union DateData *adat;\
-    Data_Get_Struct(x, union DateData, adat);
+    TypedData_Get_Struct(x, union DateData, &d_lite_type, adat);
 
 #define get_d1b(x)\
     union DateData *bdat;\
-    Data_Get_Struct(x, union DateData, bdat);
+    TypedData_Get_Struct(x, union DateData, &d_lite_type, bdat);
 
 #define get_d2(x,y)\
     union DateData *adat, *bdat;\
-    Data_Get_Struct(x, union DateData, adat);\
-    Data_Get_Struct(y, union DateData, bdat);
+    TypedData_Get_Struct(x, union DateData, &d_lite_type, adat);\
+    TypedData_Get_Struct(y, union DateData, &d_lite_type, bdat);
 
 inline static VALUE
 canon(VALUE x)
 {
-    if (TYPE(x) == T_RATIONAL) {
-	VALUE den = RRATIONAL(x)->den;
+    if (RB_TYPE_P(x, T_RATIONAL)) {
+	VALUE den = rb_rational_den(x);
 	if (FIXNUM_P(den) && FIX2LONG(den) == 1)
-	    return RRATIONAL(x)->num;
+	    return rb_rational_num(x);
     }
     return x;
 }
 
 #ifndef USE_PACK
-#define set_to_simple(x, _nth, _jd ,_sg, _year, _mon, _mday, _flags) \
-{\
-    (x)->nth = canon(_nth);\
+#define set_to_simple(obj, x, _nth, _jd ,_sg, _year, _mon, _mday, _flags) \
+do {\
+    RB_OBJ_WRITE((obj), &(x)->nth, canon(_nth)); \
     (x)->jd = _jd;\
-    (x)->sg = (sg_cast)(_sg);\
+    (x)->sg = (date_sg_t)(_sg);\
     (x)->year = _year;\
     (x)->mon = _mon;\
     (x)->mday = _mday;\
-    (x)->flags = _flags;\
-}
+    (x)->flags = (_flags) & ~COMPLEX_DAT;\
+} while (0)
 #else
-#define set_to_simple(x, _nth, _jd ,_sg, _year, _mon, _mday, _flags) \
-{\
-    (x)->nth = canon(_nth);\
+#define set_to_simple(obj, x, _nth, _jd ,_sg, _year, _mon, _mday, _flags) \
+do {\
+    RB_OBJ_WRITE((obj), &(x)->nth, canon(_nth)); \
     (x)->jd = _jd;\
-    (x)->sg = (sg_cast)(_sg);\
+    (x)->sg = (date_sg_t)(_sg);\
     (x)->year = _year;\
     (x)->pc = PACK2(_mon, _mday);\
-    (x)->flags = _flags;\
-}
+    (x)->flags = (_flags) & ~COMPLEX_DAT;\
+} while (0)
 #endif
 
 #ifndef USE_PACK
-#define set_to_complex(x, _nth, _jd ,_df, _sf, _of, _sg,\
+#define set_to_complex(obj, x, _nth, _jd ,_df, _sf, _of, _sg,\
 _year, _mon, _mday, _hour, _min, _sec, _flags) \
-{\
-    (x)->nth = canon(_nth);\
+do {\
+    RB_OBJ_WRITE((obj), &(x)->nth, canon(_nth));\
     (x)->jd = _jd;\
     (x)->df = _df;\
-    (x)->sf = canon(_sf);\
+    RB_OBJ_WRITE((obj), &(x)->sf, canon(_sf));\
     (x)->of = _of;\
-    (x)->sg = (sg_cast)(_sg);\
+    (x)->sg = (date_sg_t)(_sg);\
     (x)->year = _year;\
     (x)->mon = _mon;\
     (x)->mday = _mday;\
     (x)->hour = _hour;\
     (x)->min = _min;\
     (x)->sec = _sec;\
-    (x)->flags = _flags;\
-}
+    (x)->flags = (_flags) | COMPLEX_DAT;\
+} while (0)
 #else
-#define set_to_complex(x, _nth, _jd ,_df, _sf, _of, _sg,\
+#define set_to_complex(obj, x, _nth, _jd ,_df, _sf, _of, _sg,\
 _year, _mon, _mday, _hour, _min, _sec, _flags) \
-{\
-    (x)->nth = canon(_nth);\
+do {\
+    RB_OBJ_WRITE((obj), &(x)->nth, canon(_nth));\
     (x)->jd = _jd;\
     (x)->df = _df;\
-    (x)->sf = canon(_sf);\
+    RB_OBJ_WRITE((obj), &(x)->sf, canon(_sf));\
     (x)->of = _of;\
-    (x)->sg = (sg_cast)(_sg);\
+    (x)->sg = (date_sg_t)(_sg);\
     (x)->year = _year;\
     (x)->pc = PACK5(_mon, _mday, _hour, _min, _sec);\
-    (x)->flags = _flags;\
-}
+    (x)->flags = (_flags) | COMPLEX_DAT;\
+} while (0)
 #endif
 
 #ifndef USE_PACK
-#define copy_simple_to_complex(x, y) \
-{\
-    (x)->nth = (y)->nth;\
+#define copy_simple_to_complex(obj, x, y) \
+do {\
+    RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
     (x)->jd = (y)->jd;\
     (x)->df = 0;\
     (x)->sf = INT2FIX(0);\
     (x)->of = 0;\
-    (x)->sg = (sg_cast)((y)->sg);\
+    (x)->sg = (date_sg_t)((y)->sg);\
     (x)->year = (y)->year;\
     (x)->mon = (y)->mon;\
     (x)->mday = (y)->mday;\
@@ -392,43 +395,43 @@ _year, _mon, _mday, _hour, _min, _sec, _flags) \
     (x)->min = 0;\
     (x)->sec = 0;\
     (x)->flags = (y)->flags;\
-}
+} while (0)
 #else
-#define copy_simple_to_complex(x, y) \
-{\
-    (x)->nth = (y)->nth;\
+#define copy_simple_to_complex(obj, x, y) \
+do {\
+    RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
     (x)->jd = (y)->jd;\
     (x)->df = 0;\
-    (x)->sf = INT2FIX(0);\
+    RB_OBJ_WRITE((obj), &(x)->sf, INT2FIX(0));\
     (x)->of = 0;\
-    (x)->sg = (sg_cast)((y)->sg);\
+    (x)->sg = (date_sg_t)((y)->sg);\
     (x)->year = (y)->year;\
     (x)->pc = PACK5(EX_MON((y)->pc), EX_MDAY((y)->pc), 0, 0, 0);\
     (x)->flags = (y)->flags;\
-}
+} while (0)
 #endif
 
 #ifndef USE_PACK
-#define copy_complex_to_simple(x, y) \
-{\
-    (x)->nth = (y)->nth;\
+#define copy_complex_to_simple(obj, x, y) \
+do {\
+    RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
     (x)->jd = (y)->jd;\
-    (x)->sg = (sg_cast)((y)->sg);\
+    (x)->sg = (date_sg_t)((y)->sg);\
     (x)->year = (y)->year;\
     (x)->mon = (y)->mon;\
     (x)->mday = (y)->mday;\
     (x)->flags = (y)->flags;\
-}
+} while (0)
 #else
-#define copy_complex_to_simple(x, y) \
-{\
-    (x)->nth = (y)->nth;\
+#define copy_complex_to_simple(obj, x, y) \
+do {\
+    RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
     (x)->jd = (y)->jd;\
-    (x)->sg = (sg_cast)((y)->sg);\
+    (x)->sg = (date_sg_t)((y)->sg);\
     (x)->year = (y)->year;\
     (x)->pc = PACK2(EX_MON((y)->pc), EX_MDAY((y)->pc));\
     (x)->flags = (y)->flags;\
-}
+} while (0)
 #endif
 
 /* base */
@@ -689,7 +692,7 @@ c_julian_leap_p(int y)
 inline static int
 c_gregorian_leap_p(int y)
 {
-    return MOD(y, 4) == 0 && y % 100 != 0 || MOD(y, 400) == 0;
+    return (MOD(y, 4) == 0 && y % 100 != 0) || MOD(y, 400) == 0;
 }
 
 static int
@@ -990,8 +993,14 @@ safe_mul_p(VALUE x, long m)
     if (!FIXNUM_P(x))
 	return 0;
     ix = FIX2LONG(x);
-    if (ix >= (FIXNUM_MAX / m))
-	return 0;
+    if (ix < 0) {
+	if (ix <= (FIXNUM_MIN / m))
+	    return 0;
+    }
+    else {
+	if (ix >= (FIXNUM_MAX / m))
+	    return 0;
+    }
     return 1;
 }
 
@@ -1108,6 +1117,30 @@ m_virtual_sg(union DateData *x)
 	return c_virtual_sg(x);
 }
 
+#define canonicalize_jd(_nth, _jd) \
+do {\
+    if (_jd < 0) {\
+	_nth = f_sub(_nth, INT2FIX(1));\
+	_jd += CM_PERIOD;\
+    }\
+    if (_jd >= CM_PERIOD) {\
+	_nth = f_add(_nth, INT2FIX(1));\
+	_jd -= CM_PERIOD;\
+    }\
+} while (0)
+
+inline static void
+canonicalize_s_jd(VALUE obj, 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);
+    if (x->s.jd != j)
+	x->flags &= ~HAVE_CIVIL;
+}
+
 inline static void
 get_s_jd(union DateData *x)
 {
@@ -1193,6 +1226,18 @@ get_c_time(union DateData *x)
 }
 
 inline static void
+canonicalize_c_jd(VALUE obj, 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);
+    if (x->c.jd != j)
+	x->flags &= ~HAVE_CIVIL;
+}
+
+inline static void
 get_c_jd(union DateData *x)
 {
     assert(complex_dat_p(x));
@@ -1363,6 +1408,19 @@ guess_style(VALUE y, double sg) /* -/+oo or zero */
     return style;
 }
 
+inline static void
+m_canonicalize_jd(VALUE obj, union DateData *x)
+{
+    if (simple_dat_p(x)) {
+	get_s_jd(x);
+	canonicalize_s_jd(obj, x);
+    }
+    else {
+	get_c_jd(x);
+	canonicalize_c_jd(obj, x);
+    }
+}
+
 inline static VALUE
 m_nth(union DateData *x)
 {
@@ -1677,23 +1735,6 @@ m_real_year(union DateData *x)
     return ry;
 }
 
-
-#ifdef USE_PACK
-inline static int
-m_pc(union DateData *x)
-{
-    if (simple_dat_p(x)) {
-	get_s_civil(x);
-	return x->s.pc;
-    }
-    else {
-	get_c_civil(x);
-	get_c_time(x);
-	return x->c.pc;
-    }
-}
-#endif
-
 inline static int
 m_mon(union DateData *x)
 {
@@ -1896,13 +1937,13 @@ m_sec(union DateData *x)
 }
 
 #define decode_offset(of,s,h,m)\
-{\
+do {\
     int a;\
     s = (of < 0) ? '-' : '+';\
     a = (of < 0) ? -of : of;\
     h = a / HOUR_IN_SECONDS;\
     m = a % HOUR_IN_SECONDS / MINUTE_IN_SECONDS;\
-}
+} while (0)
 
 static VALUE
 of2str(int of)
@@ -1934,12 +1975,6 @@ k_date_p(VALUE x)
 }
 
 inline static VALUE
-k_datetime_p(VALUE x)
-{
-    return f_kind_of_p(x, cDateTime);
-}
-
-inline static VALUE
 k_numeric_p(VALUE x)
 {
     return f_kind_of_p(x, rb_cNumeric);
@@ -1951,6 +1986,13 @@ 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,
@@ -1969,7 +2011,7 @@ civil_to_jd(VALUE y, int m, int d, double sg,
 	    *ry = FIX2INT(y);
 	else {
 	    VALUE nth2;
-	    decode_year(y, ns ? -1 : +1, &nth2, ry);
+	    decode_year(y, *ns ? -1 : +1, &nth2, ry);
 	}
     }
     else {
@@ -2004,7 +2046,7 @@ ordinal_to_jd(VALUE y, int d, double sg,
 	    *ry = FIX2INT(y);
 	else {
 	    VALUE nth2;
-	    decode_year(y, ns ? -1 : +1, &nth2, ry);
+	    decode_year(y, *ns ? -1 : +1, &nth2, ry);
 	}
     }
     else {
@@ -2039,7 +2081,7 @@ commercial_to_jd(VALUE y, int w, int d, double sg,
 	    *ry = FIX2INT(y);
 	else {
 	    VALUE nth2;
-	    decode_year(y, ns ? -1 : +1, &nth2, ry);
+	    decode_year(y, *ns ? -1 : +1, &nth2, ry);
 	}
     }
     else {
@@ -2074,7 +2116,7 @@ weeknum_to_jd(VALUE y, int w, int d, int f, double sg,
 	    *ry = FIX2INT(y);
 	else {
 	    VALUE nth2;
-	    decode_year(y, ns ? -1 : +1, &nth2, ry);
+	    decode_year(y, *ns ? -1 : +1, &nth2, ry);
 	}
     }
     else {
@@ -2109,7 +2151,7 @@ nth_kday_to_jd(VALUE y, int m, int n, int k, double sg,
 	    *ry = FIX2INT(y);
 	else {
 	    VALUE nth2;
-	    decode_year(y, ns ? -1 : +1, &nth2, ry);
+	    decode_year(y, *ns ? -1 : +1, &nth2, ry);
 	}
     }
     else {
@@ -2148,7 +2190,7 @@ valid_ordinal_p(VALUE y, int d, double sg,
 	    *ry = FIX2INT(y);
 	else {
 	    VALUE nth2;
-	    decode_year(y, ns ? -1 : +1, &nth2, ry);
+	    decode_year(y, *ns ? -1 : +1, &nth2, ry);
 	}
     }
     else {
@@ -2187,7 +2229,7 @@ valid_civil_p(VALUE y, int m, int d, double sg,
 	    *ry = FIX2INT(y);
 	else {
 	    VALUE nth2;
-	    decode_year(y, ns ? -1 : +1, &nth2, ry);
+	    decode_year(y, *ns ? -1 : +1, &nth2, ry);
 	}
     }
     else {
@@ -2223,7 +2265,7 @@ valid_commercial_p(VALUE y, int w, int d, double sg,
 	    *ry = FIX2INT(y);
 	else {
 	    VALUE nth2;
-	    decode_year(y, ns ? -1 : +1, &nth2, ry);
+	    decode_year(y, *ns ? -1 : +1, &nth2, ry);
 	}
     }
     else {
@@ -2253,7 +2295,7 @@ valid_weeknum_p(VALUE y, int w, int d, int f, double sg,
 	    *ry = FIX2INT(y);
 	else {
 	    VALUE nth2;
-	    decode_year(y, ns ? -1 : +1, &nth2, ry);
+	    decode_year(y, *ns ? -1 : +1, &nth2, ry);
 	}
     }
     else {
@@ -2284,7 +2326,7 @@ valid_nth_kday_p(VALUE y, int m, int n, int k, double sg,
 	    *ry = FIX2INT(y);
 	else {
 	    VALUE nth2;
-	    decode_year(y, ns ? -1 : +1, &nth2, ry);
+	    decode_year(y, *ns ? -1 : +1, &nth2, ry);
 	}
     }
     else {
@@ -2300,6 +2342,9 @@ VALUE date_zone_to_diff(VALUE);
 static int
 offset_to_sec(VALUE vof, int *rof)
 {
+    int try_rational = 1;
+
+  again:
     switch (TYPE(vof)) {
       case T_FIXNUM:
 	{
@@ -2324,13 +2369,13 @@ offset_to_sec(VALUE vof, int *rof)
 	    return 1;
 	}
       default:
-	if (!k_numeric_p(vof))
-	    rb_raise(rb_eTypeError, "expected numeric");
+	expect_numeric(vof);
 	vof = f_to_r(vof);
-#ifdef CANONICALIZATION_FOR_MATHN
-	if (!k_rational_p(vof))
-	    return offset_to_sec(vof, rof);
-#endif
+	if (!k_rational_p(vof)) {
+	    if (!try_rational) Check_Type(vof, T_RATIONAL);
+	    try_rational = 0;
+	    goto again;
+	}
 	/* fall through */
       case T_RATIONAL:
 	{
@@ -2339,19 +2384,12 @@ offset_to_sec(VALUE vof, int *rof)
 
 	    vs = day_to_sec(vof);
 
-#ifdef CANONICALIZATION_FOR_MATHN
 	    if (!k_rational_p(vs)) {
-		if (!FIXNUM_P(vs))
-		    return 0;
-		n = FIX2LONG(vs);
-		if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
-		    return 0;
-		*rof = (int)n;
-		return 1;
+		vn = vs;
+		goto rounded;
 	    }
-#endif
-	    vn = RRATIONAL(vs)->num;
-	    vd = RRATIONAL(vs)->den;
+	    vn = rb_rational_num(vs);
+	    vd = rb_rational_den(vs);
 
 	    if (FIXNUM_P(vn) && FIXNUM_P(vd) && (FIX2LONG(vd) == 1))
 		n = FIX2LONG(vn);
@@ -2359,6 +2397,7 @@ offset_to_sec(VALUE vof, int *rof)
 		vn = f_round(vs);
 		if (!f_eqeq_p(vn, vs))
 		    rb_warning("fraction of offset is ignored");
+	      rounded:
 		if (!FIXNUM_P(vn))
 		    return 0;
 		n = FIX2LONG(vn);
@@ -2378,7 +2417,7 @@ offset_to_sec(VALUE vof, int *rof)
 	    n = FIX2LONG(vs);
 	    if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
 		return 0;
-	    *rof = n;
+	    *rof = (int)n;
 	    return 1;
 	}
     }
@@ -2388,12 +2427,12 @@ offset_to_sec(VALUE vof, int *rof)
 /* date */
 
 #define valid_sg(sg) \
-{\
+do {\
     if (!c_valid_start_p(sg)) {\
 	sg = 0;\
 	rb_warning("invalid start is ignored");\
     }\
-}
+} while (0)
 
 static VALUE
 valid_jd_sub(int argc, VALUE *argv, VALUE klass, int need_jd)
@@ -2428,11 +2467,9 @@ date_s__valid_jd_p(int argc, VALUE *argv, VALUE klass)
  *
  * Just returns true.  It's nonsense, but is for symmetry.
  *
- * For example:
- *
  *    Date.valid_jd?(2451944)		#=> true
  *
- * See also jd.
+ * See also ::jd.
  */
 static VALUE
 date_s_valid_jd_p(int argc, VALUE *argv, VALUE klass)
@@ -2442,6 +2479,7 @@ date_s_valid_jd_p(int argc, VALUE *argv, VALUE klass)
 
     rb_scan_args(argc, argv, "11", &vjd, &vsg);
 
+    RETURN_FALSE_UNLESS_NUMERIC(vjd);
     argv2[0] = vjd;
     if (argc < 2)
 	argv2[1] = INT2FIX(DEFAULT_SG);
@@ -2517,13 +2555,14 @@ date_s__valid_civil_p(int argc, VALUE *argv, VALUE klass)
  *    Date.valid_date?(year, month, mday[, start=Date::ITALY])   ->  bool
  *
  * Returns true if the given calendar date is valid, and false if not.
- *
- * For example:
+ * Valid in this context is whether the arguments passed to this
+ * method would be accepted by ::new.
  *
  *    Date.valid_date?(2001,2,3)	#=> true
  *    Date.valid_date?(2001,2,29)	#=> false
+ *    Date.valid_date?(2001,2,-1)	#=> true
  *
- * See also jd and civil.
+ * See also ::jd and ::civil.
  */
 static VALUE
 date_s_valid_civil_p(int argc, VALUE *argv, VALUE klass)
@@ -2533,6 +2572,9 @@ date_s_valid_civil_p(int argc, VALUE *argv, VALUE klass)
 
     rb_scan_args(argc, argv, "31", &vy, &vm, &vd, &vsg);
 
+    RETURN_FALSE_UNLESS_NUMERIC(vy);
+    RETURN_FALSE_UNLESS_NUMERIC(vm);
+    RETURN_FALSE_UNLESS_NUMERIC(vd);
     argv2[0] = vy;
     argv2[1] = vm;
     argv2[2] = vd;
@@ -2601,12 +2643,10 @@ date_s__valid_ordinal_p(int argc, VALUE *argv, VALUE klass)
  *
  * Returns true if the given ordinal date is valid, and false if not.
  *
- * For example:
- *
  *    Date.valid_ordinal?(2001,34)	#=> true
  *    Date.valid_ordinal?(2001,366)	#=> false
  *
- * See also jd and ordinal.
+ * See also ::jd and ::ordinal.
  */
 static VALUE
 date_s_valid_ordinal_p(int argc, VALUE *argv, VALUE klass)
@@ -2616,6 +2656,8 @@ date_s_valid_ordinal_p(int argc, VALUE *argv, VALUE klass)
 
     rb_scan_args(argc, argv, "21", &vy, &vd, &vsg);
 
+    RETURN_FALSE_UNLESS_NUMERIC(vy);
+    RETURN_FALSE_UNLESS_NUMERIC(vd);
     argv2[0] = vy;
     argv2[1] = vd;
     if (argc < 3)
@@ -2685,12 +2727,10 @@ date_s__valid_commercial_p(int argc, VALUE *argv, VALUE klass)
  *
  * Returns true if the given week date is valid, and false if not.
  *
- * For example:
- *
  *    Date.valid_commercial?(2001,5,6)	#=> true
  *    Date.valid_commercial?(2001,5,8)	#=> false
  *
- * See also jd and commercial.
+ * See also ::jd and ::commercial.
  */
 static VALUE
 date_s_valid_commercial_p(int argc, VALUE *argv, VALUE klass)
@@ -2700,6 +2740,9 @@ date_s_valid_commercial_p(int argc, VALUE *argv, VALUE klass)
 
     rb_scan_args(argc, argv, "31", &vy, &vw, &vd, &vsg);
 
+    RETURN_FALSE_UNLESS_NUMERIC(vy);
+    RETURN_FALSE_UNLESS_NUMERIC(vw);
+    RETURN_FALSE_UNLESS_NUMERIC(vd);
     argv2[0] = vy;
     argv2[1] = vw;
     argv2[2] = vd;
@@ -2872,8 +2915,6 @@ date_s_zone_to_diff(VALUE klass, VALUE str)
  * Returns true if the given year is a leap year of the proleptic
  * Julian calendar.
  *
- * For example:
- *
  *    Date.julian_leap?(1900)		#=> true
  *    Date.julian_leap?(1901)		#=> false
  */
@@ -2883,6 +2924,7 @@ date_s_julian_leap_p(VALUE klass, VALUE y)
     VALUE nth;
     int ry;
 
+    check_numeric(y, "year");
     decode_year(y, +1, &nth, &ry);
     return f_boolcast(c_julian_leap_p(ry));
 }
@@ -2895,8 +2937,6 @@ date_s_julian_leap_p(VALUE klass, VALUE y)
  * Returns true if the given year is a leap year of the proleptic
  * Gregorian calendar.
  *
- * For example:
- *
  *    Date.gregorian_leap?(1900)	#=> false
  *    Date.gregorian_leap?(2000)	#=> true
  */
@@ -2906,22 +2946,37 @@ date_s_gregorian_leap_p(VALUE klass, VALUE y)
     VALUE nth;
     int ry;
 
+    check_numeric(y, "year");
     decode_year(y, -1, &nth, &ry);
     return f_boolcast(c_gregorian_leap_p(ry));
 }
 
 static void
-d_lite_gc_mark(union DateData *dat)
+d_lite_gc_mark(void *ptr)
 {
+    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,
@@ -2932,9 +2987,9 @@ d_simple_new_internal(VALUE klass,
     struct SimpleDateData *dat;
     VALUE obj;
 
-    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);
+    obj = TypedData_Make_Struct(klass, struct SimpleDateData,
+				&d_lite_type, dat);
+    set_to_simple(obj, dat, nth, jd, sg, y, m, d, flags);
 
     assert(have_jd_p(dat) || have_civil_p(dat));
 
@@ -2953,10 +3008,10 @@ d_complex_new_internal(VALUE klass,
     struct ComplexDateData *dat;
     VALUE obj;
 
-    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);
+    obj = TypedData_Make_Struct(klass, struct ComplexDateData,
+				&d_lite_type, dat);
+    set_to_complex(obj, dat, nth, jd, df, sf, of, sg,
+		   y, m, d, h, min, s, flags);
 
     assert(have_jd_p(dat) || have_civil_p(dat));
     assert(have_df_p(dat) || have_time_p(dat));
@@ -3015,7 +3070,7 @@ old_to_new(VALUE ajd, VALUE of, VALUE sg,
     *rsg = NUM2DBL(sg);
 
     if (*rdf < 0 || *rdf >= DAY_IN_SECONDS)
-	rb_raise(rb_eArgError, "invalid day fraction");
+	rb_raise(eDateError, "invalid day fraction");
 
     if (f_lt_p(*rsf, INT2FIX(0)) ||
 	f_ge_p(*rsf, INT2FIX(SECOND_IN_NANOSECONDS)))
@@ -3086,7 +3141,7 @@ wholenum_p(VALUE x)
 	break;
       case T_RATIONAL:
 	{
-	    VALUE den = RRATIONAL(x)->den;
+	    VALUE den = rb_rational_den(x);
 	    return FIXNUM_P(den) && FIX2LONG(den) == 1;
 	}
 	break;
@@ -3095,14 +3150,23 @@ wholenum_p(VALUE x)
 }
 
 inline static VALUE
+to_integer(VALUE x)
+{
+    if (RB_INTEGER_TYPE_P(x))
+	return x;
+    return f_to_i(x);
+}
+
+inline static VALUE
 d_trunc(VALUE d, VALUE *fr)
 {
     VALUE rd;
 
     if (wholenum_p(d)) {
-	rd = d;
+	rd = to_integer(d);
 	*fr = INT2FIX(0);
-    } else {
+    }
+    else {
 	rd = f_idiv(d, INT2FIX(1));
 	*fr = f_mod(d, INT2FIX(1));
     }
@@ -3118,9 +3182,10 @@ h_trunc(VALUE h, VALUE *fr)
     VALUE rh;
 
     if (wholenum_p(h)) {
-	rh = h;
+	rh = to_integer(h);
 	*fr = INT2FIX(0);
-    } else {
+    }
+    else {
 	rh = f_idiv(h, INT2FIX(1));
 	*fr = f_mod(h, INT2FIX(1));
 	*fr = f_quo(*fr, INT2FIX(24));
@@ -3134,9 +3199,10 @@ min_trunc(VALUE min, VALUE *fr)
     VALUE rmin;
 
     if (wholenum_p(min)) {
-	rmin = min;
+	rmin = to_integer(min);
 	*fr = INT2FIX(0);
-    } else {
+    }
+    else {
 	rmin = f_idiv(min, INT2FIX(1));
 	*fr = f_mod(min, INT2FIX(1));
 	*fr = f_quo(*fr, INT2FIX(1440));
@@ -3150,9 +3216,10 @@ s_trunc(VALUE s, VALUE *fr)
     VALUE rs;
 
     if (wholenum_p(s)) {
-	rs = s;
+	rs = to_integer(s);
 	*fr = INT2FIX(0);
-    } else {
+    }
+    else {
 	rs = f_idiv(s, INT2FIX(1));
 	*fr = f_mod(s, INT2FIX(1));
 	*fr = f_quo(*fr, INT2FIX(86400));
@@ -3161,47 +3228,47 @@ s_trunc(VALUE s, VALUE *fr)
 }
 
 #define num2num_with_frac(s,n) \
-{\
+do {\
     s = s##_trunc(v##s, &fr);\
     if (f_nonzero_p(fr)) {\
 	if (argc > n)\
-	    rb_raise(rb_eArgError, "invalid fraction");\
+	    rb_raise(eDateError, "invalid fraction");\
 	fr2 = fr;\
     }\
-}
+} while (0)
 
 #define num2int_with_frac(s,n) \
-{\
+do {\
     s = NUM2INT(s##_trunc(v##s, &fr));\
     if (f_nonzero_p(fr)) {\
 	if (argc > n)\
-	    rb_raise(rb_eArgError, "invalid fraction");\
+	    rb_raise(eDateError, "invalid fraction");\
 	fr2 = fr;\
     }\
-}
+} while (0)
 
 #define canon24oc() \
-{\
+do {\
     if (rh == 24) {\
 	rh = 0;\
 	fr2 = f_add(fr2, INT2FIX(1));\
     }\
-}
+} while (0)
 
 #define add_frac() \
-{\
+do {\
     if (f_nonzero_p(fr2))\
 	ret = d_lite_plus(ret, fr2);\
-}
+} while (0)
 
 #define val2sg(vsg,dsg) \
-{\
+do {\
     dsg = NUM2DBL(vsg);\
     if (!c_valid_start_p(dsg)) {\
 	dsg = DEFAULT_SG;\
 	rb_warning("invalid start is ignored");\
     }\
-}
+} while (0)
 
 static VALUE d_lite_plus(VALUE, VALUE);
 
@@ -3212,13 +3279,11 @@ static VALUE d_lite_plus(VALUE, VALUE);
  * Creates a date object denoting the given chronological Julian day
  * number.
  *
- * For example:
- *
  *    Date.jd(2451944)		#=> #<Date: 2001-02-03 ...>
  *    Date.jd(2451945)		#=> #<Date: 2001-02-04 ...>
  *    Date.jd(0)		#=> #<Date: -4712-01-01 ...>
  *
- * See also new.
+ * See also ::new.
  */
 static VALUE
 date_s_jd(int argc, VALUE *argv, VALUE klass)
@@ -3236,6 +3301,7 @@ date_s_jd(int argc, VALUE *argv, VALUE klass)
       case 2:
 	val2sg(vsg, sg);
       case 1:
+        check_numeric(vjd, "jd");
 	num2num_with_frac(jd, positive_inf);
     }
 
@@ -3264,13 +3330,11 @@ date_s_jd(int argc, VALUE *argv, VALUE klass)
  * relative day from the end of year when negative).  It should not be
  * zero.
  *
- * For example:
- *
  *    Date.ordinal(2001)	#=> #<Date: 2001-01-01 ...>
  *    Date.ordinal(2001,34)	#=> #<Date: 2001-02-03 ...>
  *    Date.ordinal(2001,-1)	#=> #<Date: 2001-12-31 ...>
  *
- * See also jd and new.
+ * See also ::jd and ::new.
  */
 static VALUE
 date_s_ordinal(int argc, VALUE *argv, VALUE klass)
@@ -3290,8 +3354,10 @@ date_s_ordinal(int argc, VALUE *argv, VALUE klass)
       case 3:
 	val2sg(vsg, sg);
       case 2:
+        check_numeric(vd, "yday");
 	num2int_with_frac(d, positive_inf);
       case 1:
+        check_numeric(vy, "year");
 	y = vy;
     }
 
@@ -3303,7 +3369,7 @@ date_s_ordinal(int argc, VALUE *argv, VALUE klass)
 			     &nth, &ry,
 			     &rd, &rjd,
 			     &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
 	ret = d_simple_new_internal(klass,
 				     nth, rjd,
@@ -3334,20 +3400,29 @@ date_s_ordinal(int argc, VALUE *argv, VALUE klass)
  * Gregorian calendar) and Date::JULIAN (the proleptic Julian
  * calendar) can be specified as a day of calendar reform.
  *
- * For example:
- *
  *    Date.new(2001)		#=> #<Date: 2001-01-01 ...>
  *    Date.new(2001,2,3)	#=> #<Date: 2001-02-03 ...>
  *    Date.new(2001,2,-1)	#=> #<Date: 2001-02-28 ...>
  *
- * See also jd.
+ * See also ::jd.
  */
 static VALUE
 date_s_civil(int argc, VALUE *argv, VALUE klass)
 {
+    return date_initialize(argc, argv, d_lite_s_alloc_simple(klass));
+}
+
+static VALUE
+date_initialize(int argc, VALUE *argv, VALUE self)
+{
     VALUE vy, vm, vd, vsg, y, fr, fr2, ret;
     int m, d;
     double sg;
+    struct SimpleDateData *dat = rb_check_typeddata(self, &d_lite_type);
+
+    if (!simple_dat_p(dat)) {
+	rb_raise(rb_eTypeError, "Date expected");
+    }
 
     rb_scan_args(argc, argv, "04", &vy, &vm, &vd, &vsg);
 
@@ -3361,10 +3436,13 @@ date_s_civil(int argc, VALUE *argv, VALUE klass)
       case 4:
 	val2sg(vsg, sg);
       case 3:
+        check_numeric(vd, "day");
 	num2int_with_frac(d, positive_inf);
       case 2:
+        check_numeric(vm, "month");
 	m = NUM2INT(vm);
       case 1:
+        check_numeric(vy, "year");
 	y = vy;
     }
 
@@ -3375,13 +3453,9 @@ date_s_civil(int argc, VALUE *argv, VALUE klass)
 	if (!valid_gregorian_p(y, m, d,
 			       &nth, &ry,
 			       &rm, &rd))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
-	ret = d_simple_new_internal(klass,
-				    nth, 0,
-				    sg,
-				    ry, rm, rd,
-				    HAVE_CIVIL);
+	set_to_simple(self, dat, nth, 0, sg, ry, rm, rd, HAVE_CIVIL);
     }
     else {
 	VALUE nth;
@@ -3391,14 +3465,11 @@ date_s_civil(int argc, VALUE *argv, VALUE klass)
 			   &nth, &ry,
 			   &rm, &rd, &rjd,
 			   &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
-	ret = d_simple_new_internal(klass,
-				    nth, rjd,
-				    sg,
-				    ry, rm, rd,
-				    HAVE_JD | HAVE_CIVIL);
+	set_to_simple(self, dat, nth, rjd, sg, ry, rm, rd, HAVE_JD | HAVE_CIVIL);
     }
+    ret = self;
     add_frac();
     return ret;
 }
@@ -3413,13 +3484,11 @@ date_s_civil(int argc, VALUE *argv, VALUE klass)
  * number (as a relative week/day from the end of year/week when
  * negative).  They should not be zero.
  *
- * For example:
- *
  *    Date.commercial(2001)	#=> #<Date: 2001-01-01 ...>
  *    Date.commercial(2002)	#=> #<Date: 2001-12-31 ...>
  *    Date.commercial(2001,5,6)	#=> #<Date: 2001-02-03 ...>
  *
- * See also jd and new.
+ * See also ::jd and ::new.
  */
 static VALUE
 date_s_commercial(int argc, VALUE *argv, VALUE klass)
@@ -3440,10 +3509,13 @@ date_s_commercial(int argc, VALUE *argv, VALUE klass)
       case 4:
 	val2sg(vsg, sg);
       case 3:
+        check_numeric(vd, "cwday");
 	num2int_with_frac(d, positive_inf);
       case 2:
+        check_numeric(vw, "cweek");
 	w = NUM2INT(vw);
       case 1:
+        check_numeric(vy, "year");
 	y = vy;
     }
 
@@ -3455,7 +3527,7 @@ date_s_commercial(int argc, VALUE *argv, VALUE klass)
 				&nth, &ry,
 				&rw, &rd, &rjd,
 				&ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
 	ret = d_simple_new_internal(klass,
 				    nth, rjd,
@@ -3505,7 +3577,7 @@ date_s_weeknum(int argc, VALUE *argv, VALUE klass)
 			     &nth, &ry,
 			     &rw, &rd, &rjd,
 			     &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
 	ret = d_simple_new_internal(klass,
 				    nth, rjd,
@@ -3554,7 +3626,7 @@ date_s_nth_kday(int argc, VALUE *argv, VALUE klass)
 			      &nth, &ry,
 			      &rm, &rn, &rk, &rjd,
 			      &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
 	ret = d_simple_new_internal(klass,
 				    nth, rjd,
@@ -3569,6 +3641,15 @@ date_s_nth_kday(int argc, VALUE *argv, VALUE klass)
 
 #if !defined(HAVE_GMTIME_R)
 static struct tm*
+gmtime_r(const time_t *t, struct tm *tm)
+{
+    auto struct tm *tmp = gmtime(t);
+    if (tmp)
+	*tm = *tmp;
+    return tmp;
+}
+
+static struct tm*
 localtime_r(const time_t *t, struct tm *tm)
 {
     auto struct tm *tmp = localtime(t);
@@ -3584,11 +3665,9 @@ static void set_sg(union DateData *, double);
  * call-seq:
  *    Date.today([start=Date::ITALY])  ->  date
  *
- * For example:
- *
- *    Date.today		#=> #<Date: 2011-06-11 ..>
- *
  * Creates a date object denoting the present day.
+ *
+ *    Date.today   #=> #<Date: 2011-06-11 ...>
  */
 static VALUE
 date_s_today(int argc, VALUE *argv, VALUE klass)
@@ -3608,6 +3687,7 @@ date_s_today(int argc, VALUE *argv, VALUE klass)
 
     if (time(&t) == -1)
 	rb_sys_fail("time");
+    tzset();
     if (!localtime_r(&t, &tm))
 	rb_sys_fail("localtime");
 
@@ -3633,18 +3713,24 @@ date_s_today(int argc, VALUE *argv, VALUE klass)
 #define ref_hash0(k) rb_hash_aref(hash, k)
 #define del_hash0(k) rb_hash_delete(hash, k)
 
-#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k)), v)
-#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k)))
-#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k)))
+#define sym(x) ID2SYM(rb_intern(x""))
+
+#define set_hash(k,v) set_hash0(sym(k), v)
+#define ref_hash(k) ref_hash0(sym(k))
+#define del_hash(k) del_hash0(sym(k))
 
 static VALUE
 rt_rewrite_frags(VALUE hash)
 {
     VALUE seconds;
 
-    seconds = ref_hash("seconds");
+    seconds = del_hash("seconds");
     if (!NIL_P(seconds)) {
-	VALUE d, h, min, s, fr;
+	VALUE offset, d, h, min, s, fr;
+
+	offset = ref_hash("offset");
+	if (!NIL_P(offset))
+	    seconds = f_add(seconds, offset);
 
 	d = f_idiv(seconds, INT2FIX(DAY_IN_SECONDS));
 	fr = f_mod(seconds, INT2FIX(DAY_IN_SECONDS));
@@ -3663,14 +3749,10 @@ rt_rewrite_frags(VALUE hash)
 	set_hash("min", min);
 	set_hash("sec", s);
 	set_hash("sec_fraction", fr);
-	del_hash("seconds");
-	del_hash("offset");
     }
     return hash;
 }
 
-#define sym(x) ID2SYM(rb_intern(x))
-
 static VALUE d_lite_year(VALUE);
 static VALUE d_lite_wday(VALUE);
 static VALUE d_lite_jd(VALUE);
@@ -3679,7 +3761,8 @@ static VALUE
 rt_complete_frags(VALUE klass, VALUE hash)
 {
     static VALUE tab = Qnil;
-    int g, e;
+    int g;
+    long e;
     VALUE k, a, d;
 
     if (NIL_P(tab)) {
@@ -3776,19 +3859,19 @@ rt_complete_frags(VALUE klass, VALUE hash)
     }
 
     {
-	int i, eno = 0, idx = 0;
+	long i, eno = 0, idx = 0;
 
-	for (i = 0; i < RARRAY_LENINT(tab); i++) {
+	for (i = 0; i < RARRAY_LEN(tab); i++) {
 	    VALUE x, a;
 
-	    x = RARRAY_PTR(tab)[i];
-	    a = RARRAY_PTR(x)[1];
+	    x = RARRAY_AREF(tab, i);
+	    a = RARRAY_AREF(x, 1);
 
 	    {
-		int j, n = 0;
+		long j, n = 0;
 
-		for (j = 0; j < RARRAY_LENINT(a); j++)
-		    if (!NIL_P(ref_hash0(RARRAY_PTR(a)[j])))
+		for (j = 0; j < RARRAY_LEN(a); j++)
+		    if (!NIL_P(ref_hash0(RARRAY_AREF(a, j))))
 			n++;
 		if (n > eno) {
 		    eno = n;
@@ -3800,15 +3883,15 @@ rt_complete_frags(VALUE klass, VALUE hash)
 	    g = 0;
 	else {
 	    g = 1;
-	    k = RARRAY_PTR(RARRAY_PTR(tab)[idx])[0];
-	    a = RARRAY_PTR(RARRAY_PTR(tab)[idx])[1];
+	    k = RARRAY_AREF(RARRAY_AREF(tab, idx), 0);
+	    a = RARRAY_AREF(RARRAY_AREF(tab, idx), 1);
 	    e =	eno;
 	}
     }
 
     d = Qnil;
 
-    if (g && !NIL_P(k) && (RARRAY_LENINT(a) - e)) {
+    if (g && !NIL_P(k) && (RARRAY_LEN(a) - e)) {
 	if (k == sym("ordinal")) {
 	    if (NIL_P(ref_hash("year"))) {
 		if (NIL_P(d))
@@ -3819,10 +3902,10 @@ rt_complete_frags(VALUE klass, VALUE hash)
 		set_hash("yday", INT2FIX(1));
 	}
 	else if (k == sym("civil")) {
-	    int i;
+	    long i;
 
-	    for (i = 0; i < RARRAY_LENINT(a); i++) {
-		VALUE e = RARRAY_PTR(a)[i];
+	    for (i = 0; i < RARRAY_LEN(a); i++) {
+		VALUE e = RARRAY_AREF(a, i);
 
 		if (!NIL_P(ref_hash0(e)))
 		    break;
@@ -3836,10 +3919,10 @@ rt_complete_frags(VALUE klass, VALUE hash)
 		set_hash("mday", INT2FIX(1));
 	}
 	else if (k == sym("commercial")) {
-	    int i;
+	    long i;
 
-	    for (i = 0; i < RARRAY_LENINT(a); i++) {
-		VALUE e = RARRAY_PTR(a)[i];
+	    for (i = 0; i < RARRAY_LEN(a); i++) {
+		VALUE e = RARRAY_AREF(a, i);
 
 		if (!NIL_P(ref_hash0(e)))
 		    break;
@@ -3860,10 +3943,10 @@ rt_complete_frags(VALUE klass, VALUE hash)
 					   ref_hash("wday"))));
 	}
 	else if (k == sym("wnum0")) {
-	    int i;
+	    long i;
 
-	    for (i = 0; i < RARRAY_LENINT(a); i++) {
-		VALUE e = RARRAY_PTR(a)[i];
+	    for (i = 0; i < RARRAY_LEN(a); i++) {
+		VALUE e = RARRAY_AREF(a, i);
 
 		if (!NIL_P(ref_hash0(e)))
 		    break;
@@ -3877,10 +3960,10 @@ rt_complete_frags(VALUE klass, VALUE hash)
 		set_hash("wday", INT2FIX(0));
 	}
 	else if (k == sym("wnum1")) {
-	    int i;
+	    long i;
 
-	    for (i = 0; i < RARRAY_LENINT(a); i++) {
-		VALUE e = RARRAY_PTR(a)[i];
+	    for (i = 0; i < RARRAY_LEN(a); i++) {
+		VALUE e = RARRAY_AREF(a, i);
 
 		if (!NIL_P(ref_hash0(e)))
 		    break;
@@ -4090,7 +4173,7 @@ d_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
     }
 
     if (NIL_P(hash))
-	rb_raise(rb_eArgError, "invalid date");
+	rb_raise(eDateError, "invalid date");
 
     if (NIL_P(ref_hash("jd")) &&
 	NIL_P(ref_hash("yday")) &&
@@ -4107,7 +4190,7 @@ d_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
     }
 
     if (NIL_P(jd))
-	rb_raise(rb_eArgError, "invalid date");
+	rb_raise(eDateError, "invalid date");
     {
 	VALUE nth;
 	int rjd;
@@ -4162,12 +4245,10 @@ date_s__strptime_internal(int argc, VALUE *argv, VALUE klass,
 
 	if (!NIL_P(zone)) {
 	    rb_enc_copy(zone, vstr);
-	    OBJ_INFECT(zone, vstr);
 	    set_hash("zone", zone);
 	}
 	if (!NIL_P(left)) {
 	    rb_enc_copy(left, vstr);
-	    OBJ_INFECT(left, vstr);
 	    set_hash("leftover", left);
 	}
     }
@@ -4180,14 +4261,13 @@ date_s__strptime_internal(int argc, VALUE *argv, VALUE klass,
  *    Date._strptime(string[, format='%F'])  ->  hash
  *
  * Parses the given representation of date and time with the given
- * template, and returns a hash of parsed elements.
- *
- * For example:
+ * template, and returns a hash of parsed elements.  _strptime does
+ * not support specification of flags and width unlike strftime.
  *
  *    Date._strptime('2001-02-03', '%Y-%m-%d')
  *				#=> {:year=>2001, :mon=>2, :mday=>3}
  *
- *  See also strptime(3) and strftime.
+ * See also strptime(3) and #strftime.
  */
 static VALUE
 date_s__strptime(int argc, VALUE *argv, VALUE klass)
@@ -4197,12 +4277,11 @@ date_s__strptime(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    Date.strptime([string='-4712-01-01'[, format='%F'[, start=ITALY]]])  ->  date
+ *    Date.strptime([string='-4712-01-01'[, format='%F'[, start=Date::ITALY]]])  ->  date
  *
  * Parses the given representation of date and time with the given
- * template, and creates a date object.
- *
- * For example:
+ * template, and creates a date object.  strptime does not support
+ * specification of flags and width unlike strftime.
  *
  *    Date.strptime('2001-02-03', '%Y-%m-%d')	#=> #<Date: 2001-02-03 ...>
  *    Date.strptime('03-02-2001', '%d-%m-%Y')	#=> #<Date: 2001-02-03 ...>
@@ -4212,7 +4291,7 @@ date_s__strptime(int argc, VALUE *argv, VALUE klass)
  *    Date.strptime('2001 05 6', '%Y %W %u')	#=> #<Date: 2001-02-03 ...>
  *    Date.strptime('sat3feb01', '%a%d%b%y')	#=> #<Date: 2001-02-03 ...>
  *
- * See also strptime(3) and strftime.
+ * See also strptime(3) and #strftime.
  */
 static VALUE
 date_s_strptime(int argc, VALUE *argv, VALUE klass)
@@ -4257,16 +4336,6 @@ date_s__parse_internal(int argc, VALUE *argv, VALUE klass)
 
     hash = date__parse(vstr, vcomp);
 
-    {
-	VALUE zone = ref_hash("zone");
-
-	if (!NIL_P(zone)) {
-	    rb_enc_copy(zone, vstr);
-	    OBJ_INFECT(zone, vstr);
-	    set_hash("zone", zone);
-	}
-    }
-
     return hash;
 }
 
@@ -4275,14 +4344,13 @@ date_s__parse_internal(int argc, VALUE *argv, VALUE klass)
  *    Date._parse(string[, comp=true])  ->  hash
  *
  * Parses the given representation of date and time, and returns a
- * hash of parsed elements.
+ * hash of parsed elements.  This method does not function as a
+ * validator.
  *
  * If the optional second argument is true and the detected year is in
  * the range "00" to "99", considers the year a 2-digit form and makes
  * it full.
  *
- * For example:
- *
  *    Date._parse('2001-02-03')	#=> {:year=>2001, :mon=>2, :mday=>3}
  */
 static VALUE
@@ -4293,17 +4361,15 @@ date_s__parse(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    Date.parse(string='-4712-01-01'[, comp=true[, start=ITALY]])  ->  date
+ *    Date.parse(string='-4712-01-01'[, comp=true[, start=Date::ITALY]])  ->  date
  *
  * Parses the given representation of date and time, and creates a
- * date object.
+ * date object.  This method does not function as a validator.
  *
  * If the optional second argument is true and the detected year is in
  * the range "00" to "99", considers the year a 2-digit form and makes
  * it full.
  *
- * For example:
- *
  *    Date.parse('2001-02-03')		#=> #<Date: 2001-02-03 ...>
  *    Date.parse('20010203')		#=> #<Date: 2001-02-03 ...>
  *    Date.parse('3rd Feb 2001')	#=> #<Date: 2001-02-03 ...>
@@ -4355,13 +4421,11 @@ date_s__iso8601(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *    Date.iso8601(string='-4712-01-01'[, start=ITALY])  ->  date
+ *    Date.iso8601(string='-4712-01-01'[, start=Date::ITALY])  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical ISO 8601 formats.
  *
- * For example:
- *
  *    Date.iso8601('2001-02-03')	#=> #<Date: 2001-02-03 ...>
  *    Date.iso8601('20010203')		#=> #<Date: 2001-02-03 ...>
  *    Date.iso8601('2001-W05-6')	#=> #<Date: 2001-02-03 ...>
@@ -4400,13 +4464,11 @@ date_s__rfc3339(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *    Date.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  date
+ *    Date.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical RFC 3339 formats.
  *
- * For example:
- *
  *    Date.rfc3339('2001-02-03T04:05:06+07:00')	#=> #<Date: 2001-02-03 ...>
  */
 static VALUE
@@ -4443,13 +4505,11 @@ date_s__xmlschema(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *    Date.xmlschema(string='-4712-01-01'[, start=ITALY])  ->  date
+ *    Date.xmlschema(string='-4712-01-01'[, start=Date::ITALY])  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical XML Schema formats.
  *
- * For example:
- *
  *    Date.xmlschema('2001-02-03')	#=> #<Date: 2001-02-03 ...>
  */
 static VALUE
@@ -4487,14 +4547,12 @@ date_s__rfc2822(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *    Date.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=ITALY])  ->  date
- *    Date.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=ITALY])   ->  date
+ *    Date.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY])  ->  date
+ *    Date.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY])   ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical RFC 2822 formats.
  *
- * For example:
- *
  *    Date.rfc2822('Sat, 3 Feb 2001 00:00:00 +0000')
  *						#=> #<Date: 2001-02-03 ...>
  */
@@ -4532,16 +4590,13 @@ date_s__httpdate(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *    Date.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=ITALY])  ->  date
+ *    Date.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=Date::ITALY])  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some RFC 2616 format.
  *
- * For example:
- *
  *    Date.httpdate('Sat, 03 Feb 2001 00:00:00 GMT')
  *						#=> #<Date: 2001-02-03 ...>
- *
  */
 static VALUE
 date_s_httpdate(int argc, VALUE *argv, VALUE klass)
@@ -4577,14 +4632,16 @@ date_s__jisx0301(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *    Date.jisx0301(string='-4712-01-01'[, start=ITALY])  ->  date
+ *    Date.jisx0301(string='-4712-01-01'[, start=Date::ITALY])  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical JIS X 0301 formats.
  *
- * For example:
- *
  *    Date.jisx0301('H13.02.03')		#=> #<Date: 2001-02-03 ...>
+ *
+ * For no-era year, legacy format, Heisei is assumed.
+ *
+ *    Date.jisx0301('13.02.03') 		#=> #<Date: 2001-02-03 ...>
  */
 static VALUE
 date_s_jisx0301(int argc, VALUE *argv, VALUE klass)
@@ -4616,6 +4673,7 @@ dup_obj(VALUE self)
 	{
 	    get_d1b(new);
 	    bdat->s = adat->s;
+	    RB_OBJ_WRITTEN(new, Qundef, bdat->s.nth);
 	    return new;
 	}
     }
@@ -4624,6 +4682,8 @@ 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;
 	}
     }
@@ -4638,7 +4698,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(&bdat->c, &adat->s);
+	    copy_simple_to_complex(new, &bdat->c, &adat->s);
 	    bdat->c.flags |= HAVE_DF | COMPLEX_DAT;
 	    return new;
 	}
@@ -4648,20 +4708,22 @@ 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;
 	}
     }
 }
 
 #define val2off(vof,iof) \
-{\
+do {\
     if (!offset_to_sec(vof, &iof)) {\
 	iof = 0;\
 	rb_warning("invalid offset is ignored");\
     }\
-}
+} while (0)
 
-#ifndef NDEBUG
+#if 0
 static VALUE
 d_lite_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -4669,6 +4731,8 @@ d_lite_initialize(int argc, VALUE *argv, VALUE self)
     int df, of;
     double sg;
 
+    rb_check_frozen(self);
+
     rb_scan_args(argc, argv, "05", &vjd, &vdf, &vsf, &vof, &vsg);
 
     jd = INT2FIX(0);
@@ -4686,11 +4750,11 @@ d_lite_initialize(int argc, VALUE *argv, VALUE self)
 	sf = vsf;
 	if (f_lt_p(sf, INT2FIX(0)) ||
 	    f_ge_p(sf, INT2FIX(SECOND_IN_NANOSECONDS)))
-	    rb_raise(rb_eArgError, "invalid second fraction");
+	    rb_raise(eDateError, "invalid second fraction");
       case 2:
 	df = NUM2INT(vdf);
 	if (df < 0 || df >= DAY_IN_SECONDS)
-	    rb_raise(rb_eArgError, "invalid day fraction");
+	    rb_raise(eDateError, "invalid day fraction");
       case 1:
 	jd = vjd;
     }
@@ -4703,15 +4767,15 @@ d_lite_initialize(int argc, VALUE *argv, VALUE self)
 
 	decode_jd(jd, &nth, &rjd);
 	if (!df && f_zero_p(sf) && !of) {
-	    set_to_simple(&dat->s, nth, rjd, sg, 0, 0, 0, HAVE_JD);
+	    set_to_simple(self, &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(&dat->c, nth, rjd, df, sf, of, sg,
-			   0, 0, 0, 0, 0, 0, HAVE_JD | HAVE_DF | COMPLEX_DAT);
+	    set_to_complex(self, &dat->c, nth, rjd, df, sf, of, sg,
+			   0, 0, 0, 0, 0, 0, HAVE_JD | HAVE_DF);
 	}
     }
     return self;
@@ -4722,13 +4786,35 @@ d_lite_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 d_lite_initialize_copy(VALUE copy, VALUE date)
 {
+    rb_check_frozen(copy);
+
     if (copy == date)
 	return copy;
     {
 	get_d2(copy, date);
 	if (simple_dat_p(bdat)) {
-	    adat->s = bdat->s;
-	    adat->s.flags &= ~COMPLEX_DAT;
+	    if (simple_dat_p(adat)) {
+		adat->s = bdat->s;
+	    }
+	    else {
+		adat->c.flags = bdat->s.flags | COMPLEX_DAT;
+		adat->c.nth = bdat->s.nth;
+		adat->c.jd = bdat->s.jd;
+		adat->c.df = 0;
+		adat->c.sf = INT2FIX(0);
+		adat->c.of = 0;
+		adat->c.sg = bdat->s.sg;
+		adat->c.year = bdat->s.year;
+#ifndef USE_PACK
+		adat->c.mon = bdat->s.mon;
+		adat->c.mday = bdat->s.mday;
+		adat->c.hour = bdat->s.hour;
+		adat->c.min = bdat->s.min;
+		adat->c.sec = bdat->s.sec;
+#else
+		adat->c.pc = bdat->s.pc;
+#endif
+	    }
 	}
 	else {
 	    if (!complex_dat_p(adat))
@@ -4736,7 +4822,6 @@ d_lite_initialize_copy(VALUE copy, VALUE date)
 			 "cannot load complex into simple");
 
 	    adat->c = bdat->c;
-	    adat->c.flags |= COMPLEX_DAT;
 	}
     }
     return copy;
@@ -4769,8 +4854,6 @@ d_lite_fill(VALUE self)
  * Returns the astronomical Julian day number.  This is a fractional
  * number, which is not adjusted by the offset.
  *
- * For example:
- *
  *    DateTime.new(2001,2,3,4,5,6,'+7').ajd	#=> (11769328217/4800)
  *    DateTime.new(2001,2,2,14,5,6,'-7').ajd	#=> (11769328217/4800)
  */
@@ -4788,8 +4871,6 @@ d_lite_ajd(VALUE self)
  * Returns the astronomical modified Julian day number.  This is
  * a fractional number, which is not adjusted by the offset.
  *
- * For example:
- *
  *    DateTime.new(2001,2,3,4,5,6,'+7').amjd	#=> (249325817/4800)
  *    DateTime.new(2001,2,2,14,5,6,'-7').amjd	#=> (249325817/4800)
  */
@@ -4807,8 +4888,6 @@ d_lite_amjd(VALUE self)
  * Returns the Julian day number.  This is a whole number, which is
  * adjusted by the offset as the local time.
  *
- * For example:
- *
  *    DateTime.new(2001,2,3,4,5,6,'+7').jd	#=> 2451944
  *    DateTime.new(2001,2,3,4,5,6,'-7').jd	#=> 2451944
  */
@@ -4826,8 +4905,6 @@ d_lite_jd(VALUE self)
  * Returns the modified Julian day number.  This is a whole number,
  * which is adjusted by the offset as the local time.
  *
- * For example:
- *
  *    DateTime.new(2001,2,3,4,5,6,'+7').mjd	#=> 51943
  *    DateTime.new(2001,2,3,4,5,6,'-7').mjd	#=> 51943
  */
@@ -4845,8 +4922,6 @@ d_lite_mjd(VALUE self)
  * Returns the Lilian day number.  This is a whole number, which is
  * adjusted by the offset as the local time.
  *
- * For example:
- *
  *     Date.new(2001,2,3).ld		#=> 152784
  */
 static VALUE
@@ -4862,8 +4937,6 @@ d_lite_ld(VALUE self)
  *
  * Returns the year.
  *
- * For example:
- *
  *    Date.new(2001,2,3).year		#=> 2001
  *    (Date.new(1,1,1) - 1).year	#=> 0
  */
@@ -4880,8 +4953,6 @@ d_lite_year(VALUE self)
  *
  * Returns the day of the year (1-366).
  *
- * For example:
- *
  *    Date.new(2001,2,3).yday		#=> 34
  */
 static VALUE
@@ -4898,8 +4969,6 @@ d_lite_yday(VALUE self)
  *
  * Returns the month (1-12).
  *
- * For example:
- *
  *    Date.new(2001,2,3).mon		#=> 2
  */
 static VALUE
@@ -4916,8 +4985,6 @@ d_lite_mon(VALUE self)
  *
  * Returns the day of the month (1-31).
  *
- * For example:
- *
  *    Date.new(2001,2,3).mday		#=> 3
  */
 static VALUE
@@ -4933,8 +5000,6 @@ d_lite_mday(VALUE self)
  *
  * Returns the fractional part of the day.
  *
- * For example:
- *
  *    DateTime.new(2001,2,3,12).day_fraction	#=> (1/2)
  */
 static VALUE
@@ -4952,8 +5017,6 @@ d_lite_day_fraction(VALUE self)
  *
  * Returns the calendar week based year.
  *
- * For example:
- *
  *    Date.new(2001,2,3).cwyear		#=> 2001
  *    Date.new(2000,1,1).cwyear		#=> 1999
  */
@@ -4970,8 +5033,6 @@ d_lite_cwyear(VALUE self)
  *
  * Returns the calendar week number (1-53).
  *
- * For example:
- *
  *    Date.new(2001,2,3).cweek		#=> 5
  */
 static VALUE
@@ -4987,8 +5048,6 @@ d_lite_cweek(VALUE self)
  *
  * Returns the day of calendar week (1-7, Monday is 1).
  *
- * For example:
- *
  *    Date.new(2001,2,3).cwday		#=> 6
  */
 static VALUE
@@ -5020,8 +5079,6 @@ d_lite_wnum1(VALUE self)
  *
  * Returns the day of week (0-6, Sunday is zero).
  *
- * For example:
- *
  *    Date.new(2001,2,3).wday		#=> 6
  */
 static VALUE
@@ -5148,8 +5205,6 @@ d_lite_nth_kday_p(VALUE self, VALUE n, VALUE k)
  *
  * Returns the hour (0-23).
  *
- * For example:
- *
  *    DateTime.new(2001,2,3,4,5,6).hour		#=> 4
  */
 static VALUE
@@ -5166,8 +5221,6 @@ d_lite_hour(VALUE self)
  *
  * Returns the minute (0-59).
  *
- * For example:
- *
  *    DateTime.new(2001,2,3,4,5,6).min		#=> 5
  */
 static VALUE
@@ -5184,8 +5237,6 @@ d_lite_min(VALUE self)
  *
  * Returns the second (0-59).
  *
- * For example:
- *
  *    DateTime.new(2001,2,3,4,5,6).sec		#=> 6
  */
 static VALUE
@@ -5202,8 +5253,6 @@ d_lite_sec(VALUE self)
  *
  * Returns the fractional part of the second.
  *
- * For example:
- *
  *    DateTime.new(2001,2,3,4,5,6.5).sec_fraction	#=> (1/2)
  */
 static VALUE
@@ -5219,8 +5268,6 @@ d_lite_sec_fraction(VALUE self)
  *
  * Returns the offset.
  *
- * For example:
- *
  *    DateTime.parse('04pm+0730').offset	#=> (5/16)
  */
 static VALUE
@@ -5236,8 +5283,6 @@ d_lite_offset(VALUE self)
  *
  * Returns the timezone.
  *
- * For example:
- *
  *    DateTime.parse('04pm+0730').zone		#=> "+07:30"
  */
 static VALUE
@@ -5251,9 +5296,7 @@ d_lite_zone(VALUE self)
  * call-seq:
  *    d.julian?  ->  bool
  *
- * Retruns true if the date is before the day of calendar reform.
- *
- * For example:
+ * Returns 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
@@ -5269,9 +5312,7 @@ d_lite_julian_p(VALUE self)
  * call-seq:
  *    d.gregorian?  ->  bool
  *
- * Retunrs true if the date is on or after the day of calendar reform.
- *
- * For example:
+ * Returns 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
@@ -5289,8 +5330,6 @@ d_lite_gregorian_p(VALUE self)
  *
  * Returns true if the year is a leap year.
  *
- * For example:
- *
  *    Date.new(2000).leap?	#=> true
  *    Date.new(2001).leap?	#=> false
  */
@@ -5315,8 +5354,6 @@ d_lite_leap_p(VALUE self)
  *
  * Returns the Julian day number denoting the day of calendar reform.
  *
- * For example:
- *
  *    Date.new(2001,2,3).start			#=> 2299161.0
  *    Date.new(2001,2,3,Date::GREGORIAN).start	#=> -Infinity
  */
@@ -5361,12 +5398,12 @@ set_sg(union DateData *x, double sg)
     if (simple_dat_p(x)) {
 	get_s_jd(x);
 	clear_civil(x);
-	x->s.sg = (sg_cast)sg;
+	x->s.sg = (date_sg_t)sg;
     } else {
 	get_c_jd(x);
 	get_c_df(x);
 	clear_civil(x);
-	x->c.sg = (sg_cast)sg;
+	x->c.sg = (date_sg_t)sg;
     }
 }
 
@@ -5385,9 +5422,7 @@ dup_obj_with_new_start(VALUE obj, double sg)
  * call-seq:
  *    d.new_start([start=Date::ITALY])  ->  date
  *
- * Duplicates self and resets its the day of calendar reform.
- *
- * For example:
+ * Duplicates self and resets its day of calendar reform.
  *
  *    d = Date.new(1582,10,15)
  *    d.new_start(Date::JULIAN)		#=> #<Date: 1582-10-05 ...>
@@ -5482,8 +5517,6 @@ dup_obj_with_new_offset(VALUE obj, int of)
  *
  * Duplicates self and resets its offset.
  *
- * For example:
- *
  *    d = DateTime.new(2001,2,3,4,5,6,'-02:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06-02:00 ...>
  *    d.new_offset('+09:00')	#=> #<DateTime: 2001-02-03T15:05:06+09:00 ...>
@@ -5507,11 +5540,9 @@ d_lite_new_offset(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    d + other  ->  date
  *
- * Returns a date object pointing other days after self.  The other
- * should be a numeric value.  If the other is flonum, assumes its
- * precision is at most nanosecond.
- *
- * For example:
+ * Returns a date object pointing +other+ days after self.  The other
+ * should be a numeric value.  If the other is a fractional number,
+ * assumes its precision is at most nanosecond.
  *
  *    Date.new(2001,2,3) + 1	#=> #<Date: 2001-02-04 ...>
  *    DateTime.new(2001,2,3) + Rational(1,2)
@@ -5524,8 +5555,10 @@ d_lite_new_offset(int argc, VALUE *argv, VALUE self)
 static VALUE
 d_lite_plus(VALUE self, VALUE other)
 {
+    int try_rational = 1;
     get_d1(self);
 
+  again:
     switch (TYPE(other)) {
       case T_FIXNUM:
 	{
@@ -5544,15 +5577,7 @@ d_lite_plus(VALUE self, VALUE other)
 		jd = m_jd(dat);
 	    else {
 		jd = m_jd(dat) + (int)t;
-
-		if (jd < 0) {
-		    nth = f_sub(nth, INT2FIX(1));
-		    jd += CM_PERIOD;
-		}
-		else if (jd >= CM_PERIOD) {
-		    nth = f_add(nth, INT2FIX(1));
-		    jd -= CM_PERIOD;
-		}
+		canonicalize_jd(nth, jd);
 	    }
 
 	    if (simple_dat_p(dat))
@@ -5605,14 +5630,7 @@ d_lite_plus(VALUE self, VALUE other)
 		jd = m_jd(dat);
 	    else {
 		jd = m_jd(dat) + jd;
-		if (jd < 0) {
-		    nth = f_sub(nth, INT2FIX(1));
-		    jd += CM_PERIOD;
-		}
-		else if (jd >= CM_PERIOD) {
-		    nth = f_add(nth, INT2FIX(1));
-		    jd -= CM_PERIOD;
-		}
+		canonicalize_jd(nth, jd);
 	    }
 
 	    if (f_zero_p(nth))
@@ -5719,14 +5737,7 @@ d_lite_plus(VALUE self, VALUE other)
 		jd = m_jd(dat);
 	    else {
 		jd = m_jd(dat) + jd;
-		if (jd < 0) {
-		    nth = f_sub(nth, INT2FIX(1));
-		    jd += CM_PERIOD;
-		}
-		else if (jd >= CM_PERIOD) {
-		    nth = f_add(nth, INT2FIX(1));
-		    jd -= CM_PERIOD;
-		}
+		canonicalize_jd(nth, jd);
 	    }
 
 	    if (f_zero_p(nth))
@@ -5755,21 +5766,23 @@ d_lite_plus(VALUE self, VALUE other)
 	}
 	break;
       default:
-	if (!k_numeric_p(other))
-	    rb_raise(rb_eTypeError, "expected numeric");
+	expect_numeric(other);
 	other = f_to_r(other);
-#ifdef CANONICALIZATION_FOR_MATHN
-	if (!k_rational_p(other))
-	    return d_lite_plus(self, other);
-#endif
+	if (!k_rational_p(other)) {
+	    if (!try_rational) Check_Type(other, T_RATIONAL);
+	    try_rational = 0;
+	    goto again;
+	}
 	/* fall through */
       case T_RATIONAL:
 	{
 	    VALUE nth, sf, t;
 	    int jd, df, s;
 
-	    if (wholenum_p(other))
-		return d_lite_plus(self, RRATIONAL(other)->num);
+	    if (wholenum_p(other)) {
+		other = rb_rational_num(other);
+		goto again;
+	    }
 
 	    if (f_positive_p(other))
 		s = +1;
@@ -5829,14 +5842,7 @@ d_lite_plus(VALUE self, VALUE other)
 		jd = m_jd(dat);
 	    else {
 		jd = m_jd(dat) + jd;
-		if (jd < 0) {
-		    nth = f_sub(nth, INT2FIX(1));
-		    jd += CM_PERIOD;
-		}
-		else if (jd >= CM_PERIOD) {
-		    nth = f_add(nth, INT2FIX(1));
-		    jd -= CM_PERIOD;
-		}
+		canonicalize_jd(nth, jd);
 	    }
 
 	    if (f_zero_p(nth))
@@ -5880,15 +5886,7 @@ minus_dd(VALUE self, VALUE other)
 	d = m_jd(adat) - m_jd(bdat);
 	df = m_df(adat) - m_df(bdat);
 	sf = f_sub(m_sf(adat), m_sf(bdat));
-
-	if (d < 0) {
-	    n = f_sub(n, INT2FIX(1));
-	    d += CM_PERIOD;
-	}
-	else if (d >= CM_PERIOD) {
-	    n = f_add(n, INT2FIX(1));
-	    d -= CM_PERIOD;
-	}
+	canonicalize_jd(n, d);
 
 	if (df < 0) {
 	    d -= 1;
@@ -5920,7 +5918,7 @@ minus_dd(VALUE self, VALUE other)
 	if (f_nonzero_p(sf))
 	    r = f_add(r, ns_to_day(sf));
 
-	if (TYPE(r) == T_RATIONAL)
+	if (RB_TYPE_P(r, T_RATIONAL))
 	    return r;
 	return rb_rational_new1(r);
     }
@@ -5932,10 +5930,8 @@ minus_dd(VALUE self, VALUE other)
  *
  * Returns the difference between the two dates if the other is a date
  * object.  If the other is a numeric value, returns a date object
- * pointing other days before self.  If the other is flonum, assumes
- * its precision is at most nanosecond.
- *
- * For example:
+ * pointing +other+ days before self.  If the other is a fractional number,
+ * assumes its precision is at most nanosecond.
  *
  *     Date.new(2001,2,3) - 1	#=> #<Date: 2001-02-02 ...>
  *     DateTime.new(2001,2,3) - Rational(1,2)
@@ -5957,8 +5953,7 @@ d_lite_minus(VALUE self, VALUE other)
       case T_FLOAT:
 	return d_lite_plus(self, DBL2NUM(-RFLOAT_VALUE(other)));
       default:
-	if (!k_numeric_p(other))
-	    rb_raise(rb_eTypeError, "expected numeric");
+	expect_numeric(other);
 	/* fall through */
       case T_BIGNUM:
       case T_RATIONAL:
@@ -6002,6 +5997,7 @@ d_lite_prev_day(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
+ *    d.succ  ->  date
  *    d.next  ->  date
  *
  * Returns a date object denoting the following day.
@@ -6016,14 +6012,24 @@ d_lite_next(VALUE self)
  * call-seq:
  *    d >> n  ->  date
  *
- * Returns a date object pointing n months after self.  The n should
- * be a numeric value.
+ * Returns a date object pointing +n+ months after self.
+ * The argument +n+ should be a numeric value.
+ *
+ *    Date.new(2001,2,3)  >>  1   #=> #<Date: 2001-03-03 ...>
+ *    Date.new(2001,2,3)  >> -2   #=> #<Date: 2000-12-03 ...>
  *
- * For example:
+ * When the same day does not exist for the corresponding month,
+ * the last day of the month is used instead:
  *
- *    Date.new(2001,2,3) >> 1	#=> #<Date: 2001-03-03 ...>
- *    Date.new(2001,1,31) >> 1	#=> #<Date: 2001-02-28 ...>
- *    Date.new(2001,2,3) >> -2	#=> #<Date: 2000-12-03 ...>
+ *    Date.new(2001,1,28) >> 1   #=> #<Date: 2001-02-28 ...>
+ *    Date.new(2001,1,31) >> 1   #=> #<Date: 2001-02-28 ...>
+ *
+ * This also results in the following, possibly unexpected, behavior:
+ *
+ *    Date.new(2001,1,31) >> 2         #=> #<Date: 2001-03-31 ...>
+ *    Date.new(2001,1,31) >> 1 >> 1    #=> #<Date: 2001-03-28 ...>
+ *
+ *    Date.new(2001,1,31) >> 1 >> -1   #=> #<Date: 2001-01-28 ...>
  */
 static VALUE
 d_lite_rshift(VALUE self, VALUE other)
@@ -6058,7 +6064,7 @@ d_lite_rshift(VALUE self, VALUE other)
 			  &rm, &rd, &rjd, &ns))
 	    break;
 	if (--d < 1)
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
     }
     encode_jd(nth, rjd, &rjd2);
     return d_lite_plus(self, f_sub(rjd2, m_real_local_jd(dat)));
@@ -6068,18 +6074,29 @@ d_lite_rshift(VALUE self, VALUE other)
  * call-seq:
  *    d << n  ->  date
  *
- * Returns a date object pointing n months before self.  The n should
- * be a numeric value.
+ * Returns a date object pointing +n+ months before self.
+ * The argument +n+ should be a numeric value.
+ *
+ *    Date.new(2001,2,3)  <<  1   #=> #<Date: 2001-01-03 ...>
+ *    Date.new(2001,2,3)  << -2   #=> #<Date: 2001-04-03 ...>
  *
- * For example:
+ * When the same day does not exist for the corresponding month,
+ * the last day of the month is used instead:
  *
- *    Date.new(2001,2,3) << 1	#=> #<Date: 2001-01-03 ...>
- *    Date.new(2001,1,31) << 11	#=> #<Date: 2000-02-29 ...>
- *    Date.new(2001,2,3) << -1	#=> #<Date: 2001-03-03 ...>
+ *    Date.new(2001,3,28) << 1   #=> #<Date: 2001-02-28 ...>
+ *    Date.new(2001,3,31) << 1   #=> #<Date: 2001-02-28 ...>
+ *
+ * This also results in the following, possibly unexpected, behavior:
+ *
+ *    Date.new(2001,3,31) << 2         #=> #<Date: 2001-01-31 ...>
+ *    Date.new(2001,3,31) << 1 << 1    #=> #<Date: 2001-01-28 ...>
+ *
+ *    Date.new(2001,3,31) << 1 << -1   #=> #<Date: 2001-03-28 ...>
  */
 static VALUE
 d_lite_lshift(VALUE self, VALUE other)
 {
+    expect_numeric(other);
     return d_lite_rshift(self, f_negate(other));
 }
 
@@ -6087,7 +6104,9 @@ d_lite_lshift(VALUE self, VALUE other)
  * call-seq:
  *    d.next_month([n=1])  ->  date
  *
- * This method is equivalent to d >> n
+ * This method is equivalent to d >> n.
+ *
+ * See Date#>> for examples.
  */
 static VALUE
 d_lite_next_month(int argc, VALUE *argv, VALUE self)
@@ -6104,7 +6123,9 @@ d_lite_next_month(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    d.prev_month([n=1])  ->  date
  *
- * This method is equivalent to d << n
+ * This method is equivalent to d << n.
+ *
+ * See Date#<< for examples.
  */
 static VALUE
 d_lite_prev_month(int argc, VALUE *argv, VALUE self)
@@ -6121,7 +6142,13 @@ d_lite_prev_month(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    d.next_year([n=1])  ->  date
  *
- * This method is equivalent to d >> (n * 12)
+ * This method is equivalent to d >> (n * 12).
+ *
+ *    Date.new(2001,2,3).next_year      #=> #<Date: 2002-02-03 ...>
+ *    Date.new(2008,2,29).next_year     #=> #<Date: 2009-02-28 ...>
+ *    Date.new(2008,2,29).next_year(4)  #=> #<Date: 2012-02-29 ...>
+ *
+ * See also Date#>>.
  */
 static VALUE
 d_lite_next_year(int argc, VALUE *argv, VALUE self)
@@ -6138,7 +6165,13 @@ d_lite_next_year(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    d.prev_year([n=1])  ->  date
  *
- * This method is equivalent to d << (n * 12)
+ * This method is equivalent to d << (n * 12).
+ *
+ *    Date.new(2001,2,3).prev_year      #=> #<Date: 2000-02-03 ...>
+ *    Date.new(2008,2,29).prev_year     #=> #<Date: 2007-02-28 ...>
+ *    Date.new(2008,2,29).prev_year(4)  #=> #<Date: 2004-02-29 ...>
+ *
+ * See also Date#<<.
  */
 static VALUE
 d_lite_prev_year(int argc, VALUE *argv, VALUE self)
@@ -6161,8 +6194,6 @@ static VALUE d_lite_cmp(VALUE, VALUE);
  * Iterates evaluation of the given block, which takes a date object.
  * The limit should be a date object.
  *
- * For example:
- *
  *    Date.new(2001).step(Date.new(2001,-1,-1)).select{|d| d.sunday?}.size
  *				#=> 52
  */
@@ -6170,6 +6201,7 @@ static VALUE
 d_lite_step(int argc, VALUE *argv, VALUE self)
 {
     VALUE limit, step, date;
+    int c;
 
     rb_scan_args(argc, argv, "11", &limit, &step);
 
@@ -6184,25 +6216,22 @@ d_lite_step(int argc, VALUE *argv, VALUE self)
     RETURN_ENUMERATOR(self, argc, argv);
 
     date = self;
-    switch (FIX2INT(f_cmp(step, INT2FIX(0)))) {
-      case -1:
+    c = f_cmp(step, INT2FIX(0));
+    if (c < 0) {
 	while (FIX2INT(d_lite_cmp(date, limit)) >= 0) {
 	    rb_yield(date);
 	    date = d_lite_plus(date, step);
 	}
-	break;
-      case 0:
+    }
+    else if (c == 0) {
 	while (1)
 	    rb_yield(date);
-	break;
-      case 1:
+    }
+    else /* if (c > 0) */ {
 	while (FIX2INT(d_lite_cmp(date, limit)) <= 0) {
 	    rb_yield(date);
 	    date = d_lite_plus(date, step);
 	}
-	break;
-      default:
-	abort();
     }
     return self;
 }
@@ -6257,10 +6286,10 @@ cmp_gen(VALUE self, VALUE other)
     get_d1(self);
 
     if (k_numeric_p(other))
-	return f_cmp(m_ajd(dat), other);
+	return INT2FIX(f_cmp(m_ajd(dat), other));
     else if (k_date_p(other))
-	return f_cmp(m_ajd(dat), f_ajd(other));
-    return rb_num_coerce_cmp(self, other, rb_intern("<=>"));
+	return INT2FIX(f_cmp(m_ajd(dat), f_ajd(other)));
+    return rb_num_coerce_cmp(self, other, id_cmp);
 }
 
 static VALUE
@@ -6274,6 +6303,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);
 	a_nth = m_nth(adat);
 	b_nth = m_nth(bdat);
 	if (f_eqeq_p(a_nth, b_nth)) {
@@ -6326,13 +6357,11 @@ cmp_dd(VALUE self, VALUE other)
  * should be a date object or a numeric value as an astronomical
  * Julian day number.
  *
- * For example:
- *
- *    Date.new(2001,2,3) <=> Date.new(2001,2,4)	#=> -1
- *    Date.new(2001,2,3) <=> Date.new(2001,2,3)	#=> 0
- *    Date.new(2001,2,3) <=> Date.new(2001,2,2)	#=> 1
- *    Date.new(2001,2,3) <=> Object.new		#=> nil
- *    Date.new(2001,2,3) <=> Rational(4903887,2)#=> 0
+ *    Date.new(2001,2,3) <=> Date.new(2001,2,4)   #=> -1
+ *    Date.new(2001,2,3) <=> Date.new(2001,2,3)   #=> 0
+ *    Date.new(2001,2,3) <=> Date.new(2001,2,2)   #=> 1
+ *    Date.new(2001,2,3) <=> Object.new           #=> nil
+ *    Date.new(2001,2,3) <=> Rational(4903887,2)  #=> 0
  *
  * See also Comparable.
  */
@@ -6349,11 +6378,12 @@ d_lite_cmp(VALUE self, VALUE other)
 	      m_gregorian_p(adat) == m_gregorian_p(bdat)))
 	    return cmp_dd(self, other);
 
-	if (have_jd_p(adat) &&
-	    have_jd_p(bdat)) {
+	{
 	    VALUE a_nth, b_nth;
 	    int a_jd, b_jd;
 
+	    m_canonicalize_jd(self, adat);
+	    m_canonicalize_jd(other, bdat);
 	    a_nth = m_nth(adat);
 	    b_nth = m_nth(bdat);
 	    if (f_eqeq_p(a_nth, b_nth)) {
@@ -6369,74 +6399,6 @@ d_lite_cmp(VALUE self, VALUE other)
 		    return INT2FIX(1);
 		}
 	    }
-	    else if (a_nth < b_nth) {
-		return INT2FIX(-1);
-	    }
-	    else {
-		return INT2FIX(1);
-	    }
-	}
-	else {
-#ifndef USE_PACK
-	    VALUE a_nth, b_nth;
-	    int a_year, b_year,
-		a_mon, b_mon,
-		a_mday, b_mday;
-#else
-	    VALUE a_nth, b_nth;
-	    int a_year, b_year,
-		a_pd, b_pd;
-#endif
-
-	    a_nth = m_nth(adat);
-	    b_nth = m_nth(bdat);
-	    if (f_eqeq_p(a_nth, b_nth)) {
-		a_year = m_year(adat);
-		b_year = m_year(bdat);
-		if (a_year == b_year) {
-#ifndef USE_PACK
-		    a_mon = m_mon(adat);
-		    b_mon = m_mon(bdat);
-		    if (a_mon == b_mon) {
-			a_mday = m_mday(adat);
-			b_mday = m_mday(bdat);
-			if (a_mday == b_mday) {
-			    return INT2FIX(0);
-			}
-			else if (a_mday < b_mday) {
-			    return INT2FIX(-1);
-			}
-			else {
-			    return INT2FIX(1);
-			}
-		    }
-		    else if (a_mon < b_mon) {
-			return INT2FIX(-1);
-		    }
-		    else {
-			return INT2FIX(1);
-		    }
-#else
-		    a_pd = m_pc(adat);
-		    b_pd = m_pc(bdat);
-		    if (a_pd == b_pd) {
-			return INT2FIX(0);
-		    }
-		    else if (a_pd < b_pd) {
-			return INT2FIX(-1);
-		    }
-		    else {
-			return INT2FIX(1);
-		    }
-#endif
-		}
-		else if (a_year < b_year) {
-		    return INT2FIX(-1);
-		}
-		else {
-		    return INT2FIX(1);
-		}
-	    }
 	    else if (f_lt_p(a_nth, b_nth)) {
 		return INT2FIX(-1);
 	    }
@@ -6456,7 +6418,7 @@ equal_gen(VALUE self, VALUE other)
 	return f_eqeq_p(m_real_local_jd(dat), other);
     else if (k_date_p(other))
 	return f_eqeq_p(m_real_local_jd(dat), f_jd(other));
-    return rb_num_coerce_cmp(self, other, rb_intern("=="));
+    return rb_num_coerce_cmp(self, other, id_eqeq_p);
 }
 
 /*
@@ -6465,8 +6427,6 @@ equal_gen(VALUE self, VALUE other)
  *
  * Returns true if they are the same day.
  *
- * For example:
- *
  *    Date.new(2001,2,3) === Date.new(2001,2,3)
  * 					#=> true
  *    Date.new(2001,2,3) === Date.new(2001,2,4)
@@ -6490,11 +6450,12 @@ d_lite_equal(VALUE self, VALUE other)
 	if (!(m_gregorian_p(adat) == m_gregorian_p(bdat)))
 	    return equal_gen(self, other);
 
-	if (have_jd_p(adat) &&
-	    have_jd_p(bdat)) {
+	{
 	    VALUE a_nth, b_nth;
 	    int a_jd, b_jd;
 
+	    m_canonicalize_jd(self, adat);
+	    m_canonicalize_jd(other, bdat);
 	    a_nth = m_nth(adat);
 	    b_nth = m_nth(bdat);
 	    a_jd = m_local_jd(adat);
@@ -6504,45 +6465,6 @@ d_lite_equal(VALUE self, VALUE other)
 		return Qtrue;
 	    return Qfalse;
 	}
-	else {
-#ifndef USE_PACK
-	    VALUE a_nth, b_nth;
-	    int a_year, b_year,
-		a_mon, b_mon,
-		a_mday, b_mday;
-#else
-	    VALUE a_nth, b_nth;
-	    int a_year, b_year,
-		a_pd, b_pd;
-#endif
-
-	    a_nth = m_nth(adat);
-	    b_nth = m_nth(bdat);
-	    if (f_eqeq_p(a_nth, b_nth)) {
-		a_year = m_year(adat);
-		b_year = m_year(bdat);
-		if (a_year == b_year) {
-#ifndef USE_PACK
-		    a_mon = m_mon(adat);
-		    b_mon = m_mon(bdat);
-		    if (a_mon == b_mon) {
-			a_mday = m_mday(adat);
-			b_mday = m_mday(bdat);
-			if (a_mday == b_mday)
-			    return Qtrue;
-		    }
-#else
-		    /* mon and mday only */
-		    a_pd = (m_pc(adat) >> MDAY_SHIFT);
-		    b_pd = (m_pc(bdat) >> MDAY_SHIFT);
-		    if (a_pd == b_pd) {
-			return Qtrue;
-		    }
-#endif
-		}
-	    }
-	    return Qfalse;
-	}
     }
 }
 
@@ -6567,7 +6489,7 @@ d_lite_hash(VALUE self)
     h[2] = m_df(dat);
     h[3] = m_sf(dat);
     v = rb_memhash(h, sizeof(h));
-    return LONG2FIX(v);
+    return ST2FIX(v);
 }
 
 #include "date_tmx.h"
@@ -6579,10 +6501,8 @@ static VALUE strftimev(const char *, VALUE,
  * call-seq:
  *    d.to_s  ->  string
  *
- * Returns a string in an ISO 8601 format (This method doesn't use the
- * expanded representations).
- *
- * For example:
+ * Returns a string in an ISO 8601 format. (This method doesn't use the
+ * expanded representations.)
  *
  *     Date.new(2001,2,3).to_s	#=> "2001-02-03"
  */
@@ -6594,54 +6514,40 @@ d_lite_to_s(VALUE self)
 
 #ifndef NDEBUG
 static VALUE
-mk_inspect_flags(union DateData *x)
-{
-    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)
+mk_inspect_raw(union DateData *x, VALUE klass)
 {
-    if (simple_dat_p(x)) {
-	VALUE nth, flags;
+    char flags[6];
 
-	RB_GC_GUARD(nth) = f_inspect(x->s.nth);
-	RB_GC_GUARD(flags) = mk_inspect_flags(x);
+    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';
 
+    if (simple_dat_p(x)) {
 	return rb_enc_sprintf(rb_usascii_encoding(),
-			      "#<%s: "
-			      "(%sth,%dj),+0s,%.0fj; "
+			      "#<%"PRIsVALUE": "
+			      "(%+"PRIsVALUE"th,%dj),+0s,%.0fj; "
 			      "%dy%dm%dd; %s>",
-			      klass ? klass : "?",
-			      RSTRING_PTR(nth), x->s.jd, x->s.sg,
+			      klass,
+			      x->s.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
-			      RSTRING_PTR(flags));
+			      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(),
-			      "#<%s: "
-			      "(%sth,%dj,%ds,%sn),%+ds,%.0fj; "
+			      "#<%"PRIsVALUE": "
+			      "(%+"PRIsVALUE"th,%dj,%ds,%+"PRIsVALUE"n),"
+			      "%+ds,%.0fj; "
 			      "%dy%dm%dd %dh%dm%ds; %s>",
-			      klass ? klass : "?",
-			      RSTRING_PTR(nth), x->c.jd, x->c.df,
-			      RSTRING_PTR(sf),
+			      klass,
+			      x->c.nth, x->c.jd, x->c.df, x->c.sf,
 			      x->c.of, x->c.sg,
 #ifndef USE_PACK
 			      x->c.year, x->c.mon, x->c.mday,
@@ -6652,7 +6558,7 @@ mk_inspect_raw(union DateData *x, const char *klass)
 			      EX_HOUR(x->c.pc), EX_MIN(x->c.pc),
 			      EX_SEC(x->c.pc),
 #endif
-			      RSTRING_PTR(flags));
+			      flags);
     }
 }
 
@@ -6660,23 +6566,18 @@ static VALUE
 d_lite_inspect_raw(VALUE self)
 {
     get_d1(self);
-    return mk_inspect_raw(dat, rb_obj_classname(self));
+    return mk_inspect_raw(dat, rb_obj_class(self));
 }
 #endif
 
 static VALUE
-mk_inspect(union DateData *x, const char *klass, const char *to_s)
+mk_inspect(union DateData *x, VALUE klass, VALUE 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(),
-			  "#<%s: %s ((%sj,%ds,%sn),%+ds,%.0fj)>",
-			  klass ? klass : "?",
-			  to_s ? to_s : "?",
-			  RSTRING_PTR(jd), m_df(x), RSTRING_PTR(sf),
+			  "#<%"PRIsVALUE": %"PRIsVALUE" "
+			  "((%+"PRIsVALUE"j,%ds,%+"PRIsVALUE"n),%+ds,%.0fj)>",
+			  klass, to_s,
+			  m_real_jd(x), m_df(x), m_sf(x),
 			  m_of(x), m_sg(x));
 }
 
@@ -6686,24 +6587,16 @@ mk_inspect(union DateData *x, const char *klass, const char *to_s)
  *
  * Returns the value as a string for inspection.
  *
- * For example:
- *
  *    Date.new(2001,2,3).inspect
- *		#=> "#<Date: 2001-02-03 ((2451944j,0s,0n),+0s,2299161j)>"
+ *		#=> "#<Date: 2001-02-03>"
  *    DateTime.new(2001,2,3,4,5,6,'-7').inspect
- *		#=> "#<DateTime: 2001-02-03T04:05:06-07:00 ((2451944j,39906s,0n),-25200s,2299161j)>"
- *
+ *		#=> "#<DateTime: 2001-02-03T04:05:06-07:00>"
  */
 static VALUE
 d_lite_inspect(VALUE self)
 {
     get_d1(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));
-    }
+    return mk_inspect(dat, rb_obj_class(self), self);
 }
 
 #include <errno.h>
@@ -6780,19 +6673,21 @@ tmx_m_msecs(union DateData *x)
     return s;
 }
 
-static VALUE
+static int
 tmx_m_of(union DateData *x)
 {
-    return INT2FIX(m_of(x));
+    return m_of(x);
 }
 
 static char *
 tmx_m_zone(union DateData *x)
 {
-    return RSTRING_PTR(m_zone(x));
+    VALUE zone = m_zone(x);
+    /* TODO: fix potential dangling pointer */
+    return RSTRING_PTR(zone);
 }
 
-static struct tmx_funcs tmx_funcs = {
+static const struct tmx_funcs tmx_funcs = {
     (VALUE (*)(void *))m_real_year,
     (int (*)(void *))m_yday,
     (int (*)(void *))m_mon,
@@ -6809,7 +6704,7 @@ static struct tmx_funcs tmx_funcs = {
     (VALUE (*)(void *))m_sf_in_sec,
     (VALUE (*)(void *))tmx_m_secs,
     (VALUE (*)(void *))tmx_m_msecs,
-    (VALUE (*)(void *))tmx_m_of,
+    (int (*)(void *))tmx_m_of,
     (char *(*)(void *))tmx_m_zone
 };
 
@@ -6864,7 +6759,6 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
 	    if (p > fmt) rb_str_cat(str, fmt, p - fmt);
 	}
 	rb_enc_copy(str, vfmt);
-	OBJ_INFECT(str, vfmt);
 	return str;
     }
     else
@@ -6873,7 +6767,6 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
     str = rb_str_new(buf, len);
     if (buf != buffer) xfree(buf);
     rb_enc_copy(str, vfmt);
-    OBJ_INFECT(str, vfmt);
     return str;
 }
 
@@ -6881,33 +6774,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 begin 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.
+ * A directive consists of a percent (%) character,
+ * zero or more flags, an optional minimum field width,
+ * an 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.
- *    :  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 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)
@@ -6940,14 +6832,14 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *
  *      %M - Minute of the hour (00..59)
  *
- *      %S - Second of the minute (00..59)
+ *      %S - Second of the minute (00..60)
  *
  *      %L - Millisecond of the second (000..999)
  *      %N - Fractional seconds digits, default is 9 digits (nanosecond)
- *              %3N  millisecond (3 digits)
- *              %6N  microsecond (6 digits)
- *              %9N  nanosecond (9 digits)
- *              %12N picosecond (12 digits)
+ *              %3N  millisecond (3 digits)   %15N femtosecond (15 digits)
+ *              %6N  microsecond (6 digits)   %18N attosecond  (18 digits)
+ *              %9N  nanosecond  (9 digits)   %21N zeptosecond (21 digits)
+ *              %12N picosecond (12 digits)   %24N yoctosecond (24 digits)
  *
  *    Time zone:
  *      %z - Time zone as hour and minute offset from UTC (e.g. +0900)
@@ -6955,7 +6847,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *              %::z - hour, minute and second offset from UTC (e.g. +09:00:00)
  *              %:::z - hour, minute and second offset from UTC
  *                                                (e.g. +09, +09:30, +09:30:30)
- *      %Z - Time zone abbreviation name
+ *      %Z - Equivalent to %:z (e.g. +09:00)
  *
  *    Weekday:
  *      %A - The full weekday name (``Sunday'')
@@ -6981,7 +6873,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *
  *    Seconds since the Unix Epoch:
  *      %s - Number of seconds since 1970-01-01 00:00:00 UTC.
- *      %Q - Number of microseconds since 1970-01-01 00:00:00 UTC.
+ *      %Q - Number of milliseconds since 1970-01-01 00:00:00 UTC.
  *
  *    Literal string:
  *      %n - Newline character (\n)
@@ -7000,23 +6892,24 @@ 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 the 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 the 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
@@ -7052,7 +6945,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *    %GW%V%uT%H%M%z   => 2007W471T0837-0600        Week date and local time and difference from UTC (basic)
  *    %G-W%V-%uT%R%:z  => 2007-W47-1T08:37-06:00    Week date and local time and difference from UTC (extended)
  *
- * See also strftime(3) and strptime.
+ * See also strftime(3) and ::strptime.
  */
 static VALUE
 d_lite_strftime(int argc, VALUE *argv, VALUE self)
@@ -7072,6 +6965,7 @@ 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;
@@ -7145,30 +7039,44 @@ d_lite_httpdate(VALUE self)
     return strftimev("%a, %d %b %Y %T GMT", dup, set_tmx);
 }
 
-static VALUE
-jisx0301_date(VALUE jd, VALUE y)
-{
-    VALUE a[2];
+enum {
+    DECIMAL_SIZE_OF_LONG = DECIMAL_SIZE_OF_BITS(CHAR_BIT*sizeof(long)),
+    JISX0301_DATE_SIZE = DECIMAL_SIZE_OF_LONG+8
+};
 
-    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));
-    }
-    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));
+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 if (d < 2458605) {
+	    c = 'H';
+	    s = 1988;
+	}
+	else {
+	    c = 'R';
+	    s = 2018;
+	}
+	snprintf(fmt, size, "%c%02ld" ".%%m.%%d", c, FIX2INT(y) - s);
+	return fmt;
     }
-    return rb_f_sprintf(2, a);
+    return "%Y-%m-%d";
 }
 
 /*
@@ -7177,19 +7085,19 @@ jisx0301_date(VALUE jd, VALUE y)
  *
  * Returns a string in a JIS X 0301 format.
  *
- * For example:
- *
  *    Date.new(2001,2,3).jisx0301	#=> "H13.02.03"
  */
 static VALUE
 d_lite_jisx0301(VALUE self)
 {
-    VALUE s;
+    char fmtbuf[JISX0301_DATE_SIZE];
+    const char *fmt;
 
     get_d1(self);
-    s = jisx0301_date(m_real_local_jd(dat),
-		      m_real_year(dat));
-    return strftimev(RSTRING_PTR(s), self, set_tmx);
+    fmt = jisx0301_date_format(fmtbuf, sizeof(fmtbuf),
+			       m_real_local_jd(dat),
+			       m_real_year(dat));
+    return strftimev(fmt, self, set_tmx);
 }
 
 #ifndef NDEBUG
@@ -7242,61 +7150,48 @@ d_lite_marshal_dump(VALUE self)
 static VALUE
 d_lite_marshal_load(VALUE self, VALUE a)
 {
+    VALUE nth, sf;
+    int jd, df, of;
+    double sg;
+
     get_d1(self);
 
-    if (TYPE(a) != T_ARRAY)
+    rb_check_frozen(self);
+
+    if (!RB_TYPE_P(a, T_ARRAY))
 	rb_raise(rb_eTypeError, "expected an array");
 
     switch (RARRAY_LEN(a)) {
-      case 3:
+      case 2: /* 1.6.x */
+      case 3: /* 1.8.x, 1.9.2 */
 	{
-	    VALUE ajd, of, sg, nth, sf;
-	    int jd, df, rof;
-	    double rsg;
-
-	    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(&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(&dat->c, nth, jd, df, sf, rof, rsg,
-			       0, 0, 0, 0, 0, 0,
-			       HAVE_JD | HAVE_DF | COMPLEX_DAT);
+	    VALUE ajd, vof, vsg;
+
+	    if  (RARRAY_LEN(a) == 2) {
+		ajd = f_sub(RARRAY_AREF(a, 0), half_days_in_day);
+		vof = INT2FIX(0);
+		vsg = RARRAY_AREF(a, 1);
+		if (!k_numeric_p(vsg))
+		    vsg = DBL2NUM(RTEST(vsg) ? GREGORIAN : JULIAN);
 	    }
+	    else {
+		ajd = RARRAY_AREF(a, 0);
+		vof = RARRAY_AREF(a, 1);
+		vsg = RARRAY_AREF(a, 2);
+	    }
+
+	    old_to_new(ajd, vof, vsg,
+		       &nth, &jd, &df, &sf, &of, &sg);
 	}
 	break;
       case 6:
 	{
-	    VALUE nth, sf;
-	    int jd, df, of;
-	    double sg;
-
-	    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(&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(&dat->c, nth, jd, df, sf, of, sg,
-			       0, 0, 0, 0, 0, 0,
-			       HAVE_JD | HAVE_DF | COMPLEX_DAT);
-	    }
+	    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));
 	}
 	break;
       default:
@@ -7304,6 +7199,18 @@ d_lite_marshal_load(VALUE self, VALUE a)
 	break;
     }
 
+    if (simple_dat_p(dat)) {
+	if (df || !f_zero_p(sf) || of) {
+	    rb_raise(rb_eArgError,
+		     "cannot load complex into simple");
+	}
+	set_to_simple(self, &dat->s, nth, jd, sg, 0, 0, 0, HAVE_JD);
+    } else {
+	set_to_complex(self, &dat->c, nth, jd, df, sf, of, sg,
+		       0, 0, 0, 0, 0, 0,
+		       HAVE_JD | HAVE_DF);
+    }
+
     if (FL_TEST(a, FL_EXIVAR)) {
 	rb_copy_generic_ivar(self, a);
 	FL_SET(self, FL_EXIVAR);
@@ -7312,6 +7219,16 @@ d_lite_marshal_load(VALUE self, VALUE a)
     return self;
 }
 
+/* :nodoc: */
+static VALUE
+date_s__load(VALUE klass, VALUE s)
+{
+    VALUE a, obj;
+
+    a = rb_marshal_load(s);
+    obj = d_lite_s_alloc(klass);
+    return d_lite_marshal_load(obj, a);
+}
 
 /* datetime */
 
@@ -7319,11 +7236,9 @@ d_lite_marshal_load(VALUE self, VALUE a)
  * call-seq:
  *    DateTime.jd([jd=0[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]])  ->  datetime
  *
- * Creates a datetime object denoting the given chronological Julian
+ * Creates a DateTime object denoting the given chronological Julian
  * day number.
  *
- * For example:
- *
  *    DateTime.jd(2451944)	#=> #<DateTime: 2001-02-03T00:00:00+00:00 ...>
  *    DateTime.jd(2451945)	#=> #<DateTime: 2001-02-04T00:00:00+00:00 ...>
  *    DateTime.jd(Rational('0.5'))
@@ -7351,12 +7266,16 @@ datetime_s_jd(int argc, VALUE *argv, VALUE klass)
       case 5:
 	val2off(vof, rof);
       case 4:
+        check_numeric(vs, "second");
 	num2int_with_frac(s, positive_inf);
       case 3:
+        check_numeric(vmin, "minute");
 	num2int_with_frac(min, 3);
       case 2:
+        check_numeric(vh, "hour");
 	num2int_with_frac(h, 2);
       case 1:
+        check_numeric(vjd, "jd");
 	num2num_with_frac(jd, 1);
     }
 
@@ -7365,7 +7284,7 @@ datetime_s_jd(int argc, VALUE *argv, VALUE klass)
 	int rh, rmin, rs, rjd, rjd2;
 
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
 	decode_jd(jd, &nth, &rjd);
@@ -7389,9 +7308,7 @@ datetime_s_jd(int argc, VALUE *argv, VALUE klass)
  * call-seq:
  *    DateTime.ordinal([year=-4712[, yday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]])  ->  datetime
  *
- * Creates a date-time object denoting the given ordinal date.
- *
- * For example:
+ * Creates a DateTime object denoting the given ordinal date.
  *
  *    DateTime.ordinal(2001,34)	#=> #<DateTime: 2001-02-03T00:00:00+00:00 ...>
  *    DateTime.ordinal(2001,34,4,5,6,'+7')
@@ -7422,14 +7339,19 @@ datetime_s_ordinal(int argc, VALUE *argv, VALUE klass)
       case 6:
 	val2off(vof, rof);
       case 5:
+        check_numeric(vs, "second");
 	num2int_with_frac(s, positive_inf);
       case 4:
+        check_numeric(vmin, "minute");
 	num2int_with_frac(min, 4);
       case 3:
+        check_numeric(vh, "hour");
 	num2int_with_frac(h, 3);
       case 2:
+        check_numeric(vd, "yday");
 	num2int_with_frac(d, 2);
       case 1:
+        check_numeric(vy, "year");
 	y = vy;
     }
 
@@ -7441,9 +7363,9 @@ datetime_s_ordinal(int argc, VALUE *argv, VALUE klass)
 			     &nth, &ry,
 			     &rd, &rjd,
 			     &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
 	rjd2 = jd_local_to_utc(rjd,
@@ -7467,9 +7389,7 @@ datetime_s_ordinal(int argc, VALUE *argv, VALUE klass)
  *    DateTime.civil([year=-4712[, month=1[, mday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]]])  ->  datetime
  *    DateTime.new([year=-4712[, month=1[, mday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]]])    ->  datetime
  *
- * Creates a date-time object denoting the given calendar date.
- *
- * For example:
+ * Creates a DateTime object denoting the given calendar date.
  *
  *    DateTime.new(2001,2,3)	#=> #<DateTime: 2001-02-03T00:00:00+00:00 ...>
  *    DateTime.new(2001,2,3,4,5,6,'+7')
@@ -7480,9 +7400,20 @@ datetime_s_ordinal(int argc, VALUE *argv, VALUE klass)
 static VALUE
 datetime_s_civil(int argc, VALUE *argv, VALUE klass)
 {
+    return datetime_initialize(argc, argv, d_lite_s_alloc_complex(klass));
+}
+
+static VALUE
+datetime_initialize(int argc, VALUE *argv, VALUE self)
+{
     VALUE vy, vm, vd, vh, vmin, vs, vof, vsg, y, fr, fr2, ret;
     int m, d, h, min, s, rof;
     double sg;
+    struct ComplexDateData *dat = rb_check_typeddata(self, &d_lite_type);
+
+    if (!complex_dat_p(dat)) {
+	rb_raise(rb_eTypeError, "DateTime expected");
+    }
 
     rb_scan_args(argc, argv, "08", &vy, &vm, &vd, &vh, &vmin, &vs, &vof, &vsg);
 
@@ -7501,16 +7432,22 @@ datetime_s_civil(int argc, VALUE *argv, VALUE klass)
       case 7:
 	val2off(vof, rof);
       case 6:
+        check_numeric(vs, "second");
 	num2int_with_frac(s, positive_inf);
       case 5:
+        check_numeric(vmin, "minute");
 	num2int_with_frac(min, 5);
       case 4:
+        check_numeric(vh, "hour");
 	num2int_with_frac(h, 4);
       case 3:
+        check_numeric(vd, "day");
 	num2int_with_frac(d, 3);
       case 2:
+        check_numeric(vm, "month");
 	m = NUM2INT(vm);
       case 1:
+        check_numeric(vy, "year");
 	y = vy;
     }
 
@@ -7521,18 +7458,18 @@ datetime_s_civil(int argc, VALUE *argv, VALUE klass)
 	if (!valid_gregorian_p(y, m, d,
 			       &nth, &ry,
 			       &rm, &rd))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
-	ret = d_complex_new_internal(klass,
-				     nth, 0,
-				     0, INT2FIX(0),
-				     rof, sg,
-				     ry, rm, rd,
-				     rh, rmin, rs,
-				     HAVE_CIVIL | HAVE_TIME);
+	set_to_complex(self, dat,
+		       nth, 0,
+		       0, INT2FIX(0),
+		       rof, sg,
+		       ry, rm, rd,
+		       rh, rmin, rs,
+		       HAVE_CIVIL | HAVE_TIME);
     }
     else {
 	VALUE nth;
@@ -7542,23 +7479,24 @@ datetime_s_civil(int argc, VALUE *argv, VALUE klass)
 			   &nth, &ry,
 			   &rm, &rd, &rjd,
 			   &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
 	rjd2 = jd_local_to_utc(rjd,
 			       time_to_df(rh, rmin, rs),
 			       rof);
 
-	ret = d_complex_new_internal(klass,
-				     nth, rjd2,
-				     0, INT2FIX(0),
-				     rof, sg,
-				     ry, rm, rd,
-				     rh, rmin, rs,
-				     HAVE_JD | HAVE_CIVIL | HAVE_TIME);
+	set_to_complex(self, dat,
+		       nth, rjd2,
+		       0, INT2FIX(0),
+		       rof, sg,
+		       ry, rm, rd,
+		       rh, rmin, rs,
+		       HAVE_JD | HAVE_CIVIL | HAVE_TIME);
     }
+    ret = self;
     add_frac();
     return ret;
 }
@@ -7567,9 +7505,7 @@ datetime_s_civil(int argc, VALUE *argv, VALUE klass)
  * call-seq:
  *    DateTime.commercial([cwyear=-4712[, cweek=1[, cwday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]]])  ->  datetime
  *
- * Creates a date-time object denoting the given week date.
- *
- * For example:
+ * Creates a DateTime object denoting the given week date.
  *
  *    DateTime.commercial(2001)	#=> #<DateTime: 2001-01-01T00:00:00+00:00 ...>
  *    DateTime.commercial(2002)	#=> #<DateTime: 2001-12-31T00:00:00+00:00 ...>
@@ -7600,16 +7536,22 @@ datetime_s_commercial(int argc, VALUE *argv, VALUE klass)
       case 7:
 	val2off(vof, rof);
       case 6:
+        check_numeric(vs, "second");
 	num2int_with_frac(s, positive_inf);
       case 5:
+        check_numeric(vmin, "minute");
 	num2int_with_frac(min, 5);
       case 4:
+        check_numeric(vh, "hour");
 	num2int_with_frac(h, 4);
       case 3:
+        check_numeric(vd, "cwday");
 	num2int_with_frac(d, 3);
       case 2:
+        check_numeric(vw, "cweek");
 	w = NUM2INT(vw);
       case 1:
+        check_numeric(vy, "year");
 	y = vy;
     }
 
@@ -7621,9 +7563,9 @@ datetime_s_commercial(int argc, VALUE *argv, VALUE klass)
 				&nth, &ry,
 				&rw, &rd, &rjd,
 				&ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
 	rjd2 = jd_local_to_utc(rjd,
@@ -7692,9 +7634,9 @@ datetime_s_weeknum(int argc, VALUE *argv, VALUE klass)
 			     &nth, &ry,
 			     &rw, &rd, &rjd,
 			     &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
 	rjd2 = jd_local_to_utc(rjd,
@@ -7761,9 +7703,9 @@ datetime_s_nth_kday(int argc, VALUE *argv, VALUE klass)
 			      &nth, &ry,
 			      &rm, &rn, &rk, &rjd,
 			      &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
 	rjd2 = jd_local_to_utc(rjd,
@@ -7786,9 +7728,7 @@ datetime_s_nth_kday(int argc, VALUE *argv, VALUE klass)
  * call-seq:
  *    DateTime.now([start=Date::ITALY])  ->  datetime
  *
- * Creates a date-time object denoting the present time.
- *
- * For example:
+ * Creates a DateTime object denoting the present time.
  *
  *    DateTime.now		#=> #<DateTime: 2011-06-11T21:20:44+09:00 ...>
  */
@@ -7823,6 +7763,7 @@ datetime_s_now(int argc, VALUE *argv, VALUE klass)
 	rb_sys_fail("gettimeofday");
     sec = tv.tv_sec;
 #endif
+    tzset();
     if (!localtime_r(&sec, &tm))
 	rb_sys_fail("localtime");
 
@@ -7836,8 +7777,37 @@ datetime_s_now(int argc, VALUE *argv, VALUE klass)
 	s = 59;
 #ifdef HAVE_STRUCT_TM_TM_GMTOFF
     of = tm.tm_gmtoff;
+#elif defined(HAVE_TIMEZONE)
+#ifdef HAVE_ALTZONE
+    of = (long)-((tm.tm_isdst > 0) ? altzone : timezone);
+#else
+    of = (long)-timezone;
+    if (tm.tm_isdst) {
+	time_t sec2;
+
+	tm.tm_isdst = 0;
+	sec2 = mktime(&tm);
+	of += (long)difftime(sec2, sec);
+    }
+#endif
+#elif defined(HAVE_TIMEGM)
+    {
+	time_t sec2;
+
+	sec2 = timegm(&tm);
+	of = (long)difftime(sec2, sec);
+    }
 #else
-    of = -timezone;
+    {
+	struct tm tm2;
+	time_t sec2;
+
+	if (!gmtime_r(&sec, &tm2))
+	    rb_sys_fail("gmtime");
+	tm2.tm_isdst = tm.tm_isdst;
+	sec2 = mktime(&tm2);
+	of = (long)difftime(sec, sec2);
+    }
 #endif
 #ifdef HAVE_CLOCK_GETTIME
     sf = ts.tv_nsec;
@@ -7878,7 +7848,7 @@ dt_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
     }
 
     if (NIL_P(hash))
-	rb_raise(rb_eArgError, "invalid date");
+	rb_raise(eDateError, "invalid date");
 
     if (NIL_P(ref_hash("jd")) &&
 	NIL_P(ref_hash("yday")) &&
@@ -7895,7 +7865,7 @@ dt_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
 	    set_hash("min", INT2FIX(0));
 	if (NIL_P(ref_hash("sec")))
 	    set_hash("sec", INT2FIX(0));
-	else if (f_gt_p(ref_hash("sec"), INT2FIX(59)))
+	else if (f_eqeq_p(ref_hash("sec"), INT2FIX(60)))
 	    set_hash("sec", INT2FIX(59));
     }
     else {
@@ -7905,7 +7875,7 @@ dt_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
     }
 
     if (NIL_P(jd))
-	rb_raise(rb_eArgError, "invalid date");
+	rb_raise(eDateError, "invalid date");
 
     {
 	int rh, rmin, rs;
@@ -7914,7 +7884,7 @@ dt_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
 			    NUM2INT(ref_hash("min")),
 			    NUM2INT(ref_hash("sec")),
 			    &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
 	df = time_to_df(rh, rmin, rs);
     }
@@ -7958,9 +7928,10 @@ dt_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
  *    DateTime._strptime(string[, format='%FT%T%z'])  ->  hash
  *
  * Parses the given representation of date and time with the given
- * template, and returns a hash of parsed elements.
+ * template, and returns a hash of parsed elements.  _strptime does
+ * not support specification of flags and width unlike strftime.
  *
- *  See also strptime(3) and strftime.
+ * See also strptime(3) and #strftime.
  */
 static VALUE
 datetime_s__strptime(int argc, VALUE *argv, VALUE klass)
@@ -7970,12 +7941,11 @@ datetime_s__strptime(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.strptime([string='-4712-01-01T00:00:00+00:00'[, format='%FT%T%z'[ ,start=ITALY]]])  ->  datetime
+ *    DateTime.strptime([string='-4712-01-01T00:00:00+00:00'[, format='%FT%T%z'[ ,start=Date::ITALY]]])  ->  datetime
  *
  * Parses the given representation of date and time with the given
- * template, and creates a date object.
- *
- * For example:
+ * template, and creates a DateTime object.  strptime does not support
+ * specification of flags and width unlike strftime.
  *
  *    DateTime.strptime('2001-02-03T04:05:06+07:00', '%Y-%m-%dT%H:%M:%S%z')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
@@ -7994,7 +7964,7 @@ datetime_s__strptime(int argc, VALUE *argv, VALUE klass)
  *    DateTime.strptime('sat3feb014pm+7', '%a%d%b%y%H%p%z')
  *				#=> #<DateTime: 2001-02-03T16:00:00+07:00 ...>
  *
- * See also strptime(3) and strftime.
+ * See also strptime(3) and #strftime.
  */
 static VALUE
 datetime_s_strptime(int argc, VALUE *argv, VALUE klass)
@@ -8024,16 +7994,14 @@ datetime_s_strptime(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.parse(string='-4712-01-01T00:00:00+00:00'[, comp=true[, start=ITALY]])  ->  datetime
+ *    DateTime.parse(string='-4712-01-01T00:00:00+00:00'[, comp=true[, start=Date::ITALY]])  ->  datetime
  *
  * Parses the given representation of date and time, and creates a
- * date object.
+ * DateTime object.  This method does not function as a validator.
  *
  * If the optional second argument is true and the detected year is in
  * the range "00" to "99", makes it full.
  *
- * For example:
- *
  *    DateTime.parse('2001-02-03T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
  *    DateTime.parse('20010203T040506+0700')
@@ -8069,13 +8037,11 @@ datetime_s_parse(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.iso8601(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  datetime
+ *    DateTime.iso8601(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  datetime
  *
- * Creates a new Date object by parsing from a string according to
+ * Creates a new DateTime object by parsing from a string according to
  * some typical ISO 8601 formats.
  *
- * For example:
- *
  *    DateTime.iso8601('2001-02-03T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
  *    DateTime.iso8601('20010203T040506+0700')
@@ -8105,13 +8071,11 @@ datetime_s_iso8601(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  datetime
+ *    DateTime.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  datetime
  *
- * Creates a new Date object by parsing from a string according to
+ * Creates a new DateTime object by parsing from a string according to
  * some typical RFC 3339 formats.
  *
- * For example:
- *
  *    DateTime.rfc3339('2001-02-03T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
  */
@@ -8137,13 +8101,11 @@ datetime_s_rfc3339(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.xmlschema(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  datetime
+ *    DateTime.xmlschema(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  datetime
  *
- * Creates a new Date object by parsing from a string according to
+ * Creates a new DateTime object by parsing from a string according to
  * some typical XML Schema formats.
  *
- * For example:
- *
  *    DateTime.xmlschema('2001-02-03T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
  */
@@ -8169,14 +8131,12 @@ datetime_s_xmlschema(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=ITALY])  ->  datetime
- *    DateTime.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=ITALY])   ->  datetime
+ *    DateTime.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY])  ->  datetime
+ *    DateTime.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY])   ->  datetime
  *
- * Creates a new Date object by parsing from a string according to
+ * Creates a new DateTime object by parsing from a string according to
  * some typical RFC 2822 formats.
  *
- * For example:
- *
  *     DateTime.rfc2822('Sat, 3 Feb 2001 04:05:06 +0700')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
  */
@@ -8202,13 +8162,11 @@ datetime_s_rfc2822(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=ITALY])  ->  datetime
+ *    DateTime.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=Date::ITALY])  ->  datetime
  *
- * Creates a new Date object by parsing from a string according to
+ * Creates a new DateTime object by parsing from a string according to
  * some RFC 2616 format.
  *
- * For example:
- *
  *    DateTime.httpdate('Sat, 03 Feb 2001 04:05:06 GMT')
  *				#=> #<DateTime: 2001-02-03T04:05:06+00:00 ...>
  */
@@ -8234,15 +8192,18 @@ datetime_s_httpdate(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.jisx0301(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  datetime
+ *    DateTime.jisx0301(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY])  ->  datetime
  *
- * Creates a new Date object by parsing from a string according to
+ * Creates a new DateTime object by parsing from a string according to
  * some typical JIS X 0301 formats.
  *
- * For example:
- *
  *    DateTime.jisx0301('H13.02.03T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
+ *
+ * For no-era year, legacy format, Heisei is assumed.
+ *
+ *    DateTime.jisx0301('13.02.03T04:05:06+07:00')
+ *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
  */
 static VALUE
 datetime_s_jisx0301(int argc, VALUE *argv, VALUE klass)
@@ -8268,10 +8229,8 @@ datetime_s_jisx0301(int argc, VALUE *argv, VALUE klass)
  * call-seq:
  *    dt.to_s  ->  string
  *
- * Returns a string in an ISO 8601 format (This method doesn't use the
- * expanded representations).
- *
- * For example:
+ * Returns a string in an ISO 8601 format. (This method doesn't use the
+ * expanded representations.)
  *
  *     DateTime.new(2001,2,3,4,5,6,'-7').to_s
  *				#=> "2001-02-03T04:05:06-07:00"
@@ -8286,20 +8245,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 begin 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.
+ * A directive consists of a percent (%) character,
+ * zero or more flags, an optional minimum field width,
+ * an 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.
@@ -8307,12 +8266,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 modifiers are "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)
@@ -8345,14 +8304,14 @@ dt_lite_to_s(VALUE self)
  *
  *      %M - Minute of the hour (00..59)
  *
- *      %S - Second of the minute (00..59)
+ *      %S - Second of the minute (00..60)
  *
  *      %L - Millisecond of the second (000..999)
  *      %N - Fractional seconds digits, default is 9 digits (nanosecond)
- *              %3N  millisecond (3 digits)
- *              %6N  microsecond (6 digits)
- *              %9N  nanosecond (9 digits)
- *              %12N picosecond (12 digits)
+ *              %3N  millisecond (3 digits)   %15N femtosecond (15 digits)
+ *              %6N  microsecond (6 digits)   %18N attosecond  (18 digits)
+ *              %9N  nanosecond  (9 digits)   %21N zeptosecond (21 digits)
+ *              %12N picosecond (12 digits)   %24N yoctosecond (24 digits)
  *
  *    Time zone:
  *      %z - Time zone as hour and minute offset from UTC (e.g. +0900)
@@ -8360,7 +8319,7 @@ dt_lite_to_s(VALUE self)
  *              %::z - hour, minute and second offset from UTC (e.g. +09:00:00)
  *              %:::z - hour, minute and second offset from UTC
  *                                                (e.g. +09, +09:30, +09:30:30)
- *      %Z - Time zone abbreviation name
+ *      %Z - Equivalent to %:z (e.g. +09:00)
  *
  *    Weekday:
  *      %A - The full weekday name (``Sunday'')
@@ -8386,7 +8345,7 @@ dt_lite_to_s(VALUE self)
  *
  *    Seconds since the Unix Epoch:
  *      %s - Number of seconds since 1970-01-01 00:00:00 UTC.
- *      %Q - Number of microseconds since 1970-01-01 00:00:00 UTC.
+ *      %Q - Number of milliseconds since 1970-01-01 00:00:00 UTC.
  *
  *    Literal string:
  *      %n - Newline character (\n)
@@ -8405,23 +8364,24 @@ 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 the 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 the 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
@@ -8457,7 +8417,7 @@ dt_lite_to_s(VALUE self)
  *    %GW%V%uT%H%M%z   => 2007W471T0837-0600        Week date and local time and difference from UTC (basic)
  *    %G-W%V-%uT%R%:z  => 2007-W47-1T08:37-06:00    Week date and local time and difference from UTC (extended)
  *
- * See also strftime(3) and strptime.
+ * See also strftime(3) and ::strptime.
  */
 static VALUE
 dt_lite_strftime(int argc, VALUE *argv, VALUE self)
@@ -8467,25 +8427,19 @@ dt_lite_strftime(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-iso8601_timediv(VALUE self, VALUE n)
+iso8601_timediv(VALUE self, long n)
 {
-    VALUE fmt;
-
-    fmt = rb_usascii_str_new2("T%H:%M:%S");
-    if (f_gt_p(n, INT2FIX(0))) {
-	VALUE argv[3];
+    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;
 
-	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);
+    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);
 }
 
 /*
@@ -8493,10 +8447,8 @@ iso8601_timediv(VALUE self, VALUE n)
  *    dt.iso8601([n=0])    ->  string
  *    dt.xmlschema([n=0])  ->  string
  *
- * This method is equivalent to strftime('%FT%T').  The optional
- * argument n is length of fractional seconds.
- *
- * For example:
+ * This method is equivalent to strftime('%FT%T%:z').
+ * The optional argument +n+ is the number of digits for fractional seconds.
  *
  *    DateTime.parse('2001-02-03T04:05:06.123456789+07:00').iso8601(9)
  *				#=> "2001-02-03T04:05:06.123456789+07:00"
@@ -8504,25 +8456,22 @@ iso8601_timediv(VALUE self, VALUE n)
 static VALUE
 dt_lite_iso8601(int argc, VALUE *argv, VALUE self)
 {
-    VALUE n;
-
-    rb_scan_args(argc, argv, "01", &n);
+    long n = 0;
 
-    if (argc < 1)
-	n = INT2FIX(0);
+    rb_check_arity(argc, 0, 1);
+    if (argc >= 1)
+	n = NUM2LONG(argv[0]);
 
-    return f_add(strftimev("%Y-%m-%d", self, set_tmx),
-		 iso8601_timediv(self, n));
+    return rb_str_append(strftimev("%Y-%m-%d", self, set_tmx),
+			 iso8601_timediv(self, n));
 }
 
 /*
  * call-seq:
  *    dt.rfc3339([n=0])  ->  string
  *
- * This method is equivalent to strftime('%FT%T').  The optional
- * argument n is length of fractional seconds.
- *
- * For example:
+ * This method is equivalent to strftime('%FT%T%:z').
+ * The optional argument +n+ is the number of digits for fractional seconds.
  *
  *    DateTime.parse('2001-02-03T04:05:06.123456789+07:00').rfc3339(9)
  *				#=> "2001-02-03T04:05:06.123456789+07:00"
@@ -8537,10 +8486,8 @@ dt_lite_rfc3339(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    dt.jisx0301([n=0])  ->  string
  *
- * Returns a string in a JIS X 0301 format.  The optional argument n
- * is length of fractional seconds.
- *
- * For example:
+ * Returns a string in a JIS X 0301 format.
+ * The optional argument +n+ is the number of digits for fractional seconds.
  *
  *    DateTime.parse('2001-02-03T04:05:06.123456789+07:00').jisx0301(9)
  *				#=> "H13.02.03T04:05:06.123456789+07:00"
@@ -8548,41 +8495,32 @@ dt_lite_rfc3339(int argc, VALUE *argv, VALUE self)
 static VALUE
 dt_lite_jisx0301(int argc, VALUE *argv, VALUE self)
 {
-    VALUE n, s;
-
-    rb_scan_args(argc, argv, "01", &n);
+    long n = 0;
 
-    if (argc < 1)
-	n = INT2FIX(0);
+    rb_check_arity(argc, 0, 1);
+    if (argc >= 1)
+	n = NUM2LONG(argv[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));
-    }
+    return rb_str_append(d_lite_jisx0301(self),
+			 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 a copy of self as local mode.
+ * Returns self.
  */
 static VALUE
 time_to_time(VALUE self)
 {
-    return rb_funcall(self, rb_intern("getlocal"), 0);
+    return self;
 }
 
 /*
@@ -8660,24 +8598,31 @@ time_to_datetime(VALUE self)
  * call-seq:
  *    d.to_time  ->  time
  *
- * Returns a Time object which denotes self.
+ * Returns a Time object which denotes self. If self is a julian date,
+ * convert it to a gregorian date before converting it to Time.
  */
 static VALUE
 date_to_time(VALUE self)
 {
-    get_d1(self);
+    get_d1a(self);
+
+    if (m_julian_p(adat)) {
+        VALUE tmp = d_lite_gregorian(self);
+        get_d1b(tmp);
+        adat = bdat;
+    }
 
     return f_local3(rb_cTime,
-		    m_real_year(dat),
-		    INT2FIX(m_mon(dat)),
-		    INT2FIX(m_mday(dat)));
+        m_real_year(adat),
+        INT2FIX(m_mon(adat)),
+        INT2FIX(m_mday(adat)));
 }
 
 /*
  * call-seq:
  *    d.to_date  ->  self
  *
- * Returns self;
+ * Returns self.
  */
 static VALUE
 date_to_date(VALUE self)
@@ -8710,7 +8655,7 @@ date_to_datetime(VALUE self)
 	    get_d1b(new);
 	    bdat->c = adat->c;
 	    bdat->c.df = 0;
-	    bdat->c.sf = INT2FIX(0);
+	    RB_OBJ_WRITE(new, &bdat->c.sf, INT2FIX(0));
 #ifndef USE_PACK
 	    bdat->c.hour = 0;
 	    bdat->c.min = 0;
@@ -8734,21 +8679,24 @@ date_to_datetime(VALUE self)
 static VALUE
 datetime_to_time(VALUE self)
 {
-    volatile VALUE dup = dup_obj_with_new_offset(self, 0);
+    volatile VALUE dup = dup_obj(self);
     {
 	VALUE t;
 
 	get_d1(dup);
 
-	t = f_utc6(rb_cTime,
+	t = rb_funcall(rb_cTime,
+		   rb_intern("new"),
+                   7,
 		   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)));
-	return f_getlocal(t);
+			 m_sf_in_sec(dat)),
+		   INT2FIX(m_of(dat)));
+	return t;
     }
 }
 
@@ -8776,7 +8724,7 @@ datetime_to_date(VALUE self)
 	VALUE new = d_lite_s_alloc_simple(cDate);
 	{
 	    get_d1b(new);
-	    copy_complex_to_simple(&bdat->s, &adat->c)
+	    copy_complex_to_simple(new, &bdat->s, &adat->c);
 	    bdat->s.jd = m_local_jd(adat);
 	    bdat->s.flags &= ~(HAVE_DF | HAVE_TIME | COMPLEX_DAT);
 	    return new;
@@ -9141,14 +9089,18 @@ mk_ary_of_str(long len, const char *a[])
     return o;
 }
 
+static VALUE
+d_lite_zero(VALUE x)
+{
+    return INT2FIX(0);
+}
+
 void
 Init_date_core(void)
 {
 #undef rb_intern
 #define rb_intern(str) rb_intern_const(str)
 
-    assert(fprintf(stderr, "assert() is now active\n"));
-
     id_cmp = rb_intern("<=>");
     id_le_p = rb_intern("<=");
     id_ge_p = rb_intern(">=");
@@ -9176,13 +9128,13 @@ Init_date_core(void)
     /*
      * date and datetime class - Tadayoshi Funaba 1998-2011
      *
-     * 'date' provides two classes Date and DateTime.
+     * 'date' provides two classes: Date and DateTime.
      *
-     * == Terms and definitions
+     * == Terms and Definitions
      *
      * Some terms and definitions are based on ISO 8601 and JIS X 0301.
      *
-     * === calendar date
+     * === Calendar Date
      *
      * The calendar date is a particular day of a calendar year,
      * identified by its ordinal number within a calendar month within
@@ -9190,33 +9142,33 @@ Init_date_core(void)
      *
      * In those classes, this is so-called "civil".
      *
-     * === ordinal date
+     * === Ordinal Date
      *
      * The ordinal date is a particular day of a calendar year identified
      * by its ordinal number within the year.
      *
      * In those classes, this is so-called "ordinal".
      *
-     * === week date
+     * === Week Date
      *
      * The week date is a date identified by calendar week and day numbers.
      *
      * 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".
+     * In those classes, this is so-called "commercial".
      *
-     * === julian day number
+     * === Julian Day Number
      *
-     * The Julian day number is in elapsed days since noon (Greenwich mean
-     * time) on January 1, 4713 BCE (in the Julian calendar).
+     * The Julian day number is in elapsed days since noon (Greenwich Mean
+     * 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
+     * In this document, the astronomical Julian day number is the 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
      * midnight on local time.
      *
      * In this document, when the term "Julian day number" simply appears,
@@ -9225,66 +9177,72 @@ Init_date_core(void)
      *
      * In those classes, those are so-called "ajd" and "jd".
      *
-     * === modified julian day number
+     * === Modified Julian Day Number
      *
      * The modified Julian day number is in elapsed days since midnight
-     * (Coordinated universal time) on November 17, 1858 CE (in the
+     * (Coordinated Universal Time) on November 17, 1858 CE (in the
      * Gregorian calendar).
      *
      * In this document, the astronomical modified Julian day number is
-     * same as the original modified Julian day number.  And the
+     * 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
      * appears, it just refers to "chronological modified Julian day
      * number", not the original.
      *
-     * In those classes, this is so-called "mjd".
-     *
+     * In those classes, those are so-called "amjd" and "mjd".
      *
      * == Date
      *
-     * A subclass of Object includes Comparable module, easily handles
-     * date.
+     * A subclass of Object that includes the Comparable module and
+     * easily handles date.
      *
-     * Date object is created with Date::new, Date::jd, Date::ordinal,
+     * A Date object is created with Date::new, Date::jd, Date::ordinal,
      * Date::commercial, Date::parse, Date::strptime, Date::today,
-     * Time#to_date or etc.
+     * Time#to_date, etc.
      *
      *     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.
      *
-     * The concept of this date object can be represented as a tuple
+     * The concept of a date object can be represented as a tuple
      * 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
-     * Caersar.  The new style is the Gregorian calendar, which is the
+     * Caesar. 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.
      * The offset in this class is usually zero, and cannot be
      * specified directly.
      *
-     * An optional argument the day of calendar reform (start) as a
-     * Julian day number, which should be 2298874 to 2426355 or -/+oo.
-     * The default value is Date::ITALY (2299161=1582-10-15).  See
-     * also sample/cal.rb.
+     * A Date object can be created with an optional argument,
+     * the day of calendar reform as a Julian day number, which
+     * should be 2298874 to 2426355 or negative/positive infinity.
+     * The default value is +Date::ITALY+ (2299161=1582-10-15).
+     * See also sample/cal.rb.
      *
      *     $ ruby sample/cal.rb -c it 10 1582
      *         October 1582
@@ -9301,7 +9259,7 @@ Init_date_core(void)
      *     17 18 19 20 21 22 23
      *     24 25 26 27 28 29 30
      *
-     * Date object has various methods. See each reference.
+     * A Date object has various methods. See each reference.
      *
      *     d = Date.parse('3rd Feb 2001')
      *					#=> #<Date: 2001-02-03 ...>
@@ -9312,88 +9270,29 @@ 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-03T03:04:05+03:00 ...>
-     * also accepts string form.
-     *
-     *     DateTime.new(2001,2,3,4,5,6,'+03:00')
-     *				#=> #<DateTime: 2001-02-03T03:04:05+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);
+    eDateError = rb_define_class_under(cDate, "Error", rb_eArgError);
 
     rb_include_module(cDate, rb_mComparable);
 
-    /* An array of stirng of full month name in English.  The first
+    /* An array of strings of full month names in English.  The first
      * element is nil.
      */
     rb_define_const(cDate, "MONTHNAMES", mk_ary_of_str(13, monthnames));
 
-    /* An array of string of abbreviated month name in English.  The
+    /* An array of strings of abbreviated month names in English.  The
      * first element is nil.
      */
     rb_define_const(cDate, "ABBR_MONTHNAMES",
 		    mk_ary_of_str(13, abbr_monthnames));
 
-    /* An array of string of full name of days of the week in English.
+    /* An array of strings of the full names of days of the week in English.
      * The first is "Sunday".
      */
     rb_define_const(cDate, "DAYNAMES", mk_ary_of_str(7, daynames));
 
-    /* An array of string of abbreviated day name in English.  The
+    /* An array of strings of abbreviated day names in English.  The
      * first is "Sun".
      */
     rb_define_const(cDate, "ABBR_DAYNAMES", mk_ary_of_str(7, abbr_daynames));
@@ -9409,32 +9308,31 @@ Init_date_core(void)
     rb_define_const(cDate, "ENGLAND", INT2FIX(ENGLAND));
 
     /* The Julian day number of the day of calendar reform for the
-     * proleptic Julian calendar
+     * proleptic Julian calendar.
      */
     rb_define_const(cDate, "JULIAN", DBL2NUM(JULIAN));
 
     /* The Julian day number of the day of calendar reform for the
-     * proleptic Gregorian calendar
+     * proleptic Gregorian calendar.
      */
     rb_define_const(cDate, "GREGORIAN", DBL2NUM(GREGORIAN));
 
-    rb_define_alloc_func(cDate, d_lite_s_alloc);
+    rb_define_alloc_func(cDate, d_lite_s_alloc_simple);
 
 #ifndef NDEBUG
-#define de_define_private_method rb_define_private_method
-    de_define_private_method(CLASS_OF(cDate), "_valid_jd?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_jd?",
 			     date_s__valid_jd_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "_valid_ordinal?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_ordinal?",
 			     date_s__valid_ordinal_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "_valid_civil?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_civil?",
 			     date_s__valid_civil_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "_valid_date?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_date?",
 			     date_s__valid_civil_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "_valid_commercial?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_commercial?",
 			     date_s__valid_commercial_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "_valid_weeknum?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_weeknum?",
 			     date_s__valid_weeknum_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "_valid_nth_kday?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_nth_kday?",
 			     date_s__valid_nth_kday_p, -1);
 #endif
 
@@ -9447,11 +9345,11 @@ Init_date_core(void)
 			       date_s_valid_commercial_p, -1);
 
 #ifndef NDEBUG
-    de_define_private_method(CLASS_OF(cDate), "valid_weeknum?",
+    rb_define_private_method(CLASS_OF(cDate), "valid_weeknum?",
 			     date_s_valid_weeknum_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "valid_nth_kday?",
+    rb_define_private_method(CLASS_OF(cDate), "valid_nth_kday?",
 			     date_s_valid_nth_kday_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "zone_to_diff",
+    rb_define_private_method(CLASS_OF(cDate), "zone_to_diff",
 			     date_s_zone_to_diff, 1);
 #endif
 
@@ -9462,21 +9360,18 @@ Init_date_core(void)
 			       date_s_gregorian_leap_p, 1);
 
 #ifndef NDEBUG
-#define de_define_singleton_method rb_define_singleton_method
-#define de_define_alias rb_define_alias
-    de_define_singleton_method(cDate, "new!", date_s_new_bang, -1);
-    de_define_alias(rb_singleton_class(cDate), "new_l!", "new");
+    rb_define_singleton_method(cDate, "new!", date_s_new_bang, -1);
+    rb_define_alias(rb_singleton_class(cDate), "new_l!", "new");
 #endif
 
     rb_define_singleton_method(cDate, "jd", date_s_jd, -1);
     rb_define_singleton_method(cDate, "ordinal", date_s_ordinal, -1);
     rb_define_singleton_method(cDate, "civil", date_s_civil, -1);
-    rb_define_singleton_method(cDate, "new", date_s_civil, -1);
     rb_define_singleton_method(cDate, "commercial", date_s_commercial, -1);
 
 #ifndef NDEBUG
-    de_define_singleton_method(cDate, "weeknum", date_s_weeknum, -1);
-    de_define_singleton_method(cDate, "nth_kday", date_s_nth_kday, -1);
+    rb_define_singleton_method(cDate, "weeknum", date_s_weeknum, -1);
+    rb_define_singleton_method(cDate, "nth_kday", date_s_nth_kday, -1);
 #endif
 
     rb_define_singleton_method(cDate, "today", date_s_today, -1);
@@ -9499,14 +9394,11 @@ Init_date_core(void)
     rb_define_singleton_method(cDate, "_jisx0301", date_s__jisx0301, 1);
     rb_define_singleton_method(cDate, "jisx0301", date_s_jisx0301, -1);
 
-#ifndef NDEBUG
-#define de_define_method rb_define_method
-    de_define_method(cDate, "initialize", d_lite_initialize, -1);
-#endif
+    rb_define_method(cDate, "initialize", date_initialize, -1);
     rb_define_method(cDate, "initialize_copy", d_lite_initialize_copy, 1);
 
 #ifndef NDEBUG
-    de_define_method(cDate, "fill", d_lite_fill, 0);
+    rb_define_method(cDate, "fill", d_lite_fill, 0);
 #endif
 
     rb_define_method(cDate, "ajd", d_lite_ajd, 0);
@@ -9528,8 +9420,8 @@ Init_date_core(void)
     rb_define_method(cDate, "cwday", d_lite_cwday, 0);
 
 #ifndef NDEBUG
-    de_define_private_method(cDate, "wnum0", d_lite_wnum0, 0);
-    de_define_private_method(cDate, "wnum1", d_lite_wnum1, 0);
+    rb_define_private_method(cDate, "wnum0", d_lite_wnum0, 0);
+    rb_define_private_method(cDate, "wnum1", d_lite_wnum1, 0);
 #endif
 
     rb_define_method(cDate, "wday", d_lite_wday, 0);
@@ -9543,18 +9435,14 @@ Init_date_core(void)
     rb_define_method(cDate, "saturday?", d_lite_saturday_p, 0);
 
 #ifndef NDEBUG
-    de_define_method(cDate, "nth_kday?", d_lite_nth_kday_p, 2);
+    rb_define_method(cDate, "nth_kday?", d_lite_nth_kday_p, 2);
 #endif
 
-    rb_define_private_method(cDate, "hour", d_lite_hour, 0);
-    rb_define_private_method(cDate, "min", d_lite_min, 0);
-    rb_define_private_method(cDate, "minute", d_lite_min, 0);
-    rb_define_private_method(cDate, "sec", d_lite_sec, 0);
-    rb_define_private_method(cDate, "second", d_lite_sec, 0);
-    rb_define_private_method(cDate, "sec_fraction", d_lite_sec_fraction, 0);
-    rb_define_private_method(cDate, "second_fraction", d_lite_sec_fraction, 0);
-    rb_define_private_method(cDate, "offset", d_lite_offset, 0);
-    rb_define_private_method(cDate, "zone", d_lite_zone, 0);
+    rb_define_private_method(cDate, "hour", d_lite_zero, 0);
+    rb_define_private_method(cDate, "min", d_lite_zero, 0);
+    rb_define_private_method(cDate, "minute", d_lite_zero, 0);
+    rb_define_private_method(cDate, "sec", d_lite_zero, 0);
+    rb_define_private_method(cDate, "second", d_lite_zero, 0);
 
     rb_define_method(cDate, "julian?", d_lite_julian_p, 0);
     rb_define_method(cDate, "gregorian?", d_lite_gregorian_p, 0);
@@ -9567,8 +9455,6 @@ Init_date_core(void)
     rb_define_method(cDate, "julian", d_lite_julian, 0);
     rb_define_method(cDate, "gregorian", d_lite_gregorian, 0);
 
-    rb_define_private_method(cDate, "new_offset", d_lite_new_offset, -1);
-
     rb_define_method(cDate, "+", d_lite_plus, 1);
     rb_define_method(cDate, "-", d_lite_minus, 1);
 
@@ -9596,7 +9482,7 @@ Init_date_core(void)
 
     rb_define_method(cDate, "to_s", d_lite_to_s, 0);
 #ifndef NDEBUG
-    de_define_method(cDate, "inspect_raw", d_lite_inspect_raw, 0);
+    rb_define_method(cDate, "inspect_raw", d_lite_inspect_raw, 0);
 #endif
     rb_define_method(cDate, "inspect", d_lite_inspect, 0);
 
@@ -9613,14 +9499,154 @@ Init_date_core(void)
     rb_define_method(cDate, "jisx0301", d_lite_jisx0301, 0);
 
 #ifndef NDEBUG
-    de_define_method(cDate, "marshal_dump_old", d_lite_marshal_dump_old, 0);
+    rb_define_method(cDate, "marshal_dump_old", d_lite_marshal_dump_old, 0);
 #endif
     rb_define_method(cDate, "marshal_dump", d_lite_marshal_dump, 0);
     rb_define_method(cDate, "marshal_load", d_lite_marshal_load, 1);
+    rb_define_singleton_method(cDate, "_load", date_s__load, 1);
 
-    /* datetime */
+    /*
+     * == 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.
+     *
+     * A DateTime object is created with DateTime::new, DateTime::jd,
+     * DateTime::ordinal, DateTime::commercial, DateTime::parse,
+     * DateTime::strptime, DateTime::now, Time#to_datetime, 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 a
+     * 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 ...>
+     *
+     * The offset 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
+     * negative/positive infinity.
+     * The default value is +Date::ITALY+ (2299161=1582-10-15).
+     *
+     * A 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 the
+     * {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 there's no way
+     * to express this with Time objects. 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 is 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.
+     */
 
     cDateTime = rb_define_class("DateTime", cDate);
+    rb_define_alloc_func(cDateTime, d_lite_s_alloc_complex);
 
     rb_define_singleton_method(cDateTime, "jd", datetime_s_jd, -1);
     rb_define_singleton_method(cDateTime, "ordinal", datetime_s_ordinal, -1);
@@ -9630,9 +9656,9 @@ Init_date_core(void)
 			       datetime_s_commercial, -1);
 
 #ifndef NDEBUG
-    de_define_singleton_method(cDateTime, "weeknum",
+    rb_define_singleton_method(cDateTime, "weeknum",
 			       datetime_s_weeknum, -1);
-    de_define_singleton_method(cDateTime, "nth_kday",
+    rb_define_singleton_method(cDateTime, "nth_kday",
 			       datetime_s_nth_kday, -1);
 #endif
 
@@ -9660,19 +9686,16 @@ Init_date_core(void)
     rb_define_singleton_method(cDateTime, "jisx0301",
 			       datetime_s_jisx0301, -1);
 
-#define f_public(m,s) rb_funcall(m, rb_intern("public"), 1,\
-				 ID2SYM(rb_intern(s)))
-
-    f_public(cDateTime, "hour");
-    f_public(cDateTime, "min");
-    f_public(cDateTime, "minute");
-    f_public(cDateTime, "sec");
-    f_public(cDateTime, "second");
-    f_public(cDateTime, "sec_fraction");
-    f_public(cDateTime, "second_fraction");
-    f_public(cDateTime, "offset");
-    f_public(cDateTime, "zone");
-    f_public(cDateTime, "new_offset");
+    rb_define_method(cDateTime, "hour", d_lite_hour, 0);
+    rb_define_method(cDateTime, "min", d_lite_min, 0);
+    rb_define_method(cDateTime, "minute", d_lite_min, 0);
+    rb_define_method(cDateTime, "sec", d_lite_sec, 0);
+    rb_define_method(cDateTime, "second", d_lite_sec, 0);
+    rb_define_method(cDateTime, "sec_fraction", d_lite_sec_fraction, 0);
+    rb_define_method(cDateTime, "second_fraction", d_lite_sec_fraction, 0);
+    rb_define_method(cDateTime, "offset", d_lite_offset, 0);
+    rb_define_method(cDateTime, "zone", d_lite_zone, 0);
+    rb_define_method(cDateTime, "new_offset", d_lite_new_offset, -1);
 
     rb_define_method(cDateTime, "to_s", dt_lite_to_s, 0);
 
@@ -9700,15 +9723,15 @@ Init_date_core(void)
 #ifndef NDEBUG
     /* tests */
 
-    de_define_singleton_method(cDate, "test_civil", date_s_test_civil, 0);
-    de_define_singleton_method(cDate, "test_ordinal", date_s_test_ordinal, 0);
-    de_define_singleton_method(cDate, "test_commercial",
+    rb_define_singleton_method(cDate, "test_civil", date_s_test_civil, 0);
+    rb_define_singleton_method(cDate, "test_ordinal", date_s_test_ordinal, 0);
+    rb_define_singleton_method(cDate, "test_commercial",
 			       date_s_test_commercial, 0);
-    de_define_singleton_method(cDate, "test_weeknum", date_s_test_weeknum, 0);
-    de_define_singleton_method(cDate, "test_nth_kday", date_s_test_nth_kday, 0);
-    de_define_singleton_method(cDate, "test_unit_conv",
+    rb_define_singleton_method(cDate, "test_weeknum", date_s_test_weeknum, 0);
+    rb_define_singleton_method(cDate, "test_nth_kday", date_s_test_nth_kday, 0);
+    rb_define_singleton_method(cDate, "test_unit_conv",
 			       date_s_test_unit_conv, 0);
-    de_define_singleton_method(cDate, "test_all", date_s_test_all, 0);
+    rb_define_singleton_method(cDate, "test_all", date_s_test_all, 0);
 #endif
 }
 
diff --git a/ext/date/date_parse.c b/ext/date/date_parse.c
index 597c25ac55..519f29cbcb 100644
--- a/ext/date/date_parse.c
+++ b/ext/date/date_parse.c
@@ -1,5 +1,5 @@
 /*
-  date_parse.c: Coded by Tadayoshi Funaba 2011
+  date_parse.c: Coded by Tadayoshi Funaba 2011,2012
 */
 
 #include "ruby.h"
@@ -7,6 +7,11 @@
 #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])
 
 #define f_negate(x) rb_funcall(x, rb_intern("-@"), 0)
@@ -35,32 +40,47 @@
 #define f_sub_bang(s,r,x) rb_funcall(s, rb_intern("sub!"), 2, r, x)
 #define f_gsub_bang(s,r,x) rb_funcall(s, rb_intern("gsub!"), 2, r, x)
 
-#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k)), v)
-#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k)))
-#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k)))
+#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k"")), v)
+#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k"")))
+#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k"")))
 
 #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[] = {
+static const char abbr_days[][4] = {
     "sun", "mon", "tue", "wed",
     "thu", "fri", "sat"
 };
 
-static const char *abbr_months[] = {
+static const char abbr_months[][4] = {
     "jan", "feb", "mar", "apr", "may", "jun",
     "jul", "aug", "sep", "oct", "nov", "dec"
 };
 
 #define issign(c) ((c) == '-' || (c) == '+')
 #define asp_string() rb_str_new(" ", 1)
+#ifdef TIGHT_PARSER
+#define asuba_string() rb_str_new("\001", 1)
+#define asubb_string() rb_str_new("\002", 1)
+#define asubw_string() rb_str_new("\027", 1)
+#define asubt_string() rb_str_new("\024", 1)
+#endif
+
+static size_t
+digit_span(const char *s, const char *e)
+{
+    size_t i = 0;
+    while (s + i < e && isdigit(s[i])) i++;
+    return i;
+}
 
 static void
 s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 {
+    VALUE vbuf = 0;
     VALUE c = Qnil;
 
-    if (TYPE(m) != T_STRING)
+    if (!RB_TYPE_P(m, T_STRING))
 	m = f_to_s(m);
 
     if (!NIL_P(y) && !NIL_P(m) && NIL_P(d)) {
@@ -78,7 +98,7 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	    y = d;
 	    d = Qnil;
 	}
-	if (!NIL_P(d) && *RSTRING_PTR(d) == '\'') {
+	if (!NIL_P(d) && RSTRING_LEN(d) > 0 && *RSTRING_PTR(d) == '\'') {
 	    y = d;
 	    d = Qnil;
 	}
@@ -89,17 +109,20 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	size_t l;
 
 	s = RSTRING_PTR(y);
-	while (!issign(*s) && !isdigit(*s))
+	ep = RSTRING_END(y);
+	while (s < ep && !issign(*s) && !isdigit(*s))
 	    s++;
+	if (s >= ep) goto no_date;
 	bp = s;
-	if (issign(*s))
+	if (issign((unsigned char)*s))
 	    s++;
-	l = strspn(s, "0123456789");
+	l = digit_span(s, ep);
 	ep = s + l;
 	if (*ep) {
 	    y = d;
 	    d = rb_str_new(bp, ep - bp);
 	}
+      no_date:;
     }
 
     if (!NIL_P(m)) {
@@ -138,8 +161,10 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	VALUE iy;
 
 	s = RSTRING_PTR(y);
-	while (!issign(*s) && !isdigit(*s))
+	ep = RSTRING_END(y);
+	while (s < ep && !issign(*s) && !isdigit(*s))
 	    s++;
+	if (s >= ep) goto no_year;
 	bp = s;
 	if (issign(*s)) {
 	    s++;
@@ -147,43 +172,50 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	}
 	if (sign)
 	    c = Qfalse;
-	l = strspn(s, "0123456789");
+	l = digit_span(s, ep);
 	ep = s + l;
 	if (l > 2)
 	    c = Qfalse;
 	{
 	    char *buf;
 
-	    buf = ALLOCA_N(char, ep - bp + 1);
+	    buf = ALLOCV_N(char, vbuf, ep - bp + 1);
 	    memcpy(buf, bp, ep - bp);
 	    buf[ep - bp] = '\0';
 	    iy = cstr2num(buf);
+	    ALLOCV_END(vbuf);
 	}
-	if (bc)
-	    iy = f_add(f_negate(iy), INT2FIX(1));
 	set_hash("year", iy);
+      no_year:;
     }
 
+    if (bc)
+	set_hash("_bc", Qtrue);
+
     if (!NIL_P(m)) {
 	const char *s, *bp, *ep;
 	size_t l;
 	VALUE im;
 
 	s = RSTRING_PTR(m);
-	while (!isdigit(*s))
+	ep = RSTRING_END(m);
+	while (s < ep && !isdigit(*s))
 	    s++;
+	if (s >= ep) goto no_month;
 	bp = s;
-	l = strspn(s, "0123456789");
+	l = digit_span(s, ep);
 	ep = s + l;
 	{
 	    char *buf;
 
-	    buf = ALLOCA_N(char, ep - bp + 1);
+	    buf = ALLOCV_N(char, vbuf, ep - bp + 1);
 	    memcpy(buf, bp, ep - bp);
 	    buf[ep - bp] = '\0';
 	    im = cstr2num(buf);
+	    ALLOCV_END(vbuf);
 	}
 	set_hash("mon", im);
+      no_month:;
     }
 
     if (!NIL_P(d)) {
@@ -192,20 +224,24 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	VALUE id;
 
 	s = RSTRING_PTR(d);
-	while (!isdigit(*s))
+	ep = RSTRING_END(d);
+	while (s < ep && !isdigit(*s))
 	    s++;
+	if (s >= ep) goto no_mday;
 	bp = s;
-	l = strspn(s, "0123456789");
+	l = digit_span(s, ep);
 	ep = s + l;
 	{
 	    char *buf;
 
-	    buf = ALLOCA_N(char, ep - bp + 1);
+	    buf = ALLOCV_N(char, vbuf, ep - bp + 1);
 	    memcpy(buf, bp, ep - bp);
 	    buf[ep - bp] = '\0';
 	    id = cstr2num(buf);
+	    ALLOCV_END(vbuf);
 	}
 	set_hash("mday", id);
+      no_mday:;
     }
 
     if (!NIL_P(c))
@@ -217,6 +253,23 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 #define ABBR_DAYS "sun|mon|tue|wed|thu|fri|sat"
 #define ABBR_MONTHS "jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec"
 
+#ifdef TIGHT_PARSER
+#define VALID_DAYS "(?:" DAYS ")" "|(?:tues|wednes|thurs|thur|" ABBR_DAYS ")\\.?"
+#define VALID_MONTHS "(?:" MONTHS ")" "|(?:sept|" ABBR_MONTHS ")\\.?"
+#define DOTLESS_VALID_MONTHS "(?:" MONTHS ")" "|(?:sept|" ABBR_MONTHS ")"
+#define BOS "\\A\\s*"
+#define FPA "\\001"
+#define FPB "\\002"
+#define FPW "\\027"
+#define FPT "\\024"
+#define FPW_COM "\\s*(?:" FPW "\\s*,?)?\\s*"
+#define FPT_COM "\\s*(?:" FPT "\\s*,?)?\\s*"
+#define COM_FPW "\\s*(?:,?\\s*" FPW ")?\\s*"
+#define COM_FPT "\\s*(?:,?\\s*(?:@|\\b[aA][tT]\\b)?\\s*" FPT ")?\\s*"
+#define TEE_FPT "\\s*(?:[tT]?" FPT ")?"
+#define EOS "\\s*\\z"
+#endif
+
 static VALUE
 regcomp(const char *source, long len, int opt)
 {
@@ -228,21 +281,36 @@ regcomp(const char *source, long len, int opt)
 }
 
 #define REGCOMP(pat,opt) \
-{ \
+do { \
     if (NIL_P(pat)) \
 	pat = regcomp(pat##_source, sizeof pat##_source - 1, opt); \
-}
+} while (0)
 
 #define REGCOMP_0(pat) REGCOMP(pat, 0)
 #define REGCOMP_I(pat) REGCOMP(pat, ONIG_OPTION_IGNORECASE)
 
-#define SUBS(s,p,c) \
-{ \
-    return subs(s, p, hash, c);	\
+#define MATCH(s,p,c) \
+do { \
+    return match(s, p, hash, c); \
+} while (0)
+
+static int
+match(VALUE str, VALUE pat, VALUE hash, int (*cb)(VALUE, VALUE))
+{
+    VALUE m;
+
+    m = f_match(pat, str);
+
+    if (NIL_P(m))
+	return 0;
+
+    (*cb)(m, hash);
+
+    return 1;
 }
 
 static int
-subs(VALUE str, VALUE pat, VALUE hash, int (*cb)(VALUE, VALUE))
+subx(VALUE str, VALUE rep, VALUE pat, VALUE hash, int (*cb)(VALUE, VALUE))
 {
     VALUE m;
 
@@ -256,285 +324,197 @@ subs(VALUE str, VALUE pat, VALUE hash, int (*cb)(VALUE, VALUE))
 
 	be = f_begin(m, INT2FIX(0));
 	en = f_end(m, INT2FIX(0));
-	f_aset2(str, be, LONG2NUM(NUM2LONG(en) - NUM2LONG(be)), asp_string());
+	f_aset2(str, be, LONG2NUM(NUM2LONG(en) - NUM2LONG(be)), rep);
 	(*cb)(m, hash);
     }
 
     return 1;
 }
 
-struct zone {
-    const char *name;
-    int offset;
-};
+#define SUBS(s,p,c) \
+do { \
+    return subx(s, asp_string(), p, hash, c); \
+} while (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}
-};
+#ifdef TIGHT_PARSER
+#define SUBA(s,p,c) \
+do { \
+    return subx(s, asuba_string(), p, hash, c); \
+} while (0)
 
-VALUE
-date_zone_to_diff(VALUE str)
-{
-    VALUE offset = Qnil;
+#define SUBB(s,p,c) \
+do { \
+    return subx(s, asubb_string(), p, hash, c); \
+} while (0)
 
-    long l, i;
-    char *s, *dest, *d;
-    int sp = 1;
+#define SUBW(s,p,c) \
+do { \
+    return subx(s, asubw_string(), p, hash, c); \
+} while (0)
 
-    l = RSTRING_LEN(str);
-    s = RSTRING_PTR(str);
+#define SUBT(s,p,c) \
+do { \
+    return subx(s, asubt_string(), p, hash, c); \
+} while (0)
+#endif
 
-    dest = d = ALLOCA_N(char, l + 1);
+#include "zonetab.h"
 
-    for (i = 0; i < l; i++) {
-	if (isspace(s[i]) || s[i] == '\0') {
-	    if (!sp)
-		*d++ = ' ';
-	    sp = 1;
+static int
+str_end_with_word(const char *s, long l, const char *w)
+{
+    int n = (int)strlen(w);
+    if (l <= n || !isspace(s[l - n - 1])) return 0;
+    if (strncasecmp(&s[l - n], w, n)) return 0;
+    do ++n; while (l > n && isspace(s[l - n - 1]));
+    return n;
+}
+
+static long
+shrunk_size(const char *s, long l)
+{
+    long i, ni;
+    int sp = 0;
+    for (i = ni = 0; i < l; ++i) {
+	if (!isspace(s[i])) {
+	    if (sp) ni++;
+	    sp = 0;
+	    ni++;
 	}
 	else {
-	    if (isalpha(s[i]))
-		*d++ = tolower(s[i]);
-	    else
-		*d++ = s[i];
-	    sp = 0;
+	    sp = 1;
 	}
     }
-    if (d > dest) {
-	if (*(d - 1) == ' ')
-	    --d;
-	*d = '\0';
-    }
-    str = rb_str_new2(dest);
-    {
-#define STD " standard time"
-#define DST " daylight time"
-	char *ss, *ds;
-	long sl, dl;
-	int dst = 0;
-
-	sl = RSTRING_LEN(str) - (sizeof STD - 1);
-	ss = RSTRING_PTR(str) + sl;
-	dl = RSTRING_LEN(str) - (sizeof DST - 1);
-	ds = RSTRING_PTR(str) + dl;
+    return ni < l ? ni : 0;
+}
 
-	if (sl >= 0 && strcmp(ss, STD) == 0) {
-	    str = rb_str_new(RSTRING_PTR(str), sl);
-	}
-	else if (dl >= 0 && strcmp(ds, DST) == 0) {
-	    str = rb_str_new(RSTRING_PTR(str), dl);
-	    dst = 1;
+static long
+shrink_space(char *d, const char *s, long l)
+{
+    long i, ni;
+    int sp = 0;
+    for (i = ni = 0; i < l; ++i) {
+	if (!isspace(s[i])) {
+	    if (sp) d[ni++] = ' ';
+	    sp = 0;
+	    d[ni++] = s[i];
 	}
-#undef STD
-#undef DST
 	else {
-#define DST " dst"
-	    char *ds;
-	    long dl;
+	    sp = 1;
+	}
+    }
+    return ni;
+}
 
-	    dl = RSTRING_LEN(str) - (sizeof DST - 1);
-	    ds = RSTRING_PTR(str) + dl;
+VALUE
+date_zone_to_diff(VALUE str)
+{
+    VALUE offset = Qnil;
+    VALUE vbuf = 0;
+    long l = RSTRING_LEN(str);
+    const char *s = RSTRING_PTR(str);
+
+    {
+	int dst = 0;
+	int w;
 
-	    if (dl >= 0 && strcmp(ds, DST) == 0) {
-		str = rb_str_new(RSTRING_PTR(str), dl);
+	if ((w = str_end_with_word(s, l, "time")) > 0) {
+	    int wtime = w;
+	    l -= w;
+	    if ((w = str_end_with_word(s, l, "standard")) > 0) {
+		l -= w;
+	    }
+	    else if ((w = str_end_with_word(s, l, "daylight")) > 0) {
+		l -= w;
 		dst = 1;
 	    }
-#undef DST
+	    else {
+		l += wtime;
+	    }
+	}
+	else if ((w = str_end_with_word(s, l, "dst")) > 0) {
+	    l -= w;
+	    dst = 1;
 	}
 	{
-	    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);
-		}
+	    long sl = shrunk_size(s, l);
+	    if (sl > 0 && sl <= MAX_WORD_LENGTH) {
+		char *d = ALLOCV_N(char, vbuf, sl);
+		l = shrink_space(d, s, l);
+		s = d;
 	    }
-
-	    offset = f_aref(zones, str);
-	    if (!NIL_P(offset)) {
+	}
+	if (l > 0 && l <= MAX_WORD_LENGTH) {
+	    const struct zone *z = zonetab(s, (unsigned int)l);
+	    if (z) {
+		int d = z->offset;
 		if (dst)
-		    offset = f_add(offset, INT2FIX(3600));
+		    d += 3600;
+		offset = INT2FIX(d);
 		goto ok;
 	    }
 	}
 	{
-	    char *s, *p;
-	    VALUE sign;
-	    VALUE hour = Qnil, min = Qnil, sec = Qnil;
-	    VALUE str_orig;
-
-	    s = RSTRING_PTR(str);
-	    str_orig = str;
+	    char *p;
+	    int sign = 0;
+	    long hour = 0, min = 0, sec = 0;
 
-	    if (strncmp(s, "gmt", 3) == 0 ||
-		strncmp(s, "utc", 3) == 0)
+	    if (l > 3 &&
+		(strncasecmp(s, "gmt", 3) == 0 ||
+		 strncasecmp(s, "utc", 3) == 0)) {
 		s += 3;
+		l -= 3;
+	    }
 	    if (issign(*s)) {
-		sign = rb_str_new(s, 1);
+		sign = *s == '-';
 		s++;
+		l--;
 
-		str = rb_str_new2(s);
-
-		if (p = strchr(s, ':')) {
-		    hour = rb_str_new(s, p - s);
+		hour = STRTOUL(s, &p, 10);
+		if (*p == ':') {
 		    s = ++p;
-		    if (p = strchr(s, ':')) {
-			min = rb_str_new(s, p - s);
+		    min = STRTOUL(s, &p, 10);
+		    if (*p == ':') {
 			s = ++p;
-			if (p = strchr(s, ':')) {
-			    sec = rb_str_new(s, p - s);
-			}
-			else
-			    sec = rb_str_new2(s);
+			sec = STRTOUL(s, &p, 10);
 		    }
-		    else
-			min = rb_str_new2(s);
-		    RB_GC_GUARD(str_orig);
 		    goto num;
 		}
-		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;
-		}
-		{
-		    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)
-			    min  = 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);
+		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;
+		}
+		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);
 		    goto num;
 		}
 	      num:
-		if (NIL_P(hour))
-		    offset = INT2FIX(0);
-		else {
-		    if (TYPE(hour) == T_STRING)
-			hour = str2num(hour);
-		    offset = f_mul(hour, INT2FIX(3600));
-		}
-		if (!NIL_P(min)) {
-		    if (TYPE(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);
+		sec += min * 60 + hour * 3600;
+		if (sign) sec = -sec;
+		offset = INT2FIX(sec);
 	    }
 	}
     }
     RB_GC_GUARD(str);
   ok:
+    ALLOCV_END(vbuf);
     return offset;
 }
 
@@ -573,11 +553,21 @@ parse_day_cb(VALUE m, VALUE hash)
 static int
 parse_day(VALUE str, VALUE hash)
 {
-    static const char pat_source[] = "\\b(" ABBR_DAYS ")[^-\\d\\s]*";
+    static const char pat_source[] =
+#ifndef TIGHT_PARSER
+	"\\b(" ABBR_DAYS ")[^-/\\d\\s]*"
+#else
+	"(" VALID_DAYS ")"
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
+#ifndef TIGHT_PARSER
     SUBS(str, pat, parse_day_cb);
+#else
+    SUBW(str, pat, parse_day_cb);
+#endif
 }
 
 static int
@@ -664,7 +654,11 @@ parse_time(VALUE str, VALUE hash)
 		   "(?:"
 		     "\\d+\\s*:\\s*\\d+"
 		     "(?:"
+#ifndef TIGHT_PARSER
 		       "\\s*:\\s*\\d+(?:[,.]\\d*)?"
+#else
+		       "\\s*:\\s*\\d+(?:[,.]\\d+)?"
+#endif
 		     ")?"
 		   "|"
 		     "\\d+\\s*h(?:\\s*\\d+m?(?:\\s*\\d+s?)?)?"
@@ -681,20 +675,121 @@ parse_time(VALUE str, VALUE hash)
 		   "("
 		     "(?:gmt|utc?)?[-+]\\d+(?:[,.:]\\d+(?::\\d+)?)?"
 		   "|"
-		     "[[:alpha:].\\s]+(?:standard|daylight)\\stime\\b"
+		     "(?-i:[[:alpha:].\\s]+)(?:standard|daylight)\\stime\\b"
 		   "|"
-		     "[[:alpha:]]+(?:\\sdst)?\\b"
+		     "(?-i:[[:alpha:]]+)(?:\\sdst)?\\b"
 		   ")"
 		")?";
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
+#ifndef TIGHT_PARSER
     SUBS(str, pat, parse_time_cb);
+#else
+    SUBT(str, pat, parse_time_cb);
+#endif
+}
+
+#ifdef TIGHT_PARSER
+static int
+parse_era1_cb(VALUE m, VALUE hash)
+{
+    return 1;
 }
 
 static int
+parse_era1(VALUE str, VALUE hash)
+{
+    static const char pat_source[] =
+	"(a(?:d|\\.d\\.))";
+    static VALUE pat = Qnil;
+
+    REGCOMP_I(pat);
+    SUBA(str, pat, parse_era1_cb);
+}
+
+static int
+parse_era2_cb(VALUE m, VALUE hash)
+{
+    VALUE b;
+
+    b = rb_reg_nth_match(1, m);
+    if (*RSTRING_PTR(b) == 'B' ||
+	*RSTRING_PTR(b) == 'b')
+	set_hash("_bc", Qtrue);
+    return 1;
+}
+
+static int
+parse_era2(VALUE str, VALUE hash)
+{
+    static const char pat_source[] =
+	"(c(?:e|\\.e\\.)|b(?:ce|\\.c\\.e\\.)|b(?:c|\\.c\\.))";
+    static VALUE pat = Qnil;
+
+    REGCOMP_I(pat);
+    SUBB(str, pat, parse_era2_cb);
+}
+
+static int
+parse_era(VALUE str, VALUE hash)
+{
+    if (parse_era1(str, hash)) /* pre */
+	goto ok;
+    if (parse_era2(str, hash)) /* post */
+	goto ok;
+    return 0;
+  ok:
+    return 1;
+}
+#endif
+
+#ifdef TIGHT_PARSER
+static int
+check_year_width(VALUE y)
+{
+    const char *s;
+    long l;
+
+    l = RSTRING_LEN(y);
+    if (l < 2) return 0;
+    s = RSTRING_PTR(y);
+    if (!isdigit(s[1])) return 0;
+    return (l == 2 || !isdigit(s[2]));
+}
+
+static int
+check_apost(VALUE a, VALUE b, VALUE c)
+{
+    int f = 0;
+
+    if (!NIL_P(a) && *RSTRING_PTR(a) == '\'') {
+	if (!check_year_width(a))
+	    return 0;
+	f++;
+    }
+    if (!NIL_P(b) && *RSTRING_PTR(b) == '\'') {
+	if (!check_year_width(b))
+	    return 0;
+	if (!NIL_P(c))
+	    return 0;
+	f++;
+    }
+    if (!NIL_P(c) && *RSTRING_PTR(c) == '\'') {
+	if (!check_year_width(c))
+	    return 0;
+	f++;
+    }
+    if (f > 1)
+	return 0;
+    return 1;
+}
+#endif
+
+static int
 parse_eu_cb(VALUE m, VALUE hash)
 {
+#ifndef TIGHT_PARSER
     VALUE y, mon, d, b;
 
     d = rb_reg_nth_match(1, m);
@@ -707,6 +802,20 @@ parse_eu_cb(VALUE m, VALUE hash)
     s3e(hash, y, mon, d, !NIL_P(b) &&
 	(*RSTRING_PTR(b) == 'B' ||
 	 *RSTRING_PTR(b) == 'b'));
+#else
+    VALUE y, mon, d;
+
+    d = rb_reg_nth_match(1, m);
+    mon = rb_reg_nth_match(2, m);
+    y = rb_reg_nth_match(3, m);
+
+    if (!check_apost(d, mon, y))
+	return 0;
+
+    mon = INT2FIX(mon_num(mon));
+
+    s3e(hash, y, mon, d, 0);
+#endif
     return 1;
 }
 
@@ -714,15 +823,40 @@ static int
 parse_eu(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-		"'?(\\d+)[^-\\d\\s]*"
+#ifdef TIGHT_PARSER
+		BOS
+		FPW_COM FPT_COM
+#endif
+#ifndef TIGHT_PARSER
+		"('?\\d+)[^-\\d\\s]*"
+#else
+		"(\\d+)(?:(?:st|nd|rd|th)\\b)?"
+#endif
 		 "\\s*"
+#ifndef TIGHT_PARSER
 		 "(" ABBR_MONTHS ")[^-\\d\\s']*"
+#else
+		 "(" VALID_MONTHS ")"
+#endif
 		 "(?:"
 		   "\\s*"
+#ifndef TIGHT_PARSER
 		   "(c(?:e|\\.e\\.)|b(?:ce|\\.c\\.e\\.)|a(?:d|\\.d\\.)|b(?:c|\\.c\\.))?"
 		   "\\s*"
 		   "('?-?\\d+(?:(?:st|nd|rd|th)\\b)?)"
-		")?";
+#else
+		   "(?:" FPA ")?"
+		   "\\s*"
+		   "([-']?\\d+)"
+		   "\\s*"
+		   "(?:" FPA "|" FPB ")?"
+#endif
+		")?"
+#ifdef TIGHT_PARSER
+		COM_FPT COM_FPW
+		EOS
+#endif
+		;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
@@ -732,10 +866,12 @@ parse_eu(VALUE str, VALUE hash)
 static int
 parse_us_cb(VALUE m, VALUE hash)
 {
+#ifndef TIGHT_PARSER
     VALUE y, mon, d, b;
 
     mon = rb_reg_nth_match(1, m);
     d = rb_reg_nth_match(2, m);
+
     b = rb_reg_nth_match(3, m);
     y = rb_reg_nth_match(4, m);
 
@@ -744,6 +880,20 @@ parse_us_cb(VALUE m, VALUE hash)
     s3e(hash, y, mon, d, !NIL_P(b) &&
 	(*RSTRING_PTR(b) == 'B' ||
 	 *RSTRING_PTR(b) == 'b'));
+#else
+    VALUE y, mon, d;
+
+    mon = rb_reg_nth_match(1, m);
+    d = rb_reg_nth_match(2, m);
+    y = rb_reg_nth_match(3, m);
+
+    if (!check_apost(mon, d, y))
+	return 0;
+
+    mon = INT2FIX(mon_num(mon));
+
+    s3e(hash, y, mon, d, 0);
+#endif
     return 1;
 }
 
@@ -751,15 +901,42 @@ static int
 parse_us(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
+#ifdef TIGHT_PARSER
+		BOS
+		FPW_COM FPT_COM
+#endif
+#ifndef TIGHT_PARSER
 		"\\b(" ABBR_MONTHS ")[^-\\d\\s']*"
+#else
+		"\\b(" VALID_MONTHS ")"
+#endif
 		 "\\s*"
+#ifndef TIGHT_PARSER
 		 "('?\\d+)[^-\\d\\s']*"
+#else
+		 "('?\\d+)(?:(?:st|nd|rd|th)\\b)?"
+		COM_FPT
+#endif
 		 "(?:"
+		   "\\s*,?"
 		   "\\s*"
+#ifndef TIGHT_PARSER
 		   "(c(?:e|\\.e\\.)|b(?:ce|\\.c\\.e\\.)|a(?:d|\\.d\\.)|b(?:c|\\.c\\.))?"
 		   "\\s*"
 		   "('?-?\\d+)"
-		")?";
+#else
+		   "(?:" FPA ")?"
+		   "\\s*"
+		   "([-']?\\d+)"
+		   "\\s*"
+		   "(?:" FPA "|" FPB ")?"
+#endif
+		")?"
+#ifdef TIGHT_PARSER
+		COM_FPT COM_FPW
+		EOS
+#endif
+		;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
@@ -775,6 +952,11 @@ parse_iso_cb(VALUE m, VALUE hash)
     mon = rb_reg_nth_match(2, m);
     d = rb_reg_nth_match(3, m);
 
+#ifdef TIGHT_PARSER
+    if (!check_apost(y, mon, d))
+	return 0;
+#endif
+
     s3e(hash, y, mon, d, 0);
     return 1;
 }
@@ -782,7 +964,17 @@ parse_iso_cb(VALUE m, VALUE hash)
 static int
 parse_iso(VALUE str, VALUE hash)
 {
-    static const char pat_source[] = "('?[-+]?\\d+)-(\\d+)-('?-?\\d+)";
+    static const char pat_source[] =
+#ifndef TIGHT_PARSER
+	"('?[-+]?\\d+)-(\\d+)-('?-?\\d+)"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"([-+']?\\d+)-(\\d+)-([-']?\\d+)"
+	TEE_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_0(pat);
@@ -811,7 +1003,16 @@ static int
 parse_iso21(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-	"\\b(\\d{2}|\\d{4})?-?w(\\d{2})(?:-?(\\d))?\\b";
+#ifndef TIGHT_PARSER
+	"\\b(\\d{2}|\\d{4})?-?w(\\d{2})(?:-?(\\d))?\\b"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"(\\d{2}|\\d{4})?-?w(\\d{2})(?:-?(\\d))?"
+	TEE_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
@@ -831,7 +1032,17 @@ parse_iso22_cb(VALUE m, VALUE hash)
 static int
 parse_iso22(VALUE str, VALUE hash)
 {
-    static const char pat_source[] = "-w-(\\d)\\b";
+    static const char pat_source[] =
+#ifndef TIGHT_PARSER
+	"-w-(\\d)\\b"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"-w-(\\d)"
+	TEE_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
@@ -856,7 +1067,17 @@ parse_iso23_cb(VALUE m, VALUE hash)
 static int
 parse_iso23(VALUE str, VALUE hash)
 {
-    static const char pat_source[] = "--(\\d{2})?-(\\d{2})\\b";
+    static const char pat_source[] =
+#ifndef TIGHT_PARSER
+	"--(\\d{2})?-(\\d{2})\\b"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"--(\\d{2})?-(\\d{2})"
+	TEE_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_0(pat);
@@ -881,7 +1102,17 @@ parse_iso24_cb(VALUE m, VALUE hash)
 static int
 parse_iso24(VALUE str, VALUE hash)
 {
-    static const char pat_source[] = "--(\\d{2})(\\d{2})?\\b";
+    static const char pat_source[] =
+#ifndef TIGHT_PARSER
+	"--(\\d{2})(\\d{2})?\\b"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"--(\\d{2})(\\d{2})?"
+	TEE_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_0(pat);
@@ -905,9 +1136,29 @@ parse_iso25_cb(VALUE m, VALUE hash)
 static int
 parse_iso25(VALUE str, VALUE hash)
 {
-    static const char pat0_source[] = "[,.](\\d{2}|\\d{4})-\\d{3}\\b";
+    static const char pat0_source[] =
+#ifndef TIGHT_PARSER
+	"[,.](\\d{2}|\\d{4})-\\d{3}\\b"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"[,.](\\d{2}|\\d{4})-\\d{3}"
+	TEE_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat0 = Qnil;
-    static const char pat_source[] = "\\b(\\d{2}|\\d{4})-(\\d{3})\\b";
+    static const char pat_source[] =
+#ifndef TIGHT_PARSER
+	"\\b(\\d{2}|\\d{4})-(\\d{3})\\b"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"(\\d{2}|\\d{4})-(\\d{3})"
+	TEE_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_0(pat0);
@@ -931,9 +1182,29 @@ parse_iso26_cb(VALUE m, VALUE hash)
 static int
 parse_iso26(VALUE str, VALUE hash)
 {
-    static const char pat0_source[] = "\\d-\\d{3}\\b";
+    static const char pat0_source[] =
+#ifndef TIGHT_PARSER
+	"\\d-\\d{3}\\b"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"\\d-\\d{3}"
+	TEE_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat0 = Qnil;
-    static const char pat_source[] = "\\b-(\\d{3})\\b";
+    static const char pat_source[] =
+#ifndef TIGHT_PARSER
+	"\\b-(\\d{3})\\b"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"-(\\d{3})"
+	TEE_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_0(pat0);
@@ -965,6 +1236,9 @@ parse_iso2(VALUE str, VALUE hash)
     return 1;
 }
 
+#define JISX0301_ERA_INITIALS "mtshr"
+#define JISX0301_DEFAULT_ERA 'H' /* obsolete */
+
 static int
 gengo(int c)
 {
@@ -975,6 +1249,7 @@ gengo(int c)
       case 'T': case 't': e = 1911; break;
       case 'S': case 's': e = 1925; break;
       case 'H': case 'h': e = 1988; break;
+      case 'R': case 'r': e = 2018; break;
       default:  e = 0; break;
     }
     return e;
@@ -1003,7 +1278,17 @@ parse_jis_cb(VALUE m, VALUE hash)
 static int
 parse_jis(VALUE str, VALUE hash)
 {
-    static const char pat_source[] = "\\b([mtsh])(\\d+)\\.(\\d+)\\.(\\d+)";
+    static const char pat_source[] =
+#ifndef TIGHT_PARSER
+        "\\b([" JISX0301_ERA_INITIALS "])(\\d+)\\.(\\d+)\\.(\\d+)"
+#else
+	BOS
+	FPW_COM FPT_COM
+        "([" JISX0301_ERA_INITIALS "])(\\d+)\\.(\\d+)\\.(\\d+)"
+	TEE_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
@@ -1019,6 +1304,11 @@ parse_vms11_cb(VALUE m, VALUE hash)
     mon = rb_reg_nth_match(2, m);
     y = rb_reg_nth_match(3, m);
 
+#ifdef TIGHT_PARSER
+    if (!check_apost(d, mon, y))
+	return 0;
+#endif
+
     mon = INT2FIX(mon_num(mon));
 
     s3e(hash, y, mon, d, 0);
@@ -1029,8 +1319,18 @@ static int
 parse_vms11(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-	"('?-?\\d+)-(" ABBR_MONTHS ")[^-]*"
-	"-('?-?\\d+)";
+#ifndef TIGHT_PARSER
+	"('?-?\\d+)-(" ABBR_MONTHS ")[^-/.]*"
+	"-('?-?\\d+)"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"([-']?\\d+)-(" DOTLESS_VALID_MONTHS ")"
+	"-([-']?\\d+)"
+	COM_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
@@ -1046,6 +1346,11 @@ parse_vms12_cb(VALUE m, VALUE hash)
     d = rb_reg_nth_match(2, m);
     y = rb_reg_nth_match(3, m);
 
+#ifdef TIGHT_PARSER
+    if (!check_apost(mon, d, y))
+	return 0;
+#endif
+
     mon = INT2FIX(mon_num(mon));
 
     s3e(hash, y, mon, d, 0);
@@ -1056,8 +1361,18 @@ static int
 parse_vms12(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-	"\\b(" ABBR_MONTHS ")[^-]*"
-	"-('?-?\\d+)(?:-('?-?\\d+))?";
+#ifndef TIGHT_PARSER
+	"\\b(" ABBR_MONTHS ")[^-/.]*"
+	"-('?-?\\d+)(?:-('?-?\\d+))?"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"(" DOTLESS_VALID_MONTHS ")"
+	"-([-']?\\d+)(?:-([-']?\\d+))?"
+	COM_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
@@ -1086,6 +1401,11 @@ parse_sla_cb(VALUE m, VALUE hash)
     mon = rb_reg_nth_match(2, m);
     d = rb_reg_nth_match(3, m);
 
+#ifdef TIGHT_PARSER
+    if (!check_apost(y, mon, d))
+	return 0;
+#endif
+
     s3e(hash, y, mon, d, 0);
     return 1;
 }
@@ -1094,13 +1414,92 @@ static int
 parse_sla(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-	"('?-?\\d+)/\\s*('?\\d+)(?:\\D\\s*('?-?\\d+))?";
+#ifndef TIGHT_PARSER
+	"('?-?\\d+)/\\s*('?\\d+)(?:\\D\\s*('?-?\\d+))?"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"([-']?\\d+)/\\s*('?\\d+)(?:(?:[-/]|\\s+)\\s*([-']?\\d+))?"
+	COM_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
     SUBS(str, pat, parse_sla_cb);
 }
 
+#ifdef TIGHT_PARSER
+static int
+parse_sla2_cb(VALUE m, VALUE hash)
+{
+    VALUE y, mon, d;
+
+    d = rb_reg_nth_match(1, m);
+    mon = rb_reg_nth_match(2, m);
+    y = rb_reg_nth_match(3, m);
+
+    if (!check_apost(d, mon, y))
+	return 0;
+
+    mon = INT2FIX(mon_num(mon));
+
+    s3e(hash, y, mon, d, 0);
+    return 1;
+}
+
+static int
+parse_sla2(VALUE str, VALUE hash)
+{
+    static const char pat_source[] =
+	BOS
+	FPW_COM FPT_COM
+	"([-']?\\d+)/\\s*(" DOTLESS_VALID_MONTHS ")(?:(?:[-/]|\\s+)\\s*([-']?\\d+))?"
+	COM_FPT COM_FPW
+	EOS
+	;
+    static VALUE pat = Qnil;
+
+    REGCOMP_I(pat);
+    SUBS(str, pat, parse_sla2_cb);
+}
+
+static int
+parse_sla3_cb(VALUE m, VALUE hash)
+{
+    VALUE y, mon, d;
+
+    mon = rb_reg_nth_match(1, m);
+    d = rb_reg_nth_match(2, m);
+    y = rb_reg_nth_match(3, m);
+
+    if (!check_apost(mon, d, y))
+	return 0;
+
+    mon = INT2FIX(mon_num(mon));
+
+    s3e(hash, y, mon, d, 0);
+    return 1;
+}
+
+static int
+parse_sla3(VALUE str, VALUE hash)
+{
+    static const char pat_source[] =
+	BOS
+	FPW_COM FPT_COM
+	"(" DOTLESS_VALID_MONTHS ")/\\s*([-']?\\d+)(?:(?:[-/]|\\s+)\\s*([-']?\\d+))?"
+	COM_FPT COM_FPW
+	EOS
+	;
+    static VALUE pat = Qnil;
+
+    REGCOMP_I(pat);
+    SUBS(str, pat, parse_sla3_cb);
+}
+#endif
+
 static int
 parse_dot_cb(VALUE m, VALUE hash)
 {
@@ -1110,6 +1509,11 @@ parse_dot_cb(VALUE m, VALUE hash)
     mon = rb_reg_nth_match(2, m);
     d = rb_reg_nth_match(3, m);
 
+#ifdef TIGHT_PARSER
+    if (!check_apost(y, mon, d))
+	return 0;
+#endif
+
     s3e(hash, y, mon, d, 0);
     return 1;
 }
@@ -1118,13 +1522,92 @@ static int
 parse_dot(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-	"('?-?\\d+)\\.\\s*('?\\d+)\\.\\s*('?-?\\d+)";
+#ifndef TIGHT_PARSER
+	"('?-?\\d+)\\.\\s*('?\\d+)\\.\\s*('?-?\\d+)"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"([-']?\\d+)\\.\\s*(\\d+)\\.\\s*([-']?\\d+)"
+	COM_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
     SUBS(str, pat, parse_dot_cb);
 }
 
+#ifdef TIGHT_PARSER
+static int
+parse_dot2_cb(VALUE m, VALUE hash)
+{
+    VALUE y, mon, d;
+
+    d = rb_reg_nth_match(1, m);
+    mon = rb_reg_nth_match(2, m);
+    y = rb_reg_nth_match(3, m);
+
+    if (!check_apost(d, mon, y))
+	return 0;
+
+    mon = INT2FIX(mon_num(mon));
+
+    s3e(hash, y, mon, d, 0);
+    return 1;
+}
+
+static int
+parse_dot2(VALUE str, VALUE hash)
+{
+    static const char pat_source[] =
+	BOS
+	FPW_COM FPT_COM
+	"([-']?\\d+)\\.\\s*(" DOTLESS_VALID_MONTHS ")(?:(?:[./])\\s*([-']?\\d+))?"
+	COM_FPT COM_FPW
+	EOS
+	;
+    static VALUE pat = Qnil;
+
+    REGCOMP_I(pat);
+    SUBS(str, pat, parse_dot2_cb);
+}
+
+static int
+parse_dot3_cb(VALUE m, VALUE hash)
+{
+    VALUE y, mon, d;
+
+    mon = rb_reg_nth_match(1, m);
+    d = rb_reg_nth_match(2, m);
+    y = rb_reg_nth_match(3, m);
+
+    if (!check_apost(mon, d, y))
+	return 0;
+
+    mon = INT2FIX(mon_num(mon));
+
+    s3e(hash, y, mon, d, 0);
+    return 1;
+}
+
+static int
+parse_dot3(VALUE str, VALUE hash)
+{
+    static const char pat_source[] =
+	BOS
+	FPW_COM FPT_COM
+	"(" DOTLESS_VALID_MONTHS ")\\.\\s*([-']?\\d+)(?:(?:[./])\\s*([-']?\\d+))?"
+	COM_FPT COM_FPW
+	EOS
+	;
+    static VALUE pat = Qnil;
+
+    REGCOMP_I(pat);
+    SUBS(str, pat, parse_dot3_cb);
+}
+#endif
+
 static int
 parse_year_cb(VALUE m, VALUE hash)
 {
@@ -1138,7 +1621,17 @@ parse_year_cb(VALUE m, VALUE hash)
 static int
 parse_year(VALUE str, VALUE hash)
 {
-    static const char pat_source[] = "'(\\d+)\\b";
+    static const char pat_source[] =
+#ifndef TIGHT_PARSER
+	"'(\\d+)\\b"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"'(\\d+)"
+	COM_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_0(pat);
@@ -1158,7 +1651,17 @@ parse_mon_cb(VALUE m, VALUE hash)
 static int
 parse_mon(VALUE str, VALUE hash)
 {
-    static const char pat_source[] = "\\b(" ABBR_MONTHS ")\\S*";
+    static const char pat_source[] =
+#ifndef TIGHT_PARSER
+	"\\b(" ABBR_MONTHS ")\\S*"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"(" VALID_MONTHS ")"
+	COM_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
@@ -1178,7 +1681,17 @@ parse_mday_cb(VALUE m, VALUE hash)
 static int
 parse_mday(VALUE str, VALUE hash)
 {
-    static const char pat_source[] = "(\\d+)(st|nd|rd|th)\\b";
+    static const char pat_source[] =
+#ifndef TIGHT_PARSER
+	"(\\d+)(st|nd|rd|th)\\b"
+#else
+	BOS
+	FPW_COM FPT_COM
+	"(\\d+)(st|nd|rd|th)"
+	COM_FPT COM_FPW
+	EOS
+#endif
+	;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
@@ -1374,28 +1887,26 @@ parse_ddd_cb(VALUE m, VALUE hash)
 	set_hash("zone", s5);
 
 	if (*cs5 == '[') {
-	    char *buf = ALLOCA_N(char, l5 + 1);
-	    char *s1, *s2, *s3;
+            const char *s1, *s2;
 	    VALUE zone;
 
-	    memcpy(buf, cs5, l5);
-	    buf[l5 - 1] = '\0';
-
-	    s1 = buf + 1;
-	    s2 = strchr(buf, ':');
+            l5 -= 2;
+            s1 = cs5 + 1;
+            s2 = memchr(s1, ':', l5);
 	    if (s2) {
-		*s2 = '\0';
 		s2++;
+                zone = rb_str_subseq(s5, s2 - cs5, l5 - (s2 - s1));
+                s5 = rb_str_subseq(s5, 1, s2 - s1);
 	    }
-	    if (s2)
-		s3 = s2;
-	    else
-		s3 = s1;
-	    zone = rb_str_new2(s3);
+            else {
+                zone = rb_str_subseq(s5, 1, l5);
+                if (isdigit((unsigned char)*s1))
+                    s5 = rb_str_append(rb_str_new_cstr("+"), zone);
+                else
+                    s5 = zone;
+            }
 	    set_hash("zone", zone);
-	    if (isdigit(*s1))
-		*--s1 = '+';
-	    set_hash("offset", date_zone_to_diff(rb_str_new2(s1)));
+            set_hash("offset", date_zone_to_diff(s5));
 	}
 	RB_GC_GUARD(s5);
     }
@@ -1407,6 +1918,9 @@ static int
 parse_ddd(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
+#ifdef TIGHT_PARSER
+		BOS
+#endif
 		"([-+]?)(\\d{2,14})"
 		  "(?:"
 		    "\\s*"
@@ -1423,22 +1937,22 @@ parse_ddd(VALUE str, VALUE hash)
 		    "|"
 		      "\\[[-+]?\\d[^\\]]*\\]"
 		    ")"
-		")?";
+		")?"
+#ifdef TIGHT_PARSER
+		EOS
+#endif
+		;
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
     SUBS(str, pat, parse_ddd_cb);
 }
 
+#ifndef TIGHT_PARSER
 static int
 parse_bc_cb(VALUE m, VALUE hash)
 {
-    VALUE y;
-
-    y = ref_hash("year");
-    if (!NIL_P(y))
-	set_hash("year", f_add(f_negate(y), INT2FIX(1)));
-
+    set_hash("_bc", Qtrue);
     return 1;
 }
 
@@ -1485,6 +1999,57 @@ parse_frag(VALUE str, VALUE hash)
     REGCOMP_I(pat);
     SUBS(str, pat, parse_frag_cb);
 }
+#endif
+
+#ifdef TIGHT_PARSER
+static int
+parse_dummy_cb(VALUE m, VALUE hash)
+{
+    return 1;
+}
+
+static int
+parse_wday_only(VALUE str, VALUE hash)
+{
+    static const char pat_source[] = "\\A\\s*" FPW "\\s*\\z";
+    static VALUE pat = Qnil;
+
+    REGCOMP_0(pat);
+    SUBS(str, pat, parse_dummy_cb);
+}
+
+static int
+parse_time_only(VALUE str, VALUE hash)
+{
+    static const char pat_source[] = "\\A\\s*" FPT "\\s*\\z";
+    static VALUE pat = Qnil;
+
+    REGCOMP_0(pat);
+    SUBS(str, pat, parse_dummy_cb);
+}
+
+static int
+parse_wday_and_time(VALUE str, VALUE hash)
+{
+    static const char pat_source[] = "\\A\\s*(" FPW "\\s+" FPT "|" FPT "\\s+" FPW ")\\s*\\z";
+    static VALUE pat = Qnil;
+
+    REGCOMP_0(pat);
+    SUBS(str, pat, parse_dummy_cb);
+}
+
+static unsigned
+have_invalid_char_p(VALUE s)
+{
+    long i;
+
+    for (i = 0; i < RSTRING_LEN(s); i++)
+	if (iscntrl((unsigned char)RSTRING_PTR(s)[i]) &&
+	    !isspace((unsigned char)RSTRING_PTR(s)[i]))
+	    return 1;
+    return 0;
+}
+#endif
 
 #define HAVE_ALPHA (1<<0)
 #define HAVE_DIGIT (1<<1)
@@ -1500,9 +2065,9 @@ check_class(VALUE s)
 
     flags = 0;
     for (i = 0; i < RSTRING_LEN(s); i++) {
-	if (isalpha(RSTRING_PTR(s)[i]))
+	if (isalpha((unsigned char)RSTRING_PTR(s)[i]))
 	    flags |= HAVE_ALPHA;
-	if (isdigit(RSTRING_PTR(s)[i]))
+	if (isdigit((unsigned char)RSTRING_PTR(s)[i]))
 	    flags |= HAVE_DIGIT;
 	if (RSTRING_PTR(s)[i] == '-')
 	    flags |= HAVE_DASH;
@@ -1516,16 +2081,31 @@ check_class(VALUE s)
 
 #define HAVE_ELEM_P(x) ((check_class(str) & (x)) == (x))
 
+#ifdef TIGHT_PARSER
+#define PARSER_ERROR return rb_hash_new()
+#endif
+
 VALUE
 date__parse(VALUE str, VALUE comp)
 {
     VALUE backref, hash;
 
+#ifdef TIGHT_PARSER
+    if (have_invalid_char_p(str))
+	PARSER_ERROR;
+#endif
+
     backref = rb_backref_get();
     rb_match_busy(backref);
 
     {
-	static const char pat_source[] = "[^-+',./:@[:alnum:]\\[\\]]+";
+	static const char pat_source[] =
+#ifndef TIGHT_PARSER
+	    "[^-+',./:@[:alnum:]\\[\\]]+"
+#else
+	    "[^[:graph:]]+"
+#endif
+	    ;
 	static VALUE pat = Qnil;
 
 	REGCOMP_0(pat);
@@ -1541,12 +2121,17 @@ date__parse(VALUE str, VALUE comp)
     if (HAVE_ELEM_P(HAVE_DIGIT))
 	parse_time(str, hash);
 
-    if (HAVE_ELEM_P(HAVE_ALPHA|HAVE_DIGIT))
+#ifdef TIGHT_PARSER
+    if (HAVE_ELEM_P(HAVE_ALPHA))
+	parse_era(str, hash);
+#endif
+
+    if (HAVE_ELEM_P(HAVE_ALPHA|HAVE_DIGIT)) {
 	if (parse_eu(str, hash))
 	    goto ok;
-    if (HAVE_ELEM_P(HAVE_ALPHA|HAVE_DIGIT))
 	if (parse_us(str, hash))
 	    goto ok;
+    }
     if (HAVE_ELEM_P(HAVE_DIGIT|HAVE_DASH))
 	if (parse_iso(str, hash))
 	    goto ok;
@@ -1559,9 +2144,25 @@ date__parse(VALUE str, VALUE comp)
     if (HAVE_ELEM_P(HAVE_DIGIT|HAVE_SLASH))
 	if (parse_sla(str, hash))
 	    goto ok;
+#ifdef TIGHT_PARSER
+    if (HAVE_ELEM_P(HAVE_ALPHA|HAVE_DIGIT|HAVE_SLASH)) {
+	if (parse_sla2(str, hash))
+	    goto ok;
+	if (parse_sla3(str, hash))
+	    goto ok;
+    }
+#endif
     if (HAVE_ELEM_P(HAVE_DIGIT|HAVE_DOT))
 	if (parse_dot(str, hash))
 	    goto ok;
+#ifdef TIGHT_PARSER
+    if (HAVE_ELEM_P(HAVE_ALPHA|HAVE_DIGIT|HAVE_DOT)) {
+	if (parse_dot2(str, hash))
+	    goto ok;
+	if (parse_dot3(str, hash))
+	    goto ok;
+    }
+#endif
     if (HAVE_ELEM_P(HAVE_DIGIT))
 	if (parse_iso2(str, hash))
 	    goto ok;
@@ -1578,14 +2179,42 @@ date__parse(VALUE str, VALUE comp)
 	if (parse_ddd(str, hash))
 	    goto ok;
 
+#ifdef TIGHT_PARSER
+    if (parse_wday_only(str, hash))
+	goto ok;
+    if (parse_time_only(str, hash))
+	    goto ok;
+    if (parse_wday_and_time(str, hash))
+	goto ok;
+
+    PARSER_ERROR; /* not found */
+#endif
+
   ok:
+#ifndef TIGHT_PARSER
     if (HAVE_ELEM_P(HAVE_ALPHA))
 	parse_bc(str, hash);
     if (HAVE_ELEM_P(HAVE_DIGIT))
 	parse_frag(str, hash);
+#endif
 
     {
-	if (RTEST(ref_hash("_comp"))) {
+        if (RTEST(del_hash("_bc"))) {
+	    VALUE y;
+
+	    y = ref_hash("cwyear");
+	    if (!NIL_P(y)) {
+		y = f_add(f_negate(y), INT2FIX(1));
+		set_hash("cwyear", y);
+	    }
+	    y = ref_hash("year");
+	    if (!NIL_P(y)) {
+		y = f_add(f_negate(y), INT2FIX(1));
+		set_hash("year", y);
+	    }
+	}
+
+        if (RTEST(del_hash("_comp"))) {
 	    VALUE y;
 
 	    y = ref_hash("cwyear");
@@ -1605,9 +2234,8 @@ date__parse(VALUE str, VALUE comp)
 			set_hash("year", f_add(y, INT2FIX(2000)));
 		}
 	}
-    }
 
-    del_hash("_comp");
+    }
 
     {
 	VALUE zone = ref_hash("zone");
@@ -1658,8 +2286,8 @@ iso8601_ext_datetime_cb(VALUE m, VALUE hash)
 	    s[i] = rb_reg_nth_match(i, m);
     }
 
-    if (!NIL_P(s[3])) {
-	set_hash("mday", str2num(s[3]));
+    if (!NIL_P(s[1])) {
+	if (!NIL_P(s[3])) set_hash("mday", str2num(s[3]));
 	if (strcmp(RSTRING_PTR(s[1]), "-") != 0) {
 	    y = str2num(s[1]);
 	    if (RSTRING_LEN(s[1]) < 4)
@@ -1716,7 +2344,7 @@ static int
 iso8601_ext_datetime(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-	"\\A\\s*(?:([-+]?\\d{2,}|-)-(\\d{2})?-(\\d{2})|"
+	"\\A\\s*(?:([-+]?\\d{2,}|-)-(\\d{2})?(?:-(\\d{2}))?|"
 		"([-+]?\\d{2,})?-(\\d{3})|"
 		"(\\d{4}|\\d{2})?-w(\\d{2})-(\\d)|"
 		"-w-(\\d))"
@@ -1726,7 +2354,7 @@ iso8601_ext_datetime(VALUE str, VALUE hash)
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, iso8601_ext_datetime_cb);
+    MATCH(str, pat, iso8601_ext_datetime_cb);
 }
 
 #undef SNUM
@@ -1817,7 +2445,7 @@ iso8601_bas_datetime(VALUE str, VALUE hash)
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, iso8601_bas_datetime_cb);
+    MATCH(str, pat, iso8601_bas_datetime_cb);
 }
 
 #undef SNUM
@@ -1855,24 +2483,24 @@ static int
 iso8601_ext_time(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-	"\\A\\s*(?:(\\d{2}):(\\d{2})(?::(\\d{2})(?:[,.](\\d+))?)?"
+	"\\A\\s*(\\d{2}):(\\d{2})(?::(\\d{2})(?:[,.](\\d+))?"
 	"(z|[-+]\\d{2}(:?\\d{2})?)?)?\\s*\\z";
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, iso8601_ext_time_cb);
+    MATCH(str, pat, iso8601_ext_time_cb);
 }
 
 static int
 iso8601_bas_time(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-	"\\A\\s*(?:(\\d{2})(\\d{2})(?:(\\d{2})(?:[,.](\\d+))?)?"
+	"\\A\\s*(\\d{2})(\\d{2})(?:(\\d{2})(?:[,.](\\d+))?"
 	"(z|[-+]\\d{2}(\\d{2})?)?)?\\s*\\z";
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, iso8601_bas_time_cb);
+    MATCH(str, pat, iso8601_bas_time_cb);
 }
 
 VALUE
@@ -1940,7 +2568,7 @@ rfc3339(VALUE str, VALUE hash)
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, rfc3339_cb);
+    MATCH(str, pat, rfc3339_cb);
 }
 
 VALUE
@@ -2004,7 +2632,7 @@ xmlschema_datetime(VALUE str, VALUE hash)
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, xmlschema_datetime_cb);
+    MATCH(str, pat, xmlschema_datetime_cb);
 }
 
 #undef SNUM
@@ -2045,7 +2673,7 @@ xmlschema_time(VALUE str, VALUE hash)
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, xmlschema_time_cb);
+    MATCH(str, pat, xmlschema_time_cb);
 }
 
 #undef SNUM
@@ -2086,7 +2714,7 @@ xmlschema_trunc(VALUE str, VALUE hash)
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, xmlschema_trunc_cb);
+    MATCH(str, pat, xmlschema_trunc_cb);
 }
 
 VALUE
@@ -2127,7 +2755,9 @@ rfc2822_cb(VALUE m, VALUE hash)
 	    s[i] = rb_reg_nth_match(i, m);
     }
 
-    set_hash("wday", INT2FIX(day_num(s[1])));
+    if (!NIL_P(s[1])) {
+	set_hash("wday", INT2FIX(day_num(s[1])));
+    }
     set_hash("mday", str2num(s[2]));
     set_hash("mon", INT2FIX(mon_num(s[3])));
     y = str2num(s[4]);
@@ -2157,7 +2787,7 @@ rfc2822(VALUE str, VALUE hash)
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, rfc2822_cb);
+    MATCH(str, pat, rfc2822_cb);
 }
 
 VALUE
@@ -2215,7 +2845,7 @@ httpdate_type1(VALUE str, VALUE hash)
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, httpdate_type1_cb);
+    MATCH(str, pat, httpdate_type1_cb);
 }
 
 #undef SNUM
@@ -2262,7 +2892,7 @@ httpdate_type2(VALUE str, VALUE hash)
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, httpdate_type2_cb);
+    MATCH(str, pat, httpdate_type2_cb);
 }
 
 #undef SNUM
@@ -2303,7 +2933,7 @@ httpdate_type3(VALUE str, VALUE hash)
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, httpdate_type3_cb);
+    MATCH(str, pat, httpdate_type3_cb);
 }
 
 VALUE
@@ -2345,7 +2975,7 @@ jisx0301_cb(VALUE m, VALUE hash)
 	    s[i] = rb_reg_nth_match(i, m);
     }
 
-    ep = gengo(NIL_P(s[1]) ? 'h' : *RSTRING_PTR(s[1]));
+    ep = gengo(NIL_P(s[1]) ? JISX0301_DEFAULT_ERA : *RSTRING_PTR(s[1]));
     set_hash("year", f_add(str2num(s[2]), INT2FIX(ep)));
     set_hash("mon", str2num(s[3]));
     set_hash("mday", str2num(s[4]));
@@ -2370,14 +3000,14 @@ static int
 jisx0301(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-	"\\A\\s*([mtsh])?(\\d{2})\\.(\\d{2})\\.(\\d{2})"
+        "\\A\\s*([" JISX0301_ERA_INITIALS "])?(\\d{2})\\.(\\d{2})\\.(\\d{2})"
 	"(?:t"
 	"(?:(\\d{2}):(\\d{2})(?::(\\d{2})(?:[,.](\\d*))?)?"
 	"(z|[-+]\\d{2}(?::?\\d{2})?)?)?)?\\s*\\z";
     static VALUE pat = Qnil;
 
     REGCOMP_I(pat);
-    SUBS(str, pat, jisx0301_cb);
+    MATCH(str, pat, jisx0301_cb);
 }
 
 VALUE
diff --git a/ext/date/date_strftime.c b/ext/date/date_strftime.c
index 71e1bd7f00..9d8167b612 100644
--- a/ext/date/date_strftime.c
+++ b/ext/date/date_strftime.c
@@ -1,164 +1,24 @@
-/* -*- c-file-style: "linux" -*- */
-
 /*
- * strftime.c
- *
- * Public-domain implementation of ANSI C library routine.
- *
- * It's written in old-style C for maximal portability.
- * However, since I'm used to prototypes, I've included them too.
- *
- * If you want stuff in the System V ascftime routine, add the SYSV_EXT define.
- * For extensions from SunOS, add SUNOS_EXT.
- * For stuff needed to implement the P1003.2 date command, add POSIX2_DATE.
- * For VMS dates, add VMS_EXT.
- * For a an RFC822 time format, add MAILHEADER_EXT.
- * For ISO week years, add ISO_DATE_EXT.
- * For complete POSIX semantics, add POSIX_SEMANTICS.
- *
- * The code for %c, %x, and %X now follows the 1003.2 specification for
- * the POSIX locale.
- * This version ignores LOCALE information.
- * It also doesn't worry about multi-byte characters.
- * So there.
- *
- * This file is also shipped with GAWK (GNU Awk), gawk specific bits of
- * code are included if GAWK is defined.
- *
- * Arnold Robbins
- * January, February, March, 1991
- * Updated March, April 1992
- * Updated April, 1993
- * Updated February, 1994
- * Updated May, 1994
- * Updated January, 1995
- * Updated September, 1995
- * Updated January, 1996
- *
- * Fixes from ado@elsie.nci.nih.gov
- * February 1991, May 1992
- * Fixes from Tor Lillqvist tml@tik.vtt.fi
- * May, 1993
- * Further fixes from ado@elsie.nci.nih.gov
- * February 1994
- * %z code from chip@chinacat.unicom.com
- * Applied September 1995
- * %V code fixed (again) and %G, %g added,
- * January 1996
+  date_strftime.c: based on a public-domain implementation of ANSI C
+  library routine strftime, which is originally written by Arnold
+  Robbins.
  */
 
 #include "ruby/ruby.h"
 #include "date_tmx.h"
 
-#ifndef GAWK
-#include <stdio.h>
-#include <ctype.h>
+#include <stdlib.h>
 #include <string.h>
-#include <time.h>
-#include <sys/types.h>
+#include <ctype.h>
 #include <errno.h>
-#endif
-#if defined(TM_IN_SYS_TIME) || !defined(GAWK)
-#include <sys/types.h>
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#endif
-#include <math.h>
-
-/* defaults: season to taste */
-#define SYSV_EXT	1	/* stuff in System V ascftime routine */
-#define SUNOS_EXT	1	/* stuff in SunOS strftime routine */
-#define POSIX2_DATE	1	/* stuff in Posix 1003.2 date command */
-#define VMS_EXT		1	/* include %v for VMS date format */
-#define MAILHEADER_EXT	1	/* add %z for HHMM format */
-#define ISO_DATE_EXT	1	/* %G and %g for year of ISO week */
-
-#if defined(ISO_DATE_EXT)
-#if ! defined(POSIX2_DATE)
-#define POSIX2_DATE	1
-#endif
-#endif
 
-#if defined(POSIX2_DATE)
-#if ! defined(SYSV_EXT)
-#define SYSV_EXT	1
-#endif
-#if ! defined(SUNOS_EXT)
-#define SUNOS_EXT	1
-#endif
-#endif
-
-#if defined(POSIX2_DATE)
-#define adddecl(stuff)	stuff
-#else
-#define adddecl(stuff)
+#if defined(HAVE_SYS_TIME_H)
+#include <sys/time.h>
 #endif
 
 #undef strchr	/* avoid AIX weirdness */
 
-#if 0
-#if !defined __STDC__ && !defined _WIN32
-#define const	/**/
-static int weeknumber();
-adddecl(static int iso8601wknum();)
-static int weeknumber_v();
-adddecl(static int iso8601wknum_v();)
-#else
-static int weeknumber(const struct tm *timeptr, int firstweekday);
-adddecl(static int iso8601wknum(const struct tm *timeptr);)
-static int weeknumber_v(const struct tmx *tmx, int firstweekday);
-adddecl(static int iso8601wknum_v(const struct tmx *tmx);)
-#endif
-#endif
-
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#include <string.h>
-#else
-extern void *malloc();
-extern void *realloc();
-extern char *getenv();
-extern char *strchr();
-#endif
-
-#define range(low, item, hi)	max((low), min((item), (hi)))
-
-#undef min	/* just in case */
-
-/* min --- return minimum of two numbers */
-
-#ifndef __STDC__
-static inline int
-min(a, b)
-int a, b;
-#else
-static inline int
-min(int a, int b)
-#endif
-{
-	return (a < b ? a : b);
-}
-
-#undef max	/* also, just in case */
-
-/* max --- return maximum of two numbers */
-
-#ifndef __STDC__
-static inline int
-max(a, b)
-int a, b;
-#else
-static inline int
-max(int a, int b)
-#endif
-{
-	return (a > b ? a : b);
-}
-
-#ifdef NO_STRING_LITERAL_CONCATENATION
-#error No string literal concatenation
-#endif
+#define range(low, item, hi)	(item)
 
 #define add(x,y) (rb_funcall((x), '+', 1, (y)))
 #define sub(x,y) (rb_funcall((x), '-', 1, (y)))
@@ -167,989 +27,612 @@ max(int a, int b)
 #define div(x,y) (rb_funcall((x), rb_intern("div"), 1, (y)))
 #define mod(x,y) (rb_funcall((x), '%', 1, (y)))
 
+static void
+upcase(char *s, size_t i)
+{
+    do {
+	if (ISLOWER(*s))
+	    *s = TOUPPER(*s);
+    } while (s++, --i);
+}
+
+static void
+downcase(char *s, size_t i)
+{
+    do {
+	if (ISUPPER(*s))
+	    *s = TOLOWER(*s);
+    } while (s++, --i);
+}
+
 /* strftime --- produce formatted time */
 
 static size_t
-date_strftime_with_tmx(char *s, size_t maxsize, const char *format,
+date_strftime_with_tmx(char *s, const size_t maxsize, const char *format,
 		       const struct tmx *tmx)
 {
-	char *endp = s + maxsize;
-	char *start = s;
-	const char *sp, *tp;
-	auto char tbuf[100];
-	long off;
-	ptrdiff_t i;
-	int w;
-	int precision, flags, colons;
-	char padding;
-	enum {LEFT, CHCASE, LOWER, UPPER, LOCALE_O, LOCALE_E};
+    char *endp = s + maxsize;
+    char *start = s;
+    const char *sp, *tp;
+    auto char tbuf[100];
+    ptrdiff_t i;
+    int v, w;
+    size_t colons;
+    int precision, flags;
+    char padding;
+    /* LOCALE_[OE] and COLONS are actually modifiers, not flags */
+    enum {LEFT, CHCASE, LOWER, UPPER, LOCALE_O, LOCALE_E, COLONS};
 #define BIT_OF(n) (1U<<(n))
 
-	/* various tables, useful in North America */
-	static const char days_l[][10] = {
-		"Sunday", "Monday", "Tuesday", "Wednesday",
-		"Thursday", "Friday", "Saturday",
-	};
-	static const char months_l[][10] = {
-		"January", "February", "March", "April",
-		"May", "June", "July", "August", "September",
-		"October", "November", "December",
-	};
-	static const char ampm[][3] = { "AM", "PM", };
-
-	if (s == NULL || format == NULL || tmx == NULL || maxsize == 0)
-		return 0;
-
-	/* quick check if we even need to bother */
-	if (strchr(format, '%') == NULL && strlen(format) + 1 >= maxsize) {
-	err:
-		errno = ERANGE;
-		return 0;
-	}
-
-	for (; *format && s < endp - 1; format++) {
-#define FLAG_FOUND() do { \
-			if (precision > 0 || flags & (BIT_OF(LOCALE_E)|BIT_OF(LOCALE_O))) \
-				goto unknown; \
-		} while (0)
+    /* various tables for locale C */
+    static const char days_l[][10] = {
+	"Sunday", "Monday", "Tuesday", "Wednesday",
+	"Thursday", "Friday", "Saturday",
+    };
+    static const char months_l[][10] = {
+	"January", "February", "March", "April",
+	"May", "June", "July", "August", "September",
+	"October", "November", "December",
+    };
+    static const char ampm[][3] = { "AM", "PM", };
+
+    if (s == NULL || format == NULL || tmx == NULL || maxsize == 0)
+	return 0;
+
+    /* quick check if we even need to bother */
+    if (strchr(format, '%') == NULL && strlen(format) + 1 >= maxsize) {
+      err:
+	errno = ERANGE;
+	return 0;
+    }
+
+    for (; *format && s < endp - 1; format++) {
+#define FLAG_FOUND() do {						\
+	    if (precision > 0 || flags & (BIT_OF(LOCALE_E) | BIT_OF(LOCALE_O) | BIT_OF(COLONS))) \
+		goto unknown;						\
+	} while (0)
 #define NEEDS(n) do if (s >= endp || (n) >= endp - s - 1) goto err; while (0)
-#define FILL_PADDING(i) do { \
-	if (!(flags & BIT_OF(LEFT)) && precision > (i)) { \
-		NEEDS(precision); \
-		memset(s, padding ? padding : ' ', precision - (i)); \
-		s += precision - (i); \
-	} \
-	else { \
-		NEEDS(i); \
-	} \
-} while (0);
-#define FMT(def_pad, def_prec, fmt, val) \
-		do { \
-			int l; \
-			if (precision <= 0) precision = (def_prec); \
-			if (flags & BIT_OF(LEFT)) precision = 1; \
-			l = snprintf(s, endp - s, \
-				     ((padding == '0' || (!padding && (def_pad) == '0')) ? "%0*"fmt : "%*"fmt), \
-				     precision, (val)); \
-			if (l < 0) goto err; \
-			s += l; \
-		} while (0)
-#define STRFTIME(fmt) \
-		do { \
-			i = date_strftime_with_tmx(s, endp - s, (fmt), tmx); \
-			if (!i) return 0; \
-			if (precision > i) {\
-				if (start + maxsize < s + precision) { \
-					errno = ERANGE; \
-					return 0; \
-				} \
-				memmove(s + precision - i, s, i);\
-				memset(s, padding ? padding : ' ', precision - i); \
-				s += precision;	\
-	                }\
-			else s += i; \
-		} while (0)
-#define FMTV(def_pad, def_prec, fmt, val) \
-                do { \
-                        VALUE tmp = (val); \
-                        if (FIXNUM_P(tmp)) { \
-                                FMT((def_pad), (def_prec), "l"fmt, FIX2LONG(tmp)); \
-                        } \
-                        else { \
-                                VALUE args[2], result; \
-                                size_t l; \
-                                if (precision <= 0) precision = (def_prec); \
-                                if (flags & BIT_OF(LEFT)) precision = 1; \
-                                args[0] = INT2FIX(precision); \
-                                args[1] = (val); \
-                                if (padding == '0' || (!padding && (def_pad) == '0')) \
-                                        result = rb_str_format(2, args, rb_str_new2("%0*"fmt)); \
-                                else \
-                                        result = rb_str_format(2, args, rb_str_new2("%*"fmt)); \
-                                l = strlcpy(s, StringValueCStr(result), endp-s); \
-                                if ((size_t)(endp-s) <= l) \
-                                        goto err; \
-                                s += l; \
-                        } \
-                } while (0)
-
-		if (*format != '%') {
-			*s++ = *format;
-			continue;
+#define FILL_PADDING(i) do {						\
+	    if (!(flags & BIT_OF(LEFT)) && precision > (i)) {		\
+		NEEDS(precision);					\
+		memset(s, padding ? padding : ' ', precision - (i));	\
+		s += precision - (i);					\
+	    }								\
+	    else {							\
+		NEEDS(i);						\
+	    }								\
+	} while (0);
+#define FMT(def_pad, def_prec, fmt, val)				\
+	do {								\
+	    int l;							\
+	    if (precision <= 0) precision = (def_prec);			\
+	    if (flags & BIT_OF(LEFT)) precision = 1;			\
+	    l = snprintf(s, endp - s,					\
+			 ((padding == '0' || (!padding && (def_pad) == '0')) ? \
+			  "%0*"fmt : "%*"fmt),				\
+			 precision, (val));				\
+	    if (l < 0) goto err;					\
+	    s += l;							\
+	} while (0)
+#define STRFTIME(fmt)							\
+	do {								\
+	    i = date_strftime_with_tmx(s, endp - s, (fmt), tmx);	\
+	    if (!i) return 0;						\
+	    if (flags & BIT_OF(UPPER))					\
+		upcase(s, i);						\
+	    if (!(flags & BIT_OF(LEFT)) && precision > i) {		\
+		if (start + maxsize < s + precision) {			\
+		    errno = ERANGE;					\
+		    return 0;						\
+		}							\
+		memmove(s + precision - i, s, i);			\
+		memset(s, padding ? padding : ' ', precision - i);	\
+		s += precision;						\
+	    }								\
+	    else s += i;						\
+	} while (0)
+#define FMTV(def_pad, def_prec, fmt, val)				\
+	do {								\
+	    VALUE tmp = (val);						\
+	    if (FIXNUM_P(tmp)) {					\
+		FMT((def_pad), (def_prec), "l"fmt, FIX2LONG(tmp));	\
+	    }								\
+	    else {							\
+		VALUE args[2], result;					\
+		size_t l;						\
+		if (precision <= 0) precision = (def_prec);		\
+		if (flags & BIT_OF(LEFT)) precision = 1;		\
+		args[0] = INT2FIX(precision);				\
+		args[1] = (val);					\
+		if (padding == '0' || (!padding && (def_pad) == '0'))	\
+		    result = rb_str_format(2, args, rb_str_new2("%0*"fmt)); \
+		else							\
+		    result = rb_str_format(2, args, rb_str_new2("%*"fmt)); \
+		l = strlcpy(s, StringValueCStr(result), endp - s);	\
+		if ((size_t)(endp - s) <= l)				\
+		    goto err;						\
+		s += l;							\
+	    }								\
+	} while (0)
+
+	if (*format != '%') {
+	    *s++ = *format;
+	    continue;
+	}
+	tp = tbuf;
+	sp = format;
+	precision = -1;
+	flags = 0;
+	padding = 0;
+	colons = 0;
+      again:
+	switch (*++format) {
+	  case '\0':
+	    format--;
+	    goto unknown;
+
+	  case 'A':	/* full weekday name */
+	  case 'a':	/* abbreviated weekday name */
+	    if (flags & BIT_OF(CHCASE)) {
+		flags &= ~(BIT_OF(LOWER) | BIT_OF(CHCASE));
+		flags |= BIT_OF(UPPER);
+	    }
+	    {
+		int wday = tmx_wday;
+		if (wday < 0 || wday > 6)
+		    i = 1, tp = "?";
+		else {
+		    if (*format == 'A')
+			i = strlen(tp = days_l[wday]);
+		    else
+			i = 3, tp = days_l[wday];
 		}
-		tp = tbuf;
-		sp = format;
-		precision = -1;
-		flags = 0;
-		padding = 0;
-                colons = 0;
-	again:
-		switch (*++format) {
-		case '\0':
-			format--;
-			goto unknown;
-
-		case '%':
-			FILL_PADDING(1);
-			*s++ = '%';
-			continue;
-
-		case 'a':	/* abbreviated weekday name */
-			if (flags & BIT_OF(CHCASE)) {
-				flags &= ~(BIT_OF(LOWER)|BIT_OF(CHCASE));
-				flags |= BIT_OF(UPPER);
-			}
-			{
-				int wday = tmx_wday;
-				if (wday < 0 || wday > 6)
-					i = 1, tp = "?";
-				else
-					i = 3, tp = days_l[wday];
-			}
-			break;
-
-		case 'A':	/* full weekday name */
-			if (flags & BIT_OF(CHCASE)) {
-				flags &= ~(BIT_OF(LOWER)|BIT_OF(CHCASE));
-				flags |= BIT_OF(UPPER);
-			}
-			{
-				int wday = tmx_wday;
-				if (wday < 0 || wday > 6)
-					i = 1, tp = "?";
-				else
-					i = strlen(tp = days_l[wday]);
-			}
-			break;
-
-#ifdef SYSV_EXT
-		case 'h':	/* abbreviated month name */
-#endif
-		case 'b':	/* abbreviated month name */
-			if (flags & BIT_OF(CHCASE)) {
-				flags &= ~(BIT_OF(LOWER)|BIT_OF(CHCASE));
-				flags |= BIT_OF(UPPER);
-			}
-			{
-				int mon = tmx_mon;
-				if (mon < 1 || mon > 12)
-					i = 1, tp = "?";
-				else
-					i = 3, tp = months_l[mon-1];
-			}
-			break;
-
-		case 'B':	/* full month name */
-			if (flags & BIT_OF(CHCASE)) {
-				flags &= ~(BIT_OF(LOWER)|BIT_OF(CHCASE));
-				flags |= BIT_OF(UPPER);
-			}
-			{
-				int mon = tmx_mon;
-				if (mon < 1 || mon > 12)
-					i = 1, tp = "?";
-				else
-					i = strlen(tp = months_l[mon-1]);
-			}
-			break;
-
-		case 'c':	/* appropriate date and time representation */
-			STRFTIME("%a %b %e %H:%M:%S %Y");
-			continue;
-
-		case 'd':	/* day of the month, 01 - 31 */
-			i = range(1, tmx_mday, 31);
-			FMT('0', 2, "d", (int)i);
-			continue;
-
-		case 'H':	/* hour, 24-hour clock, 00 - 23 */
-			i = range(0, tmx_hour, 23);
-			FMT('0', 2, "d", (int)i);
-			continue;
-
-		case 'I':	/* hour, 12-hour clock, 01 - 12 */
-			i = range(0, tmx_hour, 23);
-			if (i == 0)
-				i = 12;
-			else if (i > 12)
-				i -= 12;
-			FMT('0', 2, "d", (int)i);
-			continue;
-
-		case 'j':	/* day of the year, 001 - 366 */
-			FMT('0', 3, "d", tmx_yday);
-			continue;
-
-		case 'm':	/* month, 01 - 12 */
-			i = range(1, tmx_mon, 12);
-			FMT('0', 2, "d", (int)i);
-			continue;
-
-		case 'M':	/* minute, 00 - 59 */
-			i = range(0, tmx_min, 59);
-			FMT('0', 2, "d", (int)i);
-			continue;
-
-		case 'p':	/* AM or PM based on 12-hour clock */
-		case 'P':	/* am or pm based on 12-hour clock */
-			if ((*format == 'p' && (flags & BIT_OF(CHCASE))) ||
-			    (*format == 'P' && !(flags & (BIT_OF(CHCASE)|BIT_OF(UPPER))))) {
-				flags &= ~(BIT_OF(UPPER)|BIT_OF(CHCASE));
-				flags |= BIT_OF(LOWER);
-			}
-			i = range(0, tmx_hour, 23);
-			if (i < 12)
-				tp = ampm[0];
-			else
-				tp = ampm[1];
-			i = 2;
-			break;
-
-		case 's':
-			FMTV('0', 1, "d", tmx_secs);
-                        continue;
-
-		case 'Q':
-			FMTV('0', 1, "d", tmx_msecs);
-                        continue;
-
-		case 'S':	/* second, 00 - 59 */
-			i = range(0, tmx_sec, 59);
-			FMT('0', 2, "d", (int)i);
-			continue;
-
-		case 'U':	/* week of year, Sunday is first day of week */
-			FMT('0', 2, "d", tmx_wnum0);
-			continue;
-
-		case 'w':	/* weekday, Sunday == 0, 0 - 6 */
-			i = range(0, tmx_wday, 6);
-			FMT('0', 1, "d", (int)i);
-			continue;
-
-		case 'W':	/* week of year, Monday is first day of week */
-			FMT('0', 2, "d", tmx_wnum1);
-			continue;
-
-		case 'x':	/* appropriate date representation */
-			STRFTIME("%m/%d/%y");
-			continue;
-
-		case 'X':	/* appropriate time representation */
-			STRFTIME("%H:%M:%S");
-			continue;
-
-		case 'y':	/* year without a century, 00 - 99 */
-			i = NUM2INT(mod(tmx_year, INT2FIX(100)));
-			FMT('0', 2, "d", (int)i);
-			continue;
-
-		case 'Y':	/* year with century */
-			{
-				VALUE year = tmx_year;
-				if (FIXNUM_P(year)) {
-					long y = FIX2LONG(year);
-					FMT('0', 0 <= y ? 4 : 5, "ld", y);
-				}
-				else {
-					FMTV('0', 4, "d", year);
-				}
-			}
-			continue;
-
-#ifdef MAILHEADER_EXT
-		case 'z':	/* time zone offset east of GMT e.g. -0600 */
-			{
-				long aoff;
-				int hl, hw;
-
-				off = NUM2LONG(rb_funcall(tmx_offset, rb_intern("round"), 0));
-
-				aoff = off;
-				if (aoff < 0)
-					aoff = -off;
-
-				if ((aoff / 3600) < 10)
-					hl = 1;
-				else
-					hl = 2;
-				hw = 2;
-				if (flags & BIT_OF(LEFT) && hl == 1)
-					hw = 1;
-
-				switch (colons) {
-				case 0: /* %z -> +hhmm */
-					precision = precision <= (3 + hw) ? hw : precision-3;
-					NEEDS(precision + 3);
-					break;
-
-				case 1: /* %:z -> +hh:mm */
-					precision = precision <= (4 + hw) ? hw : precision-4;
-					NEEDS(precision + 4);
-					break;
-
-				case 2: /* %::z -> +hh:mm:ss */
-					precision = precision <= (7 + hw) ? hw : precision-7;
-					NEEDS(precision + 7);
-					break;
-
-				case 3: /* %:::z -> +hh[:mm[:ss]] */
-				{
-					if (aoff % 3600 == 0) {
-						precision = precision <= (1 + hw) ? hw : precision-1;
-						NEEDS(precision + 3);
-					}
-					else if (aoff % 60 == 0) {
-						precision = precision <= (4 + hw) ? hw : precision-4;
-						NEEDS(precision + 4);
-					}
-					else {
-						precision = precision <= (7 + hw) ? hw : precision-7;
-						NEEDS(precision + 7);
-					}
-				}
-				break;
-
-				default:
-					format--;
-					goto unknown;
-				}
-				if (padding == ' ' && precision > hl) {
-					i = snprintf(s, endp - s, "%*s", precision - hl, "");
-					precision = hl;
-					if (i < 0) goto err;
-					s += i;
-				}
-				if (off < 0) {
-					off = -off;
-					*s++ = '-';
-				} else {
-					*s++ = '+';
-				}
-				i = snprintf(s, endp - s, "%.*ld", precision, off / 3600);
-				if (i < 0) goto err;
-				s += i;
-				off = off % 3600;
-				if (colons == 3 && off == 0)
-					continue;
-				if (1 <= colons)
-					*s++ = ':';
-				i = snprintf(s, endp - s, "%02d", (int)(off / 60));
-				if (i < 0) goto err;
-				s += i;
-				off = off % 60;
-				if (colons == 3 && off == 0)
-					continue;
-				if (2 <= colons) {
-					*s++ = ':';
-					i = snprintf(s, endp - s, "%02d", (int)off);
-					if (i < 0) goto err;
-					s += i;
-				}
-			}
-			continue;
-#endif /* MAILHEADER_EXT */
-
-		case 'Z':	/* time zone name or abbreviation */
-			if (flags & BIT_OF(CHCASE)) {
-				flags &= ~(BIT_OF(UPPER)|BIT_OF(CHCASE));
-				flags |= BIT_OF(LOWER);
-			}
-			{
-				char *zone = tmx_zone;
-				if (zone == NULL)
-					tp = "";
-				else
-					tp = zone;
-				i = strlen(tp);
-			}
-			break;
-
-#ifdef SYSV_EXT
-		case 'n':	/* same as \n */
-			FILL_PADDING(1);
-			*s++ = '\n';
-			continue;
-
-		case 't':	/* same as \t */
-			FILL_PADDING(1);
-			*s++ = '\t';
-			continue;
-
-		case 'D':	/* date as %m/%d/%y */
-			STRFTIME("%m/%d/%y");
-			continue;
-
-		case 'e':	/* day of month, blank padded */
-			FMT(' ', 2, "d", range(1, tmx_mday, 31));
-			continue;
-
-		case 'r':	/* time as %I:%M:%S %p */
-			STRFTIME("%I:%M:%S %p");
-			continue;
-
-		case 'R':	/* time as %H:%M */
-			STRFTIME("%H:%M");
-			continue;
-
-		case 'T':	/* time as %H:%M:%S */
-			STRFTIME("%H:%M:%S");
-			continue;
-#endif
-
-#ifdef SUNOS_EXT
-		case 'k':	/* hour, 24-hour clock, blank pad */
-			i = range(0, tmx_hour, 23);
-			FMT(' ', 2, "d", (int)i);
-			continue;
-
-		case 'l':	/* hour, 12-hour clock, 1 - 12, blank pad */
-			i = range(0, tmx_hour, 23);
-			if (i == 0)
-				i = 12;
-			else if (i > 12)
-				i -= 12;
-			FMT(' ', 2, "d", (int)i);
-			continue;
-#endif
-
-#ifdef VMS_EXT
-		case 'v':	/* date as dd-bbb-YYYY */
-			STRFTIME("%e-%b-%Y");
-			continue;
-#endif
-
-#ifdef POSIX2_DATE
-		case 'C':
-                        FMTV('0', 2, "d", div(tmx_year, INT2FIX(100)));
-			continue;
-
-		case 'E':
-			/* POSIX locale extensions, ignored for now */
-			flags |= BIT_OF(LOCALE_E);
-			if (*(format + 1) && strchr("cCxXyY", *(format + 1)))
-				goto again;
-			goto unknown;
-		case 'O':
-			/* POSIX locale extensions, ignored for now */
-			flags |= BIT_OF(LOCALE_O);
-			if (*(format + 1) && strchr("deHImMSuUVwWy",
-						    *(format + 1)))
-				goto again;
-			goto unknown;
-		case 'V':	/* week of year according ISO 8601 */
-			FMT('0', 2, "d", tmx_cweek);
-			continue;
-
-		case 'u':
-		/* ISO 8601: Weekday as a decimal number [1 (Monday) - 7] */
-			FMT('0', 1, "d", tmx_cwday);
-			continue;
-#endif	/* POSIX2_DATE */
-
-#ifdef ISO_DATE_EXT
-		case 'g':	/* year of ISO week without a century */
-			i = NUM2INT(mod(tmx_cwyear, INT2FIX(100)));
-			FMT('0', 2, "d", (int)i);
-			continue;
-
-		case 'G':	/* year of ISO week with century */
-			{
-				VALUE year = tmx_cwyear;
-				if (FIXNUM_P(year)) {
-					long y = FIX2LONG(year);
-					FMT('0', 0 <= y ? 4 : 5, "ld", y);
-				}
-				else {
-					FMTV('0', 4, "d", year);
-				}
-                                continue;
+	    }
+	    break;
+
+	  case 'B':	/* full month name */
+	  case 'b':	/* abbreviated month name */
+	  case 'h':	/* same as %b */
+	    if (flags & BIT_OF(CHCASE)) {
+		flags &= ~(BIT_OF(LOWER) | BIT_OF(CHCASE));
+		flags |= BIT_OF(UPPER);
+	    }
+	    {
+		int mon = tmx_mon;
+		if (mon < 1 || mon > 12)
+		    i = 1, tp = "?";
+		else {
+		    if (*format == 'B')
+			i = strlen(tp = months_l[mon - 1]);
+		    else
+			i = 3, tp = months_l[mon - 1];
+		}
+	    }
+	    break;
+
+	  case 'C':	/* century (year/100) */
+	    FMTV('0', 2, "d", div(tmx_year, INT2FIX(100)));
+	    continue;
+
+	  case 'c':	/* appropriate date and time representation */
+	    STRFTIME("%a %b %e %H:%M:%S %Y");
+	    continue;
+
+	  case 'D':
+	    STRFTIME("%m/%d/%y");
+	    continue;
+
+	  case 'd':	/* day of the month, 01 - 31 */
+	  case 'e':	/* day of month, blank padded */
+	    v = range(1, tmx_mday, 31);
+	    FMT((*format == 'd') ? '0' : ' ', 2, "d", v);
+	    continue;
+
+	  case 'F':
+	    STRFTIME("%Y-%m-%d");
+	    continue;
+
+	  case 'G':	/* year of ISO week with century */
+	  case 'Y':	/* year with century */
+	    {
+		VALUE year = (*format == 'G') ? tmx_cwyear : tmx_year;
+		if (FIXNUM_P(year)) {
+		    long y = FIX2LONG(year);
+		    FMT('0', 0 <= y ? 4 : 5, "ld", y);
+		}
+		else {
+		    FMTV('0', 4, "d", year);
+		}
+	    }
+	    continue;
+
+	  case 'g':	/* year of ISO week without a century */
+	  case 'y':	/* year without a century */
+	    v = NUM2INT(mod((*format == 'g') ? tmx_cwyear : tmx_year, INT2FIX(100)));
+	    FMT('0', 2, "d", v);
+	    continue;
+
+	  case 'H':	/* hour, 24-hour clock, 00 - 23 */
+	  case 'k':	/* hour, 24-hour clock, blank pad */
+	    v = range(0, tmx_hour, 23);
+	    FMT((*format == 'H') ? '0' : ' ', 2, "d", v);
+	    continue;
+
+	  case 'I':	/* hour, 12-hour clock, 01 - 12 */
+	  case 'l':	/* hour, 12-hour clock, 1 - 12, blank pad */
+	    v = range(0, tmx_hour, 23);
+	    if (v == 0)
+		v = 12;
+	    else if (v > 12)
+		v -= 12;
+	    FMT((*format == 'I') ? '0' : ' ', 2, "d", v);
+	    continue;
+
+	  case 'j':	/* day of the year, 001 - 366 */
+	    v = range(1, tmx_yday, 366);
+	    FMT('0', 3, "d", v);
+	    continue;
+
+	  case 'L':	/* millisecond */
+	  case 'N':	/* nanosecond */
+	    if (*format == 'L')
+		w = 3;
+	    else
+		w = 9;
+	    if (precision <= 0)
+		precision = w;
+	    NEEDS(precision);
+
+	    {
+		VALUE subsec = tmx_sec_fraction;
+		int ww;
+		long n;
+
+		ww = precision;
+		while (9 <= ww) {
+		    subsec = mul(subsec, INT2FIX(1000000000));
+		    ww -= 9;
+		}
+		n = 1;
+		for (; 0 < ww; ww--)
+		    n *= 10;
+		if (n != 1)
+		    subsec = mul(subsec, INT2FIX(n));
+		subsec = div(subsec, INT2FIX(1));
+
+		if (FIXNUM_P(subsec)) {
+		    (void)snprintf(s, endp - s, "%0*ld",
+				   precision, FIX2LONG(subsec));
+		    s += precision;
+		}
+		else {
+		    VALUE args[2], result;
+		    args[0] = INT2FIX(precision);
+		    args[1] = subsec;
+		    result = rb_str_format(2, args, rb_str_new2("%0*d"));
+		    (void)strlcpy(s, StringValueCStr(result), endp - s);
+		    s += precision;
+		}
+	    }
+	    continue;
+
+	  case 'M':	/* minute, 00 - 59 */
+	    v = range(0, tmx_min, 59);
+	    FMT('0', 2, "d", v);
+	    continue;
+
+	  case 'm':	/* month, 01 - 12 */
+	    v = range(1, tmx_mon, 12);
+	    FMT('0', 2, "d", v);
+	    continue;
+
+	  case 'n':	/* same as \n */
+	    FILL_PADDING(1);
+	    *s++ = '\n';
+	    continue;
+
+	  case 't':	/* same as \t */
+	    FILL_PADDING(1);
+	    *s++ = '\t';
+	    continue;
+
+	  case 'P':	/* am or pm based on 12-hour clock */
+	  case 'p':	/* AM or PM based on 12-hour clock */
+	    if ((*format == 'p' && (flags & BIT_OF(CHCASE))) ||
+		(*format == 'P' && !(flags & (BIT_OF(CHCASE) | BIT_OF(UPPER))))) {
+		flags &= ~(BIT_OF(UPPER) | BIT_OF(CHCASE));
+		flags |= BIT_OF(LOWER);
+	    }
+	    v = range(0, tmx_hour, 23);
+	    if (v < 12)
+		tp = ampm[0];
+	    else
+		tp = ampm[1];
+	    i = 2;
+	    break;
+
+	  case 'Q':	/* milliseconds since Unix epoch */
+	    FMTV('0', 1, "d", tmx_msecs);
+	    continue;
+
+	  case 'R':
+	    STRFTIME("%H:%M");
+	    continue;
+
+	  case 'r':
+	    STRFTIME("%I:%M:%S %p");
+	    continue;
+
+	  case 'S':	/* second, 00 - 59 */
+	    v = range(0, tmx_sec, 59);
+	    FMT('0', 2, "d", v);
+	    continue;
+
+	  case 's':	/* seconds since Unix epoch */
+	    FMTV('0', 1, "d", tmx_secs);
+	    continue;
+
+	  case 'T':
+	    STRFTIME("%H:%M:%S");
+	    continue;
+
+	  case 'U':	/* week of year, Sunday is first day of week */
+	  case 'W':	/* week of year, Monday is first day of week */
+	    v = range(0, (*format == 'U') ? tmx_wnum0 : tmx_wnum1, 53);
+	    FMT('0', 2, "d", v);
+	    continue;
+
+	  case 'u':	/* weekday, Monday == 1, 1 - 7 */
+	    v = range(1, tmx_cwday, 7);
+	    FMT('0', 1, "d", v);
+	    continue;
+
+	  case 'V':	/* week of year according ISO 8601 */
+	    v = range(1, tmx_cweek, 53);
+	    FMT('0', 2, "d", v);
+	    continue;
+
+	  case 'v':
+	    STRFTIME("%e-%b-%Y");
+	    continue;
+
+	  case 'w':	/* weekday, Sunday == 0, 0 - 6 */
+	    v = range(0, tmx_wday, 6);
+	    FMT('0', 1, "d", v);
+	    continue;
+
+	  case 'X':	/* appropriate time representation */
+	    STRFTIME("%H:%M:%S");
+	    continue;
+
+	  case 'x':	/* appropriate date representation */
+	    STRFTIME("%m/%d/%y");
+	    continue;
+
+	  case 'Z':	/* time zone name or abbreviation */
+	    if (flags & BIT_OF(CHCASE)) {
+		flags &= ~(BIT_OF(UPPER) | BIT_OF(CHCASE));
+		flags |= BIT_OF(LOWER);
+	    }
+	    {
+		char *zone = tmx_zone;
+		if (zone == NULL)
+		    tp = "";
+		else
+		    tp = zone;
+		i = strlen(tp);
+	    }
+	    break;
+
+	  case 'z':	/* offset from UTC */
+	    {
+		long off, aoff;
+		int hl, hw;
+
+		off = tmx_offset;
+		aoff = off;
+		if (aoff < 0)
+		    aoff = -off;
+
+		if ((aoff / 3600) < 10)
+		    hl = 1;
+		else
+		    hl = 2;
+		hw = 2;
+		if (flags & BIT_OF(LEFT) && hl == 1)
+		    hw = 1;
+
+		switch (colons) {
+		  case 0: /* %z -> +hhmm */
+		    precision = precision <= (3 + hw) ? hw : precision - 3;
+		    NEEDS(precision + 3);
+		    break;
+
+		  case 1: /* %:z -> +hh:mm */
+		    precision = precision <= (4 + hw) ? hw : precision - 4;
+		    NEEDS(precision + 4);
+		    break;
+
+		  case 2: /* %::z -> +hh:mm:ss */
+		    precision = precision <= (7 + hw) ? hw : precision - 7;
+		    NEEDS(precision + 7);
+		    break;
+
+		  case 3: /* %:::z -> +hh[:mm[:ss]] */
+		    {
+			if (aoff % 3600 == 0) {
+			    precision = precision <= (1 + hw) ?
+				hw : precision - 1;
+			    NEEDS(precision + 3);
 			}
-
-#endif /* ISO_DATE_EXT */
-
-		case 'L':
-			w = 3;
-			goto subsec;
-
-		case 'N':
-			/*
-			 * fractional second digits. default is 9 digits
-			 * (nanosecond).
-			 *
-			 * %3N  millisecond (3 digits)
-			 * %6N  microsecond (6 digits)
-			 * %9N  nanosecond (9 digits)
-			 */
-			w = 9;
-		subsec:
-                        if (precision <= 0) {
-                            precision = w;
-                        }
-                        NEEDS(precision);
-
-			{
-                                VALUE subsec = tmx_sec_fraction;
-                                int ww;
-                                long n;
-
-                                ww = precision;
-                                while (9 <= ww) {
-                                        subsec = mul(subsec, INT2FIX(1000000000));
-                                        ww -= 9;
-                                }
-                                n = 1;
-                                for (; 0 < ww; ww--)
-                                        n *= 10;
-                                if (n != 1)
-                                        subsec = mul(subsec, INT2FIX(n));
-                                subsec = div(subsec, INT2FIX(1));
-
-                                if (FIXNUM_P(subsec)) {
-                                        (void)snprintf(s, endp - s, "%0*ld", precision, FIX2LONG(subsec));
-                                        s += precision;
-                                }
-                                else {
-                                        VALUE args[2], result;
-                                        args[0] = INT2FIX(precision);
-                                        args[1] = subsec;
-                                        result = rb_str_format(2, args, rb_str_new2("%0*d"));
-                                        (void)strlcpy(s, StringValueCStr(result), endp-s);
-                                        s += precision;
-                                }
+			else if (aoff % 60 == 0) {
+			    precision = precision <= (4 + hw) ?
+				hw : precision - 4;
+			    NEEDS(precision + 4);
 			}
-			continue;
-
-		case 'F':	/*  Equivalent to %Y-%m-%d */
-			STRFTIME("%Y-%m-%d");
-			continue;
-		case '+':
-			STRFTIME("%a %b %e %H:%M:%S %Z %Y");
-			continue;
-
-		case '-':
-			FLAG_FOUND();
-			flags |= BIT_OF(LEFT);
-			padding = precision = 0;
-			goto again;
-
-		case '^':
-			FLAG_FOUND();
-			flags |= BIT_OF(UPPER);
-			goto again;
-
-		case '#':
-			FLAG_FOUND();
-			flags |= BIT_OF(CHCASE);
-			goto again;
-
-		case '_':
-			FLAG_FOUND();
-			padding = ' ';
-			goto again;
-
-		case ':':
-                        colons++;
-			goto again;
-
-		case '0':
-			padding = '0';
-		case '1':  case '2': case '3': case '4':
-		case '5': case '6':  case '7': case '8': case '9':
-			{
-				char *e;
-				precision = (int)strtoul(format, &e, 10);
-				format = e - 1;
-				goto again;
+			else {
+			    precision = precision <= (7 + hw) ?
+				hw : precision - 7;
+			    NEEDS(precision + 7);
 			}
+		    }
+		    break;
 
-		default:
-		unknown:
-			i = format - sp + 1;
-			tp = sp;
-			precision = -1;
-			flags = 0;
-			padding = 0;
-                        colons = 0;
-			break;
+		  default:
+		    format--;
+		    goto unknown;
 		}
-		if (i) {
-			FILL_PADDING(i);
-			memcpy(s, tp, i);
-			switch (flags & (BIT_OF(UPPER)|BIT_OF(LOWER))) {
-			case BIT_OF(UPPER):
-				do {
-					if (ISLOWER(*s)) *s = TOUPPER(*s);
-				} while (s++, --i);
-				break;
-			case BIT_OF(LOWER):
-				do {
-					if (ISUPPER(*s)) *s = TOLOWER(*s);
-				} while (s++, --i);
-				break;
-			default:
-				s += i;
-				break;
-			}
+		if (padding == ' ' && precision > hl) {
+		    i = snprintf(s, endp - s, "%*s", precision - hl, "");
+		    precision = hl;
+		    if (i < 0) goto err;
+		    s += i;
+		}
+		if (off < 0) {
+		    off = -off;
+		    *s++ = '-';
+		} else {
+		    *s++ = '+';
+		}
+		i = snprintf(s, endp - s, "%.*ld", precision, off / 3600);
+		if (i < 0) goto err;
+		s += i;
+		off = off % 3600;
+		if (colons == 3 && off == 0)
+		    continue;
+		if (1 <= colons)
+		    *s++ = ':';
+		i = snprintf(s, endp - s, "%02d", (int)(off / 60));
+		if (i < 0) goto err;
+		s += i;
+		off = off % 60;
+		if (colons == 3 && off == 0)
+		    continue;
+		if (2 <= colons) {
+		    *s++ = ':';
+		    i = snprintf(s, endp - s, "%02d", (int)off);
+		    if (i < 0) goto err;
+		    s += i;
+		}
+	    }
+	    continue;
+
+	  case '+':
+	    STRFTIME("%a %b %e %H:%M:%S %Z %Y");
+	    continue;
+
+	  case 'E':
+	    /* POSIX locale extensions, ignored for now */
+	    flags |= BIT_OF(LOCALE_E);
+	    if (*(format + 1) && strchr("cCxXyY", *(format + 1)))
+		goto again;
+	    goto unknown;
+	  case 'O':
+	    /* POSIX locale extensions, ignored for now */
+	    flags |= BIT_OF(LOCALE_O);
+	    if (*(format + 1) && strchr("deHkIlmMSuUVwWy", *(format + 1)))
+		goto again;
+	    goto unknown;
+
+	  case ':':
+	    flags |= BIT_OF(COLONS);
+	    {
+		size_t l = strspn(format, ":");
+		format += l;
+		if (*format == 'z') {
+		    colons = l;
+		    format--;
+		    goto again;
+		}
+		format -= l;
+	    }
+	    goto unknown;
+
+	  case '_':
+	    FLAG_FOUND();
+	    padding = ' ';
+	    goto again;
+
+	  case '-':
+	    FLAG_FOUND();
+	    flags |= BIT_OF(LEFT);
+	    goto again;
+
+	  case '^':
+	    FLAG_FOUND();
+	    flags |= BIT_OF(UPPER);
+	    goto again;
+
+	  case '#':
+	    FLAG_FOUND();
+	    flags |= BIT_OF(CHCASE);
+	    goto again;
+
+	  case '0':
+	    FLAG_FOUND();
+	    padding = '0';
+	  case '1':  case '2': case '3': case '4':
+	  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;
+		format = e - 1;
+		goto again;
+	    }
+
+	  case '%':
+	    FILL_PADDING(1);
+	    *s++ = '%';
+	    continue;
+
+	  default:
+	  unknown:
+	    i = format - sp + 1;
+	    tp = sp;
+	    precision = -1;
+	    flags = 0;
+	    padding = 0;
+	    colons = 0;
+	    break;
 	}
-	if (s >= endp) {
-		goto err;
+	if (i) {
+	    FILL_PADDING(i);
+	    memcpy(s, tp, i);
+	    switch (flags & (BIT_OF(UPPER) | BIT_OF(LOWER))) {
+	      case BIT_OF(UPPER):
+		upcase(s, i);
+		break;
+	      case BIT_OF(LOWER):
+		downcase(s, i);
+		break;
+	    }
+	    s += i;
 	}
-	if (*format == '\0') {
-		*s = '\0';
-		return (s - start);
-	} else
-		return 0;
+    }
+    if (s >= endp) {
+	goto err;
+    }
+    if (*format == '\0') {
+	*s = '\0';
+	return (s - start);
+    }
+    return 0;
 }
 
 size_t
 date_strftime(char *s, size_t maxsize, const char *format,
 	      const struct tmx *tmx)
 {
-	return date_strftime_with_tmx(s, maxsize, format, tmx);
-}
-
-#if 0
-/* isleap --- is a year a leap year? */
-
-#ifndef __STDC__
-static int
-isleap(year)
-long year;
-#else
-static int
-isleap(long year)
-#endif
-{
-	return ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0);
-}
-
-static void
-tmx2tm_noyear(const struct tmx *tmx, struct tm *result)
-{
-    struct tm tm;
-
-    /* for isleap() in iso8601wknum.  +100 is -1900 (mod 400). */
-    tm.tm_year = FIX2INT(mod(tmx_year, INT2FIX(400))) + 100;
-
-    tm.tm_mon = tmx_mon-1;
-    tm.tm_mday = tmx_mday;
-    tm.tm_hour = tmx_hour;
-    tm.tm_min = tmx_min;
-    tm.tm_sec = tmx_sec;
-    tm.tm_wday = tmx_wday;
-    tm.tm_yday = tmx_yday-1;
-    tm.tm_isdst = 0;
-#if defined(HAVE_STRUCT_TM_TM_GMTOFF)
-    tm.tm_gmtoff = NUM2LONG(tmx_offset);
-#endif
-#if defined(HAVE_TM_ZONE)
-    tm.tm_zone = (char *)tmx_zone;
-#endif
-    *result = tm;
-}
-
-#ifdef POSIX2_DATE
-/* iso8601wknum --- compute week number according to ISO 8601 */
-
-#ifndef __STDC__
-static int
-iso8601wknum(timeptr)
-const struct tm *timeptr;
-#else
-static int
-iso8601wknum(const struct tm *timeptr)
-#endif
-{
-	/*
-	 * From 1003.2:
-	 *	If the week (Monday to Sunday) containing January 1
-	 *	has four or more days in the new year, then it is week 1;
-	 *	otherwise it is the highest numbered week of the previous
-	 *	year (52 or 53), and the next week is week 1.
-	 *
-	 * ADR: This means if Jan 1 was Monday through Thursday,
-	 *	it was week 1, otherwise week 52 or 53.
-	 *
-	 * XPG4 erroneously included POSIX.2 rationale text in the
-	 * main body of the standard. Thus it requires week 53.
-	 */
-
-	int weeknum, jan1day;
-
-	/* get week number, Monday as first day of the week */
-	weeknum = weeknumber(timeptr, 1);
-
-	/*
-	 * With thanks and tip of the hatlo to tml@tik.vtt.fi
-	 *
-	 * What day of the week does January 1 fall on?
-	 * We know that
-	 *	(timeptr->tm_yday - jan1.tm_yday) MOD 7 ==
-	 *		(timeptr->tm_wday - jan1.tm_wday) MOD 7
-	 * and that
-	 * 	jan1.tm_yday == 0
-	 * and that
-	 * 	timeptr->tm_wday MOD 7 == timeptr->tm_wday
-	 * from which it follows that. . .
-	 */
-	jan1day = timeptr->tm_wday - (timeptr->tm_yday % 7);
-	if (jan1day < 0)
-		jan1day += 7;
-
-	/*
-	 * If Jan 1 was a Monday through Thursday, it was in
-	 * week 1.  Otherwise it was last year's highest week, which is
-	 * this year's week 0.
-	 *
-	 * What does that mean?
-	 * If Jan 1 was Monday, the week number is exactly right, it can
-	 *	never be 0.
-	 * If it was Tuesday through Thursday, the weeknumber is one
-	 *	less than it should be, so we add one.
-	 * Otherwise, Friday, Saturday or Sunday, the week number is
-	 * OK, but if it is 0, it needs to be 52 or 53.
-	 */
-	switch (jan1day) {
-	case 1:		/* Monday */
-		break;
-	case 2:		/* Tuesday */
-	case 3:		/* Wednesday */
-	case 4:		/* Thursday */
-		weeknum++;
-		break;
-	case 5:		/* Friday */
-	case 6:		/* Saturday */
-	case 0:		/* Sunday */
-		if (weeknum == 0) {
-#ifdef USE_BROKEN_XPG4
-			/* XPG4 (as of March 1994) says 53 unconditionally */
-			weeknum = 53;
-#else
-			/* get week number of last week of last year */
-			struct tm dec31ly;	/* 12/31 last year */
-			dec31ly = *timeptr;
-			dec31ly.tm_year--;
-			dec31ly.tm_mon = 11;
-			dec31ly.tm_mday = 31;
-			dec31ly.tm_wday = (jan1day == 0) ? 6 : jan1day - 1;
-			dec31ly.tm_yday = 364 + isleap(dec31ly.tm_year + 1900L);
-			weeknum = iso8601wknum(& dec31ly);
-#endif
-		}
-		break;
-	}
-
-	if (timeptr->tm_mon == 11) {
-		/*
-		 * The last week of the year
-		 * can be in week 1 of next year.
-		 * Sigh.
-		 *
-		 * This can only happen if
-		 *	M   T  W
-		 *	29  30 31
-		 *	30  31
-		 *	31
-		 */
-		int wday, mday;
-
-		wday = timeptr->tm_wday;
-		mday = timeptr->tm_mday;
-		if (   (wday == 1 && (mday >= 29 && mday <= 31))
-		    || (wday == 2 && (mday == 30 || mday == 31))
-		    || (wday == 3 &&  mday == 31))
-			weeknum = 1;
-	}
-
-	return weeknum;
-}
-
-static int
-iso8601wknum_v(const struct tmx *tmx)
-{
-        struct tm tm;
-        tmx2tm_noyear(tmx, &tm);
-        return iso8601wknum(&tm);
-}
-
-#endif
-
-/* weeknumber --- figure how many weeks into the year */
-
-/* With thanks and tip of the hatlo to ado@elsie.nci.nih.gov */
-
-#ifndef __STDC__
-static int
-weeknumber(timeptr, firstweekday)
-const struct tm *timeptr;
-int firstweekday;
-#else
-static int
-weeknumber(const struct tm *timeptr, int firstweekday)
-#endif
-{
-	int wday = timeptr->tm_wday;
-	int ret;
-
-	if (firstweekday == 1) {
-		if (wday == 0)	/* sunday */
-			wday = 6;
-		else
-			wday--;
-	}
-	ret = ((timeptr->tm_yday + 7 - wday) / 7);
-	if (ret < 0)
-		ret = 0;
-	return ret;
-}
-
-static int
-weeknumber_v(const struct tmx *tmx, int firstweekday)
-{
-        struct tm tm;
-        tmx2tm_noyear(tmx, &tm);
-        return weeknumber(&tm, firstweekday);
-}
-#endif
-
-#if 0
-/* ADR --- I'm loathe to mess with ado's code ... */
-
-Date:         Wed, 24 Apr 91 20:54:08 MDT
-From: Michal Jaegermann <audfax!emory!vm.ucs.UAlberta.CA!NTOMCZAK>
-To: arnold@audiofax.com
-
-Hi Arnold,
-in a process of fixing of strftime() in libraries on Atari ST I grabbed
-some pieces of code from your own strftime.  When doing that it came
-to mind that your weeknumber() function compiles a little bit nicer
-in the following form:
-/*
- * firstweekday is 0 if starting in Sunday, non-zero if in Monday
- */
-{
-    return (timeptr->tm_yday - timeptr->tm_wday +
-	    (firstweekday ? (timeptr->tm_wday ? 8 : 1) : 7)) / 7;
+    return date_strftime_with_tmx(s, maxsize, format, tmx);
 }
-How nicer it depends on a compiler, of course, but always a tiny bit.
-
-   Cheers,
-   Michal
-   ntomczak@vm.ucs.ualberta.ca
-#endif
-
-#ifdef	TEST_STRFTIME
 
 /*
- * NAME:
- *	tst
- *
- * SYNOPSIS:
- *	tst
- *
- * DESCRIPTION:
- *	"tst" is a test driver for the function "strftime".
- *
- * OPTIONS:
- *	None.
- *
- * AUTHOR:
- *	Karl Vogel
- *	Control Data Systems, Inc.
- *	vogelke@c-17igp.wpafb.af.mil
- *
- * BUGS:
- *	None noticed yet.
- *
- * COMPILE:
- *	cc -o tst -DTEST_STRFTIME strftime.c
- */
-
-/* ADR: I reformatted this to my liking, and deleted some unneeded code. */
-
-#ifndef NULL
-#include	<stdio.h>
-#endif
-#include	<time.h>
-#include	<sys/time.h>
-#include	<string.h>
-
-#define		MAXTIME		132
-
-/*
- * Array of time formats.
- */
-
-static char *array[] =
-{
-	"(%%A)      full weekday name, var length (Sunday..Saturday)  %A",
-	"(%%B)       full month name, var length (January..December)  %B",
-	"(%%C)                                               Century  %C",
-	"(%%D)                                       date (%%m/%%d/%%y)  %D",
-	"(%%E)                           Locale extensions (ignored)  %E",
-	"(%%H)                          hour (24-hour clock, 00..23)  %H",
-	"(%%I)                          hour (12-hour clock, 01..12)  %I",
-	"(%%M)                                       minute (00..59)  %M",
-	"(%%O)                           Locale extensions (ignored)  %O",
-	"(%%R)                                 time, 24-hour (%%H:%%M)  %R",
-	"(%%S)                                       second (00..60)  %S",
-	"(%%T)                              time, 24-hour (%%H:%%M:%%S)  %T",
-	"(%%U)    week of year, Sunday as first day of week (00..53)  %U",
-	"(%%V)                    week of year according to ISO 8601  %V",
-	"(%%W)    week of year, Monday as first day of week (00..53)  %W",
-	"(%%X)     appropriate locale time representation (%H:%M:%S)  %X",
-	"(%%Y)                           year with century (1970...)  %Y",
-	"(%%Z) timezone (EDT), or blank if timezone not determinable  %Z",
-	"(%%a)          locale's abbreviated weekday name (Sun..Sat)  %a",
-	"(%%b)            locale's abbreviated month name (Jan..Dec)  %b",
-	"(%%c)           full date (Sat Nov  4 12:02:33 1989)%n%t%t%t  %c",
-	"(%%d)                             day of the month (01..31)  %d",
-	"(%%e)               day of the month, blank-padded ( 1..31)  %e",
-	"(%%h)                                should be same as (%%b)  %h",
-	"(%%j)                            day of the year (001..366)  %j",
-	"(%%k)               hour, 24-hour clock, blank pad ( 0..23)  %k",
-	"(%%l)               hour, 12-hour clock, blank pad ( 1..12)  %l",
-	"(%%m)                                        month (01..12)  %m",
-	"(%%p)              locale's AM or PM based on 12-hour clock  %p",
-	"(%%r)                   time, 12-hour (same as %%I:%%M:%%S %%p)  %r",
-	"(%%u) ISO 8601: Weekday as decimal number [1 (Monday) - 7]   %u",
-	"(%%v)                                VMS date (dd-bbb-YYYY)  %v",
-	"(%%w)                       day of week (0..6, Sunday == 0)  %w",
-	"(%%x)                appropriate locale date representation  %x",
-	"(%%y)                      last two digits of year (00..99)  %y",
-	"(%%z)      timezone offset east of GMT as HHMM (e.g. -0500)  %z",
-	(char *) NULL
-};
-
-/* main routine. */
-
-int
-main(argc, argv)
-int argc;
-char **argv;
-{
-	char *next;
-	char string[MAXTIME];
-
-	int k;
-	int length;
-
-	struct tm *tm;
-
-	time_t clock;
-
-	/* Call the function. */
-
-	clock = time(NULL);
-	tm = localtime(&clock);
-
-	for (k = 0; next = array[k]; k++) {
-		length = strftime(string, MAXTIME, next, tm);
-		printf("%s\n", string);
-	}
-
-	exit(0);
-}
-#endif	/* TEST_STRFTIME */
+Local variables:
+c-file-style: "ruby"
+End:
+*/
diff --git a/ext/date/date_strptime.c b/ext/date/date_strptime.c
index 80b9e03278..26d9fd11bf 100644
--- a/ext/date/date_strptime.c
+++ b/ext/date/date_strptime.c
@@ -1,5 +1,5 @@
 /*
-  date_strptime.c: Coded by Tadayoshi Funaba 2011
+  date_strptime.c: Coded by Tadayoshi Funaba 2011,2012
 */
 
 #include "ruby.h"
@@ -58,14 +58,15 @@ static const char *extz_pats[] = {
 static int
 num_pattern_p(const char *s)
 {
-    if (isdigit(*s))
+    if (isdigit((unsigned char)*s))
 	return 1;
     if (*s == '%') {
 	s++;
 	if (*s == 'E' || *s == 'O')
 	    s++;
 	if (*s &&
-	    (strchr("CDdeFGgHIjkLlMmNQRrSsTUuVvWwXxYy", *s) || isdigit(*s)))
+	    (strchr("CDdeFGgHIjkLlMmNQRrSsTUuVvWwXxYy", *s) ||
+	     isdigit((unsigned char)*s)))
 	    return 1;
     }
     return 0;
@@ -78,14 +79,17 @@ read_digits(const char *s, VALUE *n, size_t width)
 {
     size_t l;
 
-    l = strspn(s, "0123456789");
+    if (!width)
+        return 0;
+
+    l = 0;
+    while (ISDIGIT(s[l])) {
+        if (++l == width) break;
+    }
 
     if (l == 0)
 	return 0;
 
-    if (width < l)
-	l = width;
-
     if ((4 * l * sizeof(char)) <= (sizeof(long)*CHAR_BIT)) {
 	const char *os = s;
 	long v;
@@ -102,34 +106,36 @@ read_digits(const char *s, VALUE *n, size_t width)
 	return l;
     }
     else {
-	char *s2 = ALLOCA_N(char, l + 1);
+	VALUE vbuf = 0;
+	char *s2 = ALLOCV_N(char, vbuf, l + 1);
 	memcpy(s2, s, l);
 	s2[l] = '\0';
 	*n = rb_cstr_to_inum(s2, 10, 0);
+	ALLOCV_END(vbuf);
 	return l;
     }
 }
 
-#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k)), v)
-#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k)))
-#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k)))
+#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k"")), v)
+#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k"")))
+#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k"")))
 
 #define fail() \
-{ \
+do { \
     set_hash("_fail", Qtrue); \
     return 0; \
-}
+} while (0)
 
 #define fail_p() (!NIL_P(ref_hash("_fail")))
 
 #define READ_DIGITS(n,w) \
-{ \
+do { \
     size_t l; \
     l = read_digits(&str[si], &n, w); \
     if (l == 0) \
 	fail();	\
     si += l; \
-}
+} while (0)
 
 #define READ_DIGITS_MAX(n) READ_DIGITS(n, LONG_MAX)
 
@@ -144,14 +150,14 @@ valid_range_p(VALUE v, int a, int b)
 }
 
 #define recur(fmt) \
-{ \
+do { \
     size_t l; \
     l = date__strptime_internal(&str[si], slen - si, \
 				fmt, sizeof fmt - 1, hash); \
     if (fail_p()) \
 	return 0; \
     si += l; \
-}
+} while (0)
 
 VALUE date_zone_to_diff(VALUE);
 
@@ -234,9 +240,9 @@ date__strptime_internal(const char *str, size_t slen,
 		    VALUE n;
 
 		    if (NUM_PATTERN_P())
-			READ_DIGITS(n, 2)
+			READ_DIGITS(n, 2);
 		    else
-			READ_DIGITS_MAX(n)
+			READ_DIGITS_MAX(n);
 		    set_hash("_cent", n);
 		    goto matched;
 		}
@@ -275,9 +281,9 @@ date__strptime_internal(const char *str, size_t slen,
 		    VALUE n;
 
 		    if (NUM_PATTERN_P())
-			READ_DIGITS(n, 4)
+			READ_DIGITS(n, 4);
 		    else
-			READ_DIGITS_MAX(n)
+			READ_DIGITS_MAX(n);
 		    set_hash("cwyear", n);
 		    goto matched;
 		}
@@ -290,8 +296,9 @@ date__strptime_internal(const char *str, size_t slen,
 		    if (!valid_range_p(n, 0, 99))
 			fail();
 		    set_hash("cwyear",n);
-		    set_hash("_cent",
-			     INT2FIX(f_ge_p(n, INT2FIX(69)) ? 19 : 20));
+		    if (NIL_P(ref_hash("_cent")))
+			set_hash("_cent",
+				 INT2FIX(f_ge_p(n, INT2FIX(69)) ? 19 : 20));
 		    goto matched;
 		}
 
@@ -354,9 +361,9 @@ date__strptime_internal(const char *str, size_t slen,
 		    }
 		    osi = si;
 		    if (NUM_PATTERN_P())
-			READ_DIGITS(n, c == 'L' ? 3 : 9)
+			READ_DIGITS(n, c == 'L' ? 3 : 9);
 		    else
-			READ_DIGITS_MAX(n)
+			READ_DIGITS_MAX(n);
 		    if (sign == -1)
 			n = f_negate(n);
 		    set_hash("sec_fraction",
@@ -422,9 +429,7 @@ date__strptime_internal(const char *str, size_t slen,
 		    if (sign == -1)
 			n = f_negate(n);
 		    set_hash("seconds",
-			     rb_rational_new2(n,
-					      f_expt(INT2FIX(10),
-						     INT2FIX(3))));
+			     rb_rational_new2(n, INT2FIX(1000)));
 		    goto matched;
 		}
 
@@ -525,24 +530,24 @@ date__strptime_internal(const char *str, size_t slen,
 		goto matched;
 
 	      case 'Y':
-		  {
-		      VALUE n;
-		      int sign = 1;
-
-		      if (issign(str[si])) {
-			  if (str[si] == '-')
-			      sign = -1;
-			  si++;
-		      }
-		      if (NUM_PATTERN_P())
-			  READ_DIGITS(n, 4)
-		      else
-			  READ_DIGITS_MAX(n)
+		{
+		    VALUE n;
+		    int sign = 1;
+
+		    if (issign(str[si])) {
+			if (str[si] == '-')
+			    sign = -1;
+			si++;
+		    }
+		    if (NUM_PATTERN_P())
+			READ_DIGITS(n, 4);
+		    else
+			READ_DIGITS_MAX(n);
 		    if (sign == -1)
 			n = f_negate(n);
-		      set_hash("year", n);
-		      goto matched;
-		  }
+		    set_hash("year", n);
+		    goto matched;
+		}
 
 	      case 'y':
 		{
@@ -555,8 +560,9 @@ date__strptime_internal(const char *str, size_t slen,
 		    if (sign == -1)
 			n = f_negate(n);
 		    set_hash("year", n);
-		    set_hash("_cent",
-			     INT2FIX(f_ge_p(n, INT2FIX(69)) ? 19 : 20));
+		    if (NIL_P(ref_hash("_cent")))
+			set_hash("_cent",
+				 INT2FIX(f_ge_p(n, INT2FIX(69)) ? 19 : 20));
 		    goto matched;
 		}
 
@@ -566,8 +572,8 @@ date__strptime_internal(const char *str, size_t slen,
 		    static const char pat_source[] =
 			"\\A("
 			"(?:gmt|utc?)?[-+]\\d+(?:[,.:]\\d+(?::\\d+)?)?"
-			"|[[:alpha:].\\s]+(?:standard|daylight)\\s+time\\b"
-			"|[[:alpha:]]+(?:\\s+dst)?\\b"
+			"|(?-i:[[:alpha:].\\s]+)(?:standard|daylight)\\s+time\\b"
+			"|(?-i:[[:alpha:]]+)(?:\\s+dst)?\\b"
 			")";
 		    static VALUE pat = Qnil;
 		    VALUE m, b;
@@ -624,7 +630,7 @@ date__strptime_internal(const char *str, size_t slen,
 	  case '\v':
 	  case '\f':
 	  case '\r':
-	    while (isspace(str[si]))
+	    while (isspace((unsigned char)str[si]))
 		si++;
 	    fi++;
 	    break;
@@ -641,15 +647,6 @@ date__strptime_internal(const char *str, size_t slen,
 	}
     }
 
-    {
-	VALUE s;
-
-	if (slen > si) {
-	    s = rb_usascii_str_new(&str[si], slen - si);
-	    set_hash("leftover", s);
-	}
-    }
-
     return si;
 }
 
@@ -657,14 +654,22 @@ VALUE
 date__strptime(const char *str, size_t slen,
 	       const char *fmt, size_t flen, VALUE hash)
 {
+    size_t si;
     VALUE cent, merid;
 
-    date__strptime_internal(str, slen, fmt, flen, hash);
+    si = date__strptime_internal(str, slen, fmt, flen, hash);
+
+    if (slen > si) {
+	VALUE s;
+
+	s = rb_usascii_str_new(&str[si], slen - si);
+	set_hash("leftover", s);
+    }
 
     if (fail_p())
 	return Qnil;
 
-    cent = ref_hash("_cent");
+    cent = del_hash("_cent");
     if (!NIL_P(cent)) {
 	VALUE year;
 
@@ -674,10 +679,9 @@ date__strptime(const char *str, size_t slen,
 	year = ref_hash("year");
 	if (!NIL_P(year))
 	    set_hash("year", f_add(year, f_mul(cent, INT2FIX(100))));
-	del_hash("_cent");
     }
 
-    merid = ref_hash("_merid");
+    merid = del_hash("_merid");
     if (!NIL_P(merid)) {
 	VALUE hour;
 
@@ -686,7 +690,6 @@ date__strptime(const char *str, size_t slen,
 	    hour = f_mod(hour, INT2FIX(12));
 	    set_hash("hour", f_add(hour, merid));
 	}
-	del_hash("_merid");
     }
 
     return hash;
diff --git a/ext/date/date_tmx.h b/ext/date/date_tmx.h
index 0e56c9b4f0..993a15327d 100644
--- a/ext/date/date_tmx.h
+++ b/ext/date/date_tmx.h
@@ -18,12 +18,12 @@ struct tmx_funcs {
     VALUE (*sec_fraction)(void *dat);
     VALUE (*secs)(void *dat);
     VALUE (*msecs)(void *dat);
-    VALUE (*offset)(void *dat);
+    int (*offset)(void *dat);
     char *(*zone)(void *dat);
 };
 struct tmx {
     void *dat;
-    struct tmx_funcs *funcs;
+    const struct tmx_funcs *funcs;
 };
 
 #define tmx_attr(x) (tmx->funcs->x)(tmx->dat)
diff --git a/ext/date/depend b/ext/date/depend
index 7e5d62e79d..28847bef13 100644
--- a/ext/date/depend
+++ b/ext/date/depend
@@ -1,2 +1,67 @@
+# AUTOGENERATED DEPENDENCIES START
+date_core.o: $(RUBY_EXTCONF_H)
+date_core.o: $(arch_hdrdir)/ruby/config.h
+date_core.o: $(hdrdir)/ruby.h
+date_core.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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.h
+date_parse.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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/assert.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
 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.h
+date_strptime.o: $(hdrdir)/ruby/assert.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/onigmo.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: date_strptime.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/date/extconf.rb b/ext/date/extconf.rb
index 9f7d3e8f0b..8938df13b3 100644
--- a/ext/date/extconf.rb
+++ b/ext/date/extconf.rb
@@ -1,2 +1,9 @@
+# frozen_string_literal: true
 require 'mkmf'
+
+config_string("strict_warnflags") {|w| $warnflags += " #{w}"}
+
+have_var("timezone", "time.h")
+have_var("altzone", "time.h")
+
 create_makefile('date_core')
diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb
index d235d76e6f..b72b4157f2 100644
--- a/ext/date/lib/date.rb
+++ b/ext/date/lib/date.rb
@@ -1,10 +1,14 @@
+# frozen_string_literal: true
 # date.rb: Written by Tadayoshi Funaba 1998-2011
 
 require 'date_core'
-require 'date/format'
 
 class Date
 
+  def infinite?
+    false
+  end
+
   class Infinity < Numeric # :nodoc:
 
     include Comparable
@@ -15,26 +19,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 +47,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/lib/date/format.rb b/ext/date/lib/date/format.rb
deleted file mode 100644
index 892e7aacaa..0000000000
--- a/ext/date/lib/date/format.rb
+++ /dev/null
@@ -1 +0,0 @@
-# format.rb: Written by Tadayoshi Funaba 1999-2011
diff --git a/ext/date/prereq.mk b/ext/date/prereq.mk
new file mode 100644
index 0000000000..fa371e0d47
--- /dev/null
+++ b/ext/date/prereq.mk
@@ -0,0 +1,12 @@
+.SUFFIXES: .list
+
+.list.h:
+	gperf --ignore-case -C -c -P -p -j1 -i 1 -g -o -t -N $(*F) $< \
+	| sed -f $(top_srcdir)/tool/gperf.sed \
+	> $(@F)
+
+zonetab.h: zonetab.list
+
+.PHONY: update-zonetab
+update-zonetab:
+	$(RUBY) -C $(srcdir) update-abbr.rb
diff --git a/ext/date/update-abbr b/ext/date/update-abbr
new file mode 100644
index 0000000000..e5f6a78c82
--- /dev/null
+++ b/ext/date/update-abbr
@@ -0,0 +1,35 @@
+# -*- mode: ruby -*-
+require 'nokogiri'
+require 'open-uri'
+
+doc = Nokogiri::HTML(URI.open('https://www.timeanddate.com/time/zones/'))
+
+h = {}
+
+doc.css('#tz-abb tbody tr').each do |tr|
+  tds = tr.css('td')
+  abbr = tds[0].text.strip.downcase
+  offset = tds[3].text.strip.gsub(/UTC\s*/, '')
+  next if offset.include?('/') # skip ambiguous timezones
+  next if offset.empty?
+
+
+  hour, min = offset.split(':', 2)
+  offset = (Integer(hour) * 60 + (Integer(min || 0)))*60
+  if h.has_key?(abbr)
+    h[abbr] = false
+  else
+    h[abbr] = offset
+  end
+end
+
+h.delete_if{|_,v| !v}
+
+lines = File.readlines('zonetab.list')
+lines.select{|l| l.include?(',')}.
+  map{|l| l.split(',', 2)[0]}.
+  each{|a| h.delete(a)}
+
+lines.insert(-2, h.sort.map{|k,v| "#{k},#{v}\n"})
+lines.flatten!
+File.write('zonetab.list', lines.join)
diff --git a/ext/date/zonetab.h b/ext/date/zonetab.h
new file mode 100644
index 0000000000..379f78e1b8
--- /dev/null
+++ b/ext/date/zonetab.h
@@ -0,0 +1,1562 @@
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf --ignore-case -C -c -P -p -j1 -i 1 -g -o -t -N zonetab zonetab.list  */
+/* Computed positions: -k'1-4,9' */
+
+#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-gperf@gnu.org>."
+#endif
+
+#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
+#line 1 "zonetab.list"
+
+struct zone {
+    int name;
+    int offset;
+};
+static const struct zone *zonetab();
+#line 9 "zonetab.list"
+struct zone;
+
+#define TOTAL_KEYWORDS 316
+#define MIN_WORD_LENGTH 1
+#define MAX_WORD_LENGTH 17
+#define MIN_HASH_VALUE 2
+#define MAX_HASH_VALUE 619
+/* maximum key range = 618, 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_STRNCMP
+#define GPERF_CASE_STRNCMP 1
+static int
+gperf_case_strncmp (register const char *s1, register const char *s2, register size_t n)
+{
+  for (; n > 0;)
+    {
+      unsigned char c1 = gperf_downcase[(unsigned char)*s1++];
+      unsigned char c2 = gperf_downcase[(unsigned char)*s2++];
+      if (c1 != 0 && c1 == c2)
+        {
+          n--;
+          continue;
+        }
+      return (int)c1 - (int)c2;
+    }
+  return 0;
+}
+#endif
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash (register const char *str, register size_t len)
+{
+  static const unsigned short asso_values[] =
+    {
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620,  17, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620,   3,   2, 620, 620, 620,
+      620, 620,  70,   8,   3, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620,  39, 176, 207,  70, 168,
+        1,   5,  18,  74, 218,   2, 117, 130,  48,  88,
+      125, 225,  92,   1,   1,  12,  54,  30,  36,  13,
+       48, 168, 263,  59, 114, 166, 109,  39, 176, 207,
+       70, 168,   1,   5,  18,  74, 218,   2, 117, 130,
+       48,  88, 125, 225,  92,   1,   1,  12,  54,  30,
+       36,  13,  48, 168, 263,  59, 114, 166, 109,  27,
+      104,   1,   9,   4, 309, 190, 188, 177, 255, 108,
+        2, 341,   3, 620, 620, 620, 620, 620, 620,  12,
+       54,  30,  36,  13,  48, 168, 263,  59, 114, 166,
+      109,  27, 104,   1,   9,   4, 309, 190, 188, 177,
+      255, 108,   2, 341,   3, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620
+    };
+  register unsigned int hval = (unsigned int)len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[8]];
+      /*FALLTHROUGH*/
+      case 8:
+      case 7:
+      case 6:
+      case 5:
+      case 4:
+        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]+6];
+      /*FALLTHROUGH*/
+      case 1:
+        hval += asso_values[(unsigned char)str[0]+52];
+        break;
+    }
+  return (unsigned int)hval;
+}
+
+struct stringpool_t
+  {
+    char stringpool_str2[sizeof("o")];
+    char stringpool_str3[sizeof("x")];
+    char stringpool_str4[sizeof("z")];
+    char stringpool_str5[sizeof("q")];
+    char stringpool_str8[sizeof("omst")];
+    char stringpool_str9[sizeof("omsst")];
+    char stringpool_str10[sizeof("p")];
+    char stringpool_str13[sizeof("a")];
+    char stringpool_str14[sizeof("e")];
+    char stringpool_str15[sizeof("pet")];
+    char stringpool_str16[sizeof("pmst")];
+    char stringpool_str17[sizeof("pett")];
+    char stringpool_str18[sizeof("petst")];
+    char stringpool_str19[sizeof("eet")];
+    char stringpool_str20[sizeof("aest")];
+    char stringpool_str21[sizeof("eest")];
+    char stringpool_str22[sizeof("eat")];
+    char stringpool_str24[sizeof("east")];
+    char stringpool_str25[sizeof("easst")];
+    char stringpool_str26[sizeof("pst")];
+    char stringpool_str27[sizeof("eastern")];
+    char stringpool_str28[sizeof("m")];
+    char stringpool_str29[sizeof("ast")];
+    char stringpool_str30[sizeof("est")];
+    char stringpool_str31[sizeof("c")];
+    char stringpool_str32[sizeof("mmt")];
+    char stringpool_str33[sizeof("met")];
+    char stringpool_str35[sizeof("mest")];
+    char stringpool_str36[sizeof("cet")];
+    char stringpool_str37[sizeof("d")];
+    char stringpool_str38[sizeof("cest")];
+    char stringpool_str39[sizeof("cat")];
+    char stringpool_str41[sizeof("cast")];
+    char stringpool_str42[sizeof("magt")];
+    char stringpool_str43[sizeof("magst")];
+    char stringpool_str44[sizeof("mst")];
+    char stringpool_str45[sizeof("msk")];
+    char stringpool_str46[sizeof("cot")];
+    char stringpool_str47[sizeof("cst")];
+    char stringpool_str48[sizeof("aqtt")];
+    char stringpool_str49[sizeof("f")];
+    char stringpool_str52[sizeof("art")];
+    char stringpool_str53[sizeof("fnt")];
+    char stringpool_str54[sizeof("fet")];
+    char stringpool_str55[sizeof("b")];
+    char stringpool_str57[sizeof("anat")];
+    char stringpool_str58[sizeof("anast")];
+    char stringpool_str59[sizeof("bnt")];
+    char stringpool_str60[sizeof("i")];
+    char stringpool_str61[sizeof("pht")];
+    char stringpool_str62[sizeof("at")];
+    char stringpool_str63[sizeof("zp6")];
+    char stringpool_str64[sizeof("mewt")];
+    char stringpool_str65[sizeof("fst")];
+    char stringpool_str66[sizeof("ahst")];
+    char stringpool_str67[sizeof("mawt")];
+    char stringpool_str68[sizeof("zp5")];
+    char stringpool_str70[sizeof("bot")];
+    char stringpool_str71[sizeof("bst")];
+    char stringpool_str72[sizeof("pwt")];
+    char stringpool_str74[sizeof("pont")];
+    char stringpool_str75[sizeof("iot")];
+    char stringpool_str76[sizeof("ist")];
+    char stringpool_str77[sizeof("awst")];
+    char stringpool_str79[sizeof("mht")];
+    char stringpool_str80[sizeof("mez")];
+    char stringpool_str81[sizeof("orat")];
+    char stringpool_str82[sizeof("mesz")];
+    char stringpool_str84[sizeof("chst")];
+    char stringpool_str85[sizeof("pmdt")];
+    char stringpool_str88[sizeof("central")];
+    char stringpool_str89[sizeof("aedt")];
+    char stringpool_str90[sizeof("act")];
+    char stringpool_str91[sizeof("ect")];
+    char stringpool_str92[sizeof("acst")];
+    char stringpool_str93[sizeof("eadt")];
+    char stringpool_str94[sizeof("brt")];
+    char stringpool_str95[sizeof("chut")];
+    char stringpool_str96[sizeof("brst")];
+    char stringpool_str97[sizeof("cen. australia")];
+    char stringpool_str100[sizeof("davt")];
+    char stringpool_str101[sizeof("irst")];
+    char stringpool_str102[sizeof("irkt")];
+    char stringpool_str103[sizeof("irkst")];
+    char stringpool_str104[sizeof("bt")];
+    char stringpool_str105[sizeof("n")];
+    char stringpool_str106[sizeof("btt")];
+    char stringpool_str107[sizeof("mountain")];
+    char stringpool_str108[sizeof("cct")];
+    char stringpool_str109[sizeof("w")];
+    char stringpool_str110[sizeof("l")];
+    char stringpool_str111[sizeof("fwt")];
+    char stringpool_str113[sizeof("msd")];
+    char stringpool_str114[sizeof("wet")];
+    char stringpool_str116[sizeof("west")];
+    char stringpool_str117[sizeof("wat")];
+    char stringpool_str119[sizeof("wast")];
+    char stringpool_str120[sizeof("wakt")];
+    char stringpool_str121[sizeof("nst")];
+    char stringpool_str122[sizeof("acwst")];
+    char stringpool_str123[sizeof("chast")];
+    char stringpool_str124[sizeof("cist")];
+    char stringpool_str125[sizeof("azt")];
+    char stringpool_str126[sizeof("clt")];
+    char stringpool_str127[sizeof("azst")];
+    char stringpool_str128[sizeof("clst")];
+    char stringpool_str129[sizeof("mart")];
+    char stringpool_str130[sizeof("zp4")];
+    char stringpool_str131[sizeof("jst")];
+    char stringpool_str132[sizeof("central asia")];
+    char stringpool_str133[sizeof("aft")];
+    char stringpool_str134[sizeof("e. south america")];
+    char stringpool_str135[sizeof("central america")];
+    char stringpool_str137[sizeof("ict")];
+    char stringpool_str143[sizeof("pgt")];
+    char stringpool_str144[sizeof("nrt")];
+    char stringpool_str145[sizeof("mexico")];
+    char stringpool_str146[sizeof("awdt")];
+    char stringpool_str147[sizeof("egt")];
+    char stringpool_str148[sizeof("cxt")];
+    char stringpool_str149[sizeof("egst")];
+    char stringpool_str150[sizeof("phot")];
+    char stringpool_str151[sizeof("alaskan")];
+    char stringpool_str154[sizeof("nt")];
+    char stringpool_str158[sizeof("wt")];
+    char stringpool_str160[sizeof("west asia")];
+    char stringpool_str161[sizeof("acdt")];
+    char stringpool_str162[sizeof("npt")];
+    char stringpool_str163[sizeof("lhst")];
+    char stringpool_str164[sizeof("afghanistan")];
+    char stringpool_str167[sizeof("k")];
+    char stringpool_str169[sizeof("g")];
+    char stringpool_str170[sizeof("irdt")];
+    char stringpool_str171[sizeof("chot")];
+    char stringpool_str172[sizeof("chost")];
+    char stringpool_str173[sizeof("gmt")];
+    char stringpool_str174[sizeof("get")];
+    char stringpool_str175[sizeof("novt")];
+    char stringpool_str176[sizeof("novst")];
+    char stringpool_str177[sizeof("fjt")];
+    char stringpool_str178[sizeof("u")];
+    char stringpool_str179[sizeof("fjst")];
+    char stringpool_str181[sizeof("pyst")];
+    char stringpool_str182[sizeof("nct")];
+    char stringpool_str183[sizeof("kst")];
+    char stringpool_str184[sizeof("kost")];
+    char stringpool_str185[sizeof("gst")];
+    char stringpool_str186[sizeof("iran")];
+    char stringpool_str187[sizeof("e. africa")];
+    char stringpool_str188[sizeof("wadt")];
+    char stringpool_str189[sizeof("t")];
+    char stringpool_str190[sizeof("e. australia")];
+    char stringpool_str191[sizeof("s")];
+    char stringpool_str192[sizeof("chadt")];
+    char stringpool_str193[sizeof("tmt")];
+    char stringpool_str194[sizeof("cidst")];
+    char stringpool_str195[sizeof("aoe")];
+    char stringpool_str197[sizeof("myt")];
+    char stringpool_str198[sizeof("west pacific")];
+    char stringpool_str199[sizeof("mut")];
+    char stringpool_str200[sizeof("wit")];
+    char stringpool_str201[sizeof("sast")];
+    char stringpool_str202[sizeof("sakt")];
+    char stringpool_str203[sizeof("new zealand")];
+    char stringpool_str204[sizeof("tot")];
+    char stringpool_str205[sizeof("china")];
+    char stringpool_str206[sizeof("tost")];
+    char stringpool_str207[sizeof("sst")];
+    char stringpool_str209[sizeof("india")];
+    char stringpool_str211[sizeof("warst")];
+    char stringpool_str212[sizeof("sbt")];
+    char stringpool_str214[sizeof("azot")];
+    char stringpool_str215[sizeof("azost")];
+    char stringpool_str216[sizeof("taht")];
+    char stringpool_str217[sizeof("nzt")];
+    char stringpool_str218[sizeof("dateline")];
+    char stringpool_str219[sizeof("nzst")];
+    char stringpool_str220[sizeof("tokyo")];
+    char stringpool_str221[sizeof("central pacific")];
+    char stringpool_str223[sizeof("qyzt")];
+    char stringpool_str224[sizeof("atlantic")];
+    char stringpool_str225[sizeof("nft")];
+    char stringpool_str227[sizeof("ut")];
+    char stringpool_str228[sizeof("trt")];
+    char stringpool_str229[sizeof("wft")];
+    char stringpool_str230[sizeof("srt")];
+    char stringpool_str231[sizeof("pdt")];
+    char stringpool_str232[sizeof("lhdt")];
+    char stringpool_str234[sizeof("adt")];
+    char stringpool_str235[sizeof("edt")];
+    char stringpool_str238[sizeof("pkt")];
+    char stringpool_str239[sizeof("almt")];
+    char stringpool_str240[sizeof("wita")];
+    char stringpool_str242[sizeof("wgt")];
+    char stringpool_str243[sizeof("akst")];
+    char stringpool_str244[sizeof("wgst")];
+    char stringpool_str246[sizeof("krat")];
+    char stringpool_str247[sizeof("krast")];
+    char stringpool_str248[sizeof("mid-atlantic")];
+    char stringpool_str249[sizeof("mdt")];
+    char stringpool_str250[sizeof("lint")];
+    char stringpool_str251[sizeof("malay peninsula")];
+    char stringpool_str252[sizeof("cdt")];
+    char stringpool_str253[sizeof("swt")];
+    char stringpool_str255[sizeof("se asia")];
+    char stringpool_str256[sizeof("v")];
+    char stringpool_str258[sizeof("tonga")];
+    char stringpool_str259[sizeof("ckt")];
+    char stringpool_str261[sizeof("vet")];
+    char stringpool_str262[sizeof("caucasus")];
+    char stringpool_str263[sizeof("central europe")];
+    char stringpool_str264[sizeof("h")];
+    char stringpool_str265[sizeof("central european")];
+    char stringpool_str266[sizeof("newfoundland")];
+    char stringpool_str267[sizeof("arab")];
+    char stringpool_str268[sizeof("sct")];
+    char stringpool_str269[sizeof("arabic")];
+    char stringpool_str270[sizeof("arabian")];
+    char stringpool_str271[sizeof("ddut")];
+    char stringpool_str273[sizeof("vost")];
+    char stringpool_str274[sizeof("hast")];
+    char stringpool_str275[sizeof("nepal")];
+    char stringpool_str276[sizeof("nut")];
+    char stringpool_str277[sizeof("fkt")];
+    char stringpool_str279[sizeof("fkst")];
+    char stringpool_str280[sizeof("hst")];
+    char stringpool_str281[sizeof("idt")];
+    char stringpool_str284[sizeof("tlt")];
+    char stringpool_str285[sizeof("w. australia")];
+    char stringpool_str286[sizeof("egypt")];
+    char stringpool_str287[sizeof("myanmar")];
+    char stringpool_str288[sizeof("nzdt")];
+    char stringpool_str289[sizeof("gft")];
+    char stringpool_str290[sizeof("uzt")];
+    char stringpool_str293[sizeof("north asia")];
+    char stringpool_str294[sizeof("mvt")];
+    char stringpool_str295[sizeof("galt")];
+    char stringpool_str296[sizeof("nfdt")];
+    char stringpool_str297[sizeof("cvt")];
+    char stringpool_str298[sizeof("north asia east")];
+    char stringpool_str300[sizeof("kgt")];
+    char stringpool_str301[sizeof("aus central")];
+    char stringpool_str302[sizeof("pacific")];
+    char stringpool_str304[sizeof("canada central")];
+    char stringpool_str306[sizeof("pacific sa")];
+    char stringpool_str307[sizeof("azores")];
+    char stringpool_str308[sizeof("gamt")];
+    char stringpool_str309[sizeof("tft")];
+    char stringpool_str310[sizeof("r")];
+    char stringpool_str311[sizeof("fle")];
+    char stringpool_str312[sizeof("akdt")];
+    char stringpool_str313[sizeof("ulat")];
+    char stringpool_str314[sizeof("ulast")];
+    char stringpool_str315[sizeof("ret")];
+    char stringpool_str317[sizeof("tjt")];
+    char stringpool_str319[sizeof("south africa")];
+    char stringpool_str324[sizeof("sgt")];
+    char stringpool_str326[sizeof("ndt")];
+    char stringpool_str327[sizeof("rott")];
+    char stringpool_str330[sizeof("samt")];
+    char stringpool_str332[sizeof("tasmania")];
+    char stringpool_str334[sizeof("hovt")];
+    char stringpool_str335[sizeof("hovst")];
+    char stringpool_str338[sizeof("gyt")];
+    char stringpool_str342[sizeof("y")];
+    char stringpool_str343[sizeof("hadt")];
+    char stringpool_str344[sizeof("sa western")];
+    char stringpool_str345[sizeof("hawaiian")];
+    char stringpool_str347[sizeof("uyt")];
+    char stringpool_str349[sizeof("uyst")];
+    char stringpool_str350[sizeof("yekt")];
+    char stringpool_str351[sizeof("yekst")];
+    char stringpool_str352[sizeof("kuyt")];
+    char stringpool_str353[sizeof("yakt")];
+    char stringpool_str354[sizeof("yakst")];
+    char stringpool_str358[sizeof("yst")];
+    char stringpool_str359[sizeof("jerusalem")];
+    char stringpool_str365[sizeof("sri lanka")];
+    char stringpool_str367[sizeof("yakutsk")];
+    char stringpool_str375[sizeof("wib")];
+    char stringpool_str377[sizeof("aus eastern")];
+    char stringpool_str378[sizeof("gilt")];
+    char stringpool_str387[sizeof("us mountain")];
+    char stringpool_str391[sizeof("vlat")];
+    char stringpool_str392[sizeof("vlast")];
+    char stringpool_str395[sizeof("gtb")];
+    char stringpool_str398[sizeof("taipei")];
+    char stringpool_str399[sizeof("sret")];
+    char stringpool_str408[sizeof("cape verde")];
+    char stringpool_str417[sizeof("tkt")];
+    char stringpool_str418[sizeof("samoa")];
+    char stringpool_str421[sizeof("sa pacific")];
+    char stringpool_str427[sizeof("vut")];
+    char stringpool_str428[sizeof("idlw")];
+    char stringpool_str432[sizeof("fiji")];
+    char stringpool_str435[sizeof("utc")];
+    char stringpool_str443[sizeof("korea")];
+    char stringpool_str445[sizeof("e. europe")];
+    char stringpool_str449[sizeof("syot")];
+    char stringpool_str452[sizeof("n. central asia")];
+    char stringpool_str455[sizeof("tvt")];
+    char stringpool_str458[sizeof("w. central africa")];
+    char stringpool_str466[sizeof("ekaterinburg")];
+    char stringpool_str468[sizeof("vladivostok")];
+    char stringpool_str476[sizeof("yapt")];
+    char stringpool_str477[sizeof("us eastern")];
+    char stringpool_str482[sizeof("sa eastern")];
+    char stringpool_str485[sizeof("hdt")];
+    char stringpool_str486[sizeof("russian")];
+    char stringpool_str492[sizeof("hkt")];
+    char stringpool_str497[sizeof("romance")];
+    char stringpool_str540[sizeof("w. europe")];
+    char stringpool_str563[sizeof("ydt")];
+    char stringpool_str566[sizeof("idle")];
+    char stringpool_str567[sizeof("greenwich")];
+    char stringpool_str619[sizeof("greenland")];
+  };
+static const struct stringpool_t stringpool_contents =
+  {
+    "o",
+    "x",
+    "z",
+    "q",
+    "omst",
+    "omsst",
+    "p",
+    "a",
+    "e",
+    "pet",
+    "pmst",
+    "pett",
+    "petst",
+    "eet",
+    "aest",
+    "eest",
+    "eat",
+    "east",
+    "easst",
+    "pst",
+    "eastern",
+    "m",
+    "ast",
+    "est",
+    "c",
+    "mmt",
+    "met",
+    "mest",
+    "cet",
+    "d",
+    "cest",
+    "cat",
+    "cast",
+    "magt",
+    "magst",
+    "mst",
+    "msk",
+    "cot",
+    "cst",
+    "aqtt",
+    "f",
+    "art",
+    "fnt",
+    "fet",
+    "b",
+    "anat",
+    "anast",
+    "bnt",
+    "i",
+    "pht",
+    "at",
+    "zp6",
+    "mewt",
+    "fst",
+    "ahst",
+    "mawt",
+    "zp5",
+    "bot",
+    "bst",
+    "pwt",
+    "pont",
+    "iot",
+    "ist",
+    "awst",
+    "mht",
+    "mez",
+    "orat",
+    "mesz",
+    "chst",
+    "pmdt",
+    "central",
+    "aedt",
+    "act",
+    "ect",
+    "acst",
+    "eadt",
+    "brt",
+    "chut",
+    "brst",
+    "cen. australia",
+    "davt",
+    "irst",
+    "irkt",
+    "irkst",
+    "bt",
+    "n",
+    "btt",
+    "mountain",
+    "cct",
+    "w",
+    "l",
+    "fwt",
+    "msd",
+    "wet",
+    "west",
+    "wat",
+    "wast",
+    "wakt",
+    "nst",
+    "acwst",
+    "chast",
+    "cist",
+    "azt",
+    "clt",
+    "azst",
+    "clst",
+    "mart",
+    "zp4",
+    "jst",
+    "central asia",
+    "aft",
+    "e. south america",
+    "central america",
+    "ict",
+    "pgt",
+    "nrt",
+    "mexico",
+    "awdt",
+    "egt",
+    "cxt",
+    "egst",
+    "phot",
+    "alaskan",
+    "nt",
+    "wt",
+    "west asia",
+    "acdt",
+    "npt",
+    "lhst",
+    "afghanistan",
+    "k",
+    "g",
+    "irdt",
+    "chot",
+    "chost",
+    "gmt",
+    "get",
+    "novt",
+    "novst",
+    "fjt",
+    "u",
+    "fjst",
+    "pyst",
+    "nct",
+    "kst",
+    "kost",
+    "gst",
+    "iran",
+    "e. africa",
+    "wadt",
+    "t",
+    "e. australia",
+    "s",
+    "chadt",
+    "tmt",
+    "cidst",
+    "aoe",
+    "myt",
+    "west pacific",
+    "mut",
+    "wit",
+    "sast",
+    "sakt",
+    "new zealand",
+    "tot",
+    "china",
+    "tost",
+    "sst",
+    "india",
+    "warst",
+    "sbt",
+    "azot",
+    "azost",
+    "taht",
+    "nzt",
+    "dateline",
+    "nzst",
+    "tokyo",
+    "central pacific",
+    "qyzt",
+    "atlantic",
+    "nft",
+    "ut",
+    "trt",
+    "wft",
+    "srt",
+    "pdt",
+    "lhdt",
+    "adt",
+    "edt",
+    "pkt",
+    "almt",
+    "wita",
+    "wgt",
+    "akst",
+    "wgst",
+    "krat",
+    "krast",
+    "mid-atlantic",
+    "mdt",
+    "lint",
+    "malay peninsula",
+    "cdt",
+    "swt",
+    "se asia",
+    "v",
+    "tonga",
+    "ckt",
+    "vet",
+    "caucasus",
+    "central europe",
+    "h",
+    "central european",
+    "newfoundland",
+    "arab",
+    "sct",
+    "arabic",
+    "arabian",
+    "ddut",
+    "vost",
+    "hast",
+    "nepal",
+    "nut",
+    "fkt",
+    "fkst",
+    "hst",
+    "idt",
+    "tlt",
+    "w. australia",
+    "egypt",
+    "myanmar",
+    "nzdt",
+    "gft",
+    "uzt",
+    "north asia",
+    "mvt",
+    "galt",
+    "nfdt",
+    "cvt",
+    "north asia east",
+    "kgt",
+    "aus central",
+    "pacific",
+    "canada central",
+    "pacific sa",
+    "azores",
+    "gamt",
+    "tft",
+    "r",
+    "fle",
+    "akdt",
+    "ulat",
+    "ulast",
+    "ret",
+    "tjt",
+    "south africa",
+    "sgt",
+    "ndt",
+    "rott",
+    "samt",
+    "tasmania",
+    "hovt",
+    "hovst",
+    "gyt",
+    "y",
+    "hadt",
+    "sa western",
+    "hawaiian",
+    "uyt",
+    "uyst",
+    "yekt",
+    "yekst",
+    "kuyt",
+    "yakt",
+    "yakst",
+    "yst",
+    "jerusalem",
+    "sri lanka",
+    "yakutsk",
+    "wib",
+    "aus eastern",
+    "gilt",
+    "us mountain",
+    "vlat",
+    "vlast",
+    "gtb",
+    "taipei",
+    "sret",
+    "cape verde",
+    "tkt",
+    "samoa",
+    "sa pacific",
+    "vut",
+    "idlw",
+    "fiji",
+    "utc",
+    "korea",
+    "e. europe",
+    "syot",
+    "n. central asia",
+    "tvt",
+    "w. central africa",
+    "ekaterinburg",
+    "vladivostok",
+    "yapt",
+    "us eastern",
+    "sa eastern",
+    "hdt",
+    "russian",
+    "hkt",
+    "romance",
+    "w. europe",
+    "ydt",
+    "idle",
+    "greenwich",
+    "greenland"
+  };
+#define stringpool ((const char *) &stringpool_contents)
+const struct zone *
+zonetab (register const char *str, register size_t len)
+{
+  static const struct zone wordlist[] =
+    {
+      {-1}, {-1},
+#line 34 "zonetab.list"
+      {gperf_offsetof(stringpool, 2),   -2*3600},
+#line 43 "zonetab.list"
+      {gperf_offsetof(stringpool, 3),  -11*3600},
+#line 45 "zonetab.list"
+      {gperf_offsetof(stringpool, 4),    0*3600},
+#line 36 "zonetab.list"
+      {gperf_offsetof(stringpool, 5),   -4*3600},
+      {-1}, {-1},
+#line 269 "zonetab.list"
+      {gperf_offsetof(stringpool, 8),21600},
+#line 268 "zonetab.list"
+      {gperf_offsetof(stringpool, 9),25200},
+#line 35 "zonetab.list"
+      {gperf_offsetof(stringpool, 10),   -3*3600},
+      {-1}, {-1},
+#line 21 "zonetab.list"
+      {gperf_offsetof(stringpool, 13),    1*3600},
+#line 25 "zonetab.list"
+      {gperf_offsetof(stringpool, 14),    5*3600},
+#line 271 "zonetab.list"
+      {gperf_offsetof(stringpool, 15),-18000},
+#line 279 "zonetab.list"
+      {gperf_offsetof(stringpool, 16),-10800},
+#line 273 "zonetab.list"
+      {gperf_offsetof(stringpool, 17),43200},
+#line 272 "zonetab.list"
+      {gperf_offsetof(stringpool, 18),43200},
+#line 80 "zonetab.list"
+      {gperf_offsetof(stringpool, 19),  2*3600},
+#line 186 "zonetab.list"
+      {gperf_offsetof(stringpool, 20),36000},
+#line 88 "zonetab.list"
+      {gperf_offsetof(stringpool, 21), 3*3600},
+#line 87 "zonetab.list"
+      {gperf_offsetof(stringpool, 22),  3*3600},
+      {-1},
+#line 101 "zonetab.list"
+      {gperf_offsetof(stringpool, 24),10*3600},
+#line 217 "zonetab.list"
+      {gperf_offsetof(stringpool, 25),-18000},
+#line 19 "zonetab.list"
+      {gperf_offsetof(stringpool, 26), -8*3600},
+#line 133 "zonetab.list"
+      {gperf_offsetof(stringpool, 27),                -18000},
+#line 32 "zonetab.list"
+      {gperf_offsetof(stringpool, 28),   12*3600},
+#line 56 "zonetab.list"
+      {gperf_offsetof(stringpool, 29), -4*3600},
+#line 13 "zonetab.list"
+      {gperf_offsetof(stringpool, 30), -5*3600},
+#line 23 "zonetab.list"
+      {gperf_offsetof(stringpool, 31),    3*3600},
+#line 256 "zonetab.list"
+      {gperf_offsetof(stringpool, 32),23400},
+#line 73 "zonetab.list"
+      {gperf_offsetof(stringpool, 33),  1*3600},
+      {-1},
+#line 82 "zonetab.list"
+      {gperf_offsetof(stringpool, 35), 2*3600},
+#line 71 "zonetab.list"
+      {gperf_offsetof(stringpool, 36),  1*3600},
+#line 24 "zonetab.list"
+      {gperf_offsetof(stringpool, 37),    4*3600},
+#line 79 "zonetab.list"
+      {gperf_offsetof(stringpool, 38), 2*3600},
+#line 65 "zonetab.list"
+      {gperf_offsetof(stringpool, 39),-10*3600},
+      {-1},
+#line 202 "zonetab.list"
+      {gperf_offsetof(stringpool, 41),28800},
+#line 252 "zonetab.list"
+      {gperf_offsetof(stringpool, 42),39600},
+#line 251 "zonetab.list"
+      {gperf_offsetof(stringpool, 43),43200},
+#line 17 "zonetab.list"
+      {gperf_offsetof(stringpool, 44), -7*3600},
+#line 89 "zonetab.list"
+      {gperf_offsetof(stringpool, 45),  3*3600},
+#line 212 "zonetab.list"
+      {gperf_offsetof(stringpool, 46),-18000},
+#line 15 "zonetab.list"
+      {gperf_offsetof(stringpool, 47), -6*3600},
+#line 192 "zonetab.list"
+      {gperf_offsetof(stringpool, 48),18000},
+#line 26 "zonetab.list"
+      {gperf_offsetof(stringpool, 49),    6*3600},
+      {-1}, {-1},
+#line 51 "zonetab.list"
+      {gperf_offsetof(stringpool, 52), -3*3600},
+#line 226 "zonetab.list"
+      {gperf_offsetof(stringpool, 53),-7200},
+#line 221 "zonetab.list"
+      {gperf_offsetof(stringpool, 54),10800},
+#line 22 "zonetab.list"
+      {gperf_offsetof(stringpool, 55),    2*3600},
+      {-1},
+#line 190 "zonetab.list"
+      {gperf_offsetof(stringpool, 57),43200},
+#line 189 "zonetab.list"
+      {gperf_offsetof(stringpool, 58),43200},
+#line 199 "zonetab.list"
+      {gperf_offsetof(stringpool, 59),28800},
+#line 29 "zonetab.list"
+      {gperf_offsetof(stringpool, 60),    9*3600},
+#line 276 "zonetab.list"
+      {gperf_offsetof(stringpool, 61),28800},
+#line 48 "zonetab.list"
+      {gperf_offsetof(stringpool, 62),  -2*3600},
+#line 94 "zonetab.list"
+      {gperf_offsetof(stringpool, 63),  6*3600},
+#line 74 "zonetab.list"
+      {gperf_offsetof(stringpool, 64), 1*3600},
+#line 81 "zonetab.list"
+      {gperf_offsetof(stringpool, 65),  2*3600},
+#line 64 "zonetab.list"
+      {gperf_offsetof(stringpool, 66),-10*3600},
+#line 254 "zonetab.list"
+      {gperf_offsetof(stringpool, 67),18000},
+#line 92 "zonetab.list"
+      {gperf_offsetof(stringpool, 68),  5*3600},
+      {-1},
+#line 200 "zonetab.list"
+      {gperf_offsetof(stringpool, 70),-14400},
+#line 70 "zonetab.list"
+      {gperf_offsetof(stringpool, 71),  1*3600},
+#line 281 "zonetab.list"
+      {gperf_offsetof(stringpool, 72),32400},
+      {-1},
+#line 280 "zonetab.list"
+      {gperf_offsetof(stringpool, 74),39600},
+#line 238 "zonetab.list"
+      {gperf_offsetof(stringpool, 75),21600},
+#line 93 "zonetab.list"
+      {gperf_offsetof(stringpool, 76),  (5*3600+1800)},
+#line 194 "zonetab.list"
+      {gperf_offsetof(stringpool, 77),28800},
+      {-1},
+#line 255 "zonetab.list"
+      {gperf_offsetof(stringpool, 79),43200},
+#line 75 "zonetab.list"
+      {gperf_offsetof(stringpool, 80),  1*3600},
+#line 270 "zonetab.list"
+      {gperf_offsetof(stringpool, 81),18000},
+#line 83 "zonetab.list"
+      {gperf_offsetof(stringpool, 82), 2*3600},
+      {-1},
+#line 207 "zonetab.list"
+      {gperf_offsetof(stringpool, 84),36000},
+#line 278 "zonetab.list"
+      {gperf_offsetof(stringpool, 85),-7200},
+      {-1}, {-1},
+#line 126 "zonetab.list"
+      {gperf_offsetof(stringpool, 88),                -21600},
+#line 185 "zonetab.list"
+      {gperf_offsetof(stringpool, 89),39600},
+#line 183 "zonetab.list"
+      {gperf_offsetof(stringpool, 90),-18000},
+#line 218 "zonetab.list"
+      {gperf_offsetof(stringpool, 91),-18000},
+#line 182 "zonetab.list"
+      {gperf_offsetof(stringpool, 92),34200},
+#line 103 "zonetab.list"
+      {gperf_offsetof(stringpool, 93),11*3600},
+#line 53 "zonetab.list"
+      {gperf_offsetof(stringpool, 94), -3*3600},
+#line 208 "zonetab.list"
+      {gperf_offsetof(stringpool, 95),36000},
+#line 49 "zonetab.list"
+      {gperf_offsetof(stringpool, 96),-2*3600},
+#line 120 "zonetab.list"
+      {gperf_offsetof(stringpool, 97),          34200},
+      {-1}, {-1},
+#line 215 "zonetab.list"
+      {gperf_offsetof(stringpool, 100),25200},
+#line 242 "zonetab.list"
+      {gperf_offsetof(stringpool, 101),12600},
+#line 241 "zonetab.list"
+      {gperf_offsetof(stringpool, 102),28800},
+#line 240 "zonetab.list"
+      {gperf_offsetof(stringpool, 103),32400},
+#line 86 "zonetab.list"
+      {gperf_offsetof(stringpool, 104),   3*3600},
+#line 33 "zonetab.list"
+      {gperf_offsetof(stringpool, 105),   -1*3600},
+#line 201 "zonetab.list"
+      {gperf_offsetof(stringpool, 106),21600},
+#line 148 "zonetab.list"
+      {gperf_offsetof(stringpool, 107),               -25200},
+#line 96 "zonetab.list"
+      {gperf_offsetof(stringpool, 108),  8*3600},
+#line 42 "zonetab.list"
+      {gperf_offsetof(stringpool, 109),  -10*3600},
+#line 31 "zonetab.list"
+      {gperf_offsetof(stringpool, 110),   11*3600},
+#line 72 "zonetab.list"
+      {gperf_offsetof(stringpool, 111),  1*3600},
+      {-1},
+#line 90 "zonetab.list"
+      {gperf_offsetof(stringpool, 113),  4*3600},
+#line 47 "zonetab.list"
+      {gperf_offsetof(stringpool, 114),  0*3600},
+      {-1},
+#line 78 "zonetab.list"
+      {gperf_offsetof(stringpool, 116), 1*3600},
+#line 77 "zonetab.list"
+      {gperf_offsetof(stringpool, 117),  1*3600},
+      {-1},
+#line 95 "zonetab.list"
+      {gperf_offsetof(stringpool, 119), 7*3600},
+#line 313 "zonetab.list"
+      {gperf_offsetof(stringpool, 120),43200},
+#line 55 "zonetab.list"
+      {gperf_offsetof(stringpool, 121), -(3*3600+1800)},
+#line 184 "zonetab.list"
+      {gperf_offsetof(stringpool, 122),31500},
+#line 204 "zonetab.list"
+      {gperf_offsetof(stringpool, 123),45900},
+#line 210 "zonetab.list"
+      {gperf_offsetof(stringpool, 124),-18000},
+#line 198 "zonetab.list"
+      {gperf_offsetof(stringpool, 125),14400},
+#line 57 "zonetab.list"
+      {gperf_offsetof(stringpool, 126), -4*3600},
+#line 197 "zonetab.list"
+      {gperf_offsetof(stringpool, 127),18000},
+#line 54 "zonetab.list"
+      {gperf_offsetof(stringpool, 128),-3*3600},
+#line 253 "zonetab.list"
+      {gperf_offsetof(stringpool, 129),-30600},
+#line 91 "zonetab.list"
+      {gperf_offsetof(stringpool, 130),  4*3600},
+#line 99 "zonetab.list"
+      {gperf_offsetof(stringpool, 131),  9*3600},
+#line 122 "zonetab.list"
+      {gperf_offsetof(stringpool, 132),            21600},
+#line 187 "zonetab.list"
+      {gperf_offsetof(stringpool, 133),16200},
+#line 132 "zonetab.list"
+      {gperf_offsetof(stringpool, 134),       -10800},
+#line 121 "zonetab.list"
+      {gperf_offsetof(stringpool, 135),        -21600},
+      {-1},
+#line 236 "zonetab.list"
+      {gperf_offsetof(stringpool, 137),25200},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 274 "zonetab.list"
+      {gperf_offsetof(stringpool, 143),36000},
+#line 266 "zonetab.list"
+      {gperf_offsetof(stringpool, 144),43200},
+#line 146 "zonetab.list"
+      {gperf_offsetof(stringpool, 145),                 -21600},
+#line 193 "zonetab.list"
+      {gperf_offsetof(stringpool, 146),32400},
+#line 220 "zonetab.list"
+      {gperf_offsetof(stringpool, 147),-3600},
+#line 214 "zonetab.list"
+      {gperf_offsetof(stringpool, 148),25200},
+#line 219 "zonetab.list"
+      {gperf_offsetof(stringpool, 149),0},
+#line 275 "zonetab.list"
+      {gperf_offsetof(stringpool, 150),46800},
+#line 109 "zonetab.list"
+      {gperf_offsetof(stringpool, 151),                -32400},
+      {-1}, {-1},
+#line 68 "zonetab.list"
+      {gperf_offsetof(stringpool, 154),  -11*3600},
+      {-1}, {-1}, {-1},
+#line 321 "zonetab.list"
+      {gperf_offsetof(stringpool, 158),0},
+      {-1},
+#line 178 "zonetab.list"
+      {gperf_offsetof(stringpool, 160),               18000},
+#line 181 "zonetab.list"
+      {gperf_offsetof(stringpool, 161),37800},
+#line 265 "zonetab.list"
+      {gperf_offsetof(stringpool, 162),20700},
+#line 249 "zonetab.list"
+      {gperf_offsetof(stringpool, 163),37800},
+#line 108 "zonetab.list"
+      {gperf_offsetof(stringpool, 164),             16200},
+      {-1}, {-1},
+#line 30 "zonetab.list"
+      {gperf_offsetof(stringpool, 167),   10*3600},
+      {-1},
+#line 27 "zonetab.list"
+      {gperf_offsetof(stringpool, 169),    7*3600},
+#line 239 "zonetab.list"
+      {gperf_offsetof(stringpool, 170),16200},
+#line 206 "zonetab.list"
+      {gperf_offsetof(stringpool, 171),28800},
+#line 205 "zonetab.list"
+      {gperf_offsetof(stringpool, 172),32400},
+#line 12 "zonetab.list"
+      {gperf_offsetof(stringpool, 173),  0*3600},
+#line 229 "zonetab.list"
+      {gperf_offsetof(stringpool, 174),14400},
+#line 264 "zonetab.list"
+      {gperf_offsetof(stringpool, 175),25200},
+#line 263 "zonetab.list"
+      {gperf_offsetof(stringpool, 176),25200},
+#line 223 "zonetab.list"
+      {gperf_offsetof(stringpool, 177),43200},
+#line 40 "zonetab.list"
+      {gperf_offsetof(stringpool, 178),   -8*3600},
+#line 222 "zonetab.list"
+      {gperf_offsetof(stringpool, 179),46800},
+      {-1},
+#line 282 "zonetab.list"
+      {gperf_offsetof(stringpool, 181),-10800},
+#line 260 "zonetab.list"
+      {gperf_offsetof(stringpool, 182),39600},
+#line 100 "zonetab.list"
+      {gperf_offsetof(stringpool, 183),  9*3600},
+#line 244 "zonetab.list"
+      {gperf_offsetof(stringpool, 184),39600},
+#line 102 "zonetab.list"
+      {gperf_offsetof(stringpool, 185), 10*3600},
+#line 143 "zonetab.list"
+      {gperf_offsetof(stringpool, 186),                    12600},
+#line 129 "zonetab.list"
+      {gperf_offsetof(stringpool, 187),               10800},
+#line 98 "zonetab.list"
+      {gperf_offsetof(stringpool, 188), 8*3600},
+#line 39 "zonetab.list"
+      {gperf_offsetof(stringpool, 189),   -7*3600},
+#line 130 "zonetab.list"
+      {gperf_offsetof(stringpool, 190),            36000},
+#line 38 "zonetab.list"
+      {gperf_offsetof(stringpool, 191),   -6*3600},
+#line 203 "zonetab.list"
+      {gperf_offsetof(stringpool, 192),49500},
+#line 298 "zonetab.list"
+      {gperf_offsetof(stringpool, 193),18000},
+#line 209 "zonetab.list"
+      {gperf_offsetof(stringpool, 194),-14400},
+#line 191 "zonetab.list"
+      {gperf_offsetof(stringpool, 195),-43200},
+      {-1},
+#line 259 "zonetab.list"
+      {gperf_offsetof(stringpool, 197),28800},
+#line 179 "zonetab.list"
+      {gperf_offsetof(stringpool, 198),            36000},
+#line 257 "zonetab.list"
+      {gperf_offsetof(stringpool, 199),14400},
+#line 319 "zonetab.list"
+      {gperf_offsetof(stringpool, 200),32400},
+#line 84 "zonetab.list"
+      {gperf_offsetof(stringpool, 201), 2*3600},
+#line 286 "zonetab.list"
+      {gperf_offsetof(stringpool, 202),39600},
+#line 152 "zonetab.list"
+      {gperf_offsetof(stringpool, 203),             43200},
+#line 300 "zonetab.list"
+      {gperf_offsetof(stringpool, 204),46800},
+#line 127 "zonetab.list"
+      {gperf_offsetof(stringpool, 205),                   28800},
+#line 299 "zonetab.list"
+      {gperf_offsetof(stringpool, 206),50400},
+#line 85 "zonetab.list"
+      {gperf_offsetof(stringpool, 207),  2*3600},
+      {-1},
+#line 142 "zonetab.list"
+      {gperf_offsetof(stringpool, 209),                   19800},
+      {-1},
+#line 314 "zonetab.list"
+      {gperf_offsetof(stringpool, 211),-10800},
+#line 288 "zonetab.list"
+      {gperf_offsetof(stringpool, 212),39600},
+      {-1},
+#line 196 "zonetab.list"
+      {gperf_offsetof(stringpool, 214),-3600},
+#line 195 "zonetab.list"
+      {gperf_offsetof(stringpool, 215),0},
+#line 293 "zonetab.list"
+      {gperf_offsetof(stringpool, 216),-36000},
+#line 106 "zonetab.list"
+      {gperf_offsetof(stringpool, 217), 12*3600},
+#line 128 "zonetab.list"
+      {gperf_offsetof(stringpool, 218),               -43200},
+#line 105 "zonetab.list"
+      {gperf_offsetof(stringpool, 219),12*3600},
+#line 170 "zonetab.list"
+      {gperf_offsetof(stringpool, 220),                   32400},
+#line 125 "zonetab.list"
+      {gperf_offsetof(stringpool, 221),         39600},
+      {-1},
+#line 283 "zonetab.list"
+      {gperf_offsetof(stringpool, 223),21600},
+#line 113 "zonetab.list"
+      {gperf_offsetof(stringpool, 224),               -14400},
+#line 262 "zonetab.list"
+      {gperf_offsetof(stringpool, 225),39600},
+      {-1},
+#line 11 "zonetab.list"
+      {gperf_offsetof(stringpool, 227),   0*3600},
+#line 301 "zonetab.list"
+      {gperf_offsetof(stringpool, 228),10800},
+#line 315 "zonetab.list"
+      {gperf_offsetof(stringpool, 229),43200},
+#line 291 "zonetab.list"
+      {gperf_offsetof(stringpool, 230),-10800},
+#line 20 "zonetab.list"
+      {gperf_offsetof(stringpool, 231), -7*3600},
+#line 248 "zonetab.list"
+      {gperf_offsetof(stringpool, 232),39600},
+      {-1},
+#line 52 "zonetab.list"
+      {gperf_offsetof(stringpool, 234), -3*3600},
+#line 14 "zonetab.list"
+      {gperf_offsetof(stringpool, 235), -4*3600},
+      {-1}, {-1},
+#line 277 "zonetab.list"
+      {gperf_offsetof(stringpool, 238),18000},
+#line 188 "zonetab.list"
+      {gperf_offsetof(stringpool, 239),21600},
+#line 320 "zonetab.list"
+      {gperf_offsetof(stringpool, 240),28800},
+      {-1},
+#line 317 "zonetab.list"
+      {gperf_offsetof(stringpool, 242),-10800},
+#line 60 "zonetab.list"
+      {gperf_offsetof(stringpool, 243),-9*3600},
+#line 316 "zonetab.list"
+      {gperf_offsetof(stringpool, 244),-7200},
+      {-1},
+#line 246 "zonetab.list"
+      {gperf_offsetof(stringpool, 246),25200},
+#line 245 "zonetab.list"
+      {gperf_offsetof(stringpool, 247),28800},
+#line 147 "zonetab.list"
+      {gperf_offsetof(stringpool, 248),            -7200},
+#line 18 "zonetab.list"
+      {gperf_offsetof(stringpool, 249), -6*3600},
+#line 250 "zonetab.list"
+      {gperf_offsetof(stringpool, 250),50400},
+#line 165 "zonetab.list"
+      {gperf_offsetof(stringpool, 251),         28800},
+#line 16 "zonetab.list"
+      {gperf_offsetof(stringpool, 252), -5*3600},
+#line 76 "zonetab.list"
+      {gperf_offsetof(stringpool, 253),  1*3600},
+      {-1},
+#line 164 "zonetab.list"
+      {gperf_offsetof(stringpool, 255),                 25200},
+#line 41 "zonetab.list"
+      {gperf_offsetof(stringpool, 256),   -9*3600},
+      {-1},
+#line 171 "zonetab.list"
+      {gperf_offsetof(stringpool, 258),                   46800},
+#line 211 "zonetab.list"
+      {gperf_offsetof(stringpool, 259),-36000},
+      {-1},
+#line 308 "zonetab.list"
+      {gperf_offsetof(stringpool, 261),-14400},
+#line 119 "zonetab.list"
+      {gperf_offsetof(stringpool, 262),                14400},
+#line 123 "zonetab.list"
+      {gperf_offsetof(stringpool, 263),           3600},
+#line 28 "zonetab.list"
+      {gperf_offsetof(stringpool, 264),    8*3600},
+#line 124 "zonetab.list"
+      {gperf_offsetof(stringpool, 265),         3600},
+#line 153 "zonetab.list"
+      {gperf_offsetof(stringpool, 266),           -12600},
+#line 110 "zonetab.list"
+      {gperf_offsetof(stringpool, 267),                    10800},
+#line 289 "zonetab.list"
+      {gperf_offsetof(stringpool, 268),14400},
+#line 112 "zonetab.list"
+      {gperf_offsetof(stringpool, 269),                  10800},
+#line 111 "zonetab.list"
+      {gperf_offsetof(stringpool, 270),                 14400},
+#line 216 "zonetab.list"
+      {gperf_offsetof(stringpool, 271),36000},
+      {-1},
+#line 311 "zonetab.list"
+      {gperf_offsetof(stringpool, 273),21600},
+#line 66 "zonetab.list"
+      {gperf_offsetof(stringpool, 274),-10*3600},
+#line 151 "zonetab.list"
+      {gperf_offsetof(stringpool, 275),                   20700},
+#line 267 "zonetab.list"
+      {gperf_offsetof(stringpool, 276),-39600},
+#line 225 "zonetab.list"
+      {gperf_offsetof(stringpool, 277),-14400},
+      {-1},
+#line 224 "zonetab.list"
+      {gperf_offsetof(stringpool, 279),-10800},
+#line 67 "zonetab.list"
+      {gperf_offsetof(stringpool, 280),-10*3600},
+#line 237 "zonetab.list"
+      {gperf_offsetof(stringpool, 281),10800},
+      {-1}, {-1},
+#line 297 "zonetab.list"
+      {gperf_offsetof(stringpool, 284),32400},
+#line 175 "zonetab.list"
+      {gperf_offsetof(stringpool, 285),            28800},
+#line 134 "zonetab.list"
+      {gperf_offsetof(stringpool, 286),                    7200},
+#line 149 "zonetab.list"
+      {gperf_offsetof(stringpool, 287),                 23400},
+#line 107 "zonetab.list"
+      {gperf_offsetof(stringpool, 288),13*3600},
+#line 230 "zonetab.list"
+      {gperf_offsetof(stringpool, 289),-10800},
+#line 307 "zonetab.list"
+      {gperf_offsetof(stringpool, 290),18000},
+      {-1}, {-1},
+#line 155 "zonetab.list"
+      {gperf_offsetof(stringpool, 293),              25200},
+#line 258 "zonetab.list"
+      {gperf_offsetof(stringpool, 294),18000},
+#line 227 "zonetab.list"
+      {gperf_offsetof(stringpool, 295),-21600},
+#line 261 "zonetab.list"
+      {gperf_offsetof(stringpool, 296),43200},
+#line 213 "zonetab.list"
+      {gperf_offsetof(stringpool, 297),-3600},
+#line 154 "zonetab.list"
+      {gperf_offsetof(stringpool, 298),         28800},
+      {-1},
+#line 243 "zonetab.list"
+      {gperf_offsetof(stringpool, 300),21600},
+#line 114 "zonetab.list"
+      {gperf_offsetof(stringpool, 301),             34200},
+#line 157 "zonetab.list"
+      {gperf_offsetof(stringpool, 302),                -28800},
+      {-1},
+#line 117 "zonetab.list"
+      {gperf_offsetof(stringpool, 304),         -21600},
+      {-1},
+#line 156 "zonetab.list"
+      {gperf_offsetof(stringpool, 306),             -14400},
+#line 116 "zonetab.list"
+      {gperf_offsetof(stringpool, 307),                  -3600},
+#line 228 "zonetab.list"
+      {gperf_offsetof(stringpool, 308),-32400},
+#line 294 "zonetab.list"
+      {gperf_offsetof(stringpool, 309),18000},
+#line 37 "zonetab.list"
+      {gperf_offsetof(stringpool, 310),   -5*3600},
+#line 137 "zonetab.list"
+      {gperf_offsetof(stringpool, 311),                      7200},
+#line 58 "zonetab.list"
+      {gperf_offsetof(stringpool, 312),-8*3600},
+#line 304 "zonetab.list"
+      {gperf_offsetof(stringpool, 313),28800},
+#line 303 "zonetab.list"
+      {gperf_offsetof(stringpool, 314),32400},
+#line 284 "zonetab.list"
+      {gperf_offsetof(stringpool, 315),14400},
+      {-1},
+#line 295 "zonetab.list"
+      {gperf_offsetof(stringpool, 317),18000},
+      {-1},
+#line 166 "zonetab.list"
+      {gperf_offsetof(stringpool, 319),             7200},
+      {-1}, {-1}, {-1}, {-1},
+#line 97 "zonetab.list"
+      {gperf_offsetof(stringpool, 324),  8*3600},
+      {-1},
+#line 50 "zonetab.list"
+      {gperf_offsetof(stringpool, 326), -(2*3600+1800)},
+#line 285 "zonetab.list"
+      {gperf_offsetof(stringpool, 327),-10800},
+      {-1}, {-1},
+#line 287 "zonetab.list"
+      {gperf_offsetof(stringpool, 330),14400},
+      {-1},
+#line 169 "zonetab.list"
+      {gperf_offsetof(stringpool, 332),                36000},
+      {-1},
+#line 235 "zonetab.list"
+      {gperf_offsetof(stringpool, 334),25200},
+#line 234 "zonetab.list"
+      {gperf_offsetof(stringpool, 335),28800},
+      {-1}, {-1},
+#line 232 "zonetab.list"
+      {gperf_offsetof(stringpool, 338),-14400},
+      {-1}, {-1}, {-1},
+#line 44 "zonetab.list"
+      {gperf_offsetof(stringpool, 342),  -12*3600},
+#line 61 "zonetab.list"
+      {gperf_offsetof(stringpool, 343),-9*3600},
+#line 162 "zonetab.list"
+      {gperf_offsetof(stringpool, 344),             -14400},
+#line 141 "zonetab.list"
+      {gperf_offsetof(stringpool, 345),               -36000},
+      {-1},
+#line 306 "zonetab.list"
+      {gperf_offsetof(stringpool, 347),-10800},
+      {-1},
+#line 305 "zonetab.list"
+      {gperf_offsetof(stringpool, 349),-7200},
+#line 326 "zonetab.list"
+      {gperf_offsetof(stringpool, 350),18000},
+#line 325 "zonetab.list"
+      {gperf_offsetof(stringpool, 351),21600},
+#line 247 "zonetab.list"
+      {gperf_offsetof(stringpool, 352),14400},
+#line 323 "zonetab.list"
+      {gperf_offsetof(stringpool, 353),32400},
+#line 322 "zonetab.list"
+      {gperf_offsetof(stringpool, 354),36000},
+      {-1}, {-1}, {-1},
+#line 63 "zonetab.list"
+      {gperf_offsetof(stringpool, 358), -9*3600},
+#line 144 "zonetab.list"
+      {gperf_offsetof(stringpool, 359),                7200},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 167 "zonetab.list"
+      {gperf_offsetof(stringpool, 365),               21600},
+      {-1},
+#line 180 "zonetab.list"
+      {gperf_offsetof(stringpool, 367),                 32400},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 318 "zonetab.list"
+      {gperf_offsetof(stringpool, 375),25200},
+      {-1},
+#line 115 "zonetab.list"
+      {gperf_offsetof(stringpool, 377),             36000},
+#line 231 "zonetab.list"
+      {gperf_offsetof(stringpool, 378),43200},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 173 "zonetab.list"
+      {gperf_offsetof(stringpool, 387),            -25200},
+      {-1}, {-1}, {-1},
+#line 310 "zonetab.list"
+      {gperf_offsetof(stringpool, 391),36000},
+#line 309 "zonetab.list"
+      {gperf_offsetof(stringpool, 392),39600},
+      {-1}, {-1},
+#line 140 "zonetab.list"
+      {gperf_offsetof(stringpool, 395),                      7200},
+      {-1}, {-1},
+#line 168 "zonetab.list"
+      {gperf_offsetof(stringpool, 398),                  28800},
+#line 290 "zonetab.list"
+      {gperf_offsetof(stringpool, 399),39600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 118 "zonetab.list"
+      {gperf_offsetof(stringpool, 408),              -3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 296 "zonetab.list"
+      {gperf_offsetof(stringpool, 417),46800},
+#line 163 "zonetab.list"
+      {gperf_offsetof(stringpool, 418),                  -39600},
+      {-1}, {-1},
+#line 161 "zonetab.list"
+      {gperf_offsetof(stringpool, 421),             -18000},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 312 "zonetab.list"
+      {gperf_offsetof(stringpool, 427),39600},
+#line 69 "zonetab.list"
+      {gperf_offsetof(stringpool, 428),-12*3600},
+      {-1}, {-1}, {-1},
+#line 136 "zonetab.list"
+      {gperf_offsetof(stringpool, 432),                    43200},
+      {-1}, {-1},
+#line 46 "zonetab.list"
+      {gperf_offsetof(stringpool, 435),  0*3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 145 "zonetab.list"
+      {gperf_offsetof(stringpool, 443),                   32400},
+      {-1},
+#line 131 "zonetab.list"
+      {gperf_offsetof(stringpool, 445),                7200},
+      {-1}, {-1}, {-1},
+#line 292 "zonetab.list"
+      {gperf_offsetof(stringpool, 449),10800},
+      {-1}, {-1},
+#line 150 "zonetab.list"
+      {gperf_offsetof(stringpool, 452),         21600},
+      {-1}, {-1},
+#line 302 "zonetab.list"
+      {gperf_offsetof(stringpool, 455),43200},
+      {-1}, {-1},
+#line 176 "zonetab.list"
+      {gperf_offsetof(stringpool, 458),        3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 135 "zonetab.list"
+      {gperf_offsetof(stringpool, 466),            18000},
+      {-1},
+#line 174 "zonetab.list"
+      {gperf_offsetof(stringpool, 468),             36000},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 324 "zonetab.list"
+      {gperf_offsetof(stringpool, 476),36000},
+#line 172 "zonetab.list"
+      {gperf_offsetof(stringpool, 477),             -18000},
+      {-1}, {-1}, {-1}, {-1},
+#line 160 "zonetab.list"
+      {gperf_offsetof(stringpool, 482),             -10800},
+      {-1}, {-1},
+#line 62 "zonetab.list"
+      {gperf_offsetof(stringpool, 485), -9*3600},
+#line 159 "zonetab.list"
+      {gperf_offsetof(stringpool, 486),                 10800},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 233 "zonetab.list"
+      {gperf_offsetof(stringpool, 492),28800},
+      {-1}, {-1}, {-1}, {-1},
+#line 158 "zonetab.list"
+      {gperf_offsetof(stringpool, 497),                  3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-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 177 "zonetab.list"
+      {gperf_offsetof(stringpool, 540),                3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+#line 59 "zonetab.list"
+      {gperf_offsetof(stringpool, 563), -8*3600},
+      {-1}, {-1},
+#line 104 "zonetab.list"
+      {gperf_offsetof(stringpool, 566),12*3600},
+#line 139 "zonetab.list"
+      {gperf_offsetof(stringpool, 567),                   0},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 138 "zonetab.list"
+      {gperf_offsetof(stringpool, 619),              -10800}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register unsigned int key = hash (str, len);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          register int o = wordlist[key].name;
+          if (o >= 0)
+            {
+              register const char *s = o + stringpool;
+
+              if ((((unsigned char)*str ^ (unsigned char)*s) & ~32) == 0 && !gperf_case_strncmp (str, s, len) && s[len] == '\0')
+                return &wordlist[key];
+            }
+        }
+    }
+  return 0;
+}
+#line 327 "zonetab.list"
+
diff --git a/ext/date/zonetab.list b/ext/date/zonetab.list
new file mode 100644
index 0000000000..0618546eb0
--- /dev/null
+++ b/ext/date/zonetab.list
@@ -0,0 +1,327 @@
+%{
+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
+acdt,37800
+acst,34200
+act,-18000
+acwst,31500
+aedt,39600
+aest,36000
+aft,16200
+almt,21600
+anast,43200
+anat,43200
+aoe,-43200
+aqtt,18000
+awdt,32400
+awst,28800
+azost,0
+azot,-3600
+azst,18000
+azt,14400
+bnt,28800
+bot,-14400
+btt,21600
+cast,28800
+chadt,49500
+chast,45900
+chost,32400
+chot,28800
+chst,36000
+chut,36000
+cidst,-14400
+cist,-18000
+ckt,-36000
+cot,-18000
+cvt,-3600
+cxt,25200
+davt,25200
+ddut,36000
+easst,-18000
+ect,-18000
+egst,0
+egt,-3600
+fet,10800
+fjst,46800
+fjt,43200
+fkst,-10800
+fkt,-14400
+fnt,-7200
+galt,-21600
+gamt,-32400
+get,14400
+gft,-10800
+gilt,43200
+gyt,-14400
+hkt,28800
+hovst,28800
+hovt,25200
+ict,25200
+idt,10800
+iot,21600
+irdt,16200
+irkst,32400
+irkt,28800
+irst,12600
+kgt,21600
+kost,39600
+krast,28800
+krat,25200
+kuyt,14400
+lhdt,39600
+lhst,37800
+lint,50400
+magst,43200
+magt,39600
+mart,-30600
+mawt,18000
+mht,43200
+mmt,23400
+mut,14400
+mvt,18000
+myt,28800
+nct,39600
+nfdt,43200
+nft,39600
+novst,25200
+novt,25200
+npt,20700
+nrt,43200
+nut,-39600
+omsst,25200
+omst,21600
+orat,18000
+pet,-18000
+petst,43200
+pett,43200
+pgt,36000
+phot,46800
+pht,28800
+pkt,18000
+pmdt,-7200
+pmst,-10800
+pont,39600
+pwt,32400
+pyst,-10800
+qyzt,21600
+ret,14400
+rott,-10800
+sakt,39600
+samt,14400
+sbt,39600
+sct,14400
+sret,39600
+srt,-10800
+syot,10800
+taht,-36000
+tft,18000
+tjt,18000
+tkt,46800
+tlt,32400
+tmt,18000
+tost,50400
+tot,46800
+trt,10800
+tvt,43200
+ulast,32400
+ulat,28800
+uyst,-7200
+uyt,-10800
+uzt,18000
+vet,-14400
+vlast,39600
+vlat,36000
+vost,21600
+vut,39600
+wakt,43200
+warst,-10800
+wft,43200
+wgst,-7200
+wgt,-10800
+wib,25200
+wit,32400
+wita,28800
+wt,0
+yakst,36000
+yakt,32400
+yapt,36000
+yekst,21600
+yekt,18000
+%%
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index 6d5396066d..bc1d527735 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -21,6 +21,15 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#define DSIZE_TYPE TYPEOF_DATUM_DSIZE
+#if SIZEOF_DATUM_DSIZE > SIZEOF_INT
+# define RSTRING_DSIZE(s) RSTRING_LEN(s)
+# define TOO_LONG(n) ((void)(n),0)
+#else
+# define RSTRING_DSIZE(s) RSTRING_LENINT(s)
+# define TOO_LONG(n) ((long)(+(DSIZE_TYPE)(n)) != (n))
+#endif
+
 static VALUE rb_cDBM, rb_eDBMError;
 
 #define RUBY_DBM_RW_BIT 0x20000000
@@ -30,32 +39,50 @@ struct dbmdata {
     DBM *di_dbm;
 };
 
+NORETURN(static void closed_dbm(void));
+
 static void
 closed_dbm(void)
 {
     rb_raise(rb_eDBMError, "closed DBM file");
 }
 
-#define GetDBM(obj, dbmp) {\
-    Data_Get_Struct((obj), struct dbmdata, (dbmp));\
-    if ((dbmp) == 0) closed_dbm();\
+#define GetDBM(obj, dbmp) do {\
+    TypedData_Get_Struct((obj), struct dbmdata, &dbm_type, (dbmp));\
     if ((dbmp)->di_dbm == 0) closed_dbm();\
-}
+} while (0)
 
-#define GetDBM2(obj, data, dbm) {\
-    GetDBM((obj), (data));\
-    (dbm) = dbmp->di_dbm;\
-}
+#define GetDBM2(obj, dbmp, dbm) do {\
+    GetDBM((obj), (dbmp));\
+    (dbm) = (dbmp)->di_dbm;\
+} while (0)
 
 static void
-free_dbm(struct dbmdata *dbmp)
+free_dbm(void *ptr)
 {
-    if (dbmp) {
-	if (dbmp->di_dbm) dbm_close(dbmp->di_dbm);
-	xfree(dbmp);
-    }
+    struct dbmdata *dbmp = ptr;
+    if (dbmp->di_dbm)
+	dbm_close(dbmp->di_dbm);
+    xfree(dbmp);
 }
 
+static size_t
+memsize_dbm(const void *ptr)
+{
+    const struct dbmdata *dbmp = ptr;
+    size_t 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
@@ -85,9 +112,7 @@ fdbm_closed(VALUE obj)
 {
     struct dbmdata *dbmp;
 
-    Data_Get_Struct(obj, struct dbmdata, dbmp);
-    if (dbmp == 0)
-	return Qtrue;
+    TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp);
     if (dbmp->di_dbm == 0)
 	return Qtrue;
 
@@ -97,7 +122,9 @@ fdbm_closed(VALUE obj)
 static VALUE
 fdbm_alloc(VALUE klass)
 {
-    return Data_Wrap_Struct(klass, 0, free_dbm, 0);
+    struct dbmdata *dbmp;
+
+    return TypedData_Make_Struct(klass, struct dbmdata, &dbm_type, dbmp);
 }
 
 /*
@@ -116,12 +143,12 @@ fdbm_alloc(VALUE klass)
 static VALUE
 fdbm_initialize(int argc, VALUE *argv, VALUE obj)
 {
-    volatile VALUE file;
-    VALUE vmode, vflags;
+    VALUE file, vmode, vflags;
     DBM *dbm;
     struct dbmdata *dbmp;
     int mode, flags = 0;
 
+    TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp);
     if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) {
 	mode = 0666;		/* default value */
     }
@@ -137,30 +164,71 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
 
     FilePathValue(file);
 
+    /*
+     * Note:
+     * gdbm 1.10 works with O_CLOEXEC.  gdbm 1.9.1 silently ignore it.
+     */
+#ifndef O_CLOEXEC
+#   define O_CLOEXEC 0
+#endif
+
     if (flags & RUBY_DBM_RW_BIT) {
         flags &= ~RUBY_DBM_RW_BIT;
-        dbm = dbm_open(RSTRING_PTR(file), flags, mode);
+        dbm = dbm_open(RSTRING_PTR(file), flags|O_CLOEXEC, mode);
     }
     else {
         dbm = 0;
         if (mode >= 0) {
-            dbm = dbm_open(RSTRING_PTR(file), O_RDWR|O_CREAT, mode);
+            dbm = dbm_open(RSTRING_PTR(file), O_RDWR|O_CREAT|O_CLOEXEC, mode);
         }
         if (!dbm) {
-            dbm = dbm_open(RSTRING_PTR(file), O_RDWR, 0);
+            dbm = dbm_open(RSTRING_PTR(file), O_RDWR|O_CLOEXEC, 0);
         }
         if (!dbm) {
-            dbm = dbm_open(RSTRING_PTR(file), O_RDONLY, 0);
+            dbm = dbm_open(RSTRING_PTR(file), O_RDONLY|O_CLOEXEC, 0);
         }
     }
 
+    if (dbm) {
+	/*
+	 * History of dbm_pagfno() and dbm_dirfno() in ndbm and its compatibles.
+	 * (dbm_pagfno() and dbm_dirfno() is not standardized.)
+	 *
+	 * 1986: 4.3BSD provides ndbm.
+	 *       It provides dbm_pagfno() and dbm_dirfno() as macros.
+	 * 1991: gdbm-1.5 provides them as functions.
+	 *       They returns a same descriptor.
+	 *       (Earlier releases may have the functions too.)
+	 * 1991: Net/2 provides Berkeley DB.
+	 *       It doesn't provide dbm_pagfno() and dbm_dirfno().
+	 * 1992: 4.4BSD Alpha provides Berkeley DB with dbm_dirfno() as a function.
+	 *       dbm_pagfno() is a macro as DBM_PAGFNO_NOT_AVAILABLE.
+	 * 1997: Berkeley DB 2.0 is released by Sleepycat Software, Inc.
+	 *       It defines dbm_pagfno() and dbm_dirfno() as macros.
+	 * 2011: gdbm-1.9 creates a separate dir file.
+	 *       dbm_pagfno() and dbm_dirfno() returns different descriptors.
+	 */
+#if defined(HAVE_DBM_PAGFNO)
+        rb_fd_fix_cloexec(dbm_pagfno(dbm));
+#endif
+#if defined(HAVE_DBM_DIRFNO)
+        rb_fd_fix_cloexec(dbm_dirfno(dbm));
+#endif
+
+#if defined(RUBYDBM_DB_HEADER) && defined(HAVE_TYPE_DBC)
+	/* Disable Berkeley DB error messages such as:
+	 * DB->put: attempt to modify a read-only database */
+        ((DBC*)dbm)->dbp->set_errfile(((DBC*)dbm)->dbp, NULL);
+#endif
+    }
+
     if (!dbm) {
 	if (mode == -1) return Qnil;
-	rb_sys_fail(RSTRING_PTR(file));
+	rb_sys_fail_str(file);
     }
 
-    dbmp = ALLOC(struct dbmdata);
-    DATA_PTR(obj) = dbmp;
+    if (dbmp->di_dbm)
+	dbm_close(dbmp->di_dbm);
     dbmp->di_dbm = dbm;
     dbmp->di_size = -1;
 
@@ -178,7 +246,7 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
 static VALUE
 fdbm_s_open(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
+    VALUE obj = fdbm_alloc(klass);
 
     if (NIL_P(fdbm_initialize(argc, argv, obj))) {
 	return Qnil;
@@ -197,19 +265,25 @@ fdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
     datum key, value;
     struct dbmdata *dbmp;
     DBM *dbm;
+    long len;
 
     ExportStringValue(keystr);
+    len = RSTRING_LEN(keystr);
+    if (TOO_LONG(len)) goto not_found;
     key.dptr = RSTRING_PTR(keystr);
-    key.dsize = (int)RSTRING_LEN(keystr);
+    key.dsize = (DSIZE_TYPE)len;
 
     GetDBM2(obj, dbmp, dbm);
     value = dbm_fetch(dbm, key);
     if (value.dptr == 0) {
-	if (ifnone == Qnil && rb_block_given_p())
-	    return rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
+      not_found:
+	if (NIL_P(ifnone) && rb_block_given_p()) {
+	    keystr = rb_str_dup(keystr);
+	    return rb_yield(keystr);
+	}
 	return ifnone;
     }
-    return rb_tainted_str_new(value.dptr, value.dsize);
+    return rb_str_new(value.dptr, value.dsize);
 }
 
 /*
@@ -258,17 +332,18 @@ fdbm_key(VALUE obj, VALUE valstr)
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
+    long len;
 
     ExportStringValue(valstr);
-    val.dptr = RSTRING_PTR(valstr);
-    val.dsize = (int)RSTRING_LEN(valstr);
+    len = RSTRING_LEN(valstr);
+    if (TOO_LONG(len)) return Qnil;
 
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	if ((long)val.dsize == (int)RSTRING_LEN(valstr) &&
+	if ((long)val.dsize == RSTRING_LEN(valstr) &&
 	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0) {
-	    return rb_tainted_str_new(key.dptr, key.dsize);
+	    return rb_str_new(key.dptr, key.dsize);
 	}
     }
     return Qnil;
@@ -301,8 +376,8 @@ fdbm_select(VALUE obj)
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	VALUE assoc, v;
 	val = dbm_fetch(dbm, key);
-	assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
-			     rb_tainted_str_new(val.dptr, val.dsize));
+	assoc = rb_assoc_new(rb_str_new(key.dptr, key.dsize),
+			     rb_str_new(val.dptr, val.dsize));
 	v = rb_yield(assoc);
 	if (RTEST(v)) {
 	    rb_ary_push(new, assoc);
@@ -335,7 +410,6 @@ fdbm_values_at(int argc, VALUE *argv, VALUE obj)
 static void
 fdbm_modify(VALUE obj)
 {
-    rb_secure(4);
     if (OBJ_FROZEN(obj)) rb_error_frozen("DBM");
 }
 
@@ -352,22 +426,26 @@ fdbm_delete(VALUE obj, VALUE keystr)
     struct dbmdata *dbmp;
     DBM *dbm;
     VALUE valstr;
+    long len;
 
     fdbm_modify(obj);
     ExportStringValue(keystr);
+    len = RSTRING_LEN(keystr);
+    if (TOO_LONG(len)) goto not_found;
     key.dptr = RSTRING_PTR(keystr);
-    key.dsize = (int)RSTRING_LEN(keystr);
+    key.dsize = (DSIZE_TYPE)len;
 
     GetDBM2(obj, dbmp, dbm);
 
     value = dbm_fetch(dbm, key);
     if (value.dptr == 0) {
+      not_found:
 	if (rb_block_given_p()) return rb_yield(keystr);
 	return Qnil;
     }
 
     /* need to save value before dbm_delete() */
-    valstr = rb_tainted_str_new(value.dptr, value.dsize);
+    valstr = rb_str_new(value.dptr, value.dsize);
 
     if (dbm_delete(dbm, key)) {
 	dbmp->di_size = -1;
@@ -402,8 +480,8 @@ fdbm_shift(VALUE obj)
     key = dbm_firstkey(dbm);
     if (!key.dptr) return Qnil;
     val = dbm_fetch(dbm, key);
-    keystr = rb_tainted_str_new(key.dptr, key.dsize);
-    valstr = rb_tainted_str_new(val.dptr, val.dsize);
+    keystr = rb_str_new(key.dptr, key.dsize);
+    valstr = rb_str_new(val.dptr, val.dsize);
     dbm_delete(dbm, key);
 
     return rb_assoc_new(keystr, valstr);
@@ -424,9 +502,9 @@ fdbm_delete_if(VALUE obj)
     struct dbmdata *dbmp;
     DBM *dbm;
     VALUE keystr, valstr;
-    VALUE ret, ary = rb_ary_new();
-    int i, status = 0;
-    long n;
+    VALUE ret, ary = rb_ary_tmp_new(0);
+    int status = 0;
+    long i, n;
 
     fdbm_modify(obj);
     GetDBM2(obj, dbmp, dbm);
@@ -435,8 +513,9 @@ fdbm_delete_if(VALUE obj)
 
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	keystr = rb_tainted_str_new(key.dptr, key.dsize);
-	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	keystr = rb_str_new(key.dptr, key.dsize);
+	OBJ_FREEZE(keystr);
+	valstr = rb_str_new(val.dptr, val.dsize);
         ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
         if (status != 0) break;
 	if (RTEST(ret)) rb_ary_push(ary, keystr);
@@ -444,16 +523,16 @@ fdbm_delete_if(VALUE obj)
     }
 
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	keystr = RARRAY_PTR(ary)[i];
-	ExportStringValue(keystr);
+	keystr = RARRAY_AREF(ary, i);
 	key.dptr = RSTRING_PTR(keystr);
-	key.dsize = (int)RSTRING_LEN(keystr);
+	key.dsize = (DSIZE_TYPE)RSTRING_LEN(keystr);
 	if (dbm_delete(dbm, key)) {
 	    rb_raise(rb_eDBMError, "dbm_delete failed");
 	}
     }
     if (status) rb_jump_tag(status);
     if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary);
+    rb_ary_clear(ary);
 
     return obj;
 }
@@ -503,8 +582,8 @@ fdbm_invert(VALUE obj)
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	keystr = rb_tainted_str_new(key.dptr, key.dsize);
-	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	keystr = rb_str_new(key.dptr, key.dsize);
+	valstr = rb_str_new(val.dptr, val.dsize);
 	rb_hash_aset(hash, valstr, keystr);
     }
     return hash;
@@ -513,13 +592,15 @@ fdbm_invert(VALUE obj)
 static VALUE fdbm_store(VALUE,VALUE,VALUE);
 
 static VALUE
-update_i(VALUE pair, VALUE dbm)
+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]");
     }
-    fdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
+    ptr = RARRAY_CONST_PTR(pair);
+    fdbm_store(dbm, ptr[0], ptr[1]);
     return Qnil;
 }
 
@@ -574,17 +655,15 @@ fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
     valstr = rb_obj_as_string(valstr);
 
     key.dptr = RSTRING_PTR(keystr);
-    key.dsize = (int)RSTRING_LEN(keystr);
+    key.dsize = RSTRING_DSIZE(keystr);
 
     val.dptr = RSTRING_PTR(valstr);
-    val.dsize = (int)RSTRING_LEN(valstr);
+    val.dsize = RSTRING_DSIZE(valstr);
 
     GetDBM2(obj, dbmp, dbm);
     dbmp->di_size = -1;
     if (dbm_store(dbm, key, val, DBM_REPLACE)) {
-#ifdef HAVE_DBM_CLEARERR
 	dbm_clearerr(dbm);
-#endif
 	if (errno == EPERM) rb_sys_fail(0);
 	rb_raise(rb_eDBMError, "dbm_store failed");
     }
@@ -595,6 +674,7 @@ fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 /*
  * call-seq:
  *   dbm.length -> integer
+ *   dbm.size -> integer
  *
  * Returns the number of entries in the database.
  */
@@ -629,21 +709,20 @@ fdbm_empty_p(VALUE obj)
     datum key;
     struct dbmdata *dbmp;
     DBM *dbm;
-    int i = 0;
 
     GetDBM2(obj, dbmp, dbm);
     if (dbmp->di_size < 0) {
 	dbm = dbmp->di_dbm;
 
 	for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-	    i++;
+	    return Qfalse;
 	}
     }
     else {
-	i = (int)dbmp->di_size;
+	if (dbmp->di_size)
+	    return Qfalse;
     }
-    if (i == 0) return Qtrue;
-    return Qfalse;
+    return Qtrue;
 }
 
 /*
@@ -664,7 +743,7 @@ fdbm_each_value(VALUE obj)
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
+	rb_yield(rb_str_new(val.dptr, val.dsize));
 	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
@@ -687,7 +766,7 @@ fdbm_each_key(VALUE obj)
 
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-	rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
+	rb_yield(rb_str_new(key.dptr, key.dsize));
 	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
@@ -714,8 +793,8 @@ fdbm_each_pair(VALUE obj)
 
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	keystr = rb_tainted_str_new(key.dptr, key.dsize);
-	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	keystr = rb_str_new(key.dptr, key.dsize);
+	valstr = rb_str_new(val.dptr, val.dsize);
 	rb_yield(rb_assoc_new(keystr, valstr));
 	GetDBM2(obj, dbmp, dbm);
     }
@@ -741,7 +820,7 @@ fdbm_keys(VALUE obj)
 
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-	rb_ary_push(ary, rb_tainted_str_new(key.dptr, key.dsize));
+	rb_ary_push(ary, rb_str_new(key.dptr, key.dsize));
     }
 
     return ary;
@@ -765,7 +844,7 @@ fdbm_values(VALUE obj)
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	rb_ary_push(ary, rb_tainted_str_new(val.dptr, val.dsize));
+	rb_ary_push(ary, rb_str_new(val.dptr, val.dsize));
     }
 
     return ary;
@@ -773,7 +852,10 @@ fdbm_values(VALUE obj)
 
 /*
  * call-seq:
+ *   dbm.include?(key) -> boolean
  *   dbm.has_key?(key) -> boolean
+ *   dbm.member?(key) -> boolean
+ *   dbm.key?(key) -> boolean
  *
  * Returns true if the database contains the specified key, false otherwise.
  */
@@ -783,10 +865,13 @@ fdbm_has_key(VALUE obj, VALUE keystr)
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
+    long len;
 
     ExportStringValue(keystr);
+    len = RSTRING_LEN(keystr);
+    if (TOO_LONG(len)) return Qfalse;
     key.dptr = RSTRING_PTR(keystr);
-    key.dsize = (int)RSTRING_LEN(keystr);
+    key.dsize = (DSIZE_TYPE)len;
 
     GetDBM2(obj, dbmp, dbm);
     val = dbm_fetch(dbm, key);
@@ -797,6 +882,7 @@ fdbm_has_key(VALUE obj, VALUE keystr)
 /*
  * call-seq:
  *   dbm.has_value?(value) -> boolean
+ *   dbm.value?(value) -> boolean
  *
  * Returns true if the database contains the specified string value, false
  * otherwise.
@@ -807,15 +893,18 @@ fdbm_has_value(VALUE obj, VALUE valstr)
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
+    long len;
 
     ExportStringValue(valstr);
+    len = RSTRING_LEN(valstr);
+    if (TOO_LONG(len)) return Qfalse;
     val.dptr = RSTRING_PTR(valstr);
-    val.dsize = (int)RSTRING_LEN(valstr);
+    val.dsize = (DSIZE_TYPE)len;
 
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	if (val.dsize == (int)RSTRING_LEN(valstr) &&
+	if ((DSIZE_TYPE)val.dsize == (DSIZE_TYPE)RSTRING_LEN(valstr) &&
 	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
 	    return Qtrue;
     }
@@ -841,8 +930,8 @@ fdbm_to_a(VALUE obj)
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	rb_ary_push(ary, rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
-				      rb_tainted_str_new(val.dptr, val.dsize)));
+	rb_ary_push(ary, rb_assoc_new(rb_str_new(key.dptr, key.dsize),
+				      rb_str_new(val.dptr, val.dsize)));
     }
 
     return ary;
@@ -867,8 +956,8 @@ fdbm_to_hash(VALUE obj)
     hash = rb_hash_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	rb_hash_aset(hash, rb_tainted_str_new(key.dptr, key.dsize),
-		           rb_tainted_str_new(val.dptr, val.dsize));
+	rb_hash_aset(hash, rb_str_new(key.dptr, key.dsize),
+		           rb_str_new(val.dptr, val.dsize));
     }
 
     return hash;
@@ -888,8 +977,7 @@ fdbm_reject(VALUE obj)
 }
 
 /*
- * Documented by mathew meta@pobox.com.
- * = Introduction
+ * == Introduction
  *
  * The DBM class provides a wrapper to a Unix-style
  * {dbm}[http://en.wikipedia.org/wiki/Dbm] or Database Manager library.
@@ -901,10 +989,13 @@ fdbm_reject(VALUE obj)
  * The exact library used depends on how Ruby was compiled. It could be any
  * of the following:
  *
+ * - The original ndbm library is released in 4.3BSD.
+ *   It is based on dbm library in Unix Version 7 but has different API to
+ *   support multiple databases in a process.
  * - {Berkeley DB}[http://en.wikipedia.org/wiki/Berkeley_DB] versions
- *   1 thru 5, also known as BDB and Sleepycat DB, now owned by Oracle
+ *   1 thru 6, also known as BDB and Sleepycat DB, now owned by Oracle
  *   Corporation.
- * - ndbm, aka Berkeley DB 1.x, still found in FreeBSD and OpenBSD.
+ * - Berkeley DB 1.x, still found in 4.4BSD derivatives (FreeBSD, OpenBSD, etc).
  * - {gdbm}[http://www.gnu.org/software/gdbm/], the GNU implementation of dbm.
  * - {qdbm}[http://fallabs.com/qdbm/index.html], another open source
  *   reimplementation of dbm.
@@ -912,7 +1003,7 @@ fdbm_reject(VALUE obj)
  * All of these dbm implementations have their own Ruby interfaces
  * available, which provide richer (but varying) APIs.
  *
- * = Cautions
+ * == Cautions
  *
  * Before you decide to use DBM, there are some issues you should consider:
  *
@@ -937,10 +1028,10 @@ fdbm_reject(VALUE obj)
  * important data. It is probably best used as a fast and easy alternative
  * to a Hash for processing large amounts of data.
  *
- * = Example
+ * == Example
  *
  *  require 'dbm'
- *  db = DBM.open('rfcs', 666, DBM::CREATRW)
+ *  db = DBM.open('rfcs', 0666, 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'
@@ -985,9 +1076,9 @@ Init_dbm(void)
     rb_define_method(rb_cDBM, "reject!", fdbm_delete_if, 0);
     rb_define_method(rb_cDBM, "reject", fdbm_reject, 0);
     rb_define_method(rb_cDBM, "clear", fdbm_clear, 0);
-    rb_define_method(rb_cDBM,"invert", fdbm_invert, 0);
-    rb_define_method(rb_cDBM,"update", fdbm_update, 1);
-    rb_define_method(rb_cDBM,"replace", fdbm_replace, 1);
+    rb_define_method(rb_cDBM, "invert", fdbm_invert, 0);
+    rb_define_method(rb_cDBM, "update", fdbm_update, 1);
+    rb_define_method(rb_cDBM, "replace", fdbm_replace, 1);
 
     rb_define_method(rb_cDBM, "include?", fdbm_has_key, 1);
     rb_define_method(rb_cDBM, "has_key?", fdbm_has_key, 1);
@@ -1016,10 +1107,50 @@ Init_dbm(void)
      */
     rb_define_const(rb_cDBM, "NEWDB",   INT2FIX(O_RDWR|O_CREAT|O_TRUNC|RUBY_DBM_RW_BIT));
 
-#ifdef DB_VERSION_STRING
-    /* The version of the dbm library, if using Berkeley DB */
-    rb_define_const(rb_cDBM, "VERSION",  rb_str_new2(DB_VERSION_STRING));
+    {
+        VALUE version;
+#if defined(_DBM_IOERR)
+        version = rb_str_new2("ndbm (4.3BSD)");
+#elif defined(RUBYDBM_GDBM_HEADER)
+#  if defined(HAVE_DECLARED_LIBVAR_GDBM_VERSION)
+        /* since gdbm 1.9 */
+        version = rb_str_new2(gdbm_version);
+#  elif defined(HAVE_UNDECLARED_LIBVAR_GDBM_VERSION)
+        /* ndbm.h doesn't declare gdbm_version until gdbm 1.8.3.
+         * See extconf.rb for more information. */
+        RUBY_EXTERN char *gdbm_version;
+        version = rb_str_new2(gdbm_version);
+#  else
+        version = rb_str_new2("GDBM (unknown)");
+#  endif
+#elif defined(RUBYDBM_DB_HEADER)
+#  if defined(HAVE_DB_VERSION)
+        /* The version of the dbm library, if using Berkeley DB */
+        version = rb_str_new2(db_version(NULL, NULL, NULL));
+#  else
+        version = rb_str_new2("Berkeley DB (unknown)");
+#  endif
+#elif defined(_RELIC_H)
+#  if defined(HAVE_DPVERSION)
+        version = rb_sprintf("QDBM %s", dpversion);
+#  else
+        version = rb_str_new2("QDBM (unknown)");
+#  endif
 #else
-    rb_define_const(rb_cDBM, "VERSION",  rb_str_new2("unknown"));
+        version = rb_str_new2("ndbm (unknown)");
 #endif
+        /*
+         * Identifies ndbm library version.
+         *
+         * Examples:
+         *
+         * - "ndbm (4.3BSD)"
+         * - "Berkeley DB 4.8.30: (April  9, 2010)"
+         * - "Berkeley DB (unknown)" (4.4BSD, maybe)
+         * - "GDBM version 1.8.3. 10/15/2002 (built Jul  1 2011 12:32:45)"
+         * - "QDBM 1.8.78"
+         *
+         */
+        rb_define_const(rb_cDBM, "VERSION", version);
+    }
 }
diff --git a/ext/dbm/dbm.gemspec b/ext/dbm/dbm.gemspec
new file mode 100644
index 0000000000..9de425b521
--- /dev/null
+++ b/ext/dbm/dbm.gemspec
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+Gem::Specification.new do |s|
+  s.name = "dbm"
+  s.version = '1.1.0'
+  s.summary = "Provides a wrapper for the UNIX-style Database Manager Library"
+  s.description = "Provides a wrapper for the UNIX-style Database Manager Library"
+
+  s.require_path = %w{lib}
+  s.files = %w{ext/dbm/extconf.rb ext/dbm/dbm.c}
+  s.extensions = %w{ext/dbm/extconf.rb}
+  s.required_ruby_version = ">= 2.3.0"
+
+  s.authors = ["Yukihiro Matsumoto"]
+  s.email = ["matz@ruby-lang.org"]
+  s.homepage = "https://github.com/ruby/dbm"
+  s.license = "BSD-2-Clause"
+
+  s.add_development_dependency "rake-compiler"
+  s.add_development_dependency "test-unit"
+end
diff --git a/ext/dbm/depend b/ext/dbm/depend
index 5fae80b096..192527a8eb 100644
--- a/ext/dbm/depend
+++ b/ext/dbm/depend
@@ -1 +1,14 @@
-dbm.o: dbm.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+# AUTOGENERATED DEPENDENCIES START
+dbm.o: $(RUBY_EXTCONF_H)
+dbm.o: $(arch_hdrdir)/ruby/config.h
+dbm.o: $(hdrdir)/ruby.h
+dbm.o: $(hdrdir)/ruby/assert.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: dbm.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 91d393b211..c9a5518bf6 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -1,3 +1,22 @@
+# frozen_string_literal: true
+# configure option:
+#   --with-dbm-type=COMMA-SEPARATED-NDBM-TYPES
+#
+# ndbm type:
+#   libc        ndbm compatible library in libc.
+#   db          Berkeley DB (libdb)
+#   db2         Berkeley DB (libdb2)
+#   db1         Berkeley DB (libdb1)
+#   db6         Berkeley DB (libdb6)
+#   db5         Berkeley DB (libdb5)
+#   db4         Berkeley DB (libdb4)
+#   db3         Berkeley DB (libdb3)
+#   gdbm_compat GDBM since 1.8.1 (libgdbm_compat)
+#   gdbm        GDBM until 1.8.0 (libgdbm)
+#   qdbm        QDBM (libqdbm)
+#   ndbm        Some legacy OS may have libndbm.
+
+# :stopdoc:
 require 'mkmf'
 
 dir_config("dbm")
@@ -5,53 +24,269 @@ dir_config("dbm")
 if dblib = with_config("dbm-type", nil)
   dblib = dblib.split(/[ ,]+/)
 else
-  dblib = %w(db db2 db1 db5 db4 db3 dbm gdbm gdbm_compat qdbm)
+  dblib = %w(libc db db2 db1 db6 db5 db4 db3 gdbm_compat gdbm qdbm)
 end
 
 headers = {
+  "libc" => ["ndbm.h"], # 4.3BSD original ndbm, Berkeley DB 1 in 4.4BSD libc.
   "db" => ["db.h"],
   "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
   "db2" => ["db2/db.h", "db2.h", "db.h"],
   "db3" => ["db3/db.h", "db3.h", "db.h"],
   "db4" => ["db4/db.h", "db4.h", "db.h"],
   "db5" => ["db5/db.h", "db5.h", "db.h"],
-  "dbm" => ["ndbm.h"],
-  "gdbm" => ["gdbm-ndbm.h", "ndbm.h", "gdbm/ndbm.h"],
-  "gdbm_compat" => ["gdbm-ndbm.h", "ndbm.h", "gdbm/ndbm.h"],
-  "qdbm" => ["relic.h", "qdbm/relic.h"],
+  "db6" => ["db6/db.h", "db6.h", "db.h"],
+  "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1
+  "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0
+  "qdbm" => ["qdbm/relic.h", "relic.h"],
+}
+
+class << headers
+  attr_accessor :found
+  attr_accessor :defs
+end
+headers.found = []
+headers.defs = nil
+
+def headers.db_check(db, hdr)
+  old_libs = $libs.dup
+  old_defs = $defs.dup
+  result = db_check2(db, hdr)
+  if !result
+    $libs = old_libs
+    $defs = old_defs
+  end
+  result
+end
+
+def have_declared_libvar(var, headers = nil, opt = "", &b)
+  checking_for checking_message([*var].compact.join(' '), headers, opt) do
+    try_declared_libvar(var, headers, opt, &b)
+  end
+end
+
+def try_declared_libvar(var, headers = nil, opt = "", &b)
+  if try_link(<<"SRC", opt, &b)
+#{cpp_include(headers)}
+/*top*/
+int main(int argc, char *argv[]) {
+  void *conftest_var = &#{var};
+  return 0;
 }
+SRC
+    $defs.push(format("-DHAVE_DECLARED_LIBVAR_%s", var.tr_cpp))
+    true
+  else
+    false
+  end
+end
+
+def have_undeclared_libvar(var, headers = nil, opt = "", &b)
+  checking_for checking_message([*var].compact.join(' '), headers, opt) do
+    try_undeclared_libvar(var, headers, opt, &b)
+  end
+end
+
+def try_undeclared_libvar(var, headers = nil, opt = "", &b)
+  var, type = *var
+  if try_link(<<"SRC", opt, &b)
+#{cpp_include(headers)}
+/*top*/
+int main(int argc, char *argv[]) {
+  typedef #{type || 'int'} conftest_type;
+  extern conftest_type #{var};
+  conftest_type *conftest_var = &#{var};
+  return 0;
+}
+SRC
+    $defs.push(format("-DHAVE_UNDECLARED_LIBVAR_%s", var.tr_cpp))
+    true
+  else
+    false
+  end
+end
+
+def have_empty_macro_dbm_clearerr(headers = nil, opt = "", &b)
+  checking_for checking_message('empty macro of dbm_clearerr(foobarbaz)',
+                                headers, opt) do
+    try_toplevel('dbm_clearerr(foobarbaz)', headers, opt, &b)
+  end
+end
+
+def try_toplevel(src, headers = nil, opt = "", &b)
+  if try_compile(<<"SRC", opt, &b)
+#{cpp_include(headers)}
+/*top*/
+#{src}
+SRC
+    true
+  else
+    false
+  end
+end
+
+
+def headers.db_check2(db, hdr)
+  $defs.push(%{-DRUBYDBM_DBM_HEADER='"#{hdr}"'})
+  $defs.push(%{-DRUBYDBM_DBM_TYPE='"#{db}"'})
 
-def headers.db_check(db)
-  db_prefix = nil
-  have_gdbm = false
   hsearch = nil
 
   case db
-  when /^db[2-5]?$/
-    db_prefix = "__db_n"
-    hsearch = "-DDB_DBM_HSEARCH "
-  when "gdbm"
-    have_gdbm = true
+  when /^db[2-6]?$/
+    hsearch = "-DDB_DBM_HSEARCH"
   when "gdbm_compat"
-    have_gdbm = true
     have_library("gdbm") or return false
   end
-  db_prefix ||= ""
 
-  if (have_library(db, db_prefix+"dbm_open") || have_func(db_prefix+"dbm_open")) and
-      hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", h, hsearch)} or
-      hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", ["db.h", h], hsearch)}
-    have_func(db_prefix+"dbm_clearerr") unless have_gdbm
-    $defs << hsearch if hsearch
-    $defs << '-DDBM_HDR="<'+hdr+'>"'
-    true
-  else
-    false
+  if !have_type("DBM", hdr, hsearch)
+    return false
+  end
+
+  # 'libc' means ndbm is provided by libc.
+  # 4.3BSD original ndbm is contained in libc.
+  # 4.4BSD (and its derivatives such as NetBSD) contains Berkeley DB 1 in libc.
+  if !(db == 'libc' ? have_func('dbm_open("", 0, 0)', hdr, hsearch) :
+                      have_library(db, 'dbm_open("", 0, 0)', hdr, hsearch))
+    return false
+  end
+
+  # Skip a mismatch of Berkeley DB's ndbm.h and old GDBM library.
+  #
+  # dbm_clearerr() should be available for any ndbm implementation.
+  # It is available since the original (4.3BSD) ndbm and standardized by POSIX.
+  #
+  # However "can't resolve symbol 'dbm_clearerr'" problem may be caused by
+  # header/library mismatch: Berkeley DB ndbm.h and GDBM library until 1.8.3.
+  # GDBM (until 1.8.3) provides dbm_clearerr() as a empty macro in the header
+  # and the library don't provide dbm_clearerr().
+  # Berkeley DB provides dbm_clearerr() as a usual function.
+  # So Berkeley DB header with GDBM library causes the problem.
+  #
+  if !have_func('dbm_clearerr((DBM *)0)', hdr, hsearch)
+    return false
   end
+
+  # Berkeley DB's ndbm.h (since 1.85 at least) defines DBM_SUFFIX.
+  # Note that _DB_H_ is not defined on Mac OS X because
+  # it uses Berkeley DB 1 but ndbm.h doesn't include db.h.
+  have_db_header = have_macro('DBM_SUFFIX', hdr, hsearch)
+
+  # Old GDBM's ndbm.h, until 1.8.3, defines dbm_clearerr as a macro which
+  # expands to no tokens.
+  have_gdbm_header1 = have_empty_macro_dbm_clearerr(hdr, hsearch)
+
+  # Recent GDBM's ndbm.h, since 1.9, includes gdbm.h and it defines _GDBM_H_.
+  # ndbm compatibility layer of GDBM is provided by libgdbm (until 1.8.0)
+  # and libgdbm_compat (since 1.8.1).
+  have_gdbm_header2 = have_macro('_GDBM_H_', hdr, hsearch)
+
+  # 4.3BSD's ndbm.h defines _DBM_IOERR.
+  # The original ndbm is provided by libc in 4.3BSD.
+  have_ndbm_header = have_macro('_DBM_IOERR', hdr, hsearch)
+
+  # GDBM provides ndbm functions in libgdbm_compat since GDBM 1.8.1.
+  # GDBM's ndbm.h defines _GDBM_H_ since GDBM 1.9.
+  # If _GDBM_H_ is defined, 'gdbm_compat' is required and reject 'gdbm'.
+  if have_gdbm_header2 && db == 'gdbm'
+    return false
+  end
+
+  if have_db_header
+    $defs.push('-DRUBYDBM_DB_HEADER')
+  end
+
+  have_gdbm_header = have_gdbm_header1 | have_gdbm_header2
+  if have_gdbm_header
+    $defs.push('-DRUBYDBM_GDBM_HEADER')
+  end
+
+  # ndbm.h is provided by the original (4.3BSD) ndbm,
+  # Berkeley DB 1 in libc of 4.4BSD and
+  # ndbm compatibility layer of GDBM.
+  # So, try to check header/library mismatch.
+  #
+  # Several (possibly historical) distributions provides libndbm.
+  # It may be Berkeley DB, GDBM or 4.3BSD ndbm.
+  # So mismatch check is not performed for that.
+  # Note that libndbm is searched only when --with-dbm-type=ndbm is
+  # given for configure.
+  #
+  if hdr == 'ndbm.h' && db != 'libc' && db != 'ndbm'
+    if /\Adb\d?\z/ !~ db && have_db_header
+      return false
+    end
+
+    if /\Agdbm/ !~ db && have_gdbm_header
+      return false
+    end
+
+    if have_ndbm_header
+      return false
+    end
+  end
+
+  # Berkeley DB
+  have_func('db_version((int *)0, (int *)0, (int *)0)', hdr, hsearch)
+
+  # GDBM
+  have_gdbm_version = have_declared_libvar("gdbm_version", hdr, hsearch)
+  # gdbm_version is available since very old version (GDBM 1.5 at least).
+  # However it is not declared by ndbm.h until GDBM 1.8.3.
+  # We can't include both ndbm.h and gdbm.h because they both define datum type.
+  # ndbm.h includes gdbm.h and gdbm_version is declared since GDBM 1.9.
+  have_gdbm_version |= have_undeclared_libvar(["gdbm_version", "char *"], hdr, hsearch)
+
+  # QDBM
+  have_var("dpversion", hdr, hsearch)
+
+  # detect mismatch between GDBM header and other library.
+  # If GDBM header is included, GDBM library should be linked.
+  if have_gdbm_header && !have_gdbm_version
+    return false
+  end
+
+  # DBC type is required to disable error messages by Berkeley DB 2 or later.
+  if have_db_header
+    have_type("DBC", hdr, hsearch)
+  end
+
+  if hsearch
+    $defs << hsearch
+    @defs = hsearch
+  end
+  $defs << '-DDBM_HDR="<'+hdr+'>"'
+  @found << hdr
+
+  puts "header: #{hdr}"
+  puts "library: #{db}"
+
+  true
 end
 
-if dblib.any? {|db| headers.db_check(db)}
+if dblib.any? {|db| headers.fetch(db, ["ndbm.h"]).any? {|hdr| headers.db_check(db, hdr) } }
   have_header("cdefs.h")
   have_header("sys/cdefs.h")
+  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 c92ae52cd9..6557e43c9d 100644
--- a/ext/digest/bubblebabble/bubblebabble.c
+++ b/ext/digest/bubblebabble/bubblebabble.c
@@ -11,8 +11,8 @@
 
 ************************************************/
 
-#include "ruby.h"
-#include "digest.h"
+#include <ruby/ruby.h>
+#include "../digest.h"
 
 static ID id_digest;
 
@@ -78,7 +78,8 @@ bubblebabble_str_new(VALUE str_digest)
     return str;
 }
 
-/*
+/* Document-method: Digest::bubblebabble
+ *
  * call-seq:
  *     Digest.bubblebabble(string) -> bubblebabble_string
  *
@@ -90,7 +91,8 @@ rb_digest_s_bubblebabble(VALUE klass, VALUE str)
     return bubblebabble_str_new(str);
 }
 
-/*
+/* Document-method: Digest::Class::bubblebabble
+ *
  * call-seq:
  *     Digest::Class.bubblebabble(string, ...) -> hash_string
  *
@@ -99,10 +101,11 @@ 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_funcall2(klass, id_digest, argc, argv));
+    return bubblebabble_str_new(rb_funcallv(klass, id_digest, argc, argv));
 }
 
-/*
+/* Document-method: Digest::Instance#bubblebabble
+ *
  * call-seq:
  *     digest_obj.bubblebabble -> hash_string
  *
@@ -121,22 +124,24 @@ rb_digest_instance_bubblebabble(VALUE self)
 void
 Init_bubblebabble(void)
 {
-    VALUE mDigest, mDigest_Instance, cDigest_Class;
+#undef rb_intern
+    VALUE rb_mDigest, rb_mDigest_Instance, rb_cDigest_Class;
 
     rb_require("digest");
 
-    mDigest = rb_path2class("Digest");
-    mDigest_Instance = rb_path2class("Digest::Instance");
-    cDigest_Class = rb_path2class("Digest::Class");
-
-    /* Digest::bubblebabble() */
-    rb_define_module_function(mDigest, "bubblebabble", rb_digest_s_bubblebabble, 1);
+    rb_mDigest = rb_path2class("Digest");
+    rb_mDigest_Instance = rb_path2class("Digest::Instance");
+    rb_cDigest_Class = rb_path2class("Digest::Class");
 
-    /* Digest::Class::bubblebabble() */
-    rb_define_singleton_method(cDigest_Class, "bubblebabble", rb_digest_class_s_bubblebabble, -1);
+#if 0
+    rb_mDigest = rb_define_module("Digest");
+    rb_mDigest_Instance = rb_define_module_under(rb_mDigest, "Instance");
+    rb_cDigest_Class = rb_define_class_under(rb_mDigest, "Class", rb_cObject);
+#endif
 
-    /* Digest::Instance#bubblebabble() */
-    rb_define_method(mDigest_Instance, "bubblebabble", rb_digest_instance_bubblebabble, 0);
+    rb_define_module_function(rb_mDigest, "bubblebabble", rb_digest_s_bubblebabble, 1);
+    rb_define_singleton_method(rb_cDigest_Class, "bubblebabble", rb_digest_class_s_bubblebabble, -1);
+    rb_define_method(rb_mDigest_Instance, "bubblebabble", rb_digest_instance_bubblebabble, 0);
 
     id_digest = rb_intern("digest");
 }
diff --git a/ext/digest/bubblebabble/depend b/ext/digest/bubblebabble/depend
index b20148ded4..e7e2a8889d 100644
--- a/ext/digest/bubblebabble/depend
+++ b/ext/digest/bubblebabble/depend
@@ -1,3 +1,15 @@
-bubblebabble.o: bubblebabble.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
-  $(srcdir)/../defs.h
+# AUTOGENERATED DEPENDENCIES START
+bubblebabble.o: $(RUBY_EXTCONF_H)
+bubblebabble.o: $(arch_hdrdir)/ruby/config.h
+bubblebabble.o: $(hdrdir)/ruby.h
+bubblebabble.o: $(hdrdir)/ruby/assert.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: $(srcdir)/../digest.h
+bubblebabble.o: bubblebabble.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/bubblebabble/extconf.rb b/ext/digest/bubblebabble/extconf.rb
index 53cb83934a..21feed57fb 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 43601a208f..87c39c8b8d 100644
--- a/ext/digest/depend
+++ b/ext/digest/depend
@@ -1,2 +1,15 @@
-digest.o: digest.c digest.h $(hdrdir)/ruby.h $(topdir)/config.h \
-  $(hdrdir)/defines.h $(hdrdir)/intern.h
+# AUTOGENERATED DEPENDENCIES START
+digest.o: $(RUBY_EXTCONF_H)
+digest.o: $(arch_hdrdir)/ruby/config.h
+digest.o: $(hdrdir)/ruby.h
+digest.o: $(hdrdir)/ruby/assert.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: digest.c
+digest.o: digest.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index 956f47ff78..a59f880ac7 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -30,40 +30,60 @@ RUBY_EXTERN void Init_digest_base(void);
  *
  * This module provides a framework for message digest libraries.
  *
- * You may want to look at OpenSSL::Digest as it supports support more
- * algorithms.
+ * You may want to look at OpenSSL::Digest as it supports more algorithms.
  *
- * A cryptographic hash function is a procedure that takes data and return a
- * fixed bit string : the hash value, also known as _digest_. Hash functions
+ * A cryptographic hash function is a procedure that takes data and returns a
+ * fixed bit string: the hash value, also known as _digest_. Hash functions
  * are also called one-way functions, it is easy to compute a digest from
  * a message, but it is infeasible to generate a message from a digest.
  *
- * == Example
+ * == Examples
  *
  *   require 'digest'
  *
  *   # Compute a complete digest
+ *   Digest::SHA256.digest 'message'       #=> "\xABS\n\x13\xE4Y..."
+ *
  *   sha256 = Digest::SHA256.new
- *   digest = sha256.digest message
+ *   sha256.digest 'message'               #=> "\xABS\n\x13\xE4Y..."
+ *
+ *   # Other encoding formats
+ *   Digest::SHA256.hexdigest 'message'    #=> "ab530a13e459..."
+ *   Digest::SHA256.base64digest 'message' #=> "q1MKE+RZFJgr..."
  *
  *   # Compute digest by chunks
- *   sha256 = Digest::SHA256.new
- *   sha256.update message1
- *   sha256 << message2 # << is an alias for update
+ *   md5 = Digest::MD5.new
+ *   md5.update 'message1'
+ *   md5 << 'message2'                     # << is an alias for update
+ *
+ *   md5.hexdigest                         #=> "94af09c09bb9..."
+ *
+ *   # Compute digest for a file
+ *   sha256 = Digest::SHA256.file 'testfile'
+ *   sha256.hexdigest
+ *
+ * Additionally digests can be encoded in "bubble babble" format as a sequence
+ * of consonants and vowels which is more recognizable and comparable than a
+ * hexadecimal digest.
+ *
+ *   require 'digest/bubblebabble'
  *
- *   digest = sha256.digest
+ *   Digest::SHA256.bubblebabble 'message' #=> "xopoh-fedac-fenyh-..."
+ *
+ * See the bubble babble specification at
+ * http://web.mit.edu/kenta/www/one/bubblebabble/spec/jrtrjwzi/draft-huima-01.txt.
  *
  * == Digest algorithms
  *
- * Different digest algorithms (or hash functions) are available :
+ * Different digest algorithms (or hash functions) are available:
  *
- * HMAC::
- *   See FIPS PUB 198 The Keyed-Hash Message Authentication Code (HMAC)
+ * MD5::
+ *  See RFC 1321 The MD5 Message-Digest Algorithm
  * RIPEMD-160::
- *   (as Digest::RMD160) see
- *   http://homes.esat.kuleuven.be/~bosselae/ripemd160.html
+ *   As Digest::RMD160.
+ *   See http://homes.esat.kuleuven.be/~bosselae/ripemd160.html.
  * SHA1::
- *   See FIPS 180 Secure Hash Standard
+ *   See FIPS 180 Secure Hash Standard.
  * SHA2 family::
  *   See FIPS 180 Secure Hash Standard which defines the following algorithms:
  *   * SHA512
@@ -71,11 +91,7 @@ RUBY_EXTERN void Init_digest_base(void);
  *   * SHA256
  *
  * The latest versions of the FIPS publications can be found here:
- * http://csrc.nist.gov/publications/PubsFIPS.html
- *
- * Additionally Digest::BubbleBabble encodes a digest as a sequence of
- * consonants and vowels which is more recognizable and comparable than a
- * hexadecimal digest.  See http://en.wikipedia.org/wiki/Bubblebabble
+ * http://csrc.nist.gov/publications/PubsFIPS.html.
  */
 
 static VALUE
@@ -99,7 +115,7 @@ hexencode_str_new(VALUE str_digest)
         rb_raise(rb_eRuntimeError, "digest string too long");
     }
 
-    str = rb_str_new(0, digest_len * 2);
+    str = rb_usascii_str_new(0, digest_len * 2);
 
     for (i = 0, p = RSTRING_PTR(str); i < digest_len; i++) {
         unsigned char byte = digest[i];
@@ -108,6 +124,8 @@ hexencode_str_new(VALUE str_digest)
         p[i + i + 1] = hex[byte & 0x0f];
     }
 
+    RB_GC_GUARD(str_digest);
+
     return str;
 }
 
@@ -154,6 +172,8 @@ static VALUE
 rb_digest_instance_update(VALUE self, VALUE str)
 {
     rb_digest_instance_method_unimpl(self, "update");
+
+    UNREACHABLE;
 }
 
 /*
@@ -172,6 +192,8 @@ static VALUE
 rb_digest_instance_finish(VALUE self)
 {
     rb_digest_instance_method_unimpl(self, "finish");
+
+    UNREACHABLE;
 }
 
 /*
@@ -186,6 +208,8 @@ static VALUE
 rb_digest_instance_reset(VALUE self)
 {
     rb_digest_instance_method_unimpl(self, "reset");
+
+    UNREACHABLE;
 }
 
 /*
@@ -350,7 +374,8 @@ rb_digest_instance_equal(VALUE self, VALUE other)
         str2 = rb_digest_instance_digest(0, 0, other);
     } else {
         str1 = rb_digest_instance_to_s(self);
-        str2 = other;
+        str2 = rb_check_string_type(other);
+        if (NIL_P(str2)) return Qfalse;
     }
 
     /* never blindly assume that subclass methods return strings */
@@ -409,6 +434,8 @@ static VALUE
 rb_digest_instance_block_length(VALUE self)
 {
     rb_digest_instance_method_unimpl(self, "block_length");
+
+    UNREACHABLE;
 }
 
 /*
@@ -459,7 +486,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_funcall2(klass, id_digest, argc, argv));
+    return hexencode_str_new(rb_funcallv(klass, id_digest, argc, argv));
 }
 
 /* :nodoc: */
@@ -474,6 +501,40 @@ 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 *
@@ -493,10 +554,24 @@ get_digest_base_metadata(VALUE klass)
     if (NIL_P(p))
         rb_raise(rb_eRuntimeError, "Digest::Base cannot be directly inherited in Ruby");
 
+    if (!RB_TYPE_P(obj, T_DATA) || RTYPEDDATA_P(obj)) {
+      wrong:
+        if (p == klass)
+            rb_raise(rb_eTypeError, "%"PRIsVALUE"::metadata is not initialized properly",
+                     klass);
+        else
+            rb_raise(rb_eTypeError, "%"PRIsVALUE"(%"PRIsVALUE")::metadata is not initialized properly",
+                     klass, p);
+    }
+
+#undef RUBY_UNTYPED_DATA_WARNING
+#define RUBY_UNTYPED_DATA_WARNING 0
     Data_Get_Struct(obj, rb_digest_metadata_t, algo);
 
+    if (!algo) goto wrong;
+
     switch (algo->api_version) {
-      case 2:
+      case 3:
         break;
 
       /*
@@ -510,6 +585,27 @@ get_digest_base_metadata(VALUE klass)
     return algo;
 }
 
+static rb_digest_metadata_t *
+get_digest_obj_metadata(VALUE obj)
+{
+    return get_digest_base_metadata(rb_obj_class(obj));
+}
+
+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)
+{
+    if (algo->init_func(pctx) != 1) {
+	rb_raise(rb_eRuntimeError, "Digest initialization failed.");
+    }
+}
+
 static VALUE
 rb_digest_base_alloc(VALUE klass)
 {
@@ -523,10 +619,9 @@ rb_digest_base_alloc(VALUE klass)
 
     algo = get_digest_base_metadata(klass);
 
-    pctx = xmalloc(algo->ctx_size);
-    algo->init_func(pctx);
-
-    obj = Data_Wrap_Struct(klass, 0, xfree, pctx);
+    obj = rb_data_typed_object_zalloc(klass, algo->ctx_size, &digest_type);
+    pctx = RTYPEDDATA_DATA(obj);
+    algo_init(algo, pctx);
 
     return obj;
 }
@@ -542,44 +637,57 @@ rb_digest_base_copy(VALUE copy, VALUE obj)
 
     rb_check_frozen(copy);
 
-    algo = get_digest_base_metadata(rb_obj_class(copy));
+    algo = get_digest_obj_metadata(copy);
+    if (algo != get_digest_obj_metadata(obj))
+	rb_raise(rb_eTypeError, "different algorithms");
 
-    Data_Get_Struct(obj, void, pctx1);
-    Data_Get_Struct(copy, void, pctx2);
+    TypedData_Get_Struct(obj, void, &digest_type, pctx1);
+    TypedData_Get_Struct(copy, void, &digest_type, pctx2);
     memcpy(pctx2, pctx1, algo->ctx_size);
 
     return copy;
 }
 
-/* :nodoc: */
+/*
+ * call-seq: digest_base.reset -> digest_base
+ *
+ * Reset the digest to its initial state and return +self+.
+ */
 static VALUE
 rb_digest_base_reset(VALUE self)
 {
     rb_digest_metadata_t *algo;
     void *pctx;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_obj_metadata(self);
 
-    Data_Get_Struct(self, void, pctx);
+    TypedData_Get_Struct(self, void, &digest_type, pctx);
 
-    algo->init_func(pctx);
+    algo_init(algo, pctx);
 
     return self;
 }
 
-/* :nodoc: */
+/*
+ * call-seq:
+ *   digest_base.update(string) -> digest_base
+ *   digest_base << string -> digest_base
+ *
+ * Update the digest using given _string_ and return +self+.
+ */
 static VALUE
 rb_digest_base_update(VALUE self, VALUE str)
 {
     rb_digest_metadata_t *algo;
     void *pctx;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_obj_metadata(self);
 
-    Data_Get_Struct(self, void, pctx);
+    TypedData_Get_Struct(self, void, &digest_type, pctx);
 
     StringValue(str);
     algo->update_func(pctx, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str));
+    RB_GC_GUARD(str);
 
     return self;
 }
@@ -592,37 +700,45 @@ rb_digest_base_finish(VALUE self)
     void *pctx;
     VALUE str;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_obj_metadata(self);
 
-    Data_Get_Struct(self, void, pctx);
+    TypedData_Get_Struct(self, void, &digest_type, pctx);
 
     str = rb_str_new(0, algo->digest_len);
     algo->finish_func(pctx, (unsigned char *)RSTRING_PTR(str));
 
     /* avoid potential coredump caused by use of a finished context */
-    algo->init_func(pctx);
+    algo_init(algo, pctx);
 
     return str;
 }
 
-/* :nodoc: */
+/*
+ * call-seq: digest_base.digest_length -> Integer
+ *
+ * Return the length of the hash value in bytes.
+ */
 static VALUE
 rb_digest_base_digest_length(VALUE self)
 {
     rb_digest_metadata_t *algo;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_obj_metadata(self);
 
     return INT2NUM(algo->digest_len);
 }
 
-/* :nodoc: */
+/*
+ * call-seq: digest_base.block_length -> Integer
+ *
+ * Return the block length of the digest in bytes.
+ */
 static VALUE
 rb_digest_base_block_length(VALUE self)
 {
     rb_digest_metadata_t *algo;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_obj_metadata(self);
 
     return INT2NUM(algo->block_len);
 }
@@ -630,13 +746,20 @@ rb_digest_base_block_length(VALUE self)
 void
 Init_digest(void)
 {
+#undef rb_intern
     id_reset           = rb_intern("reset");
     id_update          = rb_intern("update");
     id_finish          = rb_intern("finish");
     id_digest          = rb_intern("digest");
     id_hexdigest       = rb_intern("hexdigest");
     id_digest_length   = rb_intern("digest_length");
+    id_metadata        = rb_id_metadata();
+    InitVM(digest);
+}
 
+void
+InitVM_digest(void)
+{
     /*
      * module Digest
      */
@@ -683,8 +806,6 @@ Init_digest(void)
     rb_define_singleton_method(rb_cDigest_Class, "digest", rb_digest_class_s_digest, -1);
     rb_define_singleton_method(rb_cDigest_Class, "hexdigest", rb_digest_class_s_hexdigest, -1);
 
-    id_metadata = rb_intern("metadata");
-
     /* class Digest::Base < Digest::Class */
     rb_cDigest_Base = rb_define_class_under(rb_mDigest, "Base", rb_cDigest_Class);
 
diff --git a/ext/digest/digest.h b/ext/digest/digest.h
index 6e4906c859..4b6954089f 100644
--- a/ext/digest/digest.h
+++ b/ext/digest/digest.h
@@ -15,11 +15,11 @@
 
 #include "ruby.h"
 
-#define RUBY_DIGEST_API_VERSION	2
+#define RUBY_DIGEST_API_VERSION	3
 
-typedef void (*rb_digest_hash_init_func_t)(void *);
+typedef int (*rb_digest_hash_init_func_t)(void *);
 typedef void (*rb_digest_hash_update_func_t)(void *, unsigned char *, size_t);
-typedef void (*rb_digest_hash_finish_func_t)(void *, unsigned char *);
+typedef int (*rb_digest_hash_finish_func_t)(void *, unsigned char *);
 
 typedef struct {
     int api_version;
@@ -30,3 +30,35 @@ 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); \
+}
+
+static inline VALUE
+rb_digest_namespace(void)
+{
+    rb_require("digest");
+    return rb_path2class("Digest");
+}
+
+static inline ID
+rb_id_metadata(void)
+{
+    return rb_intern_const("metadata");
+}
diff --git a/ext/digest/digest_conf.rb b/ext/digest/digest_conf.rb
new file mode 100644
index 0000000000..915b61877f
--- /dev/null
+++ b/ext/digest/digest_conf.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: false
+
+# Copy from ext/openssl/extconf.rb
+def find_openssl_library
+  if $mswin || $mingw
+    # required for static OpenSSL libraries
+    have_library("gdi32") # OpenSSL <= 1.0.2 (for RAND_screen())
+    have_library("crypt32")
+  end
+
+  return false unless have_header("openssl/ssl.h")
+
+  ret = have_library("crypto", "CRYPTO_malloc") &&
+    have_library("ssl", "SSL_new")
+  return ret if ret
+
+  if $mswin
+    # OpenSSL >= 1.1.0: libcrypto.lib and libssl.lib.
+    if have_library("libcrypto", "CRYPTO_malloc") &&
+        have_library("libssl", "SSL_new")
+      return true
+    end
+
+    # OpenSSL <= 1.0.2: libeay32.lib and ssleay32.lib.
+    if have_library("libeay32", "CRYPTO_malloc") &&
+        have_library("ssleay32", "SSL_new")
+      return true
+    end
+
+    # LibreSSL: libcrypto-##.lib and libssl-##.lib, where ## is the ABI version
+    # number. We have to find the version number out by scanning libpath.
+    libpath = $LIBPATH.dup
+    libpath |= ENV["LIB"].split(File::PATH_SEPARATOR)
+    libpath.map! { |d| d.tr(File::ALT_SEPARATOR, File::SEPARATOR) }
+
+    ret = [
+      ["crypto", "CRYPTO_malloc"],
+      ["ssl", "SSL_new"]
+    ].all? do |base, func|
+      result = false
+      libs = ["lib#{base}-[0-9][0-9]", "lib#{base}-[0-9][0-9][0-9]"]
+      libs = Dir.glob(libs.map{|l| libpath.map{|d| File.join(d, l + ".*")}}.flatten).map{|path| File.basename(path, ".*")}.uniq
+      libs.each do |lib|
+        result = have_library(lib, func)
+        break if result
+      end
+      result
+    end
+    return ret if ret
+  end
+  return false
+end
+
+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 find_openssl_library
+      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 a20ca8d68f..a8c68850a2 100644
--- a/ext/digest/extconf.rb
+++ b/ext/digest/extconf.rb
@@ -1,3 +1,4 @@
+# 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 4a98af2eae..ba0637af32 100644
--- a/ext/digest/lib/digest.rb
+++ b/ext/digest/lib/digest.rb
@@ -1,6 +1,10 @@
+# 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
@@ -21,12 +25,14 @@ module Digest
   end
 
   class ::Digest::Class
-    # creates a digest object and reads a given file, _name_.
+    # Creates a digest object and reads a given file, _name_.
+    # Optional arguments are passed to the constructor of the digest
+    # class.
     #
     #   p Digest::SHA256.file("X11R6.8.2-src.tar.bz2").hexdigest
     #   # => "f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534"
-    def self.file(name)
-      new.file(name)
+    def self.file(name, *args)
+      new(*args).file(name)
     end
 
     # Returns the base64 encoded hash value of a given _string_.  The
@@ -38,7 +44,7 @@ module Digest
   end
 
   module Instance
-    # updates the digest with the contents of a given file _name_ and
+    # Updates the digest with the contents of a given file _name_ and
     # returns self.
     def file(name)
       File.open(name, "rb") {|f|
@@ -74,15 +80,30 @@ end
 # call-seq:
 #   Digest(name) -> digest_subclass
 #
-# Returns a Digest subclass by +name+.
+# Returns a Digest subclass by +name+ in a thread-safe manner even
+# when on-demand loading is involved.
 #
 #   require 'digest'
 #
 #   Digest("MD5")
 #   # => Digest::MD5
 #
-#   Digest("Foo")
+#   Digest(:SHA256)
+#   # => Digest::SHA256
+#
+#   Digest(:Foo)
 #   # => LoadError: library not found for class Digest::Foo -- digest/foo
 def Digest(name)
-  Digest.const_get(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
 end
diff --git a/ext/digest/lib/digest/hmac.rb b/ext/digest/lib/digest/hmac.rb
deleted file mode 100644
index 470b0226d4..0000000000
--- a/ext/digest/lib/digest/hmac.rb
+++ /dev/null
@@ -1,302 +0,0 @@
-# == License
-#
-# Copyright (c) 2006 Akinori MUSHA <knu@iDaemons.org>
-#
-# Documentation by Akinori MUSHA
-#
-# All rights reserved.  You can redistribute and/or modify it under
-# the same terms as Ruby.
-#
-#   $Id$
-#
-
-warn "use of the experimetal library 'digest/hmac' is discouraged; require 'openssl' and use OpenSSL::HMAC instead." if $VERBOSE
-
-require 'digest'
-
-module Digest
-  # = digest/hmac.rb
-  #
-  # An experimental implementation of HMAC keyed-hashing algorithm
-  #
-  # == Overview
-  #
-  # CAUTION: Use of this library is discouraged, because this
-  # implementation was meant to be experimental but somehow got into the
-  # 1.9 series without being noticed.  Please use OpenSSL::HMAC in the
-  # "openssl" library instead.
-  #
-  # == Examples
-  #
-  #   require 'digest/hmac'
-  #
-  #   # one-liner example
-  #   puts Digest::HMAC.hexdigest("data", "hash key", Digest::SHA1)
-  #
-  #   # rather longer one
-  #   hmac = Digest::HMAC.new("foo", Digest::RMD160)
-  #
-  #   buf = ""
-  #   while stream.read(16384, buf)
-  #     hmac.update(buf)
-  #   end
-  #
-  #   puts hmac.bubblebabble
-  #
-  class HMAC < Digest::Class
-
-    # Creates a Digest::HMAC instance.
-
-    def initialize(key, digester)
-      @md = digester.new
-
-      block_len = @md.block_length
-
-      if key.bytesize > block_len
-        key = @md.digest(key)
-      end
-
-      ipad = Array.new(block_len, 0x36)
-      opad = Array.new(block_len, 0x5c)
-
-      key.bytes.each_with_index { |c, i|
-        ipad[i] ^= c
-        opad[i] ^= c
-      }
-
-      @key = key.freeze
-      @ipad = ipad.pack('C*').freeze
-      @opad = opad.pack('C*').freeze
-      @md.update(@ipad)
-    end
-
-    def initialize_copy(other) # :nodoc:
-      @md = other.instance_eval { @md.clone }
-    end
-
-    # call-seq:
-    #   hmac.update(string) -> hmac
-    #   hmac << string -> hmac
-    #
-    # Updates the hmac using a given +string+ and returns self.
-    def update(text)
-      @md.update(text)
-      self
-    end
-    alias << update
-
-    # call-seq:
-    #   hmac.reset -> hmac
-    #
-    # Resets the hmac to the initial state and returns self.
-    def reset
-      @md.reset
-      @md.update(@ipad)
-      self
-    end
-
-    def finish # :nodoc:
-      d = @md.digest!
-      @md.update(@opad)
-      @md.update(d)
-      @md.digest!
-    end
-    private :finish
-
-    # call-seq:
-    #   hmac.digest_length -> Integer
-    #
-    # Returns the length in bytes of the hash value of the digest.
-    def digest_length
-      @md.digest_length
-    end
-
-    # call-seq:
-    #   hmac.block_length -> Integer
-    #
-    # Returns the block length in bytes of the hmac.
-    def block_length
-      @md.block_length
-    end
-
-    # call-seq:
-    #   hmac.inspect -> string
-    #
-    # Creates a printable version of the hmac object.
-    def inspect
-      sprintf('#<%s: key=%s, digest=%s>', self.class.name, @key.inspect, @md.inspect.sub(/^\#<(.*)>$/) { $1 });
-    end
-  end
-end
-
-if $0 == __FILE__
-  eval DATA.gets(nil), nil, $0, DATA.lineno
-end
-
-__END__
-
-require 'test/unit'
-
-module TM_HMAC
-  def test_s_hexdigest
-    cases.each { |h|
-      digesters.each { |d|
-        assert_equal(h[:hexdigest], Digest::HMAC.hexdigest(h[:data], h[:key], d))
-      }
-    }
-  end
-
-  def test_hexdigest
-    cases.each { |h|
-      digesters.each { |d|
-        hmac = Digest::HMAC.new(h[:key], d)
-
-        hmac.update(h[:data])
-
-        assert_equal(h[:hexdigest], hmac.hexdigest)
-      }
-    }
-  end
-
-  def test_reset
-    cases.each { |h|
-      digesters.each { |d|
-        hmac = Digest::HMAC.new(h[:key], d)
-        hmac.update("test")
-        hmac.reset
-        hmac.update(h[:data])
-
-        assert_equal(h[:hexdigest], hmac.hexdigest)
-      }
-    }
-  end
-end
-
-class TC_HMAC_MD5 < Test::Unit::TestCase
-  include TM_HMAC
-
-  def digesters
-    [Digest::MD5, Digest::MD5.new]
-  end
-
-  # Taken from RFC 2202: Test Cases for HMAC-MD5 and HMAC-SHA-1
-  def cases
-    [
-     {
-       :key		=> "\x0b" * 16,
-       :data		=> "Hi There",
-       :hexdigest	=> "9294727a3638bb1c13f48ef8158bfc9d",
-     }, {
-       :key		=> "Jefe",
-       :data		=> "what do ya want for nothing?",
-       :hexdigest	=> "750c783e6ab0b503eaa86e310a5db738",
-     }, {
-       :key		=> "\xaa" * 16,
-       :data		=> "\xdd" * 50,
-       :hexdigest	=> "56be34521d144c88dbb8c733f0e8b3f6",
-     }, {
-       :key		=> "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
-       :data		=> "\xcd" * 50,
-       :hexdigest	=> "697eaf0aca3a3aea3a75164746ffaa79",
-     }, {
-       :key		=> "\x0c" * 16,
-       :data		=> "Test With Truncation",
-       :hexdigest	=> "56461ef2342edc00f9bab995690efd4c",
-     }, {
-       :key		=> "\xaa" * 80,
-       :data		=> "Test Using Larger Than Block-Size Key - Hash Key First",
-       :hexdigest	=> "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd",
-     }, {
-       :key		=> "\xaa" * 80,
-       :data		=> "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
-       :hexdigest	=> "6f630fad67cda0ee1fb1f562db3aa53e",
-     }
-    ]
-  end
-end
-
-class TC_HMAC_SHA1 < Test::Unit::TestCase
-  include TM_HMAC
-
-  def digesters
-    [Digest::SHA1, Digest::SHA1.new]
-  end
-
-  # Taken from RFC 2202: Test Cases for HMAC-MD5 and HMAC-SHA-1
-  def cases
-    [
-     {
-       :key		=> "\x0b" * 20,
-       :data		=> "Hi There",
-       :hexdigest	=> "b617318655057264e28bc0b6fb378c8ef146be00",
-     }, {
-       :key		=> "Jefe",
-       :data		=> "what do ya want for nothing?",
-       :hexdigest	=> "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79",
-     }, {
-       :key		=> "\xaa" * 20,
-       :data		=> "\xdd" * 50,
-       :hexdigest	=> "125d7342b9ac11cd91a39af48aa17b4f63f175d3",
-     }, {
-       :key		=> "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
-       :data		=> "\xcd" * 50,
-       :hexdigest	=> "4c9007f4026250c6bc8414f9bf50c86c2d7235da",
-     }, {
-       :key		=> "\x0c" * 20,
-       :data		=> "Test With Truncation",
-       :hexdigest	=> "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04",
-     }, {
-       :key		=> "\xaa" * 80,
-       :data		=> "Test Using Larger Than Block-Size Key - Hash Key First",
-       :hexdigest	=> "aa4ae5e15272d00e95705637ce8a3b55ed402112",
-     }, {
-       :key		=> "\xaa" * 80,
-       :data		=> "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
-       :hexdigest	=> "e8e99d0f45237d786d6bbaa7965c7808bbff1a91",
-     }
-    ]
-  end
-end
-
-class TC_HMAC_RMD160 < Test::Unit::TestCase
-  include TM_HMAC
-
-  def digesters
-    [Digest::RMD160, Digest::RMD160.new]
-  end
-
-  # Taken from RFC 2286: Test Cases for HMAC-RIPEMD160 and HMAC-RIPEMD128
-  def cases
-    [
-     {
-       :key		=> "\x0b" * 20,
-       :data		=> "Hi There",
-       :hexdigest	=> "24cb4bd67d20fc1a5d2ed7732dcc39377f0a5668",
-     }, {
-       :key		=> "Jefe",
-       :data		=> "what do ya want for nothing?",
-       :hexdigest	=> "dda6c0213a485a9e24f4742064a7f033b43c4069",
-     }, {
-       :key		=> "\xaa" * 20,
-       :data		=> "\xdd" * 50,
-       :hexdigest	=> "b0b105360de759960ab4f35298e116e295d8e7c1",
-     }, {
-       :key		=> "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
-       :data		=> "\xcd" * 50,
-       :hexdigest	=> "d5ca862f4d21d5e610e18b4cf1beb97a4365ecf4",
-     }, {
-       :key		=> "\x0c" * 20,
-       :data		=> "Test With Truncation",
-       :hexdigest	=> "7619693978f91d90539ae786500ff3d8e0518e39",
-     }, {
-       :key		=> "\xaa" * 80,
-       :data		=> "Test Using Larger Than Block-Size Key - Hash Key First",
-       :hexdigest	=> "6466ca07ac5eac29e1bd523e5ada7605b791fd8b",
-     }, {
-       :key		=> "\xaa" * 80,
-       :data		=> "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
-       :hexdigest	=> "69ea60798d71616cce5fd0871e23754cd75d5a0a",
-     }
-    ]
-  end
-end
diff --git a/ext/digest/md5/depend b/ext/digest/md5/depend
index 8eaec20b4b..abfd8de6a5 100644
--- a/ext/digest/md5/depend
+++ b/ext/digest/md5/depend
@@ -1,6 +1,19 @@
-md5.o: md5.c md5.h $(srcdir)/../defs.h $(hdrdir)/ruby.h $(topdir)/config.h \
-  $(hdrdir)/defines.h $(hdrdir)/intern.h
-md5init.o: md5init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h md5.h \
-  $(srcdir)/../defs.h
-md5ossl.o: md5ossl.h
+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.h
+md5init.o: $(hdrdir)/ruby/assert.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: $(srcdir)/../digest.h
+md5init.o: md5init.c
+md5init.o: md5ossl.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb
index ddfdb707f2..dead9a228b 100644
--- a/ext/digest/md5/extconf.rb
+++ b/ext/digest/md5/extconf.rb
@@ -1,22 +1,16 @@
+# -*- 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}" ]
 
-dir_config("openssl")
-
-if !with_config("bundled-md5") &&
-    have_library("crypto") && have_header("openssl/md5.h")
-  $objs << "md5ossl.#{$OBJEXT}"
-
-else
-  $objs << "md5.#{$OBJEXT}"
-end
+digest_conf("md5")
 
 have_header("sys/cdefs.h")
 
diff --git a/ext/digest/md5/md5.c b/ext/digest/md5/md5.c
index 518f8239ed..19fe54a693 100644
--- a/ext/digest/md5/md5.c
+++ b/ext/digest/md5/md5.c
@@ -61,7 +61,7 @@
  */
 #include <string.h>
 int
-main()
+main(void)
 {
     static const char *const test[7*2] = {
 	"", "d41d8cd98f00b204e9800998ecf8427e",
@@ -102,7 +102,7 @@ main()
 #ifdef COMPUTE_T_VALUES
 #include <math.h>
 int
-main()
+main(void)
 {
     int i;
     for (i = 1; i <= 64; ++i) {
@@ -350,7 +350,7 @@ md5_process(MD5_CTX *pms, const uint8_t *data /*[64]*/)
     pms->state[3] += d;
 }
 
-void
+int
 MD5_Init(MD5_CTX *pms)
 {
     pms->count[0] = pms->count[1] = 0;
@@ -358,6 +358,7 @@ MD5_Init(MD5_CTX *pms)
     pms->state[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
     pms->state[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
     pms->state[3] = 0x10325476;
+    return 1;
 }
 
 void
@@ -368,7 +369,7 @@ MD5_Update(MD5_CTX *pms, const uint8_t *data, size_t nbytes)
     size_t offset = (pms->count[0] >> 3) & 63;
     uint32_t nbits = (uint32_t)(nbytes << 3);
 
-    if (nbytes <= 0)
+    if (nbytes == 0)
 	return;
 
     /* Update the message length. */
@@ -398,7 +399,7 @@ MD5_Update(MD5_CTX *pms, const uint8_t *data, size_t nbytes)
 	memcpy(pms->buffer, p, left);
 }
 
-void
+int
 MD5_Finish(MD5_CTX *pms, uint8_t *digest)
 {
     static const uint8_t pad[64] = {
@@ -419,4 +420,5 @@ MD5_Finish(MD5_CTX *pms, uint8_t *digest)
     MD5_Update(pms, data, 8);
     for (i = 0; i < 16; ++i)
 	digest[i] = (uint8_t)(pms->state[i >> 2] >> ((i & 3) << 3));
+    return 1;
 }
diff --git a/ext/digest/md5/md5.h b/ext/digest/md5/md5.h
index f4580ef5e7..1b3383c5ee 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
@@ -69,9 +69,9 @@ typedef struct md5_state_s {
 #define MD5_Finish	rb_Digest_MD5_Finish
 #endif
 
-void	MD5_Init _((MD5_CTX *pms));
+int	MD5_Init _((MD5_CTX *pms));
 void	MD5_Update _((MD5_CTX *pms, const uint8_t *data, size_t nbytes));
-void	MD5_Finish _((MD5_CTX *pms, uint8_t *digest));
+int	MD5_Finish _((MD5_CTX *pms, uint8_t *digest));
 
 #define MD5_BLOCK_LENGTH		64
 #define MD5_DIGEST_LENGTH		16
diff --git a/ext/digest/md5/md5cc.h b/ext/digest/md5/md5cc.h
new file mode 100644
index 0000000000..e34d7d5c11
--- /dev/null
+++ b/ext/digest/md5/md5cc.h
@@ -0,0 +1,19 @@
+#define COMMON_DIGEST_FOR_OPENSSL 1
+#include <CommonCrypto/CommonDigest.h>
+
+#ifdef __clang__
+# pragma clang diagnostic ignored "-Wdeprecated-declarations"
+/* Suppress deprecation warnings of MD5 from Xcode 11.1 */
+/* Although we know MD5 is deprecated too, provide just for backward
+ * compatibility, as well as Apple does. */
+#endif
+
+#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 d1229b5c6e..dafd38a29c 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -1,9 +1,12 @@
 /* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
 /* $Id$ */
 
-#include "digest.h"
-#if defined(HAVE_OPENSSL_MD5_H)
+#include <ruby/ruby.h>
+#include "../digest.h"
+#if defined(MD5_USE_OPENSSL)
 #include "md5ossl.h"
+#elif defined(MD5_USE_COMMONDIGEST)
+#include "md5cc.h"
 #else
 #include "md5.h"
 #endif
@@ -19,22 +22,45 @@ 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()
+Init_md5(void)
 {
     VALUE mDigest, cDigest_Base, cDigest_MD5;
 
-    rb_require("digest");
-
-    mDigest = rb_path2class("Digest");
+#if 0
+    mDigest = rb_define_module("Digest"); /* let rdoc know */
+#endif
+    mDigest = rb_digest_namespace();
     cDigest_Base = rb_path2class("Digest::Base");
 
     cDigest_MD5 = rb_define_class_under(mDigest, "MD5", cDigest_Base);
 
-    rb_ivar_set(cDigest_MD5, rb_intern("metadata"),
-      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&md5));
+#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));
 }
diff --git a/ext/digest/md5/md5ossl.c b/ext/digest/md5/md5ossl.c
deleted file mode 100644
index d94ae2cd2f..0000000000
--- a/ext/digest/md5/md5ossl.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* $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 1680c4f5c9..94aa7ae77b 100644
--- a/ext/digest/md5/md5ossl.h
+++ b/ext/digest/md5/md5ossl.h
@@ -8,6 +8,8 @@
 
 #define MD5_BLOCK_LENGTH	MD5_CBLOCK
 
-void MD5_Finish(MD5_CTX *pctx, unsigned char *digest);
+static DEFINE_FINISH_FUNC_FROM_FINAL(MD5)
+#undef MD5_Finish
+#define MD5_Finish rb_digest_MD5_finish
 
 #endif
diff --git a/ext/digest/rmd160/depend b/ext/digest/rmd160/depend
index a21d7188dc..07c406a7d2 100644
--- a/ext/digest/rmd160/depend
+++ b/ext/digest/rmd160/depend
@@ -1,6 +1,19 @@
-rmd160.o: rmd160.c rmd160.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
-rmd160init.o: rmd160init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
-  rmd160.h $(srcdir)/../defs.h
-rmd160ossl.o: rmd160ossl.h $(srcdir)/../defs.h
+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.h
+rmd160init.o: $(hdrdir)/ruby/assert.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: $(srcdir)/../digest.h
+rmd160init.o: rmd160init.c
+rmd160init.o: rmd160ossl.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb
index cc361e3d2b..a02ba56169 100644
--- a/ext/digest/rmd160/extconf.rb
+++ b/ext/digest/rmd160/extconf.rb
@@ -1,21 +1,16 @@
+# -*- 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}" ]
 
-dir_config("openssl")
-
-if !with_config("bundled-rmd160") &&
-    have_library("crypto") && have_header("openssl/ripemd.h")
-  $objs << "rmd160ossl.#{$OBJEXT}"
-else
-  $objs << "rmd160.#{$OBJEXT}"
-end
+digest_conf("rmd160", "ripemd", "RIPEMD160")
 
 have_header("sys/cdefs.h")
 
diff --git a/ext/digest/rmd160/rmd160.c b/ext/digest/rmd160/rmd160.c
index 88918728cd..058d004f3a 100644
--- a/ext/digest/rmd160/rmd160.c
+++ b/ext/digest/rmd160/rmd160.c
@@ -124,7 +124,7 @@
 
 /********************************************************************/
 
-void
+int
 RMD160_Init(RMD160_CTX *context)
 {
 
@@ -138,6 +138,7 @@ RMD160_Init(RMD160_CTX *context)
 	context->state[4] = 0xc3d2e1f0U;
 	context->length[0] = context->length[1] = 0;
 	context->buflen = 0;
+	return 1;
 }
 
 /********************************************************************/
@@ -362,16 +363,20 @@ RMD160_Update(RMD160_CTX *context, const uint8_t *data, size_t nbytes)
 	_DIAGASSERT(data != NULL);
 
 	/* update length[] */
+#if SIZEOF_SIZE_T * CHAR_BIT > 32
+	context->length[1] += (uint32_t)((context->length[0] + nbytes) >> 32);
+#else
 	if (context->length[0] + nbytes < context->length[0])
 		context->length[1]++;		/* overflow to msb of length */
-	context->length[0] += nbytes;
+#endif
+	context->length[0] += (uint32_t)nbytes;
 
 	(void)memset(X, 0, sizeof(X));
 
         if ( context->buflen + nbytes < 64 )
         {
                 (void)memcpy(context->bbuffer + context->buflen, data, nbytes);
-                context->buflen += nbytes;
+                context->buflen += (uint32_t)nbytes;
         }
         else
         {
@@ -401,14 +406,14 @@ RMD160_Update(RMD160_CTX *context, const uint8_t *data, size_t nbytes)
                 /*
                  * Put last bytes from data into context's buffer
                  */
-                context->buflen = nbytes & 63;
+                context->buflen = (uint32_t)nbytes & 63;
                 memcpy(context->bbuffer, data + (64 * i) + ofs, context->buflen);
         }
 }
 
 /********************************************************************/
 
-void
+int
 RMD160_Finish(RMD160_CTX *context, uint8_t digest[20])
 {
 	uint32_t i;
@@ -452,6 +457,7 @@ RMD160_Finish(RMD160_CTX *context, uint8_t digest[20])
 			digest[i + 3] = (context->state[i>>2] >> 24);
 		}
 	}
+	return 1;
 }
 
 /************************ end of file rmd160.c **********************/
diff --git a/ext/digest/rmd160/rmd160.h b/ext/digest/rmd160/rmd160.h
index 2c98f11cd0..6324709d96 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) */
@@ -43,10 +43,10 @@ typedef struct {
 #endif
 
 __BEGIN_DECLS
-void	RMD160_Init _((RMD160_CTX *));
+int	RMD160_Init _((RMD160_CTX *));
 void	RMD160_Transform _((uint32_t[5], const uint32_t[16]));
 void	RMD160_Update _((RMD160_CTX *, const uint8_t *, size_t));
-void	RMD160_Finish _((RMD160_CTX *, uint8_t[20]));
+int	RMD160_Finish _((RMD160_CTX *, uint8_t[20]));
 __END_DECLS
 
 #define RMD160_BLOCK_LENGTH             64
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
index 0839f1b820..a2c0a023c0 100644
--- a/ext/digest/rmd160/rmd160init.c
+++ b/ext/digest/rmd160/rmd160init.c
@@ -1,8 +1,9 @@
 /* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
 /* $Id$ */
 
-#include "digest.h"
-#if defined(HAVE_OPENSSL_RIPEMD_H)
+#include <ruby/ruby.h>
+#include "../digest.h"
+#if defined(RMD160_USE_OPENSSL)
 #include "rmd160ossl.h"
 #else
 #include "rmd160.h"
@@ -19,22 +20,45 @@ 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()
+Init_rmd160(void)
 {
     VALUE mDigest, cDigest_Base, cDigest_RMD160;
 
-    rb_require("digest");
-
-    mDigest = rb_path2class("Digest");
+#if 0
+    mDigest = rb_define_module("Digest"); /* let rdoc know */
+#endif
+    mDigest = rb_digest_namespace();
     cDigest_Base = rb_path2class("Digest::Base");
 
     cDigest_RMD160 = rb_define_class_under(mDigest, "RMD160", cDigest_Base);
 
-    rb_ivar_set(cDigest_RMD160, rb_intern("metadata"),
-      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&rmd160));
+#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));
 }
diff --git a/ext/digest/rmd160/rmd160ossl.c b/ext/digest/rmd160/rmd160ossl.c
deleted file mode 100644
index f24e63e3d8..0000000000
--- a/ext/digest/rmd160/rmd160ossl.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $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 3df38a01c0..e6bf5ea8d0 100644
--- a/ext/digest/rmd160/rmd160ossl.h
+++ b/ext/digest/rmd160/rmd160ossl.h
@@ -14,6 +14,7 @@
 #define RMD160_BLOCK_LENGTH		RIPEMD160_CBLOCK
 #define RMD160_DIGEST_LENGTH		RIPEMD160_DIGEST_LENGTH
 
-void RMD160_Finish(RMD160_CTX *ctx, char *buf);
+static DEFINE_FINISH_FUNC_FROM_FINAL(RIPEMD160)
+#define RMD160_Finish rb_digest_RIPEMD160_finish
 
 #endif
diff --git a/ext/digest/sha1/depend b/ext/digest/sha1/depend
index 61607844d0..bc9e216eed 100644
--- a/ext/digest/sha1/depend
+++ b/ext/digest/sha1/depend
@@ -1,6 +1,19 @@
-sha1.o: sha1.c sha1.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
-sha1init.o: sha1init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
-  sha1.h $(srcdir)/../defs.h
-sha1ossl.o: sha1ossl.h  $(srcdir)/../defs.h
+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.h
+sha1init.o: $(hdrdir)/ruby/assert.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: $(srcdir)/../digest.h
+sha1init.o: sha1init.c
+sha1init.o: sha1ossl.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
index fa9945cd43..0ff4158bef 100644
--- a/ext/digest/sha1/extconf.rb
+++ b/ext/digest/sha1/extconf.rb
@@ -1,21 +1,16 @@
+# -*- 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}" ]
 
-dir_config("openssl")
-
-if !with_config("bundled-sha1") &&
-    have_library("crypto") && have_header("openssl/sha.h")
-  $objs << "sha1ossl.#{$OBJEXT}"
-else
-  $objs << "sha1.#{$OBJEXT}"
-end
+digest_conf("sha1", "sha", nil, %w[SHA])
 
 have_header("sys/cdefs.h")
 
diff --git a/ext/digest/sha1/sha1.c b/ext/digest/sha1/sha1.c
index 6196ca6b82..5311227549 100644
--- a/ext/digest/sha1/sha1.c
+++ b/ext/digest/sha1/sha1.c
@@ -199,7 +199,7 @@ void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
 /*
  * SHA1_Init - Initialize new context
  */
-void SHA1_Init(SHA1_CTX *context)
+int SHA1_Init(SHA1_CTX *context)
 {
 
     _DIAGASSERT(context != 0);
@@ -211,6 +211,7 @@ void SHA1_Init(SHA1_CTX *context)
     context->state[3] = 0x10325476;
     context->state[4] = 0xC3D2E1F0;
     context->count[0] = context->count[1] = 0;
+    return 1;
 }
 
 
@@ -244,7 +245,7 @@ void SHA1_Update(SHA1_CTX *context, const uint8_t *data, size_t len)
 /*
  * Add padding and return the message digest.
  */
-void SHA1_Finish(SHA1_CTX* context, uint8_t digest[20])
+int SHA1_Finish(SHA1_CTX* context, uint8_t digest[20])
 {
     size_t i;
     uint8_t finalcount[8];
@@ -266,4 +267,5 @@ void SHA1_Finish(SHA1_CTX* context, uint8_t digest[20])
 	    digest[i] = (uint8_t)
 		((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
     }
+    return 1;
 }
diff --git a/ext/digest/sha1/sha1.h b/ext/digest/sha1/sha1.h
index 55997e73dd..2accc46d46 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];
@@ -28,9 +28,9 @@ typedef struct {
 #endif
 
 void	SHA1_Transform _((uint32_t state[5], const uint8_t buffer[64]));
-void	SHA1_Init _((SHA1_CTX *context));
+int	SHA1_Init _((SHA1_CTX *context));
 void	SHA1_Update _((SHA1_CTX *context, const uint8_t *data, size_t len));
-void	SHA1_Finish _((SHA1_CTX *context, uint8_t digest[20]));
+int	SHA1_Finish _((SHA1_CTX *context, uint8_t digest[20]));
 
 #define SHA1_BLOCK_LENGTH		64
 #define SHA1_DIGEST_LENGTH		20
diff --git a/ext/digest/sha1/sha1cc.h b/ext/digest/sha1/sha1cc.h
new file mode 100644
index 0000000000..2ed8d646ab
--- /dev/null
+++ b/ext/digest/sha1/sha1cc.h
@@ -0,0 +1,14 @@
+#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 06e7378950..3adf424b1d 100644
--- a/ext/digest/sha1/sha1init.c
+++ b/ext/digest/sha1/sha1init.c
@@ -1,9 +1,12 @@
 /* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
 /* $Id$ */
 
-#include "digest.h"
-#if defined(HAVE_OPENSSL_SHA_H)
+#include <ruby/ruby.h>
+#include "../digest.h"
+#if defined(SHA1_USE_OPENSSL)
 #include "sha1ossl.h"
+#elif defined(SHA1_USE_COMMONDIGEST)
+#include "sha1cc.h"
 #else
 #include "sha1.h"
 #endif
@@ -19,22 +22,47 @@ 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()
+Init_sha1(void)
 {
     VALUE mDigest, cDigest_Base, cDigest_SHA1;
 
-    rb_require("digest");
-
-    mDigest = rb_path2class("Digest");
+#if 0
+    mDigest = rb_define_module("Digest"); /* let rdoc know */
+#endif
+    mDigest = rb_digest_namespace();
     cDigest_Base = rb_path2class("Digest::Base");
 
     cDigest_SHA1 = rb_define_class_under(mDigest, "SHA1", cDigest_Base);
 
-    rb_ivar_set(cDigest_SHA1, rb_intern("metadata"),
-      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&sha1));
+#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));
 }
diff --git a/ext/digest/sha1/sha1ossl.c b/ext/digest/sha1/sha1ossl.c
deleted file mode 100644
index 452cf35084..0000000000
--- a/ext/digest/sha1/sha1ossl.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $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 8f9984cc64..599efe9a2f 100644
--- a/ext/digest/sha1/sha1ossl.h
+++ b/ext/digest/sha1/sha1ossl.h
@@ -15,6 +15,8 @@
 #endif
 #define SHA1_DIGEST_LENGTH	SHA_DIGEST_LENGTH
 
-void SHA1_Finish(SHA1_CTX *ctx, char *buf);
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1)
+#undef SHA1_Finish
+#define SHA1_Finish rb_digest_SHA1_finish
 
 #endif
diff --git a/ext/digest/sha2/depend b/ext/digest/sha2/depend
index 00e18e158d..8946d44f31 100644
--- a/ext/digest/sha2/depend
+++ b/ext/digest/sha2/depend
@@ -1,6 +1,19 @@
-sha2.o: sha2.c sha2.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
-sha2init.o: sha2init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
-  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
-  sha2.h $(srcdir)/../defs.h
-sha2ossl.o: sha2ossl.h $(srcdir)/../defs.h
+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.h
+sha2init.o: $(hdrdir)/ruby/assert.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: $(srcdir)/../digest.h
+sha2init.o: sha2init.c
+sha2init.o: sha2ossl.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index a8f0198cf0..5c7f76c7f3 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -1,30 +1,21 @@
+# -*- 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}" ]
 
-dir_config("openssl")
-
-if !with_config("bundled-sha2") &&
-    have_library("crypto") &&
-    %w[SHA256 SHA512].all? {|d| have_func("#{d}_Transform", "openssl/sha.h")} &&
-    %w[SHA256 SHA512].all? {|d| have_type("#{d}_CTX", "openssl/sha.h")}
-  $objs << "sha2ossl.#{$OBJEXT}"
-  $defs << "-DSHA2_USE_OPENSSL"
-else
+unless digest_conf("sha2", "sha", %w[SHA256 SHA512])
   have_type("u_int8_t")
-  $objs << "sha2.#{$OBJEXT}"
 end
 
 have_header("sys/cdefs.h")
 
 $preload = %w[digest]
 
-if have_type("uint64_t", "defs.h", $defs.join(' '))
-  create_makefile("digest/sha2")
-end
+create_makefile("digest/sha2")
diff --git a/ext/digest/sha2/lib/sha2.rb b/ext/digest/sha2/lib/sha2.rb
index 3c5bf0c863..61a0734850 100644
--- a/ext/digest/sha2/lib/sha2.rb
+++ b/ext/digest/sha2/lib/sha2.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 #--
 # sha2.rb - defines Digest::SHA2 class which wraps up the SHA256,
 #           SHA384, and SHA512 classes.
@@ -16,11 +17,45 @@ 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
     #
-    # Creates a new SHA2 hash object with a given bit length.
+    # Create a new SHA2 hash object with a given bit length.
     #
     # Valid bit lengths are 256, 384 and 512.
     def initialize(bitlen = 256)
@@ -40,7 +75,7 @@ module Digest
     # call-seq:
     #   digest_obj.reset -> digest_obj
     #
-    # Resets the digest to the initial state and returns self.
+    # Reset the digest to the initial state and return self.
     def reset
       @sha2.reset
       self
@@ -50,7 +85,7 @@ module Digest
     #   digest_obj.update(string) -> digest_obj
     #   digest_obj << string -> digest_obj
     #
-    # Updates the digest using a given _string_ and returns self.
+    # Update the digest using a given _string_ and return self.
     def update(str)
       @sha2.update(str)
       self
@@ -66,13 +101,13 @@ module Digest
     # call-seq:
     #   digest_obj.block_length -> Integer
     #
-    # Returns the block length of the digest in bytes.
+    # Return the block length of the digest in bytes.
     #
-    #   Digest::SHA256.new.digest_length * 8
+    #   Digest::SHA256.new.block_length * 8
     #   # => 512
-    #   Digest::SHA384.new.digest_length * 8
+    #   Digest::SHA384.new.block_length * 8
     #   # => 1024
-    #   Digest::SHA512.new.digest_length * 8
+    #   Digest::SHA512.new.block_length * 8
     #   # => 1024
     def block_length
       @sha2.block_length
@@ -81,7 +116,7 @@ module Digest
     # call-seq:
     #   digest_obj.digest_length -> Integer
     #
-    # Returns the length of the hash value of the digest in bytes.
+    # Return the length of the hash value (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 0566b93cb7..c86eab37a0 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
- * equivilent.
+ * equivalent.
  *
  * If your system does not define the above, then you can do so by
  * hand like this:
@@ -138,7 +138,7 @@ typedef u_int64_t sha2_word64;	/* Exactly 8 bytes */
 #define REVERSE32(w,x)	{ \
 	sha2_word32 tmp = (w); \
 	tmp = (tmp >> 16) | (tmp << 16); \
-	(x) = ((tmp & 0xff00ff00UL) >> 8) | ((tmp & 0x00ff00ffUL) << 8); \
+	(x) = ((tmp & (sha2_word32)0xff00ff00UL) >> 8) | ((tmp & (sha2_word32)0x00ff00ffUL) << 8); \
 }
 #define REVERSE64(w,x)	{ \
 	sha2_word64 tmp = (w); \
@@ -341,13 +341,14 @@ static const char *sha2_hex_digits = "0123456789abcdef";
 
 
 /*** SHA-256: *********************************************************/
-void SHA256_Init(SHA256_CTX* context) {
+int SHA256_Init(SHA256_CTX* context) {
 	if (context == (SHA256_CTX*)0) {
-		return;
+		return 0;
 	}
 	MEMCPY_BCOPY(context->state, sha256_initial_hash_value, SHA256_DIGEST_LENGTH);
 	MEMSET_BZERO(context->buffer, SHA256_BLOCK_LENGTH);
 	context->bitcount = 0;
+	return 1;
 }
 
 #ifdef SHA2_UNROLL_TRANSFORM
@@ -574,7 +575,7 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
 	usedspace = freespace = 0;
 }
 
-void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
+int SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
 	sha2_word32	*d = (sha2_word32*)digest;
 	unsigned int	usedspace;
 
@@ -613,7 +614,8 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
 			*context->buffer = 0x80;
 		}
 		/* Set the bit count: */
-		*(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount;
+		MEMCPY_BCOPY(&context->buffer[SHA256_SHORT_BLOCK_LENGTH], &context->bitcount,
+			     sizeof(sha2_word64));
 
 		/* Final transform: */
 		SHA256_Transform(context, (sha2_word32*)context->buffer);
@@ -633,8 +635,9 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
 	}
 
 	/* Clean up state data: */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(*context));
 	usedspace = 0;
+	return 1;
 }
 
 char *SHA256_End(SHA256_CTX* context, char buffer[]) {
@@ -653,7 +656,7 @@ char *SHA256_End(SHA256_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(context, sizeof(*context));
 	}
 	MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH);
 	return buffer;
@@ -669,13 +672,14 @@ char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_S
 
 
 /*** SHA-512: *********************************************************/
-void SHA512_Init(SHA512_CTX* context) {
+int SHA512_Init(SHA512_CTX* context) {
 	if (context == (SHA512_CTX*)0) {
-		return;
+		return 0;
 	}
 	MEMCPY_BCOPY(context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH);
 	MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH);
 	context->bitcount[0] = context->bitcount[1] =  0;
+	return 1;
 }
 
 #ifdef SHA2_UNROLL_TRANSFORM
@@ -930,14 +934,16 @@ void SHA512_Last(SHA512_CTX* context) {
 		*context->buffer = 0x80;
 	}
 	/* Store the length of input data (in bits): */
-	*(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1];
-	*(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
+	MEMCPY_BCOPY(&context->buffer[SHA512_SHORT_BLOCK_LENGTH], &context->bitcount[1],
+		     sizeof(sha2_word64));
+	MEMCPY_BCOPY(&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8], &context->bitcount[0],
+		     sizeof(sha2_word64));
 
 	/* Final transform: */
 	SHA512_Transform(context, (sha2_word64*)context->buffer);
 }
 
-void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
+int SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
 	sha2_word64	*d = (sha2_word64*)digest;
 
 	/* Sanity check: */
@@ -963,7 +969,8 @@ void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
 	}
 
 	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(*context));
+	return 1;
 }
 
 char *SHA512_End(SHA512_CTX* context, char buffer[]) {
@@ -982,7 +989,7 @@ char *SHA512_End(SHA512_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(context, sizeof(*context));
 	}
 	MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
 	return buffer;
@@ -998,20 +1005,21 @@ char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_S
 
 
 /*** SHA-384: *********************************************************/
-void SHA384_Init(SHA384_CTX* context) {
+int SHA384_Init(SHA384_CTX* context) {
 	if (context == (SHA384_CTX*)0) {
-		return;
+		return 0;
 	}
 	MEMCPY_BCOPY(context->state, sha384_initial_hash_value, SHA512_DIGEST_LENGTH);
 	MEMSET_BZERO(context->buffer, SHA384_BLOCK_LENGTH);
 	context->bitcount[0] = context->bitcount[1] = 0;
+	return 1;
 }
 
 void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
 	SHA512_Update((SHA512_CTX*)context, data, len);
 }
 
-void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
+int SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
 	sha2_word64	*d = (sha2_word64*)digest;
 
 	/* Sanity check: */
@@ -1037,7 +1045,8 @@ void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
 	}
 
 	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(*context));
+	return 1;
 }
 
 char *SHA384_End(SHA384_CTX* context, char buffer[]) {
@@ -1056,7 +1065,7 @@ char *SHA384_End(SHA384_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(context, sizeof(*context));
 	}
 	MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
 	return buffer;
diff --git a/ext/digest/sha2/sha2.h b/ext/digest/sha2/sha2.h
index 465398ee19..e58f15ae12 100644
--- a/ext/digest/sha2/sha2.h
+++ b/ext/digest/sha2/sha2.h
@@ -165,52 +165,52 @@ typedef SHA512_CTX SHA384_CTX;
 
 #ifndef NOPROTO
 
-void SHA256_Init(SHA256_CTX *);
+int SHA256_Init(SHA256_CTX *);
 void SHA256_Update(SHA256_CTX*, const uint8_t*, size_t);
-void SHA256_Final(uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
+int SHA256_Final(uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
 char* SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]);
 char* SHA256_Data(const uint8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]);
 
-void SHA384_Init(SHA384_CTX*);
+int SHA384_Init(SHA384_CTX*);
 void SHA384_Update(SHA384_CTX*, const uint8_t*, size_t);
-void SHA384_Final(uint8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
+int SHA384_Final(uint8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
 char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
 char* SHA384_Data(const uint8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
 
-void SHA512_Init(SHA512_CTX*);
+int SHA512_Init(SHA512_CTX*);
 void SHA512_Update(SHA512_CTX*, const uint8_t*, size_t);
-void SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
+int SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
 char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
 char* SHA512_Data(const uint8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
 
 #else /* NOPROTO */
 
-void SHA256_Init();
+int SHA256_Init();
 void SHA256_Update();
 #ifdef RUBY
-void SHA256_Finish();
+int SHA256_Finish();
 #else
-void SHA256_Final();
+int SHA256_Final();
 #endif /* RUBY */
 char* SHA256_End();
 char* SHA256_Data();
 
-void SHA384_Init();
+int SHA384_Init();
 void SHA384_Update();
 #ifdef RUBY
-void SHA384_Finish();
+int SHA384_Finish();
 #else
-void SHA384_Final();
+int SHA384_Final();
 #endif /* RUBY */
 char* SHA384_End();
 char* SHA384_Data();
 
-void SHA512_Init();
+int SHA512_Init();
 void SHA512_Update();
 #ifdef RUBY
-void SHA512_Finish();
+int SHA512_Finish();
 #else
-void SHA512_Final();
+int SHA512_Final();
 #endif /* RUBY */
 char* SHA512_End();
 char* SHA512_Data();
diff --git a/ext/digest/sha2/sha2cc.h b/ext/digest/sha2/sha2cc.h
new file mode 100644
index 0000000000..3f99604465
--- /dev/null
+++ b/ext/digest/sha2/sha2cc.h
@@ -0,0 +1,31 @@
+#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 13df4bcb78..7d211784a3 100644
--- a/ext/digest/sha2/sha2init.c
+++ b/ext/digest/sha2/sha2init.c
@@ -1,9 +1,12 @@
 /* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
 /* $Id$ */
 
-#include "digest.h"
+#include <ruby/ruby.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
@@ -29,28 +32,26 @@ FOREACH_BITLEN(DEFINE_ALGO_METADATA)
  * Standards and Technology), described in FIPS PUB 180-2.
  */
 void
-Init_sha2()
+Init_sha2(void)
 {
     VALUE mDigest, cDigest_Base;
-    ID id_metadata;
+    ID id_metadata = rb_id_metadata();
 
 #define DECLARE_ALGO_CLASS(bitlen) \
     VALUE cDigest_SHA##bitlen;
 
     FOREACH_BITLEN(DECLARE_ALGO_CLASS)
 
-    rb_require("digest");
-
-    id_metadata = rb_intern("metadata");
-
-    mDigest = rb_path2class("Digest");
+    mDigest = rb_digest_namespace();
     cDigest_Base = rb_path2class("Digest::Base");
 
 #define DEFINE_ALGO_CLASS(bitlen) \
     cDigest_SHA##bitlen = rb_define_class_under(mDigest, "SHA" #bitlen, cDigest_Base); \
 \
     rb_ivar_set(cDigest_SHA##bitlen, id_metadata, \
-      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&sha##bitlen));
+		Data_Wrap_Struct(0, 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
deleted file mode 100644
index 86824e72f4..0000000000
--- a/ext/digest/sha2/sha2ossl.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "defs.h"
-#include "sha2ossl.h"
-
-#define SHA_Finish(bit) \
-    void SHA##bit##_Finish(SHA##bit##_CTX *ctx, char *buf) \
-    { SHA##bit##_Final((unsigned char *)buf, ctx);}
-#define SHA384_Final SHA512_Final
-
-SHA_Finish(256)
-SHA_Finish(384)
-SHA_Finish(512)
diff --git a/ext/digest/sha2/sha2ossl.h b/ext/digest/sha2/sha2ossl.h
index 4229d14cf9..8dd0530107 100644
--- a/ext/digest/sha2/sha2ossl.h
+++ b/ext/digest/sha2/sha2ossl.h
@@ -8,10 +8,20 @@
 #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;
 
-void SHA256_Finish(SHA256_CTX *ctx, char *buf);
-void SHA384_Finish(SHA384_CTX *ctx, char *buf);
-void SHA512_Finish(SHA512_CTX *ctx, char *buf);
+#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)
 
 #endif
diff --git a/ext/dl/callback/depend b/ext/dl/callback/depend
deleted file mode 100644
index 7a1dc1ee62..0000000000
--- a/ext/dl/callback/depend
+++ /dev/null
@@ -1,15 +0,0 @@
-src: callback.c \
-     callback-0.c callback-1.c callback-2.c \
-     callback-3.c callback-4.c callback-5.c \
-     callback-6.c callback-7.c callback-8.c
-
-$(OBJS): $(hdrdir)/ruby.h
-
-callback-0.c callback-1.c callback-2.c \
-callback-3.c callback-4.c callback-5.c \
-callback-6.c callback-7.c callback-8.c \
-	: callback.c
-
-callback.c: $(srcdir)/mkcallback.rb $(srcdir)/../dl.h
-	@echo "generating callback.c"
-	@$(RUBY) $(srcdir)/mkcallback.rb -output=callback $(srcdir)/../dl.h
diff --git a/ext/dl/callback/extconf.rb b/ext/dl/callback/extconf.rb
deleted file mode 100644
index 6c3387670d..0000000000
--- a/ext/dl/callback/extconf.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'mkmf'
-
-if compiled?("dl")
-  callbacks = (0..8).map{|i| "callback-#{i}"}.unshift("callback")
-  callback_srcs = callbacks.map{|basename| "#{basename}.c"}
-  callback_objs = callbacks.map{|basename| "#{basename}.o"}
-
-  $distcleanfiles << '$(SRCS)'
-  $srcs = callback_srcs
-  $objs = callback_objs
-  $INCFLAGS << " -I$(srcdir)/.."
-
-  create_makefile("dl/callback")
-end
diff --git a/ext/dl/callback/mkcallback.rb b/ext/dl/callback/mkcallback.rb
deleted file mode 100644
index d14072a932..0000000000
--- a/ext/dl/callback/mkcallback.rb
+++ /dev/null
@@ -1,246 +0,0 @@
-#!ruby -s
-$output ||= "callback"
-$out = open("#{$output}.c", "w")
-
-$dl_h = ARGV[0] || "dl.h"
-
-# import DLSTACK_SIZE, DLSTACK_ARGS and so on
-File.open($dl_h){|f|
-  pre = ""
-  f.each{|line|
-    line.chop!
-    if( line[-1] == ?\\ )
-      line.chop!
-      line.concat(" ")
-      pre += line
-      next
-    end
-    if( pre.size > 0 )
-      line = pre + line
-      pre  = ""
-    end
-    case line
-    when /#define\s+DLSTACK_SIZE\s+\(?(\d+)\)?/
-      DLSTACK_SIZE = $1.to_i
-    when /#define\s+DLSTACK_ARGS\s+(.+)/
-      DLSTACK_ARGS = $1.to_i
-    when /#define\s+DLTYPE_([A-Z_]+)\s+\(?(\d+)\)?/
-      eval("#{$1} = #{$2}")
-    when /#define\s+MAX_DLTYPE\s+\(?(\d+)\)?/
-      MAX_DLTYPE  = $1.to_i
-    when /#define\s+MAX_CALLBACK\s+\(?(\d+)\)?/
-      MAX_CALLBACK = $1.to_i
-    end
-  }
-}
-
-CDECL = "cdecl"
-STDCALL = "stdcall"
-
-CALLTYPES = [CDECL, STDCALL]
-
-DLTYPE = {
-  VOID => {
-    :name => 'void',
-    :type => 'void',
-    :conv => nil,
-  },
-  CHAR => {
-    :name => 'char',
-    :type => 'char',
-    :conv => 'NUM2CHR(%s)'
-  },
-  SHORT => {
-    :name => 'short',
-    :type => 'short',
-    :conv => 'NUM2INT(%s)',
-  },
-  INT => {
-    :name => 'int',
-    :type => 'int',
-    :conv => 'NUM2INT(%s)',
-  },
-  LONG  => {
-    :name => 'long',
-    :type => 'long',
-    :conv => 'NUM2LONG(%s)',
-  },
-  LONG_LONG => {
-    :name => 'long_long',
-    :type => 'LONG_LONG',
-    :conv => 'NUM2LL(%s)',
-  },
-  FLOAT => {
-    :name => 'float',
-    :type => 'float',
-    :conv => '(float)RFLOAT_VALUE(%s)',
-  },
-  DOUBLE => {
-    :name => 'double',
-    :type => 'double',
-    :conv => 'RFLOAT_VALUE(%s)',
-  },
-  VOIDP => {
-    :name => 'ptr',
-    :type => 'void *',
-    :conv => 'NUM2PTR(%s)',
-  },
-}
-
-
-def func_name(ty, argc, n, calltype)
-  "rb_dl_callback_#{DLTYPE[ty][:name]}_#{argc}_#{n}_#{calltype}"
-end
-
-$out << (<<EOS)
-#include "ruby.h"
-
-VALUE rb_DLCdeclCallbackAddrs, rb_DLCdeclCallbackProcs;
-#ifdef FUNC_STDCALL
-VALUE rb_DLStdcallCallbackAddrs, rb_DLStdcallCallbackProcs;
-#endif
-/*static void *cdecl_callbacks[MAX_DLTYPE][MAX_CALLBACK];*/
-#ifdef FUNC_STDCALL
-/*static void *stdcall_callbacks[MAX_DLTYPE][MAX_CALLBACK];*/
-#endif
-ID   rb_dl_cb_call;
-EOS
-
-def foreach_proc_entry
-  for calltype in CALLTYPES
-    case calltype
-    when CDECL
-      proc_entry = "rb_DLCdeclCallbackProcs"
-    when STDCALL
-      proc_entry = "rb_DLStdcallCallbackProcs"
-    else
-      raise "unknown calltype: #{calltype}"
-    end
-    yield calltype, proc_entry
-  end
-end
-
-def gencallback(ty, calltype, proc_entry, argc, n)
-  <<-EOS
-#{calltype == STDCALL ? "\n#ifdef FUNC_STDCALL" : ""}
-static #{DLTYPE[ty][:type]}
-FUNC_#{calltype.upcase}(#{func_name(ty,argc,n,calltype)})(#{(0...argc).collect{|i| "DLSTACK_TYPE stack" + i.to_s}.join(", ")})
-{
-    VALUE ret, cb#{argc > 0 ? ", args[#{argc}]" : ""};
-#{
-      sizeof_voidp = [""].pack('p').size
-      sizeof_long = [0].pack('l!').size
-      (0...argc).collect{|i|
-        if sizeof_voidp == sizeof_long
-          "    args[%d] = LONG2NUM(stack%d);" % [i,i]
-        elsif sizeof_voidp == 8 # should get sizeof_long_long...
-          "    args[%d] = LL2NUM(stack%d);" % [i,i]
-        else
-          raise "unknown size of void*"
-        end
-      }.join("\n")
-}
-    cb = rb_ary_entry(rb_ary_entry(#{proc_entry}, #{ty}), #{(n * DLSTACK_SIZE) + argc});
-    ret = rb_funcall2(cb, rb_dl_cb_call, #{argc}, #{argc > 0 ? 'args' : 'NULL'});
-    return #{DLTYPE[ty][:conv] ? DLTYPE[ty][:conv] % "ret" : ""};
-}
-#{calltype == STDCALL ? "#endif\n" : ""}
-  EOS
-end
-
-def gen_push_proc_ary(ty, aryname)
-  sprintf("    rb_ary_push(#{aryname}, rb_ary_new3(%d,%s));",
-          MAX_CALLBACK * DLSTACK_SIZE,
-          (0...MAX_CALLBACK).collect{
-            (0...DLSTACK_SIZE).collect{ "Qnil" }.join(",")
-          }.join(","))
-end
-
-def gen_push_addr_ary(ty, aryname, calltype)
-  sprintf("    rb_ary_push(#{aryname}, rb_ary_new3(%d,%s));",
-          MAX_CALLBACK * DLSTACK_SIZE,
-          (0...MAX_CALLBACK).collect{|i|
-            (0...DLSTACK_SIZE).collect{|argc|
-              "PTR2NUM(%s)" % func_name(ty,argc,i,calltype)
-            }.join(",")
-          }.join(","))
-end
-
-def gen_callback_file(ty)
-  filename = "#{$output}-#{ty}.c"
-  initname = "rb_dl_init_callbacks_#{ty}"
-  body = <<-EOS
-#include "dl.h"
-
-extern VALUE rb_DLCdeclCallbackAddrs, rb_DLCdeclCallbackProcs;
-#ifdef FUNC_STDCALL
-extern VALUE rb_DLStdcallCallbackAddrs, rb_DLStdcallCallbackProcs;
-#endif
-extern ID   rb_dl_cb_call;
-    EOS
-  yield body
-  body << <<-EOS
-void
-#{initname}()
-{
-#{gen_push_proc_ary(ty, "rb_DLCdeclCallbackProcs")}
-#{gen_push_addr_ary(ty, "rb_DLCdeclCallbackAddrs", CDECL)}
-#ifdef FUNC_STDCALL
-#{gen_push_proc_ary(ty, "rb_DLStdcallCallbackProcs")}
-#{gen_push_addr_ary(ty, "rb_DLStdcallCallbackAddrs", STDCALL)}
-#endif
-}
-    EOS
-  [filename, initname, body]
-end
-
-callbacks = []
-for ty in 0...MAX_DLTYPE
-  filename, initname, body = gen_callback_file(ty) {|f|
-    foreach_proc_entry do |calltype, proc_entry|
-      for argc in 0...DLSTACK_SIZE
-        for n in 0...MAX_CALLBACK
-          f << gencallback(ty, calltype, proc_entry, argc, n)
-        end
-      end
-    end
-  }
-  $out << "void #{initname}();\n"
-  callbacks << [filename, body]
-end
-
-$out << (<<EOS)
-void
-Init_callback(void)
-{
-    VALUE tmp;
-    VALUE rb_mDL = rb_path2class("DL");
-
-    rb_dl_cb_call = rb_intern("call");
-
-    tmp = rb_DLCdeclCallbackProcs = rb_ary_new();
-    rb_define_const(rb_mDL, "CdeclCallbackProcs", tmp);
-
-    tmp = rb_DLCdeclCallbackAddrs = rb_ary_new();
-    rb_define_const(rb_mDL, "CdeclCallbackAddrs", tmp);
-
-#ifdef FUNC_STDCALL
-    tmp = rb_DLStdcallCallbackProcs = rb_ary_new();
-    rb_define_const(rb_mDL, "StdcallCallbackProcs", tmp);
-
-    tmp = rb_DLStdcallCallbackAddrs = rb_ary_new();
-    rb_define_const(rb_mDL, "StdcallCallbackAddrs", tmp);
-#endif
-
-#{
-    (0...MAX_DLTYPE).collect{|ty|
-      "    rb_dl_init_callbacks_#{ty}();"
-    }.join("\n")
-}
-}
-EOS
-$out.close
-
-for filename, body in callbacks
-  open(filename, "wb") {|f| f.puts body}
-end
diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c
deleted file mode 100644
index 677d0e1f4d..0000000000
--- a/ext/dl/cfunc.c
+++ /dev/null
@@ -1,660 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby.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_free(void *ptr)
-{
-    struct cfunc_data *data = ptr;
-    if( data->name ){
-	xfree(data->name);
-    }
-    xfree(data);
-}
-
-static size_t
-dlcfunc_memsize(const void *ptr)
-{
-    const struct cfunc_data *data = ptr;
-    size_t size = 0;
-    if( data ){
-	size += sizeof(*data);
-	if( data->name ){
-	    size += strlen(data->name) + 1;
-	}
-    }
-    return size;
-}
-
-const rb_data_type_t dlcfunc_data_type = {
-    "dl/cfunc",
-    {0, dlcfunc_free, dlcfunc_memsize,},
-};
-
-VALUE
-rb_dlcfunc_new(void (*func)(), int type, const char *name, ID calltype)
-{
-    VALUE val;
-    struct cfunc_data *data;
-
-    rb_secure(4);
-    if( func ){
-	val = TypedData_Make_Struct(rb_cDLCFunc, struct cfunc_data, &dlcfunc_data_type, data);
-	data->ptr  = (void *)(VALUE)func;
-	data->name = name ? strdup(name) : NULL;
-	data->type = type;
-	data->calltype = calltype;
-    }
-    else{
-	val = Qnil;
-    }
-
-    return val;
-}
-
-void *
-rb_dlcfunc2ptr(VALUE val)
-{
-    struct cfunc_data *data;
-    void * func;
-
-    if( rb_typeddata_is_kind_of(val, &dlcfunc_data_type) ){
-	data = DATA_PTR(val);
-	func = data->ptr;
-    }
-    else if( val == Qnil ){
-	func = NULL;
-    }
-    else{
-	rb_raise(rb_eTypeError, "DL::CFunc was expected");
-    }
-
-    return func;
-}
-
-static VALUE
-rb_dlcfunc_s_allocate(VALUE klass)
-{
-    VALUE obj;
-    struct cfunc_data *data;
-
-    obj = TypedData_Make_Struct(klass, struct cfunc_data, &dlcfunc_data_type, data);
-    data->ptr  = 0;
-    data->name = 0;
-    data->type = 0;
-    data->calltype = CFUNC_CDECL;
-
-    return obj;
-}
-
-int
-rb_dlcfunc_kind_p(VALUE func)
-{
-    return rb_typeddata_is_kind_of(func, &dlcfunc_data_type);
-}
-
-/*
- * call-seq:
- *    DL::CFunc.new(address, type=DL::TYPE_VOID, name=nil, calltype=:cdecl)
- *
- * Create a new function that points to +address+ with an optional return type
- * of +type+, a name of +name+ and a calltype of +calltype+.
- */
-static VALUE
-rb_dlcfunc_initialize(int argc, VALUE argv[], VALUE self)
-{
-    VALUE addr, name, type, calltype;
-    struct cfunc_data *data;
-    void *saddr;
-    const char *sname;
-
-    rb_scan_args(argc, argv, "13", &addr, &type, &name, &calltype);
-
-    saddr = (void*)(NUM2PTR(rb_Integer(addr)));
-    sname = NIL_P(name) ? NULL : StringValuePtr(name);
-
-    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, data);
-    if( data->name ) xfree(data->name);
-    data->ptr  = saddr;
-    data->name = sname ? strdup(sname) : 0;
-    data->type = NIL_P(type) ? DLTYPE_VOID : NUM2INT(type);
-    data->calltype = NIL_P(calltype) ? CFUNC_CDECL : SYM2ID(calltype);
-
-    return Qnil;
-}
-
-/*
- * call-seq:
- *    name  => str
- *
- * Get the name of this function
- */
-static VALUE
-rb_dlcfunc_name(VALUE self)
-{
-    struct cfunc_data *cfunc;
-
-    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
-    return cfunc->name ? rb_tainted_str_new2(cfunc->name) : Qnil;
-}
-
-/*
- * call-seq:
- *    cfunc.ctype   => num
- *
- * Get the C function return value type.  See DL for a list of constants
- * corresponding to this method's return value.
- */
-static VALUE
-rb_dlcfunc_ctype(VALUE self)
-{
-    struct cfunc_data *cfunc;
-
-    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
-    return INT2NUM(cfunc->type);
-}
-
-/*
- * call-seq:
- *    cfunc.ctype = type
- *
- * Set the C function return value type to +type+.
- */
-static VALUE
-rb_dlcfunc_set_ctype(VALUE self, VALUE ctype)
-{
-    struct cfunc_data *cfunc;
-
-    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
-    cfunc->type = NUM2INT(ctype);
-    return ctype;
-}
-
-/*
- * call-seq:
- *    cfunc.calltype    => symbol
- *
- * Get the call type of this function.
- */
-static VALUE
-rb_dlcfunc_calltype(VALUE self)
-{
-    struct cfunc_data *cfunc;
-
-    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
-    return ID2SYM(cfunc->calltype);
-}
-
-/*
- * call-seq:
- *    cfunc.calltype = symbol
- *
- * Set the call type for this function.
- */
-static VALUE
-rb_dlcfunc_set_calltype(VALUE self, VALUE sym)
-{
-    struct cfunc_data *cfunc;
-
-    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
-    cfunc->calltype = SYM2ID(sym);
-    return sym;
-}
-
-/*
- * call-seq:
- *    cfunc.ptr
- *
- * Get the underlying function pointer as a DL::CPtr object.
- */
-static VALUE
-rb_dlcfunc_ptr(VALUE self)
-{
-    struct cfunc_data *cfunc;
-
-    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
-    return PTR2NUM(cfunc->ptr);
-}
-
-/*
- * call-seq:
- *    cfunc.ptr = pointer
- *
- * Set the underlying function pointer to a DL::CPtr named +pointer+.
- */
-static VALUE
-rb_dlcfunc_set_ptr(VALUE self, VALUE addr)
-{
-    struct cfunc_data *cfunc;
-
-    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
-    cfunc->ptr = NUM2PTR(addr);
-
-    return Qnil;
-}
-
-/*
- * call-seq: inspect
- *
- * Returns a string formatted with an easily readable representation of the
- * internal state of the DL::CFunc
- */
-static VALUE
-rb_dlcfunc_inspect(VALUE self)
-{
-    VALUE val;
-    struct cfunc_data *cfunc;
-
-    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
-
-    val = rb_sprintf("#<DL::CFunc:%p ptr=%p type=%d name='%s'>",
-	     cfunc,
-	     cfunc->ptr,
-	     cfunc->type,
-	     cfunc->name ? cfunc->name : "");
-    OBJ_TAINT(val);
-    return val;
-}
-
-
-# define DECL_FUNC_CDECL(f,ret,args,val) \
-    ret (FUNC_CDECL(*(f)))(args) = (ret (FUNC_CDECL(*))(args))(VALUE)(val)
-#ifdef FUNC_STDCALL
-# define DECL_FUNC_STDCALL(f,ret,args,val) \
-    ret (FUNC_STDCALL(*(f)))(args) = (ret (FUNC_STDCALL(*))(args))(VALUE)(val)
-#endif
-
-#define CALL_CASE switch( RARRAY_LEN(ary) ){ \
-  CASE(0); break; \
-  CASE(1); break; CASE(2); break; CASE(3); break; CASE(4); break; CASE(5); break; \
-  CASE(6); break; CASE(7); break; CASE(8); break; CASE(9); break; CASE(10);break; \
-  CASE(11);break; CASE(12);break; CASE(13);break; CASE(14);break; CASE(15);break; \
-  CASE(16);break; CASE(17);break; CASE(18);break; CASE(19);break; CASE(20);break; \
-  default: rb_raise(rb_eArgError, "too many arguments"); \
-}
-
-
-#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER == 1500
-# pragma optimize("", off)
-#endif
-/*
- * call-seq:
- *    dlcfunc.call(ary)   => some_value
- *    dlcfunc[ary]        => some_value
- *
- * Calls the function pointer passing in +ary+ as values to the underlying
- * C function.  The return value depends on the ctype.
- */
-static VALUE
-rb_dlcfunc_call(VALUE self, VALUE ary)
-{
-    struct cfunc_data *cfunc;
-    int i;
-    DLSTACK_TYPE stack[DLSTACK_SIZE];
-    VALUE result = Qnil;
-
-    rb_secure_update(self);
-
-    memset(stack, 0, sizeof(DLSTACK_TYPE) * DLSTACK_SIZE);
-    Check_Type(ary, T_ARRAY);
-
-    TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
-
-    if( cfunc->ptr == 0 ){
-	rb_raise(rb_eDLError, "can't call null-function");
-	return Qnil;
-    }
-
-    for( i = 0; i < RARRAY_LEN(ary); i++ ){
-	VALUE arg;
-	if( i >= DLSTACK_SIZE ){
-	    rb_raise(rb_eDLError, "too many arguments (stack overflow)");
-	}
-	arg = rb_to_int(RARRAY_PTR(ary)[i]);
-	rb_check_safe_obj(arg);
-	if (FIXNUM_P(arg)) {
-	    stack[i] = (DLSTACK_TYPE)FIX2LONG(arg);
-	}
-	else if (RB_TYPE_P(arg, T_BIGNUM)) {
-	    stack[i] = (DLSTACK_TYPE)rb_big2ulong_pack(arg);
-	}
-	else {
-	    Check_Type(arg, T_FIXNUM);
-	}
-    }
-
-    /* calltype == CFUNC_CDECL */
-    if( cfunc->calltype == CFUNC_CDECL
-#ifndef FUNC_STDCALL
-	|| cfunc->calltype == CFUNC_STDCALL
-#endif
-	){
-	switch( cfunc->type ){
-	case DLTYPE_VOID:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,void,DLSTACK_PROTO##n,cfunc->ptr); \
-	    f(DLSTACK_ARGS##n(stack)); \
-	    result = Qnil; \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_VOIDP:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,void*,DLSTACK_PROTO##n,cfunc->ptr); \
-	    void * ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = PTR2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_CHAR:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,char,DLSTACK_PROTO##n,cfunc->ptr); \
-	    char ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = CHR2FIX(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_SHORT:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,short,DLSTACK_PROTO##n,cfunc->ptr); \
-	    short ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = INT2NUM((int)ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_INT:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,int,DLSTACK_PROTO##n,cfunc->ptr); \
-	    int ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = INT2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_LONG:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,long,DLSTACK_PROTO##n,cfunc->ptr); \
-	    long ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = LONG2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-#if HAVE_LONG_LONG  /* used in ruby.h */
-	case DLTYPE_LONG_LONG:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,LONG_LONG,DLSTACK_PROTO##n,cfunc->ptr); \
-	    LONG_LONG ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = LL2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-#endif
-	case DLTYPE_FLOAT:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,float,DLSTACK_PROTO##n,cfunc->ptr); \
-	    float ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = rb_float_new(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_DOUBLE:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,double,DLSTACK_PROTO##n,cfunc->ptr); \
-	    double ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = rb_float_new(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	default:
-	    rb_raise(rb_eDLTypeError, "unknown type %d", cfunc->type);
-	}
-    }
-#ifdef FUNC_STDCALL
-    else if( cfunc->calltype == CFUNC_STDCALL ){
-	/* calltype == CFUNC_STDCALL */
-	switch( cfunc->type ){
-	case DLTYPE_VOID:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,void,DLSTACK_PROTO##n##_,cfunc->ptr); \
-	    f(DLSTACK_ARGS##n(stack)); \
-	    result = Qnil; \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_VOIDP:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,void*,DLSTACK_PROTO##n##_,cfunc->ptr); \
-	    void * ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = PTR2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_CHAR:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,char,DLSTACK_PROTO##n##_,cfunc->ptr); \
-	    char ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = CHR2FIX(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_SHORT:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,short,DLSTACK_PROTO##n##_,cfunc->ptr); \
-	    short ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = INT2NUM((int)ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_INT:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,int,DLSTACK_PROTO##n##_,cfunc->ptr); \
-	    int ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = INT2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_LONG:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,long,DLSTACK_PROTO##n##_,cfunc->ptr); \
-	    long ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = LONG2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-#if HAVE_LONG_LONG  /* used in ruby.h */
-	case DLTYPE_LONG_LONG:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,LONG_LONG,DLSTACK_PROTO##n##_,cfunc->ptr); \
-	    LONG_LONG ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = LL2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-#endif
-	case DLTYPE_FLOAT:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,float,DLSTACK_PROTO##n##_,cfunc->ptr); \
-	    float ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = rb_float_new(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_DOUBLE:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,double,DLSTACK_PROTO##n##_,cfunc->ptr); \
-	    double ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = rb_float_new(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	default:
-	    rb_raise(rb_eDLTypeError, "unknown type %d", cfunc->type);
-	}
-    }
-#endif
-    else{
-	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 == 1500
-# pragma optimize("", on)
-#endif
-
-/*
- * call-seq:
- *    dlfunc.to_i   => integer
- *
- * Returns the memory location of this function pointer as an integer.
- */
-static VALUE
-rb_dlcfunc_to_i(VALUE self)
-{
-  struct cfunc_data *cfunc;
-
-  TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, cfunc);
-  return PTR2NUM(cfunc->ptr);
-}
-
-void
-Init_dlcfunc(void)
-{
-    id_last_error = rb_intern("__DL2_LAST_ERROR__");
-#if defined(_WIN32)
-    id_win32_last_error = rb_intern("__DL2_WIN32_LAST_ERROR__");
-#endif
-
-    /*
-     * 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
deleted file mode 100644
index 478fb7126e..0000000000
--- a/ext/dl/cptr.c
+++ /dev/null
@@ -1,659 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby/ruby.h>
-#include <ruby/io.h>
-#include <ctype.h>
-#include "dl.h"
-
-VALUE rb_cDLCPtr;
-
-static inline freefunc_t
-get_freefunc(VALUE func)
-{
-    if (NIL_P(func)) {
-	return NULL;
-    }
-    if (rb_dlcfunc_kind_p(func)) {
-	return (freefunc_t)(VALUE)RCFUNC_DATA(func)->ptr;
-    }
-    return (freefunc_t)(VALUE)NUM2PTR(rb_Integer(func));
-}
-
-static ID id_to_ptr;
-
-static void
-dlptr_free(void *ptr)
-{
-    struct ptr_data *data = ptr;
-    if (data->ptr) {
-	if (data->free) {
-	    (*(data->free))(data->ptr);
-	}
-    }
-}
-
-static size_t
-dlptr_memsize(const void *ptr)
-{
-    const struct ptr_data *data = ptr;
-    return data ? sizeof(*data) + data->size : 0;
-}
-
-static const rb_data_type_t dlptr_data_type = {
-    "dl/ptr",
-    {0, dlptr_free, dlptr_memsize,},
-};
-
-void
-dlptr_init(VALUE val)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(val, struct ptr_data, &dlptr_data_type, data);
-    OBJ_TAINT(val);
-}
-
-VALUE
-rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
-{
-    struct ptr_data *data;
-    VALUE val;
-
-    rb_secure(4);
-    val = TypedData_Make_Struct(klass, struct ptr_data, &dlptr_data_type, data);
-    data->ptr = ptr;
-    data->free = func;
-    data->size = size;
-    dlptr_init(val);
-
-    return val;
-}
-
-VALUE
-rb_dlptr_new(void *ptr, long size, freefunc_t func)
-{
-    return rb_dlptr_new2(rb_cDLCPtr, ptr, size, func);
-}
-
-VALUE
-rb_dlptr_malloc(long size, freefunc_t func)
-{
-    void *ptr;
-
-    rb_secure(4);
-    ptr = ruby_xmalloc((size_t)size);
-    memset(ptr,0,(size_t)size);
-    return rb_dlptr_new(ptr, size, func);
-}
-
-void *
-rb_dlptr2cptr(VALUE val)
-{
-    struct ptr_data *data;
-    void *ptr;
-
-    if (rb_obj_is_kind_of(val, rb_cDLCPtr)) {
-	TypedData_Get_Struct(val, struct ptr_data, &dlptr_data_type, data);
-	ptr = data->ptr;
-    }
-    else if (val == Qnil) {
-	ptr = NULL;
-    }
-    else{
-	rb_raise(rb_eTypeError, "DL::PtrData was expected");
-    }
-
-    return ptr;
-}
-
-static VALUE
-rb_dlptr_s_allocate(VALUE klass)
-{
-    VALUE obj;
-    struct ptr_data *data;
-
-    rb_secure(4);
-    obj = TypedData_Make_Struct(klass, struct ptr_data, &dlptr_data_type, data);
-    data->ptr = 0;
-    data->size = 0;
-    data->free = 0;
-
-    return obj;
-}
-
-/*
- * call-seq:
- *    DL::CPtr.new(address)                   => dl_cptr
- *    DL::CPtr.new(address, size)             => dl_cptr
- *    DL::CPtr.new(address, size, freefunc)   => dl_cptr
- *
- * Create a new pointer to +address+ with an optional +size+ and +freefunc+.
- * +freefunc+ will be called when the instance is garbage collected.
- */
-static VALUE
-rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
-{
-    VALUE ptr, sym, size;
-    struct ptr_data *data;
-    void *p = NULL;
-    freefunc_t f = NULL;
-    long s = 0;
-
-    switch (rb_scan_args(argc, argv, "12", &ptr, &size, &sym)) {
-      case 1:
-	p = (void*)(NUM2PTR(rb_Integer(ptr)));
-	break;
-      case 2:
-	p = (void*)(NUM2PTR(rb_Integer(ptr)));
-	s = NUM2LONG(size);
-	break;
-      case 3:
-	p = (void*)(NUM2PTR(rb_Integer(ptr)));
-	s = NUM2LONG(size);
-	f = get_freefunc(sym);
-	break;
-      default:
-	rb_bug("rb_dlptr_initialize");
-    }
-
-    if (p) {
-	TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
-	if (data->ptr && data->free) {
-	    /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
-	    (*(data->free))(data->ptr);
-	}
-	data->ptr  = p;
-	data->size = s;
-	data->free = f;
-    }
-
-    return Qnil;
-}
-
-/*
- * call-seq:
- *
- *    DL::CPtr.malloc(size, freefunc = nil)  => dl cptr instance
- *
- * Allocate +size+ bytes of memory and associate it with an optional
- * +freefunc+ that will be called when the pointer is garbage collected.
- * +freefunc+ must be an address pointing to a function or an instance of
- * DL::CFunc
- */
-static VALUE
-rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
-{
-    VALUE size, sym, obj;
-    long s;
-    freefunc_t f;
-
-    switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
-      case 1:
-	s = NUM2LONG(size);
-	f = NULL;
-	break;
-      case 2:
-	s = NUM2LONG(size);
-	f = get_freefunc(sym);
-	break;
-      default:
-	rb_bug("rb_dlptr_s_malloc");
-    }
-
-    obj = rb_dlptr_malloc(s,f);
-
-    return obj;
-}
-
-/*
- * call-seq: to_i
- *
- * Returns the integer memory location of this DL::CPtr.
- */
-static VALUE
-rb_dlptr_to_i(VALUE self)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
-    return PTR2NUM(data->ptr);
-}
-
-/*
- * call-seq: to_value
- *
- * Cast this CPtr to a ruby object.
- */
-static VALUE
-rb_dlptr_to_value(VALUE self)
-{
-    struct ptr_data *data;
-    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
-    return (VALUE)(data->ptr);
-}
-
-/*
- * call-seq: ptr
- *
- * Returns a DL::CPtr that is a dereferenced pointer for this DL::CPtr.
- * Analogous to the star operator in C.
- */
-VALUE
-rb_dlptr_ptr(VALUE self)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
-    return rb_dlptr_new(*((void**)(data->ptr)),0,0);
-}
-
-/*
- * call-seq: ref
- *
- * Returns a DL::CPtr that is a reference pointer for this DL::CPtr.
- * Analogous to the ampersand operator in C.
- */
-VALUE
-rb_dlptr_ref(VALUE self)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
-    return rb_dlptr_new(&(data->ptr),0,0);
-}
-
-/*
- * call-seq: null?
- *
- * Returns true if this is a null pointer.
- */
-VALUE
-rb_dlptr_null_p(VALUE self)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
-    return data->ptr ? Qfalse : Qtrue;
-}
-
-/*
- * call-seq: free=(function)
- *
- * Set the free function for this pointer to the DL::CFunc in +function+.
- */
-static VALUE
-rb_dlptr_free_set(VALUE self, VALUE val)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
-    data->free = get_freefunc(val);
-
-    return Qnil;
-}
-
-/*
- * call-seq: free
- *
- * Get the free function for this pointer.  Returns  DL::CFunc or nil.
- */
-static VALUE
-rb_dlptr_free_get(VALUE self)
-{
-    struct ptr_data *pdata;
-
-    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, pdata);
-
-    return rb_dlcfunc_new(pdata->free, DLTYPE_VOID, "free<anonymous>", CFUNC_CDECL);
-}
-
-/*
- * call-seq:
- *
- *    ptr.to_s        => string
- *    ptr.to_s(len)   => string
- *
- * Returns the pointer contents as a string.  When called with no arguments,
- * this method will return the contents until the first NULL byte.  When
- * called with +len+, a string of +len+ bytes will be returned.
- */
-static VALUE
-rb_dlptr_to_s(int argc, VALUE argv[], VALUE self)
-{
-    struct ptr_data *data;
-    VALUE arg1, val;
-    int len;
-
-    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
-    switch (rb_scan_args(argc, argv, "01", &arg1)) {
-      case 0:
-	val = rb_tainted_str_new2((char*)(data->ptr));
-	break;
-      case 1:
-	len = NUM2INT(arg1);
-	val = rb_tainted_str_new((char*)(data->ptr), len);
-	break;
-      default:
-	rb_bug("rb_dlptr_to_s");
-    }
-
-    return val;
-}
-
-/*
- * call-seq:
- *
- *    ptr.to_str        => string
- *    ptr.to_str(len)   => string
- *
- * Returns the pointer contents as a string.  When called with no arguments,
- * this method will return the contents with the length of this pointer's
- * +size+. When called with +len+, a string of +len+ bytes will be returned.
- */
-static VALUE
-rb_dlptr_to_str(int argc, VALUE argv[], VALUE self)
-{
-    struct ptr_data *data;
-    VALUE arg1, val;
-    int len;
-
-    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
-    switch (rb_scan_args(argc, argv, "01", &arg1)) {
-      case 0:
-	val = rb_tainted_str_new((char*)(data->ptr),data->size);
-	break;
-      case 1:
-	len = NUM2INT(arg1);
-	val = rb_tainted_str_new((char*)(data->ptr), len);
-	break;
-      default:
-	rb_bug("rb_dlptr_to_str");
-    }
-
-    return val;
-}
-
-/*
- * call-seq: inspect
- *
- * Returns a string formatted with an easily readable representation of the
- * internal state of the DL::CPtr
- */
-static VALUE
-rb_dlptr_inspect(VALUE self)
-{
-    struct ptr_data *data;
-    char str[1024];
-
-    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
-    snprintf(str, 1023, "#<%s:%p ptr=%p size=%ld free=%p>",
-	     rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, data->free);
-    return rb_str_new2(str);
-}
-
-/*
- *  call-seq:
- *    ptr == other    => true or false
- *    ptr.eql?(other) => true or false
- *
- * Returns true if +other+ wraps the same pointer, otherwise returns
- * false.
- */
-VALUE
-rb_dlptr_eql(VALUE self, VALUE other)
-{
-    void *ptr1, *ptr2;
-
-    if(!rb_obj_is_kind_of(other, rb_cDLCPtr)) return Qfalse;
-
-    ptr1 = rb_dlptr2cptr(self);
-    ptr2 = rb_dlptr2cptr(other);
-
-    return ptr1 == ptr2 ? Qtrue : Qfalse;
-}
-
-/*
- *  call-seq:
- *    ptr <=> other   => -1, 0, 1, or nil
- *
- * Returns -1 if less than, 0 if equal to, 1 if greater than +other+.  Returns
- * nil if +ptr+ cannot be compared to +other+.
- */
-static VALUE
-rb_dlptr_cmp(VALUE self, VALUE other)
-{
-    void *ptr1, *ptr2;
-    SIGNED_VALUE diff;
-
-    if(!rb_obj_is_kind_of(other, rb_cDLCPtr)) return Qnil;
-
-    ptr1 = rb_dlptr2cptr(self);
-    ptr2 = rb_dlptr2cptr(other);
-    diff = (SIGNED_VALUE)ptr1 - (SIGNED_VALUE)ptr2;
-    if (!diff) return INT2FIX(0);
-    return diff > 0 ? INT2NUM(1) : INT2NUM(-1);
-}
-
-/*
- * call-seq:
- *    ptr + n   => new cptr
- *
- * Returns a new DL::CPtr that has been advanced +n+ bytes.
- */
-static VALUE
-rb_dlptr_plus(VALUE self, VALUE other)
-{
-    void *ptr;
-    long num, size;
-
-    ptr = rb_dlptr2cptr(self);
-    size = RPTR_DATA(self)->size;
-    num = NUM2LONG(other);
-    return rb_dlptr_new((char *)ptr + num, size - num, 0);
-}
-
-/*
- * call-seq:
- *    ptr - n   => new cptr
- *
- * Returns a new DL::CPtr that has been moved back +n+ bytes.
- */
-static VALUE
-rb_dlptr_minus(VALUE self, VALUE other)
-{
-    void *ptr;
-    long num, size;
-
-    ptr = rb_dlptr2cptr(self);
-    size = RPTR_DATA(self)->size;
-    num = NUM2LONG(other);
-    return rb_dlptr_new((char *)ptr - num, size + num, 0);
-}
-
-/*
- *  call-seq:
- *     ptr[index]                -> an_integer
- *     ptr[start, length]        -> a_string
- *
- * Returns integer stored at _index_.  If _start_ and _length_ are given,
- * a string containing the bytes from _start_ of length _length_ will be
- * returned.
- */
-VALUE
-rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
-{
-    VALUE arg0, arg1;
-    VALUE retval = Qnil;
-    size_t offset, len;
-
-    switch( rb_scan_args(argc, argv, "11", &arg0, &arg1) ){
-      case 1:
-	offset = NUM2ULONG(arg0);
-	retval = INT2NUM(*((char*)RPTR_DATA(self)->ptr + offset));
-	break;
-      case 2:
-	offset = NUM2ULONG(arg0);
-	len    = NUM2ULONG(arg1);
-	retval = rb_tainted_str_new((char *)RPTR_DATA(self)->ptr + offset, len);
-	break;
-      default:
-	rb_bug("rb_dlptr_aref()");
-    }
-    return retval;
-}
-
-/*
- *  call-seq:
- *     ptr[index]         = int                    ->  int
- *     ptr[start, length] = string or cptr or addr ->  string or dl_cptr or addr
- *
- * Set the value at +index+ to +int+.  Or, set the memory at +start+ until
- * +length+ with the contents of +string+, the memory from +dl_cptr+, or the
- * memory pointed at by the memory address +addr+.
- */
-VALUE
-rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
-{
-    VALUE arg0, arg1, arg2;
-    VALUE retval = Qnil;
-    size_t offset, len;
-    void *mem;
-
-    switch( rb_scan_args(argc, argv, "21", &arg0, &arg1, &arg2) ){
-      case 2:
-	offset = NUM2ULONG(arg0);
-	((char*)RPTR_DATA(self)->ptr)[offset] = NUM2UINT(arg1);
-	retval = arg1;
-	break;
-      case 3:
-	offset = NUM2ULONG(arg0);
-	len    = NUM2ULONG(arg1);
-	if( TYPE(arg2) == T_STRING ){
-	    mem = StringValuePtr(arg2);
-	}
-	else if( rb_obj_is_kind_of(arg2, rb_cDLCPtr) ){
-	    mem = rb_dlptr2cptr(arg2);
-	}
-	else{
-	    mem    = NUM2PTR(arg2);
-	}
-	memcpy((char *)RPTR_DATA(self)->ptr + offset, mem, len);
-	retval = arg2;
-	break;
-      default:
-	rb_bug("rb_dlptr_aset()");
-    }
-    return retval;
-}
-
-/*
- * call-seq: size=(size)
- *
- * Set the size of this pointer to +size+
- */
-static VALUE
-rb_dlptr_size_set(VALUE self, VALUE size)
-{
-    RPTR_DATA(self)->size = NUM2LONG(size);
-    return size;
-}
-
-/*
- * call-seq: size
- *
- * Get the size of this pointer.
- */
-static VALUE
-rb_dlptr_size_get(VALUE self)
-{
-    return LONG2NUM(RPTR_DATA(self)->size);
-}
-
-/*
- * call-seq:
- *    DL::CPtr.to_ptr(val)  => cptr
- *    DL::CPtr[val]         => cptr
- *
- * Get the underlying pointer for ruby object +val+ and return it as a
- * DL::CPtr object.
- */
-static VALUE
-rb_dlptr_s_to_ptr(VALUE self, VALUE val)
-{
-    VALUE ptr;
-
-    if (RTEST(rb_obj_is_kind_of(val, rb_cIO))){
-	rb_io_t *fptr;
-	FILE *fp;
-	GetOpenFile(val, fptr);
-	fp = rb_io_stdio_file(fptr);
-	ptr = rb_dlptr_new(fp, 0, NULL);
-    }
-    else if (RTEST(rb_obj_is_kind_of(val, rb_cString))){
-	char *str = StringValuePtr(val);
-	ptr = rb_dlptr_new(str, RSTRING_LEN(val), NULL);
-    }
-    else if (rb_respond_to(val, id_to_ptr)){
-	VALUE vptr = rb_funcall(val, id_to_ptr, 0);
-	if (rb_obj_is_kind_of(vptr, rb_cDLCPtr)){
-	    ptr = vptr;
-	}
-	else{
-	    rb_raise(rb_eDLError, "to_ptr should return a CPtr object");
-	}
-    }
-    else{
-	ptr = rb_dlptr_new(NUM2PTR(rb_Integer(val)), 0, NULL);
-    }
-    OBJ_INFECT(ptr, val);
-    rb_iv_set(ptr, "wrapping", val);
-    return ptr;
-}
-
-void
-Init_dlptr(void)
-{
-    id_to_ptr = rb_intern("to_ptr");
-
-    /* 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
deleted file mode 100644
index 992c17c1b8..0000000000
--- a/ext/dl/depend
+++ /dev/null
@@ -1,7 +0,0 @@
-cfunc.o: cfunc.c dl.h $(hdrdir)/ruby.h
-
-cptr.o: cptr.c dl.h $(hdrdir)/ruby.h $(hdrdir)/io.h
-
-handle.o: handle.c dl.h $(hdrdir)/ruby.h
-
-dl.o: dl.c dl.h $(hdrdir)/ruby.h $(hdrdir)/io.h
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
deleted file mode 100644
index e0617047ec..0000000000
--- a/ext/dl/dl.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * ext/dl/dl.c
- *
- * doumentation:
- * - 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;
-
-VALUE
-rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
-{
-    return rb_class_new_instance(argc, argv, rb_cDLHandle);
-}
-
-/*
- * call-seq: DL.malloc
- *
- * Allocate +size+ bytes of memory and return the integer memory address
- * for the allocated memory.
- */
-VALUE
-rb_dl_malloc(VALUE self, VALUE size)
-{
-    void *ptr;
-
-    rb_secure(4);
-    ptr = (void*)ruby_xmalloc(NUM2INT(size));
-    return PTR2NUM(ptr);
-}
-
-/*
- * call-seq: DL.realloc(addr, size)
- *
- * Change the size of the memory allocated at the memory location +addr+ to
- * +size+ bytes.  Returns the memory address of the reallocated memory, which
- * may be different than the address passed in.
- */
-VALUE
-rb_dl_realloc(VALUE self, VALUE addr, VALUE size)
-{
-    void *ptr = NUM2PTR(addr);
-
-    rb_secure(4);
-    ptr = (void*)ruby_xrealloc(ptr, NUM2INT(size));
-    return PTR2NUM(ptr);
-}
-
-/*
- * call-seq: DL.free(addr)
- *
- * Free the memory at address +addr+
- */
-VALUE
-rb_dl_free(VALUE self, VALUE addr)
-{
-    void *ptr = NUM2PTR(addr);
-
-    rb_secure(4);
-    ruby_xfree(ptr);
-    return Qnil;
-}
-
-VALUE
-rb_dl_ptr2value(VALUE self, VALUE addr)
-{
-    rb_secure(4);
-    return (VALUE)NUM2PTR(addr);
-}
-
-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: ALIGN_VOIDP
-     *
-     * The Offset of a struct void* and a void*
-     */
-    rb_define_const(rb_mDL, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
-
-    /* Document-const: ALIGN_CHAR
-     *
-     * The Offset of a struct char and a char
-     */
-    rb_define_const(rb_mDL, "ALIGN_CHAR",  INT2NUM(ALIGN_CHAR));
-
-    /* Document-const: ALIGN_SHORT
-     *
-     * The Offset of a struct short and a short
-     */
-    rb_define_const(rb_mDL, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
-
-    /* Document-const: ALIGN_INT
-     *
-     * The Offset of a struct int and a int
-     */
-    rb_define_const(rb_mDL, "ALIGN_INT",   INT2NUM(ALIGN_INT));
-
-    /* Document-const: ALIGN_LONG
-     *
-     * The Offset of a struct long and a long
-     */
-    rb_define_const(rb_mDL, "ALIGN_LONG",  INT2NUM(ALIGN_LONG));
-
-#if HAVE_LONG_LONG
-    /* Document-const: ALIGN_LONG_LONG
-     *
-     * The Offset of a struct long long and a long long
-     */
-    rb_define_const(rb_mDL, "ALIGN_LONG_LONG",  INT2NUM(ALIGN_LONG_LONG));
-#endif
-
-    /* Document-const: ALIGN_FLOAT
-     *
-     * The Offset of a struct float and a float
-     */
-    rb_define_const(rb_mDL, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
-
-    /* Document-const: ALIGN_DOUBLE
-     *
-     * The Offset of a struct double and a double
-     */
-    rb_define_const(rb_mDL, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
-
-    /* Document-const: SIZEOF_VOIDP
-     *
-     * OS Dependent - sizeof(void*)
-     */
-    rb_define_const(rb_mDL, "SIZEOF_VOIDP", INT2NUM(sizeof(void*)));
-
-    /* Document-const: SIZEOF_CHAR
-     *
-     * OS Dependent - sizeof(char)
-     */
-    rb_define_const(rb_mDL, "SIZEOF_CHAR",  INT2NUM(sizeof(char)));
-
-    /* Document-const: SIZEOF_SHORT
-     *
-     * OS Dependent - sizeof(short)
-     */
-    rb_define_const(rb_mDL, "SIZEOF_SHORT", INT2NUM(sizeof(short)));
-
-    /* Document-const: SIZEOF_INT
-     *
-     * OS Dependent - sizeof(int)
-     */
-    rb_define_const(rb_mDL, "SIZEOF_INT",   INT2NUM(sizeof(int)));
-
-    /* Document-const: SIZEOF_LONG
-     *
-     * OS Dependent - sizeof(long)
-     */
-    rb_define_const(rb_mDL, "SIZEOF_LONG",  INT2NUM(sizeof(long)));
-
-#if HAVE_LONG_LONG
-    /* Document-const: SIZEOF_LONG_LONG
-     *
-     * OS Dependent - sizeof(long long)
-     */
-    rb_define_const(rb_mDL, "SIZEOF_LONG_LONG",  INT2NUM(sizeof(LONG_LONG)));
-#endif
-
-    /* Document-const: SIZEOF_FLOAT
-     *
-     * OS Dependent - sizeof(float)
-     */
-    rb_define_const(rb_mDL, "SIZEOF_FLOAT", INT2NUM(sizeof(float)));
-
-    /* Document-const: SIZEOF_DOUBLE
-     *
-     * OS Dependent - sizeof(double)
-     */
-    rb_define_const(rb_mDL, "SIZEOF_DOUBLE",INT2NUM(sizeof(double)));
-
-    rb_define_module_function(rb_mDL, "dlwrap", rb_dl_value2ptr, 1);
-    rb_define_module_function(rb_mDL, "dlunwrap", rb_dl_ptr2value, 1);
-
-    rb_define_module_function(rb_mDL, "dlopen", rb_dl_dlopen, -1);
-    rb_define_module_function(rb_mDL, "malloc", rb_dl_malloc, 1);
-    rb_define_module_function(rb_mDL, "realloc", rb_dl_realloc, 2);
-    rb_define_module_function(rb_mDL, "free", rb_dl_free, 1);
-
-    /* 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
deleted file mode 100644
index f893d8c2ae..0000000000
--- a/ext/dl/dl.h
+++ /dev/null
@@ -1,224 +0,0 @@
-#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*)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;
-
-typedef struct { char c; void *x; } s_voidp;
-typedef struct { char c; short x; } s_short;
-typedef struct { char c; int x; } s_int;
-typedef struct { char c; long x; } s_long;
-typedef struct { char c; float x; } s_float;
-typedef struct { char c; double x; } s_double;
-#if HAVE_LONG_LONG
-typedef struct { char c; LONG_LONG x; } s_long_long;
-#endif
-
-#define ALIGN_VOIDP  (sizeof(s_voidp) - sizeof(void *))
-#define ALIGN_SHORT  (sizeof(s_short) - sizeof(short))
-#define ALIGN_CHAR   (1)
-#define ALIGN_INT    (sizeof(s_int) - sizeof(int))
-#define ALIGN_LONG   (sizeof(s_long) - sizeof(long))
-#if HAVE_LONG_LONG
-#define ALIGN_LONG_LONG (sizeof(s_long_long) - sizeof(LONG_LONG))
-#endif
-#define ALIGN_FLOAT  (sizeof(s_float) - sizeof(float))
-#define ALIGN_DOUBLE (sizeof(s_double) - sizeof(double))
-
-#define DLALIGN(ptr,offset,align) {\
-  while( (((unsigned long)((char *)(ptr) + (offset))) % (align)) != 0 ) (offset)++;\
-}
-
-
-#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;
-};
-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;
-};
-
-#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
deleted file mode 100644
index 8317ac35ad..0000000000
--- a/ext/dl/extconf.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'mkmf'
-
-if RbConfig::CONFIG['GCC'] == 'yes'
-  $CFLAGS << " -fno-defer-pop -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
-  $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
-  create_makefile("dl")
-end
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
deleted file mode 100644
index 2037ab5760..0000000000
--- a/ext/dl/handle.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/* -*- 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);
-    }
-}
-
-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");
-}
-
-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
deleted file mode 100644
index 80d46b685a..0000000000
--- a/ext/dl/lib/dl.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'dl.so'
-
-begin
-  require 'fiddle' unless Object.const_defined?(:Fiddle)
-rescue LoadError
-end
-
-module DL
-  def self.fiddle?
-    Object.const_defined?(:Fiddle)
-  end
-end
diff --git a/ext/dl/lib/dl/callback.rb b/ext/dl/lib/dl/callback.rb
deleted file mode 100644
index 1722d3c6b9..0000000000
--- a/ext/dl/lib/dl/callback.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-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
deleted file mode 100644
index 210f953471..0000000000
--- a/ext/dl/lib/dl/cparser.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-module DL
-  module CParser
-    def parse_struct_signature(signature, tymap=nil)
-      if( signature.is_a?(String) )
-        signature = signature.split(/\s*,\s*/)
-      end
-      mems = []
-      tys  = []
-      signature.each{|msig|
-        tks = msig.split(/\s+(\*)?/)
-        ty = tks[0..-2].join(" ")
-        member = tks[-1]
-
-        case ty
-        when /\[(\d+)\]/
-          n = $1.to_i
-          ty.gsub!(/\s*\[\d+\]/,"")
-          ty = [ty, n]
-        when /\[\]/
-          ty.gsub!(/\s*\[\]/, "*")
-        end
-
-        case member
-        when /\[(\d+)\]/
-          ty = [ty, $1.to_i]
-          member.gsub!(/\s*\[\d+\]/,"")
-        when /\[\]/
-          ty = ty + "*"
-          member.gsub!(/\s*\[\]/, "")
-        end
-
-        mems.push(member)
-        tys.push(parse_ctype(ty,tymap))
-      }
-      return tys, mems
-    end
-
-    def parse_signature(signature, tymap=nil)
-      tymap ||= {}
-      signature = signature.gsub(/\s+/, " ").strip
-      case signature
-      when /^([\w@\*\s]+)\(([\w\*\s\,\[\]]*)\)$/
-        ret = $1
-        (args = $2).strip!
-        ret = ret.split(/\s+/)
-        args = args.split(/\s*,\s*/)
-        func = ret.pop
-        if( func =~ /^\*/ )
-          func.gsub!(/^\*+/,"")
-          ret.push("*")
-        end
-        ret  = ret.join(" ")
-        return [func, parse_ctype(ret, tymap), args.collect{|arg| parse_ctype(arg, tymap)}]
-      else
-        raise(RuntimeError,"can't parse the function prototype: #{signature}")
-      end
-    end
-
-    def parse_ctype(ty, tymap=nil)
-      tymap ||= {}
-      case ty
-      when Array
-        return [parse_ctype(ty[0], tymap), ty[1]]
-      when "void"
-        return TYPE_VOID
-      when "char"
-        return TYPE_CHAR
-      when "unsigned char"
-        return  -TYPE_CHAR
-      when "short"
-        return TYPE_SHORT
-      when "unsigned short"
-        return -TYPE_SHORT
-      when "int"
-        return TYPE_INT
-      when "unsigned int", 'uint'
-        return -TYPE_INT
-      when "long"
-        return TYPE_LONG
-      when "unsigned long"
-        return -TYPE_LONG
-      when "long long"
-        if( defined?(TYPE_LONG_LONG) )
-          return TYPE_LONG_LONG
-        else
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-      when "unsigned long long"
-        if( defined?(TYPE_LONG_LONG) )
-          return -TYPE_LONG_LONG
-        else
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-      when "float"
-        return TYPE_FLOAT
-      when "double"
-        return TYPE_DOUBLE
-      when /\*/, /\[\s*\]/
-        return TYPE_VOIDP
-      else
-        if( tymap[ty] )
-          return parse_ctype(tymap[ty], tymap)
-        else
-          raise(DLError, "unknown type: #{ty}")
-        end
-      end
-    end
-  end
-end
diff --git a/ext/dl/lib/dl/func.rb b/ext/dl/lib/dl/func.rb
deleted file mode 100644
index 3c2245f413..0000000000
--- a/ext/dl/lib/dl/func.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-require 'dl'
-require 'dl/callback'
-require 'dl/stack'
-require 'dl/value'
-require 'thread'
-
-module DL
-  parent = DL.fiddle? ? Fiddle::Function : Object
-
-  class Function < parent
-    include DL
-    include ValueUtil
-
-    def initialize cfunc, argtypes, abi = nil, &block
-      if DL.fiddle?
-        abi ||= Fiddle::Function::DEFAULT
-        if block_given?
-          @cfunc = Class.new(Fiddle::Closure) {
-            define_method(:call, block)
-          }.new(cfunc.ctype, argtypes)
-        else
-          @cfunc  = cfunc
-        end
-
-        @args   = argtypes
-        super(@cfunc, @args.reject { |x| x == TYPE_VOID }, cfunc.ctype, abi)
-      else
-        @cfunc = cfunc
-        @stack = Stack.new(argtypes.collect{|ty| ty.abs})
-        if( @cfunc.ctype < 0 )
-          @cfunc.ctype = @cfunc.ctype.abs
-          @unsigned = true
-        else
-          @unsigned = false
-        end
-        if block_given?
-          bind(&block)
-        end
-      end
-    end
-
-    def to_i()
-      @cfunc.to_i
-    end
-
-    def name
-      @cfunc.name
-    end
-
-    def call(*args, &block)
-      if DL.fiddle?
-        if block_given?
-          args.find { |a| DL::Function === a }.bind_at_call(&block)
-        end
-        super
-      else
-        funcs = []
-        _args = wrap_args(args, @stack.types, funcs, &block)
-        r = @cfunc.call(@stack.pack(_args))
-        funcs.each{|f| f.unbind_at_call()}
-        return wrap_result(r)
-      end
-    end
-
-    def wrap_result(r)
-      case @cfunc.ctype
-      when TYPE_VOIDP
-        r = CPtr.new(r)
-      else
-        if( @unsigned )
-          r = unsigned_value(r, @cfunc.ctype)
-        end
-      end
-      r
-    end
-
-    def bind(&block)
-      if DL.fiddle?
-        @cfunc = Class.new(Fiddle::Closure) {
-          def initialize ctype, args, block
-            super(ctype, args)
-            @block = block
-          end
-
-          def call *args
-            @block.call(*args)
-          end
-        }.new(@cfunc.ctype, @args, block)
-      else
-        if( !block )
-          raise(RuntimeError, "block must be given.")
-        end
-        if( @cfunc.ptr == 0 )
-          cb = Proc.new{|*args|
-            ary = @stack.unpack(args)
-            @stack.types.each_with_index{|ty, idx|
-              case ty
-              when TYPE_VOIDP
-                ary[idx] = CPtr.new(ary[idx])
-              end
-            }
-            r = block.call(*ary)
-            wrap_arg(r, @cfunc.ctype, [])
-          }
-          case @cfunc.calltype
-          when :cdecl
-            @cfunc.ptr = set_cdecl_callback(@cfunc.ctype, @stack.size, &cb)
-          when :stdcall
-            @cfunc.ptr = set_stdcall_callback(@cfunc.ctype, @stack.size, &cb)
-          else
-            raise(RuntimeError, "unsupported calltype: #{@cfunc.calltype}")
-          end
-          if( @cfunc.ptr == 0 )
-            raise(RuntimeException, "can't bind C function.")
-          end
-        end
-      end
-    end
-
-    def unbind()
-      if( @cfunc.ptr != 0 )
-        case @cfunc.calltype
-        when :cdecl
-          remove_cdecl_callback(@cfunc.ptr, @cfunc.ctype)
-        when :stdcall
-          remove_stdcall_callback(@cfunc.ptr, @cfunc.ctype)
-        else
-          raise(RuntimeError, "unsupported calltype: #{@cfunc.calltype}")
-        end
-        @cfunc.ptr = 0
-      end
-    end
-
-    def bound?()
-      @cfunc.ptr != 0
-    end
-
-    def bind_at_call(&block)
-      bind(&block)
-    end
-
-    def unbind_at_call()
-    end
-  end
-
-  class TempFunction < Function
-    def bind_at_call(&block)
-      bind(&block)
-    end
-
-    def unbind_at_call()
-      unbind()
-    end
-  end
-
-  class CarriedFunction < Function
-    def initialize(cfunc, argtypes, n)
-      super(cfunc, argtypes)
-      @carrier = []
-      @index = n
-      @mutex = Mutex.new
-    end
-
-    def create_carrier(data)
-      ary = []
-      userdata = [ary, data]
-      @mutex.lock()
-      @carrier.push(userdata)
-      return dlwrap(userdata)
-    end
-
-    def bind_at_call(&block)
-      userdata = @carrier[-1]
-      userdata[0].push(block)
-      bind{|*args|
-        ptr = args[@index]
-        if( !ptr )
-          raise(RuntimeError, "The index of userdata should be lower than #{args.size}.")
-        end
-        userdata = dlunwrap(Integer(ptr))
-        args[@index] = userdata[1]
-        userdata[0][0].call(*args)
-      }
-      @mutex.unlock()
-    end
-  end
-end
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
deleted file mode 100644
index eec65cdfd6..0000000000
--- a/ext/dl/lib/dl/import.rb
+++ /dev/null
@@ -1,254 +0,0 @@
-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)
-      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)
-      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)
-      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
-
-    def struct(signature)
-      tys, mems = parse_struct_signature(signature, @type_alias)
-      DL::CStructBuilder.create(CStruct, tys, mems)
-    end
-
-    def union(signature)
-      tys, mems = parse_struct_signature(signature, @type_alias)
-      DL::CStructBuilder.create(CUnion, tys, mems)
-    end
-
-    def [](name)
-      @func_map[name]
-    end
-
-    def create_value(ty, val=nil)
-      s = struct([ty + " value"])
-      ptr = s.malloc()
-      if( val )
-        ptr.value = val
-      end
-      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
-      @handler or raise "call dlload before importing symbols and functions"
-    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?
-        closure = Class.new(Fiddle::Closure) {
-          define_method(:call, block)
-        }.new(ctype, argtype)
-
-        Function.new(closure, argtype)
-      else
-        f = Function.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype)
-        f.bind(&block)
-        f
-      end
-    end
-
-    def 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
deleted file mode 100644
index 7fbc802b0f..0000000000
--- a/ext/dl/lib/dl/pack.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-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
deleted file mode 100644
index dc22378fcb..0000000000
--- a/ext/dl/lib/dl/stack.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-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
deleted file mode 100644
index b8becca6b6..0000000000
--- a/ext/dl/lib/dl/struct.rb
+++ /dev/null
@@ -1,212 +0,0 @@
-require 'dl'
-require 'dl/pack.rb'
-
-module DL
-  class CStruct
-    def CStruct.entity_class()
-      CStructEntity
-    end
-  end
-
-  class CUnion
-    def CUnion.entity_class()
-      CUnionEntity
-    end
-  end
-
-  module CStructBuilder
-    def create(klass, types, members)
-      new_class = Class.new(klass){
-        define_method(:initialize){|addr|
-          @entity = klass.entity_class.new(addr, types)
-          @entity.assign_names(members)
-        }
-        define_method(:to_ptr){ @entity }
-        define_method(:to_i){ @entity.to_i }
-        members.each{|name|
-          define_method(name){ @entity[name] }
-          define_method(name + "="){|val| @entity[name] = val }
-        }
-      }
-      size = klass.entity_class.size(types)
-      new_class.module_eval(<<-EOS, __FILE__, __LINE__+1)
-        def new_class.size()
-          #{size}
-        end
-        def new_class.malloc()
-          addr = DL.malloc(#{size})
-          new(addr)
-        end
-      EOS
-      return new_class
-    end
-    module_function :create
-  end
-
-  class CStructEntity < CPtr
-    include PackInfo
-    include ValueUtil
-
-    def CStructEntity.malloc(types, func = nil)
-      addr = DL.malloc(CStructEntity.size(types))
-      CStructEntity.new(addr, types, func)
-    end
-
-    def CStructEntity.size(types)
-      offset = 0
-      max_align = 0
-      types.each_with_index{|t,i|
-        orig_offset = offset
-        if( t.is_a?(Array) )
-          align = PackInfo::ALIGN_MAP[t[0]]
-          offset = PackInfo.align(orig_offset, align)
-          size = offset - orig_offset
-          offset += (PackInfo::SIZE_MAP[t[0]] * t[1])
-        else
-          align = PackInfo::ALIGN_MAP[t]
-          offset = PackInfo.align(orig_offset, align)
-          size = offset - orig_offset
-          offset += PackInfo::SIZE_MAP[t]
-        end
-        if (max_align < align)
-          max_align = align
-        end
-      }
-      offset = PackInfo.align(offset, max_align)
-      offset
-    end
-
-    def initialize(addr, types, func = nil)
-      set_ctypes(types)
-      super(addr, @size, func)
-    end
-
-    def assign_names(members)
-      @members = members
-    end
-
-    def set_ctypes(types)
-      @ctypes = types
-      @offset = []
-      offset = 0
-      max_align = 0
-      types.each_with_index{|t,i|
-        orig_offset = offset
-        if( t.is_a?(Array) )
-          align = ALIGN_MAP[t[0]]
-        else
-          align = ALIGN_MAP[t]
-        end
-        offset = PackInfo.align(orig_offset, align)
-        @offset[i] = offset
-        if( t.is_a?(Array) )
-          offset += (SIZE_MAP[t[0]] * t[1])
-        else
-          offset += SIZE_MAP[t]
-        end
-        if (max_align < align)
-          max_align = align
-        end
-      }
-      offset = PackInfo.align(offset, max_align)
-      @size = offset
-    end
-
-    def [](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
-
-    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()
-      super(@size)
-    end
-  end
-
-  class CUnionEntity < CStructEntity
-    include PackInfo
-
-    def CUnionEntity.malloc(types, func=nil)
-      addr = DL.malloc(CUnionEntity.size(types))
-      CUnionEntity.new(addr, types, func)
-    end
-
-    def CUnionEntity.size(types)
-      size   = 0
-      types.each_with_index{|t,i|
-        if( t.is_a?(Array) )
-          tsize = PackInfo::SIZE_MAP[t[0]] * t[1]
-        else
-          tsize = PackInfo::SIZE_MAP[t]
-        end
-        if( tsize > size )
-          size = tsize
-        end
-      }
-    end
-
-    def set_ctypes(types)
-      @ctypes = types
-      @offset = []
-      @size   = 0
-      types.each_with_index{|t,i|
-        @offset[i] = 0
-        if( t.is_a?(Array) )
-          size = SIZE_MAP[t[0]] * t[1]
-        else
-          size = SIZE_MAP[t]
-        end
-        if( size > @size )
-          @size = size
-        end
-      }
-    end
-  end
-end
-
diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb
deleted file mode 100644
index c79f74f95c..0000000000
--- a/ext/dl/lib/dl/types.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-module DL
-  # Adds Windows type aliases to the including class for use with
-  # DL::Importer.
-  #
-  # The aliases added are:
-  # * ATOM
-  # * BOOL
-  # * BYTE
-  # * DWORD
-  # * 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 "WORD", "unsigned short"
-        typealias "PWORD", "unsigned short *"
-        typealias "BOOL", "int"
-        typealias "ATOM", "int"
-        typealias "BYTE", "unsigned char"
-        typealias "PBYTE", "unsigned char *"
-        typealias "UINT", "unsigned int"
-        typealias "ULONG", "unsigned long"
-        typealias "UCHAR", "unsigned char"
-        typealias "HANDLE", "unsigned long"
-        typealias "PHANDLE", "void*"
-        typealias "PVOID", "void*"
-        typealias "LPCSTR", "char*"
-        typealias "LPSTR", "char*"
-        typealias "HINSTANCE", "unsigned int"
-        typealias "HDC", "unsigned int"
-        typealias "HWND", "unsigned int"
-      }
-    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
deleted file mode 100644
index 51f96b293b..0000000000
--- a/ext/dl/lib/dl/value.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'dl'
-
-module DL
-  module ValueUtil
-    def unsigned_value(val, ty)
-      case ty.abs
-      when TYPE_CHAR
-        [val].pack("c").unpack("C")[0]
-      when TYPE_SHORT
-        [val].pack("s!").unpack("S!")[0]
-      when TYPE_INT
-        [val].pack("i!").unpack("I!")[0]
-      when TYPE_LONG
-        [val].pack("l!").unpack("L!")[0]
-      when TYPE_LONG_LONG
-        [val].pack("q!").unpack("Q!")[0]
-      else
-        val
-      end
-    end
-
-    def signed_value(val, ty)
-      case ty.abs
-      when TYPE_CHAR
-        [val].pack("C").unpack("c")[0]
-      when TYPE_SHORT
-        [val].pack("S!").unpack("s!")[0]
-      when TYPE_INT
-        [val].pack("I!").unpack("i!")[0]
-      when TYPE_LONG
-        [val].pack("L!").unpack("l!")[0]
-      when TYPE_LONG_LONG
-        [val].pack("Q!").unpack("q!")[0]
-      else
-        val
-      end
-    end
-
-    def wrap_args(args, tys, funcs, &block)
-      result = []
-      tys ||= []
-      args.each_with_index{|arg, idx|
-        result.push(wrap_arg(arg, tys[idx], funcs, &block))
-      }
-      result
-    end
-
-    def wrap_arg(arg, ty, funcs = [], &block)
-        funcs ||= []
-        case arg
-        when nil
-          return 0
-        when CPtr
-          return arg.to_i
-        when IO
-          case ty
-          when TYPE_VOIDP
-            return CPtr[arg].to_i
-          else
-            return arg.to_i
-          end
-        when Function
-          if( block )
-            arg.bind_at_call(&block)
-            funcs.push(arg)
-          elsif !arg.bound?
-            raise(RuntimeError, "block must be given.")
-          end
-          return arg.to_i
-        when String
-          if( ty.is_a?(Array) )
-            return arg.unpack('C*')
-          else
-            case SIZEOF_VOIDP
-            when SIZEOF_LONG
-              return [arg].pack("p").unpack("l!")[0]
-            when SIZEOF_LONG_LONG
-              return [arg].pack("p").unpack("q")[0]
-            else
-              raise(RuntimeError, "sizeof(void*)?")
-            end
-          end
-        when Float, Integer
-          return arg
-        when Array
-          if( ty.is_a?(Array) ) # used only by struct
-            case ty[0]
-            when TYPE_VOIDP
-              return arg.collect{|v| Integer(v)}
-            when TYPE_CHAR
-              if( arg.is_a?(String) )
-                return val.unpack('C*')
-              end
-            end
-            return arg
-          else
-            return arg
-          end
-        else
-          if( arg.respond_to?(:to_ptr) )
-            return arg.to_ptr.to_i
-          else
-            begin
-              return Integer(arg)
-            rescue
-              raise(ArgumentError, "unknown argument type: #{arg.class}")
-            end
-          end
-        end
-    end
-  end
-end
diff --git a/ext/dl/win32/extconf.rb b/ext/dl/win32/extconf.rb
deleted file mode 100644
index a72ca49c06..0000000000
--- a/ext/dl/win32/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-if compiled?('dl') and $mswin||$bccwin||$mingw||$cygwin
-  create_makefile('win32')
-end
diff --git a/ext/dl/win32/lib/Win32API.rb b/ext/dl/win32/lib/Win32API.rb
deleted file mode 100644
index f18cec5749..0000000000
--- a/ext/dl/win32/lib/Win32API.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- ruby -*-
-# for backward compatibility
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: Win32API is deprecated after Ruby 1.9.1; use dl directly instead" if $VERBOSE
-
-require 'dl'
-
-class Win32API
-  DLL = {}
-  TYPEMAP = {"0" => DL::TYPE_VOID, "S" => DL::TYPE_VOIDP, "I" => DL::TYPE_LONG}
-
-  def initialize(dllname, func, import, export = "0", calltype = :stdcall)
-    @proto = [import].join.tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
-    handle = DLL[dllname] ||= DL.dlopen(dllname)
-    @func = DL::CFunc.new(handle[func], TYPEMAP[export.tr("VPpNnLlIi", "0SSI")], func, calltype)
-  rescue DL::DLError => e
-    raise LoadError, e.message, e.backtrace
-  end
-
-  def call(*args)
-    import = @proto.split("")
-    args.each_with_index do |x, i|
-      args[i], = [x == 0 ? nil : x].pack("p").unpack("l!*") if import[i] == "S"
-      args[i], = [x].pack("I").unpack("i") if import[i] == "I"
-    end
-    ret, = @func.call(args)
-    return ret || 0
-  end
-
-  alias Call call
-end
diff --git a/ext/dl/win32/lib/win32/registry.rb b/ext/dl/win32/lib/win32/registry.rb
deleted file mode 100644
index 6edd85b8fb..0000000000
--- a/ext/dl/win32/lib/win32/registry.rb
+++ /dev/null
@@ -1,845 +0,0 @@
-require 'dl/import'
-module Win32
-
-=begin rdoc
-= Win32 Registry
-
-win32/registry is registry accessor library for Win32 platform.
-It uses dl/import to call Win32 Registry APIs.
-
-== example
-  Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\foo') do |reg|
-    value = reg['foo']                               # read a value
-    value = reg['foo', Win32::Registry::REG_SZ]      # read a value with type
-    type, value = reg.read('foo')                    # read a value
-    reg['foo'] = 'bar'                               # write a value
-    reg['foo', Win32::Registry::REG_SZ] = 'bar'      # write a value with type
-    reg.write('foo', Win32::Registry::REG_SZ, 'bar') # write a value
-
-    reg.each_value { |name, type, data| ... }        # Enumerate values
-    reg.each_key { |key, wtime| ... }                # Enumerate subkeys
-
-    reg.delete_value(name)                         # Delete a value
-    reg.delete_key(name)                           # Delete a subkey
-    reg.delete_key(name, true)                     # Delete a subkey recursively
-  end
-
-= Reference
-
-== Win32::Registry class
-
---- info
-
---- num_keys
-
---- max_key_length
-
---- num_values
-
---- max_value_name_length
-
---- max_value_length
-
---- descriptor_length
-
---- wtime
-    Returns an item of key information.
-
-=== constants
---- HKEY_CLASSES_ROOT
-
---- HKEY_CURRENT_USER
-
---- HKEY_LOCAL_MACHINE
-
---- HKEY_PERFORMANCE_DATA
-
---- HKEY_CURRENT_CONFIG
-
---- HKEY_DYN_DATA
-
-    Win32::Registry object whose key is predefined key.
-For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/predefined_keys.asp] article.
-
-=end rdoc
-
-  class Registry
-
-    #
-    # For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/registry.asp].
-    #
-    # --- HKEY_*
-    #
-    #     Predefined key ((*handle*)).
-    #     These are Integer, not Win32::Registry.
-    #
-    # --- REG_*
-    #
-    #     Registry value type.
-    #
-    # --- KEY_*
-    #
-    #     Security access mask.
-    #
-    # --- KEY_OPTIONS_*
-    #
-    #     Key options.
-    #
-    # --- REG_CREATED_NEW_KEY
-    #
-    # --- REG_OPENED_EXISTING_KEY
-    #
-    #     If the key is created newly or opened existing key.
-    #     See also Registry#disposition method.
-    module Constants
-      HKEY_CLASSES_ROOT = 0x80000000
-      HKEY_CURRENT_USER = 0x80000001
-      HKEY_LOCAL_MACHINE = 0x80000002
-      HKEY_USERS = 0x80000003
-      HKEY_PERFORMANCE_DATA = 0x80000004
-      HKEY_PERFORMANCE_TEXT = 0x80000050
-      HKEY_PERFORMANCE_NLSTEXT = 0x80000060
-      HKEY_CURRENT_CONFIG = 0x80000005
-      HKEY_DYN_DATA = 0x80000006
-
-      REG_NONE = 0
-      REG_SZ = 1
-      REG_EXPAND_SZ = 2
-      REG_BINARY = 3
-      REG_DWORD = 4
-      REG_DWORD_LITTLE_ENDIAN = 4
-      REG_DWORD_BIG_ENDIAN = 5
-      REG_LINK = 6
-      REG_MULTI_SZ = 7
-      REG_RESOURCE_LIST = 8
-      REG_FULL_RESOURCE_DESCRIPTOR = 9
-      REG_RESOURCE_REQUIREMENTS_LIST = 10
-      REG_QWORD = 11
-      REG_QWORD_LITTLE_ENDIAN = 11
-
-      STANDARD_RIGHTS_READ = 0x00020000
-      STANDARD_RIGHTS_WRITE = 0x00020000
-      KEY_QUERY_VALUE = 0x0001
-      KEY_SET_VALUE = 0x0002
-      KEY_CREATE_SUB_KEY = 0x0004
-      KEY_ENUMERATE_SUB_KEYS = 0x0008
-      KEY_NOTIFY = 0x0010
-      KEY_CREATE_LINK = 0x0020
-      KEY_READ = STANDARD_RIGHTS_READ |
-        KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
-      KEY_WRITE = STANDARD_RIGHTS_WRITE |
-        KEY_SET_VALUE | KEY_CREATE_SUB_KEY
-      KEY_EXECUTE = KEY_READ
-      KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK
-
-      REG_OPTION_RESERVED = 0x0000
-      REG_OPTION_NON_VOLATILE = 0x0000
-      REG_OPTION_VOLATILE = 0x0001
-      REG_OPTION_CREATE_LINK = 0x0002
-      REG_OPTION_BACKUP_RESTORE = 0x0004
-      REG_OPTION_OPEN_LINK = 0x0008
-      REG_LEGAL_OPTION = REG_OPTION_RESERVED |
-        REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK |
-        REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK
-
-      REG_CREATED_NEW_KEY = 1
-      REG_OPENED_EXISTING_KEY = 2
-
-      REG_WHOLE_HIVE_VOLATILE = 0x0001
-      REG_REFRESH_HIVE = 0x0002
-      REG_NO_LAZY_FLUSH = 0x0004
-      REG_FORCE_RESTORE = 0x0008
-
-      MAX_KEY_LENGTH = 514
-      MAX_VALUE_LENGTH = 32768
-    end
-    include Constants
-    include Enumerable
-
-    #
-    # Error
-    #
-    class Error < ::StandardError
-      module Kernel32
-        extend DL::Importer
-        dlload "kernel32.dll"
-      end
-      FormatMessageA = Kernel32.extern "int FormatMessageA(int, void *, int, int, void *, int, void *)", :stdcall
-      def initialize(code)
-        @code = code
-        msg = "\0".force_encoding(Encoding::ASCII_8BIT) * 1024
-        len = FormatMessageA.call(0x1200, 0, code, 0, msg, 1024, 0)
-        msg = msg[0, len].force_encoding(Encoding.find(Encoding.locale_charmap))
-        super msg.tr("\r", '').chomp
-      end
-      attr_reader :code
-    end
-
-    #
-    # Predefined Keys
-    #
-    class PredefinedKey < Registry
-      def initialize(hkey, keyname)
-        @hkey = hkey
-        @parent = nil
-        @keyname = keyname
-        @disposition = REG_OPENED_EXISTING_KEY
-      end
-
-      # Predefined keys cannot be closed
-      def close
-        raise Error.new(5) ## ERROR_ACCESS_DENIED
-      end
-
-      # Fake #class method for Registry#open, Registry#create
-      def class
-        Registry
-      end
-
-      # Make all
-      Constants.constants.grep(/^HKEY_/) do |c|
-        Registry.const_set c, new(Constants.const_get(c), c.to_s)
-      end
-    end
-
-    #
-    # Win32 APIs
-    #
-    module API
-      extend DL::Importer
-      dlload "advapi32.dll"
-      [
-        "long RegOpenKeyExA(void *, void *, long, long, void *)",
-        "long RegCreateKeyExA(void *, void *, long, long, long, long, void *, void *, void *)",
-        "long RegEnumValueA(void *, long, void *, void *, void *, void *, void *, void *)",
-        "long RegEnumKeyExA(void *, long, void *, void *, void *, void *, void *, void *)",
-        "long RegQueryValueExA(void *, void *, void *, void *, void *, void *)",
-        "long RegSetValueExA(void *, void *, long, long, void *, long)",
-        "long RegDeleteValue(void *, void *)",
-        "long RegDeleteKey(void *, void *)",
-        "long RegFlushKey(void *)",
-        "long RegCloseKey(void *)",
-        "long RegQueryInfoKey(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *)",
-      ].each do |fn|
-        cfunc = extern fn, :stdcall
-        const_set cfunc.name.intern, cfunc
-      end
-
-      module_function
-
-      def check(result)
-        raise Error, result, caller(2) if result != 0
-      end
-
-      def packdw(dw)
-        [dw].pack('V')
-      end
-
-      def unpackdw(dw)
-        dw += [0].pack('V')
-        dw.unpack('V')[0]
-      end
-
-      def packqw(qw)
-        [ qw & 0xFFFFFFFF, qw >> 32 ].pack('VV')
-      end
-
-      def unpackqw(qw)
-        qw = qw.unpack('VV')
-        (qw[1] << 32) | qw[0]
-      end
-
-      def OpenKey(hkey, name, opt, desired)
-        result = packdw(0)
-        check RegOpenKeyExA.call(hkey, name, opt, desired, result)
-        unpackdw(result)
-      end
-
-      def CreateKey(hkey, name, opt, desired)
-        result = packdw(0)
-        disp = packdw(0)
-        check RegCreateKeyExA.call(hkey, name, 0, 0, opt, desired,
-                                   0, result, disp)
-        [ unpackdw(result), unpackdw(disp) ]
-      end
-
-      def EnumValue(hkey, index)
-        name = ' ' * Constants::MAX_KEY_LENGTH
-        size = packdw(Constants::MAX_KEY_LENGTH)
-        check RegEnumValueA.call(hkey, index, name, size, 0, 0, 0, 0)
-        name[0, unpackdw(size)]
-      end
-
-      def EnumKey(hkey, index)
-        name = ' ' * Constants::MAX_KEY_LENGTH
-        size = packdw(Constants::MAX_KEY_LENGTH)
-        wtime = ' ' * 8
-        check RegEnumKeyExA.call(hkey, index, name, size, 0, 0, 0, wtime)
-        [ name[0, unpackdw(size)], unpackqw(wtime) ]
-      end
-
-      def QueryValue(hkey, name)
-        type = packdw(0)
-        size = packdw(0)
-        check RegQueryValueExA.call(hkey, name, 0, type, 0, size)
-        data = ' ' * unpackdw(size)
-        check RegQueryValueExA.call(hkey, name, 0, type, data, size)
-        [ unpackdw(type), data[0, unpackdw(size)] ]
-      end
-
-      def SetValue(hkey, name, type, data, size)
-        check RegSetValueExA.call(hkey, name, 0, type, data, size)
-      end
-
-      def DeleteValue(hkey, name)
-        check RegDeleteValue.call(hkey, name)
-      end
-
-      def DeleteKey(hkey, name)
-        check RegDeleteKey.call(hkey, name)
-      end
-
-      def FlushKey(hkey)
-        check RegFlushKey.call(hkey)
-      end
-
-      def CloseKey(hkey)
-        check RegCloseKey.call(hkey)
-      end
-
-      def QueryInfoKey(hkey)
-        subkeys = packdw(0)
-        maxsubkeylen = packdw(0)
-        values = packdw(0)
-        maxvaluenamelen = packdw(0)
-        maxvaluelen = packdw(0)
-        secdescs = packdw(0)
-        wtime = ' ' * 8
-        check RegQueryInfoKey.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
-          values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
-        [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
-          unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
-          unpackdw(secdescs), unpackqw(wtime) ]
-      end
-    end
-
-    #
-    # Replace %\w+% into the environment value of what is contained between the %'s
-    # This method is used for REG_EXPAND_SZ.
-    #
-    # For detail, see expandEnvironmentStrings[http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp] \Win32 \API.
-    #
-    def self.expand_environ(str)
-      str.gsub(/%([^%]+)%/) { ENV[$1] || ENV[$1.upcase] || $& }
-    end
-
-    @@type2name = { }
-    %w[
-      REG_NONE REG_SZ REG_EXPAND_SZ REG_BINARY REG_DWORD
-      REG_DWORD_BIG_ENDIAN REG_LINK REG_MULTI_SZ
-      REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
-      REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD
-    ].each do |type|
-      @@type2name[Constants.const_get(type)] = type
-    end
-
-    #
-    # Convert registry type value to readable string.
-    #
-    def self.type2name(type)
-      @@type2name[type] || type.to_s
-    end
-
-    #
-    # Convert 64-bit FILETIME integer into Time object.
-    #
-    def self.wtime2time(wtime)
-      Time.at((wtime - 116444736000000000) / 10000000)
-    end
-
-    #
-    # Convert Time object or Integer object into 64-bit FILETIME.
-    #
-    def self.time2wtime(time)
-      time.to_i * 10000000 + 116444736000000000
-    end
-
-    #
-    # constructor
-    #
-    private_class_method :new
-
-    #
-    # --- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
-    #
-    # --- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) { |reg| ... }
-    #
-    # Open the registry key subkey under key.
-    # key is Win32::Registry object of parent key.
-    # You can use predefined key HKEY_* (see Constants)
-    # desired and opt is access mask and key option.
-    # For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp].
-    # If block is given, the key is closed automatically.
-    def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
-      subkey = subkey.chomp('\\')
-      newkey = API.OpenKey(hkey.hkey, subkey, opt, desired)
-      obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
-      if block_given?
-        begin
-          yield obj
-        ensure
-          obj.close
-        end
-      else
-        obj
-      end
-    end
-
-    #
-    # --- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
-    #
-    # --- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) { |reg| ... }
-    #
-    # Create or open the registry key subkey under key.
-    # You can use predefined key HKEY_* (see Constants)
-    #
-    # If subkey is already exists, key is opened and Registry#created?
-    # method will return false.
-    #
-    # If block is given, the key is closed automatically.
-    #
-    def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
-      newkey, disp = API.CreateKey(hkey.hkey, subkey, opt, desired)
-      obj = new(newkey, hkey, subkey, disp)
-      if block_given?
-        begin
-          yield obj
-        ensure
-          obj.close
-        end
-      else
-        obj
-      end
-    end
-
-    #
-    # finalizer
-    #
-    @@final = proc { |hkey| proc { API.CloseKey(hkey[0]) if hkey[0] } }
-
-    #
-    # initialize
-    #
-    def initialize(hkey, parent, keyname, disposition)
-      @hkey = hkey
-      @parent = parent
-      @keyname = keyname
-      @disposition = disposition
-      @hkeyfinal = [ hkey ]
-      ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
-    end
-
-    #  Returns key handle value.
-    attr_reader :hkey
-    # Win32::Registry object of parent key, or nil if predefeined key.
-    attr_reader :parent
-    # Same as subkey value of Registry.open or
-    # Registry.create method.
-    attr_reader :keyname
-    #  Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
-    attr_reader :disposition
-
-    #
-    # Returns if key is created ((*newly*)).
-    # (see Registry.create) -- basically you call create
-    # then when you call created? on the instance returned
-    # it will tell if it was successful or not
-    #
-    def created?
-      @disposition == REG_CREATED_NEW_KEY
-    end
-
-    #
-    # Returns if key is not closed.
-    #
-    def open?
-      !@hkey.nil?
-    end
-
-    #
-    # Full path of key such as 'HKEY_CURRENT_USER\SOFTWARE\foo\bar'.
-    #
-    def name
-      parent = self
-      name = @keyname
-      while parent = parent.parent
-        name = parent.keyname + '\\' + name
-      end
-      name
-    end
-
-    def inspect
-      "\#<Win32::Registry key=#{name.inspect}>"
-    end
-
-    #
-    # marshalling is not allowed
-    #
-    def _dump(depth)
-      raise TypeError, "can't dump Win32::Registry"
-    end
-
-    #
-    # Same as Win32::Registry.open (self, subkey, desired, opt)
-    #
-    def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk)
-      self.class.open(self, subkey, desired, opt, &blk)
-    end
-
-    #
-    # Same as Win32::Registry.create (self, subkey, desired, opt)
-    #
-    def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk)
-      self.class.create(self, subkey, desired, opt, &blk)
-    end
-
-    #
-    # Close key.
-    #
-    # After close, most method raise an error.
-    #
-    def close
-      API.CloseKey(@hkey)
-      @hkey = @parent = @keyname = nil
-      @hkeyfinal[0] = nil
-    end
-
-    #
-    # Enumerate values.
-    #
-    def each_value
-      index = 0
-      while true
-        begin
-          subkey = API.EnumValue(@hkey, index)
-        rescue Error
-          break
-        end
-        begin
-          type, data = read(subkey)
-        rescue Error
-          next
-        end
-        yield subkey, type, data
-        index += 1
-      end
-      index
-    end
-    alias each each_value
-
-    #
-    # Enumerate subkeys.
-    #
-    # subkey is String which contains name of subkey.
-    # wtime is last write time as FILETIME (64-bit integer).
-    # (see Registry.wtime2time)
-    #
-    def each_key
-      index = 0
-      while true
-        begin
-          subkey, wtime = API.EnumKey(@hkey, index)
-        rescue Error
-          break
-        end
-        yield subkey, wtime
-        index += 1
-      end
-      index
-    end
-
-    #
-    # return keys as an array
-    #
-    def keys
-      keys_ary = []
-      each_key { |key,| keys_ary << key }
-      keys_ary
-    end
-
-    # Read a registry value named name and return array of
-    # [ type, data ].
-    # When name is nil, the `default' value is read.
-    # type is value type. (see Win32::Registry::Constants module)
-    # data is value data, its class is:
-    # :REG_SZ, REG_EXPAND_SZ
-    #    String
-    # :REG_MULTI_SZ
-    #    Array of String
-    # :REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD
-    #    Integer
-    # :REG_BINARY
-    #    String (contains binary data)
-    #
-    # When rtype is specified, the value type must be included by
-    # rtype array, or TypeError is raised.
-    def read(name, *rtype)
-      type, data = API.QueryValue(@hkey, name)
-      unless rtype.empty? or rtype.include?(type)
-        raise TypeError, "Type mismatch (expect #{rtype.inspect} but #{type} present)"
-      end
-      case type
-      when REG_SZ, REG_EXPAND_SZ
-        [ type, data.chop ]
-      when REG_MULTI_SZ
-        [ type, data.split(/\0/) ]
-      when REG_BINARY
-        [ type, data ]
-      when REG_DWORD
-        [ type, API.unpackdw(data) ]
-      when REG_DWORD_BIG_ENDIAN
-        [ type, data.unpack('N')[0] ]
-      when REG_QWORD
-        [ type, API.unpackqw(data) ]
-      else
-        raise TypeError, "Type #{type} is not supported."
-      end
-    end
-
-    #
-    # Read a registry value named name and return its value data.
-    # The class of value is same as #read method returns.
-    #
-    # If the value type is REG_EXPAND_SZ, returns value data whose environment
-    # variables are replaced.
-    # If the value type is neither REG_SZ, REG_MULTI_SZ, REG_DWORD,
-    # REG_DWORD_BIG_ENDIAN, nor REG_QWORD, TypeError is raised.
-    #
-    # The meaning of rtype is same as #read method.
-    #
-    def [](name, *rtype)
-      type, data = read(name, *rtype)
-      case type
-      when REG_SZ, REG_DWORD, REG_QWORD, REG_MULTI_SZ
-        data
-      when REG_EXPAND_SZ
-        Registry.expand_environ(data)
-      else
-        raise TypeError, "Type #{type} is not supported."
-      end
-    end
-
-    # Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
-    # registry value named name.
-    #
-    # If the values type does not match, TypeError is raised.
-    def read_s(name)
-      read(name, REG_SZ)[1]
-    end
-
-    #
-    # Read a REG_SZ or REG_EXPAND_SZ registry value named name.
-    #
-    # If the value type is REG_EXPAND_SZ, environment variables are replaced.
-    # Unless the value type is REG_SZ or REG_EXPAND_SZ, TypeError is raised.
-    #
-    def read_s_expand(name)
-      type, data = read(name, REG_SZ, REG_EXPAND_SZ)
-      if type == REG_EXPAND_SZ
-        Registry.expand_environ(data)
-      else
-        data
-      end
-    end
-
-    #
-    # Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
-    # registry value named name.
-    #
-    # If the values type does not match, TypeError is raised.
-    #
-    def read_i(name)
-      read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1]
-    end
-
-    #
-    # Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
-    # registry value named name.
-    #
-    # If the values type does not match, TypeError is raised.
-    #
-    def read_bin(name)
-      read(name, REG_BINARY)[1]
-    end
-
-    #
-    # Write data to a registry value named name.
-    # When name is nil, write to the `default' value.
-    #
-    # type is type value. (see Registry::Constants module)
-    # Class of data must be same as which #read
-    # method returns.
-    #
-    def write(name, type, data)
-      case type
-      when REG_SZ, REG_EXPAND_SZ
-        data = data.to_s + "\0"
-      when REG_MULTI_SZ
-        data = data.to_a.join("\0") + "\0\0"
-      when REG_BINARY
-        data = data.to_s
-      when REG_DWORD
-        data = API.packdw(data.to_i)
-      when REG_DWORD_BIG_ENDIAN
-        data = [data.to_i].pack('N')
-      when REG_QWORD
-        data = API.packqw(data.to_i)
-      else
-        raise TypeError, "Unsupported type #{type}"
-      end
-      API.SetValue(@hkey, name, type, data, data.length)
-    end
-
-    #
-    # Write value to a registry value named name.
-    #
-    # If wtype is specified, the value type is it.
-    # Otherwise, the value type is depend on class of value:
-    # :Integer
-    #   REG_DWORD
-    # :String
-    #   REG_SZ
-    # :Array
-    #   REG_MULTI_SZ
-    #
-    def []=(name, rtype, value = nil)
-      if value
-        write name, rtype, value
-      else
-        case value = rtype
-        when Integer
-          write name, REG_DWORD, value
-        when String
-          write name, REG_SZ, value
-        when Array
-          write name, REG_MULTI_SZ, value
-        else
-          raise TypeError, "Unexpected type #{value.class}"
-        end
-      end
-      value
-    end
-
-    #
-    # Write value to a registry value named name.
-    #
-    # The value type is REG_SZ(write_s), REG_DWORD(write_i), or
-    # REG_BINARY(write_bin).
-    #
-    def write_s(name, value)
-      write name, REG_SZ, value.to_s
-    end
-
-    #
-    # Write value to a registry value named name.
-    #
-    # The value type is REG_SZ(write_s), REG_DWORD(write_i), or
-    # REG_BINARY(write_bin).
-    #
-    def write_i(name, value)
-      write name, REG_DWORD, value.to_i
-    end
-
-    #
-    # Write value to a registry value named name.
-    #
-    # The value type is REG_SZ(write_s), REG_DWORD(write_i), or
-    # REG_BINARY(write_bin).
-    #
-    def write_bin(name, value)
-      write name, REG_BINARY, value.to_s
-    end
-
-    #
-    # Delete a registry value named name.
-    # We can not delete the `default' value.
-    #
-    def delete_value(name)
-      API.DeleteValue(@hkey, name)
-    end
-    alias delete delete_value
-
-    #
-    # Delete a subkey named name and all its values.
-    #
-    # If recursive is false, the subkey must not have subkeys.
-    # Otherwise, this method deletes all subkeys and values recursively.
-    #
-    def delete_key(name, recursive = false)
-      if recursive
-        open(name, KEY_ALL_ACCESS) do |reg|
-          reg.keys.each do |key|
-            begin
-              reg.delete_key(key, true)
-            rescue Error
-              #
-            end
-          end
-        end
-        API.DeleteKey(@hkey, name)
-      else
-        begin
-          API.EnumKey @hkey, 0
-        rescue Error
-          return API.DeleteKey(@hkey, name)
-        end
-        raise Error.new(5) ## ERROR_ACCESS_DENIED
-      end
-    end
-
-    #
-    # Write all the attributes into the registry file.
-    #
-    def flush
-      API.FlushKey @hkey
-    end
-
-    #
-    # Returns key information as Array of:
-    # :num_keys
-    #   The number of subkeys.
-    # :max_key_length
-    #   Maximum length of name of subkeys.
-    # :num_values
-    #   The number of values.
-    # :max_value_name_length
-    #   Maximum length of name of values.
-    # :max_value_length
-    #   Maximum length of value of values.
-    # :descriptor_length
-    #   Length of security descriptor.
-    # :wtime
-    #   Last write time as FILETIME(64-bit integer)
-    #
-    # For detail, see RegQueryInfoKey[http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp] Win32 API.
-    #
-    def info
-      API.QueryInfoKey(@hkey)
-    end
-
-    #
-    # Returns an item of key information.
-    #
-    %w[
-      num_keys max_key_length
-      num_values max_value_name_length max_value_length
-      descriptor_length wtime
-    ].each_with_index do |s, i|
-      eval <<-__END__
-        def #{s}
-          info[#{i}]
-        end
-      __END__
-    end
-  end
-end
diff --git a/ext/dl/win32/lib/win32/resolv.rb b/ext/dl/win32/lib/win32/resolv.rb
deleted file mode 100644
index 8a65472877..0000000000
--- a/ext/dl/win32/lib/win32/resolv.rb
+++ /dev/null
@@ -1,379 +0,0 @@
-=begin
-= Win32 DNS and DHCP I/F
-
-=end
-
-require "dl/import"
-require 'win32/registry'
-
-module Win32
-  module Resolv
-    API = Registry::API
-
-    def self.get_hosts_path
-      path = get_hosts_dir
-      path = File.expand_path('hosts', path)
-      File.exist?(path) ? path : nil
-    end
-
-    def self.get_resolv_info
-      search, nameserver = get_info
-      if search.empty?
-        search = nil
-      else
-        search.delete("")
-        search.uniq!
-      end
-      if nameserver.empty?
-        nameserver = nil
-      else
-        nameserver.delete("")
-        nameserver.delete("0.0.0.0")
-        nameserver.uniq!
-      end
-      [ search, nameserver ]
-    end
-
-module Kernel32
-  extend DL::Importer
-  dlload "kernel32"
-end
-getv = Kernel32.extern "int GetVersionExA(void *)", :stdcall
-info = [ 148, 0, 0, 0, 0 ].pack('V5') + "\0" * 128
-getv.call(info)
-if info.unpack('V5')[4] == 2  # VER_PLATFORM_WIN32_NT
-#====================================================================
-# Windows NT
-#====================================================================
-  module_eval <<-'__EOS__', __FILE__, __LINE__+1
-    TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
-
-    class << self
-      private
-      def get_hosts_dir
-        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
-          reg.read_s_expand('DataBasePath')
-        end
-      end
-
-      def get_info
-        search = nil
-        nameserver = []
-        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
-          begin
-            slist = reg.read_s('SearchList')
-            search = slist.split(/,\s*/) unless slist.empty?
-          rescue Registry::Error
-          end
-
-          if add_search = search.nil?
-            search = []
-            begin
-              nvdom = reg.read_s('NV Domain')
-              unless nvdom.empty?
-                @search = [ nvdom ]
-                if reg.read_i('UseDomainNameDevolution') != 0
-                  if /^\w+\./ =~ nvdom
-                    devo = $'
-                  end
-                end
-              end
-            rescue Registry::Error
-            end
-          end
-
-          reg.open('Interfaces') do |h|
-            h.each_key do |iface,|
-              h.open(iface) do |regif|
-                begin
-                  [ 'NameServer', 'DhcpNameServer' ].each do |key|
-                    begin
-                      ns = regif.read_s(key)
-                    rescue
-                    else
-                      unless ns.empty?
-                        nameserver.concat(ns.split(/[,\s]\s*/))
-                        break
-                      end
-                    end
-                  end
-                rescue Registry::Error
-                end
-
-                if add_search
-                  begin
-                    [ 'Domain', 'DhcpDomain' ].each do |key|
-                      dom = regif.read_s(key)
-                      unless dom.empty?
-                        search.concat(dom.split(/,\s*/))
-                        break
-                      end
-                    end
-                  rescue Registry::Error
-                  end
-                end
-              end
-            end
-          end
-          search << devo if add_search and devo
-        end
-        [ search.uniq, nameserver.uniq ]
-      end
-    end
-  __EOS__
-else
-#====================================================================
-# Windows 9x
-#====================================================================
-  module_eval <<-'__EOS__', __FILE__, __LINE__+1
-    TCPIP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\MSTCP'
-    DHCP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\DHCP'
-    WINDOWS = 'Software\Microsoft\Windows\CurrentVersion'
-
-    class << self
-   #   private
-
-      def get_hosts_dir
-        Registry::HKEY_LOCAL_MACHINE.open(WINDOWS) do |reg|
-          reg.read_s_expand('SystemRoot')
-        end
-      end
-
-      def get_info
-        search = []
-        nameserver = []
-        begin
-          Registry::HKEY_LOCAL_MACHINE.open(TCPIP_9X) do |reg|
-            if reg.read_s("EnableDNS") == "1"
-              domain = reg.read_s("Domain")
-              ns = reg.read_s("NameServer")
-              slist = reg.read_s("SearchList")
-              search << domain unless domain.empty?
-              search.concat(slist.split(/,\s*/))
-              nameserver.concat(ns.split(/[,\s]\s*/))
-            end
-          end
-        rescue Registry::Error
-        end
-
-        dhcpinfo = get_dhcpinfo
-        search.concat(dhcpinfo[0])
-        nameserver.concat(dhcpinfo[1])
-        [ search, nameserver ]
-      end
-
-      def get_dhcpinfo
-        macaddrs = {}
-        ipaddrs = {}
-        WsControl.get_iflist.each do |index, macaddr, *ipaddr|
-          macaddrs[macaddr] = 1
-          ipaddr.each { |ipaddr| ipaddrs[ipaddr] = 1 }
-        end
-        iflist = [ macaddrs, ipaddrs ]
-
-        search = []
-        nameserver = []
-        version = -1
-        Registry::HKEY_LOCAL_MACHINE.open(DHCP_9X) do |reg|
-          begin
-            version = API.unpackdw(reg.read_bin("Version"))
-          rescue Registry::Error
-          end
-
-          reg.each_key do |key,|
-            catch(:not_used) do
-              reg.open(key) do |regdi|
-                dom, ns = get_dhcpinfo_key(version, regdi, iflist)
-                search << dom if dom
-                nameserver.concat(ns) if ns
-              end
-            end
-          end
-        end
-        [ search, nameserver ]
-      end
-
-      def get_dhcpinfo_95(reg)
-        dhcp = reg.read_bin("DhcpInfo")
-        [
-          API.unpackdw(dhcp[4..7]),
-          API.unpackdw(dhcp[8..11]),
-          1,
-          dhcp[45..50],
-          reg.read_bin("OptionInfo"),
-        ]
-      end
-
-      def get_dhcpinfo_98(reg)
-        [
-          API.unpackdw(reg.read_bin("DhcpIPAddress")),
-          API.unpackdw(reg.read_bin("DhcpSubnetMask")),
-          API.unpackdw(reg.read_bin("HardwareType")),
-          reg.read_bin("HardwareAddress"),
-          reg.read_bin("OptionInfo"),
-        ]
-      end
-
-      def get_dhcpinfo_key(version, reg, iflist)
-        info = case version
-               when 1
-                 get_dhcpinfo_95(reg)
-               when 2
-                 get_dhcpinfo_98(reg)
-               else
-                 begin
-                   get_dhcpinfo_98(reg)
-                 rescue Registry::Error
-                   get_dhcpinfo_95(reg)
-                 end
-               end
-        ipaddr, netmask, hwtype, macaddr, opt = info
-        throw :not_used unless
-          ipaddr and ipaddr != 0 and
-          netmask and netmask != 0 and
-          macaddr and macaddr.size == 6 and
-          hwtype == 1 and
-          iflist[0][macaddr] and iflist[1][ipaddr]
-
-        size = opt.size
-        idx = 0
-        while idx <= size
-          opttype = opt[idx]
-          optsize = opt[idx + 1]
-          optval  = opt[idx + 2, optsize]
-          case opttype
-          when 0xFF    ## term
-            break
-          when 0x0F    ## domain
-            domain = optval.chomp("\0")
-          when 0x06    ## dns
-            nameserver = optval.scan(/..../).collect { |addr|
-              "%d.%d.%d.%d" % addr.unpack('C4')
-            }
-          end
-          idx += optsize + 2
-        end
-        [ domain, nameserver ]
-      rescue Registry::Error
-        throw :not_used
-      end
-    end
-
-    module WsControl
-      module WSock32
-        extend DL::Importer
-        dlload "wsock32.dll"
-      end
-      WsControl = WSock32.extern "int WsControl(int, int, void *, void *, void *, void *", :stdcall
-      WSAGetLastError = WSock32.extern "int WSAGetLastError(void)", :stdcall
-
-      MAX_TDI_ENTITIES = 512
-      IPPROTO_TCP = 6
-      WSCTL_TCP_QUERY_INFORMATION = 0
-      INFO_CLASS_GENERIC = 0x100
-      INFO_CLASS_PROTOCOL = 0x200
-      INFO_TYPE_PROVIDER = 0x100
-      ENTITY_LIST_ID = 0
-      GENERIC_ENTITY = 0
-      CL_NL_ENTITY = 0x301
-      IF_ENTITY = 0x200
-      ENTITY_TYPE_ID = 1
-      CL_NL_IP = 0x303
-      IF_MIB = 0x202
-      IF_MIB_STATS_ID = 1
-      IP_MIB_ADDRTABLE_ENTRY_ID = 0x102
-
-      def self.wsctl(tei_entity, tei_instance,
-                     toi_class, toi_type, toi_id,
-                     buffsize)
-        reqinfo = [
-                  ## TDIEntityID
-                    tei_entity, tei_instance,
-                  ## TDIObjectID
-                    toi_class, toi_type, toi_id,
-                  ## TCP_REQUEST_INFORMATION_EX
-                    ""
-                  ].pack('VVVVVa16')
-        reqsize = API.packdw(reqinfo.size)
-        buff = "\0" * buffsize
-        buffsize = API.packdw(buffsize)
-        result = WsControl.call(
-                   IPPROTO_TCP,
-                   WSCTL_TCP_QUERY_INFORMATION,
-                   reqinfo, reqsize,
-                   buff, buffsize)
-        if result != 0
-          raise RuntimeError, "WsControl failed.(#{result})"
-        end
-        [ buff, API.unpackdw(buffsize) ]
-      end
-      private_class_method :wsctl
-
-      def self.get_iflist
-        # Get TDI Entity List
-        entities, size =
-          wsctl(GENERIC_ENTITY, 0,
-                INFO_CLASS_GENERIC,
-                INFO_TYPE_PROVIDER,
-                ENTITY_LIST_ID,
-                MAX_TDI_ENTITIES * 8)  # sizeof(TDIEntityID)
-        entities = entities[0, size].
-                     scan(/.{8}/).
-                     collect { |e| e.unpack('VV') }
-
-        # Get MIB Interface List
-        iflist = []
-        ifcount = 0
-        entities.each do |entity, instance|
-          if( (entity & IF_ENTITY)>0 )
-            ifcount += 1
-            etype, = wsctl(entity, instance,
-                           INFO_CLASS_GENERIC,
-                           INFO_TYPE_PROVIDER,
-                           ENTITY_TYPE_ID,
-                           4)
-            if( (API.unpackdw(etype) & IF_MIB)==IF_MIB )
-              ifentry, = wsctl(entity, instance,
-                               INFO_CLASS_PROTOCOL,
-                               INFO_TYPE_PROVIDER,
-                               IF_MIB_STATS_ID,
-                               21 * 4 + 8 + 130)  # sizeof(IFEntry)
-              iflist << [
-                API.unpackdw(ifentry[0,4]),
-                ifentry[20, 6]
-              ]
-            end
-          end
-        end
-
-        # Get IP Addresses
-        entities.each do |entity, instance|
-          if entity == CL_NL_ENTITY
-            etype, = wsctl(entity, instance,
-                           INFO_CLASS_GENERIC,
-                           INFO_TYPE_PROVIDER,
-                           ENTITY_TYPE_ID,
-                           4)
-            if API.unpackdw(etype) == CL_NL_IP
-              ipentries, = wsctl(entity, instance,
-                                 INFO_CLASS_PROTOCOL,
-                                 INFO_TYPE_PROVIDER,
-                                 IP_MIB_ADDRTABLE_ENTRY_ID,
-                                 24 * (ifcount+1))  # sizeof(IPAddrEntry)
-              ipentries.scan(/.{24}/) do |ipentry|
-                ipaddr, index = ipentry.unpack('VV')
-                if ifitem = iflist.assoc(index)
-                  ifitem << ipaddr
-                end
-              end
-            end
-          end
-        end
-        iflist
-      end
-    end
-  __EOS__
-end
-#====================================================================
-  end
-end
diff --git a/ext/dl/win32/lib/win32/sspi.rb b/ext/dl/win32/lib/win32/sspi.rb
deleted file mode 100644
index 6022df96c3..0000000000
--- a/ext/dl/win32/lib/win32/sspi.rb
+++ /dev/null
@@ -1,330 +0,0 @@
-#
-# = win32/sspi.rb
-#
-# Copyright (c) 2006-2007 Justin Bailey
-#
-# Written and maintained by Justin Bailey <jgbailey@gmail.com>.
-#
-# This program is free software. You can re-distribute and/or
-# modify this program under the same terms of ruby itself ---
-# Ruby Distribution License or GNU General Public License.
-#
-
-require 'Win32API'
-
-# Implements bindings to Win32 SSPI functions, focused on authentication to a proxy server over HTTP.
-module Win32
-	module SSPI
-		# Specifies how credential structure requested will be used. Only SECPKG_CRED_OUTBOUND is used
-		# here.
-		SECPKG_CRED_INBOUND = 0x00000001
-		SECPKG_CRED_OUTBOUND = 0x00000002
-		SECPKG_CRED_BOTH = 0x00000003
-
-		# Format of token. NETWORK format is used here.
-		SECURITY_NATIVE_DREP = 0x00000010
-		SECURITY_NETWORK_DREP = 0x00000000
-
-		# InitializeSecurityContext Requirement flags
-		ISC_REQ_REPLAY_DETECT = 0x00000004
-		ISC_REQ_SEQUENCE_DETECT = 0x00000008
-		ISC_REQ_CONFIDENTIALITY = 0x00000010
-		ISC_REQ_USE_SESSION_KEY = 0x00000020
-		ISC_REQ_PROMPT_FOR_CREDS = 0x00000040
-		ISC_REQ_CONNECTION = 0x00000800
-
-		# Win32 API Functions. Uses Win32API to bind methods to constants contained in class.
-		module API
-			# Can be called with AcquireCredentialsHandle.call()
-			AcquireCredentialsHandle = Win32API.new("secur32", "AcquireCredentialsHandle", 'ppLpppppp', 'L')
-			# Can be called with InitializeSecurityContext.call()
-			InitializeSecurityContext = Win32API.new("secur32", "InitializeSecurityContext", 'pppLLLpLpppp', 'L')
-			# Can be called with DeleteSecurityContext.call()
-			DeleteSecurityContext = Win32API.new("secur32", "DeleteSecurityContext", 'P', 'L')
-			# Can be called with FreeCredentialsHandle.call()
-			FreeCredentialsHandle = Win32API.new("secur32", "FreeCredentialsHandle", 'P', 'L')
-		end
-
-		# SecHandle struct
-		class SecurityHandle
-			def upper
-				@struct.unpack("LL")[1]
-			end
-
-			def lower
-				@struct.unpack("LL")[0]
-			end
-
-			def to_p
-				@struct ||= "\0" * 8
-			end
-		end
-
-		# Some familiar aliases for the SecHandle structure
-		CredHandle = CtxtHandle = SecurityHandle
-
-		# TimeStamp struct
-		class TimeStamp
-			attr_reader :struct
-
-			def to_p
-				@struct ||= "\0" * 8
-			end
-		end
-
-		# Creates binary representaiton of a SecBufferDesc structure,
-		# including the SecBuffer contained inside.
-		class SecurityBuffer
-
-			SECBUFFER_TOKEN = 2   # Security token
-
-			TOKENBUFSIZE = 12288
-			SECBUFFER_VERSION = 0
-
-			def initialize(buffer = nil)
-				@buffer = buffer || "\0" * TOKENBUFSIZE
-				@bufferSize = @buffer.length
-				@type = SECBUFFER_TOKEN
-			end
-
-			def bufferSize
-				unpack
-				@bufferSize
-			end
-
-			def bufferType
-				unpack
-				@type
-			end
-
-			def token
-				unpack
-				@buffer
-			end
-
-			def to_p
-				# Assumption is that when to_p is called we are going to get a packed structure. Therefore,
-				# set @unpacked back to nil so we know to unpack when accessors are next accessed.
-				@unpacked = nil
-				# Assignment of inner structure to variable is very important here. Without it,
-				# will not be able to unpack changes to the structure. Alternative, nested unpacks,
-				# does not work (i.e. @struct.unpack("LLP12")[2].unpack("LLP12") results in "no associated pointer")
-				@sec_buffer ||= [@bufferSize, @type, @buffer].pack("LLP")
-				@struct ||= [SECBUFFER_VERSION, 1, @sec_buffer].pack("LLP")
-			end
-
-		private
-
-			# Unpacks the SecurityBufferDesc structure into member variables. We
-			# only want to do this once per struct, so the struct is deleted
-			# after unpacking.
-			def unpack
-				if ! @unpacked && @sec_buffer && @struct
-					@bufferSize, @type = @sec_buffer.unpack("LL")
-					@buffer = @sec_buffer.unpack("LLP#{@bufferSize}")[2]
-					@struct = nil
-					@sec_buffer = nil
-					@unpacked = true
-				end
-			end
-		end
-
-		# SEC_WINNT_AUTH_IDENTITY structure
-		class Identity
-			SEC_WINNT_AUTH_IDENTITY_ANSI = 0x1
-
-			attr_accessor :user, :domain, :password
-
-			def initialize(user = nil, domain = nil, password = nil)
-				@user = user
-				@domain = domain
-				@password = password
-				@flags = SEC_WINNT_AUTH_IDENTITY_ANSI
-			end
-
-			def to_p
-				[@user, @user ? @user.length : 0,
-				 @domain, @domain ? @domain.length : 0,
-				 @password, @password ? @password.length : 0,
-				 @flags].pack("PLPLPLL")
-			end
-		end
-
-		# Takes a return result from an SSPI function and interprets the value.
-		class SSPIResult
-			# Good results
-			SEC_E_OK = 0x00000000
-			SEC_I_CONTINUE_NEEDED = 0x00090312
-
-			# These are generally returned by InitializeSecurityContext
-			SEC_E_INSUFFICIENT_MEMORY = 0x80090300
-			SEC_E_INTERNAL_ERROR = 0x80090304
-			SEC_E_INVALID_HANDLE = 0x80090301
-			SEC_E_INVALID_TOKEN = 0x80090308
-			SEC_E_LOGON_DENIED = 0x8009030C
-			SEC_E_NO_AUTHENTICATING_AUTHORITY = 0x80090311
-			SEC_E_NO_CREDENTIALS = 0x8009030E
-			SEC_E_TARGET_UNKNOWN = 0x80090303
-			SEC_E_UNSUPPORTED_FUNCTION = 0x80090302
-			SEC_E_WRONG_PRINCIPAL = 0x80090322
-
-			# These are generally returned by AcquireCredentialsHandle
-			SEC_E_NOT_OWNER = 0x80090306
-			SEC_E_SECPKG_NOT_FOUND = 0x80090305
-			SEC_E_UNKNOWN_CREDENTIALS = 0x8009030D
-
-			@@map = {}
-			constants.each { |v| @@map[self.const_get(v.to_s)] = v }
-
-			attr_reader :value
-
-			def initialize(value)
-				# convert to unsigned long
-				value = [value].pack("L").unpack("L").first
-				raise "#{value.to_s(16)} is not a recognized result" unless @@map.has_key? value
-				@value = value
-			end
-
-			def to_s
-				@@map[@value].to_s
-			end
-
-			def ok?
-				@value == SEC_I_CONTINUE_NEEDED || @value == SEC_E_OK
-			end
-
-			def ==(other)
-				if other.is_a?(SSPIResult)
-					@value == other.value
-				elsif other.is_a?(Fixnum)
-					@value == @@map[other]
-				else
-					false
-				end
-			end
-		end
-
-		# Handles "Negotiate" type authentication. Geared towards authenticating with a proxy server over HTTP
-		class NegotiateAuth
-			attr_accessor :credentials, :context, :contextAttributes, :user, :domain
-
-			# Default request flags for SSPI functions
-			REQUEST_FLAGS = ISC_REQ_CONFIDENTIALITY | ISC_REQ_REPLAY_DETECT | ISC_REQ_CONNECTION
-
-			# NTLM tokens start with this header always. Encoding alone adds "==" and newline, so remove those
-      B64_TOKEN_PREFIX = ["NTLMSSP"].pack("m").delete("=\n")
-
-			# Given a connection and a request path, performs authentication as the current user and returns
-			# the response from a GET request. The connnection should be a Net::HTTP object, and it should
-			# have been constructed using the Net::HTTP.Proxy method, but anything that responds to "get" will work.
-			# If a user and domain are given, will authenticate as the given user.
-			# Returns the response received from the get method (usually Net::HTTPResponse)
-			def NegotiateAuth.proxy_auth_get(http, path, user = nil, domain = nil)
-				raise "http must respond to :get" unless http.respond_to?(:get)
-				nego_auth = self.new user, domain
-
-				resp = http.get path, { "Proxy-Authorization" => "Negotiate " + nego_auth.get_initial_token }
-				if resp["Proxy-Authenticate"]
-					resp = http.get path, { "Proxy-Authorization" => "Negotiate " + nego_auth.complete_authentication(resp["Proxy-Authenticate"].split(" ").last.strip) }
-				end
-
-				resp
-			end
-
-			# Creates a new instance ready for authentication as the given user in the given domain.
-			# Defaults to current user and domain as defined by ENV["USERDOMAIN"] and ENV["USERNAME"] if
-			# no arguments are supplied.
-			def initialize(user = nil, domain = nil)
-				if user.nil? && domain.nil? && ENV["USERNAME"].nil? && ENV["USERDOMAIN"].nil?
-					raise "A username or domain must be supplied since they cannot be retrieved from the environment"
-				end
-
-				@user = user || ENV["USERNAME"]
-				@domain = domain || ENV["USERDOMAIN"]
-			end
-
-			# Gets the initial Negotiate token. Returns it as a base64 encoded string suitable for use in HTTP. Can
-			# be easily decoded, however.
-			def get_initial_token
-				raise "This object is no longer usable because its resources have been freed." if @cleaned_up
-				get_credentials
-
-				outputBuffer = SecurityBuffer.new
-				@context = CtxtHandle.new
-				@contextAttributes = "\0" * 4
-
-				result = SSPIResult.new(API::InitializeSecurityContext.call(@credentials.to_p, nil, nil,
-					REQUEST_FLAGS,0, SECURITY_NETWORK_DREP, nil, 0, @context.to_p, outputBuffer.to_p, @contextAttributes, TimeStamp.new.to_p))
-
-				if result.ok? then
-					return encode_token(outputBuffer.token)
-				else
-					raise "Error: #{result.to_s}"
-				end
-			end
-
-			# Takes a token and gets the next token in the Negotiate authentication chain. Token can be Base64 encoded or not.
-			# The token can include the "Negotiate" header and it will be stripped.
-			# Does not indicate if SEC_I_CONTINUE or SEC_E_OK was returned.
-			# Token returned is Base64 encoded w/ all new lines removed.
-			def complete_authentication(token)
-				raise "This object is no longer usable because its resources have been freed." if @cleaned_up
-
-				# Nil token OK, just set it to empty string
-				token = "" if token.nil?
-
-				if token.include? "Negotiate"
-					# If the Negotiate prefix is passed in, assume we are seeing "Negotiate <token>" and get the token.
-					token = token.split(" ").last
-				end
-
-				if token.include? B64_TOKEN_PREFIX
-					# indicates base64 encoded token
-          token = token.strip.unpack("m")[0]
-				end
-
-				outputBuffer = SecurityBuffer.new
-				result = SSPIResult.new(API::InitializeSecurityContext.call(@credentials.to_p, @context.to_p, nil,
-					REQUEST_FLAGS, 0, SECURITY_NETWORK_DREP, SecurityBuffer.new(token).to_p, 0,
-					@context.to_p,
-					outputBuffer.to_p, @contextAttributes, TimeStamp.new.to_p))
-
-				if result.ok? then
-					return encode_token(outputBuffer.token)
-				else
-					raise "Error: #{result.to_s}"
-				end
-			ensure
-				# need to make sure we don't clean up if we've already cleaned up.
-				clean_up unless @cleaned_up
-			end
-
-		 private
-
-			def clean_up
-				# free structures allocated
-				@cleaned_up = true
-				API::FreeCredentialsHandle.call(@credentials.to_p)
-				API::DeleteSecurityContext.call(@context.to_p)
-				@context = nil
-				@credentials = nil
-				@contextAttributes = nil
-			end
-
-			# Gets credentials based on user, domain or both. If both are nil, an error occurs
-			def get_credentials
-				@credentials = CredHandle.new
-				ts = TimeStamp.new
-				@identity = Identity.new @user, @domain
-				result = SSPIResult.new(API::AcquireCredentialsHandle.call(nil, "Negotiate", SECPKG_CRED_OUTBOUND, nil, @identity.to_p,
-					nil, nil, @credentials.to_p, ts.to_p))
-				raise "Error acquire credentials: #{result}" unless result.ok?
-			end
-
-			def encode_token(t)
-				# encode64 will add newlines every 60 characters so we need to remove those.
-        [t].pack("m").delete("\n")
-			end
-		end
-	end
-end
-\ No newline at end of file
diff --git a/ext/etc/depend b/ext/etc/depend
index f2c04f5879..99e812c7e4 100644
--- a/ext/etc/depend
+++ b/ext/etc/depend
@@ -1 +1,23 @@
-etc.o : etc.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.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.h
+etc.o: $(hdrdir)/ruby/assert.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/onigmo.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: constdefs.h
+etc.o: etc.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 2bd2e30747..2f3fbb737b 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -9,6 +9,7 @@
 
 #include "ruby.h"
 #include "ruby/encoding.h"
+#include "ruby/io.h"
 
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
@@ -23,6 +24,16 @@
 #include <grp.h>
 #endif
 
+#include <errno.h>
+
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
+
+#ifdef HAVE_SCHED_GETAFFINITY
+#include <sched.h>
+#endif
+
 static VALUE sPasswd;
 #ifdef HAVE_GETGRENT
 static VALUE sGroup;
@@ -33,6 +44,7 @@ static VALUE sGroup;
 #ifndef CSIDL_COMMON_APPDATA
 #define CSIDL_COMMON_APPDATA 35
 #endif
+#define HAVE_UNAME 1
 #endif
 
 #ifndef _WIN32
@@ -40,9 +52,21 @@ char *getenv();
 #endif
 char *getlogin();
 
-/* Returns the short user name of the currently logged in user.
- * Unfortunately, it is often rather easy to fool getlogin().
- * Avoid getlogin() for security-related purposes.
+#define RUBY_ETC_VERSION "1.1.0"
+
+#include "constdefs.h"
+
+/* call-seq:
+ *	getlogin	->  String
+ *
+ * Returns the short user name of the currently logged in user.
+ * Unfortunately, it is often rather easy to fool ::getlogin.
+ *
+ * Avoid ::getlogin for security-related purposes.
+ *
+ * If ::getlogin fails, try ::getpwuid.
+ *
+ * See the unix manpage for <code>getpwuid(3)</code> for more detail.
  *
  * e.g.
  *   Etc.getlogin -> 'guest'
@@ -52,7 +76,6 @@ etc_getlogin(VALUE obj)
 {
     char *login;
 
-    rb_secure(4);
 #ifdef HAVE_GETLOGIN
     login = getlogin();
     if (!login) login = getenv("USER");
@@ -60,8 +83,15 @@ etc_getlogin(VALUE obj)
     login = getenv("USER");
 #endif
 
-    if (login)
-	return rb_tainted_str_new2(login);
+    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);
+    }
+
     return Qnil;
 }
 
@@ -70,7 +100,21 @@ static VALUE
 safe_setup_str(const char *str)
 {
     if (str == 0) str = "";
-    return rb_tainted_str_new2(str);
+    return rb_str_new2(str);
+}
+
+static VALUE
+safe_setup_locale_str(const char *str)
+{
+    if (str == 0) str = "";
+    return rb_locale_str_new_cstr(str);
+}
+
+static VALUE
+safe_setup_filesystem_str(const char *str)
+{
+    if (str == 0) str = "";
+    return rb_filesystem_str_new_cstr(str);
 }
 #endif
 
@@ -80,33 +124,33 @@ setup_passwd(struct passwd *pwd)
 {
     if (pwd == 0) rb_sys_fail("/etc/passwd");
     return rb_struct_new(sPasswd,
-			 safe_setup_str(pwd->pw_name),
-#ifdef HAVE_ST_PW_PASSWD
+			 safe_setup_locale_str(pwd->pw_name),
+#ifdef HAVE_STRUCT_PASSWD_PW_PASSWD
 			 safe_setup_str(pwd->pw_passwd),
 #endif
 			 UIDT2NUM(pwd->pw_uid),
 			 GIDT2NUM(pwd->pw_gid),
-#ifdef HAVE_ST_PW_GECOS
-			 safe_setup_str(pwd->pw_gecos),
+#ifdef HAVE_STRUCT_PASSWD_PW_GECOS
+			 safe_setup_locale_str(pwd->pw_gecos),
 #endif
-			 safe_setup_str(pwd->pw_dir),
-			 safe_setup_str(pwd->pw_shell),
-#ifdef HAVE_ST_PW_CHANGE
+			 safe_setup_filesystem_str(pwd->pw_dir),
+			 safe_setup_filesystem_str(pwd->pw_shell),
+#ifdef HAVE_STRUCT_PASSWD_PW_CHANGE
 			 INT2NUM(pwd->pw_change),
 #endif
-#ifdef HAVE_ST_PW_QUOTA
+#ifdef HAVE_STRUCT_PASSWD_PW_QUOTA
 			 INT2NUM(pwd->pw_quota),
 #endif
-#ifdef HAVE_ST_PW_AGE
+#ifdef HAVE_STRUCT_PASSWD_PW_AGE
 			 PW_AGE2VAL(pwd->pw_age),
 #endif
-#ifdef HAVE_ST_PW_CLASS
-			 safe_setup_str(pwd->pw_class),
+#ifdef HAVE_STRUCT_PASSWD_PW_CLASS
+			 safe_setup_locale_str(pwd->pw_class),
 #endif
-#ifdef HAVE_ST_PW_COMMENT
-			 safe_setup_str(pwd->pw_comment),
+#ifdef HAVE_STRUCT_PASSWD_PW_COMMENT
+			 safe_setup_locale_str(pwd->pw_comment),
 #endif
-#ifdef HAVE_ST_PW_EXPIRE
+#ifdef HAVE_STRUCT_PASSWD_PW_EXPIRE
 			 INT2NUM(pwd->pw_expire),
 #endif
 			 0		/*dummy*/
@@ -114,14 +158,22 @@ setup_passwd(struct passwd *pwd)
 }
 #endif
 
-/* Returns the /etc/passwd information for the user with specified integer
- * user id (uid).
+/* call-seq:
+ *	getpwuid(uid)	->  Passwd
+ *
+ * Returns the /etc/passwd information for the user with the given integer +uid+.
+ *
+ * The information is returned as a Passwd struct.
+ *
+ * If +uid+ is omitted, the value from <code>Passwd[:uid]</code> is returned
+ * instead.
+ *
+ * See the unix manpage for <code>getpwuid(3)</code> for more detail.
  *
- * The information is returned as a Struct::Passwd; see getpwent above for
- * details.
+ * === Example:
  *
- * e.g.  * Etc.getpwuid(0) -> #<struct Struct::Passwd name="root",
- * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
+ *	Etc.getpwuid(0)
+ *	#=> #<struct Etc::Passwd name="root", passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
  */
 static VALUE
 etc_getpwuid(int argc, VALUE *argv, VALUE obj)
@@ -131,7 +183,6 @@ etc_getpwuid(int argc, VALUE *argv, VALUE obj)
     rb_uid_t uid;
     struct passwd *pwd;
 
-    rb_secure(4);
     if (rb_scan_args(argc, argv, "01", &id) == 1) {
 	uid = NUM2UIDT(id);
     }
@@ -146,23 +197,30 @@ etc_getpwuid(int argc, VALUE *argv, VALUE obj)
 #endif
 }
 
-/* Returns the /etc/passwd information for the user with specified login name.
+/* call-seq:
+ *	getpwnam(name)	->  Passwd
  *
- * The information is returned as a Struct::Passwd; see getpwent above for
- * details.
+ * Returns the /etc/passwd information for the user with specified login
+ * +name+.
  *
- * e.g.  * Etc.getpwnam('root') -> #<struct Struct::Passwd name="root",
- * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
+ * The information is returned as a Passwd struct.
+ *
+ * See the unix manpage for <code>getpwnam(3)</code> for more detail.
+ *
+ * === Example:
+ *
+ *	Etc.getpwnam('root')
+ *	#=> #<struct Etc::Passwd name="root", passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
  */
 static VALUE
 etc_getpwnam(VALUE obj, VALUE nam)
 {
 #ifdef HAVE_GETPWENT
     struct passwd *pwd;
+    const char *p = StringValueCStr(nam);
 
-    SafeStringValue(nam);
-    pwd = getpwnam(RSTRING_PTR(nam));
-    if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING_PTR(nam));
+    pwd = getpwnam(p);
+    if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %"PRIsVALUE, nam);
     return setup_passwd(pwd);
 #else
     return Qnil;
@@ -172,22 +230,22 @@ etc_getpwnam(VALUE obj, VALUE nam)
 #ifdef HAVE_GETPWENT
 static int passwd_blocking = 0;
 static VALUE
-passwd_ensure(void)
+passwd_ensure(VALUE _)
 {
+    endpwent();
     passwd_blocking = (int)Qfalse;
     return Qnil;
 }
 
 static VALUE
-passwd_iterate(void)
+passwd_iterate(VALUE _)
 {
     struct passwd *pw;
 
     setpwent();
-    while (pw = getpwent()) {
+    while ((pw = getpwent()) != 0) {
 	rb_yield(setup_passwd(pw));
     }
-    endpwent();
     return Qnil;
 }
 
@@ -202,11 +260,16 @@ each_passwd(void)
 }
 #endif
 
-/* Provides a convenient Ruby iterator which executes a block for each entry
+/* call-seq:
+ *	Etc.passwd { |struct| block }	->  Passwd
+ *	Etc.passwd			->  Passwd
+ *
+ * Provides a convenient Ruby iterator which executes a block for each entry
  * in the /etc/passwd file.
  *
- * The code block is passed an Struct::Passwd struct; see getpwent above for
- * details.
+ * The code block is passed an Passwd struct.
+ *
+ * See ::getpwent above for details.
  *
  * Example:
  *
@@ -223,22 +286,27 @@ etc_passwd(VALUE obj)
 #ifdef HAVE_GETPWENT
     struct passwd *pw;
 
-    rb_secure(4);
     if (rb_block_given_p()) {
 	each_passwd();
     }
-    else if (pw = getpwent()) {
+    else if ((pw = getpwent()) != 0) {
 	return setup_passwd(pw);
     }
 #endif
     return Qnil;
 }
 
-/* Iterates for each entry in the /etc/passwd file if a block is given.
- * If no block is given, returns the enumerator.
+/* call-seq:
+ *	Etc::Passwd.each { |struct| block }	->  Passwd
+ *	Etc::Passwd.each			->  Enumerator
+ *
+ * Iterates for each entry in the /etc/passwd file if a block is given.
  *
- * The code block is passed an Struct::Passwd struct; see getpwent above for
- * details.
+ * If no block is given, returns the Enumerator.
+ *
+ * The code block is passed an Passwd struct.
+ *
+ * See ::getpwent above for details.
  *
  * Example:
  *
@@ -263,7 +331,7 @@ etc_each_passwd(VALUE obj)
 }
 
 /* Resets the process of reading the /etc/passwd file, so that the next call
- * to getpwent will return the first entry again.
+ * to ::getpwent will return the first entry again.
  */
 static VALUE
 etc_setpwent(VALUE obj)
@@ -275,7 +343,7 @@ etc_setpwent(VALUE obj)
 }
 
 /* Ends the process of scanning through the /etc/passwd file begun with
- * getpwent, and closes the file.
+ * ::getpwent, and closes the file.
  */
 static VALUE
 etc_endpwent(VALUE obj)
@@ -286,31 +354,16 @@ etc_endpwent(VALUE obj)
     return Qnil;
 }
 
-/* Returns an entry from the /etc/passwd file. The first time it is called it
- * opens the file and returns the first entry; each successive call returns
- * the next entry, or nil if the end of the file has been reached.
- *
- * To close the file when processing is complete, call endpwent.
+/* Returns an entry from the /etc/passwd file.
  *
- * Each entry is returned as a Struct::Passwd:
+ * The first time it is called it opens the file and returns the first entry;
+ * each successive call returns the next entry, or +nil+ if the end of the file
+ * has been reached.
  *
- * - Passwd#name contains the short login name of the user as a String.
+ * To close the file when processing is complete, call ::endpwent.
  *
- * - Passwd#passwd contains the encrypted password of the user as a String.
- *   an 'x' is returned if shadow passwords are in use. An '*' is returned
- *   if the user cannot log in using a password.
+ * Each entry is returned as a Passwd struct.
  *
- * - Passwd#uid contains the integer user ID (uid) of the user.
- *
- * - Passwd#gid contains the integer group ID (gid) of the user's primary group.
- *
- * - Passwd#gecos contains a longer String description of the user, such as
- *   a full name. Some Unix systems provide structured information in the
- *   gecos field, but this is system-dependent.
- *
- * - Passwd#dir contains the path to the home directory of the user as a String.
- *
- * - Passwd#shell contains the path to the login shell of the user as a String.
  */
 static VALUE
 etc_getpwent(VALUE obj)
@@ -318,7 +371,7 @@ etc_getpwent(VALUE obj)
 #ifdef HAVE_GETPWENT
     struct passwd *pw;
 
-    if (pw = getpwent()) {
+    if ((pw = getpwent()) != 0) {
 	return setup_passwd(pw);
     }
 #endif
@@ -335,12 +388,12 @@ setup_group(struct group *grp)
     mem = rb_ary_new();
     tbl = grp->gr_mem;
     while (*tbl) {
-	rb_ary_push(mem, safe_setup_str(*tbl));
+	rb_ary_push(mem, safe_setup_locale_str(*tbl));
 	tbl++;
     }
     return rb_struct_new(sGroup,
-			 safe_setup_str(grp->gr_name),
-#ifdef HAVE_ST_GR_PASSWD
+			 safe_setup_locale_str(grp->gr_name),
+#ifdef HAVE_STRUCT_GROUP_GR_PASSWD
 			 safe_setup_str(grp->gr_passwd),
 #endif
 			 GIDT2NUM(grp->gr_gid),
@@ -348,14 +401,20 @@ setup_group(struct group *grp)
 }
 #endif
 
-/* Returns information about the group with specified integer group id (gid),
+/* call-seq:
+ *	getgrgid(group_id)  ->	Group
+ *
+ * Returns information about the group with specified integer +group_id+,
  * as found in /etc/group.
  *
- * The information is returned as a Struct::Group; see getgrent above for
- * details.
+ * The information is returned as a Group struct.
  *
- * e.g.  Etc.getgrgid(100) -> #<struct Struct::Group name="users", passwd="x",
- * gid=100, mem=["meta", "root"]>
+ * See the unix manpage for <code>getgrgid(3)</code> for more detail.
+ *
+ * === Example:
+ *
+ *	Etc.getgrgid(100)
+ *	#=> #<struct Etc::Group name="users", passwd="x", gid=100, mem=["meta", "root"]>
  *
  */
 static VALUE
@@ -366,7 +425,6 @@ etc_getgrgid(int argc, VALUE *argv, VALUE obj)
     gid_t gid;
     struct group *grp;
 
-    rb_secure(4);
     if (rb_scan_args(argc, argv, "01", &id) == 1) {
 	gid = NUM2GIDT(id);
     }
@@ -381,14 +439,20 @@ etc_getgrgid(int argc, VALUE *argv, VALUE obj)
 #endif
 }
 
-/* Returns information about the group with specified String name, as found
- * in /etc/group.
+/* call-seq:
+ *	getgrnam(name)	->  Group
+ *
+ * Returns information about the group with specified +name+, as found in
+ * /etc/group.
  *
- * The information is returned as a Struct::Group; see getgrent above for
- * details.
+ * The information is returned as a Group struct.
  *
- * e.g.  Etc.getgrnam('users') -> #<struct Struct::Group name="users",
- * passwd="x", gid=100, mem=["meta", "root"]>
+ * See the unix manpage for <code>getgrnam(3)</code> for more detail.
+ *
+ * === Example:
+ *
+ *	Etc.getgrnam('users')
+ *	#=> #<struct Etc::Group name="users", passwd="x", gid=100, mem=["meta", "root"]>
  *
  */
 static VALUE
@@ -396,11 +460,10 @@ etc_getgrnam(VALUE obj, VALUE nam)
 {
 #ifdef HAVE_GETGRENT
     struct group *grp;
+    const char *p = StringValueCStr(nam);
 
-    rb_secure(4);
-    SafeStringValue(nam);
-    grp = getgrnam(RSTRING_PTR(nam));
-    if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING_PTR(nam));
+    grp = getgrnam(p);
+    if (grp == 0) rb_raise(rb_eArgError, "can't find group for %"PRIsVALUE, nam);
     return setup_group(grp);
 #else
     return Qnil;
@@ -410,22 +473,23 @@ etc_getgrnam(VALUE obj, VALUE nam)
 #ifdef HAVE_GETGRENT
 static int group_blocking = 0;
 static VALUE
-group_ensure(void)
+group_ensure(VALUE _)
 {
+    endgrent();
     group_blocking = (int)Qfalse;
     return Qnil;
 }
 
+
 static VALUE
-group_iterate(void)
+group_iterate(VALUE _)
 {
     struct group *pw;
 
     setgrent();
-    while (pw = getgrent()) {
+    while ((pw = getgrent()) != 0) {
 	rb_yield(setup_group(pw));
     }
-    endgrent();
     return Qnil;
 }
 
@@ -443,8 +507,9 @@ each_group(void)
 /* Provides a convenient Ruby iterator which executes a block for each entry
  * in the /etc/group file.
  *
- * The code block is passed an Struct::Group struct; see getgrent above for
- * details.
+ * The code block is passed an Group struct.
+ *
+ * See ::getgrent above for details.
  *
  * Example:
  *
@@ -461,11 +526,10 @@ etc_group(VALUE obj)
 #ifdef HAVE_GETGRENT
     struct group *grp;
 
-    rb_secure(4);
     if (rb_block_given_p()) {
 	each_group();
     }
-    else if (grp = getgrent()) {
+    else if ((grp = getgrent()) != 0) {
 	return setup_group(grp);
     }
 #endif
@@ -473,11 +537,15 @@ etc_group(VALUE obj)
 }
 
 #ifdef HAVE_GETGRENT
-/* Iterates for each entry in the /etc/group file if a block is given.
- * If no block is given, returns the enumerator.
+/* call-seq:
+ *	Etc::Group.each { |group| block }   ->	obj
+ *	Etc::Group.each			    ->	Enumerator
  *
- * The code block is passed an Struct::Group struct; see getpwent above for
- * details.
+ * Iterates for each entry in the /etc/group file if a block is given.
+ *
+ * If no block is given, returns the Enumerator.
+ *
+ * The code block is passed a Group struct.
  *
  * Example:
  *
@@ -501,7 +569,7 @@ etc_each_group(VALUE obj)
 #endif
 
 /* Resets the process of reading the /etc/group file, so that the next call
- * to getgrent will return the first entry again.
+ * to ::getgrent will return the first entry again.
  */
 static VALUE
 etc_setgrent(VALUE obj)
@@ -513,7 +581,7 @@ etc_setgrent(VALUE obj)
 }
 
 /* Ends the process of scanning through the /etc/group file begun by
- * getgrent, and closes the file.
+ * ::getgrent, and closes the file.
  */
 static VALUE
 etc_endgrent(VALUE obj)
@@ -524,25 +592,15 @@ etc_endgrent(VALUE obj)
     return Qnil;
 }
 
-/* Returns an entry from the /etc/group file. The first time it is called it
- * opens the file and returns the first entry; each successive call returns
- * the next entry, or nil if the end of the file has been reached.
- *
- * To close the file when processing is complete, call endgrent.
+/* Returns an entry from the /etc/group file.
  *
- * Each entry is returned as a Struct::Group:
+ * The first time it is called it opens the file and returns the first entry;
+ * each successive call returns the next entry, or +nil+ if the end of the file
+ * has been reached.
  *
- * - Group#name contains the name of the group as a String.
+ * To close the file when processing is complete, call ::endgrent.
  *
- * - Group#passwd contains the encrypted password as a String. An 'x' is
- *   returned if password access to the group is not available; an empty
- *   string is returned if no password is needed to obtain membership of
- *   the group.
- *
- * - Group#gid contains the group's numeric ID as an integer.
- *
- * - Group#mem is an Array of Strings containing the short login names of the
- *   members of the group.
+ * Each entry is returned as a Group struct
  */
 static VALUE
 etc_getgrent(VALUE obj)
@@ -550,7 +608,7 @@ etc_getgrent(VALUE obj)
 #ifdef HAVE_GETGRENT
     struct group *gr;
 
-    if (gr = getgrent()) {
+    if ((gr = getgrent()) != 0) {
 	return setup_group(gr);
     }
 #endif
@@ -567,6 +625,11 @@ VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
 
 /*
  * Returns system configuration directory.
+ *
+ * This is typically "/etc", but is modified by the prefix used when Ruby was
+ * compiled. For example, if Ruby is built and installed in /usr/local,
+ * returns "/usr/local/etc" on other platforms than Windows.
+ * On Windows, this always returns the directory provided by the system.
  */
 static VALUE
 etc_sysconfdir(VALUE obj)
@@ -579,10 +642,10 @@ etc_sysconfdir(VALUE obj)
 }
 
 /*
- * Returns system temporary directory.
+ * Returns system temporary directory; typically "/tmp".
  */
 static VALUE
-etc_systmpdir(void)
+etc_systmpdir(VALUE _)
 {
     VALUE tmpdir;
 #ifdef _WIN32
@@ -591,16 +654,410 @@ etc_systmpdir(void)
     if (!len) return Qnil;
     tmpdir = rb_w32_conv_from_wchar(path, rb_filesystem_encoding());
 #else
-    tmpdir = rb_filesystem_str_new_cstr("/tmp");
+    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
+#endif
+#ifndef RB_PASS_KEYWORDS
+    /* untaint on Ruby < 2.7 */
+    FL_UNSET(tmpdir, FL_TAINT);
 #endif
-    FL_UNSET(tmpdir, FL_TAINT|FL_UNTRUSTED);
     return tmpdir;
 }
 
+#ifdef HAVE_UNAME
+/*
+ * Returns the system information obtained by uname system call.
+ *
+ * The return value is a hash which has 5 keys at least:
+ *   :sysname, :nodename, :release, :version, :machine
+ *
+ * Example:
+ *
+ *   require 'etc'
+ *   require 'pp'
+ *
+ *   pp Etc.uname
+ *   #=> {:sysname=>"Linux",
+ *   #    :nodename=>"boron",
+ *   #    :release=>"2.6.18-6-xen-686",
+ *   #    :version=>"#1 SMP Thu Nov 5 19:54:42 UTC 2009",
+ *   #    :machine=>"i686"}
+ *
+ */
+static VALUE
+etc_uname(VALUE obj)
+{
+#ifdef _WIN32
+    OSVERSIONINFOW v;
+    SYSTEM_INFO s;
+    const char *sysname, *mach;
+    VALUE result, release, version;
+    VALUE vbuf, nodename = Qnil;
+    DWORD len = 0;
+    WCHAR *buf;
+
+    v.dwOSVersionInfoSize = sizeof(v);
+    if (!GetVersionExW(&v))
+        rb_sys_fail("GetVersionEx");
+
+    result = rb_hash_new();
+    switch (v.dwPlatformId) {
+      case VER_PLATFORM_WIN32s:
+	sysname = "Win32s";
+	break;
+      case VER_PLATFORM_WIN32_NT:
+	sysname = "Windows_NT";
+	break;
+      case VER_PLATFORM_WIN32_WINDOWS:
+      default:
+	sysname = "Windows";
+	break;
+    }
+    rb_hash_aset(result, ID2SYM(rb_intern("sysname")), rb_str_new_cstr(sysname));
+    release = rb_sprintf("%lu.%lu.%lu", v.dwMajorVersion, v.dwMinorVersion, v.dwBuildNumber);
+    rb_hash_aset(result, ID2SYM(rb_intern("release")), release);
+    version = rb_sprintf("%s Version %"PRIsVALUE": %"PRIsVALUE, sysname, release,
+			 rb_w32_conv_from_wchar(v.szCSDVersion, rb_utf8_encoding()));
+    rb_hash_aset(result, ID2SYM(rb_intern("version")), version);
+
+# if defined _MSC_VER && _MSC_VER < 1300
+#   define GET_COMPUTER_NAME(ptr, plen) GetComputerNameW(ptr, plen)
+# else
+#   define GET_COMPUTER_NAME(ptr, plen) GetComputerNameExW(ComputerNameDnsFullyQualified, ptr, plen)
+# endif
+    GET_COMPUTER_NAME(NULL, &len);
+    buf = ALLOCV_N(WCHAR, vbuf, len);
+    if (GET_COMPUTER_NAME(buf, &len)) {
+	nodename = rb_w32_conv_from_wchar(buf, rb_utf8_encoding());
+    }
+    ALLOCV_END(vbuf);
+    if (NIL_P(nodename)) nodename = rb_str_new(0, 0);
+    rb_hash_aset(result, ID2SYM(rb_intern("nodename")), nodename);
+
+# ifndef PROCESSOR_ARCHITECTURE_AMD64
+#   define PROCESSOR_ARCHITECTURE_AMD64 9
+# endif
+# ifndef PROCESSOR_ARCHITECTURE_INTEL
+#   define PROCESSOR_ARCHITECTURE_INTEL 0
+# endif
+    GetSystemInfo(&s);
+    switch (s.wProcessorArchitecture) {
+      case PROCESSOR_ARCHITECTURE_AMD64:
+	mach = "x64";
+	break;
+      case PROCESSOR_ARCHITECTURE_ARM:
+	mach = "ARM";
+	break;
+      case PROCESSOR_ARCHITECTURE_INTEL:
+	mach = "x86";
+	break;
+      default:
+	mach = "unknown";
+	break;
+    }
+
+    rb_hash_aset(result, ID2SYM(rb_intern("machine")), rb_str_new_cstr(mach));
+#else
+    struct utsname u;
+    int ret;
+    VALUE result;
+
+    ret = uname(&u);
+    if (ret == -1)
+        rb_sys_fail("uname");
+
+    result = rb_hash_new();
+    rb_hash_aset(result, ID2SYM(rb_intern("sysname")), rb_str_new_cstr(u.sysname));
+    rb_hash_aset(result, ID2SYM(rb_intern("nodename")), rb_str_new_cstr(u.nodename));
+    rb_hash_aset(result, ID2SYM(rb_intern("release")), rb_str_new_cstr(u.release));
+    rb_hash_aset(result, ID2SYM(rb_intern("version")), rb_str_new_cstr(u.version));
+    rb_hash_aset(result, ID2SYM(rb_intern("machine")), rb_str_new_cstr(u.machine));
+#endif
+
+    return result;
+}
+#else
+#define etc_uname rb_f_notimplement
+#endif
+
+#ifdef HAVE_SYSCONF
+/*
+ * Returns system configuration variable using sysconf().
+ *
+ * _name_ should be a constant under <code>Etc</code> which begins with <code>SC_</code>.
+ *
+ * The return value is an integer or nil.
+ * 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
+ *
+ */
+static VALUE
+etc_sysconf(VALUE obj, VALUE arg)
+{
+    int name;
+    long ret;
+
+    name = NUM2INT(arg);
+
+    errno = 0;
+    ret = sysconf(name);
+    if (ret == -1) {
+        if (errno == 0) /* no limit */
+            return Qnil;
+        rb_sys_fail("sysconf");
+    }
+    return LONG2NUM(ret);
+}
+#else
+#define etc_sysconf rb_f_notimplement
+#endif
+
+#ifdef HAVE_CONFSTR
+/*
+ * Returns system configuration variable using confstr().
+ *
+ * _name_ should be a constant under <code>Etc</code> which begins with <code>CS_</code>.
+ *
+ * The return value is a string or nil.
+ * nil means no configuration-defined value.  (confstr() returns 0 but errno is not set.)
+ *
+ *   Etc.confstr(Etc::CS_PATH) #=> "/bin:/usr/bin"
+ *
+ *   # GNU/Linux
+ *   Etc.confstr(Etc::CS_GNU_LIBC_VERSION) #=> "glibc 2.18"
+ *   Etc.confstr(Etc::CS_GNU_LIBPTHREAD_VERSION) #=> "NPTL 2.18"
+ *
+ */
+static VALUE
+etc_confstr(VALUE obj, VALUE arg)
+{
+    int name;
+    char localbuf[128], *buf = localbuf;
+    size_t bufsize = sizeof(localbuf), ret;
+    VALUE tmp;
+
+    name = NUM2INT(arg);
+
+    errno = 0;
+    ret = confstr(name, buf, bufsize);
+    if (bufsize < ret) {
+        bufsize = ret;
+        buf = ALLOCV_N(char, tmp, bufsize);
+        errno = 0;
+        ret = confstr(name, buf, bufsize);
+    }
+    if (bufsize < ret)
+        rb_bug("required buffer size for confstr() changed dynamically.");
+    if (ret == 0) {
+        if (errno == 0) /* no configuration-defined value */
+            return Qnil;
+        rb_sys_fail("confstr");
+    }
+    return rb_str_new_cstr(buf);
+}
+#else
+#define etc_confstr rb_f_notimplement
+#endif
+
+#ifdef HAVE_FPATHCONF
+/*
+ * Returns pathname configuration variable using fpathconf().
+ *
+ * _name_ should be a constant under <code>Etc</code> which begins with <code>PC_</code>.
+ *
+ * The return value is an integer or nil.
+ * nil means indefinite limit.  (fpathconf() returns -1 but errno is not set.)
+ *
+ *   require 'etc'
+ *   IO.pipe {|r, w|
+ *     p w.pathconf(Etc::PC_PIPE_BUF) #=> 4096
+ *   }
+ *
+ */
+static VALUE
+io_pathconf(VALUE io, VALUE arg)
+{
+    int name;
+    long ret;
+    rb_io_t *fptr;
+
+    name = NUM2INT(arg);
+
+    GetOpenFile(io, fptr);
+
+    errno = 0;
+    ret = fpathconf(fptr->fd, name);
+    if (ret == -1) {
+        if (errno == 0) /* no limit */
+            return Qnil;
+        rb_sys_fail("fpathconf");
+    }
+    return LONG2NUM(ret);
+}
+#else
+#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
+
 /*
- * The etc module provides access to information from the running OS.
+ * 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
  *
- * Documented by mathew <meta@pobox.com>.
+ */
+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.
+ *
+ * The information accessible consists of the information found in the
+ * /etc/passwd and /etc/group files, plus information about the system's
+ * temporary directory (/tmp) and configuration directory (/etc).
+ *
+ * The Etc module provides a more reliable way to access information about
+ * the logged in user than environment variables such as +$USER+.
+ *
+ * == Example:
+ *
+ *     require 'etc'
+ *
+ *     login = Etc.getlogin
+ *     info = Etc.getpwnam(login)
+ *     username = info.gecos.split(/,/).first
+ *     puts "Hello #{username}, I see your login name is #{login}"
+ *
+ * Note that the methods provided by this module are not always secure.
+ * It should be used for informational purposes, and not for security.
+ *
+ * All operations defined in this module are class methods, so that you can
+ * include the Etc module into your class.
  */
 void
 Init_etc(void)
@@ -608,6 +1065,9 @@ Init_etc(void)
     VALUE mEtc;
 
     mEtc = rb_define_module("Etc");
+    rb_define_const(mEtc, "VERSION", rb_str_new_cstr(RUBY_ETC_VERSION));
+    init_constants(mEtc);
+
     rb_define_module_function(mEtc, "getlogin", etc_getlogin, 0);
 
     rb_define_module_function(mEtc, "getpwuid", etc_getpwuid, -1);
@@ -625,44 +1085,121 @@ Init_etc(void)
     rb_define_module_function(mEtc, "getgrent", etc_getgrent, 0);
     rb_define_module_function(mEtc, "sysconfdir", etc_sysconfdir, 0);
     rb_define_module_function(mEtc, "systmpdir", etc_systmpdir, 0);
+    rb_define_module_function(mEtc, "uname", etc_uname, 0);
+    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("Passwd",
-				"name", "passwd", "uid", "gid",
-#ifdef HAVE_ST_PW_GECOS
-				"gecos",
+    sPasswd =  rb_struct_define_under(mEtc, "Passwd",
+				      "name",
+#ifdef HAVE_STRUCT_PASSWD_PW_PASSWD
+				      "passwd",
+#endif
+				      "uid",
+				      "gid",
+#ifdef HAVE_STRUCT_PASSWD_PW_GECOS
+				      "gecos",
 #endif
-				"dir", "shell",
-#ifdef HAVE_ST_PW_CHANGE
-				"change",
+				      "dir",
+				      "shell",
+#ifdef HAVE_STRUCT_PASSWD_PW_CHANGE
+				      "change",
 #endif
-#ifdef HAVE_ST_PW_QUOTA
-				"quota",
+#ifdef HAVE_STRUCT_PASSWD_PW_QUOTA
+				      "quota",
 #endif
-#ifdef HAVE_ST_PW_AGE
-				"age",
+#ifdef HAVE_STRUCT_PASSWD_PW_AGE
+				      "age",
 #endif
-#ifdef HAVE_ST_PW_CLASS
-				"uclass",
+#ifdef HAVE_STRUCT_PASSWD_PW_CLASS
+				      "uclass",
 #endif
-#ifdef HAVE_ST_PW_COMMENT
-				"comment",
+#ifdef HAVE_STRUCT_PASSWD_PW_COMMENT
+				      "comment",
 #endif
-#ifdef HAVE_ST_PW_EXPIRE
-				"expire",
+#ifdef HAVE_STRUCT_PASSWD_PW_EXPIRE
+				      "expire",
 #endif
-				NULL);
+				      NULL);
+#if 0
+    /* Define-const: Passwd
+     *
+     * Passwd is a Struct that contains the following members:
+     *
+     * name::
+     *	    contains the short login name of the user as a String.
+     * passwd::
+     *	    contains the encrypted password of the user as a String.
+     *	    an 'x' is returned if shadow passwords are in use. An '*' is returned
+     *      if the user cannot log in using a password.
+     * uid::
+     *	    contains the integer user ID (uid) of the user.
+     * gid::
+     *	    contains the integer group ID (gid) of the user's primary group.
+     * dir::
+     *	    contains the path to the home directory of the user as a String.
+     * shell::
+     *	    contains the path to the login shell of the user as a String.
+     *
+     * === The following members below are optional, and must be compiled with special flags:
+     *
+     * gecos::
+     *     contains a longer String description of the user, such as
+     *	   a full name. Some Unix systems provide structured information in the
+     *     gecos field, but this is system-dependent.
+     *     must be compiled with +HAVE_STRUCT_PASSWD_PW_GECOS+
+     * change::
+     *     password change time(integer) must be compiled with +HAVE_STRUCT_PASSWD_PW_CHANGE+
+     * quota::
+     *     quota value(integer) must be compiled with +HAVE_STRUCT_PASSWD_PW_QUOTA+
+     * age::
+     *     password age(integer) must be compiled with +HAVE_STRUCT_PASSWD_PW_AGE+
+     * class::
+     *     user access class(string) must be compiled with +HAVE_STRUCT_PASSWD_PW_CLASS+
+     * comment::
+     *     comment(string) must be compiled with +HAVE_STRUCT_PASSWD_PW_COMMENT+
+     * expire::
+     *	    account expiration time(integer) must be compiled with +HAVE_STRUCT_PASSWD_PW_EXPIRE+
+     */
     rb_define_const(mEtc, "Passwd", sPasswd);
+#endif
+    rb_define_const(rb_cStruct, "Passwd", sPasswd); /* deprecated name */
     rb_extend_object(sPasswd, rb_mEnumerable);
     rb_define_singleton_method(sPasswd, "each", etc_each_passwd, 0);
 
 #ifdef HAVE_GETGRENT
-    sGroup = rb_struct_define("Group", "name",
-#ifdef HAVE_ST_GR_PASSWD
-			      "passwd",
+    sGroup = rb_struct_define_under(mEtc, "Group", "name",
+#ifdef HAVE_STRUCT_GROUP_GR_PASSWD
+				    "passwd",
 #endif
-			      "gid", "mem", NULL);
+				    "gid", "mem", NULL);
 
+#if 0
+    /* Define-const: Group
+     *
+     * Group is a Struct that is only available when compiled with +HAVE_GETGRENT+.
+     *
+     * The struct contains the following members:
+     *
+     * name::
+     *	    contains the name of the group as a String.
+     * passwd::
+     *	    contains the encrypted password as a String. An 'x' is
+     *	    returned if password access to the group is not available; an empty
+     *	    string is returned if no password is needed to obtain membership of
+     *	    the group.
+     *
+     *	    Must be compiled with +HAVE_STRUCT_GROUP_GR_PASSWD+.
+     * gid::
+     *	    contains the group's numeric ID as an integer.
+     * mem::
+     *	    is an Array of Strings containing the short login names of the
+     *	    members of the group.
+     */
     rb_define_const(mEtc, "Group", sGroup);
+#endif
+    rb_define_const(rb_cStruct, "Group", sGroup); /* deprecated name */
     rb_extend_object(sGroup, rb_mEnumerable);
     rb_define_singleton_method(sGroup, "each", etc_each_group, 0);
 #endif
diff --git a/ext/etc/etc.gemspec b/ext/etc/etc.gemspec
new file mode 100644
index 0000000000..f28016925f
--- /dev/null
+++ b/ext/etc/etc.gemspec
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+version = ["", "ext/etc/"].find do |dir|
+  begin
+    break File.open(File.expand_path("../#{dir}/etc.c", __FILE__)) do |f|
+      f.gets "\n#define RUBY_ETC_VERSION "
+      f.gets[/"(.+)"/, 1]
+    end
+  rescue
+    next
+  end
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = "etc"
+  spec.version       = version
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{Provides access to information typically stored in UNIX /etc directory.}
+  spec.description   = spec.summary
+  spec.homepage      = "https://github.com/ruby/etc"
+  spec.license       = "BSD-2-Clause"
+
+  spec.files         = %w[
+    LICENSE.txt
+    README.md
+    ext/etc/constdefs.h
+    ext/etc/etc.c
+    ext/etc/extconf.rb
+    ext/etc/mkconstants.rb
+    stub/etc.rb
+    test/etc/test_etc.rb
+  ]
+  spec.bindir        = "exe"
+  spec.require_paths = ["lib"]
+  spec.extensions    = %w{ext/etc/extconf.rb}
+
+  spec.required_ruby_version = ">= 2.3.0"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake-compiler"
+  spec.add_development_dependency "test-unit"
+end
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index 1967560cd4..435fbe7f3d 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -1,30 +1,52 @@
+# frozen_string_literal: true
 require 'mkmf'
 
+headers = []
+%w[sys/utsname.h].each {|h|
+  if have_header(h, headers)
+    headers << h
+  end
+}
 have_library("sun", "getpwnam")	# NIS (== YP) interface for IRIX 4
-a = have_func("getlogin")
-b = have_func("getpwent")
-c = have_func("getgrent")
-sysconfdir = RbConfig.expand(RbConfig::CONFIG["sysconfdir"].dup, "prefix"=>"", "DESTDIR"=>"")
-$defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}")
-if  a or b or c or sysconfdir
-  have_struct_member('struct passwd', 'pw_gecos', 'pwd.h')
-  have_struct_member('struct passwd', 'pw_change', 'pwd.h')
-  have_struct_member('struct passwd', 'pw_quota', 'pwd.h')
-  if have_struct_member('struct passwd', 'pw_age', 'pwd.h')
-    case what_type?('struct passwd', 'pw_age', 'pwd.h')
-    when "string"
-      f = "safe_setup_str"
-    when "long long"
-      f = "LL2NUM"
-    else
-      f = "INT2NUM"
-    end
-    $defs.push("-DPW_AGE2VAL="+f)
+have_func("uname((struct utsname *)NULL)", headers)
+have_func("getlogin")
+have_func("getpwent")
+have_func("getgrent")
+if (sysconfdir = RbConfig::CONFIG["sysconfdir"] and
+    !RbConfig.expand(sysconfdir.dup, "prefix"=>"", "DESTDIR"=>"").empty?)
+  $defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}")
+end
+
+have_func("sysconf")
+have_func("confstr")
+have_func("fpathconf")
+
+have_struct_member('struct passwd', 'pw_gecos', 'pwd.h')
+have_struct_member('struct passwd', 'pw_change', 'pwd.h')
+have_struct_member('struct passwd', 'pw_quota', 'pwd.h')
+if have_struct_member('struct passwd', 'pw_age', 'pwd.h')
+  case what_type?('struct passwd', 'pw_age', 'pwd.h')
+  when "string"
+    f = "safe_setup_str"
+  when "long long"
+    f = "LL2NUM"
+  else
+    f = "INT2NUM"
   end
-  have_struct_member('struct passwd', 'pw_class', 'pwd.h')
-  have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM
-  have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
-  have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
-  have_struct_member('struct group', 'gr_passwd', 'grp.h')
-  create_makefile("etc")
+  $defs.push("-DPW_AGE2VAL="+f)
 end
+have_struct_member('struct passwd', 'pw_class', 'pwd.h')
+have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM
+have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
+have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
+have_struct_member('struct group', 'gr_passwd', 'grp.h')
+
+# for https://github.com/ruby/etc
+srcdir = File.expand_path("..", __FILE__)
+if !File.exist?("#{srcdir}/depend")
+  %x[#{RbConfig.ruby} #{srcdir}/mkconstants.rb -o #{srcdir}/constdefs.h]
+end
+
+$distcleanfiles << "constdefs.h"
+
+create_makefile("etc")
diff --git a/ext/etc/mkconstants.rb b/ext/etc/mkconstants.rb
new file mode 100644
index 0000000000..a752d64519
--- /dev/null
+++ b/ext/etc/mkconstants.rb
@@ -0,0 +1,340 @@
+# frozen_string_literal: true
+require 'optparse'
+require 'erb'
+
+C_ESC = {
+  "\\" => "\\\\",
+  '"' => '\"',
+  "\n" => '\n',
+}
+
+0x00.upto(0x1f) {|ch| C_ESC[[ch].pack("C")] ||= "\\%03o" % ch }
+0x7f.upto(0xff) {|ch| C_ESC[[ch].pack("C")] = "\\%03o" % ch }
+C_ESC_PAT = Regexp.union(*C_ESC.keys)
+
+def c_str(str)
+  '"' + str.gsub(C_ESC_PAT) {|s| C_ESC[s]} + '"'
+end
+
+opt = OptionParser.new
+
+opt.def_option('-h', 'help') {
+  puts opt
+  exit 0
+}
+
+opt_o = nil
+opt.def_option('-o FILE', 'specify output file') {|filename|
+  opt_o = filename
+}
+
+opt_H = nil
+opt.def_option('-H FILE', 'specify output header file') {|filename|
+  opt_H = filename
+}
+
+opt.parse!
+
+h = {}
+COMMENTS = {}
+
+DATA.each_line {|s|
+  next if /\A\s*(\#|\z)/ =~ s
+  name, default_value, comment = s.chomp.split(/\s+/, 3)
+
+  default_value = nil if default_value == 'nil'
+
+  if h.has_key? name
+    warn "#{$.}: warning: duplicate name: #{name}"
+    next
+  end
+  h[name] = default_value
+  COMMENTS[name] = comment if comment
+}
+DEFS = h.to_a
+
+def each_const
+  DEFS.each {|name, default_value|
+    yield name, default_value
+  }
+end
+
+def each_name(pat)
+  DEFS.each {|name, default_value|
+    next if pat !~ name
+    yield name
+  }
+end
+
+erb_new = lambda do |src, safe, trim|
+  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+    ERB.new(src, trim_mode: trim)
+  else
+    ERB.new(src, safe, trim)
+  end
+end
+
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
+% each_const {|name, default_value|
+#if !defined(<%=name%>)
+# if defined(HAVE_CONST_<%=name.upcase%>)
+#  define <%=name%> <%=name%>
+%if default_value
+# else
+#  define <%=name%> <%=default_value%>
+%end
+# endif
+#endif
+% }
+EOS
+
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
+% each_const {|name, default_value|
+#if defined(<%=name%>)
+%   if comment = COMMENTS[name]
+    /* <%=comment%> */
+%   end
+    rb_define_const(mod, <%=c_str name.sub(/\A_*/, '')%>, INTEGER2NUM(<%=name%>));
+#endif
+% }
+EOS
+
+header_result = erb_new.call(<<'EOS', nil, '%').result(binding)
+/* autogenerated file */
+
+<%= gen_const_decls %>
+EOS
+
+result = erb_new.call(<<'EOS', nil, '%').result(binding)
+/* autogenerated file */
+
+#ifdef HAVE_LONG_LONG
+#define INTEGER2NUM(n) \
+    (FIXNUM_MAX < (n) ? ULL2NUM(n) : \
+     FIXNUM_MIN > (LONG_LONG)(n) ? LL2NUM(n) : \
+     LONG2FIX(n))
+#else
+#define INTEGER2NUM(n) \
+    (FIXNUM_MAX < (n) ? ULONG2NUM(n) : \
+     FIXNUM_MIN > (long)(n) ? LONG2NUM(n) : \
+     LONG2FIX(n))
+#endif
+
+static void
+init_constants(VALUE mod)
+{
+<%= gen_const_defs %>
+}
+EOS
+
+if opt_H
+  File.open(opt_H, 'w') {|f|
+    f << header_result
+  }
+else
+  result = header_result + result
+end
+
+if opt_o
+  File.open(opt_o, 'w') {|f|
+    f << result
+  }
+else
+  $stdout << result
+end
+
+__END__
+# SUSv4
+_SC_AIO_LISTIO_MAX
+_SC_AIO_MAX
+_SC_AIO_PRIO_DELTA_MAX
+_SC_ARG_MAX
+_SC_ATEXIT_MAX
+_SC_BC_BASE_MAX
+_SC_BC_DIM_MAX
+_SC_BC_SCALE_MAX
+_SC_BC_STRING_MAX
+_SC_CHILD_MAX
+_SC_CLK_TCK
+_SC_COLL_WEIGHTS_MAX
+_SC_DELAYTIMER_MAX
+_SC_EXPR_NEST_MAX
+_SC_HOST_NAME_MAX
+_SC_IOV_MAX
+_SC_LINE_MAX
+_SC_LOGIN_NAME_MAX
+_SC_NGROUPS_MAX
+_SC_GETGR_R_SIZE_MAX
+_SC_GETPW_R_SIZE_MAX
+_SC_MQ_OPEN_MAX
+_SC_MQ_PRIO_MAX
+_SC_OPEN_MAX
+_SC_ADVISORY_INFO
+_SC_BARRIERS
+_SC_ASYNCHRONOUS_IO
+_SC_CLOCK_SELECTION
+_SC_CPUTIME
+_SC_FSYNC
+_SC_IPV6
+_SC_JOB_CONTROL
+_SC_MAPPED_FILES
+_SC_MEMLOCK
+_SC_MEMLOCK_RANGE
+_SC_MEMORY_PROTECTION
+_SC_MESSAGE_PASSING
+_SC_MONOTONIC_CLOCK
+_SC_PRIORITIZED_IO
+_SC_PRIORITY_SCHEDULING
+_SC_RAW_SOCKETS
+_SC_READER_WRITER_LOCKS
+_SC_REALTIME_SIGNALS
+_SC_REGEXP
+_SC_SAVED_IDS
+_SC_SEMAPHORES
+_SC_SHARED_MEMORY_OBJECTS
+_SC_SHELL
+_SC_SPAWN
+_SC_SPIN_LOCKS
+_SC_SPORADIC_SERVER
+_SC_SS_REPL_MAX
+_SC_SYNCHRONIZED_IO
+_SC_THREAD_ATTR_STACKADDR
+_SC_THREAD_ATTR_STACKSIZE
+_SC_THREAD_CPUTIME
+_SC_THREAD_PRIO_INHERIT
+_SC_THREAD_PRIO_PROTECT
+_SC_THREAD_PRIORITY_SCHEDULING
+_SC_THREAD_PROCESS_SHARED
+_SC_THREAD_ROBUST_PRIO_INHERIT
+_SC_THREAD_ROBUST_PRIO_PROTECT
+_SC_THREAD_SAFE_FUNCTIONS
+_SC_THREAD_SPORADIC_SERVER
+_SC_THREADS
+_SC_TIMEOUTS
+_SC_TIMERS
+_SC_TRACE
+_SC_TRACE_EVENT_FILTER
+_SC_TRACE_EVENT_NAME_MAX
+_SC_TRACE_INHERIT
+_SC_TRACE_LOG
+_SC_TRACE_NAME_MAX
+_SC_TRACE_SYS_MAX
+_SC_TRACE_USER_EVENT_MAX
+_SC_TYPED_MEMORY_OBJECTS
+_SC_VERSION
+_SC_V7_ILP32_OFF32
+_SC_V7_ILP32_OFFBIG
+_SC_V7_LP64_OFF64
+_SC_V7_LPBIG_OFFBIG
+_SC_V6_ILP32_OFF32
+_SC_V6_ILP32_OFFBIG
+_SC_V6_LP64_OFF64
+_SC_V6_LPBIG_OFFBIG
+_SC_2_C_BIND
+_SC_2_C_DEV
+_SC_2_CHAR_TERM
+_SC_2_FORT_DEV
+_SC_2_FORT_RUN
+_SC_2_LOCALEDEF
+_SC_2_PBS
+_SC_2_PBS_ACCOUNTING
+_SC_2_PBS_CHECKPOINT
+_SC_2_PBS_LOCATE
+_SC_2_PBS_MESSAGE
+_SC_2_PBS_TRACK
+_SC_2_SW_DEV
+_SC_2_UPE
+_SC_2_VERSION
+_SC_PAGE_SIZE
+_SC_PAGESIZE
+_SC_THREAD_DESTRUCTOR_ITERATIONS
+_SC_THREAD_KEYS_MAX
+_SC_THREAD_STACK_MIN
+_SC_THREAD_THREADS_MAX
+_SC_RE_DUP_MAX
+_SC_RTSIG_MAX
+_SC_SEM_NSEMS_MAX
+_SC_SEM_VALUE_MAX
+_SC_SIGQUEUE_MAX
+_SC_STREAM_MAX
+_SC_SYMLOOP_MAX
+_SC_TIMER_MAX
+_SC_TTY_NAME_MAX
+_SC_TZNAME_MAX
+_SC_XOPEN_CRYPT
+_SC_XOPEN_ENH_I18N
+_SC_XOPEN_REALTIME
+_SC_XOPEN_REALTIME_THREADS
+_SC_XOPEN_SHM
+_SC_XOPEN_STREAMS
+_SC_XOPEN_UNIX
+_SC_XOPEN_UUCP
+_SC_XOPEN_VERSION
+
+# non-standard
+_SC_PHYS_PAGES
+_SC_AVPHYS_PAGES
+_SC_NPROCESSORS_CONF
+_SC_NPROCESSORS_ONLN
+_SC_CPUSET_SIZE
+
+# SUSv4
+_CS_PATH
+_CS_POSIX_V7_ILP32_OFF32_CFLAGS
+_CS_POSIX_V7_ILP32_OFF32_LDFLAGS
+_CS_POSIX_V7_ILP32_OFF32_LIBS
+_CS_POSIX_V7_ILP32_OFFBIG_CFLAGS
+_CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS
+_CS_POSIX_V7_ILP32_OFFBIG_LIBS
+_CS_POSIX_V7_LP64_OFF64_CFLAGS
+_CS_POSIX_V7_LP64_OFF64_LDFLAGS
+_CS_POSIX_V7_LP64_OFF64_LIBS
+_CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS
+_CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS
+_CS_POSIX_V7_LPBIG_OFFBIG_LIBS
+_CS_POSIX_V7_THREADS_CFLAGS
+_CS_POSIX_V7_THREADS_LDFLAGS
+_CS_POSIX_V7_WIDTH_RESTRICTED_ENVS
+_CS_V7_ENV
+_CS_POSIX_V6_ILP32_OFF32_CFLAGS
+_CS_POSIX_V6_ILP32_OFF32_LDFLAGS
+_CS_POSIX_V6_ILP32_OFF32_LIBS
+_CS_POSIX_V6_ILP32_OFFBIG_CFLAGS
+_CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS
+_CS_POSIX_V6_ILP32_OFFBIG_LIBS
+_CS_POSIX_V6_LP64_OFF64_CFLAGS
+_CS_POSIX_V6_LP64_OFF64_LDFLAGS
+_CS_POSIX_V6_LP64_OFF64_LIBS
+_CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS
+_CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS
+_CS_POSIX_V6_LPBIG_OFFBIG_LIBS
+_CS_POSIX_V6_WIDTH_RESTRICTED_ENVS
+_CS_V6_ENV
+
+# non-standard
+_CS_GNU_LIBC_VERSION
+_CS_GNU_LIBPTHREAD_VERSION
+
+# SUSv4
+_PC_FILESIZEBITS
+_PC_LINK_MAX
+_PC_MAX_CANON
+_PC_MAX_INPUT
+_PC_NAME_MAX
+_PC_PATH_MAX
+_PC_PIPE_BUF
+_PC_2_SYMLINKS
+_PC_ALLOC_SIZE_MIN
+_PC_REC_INCR_XFER_SIZE
+_PC_REC_MAX_XFER_SIZE
+_PC_REC_MIN_XFER_SIZE
+_PC_REC_XFER_ALIGN
+_PC_SYMLINK_MAX
+_PC_CHOWN_RESTRICTED
+_PC_NO_TRUNC
+_PC_VDISABLE
+_PC_ASYNC_IO
+_PC_PRIO_IO
+_PC_SYNC_IO
+_PC_TIMESTAMP_RESOLUTION
+
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 5665a966a8..80a0a1208d 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -1,30 +1,29 @@
 #! /usr/local/bin/ruby
-# -*- ruby -*-
+# -*- mode: ruby; coding: us-ascii -*-
+# frozen_string_literal: false
 
+# :stopdoc:
 $extension = nil
 $extstatic = nil
 $force_static = nil
-$install = nil
 $destdir = nil
 $dryrun = false
-$clean = nil
 $nodynamic = nil
-$extinit = nil
-$extobjs = nil
+$extobjs = []
 $extflags = ""
 $extlibs = nil
 $extpath = nil
-$ignore = nil
 $message = nil
 $command_output = nil
-$configure_only = false
+$subconfigure = false
 
 $progname = $0
 alias $PROGRAM_NAME $0
 alias $0 $progname
 
 $extlist = []
-$compiled = {}
+
+DUMMY_SIGNATURE = "***DUMMY MAKEFILE***"
 
 srcdir = File.dirname(File.dirname(__FILE__))
 unless defined?(CROSS_COMPILING) and CROSS_COMPILING
@@ -40,22 +39,49 @@ $" << "mkmf.rb"
 load File.expand_path("lib/mkmf.rb", srcdir)
 require 'optparse/shellwords'
 
-def sysquote(x)
-  @quote ||= /os2/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
-  @quote ? x.quote : x
+if defined?(File::NULL)
+  @null = File::NULL
+elsif !File.chardev?(@null = "/dev/null")
+  @null = "nul"
 end
 
 def verbose?
-  $mflags.defined?("Q") != "@"
+  $mflags.defined?("V") == "1"
+end
+
+def system(*args)
+  if verbose?
+    if args.size == 1
+      puts args
+    else
+      puts Shellwords.join(args)
+    end
+  end
+  super
+end
+
+def atomic_write_open(filename)
+  filename_new = filename + ".new.#$$"
+  open(filename_new, "wb") do |f|
+    yield f
+  end
+  if File.binread(filename_new) != (File.binread(filename) rescue nil)
+    File.rename(filename_new, filename)
+  else
+    File.unlink(filename_new)
+  end
 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(/^install-rb-default:.*[ \t](\S+)(?:[ \t].*)?\n\1:[ \t]*(\S+)/) {installrb[$2] = $1}
+  m.scan(/^(?:do-)?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]
@@ -73,6 +99,11 @@ def extract_makefile(makefile, keep = true)
     end
     return false
   end
+  srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")].map {|fn| File.basename(fn)}.sort
+  if !srcs.empty?
+    old_srcs = m[/^ORIG_SRCS[ \t]*=[ \t](.*)/, 1] or return false
+    (old_srcs.split - srcs).empty? or return false
+  end
   $target = target
   $extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1]
   if $static.nil?
@@ -80,7 +111,9 @@ def extract_makefile(makefile, keep = true)
     /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = false
   end
   $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "")
-  $DLDFLAGS += " " + (m[/^dldflags[ \t]*=[ \t]*(.*)/, 1] || "")
+  if dldflags = m[/^dldflags[ \t]*=[ \t]*(.*)/, 1] and !$DLDFLAGS.include?(dldflags)
+    $DLDFLAGS += " " + dldflags
+  end
   if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1]
     s.sub!(/^#{Regexp.quote($LIBRUBYARG)} */, "")
     s.sub!(/ *#{Regexp.quote($LIBS)}$/, "")
@@ -88,20 +121,25 @@ def extract_makefile(makefile, keep = true)
   end
   $objs = (m[/^OBJS[ \t]*=[ \t](.*)/, 1] || "").split
   $srcs = (m[/^SRCS[ \t]*=[ \t](.*)/, 1] || "").split
-  $distcleanfiles = (m[/^DISTCLEANFILES[ \t]*=[ \t](.*)/, 1] || "").split
+  $headers = (m[/^LOCAL_HDRS[ \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)
-  unless $configure_only
-    print "#{$message} #{target}\n"
-    $stdout.flush
-  end
-
+def extmake(target, basedir = 'ext', maybestatic = true)
   FileUtils.mkpath target unless File.directory?(target)
   begin
+    # don't build if parent library isn't build
+    parent = true
+    d = target
+    until (d = File.dirname(d)) == '.'
+      if File.exist?("#{$top_srcdir}/#{basedir}/#{d}/extconf.rb")
+        parent = (/^all:\s*install/ =~ IO.read("#{d}/Makefile") rescue false)
+        break
+      end
+    end
+
     dir = Dir.pwd
     FileUtils.mkpath target unless File.directory?(target)
     Dir.chdir target
@@ -114,14 +152,16 @@ def extmake(target)
     $topdir = prefix + $topdir
     $target = target
     $mdir = target
-    $srcdir = File.join($top_srcdir, "ext", $mdir)
+    $srcdir = File.join($top_srcdir, basedir, $mdir)
     $preload = nil
     $objs = []
     $srcs = []
-    $compiled[target] = false
+    $extso = []
     makefile = "./Makefile"
-    ok = File.exist?(makefile)
-    unless $ignore
+    static = $static
+    $static = nil if noinstall = File.fnmatch?("-*", target)
+    ok = parent && File.exist?(makefile)
+    if parent
       rbconfig0 = RbConfig::CONFIG
       mkconfig0 = CONFIG
       rbconfig = {
@@ -131,7 +171,7 @@ def extmake(target)
       }
       mkconfig = {
 	"hdrdir" => ($hdrdir == top_srcdir) ? top_srcdir : "$(top_srcdir)/include",
-	"srcdir" => "$(top_srcdir)/ext/#{$mdir}",
+	"srcdir" => "$(top_srcdir)/#{basedir}/#{$mdir}",
 	"topdir" => $topdir,
       }
       rbconfig0.each_pair {|key, val| rbconfig[key] ||= val.dup}
@@ -142,7 +182,7 @@ def extmake(target)
 	remove_const(:MAKEFILE_CONFIG)
 	const_set(:MAKEFILE_CONFIG, mkconfig)
       }
-      Object.class_eval {
+      MakeMakefile.class_eval {
 	remove_const(:CONFIG)
 	const_set(:CONFIG, mkconfig)
       }
@@ -150,30 +190,28 @@ def extmake(target)
 	$extconf_h = nil
 	ok &&= extract_makefile(makefile)
 	old_objs = $objs
-	old_cleanfiles = $distcleanfiles
+	old_cleanfiles = $distcleanfiles | $cleanfiles
 	conf = ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb"].find {|f| File.exist?(f)}
-	if (($extconf_h && !File.exist?($extconf_h)) ||
+	if (!ok || ($extconf_h && !File.exist?($extconf_h)) ||
 	    !(t = modified?(makefile, MTIMES)) ||
 	    [conf, "#{$srcdir}/depend"].any? {|f| modified?(f, [t])})
         then
 	  ok = false
-          if $configure_only
+          if verbose?
+            print "#{conf}\n" if conf
+          else
             print "#{$message} #{target}\n"
-            $stdout.flush
           end
+          $stdout.flush
           init_mkmf
 	  Logging::logfile 'mkmf.log'
 	  rm_f makefile
 	  if conf
-            unless verbose?
-              stdout, $stdout = $stdout, File.open(File::NULL, "a")
-            else
-              stdout = $stdout
-            end
-            begin
+            Logging.open do
+              unless verbose?
+                $stderr.reopen($stdout.reopen(@null))
+              end
               load $0 = conf
-            ensure
-              $stdout = stdout
             end
 	  else
 	    create_makefile(target)
@@ -183,59 +221,65 @@ def extmake(target)
 	end
       rescue SystemExit
 	# ignore
+      rescue => error
+        ok = false
       ensure
 	rm_f "conftest*"
-	config = $0
 	$0 = $PROGRAM_NAME
       end
     end
-    ok = yield(ok) if block_given?
+    ok &&= File.open(makefile){|f| s = f.gets and !s[DUMMY_SIGNATURE]}
     unless ok
-      open(makefile, "w") do |f|
-	f.print(*dummy_makefile(CONFIG["srcdir"]))
+      mf = ["# #{DUMMY_SIGNATURE}\n", *dummy_makefile(CONFIG["srcdir"])].join("")
+      atomic_write_open(makefile) do |f|
+        f.print(mf)
+      end
+
+      return true if !error and target.start_with?("-")
+
+      message = nil
+      if error
+        loc = error.backtrace_locations[0]
+        message = "#{loc.absolute_path}:#{loc.lineno}: #{error.message}"
+        if Logging.log_opened?
+          Logging::message("#{message}\n\t#{error.backtrace.join("\n\t")}\n")
+        end
       end
-      print "Failed to configure #{target}. It will not be installed.\n"
-      return true
+
+      return [parent, message]
     end
-    args = sysquote($mflags)
+    args = $mflags
     unless $destdir.to_s.empty? or $mflags.defined?("DESTDIR")
-      args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
+      args += ["DESTDIR=" + relative_from($destdir, "../"+prefix)]
     end
-    if $static
-      args += ["static"] unless $clean
-      $extlist.push [$static, $target, File.basename($target), $preload]
+    if $static and ok and !$objs.empty? and !noinstall
+      args += ["static"]
+      $extlist.push [(maybestatic ? $static : false), target, $target, $preload]
     end
-    FileUtils.rm_f(old_cleanfiles - $distcleanfiles)
+    FileUtils.rm_f(old_cleanfiles - $distcleanfiles - $cleanfiles)
     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
-	FileUtils.rm_f([makefile, $extconf_h || "extconf.h"])
-      end
-    end
     if $static
       $extflags ||= ""
       $extlibs ||= []
       $extpath ||= []
       unless $mswin
-        $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ")
+        $extflags = split_libs($extflags, $DLDFLAGS, $LDFLAGS).uniq.join(" ")
       end
-      $extlibs = merge_libs($extlibs, $libs.split, $LOCAL_LIBS.split)
+      $extlibs = merge_libs($extlibs, split_libs($libs, $LOCAL_LIBS).map {|lib| lib.sub(/\A\.\//, "ext/#{target}/")})
       $extpath |= $LIBPATH
     end
   ensure
-    unless $ignore
+    Logging::log_close
+    if rbconfig0
       RbConfig.module_eval {
 	remove_const(:CONFIG)
 	const_set(:CONFIG, rbconfig0)
 	remove_const(:MAKEFILE_CONFIG)
 	const_set(:MAKEFILE_CONFIG, mkconfig0)
       }
-      Object.class_eval {
+    end
+    if mkconfig0
+      MakeMakefile.class_eval {
 	remove_const(:CONFIG)
 	const_set(:CONFIG, mkconfig0)
       }
@@ -243,6 +287,7 @@ def extmake(target)
     $top_srcdir = top_srcdir
     $topdir = topdir
     $hdrdir = hdrdir
+    $static = static
     Dir.chdir dir
   end
   begin
@@ -254,10 +299,6 @@ def extmake(target)
   true
 end
 
-def compiled?(target)
-  $compiled[target]
-end
-
 def parse_args()
   $mflags = []
   $makeflags = [] # for make command to build ruby, so quoted
@@ -298,6 +339,12 @@ def parse_args()
     opts.on('--command-output=FILE', String) do |v|
       $command_output = v
     end
+    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)
@@ -306,6 +353,7 @@ def parse_args()
     $optparser.warn(e)
     abort $optparser.to_s
   end
+  $command_output or abort "--command-output option is mandatory"
 
   $destdir ||= ''
 
@@ -341,18 +389,10 @@ parse_args()
 if target = ARGV.shift and /^[a-z-]+$/ =~ target
   $mflags.push(target)
   case target
-  when /^(dist|real)?(clean)$/
-    target = $2
-    $ignore ||= true
-    $clean = $1 ? $1[0] : true
-  when /^install\b/
-    $install = true
-    $ignore ||= true
-    $mflags.unshift("INSTALL_PROG=install -c -p -m 0755",
-                    "INSTALL_DATA=install -c -p -m 0644",
-                    "MAKEDIRS=mkdir -p") if $dryrun
+  when /^(dist|real)?(clean)$/, /^install\b/
+    abort "#{target} is obsolete"
   when /configure/
-    $configure_only = true
+    $subconfigure = !ARGV.empty?
   end
 end
 unless $message
@@ -371,12 +411,15 @@ elsif sep = config_string('BUILD_FILE_SEPARATOR')
 else
   $ruby = '$(topdir)/miniruby' + EXEEXT
 end
-$ruby << " -I'$(topdir)'"
+$ruby = [$ruby]
+$ruby << "-I'$(topdir)'"
 unless CROSS_COMPILING
-  $ruby << " -I'$(top_srcdir)/lib'"
-  $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
+  $ruby << "-I'$(top_srcdir)/lib'"
+  $ruby << "-I'$(extout)/$(arch)'" << "-I'$(extout)/common'" if $extout
   ENV["RUBYLIB"] = "-"
 end
+topruby = $ruby
+$ruby = topruby.join(' ')
 $mflags << "ruby=#$ruby"
 
 MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
@@ -416,56 +459,119 @@ for dir in ["ext", File::join($top_srcdir, "ext")]
   end
 end unless $extstatic
 
-ext_prefix = "#{$top_srcdir}/ext"
+@gemname = nil
+if ARGV[0]
+  ext_prefix, exts = ARGV.shift.split('/', 2)
+  $extension = [exts] if exts
+  if ext_prefix == 'gems'
+    @gemname = exts
+  elsif exts
+    $static_ext.delete_if {|t, *| !File.fnmatch(t, exts)}
+  end
+end
+ext_prefix = "#{$top_srcdir}/#{ext_prefix || 'ext'}"
 exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
-withes, withouts = %w[--with --without].collect {|w|
-  if not (w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
-    nil
+default_exclude_exts =
+  case
+  when $cygwin
+    %w''
+  when $mswin, $mingw
+    %w'pty syslog'
+  else
+    %w'*win32*'
+  end
+mandatory_exts = {}
+withes, withouts = [["--with", nil], ["--without", default_exclude_exts]].collect {|w, d|
+  if !(w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
+    d ? proc {|c1| d.any?(&c1)} : proc {true}
   elsif (w = w.grep(String)).empty?
     proc {true}
   else
-    proc {|c1| w.collect {|o| o.split(/,/)}.flatten.any?(&c1)}
+    w = w.collect {|o| o.split(/,/)}.flatten
+    w.collect! {|o| o == '+' ? d : o}.flatten!
+    proc {|c1| w.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) or !withouts.call(cond1)
+  withes.call(proc {|n|
+                !n or (mandatory_exts[ext] = true if File.fnmatch(n, ext))
+              }) and
+    !withouts.call(proc {|n| File.fnmatch(n, ext)})
 }
 ($extension || %w[*]).each do |e|
   e = e.sub(/\A(?:\.\/)+/, '')
-  exts |= Dir.glob("#{ext_prefix}/#{e}/**/extconf.rb").collect {|d|
+  incl, excl = Dir.glob("#{ext_prefix}/#{e}/**/extconf.rb").collect {|d|
     d = File.dirname(d)
     d.slice!(0, ext_prefix.length + 1)
     d
-  }.find_all {|ext|
+  }.partition {|ext|
     with_config(ext, &cond)
-  }.sort
+  }
+  incl.sort!
+  excl.sort!.collect! {|d| d+"/"}
+  nil while incl.reject! {|d| excl << d+"/" if excl.any? {|x| d.start_with?(x)}}
+  exts |= incl
+  if $LIBRUBYARG_SHARED.empty? and CONFIG["EXTSTATIC"] == "static"
+    exts.delete_if {|d| File.fnmatch?("-*", d)}
+  end
 end
+ext_prefix = File.basename(ext_prefix)
 
-if $extout
-  extout = RbConfig.expand("#{$extout}", RbConfig::CONFIG.merge("topdir"=>$topdir))
-  unless $ignore
-    FileUtils.mkpath(extout)
+extend Module.new {
+  def timestamp_file(name, target_prefix = nil)
+    if @gemname and name == '$(TARGET_SO_DIR)'
+      name = "$(arch)/gems/#{@gemname}#{target_prefix}"
+    end
+    super.sub(%r[/\.extout\.(?:-\.)?], '/.')
   end
-end
+
+  def configuration(srcdir)
+    super << "EXTSO #{['=', $extso].join(' ')}\n"
+  end
+
+  def create_makefile(*args, &block)
+    return super unless @gemname
+    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) $@
+
+clean-so::
+	-$(Q)$(RM) $(build_complete)
+}
+      conf
+    end
+  end
+}
 
 dir = Dir.pwd
-FileUtils::makedirs('ext')
-Dir::chdir('ext')
+FileUtils::makedirs(ext_prefix)
+Dir::chdir(ext_prefix)
 
 hdrdir = $hdrdir
 $hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include"
+extso = []
+fails = []
 exts.each do |d|
-  $static = $force_static ? $static_ext[target] : nil
+  $static = $force_static ? true : $static_ext[d]
 
-  if $ignore or !$nodynamic or $static
-    extmake(d) or abort
+  if !$nodynamic or $static
+    result = extmake(d, ext_prefix, !@gemname) or abort
+    extso |= $extso
+    fails << [d, result] unless result == true
   end
 end
 
@@ -478,82 +584,41 @@ extinit = Struct.new(:c, :o) {
     super("#{src}.c", "#{src}.#{$OBJEXT}")
   end
 }.new("extinit")
-if $ignore
-  FileUtils.rm_f(extinit.to_a) if $clean
-  Dir.chdir ".."
-  if $clean
-    Dir.rmdir('ext') rescue nil
-    if $extout
-      FileUtils.rm_rf([extout+"/common", extout+"/include/ruby", extout+"/rdoc"])
-      FileUtils.rm_rf(extout+"/"+CONFIG["arch"])
-      if $clean != true
-	FileUtils.rm_rf(extout+"/include/"+CONFIG["arch"])
-	FileUtils.rm_f($mflags.defined?("INSTALLED_LIST")||ENV["INSTALLED_LIST"]||".installed.list")
-	Dir.rmdir(extout+"/include") rescue nil
-	Dir.rmdir(extout) rescue nil
-      end
-    end
-  end
-  exit
-end
 
-$extinit ||= ""
-$extobjs ||= ""
+$extobjs ||= []
 $extpath ||= []
 $extflags ||= ""
 $extlibs ||= []
+extinits = []
 unless $extlist.empty?
-  $extinit << "\n" unless $extinit.empty?
   list = $extlist.dup
   built = []
   while e = list.shift
-    s,t,i,r = e
-    if r and !(r -= built).empty?
+    static, target, feature, required = e
+    next unless static
+    if required and !(required -= built).empty?
       l = list.size
-      if (while l > 0; break true if r.include?(list[l-=1][1]) end)
+      if (while l > 0; break true if required.include?(list[l-=1][1]) end)
         list.insert(l + 1, e)
       end
       next
     end
-    f = format("%s/%s.%s", t, i, $LIBEXT)
-    if File.exist?(f)
-      $extinit << "    init(Init_#{i}, \"#{t}.so\");\n"
-      $extobjs << "ext/#{f} "
-      built << t
-    end
-  end
-
-  src = %{\
-#include "ruby.h"
-
-#define init(func, name) {	\\
-    extern void func _((void));	\\
-    ruby_init_ext(name, func);	\\
-}
-
-void ruby_init_ext _((const char *name, void (*init)(void)));
-
-void Init_ext _((void))\n{\n#$extinit}
-}
-  if !modified?(extinit.c, MTIMES) || IO.read(extinit.c) != src
-    open(extinit.c, "w") {|fe| fe.print src}
+    base = File.basename(feature)
+    extinits << feature
+    $extobjs << format("ext/%s/%s.%s", target, base, $LIBEXT)
+    built << target
   end
 
-  $extobjs = "ext/#{extinit.o} #{$extobjs}"
-  if RUBY_PLATFORM =~ /beos/
-    $extflags.delete("-L/usr/local/lib")
-  end
   $extpath.delete("$(topdir)")
   $extflags = libpathflag($extpath) << " " << $extflags.strip
   conf = [
     ['LIBRUBY_SO_UPDATE', '$(LIBRUBY_EXTS)'],
     ['SETUP', $setup],
-    [enable_config("shared", $enable_shared) ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
     ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
   ].map {|n, v|
-    "#{n}=#{v}" if v and !(v = v.strip).empty?
+    "#{n}=#{v}" if v &&= v[/\S(?:.*\S)?/]
   }.compact
-  puts(*conf)
+  puts(*conf) unless $subconfigure
   $stdout.flush
   $mflags.concat(conf)
   $makeflags.concat(conf)
@@ -575,23 +640,12 @@ 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}/."}
-  open($command_output, "wb") do |mf|
+exts.map! {|d| "#{ext_prefix}/#{d}/."}
+FileUtils.makedirs(File.dirname($command_output))
+begin
+  atomic_write_open($command_output) do |mf|
     mf.puts "V = 0"
     mf.puts "Q1 = $(V:1=)"
     mf.puts "Q = $(Q1:0=@)"
@@ -600,61 +654,123 @@ if $configure_only and $command_output
     mf.puts "MFLAGS = -$(MAKEFLAGS)" if $nmake
     mf.puts
 
-    mf.print "extensions ="
-    w = 12
-    exts.each do |d|
-      if d.size + w > 70
-        mf.print " \\\n\t    "
-        w = 12
+    def mf.macro(name, values, max = 70)
+      print name, " ="
+      w = w0 = name.size + 2
+      h = " \\\n" + "\t" * (w / 8) + " " * (w % 8)
+      values.each do |s|
+        if s.size + w > max
+          print h
+          w = w0
+        end
+        print " ", s
+        w += s.size + 1
       end
-      mf.print " #{d}"
-      w += d.size + 1
+      puts
+    end
+
+    mf.macro "ruby", topruby
+    mf.macro "RUBY", ["$(ruby)"]
+    mf.macro "extensions", exts
+    mf.macro "EXTOBJS", $extlist.empty? ? ["dmyext.#{$OBJEXT}"] : ["ext/extinit.#{$OBJEXT}", *$extobjs]
+    mf.macro "EXTLIBS", $extlibs
+    mf.macro "EXTSO", extso
+    mf.macro "EXTLDFLAGS", $extflags.split
+    mf.macro "EXTINITS", extinits
+    submakeopts = []
+    if enable_config("shared", $enable_shared)
+      submakeopts << 'DLDOBJS="$(EXTOBJS) $(EXTENCS)"'
+      submakeopts << 'EXTOBJS='
+      submakeopts << 'EXTSOLIBS="$(EXTLIBS)"'
+      submakeopts << 'LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS)'
+    else
+      submakeopts << 'EXTOBJS="$(EXTOBJS) $(EXTENCS)"'
+      submakeopts << 'EXTLIBS="$(EXTLIBS)"'
     end
+    submakeopts << 'EXTLDFLAGS="$(EXTLDFLAGS)"'
+    submakeopts << 'EXTINITS="$(EXTINITS)"'
+    submakeopts << 'UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)"'
+    submakeopts << 'SHOWFLAGS='
+    mf.macro "SUBMAKEOPTS", submakeopts
+    mf.macro "NOTE_MESG", %w[$(RUBY) $(top_srcdir)/tool/lib/colorize.rb skip]
+    mf.macro "NOTE_NAME", %w[$(RUBY) $(top_srcdir)/tool/lib/colorize.rb fail]
     mf.puts
     targets = %w[all install static install-so install-rb clean distclean realclean]
-    targets.each do |target|
-      mf.puts "#{target}: $(extensions:/.=/#{target})"
+    targets.each do |tgt|
+      mf.puts "#{tgt}: $(extensions:/.=/#{tgt})"
+      mf.puts "#{tgt}: note" unless /clean\z/ =~ tgt
     end
     mf.puts
-    mf.puts "all: #{rubies.join(' ')}"
-    mf.puts "#{rubies.join(' ')}: $(extensions:/.=/all)"
-    rubies.each do |target|
-      mf.puts "#{target}:\n\t$(Q)$(MAKE) $(MFLAGS) $@"
+    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'})"
+    submake = "$(Q)$(MAKE) $(MFLAGS) $(SUBMAKEOPTS)"
+    mf.puts "all static: #{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'}"
+    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) EXTINITS=\"$(EXTINITS)\" $@" if $static
     mf.puts
-    exec = config_string("exec") {|s| s + " "}
-    targets.each do |target|
+    if $gnumake == "yes"
+      submake = "$(MAKE) -C $(@D)"
+    else
+      submake = "cd $(@D) && "
+      config_string("exec") {|str| submake << str << " "}
+      submake << "$(MAKE)"
+    end
+    targets.each do |tgt|
       exts.each do |d|
-        mf.puts "#{d[0..-2]}#{target}:\n\t$(Q)cd $(@D) && #{exec}$(MAKE) $(MFLAGS) $(@F)"
+        d = d[0..-2]
+        t = "#{d}#{tgt}"
+        if  /^(dist|real)?clean$/ =~ tgt
+          deps = exts.select {|e|e.start_with?(d)}.map {|e|"#{e[0..-2]}#{tgt}"} - [t]
+          pd = ' ' + deps.join(' ') unless deps.empty?
+        else
+          pext = File.dirname(d)
+          pd = " #{pext}/#{tgt}" if exts.include?("#{pext}/.")
+        end
+        mf.puts "#{t}:#{pd}\n\t$(Q)#{submake} $(MFLAGS) V=$(V) $(@F)"
       end
     end
-  end
-elsif $command_output
-  message = "making #{rubies.join(', ')}"
-  message = "echo #{message}"
-  $mflags.concat(rubies)
-  $makeflags.concat(rubies)
-  cmd = $makeflags.map {|ss|ss.sub(/.*[$(){};\s].*/, %q['\&'])}.join(' ')
-  open($command_output, 'wb') do |ff|
-    case $command_output
-    when /\.sh\z/
-      ff.puts message, "rm -f \"$0\"; exec \"$@\" #{cmd}"
-    when /\.bat\z/
-      ["@echo off", message, "%* #{cmd}", "del %0 & exit %ERRORLEVEL%"].each do |ss|
-        ff.print ss, "\r\n"
+    mf.puts "\n""extso:\n"
+    mf.puts "\t@echo EXTSO=$(EXTSO)"
+
+    mf.puts "\n""note:\n"
+    unless fails.empty?
+      abandon = false
+      mf.puts "note: note-body\n"
+      mf.puts "note-body:: note-header\n"
+      mf.puts "note-header:\n"
+      mf.puts %Q<\t@$(NOTE_MESG) "*** Following extensions are not compiled:">
+      mf.puts "note-body:: note-header\n"
+      fails.each do |ext, (parent, err)|
+        abandon ||= mandatory_exts[ext]
+        mf.puts %Q<\t@$(NOTE_NAME) "#{ext}:">
+        if parent
+          mf.puts %Q<\t@echo "\tCould not be configured. It will not be installed.">
+          err and err.scan(/.+/) do |ee|
+            mf.puts %Q<\t@echo "\t#{ee.gsub(/["`$^]/, '\\\\\\&')}">
+          end
+          mf.puts %Q<\t@echo "\tCheck #{ext_prefix}/#{ext}/mkmf.log for more details.">
+        else
+          mf.puts %Q<\t@echo "\tSkipped because its parent was not configured.">
+        end
+      end
+      mf.puts "note:\n"
+      mf.puts %Q<\t@$(NOTE_MESG) "*** Fix the problems, then remove these directories and try again if you want.">
+      if abandon
+        mf.puts "\t""@exit 1"
       end
-    else
-      ff.puts cmd
     end
-    ff.chmod(0755)
   end
-elsif !$configure_only
-  message = "making #{rubies.join(', ')}"
-  puts message
-  $stdout.flush
-  $mflags.concat(rubies)
-  system($make, *sysquote($mflags)) or exit($?.exitstatus)
 end
+# :startdoc:
 
 #Local variables:
 # mode: ruby
diff --git a/ext/fcntl/depend b/ext/fcntl/depend
index 10eab64a46..60d6be6b89 100644
--- a/ext/fcntl/depend
+++ b/ext/fcntl/depend
@@ -1 +1,14 @@
-fcntl.o: fcntl.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+# AUTOGENERATED DEPENDENCIES START
+fcntl.o: $(RUBY_EXTCONF_H)
+fcntl.o: $(arch_hdrdir)/ruby/config.h
+fcntl.o: $(hdrdir)/ruby.h
+fcntl.o: $(hdrdir)/ruby/assert.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: fcntl.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/fcntl/extconf.rb b/ext/fcntl/extconf.rb
index 8b717d4a5b..6998f77483 100644
--- a/ext/fcntl/extconf.rb
+++ b/ext/fcntl/extconf.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require 'mkmf'
 create_makefile('fcntl')
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index b0992f30d8..c93694c431 100644
--- a/ext/fcntl/fcntl.c
+++ b/ext/fcntl/fcntl.c
@@ -14,12 +14,6 @@
 
 fcntl - load the C fcntl.h defines
 
-= SYNOPSIS
-
-    require "fcntl"
-    m = s.fcntl(Fcntl::F_GETFL, 0)
-    f.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK|m)
-
 = DESCRIPTION
 
 This module is just a translation of the C <fcntl.h> file.
@@ -37,151 +31,215 @@ pack up your own arguments to pass as args for locking functions, etc.
 /* Fcntl loads the constants defined in the system's <fcntl.h> C header
  * file, and used with both the fcntl(2) and open(2) POSIX system calls.
  *
- * Copyright (C) 1997-2001 Yukihiro Matsumoto
- *
- * Documented by mathew <meta@pobox.com>
- *
- * = Usage
- *
- * To perform a fcntl(2) operation, use IO::fcntl in the core classes.
+ * To perform a fcntl(2) operation, use IO::fcntl.
  *
  * To perform an open(2) operation, use IO::sysopen.
  *
- * The set of operations and constants available depends upon specific OS
- * platform. Some values listed below may not be supported on your system.
- *
- * The constants supported by Ruby for use with IO::fcntl are:
- *
- * - F_DUPFD - duplicate a close-on-exec file handle to a non-close-on-exec
- *   file handle.
- *
- * - F_GETFD - read the close-on-exec flag of a file handle.
- *
- * - F_SETFD - set the close-on-exec flag of a file handle.
- *
- * - FD_CLOEXEC - the value of the close-on-exec flag.
- *
- * - F_GETFL - get file descriptor flags.
- *
- * - F_SETFL - set file descriptor flags.
- *
- * - O_APPEND, O_NONBLOCK, etc (see below) - file descriptor flag
- *   values for the above.
- *
- * - F_GETLK - determine whether a given region of a file is locked.
- *
- * - F_SETLK - acquire a lock on a region of a file.
- *
- * - F_SETLKW - acquire a lock on a region of a file, waiting if necessary.
+ * The set of operations and constants available depends upon specific
+ * operating system.  Some values listed below may not be supported on your
+ * system.
  *
- * - F_RDLCK, F_WRLCK, F_UNLCK - types of lock for the above.
+ * See your fcntl(2) man page for complete details.
  *
- * The constants supported by Ruby for use with IO::sysopen are:
- *
- * - O_APPEND - open file in append mode.
- *
- * - O_NOCTTY - open tty without it becoming controlling tty.
- *
- * - O_CREAT - create file if it doesn't exist.
- *
- * - O_EXCL - used with O_CREAT, fail if file exists.
- *
- * - O_TRUNC - truncate file on open.
- *
- * - O_NONBLOCK / O_NDELAY - open in non-blocking mode.
- *
- * - O_RDONLY - open read-only.
- *
- * - O_WRONLY - open write-only.
- *
- * - O_RDWR - open read-write.
- *
- * - O_ACCMODE - mask to extract read/write flags.
- *
- * Example:
+ * Open /tmp/tempfile as a write-only file that is created if it doesn't
+ * exist:
  *
  *   require 'fcntl'
  *
- *   fd = IO::sysopen('/tmp/tempfile',
- *        Fcntl::O_WRONLY | Fcntl::O_EXCL | Fcntl::O_CREAT)
+ *   fd = IO.sysopen('/tmp/tempfile',
+ *                   Fcntl::O_WRONLY | Fcntl::O_EXCL | Fcntl::O_CREAT)
  *   f = IO.open(fd)
  *   f.syswrite("TEMP DATA")
  *   f.close
  *
+ * Get the flags on file +s+:
+ *
+ *   m = s.fcntl(Fcntl::F_GETFL, 0)
+ *
+ * Set the non-blocking flag on +f+ in addition to the existing flags in +m+.
+ *
+ *   f.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK|m)
+ *
  */
 void
-Init_fcntl()
+Init_fcntl(void)
 {
     VALUE mFcntl = rb_define_module("Fcntl");
 #ifdef F_DUPFD
+    /* Document-const: F_DUPFD
+     *
+     * Duplicate a file descriptor to the minimum unused file descriptor
+     * greater than or equal to the argument.
+     *
+     * The close-on-exec flag of the duplicated file descriptor is set.
+     * (Ruby uses F_DUPFD_CLOEXEC internally if available to avoid race
+     * condition.  F_SETFD is used if F_DUPFD_CLOEXEC is not available.)
+     */
     rb_define_const(mFcntl, "F_DUPFD", INT2NUM(F_DUPFD));
 #endif
 #ifdef F_GETFD
+    /* Document-const: F_GETFD
+     *
+     * Read the close-on-exec flag of a file descriptor.
+     */
     rb_define_const(mFcntl, "F_GETFD", INT2NUM(F_GETFD));
 #endif
 #ifdef F_GETLK
+    /* Document-const: F_GETLK
+     *
+     * Determine whether a given region of a file is locked.  This uses one of
+     * the F_*LK flags.
+     */
     rb_define_const(mFcntl, "F_GETLK", INT2NUM(F_GETLK));
 #endif
 #ifdef F_SETFD
+    /* Document-const: F_SETFD
+     *
+     * Set the close-on-exec flag of a file descriptor.
+     */
     rb_define_const(mFcntl, "F_SETFD", INT2NUM(F_SETFD));
 #endif
 #ifdef F_GETFL
+    /* Document-const: F_GETFL
+     *
+     * Get the file descriptor flags.  This will be one or more of the O_*
+     * flags.
+     */
     rb_define_const(mFcntl, "F_GETFL", INT2NUM(F_GETFL));
 #endif
 #ifdef F_SETFL
+    /* Document-const: F_SETFL
+     *
+     * Set the file descriptor flags.  This will be one or more of the O_*
+     * flags.
+     */
     rb_define_const(mFcntl, "F_SETFL", INT2NUM(F_SETFL));
 #endif
 #ifdef F_SETLK
+    /* Document-const: F_SETLK
+     *
+     * Acquire a lock on a region of a file.  This uses one of the F_*LCK
+     * flags.
+     */
     rb_define_const(mFcntl, "F_SETLK", INT2NUM(F_SETLK));
 #endif
 #ifdef F_SETLKW
+    /* Document-const: F_SETLKW
+     *
+     * Acquire a lock on a region of a file, waiting if necessary.  This uses
+     * one of the F_*LCK flags
+     */
     rb_define_const(mFcntl, "F_SETLKW", INT2NUM(F_SETLKW));
 #endif
 #ifdef FD_CLOEXEC
+    /* Document-const: FD_CLOEXEC
+     *
+     * the value of the close-on-exec flag.
+     */
     rb_define_const(mFcntl, "FD_CLOEXEC", INT2NUM(FD_CLOEXEC));
 #endif
 #ifdef F_RDLCK
+    /* Document-const: F_RDLCK
+     *
+     * Read lock for a region of a file
+     */
     rb_define_const(mFcntl, "F_RDLCK", INT2NUM(F_RDLCK));
 #endif
 #ifdef F_UNLCK
+    /* Document-const: F_UNLCK
+     *
+     * Remove lock for a region of a file
+     */
     rb_define_const(mFcntl, "F_UNLCK", INT2NUM(F_UNLCK));
 #endif
 #ifdef F_WRLCK
+    /* Document-const: F_WRLCK
+     *
+     * Write lock for a region of a file
+     */
     rb_define_const(mFcntl, "F_WRLCK", INT2NUM(F_WRLCK));
 #endif
 #ifdef O_CREAT
+    /* Document-const: O_CREAT
+     *
+     * Create the file if it doesn't exist
+     */
     rb_define_const(mFcntl, "O_CREAT", INT2NUM(O_CREAT));
 #endif
 #ifdef O_EXCL
+    /* Document-const: O_EXCL
+     *
+     * Used with O_CREAT, fail if the file exists
+     */
     rb_define_const(mFcntl, "O_EXCL", INT2NUM(O_EXCL));
 #endif
 #ifdef O_NOCTTY
+    /* Document-const: O_NOCTTY
+     *
+     * Open TTY without it becoming the controlling TTY
+     */
     rb_define_const(mFcntl, "O_NOCTTY", INT2NUM(O_NOCTTY));
 #endif
 #ifdef O_TRUNC
+    /* Document-const: O_TRUNC
+     *
+     * Truncate the file on open
+     */
     rb_define_const(mFcntl, "O_TRUNC", INT2NUM(O_TRUNC));
 #endif
 #ifdef O_APPEND
+    /* Document-const: O_APPEND
+     *
+     * Open the file in append mode
+     */
     rb_define_const(mFcntl, "O_APPEND", INT2NUM(O_APPEND));
 #endif
 #ifdef O_NONBLOCK
+    /* Document-const: O_NONBLOCK
+     *
+     * Open the file in non-blocking mode
+     */
     rb_define_const(mFcntl, "O_NONBLOCK", INT2NUM(O_NONBLOCK));
 #endif
 #ifdef O_NDELAY
+    /* Document-const: O_NDELAY
+     *
+     * Open the file in non-blocking mode
+     */
     rb_define_const(mFcntl, "O_NDELAY", INT2NUM(O_NDELAY));
 #endif
 #ifdef O_RDONLY
+    /* Document-const: O_RDONLY
+     *
+     * Open the file in read-only mode
+     */
     rb_define_const(mFcntl, "O_RDONLY", INT2NUM(O_RDONLY));
 #endif
 #ifdef O_RDWR
+    /* Document-const: O_RDWR
+     *
+     * Open the file in read-write mode
+     */
     rb_define_const(mFcntl, "O_RDWR", INT2NUM(O_RDWR));
 #endif
 #ifdef O_WRONLY
+    /* Document-const: O_WRONLY
+     *
+     * Open the file in write-only mode.
+     */
     rb_define_const(mFcntl, "O_WRONLY", INT2NUM(O_WRONLY));
 #endif
 #ifdef O_ACCMODE
+    /* Document-const: O_ACCMODE
+     *
+     * Mask to extract the read/write flags
+     */
     rb_define_const(mFcntl, "O_ACCMODE", INT2FIX(O_ACCMODE));
 #else
+    /* Document-const: O_ACCMODE
+     *
+     * Mask to extract the read/write flags
+     */
     rb_define_const(mFcntl, "O_ACCMODE", INT2FIX(O_RDONLY | O_WRONLY | O_RDWR));
 #endif
 }
diff --git a/ext/fcntl/fcntl.gemspec b/ext/fcntl/fcntl.gemspec
new file mode 100644
index 0000000000..0e3194fbdc
--- /dev/null
+++ b/ext/fcntl/fcntl.gemspec
@@ -0,0 +1,25 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+Gem::Specification.new do |spec|
+  spec.name          = "fcntl"
+  spec.version       = "1.0.0"
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = "Loads constants defined in the OS fcntl.h C header file"
+  spec.description   = "Loads constants defined in the OS fcntl.h C header file"
+  spec.homepage      = "https://github.com/ruby/fcntl"
+  spec.license       = "BSD-2-Clause"
+
+  spec.files         = ["ext/fcntl/extconf.rb", "ext/fcntl/fcntl.c"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.extensions    = "ext/fcntl/extconf.rb"
+  spec.required_ruby_version = ">= 2.3.0"
+
+  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "rake", "~> 12"
+  spec.add_development_dependency "rake-compiler"
+end
diff --git a/ext/fiber/depend b/ext/fiber/depend
new file mode 100644
index 0000000000..675263b95c
--- /dev/null
+++ b/ext/fiber/depend
@@ -0,0 +1,3 @@
+# AUTOGENERATED DEPENDENCIES START
+fiber.o: fiber.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/fiber/extconf.rb b/ext/fiber/extconf.rb
index 904ab94a9c..7f11e0dafa 100644
--- a/ext/fiber/extconf.rb
+++ b/ext/fiber/extconf.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'mkmf'
 create_makefile('fiber')
 
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
index 542d978395..1a80b2b02a 100644
--- a/ext/fiddle/closure.c
+++ b/ext/fiddle/closure.c
@@ -1,4 +1,7 @@
 #include <fiddle.h>
+#include <ruby/thread.h>
+
+int ruby_thread_has_gvl_p(void); /* from internal.h */
 
 VALUE cFiddleClosure;
 
@@ -10,18 +13,24 @@ typedef struct {
     ffi_type **argv;
 } fiddle_closure;
 
-#if defined(MACOSX) || defined(__linux) || defined(__OpenBSD__)
-#define DONT_USE_FFI_CLOSURE_ALLOC
+#if defined(USE_FFI_CLOSURE_ALLOC)
+#elif defined(__OpenBSD__) || defined(__APPLE__) || defined(__linux__)
+# define USE_FFI_CLOSURE_ALLOC 0
+#elif defined(RUBY_LIBFFI_MODVERSION) && RUBY_LIBFFI_MODVERSION < 3000005 && \
+	(defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_AMD64))
+# define USE_FFI_CLOSURE_ALLOC 0
+#else
+# define USE_FFI_CLOSURE_ALLOC 1
 #endif
 
 static void
 dealloc(void * ptr)
 {
     fiddle_closure * cls = (fiddle_closure *)ptr;
-#ifndef DONT_USE_FFI_CLOSURE_ALLOC
+#if USE_FFI_CLOSURE_ALLOC
     ffi_closure_free(cls->pcl);
 #else
-    munmap(cls->pcl, sizeof(cls->pcl));
+    munmap(cls->pcl, sizeof(*cls->pcl));
 #endif
     if (cls->argv) xfree(cls->argv);
     xfree(cls);
@@ -33,14 +42,13 @@ closure_memsize(const void * ptr)
     fiddle_closure * cls = (fiddle_closure *)ptr;
     size_t size = 0;
 
-    if (ptr) {
-	size += sizeof(*cls);
+    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;
 }
 
@@ -49,10 +57,19 @@ const rb_data_type_t closure_data_type = {
     {0, dealloc, closure_memsize,},
 };
 
-void
-callback(ffi_cif *cif, void *resp, void **args, void *ctx)
+struct callback_args {
+    ffi_cif *cif;
+    void *resp;
+    void **args;
+    void *ctx;
+};
+
+static void *
+with_gvl_callback(void *ptr)
 {
-    VALUE self      = (VALUE)ctx;
+    struct callback_args *x = ptr;
+
+    VALUE self      = (VALUE)x->ctx;
     VALUE rbargs    = rb_iv_get(self, "@args");
     VALUE ctype     = rb_iv_get(self, "@ctype");
     int argc        = RARRAY_LENINT(rbargs);
@@ -64,34 +81,52 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
     cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
 
     for (i = 0; i < argc; i++) {
-        type = NUM2INT(RARRAY_PTR(rbargs)[i]);
+        type = NUM2INT(RARRAY_AREF(rbargs, i));
         switch (type) {
 	  case TYPE_VOID:
 	    argc = 0;
 	    break;
 	  case TYPE_INT:
-	    rb_ary_push(params, INT2NUM(*(int *)args[i]));
+	    rb_ary_push(params, INT2NUM(*(int *)x->args[i]));
+	    break;
+	  case -TYPE_INT:
+	    rb_ary_push(params, UINT2NUM(*(unsigned int *)x->args[i]));
 	    break;
 	  case TYPE_VOIDP:
 	    rb_ary_push(params,
 			rb_funcall(cPointer, rb_intern("[]"), 1,
-				   PTR2NUM(*(void **)args[i])));
+				   PTR2NUM(*(void **)x->args[i])));
 	    break;
 	  case TYPE_LONG:
-	    rb_ary_push(params, LONG2NUM(*(long *)args[i]));
+	    rb_ary_push(params, LONG2NUM(*(long *)x->args[i]));
+	    break;
+	  case -TYPE_LONG:
+	    rb_ary_push(params, ULONG2NUM(*(unsigned long *)x->args[i]));
 	    break;
 	  case TYPE_CHAR:
-	    rb_ary_push(params, INT2NUM(*(char *)args[i]));
+	    rb_ary_push(params, INT2NUM(*(signed char *)x->args[i]));
+	    break;
+	  case -TYPE_CHAR:
+	    rb_ary_push(params, UINT2NUM(*(unsigned char *)x->args[i]));
+	    break;
+	  case TYPE_SHORT:
+	    rb_ary_push(params, INT2NUM(*(signed short *)x->args[i]));
+	    break;
+	  case -TYPE_SHORT:
+	    rb_ary_push(params, UINT2NUM(*(unsigned short *)x->args[i]));
 	    break;
 	  case TYPE_DOUBLE:
-	    rb_ary_push(params, rb_float_new(*(double *)args[i]));
+	    rb_ary_push(params, rb_float_new(*(double *)x->args[i]));
 	    break;
 	  case TYPE_FLOAT:
-	    rb_ary_push(params, rb_float_new(*(float *)args[i]));
+	    rb_ary_push(params, rb_float_new(*(float *)x->args[i]));
 	    break;
 #if HAVE_LONG_LONG
 	  case TYPE_LONG_LONG:
-	    rb_ary_push(params, rb_ull2inum(*(unsigned LONG_LONG *)args[i]));
+	    rb_ary_push(params, LL2NUM(*(LONG_LONG *)x->args[i]));
+	    break;
+	  case -TYPE_LONG_LONG:
+	    rb_ary_push(params, ULL2NUM(*(unsigned LONG_LONG *)x->args[i]));
 	    break;
 #endif
 	  default:
@@ -99,7 +134,7 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
         }
     }
 
-    ret = rb_funcall2(self, rb_intern("call"), argc, RARRAY_PTR(params));
+    ret = rb_funcall2(self, rb_intern("call"), argc, RARRAY_CONST_PTR(params));
     RB_GC_GUARD(params);
 
     type = NUM2INT(ctype);
@@ -107,30 +142,59 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
       case TYPE_VOID:
 	break;
       case TYPE_LONG:
-	*(long *)resp = NUM2LONG(ret);
+	*(long *)x->resp = NUM2LONG(ret);
+	break;
+      case -TYPE_LONG:
+	*(unsigned long *)x->resp = NUM2ULONG(ret);
 	break;
       case TYPE_CHAR:
       case TYPE_SHORT:
       case TYPE_INT:
-	*(ffi_sarg *)resp = NUM2INT(ret);
+	*(ffi_sarg *)x->resp = NUM2INT(ret);
+	break;
+      case -TYPE_CHAR:
+      case -TYPE_SHORT:
+      case -TYPE_INT:
+	*(ffi_arg *)x->resp = NUM2UINT(ret);
 	break;
       case TYPE_VOIDP:
-	*(void **)resp = NUM2PTR(ret);
+	*(void **)x->resp = NUM2PTR(ret);
 	break;
       case TYPE_DOUBLE:
-	*(double *)resp = NUM2DBL(ret);
+	*(double *)x->resp = NUM2DBL(ret);
 	break;
       case TYPE_FLOAT:
-	*(float *)resp = (float)NUM2DBL(ret);
+	*(float *)x->resp = (float)NUM2DBL(ret);
 	break;
 #if HAVE_LONG_LONG
       case TYPE_LONG_LONG:
-	*(unsigned LONG_LONG *)resp = rb_big2ull(ret);
+	*(LONG_LONG *)x->resp = NUM2LL(ret);
+	break;
+      case -TYPE_LONG_LONG:
+	*(unsigned LONG_LONG *)x->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
@@ -141,7 +205,7 @@ allocate(VALUE klass)
     VALUE i = TypedData_Make_Struct(klass, fiddle_closure,
 	    &closure_data_type, closure);
 
-#ifndef DONT_USE_FFI_CLOSURE_ALLOC
+#if USE_FFI_CLOSURE_ALLOC
     closure->pcl = ffi_closure_alloc(sizeof(ffi_closure), &closure->code);
 #else
     closure->pcl = mmap(NULL, sizeof(ffi_closure), PROT_READ | PROT_WRITE,
@@ -175,7 +239,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_PTR(args)[i]);
+        int type = NUM2INT(RARRAY_AREF(args, i));
         cl->argv[i] = INT2FFI_TYPE(type);
     }
     cl->argv[argc] = NULL;
@@ -193,13 +257,16 @@ initialize(int rbargc, VALUE argv[], VALUE self)
     if (FFI_OK != result)
 	rb_raise(rb_eRuntimeError, "error prepping CIF %d", result);
 
-#ifndef DONT_USE_FFI_CLOSURE_ALLOC
+#if USE_FFI_CLOSURE_ALLOC
     result = ffi_prep_closure_loc(pcl, cif, callback,
 		(void *)self, cl->code);
 #else
     result = ffi_prep_closure(pcl, cif, callback, (void *)self);
     cl->code = (void *)pcl;
-    mprotect(pcl, sizeof(pcl), PROT_READ | PROT_EXEC);
+    i = mprotect(pcl, sizeof(*pcl), PROT_READ | PROT_EXEC);
+    if (i) {
+	rb_sys_fail("mprotect");
+    }
 #endif
 
     if (FFI_OK != result)
@@ -222,7 +289,7 @@ to_i(VALUE self)
 }
 
 void
-Init_fiddle_closure()
+Init_fiddle_closure(void)
 {
 #if 0
     mFiddle = rb_define_module("Fiddle"); /* let rdoc know about mFiddle */
@@ -242,11 +309,11 @@ Init_fiddle_closure()
      *       10
      *     end
      *   }.new(Fiddle::TYPE_INT, [])
-     *   => #<#<Class:0x0000000150d308>:0x0000000150d240>
+     *	    #=> #<#<Class:0x0000000150d308>:0x0000000150d240>
      *   func = Fiddle::Function.new(closure, [], Fiddle::TYPE_INT)
-     *   => #<Fiddle::Function:0x00000001516e58>
+     *	    #=> #<Fiddle::Function:0x00000001516e58>
      *   func.call
-     *   => 10
+     *	    #=> 10
      */
     cFiddleClosure = rb_define_class_under(mFiddle, "Closure", rb_cObject);
 
@@ -255,12 +322,12 @@ Init_fiddle_closure()
     /*
      * Document-method: new
      *
-     * call-seq: new(ret, *args, abi = Fiddle::DEFAULT)
+     * call-seq: new(ret, args, abi = Fiddle::DEFAULT)
      *
      * Construct a new Closure object.
      *
      * * +ret+ is the C type to be returned
-     * * +args+ are passed the callback
+     * * +args+ is an Array of arguments, passed to the callback function
      * * +abi+ is the abi of the closure
      *
      * If there is an error in preparing the ffi_cif or ffi_prep_closure,
diff --git a/ext/fiddle/closure.h b/ext/fiddle/closure.h
index 1e870e2285..d0a8be6180 100644
--- a/ext/fiddle/closure.h
+++ b/ext/fiddle/closure.h
@@ -3,6 +3,6 @@
 
 #include <fiddle.h>
 
-void Init_fiddle_closure();
+void Init_fiddle_closure(void);
 
 #endif
diff --git a/ext/fiddle/conversions.c b/ext/fiddle/conversions.c
index 8ffd7c5e08..d40ddc1f38 100644
--- a/ext/fiddle/conversions.c
+++ b/ext/fiddle/conversions.c
@@ -27,7 +27,7 @@ int_to_ffi_type(int type)
 	return rb_ffi_type_of(long);
 #if HAVE_LONG_LONG
       case TYPE_LONG_LONG:
-	return rb_ffi_type_of(int64);
+	return rb_ffi_type_of(long_long);
 #endif
       case TYPE_FLOAT:
 	return &ffi_type_float;
@@ -42,13 +42,6 @@ int_to_ffi_type(int type)
 void
 value_to_generic(int type, VALUE src, fiddle_generic * dst)
 {
-    int signed_p = 1;
-
-    if (type < 0) {
-	type = -1 * type;
-	signed_p = 0;
-    }
-
     switch (type) {
       case TYPE_VOID:
 	break;
@@ -56,23 +49,35 @@ value_to_generic(int type, VALUE src, fiddle_generic * dst)
 	dst->pointer = NUM2PTR(rb_Integer(src));
 	break;
       case TYPE_CHAR:
-	dst->schar = NUM2INT(src);
+	dst->schar = (signed char)NUM2INT(src);
+	break;
+      case -TYPE_CHAR:
+	dst->uchar = (unsigned char)NUM2UINT(src);
 	break;
       case TYPE_SHORT:
-	dst->sshort = NUM2INT(src);
+	dst->sshort = (unsigned short)NUM2INT(src);
+	break;
+      case -TYPE_SHORT:
+	dst->sshort = (signed short)NUM2UINT(src);
 	break;
       case TYPE_INT:
 	dst->sint = NUM2INT(src);
 	break;
+      case -TYPE_INT:
+	dst->uint = NUM2UINT(src);
+	break;
       case TYPE_LONG:
-	if (signed_p)
-	    dst->slong = NUM2LONG(src);
-	else
-	    dst->ulong = NUM2LONG(src);
+	dst->slong = NUM2LONG(src);
+	break;
+      case -TYPE_LONG:
+	dst->ulong = NUM2ULONG(src);
 	break;
 #if HAVE_LONG_LONG
       case TYPE_LONG_LONG:
-	dst->long_long = rb_big2ull(src);
+	dst->slong_long = NUM2LL(src);
+	break;
+      case -TYPE_LONG_LONG:
+	dst->ulong_long = NUM2ULL(src);
 	break;
 #endif
       case TYPE_FLOAT:
@@ -89,17 +94,11 @@ value_to_generic(int type, VALUE src, fiddle_generic * dst)
 VALUE
 generic_to_value(VALUE rettype, fiddle_generic retval)
 {
-    int signed_p = 1;
     int type = NUM2INT(rettype);
     VALUE cPointer;
 
     cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
 
-    if (type < 0) {
-	type = -1 * type;
-	signed_p = 0;
-    }
-
     switch (type) {
       case TYPE_VOID:
 	return Qnil;
@@ -107,21 +106,26 @@ generic_to_value(VALUE rettype, fiddle_generic retval)
         return rb_funcall(cPointer, rb_intern("[]"), 1,
           PTR2NUM((void *)retval.pointer));
       case TYPE_CHAR:
-	if (signed_p) return INT2NUM((char)retval.fffi_sarg);
+	return INT2NUM((signed char)retval.fffi_sarg);
+      case -TYPE_CHAR:
 	return INT2NUM((unsigned char)retval.fffi_arg);
       case TYPE_SHORT:
-	if (signed_p) return INT2NUM((short)retval.fffi_sarg);
+	return INT2NUM((signed short)retval.fffi_sarg);
+      case -TYPE_SHORT:
 	return INT2NUM((unsigned short)retval.fffi_arg);
       case TYPE_INT:
-	if (signed_p) return INT2NUM((int)retval.fffi_sarg);
+	return INT2NUM((signed int)retval.fffi_sarg);
+      case -TYPE_INT:
 	return UINT2NUM((unsigned int)retval.fffi_arg);
       case TYPE_LONG:
-	if (signed_p) return LONG2NUM(retval.slong);
+	return LONG2NUM(retval.slong);
+      case -TYPE_LONG:
 	return ULONG2NUM(retval.ulong);
 #if HAVE_LONG_LONG
       case TYPE_LONG_LONG:
-	return rb_ll2inum(retval.long_long);
-	break;
+	return LL2NUM(retval.slong_long);
+      case -TYPE_LONG_LONG:
+	return ULL2NUM(retval.ulong_long);
 #endif
       case TYPE_FLOAT:
 	return rb_float_new(retval.ffloat);
@@ -130,6 +134,8 @@ generic_to_value(VALUE rettype, fiddle_generic retval)
       default:
 	rb_raise(rb_eRuntimeError, "unknown type %d", type);
     }
+
+    UNREACHABLE;
 }
 
 /* vim: set noet sw=4 sts=4 */
diff --git a/ext/fiddle/conversions.h b/ext/fiddle/conversions.h
index 5a605b3945..cbc610bad2 100644
--- a/ext/fiddle/conversions.h
+++ b/ext/fiddle/conversions.h
@@ -18,7 +18,8 @@ typedef union
     float ffloat;          /* ffi_type_float */
     double ddouble;        /* ffi_type_double */
 #if HAVE_LONG_LONG
-    unsigned LONG_LONG long_long; /* ffi_type_uint64 */
+    unsigned LONG_LONG ulong_long; /* ffi_type_ulong_long */
+    signed LONG_LONG slong_long; /* ffi_type_ulong_long */
 #endif
     void * pointer;        /* ffi_type_pointer */
 } fiddle_generic;
@@ -32,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)   (ULONG2NUM((unsigned long)(x)))
+# define PTR2NUM(x)   (LONG2NUM((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 PTR2NUM(x)   (LL2NUM((LONG_LONG)(x)))
 # define NUM2PTR(x)   ((void*)(NUM2ULL(x)))
 #endif
 
diff --git a/ext/fiddle/depend b/ext/fiddle/depend
new file mode 100644
index 0000000000..5ed745fa0f
--- /dev/null
+++ b/ext/fiddle/depend
@@ -0,0 +1,157 @@
+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):
+	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG)
+
+clean-none:
+clean-libffi:
+	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG) clean
+
+distclean-none:
+distclean-libffi:
+	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG) distclean
+	$(Q) $(RM) $(LIBFFI_DIR)/local.exp
+	$(Q) $(RUBY) -rfileutils -e "FileUtils.rmdir(Dir.glob(ARGV[0]+'/**/{,.*/}'), :parents=>true)" $(LIBFFI_DIR)
+
+realclean-none:
+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.h
+closure.o: $(hdrdir)/ruby/assert.h
+closure.o: $(hdrdir)/ruby/backward.h
+closure.o: $(hdrdir)/ruby/defines.h
+closure.o: $(hdrdir)/ruby/intern.h
+closure.o: $(hdrdir)/ruby/missing.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: 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.h
+conversions.o: $(hdrdir)/ruby/assert.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: 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.h
+fiddle.o: $(hdrdir)/ruby/assert.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: 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.h
+function.o: $(hdrdir)/ruby/assert.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: 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.h
+handle.o: $(hdrdir)/ruby/assert.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: 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.h
+pointer.o: $(hdrdir)/ruby/assert.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/onigmo.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: closure.h
+pointer.o: conversions.h
+pointer.o: fiddle.h
+pointer.o: function.h
+pointer.o: pointer.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index 03b0ac2765..fce0cb4079 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -1,24 +1,193 @@
+# frozen_string_literal: true
 require 'mkmf'
 
 # :stopdoc:
 
-dir_config 'libffi'
+bundle = enable_config('bundled-libffi')
+if ! bundle
+  dir_config 'libffi'
 
-pkg_config("libffi")
-unless have_header('ffi.h')
-  if have_header('ffi/ffi.h')
+  pkg_config("libffi") and
+    ver = pkg_config("libffi", "modversion")
+
+  if have_header(ffi_header = 'ffi.h')
+    true
+  elsif have_header(ffi_header = 'ffi/ffi.h')
     $defs.push(format('-DUSE_HEADER_HACKS'))
+    true
+  end and (have_library('ffi') || have_library('libffi'))
+end or
+begin
+  # for https://github.com/ruby/fiddle
+  if bundle && File.exist?("../../bin/extlibs.rb")
+    require "fileutils"
+    require_relative "../../bin/extlibs"
+    extlibs = ExtLibs.new
+    cache_dir = File.expand_path("../../tmp/.download_cache", $srcdir)
+    ext_dir = File.expand_path("../../ext", $srcdir)
+    Dir.glob("#{$srcdir}/libffi-*/").each{|dir| FileUtils.rm_rf(dir)}
+    extlibs.run(["--cache=#{cache_dir}", ext_dir])
+  end
+  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
-    abort "ffi.h is missing. Please install libffi."
+    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)".dup, 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}".dup)
+  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)".dup, 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
+  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
 
-unless have_library('ffi') || have_library('libffi')
-  abort "libffi is missing. Please install libffi."
+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 }})
 end
 
 have_header 'sys/mman.h'
 
-create_makefile 'fiddle'
+if have_header "dlfcn.h"
+  have_library "dl"
+
+  %w{ dlopen dlclose dlsym }.each do |func|
+    abort "missing function #{func}" unless have_func(func)
+  end
+
+  have_func "dlerror"
+elsif have_header "windows.h"
+  %w{ LoadLibrary FreeLibrary GetProcAddress }.each do |func|
+    abort "missing function #{func}" unless have_func(func)
+  end
+end
+
+have_const('FFI_STDCALL', ffi_header)
+
+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("-DTYPE_%s=TYPE_%s", signed||type, size)
+    end
+    if signed
+      check_signedness(type.downcase, "stddef.h")
+    end
+  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_arg = "-C $(LIBFFI_DIR)\n"
+  else
+    submake_pre = "cd $(LIBFFI_DIR) && #{config_string("exec")}".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_PRE = #{submake_pre}
+   SUBMAKE_ARG = #{submake_arg}
+   LIBFFI_CLEAN = libffi
+  MK
+end
+
+if libffi
+  $LIBPATH.pop
+end
 
 # :startdoc:
diff --git a/ext/fiddle/extlibs b/ext/fiddle/extlibs
new file mode 100644
index 0000000000..290b814590
--- /dev/null
+++ b/ext/fiddle/extlibs
@@ -0,0 +1,5 @@
+http://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz \
+  md5:83b89587607e3eb65c70d361f13bab43 \
+  sha512:980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 \
+  #
+	win32/libffi-3.2.1-mswin.patch -p0
diff --git a/ext/fiddle/fiddle.c b/ext/fiddle/fiddle.c
index 08fdb4484d..9f3d1537d6 100644
--- a/ext/fiddle/fiddle.c
+++ b/ext/fiddle/fiddle.c
@@ -1,19 +1,175 @@
 #include <fiddle.h>
 
 VALUE mFiddle;
+VALUE rb_eFiddleError;
 
-void Init_fiddle()
+#ifndef TYPE_SSIZE_T
+# if SIZEOF_SIZE_T == SIZEOF_INT
+#   define TYPE_SSIZE_T TYPE_INT
+# elif SIZEOF_SIZE_T == SIZEOF_LONG
+#   define TYPE_SSIZE_T TYPE_LONG
+# elif defined HAVE_LONG_LONG && SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+#   define TYPE_SSIZE_T TYPE_LONG_LONG
+# endif
+#endif
+#define TYPE_SIZE_T (-1*SIGNEDNESS_OF_SIZE_T*TYPE_SSIZE_T)
+
+#ifndef TYPE_PTRDIFF_T
+# if SIZEOF_PTRDIFF_T == SIZEOF_INT
+#   define TYPE_PTRDIFF_T TYPE_INT
+# elif SIZEOF_PTRDIFF_T == SIZEOF_LONG
+#   define TYPE_PTRDIFF_T TYPE_LONG
+# elif defined HAVE_LONG_LONG && SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG
+#   define TYPE_PTRDIFF_T TYPE_LONG_LONG
+# endif
+#endif
+
+#ifndef TYPE_INTPTR_T
+# if SIZEOF_INTPTR_T == SIZEOF_INT
+#   define TYPE_INTPTR_T TYPE_INT
+# elif SIZEOF_INTPTR_T == SIZEOF_LONG
+#   define TYPE_INTPTR_T TYPE_LONG
+# elif defined HAVE_LONG_LONG && SIZEOF_INTPTR_T == SIZEOF_LONG_LONG
+#   define TYPE_INTPTR_T TYPE_LONG_LONG
+# endif
+#endif
+#define TYPE_UINTPTR_T (-TYPE_INTPTR_T)
+
+void Init_fiddle_pointer(void);
+
+/*
+ * call-seq: Fiddle.malloc(size)
+ *
+ * Allocate +size+ bytes of memory and return the integer memory address
+ * for the allocated memory.
+ */
+static VALUE
+rb_fiddle_malloc(VALUE self, VALUE size)
+{
+    void *ptr;
+
+    ptr = (void*)ruby_xmalloc(NUM2SIZET(size));
+    return PTR2NUM(ptr);
+}
+
+/*
+ * call-seq: Fiddle.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.
+ */
+static VALUE
+rb_fiddle_realloc(VALUE self, VALUE addr, VALUE size)
+{
+    void *ptr = NUM2PTR(addr);
+
+    ptr = (void*)ruby_xrealloc(ptr, NUM2SIZET(size));
+    return PTR2NUM(ptr);
+}
+
+/*
+ * call-seq: Fiddle.free(addr)
+ *
+ * Free the memory at address +addr+
+ */
+VALUE
+rb_fiddle_free(VALUE self, VALUE addr)
+{
+    void *ptr = NUM2PTR(addr);
+
+    ruby_xfree(ptr);
+    return Qnil;
+}
+
+/*
+ * call-seq: Fiddle.dlunwrap(addr)
+ *
+ * Returns the hexadecimal representation of a memory pointer address +addr+
+ *
+ * Example:
+ *
+ *   lib = Fiddle.dlopen('/lib64/libc-2.15.so')
+ *   => #<Fiddle::Handle:0x00000001342460>
+ *
+ *   lib['strcpy'].to_s(16)
+ *   => "7f59de6dd240"
+ *
+ *   Fiddle.dlunwrap(Fiddle.dlwrap(lib['strcpy'].to_s(16)))
+ *   => "7f59de6dd240"
+ */
+VALUE
+rb_fiddle_ptr2value(VALUE self, VALUE addr)
+{
+    return (VALUE)NUM2PTR(addr);
+}
+
+/*
+ * call-seq: Fiddle.dlwrap(val)
+ *
+ * Returns a memory pointer of a function's hexadecimal address location +val+
+ *
+ * Example:
+ *
+ *   lib = Fiddle.dlopen('/lib64/libc-2.15.so')
+ *   => #<Fiddle::Handle:0x00000001342460>
+ *
+ *   Fiddle.dlwrap(lib['strcpy'].to_s(16))
+ *   => 25522520
+ */
+static VALUE
+rb_fiddle_value2ptr(VALUE self, VALUE val)
+{
+    return PTR2NUM((void*)val);
+}
+
+void Init_fiddle_handle(void);
+
+void
+Init_fiddle(void)
 {
     /*
      * Document-module: Fiddle
      *
+     * A libffi wrapper for Ruby.
+     *
      * == Description
      *
-     * A libffi wrapper.
+     * Fiddle is an extension to translate a foreign function interface (FFI)
+     * with ruby.
+     *
+     * It wraps {libffi}[http://sourceware.org/libffi/], a popular C library
+     * which provides a portable interface that allows code written in one
+     * language to call code written in another language.
+     *
+     * == Example
+     *
+     * Here we will use Fiddle::Function to wrap {floor(3) from
+     * libm}[http://linux.die.net/man/3/floor]
+     *
+     *	    require 'fiddle'
+     *
+     *	    libm = Fiddle.dlopen('/lib/libm.so.6')
+     *
+     *	    floor = Fiddle::Function.new(
+     *	      libm['floor'],
+     *	      [Fiddle::TYPE_DOUBLE],
+     *	      Fiddle::TYPE_DOUBLE
+     *	    )
+     *
+     *	    puts floor.call(3.14159) #=> 3.0
+     *
      *
      */
     mFiddle = rb_define_module("Fiddle");
 
+    /*
+     * Document-class: Fiddle::DLError
+     *
+     * standard dynamic load exception
+     */
+    rb_eFiddleError = rb_define_class_under(mFiddle, "DLError", rb_eStandardError);
+
     /* Document-const: TYPE_VOID
      *
      * C type - void
@@ -70,6 +226,116 @@ void Init_fiddle()
      */
     rb_define_const(mFiddle, "TYPE_DOUBLE",    INT2NUM(TYPE_DOUBLE));
 
+    /* Document-const: TYPE_SIZE_T
+     *
+     * C type - size_t
+     */
+    rb_define_const(mFiddle, "TYPE_SIZE_T",   INT2NUM(TYPE_SIZE_T));
+
+    /* Document-const: TYPE_SSIZE_T
+     *
+     * C type - ssize_t
+     */
+    rb_define_const(mFiddle, "TYPE_SSIZE_T",   INT2NUM(TYPE_SSIZE_T));
+
+    /* Document-const: TYPE_PTRDIFF_T
+     *
+     * C type - ptrdiff_t
+     */
+    rb_define_const(mFiddle, "TYPE_PTRDIFF_T", INT2NUM(TYPE_PTRDIFF_T));
+
+    /* Document-const: TYPE_INTPTR_T
+     *
+     * C type - intptr_t
+     */
+    rb_define_const(mFiddle, "TYPE_INTPTR_T",  INT2NUM(TYPE_INTPTR_T));
+
+    /* Document-const: TYPE_UINTPTR_T
+     *
+     * C type - uintptr_t
+     */
+    rb_define_const(mFiddle, "TYPE_UINTPTR_T",  INT2NUM(TYPE_UINTPTR_T));
+
+    /* Document-const: ALIGN_VOIDP
+     *
+     * The alignment size of a void*
+     */
+    rb_define_const(mFiddle, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
+
+    /* Document-const: ALIGN_CHAR
+     *
+     * The alignment size of a char
+     */
+    rb_define_const(mFiddle, "ALIGN_CHAR",  INT2NUM(ALIGN_CHAR));
+
+    /* Document-const: ALIGN_SHORT
+     *
+     * The alignment size of a short
+     */
+    rb_define_const(mFiddle, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
+
+    /* Document-const: ALIGN_INT
+     *
+     * The alignment size of an int
+     */
+    rb_define_const(mFiddle, "ALIGN_INT",   INT2NUM(ALIGN_INT));
+
+    /* Document-const: ALIGN_LONG
+     *
+     * The alignment size of a long
+     */
+    rb_define_const(mFiddle, "ALIGN_LONG",  INT2NUM(ALIGN_LONG));
+
+#if HAVE_LONG_LONG
+    /* Document-const: ALIGN_LONG_LONG
+     *
+     * The alignment size of a long long
+     */
+    rb_define_const(mFiddle, "ALIGN_LONG_LONG",  INT2NUM(ALIGN_LONG_LONG));
+#endif
+
+    /* Document-const: ALIGN_FLOAT
+     *
+     * The alignment size of a float
+     */
+    rb_define_const(mFiddle, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
+
+    /* Document-const: ALIGN_DOUBLE
+     *
+     * The alignment size of a double
+     */
+    rb_define_const(mFiddle, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
+
+    /* Document-const: ALIGN_SIZE_T
+     *
+     * The alignment size of a size_t
+     */
+    rb_define_const(mFiddle, "ALIGN_SIZE_T", INT2NUM(ALIGN_OF(size_t)));
+
+    /* Document-const: ALIGN_SSIZE_T
+     *
+     * The alignment size of a ssize_t
+     */
+    rb_define_const(mFiddle, "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(mFiddle, "ALIGN_PTRDIFF_T", INT2NUM(ALIGN_OF(ptrdiff_t)));
+
+    /* Document-const: ALIGN_INTPTR_T
+     *
+     * The alignment size of a intptr_t
+     */
+    rb_define_const(mFiddle, "ALIGN_INTPTR_T", INT2NUM(ALIGN_OF(intptr_t)));
+
+    /* Document-const: ALIGN_UINTPTR_T
+     *
+     * The alignment size of a uintptr_t
+     */
+    rb_define_const(mFiddle, "ALIGN_UINTPTR_T", INT2NUM(ALIGN_OF(uintptr_t)));
+
     /* Document-const: WINDOWS
      *
      * Returns a boolean regarding whether the host is WIN32
@@ -80,7 +346,109 @@ void Init_fiddle()
     rb_define_const(mFiddle, "WINDOWS", Qfalse);
 #endif
 
+    /* Document-const: SIZEOF_VOIDP
+     *
+     * size of a void*
+     */
+    rb_define_const(mFiddle, "SIZEOF_VOIDP", INT2NUM(sizeof(void*)));
+
+    /* Document-const: SIZEOF_CHAR
+     *
+     * size of a char
+     */
+    rb_define_const(mFiddle, "SIZEOF_CHAR",  INT2NUM(sizeof(char)));
+
+    /* Document-const: SIZEOF_SHORT
+     *
+     * size of a short
+     */
+    rb_define_const(mFiddle, "SIZEOF_SHORT", INT2NUM(sizeof(short)));
+
+    /* Document-const: SIZEOF_INT
+     *
+     * size of an int
+     */
+    rb_define_const(mFiddle, "SIZEOF_INT",   INT2NUM(sizeof(int)));
+
+    /* Document-const: SIZEOF_LONG
+     *
+     * size of a long
+     */
+    rb_define_const(mFiddle, "SIZEOF_LONG",  INT2NUM(sizeof(long)));
+
+#if HAVE_LONG_LONG
+    /* Document-const: SIZEOF_LONG_LONG
+     *
+     * size of a long long
+     */
+    rb_define_const(mFiddle, "SIZEOF_LONG_LONG",  INT2NUM(sizeof(LONG_LONG)));
+#endif
+
+    /* Document-const: SIZEOF_FLOAT
+     *
+     * size of a float
+     */
+    rb_define_const(mFiddle, "SIZEOF_FLOAT", INT2NUM(sizeof(float)));
+
+    /* Document-const: SIZEOF_DOUBLE
+     *
+     * size of a double
+     */
+    rb_define_const(mFiddle, "SIZEOF_DOUBLE",INT2NUM(sizeof(double)));
+
+    /* Document-const: SIZEOF_SIZE_T
+     *
+     * size of a size_t
+     */
+    rb_define_const(mFiddle, "SIZEOF_SIZE_T",  INT2NUM(sizeof(size_t)));
+
+    /* Document-const: SIZEOF_SSIZE_T
+     *
+     * size of a ssize_t
+     */
+    rb_define_const(mFiddle, "SIZEOF_SSIZE_T",  INT2NUM(sizeof(size_t))); /* same as size_t */
+
+    /* Document-const: SIZEOF_PTRDIFF_T
+     *
+     * size of a ptrdiff_t
+     */
+    rb_define_const(mFiddle, "SIZEOF_PTRDIFF_T",  INT2NUM(sizeof(ptrdiff_t)));
+
+    /* Document-const: SIZEOF_INTPTR_T
+     *
+     * size of a intptr_t
+     */
+    rb_define_const(mFiddle, "SIZEOF_INTPTR_T",  INT2NUM(sizeof(intptr_t)));
+
+    /* Document-const: SIZEOF_UINTPTR_T
+     *
+     * size of a uintptr_t
+     */
+    rb_define_const(mFiddle, "SIZEOF_UINTPTR_T",  INT2NUM(sizeof(uintptr_t)));
+
+    /* Document-const: RUBY_FREE
+     *
+     * Address of the ruby_xfree() function
+     */
+    rb_define_const(mFiddle, "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(mFiddle, "BUILD_RUBY_PLATFORM", rb_str_new2(RUBY_PLATFORM));
+
+    rb_define_module_function(mFiddle, "dlwrap", rb_fiddle_value2ptr, 1);
+    rb_define_module_function(mFiddle, "dlunwrap", rb_fiddle_ptr2value, 1);
+    rb_define_module_function(mFiddle, "malloc", rb_fiddle_malloc, 1);
+    rb_define_module_function(mFiddle, "realloc", rb_fiddle_realloc, 2);
+    rb_define_module_function(mFiddle, "free", rb_fiddle_free, 1);
+
     Init_fiddle_function();
     Init_fiddle_closure();
+    Init_fiddle_handle();
+    Init_fiddle_pointer();
 }
 /* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec
new file mode 100644
index 0000000000..b29f4ec788
--- /dev/null
+++ b/ext/fiddle/fiddle.gemspec
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+Gem::Specification.new do |spec|
+  spec.name          = "fiddle"
+  spec.version       = '1.0.0'
+  spec.authors       = ["Aaron Patterson", "SHIBATA Hiroshi"]
+  spec.email         = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
+
+  spec.summary       = %q{A libffi wrapper for Ruby.}
+  spec.description   = %q{A libffi wrapper for Ruby.}
+  spec.homepage      = "https://github.com/ruby/fiddle"
+  spec.license       = "BSD-2-Clause"
+
+  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "ext/fiddle/closure.c", "ext/fiddle/closure.h", "ext/fiddle/conversions.c", "ext/fiddle/conversions.h", "ext/fiddle/extconf.rb", "ext/fiddle/extlibs", "ext/fiddle/fiddle.c", "ext/fiddle/fiddle.h", "ext/fiddle/function.c", "ext/fiddle/function.h", "ext/fiddle/handle.c", "ext/fiddle/pointer.c", "ext/fiddle/win32/fficonfig.h", "ext/fiddle/win32/libffi-3.2.1-mswin.patch", "ext/fiddle/win32/libffi-config.rb", "ext/fiddle/win32/libffi.mk.tmpl", "fiddle.gemspec", "lib/fiddle.rb", "lib/fiddle/closure.rb", "lib/fiddle/cparser.rb", "lib/fiddle/function.rb", "lib/fiddle/import.rb", "lib/fiddle/pack.rb", "lib/fiddle/struct.rb", "lib/fiddle/types.rb", "lib/fiddle/value.rb"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.required_ruby_version = ">= 2.3.0"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake-compiler"
+end
diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h
index 7165969225..d2583c1cbf 100644
--- a/ext/fiddle/fiddle.h
+++ b/ext/fiddle/fiddle.h
@@ -12,6 +12,30 @@
 #include <sys/mman.h>
 #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*)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
+
 #ifdef USE_HEADER_HACKS
 #include <ffi/ffi.h>
 #else
@@ -67,15 +91,19 @@
 #  error "long size not supported"
 # endif
 
+#if HAVE_LONG_LONG
+# if SIZEOF_LONG_LONG == 8
+#   define ffi_type_slong_long ffi_type_sint64
+#   define ffi_type_ulong_long ffi_type_uint64
+# else
+#  error "long long size not supported"
+# endif
+#endif
+
 #include <closure.h>
 #include <conversions.h>
 #include <function.h>
 
-/* FIXME
- * These constants need to match up with DL. We need to refactor this to use
- * the DL header files or vice versa.
- */
-
 #define TYPE_VOID  0
 #define TYPE_VOIDP 1
 #define TYPE_CHAR  2
@@ -88,7 +116,23 @@
 #define TYPE_FLOAT 7
 #define TYPE_DOUBLE 8
 
+#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)
+
 extern VALUE mFiddle;
+extern VALUE rb_eFiddleError;
+
+VALUE rb_fiddle_new_function(VALUE address, VALUE arg_types, VALUE ret_type);
 
 #endif
 /* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c
index 6e8909991a..994402e26b 100644
--- a/ext/fiddle/function.c
+++ b/ext/fiddle/function.c
@@ -1,7 +1,33 @@
 #include <fiddle.h>
+#include <ruby/thread.h>
+
+#ifdef PRIsVALUE
+# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
+# define RB_OBJ_STRING(obj) (obj)
+#else
+# define PRIsVALUE "s"
+# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
+# define RB_OBJ_STRING(obj) StringValueCStr(obj)
+#endif
 
 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)", \
+		 (len)); \
+    }
+
 static void
 deallocate(void *p)
 {
@@ -16,12 +42,11 @@ function_memsize(const void *p)
     /* const */ffi_cif *ptr = (ffi_cif *)p;
     size_t size = 0;
 
-    if (ptr) {
-	size += sizeof(*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;
 }
 
@@ -38,41 +63,83 @@ allocate(VALUE klass)
     return TypedData_Make_Struct(klass, ffi_cif, &function_data_type, cif);
 }
 
+VALUE
+rb_fiddle_new_function(VALUE address, VALUE arg_types, VALUE ret_type)
+{
+    VALUE argv[3];
+
+    argv[0] = address;
+    argv[1] = arg_types;
+    argv[2] = ret_type;
+
+    return rb_class_new_instance(3, argv, cFiddleFunction);
+}
+
+static int
+parse_keyword_arg_i(VALUE key, VALUE value, VALUE self)
+{
+    if (key == ID2SYM(rb_intern("name"))) {
+	rb_iv_set(self, "@name", value);
+    } else {
+	rb_raise(rb_eArgError, "unknown keyword: %"PRIsVALUE,
+		 RB_OBJ_STRING(key));
+    }
+    return ST_CONTINUE;
+}
+
 static VALUE
 initialize(int argc, VALUE argv[], VALUE self)
 {
     ffi_cif * cif;
-    ffi_type **arg_types;
+    ffi_type **arg_types, *rtype;
     ffi_status result;
-    VALUE ptr, args, ret_type, abi;
-    int i;
-
-    rb_scan_args(argc, argv, "31", &ptr, &args, &ret_type, &abi);
-    if(NIL_P(abi)) abi = INT2NUM(FFI_DEFAULT_ABI);
+    VALUE ptr, args, ret_type, abi, kwds, ary;
+    int i, len;
+    int nabi;
+    void *cfunc;
+
+    rb_scan_args(argc, argv, "31:", &ptr, &args, &ret_type, &abi, &kwds);
+    rb_iv_set(self, "@closure", ptr);
+
+    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);
 
     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_AREF(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);
 
     rb_iv_set(self, "@ptr", ptr);
     rb_iv_set(self, "@args", args);
     rb_iv_set(self, "@return_type", ret_type);
     rb_iv_set(self, "@abi", abi);
 
+    if (!NIL_P(kwds)) rb_hash_foreach(kwds, parse_keyword_arg_i, self);
+
     TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif);
 
-    arg_types = xcalloc(RARRAY_LEN(args) + 1, sizeof(ffi_type *));
+    arg_types = xcalloc(len + 1, sizeof(ffi_type *));
 
     for (i = 0; i < RARRAY_LEN(args); i++) {
-	int type = NUM2INT(RARRAY_PTR(args)[i]);
+	int type = NUM2INT(RARRAY_AREF(args, i));
 	arg_types[i] = INT2FFI_TYPE(type);
     }
-    arg_types[RARRAY_LEN(args)] = NULL;
+    arg_types[len] = NULL;
 
-    result = ffi_prep_cif (
-	    cif,
-	    NUM2INT(abi),
-	    RARRAY_LENINT(args),
-	    INT2FFI_TYPE(NUM2INT(ret_type)),
-	    arg_types);
+    result = ffi_prep_cif(cif, nabi, len, rtype, arg_types);
 
     if (result)
 	rb_raise(rb_eRuntimeError, "error creating CIF %d", result);
@@ -80,59 +147,78 @@ 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)
 {
-    ffi_cif * cif;
-    fiddle_generic retval;
+    struct nogvl_ffi_call_args args = { 0 };
     fiddle_generic *generic_args;
-    void **values;
     VALUE cfunc, types, cPointer;
     int i;
+    VALUE alloc_buffer = 0;
 
     cfunc    = rb_iv_get(self, "@ptr");
     types    = rb_iv_get(self, "@args");
     cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
 
-    if(argc != RARRAY_LENINT(types)) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
-		argc, RARRAY_LENINT(types));
+    Check_Max_Args("number of arguments", argc);
+    if (argc != (i = RARRAY_LENINT(types))) {
+	rb_error_arity(argc, i, i);
     }
 
-    TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif);
+    TypedData_Get_Struct(self, ffi_cif, &function_data_type, args.cif);
 
-    values = xcalloc((size_t)argc + 1, (size_t)sizeof(void *));
-    generic_args = xcalloc((size_t)argc, (size_t)sizeof(fiddle_generic));
+    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));
 
     for (i = 0; i < argc; i++) {
-	VALUE type = RARRAY_PTR(types)[i];
+	VALUE type = RARRAY_AREF(types, i);
 	VALUE src = argv[i];
+	int argtype = FIX2INT(type);
 
-	if(NUM2INT(type) == TYPE_VOIDP) {
+	if (argtype == TYPE_VOIDP) {
 	    if(NIL_P(src)) {
-		src = INT2NUM(0);
+		src = INT2FIX(0);
 	    } else if(cPointer != CLASS_OF(src)) {
-	        src = rb_funcall(cPointer, rb_intern("[]"), 1, src);
+		src = rb_funcall(cPointer, rb_intern("[]"), 1, src);
 	    }
 	    src = rb_Integer(src);
 	}
 
-	VALUE2GENERIC(NUM2INT(type), src, &generic_args[i]);
-	values[i] = (void *)&generic_args[i];
+	VALUE2GENERIC(argtype, src, &generic_args[i]);
+	args.values[i] = (void *)&generic_args[i];
     }
-    values[argc] = NULL;
+    args.values[argc] = NULL;
+    args.fn = (void(*)(void))NUM2PTR(cfunc);
 
-    ffi_call(cif, NUM2PTR(rb_Integer(cfunc)), &retval, values);
+    (void)rb_thread_call_without_gvl(nogvl_ffi_call, &args, 0, 0);
 
     rb_funcall(mFiddle, rb_intern("last_error="), 1, INT2NUM(errno));
 #if defined(_WIN32)
     rb_funcall(mFiddle, rb_intern("win32_last_error="), 1, INT2NUM(errno));
 #endif
 
-    xfree(values);
-    xfree(generic_args);
+    ALLOCV_END(alloc_buffer);
 
-    return GENERIC2VALUE(rb_iv_get(self, "@return_type"), retval);
+    return GENERIC2VALUE(rb_iv_get(self, "@return_type"), args.retval);
 }
 
 void
@@ -149,25 +235,28 @@ Init_fiddle_function(void)
      *
      * === 'strcpy'
      *
-     *   @libc = DL.dlopen "/lib/libc.so.6"
-     *   => #<DL::Handle:0x00000001d7a8d8>
-     *   f = Fiddle::Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-     *   => #<Fiddle::Function:0x00000001d8ee00>
+     *   @libc = Fiddle.dlopen "/lib/libc.so.6"
+     *	    #=> #<Fiddle::Handle:0x00000001d7a8d8>
+     *   f = Fiddle::Function.new(
+     *     @libc['strcpy'],
+     *     [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP],
+     *     Fiddle::TYPE_VOIDP)
+     *	    #=> #<Fiddle::Function:0x00000001d8ee00>
      *   buff = "000"
-     *   => "000"
+     *	    #=> "000"
      *   str = f.call(buff, "123")
-     *   => #<DL::CPtr:0x00000001d0c380 ptr=0x000000018a21b8 size=0 free=0x00000000000000>
+     *	    #=> #<Fiddle::Pointer:0x00000001d0c380 ptr=0x000000018a21b8 size=0 free=0x00000000000000>
      *   str.to_s
      *   => "123"
      *
      * === ABI check
      *
-     *   @libc = DL.dlopen "/lib/libc.so.6"
-     *   => #<DL::Handle:0x00000001d7a8d8>
+     *   @libc = Fiddle.dlopen "/lib/libc.so.6"
+     *	    #=> #<Fiddle::Handle:0x00000001d7a8d8>
      *   f = Fiddle::Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
-     *   => #<Fiddle::Function:0x00000001d8ee00>
+     *	    #=> #<Fiddle::Function:0x00000001d8ee00>
      *   f.abi == Fiddle::Function::DEFAULT
-     *   => true
+     *	    #=> true
      */
     cFiddleFunction = rb_define_class_under(mFiddle, "Function", rb_cObject);
 
@@ -179,7 +268,7 @@ Init_fiddle_function(void)
      */
     rb_define_const(cFiddleFunction, "DEFAULT", INT2NUM(FFI_DEFAULT_ABI));
 
-#ifdef FFI_STDCALL
+#ifdef HAVE_CONST_FFI_STDCALL
     /*
      * Document-const: STDCALL
      *
@@ -194,7 +283,9 @@ Init_fiddle_function(void)
     /*
      * Document-method: call
      *
-     * Calls the constructed Function, with +args+
+     * 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.
      *
      * For an example see Fiddle::Function
      *
@@ -203,10 +294,10 @@ Init_fiddle_function(void)
 
     /*
      * Document-method: new
-     * call-seq: new(ptr, *args, ret_type, abi = DEFAULT)
+     * call-seq: new(ptr, args, ret_type, abi = DEFAULT)
      *
      * Constructs a Function object.
-     * * +ptr+ is a referenced function, of a DL::Handle
+     * * +ptr+ is a referenced function, of a Fiddle::Handle
      * * +args+ is an Array of arguments, passed to the +ptr+ function
      * * +ret_type+ is the return type of the function
      * * +abi+ is the ABI of the function
diff --git a/ext/fiddle/function.h b/ext/fiddle/function.h
index e5465ab64f..829e592c8a 100644
--- a/ext/fiddle/function.h
+++ b/ext/fiddle/function.h
@@ -3,6 +3,6 @@
 
 #include <fiddle.h>
 
-void Init_fiddle_function();
+void Init_fiddle_function(void);
 
 #endif
diff --git a/ext/fiddle/handle.c b/ext/fiddle/handle.c
new file mode 100644
index 0000000000..700924afb5
--- /dev/null
+++ b/ext/fiddle/handle.c
@@ -0,0 +1,477 @@
+#include <ruby.h>
+#include <fiddle.h>
+
+VALUE rb_cHandle;
+
+struct dl_handle {
+    void *ptr;
+    int  open;
+    int  enable_close;
+};
+
+#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
+fiddle_handle_free(void *ptr)
+{
+    struct dl_handle *fiddle_handle = ptr;
+    if( fiddle_handle->ptr && fiddle_handle->open && fiddle_handle->enable_close ){
+	dlclose(fiddle_handle->ptr);
+    }
+    xfree(ptr);
+}
+
+static size_t
+fiddle_handle_memsize(const void *ptr)
+{
+    return sizeof(struct dl_handle);
+}
+
+static const rb_data_type_t fiddle_handle_data_type = {
+    "fiddle/handle",
+    {0, fiddle_handle_free, fiddle_handle_memsize,},
+};
+
+/*
+ * call-seq: close
+ *
+ * Close this handle.
+ *
+ * Calling close more than once will raise a Fiddle::DLError exception.
+ */
+static VALUE
+rb_fiddle_handle_close(VALUE self)
+{
+    struct dl_handle *fiddle_handle;
+
+    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
+    if(fiddle_handle->open) {
+	int ret = dlclose(fiddle_handle->ptr);
+	fiddle_handle->open = 0;
+
+	/* Check dlclose for successful return value */
+	if(ret) {
+#if defined(HAVE_DLERROR)
+	    rb_raise(rb_eFiddleError, "%s", dlerror());
+#else
+	    rb_raise(rb_eFiddleError, "could not close handle");
+#endif
+	}
+	return INT2NUM(ret);
+    }
+    rb_raise(rb_eFiddleError, "dlclose() called too many times");
+
+    UNREACHABLE;
+}
+
+static VALUE
+rb_fiddle_handle_s_allocate(VALUE klass)
+{
+    VALUE obj;
+    struct dl_handle *fiddle_handle;
+
+    obj = TypedData_Make_Struct(rb_cHandle, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
+    fiddle_handle->ptr  = 0;
+    fiddle_handle->open = 0;
+    fiddle_handle->enable_close = 0;
+
+    return obj;
+}
+
+static VALUE
+predefined_fiddle_handle(void *handle)
+{
+    VALUE obj = rb_fiddle_handle_s_allocate(rb_cHandle);
+    struct dl_handle *fiddle_handle = DATA_PTR(obj);
+
+    fiddle_handle->ptr = handle;
+    fiddle_handle->open = 1;
+    OBJ_FREEZE(obj);
+    return obj;
+}
+
+/*
+ * call-seq:
+ *    new(library = nil, flags = Fiddle::RTLD_LAZY | Fiddle::RTLD_GLOBAL)
+ *
+ * Create a new handler that opens +library+ with +flags+.
+ *
+ * If no +library+ is specified or +nil+ is given, DEFAULT is used, which is
+ * the equivalent to RTLD_DEFAULT. See <code>man 3 dlopen</code> for more.
+ *
+ *	lib = Fiddle::Handle.new
+ *
+ * The default is dependent on OS, and provide a handle for all libraries
+ * already loaded. For example, in most cases you can use this to access +libc+
+ * functions, or ruby functions like +rb_str_new+.
+ */
+static VALUE
+rb_fiddle_handle_initialize(int argc, VALUE argv[], VALUE self)
+{
+    void *ptr;
+    struct dl_handle *fiddle_handle;
+    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 : StringValueCStr(lib);
+	cflag = RTLD_LAZY | RTLD_GLOBAL;
+	break;
+      case 2:
+	clib = NIL_P(lib) ? NULL : StringValueCStr(lib);
+	cflag = NUM2INT(flag);
+	break;
+      default:
+	rb_bug("rb_fiddle_handle_new");
+    }
+
+#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
+	(void)cflag;
+	ptr = w32_coredll();
+# endif
+    }
+    else
+#endif
+	ptr = dlopen(clib, cflag);
+#if defined(HAVE_DLERROR)
+    if( !ptr && (err = dlerror()) ){
+	rb_raise(rb_eFiddleError, "%s", err);
+    }
+#else
+    if( !ptr ){
+	err = dlerror();
+	rb_raise(rb_eFiddleError, "%s", err);
+    }
+#endif
+    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
+    if( fiddle_handle->ptr && fiddle_handle->open && fiddle_handle->enable_close ){
+	dlclose(fiddle_handle->ptr);
+    }
+    fiddle_handle->ptr = ptr;
+    fiddle_handle->open = 1;
+    fiddle_handle->enable_close = 0;
+
+    if( rb_block_given_p() ){
+	rb_ensure(rb_yield, self, rb_fiddle_handle_close, self);
+    }
+
+    return Qnil;
+}
+
+/*
+ * call-seq: enable_close
+ *
+ * Enable a call to dlclose() when this handle is garbage collected.
+ */
+static VALUE
+rb_fiddle_handle_enable_close(VALUE self)
+{
+    struct dl_handle *fiddle_handle;
+
+    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
+    fiddle_handle->enable_close = 1;
+    return Qnil;
+}
+
+/*
+ * call-seq: disable_close
+ *
+ * Disable a call to dlclose() when this handle is garbage collected.
+ */
+static VALUE
+rb_fiddle_handle_disable_close(VALUE self)
+{
+    struct dl_handle *fiddle_handle;
+
+    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
+    fiddle_handle->enable_close = 0;
+    return Qnil;
+}
+
+/*
+ * call-seq: close_enabled?
+ *
+ * Returns +true+ if dlclose() will be called when this handle is garbage collected.
+ *
+ * See man(3) dlclose() for more info.
+ */
+static VALUE
+rb_fiddle_handle_close_enabled_p(VALUE self)
+{
+    struct dl_handle *fiddle_handle;
+
+    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
+
+    if(fiddle_handle->enable_close) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * call-seq: to_i
+ *
+ * Returns the memory address for this handle.
+ */
+static VALUE
+rb_fiddle_handle_to_i(VALUE self)
+{
+    struct dl_handle *fiddle_handle;
+
+    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
+    return PTR2NUM(fiddle_handle);
+}
+
+static VALUE fiddle_handle_sym(void *handle, VALUE symbol);
+
+/*
+ * Document-method: sym
+ *
+ * call-seq: sym(name)
+ *
+ * Get the address as an Integer for the function named +name+.
+ */
+static VALUE
+rb_fiddle_handle_sym(VALUE self, VALUE sym)
+{
+    struct dl_handle *fiddle_handle;
+
+    TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
+    if( ! fiddle_handle->open ){
+	rb_raise(rb_eFiddleError, "closed handle");
+    }
+
+    return fiddle_handle_sym(fiddle_handle->ptr, sym);
+}
+
+#ifndef RTLD_NEXT
+#define RTLD_NEXT NULL
+#endif
+#ifndef RTLD_DEFAULT
+#define RTLD_DEFAULT NULL
+#endif
+
+/*
+ * Document-method: sym
+ *
+ * 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.
+ */
+static VALUE
+rb_fiddle_handle_s_sym(VALUE self, VALUE sym)
+{
+    return fiddle_handle_sym(RTLD_NEXT, sym);
+}
+
+static VALUE
+fiddle_handle_sym(void *handle, VALUE symbol)
+{
+#if defined(HAVE_DLERROR)
+    const char *err;
+# define CHECK_DLERROR if ((err = dlerror()) != 0) { func = 0; }
+#else
+# define CHECK_DLERROR
+#endif
+    void (*func)();
+    const char *name = StringValueCStr(symbol);
+
+#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_eFiddleError, "unknown symbol \"%"PRIsVALUE"\"", symbol);
+    }
+
+    return PTR2NUM(func);
+}
+
+void
+Init_fiddle_handle(void)
+{
+    /*
+     * Document-class: Fiddle::Handle
+     *
+     * The Fiddle::Handle is the manner to access the dynamic library
+     *
+     * == Example
+     *
+     * === Setup
+     *
+     *   libc_so = "/lib64/libc.so.6"
+     *   => "/lib64/libc.so.6"
+     *   @handle = Fiddle::Handle.new(libc_so)
+     *   => #<Fiddle::Handle:0x00000000d69ef8>
+     *
+     * === Setup, with flags
+     *
+     *   libc_so = "/lib64/libc.so.6"
+     *   => "/lib64/libc.so.6"
+     *   @handle = Fiddle::Handle.new(libc_so, Fiddle::RTLD_LAZY | Fiddle::RTLD_GLOBAL)
+     *   => #<Fiddle::Handle:0x00000000d69ef8>
+     *
+     * See RTLD_LAZY and RTLD_GLOBAL
+     *
+     * === Addresses to symbols
+     *
+     *   strcpy_addr = @handle['strcpy']
+     *   => 140062278451968
+     *
+     * or
+     *
+     *   strcpy_addr = @handle.sym('strcpy')
+     *   => 140062278451968
+     *
+     */
+    rb_cHandle = rb_define_class_under(mFiddle, "Handle", rb_cObject);
+    rb_define_alloc_func(rb_cHandle, rb_fiddle_handle_s_allocate);
+    rb_define_singleton_method(rb_cHandle, "sym", rb_fiddle_handle_s_sym, 1);
+    rb_define_singleton_method(rb_cHandle, "[]", rb_fiddle_handle_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_cHandle, "NEXT", predefined_fiddle_handle(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_cHandle, "DEFAULT", predefined_fiddle_handle(RTLD_DEFAULT));
+
+    /* Document-const: RTLD_GLOBAL
+     *
+     * rtld Fiddle::Handle flag.
+     *
+     * The symbols defined by this library will be made available for symbol
+     * resolution of subsequently loaded libraries.
+     */
+    rb_define_const(rb_cHandle, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
+
+    /* Document-const: RTLD_LAZY
+     *
+     * rtld Fiddle::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_cHandle, "RTLD_LAZY",   INT2NUM(RTLD_LAZY));
+
+    /* Document-const: RTLD_NOW
+     *
+     * rtld Fiddle::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 Fiddle.dlopen returns.  If this cannot be done an error
+     * is returned.
+     */
+    rb_define_const(rb_cHandle, "RTLD_NOW",    INT2NUM(RTLD_NOW));
+
+    rb_define_method(rb_cHandle, "initialize", rb_fiddle_handle_initialize, -1);
+    rb_define_method(rb_cHandle, "to_i", rb_fiddle_handle_to_i, 0);
+    rb_define_method(rb_cHandle, "close", rb_fiddle_handle_close, 0);
+    rb_define_method(rb_cHandle, "sym",  rb_fiddle_handle_sym, 1);
+    rb_define_method(rb_cHandle, "[]",  rb_fiddle_handle_sym,  1);
+    rb_define_method(rb_cHandle, "disable_close", rb_fiddle_handle_disable_close, 0);
+    rb_define_method(rb_cHandle, "enable_close", rb_fiddle_handle_enable_close, 0);
+    rb_define_method(rb_cHandle, "close_enabled?", rb_fiddle_handle_close_enabled_p, 0);
+}
+
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/lib/fiddle.rb b/ext/fiddle/lib/fiddle.rb
index 7d55a1f7ad..e9aa7e50ae 100644
--- a/ext/fiddle/lib/fiddle.rb
+++ b/ext/fiddle/lib/fiddle.rb
@@ -1,13 +1,9 @@
+# frozen_string_literal: true
 require 'fiddle.so'
 require 'fiddle/function'
 require 'fiddle/closure'
-require 'dl' unless Object.const_defined?(:DL)
 
 module Fiddle
-
-  # A reference to DL::CPtr
-  Pointer = DL::CPtr
-
   if WINDOWS
     # Returns the last win32 +Error+ of the current executing +Thread+ or nil
     # if none
@@ -31,4 +27,30 @@ module Fiddle
     Thread.current[:__DL2_LAST_ERROR__] = error
     Thread.current[:__FIDDLE_LAST_ERROR__] = error
   end
+
+  # call-seq: dlopen(library) => Fiddle::Handle
+  #
+  # Creates a new handler that opens +library+, and returns an instance of
+  # Fiddle::Handle.
+  #
+  # If +nil+ is given for the +library+, Fiddle::Handle::DEFAULT is used, which
+  # is the equivalent to RTLD_DEFAULT. See <code>man 3 dlopen</code> for more.
+  #
+  #   lib = Fiddle.dlopen(nil)
+  #
+  # The default is dependent on OS, and provide a handle for all libraries
+  # already loaded. For example, in most cases you can use this to access
+  # +libc+ functions, or ruby functions like +rb_str_new+.
+  #
+  # See Fiddle::Handle.new for more.
+  def dlopen library
+    Fiddle::Handle.new library
+  end
+  module_function :dlopen
+
+  # Add constants for backwards compat
+
+  RTLD_GLOBAL = Handle::RTLD_GLOBAL # :nodoc:
+  RTLD_LAZY   = Handle::RTLD_LAZY   # :nodoc:
+  RTLD_NOW    = Handle::RTLD_NOW    # :nodoc:
 end
diff --git a/ext/fiddle/lib/fiddle/closure.rb b/ext/fiddle/lib/fiddle/closure.rb
index beb90ecbe5..c865a63c20 100644
--- a/ext/fiddle/lib/fiddle/closure.rb
+++ b/ext/fiddle/lib/fiddle/closure.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Fiddle
   class Closure
 
diff --git a/ext/fiddle/lib/fiddle/cparser.rb b/ext/fiddle/lib/fiddle/cparser.rb
new file mode 100644
index 0000000000..cd0a64fef5
--- /dev/null
+++ b/ext/fiddle/lib/fiddle/cparser.rb
@@ -0,0 +1,197 @@
+# frozen_string_literal: true
+module Fiddle
+  # A mixin that provides methods for parsing C struct and prototype signatures.
+  #
+  # == Example
+  #   require 'fiddle/import'
+  #
+  #   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]]
+  #
+  module CParser
+    # Parses a C struct's members
+    #
+    # Example:
+    #   require 'fiddle/import'
+    #
+    #   include Fiddle::CParser
+    #     #=> Object
+    #
+    #   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, /[,;]/)
+      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}")
+        end
+      }
+      return tys, mems
+    end
+
+    # Parses a C prototype signature
+    #
+    # If Hash +tymap+ is provided, the return value and the arguments from the
+    # +signature+ are expected to be keys, and the value will be the C type to
+    # be looked up.
+    #
+    # Example:
+    #   require 'fiddle/import'
+    #
+    #   include Fiddle::CParser
+    #     #=> Object
+    #
+    #   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)}]
+      else
+        raise(RuntimeError,"can't parse the function prototype: #{signature}")
+      end
+    end
+
+    # Given a String of C type +ty+, returns the corresponding Fiddle constant.
+    #
+    # +ty+ can also accept an Array of C type Strings, and will be 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:
+    #   require 'fiddle/import'
+    #
+    #   include Fiddle::CParser
+    #     #=> Object
+    #
+    #   parse_ctype('int')
+    #     #=> Fiddle::TYPE_INT
+    #
+    #   parse_ctype('double diff')
+    #     #=> Fiddle::TYPE_DOUBLE
+    #
+    #   parse_ctype('unsigned char byte')
+    #     #=> -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'
+        return TYPE_VOID
+      when /^(?:(?:signed\s+)?long\s+long(?:\s+int\s+)?|int64_t)(?:\s+\w+)?$/
+        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+)?$/
+        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+)?$/
+        return TYPE_FLOAT
+      when /^double(?:\s+\w+)?$/
+        return TYPE_DOUBLE
+      when /^size_t(?:\s+\w+)?$/
+        return TYPE_SIZE_T
+      when /^ssize_t(?:\s+\w+)?$/
+        return TYPE_SSIZE_T
+      when /^ptrdiff_t(?:\s+\w+)?$/
+        return TYPE_PTRDIFF_T
+      when /^intptr_t(?:\s+\w+)?$/
+        return TYPE_INTPTR_T
+      when /^uintptr_t(?:\s+\w+)?$/
+        return TYPE_UINTPTR_T
+      when /\*/, /\[[\s\d]*\]/
+        return TYPE_VOIDP
+      else
+        ty = ty.split(' ', 2)[0]
+        if( tymap[ty] )
+          return parse_ctype(tymap[ty], tymap)
+        else
+          raise(DLError, "unknown type: #{ty}")
+        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 1657682498..dd5e04e417 100644
--- a/ext/fiddle/lib/fiddle/function.rb
+++ b/ext/fiddle/lib/fiddle/function.rb
@@ -1,6 +1,18 @@
+# frozen_string_literal: true
 module Fiddle
   class Function
     # The ABI of the Function.
     attr_reader :abi
+
+    # The address of this function
+    attr_reader :ptr
+
+    # The name of this function
+    attr_reader :name
+
+    # The integer memory location of this function
+    def to_i
+      ptr.to_i
+    end
   end
 end
diff --git a/ext/fiddle/lib/fiddle/import.rb b/ext/fiddle/lib/fiddle/import.rb
new file mode 100644
index 0000000000..178ebb8c76
--- /dev/null
+++ b/ext/fiddle/lib/fiddle/import.rb
@@ -0,0 +1,322 @@
+# frozen_string_literal: true
+require 'fiddle'
+require 'fiddle/struct'
+require 'fiddle/cparser'
+
+module Fiddle
+
+  # Used internally by Fiddle::Importer
+  class CompositeHandler
+    # Create a new handler with the open +handlers+
+    #
+    # Used internally by Fiddle::Importer.dlload
+    def initialize(handlers)
+      @handlers = handlers
+    end
+
+    # Array of the currently loaded libraries.
+    def handlers()
+      @handlers
+    end
+
+    # Returns the address as an Integer from any handlers with the function
+    # named +symbol+.
+    #
+    # Raises a DLError if the handle is closed.
+    def sym(symbol)
+      @handlers.each{|handle|
+        if( handle )
+          begin
+            addr = handle.sym(symbol)
+            return addr
+          rescue DLError
+          end
+        end
+      }
+      return nil
+    end
+
+    # See Fiddle::CompositeHandler.sym
+    def [](symbol)
+      sym(symbol)
+    end
+  end
+
+  # A DSL that provides 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 'fiddle'
+  #   require 'fiddle/import'
+  #
+  #   module LibSum
+  #   	extend Fiddle::Importer
+  #   	dlload './libsum.so'
+  #   	extern 'double sum(double*, int)'
+  #   	extern 'double split(double)'
+  #   end
+  #
+  module Importer
+    include 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
+    #
+    # Raises a DLError if the library cannot be loaded.
+    #
+    # See Fiddle.dlopen
+    def dlload(*libs)
+      handles = libs.collect{|lib|
+        case lib
+        when nil
+          nil
+        when Handle
+          lib
+        when Importer
+          lib.handlers
+        else
+          begin
+            Fiddle.dlopen(lib)
+          rescue DLError
+            raise(DLError, "can't load #{lib}")
+          end
+        end
+      }.flatten()
+      @handler = CompositeHandler.new(handles)
+      @func_map = {}
+      @type_alias = {}
+    end
+
+    # Sets the type alias for +alias_type+ as +orig_type+
+    def typealias(alias_type, orig_type)
+      @type_alias[alias_type] = orig_type
+    end
+
+    # Returns the sizeof +ty+, using Fiddle::Importer.parse_ctype to determine
+    # the C type and the appropriate Fiddle constant.
+    def sizeof(ty)
+      case ty
+      when String
+        ty = parse_ctype(ty, type_alias).abs()
+        case ty
+        when TYPE_CHAR
+          return SIZEOF_CHAR
+        when TYPE_SHORT
+          return SIZEOF_SHORT
+        when TYPE_INT
+          return SIZEOF_INT
+        when TYPE_LONG
+          return SIZEOF_LONG
+        when TYPE_FLOAT
+          return SIZEOF_FLOAT
+        when TYPE_DOUBLE
+          return SIZEOF_DOUBLE
+        when TYPE_VOIDP
+          return SIZEOF_VOIDP
+        else
+          if defined?(TYPE_LONG_LONG) and
+            ty == TYPE_LONG_LONG
+            return SIZEOF_LONG_LONG
+          else
+            raise(DLError, "unknown type: #{ty}")
+          end
+        end
+      when Class
+        if( ty.instance_methods().include?(:to_ptr) )
+          return ty.size()
+        end
+      end
+      return Pointer[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
+
+    # :stopdoc:
+    CALL_TYPE_TO_ABI = Hash.new { |h, k|
+      raise RuntimeError, "unsupported call type: #{k}"
+    }.merge({ :stdcall => Function.const_defined?(:STDCALL) ? Function::STDCALL :
+                          Function::DEFAULT,
+              :cdecl   => Function::DEFAULT,
+              nil      => Function::DEFAULT
+            }).freeze
+    private_constant :CALL_TYPE_TO_ABI
+    # :startdoc:
+
+    # Creates a global method from the given C +signature+.
+    def extern(signature, *opts)
+      symname, ctype, argtype = parse_signature(signature, type_alias)
+      opt = parse_bind_options(opts)
+      f = import_function(symname, ctype, argtype, opt[:call_type])
+      name = symname.gsub(/@.+/,'')
+      @func_map[name] = f
+      # define_method(name){|*args,&block| f.call(*args,&block)}
+      begin
+        /^(.+?):(\d+)/ =~ caller.first
+        file, line = $1, $2.to_i
+      rescue
+        file, line = __FILE__, __LINE__+3
+      end
+      module_eval(<<-EOS, file, line)
+        def #{name}(*args, &block)
+          @func_map['#{name}'].call(*args,&block)
+        end
+      EOS
+      module_function(name)
+      f
+    end
+
+    # 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)
+      h = parse_bind_options(opts)
+      case h[:callback_type]
+      when :bind, nil
+        f = bind_function(name, ctype, argtype, h[:call_type], &blk)
+      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)
+      tys, mems = parse_struct_signature(signature, type_alias)
+      Fiddle::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)
+      tys, mems = parse_struct_signature(signature, type_alias)
+      Fiddle::CStructBuilder.create(CUnion, tys, mems)
+    end
+
+    # Returns the function mapped to +name+, that was created by either
+    # Fiddle::Importer.extern or Fiddle::Importer.bind
+    def [](name)
+      @func_map[name]
+    end
+
+    # Creates a class to wrap the C struct with the value +ty+
+    #
+    # See also Fiddle::Importer.struct
+    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
+
+    # Returns a new instance of the C struct with the value +ty+ at the +addr+
+    # address.
+    def import_value(ty, addr)
+      s = struct([ty + " value"])
+      ptr = s.new(addr)
+      return ptr
+    end
+
+
+    # The Fiddle::CompositeHandler instance
+    #
+    # Will raise an error if no handlers are open.
+    def handler
+      (@handler ||= nil) or raise "call dlload before importing symbols and functions"
+    end
+
+    # Returns a new Fiddle::Pointer instance at the memory address of the given
+    # +name+ symbol.
+    #
+    # Raises a DLError if the +name+ doesn't exist.
+    #
+    # See Fiddle::CompositeHandler.sym and Fiddle::Handle.sym
+    def import_symbol(name)
+      addr = handler.sym(name)
+      if( !addr )
+        raise(DLError, "cannot find the symbol: #{name}")
+      end
+      Pointer.new(addr)
+    end
+
+    # Returns a new Fiddle::Function instance at the memory address of the given
+    # +name+ function.
+    #
+    # Raises a DLError if the +name+ doesn't exist.
+    #
+    # * +argtype+ is an Array of arguments, passed to the +name+ function.
+    # * +ctype+ is the return type of the function
+    # * +call_type+ is the ABI of the function
+    #
+    # See also Fiddle:Function.new
+    #
+    # See Fiddle::CompositeHandler.sym and Fiddle::Handler.sym
+    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(addr, argtype, ctype, CALL_TYPE_TO_ABI[call_type],
+                   name: name)
+    end
+
+    # Returns a new closure wrapper for the +name+ function.
+    #
+    # * +ctype+ is the return type of the function
+    # * +argtype+ is an Array of arguments, passed to the callback function
+    # * +call_type+ is the abi of the closure
+    # * +block+ is passed to the callback
+    #
+    # See Fiddle::Closure
+    def bind_function(name, ctype, argtype, call_type = nil, &block)
+      abi = CALL_TYPE_TO_ABI[call_type]
+      closure = Class.new(Fiddle::Closure) {
+        define_method(:call, block)
+      }.new(ctype, argtype, abi)
+
+      Function.new(closure, argtype, ctype, abi, name: name)
+    end
+  end
+end
diff --git a/ext/fiddle/lib/fiddle/pack.rb b/ext/fiddle/lib/fiddle/pack.rb
new file mode 100644
index 0000000000..22eccedb76
--- /dev/null
+++ b/ext/fiddle/lib/fiddle/pack.rb
@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+require 'fiddle'
+
+module Fiddle
+  module PackInfo # :nodoc: all
+    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 => "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
+      PACK_MAP[TYPE_VOIDP] = "q" if SIZEOF_LONG_LONG == SIZEOF_VOIDP
+    end
+
+    def align(addr, align)
+      d = addr % align
+      if( d == 0 )
+        addr
+      else
+        addr + (align - d)
+      end
+    end
+    module_function :align
+  end
+
+  class Packer # :nodoc: all
+    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)
+      else
+        if defined?(TYPE_LONG_LONG) and
+          SIZEOF_VOIDP == SIZEOF_LONG_LONG
+          ary.pack(@template)
+        else
+          raise(RuntimeError, "sizeof(void*)?")
+        end
+      end
+    end
+
+    def unpack(ary)
+      case SIZEOF_VOIDP
+      when SIZEOF_LONG
+        ary.join().unpack(@template)
+      else
+        if defined?(TYPE_LONG_LONG) and
+          SIZEOF_VOIDP == SIZEOF_LONG_LONG
+          ary.join().unpack(@template)
+        else
+          raise(RuntimeError, "sizeof(void*)?")
+        end
+      end
+    end
+
+    private
+
+    def parse_types(types)
+      @template = "".dup
+      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/fiddle/lib/fiddle/struct.rb b/ext/fiddle/lib/fiddle/struct.rb
new file mode 100644
index 0000000000..7c0dedb39f
--- /dev/null
+++ b/ext/fiddle/lib/fiddle/struct.rb
@@ -0,0 +1,244 @@
+# frozen_string_literal: true
+require 'fiddle'
+require 'fiddle/value'
+require 'fiddle/pack'
+
+module Fiddle
+  # C struct shell
+  class CStruct
+    # accessor to Fiddle::CStructEntity
+    def CStruct.entity_class
+      CStructEntity
+    end
+  end
+
+  # C union shell
+  class CUnion
+    # accessor to Fiddle::CUnionEntity
+    def CUnion.entity_class
+      CUnionEntity
+    end
+  end
+
+  # Used to construct C classes (CUnion, CStruct, etc)
+  #
+  # Fiddle::Importer#struct and Fiddle::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+ (Fiddle::TYPE_INT, Fiddle::TYPE_SIZE_T, etc., see the C types
+    #   constants)
+    # * corresponding +members+
+    #
+    # Fiddle::Importer#struct and Fiddle::Importer#union wrap this functionality in an
+    # easy-to-use manner.
+    #
+    # Example:
+    #
+    #   require 'fiddle/struct'
+    #   require 'fiddle/cparser'
+    #
+    #   include Fiddle::CParser
+    #
+    #   types, members = parse_struct_signature(['int i','char c'])
+    #
+    #   MyStruct = Fiddle::CStructBuilder.create(Fiddle::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 = Fiddle.malloc(#{size})
+          new(addr)
+        end
+      EOS
+      return new_class
+    end
+    module_function :create
+  end
+
+  # A C struct wrapper
+  class CStructEntity < Fiddle::Pointer
+    include PackInfo
+    include ValueUtil
+
+    # Allocates a C struct with the +types+ provided.
+    #
+    # When the instance is garbage collected, the C function +func+ is called.
+    def CStructEntity.malloc(types, func = nil)
+      addr = Fiddle.malloc(CStructEntity.size(types))
+      CStructEntity.new(addr, types, func)
+    end
+
+    # Returns the offset for the packed sizes for the given +types+.
+    #
+    #   Fiddle::CStructEntity.size(
+    #     [ Fiddle::TYPE_DOUBLE,
+    #       Fiddle::TYPE_INT,
+    #       Fiddle::TYPE_CHAR,
+    #       Fiddle::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+.
+    #
+    # When the instance is garbage collected, the C function +func+ is called.
+    #
+    # See also Fiddle::Pointer.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
+
+    # Calculates the offsets and sizes for the given +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| Pointer.new(v)}
+        end
+      when TYPE_VOIDP
+        val = Pointer.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.
+    #
+    # When the instance is garbage collected, the C function +func+ is called.
+    def CUnionEntity.malloc(types, func=nil)
+      addr = Fiddle.malloc(CUnionEntity.size(types))
+      CUnionEntity.new(addr, types, func)
+    end
+
+    # Returns the size needed for the union with the given +types+.
+    #
+    #   Fiddle::CUnionEntity.size(
+    #     [ Fiddle::TYPE_DOUBLE,
+    #       Fiddle::TYPE_INT,
+    #       Fiddle::TYPE_CHAR,
+    #       Fiddle::TYPE_VOIDP ]) #=> 8
+    def CUnionEntity.size(types)
+      types.map { |type, count = 1|
+        PackInfo::SIZE_MAP[type] * count
+      }.max
+    end
+
+    # Calculate the necessary offset and for each union member with the given
+    # +types+
+    def set_ctypes(types)
+      @ctypes = types
+      @offset = Array.new(types.length, 0)
+      @size   = self.class.size types
+    end
+  end
+end
+
diff --git a/ext/fiddle/lib/fiddle/types.rb b/ext/fiddle/lib/fiddle/types.rb
new file mode 100644
index 0000000000..8dc811d3e4
--- /dev/null
+++ b/ext/fiddle/lib/fiddle/types.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+module Fiddle
+  # Adds Windows type aliases to the including class for use with
+  # Fiddle::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 Fiddle::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/fiddle/lib/fiddle/value.rb b/ext/fiddle/lib/fiddle/value.rb
new file mode 100644
index 0000000000..01fec1c206
--- /dev/null
+++ b/ext/fiddle/lib/fiddle/value.rb
@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+require 'fiddle'
+
+module Fiddle
+  module ValueUtil #:nodoc: all
+    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]
+      else
+        if defined?(TYPE_LONG_LONG) and
+          ty.abs == TYPE_LONG_LONG
+          [val].pack("q").unpack("Q")[0]
+        else
+          val
+        end
+      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]
+      else
+        if defined?(TYPE_LONG_LONG) and
+          ty.abs == TYPE_LONG_LONG
+          [val].pack("Q").unpack("q")[0]
+        else
+          val
+        end
+      end
+    end
+
+    def wrap_args(args, tys, funcs, &block)
+      result = []
+      tys ||= []
+      args.each_with_index{|arg, idx|
+        result.push(wrap_arg(arg, tys[idx], funcs, &block))
+      }
+      result
+    end
+
+    def wrap_arg(arg, ty, funcs = [], &block)
+      funcs ||= []
+      case arg
+      when nil
+        return 0
+      when Pointer
+        return arg.to_i
+      when IO
+        case ty
+        when TYPE_VOIDP
+          return Pointer[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]
+          else
+            if defined?(SIZEOF_LONG_LONG) and
+              SIZEOF_VOIDP == SIZEOF_LONG_LONG
+              return [arg].pack("p").unpack("q")[0]
+            else
+              raise(RuntimeError, "sizeof(void*)?")
+            end
+          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/fiddle/pointer.c b/ext/fiddle/pointer.c
new file mode 100644
index 0000000000..117cc9b826
--- /dev/null
+++ b/ext/fiddle/pointer.c
@@ -0,0 +1,720 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#include <ruby/ruby.h>
+#include <ruby/io.h>
+#include <ctype.h>
+#include <fiddle.h>
+
+#ifdef PRIsVALUE
+# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
+# define RB_OBJ_STRING(obj) (obj)
+#else
+# define PRIsVALUE "s"
+# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
+# define RB_OBJ_STRING(obj) StringValueCStr(obj)
+#endif
+
+VALUE rb_cPointer;
+
+typedef void (*freefunc_t)(void*);
+
+struct ptr_data {
+    void *ptr;
+    long size;
+    freefunc_t free;
+    VALUE wrap[2];
+};
+
+#define RPTR_DATA(obj) ((struct ptr_data *)(DATA_PTR(obj)))
+
+static inline freefunc_t
+get_freefunc(VALUE func, volatile VALUE *wrap)
+{
+    VALUE addrnum;
+    if (NIL_P(func)) {
+	*wrap = 0;
+	return NULL;
+    }
+    addrnum = rb_Integer(func);
+    *wrap = (addrnum != func) ? func : 0;
+    return (freefunc_t)(VALUE)NUM2PTR(addrnum);
+}
+
+static ID id_to_ptr;
+
+static void
+fiddle_ptr_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
+fiddle_ptr_free(void *ptr)
+{
+    struct ptr_data *data = ptr;
+    if (data->ptr) {
+	if (data->free) {
+	    (*(data->free))(data->ptr);
+	}
+    }
+    xfree(ptr);
+}
+
+static size_t
+fiddle_ptr_memsize(const void *ptr)
+{
+    const struct ptr_data *data = ptr;
+    return sizeof(*data) + data->size;
+}
+
+static const rb_data_type_t fiddle_ptr_data_type = {
+    "fiddle/pointer",
+    {fiddle_ptr_mark, fiddle_ptr_free, fiddle_ptr_memsize,},
+};
+
+static VALUE
+rb_fiddle_ptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
+{
+    struct ptr_data *data;
+    VALUE val;
+
+    val = TypedData_Make_Struct(klass, struct ptr_data, &fiddle_ptr_data_type, data);
+    data->ptr = ptr;
+    data->free = func;
+    data->size = size;
+
+    return val;
+}
+
+static VALUE
+rb_fiddle_ptr_new(void *ptr, long size, freefunc_t func)
+{
+    return rb_fiddle_ptr_new2(rb_cPointer, ptr, size, func);
+}
+
+static VALUE
+rb_fiddle_ptr_malloc(long size, freefunc_t func)
+{
+    void *ptr;
+
+    ptr = ruby_xmalloc((size_t)size);
+    memset(ptr,0,(size_t)size);
+    return rb_fiddle_ptr_new(ptr, size, func);
+}
+
+static void *
+rb_fiddle_ptr2cptr(VALUE val)
+{
+    struct ptr_data *data;
+    void *ptr;
+
+    if (rb_obj_is_kind_of(val, rb_cPointer)) {
+	TypedData_Get_Struct(val, struct ptr_data, &fiddle_ptr_data_type, data);
+	ptr = data->ptr;
+    }
+    else if (val == Qnil) {
+	ptr = NULL;
+    }
+    else{
+	rb_raise(rb_eTypeError, "Fiddle::Pointer was expected");
+    }
+
+    return ptr;
+}
+
+static VALUE
+rb_fiddle_ptr_s_allocate(VALUE klass)
+{
+    VALUE obj;
+    struct ptr_data *data;
+
+    obj = TypedData_Make_Struct(klass, struct ptr_data, &fiddle_ptr_data_type, data);
+    data->ptr = 0;
+    data->size = 0;
+    data->free = 0;
+
+    return obj;
+}
+
+/*
+ * call-seq:
+ *    Fiddle::Pointer.new(address)      => fiddle_cptr
+ *    new(address, size)		=> fiddle_cptr
+ *    new(address, size, freefunc)	=> fiddle_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_fiddle_ptr_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, &fiddle_ptr_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:
+ *
+ *    Fiddle::Pointer.malloc(size, freefunc = nil)  => fiddle pointer 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
+ * Fiddle::Function
+ */
+static VALUE
+rb_fiddle_ptr_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_fiddle_ptr_s_malloc");
+    }
+
+    obj = rb_fiddle_ptr_malloc(s,f);
+    if (wrap) RPTR_DATA(obj)->wrap[1] = wrap;
+
+    return obj;
+}
+
+/*
+ * call-seq: to_i
+ *
+ * Returns the integer memory location of this pointer.
+ */
+static VALUE
+rb_fiddle_ptr_to_i(VALUE self)
+{
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
+    return PTR2NUM(data->ptr);
+}
+
+/*
+ * call-seq: to_value
+ *
+ * Cast this pointer to a ruby object.
+ */
+static VALUE
+rb_fiddle_ptr_to_value(VALUE self)
+{
+    struct ptr_data *data;
+    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
+    return (VALUE)(data->ptr);
+}
+
+/*
+ * call-seq: ptr
+ *
+ * Returns a new Fiddle::Pointer instance that is a dereferenced pointer for
+ * this pointer.
+ *
+ * Analogous to the star operator in C.
+ */
+static VALUE
+rb_fiddle_ptr_ptr(VALUE self)
+{
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
+    return rb_fiddle_ptr_new(*((void**)(data->ptr)),0,0);
+}
+
+/*
+ * call-seq: ref
+ *
+ * Returns a new Fiddle::Pointer instance that is a reference pointer for this
+ * pointer.
+ *
+ * Analogous to the ampersand operator in C.
+ */
+static VALUE
+rb_fiddle_ptr_ref(VALUE self)
+{
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
+    return rb_fiddle_ptr_new(&(data->ptr),0,0);
+}
+
+/*
+ * call-seq: null?
+ *
+ * Returns +true+ if this is a null pointer.
+ */
+static VALUE
+rb_fiddle_ptr_null_p(VALUE self)
+{
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
+    return data->ptr ? Qfalse : Qtrue;
+}
+
+/*
+ * call-seq: free=(function)
+ *
+ * Set the free function for this pointer to +function+ in the given
+ * Fiddle::Function.
+ */
+static VALUE
+rb_fiddle_ptr_free_set(VALUE self, VALUE val)
+{
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
+    data->free = get_freefunc(val, &data->wrap[1]);
+
+    return Qnil;
+}
+
+/*
+ * call-seq: free => Fiddle::Function
+ *
+ * Get the free function for this pointer.
+ *
+ * Returns a new instance of Fiddle::Function.
+ *
+ * See Fiddle::Function.new
+ */
+static VALUE
+rb_fiddle_ptr_free_get(VALUE self)
+{
+    struct ptr_data *pdata;
+    VALUE address;
+    VALUE arg_types;
+    VALUE ret_type;
+
+    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, pdata);
+
+    if (!pdata->free)
+	return Qnil;
+
+    address = PTR2NUM(pdata->free);
+    ret_type = INT2NUM(TYPE_VOID);
+    arg_types = rb_ary_new();
+    rb_ary_push(arg_types, INT2NUM(TYPE_VOIDP));
+
+    return rb_fiddle_new_function(address, arg_types, ret_type);
+}
+
+/*
+ * 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.
+ *
+ * See to_str
+ */
+static VALUE
+rb_fiddle_ptr_to_s(int argc, VALUE argv[], VALUE self)
+{
+    struct ptr_data *data;
+    VALUE arg1, val;
+    int len;
+
+    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
+    switch (rb_scan_args(argc, argv, "01", &arg1)) {
+      case 0:
+	val = rb_str_new2((char*)(data->ptr));
+	break;
+      case 1:
+	len = NUM2INT(arg1);
+	val = rb_str_new((char*)(data->ptr), len);
+	break;
+      default:
+	rb_bug("rb_fiddle_ptr_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.
+ *
+ * See to_s
+ */
+static VALUE
+rb_fiddle_ptr_to_str(int argc, VALUE argv[], VALUE self)
+{
+    struct ptr_data *data;
+    VALUE arg1, val;
+    int len;
+
+    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
+    switch (rb_scan_args(argc, argv, "01", &arg1)) {
+      case 0:
+	val = rb_str_new((char*)(data->ptr),data->size);
+	break;
+      case 1:
+	len = NUM2INT(arg1);
+	val = rb_str_new((char*)(data->ptr), len);
+	break;
+      default:
+	rb_bug("rb_fiddle_ptr_to_str");
+    }
+
+    return val;
+}
+
+/*
+ * call-seq: inspect
+ *
+ * Returns a string formatted with an easily readable representation of the
+ * internal state of the pointer.
+ */
+static VALUE
+rb_fiddle_ptr_inspect(VALUE self)
+{
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
+    return rb_sprintf("#<%"PRIsVALUE":%p ptr=%p size=%ld free=%p>",
+		      RB_OBJ_CLASSNAME(self), (void *)data, data->ptr, data->size, (void *)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.
+ */
+static VALUE
+rb_fiddle_ptr_eql(VALUE self, VALUE other)
+{
+    void *ptr1, *ptr2;
+
+    if(!rb_obj_is_kind_of(other, rb_cPointer)) return Qfalse;
+
+    ptr1 = rb_fiddle_ptr2cptr(self);
+    ptr2 = rb_fiddle_ptr2cptr(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_fiddle_ptr_cmp(VALUE self, VALUE other)
+{
+    void *ptr1, *ptr2;
+    SIGNED_VALUE diff;
+
+    if(!rb_obj_is_kind_of(other, rb_cPointer)) return Qnil;
+
+    ptr1 = rb_fiddle_ptr2cptr(self);
+    ptr2 = rb_fiddle_ptr2cptr(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 pointer instance that has been advanced +n+ bytes.
+ */
+static VALUE
+rb_fiddle_ptr_plus(VALUE self, VALUE other)
+{
+    void *ptr;
+    long num, size;
+
+    ptr = rb_fiddle_ptr2cptr(self);
+    size = RPTR_DATA(self)->size;
+    num = NUM2LONG(other);
+    return rb_fiddle_ptr_new((char *)ptr + num, size - num, 0);
+}
+
+/*
+ * call-seq:
+ *    ptr - n   => new cptr
+ *
+ * Returns a new pointer instance that has been moved back +n+ bytes.
+ */
+static VALUE
+rb_fiddle_ptr_minus(VALUE self, VALUE other)
+{
+    void *ptr;
+    long num, size;
+
+    ptr = rb_fiddle_ptr2cptr(self);
+    size = RPTR_DATA(self)->size;
+    num = NUM2LONG(other);
+    return rb_fiddle_ptr_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_ will be returned.
+ */
+static VALUE
+rb_fiddle_ptr_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, &fiddle_ptr_data_type, data);
+    if (!data->ptr) rb_raise(rb_eFiddleError, "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_str_new((char *)data->ptr + offset, len);
+	break;
+      default:
+	rb_bug("rb_fiddle_ptr_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+.
+ */
+static VALUE
+rb_fiddle_ptr_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, &fiddle_ptr_data_type, data);
+    if (!data->ptr) rb_raise(rb_eFiddleError, "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_cPointer) ){
+	    mem = rb_fiddle_ptr2cptr(arg2);
+	}
+	else{
+	    mem    = NUM2PTR(arg2);
+	}
+	memcpy((char *)data->ptr + offset, mem, len);
+	retval = arg2;
+	break;
+      default:
+	rb_bug("rb_fiddle_ptr_aset()");
+    }
+    return retval;
+}
+
+/*
+ * call-seq: size=(size)
+ *
+ * Set the size of this pointer to +size+
+ */
+static VALUE
+rb_fiddle_ptr_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_fiddle_ptr_size_get(VALUE self)
+{
+    return LONG2NUM(RPTR_DATA(self)->size);
+}
+
+/*
+ * call-seq:
+ *    Fiddle::Pointer[val]         => cptr
+ *    to_ptr(val)  => cptr
+ *
+ * Get the underlying pointer for ruby object +val+ and return it as a
+ * Fiddle::Pointer object.
+ */
+static VALUE
+rb_fiddle_ptr_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_fiddle_ptr_new(fp, 0, NULL);
+    }
+    else if (RTEST(rb_obj_is_kind_of(val, rb_cString))){
+	char *str = StringValuePtr(val);
+	ptr = rb_fiddle_ptr_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_cPointer)){
+	    ptr = vptr;
+	    wrap = 0;
+	}
+	else{
+	    rb_raise(rb_eFiddleError, "to_ptr should return a Fiddle::Pointer object");
+	}
+    }
+    else{
+	VALUE num = rb_Integer(val);
+	if (num == val) wrap = 0;
+	ptr = rb_fiddle_ptr_new(NUM2PTR(num), 0, NULL);
+    }
+    if (wrap) RPTR_DATA(ptr)->wrap[0] = wrap;
+    return ptr;
+}
+
+void
+Init_fiddle_pointer(void)
+{
+#undef rb_intern
+    id_to_ptr = rb_intern("to_ptr");
+
+    /* Document-class: Fiddle::Pointer
+     *
+     * Fiddle::Pointer is a class to handle C pointers
+     *
+     */
+    rb_cPointer = rb_define_class_under(mFiddle, "Pointer", rb_cObject);
+    rb_define_alloc_func(rb_cPointer, rb_fiddle_ptr_s_allocate);
+    rb_define_singleton_method(rb_cPointer, "malloc", rb_fiddle_ptr_s_malloc, -1);
+    rb_define_singleton_method(rb_cPointer, "to_ptr", rb_fiddle_ptr_s_to_ptr, 1);
+    rb_define_singleton_method(rb_cPointer, "[]", rb_fiddle_ptr_s_to_ptr, 1);
+    rb_define_method(rb_cPointer, "initialize", rb_fiddle_ptr_initialize, -1);
+    rb_define_method(rb_cPointer, "free=", rb_fiddle_ptr_free_set, 1);
+    rb_define_method(rb_cPointer, "free",  rb_fiddle_ptr_free_get, 0);
+    rb_define_method(rb_cPointer, "to_i",  rb_fiddle_ptr_to_i, 0);
+    rb_define_method(rb_cPointer, "to_int",  rb_fiddle_ptr_to_i, 0);
+    rb_define_method(rb_cPointer, "to_value",  rb_fiddle_ptr_to_value, 0);
+    rb_define_method(rb_cPointer, "ptr",   rb_fiddle_ptr_ptr, 0);
+    rb_define_method(rb_cPointer, "+@", rb_fiddle_ptr_ptr, 0);
+    rb_define_method(rb_cPointer, "ref",   rb_fiddle_ptr_ref, 0);
+    rb_define_method(rb_cPointer, "-@", rb_fiddle_ptr_ref, 0);
+    rb_define_method(rb_cPointer, "null?", rb_fiddle_ptr_null_p, 0);
+    rb_define_method(rb_cPointer, "to_s", rb_fiddle_ptr_to_s, -1);
+    rb_define_method(rb_cPointer, "to_str", rb_fiddle_ptr_to_str, -1);
+    rb_define_method(rb_cPointer, "inspect", rb_fiddle_ptr_inspect, 0);
+    rb_define_method(rb_cPointer, "<=>", rb_fiddle_ptr_cmp, 1);
+    rb_define_method(rb_cPointer, "==", rb_fiddle_ptr_eql, 1);
+    rb_define_method(rb_cPointer, "eql?", rb_fiddle_ptr_eql, 1);
+    rb_define_method(rb_cPointer, "+", rb_fiddle_ptr_plus, 1);
+    rb_define_method(rb_cPointer, "-", rb_fiddle_ptr_minus, 1);
+    rb_define_method(rb_cPointer, "[]", rb_fiddle_ptr_aref, -1);
+    rb_define_method(rb_cPointer, "[]=", rb_fiddle_ptr_aset, -1);
+    rb_define_method(rb_cPointer, "size", rb_fiddle_ptr_size_get, 0);
+    rb_define_method(rb_cPointer, "size=", rb_fiddle_ptr_size_set, 1);
+
+    /*  Document-const: NULL
+     *
+     * A NULL pointer
+     */
+    rb_define_const(mFiddle, "NULL", rb_fiddle_ptr_new(0, 0, 0));
+}
diff --git a/ext/fiddle/win32/fficonfig.h b/ext/fiddle/win32/fficonfig.h
new file mode 100755
index 0000000000..776808159c
--- /dev/null
+++ b/ext/fiddle/win32/fficonfig.h
@@ -0,0 +1,29 @@
+#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
new file mode 100644
index 0000000000..f9100e703d
--- /dev/null
+++ b/ext/fiddle/win32/libffi-3.2.1-mswin.patch
@@ -0,0 +1,191 @@
+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
new file mode 100755
index 0000000000..6abc9b2c02
--- /dev/null
+++ b/ext/fiddle/win32/libffi-config.rb
@@ -0,0 +1,48 @@
+#!/usr/bin/ruby
+# frozen_string_literal: true
+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
new file mode 100755
index 0000000000..2a16e8efec
--- /dev/null
+++ b/ext/fiddle/win32/libffi.mk.tmpl
@@ -0,0 +1,96 @@
+# -*- 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
index c080a81619..33635bc099 100644
--- a/ext/gdbm/depend
+++ b/ext/gdbm/depend
@@ -1 +1,14 @@
-gdbm.o: gdbm.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+# AUTOGENERATED DEPENDENCIES START
+gdbm.o: $(RUBY_EXTCONF_H)
+gdbm.o: $(arch_hdrdir)/ruby/config.h
+gdbm.o: $(hdrdir)/ruby.h
+gdbm.o: $(hdrdir)/ruby/assert.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: gdbm.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/gdbm/extconf.rb b/ext/gdbm/extconf.rb
index 5a09492e5e..d1908ffa5c 100644
--- a/ext/gdbm/extconf.rb
+++ b/ext/gdbm/extconf.rb
@@ -1,7 +1,19 @@
+# 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 6f0c14d664..4a6377b685 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -73,12 +73,22 @@
  */
 static VALUE rb_cGDBM, rb_eGDBMError, rb_eGDBMFatalError;
 
+#if SIZEOF_LONG > SIZEOF_INT
+#define TOO_LONG(n) ((long)(+(int)(n)) != (long)(n))
+#else
+#define TOO_LONG(n) 0
+#endif
+
 #define RUBY_GDBM_RW_BIT 0x20000000
 
 #define MY_BLOCK_SIZE (2048)
 #define MY_FATAL_FUNC rb_gdbm_fatal
+
+NORETURN(static void rb_gdbm_fatal(const char *msg));
+NORETURN(static void closed_dbm(void));
+
 static void
-rb_gdbm_fatal(char *msg)
+rb_gdbm_fatal(const char *msg)
 {
     rb_raise(rb_eGDBMFatalError, "%s", msg);
 }
@@ -95,25 +105,41 @@ closed_dbm(void)
 }
 
 #define GetDBM(obj, dbmp) do {\
-    Data_Get_Struct((obj), struct dbmdata, (dbmp));\
-    if ((dbmp) == 0) closed_dbm();\
+    TypedData_Get_Struct((obj), struct dbmdata, &dbm_type, (dbmp));\
     if ((dbmp)->di_dbm == 0) closed_dbm();\
 } while (0)
 
-#define GetDBM2(obj, data, dbm) {\
-    GetDBM((obj), (data));\
-    (dbm) = dbmp->di_dbm;\
-}
+#define GetDBM2(obj, dbmp, dbm) do {\
+    GetDBM((obj), (dbmp));\
+    (dbm) = (dbmp)->di_dbm;\
+} while (0)
 
 static void
-free_dbm(struct dbmdata *dbmp)
+free_dbm(void *ptr)
 {
-    if (dbmp) {
-        if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
-        xfree(dbmp);
-    }
+    struct dbmdata *dbmp = ptr;
+    if (dbmp->di_dbm)
+	gdbm_close(dbmp->di_dbm);
+    xfree(dbmp);
+}
+
+static size_t
+memsize_dbm(const void *ptr)
+{
+    const struct dbmdata *dbmp = ptr;
+    size_t 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
@@ -143,9 +169,7 @@ fgdbm_closed(VALUE obj)
 {
     struct dbmdata *dbmp;
 
-    Data_Get_Struct(obj, struct dbmdata, dbmp);
-    if (dbmp == 0)
-        return Qtrue;
+    TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp);
     if (dbmp->di_dbm == 0)
         return Qtrue;
 
@@ -155,7 +179,9 @@ fgdbm_closed(VALUE obj)
 static VALUE
 fgdbm_s_alloc(VALUE klass)
 {
-    return Data_Wrap_Struct(klass, 0, free_dbm, 0);
+    struct dbmdata *dbmp;
+
+    return TypedData_Make_Struct(klass, struct dbmdata, &dbm_type, dbmp);
 }
 
 /*
@@ -189,6 +215,7 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
     struct dbmdata *dbmp;
     int mode, flags = 0;
 
+    TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp);
     if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) {
         mode = 0666;            /* default value */
     }
@@ -202,7 +229,12 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
     if (!NIL_P(vflags))
         flags = NUM2INT(vflags);
 
-    SafeStringValue(file);
+    FilePathValue(file);
+
+#ifdef GDBM_CLOEXEC
+    /* GDBM_CLOEXEC is available since gdbm 1.10. */
+    flags |= GDBM_CLOEXEC;
+#endif
 
     if (flags & RUBY_GDBM_RW_BIT) {
         flags &= ~RUBY_GDBM_RW_BIT;
@@ -222,20 +254,23 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
                             GDBM_READER|flags, 0, MY_FATAL_FUNC);
     }
 
+    if (dbm) {
+        rb_fd_fix_cloexec(gdbm_fdesc(dbm));
+    }
+
     if (!dbm) {
         if (mode == -1) return Qnil;
 
         if (gdbm_errno == GDBM_FILE_OPEN_ERROR ||
             gdbm_errno == GDBM_CANT_BE_READER ||
             gdbm_errno == GDBM_CANT_BE_WRITER)
-            rb_sys_fail(RSTRING_PTR(file));
+            rb_sys_fail_str(file);
         else
             rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
     }
 
-    dbmp = ALLOC(struct dbmdata);
-    free_dbm(DATA_PTR(obj));
-    DATA_PTR(obj) = dbmp;
+    if (dbmp->di_dbm)
+	gdbm_close(dbmp->di_dbm);
     dbmp->di_dbm = dbm;
     dbmp->di_size = -1;
 
@@ -264,7 +299,7 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
 static VALUE
 fgdbm_s_open(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
+    VALUE obj = fgdbm_s_alloc(klass);
 
     if (NIL_P(fgdbm_initialize(argc, argv, obj))) {
         return Qnil;
@@ -289,7 +324,6 @@ rb_gdbm_fetch(GDBM_FILE dbm, datum key)
 
     str = rb_str_new(val.dptr, val.dsize);
     free(val.dptr);
-    OBJ_TAINT(str);
     return str;
 }
 
@@ -297,10 +331,13 @@ static VALUE
 rb_gdbm_fetch2(GDBM_FILE dbm, VALUE keystr)
 {
     datum key;
+    long len;
 
-    StringValue(keystr);
+    ExportStringValue(keystr);
+    len = RSTRING_LEN(keystr);
+    if (TOO_LONG(len)) return Qnil;
     key.dptr = RSTRING_PTR(keystr);
-    key.dsize = (int)RSTRING_LEN(keystr);
+    key.dsize = (int)len;
 
     return rb_gdbm_fetch(dbm, key);
 }
@@ -327,7 +364,6 @@ rb_gdbm_firstkey(GDBM_FILE dbm)
 
     str = rb_str_new(key.dptr, key.dsize);
     free(key.dptr);
-    OBJ_TAINT(str);
     return str;
 }
 
@@ -336,16 +372,18 @@ rb_gdbm_nextkey(GDBM_FILE dbm, VALUE keystr)
 {
     datum key, key2;
     VALUE str;
+    long len;
 
+    len = RSTRING_LEN(keystr);
+    if (TOO_LONG(len)) return Qnil;
     key.dptr = RSTRING_PTR(keystr);
-    key.dsize = (int)RSTRING_LEN(keystr);
+    key.dsize = (int)len;
     key2 = gdbm_nextkey(dbm, key);
     if (key2.dptr == 0)
         return Qnil;
 
     str = rb_str_new(key2.dptr, key2.dsize);
     free(key2.dptr);
-    OBJ_TAINT(str);
     return str;
 }
 
@@ -409,7 +447,7 @@ fgdbm_key(VALUE obj, VALUE valstr)
     GDBM_FILE dbm;
     VALUE keystr, valstr2;
 
-    StringValue(valstr);
+    ExportStringValue(valstr);
     GetDBM2(obj, dbmp, dbm);
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -485,7 +523,6 @@ fgdbm_values_at(int argc, VALUE *argv, VALUE obj)
 static void
 rb_gdbm_modify(VALUE obj)
 {
-    rb_secure(4);
     if (OBJ_FROZEN(obj)) rb_error_frozen("GDBM");
 }
 
@@ -495,11 +532,14 @@ rb_gdbm_delete(VALUE obj, VALUE keystr)
     datum key;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
+    long len;
 
     rb_gdbm_modify(obj);
-    StringValue(keystr);
+    ExportStringValue(keystr);
+    len = RSTRING_LEN(keystr);
+    if (TOO_LONG(len)) return Qnil;
     key.dptr = RSTRING_PTR(keystr);
-    key.dsize = (int)RSTRING_LEN(keystr);
+    key.dsize = (int)len;
 
     GetDBM2(obj, dbmp, dbm);
     if (!gdbm_exists(dbm, key)) {
@@ -570,8 +610,9 @@ fgdbm_delete_if(VALUE obj)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
     VALUE keystr, valstr;
-    VALUE ret, ary = rb_ary_new();
-    int i, status = 0, n;
+    VALUE ret, ary = rb_ary_tmp_new(0);
+    long i;
+    int status = 0, n;
 
     rb_gdbm_modify(obj);
     GetDBM2(obj, dbmp, dbm);
@@ -581,17 +622,19 @@ fgdbm_delete_if(VALUE obj)
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
+	OBJ_FREEZE(keystr);
         valstr = rb_gdbm_fetch2(dbm, keystr);
-        ret = rb_protect(rb_yield, rb_assoc_new(keystr, valstr), &status);
+        ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
         if (status != 0) break;
         if (RTEST(ret)) rb_ary_push(ary, keystr);
         GetDBM2(obj, dbmp, dbm);
     }
 
     for (i = 0; i < RARRAY_LEN(ary); i++)
-        rb_gdbm_delete(obj, RARRAY_PTR(ary)[i]);
+        rb_gdbm_delete(obj, RARRAY_AREF(ary, i));
     if (status) rb_jump_tag(status);
     if (n > 0) dbmp->di_size = n - (int)RARRAY_LEN(ary);
+    rb_ary_clear(ary);
 
     return obj;
 }
@@ -679,14 +722,14 @@ fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
     GDBM_FILE dbm;
 
     rb_gdbm_modify(obj);
-    StringValue(keystr);
-    StringValue(valstr);
+    ExportStringValue(keystr);
+    ExportStringValue(valstr);
 
     key.dptr = RSTRING_PTR(keystr);
-    key.dsize = (int)RSTRING_LEN(keystr);
+    key.dsize = RSTRING_LENINT(keystr);
 
     val.dptr = RSTRING_PTR(valstr);
-    val.dsize = (int)RSTRING_LEN(valstr);
+    val.dsize = RSTRING_LENINT(valstr);
 
     GetDBM2(obj, dbmp, dbm);
     dbmp->di_size = -1;
@@ -699,13 +742,15 @@ fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 }
 
 static VALUE
-update_i(VALUE pair, VALUE dbm)
+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]");
     }
-    fgdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
+    ptr = RARRAY_CONST_PTR(pair);
+    fgdbm_store(dbm, ptr[0], ptr[1]);
     return Qnil;
 }
 
@@ -853,7 +898,7 @@ fgdbm_each_key(VALUE obj)
  *      gdbm.each_pair { |key, value| block } -> gdbm
  *
  * Executes _block_ for each key in the database, passing the _key_ and the
- * correspoding _value_ as a parameter.
+ * corresponding _value_ as a parameter.
  */
 static VALUE
 fgdbm_each_pair(VALUE obj)
@@ -927,7 +972,9 @@ fgdbm_values(VALUE obj)
 
 /*
  * call-seq:
+ *      gdbm.include?(k) -> true or false
  *      gdbm.has_key?(k) -> true or false
+ *      gdbm.member?(k) -> true or false
  *      gdbm.key?(k) -> true or false
  *
  * Returns true if the given key _k_ exists within the database.
@@ -939,10 +986,13 @@ fgdbm_has_key(VALUE obj, VALUE keystr)
     datum key;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
+    long len;
 
-    StringValue(keystr);
+    ExportStringValue(keystr);
+    len = RSTRING_LENINT(keystr);
+    if (TOO_LONG(len)) return Qfalse;
     key.dptr = RSTRING_PTR(keystr);
-    key.dsize = (int)RSTRING_LEN(keystr);
+    key.dsize = (int)len;
 
     GetDBM2(obj, dbmp, dbm);
     if (gdbm_exists(dbm, key))
@@ -965,7 +1015,7 @@ fgdbm_has_value(VALUE obj, VALUE valstr)
     GDBM_FILE dbm;
     VALUE keystr, valstr2;
 
-    StringValue(valstr);
+    ExportStringValue(valstr);
     GetDBM2(obj, dbmp, dbm);
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -1023,6 +1073,7 @@ fgdbm_reorganize(VALUE obj)
     rb_gdbm_modify(obj);
     GetDBM2(obj, dbmp, dbm);
     gdbm_reorganize(dbm);
+    rb_fd_fix_cloexec(gdbm_fdesc(dbm));
     return obj;
 }
 
@@ -1031,7 +1082,7 @@ fgdbm_reorganize(VALUE obj)
  *     gdbm.sync -> gdbm
  *
  * Unless the _gdbm_ object has been opened with the *SYNC* flag, it is not
- * guarenteed that database modification operations are immediately applied to
+ * guaranteed that database modification operations are immediately applied to
  * the database file. This method ensures that all recent modifications
  * to the database are written to the file. Blocks until all writing operations
  * to the disk have been finished.
diff --git a/ext/gdbm/gdbm.gemspec b/ext/gdbm/gdbm.gemspec
new file mode 100644
index 0000000000..da074b0180
--- /dev/null
+++ b/ext/gdbm/gdbm.gemspec
@@ -0,0 +1,21 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+Gem::Specification.new do |spec|
+  spec.name          = "gdbm"
+  spec.version       = "2.1.0"
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = "Ruby extension for GNU dbm."
+  spec.description   = "Ruby extension for GNU dbm."
+  spec.homepage      = "https://github.com/ruby/gdbm"
+  spec.license       = "BSD-2-Clause"
+
+  spec.files         = ["ext/gdbm/extconf.rb", "ext/gdbm/gdbm.c"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.extensions    = ["ext/gdbm/extconf.rb"]
+  spec.required_ruby_version = ">= 2.3.0"
+end
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
deleted file mode 100644
index cd567a8e2e..0000000000
--- a/ext/iconv/charset_alias.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-#! /usr/bin/ruby
-# :stopdoc:
-require 'rbconfig'
-require 'optparse'
-
-# http://www.ctan.org/get/macros/texinfo/texinfo/gnulib/lib/config.charset
-# Tue, 25 Dec 2007 00:00:00 GMT
-
-OS = RbConfig::CONFIG["target_os"]
-SHELL = RbConfig::CONFIG['SHELL']
-
-class Hash::Ordered < Hash
-  def [](key)
-    val = super and val.last
-  end
-  def []=(key, val)
-    ary = fetch(key) {return super(key, [self.size, key, val])} and
-      ary << val
-  end
-  def sort
-    values.sort.collect {|i, *rest| rest}
-  end
-  def each(&block)
-    sort.each(&block)
-  end
-end
-
-def charset_alias(config_charset, mapfile, target = OS)
-  map = Hash::Ordered.new
-  comments = []
-  open(config_charset) do |input|
-    input.find {|line| /^case "\$os" in/ =~ line} or break
-    input.find {|line|
-      /^\s*([-\w\*]+(?:\s*\|\s*[-\w\*]+)*)(?=\))/ =~ line and
-      $&.split('|').any? {|pattern| File.fnmatch?(pattern.strip, target)}
-    } or break
-    input.find do |line|
-      case line
-      when /^\s*echo "(?:\$\w+\.)?([-\w*]+)\s+([-\w]+)"/
-        sys, can = $1, $2
-        can.downcase!
-        map[can] = sys
-        false
-      when /^\s*;;/
-        true
-      else
-        false
-      end
-    end
-  end
-  case target
-  when /linux|-gnu/
-    # map.delete('ascii')
-  when /cygwin|os2-emx/
-    # get rid of tilde/yen problem.
-    map['shift_jis'] = 'cp932'
-  end
-  st = Hash.new(0)
-  map = map.sort.collect do |can, *sys|
-    if sys.grep(/^en_us(?=.|$)/i) {break true} == true
-      noen = %r"^(?!en_us)\w+_\w+#{Regexp.new($')}$"i #"
-      sys.reject! {|s| noen =~ s}
-    end
-    sys = sys.first
-    st[sys] += 1
-    [can, sys]
-  end
-  st.delete_if {|sys, i| i == 1}.empty?
-  st.keys.each {|sys| st[sys] = nil}
-  st.default = nil
-  writer = proc do |f|
-    f.puts("require 'iconv.so'")
-    f.puts
-    f.puts(comments)
-    f.puts("class Iconv")
-    i = 0
-    map.each do |can, sys|
-      if s = st[sys]
-        sys = s
-      elsif st.key?(sys)
-        sys = (st[sys] = "sys#{i+=1}") + " = '#{sys}'.freeze"
-      else
-        sys = "'#{sys}'.freeze"
-      end
-      f.puts("  charset_map['#{can}'] = #{sys}")
-    end
-    f.puts("end")
-  end
-  if mapfile
-    open(mapfile, "w", &writer)
-  else
-    writer[STDOUT]
-  end
-end
-
-target = OS
-opt = nil
-ARGV.options do |opt2|
-  opt = opt2
-  opt.banner << " config.status map.rb"
-  opt.on("--target OS") {|t| target = t}
-  opt.parse! and (1..2) === ARGV.size
-end or abort opt.to_s
-charset_alias(ARGV[0], ARGV[1], target)
diff --git a/ext/iconv/depend b/ext/iconv/depend
deleted file mode 100644
index ac555596ce..0000000000
--- a/ext/iconv/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-iconv.o: iconv.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
-  $(hdrdir)/st.h $(hdrdir)/intern.h $(hdrdir)/encoding.h
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
deleted file mode 100644
index c4a57c80d6..0000000000
--- a/ext/iconv/extconf.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'mkmf'
-
-dir_config("iconv")
-
-conf = File.exist?(File.join($srcdir, "config.charset"))
-conf = with_config("config-charset", enable_config("config-charset", conf))
-
-if have_func("iconv", "iconv.h") or
-    have_library("iconv", "iconv", "iconv.h")
-  check_signedness("size_t")
-  if checking_for("const of iconv() 2nd argument") do
-      create_tmpsrc(cpp_include("iconv.h") + "---> iconv(cd,0,0,0,0) <---")
-      src = xpopen(cpp_command("")) {|f|f.read}
-      if !(func = src[/^--->\s*(\w+).*\s*<---/, 1])
-        Logging::message "iconv function name not found"
-        false
-      elsif !(second = src[%r"\b#{func}\s*\(.*?,(.*?),.*?\)\s*;"m, 1])
-        Logging::message "prototype for #{func}() not found"
-        false
-      else
-        Logging::message $&+"\n"
-        /\bconst\b/ =~ second
-      end
-    end
-    $defs.push('-DICONV_INPTR_CONST')
-  end
-  have_func("iconvlist", "iconv.h")
-  have_func("__iconv_free_list", "iconv.h")
-  if conf
-    prefix = '$(srcdir)'
-    prefix =  $nmake ? "{#{prefix}}" : "#{prefix}/"
-    if $extout
-      wrapper = "$(RUBYARCHDIR)/iconv.rb"
-    else
-      wrapper = "./iconv.rb"
-      $INSTALLFILES = [[wrapper, "$(RUBYARCHDIR)"]]
-    end
-    if String === conf
-      require 'uri'
-      scheme = URI.parse(conf).scheme
-    else
-      conf = "$(srcdir)/config.charset"
-    end
-    $cleanfiles << wrapper
-  end
-  create_makefile("iconv")
-  if conf
-    open("Makefile", "a") do |mf|
-      mf.print("\nall: #{wrapper}\n\n#{wrapper}: #{prefix}charset_alias.rb")
-      mf.print(" ", conf) unless scheme
-      mf.print("\n\t$(RUBY) $(srcdir)/charset_alias.rb #{conf} $@\n")
-    end
-  end
-end
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
deleted file mode 100644
index 531745c38d..0000000000
--- a/ext/iconv/iconv.c
+++ /dev/null
@@ -1,1256 +0,0 @@
-/* -*- mode:c; c-file-style:"ruby" -*- */
-/**********************************************************************
-
-  iconv.c -
-
-  $Author$
-  created at: Wed Dec  1 20:28:09 JST 1999
-
-  All the files in this distribution are covered under the Ruby's
-  license (see the file COPYING).
-
-  Documentation by Yukihiro Matsumoto and Gavin Sinclair.
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-#include <errno.h>
-#include <iconv.h>
-#include <assert.h>
-#include "ruby/st.h"
-#include "ruby/encoding.h"
-
-/*
- * Document-class: Iconv
- *
- * == Summary
- *
- * Ruby extension for charset conversion.
- *
- * == Abstract
- *
- * Iconv is a wrapper class for the UNIX 95 <tt>iconv()</tt> function family,
- * which translates string between various encoding systems.
- *
- * See Open Group's on-line documents for more details.
- * * <tt>iconv.h</tt>:       http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.h.html
- * * <tt>iconv_open()</tt>:  http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_open.html
- * * <tt>iconv()</tt>:       http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html
- * * <tt>iconv_close()</tt>: http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_close.html
- *
- * Which coding systems are available is platform-dependent.
- *
- * == Examples
- *
- * 1. Simple conversion between two charsets.
- *
- *      converted_text = Iconv.conv('iso-8859-15', 'utf-8', text)
- *
- * 2. Instantiate a new Iconv and use method Iconv#iconv.
- *
- *      cd = Iconv.new(to, from)
- *      begin
- *        input.each { |s| output << cd.iconv(s) }
- *        output << cd.iconv(nil)                   # Don't forget this!
- *      ensure
- *        cd.close
- *      end
- *
- * 3. Invoke Iconv.open with a block.
- *
- *      Iconv.open(to, from) do |cd|
- *        input.each { |s| output << cd.iconv(s) }
- *        output << cd.iconv(nil)
- *      end
- *
- * 4. Shorthand for (3).
- *
- *      Iconv.iconv(to, from, *input.to_a)
- *
- * == Attentions
- *
- * Even if some extentions of implementation dependent are useful,
- * DON'T USE those extentions in libraries and scripts to widely distribute.
- * If you want to use those feature, use String#encode.
- */
-
-/* Invalid value for iconv_t is -1 but 0 for VALUE, I hope VALUE is
-   big enough to keep iconv_t */
-#define VALUE2ICONV(v) ((iconv_t)((VALUE)(v) ^ -1))
-#define ICONV2VALUE(c) ((VALUE)(c) ^ -1)
-
-struct iconv_env_t
-{
-    iconv_t cd;
-    int argc;
-    VALUE *argv;
-    VALUE ret;
-    int toidx;
-    VALUE (*append)_((VALUE, VALUE));
-};
-
-struct rb_iconv_opt_t
-{
-    VALUE transliterate;
-    VALUE discard_ilseq;
-};
-
-static ID id_transliterate, id_discard_ilseq;
-
-static VALUE rb_eIconvInvalidEncoding;
-static VALUE rb_eIconvFailure;
-static VALUE rb_eIconvIllegalSeq;
-static VALUE rb_eIconvInvalidChar;
-static VALUE rb_eIconvOutOfRange;
-static VALUE rb_eIconvBrokenLibrary;
-
-static ID rb_success, rb_failed;
-static VALUE iconv_fail _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg));
-static VALUE iconv_fail_retry _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg));
-static VALUE iconv_failure_initialize _((VALUE error, VALUE mesg, VALUE success, VALUE failed));
-static VALUE iconv_failure_success _((VALUE self));
-static VALUE iconv_failure_failed _((VALUE self));
-
-static iconv_t iconv_create _((VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx));
-static void iconv_dfree _((void *cd));
-static VALUE iconv_free _((VALUE cd));
-static VALUE iconv_try _((iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen));
-static VALUE rb_str_derive _((VALUE str, const char* ptr, long len));
-static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, int toidx,
-			      struct iconv_env_t* env));
-static VALUE iconv_s_allocate _((VALUE klass));
-static VALUE iconv_initialize _((int argc, VALUE *argv, VALUE self));
-static VALUE iconv_s_open _((int argc, VALUE *argv, VALUE self));
-static VALUE iconv_s_convert _((struct iconv_env_t* env));
-static VALUE iconv_s_iconv _((int argc, VALUE *argv, VALUE self));
-static VALUE iconv_init_state _((VALUE cd));
-static VALUE iconv_finish _((VALUE self));
-static VALUE iconv_iconv _((int argc, VALUE *argv, VALUE self));
-static VALUE iconv_conv _((int argc, VALUE *argv, VALUE self));
-
-static VALUE charset_map;
-
-/*
- * Document-method: charset_map
- * call-seq: Iconv.charset_map
- *
- * Returns the map from canonical name to system dependent name.
- */
-static VALUE
-charset_map_get(void)
-{
-    return charset_map;
-}
-
-static VALUE
-strip_glibc_option(VALUE *code)
-{
-    VALUE val = StringValue(*code);
-    const char *ptr = RSTRING_PTR(val), *pend = RSTRING_END(val);
-    const char *slash = memchr(ptr, '/', pend - ptr);
-
-    if (slash && slash < pend - 1 && slash[1] ==  '/') {
-	VALUE opt = rb_str_subseq(val, slash - ptr, pend - slash);
-	val = rb_str_subseq(val, 0, slash - ptr);
-	*code = val;
-	return opt;
-    }
-    return 0;
-}
-
-static char *
-map_charset(VALUE *code)
-{
-    VALUE val = StringValue(*code);
-
-    if (RHASH_SIZE(charset_map)) {
-	st_data_t data;
-	VALUE key = rb_funcall2(val, rb_intern("downcase"), 0, 0);
-	StringValuePtr(key);
-	if (st_lookup(RHASH_TBL(charset_map), key, &data)) {
-	    *code = (VALUE)data;
-	}
-    }
-    return StringValuePtr(*code);
-}
-
-NORETURN(static void rb_iconv_sys_fail(const char *s));
-static void
-rb_iconv_sys_fail(const char *s)
-{
-    if (errno == 0) {
-	rb_exc_raise(iconv_fail(rb_eIconvBrokenLibrary, Qnil, Qnil, NULL, s));
-    }
-    rb_sys_fail(s);
-}
-
-#define rb_sys_fail(s) rb_iconv_sys_fail(s)
-
-static iconv_t
-iconv_create(VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx)
-{
-    VALUE toopt = strip_glibc_option(&to);
-    VALUE fromopt = strip_glibc_option(&from);
-    VALUE toenc = 0, fromenc = 0;
-    const char* tocode = map_charset(&to);
-    const char* fromcode = map_charset(&from);
-    iconv_t cd;
-    int retry = 0;
-
-    *idx = rb_enc_find_index(tocode);
-
-    if (toopt) {
-	toenc = rb_str_plus(to, toopt);
-	tocode = RSTRING_PTR(toenc);
-    }
-    if (fromopt) {
-	fromenc = rb_str_plus(from, fromopt);
-	fromcode = RSTRING_PTR(fromenc);
-    }
-    while ((cd = iconv_open(tocode, fromcode)) == (iconv_t)-1) {
-	int inval = 0;
-	switch (errno) {
-	  case EMFILE:
-	  case ENFILE:
-	  case ENOMEM:
-	    if (!retry++) {
-		rb_gc();
-		continue;
-	    }
-	    break;
-	  case EINVAL:
-	    retry = 0;
-	    inval = 1;
-	    if (toenc) {
-		tocode = RSTRING_PTR(to);
-		rb_str_resize(toenc, 0);
-		toenc = 0;
-		continue;
-	    }
-	    if (fromenc) {
-		fromcode = RSTRING_PTR(from);
-		rb_str_resize(fromenc, 0);
-		fromenc = 0;
-		continue;
-	    }
-	    break;
-	}
-	{
-	    const char *s = inval ? "invalid encoding " : "iconv";
-	    volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING_LEN(to) +
-					    RSTRING_LEN(from) + 8);
-
-	    sprintf(RSTRING_PTR(msg), "%s(\"%s\", \"%s\")",
-		    s, RSTRING_PTR(to), RSTRING_PTR(from));
-	    s = RSTRING_PTR(msg);
-	    rb_str_set_len(msg, strlen(s));
-	    if (!inval) rb_sys_fail(s);
-	    rb_exc_raise(iconv_fail(rb_eIconvInvalidEncoding, Qnil,
-				    rb_ary_new3(2, to, from), NULL, s));
-	}
-    }
-
-    if (toopt || fromopt) {
-	if (toopt && fromopt && RTEST(rb_str_equal(toopt, fromopt))) {
-	    fromopt = 0;
-	}
-	if (toopt && fromopt) {
-	    rb_warning("encoding option isn't portable: %s, %s",
-		       RSTRING_PTR(toopt) + 2, RSTRING_PTR(fromopt) + 2);
-	}
-	else {
-	    rb_warning("encoding option isn't portable: %s",
-		       (toopt ? RSTRING_PTR(toopt) : RSTRING_PTR(fromopt)) + 2);
-	}
-    }
-
-    if (opt) {
-#ifdef ICONV_SET_TRANSLITERATE
-	if (opt->transliterate != Qundef) {
-	    int flag = RTEST(opt->transliterate);
-	    rb_warning("encoding option isn't portable: transliterate");
-	    if (iconvctl(cd, ICONV_SET_TRANSLITERATE, (void *)&flag))
-		rb_sys_fail("ICONV_SET_TRANSLITERATE");
-	}
-#endif
-#ifdef ICONV_SET_DISCARD_ILSEQ
-	if (opt->discard_ilseq != Qundef) {
-	    int flag = RTEST(opt->discard_ilseq);
-	    rb_warning("encoding option isn't portable: discard_ilseq");
-	    if (iconvctl(cd, ICONV_SET_DISCARD_ILSEQ, (void *)&flag))
-		rb_sys_fail("ICONV_SET_DISCARD_ILSEQ");
-	}
-#endif
-    }
-
-    return cd;
-}
-
-static void
-iconv_dfree(void *cd)
-{
-    iconv_close(VALUE2ICONV(cd));
-}
-
-#define ICONV_FREE iconv_dfree
-
-static VALUE
-iconv_free(VALUE cd)
-{
-    if (cd && iconv_close(VALUE2ICONV(cd)) == -1)
-	rb_sys_fail("iconv_close");
-    return Qnil;
-}
-
-static VALUE
-check_iconv(VALUE obj)
-{
-    Check_Type(obj, T_DATA);
-    if (RDATA(obj)->dfree != ICONV_FREE) {
-	rb_raise(rb_eArgError, "Iconv expected (%s)", rb_class2name(CLASS_OF(obj)));
-    }
-    return (VALUE)DATA_PTR(obj);
-}
-
-static VALUE
-iconv_try(iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)
-{
-#ifdef ICONV_INPTR_CONST
-#define ICONV_INPTR_CAST
-#else
-#define ICONV_INPTR_CAST (char **)
-#endif
-    size_t ret;
-
-    errno = 0;
-    ret = iconv(cd, ICONV_INPTR_CAST inptr, inlen, outptr, outlen);
-    if (ret == (size_t)-1) {
-	if (!*inlen)
-	    return Qfalse;
-	switch (errno) {
-	  case E2BIG:
-	    /* try the left in next loop */
-	    break;
-	  case EILSEQ:
-	    return rb_eIconvIllegalSeq;
-	  case EINVAL:
-	    return rb_eIconvInvalidChar;
-	  case 0:
-	    return rb_eIconvBrokenLibrary;
-	  default:
-	    rb_sys_fail("iconv");
-	}
-    }
-    else if (*inlen > 0) {
-	/* something goes wrong */
-	return rb_eIconvIllegalSeq;
-    }
-    else if (ret) {
-	return Qnil;		/* conversion */
-    }
-    return Qfalse;
-}
-
-#define FAILED_MAXLEN 16
-
-static VALUE
-iconv_failure_initialize(VALUE error, VALUE mesg, VALUE success, VALUE failed)
-{
-    rb_call_super(1, &mesg);
-    rb_ivar_set(error, rb_success, success);
-    rb_ivar_set(error, rb_failed, failed);
-    return error;
-}
-
-static VALUE
-iconv_fail(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
-{
-    VALUE args[3];
-
-    if (mesg && *mesg) {
-	args[0] = rb_str_new2(mesg);
-    }
-    else if (TYPE(failed) != T_STRING || RSTRING_LEN(failed) < FAILED_MAXLEN) {
-	args[0] = rb_inspect(failed);
-    }
-    else {
-	args[0] = rb_inspect(rb_str_substr(failed, 0, FAILED_MAXLEN));
-	rb_str_cat2(args[0], "...");
-    }
-    args[1] = success;
-    args[2] = failed;
-    if (env) {
-	args[1] = env->append(rb_obj_dup(env->ret), success);
-	if (env->argc > 0) {
-	    *(env->argv) = failed;
-	    args[2] = rb_ary_new4(env->argc, env->argv);
-	}
-    }
-    return rb_class_new_instance(3, args, error);
-}
-
-static VALUE
-iconv_fail_retry(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
-{
-    error = iconv_fail(error, success, failed, env, mesg);
-    if (!rb_block_given_p()) rb_exc_raise(error);
-    rb_set_errinfo(error);
-    return rb_yield(failed);
-}
-
-static VALUE
-rb_str_derive(VALUE str, const char* ptr, long len)
-{
-    VALUE ret;
-
-    if (NIL_P(str))
-	return rb_str_new(ptr, len);
-    if (RSTRING_PTR(str) + RSTRING_LEN(str) == ptr + len)
-	ret = rb_str_subseq(str, ptr - RSTRING_PTR(str), len);
-    else
-	ret = rb_str_new(ptr, len);
-    OBJ_INFECT(ret, str);
-    return ret;
-}
-
-static VALUE
-iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct iconv_env_t* env)
-{
-    VALUE ret = Qfalse;
-    VALUE error = Qfalse;
-    VALUE rescue;
-    const char *inptr, *instart;
-    size_t inlen;
-    /* I believe ONE CHARACTER never exceed this. */
-    char buffer[BUFSIZ];
-    char *outptr;
-    size_t outlen;
-
-    if (cd == (iconv_t)-1)
-	rb_raise(rb_eArgError, "closed iconv");
-
-    if (NIL_P(str)) {
-	/* Reset output pointer or something. */
-	inptr = "";
-	inlen = 0;
-	outptr = buffer;
-	outlen = sizeof(buffer);
-	error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen);
-	if (RTEST(error)) {
-	    unsigned int i;
-	    rescue = iconv_fail_retry(error, Qnil, Qnil, env, 0);
-	    if (TYPE(rescue) == T_ARRAY) {
-		str = RARRAY_LEN(rescue) > 0 ? RARRAY_PTR(rescue)[0] : Qnil;
-	    }
-	    if (FIXNUM_P(str) && (i = FIX2INT(str)) <= 0xff) {
-		char c = i;
-		str = rb_str_new(&c, 1);
-	    }
-	    else if (!NIL_P(str)) {
-		StringValue(str);
-	    }
-	}
-
-	inptr = NULL;
-	length = 0;
-    }
-    else {
-	long slen;
-
-	StringValue(str);
-	slen = RSTRING_LEN(str);
-	inptr = RSTRING_PTR(str);
-
-	inptr += start;
-	if (length < 0 || length > start + slen)
-	    length = slen - start;
-    }
-    instart = inptr;
-    inlen = length;
-
-    do {
-	char errmsg[50];
-	const char *tmpstart = inptr;
-	outptr = buffer;
-	outlen = sizeof(buffer);
-
-	errmsg[0] = 0;
-	error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen);
-
-	if (
-#if SIGNEDNESS_OF_SIZE_T < 0
-	    0 <= outlen &&
-#endif
-	    outlen <= sizeof(buffer)) {
-	    outlen = sizeof(buffer) - outlen;
-	    if (NIL_P(error) ||	/* something converted */
-		outlen > (size_t)(inptr - tmpstart) || /* input can't contain output */
-		(outlen < (size_t)(inptr - tmpstart) && inlen > 0) || /* something skipped */
-		memcmp(buffer, tmpstart, outlen)) /* something differs */
-	    {
-		if (NIL_P(str)) {
-		    ret = rb_str_new(buffer, outlen);
-		    if (toidx >= 0) rb_enc_associate_index(ret, toidx);
-		}
-		else {
-		    if (ret) {
-			ret = rb_str_buf_cat(ret, instart, tmpstart - instart);
-		    }
-		    else {
-			ret = rb_str_new(instart, tmpstart - instart);
-			if (toidx >= 0) rb_enc_associate_index(ret, toidx);
-			OBJ_INFECT(ret, str);
-		    }
-		    ret = rb_str_buf_cat(ret, buffer, outlen);
-		    instart = inptr;
-		}
-	    }
-	    else if (!inlen) {
-		inptr = tmpstart + outlen;
-	    }
-	}
-	else {
-	    /* Some iconv() have a bug, return *outlen out of range */
-	    sprintf(errmsg, "bug?(output length = %ld)", (long)(sizeof(buffer) - outlen));
-	    error = rb_eIconvOutOfRange;
-	}
-
-	if (RTEST(error)) {
-	    long len = 0;
-
-	    if (!ret) {
-		ret = rb_str_derive(str, instart, inptr - instart);
-		if (toidx >= 0) rb_enc_associate_index(ret, toidx);
-	    }
-	    else if (inptr > instart) {
-		rb_str_cat(ret, instart, inptr - instart);
-	    }
-	    str = rb_str_derive(str, inptr, inlen);
-	    rescue = iconv_fail_retry(error, ret, str, env, errmsg);
-	    if (TYPE(rescue) == T_ARRAY) {
-		if ((len = RARRAY_LEN(rescue)) > 0)
-		    rb_str_concat(ret, RARRAY_PTR(rescue)[0]);
-		if (len > 1 && !NIL_P(str = RARRAY_PTR(rescue)[1])) {
-		    StringValue(str);
-		    inlen = length = RSTRING_LEN(str);
-		    instart = inptr = RSTRING_PTR(str);
-		    continue;
-		}
-	    }
-	    else if (!NIL_P(rescue)) {
-		rb_str_concat(ret, rescue);
-	    }
-	    break;
-	}
-    } while (inlen > 0);
-
-    if (!ret) {
-	ret = rb_str_derive(str, instart, inptr - instart);
-	if (toidx >= 0) rb_enc_associate_index(ret, toidx);
-    }
-    else if (inptr > instart) {
-	rb_str_cat(ret, instart, inptr - instart);
-    }
-    return ret;
-}
-
-static VALUE
-iconv_s_allocate(VALUE klass)
-{
-    return Data_Wrap_Struct(klass, 0, ICONV_FREE, 0);
-}
-
-static VALUE
-get_iconv_opt_i(VALUE i, VALUE arg)
-{
-    struct rb_iconv_opt_t *opt = (struct rb_iconv_opt_t *)arg;
-    VALUE name, val;
-
-    (void)opt;
-    i = rb_Array(i);
-    name = rb_ary_entry(i, 0);
-    val = rb_ary_entry(i, 1);
-    do {
-	if (SYMBOL_P(name)) {
-	    ID id = SYM2ID(name);
-	    if (id == id_transliterate) {
-#ifdef ICONV_SET_TRANSLITERATE
-		opt->transliterate = val;
-#else
-		rb_notimplement();
-#endif
-		break;
-	    }
-	    if (id == id_discard_ilseq) {
-#ifdef ICONV_SET_DISCARD_ILSEQ
-		opt->discard_ilseq = val;
-#else
-		rb_notimplement();
-#endif
-		break;
-	    }
-	}
-	else {
-	    const char *s = StringValueCStr(name);
-	    if (strcmp(s, "transliterate") == 0) {
-#ifdef ICONV_SET_TRANSLITERATE
-		opt->transliterate = val;
-#else
-		rb_notimplement();
-#endif
-		break;
-	    }
-	    if (strcmp(s, "discard_ilseq") == 0) {
-#ifdef ICONV_SET_DISCARD_ILSEQ
-		opt->discard_ilseq = val;
-#else
-		rb_notimplement();
-#endif
-		break;
-	    }
-	}
-	name = rb_inspect(name);
-	rb_raise(rb_eArgError, "unknown option - %s", StringValueCStr(name));
-    } while (0);
-    return Qnil;
-}
-
-static void
-get_iconv_opt(struct rb_iconv_opt_t *opt, VALUE options)
-{
-    opt->transliterate = Qundef;
-    opt->discard_ilseq = Qundef;
-    if (!NIL_P(options)) {
-	rb_block_call(options, rb_intern("each"), 0, 0, get_iconv_opt_i, (VALUE)opt);
-    }
-}
-
-#define iconv_ctl(self, func, val) (\
-	iconvctl(VALUE2ICONV(check_iconv(self)), func, (void *)&(val)) ? \
-	rb_sys_fail(#func) : (void)0)
-
-/*
- * Document-method: new
- * call-seq: Iconv.new(to, from, [options])
- *
- * Creates new code converter from a coding-system designated with +from+
- * to another one designated with +to+.
- *
- * === Parameters
- *
- * +to+::   encoding name for destination
- * +from+:: encoding name for source
- * +options+:: options for converter
- *
- * === Exceptions
- *
- * TypeError::       if +to+ or +from+ aren't String
- * InvalidEncoding:: if designated converter couldn't find out
- * SystemCallError:: if <tt>iconv_open(3)</tt> fails
- */
-static VALUE
-iconv_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE to, from, options;
-    struct rb_iconv_opt_t opt;
-    int idx;
-
-    rb_scan_args(argc, argv, "21", &to, &from, &options);
-    get_iconv_opt(&opt, options);
-    iconv_free(check_iconv(self));
-    DATA_PTR(self) = NULL;
-    DATA_PTR(self) = (void *)ICONV2VALUE(iconv_create(to, from, &opt, &idx));
-    if (idx >= 0) ENCODING_SET(self, idx);
-    return self;
-}
-
-/*
- * Document-method: open
- * call-seq: Iconv.open(to, from) { |iconv| ... }
- *
- * Equivalent to Iconv.new except that when it is called with a block, it
- * yields with the new instance and closes it, and returns the result which
- * returned from the block.
- */
-static VALUE
-iconv_s_open(int argc, VALUE *argv, VALUE self)
-{
-    VALUE to, from, options, cd;
-    struct rb_iconv_opt_t opt;
-    int idx;
-
-    rb_scan_args(argc, argv, "21", &to, &from, &options);
-    get_iconv_opt(&opt, options);
-    cd = ICONV2VALUE(iconv_create(to, from, &opt, &idx));
-
-    self = Data_Wrap_Struct(self, NULL, ICONV_FREE, (void *)cd);
-    if (idx >= 0) ENCODING_SET(self, idx);
-
-    if (rb_block_given_p()) {
-	return rb_ensure(rb_yield, self, (VALUE(*)())iconv_finish, self);
-    }
-    else {
-	return self;
-    }
-}
-
-static VALUE
-iconv_s_convert(struct iconv_env_t* env)
-{
-    VALUE last = 0;
-
-    for (; env->argc > 0; --env->argc, ++env->argv) {
-	VALUE s = iconv_convert(env->cd, last = *(env->argv),
-				0, -1, env->toidx, env);
-	env->append(env->ret, s);
-    }
-
-    if (!NIL_P(last)) {
-	VALUE s = iconv_convert(env->cd, Qnil, 0, 0, env->toidx, env);
-	if (RSTRING_LEN(s))
-	    env->append(env->ret, s);
-    }
-
-    return env->ret;
-}
-
-/*
- * Document-method: Iconv::iconv
- * call-seq: Iconv.iconv(to, from, *strs)
- *
- * Shorthand for
- *   Iconv.open(to, from) { |cd|
- *     (strs + [nil]).collect { |s| cd.iconv(s) }
- *   }
- *
- * === Parameters
- *
- * <tt>to, from</tt>:: see Iconv.new
- * <tt>strs</tt>:: strings to be converted
- *
- * === Exceptions
- *
- * Exceptions thrown by Iconv.new, Iconv.open and Iconv#iconv.
- */
-static VALUE
-iconv_s_iconv(int argc, VALUE *argv, VALUE self)
-{
-    struct iconv_env_t arg;
-
-    if (argc < 2)		/* needs `to' and `from' arguments at least */
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, 2);
-
-    arg.argc = argc -= 2;
-    arg.argv = argv + 2;
-    arg.append = rb_ary_push;
-    arg.ret = rb_ary_new2(argc);
-    arg.cd = iconv_create(argv[0], argv[1], NULL, &arg.toidx);
-    return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
-}
-
-/*
- * Document-method: Iconv::conv
- * call-seq: Iconv.conv(to, from, str)
- *
- * Shorthand for
- *   Iconv.iconv(to, from, str).join
- * See Iconv.iconv.
- */
-static VALUE
-iconv_s_conv(VALUE self, VALUE to, VALUE from, VALUE str)
-{
-    struct iconv_env_t arg;
-
-    arg.argc = 1;
-    arg.argv = &str;
-    arg.append = rb_str_append;
-    arg.ret = rb_str_new(0, 0);
-    arg.cd = iconv_create(to, from, NULL, &arg.toidx);
-    return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
-}
-
-/*
- * Document-method: list
- * call-seq: Iconv.list {|*aliases| ... }
- *
- * Iterates each alias sets.
- */
-
-#ifdef HAVE_ICONVLIST
-struct iconv_name_list
-{
-    unsigned int namescount;
-    const char *const *names;
-    VALUE array;
-};
-
-static VALUE
-list_iconv_i(VALUE ptr)
-{
-    struct iconv_name_list *p = (struct iconv_name_list *)ptr;
-    unsigned int i, namescount = p->namescount;
-    const char *const *names = p->names;
-    VALUE ary = rb_ary_new2(namescount);
-
-    for (i = 0; i < namescount; i++) {
-	rb_ary_push(ary, rb_str_new2(names[i]));
-    }
-    if (p->array) {
-	return rb_ary_push(p->array, ary);
-    }
-    return rb_yield(ary);
-}
-
-static int
-list_iconv(unsigned int namescount, const char *const *names, void *data)
-{
-    int *state = data;
-    struct iconv_name_list list;
-
-    list.namescount = namescount;
-    list.names = names;
-    list.array = ((VALUE *)data)[1];
-    rb_protect(list_iconv_i, (VALUE)&list, state);
-    return *state;
-}
-#endif
-
-#if defined(HAVE_ICONVLIST) || defined(HAVE___ICONV_FREE_LIST)
-static VALUE
-iconv_s_list(void)
-{
-#ifdef HAVE_ICONVLIST
-    int state;
-    VALUE args[2];
-
-    args[1] = rb_block_given_p() ? 0 : rb_ary_new();
-    iconvlist(list_iconv, args);
-    state = *(int *)args;
-    if (state) rb_jump_tag(state);
-    if (args[1]) return args[1];
-#elif defined(HAVE___ICONV_FREE_LIST)
-    char **list;
-    size_t sz, i;
-    VALUE ary;
-
-    if (__iconv_get_list(&list, &sz)) return Qnil;
-
-    ary = rb_ary_new2(sz);
-    for (i = 0; i < sz; i++) {
-	rb_ary_push(ary, rb_str_new2(list[i]));
-    }
-    __iconv_free_list(list, sz);
-
-    if (!rb_block_given_p())
-	return ary;
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
-	rb_yield(RARRAY_PTR(ary)[i]);
-    }
-#endif
-    return Qnil;
-}
-#else
-#define iconv_s_list rb_f_notimplement
-#endif
-
-/*
- * Document-method: close
- *
- * Finishes conversion.
- *
- * After calling this, calling Iconv#iconv will cause an exception, but
- * multiple calls of #close are guaranteed to end successfully.
- *
- * Returns a string containing the byte sequence to change the output buffer to
- * its initial shift state.
- */
-static VALUE
-iconv_init_state(VALUE self)
-{
-    iconv_t cd = VALUE2ICONV((VALUE)DATA_PTR(self));
-    DATA_PTR(self) = NULL;
-    return iconv_convert(cd, Qnil, 0, 0, ENCODING_GET(self), NULL);
-}
-
-static VALUE
-iconv_finish(VALUE self)
-{
-    VALUE cd = check_iconv(self);
-
-    if (!cd) return Qnil;
-    return rb_ensure(iconv_init_state, self, iconv_free, cd);
-}
-
-/*
- * Document-method: Iconv#iconv
- * call-seq: iconv(str, start=0, length=-1)
- *
- * Converts string and returns the result.
- * * If +str+ is a String, converts <tt>str[start, length]</tt> and returns the converted string.
- * * If +str+ is +nil+, places converter itself into initial shift state and
- *   just returns a string containing the byte sequence to change the output
- *   buffer to its initial shift state.
- * * Otherwise, raises an exception.
- *
- * === Parameters
- *
- * str::    string to be converted, or nil
- * start::  starting offset
- * length:: conversion length; nil or -1 means whole the string from start
- *
- * === Exceptions
- *
- * * IconvIllegalSequence
- * * IconvInvalidCharacter
- * * IconvOutOfRange
- *
- * === Examples
- *
- * See the Iconv documentation.
- */
-static VALUE
-iconv_iconv(int argc, VALUE *argv, VALUE self)
-{
-    VALUE str, n1, n2;
-    VALUE cd = check_iconv(self);
-    long start = 0, length = 0, slen = 0;
-
-    rb_scan_args(argc, argv, "12", &str, &n1, &n2);
-    if (!NIL_P(str)) {
-	VALUE n = rb_str_length(StringValue(str));
-	slen = NUM2LONG(n);
-    }
-    if (argc != 2 || !RTEST(rb_range_beg_len(n1, &start, &length, slen, 0))) {
-	if (NIL_P(n1) || ((start = NUM2LONG(n1)) < 0 ? (start += slen) >= 0 : start < slen)) {
-	    length = NIL_P(n2) ? -1 : NUM2LONG(n2);
-	}
-    }
-    if (start > 0 || length > 0) {
-	rb_encoding *enc = rb_enc_get(str);
-	const char *s = RSTRING_PTR(str), *e = s + RSTRING_LEN(str);
-	const char *ps = s;
-	if (start > 0) {
-	    start = (ps = rb_enc_nth(s, e, start, enc)) - s;
-	}
-	if (length > 0) {
-	    length = rb_enc_nth(ps, e, length, enc) - ps;
-	}
-    }
-
-    return iconv_convert(VALUE2ICONV(cd), str, start, length, ENCODING_GET(self), NULL);
-}
-
-/*
- * Document-method: conv
- * call-seq: conv(str...)
- *
- * Equivalent to
- *
- *   iconv(nil, str..., nil).join
- */
-static VALUE
-iconv_conv(int argc, VALUE *argv, VALUE self)
-{
-    iconv_t cd = VALUE2ICONV(check_iconv(self));
-    VALUE str, s;
-    int toidx = ENCODING_GET(self);
-
-    str = iconv_convert(cd, Qnil, 0, 0, toidx, NULL);
-    if (argc > 0) {
-	do {
-	    s = iconv_convert(cd, *argv++, 0, -1, toidx, NULL);
-	    if (RSTRING_LEN(s))
-		rb_str_buf_append(str, s);
-	} while (--argc);
-	s = iconv_convert(cd, Qnil, 0, 0, toidx, NULL);
-	if (RSTRING_LEN(s))
-	    rb_str_buf_append(str, s);
-    }
-
-    return str;
-}
-
-#ifdef ICONV_TRIVIALP
-/*
- * Document-method: trivial?
- * call-seq: trivial?
- *
- * Returns trivial flag.
- */
-static VALUE
-iconv_trivialp(VALUE self)
-{
-    int trivial = 0;
-    iconv_ctl(self, ICONV_TRIVIALP, trivial);
-    if (trivial) return Qtrue;
-    return Qfalse;
-}
-#else
-#define iconv_trivialp rb_f_notimplement
-#endif
-
-#ifdef ICONV_GET_TRANSLITERATE
-/*
- * Document-method: transliterate?
- * call-seq: transliterate?
- *
- * Returns transliterate flag.
- */
-static VALUE
-iconv_get_transliterate(VALUE self)
-{
-    int trans = 0;
-    iconv_ctl(self, ICONV_GET_TRANSLITERATE, trans);
-    if (trans) return Qtrue;
-    return Qfalse;
-}
-#else
-#define iconv_get_transliterate rb_f_notimplement
-#endif
-
-#ifdef ICONV_SET_TRANSLITERATE
-/*
- * Document-method: transliterate=
- * call-seq: cd.transliterate = flag
- *
- * Sets transliterate flag.
- */
-static VALUE
-iconv_set_transliterate(VALUE self, VALUE transliterate)
-{
-    int trans = RTEST(transliterate);
-    iconv_ctl(self, ICONV_SET_TRANSLITERATE, trans);
-    return self;
-}
-#else
-#define iconv_set_transliterate rb_f_notimplement
-#endif
-
-#ifdef ICONV_GET_DISCARD_ILSEQ
-/*
- * Document-method: discard_ilseq?
- * call-seq: discard_ilseq?
- *
- * Returns discard_ilseq flag.
- */
-static VALUE
-iconv_get_discard_ilseq(VALUE self)
-{
-    int dis = 0;
-    iconv_ctl(self, ICONV_GET_DISCARD_ILSEQ, dis);
-    if (dis) return Qtrue;
-    return Qfalse;
-}
-#else
-#define iconv_get_discard_ilseq rb_f_notimplement
-#endif
-
-#ifdef ICONV_SET_DISCARD_ILSEQ
-/*
- * Document-method: discard_ilseq=
- * call-seq: cd.discard_ilseq = flag
- *
- * Sets discard_ilseq flag.
- */
-static VALUE
-iconv_set_discard_ilseq(VALUE self, VALUE discard_ilseq)
-{
-    int dis = RTEST(discard_ilseq);
-    iconv_ctl(self, ICONV_SET_DISCARD_ILSEQ, dis);
-    return self;
-}
-#else
-#define iconv_set_discard_ilseq rb_f_notimplement
-#endif
-
-/*
- * Document-method: ctlmethods
- * call-seq: Iconv.ctlmethods => array
- *
- * Returns available iconvctl() method list.
- */
-static VALUE
-iconv_s_ctlmethods(VALUE klass)
-{
-    VALUE ary = rb_ary_new();
-#ifdef ICONV_TRIVIALP
-    rb_ary_push(ary, ID2SYM(rb_intern("trivial?")));
-#endif
-#ifdef ICONV_GET_TRANSLITERATE
-    rb_ary_push(ary, ID2SYM(rb_intern("transliterate?")));
-#endif
-#ifdef ICONV_SET_TRANSLITERATE
-    rb_ary_push(ary, ID2SYM(rb_intern("transliterate=")));
-#endif
-#ifdef ICONV_GET_DISCARD_ILSEQ
-    rb_ary_push(ary, ID2SYM(rb_intern("discard_ilseq?")));
-#endif
-#ifdef ICONV_SET_DISCARD_ILSEQ
-    rb_ary_push(ary, ID2SYM(rb_intern("discard_ilseq=")));
-#endif
-    return ary;
-}
-
-/*
- * Document-class: Iconv::Failure
- *
- * Base attributes for Iconv exceptions.
- */
-
-/*
- * Document-method: success
- * call-seq: success
- *
- * Returns string(s) translated successfully until the exception occurred.
- * * In the case of failure occurred within Iconv.iconv, returned
- *   value is an array of strings translated successfully preceding
- *   failure and the last element is string on the way.
- */
-static VALUE
-iconv_failure_success(VALUE self)
-{
-    return rb_attr_get(self, rb_success);
-}
-
-/*
- * Document-method: failed
- * call-seq: failed
- *
- * Returns substring of the original string passed to Iconv that starts at the
- * character caused the exception.
- */
-static VALUE
-iconv_failure_failed(VALUE self)
-{
-    return rb_attr_get(self, rb_failed);
-}
-
-/*
- * Document-method: inspect
- * call-seq: inspect
- *
- * Returns inspected string like as: #<_class_: _success_, _failed_>
- */
-static VALUE
-iconv_failure_inspect(VALUE self)
-{
-    const char *cname = rb_class2name(CLASS_OF(self));
-    VALUE success = rb_attr_get(self, rb_success);
-    VALUE failed = rb_attr_get(self, rb_failed);
-    VALUE str = rb_str_buf_cat2(rb_str_new2("#<"), cname);
-    str = rb_str_buf_cat(str, ": ", 2);
-    str = rb_str_buf_append(str, rb_inspect(success));
-    str = rb_str_buf_cat(str, ", ", 2);
-    str = rb_str_buf_append(str, rb_inspect(failed));
-    return rb_str_buf_cat(str, ">", 1);
-}
-
-/*
- * Document-class: Iconv::InvalidEncoding
- *
- * Requested coding-system is not available on this system.
- */
-
-/*
- * Document-class: Iconv::IllegalSequence
- *
- * Input conversion stopped due to an input byte that does not belong to
- * the input codeset, or the output codeset does not contain the
- * character.
- */
-
-/*
- * Document-class: Iconv::InvalidCharacter
- *
- * Input conversion stopped due to an incomplete character or shift
- * sequence at the end of the input buffer.
- */
-
-/*
- * Document-class: Iconv::OutOfRange
- *
- * Iconv library internal error.  Must not occur.
- */
-
-/*
- * Document-class: Iconv::BrokenLibrary
- *
- * Detected a bug of underlying iconv(3) libray.
- * * returns an error without setting errno properly
- */
-
-static void
-warn_deprecated(void)
-{
-    static const char message[] =
-	": iconv will be deprecated in the future, use String#encode instead.\n";
-    VALUE msg = Qnil, caller = rb_make_backtrace();
-    long i;
-
-    for (i = 1; i < RARRAY_LEN(caller); ++i) {
-	VALUE s = RARRAY_PTR(caller)[i];
-	if (strncmp(RSTRING_PTR(s), "<internal:", 10) != 0) {
-	    msg = s;
-	    break;
-	}
-    }
-    if (NIL_P(msg)) {
-	msg = rb_str_new_cstr(message + 2);
-    }
-    else {
-	rb_str_cat(msg, message, sizeof(message) - 1);
-    }
-    rb_io_puts(1, &msg, rb_stderr);
-}
-
-void
-Init_iconv(void)
-{
-    VALUE rb_cIconv = rb_define_class("Iconv", rb_cData);
-
-    if (!NIL_P(ruby_verbose)) {
-	warn_deprecated();
-    }
-    rb_define_alloc_func(rb_cIconv, iconv_s_allocate);
-    rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, -1);
-    rb_define_singleton_method(rb_cIconv, "iconv", iconv_s_iconv, -1);
-    rb_define_singleton_method(rb_cIconv, "conv", iconv_s_conv, 3);
-    rb_define_singleton_method(rb_cIconv, "list", iconv_s_list, 0);
-    rb_define_singleton_method(rb_cIconv, "ctlmethods", iconv_s_ctlmethods, 0);
-    rb_define_method(rb_cIconv, "initialize", iconv_initialize, -1);
-    rb_define_method(rb_cIconv, "close", iconv_finish, 0);
-    rb_define_method(rb_cIconv, "iconv", iconv_iconv, -1);
-    rb_define_method(rb_cIconv, "conv", iconv_conv, -1);
-    rb_define_method(rb_cIconv, "trivial?", iconv_trivialp, 0);
-    rb_define_method(rb_cIconv, "transliterate?", iconv_get_transliterate, 0);
-    rb_define_method(rb_cIconv, "transliterate=", iconv_set_transliterate, 1);
-    rb_define_method(rb_cIconv, "discard_ilseq?", iconv_get_discard_ilseq, 0);
-    rb_define_method(rb_cIconv, "discard_ilseq=", iconv_set_discard_ilseq, 1);
-
-    rb_eIconvFailure = rb_define_module_under(rb_cIconv, "Failure");
-    rb_define_method(rb_eIconvFailure, "initialize", iconv_failure_initialize, 3);
-    rb_define_method(rb_eIconvFailure, "success", iconv_failure_success, 0);
-    rb_define_method(rb_eIconvFailure, "failed", iconv_failure_failed, 0);
-    rb_define_method(rb_eIconvFailure, "inspect", iconv_failure_inspect, 0);
-
-    rb_eIconvInvalidEncoding = rb_define_class_under(rb_cIconv, "InvalidEncoding", rb_eArgError);
-    rb_eIconvIllegalSeq = rb_define_class_under(rb_cIconv, "IllegalSequence", rb_eArgError);
-    rb_eIconvInvalidChar = rb_define_class_under(rb_cIconv, "InvalidCharacter", rb_eArgError);
-    rb_eIconvOutOfRange = rb_define_class_under(rb_cIconv, "OutOfRange", rb_eRuntimeError);
-    rb_eIconvBrokenLibrary = rb_define_class_under(rb_cIconv, "BrokenLibrary", rb_eRuntimeError);
-    rb_include_module(rb_eIconvInvalidEncoding, rb_eIconvFailure);
-    rb_include_module(rb_eIconvIllegalSeq, rb_eIconvFailure);
-    rb_include_module(rb_eIconvInvalidChar, rb_eIconvFailure);
-    rb_include_module(rb_eIconvOutOfRange, rb_eIconvFailure);
-    rb_include_module(rb_eIconvBrokenLibrary, rb_eIconvFailure);
-
-    rb_success = rb_intern("success");
-    rb_failed = rb_intern("failed");
-    id_transliterate = rb_intern("transliterate");
-    id_discard_ilseq = rb_intern("discard_ilseq");
-
-    rb_gc_register_address(&charset_map);
-    charset_map = rb_hash_new();
-    rb_define_singleton_method(rb_cIconv, "charset_map", charset_map_get, 0);
-}
-
diff --git a/ext/iconv/mkwrapper.rb b/ext/iconv/mkwrapper.rb
deleted file mode 100644
index 44d5fcf194..0000000000
--- a/ext/iconv/mkwrapper.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /usr/bin/ruby
-require 'rbconfig'
-require 'optparse'
-
-# http://www.ctan.org/get/macros/texinfo/texinfo/gnulib/lib/config.charset
-# Tue, 25 Dec 2007 00:00:00 GMT
-
-HEADER = <<SRC
-require 'iconv.so'
-
-class Iconv
-  case RUBY_PLATFORM
-SRC
-
-def charset_alias(config_charset, mapfile = nil)
-  found = nil
-  src = [HEADER]
-  open(config_charset) do |input|
-    input.find {|line| /^case "\$os" in/ =~ line} or return
-    input.each do |line|
-      case line
-      when /^\s*([-\w\*]+(?:\s*\|\s*[-\w\*]+)*)(?=\))/
-        (s = "  when ") << $&.split('|').collect {|targ|
-          targ.strip!
-          tail = targ.chomp!("*") ? '' : '\z'
-          head = targ.slice!(/\A\*/) ? '' : '\A'
-          targ.gsub!(/\*/, '.*')
-          "/#{head}#{targ}#{tail}/"
-        }.join(", ")
-        src << s
-        found = {}
-      when /^\s*echo "(?:\$\w+\.)?([-\w*]+)\s+([-\w]+)"/
-        sys, can = $1, $2
-        can.downcase!
-        unless found[can] or (/\Aen_(?!US\z)/ =~ sys && /\ACP437\z/i =~ can)
-          found[can] = true
-          src << "    charset_map['#{can}'] = '#{sys}'.freeze"
-        end
-      when /^\s*;;/
-        found = nil
-      end
-    end
-  end
-  src << "  end" << "end"
-  if mapfile
-    open(mapfile, "wb") {|f| f.puts(*src)}
-  else
-    puts(*src)
-  end
-end
-
-(1..2) === ARGV.size or abort "usage: #{$0} config_charset [mapfile]"
-charset_alias(*ARGV)
diff --git a/ext/io/console/buildgem.sh b/ext/io/console/buildgem.sh
new file mode 100755
index 0000000000..65fe545e1e
--- /dev/null
+++ b/ext/io/console/buildgem.sh
@@ -0,0 +1,5 @@
+#!/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 87101fea5e..ac5b6a611c 100644
--- a/ext/io/console/console.c
+++ b/ext/io/console/console.c
@@ -3,15 +3,8 @@
  * console IO module
  */
 #include "ruby.h"
-#ifdef HAVE_RUBY_IO_H
 #include "ruby/io.h"
-#else
-#include "rubyio.h"
-#endif
-
-#ifndef HAVE_RB_IO_T
-typedef OpenFile rb_io_t;
-#endif
+#include "ruby/thread.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -30,7 +23,7 @@ typedef struct termios conmode;
 static int
 setattr(int fd, conmode *t)
 {
-    while (tcsetattr(fd, TCSAFLUSH, t)) {
+    while (tcsetattr(fd, TCSANOW, t)) {
 	if (errno != EINTR) return 0;
     }
     return 1;
@@ -56,13 +49,10 @@ typedef struct sgttyb conmode;
 # endif
 #elif defined _WIN32
 #include <winioctl.h>
+#include <conio.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
@@ -85,35 +75,144 @@ getattr(int fd, conmode *t)
 #define SET_LAST_ERROR (0)
 #endif
 
-#ifndef InitVM
-#define InitVM(ext) {void InitVM_##ext(void);InitVM_##ext();}
+static ID id_getc, id_console, id_close, id_min, id_time, id_intr;
+#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);
+}
 #endif
 
-static ID id_getc, id_console;
+typedef struct {
+    int vmin;
+    int vtime;
+    int intr;
+} rawmode_arg_t;
+
+static rawmode_arg_t *
+rawmode_opt(int *argcp, VALUE *argv, int min_argc, int max_argc, rawmode_arg_t *opts)
+{
+    int argc = *argcp;
+    rawmode_arg_t *optp = NULL;
+    VALUE vopts = Qnil;
+    if (argc > min_argc)  {
+	vopts = rb_check_hash_type(argv[argc-1]);
+	if (!NIL_P(vopts)) {
+	    argv[argc-1] = vopts;
+	    vopts = rb_extract_keywords(&argv[argc-1]);
+	    if (!argv[argc-1]) *argcp = --argc;
+	    if (!vopts) vopts = Qnil;
+	}
+    }
+    rb_check_arity(argc, min_argc, max_argc);
+    if (!NIL_P(vopts)) {
+	VALUE vmin = rb_hash_aref(vopts, ID2SYM(id_min));
+	VALUE vtime = rb_hash_aref(vopts, ID2SYM(id_time));
+	VALUE intr = rb_hash_aref(vopts, ID2SYM(id_intr));
+	/* default values by `stty raw` */
+	opts->vmin = 1;
+	opts->vtime = 0;
+	opts->intr = 0;
+	if (!NIL_P(vmin)) {
+	    opts->vmin = NUM2INT(vmin);
+	    optp = opts;
+	}
+	if (!NIL_P(vtime)) {
+	    VALUE v10 = INT2FIX(10);
+	    vtime = rb_funcall3(vtime, '*', 1, &v10);
+	    opts->vtime = NUM2INT(vtime);
+	    optp = opts;
+	}
+	switch (intr) {
+	  case Qtrue:
+	    opts->intr = 1;
+	    optp = opts;
+	    break;
+	  case Qfalse:
+	    opts->intr = 0;
+	    optp = opts;
+	    break;
+	  case Qnil:
+	    break;
+	  default:
+	    rb_raise(rb_eArgError, "true or false expected as intr: %"PRIsVALUE,
+		     intr);
+	}
+    }
+    return optp;
+}
 
 static void
-set_rawmode(conmode *t)
+set_rawmode(conmode *t, void *arg)
 {
 #ifdef HAVE_CFMAKERAW
     cfmakeraw(t);
-#else
-#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
-    t->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
+    t->c_lflag &= ~(ECHOE|ECHOK);
+#elif defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
+    t->c_iflag &= ~(IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|INLCR|IGNCR|ICRNL|IXON|IXOFF|IXANY|IMAXBEL);
     t->c_oflag &= ~OPOST;
-    t->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
+    t->c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|ICANON|ISIG|IEXTEN|XCASE);
     t->c_cflag &= ~(CSIZE|PARENB);
     t->c_cflag |= CS8;
+    t->c_cc[VMIN] = 1;
+    t->c_cc[VTIME] = 0;
 #elif defined HAVE_SGTTY_H
     t->sg_flags &= ~ECHO;
     t->sg_flags |= RAW;
 #elif defined _WIN32
     *t = 0;
 #endif
+    if (arg) {
+	const rawmode_arg_t *r = arg;
+#ifdef VMIN
+	if (r->vmin >= 0) t->c_cc[VMIN] = r->vmin;
+#endif
+#ifdef VTIME
+	if (r->vtime >= 0) t->c_cc[VTIME] = r->vtime;
+#endif
+#ifdef ISIG
+	if (r->intr) {
+	    t->c_iflag |= BRKINT|IXON;
+	    t->c_lflag |= ISIG;
+	}
+#endif
+	(void)r;
+    }
+}
+
+static void
+set_cookedmode(conmode *t, void *arg)
+{
+#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
+    t->c_iflag |= (BRKINT|ISTRIP|ICRNL|IXON);
+    t->c_oflag |= OPOST;
+    t->c_lflag |= (ECHO|ECHOE|ECHOK|ECHONL|ICANON|ISIG|IEXTEN);
+#elif defined HAVE_SGTTY_H
+    t->sg_flags |= ECHO;
+    t->sg_flags &= ~RAW;
+#elif defined _WIN32
+    *t |= ENABLE_ECHO_INPUT|ENABLE_LINE_INPUT|ENABLE_PROCESSED_INPUT;
 #endif
 }
 
 static void
-set_noecho(conmode *t)
+set_noecho(conmode *t, void *arg)
 {
 #if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
     t->c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL);
@@ -125,7 +224,7 @@ set_noecho(conmode *t)
 }
 
 static void
-set_echo(conmode *t)
+set_echo(conmode *t, void *arg)
 {
 #if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
     t->c_lflag |= (ECHO | ECHOE | ECHOK | ECHONL);
@@ -140,7 +239,7 @@ static int
 echo_p(conmode *t)
 {
 #if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
-    return (t->c_lflag & (ECHO | ECHOE | ECHOK | ECHONL)) != 0;
+    return (t->c_lflag & (ECHO | ECHONL)) != 0;
 #elif defined HAVE_SGTTY_H
     return (t->sg_flags & ECHO) != 0;
 #elif defined _WIN32
@@ -149,24 +248,17 @@ echo_p(conmode *t)
 }
 
 static int
-set_ttymode(int fd, conmode *t, void (*setter)(conmode *))
+set_ttymode(int fd, conmode *t, void (*setter)(conmode *, void *), void *arg)
 {
     conmode r;
     if (!getattr(fd, t)) return 0;
     r = *t;
-    setter(&r);
+    setter(&r, 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)
 {
@@ -177,12 +269,11 @@ get_write_fd(const rb_io_t *fptr)
     return ofptr->fd;
 }
 #define GetWriteFD(fptr) get_write_fd(fptr)
-#endif
 
 #define FD_PER_IO 2
 
 static VALUE
-ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *))
+ttymode(VALUE io, VALUE (*func)(VALUE), VALUE farg, void (*setter)(conmode *, void *), void *arg)
 {
     rb_io_t *fptr;
     int status = -1;
@@ -194,7 +285,7 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *))
     GetOpenFile(io, fptr);
     fd[0] = GetReadFD(fptr);
     if (fd[0] != -1) {
-	if (set_ttymode(fd[0], t+0, setter)) {
+	if (set_ttymode(fd[0], t+0, setter, arg)) {
 	    status = 0;
 	}
 	else {
@@ -204,7 +295,7 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *))
     }
     fd[1] = GetWriteFD(fptr);
     if (fd[1] != -1 && fd[1] != fd[0]) {
-	if (set_ttymode(fd[1], t+1, setter)) {
+	if (set_ttymode(fd[1], t+1, setter, arg)) {
 	    status = 0;
 	}
 	else {
@@ -213,7 +304,7 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *))
 	}
     }
     if (status == 0) {
-	result = rb_protect(func, io, &status);
+	result = rb_protect(func, farg, &status);
     }
     GetOpenFile(io, fptr);
     if (fd[0] != -1 && fd[0] == GetReadFD(fptr)) {
@@ -230,69 +321,228 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *))
     }
     if (status) {
 	if (status == -1) {
-	    errno = error;
-	    rb_sys_fail(0);
+	    rb_syserr_fail(error, 0);
 	}
 	rb_jump_tag(status);
     }
     return result;
 }
 
+#if !defined _WIN32
+struct ttymode_callback_args {
+    VALUE (*func)(VALUE, VALUE);
+    VALUE io;
+    VALUE farg;
+};
+
+static VALUE
+ttymode_callback(VALUE args)
+{
+    struct ttymode_callback_args *argp = (struct ttymode_callback_args *)args;
+    return argp->func(argp->io, argp->farg);
+}
+
+static VALUE
+ttymode_with_io(VALUE io, VALUE (*func)(VALUE, VALUE), VALUE farg, void (*setter)(conmode *, void *), void *arg)
+{
+    struct ttymode_callback_args cargs;
+    cargs.func = func;
+    cargs.io = io;
+    cargs.farg = farg;
+    return ttymode(io, ttymode_callback, (VALUE)&cargs, setter, arg);
+}
+#endif
+
 /*
  * call-seq:
- *   io.raw {|io| }
+ *   io.raw(min: nil, time: nil) {|io| }
  *
  * Yields +self+ within raw mode.
  *
  *   STDIN.raw(&:gets)
  *
- * will read and return a line with echo back and line editing.
+ * will read and return a line without echo back and line editing.
+ *
+ * The parameter +min+ specifies the minimum number of bytes that
+ * should be received when a read operation is performed. (default: 1)
+ *
+ * The parameter +time+ specifies the timeout in _seconds_ with a
+ * precision of 1/10 of a second. (default: 0)
+ *
+ * Refer to the manual page of termios for further details.
+ *
+ * You must require 'io/console' to use this method.
  */
 static VALUE
-console_raw(VALUE io)
+console_raw(int argc, VALUE *argv, VALUE io)
 {
-    return ttymode(io, rb_yield, set_rawmode);
+    rawmode_arg_t opts, *optp = rawmode_opt(&argc, argv, 0, 0, &opts);
+    return ttymode(io, rb_yield, io, set_rawmode, optp);
 }
 
 /*
  * call-seq:
- *   io.raw!
+ *   io.raw!(min: nil, time: nil)
  *
  * Enables raw mode.
  *
  * If the terminal mode needs to be back, use io.raw { ... }.
+ *
+ * See IO#raw for details on the parameters.
+ *
+ * You must require 'io/console' to use this method.
  */
 static VALUE
-console_set_raw(VALUE io)
+console_set_raw(int argc, VALUE *argv, VALUE io)
 {
     conmode t;
     rb_io_t *fptr;
     int fd;
+    rawmode_arg_t opts, *optp = rawmode_opt(&argc, argv, 0, 0, &opts);
 
     GetOpenFile(io, fptr);
     fd = GetReadFD(fptr);
     if (!getattr(fd, &t)) rb_sys_fail(0);
-    set_rawmode(&t);
+    set_rawmode(&t, optp);
     if (!setattr(fd, &t)) rb_sys_fail(0);
     return io;
 }
 
+/*
+ * call-seq:
+ *   io.cooked {|io| }
+ *
+ * Yields +self+ within cooked mode.
+ *
+ *   STDIN.cooked(&:gets)
+ *
+ * will read and return a line with echo back and line editing.
+ *
+ * You must require 'io/console' to use this method.
+ */
+static VALUE
+console_cooked(VALUE io)
+{
+    return ttymode(io, rb_yield, io, set_cookedmode, NULL);
+}
+
+/*
+ * call-seq:
+ *   io.cooked!
+ *
+ * Enables cooked mode.
+ *
+ * If the terminal mode needs to be back, use io.cooked { ... }.
+ *
+ * You must require 'io/console' to use this method.
+ */
+static VALUE
+console_set_cooked(VALUE io)
+{
+    conmode t;
+    rb_io_t *fptr;
+    int fd;
+
+    GetOpenFile(io, fptr);
+    fd = GetReadFD(fptr);
+    if (!getattr(fd, &t)) rb_sys_fail(0);
+    set_cookedmode(&t, NULL);
+    if (!setattr(fd, &t)) rb_sys_fail(0);
+    return io;
+}
+
+#ifndef _WIN32
 static VALUE
 getc_call(VALUE io)
 {
-    return rb_funcall2(io, id_getc, 0, 0);
+    return rb_funcallv(io, id_getc, 0, 0);
+}
+#else
+static void *
+nogvl_getch(void *p)
+{
+    int len = 0;
+    wint_t *buf = p, c = _getwch();
+
+    switch (c) {
+      case WEOF:
+	break;
+      case 0x00:
+      case 0xe0:
+	buf[len++] = c;
+	c = _getwch();
+	/* fall through */
+      default:
+	buf[len++] = c;
+	break;
+    }
+    return (void *)(VALUE)len;
 }
+#endif
 
 /*
  * call-seq:
- *   io.getch       -> char
+ *   io.getch(min: nil, time: nil)       -> char
  *
  * Reads and returns a character in raw mode.
+ *
+ * See IO#raw for details on the parameters.
+ *
+ * You must require 'io/console' to use this method.
  */
 static VALUE
-console_getch(VALUE io)
+console_getch(int argc, VALUE *argv, VALUE io)
 {
-    return ttymode(io, getc_call, set_rawmode);
+    rawmode_arg_t opts, *optp = rawmode_opt(&argc, argv, 0, 0, &opts);
+#ifndef _WIN32
+    return ttymode(io, getc_call, io, set_rawmode, optp);
+#else
+    rb_io_t *fptr;
+    VALUE str;
+    wint_t c;
+    int w, len;
+    char buf[8];
+    wint_t wbuf[2];
+    struct timeval *to = NULL, tv;
+
+    GetOpenFile(io, fptr);
+    if (optp) {
+	if (optp->vtime) {
+	    to = &tv;
+	    tv.tv_sec = optp->vtime / 10;
+	    tv.tv_usec = (optp->vtime % 10) * 100000;
+	}
+	if (optp->vmin != 1) {
+	    rb_warning("min option ignored");
+	}
+	if (optp->intr) {
+	    w = rb_wait_for_single_fd(fptr->fd, RB_WAITFD_IN, to);
+	    if (w < 0) rb_eof_error();
+	    if (!(w & RB_WAITFD_IN)) return Qnil;
+	}
+	else {
+	    rb_warning("vtime option ignored if intr flag is unset");
+	}
+    }
+    len = (int)(VALUE)rb_thread_call_without_gvl(nogvl_getch, wbuf, RUBY_UBF_IO, 0);
+    switch (len) {
+      case 0:
+	return Qnil;
+      case 2:
+	buf[0] = (char)wbuf[0];
+	c = wbuf[1];
+	len = 1;
+	do {
+	    buf[len++] = (unsigned char)c;
+	} while ((c >>= CHAR_BIT) && len < (int)sizeof(buf));
+	return rb_str_new(buf, len);
+      default:
+	c = wbuf[0];
+	len = rb_uv_to_utf8(buf, c);
+	str = rb_utf8_str_new(buf, len);
+	return rb_str_conv_enc(str, NULL, rb_default_external_encoding());
+    }
+#endif
 }
 
 /*
@@ -304,11 +554,13 @@ console_getch(VALUE io)
  *   STDIN.noecho(&:gets)
  *
  * will read and return a line without echo back.
+ *
+ * You must require 'io/console' to use this method.
  */
 static VALUE
 console_noecho(VALUE io)
 {
-    return ttymode(io, rb_yield, set_noecho);
+    return ttymode(io, rb_yield, io, set_noecho, NULL);
 }
 
 /*
@@ -316,6 +568,10 @@ console_noecho(VALUE io)
  *   io.echo = flag
  *
  * Enables/disables echo back.
+ * On some platforms, all combinations of this flags and raw/cooked
+ * mode may not be valid.
+ *
+ * You must require 'io/console' to use this method.
  */
 static VALUE
 console_set_echo(VALUE io, VALUE f)
@@ -328,9 +584,9 @@ console_set_echo(VALUE io, VALUE f)
     fd = GetReadFD(fptr);
     if (!getattr(fd, &t)) rb_sys_fail(0);
     if (RTEST(f))
-	set_echo(&t);
+	set_echo(&t, NULL);
     else
-	set_noecho(&t);
+	set_noecho(&t, NULL);
     if (!setattr(fd, &t)) rb_sys_fail(0);
     return io;
 }
@@ -340,6 +596,8 @@ console_set_echo(VALUE io, VALUE f)
  *   io.echo?       -> true or false
  *
  * Returns +true+ if echo back is enabled.
+ *
+ * You must require 'io/console' to use this method.
  */
 static VALUE
 console_echo_p(VALUE io)
@@ -354,6 +612,115 @@ console_echo_p(VALUE io)
     return echo_p(&t) ? Qtrue : Qfalse;
 }
 
+static const rb_data_type_t conmode_type = {
+    "console-mode",
+    {0, RUBY_TYPED_DEFAULT_FREE,},
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+static VALUE cConmode;
+
+static VALUE
+conmode_alloc(VALUE klass)
+{
+    return rb_data_typed_object_zalloc(klass, sizeof(conmode), &conmode_type);
+}
+
+static VALUE
+conmode_new(VALUE klass, const conmode *t)
+{
+    VALUE obj = conmode_alloc(klass);
+    *(conmode *)DATA_PTR(obj) = *t;
+    return obj;
+}
+
+static VALUE
+conmode_init_copy(VALUE obj, VALUE obj2)
+{
+    conmode *t = rb_check_typeddata(obj, &conmode_type);
+    conmode *t2 = rb_check_typeddata(obj2, &conmode_type);
+    *t = *t2;
+    return obj;
+}
+
+static VALUE
+conmode_set_echo(VALUE obj, VALUE f)
+{
+    conmode *t = rb_check_typeddata(obj, &conmode_type);
+    if (RTEST(f))
+	set_echo(t, NULL);
+    else
+	set_noecho(t, NULL);
+    return obj;
+}
+
+static VALUE
+conmode_set_raw(int argc, VALUE *argv, VALUE obj)
+{
+    conmode *t = rb_check_typeddata(obj, &conmode_type);
+    rawmode_arg_t opts, *optp = rawmode_opt(&argc, argv, 0, 0, &opts);
+
+    set_rawmode(t, optp);
+    return obj;
+}
+
+static VALUE
+conmode_raw_new(int argc, VALUE *argv, VALUE obj)
+{
+    conmode *r = rb_check_typeddata(obj, &conmode_type);
+    conmode t = *r;
+    rawmode_arg_t opts, *optp = rawmode_opt(&argc, argv, 0, 0, &opts);
+
+    set_rawmode(&t, optp);
+    return conmode_new(rb_obj_class(obj), &t);
+}
+
+/*
+ * call-seq:
+ *   io.console_mode       -> mode
+ *
+ * Returns a data represents the current console mode.
+ *
+ * You must require 'io/console' to use this method.
+ */
+static VALUE
+console_conmode_get(VALUE io)
+{
+    conmode t;
+    rb_io_t *fptr;
+    int fd;
+
+    GetOpenFile(io, fptr);
+    fd = GetReadFD(fptr);
+    if (!getattr(fd, &t)) rb_sys_fail(0);
+
+    return conmode_new(cConmode, &t);
+}
+
+/*
+ * call-seq:
+ *   io.console_mode = mode
+ *
+ * Sets the console mode to +mode+.
+ *
+ * You must require 'io/console' to use this method.
+ */
+static VALUE
+console_conmode_set(VALUE io, VALUE mode)
+{
+    conmode *t, r;
+    rb_io_t *fptr;
+    int fd;
+
+    TypedData_Get_Struct(mode, conmode, &conmode_type, t);
+    r = *t;
+    GetOpenFile(io, fptr);
+    fd = GetReadFD(fptr);
+    if (!setattr(fd, &r)) rb_sys_fail(0);
+
+    return mode;
+}
+
 #if defined TIOCGWINSZ
 typedef struct winsize rb_console_size_t;
 #define getwinsize(fd, buf) (ioctl((fd), TIOCGWINSZ, (buf)) == 0)
@@ -379,6 +746,8 @@ typedef CONSOLE_SCREEN_BUFFER_INFO rb_console_size_t;
  *   io.winsize     -> [rows, columns]
  *
  * Returns console size.
+ *
+ * You must require 'io/console' to use this method.
  */
 static VALUE
 console_winsize(VALUE io)
@@ -399,6 +768,8 @@ console_winsize(VALUE io)
  *
  * Tries to set console size.  The effect depends on the platform and
  * the running environment.
+ *
+ * You must require 'io/console' to use this method.
  */
 static VALUE
 console_set_winsize(VALUE io, VALUE size)
@@ -408,16 +779,25 @@ console_set_winsize(VALUE io, VALUE size)
 #if defined _WIN32
     HANDLE wh;
     int newrow, newcol;
+    BOOL ret;
 #endif
     VALUE row, col, xpixel, ypixel;
+    const VALUE *sz;
     int fd;
+    long sizelen;
 
     GetOpenFile(io, fptr);
     size = rb_Array(size);
-    rb_scan_args((int)RARRAY_LEN(size), RARRAY_PTR(size), "22",
-                &row, &col, &xpixel, &ypixel);
-#if defined TIOCSWINSZ
+    if ((sizelen = RARRAY_LEN(size)) != 2 && sizelen != 4) {
+	rb_raise(rb_eArgError,
+		 "wrong number of arguments (given %ld, expected 2 or 4)",
+		 sizelen);
+    }
+    sz = RARRAY_CONST_PTR(size);
+    row = sz[0], col = sz[1], xpixel = ypixel = Qnil;
+    if (sizelen == 4) xpixel = sz[2], ypixel = sz[3];
     fd = GetWriteFD(fptr);
+#if defined TIOCSWINSZ
     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);
@@ -427,35 +807,69 @@ 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(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) || SET_LAST_ERROR)) {
-	    rb_sys_fail("SetConsoleScreenBufferInfo");
-	}
+    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");
     }
+    ws.dwSize.X = newcol;
+    ret = SetConsoleScreenBufferSize(wh, ws.dwSize);
     ws.srWindow.Left = 0;
     ws.srWindow.Top = 0;
-    ws.srWindow.Right = newcol;
-    ws.srWindow.Bottom = newrow;
-    if (!(SetConsoleWindowInfo(wh, FALSE, &ws.srWindow) || SET_LAST_ERROR)) {
-	rb_sys_fail("SetConsoleWindowInfo");
+    ws.srWindow.Right = newcol-1;
+    ws.srWindow.Bottom = newrow-1;
+    if (!SetConsoleWindowInfo(wh, TRUE, &ws.srWindow)) {
+	rb_syserr_fail(LAST_ERROR, "SetConsoleWindowInfo");
+    }
+    /* retry when shrinking buffer after shrunk window */
+    if (!ret && !SetConsoleScreenBufferSize(wh, ws.dwSize)) {
+	rb_syserr_fail(LAST_ERROR, "SetConsoleScreenBufferInfo");
+    }
+    /* remove scrollbar if possible */
+    if (!SetConsoleWindowInfo(wh, TRUE, &ws.srWindow)) {
+	rb_syserr_fail(LAST_ERROR, "SetConsoleWindowInfo");
     }
 #endif
     return io;
 }
 #endif
 
+#ifdef _WIN32
+static VALUE
+console_check_winsize_changed(VALUE io)
+{
+    rb_io_t *fptr;
+    HANDLE h;
+    DWORD num;
+
+    GetOpenFile(io, fptr);
+    h = (HANDLE)rb_w32_get_osfhandle(GetReadFD(fptr));
+    while (GetNumberOfConsoleInputEvents(h, &num) && num > 0) {
+	INPUT_RECORD rec;
+	if (ReadConsoleInput(h, &rec, 1, &num)) {
+	    if (rec.EventType == WINDOW_BUFFER_SIZE_EVENT) {
+		rb_yield(Qnil);
+	    }
+	}
+    }
+    return io;
+}
+#else
+#define console_check_winsize_changed rb_f_notimplement
+#endif
+
 /*
  * call-seq:
  *   io.iflush
  *
  * Flushes input buffer in kernel.
+ *
+ * You must require 'io/console' to use this method.
  */
 static VALUE
 console_iflush(VALUE io)
@@ -468,6 +882,7 @@ console_iflush(VALUE io)
 #if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
     if (tcflush(fd, TCIFLUSH)) rb_sys_fail(0);
 #endif
+    (void)fd;
     return io;
 }
 
@@ -476,6 +891,8 @@ console_iflush(VALUE io)
  *   io.oflush
  *
  * Flushes output buffer in kernel.
+ *
+ * You must require 'io/console' to use this method.
  */
 static VALUE
 console_oflush(VALUE io)
@@ -488,6 +905,7 @@ console_oflush(VALUE io)
 #if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
     if (tcflush(fd, TCOFLUSH)) rb_sys_fail(0);
 #endif
+    (void)fd;
     return io;
 }
 
@@ -496,6 +914,8 @@ console_oflush(VALUE io)
  *   io.ioflush
  *
  * Flushes input and output buffers in kernel.
+ *
+ * You must require 'io/console' to use this method.
  */
 static VALUE
 console_ioflush(VALUE io)
@@ -520,28 +940,500 @@ 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;
+}
+
+static int
+mode_in_range(VALUE val, int high, const char *modename)
+{
+    int mode;
+    if (NIL_P(val)) return 0;
+    if (!RB_INTEGER_TYPE_P(val)) {
+      wrong_value:
+	rb_raise(rb_eArgError, "wrong %s mode: %"PRIsVALUE, modename, val);
+    }
+    if ((mode = NUM2INT(val)) < 0 || mode > high) {
+	goto wrong_value;
+    }
+    return mode;
+}
+
+#if defined _WIN32
+static VALUE
+console_goto(VALUE io, VALUE y, VALUE x)
+{
+    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.Y), UINT2NUM(ws.dwCursorPosition.X));
+}
+
+static VALUE
+console_move(VALUE io, int y, int x)
+{
+    rb_io_t *fptr;
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+
+    GetOpenFile(io, fptr);
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(fptr));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    pos->X += x;
+    pos->Y += y;
+    if (!SetConsoleCursorPosition(h, *pos)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    return io;
+}
+
+static VALUE
+console_goto_column(VALUE io, VALUE val)
+{
+    rb_io_t *fptr;
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+
+    GetOpenFile(io, fptr);
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(fptr));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    pos->X = NUM2INT(val);
+    if (!SetConsoleCursorPosition(h, *pos)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    return io;
+}
+
+static void
+constat_clear(HANDLE handle, WORD attr, DWORD len, COORD pos)
+{
+    DWORD written;
+
+    FillConsoleOutputAttribute(handle, attr, len, pos, &written);
+    FillConsoleOutputCharacterW(handle, L' ', len, pos, &written);
+}
+
+static VALUE
+console_erase_line(VALUE io, VALUE val)
+{
+    rb_io_t *fptr;
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+    DWORD w;
+    int mode = mode_in_range(val, 2, "line erase");
+
+    GetOpenFile(io, fptr);
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(fptr));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    w = winsize_col(&ws);
+    switch (mode) {
+      case 0:			/* after cursor */
+	w -= pos->X;
+	break;
+      case 1:			/* before *and* cursor */
+	w = pos->X + 1;
+	pos->X = 0;
+	break;
+      case 2:			/* entire line */
+	pos->X = 0;
+	break;
+    }
+    constat_clear(h, ws.wAttributes, w, *pos);
+    return io;
+}
+
+static VALUE
+console_erase_screen(VALUE io, VALUE val)
+{
+    rb_io_t *fptr;
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+    DWORD w;
+    int mode = mode_in_range(val, 3, "screen erase");
+
+    GetOpenFile(io, fptr);
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(fptr));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    w = winsize_col(&ws);
+    switch (mode) {
+      case 0:	/* erase after cursor */
+	w = (w * (ws.srWindow.Bottom - pos->Y + 1) - pos->X);
+	break;
+      case 1:	/* erase before *and* cursor */
+	w = (w * (pos->Y - ws.srWindow.Top) + pos->X + 1);
+	pos->X = 0;
+	pos->Y = ws.srWindow.Top;
+	break;
+      case 2:	/* erase entire screen */
+	w = (w * winsize_row(&ws));
+	pos->X = 0;
+	pos->Y = ws.srWindow.Top;
+	break;
+      case 3:	/* erase entire screen */
+	w = (w * ws.dwSize.Y);
+	pos->X = 0;
+	pos->Y = 0;
+	break;
+    }
+    constat_clear(h, ws.wAttributes, w, *pos);
+    return io;
+}
+
+static VALUE
+console_scroll(VALUE io, int line)
+{
+    rb_io_t *fptr;
+    HANDLE h;
+    rb_console_size_t ws;
+
+    GetOpenFile(io, fptr);
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(fptr));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    if (line) {
+	SMALL_RECT scroll;
+	COORD destination;
+	CHAR_INFO fill;
+	scroll.Left = 0;
+	scroll.Top = line > 0 ? line : 0;
+	scroll.Right = winsize_col(&ws) - 1;
+	scroll.Bottom = winsize_row(&ws) - 1 + (line < 0 ? line : 0);
+	destination.X = 0;
+	destination.Y = line < 0 ? -line : 0;
+	fill.Char.UnicodeChar = L' ';
+	fill.Attributes = ws.wAttributes;
+
+	ScrollConsoleScreenBuffer(h, &scroll, NULL, destination, &fill);
+    }
+    return io;
+}
+
+#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
+struct query_args {
+    const char *qstr;
+    int opt;
+};
+
+static int
+direct_query(VALUE io, const struct query_args *query)
+{
+    if (RB_TYPE_P(io, T_FILE)) {
+	rb_io_t *fptr;
+	VALUE wio;
+	GetOpenFile(io, fptr);
+	wio = fptr->tied_io_for_writing;
+	if (wio) {
+	    VALUE s = rb_str_new_cstr(query->qstr);
+	    rb_io_write(wio, s);
+	    rb_io_flush(wio);
+	    return 1;
+	}
+	if (write(fptr->fd, query->qstr, strlen(query->qstr)) != -1) {
+	    return 1;
+	}
+	if (fptr->fd == 0 &&
+	    write(1, query->qstr, strlen(query->qstr)) != -1) {
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+static VALUE
+read_vt_response(VALUE io, VALUE query)
+{
+    struct query_args *qargs = (struct query_args *)query;
+    VALUE result, b;
+    int opt = 0;
+    int num = 0;
+    if (qargs) {
+	opt = qargs->opt;
+	if (!direct_query(io, qargs)) return Qnil;
+    }
+    if (rb_io_getbyte(io) != INT2FIX(0x1b)) return Qnil;
+    if (rb_io_getbyte(io) != INT2FIX('[')) return Qnil;
+    result = rb_ary_new();
+    while (!NIL_P(b = rb_io_getbyte(io))) {
+	int c = NUM2UINT(b);
+	if (c == ';') {
+	    rb_ary_push(result, INT2NUM(num));
+	    num = 0;
+	}
+	else if (ISDIGIT(c)) {
+	    num = num * 10 + c - '0';
+	}
+	else if (opt && c == opt) {
+	    opt = 0;
+	}
+	else {
+	    char last = (char)c;
+	    rb_ary_push(result, INT2NUM(num));
+	    b = rb_str_new(&last, 1);
+	    break;
+	}
+    }
+    return rb_ary_push(result, b);
+}
+
+static VALUE
+console_vt_response(int argc, VALUE *argv, VALUE io, const struct query_args *qargs)
+{
+    rawmode_arg_t opts, *optp = rawmode_opt(&argc, argv, 0, 1, &opts);
+    VALUE query = (VALUE)qargs;
+    VALUE ret = ttymode_with_io(io, read_vt_response, query, set_rawmode, optp);
+    return ret;
+}
+
+static VALUE
+console_cursor_pos(VALUE io)
+{
+    static const struct query_args query = {"\033[6n", 0};
+    VALUE resp = console_vt_response(0, 0, io, &query);
+    VALUE row, column, term;
+    unsigned int r, c;
+    if (!RB_TYPE_P(resp, T_ARRAY) || RARRAY_LEN(resp) != 3) return Qnil;
+    term = RARRAY_AREF(resp, 2);
+    if (!RB_TYPE_P(term, T_STRING) || RSTRING_LEN(term) != 1) return Qnil;
+    if (RSTRING_PTR(term)[0] != 'R') return Qnil;
+    row = RARRAY_AREF(resp, 0);
+    column = RARRAY_AREF(resp, 1);
+    rb_ary_resize(resp, 2);
+    r = NUM2UINT(row) - 1;
+    c = NUM2UINT(column) - 1;
+    RARRAY_ASET(resp, 0, INT2NUM(r));
+    RARRAY_ASET(resp, 1, INT2NUM(c));
+    return resp;
+}
+
+static VALUE
+console_goto(VALUE io, VALUE y, VALUE x)
+{
+    rb_io_write(io, rb_sprintf("\x1b[%d;%dH", NUM2UINT(y)+1, NUM2UINT(x)+1));
+    return io;
+}
+
+static VALUE
+console_move(VALUE io, int y, int x)
+{
+    if (x || y) {
+	VALUE s = rb_str_new_cstr("");
+	if (y) rb_str_catf(s, "\x1b[%d%c", y < 0 ? -y : y, y < 0 ? 'A' : 'B');
+	if (x) rb_str_catf(s, "\x1b[%d%c", x < 0 ? -x : x, x < 0 ? 'D' : 'C');
+	rb_io_write(io, s);
+	rb_io_flush(io);
+    }
+    return io;
+}
+
+static VALUE
+console_goto_column(VALUE io, VALUE val)
+{
+    rb_io_write(io, rb_sprintf("\x1b[%dG", NUM2UINT(val)+1));
+    return io;
+}
+
+static VALUE
+console_erase_line(VALUE io, VALUE val)
+{
+    int mode = mode_in_range(val, 2, "line erase");
+    rb_io_write(io, rb_sprintf("\x1b[%dK", mode));
+    return io;
+}
+
+static VALUE
+console_erase_screen(VALUE io, VALUE val)
+{
+    int mode = mode_in_range(val, 3, "screen erase");
+    rb_io_write(io, rb_sprintf("\x1b[%dJ", mode));
+    return io;
+}
+
+static VALUE
+console_scroll(VALUE io, int line)
+{
+    if (line) {
+	VALUE s = rb_sprintf("\x1b[%d%c", line < 0 ? -line : line,
+			     line < 0 ? 'T' : 'S');
+	rb_io_write(io, s);
+    }
+    return io;
+}
+# define console_key_pressed_p rb_f_notimplement
+#endif
+
+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));
+}
+
+static VALUE
+console_cursor_up(VALUE io, VALUE val)
+{
+    return console_move(io, -NUM2INT(val), 0);
+}
+
+static VALUE
+console_cursor_down(VALUE io, VALUE val)
+{
+    return console_move(io, +NUM2INT(val), 0);
+}
+
+static VALUE
+console_cursor_left(VALUE io, VALUE val)
+{
+    return console_move(io, 0, -NUM2INT(val));
+}
+
+static VALUE
+console_cursor_right(VALUE io, VALUE val)
+{
+    return console_move(io, 0, +NUM2INT(val));
+}
+
+static VALUE
+console_scroll_forward(VALUE io, VALUE val)
+{
+    return console_scroll(io, +NUM2INT(val));
+}
+
+static VALUE
+console_scroll_backward(VALUE io, VALUE val)
+{
+    return console_scroll(io, -NUM2INT(val));
+}
+
+static VALUE
+console_clear_screen(VALUE io)
+{
+    console_erase_screen(io, INT2FIX(2));
+    console_goto(io, INT2FIX(0), INT2FIX(0));
+    return io;
+}
+
 /*
  * 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(VALUE klass)
+console_dev(int argc, VALUE *argv, 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 (TYPE(con) == T_FILE) {
-	    if ((fptr = RFILE(con)->fptr) && GetReadFD(fptr) != -1)
-		return con;
+	if (!RB_TYPE_P(con, T_FILE) ||
+	    (!(fptr = RFILE(con)->fptr) || GetReadFD(fptr) == -1)) {
+	    rb_const_remove(klass, id_console);
+	    con = 0;
 	}
-	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"
@@ -557,17 +1449,17 @@ console_dev(VALUE klass)
 	VALUE out;
 	rb_io_t *ofptr;
 #endif
-	int fd, mode;
+	int fd;
 
 #ifdef CONSOLE_DEVICE_FOR_WRITING
-	fd = open(CONSOLE_DEVICE_FOR_WRITING, O_WRONLY);
+	fd = rb_cloexec_open(CONSOLE_DEVICE_FOR_WRITING, O_RDWR, 0);
 	if (fd < 0) return Qnil;
         rb_update_max_fd(fd);
 	args[1] = INT2FIX(O_WRONLY);
 	args[0] = INT2NUM(fd);
 	out = rb_class_new_instance(2, args, klass);
 #endif
-	fd = open(CONSOLE_DEVICE_FOR_READING, O_RDWR);
+	fd = rb_cloexec_open(CONSOLE_DEVICE_FOR_READING, O_RDWR, 0);
 	if (fd < 0) {
 #ifdef CONSOLE_DEVICE_FOR_WRITING
 	    rb_io_close(out);
@@ -582,45 +1474,180 @@ console_dev(VALUE klass)
 	fptr->pathv = rb_obj_freeze(rb_str_new2(CONSOLE_DEVICE));
 #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;
 }
 
 /*
+ * call-seq:
+ *   io.getch(min: nil, time: nil)       -> char
+ *
+ * See IO#getch.
+ */
+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, io, 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_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;
+}
+
+/*
+ * 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");
+    id_intr = rb_intern("intr");
+#ifndef HAVE_RB_F_SEND
+    id___send__ = rb_intern("__send__");
+#endif
     InitVM(console);
 }
 
 void
 InitVM_console(void)
 {
-    rb_define_method(rb_cIO, "raw", console_raw, 0);
-    rb_define_method(rb_cIO, "raw!", console_set_raw, 0);
-    rb_define_method(rb_cIO, "getch", console_getch, 0);
+    rb_define_method(rb_cIO, "raw", console_raw, -1);
+    rb_define_method(rb_cIO, "raw!", console_set_raw, -1);
+    rb_define_method(rb_cIO, "cooked", console_cooked, 0);
+    rb_define_method(rb_cIO, "cooked!", console_set_cooked, 0);
+    rb_define_method(rb_cIO, "getch", console_getch, -1);
     rb_define_method(rb_cIO, "echo=", console_set_echo, 1);
     rb_define_method(rb_cIO, "echo?", console_echo_p, 0);
+    rb_define_method(rb_cIO, "console_mode", console_conmode_get, 0);
+    rb_define_method(rb_cIO, "console_mode=", console_conmode_set, 1);
     rb_define_method(rb_cIO, "noecho", console_noecho, 0);
     rb_define_method(rb_cIO, "winsize", console_winsize, 0);
     rb_define_method(rb_cIO, "winsize=", console_set_winsize, 1);
     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_singleton_method(rb_cIO, "console", console_dev, 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, "cursor_up", console_cursor_up, 1);
+    rb_define_method(rb_cIO, "cursor_down", console_cursor_down, 1);
+    rb_define_method(rb_cIO, "cursor_left", console_cursor_left, 1);
+    rb_define_method(rb_cIO, "cursor_right", console_cursor_right, 1);
+    rb_define_method(rb_cIO, "goto_column", console_goto_column, 1);
+    rb_define_method(rb_cIO, "erase_line", console_erase_line, 1);
+    rb_define_method(rb_cIO, "erase_screen", console_erase_screen, 1);
+    rb_define_method(rb_cIO, "scroll_forward", console_scroll_forward, 1);
+    rb_define_method(rb_cIO, "scroll_backward", console_scroll_backward, 1);
+    rb_define_method(rb_cIO, "clear_screen", console_clear_screen, 0);
+    rb_define_method(rb_cIO, "pressed?", console_key_pressed_p, 1);
+    rb_define_method(rb_cIO, "check_winsize_changed", console_check_winsize_changed, 0);
+#if ENABLE_IO_GETPASS
+    rb_define_method(rb_cIO, "getpass", console_getpass, -1);
+#endif
+    rb_define_singleton_method(rb_cIO, "console", console_dev, -1);
+    {
+	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
+    }
+    {
+	/* :stopdoc: */
+        cConmode = rb_define_class_under(rb_cIO, "ConsoleMode", rb_cObject);
+        rb_define_alloc_func(cConmode, conmode_alloc);
+        rb_undef_method(cConmode, "initialize");
+        rb_define_method(cConmode, "initialize_copy", conmode_init_copy, 1);
+        rb_define_method(cConmode, "echo=", conmode_set_echo, 1);
+        rb_define_method(cConmode, "raw!", conmode_set_raw, -1);
+        rb_define_method(cConmode, "raw", conmode_raw_new, -1);
+	/* :startdoc: */
+    }
 }
diff --git a/ext/io/console/depend b/ext/io/console/depend
new file mode 100644
index 0000000000..9c8f9cd22e
--- /dev/null
+++ b/ext/io/console/depend
@@ -0,0 +1,39 @@
+# AUTOGENERATED DEPENDENCIES START
+console.o: $(RUBY_EXTCONF_H)
+console.o: $(arch_hdrdir)/ruby/config.h
+console.o: $(hdrdir)/ruby.h
+console.o: $(hdrdir)/ruby/assert.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/onigmo.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: $(hdrdir)/ruby/thread.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 -f $(top_srcdir)/tool/gperf.sed \
+	) > $(@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)
diff --git a/ext/io/console/extconf.rb b/ext/io/console/extconf.rb
index 57cd7ad87f..a6049da667 100644
--- a/ext/io/console/extconf.rb
+++ b/ext/io/console/extconf.rb
@@ -1,10 +1,13 @@
+# frozen_string_literal: false
 require 'mkmf'
 
 ok = true
 hdr = nil
 case
 when macro_defined?("_WIN32", "")
-  have_func("rb_w32_map_errno", "ruby.h")
+  # 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}"
 when hdr = %w"termios.h termio.h".find {|h| have_header(h)}
   have_func("cfmakeraw", hdr)
 when have_header(hdr = "sgtty.h")
@@ -12,9 +15,16 @@ when have_header(hdr = "sgtty.h")
 else
   ok = false
 end
-have_header("sys/ioctl.h")
-have_func("rb_io_get_write_io", "ruby/io.h")
-have_func("dup3", "unistd.h")
 if ok
-  create_makefile("io/console")
+  have_header("sys/ioctl.h") if hdr
+  # rb_check_hash_type: 1.9.3
+  # rb_io_get_write_io: 1.9.1
+  # rb_cloexec_open: 2.0.0
+  # rb_funcallv: 2.1.0
+  # RARRAY_CONST_PTR: 2.1.0
+  # rb_sym2str: 2.2.0
+  $defs << "-D""ENABLE_IO_GETPASS=1"
+  create_makefile("io/console") {|conf|
+    conf << "\n""VK_HEADER = #{vk_header}\n"
+  }
 end
diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
index 2d34a41336..fac9bff9b7 100644
--- a/ext/io/console/io-console.gemspec
+++ b/ext/io/console/io-console.gemspec
@@ -1,15 +1,27 @@
 # -*- ruby -*-
-_VERSION = "0.3"
+_VERSION = "0.5.3"
+date = %w$Date::                           $[1]
 
 Gem::Specification.new do |s|
   s.name = "io-console"
   s.version = _VERSION
-  s.date = "2011-06-24"
+  s.date = date
   s.summary = "Console interface"
   s.email = "nobu@ruby-lang.org"
   s.description = "add console capabilities to IO instances."
+  s.required_ruby_version = ">= 2.2.0"
+  s.homepage = "https://github.com/ruby/io-console"
+  s.metadata["source_code_url"] = s.homepage
   s.authors = ["Nobu Nakada"]
-  s.require_path = %[.]
-  s.files = %w[console.c extconf.rb lib/console/size.rb]
-  s.extensions = %w[extconf.rb]
+  s.require_path = %[lib]
+  s.files = %w[
+    LICENSE.txt
+    README.md
+    ext/io/console/console.c
+    ext/io/console/extconf.rb
+    ext/io/console/win32_vk.inc
+    lib/io/console/size.rb
+  ]
+  s.extensions = %w[ext/io/console/extconf.rb]
+  s.license = "BSD-2-Clause"
 end
diff --git a/ext/io/console/lib/console/size.rb b/ext/io/console/lib/console/size.rb
index e9d8a1fbb6..14b9a74b22 100644
--- a/ext/io/console/lib/console/size.rb
+++ b/ext/io/console/lib/console/size.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+# fallback to console window size
 def IO.default_console_size
   [
     ENV["LINES"].to_i.nonzero? || 25,
@@ -8,10 +10,11 @@ end
 begin
   require 'io/console'
 rescue LoadError
-  class IO
+  class << IO
     alias console_size default_console_size
   end
 else
+  # returns console window size
   def IO.console_size
     console.winsize
   rescue NoMethodError
diff --git a/ext/io/console/win32_vk.chksum b/ext/io/console/win32_vk.chksum
new file mode 100644
index 0000000000..bc9fff7560
--- /dev/null
+++ b/ext/io/console/win32_vk.chksum
@@ -0,0 +1 @@
+src="win32_vk.list", len=3269, checksum=34076
diff --git a/ext/io/console/win32_vk.inc b/ext/io/console/win32_vk.inc
new file mode 100644
index 0000000000..cbec7bef15
--- /dev/null
+++ b/ext/io/console/win32_vk.inc
@@ -0,0 +1,1391 @@
+#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
+/* ANSI-C code produced by gperf version 3.1 */
+/* 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-gperf@gnu.org>."
+#endif
+
+#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
+#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 (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
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash (register const char *str, register size_t 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 unsigned int hval = (unsigned int)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 (unsigned int)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)
+const struct vktable *
+console_win32_vk (register const char *str, register size_t 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"
+      {gperf_offsetof(stringpool, 12), VK_UP},
+#line 52 "win32_vk.list"
+      {gperf_offsetof(stringpool, 13), VK_APPS},
+#line 159 "win32_vk.list"
+      {gperf_offsetof(stringpool, 14), VK_CRSEL},
+#line 34 "win32_vk.list"
+      {gperf_offsetof(stringpool, 15), VK_SPACE},
+#line 95 "win32_vk.list"
+      {gperf_offsetof(stringpool, 16), VK_SCROLL},
+#line 29 "win32_vk.list"
+      {gperf_offsetof(stringpool, 17), VK_ESCAPE},
+#line 9 "win32_vk.list"
+      {gperf_offsetof(stringpool, 18), VK_CANCEL},
+#line 32 "win32_vk.list"
+      {gperf_offsetof(stringpool, 19), VK_ACCEPT},
+#line 66 "win32_vk.list"
+      {gperf_offsetof(stringpool, 20), VK_SEPARATOR},
+#line 43 "win32_vk.list"
+      {gperf_offsetof(stringpool, 21), VK_SELECT},
+#line 18 "win32_vk.list"
+      {gperf_offsetof(stringpool, 22), VK_CONTROL},
+#line 166 "win32_vk.list"
+      {gperf_offsetof(stringpool, 23), VK_OEM_CLEAR},
+#line 145 "win32_vk.list"
+      {gperf_offsetof(stringpool, 24), VK_OEM_RESET},
+#line 155 "win32_vk.list"
+      {gperf_offsetof(stringpool, 25), VK_OEM_AUTO},
+#line 151 "win32_vk.list"
+      {gperf_offsetof(stringpool, 26), VK_OEM_CUSEL},
+      {-1},
+#line 22 "win32_vk.list"
+      {gperf_offsetof(stringpool, 28), VK_KANA},
+#line 127 "win32_vk.list"
+      {gperf_offsetof(stringpool, 29), VK_OEM_PLUS},
+#line 35 "win32_vk.list"
+      {gperf_offsetof(stringpool, 30), VK_PRIOR},
+#line 152 "win32_vk.list"
+      {gperf_offsetof(stringpool, 31), VK_OEM_ATTN},
+#line 20 "win32_vk.list"
+      {gperf_offsetof(stringpool, 32), VK_PAUSE},
+#line 13 "win32_vk.list"
+      {gperf_offsetof(stringpool, 33), VK_BACK},
+#line 144 "win32_vk.list"
+      {gperf_offsetof(stringpool, 34), VK_PACKET},
+#line 105 "win32_vk.list"
+      {gperf_offsetof(stringpool, 35), VK_RCONTROL},
+#line 104 "win32_vk.list"
+      {gperf_offsetof(stringpool, 36), VK_LCONTROL},
+#line 37 "win32_vk.list"
+      {gperf_offsetof(stringpool, 37), VK_END},
+#line 38 "win32_vk.list"
+      {gperf_offsetof(stringpool, 38), VK_HOME},
+#line 44 "win32_vk.list"
+      {gperf_offsetof(stringpool, 39), VK_PRINT},
+#line 94 "win32_vk.list"
+      {gperf_offsetof(stringpool, 40), VK_NUMLOCK},
+#line 39 "win32_vk.list"
+      {gperf_offsetof(stringpool, 41), VK_LEFT},
+#line 25 "win32_vk.list"
+      {gperf_offsetof(stringpool, 42), VK_JUNJA},
+#line 19 "win32_vk.list"
+      {gperf_offsetof(stringpool, 43), VK_MENU},
+#line 150 "win32_vk.list"
+      {gperf_offsetof(stringpool, 44), VK_OEM_WSCTRL},
+#line 156 "win32_vk.list"
+      {gperf_offsetof(stringpool, 45), VK_OEM_ENLW},
+#line 36 "win32_vk.list"
+      {gperf_offsetof(stringpool, 46), VK_NEXT},
+#line 51 "win32_vk.list"
+      {gperf_offsetof(stringpool, 47), VK_RWIN},
+#line 50 "win32_vk.list"
+      {gperf_offsetof(stringpool, 48), VK_LWIN},
+#line 21 "win32_vk.list"
+      {gperf_offsetof(stringpool, 49), VK_CAPITAL},
+#line 49 "win32_vk.list"
+      {gperf_offsetof(stringpool, 50), VK_HELP},
+#line 164 "win32_vk.list"
+      {gperf_offsetof(stringpool, 51), VK_NONAME},
+#line 8 "win32_vk.list"
+      {gperf_offsetof(stringpool, 52), VK_RBUTTON},
+#line 7 "win32_vk.list"
+      {gperf_offsetof(stringpool, 53), VK_LBUTTON},
+#line 96 "win32_vk.list"
+      {gperf_offsetof(stringpool, 54), VK_OEM_NEC_EQUAL},
+      {-1},
+#line 47 "win32_vk.list"
+      {gperf_offsetof(stringpool, 56), VK_INSERT},
+#line 27 "win32_vk.list"
+      {gperf_offsetof(stringpool, 57), VK_HANJA},
+      {-1}, {-1},
+#line 46 "win32_vk.list"
+      {gperf_offsetof(stringpool, 60), VK_SNAPSHOT},
+#line 158 "win32_vk.list"
+      {gperf_offsetof(stringpool, 61), VK_ATTN},
+#line 14 "win32_vk.list"
+      {gperf_offsetof(stringpool, 62), VK_TAB},
+#line 157 "win32_vk.list"
+      {gperf_offsetof(stringpool, 63), VK_OEM_BACKTAB},
+#line 143 "win32_vk.list"
+      {gperf_offsetof(stringpool, 64), VK_ICO_CLEAR},
+#line 30 "win32_vk.list"
+      {gperf_offsetof(stringpool, 65), VK_CONVERT},
+#line 16 "win32_vk.list"
+      {gperf_offsetof(stringpool, 66), VK_RETURN},
+#line 146 "win32_vk.list"
+      {gperf_offsetof(stringpool, 67), VK_OEM_JUMP},
+      {-1}, {-1}, {-1},
+#line 111 "win32_vk.list"
+      {gperf_offsetof(stringpool, 71), VK_BROWSER_STOP},
+#line 26 "win32_vk.list"
+      {gperf_offsetof(stringpool, 72), VK_FINAL},
+#line 163 "win32_vk.list"
+      {gperf_offsetof(stringpool, 73), VK_ZOOM},
+#line 28 "win32_vk.list"
+      {gperf_offsetof(stringpool, 74), VK_KANJI},
+#line 48 "win32_vk.list"
+      {gperf_offsetof(stringpool, 75), VK_DELETE},
+#line 128 "win32_vk.list"
+      {gperf_offsetof(stringpool, 76), VK_OEM_COMMA},
+#line 67 "win32_vk.list"
+      {gperf_offsetof(stringpool, 77), VK_SUBTRACT},
+      {-1},
+#line 10 "win32_vk.list"
+      {gperf_offsetof(stringpool, 79), VK_MBUTTON},
+#line 78 "win32_vk.list"
+      {gperf_offsetof(stringpool, 80), VK_F9},
+#line 17 "win32_vk.list"
+      {gperf_offsetof(stringpool, 81), VK_SHIFT},
+#line 103 "win32_vk.list"
+      {gperf_offsetof(stringpool, 82), VK_RSHIFT},
+#line 102 "win32_vk.list"
+      {gperf_offsetof(stringpool, 83), VK_LSHIFT},
+#line 65 "win32_vk.list"
+      {gperf_offsetof(stringpool, 84), VK_ADD},
+#line 31 "win32_vk.list"
+      {gperf_offsetof(stringpool, 85), VK_NONCONVERT},
+#line 160 "win32_vk.list"
+      {gperf_offsetof(stringpool, 86), VK_EXSEL},
+#line 126 "win32_vk.list"
+      {gperf_offsetof(stringpool, 87), VK_OEM_1},
+#line 138 "win32_vk.list"
+      {gperf_offsetof(stringpool, 88), VK_OEM_AX},
+#line 108 "win32_vk.list"
+      {gperf_offsetof(stringpool, 89), VK_BROWSER_BACK},
+#line 137 "win32_vk.list"
+      {gperf_offsetof(stringpool, 90), VK_OEM_8},
+#line 129 "win32_vk.list"
+      {gperf_offsetof(stringpool, 91), VK_OEM_MINUS},
+#line 162 "win32_vk.list"
+      {gperf_offsetof(stringpool, 92), VK_PLAY},
+#line 131 "win32_vk.list"
+      {gperf_offsetof(stringpool, 93), VK_OEM_2},
+#line 15 "win32_vk.list"
+      {gperf_offsetof(stringpool, 94), VK_CLEAR},
+#line 99 "win32_vk.list"
+      {gperf_offsetof(stringpool, 95), VK_OEM_FJ_TOUROKU},
+#line 147 "win32_vk.list"
+      {gperf_offsetof(stringpool, 96), VK_OEM_PA1},
+#line 140 "win32_vk.list"
+      {gperf_offsetof(stringpool, 97), VK_ICO_HELP},
+#line 112 "win32_vk.list"
+      {gperf_offsetof(stringpool, 98), VK_BROWSER_SEARCH},
+#line 53 "win32_vk.list"
+      {gperf_offsetof(stringpool, 99), VK_SLEEP},
+      {-1},
+#line 70 "win32_vk.list"
+      {gperf_offsetof(stringpool, 101), VK_F1},
+#line 148 "win32_vk.list"
+      {gperf_offsetof(stringpool, 102), VK_OEM_PA2},
+#line 154 "win32_vk.list"
+      {gperf_offsetof(stringpool, 103), VK_OEM_COPY},
+#line 77 "win32_vk.list"
+      {gperf_offsetof(stringpool, 104), VK_F8},
+#line 88 "win32_vk.list"
+      {gperf_offsetof(stringpool, 105), VK_F19},
+#line 41 "win32_vk.list"
+      {gperf_offsetof(stringpool, 106), VK_RIGHT},
+#line 71 "win32_vk.list"
+      {gperf_offsetof(stringpool, 107), VK_F2},
+#line 135 "win32_vk.list"
+      {gperf_offsetof(stringpool, 108), VK_OEM_6},
+#line 87 "win32_vk.list"
+      {gperf_offsetof(stringpool, 109), VK_F18},
+      {-1},
+#line 117 "win32_vk.list"
+      {gperf_offsetof(stringpool, 111), VK_VOLUME_UP},
+      {-1}, {-1},
+#line 120 "win32_vk.list"
+      {gperf_offsetof(stringpool, 114), VK_MEDIA_STOP},
+#line 130 "win32_vk.list"
+      {gperf_offsetof(stringpool, 115), VK_OEM_PERIOD},
+      {-1},
+#line 161 "win32_vk.list"
+      {gperf_offsetof(stringpool, 117), VK_EREOF},
+      {-1}, {-1}, {-1},
+#line 114 "win32_vk.list"
+      {gperf_offsetof(stringpool, 121), VK_BROWSER_HOME},
+#line 75 "win32_vk.list"
+      {gperf_offsetof(stringpool, 122), VK_F6},
+      {-1},
+#line 110 "win32_vk.list"
+      {gperf_offsetof(stringpool, 124), VK_BROWSER_REFRESH},
+      {-1},
+#line 165 "win32_vk.list"
+      {gperf_offsetof(stringpool, 126), VK_PA1},
+#line 142 "win32_vk.list"
+      {gperf_offsetof(stringpool, 127), VK_PROCESSKEY},
+#line 68 "win32_vk.list"
+      {gperf_offsetof(stringpool, 128), VK_DECIMAL},
+#line 132 "win32_vk.list"
+      {gperf_offsetof(stringpool, 129), VK_OEM_3},
+#line 107 "win32_vk.list"
+      {gperf_offsetof(stringpool, 130), VK_RMENU},
+#line 106 "win32_vk.list"
+      {gperf_offsetof(stringpool, 131), VK_LMENU},
+#line 98 "win32_vk.list"
+      {gperf_offsetof(stringpool, 132), VK_OEM_FJ_MASSHOU},
+#line 54 "win32_vk.list"
+      {gperf_offsetof(stringpool, 133), VK_NUMPAD0},
+#line 24 "win32_vk.list"
+      {gperf_offsetof(stringpool, 134), VK_HANGUL},
+#line 63 "win32_vk.list"
+      {gperf_offsetof(stringpool, 135), VK_NUMPAD9},
+#line 23 "win32_vk.list"
+      {gperf_offsetof(stringpool, 136), VK_HANGEUL},
+#line 134 "win32_vk.list"
+      {gperf_offsetof(stringpool, 137), VK_OEM_5},
+#line 149 "win32_vk.list"
+      {gperf_offsetof(stringpool, 138), VK_OEM_PA3},
+#line 115 "win32_vk.list"
+      {gperf_offsetof(stringpool, 139), VK_VOLUME_MUTE},
+#line 133 "win32_vk.list"
+      {gperf_offsetof(stringpool, 140), VK_OEM_4},
+#line 122 "win32_vk.list"
+      {gperf_offsetof(stringpool, 141), VK_LAUNCH_MAIL},
+#line 97 "win32_vk.list"
+      {gperf_offsetof(stringpool, 142), VK_OEM_FJ_JISHO},
+#line 72 "win32_vk.list"
+      {gperf_offsetof(stringpool, 143), VK_F3},
+#line 101 "win32_vk.list"
+      {gperf_offsetof(stringpool, 144), VK_OEM_FJ_ROYA},
+#line 100 "win32_vk.list"
+      {gperf_offsetof(stringpool, 145), VK_OEM_FJ_LOYA},
+      {-1},
+#line 42 "win32_vk.list"
+      {gperf_offsetof(stringpool, 147), VK_DOWN},
+      {-1},
+#line 153 "win32_vk.list"
+      {gperf_offsetof(stringpool, 149), VK_OEM_FINISH},
+      {-1},
+#line 74 "win32_vk.list"
+      {gperf_offsetof(stringpool, 151), VK_F5},
+      {-1},
+#line 136 "win32_vk.list"
+      {gperf_offsetof(stringpool, 153), VK_OEM_7},
+#line 73 "win32_vk.list"
+      {gperf_offsetof(stringpool, 154), VK_F4},
+#line 86 "win32_vk.list"
+      {gperf_offsetof(stringpool, 155), VK_F17},
+#line 55 "win32_vk.list"
+      {gperf_offsetof(stringpool, 156), VK_NUMPAD1},
+#line 141 "win32_vk.list"
+      {gperf_offsetof(stringpool, 157), VK_ICO_00},
+      {-1},
+#line 62 "win32_vk.list"
+      {gperf_offsetof(stringpool, 159), VK_NUMPAD8},
+      {-1}, {-1},
+#line 56 "win32_vk.list"
+      {gperf_offsetof(stringpool, 162), VK_NUMPAD2},
+      {-1},
+#line 124 "win32_vk.list"
+      {gperf_offsetof(stringpool, 164), VK_LAUNCH_APP1},
+#line 109 "win32_vk.list"
+      {gperf_offsetof(stringpool, 165), VK_BROWSER_FORWARD},
+      {-1},
+#line 76 "win32_vk.list"
+      {gperf_offsetof(stringpool, 167), VK_F7},
+      {-1}, {-1},
+#line 125 "win32_vk.list"
+      {gperf_offsetof(stringpool, 170), VK_LAUNCH_APP2},
+#line 64 "win32_vk.list"
+      {gperf_offsetof(stringpool, 171), VK_MULTIPLY},
+      {-1}, {-1},
+#line 45 "win32_vk.list"
+      {gperf_offsetof(stringpool, 174), VK_EXECUTE},
+      {-1},
+#line 113 "win32_vk.list"
+      {gperf_offsetof(stringpool, 176), VK_BROWSER_FAVORITES},
+#line 60 "win32_vk.list"
+      {gperf_offsetof(stringpool, 177), VK_NUMPAD6},
+      {-1},
+#line 85 "win32_vk.list"
+      {gperf_offsetof(stringpool, 179), VK_F16},
+      {-1}, {-1},
+#line 79 "win32_vk.list"
+      {gperf_offsetof(stringpool, 182), VK_F10},
+      {-1}, {-1},
+#line 116 "win32_vk.list"
+      {gperf_offsetof(stringpool, 185), VK_VOLUME_DOWN},
+      {-1}, {-1},
+#line 89 "win32_vk.list"
+      {gperf_offsetof(stringpool, 188), VK_F20},
+#line 119 "win32_vk.list"
+      {gperf_offsetof(stringpool, 189), VK_MEDIA_PREV_TRACK},
+      {-1},
+#line 33 "win32_vk.list"
+      {gperf_offsetof(stringpool, 191), VK_MODECHANGE},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 83 "win32_vk.list"
+      {gperf_offsetof(stringpool, 197), VK_F14},
+#line 57 "win32_vk.list"
+      {gperf_offsetof(stringpool, 198), VK_NUMPAD3},
+#line 11 "win32_vk.list"
+      {gperf_offsetof(stringpool, 199), VK_XBUTTON1},
+      {-1}, {-1}, {-1},
+#line 93 "win32_vk.list"
+      {gperf_offsetof(stringpool, 203), VK_F24},
+      {-1},
+#line 12 "win32_vk.list"
+      {gperf_offsetof(stringpool, 205), VK_XBUTTON2},
+#line 59 "win32_vk.list"
+      {gperf_offsetof(stringpool, 206), VK_NUMPAD5},
+      {-1}, {-1},
+#line 58 "win32_vk.list"
+      {gperf_offsetof(stringpool, 209), VK_NUMPAD4},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 121 "win32_vk.list"
+      {gperf_offsetof(stringpool, 215), VK_MEDIA_PLAY_PAUSE},
+      {-1},
+#line 123 "win32_vk.list"
+      {gperf_offsetof(stringpool, 217), VK_LAUNCH_MEDIA_SELECT},
+#line 80 "win32_vk.list"
+      {gperf_offsetof(stringpool, 218), VK_F11},
+      {-1},
+#line 139 "win32_vk.list"
+      {gperf_offsetof(stringpool, 220), VK_OEM_102},
+#line 118 "win32_vk.list"
+      {gperf_offsetof(stringpool, 221), VK_MEDIA_NEXT_TRACK},
+#line 61 "win32_vk.list"
+      {gperf_offsetof(stringpool, 222), VK_NUMPAD7},
+      {-1},
+#line 90 "win32_vk.list"
+      {gperf_offsetof(stringpool, 224), VK_F21},
+      {-1},
+#line 82 "win32_vk.list"
+      {gperf_offsetof(stringpool, 226), VK_F13},
+      {-1}, {-1},
+#line 81 "win32_vk.list"
+      {gperf_offsetof(stringpool, 229), VK_F12},
+      {-1}, {-1},
+#line 92 "win32_vk.list"
+      {gperf_offsetof(stringpool, 232), VK_F23},
+      {-1}, {-1},
+#line 91 "win32_vk.list"
+      {gperf_offsetof(stringpool, 235), VK_F22},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 84 "win32_vk.list"
+      {gperf_offsetof(stringpool, 242), VK_F15},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+#line 69 "win32_vk.list"
+      {gperf_offsetof(stringpool, 256), VK_DIVIDE}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register unsigned int key = hash (str, len);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          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
new file mode 100644
index 0000000000..7909a4d1f0
--- /dev/null
+++ b/ext/io/console/win32_vk.list
@@ -0,0 +1,166 @@
+%{
+struct vktable {short ofs; unsigned short vk;};
+static const struct vktable *console_win32_vk(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
+%}
+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
new file mode 100644
index 0000000000..bea4a15e23
--- /dev/null
+++ b/ext/io/nonblock/depend
@@ -0,0 +1,18 @@
+# AUTOGENERATED DEPENDENCIES START
+nonblock.o: $(RUBY_EXTCONF_H)
+nonblock.o: $(arch_hdrdir)/ruby/config.h
+nonblock.o: $(hdrdir)/ruby.h
+nonblock.o: $(hdrdir)/ruby/assert.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/onigmo.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: nonblock.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/io/nonblock/extconf.rb b/ext/io/nonblock/extconf.rb
index aecdc16cea..d813a01e7c 100644
--- a/ext/io/nonblock/extconf.rb
+++ b/ext/io/nonblock/extconf.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'mkmf'
 target = "io/nonblock"
 
diff --git a/ext/io/nonblock/nonblock.c b/ext/io/nonblock/nonblock.c
index 1d866ceb0f..1c0bdc68e7 100644
--- a/ext/io/nonblock/nonblock.c
+++ b/ext/io/nonblock/nonblock.c
@@ -1,6 +1,6 @@
 /**********************************************************************
 
-  io/wait.c -
+  io/nonblock.c -
 
   $Author$
   created at: Tue Jul 14 21:53:18 2009
@@ -30,6 +30,12 @@ io_nonblock_mode(int fd)
 #endif
 
 #ifdef F_GETFL
+/*
+ * call-seq:
+ *   io.nonblock? -> boolean
+ *
+ * Returns +true+ if an IO object is in non-blocking mode.
+ */
 static VALUE
 rb_io_nonblock_p(VALUE io)
 {
@@ -44,29 +50,40 @@ rb_io_nonblock_p(VALUE io)
 #endif
 
 #ifdef F_SETFL
-static void
+static int
 io_nonblock_set(int fd, int f, int nb)
 {
     if (nb) {
 	if ((f & O_NONBLOCK) != 0)
-	    return;
+	    return 0;
 	f |= O_NONBLOCK;
     }
     else {
 	if ((f & O_NONBLOCK) == 0)
-	    return;
+	    return 0;
 	f &= ~O_NONBLOCK;
     }
     if (fcntl(fd, F_SETFL, f) == -1)
 	rb_sys_fail(0);
+    return 1;
 }
 
+/*
+ * call-seq:
+ *   io.nonblock = boolean -> boolean
+ *
+ * Enables non-blocking mode on a stream when set to
+ * +true+, and blocking mode when set to +false+.
+ */
 static VALUE
 rb_io_nonblock_set(VALUE io, VALUE nb)
 {
     rb_io_t *fptr;
     GetOpenFile(io, fptr);
-    io_nonblock_set(fptr->fd, io_nonblock_mode(fptr->fd), RTEST(nb));
+    if (RTEST(nb))
+	rb_io_set_nonblock(fptr);
+    else
+	io_nonblock_set(fptr->fd, io_nonblock_mode(fptr->fd), RTEST(nb));
     return io;
 }
 
@@ -79,6 +96,16 @@ io_nonblock_restore(VALUE arg)
     return Qnil;
 }
 
+/*
+ * call-seq:
+ *   io.nonblock {|io| } -> io
+ *   io.nonblock(boolean) {|io| } -> io
+ *
+ * Yields +self+ in non-blocking mode.
+ *
+ * When +false+ is given as an argument, +self+ is yielded in blocking mode.
+ * The original mode is restored after the block is executed.
+ */
 static VALUE
 rb_io_nonblock_block(int argc, VALUE *argv, VALUE io)
 {
@@ -95,7 +122,8 @@ rb_io_nonblock_block(int argc, VALUE *argv, VALUE io)
     f = io_nonblock_mode(fptr->fd);
     restore[0] = fptr->fd;
     restore[1] = f;
-    io_nonblock_set(fptr->fd, f, nb);
+    if (!io_nonblock_set(fptr->fd, f, nb))
+	return rb_yield(io);
     return rb_ensure(rb_yield, io, io_nonblock_restore, (VALUE)restore);
 }
 #else
@@ -106,9 +134,7 @@ rb_io_nonblock_block(int argc, VALUE *argv, VALUE io)
 void
 Init_nonblock(void)
 {
-    VALUE io = rb_cIO;
-
-    rb_define_method(io, "nonblock?", rb_io_nonblock_p, 0);
-    rb_define_method(io, "nonblock=", rb_io_nonblock_set, 1);
-    rb_define_method(io, "nonblock", rb_io_nonblock_block, -1);
+    rb_define_method(rb_cIO, "nonblock?", rb_io_nonblock_p, 0);
+    rb_define_method(rb_cIO, "nonblock=", rb_io_nonblock_set, 1);
+    rb_define_method(rb_cIO, "nonblock", rb_io_nonblock_block, -1);
 }
diff --git a/ext/io/wait/depend b/ext/io/wait/depend
new file mode 100644
index 0000000000..bbf1266aba
--- /dev/null
+++ b/ext/io/wait/depend
@@ -0,0 +1,18 @@
+# AUTOGENERATED DEPENDENCIES START
+wait.o: $(RUBY_EXTCONF_H)
+wait.o: $(arch_hdrdir)/ruby/config.h
+wait.o: $(hdrdir)/ruby.h
+wait.o: $(hdrdir)/ruby/assert.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/onigmo.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: wait.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb
index eed3543124..b5d36c3fe3 100644
--- a/ext/io/wait/extconf.rb
+++ b/ext/io/wait/extconf.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'mkmf'
 target = "io/wait"
 
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
index 34e832b122..d846bba49e 100644
--- a/ext/io/wait/wait.c
+++ b/ext/io/wait/wait.c
@@ -14,6 +14,9 @@
 #include "ruby/io.h"
 
 #include <sys/types.h>
+#if defined(HAVE_UNISTD_H) && (defined(__sun))
+#include <unistd.h>
+#endif
 #if defined(HAVE_SYS_IOCTL_H)
 #include <sys/ioctl.h>
 #endif
@@ -37,9 +40,34 @@
 #endif
 
 static VALUE io_ready_p _((VALUE io));
-static VALUE io_wait _((int argc, VALUE *argv, VALUE io));
+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
@@ -58,7 +86,7 @@ io_nread(VALUE io)
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     len = rb_io_read_pending(fptr);
-    if (len > 0) return len;
+    if (len > 0) return INT2FIX(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);
@@ -67,65 +95,146 @@ io_nread(VALUE io)
 
 /*
  * call-seq:
- *   io.ready? -> true, false or nil
+ *   io.ready? -> true or false
  *
  * Returns true if input available without blocking, or false.
- * Returns nil if no information available.
  */
 
 static VALUE
 io_ready_p(VALUE io)
 {
     rb_io_t *fptr;
-    ioctl_arg n;
+    struct timeval tv = {0, 0};
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     if (rb_io_read_pending(fptr)) return Qtrue;
-    if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qnil;
-    if (ioctl(fptr->fd, FIONREAD, &n)) return Qnil;
-    if (n > 0) return Qtrue;
+    if (wait_for_single_fd(fptr, RB_WAITFD_IN, &tv))
+	return Qtrue;
     return Qfalse;
 }
 
 /*
  * call-seq:
- *   io.wait          -> IO, true, false or nil
- *   io.wait(timeout) -> IO, true, false or nil
+ *   io.wait_readable          -> IO, true or nil
+ *   io.wait_readable(timeout) -> IO, true or nil
  *
- * Waits until input is available or times out and returns self or nil when
- * EOF is reached.
+ * Waits until IO is readable without blocking and returns +self+, or
+ * +nil+ when times out.
+ * Returns +true+ immediately when buffered data is available.
  */
 
 static VALUE
-io_wait(int argc, VALUE *argv, VALUE io)
+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);
-    rb_scan_args(argc, argv, "01", &timeout);
-    if (NIL_P(timeout)) {
-	tv = NULL;
+    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;
     }
-    else {
-	timerec = rb_time_interval(timeout);
-	tv = &timerec;
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   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.
+ */
+static VALUE
+io_wait_writable(int argc, VALUE *argv, VALUE io)
+{
+    rb_io_t *fptr;
+    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;
     }
+    return Qnil;
+}
 
-    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);
+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;
+    }
+    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 */
     rb_io_check_closed(fptr);
-    if (ioctl(fptr->fd, FIONREAD, &n)) rb_sys_fail(0);
-    if (n > 0) return io;
+    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))
+	return io;
     return Qnil;
 }
 
@@ -134,9 +243,11 @@ io_wait(int argc, VALUE *argv, VALUE io)
  */
 
 void
-Init_wait()
+Init_wait(void)
 {
     rb_define_method(rb_cIO, "nread", io_nread, 0);
     rb_define_method(rb_cIO, "ready?", io_ready_p, 0);
-    rb_define_method(rb_cIO, "wait", io_wait, -1);
+    rb_define_method(rb_cIO, "wait", io_wait_readwrite, -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/depend b/ext/json/depend
new file mode 100644
index 0000000000..0301ce074c
--- /dev/null
+++ b/ext/json/depend
@@ -0,0 +1,2 @@
+# AUTOGENERATED DEPENDENCIES START
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/json/extconf.rb b/ext/json/extconf.rb
index 850798c643..7595d58a98 100644
--- a/ext/json/extconf.rb
+++ b/ext/json/extconf.rb
@@ -1,3 +1,2 @@
 require 'mkmf'
 create_makefile('json')
-
diff --git a/ext/json/fbuffer/fbuffer.h b/ext/json/fbuffer/fbuffer.h
new file mode 100644
index 0000000000..dc8f406b5b
--- /dev/null
+++ b/ext/json/fbuffer/fbuffer.h
@@ -0,0 +1,187 @@
+
+#ifndef _FBUFFER_H_
+#define _FBUFFER_H_
+
+#include "ruby.h"
+
+#ifndef RHASH_SIZE
+#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries)
+#endif
+
+#ifndef RFLOAT_VALUE
+#define RFLOAT_VALUE(val) (RFLOAT(val)->value)
+#endif
+
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
+#endif
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(string) RSTRING(string)->ptr
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(string) RSTRING(string)->len
+#endif
+
+#ifdef PRIsVALUE
+# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
+# define RB_OBJ_STRING(obj) (obj)
+#else
+# define PRIsVALUE "s"
+# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
+# define RB_OBJ_STRING(obj) StringValueCStr(obj)
+#endif
+
+#ifdef HAVE_RUBY_ENCODING_H
+#include "ruby/encoding.h"
+#define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding())
+#else
+#define FORCE_UTF8(obj)
+#endif
+
+/* We don't need to guard objects for rbx, so let's do nothing at all. */
+#ifndef RB_GC_GUARD
+#define RB_GC_GUARD(object)
+#endif
+
+typedef struct FBufferStruct {
+    unsigned long initial_length;
+    char *ptr;
+    unsigned long len;
+    unsigned long capa;
+} FBuffer;
+
+#define FBUFFER_INITIAL_LENGTH_DEFAULT 1024
+
+#define FBUFFER_PTR(fb) (fb->ptr)
+#define FBUFFER_LEN(fb) (fb->len)
+#define FBUFFER_CAPA(fb) (fb->capa)
+#define FBUFFER_PAIR(fb) FBUFFER_PTR(fb), FBUFFER_LEN(fb)
+
+static FBuffer *fbuffer_alloc(unsigned long initial_length);
+static void fbuffer_free(FBuffer *fb);
+static void fbuffer_clear(FBuffer *fb);
+static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len);
+#ifdef JSON_GENERATOR
+static void fbuffer_append_long(FBuffer *fb, long number);
+#endif
+static void fbuffer_append_char(FBuffer *fb, char newchr);
+#ifdef JSON_GENERATOR
+static FBuffer *fbuffer_dup(FBuffer *fb);
+static VALUE fbuffer_to_s(FBuffer *fb);
+#endif
+
+static FBuffer *fbuffer_alloc(unsigned long initial_length)
+{
+    FBuffer *fb;
+    if (initial_length <= 0) initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT;
+    fb = ALLOC(FBuffer);
+    memset((void *) fb, 0, sizeof(FBuffer));
+    fb->initial_length = initial_length;
+    return fb;
+}
+
+static void fbuffer_free(FBuffer *fb)
+{
+    if (fb->ptr) ruby_xfree(fb->ptr);
+    ruby_xfree(fb);
+}
+
+static void fbuffer_clear(FBuffer *fb)
+{
+    fb->len = 0;
+}
+
+static void fbuffer_inc_capa(FBuffer *fb, unsigned long requested)
+{
+    unsigned long required;
+
+    if (!fb->ptr) {
+        fb->ptr = ALLOC_N(char, fb->initial_length);
+        fb->capa = fb->initial_length;
+    }
+
+    for (required = fb->capa; requested > required - fb->len; required <<= 1);
+
+    if (required > fb->capa) {
+        REALLOC_N(fb->ptr, char, required);
+        fb->capa = required;
+    }
+}
+
+static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len)
+{
+    if (len > 0) {
+        fbuffer_inc_capa(fb, len);
+        MEMCPY(fb->ptr + fb->len, newstr, char, len);
+        fb->len += len;
+    }
+}
+
+#ifdef JSON_GENERATOR
+static void fbuffer_append_str(FBuffer *fb, VALUE str)
+{
+    const char *newstr = StringValuePtr(str);
+    unsigned long len = RSTRING_LEN(str);
+
+    RB_GC_GUARD(str);
+
+    fbuffer_append(fb, newstr, len);
+}
+#endif
+
+static void fbuffer_append_char(FBuffer *fb, char newchr)
+{
+    fbuffer_inc_capa(fb, 1);
+    *(fb->ptr + fb->len) = newchr;
+    fb->len++;
+}
+
+#ifdef JSON_GENERATOR
+static void freverse(char *start, char *end)
+{
+    char c;
+
+    while (end > start) {
+        c = *end, *end-- = *start, *start++ = c;
+    }
+}
+
+static long fltoa(long number, char *buf)
+{
+    static char digits[] = "0123456789";
+    long sign = number;
+    char* tmp = buf;
+
+    if (sign < 0) number = -number;
+    do *tmp++ = digits[number % 10]; while (number /= 10);
+    if (sign < 0) *tmp++ = '-';
+    freverse(buf, tmp - 1);
+    return tmp - buf;
+}
+
+static void fbuffer_append_long(FBuffer *fb, long number)
+{
+    char buf[20];
+    unsigned long len = fltoa(number, buf);
+    fbuffer_append(fb, buf, len);
+}
+
+static FBuffer *fbuffer_dup(FBuffer *fb)
+{
+    unsigned long len = fb->len;
+    FBuffer *result;
+
+    result = fbuffer_alloc(len);
+    fbuffer_append(result, FBUFFER_PAIR(fb));
+    return result;
+}
+
+static VALUE fbuffer_to_s(FBuffer *fb)
+{
+    VALUE result = rb_str_new(FBUFFER_PTR(fb), FBUFFER_LEN(fb));
+    fbuffer_free(fb);
+    FORCE_UTF8(result);
+    return result;
+}
+#endif
+#endif
diff --git a/ext/json/generator/depend b/ext/json/generator/depend
index bb76ad6400..3f04c0d625 100644
--- a/ext/json/generator/depend
+++ b/ext/json/generator/depend
@@ -1 +1,24 @@
-generator.o: generator.c generator.h
+$(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.h
+generator.o: $(hdrdir)/ruby/assert.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/onigmo.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: $(srcdir)/../fbuffer/fbuffer.h
+generator.o: generator.c
+generator.o: generator.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/json/generator/extconf.rb b/ext/json/generator/extconf.rb
index b94f71e8b3..8627c5f4bd 100644
--- a/ext/json/generator/extconf.rb
+++ b/ext/json/generator/extconf.rb
@@ -1,10 +1,4 @@
 require 'mkmf'
-require 'rbconfig'
 
-if RUBY_VERSION < "1.9"
-  have_header("re.h")
-else
-  have_header("ruby/re.h")
-  have_header("ruby/encoding.h")
-end
+$defs << "-DJSON_GENERATOR"
 create_makefile 'json/ext/generator'
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 9ad037cd40..881435e3dc 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -1,3 +1,4 @@
+#include "../fbuffer/fbuffer.h"
 #include "generator.h"
 
 #ifdef HAVE_RUBY_ENCODING_H
@@ -6,15 +7,22 @@ static ID i_encoding, i_encode;
 #endif
 
 static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
-             mHash, mArray, mFixnum, mBignum, mFloat, mString, mString_Extend,
+             mHash, mArray,
+#ifdef RUBY_INTEGER_UNIFICATION
+             mInteger,
+#else
+             mFixnum, mBignum,
+#endif
+             mFloat, mString, mString_Extend,
              mTrueClass, mFalseClass, mNilClass, eGeneratorError,
-             eNestingError, CRegexp_MULTILINE, CJSON_SAFE_STATE_PROTOTYPE,
+             eNestingError,
              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_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_dup;
+          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;
 
 /*
  * Copyright 2001-2004 Unicode, Inc.
@@ -112,7 +120,7 @@ static void unicode_escape(char *buf, UTF16 character)
 }
 
 /* Escapes the UTF16 character and stores the result in the buffer buf, then
- * the buffer buf іs appended to the FBuffer buffer. */
+ * the buffer buf is appended to the FBuffer buffer. */
 static void unicode_escape_to_buffer(FBuffer *buffer, char buf[6], UTF16
         character)
 {
@@ -214,6 +222,7 @@ 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
@@ -228,6 +237,7 @@ static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string)
     int escape_len;
     unsigned char c;
     char buf[6] = { '\\', 'u' };
+    int ascii_only = rb_enc_str_asciionly_p(string);
 
     for (start = 0, end = 0; end < len;) {
         p = ptr + end;
@@ -271,7 +281,21 @@ static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string)
                     escape_len = 2;
                     break;
                 default:
-                    end++;
+                    {
+                        unsigned short clen = 1;
+                        if (!ascii_only) {
+                            clen += trailingBytesForUTF8[c];
+                            if (end + clen > len) {
+                                rb_raise(rb_path2class("JSON::GeneratorError"),
+                                        "partial character in source, but hit end");
+                            }
+                            if (!isLegalUTF8((UTF8 *) p, clen)) {
+                                rb_raise(rb_path2class("JSON::GeneratorError"),
+                                        "source sequence is illegal/malformed utf-8");
+                            }
+                        }
+                        end += clen;
+                    }
                     continue;
                     break;
             }
@@ -288,127 +312,10 @@ static char *fstrndup(const char *ptr, unsigned long len) {
   char *result;
   if (len <= 0) return NULL;
   result = ALLOC_N(char, len);
-  memccpy(result, ptr, 0, len);
+  memcpy(result, ptr, len);
   return result;
 }
 
-/* fbuffer implementation */
-
-static FBuffer *fbuffer_alloc()
-{
-    FBuffer *fb = ALLOC(FBuffer);
-    memset((void *) fb, 0, sizeof(FBuffer));
-    fb->initial_length = FBUFFER_INITIAL_LENGTH;
-    return fb;
-}
-
-static FBuffer *fbuffer_alloc_with_length(unsigned long initial_length)
-{
-    FBuffer *fb;
-    assert(initial_length > 0);
-    fb = ALLOC(FBuffer);
-    memset((void *) fb, 0, sizeof(FBuffer));
-    fb->initial_length = initial_length;
-    return fb;
-}
-
-static void fbuffer_free(FBuffer *fb)
-{
-    if (fb->ptr) ruby_xfree(fb->ptr);
-    ruby_xfree(fb);
-}
-
-static void fbuffer_clear(FBuffer *fb)
-{
-    fb->len = 0;
-}
-
-static void fbuffer_inc_capa(FBuffer *fb, unsigned long requested)
-{
-    unsigned long required;
-
-    if (!fb->ptr) {
-        fb->ptr = ALLOC_N(char, fb->initial_length);
-        fb->capa = fb->initial_length;
-    }
-
-    for (required = fb->capa; requested > required - fb->len; required <<= 1);
-
-    if (required > fb->capa) {
-        REALLOC_N(fb->ptr, char, required);
-        fb->capa = required;
-    }
-}
-
-static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len)
-{
-    if (len > 0) {
-        fbuffer_inc_capa(fb, len);
-        MEMCPY(fb->ptr + fb->len, newstr, char, len);
-        fb->len += len;
-    }
-}
-
-static void fbuffer_append_str(FBuffer *fb, VALUE str)
-{
-    const char *newstr = StringValuePtr(str);
-    unsigned long len = RSTRING_LEN(str);
-
-    RB_GC_GUARD(str);
-
-    fbuffer_append(fb, newstr, len);
-}
-
-static void fbuffer_append_char(FBuffer *fb, char newchr)
-{
-    fbuffer_inc_capa(fb, 1);
-    *(fb->ptr + fb->len) = newchr;
-    fb->len++;
-}
-
-static void freverse(char *start, char *end)
-{
-    char c;
-
-    while (end > start) {
-        c = *end, *end-- = *start, *start++ = c;
-    }
-}
-
-static long fltoa(long number, char *buf)
-{
-    static char digits[] = "0123456789";
-    long sign = number;
-    char* tmp = buf;
-
-    if (sign < 0) number = -number;
-    do *tmp++ = digits[number % 10]; while (number /= 10);
-    if (sign < 0) *tmp++ = '-';
-    freverse(buf, tmp - 1);
-    return tmp - buf;
-}
-
-static void fbuffer_append_long(FBuffer *fb, long number)
-{
-    char buf[20];
-    unsigned long len = fltoa(number, buf);
-    fbuffer_append(fb, buf, len);
-}
-
-static FBuffer *fbuffer_dup(FBuffer *fb)
-{
-    unsigned long len = fb->len;
-    FBuffer *result;
-
-    if (len > 0) {
-        result = fbuffer_alloc_with_length(len);
-        fbuffer_append(result, FBUFFER_PAIR(fb));
-    } else {
-        result = fbuffer_alloc();
-    }
-    return result;
-}
-
 /*
  * Document-module: JSON::Ext::Generator
  *
@@ -446,6 +353,18 @@ 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(*)
  *
@@ -465,6 +384,7 @@ static VALUE mBignum_to_json(int argc, VALUE *argv, VALUE self)
 {
     GENERATE_JSON(bignum);
 }
+#endif
 
 /*
  * call-seq: to_json(*)
@@ -590,8 +510,9 @@ static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self)
     return cState_partial_generate(state, string);
 }
 
-static void State_free(JSON_Generator_State *state)
+static void State_free(void *ptr)
 {
+    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);
@@ -603,17 +524,37 @@ static void State_free(JSON_Generator_State *state)
     ruby_xfree(state);
 }
 
-static JSON_Generator_State *State_allocate()
-{
-    JSON_Generator_State *state = ALLOC(JSON_Generator_State);
-    MEMZERO(state, JSON_Generator_State, 1);
-    return 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 VALUE cState_s_allocate(VALUE klass)
 {
-    JSON_Generator_State *state = State_allocate();
-    return Data_Wrap_Struct(klass, NULL, State_free, state);
+    JSON_Generator_State *state;
+    return TypedData_Make_Struct(klass, JSON_Generator_State,
+				 &JSON_Generator_State_type, state);
 }
 
 /*
@@ -626,18 +567,15 @@ static VALUE cState_configure(VALUE self, VALUE opts)
 {
     VALUE tmp;
     GET_STATE(self);
-    tmp = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
+    tmp = rb_check_convert_type(opts, T_HASH, "Hash", "to_hash");
     if (NIL_P(tmp)) tmp = rb_convert_type(opts, T_HASH, "Hash", "to_h");
-    if (NIL_P(tmp)) {
-        rb_raise(rb_eArgError, "opts has to be hash like or convertable into a hash");
-    }
     opts = tmp;
     tmp = rb_hash_aref(opts, ID2SYM(i_indent));
     if (RTEST(tmp)) {
         unsigned long len;
         Check_Type(tmp, T_STRING);
         len = RSTRING_LEN(tmp);
-        state->indent = fstrndup(RSTRING_PTR(tmp), len);
+        state->indent = fstrndup(RSTRING_PTR(tmp), len + 1);
         state->indent_len = len;
     }
     tmp = rb_hash_aref(opts, ID2SYM(i_space));
@@ -645,7 +583,7 @@ static VALUE cState_configure(VALUE self, VALUE opts)
         unsigned long len;
         Check_Type(tmp, T_STRING);
         len = RSTRING_LEN(tmp);
-        state->space = fstrndup(RSTRING_PTR(tmp), len);
+        state->space = fstrndup(RSTRING_PTR(tmp), len + 1);
         state->space_len = len;
     }
     tmp = rb_hash_aref(opts, ID2SYM(i_space_before));
@@ -653,7 +591,7 @@ static VALUE cState_configure(VALUE self, VALUE opts)
         unsigned long len;
         Check_Type(tmp, T_STRING);
         len = RSTRING_LEN(tmp);
-        state->space_before = fstrndup(RSTRING_PTR(tmp), len);
+        state->space_before = fstrndup(RSTRING_PTR(tmp), len + 1);
         state->space_before_len = len;
     }
     tmp = rb_hash_aref(opts, ID2SYM(i_array_nl));
@@ -661,7 +599,7 @@ static VALUE cState_configure(VALUE self, VALUE opts)
         unsigned long len;
         Check_Type(tmp, T_STRING);
         len = RSTRING_LEN(tmp);
-        state->array_nl = fstrndup(RSTRING_PTR(tmp), len);
+        state->array_nl = fstrndup(RSTRING_PTR(tmp), len + 1);
         state->array_nl_len = len;
     }
     tmp = rb_hash_aref(opts, ID2SYM(i_object_nl));
@@ -669,11 +607,11 @@ static VALUE cState_configure(VALUE self, VALUE opts)
         unsigned long len;
         Check_Type(tmp, T_STRING);
         len = RSTRING_LEN(tmp);
-        state->object_nl = fstrndup(RSTRING_PTR(tmp), len);
+        state->object_nl = fstrndup(RSTRING_PTR(tmp), len + 1);
         state->object_nl_len = len;
     }
     tmp = ID2SYM(i_max_nesting);
-    state->max_nesting = 19;
+    state->max_nesting = 100;
     if (option_given_p(opts, tmp)) {
         VALUE max_nesting = rb_hash_aref(opts, tmp);
         if (RTEST(max_nesting)) {
@@ -694,15 +632,35 @@ static VALUE cState_configure(VALUE self, VALUE opts)
             state->depth = 0;
         }
     }
+    tmp = ID2SYM(i_buffer_initial_length);
+    if (option_given_p(opts, tmp)) {
+        VALUE buffer_initial_length = rb_hash_aref(opts, tmp);
+        if (RTEST(buffer_initial_length)) {
+            long initial_length;
+            Check_Type(buffer_initial_length, T_FIXNUM);
+            initial_length = FIX2LONG(buffer_initial_length);
+            if (initial_length > 0) state->buffer_initial_length = initial_length;
+        }
+    }
     tmp = rb_hash_aref(opts, ID2SYM(i_allow_nan));
     state->allow_nan = RTEST(tmp);
     tmp = rb_hash_aref(opts, ID2SYM(i_ascii_only));
     state->ascii_only = RTEST(tmp);
-    tmp = rb_hash_aref(opts, ID2SYM(i_quirks_mode));
-    state->quirks_mode = RTEST(tmp);
     return self;
 }
 
+static void set_state_ivars(VALUE hash, VALUE state)
+{
+    VALUE ivars = rb_obj_instance_variables(state);
+    int i = 0;
+    for (i = 0; i < RARRAY_LEN(ivars); i++) {
+        VALUE key = rb_funcall(rb_ary_entry(ivars, i), i_to_s, 0);
+        long key_len = RSTRING_LEN(key);
+        VALUE value = rb_iv_get(state, StringValueCStr(key));
+        rb_hash_aset(hash, rb_str_intern(rb_str_substr(key, 1, key_len - 1)), value);
+    }
+}
+
 /*
  * call-seq: to_h
  *
@@ -713,6 +671,7 @@ static VALUE cState_to_h(VALUE self)
 {
     VALUE result = rb_hash_new();
     GET_STATE(self);
+    set_state_ivars(result, self);
     rb_hash_aset(result, ID2SYM(i_indent), rb_str_new(state->indent, state->indent_len));
     rb_hash_aset(result, ID2SYM(i_space), rb_str_new(state->space, state->space_len));
     rb_hash_aset(result, ID2SYM(i_space_before), rb_str_new(state->space_before, state->space_before_len));
@@ -720,64 +679,123 @@ 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));
     return result;
 }
 
 /*
 * call-seq: [](name)
 *
-* Return the value returned by method +name+.
+* Returns the value returned by method +name+.
 */
 static VALUE cState_aref(VALUE self, VALUE name)
 {
-    GET_STATE(self);
+    name = rb_funcall(name, i_to_s, 0);
     if (RTEST(rb_funcall(self, i_respond_to_p, 1, name))) {
         return rb_funcall(self, i_send, 1, name);
     } else {
-        return Qnil;
+        return rb_attr_get(self, rb_intern_str(rb_str_concat(rb_str_new2("@"), name)));
     }
 }
 
-static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+/*
+* call-seq: []=(name, value)
+*
+* Sets the attribute name to value.
+*/
+static VALUE cState_aset(VALUE self, VALUE name, VALUE value)
+{
+    VALUE name_writer;
+
+    name = rb_funcall(name, i_to_s, 0);
+    name_writer = rb_str_cat2(rb_str_dup(name), "=");
+    if (RTEST(rb_funcall(self, i_respond_to_p, 1, name_writer))) {
+        return rb_funcall(self, i_send, 2, name_writer, value);
+    } else {
+        rb_ivar_set(self, rb_intern_str(rb_str_concat(rb_str_new2("@"), name)), value);
+    }
+    return Qnil;
+}
+
+struct hash_foreach_arg {
+    FBuffer *buffer;
+    JSON_Generator_State *state;
+    VALUE Vstate;
+    int iter;
+};
+
+static int
+json_object_i(VALUE key, VALUE val, VALUE _arg)
 {
+    struct hash_foreach_arg *arg = (struct hash_foreach_arg *)_arg;
+    FBuffer *buffer = arg->buffer;
+    JSON_Generator_State *state = arg->state;
+    VALUE Vstate = arg->Vstate;
+
     char *object_nl = state->object_nl;
     long object_nl_len = state->object_nl_len;
     char *indent = state->indent;
     long indent_len = state->indent_len;
-    long max_nesting = state->max_nesting;
     char *delim = FBUFFER_PTR(state->object_delim);
     long delim_len = FBUFFER_LEN(state->object_delim);
     char *delim2 = FBUFFER_PTR(state->object_delim2);
     long delim2_len = FBUFFER_LEN(state->object_delim2);
+    long depth = state->depth;
+    int j;
+    VALUE klass, key_to_s;
+
+    if (arg->iter > 0) fbuffer_append(buffer, delim, delim_len);
+    if (object_nl) {
+        fbuffer_append(buffer, object_nl, object_nl_len);
+    }
+    if (indent) {
+        for (j = 0; j < depth; j++) {
+            fbuffer_append(buffer, indent, indent_len);
+        }
+    }
+
+    klass = CLASS_OF(key);
+    if (klass == rb_cString) {
+        key_to_s = key;
+    } else if (klass == rb_cSymbol) {
+        key_to_s = rb_id2str(SYM2ID(key));
+    } else {
+        key_to_s = rb_funcall(key, i_to_s, 0);
+    }
+    Check_Type(key_to_s, T_STRING);
+    generate_json(buffer, Vstate, state, key_to_s);
+    fbuffer_append(buffer, delim2, delim2_len);
+    generate_json(buffer, Vstate, state, val);
+
+    arg->iter++;
+    return ST_CONTINUE;
+}
+
+static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+{
+    char *object_nl = state->object_nl;
+    long object_nl_len = state->object_nl_len;
+    char *indent = state->indent;
+    long indent_len = state->indent_len;
+    long max_nesting = state->max_nesting;
     long depth = ++state->depth;
-    int i, j;
-    VALUE key, key_to_s, keys;
+    int j;
+    struct hash_foreach_arg arg;
+
     if (max_nesting != 0 && depth > max_nesting) {
         fbuffer_free(buffer);
         rb_raise(eNestingError, "nesting of %ld is too deep", --state->depth);
     }
     fbuffer_append_char(buffer, '{');
-    keys = rb_funcall(obj, i_keys, 0);
-    for(i = 0; i < RARRAY_LEN(keys); i++) {
-        if (i > 0) fbuffer_append(buffer, delim, delim_len);
-        if (object_nl) {
-            fbuffer_append(buffer, object_nl, object_nl_len);
-        }
-        if (indent) {
-            for (j = 0; j < depth; j++) {
-                fbuffer_append(buffer, indent, indent_len);
-            }
-        }
-        key = rb_ary_entry(keys, i);
-        key_to_s = rb_funcall(key, i_to_s, 0);
-        Check_Type(key_to_s, T_STRING);
-        generate_json(buffer, Vstate, state, key_to_s);
-        fbuffer_append(buffer, delim2, delim2_len);
-        generate_json(buffer, Vstate, state, rb_hash_aref(obj, key));
-    }
+
+    arg.buffer = buffer;
+    arg.state = state;
+    arg.Vstate = Vstate;
+    arg.iter = 0;
+    rb_hash_foreach(obj, json_object_i, (VALUE)&arg);
+
     depth = --state->depth;
     if (object_nl) {
         fbuffer_append(buffer, object_nl, object_nl_len);
@@ -828,11 +846,22 @@ static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
     fbuffer_append_char(buffer, ']');
 }
 
+#ifdef HAVE_RUBY_ENCODING_H
+static int enc_utf8_compatible_p(rb_encoding *enc)
+{
+    if (enc == rb_usascii_encoding()) return 1;
+    if (enc == rb_utf8_encoding()) return 1;
+    return 0;
+}
+#endif
+
 static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
 {
     fbuffer_append_char(buffer, '"');
 #ifdef HAVE_RUBY_ENCODING_H
-    obj = rb_funcall(obj, i_encode, 1, CEncoding_UTF_8);
+    if (!enc_utf8_compatible_p(rb_enc_get(obj))) {
+        obj = rb_str_encode(obj, CEncoding_UTF_8, 0, Qnil);
+    }
 #endif
     if (state->ascii_only) {
         convert_UTF8_to_JSON_ASCII(buffer, obj);
@@ -868,6 +897,15 @@ 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);
@@ -876,10 +914,10 @@ static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
     if (!allow_nan) {
         if (isinf(value)) {
             fbuffer_free(buffer);
-            rb_raise(eGeneratorError, "%u: %s not allowed in JSON", __LINE__, StringValueCStr(tmp));
+            rb_raise(eGeneratorError, "%u: %"PRIsVALUE" not allowed in JSON", __LINE__, RB_OBJ_STRING(tmp));
         } else if (isnan(value)) {
             fbuffer_free(buffer);
-            rb_raise(eGeneratorError, "%u: %s not allowed in JSON", __LINE__, StringValueCStr(tmp));
+            rb_raise(eGeneratorError, "%u: %"PRIsVALUE" not allowed in JSON", __LINE__, RB_OBJ_STRING(tmp));
         }
     }
     fbuffer_append_str(buffer, tmp);
@@ -901,9 +939,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 (klass == rb_cFixnum) {
+    } else if (FIXNUM_P(obj)) {
         generate_json_fixnum(buffer, Vstate, state, obj);
-    } else if (klass == rb_cBignum) {
+    } else if (RB_TYPE_P(obj, T_BIGNUM)) {
         generate_json_bignum(buffer, Vstate, state, obj);
     } else if (klass == rb_cFloat) {
         generate_json_float(buffer, Vstate, state, obj);
@@ -914,47 +952,41 @@ 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(buffer, Vstate, state, tmp);
+        generate_json_string(buffer, Vstate, state, tmp);
     }
 }
 
 static FBuffer *cState_prepare_buffer(VALUE self)
 {
-    FBuffer *buffer = fbuffer_alloc();
+    FBuffer *buffer;
     GET_STATE(self);
+    buffer = fbuffer_alloc(state->buffer_initial_length);
 
     if (state->object_delim) {
         fbuffer_clear(state->object_delim);
     } else {
-        state->object_delim = fbuffer_alloc_with_length(16);
+        state->object_delim = fbuffer_alloc(16);
     }
     fbuffer_append_char(state->object_delim, ',');
     if (state->object_delim2) {
         fbuffer_clear(state->object_delim2);
     } else {
-        state->object_delim2 = fbuffer_alloc_with_length(16);
+        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);
 
     if (state->array_delim) {
         fbuffer_clear(state->array_delim);
     } else {
-        state->array_delim = fbuffer_alloc_with_length(16);
+        state->array_delim = fbuffer_alloc(16);
     }
     fbuffer_append_char(state->array_delim, ',');
     if (state->array_nl) fbuffer_append(state->array_delim, state->array_nl, state->array_nl_len);
     return buffer;
 }
 
-static VALUE fbuffer_to_s(FBuffer *fb)
-{
-    VALUE result = rb_str_new(FBUFFER_PAIR(fb));
-    fbuffer_free(fb);
-    FORCE_UTF8(result);
-    return result;
-}
-
 static VALUE cState_partial_generate(VALUE self, VALUE obj)
 {
     FBuffer *buffer = cState_prepare_buffer(self);
@@ -973,16 +1005,8 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj)
 static VALUE cState_generate(VALUE self, VALUE obj)
 {
     VALUE result = cState_partial_generate(self, obj);
-    VALUE re, args[2];
     GET_STATE(self);
-    if (!state->quirks_mode) {
-        args[0] = rb_str_new2("\\A\\s*(?:\\[.*\\]|\\{.*\\})\\s*\\Z");
-        args[1] = CRegexp_MULTILINE;
-        re = rb_class_new_instance(2, args, rb_cRegexp);
-        if (NIL_P(rb_funcall(re, i_match, 1, result))) {
-            rb_raise(eGeneratorError, "only generation of JSON objects or arrays allowed");
-        }
-    }
+    (void)state;
     return result;
 }
 
@@ -1001,14 +1025,17 @@ 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.
+ * * *ascii_only*: true if only ASCII characters should be generated. This
+ *   ontions defaults to false.
+ * * *buffer_initial_length*: sets the initial length of the generator's
+ *   internal buffer.
  */
 static VALUE cState_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE opts;
     GET_STATE(self);
-    state->max_nesting = 19;
+    state->max_nesting = 100;
+    state->buffer_initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT;
     rb_scan_args(argc, argv, "01", &opts);
     if (!NIL_P(opts)) cState_configure(self, opts);
     return self;
@@ -1017,15 +1044,16 @@ static VALUE cState_initialize(int argc, VALUE *argv, VALUE self)
 /*
  * call-seq: initialize_copy(orig)
  *
- * Initializes this object from orig if it to be duplicated/cloned and returns
+ * Initializes this object from orig if it can be duplicated/cloned and returns
  * it.
 */
 static VALUE cState_init_copy(VALUE obj, VALUE orig)
 {
     JSON_Generator_State *objState, *origState;
 
-    Data_Get_Struct(obj, JSON_Generator_State, objState);
-    Data_Get_Struct(orig, JSON_Generator_State, origState);
+    if (obj == orig) return obj;
+    GET_STATE_TO(obj, objState);
+    GET_STATE_TO(orig, origState);
     if (!objState) rb_raise(rb_eArgError, "unallocated JSON::State");
 
     MEMCPY(objState, origState, JSON_Generator_State, 1);
@@ -1054,28 +1082,26 @@ static VALUE cState_from_state_s(VALUE self, VALUE opts)
     } else if (rb_obj_is_kind_of(opts, rb_cHash)) {
         return rb_funcall(self, i_new, 1, opts);
     } else {
-        if (NIL_P(CJSON_SAFE_STATE_PROTOTYPE)) {
-            CJSON_SAFE_STATE_PROTOTYPE = rb_const_get(mJSON, i_SAFE_STATE_PROTOTYPE);
-        }
-        return rb_funcall(CJSON_SAFE_STATE_PROTOTYPE, i_dup, 0);
+        VALUE prototype = rb_const_get(mJSON, i_SAFE_STATE_PROTOTYPE);
+        return rb_funcall(prototype, i_dup, 0);
     }
 }
 
 /*
  * call-seq: indent()
  *
- * This string is used to indent levels in the JSON text.
+ * Returns the string that is used to indent levels in the JSON text.
  */
 static VALUE cState_indent(VALUE self)
 {
     GET_STATE(self);
-    return state->indent ? rb_str_new2(state->indent) : rb_str_new2("");
+    return state->indent ? rb_str_new(state->indent, state->indent_len) : rb_str_new2("");
 }
 
 /*
  * call-seq: indent=(indent)
  *
- * This string is used to indent levels in the JSON text.
+ * Sets the string that is used to indent levels in the JSON text.
  */
 static VALUE cState_indent_set(VALUE self, VALUE indent)
 {
@@ -1091,7 +1117,7 @@ static VALUE cState_indent_set(VALUE self, VALUE indent)
         }
     } else {
         if (state->indent) ruby_xfree(state->indent);
-        state->indent = strdup(RSTRING_PTR(indent));
+        state->indent = fstrndup(RSTRING_PTR(indent), len);
         state->indent_len = len;
     }
     return Qnil;
@@ -1100,19 +1126,19 @@ static VALUE cState_indent_set(VALUE self, VALUE indent)
 /*
  * call-seq: space()
  *
- * This string is used to insert a space between the tokens in a JSON
+ * Returns the string that is used to insert a space between the tokens in a JSON
  * string.
  */
 static VALUE cState_space(VALUE self)
 {
     GET_STATE(self);
-    return state->space ? rb_str_new2(state->space) : rb_str_new2("");
+    return state->space ? rb_str_new(state->space, state->space_len) : rb_str_new2("");
 }
 
 /*
  * call-seq: space=(space)
  *
- * This string is used to insert a space between the tokens in a JSON
+ * Sets _space_ to the string that is used to insert a space between the tokens in a JSON
  * string.
  */
 static VALUE cState_space_set(VALUE self, VALUE space)
@@ -1129,7 +1155,7 @@ static VALUE cState_space_set(VALUE self, VALUE space)
         }
     } else {
         if (state->space) ruby_xfree(state->space);
-        state->space = strdup(RSTRING_PTR(space));
+        state->space = fstrndup(RSTRING_PTR(space), len);
         state->space_len = len;
     }
     return Qnil;
@@ -1138,18 +1164,18 @@ static VALUE cState_space_set(VALUE self, VALUE space)
 /*
  * call-seq: space_before()
  *
- * This string is used to insert a space before the ':' in JSON objects.
+ * Returns the string that is used to insert a space before the ':' in JSON objects.
  */
 static VALUE cState_space_before(VALUE self)
 {
     GET_STATE(self);
-    return state->space_before ? rb_str_new2(state->space_before) : rb_str_new2("");
+    return state->space_before ? rb_str_new(state->space_before, state->space_before_len) : rb_str_new2("");
 }
 
 /*
  * call-seq: space_before=(space_before)
  *
- * This string is used to insert a space before the ':' in JSON objects.
+ * Sets the string that is used to insert a space before the ':' in JSON objects.
  */
 static VALUE cState_space_before_set(VALUE self, VALUE space_before)
 {
@@ -1165,7 +1191,7 @@ static VALUE cState_space_before_set(VALUE self, VALUE space_before)
         }
     } else {
         if (state->space_before) ruby_xfree(state->space_before);
-        state->space_before = strdup(RSTRING_PTR(space_before));
+        state->space_before = fstrndup(RSTRING_PTR(space_before), len);
         state->space_before_len = len;
     }
     return Qnil;
@@ -1180,7 +1206,7 @@ static VALUE cState_space_before_set(VALUE self, VALUE space_before)
 static VALUE cState_object_nl(VALUE self)
 {
     GET_STATE(self);
-    return state->object_nl ? rb_str_new2(state->object_nl) : rb_str_new2("");
+    return state->object_nl ? rb_str_new(state->object_nl, state->object_nl_len) : rb_str_new2("");
 }
 
 /*
@@ -1202,7 +1228,7 @@ static VALUE cState_object_nl_set(VALUE self, VALUE object_nl)
         }
     } else {
         if (state->object_nl) ruby_xfree(state->object_nl);
-        state->object_nl = strdup(RSTRING_PTR(object_nl));
+        state->object_nl = fstrndup(RSTRING_PTR(object_nl), len);
         state->object_nl_len = len;
     }
     return Qnil;
@@ -1216,7 +1242,7 @@ static VALUE cState_object_nl_set(VALUE self, VALUE object_nl)
 static VALUE cState_array_nl(VALUE self)
 {
     GET_STATE(self);
-    return state->array_nl ? rb_str_new2(state->array_nl) : rb_str_new2("");
+    return state->array_nl ? rb_str_new(state->array_nl, state->array_nl_len) : rb_str_new2("");
 }
 
 /*
@@ -1237,7 +1263,7 @@ static VALUE cState_array_nl_set(VALUE self, VALUE array_nl)
         }
     } else {
         if (state->array_nl) ruby_xfree(state->array_nl);
-        state->array_nl = strdup(RSTRING_PTR(array_nl));
+        state->array_nl = fstrndup(RSTRING_PTR(array_nl), len);
         state->array_nl_len = len;
     }
     return Qnil;
@@ -1296,7 +1322,7 @@ static VALUE cState_allow_nan_p(VALUE self)
 /*
  * call-seq: ascii_only?
  *
- * Returns true, if NaN, Infinity, and -Infinity should be generated, otherwise
+ * Returns true, if only ASCII characters should be generated. Otherwise
  * returns false.
  */
 static VALUE cState_ascii_only_p(VALUE self)
@@ -1306,57 +1332,65 @@ static VALUE cState_ascii_only_p(VALUE self)
 }
 
 /*
- * call-seq: quirks_mode?
+ * call-seq: depth
  *
- * Returns true, if quirks mode is enabled. Otherwise returns false.
+ * This integer returns the current depth of data structure nesting.
  */
-static VALUE cState_quirks_mode_p(VALUE self)
+static VALUE cState_depth(VALUE self)
 {
     GET_STATE(self);
-    return state->quirks_mode ? Qtrue : Qfalse;
+    return LONG2FIX(state->depth);
 }
 
 /*
- * call-seq: quirks_mode=(enable)
+ * call-seq: depth=(depth)
  *
- * If set to true, enables the quirks_mode mode.
+ * This sets the maximum level of data structure nesting in the generated JSON
+ * to the integer depth, max_nesting = 0 if no maximum should be checked.
  */
-static VALUE cState_quirks_mode_set(VALUE self, VALUE enable)
+static VALUE cState_depth_set(VALUE self, VALUE depth)
 {
     GET_STATE(self);
-    state->quirks_mode = RTEST(enable);
+    Check_Type(depth, T_FIXNUM);
+    state->depth = FIX2LONG(depth);
     return Qnil;
 }
 
 /*
- * call-seq: depth
+ * call-seq: buffer_initial_length
  *
- * This integer returns the current depth of data structure nesting.
+ * This integer returns the current initial length of the buffer.
  */
-static VALUE cState_depth(VALUE self)
+static VALUE cState_buffer_initial_length(VALUE self)
 {
     GET_STATE(self);
-    return LONG2FIX(state->depth);
+    return LONG2FIX(state->buffer_initial_length);
 }
 
 /*
- * call-seq: depth=(depth)
+ * call-seq: buffer_initial_length=(length)
  *
- * This sets the maximum level of data structure nesting in the generated JSON
- * to the integer depth, max_nesting = 0 if no maximum should be checked.
+ * This sets the initial length of the buffer to +length+, if +length+ > 0,
+ * otherwise its value isn't changed.
  */
-static VALUE cState_depth_set(VALUE self, VALUE depth)
+static VALUE cState_buffer_initial_length_set(VALUE self, VALUE buffer_initial_length)
 {
+    long initial_length;
     GET_STATE(self);
-    Check_Type(depth, T_FIXNUM);
-    return state->depth = FIX2LONG(depth);
+    Check_Type(buffer_initial_length, T_FIXNUM);
+    initial_length = FIX2LONG(buffer_initial_length);
+    if (initial_length > 0) {
+        state->buffer_initial_length = initial_length;
+    }
+    return Qnil;
 }
 
 /*
  *
  */
-void Init_generator()
+void Init_generator(void)
 {
+#undef rb_intern
     rb_require("json/common");
 
     mJSON = rb_define_module("JSON");
@@ -1365,6 +1399,8 @@ void Init_generator()
 
     eGeneratorError = rb_path2class("JSON::GeneratorError");
     eNestingError = rb_path2class("JSON::NestingError");
+    rb_gc_register_mark_object(eGeneratorError);
+    rb_gc_register_mark_object(eNestingError);
 
     cState = rb_define_class_under(mGenerator, "State", rb_cObject);
     rb_define_alloc_func(cState, cState_s_allocate);
@@ -1386,15 +1422,16 @@ void Init_generator()
     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);
+    rb_define_method(cState, "buffer_initial_length=", cState_buffer_initial_length_set, 1);
     rb_define_method(cState, "configure", cState_configure, 1);
     rb_define_alias(cState, "merge", "configure");
     rb_define_method(cState, "to_h", cState_to_h, 0);
+    rb_define_alias(cState, "to_hash", "to_h");
     rb_define_method(cState, "[]", cState_aref, 1);
+    rb_define_method(cState, "[]=", cState_aset, 2);
     rb_define_method(cState, "generate", cState_generate, 1);
 
     mGeneratorMethods = rb_define_module_under(mGenerator, "GeneratorMethods");
@@ -1404,10 +1441,15 @@ void Init_generator()
     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");
@@ -1424,7 +1466,6 @@ void Init_generator()
     mNilClass = rb_define_module_under(mGeneratorMethods, "NilClass");
     rb_define_method(mNilClass, "to_json", mNilClass_to_json, -1);
 
-    CRegexp_MULTILINE = rb_const_get(rb_cRegexp, rb_intern("MULTILINE"));
     i_to_s = rb_intern("to_s");
     i_to_json = rb_intern("to_json");
     i_new = rb_intern("new");
@@ -1436,8 +1477,8 @@ void Init_generator()
     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");
     i_unpack = rb_intern("unpack");
     i_create_id = rb_intern("create_id");
@@ -1455,5 +1496,4 @@ void Init_generator()
     i_encode = rb_intern("encode");
 #endif
     i_SAFE_STATE_PROTOTYPE = rb_intern("SAFE_STATE_PROTOTYPE");
-    CJSON_SAFE_STATE_PROTOTYPE = Qnil;
 }
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index f882ea004b..c367a6209a 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -1,83 +1,28 @@
 #ifndef _GENERATOR_H_
 #define _GENERATOR_H_
 
-#include <string.h>
-#include <assert.h>
 #include <math.h>
+#include <ctype.h>
 
 #include "ruby.h"
 
-#if HAVE_RUBY_RE_H
+#ifdef HAVE_RUBY_RE_H
 #include "ruby/re.h"
-#endif
-
-#if HAVE_RE_H
-#include "re.h"
-#endif
-
-#ifdef HAVE_RUBY_ENCODING_H
-#include "ruby/encoding.h"
-#define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding())
 #else
-#define FORCE_UTF8(obj)
-#endif
-
-#define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
-
-#ifndef RHASH_SIZE
-#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries)
-#endif
-
-#ifndef RFLOAT_VALUE
-#define RFLOAT_VALUE(val) (RFLOAT(val)->value)
+#include "re.h"
 #endif
 
-#ifndef RARRAY_PTR
-#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr
-#endif
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
-#endif
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(string) RSTRING(string)->ptr
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(string) RSTRING(string)->len
+#ifndef rb_intern_str
+#define rb_intern_str(string) SYM2ID(rb_str_intern(string))
 #endif
 
-/* We don't need to guard objects for rbx, so let's do nothing at all. */
-#ifndef RB_GC_GUARD
-#define RB_GC_GUARD(object)
+#ifndef rb_obj_instance_variables
+#define rb_obj_instance_variables(object) rb_funcall(object, rb_intern("instance_variables"), 0)
 #endif
 
-/* fbuffer implementation */
-
-typedef struct FBufferStruct {
-    unsigned long initial_length;
-    char *ptr;
-    unsigned long len;
-    unsigned long capa;
-} FBuffer;
-
-#define FBUFFER_INITIAL_LENGTH 4096
-
-#define FBUFFER_PTR(fb) (fb->ptr)
-#define FBUFFER_LEN(fb) (fb->len)
-#define FBUFFER_CAPA(fb) (fb->capa)
-#define FBUFFER_PAIR(fb) FBUFFER_PTR(fb), FBUFFER_LEN(fb)
+#define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
 
-static char *fstrndup(const char *ptr, unsigned long len);
-static FBuffer *fbuffer_alloc();
-static FBuffer *fbuffer_alloc_with_length(unsigned long initial_length);
-static void fbuffer_free(FBuffer *fb);
-static void fbuffer_clear(FBuffer *fb);
-static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len);
-static void fbuffer_append_long(FBuffer *fb, long number);
-static void fbuffer_append_char(FBuffer *fb, char newchr);
-static FBuffer *fbuffer_dup(FBuffer *fb);
-static VALUE fbuffer_to_s(FBuffer *fb);
-
-/* unicode defintions */
+/* unicode definitions */
 
 #define UNI_STRICT_CONVERSION 1
 
@@ -106,6 +51,7 @@ static void unicode_escape(char *buf, UTF16 character);
 static void unicode_escape_to_buffer(FBuffer *buffer, char buf[6], UTF16 character);
 static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string);
 static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string);
+static char *fstrndup(const char *ptr, unsigned long len);
 
 /* ruby api and some helpers */
 
@@ -126,13 +72,16 @@ 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;              \
-    Data_Get_Struct(self, JSON_Generator_State, state)
+    GET_STATE_TO(self, state)
 
 #define GENERATE_JSON(type)                                                                     \
     FBuffer *buffer;                                                                            \
@@ -141,15 +90,19 @@ typedef struct JSON_Generator_StateStruct {
                                                                                                 \
     rb_scan_args(argc, argv, "01", &Vstate);                                                    \
     Vstate = cState_from_state_s(cState, Vstate);                                               \
-    Data_Get_Struct(Vstate, JSON_Generator_State, state);                                       \
+    TypedData_Get_Struct(Vstate, JSON_Generator_State, &JSON_Generator_State_type, 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);
@@ -160,8 +113,7 @@ static VALUE mTrueClass_to_json(int argc, VALUE *argv, VALUE self);
 static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self);
 static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self);
 static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self);
-static void State_free(JSON_Generator_State *state);
-static JSON_Generator_State *State_allocate();
+static void State_free(void *state);
 static VALUE cState_s_allocate(VALUE klass);
 static VALUE cState_configure(VALUE self, VALUE opts);
 static VALUE cState_to_h(VALUE self);
@@ -172,6 +124,9 @@ 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);
@@ -196,5 +151,21 @@ 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
new file mode 100644
index 0000000000..d8be2e52c6
--- /dev/null
+++ b/ext/json/json.gemspec
@@ -0,0 +1,133 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "json"
+  s.version = "2.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["Florian Frank"]
+  s.date = "2019-12-11"
+  s.description = "This is a JSON implementation as a Ruby extension in C."
+  s.email = "flori@ping.de"
+  s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb", "ext/json/extconf.rb"]
+  s.extra_rdoc_files = ["README.md"]
+  s.files = [
+    ".gitignore",
+    ".travis.yml",
+    "CHANGES.md",
+    "Gemfile",
+    "README-json-jruby.md",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "diagrams/.keep",
+    "ext/json/ext/fbuffer/fbuffer.h",
+    "ext/json/ext/generator/depend",
+    "ext/json/ext/generator/extconf.rb",
+    "ext/json/ext/generator/generator.c",
+    "ext/json/ext/generator/generator.h",
+    "ext/json/ext/parser/depend",
+    "ext/json/ext/parser/extconf.rb",
+    "ext/json/ext/parser/parser.c",
+    "ext/json/ext/parser/parser.h",
+    "ext/json/ext/parser/parser.rl",
+    "ext/json/extconf.rb",
+    "install.rb",
+    "java/src/json/ext/ByteListTranscoder.java",
+    "java/src/json/ext/Generator.java",
+    "java/src/json/ext/GeneratorMethods.java",
+    "java/src/json/ext/GeneratorService.java",
+    "java/src/json/ext/GeneratorState.java",
+    "java/src/json/ext/OptionsReader.java",
+    "java/src/json/ext/Parser.java",
+    "java/src/json/ext/Parser.rl",
+    "java/src/json/ext/ParserService.java",
+    "java/src/json/ext/RuntimeInfo.java",
+    "java/src/json/ext/StringDecoder.java",
+    "java/src/json/ext/StringEncoder.java",
+    "java/src/json/ext/Utils.java",
+    "json-java.gemspec",
+    "json.gemspec",
+    "json_pure.gemspec",
+    "lib/json.rb",
+    "lib/json/add/bigdecimal.rb",
+    "lib/json/add/complex.rb",
+    "lib/json/add/core.rb",
+    "lib/json/add/date.rb",
+    "lib/json/add/date_time.rb",
+    "lib/json/add/exception.rb",
+    "lib/json/add/ostruct.rb",
+    "lib/json/add/range.rb",
+    "lib/json/add/rational.rb",
+    "lib/json/add/regexp.rb",
+    "lib/json/add/set.rb",
+    "lib/json/add/struct.rb",
+    "lib/json/add/symbol.rb",
+    "lib/json/add/time.rb",
+    "lib/json/common.rb",
+    "lib/json/ext.rb",
+    "lib/json/ext/.keep",
+    "lib/json/generic_object.rb",
+    "lib/json/pure.rb",
+    "lib/json/pure/generator.rb",
+    "lib/json/pure/parser.rb",
+    "lib/json/version.rb",
+    "references/rfc7159.txt",
+    "tests/fixtures/fail10.json",
+    "tests/fixtures/fail11.json",
+    "tests/fixtures/fail12.json",
+    "tests/fixtures/fail13.json",
+    "tests/fixtures/fail14.json",
+    "tests/fixtures/fail18.json",
+    "tests/fixtures/fail19.json",
+    "tests/fixtures/fail2.json",
+    "tests/fixtures/fail20.json",
+    "tests/fixtures/fail21.json",
+    "tests/fixtures/fail22.json",
+    "tests/fixtures/fail23.json",
+    "tests/fixtures/fail24.json",
+    "tests/fixtures/fail25.json",
+    "tests/fixtures/fail27.json",
+    "tests/fixtures/fail28.json",
+    "tests/fixtures/fail3.json",
+    "tests/fixtures/fail4.json",
+    "tests/fixtures/fail5.json",
+    "tests/fixtures/fail6.json",
+    "tests/fixtures/fail7.json",
+    "tests/fixtures/fail8.json",
+    "tests/fixtures/fail9.json",
+    "tests/fixtures/obsolete_fail1.json",
+    "tests/fixtures/pass1.json",
+    "tests/fixtures/pass15.json",
+    "tests/fixtures/pass16.json",
+    "tests/fixtures/pass17.json",
+    "tests/fixtures/pass2.json",
+    "tests/fixtures/pass26.json",
+    "tests/fixtures/pass3.json",
+    "tests/json_addition_test.rb",
+    "tests/json_common_interface_test.rb",
+    "tests/json_encoding_test.rb",
+    "tests/json_ext_parser_test.rb",
+    "tests/json_fixtures_test.rb",
+    "tests/json_generator_test.rb",
+    "tests/json_generic_object_test.rb",
+    "tests/json_parser_test.rb",
+    "tests/json_string_matching_test.rb",
+    "tests/test_helper.rb",
+    "tests/test_helper.rb",
+    "tools/diff.sh",
+    "tools/fuzz.rb",
+    "tools/server.rb",
+  ]
+  s.homepage = "http://flori.github.com/json"
+  s.licenses = ["Ruby"]
+  s.rdoc_options = ["--title", "JSON implemention for Ruby", "--main", "README.md"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9")
+  s.rubygems_version = "3.0.3"
+  s.summary = "JSON Implementation for Ruby"
+  s.test_files = ["tests/test_helper.rb"]
+
+  s.add_development_dependency("rake", [">= 0"])
+  s.add_development_dependency("test-unit", ["~> 2.0"])
+end
diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb
index 00fe4cae84..b5a6912415 100644
--- a/ext/json/lib/json.rb
+++ b/ext/json/lib/json.rb
@@ -1,3 +1,6 @@
+#frozen_string_literal: false
+require 'json/common'
+
 ##
 # = JavaScript Object Notation (JSON)
 #
@@ -49,8 +52,6 @@
 #
 #   1.to_json => "1"
 #
-
-require 'json/common'
 module JSON
   require 'json/version'
 
diff --git a/ext/json/lib/json/add/bigdecimal.rb b/ext/json/lib/json/add/bigdecimal.rb
new file mode 100644
index 0000000000..c8b4f567cb
--- /dev/null
+++ b/ext/json/lib/json/add/bigdecimal.rb
@@ -0,0 +1,29 @@
+#frozen_string_literal: false
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+defined?(::BigDecimal) or require 'bigdecimal'
+
+class BigDecimal
+  # Import a JSON Marshalled object.
+  #
+  # method used for JSON marshalling support.
+  def self.json_create(object)
+    BigDecimal._load object['b']
+  end
+
+  # Marshal the object to JSON.
+  #
+  # method used for JSON marshalling support.
+  def as_json(*)
+    {
+      JSON.create_id => self.class.name,
+      'b'            => _dump,
+    }
+  end
+
+  # return the JSON value
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end
diff --git a/ext/json/lib/json/add/complex.rb b/ext/json/lib/json/add/complex.rb
index d7ebebf5f7..4d977e7589 100644
--- a/ext/json/lib/json/add/complex.rb
+++ b/ext/json/lib/json/add/complex.rb
@@ -1,13 +1,19 @@
+#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,
@@ -16,7 +22,8 @@ class Complex
     }
   end
 
-  def to_json(*)
-    as_json.to_json
+  # Stores class name (Complex) along with real value <tt>r</tt> and imaginary value <tt>i</tt> as JSON string
+  def to_json(*args)
+    as_json.to_json(*args)
   end
 end
diff --git a/ext/json/lib/json/add/core.rb b/ext/json/lib/json/add/core.rb
index 1ae00d01a5..bfb017c460 100644
--- a/ext/json/lib/json/add/core.rb
+++ b/ext/json/lib/json/add/core.rb
@@ -1,243 +1,12 @@
-# This file contains implementations of ruby core's custom objects for
+#frozen_string_literal: false
+# This file requires the implementations of ruby core's custom objects for
 # serialisation/deserialisation.
 
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
-  require 'json'
-end
-require 'date'
-
-# Symbol serialization/deserialization
-class Symbol
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
-  def as_json(*)
-    {
-      JSON.create_id => self.class.name,
-      's'            => to_s,
-    }
-  end
-
-  # Stores class name (Symbol) with String representation of Symbol as a JSON string.
-  def to_json(*a)
-    as_json.to_json(*a)
-  end
-
-  # Deserializes JSON string by converting the <tt>string</tt> value stored in the object to a Symbol
-  def self.json_create(o)
-    o['s'].to_sym
-  end
-end
-
-# Time serialization/deserialization
-class Time
-
-  # Deserializes JSON string by converting time since epoch to Time
-  def self.json_create(object)
-    if usec = object.delete('u') # used to be tv_usec -> tv_nsec
-      object['n'] = usec * 1000
-    end
-    if respond_to?(:tv_nsec)
-      at(*object.values_at('s', 'n'))
-    else
-      at(object['s'], object['n'] / 1000)
-    end
-  end
-
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
-  def as_json(*)
-    {
-      JSON.create_id => self.class.name,
-      's'            => tv_sec,
-      'n'            => respond_to?(:tv_nsec) ? tv_nsec : tv_usec * 1000
-    }
-  end
-
-  # Stores class name (Time) with number of seconds since epoch and number of
-  # microseconds for Time as JSON string
-  def to_json(*args)
-    as_json.to_json(*args)
-  end
-end
-
-# Date serialization/deserialization
-class Date
-
-  # Deserializes JSON string by converting Julian year <tt>y</tt>, month
-  # <tt>m</tt>, day <tt>d</tt> and Day of Calendar Reform <tt>sg</tt> to Date.
-  def self.json_create(object)
-    civil(*object.values_at('y', 'm', 'd', 'sg'))
-  end
-
-  alias start sg unless method_defined?(:start)
-
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
-  def as_json(*)
-    {
-      JSON.create_id => self.class.name,
-      'y' => year,
-      'm' => month,
-      'd' => day,
-      'sg' => start,
-    }
-  end
-
-  # Stores class name (Date) with Julian year <tt>y</tt>, month <tt>m</tt>, day
-  # <tt>d</tt> and Day of Calendar Reform <tt>sg</tt> as JSON string
-  def to_json(*args)
-    as_json.to_json(*args)
-  end
-end
-
-# DateTime serialization/deserialization
-class DateTime
-
-  # Deserializes JSON string by converting year <tt>y</tt>, month <tt>m</tt>,
-  # day <tt>d</tt>, hour <tt>H</tt>, minute <tt>M</tt>, second <tt>S</tt>,
-  # offset <tt>of</tt> and Day of Calendar Reform <tt>sg</tt> to DateTime.
-  def self.json_create(object)
-    args = object.values_at('y', 'm', 'd', 'H', 'M', 'S')
-    of_a, of_b = object['of'].split('/')
-    if of_b and of_b != '0'
-      args << Rational(of_a.to_i, of_b.to_i)
-    else
-      args << of_a
-    end
-    args << object['sg']
-    civil(*args)
-  end
-
-  alias start sg unless method_defined?(:start)
-
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
-  def as_json(*)
-    {
-      JSON.create_id => self.class.name,
-      'y' => year,
-      'm' => month,
-      'd' => day,
-      'H' => hour,
-      'M' => min,
-      'S' => sec,
-      'of' => offset.to_s,
-      'sg' => start,
-    }
-  end
-
-  # Stores class name (DateTime) with Julian year <tt>y</tt>, month <tt>m</tt>,
-  # day <tt>d</tt>, hour <tt>H</tt>, minute <tt>M</tt>, second <tt>S</tt>,
-  # offset <tt>of</tt> and Day of Calendar Reform <tt>sg</tt> as JSON string
-  def to_json(*args)
-    as_json.to_json(*args)
-  end
-end
-
-# Range serialization/deserialization
-class Range
-
-  # Deserializes JSON string by constructing new Range object with arguments
-  # <tt>a</tt> serialized by <tt>to_json</tt>.
-  def self.json_create(object)
-    new(*object['a'])
-  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,
-      'a'             => [ first, last, exclude_end? ]
-    }
-  end
-
-  # Stores class name (Range) with JSON array of arguments <tt>a</tt> which
-  # include <tt>first</tt> (integer), <tt>last</tt> (integer), and
-  # <tt>exclude_end?</tt> (boolean) as JSON string.
-  def to_json(*args)
-    as_json.to_json(*args)
-  end
-end
-
-# Struct serialization/deserialization
-class Struct
-
-  # Deserializes JSON string by constructing new Struct object with values
-  # <tt>v</tt> serialized by <tt>to_json</tt>.
-  def self.json_create(object)
-    new(*object['v'])
-  end
-
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
-  def as_json(*)
-    klass = self.class.name
-    klass.to_s.empty? and raise JSON::JSONError, "Only named structs are supported!"
-    {
-      JSON.create_id => klass,
-      'v'            => values,
-    }
-  end
-
-  # Stores class name (Struct) with Struct values <tt>v</tt> as a JSON string.
-  # Only named structs are supported.
-  def to_json(*args)
-    as_json.to_json(*args)
-  end
-end
-
-# Exception serialization/deserialization
-class Exception
-
-  # Deserializes JSON string by constructing new Exception object with message
-  # <tt>m</tt> and backtrace <tt>b</tt> serialized with <tt>to_json</tt>
-  def self.json_create(object)
-    result = new(object['m'])
-    result.set_backtrace object['b']
-    result
-  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,
-      'm'            => message,
-      'b'            => backtrace,
-    }
-  end
-
-  # Stores class name (Exception) with message <tt>m</tt> and backtrace array
-  # <tt>b</tt> as JSON string
-  def to_json(*args)
-    as_json.to_json(*args)
-  end
-end
-
-# Regexp serialization/deserialization
-class Regexp
-
-  # Deserializes JSON string by constructing new Regexp object with source
-  # <tt>s</tt> (Regexp or String) and options <tt>o</tt> serialized by
-  # <tt>to_json</tt>
-  def self.json_create(object)
-    new(object['s'], object['o'])
-  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,
-      'o'            => options,
-      's'            => source,
-    }
-  end
-
-  # Stores class name (Regexp) with options <tt>o</tt> and source <tt>s</tt>
-  # (Regexp or String) as JSON string
-  def to_json(*)
-    as_json.to_json
-  end
-end
+require 'json/add/date'
+require 'json/add/date_time'
+require 'json/add/exception'
+require 'json/add/range'
+require 'json/add/regexp'
+require 'json/add/struct'
+require 'json/add/symbol'
+require 'json/add/time'
diff --git a/ext/json/lib/json/add/date.rb b/ext/json/lib/json/add/date.rb
new file mode 100644
index 0000000000..25523561a5
--- /dev/null
+++ b/ext/json/lib/json/add/date.rb
@@ -0,0 +1,34 @@
+#frozen_string_literal: false
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+require 'date'
+
+class Date
+
+  # Deserializes JSON string by converting Julian year <tt>y</tt>, month
+  # <tt>m</tt>, day <tt>d</tt> and Day of Calendar Reform <tt>sg</tt> to Date.
+  def self.json_create(object)
+    civil(*object.values_at('y', 'm', 'd', 'sg'))
+  end
+
+  alias start sg unless method_defined?(:start)
+
+  # Returns a hash, that will be turned into a JSON object and represent this
+  # object.
+  def as_json(*)
+    {
+      JSON.create_id => self.class.name,
+      'y' => year,
+      'm' => month,
+      'd' => day,
+      'sg' => start,
+    }
+  end
+
+  # Stores class name (Date) with Julian year <tt>y</tt>, month <tt>m</tt>, day
+  # <tt>d</tt> and Day of Calendar Reform <tt>sg</tt> as JSON string
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end
diff --git a/ext/json/lib/json/add/date_time.rb b/ext/json/lib/json/add/date_time.rb
new file mode 100644
index 0000000000..38b0e86ab8
--- /dev/null
+++ b/ext/json/lib/json/add/date_time.rb
@@ -0,0 +1,50 @@
+#frozen_string_literal: false
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+require 'date'
+
+class DateTime
+
+  # Deserializes JSON string by converting year <tt>y</tt>, month <tt>m</tt>,
+  # day <tt>d</tt>, hour <tt>H</tt>, minute <tt>M</tt>, second <tt>S</tt>,
+  # offset <tt>of</tt> and Day of Calendar Reform <tt>sg</tt> to DateTime.
+  def self.json_create(object)
+    args = object.values_at('y', 'm', 'd', 'H', 'M', 'S')
+    of_a, of_b = object['of'].split('/')
+    if of_b and of_b != '0'
+      args << Rational(of_a.to_i, of_b.to_i)
+    else
+      args << of_a
+    end
+    args << object['sg']
+    civil(*args)
+  end
+
+  alias start sg unless method_defined?(:start)
+
+  # Returns a hash, that will be turned into a JSON object and represent this
+  # object.
+  def as_json(*)
+    {
+      JSON.create_id => self.class.name,
+      'y' => year,
+      'm' => month,
+      'd' => day,
+      'H' => hour,
+      'M' => min,
+      'S' => sec,
+      'of' => offset.to_s,
+      'sg' => start,
+    }
+  end
+
+  # Stores class name (DateTime) with Julian year <tt>y</tt>, month <tt>m</tt>,
+  # day <tt>d</tt>, hour <tt>H</tt>, minute <tt>M</tt>, second <tt>S</tt>,
+  # offset <tt>of</tt> and Day of Calendar Reform <tt>sg</tt> as JSON string
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end
+
+
diff --git a/ext/json/lib/json/add/exception.rb b/ext/json/lib/json/add/exception.rb
new file mode 100644
index 0000000000..a107e5b3c4
--- /dev/null
+++ b/ext/json/lib/json/add/exception.rb
@@ -0,0 +1,31 @@
+#frozen_string_literal: false
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+
+class Exception
+
+  # Deserializes JSON string by constructing new Exception object with message
+  # <tt>m</tt> and backtrace <tt>b</tt> serialized with <tt>to_json</tt>
+  def self.json_create(object)
+    result = new(object['m'])
+    result.set_backtrace object['b']
+    result
+  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,
+      'm'            => message,
+      'b'            => backtrace,
+    }
+  end
+
+  # Stores class name (Exception) with message <tt>m</tt> and backtrace array
+  # <tt>b</tt> as JSON string
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end
diff --git a/ext/json/lib/json/add/ostruct.rb b/ext/json/lib/json/add/ostruct.rb
new file mode 100644
index 0000000000..686cf0025d
--- /dev/null
+++ b/ext/json/lib/json/add/ostruct.rb
@@ -0,0 +1,31 @@
+#frozen_string_literal: false
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+require 'ostruct'
+
+class OpenStruct
+
+  # Deserializes JSON string by constructing new Struct object with values
+  # <tt>t</tt> serialized by <tt>to_json</tt>.
+  def self.json_create(object)
+    new(object['t'] || object[:t])
+  end
+
+  # Returns a hash, that will be turned into a JSON object and represent this
+  # object.
+  def as_json(*)
+    klass = self.class.name
+    klass.to_s.empty? and raise JSON::JSONError, "Only named structs are supported!"
+    {
+      JSON.create_id => klass,
+      't'            => table,
+    }
+  end
+
+  # Stores class name (OpenStruct) with this struct's values <tt>t</tt> as a
+  # JSON string.
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end
diff --git a/ext/json/lib/json/add/range.rb b/ext/json/lib/json/add/range.rb
new file mode 100644
index 0000000000..93529fb1c4
--- /dev/null
+++ b/ext/json/lib/json/add/range.rb
@@ -0,0 +1,29 @@
+#frozen_string_literal: false
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+
+class Range
+
+  # Deserializes JSON string by constructing new Range object with arguments
+  # <tt>a</tt> serialized by <tt>to_json</tt>.
+  def self.json_create(object)
+    new(*object['a'])
+  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,
+      'a'             => [ first, last, exclude_end? ]
+    }
+  end
+
+  # Stores class name (Range) with JSON array of arguments <tt>a</tt> which
+  # include <tt>first</tt> (integer), <tt>last</tt> (integer), and
+  # <tt>exclude_end?</tt> (boolean) as JSON string.
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end
diff --git a/ext/json/lib/json/add/rational.rb b/ext/json/lib/json/add/rational.rb
index 867cd92f05..6be4034581 100644
--- a/ext/json/lib/json/add/rational.rb
+++ b/ext/json/lib/json/add/rational.rb
@@ -1,13 +1,18 @@
+#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,
@@ -16,7 +21,8 @@ class Rational
     }
   end
 
-  def to_json(*)
-    as_json.to_json
+  # Stores class name (Rational) along with numerator value <tt>n</tt> and denominator value <tt>d</tt> as JSON string
+  def to_json(*args)
+    as_json.to_json(*args)
   end
 end
diff --git a/ext/json/lib/json/add/regexp.rb b/ext/json/lib/json/add/regexp.rb
new file mode 100644
index 0000000000..39d69fede7
--- /dev/null
+++ b/ext/json/lib/json/add/regexp.rb
@@ -0,0 +1,30 @@
+#frozen_string_literal: false
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+
+class Regexp
+
+  # Deserializes JSON string by constructing new Regexp object with source
+  # <tt>s</tt> (Regexp or String) and options <tt>o</tt> serialized by
+  # <tt>to_json</tt>
+  def self.json_create(object)
+    new(object['s'], object['o'])
+  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,
+      'o'            => options,
+      's'            => source,
+    }
+  end
+
+  # Stores class name (Regexp) with options <tt>o</tt> and source <tt>s</tt>
+  # (Regexp or String) as JSON string
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end
diff --git a/ext/json/lib/json/add/set.rb b/ext/json/lib/json/add/set.rb
new file mode 100644
index 0000000000..71e2a0ac8b
--- /dev/null
+++ b/ext/json/lib/json/add/set.rb
@@ -0,0 +1,29 @@
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+defined?(::Set) or require 'set'
+
+class Set
+  # Import a JSON Marshalled object.
+  #
+  # method used for JSON marshalling support.
+  def self.json_create(object)
+    new object['a']
+  end
+
+  # Marshal the object to JSON.
+  #
+  # method used for JSON marshalling support.
+  def as_json(*)
+    {
+      JSON.create_id => self.class.name,
+      'a'            => to_a,
+    }
+  end
+
+  # return the JSON value
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end
+
diff --git a/ext/json/lib/json/add/struct.rb b/ext/json/lib/json/add/struct.rb
new file mode 100644
index 0000000000..e8395ed42f
--- /dev/null
+++ b/ext/json/lib/json/add/struct.rb
@@ -0,0 +1,30 @@
+#frozen_string_literal: false
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+
+class Struct
+
+  # Deserializes JSON string by constructing new Struct object with values
+  # <tt>v</tt> serialized by <tt>to_json</tt>.
+  def self.json_create(object)
+    new(*object['v'])
+  end
+
+  # Returns a hash, that will be turned into a JSON object and represent this
+  # object.
+  def as_json(*)
+    klass = self.class.name
+    klass.to_s.empty? and raise JSON::JSONError, "Only named structs are supported!"
+    {
+      JSON.create_id => klass,
+      'v'            => values,
+    }
+  end
+
+  # Stores class name (Struct) with Struct values <tt>v</tt> as a JSON string.
+  # Only named structs are supported.
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end
diff --git a/ext/json/lib/json/add/symbol.rb b/ext/json/lib/json/add/symbol.rb
new file mode 100644
index 0000000000..74b13a423f
--- /dev/null
+++ b/ext/json/lib/json/add/symbol.rb
@@ -0,0 +1,25 @@
+#frozen_string_literal: false
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+
+class Symbol
+  # Returns a hash, that will be turned into a JSON object and represent this
+  # object.
+  def as_json(*)
+    {
+      JSON.create_id => self.class.name,
+      's'            => to_s,
+    }
+  end
+
+  # Stores class name (Symbol) with String representation of Symbol as a JSON string.
+  def to_json(*a)
+    as_json.to_json(*a)
+  end
+
+  # Deserializes JSON string by converting the <tt>string</tt> value stored in the object to a Symbol
+  def self.json_create(o)
+    o['s'].to_sym
+  end
+end
diff --git a/ext/json/lib/json/add/time.rb b/ext/json/lib/json/add/time.rb
new file mode 100644
index 0000000000..b73acc4086
--- /dev/null
+++ b/ext/json/lib/json/add/time.rb
@@ -0,0 +1,38 @@
+#frozen_string_literal: false
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+
+class Time
+
+  # Deserializes JSON string by converting time since epoch to Time
+  def self.json_create(object)
+    if usec = object.delete('u') # used to be tv_usec -> tv_nsec
+      object['n'] = usec * 1000
+    end
+    if method_defined?(:tv_nsec)
+      at(object['s'], Rational(object['n'], 1000))
+    else
+      at(object['s'], object['n'] / 1000)
+    end
+  end
+
+  # Returns a hash, that will be turned into a JSON object and represent this
+  # object.
+  def as_json(*)
+    nanoseconds = [ tv_usec * 1000 ]
+    respond_to?(:tv_nsec) and nanoseconds << tv_nsec
+    nanoseconds = nanoseconds.max
+    {
+      JSON.create_id => self.class.name,
+      's'            => tv_sec,
+      'n'            => nanoseconds,
+    }
+  end
+
+  # Stores class name (Time) with number of seconds since epoch and number of
+  # microseconds for Time as JSON string
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index 43e249c954..3be9fd8dc5 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -1,13 +1,15 @@
+#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)
@@ -23,7 +25,7 @@ module JSON
     # Set the JSON parser class _parser_ to be used by JSON.
     def parser=(parser) # :nodoc:
       @parser = parser
-      remove_const :Parser if JSON.const_defined_in?(self, :Parser)
+      remove_const :Parser if const_defined?(:Parser, false)
       const_set :Parser, parser
     end
 
@@ -34,8 +36,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 JSON.const_defined_in?(p, c) then p.const_get(c)
+        when c.empty?                  then p
+        when p.const_defined?(c, true) then p.const_get(c)
         else
           begin
             p.const_missing(c)
@@ -102,7 +104,13 @@ module JSON
   MinusInfinity = -Infinity
 
   # The base exception for JSON errors.
-  class JSONError < StandardError; end
+  class JSONError < StandardError
+    def self.wrap(exception)
+      obj = new("Wrapped(#{exception.class}): #{exception.message.inspect}")
+      obj.set_backtrace exception.backtrace
+      obj
+    end
+  end
 
   # This exception is raised if a parser error occurs.
   class ParserError < JSONError; end
@@ -131,21 +139,21 @@ 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 19.
+  #   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 4627 to be parsed by the Parser. This option defaults
+  #   defiance of RFC 7159 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 true.
+  #   defaults to false.
   # * *object_class*: Defaults to Hash
   # * *array_class*: Defaults to Array
   def parse(source, opts = {})
-    Parser.new(source, opts).parse
+    Parser.new(source, **(opts||{})).parse
   end
 
   # Parse the JSON document _source_ into a Ruby data structure and return it.
@@ -154,21 +162,21 @@ 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 4627 to be parsed by the Parser. This option defaults
+  #   defiance of RFC 7159 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 true.
+  #   defaults to false.
   def parse!(source, opts = {})
     opts = {
       :max_nesting  => false,
       :allow_nan    => true
-    }.update(opts)
-    Parser.new(source, opts).parse
+    }.merge(opts)
+    Parser.new(source, **(opts||{})).parse
   end
 
   # Generate a JSON document from the Ruby data structure _obj_ and return
@@ -192,7 +200,7 @@ module JSON
   #   encountered. This options defaults to false.
   # * *max_nesting*: The maximum depth of nesting allowed in the data
   #   structures from which JSON is to be generated. Disable depth checking
-  #   with :max_nesting => false, it defaults to 19.
+  #   with :max_nesting => false, it defaults to 100.
   #
   # See also the fast_generate for the fastest creation method with the least
   # amount of sanity checks, and the pretty_generate method for some
@@ -284,22 +292,47 @@ module JSON
   module_function :pretty_unparse
   # :startdoc:
 
+  class << self
+    # The global default options for the JSON.load method:
+    #  :max_nesting: false
+    #  :allow_nan:   true
+    #  :allow_blank:  true
+    attr_accessor :load_default_options
+  end
+  self.load_default_options = {
+    :max_nesting      => false,
+    :allow_nan        => true,
+    :allow_blank       => true,
+    :create_additions => true,
+  }
+
   # Load a ruby data structure from a JSON _source_ and return it. A source can
   # either be a string-like object, an IO-like object, or an object responding
   # to the read method. If _proc_ was given, it will be called with any nested
-  # Ruby object as an argument recursively in depth first order.
+  # Ruby object as an argument recursively in depth first order. To modify the
+  # default options pass in the optional _options_ argument as well.
+  #
+  # BEWARE: This method is meant to serialise data from trusted user input,
+  # like from your own database server or clients under your control, it could
+  # be dangerous to allow untrusted users to pass JSON sources into it. The
+  # default options for the parser can be changed via the load_default_options
+  # method.
   #
   # This method is part of the implementation of the load/dump interface of
   # Marshal and YAML.
-  def load(source, proc = nil)
+  def load(source, proc = nil, options = {})
+    opts = load_default_options.merge options
     if source.respond_to? :to_str
       source = source.to_str
     elsif source.respond_to? :to_io
       source = source.to_io.read
-    else
+    elsif source.respond_to?(:read)
       source = source.read
     end
-    result = parse(source, :max_nesting => false, :allow_nan => true)
+    if opts[:allow_blank] && (source.nil? || source.empty?)
+      source = 'null'
+    end
+    result = parse(source, opts)
     recurse_proc(result, &proc) if proc
     result
   end
@@ -321,6 +354,18 @@ module JSON
   alias restore load
   module_function :restore
 
+  class << self
+    # The global default options for the JSON.dump method:
+    #  :max_nesting: false
+    #  :allow_nan:   true
+    #  :allow_blank: true
+    attr_accessor :dump_default_options
+  end
+  self.dump_default_options = {
+    :max_nesting => false,
+    :allow_nan   => true,
+  }
+
   # Dumps _obj_ as a JSON string, i.e. calls generate on the object and returns
   # the result.
   #
@@ -331,6 +376,9 @@ module JSON
   # exception is raised. This argument is similar (but not exactly the
   # same!) to the _limit_ argument in Marshal.dump.
   #
+  # The default options for the generator can be changed via the
+  # dump_default_options method.
+  #
   # This method is part of the implementation of the load/dump interface of
   # Marshal and YAML.
   def dump(obj, anIO = nil, limit = nil)
@@ -341,8 +389,9 @@ module JSON
         anIO = nil
       end
     end
-    limit ||= 0
-    result = generate(obj, :allow_nan => true, :max_nesting => limit)
+    opts = JSON.dump_default_options
+    opts = opts.merge(:max_nesting => limit) if limit
+    result = generate(obj, opts)
     if anIO
       anIO.write result
       anIO
@@ -353,37 +402,9 @@ module JSON
     raise ArgumentError, "exceed depth limit"
   end
 
-  # 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
+  # Encodes string using Ruby's _String.encode_
+  def self.iconv(to, from, string)
+    string.encode(to, from)
   end
 end
 
@@ -399,7 +420,7 @@ module ::Kernel
     nil
   end
 
-  # Ouputs _objs_ to STDOUT as JSON strings in a pretty format, with
+  # Outputs _objs_ to STDOUT as JSON strings in a pretty format, with
   # indentation and over many lines.
   def jj(*objs)
     objs.each do |obj|
diff --git a/ext/json/lib/json/generic_object.rb b/ext/json/lib/json/generic_object.rb
new file mode 100644
index 0000000000..108309db26
--- /dev/null
+++ b/ext/json/lib/json/generic_object.rb
@@ -0,0 +1,71 @@
+#frozen_string_literal: false
+require 'ostruct'
+
+module JSON
+  class GenericObject < OpenStruct
+    class << self
+      alias [] new
+
+      def json_creatable?
+        @json_creatable
+      end
+
+      attr_writer :json_creatable
+
+      def json_create(data)
+        data = data.dup
+        data.delete JSON.create_id
+        self[data]
+      end
+
+      def from_hash(object)
+        case
+        when object.respond_to?(:to_hash)
+          result = new
+          object.to_hash.each do |key, value|
+            result[key] = from_hash(value)
+          end
+          result
+        when object.respond_to?(:to_ary)
+          object.to_ary.map { |a| from_hash(a) }
+        else
+          object
+        end
+      end
+
+      def load(source, proc = nil, opts = {})
+        result = ::JSON.load(source, proc, opts.merge(:object_class => self))
+        result.nil? ? new : result
+      end
+
+      def dump(obj, *args)
+        ::JSON.dump(obj, *args)
+      end
+    end
+    self.json_creatable = false
+
+    def to_hash
+      table
+    end
+
+    def [](name)
+      __send__(name)
+    end unless method_defined?(:[])
+
+    def []=(name, value)
+      __send__("#{name}=", value)
+    end unless method_defined?(:[]=)
+
+    def |(other)
+      self.class[other.to_hash.merge(to_hash)]
+    end
+
+    def as_json(*)
+      { JSON.create_id => self.class.name }.merge to_hash
+    end
+
+    def to_json(*a)
+      as_json.to_json(*a)
+    end
+  end
+end
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index 2175ac0f90..9d781df875 100644
--- a/ext/json/lib/json/version.rb
+++ b/ext/json/lib/json/version.rb
@@ -1,6 +1,7 @@
+# frozen_string_literal: false
 module JSON
   # JSON version
-  VERSION         = '1.5.4'
+  VERSION         = '2.3.0'
   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 5eaf6dd040..d0c9c2d2a6 100644
--- a/ext/json/parser/depend
+++ b/ext/json/parser/depend
@@ -1 +1,23 @@
-parser.o: parser.c parser.h
+$(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.h
+parser.o: $(hdrdir)/ruby/assert.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/onigmo.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: $(srcdir)/../fbuffer/fbuffer.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 4a10dd2ed6..f7360d46b2 100644
--- a/ext/json/parser/extconf.rb
+++ b/ext/json/parser/extconf.rb
@@ -1,10 +1,6 @@
+# frozen_string_literal: false
 require 'mkmf'
-require 'rbconfig'
 
-if RUBY_VERSION < "1.9"
-  have_header("re.h")
-else
-  have_header("ruby/re.h")
-  have_header("ruby/encoding.h")
-end
+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 d1d14c79ca..0f98cf9827 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -1,10 +1,33 @@
-
+/* This file is automatically generated from parser.rl by using ragel */
 #line 1 "parser.rl"
+#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] = {
+static const signed char digit_values[256] = {
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1,
@@ -23,20 +46,20 @@ static const char digit_values[256] = {
 
 static UTF32 unescape_unicode(const unsigned char *p)
 {
-    char b;
+    signed char b;
     UTF32 result = 0;
     b = digit_values[p[0]];
     if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | b;
+    result = (result << 4) | (unsigned char)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;
 }
 
@@ -66,59 +89,53 @@ 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 VALUE cBigDecimal = Qundef;
 
 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_quirks_mode,
-          i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match,
-          i_match_string, i_aset, i_leftshift;
+          i_chr, i_max_nesting, i_allow_nan, i_symbolize_names,
+          i_object_class, i_array_class, i_decimal_class, i_key_p,
+          i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
+          i_leftshift, i_new, i_BigDecimal;
 
 
-#line 109 "parser.rl"
+#line 126 "parser.rl"
 
 
 
-#line 91 "parser.c"
-static const int JSON_object_start = 1;
-static const int JSON_object_first_final = 27;
-static const int JSON_object_error = 0;
+#line 108 "parser.c"
+enum {JSON_object_start = 1};
+enum {JSON_object_first_final = 27};
+enum {JSON_object_error = 0};
 
-static const int JSON_object_en_main = 1;
+enum {JSON_object_en_main = 1};
 
 
-#line 150 "parser.rl"
+#line 167 "parser.rl"
 
 
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
+static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
 {
     int cs = EVIL;
     VALUE last_name = Qnil;
     VALUE object_class = json->object_class;
 
-    if (json->max_nesting && json->current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    if (json->max_nesting && current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
     }
 
     *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
 
 
-#line 115 "parser.c"
+#line 132 "parser.c"
 	{
 	cs = JSON_object_start;
 	}
 
-#line 165 "parser.rl"
+#line 182 "parser.rl"
 
-#line 122 "parser.c"
+#line 139 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -146,7 +163,7 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 132 "parser.rl"
+#line 149 "parser.rl"
 	{
         char *np;
         json->parsing_name = 1;
@@ -159,7 +176,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 163 "parser.c"
+#line 180 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -226,10 +243,10 @@ case 8:
 		goto st8;
 	goto st0;
 tr11:
-#line 117 "parser.rl"
+#line 134 "parser.rl"
 	{
         VALUE v = Qnil;
-        char *np = JSON_parse_value(json, p, pe, &v);
+        char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
         if (np == NULL) {
             p--; {p++; cs = 9; goto _out;}
         } else {
@@ -246,7 +263,7 @@ st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 250 "parser.c"
+#line 267 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st9;
 		case 32: goto st9;
@@ -335,14 +352,14 @@ case 18:
 		goto st9;
 	goto st18;
 tr4:
-#line 140 "parser.rl"
+#line 157 "parser.rl"
 	{ p--; {p++; cs = 27; goto _out;} }
 	goto st27;
 st27:
 	if ( ++p == pe )
 		goto _test_eof27;
 case 27:
-#line 346 "parser.c"
+#line 363 "parser.c"
 	goto st0;
 st19:
 	if ( ++p == pe )
@@ -440,11 +457,16 @@ case 26:
 	_out: {}
 	}
 
-#line 166 "parser.rl"
+#line 183 "parser.rl"
 
     if (cs >= JSON_object_first_final) {
         if (json->create_additions) {
-            VALUE klassname = rb_hash_aref(*result, json->create_id);
+            VALUE klassname;
+            if (NIL_P(json->object_class)) {
+              klassname = rb_hash_aref(*result, json->create_id);
+            } else {
+              klassname = rb_funcall(*result, i_aref, 1, json->create_id);
+            }
             if (!NIL_P(klassname)) {
                 VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname);
                 if (RTEST(rb_funcall(klass, i_json_creatable_p, 0))) {
@@ -460,281 +482,358 @@ case 26:
 
 
 
-#line 464 "parser.c"
-static const int JSON_value_start = 1;
-static const int JSON_value_first_final = 21;
-static const int JSON_value_error = 0;
+#line 486 "parser.c"
+enum {JSON_value_start = 1};
+enum {JSON_value_first_final = 29};
+enum {JSON_value_error = 0};
 
-static const int JSON_value_en_main = 1;
+enum {JSON_value_en_main = 1};
 
 
-#line 265 "parser.rl"
+#line 283 "parser.rl"
 
 
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
+static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
 {
     int cs = EVIL;
 
 
-#line 480 "parser.c"
+#line 502 "parser.c"
 	{
 	cs = JSON_value_start;
 	}
 
-#line 272 "parser.rl"
+#line 290 "parser.rl"
 
-#line 487 "parser.c"
+#line 509 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
 	switch ( cs )
 	{
+st1:
+	if ( ++p == pe )
+		goto _test_eof1;
 case 1:
 	switch( (*p) ) {
-		case 34: goto tr0;
-		case 45: goto tr2;
-		case 73: goto st2;
-		case 78: goto st9;
-		case 91: goto tr5;
-		case 102: goto st11;
-		case 110: goto st15;
-		case 116: goto st18;
-		case 123: goto tr9;
+		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;
 	}
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto tr2;
+	if ( (*p) > 10 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto tr3;
+	} else if ( (*p) >= 9 )
+		goto st1;
 	goto st0;
 st0:
 cs = 0;
 	goto _out;
-tr0:
-#line 213 "parser.rl"
+tr2:
+#line 235 "parser.rl"
 	{
         char *np = JSON_parse_string(json, p, pe, result);
-        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
+        if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
     }
-	goto st21;
-tr2:
-#line 218 "parser.rl"
+	goto st29;
+tr3:
+#line 240 "parser.rl"
 	{
         char *np;
-        if(pe > p + 9 - json->quirks_mode && !strncmp(MinusInfinity, p, 9)) {
+        if(pe > p + 8 && !strncmp(MinusInfinity, p, 9)) {
             if (json->allow_nan) {
                 *result = CMinusInfinity;
                 {p = (( p + 10))-1;}
-                p--; {p++; cs = 21; goto _out;}
+                p--; {p++; cs = 29; goto _out;}
             } else {
-                rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+                rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
             }
         }
         np = JSON_parse_float(json, p, pe, result);
         if (np != NULL) {p = (( np))-1;}
         np = JSON_parse_integer(json, p, pe, result);
         if (np != NULL) {p = (( np))-1;}
-        p--; {p++; cs = 21; goto _out;}
+        p--; {p++; cs = 29; goto _out;}
     }
-	goto st21;
-tr5:
-#line 236 "parser.rl"
+	goto st29;
+tr7:
+#line 258 "parser.rl"
 	{
         char *np;
-        json->current_nesting++;
-        np = JSON_parse_array(json, p, pe, result);
-        json->current_nesting--;
-        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
+        np = JSON_parse_array(json, p, pe, result, current_nesting + 1);
+        if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
     }
-	goto st21;
-tr9:
-#line 244 "parser.rl"
+	goto st29;
+tr11:
+#line 264 "parser.rl"
 	{
         char *np;
-        json->current_nesting++;
-        np =  JSON_parse_object(json, p, pe, result);
-        json->current_nesting--;
-        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
+        np =  JSON_parse_object(json, p, pe, result, current_nesting + 1);
+        if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
     }
-	goto st21;
-tr16:
-#line 206 "parser.rl"
+	goto st29;
+tr25:
+#line 228 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CInfinity;
         } else {
-            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
+            rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
         }
     }
-	goto st21;
-tr18:
-#line 199 "parser.rl"
+	goto st29;
+tr27:
+#line 221 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CNaN;
         } else {
-            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
+            rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
         }
     }
-	goto st21;
-tr22:
-#line 193 "parser.rl"
+	goto st29;
+tr31:
+#line 215 "parser.rl"
 	{
         *result = Qfalse;
     }
-	goto st21;
-tr25:
-#line 190 "parser.rl"
+	goto st29;
+tr34:
+#line 212 "parser.rl"
 	{
         *result = Qnil;
     }
-	goto st21;
-tr28:
-#line 196 "parser.rl"
+	goto st29;
+tr37:
+#line 218 "parser.rl"
 	{
         *result = Qtrue;
     }
-	goto st21;
-st21:
-	if ( ++p == pe )
-		goto _test_eof21;
-case 21:
-#line 252 "parser.rl"
-	{ p--; {p++; cs = 21; goto _out;} }
-#line 602 "parser.c"
+	goto st29;
+st29:
+	if ( ++p == pe )
+		goto _test_eof29;
+case 29:
+#line 270 "parser.rl"
+	{ p--; {p++; cs = 29; goto _out;} }
+#line 629 "parser.c"
+	switch( (*p) ) {
+		case 13: goto st29;
+		case 32: goto st29;
+		case 47: goto st2;
+	}
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto st29;
 	goto st0;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-	if ( (*p) == 110 )
-		goto st3;
+	switch( (*p) ) {
+		case 42: goto st3;
+		case 47: goto st5;
+	}
 	goto st0;
 st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-	if ( (*p) == 102 )
+	if ( (*p) == 42 )
 		goto st4;
-	goto st0;
+	goto st3;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-	if ( (*p) == 105 )
-		goto st5;
-	goto st0;
+	switch( (*p) ) {
+		case 42: goto st4;
+		case 47: goto st29;
+	}
+	goto st3;
 st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-	if ( (*p) == 110 )
-		goto st6;
-	goto st0;
+	if ( (*p) == 10 )
+		goto st29;
+	goto st5;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-	if ( (*p) == 105 )
-		goto st7;
+	switch( (*p) ) {
+		case 42: goto st7;
+		case 47: goto st9;
+	}
 	goto st0;
 st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-	if ( (*p) == 116 )
+	if ( (*p) == 42 )
 		goto st8;
-	goto st0;
+	goto st7;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-	if ( (*p) == 121 )
-		goto tr16;
-	goto st0;
+	switch( (*p) ) {
+		case 42: goto st8;
+		case 47: goto st1;
+	}
+	goto st7;
 st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-	if ( (*p) == 97 )
-		goto st10;
-	goto st0;
+	if ( (*p) == 10 )
+		goto st1;
+	goto st9;
 st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-	if ( (*p) == 78 )
-		goto tr18;
+	if ( (*p) == 110 )
+		goto st11;
 	goto st0;
 st11:
 	if ( ++p == pe )
 		goto _test_eof11;
 case 11:
-	if ( (*p) == 97 )
+	if ( (*p) == 102 )
 		goto st12;
 	goto st0;
 st12:
 	if ( ++p == pe )
 		goto _test_eof12;
 case 12:
-	if ( (*p) == 108 )
+	if ( (*p) == 105 )
 		goto st13;
 	goto st0;
 st13:
 	if ( ++p == pe )
 		goto _test_eof13;
 case 13:
-	if ( (*p) == 115 )
+	if ( (*p) == 110 )
 		goto st14;
 	goto st0;
 st14:
 	if ( ++p == pe )
 		goto _test_eof14;
 case 14:
-	if ( (*p) == 101 )
-		goto tr22;
+	if ( (*p) == 105 )
+		goto st15;
 	goto st0;
 st15:
 	if ( ++p == pe )
 		goto _test_eof15;
 case 15:
-	if ( (*p) == 117 )
+	if ( (*p) == 116 )
 		goto st16;
 	goto st0;
 st16:
 	if ( ++p == pe )
 		goto _test_eof16;
 case 16:
-	if ( (*p) == 108 )
-		goto st17;
+	if ( (*p) == 121 )
+		goto tr25;
 	goto st0;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-	if ( (*p) == 108 )
-		goto tr25;
+	if ( (*p) == 97 )
+		goto st18;
 	goto st0;
 st18:
 	if ( ++p == pe )
 		goto _test_eof18;
 case 18:
-	if ( (*p) == 114 )
-		goto st19;
+	if ( (*p) == 78 )
+		goto tr27;
 	goto st0;
 st19:
 	if ( ++p == pe )
 		goto _test_eof19;
 case 19:
-	if ( (*p) == 117 )
+	if ( (*p) == 97 )
 		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 tr28;
+		goto tr37;
 	goto st0;
 	}
-	_test_eof21: cs = 21; goto _test_eof;
+	_test_eof1: cs = 1; goto _test_eof;
+	_test_eof29: cs = 29; goto _test_eof;
 	_test_eof2: cs = 2; goto _test_eof;
 	_test_eof3: cs = 3; goto _test_eof;
 	_test_eof4: cs = 4; goto _test_eof;
@@ -754,12 +853,20 @@ case 20:
 	_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 273 "parser.rl"
+#line 291 "parser.rl"
 
     if (cs >= JSON_value_first_final) {
         return p;
@@ -769,15 +876,15 @@ case 20:
 }
 
 
-#line 773 "parser.c"
-static const int JSON_integer_start = 1;
-static const int JSON_integer_first_final = 3;
-static const int JSON_integer_error = 0;
+#line 880 "parser.c"
+enum {JSON_integer_start = 1};
+enum {JSON_integer_first_final = 3};
+enum {JSON_integer_error = 0};
 
-static const int JSON_integer_en_main = 1;
+enum {JSON_integer_en_main = 1};
 
 
-#line 289 "parser.rl"
+#line 307 "parser.rl"
 
 
 static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -785,15 +892,15 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
     int cs = EVIL;
 
 
-#line 789 "parser.c"
+#line 896 "parser.c"
 	{
 	cs = JSON_integer_start;
 	}
 
-#line 296 "parser.rl"
+#line 314 "parser.rl"
     json->memo = p;
 
-#line 797 "parser.c"
+#line 904 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -827,14 +934,14 @@ case 3:
 		goto st0;
 	goto tr4;
 tr4:
-#line 286 "parser.rl"
+#line 304 "parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 838 "parser.c"
+#line 945 "parser.c"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -853,11 +960,14 @@ case 5:
 	_out: {}
 	}
 
-#line 298 "parser.rl"
+#line 316 "parser.rl"
 
     if (cs >= JSON_integer_first_final) {
         long len = p - json->memo;
-        *result = rb_Integer(rb_str_new(json->memo, len));
+        fbuffer_clear(json->fbuffer);
+        fbuffer_append(json->fbuffer, json->memo, len);
+        fbuffer_append_char(json->fbuffer, '\0');
+        *result = rb_cstr2inum(FBUFFER_PTR(json->fbuffer), 10);
         return p + 1;
     } else {
         return NULL;
@@ -865,31 +975,44 @@ case 5:
 }
 
 
-#line 869 "parser.c"
-static const int JSON_float_start = 1;
-static const int JSON_float_first_final = 8;
-static const int JSON_float_error = 0;
+#line 979 "parser.c"
+enum {JSON_float_start = 1};
+enum {JSON_float_first_final = 8};
+enum {JSON_float_error = 0};
 
-static const int JSON_float_en_main = 1;
+enum {JSON_float_en_main = 1};
 
 
-#line 320 "parser.rl"
+#line 341 "parser.rl"
 
 
+static int is_bigdecimal_class(VALUE obj)
+{
+  if (cBigDecimal == Qundef) {
+    if (rb_const_defined(rb_cObject, i_BigDecimal)) {
+      cBigDecimal = rb_const_get_at(rb_cObject, i_BigDecimal);
+    }
+    else {
+      return 0;
+    }
+  }
+  return obj == cBigDecimal;
+}
+
 static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
 
 
-#line 885 "parser.c"
+#line 1008 "parser.c"
 	{
 	cs = JSON_float_start;
 	}
 
-#line 327 "parser.rl"
+#line 361 "parser.rl"
     json->memo = p;
 
-#line 893 "parser.c"
+#line 1016 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -947,14 +1070,14 @@ case 8:
 		goto st0;
 	goto tr9;
 tr9:
-#line 314 "parser.rl"
+#line 335 "parser.rl"
 	{ p--; {p++; cs = 9; goto _out;} }
 	goto st9;
 st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 958 "parser.c"
+#line 1081 "parser.c"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -1015,11 +1138,24 @@ case 7:
 	_out: {}
 	}
 
-#line 329 "parser.rl"
+#line 363 "parser.rl"
 
     if (cs >= JSON_float_first_final) {
         long len = p - json->memo;
-        *result = rb_Float(rb_str_new(json->memo, len));
+        fbuffer_clear(json->fbuffer);
+        fbuffer_append(json->fbuffer, json->memo, len);
+        fbuffer_append_char(json->fbuffer, '\0');
+        if (NIL_P(json->decimal_class)) {
+          *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+        } else {
+          VALUE text;
+          text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
+          if (is_bigdecimal_class(json->decimal_class)) {
+            *result = rb_funcall(Qnil, i_BigDecimal, 1, text);
+          } else {
+            *result = rb_funcall(json->decimal_class, i_new, 1, text);
+          }
+        }
         return p + 1;
     } else {
         return NULL;
@@ -1028,36 +1164,36 @@ case 7:
 
 
 
-#line 1032 "parser.c"
-static const int JSON_array_start = 1;
-static const int JSON_array_first_final = 17;
-static const int JSON_array_error = 0;
+#line 1168 "parser.c"
+enum {JSON_array_start = 1};
+enum {JSON_array_first_final = 17};
+enum {JSON_array_error = 0};
 
-static const int JSON_array_en_main = 1;
+enum {JSON_array_en_main = 1};
 
 
-#line 369 "parser.rl"
+#line 416 "parser.rl"
 
 
-static char *JSON_parse_array(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)
 {
     int cs = EVIL;
     VALUE array_class = json->array_class;
 
-    if (json->max_nesting && json->current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    if (json->max_nesting && current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
     }
     *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
 
 
-#line 1054 "parser.c"
+#line 1190 "parser.c"
 	{
 	cs = JSON_array_start;
 	}
 
-#line 382 "parser.rl"
+#line 429 "parser.rl"
 
-#line 1061 "parser.c"
+#line 1197 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1096,10 +1232,10 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 346 "parser.rl"
+#line 393 "parser.rl"
 	{
         VALUE v = Qnil;
-        char *np = JSON_parse_value(json, p, pe, &v);
+        char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
         if (np == NULL) {
             p--; {p++; cs = 3; goto _out;}
         } else {
@@ -1116,7 +1252,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 1120 "parser.c"
+#line 1256 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -1216,14 +1352,14 @@ case 12:
 		goto st3;
 	goto st12;
 tr4:
-#line 361 "parser.rl"
+#line 408 "parser.rl"
 	{ p--; {p++; cs = 17; goto _out;} }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 1227 "parser.c"
+#line 1363 "parser.c"
 	goto st0;
 st13:
 	if ( ++p == pe )
@@ -1279,12 +1415,12 @@ case 16:
 	_out: {}
 	}
 
-#line 383 "parser.rl"
+#line 430 "parser.rl"
 
     if(cs >= JSON_array_first_final) {
         return p + 1;
     } else {
-        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
         return NULL;
     }
 }
@@ -1293,6 +1429,7 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
 {
     char *p = string, *pe = string, *unescape;
     int unescape_len;
+    char buf[4];
 
     while (pe < stringEnd) {
         if (*pe == '\\') {
@@ -1323,14 +1460,21 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
                     break;
                 case 'u':
                     if (pe > stringEnd - 4) {
-                        return Qnil;
+                      rb_enc_raise(
+                        EXC_ENCODING eParserError,
+                        "%u: incomplete unicode character escape sequence at '%s'", __LINE__, p
+                      );
                     } else {
-                        char buf[4];
                         UTF32 ch = unescape_unicode((unsigned char *) ++pe);
                         pe += 3;
                         if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
                             pe++;
-                            if (pe > stringEnd - 6) return Qnil;
+                            if (pe > stringEnd - 6) {
+                              rb_enc_raise(
+                                EXC_ENCODING eParserError,
+                                "%u: incomplete surrogate pair at '%s'", __LINE__, p
+                                );
+                            }
                             if (pe[0] == '\\' && pe[1] == 'u') {
                                 UTF32 sur = unescape_unicode((unsigned char *) pe + 2);
                                 ch = (((ch & 0x3F) << 10) | ((((ch >> 6) & 0xF) + 1) << 16)
@@ -1360,15 +1504,15 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
 }
 
 
-#line 1364 "parser.c"
-static const int JSON_string_start = 1;
-static const int JSON_string_first_final = 8;
-static const int JSON_string_error = 0;
+#line 1508 "parser.c"
+enum {JSON_string_start = 1};
+enum {JSON_string_first_final = 8};
+enum {JSON_string_error = 0};
 
-static const int JSON_string_en_main = 1;
+enum {JSON_string_en_main = 1};
 
 
-#line 482 "parser.rl"
+#line 537 "parser.rl"
 
 
 static int
@@ -1390,15 +1534,15 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     *result = rb_str_buf_new(0);
 
-#line 1394 "parser.c"
+#line 1538 "parser.c"
 	{
 	cs = JSON_string_start;
 	}
 
-#line 503 "parser.rl"
+#line 558 "parser.rl"
     json->memo = p;
 
-#line 1402 "parser.c"
+#line 1546 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1423,7 +1567,7 @@ case 2:
 		goto st0;
 	goto st2;
 tr2:
-#line 468 "parser.rl"
+#line 523 "parser.rl"
 	{
         *result = json_string_unescape(*result, json->memo + 1, p);
         if (NIL_P(*result)) {
@@ -1434,14 +1578,14 @@ tr2:
             {p = (( p + 1))-1;}
         }
     }
-#line 479 "parser.rl"
+#line 534 "parser.rl"
 	{ p--; {p++; cs = 8; goto _out;} }
 	goto st8;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 1445 "parser.c"
+#line 1589 "parser.c"
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -1517,7 +1661,7 @@ case 7:
 	_out: {}
 	}
 
-#line 505 "parser.rl"
+#line 560 "parser.rl"
 
     if (json->create_additions && RTEST(match_string = json->match_string)) {
           VALUE klass;
@@ -1532,6 +1676,8 @@ case 7:
 
     if (json->symbolize_names && json->parsing_name) {
       *result = rb_str_intern(*result);
+    } else if (RB_TYPE_P(*result, T_STRING)) {
+      rb_str_resize(*result, RSTRING_LEN(*result));
     }
     if (cs >= JSON_string_first_final) {
         return p + 1;
@@ -1554,41 +1700,16 @@ 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
-    {
-        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);
+  rb_encoding *enc = rb_enc_get(source);
+  if (enc == rb_ascii8bit_encoding()) {
+    if (OBJ_FROZEN(source)) {
+      source = rb_str_dup(source);
     }
+    FORCE_UTF8(source);
+  } else {
+    source = rb_str_conv_enc(source, rb_enc_get(source), rb_utf8_encoding());
+  }
 #endif
     return source;
 }
@@ -1606,21 +1727,19 @@ static VALUE convert_encoding(VALUE source)
  * _opts_ can have the following keys:
  * * *max_nesting*: The maximum depth of nesting allowed in the parsed data
  *   structures. Disable depth checking with :max_nesting => false|nil|0, it
- *   defaults to 19.
+ *   defaults to 100.
  * * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
  *   defiance of RFC 4627 to be parsed by the Parser. This option defaults to
  *   false.
  * * *symbolize_names*: If set to true, returns symbols for the names
- *   (keys) in a JSON object. Otherwise strings are returned, which is also
- *   the default.
+ *   (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.
  * * *create_additions*: If set to false, the Parser doesn't create
- *   additions even if a matchin class and create_id was found. This option
- *   defaults to true.
+ *   additions even if a matching class and create_id was found. This option
+ *   defaults to false.
  * * *object_class*: Defaults to Hash
  * * *array_class*: Defaults to Array
- * * *quirks_mode*: Enables quirks_mode for parser, that is for example
- *   parsing single JSON values instead of documents is possible.
- *
  */
 static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -1630,12 +1749,18 @@ 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);
@@ -1646,7 +1771,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
                     json->max_nesting = 0;
                 }
             } else {
-                json->max_nesting = 19;
+                json->max_nesting = 100;
             }
             tmp = ID2SYM(i_allow_nan);
             if (option_given_p(opts, tmp)) {
@@ -1660,18 +1785,16 @@ 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 = 1;
+                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)) {
@@ -1691,6 +1814,12 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->array_class = Qnil;
             }
+            tmp = ID2SYM(i_decimal_class);
+            if (option_given_p(opts, tmp)) {
+                json->decimal_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->decimal_class = Qnil;
+            }
             tmp = ID2SYM(i_match_string);
             if (option_given_p(opts, tmp)) {
                 VALUE match_string = rb_hash_aref(opts, tmp);
@@ -1698,19 +1827,20 @@ 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 = 19;
+        json->max_nesting = 100;
         json->allow_nan = 0;
-        json->create_additions = 1;
+        json->create_additions = 0;
         json->create_id = rb_funcall(mJSON, i_create_id, 0);
         json->object_class = Qnil;
         json->array_class = Qnil;
+        json->decimal_class = Qnil;
     }
-    if (!json->quirks_mode) {
-      source = convert_encoding(StringValue(source));
-    }
-    json->current_nesting = 0;
+    source = convert_encoding(StringValue(source));
+    StringValue(source);
     json->len = RSTRING_LEN(source);
     json->source = RSTRING_PTR(source);;
     json->Vsource = source;
@@ -1718,209 +1848,41 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 
-#line 1719 "parser.c"
-static const int JSON_start = 1;
-static const int JSON_first_final = 10;
-static const int JSON_error = 0;
+#line 1852 "parser.c"
+enum {JSON_start = 1};
+enum {JSON_first_final = 10};
+enum {JSON_error = 0};
 
-static const int JSON_en_main = 1;
+enum {JSON_en_main = 1};
 
 
-#line 726 "parser.rl"
+#line 760 "parser.rl"
 
 
-static VALUE cParser_parse_strict(VALUE self)
+/*
+ * call-seq: parse()
+ *
+ *  Parses the current JSON text _source_ and returns the complete data
+ *  structure as a result.
+ */
+static VALUE cParser_parse(VALUE self)
 {
-    char *p, *pe;
-    int cs = EVIL;
-    VALUE result = Qnil;
-    GET_PARSER;
+  char *p, *pe;
+  int cs = EVIL;
+  VALUE result = Qnil;
+  GET_PARSER;
 
 
-#line 1738 "parser.c"
+#line 1877 "parser.c"
 	{
 	cs = JSON_start;
 	}
 
-#line 736 "parser.rl"
-    p = json->source;
-    pe = p + json->len;
+#line 776 "parser.rl"
+  p = json->source;
+  pe = p + json->len;
 
-#line 1747 "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 715 "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 708 "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 1824 "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 739 "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 1893 "parser.c"
-static const int JSON_quirks_mode_start = 1;
-static const int JSON_quirks_mode_first_final = 10;
-static const int JSON_quirks_mode_error = 0;
-
-static const int JSON_quirks_mode_en_main = 1;
-
-
-#line 764 "parser.rl"
-
-
-static VALUE cParser_parse_quirks_mode(VALUE self)
-{
-    char *p, *pe;
-    int cs = EVIL;
-    VALUE result = Qnil;
-    GET_PARSER;
-
-
-#line 1912 "parser.c"
-	{
-	cs = JSON_quirks_mode_start;
-	}
-
-#line 774 "parser.rl"
-    p = json->source;
-    pe = p + json->len;
-
-#line 1921 "parser.c"
+#line 1886 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1954,9 +1916,9 @@ st0:
 cs = 0;
 	goto _out;
 tr2:
-#line 756 "parser.rl"
+#line 752 "parser.rl"
 	{
-        char *np = JSON_parse_value(json, p, pe, &result);
+        char *np = JSON_parse_value(json, p, pe, &result, 0);
         if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
     }
 	goto st10;
@@ -1964,7 +1926,7 @@ st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 1965 "parser.c"
+#line 1930 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -2053,59 +2015,57 @@ case 9:
 	_out: {}
 	}
 
-#line 777 "parser.rl"
-
-    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;
+#line 779 "parser.rl"
 
-  if (json->quirks_mode) {
-    return cParser_parse_quirks_mode(self);
+  if (cs >= JSON_first_final && p == pe) {
+    return result;
   } else {
-    return cParser_parse_strict(self);
+    rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+    return Qnil;
   }
 }
 
-
-static JSON_Parser *JSON_allocate()
-{
-    JSON_Parser *json = ALLOC(JSON_Parser);
-    MEMZERO(json, JSON_Parser, 1);
-    return json;
-}
-
-static void JSON_mark(JSON_Parser *json)
+static void JSON_mark(void *ptr)
 {
+    JSON_Parser *json = ptr;
     rb_gc_mark_maybe(json->Vsource);
     rb_gc_mark_maybe(json->create_id);
     rb_gc_mark_maybe(json->object_class);
     rb_gc_mark_maybe(json->array_class);
+    rb_gc_mark_maybe(json->decimal_class);
     rb_gc_mark_maybe(json->match_string);
 }
 
-static void JSON_free(JSON_Parser *json)
+static void JSON_free(void *ptr)
 {
+    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 = JSON_allocate();
-    return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
+    JSON_Parser *json;
+    VALUE obj = TypedData_Make_Struct(klass, JSON_Parser, &JSON_Parser_type, json);
+    json->fbuffer = fbuffer_alloc(0);
+    return obj;
 }
 
 /*
@@ -2120,35 +2080,30 @@ static VALUE cParser_source(VALUE self)
     return rb_str_dup(json->Vsource);
 }
 
-/*
- * 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()
+void Init_parser(void)
 {
+#undef rb_intern
     rb_require("json/common");
     mJSON = rb_define_module("JSON");
     mExt = rb_define_module_under(mJSON, "Ext");
     cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
     eParserError = rb_path2class("JSON::ParserError");
     eNestingError = rb_path2class("JSON::NestingError");
+    rb_gc_register_mark_object(eParserError);
+    rb_gc_register_mark_object(eNestingError);
     rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
     rb_define_method(cParser, "initialize", cParser_initialize, -1);
     rb_define_method(cParser, "parse", cParser_parse, 0);
     rb_define_method(cParser, "source", cParser_source, 0);
-    rb_define_method(cParser, "quirks_mode?", cParser_quirks_mode_p, 0);
 
     CNaN = rb_const_get(mJSON, rb_intern("NaN"));
+    rb_gc_register_mark_object(CNaN);
+
     CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
+    rb_gc_register_mark_object(CInfinity);
+
     CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
+    rb_gc_register_mark_object(CMinusInfinity);
 
     i_json_creatable_p = rb_intern("json_creatable?");
     i_json_create = rb_intern("json_create");
@@ -2158,27 +2113,18 @@ void Init_parser()
     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_decimal_class = rb_intern("decimal_class");
     i_match = rb_intern("match");
     i_match_string = rb_intern("match_string");
     i_key_p = rb_intern("key?");
     i_deep_const_get = rb_intern("deep_const_get");
     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
+    i_new = rb_intern("new");
+    i_BigDecimal = rb_intern("BigDecimal");
 }
 
 /*
diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
index fc73810dd6..e6cf779024 100644
--- a/ext/json/parser/parser.h
+++ b/ext/json/parser/parser.h
@@ -3,16 +3,10 @@
 
 #include "ruby.h"
 
-#if HAVE_RE_H
+#ifndef HAVE_RUBY_RE_H
 #include "re.h"
 #endif
 
-#ifdef HAVE_RUBY_ENCODING_H
-#include "ruby/encoding.h"
-#define FORCE_UTF8(obj) ((obj) = rb_enc_associate(rb_str_dup(obj), rb_utf8_encoding()))
-#else
-#define FORCE_UTF8(obj)
-#endif
 #ifdef HAVE_RUBY_ST_H
 #include "ruby/st.h"
 #else
@@ -40,15 +34,15 @@ 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;
+    VALUE decimal_class;
     int create_additions;
     VALUE match_string;
+    FBuffer *fbuffer;
 } JSON_Parser;
 
 #define GET_PARSER                          \
@@ -56,27 +50,42 @@ typedef struct JSON_ParserStruct {
     if (!json->Vsource) rb_raise(rb_eTypeError, "uninitialized instance")
 #define GET_PARSER_INIT                     \
     JSON_Parser *json;                      \
-    Data_Get_Struct(self, JSON_Parser, json)
+    TypedData_Get_Struct(self, JSON_Parser, &JSON_Parser_type, json)
 
 #define MinusInfinity "-Infinity"
 #define EVIL 0x666
 
 static UTF32 unescape_unicode(const unsigned char *p);
 static int convert_UTF32_to_UTF8(char *buf, UTF32 ch);
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result);
+static char *JSON_parse_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_integer(JSON_Parser *json, char *p, char *pe, VALUE *result);
 static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result);
+static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting);
 static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd);
 static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result);
 static VALUE convert_encoding(VALUE source);
 static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self);
 static VALUE cParser_parse(VALUE self);
-static JSON_Parser *JSON_allocate();
-static void JSON_mark(JSON_Parser *json);
-static void JSON_free(JSON_Parser *json);
+static void JSON_mark(void *json);
+static void JSON_free(void *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 e7d47e1589..6b38bb283a 100644
--- a/ext/json/parser/parser.rl
+++ b/ext/json/parser/parser.rl
@@ -1,8 +1,31 @@
+#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] = {
+static const signed char digit_values[256] = {
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1,
@@ -21,20 +44,20 @@ static const char digit_values[256] = {
 
 static UTF32 unescape_unicode(const unsigned char *p)
 {
-    char b;
+    signed char b;
     UTF32 result = 0;
     b = digit_values[p[0]];
     if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | b;
+    result = (result << 4) | (unsigned char)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;
 }
 
@@ -64,21 +87,15 @@ 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 VALUE cBigDecimal = Qundef;
 
 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_quirks_mode,
-          i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match,
-          i_match_string, i_aset, i_leftshift;
+          i_chr, i_max_nesting, i_allow_nan, i_symbolize_names,
+          i_object_class, i_array_class, i_decimal_class, i_key_p,
+          i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
+          i_leftshift, i_new, i_BigDecimal;
 
 %%{
     machine JSON_common;
@@ -116,7 +133,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);
+        char *np = JSON_parse_value(json, fpc, pe, &v, current_nesting);
         if (np == NULL) {
             fhold; fbreak;
         } else {
@@ -149,14 +166,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)
+static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
 {
     int cs = EVIL;
     VALUE last_name = Qnil;
     VALUE object_class = json->object_class;
 
-    if (json->max_nesting && json->current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    if (json->max_nesting && current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
     }
 
     *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
@@ -166,7 +183,12 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     if (cs >= JSON_object_first_final) {
         if (json->create_additions) {
-            VALUE klassname = rb_hash_aref(*result, json->create_id);
+            VALUE klassname;
+            if (NIL_P(json->object_class)) {
+              klassname = rb_hash_aref(*result, json->create_id);
+            } else {
+              klassname = rb_funcall(*result, i_aref, 1, json->create_id);
+            }
             if (!NIL_P(klassname)) {
                 VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname);
                 if (RTEST(rb_funcall(klass, i_json_creatable_p, 0))) {
@@ -200,14 +222,14 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
         if (json->allow_nan) {
             *result = CNaN;
         } else {
-            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
+            rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
         }
     }
     action parse_infinity {
         if (json->allow_nan) {
             *result = CInfinity;
         } else {
-            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
+            rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
         }
     }
     action parse_string {
@@ -217,13 +239,13 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     action parse_number {
         char *np;
-        if(pe > fpc + 9 - json->quirks_mode && !strncmp(MinusInfinity, fpc, 9)) {
+        if(pe > fpc + 8 && !strncmp(MinusInfinity, fpc, 9)) {
             if (json->allow_nan) {
                 *result = CMinusInfinity;
                 fexec p + 10;
                 fhold; fbreak;
             } else {
-                rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+                rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
             }
         }
         np = JSON_parse_float(json, fpc, pe, result);
@@ -235,23 +257,19 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     action parse_array {
         char *np;
-        json->current_nesting++;
-        np = JSON_parse_array(json, fpc, pe, result);
-        json->current_nesting--;
+        np = JSON_parse_array(json, fpc, pe, result, current_nesting + 1);
         if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
     action parse_object {
         char *np;
-        json->current_nesting++;
-        np =  JSON_parse_object(json, fpc, pe, result);
-        json->current_nesting--;
+        np =  JSON_parse_object(json, fpc, pe, result, current_nesting + 1);
         if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
     action exit { fhold; fbreak; }
 
-main := (
+main := ignore* (
               Vnull @parse_null |
               Vfalse @parse_false |
               Vtrue @parse_true |
@@ -261,10 +279,10 @@ main := (
               begin_string >parse_string |
               begin_array >parse_array |
               begin_object >parse_object
-        ) %*exit;
+        ) ignore* %*exit;
 }%%
 
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
+static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
 {
     int cs = EVIL;
 
@@ -298,7 +316,10 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
 
     if (cs >= JSON_integer_first_final) {
         long len = p - json->memo;
-        *result = rb_Integer(rb_str_new(json->memo, len));
+        fbuffer_clear(json->fbuffer);
+        fbuffer_append(json->fbuffer, json->memo, len);
+        fbuffer_append_char(json->fbuffer, '\0');
+        *result = rb_cstr2inum(FBUFFER_PTR(json->fbuffer), 10);
         return p + 1;
     } else {
         return NULL;
@@ -319,6 +340,19 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
              )  (^[0-9Ee.\-]? @exit );
 }%%
 
+static int is_bigdecimal_class(VALUE obj)
+{
+  if (cBigDecimal == Qundef) {
+    if (rb_const_defined(rb_cObject, i_BigDecimal)) {
+      cBigDecimal = rb_const_get_at(rb_cObject, i_BigDecimal);
+    }
+    else {
+      return 0;
+    }
+  }
+  return obj == cBigDecimal;
+}
+
 static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
@@ -329,7 +363,20 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
 
     if (cs >= JSON_float_first_final) {
         long len = p - json->memo;
-        *result = rb_Float(rb_str_new(json->memo, len));
+        fbuffer_clear(json->fbuffer);
+        fbuffer_append(json->fbuffer, json->memo, len);
+        fbuffer_append_char(json->fbuffer, '\0');
+        if (NIL_P(json->decimal_class)) {
+          *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+        } else {
+          VALUE text;
+          text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
+          if (is_bigdecimal_class(json->decimal_class)) {
+            *result = rb_funcall(Qnil, i_BigDecimal, 1, text);
+          } else {
+            *result = rb_funcall(json->decimal_class, i_new, 1, text);
+          }
+        }
         return p + 1;
     } else {
         return NULL;
@@ -345,7 +392,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);
+        char *np = JSON_parse_value(json, fpc, pe, &v, current_nesting);
         if (np == NULL) {
             fhold; fbreak;
         } else {
@@ -368,13 +415,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)
+static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
 {
     int cs = EVIL;
     VALUE array_class = json->array_class;
 
-    if (json->max_nesting && json->current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    if (json->max_nesting && current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
     }
     *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
 
@@ -384,7 +431,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_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
         return NULL;
     }
 }
@@ -393,6 +440,7 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
 {
     char *p = string, *pe = string, *unescape;
     int unescape_len;
+    char buf[4];
 
     while (pe < stringEnd) {
         if (*pe == '\\') {
@@ -423,14 +471,21 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
                     break;
                 case 'u':
                     if (pe > stringEnd - 4) {
-                        return Qnil;
+                      rb_enc_raise(
+                        EXC_ENCODING eParserError,
+                        "%u: incomplete unicode character escape sequence at '%s'", __LINE__, p
+                      );
                     } else {
-                        char buf[4];
                         UTF32 ch = unescape_unicode((unsigned char *) ++pe);
                         pe += 3;
                         if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
                             pe++;
-                            if (pe > stringEnd - 6) return Qnil;
+                            if (pe > stringEnd - 6) {
+                              rb_enc_raise(
+                                EXC_ENCODING eParserError,
+                                "%u: incomplete surrogate pair at '%s'", __LINE__, p
+                                );
+                            }
                             if (pe[0] == '\\' && pe[1] == 'u') {
                                 UTF32 sur = unescape_unicode((unsigned char *) pe + 2);
                                 ch = (((ch & 0x3F) << 10) | ((((ch >> 6) & 0xF) + 1) << 16)
@@ -516,6 +571,8 @@ 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 if (RB_TYPE_P(*result, T_STRING)) {
+      rb_str_resize(*result, RSTRING_LEN(*result));
     }
     if (cs >= JSON_string_first_final) {
         return p + 1;
@@ -538,41 +595,16 @@ 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
-    {
-        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);
+  rb_encoding *enc = rb_enc_get(source);
+  if (enc == rb_ascii8bit_encoding()) {
+    if (OBJ_FROZEN(source)) {
+      source = rb_str_dup(source);
     }
+    FORCE_UTF8(source);
+  } else {
+    source = rb_str_conv_enc(source, rb_enc_get(source), rb_utf8_encoding());
+  }
 #endif
     return source;
 }
@@ -590,16 +622,17 @@ static VALUE convert_encoding(VALUE source)
  * _opts_ can have the following keys:
  * * *max_nesting*: The maximum depth of nesting allowed in the parsed data
  *   structures. Disable depth checking with :max_nesting => false|nil|0, it
- *   defaults to 19.
+ *   defaults to 100.
  * * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
  *   defiance of RFC 4627 to be parsed by the Parser. This option defaults to
  *   false.
  * * *symbolize_names*: If set to true, returns symbols for the names
- *   (keys) in a JSON object. Otherwise strings are returned, which is also
- *   the default.
+ *   (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.
  * * *create_additions*: If set to false, the Parser doesn't create
- *   additions even if a matchin class and create_id was found. This option
- *   defaults to true.
+ *   additions even if a matching class and create_id was found. This option
+ *   defaults to false.
  * * *object_class*: Defaults to Hash
  * * *array_class*: Defaults to Array
  */
@@ -611,12 +644,18 @@ 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);
@@ -627,7 +666,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
                     json->max_nesting = 0;
                 }
             } else {
-                json->max_nesting = 19;
+                json->max_nesting = 100;
             }
             tmp = ID2SYM(i_allow_nan);
             if (option_given_p(opts, tmp)) {
@@ -641,18 +680,16 @@ 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 = 1;
+                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)) {
@@ -672,6 +709,12 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->array_class = Qnil;
             }
+            tmp = ID2SYM(i_decimal_class);
+            if (option_given_p(opts, tmp)) {
+                json->decimal_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->decimal_class = Qnil;
+            }
             tmp = ID2SYM(i_match_string);
             if (option_given_p(opts, tmp)) {
                 VALUE match_string = rb_hash_aref(opts, tmp);
@@ -679,19 +722,20 @@ 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 = 19;
+        json->max_nesting = 100;
         json->allow_nan = 0;
-        json->create_additions = 1;
+        json->create_additions = 0;
         json->create_id = rb_funcall(mJSON, i_create_id, 0);
         json->object_class = Qnil;
         json->array_class = Qnil;
+        json->decimal_class = Qnil;
     }
-    if (!json->quirks_mode) {
-      source = convert_encoding(StringValue(source));
-    }
-    json->current_nesting = 0;
+    source = convert_encoding(StringValue(source));
+    StringValue(source);
     json->len = RSTRING_LEN(source);
     json->source = RSTRING_PTR(source);;
     json->Vsource = source;
@@ -705,56 +749,8 @@ 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);
+        char *np = JSON_parse_value(json, fpc, pe, &result, 0);
         if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
@@ -763,26 +759,6 @@ static VALUE cParser_parse_strict(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()
  *
@@ -791,41 +767,65 @@ static VALUE cParser_parse_quirks_mode(VALUE self)
  */
 static VALUE cParser_parse(VALUE self)
 {
+  char *p, *pe;
+  int cs = EVIL;
+  VALUE result = Qnil;
   GET_PARSER;
 
-  if (json->quirks_mode) {
-    return cParser_parse_quirks_mode(self);
+  %% write init;
+  p = json->source;
+  pe = p + json->len;
+  %% write exec;
+
+  if (cs >= JSON_first_final && p == pe) {
+    return result;
   } else {
-    return cParser_parse_strict(self);
+    rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+    return Qnil;
   }
 }
 
-
-static JSON_Parser *JSON_allocate()
-{
-    JSON_Parser *json = ALLOC(JSON_Parser);
-    MEMZERO(json, JSON_Parser, 1);
-    return json;
-}
-
-static void JSON_mark(JSON_Parser *json)
+static void JSON_mark(void *ptr)
 {
+    JSON_Parser *json = ptr;
     rb_gc_mark_maybe(json->Vsource);
     rb_gc_mark_maybe(json->create_id);
     rb_gc_mark_maybe(json->object_class);
     rb_gc_mark_maybe(json->array_class);
+    rb_gc_mark_maybe(json->decimal_class);
     rb_gc_mark_maybe(json->match_string);
 }
 
-static void JSON_free(JSON_Parser *json)
+static void JSON_free(void *ptr)
 {
+    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 = JSON_allocate();
-    return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
+    JSON_Parser *json;
+    VALUE obj = TypedData_Make_Struct(klass, JSON_Parser, &JSON_Parser_type, json);
+    json->fbuffer = fbuffer_alloc(0);
+    return obj;
 }
 
 /*
@@ -840,35 +840,30 @@ static VALUE cParser_source(VALUE self)
     return rb_str_dup(json->Vsource);
 }
 
-/*
- * 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()
+void Init_parser(void)
 {
+#undef rb_intern
     rb_require("json/common");
     mJSON = rb_define_module("JSON");
     mExt = rb_define_module_under(mJSON, "Ext");
     cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
     eParserError = rb_path2class("JSON::ParserError");
     eNestingError = rb_path2class("JSON::NestingError");
+    rb_gc_register_mark_object(eParserError);
+    rb_gc_register_mark_object(eNestingError);
     rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
     rb_define_method(cParser, "initialize", cParser_initialize, -1);
     rb_define_method(cParser, "parse", cParser_parse, 0);
     rb_define_method(cParser, "source", cParser_source, 0);
-    rb_define_method(cParser, "quirks_mode?", cParser_quirks_mode_p, 0);
 
     CNaN = rb_const_get(mJSON, rb_intern("NaN"));
+    rb_gc_register_mark_object(CNaN);
+
     CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
+    rb_gc_register_mark_object(CInfinity);
+
     CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
+    rb_gc_register_mark_object(CMinusInfinity);
 
     i_json_creatable_p = rb_intern("json_creatable?");
     i_json_create = rb_intern("json_create");
@@ -878,27 +873,18 @@ void Init_parser()
     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_decimal_class = rb_intern("decimal_class");
     i_match = rb_intern("match");
     i_match_string = rb_intern("match_string");
     i_key_p = rb_intern("key?");
     i_deep_const_get = rb_intern("deep_const_get");
     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
+    i_new = rb_intern("new");
+    i_BigDecimal = rb_intern("BigDecimal");
 }
 
 /*
diff --git a/ext/json/parser/prereq.mk b/ext/json/parser/prereq.mk
index 440ef4017e..37bacc3380 100644
--- a/ext/json/parser/prereq.mk
+++ b/ext/json/parser/prereq.mk
@@ -4,6 +4,8 @@ RAGEL = ragel
 
 .rl.c:
 	$(RAGEL) -G2 $<
-	$(BASERUBY) -pli -e '$$_.sub!(/[ \t]+$$/, "")' $@
+	$(BASERUBY) -pli -e '$$_.sub!(/[ \t]+$$/, "")' \
+	-e '$$_.sub!(/^static const int (JSON_.*=.*);$$/, "enum {\\1};")' \
+	-e '$$_ = "/* This file is automatically generated from parser.rl by using ragel */" + $$_ if $$. == 1' $@
 
 parser.c:
diff --git a/ext/mathn/complex/complex.c b/ext/mathn/complex/complex.c
deleted file mode 100644
index dce494959f..0000000000
--- a/ext/mathn/complex/complex.c
+++ /dev/null
@@ -1,7 +0,0 @@
-extern void nucomp_canonicalization(int);
-
-void
-Init_complex(void)
-{
-    nucomp_canonicalization(1);
-}
diff --git a/ext/mathn/complex/extconf.rb b/ext/mathn/complex/extconf.rb
deleted file mode 100644
index d4d14ffcb8..0000000000
--- a/ext/mathn/complex/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require "mkmf"
-
-create_makefile "mathn/complex"
diff --git a/ext/mathn/rational/extconf.rb b/ext/mathn/rational/extconf.rb
deleted file mode 100644
index ba76306b7b..0000000000
--- a/ext/mathn/rational/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require "mkmf"
-
-create_makefile "mathn/rational"
diff --git a/ext/mathn/rational/rational.c b/ext/mathn/rational/rational.c
deleted file mode 100644
index 2ac5999946..0000000000
--- a/ext/mathn/rational/rational.c
+++ /dev/null
@@ -1,7 +0,0 @@
-extern void nurat_canonicalization(int);
-
-void
-Init_rational(void)
-{
-    nurat_canonicalization(1);
-}
diff --git a/ext/monitor/depend b/ext/monitor/depend
new file mode 100644
index 0000000000..89efe1766b
--- /dev/null
+++ b/ext/monitor/depend
@@ -0,0 +1,13 @@
+# AUTOGENERATED DEPENDENCIES START
+monitor.o: $(RUBY_EXTCONF_H)
+monitor.o: $(arch_hdrdir)/ruby/config.h
+monitor.o: $(hdrdir)/ruby/assert.h
+monitor.o: $(hdrdir)/ruby/backward.h
+monitor.o: $(hdrdir)/ruby/defines.h
+monitor.o: $(hdrdir)/ruby/intern.h
+monitor.o: $(hdrdir)/ruby/missing.h
+monitor.o: $(hdrdir)/ruby/ruby.h
+monitor.o: $(hdrdir)/ruby/st.h
+monitor.o: $(hdrdir)/ruby/subst.h
+monitor.o: monitor.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/monitor/extconf.rb b/ext/monitor/extconf.rb
new file mode 100644
index 0000000000..78c53fa0c5
--- /dev/null
+++ b/ext/monitor/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('monitor')
diff --git a/ext/monitor/lib/monitor.rb b/ext/monitor/lib/monitor.rb
new file mode 100644
index 0000000000..1883cb72f6
--- /dev/null
+++ b/ext/monitor/lib/monitor.rb
@@ -0,0 +1,284 @@
+# frozen_string_literal: false
+# = monitor.rb
+#
+# Copyright (C) 2001  Shugo Maeda <shugo@ruby-lang.org>
+#
+# This library is distributed under the terms of the Ruby license.
+# You can freely distribute/modify this library.
+#
+
+#
+# In concurrent programming, a monitor is an object or module intended to be
+# used safely by more than one thread.  The defining characteristic of a
+# monitor is that its methods are executed with mutual exclusion.  That is, at
+# each point in time, at most one thread may be executing any of its methods.
+# This mutual exclusion greatly simplifies reasoning about the implementation
+# of monitors compared to reasoning about parallel code that updates a data
+# structure.
+#
+# You can read more about the general principles on the Wikipedia page for
+# Monitors[http://en.wikipedia.org/wiki/Monitor_%28synchronization%29]
+#
+# == Examples
+#
+# === Simple object.extend
+#
+#   require 'monitor.rb'
+#
+#   buf = []
+#   buf.extend(MonitorMixin)
+#   empty_cond = buf.new_cond
+#
+#   # consumer
+#   Thread.start do
+#     loop do
+#       buf.synchronize do
+#         empty_cond.wait_while { buf.empty? }
+#         print buf.shift
+#       end
+#     end
+#   end
+#
+#   # producer
+#   while line = ARGF.gets
+#     buf.synchronize do
+#       buf.push(line)
+#       empty_cond.signal
+#     end
+#   end
+#
+# The consumer thread waits for the producer thread to push a line to buf
+# while <tt>buf.empty?</tt>.  The producer thread (main thread) reads a
+# line from ARGF and pushes it into buf then calls <tt>empty_cond.signal</tt>
+# to notify the consumer thread of new data.
+#
+# === Simple Class include
+#
+#   require 'monitor'
+#
+#   class SynchronizedArray < Array
+#
+#     include MonitorMixin
+#
+#     def initialize(*args)
+#       super(*args)
+#     end
+#
+#     alias :old_shift :shift
+#     alias :old_unshift :unshift
+#
+#     def shift(n=1)
+#       self.synchronize do
+#         self.old_shift(n)
+#       end
+#     end
+#
+#     def unshift(item)
+#       self.synchronize do
+#         self.old_unshift(item)
+#       end
+#     end
+#
+#     # other methods ...
+#   end
+#
+# +SynchronizedArray+ implements an Array with synchronized access to items.
+# This Class is implemented as subclass of Array which includes the
+# MonitorMixin module.
+#
+
+require 'monitor.so'
+
+module MonitorMixin
+  #
+  # FIXME: This isn't documented in Nutshell.
+  #
+  # Since MonitorMixin.new_cond returns a ConditionVariable, and the example
+  # above calls while_wait and signal, this class should be documented.
+  #
+  class ConditionVariable
+    #
+    # Releases the lock held in the associated monitor and waits; reacquires the lock on wakeup.
+    #
+    # If +timeout+ is given, this method returns after +timeout+ seconds passed,
+    # even if no other thread doesn't signal.
+    #
+    def wait(timeout = nil)
+      @monitor.mon_check_owner
+      @monitor.wait_for_cond(@cond, timeout)
+    end
+
+    #
+    # Calls wait repeatedly while the given block yields a truthy value.
+    #
+    def wait_while
+      while yield
+        wait
+      end
+    end
+
+    #
+    # Calls wait repeatedly until the given block yields a truthy value.
+    #
+    def wait_until
+      until yield
+        wait
+      end
+    end
+
+    #
+    # Wakes up the first thread in line waiting for this lock.
+    #
+    def signal
+      @monitor.mon_check_owner
+      @cond.signal
+    end
+
+    #
+    # Wakes up all threads waiting for this lock.
+    #
+    def broadcast
+      @monitor.mon_check_owner
+      @cond.broadcast
+    end
+
+    private
+
+    def initialize(monitor)
+      @monitor = monitor
+      @cond = Thread::ConditionVariable.new
+    end
+  end
+
+  def self.extend_object(obj)
+    super(obj)
+    obj.__send__(:mon_initialize)
+  end
+
+  #
+  # Attempts to enter exclusive section.  Returns +false+ if lock fails.
+  #
+  def mon_try_enter
+    @mon_data.try_enter
+  end
+  # For backward compatibility
+  alias try_mon_enter mon_try_enter
+
+  #
+  # Enters exclusive section.
+  #
+  def mon_enter
+    @mon_data.enter
+  end
+
+  #
+  # Leaves exclusive section.
+  #
+  def mon_exit
+    mon_check_owner
+    @mon_data.exit
+  end
+
+  #
+  # Returns true if this monitor is locked by any thread
+  #
+  def mon_locked?
+    @mon_data.mon_locked?
+  end
+
+  #
+  # Returns true if this monitor is locked by current thread.
+  #
+  def mon_owned?
+    @mon_data.mon_owned?
+  end
+
+  #
+  # Enters exclusive section and executes the block.  Leaves the exclusive
+  # section automatically when the block exits.  See example under
+  # +MonitorMixin+.
+  #
+  def mon_synchronize(&b)
+    @mon_data.synchronize(&b)
+  end
+  alias synchronize mon_synchronize
+
+  #
+  # Creates a new MonitorMixin::ConditionVariable associated with the
+  # Monitor object.
+  #
+  def new_cond
+    unless defined?(@mon_data)
+      mon_initialize
+      @mon_initialized_by_new_cond = true
+    end
+    return ConditionVariable.new(@mon_data)
+  end
+
+  private
+
+  # Use <tt>extend MonitorMixin</tt> or <tt>include MonitorMixin</tt> instead
+  # of this constructor.  Have look at the examples above to understand how to
+  # use this module.
+  def initialize(*args)
+    super
+    mon_initialize
+  end
+
+  # Initializes the MonitorMixin after being included in a class or when an
+  # object has been extended with the MonitorMixin
+  def mon_initialize
+    if defined?(@mon_data)
+      if defined?(@mon_initialized_by_new_cond)
+        return # already initalized.
+      elsif @mon_data_owner_object_id == self.object_id
+        raise ThreadError, "already initialized"
+      end
+    end
+    @mon_data = ::Monitor.new
+    @mon_data_owner_object_id = self.object_id
+  end
+
+  def mon_check_owner
+    @mon_data.mon_check_owner
+  end
+end
+
+# Use the Monitor class when you want to have a lock object for blocks with
+# mutual exclusion.
+#
+#   require 'monitor'
+#
+#   lock = Monitor.new
+#   lock.synchronize do
+#     # exclusive access
+#   end
+#
+class Monitor
+  def new_cond
+    ::MonitorMixin::ConditionVariable.new(self)
+  end
+
+  # for compatibility
+  alias try_mon_enter try_enter
+  alias mon_try_enter try_enter
+  alias mon_enter enter
+  alias mon_exit exit
+  alias mon_synchronize synchronize
+end
+
+# Documentation comments:
+#  - All documentation comes from Nutshell.
+#  - MonitorMixin.new_cond appears in the example, but is not documented in
+#    Nutshell.
+#  - All the internals (internal modules Accessible and Initializable, class
+#    ConditionVariable) appear in RDoc.  It might be good to hide them, by
+#    making them private, or marking them :nodoc:, etc.
+#  - RDoc doesn't recognise aliases, so we have mon_synchronize documented, but
+#    not synchronize.
+#  - mon_owner is in Nutshell, but appears as an accessor in a separate module
+#    here, so is hard/impossible to RDoc.  Some other useful accessors
+#    (mon_count and some queue stuff) are also in this module, and don't appear
+#    directly in the RDoc output.
+#  - in short, it may be worth changing the code layout in this file to make the
+#    documentation easier
diff --git a/ext/monitor/monitor.c b/ext/monitor/monitor.c
new file mode 100644
index 0000000000..256fc4d7db
--- /dev/null
+++ b/ext/monitor/monitor.c
@@ -0,0 +1,221 @@
+#include "ruby/ruby.h"
+
+/* Thread::Monitor */
+
+struct rb_monitor {
+    long count;
+    const VALUE owner;
+    const VALUE mutex;
+};
+
+static void
+monitor_mark(void *ptr)
+{
+    struct rb_monitor *mc = ptr;
+    rb_gc_mark(mc->owner);
+    rb_gc_mark(mc->mutex);
+}
+
+static size_t
+monitor_memsize(const void *ptr)
+{
+    return sizeof(struct rb_monitor);
+}
+
+static const rb_data_type_t monitor_data_type = {
+    "monitor",
+    {monitor_mark, RUBY_TYPED_DEFAULT_FREE, monitor_memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED
+};
+
+static VALUE
+monitor_alloc(VALUE klass)
+{
+    struct rb_monitor *mc;
+    VALUE obj;
+
+    obj = TypedData_Make_Struct(klass, struct rb_monitor, &monitor_data_type, mc);
+    RB_OBJ_WRITE(obj, &mc->mutex, rb_mutex_new());
+    RB_OBJ_WRITE(obj, &mc->owner, Qnil);
+    mc->count = 0;
+
+    return obj;
+}
+
+static struct rb_monitor *
+monitor_ptr(VALUE monitor)
+{
+    struct rb_monitor *mc;
+    TypedData_Get_Struct(monitor, struct rb_monitor, &monitor_data_type, mc);
+    return mc;
+}
+
+static int
+mc_owner_p(struct rb_monitor *mc)
+{
+    return mc->owner == rb_thread_current();
+}
+
+static VALUE
+monitor_try_enter(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+
+    if (!mc_owner_p(mc)) {
+        if (!rb_mutex_trylock(mc->mutex)) {
+            return Qfalse;
+        }
+        RB_OBJ_WRITE(monitor, &mc->owner, rb_thread_current());
+        mc->count = 0;
+    }
+    mc->count += 1;
+    return Qtrue;
+}
+
+static VALUE
+monitor_enter(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+    if (!mc_owner_p(mc)) {
+        rb_mutex_lock(mc->mutex);
+        RB_OBJ_WRITE(monitor, &mc->owner, rb_thread_current());
+        mc->count = 0;
+    }
+    mc->count++;
+    return Qnil;
+}
+
+static VALUE
+monitor_check_owner(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+    if (!mc_owner_p(mc)) {
+        rb_raise(rb_eThreadError, "current thread not owner");
+    }
+    return Qnil;
+}
+
+static VALUE
+monitor_exit(VALUE monitor)
+{
+    monitor_check_owner(monitor);
+
+    struct rb_monitor *mc = monitor_ptr(monitor);
+
+    if (mc->count <= 0) rb_bug("monitor_exit: count:%d\n", (int)mc->count);
+    mc->count--;
+
+    if (mc->count == 0) {
+        RB_OBJ_WRITE(monitor, &mc->owner, Qnil);
+        rb_mutex_unlock(mc->mutex);
+    }
+    return Qnil;
+}
+
+static VALUE
+monitor_locked_p(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+    return rb_mutex_locked_p(mc->mutex);
+}
+
+static VALUE
+monitor_owned_p(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+    return (rb_mutex_locked_p(mc->mutex) && mc_owner_p(mc)) ? Qtrue : Qfalse;
+}
+
+static VALUE
+monitor_exit_for_cond(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+    long cnt = mc->count;
+    RB_OBJ_WRITE(monitor, &mc->owner, Qnil);
+    mc->count = 0;
+    return LONG2NUM(cnt);
+}
+
+struct wait_for_cond_data {
+    VALUE monitor;
+    VALUE cond;
+    VALUE timeout;
+    VALUE count;
+};
+
+static VALUE
+monitor_wait_for_cond_body(VALUE v)
+{
+    struct wait_for_cond_data *data = (struct wait_for_cond_data *)v;
+    struct rb_monitor *mc = monitor_ptr(data->monitor);
+    // cond.wait(monitor.mutex, timeout)
+    rb_funcall(data->cond, rb_intern("wait"), 2, mc->mutex, data->timeout);
+    return Qtrue;
+}
+
+static VALUE
+monitor_enter_for_cond(VALUE v)
+{
+    // assert(rb_mutex_owned_p(mc->mutex) == Qtrue)
+    // but rb_mutex_owned_p is not exported...
+
+    struct wait_for_cond_data *data = (struct wait_for_cond_data *)v;
+    struct rb_monitor *mc = monitor_ptr(data->monitor);
+    RB_OBJ_WRITE(data->monitor, &mc->owner, rb_thread_current());
+    mc->count = NUM2LONG(data->count);
+    return Qnil;
+}
+
+static VALUE
+monitor_wait_for_cond(VALUE monitor, VALUE cond, VALUE timeout)
+{
+    VALUE count = monitor_exit_for_cond(monitor);
+    struct wait_for_cond_data data = {
+        monitor,
+        cond,
+        timeout,
+        count,
+    };
+
+    return rb_ensure(monitor_wait_for_cond_body, (VALUE)&data,
+                     monitor_enter_for_cond, (VALUE)&data);
+}
+
+static VALUE
+monitor_sync_body(VALUE monitor)
+{
+    return rb_yield_values(0);
+}
+
+static VALUE
+monitor_sync_ensure(VALUE monitor)
+{
+    return monitor_exit(monitor);
+}
+
+static VALUE
+monitor_synchronize(VALUE monitor)
+{
+    monitor_enter(monitor);
+    return rb_ensure(monitor_sync_body, monitor, monitor_sync_ensure, monitor);
+}
+
+void
+Init_monitor(void)
+{
+    VALUE rb_cMonitor = rb_define_class("Monitor", rb_cObject);
+    rb_define_alloc_func(rb_cMonitor, monitor_alloc);
+
+    rb_define_method(rb_cMonitor, "try_enter", monitor_try_enter, 0);
+    rb_define_method(rb_cMonitor, "enter", monitor_enter, 0);
+    rb_define_method(rb_cMonitor, "exit", monitor_exit, 0);
+    rb_define_method(rb_cMonitor, "synchronize", monitor_synchronize, 0);
+
+    /* internal methods for MonitorMixin */
+    rb_define_method(rb_cMonitor, "mon_locked?", monitor_locked_p, 0);
+    rb_define_method(rb_cMonitor, "mon_check_owner", monitor_check_owner, 0);
+    rb_define_method(rb_cMonitor, "mon_owned?", monitor_owned_p, 0);
+
+    /* internal methods for MonitorMixin::ConditionalVariable */
+    rb_define_method(rb_cMonitor, "wait_for_cond", monitor_wait_for_cond, 2);
+}
diff --git a/ext/nkf/depend b/ext/nkf/depend
index 0ed8fea8d2..82580ff7fe 100644
--- a/ext/nkf/depend
+++ b/ext/nkf/depend
@@ -1 +1,25 @@
-nkf.o : nkf.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(srcdir)/nkf-utf8/nkf.c $(srcdir)/nkf-utf8/utf8tbl.c $(srcdir)/nkf-utf8/config.h
+# 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/assert.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/onigmo.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
diff --git a/ext/nkf/extconf.rb b/ext/nkf/extconf.rb
index 710662f19c..f41f6b11dc 100644
--- a/ext/nkf/extconf.rb
+++ b/ext/nkf/extconf.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: false
 require 'mkmf'
 create_makefile('nkf')
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
index f8c1ae8f59..f52b755288 100644
--- a/ext/nkf/lib/kconv.rb
+++ b/ext/nkf/lib/kconv.rb
@@ -1,3 +1,4 @@
+# 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 0382f30938..cc438a50d6 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
- * Copyright (c) 1996-2010, The nkf Project.
+ * Copyright (c) 1996-2018, The nkf Project.
  *
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -20,11 +20,11 @@
  *
  * 3. This notice may not be removed or altered from any source distribution.
  */
-#define NKF_VERSION "2.1.2"
-#define NKF_RELEASE_DATE "2011-09-08"
+#define NKF_VERSION "2.1.5"
+#define NKF_RELEASE_DATE "2018-12-15"
 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
-    "Copyright (C) 1996-2011, The nkf Project."
+    "Copyright (C) 1996-2018, The nkf Project."
 
 #include "config.h"
 #include "nkf.h"
@@ -356,6 +356,7 @@ static  int     no_cp932ext_f = FALSE;
 /* ignore ZERO WIDTH NO-BREAK SPACE */
 static  int     no_best_fit_chars_f = FALSE;
 static  int     input_endian = ENDIAN_BIG;
+static  int     input_bom_f = FALSE;
 static  nkf_char     unicode_subchar = '?'; /* the regular substitution character */
 static  void    (*encode_fallback)(nkf_char c) = NULL;
 static  void    w_status(struct input_code *, nkf_char);
@@ -430,6 +431,8 @@ static nkf_char (*i_uungetc)(nkf_char c ,FILE *f) = std_ungetc;
 #define nkf_char_unicode_bmp_p(c) ((c & VALUE_MASK) <= UNICODE_BMP_MAX)
 #define nkf_char_unicode_value_p(c) ((c & VALUE_MASK) <= UNICODE_MAX)
 
+#define UTF16_TO_UTF32(lead, trail) (((lead) << 10) + (trail) - NKF_INT32_C(0x35FDC00))
+
 #ifdef NUMCHAR_OPTION
 static int numchar_f = FALSE;
 static nkf_char (*i_ngetc)(FILE *) = std_getc; /* input of ugetc */
@@ -506,7 +509,7 @@ static int             fold_margin  = FOLD_MARGIN;
 /* process default */
 
 static nkf_char
-no_connection2(nkf_char c2, nkf_char c1, nkf_char c0)
+no_connection2(ARG_UNUSED nkf_char c2, ARG_UNUSED nkf_char c1, ARG_UNUSED nkf_char c0)
 {
     fprintf(stderr,"nkf internal module connection failure.\n");
     exit(EXIT_FAILURE);
@@ -620,6 +623,27 @@ static const unsigned char ev[]= {
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
     0x00,0x00};
 
+/* X0201 kana to X0213 conversion table for han-daguten */
+/* 90-9F A0-DF */
+static const unsigned char ev_x0213[]= {
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x25,0x77,0x25,0x78,
+    0x25,0x79,0x25,0x7a,0x25,0x7b,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x25,0x7c,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x25,0x7d,0x00,0x00,
+    0x25,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00};
+
 
 /* X0208 kigou conversion table */
 /* 0x8140 - 0x819e */
@@ -750,7 +774,7 @@ nkf_enc_find(const char *name)
 
 #ifdef DEFAULT_CODE_LOCALE
 static const char*
-nkf_locale_charmap()
+nkf_locale_charmap(void)
 {
 #ifdef HAVE_LANGINFO_H
     return nl_langinfo(CODESET);
@@ -778,7 +802,7 @@ nkf_locale_charmap()
 }
 
 static nkf_encoding*
-nkf_locale_encoding()
+nkf_locale_encoding(void)
 {
     nkf_encoding *enc = 0;
     const char *encname = nkf_locale_charmap();
@@ -789,13 +813,13 @@ nkf_locale_encoding()
 #endif /* DEFAULT_CODE_LOCALE */
 
 static nkf_encoding*
-nkf_utf8_encoding()
+nkf_utf8_encoding(void)
 {
     return &nkf_encoding_table[UTF_8];
 }
 
 static nkf_encoding*
-nkf_default_encoding()
+nkf_default_encoding(void)
 {
     nkf_encoding *enc = 0;
 #ifdef DEFAULT_CODE_LOCALE
@@ -1087,18 +1111,26 @@ encode_fallback_java(nkf_char c)
     (*oconv)(0, '\\');
     c &= VALUE_MASK;
     if(!nkf_char_unicode_bmp_p(c)){
-	(*oconv)(0, 'U');
-	(*oconv)(0, '0');
-	(*oconv)(0, '0');
-	(*oconv)(0, bin2hex(c>>20));
-	(*oconv)(0, bin2hex(c>>16));
+        int high = (c >> 10) + NKF_INT32_C(0xD7C0);   /* high surrogate */
+        int low = (c & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
+	(*oconv)(0, 'u');
+	(*oconv)(0, bin2hex(high>>12));
+	(*oconv)(0, bin2hex(high>> 8));
+	(*oconv)(0, bin2hex(high>> 4));
+	(*oconv)(0, bin2hex(high    ));
+	(*oconv)(0, '\\');
+	(*oconv)(0, 'u');
+	(*oconv)(0, bin2hex(low>>12));
+	(*oconv)(0, bin2hex(low>> 8));
+	(*oconv)(0, bin2hex(low>> 4));
+	(*oconv)(0, bin2hex(low    ));
     }else{
 	(*oconv)(0, 'u');
+	(*oconv)(0, bin2hex(c>>12));
+	(*oconv)(0, bin2hex(c>> 8));
+	(*oconv)(0, bin2hex(c>> 4));
+	(*oconv)(0, bin2hex(c    ));
     }
-    (*oconv)(0, bin2hex(c>>12));
-    (*oconv)(0, bin2hex(c>> 8));
-    (*oconv)(0, bin2hex(c>> 4));
-    (*oconv)(0, bin2hex(c    ));
     return;
 }
 
@@ -1287,6 +1319,7 @@ set_input_encoding(nkf_encoding *enc)
 	x0213_f = TRUE;
 #ifdef SHIFTJIS_CP932
 	cp51932_f = FALSE;
+	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
 #endif
 	break;
     case EUC_JISX0213:
@@ -1357,6 +1390,7 @@ set_output_encoding(nkf_encoding *enc)
 #endif
 	break;
     case ISO_2022_JP_3:
+    case ISO_2022_JP_2004:
 	x0212_f = TRUE;
 	x0213_f = TRUE;
 #ifdef SHIFTJIS_CP932
@@ -1540,13 +1574,26 @@ x0212_unshift(nkf_char c)
 }
 #endif /* X0212_ENABLE */
 
+static int
+is_x0213_2_in_x0212(nkf_char c1)
+{
+    static const char x0213_2_table[] =
+	{0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1};
+    int ku = c1 - 0x20;
+    if (ku <= 15)
+	return x0213_2_table[ku]; /* 1, 3-5, 8, 12-15 */
+    if (78 <= ku && ku <= 94)
+	return 1;
+    return 0;
+}
+
 static nkf_char
 e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
 {
     nkf_char ndx;
     if (is_eucg3(c2)){
 	ndx = c2 & 0x7f;
-	if (x0213_f){
+	if (x0213_f && is_x0213_2_in_x0212(ndx)){
 	    if((0x21 <= ndx && ndx <= 0x2F)){
 		if (p2) *p2 = ((ndx - 1) >> 1) + 0xec - ndx / 8 * 3;
 		if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
@@ -1592,7 +1639,7 @@ s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
     static const char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} };
     if (0xFC < c1) return 1;
 #ifdef SHIFTJIS_CP932
-    if (!cp932inv_f && is_ibmext_in_sjis(c2)){
+    if (!cp932inv_f && !x0213_f && is_ibmext_in_sjis(c2)){
 	val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40];
 	if (val){
 	    c2 = val >> 8;
@@ -1695,7 +1742,7 @@ nkf_utf8_to_unicode(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
 	/* single byte */
 	wc = c1;
     }
-    else if (c1 <= 0xC3) {
+    else if (c1 <= 0xC1) {
 	/* trail byte or invalid */
 	return -1;
     }
@@ -1835,6 +1882,7 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
 	    ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_2bytes_932 :
 	    ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_2bytes_ms :
 	    ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_2bytes_mac :
+	    x0213_f ? utf8_to_euc_2bytes_x0213 :
 	    utf8_to_euc_2bytes;
 	ret =  unicode_to_jis_common2(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1);
     }else if(c0 < 0xF0){
@@ -1902,16 +1950,22 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
 	    ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_3bytes_932 :
 	    ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_3bytes_ms :
 	    ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_3bytes_mac :
+	    x0213_f ? utf8_to_euc_3bytes_x0213 :
 	    utf8_to_euc_3bytes;
 	ret = unicode_to_jis_common2(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1);
     }else return -1;
 #ifdef SHIFTJIS_CP932
-    if (!ret && !cp932inv_f && is_eucg3(*p2)) {
-	nkf_char s2, s1;
-	if (e2s_conv(*p2, *p1, &s2, &s1) == 0) {
-	    s2e_conv(s2, s1, p2, p1);
-	}else{
-	    ret = 1;
+    if (!ret&& is_eucg3(*p2)) {
+	if (cp932inv_f) {
+	    if (encode_fallback) ret = 1;
+	}
+	else {
+	    nkf_char s2, s1;
+	    if (e2s_conv(*p2, *p1, &s2, &s1) == 0) {
+		s2e_conv(s2, s1, p2, p1);
+	    }else{
+		ret = 1;
+	    }
 	}
     }
 #endif
@@ -1919,6 +1973,15 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
 }
 
 #ifdef UTF8_OUTPUT_ENABLE
+#define X0213_SURROGATE_FIND(tbl, size, euc) do { \
+	int i; \
+	for (i = 0; i < size; i++) \
+	    if (tbl[i][0] == euc) { \
+		low = tbl[i][2]; \
+		break; \
+	    } \
+    } while (0)
+
 static nkf_char
 e2w_conv(nkf_char c2, nkf_char c1)
 {
@@ -1941,7 +2004,9 @@ e2w_conv(nkf_char c2, nkf_char c1)
 	}
 	c2 = (c2&0x7f) - 0x21;
 	if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
-	    p = x0212_to_utf8_2bytes[c2];
+	    p =
+		x0213_f ? x0212_to_utf8_2bytes_x0213[c2] :
+		x0212_to_utf8_2bytes[c2];
 	else
 	    return 0;
 #endif
@@ -1950,6 +2015,7 @@ e2w_conv(nkf_char c2, nkf_char c1)
 	c2 = (c2&0x7f) - 0x21;
 	if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
 	    p =
+		x0213_f ? euc_to_utf8_2bytes_x0213[c2] :
 		ms_ucs_map_f == UCS_MAP_ASCII ? euc_to_utf8_2bytes[c2] :
 		ms_ucs_map_f == UCS_MAP_CP10001 ? euc_to_utf8_2bytes_mac[c2] :
 		euc_to_utf8_2bytes_ms[c2];
@@ -1958,8 +2024,39 @@ e2w_conv(nkf_char c2, nkf_char c1)
     }
     if (!p) return 0;
     c1 = (c1 & 0x7f) - 0x21;
-    if (0<=c1 && c1<sizeof_euc_to_utf8_1byte)
-	return p[c1];
+    if (0<=c1 && c1<sizeof_euc_to_utf8_1byte) {
+	nkf_char val = p[c1];
+	if (x0213_f && 0xD800<=val && val<=0xDBFF) {
+	    nkf_char euc = (c2+0x21)<<8 | (c1+0x21);
+	    nkf_char low = 0;
+	    if (p==x0212_to_utf8_2bytes_x0213[c2]) {
+		X0213_SURROGATE_FIND(x0213_2_surrogate_table, sizeof_x0213_2_surrogate_table, euc);
+	    } else {
+		X0213_SURROGATE_FIND(x0213_1_surrogate_table, sizeof_x0213_1_surrogate_table, euc);
+	    }
+	    if (!low) return 0;
+	    return UTF16_TO_UTF32(val, low);
+	} else {
+	    return val;
+	}
+    }
+    return 0;
+}
+
+static nkf_char
+e2w_combining(nkf_char comb, nkf_char c2, nkf_char c1)
+{
+    nkf_char euc;
+    int i;
+    for (i = 0; i < sizeof_x0213_combining_chars; i++)
+	if (x0213_combining_chars[i] == comb)
+	    break;
+    if (i >= sizeof_x0213_combining_chars)
+	return 0;
+    euc = (c2&0x7f)<<8 | (c1&0x7f);
+    for (i = 0; i < sizeof_x0213_combining_table; i++)
+	if (x0213_combining_table[i][0] == euc)
+	    return x0213_combining_table[i][1];
     return 0;
 }
 #endif
@@ -2006,6 +2103,25 @@ w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1)
 	}
     }
     else {
+	int i;
+	if (x0213_f) {
+	    c1 = (val >> 10) + NKF_INT32_C(0xD7C0);   /* high surrogate */
+	    c2 = (val & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
+	    for (i = 0; i < sizeof_x0213_1_surrogate_table; i++)
+		if (x0213_1_surrogate_table[i][1] == c1 && x0213_1_surrogate_table[i][2] == c2) {
+		    val = x0213_1_surrogate_table[i][0];
+		    *p2 = val >> 8;
+		    *p1 = val & 0xFF;
+		    return 0;
+		}
+	    for (i = 0; i < sizeof_x0213_2_surrogate_table; i++)
+		if (x0213_2_surrogate_table[i][1] == c1 && x0213_2_surrogate_table[i][2] == c2) {
+		    val = x0213_2_surrogate_table[i][0];
+		    *p2 = PREFIX_EUCG3 | (val >> 8);
+		    *p1 = val & 0xFF;
+		    return 0;
+		}
+	}
 	*p2 = 0;
 	*p1 = nkf_char_unicode_new(val);
     }
@@ -2078,7 +2194,7 @@ e_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
 }
 
 static nkf_char
-s_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
+s_iconv(ARG_UNUSED nkf_char c2, nkf_char c1, ARG_UNUSED nkf_char c0)
 {
     if (c2 == JIS_X_0201_1976_K || (0xA1 <= c2 && c2 <= 0xDF)) {
 	if (iso2022jp_f && !x0201_f) {
@@ -2101,6 +2217,30 @@ s_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
     return 0;
 }
 
+static int
+x0213_wait_combining_p(nkf_char wc)
+{
+    int i;
+    for (i = 0; i < sizeof_x0213_combining_table; i++) {
+	if (x0213_combining_table[i][1] == wc) {
+	    return TRUE;
+	}
+    }
+    return FALSE;
+}
+
+static int
+x0213_combining_p(nkf_char wc)
+{
+    int i;
+    for (i = 0; i < sizeof_x0213_combining_chars; i++) {
+	if (x0213_combining_chars[i] == wc) {
+	    return TRUE;
+	}
+    }
+    return FALSE;
+}
+
 static nkf_char
 w_iconv(nkf_char c1, nkf_char c2, nkf_char c3)
 {
@@ -2168,6 +2308,8 @@ w_iconv(nkf_char c1, nkf_char c2, nkf_char c3)
 	c2 = nkf_char_unicode_new(nkf_utf8_to_unicode(c1, c2, c3, c4));
 	c1 = 0;
     } else {
+	if (x0213_f && x0213_wait_combining_p(nkf_utf8_to_unicode(c1, c2, c3, c4)))
+	    return -3;
 	ret = w2e_conv(c1, c2, c3, &c1, &c2);
     }
     if (ret == 0){
@@ -2176,9 +2318,22 @@ w_iconv(nkf_char c1, nkf_char c2, nkf_char c3)
     return ret;
 }
 
+static nkf_char
+w_iconv_nocombine(nkf_char c1, nkf_char c2, nkf_char c3)
+{
+    /* continue from the line below 'return -3;' in w_iconv() */
+    nkf_char ret = w2e_conv(c1, c2, c3, &c1, &c2);
+    if (ret == 0){
+	(*oconv)(c1, c2);
+    }
+    return ret;
+}
+
 #define NKF_ICONV_INVALID_CODE_RANGE -13
+#define NKF_ICONV_WAIT_COMBINING_CHAR -14
+#define NKF_ICONV_NOT_COMBINED -15
 static size_t
-unicode_iconv(nkf_char wc)
+unicode_iconv(nkf_char wc, int nocombine)
 {
     nkf_char c1, c2;
     int ret = 0;
@@ -2190,6 +2345,8 @@ unicode_iconv(nkf_char wc)
 	/* unpaired surrogate */
 	return NKF_ICONV_INVALID_CODE_RANGE;
     }else if (wc < 0xFFFF) {
+	if (!nocombine && x0213_f && x0213_wait_combining_p(wc))
+	    return NKF_ICONV_WAIT_COMBINING_CHAR;
 	ret = w16e_conv(wc, &c2, &c1);
 	if (ret) return ret;
     }else if (wc < 0x10FFFF) {
@@ -2202,9 +2359,50 @@ unicode_iconv(nkf_char wc)
     return 0;
 }
 
+static nkf_char
+unicode_iconv_combine(nkf_char wc, nkf_char wc2)
+{
+    nkf_char c1, c2;
+    int i;
+
+    if (wc2 < 0x80) {
+	return NKF_ICONV_NOT_COMBINED;
+    }else if ((wc2>>11) == 27) {
+	/* unpaired surrogate */
+	return NKF_ICONV_INVALID_CODE_RANGE;
+    }else if (wc2 < 0xFFFF) {
+	if (!x0213_combining_p(wc2))
+	    return NKF_ICONV_NOT_COMBINED;
+	for (i = 0; i < sizeof_x0213_combining_table; i++) {
+	    if (x0213_combining_table[i][1] == wc &&
+		x0213_combining_table[i][2] == wc2) {
+		c2 = x0213_combining_table[i][0] >> 8;
+		c1 = x0213_combining_table[i][0] & 0x7f;
+		(*oconv)(c2, c1);
+		return 0;
+	    }
+	}
+    }else if (wc2 < 0x10FFFF) {
+	return NKF_ICONV_NOT_COMBINED;
+    } else {
+	return NKF_ICONV_INVALID_CODE_RANGE;
+    }
+    return NKF_ICONV_NOT_COMBINED;
+}
+
+static nkf_char
+w_iconv_combine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4, nkf_char c5, nkf_char c6)
+{
+    nkf_char wc, wc2;
+    wc = nkf_utf8_to_unicode(c1, c2, c3, 0);
+    wc2 = nkf_utf8_to_unicode(c4, c5, c6, 0);
+    if (wc2 < 0)
+	return wc2;
+    return unicode_iconv_combine(wc, wc2);
+}
+
 #define NKF_ICONV_NEED_ONE_MORE_BYTE (size_t)-1
 #define NKF_ICONV_NEED_TWO_MORE_BYTES (size_t)-2
-#define UTF16_TO_UTF32(lead, trail) (((lead) << 10) + (trail) - NKF_INT32_C(0x35FDC00))
 static size_t
 nkf_iconv_utf_16(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
 {
@@ -2233,33 +2431,63 @@ nkf_iconv_utf_16(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
 	}
     }
 
-    return (*unicode_iconv)(wc);
+    return (*unicode_iconv)(wc, FALSE);
+}
+
+static size_t
+nkf_iconv_utf_16_combine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
+{
+    nkf_char wc, wc2;
+
+    if (input_endian == ENDIAN_BIG) {
+	if (0xD8 <= c3 && c3 <= 0xDB) {
+	    return NKF_ICONV_NOT_COMBINED;
+	} else {
+	    wc = c1 << 8 | c2;
+	    wc2 = c3 << 8 | c4;
+	}
+    } else {
+	if (0xD8 <= c2 && c2 <= 0xDB) {
+	    return NKF_ICONV_NOT_COMBINED;
+	} else {
+	    wc = c2 << 8 | c1;
+	    wc2 = c4 << 8 | c3;
+	}
+    }
+
+    return unicode_iconv_combine(wc, wc2);
+}
+
+static size_t
+nkf_iconv_utf_16_nocombine(nkf_char c1, nkf_char c2)
+{
+    nkf_char wc;
+    if (input_endian == ENDIAN_BIG)
+	wc = c1 << 8 | c2;
+    else
+	wc = c2 << 8 | c1;
+    return (*unicode_iconv)(wc, TRUE);
 }
 
 static nkf_char
-w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0)
+w_iconv16(nkf_char c2, nkf_char c1, ARG_UNUSED nkf_char c0)
 {
     (*oconv)(c2, c1);
     return 16; /* different from w_iconv32 */
 }
 
 static nkf_char
-w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0)
+w_iconv32(nkf_char c2, nkf_char c1, ARG_UNUSED nkf_char c0)
 {
     (*oconv)(c2, c1);
     return 32; /* different from w_iconv16 */
 }
 
-static size_t
-nkf_iconv_utf_32(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
+static nkf_char
+utf32_to_nkf_char(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
 {
     nkf_char wc;
 
-    if (c1 == EOF) {
-	(*oconv)(EOF, 0);
-	return 0;
-    }
-
     switch(input_endian){
     case ENDIAN_BIG:
 	wc = c2 << 16 | c3 << 8 | c4;
@@ -2276,8 +2504,48 @@ nkf_iconv_utf_32(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
     default:
 	return NKF_ICONV_INVALID_CODE_RANGE;
     }
+    return wc;
+}
+
+static size_t
+nkf_iconv_utf_32(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
+{
+    nkf_char wc;
+
+    if (c1 == EOF) {
+	(*oconv)(EOF, 0);
+	return 0;
+    }
+
+    wc = utf32_to_nkf_char(c1, c2, c3, c4);
+    if (wc < 0)
+	return wc;
 
-    return (*unicode_iconv)(wc);
+    return (*unicode_iconv)(wc, FALSE);
+}
+
+static nkf_char
+nkf_iconv_utf_32_combine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4, nkf_char c5, nkf_char c6, nkf_char c7, nkf_char c8)
+{
+    nkf_char wc, wc2;
+
+    wc = utf32_to_nkf_char(c1, c2, c3, c4);
+    if (wc < 0)
+	return wc;
+    wc2 = utf32_to_nkf_char(c5, c6, c7, c8);
+    if (wc2 < 0)
+	return wc2;
+
+    return unicode_iconv_combine(wc, wc2);
+}
+
+static size_t
+nkf_iconv_utf_32_nocombine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
+{
+    nkf_char wc;
+
+    wc = utf32_to_nkf_char(c1, c2, c3, c4);
+    return (*unicode_iconv)(wc, TRUE);
 }
 #endif
 
@@ -2532,11 +2800,19 @@ s_oconv(nkf_char c2, nkf_char c1)
 }
 
 #ifdef UTF8_OUTPUT_ENABLE
+#define OUTPUT_UTF8(val) do { \
+	nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4); \
+	(*o_putc)(c1); \
+	if (c2) (*o_putc)(c2); \
+	if (c3) (*o_putc)(c3); \
+	if (c4) (*o_putc)(c4); \
+    } while (0)
+
 static void
 w_oconv(nkf_char c2, nkf_char c1)
 {
     nkf_char c3, c4;
-    nkf_char val;
+    nkf_char val, val2;
 
     if (output_bom_f) {
 	output_bom_f = FALSE;
@@ -2552,11 +2828,7 @@ w_oconv(nkf_char c2, nkf_char c1)
 
     if (c2 == 0 && nkf_char_unicode_p(c1)){
 	val = c1 & VALUE_MASK;
-	nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4);
-	(*o_putc)(c1);
-	if (c2) (*o_putc)(c2);
-	if (c3) (*o_putc)(c3);
-	if (c4) (*o_putc)(c4);
+	OUTPUT_UTF8(val);
 	return;
     }
 
@@ -2565,27 +2837,46 @@ w_oconv(nkf_char c2, nkf_char c1)
     } else {
 	val = e2w_conv(c2, c1);
 	if (val){
-	    nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4);
-	    (*o_putc)(c1);
-	    if (c2) (*o_putc)(c2);
-	    if (c3) (*o_putc)(c3);
-	    if (c4) (*o_putc)(c4);
+	    val2 = e2w_combining(val, c2, c1);
+	    if (val2)
+		OUTPUT_UTF8(val2);
+	    OUTPUT_UTF8(val);
 	}
     }
 }
 
+#define OUTPUT_UTF16_BYTES(c1, c2) do { \
+	if (output_endian == ENDIAN_LITTLE){ \
+	    (*o_putc)(c1); \
+	    (*o_putc)(c2); \
+	}else{ \
+	    (*o_putc)(c2); \
+	    (*o_putc)(c1); \
+	} \
+    } while (0)
+
+#define OUTPUT_UTF16(val) do { \
+	if (nkf_char_unicode_bmp_p(val)) { \
+	    c2 = (val >> 8) & 0xff; \
+	    c1 = val & 0xff; \
+	    OUTPUT_UTF16_BYTES(c1, c2); \
+	} else { \
+	    val &= VALUE_MASK; \
+	    if (val <= UNICODE_MAX) { \
+		c2 = (val >> 10) + NKF_INT32_C(0xD7C0);   /* high surrogate */ \
+		c1 = (val & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */ \
+		OUTPUT_UTF16_BYTES(c2 & 0xff, (c2 >> 8) & 0xff); \
+		OUTPUT_UTF16_BYTES(c1 & 0xff, (c1 >> 8) & 0xff); \
+	    } \
+	} \
+    } while (0)
+
 static void
 w_oconv16(nkf_char c2, nkf_char c1)
 {
     if (output_bom_f) {
 	output_bom_f = FALSE;
-	if (output_endian == ENDIAN_LITTLE){
-	    (*o_putc)(0xFF);
-	    (*o_putc)(0xFE);
-	}else{
-	    (*o_putc)(0xFE);
-	    (*o_putc)(0xFF);
-	}
+	OUTPUT_UTF16_BYTES(0xFF, 0xFE);
     }
 
     if (c2 == EOF) {
@@ -2594,43 +2885,33 @@ w_oconv16(nkf_char c2, nkf_char c1)
     }
 
     if (c2 == 0 && nkf_char_unicode_p(c1)) {
-	if (nkf_char_unicode_bmp_p(c1)) {
-	    c2 = (c1 >> 8) & 0xff;
-	    c1 &= 0xff;
-	} else {
-	    c1 &= VALUE_MASK;
-	    if (c1 <= UNICODE_MAX) {
-		c2 = (c1 >> 10) + NKF_INT32_C(0xD7C0);   /* high surrogate */
-		c1 = (c1 & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
-		if (output_endian == ENDIAN_LITTLE){
-		    (*o_putc)(c2 & 0xff);
-		    (*o_putc)((c2 >> 8) & 0xff);
-		    (*o_putc)(c1 & 0xff);
-		    (*o_putc)((c1 >> 8) & 0xff);
-		}else{
-		    (*o_putc)((c2 >> 8) & 0xff);
-		    (*o_putc)(c2 & 0xff);
-		    (*o_putc)((c1 >> 8) & 0xff);
-		    (*o_putc)(c1 & 0xff);
-		}
-	    }
-	    return;
-	}
+	OUTPUT_UTF16(c1);
     } else if (c2) {
-	nkf_char val = e2w_conv(c2, c1);
-	c2 = (val >> 8) & 0xff;
-	c1 = val & 0xff;
+	nkf_char val, val2;
+	val = e2w_conv(c2, c1);
 	if (!val) return;
-    }
-
-    if (output_endian == ENDIAN_LITTLE){
-	(*o_putc)(c1);
-	(*o_putc)(c2);
-    }else{
-	(*o_putc)(c2);
-	(*o_putc)(c1);
-    }
-}
+	val2 = e2w_combining(val, c2, c1);
+	if (val2)
+	    OUTPUT_UTF16(val2);
+	OUTPUT_UTF16(val);
+    } else {
+	OUTPUT_UTF16_BYTES(c1, c2);
+    }
+}
+
+#define OUTPUT_UTF32(c) do { \
+	if (output_endian == ENDIAN_LITTLE){ \
+	    (*o_putc)( (c)        & 0xFF); \
+	    (*o_putc)(((c) >>  8) & 0xFF); \
+	    (*o_putc)(((c) >> 16) & 0xFF); \
+	    (*o_putc)(0); \
+	}else{ \
+	    (*o_putc)(0); \
+	    (*o_putc)(((c) >> 16) & 0xFF); \
+	    (*o_putc)(((c) >>  8) & 0xFF); \
+	    (*o_putc)( (c)        & 0xFF); \
+	} \
+    } while (0)
 
 static void
 w_oconv32(nkf_char c2, nkf_char c1)
@@ -2660,20 +2941,15 @@ w_oconv32(nkf_char c2, nkf_char c1)
     } else if (c2 == 0 && nkf_char_unicode_p(c1)) {
 	c1 &= VALUE_MASK;
     } else if (c2) {
-	c1 = e2w_conv(c2, c1);
-	if (!c1) return;
-    }
-    if (output_endian == ENDIAN_LITTLE){
-	(*o_putc)( c1        & 0xFF);
-	(*o_putc)((c1 >>  8) & 0xFF);
-	(*o_putc)((c1 >> 16) & 0xFF);
-	(*o_putc)(0);
-    }else{
-	(*o_putc)(0);
-	(*o_putc)((c1 >> 16) & 0xFF);
-	(*o_putc)((c1 >>  8) & 0xFF);
-	(*o_putc)( c1        & 0xFF);
+	nkf_char val, val2;
+	val = e2w_conv(c2, c1);
+	if (!val) return;
+	val2 = e2w_combining(val, c2, c1);
+	if (val2)
+	    OUTPUT_UTF32(val2);
+	c1 = val;
     }
+    OUTPUT_UTF32(c1);
 }
 #endif
 
@@ -2682,7 +2958,8 @@ w_oconv32(nkf_char c2, nkf_char c1)
 #define SCORE_DEPEND   (SCORE_KANA << 1)     /* MD Characters */
 #define SCORE_CP932    (SCORE_DEPEND << 1)   /* IBM extended characters */
 #define SCORE_X0212    (SCORE_CP932 << 1)    /* JIS X 0212 */
-#define SCORE_NO_EXIST (SCORE_X0212 << 1)    /* Undefined Characters */
+#define SCORE_X0213    (SCORE_X0212 << 1)    /* JIS X 0213 */
+#define SCORE_NO_EXIST (SCORE_X0213 << 1)    /* Undefined Characters */
 #define SCORE_iMIME    (SCORE_NO_EXIST << 1) /* MIME selected */
 #define SCORE_ERROR    (SCORE_iMIME << 1) /* Error */
 
@@ -2692,14 +2969,35 @@ static const nkf_char score_table_A0[] = {
     0, 0, 0, 0,
     0, 0, 0, 0,
     0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
-    SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_NO_EXIST,
+    SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_X0213,
 };
 
 static const nkf_char score_table_F0[] = {
     SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2,
-    SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST,
+    SCORE_L2, SCORE_DEPEND, SCORE_X0213, SCORE_X0213,
     SCORE_DEPEND, SCORE_DEPEND, SCORE_CP932, SCORE_CP932,
-    SCORE_CP932, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_ERROR,
+    SCORE_CP932, SCORE_X0213, SCORE_X0213, SCORE_ERROR,
+};
+
+static const nkf_char score_table_8FA0[] = {
+    0, SCORE_X0213, SCORE_X0212, SCORE_X0213,
+    SCORE_X0213, SCORE_X0213, SCORE_X0212, SCORE_X0212,
+    SCORE_X0213, SCORE_X0212, SCORE_X0212, SCORE_X0212,
+    SCORE_X0213, SCORE_X0213, SCORE_X0213, SCORE_X0213,
+};
+
+static const nkf_char score_table_8FE0[] = {
+    SCORE_X0212, SCORE_X0212, SCORE_X0212, SCORE_X0212,
+    SCORE_X0212, SCORE_X0212, SCORE_X0212, SCORE_X0212,
+    SCORE_X0212, SCORE_X0212, SCORE_X0212, SCORE_X0212,
+    SCORE_X0212, SCORE_X0212, SCORE_X0213, SCORE_X0213,
+};
+
+static const nkf_char score_table_8FF0[] = {
+    SCORE_X0213, SCORE_X0213, SCORE_X0213, SCORE_X0212,
+    SCORE_X0212, SCORE_X0213, SCORE_X0213, SCORE_X0213,
+    SCORE_X0213, SCORE_X0213, SCORE_X0213, SCORE_X0213,
+    SCORE_X0213, SCORE_X0213, SCORE_X0213, SCORE_X0213,
 };
 
 static void
@@ -2722,15 +3020,21 @@ static void
 code_score(struct input_code *ptr)
 {
     nkf_char c2 = ptr->buf[0];
-#ifdef UTF8_OUTPUT_ENABLE
     nkf_char c1 = ptr->buf[1];
-#endif
     if (c2 < 0){
 	set_code_score(ptr, SCORE_ERROR);
     }else if (c2 == SS2){
 	set_code_score(ptr, SCORE_KANA);
     }else if (c2 == 0x8f){
-	set_code_score(ptr, SCORE_X0212);
+	if ((c1 & 0x70) == 0x20){
+	    set_code_score(ptr, score_table_8FA0[c1 & 0x0f]);
+	}else if ((c1 & 0x70) == 0x60){
+	    set_code_score(ptr, score_table_8FE0[c1 & 0x0f]);
+	}else if ((c1 & 0x70) == 0x70){
+	    set_code_score(ptr, score_table_8FF0[c1 & 0x0f]);
+	}else{
+	    set_code_score(ptr, SCORE_X0212);
+	}
 #ifdef UTF8_OUTPUT_ENABLE
     }else if (!e2w_conv(c2, c1)){
 	set_code_score(ptr, SCORE_NO_EXIST);
@@ -3046,7 +3350,7 @@ std_getc(FILE *f)
 #endif /*WIN32DLL*/
 
 static nkf_char
-std_ungetc(nkf_char c, FILE *f)
+std_ungetc(nkf_char c, ARG_UNUSED FILE *f)
 {
     nkf_buf_push(nkf_state->std_gc_buf, c);
     return c;
@@ -3077,6 +3381,7 @@ h_conv(FILE *f, nkf_char c1, nkf_char c2)
 {
     int ret;
     int hold_index;
+    int fromhold_count;
     nkf_char c3, c4;
 
     /** it must NOT be in the kanji shifte sequence      */
@@ -3138,8 +3443,10 @@ h_conv(FILE *f, nkf_char c1, nkf_char c2)
 	    (*iconv)(JIS_X_0201_1976_K, c1, 0);
 	    continue;
 	}
+	fromhold_count = 1;
 	if (hold_index < hold_count){
 	    c2 = hold_buf[hold_index++];
+	    fromhold_count++;
 	}else{
 	    c2 = (*i_getc)(f);
 	    if (c2 == EOF){
@@ -3168,17 +3475,105 @@ h_conv(FILE *f, nkf_char c1, nkf_char c2)
 	    code_status(c4);
 	    (*iconv)(c1, c2, (c3<<8)|c4);
 	    break;
+	case -3:
+	    /* 4 bytes UTF-8 (check combining character) */
+	    if (hold_index < hold_count){
+		c3 = hold_buf[hold_index++];
+		fromhold_count++;
+	    } else if ((c3 = (*i_getc)(f)) == EOF) {
+		w_iconv_nocombine(c1, c2, 0);
+		break;
+	    }
+	    if (hold_index < hold_count){
+		c4 = hold_buf[hold_index++];
+		fromhold_count++;
+	    } else if ((c4 = (*i_getc)(f)) == EOF) {
+		w_iconv_nocombine(c1, c2, 0);
+		if (fromhold_count <= 2)
+		    (*i_ungetc)(c3,f);
+		else
+		    hold_index--;
+		continue;
+	    }
+	    if (w_iconv_combine(c1, c2, 0, c3, c4, 0)) {
+		w_iconv_nocombine(c1, c2, 0);
+		if (fromhold_count <= 2) {
+		    (*i_ungetc)(c4,f);
+		    (*i_ungetc)(c3,f);
+		} else if (fromhold_count == 3) {
+		    (*i_ungetc)(c4,f);
+		    hold_index--;
+		} else {
+		    hold_index -= 2;
+		}
+	    }
+	    break;
 	case -1:
 	    /* 3 bytes EUC or UTF-8 */
 	    if (hold_index < hold_count){
 		c3 = hold_buf[hold_index++];
+		fromhold_count++;
 	    } else if ((c3 = (*i_getc)(f)) == EOF) {
 		ret = EOF;
 		break;
 	    } else {
 		code_status(c3);
 	    }
-	    (*iconv)(c1, c2, c3);
+	    if ((*iconv)(c1, c2, c3) == -3) {
+		/* 6 bytes UTF-8 (check combining character) */
+		nkf_char c5, c6;
+		if (hold_index < hold_count){
+		    c4 = hold_buf[hold_index++];
+		    fromhold_count++;
+		} else if ((c4 = (*i_getc)(f)) == EOF) {
+		    w_iconv_nocombine(c1, c2, c3);
+		    continue;
+		}
+		if (hold_index < hold_count){
+		    c5 = hold_buf[hold_index++];
+		    fromhold_count++;
+		} else if ((c5 = (*i_getc)(f)) == EOF) {
+		    w_iconv_nocombine(c1, c2, c3);
+		    if (fromhold_count == 4)
+			hold_index--;
+		    else
+			(*i_ungetc)(c4,f);
+		    continue;
+		}
+		if (hold_index < hold_count){
+		    c6 = hold_buf[hold_index++];
+		    fromhold_count++;
+		} else if ((c6 = (*i_getc)(f)) == EOF) {
+		    w_iconv_nocombine(c1, c2, c3);
+		    if (fromhold_count == 5) {
+			hold_index -= 2;
+		    } else if (fromhold_count == 4) {
+			hold_index--;
+			(*i_ungetc)(c5,f);
+		    } else {
+			(*i_ungetc)(c5,f);
+			(*i_ungetc)(c4,f);
+		    }
+		    continue;
+		}
+		if (w_iconv_combine(c1, c2, c3, c4, c5, c6)) {
+		    w_iconv_nocombine(c1, c2, c3);
+		    if (fromhold_count == 6) {
+			hold_index -= 3;
+		    } else if (fromhold_count == 5) {
+			hold_index -= 2;
+			(*i_ungetc)(c6,f);
+		    } else if (fromhold_count == 4) {
+			hold_index--;
+			(*i_ungetc)(c6,f);
+			(*i_ungetc)(c5,f);
+		    } else {
+			(*i_ungetc)(c6,f);
+			(*i_ungetc)(c5,f);
+			(*i_ungetc)(c4,f);
+		    }
+		}
+	    }
 	    break;
 	}
 	if (c3 == EOF) break;
@@ -3193,6 +3588,7 @@ 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){
@@ -3202,6 +3598,7 @@ check_bom(FILE *f)
 			set_iconv(TRUE, w_iconv32);
 		    }
 		    if (iconv == w_iconv32) {
+			input_bom_f = TRUE;
 			input_endian = ENDIAN_BIG;
 			return;
 		    }
@@ -3232,6 +3629,7 @@ check_bom(FILE *f)
 		    set_iconv(TRUE, w_iconv);
 		}
 		if (iconv == w_iconv) {
+		    input_bom_f = TRUE;
 		    return;
 		}
 		(*i_ungetc)(0xBF,f);
@@ -3260,6 +3658,7 @@ check_bom(FILE *f)
 	    }
 	    if (iconv == w_iconv16) {
 		input_endian = ENDIAN_BIG;
+		input_bom_f = TRUE;
 		return;
 	    }
 	    (*i_ungetc)(0xFF,f);
@@ -3275,6 +3674,7 @@ check_bom(FILE *f)
 		    }
 		    if (iconv == w_iconv32) {
 			input_endian = ENDIAN_LITTLE;
+			input_bom_f = TRUE;
 			return;
 		    }
 		    (*i_ungetc)(0x00,f);
@@ -3286,6 +3686,7 @@ check_bom(FILE *f)
 	    }
 	    if (iconv == w_iconv16) {
 		input_endian = ENDIAN_LITTLE;
+		input_bom_f = TRUE;
 		return;
 	    }
 	    (*i_ungetc)(0xFE,f);
@@ -3338,7 +3739,7 @@ broken_getc(FILE *f)
 }
 
 static nkf_char
-broken_ungetc(nkf_char c, FILE *f)
+broken_ungetc(nkf_char c, ARG_UNUSED FILE *f)
 {
     if (nkf_buf_length(nkf_state->broken_buf) < 2)
 	nkf_buf_push(nkf_state->broken_buf, c);
@@ -3446,8 +3847,8 @@ fold_conv(nkf_char c2, nkf_char c1)
 	    f_prev = c1;
 	    f_line = 0;
 	    fold_state =  CR;
-	} else if ((f_prev == c1 && !fold_preserve_f)
-		   || (f_prev == LF && fold_preserve_f)
+	} else if ((f_prev == c1)
+		   || (f_prev == LF)
 		  ) {        /* duplicate newline */
 	    if (f_line) {
 		f_line = 0;
@@ -3494,7 +3895,7 @@ fold_conv(nkf_char c2, nkf_char c1)
 	f_prev = c1;
 	if (c2 || c2 == JIS_X_0201_1976_K)
 	    f_prev |= 0x80;  /* this is Japanese */
-	f_line += char_size(c2,c1);
+	f_line += c2 == JIS_X_0201_1976_K ? 1: char_size(c2,c1);
 	if (f_line<=fold_len) {   /* normal case */
 	    fold_state = 1;
 	} else {
@@ -3613,13 +4014,17 @@ z_conv(nkf_char c2, nkf_char c1)
 		    z_prev2 = 0;
 		    (*o_zconv)(ev[(z_prev1-SP)*2], ev[(z_prev1-SP)*2+1]);
 		    return;
+		} else if (x0213_f && c1 == (0xdf&0x7f) && ev_x0213[(z_prev1-SP)*2]) {  /* $BH>ByE@(B */
+		    z_prev2 = 0;
+		    (*o_zconv)(ev_x0213[(z_prev1-SP)*2], ev_x0213[(z_prev1-SP)*2+1]);
+		    return;
 		}
 	    }
 	    z_prev2 = 0;
 	    (*o_zconv)(cv[(z_prev1-SP)*2], cv[(z_prev1-SP)*2+1]);
 	}
 	if (c2 == JIS_X_0201_1976_K) {
-	    if (dv[(c1-SP)*2] || ev[(c1-SP)*2]) {
+	    if (dv[(c1-SP)*2] || ev[(c1-SP)*2] || (x0213_f && ev_x0213[(c1-SP)*2])) {
 		/* wait for $BByE@(B or $BH>ByE@(B */
 		z_prev1 = c1;
 		z_prev2 = c2;
@@ -3727,8 +4132,8 @@ z_conv(nkf_char c2, nkf_char c1)
 		0x4D00, 0x4D5E, 0x4D5F, 0x4E00, 0x4E5E, 0x4E5F, 0x4F00, 0x5000,
 		0x5100, 0x5200, 0x5300, 0x2C00, 0x5400, 0x2D00, 0x5500, 0x2E00,
 		0x5600, 0x5700, 0x5800, 0x5900, 0x5A00, 0x5B00, 0x0000, 0x5C00,
-		0x0000, 0x0000, 0x2600, 0x5D00, 0x335E, 0x0000, 0x0000, 0x0000,
-		0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+		0x0000, 0x0000, 0x2600, 0x5D00, 0x335E, 0x0000, 0x0000, 0x365F,
+		0x375F, 0x385F, 0x395F, 0x3A5F, 0x3E5F, 0x425F, 0x445F, 0x0000
 	    };
 	    if (fullwidth_to_halfwidth[c1-0x20]){
 		c2 = fullwidth_to_halfwidth[c1-0x20];
@@ -3738,6 +4143,10 @@ z_conv(nkf_char c2, nkf_char c1)
 		}
 		return;
 	    }
+	} else if (c2 == 0 && nkf_char_unicode_p(c1) &&
+	    ((c1&VALUE_MASK) == 0x3099 || (c1&VALUE_MASK) == 0x309A)) { /* $B9g@.MQByE@!&H>ByE@(B */
+	    (*o_zconv)(JIS_X_0201_1976_K, 0x5E + (c1&VALUE_MASK) - 0x3099);
+	    return;
 	}
     }
     (*o_zconv)(c2,c1);
@@ -3926,7 +4335,7 @@ mime_input_buf_unshift(nkf_char c)
 }
 
 static nkf_char
-mime_ungetc(nkf_char c, FILE *f)
+mime_ungetc(nkf_char c, ARG_UNUSED FILE *f)
 {
     mime_input_buf_unshift(c);
     return c;
@@ -3945,7 +4354,7 @@ mime_ungetc_buf(nkf_char c, FILE *f)
 static nkf_char
 mime_getc_buf(FILE *f)
 {
-    /* we don't keep eof of mime_input_buf, becase it contains ?= as
+    /* we don't keep eof of mime_input_buf, because it contains ?= as
        a terminator. It was checked in mime_integrity. */
     return ((mimebuf_f)?
 	    (*i_mgetc_buf)(f):mime_input_buf(mime_input_state.input++));
@@ -4071,7 +4480,7 @@ mime_begin_strict(FILE *f)
 static nkf_char
 mime_begin(FILE *f)
 {
-    nkf_char c1;
+    nkf_char c1 = 0;
     int i,k;
 
     /* In NONSTRICT mode, only =? is checked. In case of failure, we  */
@@ -4127,7 +4536,7 @@ mime_begin(FILE *f)
 
 #ifdef CHECK_OPTION
 static void
-no_putc(nkf_char c)
+no_putc(ARG_UNUSED nkf_char c)
 {
     ;
 }
@@ -4164,7 +4573,9 @@ get_guessed_code(void)
 	    if (p->score & (SCORE_DEPEND|SCORE_CP932))
 		input_codename = "CP932";
 	} else if (strcmp(input_codename, "EUC-JP") == 0) {
-	    if (p->score & (SCORE_X0212))
+	    if (p->score & SCORE_X0213)
+		input_codename = "EUC-JIS-2004";
+	    else if (p->score & (SCORE_X0212))
 		input_codename = "EUCJP-MS";
 	    else if (p->score & (SCORE_DEPEND|SCORE_CP932))
 		input_codename = "CP51932";
@@ -4190,8 +4601,13 @@ print_guessed_code(char *filename)
 	if (guess_f == 1) {
 	    printf("%s\n", input_codename);
 	} else {
-	    printf("%s%s\n",
+	    printf("%s%s%s%s\n",
 		   input_codename,
+		   iconv != w_iconv16 && iconv != w_iconv32 ? "" :
+		   input_endian == ENDIAN_LITTLE ? " LE" :
+		   input_endian == ENDIAN_BIG ? " BE" :
+		   "[BUG]",
+		   input_bom_f ? " (BOM)" : "",
 		   input_eol == CR   ? " (CR)" :
 		   input_eol == LF   ? " (LF)" :
 		   input_eol == CRLF ? " (CRLF)" :
@@ -5033,8 +5449,8 @@ mime_putc(nkf_char c)
 		mimeout_state.buf[mimeout_state.count++] = (char)c;
 		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
 		    eof_mime();
-		    for (i=0;i<mimeout_state.count;i++) {
-			(*o_mputc)(mimeout_state.buf[i]);
+		    for (j=0;j<mimeout_state.count;j++) {
+			(*o_mputc)(mimeout_state.buf[j]);
 			base64_count++;
 		    }
 		    mimeout_state.count = 0;
@@ -5088,7 +5504,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)
@@ -5307,13 +5723,13 @@ 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 continucation module, from output side */
+    /* replace continuation module, from output side */
 
-    /* output redicrection */
+    /* output redirection */
 #ifdef CHECK_OPTION
     if (noout_f || guess_f){
 	o_putc = no_putc;
@@ -5350,7 +5766,7 @@ module_connection(void)
 
     i_getc = std_getc;
     i_ungetc = std_ungetc;
-    /* input redicrection */
+    /* input redirection */
 #ifdef INPUT_OPTION
     if (cap_f){
 	i_cgetc = i_getc; i_getc = cap_getc;
@@ -5456,17 +5872,45 @@ kanji_convert(FILE *f)
 	       (c2 = (*i_getc)(f)) != EOF &&
 	       (c3 = (*i_getc)(f)) != EOF &&
 	       (c4 = (*i_getc)(f)) != EOF) {
-	    nkf_iconv_utf_32(c1, c2, c3, c4);
+	    nkf_char c5, c6, c7, c8;
+	    if (nkf_iconv_utf_32(c1, c2, c3, c4) == (size_t)NKF_ICONV_WAIT_COMBINING_CHAR) {
+		if ((c5 = (*i_getc)(f)) != EOF &&
+		    (c6 = (*i_getc)(f)) != EOF &&
+		    (c7 = (*i_getc)(f)) != EOF &&
+		    (c8 = (*i_getc)(f)) != EOF) {
+		    if (nkf_iconv_utf_32_combine(c1, c2, c3, c4, c5, c6, c7, c8)) {
+			(*i_ungetc)(c8, f);
+			(*i_ungetc)(c7, f);
+			(*i_ungetc)(c6, f);
+			(*i_ungetc)(c5, f);
+			nkf_iconv_utf_32_nocombine(c1, c2, c3, c4);
+		    }
+		} else {
+		    nkf_iconv_utf_32_nocombine(c1, c2, c3, c4);
+		}
+	    }
 	}
 	goto finished;
     }
     else if (iconv == w_iconv16) {
 	while ((c1 = (*i_getc)(f)) != EOF &&
 	       (c2 = (*i_getc)(f)) != EOF) {
-	    if (nkf_iconv_utf_16(c1, c2, 0, 0) == NKF_ICONV_NEED_TWO_MORE_BYTES &&
+	    size_t ret = nkf_iconv_utf_16(c1, c2, 0, 0);
+	    if (ret == NKF_ICONV_NEED_TWO_MORE_BYTES &&
 		(c3 = (*i_getc)(f)) != EOF &&
 		(c4 = (*i_getc)(f)) != EOF) {
 		nkf_iconv_utf_16(c1, c2, c3, c4);
+	    } else if (ret == (size_t)NKF_ICONV_WAIT_COMBINING_CHAR) {
+		if ((c3 = (*i_getc)(f)) != EOF &&
+		    (c4 = (*i_getc)(f)) != EOF) {
+		    if (nkf_iconv_utf_16_combine(c1, c2, c3, c4)) {
+			(*i_ungetc)(c4, f);
+			(*i_ungetc)(c3, f);
+			nkf_iconv_utf_16_nocombine(c1, c2);
+		    }
+		} else {
+		    nkf_iconv_utf_16_nocombine(c1, c2);
+		}
 	    }
 	}
 	goto finished;
@@ -5480,11 +5924,11 @@ kanji_convert(FILE *f)
 	    code_status(c1);
 	if (c2) {
 	    /* second byte */
-	    if (c2 > DEL) {
+	    if (c2 > ((input_encoding && nkf_enc_cp5022x_p(input_encoding)) ? 0x92 : DEL)) {
 		/* in case of 8th bit is on */
 		if (!estab_f&&!mime_decode_mode) {
 		    /* in case of not established yet */
-		    /* It is still ambiguious */
+		    /* It is still ambiguous */
 		    if (h_conv(f, c2, c1)==EOF) {
 			LAST;
 		    }
@@ -5672,6 +6116,7 @@ kanji_convert(FILE *f)
 		    else if (c1 == 'I') {
 			/* JIS X 0201 Katakana */
 			set_input_mode(JIS_X_0201_1976_K);
+			shift_mode = 1;
 			SKIP;
 		    }
 		    else if (c1 == 'B' || c1 == 'J' || c1 == 'H') {
@@ -5719,9 +6164,10 @@ kanji_convert(FILE *f)
 		    }
 		}
 		else {
+		    i_ungetc(c1,f);
 		    /* lonely ESC  */
 		    (*oconv)(0, ESC);
-		    SEND;
+		    SKIP;
 		}
 	    } else if (c1 == ESC && iconv == s_iconv) {
 		/* ESC in Shift_JIS */
@@ -5758,9 +6204,10 @@ kanji_convert(FILE *f)
 		    }
 		}
 		else {
+		    i_ungetc(c1,f);
 		    /* lonely ESC  */
 		    (*oconv)(0, ESC);
-		    SEND;
+		    SKIP;
 		}
 	    } else if (c1 == LF || c1 == CR) {
 		if (broken_f&4) {
@@ -5813,11 +6260,52 @@ kanji_convert(FILE *f)
 		    }
 		}
 		break;
+	    case -3:
+		/* 4 bytes UTF-8 (check combining character) */
+		if ((c3 = (*i_getc)(f)) != EOF) {
+		    if ((c4 = (*i_getc)(f)) != EOF) {
+			if (w_iconv_combine(c2, c1, 0, c3, c4, 0)) {
+			    (*i_ungetc)(c4, f);
+			    (*i_ungetc)(c3, f);
+			    w_iconv_nocombine(c2, c1, 0);
+			}
+		    } else {
+			(*i_ungetc)(c3, f);
+			w_iconv_nocombine(c2, c1, 0);
+		    }
+		} else {
+		    w_iconv_nocombine(c2, c1, 0);
+		}
+		break;
 	    case -1:
 		/* 3 bytes EUC or UTF-8 */
 		if ((c3 = (*i_getc)(f)) != EOF) {
 		    code_status(c3);
-		    (*iconv)(c2, c1, c3);
+		    if ((*iconv)(c2, c1, c3) == -3) {
+			/* 6 bytes UTF-8 (check combining character) */
+			nkf_char c5, c6;
+			if ((c4 = (*i_getc)(f)) != EOF) {
+			    if ((c5 = (*i_getc)(f)) != EOF) {
+				if ((c6 = (*i_getc)(f)) != EOF) {
+				    if (w_iconv_combine(c2, c1, c3, c4, c5, c6)) {
+					(*i_ungetc)(c6, f);
+					(*i_ungetc)(c5, f);
+					(*i_ungetc)(c4, f);
+					w_iconv_nocombine(c2, c1, c3);
+				    }
+				} else {
+				    (*i_ungetc)(c5, f);
+				    (*i_ungetc)(c4, f);
+				    w_iconv_nocombine(c2, c1, c3);
+				}
+			    } else {
+				(*i_ungetc)(c4, f);
+				w_iconv_nocombine(c2, c1, c3);
+			    }
+			} else {
+			    w_iconv_nocombine(c2, c1, c3);
+			}
+		    }
 		}
 		break;
 	    }
@@ -6424,7 +6912,7 @@ options(unsigned char *cp)
 	    continue;
 #endif
 	case SP:
-	    /* module muliple options in a string are allowed for Perl moudle  */
+	    /* module multiple options in a string are allowed for Perl module  */
 	    while(*cp && *cp++!='-');
 	    continue;
 	default:
diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h
index dd479a0f87..cd3037601b 100644
--- a/ext/nkf/nkf-utf8/nkf.h
+++ b/ext/nkf/nkf-utf8/nkf.h
@@ -2,10 +2,10 @@
  *
  * nkf.h - Header file for nkf
  *
- * $Id$
  */
 
 #ifndef NKF_H
+#define NKF_H
 
 /* Wrapper of configurations */
 
@@ -17,21 +17,9 @@
 #endif
 
 #if DEFAULT_NEWLINE == 0x0D0A
-#define PUT_NEWLINE(func) do {\
-    func(0x0D);\
-    func(0x0A);\
-} while (0)
-#define OCONV_NEWLINE(func) do {\
-    func(0, 0x0D);\
-    func(0, 0x0A);\
-} while (0)
 #elif DEFAULT_NEWLINE == 0x0D
-#define PUT_NEWLINE(func) func(0x0D)
-#define OCONV_NEWLINE(func) func(0, 0x0D)
 #else
 #define DEFAULT_NEWLINE 0x0A
-#define PUT_NEWLINE(func) func(0x0A)
-#define OCONV_NEWLINE(func) func(0, 0x0A)
 #endif
 #ifdef HELP_OUTPUT_STDERR
 #define HELP_OUTPUT stderr
@@ -94,7 +82,7 @@ void  setbinmode(FILE *fp)
 #define setbinmode(fp) setmode(fileno(fp), O_BINARY)
 #endif
 #else /* UNIX */
-#define setbinmode(fp)
+#define setbinmode(fp) (void)(fp)
 #endif
 
 #ifdef _IOFBF /* SysV and MSDOS, Windows */
@@ -164,6 +152,7 @@ void  setbinmode(FILE *fp)
 # ifndef HAVE_LOCALE_H
 #  define HAVE_LOCALE_H
 # endif
+#elif defined(__BIONIC__) /* bionic doesn't have locale */
 #else
 # ifndef HAVE_LANGINFO_H
 #  define HAVE_LANGINFO_H
@@ -185,6 +174,14 @@ void  setbinmode(FILE *fp)
 #define         FALSE   0
 #define         TRUE    1
 
+#ifndef ARG_UNUSED
+#if defined(__GNUC__)
+#  define ARG_UNUSED  __attribute__ ((unused))
+#else
+#  define ARG_UNUSED
+#endif
+#endif
+
 #ifdef WIN32DLL
 #include "nkf32.h"
 #endif
diff --git a/ext/nkf/nkf-utf8/utf8tbl.c b/ext/nkf/nkf-utf8/utf8tbl.c
index 10eec60c5d..a31e4e7805 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.c
+++ b/ext/nkf/nkf-utf8/utf8tbl.c
@@ -1,7 +1,6 @@
 /*
- * utf8tbl.c - Convertion Table for nkf
+ * utf8tbl.c - Conversion Table for nkf
  *
- * $Id$
  */
 
 #include "config.h"
@@ -68,6 +67,20 @@ static const unsigned short euc_to_utf8_A2_ms[] = {
       0,      0, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
  0x2021, 0x00B6,      0,      0,      0,      0, 0x25EF,
 };
+static const unsigned short euc_to_utf8_A2_x0213[] = {
+         0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
+ 0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013, 0xFF07,
+ 0xFF02, 0xFF0D, 0xFF5E, 0x3033, 0x3034, 0x3035, 0x303B, 0x303C,
+ 0x30FF, 0x309F, 0x2208, 0x220B, 0x2286, 0x2287, 0x2282, 0x2283,
+ 0x222A, 0x2229, 0x2284, 0x2285, 0x228A, 0x228B, 0x2209, 0x2205,
+ 0x2305, 0x2306, 0x2227, 0x2228, 0x00AC, 0x21D2, 0x21D4, 0x2200,
+ 0x2203, 0x2295, 0x2296, 0x2297, 0x2225, 0x2226, 0xFF5F, 0xFF60,
+ 0x3018, 0x3019, 0x3016, 0x3017, 0x2220, 0x22A5, 0x2312, 0x2202,
+ 0x2207, 0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D,
+ 0x2235, 0x222B, 0x222C, 0x2262, 0x2243, 0x2245, 0x2248, 0x2276,
+ 0x2277, 0x2194, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
+ 0x2021, 0x00B6, 0x266E, 0x266B, 0x266C, 0x2669, 0x25EF,
+};
 static const unsigned short euc_to_utf8_A3[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -82,6 +95,20 @@ static const unsigned short euc_to_utf8_A3[] = {
  0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57,
  0xFF58, 0xFF59, 0xFF5A,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_A3_x0213[] = {
+         0x25B7, 0x25B6, 0x25C1, 0x25C0, 0x2197, 0x2198, 0x2196,
+ 0x2199, 0x21C4, 0x21E8, 0x21E6, 0x21E7, 0x21E9, 0x2934, 0x2935,
+ 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17,
+ 0xFF18, 0xFF19, 0x29BF, 0x25C9, 0x303D, 0xFE46, 0xFE45, 0x25E6,
+ 0x2022, 0xFF21, 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27,
+ 0xFF28, 0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F,
+ 0xFF30, 0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37,
+ 0xFF38, 0xFF39, 0xFF3A, 0x2213, 0x2135, 0x210F, 0x33CB, 0x2113,
+ 0x2127, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47,
+ 0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F,
+ 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57,
+ 0xFF58, 0xFF59, 0xFF5A, 0x30A0, 0x2013, 0x29FA, 0x29FB,
+};
 static const unsigned short euc_to_utf8_A4[] = {
          0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047,
  0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F,
@@ -96,6 +123,20 @@ static const unsigned short euc_to_utf8_A4[] = {
  0x3090, 0x3091, 0x3092, 0x3093,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_A4_x0213[] = {
+         0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047,
+ 0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F,
+ 0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057,
+ 0x3058, 0x3059, 0x305A, 0x305B, 0x305C, 0x305D, 0x305E, 0x305F,
+ 0x3060, 0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067,
+ 0x3068, 0x3069, 0x306A, 0x306B, 0x306C, 0x306D, 0x306E, 0x306F,
+ 0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077,
+ 0x3078, 0x3079, 0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F,
+ 0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087,
+ 0x3088, 0x3089, 0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F,
+ 0x3090, 0x3091, 0x3092, 0x3093, 0x3094, 0x3095, 0x3096, /*0x304B*/ 0x309A,
+ /*0x304D*/ 0x309A, /*0x304F*/ 0x309A, /*0x3051*/ 0x309A, /*0x3053*/ 0x309A, 0, 0, 0,
+};
 static const unsigned short euc_to_utf8_A5[] = {
          0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7,
  0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF,
@@ -110,6 +151,20 @@ static const unsigned short euc_to_utf8_A5[] = {
  0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_A5_x0213[] = {
+         0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7,
+ 0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF,
+ 0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7,
+ 0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC, 0x30BD, 0x30BE, 0x30BF,
+ 0x30C0, 0x30C1, 0x30C2, 0x30C3, 0x30C4, 0x30C5, 0x30C6, 0x30C7,
+ 0x30C8, 0x30C9, 0x30CA, 0x30CB, 0x30CC, 0x30CD, 0x30CE, 0x30CF,
+ 0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7,
+ 0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF,
+ 0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 0x30E7,
+ 0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 0x30EE, 0x30EF,
+ 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6, /*0x30AB*/ 0x309A,
+ /*0x30AD*/ 0x309A, /*0x30AF*/ 0x309A, /*0x30B1*/ 0x309A, /*0x30B3*/ 0x309A, /*0x30BB*/ 0x309A, /*0x30C4*/ 0x309A, /*0x30C8*/ 0x309A,
+};
 static const unsigned short euc_to_utf8_A6[] = {
          0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
  0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
@@ -124,6 +179,20 @@ static const unsigned short euc_to_utf8_A6[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_A6_x0213[] = {
+         0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
+ 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+ 0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8,
+ 0x03A9, 0x2664, 0x2660, 0x2662, 0x2666, 0x2661, 0x2665, 0x2667,
+ 0x2663, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
+ 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+ 0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8,
+ 0x03C9, 0x03C2, 0x24F5, 0x24F6, 0x24F7, 0x24F8, 0x24F9, 0x24FA,
+ 0x24FB, 0x24FC, 0x24FD, 0x24FE, 0x2616, 0x2617, 0x3020, 0x260E,
+ 0x2600, 0x2601, 0x2602, 0x2603, 0x2668, 0x25B1, 0x31F0, 0x31F1,
+ 0x31F2, 0x31F3, 0x31F4, 0x31F5, 0x31F6, 0x31F7, 0x31F8, 0x31F9,
+ /*0x31F7*/ 0x309A, 0x31FA, 0x31FB, 0x31FC, 0x31FD, 0x31FE, 0x31FF,
+};
 static const unsigned short euc_to_utf8_A7[] = {
          0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401,
  0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D,
@@ -138,6 +207,20 @@ static const unsigned short euc_to_utf8_A7[] = {
  0x044E, 0x044F,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_A7_x0213[] = {
+         0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401,
+ 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D,
+ 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425,
+ 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D,
+ 0x042E, 0x042F, 0x23BE, 0x23BF, 0x23C0, 0x23C1, 0x23C2, 0x23C3,
+ 0x23C4, 0x23C5, 0x23C6, 0x23C7, 0x23C8, 0x23C9, 0x23CA, 0x23CB,
+ 0x23CC, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451,
+ 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D,
+ 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445,
+ 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D,
+ 0x044E, 0x044F, 0x30F7, 0x30F8, 0x30F9, 0x30FA, 0x22DA, 0x22DB,
+ 0x2153, 0x2154, 0x2155, 0x2713, 0x2318, 0x2423, 0x23CE,
+};
 static const unsigned short euc_to_utf8_A8[] = {
          0x2500, 0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C,
  0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513,
@@ -152,6 +235,20 @@ static const unsigned short euc_to_utf8_A8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_A8_x0213[] = {
+         0x2500, 0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C,
+ 0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513,
+ 0x251B, 0x2517, 0x2523, 0x2533, 0x252B, 0x253B, 0x254B, 0x2520,
+ 0x252F, 0x2528, 0x2537, 0x253F, 0x251D, 0x2530, 0x2525, 0x2538,
+ 0x2542, 0x3251, 0x3252, 0x3253, 0x3254, 0x3255, 0x3256, 0x3257,
+ 0x3258, 0x3259, 0x325A, 0x325B, 0x325C, 0x325D, 0x325E, 0x325F,
+ 0x32B1, 0x32B2, 0x32B3, 0x32B4, 0x32B5, 0x32B6, 0x32B7, 0x32B8,
+ 0x32B9, 0x32BA, 0x32BB, 0x32BC, 0x32BD, 0x32BE, 0x32BF,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x25D0,
+ 0x25D1, 0x25D2, 0x25D3, 0x203C, 0x2047, 0x2048, 0x2049, 0x01CD,
+ 0x01CE, 0x01D0, 0x1E3E, 0x1E3F, 0x01F8, 0x01F9, 0x01D1, 0x01D2,
+ 0x01D4, 0x01D6, 0x01D8, 0x01DA, 0x01DC,      0,      0,
+};
 static const unsigned short euc_to_utf8_A9[] = {
          0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
  0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
@@ -166,6 +263,20 @@ static const unsigned short euc_to_utf8_A9[] = {
       0,      0, 0x2488, 0x2489, 0x248A, 0x248B, 0x248C, 0x248D,
  0x248E, 0x248F, 0x2490,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_A9_x0213[] = {
+         0x20AC, 0x00A0, 0x00A1, 0x00A4, 0x00A6, 0x00A9, 0x00AA,
+ 0x00AB, 0x00AD, 0x00AE, 0x00AF, 0x00B2, 0x00B3, 0x00B7, 0x00B8,
+ 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 0x00C0,
+ 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8,
+ 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x00D0,
+ 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D8, 0x00D9,
+ 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, 0x00E0, 0x00E1,
+ 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9,
+ 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F0, 0x00F1,
+ 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F8, 0x00F9, 0x00FA,
+ 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF, 0x0100, 0x012A, 0x016A,
+ 0x0112, 0x014C, 0x0101, 0x012B, 0x016B, 0x0113, 0x014D,
+};
 static const unsigned short euc_to_utf8_AA[] = {
          0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166,
  0x2167, 0x2168, 0x2169, 0x216A, 0x216B,      0,      0,      0,
@@ -180,6 +291,20 @@ static const unsigned short euc_to_utf8_AA[] = {
  0x24AF, 0x24B0, 0x24B1, 0x24B2, 0x24B3, 0x24B4, 0x24B5,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_AA_x0213[] = {
+         0x0104, 0x02D8, 0x0141, 0x013D, 0x015A, 0x0160, 0x015E,
+ 0x0164, 0x0179, 0x017D, 0x017B, 0x0105, 0x02DB, 0x0142, 0x013E,
+ 0x015B, 0x02C7, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E,
+ 0x017C, 0x0154, 0x0102, 0x0139, 0x0106, 0x010C, 0x0118, 0x011A,
+ 0x010E, 0x0143, 0x0147, 0x0150, 0x0158, 0x016E, 0x0170, 0x0162,
+ 0x0155, 0x0103, 0x013A, 0x0107, 0x010D, 0x0119, 0x011B, 0x010F,
+ 0x0111, 0x0144, 0x0148, 0x0151, 0x0159, 0x016F, 0x0171, 0x0163,
+ 0x02D9, 0x0108, 0x011C, 0x0124, 0x0134, 0x015C, 0x016C, 0x0109,
+ 0x011D, 0x0125, 0x0135, 0x015D, 0x016D, 0x0271, 0x028B, 0x027E,
+ 0x0283, 0x0292, 0x026C, 0x026E, 0x0279, 0x0288, 0x0256, 0x0273,
+ 0x027D, 0x0282, 0x0290, 0x027B, 0x026D, 0x025F, 0x0272, 0x029D,
+ 0x028E, 0x0261, 0x014B, 0x0270, 0x0281, 0x0127, 0x0295,
+};
 static const unsigned short euc_to_utf8_AB[] = {
          0x339C, 0x339F, 0x339D, 0x33A0, 0x33A4,      0, 0x33A1,
  0x33A5, 0x339E, 0x33A2, 0x338E,      0, 0x338F, 0x33C4, 0x3396,
@@ -194,6 +319,20 @@ static const unsigned short euc_to_utf8_AB[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0x2116, 0x33CD, 0x2121,      0,
 };
+static const unsigned short euc_to_utf8_AB_x0213[] = {
+         0x0294, 0x0266, 0x0298, 0x01C2, 0x0253, 0x0257, 0x0284,
+ 0x0260, 0x0193, 0x0153, 0x0152, 0x0268, 0x0289, 0x0258, 0x0275,
+ 0x0259, 0x025C, 0x025E, 0x0250, 0x026F, 0x028A, 0x0264, 0x028C,
+ 0x0254, 0x0251, 0x0252, 0x028D, 0x0265, 0x02A2, 0x02A1, 0x0255,
+ 0x0291, 0x027A, 0x0267, 0x025A, /*0x00E6*/ 0x0300, 0x01FD, 0x1F70, 0x1F71,
+ /*0x0254*/ 0x0300, /*0x0254*/ 0x0301, /*0x028C*/ 0x0300, /*0x028C*/ 0x0301, /*0x0259*/ 0x0300, /*0x0259*/ 0x0301, /*0x025A*/ 0x0300, /*0x025A*/ 0x0301,
+ 0x1F72, 0x1F73, 0x0361, 0x02C8, 0x02CC, 0x02D0, 0x02D1, 0x0306,
+ 0x203F, 0x030B, /*0*/ 0x0301, 0x0304, /*0*/ 0x0300, 0x030F, 0x030C, 0x0302,
+ /*0*/ 0x02E5, 0x02E6, 0x02E7, 0x02E8, /*0*/ 0x02E9, /*0x02E9*/ 0x02E5, /*0x02E5*/ 0x02E9, 0x0325,
+ 0x032C, 0x0339, 0x031C, 0x031F, 0x0320, 0x0308, 0x033D, 0x0329,
+ 0x032F, 0x02DE, 0x0324, 0x0330, 0x033C, 0x0334, 0x031D, 0x031E,
+ 0x0318, 0x0319, 0x032A, 0x033A, 0x033B, 0x0303, 0x031A,
+};
 static const unsigned short euc_to_utf8_AC[] = {
          0x2664, 0x2667, 0x2661, 0x2662, 0x2660, 0x2663, 0x2665,
  0x2666,      0,      0,      0,      0,      0,      0,      0,
@@ -222,6 +361,20 @@ static const unsigned short euc_to_utf8_AC_mac[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_AC_x0213[] = {
+         0x2776, 0x2777, 0x2778, 0x2779, 0x277A, 0x277B, 0x277C,
+ 0x277D, 0x277E, 0x277F, 0x24EB, 0x24EC, 0x24ED, 0x24EE, 0x24EF,
+ 0x24F0, 0x24F1, 0x24F2, 0x24F3, 0x24F4, 0x2170, 0x2171, 0x2172,
+ 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217A,
+ 0x217B, 0x24D0, 0x24D1, 0x24D2, 0x24D3, 0x24D4, 0x24D5, 0x24D6,
+ 0x24D7, 0x24D8, 0x24D9, 0x24DA, 0x24DB, 0x24DC, 0x24DD, 0x24DE,
+ 0x24DF, 0x24E0, 0x24E1, 0x24E2, 0x24E3, 0x24E4, 0x24E5, 0x24E6,
+ 0x24E7, 0x24E8, 0x24E9, 0x32D0, 0x32D1, 0x32D2, 0x32D3, 0x32D4,
+ 0x32D5, 0x32D6, 0x32D7, 0x32D8, 0x32D9, 0x32DA, 0x32DB, 0x32DC,
+ 0x32DD, 0x32DE, 0x32DF, 0x32E0, 0x32E1, 0x32E2, 0x32E3, 0x32FA,
+ 0x32E9, 0x32E5, 0x32ED, 0x32EC,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x2051, 0x2042,
+};
 static const unsigned short euc_to_utf8_AD[] = {
          0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
  0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
@@ -250,6 +403,20 @@ static const unsigned short euc_to_utf8_AD_mac[] = {
  0x2252, 0x5927, 0x5C0F, 0x32A4, 0x32A5, 0x32A6, 0x32A7, 0x32A8,
  0x533B, 0x8CA1, 0x512A, 0x52B4, 0x5370, 0x63A7, 0x79D8,
 };
+static const unsigned short euc_to_utf8_AD_x0213[] = {
+         0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
+ 0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
+ 0x246F, 0x2470, 0x2471, 0x2472, 0x2473, 0x2160, 0x2161, 0x2162,
+ 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, 0x216A,
+ 0x3349, 0x3314, 0x3322, 0x334D, 0x3318, 0x3327, 0x3303, 0x3336,
+ 0x3351, 0x3357, 0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B,
+ 0x339C, 0x339D, 0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1, 0x216B,
+      0,      0,      0,      0,      0,      0,      0, 0x337B,
+ 0x301D, 0x301F, 0x2116, 0x33CD, 0x2121, 0x32A4, 0x32A5, 0x32A6,
+ 0x32A7, 0x32A8, 0x3231, 0x3232, 0x3239, 0x337E, 0x337D, 0x337C,
+ 0x2252, 0x2261, 0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, 0x2220,
+ 0x221F, 0x22BF, 0x2235, 0x2229, 0x222A, 0x2756, 0x261E,
+};
 static const unsigned short euc_to_utf8_AE[] = {
          0x3349, 0x3322, 0x334D, 0x3314, 0x3316, 0x3305, 0x3333,
  0x334E, 0x3303, 0x3336, 0x3318, 0x3315, 0x3327, 0x3351, 0x334A,
@@ -264,6 +431,20 @@ static const unsigned short euc_to_utf8_AE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0x337F,      0,      0,
 };
+static const unsigned short euc_to_utf8_AE_x0213[] = {
+         0x4FF1, 0xD840 /*0xDC0B*/, 0x3402, 0x4E28, 0x4E2F, 0x4E30, 0x4E8D,
+ 0x4EE1, 0x4EFD, 0x4EFF, 0x4F03, 0x4F0B, 0x4F60, 0x4F48, 0x4F49,
+ 0x4F56, 0x4F5F, 0x4F6A, 0x4F6C, 0x4F7E, 0x4F8A, 0x4F94, 0x4F97,
+ 0xFA30, 0x4FC9, 0x4FE0, 0x5001, 0x5002, 0x500E, 0x5018, 0x5027,
+ 0x502E, 0x5040, 0x503B, 0x5041, 0x5094, 0x50CC, 0x50F2, 0x50D0,
+ 0x50E6, 0xFA31, 0x5106, 0x5103, 0x510B, 0x511E, 0x5135, 0x514A,
+ 0xFA32, 0x5155, 0x5157, 0x34B5, 0x519D, 0x51C3, 0x51CA, 0x51DE,
+ 0x51E2, 0x51EE, 0x5201, 0x34DB, 0x5213, 0x5215, 0x5249, 0x5257,
+ 0x5261, 0x5293, 0x52C8, 0xFA33, 0x52CC, 0x52D0, 0x52D6, 0x52DB,
+ 0xFA34, 0x52F0, 0x52FB, 0x5300, 0x5307, 0x531C, 0xFA35, 0x5361,
+ 0x5363, 0x537D, 0x5393, 0x539D, 0x53B2, 0x5412, 0x5427, 0x544D,
+ 0x549C, 0x546B, 0x5474, 0x547F, 0x5488, 0x5496, 0x54A1,
+};
 static const unsigned short euc_to_utf8_AF[] = {
          0x222E, 0x221F, 0x22BF,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -278,6 +459,20 @@ static const unsigned short euc_to_utf8_AF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_AF_x0213[] = {
+         0x54A9, 0x54C6, 0x54FF, 0x550E, 0x552B, 0x5535, 0x5550,
+ 0x555E, 0x5581, 0x5586, 0x558E, 0xFA36, 0x55AD, 0x55CE, 0xFA37,
+ 0x5608, 0x560E, 0x563B, 0x5649, 0x5676, 0x5666, 0xFA38, 0x566F,
+ 0x5671, 0x5672, 0x5699, 0x569E, 0x56A9, 0x56AC, 0x56B3, 0x56C9,
+ 0x56CA, 0x570A, 0xD844 /*0xDE3D*/, 0x5721, 0x572F, 0x5733, 0x5734, 0x5770,
+ 0x5777, 0x577C, 0x579C, 0xFA0F, 0xD844 /*0xDF1B*/, 0x57B8, 0x57C7, 0x57C8,
+ 0x57CF, 0x57E4, 0x57ED, 0x57F5, 0x57F6, 0x57FF, 0x5809, 0xFA10,
+ 0x5861, 0x5864, 0xFA39, 0x587C, 0x5889, 0x589E, 0xFA3A, 0x58A9,
+ 0xD845 /*0xDC6E*/, 0x58D2, 0x58CE, 0x58D4, 0x58DA, 0x58E0, 0x58E9, 0x590C,
+ 0x8641, 0x595D, 0x596D, 0x598B, 0x5992, 0x59A4, 0x59C3, 0x59D2,
+ 0x59DD, 0x5A13, 0x5A23, 0x5A67, 0x5A6D, 0x5A77, 0x5A7E, 0x5A84,
+ 0x5A9E, 0x5AA7, 0x5AC4, 0xD846 /*0xDCBD*/, 0x5B19, 0x5B25, 0x525D,
+};
 static const unsigned short euc_to_utf8_B0[] = {
          0x4E9C, 0x5516, 0x5A03, 0x963F, 0x54C0, 0x611B, 0x6328,
  0x59F6, 0x9022, 0x8475, 0x831C, 0x7A50, 0x60AA, 0x63E1, 0x6E25,
@@ -726,6 +921,20 @@ static const unsigned short euc_to_utf8_CF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_CF_x0213[] = {
+         0x84EE, 0x9023, 0x932C, 0x5442, 0x9B6F, 0x6AD3, 0x7089,
+ 0x8CC2, 0x8DEF, 0x9732, 0x52B4, 0x5A41, 0x5ECA, 0x5F04, 0x6717,
+ 0x697C, 0x6994, 0x6D6A, 0x6F0F, 0x7262, 0x72FC, 0x7BED, 0x8001,
+ 0x807E, 0x874B, 0x90CE, 0x516D, 0x9E93, 0x7984, 0x808B, 0x9332,
+ 0x8AD6, 0x502D, 0x548C, 0x8A71, 0x6B6A, 0x8CC4, 0x8107, 0x60D1,
+ 0x67A0, 0x9DF2, 0x4E99, 0x4E98, 0x9C10, 0x8A6B, 0x85C1, 0x8568,
+ 0x6900, 0x6E7E, 0x7897, 0x8155, 0xD842 /*0xDF9F*/, 0x5B41, 0x5B56, 0x5B7D,
+ 0x5B93, 0x5BD8, 0x5BEC, 0x5C12, 0x5C1E, 0x5C23, 0x5C2B, 0x378D,
+ 0x5C62, 0xFA3B, 0xFA3C, 0xD845 /*0xDEB4*/, 0x5C7A, 0x5C8F, 0x5C9F, 0x5CA3,
+ 0x5CAA, 0x5CBA, 0x5CCB, 0x5CD0, 0x5CD2, 0x5CF4, 0xD847 /*0xDE34*/, 0x37E2,
+ 0x5D0D, 0x5D27, 0xFA11, 0x5D46, 0x5D47, 0x5D53, 0x5D4A, 0x5D6D,
+ 0x5D81, 0x5DA0, 0x5DA4, 0x5DA7, 0x5DB8, 0x5DCB, 0x541E,
+};
 static const unsigned short euc_to_utf8_D0[] = {
          0x5F0C, 0x4E10, 0x4E15, 0x4E2A, 0x4E31, 0x4E36, 0x4E3C,
  0x4E3F, 0x4E42, 0x4E56, 0x4E58, 0x4E82, 0x4E85, 0x8C6B, 0x4E8A,
@@ -1244,6 +1453,20 @@ static const unsigned short euc_to_utf8_F4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_F4_x0213[] = {
+         0x582F, 0x69C7, 0x9059, 0x7464, 0x51DC, 0x7199, 0x5653,
+ 0x5DE2, 0x5E14, 0x5E18, 0x5E58, 0x5E5E, 0x5EBE, 0xF928, 0x5ECB,
+ 0x5EF9, 0x5F00, 0x5F02, 0x5F07, 0x5F1D, 0x5F23, 0x5F34, 0x5F36,
+ 0x5F3D, 0x5F40, 0x5F45, 0x5F54, 0x5F58, 0x5F64, 0x5F67, 0x5F7D,
+ 0x5F89, 0x5F9C, 0x5FA7, 0x5FAF, 0x5FB5, 0x5FB7, 0x5FC9, 0x5FDE,
+ 0x5FE1, 0x5FE9, 0x600D, 0x6014, 0x6018, 0x6033, 0x6035, 0x6047,
+ 0xFA3D, 0x609D, 0x609E, 0x60CB, 0x60D4, 0x60D5, 0x60DD, 0x60F8,
+ 0x611C, 0x612B, 0x6130, 0x6137, 0xFA3E, 0x618D, 0xFA3F, 0x61BC,
+ 0x61B9, 0xFA40, 0x6222, 0x623E, 0x6243, 0x6256, 0x625A, 0x626F,
+ 0x6285, 0x62C4, 0x62D6, 0x62FC, 0x630A, 0x6318, 0x6339, 0x6343,
+ 0x6365, 0x637C, 0x63E5, 0x63ED, 0x63F5, 0x6410, 0x6414, 0x6422,
+ 0x6479, 0x6451, 0x6460, 0x646D, 0x64CE, 0x64BE, 0x64BF,
+};
 static const unsigned short euc_to_utf8_F5[] = {
               0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -1258,6 +1481,62 @@ static const unsigned short euc_to_utf8_F5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short euc_to_utf8_F5_x0213[] = {
+         0x64C4, 0x64CA, 0x64D0, 0x64F7, 0x64FB, 0x6522, 0x6529,
+ 0xFA41, 0x6567, 0x659D, 0xFA42, 0x6600, 0x6609, 0x6615, 0x661E,
+ 0x663A, 0x6622, 0x6624, 0x662B, 0x6630, 0x6631, 0x6633, 0x66FB,
+ 0x6648, 0x664C, 0xD84C /*0xDDC4*/, 0x6659, 0x665A, 0x6661, 0x6665, 0x6673,
+ 0x6677, 0x6678, 0x668D, 0xFA43, 0x66A0, 0x66B2, 0x66BB, 0x66C6,
+ 0x66C8, 0x3B22, 0x66DB, 0x66E8, 0x66FA, 0x6713, 0xF929, 0x6733,
+ 0x6766, 0x6747, 0x6748, 0x677B, 0x6781, 0x6793, 0x6798, 0x679B,
+ 0x67BB, 0x67F9, 0x67C0, 0x67D7, 0x67FC, 0x6801, 0x6852, 0x681D,
+ 0x682C, 0x6831, 0x685B, 0x6872, 0x6875, 0xFA44, 0x68A3, 0x68A5,
+ 0x68B2, 0x68C8, 0x68D0, 0x68E8, 0x68ED, 0x68F0, 0x68F1, 0x68FC,
+ 0x690A, 0x6949, 0xD84D /*0xDDC4*/, 0x6935, 0x6942, 0x6957, 0x6963, 0x6964,
+ 0x6968, 0x6980, 0xFA14, 0x69A5, 0x69AD, 0x69CF, 0x3BB6,
+};
+static const unsigned short euc_to_utf8_F6_x0213[] = {
+         0x3BC3, 0x69E2, 0x69E9, 0x69EA, 0x69F5, 0x69F6, 0x6A0F,
+ 0x6A15, 0xD84D /*0xDF3F*/, 0x6A3B, 0x6A3E, 0x6A45, 0x6A50, 0x6A56, 0x6A5B,
+ 0x6A6B, 0x6A73, 0xD84D /*0xDF63*/, 0x6A89, 0x6A94, 0x6A9D, 0x6A9E, 0x6AA5,
+ 0x6AE4, 0x6AE7, 0x3C0F, 0xF91D, 0x6B1B, 0x6B1E, 0x6B2C, 0x6B35,
+ 0x6B46, 0x6B56, 0x6B60, 0x6B65, 0x6B67, 0x6B77, 0x6B82, 0x6BA9,
+ 0x6BAD, 0xF970, 0x6BCF, 0x6BD6, 0x6BD7, 0x6BFF, 0x6C05, 0x6C10,
+ 0x6C33, 0x6C59, 0x6C5C, 0x6CAA, 0x6C74, 0x6C76, 0x6C85, 0x6C86,
+ 0x6C98, 0x6C9C, 0x6CFB, 0x6CC6, 0x6CD4, 0x6CE0, 0x6CEB, 0x6CEE,
+ 0xD84F /*0xDCFE*/, 0x6D04, 0x6D0E, 0x6D2E, 0x6D31, 0x6D39, 0x6D3F, 0x6D58,
+ 0x6D65, 0xFA45, 0x6D82, 0x6D87, 0x6D89, 0x6D94, 0x6DAA, 0x6DAC,
+ 0x6DBF, 0x6DC4, 0x6DD6, 0x6DDA, 0x6DDB, 0x6DDD, 0x6DFC, 0xFA46,
+ 0x6E34, 0x6E44, 0x6E5C, 0x6E5E, 0x6EAB, 0x6EB1, 0x6EC1,
+};
+static const unsigned short euc_to_utf8_F7_x0213[] = {
+         0x6EC7, 0x6ECE, 0x6F10, 0x6F1A, 0xFA47, 0x6F2A, 0x6F2F,
+ 0x6F33, 0x6F51, 0x6F59, 0x6F5E, 0x6F61, 0x6F62, 0x6F7E, 0x6F88,
+ 0x6F8C, 0x6F8D, 0x6F94, 0x6FA0, 0x6FA7, 0x6FB6, 0x6FBC, 0x6FC7,
+ 0x6FCA, 0x6FF9, 0x6FF0, 0x6FF5, 0x7005, 0x7006, 0x7028, 0x704A,
+ 0x705D, 0x705E, 0x704E, 0x7064, 0x7075, 0x7085, 0x70A4, 0x70AB,
+ 0x70B7, 0x70D4, 0x70D8, 0x70E4, 0x710F, 0x712B, 0x711E, 0x7120,
+ 0x712E, 0x7130, 0x7146, 0x7147, 0x7151, 0xFA48, 0x7152, 0x715C,
+ 0x7160, 0x7168, 0xFA15, 0x7185, 0x7187, 0x7192, 0x71C1, 0x71BA,
+ 0x71C4, 0x71FE, 0x7200, 0x7215, 0x7255, 0x7256, 0x3E3F, 0x728D,
+ 0x729B, 0x72BE, 0x72C0, 0x72FB, 0xD851 /*0xDFF1*/, 0x7327, 0x7328, 0xFA16,
+ 0x7350, 0x7366, 0x737C, 0x7395, 0x739F, 0x73A0, 0x73A2, 0x73A6,
+ 0x73AB, 0x73C9, 0x73CF, 0x73D6, 0x73D9, 0x73E3, 0x73E9,
+};
+static const unsigned short euc_to_utf8_F8_x0213[] = {
+         0x7407, 0x740A, 0x741A, 0x741B, 0xFA4A, 0x7426, 0x7428,
+ 0x742A, 0x742B, 0x742C, 0x742E, 0x742F, 0x7430, 0x7444, 0x7446,
+ 0x7447, 0x744B, 0x7457, 0x7462, 0x746B, 0x746D, 0x7486, 0x7487,
+ 0x7489, 0x7498, 0x749C, 0x749F, 0x74A3, 0x7490, 0x74A6, 0x74A8,
+ 0x74A9, 0x74B5, 0x74BF, 0x74C8, 0x74C9, 0x74DA, 0x74FF, 0x7501,
+ 0x7517, 0x752F, 0x756F, 0x7579, 0x7592, 0x3F72, 0x75CE, 0x75E4,
+ 0x7600, 0x7602, 0x7608, 0x7615, 0x7616, 0x7619, 0x761E, 0x762D,
+ 0x7635, 0x7643, 0x764B, 0x7664, 0x7665, 0x766D, 0x766F, 0x7671,
+ 0x7681, 0x769B, 0x769D, 0x769E, 0x76A6, 0x76AA, 0x76B6, 0x76C5,
+ 0x76CC, 0x76CE, 0x76D4, 0x76E6, 0x76F1, 0x76FC, 0x770A, 0x7719,
+ 0x7734, 0x7736, 0x7746, 0x774D, 0x774E, 0x775C, 0x775F, 0x7762,
+ 0x777A, 0x7780, 0x7794, 0x77AA, 0x77E0, 0x782D, 0xD855 /*0xDC8E*/,
+};
 static const unsigned short euc_to_utf8_F9[] = {
          0x7E8A, 0x891C, 0x9348, 0x9288, 0x84DC, 0x4FC9, 0x70BB,
  0x6631, 0x68C8, 0x92F9, 0x66FB, 0x5F45, 0x4E28, 0x4EE1, 0x4EFC,
@@ -1272,6 +1551,20 @@ static const unsigned short euc_to_utf8_F9[] = {
  0x5CA6, 0x5CBA, 0x5CF5, 0x5D27, 0x5D53, 0xFA11, 0x5D42, 0x5D6D,
  0x5DB8, 0x5DB9, 0x5DD0, 0x5F21, 0x5F34, 0x5F67, 0x5FB7,
 };
+static const unsigned short euc_to_utf8_F9_x0213[] = {
+         0x7843, 0x784E, 0x784F, 0x7851, 0x7868, 0x786E, 0xFA4B,
+ 0x78B0, 0xD855 /*0xDD0E*/, 0x78AD, 0x78E4, 0x78F2, 0x7900, 0x78F7, 0x791C,
+ 0x792E, 0x7931, 0x7934, 0xFA4C, 0xFA4D, 0x7945, 0x7946, 0xFA4E,
+ 0xFA4F, 0xFA50, 0x795C, 0xFA51, 0xFA19, 0xFA1A, 0x7979, 0xFA52,
+ 0xFA53, 0xFA1B, 0x7998, 0x79B1, 0x79B8, 0x79C8, 0x79CA, 0xD855 /*0xDF71*/,
+ 0x79D4, 0x79DE, 0x79EB, 0x79ED, 0x7A03, 0xFA54, 0x7A39, 0x7A5D,
+ 0x7A6D, 0xFA55, 0x7A85, 0x7AA0, 0xD856 /*0xDDC4*/, 0x7AB3, 0x7ABB, 0x7ACE,
+ 0x7AEB, 0x7AFD, 0x7B12, 0x7B2D, 0x7B3B, 0x7B47, 0x7B4E, 0x7B60,
+ 0x7B6D, 0x7B6F, 0x7B72, 0x7B9E, 0xFA56, 0x7BD7, 0x7BD9, 0x7C01,
+ 0x7C31, 0x7C1E, 0x7C20, 0x7C33, 0x7C36, 0x4264, 0xD857 /*0xDDA1*/, 0x7C59,
+ 0x7C6D, 0x7C79, 0x7C8F, 0x7C94, 0x7CA0, 0x7CBC, 0x7CD5, 0x7CD9,
+ 0x7CDD, 0x7D07, 0x7D08, 0x7D13, 0x7D1D, 0x7D23, 0x7D31,
+};
 static const unsigned short euc_to_utf8_FA[] = {
          0x5FDE, 0x605D, 0x6085, 0x608A, 0x60DE, 0x60D5, 0x6120,
  0x60F2, 0x6111, 0x6137, 0x6130, 0x6198, 0x6213, 0x62A6, 0x63F5,
@@ -1286,6 +1579,20 @@ static const unsigned short euc_to_utf8_FA[] = {
  0x6FF5, 0x7005, 0x7007, 0x7028, 0x7085, 0x70AB, 0x710F, 0x7104,
  0x715C, 0x7146, 0x7147, 0xFA15, 0x71C1, 0x71FE, 0x72B1,
 };
+static const unsigned short euc_to_utf8_FA_x0213[] = {
+         0x7D41, 0x7D48, 0x7D53, 0x7D5C, 0x7D7A, 0x7D83, 0x7D8B,
+ 0x7DA0, 0x7DA6, 0x7DC2, 0x7DCC, 0x7DD6, 0x7DE3, 0xFA57, 0x7E28,
+ 0x7E08, 0x7E11, 0x7E15, 0xFA59, 0x7E47, 0x7E52, 0x7E61, 0x7E8A,
+ 0x7E8D, 0x7F47, 0xFA5A, 0x7F91, 0x7F97, 0x7FBF, 0x7FCE, 0x7FDB,
+ 0x7FDF, 0x7FEC, 0x7FEE, 0x7FFA, 0xFA5B, 0x8014, 0x8026, 0x8035,
+ 0x8037, 0x803C, 0x80CA, 0x80D7, 0x80E0, 0x80F3, 0x8118, 0x814A,
+ 0x8160, 0x8167, 0x8168, 0x816D, 0x81BB, 0x81CA, 0x81CF, 0x81D7,
+ 0xFA5C, 0x4453, 0x445B, 0x8260, 0x8274, 0xD85A /*0xDEFF*/, 0x828E, 0x82A1,
+ 0x82A3, 0x82A4, 0x82A9, 0x82AE, 0x82B7, 0x82BE, 0x82BF, 0x82C6,
+ 0x82D5, 0x82FD, 0x82FE, 0x8300, 0x8301, 0x8362, 0x8322, 0x832D,
+ 0x833A, 0x8343, 0x8347, 0x8351, 0x8355, 0x837D, 0x8386, 0x8392,
+ 0x8398, 0x83A7, 0x83A9, 0x83BF, 0x83C0, 0x83C7, 0x83CF,
+};
 static const unsigned short euc_to_utf8_FB[] = {
          0x72BE, 0x7324, 0xFA16, 0x7377, 0x73BD, 0x73C9, 0x73D6,
  0x73E3, 0x73D2, 0x7407, 0x73F5, 0x7426, 0x742A, 0x7429, 0x742E,
@@ -1300,6 +1607,20 @@ static const unsigned short euc_to_utf8_FB[] = {
  0x8B7F, 0x8CF0, 0x8CF4, 0x8D12, 0x8D76, 0xFA23, 0x8ECF, 0xFA24,
  0xFA25, 0x9067, 0x90DE, 0xFA26, 0x9115, 0x9127, 0x91DA,
 };
+static const unsigned short euc_to_utf8_FB_x0213[] = {
+         0x83D1, 0x83E1, 0x83EA, 0x8401, 0x8406, 0x840A, 0xFA5F,
+ 0x8448, 0x845F, 0x8470, 0x8473, 0x8485, 0x849E, 0x84AF, 0x84B4,
+ 0x84BA, 0x84C0, 0x84C2, 0xD85B /*0xDE40*/, 0x8532, 0x851E, 0x8523, 0x852F,
+ 0x8559, 0x8564, 0xFA1F, 0x85AD, 0x857A, 0x858C, 0x858F, 0x85A2,
+ 0x85B0, 0x85CB, 0x85CE, 0x85ED, 0x8612, 0x85FF, 0x8604, 0x8605,
+ 0x8610, 0xD85C /*0xDCF4*/, 0x8618, 0x8629, 0x8638, 0x8657, 0x865B, 0xF936,
+ 0x8662, 0x459D, 0x866C, 0x8675, 0x8698, 0x86B8, 0x86FA, 0x86FC,
+ 0x86FD, 0x870B, 0x8771, 0x8787, 0x8788, 0x87AC, 0x87AD, 0x87B5,
+ 0x45EA, 0x87D6, 0x87EC, 0x8806, 0x880A, 0x8810, 0x8814, 0x881F,
+ 0x8898, 0x88AA, 0x88CA, 0x88CE, 0xD85D /*0xDE84*/, 0x88F5, 0x891C, 0xFA60,
+ 0x8918, 0x8919, 0x891A, 0x8927, 0x8930, 0x8932, 0x8939, 0x8940,
+ 0x8994, 0xFA61, 0x89D4, 0x89E5, 0x89F6, 0x8A12, 0x8A15,
+};
 static const unsigned short euc_to_utf8_FC[] = {
          0x91D7, 0x91DE, 0x91ED, 0x91EE, 0x91E4, 0x91E5, 0x9206,
  0x9210, 0x920A, 0x923A, 0x9240, 0x923C, 0x924E, 0x9259, 0x9251,
@@ -1330,6 +1651,413 @@ static const unsigned short euc_to_utf8_FC_ms[] = {
       0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176,
  0x2177, 0x2178, 0x2179, 0xFFE2, 0xFFE4, 0xFF07, 0xFF02,
 };
+static const unsigned short euc_to_utf8_FC_x0213[] = {
+         0x8A22, 0x8A37, 0x8A47, 0x8A4E, 0x8A5D, 0x8A61, 0x8A75,
+ 0x8A79, 0x8AA7, 0x8AD0, 0x8ADF, 0x8AF4, 0x8AF6, 0xFA22, 0xFA62,
+ 0xFA63, 0x8B46, 0x8B54, 0x8B59, 0x8B69, 0x8B9D, 0x8C49, 0x8C68,
+ 0xFA64, 0x8CE1, 0x8CF4, 0x8CF8, 0x8CFE, 0xFA65, 0x8D12, 0x8D1B,
+ 0x8DAF, 0x8DCE, 0x8DD1, 0x8DD7, 0x8E20, 0x8E23, 0x8E3D, 0x8E70,
+ 0x8E7B, 0xD860 /*0xDE77*/, 0x8EC0, 0x4844, 0x8EFA, 0x8F1E, 0x8F2D, 0x8F36,
+ 0x8F54, 0xD860 /*0xDFCD*/, 0x8FA6, 0x8FB5, 0x8FE4, 0x8FE8, 0x8FEE, 0x9008,
+ 0x902D, 0xFA67, 0x9088, 0x9095, 0x9097, 0x9099, 0x909B, 0x90A2,
+ 0x90B3, 0x90BE, 0x90C4, 0x90C5, 0x90C7, 0x90D7, 0x90DD, 0x90DE,
+ 0x90EF, 0x90F4, 0xFA26, 0x9114, 0x9115, 0x9116, 0x9122, 0x9123,
+ 0x9127, 0x912F, 0x9131, 0x9134, 0x913D, 0x9148, 0x915B, 0x9183,
+ 0x919E, 0x91AC, 0x91B1, 0x91BC, 0x91D7, 0x91FB, 0x91E4,
+};
+static const unsigned short euc_to_utf8_FD_x0213[] = {
+         0x91E5, 0x91ED, 0x91F1, 0x9207, 0x9210, 0x9238, 0x9239,
+ 0x923A, 0x923C, 0x9240, 0x9243, 0x924F, 0x9278, 0x9288, 0x92C2,
+ 0x92CB, 0x92CC, 0x92D3, 0x92E0, 0x92FF, 0x9304, 0x931F, 0x9321,
+ 0x9325, 0x9348, 0x9349, 0x934A, 0x9364, 0x9365, 0x936A, 0x9370,
+ 0x939B, 0x93A3, 0x93BA, 0x93C6, 0x93DE, 0x93DF, 0x9404, 0x93FD,
+ 0x9433, 0x944A, 0x9463, 0x946B, 0x9471, 0x9472, 0x958E, 0x959F,
+ 0x95A6, 0x95A9, 0x95AC, 0x95B6, 0x95BD, 0x95CB, 0x95D0, 0x95D3,
+ 0x49B0, 0x95DA, 0x95DE, 0x9658, 0x9684, 0xF9DC, 0x969D, 0x96A4,
+ 0x96A5, 0x96D2, 0x96DE, 0xFA68, 0x96E9, 0x96EF, 0x9733, 0x973B,
+ 0x974D, 0x974E, 0x974F, 0x975A, 0x976E, 0x9773, 0x9795, 0x97AE,
+ 0x97BA, 0x97C1, 0x97C9, 0x97DE, 0x97DB, 0x97F4, 0xFA69, 0x980A,
+ 0x981E, 0x982B, 0x9830, 0xFA6A, 0x9852, 0x9853, 0x9856,
+};
+static const unsigned short euc_to_utf8_FE_x0213[] = {
+         0x9857, 0x9859, 0x985A, 0xF9D0, 0x9865, 0x986C, 0x98BA,
+ 0x98C8, 0x98E7, 0x9958, 0x999E, 0x9A02, 0x9A03, 0x9A24, 0x9A2D,
+ 0x9A2E, 0x9A38, 0x9A4A, 0x9A4E, 0x9A52, 0x9AB6, 0x9AC1, 0x9AC3,
+ 0x9ACE, 0x9AD6, 0x9AF9, 0x9B02, 0x9B08, 0x9B20, 0x4C17, 0x9B2D,
+ 0x9B5E, 0x9B79, 0x9B66, 0x9B72, 0x9B75, 0x9B84, 0x9B8A, 0x9B8F,
+ 0x9B9E, 0x9BA7, 0x9BC1, 0x9BCE, 0x9BE5, 0x9BF8, 0x9BFD, 0x9C00,
+ 0x9C23, 0x9C41, 0x9C4F, 0x9C50, 0x9C53, 0x9C63, 0x9C65, 0x9C77,
+ 0x9D1D, 0x9D1E, 0x9D43, 0x9D47, 0x9D52, 0x9D63, 0x9D70, 0x9D7C,
+ 0x9D8A, 0x9D96, 0x9DC0, 0x9DAC, 0x9DBC, 0x9DD7, 0xD868 /*0xDD90*/, 0x9DE7,
+ 0x9E07, 0x9E15, 0x9E7C, 0x9E9E, 0x9EA4, 0x9EAC, 0x9EAF, 0x9EB4,
+ 0x9EB5, 0x9EC3, 0x9ED1, 0x9F10, 0x9F39, 0x9F57, 0x9F90, 0x9F94,
+ 0x9F97, 0x9FA2, 0x59F8, 0x5C5B, 0x5E77, 0x7626, 0x7E6B,
+};
+
+static const unsigned short euc_to_utf8_8FA1_x0213[] = {
+         0xD840 /*0xDC89*/, 0x4E02, 0x4E0F, 0x4E12, 0x4E29, 0x4E2B, 0x4E2E,
+ 0x4E40, 0x4E47, 0x4E48, 0xD840 /*0xDCA2*/, 0x4E51, 0x3406, 0xD840 /*0xDCA4*/, 0x4E5A,
+ 0x4E69, 0x4E9D, 0x342C, 0x342E, 0x4EB9, 0x4EBB, 0xD840 /*0xDDA2*/, 0x4EBC,
+ 0x4EC3, 0x4EC8, 0x4ED0, 0x4EEB, 0x4EDA, 0x4EF1, 0x4EF5, 0x4F00,
+ 0x4F16, 0x4F64, 0x4F37, 0x4F3E, 0x4F54, 0x4F58, 0xD840 /*0xDE13*/, 0x4F77,
+ 0x4F78, 0x4F7A, 0x4F7D, 0x4F82, 0x4F85, 0x4F92, 0x4F9A, 0x4FE6,
+ 0x4FB2, 0x4FBE, 0x4FC5, 0x4FCB, 0x4FCF, 0x4FD2, 0x346A, 0x4FF2,
+ 0x5000, 0x5010, 0x5013, 0x501C, 0x501E, 0x5022, 0x3468, 0x5042,
+ 0x5046, 0x504E, 0x5053, 0x5057, 0x5063, 0x5066, 0x506A, 0x5070,
+ 0x50A3, 0x5088, 0x5092, 0x5093, 0x5095, 0x5096, 0x509C, 0x50AA,
+ 0xD840 /*0xDF2B*/, 0x50B1, 0x50BA, 0x50BB, 0x50C4, 0x50C7, 0x50F3, 0xD840 /*0xDF81*/,
+ 0x50CE, 0xD840 /*0xDF71*/, 0x50D4, 0x50D9, 0x50E1, 0x50E9, 0x3492,
+};
+static const unsigned short euc_to_utf8_8FA3_x0213[] = {
+         0x5108, 0xD840 /*0xDFF9*/, 0x5117, 0x511B, 0xD841 /*0xDC4A*/, 0x5160, 0xD841 /*0xDD09*/,
+ 0x5173, 0x5183, 0x518B, 0x34BC, 0x5198, 0x51A3, 0x51AD, 0x34C7,
+ 0x51BC, 0xD841 /*0xDDD6*/, 0xD841 /*0xDE28*/, 0x51F3, 0x51F4, 0x5202, 0x5212, 0x5216,
+ 0xD841 /*0xDF4F*/, 0x5255, 0x525C, 0x526C, 0x5277, 0x5284, 0x5282, 0xD842 /*0xDC07*/,
+ 0x5298, 0xD842 /*0xDC3A*/, 0x52A4, 0x52A6, 0x52AF, 0x52BA, 0x52BB, 0x52CA,
+ 0x351F, 0x52D1, 0xD842 /*0xDCB9*/, 0x52F7, 0x530A, 0x530B, 0x5324, 0x5335,
+ 0x533E, 0x5342, 0xD842 /*0xDD7C*/, 0xD842 /*0xDD9D*/, 0x5367, 0x536C, 0x537A, 0x53A4,
+ 0x53B4, 0xD842 /*0xDED3*/, 0x53B7, 0x53C0, 0xD842 /*0xDF1D*/, 0x355D, 0x355E, 0x53D5,
+ 0x53DA, 0x3563, 0x53F4, 0x53F5, 0x5455, 0x5424, 0x5428, 0x356E,
+ 0x5443, 0x5462, 0x5466, 0x546C, 0x548A, 0x548D, 0x5495, 0x54A0,
+ 0x54A6, 0x54AD, 0x54AE, 0x54B7, 0x54BA, 0x54BF, 0x54C3, 0xD843 /*0xDD45*/,
+ 0x54EC, 0x54EF, 0x54F1, 0x54F3, 0x5500, 0x5501, 0x5509,
+};
+static const unsigned short euc_to_utf8_8FA4_x0213[] = {
+         0x553C, 0x5541, 0x35A6, 0x5547, 0x554A, 0x35A8, 0x5560,
+ 0x5561, 0x5564, 0xD843 /*0xDDE1*/, 0x557D, 0x5582, 0x5588, 0x5591, 0x35C5,
+ 0x55D2, 0xD843 /*0xDE95*/, 0xD843 /*0xDE6D*/, 0x55BF, 0x55C9, 0x55CC, 0x55D1, 0x55DD,
+ 0x35DA, 0x55E2, 0xD843 /*0xDE64*/, 0x55E9, 0x5628, 0xD843 /*0xDF5F*/, 0x5607, 0x5610,
+ 0x5630, 0x5637, 0x35F4, 0x563D, 0x563F, 0x5640, 0x5647, 0x565E,
+ 0x5660, 0x566D, 0x3605, 0x5688, 0x568C, 0x5695, 0x569A, 0x569D,
+ 0x56A8, 0x56AD, 0x56B2, 0x56C5, 0x56CD, 0x56DF, 0x56E8, 0x56F6,
+ 0x56F7, 0xD844 /*0xDE01*/, 0x5715, 0x5723, 0xD844 /*0xDE55*/, 0x5729, 0xD844 /*0xDE7B*/, 0x5745,
+ 0x5746, 0x574C, 0x574D, 0xD844 /*0xDE74*/, 0x5768, 0x576F, 0x5773, 0x5774,
+ 0x5775, 0x577B, 0xD844 /*0xDEE4*/, 0xD844 /*0xDED7*/, 0x57AC, 0x579A, 0x579D, 0x579E,
+ 0x57A8, 0x57D7, 0xD844 /*0xDEFD*/, 0x57CC, 0xD844 /*0xDF36*/, 0xD844 /*0xDF44*/, 0x57DE, 0x57E6,
+ 0x57F0, 0x364A, 0x57F8, 0x57FB, 0x57FD, 0x5804, 0x581E,
+};
+static const unsigned short euc_to_utf8_8FA5_x0213[] = {
+         0x5820, 0x5827, 0x5832, 0x5839, 0xD844 /*0xDFC4*/, 0x5849, 0x584C,
+ 0x5867, 0x588A, 0x588B, 0x588D, 0x588F, 0x5890, 0x5894, 0x589D,
+ 0x58AA, 0x58B1, 0xD845 /*0xDC6D*/, 0x58C3, 0x58CD, 0x58E2, 0x58F3, 0x58F4,
+ 0x5905, 0x5906, 0x590B, 0x590D, 0x5914, 0x5924, 0xD845 /*0xDDD7*/, 0x3691,
+ 0x593D, 0x3699, 0x5946, 0x3696, 0xD85B /*0xDC29*/, 0x595B, 0x595F, 0xD845 /*0xDE47*/,
+ 0x5975, 0x5976, 0x597C, 0x599F, 0x59AE, 0x59BC, 0x59C8, 0x59CD,
+ 0x59DE, 0x59E3, 0x59E4, 0x59E7, 0x59EE, 0xD845 /*0xDF06*/, 0xD845 /*0xDF42*/, 0x36CF,
+ 0x5A0C, 0x5A0D, 0x5A17, 0x5A27, 0x5A2D, 0x5A55, 0x5A65, 0x5A7A,
+ 0x5A8B, 0x5A9C, 0x5A9F, 0x5AA0, 0x5AA2, 0x5AB1, 0x5AB3, 0x5AB5,
+ 0x5ABA, 0x5ABF, 0x5ADA, 0x5ADC, 0x5AE0, 0x5AE5, 0x5AF0, 0x5AEE,
+ 0x5AF5, 0x5B00, 0x5B08, 0x5B17, 0x5B34, 0x5B2D, 0x5B4C, 0x5B52,
+ 0x5B68, 0x5B6F, 0x5B7C, 0x5B7F, 0x5B81, 0x5B84, 0xD846 /*0xDDC3*/,
+};
+static const unsigned short euc_to_utf8_8FA8_x0213[] = {
+         0x5B96, 0x5BAC, 0x3761, 0x5BC0, 0x3762, 0x5BCE, 0x5BD6,
+ 0x376C, 0x376B, 0x5BF1, 0x5BFD, 0x3775, 0x5C03, 0x5C29, 0x5C30,
+ 0xD847 /*0xDC56*/, 0x5C5F, 0x5C63, 0x5C67, 0x5C68, 0x5C69, 0x5C70, 0xD847 /*0xDD2D*/,
+ 0xD847 /*0xDD45*/, 0x5C7C, 0xD847 /*0xDD78*/, 0xD847 /*0xDD62*/, 0x5C88, 0x5C8A, 0x37C1, 0xD847 /*0xDDA1*/,
+ 0xD847 /*0xDD9C*/, 0x5CA0, 0x5CA2, 0x5CA6, 0x5CA7, 0xD847 /*0xDD92*/, 0x5CAD, 0x5CB5,
+ 0xD847 /*0xDDB7*/, 0x5CC9, 0xD847 /*0xDDE0*/, 0xD847 /*0xDE33*/, 0x5D06, 0x5D10, 0x5D2B, 0x5D1D,
+ 0x5D20, 0x5D24, 0x5D26, 0x5D31, 0x5D39, 0x5D42, 0x37E8, 0x5D61,
+ 0x5D6A, 0x37F4, 0x5D70, 0xD847 /*0xDF1E*/, 0x37FD, 0x5D88, 0x3800, 0x5D92,
+ 0x5D94, 0x5D97, 0x5D99, 0x5DB0, 0x5DB2, 0x5DB4, 0xD847 /*0xDF76*/, 0x5DB9,
+ 0x5DD1, 0x5DD7, 0x5DD8, 0x5DE0, 0xD847 /*0xDFFA*/, 0x5DE4, 0x5DE9, 0x382F,
+ 0x5E00, 0x3836, 0x5E12, 0x5E15, 0x3840, 0x5E1F, 0x5E2E, 0x5E3E,
+ 0x5E49, 0x385C, 0x5E56, 0x3861, 0x5E6B, 0x5E6C, 0x5E6D,
+};
+static const unsigned short euc_to_utf8_8FAC_x0213[] = {
+         0x5E6E, 0xD848 /*0xDD7B*/, 0x5EA5, 0x5EAA, 0x5EAC, 0x5EB9, 0x5EBF,
+ 0x5EC6, 0x5ED2, 0x5ED9, 0xD848 /*0xDF1E*/, 0x5EFD, 0x5F08, 0x5F0E, 0x5F1C,
+ 0xD848 /*0xDFAD*/, 0x5F1E, 0x5F47, 0x5F63, 0x5F72, 0x5F7E, 0x5F8F, 0x5FA2,
+ 0x5FA4, 0x5FB8, 0x5FC4, 0x38FA, 0x5FC7, 0x5FCB, 0x5FD2, 0x5FD3,
+ 0x5FD4, 0x5FE2, 0x5FEE, 0x5FEF, 0x5FF3, 0x5FFC, 0x3917, 0x6017,
+ 0x6022, 0x6024, 0x391A, 0x604C, 0x607F, 0x608A, 0x6095, 0x60A8,
+ 0xD849 /*0xDEF3*/, 0x60B0, 0x60B1, 0x60BE, 0x60C8, 0x60D9, 0x60DB, 0x60EE,
+ 0x60F2, 0x60F5, 0x6110, 0x6112, 0x6113, 0x6119, 0x611E, 0x613A,
+ 0x396F, 0x6141, 0x6146, 0x6160, 0x617C, 0xD84A /*0xDC5B*/, 0x6192, 0x6193,
+ 0x6197, 0x6198, 0x61A5, 0x61A8, 0x61AD, 0xD84A /*0xDCAB*/, 0x61D5, 0x61DD,
+ 0x61DF, 0x61F5, 0xD84A /*0xDD8F*/, 0x6215, 0x6223, 0x6229, 0x6246, 0x624C,
+ 0x6251, 0x6252, 0x6261, 0x6264, 0x627B, 0x626D, 0x6273,
+};
+static const unsigned short euc_to_utf8_8FAD_x0213[] = {
+         0x6299, 0x62A6, 0x62D5, 0xD84A /*0xDEB8*/, 0x62FD, 0x6303, 0x630D,
+ 0x6310, 0xD84A /*0xDF4F*/, 0xD84A /*0xDF50*/, 0x6332, 0x6335, 0x633B, 0x633C, 0x6341,
+ 0x6344, 0x634E, 0xD84A /*0xDF46*/, 0x6359, 0xD84B /*0xDC1D*/, 0xD84A /*0xDFA6*/, 0x636C, 0x6384,
+ 0x6399, 0xD84B /*0xDC24*/, 0x6394, 0x63BD, 0x63F7, 0x63D4, 0x63D5, 0x63DC,
+ 0x63E0, 0x63EB, 0x63EC, 0x63F2, 0x6409, 0x641E, 0x6425, 0x6429,
+ 0x642F, 0x645A, 0x645B, 0x645D, 0x6473, 0x647D, 0x6487, 0x6491,
+ 0x649D, 0x649F, 0x64CB, 0x64CC, 0x64D5, 0x64D7, 0xD84B /*0xDDE1*/, 0x64E4,
+ 0x64E5, 0x64FF, 0x6504, 0x3A6E, 0x650F, 0x6514, 0x6516, 0x3A73,
+ 0x651E, 0x6532, 0x6544, 0x6554, 0x656B, 0x657A, 0x6581, 0x6584,
+ 0x6585, 0x658A, 0x65B2, 0x65B5, 0x65B8, 0x65BF, 0x65C2, 0x65C9,
+ 0x65D4, 0x3AD6, 0x65F2, 0x65F9, 0x65FC, 0x6604, 0x6608, 0x6621,
+ 0x662A, 0x6645, 0x6651, 0x664E, 0x3AEA, 0xD84C /*0xDDC3*/, 0x6657,
+};
+static const unsigned short euc_to_utf8_8FAE_x0213[] = {
+         0x665B, 0x6663, 0xD84C /*0xDDF5*/, 0xD84C /*0xDDB6*/, 0x666A, 0x666B, 0x666C,
+ 0x666D, 0x667B, 0x6680, 0x6690, 0x6692, 0x6699, 0x3B0E, 0x66AD,
+ 0x66B1, 0x66B5, 0x3B1A, 0x66BF, 0x3B1C, 0x66EC, 0x3AD7, 0x6701,
+ 0x6705, 0x6712, 0xD84C /*0xDF72*/, 0x6719, 0xD84C /*0xDFD3*/, 0xD84C /*0xDFD2*/, 0x674C, 0x674D,
+ 0x6754, 0x675D, 0xD84C /*0xDFD0*/, 0xD84C /*0xDFE4*/, 0xD84C /*0xDFD5*/, 0x6774, 0x6776, 0xD84C /*0xDFDA*/,
+ 0x6792, 0xD84C /*0xDFDF*/, 0x8363, 0x6810, 0x67B0, 0x67B2, 0x67C3, 0x67C8,
+ 0x67D2, 0x67D9, 0x67DB, 0x67F0, 0x67F7, 0xD84D /*0xDC4A*/, 0xD84D /*0xDC51*/, 0xD84D /*0xDC4B*/,
+ 0x6818, 0x681F, 0x682D, 0xD84D /*0xDC65*/, 0x6833, 0x683B, 0x683E, 0x6844,
+ 0x6845, 0x6849, 0x684C, 0x6855, 0x6857, 0x3B77, 0x686B, 0x686E,
+ 0x687A, 0x687C, 0x6882, 0x6890, 0x6896, 0x3B6D, 0x6898, 0x6899,
+ 0x689A, 0x689C, 0x68AA, 0x68AB, 0x68B4, 0x68BB, 0x68FB, 0xD84D /*0xDCE4*/,
+ 0xD84D /*0xDD5A*/, 0xFA13, 0x68C3, 0x68C5, 0x68CC, 0x68CF, 0x68D6,
+};
+static const unsigned short euc_to_utf8_8FAF_x0213[] = {
+         0x68D9, 0x68E4, 0x68E5, 0x68EC, 0x68F7, 0x6903, 0x6907,
+ 0x3B87, 0x3B88, 0xD84D /*0xDD94*/, 0x693B, 0x3B8D, 0x6946, 0x6969, 0x696C,
+ 0x6972, 0x697A, 0x697F, 0x6992, 0x3BA4, 0x6996, 0x6998, 0x69A6,
+ 0x69B0, 0x69B7, 0x69BA, 0x69BC, 0x69C0, 0x69D1, 0x69D6, 0xD84D /*0xDE39*/,
+ 0xD84D /*0xDE47*/, 0x6A30, 0xD84D /*0xDE38*/, 0xD84D /*0xDE3A*/, 0x69E3, 0x69EE, 0x69EF, 0x69F3,
+ 0x3BCD, 0x69F4, 0x69FE, 0x6A11, 0x6A1A, 0x6A1D, 0xD84D /*0xDF1C*/, 0x6A32,
+ 0x6A33, 0x6A34, 0x6A3F, 0x6A46, 0x6A49, 0x6A7A, 0x6A4E, 0x6A52,
+ 0x6A64, 0xD84D /*0xDF0C*/, 0x6A7E, 0x6A83, 0x6A8B, 0x3BF0, 0x6A91, 0x6A9F,
+ 0x6AA1, 0xD84D /*0xDF64*/, 0x6AAB, 0x6ABD, 0x6AC6, 0x6AD4, 0x6AD0, 0x6ADC,
+ 0x6ADD, 0xD84D /*0xDFFF*/, 0xD84D /*0xDFE7*/, 0x6AEC, 0x6AF1, 0x6AF2, 0x6AF3, 0x6AFD,
+ 0xD84E /*0xDC24*/, 0x6B0B, 0x6B0F, 0x6B10, 0x6B11, 0xD84E /*0xDC3D*/, 0x6B17, 0x3C26,
+ 0x6B2F, 0x6B4A, 0x6B58, 0x6B6C, 0x6B75, 0x6B7A, 0x6B81,
+};
+static const unsigned short euc_to_utf8_8FEE_x0213[] = {
+         0x6B9B, 0x6BAE, 0xD84E /*0xDE98*/, 0x6BBD, 0x6BBE, 0x6BC7, 0x6BC8,
+ 0x6BC9, 0x6BDA, 0x6BE6, 0x6BE7, 0x6BEE, 0x6BF1, 0x6C02, 0x6C0A,
+ 0x6C0E, 0x6C35, 0x6C36, 0x6C3A, 0xD84F /*0xDC7F*/, 0x6C3F, 0x6C4D, 0x6C5B,
+ 0x6C6D, 0x6C84, 0x6C89, 0x3CC3, 0x6C94, 0x6C95, 0x6C97, 0x6CAD,
+ 0x6CC2, 0x6CD0, 0x3CD2, 0x6CD6, 0x6CDA, 0x6CDC, 0x6CE9, 0x6CEC,
+ 0x6CED, 0xD84F /*0xDD00*/, 0x6D00, 0x6D0A, 0x6D24, 0x6D26, 0x6D27, 0x6C67,
+ 0x6D2F, 0x6D3C, 0x6D5B, 0x6D5E, 0x6D60, 0x6D70, 0x6D80, 0x6D81,
+ 0x6D8A, 0x6D8D, 0x6D91, 0x6D98, 0xD84F /*0xDD40*/, 0x6E17, 0xD84F /*0xDDFA*/, 0xD84F /*0xDDF9*/,
+ 0xD84F /*0xDDD3*/, 0x6DAB, 0x6DAE, 0x6DB4, 0x6DC2, 0x6D34, 0x6DC8, 0x6DCE,
+ 0x6DCF, 0x6DD0, 0x6DDF, 0x6DE9, 0x6DF6, 0x6E36, 0x6E1E, 0x6E22,
+ 0x6E27, 0x3D11, 0x6E32, 0x6E3C, 0x6E48, 0x6E49, 0x6E4B, 0x6E4C,
+ 0x6E4F, 0x6E51, 0x6E53, 0x6E54, 0x6E57, 0x6E63, 0x3D1E,
+};
+static const unsigned short euc_to_utf8_8FEF_x0213[] = {
+         0x6E93, 0x6EA7, 0x6EB4, 0x6EBF, 0x6EC3, 0x6ECA, 0x6ED9,
+ 0x6F35, 0x6EEB, 0x6EF9, 0x6EFB, 0x6F0A, 0x6F0C, 0x6F18, 0x6F25,
+ 0x6F36, 0x6F3C, 0xD84F /*0xDF7E*/, 0x6F52, 0x6F57, 0x6F5A, 0x6F60, 0x6F68,
+ 0x6F98, 0x6F7D, 0x6F90, 0x6F96, 0x6FBE, 0x6F9F, 0x6FA5, 0x6FAF,
+ 0x3D64, 0x6FB5, 0x6FC8, 0x6FC9, 0x6FDA, 0x6FDE, 0x6FE9, 0xD850 /*0xDC96*/,
+ 0x6FFC, 0x7000, 0x7007, 0x700A, 0x7023, 0xD850 /*0xDD03*/, 0x7039, 0x703A,
+ 0x703C, 0x7043, 0x7047, 0x704B, 0x3D9A, 0x7054, 0x7065, 0x7069,
+ 0x706C, 0x706E, 0x7076, 0x707E, 0x7081, 0x7086, 0x7095, 0x7097,
+ 0x70BB, 0xD850 /*0xDDC6*/, 0x709F, 0x70B1, 0xD850 /*0xDDFE*/, 0x70EC, 0x70CA, 0x70D1,
+ 0x70D3, 0x70DC, 0x7103, 0x7104, 0x7106, 0x7107, 0x7108, 0x710C,
+ 0x3DC0, 0x712F, 0x7131, 0x7150, 0x714A, 0x7153, 0x715E, 0x3DD4,
+ 0x7196, 0x7180, 0x719B, 0x71A0, 0x71A2, 0x71AE, 0x71AF,
+};
+static const unsigned short euc_to_utf8_8FF0_x0213[] = {
+         0x71B3, 0xD850 /*0xDFBC*/, 0x71CB, 0x71D3, 0x71D9, 0x71DC, 0x7207,
+ 0x3E05, 0xFA49, 0x722B, 0x7234, 0x7238, 0x7239, 0x4E2C, 0x7242,
+ 0x7253, 0x7257, 0x7263, 0xD851 /*0xDE29*/, 0x726E, 0x726F, 0x7278, 0x727F,
+ 0x728E, 0xD851 /*0xDEA5*/, 0x72AD, 0x72AE, 0x72B0, 0x72B1, 0x72C1, 0x3E60,
+ 0x72CC, 0x3E66, 0x3E68, 0x72F3, 0x72FA, 0x7307, 0x7312, 0x7318,
+ 0x7319, 0x3E83, 0x7339, 0x732C, 0x7331, 0x7333, 0x733D, 0x7352,
+ 0x3E94, 0x736B, 0x736C, 0xD852 /*0xDC96*/, 0x736E, 0x736F, 0x7371, 0x7377,
+ 0x7381, 0x7385, 0x738A, 0x7394, 0x7398, 0x739C, 0x739E, 0x73A5,
+ 0x73A8, 0x73B5, 0x73B7, 0x73B9, 0x73BC, 0x73BF, 0x73C5, 0x73CB,
+ 0x73E1, 0x73E7, 0x73F9, 0x7413, 0x73FA, 0x7401, 0x7424, 0x7431,
+ 0x7439, 0x7453, 0x7440, 0x7443, 0x744D, 0x7452, 0x745D, 0x7471,
+ 0x7481, 0x7485, 0x7488, 0xD852 /*0xDE4D*/, 0x7492, 0x7497, 0x7499,
+};
+static const unsigned short euc_to_utf8_8FF1_x0213[] = {
+         0x74A0, 0x74A1, 0x74A5, 0x74AA, 0x74AB, 0x74B9, 0x74BB,
+ 0x74BA, 0x74D6, 0x74D8, 0x74DE, 0x74EF, 0x74EB, 0xD852 /*0xDF56*/, 0x74FA,
+ 0xD852 /*0xDF6F*/, 0x7520, 0x7524, 0x752A, 0x3F57, 0xD853 /*0xDC16*/, 0x753D, 0x753E,
+ 0x7540, 0x7548, 0x754E, 0x7550, 0x7552, 0x756C, 0x7572, 0x7571,
+ 0x757A, 0x757D, 0x757E, 0x7581, 0xD853 /*0xDD14*/, 0x758C, 0x3F75, 0x75A2,
+ 0x3F77, 0x75B0, 0x75B7, 0x75BF, 0x75C0, 0x75C6, 0x75CF, 0x75D3,
+ 0x75DD, 0x75DF, 0x75E0, 0x75E7, 0x75EC, 0x75EE, 0x75F1, 0x75F9,
+ 0x7603, 0x7618, 0x7607, 0x760F, 0x3FAE, 0xD853 /*0xDE0E*/, 0x7613, 0x761B,
+ 0x761C, 0xD853 /*0xDE37*/, 0x7625, 0x7628, 0x763C, 0x7633, 0xD853 /*0xDE6A*/, 0x3FC9,
+ 0x7641, 0xD853 /*0xDE8B*/, 0x7649, 0x7655, 0x3FD7, 0x766E, 0x7695, 0x769C,
+ 0x76A1, 0x76A0, 0x76A7, 0x76A8, 0x76AF, 0xD854 /*0xDC4A*/, 0x76C9, 0xD854 /*0xDC55*/,
+ 0x76E8, 0x76EC, 0xD854 /*0xDD22*/, 0x7717, 0x771A, 0x772D, 0x7735,
+};
+static const unsigned short euc_to_utf8_8FF2_x0213[] = {
+         0xD854 /*0xDDA9*/, 0x4039, 0xD854 /*0xDDE5*/, 0xD854 /*0xDDCD*/, 0x7758, 0x7760, 0x776A,
+ 0xD854 /*0xDE1E*/, 0x7772, 0x777C, 0x777D, 0xD854 /*0xDE4C*/, 0x4058, 0x779A, 0x779F,
+ 0x77A2, 0x77A4, 0x77A9, 0x77DE, 0x77DF, 0x77E4, 0x77E6, 0x77EA,
+ 0x77EC, 0x4093, 0x77F0, 0x77F4, 0x77FB, 0xD855 /*0xDC2E*/, 0x7805, 0x7806,
+ 0x7809, 0x780D, 0x7819, 0x7821, 0x782C, 0x7847, 0x7864, 0x786A,
+ 0xD855 /*0xDCD9*/, 0x788A, 0x7894, 0x78A4, 0x789D, 0x789E, 0x789F, 0x78BB,
+ 0x78C8, 0x78CC, 0x78CE, 0x78D5, 0x78E0, 0x78E1, 0x78E6, 0x78F9,
+ 0x78FA, 0x78FB, 0x78FE, 0xD855 /*0xDDA7*/, 0x7910, 0x791B, 0x7930, 0x7925,
+ 0x793B, 0x794A, 0x7958, 0x795B, 0x4105, 0x7967, 0x7972, 0x7994,
+ 0x7995, 0x7996, 0x799B, 0x79A1, 0x79A9, 0x79B4, 0x79BB, 0x79C2,
+ 0x79C7, 0x79CC, 0x79CD, 0x79D6, 0x4148, 0xD855 /*0xDFA9*/, 0xD855 /*0xDFB4*/, 0x414F,
+ 0x7A0A, 0x7A11, 0x7A15, 0x7A1B, 0x7A1E, 0x4163, 0x7A2D,
+};
+static const unsigned short euc_to_utf8_8FF3_x0213[] = {
+         0x7A38, 0x7A47, 0x7A4C, 0x7A56, 0x7A59, 0x7A5C, 0x7A5F,
+ 0x7A60, 0x7A67, 0x7A6A, 0x7A75, 0x7A78, 0x7A82, 0x7A8A, 0x7A90,
+ 0x7AA3, 0x7AAC, 0xD856 /*0xDDD4*/, 0x41B4, 0x7AB9, 0x7ABC, 0x7ABE, 0x41BF,
+ 0x7ACC, 0x7AD1, 0x7AE7, 0x7AE8, 0x7AF4, 0xD856 /*0xDEE4*/, 0xD856 /*0xDEE3*/, 0x7B07,
+ 0xD856 /*0xDEF1*/, 0x7B3D, 0x7B27, 0x7B2A, 0x7B2E, 0x7B2F, 0x7B31, 0x41E6,
+ 0x41F3, 0x7B7F, 0x7B41, 0x41EE, 0x7B55, 0x7B79, 0x7B64, 0x7B66,
+ 0x7B69, 0x7B73, 0xD856 /*0xDFB2*/, 0x4207, 0x7B90, 0x7B91, 0x7B9B, 0x420E,
+ 0x7BAF, 0x7BB5, 0x7BBC, 0x7BC5, 0x7BCA, 0xD857 /*0xDC4B*/, 0xD857 /*0xDC64*/, 0x7BD4,
+ 0x7BD6, 0x7BDA, 0x7BEA, 0x7BF0, 0x7C03, 0x7C0B, 0x7C0E, 0x7C0F,
+ 0x7C26, 0x7C45, 0x7C4A, 0x7C51, 0x7C57, 0x7C5E, 0x7C61, 0x7C69,
+ 0x7C6E, 0x7C6F, 0x7C70, 0xD857 /*0xDE2E*/, 0xD857 /*0xDE56*/, 0xD857 /*0xDE65*/, 0x7CA6, 0xD857 /*0xDE62*/,
+ 0x7CB6, 0x7CB7, 0x7CBF, 0xD857 /*0xDED8*/, 0x7CC4, 0xD857 /*0xDEC2*/, 0x7CC8,
+};
+static const unsigned short euc_to_utf8_8FF4_x0213[] = {
+         0x7CCD, 0xD857 /*0xDEE8*/, 0x7CD7, 0xD857 /*0xDF23*/, 0x7CE6, 0x7CEB, 0xD857 /*0xDF5C*/,
+ 0x7CF5, 0x7D03, 0x7D09, 0x42C6, 0x7D12, 0x7D1E, 0xD857 /*0xDFE0*/, 0xD857 /*0xDFD4*/,
+ 0x7D3D, 0x7D3E, 0x7D40, 0x7D47, 0xD858 /*0xDC0C*/, 0xD857 /*0xDFFB*/, 0x42D6, 0x7D59,
+ 0x7D5A, 0x7D6A, 0x7D70, 0x42DD, 0x7D7F, 0xD858 /*0xDC17*/, 0x7D86, 0x7D88,
+ 0x7D8C, 0x7D97, 0xD858 /*0xDC60*/, 0x7D9D, 0x7DA7, 0x7DAA, 0x7DB6, 0x7DB7,
+ 0x7DC0, 0x7DD7, 0x7DD9, 0x7DE6, 0x7DF1, 0x7DF9, 0x4302, 0xD858 /*0xDCED*/,
+ 0xFA58, 0x7E10, 0x7E17, 0x7E1D, 0x7E20, 0x7E27, 0x7E2C, 0x7E45,
+ 0x7E73, 0x7E75, 0x7E7E, 0x7E86, 0x7E87, 0x432B, 0x7E91, 0x7E98,
+ 0x7E9A, 0x4343, 0x7F3C, 0x7F3B, 0x7F3E, 0x7F43, 0x7F44, 0x7F4F,
+ 0x34C1, 0xD858 /*0xDE70*/, 0x7F52, 0xD858 /*0xDE86*/, 0x7F61, 0x7F63, 0x7F64, 0x7F6D,
+ 0x7F7D, 0x7F7E, 0xD858 /*0xDF4C*/, 0x7F90, 0x517B, 0xD84F /*0xDD0E*/, 0x7F96, 0x7F9C,
+ 0x7FAD, 0xD859 /*0xDC02*/, 0x7FC3, 0x7FCF, 0x7FE3, 0x7FE5, 0x7FEF,
+};
+static const unsigned short euc_to_utf8_8FF5_x0213[] = {
+         0x7FF2, 0x8002, 0x800A, 0x8008, 0x800E, 0x8011, 0x8016,
+ 0x8024, 0x802C, 0x8030, 0x8043, 0x8066, 0x8071, 0x8075, 0x807B,
+ 0x8099, 0x809C, 0x80A4, 0x80A7, 0x80B8, 0xD859 /*0xDE7E*/, 0x80C5, 0x80D5,
+ 0x80D8, 0x80E6, 0xD859 /*0xDEB0*/, 0x810D, 0x80F5, 0x80FB, 0x43EE, 0x8135,
+ 0x8116, 0x811E, 0x43F0, 0x8124, 0x8127, 0x812C, 0xD859 /*0xDF1D*/, 0x813D,
+ 0x4408, 0x8169, 0x4417, 0x8181, 0x441C, 0x8184, 0x8185, 0x4422,
+ 0x8198, 0x81B2, 0x81C1, 0x81C3, 0x81D6, 0x81DB, 0xD85A /*0xDCDD*/, 0x81E4,
+ 0xD85A /*0xDCEA*/, 0x81EC, 0xD85A /*0xDD51*/, 0x81FD, 0x81FF, 0xD85A /*0xDD6F*/, 0x8204, 0xD85A /*0xDDDD*/,
+ 0x8219, 0x8221, 0x8222, 0xD85A /*0xDE1E*/, 0x8232, 0x8234, 0x823C, 0x8246,
+ 0x8249, 0x8245, 0xD85A /*0xDE58*/, 0x824B, 0x4476, 0x824F, 0x447A, 0x8257,
+ 0xD85A /*0xDE8C*/, 0x825C, 0x8263, 0xD85A /*0xDEB7*/, 0xFA5D, 0xFA5E, 0x8279, 0x4491,
+ 0x827D, 0x827F, 0x8283, 0x828A, 0x8293, 0x82A7, 0x82A8,
+};
+static const unsigned short euc_to_utf8_8FF6_x0213[] = {
+         0x82B2, 0x82B4, 0x82BA, 0x82BC, 0x82E2, 0x82E8, 0x82F7,
+ 0x8307, 0x8308, 0x830C, 0x8354, 0x831B, 0x831D, 0x8330, 0x833C,
+ 0x8344, 0x8357, 0x44BE, 0x837F, 0x44D4, 0x44B3, 0x838D, 0x8394,
+ 0x8395, 0x839B, 0x839D, 0x83C9, 0x83D0, 0x83D4, 0x83DD, 0x83E5,
+ 0x83F9, 0x840F, 0x8411, 0x8415, 0xD85B /*0xDC73*/, 0x8417, 0x8439, 0x844A,
+ 0x844F, 0x8451, 0x8452, 0x8459, 0x845A, 0x845C, 0xD85B /*0xDCDD*/, 0x8465,
+ 0x8476, 0x8478, 0x847C, 0x8481, 0x450D, 0x84DC, 0x8497, 0x84A6,
+ 0x84BE, 0x4508, 0x84CE, 0x84CF, 0x84D3, 0xD85B /*0xDE65*/, 0x84E7, 0x84EA,
+ 0x84EF, 0x84F0, 0x84F1, 0x84FA, 0x84FD, 0x850C, 0x851B, 0x8524,
+ 0x8525, 0x852B, 0x8534, 0x854F, 0x856F, 0x4525, 0x4543, 0x853E,
+ 0x8551, 0x8553, 0x855E, 0x8561, 0x8562, 0xD85B /*0xDF94*/, 0x857B, 0x857D,
+ 0x857F, 0x8581, 0x8586, 0x8593, 0x859D, 0x859F, 0xD85B /*0xDFF8*/,
+};
+static const unsigned short euc_to_utf8_8FF7_x0213[] = {
+         0xD85B /*0xDFF6*/, 0xD85B /*0xDFF7*/, 0x85B7, 0x85BC, 0x85C7, 0x85CA, 0x85D8,
+ 0x85D9, 0x85DF, 0x85E1, 0x85E6, 0x85F6, 0x8600, 0x8611, 0x861E,
+ 0x8621, 0x8624, 0x8627, 0xD85C /*0xDD0D*/, 0x8639, 0x863C, 0xD85C /*0xDD39*/, 0x8640,
+ 0xFA20, 0x8653, 0x8656, 0x866F, 0x8677, 0x867A, 0x8687, 0x8689,
+ 0x868D, 0x8691, 0x869C, 0x869D, 0x86A8, 0xFA21, 0x86B1, 0x86B3,
+ 0x86C1, 0x86C3, 0x86D1, 0x86D5, 0x86D7, 0x86E3, 0x86E6, 0x45B8,
+ 0x8705, 0x8707, 0x870E, 0x8710, 0x8713, 0x8719, 0x871F, 0x8721,
+ 0x8723, 0x8731, 0x873A, 0x873E, 0x8740, 0x8743, 0x8751, 0x8758,
+ 0x8764, 0x8765, 0x8772, 0x877C, 0xD85C /*0xDFDB*/, 0xD85C /*0xDFDA*/, 0x87A7, 0x8789,
+ 0x878B, 0x8793, 0x87A0, 0xD85C /*0xDFFE*/, 0x45E5, 0x87BE, 0xD85D /*0xDC10*/, 0x87C1,
+ 0x87CE, 0x87F5, 0x87DF, 0xD85D /*0xDC49*/, 0x87E3, 0x87E5, 0x87E6, 0x87EA,
+ 0x87EB, 0x87ED, 0x8801, 0x8803, 0x880B, 0x8813, 0x8828,
+};
+static const unsigned short euc_to_utf8_8FF8_x0213[] = {
+         0x882E, 0x8832, 0x883C, 0x460F, 0x884A, 0x8858, 0x885F,
+ 0x8864, 0xD85D /*0xDE15*/, 0xD85D /*0xDE14*/, 0x8869, 0xD85D /*0xDE31*/, 0x886F, 0x88A0, 0x88BC,
+ 0x88BD, 0x88BE, 0x88C0, 0x88D2, 0xD85D /*0xDE93*/, 0x88D1, 0x88D3, 0x88DB,
+ 0x88F0, 0x88F1, 0x4641, 0x8901, 0xD85D /*0xDF0E*/, 0x8937, 0xD85D /*0xDF23*/, 0x8942,
+ 0x8945, 0x8949, 0xD85D /*0xDF52*/, 0x4665, 0x8962, 0x8980, 0x8989, 0x8990,
+ 0x899F, 0x89B0, 0x89B7, 0x89D6, 0x89D8, 0x89EB, 0x46A1, 0x89F1,
+ 0x89F3, 0x89FD, 0x89FF, 0x46AF, 0x8A11, 0x8A14, 0xD85E /*0xDD85*/, 0x8A21,
+ 0x8A35, 0x8A3E, 0x8A45, 0x8A4D, 0x8A58, 0x8AAE, 0x8A90, 0x8AB7,
+ 0x8ABE, 0x8AD7, 0x8AFC, 0xD85E /*0xDE84*/, 0x8B0A, 0x8B05, 0x8B0D, 0x8B1C,
+ 0x8B1F, 0x8B2D, 0x8B43, 0x470C, 0x8B51, 0x8B5E, 0x8B76, 0x8B7F,
+ 0x8B81, 0x8B8B, 0x8B94, 0x8B95, 0x8B9C, 0x8B9E, 0x8C39, 0xD85E /*0xDFB3*/,
+ 0x8C3D, 0xD85E /*0xDFBE*/, 0xD85E /*0xDFC7*/, 0x8C45, 0x8C47, 0x8C4F, 0x8C54,
+};
+static const unsigned short euc_to_utf8_8FF9_x0213[] = {
+         0x8C57, 0x8C69, 0x8C6D, 0x8C73, 0xD85F /*0xDCB8*/, 0x8C93, 0x8C92,
+ 0x8C99, 0x4764, 0x8C9B, 0x8CA4, 0x8CD6, 0x8CD5, 0x8CD9, 0xD85F /*0xDDA0*/,
+ 0x8CF0, 0x8CF1, 0xD85F /*0xDE10*/, 0x8D09, 0x8D0E, 0x8D6C, 0x8D84, 0x8D95,
+ 0x8DA6, 0xD85F /*0xDFB7*/, 0x8DC6, 0x8DC8, 0x8DD9, 0x8DEC, 0x8E0C, 0x47FD,
+ 0x8DFD, 0x8E06, 0xD860 /*0xDC8A*/, 0x8E14, 0x8E16, 0x8E21, 0x8E22, 0x8E27,
+ 0xD860 /*0xDCBB*/, 0x4816, 0x8E36, 0x8E39, 0x8E4B, 0x8E54, 0x8E62, 0x8E6C,
+ 0x8E6D, 0x8E6F, 0x8E98, 0x8E9E, 0x8EAE, 0x8EB3, 0x8EB5, 0x8EB6,
+ 0x8EBB, 0xD860 /*0xDE82*/, 0x8ED1, 0x8ED4, 0x484E, 0x8EF9, 0xD860 /*0xDEF3*/, 0x8F00,
+ 0x8F08, 0x8F17, 0x8F2B, 0x8F40, 0x8F4A, 0x8F58, 0xD861 /*0xDC0C*/, 0x8FA4,
+ 0x8FB4, 0xFA66, 0x8FB6, 0xD861 /*0xDC55*/, 0x8FC1, 0x8FC6, 0xFA24, 0x8FCA,
+ 0x8FCD, 0x8FD3, 0x8FD5, 0x8FE0, 0x8FF1, 0x8FF5, 0x8FFB, 0x9002,
+ 0x900C, 0x9037, 0xD861 /*0xDD6B*/, 0x9043, 0x9044, 0x905D, 0xD861 /*0xDDC8*/,
+};
+static const unsigned short euc_to_utf8_8FFA_x0213[] = {
+         0xD861 /*0xDDC9*/, 0x9085, 0x908C, 0x9090, 0x961D, 0x90A1, 0x48B5,
+ 0x90B0, 0x90B6, 0x90C3, 0x90C8, 0xD861 /*0xDED7*/, 0x90DC, 0x90DF, 0xD861 /*0xDEFA*/,
+ 0x90F6, 0x90F2, 0x9100, 0x90EB, 0x90FE, 0x90FF, 0x9104, 0x9106,
+ 0x9118, 0x911C, 0x911E, 0x9137, 0x9139, 0x913A, 0x9146, 0x9147,
+ 0x9157, 0x9159, 0x9161, 0x9164, 0x9174, 0x9179, 0x9185, 0x918E,
+ 0x91A8, 0x91AE, 0x91B3, 0x91B6, 0x91C3, 0x91C4, 0x91DA, 0xD862 /*0xDD49*/,
+ 0xD862 /*0xDD46*/, 0x91EC, 0x91EE, 0x9201, 0x920A, 0x9216, 0x9217, 0xD862 /*0xDD6B*/,
+ 0x9233, 0x9242, 0x9247, 0x924A, 0x924E, 0x9251, 0x9256, 0x9259,
+ 0x9260, 0x9261, 0x9265, 0x9267, 0x9268, 0xD862 /*0xDD87*/, 0xD862 /*0xDD88*/, 0x927C,
+ 0x927D, 0x927F, 0x9289, 0x928D, 0x9297, 0x9299, 0x929F, 0x92A7,
+ 0x92AB, 0xD862 /*0xDDBA*/, 0xD862 /*0xDDBB*/, 0x92B2, 0x92BF, 0x92C0, 0x92C6, 0x92CE,
+ 0x92D0, 0x92D7, 0x92D9, 0x92E5, 0x92E7, 0x9311, 0xD862 /*0xDE1E*/,
+};
+static const unsigned short euc_to_utf8_8FFB_x0213[] = {
+         0xD862 /*0xDE29*/, 0x92F7, 0x92F9, 0x92FB, 0x9302, 0x930D, 0x9315,
+ 0x931D, 0x931E, 0x9327, 0x9329, 0xD862 /*0xDE71*/, 0xD862 /*0xDE43*/, 0x9347, 0x9351,
+ 0x9357, 0x935A, 0x936B, 0x9371, 0x9373, 0x93A1, 0xD862 /*0xDE99*/, 0xD862 /*0xDECD*/,
+ 0x9388, 0x938B, 0x938F, 0x939E, 0x93F5, 0xD862 /*0xDEE4*/, 0xD862 /*0xDEDD*/, 0x93F1,
+ 0x93C1, 0x93C7, 0x93DC, 0x93E2, 0x93E7, 0x9409, 0x940F, 0x9416,
+ 0x9417, 0x93FB, 0x9432, 0x9434, 0x943B, 0x9445, 0xD862 /*0xDFC1*/, 0xD862 /*0xDFEF*/,
+ 0x946D, 0x946F, 0x9578, 0x9579, 0x9586, 0x958C, 0x958D, 0xD863 /*0xDD10*/,
+ 0x95AB, 0x95B4, 0xD863 /*0xDD71*/, 0x95C8, 0xD863 /*0xDDFB*/, 0xD863 /*0xDE1F*/, 0x962C, 0x9633,
+ 0x9634, 0xD863 /*0xDE36*/, 0x963C, 0x9641, 0x9661, 0xD863 /*0xDE89*/, 0x9682, 0xD863 /*0xDEEB*/,
+ 0x969A, 0xD863 /*0xDF32*/, 0x49E7, 0x96A9, 0x96AF, 0x96B3, 0x96BA, 0x96BD,
+ 0x49FA, 0xD863 /*0xDFF8*/, 0x96D8, 0x96DA, 0x96DD, 0x4A04, 0x9714, 0x9723,
+ 0x4A29, 0x9736, 0x9741, 0x9747, 0x9755, 0x9757, 0x975B,
+};
+static const unsigned short euc_to_utf8_8FFC_x0213[] = {
+         0x976A, 0xD864 /*0xDEA0*/, 0xD864 /*0xDEB1*/, 0x9796, 0x979A, 0x979E, 0x97A2,
+ 0x97B1, 0x97B2, 0x97BE, 0x97CC, 0x97D1, 0x97D4, 0x97D8, 0x97D9,
+ 0x97E1, 0x97F1, 0x9804, 0x980D, 0x980E, 0x9814, 0x9816, 0x4ABC,
+ 0xD865 /*0xDC90*/, 0x9823, 0x9832, 0x9833, 0x9825, 0x9847, 0x9866, 0x98AB,
+ 0x98AD, 0x98B0, 0xD865 /*0xDDCF*/, 0x98B7, 0x98B8, 0x98BB, 0x98BC, 0x98BF,
+ 0x98C2, 0x98C7, 0x98CB, 0x98E0, 0xD865 /*0xDE7F*/, 0x98E1, 0x98E3, 0x98E5,
+ 0x98EA, 0x98F0, 0x98F1, 0x98F3, 0x9908, 0x4B3B, 0xD865 /*0xDEF0*/, 0x9916,
+ 0x9917, 0xD865 /*0xDF19*/, 0x991A, 0x991B, 0x991C, 0xD865 /*0xDF50*/, 0x9931, 0x9932,
+ 0x9933, 0x993A, 0x993B, 0x993C, 0x9940, 0x9941, 0x9946, 0x994D,
+ 0x994E, 0x995C, 0x995F, 0x9960, 0x99A3, 0x99A6, 0x99B9, 0x99BD,
+ 0x99BF, 0x99C3, 0x99C9, 0x99D4, 0x99D9, 0x99DE, 0xD866 /*0xDCC6*/, 0x99F0,
+ 0x99F9, 0x99FC, 0x9A0A, 0x9A11, 0x9A16, 0x9A1A, 0x9A20,
+};
+static const unsigned short euc_to_utf8_8FFD_x0213[] = {
+         0x9A31, 0x9A36, 0x9A44, 0x9A4C, 0x9A58, 0x4BC2, 0x9AAF,
+ 0x4BCA, 0x9AB7, 0x4BD2, 0x9AB9, 0xD866 /*0xDE72*/, 0x9AC6, 0x9AD0, 0x9AD2,
+ 0x9AD5, 0x4BE8, 0x9ADC, 0x9AE0, 0x9AE5, 0x9AE9, 0x9B03, 0x9B0C,
+ 0x9B10, 0x9B12, 0x9B16, 0x9B1C, 0x9B2B, 0x9B33, 0x9B3D, 0x4C20,
+ 0x9B4B, 0x9B63, 0x9B65, 0x9B6B, 0x9B6C, 0x9B73, 0x9B76, 0x9B77,
+ 0x9BA6, 0x9BAC, 0x9BB1, 0xD867 /*0xDDDB*/, 0xD867 /*0xDE3D*/, 0x9BB2, 0x9BB8, 0x9BBE,
+ 0x9BC7, 0x9BF3, 0x9BD8, 0x9BDD, 0x9BE7, 0x9BEA, 0x9BEB, 0x9BEF,
+ 0x9BEE, 0xD867 /*0xDE15*/, 0x9BFA, 0xD867 /*0xDE8A*/, 0x9BF7, 0xD867 /*0xDE49*/, 0x9C16, 0x9C18,
+ 0x9C19, 0x9C1A, 0x9C1D, 0x9C22, 0x9C27, 0x9C29, 0x9C2A, 0xD867 /*0xDEC4*/,
+ 0x9C31, 0x9C36, 0x9C37, 0x9C45, 0x9C5C, 0xD867 /*0xDEE9*/, 0x9C49, 0x9C4A,
+ 0xD867 /*0xDEDB*/, 0x9C54, 0x9C58, 0x9C5B, 0x9C5D, 0x9C5F, 0x9C69, 0x9C6A,
+ 0x9C6B, 0x9C6D, 0x9C6E, 0x9C70, 0x9C72, 0x9C75, 0x9C7A,
+};
+static const unsigned short euc_to_utf8_8FFE_x0213[] = {
+         0x9CE6, 0x9CF2, 0x9D0B, 0x9D02, 0xD867 /*0xDFCE*/, 0x9D11, 0x9D17,
+ 0x9D18, 0xD868 /*0xDC2F*/, 0x4CC4, 0xD868 /*0xDC1A*/, 0x9D32, 0x4CD1, 0x9D42, 0x9D4A,
+ 0x9D5F, 0x9D62, 0xD868 /*0xDCF9*/, 0x9D69, 0x9D6B, 0xD868 /*0xDC82*/, 0x9D73, 0x9D76,
+ 0x9D77, 0x9D7E, 0x9D84, 0x9D8D, 0x9D99, 0x9DA1, 0x9DBF, 0x9DB5,
+ 0x9DB9, 0x9DBD, 0x9DC3, 0x9DC7, 0x9DC9, 0x9DD6, 0x9DDA, 0x9DDF,
+ 0x9DE0, 0x9DE3, 0x9DF4, 0x4D07, 0x9E0A, 0x9E02, 0x9E0D, 0x9E19,
+ 0x9E1C, 0x9E1D, 0x9E7B, 0xD848 /*0xDE18*/, 0x9E80, 0x9E85, 0x9E9B, 0x9EA8,
+ 0xD868 /*0xDF8C*/, 0x9EBD, 0xD869 /*0xDC37*/, 0x9EDF, 0x9EE7, 0x9EEE, 0x9EFF, 0x9F02,
+ 0x4D77, 0x9F03, 0x9F17, 0x9F19, 0x9F2F, 0x9F37, 0x9F3A, 0x9F3D,
+ 0x9F41, 0x9F45, 0x9F46, 0x9F53, 0x9F55, 0x9F58, 0xD869 /*0xDDF1*/, 0x9F5D,
+ 0xD869 /*0xDE02*/, 0x9F69, 0xD869 /*0xDE1A*/, 0x9F6D, 0x9F70, 0x9F75, 0xD869 /*0xDEB2*/, 0,
+      0,      0,      0,      0,      0,      0,      0,
+};
 
 #ifdef X0212_ENABLE
 static const unsigned short euc_to_utf8_8FA2[] = {
@@ -2408,6 +3136,32 @@ const unsigned short *const euc_to_utf8_2bytes_mac[] = {
               0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
  euc_to_utf8_FC_ms,              0,              0,
 };
+const unsigned short *const euc_to_utf8_2bytes_x0213[] = {
+                 euc_to_utf8_A1, euc_to_utf8_A2_x0213, euc_to_utf8_A3_x0213,
+ euc_to_utf8_A4_x0213, euc_to_utf8_A5_x0213, euc_to_utf8_A6_x0213, euc_to_utf8_A7_x0213,
+ euc_to_utf8_A8_x0213, euc_to_utf8_A9_x0213, euc_to_utf8_AA_x0213, euc_to_utf8_AB_x0213,
+ euc_to_utf8_AC_x0213, euc_to_utf8_AD_x0213, euc_to_utf8_AE_x0213, euc_to_utf8_AF_x0213,
+ euc_to_utf8_B0, euc_to_utf8_B1, euc_to_utf8_B2, euc_to_utf8_B3,
+ euc_to_utf8_B4, euc_to_utf8_B5, euc_to_utf8_B6, euc_to_utf8_B7,
+ euc_to_utf8_B8, euc_to_utf8_B9, euc_to_utf8_BA, euc_to_utf8_BB,
+ euc_to_utf8_BC, euc_to_utf8_BD, euc_to_utf8_BE, euc_to_utf8_BF,
+ euc_to_utf8_C0, euc_to_utf8_C1, euc_to_utf8_C2, euc_to_utf8_C3,
+ euc_to_utf8_C4, euc_to_utf8_C5, euc_to_utf8_C6, euc_to_utf8_C7,
+ euc_to_utf8_C8, euc_to_utf8_C9, euc_to_utf8_CA, euc_to_utf8_CB,
+ euc_to_utf8_CC, euc_to_utf8_CD, euc_to_utf8_CE, euc_to_utf8_CF_x0213,
+ euc_to_utf8_D0, euc_to_utf8_D1, euc_to_utf8_D2, euc_to_utf8_D3,
+ euc_to_utf8_D4, euc_to_utf8_D5, euc_to_utf8_D6, euc_to_utf8_D7,
+ euc_to_utf8_D8, euc_to_utf8_D9, euc_to_utf8_DA, euc_to_utf8_DB,
+ euc_to_utf8_DC, euc_to_utf8_DD, euc_to_utf8_DE, euc_to_utf8_DF,
+ euc_to_utf8_E0, euc_to_utf8_E1, euc_to_utf8_E2, euc_to_utf8_E3,
+ euc_to_utf8_E4, euc_to_utf8_E5, euc_to_utf8_E6, euc_to_utf8_E7,
+ euc_to_utf8_E8, euc_to_utf8_E9, euc_to_utf8_EA, euc_to_utf8_EB,
+ euc_to_utf8_EC, euc_to_utf8_ED, euc_to_utf8_EE, euc_to_utf8_EF,
+ euc_to_utf8_F0, euc_to_utf8_F1, euc_to_utf8_F2, euc_to_utf8_F3,
+ euc_to_utf8_F4_x0213, euc_to_utf8_F5_x0213, euc_to_utf8_F6_x0213, euc_to_utf8_F7_x0213,
+ euc_to_utf8_F8_x0213, euc_to_utf8_F9_x0213, euc_to_utf8_FA_x0213, euc_to_utf8_FB_x0213,
+ euc_to_utf8_FC_x0213, euc_to_utf8_FD_x0213, euc_to_utf8_FE_x0213,
+};
 
 #ifdef X0212_ENABLE
 const unsigned short *const x0212_to_utf8_2bytes[] = {
@@ -2435,7 +3189,371 @@ const unsigned short *const x0212_to_utf8_2bytes[] = {
  euc_to_utf8_8FF4,            0,              0,              0,
               0,              0,              0,              0,
               0,              0,              0,};
+
+const unsigned short *const x0212_to_utf8_2bytes_x0213[] = {
+                   euc_to_utf8_8FA1_x0213, euc_to_utf8_8FA2, euc_to_utf8_8FA3_x0213,
+ euc_to_utf8_8FA4_x0213, euc_to_utf8_8FA5_x0213, euc_to_utf8_8FA6, euc_to_utf8_8FA7,
+ euc_to_utf8_8FA8_x0213, euc_to_utf8_8FA9, euc_to_utf8_8FAA, euc_to_utf8_8FAB,
+ euc_to_utf8_8FAC_x0213, euc_to_utf8_8FAD_x0213, euc_to_utf8_8FAE_x0213, euc_to_utf8_8FAF_x0213,
+ euc_to_utf8_8FB0, euc_to_utf8_8FB1, euc_to_utf8_8FB2, euc_to_utf8_8FB3,
+ euc_to_utf8_8FB4, euc_to_utf8_8FB5, euc_to_utf8_8FB6, euc_to_utf8_8FB7,
+ euc_to_utf8_8FB8, euc_to_utf8_8FB9, euc_to_utf8_8FBA, euc_to_utf8_8FBB,
+ euc_to_utf8_8FBC, euc_to_utf8_8FBD, euc_to_utf8_8FBE, euc_to_utf8_8FBF,
+ euc_to_utf8_8FC0, euc_to_utf8_8FC1, euc_to_utf8_8FC2, euc_to_utf8_8FC3,
+ euc_to_utf8_8FC4, euc_to_utf8_8FC5, euc_to_utf8_8FC6, euc_to_utf8_8FC7,
+ euc_to_utf8_8FC8, euc_to_utf8_8FC9, euc_to_utf8_8FCA, euc_to_utf8_8FCB,
+ euc_to_utf8_8FCC, euc_to_utf8_8FCD, euc_to_utf8_8FCE, euc_to_utf8_8FCF,
+ euc_to_utf8_8FD0, euc_to_utf8_8FD1, euc_to_utf8_8FD2, euc_to_utf8_8FD3,
+ euc_to_utf8_8FD4, euc_to_utf8_8FD5, euc_to_utf8_8FD6, euc_to_utf8_8FD7,
+ euc_to_utf8_8FD8, euc_to_utf8_8FD9, euc_to_utf8_8FDA, euc_to_utf8_8FDB,
+ euc_to_utf8_8FDC, euc_to_utf8_8FDD, euc_to_utf8_8FDE, euc_to_utf8_8FDF,
+ euc_to_utf8_8FE0, euc_to_utf8_8FE1, euc_to_utf8_8FE2, euc_to_utf8_8FE3,
+ euc_to_utf8_8FE4, euc_to_utf8_8FE5, euc_to_utf8_8FE6, euc_to_utf8_8FE7,
+ euc_to_utf8_8FE8, euc_to_utf8_8FE9, euc_to_utf8_8FEA, euc_to_utf8_8FEB,
+ euc_to_utf8_8FEC, euc_to_utf8_8FED, euc_to_utf8_8FEE_x0213, euc_to_utf8_8FEF_x0213,
+ euc_to_utf8_8FF0_x0213, euc_to_utf8_8FF1_x0213, euc_to_utf8_8FF2_x0213, euc_to_utf8_8FF3_x0213,
+ euc_to_utf8_8FF4_x0213, euc_to_utf8_8FF5_x0213, euc_to_utf8_8FF6_x0213, euc_to_utf8_8FF7_x0213,
+ euc_to_utf8_8FF8_x0213, euc_to_utf8_8FF9_x0213, euc_to_utf8_8FFA_x0213, euc_to_utf8_8FFB_x0213,
+ euc_to_utf8_8FFC_x0213, euc_to_utf8_8FFD_x0213, euc_to_utf8_8FFE_x0213,};
 #endif /* X0212_ENABLE */
+
+const unsigned short x0213_combining_chars[sizeof_x0213_combining_chars] = {
+    0x309A, 0x0300, 0x0301, 0x02E5, 0x02E9,
+};
+const unsigned short x0213_combining_table[sizeof_x0213_combining_table][3] = {
+    {0x2477, 0x304B, 0x309A},
+    {0x2478, 0x304D, 0x309A},
+    {0x2479, 0x304F, 0x309A},
+    {0x247A, 0x3051, 0x309A},
+    {0x247B, 0x3053, 0x309A},
+    {0x2577, 0x30AB, 0x309A},
+    {0x2578, 0x30AD, 0x309A},
+    {0x2579, 0x30AF, 0x309A},
+    {0x257A, 0x30B1, 0x309A},
+    {0x257B, 0x30B3, 0x309A},
+    {0x257C, 0x30BB, 0x309A},
+    {0x257D, 0x30C4, 0x309A},
+    {0x257E, 0x30C8, 0x309A},
+    {0x2678, 0x31F7, 0x309A},
+    {0x2B44, 0x00E6, 0x0300},
+    {0x2B48, 0x0254, 0x0300},
+    {0x2B49, 0x0254, 0x0301},
+    {0x2B4A, 0x028C, 0x0300},
+    {0x2B4B, 0x028C, 0x0301},
+    {0x2B4C, 0x0259, 0x0300},
+    {0x2B4D, 0x0259, 0x0301},
+    {0x2B4E, 0x025A, 0x0300},
+    {0x2B4F, 0x025A, 0x0301},
+    {0x2B65, 0x02E9, 0x02E5},
+    {0x2B66, 0x02E5, 0x02E9},
+};
+const unsigned short x0213_1_surrogate_table[sizeof_x0213_1_surrogate_table][3] = {
+    {0x2E22, 0xD840, 0xDC0B},
+    {0x2F42, 0xD844, 0xDE3D},
+    {0x2F4C, 0xD844, 0xDF1B},
+    {0x2F60, 0xD845, 0xDC6E},
+    {0x2F7B, 0xD846, 0xDCBD},
+    {0x4F54, 0xD842, 0xDF9F},
+    {0x4F63, 0xD845, 0xDEB4},
+    {0x4F6E, 0xD847, 0xDE34},
+    {0x753A, 0xD84C, 0xDDC4},
+    {0x7572, 0xD84D, 0xDDC4},
+    {0x7629, 0xD84D, 0xDF3F},
+    {0x7632, 0xD84D, 0xDF63},
+    {0x7660, 0xD84F, 0xDCFE},
+    {0x776C, 0xD851, 0xDFF1},
+    {0x787E, 0xD855, 0xDC8E},
+    {0x7929, 0xD855, 0xDD0E},
+    {0x7947, 0xD855, 0xDF71},
+    {0x7954, 0xD856, 0xDDC4},
+    {0x796E, 0xD857, 0xDDA1},
+    {0x7A5D, 0xD85A, 0xDEFF},
+    {0x7B33, 0xD85B, 0xDE40},
+    {0x7B49, 0xD85C, 0xDCF4},
+    {0x7B6C, 0xD85D, 0xDE84},
+    {0x7C49, 0xD860, 0xDE77},
+    {0x7C51, 0xD860, 0xDFCD},
+    {0x7E66, 0xD868, 0xDD90},
+};
+const unsigned short x0213_2_surrogate_table[sizeof_x0213_2_surrogate_table][3] = {
+    {0x2121, 0xD840, 0xDC89},
+    {0x212B, 0xD840, 0xDCA2},
+    {0x212E, 0xD840, 0xDCA4},
+    {0x2136, 0xD840, 0xDDA2},
+    {0x2146, 0xD840, 0xDE13},
+    {0x2170, 0xD840, 0xDF2B},
+    {0x2177, 0xD840, 0xDF81},
+    {0x2179, 0xD840, 0xDF71},
+    {0x2322, 0xD840, 0xDFF9},
+    {0x2325, 0xD841, 0xDC4A},
+    {0x2327, 0xD841, 0xDD09},
+    {0x2331, 0xD841, 0xDDD6},
+    {0x2332, 0xD841, 0xDE28},
+    {0x2338, 0xD841, 0xDF4F},
+    {0x233F, 0xD842, 0xDC07},
+    {0x2341, 0xD842, 0xDC3A},
+    {0x234A, 0xD842, 0xDCB9},
+    {0x2352, 0xD842, 0xDD7C},
+    {0x2353, 0xD842, 0xDD9D},
+    {0x2359, 0xD842, 0xDED3},
+    {0x235C, 0xD842, 0xDF1D},
+    {0x2377, 0xD843, 0xDD45},
+    {0x242A, 0xD843, 0xDDE1},
+    {0x2431, 0xD843, 0xDE95},
+    {0x2432, 0xD843, 0xDE6D},
+    {0x243A, 0xD843, 0xDE64},
+    {0x243D, 0xD843, 0xDF5F},
+    {0x2459, 0xD844, 0xDE01},
+    {0x245C, 0xD844, 0xDE55},
+    {0x245E, 0xD844, 0xDE7B},
+    {0x2463, 0xD844, 0xDE74},
+    {0x246A, 0xD844, 0xDEE4},
+    {0x246B, 0xD844, 0xDED7},
+    {0x2472, 0xD844, 0xDEFD},
+    {0x2474, 0xD844, 0xDF36},
+    {0x2475, 0xD844, 0xDF44},
+    {0x2525, 0xD844, 0xDFC4},
+    {0x2532, 0xD845, 0xDC6D},
+    {0x253E, 0xD845, 0xDDD7},
+    {0x2544, 0xD85B, 0xDC29},
+    {0x2547, 0xD845, 0xDE47},
+    {0x2555, 0xD845, 0xDF06},
+    {0x2556, 0xD845, 0xDF42},
+    {0x257E, 0xD846, 0xDDC3},
+    {0x2830, 0xD847, 0xDC56},
+    {0x2837, 0xD847, 0xDD2D},
+    {0x2838, 0xD847, 0xDD45},
+    {0x283A, 0xD847, 0xDD78},
+    {0x283B, 0xD847, 0xDD62},
+    {0x283F, 0xD847, 0xDDA1},
+    {0x2840, 0xD847, 0xDD9C},
+    {0x2845, 0xD847, 0xDD92},
+    {0x2848, 0xD847, 0xDDB7},
+    {0x284A, 0xD847, 0xDDE0},
+    {0x284B, 0xD847, 0xDE33},
+    {0x285B, 0xD847, 0xDF1E},
+    {0x2866, 0xD847, 0xDF76},
+    {0x286C, 0xD847, 0xDFFA},
+    {0x2C22, 0xD848, 0xDD7B},
+    {0x2C2B, 0xD848, 0xDF1E},
+    {0x2C30, 0xD848, 0xDFAD},
+    {0x2C50, 0xD849, 0xDEF3},
+    {0x2C65, 0xD84A, 0xDC5B},
+    {0x2C6D, 0xD84A, 0xDCAB},
+    {0x2C72, 0xD84A, 0xDD8F},
+    {0x2D24, 0xD84A, 0xDEB8},
+    {0x2D29, 0xD84A, 0xDF4F},
+    {0x2D2A, 0xD84A, 0xDF50},
+    {0x2D32, 0xD84A, 0xDF46},
+    {0x2D34, 0xD84B, 0xDC1D},
+    {0x2D35, 0xD84A, 0xDFA6},
+    {0x2D39, 0xD84B, 0xDC24},
+    {0x2D56, 0xD84B, 0xDDE1},
+    {0x2D7D, 0xD84C, 0xDDC3},
+    {0x2E23, 0xD84C, 0xDDF5},
+    {0x2E24, 0xD84C, 0xDDB6},
+    {0x2E3A, 0xD84C, 0xDF72},
+    {0x2E3C, 0xD84C, 0xDFD3},
+    {0x2E3D, 0xD84C, 0xDFD2},
+    {0x2E42, 0xD84C, 0xDFD0},
+    {0x2E43, 0xD84C, 0xDFE4},
+    {0x2E44, 0xD84C, 0xDFD5},
+    {0x2E47, 0xD84C, 0xDFDA},
+    {0x2E49, 0xD84C, 0xDFDF},
+    {0x2E55, 0xD84D, 0xDC4A},
+    {0x2E56, 0xD84D, 0xDC51},
+    {0x2E57, 0xD84D, 0xDC4B},
+    {0x2E5B, 0xD84D, 0xDC65},
+    {0x2E77, 0xD84D, 0xDCE4},
+    {0x2E78, 0xD84D, 0xDD5A},
+    {0x2F2A, 0xD84D, 0xDD94},
+    {0x2F3F, 0xD84D, 0xDE39},
+    {0x2F40, 0xD84D, 0xDE47},
+    {0x2F42, 0xD84D, 0xDE38},
+    {0x2F43, 0xD84D, 0xDE3A},
+    {0x2F4E, 0xD84D, 0xDF1C},
+    {0x2F59, 0xD84D, 0xDF0C},
+    {0x2F61, 0xD84D, 0xDF64},
+    {0x2F69, 0xD84D, 0xDFFF},
+    {0x2F6A, 0xD84D, 0xDFE7},
+    {0x2F70, 0xD84E, 0xDC24},
+    {0x2F75, 0xD84E, 0xDC3D},
+    {0x6E23, 0xD84E, 0xDE98},
+    {0x6E34, 0xD84F, 0xDC7F},
+    {0x6E49, 0xD84F, 0xDD00},
+    {0x6E5C, 0xD84F, 0xDD40},
+    {0x6E5E, 0xD84F, 0xDDFA},
+    {0x6E5F, 0xD84F, 0xDDF9},
+    {0x6E60, 0xD84F, 0xDDD3},
+    {0x6F32, 0xD84F, 0xDF7E},
+    {0x6F47, 0xD850, 0xDC96},
+    {0x6F4D, 0xD850, 0xDD03},
+    {0x6F61, 0xD850, 0xDDC6},
+    {0x6F64, 0xD850, 0xDDFE},
+    {0x7022, 0xD850, 0xDFBC},
+    {0x7033, 0xD851, 0xDE29},
+    {0x7039, 0xD851, 0xDEA5},
+    {0x7053, 0xD852, 0xDC96},
+    {0x707B, 0xD852, 0xDE4D},
+    {0x712E, 0xD852, 0xDF56},
+    {0x7130, 0xD852, 0xDF6F},
+    {0x7135, 0xD853, 0xDC16},
+    {0x7144, 0xD853, 0xDD14},
+    {0x715D, 0xD853, 0xDE0E},
+    {0x7161, 0xD853, 0xDE37},
+    {0x7166, 0xD853, 0xDE6A},
+    {0x7169, 0xD853, 0xDE8B},
+    {0x7175, 0xD854, 0xDC4A},
+    {0x7177, 0xD854, 0xDC55},
+    {0x717A, 0xD854, 0xDD22},
+    {0x7221, 0xD854, 0xDDA9},
+    {0x7223, 0xD854, 0xDDE5},
+    {0x7224, 0xD854, 0xDDCD},
+    {0x7228, 0xD854, 0xDE1E},
+    {0x722C, 0xD854, 0xDE4C},
+    {0x723D, 0xD855, 0xDC2E},
+    {0x7248, 0xD855, 0xDCD9},
+    {0x725B, 0xD855, 0xDDA7},
+    {0x7275, 0xD855, 0xDFA9},
+    {0x7276, 0xD855, 0xDFB4},
+    {0x7332, 0xD856, 0xDDD4},
+    {0x733D, 0xD856, 0xDEE4},
+    {0x733E, 0xD856, 0xDEE3},
+    {0x7340, 0xD856, 0xDEF1},
+    {0x7352, 0xD856, 0xDFB2},
+    {0x735D, 0xD857, 0xDC4B},
+    {0x735E, 0xD857, 0xDC64},
+    {0x7373, 0xD857, 0xDE2E},
+    {0x7374, 0xD857, 0xDE56},
+    {0x7375, 0xD857, 0xDE65},
+    {0x7377, 0xD857, 0xDE62},
+    {0x737B, 0xD857, 0xDED8},
+    {0x737D, 0xD857, 0xDEC2},
+    {0x7422, 0xD857, 0xDEE8},
+    {0x7424, 0xD857, 0xDF23},
+    {0x7427, 0xD857, 0xDF5C},
+    {0x742E, 0xD857, 0xDFE0},
+    {0x742F, 0xD857, 0xDFD4},
+    {0x7434, 0xD858, 0xDC0C},
+    {0x7435, 0xD857, 0xDFFB},
+    {0x743D, 0xD858, 0xDC17},
+    {0x7442, 0xD858, 0xDC60},
+    {0x744F, 0xD858, 0xDCED},
+    {0x7469, 0xD858, 0xDE70},
+    {0x746B, 0xD858, 0xDE86},
+    {0x7472, 0xD858, 0xDF4C},
+    {0x7475, 0xD84F, 0xDD0E},
+    {0x7479, 0xD859, 0xDC02},
+    {0x7535, 0xD859, 0xDE7E},
+    {0x753A, 0xD859, 0xDEB0},
+    {0x7546, 0xD859, 0xDF1D},
+    {0x7556, 0xD85A, 0xDCDD},
+    {0x7558, 0xD85A, 0xDCEA},
+    {0x755A, 0xD85A, 0xDD51},
+    {0x755D, 0xD85A, 0xDD6F},
+    {0x755F, 0xD85A, 0xDDDD},
+    {0x7563, 0xD85A, 0xDE1E},
+    {0x756A, 0xD85A, 0xDE58},
+    {0x7570, 0xD85A, 0xDE8C},
+    {0x7573, 0xD85A, 0xDEB7},
+    {0x7644, 0xD85B, 0xDC73},
+    {0x764E, 0xD85B, 0xDCDD},
+    {0x765D, 0xD85B, 0xDE65},
+    {0x7675, 0xD85B, 0xDF94},
+    {0x767E, 0xD85B, 0xDFF8},
+    {0x7721, 0xD85B, 0xDFF6},
+    {0x7722, 0xD85B, 0xDFF7},
+    {0x7733, 0xD85C, 0xDD0D},
+    {0x7736, 0xD85C, 0xDD39},
+    {0x7764, 0xD85C, 0xDFDB},
+    {0x7765, 0xD85C, 0xDFDA},
+    {0x776B, 0xD85C, 0xDFFE},
+    {0x776E, 0xD85D, 0xDC10},
+    {0x7773, 0xD85D, 0xDC49},
+    {0x7829, 0xD85D, 0xDE15},
+    {0x782A, 0xD85D, 0xDE14},
+    {0x782C, 0xD85D, 0xDE31},
+    {0x7834, 0xD85D, 0xDE93},
+    {0x783C, 0xD85D, 0xDF0E},
+    {0x783E, 0xD85D, 0xDF23},
+    {0x7842, 0xD85D, 0xDF52},
+    {0x7856, 0xD85E, 0xDD85},
+    {0x7863, 0xD85E, 0xDE84},
+    {0x7877, 0xD85E, 0xDFB3},
+    {0x7879, 0xD85E, 0xDFBE},
+    {0x787A, 0xD85E, 0xDFC7},
+    {0x7925, 0xD85F, 0xDCB8},
+    {0x792F, 0xD85F, 0xDDA0},
+    {0x7932, 0xD85F, 0xDE10},
+    {0x7939, 0xD85F, 0xDFB7},
+    {0x7942, 0xD860, 0xDC8A},
+    {0x7948, 0xD860, 0xDCBB},
+    {0x7959, 0xD860, 0xDE82},
+    {0x795E, 0xD860, 0xDEF3},
+    {0x7966, 0xD861, 0xDC0C},
+    {0x796B, 0xD861, 0xDC55},
+    {0x797A, 0xD861, 0xDD6B},
+    {0x797E, 0xD861, 0xDDC8},
+    {0x7A21, 0xD861, 0xDDC9},
+    {0x7A2C, 0xD861, 0xDED7},
+    {0x7A2F, 0xD861, 0xDEFA},
+    {0x7A4F, 0xD862, 0xDD49},
+    {0x7A50, 0xD862, 0xDD46},
+    {0x7A57, 0xD862, 0xDD6B},
+    {0x7A65, 0xD862, 0xDD87},
+    {0x7A66, 0xD862, 0xDD88},
+    {0x7A71, 0xD862, 0xDDBA},
+    {0x7A72, 0xD862, 0xDDBB},
+    {0x7A7E, 0xD862, 0xDE1E},
+    {0x7B21, 0xD862, 0xDE29},
+    {0x7B2C, 0xD862, 0xDE71},
+    {0x7B2D, 0xD862, 0xDE43},
+    {0x7B36, 0xD862, 0xDE99},
+    {0x7B37, 0xD862, 0xDECD},
+    {0x7B3D, 0xD862, 0xDEE4},
+    {0x7B3E, 0xD862, 0xDEDD},
+    {0x7B4E, 0xD862, 0xDFC1},
+    {0x7B4F, 0xD862, 0xDFEF},
+    {0x7B57, 0xD863, 0xDD10},
+    {0x7B5A, 0xD863, 0xDD71},
+    {0x7B5C, 0xD863, 0xDDFB},
+    {0x7B5D, 0xD863, 0xDE1F},
+    {0x7B61, 0xD863, 0xDE36},
+    {0x7B65, 0xD863, 0xDE89},
+    {0x7B67, 0xD863, 0xDEEB},
+    {0x7B69, 0xD863, 0xDF32},
+    {0x7B71, 0xD863, 0xDFF8},
+    {0x7C22, 0xD864, 0xDEA0},
+    {0x7C23, 0xD864, 0xDEB1},
+    {0x7C38, 0xD865, 0xDC90},
+    {0x7C42, 0xD865, 0xDDCF},
+    {0x7C4C, 0xD865, 0xDE7F},
+    {0x7C56, 0xD865, 0xDEF0},
+    {0x7C59, 0xD865, 0xDF19},
+    {0x7C5D, 0xD865, 0xDF50},
+    {0x7C76, 0xD866, 0xDCC6},
+    {0x7D2C, 0xD866, 0xDE72},
+    {0x7D4B, 0xD867, 0xDDDB},
+    {0x7D4C, 0xD867, 0xDE3D},
+    {0x7D59, 0xD867, 0xDE15},
+    {0x7D5B, 0xD867, 0xDE8A},
+    {0x7D5D, 0xD867, 0xDE49},
+    {0x7D67, 0xD867, 0xDEC4},
+    {0x7D6D, 0xD867, 0xDEE9},
+    {0x7D70, 0xD867, 0xDEDB},
+    {0x7E25, 0xD867, 0xDFCE},
+    {0x7E29, 0xD868, 0xDC2F},
+    {0x7E2B, 0xD868, 0xDC1A},
+    {0x7E32, 0xD868, 0xDCF9},
+    {0x7E35, 0xD868, 0xDC82},
+    {0x7E53, 0xD848, 0xDE18},
+    {0x7E58, 0xD868, 0xDF8C},
+    {0x7E5A, 0xD869, 0xDC37},
+    {0x7E6E, 0xD869, 0xDDF1},
+    {0x7E70, 0xD869, 0xDE02},
+    {0x7E72, 0xD869, 0xDE1A},
+    {0x7E76, 0xD869, 0xDEB2},
+};
 #endif /* UTF8_OUTPUT_ENABLE */
 
 #ifdef UTF8_INPUT_ENABLE
@@ -2479,6 +3597,16 @@ static const unsigned short utf8_to_euc_C2_932[] = {
  0x216B, 0x215E,   0x32,   0x33, 0x212D, 0x264C, 0x2279, 0x2126,
  0x2124,   0x31,   0x6F, 0x2264,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_C2_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2922, 0x2923, 0x2171, 0x2172, 0x2924, 0x216F, 0x2925, 0x2178,
+ 0x212F, 0x2926, 0x2927, 0x2928, 0x224C, 0x2929, 0x292A, 0x292B,
+ 0x216B, 0x215E, 0x292C, 0x292D, 0x212D,      0, 0x2279, 0x292E,
+ 0x292F, 0x2930, 0x2931, 0x2932, 0x2933, 0x2934, 0x2935, 0x2936,
+};
 static const unsigned short utf8_to_euc_C3[] = {
  0xAA22, 0xAA21, 0xAA24, 0xAA2A, 0xAA23, 0xAA29, 0xA921, 0xAA2E,
  0xAA32, 0xAA31, 0xAA34, 0xAA33, 0xAA40, 0xAA3F, 0xAA42, 0xAA41,
@@ -2499,6 +3627,16 @@ static const unsigned short utf8_to_euc_C3_932[] = {
    0x64,   0x6E,   0x6F,   0x6F,   0x6F,   0x6F,   0x6F, 0x2160,
    0x6F,   0x75,   0x75,   0x75,   0x75,   0x79,   0x74,   0x79,
 };
+static const unsigned short utf8_to_euc_C3_x0213[] = {
+ 0x2937, 0x2938, 0x2939, 0x293A, 0x293B, 0x293C, 0x293D, 0x293E,
+ 0x293F, 0x2940, 0x2941, 0x2942, 0x2943, 0x2944, 0x2945, 0x2946,
+ 0x2947, 0x2948, 0x2949, 0x294A, 0x294B, 0x294C, 0x294D, 0x215F,
+ 0x294E, 0x294F, 0x2950, 0x2951, 0x2952, 0x2953, 0x2954, 0x2955,
+ 0x2956, 0x2957, 0x2958, 0x2959, 0x295A, 0x295B, 0x295C, 0x295D,
+ 0x295E, 0x295F, 0x2960, 0x2961, 0x2962, 0x2963, 0x2964, 0x2965,
+ 0x2966, 0x2967, 0x2968, 0x2969, 0x296A, 0x296B, 0x296C, 0x2160,
+ 0x296D, 0x296E, 0x296F, 0x2970, 0x2971, 0x2972, 0x2973, 0x2974,
+};
 static const unsigned short utf8_to_euc_C4[] = {
  0xAA27, 0xAB27, 0xAA25, 0xAB25, 0xAA28, 0xAB28, 0xAA2B, 0xAB2B,
  0xAA2C, 0xAB2C, 0xAA2F, 0xAB2F, 0xAA2D, 0xAB2D, 0xAA30, 0xAB30,
@@ -2509,6 +3647,16 @@ static const unsigned short utf8_to_euc_C4[] = {
  0xAA44, 0xA945, 0xA926, 0xA946, 0xAA48, 0xAB48, 0xAA49, 0xAB49,
  0xA947, 0xAA4A, 0xAB4A, 0xAA4C, 0xAB4C, 0xAA4B, 0xAB4B, 0xA929,
 };
+static const unsigned short utf8_to_euc_C4_x0213[] = {
+ 0x2975, 0x297A, 0x2A3A, 0x2A49, 0x2A21, 0x2A2C, 0x2A3C, 0x2A4B,
+ 0x2A59, 0x2A5F, 0xAA2F, 0xAB2F, 0x2A3D, 0x2A4C, 0x2A40, 0x2A4F,
+ 0xA922, 0x2A50, 0x2978, 0x297D,      0,      0, 0xAA36, 0xAB36,
+ 0x2A3E, 0x2A4D, 0x2A3F, 0x2A4E, 0x2A5A, 0x2A60, 0xAA3B, 0xAB3B,
+ 0xAA3D, 0xAB3D, 0xAA3C,      0, 0x2A5B, 0x2A61, 0xA924, 0x2A7D,
+ 0xAA47, 0xAB47, 0x2976, 0x297B,      0,      0, 0xAA46, 0xAB46,
+ 0xAA44, 0xA945, 0xA926, 0xA946, 0x2A5C, 0x2A62, 0xAA49, 0xAB49,
+ 0xA947, 0x2A3B, 0x2A4A, 0xAA4C, 0xAB4C, 0x2A24, 0x2A2F, 0xA929,
+};
 static const unsigned short utf8_to_euc_C5[] = {
  0xA949, 0xA928, 0xA948, 0xAA4D, 0xAB4D, 0xAA4F, 0xAB4F, 0xAA4E,
  0xAB4E, 0xA94A, 0xA92B, 0xA94B, 0xAA57, 0xAB57,      0,      0,
@@ -2519,6 +3667,26 @@ static const unsigned short utf8_to_euc_C5[] = {
  0xAA68, 0xAB68, 0xAA6A, 0xAB6A, 0xAA71, 0xAB71, 0xAA74, 0xAB74,
  0xAA73, 0xAA75, 0xAB75, 0xAA77, 0xAB77, 0xAA76, 0xAB76,      0,
 };
+static const unsigned short utf8_to_euc_C5_x0213[] = {
+ 0xA949, 0x2A23, 0x2A2E, 0x2A41, 0x2A51, 0xAA4F, 0xAB4F, 0x2A42,
+ 0x2A52, 0xA94A, 0xA92B, 0x2A7A, 0x2979, 0x297E,      0,      0,
+ 0x2A43, 0x2A53, 0x2B2B, 0x2B2A, 0x2A39, 0x2A48, 0xAA5B, 0xAB5B,
+ 0x2A44, 0x2A54, 0x2A25, 0x2A30, 0x2A5D, 0x2A63, 0x2A27, 0x2A33,
+ 0x2A26, 0x2A32, 0x2A47, 0x2A57, 0x2A28, 0x2A34, 0xA92F, 0xA94F,
+ 0xAA6C, 0xAB6C, 0x2977, 0x297C, 0x2A5E, 0x2A64, 0x2A45, 0x2A55,
+ 0x2A46, 0x2A56, 0xAA6A, 0xAB6A, 0xAA71, 0xAB71, 0xAA74, 0xAB74,
+ 0xAA73, 0x2A29, 0x2A35, 0x2A2B, 0x2A38, 0x2A2A, 0x2A37,      0,
+};
+static const unsigned short utf8_to_euc_C6_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2B29,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_C7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0xAA26, 0xAB26, 0xAA43,
@@ -2529,6 +3697,36 @@ static const unsigned short utf8_to_euc_C7[] = {
       0,      0,      0,      0,      0, 0xAB39,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_C7_x0213[] = {
+      0,      0, 0x2B24,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x286F, 0x2870, 0xAA43,
+ 0x2871, 0x2876, 0x2877, 0xAA67, 0x2878, 0xAA70, 0x2879, 0xAA6D,
+ 0x287A, 0xAA6F, 0x287B, 0xAA6E, 0x287C,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xAB39,      0,      0,
+ 0x2874, 0x2875,      0,      0,      0, 0x2B45,      0,      0,
+};
+static const unsigned short utf8_to_euc_C9_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2B33, 0x2B39, 0x2B3A, 0x2B25, 0x2B38, 0x2B3F, 0x2A6E, 0x2B26,
+ 0x2B2E, 0x2B30, 0x2B43,      0, 0x2B31,      0, 0x2B32, 0x2A75,
+ 0x2B28, 0x2A79,      0,      0, 0x2B36, 0x2B3C, 0x2B22, 0x2B42,
+ 0x2B2C,      0,      0,      0, 0x2A6A, 0x2A74, 0x2A6B, 0x2B34,
+ 0x2A7B, 0x2A65, 0x2A76, 0x2A6F,      0, 0x2B2F,      0,      0,
+      0, 0x2A6C, 0x2B41, 0x2A73,      0, 0x2A70, 0x2A67,      0,
+};
+static const unsigned short utf8_to_euc_CA_x0213[] = {
+      0, 0x2A7C, 0x2A71, 0x2A68, 0x2B27,      0,      0,      0,
+ 0x2A6D, 0x2B2D, 0x2B35, 0x2A66, 0x2B37, 0x2B3B, 0x2A78,      0,
+ 0x2A72, 0x2B40, 0x2A69,      0, 0x2B21, 0x2A7E,      0,      0,
+ 0x2B23,      0,      0,      0,      0, 0x2A77,      0,      0,
+      0, 0x2B3E, 0x2B3D,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_CB[] = {
       0,      0,      0,      0,      0,      0,      0, 0xA230,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2539,6 +3737,36 @@ static const unsigned short utf8_to_euc_CB[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_CB_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0, 0x2A31,
+ 0x2B53,      0,      0,      0, 0x2B54,      0,      0,      0,
+ 0x2B55, 0x2B56,      0,      0,      0,      0,      0,      0,
+ 0x2A22, 0x2A58, 0xA236, 0x2A2D,      0, 0x2A36, 0x2B71,      0,
+      0,      0,      0,      0,      0, 0x2B60, 0x2B61, 0x2B62,
+ 0x2B63, 0x2B64,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_CC_x0213[] = {
+ 0x2B5C, 0x2B5A, 0x2B5F, 0x2B7D, 0x2B5B,      0, 0x2B57,      0,
+ 0x2B6D,      0,      0, 0x2B59, 0x2B5E,      0,      0, 0x2B5D,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2B78, 0x2B79, 0x2B7E,      0, 0x2B6A, 0x2B76, 0x2B77, 0x2B6B,
+ 0x2B6C,      0,      0,      0, 0x2B72, 0x2B67,      0,      0,
+      0, 0x2B6F, 0x2B7A,      0, 0x2B68,      0,      0, 0x2B70,
+ 0x2B73,      0,      0,      0, 0x2B75,      0,      0,      0,
+      0, 0x2B69, 0x2B7B, 0x2B7C, 0x2B74, 0x2B6E,      0,      0,
+};
+static const unsigned short utf8_to_euc_CD_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x2B52,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_CE[] = {
       0,      0,      0,      0, 0xA238, 0xA239, 0xA661,      0,
  0xA662, 0xA663, 0xA664,      0, 0xA667,      0, 0xA669, 0xA66C,
@@ -2559,6 +3787,16 @@ static const unsigned short utf8_to_euc_CF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_CF_x0213[] = {
+ 0x2650, 0x2651, 0x2659, 0x2652, 0x2653, 0x2654, 0x2655, 0x2656,
+ 0x2657, 0x2658, 0xA675, 0xA67A, 0xA677, 0xA679, 0xA67C,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_D0[] = {
       0, 0x2727, 0xA742, 0xA743, 0xA744, 0xA745, 0xA746, 0xA747,
  0xA748, 0xA749, 0xA74A, 0xA74B, 0xA74C,      0, 0xA74D, 0xA74E,
@@ -2579,6 +3817,26 @@ static const unsigned short utf8_to_euc_D1[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E1B8_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x2872, 0x2873,
+};
+static const unsigned short utf8_to_euc_E1BD_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2B46, 0x2B47, 0x2B50, 0x2B51,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E280[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2609,6 +3867,36 @@ static const unsigned short utf8_to_euc_E280_932[] = {
  0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
       0,      0,      0, 0x2228,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E280_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x213E,      0,      0, 0x237C, 0x213D, 0x213D, 0x2142,      0,
+ 0x2146, 0x2147,      0,      0, 0x2148, 0x2149,      0,      0,
+ 0x2277, 0x2278, 0x2340,      0,      0, 0x2145, 0x2144,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
+      0,      0,      0, 0x2228, 0x286B,      0, 0x2131, 0x2B58,
+};
+static const unsigned short utf8_to_euc_E281_x0213[] = {
+      0,      0, 0x2C7E,      0,      0,      0,      0, 0x286C,
+ 0x286D, 0x286E,      0,      0,      0,      0,      0,      0,
+      0, 0x2C7D,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E282_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x2921,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E284[] = {
       0,      0,      0, 0x216E,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2629,6 +3917,16 @@ static const unsigned short utf8_to_euc_E284_mac[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E284_x0213[] = {
+      0,      0,      0, 0x216E,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x235D,
+      0,      0,      0, 0x235F,      0,      0, 0x2D62,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x2D64, 0xA26F,      0,      0,      0,      0, 0x2360,
+      0,      0,      0, 0x2272,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x235C,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E285[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2649,6 +3947,16 @@ static const unsigned short utf8_to_euc_E285_mac[] = {
  0x2A35, 0x2A36, 0x2A37, 0x2A38, 0x2A39, 0x2A3A, 0x2A3B, 0x2A3C,
  0x2A3D, 0x2A3E,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E285_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2778, 0x2779, 0x277A,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2D35, 0x2D36, 0x2D37, 0x2D38, 0x2D39, 0x2D3A, 0x2D3B, 0x2D3C,
+ 0x2D3D, 0x2D3E, 0x2D3F, 0x2D57,      0,      0,      0,      0,
+ 0x2C35, 0x2C36, 0x2C37, 0x2C38, 0x2C39, 0x2C3A, 0x2C3B, 0x2C3C,
+ 0x2C3D, 0x2C3E, 0x2C3F, 0x2C40,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E286[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2659,6 +3967,16 @@ static const unsigned short utf8_to_euc_E286[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E286_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x222B, 0x222C, 0x222A, 0x222D, 0x2271,      0, 0x2327, 0x2325,
+ 0x2326, 0x2328,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E287[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2669,6 +3987,16 @@ static const unsigned short utf8_to_euc_E287[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E287_x0213[] = {
+      0,      0,      0,      0, 0x2329,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x224D,      0, 0x224E,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x232B, 0x232C,
+ 0x232A, 0x232D,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E288[] = {
  0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260,
  0x223A,      0,      0, 0x223B,      0,      0,      0,      0,
@@ -2699,6 +4027,16 @@ static const unsigned short utf8_to_euc_E288_mac[] = {
       0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
       0,      0,      0,      0,      0, 0x2266,      0,      0,
 };
+static const unsigned short utf8_to_euc_E288_x0213[] = {
+ 0x224F,      0, 0x225F, 0x2250,      0, 0x2247,      0, 0x2260,
+ 0x223A, 0x2246,      0, 0x223B,      0,      0,      0,      0,
+      0, 0x2D74, 0x215D, 0x235B,      0,      0,      0,      0,
+      0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2D78,
+ 0x225C,      0,      0,      0,      0, 0x2254, 0x2255, 0x224A,
+ 0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2D73,      0,
+      0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
+      0,      0,      0,      0,      0, 0x2266,      0,      0,
+};
 static const unsigned short utf8_to_euc_E289[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2709,6 +4047,16 @@ static const unsigned short utf8_to_euc_E289[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E289_x0213[] = {
+      0,      0,      0, 0x226C,      0, 0x226D,      0,      0,
+ 0x226E,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2262,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2162, 0x2261, 0x226B,      0,      0,      0, 0x2165, 0x2166,
+      0,      0, 0x2263, 0x2264,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x226F, 0x2270,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E28A[] = {
       0,      0, 0x223E, 0x223F,      0,      0, 0x223C, 0x223D,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2729,6 +4077,26 @@ static const unsigned short utf8_to_euc_E28A_mac[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0, 0x2F23,
 };
+static const unsigned short utf8_to_euc_E28A_x0213[] = {
+      0,      0, 0x223E, 0x223F, 0x2242, 0x2243, 0x223C, 0x223D,
+      0,      0, 0x2244, 0x2245,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x2251, 0x2252, 0x2253,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x225D,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x2D79,
+};
+static const unsigned short utf8_to_euc_E28B_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2776, 0x2777,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E28C[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2739,6 +4107,46 @@ static const unsigned short utf8_to_euc_E28C[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E28C_x0213[] = {
+      0,      0,      0,      0,      0, 0x2248, 0x2249,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x225E,      0,      0,      0,      0,      0,
+ 0x277C,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E28E_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x2742, 0x2743,
+};
+static const unsigned short utf8_to_euc_E28F_x0213[] = {
+ 0x2744, 0x2745, 0x2746, 0x2747, 0x2748, 0x2749, 0x274A, 0x274B,
+ 0x274C, 0x274D, 0x274E, 0x274F, 0x2750,      0, 0x277E,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E290_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x277D,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E291[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2759,6 +4167,16 @@ static const unsigned short utf8_to_euc_E291_mac[] = {
  0x2931, 0x2932, 0x2933, 0x2934,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E293_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2C41, 0x2C42, 0x2C43, 0x2C44, 0x2C45, 0x2C46, 0x2C47, 0x2C48,
+ 0x2C49, 0x2C4A, 0x2C4B, 0x2C4C, 0x2C4D, 0x2C4E, 0x2C4F, 0x2C50,
+ 0x2C51, 0x2C52, 0x2C53, 0x2C54, 0x2C55, 0x2C56, 0x2C57, 0x2C58,
+ 0x2C59, 0x2C5A,      0, 0x2C2B, 0x2C2C, 0x2C2D, 0x2C2E, 0x2C2F,
+ 0x2C30, 0x2C31, 0x2C32, 0x2C33, 0x2C34, 0x265A, 0x265B, 0x265C,
+ 0x265D, 0x265E, 0x265F, 0x2660, 0x2661, 0x2662, 0x2663,      0,
+};
 static const unsigned short utf8_to_euc_E294[] = {
  0x2821, 0x282C, 0x2822, 0x282D,      0,      0,      0,      0,
       0,      0,      0,      0, 0x2823,      0,      0, 0x282E,
@@ -2789,6 +4207,16 @@ static const unsigned short utf8_to_euc_E296[] = {
       0,      0, 0x2225, 0x2224,      0,      0,      0,      0,
       0,      0,      0,      0, 0x2227, 0x2226,      0,      0,
 };
+static const unsigned short utf8_to_euc_E296_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2223, 0x2222,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x266D, 0x2225, 0x2224,      0,      0, 0x2322, 0x2321,
+      0,      0,      0,      0, 0x2227, 0x2226,      0,      0,
+};
 static const unsigned short utf8_to_euc_E297[] = {
       0,      0,      0,      0,      0,      0, 0x2221, 0x217E,
       0,      0,      0, 0x217B,      0,      0, 0x217D, 0x217C,
@@ -2799,6 +4227,16 @@ static const unsigned short utf8_to_euc_E297[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E297_x0213[] = {
+ 0x2324, 0x2323,      0,      0,      0,      0, 0x2221, 0x217E,
+      0, 0x233B,      0, 0x217B,      0,      0, 0x217D, 0x217C,
+ 0x2867, 0x2868, 0x2869, 0x286A,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x233F,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x227E,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E298[] = {
       0,      0,      0,      0,      0, 0x217A, 0x2179,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2809,6 +4247,16 @@ static const unsigned short utf8_to_euc_E298[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E298_x0213[] = {
+ 0x2668, 0x2669, 0x266A, 0x266B,      0, 0x217A, 0x2179,      0,
+      0,      0,      0,      0,      0,      0, 0x2667,      0,
+      0,      0,      0,      0,      0,      0, 0x2664, 0x2665,
+      0,      0,      0,      0,      0,      0, 0x2D7E,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E299[] = {
  0x216A,      0, 0x2169,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2819,6 +4267,66 @@ static const unsigned short utf8_to_euc_E299[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E299_x0213[] = {
+ 0x216A,      0, 0x2169,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x263A, 0x263D, 0x263B, 0x2640, 0x2639, 0x263E, 0x263C, 0x263F,
+ 0x266C, 0x227D, 0x2276, 0x227B, 0x227C, 0x2275, 0x227A, 0x2274,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E29C_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x277B,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E29D_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x2D7D,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x2C21, 0x2C22,
+ 0x2C23, 0x2C24, 0x2C25, 0x2C26, 0x2C27, 0x2C28, 0x2C29, 0x2C2A,
+};
+static const unsigned short utf8_to_euc_E2A4_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x232E, 0x232F,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E2A6_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x233A,
+};
+static const unsigned short utf8_to_euc_E2A7_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x237D, 0x237E,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E380[] = {
  0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B,
  0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
@@ -2839,6 +4347,16 @@ static const unsigned short utf8_to_euc_E380_932[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E380_x0213[] = {
+ 0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B,
+ 0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
+ 0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D, 0x225A, 0x225B,
+ 0x2258, 0x2259,      0,      0, 0x2141, 0x2D60,      0, 0x2D61,
+ 0x2666,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2233, 0x2234, 0x2235,      0,      0,
+      0,      0,      0, 0x2236, 0x2237, 0x233C,      0,      0,
+};
 static const unsigned short utf8_to_euc_E381[] = {
       0, 0x2421, 0x2422, 0x2423, 0x2424, 0x2425, 0x2426, 0x2427,
  0x2428, 0x2429, 0x242A, 0x242B, 0x242C, 0x242D, 0x242E, 0x242F,
@@ -2869,6 +4387,16 @@ static const unsigned short utf8_to_euc_E382_932[] = {
  0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
  0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
 };
+static const unsigned short utf8_to_euc_E382_x0213[] = {
+ 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
+ 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
+ 0x2470, 0x2471, 0x2472, 0x2473, 0x2474, 0x2475, 0x2476,      0,
+      0,      0,      0, 0x212B, 0x212C, 0x2135, 0x2136, 0x2239,
+ 0x237B, 0x2521, 0x2522, 0x2523, 0x2524, 0x2525, 0x2526, 0x2527,
+ 0x2528, 0x2529, 0x252A, 0x252B, 0x252C, 0x252D, 0x252E, 0x252F,
+ 0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
+ 0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
+};
 static const unsigned short utf8_to_euc_E383[] = {
  0x2540, 0x2541, 0x2542, 0x2543, 0x2544, 0x2545, 0x2546, 0x2547,
  0x2548, 0x2549, 0x254A, 0x254B, 0x254C, 0x254D, 0x254E, 0x254F,
@@ -2879,6 +4407,26 @@ static const unsigned short utf8_to_euc_E383[] = {
  0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576,      0,
       0,      0,      0, 0x2126, 0x213C, 0x2133, 0x2134,      0,
 };
+static const unsigned short utf8_to_euc_E383_x0213[] = {
+ 0x2540, 0x2541, 0x2542, 0x2543, 0x2544, 0x2545, 0x2546, 0x2547,
+ 0x2548, 0x2549, 0x254A, 0x254B, 0x254C, 0x254D, 0x254E, 0x254F,
+ 0x2550, 0x2551, 0x2552, 0x2553, 0x2554, 0x2555, 0x2556, 0x2557,
+ 0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E, 0x255F,
+ 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567,
+ 0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x256D, 0x256E, 0x256F,
+ 0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576, 0x2772,
+ 0x2773, 0x2774, 0x2775, 0x2126, 0x213C, 0x2133, 0x2134, 0x2238,
+};
+static const unsigned short utf8_to_euc_E387_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x266E, 0x266F, 0x2670, 0x2671, 0x2672, 0x2673, 0x2674, 0x2675,
+ 0x2676, 0x2677, 0x2679, 0x267A, 0x267B, 0x267C, 0x267D, 0x267E,
+};
 static const unsigned short utf8_to_euc_E388[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2899,6 +4447,16 @@ static const unsigned short utf8_to_euc_E388_mac[] = {
       0, 0x2D2E, 0x2D31,      0,      0,      0,      0,      0,
       0, 0x2D2C,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E389_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x2841, 0x2842, 0x2843, 0x2844, 0x2845, 0x2846, 0x2847,
+ 0x2848, 0x2849, 0x284A, 0x284B, 0x284C, 0x284D, 0x284E, 0x284F,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E38A[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -2919,6 +4477,26 @@ static const unsigned short utf8_to_euc_E38A_mac[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E38A_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x2D65, 0x2D66, 0x2D67, 0x2D68,
+ 0x2D69,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x2850, 0x2851, 0x2852, 0x2853, 0x2854, 0x2855, 0x2856,
+ 0x2857, 0x2858, 0x2859, 0x285A, 0x285B, 0x285C, 0x285D, 0x285E,
+};
+static const unsigned short utf8_to_euc_E38B_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2C5B, 0x2C5C, 0x2C5D, 0x2C5E, 0x2C5F, 0x2C60, 0x2C61, 0x2C62,
+ 0x2C63, 0x2C64, 0x2C65, 0x2C66, 0x2C67, 0x2C68, 0x2C69, 0x2C6A,
+ 0x2C6B, 0x2C6C, 0x2C6D, 0x2C6E,      0, 0x2C71,      0,      0,
+      0, 0x2C70,      0,      0, 0x2C73, 0x2C72,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2C6F,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E38C[] = {
       0,      0,      0, 0x2D46,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0x2D4A,      0,      0,
@@ -2999,6 +4577,796 @@ static const unsigned short utf8_to_euc_E38F_mac[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E38F_x0213[] = {
+      0,      0,      0,      0, 0x2D55,      0,      0,      0,
+      0,      0,      0, 0x235E,      0, 0x2D63,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E390_x0213[] = {
+      0,      0, 0x2E23,      0,      0,      0, 0xA12D,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xA132,      0, 0xA133,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E391_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xA15E,      0, 0xA156,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E392_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xA17E,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x2E53,      0,      0,
+      0,      0,      0,      0, 0xA32B,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E393_x0213[] = {
+      0, 0xF468,      0,      0,      0,      0,      0, 0xA32F,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2E5B,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E394_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xA348,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E395_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xA35D, 0xA35E,      0,
+      0,      0,      0, 0xA361,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xA367,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E396_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xA423,      0,
+ 0xA426,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E397_x0213[] = {
+      0,      0,      0,      0,      0, 0xA42F,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xA438,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xA442,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E398_x0213[] = {
+      0,      0,      0,      0,      0, 0xA44A,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E399_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xA479,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E39A_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xA53F,      0,      0,      0,      0, 0xA543,      0,
+      0, 0xA541,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E39B_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xA557,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E39D_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xA823, 0xA825,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xA829, 0xA828,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xA82C,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E39E_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x4F5F,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E39F_x0213[] = {
+      0, 0xA83E,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x4F6F,      0,      0,      0,      0,      0,
+ 0xA856,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xA859,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xA85C,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3A0_x0213[] = {
+ 0xA85E,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xA86F,
+      0,      0,      0,      0,      0,      0, 0xA871,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3A1_x0213[] = {
+ 0xA874,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xA879,      0,      0,      0,
+      0, 0xA87B,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3A3_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xAC3B,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3A4_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xAC46,
+      0,      0, 0xAC4A,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3A5_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xAC60,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3A9_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xAD5B,      0,
+      0,      0,      0, 0xAD5F,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3AB_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xAD71, 0xAE36,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xAD7C,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3AC_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xAE2E,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xAE32,      0, 0xAE34,      0,      0,      0,
+      0,      0, 0x7549,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3AD_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xAE6D,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xAE65,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3AE_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0, 0xAF28,
+ 0xAF29,      0,      0,      0,      0, 0xAF2C,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xAF34,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x757E,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3AF_x0213[] = {
+      0,      0,      0, 0x7621,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xAF48,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xAF5D,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3B0_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x763A,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xAF77,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3B3_x0213[] = {
+      0,      0,      0, 0xEE3B,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xEE42,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3B4_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xEE71,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xEE7E,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3B5_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xEF40,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3B6_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xEF54,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3B7_x0213[] = {
+ 0xEF70,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xEF77,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3B8_x0213[] = {
+      0,      0,      0,      0,      0, 0xF028,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x7766,
+};
+static const unsigned short utf8_to_euc_E3B9_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xF03F,      0,      0,      0,      0,      0, 0xF041,      0,
+ 0xF042,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3BA_x0213[] = {
+      0,      0,      0, 0xF049,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xF050,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3BD_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xF134,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x784D,      0,      0, 0xF146,      0, 0xF148,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3BE_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xF15C,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E3BF_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xF167,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xF16C,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E480_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xF222,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E481_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xF22D,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E482_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xF239,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E484_x0213[] = {
+      0,      0,      0,      0,      0, 0xF264,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E485_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xF274,      0,      0,      0,      0,      0,      0, 0xF277,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xF27D,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E486_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xF333,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xF337,
+};
+static const unsigned short utf8_to_euc_E487_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xF347,      0,
+      0,      0,      0,      0,      0,      0, 0xF34B,      0,
+      0,      0,      0, 0xF348,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E488_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0, 0xF353,
+      0,      0,      0,      0,      0,      0, 0xF357,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E489_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x796D,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E48B_x0213[] = {
+      0,      0,      0,      0,      0,      0, 0xF42B,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xF436,      0,
+      0,      0,      0,      0,      0, 0xF43B,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E48C_x0213[] = {
+      0,      0, 0xF44E,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xF45D,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E48D_x0213[] = {
+      0,      0,      0, 0xF461,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E48F_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xF53E,      0,
+ 0xF542,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E490_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xF548,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xF54A,
+      0,      0,      0,      0, 0xF54C,      0,      0,      0,
+      0,      0, 0xF54F,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E491_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x7A59,      0,      0,      0,      0,
+      0,      0,      0, 0x7A5A,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xF56C,      0,
+      0,      0, 0xF56E,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E492_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xF577,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xF635,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xF632,      0,
+};
+static const unsigned short utf8_to_euc_E493_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xF634,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E494_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xF659,      0,      0,      0,      0, 0xF654,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xF66D,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E495_x0213[] = {
+      0,      0,      0, 0xF66E,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E496_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x7B51,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xF74F,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E497_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xF76C,      0,      0,
+      0,      0, 0x7B60,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E498_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xF824,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E499_x0213[] = {
+      0, 0xF83A,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xF843,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E49A_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xF84E,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xF853,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E49C_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xF86B,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E49D_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xF929,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E49F_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xF93F,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4A0_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xF949,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4A1_x0213[] = {
+      0,      0,      0,      0, 0x7C4B,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xF95C,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4A2_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFA27,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4A6_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x7D58,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4A7_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xFB6A,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFB70,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4A8_x0213[] = {
+      0,      0,      0,      0, 0xFB75,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFB78,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4AA_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFC37,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4AC_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFC55,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4AF_x0213[] = {
+      0,      0, 0xFD26,      0,      0,      0,      0,      0,
+      0,      0, 0xFD28,      0,      0,      0,      0,      0,
+      0,      0, 0xFD2A,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFD31,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4B0_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x7E3E,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFD3F,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4B3_x0213[] = {
+      0,      0,      0,      0, 0xFE2A,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFE2D,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4B4_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0, 0xFE4B,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_E4B5_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xFE60,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E4B8[] = {
  0x306C, 0x437A, 0xB021, 0x3C37, 0xB022, 0xB023,      0, 0x4B7C,
  0x3E66, 0x3B30, 0x3E65, 0x323C, 0xB024, 0x4954, 0x4D3F,      0,
@@ -3009,6 +5377,16 @@ static const unsigned short utf8_to_euc_E4B8[] = {
  0xB02D, 0x5025, 0x367A,      0,      0, 0xB02E, 0x5026,      0,
  0x345D, 0x4330,      0, 0x3C67, 0x5027,      0,      0, 0x5028,
 };
+static const unsigned short utf8_to_euc_E4B8_x0213[] = {
+ 0x306C, 0x437A, 0xA122, 0x3C37, 0xB022, 0xB023,      0, 0x4B7C,
+ 0x3E66, 0x3B30, 0x3E65, 0x323C, 0xB024, 0x4954, 0x4D3F, 0xA123,
+ 0x5022, 0x312F, 0xA124,      0, 0x336E, 0x5023, 0x4024, 0x5242,
+ 0x3556, 0x4A3A,      0,      0,      0,      0, 0x3E67, 0xB026,
+      0, 0x4E3E,      0, 0xB027, 0xB028,      0, 0x4A42,      0,
+ 0x2E24, 0xA125, 0x5024, 0xA126, 0xF02E, 0x4366, 0xA127, 0x2E25,
+ 0x2E26, 0x5025, 0x367A,      0,      0, 0xB02E, 0x5026,      0,
+ 0x345D, 0x4330,      0, 0x3C67, 0x5027,      0,      0, 0x5028,
+};
 static const unsigned short utf8_to_euc_E4B9[] = {
  0xB02F, 0xB030, 0x5029, 0x4735, 0xB031, 0x3557,      0, 0xB032,
       0,      0,      0, 0x4737,      0, 0x4663, 0x3843, 0x4B33,
@@ -3019,6 +5397,16 @@ static const unsigned short utf8_to_euc_E4B9[] = {
       0, 0x4D70,      0, 0x467D, 0xB039, 0xB03A,      0,      0,
       0, 0xB03B,      0,      0,      0,      0, 0x3425, 0xB03C,
 };
+static const unsigned short utf8_to_euc_E4B9_x0213[] = {
+ 0xA128, 0xB030, 0x5029, 0x4735, 0xB031, 0x3557,      0, 0xA129,
+ 0xA12A,      0,      0, 0x4737,      0, 0x4663, 0x3843, 0x4B33,
+      0, 0xA12C,      0,      0,      0, 0x6949, 0x502A, 0x3E68,
+ 0x502B, 0x3235, 0xA12F,      0, 0xB035, 0x3665, 0x3870, 0x4C69,
+      0,      0, 0x5626, 0xB036,      0,      0,      0,      0,
+ 0xB037, 0xA130,      0,      0,      0,      0,      0,      0,
+      0, 0x4D70,      0, 0x467D, 0xB039, 0xB03A,      0,      0,
+      0, 0xB03B,      0,      0,      0,      0, 0x3425, 0xB03C,
+};
 static const unsigned short utf8_to_euc_E4BA[] = {
  0x3535,      0, 0x502C,      0,      0, 0x502D, 0x4E3B,      0,
  0x4D3D, 0x4168, 0x502F, 0x3B76, 0x4673, 0xB03D, 0x5032,      0,
@@ -3029,6 +5417,16 @@ static const unsigned short utf8_to_euc_E4BA[] = {
  0x5037,      0,      0, 0x5038,      0,      0, 0x5039,      0,
       0, 0xB042, 0x3F4D,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E4BA_x0213[] = {
+ 0x3535,      0, 0x502C,      0,      0, 0x502D, 0x4E3B,      0,
+ 0x4D3D, 0x4168, 0x502F, 0x3B76, 0x4673, 0x2E27, 0x5032,      0,
+      0, 0x313E, 0x385F,      0, 0x385E, 0x3066, 0xB03E, 0xB03F,
+ 0x4F4B, 0x4F4A,      0, 0x3A33, 0x3021, 0xA131, 0x5033, 0x5034,
+ 0x5035, 0x4B34, 0x5036,      0, 0x3872, 0x3067, 0x4B72,      0,
+ 0x357C,      0,      0, 0x357D, 0x357E, 0x4462, 0x4E3C, 0xB041,
+ 0x5037,      0,      0, 0x5038,      0,      0, 0x5039,      0,
+      0, 0xA134, 0x3F4D, 0xA135, 0xA137,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E4BB[] = {
  0x3D3A, 0x3F4E, 0x503E, 0xB043, 0x503C,      0, 0x503D, 0x3558,
       0,      0, 0x3A23, 0x3270,      0, 0x503B, 0x503A, 0x4A29,
@@ -3039,6 +5437,16 @@ static const unsigned short utf8_to_euc_E4BB[] = {
  0x3644, 0xB04C, 0x4367, 0xB04D,      0, 0xB04E, 0x376F, 0x5043,
       0,      0,      0, 0x4724, 0xF42F, 0xB04F, 0xB050, 0xB051,
 };
+static const unsigned short utf8_to_euc_E4BB_x0213[] = {
+ 0x3D3A, 0x3F4E, 0x503E, 0xA138, 0x503C,      0, 0x503D, 0x3558,
+ 0xA139,      0, 0x3A23, 0x3270,      0, 0x503B, 0x503A, 0x4A29,
+ 0xA13A,      0,      0,      0, 0x3B46, 0x3B45, 0x423E, 0x503F,
+ 0x4955, 0x4067, 0xA13C, 0xB046,      0, 0x2138, 0x5040, 0x5042,
+ 0xB047, 0x2E28, 0xB049, 0x4265, 0x4E61, 0x304A,      0,      0,
+ 0xB04A,      0,      0, 0xA13B,      0, 0x5041, 0x323E, 0xB04B,
+ 0x3644, 0xA13D, 0x4367, 0xB04D,      0, 0xA13E, 0x376F, 0x5043,
+      0,      0,      0, 0x4724,      0, 0x2E29, 0xB050, 0x2E2A,
+};
 static const unsigned short utf8_to_euc_E4BC[] = {
  0xB052, 0x346B, 0xB053, 0xB054,      0,      0,      0,      0,
  0xB055, 0x5044, 0x304B, 0xB056, 0xB057, 0x3860, 0x346C, 0x497A,
@@ -3049,6 +5457,16 @@ static const unsigned short utf8_to_euc_E4BC[] = {
  0x5046, 0xB05E,      0, 0xB060, 0x483C, 0xB061, 0x4E62, 0xB062,
  0x3F2D, 0xB063, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xB065,      0,
 };
+static const unsigned short utf8_to_euc_E4BC_x0213[] = {
+ 0xA13F, 0x346B, 0xB053, 0x2E2B,      0,      0,      0,      0,
+ 0xB055, 0x5044, 0x304B, 0x2E2C, 0xB057, 0x3860, 0x346C, 0x497A,
+ 0x4832, 0x3559, 0xB058,      0,      0, 0xB059, 0xA140, 0xB05B,
+      0, 0xB05C, 0x3271,      0, 0x5067, 0x4541,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xB05D, 0x476C,
+ 0x5046, 0xB05E,      0, 0xB060, 0x483C, 0xB061, 0x4E62, 0xA142,
+ 0x3F2D,      0, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xA143,      0,
+};
 static const unsigned short utf8_to_euc_E4BD[] = {
  0xB066,      0, 0xB067, 0x4451,      0,      0, 0x4322, 0x504A,
  0xB068, 0xB069,      0, 0xB06A, 0xB06B, 0x304C, 0x4463, 0x3D3B,
@@ -3059,6 +5477,16 @@ static const unsigned short utf8_to_euc_E4BD[] = {
  0x5051, 0xB075,      0, 0x3242,      0, 0x4A3B, 0x504B, 0xB076,
  0xB077, 0xB078, 0xB079, 0x504F, 0x3873, 0xB07A, 0xB07B, 0x3B48,
 };
+static const unsigned short utf8_to_euc_E4BD_x0213[] = {
+ 0xB066,      0, 0xB067, 0x4451,      0,      0, 0x4322, 0x504A,
+ 0x2E2E, 0x2E2F,      0, 0xB06A, 0xB06B, 0x304C, 0x4463, 0x3D3B,
+ 0x3A34, 0x4D24, 0xB06C, 0x424E, 0xA144, 0x323F, 0x2E30, 0x5049,
+ 0xA145, 0x4D3E, 0x5045, 0x5047, 0x3A6E, 0x5048, 0x5524, 0x2E31,
+ 0x2E2D,      0,      0, 0xB071, 0xA141,      0,      0,      0,
+      0, 0x5050, 0x2E32,      0, 0x2E33,      0, 0xB074, 0x5053,
+ 0x5051, 0xB075,      0, 0x3242,      0, 0x4A3B, 0x504B, 0xA147,
+ 0xA148, 0xB078, 0xA149, 0x504F, 0x3873, 0xA14A, 0x2E34, 0x3B48,
+};
 static const unsigned short utf8_to_euc_E4BE[] = {
       0, 0xB07C, 0xB07D, 0x3426, 0xB07E, 0xB121, 0x5054,      0,
  0x504C, 0xB122, 0xB123, 0x4E63, 0xB124, 0x3B78, 0xB125, 0x504D,
@@ -3069,6 +5497,16 @@ static const unsigned short utf8_to_euc_E4BE[] = {
       0,      0, 0xB12F,      0,      0, 0x3F2F, 0x4E37, 0xB130,
       0, 0xB131,      0, 0xB132, 0xB133, 0xB134, 0xB135, 0x4A58,
 };
+static const unsigned short utf8_to_euc_E4BE_x0213[] = {
+      0, 0xB07C, 0xA14B, 0x3426, 0xB07E, 0xA14C, 0x5054,      0,
+ 0x504C, 0xB122, 0x2E35, 0x4E63, 0xB124, 0x3B78, 0xB125, 0x504D,
+ 0xB126, 0x5052, 0xA14D, 0xB128, 0x2E36,      0, 0x5055, 0x2E37,
+ 0x504E, 0xB12B, 0xA14E, 0x3621,      0, 0x304D, 0xB12D, 0xB12E,
+ 0x3622, 0x3241,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x5525,      0, 0x4B79, 0x496E, 0x3874,
+      0,      0, 0xA150,      0,      0, 0x3F2F, 0x4E37, 0xB130,
+      0, 0xB131,      0, 0xB132, 0xB133, 0xB134, 0xA151, 0x4A58,
+};
 static const unsigned short utf8_to_euc_E4BF[] = {
  0xB136, 0xB137, 0x3738, 0x4225, 0x3264, 0xB138, 0xB139,      0,
  0xB13A, 0xB13B, 0x3D53, 0xB13C, 0xB13D, 0xB13E, 0x5059, 0xB13F,
@@ -3079,6 +5517,16 @@ static const unsigned short utf8_to_euc_E4BF[] = {
  0xB144,      0, 0xB145, 0x4750,      0, 0x4936, 0x5068,      0,
  0x4A70,      0, 0x3236,      0, 0xB146, 0xB147, 0x506C, 0xB148,
 };
+static const unsigned short utf8_to_euc_E4BF_x0213[] = {
+ 0xB136, 0xB137, 0x3738, 0x4225, 0x3264, 0xA152, 0xB139,      0,
+ 0xB13A, 0x2E39, 0x3D53, 0xA153, 0xB13D,      0, 0x5059, 0xA154,
+ 0x505E, 0x505C, 0xA155,      0, 0x5057,      0,      0, 0x422F,
+ 0x505A,      0, 0x505D, 0x505B, 0xB141, 0x4A5D,      0, 0x5058,
+ 0x2E3A, 0x3F2E, 0xB143, 0x4B73, 0x505F, 0x5060, 0xA14F,      0,
+      0,      0,      0,      0,      0,      0, 0x3D24, 0x506D,
+ 0xB144, 0x2E21, 0xA157, 0x4750,      0, 0x4936, 0x5068,      0,
+ 0x4A70,      0, 0x3236,      0, 0xB146, 0xB147, 0x506C,      0,
+};
 static const unsigned short utf8_to_euc_E580[] = {
  0xB149, 0xB14A,      0,      0, 0xB14B, 0x5066, 0x506F, 0xB14C,
       0, 0x4152, 0xB14D, 0x3844, 0xB14E, 0x475C, 0xB14F, 0x6047,
@@ -3089,6 +5537,16 @@ static const unsigned short utf8_to_euc_E580[] = {
  0xB15B,      0, 0xB15C, 0xB15D,      0, 0xB15E, 0x3666,      0,
       0, 0x3770,      0, 0xB176,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E580_x0213[] = {
+ 0xA158, 0x2E3B, 0x2E3C,      0, 0xB14B, 0x5066, 0x506F, 0xB14C,
+      0, 0x4152, 0xB14D, 0x3844, 0xB14E, 0x475C, 0x2E3D, 0x6047,
+ 0xA159, 0x506E, 0x455D, 0xA15A, 0x5063,      0, 0x3876, 0xB152,
+ 0x2E3E, 0x3875, 0x5061, 0xB154, 0xA15B, 0xB156, 0xA15C, 0x3C5A,
+      0, 0x5069, 0xA15D, 0x4A6F, 0x434D, 0x5065, 0x3771, 0x2E3F,
+ 0x5062, 0x506A, 0x5064, 0x4E51, 0x506B, 0x4F41, 0x2E40,      0,
+ 0xB15B,      0, 0xB15C, 0xB15D,      0, 0xB15E, 0x3666,      0,
+      0, 0x3770,      0, 0x2E42,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E581[] = {
  0xB15F, 0xB160, 0xB161, 0x5070,      0, 0xB162, 0xB163, 0x5071,
  0x5075, 0x304E, 0xB164,      0, 0xB165,      0, 0xB166, 0x4A50,
@@ -3099,6 +5557,16 @@ static const unsigned short utf8_to_euc_E581[] = {
  0xB174, 0xB175, 0x3C45,      0, 0x4226, 0x4465, 0x3676,      0,
  0x5079,      0,      0,      0,      0, 0x3536,      0,      0,
 };
+static const unsigned short utf8_to_euc_E581_x0213[] = {
+ 0x2E41, 0x2E43, 0xA15F, 0x5070,      0, 0xB162, 0xA160, 0x5071,
+ 0x5075, 0x304E, 0xB164,      0, 0xB165,      0, 0xA161, 0x4A50,
+ 0x5074, 0xB167, 0xB168, 0xA162,      0, 0x5073, 0x5077, 0xA163,
+      0, 0xB16B, 0x5076,      0, 0x4464,      0,      0, 0xB16C,
+ 0xB16D,      0, 0xB16E, 0xA164,      0, 0x3772, 0xA165, 0xB171,
+      0,      0, 0xA166,      0, 0x5078, 0xB173,      0,      0,
+ 0xA167, 0xB175, 0x3C45,      0, 0x4226, 0x4465, 0x3676,      0,
+ 0x5079,      0,      0,      0,      0, 0x3536,      0,      0,
+};
 static const unsigned short utf8_to_euc_E582[] = {
  0x507A, 0xB177,      0, 0xB178, 0xB179, 0x507C, 0xB17A,      0,
       0,      0, 0xB17B,      0,      0, 0x4B35, 0xB17C, 0xB17D,
@@ -3109,6 +5577,16 @@ static const unsigned short utf8_to_euc_E582[] = {
  0xB22E,      0, 0x507E, 0x5123, 0x507D, 0x3A44,      0, 0x3D7D,
       0, 0xB22F, 0xB230,      0,      0, 0xB231, 0x3739,      0,
 };
+static const unsigned short utf8_to_euc_E582_x0213[] = {
+ 0x507A, 0xB177,      0, 0xB178, 0xB179, 0x507C, 0xB17A,      0,
+ 0xA169,      0, 0xB17B,      0,      0, 0x4B35, 0xB17C, 0xB17D,
+ 0xB17E, 0x3766, 0xA16A, 0xA16B, 0x2E44, 0xA16C, 0xA16D,      0,
+ 0x3B31, 0x4877, 0x507B, 0xB225, 0xA16E,      0, 0xB227, 0xB228,
+ 0xB229, 0xB22A, 0xB22B, 0xA168,      0,      0,      0,      0,
+      0,      0, 0xA16F,      0, 0x3A45, 0x4D43,      0, 0xB22D,
+ 0xB22E, 0xA171, 0x507E, 0x5123, 0x507D, 0x3A44,      0, 0x3D7D,
+      0, 0xB22F, 0xA172, 0xA173,      0, 0xB231, 0x3739,      0,
+};
 static const unsigned short utf8_to_euc_E583[] = {
  0xB232,      0, 0x5124, 0xB233, 0xB234, 0x364F,      0, 0xB235,
       0, 0x5121, 0x5122,      0, 0xB236, 0x462F, 0xB237, 0x417C,
@@ -3119,6 +5597,16 @@ static const unsigned short utf8_to_euc_E583[] = {
       0, 0xB245, 0xB251,      0, 0xF430, 0x512C, 0xB246,      0,
       0, 0x512B, 0xB247, 0x4A48,      0,      0, 0xB248,      0,
 };
+static const unsigned short utf8_to_euc_E583_x0213[] = {
+ 0xB232,      0, 0x5124, 0xB233, 0xA174, 0x364F,      0, 0xA175,
+      0, 0x5121, 0x5122,      0, 0x2E45, 0x462F, 0xA178, 0x417C,
+ 0x2E47, 0x3623,      0, 0xB239, 0xA17A, 0x4B4D, 0x5125,      0,
+      0, 0xA17B, 0x4E3D,      0, 0xB23C, 0xB23D, 0x5126, 0xB23E,
+      0, 0xA17C, 0xB23F, 0x5129, 0xB240, 0x5127, 0x2E48, 0x414E,
+ 0xB242, 0xA17D,      0,      0,      0, 0x5128, 0x512A, 0xB244,
+      0, 0xB245, 0x2E46, 0xA176,      0, 0x512C, 0xB246,      0,
+      0, 0x512B, 0xB247, 0x4A48,      0,      0, 0xB248,      0,
+};
 static const unsigned short utf8_to_euc_E584[] = {
  0x3537, 0x512E, 0x512F, 0xB249, 0x322F,      0, 0xB24A, 0xB24B,
  0xB24C, 0x512D,      0, 0xB24D, 0xB24E, 0xB24F, 0xB250,      0,
@@ -3129,6 +5617,16 @@ static const unsigned short utf8_to_euc_E584[] = {
       0, 0xB25F, 0x4C59, 0xB260, 0xB261, 0xB262,      0, 0x5136,
  0xB263, 0xB264, 0x5135, 0x5138, 0x5137,      0,      0, 0x5139,
 };
+static const unsigned short utf8_to_euc_E584_x0213[] = {
+ 0x3537, 0x512E, 0x512F, 0x2E4B, 0x322F,      0, 0x2E4A, 0xB24B,
+ 0xA321, 0x512D,      0, 0x2E4C, 0xB24E, 0xB24F, 0xB250,      0,
+ 0xB252,      0, 0x3C74,      0, 0x5132, 0x5131, 0x5130, 0xA323,
+ 0x5056, 0xB254, 0x5133, 0xA324, 0xB256, 0xB257, 0x2E4D, 0x3D7E,
+      0, 0x5134,      0, 0xB259,      0,      0,      0, 0xB25A,
+ 0xB25B,      0, 0x4D25,      0, 0xB25C, 0xB25D,      0, 0xB25E,
+      0, 0xB25F, 0x4C59, 0xB260, 0xB261, 0x2E4E,      0, 0x5136,
+ 0xB263, 0xB264, 0x5135, 0x5138, 0x5137,      0,      0, 0x5139,
+};
 static const unsigned short utf8_to_euc_E585[] = {
  0x513A, 0x3074, 0xB265, 0x3835, 0x373B, 0x3D3C, 0x437B, 0x3624,
  0x4068, 0x3877, 0xB266, 0x396E, 0x513C, 0x4C48, 0x4546, 0xB267,
@@ -3139,6 +5637,16 @@ static const unsigned short utf8_to_euc_E585[] = {
       0, 0x3626,      0,      0,      0, 0x4A3C, 0x4236, 0x3671,
  0x4535,      0,      0,      0, 0x3773,      0, 0xB26F,      0,
 };
+static const unsigned short utf8_to_euc_E585_x0213[] = {
+ 0x513A, 0x3074, 0xB265, 0x3835, 0x373B, 0x3D3C, 0x437B, 0x3624,
+ 0x4068, 0x3877, 0x2E4F, 0x396E, 0x513C, 0x4C48, 0x4546, 0xB267,
+ 0x3B79,      0, 0x513B, 0xB268, 0x513D, 0x2E51,      0, 0x2E52,
+ 0xB26B,      0, 0x455E,      0, 0x3375,      0,      0, 0xB26C,
+ 0xA326,      0, 0x513E,      0,      0, 0x467E, 0xB26E,      0,
+ 0x4134, 0x5140, 0x5141, 0x482C, 0x3878, 0x4F3B, 0x5142,      0,
+      0, 0x3626,      0, 0xA328,      0, 0x4A3C, 0x4236, 0x3671,
+ 0x4535,      0,      0, 0xF474, 0x3773,      0, 0xB26F,      0,
+};
 static const unsigned short utf8_to_euc_E586[] = {
  0x5143,      0, 0x5144, 0xB270, 0xB271, 0x4662, 0x315F,      0,
       0, 0x5147, 0x3A7D, 0xB272, 0x5146, 0x3A46, 0xB273, 0x5148,
@@ -3149,6 +5657,16 @@ static const unsigned short utf8_to_euc_E586[] = {
  0x5156, 0x5154, 0x5155, 0x5153, 0x3A63, 0x5157, 0x4C6A, 0x4E64,
  0xB279,      0, 0xB27A,      0, 0xB27B, 0x5158, 0xB27C, 0xB27D,
 };
+static const unsigned short utf8_to_euc_E586_x0213[] = {
+ 0x5143,      0, 0x5144, 0xA329, 0xB271, 0x4662, 0x315F,      0,
+      0, 0x5147, 0x3A7D, 0xA32A, 0x5146, 0x3A46, 0xB273, 0x5148,
+ 0x666E, 0x5149, 0x4B41, 0x514A,      0, 0x514B, 0x514C, 0x3E69,
+ 0xA32C, 0x3C4C,      0,      0,      0, 0x2E54,      0,      0,
+ 0x3427, 0xB276, 0x514F, 0xA32D, 0x514D, 0x4C3D, 0x514E,      0,
+ 0x495A, 0x5150, 0x5151, 0x5152, 0x455F, 0xA32E,      0,      0,
+ 0x5156, 0x5154, 0x5155, 0x5153, 0x3A63, 0x5157, 0x4C6A, 0x4E64,
+ 0xB279,      0, 0xB27A,      0, 0xA330, 0x5158,      0, 0xB27D,
+};
 static const unsigned short utf8_to_euc_E587[] = {
       0,      0, 0xB27E,      0, 0x4028, 0x5159, 0x3D5A,      0,
  0xB321, 0x515A,      0, 0x437C, 0x4E3F, 0x4560,      0, 0xB322,
@@ -3159,6 +5677,16 @@ static const unsigned short utf8_to_euc_E587[] = {
  0x5160, 0x332E, 0xB32C, 0xB32D, 0xB32E, 0x5161, 0x3627, 0xB32F,
  0x464C, 0x317A, 0x3D50,      0,      0, 0x4821, 0x5162,      0,
 };
+static const unsigned short utf8_to_euc_E587_x0213[] = {
+      0,      0, 0xB27E, 0x2E55, 0x4028, 0x5159, 0x3D5A,      0,
+ 0xB321, 0x515A, 0x2E56, 0x437C, 0x4E3F, 0x4560,      0, 0xB322,
+      0, 0xB323, 0xB324, 0xB325,      0, 0xB326, 0x5245,      0,
+ 0xB327,      0,      0, 0x515B, 0x7425, 0x3645, 0x2E57,      0,
+ 0x515C, 0x4B5E, 0x2E58,      0,      0, 0xB32A, 0x3D68, 0x427C,
+      0, 0x515E, 0x4664,      0,      0, 0x515F, 0x2E59,      0,
+ 0x5160, 0x332E, 0xB32C, 0xA333, 0xA334, 0x5161, 0x3627, 0xB32F,
+ 0x464C, 0x317A, 0x3D50,      0,      0, 0x4821, 0x5162,      0,
+};
 static const unsigned short utf8_to_euc_E588[] = {
  0x4561, 0xB330, 0xB331, 0x3F4F, 0x5163, 0xB332, 0x4A2C, 0x405A,
  0x3422,      0, 0x3429, 0x5164,      0,      0, 0x5166,      0,
@@ -3169,6 +5697,16 @@ static const unsigned short utf8_to_euc_E588[] = {
  0x457E, 0xB33A, 0xB33B, 0x516A,      0, 0xB33C, 0x4029, 0x3A7E,
  0x3774, 0x516B, 0x3B49, 0x396F, 0xB33D,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E588_x0213[] = {
+ 0x4561, 0x2E5A, 0xA335, 0x3F4F, 0x5163, 0xB332, 0x4A2C, 0x405A,
+ 0x3422,      0, 0x3429, 0x5164,      0,      0, 0x5166,      0,
+      0, 0x373A, 0xA336, 0x2E5C, 0x5165, 0x2E5D, 0xA337, 0x4E73,
+ 0xB337,      0,      0,      0,      0, 0x3D69,      0,      0,
+      0,      0, 0xB338,      0, 0x483D, 0x4A4C,      0, 0x5167,
+ 0xB339, 0x4D78, 0x5168,      0,      0,      0, 0x5169,      0,
+ 0x457E, 0xB33A, 0xB33B, 0x516A,      0, 0xB33C, 0x4029, 0x3A7E,
+ 0x3774, 0x516B, 0x3B49, 0x396F, 0xB33D,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E589[] = {
       0,      0,      0, 0x4466, 0x516D, 0xB33E,      0, 0x4227,
       0, 0xB33F, 0x3A6F, 0x516E, 0x516F, 0x4130,      0, 0x516C,
@@ -3179,6 +5717,16 @@ static const unsigned short utf8_to_euc_E589[] = {
  0x3E6A, 0x517B, 0x3364, 0x5175, 0x5173, 0x414F,      0, 0xB34A,
  0xB34B, 0xB34C,      0,      0,      0, 0x5177,      0, 0x5176,
 };
+static const unsigned short utf8_to_euc_E589_x0213[] = {
+      0,      0,      0, 0x4466, 0x516D, 0xB33E,      0, 0x4227,
+      0, 0x2E5E, 0x3A6F, 0x516E, 0x516F, 0x4130,      0, 0x516C,
+      0,      0,      0,      0, 0x5171, 0xA339, 0x4B36, 0x2E5F,
+ 0xB342,      0, 0xB343, 0x3964, 0xA33A, 0x2F7E, 0x5170, 0xB345,
+ 0xB346, 0x2E60,      0, 0x3775, 0x3A5E, 0x476D, 0xB348,      0,
+      0, 0x5174, 0x5172,      0, 0xA33B,      0, 0xB349, 0x497B,
+ 0x3E6A, 0x517B, 0x3364, 0x5175, 0x5173, 0x414F,      0, 0xA33C,
+ 0xB34B, 0xB34C,      0,      0,      0, 0x5177,      0, 0x5176,
+};
 static const unsigned short utf8_to_euc_E58A[] = {
  0xB34D,      0, 0xB34E, 0x3344,      0, 0xB34F,      0, 0x3760,
  0x517C, 0x4E2D, 0xB350,      0, 0xB351, 0x5178,      0,      0,
@@ -3189,6 +5737,16 @@ static const unsigned short utf8_to_euc_E58A[] = {
  0xB35E, 0x4E65,      0,      0, 0x4F2B, 0x5225, 0xB35F, 0xB360,
  0xB361, 0x387A, 0xB362, 0xB363, 0x5224, 0xB364, 0x332F,      0,
 };
+static const unsigned short utf8_to_euc_E58A_x0213[] = {
+ 0xB34D,      0, 0xA33E, 0x3344, 0xA33D, 0xB34F,      0, 0x3760,
+ 0x517C, 0x4E2D, 0xB350,      0, 0xB351, 0x5178,      0,      0,
+      0, 0x517D, 0x517A, 0x2E61, 0x5179, 0xB353, 0xB354, 0xB355,
+ 0xA340,      0, 0xB357, 0x4E4F,      0,      0,      0, 0x3879,
+ 0x3243,      0,      0, 0x4E74, 0xA342, 0xB35A, 0xA343, 0xB35C,
+      0, 0x3D75, 0x4558, 0x3965, 0x5222, 0x5223,      0, 0xA344,
+ 0xB35E, 0x4E65,      0,      0, 0x4F2B, 0x5225, 0xB35F, 0xB360,
+ 0xB361, 0x387A, 0xA345, 0xA346, 0x5224, 0xB364, 0x332F,      0,
+};
 static const unsigned short utf8_to_euc_E58B[] = {
  0xB365, 0x5226,      0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
  0xB368, 0x4A59,      0,      0, 0xB369, 0x5227,      0, 0xB36A,
@@ -3199,6 +5757,16 @@ static const unsigned short utf8_to_euc_E58B[] = {
  0xB376, 0xB377, 0x372E, 0x522E, 0xB378, 0x522F, 0xB379, 0xB37A,
  0x5230, 0x5231, 0x3C5B,      0,      0,      0, 0x387B, 0x4C5E,
 };
+static const unsigned short utf8_to_euc_E58B_x0213[] = {
+      0, 0x5226,      0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
+ 0x2E62, 0x4A59, 0xA347,      0, 0x2E64, 0x5227,      0, 0xB36A,
+ 0x2E65, 0xA349, 0x7055,      0, 0xB36C, 0x4630, 0x2E66, 0x5228,
+ 0x342A, 0x4C33,      0, 0x2E67, 0xB36F, 0x3E21, 0x5229, 0x4A67,
+ 0x522D, 0xB370, 0x402A, 0x522A, 0x3650, 0xB371, 0x522B, 0x342B,
+ 0xB372, 0xB373, 0xB374,      0, 0xB375,      0,      0,      0,
+ 0x2E69, 0xB377, 0x372E, 0x522E, 0xB378, 0x522F, 0xB379, 0xA34B,
+ 0x5230, 0x5231, 0x3C5B, 0x2E6A,      0,      0, 0x387B, 0x4C5E,
+};
 static const unsigned short utf8_to_euc_E58C[] = {
  0xB37B, 0x4C68, 0x4677, 0xB37C,      0, 0x4A71, 0x5232, 0xF432,
  0x5233,      0, 0xB37D, 0xB37E, 0xB421, 0x5235,      0, 0x5237,
@@ -3209,6 +5777,16 @@ static const unsigned short utf8_to_euc_E58C[] = {
  0xB430, 0x523C, 0xB431, 0x523D,      0, 0xB432,      0,      0,
  0x523E, 0x4924, 0x3668, 0x3065, 0xB433, 0xB434, 0xB435, 0x463F,
 };
+static const unsigned short utf8_to_euc_E58C_x0213[] = {
+ 0x2E6B, 0x4C68, 0x4677, 0xB37C,      0, 0x4A71, 0x5232, 0x2E6C,
+ 0x5233,      0, 0xA34C, 0xA34D, 0xB421, 0x5235,      0, 0x5237,
+ 0x5236, 0xB422,      0, 0xB423,      0, 0x5238, 0x323D, 0x4B4C,
+ 0xB424, 0x3A7C, 0x5239, 0xB425, 0x2E6D, 0x4159, 0xB427, 0xB428,
+ 0x3E22, 0x3629,      0, 0x523A, 0xA34E, 0xB429,      0, 0xB42A,
+ 0xB42B, 0xB42C, 0x485B, 0xB42D, 0xB42E, 0xB42F,      0, 0x523B,
+ 0xB430, 0x523C, 0xB431, 0x523D,      0, 0xA34F,      0,      0,
+ 0x523E, 0x4924, 0x3668, 0x3065, 0xB433, 0xB434, 0xA350, 0x463F,
+};
 static const unsigned short utf8_to_euc_E58D[] = {
  0x523F, 0x3D3D, 0xB436, 0x4069,      0, 0x5241, 0x5240, 0x3E23,
  0x3861, 0x5243, 0x483E, 0xB438, 0xB437, 0x5244,      0,      0,
@@ -3219,6 +5797,16 @@ static const unsigned short utf8_to_euc_E58D[] = {
  0x3075, 0x346D, 0xB440, 0x4228, 0x3551, 0x4D71,      0, 0x524B,
  0x3237, 0xB441,      0, 0x524A,      0,      0, 0xB442, 0x362A,
 };
+static const unsigned short utf8_to_euc_E58D_x0213[] = {
+ 0x523F, 0x3D3D, 0xA351, 0x4069,      0, 0x5241, 0x5240, 0x3E23,
+ 0x3861, 0x5243, 0x483E, 0xB438, 0xB437, 0x5244,      0,      0,
+      0, 0x485C, 0x4234, 0x426E, 0x3628,      0,      0, 0x466E,
+ 0x4331, 0xB439, 0x476E, 0xB43A, 0x4B4E,      0, 0x5246,      0,
+ 0x406A, 0x2E6F,      0, 0x2E70,      0, 0xB43D, 0x3735, 0xA354,
+      0, 0x5247,      0,      0, 0xA355, 0xB43F, 0x5248, 0x312C,
+ 0x3075, 0x346D,      0, 0x4228, 0x3551, 0x4D71,      0, 0x524B,
+ 0x3237, 0xB441, 0xA356, 0x524A,      0, 0x2E71, 0xB442, 0x362A,
+};
 static const unsigned short utf8_to_euc_E58E[] = {
       0,      0, 0x524C, 0xB443, 0x4C71,      0,      0, 0xB444,
  0xB445,      0,      0,      0,      0,      0, 0xB446,      0,
@@ -3229,6 +5817,16 @@ static const unsigned short utf8_to_euc_E58E[] = {
  0x5252,      0, 0xB450, 0x3837, 0xB451, 0xB452, 0x5253, 0xB453,
  0xB454,      0, 0xB455, 0x356E,      0, 0xB456,      0,      0,
 };
+static const unsigned short utf8_to_euc_E58E_x0213[] = {
+      0,      0, 0x524C, 0xB443, 0x4C71,      0,      0, 0xB444,
+ 0xB445,      0,      0,      0,      0,      0, 0xB446,      0,
+      0,      0,      0, 0x2E72, 0xB448,      0, 0x524D,      0,
+ 0x4E52, 0xB449, 0x387C,      0,      0, 0x2E73,      0, 0x3836,
+ 0x524E, 0xB44B,      0,      0, 0xA357, 0x5250, 0x524F,      0,
+ 0x3F5F, 0x3139, 0xB44D, 0xB44E,      0, 0x315E, 0x5251, 0xB44F,
+ 0x5252,      0, 0x2E74, 0x3837, 0xA358, 0xB452, 0x5253, 0xA35A,
+ 0xB454,      0, 0xB455, 0x356E,      0, 0xB456,      0,      0,
+};
 static const unsigned short utf8_to_euc_E58F[] = {
  0xB457,      0, 0x3B32, 0x5254,      0, 0xB458,      0,      0,
  0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D, 0xB459,
@@ -3239,6 +5837,16 @@ static const unsigned short utf8_to_euc_E58F[] = {
  0x4266, 0x3C38, 0x3B4B, 0x3126,      0, 0xB463, 0x3370, 0x3966,
  0x3B4A,      0, 0x525D,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E58F_x0213[] = {
+ 0xA35B,      0, 0x3B32, 0x5254,      0, 0xB458,      0,      0,
+ 0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D, 0xB459,
+      0,      0, 0xB45A, 0xB45B, 0x3D47, 0xA35F, 0x3C68, 0x3C75,
+      0, 0x3D76, 0xA360, 0x4840,      0,      0, 0xB45F, 0x5257,
+ 0xB460, 0x3143, 0x4151, 0x387D, 0x3845, 0x3667, 0xB461, 0xB462,
+ 0x525B, 0x4321, 0x427E, 0x362B, 0x3E24, 0x525C, 0x525A, 0x3244,
+ 0x4266, 0x3C38, 0x3B4B, 0x3126, 0xA362, 0xA363, 0x3370, 0x3966,
+ 0x3B4A,      0, 0x525D,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E590[] = {
       0, 0x525E, 0xB464, 0x3549, 0x3346,      0,      0,      0,
  0x3967, 0x3548, 0x445F, 0x3125, 0x4631, 0x4C3E, 0x3921, 0x4D79,
@@ -3249,6 +5857,16 @@ static const unsigned short utf8_to_euc_E590[] = {
       0, 0xB46C,      0,      0, 0xB46D, 0xB46E, 0x5265,      0,
  0x355B, 0x3F61,      0, 0x4A2D, 0x5263, 0x525F, 0x3863,      0,
 };
+static const unsigned short utf8_to_euc_E590_x0213[] = {
+      0, 0x525E, 0xB464, 0x3549, 0x3346,      0,      0,      0,
+ 0x3967, 0x3548, 0x445F, 0x3125, 0x4631, 0x4C3E, 0x3921, 0x4D79,
+ 0x4547, 0x387E, 0x2E75, 0xB465,      0,      0,      0,      0,
+      0,      0, 0xB466, 0x372F,      0, 0x5267, 0x4F7E, 0x3663,
+ 0x4B4A, 0xB467,      0,      0, 0xA365,      0, 0x485D, 0x2E76,
+ 0xA366, 0x5266, 0xB46A, 0x345E, 0x5261, 0x5262, 0x5264, 0xB46B,
+      0, 0xB46C,      0,      0, 0xB46D, 0xB46E, 0x5265,      0,
+ 0x355B, 0x3F61,      0, 0x4A2D, 0x5263, 0x525F, 0x3863,      0,
+};
 static const unsigned short utf8_to_euc_E591[] = {
  0x5260,      0, 0x4F24, 0xB46F, 0xB470,      0, 0x4A72, 0xB471,
  0x4468, 0x3862, 0x3970,      0,      0, 0xB472, 0x5268, 0xB473,
@@ -3259,6 +5877,16 @@ static const unsigned short utf8_to_euc_E591[] = {
  0x526F, 0x526D,      0, 0x4C23, 0xB47D, 0x526A, 0x5273, 0x526E,
       0,      0,      0, 0x5271, 0x3846, 0x4C3F,      0, 0xB47E,
 };
+static const unsigned short utf8_to_euc_E591_x0213[] = {
+ 0x5260,      0, 0x4F24, 0xA368, 0xB470,      0, 0x4A72, 0xB471,
+ 0x4468, 0x3862, 0x3970,      0,      0, 0x2E77, 0x5268, 0xB473,
+      0, 0x465D,      0,      0,      0, 0xA364,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xB474, 0x526C,
+      0,      0, 0xA369,      0, 0xB476,      0, 0xA36A, 0xB478,
+ 0x3C7E, 0xB479, 0x3C76, 0x2E79, 0xA36B, 0xB47B, 0xB47C,      0,
+ 0x526F, 0x526D,      0, 0x4C23, 0x2E7A, 0x526A, 0x5273, 0x526E,
+      0,      0,      0, 0x5271, 0x3846, 0x4C3F,      0, 0x2E7B,
+};
 static const unsigned short utf8_to_euc_E592[] = {
  0x5272, 0xB521,      0, 0xB522, 0x5274, 0xB523, 0x5276,      0,
  0xB524, 0xB525, 0xF435, 0x3A70, 0x4F42, 0xB526, 0x526B, 0x5269,
@@ -3269,6 +5897,16 @@ static const unsigned short utf8_to_euc_E592[] = {
       0, 0xB533, 0x3A69, 0x3331,      0,      0,      0, 0xB534,
  0x5279, 0xB535, 0xB536, 0xB537, 0x5325, 0x3076, 0x5324, 0xB538,
 };
+static const unsigned short utf8_to_euc_E592_x0213[] = {
+ 0x5272, 0xB521,      0, 0xB522, 0x5274, 0xB523, 0x5276,      0,
+ 0x2E7C, 0xB525, 0xA36C, 0x3A70, 0x4F42, 0xA36D, 0x526B, 0x5269,
+ 0x5275, 0xB527, 0x5270,      0,      0, 0xA36E, 0x2E7D,      0,
+      0,      0,      0,      0, 0x2E78,      0,      0, 0xB52B,
+ 0xA36F, 0x2E7E, 0x5278,      0, 0x5323, 0x527A, 0xA370, 0xB52E,
+ 0x527E, 0x2F21, 0xB530, 0x5321, 0x527B, 0xA371, 0xA372, 0x533E,
+      0, 0xB533, 0x3A69, 0x3331,      0,      0,      0, 0xA373,
+ 0x5279, 0xB535, 0xA374, 0xB537, 0x5325, 0x3076, 0x5324, 0xA375,
+};
 static const unsigned short utf8_to_euc_E593[] = {
  0x3025, 0x494A, 0x5322,      0, 0x527C,      0, 0xB539, 0x5277,
  0x527D, 0x3A48, 0xB53A,      0,      0, 0xB53B, 0xB53C,      0,
@@ -3279,6 +5917,16 @@ static const unsigned short utf8_to_euc_E593[] = {
       0,      0, 0x452F,      0,      0,      0, 0xB541,      0,
       0,      0, 0x532E,      0, 0xB542, 0x532B, 0xB543, 0xB544,
 };
+static const unsigned short utf8_to_euc_E593_x0213[] = {
+ 0x3025, 0x494A, 0x5322, 0xA376, 0x527C,      0, 0x2F22, 0x5277,
+ 0x527D, 0x3A48, 0xB53A,      0,      0, 0xB53B, 0xB53C,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x5326,      0,      0,      0,      0,      0,      0,      0,
+ 0xB53D, 0x3077, 0x532F,      0,      0, 0x5327, 0x5328,      0,
+ 0x3E25, 0x4B69, 0xB53E,      0, 0xA378, 0x532D, 0x532C, 0xA379,
+      0, 0xA37A, 0x452F, 0xA37B,      0,      0, 0xB541,      0,
+      0,      0, 0x532E,      0, 0xB542, 0x532B, 0xB543, 0x2F23,
+};
 static const unsigned short utf8_to_euc_E594[] = {
  0xB545, 0xB546,      0,      0, 0x3134, 0xB547, 0x3A36, 0x3F30,
  0xB548, 0xB549,      0,      0, 0xB54A, 0xB54B, 0xB54C, 0x5329,
@@ -3289,6 +5937,16 @@ static const unsigned short utf8_to_euc_E594[] = {
       0, 0x3E27, 0xB550, 0x533A,      0, 0xB551, 0xB552,      0,
  0x5339, 0x5330,      0, 0xB553, 0xB554, 0xB555, 0x4243,      0,
 };
+static const unsigned short utf8_to_euc_E594_x0213[] = {
+ 0xA37C, 0xA37D,      0,      0, 0x3134, 0xB547, 0x3A36, 0x3F30,
+ 0xB548, 0xA37E,      0,      0, 0xB54A, 0xB54B, 0x2F24, 0x5329,
+ 0x4562,      0,      0,      0, 0x532A, 0xB54D, 0x3022,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xB54E, 0x2F25,      0,      0, 0x5334, 0x4D23,
+      0, 0x3E27, 0xB550, 0x533A,      0, 0x2F26, 0xB552,      0,
+ 0x5339, 0x5330,      0, 0xB553, 0xA421, 0xB555, 0x4243,      0,
+};
 static const unsigned short utf8_to_euc_E595[] = {
  0x5331, 0xB556,      0,      0, 0x426F, 0x5336, 0x3E26, 0xB557,
       0, 0xB558, 0xB559,      0, 0x5333, 0xB55A,      0, 0x4C64,
@@ -3299,6 +5957,16 @@ static const unsigned short utf8_to_euc_E595[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0x5341, 0x5346,      0, 0x5342, 0xB565,
 };
+static const unsigned short utf8_to_euc_E595_x0213[] = {
+ 0x5331, 0xA422,      0,      0, 0x426F, 0x5336, 0x3E26, 0xA424,
+      0, 0xB558, 0xA425,      0, 0x5333, 0xB55A,      0, 0x4C64,
+ 0x2F27, 0xB55C,      0, 0x373C,      0,      0, 0x5337, 0x5338,
+ 0xB55D,      0, 0xB55E, 0xB55F, 0x5335, 0x533B, 0x2F28,      0,
+ 0xA427, 0xA428,      0, 0x5332, 0xA429,      0, 0xB564,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x5341, 0x5346, 0xA42B, 0x5342, 0xB565,
+};
 static const unsigned short utf8_to_euc_E596[] = {
  0x533D, 0xB566, 0xB567, 0x5347, 0x4131,      0, 0xB568, 0x5349,
  0xB569, 0x3922, 0x533F, 0x437D,      0,      0, 0xB56A, 0xB56B,
@@ -3309,6 +5977,16 @@ static const unsigned short utf8_to_euc_E596[] = {
  0x3674,      0, 0xB574,      0,      0,      0, 0x3144,      0,
       0,      0,      0,      0,      0,      0,      0, 0xB575,
 };
+static const unsigned short utf8_to_euc_E596_x0213[] = {
+ 0x533D, 0x2F29, 0xA42C, 0x5347, 0x4131,      0, 0x2F2A, 0x5349,
+ 0xA42D, 0x3922, 0x533F, 0x437D,      0,      0, 0x2F2B, 0xB56B,
+      0, 0xA42E, 0xB56D, 0xB56E, 0xB56F,      0,      0, 0xB570,
+ 0x5343, 0x533C, 0x342D,      0, 0x346E, 0x3365, 0x5344, 0x5340,
+      0,      0,      0, 0xB571, 0xB572,      0,      0, 0x3776,
+ 0x534A, 0x5348, 0x4153, 0x354A, 0x362C, 0x2F2D, 0x5345,      0,
+ 0x3674,      0, 0xB574,      0,      0,      0, 0x3144,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xA433,
+};
 static const unsigned short utf8_to_euc_E597[] = {
       0, 0xB576,      0, 0xB577, 0x534E, 0x534C, 0xB578, 0x5427,
       0, 0xB579,      0, 0xB57A, 0xB57B,      0, 0xB57C,      0,
@@ -3319,6 +5997,16 @@ static const unsigned short utf8_to_euc_E597[] = {
       0,      0,      0,      0,      0,      0, 0xB628, 0x5353,
       0, 0x5358,      0,      0,      0, 0x5356, 0x5355, 0xB629,
 };
+static const unsigned short utf8_to_euc_E597_x0213[] = {
+      0, 0xB576,      0, 0xB577, 0x534E, 0x534C, 0xB578, 0x5427,
+      0, 0xA434,      0, 0xB57A, 0xA435,      0, 0x2F2E,      0,
+      0, 0xA436, 0xA430, 0xB621, 0x5351,      0,      0, 0xB622,
+ 0xB623,      0, 0x534B, 0xB624, 0x534F, 0xA437, 0xB625, 0x534D,
+      0,      0, 0xA439, 0x3B4C, 0x5350,      0,      0,      0,
+      0, 0xA43B,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xB628, 0x5353,
+      0, 0x5358,      0,      0,      0, 0x5356, 0x5355, 0xB629,
+};
 static const unsigned short utf8_to_euc_E598[] = {
       0,      0,      0,      0,      0, 0xB62A, 0x4332,      0,
  0xB62B, 0x3245, 0xB62C,      0,      0, 0xB62D, 0xB62E, 0xB62F,
@@ -3329,6 +6017,16 @@ static const unsigned short utf8_to_euc_E598[] = {
  0xB635, 0x3E7C, 0x535E, 0xB636, 0x535C, 0xB637, 0x535D, 0xB638,
  0x535F, 0xB639,      0, 0xB63A, 0xB63B, 0xB63C,      0, 0xB63D,
 };
+static const unsigned short utf8_to_euc_E598_x0213[] = {
+      0,      0,      0,      0,      0, 0xB62A, 0x4332, 0xA43E,
+ 0x2F30, 0x3245, 0xB62C,      0,      0, 0xB62D, 0x2F31, 0xB62F,
+ 0xA43F, 0xB631, 0xB632,      0, 0x5352,      0, 0x5354, 0x3E28,
+ 0x3133, 0xB633,      0, 0x5357,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xA43C, 0x325E,      0,      0, 0xB634,      0,      0, 0x5362,
+ 0xA440, 0x3E7C, 0x535E, 0xB636, 0x535C, 0xB637, 0x535D, 0xA441,
+ 0x535F, 0xB639,      0, 0x2F32, 0xB63B, 0xA443,      0, 0xA444,
+};
 static const unsigned short utf8_to_euc_E599[] = {
  0xB63E, 0xB63F, 0x313D, 0xB640, 0xB641,      0, 0xB642,      0,
       0, 0xB643,      0, 0xB644, 0x4139, 0xB645, 0x5359, 0xB646,
@@ -3339,6 +6037,16 @@ static const unsigned short utf8_to_euc_E599[] = {
       0, 0xB651, 0xB652,      0, 0x4A2E, 0xB653,      0,      0,
  0x4655,      0, 0x4838,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E599_x0213[] = {
+ 0xA445, 0xB63F, 0x313D, 0xB640, 0xB641,      0, 0xB642, 0xA446,
+      0, 0x2F33,      0, 0xB644, 0x4139, 0xB645, 0x5359, 0xB646,
+ 0x535A,      0,      0, 0x7427, 0xB647,      0,      0,      0,
+      0,      0,      0, 0x337A,      0,      0, 0xA447,      0,
+ 0xA448, 0xB64A, 0xB64B, 0xB64C, 0x5361,      0, 0x2F35,      0,
+ 0x346F, 0xB64E, 0x5364, 0x5360, 0x5363, 0xA449,      0, 0x2F37,
+      0, 0x2F38, 0x2F39,      0, 0x4A2E, 0xB653, 0x2F34,      0,
+ 0x4655,      0, 0x4838,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E59A[] = {
  0x5366,      0,      0,      0, 0xB654, 0xB655, 0x5365, 0x3345,
  0xB656,      0, 0x5367, 0xB657, 0xB658,      0,      0, 0x536A,
@@ -3349,6 +6057,16 @@ static const unsigned short utf8_to_euc_E59A[] = {
       0, 0xB666,      0, 0xB667, 0x536E,      0, 0x536D, 0xB668,
       0,      0,      0,      0, 0x5370,      0, 0xB669,      0,
 };
+static const unsigned short utf8_to_euc_E59A_x0213[] = {
+ 0x5366,      0,      0,      0, 0xB654, 0xB655, 0x5365, 0x3345,
+ 0xA44B,      0, 0x5367, 0xB657, 0xA44C,      0,      0, 0x536A,
+      0,      0,      0,      0, 0x5369, 0xA44D,      0,      0,
+      0, 0x2F3A, 0xA44E,      0,      0, 0xA44F, 0x2F3B, 0xB65E,
+ 0x5368,      0, 0x4739,      0,      0, 0x536B, 0xB65F, 0xB660,
+ 0xA450, 0x2F3C,      0, 0xB663, 0x2F3D, 0xA451, 0x536C,      0,
+      0, 0xB666, 0xA452, 0x2F3E, 0x536E,      0, 0x536D, 0xB668,
+      0,      0,      0,      0, 0x5370,      0, 0xB669,      0,
+};
 static const unsigned short utf8_to_euc_E59B[] = {
  0x5373, 0x5371, 0x536F, 0x5372,      0, 0xB66A,      0,      0,
  0x5374, 0xB66B, 0xB66C, 0xB66D, 0xB670, 0xB671, 0x5375, 0xB66E,
@@ -3359,6 +6077,16 @@ static const unsigned short utf8_to_euc_E59B[] = {
  0x3A24, 0xB67C, 0x304F, 0x3F5E,      0,      0, 0xB721, 0xB722,
       0, 0x537A, 0x3847,      0,      0, 0x3971,      0, 0x537C,
 };
+static const unsigned short utf8_to_euc_E59B_x0213[] = {
+ 0x5373, 0x5371, 0x536F, 0x5372,      0, 0xA453,      0,      0,
+ 0x5374, 0x2F3F, 0x2F40, 0xB66D, 0xB670, 0xA454, 0x5375, 0xB66E,
+ 0xB66F, 0x5376,      0, 0x5377,      0,      0,      0, 0x5378,
+ 0x5145, 0xB672, 0x3C7C, 0x3B4D, 0xB673, 0xB674, 0x3273, 0xA455,
+ 0x3078, 0xB676,      0, 0x4344, 0xB677, 0xB678, 0xB679, 0xB67A,
+ 0xA456,      0,      0, 0xB67D,      0, 0xB67E, 0x5379,      0,
+ 0x3A24, 0xB67C, 0x304F, 0x3F5E,      0,      0, 0xA457, 0xA458,
+      0, 0x537A, 0x3847,      0,      0, 0x3971,      0, 0x537C,
+};
 static const unsigned short utf8_to_euc_E59C[] = {
  0x537B, 0xB723, 0xB724, 0x4A60, 0x537D,      0,      0, 0xB725,
  0x5421, 0x537E, 0xB726, 0x5422, 0xB727, 0x5423,      0, 0x3777,
@@ -3369,6 +6097,16 @@ static const unsigned short utf8_to_euc_E59C[] = {
  0x434F,      0,      0, 0xB737, 0xB738,      0,      0, 0x542A,
  0x542B,      0,      0, 0x542D,      0, 0xB739, 0xB73A, 0xB73B,
 };
+static const unsigned short utf8_to_euc_E59C_x0213[] = {
+ 0x537B, 0xB723, 0xB724, 0x4A60, 0x537D,      0,      0, 0xB725,
+ 0x5421, 0x537E, 0x2F41, 0x5422, 0xB727, 0x5423,      0, 0x3777,
+      0, 0xB728, 0x3160, 0x5424,      0, 0xA45A, 0x5426,      0,
+ 0x5425,      0, 0xB72A, 0xB72B, 0x5428, 0xB72C,      0, 0x455A,
+ 0xB72D, 0x2F43, 0xB72E, 0xA45B, 0xB730, 0xB731, 0x5429, 0x3035,
+ 0x3A5F, 0xA45D, 0xB733,      0, 0xB734, 0x373D, 0xB735, 0x2F44,
+ 0x434F,      0,      0, 0x2F45, 0x2F46,      0,      0, 0x542A,
+ 0x542B,      0,      0, 0x542D,      0, 0xB739, 0xB73A, 0xB73B,
+};
 static const unsigned short utf8_to_euc_E59D[] = {
  0x542E,      0, 0x3A64,      0,      0, 0xB73C, 0xB73D, 0x3651,
       0,      0, 0x4B37,      0, 0xB73E, 0xB73F, 0x542C, 0x542F,
@@ -3379,6 +6117,16 @@ static const unsigned short utf8_to_euc_E59D[] = {
  0xB749, 0xB74A,      0, 0xB74B, 0xB74C, 0xB74D,      0, 0xB74E,
       0, 0xB74F, 0xB750, 0xB751, 0xB752,      0, 0xB753, 0x5434,
 };
+static const unsigned short utf8_to_euc_E59D_x0213[] = {
+ 0x542E,      0, 0x3A64,      0,      0, 0xA45F, 0xA460, 0x3651,
+      0,      0, 0x4B37,      0, 0xA461, 0xA462, 0x542C, 0x542F,
+ 0x3A41, 0x3923, 0xB740,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x5433, 0xB741,      0, 0x3A25,      0, 0x4333, 0xB743,
+ 0xA464, 0x5430, 0x445A, 0xB745,      0, 0xB746, 0xB747, 0xA465,
+ 0x2F47, 0xB74A,      0, 0xA466, 0xA467, 0xA468,      0, 0x2F48,
+      0, 0xB74F, 0xB750, 0xA469, 0x2F49,      0, 0xB753, 0x5434,
+};
 static const unsigned short utf8_to_euc_E59E[] = {
       0, 0xB754, 0x3F62, 0xB755,      0,      0,      0,      0,
  0x5432, 0x5435,      0, 0x373F, 0xB756,      0,      0,      0,
@@ -3389,6 +6137,16 @@ static const unsigned short utf8_to_euc_E59E[] = {
  0x543B,      0,      0, 0x5438,      0,      0,      0,      0,
  0xB765,      0,      0,      0,      0, 0xB766,      0,      0,
 };
+static const unsigned short utf8_to_euc_E59E_x0213[] = {
+      0, 0xB754, 0x3F62, 0xB755,      0,      0,      0,      0,
+ 0x5432, 0x5435,      0, 0x373F, 0xB756,      0,      0,      0,
+      0,      0,      0, 0x5436, 0xB757, 0xB760,      0, 0xB758,
+      0, 0xB759, 0xA46D,      0, 0x2F4A, 0xA46E, 0xA46F, 0xB75E,
+ 0x5437, 0xB75F, 0x3924, 0x3340, 0x5439,      0,      0, 0xB761,
+ 0xA470, 0xB763, 0x543A,      0, 0xA46C,      0,      0,      0,
+ 0x543B,      0,      0, 0x5438,      0,      0,      0,      0,
+ 0x2F4D,      0,      0,      0,      0, 0xB766,      0,      0,
+};
 static const unsigned short utf8_to_euc_E59F[] = {
  0x5431,      0,      0, 0x543C,      0,      0, 0x543D, 0xB767,
  0xB768,      0,      0, 0x4B64, 0xB769,      0, 0x3E6B, 0xB76A,
@@ -3399,6 +6157,16 @@ static const unsigned short utf8_to_euc_E59F[] = {
  0xB773,      0,      0,      0, 0x3E7D, 0xB774, 0xB775, 0x3C39,
  0xB776, 0x475D, 0x3470,      0, 0x3A6B, 0xB777, 0xB778, 0xB779,
 };
+static const unsigned short utf8_to_euc_E59F_x0213[] = {
+ 0x5431,      0,      0, 0x543C,      0,      0, 0x543D, 0x2F4E,
+ 0x2F4F,      0,      0, 0x4B64, 0xA473,      0, 0x3E6B, 0x2F50,
+      0,      0, 0x543F, 0x5440, 0x543E, 0xB76B, 0x5442, 0xA471,
+      0,      0,      0,      0, 0x4738, 0xB76C, 0xA476, 0x3068,
+ 0x4956, 0xB77E,      0, 0x5443, 0x2F51,      0, 0xA477, 0xB770,
+      0, 0xB771,      0,      0,      0, 0x2F52,      0,      0,
+ 0xA478,      0,      0,      0, 0x3E7D, 0x2F53, 0x2F54, 0x3C39,
+ 0xA47A, 0x475D, 0x3470, 0xA47B, 0x3A6B, 0xA47C, 0xB778, 0x2F55,
+};
 static const unsigned short utf8_to_euc_E5A0[] = {
  0x4B59,      0, 0x4632, 0xB77A, 0xB77B, 0x3778, 0x424F,      0,
  0xB77C, 0xB77D, 0x5441, 0x5444, 0xB821, 0xB822,      0,      0,
@@ -3409,6 +6177,16 @@ static const unsigned short utf8_to_euc_E5A0[] = {
  0x3161, 0x4A73, 0xB82A,      0, 0x3E6C, 0x4548,      0,      0,
       0, 0xB82B, 0x3A66,      0,      0, 0x544E,      0, 0xB82C,
 };
+static const unsigned short utf8_to_euc_E5A0_x0213[] = {
+ 0x4B59,      0, 0x4632, 0xB77A, 0xA47D, 0x3778, 0x424F,      0,
+ 0xB77C, 0x2F56, 0x5441, 0x5444, 0xB821, 0xB822,      0,      0,
+      0,      0,      0,      0,      0, 0x4244,      0,      0,
+      0, 0x5445,      0, 0xB823,      0, 0x5446, 0xA47E, 0xB825,
+ 0xA521, 0x5448,      0,      0, 0x4469,      0, 0xB827, 0xA522,
+      0,      0, 0x342E,      0,      0, 0xB829,      0, 0x7421,
+ 0x3161, 0x4A73, 0xA523,      0, 0x3E6C, 0x4548,      0,      0,
+      0, 0xA524, 0x3A66,      0,      0, 0x544E,      0, 0xB82C,
+};
 static const unsigned short utf8_to_euc_E5A1[] = {
  0x4A3D, 0x4E5D,      0,      0,      0,      0,      0,      0,
       0, 0xB82D, 0x3274, 0x544A, 0xB82E, 0xB82F,      0, 0xB830,
@@ -3419,6 +6197,16 @@ static const unsigned short utf8_to_euc_E5A1[] = {
  0x544B,      0, 0x5447,      0,      0, 0x3F50,      0,      0,
  0xB838, 0x544F,      0,      0, 0xB839,      0, 0x3D4E, 0xB83A,
 };
+static const unsigned short utf8_to_euc_E5A1_x0213[] = {
+ 0x4A3D, 0x4E5D,      0,      0,      0,      0,      0,      0,
+      0, 0xA526, 0x3274, 0x544A, 0xA527, 0xB82F,      0, 0xB830,
+ 0xB831, 0x413A, 0x544D,      0, 0x4563, 0xB832,      0, 0x4549,
+ 0x4564, 0x4839, 0x444D,      0,      0,      0, 0x3A49, 0xB833,
+      0, 0x2F58, 0x5449,      0, 0x2F59,      0,      0, 0xA528,
+ 0xB837, 0x3176,      0, 0x4536,      0,      0,      0,      0,
+ 0x544B,      0, 0x5447,      0,      0, 0x3F50,      0,      0,
+ 0xB838, 0x544F,      0,      0, 0x2F5B,      0, 0x3D4E, 0xB83A,
+};
 static const unsigned short utf8_to_euc_E5A2[] = {
  0xB83B, 0xB83C,      0, 0x362D,      0, 0x5450,      0, 0xB83D,
  0xB83E, 0xB83F, 0xB840,      0, 0xB841, 0xB842,      0, 0xB843,
@@ -3429,6 +6217,16 @@ static const unsigned short utf8_to_euc_E5A2[] = {
       0, 0xB84D, 0xB84E, 0x4A2F,      0,      0,      0,      0,
  0x5457, 0x5451, 0x5454, 0x5456, 0xB850,      0, 0x3A26,      0,
 };
+static const unsigned short utf8_to_euc_E5A2_x0213[] = {
+ 0xB83B, 0xB83C,      0, 0x362D,      0, 0x5450,      0, 0xB83D,
+ 0xB83E, 0x2F5C, 0xA529, 0xA52A, 0xB841, 0xA52B,      0, 0xA52C,
+ 0xA52D,      0,      0, 0x4A68, 0xA52E,      0, 0xB846, 0x417D,
+      0,      0,      0,      0, 0x4446, 0xA52F, 0x2F5D, 0x5452,
+ 0xB848, 0xB849, 0xB84A,      0,      0,      0, 0xB84B,      0,
+ 0x4B4F, 0x2F5F, 0xA530, 0x5453,      0,      0, 0x5458,      0,
+      0, 0xA531,      0, 0x4A2F,      0,      0,      0,      0,
+ 0x5457, 0x5451, 0x5454, 0x5456, 0xB850,      0, 0x3A26,      0,
+};
 static const unsigned short utf8_to_euc_E5A3[] = {
       0, 0x4A49, 0xB851,      0, 0xB84F, 0x5459,      0, 0x4345,
  0xB852,      0, 0x3275,      0, 0x3E6D, 0xB853, 0xB854,      0,
@@ -3439,6 +6237,16 @@ static const unsigned short utf8_to_euc_E5A3[] = {
  0x403C, 0x306D, 0x4764, 0xB85E,      0,      0,      0, 0x445B,
       0, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468,      0,      0,
 };
+static const unsigned short utf8_to_euc_E5A3_x0213[] = {
+      0, 0x4A49, 0xB851, 0xA533, 0xB84F, 0x5459,      0, 0x4345,
+ 0xB852,      0, 0x3275,      0, 0x3E6D, 0xA534, 0x2F62,      0,
+ 0xB855, 0x545B, 0x2F61, 0x545A, 0x2F63, 0x3968, 0xB858, 0x545C,
+ 0x545E, 0x545D, 0x2F64,      0, 0x5460, 0xB85A, 0x5455, 0x5462,
+ 0x2F65, 0xB85B, 0xA535,      0, 0x5461, 0x545F,      0,      0,
+      0, 0x2F66,      0, 0x3B4E, 0x3F51,      0, 0x4154, 0x5463,
+ 0x403C, 0x306D, 0x4764, 0xA536, 0xA537,      0,      0, 0x445B,
+      0, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468,      0,      0,
+};
 static const unsigned short utf8_to_euc_E5A4[] = {
       0,      0, 0x5469,      0,      0, 0xB85F, 0xB860,      0,
       0, 0x4A51, 0x546A, 0xB861, 0xB862,      0,      0, 0x3246,
@@ -3449,6 +6257,16 @@ static const unsigned short utf8_to_euc_E5A4[] = {
  0xB86D, 0x3C3A, 0x5471, 0xB86E,      0, 0xB86F, 0xB870, 0x3050,
  0x5472,      0,      0,      0,      0,      0, 0x5473, 0xB871,
 };
+static const unsigned short utf8_to_euc_E5A4_x0213[] = {
+      0,      0, 0x5469,      0,      0, 0xA538, 0xA539,      0,
+      0, 0x4A51, 0x546A, 0xA53A, 0x2F67, 0xA53B,      0, 0x3246,
+ 0x546B,      0, 0xB863, 0xB864, 0xA53C, 0x4D3C, 0x3330,      0,
+ 0x5249, 0x3D48, 0x423F, 0x546C, 0x4C6B, 0xB867,      0,      0,
+      0, 0xB868, 0x4C34, 0xB869, 0xA53D, 0x546E,      0, 0x4267,
+ 0xB86B, 0x4537, 0x4240, 0x4957, 0x546F, 0x5470, 0x317B, 0xB86C,
+ 0xB86D, 0x3C3A, 0x5471, 0xB86E,      0, 0xB86F, 0xB870, 0x3050,
+ 0x5472,      0,      0,      0,      0, 0xA540, 0x5473, 0xB871,
+};
 static const unsigned short utf8_to_euc_E5A5[] = {
       0,      0,      0, 0xB872, 0x3162,      0, 0xB873, 0x3471,
  0x4660, 0x4A74,      0,      0,      0,      0, 0x5477, 0x4155,
@@ -3459,6 +6277,16 @@ static const unsigned short utf8_to_euc_E5A5[] = {
       0,      0, 0xB922, 0x3D77, 0x455B, 0xB923, 0xB924,      0,
  0x5521, 0xB925,      0, 0xB926, 0xB927, 0x3925,      0,      0,
 };
+static const unsigned short utf8_to_euc_E5A5_x0213[] = {
+      0,      0,      0, 0xB872, 0x3162,      0, 0xA542, 0x3471,
+ 0x4660, 0x4A74,      0,      0,      0,      0, 0x5477, 0x4155,
+ 0x5476, 0x3740, 0xB874,      0, 0x4B5B, 0x5475,      0, 0x4565,
+ 0x5479, 0xB876, 0x5478, 0xA545,      0, 0x2F69, 0xB879, 0xA546,
+ 0x547B, 0xB87B, 0x547A,      0,      0, 0x317C,      0, 0x547C,
+ 0x3E29, 0x547E, 0x4325, 0xB87D, 0x547D, 0x2F6A, 0x4A33, 0xB921,
+      0,      0, 0xB922, 0x3D77, 0x455B, 0xA548, 0xA549,      0,
+ 0x5521, 0xB925,      0, 0xB926, 0xA54A, 0x3925,      0,      0,
+};
 static const unsigned short utf8_to_euc_E5A6[] = {
       0, 0x5522, 0x4721, 0x485E, 0x4C51,      0,      0,      0,
       0,      0, 0x4725, 0xB928, 0xB929, 0x552B, 0xB92A,      0,
@@ -3469,6 +6297,16 @@ static const unsigned short utf8_to_euc_E5A6[] = {
  0xB934,      0, 0x5527, 0xB935,      0,      0,      0, 0xB936,
       0, 0x4B65, 0xB937, 0x3A4A, 0xB938,      0, 0x3E2A,      0,
 };
+static const unsigned short utf8_to_euc_E5A6_x0213[] = {
+      0, 0x5522, 0x4721, 0x485E, 0x4C51,      0,      0,      0,
+      0,      0, 0x4725, 0x2F6B, 0xB929, 0x552B, 0xB92A,      0,
+      0,      0, 0x2F6C, 0x3538,      0, 0xB92C, 0x4D45, 0xB92D,
+      0, 0x4C2F,      0, 0x562C,      0, 0x5523,      0, 0xA54B,
+      0,      0,      0, 0x5526, 0x2F6D, 0x4245,      0, 0xB930,
+ 0x4B38,      0,      0,      0, 0x454A, 0xB931, 0xA54C, 0xB933,
+ 0xB934,      0, 0x5527, 0xB935,      0,      0,      0, 0xB936,
+      0, 0x4B65,      0, 0x3A4A, 0xA54D,      0, 0x3E2A,      0,
+};
 static const unsigned short utf8_to_euc_E5A7[] = {
       0, 0xB939,      0, 0xB93A, 0xB93B,      0, 0x5528,      0,
  0xB93C, 0x3B50, 0xB93D, 0x3B4F,      0, 0xB93E,      0,      0,
@@ -3479,6 +6317,16 @@ static const unsigned short utf8_to_euc_E5A7[] = {
       0, 0xB948, 0xB949,      0, 0xB94A,      0, 0x3028, 0xB94B,
       0,      0,      0, 0x3079,      0,      0,      0, 0x3B51,
 };
+static const unsigned short utf8_to_euc_E5A7_x0213[] = {
+      0, 0xB939,      0, 0x2F6E, 0xB93B,      0, 0x5528,      0,
+ 0xA54E, 0x3B50, 0xB93D, 0x3B4F,      0, 0xA54F,      0,      0,
+ 0x3039, 0x3848, 0x2F6F, 0x402B, 0x3051,      0,      0,      0,
+      0, 0x552C, 0x552D,      0, 0x552A, 0x2F70, 0xA550, 0xB942,
+      0,      0,      0, 0xA551, 0xA552, 0x3138, 0x342F, 0xA553,
+ 0x5529,      0, 0x4C45, 0x4931,      0,      0, 0xA554, 0xB947,
+      0, 0xB948, 0xB949,      0, 0xB94A,      0, 0x3028, 0xB94B,
+ 0x7E7A,      0,      0, 0x3079,      0,      0,      0, 0x3B51,
+};
 static const unsigned short utf8_to_euc_E5A8[] = {
  0xB94C, 0x3052,      0, 0x3023, 0xB94D,      0,      0,      0,
       0, 0x5532,      0,      0, 0xB94E, 0xB94F, 0xB950,      0,
@@ -3489,6 +6337,16 @@ static const unsigned short utf8_to_euc_E5A8[] = {
  0xB95A,      0,      0,      0,      0, 0x5537, 0x5538,      0,
       0,      0,      0,      0, 0x3E2B,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E5A8_x0213[] = {
+ 0xB94C, 0x3052,      0, 0x3023, 0xB94D,      0,      0,      0,
+      0, 0x5532,      0,      0, 0xA558, 0xA559, 0xB950,      0,
+      0, 0x5530, 0xB951, 0x2F71,      0,      0,      0, 0xA55A,
+ 0x4C3C,      0, 0x5533,      0, 0x5531,      0, 0xB953, 0x552F,
+ 0x3F31,      0,      0, 0x2F72, 0xB955, 0x552E,      0, 0xA55B,
+ 0xB957, 0x4A5A, 0xB958,      0,      0, 0xA55C,      0, 0x3864,
+ 0xB95A,      0,      0,      0,      0, 0x5537, 0x5538,      0,
+      0,      0,      0,      0, 0x3E2B,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E5A9[] = {
  0x5534, 0x4F2C,      0,      0, 0xB95B, 0xB95C, 0x474C, 0xB95D,
  0xB95E, 0x5536,      0,      0, 0xB95F,      0,      0,      0,
@@ -3499,6 +6357,16 @@ static const unsigned short utf8_to_euc_E5A9[] = {
       0,      0,      0,      0,      0,      0,      0, 0xB967,
       0,      0, 0xB968, 0xB969,      0,      0, 0xB96A, 0x4C3B,
 };
+static const unsigned short utf8_to_euc_E5A9_x0213[] = {
+ 0x5534, 0x4F2C,      0,      0, 0xB95B, 0xB95C, 0x474C, 0xB95D,
+ 0xB95E, 0x5536,      0,      0, 0xB95F,      0,      0,      0,
+ 0xB960,      0,      0,      0,      0, 0xA55D,      0,      0,
+      0,      0, 0x3A27,      0,      0,      0, 0xB962,      0,
+      0,      0, 0x5539, 0xB963,      0, 0xA55E, 0x4958, 0x2F73,
+      0,      0, 0x553A,      0, 0x5535, 0x2F74,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x2F75,
+      0,      0, 0xA55F, 0xB969,      0,      0, 0x2F76, 0x4C3B,
+};
 static const unsigned short utf8_to_euc_E5AA[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0xB96B,      0,      0,      0,      0,
@@ -3509,6 +6377,16 @@ static const unsigned short utf8_to_euc_E5AA[] = {
       0, 0xB977, 0xB978, 0xB979,      0, 0xB97A,      0,      0,
  0xB97B,      0, 0xB97C, 0xB97D, 0x553C, 0x5540, 0x553D, 0xB97E,
 };
+static const unsigned short utf8_to_euc_E5AA_x0213[] = {
+      0,      0,      0,      0, 0x2F77,      0,      0,      0,
+      0,      0,      0, 0xA560,      0,      0,      0,      0,
+ 0xB96C,      0, 0x475E, 0xB96D,      0,      0, 0xB96E,      0,
+      0, 0xB96F, 0x553B, 0x4932, 0xA561,      0, 0x2F78, 0xA562,
+ 0xA563,      0, 0xA564,      0,      0,      0,      0, 0x2F79,
+      0,      0,      0,      0, 0xB976,      0,      0,      0,
+      0, 0xA565, 0xB978, 0xA566,      0, 0xA567,      0,      0,
+ 0xB97B,      0, 0xA568, 0xB97D, 0x553C, 0x5540, 0x553D, 0xA569,
+};
 static const unsigned short utf8_to_euc_E5AB[] = {
       0, 0x3247, 0x553F,      0, 0xBA21,      0, 0xBA22,      0,
  0xBA23, 0x3C3B,      0, 0x553E, 0x3779,      0,      0, 0xBA24,
@@ -3519,6 +6397,16 @@ static const unsigned short utf8_to_euc_E5AB[] = {
       0,      0,      0,      0,      0, 0xBA2B, 0xBA2C,      0,
       0,      0, 0x5546, 0x5547,      0, 0xBA2D,      0,      0,
 };
+static const unsigned short utf8_to_euc_E5AB_x0213[] = {
+      0, 0x3247, 0x553F,      0, 0x2F7A,      0, 0xBA22,      0,
+ 0xBA23, 0x3C3B,      0, 0x553E, 0x3779,      0,      0, 0xBA24,
+ 0x554C,      0,      0,      0,      0,      0, 0x5545, 0x5542,
+      0,      0, 0xA56A,      0, 0xA56B,      0,      0,      0,
+ 0xA56C, 0x4364,      0, 0x5541,      0, 0xA56D, 0x5543,      0,
+      0, 0x5544, 0xBA29,      0,      0,      0, 0xA56F,      0,
+ 0xA56E,      0,      0,      0,      0, 0xA570, 0xBA2C,      0,
+      0,      0, 0x5546, 0x5547,      0, 0xBA2D,      0,      0,
+};
 static const unsigned short utf8_to_euc_E5AC[] = {
  0xBA2E, 0xBA2F,      0,      0,      0,      0,      0,      0,
  0xBA30, 0x3472,      0, 0x5549, 0x5548,      0,      0,      0,
@@ -3529,6 +6417,16 @@ static const unsigned short utf8_to_euc_E5AC[] = {
  0x3145,      0, 0x554B,      0, 0xBA32,      0, 0x554E,      0,
  0xBA39,      0,      0,      0,      0,      0, 0x554F,      0,
 };
+static const unsigned short utf8_to_euc_E5AC_x0213[] = {
+ 0xA571, 0xBA2F,      0,      0,      0,      0,      0,      0,
+ 0xA572, 0x3472,      0, 0x5549, 0x5548,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x554A, 0xA573,
+      0, 0x2F7C,      0, 0xBA34,      0, 0xBA35,      0,      0,
+      0, 0xBA36, 0x3E6E,      0,      0, 0x2F7D,      0,      0,
+      0,      0, 0x554D,      0, 0x445C, 0xA575,      0,      0,
+ 0x3145,      0, 0x554B,      0, 0xA574,      0, 0x554E,      0,
+ 0xBA39,      0,      0,      0,      0,      0, 0x554F,      0,
+};
 static const unsigned short utf8_to_euc_E5AD[] = {
  0x5552, 0xBA3A,      0, 0x5550,      0, 0x5551,      0,      0,
       0,      0,      0, 0xBA3B, 0xBA3C,      0,      0,      0,
@@ -3539,6 +6437,16 @@ static const unsigned short utf8_to_euc_E5AD[] = {
  0x5559, 0x5623,      0, 0x555A,      0, 0x555B,      0,      0,
  0x555C,      0, 0x555E,      0, 0xBA43, 0xBA44, 0xBA45, 0xBA46,
 };
+static const unsigned short utf8_to_euc_E5AD_x0213[] = {
+ 0x5552, 0x4F55,      0, 0x5550,      0, 0x5551,      0,      0,
+      0,      0,      0, 0xBA3B, 0xA576,      0,      0,      0,
+ 0x3B52, 0x5553, 0xA577,      0, 0x3926, 0x5554, 0x4F56, 0x3B7A,
+ 0x4238,      0, 0x5555, 0x5556, 0x3B5A, 0x3927, 0xBA3F, 0x4C52,
+      0,      0,      0, 0x3528, 0x3849, 0x5557, 0x3358,      0,
+ 0xA578, 0x5558,      0, 0x4239,      0,      0, 0xBA41, 0xA579,
+ 0x5559, 0x5623,      0, 0x555A,      0, 0x555B,      0,      0,
+ 0x555C,      0, 0x555E,      0, 0xA57A, 0x4F57, 0xBA45, 0xA57B,
+};
 static const unsigned short utf8_to_euc_E5AE[] = {
  0x555F, 0xBA47,      0, 0x5560, 0xBA48, 0x4270, 0xBA49, 0x3127,
  0x3C69, 0x3042, 0xBA4A, 0x4157, 0x3430, 0x3C35, 0xBA4B, 0x3928,
@@ -3549,6 +6457,16 @@ static const unsigned short utf8_to_euc_E5AE[] = {
  0x3A4B, 0xBA56, 0xBA57, 0x3332, 0x3163, 0x3E2C, 0x3248, 0xBA58,
  0x5562, 0x4D46, 0xBA59,      0, 0xBA5A,      0,      0, 0x3D49,
 };
+static const unsigned short utf8_to_euc_E5AE_x0213[] = {
+ 0x555F, 0xA57C,      0, 0x5560, 0xA57D, 0x4270, 0xBA49, 0x3127,
+ 0x3C69, 0x3042, 0xBA4A, 0x4157, 0x3430, 0x3C35, 0xBA4B, 0x3928,
+ 0xBA4C, 0xBA4D,      0, 0x4F58, 0xBA4F, 0x4566, 0xA821, 0x3D21,
+ 0x3431, 0x4368, 0x446A, 0x3038, 0x3539, 0x4A75,      0, 0x3C42,
+      0,      0, 0x3552, 0x406B, 0x3C3C, 0x4D28, 0x5561,      0,
+ 0xBA51, 0xBA52,      0,      0, 0xA822, 0xBA54, 0x355C, 0xBA55,
+ 0x3A4B, 0xBA56, 0xBA57, 0x3332, 0x3163, 0x3E2C, 0x3248, 0xBA58,
+ 0x5562, 0x4D46, 0xBA59,      0, 0xBA5A,      0,      0, 0x3D49,
+};
 static const unsigned short utf8_to_euc_E5AF[] = {
  0xBA5B, 0xBA5C, 0x3C64, 0x5563, 0x3473, 0x4652, 0x4C29, 0x5564,
       0, 0x5565,      0,      0, 0x4959, 0xBA5D,      0, 0xBA5E,
@@ -3559,6 +6477,16 @@ static const unsigned short utf8_to_euc_E5AF[] = {
  0x556E, 0xBA66,      0, 0x5570, 0xBA67, 0x437E, 0x556F,      0,
  0x4023,      0, 0x3B7B,      0,      0, 0xBA68, 0x4250, 0x3C77,
 };
+static const unsigned short utf8_to_euc_E5AF_x0213[] = {
+ 0xA824, 0xBA5C, 0x3C64, 0x5563, 0x3473, 0x4652, 0x4C29, 0x5564,
+      0, 0x5565,      0,      0, 0x4959, 0xBA5D, 0xA826, 0xBA5E,
+ 0x5567,      0, 0x3428, 0x3677, 0x5566,      0, 0xA827, 0xBA60,
+ 0x4F59, 0xBA62, 0xBA63, 0x3432,      0, 0x3F32, 0x556B, 0x3B21,
+ 0xBA64, 0x3249, 0x556A,      0, 0x5568, 0x556C, 0x5569, 0x472B,
+ 0x5C4D, 0x3F33,      0, 0x556D, 0x4F5A,      0, 0x4E40, 0xBA65,
+ 0x556E, 0xA82A,      0, 0x5570, 0xBA67, 0x437E, 0x556F,      0,
+ 0x4023,      0, 0x3B7B,      0,      0, 0xA82B, 0x4250, 0x3C77,
+};
 static const unsigned short utf8_to_euc_E5B0[] = {
       0, 0x4975, 0x406C,      0, 0x3C4D, 0x5571, 0x3E2D, 0x5572,
  0x5573, 0x3053, 0x423A, 0x3F52, 0xBA69, 0x5574, 0x4633, 0x3E2E,
@@ -3569,6 +6497,16 @@ static const unsigned short utf8_to_euc_E5B0[] = {
  0xBA73, 0x3D22, 0xBA74,      0,      0, 0xBA75, 0xBA76,      0,
  0x5579, 0x557A, 0x3C5C, 0x3F2C, 0x4674, 0x3F54, 0x4878, 0x4722,
 };
+static const unsigned short utf8_to_euc_E5B0_x0213[] = {
+      0, 0x4975, 0x406C, 0xA82D, 0x3C4D, 0x5571, 0x3E2D, 0x5572,
+ 0x5573, 0x3053, 0x423A, 0x3F52, 0xBA69, 0x5574, 0x4633, 0x3E2E,
+      0, 0x3E2F, 0x4F5B, 0x5575,      0,      0, 0x406D, 0xBA6A,
+      0,      0, 0x3E30,      0,      0,      0, 0x4F5C, 0xBA6C,
+ 0x5576,      0, 0x5577, 0x4F5D, 0x4C60,      0, 0xBA6E,      0,
+ 0x5578, 0xA82E,      0, 0x4F5E, 0xBA71, 0x3646, 0xBA72,      0,
+ 0xA82F, 0x3D22, 0xBA74,      0,      0, 0xBA75, 0xBA76,      0,
+ 0x5579, 0x557A, 0x3C5C, 0x3F2C, 0x4674, 0x3F54, 0x4878, 0x4722,
+};
 static const unsigned short utf8_to_euc_E5B1[] = {
  0x3649, 0x557B,      0,      0,      0, 0x356F, 0x557C,      0,
  0x367E,      0, 0x464F, 0x3230,      0, 0x3B53, 0x557D, 0x5622,
@@ -3579,6 +6517,16 @@ static const unsigned short utf8_to_euc_E5B1[] = {
  0xBB22, 0x3B33,      0,      0, 0xBB23, 0xBB24, 0x5627,      0,
       0, 0x5628, 0xBB25, 0xBB26, 0xBB27, 0xBB28,      0,      0,
 };
+static const unsigned short utf8_to_euc_E5B1_x0213[] = {
+ 0x3649, 0x557B,      0,      0,      0, 0x356F, 0x557C,      0,
+ 0x367E,      0, 0x464F, 0x3230,      0, 0x3B53, 0x557D, 0x5622,
+ 0x5621, 0x367D,      0, 0x557E,      0, 0x4538,      0,      0,
+      0, 0xBA77, 0xBA78, 0x7E7B, 0xBA79,      0, 0x4230, 0xA831,
+ 0x454B, 0x3C48, 0x4F60, 0xA832, 0x4158, 0x4D7A,      0, 0xA833,
+ 0xA834, 0xA835,      0,      0, 0x5624, 0xBB21, 0x5625, 0x4656,
+ 0xA836, 0x3B33,      0,      0, 0xBB23, 0xBB24, 0x5627,      0,
+      0, 0x5628, 0x4F64, 0xBB26, 0xA839, 0xBB28,      0,      0,
+};
 static const unsigned short utf8_to_euc_E5B2[] = {
       0,      0,      0,      0,      0,      0,      0, 0xBB29,
  0xBB2A,      0, 0xBB2B,      0, 0x5629,      0,      0, 0xBB2C,
@@ -3589,6 +6537,16 @@ static const unsigned short utf8_to_euc_E5B2[] = {
       0, 0x4252, 0xBB35, 0x3359, 0xBB36, 0xBB37, 0x562F, 0x5631,
  0x345F,      0, 0xBB38, 0x562E, 0x5630,      0, 0x5633,      0,
 };
+static const unsigned short utf8_to_euc_E5B2_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0, 0xBB29,
+ 0xA83C,      0, 0xA83D,      0, 0x5629,      0,      0, 0x4F65,
+ 0x3474, 0x562A, 0xBB2D,      0, 0x562B,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xBB2E,      0, 0x4F66,
+ 0xA841, 0x322C, 0xA842, 0x4F67,      0,      0, 0xA843, 0xA844,
+ 0x413B, 0x3464, 0x4F68, 0x562D, 0x4C28, 0xA846,      0,      0,
+      0, 0x4252, 0xBB35, 0x3359, 0xBB36, 0xA847, 0x562F, 0x5631,
+ 0x345F,      0, 0x4F69, 0x562E, 0x5630,      0, 0x5633,      0,
+};
 static const unsigned short utf8_to_euc_E5B3[] = {
       0,      0,      0,      0,      0, 0x5632,      0, 0x5634,
       0, 0xBB39,      0, 0xBB3A,      0,      0,      0,      0,
@@ -3599,6 +6557,16 @@ static const unsigned short utf8_to_euc_E5B3[] = {
  0x4A76, 0xBB3F, 0xBB40,      0, 0xBB41, 0xF43B, 0x4567,      0,
       0,      0, 0x5638, 0x3D54,      0, 0x5637,      0,      0,
 };
+static const unsigned short utf8_to_euc_E5B3_x0213[] = {
+      0,      0,      0,      0,      0, 0x5632,      0, 0x5634,
+      0, 0xA849,      0, 0x4F6A,      0,      0,      0,      0,
+ 0x4F6B,      0, 0x4F6C,      0,      0,      0,      0, 0xBB3D,
+      0, 0x5635,      0,      0,      0, 0xBB3C,      0,      0,
+ 0x463D, 0x362E,      0,      0,      0,      0,      0,      0,
+ 0x3265, 0x5636, 0x563B,      0,      0, 0x5639, 0xBB3E, 0x4A77,
+ 0x4A76, 0xBB3F, 0xBB40,      0, 0x4F6D,      0, 0x4567,      0,
+      0,      0, 0x5638, 0x3D54,      0, 0x5637,      0,      0,
+};
 static const unsigned short utf8_to_euc_E5B4[] = {
       0, 0xBB42,      0,      0,      0,      0, 0xBB43, 0x3F72,
       0,      0,      0, 0x563C,      0, 0xBB44, 0x3A6A,      0,
@@ -3609,6 +6577,16 @@ static const unsigned short utf8_to_euc_E5B4[] = {
       0, 0xBB4B,      0,      0, 0xBB4C,      0,      0,      0,
       0, 0xBB4D,      0,      0,      0, 0xBB4E,      0, 0xBB4F,
 };
+static const unsigned short utf8_to_euc_E5B4_x0213[] = {
+      0, 0xBB42,      0,      0,      0,      0, 0xA84C, 0x3F72,
+      0,      0,      0, 0x563C,      0, 0x4F70, 0x3A6A,      0,
+ 0xA84D, 0x5642, 0xBB45,      0, 0x5643, 0x563D, 0x3333, 0x563E,
+ 0x5647, 0x5646, 0x5645, 0x5641,      0, 0xA84F,      0, 0x5640,
+ 0xA850,      0, 0x5644, 0xBB47, 0xA851,      0, 0xA852, 0x4F71,
+      0, 0x4A78,      0, 0xA84E,      0,      0,      0,      0,
+      0, 0xA853,      0,      0, 0xBB4C,      0,      0,      0,
+      0, 0xA854,      0,      0,      0, 0xBB4E,      0, 0xBB4F,
+};
 static const unsigned short utf8_to_euc_E5B5[] = {
       0,      0, 0xBB50, 0xBB51,      0,      0, 0xBB52,      0,
  0xBB53,      0, 0xBB57, 0x564B, 0x5648,      0, 0x564A,      0,
@@ -3619,6 +6597,16 @@ static const unsigned short utf8_to_euc_E5B5[] = {
  0xBB5F,      0,      0, 0x564D,      0,      0, 0x564E,      0,
       0, 0xBB60, 0xBB61,      0,      0,      0, 0xBB62, 0xBB63,
 };
+static const unsigned short utf8_to_euc_E5B5_x0213[] = {
+      0,      0, 0xA855, 0xBB51,      0,      0, 0x4F73, 0x4F74,
+ 0xBB53,      0, 0x4F76, 0x564B, 0x5648,      0, 0x564A,      0,
+ 0x4D72, 0xBB55, 0x5649, 0x4F75,      0, 0xBB54,      0,      0,
+      0, 0xBB56,      0,      0, 0x563F,      0,      0, 0xBB58,
+ 0xBB59, 0xA857, 0xBB5B,      0, 0xBB5C,      0,      0,      0,
+      0, 0x3F73, 0xA858,      0, 0x564C, 0x4F77,      0, 0x3A37,
+ 0xA85A,      0,      0, 0x564D,      0,      0, 0x564E,      0,
+      0, 0xBB60, 0xBB61,      0,      0,      0, 0xBB62, 0xBB63,
+};
 static const unsigned short utf8_to_euc_E5B6[] = {
       0, 0xBB64, 0x5651, 0xBB65, 0x5650,      0,      0, 0x564F,
  0xBB66,      0, 0xBB67, 0x4568, 0x563A,      0,      0,      0,
@@ -3629,6 +6617,16 @@ static const unsigned short utf8_to_euc_E5B6[] = {
  0xBB72,      0, 0xE674,      0, 0xBB73,      0,      0, 0x5658,
  0xBB74, 0xBB75, 0x4E66,      0, 0x5659, 0x5656,      0,      0,
 };
+static const unsigned short utf8_to_euc_E5B6_x0213[] = {
+      0, 0x4F78, 0x5651, 0xBB65, 0x5650,      0,      0, 0x564F,
+ 0xA85D,      0, 0xBB67, 0x4568, 0x563A,      0,      0,      0,
+ 0x5657,      0, 0xA85F, 0xBB69, 0xA860, 0xBB6B,      0, 0xA861,
+      0, 0xA862,      0, 0xBB6D,      0, 0x5653,      0, 0xBB6E,
+ 0x4F79,      0, 0x5652,      0, 0x4F7A,      0,      0, 0x4F7B,
+      0,      0,      0, 0xBB71, 0x5654,      0, 0x5655,      0,
+ 0xA863,      0, 0xA864,      0, 0xA865,      0,      0, 0x5658,
+ 0x4F7C, 0xA867, 0x4E66,      0, 0x5659, 0x5656,      0,      0,
+};
 static const unsigned short utf8_to_euc_E5B7[] = {
       0,      0,      0, 0xBB76,      0,      0,      0, 0xBB77,
       0, 0x565A,      0, 0xBB78, 0x3460, 0x565B, 0xBB7A,      0,
@@ -3639,6 +6637,16 @@ static const unsigned short utf8_to_euc_E5B7[] = {
       0, 0x384A, 0x5661, 0x4C26, 0x4743, 0x5662,      0, 0x392B,
  0xBC22, 0xBC23,      0, 0x342C,      0, 0x4327, 0x3652,      0,
 };
+static const unsigned short utf8_to_euc_E5B7_x0213[] = {
+      0,      0,      0, 0xBB76,      0,      0,      0, 0xBB77,
+      0, 0x565A,      0, 0x4F7D, 0x3460, 0x565B, 0xBB7A,      0,
+      0, 0xA868, 0x565D, 0x565C,      0,      0, 0x565E, 0xA869,
+ 0xA86A, 0xBB7C,      0, 0x565F,      0, 0x406E, 0x3D23,      0,
+ 0xA86B, 0x3D64, 0x7428, 0x4163, 0xA86D, 0x3929, 0x3A38, 0x392A,
+ 0x3570, 0xA86E,      0, 0x5660,      0,      0, 0x3A39,      0,
+      0, 0x384A, 0x5661, 0x4C26, 0x4743, 0x5662,      0, 0x392B,
+ 0xBC22, 0xBC23,      0, 0x342C,      0, 0x4327, 0x3652,      0,
+};
 static const unsigned short utf8_to_euc_E5B8[] = {
  0xBC24,      0, 0x3B54, 0x495B,      0,      0, 0x4841, 0xBC25,
       0,      0,      0, 0x5663, 0x3475, 0xBC26,      0,      0,
@@ -3649,6 +6657,16 @@ static const unsigned short utf8_to_euc_E5B8[] = {
  0x3522,      0, 0xBC2F, 0x4422,      0, 0xBC30, 0x5668, 0x5669,
  0x3E6F,      0,      0,      0,      0, 0x4B39, 0xBC31,      0,
 };
+static const unsigned short utf8_to_euc_E5B8_x0213[] = {
+ 0xA870,      0, 0x3B54, 0x495B,      0,      0, 0x4841, 0xBC25,
+      0,      0,      0, 0x5663, 0x3475, 0xBC26,      0,      0,
+      0, 0x5666, 0xA872,      0, 0x7429, 0xA873, 0x4421,      0,
+ 0x742A, 0x5665, 0x5664, 0x5667,      0, 0x446B,      0, 0xA875,
+ 0xBC2C,      0,      0,      0,      0, 0x3F63,      0,      0,
+ 0xBC2E,      0,      0, 0x3B55,      0, 0x404A, 0xA876, 0x4253,
+ 0x3522,      0, 0xBC2F, 0x4422,      0, 0xBC30, 0x5668, 0x5669,
+ 0x3E6F,      0,      0,      0,      0, 0x4B39, 0xA877,      0,
+};
 static const unsigned short utf8_to_euc_E5B9[] = {
  0x566C,      0,      0, 0x566B, 0x566A, 0x497D,      0, 0x5673,
       0, 0xBC34,      0, 0xBC32, 0x4B5A,      0, 0x566D,      0,
@@ -3659,6 +6677,16 @@ static const unsigned short utf8_to_euc_E5B9[] = {
  0xBC41,      0, 0x3433, 0x4A3F, 0x472F, 0x5674, 0x5675,      0,
  0x392C, 0x3434, 0x5676, 0x3838, 0x4D44, 0x4D29, 0x3476, 0x5678,
 };
+static const unsigned short utf8_to_euc_E5B9_x0213[] = {
+ 0x566C,      0,      0, 0x566B, 0x566A, 0x497D,      0, 0x5673,
+      0, 0xA878,      0, 0xBC32, 0x4B5A,      0, 0x566D,      0,
+ 0xBC33, 0xBC35,      0,      0, 0x566F, 0x4B6B, 0xA87A, 0x566E,
+ 0x742B,      0,      0, 0xBC38, 0xBC39,      0, 0x742C, 0x5670,
+      0, 0x4828, 0x5671, 0x4A3E, 0x5672,      0,      0,      0,
+ 0xBC3B,      0, 0xBC3C, 0xA87C, 0xA87D, 0xA87E, 0xAC21,      0,
+ 0xBC41,      0, 0x3433, 0x4A3F, 0x472F, 0x5674, 0x5675, 0x7E7C,
+ 0x392C, 0x3434, 0x5676, 0x3838, 0x4D44, 0x4D29, 0x3476, 0x5678,
+};
 static const unsigned short utf8_to_euc_E5BA[] = {
  0xBC42, 0x4423,      0, 0x392D, 0x3E31,      0,      0, 0x485F,
       0,      0, 0x3E32, 0xBC43,      0,      0, 0xBC44, 0x3D78,
@@ -3669,6 +6697,16 @@ static const unsigned short utf8_to_euc_E5BA[] = {
       0, 0xBC4B,      0, 0xBC4C,      0, 0x3043, 0x3D6E, 0x392F,
  0x4D47,      0,      0,      0,      0, 0xBC4D, 0xBC4E, 0xBC4F,
 };
+static const unsigned short utf8_to_euc_E5BA_x0213[] = {
+ 0xBC42, 0x4423,      0, 0x392D, 0x3E31,      0,      0, 0x485F,
+      0,      0, 0x3E32, 0xBC43,      0,      0, 0xBC44, 0x3D78,
+      0,      0,      0,      0,      0, 0x446C, 0x4A79, 0x4539,
+      0,      0, 0x392E,      0, 0x495C,      0,      0,      0,
+ 0x5679,      0, 0xBC45,      0, 0xBC46, 0xAC23, 0x4559, 0x3A42,
+ 0xBC48,      0, 0xAC24, 0x384B, 0xAC25, 0x446D,      0,      0,
+      0, 0xBC4B,      0, 0xBC4C,      0, 0x3043, 0x3D6E, 0x392F,
+ 0x4D47, 0xAC26,      0,      0,      0, 0xBC4D, 0x742D, 0xAC27,
+};
 static const unsigned short utf8_to_euc_E5BB[] = {
       0, 0x567A, 0x567B, 0x4751,      0,      0, 0xBC50,      0,
  0x567C, 0x4E77, 0x4F2D, 0xBC52, 0xBC51,      0, 0xBC53, 0x567E,
@@ -3679,6 +6717,16 @@ static const unsigned short utf8_to_euc_E5BB[] = {
  0x572D, 0x572B,      0, 0x572C, 0x572E,      0, 0x3164, 0x446E,
  0x572F,      0, 0x377A, 0x3276, 0x4736,      0, 0x5730, 0x467B,
 };
+static const unsigned short utf8_to_euc_E5BB_x0213[] = {
+      0, 0x567A, 0x567B, 0x4751,      0,      0, 0xAC28,      0,
+ 0x567C, 0x4E77, 0x4F2D, 0x742F, 0xBC51,      0, 0xBC53, 0x567E,
+ 0x567D, 0xBC54, 0xAC29, 0x3347, 0xBC56, 0xBC57, 0x5721,      0,
+      0, 0xAC2A, 0x5724, 0x5725, 0xBC58, 0x5723, 0xBC59, 0x4940,
+ 0x3E33, 0x5727, 0x5726, 0x5722,      0, 0xBC5A,      0,      0,
+ 0x5728, 0x5729,      0, 0xBC5B, 0x572A,      0,      0,      0,
+ 0x572D, 0x572B,      0, 0x572C, 0x572E,      0, 0x3164, 0x446E,
+ 0x572F, 0x7430, 0x377A, 0x3276, 0x4736, 0xAC2C, 0x5730, 0x467B,
+};
 static const unsigned short utf8_to_euc_E5BC[] = {
       0, 0x4A5B, 0xBC5C, 0x5731, 0x4F2E,      0, 0xBC5D, 0xBC5E,
  0xBC5F, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031, 0xBC60, 0x3C30,
@@ -3689,6 +6737,16 @@ static const unsigned short utf8_to_euc_E5BC[] = {
  0xBC6C, 0x3C65,      0,      0, 0xBC6D, 0x4425, 0xBC6E, 0x362F,
  0x573A,      0,      0, 0xBC6F, 0x492B, 0xBC70, 0x4346, 0xBC71,
 };
+static const unsigned short utf8_to_euc_E5BC_x0213[] = {
+ 0x7431, 0x4A5B, 0x7432, 0x5731, 0x4F2E,      0, 0xBC5D, 0x7433,
+ 0xAC2D, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031, 0xAC2E, 0x3C30,
+ 0x4675, 0x5736,      0, 0x355D, 0x4424, 0x307A, 0x5737, 0x4A26,
+ 0x3930, 0xBC61,      0, 0x4350, 0xAC2F, 0x7434, 0xAC31, 0x446F,
+      0,      0, 0xBC65, 0x7435, 0xBC67, 0x4C6F, 0x3839, 0x384C,
+ 0xBC68, 0x5738,      0, 0xBC69, 0xBC6A, 0x5739, 0xBC6B, 0x573F,
+ 0xBC6C, 0x3C65,      0,      0, 0x7436, 0x4425, 0x7437, 0x362F,
+ 0x573A,      0,      0, 0xBC6F, 0x492B, 0x7438, 0x4346, 0xBC71,
+};
 static const unsigned short utf8_to_euc_E5BD[] = {
  0xBC72, 0x573B,      0,      0, 0xBC73, 0xBC74,      0, 0xBC75,
  0x573C,      0, 0x3630,      0, 0x573D, 0xBC76, 0x573E,      0,
@@ -3699,6 +6757,16 @@ static const unsigned short utf8_to_euc_E5BD[] = {
  0x3E34, 0x3146, 0xBD22, 0x5746, 0xBD23, 0xBD24,      0, 0x5747,
  0xBD25, 0x4C72, 0xBD26,      0, 0x4860, 0xBD27, 0xBD28, 0x574A,
 };
+static const unsigned short utf8_to_euc_E5BD_x0213[] = {
+ 0x7439, 0x573B,      0,      0, 0xBC73, 0x743A,      0, 0xAC32,
+ 0x573C,      0, 0x3630,      0, 0x573D, 0xBC76, 0x573E,      0,
+ 0xBC77, 0x5740,      0, 0x4576, 0x743B,      0, 0x5741, 0x5742,
+ 0x743C, 0x5743,      0, 0xBC7A, 0x5734, 0x5733,      0,      0,
+ 0xBC7B, 0x5744, 0x3741, 0xAC33, 0x743D,      0, 0x4927, 0x743E,
+      0, 0x3A4C, 0x4937, 0x4426, 0x494B, 0x5745,      0, 0xBD21,
+ 0x3E34, 0x3146, 0xAC34, 0x5746, 0xBD23, 0xBD24,      0, 0x5747,
+ 0xBD25, 0x4C72, 0xBD26,      0, 0x4860, 0x743F, 0xAC35, 0x574A,
+};
 static const unsigned short utf8_to_euc_E5BE[] = {
  0x317D, 0x402C, 0x5749, 0x5748, 0x3742, 0x4254,      0, 0x574E,
  0x574C, 0xBD29, 0x574B, 0x4E27, 0x3865, 0xBD2A,      0, 0xBD2B,
@@ -3709,6 +6777,16 @@ static const unsigned short utf8_to_euc_E5BE[] = {
  0xBD35, 0xBD36,      0, 0x4641, 0x4427,      0,      0, 0xF43E,
  0xBD37, 0x4530,      0,      0, 0x5755, 0x352B,      0,      0,
 };
+static const unsigned short utf8_to_euc_E5BE_x0213[] = {
+ 0x317D, 0x402C, 0x5749, 0x5748, 0x3742, 0x4254,      0, 0x574E,
+ 0x574C, 0x7440, 0x574B, 0x4E27, 0x3865, 0xBD2A,      0, 0xAC36,
+ 0x3D79, 0x574D, 0x454C, 0x3D3E,      0,      0, 0xBD2C, 0x4640,
+ 0x5751, 0x5750,      0,      0, 0x7441, 0xBD2E, 0x574F,      0,
+ 0x5752, 0x3866, 0xAC37,      0, 0xAC38,      0,      0, 0x7442,
+ 0x5753, 0x497C, 0x3D5B, 0xBD31, 0xBD33, 0x5754, 0x4879, 0x7443,
+ 0xBD35, 0xBD36,      0, 0x4641, 0x4427, 0x7444,      0, 0x7445,
+ 0xAC39, 0x4530,      0,      0, 0x5755, 0x352B,      0,      0,
+};
 static const unsigned short utf8_to_euc_E5BF[] = {
       0,      0,      0, 0x3F34, 0xBD38, 0x492C,      0, 0xBD39,
  0xBD3A, 0xBD3B,      0, 0xBD3C, 0x3477, 0x4726,      0,      0,
@@ -3719,6 +6797,16 @@ static const unsigned short utf8_to_euc_E5BF[] = {
  0x582D, 0x575A, 0xBD4C, 0xBD4D,      0, 0x4730, 0xBD4E,      0,
  0x5759,      0, 0xBD4F, 0x5757, 0xBD50, 0x397A,      0, 0x575D,
 };
+static const unsigned short utf8_to_euc_E5BF_x0213[] = {
+      0,      0,      0, 0x3F34, 0xAC3A, 0x492C,      0, 0xAC3C,
+ 0xBD3A, 0x7446,      0, 0xAC3D, 0x3477, 0x4726,      0,      0,
+ 0xBD3D, 0xBD3E, 0xAC3E, 0xAC3F, 0xAC40,      0, 0x5756, 0x3B56,
+ 0x4B3A, 0x4B3B,      0,      0, 0x317E, 0x575B, 0x7447,      0,
+ 0x4369, 0x7448, 0xAC41,      0, 0x5758,      0,      0,      0,
+ 0xBD45, 0x7449, 0xBD47, 0x3277, 0xBD48, 0xBD49, 0xAC42, 0xAC43,
+ 0x582D, 0x575A, 0xBD4C, 0xAC44,      0, 0x4730, 0xBD4E,      0,
+ 0x5759,      0, 0xBD4F, 0x5757, 0xAC45, 0x397A,      0, 0x575D,
+};
 static const unsigned short utf8_to_euc_E680[] = {
       0,      0,      0,      0,      0,      0,      0, 0xBD51,
       0,      0, 0xBD52,      0,      0, 0xBD53, 0x5763, 0x5769,
@@ -3729,6 +6817,16 @@ static const unsigned short utf8_to_euc_E680[] = {
       0, 0x5764,      0, 0xBD5C,      0, 0xBD5D,      0,      0,
       0,      0, 0x576A,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E680_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0, 0xBD51,
+      0,      0, 0xBD52,      0,      0, 0x744A, 0x5763, 0x5769,
+ 0x5761,      0, 0x455C, 0xBD54, 0x744B, 0x5766, 0x495D, 0xAC47,
+ 0x744C, 0x5760, 0xBD58, 0x5765, 0x4E67, 0x3B57,      0, 0xBD59,
+ 0x4255, 0x575E, 0xAC48,      0, 0xAC49, 0x355E, 0x5768, 0x402D,
+ 0x3165, 0x5762, 0x3278, 0x5767,      0, 0xBD5B,      0, 0x3631,
+      0, 0x5764,      0, 0x744D,      0, 0x744E,      0,      0,
+      0,      0, 0x576A,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E681[] = {
  0xBD5E, 0x576C, 0x5776, 0x5774,      0,      0, 0x5771, 0xBD5F,
  0xBD60, 0xBD61, 0x5770, 0x4E78, 0xBD62, 0x5772,      0,      0,
@@ -3739,6 +6837,16 @@ static const unsigned short utf8_to_euc_E681[] = {
  0x3366, 0xBD6A,      0,      0,      0, 0x3743,      0, 0x576E,
       0,      0,      0,      0,      0,      0, 0xBD6B, 0xBD6C,
 };
+static const unsigned short utf8_to_euc_E681_x0213[] = {
+ 0xBD5E, 0x576C, 0x5776, 0x5774,      0,      0, 0x5771, 0x744F,
+ 0xBD60, 0xBD61, 0x5770, 0x4E78, 0xAC4B, 0x5772,      0,      0,
+ 0x3632, 0xBD63, 0x3931,      0, 0xBD64, 0x3D7A, 0xBD65, 0xBD66,
+      0, 0x5779, 0x576B,      0,      0,      0,      0, 0x576F,
+ 0x575F, 0xBD68, 0x327A, 0x5773, 0x5775, 0x4351,      0, 0xBD69,
+ 0x3A28, 0x3238, 0x576D, 0x5778, 0x5777, 0x3633,      0, 0x4229,
+ 0x3366, 0xBD6A,      0,      0,      0, 0x3743,      0, 0x576E,
+      0,      0,      0,      0,      0,      0, 0xBD6B, 0xAC4C,
+};
 static const unsigned short utf8_to_euc_E682[] = {
       0, 0x577A, 0xBD6D, 0x577D, 0x5821, 0xF43F, 0xBD6E,      0,
  0xBD6F, 0x3C3D, 0xBD70, 0x5827, 0x4470, 0x577B, 0xBD71,      0,
@@ -3749,6 +6857,16 @@ static const unsigned short utf8_to_euc_E682[] = {
  0xBD7C, 0xBD7D, 0x4861, 0x575C, 0x582C, 0x5830, 0x4C65, 0xBD7E,
  0x5829,      0,      0, 0xBE21, 0x4569, 0x582E, 0xBE22,      0,
 };
+static const unsigned short utf8_to_euc_E682_x0213[] = {
+      0, 0x577A, 0xBD6D, 0x577D, 0x5821,      0, 0xBD6E,      0,
+ 0xBD6F, 0x3C3D, 0xAC4D, 0x5827, 0x4470, 0x577B, 0xBD71,      0,
+      0, 0xBD72, 0x5825, 0xBD73, 0x3279, 0xAC4E, 0x5823, 0x5824,
+ 0xBD75,      0, 0x577E, 0x5822,      0, 0x7451, 0x7452, 0x3867,
+ 0x4D2A,      0, 0xBD78, 0x3435, 0xBD79, 0xBD7A, 0x3159, 0x5826,
+ 0xAC4F, 0x473A, 0x302D,      0,      0,      0,      0,      0,
+ 0xAC51, 0xAC52, 0x4861, 0x575C, 0x582C, 0x5830, 0x4C65, 0xBD7E,
+ 0x5829,      0,      0, 0xBE21, 0x4569, 0x582E, 0xAC53,      0,
+};
 static const unsigned short utf8_to_euc_E683[] = {
       0,      0, 0xBE23,      0, 0xBE24, 0x3E70, 0x582F, 0x4657,
  0xBE25, 0xBE26, 0xBE27, 0xBE28,      0,      0, 0xBE29, 0xBE2A,
@@ -3759,6 +6877,16 @@ static const unsigned short utf8_to_euc_E683[] = {
  0x4246, 0x583D, 0xBE33, 0x415B, 0x5838, 0xBE34, 0x5835, 0x5836,
  0xBE35, 0x3C66, 0x5839, 0x583C, 0xBE36, 0xBE37,      0,      0,
 };
+static const unsigned short utf8_to_euc_E683_x0213[] = {
+      0,      0, 0xBE23,      0, 0xBE24, 0x3E70, 0x582F, 0x4657,
+ 0xAC54, 0xBE26, 0xBE27, 0x7453,      0,      0, 0xBE29, 0xBE2A,
+      0, 0x4F47,      0, 0x582B, 0x7454, 0x7455,      0,      0,
+ 0x5831, 0xAC55, 0x397B, 0xAC56, 0x404B, 0x7456,      0, 0x3054,
+ 0x582A, 0x5828, 0xBE31, 0x415A,      0, 0xBE32,      0, 0x577C,
+ 0x3B34,      0,      0,      0,      0,      0, 0xAC57,      0,
+ 0x4246, 0x583D, 0xAC58, 0x415B, 0x5838, 0xAC59, 0x5835, 0x5836,
+ 0x7457, 0x3C66, 0x5839, 0x583C, 0xBE36, 0xBE37,      0,      0,
+};
 static const unsigned short utf8_to_euc_E684[] = {
  0x5837, 0x3D25, 0xBE38, 0x583A,      0,      0, 0x5834, 0xBE39,
  0x4C7C, 0x4C7B, 0xBE3A,      0, 0xBE3B, 0x583E, 0x583F, 0x3055,
@@ -3769,6 +6897,16 @@ static const unsigned short utf8_to_euc_E684[] = {
  0xBE49, 0xBE4A,      0,      0, 0x5848, 0xBE4B, 0xBE4C, 0xBE4D,
       0, 0xBE4E,      0,      0, 0x5846, 0x5849, 0x5841, 0x5845,
 };
+static const unsigned short utf8_to_euc_E684_x0213[] = {
+ 0x5837, 0x3D25, 0xBE38, 0x583A,      0,      0, 0x5834, 0xBE39,
+ 0x4C7C, 0x4C7B, 0xBE3A,      0, 0xBE3B, 0x583E, 0x583F, 0x3055,
+ 0xAC5A,      0, 0xAC5B, 0xAC5C, 0xBE40, 0x5833, 0xBE41, 0xBE42,
+      0, 0xAC5D, 0x3672, 0x3026, 0x7458,      0, 0xAC5E, 0x3436,
+      0, 0x583B, 0xBE46,      0,      0,      0,      0, 0x5843,
+ 0x5842,      0, 0xBE47, 0x7459, 0x5847,      0,      0,      0,
+ 0x745A, 0xBE4A,      0,      0, 0x5848, 0xBE4B, 0xBE4C, 0x745B,
+      0, 0xBE4E, 0xAC5F,      0, 0x5846, 0x5849, 0x5841, 0x5845,
+};
 static const unsigned short utf8_to_euc_E685[] = {
       0, 0xBE4F, 0x584A,      0, 0x584B, 0xBE50, 0xBE51, 0x5840,
  0x3B7C, 0xBE52, 0x5844, 0x4256, 0x3932, 0x5832, 0x3F35,      0,
@@ -3779,6 +6917,16 @@ static const unsigned short utf8_to_euc_E685[] = {
  0x3056, 0x5855, 0xBE56, 0x584C, 0x5852, 0x5859, 0x3744, 0x584D,
  0xBE57,      0,      0, 0xBE58, 0xBE59,      0, 0x4D5D, 0xBE5A,
 };
+static const unsigned short utf8_to_euc_E685_x0213[] = {
+      0, 0xAC61, 0x584A,      0, 0x584B, 0xBE50, 0xAC62, 0x5840,
+ 0x3B7C, 0xBE52, 0x5844, 0x4256, 0x3932, 0x5832, 0x3F35,      0,
+      0,      0,      0, 0x5858,      0, 0x4A69,      0,      0,
+ 0x584E, 0x584F, 0x5850,      0,      0, 0x5857, 0xBE53, 0x5856,
+ 0xAC63,      0, 0x4B7D, 0x3437,      0, 0x5854,      0, 0x3745,
+ 0x3334,      0,      0, 0x5851, 0xBE55,      0, 0x4E38, 0x5853,
+ 0x3056, 0x5855, 0xBE56, 0x584C, 0x5852, 0x5859, 0x3744, 0x584D,
+ 0xBE57,      0,      0, 0xBE58, 0xAC64,      0, 0x4D5D, 0xBE5A,
+};
 static const unsigned short utf8_to_euc_E686[] = {
  0xBE5B, 0xBE5C, 0x4D2B, 0xBE5D, 0xBE5E,      0,      0, 0x585C,
       0,      0, 0x5860, 0xBE5F,      0, 0xBE60, 0x417E,      0,
@@ -3789,6 +6937,16 @@ static const unsigned short utf8_to_euc_E686[] = {
       0,      0, 0x377B,      0,      0,      0, 0x3231,      0,
  0xBE6D, 0xBE6E, 0x586B,      0, 0xBE6F,      0, 0x3438,      0,
 };
+static const unsigned short utf8_to_euc_E686_x0213[] = {
+ 0xBE5B, 0xBE5C, 0x4D2B, 0xBE5D, 0xBE5E,      0,      0, 0x585C,
+      0,      0, 0x5860, 0xBE5F,      0, 0x745D, 0x417E,      0,
+ 0x4E79, 0x5861, 0xAC66, 0xAC67, 0x585E,      0, 0x585B, 0xAC68,
+ 0xAC69, 0x585A, 0x585F,      0, 0xBE65, 0xBE66,      0, 0xBE67,
+ 0xBE68,      0,      0,      0, 0x4A30, 0xAC6A,      0, 0x4634,
+ 0xAC6B, 0x3746, 0xBE6B, 0x5862, 0x585D, 0xAC6C, 0x5863,      0,
+      0,      0, 0x377B,      0,      0,      0, 0x3231,      0,
+ 0xBE6D, 0x7460, 0x586B,      0, 0x745F,      0, 0x3438,      0,
+};
 static const unsigned short utf8_to_euc_E687[] = {
  0xBE70, 0xBE71, 0xBE72, 0x5869,      0,      0, 0x586A, 0x3A29,
  0x5868, 0x5866, 0x5865, 0x586C, 0x5864, 0x586E, 0xBE73, 0xBE74,
@@ -3799,6 +6957,16 @@ static const unsigned short utf8_to_euc_E687[] = {
       0,      0, 0x4428,      0, 0x5873,      0, 0x5871, 0x5867,
  0x377C,      0, 0x5872,      0, 0x5876, 0x5875, 0x5877, 0x5874,
 };
+static const unsigned short utf8_to_euc_E687_x0213[] = {
+ 0xBE70, 0xBE71, 0xBE72, 0x5869,      0,      0, 0x586A, 0x3A29,
+ 0x5868, 0x5866, 0x5865, 0x586C, 0x5864, 0x586E, 0xBE73, 0xBE74,
+ 0x327B,      0,      0,      0,      0, 0xAC6E,      0,      0,
+      0,      0,      0,      0, 0xBE76, 0xAC6F, 0xBE78, 0xAC70,
+      0, 0xBE7A, 0xBE7B, 0x5870,      0, 0xBE7E, 0x586F, 0xBE7C,
+      0, 0xBE7D,      0,      0, 0xBF21, 0xBF22,      0, 0xBF23,
+      0,      0, 0x4428,      0, 0x5873, 0xAC71, 0x5871, 0x5867,
+ 0x377C,      0, 0x5872,      0, 0x5876, 0x5875, 0x5877, 0x5874,
+};
 static const unsigned short utf8_to_euc_E688[] = {
  0x5878, 0xBF24,      0, 0xBF25, 0xBF26,      0,      0, 0xBF27,
  0x5879, 0x587A, 0x4A6A,      0, 0x587C, 0x587B, 0x3D3F,      0,
@@ -3809,6 +6977,16 @@ static const unsigned short utf8_to_euc_E688[] = {
  0x5925,      0, 0x5926, 0x5927, 0x4257,      0,      0,      0,
  0x384D, 0xBF31,      0, 0x4C61,      0, 0xBF32,      0, 0x4B3C,
 };
+static const unsigned short utf8_to_euc_E688_x0213[] = {
+ 0x5878, 0xBF24,      0, 0xBF25, 0xBF26,      0,      0, 0xBF27,
+ 0x5879, 0x587A, 0x4A6A,      0, 0x587C, 0x587B, 0x3D3F,      0,
+ 0x402E, 0x3266, 0x327C,      0, 0x587D, 0xAC73, 0x303F,      0,
+      0,      0, 0x404C, 0x587E, 0xBF2A, 0x6C43, 0x5921, 0x3761,
+ 0xBF2B, 0x5922, 0x7462, 0xAC74,      0,      0, 0x406F, 0xBF2E,
+      0, 0xAC75, 0x5923, 0xBF30,      0,      0, 0x5924, 0x353A,
+ 0x5925,      0, 0x5926, 0x5927, 0x4257,      0,      0,      0,
+ 0x384D, 0xBF31,      0, 0x4C61,      0, 0xBF32, 0x7463, 0x4B3C,
+};
 static const unsigned short utf8_to_euc_E689[] = {
  0x3D6A, 0x5928, 0xBF33, 0xBF34, 0xBF35,      0, 0xBF36, 0x4070,
  0x6E3D, 0x4862,      0, 0x3C6A, 0xBF37, 0x3A4D, 0x5929,      0,
@@ -3819,6 +6997,16 @@ static const unsigned short utf8_to_euc_E689[] = {
       0, 0x3037,      0, 0xBF42,      0,      0, 0x495E,      0,
       0, 0x4863, 0xBF43,      0, 0x592F, 0xBF44, 0x5932, 0x3E35,
 };
+static const unsigned short utf8_to_euc_E689_x0213[] = {
+ 0x3D6A, 0x5928, 0xBF33, 0x7464, 0xBF35,      0, 0xAC76, 0x4070,
+ 0x6E3D, 0x4862,      0, 0x3C6A, 0xAC77, 0x3A4D, 0x5929,      0,
+ 0xBF38, 0xAC78, 0xAC79, 0x4247, 0xBF3B, 0x4A27, 0x7465,      0,
+ 0x4271,      0, 0x7466, 0x592C, 0xBF3E,      0, 0x592A,      0,
+ 0x592D, 0xAC7A,      0, 0x592B, 0xAC7B,      0,      0,      0,
+ 0x592E,      0,      0,      0,      0, 0xAC7D, 0x4A31, 0x7467,
+      0, 0x3037,      0, 0xAC7E,      0,      0, 0x495E,      0,
+      0, 0x4863, 0xBF43, 0xAC7C, 0x592F, 0xBF44, 0x5932, 0x3E35,
+};
 static const unsigned short utf8_to_euc_E68A[] = {
  0x353B,      0, 0x5930, 0x5937, 0x3E36,      0,      0,      0,
       0, 0x5931, 0x4744,      0,      0, 0xBF45, 0xBF46, 0xBF47,
@@ -3829,6 +7017,16 @@ static const unsigned short utf8_to_euc_E68A[] = {
       0, 0x4A7A,      0, 0xBF4B,      0, 0x4471, 0xBF4C, 0xBF4D,
       0, 0x4B75, 0xBF4E, 0x593B, 0x3221, 0x436A, 0xBF4F, 0xBF50,
 };
+static const unsigned short utf8_to_euc_E68A_x0213[] = {
+ 0x353B,      0, 0x5930, 0x5937, 0x3E36, 0x7468,      0,      0,
+      0, 0x5931, 0x4744,      0,      0, 0xBF45, 0xBF46, 0xBF47,
+ 0xBF48, 0x4D5E, 0x5933, 0x5934, 0x5938, 0x456A, 0x5935, 0x3933,
+ 0x405E, 0xAD21,      0, 0x5946, 0x4834,      0, 0x4272,      0,
+      0,      0,      0,      0,      0,      0, 0xAD22,      0,
+ 0xBF4A,      0,      0, 0x4864, 0x5A2D,      0,      0,      0,
+      0, 0x4A7A,      0, 0xBF4B,      0, 0x4471, 0xBF4C, 0xBF4D,
+      0, 0x4B75, 0xBF4E, 0x593B, 0x3221, 0x436A, 0xBF4F, 0xBF50,
+};
 static const unsigned short utf8_to_euc_E68B[] = {
       0,      0, 0x5944,      0, 0xBF51, 0x4334, 0x593E, 0x5945,
  0x5940, 0x5947, 0x5943,      0, 0x5942, 0x476F, 0xBF52, 0x593C,
@@ -3839,6 +7037,16 @@ static const unsigned short utf8_to_euc_E68B[] = {
       0, 0x594A, 0xBF57, 0x377D, 0xBF58, 0x594F, 0x3B22, 0x3969,
       0,      0,      0,      0, 0xBF59, 0xBF5A, 0x3D26, 0x593D,
 };
+static const unsigned short utf8_to_euc_E68B_x0213[] = {
+      0,      0, 0x5944,      0, 0x7469, 0x4334, 0x593E, 0x5945,
+ 0x5940, 0x5947, 0x5943,      0, 0x5942, 0x476F, 0xBF52, 0x593C,
+ 0x327D, 0x593A, 0x3571, 0x4273, 0x5936, 0xAD23, 0x746A, 0x5939,
+ 0x3934, 0x405B, 0xBF55, 0x3E37, 0x5941, 0x4752,      0,      0,
+ 0x3572, 0x3348,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xBF56,      0, 0x3367, 0x3F21, 0x5949, 0x594E,
+      0, 0x594A, 0xBF57, 0x377D, 0xBF58, 0x594F, 0x3B22, 0x3969,
+      0,      0,      0,      0, 0x746B, 0xAD25, 0x3D26, 0x593D,
+};
 static const unsigned short utf8_to_euc_E68C[] = {
       0, 0x3B7D, 0x594C, 0xBF5B, 0xBF5C,      0,      0, 0x3B58,
  0x594D, 0x3044, 0xBF5D, 0xBF5E, 0x5948, 0xBF5F,      0,      0,
@@ -3849,6 +7057,16 @@ static const unsigned short utf8_to_euc_E68C[] = {
       0,      0,      0,      0,      0, 0xBF67, 0xBF68,      0,
       0, 0xBF69, 0x4472,      0, 0xBF6A, 0x4854, 0x5951, 0x415E,
 };
+static const unsigned short utf8_to_euc_E68C_x0213[] = {
+      0, 0x3B7D, 0x594C, 0xAD26, 0xBF5C,      0,      0, 0x3B58,
+ 0x594D, 0x3044, 0x746C, 0xBF5E, 0x5948, 0xAD27,      0,      0,
+ 0xAD28, 0x4429,      0, 0xBF61,      0,      0, 0xBF62,      0,
+ 0x746D, 0x3573,      0,      0,      0,      0,      0, 0x3634,
+      0,      0,      0,      0,      0,      0,      0, 0x594B,
+ 0x3027, 0xBF64, 0xBF65, 0x3A43,      0, 0xBF66,      0, 0x3F36,
+      0,      0, 0xAD2B,      0,      0, 0xAD2C, 0xBF68,      0,
+      0, 0x746E, 0x4472, 0xAD2D, 0xAD2E, 0x4854, 0x5951, 0x415E,
+};
 static const unsigned short utf8_to_euc_E68D[] = {
       0, 0xBF6B, 0xBF6C, 0xBF6D, 0xBF6E,      0, 0xBF6F,      0,
       0, 0x422A, 0xBF70, 0xBF71, 0x3B2B, 0x5952, 0xBF72, 0x5954,
@@ -3859,6 +7077,16 @@ static const unsigned short utf8_to_euc_E68D[] = {
       0, 0xBF7C, 0x377E,      0, 0xBF7D, 0xBF7E, 0x5959, 0x3E39,
  0xC021,      0, 0x4668, 0x4731, 0xC022, 0xC023,      0, 0xC024,
 };
+static const unsigned short utf8_to_euc_E68D_x0213[] = {
+      0, 0xAD2F, 0xBF6C, 0x746F, 0xAD30,      0, 0xBF6F,      0,
+      0, 0x422A, 0xBF70, 0xBF71, 0x3B2B, 0x5952, 0xAD31, 0x5954,
+ 0x5950,      0, 0xBF73, 0xBF74, 0xBF75, 0x4A61,      0, 0x443D,
+ 0xBF76, 0xAD33,      0, 0xBF77, 0x415C,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x7470, 0xBF79, 0x4A7B,
+ 0x3C4E, 0x5960,      0, 0x595F, 0xAD36, 0xBF7B, 0x3F78,      0,
+      0, 0xBF7C, 0x377E,      0, 0xBF7D, 0xBF7E, 0x5959, 0x3E39,
+ 0xC021,      0, 0x4668, 0x4731, 0x7471, 0xC023,      0, 0xC024,
+};
 static const unsigned short utf8_to_euc_E68E[] = {
  0x5957,      0, 0xC025, 0x415D, 0xC026,      0,      0, 0xC027,
  0x3C78, 0x595C, 0xC028,      0, 0x3E38,      0, 0x5956, 0x595B,
@@ -3869,6 +7097,16 @@ static const unsigned short utf8_to_euc_E68E[] = {
       0,      0, 0x3747,      0, 0x444F, 0x595E,      0,      0,
       0,      0,      0, 0x415F,      0, 0xC034, 0x5961,      0,
 };
+static const unsigned short utf8_to_euc_E68E_x0213[] = {
+ 0x5957,      0, 0xC025, 0x415D, 0xAD37,      0,      0, 0xC027,
+ 0x3C78, 0x595C, 0xC028,      0, 0x3E38,      0, 0x5956, 0x595B,
+ 0xC029,      0, 0x4753,      0, 0xAD3A, 0xC02B, 0x5955,      0,
+ 0x3721, 0xAD38, 0xC02D, 0x335D,      0,      0, 0xC02E, 0x595D,
+ 0x4E2B, 0x3A4E, 0x4335, 0x595A, 0xC02F, 0x405C, 0xC030, 0x3935,
+ 0x3F64, 0x3166, 0x413C, 0x5958, 0x3545, 0xC031, 0xC032, 0xC033,
+      0,      0, 0x3747,      0, 0x444F, 0x595E,      0,      0,
+      0,      0,      0, 0x415F,      0, 0xAD3B, 0x5961,      0,
+};
 static const unsigned short utf8_to_euc_E68F[] = {
  0x5963, 0xC035,      0, 0x4237, 0x5969, 0xC036, 0x5964,      0,
  0xC037, 0x5966,      0,      0,      0,      0, 0xC038, 0x4941,
@@ -3879,6 +7117,16 @@ static const unsigned short utf8_to_euc_E68F[] = {
       0,      0, 0xC042, 0xC043, 0x3167, 0xC044, 0x5968,      0,
  0xC045, 0xC046, 0x4D49,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E68F_x0213[] = {
+ 0x5963, 0xC035,      0, 0x4237, 0x5969, 0xC036, 0x5964,      0,
+ 0xC037, 0x5966,      0,      0,      0,      0, 0xC038, 0x4941,
+ 0x4473, 0xC039, 0x5967, 0xC03A, 0xAD3D, 0xAD3E, 0x4D2C,      0,
+      0,      0, 0x4D48, 0x3439, 0xAD3F,      0,      0,      0,
+ 0xAD40, 0x302E,      0, 0x5965,      0, 0x7472,      0,      0,
+      0, 0x5962, 0xC040, 0xAD41, 0xAD42, 0x7473, 0x3478,      0,
+      0,      0, 0xAD43, 0xC043, 0x3167, 0x7474, 0x5968, 0xAD3C,
+ 0xC045, 0xC046, 0x4D49,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E690[] = {
       0,      0,      0,      0,      0,      0, 0x596C,      0,
       0, 0xC047, 0xC048,      0,      0, 0x423B,      0, 0x5973,
@@ -3889,6 +7137,16 @@ static const unsigned short utf8_to_euc_E690[] = {
  0xC055,      0,      0,      0, 0x596B, 0xC056, 0x596F,      0,
       0,      0, 0x3748,      0,      0, 0xC057, 0x3A71, 0xC058,
 };
+static const unsigned short utf8_to_euc_E690_x0213[] = {
+      0,      0,      0,      0,      0,      0, 0x596C,      0,
+      0, 0xAD44, 0xC048,      0,      0, 0x423B,      0, 0x5973,
+ 0x7475,      0, 0xC04A, 0x596D, 0x7476,      0, 0x596A, 0x5971,
+ 0xC04C,      0,      0,      0, 0x5953,      0, 0xAD45,      0,
+ 0xC04E,      0, 0x7477,      0, 0xC050, 0xAD46, 0x596E,      0,
+ 0x5972, 0xAD47, 0xC053,      0, 0x4842, 0x456B,      0, 0xAD48,
+ 0xC055,      0,      0,      0, 0x596B, 0xC056, 0x596F,      0,
+      0,      0, 0x3748,      0,      0, 0xC057, 0x3A71, 0xC058,
+};
 static const unsigned short utf8_to_euc_E691[] = {
       0,      0, 0x405D,      0,      0,      0,      0,      0,
       0,      0,      0, 0xC059,      0,      0, 0x5977, 0xC05A,
@@ -3899,6 +7157,16 @@ static const unsigned short utf8_to_euc_E691[] = {
       0,      0,      0, 0xC068, 0xC069,      0, 0x5976,      0,
  0x4C4E,      0, 0x4022, 0xC06A,      0, 0xC06B,      0,      0,
 };
+static const unsigned short utf8_to_euc_E691_x0213[] = {
+      0,      0, 0x405D,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xC059,      0,      0, 0x5977, 0xC05A,
+      0, 0x7479, 0xC05C, 0xC05D, 0xC05E,      0,      0,      0,
+ 0x4526,      0, 0xAD49, 0xAD4A, 0xC061, 0xAD4B,      0, 0xC063,
+ 0x747A, 0xC065,      0, 0xC066,      0,      0,      0, 0x5974,
+      0, 0x4B60,      0,      0,      0, 0x747B,      0, 0x5975,
+      0,      0,      0, 0xAD4C, 0xC069,      0, 0x5976,      0,
+ 0x4C4E, 0x7478, 0x4022, 0xC06A,      0, 0xAD4D,      0,      0,
+};
 static const unsigned short utf8_to_euc_E692[] = {
       0,      0,      0, 0x3762,      0, 0xC06C,      0, 0xC06D,
  0x597D,      0,      0,      0,      0,      0,      0, 0xC06E,
@@ -3909,6 +7177,16 @@ static const unsigned short utf8_to_euc_E692[] = {
  0x4071,      0, 0x4B50, 0xC07B,      0,      0,      0,      0,
       0, 0x3349,      0, 0x5A25, 0x597E, 0xC07C, 0xC07D, 0xC07E,
 };
+static const unsigned short utf8_to_euc_E692_x0213[] = {
+      0,      0,      0, 0x3762,      0, 0xC06C,      0, 0xAD4E,
+ 0x597D,      0,      0,      0,      0,      0,      0, 0xC06E,
+ 0xC06F, 0xAD4F, 0x3B35, 0x597A,      0, 0x5979,      0,      0,
+ 0xC071, 0xC072, 0x4732, 0xC073,      0, 0xAD50, 0x4635, 0xAD51,
+      0, 0xC076,      0, 0xC077, 0x4531, 0x597B, 0xC078,      0,
+ 0xC079, 0x597C,      0, 0x496F, 0xC07A, 0x4745, 0x3B23,      0,
+ 0x4071,      0, 0x4B50, 0xC07B,      0,      0,      0,      0,
+      0, 0x3349,      0, 0x5A25, 0x597E, 0xC07C, 0x747D, 0x747E,
+};
 static const unsigned short utf8_to_euc_E693[] = {
       0, 0x4D4A, 0x5A27,      0, 0xC121, 0x5A23,      0, 0x5A24,
       0, 0xC122, 0xC123, 0xC124, 0xC125, 0x4160, 0xC126,      0,
@@ -3919,6 +7197,16 @@ static const unsigned short utf8_to_euc_E693[] = {
  0xC130, 0x5A28, 0x5A33,      0, 0x5A32, 0xC131, 0x5A31, 0xC132,
       0,      0, 0x5A34, 0xC133,      0, 0x5A36, 0x3E71, 0xC134,
 };
+static const unsigned short utf8_to_euc_E693_x0213[] = {
+      0, 0x4D4A, 0x5A27,      0, 0x7521, 0x5A23,      0, 0x5A24,
+      0, 0xC122, 0x7522, 0xAD52, 0xAD53, 0x4160, 0x747C,      0,
+ 0x7523, 0xC128, 0x5A22,      0, 0x593F, 0xAD54,      0, 0xAD55,
+ 0x5A26,      0, 0x5A21,      0,      0,      0,      0,      0,
+ 0x5A2B, 0x5A2C, 0x4527, 0x5A2E, 0xAD57, 0xAD58, 0x3B24, 0x5A29,
+      0, 0xC12D, 0xC12E,      0, 0x353C, 0xC12F,      0, 0x5A2F,
+ 0xC130, 0x5A28, 0x5A33,      0, 0x5A32, 0xC131, 0x5A31, 0x7524,
+      0,      0, 0x5A34, 0x7525,      0, 0x5A36, 0x3E71, 0xAD59,
+};
 static const unsigned short utf8_to_euc_E694[] = {
  0x5A35, 0xC135,      0,      0, 0xC136, 0x5A39,      0,      0,
  0xC137, 0xC138, 0xC139,      0,      0,      0,      0, 0xC13A,
@@ -3929,6 +7217,16 @@ static const unsigned short utf8_to_euc_E694[] = {
       0, 0xC146,      0,      0, 0x5A3D, 0x5A3E, 0x5A40, 0x5A3F,
  0x5A41, 0x327E, 0xC147, 0x3936, 0xC148, 0xC149, 0x4A7C, 0x402F,
 };
+static const unsigned short utf8_to_euc_E694_x0213[] = {
+ 0x5A35, 0xC135,      0,      0, 0xAD5A, 0x5A39,      0,      0,
+ 0xC137, 0xC138, 0xC139,      0,      0,      0,      0, 0xAD5C,
+      0,      0,      0, 0xC13B, 0xAD5D,      0, 0xAD5E,      0,
+ 0x5A37, 0xC13E,      0, 0xC13F, 0x5A38, 0x5970, 0xAD60, 0xC141,
+      0,      0, 0x7526, 0x5A3B, 0x5A3A,      0, 0xC143,      0,
+      0, 0x7527, 0x5978, 0x5A3C, 0x5A30,      0, 0xC145, 0x3B59,
+      0, 0xC146, 0xAD61,      0, 0x5A3D, 0x5A3E, 0x5A40, 0x5A3F,
+ 0x5A41, 0x327E, 0xC147, 0x3936, 0xC148, 0xC149, 0x4A7C, 0x402F,
+};
 static const unsigned short utf8_to_euc_E695[] = {
       0,      0,      0, 0xC14A,      0, 0x384E,      0, 0xC14B,
  0x5A43, 0xC14C,      0,      0,      0, 0x5A46, 0xF441, 0x4952,
@@ -3939,6 +7237,16 @@ static const unsigned short utf8_to_euc_E695[] = {
  0x3F74,      0, 0x5A4A,      0, 0x4030, 0x4528,      0, 0x495F,
  0x5A4B,      0, 0xC154,      0,      0, 0xC155,      0,      0,
 };
+static const unsigned short utf8_to_euc_E695_x0213[] = {
+      0,      0,      0, 0xC14A, 0xAD62, 0x384E,      0, 0xC14B,
+ 0x5A43, 0xC14C,      0,      0,      0, 0x5A46,      0, 0x4952,
+ 0xC14D, 0x355F, 0xC14E,      0, 0xAD63, 0x5A45, 0x5A44, 0x4754,
+ 0x5A47, 0x3635,      0,      0,      0, 0x5A49, 0x5A48, 0xC150,
+ 0xC151,      0, 0x343A, 0x3B36,      0,      0, 0x4658, 0x7529,
+      0,      0,      0, 0xAD64, 0x3749,      0,      0,      0,
+ 0x3F74,      0, 0x5A4A,      0, 0x4030, 0x4528,      0, 0x495F,
+ 0x5A4B,      0, 0xAD65,      0,      0, 0xC155,      0,      0,
+};
 static const unsigned short utf8_to_euc_E696[] = {
       0, 0xC156, 0x5A4C, 0x5A4D,      0, 0xC157,      0, 0x4A38,
  0x555D, 0x4046, 0xC158,      0, 0x494C,      0, 0x3A58,      0,
@@ -3949,6 +7257,16 @@ static const unsigned short utf8_to_euc_E696[] = {
  0x3F37,      0, 0xC161, 0xC162, 0xC163,      0,      0, 0x5A52,
       0, 0x4A7D,      0,      0, 0x3177, 0x3B5C,      0, 0xC164,
 };
+static const unsigned short utf8_to_euc_E696_x0213[] = {
+      0, 0xAD66, 0x5A4C, 0x5A4D, 0xAD67, 0xAD68,      0, 0x4A38,
+ 0x555D, 0x4046, 0xAD69,      0, 0x494C,      0, 0x3A58,      0,
+ 0x4865, 0x4843, 0xC159,      0,      0, 0xC15A,      0, 0x454D,
+ 0xC15B, 0x4E41,      0, 0x5A4F, 0x3C50, 0x752A,      0, 0x5A50,
+ 0xC15D, 0x3036,      0, 0xC15E, 0x3654, 0x404D, 0xC15F, 0x4960,
+      0,      0,      0, 0x5A51, 0x3B42, 0x4347, 0xC160, 0x3B5B,
+ 0x3F37,      0, 0xAD6A, 0xC162, 0xC163, 0xAD6B,      0, 0x5A52,
+ 0xAD6C, 0x4A7D,      0,      0, 0x3177, 0x3B5C,      0, 0xAD6D,
+};
 static const unsigned short utf8_to_euc_E697[] = {
       0, 0x5A55, 0xC165, 0x5A53, 0x5A56, 0x4E39, 0x5A54,      0,
  0xC166, 0xC167,      0, 0x407B, 0x5A57,      0, 0xC168, 0x4232,
@@ -3959,6 +7277,16 @@ static const unsigned short utf8_to_euc_E697[] = {
  0xC16E, 0x5A5D, 0xC16F,      0, 0xC170, 0xC171,      0,      0,
       0, 0xC172, 0x3222, 0x5A61,      0,      0, 0xC173, 0xC174,
 };
+static const unsigned short utf8_to_euc_E697_x0213[] = {
+      0, 0x5A55, 0xAD6E, 0x5A53, 0x5A56, 0x4E39, 0x5A54,      0,
+ 0xC166, 0xAD6F,      0, 0x407B, 0x5A57,      0, 0xC168, 0x4232,
+ 0xC169,      0, 0x5A58,      0, 0xAD70,      0, 0xC16B, 0x347A,
+ 0xC16C, 0x5A5A,      0, 0x5A59,      0,      0,      0, 0xC16D,
+ 0x5A5B, 0x5A5C, 0x347B,      0,      0, 0x467C, 0x4336, 0x356C,
+ 0x3B5D, 0x4161,      0,      0, 0x3D5C, 0x3030,      0,      0,
+ 0xC16E, 0x5A5D, 0xAD72,      0, 0xC170, 0xC171,      0,      0,
+      0, 0xAD73, 0x3222, 0x5A61, 0xAD74,      0, 0xC173, 0xC174,
+};
 static const unsigned short utf8_to_euc_E698[] = {
  0xC175,      0, 0x3937, 0x5A60, 0xC176,      0, 0x3A2B, 0x3E3A,
  0xC177, 0xC178, 0x5A5F,      0, 0x3E3B, 0xC179, 0x4C40, 0x3A2A,
@@ -3969,6 +7297,16 @@ static const unsigned short utf8_to_euc_E698[] = {
  0xC22C, 0xC22D,      0, 0xC22E, 0x5A65, 0x5A63, 0x5A64, 0xC230,
       0, 0xC22F,      0, 0xF442, 0x436B,      0,      0, 0x5B26,
 };
+static const unsigned short utf8_to_euc_E698_x0213[] = {
+ 0x752C,      0, 0x3937, 0x5A60, 0xAD75,      0, 0x3A2B, 0x3E3A,
+ 0xAD76, 0x752D, 0x5A5F,      0, 0x3E3B, 0xC179, 0x4C40, 0x3A2A,
+      0, 0xC17A, 0xC17B, 0x3057, 0x404E, 0x752E, 0xC17D,      0,
+      0,      0,      0,      0, 0x5A66, 0xC17E, 0x752F, 0x4031,
+ 0x3147, 0xAD77, 0x7531, 0xC224, 0x7532, 0x3D55, 0xC226, 0x4B66,
+ 0x3A72, 0xC227, 0xAD78, 0x7533, 0xC22A, 0x3E3C,      0, 0x4027,
+ 0x7534, 0x7535,      0, 0x7536, 0x5A65, 0x5A63, 0x5A64, 0xC230,
+      0, 0xC22F, 0x7530,      0, 0x436B,      0,      0, 0x5B26,
+};
 static const unsigned short utf8_to_euc_E699[] = {
  0xC231, 0x5A6A, 0x3B7E, 0x3938, 0x5A68, 0xC232, 0xC233,      0,
       0, 0x5A69, 0xC234, 0x3F38, 0xC235,      0, 0xC237, 0x5A67,
@@ -3979,6 +7317,16 @@ static const unsigned short utf8_to_euc_E699[] = {
  0x5A72,      0,      0, 0xC244, 0x4032, 0xC245, 0x3E3D, 0xC247,
  0xC248, 0xC249, 0x4352, 0xC24A, 0xC24C,      0, 0xC243, 0xC246,
 };
+static const unsigned short utf8_to_euc_E699_x0213[] = {
+ 0xC231, 0x5A6A, 0x3B7E, 0x3938, 0x5A68, 0xAD79, 0xC233,      0,
+ 0x7538, 0x5A69, 0xC234, 0x3F38, 0x7539,      0, 0xAD7B, 0x5A67,
+      0, 0xAD7A, 0x3B2F,      0,      0,      0,      0, 0xAD7E,
+ 0xC239, 0x753B, 0x753C, 0xAE21, 0xC23C, 0x5A6C, 0x5A6B, 0x5A70,
+ 0xC23D, 0x753D, 0x5A71, 0xAE22, 0x5A6D, 0x753E, 0x3322, 0x5A6E,
+ 0x5A6F, 0x4855, 0xAE25, 0xAE26, 0xAE27, 0xAE28, 0x4961, 0x374A,
+ 0x5A72,      0,      0, 0x753F, 0x4032, 0xC245, 0x3E3D, 0x7540,
+ 0x7541, 0xC249, 0x4352, 0xAE29, 0xC24C,      0, 0xC243, 0xC246,
+};
 static const unsigned short utf8_to_euc_E69A[] = {
  0xC24B, 0x3647,      0, 0x5A73, 0x5A77,      0,      0, 0x324B,
  0x5A74, 0x5A76,      0, 0xC24D, 0xC24E, 0xC24F, 0x5A75,      0,
@@ -3989,6 +7337,16 @@ static const unsigned short utf8_to_euc_E69A[] = {
       0, 0xC25A, 0xC25B,      0, 0x4B3D, 0xC25C,      0,      0,
  0x5B22, 0x5A7B,      0, 0xC25D, 0x5A7E,      0, 0x5A7D, 0xC25E,
 };
+static const unsigned short utf8_to_euc_E69A_x0213[] = {
+ 0xAE2A, 0x3647,      0, 0x5A73, 0x5A77,      0,      0, 0x324B,
+ 0x5A74, 0x5A76,      0, 0xC24D, 0xC24E, 0x7542, 0x5A75,      0,
+ 0xAE2B, 0x3D6B, 0xAE2C,      0,      0,      0, 0x4348, 0x3045,
+ 0x5A78, 0xAE2D, 0xC253, 0xC254, 0xC255, 0x5A79,      0, 0xC256,
+ 0x7544,      0, 0x442A,      0, 0xC258,      0, 0x4E71,      0,
+      0,      0,      0, 0x3B43,      0, 0xAE2F, 0x4A6B,      0,
+      0, 0xAE30, 0x7545,      0, 0x4B3D, 0xAE31,      0,      0,
+ 0x5B22, 0x5A7B,      0, 0x7546, 0x5A7E,      0, 0x5A7D, 0xAE33,
+};
 static const unsigned short utf8_to_euc_E69B[] = {
  0xC25F, 0x5A7A, 0xC260, 0xC261, 0x5B21,      0,      0, 0x465E,
  0xC262, 0x5A7C,      0,      0, 0xC263,      0, 0xC264, 0xC265,
@@ -3999,6 +7357,16 @@ static const unsigned short utf8_to_euc_E69B[] = {
  0x5B29,      0, 0x364A, 0x3148, 0x3939, 0x5B2A,      0, 0x5B2B,
  0x3D71, 0x4162, 0xC26D, 0xC23F, 0x5258, 0x413E, 0x413D, 0x4258,
 };
+static const unsigned short utf8_to_euc_E69B_x0213[] = {
+ 0xC25F, 0x5A7A, 0xC260, 0xC261, 0x5B21,      0, 0x7547, 0x465E,
+ 0x7548, 0x5A7C,      0,      0, 0xC263,      0, 0xC264, 0xC265,
+      0,      0,      0,      0, 0xC266,      0, 0x5B23,      0,
+      0, 0x3D6C, 0x5B24, 0x754A, 0x4D4B, 0x4778,      0, 0xC268,
+ 0x5B25,      0,      0,      0,      0,      0, 0x5B27,      0,
+ 0x754B, 0x5B28,      0, 0xC26A, 0xAE35,      0, 0xC26C,      0,
+ 0x5B29,      0, 0x364A, 0x3148, 0x3939, 0x5B2A,      0, 0x5B2B,
+ 0x3D71, 0x4162, 0x754C, 0x7537, 0x5258, 0x413E, 0x413D, 0x4258,
+};
 static const unsigned short utf8_to_euc_E69C[] = {
  0x3A47,      0,      0, 0x5072,      0, 0xC26E,      0, 0xC26F,
  0x376E, 0x4D2D,      0, 0x4A7E,      0, 0x497E, 0xC270, 0x5B2C,
@@ -4009,6 +7377,16 @@ static const unsigned short utf8_to_euc_E69C[] = {
       0, 0x3C6B,      0, 0xC276, 0x4B51,      0, 0x5B34, 0x5B37,
  0x5B36,      0, 0x3479,      0,      0, 0x3560, 0xC277, 0x5B33,
 };
+static const unsigned short utf8_to_euc_E69C_x0213[] = {
+ 0x3A47, 0xAE37,      0, 0x5072,      0, 0xAE38,      0, 0xC26F,
+ 0x376E, 0x4D2D,      0, 0x4A7E,      0, 0x497E,      0, 0x5B2C,
+      0,      0, 0xAE39, 0x754D, 0x3A73, 0x443F, 0x5B2D, 0x4F2F,
+      0, 0xAE3B,      0, 0x4B3E, 0xC273, 0x442B, 0x5B2E, 0x347C,
+ 0xC274,      0, 0xC275,      0,      0,      0, 0x5B2F, 0x5B30,
+ 0x4C5A,      0, 0x4C24, 0x4B76, 0x4B5C, 0x3B25, 0x5B32,      0,
+      0, 0x3C6B,      0, 0x754F, 0x4B51,      0, 0x5B34, 0x5B37,
+ 0x5B36,      0, 0x3479,      0,      0, 0x3560, 0xC277, 0x5B33,
+};
 static const unsigned short utf8_to_euc_E69D[] = {
       0, 0x5B35,      0,      0,      0, 0xC278, 0x5B38, 0xC279,
  0xC27A, 0x3F79,      0,      0, 0xC27B,      0, 0x4D7B, 0x3049,
@@ -4019,6 +7397,16 @@ static const unsigned short utf8_to_euc_E69D[] = {
  0x5B3F, 0x456C, 0x5A5E, 0x5A62, 0xC324, 0x354F, 0xC325, 0x4747,
       0,      0,      0, 0xC326, 0x5B41,      0, 0x3E3E, 0x4844,
 };
+static const unsigned short utf8_to_euc_E69D_x0213[] = {
+      0, 0x5B35,      0,      0,      0, 0xC278, 0x5B38, 0x7551,
+ 0x7552, 0x3F79,      0,      0, 0xAE3E, 0xAE3F, 0x4D7B, 0x3049,
+ 0x3A60, 0x423C,      0, 0x3C5D, 0xAE40, 0xC27D, 0x3E73,      0,
+      0, 0x5B3B,      0,      0, 0x454E, 0xAE41, 0x5B39, 0x422B,
+ 0x5B3A, 0x3E72, 0x4C5D, 0x5B3C, 0x5B3D, 0x4D68, 0x7550,      0,
+      0,      0, 0x5B42,      0, 0xC322, 0x393A, 0xC323, 0x4755,
+ 0x5B3F, 0x456C, 0x5A5E, 0x5A62, 0xAE45, 0x354F, 0xAE46, 0x4747,
+      0,      0,      0, 0x7553, 0x5B41,      0, 0x3E3E, 0x4844,
+};
 static const unsigned short utf8_to_euc_E69E[] = {
       0, 0xC327,      0,      0, 0xC328, 0x5B47,      0, 0x487A,
       0, 0x5B3E,      0, 0x5B44, 0x5B43,      0, 0xC329, 0xC32A,
@@ -4029,6 +7417,16 @@ static const unsigned short utf8_to_euc_E69E[] = {
  0xC331, 0xC332, 0xC333, 0x5B4C, 0x5B4A, 0xC334, 0x324D, 0x5B48,
  0x5B4E, 0x5B54,      0, 0xC335, 0xC336, 0xC337,      0,      0,
 };
+static const unsigned short utf8_to_euc_E69E_x0213[] = {
+      0, 0x7554,      0,      0, 0xC328, 0x5B47,      0, 0x487A,
+      0, 0x5B3E,      0, 0x5B44, 0x5B43,      0, 0xC329, 0xC32A,
+ 0x404F, 0xC32B, 0xAE48, 0x7555,      0, 0x4B6D, 0xC32D, 0x4E53,
+ 0x7556, 0xC32F, 0x4B67, 0x7557, 0x324C, 0x3B5E,      0,      0,
+ 0x4F48, 0x5B46, 0x3F75,      0,      0,      0, 0x5B45,      0,
+      0, 0x5B40,      0,      0,      0,      0,      0, 0x384F,
+ 0xAE4C, 0xC332, 0xAE4D, 0x5B4C, 0x5B4A, 0xC334, 0x324D, 0x5B48,
+ 0x5B4E, 0x5B54,      0, 0x7558, 0xC336, 0xC337,      0,      0,
+};
 static const unsigned short utf8_to_euc_E69F[] = {
  0xC339, 0x4248, 0xC33A, 0xC33B, 0x4A41, 0xC33C, 0x5B56,      0,
  0xC33D, 0xC33E, 0x4922,      0,      0,      0, 0x5B55, 0x4770,
@@ -4039,6 +7437,16 @@ static const unsigned short utf8_to_euc_E69F[] = {
  0xC345, 0x436C, 0xC346, 0x4C78, 0x3C46, 0x3A74, 0xC347, 0xC348,
       0, 0xC338,      0, 0x3A3A,      0,      0, 0x4B6F, 0x3341,
 };
+static const unsigned short utf8_to_euc_E69F_x0213[] = {
+ 0x755A, 0x4248, 0xC33A, 0xAE4E, 0x4A41, 0xC33C, 0x5B56,      0,
+ 0xAE4F, 0xC33E, 0x4922,      0,      0,      0, 0x5B55, 0x4770,
+ 0x4B3F, 0x343B, 0xAE50, 0x4077, 0x3D40,      0,      0, 0x755B,
+ 0x4453, 0xAE51, 0x4D2E, 0xAE52, 0xC342, 0x5B51, 0x5B50,      0,
+      0, 0xC343, 0x5B52,      0, 0x5B4F,      0, 0xC344, 0x5B57,
+      0, 0x5B4D,      0,      0, 0x5B4B,      0, 0x5B53, 0x5B49,
+ 0xAE53, 0x436C, 0xC346, 0x4C78, 0x3C46, 0x3A74, 0xC347, 0xAE54,
+      0, 0x7559,      0, 0x3A3A, 0x755C,      0, 0x4B6F, 0x3341,
+};
 static const unsigned short utf8_to_euc_E6A0[] = {
       0, 0xF446, 0x444E, 0x464A, 0x3149,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -4049,6 +7457,16 @@ static const unsigned short utf8_to_euc_E6A0[] = {
  0xC353, 0xC354, 0x5B5E, 0xC355, 0x4073,      0,      0,      0,
  0x334B, 0x3A2C,      0, 0xC356, 0x334A, 0x3A4F,      0, 0xC357,
 };
+static const unsigned short utf8_to_euc_E6A0_x0213[] = {
+      0, 0x755D, 0x444E, 0x464A, 0x3149,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xAE4B,      0,      0, 0x4072, 0xC34A,      0, 0x4034, 0x372A,
+ 0xAE58, 0xC34B,      0,      0,      0, 0x755F, 0x5B59, 0xAE59,
+      0, 0x393B, 0x337C,      0,      0,      0,      0, 0xC34F,
+ 0xC34E, 0x5B5B, 0x3374, 0x5B61, 0x7560, 0xAE5A,      0, 0xC352,
+ 0xC353, 0x7561, 0x5B5E, 0xAE5C, 0x4073,      0,      0,      0,
+ 0x334B, 0x3A2C,      0, 0xAE5D, 0x334A, 0x3A4F, 0xAE5E, 0xC357,
+};
 static const unsigned short utf8_to_euc_E6A1[] = {
  0x5B5C, 0x3765, 0x374B, 0x456D, 0xC358, 0xC359, 0x5B5A,      0,
  0x3046,      0, 0xC35A,      0, 0xC35B, 0x5B5D, 0x5B5F,      0,
@@ -4059,6 +7477,16 @@ static const unsigned short utf8_to_euc_E6A1[] = {
  0xC363, 0xC364, 0xC365,      0, 0x5B6F, 0xC366, 0x3233, 0x5B64,
       0, 0xC367, 0xC368, 0xC369, 0xC36A,      0, 0x5B75, 0x5B65,
 };
+static const unsigned short utf8_to_euc_E6A1_x0213[] = {
+ 0x5B5C, 0x3765, 0x374B, 0x456D, 0xAE5F, 0xAE60, 0x5B5A,      0,
+ 0x3046, 0xAE61, 0xC35A,      0, 0xAE62, 0x5B5D, 0x5B5F,      0,
+ 0x364D, 0x372C, 0x755E, 0x343C, 0x354B, 0xAE63,      0, 0xAE64,
+ 0xC35E, 0x5B62,      0, 0x7562, 0x3A79, 0x4B71,      0, 0x3B37,
+      0,      0,      0, 0x5B63,      0,      0,      0, 0x4930,
+      0,      0,      0, 0xAE66,      0,      0, 0xAE67, 0xC362,
+ 0xC363, 0xC364, 0x7563,      0, 0x5B6F, 0x7564, 0x3233, 0x5B64,
+      0, 0xC367, 0xAE68, 0xC369, 0xAE69,      0, 0x5B75, 0x5B65,
+};
 static const unsigned short utf8_to_euc_E6A2[] = {
       0, 0x4E42, 0xC36B, 0x5B6C, 0xC36C, 0x475F, 0xC36D,      0,
  0xC36E,      0,      0,      0,      0, 0x5B74,      0, 0x5B67,
@@ -4069,6 +7497,16 @@ static const unsigned short utf8_to_euc_E6A2[] = {
  0x3323, 0x3A2D, 0xC379, 0x5B60,      0, 0x5B70, 0x3361,      0,
       0, 0x5B6E, 0x5B72, 0xC37A, 0x456E,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E6A2_x0213[] = {
+      0, 0x4E42, 0xAE6A, 0x5B6C, 0xC36C, 0x475F, 0xC36D,      0,
+ 0xC36E,      0,      0,      0,      0, 0x5B74,      0, 0x5B67,
+ 0xAE6B,      0,      0, 0x3034, 0x5B69,      0, 0xAE6C, 0x393C,
+ 0xAE6E, 0xAE6F, 0xAE70, 0x5B6B, 0xAE71, 0x5B6A,      0, 0x5B66,
+ 0x5B71, 0xC373, 0x3E3F, 0x7566,      0, 0x7567, 0x546D, 0x3868,
+ 0x4D7C, 0xC376, 0xAE72, 0xAE73,      0, 0x5B68, 0xC378, 0x4474,
+ 0x3323, 0x3A2D, 0x7568, 0x5B60, 0xAE74, 0x5B70, 0x3361,      0,
+      0, 0x5B6E, 0x5B72, 0xAE75, 0x456E,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E6A3[] = {
       0,      0,      0,      0, 0x347E, 0xC37B, 0x5C32,      0,
  0xC37C, 0x4C49, 0x5B77, 0x347D, 0xC37D, 0x5B7E,      0, 0xC37E,
@@ -4079,6 +7517,16 @@ static const unsigned short utf8_to_euc_E6A3[] = {
  0xC42E, 0xC42F, 0x4033,      0,      0, 0xC430, 0xC431,      0,
       0, 0x5C2A, 0x343D, 0xC432, 0xC433, 0xC434,      0,      0,
 };
+static const unsigned short utf8_to_euc_E6A3_x0213[] = {
+      0,      0,      0, 0xAE7A, 0x347E, 0xAE7B, 0x5C32,      0,
+ 0x7569, 0x4C49, 0x5B77, 0x347D, 0xAE7C, 0x5B7E,      0, 0xAE7D,
+ 0x756A, 0xC422, 0x4B40, 0xC423, 0x5C21, 0x5C23, 0xAE7E, 0x5C27,
+ 0x5B79, 0xAF21, 0x432A,      0, 0xC426, 0xC427,      0, 0x456F,
+ 0x5C2B, 0x5B7C,      0, 0x5C28, 0xAF22, 0xAF23,      0, 0x5C22,
+ 0x756B,      0, 0xC42A, 0xC42B, 0xAF24, 0x756C, 0x3F39, 0x5C2C,
+ 0x756D, 0x756E, 0x4033,      0,      0, 0xC430, 0xC431, 0xAF25,
+      0, 0x5C2A, 0x343D, 0xAE76, 0x756F, 0xC434,      0,      0,
+};
 static const unsigned short utf8_to_euc_E6A4[] = {
  0x4F50, 0x5B76,      0,      0, 0x5C26, 0x3058, 0xC435,      0,
  0x5B78, 0xC436, 0xC437, 0x4C3A, 0x5B7D, 0x3F22, 0x4447, 0x5B73,
@@ -4089,6 +7537,16 @@ static const unsigned short utf8_to_euc_E6A4[] = {
  0x5C3F, 0xC43D,      0, 0xC43E, 0x464E, 0xC43F, 0x5C24,      0,
  0xC440, 0x5C3B,      0, 0xC441,      0, 0x5C3D,      0, 0x4458,
 };
+static const unsigned short utf8_to_euc_E6A4_x0213[] = {
+ 0x4F50, 0x5B76,      0, 0xAF26, 0x5C26, 0x3058, 0xC435, 0xAF27,
+ 0x5B78, 0xC436, 0x7570, 0x4C3A, 0x5B7D, 0x3F22, 0x4447, 0x5B73,
+ 0xC438, 0xC439, 0x5C25, 0xC43A,      0,      0, 0xC43B, 0xC43C,
+      0, 0x3F7A, 0x5C2F, 0x3371, 0x3821,      0,      0,      0,
+      0, 0x5C31, 0x5B7A, 0x5C30,      0, 0x5C29, 0x5B7B,      0,
+ 0x5C2D,      0, 0x5C2E,      0,      0,      0,      0,      0,
+ 0x5C3F, 0xC43D,      0, 0xC43E, 0x464E, 0x7573, 0x5C24,      0,
+ 0xC440, 0x5C3B,      0, 0xAF2B,      0, 0x5C3D,      0, 0x4458,
+};
 static const unsigned short utf8_to_euc_E6A5[] = {
       0,      0, 0xC442,      0,      0, 0xC443,      0,      0,
       0, 0xC444, 0x4D4C,      0,      0,      0, 0xC445,      0,
@@ -4099,6 +7557,16 @@ static const unsigned short utf8_to_euc_E6A5[] = {
  0xC44F, 0xC450, 0xC451, 0x4760, 0x5C3C, 0x364B,      0, 0x5C34,
  0x5C36, 0x5C33, 0xC452, 0xC453, 0x4F30, 0x335A, 0x5C39, 0xC454,
 };
+static const unsigned short utf8_to_euc_E6A5_x0213[] = {
+      0,      0, 0x7574,      0,      0, 0xC443, 0xAF2D,      0,
+      0, 0x7571, 0x4D4C,      0,      0,      0, 0xC445,      0,
+      0,      0,      0, 0x4976, 0x5C38, 0x424A,      0, 0x7575,
+      0, 0x5C3E, 0x413F, 0xC447, 0x5C35, 0x5C42, 0x5C41,      0,
+ 0x466F, 0x5C40, 0x466A, 0x7576, 0x7577, 0xC44A, 0xC44B,      0,
+ 0x7578, 0xAF2E, 0x5C44, 0x5C37, 0xAF2F, 0x3648, 0x5C3A, 0x3D5D,
+ 0xC44F, 0xC450, 0xAF30, 0x4760, 0x5C3C, 0x364B,      0, 0x5C34,
+ 0x5C36, 0x5C33, 0xAF31, 0xC453, 0x4F30, 0x335A, 0x5C39, 0xAF32,
+};
 static const unsigned short utf8_to_euc_E6A6[] = {
  0xC455, 0x5C43, 0x3335,      0,      0,      0,      0,      0,
       0,      0, 0x3A67,      0,      0, 0xC456, 0x315D,      0,
@@ -4109,6 +7577,16 @@ static const unsigned short utf8_to_euc_E6A6[] = {
       0, 0x5C63, 0x5C45,      0, 0x5C58,      0,      0, 0xC461,
  0xC462,      0, 0xC463, 0x5C50, 0xC464,      0, 0x5C4B, 0x5C48,
 };
+static const unsigned short utf8_to_euc_E6A6_x0213[] = {
+ 0x7579, 0x5C43, 0x3335,      0,      0,      0,      0,      0,
+      0,      0, 0x3A67,      0,      0, 0xC456, 0x315D,      0,
+      0, 0x5C54, 0xAF33,      0, 0x4F31, 0x5C57, 0xAF35,      0,
+ 0xAF36,      0,      0, 0x3F3A, 0x5C56,      0,      0,      0,
+ 0x5C55, 0xC45A,      0,      0,      0, 0x757B, 0xAF37, 0x5C52,
+ 0xC45D,      0,      0, 0xC45E,      0, 0x757C, 0x5C46, 0xC460,
+ 0xAF38, 0x5C63, 0x5C45,      0, 0x5C58,      0,      0, 0xAF39,
+ 0xC462,      0, 0xAF3A, 0x5C50, 0xAF3B,      0, 0x5C4B, 0x5C48,
+};
 static const unsigned short utf8_to_euc_E6A7[] = {
       0, 0x5C49,      0, 0x5C51,      0, 0xC465,      0, 0x7422,
  0xC466,      0, 0x5C4E, 0x393D, 0x4448, 0x4164, 0x5C4C,      0,
@@ -4119,6 +7597,16 @@ static const unsigned short utf8_to_euc_E6A7[] = {
       0, 0xC46E, 0x5C60, 0xC46F,      0, 0xC470,      0,      0,
       0, 0x5C5F,      0, 0x4450,      0, 0x4165, 0xC471, 0x5C5D,
 };
+static const unsigned short utf8_to_euc_E6A7_x0213[] = {
+ 0xAF3C, 0x5C49,      0, 0x5C51,      0, 0xC465,      0, 0x7422,
+ 0xC466,      0, 0x5C4E, 0x393D, 0x4448, 0x4164, 0x5C4C, 0x757D,
+ 0x5C47, 0xAF3D,      0, 0x5C4A,      0,      0, 0xAF3E, 0xC469,
+ 0x4D4D, 0x4B6A,      0,      0,      0, 0x5C4F, 0x5C59,      0,
+      0,      0, 0x7622, 0xAF44,      0, 0xC46B,      0, 0x5C61,
+ 0x5C5A, 0x7623, 0x7624, 0x5C67,      0, 0x5C65, 0xAF45, 0xAF46,
+      0, 0xC46E, 0x5C60, 0xAF47, 0xAF49, 0x7625, 0x7626,      0,
+      0, 0x5C5F,      0, 0x4450,      0, 0x4165, 0xAF4A, 0x5C5D,
+};
 static const unsigned short utf8_to_euc_E6A8[] = {
  0xC472, 0xC473, 0x5C5B, 0xC474,      0, 0x5C62,      0,      0,
       0,      0, 0x5C68, 0x4875, 0x5C6E,      0,      0, 0xC475,
@@ -4129,6 +7617,16 @@ static const unsigned short utf8_to_euc_E6A8[] = {
  0xC47D,      0, 0xC47E,      0, 0xC521, 0x3E41, 0x5C70, 0xC522,
  0x5C77, 0x3C79, 0x3372, 0xC523,      0, 0x432E, 0xC524, 0xC525,
 };
+static const unsigned short utf8_to_euc_E6A8_x0213[] = {
+ 0xC472, 0xC473, 0x5C5B, 0xC474,      0, 0x5C62,      0,      0,
+      0,      0, 0x5C68, 0x4875, 0x5C6E,      0,      0, 0x7627,
+      0, 0xAF4B, 0x5C69, 0x5C6C, 0x5C66, 0x7628,      0, 0x4374,
+      0, 0x4938, 0xAF4C, 0x5C5C,      0, 0xAF4D, 0x5C64, 0x3E40,
+ 0xC47A, 0x4C4F, 0x5C78, 0x5C6B, 0xC47B,      0,      0,      0,
+ 0xC47C, 0x3822, 0x3223, 0x335F,      0,      0, 0x5C53,      0,
+ 0xAF41,      0, 0xAF4F, 0xAF50, 0xAF51, 0x3E41, 0x5C70, 0xC522,
+ 0x5C77, 0x3C79, 0x3372, 0x762A,      0, 0x432E, 0x762B, 0xAF52,
+};
 static const unsigned short utf8_to_euc_E6A9[] = {
       0,      0,      0,      0, 0x5C6D, 0xC526, 0xC527, 0x5C72,
  0x5C76, 0xC528, 0xC529, 0x3636,      0,      0, 0xC52A,      0,
@@ -4139,6 +7637,16 @@ static const unsigned short utf8_to_euc_E6A9[] = {
       0, 0xC534, 0x5C6F, 0xC535,      0,      0,      0,      0,
  0x5C71,      0,      0,      0,      0,      0, 0xC536, 0x3360,
 };
+static const unsigned short utf8_to_euc_E6A9_x0213[] = {
+      0,      0,      0,      0, 0x5C6D, 0x762C, 0xAF53, 0x5C72,
+ 0x5C76, 0xAF54, 0xC529, 0x3636,      0,      0, 0xAF56,      0,
+ 0x762D, 0xC52C, 0xAF57,      0,      0, 0xC52E, 0x762E,      0,
+ 0x354C, 0x5C74,      0, 0x762F,      0,      0,      0, 0x3521,
+      0, 0x464B, 0x5C73,      0, 0xAF58,      0, 0x5C75, 0xC532,
+      0,      0, 0xC533, 0x7630,      0,      0,      0,      0,
+      0, 0xC534, 0x5C6F, 0x7631,      0,      0,      0,      0,
+ 0x5C71,      0, 0xAF55,      0,      0,      0, 0xAF5A, 0x3360,
+};
 static const unsigned short utf8_to_euc_E6AA[] = {
  0x4349, 0xC537,      0, 0xC538, 0x5C7C,      0, 0xC539, 0xC53A,
       0, 0xC53B,      0, 0xC53C,      0, 0x5C7A, 0x3869,      0,
@@ -4149,6 +7657,16 @@ static const unsigned short utf8_to_euc_E6AA[] = {
  0xC545, 0xC546,      0, 0x5D27, 0xC547,      0,      0,      0,
  0x5D26,      0,      0, 0x5D23,      0, 0xC548, 0xC549, 0xC54A,
 };
+static const unsigned short utf8_to_euc_E6AA_x0213[] = {
+ 0x4349, 0xC537,      0, 0xAF5B, 0x5C7C,      0, 0xC539, 0xC53A,
+      0, 0x7633,      0, 0xAF5C,      0, 0x5C7A, 0x3869,      0,
+ 0x5C79, 0xAF5E,      0,      0, 0x7634,      0,      0, 0x5D21,
+      0,      0,      0, 0xC53E, 0x5B58, 0x7635, 0x7636, 0xAF5F,
+ 0x5C7B, 0xAF60, 0x5C7D, 0x5C7E,      0, 0x7637,      0,      0,
+      0,      0, 0x5D2C, 0xAF62, 0x5D28,      0, 0x5B6D, 0xC544,
+ 0xC545, 0xC546,      0, 0x5D27, 0xC547,      0,      0,      0,
+ 0x5D26,      0,      0, 0x5D23,      0, 0xAF63, 0xC549, 0xC54A,
+};
 static const unsigned short utf8_to_euc_E6AB[] = {
       0, 0x5C6A, 0x5D25, 0x5D24,      0,      0, 0xC54B,      0,
  0xC54D, 0xC54C,      0,      0, 0xC54E,      0,      0,      0,
@@ -4159,6 +7677,16 @@ static const unsigned short utf8_to_euc_E6AB[] = {
  0xC558, 0xC559, 0xC55A,      0,      0,      0,      0,      0,
       0,      0, 0x5D32, 0x5D2F, 0xC55B, 0xC55C,      0,      0,
 };
+static const unsigned short utf8_to_euc_E6AB_x0213[] = {
+      0, 0x5C6A, 0x5D25, 0x5D24,      0,      0, 0xAF64,      0,
+ 0xC54D, 0xC54C,      0,      0, 0xC54E,      0,      0,      0,
+ 0xAF66, 0x5D2A,      0, 0x4F26, 0xAF65, 0xC551, 0xC552,      0,
+      0,      0, 0x5D2D, 0x367B, 0xAF67, 0xAF68, 0x5D29, 0x5D2B,
+      0,      0,      0,      0, 0x7638,      0,      0, 0x7639,
+ 0x4827,      0, 0x5D2E,      0, 0xAF6B,      0,      0,      0,
+ 0xC558, 0xAF6C, 0xAF6D, 0xAF6E,      0,      0,      0,      0,
+      0,      0, 0x5D32, 0x5D2F, 0xC55B, 0xAF6F,      0,      0,
+};
 static const unsigned short utf8_to_euc_E6AC[] = {
       0,      0, 0xC55D, 0xC55E, 0x4D73, 0x5D30, 0xC55F, 0xC560,
       0, 0xC561, 0x5C5E,      0,      0,      0,      0, 0xC562,
@@ -4169,6 +7697,16 @@ static const unsigned short utf8_to_euc_E6AC[] = {
       0,      0, 0x4D5F,      0,      0, 0xC56D, 0xC56E, 0x5D38,
  0x5D37, 0x5D3A, 0x353D, 0xC56F,      0, 0x3656, 0x343E, 0xC570,
 };
+static const unsigned short utf8_to_euc_E6AC_x0213[] = {
+      0,      0, 0xC55D, 0xC55E, 0x4D73, 0x5D30, 0xC55F, 0xC560,
+      0, 0xC561, 0x5C5E, 0xAF71,      0,      0,      0, 0xAF72,
+ 0xAF73, 0xAF74, 0x5D33,      0,      0,      0, 0x5D34, 0xAF76,
+      0,      0,      0, 0x763C,      0, 0x3135, 0x763D, 0x5D36,
+ 0x3767, 0x3C21,      0, 0x3655, 0xC568,      0,      0, 0x3224,
+ 0xC569,      0,      0, 0xC56A, 0x763E,      0,      0, 0xAF78,
+      0,      0, 0x4D5F,      0,      0, 0x763F, 0xC56E, 0x5D38,
+ 0x5D37, 0x5D3A, 0x353D, 0xC56F,      0, 0x3656, 0x343E, 0xC570,
+};
 static const unsigned short utf8_to_euc_E6AD[] = {
       0,      0,      0, 0x5D3D,      0,      0, 0xC571, 0x5D3C,
       0, 0x5D3E, 0xC572,      0, 0x324E, 0xC573, 0x4337,      0,
@@ -4179,6 +7717,16 @@ static const unsigned short utf8_to_euc_E6AD[] = {
  0xC57C,      0,      0, 0x3A50, 0x4E72, 0xC57D,      0,      0,
  0x5D45, 0x5D46,      0, 0x3B60,      0, 0xC57E, 0xC621, 0x5D47,
 };
+static const unsigned short utf8_to_euc_E6AD_x0213[] = {
+      0,      0,      0, 0x5D3D,      0,      0, 0x7640, 0x5D3C,
+      0, 0x5D3E, 0xAF79,      0, 0x324E, 0xC573, 0x4337,      0,
+ 0x5D3F,      0, 0xC574, 0x343F, 0x5D41,      0, 0x7641,      0,
+ 0xAF7A, 0x5D40,      0, 0x5D42,      0, 0xC577,      0, 0x5D43,
+ 0x7642, 0x5D44, 0x3B5F, 0x4035, 0x3A21, 0x7643, 0x4970, 0x7644,
+      0, 0x4A62, 0x4F44, 0xC57A, 0xAF7B,      0, 0xC57B, 0x3B75,
+ 0xC57C,      0,      0, 0x3A50, 0x4E72, 0xAF7C,      0, 0x7645,
+ 0x5D45, 0x5D46, 0xAF7D, 0x3B60,      0, 0xC57E, 0xC621, 0x5D47,
+};
 static const unsigned short utf8_to_euc_E6AE[] = {
  0x5D48,      0, 0xC622, 0x5D4A, 0x5D49, 0xC623, 0x4B58,      0,
       0, 0x3D5E, 0x3C6C, 0x3B44,      0, 0x5D4B,      0,      0,
@@ -4189,6 +7737,16 @@ static const unsigned short utf8_to_euc_E6AE[] = {
  0xC62F, 0x5D54, 0x5D53, 0x5D55, 0x3225, 0x434A,      0, 0x5D56,
  0xC630, 0xC631, 0x3B26, 0x334C, 0x5D57, 0xC632, 0xC633, 0x4542,
 };
+static const unsigned short utf8_to_euc_E6AE_x0213[] = {
+ 0x5D48, 0xAF7E, 0x7646, 0x5D4A, 0x5D49, 0xC623, 0x4B58,      0,
+      0, 0x3D5E, 0x3C6C, 0x3B44,      0, 0x5D4B,      0,      0,
+      0,      0,      0,      0,      0, 0x5D4D, 0x3F23, 0xC624,
+ 0x5D4C,      0,      0, 0xEE21,      0,      0, 0x5D4E, 0xC626,
+ 0xC627,      0, 0xC628, 0xC629, 0x5D4F,      0,      0,      0,
+ 0xC62A, 0x7647, 0x5D50, 0x5D51, 0xC62C, 0x7648, 0xEE22, 0x5D52,
+ 0xC62F, 0x5D54, 0x5D53, 0x5D55, 0x3225, 0x434A,      0, 0x5D56,
+ 0xC630, 0xC631, 0x3B26, 0x334C, 0x5D57, 0xEE24, 0xEE25, 0x4542,
+};
 static const unsigned short utf8_to_euc_E6AF[] = {
  0x544C,      0,      0, 0xC634, 0xC635, 0x3523, 0x5D58,      0,
       0, 0xC636,      0, 0x5D59, 0xC637, 0x4A6C, 0x4B68,      0,
@@ -4199,6 +7757,16 @@ static const unsigned short utf8_to_euc_E6AF[] = {
       0, 0xC63F,      0, 0x5D5E,      0,      0,      0, 0xC640,
       0, 0xC641,      0,      0,      0,      0,      0, 0xC642,
 };
+static const unsigned short utf8_to_euc_E6AF_x0213[] = {
+ 0x544C,      0,      0, 0xC634, 0xC635, 0x3523, 0x5D58, 0xEE26,
+ 0xEE27, 0xEE28,      0, 0x5D59, 0xC637, 0x4A6C, 0x4B68, 0x764A,
+      0,      0, 0x4647, 0x5D5A, 0x4866,      0, 0x764B, 0x764C,
+ 0x487B,      0, 0xEE29, 0x4C53,      0,      0,      0, 0x5D5B,
+      0, 0xC63A,      0, 0xC63B,      0,      0, 0xEE2A, 0xEE2B,
+      0,      0,      0, 0x5D5D, 0x5D5C,      0, 0xEE2C, 0x5D5F,
+      0, 0xEE2D,      0, 0x5D5E,      0,      0,      0, 0xC640,
+      0, 0xC641,      0,      0,      0,      0,      0, 0x764D,
+};
 static const unsigned short utf8_to_euc_E6B0[] = {
       0,      0, 0xC643,      0, 0xC644, 0xC645,      0,      0,
  0x5D61, 0xC646,      0,      0,      0, 0xC647, 0xC648, 0x3B61,
@@ -4209,6 +7777,16 @@ static const unsigned short utf8_to_euc_E6B0[] = {
       0,      0,      0, 0xC652, 0x3F65, 0xC653, 0xC654, 0x4939,
  0x314A,      0, 0xC655, 0xC656,      0,      0, 0x4845, 0xC657,
 };
+static const unsigned short utf8_to_euc_E6B0_x0213[] = {
+      0,      0, 0xEE2E,      0, 0xC644, 0x764E,      0,      0,
+ 0x5D61, 0xC646, 0xEE2F,      0,      0, 0xC647, 0xEE30, 0x3B61,
+ 0x764F, 0x4C31, 0xC64A, 0x5D62, 0x5D63,      0,      0, 0x3524,
+      0, 0xC64B,      0, 0x5D64,      0,      0,      0, 0xC64C,
+      0,      0,      0, 0x5D66, 0x5D65,      0, 0xC64D, 0xC64E,
+ 0xC64F,      0,      0,      0, 0xC650,      0, 0xC651,      0,
+      0,      0,      0, 0x7650, 0x3F65, 0xEE31, 0xEE32, 0x4939,
+ 0x314A,      0, 0xEE33, 0xC656,      0,      0, 0x4845, 0xEE35,
+};
 static const unsigned short utf8_to_euc_E6B1[] = {
  0x4475, 0x3D41, 0x3561,      0,      0,      0,      0,      0,
       0,      0, 0xC658, 0xC659,      0, 0xC65A, 0x4846, 0xC65B,
@@ -4219,6 +7797,16 @@ static const unsigned short utf8_to_euc_E6B1[] = {
  0x4241,      0, 0x3562, 0x5D72, 0xC664,      0, 0xC665,      0,
  0xC666, 0xC667, 0x3768, 0xC668,      0, 0x3525, 0x5D70,      0,
 };
+static const unsigned short utf8_to_euc_E6B1_x0213[] = {
+ 0x4475, 0x3D41, 0x3561,      0,      0,      0,      0,      0,
+      0,      0, 0xC658, 0xC659,      0, 0xEE36, 0x4846, 0xC65B,
+ 0x3C2E,      0, 0xC65C,      0, 0xC65D, 0x5D68,      0, 0x3440,
+      0, 0x7651, 0x3178, 0xEE37, 0x7652, 0x4672, 0x5D67, 0x393E,
+ 0x4353,      0, 0x5D69,      0,      0,      0,      0, 0xEE4F,
+ 0x5D71,      0, 0x5D6A, 0xC661,      0, 0xEE38,      0,      0,
+ 0x4241,      0, 0x3562, 0x5D72, 0x7654,      0, 0x7655,      0,
+ 0xC666, 0xC667, 0x3768, 0xC668,      0, 0x3525, 0x5D70,      0,
+};
 static const unsigned short utf8_to_euc_E6B2[] = {
       0, 0x5D6E, 0x5D6B, 0x4D60,      0, 0xC669, 0xC66A, 0xC66B,
  0x4440, 0xC66C,      0,      0, 0x4659, 0x5D6C,      0,      0,
@@ -4229,6 +7817,16 @@ static const unsigned short utf8_to_euc_E6B2[] = {
  0xC673, 0x5D7D, 0xC674, 0x324F, 0xC675,      0,      0,      0,
  0x4A28, 0x4C7D, 0x5E21, 0x3C23, 0x3E42, 0x5D78, 0x5D7E, 0x3168,
 };
+static const unsigned short utf8_to_euc_E6B2_x0213[] = {
+      0, 0x5D6E, 0x5D6B, 0x4D60, 0xEE39, 0x7656, 0x7657, 0xC66B,
+ 0x4440, 0xEE3A,      0,      0, 0x4659, 0x5D6C,      0,      0,
+ 0x5D74,      0, 0x5D73, 0x3723, 0xEE3C, 0xEE3D, 0x322D, 0xEE3E,
+ 0x7658, 0x3A3B, 0x5D6D, 0x5D6F, 0x7659,      0,      0, 0xC672,
+      0, 0x4B57, 0x4274,      0,      0,      0,      0,      0,
+      0,      0, 0x7653, 0x4B77,      0, 0xEE3F, 0x5D7C,      0,
+ 0xC673, 0x5D7D, 0xC674, 0x324F, 0xC675,      0,      0,      0,
+ 0x4A28, 0x4C7D, 0x5E21, 0x3C23, 0x3E42, 0x5D78, 0x5D7E, 0x3168,
+};
 static const unsigned short utf8_to_euc_E6B3[] = {
       0, 0x3637, 0xC676,      0, 0x5D75, 0x5D7A, 0xC677,      0,
       0, 0x4074, 0x4771,      0, 0x4867, 0xC678,      0, 0xC679,
@@ -4239,6 +7837,16 @@ static const unsigned short utf8_to_euc_E6B3[] = {
  0x4259, 0x5D76, 0xC729, 0x314B, 0xC72A,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E6B3_x0213[] = {
+      0, 0x3637, 0xEE40,      0, 0x5D75, 0x5D7A, 0x765B,      0,
+      0, 0x4074, 0x4771,      0, 0x4867, 0xC678,      0, 0xC679,
+ 0xEE41, 0xC67B, 0xC67C, 0x5D77, 0x765C, 0x4B21, 0xEE43, 0x5D79,
+      0, 0x5E24, 0xEE44, 0x5E22, 0xEE45, 0x5D7B,      0,      0,
+ 0x765D, 0x4B22, 0x4748, 0x3563,      0, 0x4525,      0, 0xC724,
+ 0x436D, 0xEE46, 0x5E25, 0x765E, 0xEE47, 0xEE48, 0x765F, 0x5E23,
+ 0x4259, 0x5D76, 0xC729, 0x314B, 0xC72A,      0,      0,      0,
+      0,      0,      0, 0x765A,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E6B4[] = {
       0,      0,      0,      0, 0xC72B,      0,      0, 0xC72C,
       0,      0, 0xC72D, 0x4D4E, 0x5E30,      0, 0xC72E, 0xC72F,
@@ -4249,6 +7857,16 @@ static const unsigned short utf8_to_euc_E6B4[] = {
       0, 0xC739, 0x3D27, 0x5E2E,      0, 0x5E2D, 0x5E28,      0,
  0x5E2B, 0xC73A,      0, 0x3368, 0xC73B, 0x5E2A, 0x4749, 0xC73C,
 };
+static const unsigned short utf8_to_euc_E6B4_x0213[] = {
+ 0xEE4A,      0,      0,      0, 0x7661,      0,      0, 0xC72C,
+      0,      0, 0xEE4B, 0x4D4E, 0x5E30,      0, 0x7662, 0xC72F,
+      0, 0xC730, 0x5E2F, 0xC731,      0,      0,      0, 0x4076,
+      0, 0x5E2C, 0xC732, 0x4D6C,      0,      0, 0x4636, 0x5E26,
+      0,      0,      0,      0, 0xEE4C, 0x4445, 0xEE4D, 0xEE4E,
+ 0xC735, 0x314C, 0x393F, 0x5E29,      0,      0, 0x7663, 0xEE50,
+      0, 0x7664, 0x3D27, 0x5E2E, 0xEE65, 0x5E2D, 0x5E28,      0,
+ 0x5E2B, 0x7665,      0, 0x3368, 0xEE51, 0x5E2A, 0x4749, 0x7666,
+};
 static const unsigned short utf8_to_euc_E6B5[] = {
       0, 0x4E2E,      0,      0, 0x3E74, 0x4075,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -4259,6 +7877,16 @@ static const unsigned short utf8_to_euc_E6B5[] = {
  0xC744,      0,      0,      0, 0x4D61,      0,      0, 0x3324,
  0x3F3B, 0x5E35,      0,      0, 0xC745,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E6B5_x0213[] = {
+      0, 0x4E2E,      0,      0, 0x3E74, 0x4075,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xC73D,
+ 0x7667, 0x5E36, 0x5E34, 0xEE52, 0x494D,      0, 0xEE53, 0xC73F,
+ 0xEE54, 0xC740,      0, 0x5E31, 0x5E33, 0x7668, 0x313A, 0xC742,
+      0, 0x3940, 0x4F32,      0, 0x333D,      0, 0x4962,      0,
+ 0xEE55,      0,      0,      0, 0x4D61,      0,      0, 0x3324,
+ 0x3F3B, 0x5E35,      0,      0, 0xC745,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E6B6[] = {
       0,      0, 0xC746,      0,      0, 0x5E3A,      0, 0xC747,
  0x3E43,      0,      0,      0, 0x4D30,      0, 0x5E37,      0,
@@ -4269,6 +7897,16 @@ static const unsigned short utf8_to_euc_E6B6[] = {
       0,      0, 0x3155,      0, 0xC750, 0x5E3E,      0, 0xC751,
  0x5E41, 0xC752,      0,      0, 0x4E43, 0xC753,      0, 0xC754,
 };
+static const unsigned short utf8_to_euc_E6B6_x0213[] = {
+ 0xEE56, 0xEE57, 0x766A,      0,      0, 0x5E3A,      0, 0x766B,
+ 0x3E43, 0x766C, 0xEE58,      0, 0x4D30, 0xEE59, 0x5E37,      0,
+      0, 0xEE5A, 0xC749, 0x5E32, 0x766D, 0x5E38,      0, 0xC74C,
+ 0xEE5B, 0x4E5E,      0, 0x4573, 0x4642,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x766E, 0xEE61, 0x766F,      0, 0xEE62, 0x3336,
+      0,      0, 0x3155,      0, 0xEE63, 0x5E3E,      0, 0xC751,
+ 0x5E41, 0xC752,      0,      0, 0x4E43, 0xC753,      0, 0x7670,
+};
 static const unsigned short utf8_to_euc_E6B7[] = {
  0x4D64,      0,      0,      0, 0xC755, 0x5E48, 0x5E42, 0x5E3F,
  0xC756,      0, 0xC757, 0x4E54, 0x5E45,      0, 0xC758, 0xC759,
@@ -4279,6 +7917,16 @@ static const unsigned short utf8_to_euc_E6B7[] = {
  0xC763, 0x3F3C, 0xF44C, 0x3D5F, 0xC764, 0x4A25, 0xC765, 0x3A2E,
  0xF44B, 0x5E3B, 0x5E49, 0x453A, 0xC766,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E6B7_x0213[] = {
+ 0x4D64,      0, 0xEE64,      0, 0x7671, 0x5E48, 0x5E42, 0x5E3F,
+ 0xEE66,      0, 0xC757, 0x4E54, 0x5E45,      0, 0xEE67, 0xEE68,
+ 0xEE69, 0x3D4A, 0x5E47,      0,      0, 0x5E4C, 0x7672,      0,
+ 0x4571, 0x5E4A, 0x7673, 0x7674,      0, 0x7675, 0x5E44, 0xEE6A,
+ 0xC75E, 0x4338, 0xC75F,      0, 0x5E4B, 0xC760, 0x5E40,      0,
+ 0x5E46, 0xEE6B, 0x5E4D, 0x307C, 0x5E43,      0, 0x5E4E, 0xC762,
+ 0xC763, 0x3F3C,      0, 0x3D5F, 0xC764, 0x4A25, 0xEE6C, 0x3A2E,
+      0, 0x5E3B, 0x5E49, 0x453A, 0x7676,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E6B8[] = {
  0xC767,      0,      0,      0, 0xC768, 0x4036,      0, 0x3369,
  0x3A51, 0x3E44, 0x5E3D, 0x3D42,      0,      0,      0,      0,
@@ -4289,6 +7937,16 @@ static const unsigned short utf8_to_euc_E6B8[] = {
       0,      0, 0xC76C,      0,      0,      0, 0xC76D,      0,
  0x5E62, 0xC76E, 0x5E5D, 0xC76F, 0xC770,      0, 0x5E55,      0,
 };
+static const unsigned short utf8_to_euc_E6B8_x0213[] = {
+ 0xC767,      0,      0,      0, 0xC768, 0x4036,      0, 0x3369,
+ 0x3A51, 0x3E44, 0x5E3D, 0x3D42,      0,      0,      0,      0,
+      0,      0,      0, 0x374C,      0, 0x5E3C,      0, 0xEE5D,
+      0, 0x5E52, 0x3D6D, 0x383A,      0, 0x5E61, 0xEE6E, 0x5E5B,
+ 0x3574, 0x454F, 0xEE6F, 0x5E56, 0x5E5F, 0x302F, 0x3132, 0xEE70,
+      0, 0x3239,      0, 0x5E58, 0x422C, 0x5E4F, 0x5E51, 0x3941,
+      0,      0, 0xEE72,      0, 0x7678,      0, 0xEE6D,      0,
+ 0x5E62,      0, 0x5E5D, 0xC76F, 0xEE73,      0, 0x5E55,      0,
+};
 static const unsigned short utf8_to_euc_E6B9[] = {
       0,      0,      0, 0x5E5C, 0xC771, 0xC772,      0,      0,
  0xC773, 0xC774, 0x4C2B, 0xC775,      0, 0x5E5A, 0x5E5E, 0xC776,
@@ -4299,6 +7957,16 @@ static const unsigned short utf8_to_euc_E6B9[] = {
       0,      0, 0x5E53, 0xC824,      0,      0, 0x5E59,      0,
       0,      0,      0, 0xC825,      0, 0xC826, 0x4F51, 0x3C3E,
 };
+static const unsigned short utf8_to_euc_E6B9_x0213[] = {
+      0,      0,      0, 0x5E5C, 0x7679, 0xC772,      0,      0,
+ 0xEE74, 0xEE75, 0x4C2B, 0xEE76, 0xEE77, 0x5E5A, 0x5E5E, 0xEE78,
+      0, 0xEE79, 0xC778, 0xEE7A, 0xEE7B,      0, 0x3850, 0xEE7C,
+ 0x3E45,      0,      0, 0x4339, 0x767A, 0xC77D, 0x767B, 0x5E54,
+      0,      0, 0xC821, 0xEE7D,      0,      0,      0, 0x4D2F,
+ 0xC823,      0,      0, 0x5E57,      0,      0, 0x5E50, 0x4572,
+      0,      0, 0x5E53, 0xC824,      0,      0, 0x5E59,      0,
+      0,      0,      0, 0xC825,      0, 0xC826, 0x4F51, 0x3C3E,
+};
 static const unsigned short utf8_to_euc_E6BA[] = {
  0x4B7E,      0, 0x5E63,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0x482E, 0xC827,      0, 0x5E6F,
@@ -4309,6 +7977,16 @@ static const unsigned short utf8_to_euc_E6BA[] = {
       0, 0xC82E, 0x5E6C, 0xC82F,      0,      0, 0x4D4F, 0x5E67,
       0,      0, 0x452E, 0xC830,      0, 0x5E69,      0, 0xC831,
 };
+static const unsigned short utf8_to_euc_E6BA_x0213[] = {
+ 0x4B7E,      0, 0x5E63,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x482E, 0xC827,      0, 0x5E6F,
+ 0x383B,      0,      0, 0xEF21,      0,      0, 0x3D60,      0,
+ 0x5E65, 0xC829,      0,      0, 0x4E2F, 0x3942,      0, 0x5E72,
+ 0xC82A,      0, 0x306E,      0,      0, 0x5E70,      0, 0xEF22,
+      0,      0, 0x5E64, 0x767C,      0, 0xC82C, 0xC82D, 0x5E6A,
+      0, 0x767D, 0x5E6C, 0xC82F, 0xEF23,      0, 0x4D4F, 0x5E67,
+      0,      0, 0x452E, 0xC830,      0, 0x5E69,      0, 0xEF24,
+};
 static const unsigned short utf8_to_euc_E6BB[] = {
  0xC832, 0xC833, 0x5E71, 0xC834, 0x5E6B, 0x4C47,      0, 0xC835,
  0xC836, 0x5E66, 0xC837, 0x3C22, 0x5E7E, 0xC838, 0xC839, 0xC83A,
@@ -4319,6 +7997,16 @@ static const unsigned short utf8_to_euc_E6BB[] = {
       0,      0, 0x5E7A,      0, 0x4529,      0,      0, 0x5F23,
  0x5E77, 0xC83E,      0, 0xC83F,      0, 0xC840, 0x5E78, 0x5E60,
 };
+static const unsigned short utf8_to_euc_E6BB_x0213[] = {
+ 0xC832, 0x767E, 0x5E71, 0xEF25, 0x5E6B, 0x4C47,      0, 0x7721,
+ 0xC836, 0x5E66, 0xEF26, 0x3C22, 0x5E7E, 0xC838, 0x7722, 0xC83A,
+      0, 0x336A,      0, 0x5E68, 0x5E6D, 0x5E6E,      0,      0,
+      0, 0xEF27,      0,      0,      0, 0x426C, 0x425A,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xEF29, 0x5E76, 0xC83C, 0xC83D, 0x5E7C,
+      0,      0, 0x5E7A,      0, 0x4529,      0,      0, 0x5F23,
+ 0x5E77, 0xEF2A,      0, 0xEF2B,      0, 0xC840, 0x5E78, 0x5E60,
+};
 static const unsigned short utf8_to_euc_E6BC[] = {
       0, 0x3579, 0x493A,      0, 0xC841,      0, 0x3C3F,      0,
  0xC842, 0x3977, 0xC843,      0, 0xC844, 0xC845,      0, 0x4F33,
@@ -4329,6 +8017,16 @@ static const unsigned short utf8_to_euc_E6BC[] = {
  0xC84E, 0x5E7B, 0x5E7D, 0xC84F,      0,      0, 0xC850,      0,
  0x4132,      0,      0, 0xC851, 0xC852,      0, 0x5F21, 0x5E79,
 };
+static const unsigned short utf8_to_euc_E6BC_x0213[] = {
+      0, 0x3579, 0x493A,      0, 0xC841,      0, 0x3C3F,      0,
+ 0xC842, 0x3977, 0xEF2C,      0, 0xEF2D, 0xC845,      0, 0x4F33,
+ 0x7723, 0x5E74,      0, 0x5F22, 0x3169, 0x4166, 0xC846,      0,
+ 0xEF2E,      0, 0x7724, 0xC849,      0,      0,      0,      0,
+ 0x4779,      0, 0x3441, 0x4E7A,      0, 0xEF2F, 0xC84A,      0,
+      0, 0xC84B, 0x7726, 0x4C21, 0x4452, 0xC853,      0, 0x7727,
+ 0xC84E, 0x5E7B, 0x5E7D, 0x7728,      0, 0xEF28, 0xEF30,      0,
+ 0x4132,      0,      0, 0xC851, 0xEF31,      0, 0x5F21, 0x5E79,
+};
 static const unsigned short utf8_to_euc_E6BD[] = {
       0, 0x5E73,      0,      0,      0, 0x3443,      0,      0,
       0,      0,      0,      0,      0,      0,      0, 0xC854,
@@ -4339,6 +8037,16 @@ static const unsigned short utf8_to_euc_E6BD[] = {
  0x4459,      0,      0,      0, 0x5F4C,      0,      0,      0,
  0x5F26,      0, 0x5F25,      0, 0x5F2E, 0xC861, 0xC862,      0,
 };
+static const unsigned short utf8_to_euc_E6BD_x0213[] = {
+      0, 0x5E73,      0,      0,      0, 0x3443,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xC854,
+      0, 0x7729, 0xEF33, 0xC857, 0x3769,      0,      0, 0xEF34,
+ 0x5F2F, 0x772A, 0xEF35, 0x5F2A, 0x4078, 0xC85B, 0x772B, 0x3363,
+ 0xEF36, 0x772C, 0x772D,      0, 0x3D61,      0, 0x5F33,      0,
+ 0xEF37,      0,      0,      0, 0xC860, 0x5F2C, 0x442C, 0x5F29,
+ 0x4459,      0,      0,      0, 0x5F4C,      0,      0,      0,
+ 0x5F26,      0, 0x5F25,      0, 0x5F2E, 0xEF39, 0x772E,      0,
+};
 static const unsigned short utf8_to_euc_E6BE[] = {
  0x5F28, 0x5F27, 0x5F2D, 0xC863, 0x4021,      0, 0x5F24, 0xC864,
  0xC865,      0,      0, 0xC866, 0xC867, 0xC868, 0x5F30,      0,
@@ -4349,6 +8057,16 @@ static const unsigned short utf8_to_euc_E6BE[] = {
  0xC877, 0x4543,      0, 0x5F34,      0, 0xC878, 0xC879,      0,
       0, 0x5F38,      0,      0, 0xC87A,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E6BE_x0213[] = {
+ 0x5F28, 0x5F27, 0x5F2D, 0xC863, 0x4021,      0, 0x5F24, 0xC864,
+ 0x772F,      0,      0, 0xC866, 0x7730, 0x7731, 0x5F30,      0,
+ 0xEF3A, 0x5F31, 0xC86A, 0xC86B, 0x7732,      0, 0xEF3B, 0x3442,
+ 0xEF38,      0, 0xC86E,      0,      0,      0,      0, 0xEF3D,
+ 0x7733, 0x5F36,      0, 0x5F35, 0x5F37, 0xEF3E, 0xC872, 0x7734,
+ 0xC874,      0, 0x5F3A,      0,      0,      0, 0xC875, 0xEF3F,
+ 0xC877, 0x4543,      0, 0x5F34,      0, 0xEF41, 0x7735,      0,
+      0, 0x5F38,      0,      0, 0x7736,      0, 0xEF3C,      0,
+};
 static const unsigned short utf8_to_euc_E6BF[] = {
  0x3763, 0x4279, 0x5F32, 0x473B,      0, 0xC87B, 0x5F39, 0xC87C,
  0xC87D,      0, 0xC87E,      0,      0,      0,      0,      0,
@@ -4359,6 +8077,16 @@ static const unsigned short utf8_to_euc_E6BF[] = {
  0xC925, 0x5F40,      0, 0x5F2B,      0, 0xC926, 0x6F69,      0,
       0, 0xC927, 0x5F45,      0, 0xC928, 0xC929, 0x5F49,      0,
 };
+static const unsigned short utf8_to_euc_E6BF_x0213[] = {
+ 0x3763, 0x4279, 0x5F32, 0x473B,      0, 0xC87B, 0x5F39, 0x7737,
+ 0xEF42, 0xEF43, 0x7738,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x5F3E, 0x5F3C,      0,      0,
+ 0x5F3F,      0, 0xEF44, 0x5F42,      0,      0, 0xEF45, 0x5F3B,
+ 0x396A, 0x4728,      0,      0, 0x5E39,      0,      0,      0,
+ 0xC923, 0xEF46,      0, 0x4D74, 0x5F3D,      0, 0x5F41, 0x4275,
+ 0x773A, 0x5F40,      0, 0x5F2B,      0, 0x773B, 0x6F69,      0,
+      0, 0x7739, 0x5F45,      0, 0xEF48, 0xC929, 0x5F49,      0,
+};
 static const unsigned short utf8_to_euc_E780[] = {
  0xC92A, 0x5F47,      0,      0,      0, 0xC92B, 0xC92C, 0xC92D,
       0, 0x5F43,      0, 0x5F44,      0, 0xC92E,      0, 0x5F48,
@@ -4369,6 +8097,16 @@ static const unsigned short utf8_to_euc_E780[] = {
  0x5F50,      0, 0x5F52,      0, 0xC933,      0,      0, 0xC934,
       0, 0xC935,      0,      0, 0xC936,      0, 0x5F51,      0,
 };
+static const unsigned short utf8_to_euc_E780_x0213[] = {
+ 0xEF49, 0x5F47,      0,      0,      0, 0x773C, 0x773D, 0xEF4A,
+      0, 0x5F43, 0xEF4B, 0x5F44,      0, 0xC92E,      0, 0x5F48,
+      0, 0x5F46,      0,      0,      0, 0x494E,      0, 0xC92F,
+ 0x5F4E,      0, 0x5F4B, 0x5F4A,      0, 0x5F4D, 0x4654, 0x5F4F,
+ 0xC930,      0,      0, 0xEF4C,      0,      0, 0x4375, 0x426D,
+ 0x773E,      0,      0,      0, 0x4025,      0,      0, 0xC932,
+ 0x5F50,      0, 0x5F52,      0, 0xC933,      0,      0, 0xC934,
+      0, 0xEF4E, 0xEF4F,      0, 0xEF50,      0, 0x5F51,      0,
+};
 static const unsigned short utf8_to_euc_E781[] = {
       0,      0,      0, 0xC937, 0xC938,      0,      0,      0,
  0xC939, 0xC93A, 0xC93B, 0xC93C, 0x5E75,      0, 0xC941,      0,
@@ -4379,6 +8117,16 @@ static const unsigned short utf8_to_euc_E781[] = {
  0x3325,      0,      0,      0,      0, 0xC946, 0xC947,      0,
  0x3564,      0,      0,      0, 0x3C5E, 0x3A52, 0xC948,      0,
 };
+static const unsigned short utf8_to_euc_E781_x0213[] = {
+      0,      0,      0, 0xEF51, 0xC938,      0,      0, 0xEF52,
+ 0xC939, 0xC93A, 0x773F, 0xEF53, 0x5E75,      0, 0x7742,      0,
+      0, 0x5F53,      0,      0, 0xEF55, 0xC93E,      0,      0,
+ 0x4667,      0,      0,      0,      0, 0x7740, 0x7741,      0,
+      0,      0,      0, 0x5F54, 0x7743, 0xEF56,      0,      0,
+      0, 0xEF57,      0, 0x3250, 0xEF58,      0, 0xEF59, 0x4574,
+ 0x3325,      0,      0,      0,      0, 0x7744, 0xEF5A,      0,
+ 0x3564,      0,      0,      0, 0x3C5E, 0x3A52, 0xEF5B,      0,
+};
 static const unsigned short utf8_to_euc_E782[] = {
       0, 0xC949,      0,      0,      0, 0xC94A, 0xC94B,      0,
       0, 0x4F27, 0x3F66,      0,      0,      0, 0x316A,      0,
@@ -4389,6 +8137,16 @@ static const unsigned short utf8_to_euc_E782[] = {
  0xC954, 0xC955,      0, 0x5F5B, 0xC956,      0,      0, 0xC957,
  0x5F5A, 0x4540, 0x3059, 0xF42E,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E782_x0213[] = {
+      0, 0xEF5C,      0,      0,      0, 0x7745, 0xEF5D,      0,
+      0, 0x4F27, 0x3F66,      0,      0,      0, 0x316A,      0,
+      0,      0, 0x5F56,      0, 0xC94C, 0xEF5E, 0xC94E, 0xEF5F,
+ 0xC950, 0x5F55,      0, 0xC951,      0,      0,      0, 0xEF62,
+      0,      0,      0,      0, 0x7746,      0,      0,      0,
+      0,      0,      0, 0x7747, 0x5F59, 0x433A, 0x5F5C, 0x5F57,
+ 0xC954, 0xEF63,      0, 0x5F5B, 0xC956,      0,      0, 0x7748,
+ 0x5F5A, 0x4540, 0x3059, 0xEF60,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E783[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
  0x4E75,      0, 0xC958, 0x5F5E,      0,      0,      0, 0x3128,
@@ -4399,6 +8157,16 @@ static const unsigned short utf8_to_euc_E783[] = {
       0, 0x5F58,      0,      0,      0,      0,      0,      0,
       0, 0x4B23, 0xC961,      0,      0, 0x5F62,      0,      0,
 };
+static const unsigned short utf8_to_euc_E783_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x4E75,      0, 0xEF66, 0x5F5E,      0,      0,      0, 0x3128,
+      0, 0xEF67,      0, 0xEF68, 0x7749, 0xC95C, 0xC95D,      0,
+ 0x774A, 0x5F60,      0,      0, 0xEF69, 0x5F5F,      0, 0x5F5D,
+      0,      0,      0,      0, 0x774B,      0,      0,      0,
+      0,      0,      0,      0, 0xEF65,      0,      0,      0,
+      0, 0x5F58,      0,      0,      0,      0,      0,      0,
+      0, 0x4B23, 0xC961,      0,      0, 0x5F62,      0,      0,
+};
 static const unsigned short utf8_to_euc_E784[] = {
       0,      0,      0, 0xC962, 0xC963, 0xC964, 0xC965, 0xC966,
       0, 0x5F61,      0, 0xC967, 0xC968,      0,      0, 0xC969,
@@ -4409,6 +8177,16 @@ static const unsigned short utf8_to_euc_E784[] = {
  0xC96F, 0xC970,      0,      0,      0,      0, 0x4133,      0,
  0xC971,      0,      0,      0, 0x3E46,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E784_x0213[] = {
+      0,      0,      0, 0xEF6A, 0xEF6B, 0xC964, 0xEF6C, 0xEF6D,
+ 0xEF6E, 0x5F61,      0, 0xC967, 0xEF6F,      0,      0, 0x774C,
+      0,      0,      0,      0, 0x316B,      0,      0,      0,
+      0, 0x5F64, 0x4A32,      0, 0x5F63,      0, 0x774E,      0,
+ 0x774F, 0x4C35,      0,      0,      0,      0, 0x3E47,      0,
+      0,      0,      0, 0x774D,      0, 0xC96D, 0x7750, 0xEF71,
+ 0x7751, 0xEF72,      0,      0,      0,      0, 0x4133,      0,
+ 0xC971,      0,      0,      0, 0x3E46,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E785[] = {
       0, 0xC972,      0,      0,      0, 0xC973, 0xC974, 0xC975,
       0, 0x4E7B, 0xC976, 0xC977, 0x5F6A,      0, 0x4079,      0,
@@ -4419,6 +8197,16 @@ static const unsigned short utf8_to_euc_E785[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0, 0xCA22,      0,      0,      0, 0x407A,      0,      0,
 };
+static const unsigned short utf8_to_euc_E785_x0213[] = {
+      0, 0xC972,      0,      0,      0, 0xC973, 0x7752, 0x7753,
+      0, 0x4E7B, 0xEF74, 0xC977, 0x5F6A,      0, 0x4079,      0,
+ 0xEF73, 0x7754, 0x7756, 0xEF75,      0, 0x5F66, 0x5F6B, 0xC97A,
+      0, 0x316C, 0xC97B,      0, 0x7757,      0, 0xEF76,      0,
+ 0x7758,      0, 0x5F69,      0, 0x4761, 0x5F65, 0x5F68, 0x3E48,
+ 0x7759, 0x4851,      0,      0, 0x5F6C,      0, 0x3C51,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xCA22,      0,      0,      0, 0x407A,      0,      0,
+};
 static const unsigned short utf8_to_euc_E786[] = {
  0xCA23,      0,      0,      0, 0x5F6F, 0xCA24,      0, 0xCA25,
  0x5F67,      0, 0x3727,      0, 0xCA26,      0,      0, 0x5F6D,
@@ -4429,6 +8217,16 @@ static const unsigned short utf8_to_euc_E786[] = {
  0xCA2D, 0x472E, 0xCA2E, 0xCA2F,      0,      0,      0,      0,
       0, 0x5F74, 0xCA30,      0,      0,      0, 0x5F75, 0xCA31,
 };
+static const unsigned short utf8_to_euc_E786_x0213[] = {
+ 0xEF79,      0,      0,      0, 0x5F6F, 0x775B,      0, 0x775C,
+ 0x5F67,      0, 0x3727,      0, 0xCA26,      0,      0, 0x5F6D,
+      0,      0, 0x775D,      0, 0x4D50, 0x5F70, 0xEF78,      0,
+      0, 0x7426, 0xCA28, 0xEF7A,      0,      0,      0, 0x3D4F,
+ 0xEF7B,      0, 0xEF7C,      0,      0,      0,      0,      0,
+ 0x5F71,      0,      0,      0, 0x5F72,      0, 0xEF7D, 0xEF7E,
+ 0xCA2D, 0x472E, 0xCA2E, 0xF021,      0,      0,      0,      0,
+      0, 0x5F74, 0x775F,      0,      0,      0, 0x5F75, 0xCA31,
+};
 static const unsigned short utf8_to_euc_E787[] = {
  0xCA32, 0xCA33,      0, 0x4733, 0xCA34,      0,      0,      0,
  0x4575, 0x5F77,      0, 0xCA35, 0xCA36,      0, 0x5F79,      0,
@@ -4439,6 +8237,16 @@ static const unsigned short utf8_to_euc_E787[] = {
       0,      0,      0,      0,      0, 0x5F7D,      0,      0,
  0xCA3C, 0x6021,      0, 0x5F6E, 0x5F7E,      0, 0xCA3D, 0x6022,
 };
+static const unsigned short utf8_to_euc_E787_x0213[] = {
+ 0xCA32, 0x775E,      0, 0x4733, 0x7760,      0,      0,      0,
+ 0x4575, 0x5F77,      0, 0xF023, 0xCA36,      0, 0x5F79,      0,
+ 0x4E55,      0, 0x5F76, 0xF024, 0x5F78, 0x316D, 0xCA38, 0x5F73,
+      0, 0xF025, 0xCA3A,      0, 0xF026,      0,      0, 0x535B,
+ 0x5F7A,      0,      0,      0,      0, 0x4167, 0x3B38, 0x5F7C,
+      0,      0,      0,      0, 0x5F7B, 0x3F24, 0x5259,      0,
+      0,      0,      0,      0,      0, 0x5F7D,      0,      0,
+ 0xCA3C, 0x6021,      0, 0x5F6E, 0x5F7E,      0, 0x7761, 0x6022,
+};
 static const unsigned short utf8_to_euc_E788[] = {
  0xCA3E,      0,      0,      0,      0,      0, 0x477A, 0xCA3F,
  0xCA40, 0xCA41,      0,      0,      0, 0x6023,      0,      0,
@@ -4449,6 +8257,16 @@ static const unsigned short utf8_to_euc_E788[] = {
  0x6029,      0, 0x602A,      0, 0xCA4A, 0x3C5F, 0x4963,      0,
  0xCA4B, 0xCA4C, 0x4C6C, 0x602B, 0x602C, 0x4156, 0x3C24, 0x602D,
 };
+static const unsigned short utf8_to_euc_E788_x0213[] = {
+ 0x7762,      0,      0,      0,      0,      0, 0x477A, 0xF027,
+ 0xCA40, 0xCA41,      0,      0,      0, 0x6023,      0,      0,
+ 0x6024,      0,      0, 0xCA42,      0, 0x7763,      0, 0xCA43,
+      0,      0, 0xCA44, 0x6025,      0, 0xCA45,      0, 0xCA46,
+      0,      0,      0,      0, 0xCA47,      0,      0,      0,
+ 0x6026,      0, 0x445E, 0xF02A, 0x6028, 0x6027,      0, 0xCA49,
+ 0x6029,      0, 0x602A,      0, 0xF02B, 0x3C5F, 0x4963,      0,
+ 0xF02C, 0xF02D, 0x4C6C, 0x602B, 0x602C, 0x4156, 0x3C24, 0x602D,
+};
 static const unsigned short utf8_to_euc_E789[] = {
  0x602E, 0xCA4D, 0xCA4E, 0xCA4F,      0, 0xCA50, 0x602F, 0x4A52,
  0x4847,      0,      0, 0x6030, 0x4757,      0, 0xCA51, 0xCA52,
@@ -4459,6 +8277,16 @@ static const unsigned short utf8_to_euc_E789[] = {
       0, 0xCA60, 0x4037,      0, 0x6032,      0,      0, 0xCA61,
  0xCA62, 0x4643,      0, 0xCA63, 0xCA64, 0x3823, 0x6033, 0xCA65,
 };
+static const unsigned short utf8_to_euc_E789_x0213[] = {
+ 0x602E, 0xCA4D, 0xF02F, 0xCA4F,      0, 0xCA50, 0x602F, 0x4A52,
+ 0x4847,      0,      0, 0x6030, 0x4757,      0, 0xCA51, 0xCA52,
+ 0xCA53,      0, 0x442D, 0xF030,      0, 0x7764, 0x7765, 0xF031,
+ 0x6031, 0x3267, 0xCA57, 0x356D, 0xCA58, 0x4C46, 0xCA59, 0x4C36,
+ 0xCA5A, 0x3234, 0x4F34, 0xF032,      0,      0,      0, 0x4B52,
+ 0xCA5C, 0x4A2A,      0, 0xCA5D,      0,      0, 0xF034, 0xF035,
+      0, 0xCA60, 0x4037,      0, 0x6032,      0,      0, 0xCA61,
+ 0xF036, 0x4643,      0, 0xCA63, 0xCA64, 0x3823, 0x6033, 0xF037,
+};
 static const unsigned short utf8_to_euc_E78A[] = {
  0x3A54, 0x6035, 0x6034,      0, 0xCA66,      0,      0, 0x6036,
       0, 0xCA67,      0,      0,      0, 0xCA68, 0xCA69,      0,
@@ -4469,6 +8297,16 @@ static const unsigned short utf8_to_euc_E78A[] = {
       0, 0xCA6F, 0x603C,      0, 0xCA70,      0, 0x3E75,      0,
       0, 0x603B,      0,      0,      0,      0, 0xCA71,      0,
 };
+static const unsigned short utf8_to_euc_E78A_x0213[] = {
+ 0x3A54, 0x6035, 0x6034,      0, 0xCA66,      0,      0, 0x6036,
+      0, 0xCA67,      0,      0,      0, 0x7767, 0xF038,      0,
+      0,      0, 0x6037, 0xCA6A,      0,      0, 0x6038,      0,
+      0,      0,      0, 0x7768,      0,      0,      0,      0,
+ 0x353E,      0, 0x6039,      0,      0,      0,      0, 0x603A,
+ 0xCA6C,      0,      0,      0, 0x3824, 0xF03A, 0xF03B, 0x4848,
+ 0xF03C, 0xF03D, 0x603C,      0, 0xCA70,      0, 0x3E75,      0,
+      0, 0x603B,      0,      0,      0,      0, 0x7769,      0,
+};
 static const unsigned short utf8_to_euc_E78B[] = {
       0, 0xCA72, 0x3638, 0x603D, 0x603F,      0, 0x603E, 0xCA73,
       0, 0xCA74,      0,      0, 0xCA75,      0, 0x6040,      0,
@@ -4479,6 +8317,16 @@ static const unsigned short utf8_to_euc_E78B[] = {
       0,      0,      0, 0xCA7B, 0xCA7C,      0,      0, 0x6046,
  0x432C, 0x6045, 0xCA7D, 0xCA7E, 0x4F35, 0x4762, 0xCB21,      0,
 };
+static const unsigned short utf8_to_euc_E78B_x0213[] = {
+ 0x776A, 0xF03E, 0x3638, 0x603D, 0x603F,      0, 0x603E, 0xCA73,
+      0, 0xCA74,      0,      0, 0xF040,      0, 0x6040,      0,
+ 0x3851,      0, 0x6041,      0,      0, 0xCA76, 0xCA77, 0x3669,
+ 0xCA78, 0x4140,      0, 0x397D,      0,      0,      0, 0xCA79,
+ 0x6043, 0x6044, 0x6042,      0,      0, 0xCA7A,      0,      0,
+      0, 0x3C6D,      0,      0, 0x4648, 0x3639,      0,      0,
+      0,      0,      0, 0xF043, 0xCA7C,      0,      0, 0x6046,
+ 0x432C, 0x6045, 0xF044, 0x776B, 0x4F35, 0x4762, 0xCB21,      0,
+};
 static const unsigned short utf8_to_euc_E78C[] = {
       0,      0, 0xCB22,      0, 0xCB23, 0xCB24,      0, 0xCB25,
       0,      0, 0x6049, 0xCB26,      0, 0xCB27,      0,      0,
@@ -4489,6 +8337,16 @@ static const unsigned short utf8_to_euc_E78C[] = {
       0, 0xCB32, 0xCB33,      0, 0x604D, 0xCB34, 0x4D31, 0x4D32,
       0,      0, 0xCB35, 0xCB36,      0, 0xCB37, 0x6051, 0x316E,
 };
+static const unsigned short utf8_to_euc_E78C_x0213[] = {
+      0,      0, 0xCB22,      0, 0xCB23, 0xCB24,      0, 0xF045,
+      0,      0, 0x6049, 0xCB26,      0, 0xCB27,      0,      0,
+      0,      0, 0xF046, 0xCB29,      0,      0, 0x604B, 0x6048,
+ 0xF047, 0xF048,      0, 0x4C54, 0x604A, 0x604C, 0xCB2C, 0x4E44,
+      0,      0, 0xCB2D,      0,      0, 0x6050,      0, 0x776D,
+ 0x776E, 0x604F, 0x4376, 0x472D, 0xF04B,      0, 0x3825, 0x604E,
+      0, 0xF04C, 0xCB33, 0xF04D, 0x604D, 0xCB34, 0x4D31, 0x4D32,
+      0, 0xF04A, 0xCB35, 0xCB36,      0, 0xF04E, 0x6051, 0x316E,
+};
 static const unsigned short utf8_to_euc_E78D[] = {
       0,      0,      0, 0xCB38, 0x3976, 0x3B62,      0,      0,
       0,      0,      0,      0,      0, 0xCB39, 0x6052, 0x6053,
@@ -4499,6 +8357,16 @@ static const unsigned short utf8_to_euc_E78D[] = {
  0x6058, 0xCB49, 0x334D,      0,      0, 0x605A,      0, 0xCB4A,
  0x6059, 0xCB4B, 0x605C, 0x605B, 0xCB4C,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E78D_x0213[] = {
+      0,      0,      0, 0xCB38, 0x3976, 0x3B62,      0,      0,
+      0,      0,      0,      0,      0, 0xCB39, 0x6052, 0x6053,
+ 0x7770,      0, 0xF04F,      0,      0,      0, 0xCB3C, 0x6055,
+ 0xCB3D,      0,      0,      0,      0, 0xCB3E, 0xCB3F, 0xCB40,
+ 0xCB41,      0,      0, 0x3D43,      0,      0, 0x7771, 0xCB43,
+ 0x6057, 0xCB44, 0x6056, 0xF051, 0xF052,      0, 0xF054, 0xF055,
+ 0x6058, 0xF056, 0x334D,      0,      0, 0x605A,      0, 0xF057,
+ 0x6059, 0xCB4B, 0x605C, 0x605B, 0x7772,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E78E[] = {
  0xCB4D, 0xCB4E,      0, 0xCB4F, 0x383C, 0xCB50, 0xCB51, 0x4E28,
       0, 0x364C,      0, 0x3226,      0,      0, 0xCB52,      0,
@@ -4509,6 +8377,16 @@ static const unsigned short utf8_to_euc_E78E[] = {
       0,      0, 0x4E68, 0x605E,      0, 0xCB62,      0, 0xCB63,
       0, 0xCB64,      0, 0x6060, 0xCB65, 0xCB66,      0, 0xCB67,
 };
+static const unsigned short utf8_to_euc_E78E_x0213[] = {
+ 0xCB4D, 0xF058,      0, 0xCB4F, 0x383C, 0xF059, 0xCB51, 0x4E28,
+      0, 0x364C, 0xF05A, 0x3226,      0,      0, 0xCB52,      0,
+ 0xCB53,      0,      0, 0xCB54, 0xF05B, 0x7773, 0x366A, 0xCB56,
+ 0xF05C,      0,      0,      0, 0xF05D,      0, 0xF05E, 0x7774,
+ 0x7775,      0, 0x7776,      0,      0, 0xF05F, 0x7777,      0,
+ 0xF060, 0x3461, 0xCB5F, 0x7778,      0, 0xCB61,      0,      0,
+      0,      0, 0x4E68, 0x605E,      0, 0xF061,      0, 0xF062,
+      0, 0xF063,      0, 0x6060, 0xF064,      0,      0, 0xF065,
+};
 static const unsigned short utf8_to_euc_E78F[] = {
  0x6061,      0, 0x3251,      0,      0, 0xCB68, 0xCB69,      0,
  0x605D, 0xCB6A, 0x3B39, 0xCB6B, 0xCB6C, 0x4441, 0x605F, 0xCB6D,
@@ -4519,6 +8397,16 @@ static const unsigned short utf8_to_euc_E78F[] = {
       0, 0x607E,      0,      0, 0xCB78, 0xCB79,      0, 0xCB7A,
  0x6069, 0xCB7B, 0xCB7C, 0xCB7D,      0, 0xCB7E, 0x383D, 0xCC21,
 };
+static const unsigned short utf8_to_euc_E78F_x0213[] = {
+ 0x6061,      0, 0x3251,      0,      0, 0xF066, 0xCB69,      0,
+ 0x605D, 0x7779, 0x3B39, 0xF067, 0xCB6C, 0x4441, 0x605F, 0x777A,
+      0,      0,      0, 0xCB6F,      0,      0, 0x777B,      0,
+      0, 0x777C,      0,      0,      0, 0xCB72, 0x6064,      0,
+ 0x3C6E, 0xF068,      0, 0x777D,      0, 0x6062, 0xCB75, 0xF069,
+      0, 0x777E, 0x373E,      0,      0, 0x4849, 0x6063,      0,
+      0, 0x607E,      0,      0, 0xCB78,      0,      0, 0xCB7A,
+ 0x6069, 0xF06A, 0xF06C, 0xCB7D,      0, 0xCB7E, 0x383D, 0xCC21,
+};
 static const unsigned short utf8_to_euc_E790[] = {
  0xCC22, 0xCC23,      0, 0x3565, 0xCC24, 0x6066, 0x4D7D, 0xCC25,
       0, 0x4E30, 0xCC26,      0,      0,      0,      0,      0,
@@ -4529,6 +8417,16 @@ static const unsigned short utf8_to_euc_E790[] = {
  0xCC34, 0xCC35, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A,      0,
       0, 0xCC36, 0x606B,      0,      0,      0,      0, 0x606D,
 };
+static const unsigned short utf8_to_euc_E790_x0213[] = {
+ 0xCC22, 0xF06D,      0, 0x3565, 0xCC24, 0x6066, 0x4D7D, 0x7821,
+      0, 0x4E30, 0x7822,      0,      0,      0,      0,      0,
+      0, 0xCC27,      0, 0xF06B,      0,      0,      0,      0,
+      0,      0, 0x7823, 0x7824,      0,      0,      0,      0,
+      0,      0, 0x4276,      0, 0xF06E, 0x6068, 0x7826,      0,
+ 0x7827,      0, 0x7828, 0x7829, 0x782A, 0xCC31, 0x782B, 0x782C,
+ 0x782D, 0xF06F, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A,      0,
+      0, 0xF070, 0x606B,      0,      0,      0,      0, 0x606D,
+};
 static const unsigned short utf8_to_euc_E791[] = {
  0xCC37, 0x6070,      0, 0xCC38, 0xCC39,      0, 0xCC3A, 0xCC3B,
       0,      0,      0, 0xCC3C,      0, 0xCC3D,      0,      0,
@@ -4539,6 +8437,16 @@ static const unsigned short utf8_to_euc_E791[] = {
  0x6073, 0xCC49, 0xCC4A, 0x3A3C,      0,      0, 0x6076,      0,
       0,      0,      0,      0,      0,      0, 0x6077,      0,
 };
+static const unsigned short utf8_to_euc_E791_x0213[] = {
+ 0xF072, 0x6070,      0, 0xF073, 0x782E,      0, 0x782F, 0x7830,
+      0,      0,      0, 0x7831,      0, 0xF074,      0,      0,
+      0, 0xCC3E, 0xF075, 0xF071,      0, 0x606C,      0, 0x7832,
+      0, 0x606F, 0x386A, 0x314D, 0x6071, 0xF076, 0x3F70, 0x606E,
+ 0x4E5C,      0, 0x7833, 0x6074, 0x7424,      0, 0xCC43, 0xCC44,
+ 0xCC45, 0x6072, 0x6075, 0x7834,      0, 0x7835, 0xCC48, 0x6067,
+ 0x6073, 0xF077, 0xCC4A, 0x3A3C,      0,      0, 0x6076,      0,
+      0,      0,      0,      0,      0,      0, 0x6077,      0,
+};
 static const unsigned short utf8_to_euc_E792[] = {
  0xCC4B, 0xCC4C,      0, 0x4D7E,      0, 0xCC4D, 0xCC4E, 0xCC4F,
       0, 0xCC50,      0, 0x6078,      0,      0,      0, 0xCC51,
@@ -4549,6 +8457,16 @@ static const unsigned short utf8_to_euc_E792[] = {
  0x3444, 0xCC64, 0xCC65,      0,      0, 0xCC66,      0,      0,
       0, 0xCC67,      0, 0xCC68,      0, 0x3C25,      0, 0xCC69,
 };
+static const unsigned short utf8_to_euc_E792_x0213[] = {
+ 0xCC4B, 0xF078,      0, 0x4D7E,      0, 0xF079, 0x7836, 0x7837,
+ 0xF07A, 0x7838,      0, 0x6078,      0,      0,      0, 0xCC51,
+ 0x783D, 0xCC53, 0xF07C,      0,      0,      0,      0, 0xF07D,
+ 0x7839, 0xF07E, 0xCC57,      0, 0x783A,      0, 0x6079, 0x783B,
+ 0xF121, 0xF122, 0x6065, 0x783C,      0, 0xF123, 0x783E, 0x607A,
+ 0x783F, 0x7840, 0xF124, 0xF125,      0,      0, 0xCC62, 0xCC63,
+ 0x3444, 0xCC64, 0xCC65,      0,      0, 0x7841,      0,      0,
+      0, 0xF126, 0xF128, 0xF127,      0, 0x3C25,      0, 0x7842,
+};
 static const unsigned short utf8_to_euc_E793[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
  0xCC6A, 0xCC6B, 0x607B,      0, 0xCC6C,      0,      0, 0x607C,
@@ -4559,6 +8477,16 @@ static const unsigned short utf8_to_euc_E793[] = {
  0x6127, 0x6128, 0x6126,      0, 0xCC79,      0, 0x4953, 0x612A,
  0x6129,      0, 0xCC7A, 0xCC7B, 0xCC7C,      0,      0, 0xCC7D,
 };
+static const unsigned short utf8_to_euc_E793_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x7843, 0x7844, 0x607B,      0, 0xCC6C,      0,      0, 0x607C,
+ 0xCC6D,      0,      0, 0xCC6E, 0x607D,      0, 0xF129,      0,
+ 0xF12A,      0, 0x7845, 0xCC71, 0x313B,      0, 0xF12B, 0xCC73,
+ 0x6121,      0, 0x493B, 0x6122, 0xCC74,      0, 0x3424, 0x6123,
+ 0xCC75, 0x6124, 0xCC76, 0xF12D,      0,      0, 0x6125, 0xF12C,
+ 0x6127, 0x6128, 0x6126,      0, 0xCC79,      0, 0x4953, 0x612A,
+ 0x6129,      0, 0xF12F, 0xCC7B, 0xCC7C,      0,      0, 0x7846,
+};
 static const unsigned short utf8_to_euc_E794[] = {
       0, 0xF450,      0, 0x612C, 0x612B, 0x612D, 0xCC7E,      0,
       0,      0,      0,      0, 0x612E, 0x6130, 0x612F,      0,
@@ -4569,6 +8497,16 @@ static const unsigned short utf8_to_euc_E794[] = {
  0x4544, 0x4D33, 0x3943, 0x3F3D,      0,      0, 0xCD2B, 0x434B,
  0x5234, 0xCD2C, 0x442E, 0x3268, 0x6136, 0xCD2D, 0xCD2E, 0xCD2F,
 };
+static const unsigned short utf8_to_euc_E794_x0213[] = {
+      0, 0x7847,      0, 0x612C, 0x612B, 0x612D, 0xCC7E,      0,
+      0,      0,      0,      0, 0x612E, 0x6130, 0x612F,      0,
+      0, 0x3979, 0xCD21, 0x6132,      0, 0x6131, 0xCD22, 0x7848,
+ 0x3445,      0, 0x3F53,      0, 0x453C,      0, 0x6133, 0x4038,
+ 0xF131, 0xCD25,      0, 0x3B3A, 0xF132, 0x3179, 0x6134, 0xCD27,
+ 0x4D51, 0xCD28, 0xF133, 0x4A63, 0x6135,      0,      0, 0x7849,
+ 0x4544, 0x4D33, 0x3943, 0x3F3D,      0,      0, 0xCD2B, 0x434B,
+ 0x5234, 0xCD2C, 0x442E, 0x3268, 0x6136, 0xF136, 0xF137, 0xCD2F,
+};
 static const unsigned short utf8_to_euc_E795[] = {
  0xCD30,      0,      0, 0xCD31, 0x6137,      0, 0x613C, 0xCD32,
  0xCD33, 0x613A, 0x6139, 0x5A42, 0x3326, 0x6138, 0xCD34, 0x305A,
@@ -4579,6 +8517,16 @@ static const unsigned short utf8_to_euc_E795[] = {
  0x305B, 0xCD3C,      0, 0x3E76, 0x6147,      0, 0x6144, 0x466D,
  0x6143, 0xCD3D, 0xCD3E, 0xCD3F, 0xCD40, 0xCD41, 0xCD42, 0x3526,
 };
+static const unsigned short utf8_to_euc_E795_x0213[] = {
+ 0xF138,      0,      0, 0xCD31, 0x6137,      0, 0x613C, 0xCD32,
+ 0xF139, 0x613A, 0x6139, 0x5A42, 0x3326, 0x6138, 0xF13A, 0x305A,
+ 0xF13B, 0x482A, 0xF13C,      0, 0x484A,      0,      0, 0xCD37,
+      0, 0x4E31, 0x613D, 0x613B, 0x435C, 0x4026, 0xCD38, 0xCD39,
+ 0x482B, 0xCD3A, 0x492D,      0, 0x613F, 0x4E2C, 0x374D, 0x6140,
+      0, 0x613E, 0x4856, 0x6141, 0xF13D, 0x6142,      0, 0x784A,
+ 0x305B, 0xF13F, 0xF13E, 0x3E76, 0x6147,      0, 0x6144, 0x466D,
+ 0x6143, 0x784B, 0xF140, 0xCD3F, 0xCD40, 0xF141, 0xF142, 0x3526,
+};
 static const unsigned short utf8_to_euc_E796[] = {
       0, 0xCD43, 0x614A,      0,      0, 0xCD44, 0x6145, 0x6146,
       0, 0x6149, 0x6148, 0x4925,      0,      0, 0x4142, 0x4141,
@@ -4589,6 +8537,16 @@ static const unsigned short utf8_to_euc_E796[] = {
       0, 0x6157, 0x4868, 0x6151, 0xCD4D, 0x6153,      0,      0,
  0x6155, 0x3F3E, 0xCD4E,      0, 0x6156, 0x6154, 0x3C40, 0xCD4F,
 };
+static const unsigned short utf8_to_euc_E796_x0213[] = {
+      0, 0xF143, 0x614A,      0,      0, 0xCD44, 0x6145, 0x6146,
+      0, 0x6149, 0x6148, 0x4925, 0xF145,      0, 0x4142, 0x4141,
+ 0xCD45, 0x353F, 0x784C, 0xCD47, 0x614B, 0xCD48,      0,      0,
+      0, 0xCD49, 0x614C,      0, 0xCD4A, 0x614D,      0,      0,
+      0,      0, 0xF147, 0x614F, 0xCD4C, 0x614E,      0,      0,
+      0,      0,      0, 0x3156,      0,      0,      0,      0,
+ 0xF149, 0x6157, 0x4868, 0x6151, 0xCD4D, 0x6153,      0, 0xF14A,
+ 0x6155, 0x3F3E, 0xCD4E,      0, 0x6156, 0x6154, 0x3C40, 0xF14B,
+};
 static const unsigned short utf8_to_euc_E797[] = {
  0xCD50, 0xCD51, 0x6150, 0x6152, 0xCD52, 0x4942, 0xCD53, 0x3E49,
       0,      0, 0x6159,      0, 0xCD54, 0x6158, 0xCD55, 0xCD56,
@@ -4599,6 +8557,16 @@ static const unsigned short utf8_to_euc_E797[] = {
  0x6162, 0xCD61, 0x6164, 0x6165, 0x4354,      0,      0,      0,
       0, 0xCD62, 0x6163,      0, 0x6160,      0, 0x615E, 0x615F,
 };
+static const unsigned short utf8_to_euc_E797_x0213[] = {
+ 0xF14C, 0xCD51, 0x6150, 0x6152, 0xCD52, 0x4942, 0xF14D, 0x3E49,
+      0,      0, 0x6159,      0, 0xCD54, 0x6158, 0x784E, 0xF14E,
+      0,      0, 0x615A, 0xF14F, 0x3C26, 0x3A2F,      0, 0xCD57,
+ 0x4577, 0x615B,      0, 0x444B, 0xCD58, 0xF150, 0x615D, 0xF151,
+ 0xF152, 0xCD5B, 0x4E21, 0x615C, 0x784F,      0,      0, 0xF153,
+      0, 0x4169,      0,      0, 0xF154,      0, 0xF155, 0xCD60,
+ 0x6162, 0xF156, 0x6164, 0x6165, 0x4354,      0,      0,      0,
+      0, 0xF157, 0x6163,      0, 0x6160,      0, 0x615E, 0x615F,
+};
 static const unsigned short utf8_to_euc_E798[] = {
  0xCD63, 0x6161, 0xCD64, 0xCD65, 0xCD66,      0,      0, 0xCD67,
  0xCD68, 0x6168, 0xCD69, 0x6166, 0xCD6A, 0x6167,      0, 0xCD6B,
@@ -4609,6 +8577,16 @@ static const unsigned short utf8_to_euc_E798[] = {
  0x6170,      0, 0xCD7A, 0xCD7B, 0x616F, 0xCD7C,      0,      0,
  0xCD7D, 0xCD7E, 0xCE21, 0x6171, 0xCE22,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E798_x0213[] = {
+ 0x7850, 0x6161, 0x7851, 0xF158, 0xCD66,      0,      0, 0xF15A,
+ 0x7852, 0x6168, 0xCD69, 0x6166, 0xCD6A, 0x6167,      0, 0xF15B,
+      0,      0, 0xCD6C, 0xF15E,      0, 0x7853, 0x7854,      0,
+ 0xF159, 0x7855,      0, 0xF15F, 0xF160, 0xCD73, 0x7856, 0x6169,
+ 0x616B, 0x616C, 0x616D, 0xCD75, 0x616E, 0xF162, 0x7E7D, 0x616A,
+ 0xF163, 0xCD78,      0,      0,      0, 0x7857,      0,      0,
+ 0x6170,      0, 0xCD7A, 0xF165, 0x616F, 0x7858,      0,      0,
+ 0xCD7D, 0xCD7E, 0xCE21, 0x6171, 0xF164,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E799[] = {
  0xCE24, 0xCE25, 0x4E45, 0xCE26, 0xCE27, 0xCE28, 0x6174, 0x6172,
  0x6173, 0xCE29, 0xCE23, 0xCE2A, 0x3462,      0,      0,      0,
@@ -4619,6 +8597,16 @@ static const unsigned short utf8_to_euc_E799[] = {
  0x617E, 0xCE33, 0x6221,      0, 0xCE34,      0, 0x6222,      0,
  0x6223,      0, 0x482F, 0x4550, 0x6224, 0x4772, 0x4934,      0,
 };
+static const unsigned short utf8_to_euc_E799_x0213[] = {
+ 0xCE24, 0xF168, 0x4E45, 0x7859, 0xCE27, 0xCE28, 0x6174, 0x6172,
+ 0x6173, 0xF16A, 0xCE23, 0x785A, 0x3462,      0,      0,      0,
+      0,      0, 0x4C7E,      0,      0, 0xF16B, 0x4A4A,      0,
+ 0x6176, 0xCE2C,      0,      0, 0x6175,      0,      0, 0xCE2D,
+      0, 0x6177, 0x6178,      0, 0x785B, 0x785C,      0, 0x617C,
+ 0x6179, 0x617A, 0x617B,      0, 0x617D, 0x785D, 0xF16D, 0x785E,
+ 0x617E, 0x785F, 0x6221,      0, 0xCE34,      0, 0x6222,      0,
+ 0x6223,      0, 0x482F, 0x4550, 0x6224, 0x4772, 0x4934,      0,
+};
 static const unsigned short utf8_to_euc_E79A[] = {
  0x6225, 0xCE35, 0xF451, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
  0x6227,      0,      0, 0x6228, 0xCE37, 0xCE38, 0x6229,      0,
@@ -4629,6 +8617,16 @@ static const unsigned short utf8_to_euc_E79A[] = {
  0x622E,      0,      0,      0, 0x622F,      0,      0, 0x7369,
  0x6230, 0x6231, 0x6232,      0,      0, 0xCE48,      0, 0x3B2E,
 };
+static const unsigned short utf8_to_euc_E79A_x0213[] = {
+ 0x6225, 0x7860,      0, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
+ 0x6227,      0,      0, 0x6228, 0xCE37, 0xCE38, 0x6229,      0,
+ 0x3B29,      0,      0, 0x622B,      0, 0xF16E, 0x622A,      0,
+      0, 0x622C, 0x622D, 0x7861, 0xF16F, 0x7862, 0x7863, 0xCE3D,
+ 0xF171, 0xF170, 0xCE3F, 0xCE40, 0xCE41, 0xCE42, 0x7864, 0xF172,
+ 0xF173,      0, 0x7865,      0,      0, 0xCE47, 0x4869, 0xF174,
+ 0x622E,      0,      0,      0, 0x622F,      0, 0x7866, 0x7369,
+ 0x6230, 0x6231, 0x6232,      0,      0, 0xCE48,      0, 0x3B2E,
+};
 static const unsigned short utf8_to_euc_E79B[] = {
       0, 0xCE49, 0x6233, 0x4756,      0, 0xCE4A, 0x4B5F,      0,
  0x314E, 0xCE4B, 0x3157, 0xCE4C, 0xCE4D, 0x6234, 0xCE4E,      0,
@@ -4639,6 +8637,16 @@ static const unsigned short utf8_to_euc_E79B[] = {
  0xCE55, 0xCE56, 0x4C55,      0, 0x443E,      0, 0xCE57,      0,
  0x416A, 0xCE58,      0, 0x623D, 0xCE59,      0, 0x3D62,      0,
 };
+static const unsigned short utf8_to_euc_E79B_x0213[] = {
+      0, 0xCE49, 0x6233, 0x4756,      0, 0x7867, 0x4B5F,      0,
+ 0x314E, 0xF176, 0x3157, 0xCE4C, 0x7868, 0x6234, 0x7869,      0,
+      0,      0, 0x6236,      0, 0x786A,      0, 0x6235, 0x4570,
+      0, 0xCE50,      0, 0x4039, 0x5D39,      0, 0x6237, 0x4C41,
+ 0xCE51, 0x6238,      0, 0x3446, 0x4857, 0x6239, 0x786B, 0x623A,
+ 0xF178,      0, 0x623B,      0, 0xF179,      0, 0x4C5C,      0,
+ 0xCE55, 0x786C, 0x4C55,      0, 0x443E,      0, 0xCE57,      0,
+ 0x416A, 0xCE58,      0, 0x623D, 0x786D,      0, 0x3D62,      0,
+};
 static const unsigned short utf8_to_euc_E79C[] = {
  0xCE5A, 0x3E4A,      0,      0, 0x6240,      0, 0xCE5B, 0x623F,
  0x623E, 0x487D, 0xCE5C, 0x3447, 0x3829,      0, 0xCE5D,      0,
@@ -4649,6 +8657,16 @@ static const unsigned short utf8_to_euc_E79C[] = {
       0,      0,      0,      0, 0xCE6A, 0xCE6B, 0xCE6C, 0x6247,
  0x6248, 0xCE6D, 0x442F,      0, 0x3463, 0xCE6E, 0xCE6F,      0,
 };
+static const unsigned short utf8_to_euc_E79C_x0213[] = {
+ 0xCE5A, 0x3E4A,      0,      0, 0x6240,      0, 0xCE5B, 0x623F,
+ 0x623E, 0x487D, 0x786E, 0x3447, 0x3829,      0, 0xCE5D,      0,
+      0,      0, 0xCE5E,      0, 0xCE5F, 0xCE60,      0, 0xF17B,
+      0, 0x786F, 0xF17C, 0x6246, 0xCE64,      0, 0x6243, 0x3F3F,
+ 0x4C32,      0, 0xCE65,      0, 0x6242, 0x6244, 0x6245,      0,
+ 0xCE66, 0x6241,      0,      0,      0, 0xF17D, 0xCE68, 0xCE69,
+      0,      0,      0,      0, 0x7870, 0xF17E, 0x7871, 0x6247,
+ 0x6248, 0xCE6D, 0x442F,      0, 0x3463, 0xCE6E, 0xCE6F,      0,
+};
 static const unsigned short utf8_to_euc_E79D[] = {
  0x4365,      0, 0xCE70,      0,      0, 0xCE71, 0xCE72, 0x6249,
       0,      0, 0xCE73,      0,      0, 0xCE74, 0xCE75, 0xCE76,
@@ -4659,6 +8677,16 @@ static const unsigned short utf8_to_euc_E79D[] = {
  0xCF25,      0, 0xCF26, 0xCF27, 0xCF28,      0,      0,      0,
       0, 0x6251, 0xCF29,      0,      0, 0xCF2A, 0x6250, 0x624F,
 };
+static const unsigned short utf8_to_euc_E79D_x0213[] = {
+ 0x4365,      0, 0xCE70,      0,      0, 0xCE71, 0x7872, 0x6249,
+      0,      0, 0xCE73,      0,      0, 0x7873, 0x7874, 0xCE76,
+      0,      0, 0xCE77,      0,      0,      0, 0xCE78, 0xCE79,
+ 0xF225,      0, 0x624A, 0x624D, 0x7875,      0, 0xCE7B, 0x7876,
+ 0xF226, 0x3F67, 0x7877, 0x4644, 0xCF21, 0x624E, 0x4B53, 0xCF22,
+ 0x624B,      0, 0xF227, 0x624C, 0xCF24,      0,      0,      0,
+ 0xCF25,      0, 0xF229, 0xCF27, 0xCF28,      0,      0,      0,
+      0, 0x6251, 0x7878,      0, 0xF22A, 0xF22B, 0x6250, 0x624F,
+};
 static const unsigned short utf8_to_euc_E79E[] = {
  0xCF2B,      0,      0,      0, 0xCF2C,      0,      0,      0,
       0,      0,      0, 0x6253, 0xCF2D, 0xCF2E, 0x6252,      0,
@@ -4669,6 +8697,16 @@ static const unsigned short utf8_to_euc_E79E[] = {
  0x6257, 0xCF39,      0, 0x4637,      0, 0xCF3A, 0x6258,      0,
       0, 0x6259,      0, 0x625D, 0x625B, 0x625C, 0xCF3B, 0x625A,
 };
+static const unsigned short utf8_to_euc_E79E_x0213[] = {
+ 0x7879,      0,      0,      0, 0xCF2C,      0,      0,      0,
+      0,      0,      0, 0x6253, 0xCF2D, 0xCF2E, 0x6252,      0,
+      0, 0x6254,      0,      0, 0x787A, 0xCF30, 0xCF31,      0,
+      0,      0, 0xF22E,      0,      0,      0, 0x6256, 0xF22F,
+ 0x6255,      0, 0xF230,      0, 0xF231, 0x4A4D,      0, 0xCF35,
+      0, 0xF232, 0x787B,      0, 0x3D56, 0x4E46, 0xCF37, 0xCF38,
+ 0x6257, 0xCF39,      0, 0x4637,      0, 0xCF3A, 0x6258,      0,
+      0, 0x6259,      0, 0x625D, 0x625B, 0x625C, 0xCF3B, 0x625A,
+};
 static const unsigned short utf8_to_euc_E79F[] = {
       0,      0,      0, 0xCF3C,      0,      0,      0, 0x625E,
       0, 0xCF3D,      0,      0,      0, 0x625F,      0,      0,
@@ -4679,6 +8717,16 @@ static const unsigned short utf8_to_euc_E79F[] = {
  0xCF49, 0xCF4A,      0, 0x4050, 0xCF4B,      0,      0,      0,
  0xCF4C,      0,      0, 0xCF4D, 0x6265,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E79F_x0213[] = {
+      0,      0,      0, 0xCF3C,      0,      0,      0, 0x625E,
+      0, 0xCF3D,      0,      0,      0, 0x625F,      0,      0,
+      0, 0xCF3E, 0xCF3F,      0,      0, 0xCF40,      0, 0x6260,
+      0, 0xCF41, 0x6261, 0x4C37, 0x6262,      0, 0xF233, 0xF234,
+ 0x787C,      0, 0x4C70, 0x6263, 0xF235, 0x434E, 0xF236, 0x476A,
+      0, 0x366B, 0xF237,      0, 0xF238, 0x433B, 0x6264, 0x363A,
+ 0xF23A, 0xCF4A,      0, 0x4050, 0xF23B,      0,      0,      0,
+ 0xCF4C,      0,      0, 0xF23C, 0x6265,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E7A0[] = {
       0,      0, 0x3A3D,      0,      0, 0xCF4E, 0xCF4F,      0,
       0, 0xCF50,      0,      0, 0x6266, 0xCF51, 0xCF52,      0,
@@ -4689,6 +8737,16 @@ static const unsigned short utf8_to_euc_E7A0[] = {
  0xCF5A,      0, 0x4B24,      0, 0x474B, 0xCF5B,      0, 0xCF5C,
       0,      0, 0x4557,      0,      0,      0,      0, 0x395C,
 };
+static const unsigned short utf8_to_euc_E7A0_x0213[] = {
+      0,      0, 0x3A3D,      0,      0, 0xF23E, 0xF23F,      0,
+      0, 0xF240,      0,      0, 0x6266, 0xF241, 0xCF52,      0,
+      0, 0xCF53, 0x6267,      0, 0x3826, 0x3A55,      0,      0,
+      0, 0xF242,      0,      0,      0, 0xCF54,      0,      0,
+ 0x6269, 0xF243, 0xCF56, 0xCF57,      0, 0x4556, 0x3A56, 0x354E,
+      0,      0,      0,      0, 0xF244, 0x787D, 0xCF59,      0,
+ 0xCF5A,      0, 0x4B24,      0, 0x474B, 0xCF5B,      0, 0xCF5C,
+      0,      0, 0x4557,      0,      0,      0,      0, 0x395C,
+};
 static const unsigned short utf8_to_euc_E7A1[] = {
       0,      0,      0, 0xCF5D, 0xCF5E, 0x626B,      0, 0xCF5F,
  0xCF60,      0,      0,      0, 0xCF61,      0, 0xCF62,      0,
@@ -4699,6 +8757,16 @@ static const unsigned short utf8_to_euc_E7A1[] = {
       0,      0, 0x4823,      0, 0x626D,      0,      0,      0,
       0,      0, 0xCF6D,      0, 0x626F,      0, 0xCF6E,      0,
 };
+static const unsigned short utf8_to_euc_E7A1_x0213[] = {
+      0,      0,      0, 0x7921, 0xCF5E, 0x626B,      0, 0xF245,
+ 0xCF60,      0,      0,      0, 0xCF61,      0, 0x7922, 0x7923,
+      0, 0x7924, 0xCF63,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xCF64, 0x3E4B, 0xCF65,      0,
+ 0xCF66, 0xCF67,      0, 0xCF68, 0xF246,      0,      0,      0,
+ 0x7925,      0, 0xF247, 0x4E32, 0x3945,      0, 0x7926, 0x3827,
+      0,      0, 0x4823,      0, 0x626D,      0,      0,      0,
+      0,      0,      0,      0, 0x626F,      0, 0xCF6E,      0,
+};
 static const unsigned short utf8_to_euc_E7A2[] = {
       0, 0x386B,      0,      0,      0,      0, 0x626E, 0x4476,
       0,      0, 0xCF6F,      0, 0x6271, 0x3337, 0x626C, 0xCF70,
@@ -4709,6 +8777,16 @@ static const unsigned short utf8_to_euc_E7A2[] = {
  0xCF7B, 0xCF7C, 0xCF7D, 0xCF7E,      0, 0x6273,      0,      0,
       0,      0, 0x334E, 0xD021, 0x627B, 0xD022, 0x627A, 0xD023,
 };
+static const unsigned short utf8_to_euc_E7A2_x0213[] = {
+      0, 0x386B,      0,      0,      0,      0, 0x626E, 0x4476,
+      0,      0, 0xF249,      0, 0x6271, 0x3337, 0x626C, 0xCF70,
+      0, 0x486A,      0, 0x3130, 0xF24A, 0x3A6C,      0, 0x4F52,
+ 0xCF72,      0, 0x6270,      0,      0, 0xF24C, 0xF24D, 0xF24E,
+      0, 0xCF73,      0, 0x6272, 0xF24B,      0,      0, 0x4A4B,
+ 0xCF78, 0x4059, 0x6274,      0, 0xCF79, 0x792A,      0, 0x6275,
+ 0x7928, 0xCF7C, 0xCF7D, 0xCF7E,      0, 0x6273,      0,      0,
+      0,      0, 0x334E, 0xF24F, 0x627B, 0xD022, 0x627A, 0xD023,
+};
 static const unsigned short utf8_to_euc_E7A3[] = {
       0, 0x3C27,      0,      0,      0, 0x627C, 0x6277, 0xD024,
  0xD025, 0xD026, 0x627D, 0x6278, 0xD027,      0, 0xD028,      0,
@@ -4719,6 +8797,16 @@ static const unsigned short utf8_to_euc_E7A3[] = {
       0,      0, 0xD034, 0xD035, 0x6324,      0, 0xD037, 0xD038,
       0,      0, 0xD039, 0xD03A,      0, 0x6323,      0, 0xD03B,
 };
+static const unsigned short utf8_to_euc_E7A3_x0213[] = {
+      0, 0x3C27,      0,      0,      0, 0x627C, 0x6277, 0xD024,
+ 0xF250, 0xD026, 0x627D, 0x6278, 0xF251,      0, 0xF252,      0,
+ 0x4858, 0x6276, 0xD029, 0xD02A, 0x6279, 0xF253, 0xD02C,      0,
+      0,      0, 0x6322, 0xD02E,      0,      0,      0, 0xD02F,
+ 0xF254, 0xF255,      0,      0, 0x792B,      0, 0xF256, 0x6321,
+ 0x4B61,      0, 0xD033,      0, 0x627E,      0,      0, 0x306B,
+      0,      0, 0x792C, 0xD035, 0x6324,      0, 0xD037, 0x792E,
+      0, 0xF257, 0xF258, 0xF259,      0, 0x6323, 0xF25A, 0xD03B,
+};
 static const unsigned short utf8_to_euc_E7A4[] = {
  0xD036, 0x3E4C,      0,      0,      0,      0, 0xD03C, 0x6325,
       0,      0,      0,      0, 0xD03D,      0, 0x4143,      0,
@@ -4729,6 +8817,16 @@ static const unsigned short utf8_to_euc_E7A4[] = {
  0xF454, 0xD048,      0,      0, 0xD049, 0xD04A,      0,      0,
       0,      0, 0x3C28, 0xD04B, 0x4E69, 0xD04C, 0x3C52, 0xD04D,
 };
+static const unsigned short utf8_to_euc_E7A4_x0213[] = {
+ 0x792D, 0x3E4C,      0,      0,      0,      0, 0xD03C, 0x6325,
+      0,      0,      0,      0, 0xD03D,      0, 0x4143,      0,
+ 0xF25C, 0x6327, 0x6326,      0,      0,      0,      0,      0,
+      0, 0x6328, 0xD03F, 0xF25D, 0x792F,      0, 0xD041, 0xD042,
+ 0xD043,      0,      0,      0,      0, 0xF25F, 0x6268, 0xD045,
+      0, 0xD046, 0x626A, 0x632A, 0x6329, 0xD047, 0x7930,      0,
+ 0xF25E, 0x7931,      0,      0, 0x7932, 0xD04A,      0,      0,
+      0,      0, 0x3C28, 0xF260, 0x4E69, 0xD04C, 0x3C52, 0xD04D,
+};
 static const unsigned short utf8_to_euc_E7A5[] = {
  0x632B, 0x3737,      0,      0, 0xD04E, 0xD04F, 0xD050, 0x3540,
  0x3527, 0x3B63, 0xD051, 0xD052,      0,      0,      0, 0xD053,
@@ -4739,6 +8837,16 @@ static const unsigned short utf8_to_euc_E7A5[] = {
       0,      0, 0xD05C,      0,      0,      0,      0, 0x4578,
       0, 0xD05D, 0x6332, 0xD05E, 0xD05F,      0, 0xD060, 0x6333,
 };
+static const unsigned short utf8_to_euc_E7A5_x0213[] = {
+ 0x632B, 0x3737,      0,      0, 0xD04E, 0x7935, 0x7936, 0x3540,
+ 0x3527, 0x3B63, 0xF261, 0xD052,      0,      0,      0, 0xD053,
+ 0x4D34, 0xD054,      0, 0x6331, 0xD055, 0x6330, 0x4144, 0x632D,
+ 0xF262,      0, 0x632F, 0xF263, 0x793A, 0x3D4B, 0x3F40, 0x632E,
+ 0x632C,      0, 0x472A,      0,      0, 0x3E4D,      0, 0xF265,
+ 0x493C, 0xD05A,      0, 0xD05B,      0, 0x3A57,      0,      0,
+      0,      0, 0xF266,      0,      0,      0,      0, 0x4578,
+      0, 0x793E, 0x6332, 0xD05E, 0xD05F,      0, 0xD060, 0x6333,
+};
 static const unsigned short utf8_to_euc_E7A6[] = {
  0x6349, 0x3658,      0,      0, 0x4F3D, 0x4135,      0,      0,
       0,      0, 0x6334, 0xD061, 0xD062, 0x3252, 0x4477, 0x4A21,
@@ -4749,6 +8857,16 @@ static const unsigned short utf8_to_euc_E7A6[] = {
  0x4729, 0xD070,      0, 0x633A, 0xD071,      0,      0,      0,
  0xD072, 0x633B, 0x633C, 0xD073,      0, 0x3659, 0x3253, 0x4645,
 };
+static const unsigned short utf8_to_euc_E7A6_x0213[] = {
+ 0x6349, 0x3658,      0,      0, 0x4F3D, 0x4135,      0,      0,
+      0,      0, 0x6334, 0xD061, 0xD062, 0x3252, 0x4477, 0x4A21,
+      0, 0xD063,      0, 0xD064, 0xF267, 0xF268, 0xF269,      0,
+ 0x7942,      0,      0, 0xF26A, 0xD06A, 0x6335,      0,      0,
+      0, 0xF26B,      0,      0,      0,      0, 0x357A, 0x6336,
+ 0xD06C, 0xF26C, 0x6338, 0xD06E,      0,      0, 0x6339, 0xD06F,
+ 0x4729, 0x7943,      0, 0x633A, 0xF26D,      0,      0,      0,
+ 0x7944, 0x633B, 0x633C, 0xF26E,      0, 0x3659, 0x3253, 0x4645,
+};
 static const unsigned short utf8_to_euc_E7A7[] = {
  0x3D28, 0x3B64, 0xD074,      0, 0xD075,      0,      0, 0xD076,
  0xD077, 0x633D, 0xD078, 0x3D29,      0,      0,      0, 0xD079,
@@ -4759,6 +8877,16 @@ static const unsigned short utf8_to_euc_E7A7[] = {
  0x3E4E, 0xD127,      0,      0,      0,      0,      0,      0,
  0xD128,      0,      0, 0x305C, 0xD129,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E7A7_x0213[] = {
+ 0x3D28, 0x3B64, 0xF26F,      0, 0xD075,      0,      0, 0xF270,
+ 0x7945, 0x633D, 0x7946, 0x3D29, 0xF271, 0xF272,      0, 0xD079,
+      0, 0x324A, 0x4943,      0, 0x7948, 0x633E, 0xF273,      0,
+ 0x486B,      0, 0xD07C,      0,      0, 0xD07D, 0x7949, 0x4145,
+ 0xD121, 0x6341, 0xD122, 0x6342, 0x4769, 0xD123, 0x3F41, 0x633F,
+      0, 0x4361, 0xD124, 0x794A, 0x6340, 0x794B,      0,      0,
+ 0x3E4E, 0xD127,      0,      0,      0,      0,      0,      0,
+ 0xD128,      0,      0, 0x305C, 0xD129,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E7A8[] = {
  0x3529,      0, 0xD12A, 0xD12B,      0,      0,      0, 0xD12C,
  0x6343, 0xD12D, 0xD12E, 0x4478, 0xD12F, 0x6344, 0x4047,      0,
@@ -4769,6 +8897,16 @@ static const unsigned short utf8_to_euc_E7A8[] = {
  0xD139, 0x634A, 0x3070,      0, 0xD13A, 0xD13B,      0, 0x634D,
  0xD13C, 0xD13D, 0xD13E, 0x634B, 0x3254, 0x374E, 0x634C, 0x3946,
 };
+static const unsigned short utf8_to_euc_E7A8_x0213[] = {
+ 0x3529,      0, 0xD12A, 0x794C,      0,      0,      0, 0xD12C,
+ 0x6343, 0xD12D, 0xF278, 0x4478, 0xD12F, 0x6344, 0x4047,      0,
+      0, 0xF279,      0,      0, 0x4C2D, 0xF27A,      0, 0x4923,
+ 0x6345, 0x6346, 0x4355, 0xF27B, 0x4E47,      0, 0xF27C, 0x6348,
+ 0x6347, 0xD134,      0,      0,      0,      0,      0, 0xD135,
+      0,      0,      0, 0xD136,      0, 0xF27E, 0x3C6F, 0xD138,
+ 0xD139, 0x634A, 0x3070,      0, 0xD13A, 0xD13B,      0, 0x634D,
+ 0xF321, 0x794E, 0xD13E, 0x634B, 0x3254, 0x374E, 0x634C, 0x3946,
+};
 static const unsigned short utf8_to_euc_E7A9[] = {
  0x3972,      0, 0x4A66, 0x634E, 0xD13F, 0xD140, 0x4B54, 0xD141,
  0xD142, 0x6350,      0,      0, 0xD143, 0x4051, 0x314F, 0x323A,
@@ -4779,6 +8917,16 @@ static const unsigned short utf8_to_euc_E7A9[] = {
  0x6355,      0,      0,      0, 0x376A, 0xD14F, 0x3566,      0,
  0xD150, 0x6356, 0x3675,      0,      0, 0x6357, 0xD151, 0x407C,
 };
+static const unsigned short utf8_to_euc_E7A9_x0213[] = {
+ 0x3972,      0, 0x4A66, 0x634E, 0xD13F, 0xD140, 0x4B54, 0xF322,
+ 0xD142, 0x6350,      0,      0, 0xF323, 0x4051, 0x314F, 0x323A,
+ 0x302C,      0,      0,      0,      0, 0xD144, 0xF324, 0x634F,
+      0, 0xF325,      0,      0, 0xF326, 0x794F,      0, 0xF327,
+ 0xF328, 0x6351, 0x6352, 0x3E77,      0, 0xD14B,      0, 0xF329,
+      0, 0x6353, 0xF32A, 0x334F,      0, 0x7950,      0,      0,
+ 0x6355,      0,      0,      0, 0x376A, 0xF32B, 0x3566,      0,
+ 0xF32C, 0x6356, 0x3675,      0,      0, 0x6357, 0xD151, 0x407C,
+};
 static const unsigned short utf8_to_euc_E7AA[] = {
  0xD152, 0x464D, 0xD153, 0x4060, 0x3A75, 0xD154, 0xD155,      0,
  0x6358,      0, 0xD156, 0xD157,      0,      0,      0,      0,
@@ -4789,6 +8937,16 @@ static const unsigned short utf8_to_euc_E7AA[] = {
  0x635F,      0,      0, 0xD15F,      0, 0xD160, 0x6360,      0,
       0, 0xD161, 0x312E, 0xD162, 0xD163,      0,      0, 0x6363,
 };
+static const unsigned short utf8_to_euc_E7AA_x0213[] = {
+ 0xD152, 0x464D, 0xF32D, 0x4060, 0x3A75, 0x7952, 0xD155,      0,
+ 0x6358,      0, 0xF32E, 0xD157,      0,      0,      0,      0,
+ 0xF32F, 0xD159, 0x4362, 0x416B, 0xD15A, 0x635A, 0x635C, 0x6359,
+ 0x635B,      0,      0,      0,      0,      0, 0xD15B, 0x3722,
+ 0x7953,      0,      0, 0xF330,      0,      0,      0,      0,
+      0, 0x635D, 0x3726,      0, 0xF331,      0, 0x3567, 0x4D52,
+ 0x635F,      0,      0, 0x7955,      0, 0xD160, 0x6360,      0,
+      0, 0xF334, 0x312E, 0x7956, 0xF335,      0, 0xF336, 0x6363,
+};
 static const unsigned short utf8_to_euc_E7AB[] = {
       0,      0,      0, 0x3376, 0x6362, 0x6361, 0xD164, 0x6365,
  0x635E, 0xD165, 0x6366, 0x4E29, 0xD166, 0x6367, 0xD167, 0x6368,
@@ -4799,6 +8957,16 @@ static const unsigned short utf8_to_euc_E7AB[] = {
  0x6372, 0xD16E,      0,      0, 0xD16F,      0, 0x3625,      0,
  0x513F, 0x435D, 0x3C33, 0xD170,      0, 0xD171, 0xD172, 0x3448,
 };
+static const unsigned short utf8_to_euc_E7AB_x0213[] = {
+      0,      0,      0, 0x3376, 0x6362, 0x6361, 0xD164, 0x6365,
+ 0x635E, 0xD165, 0x6366, 0x4E29, 0xF338, 0x6367, 0x7957, 0x6368,
+      0, 0xF339, 0x5474, 0x636A,      0, 0x6369,      0,      0,
+      0, 0x636B, 0x636C, 0xD169, 0x4E35, 0x636D,      0, 0x706F,
+ 0x3E4F, 0x636E, 0x636F, 0x3D57,      0, 0x4638, 0x6370, 0xF33A,
+ 0xF33B, 0xD16B, 0x4328, 0x7958, 0xD16D, 0x6371,      0, 0x433C,
+ 0x6372, 0xD16E,      0,      0, 0xF33C,      0, 0x3625,      0,
+ 0x513F, 0x435D, 0x3C33, 0xD170,      0, 0x7959, 0xD172, 0x3448,
+};
 static const unsigned short utf8_to_euc_E7AC[] = {
       0,      0, 0x6373,      0, 0x6422,      0, 0x6376, 0xD173,
  0x3568,      0, 0x6375, 0x6424,      0,      0,      0, 0x6374,
@@ -4809,6 +8977,16 @@ static const unsigned short utf8_to_euc_E7AC[] = {
  0xD17E, 0xD221,      0, 0x6377, 0xD222, 0x637B, 0x637D,      0,
       0, 0x3A7B,      0,      0,      0, 0xD223,      0, 0xD224,
 };
+static const unsigned short utf8_to_euc_E7AC_x0213[] = {
+      0,      0, 0x6373,      0, 0x6422,      0, 0x6376, 0xF33F,
+ 0x3568,      0, 0x6375, 0x6424,      0,      0,      0, 0x6374,
+      0, 0x3E50, 0x795A,      0, 0xD174,      0,      0,      0,
+ 0x6378, 0x6379,      0, 0x452B,      0,      0, 0x637A, 0xD175,
+ 0x335E,      0,      0, 0xD176,      0, 0x3F5A, 0x4964, 0xF342,
+ 0x637C, 0xD178, 0xF343, 0xD17A, 0x4268, 0x795B, 0xF344, 0xF345,
+ 0xD17E, 0xF346,      0, 0x6377, 0xD222, 0x637B, 0x637D,      0,
+      0, 0x3A7B,      0, 0x795C,      0, 0xF341,      0, 0xD224,
+};
 static const unsigned short utf8_to_euc_E7AD[] = {
  0xD225, 0xD226,      0,      0,      0, 0x6426, 0x492E, 0xD227,
  0x4826, 0x4579,      0, 0x365A, 0x6425, 0x6423, 0xD228, 0x4835,
@@ -4819,6 +8997,16 @@ static const unsigned short utf8_to_euc_E7AD[] = {
  0x642B, 0x642C, 0xD231, 0xD232, 0x6429, 0x6427,      0, 0xD233,
       0,      0, 0x6421,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E7AD_x0213[] = {
+ 0xD225, 0xF34A,      0,      0,      0, 0x6426, 0x492E, 0x795D,
+ 0x4826, 0x4579,      0, 0x365A, 0x6425, 0x6423, 0x795E, 0x4835,
+ 0x637E, 0x435E, 0x457B,      0, 0x457A, 0xF34C, 0x3A76,      0,
+      0,      0,      0,      0,      0, 0x6438,      0,      0,
+ 0x795F,      0,      0,      0, 0xF34E, 0x6428, 0xF34F, 0x642A,
+      0, 0xF350, 0xD22E,      0, 0x642D, 0x7960, 0x642E, 0x7961,
+ 0x642B, 0x642C, 0x7962, 0xF351, 0x6429, 0x6427,      0, 0xD233,
+      0, 0xF34D, 0x6421,      0,      0,      0,      0, 0xF349,
+};
 static const unsigned short utf8_to_euc_E7AE[] = {
       0,      0,      0,      0, 0xD234,      0, 0x4A4F, 0x3255,
       0, 0xD235,      0, 0x6435,      0, 0x6432, 0xD236, 0x6437,
@@ -4829,6 +9017,16 @@ static const unsigned short utf8_to_euc_E7AE[] = {
  0xD240, 0x4822, 0xD241,      0, 0x643E, 0xD242, 0xD243,      0,
  0x4824,      0, 0xD244, 0xD245, 0xD246, 0xD247,      0,      0,
 };
+static const unsigned short utf8_to_euc_E7AE_x0213[] = {
+      0,      0,      0,      0, 0xD234,      0, 0x4A4F, 0x3255,
+      0, 0xD235,      0, 0x6435,      0, 0x6432, 0xD236, 0x6437,
+ 0xF354, 0xF355, 0x6436,      0, 0x4773, 0x4C27, 0xD239, 0x3B3B,
+ 0x6430, 0x6439, 0x6434, 0xF356, 0x6433, 0x642F, 0x7963, 0x6431,
+ 0xD23C, 0x3449,      0,      0,      0, 0xD23D,      0,      0,
+      0,      0, 0x433D,      0, 0xD23E, 0x407D,      0, 0xF358,
+ 0xD240, 0x4822, 0xD241,      0, 0x643E, 0xF359, 0xD243,      0,
+ 0x4824,      0, 0xD244, 0xD245, 0xF35A, 0xD247,      0,      0,
+};
 static const unsigned short utf8_to_euc_E7AF[] = {
  0x4061, 0x643B, 0xD248,      0, 0x484F, 0xD249, 0x643F, 0x4A53,
  0xD24A, 0x435B, 0xD24B, 0x643A, 0x643C,      0,      0, 0x643D,
@@ -4839,6 +9037,16 @@ static const unsigned short utf8_to_euc_E7AF[] = {
       0,      0, 0xD254, 0x644A, 0xD255, 0xD256, 0x644E, 0x644B,
  0xD257, 0xD258, 0xD259,      0, 0xD25A,      0, 0xD25B,      0,
 };
+static const unsigned short utf8_to_euc_E7AF_x0213[] = {
+ 0x4061, 0x643B, 0xD248,      0, 0x484F, 0xF35B, 0x643F, 0x4A53,
+ 0xD24A, 0x435B, 0xF35C, 0x643A, 0x643C,      0,      0, 0x643D,
+      0,      0,      0,      0, 0xF35F,      0, 0xF360, 0x7965,
+      0, 0x7966, 0xF361, 0xD251,      0, 0x6440,      0,      0,
+ 0x3C44,      0,      0,      0, 0x4646, 0x6445, 0x6444,      0,
+ 0xD252, 0x6441, 0xF362,      0,      0, 0x4F36,      0,      0,
+ 0xF363,      0, 0xD254, 0x644A, 0xD255, 0xD256, 0x644E, 0x644B,
+ 0xD257, 0xD258, 0xD259,      0, 0xD25A,      0, 0xD25B,      0,
+};
 static const unsigned short utf8_to_euc_E7B0[] = {
  0x6447, 0xD25C, 0xD25D, 0xD25E, 0xD25F,      0, 0xD260, 0x6448,
       0, 0xD261,      0, 0xD262, 0xD263, 0x644D, 0xD264, 0xD265,
@@ -4849,6 +9057,16 @@ static const unsigned short utf8_to_euc_E7B0[] = {
       0, 0xD26D,      0, 0xD26E, 0xD26F,      0, 0xD270, 0x6453,
  0x4876, 0xD271, 0xD272,      0,      0, 0x6455, 0x4E7C, 0x4A6D,
 };
+static const unsigned short utf8_to_euc_E7B0_x0213[] = {
+ 0x6447, 0x7967, 0xD25D, 0xF364, 0xD25F,      0, 0xD260, 0x6448,
+      0, 0xD261,      0, 0xF365, 0xD263, 0x644D, 0xF366, 0xF367,
+      0, 0x6442, 0x5255, 0x6449, 0x6443,      0,      0, 0x644C,
+      0, 0xD266,      0, 0xD267,      0,      0, 0x7969, 0x6452,
+ 0x796A, 0x344A,      0, 0x644F,      0, 0xD269, 0xF368, 0x6450,
+ 0xD26B,      0, 0x6451, 0x6454, 0xD26C,      0,      0,      0,
+      0, 0x7968,      0, 0x796B, 0xD26F,      0, 0x796C, 0x6453,
+ 0x4876, 0xD271, 0xD272,      0,      0, 0x6455, 0x4E7C, 0x4A6D,
+};
 static const unsigned short utf8_to_euc_E7B1[] = {
  0x645A,      0,      0, 0x6457,      0,      0, 0xD273,      0,
       0,      0, 0xD274,      0, 0x6456, 0x4052,      0, 0x6459,
@@ -4859,6 +9077,16 @@ static const unsigned short utf8_to_euc_E7B1[] = {
  0xD327,      0, 0xD328, 0x4A46,      0, 0x6462,      0,      0,
       0, 0xD329,      0,      0, 0xD32A, 0xD32B, 0x4C62,      0,
 };
+static const unsigned short utf8_to_euc_E7B1_x0213[] = {
+ 0x645A,      0,      0, 0x6457,      0, 0xF369, 0xD273,      0,
+      0,      0, 0xF36A,      0, 0x6456, 0x4052,      0, 0x6459,
+ 0x645B, 0xF36B, 0xD277, 0xD278, 0x6458, 0xD275, 0x645F, 0xF36C,
+ 0x645C, 0x796F, 0xD27A, 0xD27B, 0xD27C, 0xD27D, 0xF36D, 0x645D,
+ 0x6446, 0xF36E,      0, 0xD322, 0x645E, 0x6460,      0, 0xD323,
+      0, 0xF36F,      0,      0, 0x6461, 0x7970, 0xF370, 0xF371,
+ 0xF372,      0, 0xD328, 0x4A46,      0, 0x6462,      0,      0,
+      0, 0x7971,      0,      0, 0xD32A, 0xD32B, 0x4C62,      0,
+};
 static const unsigned short utf8_to_euc_E7B2[] = {
       0, 0x364E, 0x3729, 0x6463,      0,      0, 0xD32C, 0xD32D,
       0, 0x4A34,      0, 0x3F68,      0, 0x4C30,      0, 0xD32E,
@@ -4869,6 +9097,16 @@ static const unsigned short utf8_to_euc_E7B2[] = {
  0xD333, 0x646D, 0x646C, 0x646B,      0,      0, 0xD334, 0xD335,
       0, 0x646F, 0xD336, 0xD337, 0xD338, 0x6470, 0x403A, 0xD339,
 };
+static const unsigned short utf8_to_euc_E7B2_x0213[] = {
+      0, 0x364E, 0x3729, 0x6463,      0,      0, 0xD32C, 0xD32D,
+      0, 0x4A34,      0, 0x3F68,      0, 0x4C30,      0, 0x7972,
+ 0x6464,      0, 0x4E33,      0, 0x7973, 0x4774,      0, 0x4146,
+ 0x4734,      0,      0, 0x3D4D,      0,      0, 0xD330, 0x3040,
+ 0x7974, 0x6469, 0x6467,      0, 0x6465, 0x3421, 0xF376, 0x3E51,
+ 0x646A,      0,      0, 0x6468,      0, 0x6466, 0x646E,      0,
+ 0xD333, 0x646D, 0x646C, 0x646B,      0,      0, 0xF378, 0xF379,
+      0, 0x646F, 0xD336, 0xD337, 0x7975, 0x6470, 0x403A, 0xF37A,
+};
 static const unsigned short utf8_to_euc_E7B3[] = {
  0x6471,      0, 0x6473,      0, 0xD33A, 0x6472,      0, 0xD33B,
  0xD33C, 0xD33D, 0x3852,      0,      0, 0xD33E, 0x4138, 0xD33F,
@@ -4879,6 +9117,16 @@ static const unsigned short utf8_to_euc_E7B3[] = {
       0,      0, 0x647A,      0, 0x647B, 0xD34A, 0x647C,      0,
  0x3B65,      0, 0x647D, 0x374F,      0,      0, 0x356A,      0,
 };
+static const unsigned short utf8_to_euc_E7B3_x0213[] = {
+ 0x6471,      0, 0x6473,      0, 0xF37C, 0x6472,      0, 0xD33B,
+ 0xF37E, 0xD33D, 0x3852,      0,      0, 0xF421, 0x4138, 0xD33F,
+      0,      0, 0x6475, 0xD340, 0xD341, 0x7976, 0x457C, 0xF423,
+ 0x6474, 0x7977, 0xD345,      0, 0x6476, 0x7978, 0x4A35, 0x416C,
+ 0x3947,      0, 0x6477,      0,      0,      0, 0xF425, 0x4E48,
+      0, 0xD348,      0, 0xF426,      0,      0,      0, 0x6479,
+      0,      0, 0x647A,      0, 0x647B, 0xF428, 0x647C,      0,
+ 0x3B65,      0, 0x647D, 0x374F,      0,      0, 0x356A,      0,
+};
 static const unsigned short utf8_to_euc_E7B4[] = {
  0x352A,      0, 0x6521, 0xD34B, 0x4C73, 0x3948, 0x647E, 0xD34C,
  0xD34D, 0xD34E, 0x6524, 0x4C66,      0, 0x473C,      0, 0xD34F,
@@ -4889,6 +9137,16 @@ static const unsigned short utf8_to_euc_E7B4[] = {
  0x3A59, 0xD35A, 0x6528, 0x3F42,      0, 0x652A,      0,      0,
       0, 0x3E52, 0x3A30,      0, 0xD35B, 0xD35C, 0xD35D, 0x6529,
 };
+static const unsigned short utf8_to_euc_E7B4_x0213[] = {
+ 0x352A,      0, 0x6521, 0xF429, 0x4C73, 0x3948, 0x647E, 0x7979,
+ 0x797A, 0xF42A, 0x6524, 0x4C66,      0, 0x473C,      0, 0xD34F,
+ 0x4933, 0xD350, 0xF42C, 0x797B, 0x3D63, 0x6523, 0xD353, 0x3C53,
+ 0x3949, 0x3B66, 0x3569, 0x4A36, 0x6522, 0x797C, 0xF42D,      0,
+ 0x4147, 0x4B42, 0x3A77, 0x797D,      0,      0, 0xD357,      0,
+      0,      0, 0xD358, 0x3B67, 0x445D, 0xD359, 0x6527, 0x4E5F,
+ 0x3A59, 0x797E, 0x6528, 0x3F42,      0, 0x652A,      0,      0,
+      0, 0x3E52, 0x3A30,      0, 0xD35B, 0xF430, 0xF431, 0x6529,
+};
 static const unsigned short utf8_to_euc_E7B5[] = {
  0xD35E, 0xD35F, 0x3D2A, 0x383E, 0x4148, 0x6525, 0x652B, 0xD360,
  0xD361,      0,      0, 0x6526, 0x3750, 0xD362, 0x652E, 0x6532,
@@ -4899,6 +9157,16 @@ static const unsigned short utf8_to_euc_E7B5[] = {
  0xD36D, 0x457D, 0x652F, 0x652C,      0, 0x3328, 0x4064,      0,
  0xD36E, 0x3828, 0xD36F, 0xD370,      0, 0x6538,      0, 0xD371,
 };
+static const unsigned short utf8_to_euc_E7B5_x0213[] = {
+ 0xF432, 0x7A21, 0x3D2A, 0x383E, 0x4148, 0x6525, 0x652B, 0xF433,
+ 0x7A22,      0,      0, 0x6526, 0x3750, 0xD362, 0x652E, 0x6532,
+ 0x376B, 0xD363,      0, 0x7A23,      0,      0, 0x652D, 0xD365,
+      0, 0xF437, 0xF438, 0x6536, 0x7A24, 0xD369, 0x394A,      0,
+      0, 0x4D6D, 0x303C, 0x6533,      0, 0xD36A, 0x356B, 0xD36B,
+ 0x6530,      0, 0xF439,      0,      0,      0, 0x6531,      0,
+ 0xF43A, 0x457D, 0x652F, 0x652C,      0, 0x3328, 0x4064,      0,
+ 0xD36E, 0x3828, 0x7A25, 0xD370,      0, 0x6538,      0, 0xF43C,
+};
 static const unsigned short utf8_to_euc_E7B6[] = {
       0, 0xD372, 0xD373, 0xD374,      0, 0xD375, 0xD376,      0,
  0xD377, 0x6535,      0, 0xD378, 0xD379, 0xD37A,      0, 0x6537,
@@ -4909,6 +9177,16 @@ static const unsigned short utf8_to_euc_E7B6[] = {
  0x6547, 0x394B, 0x4C56, 0xD425, 0x4456, 0x653D, 0xD426, 0xD427,
  0x6545, 0xD428, 0x653A, 0x433E,      0, 0x653F, 0x303D, 0x4C4A,
 };
+static const unsigned short utf8_to_euc_E7B6_x0213[] = {
+      0, 0xD372, 0xD373, 0x7A26,      0, 0xD375, 0xF43E,      0,
+ 0xF43F, 0x6535,      0, 0x7A27, 0xF440, 0xD37A,      0, 0x6537,
+      0, 0xD37B,      0, 0x6534,      0,      0, 0xD37C, 0xF441,
+      0, 0x3751, 0x4233, 0x6539, 0x416E, 0xF443, 0xD421, 0x6546,
+ 0x7A28,      0, 0x6542, 0x653C,      0,      0, 0x7A29, 0xF444,
+      0,      0, 0xF445, 0x6540, 0x3C7A, 0x305D, 0x653B, 0x6543,
+ 0x6547, 0x394B, 0x4C56, 0xD425, 0x4456, 0x653D, 0xF446, 0xF447,
+ 0x6545, 0xD428, 0x653A, 0x433E,      0, 0x653F, 0x303D, 0x4C4A,
+};
 static const unsigned short utf8_to_euc_E7B7[] = {
       0,      0, 0xD429, 0xD42A, 0xD42B, 0xD42C, 0xD42D, 0x653E,
       0,      0, 0x365B, 0x486C, 0xD42E, 0xD42F, 0xD430, 0x416D,
@@ -4919,6 +9197,16 @@ static const unsigned short utf8_to_euc_E7B7[] = {
       0, 0xD43A, 0x654D,      0, 0x4E7D, 0xD43B, 0xD43C,      0,
       0, 0xD43D, 0xD43E, 0x654C,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E7B7_x0213[] = {
+ 0xF448,      0, 0x7A2A, 0xD42A, 0xD42B, 0xD42C, 0xD42D, 0x653E,
+      0,      0, 0x365B, 0x486C, 0x7A2B, 0xD42F, 0xD430, 0x416D,
+      0, 0x4E50, 0x3D6F,      0,      0, 0x656E, 0x7A2C, 0xF449,
+ 0x6548, 0xF44A, 0x407E,      0, 0x6544, 0x6549, 0x654B,      0,
+ 0x4479, 0x654E, 0xD434, 0x7A2D, 0x654A, 0xD435, 0xF44B,      0,
+ 0x4A54, 0x344B, 0xD437, 0xD438, 0x4C4B, 0xD439,      0, 0x305E,
+      0, 0xF44C, 0x654D,      0, 0x4E7D, 0xD43B, 0xD43C,      0,
+      0, 0xF44D, 0xD43E, 0x654C,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E7B8[] = {
  0xD433, 0x316F,      0,      0, 0x466C, 0x654F,      0,      0,
  0xD43F, 0x6556, 0x6550, 0x6557,      0,      0,      0,      0,
@@ -4929,6 +9217,16 @@ static const unsigned short utf8_to_euc_E7B8[] = {
       0, 0x6554, 0x6560, 0xD44C,      0, 0x655C, 0xD44D, 0x655F,
       0, 0x655D, 0x6561, 0x655B,      0, 0x6541, 0x4053, 0xD44E,
 };
+static const unsigned short utf8_to_euc_E7B8_x0213[] = {
+ 0xD433, 0x316F,      0,      0, 0x466C, 0x654F,      0,      0,
+ 0x7A30, 0x6556, 0x6550, 0x6557,      0,      0,      0,      0,
+ 0xF451, 0x7A31, 0x6553,      0,      0, 0x7A32,      0, 0xF452,
+      0,      0,      0, 0x477B, 0xD444, 0xF453, 0x3C4A, 0x6555,
+ 0xF454, 0x6552, 0x6558, 0x6551,      0,      0, 0x3D44, 0xF455,
+ 0x7A2F,      0,      0, 0x4B25, 0xF456, 0xD44A, 0x3D4C, 0xD44B,
+      0, 0x6554, 0x6560, 0xD44C,      0, 0x655C, 0xD44D, 0x655F,
+      0, 0x655D, 0x6561, 0x655B,      0, 0x6541, 0x4053, 0xD44E,
+};
 static const unsigned short utf8_to_euc_E7B9[] = {
       0, 0x484B,      0, 0x655E, 0xD44F, 0xD450, 0x6559, 0xD451,
       0,      0, 0x4121, 0x3752,      0, 0x3D2B, 0xD452,      0,
@@ -4939,6 +9237,16 @@ static const unsigned short utf8_to_euc_E7B9[] = {
  0x372B,      0,      0, 0xD45D,      0,      0,      0,      0,
  0xD45E, 0x6568,      0, 0x656C, 0x656B, 0x656F, 0xD45F, 0x6571,
 };
+static const unsigned short utf8_to_euc_E7B9_x0213[] = {
+      0, 0x484B,      0, 0x655E, 0xD44F, 0xF457, 0x6559, 0x7A34,
+      0,      0, 0x4121, 0x3752,      0, 0x3D2B, 0xD452,      0,
+ 0xD453,      0, 0x7A35,      0, 0x3F25, 0x4136, 0x6564,      0,
+ 0xD455, 0x6566, 0x6567,      0,      0, 0x6563, 0x6565, 0xD456,
+      0, 0x7A36, 0xD458,      0,      0, 0xD459, 0x655A, 0x6562,
+      0, 0x656A, 0x6569, 0x7E7E,      0, 0x4B7A, 0xD45B, 0xD45C,
+ 0x372B,      0,      0, 0xF458,      0, 0xF459,      0,      0,
+ 0xD45E, 0x6568,      0, 0x656C, 0x656B, 0x656F, 0xF45A, 0x6571,
+};
 static const unsigned short utf8_to_euc_E7BA[] = {
       0, 0xD460, 0x3B3C, 0x656D,      0,      0, 0xD461, 0xD462,
  0x6572, 0x6573, 0xD463,      0, 0x6574, 0xD464, 0x657A, 0x453B,
@@ -4949,6 +9257,16 @@ static const unsigned short utf8_to_euc_E7BA[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E7BA_x0213[] = {
+      0, 0xD460, 0x3B3C, 0x656D,      0,      0, 0xF45B, 0xF45C,
+ 0x6572, 0x6573, 0x7A37,      0, 0x6574, 0x7A38, 0x657A, 0x453B,
+ 0x6576, 0xF45E, 0x6575, 0x6577, 0x6578, 0xD466, 0x6579,      0,
+ 0xF45F,      0, 0xF460, 0x657B, 0x657C, 0xD469, 0xD46A,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E7BC[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -4959,6 +9277,16 @@ static const unsigned short utf8_to_euc_E7BC[] = {
       0,      0,      0,      0,      0,      0, 0x344C,      0,
  0x657D,      0, 0x657E, 0xD46C, 0xD46B, 0xD46D, 0xD46E, 0xD46F,
 };
+static const unsigned short utf8_to_euc_E7BC_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x344C,      0,
+ 0x657D,      0, 0x657E, 0xF463, 0xF462, 0xD46D, 0xF464, 0xD46F,
+};
 static const unsigned short utf8_to_euc_E7BD[] = {
       0,      0,      0, 0xD470, 0xD471, 0x6621,      0, 0xD472,
       0,      0,      0,      0, 0x6622, 0x6623, 0x6624, 0xD473,
@@ -4969,6 +9297,16 @@ static const unsigned short utf8_to_euc_E7BD[] = {
  0x4833, 0xD521, 0x3D70,      0,      0, 0x474D,      0, 0x486D,
  0x662F, 0x586D,      0,      0,      0, 0xD522, 0xD523, 0xD524,
 };
+static const unsigned short utf8_to_euc_E7BD_x0213[] = {
+      0,      0,      0, 0xF465, 0xF466, 0x6621,      0, 0x7A39,
+      0,      0,      0,      0, 0x6622, 0x6623, 0x6624, 0xF467,
+ 0x6625, 0x6626, 0xF46A, 0xD475, 0x6628, 0x6627,      0,      0,
+ 0x6629,      0,      0, 0xD476, 0xD477, 0xD478,      0, 0x662A,
+ 0x662B, 0xF46C,      0, 0xF46D, 0xF46E, 0xD47C, 0xD47D, 0x662E,
+ 0x662C, 0x662D, 0x3A61, 0x3753,      0, 0xF46F, 0x4356,      0,
+ 0x4833, 0xD521, 0x3D70,      0,      0, 0x474D,      0, 0x486D,
+ 0x662F, 0x586D,      0,      0,      0, 0xF470, 0xF471, 0xD524,
+};
 static const unsigned short utf8_to_euc_E7BE[] = {
  0xD525,      0, 0x6630, 0x6632,      0, 0x4D65, 0x6631, 0x6634,
  0x6633,      0, 0x4D53, 0xD526, 0x6635, 0xD527, 0x487E, 0xD528,
@@ -4979,6 +9317,16 @@ static const unsigned short utf8_to_euc_E7BE[] = {
       0,      0, 0x663C,      0, 0xD533,      0, 0x663F,      0,
  0x6640, 0x663D,      0,      0, 0xD534, 0x3129,      0, 0xD535,
 };
+static const unsigned short utf8_to_euc_E7BE_x0213[] = {
+ 0xD525,      0, 0x6630, 0x6632,      0, 0x4D65, 0x6631, 0x6634,
+ 0x6633,      0, 0x4D53, 0xD526, 0x6635, 0xD527, 0x487E, 0xD528,
+ 0xF473, 0x7A3B,      0,      0, 0x6636,      0, 0xF476, 0x7A3C,
+      0,      0, 0x6639,      0, 0xF477, 0x6638, 0x6637,      0,
+      0,      0, 0xD52F, 0x663A, 0x3732,      0, 0xD530,      0,
+ 0x4122, 0x3541, 0xD531,      0,      0, 0xF478, 0x663E, 0x663B,
+      0,      0, 0x663C,      0, 0xD533,      0, 0x663F,      0,
+ 0x6640, 0x663D,      0,      0, 0xD534, 0x3129,      0, 0x7A3D,
+};
 static const unsigned short utf8_to_euc_E7BF[] = {
  0xD536, 0x3227,      0, 0xD537,      0, 0x6642, 0x6643,      0,
  0xD538,      0, 0x6644,      0, 0x4D62,      0, 0xD539, 0xD53A,
@@ -4989,6 +9337,16 @@ static const unsigned short utf8_to_euc_E7BF[] = {
  0x344D,      0, 0xD543, 0x664A,      0,      0,      0,      0,
       0, 0x664B, 0xD544, 0x4B5D, 0x4D63, 0xD545, 0xD546, 0xD547,
 };
+static const unsigned short utf8_to_euc_E7BF_x0213[] = {
+ 0xD536, 0x3227,      0, 0xF47A,      0, 0x6642, 0x6643,      0,
+ 0xD538,      0, 0x6644,      0, 0x4D62,      0, 0x7A3E, 0xF47B,
+      0,      0, 0x3D2C,      0, 0x6646, 0x6645,      0,      0,
+      0,      0,      0, 0x7A3F,      0,      0,      0, 0x7A40,
+ 0x3F69, 0x6647,      0, 0xF47C,      0, 0xF47D, 0x6648,      0,
+ 0xD53F, 0x6649,      0, 0x3465, 0x7A41,      0, 0x7A42, 0xF47E,
+ 0x344D,      0, 0xF521, 0x664A,      0,      0,      0,      0,
+      0, 0x664B, 0x7A43, 0x4B5D, 0x4D63, 0xD545, 0xD546, 0xD547,
+};
 static const unsigned short utf8_to_euc_E880[] = {
  0x4D54, 0x4F37,      0, 0x394D, 0x664E, 0x3C54, 0x664D, 0xD548,
  0xD549,      0, 0xD54A, 0x664F, 0x3C29, 0xD54B, 0xD54C, 0xD54D,
@@ -4999,6 +9357,16 @@ static const unsigned short utf8_to_euc_E880[] = {
  0xD55A,      0,      0, 0x3C2A, 0xD55B, 0xD55C, 0x4C6D, 0xD55D,
       0, 0xD55E, 0xD55F, 0x6657, 0xD560, 0x433F, 0xD561, 0x6656,
 };
+static const unsigned short utf8_to_euc_E880_x0213[] = {
+ 0x4D54, 0x4F37, 0xF522, 0x394D, 0x664E, 0x3C54, 0x664D, 0xD548,
+ 0xF524,      0, 0xF523, 0x664F, 0x3C29, 0xD54B, 0xF525, 0xD54D,
+ 0x4251, 0xF526, 0x6650, 0xD54F, 0x7A45, 0x394C, 0xF527, 0x4C57,
+ 0x6651, 0x6652,      0,      0, 0x6653, 0xD552, 0xD553, 0xD554,
+ 0xD555, 0x6654,      0,      0, 0xF528,      0, 0x7A46,      0,
+ 0x6655,      0,      0,      0, 0xF529,      0, 0xD559,      0,
+ 0xF52A,      0,      0, 0x3C2A, 0xD55B, 0x7A47, 0x4C6D, 0x7A48,
+      0, 0xD55E, 0xD55F, 0x6657, 0x7A49, 0x433F, 0xD561, 0x6656,
+};
 static const unsigned short utf8_to_euc_E881[] = {
  0xD562,      0,      0,      0, 0xD563,      0, 0x6659,      0,
       0,      0, 0x6658,      0,      0,      0,      0,      0,
@@ -5009,6 +9377,16 @@ static const unsigned short utf8_to_euc_E881[] = {
  0x6662, 0xD568, 0x6661, 0x6660, 0x4430, 0xD569, 0x6663, 0x3F26,
       0, 0x6664,      0,      0,      0, 0x6665, 0x4F38, 0x6666,
 };
+static const unsigned short utf8_to_euc_E881_x0213[] = {
+ 0xD562,      0,      0, 0xF52B, 0xD563,      0, 0x6659,      0,
+      0,      0, 0x6658,      0,      0,      0,      0,      0,
+      0,      0, 0x665A,      0,      0,      0, 0x403B,      0,
+ 0x665B,      0, 0x665C,      0,      0,      0, 0x4A39, 0x665D,
+ 0xD564, 0x416F, 0x665E,      0, 0xD565,      0, 0xF52C,      0,
+ 0x665F,      0,      0,      0,      0, 0xD567,      0, 0x4E7E,
+ 0x6662, 0xF52D, 0x6661, 0x6660, 0x4430, 0xF52E, 0x6663, 0x3F26,
+      0, 0x6664,      0, 0xF52F,      0, 0x6665, 0x4F38, 0x6666,
+};
 static const unsigned short utf8_to_euc_E882[] = {
       0, 0xD56A,      0,      0, 0x6667, 0x6669, 0x6668, 0x4825,
  0xD56B, 0x4679,      0, 0x4F3E, 0x4829,      0, 0xD56C,      0,
@@ -5019,6 +9397,16 @@ static const unsigned short utf8_to_euc_E882[] = {
       0, 0x394F, 0x3069,      0, 0x3A68,      0,      0,      0,
  0xD572, 0xD573, 0x4759,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E882_x0213[] = {
+      0, 0xD56A,      0,      0, 0x6667, 0x6669, 0x6668, 0x4825,
+ 0xD56B, 0x4679,      0, 0x4F3E, 0x4829,      0, 0xD56C,      0,
+      0,      0,      0, 0x666B,      0,      0, 0x3E53,      0,
+ 0x492A, 0xF530, 0x666C, 0x666A, 0xF531, 0x344E, 0xD56E,      0,
+      0, 0x3854, 0x3B68,      0, 0xF532, 0x486E, 0xD56F, 0xF533,
+      0, 0x382A, 0x4B43, 0xD571, 0x666F, 0x666D,      0, 0x394E,
+      0, 0x394F, 0x3069,      0, 0x3A68,      0,      0,      0,
+ 0xF534, 0xD573, 0x4759,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E883[] = {
       0,      0,      0, 0x305F, 0x6674,      0, 0x4340,      0,
  0xD574,      0,      0,      0, 0x4758, 0xD575, 0x425B, 0xD576,
@@ -5029,6 +9417,16 @@ static const unsigned short utf8_to_euc_E883[] = {
  0xD621, 0x6679, 0xD622, 0xD623, 0x4639,      0, 0xD624,      0,
  0x363B, 0xD625, 0xD626,      0, 0x6726, 0x473D, 0xD627,      0,
 };
+static const unsigned short utf8_to_euc_E883_x0213[] = {
+      0,      0,      0, 0x305F, 0x6674, 0xF536, 0x4340,      0,
+ 0xD574,      0, 0x7A4A,      0, 0x4758, 0xD575, 0x425B, 0xD576,
+      0,      0, 0xD577,      0, 0xD578, 0xF537, 0x6676, 0x7A4B,
+ 0xF538, 0x6672, 0x6675, 0x6670,      0, 0x6673, 0x4B26,      0,
+ 0x7A4C, 0x3855,      0,      0, 0x307D, 0x6671, 0xF539,      0,
+      0,      0,      0,      0,      0, 0xD57D, 0xD57E, 0x6678,
+ 0xD621, 0x6679, 0xD622, 0x7A4D, 0x4639, 0xF53C, 0xD624,      0,
+ 0x363B, 0xD625, 0xD626, 0xF53D, 0x6726, 0x473D, 0xD627,      0,
+};
 static const unsigned short utf8_to_euc_E884[] = {
       0,      0, 0x3B69, 0xD628,      0, 0x363C, 0x4048, 0x4F46,
  0x4C2E, 0x6677, 0x4054, 0xD629,      0,      0,      0,      0,
@@ -5039,6 +9437,16 @@ static const unsigned short utf8_to_euc_E884[] = {
  0xD633, 0x4326,      0, 0x473E,      0, 0xD634,      0,      0,
       0, 0x4431, 0xD635,      0, 0xD636,      0, 0x6723,      0,
 };
+static const unsigned short utf8_to_euc_E884_x0213[] = {
+      0,      0, 0x3B69, 0xD628,      0, 0x363C, 0x4048, 0x4F46,
+ 0x4C2E, 0x6677, 0x4054, 0xD629,      0, 0xF53B,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xF540, 0xD62B,
+ 0x7A4E,      0, 0x3553, 0x667A, 0xD62D,      0, 0xF541,      0,
+ 0xD62F,      0,      0, 0x667C, 0xF543,      0,      0, 0xF544,
+      0, 0x667B,      0,      0, 0xF545,      0,      0, 0x667D,
+ 0xD633, 0x4326,      0, 0x473E,      0, 0xF53F,      0,      0,
+      0, 0x4431, 0xD635,      0, 0xD636, 0xF547, 0x6723,      0,
+};
 static const unsigned short utf8_to_euc_E885[] = {
       0,      0,      0,      0,      0, 0xD637, 0x6722, 0xD638,
       0,      0, 0xD639, 0x667E, 0xD63A,      0, 0x3F55,      0,
@@ -5049,6 +9457,16 @@ static const unsigned short utf8_to_euc_E885[] = {
  0x3978, 0x6727,      0,      0, 0x672B,      0,      0, 0xD644,
  0x4432, 0x4A22, 0x4123,      0,      0,      0,      0, 0x425C,
 };
+static const unsigned short utf8_to_euc_E885_x0213[] = {
+      0,      0,      0,      0,      0, 0xD637, 0x6722, 0xD638,
+      0,      0, 0x7A4F, 0x667E, 0xD63A,      0, 0x3F55,      0,
+ 0x4965, 0x6725, 0xD63B, 0x6724, 0x3950, 0x4F53,      0, 0xD63C,
+      0,      0,      0,      0,      0,      0,      0, 0x6735,
+ 0x7A50, 0xD63E,      0,      0,      0, 0x6729, 0x672A, 0x7A51,
+ 0x7A52, 0xF549,      0, 0x3C70,      0, 0x7A53, 0x6728, 0xD643,
+ 0x3978, 0x6727,      0,      0, 0x672B,      0,      0, 0xD644,
+ 0x4432, 0x4A22, 0x4123,      0,      0,      0,      0, 0x425C,
+};
 static const unsigned short utf8_to_euc_E886[] = {
  0x672F, 0xD645, 0x6730, 0x672C, 0xD647, 0xD648, 0xD649,      0,
  0x672D,      0, 0x672E, 0xD64A,      0,      0, 0xD64B, 0x3951,
@@ -5059,6 +9477,16 @@ static const unsigned short utf8_to_euc_E886[] = {
  0x6738,      0, 0xD652, 0x4137, 0xD653, 0x6739,      0,      0,
  0x673B,      0, 0x673F, 0xD654,      0, 0x673C, 0x673A, 0x473F,
 };
+static const unsigned short utf8_to_euc_E886_x0213[] = {
+ 0x672F, 0xF54B, 0x6730, 0x672C, 0xF54D, 0xF54E, 0xD649,      0,
+ 0x672D,      0, 0x672E, 0xD64A,      0,      0, 0xD64B, 0x3951,
+ 0xD646,      0,      0, 0x6736,      0, 0x6732, 0xD64C,      0,
+ 0xF550,      0, 0x4966, 0xD64E, 0x4B6C, 0x4928, 0xD64F,      0,
+ 0x6731,      0, 0xD650, 0x6734, 0x6733,      0,      0,      0,
+ 0x4B44, 0x6737,      0,      0,      0,      0, 0xD651,      0,
+ 0x6738,      0, 0xF551, 0x4137, 0xD653, 0x6739,      0,      0,
+ 0x673B,      0, 0x673F, 0x7A54,      0, 0x673C, 0x673A, 0x473F,
+};
 static const unsigned short utf8_to_euc_E887[] = {
  0x673D,      0, 0x673E, 0xD656,      0, 0xD657, 0x3232,      0,
  0x6745, 0x6740, 0xD658, 0xD655,      0, 0x6741, 0xD659, 0xD65A,
@@ -5069,6 +9497,16 @@ static const unsigned short utf8_to_euc_E887[] = {
  0xD664, 0xD665, 0xD666, 0x3B6A, 0x4357, 0xD667, 0xD668,      0,
  0xD669, 0xD66A, 0x674A, 0x674B, 0x3131, 0xD66B, 0x674C, 0xD66C,
 };
+static const unsigned short utf8_to_euc_E887_x0213[] = {
+ 0x673D, 0xF552, 0x673E, 0xF553,      0, 0xD657, 0x3232,      0,
+ 0x6745, 0x6740, 0x7A55, 0xD655,      0, 0x6741, 0xD659, 0x7A56,
+      0, 0x6742,      0, 0x4221,      0, 0xD65B, 0xF554, 0x7A57,
+ 0x6744, 0x6743, 0x6746, 0xF555,      0, 0xD65E, 0xD65F, 0x6747,
+ 0x6748, 0xD660,      0, 0x3F43, 0xF557, 0x3269,      0, 0x6749,
+ 0x4E57,      0, 0x3C2B, 0xD662, 0xF559, 0x3D2D,      0,      0,
+ 0xD664, 0xD665, 0xD666, 0x3B6A, 0x4357, 0xD667, 0xD668,      0,
+ 0xD669, 0xD66A, 0x674A, 0x674B, 0x3131, 0xF55B, 0x674C, 0xF55C,
+};
 static const unsigned short utf8_to_euc_E888[] = {
  0xD66D, 0x674D, 0x674E, 0xD66E,      0, 0x674F,      0, 0x6750,
  0x363D, 0x5A2A, 0x6751,      0, 0x4065, 0x6752, 0x3C4B, 0xD66F,
@@ -5079,6 +9517,16 @@ static const unsigned short utf8_to_euc_E888[] = {
       0,      0, 0xD678, 0x6758, 0xD679, 0x4249, 0x4775, 0x383F,
  0x6757, 0x4125, 0xD67A,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E888_x0213[] = {
+ 0xD66D, 0x674D, 0x674E, 0xD66E, 0xF55E, 0x674F,      0, 0x6750,
+ 0x363D, 0x5A2A, 0x6751,      0, 0x4065, 0x6752, 0x3C4B, 0xD66F,
+ 0x6753,      0, 0x5030, 0xD670, 0xD671,      0, 0x6754, 0x4A5E,
+ 0x345C, 0xF560, 0xD673, 0x4124, 0x3D58, 0xD674, 0x4971, 0x3D2E,
+      0, 0xF561, 0xF562,      0,      0,      0,      0,      0,
+ 0xD677, 0x6755, 0x3952, 0x6756, 0x484C,      0, 0x6764,      0,
+      0,      0, 0xF564, 0x6758, 0xF565, 0x4249, 0x4775, 0x383F,
+ 0x6757, 0x4125, 0xD67A,      0, 0xF566,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E889[] = {
  0x6759,      0,      0, 0xD67B, 0xD67C, 0xD67D, 0xD67E, 0x447A,
       0,      0,      0, 0xD721,      0,      0, 0xD722, 0xD723,
@@ -5089,6 +9537,16 @@ static const unsigned short utf8_to_euc_E889[] = {
       0, 0x6765, 0x3F27,      0, 0xD72B,      0, 0x3170, 0x6766,
  0x6767,      0,      0, 0xD72C,      0, 0xD72D, 0x6768, 0xD72E,
 };
+static const unsigned short utf8_to_euc_E889_x0213[] = {
+ 0x6759,      0,      0, 0xD67B, 0xD67C, 0xF569, 0xF567, 0x447A,
+      0, 0xF568,      0, 0xF56B,      0,      0, 0xD722, 0xF56D,
+      0, 0xD724,      0,      0,      0,      0, 0xD725, 0xF56F,
+ 0x675B, 0x675A, 0x675D,      0, 0xF571, 0x675C,      0, 0x675E,
+ 0x7A5B,      0, 0x6760, 0xF572, 0x675F,      0, 0x344F, 0xD729,
+ 0x6761,      0, 0x6762, 0x6763,      0, 0xD72A, 0x3A31, 0x4E49,
+      0, 0x6765, 0x3F27,      0, 0x7A5C,      0, 0x3170, 0x6766,
+ 0x6767, 0xF576,      0, 0xD72C,      0, 0xF578, 0x6768, 0xF579,
+};
 static const unsigned short utf8_to_euc_E88A[] = {
  0xD72F, 0xD730,      0, 0xD731, 0xD732,      0,      0, 0xD733,
       0, 0xD734, 0xD735, 0x3072,      0, 0x6769, 0xD736,      0,
@@ -5099,6 +9557,16 @@ static const unsigned short utf8_to_euc_E88A[] = {
  0xD746, 0x3256, 0xD747, 0x4B27, 0xD748,      0,      0, 0xD749,
  0x375D, 0x365C, 0xD74A, 0x676D, 0xD74B, 0x326A, 0xD74C, 0xD74D,
 };
+static const unsigned short utf8_to_euc_E88A_x0213[] = {
+ 0xD72F, 0xD730,      0, 0xF57A, 0xD732,      0,      0, 0xD733,
+      0, 0xD734, 0xF57B, 0x3072,      0, 0x6769, 0x7A5E,      0,
+      0, 0xD737, 0x676A, 0xF57C, 0xD738,      0, 0xD739,      0,
+ 0xD73A, 0x4967, 0xD73B, 0xD73C,      0, 0x3C47,      0, 0x676C,
+ 0xD73D, 0x7A5F,      0, 0x7A60, 0x7A61, 0x3329, 0x3032, 0xF57D,
+ 0xF57E, 0x7A62, 0xD744, 0x676B, 0x676E, 0x474E, 0x7A63, 0x3F44,
+ 0xD746, 0x3256, 0xF621, 0x4B27, 0xF622,      0,      0, 0x7A64,
+ 0x375D, 0x365C, 0xF623, 0x676D, 0xF624, 0x326A, 0x7A65, 0x7A66,
+};
 static const unsigned short utf8_to_euc_E88B[] = {
       0,      0,      0,      0,      0, 0x3423, 0xD74E,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5109,6 +9577,16 @@ static const unsigned short utf8_to_euc_E88B[] = {
       0, 0x3151,      0, 0x6774, 0x6773,      0, 0xD759, 0xD75A,
       0, 0x6779, 0x6775, 0x6778,      0, 0xD75B, 0xD75C,      0,
 };
+static const unsigned short utf8_to_euc_E88B_x0213[] = {
+      0,      0,      0,      0,      0, 0x3423, 0x7A67,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xD74F, 0x3171, 0x6772, 0x4E6A, 0x425D, 0x7A68,      0, 0x4944,
+      0, 0x677E, 0xD751, 0x3257, 0x677C,      0, 0x677A, 0x6771,
+ 0xD752, 0x676F, 0xF625, 0x6770, 0xD754, 0x3C63, 0x366C, 0x4377,
+ 0xF626,      0, 0xD756, 0x4651,      0, 0xD757,      0, 0xD758,
+      0, 0x3151,      0, 0x6774, 0x6773,      0, 0xD759, 0xF627,
+      0, 0x6779, 0x6775, 0x6778,      0, 0x7A69, 0x7A6A,      0,
+};
 static const unsigned short utf8_to_euc_E88C[] = {
  0xD75D, 0xD75E, 0x4C50, 0x6777, 0x3258, 0x337D, 0x677B, 0xD75F,
  0xD760, 0x677D, 0xD761, 0xD762,      0,      0, 0x3754,      0,
@@ -5119,6 +9597,16 @@ static const unsigned short utf8_to_euc_E88C[] = {
  0xD76D, 0x6825, 0x6824, 0xD76E, 0x6822, 0x6821, 0x4363, 0xD76F,
  0x427B, 0x6827, 0xD770,      0, 0xD771, 0xD772,      0,      0,
 };
+static const unsigned short utf8_to_euc_E88C_x0213[] = {
+ 0x7A6B, 0x7A6C, 0x4C50, 0x6777, 0x3258, 0x337D, 0x677B, 0xF628,
+ 0xF629, 0x677D, 0xD761, 0xD762, 0xF62A,      0, 0x3754,      0,
+      0,      0,      0,      0,      0,      0, 0x6823, 0x682C,
+ 0x682D,      0,      0, 0xF62C, 0x302B, 0xF62D, 0xD766, 0xD767,
+      0, 0xD768, 0x7A6E, 0x6834,      0,      0,      0,      0,
+ 0x3071,      0,      0, 0x682B, 0xD76A, 0x7A6F, 0xD76C, 0x682A,
+ 0xF62E, 0x6825, 0x6824, 0xD76E, 0x6822, 0x6821, 0x4363, 0xD76F,
+ 0x427B, 0x6827, 0x7A70,      0, 0xF62F, 0xD772,      0,      0,
+};
 static const unsigned short utf8_to_euc_E88D[] = {
  0x6826,      0, 0xD773, 0xD774, 0xD775, 0x6829,      0, 0xD776,
       0, 0x4170, 0x3755,      0,      0, 0xD777, 0xD778, 0x3141,
@@ -5129,6 +9617,16 @@ static const unsigned short utf8_to_euc_E88D[] = {
  0xD77D,      0,      0, 0x683A,      0, 0x683B,      0, 0x3259,
  0xD77E,      0,      0, 0x322E, 0x6838, 0xD821,      0, 0xD822,
 };
+static const unsigned short utf8_to_euc_E88D_x0213[] = {
+ 0x6826,      0, 0xD773, 0x7A71, 0xF630, 0x6829,      0, 0x7A72,
+      0, 0x4170, 0x3755,      0,      0, 0xD777, 0xD778, 0x3141,
+ 0x6828, 0x7A73, 0x3953, 0xD83E, 0xF62B, 0x7A74, 0xD77B, 0xF631,
+ 0x4171,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x7A6D, 0xAE4A,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xD77D,      0,      0, 0x683A,      0, 0x683B,      0, 0x3259,
+ 0xD77E,      0,      0, 0x322E, 0x6838, 0x7A75,      0, 0xF633,
+};
 static const unsigned short utf8_to_euc_E88E[] = {
  0xD823,      0, 0xD824,      0, 0xD825, 0x682E, 0xD826, 0x6836,
       0, 0x683D, 0x6837,      0,      0, 0xD827, 0x6835,      0,
@@ -5139,6 +9637,16 @@ static const unsigned short utf8_to_euc_E88E[] = {
       0, 0x4D69,      0,      0,      0, 0x6839,      0,      0,
       0,      0,      0,      0,      0, 0x684F, 0xD834, 0xD835,
 };
+static const unsigned short utf8_to_euc_E88E_x0213[] = {
+ 0xD823,      0, 0xD824,      0, 0xD825, 0x682E, 0x7A76, 0x6836,
+      0, 0x683D, 0x6837,      0,      0, 0xF636, 0x6835,      0,
+      0,      0, 0x7A77, 0x6776, 0xF637, 0xF638, 0x6833,      0,
+ 0x7A78, 0xD82C, 0x682F, 0xF639, 0xD82E, 0xF63A, 0x3450, 0x6831,
+ 0x683C,      0, 0x6832,      0,      0,      0, 0xD830, 0x7A79,
+ 0x683E, 0x7A7A, 0x6830, 0x477C, 0xD833, 0xD84C,      0,      0,
+      0, 0x4D69,      0,      0,      0, 0x6839,      0,      0,
+      0,      0,      0,      0,      0, 0x684F, 0xD834, 0x7A7B,
+};
 static const unsigned short utf8_to_euc_E88F[] = {
  0xD836, 0x6847,      0,      0,      0, 0x3F7B,      0, 0xD837,
       0, 0xD838, 0x3546,      0, 0x365D,      0, 0x6842, 0xD839,
@@ -5149,6 +9657,16 @@ static const unsigned short utf8_to_euc_E88F[] = {
  0x3856, 0x4929, 0x684B,      0, 0x683F,      0, 0xD841, 0x6848,
  0xD842, 0xD843,      0, 0x6852, 0xD844, 0x6843,      0,      0,
 };
+static const unsigned short utf8_to_euc_E88F_x0213[] = {
+ 0x7A7C, 0x6847,      0,      0,      0, 0x3F7B,      0, 0x7A7D,
+      0, 0xF63B, 0x3546,      0, 0x365D,      0, 0x6842, 0x7A7E,
+ 0xF63C, 0x7B21,      0, 0x325B, 0xF63D,      0, 0x3E54,      0,
+ 0x6845,      0,      0,      0, 0x3A5A, 0xF63E,      0, 0x4551,
+ 0x684A, 0x7B22,      0,      0,      0, 0xF63F,      0,      0,
+ 0xD83F, 0x4A6E, 0x7B23, 0x6841,      0,      0,      0, 0x325A,
+ 0x3856, 0x4929, 0x684B,      0, 0x683F,      0,      0, 0x6848,
+ 0xD842, 0xF640,      0, 0x6852, 0xD844, 0x6843,      0,      0,
+};
 static const unsigned short utf8_to_euc_E890[] = {
       0, 0xD845,      0, 0x6844, 0x463A,      0, 0xD846, 0x6849,
       0,      0, 0xD847, 0x6846, 0x4B28, 0x684C, 0x3060, 0xD848,
@@ -5159,6 +9677,16 @@ static const unsigned short utf8_to_euc_E890[] = {
       0, 0x337E,      0,      0,      0, 0x6862,      0,      0,
  0x6850, 0xD84E,      0,      0, 0x6855, 0x4D6E,      0,      0,
 };
+static const unsigned short utf8_to_euc_E890_x0213[] = {
+      0, 0x7B24,      0, 0x6844, 0x463A,      0, 0x7B25, 0x6849,
+      0,      0, 0x7B26, 0x6846, 0x4B28, 0x684C, 0x3060, 0xF641,
+      0, 0xF642,      0, 0x6840,      0, 0xF643,      0, 0xF645,
+      0, 0xD84B,      0,      0,      0,      0,      0,      0,
+ 0x684E,      0, 0x684D,      0,      0,      0,      0,      0,
+      0, 0x476B, 0x6854,      0, 0x685F,      0,      0, 0xD84D,
+      0, 0x337E,      0,      0,      0, 0x6862,      0,      0,
+ 0x6850, 0xF646,      0,      0, 0x6855, 0x4D6E,      0,      0,
+};
 static const unsigned short utf8_to_euc_E891[] = {
       0,      0,      0,      0,      0, 0xD84F, 0x685E, 0xD850,
  0xD851, 0x4D55, 0xD852,      0,      0, 0xD853, 0x4E2A, 0xD854,
@@ -5169,6 +9697,16 @@ static const unsigned short utf8_to_euc_E891[] = {
  0xD861, 0x472C,      0, 0xD862, 0xD863, 0x302A, 0xD864, 0x6858,
  0xD865, 0x6861, 0x4978,      0, 0xD866, 0xD867,      0,      0,
 };
+static const unsigned short utf8_to_euc_E891_x0213[] = {
+      0,      0,      0,      0,      0, 0xD84F, 0x685E, 0xD850,
+ 0x7B28, 0x4D55, 0xF647,      0,      0, 0xD853, 0x4E2A, 0xF648,
+      0, 0xF649, 0xF64A,      0,      0,      0, 0xD857, 0x4378,
+ 0xD858, 0xF64B, 0xF64C, 0x336B, 0xF64D,      0,      0, 0x7B29,
+ 0xD85C, 0x4972, 0x6864, 0x4621, 0xD85D, 0xF64F, 0x3031, 0xD85F,
+      0, 0x685D, 0xD860, 0x6859, 0x4172, 0x6853, 0x685B, 0x6860,
+ 0x7B2A, 0x472C,      0, 0x7B2B, 0xD863, 0x302A, 0xF650, 0x6858,
+ 0xF651, 0x6861, 0x4978,      0, 0xF652, 0xD867,      0,      0,
+};
 static const unsigned short utf8_to_euc_E892[] = {
       0, 0xD868, 0x685C,      0, 0x6857, 0xD869,      0,      0,
       0,      0,      0, 0x3E55,      0,      0,      0,      0,
@@ -5179,6 +9717,16 @@ static const unsigned short utf8_to_euc_E892[] = {
       0, 0xD873, 0x3377,      0, 0xD874,      0,      0,      0,
  0x3E78, 0x6865, 0xD875, 0x686A, 0x4173, 0xD876, 0xD877, 0x6866,
 };
+static const unsigned short utf8_to_euc_E892_x0213[] = {
+      0, 0xF653, 0x685C,      0, 0x6857, 0x7B2C,      0,      0,
+      0,      0,      0, 0x3E55,      0,      0,      0,      0,
+ 0x3D2F,      0, 0xD86A, 0xD86B, 0x3C2C, 0xD86C,      0, 0xF656,
+      0, 0x4C58,      0,      0, 0x4947,      0, 0x7B2D, 0x6867,
+      0, 0x6870,      0,      0,      0,      0, 0xF657,      0,
+ 0xD86F, 0xD870, 0xD871,      0,      0, 0x685A,      0, 0x7B2E,
+      0, 0xD873, 0x3377,      0, 0x7B2F,      0,      0,      0,
+ 0x3E78, 0x6865, 0x7B30, 0x686A, 0x4173, 0xD876, 0xF658, 0x6866,
+};
 static const unsigned short utf8_to_euc_E893[] = {
  0xD878, 0x686D, 0xD879,      0, 0x435F,      0, 0x686E, 0xD87A,
  0xD87B, 0x4D56, 0x6863, 0x3338, 0xD87C, 0x6869,      0, 0xD87D,
@@ -5189,6 +9737,16 @@ static const unsigned short utf8_to_euc_E893[] = {
  0xD925, 0xD926, 0xD927,      0, 0x6873,      0,      0, 0xD928,
       0,      0, 0xD92A, 0xD92B, 0x687A, 0xD92C,      0, 0x6872,
 };
+static const unsigned short utf8_to_euc_E893_x0213[] = {
+ 0x7B31, 0x686D, 0x7B32,      0, 0x435F,      0, 0x686E, 0xD87A,
+ 0xD87B, 0x4D56, 0x6863, 0x3338, 0xD87C, 0x6869, 0xF65A, 0xF65B,
+ 0x686C, 0x4C2C,      0, 0xF65C,      0,      0, 0x686F,      0,
+      0, 0x6868, 0x686B,      0, 0xF655,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xF65E,
+      0,      0, 0xF65F,      0, 0x4B29,      0, 0x4F21, 0xF660,
+ 0xF661, 0xF662, 0xD927,      0, 0x6873,      0,      0, 0xD928,
+      0,      0, 0xF663, 0xD92B, 0x687A, 0xF664,      0, 0x6872,
+};
 static const unsigned short utf8_to_euc_E894[] = {
  0x3C43,      0, 0xD92D, 0xD92E,      0,      0, 0x6851, 0xD92F,
       0,      0,      0,      0, 0xD930,      0, 0xD931,      0,
@@ -5199,6 +9757,16 @@ static const unsigned short utf8_to_euc_E894[] = {
       0,      0, 0xD929, 0xD93D, 0xD93E, 0x4222, 0xD93F,      0,
       0,      0,      0,      0,      0, 0x4A43,      0, 0xD940,
 };
+static const unsigned short utf8_to_euc_E894_x0213[] = {
+ 0x3C43,      0, 0xD92D, 0xD92E,      0,      0, 0x6851, 0xD92F,
+      0,      0,      0,      0, 0xF665,      0, 0xD931,      0,
+ 0xD932, 0x4A4E,      0, 0x4C22, 0x6879, 0x6878,      0, 0x6874,
+ 0x6875,      0, 0x3136, 0xF666, 0xD933,      0, 0x7B35, 0x6877,
+      0, 0x6871, 0xD935, 0x7B36, 0xF667, 0xF668, 0x4455, 0xD939,
+      0,      0, 0xD93A, 0xF669, 0x6876, 0x307E,      0, 0x7B37,
+      0,      0, 0x7B34, 0xD93D, 0xF66A, 0x4222, 0xD93F,      0,
+      0,      0,      0,      0,      0, 0x4A43, 0xF66F, 0xD940,
+};
 static const unsigned short utf8_to_euc_E895[] = {
  0x687B, 0x6921,      0, 0x4859,      0,      0, 0xD941,      0,
  0x687E, 0x3E56, 0x3C49, 0x6923,      0,      0, 0x363E, 0xD942,
@@ -5209,6 +9777,16 @@ static const unsigned short utf8_to_euc_E895[] = {
       0,      0,      0,      0,      0,      0,      0, 0x6931,
       0, 0xD953, 0xD954, 0xD955,      0, 0xD956, 0x6932, 0xD957,
 };
+static const unsigned short utf8_to_euc_E895_x0213[] = {
+ 0x687B, 0x6921,      0, 0x4859,      0,      0, 0xD941,      0,
+ 0x687E, 0x3E56, 0x3C49, 0x6923,      0,      0, 0x363E, 0xF66B,
+ 0xD943, 0xF670, 0xD945, 0xF671,      0, 0x6924, 0xD947, 0x4979,
+ 0x687D, 0x7B38, 0x6856,      0, 0xD949, 0xD94A, 0xF672, 0xD94C,
+ 0xD94D, 0xF673, 0xF674, 0x687C, 0x7B39,      0,      0,      0,
+ 0x4F4F, 0x4622, 0x4973,      0,      0, 0x692B,      0, 0xF66C,
+      0,      0,      0,      0,      0,      0,      0, 0x6931,
+      0, 0xD953, 0x7B3C, 0xF676,      0, 0xF677, 0x6932, 0xF678,
+};
 static const unsigned short utf8_to_euc_E896[] = {
  0x6925, 0xD958,      0,      0, 0x4776, 0xD959, 0xD95A, 0x692F,
  0x6927, 0xD95B, 0x6929, 0xD95C, 0xD95D,      0,      0, 0xD95E,
@@ -5219,6 +9797,16 @@ static const unsigned short utf8_to_euc_E896[] = {
  0xF461,      0,      0,      0, 0xD967,      0, 0xD968, 0xD969,
  0xD96A, 0x6937, 0x6935,      0, 0xD96B, 0xD96C, 0xD96D, 0xD96E,
 };
+static const unsigned short utf8_to_euc_E896_x0213[] = {
+ 0x6925, 0xF679,      0,      0, 0x4776, 0xD959, 0xF67A, 0x692F,
+ 0x6927, 0xD95B, 0x6929, 0xD95C, 0x7B3D,      0,      0, 0x7B3E,
+ 0x6933, 0x6928,      0, 0xF67B, 0x692C,      0,      0, 0x3172,
+ 0xD960, 0x4665,      0, 0x692D, 0x6930, 0xF67C,      0, 0xF67D,
+ 0xD963,      0, 0x7B3F,      0, 0x6926, 0xD965, 0x4126, 0xD966,
+ 0x692A, 0x3B27, 0x3F45, 0x3730, 0x4C74, 0x7B3B, 0x4C79, 0x3D72,
+ 0x7B40,      0,      0,      0, 0xD967,      0, 0xD968, 0xF723,
+ 0xD96A, 0x6937, 0x6935,      0, 0xF724, 0xD96C, 0xD96D, 0xD96E,
+};
 static const unsigned short utf8_to_euc_E897[] = {
       0, 0x4F4E, 0xD96F,      0,      0,      0,      0, 0xD970,
       0, 0x6934, 0xD971, 0xD972,      0, 0x4D75, 0xD973, 0x6936,
@@ -5229,6 +9817,16 @@ static const unsigned short utf8_to_euc_E897[] = {
       0,      0,      0, 0xD97C,      0,      0, 0xD97D, 0x3D73,
       0, 0x693D, 0x6942, 0x4174, 0xD97E,      0, 0x6941, 0xDA21,
 };
+static const unsigned short utf8_to_euc_E897_x0213[] = {
+      0, 0x4F4E, 0xD96F,      0,      0,      0,      0, 0xF725,
+      0, 0x6934, 0xF726, 0x7B41,      0, 0x4D75, 0x7B42, 0x6936,
+ 0x6938,      0,      0,      0,      0, 0x6939,      0,      0,
+ 0xF727, 0xF728, 0xD976,      0, 0x693C, 0x693A,      0, 0xF729,
+ 0xD978, 0xF72A,      0,      0, 0x4623, 0x693B, 0xF72B,      0,
+ 0xD97A, 0x484D, 0x692E,      0,      0, 0x7B43,      0,      0,
+      0,      0,      0, 0xD97C,      0,      0, 0xF72C, 0x3D73,
+      0, 0x693D, 0x6942, 0x4174, 0xD97E,      0, 0x6941, 0x7B45,
+};
 static const unsigned short utf8_to_euc_E898[] = {
  0xDA22,      0, 0x6922,      0, 0xDA23, 0xDA24, 0x6943, 0x4149,
       0,      0, 0x693E, 0x6940,      0, 0xDA25, 0xDA26,      0,
@@ -5239,6 +9837,16 @@ static const unsigned short utf8_to_euc_E898[] = {
  0x6946,      0,      0,      0,      0,      0, 0xDA31,      0,
  0xDA32,      0, 0xDA33,      0, 0xDA34, 0xDA35,      0, 0x6947,
 };
+static const unsigned short utf8_to_euc_E898_x0213[] = {
+ 0xF72D,      0, 0x6922,      0, 0x7B46, 0x7B47, 0x6943, 0x4149,
+      0,      0, 0x693E, 0x6940,      0, 0xDA25, 0xDA26,      0,
+ 0x7B48, 0xF72E, 0x7B44, 0x693F,      0,      0, 0x5D31, 0x5D22,
+ 0x7B4A, 0xDA2B, 0x6945, 0xDA2C,      0,      0, 0xF72F,      0,
+      0, 0xF730, 0x6944,      0, 0xF731,      0,      0, 0xF732,
+      0, 0x7B4B,      0,      0,      0, 0x4D76,      0, 0x623C,
+ 0x6946,      0,      0,      0,      0,      0, 0xDA31,      0,
+ 0x7B4C, 0xF734, 0xDA33,      0, 0xF735, 0xDA35,      0, 0x6947,
+};
 static const unsigned short utf8_to_euc_E899[] = {
  0xDA36, 0xB866, 0xDA37,      0,      0,      0, 0xDA38,      0,
       0,      0,      0,      0,      0, 0x6948, 0x3857,      0,
@@ -5249,6 +9857,16 @@ static const unsigned short utf8_to_euc_E899[] = {
       0, 0x694D,      0,      0,      0, 0xDA48, 0xDA49, 0xDA4A,
       0, 0x467A, 0xDA4B, 0x303A,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E899_x0213[] = {
+ 0xF737, 0x2F68, 0xDA37,      0,      0,      0, 0xDA38,      0,
+      0,      0,      0,      0,      0, 0x6948, 0x3857,      0,
+ 0x3554,      0, 0xDA39, 0xF739, 0x694A, 0x515D, 0xF73A, 0x7B4D,
+ 0xDA3D, 0xDA3E, 0x3575, 0x7B4E, 0x4E3A, 0xDA3F, 0x3673, 0x694B,
+ 0xDA40, 0xDA41, 0x7B50, 0xDA43, 0xDA44,      0,      0, 0x694C,
+      0, 0xDA45,      0, 0x436E, 0x7B52,      0,      0, 0xF73B,
+      0, 0x694D,      0,      0,      0, 0x7B53, 0xDA49, 0xF73C,
+      0, 0x467A, 0xF73D, 0x303A,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E89A[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
  0xDA6D,      0, 0x3263, 0x6952, 0x6953, 0xDA4C,      0,      0,
@@ -5259,6 +9877,16 @@ static const unsigned short utf8_to_euc_E89A[] = {
  0x6958, 0xDA57,      0, 0xDA58, 0xDA59, 0xDA5A, 0x6954, 0xDA5B,
  0xDA5C, 0xDA5D,      0,      0,      0,      0,      0, 0xDA5E,
 };
+static const unsigned short utf8_to_euc_E89A_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0, 0xF73E,
+ 0xDA6D, 0xF73F, 0x3263, 0x6952, 0x6953, 0xF740,      0,      0,
+      0, 0xF741,      0, 0x694E,      0, 0x3B3D, 0xDA4E,      0,
+ 0x7B54,      0, 0xDA50,      0, 0xF742, 0xF743,      0,      0,
+      0, 0xDA52,      0, 0x694F, 0x4742,      0, 0xDA53, 0xDA54,
+ 0xF744, 0x6950, 0x6951, 0x695B,      0, 0xDA56,      0, 0x6955,
+ 0x6958, 0xF746,      0, 0xF747, 0xDA59, 0xDA5A, 0x6954, 0xDA5B,
+ 0x7B55, 0xDA5D,      0,      0,      0,      0,      0, 0xDA5E,
+};
 static const unsigned short utf8_to_euc_E89B[] = {
  0xDA5F, 0xDA60,      0, 0xDA61, 0x6956, 0xDA62, 0x6957, 0x3C58,
       0, 0x6959,      0, 0x4341,      0, 0x3756, 0x3342,      0,
@@ -5269,6 +9897,16 @@ static const unsigned short utf8_to_euc_E89B[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
  0x427D, 0x696C, 0xDA6E, 0x6968, 0xDA6F, 0xDA70, 0x326B,      0,
 };
+static const unsigned short utf8_to_euc_E89B_x0213[] = {
+ 0xDA5F, 0xF748,      0, 0xF749, 0x6956, 0xDA62, 0x6957, 0x3C58,
+      0, 0x6959,      0, 0x4341,      0, 0x3756, 0x3342,      0,
+      0, 0xF74A, 0xDA64,      0, 0x695C, 0xF74B,      0, 0xF74C,
+      0, 0x333F, 0xDA67, 0x6961, 0xDA68,      0, 0x695D, 0x6960,
+ 0xDA69,      0,      0, 0xF74D, 0x483A, 0xDA6B, 0xF74E, 0xDA6C,
+      0, 0x695E,      0,      0, 0x695F, 0x4948, 0x485A, 0x6962,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x427D, 0x696C, 0x7B56, 0x6968, 0x7B57, 0x7B58, 0x326B,      0,
+};
 static const unsigned short utf8_to_euc_E89C[] = {
  0x6966,      0, 0x4B2A, 0x6967, 0xDA71, 0xDA72, 0x6964, 0xDA73,
  0x6965, 0x696A, 0x696D, 0xDA74,      0, 0x696B, 0xDA75, 0xDA76,
@@ -5279,6 +9917,16 @@ static const unsigned short utf8_to_euc_E89C[] = {
       0, 0xDB24, 0xDB25,      0, 0x696E,      0,      0, 0x6970,
       0, 0xDB26, 0xDB27, 0x6971, 0xDB28, 0xDB29, 0xDB2A, 0x696F,
 };
+static const unsigned short utf8_to_euc_E89C_x0213[] = {
+ 0x6966,      0, 0x4B2A, 0x6967, 0xDA71, 0xF750, 0x6964, 0xF751,
+ 0x6965, 0x696A, 0x696D, 0x7B59,      0, 0x696B, 0xF752, 0xDA76,
+ 0xF753, 0x6969, 0x6963, 0xF754, 0xDA79,      0,      0,      0,
+ 0x4358, 0xF755, 0x6974,      0, 0x4C2A,      0, 0xDA7B, 0xF756,
+      0, 0xF757,      0, 0xF758,      0, 0x6972,      0,      0,
+ 0xDB21, 0x6973,      0,      0,      0,      0, 0xDB22, 0xDB23,
+      0, 0xF759, 0xDB25,      0, 0x696E,      0,      0, 0x6970,
+      0, 0xDB26, 0xF75A, 0x6971, 0xDB28, 0xDB29, 0xF75B, 0x696F,
+};
 static const unsigned short utf8_to_euc_E89D[] = {
  0xDB2B,      0,      0, 0xDB2C,      0, 0xDB2D,      0,      0,
       0, 0x4066,      0, 0x4F39, 0x6978, 0xDB2E, 0x6979,      0,
@@ -5289,6 +9937,16 @@ static const unsigned short utf8_to_euc_E89D[] = {
       0, 0xDB35, 0xDB36,      0, 0x697A,      0, 0x4433,      0,
  0x6977,      0,      0, 0xDB37,      0,      0,      0, 0x4768,
 };
+static const unsigned short utf8_to_euc_E89D_x0213[] = {
+ 0xF75C,      0,      0, 0xF75D,      0, 0xDB2D,      0,      0,
+      0, 0x4066,      0, 0x4F39, 0x6978, 0xDB2E, 0x6979,      0,
+      0, 0xF75E,      0, 0x6A21,      0, 0x3F2A,      0, 0x697B,
+ 0xF75F, 0x697E,      0,      0,      0, 0xDB30,      0, 0x6976,
+ 0x6975, 0xDB31,      0, 0x6A22, 0xF760, 0xF761, 0x325C,      0,
+ 0x697C,      0, 0x6A23,      0,      0,      0, 0x697D, 0xDB34,
+      0, 0x7B5A, 0xF762,      0, 0x697A,      0, 0x4433,      0,
+ 0x6977,      0,      0, 0xDB37, 0xF763,      0,      0, 0x4768,
+};
 static const unsigned short utf8_to_euc_E89E[] = {
       0,      0, 0x6A27, 0xDB38, 0xDB39, 0xDB3A, 0xDB3B, 0xDB3C,
  0xDB3D, 0xDB3E,      0, 0xDB3F, 0xDB40, 0x4D3B,      0,      0,
@@ -5299,6 +9957,16 @@ static const unsigned short utf8_to_euc_E89E[] = {
       0, 0xDB4E,      0, 0x6A30,      0, 0xDB4F,      0,      0,
       0,      0, 0x4D66, 0x6A33,      0, 0x6A2A, 0xDB50, 0xDB51,
 };
+static const unsigned short utf8_to_euc_E89E_x0213[] = {
+      0,      0, 0x6A27, 0xDB38, 0xDB39, 0xDB3A, 0xDB3B, 0x7B5B,
+ 0x7B5C, 0xF767,      0, 0xF768, 0xDB40, 0x4D3B,      0,      0,
+ 0xDB41,      0,      0, 0xF769,      0, 0xDB43,      0, 0xDB44,
+ 0xDB45, 0xDB46,      0,      0,      0,      0, 0xDB47, 0x6A26,
+ 0xF76A,      0, 0x6A25, 0xDB49,      0,      0,      0, 0xF766,
+      0,      0,      0, 0x6A2E, 0x7B5D, 0x7B5E, 0xDB4D, 0x6A28,
+      0, 0xDB4E,      0, 0x6A30,      0, 0x7B5F,      0,      0,
+      0,      0, 0x4D66, 0x6A33,      0, 0x6A2A, 0xF76D, 0xDB51,
+};
 static const unsigned short utf8_to_euc_E89F[] = {
  0x6A2B, 0xDB52,      0,      0, 0x6A2F,      0, 0x6A32, 0x6A31,
  0xDB53, 0xDB54, 0xDB55, 0x6A29,      0,      0, 0xDB56,      0,
@@ -5309,6 +9977,16 @@ static const unsigned short utf8_to_euc_E89F[] = {
       0, 0xDB63, 0x6A35, 0xDB64,      0,      0, 0x6A3A, 0x6A3B,
  0xDB65, 0x332A, 0xDB66, 0x3542,      0,      0, 0x6A39, 0xDB67,
 };
+static const unsigned short utf8_to_euc_E89F_x0213[] = {
+ 0x6A2B, 0xF76F,      0,      0, 0x6A2F,      0, 0x6A32, 0x6A31,
+ 0xDB53, 0xDB54, 0xDB55, 0x6A29,      0,      0, 0xF770,      0,
+ 0x6A2C,      0, 0x6A3D,      0,      0, 0xDB57, 0x7B61,      0,
+      0, 0xDB59, 0xDB5A,      0, 0xDB5B,      0,      0, 0xF772,
+ 0x6A36,      0, 0xDB5D, 0xF774, 0xDB5F, 0xF775, 0xF776,      0,
+      0,      0, 0xF777, 0xF778, 0x7B62, 0xF779,      0, 0x6A34,
+      0, 0xDB63, 0x6A35, 0xDB64,      0, 0xF771, 0x6A3A, 0x6A3B,
+ 0xDB65, 0x332A, 0xDB66, 0x3542,      0,      0, 0x6A39, 0xDB67,
+};
 static const unsigned short utf8_to_euc_E8A0[] = {
       0, 0xDB68,      0, 0xDB69,      0, 0x6A24, 0xDB6A, 0xF464,
       0, 0xDB6B, 0xDB6C, 0xDB6D,      0, 0x6A38, 0x6A3C, 0x6A37,
@@ -5319,6 +9997,16 @@ static const unsigned short utf8_to_euc_E8A0[] = {
  0xDB7C, 0x6A43, 0xDB7D,      0,      0, 0xDB7E, 0x6A44,      0,
       0, 0x6A45, 0xDC21, 0x6A47, 0xDC22,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E8A0_x0213[] = {
+      0, 0xF77A,      0, 0xF77B,      0, 0x6A24, 0x7B63,      0,
+      0, 0xDB6B, 0x7B64, 0xF77C,      0, 0x6A38, 0x6A3C, 0x6A37,
+ 0x7B65, 0x6A3E, 0xDB70, 0xF77D, 0x7B66, 0x6A40, 0x6A3F,      0,
+ 0xDB73, 0xDB6F, 0xDB74, 0xDB75, 0xDB76,      0, 0xDB77, 0x7B67,
+      0, 0x6A42, 0x6A41, 0x695A,      0,      0,      0, 0x6A46,
+ 0xF77E,      0,      0,      0,      0, 0xDB7A, 0xF821,      0,
+ 0xDB7C, 0x6A43, 0xF822,      0,      0, 0xDB7E, 0x6A44,      0,
+      0, 0x6A45, 0xDC21, 0x6A47, 0xF823,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E8A1[] = {
  0x376C, 0xDC23, 0x6A49, 0xDC24, 0x6A48, 0xDC25, 0x3D30,      0,
  0xDC26, 0xDC27, 0xDC28, 0xDC29, 0x3954, 0x5E27, 0xDC2A,      0,
@@ -5329,6 +10017,16 @@ static const unsigned short utf8_to_euc_E8A1[] = {
  0x3F6A, 0xDC35, 0x6A55,      0,      0, 0x6A52,      0, 0x436F,
       0, 0xDC36,      0, 0xDC37,      0, 0x6A53, 0x6A50, 0x365E,
 };
+static const unsigned short utf8_to_euc_E8A1_x0213[] = {
+ 0x376C, 0xDC23, 0x6A49, 0xDC24, 0x6A48, 0xDC25, 0x3D30,      0,
+ 0xDC26, 0xDC27, 0xF825, 0xDC29, 0x3954, 0x5E27, 0xDC2A,      0,
+      0, 0xDC2B, 0x6A4A, 0x3D51,      0, 0xDC2C, 0xDC2D, 0x3339,
+ 0xF826, 0x6A4B, 0xDC2F, 0x3152, 0xDC30, 0x3E57, 0x6A4C, 0xF827,
+ 0xDC32, 0x3955, 0x6A4D, 0x3061, 0xF828,      0,      0,      0,
+ 0x493D, 0xF82B,      0, 0x6A4E,      0,      0,      0, 0xF82D,
+ 0x3F6A, 0xDC35, 0x6A55,      0,      0, 0x6A52,      0, 0x436F,
+      0, 0xDC36,      0, 0xDC37,      0, 0x6A53, 0x6A50, 0x365E,
+};
 static const unsigned short utf8_to_euc_E8A2[] = {
  0xDC38, 0x6A4F, 0x6A56,      0,      0,      0,      0,      0,
  0x3736,      0,      0, 0x425E,      0, 0x6A5C,      0,      0,
@@ -5339,6 +10037,16 @@ static const unsigned short utf8_to_euc_E8A2[] = {
  0x6A5E, 0x6A60,      0,      0, 0x3853, 0x6A54,      0, 0x3041,
       0,      0, 0xDC41,      0,      0, 0xDC42, 0xDC43, 0x6A5F,
 };
+static const unsigned short utf8_to_euc_E8A2_x0213[] = {
+ 0xDC38, 0x6A4F, 0x6A56,      0,      0,      0,      0,      0,
+ 0x3736,      0,      0, 0x425E,      0, 0x6A5C,      0,      0,
+      0,      0, 0x6A58,      0,      0,      0, 0x4235, 0x6A57,
+ 0x7B68, 0x6A5A, 0xDC3A, 0xDC3B, 0xDC3C,      0, 0x6A51, 0xDC3D,
+ 0xF82E,      0, 0x6A5B,      0, 0x6A5D,      0,      0,      0,
+ 0xDC3F,      0, 0x7B69, 0x486F,      0,      0, 0x6A59,      0,
+ 0x6A5E, 0x6A60,      0,      0, 0x3853, 0x6A54,      0, 0x3041,
+      0,      0, 0xDC41,      0, 0xF82F, 0xF830, 0xF831, 0x6A5F,
+};
 static const unsigned short utf8_to_euc_E8A3[] = {
  0xDC44, 0x3A5B, 0x4E76, 0x6A61, 0x6A62, 0x4175,      0,      0,
       0,      0, 0xDC45, 0xDC46, 0xDC47, 0xDC48, 0xDC49, 0x4E22,
@@ -5349,6 +10057,16 @@ static const unsigned short utf8_to_euc_E8A3[] = {
  0xDC51, 0xDC52, 0x6A6C, 0x3E58, 0x6A6A, 0xDC53,      0, 0xDC54,
  0x4D67, 0x6A67,      0,      0, 0x6A69, 0x403D, 0x3F7E,      0,
 };
+static const unsigned short utf8_to_euc_E8A3_x0213[] = {
+ 0xF832, 0x3A5B, 0x4E76, 0x6A61, 0x6A62, 0x4175,      0,      0,
+      0,      0, 0x7B6A, 0xDC46, 0xDC47, 0xDC48, 0x7B6B, 0x4E22,
+      0, 0xF835, 0xF833, 0xF836, 0x6A63, 0x4D35,      0,      0,
+ 0x6A64, 0x6A65,      0, 0xF837, 0x4A64, 0x6A66, 0xDC4E, 0x3A40,
+      0, 0x4E23,      0,      0,      0,      0,      0, 0xDC4F,
+ 0x6A6B,      0,      0,      0,      0,      0,      0, 0xDC50,
+ 0xF838, 0xF839, 0x6A6C, 0x3E58, 0x6A6A, 0x7B6D,      0, 0xDC54,
+ 0x4D67, 0x6A67,      0,      0, 0x6A69, 0x403D, 0x3F7E,      0,
+};
 static const unsigned short utf8_to_euc_E8A4[] = {
       0, 0xDC55, 0x6A68,      0, 0x6A6D,      0, 0xDC56, 0x4A23,
       0,      0, 0x6A6F,      0, 0x6A6E, 0xDC57, 0xDC58, 0xDC59,
@@ -5359,6 +10077,16 @@ static const unsigned short utf8_to_euc_E8A4[] = {
  0xDC64, 0xDC65, 0xDC66,      0,      0, 0xDC67, 0x6A79,      0,
  0x6A7A, 0xDC68, 0xDC69, 0x6A78,      0,      0, 0xDC6A,      0,
 };
+static const unsigned short utf8_to_euc_E8A4_x0213[] = {
+      0, 0xF83B, 0x6A68,      0, 0x6A6D,      0, 0xDC56, 0x4A23,
+      0,      0, 0x6A6F,      0, 0x6A6E, 0xDC57, 0xDC58, 0xDC59,
+ 0x336C,      0, 0x4B2B, 0x6A70,      0, 0xDC5A, 0xDC5B,      0,
+ 0x7B70, 0x7B71, 0x7B72,      0, 0x7B6E, 0x6A7C, 0x6A72,      0,
+ 0xDC60,      0,      0,      0,      0, 0x6A73, 0xDC61, 0x7B73,
+ 0xDC63,      0, 0x6A74, 0x6A75,      0,      0,      0,      0,
+ 0x7B74, 0xDC65, 0x7B75,      0,      0, 0xDC67, 0x6A79, 0xF83D,
+ 0x6A7A, 0x7B76, 0xDC69, 0x6A78,      0,      0, 0xDC6A,      0,
+};
 static const unsigned short utf8_to_euc_E8A5[] = {
  0xDC6B, 0x6A76, 0xDC6C, 0x6A71, 0x6A77, 0xDC6D, 0xDC6E,      0,
       0, 0xDC6F,      0,      0, 0x6A7B, 0x7037,      0, 0xDC70,
@@ -5369,6 +10097,16 @@ static const unsigned short utf8_to_euc_E8A5[] = {
  0xDC7B,      0, 0x3D31, 0xDC7C, 0x6B26, 0xDC7D,      0, 0x6B27,
       0,      0, 0xDC7E, 0xDD21, 0xDD22, 0xDD23, 0x6B28, 0x403E,
 };
+static const unsigned short utf8_to_euc_E8A5_x0213[] = {
+ 0x7B77, 0x6A76, 0xF83F, 0x6A71, 0x6A77, 0xF840, 0xDC6E,      0,
+      0, 0xF841,      0,      0, 0x6A7B, 0x7037,      0, 0xDC70,
+      0,      0, 0xDC71,      0,      0,      0, 0x3228, 0xDC72,
+      0,      0, 0xDC73, 0xDC74, 0xDC75,      0, 0x6A7E, 0x365F,
+ 0x6A7D, 0xDC76, 0xF844, 0xDC78, 0x6B22,      0, 0x6B21,      0,
+      0,      0, 0x6B24, 0xDC79,      0, 0x6B23, 0xDC7A, 0x6B25,
+ 0xDC7B,      0, 0x3D31, 0xDC7C, 0x6B26, 0xDC7D,      0, 0x6B27,
+      0,      0, 0xDC7E, 0xDD21, 0xDD22, 0xDD23, 0x6B28, 0x403E,
+};
 static const unsigned short utf8_to_euc_E8A6[] = {
       0, 0x4D57,      0, 0x6B29,      0,      0, 0x4A24, 0x4746,
  0x6B2A, 0xDD24, 0x6B2B, 0x382B,      0, 0xDD25,      0, 0x352C,
@@ -5379,6 +10117,16 @@ static const unsigned short utf8_to_euc_E8A6[] = {
  0xDD2E,      0, 0x6B33, 0x3451, 0xDD2F, 0xDD30, 0xDD31, 0xDD32,
       0,      0, 0x6B34,      0, 0xDD33, 0x6B35,      0, 0x6B36,
 };
+static const unsigned short utf8_to_euc_E8A6_x0213[] = {
+ 0xF845, 0x4D57,      0, 0x6B29,      0,      0, 0x4A24, 0x4746,
+ 0x6B2A, 0xF846, 0x6B2B, 0x382B,      0, 0xDD25,      0, 0x352C,
+ 0xF847,      0,      0, 0x6B2C, 0x7B78, 0xDD28, 0x3B6B, 0x4741,
+ 0x6B2D,      0, 0x3350, 0xDD29, 0xDD2A,      0,      0, 0xF848,
+ 0xDD2C, 0x6B2E,      0,      0,      0, 0xDD2D, 0x6B30, 0x4D77,
+      0, 0x6B2F, 0x3F46,      0, 0x6B31,      0,      0, 0x6B32,
+ 0xF849,      0, 0x6B33, 0x3451, 0xDD2F, 0xDD30, 0xDD31, 0xF84A,
+      0,      0, 0x6B34,      0, 0xDD33, 0x6B35,      0, 0x6B36,
+};
 static const unsigned short utf8_to_euc_E8A7[] = {
  0x6B37,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5389,6 +10137,16 @@ static const unsigned short utf8_to_euc_E8A7[] = {
       0, 0xDD3D,      0, 0xDD3E, 0x6B3C,      0, 0xDD3F,      0,
  0x6B3D, 0xDD40,      0,      0,      0, 0xDD41,      0, 0xDD42,
 };
+static const unsigned short utf8_to_euc_E8A7_x0213[] = {
+ 0x6B37,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x3351,      0, 0x7B7A, 0xDD35, 0xF84B, 0xDD37,
+ 0xF84C,      0, 0x6B38,      0, 0x6B39, 0x6B3A,      0,      0,
+      0,      0,      0, 0x3272,      0, 0x7B7B, 0x3F28, 0x6B3B,
+      0, 0xDD3A,      0, 0xF84D,      0, 0xDD3C,      0,      0,
+      0, 0xF84F,      0, 0xF850, 0x6B3C,      0, 0x7B7C,      0,
+ 0x6B3D, 0xDD40,      0,      0,      0, 0xF851,      0, 0xF852,
+};
 static const unsigned short utf8_to_euc_E8A8[] = {
  0x3840,      0, 0x447B, 0x6B3E, 0xDD43, 0xDD44,      0, 0xDD45,
  0x3757,      0, 0x3F56,      0, 0x6B41,      0, 0x4624, 0xDD46,
@@ -5399,6 +10157,16 @@ static const unsigned short utf8_to_euc_E8A8[] = {
       0, 0x3576,      0, 0x4C75, 0x414A, 0xDD53, 0x6B45, 0xDD54,
       0,      0, 0x3F47, 0x4370, 0x3E5A, 0xDD55, 0xDD56,      0,
 };
+static const unsigned short utf8_to_euc_E8A8_x0213[] = {
+ 0x3840,      0, 0x447B, 0x6B3E, 0xDD43, 0xDD44,      0, 0xDD45,
+ 0x3757,      0, 0x3F56,      0, 0x6B41,      0, 0x4624, 0xDD46,
+ 0x6B40, 0xF854, 0x7B7D, 0x3731, 0xF855, 0x7B7E, 0x6B3F, 0x4277,
+ 0x352D,      0,      0, 0x6B42,      0, 0x6B43, 0xDD4B, 0x3E59,
+ 0xDD4C, 0xF857, 0x7C21, 0x376D, 0xDD4E, 0x6B44, 0xDD4F,      0,
+      0,      0, 0x4B2C, 0xDD50, 0xDD51, 0x405F,      0, 0xDD52,
+      0, 0x3576,      0, 0x4C75, 0x414A, 0xF858, 0x6B45, 0x7C22,
+      0,      0, 0x3F47, 0x4370, 0x3E5A, 0xDD55, 0xF859,      0,
+};
 static const unsigned short utf8_to_euc_E8A9[] = {
  0xDD57, 0x6B46,      0, 0xDD58,      0, 0xDD59, 0x6B49, 0xDD5A,
  0x6B4A, 0xDD5B,      0,      0,      0, 0xDD5C, 0xDD5D,      0,
@@ -5409,6 +10177,16 @@ static const unsigned short utf8_to_euc_E8A9[] = {
  0x354D, 0x4F43, 0x333A, 0x3E5C,      0, 0xDD67, 0xDD68, 0xDD69,
       0, 0xDD6A, 0xDD6B, 0xDD6C, 0x6B4B,      0, 0xDD6D, 0xDD6E,
 };
+static const unsigned short utf8_to_euc_E8A9_x0213[] = {
+ 0xDD57, 0x6B46,      0, 0xDD58,      0, 0xF85A, 0x6B49, 0x7C23,
+ 0x6B4A, 0xDD5B,      0,      0,      0, 0xF85B, 0x7C24,      0,
+ 0x3A3E, 0x4242, 0x6B48, 0xDD5E, 0x3E5B, 0x493E, 0xDD5F, 0xDD60,
+ 0xF85C,      0,      0, 0x6B47, 0xDD62, 0x7C25, 0x3B6C,      0,
+ 0x3153, 0x7C26, 0x6B4E, 0x3758,      0, 0xDD65, 0x3B6E, 0xDD66,
+      0, 0x3B6D,      0, 0x4F4D, 0x6B4D, 0x6B4C, 0x4127,      0,
+ 0x354D, 0x4F43, 0x333A, 0x3E5C,      0, 0x7C27, 0xDD68, 0xDD69,
+      0, 0x7C28, 0xDD6B, 0xDD6C, 0x6B4B,      0, 0xDD6D, 0xDD6E,
+};
 static const unsigned short utf8_to_euc_E8AA[] = {
  0xDD6F,      0, 0x6B50, 0xDD70, 0x6B51, 0x6B4F, 0xDD71, 0x3858,
       0, 0x4D40,      0, 0xDD72, 0x3B6F, 0x4727,      0, 0xDD73,
@@ -5419,6 +10197,16 @@ static const unsigned short utf8_to_euc_E8AA[] = {
  0x432F,      0, 0x325D, 0xDD7E,      0,      0, 0xDE21, 0xDE22,
       0, 0x4870,      0, 0xDE23, 0x3543,      0, 0xDE24, 0x4434,
 };
+static const unsigned short utf8_to_euc_E8AA_x0213[] = {
+ 0xDD6F,      0, 0x6B50, 0xDD70, 0x6B51, 0x6B4F, 0xDD71, 0x3858,
+      0, 0x4D40,      0, 0xDD72, 0x3B6F, 0x4727,      0, 0xDD73,
+ 0xF85E, 0x6B54, 0xDD75, 0x4040,      0, 0x4342, 0xDD76, 0xDD77,
+ 0x4D36, 0xDD78, 0x6B57,      0,      0,      0, 0x386C, 0xDD79,
+ 0x403F, 0x6B53,      0, 0x6B58, 0x386D, 0x6B55, 0x6B56, 0x7C29,
+ 0x6B52, 0xDD7B,      0,      0, 0x4062, 0x4649, 0xF85D, 0xDD7D,
+ 0x432F,      0, 0x325D, 0xDD7E,      0,      0, 0xDE21, 0xF85F,
+      0, 0x4870,      0, 0xDE23, 0x3543,      0, 0xF860, 0x4434,
+};
 static const unsigned short utf8_to_euc_E8AB[] = {
       0,      0, 0x6B5B, 0xDE25, 0x6B59,      0, 0xDE26, 0x434C,
  0xDE27, 0xDE28, 0xDE29, 0x4041, 0x3452, 0x6B5A,      0, 0x3F5B,
@@ -5429,6 +10217,16 @@ static const unsigned short utf8_to_euc_E8AB[] = {
  0xDE32, 0x6B61,      0, 0x6B5E, 0xDE33, 0xDE34, 0xDE35, 0x6B65,
  0x3D74,      0, 0x3841,      0, 0xDE36,      0, 0x427A, 0xDE37,
 };
+static const unsigned short utf8_to_euc_E8AB_x0213[] = {
+      0,      0, 0x6B5B, 0xDE25, 0x6B59,      0, 0xDE26, 0x434C,
+ 0xDE27, 0xDE28, 0xDE29, 0x4041, 0x3452, 0x6B5A,      0, 0x3F5B,
+ 0x7C2A, 0xDE2A, 0x4E4A, 0xDE2B, 0xDE2C, 0xDE2D, 0x4F40, 0xF861,
+      0,      0, 0x6B5C, 0x6B67, 0x4435, 0xDE2F, 0x6B66, 0x7C2B,
+ 0x6B63, 0x6B6B, 0x6B64,      0, 0x6B60,      0, 0x447C, 0x6B5F,
+      0,      0,      0, 0x6B5D, 0xDE31, 0x4D21, 0x3B70,      0,
+ 0xDE32, 0x6B61,      0, 0x6B5E, 0x7C2C, 0xDE34, 0x7C2D, 0x6B65,
+ 0x3D74,      0, 0x3841,      0, 0xF862,      0, 0x427A, 0xDE37,
+};
 static const unsigned short utf8_to_euc_E8AC[] = {
  0x4B45, 0x315A, 0x3062,      0, 0x4625, 0xDE38, 0xDE39, 0x6B69,
       0,      0, 0xDE3F, 0xDE3A, 0x6B68,      0, 0x4666,      0,
@@ -5439,6 +10237,16 @@ static const unsigned short utf8_to_euc_E8AC[] = {
  0xDE41,      0,      0, 0x6B70,      0,      0,      0, 0xDE42,
       0, 0x3660,      0,      0, 0xDE43,      0, 0x6B74,      0,
 };
+static const unsigned short utf8_to_euc_E8AC_x0213[] = {
+ 0x4B45, 0x315A, 0x3062,      0, 0x4625, 0xF865, 0xDE39, 0x6B69,
+      0,      0, 0xF864, 0xDE3A, 0x6B68, 0xF866, 0x4666,      0,
+ 0x6B6D, 0xDE3B,      0,      0, 0x6B62,      0, 0x6B6C, 0x6B6E,
+      0, 0x382C, 0x6B6A, 0x3956, 0xF867, 0x3C55, 0xDE3D, 0xF868,
+ 0x6B6F, 0x4D58,      0,      0,      0,      0, 0x6B72,      0,
+ 0x6B75,      0,      0, 0x6B73, 0x4935, 0xF869,      0,      0,
+ 0xDE41,      0,      0, 0x6B70,      0,      0,      0, 0xDE42,
+      0, 0x3660,      0,      0, 0xDE43,      0, 0x6B74,      0,
+};
 static const unsigned short utf8_to_euc_E8AD[] = {
       0, 0x6B76, 0xDE44, 0xDE45, 0xDE46, 0xDE47, 0xDE48,      0,
  0xDE49, 0x6B7A,      0,      0, 0x6B77, 0xDE4E, 0x6B79, 0x6B78,
@@ -5449,6 +10257,16 @@ static const unsigned short utf8_to_euc_E8AD[] = {
  0x3544, 0x6641, 0x3E79,      0, 0x6C24,      0, 0xDE52, 0x386E,
  0xDE53, 0xDE54,      0,      0, 0xDE55, 0x6C25, 0xDE56, 0xF466,
 };
+static const unsigned short utf8_to_euc_E8AD_x0213[] = {
+      0, 0x6B76, 0xDE44, 0xF86A, 0xDE46, 0xDE47, 0x7C31,      0,
+ 0xDE49, 0x6B7A,      0,      0, 0x6B77, 0xDE4E, 0x6B79, 0x6B78,
+      0, 0xF86C, 0xDE4A,      0, 0x7C32,      0, 0x6B7B,      0,
+ 0x3C31, 0x7C33, 0x6B7D, 0x6B7C, 0x4968,      0, 0xF86D, 0x6C21,
+      0,      0,      0, 0xDE50,      0,      0, 0x3759,      0,
+      0, 0x7C34,      0, 0x6B7E, 0x6C22, 0xDE51,      0, 0x6C23,
+ 0x3544, 0x6641, 0x3E79,      0, 0x6C24,      0, 0xF86E, 0x386E,
+ 0xDE53, 0xDE54,      0,      0, 0xDE55, 0x6C25, 0xDE56, 0xF86F,
+};
 static const unsigned short utf8_to_euc_E8AE[] = {
  0x6C26, 0xDE57,      0, 0x3B3E, 0xDE58, 0xDE59,      0,      0,
       0,      0, 0x5A4E, 0xDE5A, 0x6C27, 0xDE5B, 0x6C28, 0xDE5C,
@@ -5459,6 +10277,16 @@ static const unsigned short utf8_to_euc_E8AE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E8AE_x0213[] = {
+ 0x6C26, 0xF870,      0, 0x3B3E, 0xDE58, 0xDE59,      0,      0,
+      0,      0, 0x5A4E, 0xF871, 0x6C27, 0xDE5B, 0x6C28, 0xDE5C,
+ 0x3D32,      0, 0x6C29, 0x6C2A, 0xF872, 0xF873, 0x6C2B,      0,
+      0, 0x6C2C, 0x6C2D,      0, 0xF874, 0x7C35, 0xF875, 0xDE61,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E8B0[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5469,6 +10297,16 @@ static const unsigned short utf8_to_euc_E8B0[] = {
       0,      0,      0,      0,      0,      0,      0, 0x432B,
  0xDE62, 0xDE63, 0x6C2E,      0,      0, 0xDE64, 0xDE65, 0x6C30,
 };
+static const unsigned short utf8_to_euc_E8B0_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x432B,
+ 0xDE62, 0xF876, 0x6C2E,      0,      0, 0xF878, 0xDE65, 0x6C30,
+};
 static const unsigned short utf8_to_euc_E8B1[] = {
       0, 0x6C2F,      0,      0,      0, 0xDE66, 0x4626, 0xDE67,
  0x6C31, 0xDE68, 0x4B2D, 0xDE69, 0x6C32,      0, 0x6C33, 0xDE6A,
@@ -5479,6 +10317,16 @@ static const unsigned short utf8_to_euc_E8B1[] = {
       0,      0,      0, 0xDE79,      0, 0xDE7A, 0xDE7B,      0,
  0x6C38, 0x493F, 0x6C39, 0xDE7C, 0x6C41,      0, 0xDE7D,      0,
 };
+static const unsigned short utf8_to_euc_E8B1_x0213[] = {
+      0, 0x6C2F,      0,      0,      0, 0xF87B, 0x4626, 0xF87C,
+ 0x6C31, 0x7C36, 0x4B2D, 0xDE69, 0x6C32,      0, 0x6C33, 0xF87D,
+ 0x6C34, 0xDE6B,      0, 0xDE6C, 0xF87E, 0x6C35,      0, 0xF921,
+ 0xDE6F, 0xDE72, 0x465A, 0xDE70,      0, 0xDE71,      0,      0,
+      0, 0x3E5D, 0x6C36, 0xDE73, 0xDE74,      0, 0xDE75,      0,
+ 0x7C37, 0xF922, 0x396B, 0x502E, 0x6C37, 0xF923,      0,      0,
+      0,      0,      0, 0xF924,      0, 0xDE7A, 0xDE7B,      0,
+ 0x6C38, 0x493F, 0x6C39, 0xDE7C, 0x6C41,      0, 0xDE7D,      0,
+};
 static const unsigned short utf8_to_euc_E8B2[] = {
       0,      0, 0x6C3A,      0,      0, 0x6C3C, 0xDE7E, 0xDF21,
       0, 0x6C3B, 0x6C3D, 0xDF22, 0x4B46, 0x6C3E, 0x6C3F,      0,
@@ -5489,6 +10337,16 @@ static const unsigned short utf8_to_euc_E8B2[] = {
  0x4C63,      0, 0x6C47, 0x6C48, 0x352E,      0, 0x6C4A, 0x4763,
  0x425F, 0xDF2A, 0xDF2B, 0x4871, 0x453D, 0x6C46,      0, 0x4B47,
 };
+static const unsigned short utf8_to_euc_E8B2_x0213[] = {
+      0,      0, 0x6C3A,      0,      0, 0x6C3C, 0xDE7E, 0xDF21,
+      0, 0x6C3B, 0x6C3D, 0xDF22, 0x4B46, 0x6C3E, 0x6C3F,      0,
+ 0xDF23,      0, 0xF927, 0xF926, 0x6C40,      0,      0,      0,
+ 0x6C42, 0xF928,      0, 0xF92A, 0xDF28, 0x332D, 0x4467,      0,
+ 0x4969, 0x3A62, 0x3957,      0, 0xF92B,      0,      0, 0x494F,
+ 0x325F, 0x484E, 0x6C45, 0x3453, 0x4055, 0x6C44, 0x6C49, 0x4379,
+ 0x4C63,      0, 0x6C47, 0x6C48, 0x352E,      0, 0x6C4A, 0x4763,
+ 0x425F, 0xDF2A, 0xDF2B, 0x4871, 0x453D, 0x6C46,      0, 0x4B47,
+};
 static const unsigned short utf8_to_euc_E8B3[] = {
  0x326C, 0x6C4C, 0x4F28, 0x4442, 0x4F45, 0xDF2C, 0xDF2D, 0x3B71,
  0x6C4B, 0xDF2E, 0x4231, 0xDF2F,      0, 0x6C5C, 0x4128, 0xDF30,
@@ -5499,6 +10357,16 @@ static const unsigned short utf8_to_euc_E8B3[] = {
  0xDF39,      0, 0xDF3A,      0, 0xF467, 0xDF3B,      0, 0xDF3C,
  0xDF3D,      0, 0x6C51, 0x6C52, 0x3958, 0x6C50, 0xDF3E, 0xDF3F,
 };
+static const unsigned short utf8_to_euc_E8B3_x0213[] = {
+ 0x326C, 0x6C4C, 0x4F28, 0x4442, 0x4F45, 0xDF2C, 0xDF2D, 0x3B71,
+ 0x6C4B, 0xDF2E, 0x4231, 0xDF2F,      0, 0x6C5C, 0x4128, 0xDF30,
+      0, 0x4678,      0, 0x4950,      0, 0xF92D, 0xF92C,      0,
+      0, 0xF92E, 0x6C4F, 0x3B3F, 0x3B72, 0xDF34, 0x3E5E,      0,
+ 0x4765, 0x7C39, 0x382D, 0x6C4E, 0x6C4D,      0, 0x496A,      0,
+ 0xDF36,      0, 0x3C41,      0, 0xDF37, 0x4552,      0, 0xDF38,
+ 0xF930, 0xF931, 0xDF3A,      0, 0x7C3A, 0xDF3B,      0, 0xDF3C,
+ 0x7C3B,      0, 0x6C51, 0x6C52, 0x3958, 0x6C50, 0x7C3C, 0xDF3F,
+};
 static const unsigned short utf8_to_euc_E8B4[] = {
       0, 0xDF40,      0, 0xDF41, 0x6C53, 0x6C54,      0, 0x6C56,
  0x4223, 0xDF42, 0x6C55, 0x3466,      0, 0x6C58,      0, 0x6C57,
@@ -5509,6 +10377,16 @@ static const unsigned short utf8_to_euc_E8B4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E8B4_x0213[] = {
+      0, 0xDF40,      0, 0xDF41, 0x6C53, 0x6C54,      0, 0x6C56,
+ 0x4223, 0xF933, 0x6C55, 0x3466,      0, 0x6C58, 0xF934, 0x6C57,
+ 0x6C59,      0, 0x7C3E, 0x6C5B, 0x6C5D,      0, 0x6C5E, 0xDF44,
+      0,      0,      0, 0x7C3F,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E8B5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5519,6 +10397,16 @@ static const unsigned short utf8_to_euc_E8B5[] = {
  0x4176, 0x6C61,      0, 0x6C62, 0x496B,      0, 0xF468, 0x352F,
       0,      0,      0,      0,      0,      0,      0, 0xDF4A,
 };
+static const unsigned short utf8_to_euc_E8B5_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x4056, 0xDF46, 0x3C4F, 0x6C5F,
+      0, 0xDF47,      0, 0x3352, 0xF935, 0x6C60, 0xDF49,      0,
+ 0x4176, 0x6C61,      0, 0x6C62, 0x496B,      0,      0, 0x352F,
+      0,      0,      0,      0,      0,      0,      0, 0xDF4A,
+};
 static const unsigned short utf8_to_euc_E8B6[] = {
       0, 0x6C63, 0xDF4B,      0, 0xDF4C, 0x4436,      0,      0,
  0xDF4D,      0, 0x315B,      0,      0, 0xDF4E,      0,      0,
@@ -5529,6 +10417,16 @@ static const unsigned short utf8_to_euc_E8B6[] = {
       0,      0, 0xDF59, 0x422D,      0, 0xDF5A,      0, 0xDF5B,
       0, 0xDF5C, 0x6C67, 0xDF5D, 0xDF6F,      0, 0x6C66,      0,
 };
+static const unsigned short utf8_to_euc_E8B6_x0213[] = {
+      0, 0x6C63, 0xDF4B,      0, 0xF936, 0x4436,      0,      0,
+ 0xDF4D,      0, 0x315B,      0,      0, 0xDF4E,      0,      0,
+ 0xDF4F, 0xDF50,      0,      0,      0, 0xF937,      0,      0,
+      0, 0x6C64,      0,      0,      0,      0, 0xDF52, 0xDF53,
+ 0xDF54,      0,      0, 0x3C71,      0,      0, 0xF938,      0,
+ 0x3F76,      0,      0, 0xDF56, 0xDF57,      0,      0, 0x7C40,
+      0,      0, 0xDF59, 0x422D,      0, 0xDF5A,      0, 0xDF5B,
+      0, 0xDF5C, 0x6C67, 0xDF5D, 0xDF6F,      0, 0x6C66,      0,
+};
 static const unsigned short utf8_to_euc_E8B7[] = {
  0xDF5E,      0, 0x6C65,      0,      0, 0xDF5F, 0xDF60, 0xDF61,
  0xDF62,      0, 0xDF63, 0x6C6D, 0x6C6B,      0, 0xDF64, 0x6C68,
@@ -5539,6 +10437,16 @@ static const unsigned short utf8_to_euc_E8B7[] = {
  0xDF6E, 0xDF70, 0xDF71, 0x4437, 0xDF72, 0x4129,      0,      0,
       0,      0,      0,      0, 0x6C72, 0xDF73,      0, 0x6C75,
 };
+static const unsigned short utf8_to_euc_E8B7_x0213[] = {
+ 0xDF5E,      0, 0x6C65,      0,      0, 0xDF5F, 0xF93A, 0xDF61,
+ 0xF93B,      0, 0xDF63, 0x6C6D, 0x6C6B,      0, 0x7C41, 0x6C68,
+      0, 0x7C42,      0,      0, 0xDF66, 0xDF67, 0x6C6A, 0x7C43,
+      0, 0xF93C, 0x6C69, 0x6C6C,      0, 0x3577,      0, 0x6C70,
+      0, 0x4057,      0, 0x6C71, 0xDF6A, 0xDF6B,      0, 0xDF6C,
+ 0x3859,      0, 0x6C6E, 0x6C6F, 0xF93D,      0,      0, 0x4F29,
+ 0xDF6E, 0xDF70, 0xDF71, 0x4437, 0xDF72, 0x4129,      0,      0,
+      0,      0,      0,      0, 0x6C72, 0xF940,      0, 0x6C75,
+};
 static const unsigned short utf8_to_euc_E8B8[] = {
       0, 0xDF74,      0,      0, 0xDF75, 0xDF76, 0xDF77,      0,
  0x6C73, 0x6C74, 0x4D59, 0xDF78,      0,      0,      0, 0x4627,
@@ -5549,6 +10457,16 @@ static const unsigned short utf8_to_euc_E8B8[] = {
  0x6C7C, 0xE024,      0, 0xE025, 0x6C7D, 0x6C7B, 0xE026, 0xE027,
  0xE028, 0xE029,      0,      0,      0, 0xE02A,      0,      0,
 };
+static const unsigned short utf8_to_euc_E8B8_x0213[] = {
+      0, 0xDF74,      0,      0, 0xDF75, 0xDF76, 0xF941,      0,
+ 0x6C73, 0x6C74, 0x4D59, 0xDF78, 0xF93E,      0,      0, 0x4627,
+ 0x6C78, 0xDF79,      0,      0, 0xF943,      0, 0xF944,      0,
+      0,      0,      0,      0,      0, 0x6C76, 0x6C77, 0x6C79,
+ 0x7C44, 0xF945, 0xF946, 0x7C45,      0,      0, 0xE022, 0xF947,
+      0,      0, 0x6D29,      0,      0,      0,      0,      0,
+ 0x6C7C, 0xE024,      0, 0xE025, 0x6C7D, 0x6C7B, 0xF94A, 0xE027,
+ 0xE028, 0xF94B,      0,      0,      0, 0x7C46,      0,      0,
+};
 static const unsigned short utf8_to_euc_E8B9[] = {
  0xE02B, 0xE02C, 0x6C7A,      0, 0x447D,      0,      0, 0x6D21,
  0x6D25, 0x6D22, 0x6C7E, 0xE02D, 0x6D23, 0xE02E, 0xE02F, 0xE030,
@@ -5559,6 +10477,16 @@ static const unsigned short utf8_to_euc_E8B9[] = {
  0xE03C, 0xE03D, 0x6D2D,      0, 0x3D33,      0, 0x6D2C,      0,
       0, 0xE03E, 0xE03F, 0xE040, 0x6D2E,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E8B9_x0213[] = {
+ 0xE02B, 0xE02C, 0x6C7A,      0, 0x447D,      0,      0, 0x6D21,
+ 0x6D25, 0x6D22, 0x6C7E, 0xF94C, 0x6D23, 0xE02E, 0xE02F, 0xE030,
+ 0x6D24,      0,      0,      0, 0xF94D, 0x6D2B,      0,      0,
+      0, 0x6D26,      0, 0xE032, 0xE033, 0xE034, 0xE035, 0x4058,
+ 0x6D28, 0xE036, 0xF94E, 0x6D2A, 0x6D27,      0,      0,      0,
+      0, 0xE038,      0,      0, 0xF94F, 0xF950,      0, 0xF951,
+ 0x7C47, 0xE03D, 0x6D2D,      0, 0x3D33,      0, 0x6D2C,      0,
+      0, 0xE03E, 0xE03F, 0x7C48, 0x6D2E,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E8BA[] = {
       0, 0x6D2F, 0xE041, 0xE042, 0x6D32, 0x6D31,      0, 0x6D30,
       0, 0xE043, 0x6D34, 0x6D33,      0, 0x4C76,      0,      0,
@@ -5569,6 +10497,16 @@ static const unsigned short utf8_to_euc_E8BA[] = {
  0x6D3C, 0x6D3E,      0, 0xE050,      0, 0xE051,      0,      0,
       0,      0, 0xE052, 0xE053,      0,      0, 0x6D3F,      0,
 };
+static const unsigned short utf8_to_euc_E8BA_x0213[] = {
+      0, 0x6D2F, 0xE041, 0xE042, 0x6D32, 0x6D31,      0, 0x6D30,
+      0, 0xE043, 0x6D34, 0x6D33,      0, 0x4C76,      0,      0,
+ 0xE044, 0x6D36, 0xE045, 0x6D35, 0x6D37, 0xE046,      0,      0,
+ 0xF952, 0x6D38, 0xE047, 0xE048,      0, 0xE049, 0xF953,      0,
+      0, 0x6D3A, 0xE04B,      0,      0,      0,      0, 0xE04C,
+      0, 0xE04D, 0x6D39, 0x3F48, 0x6D3B, 0xE04E, 0xF954, 0x366D,
+ 0x6D3C, 0x6D3E,      0, 0xF955,      0, 0xF956, 0xF957,      0,
+      0,      0, 0xE052, 0xF958,      0,      0, 0x6D3F,      0,
+};
 static const unsigned short utf8_to_euc_E8BB[] = {
  0xE054, 0xE055,      0, 0xE056, 0xE057, 0x6D40, 0x6D3D, 0xE058,
  0x6D41,      0, 0x3C56, 0x6D42, 0x3530, 0x3733,      0, 0xE059,
@@ -5579,6 +10517,16 @@ static const unsigned short utf8_to_euc_E8BB[] = {
  0xE05F, 0xE060,      0,      0,      0,      0,      0, 0xE061,
  0x3C34, 0xE062, 0xE063, 0x6D46, 0x6D45, 0x375A, 0x6D48,      0,
 };
+static const unsigned short utf8_to_euc_E8BB_x0213[] = {
+ 0x7C4A, 0xE055,      0, 0xE056, 0xE057, 0x6D40, 0x6D3D, 0xE058,
+ 0x6D41,      0, 0x3C56, 0x6D42, 0x3530, 0x3733,      0,      0,
+      0, 0xF95A, 0x382E,      0, 0xF95B,      0,      0,      0,
+      0,      0,      0, 0x6D43, 0xE05C,      0,      0, 0x4670,
+      0,      0, 0x453E, 0x6D44,      0,      0,      0,      0,
+ 0xE05D,      0,      0, 0x6D47,      0, 0xE064, 0xE05E,      0,
+ 0xE05F, 0xE060,      0,      0,      0,      0,      0, 0xE061,
+ 0x3C34, 0xF95D, 0x7C4C, 0x6D46, 0x6D45, 0x375A, 0x6D48,      0,
+};
 static const unsigned short utf8_to_euc_E8BC[] = {
  0xE065,      0, 0xE066, 0x3353,      0, 0x6D4A,      0, 0xE067,
  0xE068, 0x3A5C, 0x6D49,      0, 0x6D52,      0,      0, 0xE069,
@@ -5589,6 +10537,16 @@ static const unsigned short utf8_to_euc_E8BC[] = {
       0,      0,      0, 0x6D54, 0xE078, 0xE079, 0xE07A, 0xE07B,
  0x4D22, 0x6D56, 0xE07C, 0x6D55,      0,      0, 0x6D59, 0x4D41,
 };
+static const unsigned short utf8_to_euc_E8BC_x0213[] = {
+ 0xF95F,      0, 0xE066, 0x3353,      0, 0x6D4A,      0, 0xE067,
+ 0xF960, 0x3A5C, 0x6D49,      0, 0x6D52,      0,      0, 0xE069,
+ 0xE06A,      0, 0x6D4C, 0x6D4E, 0x4A65, 0x6D4B, 0xE06B, 0xF961,
+ 0xE06D, 0x6D4D,      0, 0x6D51, 0x6D4F, 0x3531, 0x7C4D, 0x6D50,
+ 0xE06F, 0xE070,      0, 0xE071,      0, 0xE072, 0x6D53, 0xE073,
+ 0xE074, 0x475A, 0x4E58, 0xF962, 0xE075, 0x7C4E, 0xE077, 0x3D34,
+      0,      0,      0, 0x6D54, 0xE078, 0xE079, 0x7C4F, 0xE07B,
+ 0x4D22, 0x6D56, 0xE07C, 0x6D55,      0,      0, 0x6D59, 0x4D41,
+};
 static const unsigned short utf8_to_euc_E8BD[] = {
  0xE07D, 0xE07E, 0x6D58, 0xE121, 0x336D, 0x6D57, 0x6D5C, 0xE122,
       0, 0x6D5B,      0,      0, 0x6D5A, 0x4532, 0x6D5D, 0xE123,
@@ -5599,6 +10557,16 @@ static const unsigned short utf8_to_euc_E8BD[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E8BD_x0213[] = {
+ 0xF963, 0xE07E, 0x6D58, 0xE121, 0x336D, 0x6D57, 0x6D5C, 0xE122,
+      0, 0x6D5B, 0xF964,      0, 0x6D5A, 0x4532, 0x6D5D, 0xE123,
+      0, 0xE124, 0xE125, 0xE126, 0x7C50, 0xE128,      0, 0x6D5E,
+ 0xF965,      0,      0,      0, 0x6D5F, 0xE12A, 0xE12B, 0x396C,
+      0, 0x3725, 0x6D60, 0x6D61, 0x6D62, 0xE12C,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E8BE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5609,6 +10577,16 @@ static const unsigned short utf8_to_euc_E8BE[] = {
  0x4324, 0x3F2B, 0x4740,      0,      0, 0xE133, 0xE134, 0x6D68,
  0xE135,      0, 0x4A55, 0x4454, 0x397E,      0, 0xE136, 0x4329,
 };
+static const unsigned short utf8_to_euc_E8BE_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x3F49, 0x6D63, 0xE12D, 0x3C2D, 0x6D64,
+ 0xE12E, 0xE12F,      0, 0x6D65, 0xF967, 0xE131, 0x7C52, 0x5221,
+ 0x517E,      0,      0,      0,      0, 0x6D66, 0x6570, 0x6D67,
+ 0x4324, 0x3F2B, 0x4740,      0, 0xF968, 0x7C53, 0xF96A, 0x6D68,
+ 0xE135,      0, 0x4A55, 0x4454, 0x397E,      0, 0xE136, 0x4329,
+};
 static const unsigned short utf8_to_euc_E8BF[] = {
  0xE137, 0xE138, 0x312A,      0, 0x4B78, 0x3F57, 0xE139,      0,
       0,      0, 0xE13A, 0xE13B,      0, 0xE13C, 0x375E,      0,
@@ -5619,6 +10597,16 @@ static const unsigned short utf8_to_euc_E8BF[] = {
  0x3D52, 0xE146,      0,      0, 0x6D6F, 0xE147, 0xE148, 0x4C42,
  0x6D7E, 0x6D71, 0x6D72, 0xE149,      0, 0x4449, 0xE14A,      0,
 };
+static const unsigned short utf8_to_euc_E8BF_x0213[] = {
+ 0xE137, 0xF96C, 0x312A,      0, 0x4B78, 0x3F57, 0xF96D,      0,
+      0,      0, 0xF96F, 0xE13B,      0, 0xF970, 0x375E,      0,
+ 0xE13D, 0x3661, 0xE13E, 0xF971, 0x4A56, 0xF972,      0,      0,
+      0,      0, 0x6D69,      0,      0,      0,      0,      0,
+ 0xF973,      0, 0x6D6B, 0xE142, 0x7C54, 0x6D6A, 0x3260,      0,
+ 0x7C55, 0x4676, 0x6D6C, 0x4777,      0, 0x4533, 0x7C56, 0x6D6D,
+ 0x3D52, 0xF974,      0,      0, 0x6D6F, 0xF975, 0xE148, 0x4C42,
+ 0x6D7E, 0x6D71, 0x6D72, 0xF976,      0, 0x4449, 0xE14A,      0,
+};
 static const unsigned short utf8_to_euc_E980[] = {
  0x4260, 0x4177, 0xE14B, 0x4628, 0xE14C, 0x6D70, 0x3555,      0,
  0xE14D,      0,      0, 0x6D79, 0xE14E, 0x6D76, 0x6E25, 0x4629,
@@ -5629,6 +10617,16 @@ static const unsigned short utf8_to_euc_E980[] = {
       0, 0x3D35, 0x3F4A, 0xE157, 0xE158, 0x6D7C, 0x6D7B, 0xE159,
  0x306F, 0x6D7D,      0,      0, 0x492F,      0, 0x6E27, 0xE15A,
 };
+static const unsigned short utf8_to_euc_E980_x0213[] = {
+ 0x4260, 0x4177, 0xF977, 0x4628, 0xE14C, 0x6D70, 0x3555,      0,
+ 0x7C57,      0,      0, 0x6D79, 0xF978, 0x6D76, 0x6E25, 0x4629,
+ 0x4360, 0x6D73,      0, 0x447E, 0x4553, 0x6D74, 0x6D78, 0x3F60,
+ 0xE14F, 0x4767, 0x444C, 0xE150,      0, 0x4042, 0x6D77, 0x422E,
+ 0x4224, 0x6D75, 0x3029, 0x4F22,      0,      0,      0, 0x6D7A,
+ 0xE151, 0xE152, 0xE154,      0, 0xE155, 0x7C58, 0x4261, 0xE153,
+      0, 0x3D35, 0x3F4A, 0xE157, 0xE158, 0x6D7C, 0x6D7B, 0xF979,
+ 0x306F, 0x6D7D,      0,      0, 0x492F,      0, 0x6E27, 0xE15A,
+};
 static const unsigned short utf8_to_euc_E981[] = {
       0, 0x465B, 0x3F6B, 0xE15B, 0xE15C, 0x4359,      0, 0x3678,
       0, 0x6E26, 0x4D37, 0x313F, 0xE15D, 0x4A57, 0x3261, 0x6E21,
@@ -5639,6 +10637,16 @@ static const unsigned short utf8_to_euc_E981[] = {
  0xE164,      0, 0x6E2F,      0, 0xE165, 0x3D65, 0x6E2D, 0x412B,
  0x412A, 0xE166, 0x3064,      0, 0x4E4B, 0x6E31,      0, 0x4872,
 };
+static const unsigned short utf8_to_euc_E981_x0213[] = {
+      0, 0x465B, 0x3F6B, 0xF97B, 0xF97C, 0x4359,      0, 0x3678,
+      0, 0x6E26, 0x4D37, 0x313F, 0xE15D, 0x4A57, 0x3261, 0x6E21,
+ 0x6E22, 0x6E23, 0x6E24, 0x463B, 0x4323, 0x3063, 0x6E28,      0,
+ 0x6E29, 0x7423,      0, 0xE15E, 0x423D, 0xF97D, 0x6E2A,      0,
+ 0x3173, 0x414C, 0xE160, 0x382F,      0, 0x4D5A, 0xE161,      0,
+ 0x6E2B, 0x452C,      0,      0, 0xE163, 0x4178, 0x3C57, 0x6E2C,
+ 0xE164,      0, 0x6E2F,      0, 0xE165, 0x3D65, 0x6E2D, 0x412B,
+ 0x412A, 0xE166, 0x3064,      0, 0x4E4B, 0x6E31,      0, 0x4872,
+};
 static const unsigned short utf8_to_euc_E982[] = {
  0x6E33, 0x6E32, 0x6E30, 0x6364, 0x3454, 0xE167,      0, 0x6D6E,
  0xE168, 0x6E35, 0x6E34, 0xE169, 0xE16A,      0, 0xE16B, 0x6E36,
@@ -5649,6 +10657,16 @@ static const unsigned short utf8_to_euc_E982[] = {
  0xE176, 0x6E39, 0xE177, 0xE178, 0xE179, 0x6E3A, 0xE17A,      0,
  0x4521,      0,      0,      0,      0, 0xE17B, 0xE17D,      0,
 };
+static const unsigned short utf8_to_euc_E982_x0213[] = {
+ 0x6E33, 0x6E32, 0x6E30, 0x6364, 0x3454, 0xFA22,      0, 0x6D6E,
+ 0x7C5A, 0x6E35, 0x6E34, 0xE169, 0xFA23,      0, 0xE16B, 0x6E36,
+ 0xFA24, 0x4D38,      0,      0,      0, 0x7C5B,      0, 0x7C5C,
+ 0xE16F, 0x7C5D,      0, 0x7C5E,      0,      0,      0,      0,
+ 0xE172, 0xFA26, 0x7C5F, 0x4661,      0, 0xE175, 0x4B2E,      0,
+ 0x6E37,      0, 0x3C59,      0,      0,      0,      0, 0x6E38,
+ 0xFA28, 0x6E39, 0xE177, 0x7C60, 0xE179, 0x6E3A, 0xFA29,      0,
+ 0x4521,      0,      0,      0,      0, 0xE17B, 0x7C61,      0,
+};
 static const unsigned short utf8_to_euc_E983[] = {
       0, 0x306A,      0, 0xE17E, 0xE221, 0xE222,      0, 0xE223,
  0xE224,      0, 0x3959,      0, 0xE17C,      0, 0x4F3A,      0,
@@ -5659,6 +10677,16 @@ static const unsigned short utf8_to_euc_E983[] = {
  0xE231,      0,      0,      0, 0xE232, 0x4D39, 0xE22E, 0x363F,
       0,      0,      0,      0,      0, 0x4554, 0xE233, 0xE234,
 };
+static const unsigned short utf8_to_euc_E983_x0213[] = {
+      0, 0x306A,      0, 0xFA2A, 0x7C62, 0x7C63,      0, 0x7C64,
+ 0xFA2B,      0, 0x3959,      0, 0xE17C,      0, 0x4F3A,      0,
+      0,      0, 0xE22D,      0,      0, 0xE225,      0, 0x7C65,
+ 0xE227, 0xE228,      0, 0x6E3E, 0xFA2D, 0x7C66, 0x7C67, 0xFA2E,
+      0, 0x3734, 0x6E3B,      0, 0x6E3C, 0xE22C,      0,      0,
+ 0x4974,      0,      0, 0xFA33,      0, 0x3354,      0, 0x7C68,
+ 0xE231,      0, 0xFA31,      0, 0x7C69, 0x4D39, 0xFA30, 0x363F,
+      0,      0,      0,      0,      0, 0x4554, 0xFA34, 0xFA35,
+};
 static const unsigned short utf8_to_euc_E984[] = {
  0xE235,      0, 0x6E3F,      0, 0xE236, 0xE237, 0xE238,      0,
  0xE239,      0,      0,      0,      0, 0xE23A,      0,      0,
@@ -5669,6 +10697,16 @@ static const unsigned short utf8_to_euc_E984[] = {
  0x6E43, 0xE24B, 0x6E42,      0, 0xE24C,      0, 0xE24D, 0xE24E,
       0, 0xE24F, 0xE250,      0, 0xE251, 0xE252,      0,      0,
 };
+static const unsigned short utf8_to_euc_E984_x0213[] = {
+ 0xFA32,      0, 0x6E3F,      0, 0xFA36, 0xE237, 0xFA37,      0,
+ 0xE239,      0,      0,      0,      0, 0xE23A,      0,      0,
+ 0xE23B,      0, 0x6E40,      0, 0x7C6B, 0x7C6C, 0x7C6D, 0xE23E,
+ 0xFA38, 0x6E41, 0xE240,      0, 0xFA39,      0, 0xFA3A,      0,
+ 0xE243,      0, 0x7C6E, 0x7C6F,      0, 0xE244,      0, 0x7C70,
+      0, 0xE248,      0,      0,      0, 0x4522, 0xE249, 0x7C71,
+ 0x6E43, 0x7C72, 0x6E42,      0, 0x7C73,      0, 0xE24D, 0xFA3B,
+      0, 0xFA3C, 0xFA3D,      0, 0xE251, 0x7C74,      0,      0,
+};
 static const unsigned short utf8_to_euc_E985[] = {
       0,      0,      0, 0xE253,      0,      0,      0, 0xE254,
  0xE255, 0x4653, 0x6E44, 0x3D36, 0x3C60, 0x475B, 0x4371, 0xE256,
@@ -5679,6 +10717,16 @@ static const unsigned short utf8_to_euc_E985[] = {
       0,      0, 0x6E4B, 0x6E4A, 0xE260, 0x395A,      0, 0x3973,
  0x3B40, 0xE261, 0xE262, 0xE263,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E985_x0213[] = {
+      0,      0,      0, 0xE253,      0,      0, 0xFA3E, 0xFA3F,
+ 0x7C75, 0x4653, 0x6E44, 0x3D36, 0x3C60, 0x475B, 0x4371, 0xE256,
+      0,      0, 0x3C72, 0xE257, 0x3F6C,      0, 0x6E45, 0xFA40,
+ 0x6E46, 0xFA41, 0xE25A, 0x7C76,      0,      0,      0,      0,
+      0, 0xFA42, 0x3F5D, 0x6E47, 0xFA43, 0x6E48,      0, 0xE25E,
+      0, 0x6E49, 0x4D6F,      0, 0x3D37, 0xE25F,      0,      0,
+      0,      0, 0x6E4B, 0x6E4A, 0xFA44, 0x395A,      0, 0x3973,
+ 0x3B40, 0xFA45, 0xE262, 0xE263,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E986[] = {
       0, 0xE264, 0x6E4E, 0xE265,      0, 0xE266, 0xE267, 0x3D66,
       0, 0x6E4D, 0xE268, 0x6E4C,      0, 0x4269, 0xE269,      0,
@@ -5689,6 +10737,16 @@ static const unsigned short utf8_to_euc_E986[] = {
  0xE276, 0xE277, 0xE278, 0xE279, 0x6E54, 0x6E53, 0xE27A,      0,
  0x3E7A,      0, 0x6E55, 0xE27B, 0xE27C, 0xE27D,      0, 0xE27E,
 };
+static const unsigned short utf8_to_euc_E986_x0213[] = {
+      0, 0xE264, 0x6E4E, 0x7C77,      0, 0xFA46, 0xE267, 0x3D66,
+      0, 0x6E4D, 0xE268, 0x6E4C,      0, 0x4269, 0xFA47,      0,
+ 0x386F, 0xE26A, 0x4043, 0xE26B, 0xE26C, 0xE26D,      0, 0x4830,
+ 0xE26E,      0,      0,      0, 0x3D39,      0, 0x7C78,      0,
+      0, 0xE270, 0x6E4F,      0, 0x3E5F,      0, 0xE271,      0,
+ 0xFA48,      0, 0x6E52, 0x6E50, 0x7C79, 0xE274, 0xFA49, 0x6E51,
+ 0xE276, 0x7C7A, 0xE278, 0xFA4A, 0x6E54, 0x6E53, 0xFA4B,      0,
+ 0x3E7A,      0, 0x6E55, 0xE27B, 0x7C7B, 0xE27D,      0, 0xE27E,
+};
 static const unsigned short utf8_to_euc_E987[] = {
  0x6E56, 0x6E57, 0xE321, 0xE322,      0, 0xE323, 0x4850, 0x3A53,
  0x3C61, 0x6E58,      0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C,
@@ -5699,6 +10757,16 @@ static const unsigned short utf8_to_euc_E987[] = {
  0xE332, 0xE333,      0,      0,      0, 0x6E60, 0x6E61, 0xE334,
       0, 0xE335,      0, 0xE336, 0x6E5F, 0xE337,      0, 0x6E63,
 };
+static const unsigned short utf8_to_euc_E987_x0213[] = {
+ 0x6E56, 0x6E57, 0xE321, 0xFA4C, 0xFA4D, 0xE323, 0x4850, 0x3A53,
+ 0x3C61, 0x6E58,      0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C,
+ 0x6E5A, 0x3662,      0, 0xE324, 0xE325,      0, 0x6E5B, 0x7C7C,
+ 0x4523, 0xE327, 0xFA4E, 0x6E5E, 0x3378, 0x3F4B,      0, 0x6E5C,
+      0, 0x6E5D,      0, 0x4460, 0x7C7E, 0x7D21, 0x4B55, 0x367C,
+      0, 0xE32C, 0xE32D,      0, 0xFA51, 0x7D22, 0xFA52, 0xE331,
+ 0xE332, 0x7D23,      0,      0,      0, 0x6E60, 0x6E61, 0xE334,
+      0, 0xE335,      0, 0x7C7D, 0x6E5F, 0xE337,      0, 0x6E63,
+};
 static const unsigned short utf8_to_euc_E988[] = {
  0xE338, 0xE339,      0,      0, 0xE33A, 0xE33B, 0xE33C, 0xE33D,
       0, 0xE33E, 0xE33F,      0, 0xE340, 0x465F, 0x3343,      0,
@@ -5709,6 +10777,16 @@ static const unsigned short utf8_to_euc_E988[] = {
  0xE34F,      0,      0, 0xE350, 0x4E6B, 0xE351, 0xE352, 0x385A,
  0xE353, 0xE354, 0xE355,      0, 0xE356,      0, 0xE357, 0x6E6F,
 };
+static const unsigned short utf8_to_euc_E988_x0213[] = {
+ 0xE338, 0xFA53,      0,      0, 0xE33A, 0xE33B,      0, 0x7D24,
+      0, 0xE33E, 0xFA54,      0, 0xE340, 0x465F, 0x3343,      0,
+ 0x7D25, 0x6E67, 0xE342, 0xE343, 0x6E64, 0x6E66, 0xFA55, 0xFA56,
+ 0xE345,      0,      0,      0, 0xE346, 0xE347, 0x6E62,      0,
+      0,      0,      0, 0xE348, 0xE349, 0xE34A, 0xE34B,      0,
+ 0xE34C, 0x6F4F,      0,      0, 0x6E65,      0, 0xE34D, 0xE34E,
+ 0xE34F,      0,      0, 0xFA58, 0x4E6B, 0xE351, 0xE352, 0x385A,
+ 0x7D26, 0x7D27, 0x7D28,      0, 0x7D29,      0, 0xE357, 0x6E6F,
+};
 static const unsigned short utf8_to_euc_E989[] = {
  0xE358,      0, 0xE359, 0xE35A, 0x4534, 0x6E6A, 0xE35B, 0xE35C,
  0x6E6D, 0x6E6B, 0xE35D, 0x6E70,      0, 0xE35E, 0xE35F, 0xE360,
@@ -5719,6 +10797,16 @@ static const unsigned short utf8_to_euc_E989[] = {
  0xE36E, 0x395B,      0,      0,      0, 0xE36F, 0xE370, 0xE371,
  0xE372, 0xE373,      0, 0xE374, 0xE375, 0xE376, 0x4B48, 0xE377,
 };
+static const unsigned short utf8_to_euc_E989_x0213[] = {
+ 0x7D2A,      0, 0xFA59, 0x7D2B, 0x4534, 0x6E6A, 0xE35B, 0xFA5A,
+ 0x6E6D, 0x6E6B, 0xFA5B, 0x6E70,      0, 0xE35E, 0xFA5C, 0x7D2C,
+ 0x6E71, 0xFA5D,      0,      0,      0,      0, 0xFA5E, 0x6E69,
+ 0xE362, 0xFA5F, 0x6E76, 0x3174, 0xE364, 0xE365, 0x6E68,      0,
+ 0xFA60, 0xFA61, 0x482D,      0, 0x6E6C, 0xFA62, 0x3E60, 0xFA63,
+ 0xFA64, 0xE36B,      0,      0,      0,      0, 0xE36C, 0xE36D,
+ 0xE36E, 0x395B,      0,      0,      0, 0xE36F, 0xE370,      0,
+ 0x7D2D, 0xE373,      0, 0xE374, 0xFA67, 0xFA68, 0x4B48, 0xFA69,
+};
 static const unsigned short utf8_to_euc_E98A[] = {
  0x3664,      0,      0, 0x3D46,      0, 0x463C,      0,      0,
  0xE378, 0xE379, 0xE37A,      0,      0, 0xE37B, 0xE37C,      0,
@@ -5729,6 +10817,16 @@ static const unsigned short utf8_to_euc_E98A[] = {
       0,      0, 0xE42A,      0,      0,      0, 0xE42B, 0x6E79,
  0xE42C, 0x6E78, 0xE42D, 0xE42E, 0xE42F, 0xE430,      0, 0xE431,
 };
+static const unsigned short utf8_to_euc_E98A_x0213[] = {
+ 0x3664,      0,      0, 0x3D46,      0, 0x463C,      0,      0,
+ 0x7D2E, 0xFA6A, 0xE37A,      0,      0, 0xFA6B, 0xE37C,      0,
+      0, 0x412D, 0xE37D, 0x6E74,      0, 0x6E6E, 0x6E73, 0xFA6C,
+ 0x4C43, 0xFA6D, 0x4438, 0x6E75, 0x6E72,      0,      0, 0xFA6E,
+ 0xE423,      0,      0,      0, 0xE424, 0xE425,      0, 0xFA6F,
+ 0xE427,      0,      0, 0xFA70,      0, 0x412C,      0, 0xE429,
+      0,      0, 0xFA73,      0,      0,      0, 0xE42B, 0x6E79,
+ 0xE42C, 0x6E78, 0xE42D, 0xE42E, 0xE42F, 0xE430,      0, 0xFA74,
+};
 static const unsigned short utf8_to_euc_E98B[] = {
  0xE432, 0xE433, 0xE434, 0xE435,      0, 0xE436, 0xE437, 0xE438,
  0xE439,      0,      0, 0xE43A, 0xE43B, 0xE43C, 0xE43D, 0x6E77,
@@ -5739,6 +10837,16 @@ static const unsigned short utf8_to_euc_E98B[] = {
  0xE44F,      0, 0x4946, 0x4372,      0,      0,      0,      0,
  0x3578, 0xE450, 0x6E7C, 0xE451, 0x395D,      0,      0, 0xE452,
 };
+static const unsigned short utf8_to_euc_E98B_x0213[] = {
+ 0xFA75, 0xE433, 0x7D2F, 0xE435,      0, 0xE436, 0xFA76, 0xE438,
+ 0xE439,      0,      0, 0x7D30, 0x7D31, 0xE43C, 0xFA77, 0x6E77,
+ 0xFA78,      0, 0x4B2F, 0x7D32,      0,      0,      0, 0xFA79,
+ 0xE442, 0xFA7A,      0,      0, 0xE444, 0xE445,      0, 0xE446,
+ 0x7D33, 0xE448,      0, 0xE449, 0x3D7B, 0xFA7B,      0, 0xFA7C,
+ 0xE44C, 0x6E7A, 0x4A5F,      0, 0xE44D, 0x3154, 0xE44E,      0,
+ 0xE44F,      0, 0x4946, 0x4372,      0,      0,      0, 0xFB22,
+ 0x3578, 0xFB23, 0x6E7C, 0xFB24, 0x395D,      0,      0, 0x7D34,
+};
 static const unsigned short utf8_to_euc_E98C[] = {
  0xE453,      0, 0xE454,      0,      0,      0, 0x3B2C,      0,
  0xE455,      0,      0,      0,      0, 0xE456,      0, 0x6E7B,
@@ -5749,6 +10857,16 @@ static const unsigned short utf8_to_euc_E98C[] = {
       0,      0, 0x4F3F, 0xE464, 0xE465, 0x6F26, 0xE466, 0xE467,
       0,      0, 0x6F25, 0x6F27,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E98C_x0213[] = {
+ 0xE453,      0, 0xFB25,      0, 0x7D35,      0, 0x3B2C,      0,
+ 0xE455,      0,      0,      0,      0, 0xFB26,      0, 0x6E7B,
+ 0x3F6D, 0xFA7D,      0,      0, 0xE458, 0xFB27,      0,      0,
+ 0x3F6E, 0x6F21, 0x6F23,      0, 0xE45A, 0xFB28, 0xFB29, 0x7D36,
+ 0x3E7B, 0x7D37, 0x6F22, 0x6F24, 0xE45F, 0x7D38, 0x3653, 0xFB2A,
+ 0x4945, 0xFB2B, 0xE463, 0x3C62, 0x4F23,      0, 0x6E7E, 0x3A78,
+      0,      0, 0x4F3F, 0xE464, 0xE465, 0x6F26, 0xE466, 0xE467,
+      0,      0, 0x6F25, 0x6F27,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E98D[] = {
       0,      0,      0,      0, 0x6E7D,      0,      0, 0xE468,
  0xE469, 0xE46A,      0, 0x4669,      0, 0x4555,      0,      0,
@@ -5759,6 +10877,16 @@ static const unsigned short utf8_to_euc_E98D[] = {
  0xE47A, 0xE47B,      0, 0xE47C, 0xE47D, 0x3830, 0xE47E,      0,
       0,      0, 0xE521,      0, 0x6F2A, 0xE522, 0x3E61, 0xE523,
 };
+static const unsigned short utf8_to_euc_E98D_x0213[] = {
+      0,      0,      0,      0, 0x6E7D,      0,      0, 0xFB2E,
+ 0x7D39, 0x7D3A, 0x7D3B, 0x4669,      0, 0x4555,      0,      0,
+ 0xE46B, 0xFB2F, 0xE46D,      0, 0x4457, 0xE46E, 0x6F2C, 0xFB30,
+ 0xE470,      0, 0xFB31, 0x4343, 0x6F28,      0, 0xE472,      0,
+ 0x6F29,      0,      0,      0, 0x7D3C, 0x7D3D,      0, 0xE475,
+      0, 0xE476, 0x7D3E, 0xFB32, 0x372D, 0xE478, 0x6F2B, 0xE479,
+ 0x7D3F, 0xFB33,      0, 0xFB34, 0xE47D, 0x3830, 0xE47E,      0,
+      0,      0, 0xE521,      0, 0x6F2A, 0xE522, 0x3E61, 0xE523,
+};
 static const unsigned short utf8_to_euc_E98E[] = {
  0xE524, 0xE525, 0xE526,      0,      0,      0,      0,      0,
  0xE527,      0, 0xE528, 0xE529, 0x3379, 0xE52A,      0, 0xE52B,
@@ -5769,6 +10897,16 @@ static const unsigned short utf8_to_euc_E98E[] = {
  0x6F2D,      0,      0,      0, 0xE537, 0xE538, 0xE539,      0,
       0, 0x6F31, 0xE53A,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E98E_x0213[] = {
+ 0xE524, 0xE525, 0xE526,      0,      0,      0,      0,      0,
+ 0xFB38,      0, 0xE528, 0xFB39, 0x3379, 0xE52A,      0, 0xFB3A,
+      0,      0, 0xE52C,      0, 0x6F30, 0xE52D, 0x3A3F, 0x4179,
+ 0xE52E,      0, 0x444A, 0x7D40,      0,      0, 0xFB3B,      0,
+      0, 0xFB35,      0, 0x7D41,      0,      0, 0xE534, 0x333B,
+ 0xE535, 0xE53B,      0, 0xE536, 0x6F2E, 0x6F2F, 0x4443,      0,
+ 0x6F2D,      0,      0,      0, 0xE537, 0xE538, 0xE539,      0,
+      0, 0x6F31, 0x7D42,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E98F[] = {
       0, 0xE53C,      0, 0x6F37, 0xE53D, 0xE53E, 0xE53F, 0xE540,
  0x6F3A, 0xE541, 0xE542, 0xE543, 0xE544, 0xE545,      0,      0,
@@ -5779,6 +10917,16 @@ static const unsigned short utf8_to_euc_E98F[] = {
       0,      0,      0,      0,      0,      0,      0, 0xE54F,
  0xE550, 0xE54E, 0xE551, 0xE552,      0, 0xE553,      0,      0,
 };
+static const unsigned short utf8_to_euc_E98F_x0213[] = {
+      0, 0xFB40,      0, 0x6F37, 0xE53D, 0xE53E, 0x7D43, 0xFB41,
+ 0x6F3A, 0xE541, 0xE542, 0xE543, 0xE544, 0xE545,      0,      0,
+ 0x6F39, 0x452D,      0, 0xE546,      0,      0, 0x6F32, 0x6F33,
+ 0x6F36, 0xE547,      0,      0, 0xFB42, 0x6F38, 0x7D44, 0x7D45,
+      0, 0x3640, 0xFB43,      0, 0x6F3B, 0x6F35, 0xE54C, 0xFB44,
+ 0x6F34,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFB3F,      0,      0,      0, 0xFB3C,      0, 0xE54F,
+      0, 0xE54E, 0xE551, 0xFB49,      0, 0x7D47,      0,      0,
+};
 static const unsigned short utf8_to_euc_E990[] = {
       0, 0xE554, 0xE555, 0x6F3F, 0xE556,      0,      0, 0x6F40,
  0xE557, 0xE558,      0,      0,      0, 0xE559, 0xE55A, 0xE55B,
@@ -5789,6 +10937,16 @@ static const unsigned short utf8_to_euc_E990[] = {
       0, 0xE562, 0xE563, 0xE564, 0xE565, 0x6F44, 0x6F42,      0,
  0x4278,      0, 0x6F46, 0xE566,      0, 0xE568,      0, 0xE567,
 };
+static const unsigned short utf8_to_euc_E990_x0213[] = {
+      0, 0xE554, 0xE555, 0x6F3F, 0x7D46,      0,      0, 0x6F40,
+ 0xE557, 0xFB45,      0,      0,      0, 0xE559, 0xE55A, 0xFB46,
+ 0x6F41,      0,      0, 0x6F3E, 0x6F3D, 0xE55C, 0xFB47, 0xFB48,
+ 0x3E62, 0x462A, 0x6F3C,      0,      0,      0,      0, 0xE55F,
+      0, 0x6F45,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x6F43,      0,      0, 0xE560, 0xE561,
+      0,      0, 0xFB4A, 0x7D48, 0xFB4B, 0x6F44, 0x6F42,      0,
+ 0x4278,      0, 0x6F46, 0xFB4C,      0, 0xE568,      0, 0xE567,
+};
 static const unsigned short utf8_to_euc_E991[] = {
       0, 0x6F47,      0, 0xE569, 0x6F49, 0xE56A,      0,      0,
  0xE56B,      0, 0xE56C,      0, 0xE56D,      0,      0,      0,
@@ -5799,6 +10957,16 @@ static const unsigned short utf8_to_euc_E991[] = {
  0x6F50, 0xE579, 0xE57A,      0,      0, 0x6F51,      0, 0x6F52,
       0,      0,      0,      0, 0x6F55, 0x6F53, 0x6F56, 0x6F58,
 };
+static const unsigned short utf8_to_euc_E991_x0213[] = {
+      0, 0x6F47,      0, 0xE569, 0x6F49, 0xFB4D,      0,      0,
+      0,      0, 0x7D49,      0, 0xE56D,      0,      0,      0,
+      0, 0x3455, 0x6F48, 0x4C7A,      0, 0xE56E,      0,      0,
+      0, 0xE56F, 0x6F54, 0x6F4A, 0xE570,      0, 0x6F4D, 0xE571,
+ 0x6F4B, 0xE572, 0x6F4C, 0x7D4A,      0,      0,      0,      0,
+ 0xE574,      0, 0x6F4E, 0x7D4B,      0, 0xFB50, 0xE577, 0xFB51,
+ 0x6F50, 0x7D4C, 0x7D4D,      0,      0, 0x6F51,      0, 0x6F52,
+      0,      0,      0,      0, 0x6F55, 0x6F53, 0x6F56, 0x6F58,
+};
 static const unsigned short utf8_to_euc_E992[] = {
       0, 0x6F57,      0, 0xE57C, 0xE57B,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5819,6 +10987,16 @@ static const unsigned short utf8_to_euc_E995[] = {
       0,      0,      0,      0,      0,      0,      0, 0x4439,
  0xE57D, 0xE57E,      0,      0,      0,      0, 0xE621,      0,
 };
+static const unsigned short utf8_to_euc_E995_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x4439,
+ 0xFB52, 0xFB53,      0,      0,      0,      0, 0xE621,      0,
+};
 static const unsigned short utf8_to_euc_E996[] = {
  0x4C67,      0, 0x6F59, 0x412E, 0xE622,      0,      0, 0x6F5A,
  0xE623, 0x4A44, 0x6F5B, 0x332B, 0xE624, 0xE625, 0xE626, 0x313C,
@@ -5829,6 +11007,16 @@ static const unsigned short utf8_to_euc_E996[] = {
       0,      0, 0x315C,      0, 0xE62F,      0, 0xE630,      0,
       0, 0x6F66, 0xE631, 0x6F65, 0x6F64, 0xE632, 0x6F67, 0xE633,
 };
+static const unsigned short utf8_to_euc_E996_x0213[] = {
+ 0x4C67,      0, 0x6F59, 0x412E, 0xE622,      0, 0xFB54, 0x6F5A,
+ 0xE623, 0x4A44, 0x6F5B, 0x332B, 0xFB55, 0xFB56, 0x7D4E, 0x313C,
+      0, 0x3457,      0, 0x3456, 0x6F5C,      0, 0x6F5D,      0,
+ 0x6F5E, 0x6F5F,      0,      0,      0, 0xE627, 0xE628, 0x7D4F,
+ 0x6F60, 0xE62A, 0x3458, 0x3355, 0x395E, 0x4836, 0x7D50, 0x6F62,
+ 0x6F61, 0x7D51,      0, 0xFB58, 0x7D52, 0x6F63,      0,      0,
+      0,      0, 0x315C,      0, 0xFB59,      0, 0x7D53,      0,
+      0, 0x6F66, 0xE631, 0x6F65, 0x6F64, 0x7D54, 0x6F67, 0xE633,
+};
 static const unsigned short utf8_to_euc_E997[] = {
       0,      0,      0, 0x6F6A,      0,      0, 0xE634, 0x3047,
  0xE635, 0xE636, 0x6F68, 0xE637, 0x6F6C, 0x6F6B,      0,      0,
@@ -5839,6 +11027,16 @@ static const unsigned short utf8_to_euc_E997[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E997_x0213[] = {
+      0,      0,      0, 0x6F6A,      0,      0, 0xE634, 0x3047,
+ 0xFB5B, 0xE636, 0x6F68, 0x7D55, 0x6F6C, 0x6F6B,      0,      0,
+ 0x7D56, 0xE639, 0xE63A, 0x7D57, 0x6F6E, 0x6F6D, 0x6F6F,      0,
+ 0x462E, 0xE63C, 0x7D59,      0, 0x6F70, 0xE63E, 0x7D5A, 0xE640,
+ 0xE641, 0x6F71, 0x6F73,      0, 0xE642, 0x6F72, 0xE643,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E998[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5849,6 +11047,16 @@ static const unsigned short utf8_to_euc_E998[] = {
       0, 0xE64B, 0x4B49, 0xE64C,      0,      0,      0, 0xE64D,
  0xE64E, 0xE64F, 0xE650, 0x414B, 0xE651, 0xE652,      0, 0x3024,
 };
+static const unsigned short utf8_to_euc_E998_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x496C, 0xFA25, 0xE645,      0,
+      0, 0x6F74, 0xE646,      0, 0xE647, 0xE648, 0xE649,      0,
+ 0x6F75,      0, 0x3A65,      0, 0xFB5E,      0, 0x6F76, 0x6F77,
+      0, 0xE64B, 0x4B49, 0xFB5F, 0xFB60,      0,      0, 0xE64D,
+ 0xE64E, 0xE64F, 0xE650, 0x414B, 0xFB62, 0xE652,      0, 0x3024,
+};
 static const unsigned short utf8_to_euc_E999[] = {
  0x424B, 0xE653, 0x6F78,      0, 0x496D,      0,      0,      0,
       0,      0,      0, 0x6F7B, 0x6F79, 0x395F,      0, 0x6F7A,
@@ -5859,6 +11067,16 @@ static const unsigned short utf8_to_euc_E999[] = {
  0x3122,      0, 0x7024, 0x4444, 0xE65B, 0x4E4D, 0x462B, 0x6F7C,
  0x4E26,      0, 0x3831, 0xE65C, 0xE65D, 0x4D5B, 0xE65E, 0xE65F,
 };
+static const unsigned short utf8_to_euc_E999_x0213[] = {
+ 0x424B, 0xFB63, 0x6F78,      0, 0x496D,      0,      0,      0,
+      0,      0,      0, 0x6F7B, 0x6F79, 0x395F,      0, 0x6F7A,
+ 0x3842,      0, 0xE654,      0, 0xE655,      0, 0xE656, 0xE657,
+ 0x7D5B,      0,      0, 0x4A45, 0x6F7D, 0x7021, 0x6F7E, 0x7022,
+      0, 0xFB64, 0x3121, 0x3F58, 0x3D7C, 0x3459, 0x7023,      0,
+      0,      0, 0x4766,      0, 0x7025,      0, 0xE65A,      0,
+ 0x3122,      0, 0x7024, 0x4444, 0xE65B, 0x4E4D, 0x462B, 0x6F7C,
+ 0x4E26,      0, 0x3831, 0xE65C, 0xE65D, 0x4D5B, 0xE65E, 0xE65F,
+};
 static const unsigned short utf8_to_euc_E99A[] = {
       0, 0xE660, 0xE661, 0xE662, 0xE663, 0x3679, 0x4E34,      0,
  0x3728, 0xE664, 0x4262, 0x6721,      0, 0x7026, 0x332C, 0x3F6F,
@@ -5869,6 +11087,16 @@ static const unsigned short utf8_to_euc_E99A[] = {
  0x702E, 0x702C, 0x702D, 0xE670, 0x702F,      0, 0x7030, 0x4E6C,
  0x7031, 0x7032, 0xE671, 0x4049, 0x483B,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E99A_x0213[] = {
+      0, 0xE660, 0xFB66, 0xE662, 0x7D5C, 0x3679, 0x4E34,      0,
+ 0x3728, 0xE664, 0x4262, 0x6721,      0, 0x7026, 0x332C, 0x3F6F,
+      0, 0xE665,      0,      0, 0x3356, 0x7028, 0xE666, 0x7029,
+ 0x7027, 0x3764, 0xFB68, 0x3A5D, 0x3E63, 0x7D5E,      0, 0xE669,
+ 0x3123,      0,      0, 0x4E59, 0x7D5F, 0x7D60, 0xE66C, 0x702B,
+ 0x6E2E, 0xFB6B, 0x702A,      0,      0,      0, 0xE66E, 0xFB6C,
+ 0x702E, 0x702C, 0x702D, 0xFB6D, 0x702F,      0, 0x7030, 0x4E6C,
+ 0x7031, 0x7032, 0xFB6E, 0x4049, 0x483B, 0xFB6F,      0,      0,
+};
 static const unsigned short utf8_to_euc_E99B[] = {
  0x3F7D, 0x3467,      0,      0, 0x4D3A, 0x326D, 0x3D38, 0x385B,
       0, 0x7035, 0xE672, 0x7034, 0x3B73, 0x7036, 0x7033,      0,
@@ -5879,6 +11107,16 @@ static const unsigned short utf8_to_euc_E99B[] = {
  0x4A37, 0xE67C, 0x3140,      0,      0,      0, 0x4E6D, 0x4D6B,
       0, 0x703B, 0xE67D, 0x4545,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E99B_x0213[] = {
+ 0x3F7D, 0x3467,      0,      0, 0x4D3A, 0x326D, 0x3D38, 0x385B,
+      0, 0x7035, 0xE672, 0x7034, 0x3B73, 0x7036, 0x7033,      0,
+      0, 0x3B28, 0x7D61,      0,      0, 0x703A, 0x6A2D,      0,
+ 0xFB72, 0x5256, 0xFB73, 0x3F77, 0x7038, 0xFB74, 0x7D62, 0xE679,
+      0,      0, 0x4E25, 0x4671,      0,      0,      0,      0,
+ 0x312B, 0x7D64, 0x4063, 0x3C36,      0,      0,      0, 0x7D65,
+ 0x4A37, 0xE67C, 0x3140,      0,      0,      0, 0x4E6D, 0x4D6B,
+      0, 0x703B, 0xE67D, 0x4545,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E99C[] = {
  0x3C7B,      0, 0xE67E, 0xE721, 0x703C, 0xE722, 0x703D, 0x3F4C,
  0x703E, 0xE723, 0x4E6E,      0,      0, 0x7039, 0x7040, 0x7042,
@@ -5889,6 +11127,16 @@ static const unsigned short utf8_to_euc_E99C[] = {
  0x7047, 0xE72B, 0x4F2A, 0xE72C,      0,      0,      0,      0,
  0x5B31, 0x7048,      0, 0xF474,      0, 0x7049, 0x704A,      0,
 };
+static const unsigned short utf8_to_euc_E99C_x0213[] = {
+ 0x3C7B,      0, 0xE67E, 0xE721, 0x703C, 0xE722, 0x703D, 0x3F4C,
+ 0x703E, 0xE723, 0x4E6E,      0,      0, 0x7039, 0x7040, 0x7042,
+      0, 0x7041,      0, 0x703F, 0xFB76,      0, 0x7043,      0,
+      0, 0x7044, 0xE724, 0xE725, 0x417A, 0xE726, 0x3262,      0,
+      0, 0xE727, 0xE728, 0xFB77, 0x7045,      0,      0, 0x4C38,
+ 0xE72A,      0, 0x7046,      0,      0,      0,      0,      0,
+ 0x7047, 0xE72B, 0x4F2A, 0x7D66,      0,      0, 0xFB79,      0,
+ 0x5B31, 0x7048,      0, 0x7D67,      0, 0x7049, 0x704A,      0,
+};
 static const unsigned short utf8_to_euc_E99D[] = {
       0, 0xE72D, 0x704E, 0xE72E, 0x704B,      0, 0x704C,      0,
  0x704D, 0x704F, 0xE72F,      0,      0, 0xF475, 0xE730, 0xE731,
@@ -5899,6 +11147,16 @@ static const unsigned short utf8_to_euc_E99D[] = {
       0, 0x7057,      0, 0xE73B, 0x3724,      0, 0xE73C, 0xE73D,
  0xE73E, 0x7058, 0x705C, 0xE73F, 0x705A, 0xE740,      0, 0xE741,
 };
+static const unsigned short utf8_to_euc_E99D_x0213[] = {
+      0, 0xFB7A, 0x704E,      0, 0x704B,      0, 0x704C, 0xFB7B,
+ 0x704D, 0x704F, 0xE72F,      0,      0, 0x7D68, 0x7D69, 0x7D6A,
+      0,      0, 0x4044,      0,      0, 0xFB7C, 0x4C77, 0xFB7D,
+ 0xE734, 0x4045, 0x7D6B, 0xFB7E, 0x7050,      0, 0x4873,      0,
+ 0x7051, 0x7353, 0x4C4C, 0xE737, 0x7052,      0, 0x7053, 0xE738,
+ 0x7054, 0x3357, 0xFC21, 0x7056,      0, 0x3F59, 0x7D6C,      0,
+      0, 0x7057,      0, 0x7D6D, 0x3724,      0, 0xE73C, 0xE73D,
+ 0xE73E, 0x7058, 0x705C, 0xE73F, 0x705A, 0xE740,      0, 0xE741,
+};
 static const unsigned short utf8_to_euc_E99E[] = {
  0xE742, 0x705B,      0,      0, 0x3373, 0x7059, 0x705D,      0,
       0, 0xE743,      0, 0x705E,      0, 0x3048,      0, 0x705F,
@@ -5909,6 +11167,16 @@ static const unsigned short utf8_to_euc_E99E[] = {
       0, 0xE74E, 0xE74F, 0x7065, 0x7066, 0xE750, 0xE751,      0,
  0xE752, 0xE753, 0xE754,      0, 0xE755,      0, 0xE756, 0xE757,
 };
+static const unsigned short utf8_to_euc_E99E_x0213[] = {
+ 0xE742, 0x705B,      0,      0, 0x3373, 0x7059, 0x705D,      0,
+      0, 0xE743,      0, 0x705E,      0, 0x3048,      0, 0x705F,
+ 0x7060,      0,      0,      0,      0, 0x7D6E, 0xFC24, 0xE746,
+ 0x3E64, 0xE747, 0xFC25,      0, 0x7061,      0, 0xFC26, 0xE74A,
+ 0x3547,      0, 0xFC27, 0x7064,      0,      0, 0x7063,      0,
+ 0x7062,      0,      0, 0x6B71, 0xE74C, 0x4A5C, 0x7D6F,      0,
+      0, 0xFC28, 0xFC29, 0x7065, 0x7066, 0xE750, 0xE751,      0,
+ 0xE752, 0xE753, 0x7D70,      0, 0xE755,      0, 0xFC2A, 0xE757,
+};
 static const unsigned short utf8_to_euc_E99F[] = {
       0, 0xE758,      0, 0x7067, 0xE759, 0xE75A, 0x7068, 0xE75B,
  0x7069, 0xE75C, 0xE75D, 0x706A, 0xE75E, 0xE75F, 0xE760,      0,
@@ -5919,6 +11187,16 @@ static const unsigned short utf8_to_euc_E99F[] = {
       0, 0xE76E, 0x706E, 0x323B, 0xE76F, 0x7071, 0x7070, 0xE770,
  0xE771,      0, 0xE772, 0x3124,      0,      0,      0, 0x3641,
 };
+static const unsigned short utf8_to_euc_E99F_x0213[] = {
+      0, 0x7D71,      0, 0x7067, 0xE759, 0xE75A, 0x7068, 0xE75B,
+ 0x7069, 0x7D72, 0xE75D, 0x706A, 0xFC2B, 0xE75F, 0xE760,      0,
+ 0xE761, 0xFC2C,      0, 0x345A, 0xFC2D,      0,      0, 0xE764,
+ 0xFC2E, 0xFC2F,      0, 0x7D74, 0x706B, 0xE767, 0x7D73,      0,
+ 0xE769, 0xFC30,      0,      0, 0xE76C,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x706C, 0x4723, 0xE76D,
+      0, 0xFC31, 0x706E, 0x323B, 0x7D75, 0x7071, 0x7070, 0xE770,
+ 0xE771,      0, 0xE772, 0x3124,      0,      0,      0, 0x3641,
+};
 static const unsigned short utf8_to_euc_E9A0[] = {
       0, 0x4A47, 0x443A, 0x3A22,      0, 0x3960, 0x3D67, 0xE773,
  0x3F5C,      0, 0xE774,      0, 0x7073, 0xE776, 0xE777, 0x7072,
@@ -5929,6 +11207,16 @@ static const unsigned short utf8_to_euc_E9A0[] = {
  0xE824,      0, 0xE825, 0xE826, 0x3150, 0xE827,      0, 0x7077,
  0x7074,      0,      0, 0x4951, 0x4D6A, 0x7078, 0xE829,      0,
 };
+static const unsigned short utf8_to_euc_E9A0_x0213[] = {
+      0, 0x4A47, 0x443A, 0x3A22, 0xFC32, 0x3960, 0x3D67, 0xE773,
+ 0x3F5C,      0, 0x7D77,      0, 0x7073, 0xFC33, 0xFC34, 0x7072,
+ 0x4D42, 0x3468, 0x4852, 0x465C, 0xFC35,      0, 0xFC36, 0x3F7C,
+ 0x4E4E, 0xE775, 0x375B,      0, 0xE77A,      0, 0x7D78,      0,
+ 0xE77C, 0x7076,      0, 0xFC39, 0x7075, 0xFC3C, 0xE77E,      0,
+      0,      0,      0, 0x7D79, 0x4B4B, 0x462C, 0xE822, 0xE823,
+ 0x7D7A,      0, 0xFC3A, 0xFC3B, 0x3150, 0xE827,      0, 0x7077,
+ 0x7074,      0,      0, 0x4951, 0x4D6A, 0x7078, 0xE829,      0,
+};
 static const unsigned short utf8_to_euc_E9A1[] = {
       0,      0,      0,      0, 0xE82A,      0, 0x7079, 0xE82B,
       0,      0, 0xE82C, 0x707B, 0x426A, 0x335B, 0x335C, 0x707A,
@@ -5939,6 +11227,16 @@ static const unsigned short utf8_to_euc_E9A1[] = {
  0x707E, 0x7121,      0, 0x7123, 0x7122,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E9A1_x0213[] = {
+      0,      0,      0,      0, 0xE82A,      0, 0x7079, 0xFC3D,
+      0,      0, 0xE82C, 0x707B, 0x426A, 0x335B, 0x335C, 0x707A,
+      0, 0xE82D, 0x7D7C, 0x7D7D, 0x3469, 0x3832, 0x7D7E, 0x7E21,
+ 0x346A, 0x7E22, 0x7E23, 0x453F,      0,      0, 0x4E60,      0,
+      0,      0, 0xE834, 0xE835,      0, 0x7E25, 0xFC3E, 0x385C,
+      0,      0, 0xE838, 0x707C, 0x7E26,      0,      0, 0x707D,
+ 0x707E, 0x7121,      0, 0x7123, 0x7122,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E9A2[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5949,6 +11247,16 @@ static const unsigned short utf8_to_euc_E9A2[] = {
  0xE83D, 0x7126,      0,      0, 0xE83E,      0, 0x7127, 0xE83F,
  0xE840,      0, 0xE841, 0xE842,      0,      0,      0, 0xE843,
 };
+static const unsigned short utf8_to_euc_E9A2_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x4977,      0, 0x7124, 0xFC3F,      0, 0xFC40, 0xE83C, 0x7125,
+ 0xFC41, 0x7126,      0,      0, 0xE83E,      0, 0x7127, 0xFC43,
+ 0xFC44,      0, 0x7E27, 0xFC45, 0xFC46,      0,      0, 0xFC47,
+};
 static const unsigned short utf8_to_euc_E9A3[] = {
       0,      0, 0xE844, 0x7129, 0x7128, 0xE845, 0x712A,      0,
  0xE846,      0,      0,      0, 0xE847,      0,      0,      0,
@@ -5959,6 +11267,16 @@ static const unsigned short utf8_to_euc_E9A3[] = {
       0,      0, 0x307B, 0xE84E, 0x303B,      0, 0xE84F,      0,
       0,      0,      0,      0, 0x3B74, 0x4B30, 0x3E7E,      0,
 };
+static const unsigned short utf8_to_euc_E9A3_x0213[] = {
+      0,      0, 0xFC48, 0x7129, 0x7128, 0xE845, 0x712A, 0xFC49,
+ 0x7E28,      0,      0, 0xFC4A, 0xE847,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x4874, 0x664C,      0,      0, 0x3F29,
+ 0xFC4B, 0xFC4D, 0x3532, 0xFC4E,      0, 0xFC4F, 0xE84B, 0x7E29,
+      0, 0x712B, 0xFC50, 0x712C,      0, 0x522C, 0x5D3B, 0x4853,
+ 0xFC51, 0xFC52, 0x307B, 0xFC53, 0x303B,      0, 0xE84F,      0,
+      0,      0,      0,      0, 0x3B74, 0x4B30, 0x3E7E,      0,
+};
 static const unsigned short utf8_to_euc_E9A4[] = {
       0,      0, 0xE850, 0x712D,      0, 0x4C5F,      0, 0xE851,
  0xE852, 0x712E, 0x4D5C,      0, 0x3142,      0,      0,      0,
@@ -5969,6 +11287,16 @@ static const unsigned short utf8_to_euc_E9A4[] = {
       0, 0xE85F, 0xE860, 0xE861, 0xE862, 0xE863,      0,      0,
       0, 0xE864, 0xE865, 0xE866, 0xE867, 0x7139, 0x713A,      0,
 };
+static const unsigned short utf8_to_euc_E9A4_x0213[] = {
+      0,      0, 0xE850, 0x712D,      0, 0x4C5F,      0, 0xE851,
+ 0xFC54, 0x712E, 0x4D5C,      0, 0x3142,      0,      0,      0,
+ 0x3B41, 0xE853, 0x712F, 0x326E, 0x7130, 0xE854, 0xFC57, 0xFC58,
+ 0x7131,      0, 0xFC5A, 0xFC5B, 0xFC5C, 0x7133, 0x7134, 0xE85A,
+ 0x7136, 0x7132, 0xE85B,      0, 0x7135,      0, 0xE85C,      0,
+ 0x345B,      0,      0, 0xE85E, 0x7137,      0, 0x7138,      0,
+      0, 0xFC5E, 0xFC5F, 0xFC60, 0xE862, 0xE863,      0,      0,
+      0, 0xE864, 0xFC61, 0xFC62, 0xFC63, 0x7139, 0x713A,      0,
+};
 static const unsigned short utf8_to_euc_E9A5[] = {
  0xE868, 0xE869, 0x713B,      0,      0, 0x713D, 0xE86A, 0xE86B,
  0xE86C, 0x713C,      0, 0x713F, 0x7142, 0xE86D, 0xE86E,      0,
@@ -5979,6 +11307,16 @@ static const unsigned short utf8_to_euc_E9A5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E9A5_x0213[] = {
+ 0xFC64, 0xFC65, 0x713B,      0,      0, 0x713D, 0xFC66, 0xE86B,
+ 0xE86C, 0x713C,      0, 0x713F, 0x7142, 0xFC67, 0xFC68,      0,
+ 0x713E, 0x7140, 0x7141,      0, 0xE86F, 0x7143,      0, 0x3642,
+ 0x7E2A, 0xE871,      0, 0xE872, 0xFC69,      0, 0xE874, 0xFC6A,
+ 0xFC6B,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E9A6[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -5989,6 +11327,16 @@ static const unsigned short utf8_to_euc_E9A6[] = {
  0xE87B, 0xE87C, 0xE87D, 0x435A, 0x466B, 0xE87E,      0,      0,
       0, 0xE921, 0xE922,      0, 0x7149, 0xE923,      0, 0xE924,
 };
+static const unsigned short utf8_to_euc_E9A6_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x3C73, 0x7144,
+ 0x7145, 0x3961,      0, 0xE877,      0, 0xE878, 0x7E2B, 0xE879,
+      0,      0,      0, 0xFC6C,      0, 0x7146, 0xFC6D,      0,
+ 0x333E,      0,      0,      0, 0x474F, 0x7147, 0x7148,      0,
+ 0xE87B, 0xE87C, 0xE87D, 0x435A, 0x466B, 0xE87E,      0,      0,
+      0, 0xFC6E, 0xE922,      0, 0x7149, 0xFC6F,      0, 0xFC70,
+};
 static const unsigned short utf8_to_euc_E9A7[] = {
       0, 0x477D,      0, 0xE925, 0x424C, 0x3158, 0x366E,      0,
  0x366F, 0xE926,      0,      0,      0,      0,      0,      0,
@@ -5999,6 +11347,16 @@ static const unsigned short utf8_to_euc_E9A7[] = {
  0xE931, 0x7151, 0x7152,      0, 0xE932, 0xE933,      0,      0,
  0x7154, 0xE934,      0, 0x7153,      0, 0xE935, 0xE936, 0x3D59,
 };
+static const unsigned short utf8_to_euc_E9A7_x0213[] = {
+      0, 0x477D,      0, 0xFC71, 0x424C, 0x3158, 0x366E,      0,
+ 0x366F, 0xFC72,      0,      0,      0,      0,      0,      0,
+ 0x4373, 0x714E, 0x3670, 0xE927, 0xFC73, 0x326F,      0,      0,
+ 0x714D, 0xFC74, 0xE92A, 0x714B, 0xE92B, 0x714C, 0xFC75, 0x714A,
+      0,      0, 0x7158,      0,      0,      0,      0, 0xE92D,
+      0,      0, 0xE92E, 0xE92F, 0xE930, 0x714F, 0x7150,      0,
+ 0xFC77, 0x7151, 0x7152,      0, 0xE932, 0xE933,      0,      0,
+ 0x7154, 0xFC78,      0, 0x7153, 0xFC79, 0xE935, 0xE936, 0x3D59,
+};
 static const unsigned short utf8_to_euc_E9A8[] = {
       0, 0x7155, 0xE937, 0xE938, 0xE939, 0x7157,      0,      0,
       0,      0,      0, 0xE93A, 0xE93B,      0, 0x3533, 0x7156,
@@ -6009,6 +11367,16 @@ static const unsigned short utf8_to_euc_E9A8[] = {
  0x462D,      0,      0, 0xE947,      0, 0xE948, 0xE949, 0x715B,
  0xE94A,      0,      0,      0,      0,      0, 0x7160,      0,
 };
+static const unsigned short utf8_to_euc_E9A8_x0213[] = {
+      0, 0x7155, 0x7E2C, 0x7E2D, 0xE939, 0x7157,      0,      0,
+      0,      0, 0xFC7A, 0xE93A, 0xE93B,      0, 0x3533, 0x7156,
+ 0xE93C, 0xFC7B, 0x417B, 0x3833,      0,      0, 0xFC7C,      0,
+      0, 0x7159, 0xFC7D,      0,      0,      0, 0xE93F,      0,
+ 0xFC7E,      0, 0xE941, 0xE942, 0x7E2E,      0,      0, 0xE944,
+ 0x424D,      0,      0, 0x715A,      0, 0x7E2F, 0x7E30,      0,
+ 0x462D, 0xFD21,      0, 0xE947,      0, 0xE948, 0xFD22, 0x715B,
+ 0x7E31,      0,      0,      0,      0,      0, 0x7160,      0,
+};
 static const unsigned short utf8_to_euc_E9A9[] = {
  0x715E, 0xE94C, 0x715D, 0x715F, 0xE94D, 0x715C,      0, 0xE94B,
       0,      0, 0xE94E, 0xE94F, 0xE950, 0x7162, 0xE951,      0,
@@ -6019,6 +11387,16 @@ static const unsigned short utf8_to_euc_E9A9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E9A9_x0213[] = {
+ 0x715E, 0xE94C, 0x715D, 0x715F, 0xFD23, 0x715C,      0, 0xE94B,
+      0,      0, 0x7E32, 0xE94F, 0xFD24, 0x7162, 0x7E33,      0,
+      0, 0xE952, 0x7E34,      0, 0xE953, 0x7161, 0xE954, 0x7164,
+ 0xFD25,      0, 0x3643, 0x7163,      0, 0xE955,      0, 0x7165,
+      0,      0, 0x7166,      0, 0x7168, 0x7167,      0,      0,
+      0, 0x7169, 0x716B, 0x716A,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E9AA[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -6029,6 +11407,16 @@ static const unsigned short utf8_to_euc_E9AA[] = {
  0x716D,      0, 0xE95A,      0, 0xE95B, 0xE95C, 0xE95D,      0,
  0x333C, 0xE95E,      0, 0xE95F, 0x716E,      0, 0xE960, 0xE961,
 };
+static const unsigned short utf8_to_euc_E9AA_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x397C,      0, 0xE956,      0, 0xE957, 0x716C, 0xE958, 0xFD27,
+ 0x716D,      0, 0xE95A,      0, 0xE95B, 0xE95C, 0x7E35, 0xFD29,
+ 0x333C, 0xFD2B,      0, 0xE95F, 0x716E,      0, 0xE960, 0xE961,
+};
 static const unsigned short utf8_to_euc_E9AB[] = {
  0x716F, 0xE962,      0, 0xE963, 0x3F71,      0, 0xE964,      0,
  0xE965,      0,      0,      0,      0,      0, 0xE966, 0x7170,
@@ -6039,6 +11427,16 @@ static const unsigned short utf8_to_euc_E9AB[] = {
       0, 0x717D, 0xE974, 0xE975, 0x717C, 0xE976,      0, 0x717E,
       0, 0xE977, 0xE978, 0x7221,      0, 0xE979,      0, 0xE97A,
 };
+static const unsigned short utf8_to_euc_E9AB_x0213[] = {
+ 0x716F, 0x7E36,      0, 0x7E37, 0x3F71,      0, 0xFD2D,      0,
+ 0xE965,      0,      0,      0,      0,      0, 0x7E38, 0x7170,
+ 0xFD2E, 0x7171, 0xFD2F, 0x7172, 0x7173, 0xFD30, 0x7E39, 0xE96B,
+ 0x3962,      0,      0, 0xE96C, 0xFD32,      0, 0x7174, 0x7175,
+ 0xFD33,      0, 0x7176, 0x7177, 0xE96F, 0xFD34, 0x7178, 0xE971,
+      0, 0xFD35, 0x4831, 0x717A, 0xE973, 0x4926, 0x717B, 0x7179,
+      0, 0x717D, 0xE974, 0xE975, 0x717C, 0xE976,      0, 0x717E,
+      0, 0x7E3A, 0xE978, 0x7221,      0, 0xE979,      0, 0xE97A,
+};
 static const unsigned short utf8_to_euc_E9AC[] = {
  0xE97B, 0xE97C, 0xE97D, 0xE97E, 0xEA21, 0xEA22, 0x7222,      0,
  0xEA23, 0xEA24,      0, 0xEA25, 0xEA26, 0xEA27, 0xEA28,      0,
@@ -6049,6 +11447,16 @@ static const unsigned short utf8_to_euc_E9AC[] = {
       0, 0x5D35, 0x722F, 0xEA33, 0xEA34, 0xEA35,      0, 0xEA36,
       0, 0xEA37, 0xEA38, 0x6478, 0x3534, 0xEA39,      0,      0,
 };
+static const unsigned short utf8_to_euc_E9AC_x0213[] = {
+ 0xE97B, 0xE97C, 0x7E3B, 0xFD36, 0xEA21, 0xEA22, 0x7222,      0,
+ 0x7E3C, 0xEA24,      0, 0xEA25, 0xFD37, 0xEA27, 0xEA28,      0,
+ 0xFD38,      0, 0xFD39,      0,      0,      0, 0xFD3A,      0,
+ 0x7223, 0xEA2C, 0x7224, 0xEA2D, 0xFD3B,      0,      0, 0x7225,
+ 0x7E3D,      0, 0x7226, 0x7227,      0, 0x7228, 0xEA30, 0x7229,
+ 0x722A, 0x722B, 0x722C, 0xFD3C,      0, 0x7E3F, 0x722D, 0x722E,
+      0, 0x5D35, 0x722F, 0xFD3D, 0xEA34, 0xEA35,      0, 0xEA36,
+      0, 0xEA37, 0xEA38, 0x6478, 0x3534, 0xFD3E,      0,      0,
+};
 static const unsigned short utf8_to_euc_E9AD[] = {
       0, 0x3321, 0x3A32, 0x7231, 0x7230, 0x4C25,      0,      0,
  0xEA3A,      0,      0, 0xEA3B, 0xEA3C, 0x7233, 0x7234, 0x7232,
@@ -6059,6 +11467,16 @@ static const unsigned short utf8_to_euc_E9AD[] = {
       0,      0, 0xF47C, 0xEA4C, 0x7237, 0xEA4D,      0, 0xEA4E,
  0xEA4F, 0xEA50,      0,      0,      0,      0,      0, 0xEA51,
 };
+static const unsigned short utf8_to_euc_E9AD_x0213[] = {
+      0, 0x3321, 0x3A32, 0x7231, 0x7230, 0x4C25,      0,      0,
+ 0xEA3A,      0,      0, 0xFD40, 0xEA3C, 0x7233, 0x7234, 0x7232,
+      0, 0x7235,      0,      0, 0x4B62, 0xEA3D, 0xEA3E, 0xEA3F,
+ 0x7236,      0, 0x357B, 0xEA40,      0,      0, 0x7E40,      0,
+      0, 0xEA42,      0, 0xFD41,      0, 0xFD42, 0x7E42,      0,
+ 0xEA46,      0, 0xEA47, 0xFD43, 0xFD44, 0xEA4A, 0xEA4B, 0x4F25,
+      0,      0, 0x7E43, 0xFD45, 0x7237, 0x7E44, 0xFD46, 0xFD47,
+ 0xEA4F, 0x7E41,      0,      0,      0,      0,      0, 0xEA51,
+};
 static const unsigned short utf8_to_euc_E9AE[] = {
  0xEA52,      0,      0, 0x7239, 0xEA53, 0xEA54, 0xEA55, 0xEA56,
       0, 0xEA57, 0xEA58, 0xEA59,      0, 0xEA5A, 0x303E, 0xEA5B,
@@ -6069,6 +11487,16 @@ static const unsigned short utf8_to_euc_E9AE[] = {
  0xEA65, 0xEA66, 0xEA67,      0, 0x7240,      0,      0, 0xEA68,
  0xEA69, 0x7243,      0, 0xEA6A, 0xEA6B,      0, 0xEA6C, 0xEA6D,
 };
+static const unsigned short utf8_to_euc_E9AE_x0213[] = {
+ 0xEA52,      0,      0, 0x7239, 0x7E45, 0xEA54, 0xEA55, 0xEA56,
+      0, 0xEA57, 0x7E46, 0xEA59,      0, 0xEA5A, 0x303E, 0x7E47,
+ 0xEA5C, 0x723A, 0x4A2B, 0x7238, 0xEA5D,      0, 0x723B, 0x723C,
+      0,      0, 0xEA5E,      0,      0, 0xEA5F, 0x7E48, 0x723D,
+ 0x723E,      0,      0,      0,      0,      0, 0xFD48, 0x7E49,
+ 0x723F, 0xEA63, 0x4B6E, 0x3B2D, 0xFD49, 0x3A7A, 0x412F,      0,
+ 0xEA65, 0xFD4A, 0xFD4D,      0, 0x7240,      0,      0, 0xEA68,
+ 0xFD4E, 0x7243,      0,      0, 0xEA6B,      0, 0xFD4F, 0xEA6D,
+};
 static const unsigned short utf8_to_euc_E9AF[] = {
  0x7241, 0xEA6E,      0,      0,      0,      0, 0x7244, 0xEA6F,
  0xEA70, 0x3871, 0x7242,      0,      0,      0, 0xEA71, 0x7245,
@@ -6079,6 +11507,16 @@ static const unsigned short utf8_to_euc_E9AF[] = {
  0x7250, 0x724F, 0x724E, 0xEA7C,      0, 0x3033,      0, 0xEA7D,
  0xEA7E, 0xEB21, 0xEB22,      0,      0, 0xEB23,      0, 0xEB24,
 };
+static const unsigned short utf8_to_euc_E9AF_x0213[] = {
+ 0x7241, 0x7E4A,      0,      0,      0,      0, 0x7244, 0xFD50,
+ 0xEA70, 0x3871, 0x7242,      0,      0,      0, 0x7E4B, 0x7245,
+ 0xEA72, 0x7246, 0x7247,      0, 0x724B,      0, 0x3B2A, 0xEA73,
+ 0xFD52,      0,      0, 0x4264,      0, 0xFD53,      0, 0xEA76,
+      0, 0x724C, 0x7249, 0x7248, 0x724A, 0x7E4C,      0, 0xFD54,
+ 0x375F,      0, 0xFD55, 0xFD56,      0,      0, 0xFD58, 0xFD57,
+ 0x7250, 0x724F, 0x724E, 0xFD51,      0, 0x3033,      0, 0xFD5C,
+ 0x7E4D, 0xEB21, 0xFD5A,      0,      0, 0x7E4E,      0, 0xEB24,
+};
 static const unsigned short utf8_to_euc_E9B0[] = {
  0xEB25,      0, 0xEB26,      0, 0x725A,      0, 0x7256,      0,
  0x7257, 0x7253, 0x7259, 0xEB27, 0x7255, 0x3362,      0, 0xEB28,
@@ -6089,6 +11527,16 @@ static const unsigned short utf8_to_euc_E9B0[] = {
  0x7260, 0xEB37, 0x7262,      0,      0, 0xEB38, 0xEB39, 0xEB3A,
       0, 0x336F, 0x724D, 0x3137,      0, 0xEB3B, 0x7264,      0,
 };
+static const unsigned short utf8_to_euc_E9B0_x0213[] = {
+ 0x7E4F,      0, 0xEB26,      0, 0x725A,      0, 0x7256,      0,
+ 0x7257, 0x7253, 0x7259, 0xEB27, 0x7255, 0x3362,      0, 0xEB28,
+ 0x4F4C, 0xEB29, 0x7258, 0x7254, 0x7252, 0x7251, 0xFD5E,      0,
+ 0xFD5F, 0xFD60, 0xFD61, 0x725C, 0xEB2E, 0xFD62, 0xEB2F,      0,
+      0, 0x725F, 0xFD63, 0x7E50, 0x725E, 0x725D, 0xEB32, 0xFD64,
+ 0xEB34, 0xFD65, 0xFD66,      0,      0, 0x4949, 0x725B, 0x3073,
+ 0x7260, 0xFD68, 0x7262,      0,      0, 0xEB38, 0xFD69, 0xFD6A,
+      0, 0x336F, 0x724D, 0x3137,      0, 0xEB3B, 0x7264,      0,
+};
 static const unsigned short utf8_to_euc_E9B1[] = {
       0, 0xEB3C,      0, 0xEB3D, 0xEB3E, 0xEB3F, 0x7263, 0x7261,
  0x432D, 0xEB40, 0xEB41,      0,      0,      0, 0xEB42, 0xEB43,
@@ -6099,6 +11547,16 @@ static const unsigned short utf8_to_euc_E9B1[] = {
  0xEB54,      0, 0xEB55,      0,      0, 0xEB56, 0x7268, 0xEB57,
  0x7269,      0,      0, 0xEB58,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E9B1_x0213[] = {
+      0, 0x7E51,      0, 0xEB3D, 0xEB3E, 0xFD6B, 0x7263, 0x7261,
+ 0x432D, 0xFD6E, 0xFD6F,      0,      0,      0, 0xEB42, 0x7E52,
+ 0x7E53,      0, 0x4B70, 0x7E54, 0xFD71,      0, 0xEB47, 0x4E5A,
+ 0xFD72,      0, 0x7265, 0xFD73, 0xFD6C, 0xFD74, 0xEB4B, 0xFD75,
+ 0x7266,      0,      0, 0x7E55,      0, 0x7E56,      0, 0x7267,
+ 0xEB52, 0xFD76, 0xFD77, 0xFD78,      0, 0xFD79, 0xFD7A,      0,
+ 0xFD7B,      0, 0xFD7C,      0,      0, 0xFD7D, 0x7268, 0x7E57,
+ 0x7269,      0, 0xFD7E, 0xEB58,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E9B3[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -6109,6 +11567,16 @@ static const unsigned short utf8_to_euc_E9B3[] = {
  0x726C,      0, 0xEB5A, 0x4B31, 0x4C44,      0, 0x4650, 0xEB5B,
       0, 0xEB5C,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E9B3_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x443B, 0xFE21, 0x726A,
+      0, 0x4837,      0, 0x726F, 0x726B,      0,      0,      0,
+ 0x726C,      0, 0xFE22, 0x4B31, 0x4C44,      0, 0x4650, 0xEB5B,
+      0, 0xEB5C,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E9B4[] = {
       0,      0, 0xEB5E, 0x7270,      0,      0, 0x7271, 0x463E,
  0x726E, 0x726D,      0, 0xEB5D,      0,      0, 0x322A,      0,
@@ -6119,6 +11587,16 @@ static const unsigned short utf8_to_euc_E9B4[] = {
  0xEB66,      0, 0xEB67, 0xEB68, 0xEB69,      0,      0,      0,
       0,      0, 0xEB6A, 0x3963, 0xEB6B, 0xEB6D, 0x727C, 0x727B,
 };
+static const unsigned short utf8_to_euc_E9B4_x0213[] = {
+      0,      0, 0xFE24, 0x7270,      0,      0, 0x7271, 0x463E,
+ 0x726E, 0x726D,      0, 0xFE23,      0,      0, 0x322A,      0,
+      0, 0xFE26, 0x7279,      0,      0, 0x7278,      0, 0xFE27,
+ 0xFE28,      0,      0, 0x3175, 0xEB62, 0x7E58, 0x7E59, 0x7276,
+      0,      0,      0, 0x7275,      0,      0, 0x7273,      0,
+ 0x337B,      0, 0x7272, 0x3C32, 0x3229,      0,      0, 0xEB65,
+ 0xEB66,      0, 0xFE2C, 0xEB68, 0xEB69,      0,      0,      0,
+      0,      0, 0xEB6A, 0x3963, 0xEB6B, 0xEB6D, 0x727C, 0x727B,
+};
 static const unsigned short utf8_to_euc_E9B5[] = {
       0, 0x727A, 0xEB6E, 0xEB6F, 0x7277, 0xEB6C, 0x727D, 0xEB70,
  0x727E,      0, 0xEB71,      0,      0,      0,      0,      0,
@@ -6129,6 +11607,16 @@ static const unsigned short utf8_to_euc_E9B5[] = {
  0xEB7B,      0, 0x7327,      0,      0,      0, 0xEB7C, 0xEB7D,
       0,      0, 0x732C, 0xEB7E, 0xEC21,      0, 0xEC22,      0,
 };
+static const unsigned short utf8_to_euc_E9B5_x0213[] = {
+      0, 0x727A, 0xFE2E, 0x7E5A, 0x7277, 0xEB6C, 0x727D, 0x7E5B,
+ 0x727E,      0, 0xFE2F,      0,      0,      0,      0,      0,
+ 0x7325, 0x7324, 0x7E5C, 0xEB72, 0xEB73,      0,      0,      0,
+      0, 0x7326,      0,      0, 0x312D, 0x7321, 0x7322, 0xFE30,
+ 0x3974, 0x4C39, 0xFE31, 0x7E5D, 0x7323, 0xEB77,      0,      0,
+      0, 0xFE33, 0xEB79, 0xFE34, 0x4B32,      0,      0, 0x732B,
+ 0x7E5E,      0, 0x7327, 0xFE36,      0,      0, 0xFE37, 0xFE38,
+      0,      0, 0x732C, 0xEB7E, 0x7E5F,      0, 0xFE39,      0,
+};
 static const unsigned short utf8_to_euc_E9B6[] = {
       0,      0,      0, 0xEC23, 0xEC24,      0, 0xEC25, 0x7329,
       0, 0x7328, 0xEC26,      0,      0, 0xEC27, 0xEC28, 0x375C,
@@ -6139,6 +11627,16 @@ static const unsigned short utf8_to_euc_E9B6[] = {
       0, 0xEC33, 0x7330,      0, 0x4461, 0xEC34,      0,      0,
  0x7334, 0xEC35, 0x7335, 0x7333, 0xEC36,      0,      0, 0xEC37,
 };
+static const unsigned short utf8_to_euc_E9B6_x0213[] = {
+      0,      0,      0, 0xEC23, 0xFE3A,      0, 0xEC25, 0x7329,
+      0, 0x7328, 0x7E60,      0,      0, 0xFE3B, 0xEC28, 0x375C,
+      0,      0, 0xEC29, 0xEC2A,      0, 0xEC2B, 0x7E61, 0xEC2D,
+ 0xEC2E, 0xFE3C, 0x732D,      0,      0,      0,      0,      0,
+      0, 0xFE3D,      0,      0, 0x732E,      0,      0,      0,
+      0, 0x732F, 0xEC30, 0x732A, 0x7E63,      0, 0xEC32, 0x7274,
+      0, 0xEC33, 0x7330,      0, 0x4461, 0xFE3F,      0,      0,
+ 0x7334, 0xFE40, 0x7335, 0x7333, 0x7E64, 0xFE41,      0, 0xFE3E,
+};
 static const unsigned short utf8_to_euc_E9B7[] = {
       0, 0x7332, 0x7338, 0xEC38, 0x7331,      0, 0x7336, 0xEC39,
       0, 0xEC3A, 0xEC3B,      0,      0,      0,      0, 0x7337,
@@ -6149,6 +11647,16 @@ static const unsigned short utf8_to_euc_E9B7[] = {
  0xEC49,      0, 0x4F49, 0xEC4A, 0xEC4B,      0,      0,      0,
  0x733B, 0x426B, 0x3A6D,      0,      0, 0x733F, 0xEC4C,      0,
 };
+static const unsigned short utf8_to_euc_E9B7_x0213[] = {
+ 0x7E62, 0x7332, 0x7338, 0xFE42, 0x7331,      0, 0x7336, 0xFE43,
+      0, 0xFE44, 0xEC3B,      0,      0,      0,      0, 0x7337,
+      0,      0,      0, 0x733A, 0xEC3C, 0xEC3D, 0xFE45, 0x7E65,
+      0, 0x7339, 0xFE46,      0,      0,      0, 0xEC41, 0xFE47,
+ 0xFE48,      0,      0, 0xFE49,      0, 0xEC44, 0x733C, 0x7E67,
+      0, 0xEC46,      0, 0xEC47,      0, 0x733D, 0xEC48, 0x733E,
+ 0xEC49,      0, 0x4F49, 0xEC4A, 0xFE4A,      0,      0,      0,
+ 0x733B, 0x426B, 0x3A6D,      0,      0, 0x733F, 0xEC4C,      0,
+};
 static const unsigned short utf8_to_euc_E9B8[] = {
       0,      0, 0xEC4E,      0,      0,      0,      0, 0xEC4F,
       0,      0, 0xEC4D,      0,      0,      0, 0xEC50,      0,
@@ -6159,6 +11667,16 @@ static const unsigned short utf8_to_euc_E9B8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E9B8_x0213[] = {
+      0,      0, 0xFE4D,      0,      0,      0,      0, 0x7E68,
+      0,      0, 0xFE4C,      0,      0, 0xFE4E, 0xEC50,      0,
+ 0xEC51, 0xEC52, 0xEC53,      0,      0, 0x7E69, 0xEC55,      0,
+      0, 0xFE4F, 0x7340, 0x7341, 0xFE50, 0xFE51, 0x7342,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_E9B9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -6169,6 +11687,16 @@ static const unsigned short utf8_to_euc_E9B9[] = {
       0,      0,      0,      0,      0, 0x7343,      0,      0,
  0x3834, 0x7344, 0xEC59, 0xEC5A, 0xEC5B, 0x7345,      0, 0x3C2F,
 };
+static const unsigned short utf8_to_euc_E9B9_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x7343,      0,      0,
+ 0x3834, 0x7344, 0xEC59, 0xFE52, 0x7E6A, 0x7345,      0, 0x3C2F,
+};
 static const unsigned short utf8_to_euc_E9BA[] = {
  0xEC5C, 0x7346, 0xEC5D, 0xEC5E, 0xEC5F, 0xEC60,      0, 0xEC61,
  0x7347,      0,      0, 0x7348, 0x7349,      0, 0xEC62, 0xEC63,
@@ -6179,6 +11707,16 @@ static const unsigned short utf8_to_euc_E9BA[] = {
  0xEC6D,      0,      0, 0xEC6E, 0xEC6F, 0xEC70,      0,      0,
  0x7350, 0x396D, 0x4C4D, 0x4B63, 0x5677,      0, 0x5D60, 0x4B7B,
 };
+static const unsigned short utf8_to_euc_E9BA_x0213[] = {
+ 0xFE54, 0x7346, 0xEC5D, 0xEC5E, 0xEC5F, 0xFE55,      0, 0xEC61,
+ 0x7347,      0,      0, 0x7348, 0x7349,      0, 0xEC62, 0xEC63,
+      0, 0x734C, 0x734A, 0x4F3C,      0, 0x734B, 0xEC64, 0x4E6F,
+ 0xEC65,      0,      0, 0xFE56,      0, 0x734D, 0x7E6B, 0x4E5B,
+      0,      0,      0,      0, 0x7E6C, 0x734E, 0x477E,      0,
+ 0xFE57, 0x734F, 0x7351,      0, 0x7E6D, 0x7352, 0xEC6B, 0x7E6E,
+ 0xEC6D,      0,      0, 0xEC6E, 0x7E6F, 0x7E70,      0,      0,
+ 0x7350, 0x396D, 0x4C4D, 0x4B63, 0x5677, 0xFE59, 0x5D60, 0x4B7B,
+};
 static const unsigned short utf8_to_euc_E9BB[] = {
       0,      0,      0,      0, 0x322B,      0, 0xEC71,      0,
  0xEC72,      0,      0, 0xEC73, 0x7354, 0x3550, 0x7355, 0x7356,
@@ -6189,6 +11727,16 @@ static const unsigned short utf8_to_euc_E9BB[] = {
  0xEC7B, 0xEC7C, 0xEC7D,      0, 0x7360, 0xEC7E, 0x7361, 0x7362,
  0xED21, 0x7363,      0, 0x7364, 0x7365, 0x7366,      0, 0xED22,
 };
+static const unsigned short utf8_to_euc_E9BB_x0213[] = {
+      0,      0,      0, 0x7E71, 0x322B,      0, 0xEC71,      0,
+ 0xEC72,      0,      0, 0xEC73, 0x7354, 0x3550, 0x7355, 0x7356,
+ 0x7357, 0x7E72, 0x3975,      0, 0x7358, 0xEC74,      0,      0,
+ 0x6054, 0x4C5B,      0, 0x4263, 0x7359, 0x735B, 0x735A, 0xFE5B,
+ 0x735C,      0,      0,      0, 0xEC76, 0x735D,      0, 0xFE5C,
+ 0x735E,      0,      0,      0, 0xEC78, 0xEC79, 0xFE5D, 0x735F,
+ 0xEC7B, 0xEC7C, 0xEC7D,      0, 0x7360, 0xEC7E, 0x7361, 0x7362,
+ 0xED21, 0x7363,      0, 0x7364, 0x7365, 0x7366,      0, 0xFE5E,
+};
 static const unsigned short utf8_to_euc_E9BC[] = {
       0,      0, 0xED23, 0xED24,      0,      0,      0, 0x7367,
  0x7368, 0xED25,      0,      0,      0,      0, 0x4524, 0xED26,
@@ -6199,6 +11747,16 @@ static const unsigned short utf8_to_euc_E9BC[] = {
       0, 0xED36, 0xED37,      0, 0xED38,      0,      0, 0xED39,
       0, 0xED3A, 0xED3B, 0x4921, 0xED3C, 0xED3D, 0x736D, 0xED3E,
 };
+static const unsigned short utf8_to_euc_E9BC_x0213[] = {
+      0,      0, 0xFE5F, 0xFE61,      0,      0,      0, 0x7367,
+ 0x7368, 0xED25,      0,      0,      0,      0, 0x4524, 0xED26,
+ 0x7E73, 0xED28, 0xED29, 0x385D, 0xED2A, 0x736A, 0xED2B, 0xFE62,
+      0, 0xFE63, 0xED2E, 0xED2F,      0,      0,      0, 0xED30,
+ 0x414D, 0x736B, 0xED31,      0,      0,      0, 0xED32,      0,
+      0,      0, 0xED33, 0xED34, 0x736C,      0,      0, 0xFE64,
+      0, 0xED36, 0xED37,      0, 0xED38,      0,      0, 0xFE65,
+      0, 0x7E74, 0xFE66, 0x4921, 0xED3C, 0xFE67, 0x736D, 0xED3E,
+};
 static const unsigned short utf8_to_euc_E9BD[] = {
       0, 0xED3F,      0, 0xED40, 0xED41, 0xED42, 0xED43, 0xED44,
       0,      0, 0x736E, 0x6337,      0,      0, 0x6C5A, 0x706D,
@@ -6209,6 +11767,16 @@ static const unsigned short utf8_to_euc_E9BD[] = {
  0xED52, 0xED53, 0x737A, 0xED54,      0, 0xED55, 0x737B, 0x7379,
       0,      0, 0xED56,      0,      0, 0xED57,      0,      0,
 };
+static const unsigned short utf8_to_euc_E9BD_x0213[] = {
+      0, 0xFE68,      0, 0xED40, 0xED41, 0xFE69, 0xFE6A, 0xED44,
+      0,      0, 0x736E, 0x6337,      0,      0, 0x6C5A, 0x706D,
+      0,      0, 0x736F, 0xFE6B, 0x7370, 0xFE6C, 0xED47, 0x7E75,
+ 0xFE6D,      0, 0xED4A,      0,      0, 0xFE6F, 0xED4C, 0x7372,
+ 0x7373, 0x7374, 0x4E70, 0x7371,      0,      0, 0x7375, 0x7376,
+ 0xED4D, 0xFE71, 0x7378,      0, 0x7377, 0xFE73, 0xED50, 0xED51,
+ 0xFE74, 0xED53, 0x737A, 0xED54,      0, 0xFE75, 0x737B, 0x7379,
+      0,      0, 0xED56,      0,      0, 0xED57,      0,      0,
+};
 static const unsigned short utf8_to_euc_E9BE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0x4E36,      0, 0xED58,
@@ -6219,6 +11787,16 @@ static const unsigned short utf8_to_euc_E9BE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_E9BE_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x4E36,      0, 0xED58,
+ 0x7E76, 0xED5A, 0xED5B,      0, 0x7E77, 0x737C, 0xED5D, 0x7E78,
+      0,      0,      0,      0, 0x737D, 0x6354, 0xED5F,      0,
+ 0x737E, 0xED60, 0x7E79, 0xED62,      0, 0xED63,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_EFA4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -6229,6 +11807,26 @@ static const unsigned short utf8_to_euc_EFA4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_EFA4_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x763B,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x742E, 0x754E,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x7B4F,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_EFA5_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x7649,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_EFA7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
@@ -6239,6 +11837,16 @@ static const unsigned short utf8_to_euc_EFA7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_EFA7_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x7E24,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x7D5D,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_EFA8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0, 0xF434, 0xF437,
@@ -6249,6 +11857,36 @@ static const unsigned short utf8_to_euc_EFA8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_EFA8_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x2F4B,
+ 0x2F57, 0x4F72,      0, 0xAE79, 0x757A, 0x775A, 0x776F,      0,
+      0, 0x793C, 0x793D, 0x7941,      0,      0,      0, 0x7B3A,
+ 0xF738, 0xF745, 0x7C2E,      0, 0xF96E,      0, 0x7C6A,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2E38, 0x2E49, 0x2E50, 0x2E63, 0x2E68, 0x2E6E, 0x2F2C, 0x2F2F,
+ 0x2F36, 0x2F5A, 0x2F5E, 0x4F61, 0x4F62, 0x7450, 0x745C, 0x745E,
+};
+static const unsigned short utf8_to_euc_EFA9_x0213[] = {
+ 0x7461, 0x7528, 0x752B, 0x7543, 0x7565, 0x7669, 0x7677, 0x7725,
+ 0x7755, 0xF029, 0x7825, 0x7927, 0x7933, 0x7934, 0x7937, 0x7938,
+ 0x7939, 0x793B, 0x793F, 0x7940, 0x794D, 0x7951, 0x7964, 0x7A2E,
+ 0xF450, 0x7A33, 0x7A3A, 0x7A44, 0x7A58, 0xF574, 0xF575, 0x7B27,
+ 0x7B6F, 0x7B79, 0x7C2F, 0x7C30, 0x7C38, 0x7C3D, 0xF969, 0x7C59,
+ 0x7D63, 0x7D76, 0x7D7B,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short utf8_to_euc_EFB9_x0213[] = {
+      0,      0,      0,      0,      0, 0x233E, 0x233D,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short utf8_to_euc_EFBC[] = {
       0, 0x212A, 0xF42A, 0x2174, 0x2170, 0x2173, 0x2175, 0xF429,
  0x214A, 0x214B, 0x2176, 0x215C, 0x2124, 0x215D, 0x2125, 0x213F,
@@ -6259,6 +11897,16 @@ static const unsigned short utf8_to_euc_EFBC[] = {
  0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357,
  0x2358, 0x2359, 0x235A, 0x214E, 0x2140, 0x214F, 0x2130, 0x2132,
 };
+static const unsigned short utf8_to_euc_EFBC_x0213[] = {
+      0, 0x212A, 0x2230, 0x2174, 0x2170, 0x2173, 0x2175, 0x222F,
+ 0x214A, 0x214B, 0x2176, 0x215C, 0x2124, 0x2231, 0x2125, 0x213F,
+ 0x2330, 0x2331, 0x2332, 0x2333, 0x2334, 0x2335, 0x2336, 0x2337,
+ 0x2338, 0x2339, 0x2127, 0x2128, 0x2163, 0x2161, 0x2164, 0x2129,
+ 0x2177, 0x2341, 0x2342, 0x2343, 0x2344, 0x2345, 0x2346, 0x2347,
+ 0x2348, 0x2349, 0x234A, 0x234B, 0x234C, 0x234D, 0x234E, 0x234F,
+ 0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357,
+ 0x2358, 0x2359, 0x235A, 0x214E, 0x2140, 0x214F, 0x2130, 0x2132,
+};
 static const unsigned short utf8_to_euc_EFBD[] = {
  0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
  0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
@@ -6279,6 +11927,16 @@ static const unsigned short utf8_to_euc_EFBD_ms[] = {
  0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
  0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
 };
+static const unsigned short utf8_to_euc_EFBD_x0213[] = {
+ 0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
+ 0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
+ 0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
+ 0x2378, 0x2379, 0x237A, 0x2150, 0x2143, 0x2151, 0x2232, 0x2256,
+ 0x2257, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
+ 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
+ 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
+ 0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
+};
 static const unsigned short utf8_to_euc_EFBE[] = {
  0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
  0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
@@ -6299,6 +11957,34 @@ static const unsigned short utf8_to_euc_EFBF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
+static const unsigned short utf8_to_euc_EFBF_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2131,      0, 0x216F,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+static const unsigned short *const utf8_to_euc_E1_x0213[] = {
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+ utf8_to_euc_E1B8_x0213,                0,                0,                0,
+                0, utf8_to_euc_E1BD_x0213,                0,                0,
+};
 static const unsigned short *const utf8_to_euc_E2[] = {
  utf8_to_euc_E280,                0,                0,                0,
  utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
@@ -6371,6 +12057,24 @@ static const unsigned short *const utf8_to_euc_E2_mac[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
 };
+static const unsigned short *const utf8_to_euc_E2_x0213[] = {
+ utf8_to_euc_E280_x0213, utf8_to_euc_E281_x0213, utf8_to_euc_E282_x0213,                0,
+ utf8_to_euc_E284_x0213, utf8_to_euc_E285_x0213, utf8_to_euc_E286_x0213, utf8_to_euc_E287_x0213,
+ utf8_to_euc_E288_x0213, utf8_to_euc_E289_x0213, utf8_to_euc_E28A_x0213, utf8_to_euc_E28B_x0213,
+ utf8_to_euc_E28C_x0213,                0, utf8_to_euc_E28E_x0213, utf8_to_euc_E28F_x0213,
+ utf8_to_euc_E290_x0213, utf8_to_euc_E291,                0, utf8_to_euc_E293_x0213,
+ utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296_x0213, utf8_to_euc_E297_x0213,
+ utf8_to_euc_E298_x0213, utf8_to_euc_E299_x0213,                0,                0,
+ utf8_to_euc_E29C_x0213, utf8_to_euc_E29D_x0213,                0,                0,
+                0,                0,                0,                0,
+ utf8_to_euc_E2A4_x0213,                0, utf8_to_euc_E2A6_x0213, utf8_to_euc_E2A7_x0213,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+};
 static const unsigned short *const utf8_to_euc_E3[] = {
  utf8_to_euc_E380, utf8_to_euc_E381, utf8_to_euc_E382, utf8_to_euc_E383,
                 0,                0,                0,                0,
@@ -6425,6 +12129,24 @@ static const unsigned short *const utf8_to_euc_E3_mac[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
 };
+static const unsigned short *const utf8_to_euc_E3_x0213[] = {
+ utf8_to_euc_E380_x0213, utf8_to_euc_E381, utf8_to_euc_E382_x0213, utf8_to_euc_E383_x0213,
+                0,                0,                0, utf8_to_euc_E387_x0213,
+ utf8_to_euc_E388, utf8_to_euc_E389_x0213, utf8_to_euc_E38A_x0213, utf8_to_euc_E38B_x0213,
+ utf8_to_euc_E38C, utf8_to_euc_E38D, utf8_to_euc_E38E, utf8_to_euc_E38F_x0213,
+ utf8_to_euc_E390_x0213, utf8_to_euc_E391_x0213, utf8_to_euc_E392_x0213, utf8_to_euc_E393_x0213,
+ utf8_to_euc_E394_x0213, utf8_to_euc_E395_x0213, utf8_to_euc_E396_x0213, utf8_to_euc_E397_x0213,
+ utf8_to_euc_E398_x0213, utf8_to_euc_E399_x0213, utf8_to_euc_E39A_x0213, utf8_to_euc_E39B_x0213,
+                0, utf8_to_euc_E39D_x0213, utf8_to_euc_E39E_x0213, utf8_to_euc_E39F_x0213,
+ utf8_to_euc_E3A0_x0213, utf8_to_euc_E3A1_x0213,                0, utf8_to_euc_E3A3_x0213,
+ utf8_to_euc_E3A4_x0213, utf8_to_euc_E3A5_x0213,                0,                0,
+                0, utf8_to_euc_E3A9_x0213,                0, utf8_to_euc_E3AB_x0213,
+ utf8_to_euc_E3AC_x0213, utf8_to_euc_E3AD_x0213, utf8_to_euc_E3AE_x0213, utf8_to_euc_E3AF_x0213,
+ utf8_to_euc_E3B0_x0213,                0,                0, utf8_to_euc_E3B3_x0213,
+ utf8_to_euc_E3B4_x0213, utf8_to_euc_E3B5_x0213, utf8_to_euc_E3B6_x0213, utf8_to_euc_E3B7_x0213,
+ utf8_to_euc_E3B8_x0213, utf8_to_euc_E3B9_x0213, utf8_to_euc_E3BA_x0213,                0,
+                0, utf8_to_euc_E3BD_x0213, utf8_to_euc_E3BE_x0213, utf8_to_euc_E3BF_x0213,
+};
 static const unsigned short *const utf8_to_euc_E4[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
@@ -6443,6 +12165,24 @@ static const unsigned short *const utf8_to_euc_E4[] = {
  utf8_to_euc_E4B8, utf8_to_euc_E4B9, utf8_to_euc_E4BA, utf8_to_euc_E4BB,
  utf8_to_euc_E4BC, utf8_to_euc_E4BD, utf8_to_euc_E4BE, utf8_to_euc_E4BF,
 };
+static const unsigned short *const utf8_to_euc_E4_x0213[] = {
+ utf8_to_euc_E480_x0213, utf8_to_euc_E481_x0213, utf8_to_euc_E482_x0213,                0,
+ utf8_to_euc_E484_x0213, utf8_to_euc_E485_x0213, utf8_to_euc_E486_x0213, utf8_to_euc_E487_x0213,
+ utf8_to_euc_E488_x0213, utf8_to_euc_E489_x0213,                0, utf8_to_euc_E48B_x0213,
+ utf8_to_euc_E48C_x0213, utf8_to_euc_E48D_x0213,                0, utf8_to_euc_E48F_x0213,
+ utf8_to_euc_E490_x0213, utf8_to_euc_E491_x0213, utf8_to_euc_E492_x0213, utf8_to_euc_E493_x0213,
+ utf8_to_euc_E494_x0213, utf8_to_euc_E495_x0213, utf8_to_euc_E496_x0213, utf8_to_euc_E497_x0213,
+ utf8_to_euc_E498_x0213, utf8_to_euc_E499_x0213, utf8_to_euc_E49A_x0213,                0,
+ utf8_to_euc_E49C_x0213, utf8_to_euc_E49D_x0213,                0, utf8_to_euc_E49F_x0213,
+ utf8_to_euc_E4A0_x0213, utf8_to_euc_E4A1_x0213, utf8_to_euc_E4A2_x0213,                0,
+                0,                0, utf8_to_euc_E4A6_x0213, utf8_to_euc_E4A7_x0213,
+ utf8_to_euc_E4A8_x0213,                0, utf8_to_euc_E4AA_x0213,                0,
+ utf8_to_euc_E4AC_x0213,                0,                0, utf8_to_euc_E4AF_x0213,
+ utf8_to_euc_E4B0_x0213,                0,                0, utf8_to_euc_E4B3_x0213,
+ utf8_to_euc_E4B4_x0213, utf8_to_euc_E4B5_x0213,                0,                0,
+ utf8_to_euc_E4B8_x0213, utf8_to_euc_E4B9_x0213, utf8_to_euc_E4BA_x0213, utf8_to_euc_E4BB_x0213,
+ utf8_to_euc_E4BC_x0213, utf8_to_euc_E4BD_x0213, utf8_to_euc_E4BE_x0213, utf8_to_euc_E4BF_x0213,
+};
 static const unsigned short *const utf8_to_euc_E5[] = {
  utf8_to_euc_E580, utf8_to_euc_E581, utf8_to_euc_E582, utf8_to_euc_E583,
  utf8_to_euc_E584, utf8_to_euc_E585, utf8_to_euc_E586, utf8_to_euc_E587,
@@ -6461,6 +12201,24 @@ static const unsigned short *const utf8_to_euc_E5[] = {
  utf8_to_euc_E5B8, utf8_to_euc_E5B9, utf8_to_euc_E5BA, utf8_to_euc_E5BB,
  utf8_to_euc_E5BC, utf8_to_euc_E5BD, utf8_to_euc_E5BE, utf8_to_euc_E5BF,
 };
+static const unsigned short *const utf8_to_euc_E5_x0213[] = {
+ utf8_to_euc_E580_x0213, utf8_to_euc_E581_x0213, utf8_to_euc_E582_x0213, utf8_to_euc_E583_x0213,
+ utf8_to_euc_E584_x0213, utf8_to_euc_E585_x0213, utf8_to_euc_E586_x0213, utf8_to_euc_E587_x0213,
+ utf8_to_euc_E588_x0213, utf8_to_euc_E589_x0213, utf8_to_euc_E58A_x0213, utf8_to_euc_E58B_x0213,
+ utf8_to_euc_E58C_x0213, utf8_to_euc_E58D_x0213, utf8_to_euc_E58E_x0213, utf8_to_euc_E58F_x0213,
+ utf8_to_euc_E590_x0213, utf8_to_euc_E591_x0213, utf8_to_euc_E592_x0213, utf8_to_euc_E593_x0213,
+ utf8_to_euc_E594_x0213, utf8_to_euc_E595_x0213, utf8_to_euc_E596_x0213, utf8_to_euc_E597_x0213,
+ utf8_to_euc_E598_x0213, utf8_to_euc_E599_x0213, utf8_to_euc_E59A_x0213, utf8_to_euc_E59B_x0213,
+ utf8_to_euc_E59C_x0213, utf8_to_euc_E59D_x0213, utf8_to_euc_E59E_x0213, utf8_to_euc_E59F_x0213,
+ utf8_to_euc_E5A0_x0213, utf8_to_euc_E5A1_x0213, utf8_to_euc_E5A2_x0213, utf8_to_euc_E5A3_x0213,
+ utf8_to_euc_E5A4_x0213, utf8_to_euc_E5A5_x0213, utf8_to_euc_E5A6_x0213, utf8_to_euc_E5A7_x0213,
+ utf8_to_euc_E5A8_x0213, utf8_to_euc_E5A9_x0213, utf8_to_euc_E5AA_x0213, utf8_to_euc_E5AB_x0213,
+ utf8_to_euc_E5AC_x0213, utf8_to_euc_E5AD_x0213, utf8_to_euc_E5AE_x0213, utf8_to_euc_E5AF_x0213,
+ utf8_to_euc_E5B0_x0213, utf8_to_euc_E5B1_x0213, utf8_to_euc_E5B2_x0213, utf8_to_euc_E5B3_x0213,
+ utf8_to_euc_E5B4_x0213, utf8_to_euc_E5B5_x0213, utf8_to_euc_E5B6_x0213, utf8_to_euc_E5B7_x0213,
+ utf8_to_euc_E5B8_x0213, utf8_to_euc_E5B9_x0213, utf8_to_euc_E5BA_x0213, utf8_to_euc_E5BB_x0213,
+ utf8_to_euc_E5BC_x0213, utf8_to_euc_E5BD_x0213, utf8_to_euc_E5BE_x0213, utf8_to_euc_E5BF_x0213,
+};
 static const unsigned short *const utf8_to_euc_E6[] = {
  utf8_to_euc_E680, utf8_to_euc_E681, utf8_to_euc_E682, utf8_to_euc_E683,
  utf8_to_euc_E684, utf8_to_euc_E685, utf8_to_euc_E686, utf8_to_euc_E687,
@@ -6479,6 +12237,24 @@ static const unsigned short *const utf8_to_euc_E6[] = {
  utf8_to_euc_E6B8, utf8_to_euc_E6B9, utf8_to_euc_E6BA, utf8_to_euc_E6BB,
  utf8_to_euc_E6BC, utf8_to_euc_E6BD, utf8_to_euc_E6BE, utf8_to_euc_E6BF,
 };
+static const unsigned short *const utf8_to_euc_E6_x0213[] = {
+ utf8_to_euc_E680_x0213, utf8_to_euc_E681_x0213, utf8_to_euc_E682_x0213, utf8_to_euc_E683_x0213,
+ utf8_to_euc_E684_x0213, utf8_to_euc_E685_x0213, utf8_to_euc_E686_x0213, utf8_to_euc_E687_x0213,
+ utf8_to_euc_E688_x0213, utf8_to_euc_E689_x0213, utf8_to_euc_E68A_x0213, utf8_to_euc_E68B_x0213,
+ utf8_to_euc_E68C_x0213, utf8_to_euc_E68D_x0213, utf8_to_euc_E68E_x0213, utf8_to_euc_E68F_x0213,
+ utf8_to_euc_E690_x0213, utf8_to_euc_E691_x0213, utf8_to_euc_E692_x0213, utf8_to_euc_E693_x0213,
+ utf8_to_euc_E694_x0213, utf8_to_euc_E695_x0213, utf8_to_euc_E696_x0213, utf8_to_euc_E697_x0213,
+ utf8_to_euc_E698_x0213, utf8_to_euc_E699_x0213, utf8_to_euc_E69A_x0213, utf8_to_euc_E69B_x0213,
+ utf8_to_euc_E69C_x0213, utf8_to_euc_E69D_x0213, utf8_to_euc_E69E_x0213, utf8_to_euc_E69F_x0213,
+ utf8_to_euc_E6A0_x0213, utf8_to_euc_E6A1_x0213, utf8_to_euc_E6A2_x0213, utf8_to_euc_E6A3_x0213,
+ utf8_to_euc_E6A4_x0213, utf8_to_euc_E6A5_x0213, utf8_to_euc_E6A6_x0213, utf8_to_euc_E6A7_x0213,
+ utf8_to_euc_E6A8_x0213, utf8_to_euc_E6A9_x0213, utf8_to_euc_E6AA_x0213, utf8_to_euc_E6AB_x0213,
+ utf8_to_euc_E6AC_x0213, utf8_to_euc_E6AD_x0213, utf8_to_euc_E6AE_x0213, utf8_to_euc_E6AF_x0213,
+ utf8_to_euc_E6B0_x0213, utf8_to_euc_E6B1_x0213, utf8_to_euc_E6B2_x0213, utf8_to_euc_E6B3_x0213,
+ utf8_to_euc_E6B4_x0213, utf8_to_euc_E6B5_x0213, utf8_to_euc_E6B6_x0213, utf8_to_euc_E6B7_x0213,
+ utf8_to_euc_E6B8_x0213, utf8_to_euc_E6B9_x0213, utf8_to_euc_E6BA_x0213, utf8_to_euc_E6BB_x0213,
+ utf8_to_euc_E6BC_x0213, utf8_to_euc_E6BD_x0213, utf8_to_euc_E6BE_x0213, utf8_to_euc_E6BF_x0213,
+};
 static const unsigned short *const utf8_to_euc_E7[] = {
  utf8_to_euc_E780, utf8_to_euc_E781, utf8_to_euc_E782, utf8_to_euc_E783,
  utf8_to_euc_E784, utf8_to_euc_E785, utf8_to_euc_E786, utf8_to_euc_E787,
@@ -6497,6 +12273,24 @@ static const unsigned short *const utf8_to_euc_E7[] = {
  utf8_to_euc_E7B8, utf8_to_euc_E7B9, utf8_to_euc_E7BA,                0,
  utf8_to_euc_E7BC, utf8_to_euc_E7BD, utf8_to_euc_E7BE, utf8_to_euc_E7BF,
 };
+static const unsigned short *const utf8_to_euc_E7_x0213[] = {
+ utf8_to_euc_E780_x0213, utf8_to_euc_E781_x0213, utf8_to_euc_E782_x0213, utf8_to_euc_E783_x0213,
+ utf8_to_euc_E784_x0213, utf8_to_euc_E785_x0213, utf8_to_euc_E786_x0213, utf8_to_euc_E787_x0213,
+ utf8_to_euc_E788_x0213, utf8_to_euc_E789_x0213, utf8_to_euc_E78A_x0213, utf8_to_euc_E78B_x0213,
+ utf8_to_euc_E78C_x0213, utf8_to_euc_E78D_x0213, utf8_to_euc_E78E_x0213, utf8_to_euc_E78F_x0213,
+ utf8_to_euc_E790_x0213, utf8_to_euc_E791_x0213, utf8_to_euc_E792_x0213, utf8_to_euc_E793_x0213,
+ utf8_to_euc_E794_x0213, utf8_to_euc_E795_x0213, utf8_to_euc_E796_x0213, utf8_to_euc_E797_x0213,
+ utf8_to_euc_E798_x0213, utf8_to_euc_E799_x0213, utf8_to_euc_E79A_x0213, utf8_to_euc_E79B_x0213,
+ utf8_to_euc_E79C_x0213, utf8_to_euc_E79D_x0213, utf8_to_euc_E79E_x0213, utf8_to_euc_E79F_x0213,
+ utf8_to_euc_E7A0_x0213, utf8_to_euc_E7A1_x0213, utf8_to_euc_E7A2_x0213, utf8_to_euc_E7A3_x0213,
+ utf8_to_euc_E7A4_x0213, utf8_to_euc_E7A5_x0213, utf8_to_euc_E7A6_x0213, utf8_to_euc_E7A7_x0213,
+ utf8_to_euc_E7A8_x0213, utf8_to_euc_E7A9_x0213, utf8_to_euc_E7AA_x0213, utf8_to_euc_E7AB_x0213,
+ utf8_to_euc_E7AC_x0213, utf8_to_euc_E7AD_x0213, utf8_to_euc_E7AE_x0213, utf8_to_euc_E7AF_x0213,
+ utf8_to_euc_E7B0_x0213, utf8_to_euc_E7B1_x0213, utf8_to_euc_E7B2_x0213, utf8_to_euc_E7B3_x0213,
+ utf8_to_euc_E7B4_x0213, utf8_to_euc_E7B5_x0213, utf8_to_euc_E7B6_x0213, utf8_to_euc_E7B7_x0213,
+ utf8_to_euc_E7B8_x0213, utf8_to_euc_E7B9_x0213, utf8_to_euc_E7BA_x0213,                0,
+ utf8_to_euc_E7BC_x0213, utf8_to_euc_E7BD_x0213, utf8_to_euc_E7BE_x0213, utf8_to_euc_E7BF_x0213,
+};
 static const unsigned short *const utf8_to_euc_E8[] = {
  utf8_to_euc_E880, utf8_to_euc_E881, utf8_to_euc_E882, utf8_to_euc_E883,
  utf8_to_euc_E884, utf8_to_euc_E885, utf8_to_euc_E886, utf8_to_euc_E887,
@@ -6515,6 +12309,24 @@ static const unsigned short *const utf8_to_euc_E8[] = {
  utf8_to_euc_E8B8, utf8_to_euc_E8B9, utf8_to_euc_E8BA, utf8_to_euc_E8BB,
  utf8_to_euc_E8BC, utf8_to_euc_E8BD, utf8_to_euc_E8BE, utf8_to_euc_E8BF,
 };
+static const unsigned short *const utf8_to_euc_E8_x0213[] = {
+ utf8_to_euc_E880_x0213, utf8_to_euc_E881_x0213, utf8_to_euc_E882_x0213, utf8_to_euc_E883_x0213,
+ utf8_to_euc_E884_x0213, utf8_to_euc_E885_x0213, utf8_to_euc_E886_x0213, utf8_to_euc_E887_x0213,
+ utf8_to_euc_E888_x0213, utf8_to_euc_E889_x0213, utf8_to_euc_E88A_x0213, utf8_to_euc_E88B_x0213,
+ utf8_to_euc_E88C_x0213, utf8_to_euc_E88D_x0213, utf8_to_euc_E88E_x0213, utf8_to_euc_E88F_x0213,
+ utf8_to_euc_E890_x0213, utf8_to_euc_E891_x0213, utf8_to_euc_E892_x0213, utf8_to_euc_E893_x0213,
+ utf8_to_euc_E894_x0213, utf8_to_euc_E895_x0213, utf8_to_euc_E896_x0213, utf8_to_euc_E897_x0213,
+ utf8_to_euc_E898_x0213, utf8_to_euc_E899_x0213, utf8_to_euc_E89A_x0213, utf8_to_euc_E89B_x0213,
+ utf8_to_euc_E89C_x0213, utf8_to_euc_E89D_x0213, utf8_to_euc_E89E_x0213, utf8_to_euc_E89F_x0213,
+ utf8_to_euc_E8A0_x0213, utf8_to_euc_E8A1_x0213, utf8_to_euc_E8A2_x0213, utf8_to_euc_E8A3_x0213,
+ utf8_to_euc_E8A4_x0213, utf8_to_euc_E8A5_x0213, utf8_to_euc_E8A6_x0213, utf8_to_euc_E8A7_x0213,
+ utf8_to_euc_E8A8_x0213, utf8_to_euc_E8A9_x0213, utf8_to_euc_E8AA_x0213, utf8_to_euc_E8AB_x0213,
+ utf8_to_euc_E8AC_x0213, utf8_to_euc_E8AD_x0213, utf8_to_euc_E8AE_x0213,                0,
+ utf8_to_euc_E8B0_x0213, utf8_to_euc_E8B1_x0213, utf8_to_euc_E8B2_x0213, utf8_to_euc_E8B3_x0213,
+ utf8_to_euc_E8B4_x0213, utf8_to_euc_E8B5_x0213, utf8_to_euc_E8B6_x0213, utf8_to_euc_E8B7_x0213,
+ utf8_to_euc_E8B8_x0213, utf8_to_euc_E8B9_x0213, utf8_to_euc_E8BA_x0213, utf8_to_euc_E8BB_x0213,
+ utf8_to_euc_E8BC_x0213, utf8_to_euc_E8BD_x0213, utf8_to_euc_E8BE_x0213, utf8_to_euc_E8BF_x0213,
+};
 static const unsigned short *const utf8_to_euc_E9[] = {
  utf8_to_euc_E980, utf8_to_euc_E981, utf8_to_euc_E982, utf8_to_euc_E983,
  utf8_to_euc_E984, utf8_to_euc_E985, utf8_to_euc_E986, utf8_to_euc_E987,
@@ -6533,6 +12345,24 @@ static const unsigned short *const utf8_to_euc_E9[] = {
  utf8_to_euc_E9B8, utf8_to_euc_E9B9, utf8_to_euc_E9BA, utf8_to_euc_E9BB,
  utf8_to_euc_E9BC, utf8_to_euc_E9BD, utf8_to_euc_E9BE,                0,
 };
+static const unsigned short *const utf8_to_euc_E9_x0213[] = {
+ utf8_to_euc_E980_x0213, utf8_to_euc_E981_x0213, utf8_to_euc_E982_x0213, utf8_to_euc_E983_x0213,
+ utf8_to_euc_E984_x0213, utf8_to_euc_E985_x0213, utf8_to_euc_E986_x0213, utf8_to_euc_E987_x0213,
+ utf8_to_euc_E988_x0213, utf8_to_euc_E989_x0213, utf8_to_euc_E98A_x0213, utf8_to_euc_E98B_x0213,
+ utf8_to_euc_E98C_x0213, utf8_to_euc_E98D_x0213, utf8_to_euc_E98E_x0213, utf8_to_euc_E98F_x0213,
+ utf8_to_euc_E990_x0213, utf8_to_euc_E991_x0213, utf8_to_euc_E992,                0,
+                0, utf8_to_euc_E995_x0213, utf8_to_euc_E996_x0213, utf8_to_euc_E997_x0213,
+ utf8_to_euc_E998_x0213, utf8_to_euc_E999_x0213, utf8_to_euc_E99A_x0213, utf8_to_euc_E99B_x0213,
+ utf8_to_euc_E99C_x0213, utf8_to_euc_E99D_x0213, utf8_to_euc_E99E_x0213, utf8_to_euc_E99F_x0213,
+ utf8_to_euc_E9A0_x0213, utf8_to_euc_E9A1_x0213, utf8_to_euc_E9A2_x0213, utf8_to_euc_E9A3_x0213,
+ utf8_to_euc_E9A4_x0213, utf8_to_euc_E9A5_x0213, utf8_to_euc_E9A6_x0213, utf8_to_euc_E9A7_x0213,
+ utf8_to_euc_E9A8_x0213, utf8_to_euc_E9A9_x0213, utf8_to_euc_E9AA_x0213, utf8_to_euc_E9AB_x0213,
+ utf8_to_euc_E9AC_x0213, utf8_to_euc_E9AD_x0213, utf8_to_euc_E9AE_x0213, utf8_to_euc_E9AF_x0213,
+ utf8_to_euc_E9B0_x0213, utf8_to_euc_E9B1_x0213,                0, utf8_to_euc_E9B3_x0213,
+ utf8_to_euc_E9B4_x0213, utf8_to_euc_E9B5_x0213, utf8_to_euc_E9B6_x0213, utf8_to_euc_E9B7_x0213,
+ utf8_to_euc_E9B8_x0213, utf8_to_euc_E9B9_x0213, utf8_to_euc_E9BA_x0213, utf8_to_euc_E9BB_x0213,
+ utf8_to_euc_E9BC_x0213, utf8_to_euc_E9BD_x0213, utf8_to_euc_E9BE_x0213,                0,
+};
 static const unsigned short *const utf8_to_euc_EF[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
@@ -6569,6 +12399,24 @@ static const unsigned short *const utf8_to_euc_EF_ms[] = {
                 0,                0,                0,                0,
  utf8_to_euc_EFBC, utf8_to_euc_EFBD_ms, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
 };
+static const unsigned short *const utf8_to_euc_EF_x0213[] = {
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+ utf8_to_euc_EFA4_x0213, utf8_to_euc_EFA5_x0213,                0, utf8_to_euc_EFA7_x0213,
+ utf8_to_euc_EFA8_x0213, utf8_to_euc_EFA9_x0213,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0, utf8_to_euc_EFB9_x0213,                0,                0,
+ utf8_to_euc_EFBC_x0213, utf8_to_euc_EFBD_x0213, utf8_to_euc_EFBE, utf8_to_euc_EFBF_x0213,
+};
 const unsigned short *const utf8_to_euc_2bytes[] = {
               0,              0,              0,              0,
               0,              0,              0,              0,
@@ -6689,6 +12537,36 @@ const unsigned short *const utf8_to_euc_2bytes_mac[] = {
               0,              0,              0,              0,
               0,              0,              0,              0,
 };
+const unsigned short *const utf8_to_euc_2bytes_x0213[] = {
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0, utf8_to_euc_C2_x0213, utf8_to_euc_C3_x0213,
+ utf8_to_euc_C4_x0213, utf8_to_euc_C5_x0213, utf8_to_euc_C6_x0213, utf8_to_euc_C7_x0213,
+              0, utf8_to_euc_C9_x0213, utf8_to_euc_CA_x0213, utf8_to_euc_CB_x0213,
+ utf8_to_euc_CC_x0213, utf8_to_euc_CD_x0213, utf8_to_euc_CE, utf8_to_euc_CF_x0213,
+ utf8_to_euc_D0, utf8_to_euc_D1,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+};
 const unsigned short *const *const utf8_to_euc_3bytes[] = {
               0,              0, utf8_to_euc_E2, utf8_to_euc_E3,
  utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
@@ -6713,6 +12591,12 @@ const unsigned short *const *const utf8_to_euc_3bytes_mac[] = {
  utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
               0,              0,              0, utf8_to_euc_EF_ms,
 };
+const unsigned short *const *const utf8_to_euc_3bytes_x0213[] = {
+              0, utf8_to_euc_E1_x0213, utf8_to_euc_E2_x0213, utf8_to_euc_E3_x0213,
+ utf8_to_euc_E4_x0213, utf8_to_euc_E5_x0213, utf8_to_euc_E6_x0213, utf8_to_euc_E7_x0213,
+ utf8_to_euc_E8_x0213, utf8_to_euc_E9_x0213,              0,              0,
+              0,              0,              0, utf8_to_euc_EF_x0213,
+};
 
 #ifdef UNICODE_NORMALIZATION
 
diff --git a/ext/nkf/nkf-utf8/utf8tbl.h b/ext/nkf/nkf-utf8/utf8tbl.h
index c3d7709ef7..54a34271dd 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.h
+++ b/ext/nkf/nkf-utf8/utf8tbl.h
@@ -1,7 +1,6 @@
 /*
- * utf8tbl.h - Header file for Convertion Table
+ * utf8tbl.h - Header file for Conversion Table
  *
- * $Id$
  */
 
 #ifndef _UTF8TBL_H_
@@ -14,7 +13,17 @@ extern const unsigned short euc_to_utf8_1byte[];
 extern const unsigned short *const euc_to_utf8_2bytes[];
 extern const unsigned short *const euc_to_utf8_2bytes_ms[];
 extern const unsigned short *const euc_to_utf8_2bytes_mac[];
+extern const unsigned short *const euc_to_utf8_2bytes_x0213[];
 extern const unsigned short *const x0212_to_utf8_2bytes[];
+extern const unsigned short *const x0212_to_utf8_2bytes_x0213[];
+#define sizeof_x0213_combining_chars 5
+#define sizeof_x0213_combining_table 25
+#define sizeof_x0213_1_surrogate_table 26
+#define sizeof_x0213_2_surrogate_table 277
+extern const unsigned short x0213_combining_chars[sizeof_x0213_combining_chars];
+extern const unsigned short x0213_combining_table[sizeof_x0213_combining_table][3];
+extern const unsigned short x0213_1_surrogate_table[sizeof_x0213_1_surrogate_table][3];
+extern const unsigned short x0213_2_surrogate_table[sizeof_x0213_2_surrogate_table][3];
 #endif /* UTF8_OUTPUT_ENABLE */
 
 #ifdef UTF8_INPUT_ENABLE
@@ -26,10 +35,12 @@ extern const unsigned short *const utf8_to_euc_2bytes[];
 extern const unsigned short *const utf8_to_euc_2bytes_ms[];
 extern const unsigned short *const utf8_to_euc_2bytes_932[];
 extern const unsigned short *const utf8_to_euc_2bytes_mac[];
+extern const unsigned short *const utf8_to_euc_2bytes_x0213[];
 extern const unsigned short *const *const utf8_to_euc_3bytes[];
 extern const unsigned short *const *const utf8_to_euc_3bytes_ms[];
 extern const unsigned short *const *const utf8_to_euc_3bytes_932[];
 extern const unsigned short *const *const utf8_to_euc_3bytes_mac[];
+extern const unsigned short *const *const utf8_to_euc_3bytes_x0213[];
 #endif /* UTF8_INPUT_ENABLE */
 
 #ifdef UNICODE_NORMALIZATION
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 05fd36de64..37717e4799 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -135,10 +135,9 @@ int nkf_split_options(const char *arg)
 static VALUE
 rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
 {
-    volatile VALUE tmp;
+    VALUE tmp;
     reinit();
-    StringValue(opt);
-    nkf_split_options(RSTRING_PTR(opt));
+    nkf_split_options(StringValueCStr(opt));
     if (!output_encoding) rb_raise(rb_eArgError, "no output encoding given");
 
     switch (nkf_enc_to_index(output_encoding)) {
@@ -153,26 +152,29 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
     incsize = INCSIZE;
 
     input_ctr = 0;
-    StringValue(src);
-    input = (unsigned char *)RSTRING_PTR(src);
+    input = (unsigned char *)StringValuePtr(src);
     i_len = RSTRING_LENINT(src);
-    tmp = result = rb_str_new(0, i_len*3 + 10);
+    tmp = rb_str_new(0, i_len*3 + 10);
 
     output_ctr = 0;
-    output     = (unsigned char *)RSTRING_PTR(result);
-    o_len      = RSTRING_LENINT(result);
+    output     = (unsigned char *)RSTRING_PTR(tmp);
+    o_len      = RSTRING_LENINT(tmp);
     *output    = '\0';
 
+    /* use _result_ begin*/
+    result = tmp;
     kanji_convert(NULL);
-    rb_str_set_len(result, output_ctr);
-    OBJ_INFECT(result, src);
+    result = Qnil;
+    /* use _result_ end */
+
+    rb_str_set_len(tmp, output_ctr);
 
     if (mimeout_f)
-	rb_enc_associate(result, rb_usascii_encoding());
+	rb_enc_associate(tmp, rb_usascii_encoding());
     else
-	rb_enc_associate(result, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
+	rb_enc_associate(tmp, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
 
-    return result;
+    return tmp;
 }
 
 
@@ -190,8 +192,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
     reinit();
 
     input_ctr = 0;
-    StringValue(src);
-    input = (unsigned char *)RSTRING_PTR(src);
+    input = (unsigned char *)StringValuePtr(src);
     i_len = RSTRING_LENINT(src);
 
     guess_f = TRUE;
@@ -473,7 +474,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
  */
 
 void
-Init_nkf()
+Init_nkf(void)
 {
     VALUE mNKF = rb_define_module("NKF");
 
diff --git a/ext/objspace/depend b/ext/objspace/depend
index 83a08f7078..18be4fe8a8 100644
--- a/ext/objspace/depend
+++ b/ext/objspace/depend
@@ -1,3 +1,73 @@
-objspace.o: $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/io.h \
-	    $(hdrdir)/ruby/re.h $(top_srcdir)/node.h $(top_srcdir)/gc.h \
-	    $(top_srcdir)/regint.h $(top_srcdir)/internal.h
+# AUTOGENERATED DEPENDENCIES START
+object_tracing.o: $(RUBY_EXTCONF_H)
+object_tracing.o: $(arch_hdrdir)/ruby/config.h
+object_tracing.o: $(hdrdir)/ruby.h
+object_tracing.o: $(hdrdir)/ruby/assert.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/intern.h
+object_tracing.o: $(hdrdir)/ruby/missing.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)/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.h
+objspace.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+objspace_dump.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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_opts.h
+objspace_dump.o: objspace.h
+objspace_dump.o: objspace_dump.c
+objspace_dump.o: {$(VPATH)}id.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/objspace/extconf.rb b/ext/objspace/extconf.rb
index 23a42c4c20..d0c2dbd02b 100644
--- a/ext/objspace/extconf.rb
+++ b/ext/objspace/extconf.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
 $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
new file mode 100644
index 0000000000..a057ac2a96
--- /dev/null
+++ b/ext/objspace/object_tracing.c
@@ -0,0 +1,500 @@
+/**********************************************************************
+
+  object_tracing.c - Object Tracing mechanism/ObjectSpace extender for MRI.
+
+  $Author$
+  created at: Mon May 27 16:27:44 2013
+
+  NOTE: This extension library is not expected to exist except C Ruby.
+  NOTE: This feature is an example usage of internal event tracing APIs.
+
+  All the files in this distribution are covered under the Ruby's
+  license (see the file COPYING).
+
+**********************************************************************/
+
+#include "internal.h"
+#include "ruby/debug.h"
+#include "objspace.h"
+
+struct traceobj_arg {
+    int running;
+    int keep_remains;
+    VALUE newobj_trace;
+    VALUE freeobj_trace;
+    st_table *object_table; /* obj (VALUE) -> allocation_info */
+    st_table *str_table;    /* cstr -> refcount */
+    struct traceobj_arg *prev_traceobj_arg;
+};
+
+static const char *
+make_unique_str(st_table *tbl, const char *str, long len)
+{
+    if (!str) {
+	return NULL;
+    }
+    else {
+	st_data_t n;
+	char *result;
+
+	if (st_lookup(tbl, (st_data_t)str, &n)) {
+	    st_insert(tbl, (st_data_t)str, n+1);
+	    st_get_key(tbl, (st_data_t)str, &n);
+	    result = (char *)n;
+	}
+	else {
+	    result = (char *)ruby_xmalloc(len+1);
+	    strncpy(result, str, len);
+	    result[len] = 0;
+	    st_add_direct(tbl, (st_data_t)result, 1);
+	}
+	return result;
+    }
+}
+
+static void
+delete_unique_str(st_table *tbl, const char *str)
+{
+    if (str) {
+	st_data_t n;
+
+	st_lookup(tbl, (st_data_t)str, &n);
+	if (n == 1) {
+	    n = (st_data_t)str;
+	    st_delete(tbl, &n, 0);
+	    ruby_xfree((char *)n);
+	}
+	else {
+	    st_insert(tbl, (st_data_t)str, n-1);
+	}
+    }
+}
+
+static void
+newobj_i(VALUE tpval, void *data)
+{
+    struct traceobj_arg *arg = (struct traceobj_arg *)data;
+    rb_trace_arg_t *tparg = rb_tracearg_from_tracepoint(tpval);
+    VALUE obj = rb_tracearg_object(tparg);
+    VALUE path = rb_tracearg_path(tparg);
+    VALUE line = rb_tracearg_lineno(tparg);
+    VALUE mid = rb_tracearg_method_id(tparg);
+    VALUE klass = rb_tracearg_defined_class(tparg);
+    struct allocation_info *info;
+    const char *path_cstr = RTEST(path) ? make_unique_str(arg->str_table, RSTRING_PTR(path), RSTRING_LEN(path)) : 0;
+    VALUE class_path = (RTEST(klass) && !OBJ_FROZEN(klass)) ? rb_class_path_cached(klass) : Qnil;
+    const char *class_path_cstr = RTEST(class_path) ? make_unique_str(arg->str_table, RSTRING_PTR(class_path), RSTRING_LEN(class_path)) : 0;
+    st_data_t v;
+
+    if (st_lookup(arg->object_table, (st_data_t)obj, &v)) {
+	info = (struct allocation_info *)v;
+	if (arg->keep_remains) {
+	    if (info->living) {
+		/* do nothing. there is possibility to keep living if FREEOBJ events while suppressing tracing */
+	    }
+	}
+	/* reuse info */
+	delete_unique_str(arg->str_table, info->path);
+	delete_unique_str(arg->str_table, info->class_path);
+    }
+    else {
+	info = (struct allocation_info *)ruby_xmalloc(sizeof(struct allocation_info));
+    }
+    info->living = 1;
+    info->flags = RBASIC(obj)->flags;
+    info->klass = RBASIC_CLASS(obj);
+
+    info->path = path_cstr;
+    info->line = NUM2INT(line);
+    info->mid = mid;
+    info->class_path = class_path_cstr;
+    info->generation = rb_gc_count();
+    st_insert(arg->object_table, (st_data_t)obj, (st_data_t)info);
+}
+
+static void
+freeobj_i(VALUE tpval, void *data)
+{
+    struct traceobj_arg *arg = (struct traceobj_arg *)data;
+    rb_trace_arg_t *tparg = rb_tracearg_from_tracepoint(tpval);
+    st_data_t obj = (st_data_t)rb_tracearg_object(tparg);
+    st_data_t v;
+    struct allocation_info *info;
+
+    if (arg->keep_remains) {
+	if (st_lookup(arg->object_table, obj, &v)) {
+	    info = (struct allocation_info *)v;
+	    info->living = 0;
+	}
+    }
+    else {
+	if (st_delete(arg->object_table, &obj, &v)) {
+	    info = (struct allocation_info *)v;
+	    delete_unique_str(arg->str_table, info->path);
+	    delete_unique_str(arg->str_table, info->class_path);
+	    ruby_xfree(info);
+	}
+    }
+}
+
+static int
+free_keys_i(st_data_t key, st_data_t value, st_data_t data)
+{
+    ruby_xfree((void *)key);
+    return ST_CONTINUE;
+}
+
+static int
+free_values_i(st_data_t key, st_data_t value, st_data_t data)
+{
+    ruby_xfree((void *)value);
+    return ST_CONTINUE;
+}
+
+static struct traceobj_arg *tmp_trace_arg; /* TODO: Do not use global variables */
+static int tmp_keep_remains;               /* TODO: Do not use global variables */
+
+static struct traceobj_arg *
+get_traceobj_arg(void)
+{
+    if (tmp_trace_arg == 0) {
+	tmp_trace_arg = ALLOC_N(struct traceobj_arg, 1);
+	tmp_trace_arg->running = 0;
+	tmp_trace_arg->keep_remains = tmp_keep_remains;
+	tmp_trace_arg->newobj_trace = 0;
+	tmp_trace_arg->freeobj_trace = 0;
+	tmp_trace_arg->object_table = st_init_numtable();
+	tmp_trace_arg->str_table = st_init_strtable();
+    }
+    return tmp_trace_arg;
+}
+
+/*
+ * call-seq: trace_object_allocations_start
+ *
+ * Starts tracing object allocations.
+ *
+ */
+static VALUE
+trace_object_allocations_start(VALUE self)
+{
+    struct traceobj_arg *arg = get_traceobj_arg();
+
+    if (arg->running++ > 0) {
+	/* do nothing */
+    }
+    else {
+	if (arg->newobj_trace == 0) {
+	    arg->newobj_trace = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_NEWOBJ, newobj_i, arg);
+	    rb_gc_register_mark_object(arg->newobj_trace);
+	    arg->freeobj_trace = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_FREEOBJ, freeobj_i, arg);
+	    rb_gc_register_mark_object(arg->freeobj_trace);
+	}
+	rb_tracepoint_enable(arg->newobj_trace);
+	rb_tracepoint_enable(arg->freeobj_trace);
+    }
+
+    return Qnil;
+}
+
+/*
+ * call-seq: trace_object_allocations_stop
+ *
+ * Stop tracing object allocations.
+ *
+ * Note that if ::trace_object_allocations_start is called n-times, then
+ * tracing will stop after calling ::trace_object_allocations_stop n-times.
+ *
+ */
+static VALUE
+trace_object_allocations_stop(VALUE self)
+{
+    struct traceobj_arg *arg = get_traceobj_arg();
+
+    if (arg->running > 0) {
+	arg->running--;
+    }
+
+    if (arg->running == 0) {
+	rb_tracepoint_disable(arg->newobj_trace);
+	rb_tracepoint_disable(arg->freeobj_trace);
+    }
+
+    return Qnil;
+}
+
+/*
+ * call-seq: trace_object_allocations_clear
+ *
+ * Clear recorded tracing information.
+ *
+ */
+static VALUE
+trace_object_allocations_clear(VALUE self)
+{
+    struct traceobj_arg *arg = get_traceobj_arg();
+
+    /* clear tables */
+    st_foreach(arg->object_table, free_values_i, 0);
+    st_clear(arg->object_table);
+    st_foreach(arg->str_table, free_keys_i, 0);
+    st_clear(arg->str_table);
+
+    /* do not touch TracePoints */
+
+    return Qnil;
+}
+
+/*
+ * call-seq: trace_object_allocations { block }
+ *
+ * Starts tracing object allocations from the ObjectSpace extension module.
+ *
+ * For example:
+ *
+ *	require 'objspace'
+ *
+ *	class C
+ *	  include ObjectSpace
+ *
+ *	  def foo
+ *	    trace_object_allocations do
+ *	      obj = Object.new
+ *	      p "#{allocation_sourcefile(obj)}:#{allocation_sourceline(obj)}"
+ *	    end
+ *	  end
+ *	end
+ *
+ *	C.new.foo #=> "objtrace.rb:8"
+ *
+ * This example has included the ObjectSpace module to make it easier to read,
+ * but you can also use the ::trace_object_allocations notation (recommended).
+ *
+ * Note that this feature introduces a huge performance decrease and huge
+ * memory consumption.
+ */
+static VALUE
+trace_object_allocations(VALUE self)
+{
+    trace_object_allocations_start(self);
+    return rb_ensure(rb_yield, Qnil, trace_object_allocations_stop, self);
+}
+
+int rb_bug_reporter_add(void (*func)(FILE *, void *), void *data);
+static int object_allocations_reporter_registered = 0;
+
+static int
+object_allocations_reporter_i(st_data_t key, st_data_t val, st_data_t ptr)
+{
+    FILE *out = (FILE *)ptr;
+    VALUE obj = (VALUE)key;
+    struct allocation_info *info = (struct allocation_info *)val;
+
+    fprintf(out, "-- %p (%s F: %p, ", (void *)obj, info->living ? "live" : "dead", (void *)info->flags);
+    if (info->class_path) fprintf(out, "C: %s", info->class_path);
+    else                  fprintf(out, "C: %p", (void *)info->klass);
+    fprintf(out, "@%s:%lu", info->path ? info->path : "", info->line);
+    if (!NIL_P(info->mid)) {
+	VALUE m = rb_sym2str(info->mid);
+	fprintf(out, " (%s)", RSTRING_PTR(m));
+    }
+    fprintf(out, ")\n");
+
+    return ST_CONTINUE;
+}
+
+static void
+object_allocations_reporter(FILE *out, void *ptr)
+{
+    fprintf(out, "== object_allocations_reporter: START\n");
+    if (tmp_trace_arg) {
+	st_foreach(tmp_trace_arg->object_table, object_allocations_reporter_i, (st_data_t)out);
+    }
+    fprintf(out, "== object_allocations_reporter: END\n");
+}
+
+static VALUE
+trace_object_allocations_debug_start(VALUE self)
+{
+    tmp_keep_remains = 1;
+    if (object_allocations_reporter_registered == 0) {
+	object_allocations_reporter_registered = 1;
+	rb_bug_reporter_add(object_allocations_reporter, 0);
+    }
+
+    return trace_object_allocations_start(self);
+}
+
+static struct allocation_info *
+lookup_allocation_info(VALUE obj)
+{
+    if (tmp_trace_arg) {
+	st_data_t info;
+	if (st_lookup(tmp_trace_arg->object_table, obj, &info)) {
+	    return (struct allocation_info *)info;
+	}
+    }
+    return NULL;
+}
+
+struct allocation_info *
+objspace_lookup_allocation_info(VALUE obj)
+{
+    return lookup_allocation_info(obj);
+}
+
+/*
+ * call-seq: allocation_sourcefile(object) -> string
+ *
+ * Returns the source file origin from the given +object+.
+ *
+ * See ::trace_object_allocations for more information and examples.
+ */
+static VALUE
+allocation_sourcefile(VALUE self, VALUE obj)
+{
+    struct allocation_info *info = lookup_allocation_info(obj);
+
+    if (info && info->path) {
+	return rb_str_new2(info->path);
+    }
+    else {
+	return Qnil;
+    }
+}
+
+/*
+ * call-seq: allocation_sourceline(object) -> integer
+ *
+ * Returns the original line from source for from the given +object+.
+ *
+ * See ::trace_object_allocations for more information and examples.
+ */
+static VALUE
+allocation_sourceline(VALUE self, VALUE obj)
+{
+    struct allocation_info *info = lookup_allocation_info(obj);
+
+    if (info) {
+	return INT2FIX(info->line);
+    }
+    else {
+	return Qnil;
+    }
+}
+
+/*
+ * call-seq: allocation_class_path(object) -> string
+ *
+ * Returns the class for the given +object+.
+ *
+ *	class A
+ *	  def foo
+ *	    ObjectSpace::trace_object_allocations do
+ *	      obj = Object.new
+ *	      p "#{ObjectSpace::allocation_class_path(obj)}"
+ *	    end
+ *	  end
+ *	end
+ *
+ *	A.new.foo #=> "Class"
+ *
+ * See ::trace_object_allocations for more information and examples.
+ */
+static VALUE
+allocation_class_path(VALUE self, VALUE obj)
+{
+    struct allocation_info *info = lookup_allocation_info(obj);
+
+    if (info && info->class_path) {
+	return rb_str_new2(info->class_path);
+    }
+    else {
+	return Qnil;
+    }
+}
+
+/*
+ * call-seq: allocation_method_id(object) -> string
+ *
+ * Returns the method identifier for the given +object+.
+ *
+ *	class A
+ *	  include ObjectSpace
+ *
+ *	  def foo
+ *	    trace_object_allocations do
+ *	      obj = Object.new
+ *	      p "#{allocation_class_path(obj)}##{allocation_method_id(obj)}"
+ *	    end
+ *	  end
+ *	end
+ *
+ *	A.new.foo #=> "Class#new"
+ *
+ * See ::trace_object_allocations for more information and examples.
+ */
+static VALUE
+allocation_method_id(VALUE self, VALUE obj)
+{
+    struct allocation_info *info = lookup_allocation_info(obj);
+    if (info) {
+	return info->mid;
+    }
+    else {
+	return Qnil;
+    }
+}
+
+/*
+ * call-seq: allocation_generation(object) -> integer or nil
+ *
+ * Returns garbage collector generation for the given +object+.
+ *
+ *	class B
+ *	  include ObjectSpace
+ *
+ *	  def foo
+ *	    trace_object_allocations do
+ *	      obj = Object.new
+ *	      p "Generation is #{allocation_generation(obj)}"
+ *	    end
+ *	  end
+ *	end
+ *
+ *	B.new.foo #=> "Generation is 3"
+ *
+ * See ::trace_object_allocations for more information and examples.
+ */
+static VALUE
+allocation_generation(VALUE self, VALUE obj)
+{
+    struct allocation_info *info = lookup_allocation_info(obj);
+    if (info) {
+	return SIZET2NUM(info->generation);
+    }
+    else {
+	return Qnil;
+    }
+}
+
+void
+Init_object_tracing(VALUE rb_mObjSpace)
+{
+#if 0
+    rb_mObjSpace = rb_define_module("ObjectSpace"); /* let rdoc know */
+#endif
+
+    rb_define_module_function(rb_mObjSpace, "trace_object_allocations", trace_object_allocations, 0);
+    rb_define_module_function(rb_mObjSpace, "trace_object_allocations_start", trace_object_allocations_start, 0);
+    rb_define_module_function(rb_mObjSpace, "trace_object_allocations_stop", trace_object_allocations_stop, 0);
+    rb_define_module_function(rb_mObjSpace, "trace_object_allocations_clear", trace_object_allocations_clear, 0);
+
+    rb_define_module_function(rb_mObjSpace, "trace_object_allocations_debug_start", trace_object_allocations_debug_start, 0);
+
+    rb_define_module_function(rb_mObjSpace, "allocation_sourcefile", allocation_sourcefile, 1);
+    rb_define_module_function(rb_mObjSpace, "allocation_sourceline", allocation_sourceline, 1);
+    rb_define_module_function(rb_mObjSpace, "allocation_class_path", allocation_class_path, 1);
+    rb_define_module_function(rb_mObjSpace, "allocation_method_id", allocation_method_id, 1);
+    rb_define_module_function(rb_mObjSpace, "allocation_generation", allocation_generation, 1);
+}
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index 66e33a38c4..311e687206 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -5,153 +5,20 @@
   $Author$
   created at: Wed Jun 17 07:39:17 2009
 
-  NOTE: This extension library is not expected to exist except C Ruby.
+  NOTE: This extension library is only expected to exist with C Ruby.
 
   All the files in this distribution are covered under the Ruby's
   license (see the file COPYING).
 
 **********************************************************************/
 
-/* objspace library extends ObjectSpace module and add several
- * methods to get internal statistic information about
- * object/memory management.
- *
- * Generally, you *SHOULD NOT*use this library if you do not know
- * about the MRI implementation.  Mainly, this library is for (memory)
- * profiler developers and MRI developers who need to know how MRI
- * memory usage.
- *
- */
-
-#include <ruby/ruby.h>
-#include <ruby/st.h>
 #include <ruby/io.h>
+#include "internal.h"
+#include <ruby/st.h>
 #include <ruby/re.h>
 #include "node.h"
 #include "gc.h"
-#include "regint.h"
-#include "internal.h"
-
-size_t rb_str_memsize(VALUE);
-size_t rb_ary_memsize(VALUE);
-size_t rb_io_memsize(const rb_io_t *);
-size_t rb_generic_ivar_memsize(VALUE);
-size_t rb_objspace_data_type_memsize(VALUE obj);
-
-static size_t
-memsize_of(VALUE obj)
-{
-    size_t size = 0;
-
-    if (SPECIAL_CONST_P(obj)) {
-	return 0;
-    }
-
-    if (FL_TEST(obj, FL_EXIVAR)) {
-	size += rb_generic_ivar_memsize(obj);
-    }
-
-    switch (BUILTIN_TYPE(obj)) {
-      case T_OBJECT:
-	if (!(RBASIC(obj)->flags & ROBJECT_EMBED) &&
-	    ROBJECT(obj)->as.heap.ivptr) {
-	    size += ROBJECT(obj)->as.heap.numiv * sizeof(VALUE);
-	}
-	break;
-      case T_MODULE:
-      case T_CLASS:
-	size += st_memsize(RCLASS_M_TBL(obj));
-	if (RCLASS_IV_TBL(obj)) {
-	    size += st_memsize(RCLASS_IV_TBL(obj));
-	}
-	if (RCLASS_IV_INDEX_TBL(obj)) {
-	    size += st_memsize(RCLASS_IV_INDEX_TBL(obj));
-	}
-	if (RCLASS(obj)->ptr->iv_tbl) {
-	    size += st_memsize(RCLASS(obj)->ptr->iv_tbl);
-	}
-	if (RCLASS(obj)->ptr->const_tbl) {
-	    size += st_memsize(RCLASS(obj)->ptr->const_tbl);
-	}
-	size += sizeof(rb_classext_t);
-	break;
-      case T_STRING:
-	size += rb_str_memsize(obj);
-	break;
-      case T_ARRAY:
-	size += rb_ary_memsize(obj);
-	break;
-      case T_HASH:
-	if (RHASH(obj)->ntbl) {
-	    size += st_memsize(RHASH(obj)->ntbl);
-	}
-	break;
-      case T_REGEXP:
-	if (RREGEXP(obj)->ptr) {
-	    size += onig_memsize(RREGEXP(obj)->ptr);
-	}
-	break;
-      case T_DATA:
-	size += rb_objspace_data_type_memsize(obj);
-	break;
-      case T_MATCH:
-	if (RMATCH(obj)->rmatch) {
-            struct rmatch *rm = RMATCH(obj)->rmatch;
-	    size += sizeof(struct re_registers); /* TODO: onig_region_memsize(&rm->regs); */
-	    size += sizeof(struct rmatch_offset) * rm->char_offset_num_allocated;
-	    size += sizeof(struct rmatch);
-	}
-	break;
-      case T_FILE:
-	if (RFILE(obj)->fptr) {
-	    size += rb_io_memsize(RFILE(obj)->fptr);
-	}
-	break;
-      case T_RATIONAL:
-      case T_COMPLEX:
-	break;
-      case T_ICLASS:
-	/* iClass shares table with the module */
-	break;
-
-      case T_FLOAT:
-	break;
-
-      case T_BIGNUM:
-	if (!(RBASIC(obj)->flags & RBIGNUM_EMBED_FLAG) && RBIGNUM_DIGITS(obj)) {
-	    size += RBIGNUM_LEN(obj) * sizeof(BDIGIT);
-	}
-	break;
-      case T_NODE:
-	switch (nd_type(obj)) {
-	  case NODE_SCOPE:
-	    if (RNODE(obj)->u1.tbl) {
-		/* TODO: xfree(RANY(obj)->as.node.u1.tbl); */
-	    }
-	    break;
-	  case NODE_ALLOCA:
-	    /* TODO: xfree(RANY(obj)->as.node.u1.node); */
-	    ;
-	}
-	break;			/* no need to free iv_tbl */
-
-      case T_STRUCT:
-	if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) == 0 &&
-	    RSTRUCT(obj)->as.heap.ptr) {
-	    size += sizeof(VALUE) * RSTRUCT_LEN(obj);
-	}
-	break;
-
-      case T_ZOMBIE:
-	break;
-
-      default:
-	rb_bug("objspace/memsize_of(): unknown data type 0x%x(%p)",
-	       BUILTIN_TYPE(obj), (void*)obj);
-    }
-
-    return size;
-}
+#include "symbol.h"
 
 /*
  *  call-seq:
@@ -159,17 +26,20 @@ memsize_of(VALUE obj)
  *
  *  Return consuming memory size of obj.
  *
- *  Note that the return size is incomplete.  You need to deal with
- *  this information as only a *HINT*.  Especially, the size of
- *  T_DATA may not be correct.
+ *  Note that the return size is incomplete.  You need to deal with this
+ *  information as only a *HINT*. Especially, the size of +T_DATA+ may not be
+ *  correct.
  *
- *  This method is not expected to work except C Ruby.
+ *  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
 memsize_of_m(VALUE self, VALUE obj)
 {
-    return SIZET2NUM(memsize_of(obj));
+    return SIZET2NUM(rb_obj_memsize_of(obj));
 }
 
 struct total_data {
@@ -187,16 +57,14 @@ 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 += memsize_of(v);
+		    data->total += rb_obj_memsize_of(v);
 		}
 	    }
 	}
@@ -210,26 +78,27 @@ total_i(void *vstart, void *vend, size_t stride, void *ptr)
  *    ObjectSpace.memsize_of_all([klass]) -> Integer
  *
  *  Return consuming memory size of all living objects.
- *  If klass (should be Class object) is given, return the total
- *  memory size of instances of the given class.
  *
- *  Note that the returned size is incomplete.  You need to deal with
- *  this information as only a *HINT*.  Especially, the size of
- *  T_DATA may not be correct.
+ *  If +klass+ (should be Class object) is given, return the total memory size
+ *  of instances of the given class.
+ *
+ *  Note that the returned size is incomplete. You need to deal with this
+ *  information as only a *HINT*. Especially, the size of +T_DATA+ may not be
+ *  correct.
  *
  *  Note that this method does *NOT* return total malloc'ed memory size.
  *
  *  This method can be defined by the following Ruby code:
  *
- *  def memsize_of_all klass = false
- *    total = 0
- *    ObjectSpace.each_objects{|e|
- *      total += ObjectSpace.memsize_of(e) if klass == false || e.kind_of?(klass)
- *    }
- *    total
- *  end
+ *	def memsize_of_all klass = false
+ *  	  total = 0
+ *  	  ObjectSpace.each_object{|e|
+ *  	    total += ObjectSpace.memsize_of(e) if klass == false || e.kind_of?(klass)
+ *  	  }
+ *  	  total
+ *  	end
  *
- *  This method is not expected to work except C Ruby.
+ *  This method is only expected to work with C Ruby.
  */
 
 static VALUE
@@ -254,6 +123,26 @@ 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)
 {
@@ -262,12 +151,51 @@ cos_i(void *vstart, void *vend, size_t stride, void *data)
 
     for (;v != (VALUE)vend; v += stride) {
 	if (RBASIC(v)->flags) {
-	    counts[BUILTIN_TYPE(v)] += memsize_of(v);
+	    counts[BUILTIN_TYPE(v)] += rb_obj_memsize_of(v);
 	}
     }
     return 0;
 }
 
+static VALUE
+type2sym(enum ruby_value_type i)
+{
+    VALUE type;
+    switch (i) {
+#define CASE_TYPE(t) case t: type = ID2SYM(rb_intern(#t)); break;
+	CASE_TYPE(T_NONE);
+	CASE_TYPE(T_OBJECT);
+	CASE_TYPE(T_CLASS);
+	CASE_TYPE(T_MODULE);
+	CASE_TYPE(T_FLOAT);
+	CASE_TYPE(T_STRING);
+	CASE_TYPE(T_REGEXP);
+	CASE_TYPE(T_ARRAY);
+	CASE_TYPE(T_HASH);
+	CASE_TYPE(T_STRUCT);
+	CASE_TYPE(T_BIGNUM);
+	CASE_TYPE(T_FILE);
+	CASE_TYPE(T_DATA);
+	CASE_TYPE(T_MATCH);
+	CASE_TYPE(T_COMPLEX);
+	CASE_TYPE(T_RATIONAL);
+	CASE_TYPE(T_NIL);
+	CASE_TYPE(T_TRUE);
+	CASE_TYPE(T_FALSE);
+	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_MOVED);
+	CASE_TYPE(T_ZOMBIE);
+#undef CASE_TYPE
+      default: rb_bug("type2sym: unknown type (%d)", i);
+    }
+    return type;
+}
+
 /*
  *  call-seq:
  *    ObjectSpace.count_objects_size([result_hash]) -> hash
@@ -276,7 +204,7 @@ cos_i(void *vstart, void *vend, size_t stride, void *data)
  *
  *  Note that this information is incomplete.  You need to deal with
  *  this information as only a *HINT*.  Especially, total size of
- *  T_DATA may not right size.
+ *  T_DATA may be wrong.
  *
  *  It returns a hash as:
  *    {:TOTAL=>1461154, :T_CLASS=>158280, :T_MODULE=>20672, :T_STRING=>527249, ...}
@@ -288,7 +216,7 @@ cos_i(void *vstart, void *vend, size_t stride, void *data)
  *  The contents of the returned hash is implementation defined.
  *  It may be changed in future.
  *
- *  This method is not expected to work except C Ruby.
+ *  This method is only expected to work with C Ruby.
  */
 
 static VALUE
@@ -296,13 +224,8 @@ count_objects_size(int argc, VALUE *argv, VALUE os)
 {
     size_t counts[T_MASK+1];
     size_t total = 0;
-    size_t i;
-    VALUE hash;
-
-    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
-        if (TYPE(hash) != T_HASH)
-            rb_raise(rb_eTypeError, "non-hash given");
-    }
+    enum ruby_value_type i;
+    VALUE hash = setup_hash(argc, argv);
 
     for (i = 0; i <= T_MASK; i++) {
 	counts[i] = 0;
@@ -310,46 +233,9 @@ count_objects_size(int argc, VALUE *argv, VALUE os)
 
     rb_objspace_each_objects(cos_i, &counts[0]);
 
-    if (hash == Qnil) {
-        hash = rb_hash_new();
-    }
-    else if (!RHASH_EMPTY_P(hash)) {
-        st_foreach(RHASH_TBL(hash), set_zero_i, hash);
-    }
-
     for (i = 0; i <= T_MASK; i++) {
 	if (counts[i]) {
-	    VALUE type;
-	    switch (i) {
-#define COUNT_TYPE(t) case t: type = ID2SYM(rb_intern(#t)); break;
-		COUNT_TYPE(T_NONE);
-		COUNT_TYPE(T_OBJECT);
-		COUNT_TYPE(T_CLASS);
-		COUNT_TYPE(T_MODULE);
-		COUNT_TYPE(T_FLOAT);
-		COUNT_TYPE(T_STRING);
-		COUNT_TYPE(T_REGEXP);
-		COUNT_TYPE(T_ARRAY);
-		COUNT_TYPE(T_HASH);
-		COUNT_TYPE(T_STRUCT);
-		COUNT_TYPE(T_BIGNUM);
-		COUNT_TYPE(T_FILE);
-		COUNT_TYPE(T_DATA);
-		COUNT_TYPE(T_MATCH);
-		COUNT_TYPE(T_COMPLEX);
-		COUNT_TYPE(T_RATIONAL);
-		COUNT_TYPE(T_NIL);
-		COUNT_TYPE(T_TRUE);
-		COUNT_TYPE(T_FALSE);
-		COUNT_TYPE(T_SYMBOL);
-		COUNT_TYPE(T_FIXNUM);
-		COUNT_TYPE(T_UNDEF);
-		COUNT_TYPE(T_NODE);
-		COUNT_TYPE(T_ICLASS);
-		COUNT_TYPE(T_ZOMBIE);
-#undef COUNT_TYPE
-	      default: type = INT2NUM(i); break;
-	    }
+	    VALUE type = type2sym(i);
 	    total += counts[i];
 	    rb_hash_aset(hash, type, SIZET2NUM(counts[i]));
 	}
@@ -358,6 +244,77 @@ 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);
+
+    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)
 {
@@ -380,33 +337,29 @@ cn_i(void *vstart, void *vend, size_t stride, void *n)
  *
  *  Counts nodes for each node type.
  *
- *  This method is not for ordinary Ruby programmers, but for MRI developers
- *  who have interest in MRI performance and memory usage.
+ *  This method is only for MRI developers interested in performance and memory
+ *  usage of Ruby programs.
  *
  *  It returns a hash as:
- *  {:NODE_METHOD=>2027, :NODE_FBODY=>1927, :NODE_CFUNC=>1798, ...}
  *
- *  If the optional argument, result_hash, is given,
- *  it is overwritten and returned.
- *  This is intended to avoid probe effect.
+ *	{:NODE_METHOD=>2027, :NODE_FBODY=>1927, :NODE_CFUNC=>1798, ...}
+ *
+ *  If the optional argument, result_hash, is given, it is overwritten and
+ *  returned. This is intended to avoid probe effect.
  *
+ *  Note:
  *  The contents of the returned hash is implementation defined.
  *  It may be changed in future.
  *
- *  This method is not expected to work except C Ruby.
+ *  This method is only expected to work with C Ruby.
  */
 
 static VALUE
 count_nodes(int argc, VALUE *argv, VALUE os)
 {
     size_t nodes[NODE_LAST+1];
-    size_t i;
-    VALUE hash;
-
-    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
-        if (TYPE(hash) != T_HASH)
-            rb_raise(rb_eTypeError, "non-hash given");
-    }
+    enum node_type i;
+    VALUE hash = setup_hash(argc, argv);
 
     for (i = 0; i <= NODE_LAST; i++) {
 	nodes[i] = 0;
@@ -414,28 +367,25 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 
     rb_objspace_each_objects(cn_i, &nodes[0]);
 
-    if (hash == Qnil) {
-        hash = rb_hash_new();
-    }
-    else if (!RHASH_EMPTY_P(hash)) {
-        st_foreach(RHASH_TBL(hash), set_zero_i, hash);
-    }
-
     for (i=0; i<NODE_LAST; i++) {
 	if (nodes[i] != 0) {
 	    VALUE node;
 	    switch (i) {
-#define COUNT_NODE(n) case n: node = ID2SYM(rb_intern(#n)); break;
+#define COUNT_NODE(n) case n: node = ID2SYM(rb_intern(#n)); goto set
 		COUNT_NODE(NODE_SCOPE);
 		COUNT_NODE(NODE_BLOCK);
 		COUNT_NODE(NODE_IF);
+		COUNT_NODE(NODE_UNLESS);
 		COUNT_NODE(NODE_CASE);
+		COUNT_NODE(NODE_CASE2);
+                COUNT_NODE(NODE_CASE3);
 		COUNT_NODE(NODE_WHEN);
-		COUNT_NODE(NODE_OPT_N);
+                COUNT_NODE(NODE_IN);
 		COUNT_NODE(NODE_WHILE);
 		COUNT_NODE(NODE_UNTIL);
 		COUNT_NODE(NODE_ITER);
 		COUNT_NODE(NODE_FOR);
+		COUNT_NODE(NODE_FOR_MASGN);
 		COUNT_NODE(NODE_BREAK);
 		COUNT_NODE(NODE_NEXT);
 		COUNT_NODE(NODE_REDO);
@@ -452,21 +402,22 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 		COUNT_NODE(NODE_DASGN_CURR);
 		COUNT_NODE(NODE_GASGN);
 		COUNT_NODE(NODE_IASGN);
-		COUNT_NODE(NODE_IASGN2);
 		COUNT_NODE(NODE_CDECL);
 		COUNT_NODE(NODE_CVASGN);
-		COUNT_NODE(NODE_CVDECL);
 		COUNT_NODE(NODE_OP_ASGN1);
 		COUNT_NODE(NODE_OP_ASGN2);
 		COUNT_NODE(NODE_OP_ASGN_AND);
 		COUNT_NODE(NODE_OP_ASGN_OR);
+		COUNT_NODE(NODE_OP_CDECL);
 		COUNT_NODE(NODE_CALL);
+		COUNT_NODE(NODE_OPCALL);
 		COUNT_NODE(NODE_FCALL);
 		COUNT_NODE(NODE_VCALL);
+		COUNT_NODE(NODE_QCALL);
 		COUNT_NODE(NODE_SUPER);
 		COUNT_NODE(NODE_ZSUPER);
-		COUNT_NODE(NODE_ARRAY);
-		COUNT_NODE(NODE_ZARRAY);
+		COUNT_NODE(NODE_LIST);
+		COUNT_NODE(NODE_ZLIST);
 		COUNT_NODE(NODE_VALUES);
 		COUNT_NODE(NODE_HASH);
 		COUNT_NODE(NODE_RETURN);
@@ -489,16 +440,15 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 		COUNT_NODE(NODE_DXSTR);
 		COUNT_NODE(NODE_EVSTR);
 		COUNT_NODE(NODE_DREGX);
-		COUNT_NODE(NODE_DREGX_ONCE);
+		COUNT_NODE(NODE_ONCE);
 		COUNT_NODE(NODE_ARGS);
 		COUNT_NODE(NODE_ARGS_AUX);
 		COUNT_NODE(NODE_OPT_ARG);
+		COUNT_NODE(NODE_KW_ARG);
 		COUNT_NODE(NODE_POSTARG);
 		COUNT_NODE(NODE_ARGSCAT);
 		COUNT_NODE(NODE_ARGSPUSH);
 		COUNT_NODE(NODE_SPLAT);
-		COUNT_NODE(NODE_TO_ARY);
-		COUNT_NODE(NODE_BLOCK_ARG);
 		COUNT_NODE(NODE_BLOCK_PASS);
 		COUNT_NODE(NODE_DEFN);
 		COUNT_NODE(NODE_DEFS);
@@ -521,18 +471,16 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 		COUNT_NODE(NODE_ERRINFO);
 		COUNT_NODE(NODE_DEFINED);
 		COUNT_NODE(NODE_POSTEXE);
-		COUNT_NODE(NODE_ALLOCA);
-		COUNT_NODE(NODE_BMETHOD);
-		COUNT_NODE(NODE_MEMO);
-		COUNT_NODE(NODE_IFUNC);
 		COUNT_NODE(NODE_DSYM);
 		COUNT_NODE(NODE_ATTRASGN);
-		COUNT_NODE(NODE_PRELUDE);
 		COUNT_NODE(NODE_LAMBDA);
-		COUNT_NODE(NODE_OPTBLOCK);
+                COUNT_NODE(NODE_ARYPTN);
+                COUNT_NODE(NODE_HSHPTN);
 #undef COUNT_NODE
-	      default: node = INT2FIX(nodes[i]);
+	      case NODE_LAST: break;
 	    }
+	    UNREACHABLE;
+	  set:
 	    rb_hash_aset(hash, node, SIZET2NUM(nodes[i]));
 	}
     }
@@ -575,76 +523,461 @@ cto_i(void *vstart, void *vend, size_t stride, void *data)
  *  call-seq:
  *     ObjectSpace.count_tdata_objects([result_hash]) -> hash
  *
- *  Counts objects for each T_DATA type.
+ *  Counts objects for each +T_DATA+ type.
  *
- *  This method is not for ordinary Ruby programmers, but for MRI developers
- *  who interest on MRI performance.
+ *  This method is only for MRI developers interested in performance and memory
+ *  usage of Ruby programs.
  *
  *  It returns a hash as:
- *  {RubyVM::InstructionSequence=>504, :parser=>5, :barrier=>6,
- *   :mutex=>6, Proc=>60, RubyVM::Env=>57, Mutex=>1, Encoding=>99,
- *   ThreadGroup=>1, Binding=>1, Thread=>1, RubyVM=>1, :iseq=>1,
- *   Random=>1, ARGF.class=>1, Data=>1, :autoload=>3, Time=>2}
- *  # T_DATA objects existing at startup on r32276.
  *
- *  If the optional argument, result_hash, is given,
- *  it is overwritten and returned.
- *  This is intended to avoid probe effect.
+ *	{RubyVM::InstructionSequence=>504, :parser=>5, :barrier=>6,
+ *  	 :mutex=>6, Proc=>60, RubyVM::Env=>57, Mutex=>1, Encoding=>99,
+ *  	 ThreadGroup=>1, Binding=>1, Thread=>1, RubyVM=>1, :iseq=>1,
+ *  	 Random=>1, ARGF.class=>1, Data=>1, :autoload=>3, Time=>2}
+ *  	# T_DATA objects existing at startup on r32276.
  *
- *  The contents of the returned hash is implementation defined.
- *  It may be changed in future.
+ *  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 Class object or Symbol object.
+ *
  *  If object is kind of normal (accessible) object, the key is Class object.
  *  If object is not a kind of normal (internal) object, the key is symbol
  *  name, registered by rb_data_type_struct.
  *
- *  This method is not expected to work except C Ruby.
- *
+ *  This method is only expected to work with C Ruby.
  */
 
 static VALUE
 count_tdata_objects(int argc, VALUE *argv, VALUE self)
 {
-    VALUE hash;
+    VALUE hash = setup_hash(argc, argv);
+    rb_objspace_each_objects(cto_i, (void *)hash);
+    return hash;
+}
 
-    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
-        if (TYPE(hash) != T_HASH)
-            rb_raise(rb_eTypeError, "non-hash given");
+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);
+	    }
+
+	    rb_hash_aset(hash, key, counter);
+	}
     }
 
-    if (hash == Qnil) {
-        hash = rb_hash_new();
+    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_env");
+	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");
+	imemo_type_ids[8] = rb_intern("imemo_tmpbuf");
+        imemo_type_ids[9] = rb_intern("imemo_ast");
+        imemo_type_ids[10] = rb_intern("imemo_parser_strterm");
     }
-    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);
+
+    return hash;
+}
+
+static void
+iow_mark(void *ptr)
+{
+    rb_gc_mark((VALUE)ptr);
+}
+
+static size_t
+iow_size(const void *ptr)
+{
+    VALUE obj = (VALUE)ptr;
+    return rb_obj_memsize_of(obj);
+}
+
+static const rb_data_type_t iow_data_type = {
+    "ObjectSpace::InternalObjectWrapper",
+    {iow_mark, 0, iow_size,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE rb_mInternalObjectWrapper;
+
+static VALUE
+iow_newobj(VALUE obj)
+{
+    return TypedData_Wrap_Struct(rb_mInternalObjectWrapper, &iow_data_type, (void *)obj);
+}
+
+/* Returns the type of the internal object. */
+static VALUE
+iow_type(VALUE self)
+{
+    VALUE obj = (VALUE)DATA_PTR(self);
+    return type2sym(BUILTIN_TYPE(obj));
+}
+
+/* See Object#inspect. */
+static VALUE
+iow_inspect(VALUE self)
+{
+    VALUE obj = (VALUE)DATA_PTR(self);
+    VALUE type = type2sym(BUILTIN_TYPE(obj));
+
+    return rb_sprintf("#<InternalObject:%p %"PRIsVALUE">", (void *)obj, rb_sym2str(type));
+}
+
+/* Returns the Object#object_id of the internal object. */
+static VALUE
+iow_internal_object_id(VALUE self)
+{
+    VALUE obj = (VALUE)DATA_PTR(self);
+    return rb_obj_id(obj);
+}
+
+struct rof_data {
+    st_table *refs;
+    VALUE internals;
+};
+
+static void
+reachable_object_from_i(VALUE obj, void *data_ptr)
+{
+    struct rof_data *data = (struct rof_data *)data_ptr;
+    VALUE key = obj;
+    VALUE val = obj;
+
+    if (rb_objspace_markable_object_p(obj)) {
+	if (rb_objspace_internal_object_p(obj)) {
+	    val = iow_newobj(obj);
+	    rb_ary_push(data->internals, val);
+	}
+	st_insert(data->refs, key, val);
     }
+}
 
-    rb_objspace_each_objects(cto_i, (void *)hash);
+static int
+collect_values(st_data_t key, st_data_t value, st_data_t data)
+{
+    VALUE ary = (VALUE)data;
+    rb_ary_push(ary, (VALUE)value);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     ObjectSpace.reachable_objects_from(obj) -> array or nil
+ *
+ *  [MRI specific feature] Return all reachable objects from `obj'.
+ *
+ *  This method returns all reachable objects from `obj'.
+ *
+ *  If `obj' has two or more references to the same object `x', then returned
+ *  array only includes one `x' object.
+ *
+ *  If `obj' is a non-markable (non-heap management) object such as true,
+ *  false, nil, symbols and Fixnums (and Flonum) then it simply returns nil.
+ *
+ *  If `obj' has references to an internal object, then it returns instances of
+ *  ObjectSpace::InternalObjectWrapper class. This object contains a reference
+ *  to an internal object and you can check the type of internal object with
+ *  `type' method.
+ *
+ *  If `obj' is instance of ObjectSpace::InternalObjectWrapper class, then this
+ *  method returns all reachable object from an internal object, which is
+ *  pointed by `obj'.
+ *
+ *  With this method, you can find memory leaks.
+ *
+ *  This method is only expected to work except with C Ruby.
+ *
+ *  Example:
+ *    ObjectSpace.reachable_objects_from(['a', 'b', 'c'])
+ *    #=> [Array, 'a', 'b', 'c']
+ *
+ *    ObjectSpace.reachable_objects_from(['a', 'a', 'a'])
+ *    #=> [Array, 'a', 'a', 'a'] # all 'a' strings have different object id
+ *
+ *    ObjectSpace.reachable_objects_from([v = 'a', v, v])
+ *    #=> [Array, 'a']
+ *
+ *    ObjectSpace.reachable_objects_from(1)
+ *    #=> nil # 1 is not markable (heap managed) object
+ *
+ */
+
+static VALUE
+reachable_objects_from(VALUE self, VALUE obj)
+{
+    if (rb_objspace_markable_object_p(obj)) {
+	VALUE ret = rb_ary_new();
+	struct rof_data data;
+
+	if (rb_typeddata_is_kind_of(obj, &iow_data_type)) {
+	    obj = (VALUE)DATA_PTR(obj);
+	}
+
+	data.refs = st_init_numtable();
+	data.internals = rb_ary_new();
+
+	rb_objspace_reachable_objects_from(obj, reachable_object_from_i, &data);
+
+	st_foreach(data.refs, collect_values, (st_data_t)ret);
+	return ret;
+    }
+    else {
+	return Qnil;
+    }
+}
+
+struct rofr_data {
+    VALUE categories;
+    const char *last_category;
+    VALUE last_category_str;
+    VALUE last_category_objects;
+};
+
+static void
+reachable_object_from_root_i(const char *category, VALUE obj, void *ptr)
+{
+    struct rofr_data *data = (struct rofr_data *)ptr;
+    VALUE category_str;
+    VALUE category_objects;
+
+    if (category == data->last_category) {
+	category_str = data->last_category_str;
+	category_objects = data->last_category_objects;
+    }
+    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();
+	if (!NIL_P(rb_hash_lookup(data->categories, category_str))) {
+	    rb_bug("reachable_object_from_root_i: category should insert at once");
+	}
+	rb_hash_aset(data->categories, category_str, category_objects);
+    }
+
+    if (rb_objspace_markable_object_p(obj) &&
+	obj != data->categories &&
+	obj != data->last_category_objects) {
+	if (rb_objspace_internal_object_p(obj)) {
+	    obj = iow_newobj(obj);
+	}
+	rb_hash_aset(category_objects, obj, obj);
+    }
+}
+
+static int
+collect_values_of_values(VALUE category, VALUE category_objects, VALUE categories)
+{
+    VALUE ary = rb_ary_new();
+    rb_hash_foreach(category_objects, collect_values, ary);
+    rb_hash_aset(categories, category, ary);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     ObjectSpace.reachable_objects_from_root -> hash
+ *
+ *  [MRI specific feature] Return all reachable objects from root.
+ */
+static VALUE
+reachable_objects_from_root(VALUE self)
+{
+    struct rofr_data data;
+    VALUE hash = data.categories = rb_ident_hash_new();
+    data.last_category = 0;
+
+    rb_objspace_reachable_objects_from_root(reachable_object_from_root_i, &data);
+    rb_hash_foreach(hash, collect_values_of_values, hash);
 
     return hash;
 }
 
-/* objspace library extends ObjectSpace module and add several
+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);
+
+/*
+ * Document-module: ObjectSpace
+ *
+ * The objspace library extends the ObjectSpace module and adds several
  * methods to get internal statistic information about
  * object/memory management.
  *
- * Generally, you *SHOULD NOT*use this library if you do not know
+ * You need to <code>require 'objspace'</code> to use this extension module.
+ *
+ * Generally, you *SHOULD NOT* use this library if you do not know
  * about the MRI implementation.  Mainly, this library is for (memory)
- * profiler developers and MRI developers who need to know how MRI
+ * profiler developers and MRI developers who need to know about MRI
  * memory usage.
  */
 
 void
 Init_objspace(void)
 {
-    VALUE rb_mObjSpace = rb_const_get(rb_cObject, rb_intern("ObjectSpace"));
+#undef rb_intern
+    VALUE rb_mObjSpace;
+#if 0
+    rb_mObjSpace = rb_define_module("ObjectSpace"); /* let rdoc know */
+#endif
+    rb_mObjSpace = rb_const_get(rb_cObject, rb_intern("ObjectSpace"));
 
     rb_define_module_function(rb_mObjSpace, "memsize_of", memsize_of_m, 1);
-    rb_define_module_function(rb_mObjSpace, "memsize_of_all",
-			      memsize_of_all_m, -1);
+    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.
+     *
+     * When ObjectSpace::reachable_objects_from returns an object with
+     * references to an internal object, an instance of this class is returned.
+     *
+     * You can use the #type method to check the type of the internal object.
+     */
+    rb_mInternalObjectWrapper = rb_define_class_under(rb_mObjSpace, "InternalObjectWrapper", rb_cObject);
+    rb_define_method(rb_mInternalObjectWrapper, "type", iow_type, 0);
+    rb_define_method(rb_mInternalObjectWrapper, "inspect", iow_inspect, 0);
+    rb_define_method(rb_mInternalObjectWrapper, "internal_object_id", iow_internal_object_id, 0);
+
+    Init_object_tracing(rb_mObjSpace);
+    Init_objspace_dump(rb_mObjSpace);
 }
diff --git a/ext/objspace/objspace.h b/ext/objspace/objspace.h
new file mode 100644
index 0000000000..95b84d6c1e
--- /dev/null
+++ b/ext/objspace/objspace.h
@@ -0,0 +1,20 @@
+#ifndef OBJSPACE_H
+#define OBJSPACE_H 1
+
+/* object_tracing.c */
+struct allocation_info {
+    /* all of information don't need marking. */
+    int living;
+    VALUE flags;
+    VALUE klass;
+
+    /* allocation info */
+    const char *path;
+    unsigned long line;
+    const char *class_path;
+    VALUE mid;
+    size_t generation;
+};
+struct allocation_info *objspace_lookup_allocation_info(VALUE obj);
+
+#endif
diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c
new file mode 100644
index 0000000000..5fa9d98e38
--- /dev/null
+++ b/ext/objspace/objspace_dump.c
@@ -0,0 +1,517 @@
+/**********************************************************************
+
+  objspace_dump.c - Heap dumping ObjectSpace extender for MRI.
+
+  $Author$
+  created at: Sat Oct 11 10:11:00 2013
+
+  NOTE: This extension library is not expected to exist except C Ruby.
+
+  All the files in this distribution are covered under the Ruby's
+  license (see the file COPYING).
+
+**********************************************************************/
+
+#include "ruby/io.h"
+#include "internal.h"
+#include "ruby/debug.h"
+#include "gc.h"
+#include "node.h"
+#include "vm_core.h"
+#include "objspace.h"
+
+static VALUE sym_output, sym_stdout, sym_string, sym_file;
+static VALUE sym_full;
+
+struct dump_config {
+    VALUE type;
+    FILE *stream;
+    VALUE string;
+    const char *root_category;
+    VALUE cur_obj;
+    VALUE cur_obj_klass;
+    size_t cur_obj_references;
+    unsigned int roots: 1;
+    unsigned int full_heap: 1;
+};
+
+PRINTF_ARGS(static void dump_append(struct dump_config *, const char *, ...), 2, 3);
+static void
+dump_append(struct dump_config *dc, const char *format, ...)
+{
+    va_list vl;
+    va_start(vl, format);
+
+    if (dc->stream) {
+	vfprintf(dc->stream, format, vl);
+    }
+    else if (dc->string)
+	rb_str_vcatf(dc->string, format, vl);
+
+    va_end(vl);
+}
+
+static void
+dump_append_string_value(struct dump_config *dc, VALUE obj)
+{
+    long i;
+    char c;
+    const char *value;
+
+    dump_append(dc, "\"");
+    for (i = 0, value = RSTRING_PTR(obj); i < RSTRING_LEN(obj); i++) {
+	switch ((c = value[i])) {
+	  case '\\':
+	  case '"':
+	    dump_append(dc, "\\%c", c);
+	    break;
+	  case '\0':
+	    dump_append(dc, "\\u0000");
+	    break;
+	  case '\b':
+	    dump_append(dc, "\\b");
+	    break;
+	  case '\t':
+	    dump_append(dc, "\\t");
+	    break;
+	  case '\f':
+	    dump_append(dc, "\\f");
+	    break;
+	  case '\n':
+	    dump_append(dc, "\\n");
+	    break;
+	  case '\r':
+	    dump_append(dc, "\\r");
+	    break;
+	  default:
+	    if (c <= 0x1f)
+		dump_append(dc, "\\u%04d", c);
+	    else
+		dump_append(dc, "%c", c);
+	}
+    }
+    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)
+{
+    switch (BUILTIN_TYPE(obj)) {
+#define CASE_TYPE(type) case T_##type: return #type
+	CASE_TYPE(NONE);
+	CASE_TYPE(NIL);
+	CASE_TYPE(OBJECT);
+	CASE_TYPE(CLASS);
+	CASE_TYPE(ICLASS);
+	CASE_TYPE(MODULE);
+	CASE_TYPE(FLOAT);
+	CASE_TYPE(STRING);
+	CASE_TYPE(REGEXP);
+	CASE_TYPE(ARRAY);
+	CASE_TYPE(HASH);
+	CASE_TYPE(STRUCT);
+	CASE_TYPE(BIGNUM);
+	CASE_TYPE(FILE);
+	CASE_TYPE(FIXNUM);
+	CASE_TYPE(TRUE);
+	CASE_TYPE(FALSE);
+	CASE_TYPE(DATA);
+	CASE_TYPE(MATCH);
+	CASE_TYPE(SYMBOL);
+	CASE_TYPE(RATIONAL);
+	CASE_TYPE(COMPLEX);
+	CASE_TYPE(IMEMO);
+	CASE_TYPE(UNDEF);
+	CASE_TYPE(NODE);
+	CASE_TYPE(ZOMBIE);
+#undef CASE_TYPE
+    }
+    return "UNKNOWN";
+}
+
+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;
+
+    if (dc->cur_obj_klass == ref)
+	return;
+
+    if (dc->cur_obj_references == 0)
+        dump_append(dc, ", \"references\":[\"%#"PRIxVALUE"\"", ref);
+    else
+        dump_append(dc, ", \"%#"PRIxVALUE"\"", ref);
+
+    dc->cur_obj_references++;
+}
+
+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 const char *
+imemo_name(int imemo)
+{
+    switch(imemo) {
+#define TYPE_STR(t) case(imemo_##t): return #t
+	TYPE_STR(env);
+	TYPE_STR(cref);
+	TYPE_STR(svar);
+	TYPE_STR(throw_data);
+	TYPE_STR(ifunc);
+	TYPE_STR(memo);
+	TYPE_STR(ment);
+	TYPE_STR(iseq);
+	TYPE_STR(tmpbuf);
+	TYPE_STR(ast);
+	TYPE_STR(parser_strterm);
+      default:
+	return "unknown";
+#undef TYPE_STR
+    }
+}
+
+static void
+dump_object(VALUE obj, struct dump_config *dc)
+{
+    size_t memsize;
+    struct allocation_info *ainfo;
+    rb_io_t *fptr;
+    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);
+
+    if (dc->cur_obj == dc->string)
+	return;
+
+    dump_append(dc, "{\"address\":\"%#"PRIxVALUE"\", \"type\":\"%s\"", obj, obj_type(obj));
+
+    if (dc->cur_obj_klass)
+        dump_append(dc, ", \"class\":\"%#"PRIxVALUE"\"", dc->cur_obj_klass);
+    if (rb_obj_frozen_p(obj))
+	dump_append(dc, ", \"frozen\":true");
+
+    switch (BUILTIN_TYPE(obj)) {
+      case T_NONE:
+	dump_append(dc, "}\n");
+	return;
+
+      case T_IMEMO:
+	dump_append(dc, ", \"imemo_type\":\"%s\"", imemo_name(imemo_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");
+	if (is_broken_string(obj))
+	    dump_append(dc, ", \"broken\":true");
+	if (FL_TEST(obj, RSTRING_FSTR))
+	    dump_append(dc, ", \"fstring\":true");
+	if (STR_SHARED_P(obj))
+	    dump_append(dc, ", \"shared\":true");
+	else
+	    dump_append_string_content(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));
+        if (FL_TEST(obj, RHASH_PROC_DEFAULT))
+            dump_append(dc, ", \"default\":\"%#"PRIxVALUE"\"", RHASH_IFNONE(obj));
+	break;
+
+      case T_ARRAY:
+	dump_append(dc, ", \"length\":%ld", RARRAY_LEN(obj));
+	if (RARRAY_LEN(obj) > 0 && FL_TEST(obj, ELTS_SHARED))
+	    dump_append(dc, ", \"shared\":true");
+	if (RARRAY_LEN(obj) > 0 && FL_TEST(obj, RARRAY_EMBED_FLAG))
+	    dump_append(dc, ", \"embedded\":true");
+	break;
+
+      case T_CLASS:
+      case T_MODULE:
+	if (dc->cur_obj_klass)
+	    dump_append(dc, ", \"name\":\"%s\"", rb_class2name(obj));
+	break;
+
+      case T_DATA:
+	if (RTYPEDDATA_P(obj))
+	    dump_append(dc, ", \"struct\":\"%s\"", RTYPEDDATA_TYPE(obj)->wrap_struct_name);
+	break;
+
+      case T_FLOAT:
+	dump_append(dc, ", \"value\":\"%g\"", RFLOAT_VALUE(obj));
+	break;
+
+      case T_OBJECT:
+	dump_append(dc, ", \"ivars\":%u", ROBJECT_NUMIV(obj));
+	break;
+
+      case T_FILE:
+	fptr = RFILE(obj)->fptr;
+	if (fptr)
+	    dump_append(dc, ", \"fd\":%d", fptr->fd);
+	break;
+
+      case T_ZOMBIE:
+	dump_append(dc, "}\n");
+	return;
+    }
+
+    rb_objspace_reachable_objects_from(obj, reachable_object_i, dc);
+    if (dc->cur_obj_references > 0)
+	dump_append(dc, "]");
+
+    if ((ainfo = objspace_lookup_allocation_info(obj))) {
+	dump_append(dc, ", \"file\":\"%s\", \"line\":%lu", ainfo->path, ainfo->line);
+	if (RTEST(ainfo->mid)) {
+	    VALUE m = rb_sym2str(ainfo->mid);
+	    dump_append(dc, ", \"method\":\"%s\"", RSTRING_PTR(m));
+	}
+	dump_append(dc, ", \"generation\":%"PRIuSIZE, ainfo->generation);
+    }
+
+    if ((memsize = rb_obj_memsize_of(obj)) > 0)
+	dump_append(dc, ", \"memsize\":%"PRIuSIZE, memsize);
+
+    if ((n = rb_obj_gc_flags(obj, flags, sizeof(flags))) > 0) {
+	dump_append(dc, ", \"flags\":{");
+	for (i=0; i<n; i++) {
+	    dump_append(dc, "\"%s\":true", rb_id2name(flags[i]));
+	    if (i != n-1) dump_append(dc, ", ");
+	}
+	dump_append(dc, "}");
+    }
+
+    dump_append(dc, "}\n");
+}
+
+static int
+heap_i(void *vstart, void *vend, size_t stride, void *data)
+{
+    struct dump_config *dc = (struct dump_config *)data;
+    VALUE v = (VALUE)vstart;
+    for (; v != (VALUE)vend; v += stride) {
+	if (dc->full_heap || RBASIC(v)->flags)
+	    dump_object(v, dc);
+    }
+    return 0;
+}
+
+static void
+root_obj_i(const char *category, VALUE obj, void *data)
+{
+    struct dump_config *dc = (struct dump_config *)data;
+
+    if (dc->root_category != NULL && category != dc->root_category)
+	dump_append(dc, "]}\n");
+    if (dc->root_category == NULL || category != dc->root_category)
+        dump_append(dc, "{\"type\":\"ROOT\", \"root\":\"%s\", \"references\":[\"%#"PRIxVALUE"\"", category, obj);
+    else
+        dump_append(dc, ", \"%#"PRIxVALUE"\"", obj);
+
+    dc->root_category = category;
+    dc->roots = 1;
+}
+
+static VALUE
+dump_output(struct dump_config *dc, VALUE opts, VALUE output, const char *filename)
+{
+    VALUE tmp;
+
+    dc->full_heap = 0;
+
+    if (RTEST(opts)) {
+	output = rb_hash_aref(opts, sym_output);
+
+	if (Qtrue == rb_hash_lookup2(opts, sym_full, Qfalse))
+	    dc->full_heap = 1;
+    }
+
+    if (output == sym_stdout) {
+	dc->stream = stdout;
+	dc->string = Qnil;
+    }
+    else if (output == sym_file) {
+	rb_io_t *fptr;
+	rb_require("tempfile");
+	tmp = rb_assoc_new(rb_str_new_cstr(filename), rb_str_new_cstr(".json"));
+	tmp = rb_funcallv(rb_path2class("Tempfile"), rb_intern("create"), 1, &tmp);
+      io:
+	dc->string = rb_io_get_write_io(tmp);
+	rb_io_flush(dc->string);
+	GetOpenFile(dc->string, fptr);
+	dc->stream = rb_io_stdio_file(fptr);
+    }
+    else if (output == sym_string) {
+	dc->string = rb_str_new_cstr("");
+    }
+    else if (!NIL_P(tmp = rb_io_check_io(output))) {
+	output = sym_file;
+	goto io;
+    }
+    else {
+	rb_raise(rb_eArgError, "wrong output option: %"PRIsVALUE, output);
+    }
+    return output;
+}
+
+static VALUE
+dump_result(struct dump_config *dc, VALUE output)
+{
+    if (output == sym_string) {
+	return rb_str_resurrect(dc->string);
+    }
+    else if (output == sym_file) {
+	rb_io_flush(dc->string);
+	return dc->string;
+    }
+    else {
+	return Qnil;
+    }
+}
+
+/*
+ *  call-seq:
+ *    ObjectSpace.dump(obj[, output: :string]) # => "{ ... }"
+ *    ObjectSpace.dump(obj, output: :file)     # => #<File:/tmp/rubyobj20131125-88733-1xkfmpv.json>
+ *    ObjectSpace.dump(obj, output: :stdout)   # => nil
+ *
+ *  Dump the contents of a ruby object as JSON.
+ *
+ *  This method is only expected to work with C Ruby.
+ *  This is an experimental method and is subject to change.
+ *  In particular, the function signature and output format are
+ *  not guaranteed to be compatible in future versions of ruby.
+ */
+
+static VALUE
+objspace_dump(int argc, VALUE *argv, VALUE os)
+{
+    static const char filename[] = "rubyobj";
+    VALUE obj = Qnil, opts = Qnil, output;
+    struct dump_config dc = {0,};
+
+    rb_scan_args(argc, argv, "1:", &obj, &opts);
+
+    output = dump_output(&dc, opts, sym_string, filename);
+
+    dump_object(obj, &dc);
+
+    return dump_result(&dc, output);
+}
+
+/*
+ *  call-seq:
+ *    ObjectSpace.dump_all([output: :file]) # => #<File:/tmp/rubyheap20131125-88469-laoj3v.json>
+ *    ObjectSpace.dump_all(output: :stdout) # => nil
+ *    ObjectSpace.dump_all(output: :string) # => "{...}\n{...}\n..."
+ *    ObjectSpace.dump_all(output:
+ *      File.open('heap.json','w'))         # => #<File:heap.json>
+ *
+ *  Dump the contents of the ruby heap as JSON.
+ *
+ *  This method is only expected to work with C Ruby.
+ *  This is an experimental method and is subject to change.
+ *  In particular, the function signature and output format are
+ *  not guaranteed to be compatible in future versions of ruby.
+ */
+
+static VALUE
+objspace_dump_all(int argc, VALUE *argv, VALUE os)
+{
+    static const char filename[] = "rubyheap";
+    VALUE opts = Qnil, output;
+    struct dump_config dc = {0,};
+
+    rb_scan_args(argc, argv, "0:", &opts);
+
+    output = dump_output(&dc, opts, sym_file, filename);
+
+    /* dump roots */
+    rb_objspace_reachable_objects_from_root(root_obj_i, &dc);
+    if (dc.roots) dump_append(&dc, "]}\n");
+
+    /* dump all objects */
+    rb_objspace_each_objects(heap_i, &dc);
+
+    return dump_result(&dc, output);
+}
+
+void
+Init_objspace_dump(VALUE rb_mObjSpace)
+{
+#undef rb_intern
+#if 0
+    rb_mObjSpace = rb_define_module("ObjectSpace"); /* let rdoc know */
+#endif
+
+    rb_define_module_function(rb_mObjSpace, "dump", objspace_dump, -1);
+    rb_define_module_function(rb_mObjSpace, "dump_all", objspace_dump_all, -1);
+
+    sym_output = ID2SYM(rb_intern("output"));
+    sym_stdout = ID2SYM(rb_intern("stdout"));
+    sym_string = ID2SYM(rb_intern("string"));
+    sym_file   = ID2SYM(rb_intern("file"));
+    sym_full   = ID2SYM(rb_intern("full"));
+
+    /* force create static IDs */
+    rb_obj_gc_flags(rb_mObjSpace, 0, 0);
+}
diff --git a/ext/openssl/History.md b/ext/openssl/History.md
new file mode 100644
index 0000000000..db5050014e
--- /dev/null
+++ b/ext/openssl/History.md
@@ -0,0 +1,339 @@
+Version 2.1.2
+=============
+
+Merged changes in 2.0.9.
+
+
+Version 2.1.1
+=============
+
+Merged changes in 2.0.8.
+
+
+Version 2.1.0
+=============
+
+Notable changes
+---------------
+
+* Support for OpenSSL versions before 1.0.1 and LibreSSL versions before 2.5
+  is removed.
+  [[GitHub #86]](https://github.com/ruby/openssl/pull/86)
+* OpenSSL::BN#negative?, #+@, and #-@ are added.
+* OpenSSL::SSL::SSLSocket#connect raises a more informative exception when
+  certificate verification fails.
+  [[GitHub #99]](https://github.com/ruby/openssl/pull/99)
+* OpenSSL::KDF module is newly added. In addition to PBKDF2-HMAC that has moved
+  from OpenSSL::PKCS5, scrypt and HKDF are supported.
+  [[GitHub #109]](https://github.com/ruby/openssl/pull/109)
+  [[GitHub #173]](https://github.com/ruby/openssl/pull/173)
+* OpenSSL.fips_mode is added. We had the setter, but not the getter.
+  [[GitHub #125]](https://github.com/ruby/openssl/pull/125)
+* OpenSSL::OCSP::Request#signed? is added.
+* OpenSSL::ASN1 handles the indefinite length form better. OpenSSL::ASN1.decode
+  no longer wrongly treats the end-of-contents octets as part of the content.
+  OpenSSL::ASN1::ASN1Data#infinite_length is renamed to #indefinite_length.
+  [[GitHub #98]](https://github.com/ruby/openssl/pull/98)
+* OpenSSL::X509::Name#add_entry now accepts two additional keyword arguments
+  'loc' and 'set'.
+  [[GitHub #94]](https://github.com/ruby/openssl/issues/94)
+* OpenSSL::SSL::SSLContext#min_version= and #max_version= are added to replace
+  #ssl_version= that was built on top of the deprecated OpenSSL C API. Use of
+  that method and the constant OpenSSL::SSL::SSLContext::METHODS is now
+  deprecated.
+  [[GitHub #142]](https://github.com/ruby/openssl/pull/142)
+* OpenSSL::X509::Name#to_utf8 is added.
+  [[GitHub #26]](https://github.com/ruby/openssl/issues/26)
+  [[GitHub #143]](https://github.com/ruby/openssl/pull/143)
+* OpenSSL::X509::{Extension,Attribute,Certificate,CRL,Revoked,Request} can be
+  compared with == operator.
+  [[GitHub #161]](https://github.com/ruby/openssl/pull/161)
+* TLS Fallback Signaling Cipher Suite Value (SCSV) support is added.
+  [[GitHub #165]](https://github.com/ruby/openssl/pull/165)
+* Build failure with OpenSSL 1.1 built with no-deprecated is fixed.
+  [[GitHub #160]](https://github.com/ruby/openssl/pull/160)
+* OpenSSL::Buffering#write accepts an arbitrary number of arguments.
+  [[Feature #9323]](https://bugs.ruby-lang.org/issues/9323)
+  [[GitHub #162]](https://github.com/ruby/openssl/pull/162)
+* OpenSSL::PKey::RSA#sign_pss and #verify_pss are added. They perform RSA-PSS
+  signature and verification.
+  [[GitHub #75]](https://github.com/ruby/openssl/issues/75)
+  [[GitHub #76]](https://github.com/ruby/openssl/pull/76)
+  [[GitHub #169]](https://github.com/ruby/openssl/pull/169)
+* OpenSSL::SSL::SSLContext#add_certificate is added.
+  [[GitHub #167]](https://github.com/ruby/openssl/pull/167)
+* OpenSSL::PKey::EC::Point#to_octet_string is added.
+  OpenSSL::PKey::EC::Point.new can now take String as the second argument.
+  [[GitHub #177]](https://github.com/ruby/openssl/pull/177)
+
+
+Version 2.0.9
+=============
+
+Security fixes
+--------------
+
+* OpenSSL::X509::Name#<=> could incorrectly return 0 (= equal) for non-equal
+  objects. CVE-2018-16395 is assigned for this issue.
+  https://hackerone.com/reports/387250
+
+Bug fixes
+---------
+
+* Fixed OpenSSL::PKey::*.{new,generate} immediately aborting if the thread is
+  interrupted.
+  [[Bug #14882]](https://bugs.ruby-lang.org/issues/14882)
+  [[GitHub #205]](https://github.com/ruby/openssl/pull/205)
+* Fixed OpenSSL::X509::Name#to_s failing with OpenSSL::X509::NameError if
+  called against an empty instance.
+  [[GitHub #200]](https://github.com/ruby/openssl/issues/200)
+  [[GitHub #211]](https://github.com/ruby/openssl/pull/211)
+
+
+Version 2.0.8
+=============
+
+Bug fixes
+---------
+
+* OpenSSL::Cipher#pkcs5_keyivgen raises an error when a negative iteration
+  count is given.
+  [[GitHub #184]](https://github.com/ruby/openssl/pull/184)
+* Fixed build with LibreSSL 2.7.
+  [[GitHub #192]](https://github.com/ruby/openssl/issues/192)
+  [[GitHub #193]](https://github.com/ruby/openssl/pull/193)
+
+
+Version 2.0.7
+=============
+
+Bug fixes
+---------
+
+* OpenSSL::Cipher#auth_data= could segfault if called against a non-AEAD cipher.
+  [[Bug #14024]](https://bugs.ruby-lang.org/issues/14024)
+* OpenSSL::X509::Certificate#public_key= (and similar methods) could segfault
+  when an instance of OpenSSL::PKey::PKey with no public key components is
+  passed.
+  [[Bug #14087]](https://bugs.ruby-lang.org/issues/14087)
+  [[GitHub #168]](https://github.com/ruby/openssl/pull/168)
+
+
+Version 2.0.6
+=============
+
+Bug fixes
+---------
+
+* The session_remove_cb set to an OpenSSL::SSL::SSLContext is no longer called
+  during GC.
+* A possible deadlock in OpenSSL::SSL::SSLSocket#sysread is fixed.
+  [[GitHub #139]](https://github.com/ruby/openssl/pull/139)
+* OpenSSL::BN#hash could return an unnormalized fixnum value on Windows.
+  [[Bug #13877]](https://bugs.ruby-lang.org/issues/13877)
+* OpenSSL::SSL::SSLSocket#sysread and #sysread_nonblock set the length of the
+  destination buffer String to 0 on error.
+  [[GitHub #153]](https://github.com/ruby/openssl/pull/153)
+* Possible deadlock is fixed. This happened only when built with older versions
+  of OpenSSL (before 1.1.0) or LibreSSL.
+  [[GitHub #155]](https://github.com/ruby/openssl/pull/155)
+
+
+Version 2.0.5
+=============
+
+Bug fixes
+---------
+
+* Reading a PEM/DER-encoded private key or certificate from an IO object did
+  not work properly on mswin platforms.
+  [[ruby/openssl#128]](https://github.com/ruby/openssl/issues/128)
+* Broken length check in the PEM passphrase callback is fixed.
+* It failed to compile when OpenSSL is configured without TLS 1.0 support.
+
+
+Version 2.0.4
+=============
+
+Bug fixes
+---------
+
+* It now compiles with LibreSSL without renaming on Windows (mswin).
+* A workaround for the error queue leak of X509_load_cert_crl_file() that
+  causes random errors is added.
+  [[Bug #11033]](https://bugs.ruby-lang.org/issues/11033)
+
+
+Version 2.0.3
+=============
+
+Bug fixes
+---------
+
+* OpenSSL::ASN1::Constructive#each which was broken by 2.0.0 is fixed.
+  [[ruby/openssl#96]](https://github.com/ruby/openssl/pull/96)
+* Fixed build with static OpenSSL libraries on Windows.
+  [[Bug #13080]](https://bugs.ruby-lang.org/issues/13080)
+* OpenSSL::X509::Name#eql? which was broken by 2.0.0 is fixed.
+
+
+Version 2.0.2
+=============
+
+Bug fixes
+---------
+
+* Fix build with early 0.9.8 series which did not have SSL_CTX_clear_options().
+  [ruby-core:78693]
+
+
+Version 2.0.1
+=============
+
+Bug fixes
+---------
+
+* A GC issue around OpenSSL::BN is fixed.
+  [[ruby/openssl#87]](https://github.com/ruby/openssl/issues/87)
+* OpenSSL::ASN1 now parses BER encoding of GeneralizedTime without seconds.
+  [[ruby/openssl#88]](https://github.com/ruby/openssl/pull/88)
+
+
+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::SSLContext#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
new file mode 100644
index 0000000000..68cf357294
--- /dev/null
+++ b/ext/openssl/depend
@@ -0,0 +1,1185 @@
+# 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.h
+ossl.o: $(hdrdir)/ruby/assert.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/onigmo.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
+ossl.o: $(hdrdir)/ruby/thread_native.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_kdf.h
+ossl.o: ossl_ns_spki.h
+ossl.o: ossl_ocsp.h
+ossl.o: ossl_pkcs12.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.h
+ossl_asn1.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_asn1.o: ossl_ns_spki.h
+ossl_asn1.o: ossl_ocsp.h
+ossl_asn1.o: ossl_pkcs12.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.h
+ossl_bio.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_bio.o: ossl_ns_spki.h
+ossl_bio.o: ossl_ocsp.h
+ossl_bio.o: ossl_pkcs12.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.h
+ossl_bn.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_bn.o: ossl_ns_spki.h
+ossl_bn.o: ossl_ocsp.h
+ossl_bn.o: ossl_pkcs12.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.h
+ossl_cipher.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_cipher.o: ossl_ns_spki.h
+ossl_cipher.o: ossl_ocsp.h
+ossl_cipher.o: ossl_pkcs12.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.h
+ossl_config.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_config.o: ossl_ns_spki.h
+ossl_config.o: ossl_ocsp.h
+ossl_config.o: ossl_pkcs12.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.h
+ossl_digest.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_digest.o: ossl_ns_spki.h
+ossl_digest.o: ossl_ocsp.h
+ossl_digest.o: ossl_pkcs12.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.h
+ossl_engine.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_engine.o: ossl_ns_spki.h
+ossl_engine.o: ossl_ocsp.h
+ossl_engine.o: ossl_pkcs12.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.h
+ossl_hmac.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_hmac.o: ossl_ns_spki.h
+ossl_hmac.o: ossl_ocsp.h
+ossl_hmac.o: ossl_pkcs12.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_kdf.o: $(RUBY_EXTCONF_H)
+ossl_kdf.o: $(arch_hdrdir)/ruby/config.h
+ossl_kdf.o: $(hdrdir)/ruby.h
+ossl_kdf.o: $(hdrdir)/ruby/assert.h
+ossl_kdf.o: $(hdrdir)/ruby/backward.h
+ossl_kdf.o: $(hdrdir)/ruby/defines.h
+ossl_kdf.o: $(hdrdir)/ruby/encoding.h
+ossl_kdf.o: $(hdrdir)/ruby/intern.h
+ossl_kdf.o: $(hdrdir)/ruby/io.h
+ossl_kdf.o: $(hdrdir)/ruby/missing.h
+ossl_kdf.o: $(hdrdir)/ruby/onigmo.h
+ossl_kdf.o: $(hdrdir)/ruby/oniguruma.h
+ossl_kdf.o: $(hdrdir)/ruby/ruby.h
+ossl_kdf.o: $(hdrdir)/ruby/st.h
+ossl_kdf.o: $(hdrdir)/ruby/subst.h
+ossl_kdf.o: $(hdrdir)/ruby/thread.h
+ossl_kdf.o: openssl_missing.h
+ossl_kdf.o: ossl.h
+ossl_kdf.o: ossl_asn1.h
+ossl_kdf.o: ossl_bio.h
+ossl_kdf.o: ossl_bn.h
+ossl_kdf.o: ossl_cipher.h
+ossl_kdf.o: ossl_config.h
+ossl_kdf.o: ossl_digest.h
+ossl_kdf.o: ossl_engine.h
+ossl_kdf.o: ossl_hmac.h
+ossl_kdf.o: ossl_kdf.c
+ossl_kdf.o: ossl_kdf.h
+ossl_kdf.o: ossl_ns_spki.h
+ossl_kdf.o: ossl_ocsp.h
+ossl_kdf.o: ossl_pkcs12.h
+ossl_kdf.o: ossl_pkcs7.h
+ossl_kdf.o: ossl_pkey.h
+ossl_kdf.o: ossl_rand.h
+ossl_kdf.o: ossl_ssl.h
+ossl_kdf.o: ossl_version.h
+ossl_kdf.o: ossl_x509.h
+ossl_kdf.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.h
+ossl_ns_spki.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.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_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.h
+ossl_ocsp.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.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_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.h
+ossl_pkcs12.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.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_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_pkcs7.o: $(RUBY_EXTCONF_H)
+ossl_pkcs7.o: $(arch_hdrdir)/ruby/config.h
+ossl_pkcs7.o: $(hdrdir)/ruby.h
+ossl_pkcs7.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_pkcs7.o: ossl_ns_spki.h
+ossl_pkcs7.o: ossl_ocsp.h
+ossl_pkcs7.o: ossl_pkcs12.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.h
+ossl_pkey.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_pkey.o: ossl_ns_spki.h
+ossl_pkey.o: ossl_ocsp.h
+ossl_pkey.o: ossl_pkcs12.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.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.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_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.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.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_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.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.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_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.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.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_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.h
+ossl_rand.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_rand.o: ossl_ns_spki.h
+ossl_rand.o: ossl_ocsp.h
+ossl_rand.o: ossl_pkcs12.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.h
+ossl_ssl.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_ssl.o: ossl_ns_spki.h
+ossl_ssl.o: ossl_ocsp.h
+ossl_ssl.o: ossl_pkcs12.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.h
+ossl_ssl_session.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.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_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.h
+ossl_x509.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_x509.o: ossl_ns_spki.h
+ossl_x509.o: ossl_ocsp.h
+ossl_x509.o: ossl_pkcs12.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.h
+ossl_x509attr.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_x509attr.o: ossl_ns_spki.h
+ossl_x509attr.o: ossl_ocsp.h
+ossl_x509attr.o: ossl_pkcs12.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.h
+ossl_x509cert.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_x509cert.o: ossl_ns_spki.h
+ossl_x509cert.o: ossl_ocsp.h
+ossl_x509cert.o: ossl_pkcs12.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.h
+ossl_x509crl.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_x509crl.o: ossl_ns_spki.h
+ossl_x509crl.o: ossl_ocsp.h
+ossl_x509crl.o: ossl_pkcs12.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.h
+ossl_x509ext.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_x509ext.o: ossl_ns_spki.h
+ossl_x509ext.o: ossl_ocsp.h
+ossl_x509ext.o: ossl_pkcs12.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.h
+ossl_x509name.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_x509name.o: ossl_ns_spki.h
+ossl_x509name.o: ossl_ocsp.h
+ossl_x509name.o: ossl_pkcs12.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.h
+ossl_x509req.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_x509req.o: ossl_ns_spki.h
+ossl_x509req.o: ossl_ocsp.h
+ossl_x509req.o: ossl_pkcs12.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.h
+ossl_x509revoked.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_x509revoked.o: ossl_ns_spki.h
+ossl_x509revoked.o: ossl_ocsp.h
+ossl_x509revoked.o: ossl_pkcs12.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.h
+ossl_x509store.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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_kdf.h
+ossl_x509store.o: ossl_ns_spki.h
+ossl_x509store.o: ossl_ocsp.h
+ossl_x509store.o: ossl_pkcs12.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
new file mode 100644
index 0000000000..afe989ead1
--- /dev/null
+++ b/ext/openssl/deprecation.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: false
+module OpenSSL
+  def self.deprecated_warning_flag
+    unless flag = (@deprecated_warning_flag ||= nil)
+      if try_compile("", flag = "-Werror=deprecated-declarations")
+        $warnflags = "#{@warnflags = $warnflags}" #{flag}"
+      else
+        flag = ""
+      end
+      @deprecated_warning_flag = flag
+    end
+    flag
+  end
+
+  def self.restore_warning_flag
+    $warnflags = @warnflags
+  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}")
+  end
+end
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index 920caa641d..264130bb51 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -1,140 +1,174 @@
+# -*- 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 licenced under the same licence as Ruby.
+  This program is licensed under the same licence as Ruby.
   (See the file 'LICENCE'.)
-
-= Version
-  $Id$
 =end
 
 require "mkmf"
+require File.expand_path('../deprecation', __FILE__)
 
 dir_config("openssl")
 dir_config("kerberos")
 
-message "=== OpenSSL for Ruby configurator ===\n"
+Logging::message "=== OpenSSL for Ruby configurator ===\n"
+
+# Check with -Werror=deprecated-declarations if available
+OpenSSL.deprecated_warning_flag
 
 ##
-# Adds -Wall -DOSSL_DEBUG for compilation and some more targets when GCC is used
+# 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") unless $defs.include? "-DOSSL_DEBUG"
-
-  if CONFIG['GCC'] == 'yes'
-    $CPPFLAGS += " -Wall" unless $CPPFLAGS.split.include? "-Wall"
-  end
+  $defs.push("-DOSSL_DEBUG")
 end
 
-message "=== Checking for system dependent stuff... ===\n"
+Logging::message "=== Checking for system dependent stuff... ===\n"
 have_library("nsl", "t_open")
 have_library("socket", "socket")
-have_header("assert.h")
-
-message "=== Checking for required stuff... ===\n"
-if $mingw
-  have_library("wsock32")
-  have_library("gdi32")
+if $mswin || $mingw
+  have_library("ws2_32")
 end
 
+Logging::message "=== Checking for required stuff... ===\n"
 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, "OpenSSL_add_all_digests")}
-  result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")}
-  unless result
-    message "=== Checking for required stuff failed. ===\n"
-    message "Makefile wasn't created. Fix the errors above.\n"
-    exit 1
+def find_openssl_library
+  if $mswin || $mingw
+    # required for static OpenSSL libraries
+    have_library("gdi32") # OpenSSL <= 1.0.2 (for RAND_screen())
+    have_library("crypt32")
   end
-end
 
-unless have_header("openssl/conf_api.h")
-  message "OpenSSL 0.9.6 or later required.\n"
-  exit 1
+  return false unless have_header("openssl/ssl.h")
+
+  ret = have_library("crypto", "CRYPTO_malloc") &&
+    have_library("ssl", "SSL_new")
+  return ret if ret
+
+  if $mswin
+    # OpenSSL >= 1.1.0: libcrypto.lib and libssl.lib.
+    if have_library("libcrypto", "CRYPTO_malloc") &&
+        have_library("libssl", "SSL_new")
+      return true
+    end
+
+    # OpenSSL <= 1.0.2: libeay32.lib and ssleay32.lib.
+    if have_library("libeay32", "CRYPTO_malloc") &&
+        have_library("ssleay32", "SSL_new")
+      return true
+    end
+
+    # LibreSSL: libcrypto-##.lib and libssl-##.lib, where ## is the ABI version
+    # number. We have to find the version number out by scanning libpath.
+    libpath = $LIBPATH.dup
+    libpath |= ENV["LIB"].split(File::PATH_SEPARATOR)
+    libpath.map! { |d| d.tr(File::ALT_SEPARATOR, File::SEPARATOR) }
+
+    ret = [
+      ["crypto", "CRYPTO_malloc"],
+      ["ssl", "SSL_new"]
+    ].all? do |base, func|
+      result = false
+      libs = ["lib#{base}-[0-9][0-9]", "lib#{base}-[0-9][0-9][0-9]"]
+      libs = Dir.glob(libs.map{|l| libpath.map{|d| File.join(d, l + ".*")}}.flatten).map{|path| File.basename(path, ".*")}.uniq
+      libs.each do |lib|
+        result = have_library(lib, func)
+        break if result
+      end
+      result
+    end
+    return ret if ret
+  end
+  return false
 end
 
-%w"rb_str_set_len rb_block_call".each {|func| have_func(func, "ruby.h")}
-
-message "=== Checking for OpenSSL features... ===\n"
-have_func("ERR_peek_last_error")
-have_func("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_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_get_ex_data")
-have_func("X509_STORE_set_ex_data")
-have_func("OBJ_NAME_do_all_sorted")
-have_func("SSL_SESSION_get_id")
-have_func("SSL_SESSION_cmp")
-have_func("OPENSSL_cleanse")
-have_func("SSLv2_method")
-have_func("SSLv2_server_method")
-have_func("SSLv2_client_method")
-unless have_func("SSL_set_tlsext_host_name", ['openssl/ssl.h'])
-  have_macro("SSL_set_tlsext_host_name", ['openssl/ssl.h']) && $defs.push("-DHAVE_SSL_SET_TLSEXT_HOST_NAME")
+unless result
+  unless find_openssl_library
+    Logging::message "=== Checking for required stuff failed. ===\n"
+    Logging::message "Makefile wasn't created. Fix the errors above.\n"
+    raise "OpenSSL library could not be found. You might want to use " \
+      "--with-openssl-dir=<dir> option to specify the prefix where OpenSSL " \
+      "is installed."
+  end
 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_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")
+
+unless checking_for("OpenSSL version is 1.0.1 or later") {
+    try_static_assert("OPENSSL_VERSION_NUMBER >= 0x10001000L", "openssl/opensslv.h") }
+  raise "OpenSSL >= 1.0.1 or LibreSSL is required"
 end
-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")
+
+Logging::message "=== Checking for OpenSSL features... ===\n"
+# compile options
+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")
+}
+
+if ($mswin || $mingw) && have_macro("LIBRESSL_VERSION_NUMBER", "openssl/opensslv.h")
+  $defs.push("-DNOCRYPT")
 end
-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")
 
-message "=== Checking done. ===\n"
+# 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
+if !have_struct_member("SSL", "ctx", "openssl/ssl.h") ||
+    try_static_assert("LIBRESSL_VERSION_NUMBER >= 0x2070000fL", "openssl/opensslv.h")
+  $defs.push("-DHAVE_OPAQUE_OPENSSL")
+end
+have_func("CRYPTO_lock") || $defs.push("-DHAVE_OPENSSL_110_THREADING_API")
+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("EVP_PBE_scrypt")
+
+Logging::message "=== Checking done. ===\n"
 
 create_header
+OpenSSL.restore_warning_flag
 create_makefile("openssl")
-message "Done.\n"
+Logging::message "Done.\n"
diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb
index 3cff8d9c10..0914282920 100644
--- a/ext/openssl/lib/openssl.rb
+++ b/ext/openssl/lib/openssl.rb
@@ -1,25 +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 licenced under the same licence as Ruby.
+  This program is licensed 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'
-require 'openssl/ssl-internal'
-require 'openssl/x509-internal'
-
+require 'openssl/x509'
+require 'openssl/ssl'
+require 'openssl/pkcs5'
diff --git a/ext/openssl/lib/openssl/bn.rb b/ext/openssl/lib/openssl/bn.rb
index b2fca163f1..8d1ebefb6e 100644
--- a/ext/openssl/lib/openssl/bn.rb
+++ b/ext/openssl/lib/openssl/bn.rb
@@ -1,35 +1,40 @@
+# frozen_string_literal: false
 #--
 #
-# $RCSfile$
-#
 # = Ruby-space definitions that completes C-space funcs for BN
-# 
+#
 # = Info
 # 'OpenSSL for Ruby 2' project
 # Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
 # All rights reserved.
-# 
+#
 # = Licence
-# This program is licenced under the same licence as Ruby.
+# This program is licensed 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
 
 ##
+#--
 # Add double dispatch to Integer
-#
+#++
 class Integer
+  # Casts an Integer as an OpenSSL::BN
+  #
+  # See `man bn` for more info.
   def to_bn
-    OpenSSL::BN::new(self.to_s(16), 16)
+    OpenSSL::BN::new(self)
   end
 end # Integer
-
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index eb39dabcef..5d1586e594 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -1,23 +1,23 @@
-=begin
-= $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 licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
+# coding: binary
+# frozen_string_literal: false
+#--
+#= 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.
+#  (See the file 'LICENCE'.)
+#++
 
 ##
 # OpenSSL IO buffering mix-in module.
 #
 # This module allows an OpenSSL::SSL::SSLSocket to behave like an IO.
+#
+# You typically won't use this module directly, you can see it implemented in
+# OpenSSL::SSL::SSLSocket.
 
 module OpenSSL::Buffering
   include Enumerable
@@ -34,7 +34,11 @@ module OpenSSL::Buffering
 
   BLOCK_SIZE = 1024*16
 
-  def initialize(*args)
+  ##
+  # Creates an instance of OpenSSL's buffering IO module.
+
+  def initialize(*)
+    super
     @eof = false
     @rbuffer = ""
     @sync = @io.sync
@@ -59,7 +63,7 @@ module OpenSSL::Buffering
   end
 
   ##
-  # Consumes +size+ bytes from the buffer
+  # Consumes _size_ bytes from the buffer
 
   def consume_rbuff(size=nil)
     if @rbuffer.empty?
@@ -75,7 +79,7 @@ module OpenSSL::Buffering
   public
 
   ##
-  # Reads +size+ bytes from the stream.  If +buf+ is provided it must
+  # Reads _size_ bytes from the stream.  If _buf_ is provided it must
   # reference a string which will receive the data.
   #
   # See IO#read for full details.
@@ -102,7 +106,7 @@ module OpenSSL::Buffering
   end
 
   ##
-  # Reads at most +maxlen+ bytes from the stream.  If +buf+ is provided it
+  # Reads at most _maxlen_ bytes from the stream.  If _buf_ is provided it
   # must reference a string which will receive the data.
   #
   # See IO#readpartial for full details.
@@ -128,12 +132,11 @@ module OpenSSL::Buffering
       buf.replace(ret)
       ret = buf
     end
-    raise EOFError if ret.empty?
     ret
   end
 
   ##
-  # Reads at most +maxlen+ bytes in the non-blocking manner.
+  # Reads at most _maxlen_ bytes in the non-blocking manner.
   #
   # When no data can be read without blocking it raises
   # OpenSSL::SSL::SSLError extended by IO::WaitReadable or IO::WaitWritable.
@@ -160,8 +163,13 @@ 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 a keyword argument _exception_ to +false+, you can indicate
+  # that read_nonblock should not raise an IO::Wait*able exception, but
+  # return the symbol +:wait_writable+ or +:wait_readable+ instead. At EOF,
+  # it will return +nil+ instead of raising EOFError.
 
-  def read_nonblock(maxlen, buf=nil)
+  def read_nonblock(maxlen, buf=nil, exception: true)
     if maxlen == 0
       if buf
         buf.clear
@@ -171,23 +179,22 @@ module OpenSSL::Buffering
       end
     end
     if @rbuffer.empty?
-      return sysread_nonblock(maxlen, buf)
+      return sysread_nonblock(maxlen, buf, exception: exception)
     end
     ret = consume_rbuff(maxlen)
     if buf
       buf.replace(ret)
       ret = buf
     end
-    raise EOFError if ret.empty?
     ret
   end
 
   ##
-  # Reads the next "line+ from the stream.  Lines are separated by +eol+.  If
-  # +limit+ is provided the result will not be longer than the given number of
+  # Reads the next "line" from the stream.  Lines are separated by _eol_.  If
+  # _limit_ is provided the result will not be longer than the given number of
   # bytes.
   #
-  # +eol+ may be a String or Regexp.
+  # _eol_ may be a String or Regexp.
   #
   # Unlike IO#gets the line read will not be assigned to +$_+.
   #
@@ -205,7 +212,7 @@ module OpenSSL::Buffering
     else
       size = idx ? idx+eol.size : nil
     end
-    if limit and limit >= 0
+    if size && limit && limit >= 0
       size = [size, limit].min
     end
     consume_rbuff(size)
@@ -213,7 +220,7 @@ module OpenSSL::Buffering
 
   ##
   # Executes the block for every line in the stream where lines are separated
-  # by +eol+.
+  # by _eol_.
   #
   # See also #gets
 
@@ -225,7 +232,7 @@ module OpenSSL::Buffering
   alias each_line each
 
   ##
-  # Reads lines from the stream which are separated by +eol+.
+  # Reads lines from the stream which are separated by _eol_.
   #
   # See also #gets
 
@@ -238,7 +245,7 @@ module OpenSSL::Buffering
   end
 
   ##
-  # Reads a line from the stream which is separated by +eol+.
+  # Reads a line from the stream which is separated by _eol_.
   #
   # Raises EOFError if at end of file.
 
@@ -274,7 +281,7 @@ module OpenSSL::Buffering
   end
 
   ##
-  # Pushes character +c+ back onto the stream such that a subsequent buffered
+  # Pushes character _c_ back onto the stream such that a subsequent buffered
   # character read will return it.
   #
   # Unlike IO#getc multiple bytes may be pushed back onto the stream.
@@ -301,43 +308,41 @@ module OpenSSL::Buffering
   private
 
   ##
-  # Writes +s+ to the buffer.  When the buffer is full or #sync is true the
+  # Writes _s_ to the buffer.  When the buffer is full or #sync is true the
   # buffer is flushed to the underlying socket.
 
   def do_write(s)
     @wbuffer = "" unless defined? @wbuffer
     @wbuffer << s
+    @wbuffer.force_encoding(Encoding::BINARY)
     @sync ||= false
-    if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/)
-      remain = idx ? idx + $/.size : @wbuffer.length
-      nwritten = 0
-      while remain > 0
-        str = @wbuffer[nwritten,remain]
+    if @sync or @wbuffer.size > BLOCK_SIZE
+      until @wbuffer.empty?
         begin
-          nwrote = syswrite(str)
+          nwrote = syswrite(@wbuffer)
         rescue Errno::EAGAIN
           retry
         end
-        remain -= nwrote
-        nwritten += nwrote
+        @wbuffer[0, nwrote] = ""
       end
-      @wbuffer[0,nwritten] = ""
     end
   end
 
   public
 
   ##
-  # Writes +s+ to the stream.  If the argument is not a string it will be
-  # converted using String#to_s.  Returns the number of bytes written.
+  # Writes _s_ to the stream.  If the argument is not a String it will be
+  # converted using +.to_s+ method.  Returns the number of bytes written.
 
-  def write(s)
-    do_write(s)
-    s.length
+  def write(*s)
+    s.inject(0) do |written, str|
+      do_write(str)
+      written + str.bytesize
+    end
   end
 
   ##
-  # Writes +str+ in the non-blocking manner.
+  # Writes _s_ in the non-blocking manner.
   #
   # If there is buffered data, it is flushed first.  This may block.
   #
@@ -368,23 +373,27 @@ 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 a keyword argument _exception_ to +false+, you can 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)
+  def write_nonblock(s, exception: true)
     flush
-    syswrite_nonblock(s)
+    syswrite_nonblock(s, exception: exception)
   end
 
   ##
-  # Writes +s+ to the stream.  +s+ will be converted to a String using
-  # String#to_s.
+  # Writes _s_ to the stream.  _s_ will be converted to a String using
+  # +.to_s+ method.
 
-  def << (s)
+  def <<(s)
     do_write(s)
     self
   end
 
   ##
-  # Writes +args+ to the stream along with a record separator.
+  # Writes _args_ to the stream along with a record separator.
   #
   # See IO#puts for full details.
 
@@ -395,16 +404,14 @@ module OpenSSL::Buffering
     end
     args.each{|arg|
       s << arg.to_s
-      if $/ && /\n\z/ !~ s
-        s << "\n"
-      end
+      s.sub!(/(?<!\n)\z/, "\n")
     }
     do_write(s)
     nil
   end
 
   ##
-  # Writes +args+ to the stream.
+  # Writes _args_ to the stream.
   #
   # See IO#print for full details.
 
diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb
index eb146fb552..af721b3a80 100644
--- a/ext/openssl/lib/openssl/cipher.rb
+++ b/ext/openssl/lib/openssl/cipher.rb
@@ -1,21 +1,15 @@
+# frozen_string_literal: false
 #--
-#
-# $RCSfile$
-#
 # = Ruby-space predefined Cipher subclasses
-# 
+#
 # = Info
 # 'OpenSSL for Ruby 2' project
 # Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
 # All rights reserved.
-# 
+#
 # = Licence
-# This program is licenced under the same licence as Ruby.
+# This program is licensed under the same licence as Ruby.
 # (See the file 'LICENCE'.)
-# 
-# = Version
-# $Id$
-#
 #++
 
 module OpenSSL
@@ -24,7 +18,7 @@ module OpenSSL
       klass = Class.new(Cipher){
         define_method(:initialize){|*args|
           cipher_name = args.inject(name){|n, arg| "#{n}-#{arg}" }
-          super(cipher_name)
+          super(cipher_name.downcase)
         }
       }
       const_set(name, klass)
@@ -32,34 +26,42 @@ module OpenSSL
 
     %w(128 192 256).each{|keylen|
       klass = Class.new(Cipher){
-        define_method(:initialize){|mode|
-          mode ||= "CBC"
-          cipher_name = "AES-#{keylen}-#{mode}"
-          super(cipher_name)
+        define_method(:initialize){|mode = "CBC"|
+          super("aes-#{keylen}-#{mode}".downcase)
         }
       }
       const_set("AES#{keylen}", klass)
     }
 
-    # Generate, set, and return a random key.
-    # You must call cipher.encrypt or cipher.decrypt before calling this method.
+    # 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.
     def random_key
       str = OpenSSL::Random.random_bytes(self.key_len)
       self.key = str
-      return str
     end
 
-    # Generate, set, and return a random iv.
-    # You must call cipher.encrypt or cipher.decrypt before calling this method.
+    # 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.
     def random_iv
       str = OpenSSL::Random.random_bytes(self.iv_len)
       self.iv = str
-      return str
     end
 
-    # This class is only provided for backwards compatibility.  Use OpenSSL::Cipher in the future.
-    class Cipher < Cipher
-      # add warning
-    end
+    # Deprecated.
+    #
+    # This class is only provided for backwards compatibility.
+    # Use OpenSSL::Cipher.
+    class Cipher < Cipher; end
+    deprecate_constant :Cipher
   end # Cipher
 end # OpenSSL
diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb
index 24a54c91ec..48d8be0069 100644
--- a/ext/openssl/lib/openssl/config.rb
+++ b/ext/openssl/lib/openssl/config.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 =begin
 = Ruby-space definitions that completes C-space funcs for Config
 
@@ -5,7 +6,7 @@
   Copyright (C) 2010  Hiroshi Nakamura <nahi@ruby-lang.org>
 
 = Licence
-  This program is licenced under the same licence as Ruby.
+  This program is licensed under the same licence as Ruby.
   (See the file 'LICENCE'.)
 
 =end
@@ -13,20 +14,42 @@
 require 'stringio'
 
 module OpenSSL
+  ##
+  # = OpenSSL::Config
+  #
+  # Configuration for the openssl library.
+  #
+  # Many system's installation of openssl library will depend on your system
+  # configuration. See the value of OpenSSL::Config::DEFAULT_CONFIG_FILE for
+  # the location of the file for your host.
+  #
+  # See also http://www.openssl.org/docs/apps/config.html
   class Config
     include Enumerable
 
     class << self
-      def parse(str)
+
+      ##
+      # Parses a given _string_ as a blob that contains configuration for
+      # OpenSSL.
+      #
+      # If the source of the IO is a file, then consider using #parse_config.
+      def parse(string)
         c = new()
-        parse_config(StringIO.new(str)).each do |section, hash|
+        parse_config(StringIO.new(string)).each do |section, hash|
           c[section] = hash
         end
         c
       end
 
+      ##
+      # load is an alias to ::new
       alias load new
 
+      ##
+      # Parses the configuration data read from _io_, see also #parse.
+      #
+      # Raises a ConfigError on invalid configuration data.
       def parse_config(io)
         begin
           parse_config_lines(io)
@@ -209,6 +232,18 @@ module OpenSSL
       end
     end
 
+    ##
+    # Creates an instance of OpenSSL's configuration class.
+    #
+    # This can be used in contexts like OpenSSL::X509::ExtensionFactory.config=
+    #
+    # If the optional _filename_ parameter is provided, then it is read in and
+    # parsed via #parse_config.
+    #
+    # This can raise IO exceptions based on the access, or availability of the
+    # file. A ConfigError exception may be raised depending on the validity of
+    # the data being configured.
+    #
     def initialize(filename = nil)
       @data = {}
       if filename
@@ -220,6 +255,23 @@ module OpenSSL
       end
     end
 
+    ##
+    # Gets the value of _key_ from the given _section_
+    #
+    # Given the following configurating file being loaded:
+    #
+    #   config = OpenSSL::Config.load('foo.cnf')
+    #     #=> #<OpenSSL::Config sections=["default"]>
+    #   puts config.to_s
+    #     #=> [ default ]
+    #     #   foo=bar
+    #
+    # You can get a specific value from the config if you know the _section_
+    # and _key_ like so:
+    #
+    #   config.get_value('default','foo')
+    #     #=> "bar"
+    #
     def get_value(section, key)
       if section.nil?
         raise TypeError.new('nil not allowed')
@@ -228,7 +280,12 @@ module OpenSSL
       get_key_string(section, key)
     end
 
-    def value(arg1, arg2 = nil)
+    ##
+    #
+    # *Deprecated*
+    #
+    # Use #get_value instead
+    def value(arg1, arg2 = nil) # :nodoc:
       warn('Config#value is deprecated; use Config#get_value')
       if arg2.nil?
         section, key = 'default', arg1
@@ -240,20 +297,84 @@ module OpenSSL
       get_key_string(section, key)
     end
 
+    ##
+    # Set the target _key_ with a given _value_ under a specific _section_.
+    #
+    # Given the following configurating file being loaded:
+    #
+    #   config = OpenSSL::Config.load('foo.cnf')
+    #     #=> #<OpenSSL::Config sections=["default"]>
+    #   puts config.to_s
+    #     #=> [ default ]
+    #     #   foo=bar
+    #
+    # You can set the value of _foo_ under the _default_ section to a new
+    # value:
+    #
+    #   config.add_value('default', 'foo', 'buzz')
+    #     #=> "buzz"
+    #   puts config.to_s
+    #     #=> [ default ]
+    #     #   foo=buzz
+    #
     def add_value(section, key, value)
       check_modify
       (@data[section] ||= {})[key] = value
     end
 
+    ##
+    # Get a specific _section_ from the current configuration
+    #
+    # Given the following configurating file being loaded:
+    #
+    #   config = OpenSSL::Config.load('foo.cnf')
+    #     #=> #<OpenSSL::Config sections=["default"]>
+    #   puts config.to_s
+    #     #=> [ default ]
+    #     #   foo=bar
+    #
+    # You can get a hash of the specific section like so:
+    #
+    #   config['default']
+    #     #=> {"foo"=>"bar"}
+    #
     def [](section)
       @data[section] || {}
     end
 
-    def section(name)
+    ##
+    # Deprecated
+    #
+    # Use #[] instead
+    def section(name) # :nodoc:
       warn('Config#section is deprecated; use Config#[]')
       @data[name] || {}
     end
 
+    ##
+    # Sets a specific _section_ name with a Hash _pairs_.
+    #
+    # Given the following configuration being created:
+    #
+    #   config = OpenSSL::Config.new
+    #     #=> #<OpenSSL::Config sections=[]>
+    #   config['default'] = {"foo"=>"bar","baz"=>"buz"}
+    #     #=> {"foo"=>"bar", "baz"=>"buz"}
+    #   puts config.to_s
+    #     #=> [ default ]
+    #     #   foo=bar
+    #     #   baz=buz
+    #
+    # It's important to note that this will essentially merge any of the keys
+    # in _pairs_ with the existing _section_. For example:
+    #
+    #   config['default']
+    #     #=> {"foo"=>"bar", "baz"=>"buz"}
+    #   config['default'] = {"foo" => "changed"}
+    #     #=> {"foo"=>"changed"}
+    #   config['default']
+    #     #=> {"foo"=>"changed", "baz"=>"buz"}
+    #
     def []=(section, pairs)
       check_modify
       @data[section] ||= {}
@@ -262,10 +383,38 @@ module OpenSSL
       end
     end
 
+    ##
+    # Get the names of all sections in the current configuration
     def sections
       @data.keys
     end
 
+    ##
+    # Get the parsable form of the current configuration
+    #
+    # Given the following configuration being created:
+    #
+    #   config = OpenSSL::Config.new
+    #     #=> #<OpenSSL::Config sections=[]>
+    #   config['default'] = {"foo"=>"bar","baz"=>"buz"}
+    #     #=> {"foo"=>"bar", "baz"=>"buz"}
+    #   puts config.to_s
+    #     #=> [ default ]
+    #     #   foo=bar
+    #     #   baz=buz
+    #
+    # You can parse get the serialized configuration using #to_s and then parse
+    # it later:
+    #
+    #   serialized_config = config.to_s
+    #   # much later...
+    #   new_config = OpenSSL::Config.parse(serialized_config)
+    #     #=> #<OpenSSL::Config sections=["default"]>
+    #   puts new_config
+    #     #=> [ default ]
+    #         foo=bar
+    #         baz=buz
+    #
     def to_s
       ary = []
       @data.keys.sort.each do |section|
@@ -278,6 +427,15 @@ module OpenSSL
       ary.join
     end
 
+    ##
+    # For a block.
+    #
+    # Receive the section and its pairs for the current configuration.
+    #
+    #   config.each do |section, key, value|
+    #     # ...
+    #   end
+    #
     def each
       @data.each do |section, hash|
         hash.each do |key, value|
@@ -286,13 +444,16 @@ module OpenSSL
       end
     end
 
+    ##
+    # String representation of this configuration object, including the class
+    # name and its sections.
     def inspect
       "#<#{self.class.name} sections=#{sections.inspect}>"
     end
 
   protected
 
-    def data
+    def data # :nodoc:
       @data
     end
 
diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index b47007165c..b6744de6bd 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -1,72 +1,75 @@
+# frozen_string_literal: false
 #--
-#
-# $RCSfile$
-#
 # = Ruby-space predefined Digest subclasses
-# 
+#
 # = Info
 # 'OpenSSL for Ruby 2' project
 # Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
 # All rights reserved.
-# 
+#
 # = Licence
-# This program is licenced under the same licence as Ruby.
+# This program is licensed under the same licence as Ruby.
 # (See the file 'LICENCE'.)
-# 
-# = Version
-# $Id$
-#
 #++
 
 module OpenSSL
   class Digest
 
-    alg = %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1)
-    if OPENSSL_VERSION_NUMBER > 0x00908000
-      alg += %w(SHA224 SHA256 SHA384 SHA512)
+    alg = %w(MD2 MD4 MD5 MDC2 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512)
+    if OPENSSL_VERSION_NUMBER < 0x10100000
+      alg += %w(DSS DSS1 SHA)
     end
 
-    # Return the +data+ hash computed with +name+ Digest. +name+ is either the
+    # Return the hash value computed with _name_ Digest. _name_ is either the
     # long name or short name of a supported digest algorithm.
     #
     # === Examples
     #
-    #   OpenSSL::Digest.digest("SHA256, "abc")
+    #   OpenSSL::Digest.digest("SHA256", "abc")
     #
     # which is equivalent to:
     #
     #   OpenSSL::Digest::SHA256.digest("abc")
 
     def self.digest(name, data)
-        super(data, name)
+      super(data, name)
     end
 
     alg.each{|name|
-      klass = Class.new(Digest){
-        define_method(:initialize){|*data|
-          if data.length > 1
-            raise ArgumentError,
-              "wrong number of arguments (#{data.length} for 1)"
-          end
-          super(name, data.first)
-        }
+      klass = Class.new(self) {
+        define_method(:initialize, ->(data = nil) {super(name, data)})
       }
       singleton = (class << klass; self; end)
       singleton.class_eval{
-        define_method(:digest){|data| Digest.digest(name, data) }
-        define_method(:hexdigest){|data| Digest.hexdigest(name, data) }
+        define_method(:digest){|data| new.digest(data) }
+        define_method(:hexdigest){|data| new.hexdigest(data) }
       }
       const_set(name, klass)
     }
 
-    # This class is only provided for backwards compatibility.  Use OpenSSL::Digest in the future.
-    class Digest < Digest
-      def initialize(*args)
-        # add warning
-        super(*args)
-      end
-    end
+    # Deprecated.
+    #
+    # This class is only provided for backwards compatibility.
+    # Use OpenSSL::Digest instead.
+    class Digest < Digest; end # :nodoc:
+    deprecate_constant :Digest
 
   end # Digest
-end # OpenSSL
 
+  # Returns a Digest subclass by _name_
+  #
+  #   require 'openssl'
+  #
+  #   OpenSSL::Digest("MD5")
+  #   # => OpenSSL::Digest::MD5
+  #
+  #   Digest("Foo")
+  #   # => NameError: wrong constant name Foo
+
+  def Digest(name)
+    OpenSSL::Digest.const_get(name)
+  end
+
+  module_function :Digest
+
+end # OpenSSL
diff --git a/ext/openssl/lib/openssl/pkcs5.rb b/ext/openssl/lib/openssl/pkcs5.rb
new file mode 100644
index 0000000000..959447df5e
--- /dev/null
+++ b/ext/openssl/lib/openssl/pkcs5.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: false
+#--
+# Ruby/OpenSSL Project
+# Copyright (C) 2017 Ruby/OpenSSL Project Authors
+#++
+
+module OpenSSL
+  module PKCS5
+    module_function
+
+    # OpenSSL::PKCS5.pbkdf2_hmac has been renamed to OpenSSL::KDF.pbkdf2_hmac.
+    # This method is provided for backwards compatibility.
+    def pbkdf2_hmac(pass, salt, iter, keylen, digest)
+      OpenSSL::KDF.pbkdf2_hmac(pass, salt: salt, iterations: iter,
+                               length: keylen, hash: digest)
+    end
+
+    def pbkdf2_hmac_sha1(pass, salt, iter, keylen)
+      pbkdf2_hmac(pass, salt, iter, keylen, "sha1")
+    end
+  end
+end
diff --git a/ext/openssl/lib/openssl/pkey.rb b/ext/openssl/lib/openssl/pkey.rb
new file mode 100644
index 0000000000..8a547c340d
--- /dev/null
+++ b/ext/openssl/lib/openssl/pkey.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: false
+#--
+# Ruby/OpenSSL Project
+# Copyright (C) 2017 Ruby/OpenSSL Project Authors
+#++
+
+module OpenSSL::PKey
+  if defined?(EC)
+  class EC::Point
+    # :call-seq:
+    #    point.to_bn([conversion_form]) -> OpenSSL::BN
+    #
+    # Returns the octet string representation of the EC point as an instance of
+    # OpenSSL::BN.
+    #
+    # If _conversion_form_ is not given, the _point_conversion_form_ attribute
+    # set to the group is used.
+    #
+    # See #to_octet_string for more information.
+    def to_bn(conversion_form = group.point_conversion_form)
+      OpenSSL::BN.new(to_octet_string(conversion_form), 2)
+    end
+  end
+  end
+end
diff --git a/ext/openssl/lib/openssl/ssl-internal.rb b/ext/openssl/lib/openssl/ssl-internal.rb
deleted file mode 100644
index c70b5b8f6b..0000000000
--- a/ext/openssl/lib/openssl/ssl-internal.rb
+++ /dev/null
@@ -1,177 +0,0 @@
-=begin
-= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for SSL
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-require "openssl/buffering"
-require "fcntl"
-
-module OpenSSL
-  module SSL
-    class SSLContext
-      DEFAULT_PARAMS = {
-        :ssl_version => "SSLv23",
-        :verify_mode => OpenSSL::SSL::VERIFY_PEER,
-        :ciphers => "ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW",
-        :options => OpenSSL::SSL::OP_ALL,
-      }
-
-      DEFAULT_CERT_STORE = OpenSSL::X509::Store.new
-      DEFAULT_CERT_STORE.set_default_paths
-      if defined?(OpenSSL::X509::V_FLAG_CRL_CHECK_ALL)
-        DEFAULT_CERT_STORE.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
-      end
-
-      def set_params(params={})
-        params = DEFAULT_PARAMS.merge(params)
-        params.each{|name, value| self.__send__("#{name}=", value) }
-        if self.verify_mode != OpenSSL::SSL::VERIFY_NONE
-          unless self.ca_file or self.ca_path or self.cert_store
-            self.cert_store = DEFAULT_CERT_STORE
-          end
-        end
-        return params
-      end
-    end
-
-    module SocketForwarder
-      def addr
-        to_io.addr
-      end
-
-      def peeraddr
-        to_io.peeraddr
-      end
-
-      def setsockopt(level, optname, optval)
-        to_io.setsockopt(level, optname, optval)
-      end
-
-      def getsockopt(level, optname)
-        to_io.getsockopt(level, optname)
-      end
-
-      def fcntl(*args)
-        to_io.fcntl(*args)
-      end
-
-      def closed?
-        to_io.closed?
-      end
-
-      def do_not_reverse_lookup=(flag)
-        to_io.do_not_reverse_lookup = flag
-      end
-    end
-
-    module Nonblock
-      def initialize(*args)
-        flag = File::NONBLOCK
-        flag |= @io.fcntl(Fcntl::F_GETFL) if defined?(Fcntl::F_GETFL)
-        @io.fcntl(Fcntl::F_SETFL, flag)
-        super
-      end
-    end
-
-    def verify_certificate_identity(cert, hostname)
-      should_verify_common_name = true
-      cert.extensions.each{|ext|
-        next if ext.oid != "subjectAltName"
-        ext.value.split(/,\s+/).each{|general_name|
-          if /\ADNS:(.*)/ =~ general_name
-            should_verify_common_name = false
-            reg = Regexp.escape($1).gsub(/\\\*/, "[^.]+")
-            return true if /\A#{reg}\z/i =~ hostname
-          elsif /\AIP Address:(.*)/ =~ general_name
-            should_verify_common_name = false
-            return true if $1 == hostname
-          end
-        }
-      }
-      if should_verify_common_name
-        cert.subject.to_a.each{|oid, value|
-          if oid == "CN"
-            reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+")
-            return true if /\A#{reg}\z/i =~ hostname
-          end
-        }
-      end
-      return false
-    end
-    module_function :verify_certificate_identity
-
-    class SSLSocket
-      include Buffering
-      include SocketForwarder
-      include Nonblock
-
-      def post_connection_check(hostname)
-        unless OpenSSL::SSL.verify_certificate_identity(peer_cert, hostname)
-          raise SSLError, "hostname does not match the server certificate"
-        end
-        return true
-      end
-
-      def session
-        SSL::Session.new(self)
-      rescue SSL::Session::SessionError
-        nil
-      end
-    end
-
-    class SSLServer
-      include SocketForwarder
-      attr_accessor :start_immediately
-
-      def initialize(svr, ctx)
-        @svr = svr
-        @ctx = ctx
-        unless ctx.session_id_context
-          session_id = OpenSSL::Digest::MD5.hexdigest($0)
-          @ctx.session_id_context = session_id
-        end
-        @start_immediately = true
-      end
-
-      def to_io
-        @svr
-      end
-
-      def listen(backlog=5)
-        @svr.listen(backlog)
-      end
-
-      def shutdown(how=Socket::SHUT_RDWR)
-        @svr.shutdown(how)
-      end
-
-      def accept
-        sock = @svr.accept
-        begin
-          ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
-          ssl.sync_close = true
-          ssl.accept if @start_immediately
-          ssl
-        rescue SSLError => ex
-          sock.close
-          raise ex
-        end
-      end
-
-      def close
-        @svr.close
-      end
-    end
-  end
-end
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index 15f42d6091..355eb2ebbb 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -1,2 +1,504 @@
-warn 'deprecated openssl/ssl use: require "openssl" instead of "openssl/ssl"'
-require 'openssl'
+# frozen_string_literal: false
+=begin
+= 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.
+  (See the file 'LICENCE'.)
+=end
+
+require "openssl/buffering"
+require "io/nonblock"
+require "ipaddr"
+
+module OpenSSL
+  module SSL
+    class SSLContext
+      DEFAULT_PARAMS = { # :nodoc:
+        :min_version => OpenSSL::SSL::TLS1_VERSION,
+        :verify_mode => OpenSSL::SSL::VERIFY_PEER,
+        :verify_hostname => true,
+        :options => -> {
+          opts = OpenSSL::SSL::OP_ALL
+          opts &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
+          opts |= OpenSSL::SSL::OP_NO_COMPRESSION
+          opts
+        }.call
+      }
+
+      if defined?(OpenSSL::PKey::DH)
+        DEFAULT_2048 = OpenSSL::PKey::DH.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_
+        private_constant :DEFAULT_2048
+
+        DEFAULT_TMP_DH_CALLBACK = lambda { |ctx, is_export, keylen| # :nodoc:
+          warn "using default DH parameters." if $VERBOSE
+          DEFAULT_2048
+        }
+      end
+
+      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.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
+
+      # call-seq:
+      #    SSLContext.new           -> ctx
+      #    SSLContext.new(:TLSv1)   -> ctx
+      #    SSLContext.new("SSLv23") -> ctx
+      #
+      # Creates a new SSL context.
+      #
+      # If an argument is given, #ssl_version= is called with the value. Note
+      # that this form is deprecated. New applications should use #min_version=
+      # and #max_version= as necessary.
+      def initialize(version = nil)
+        self.options |= OpenSSL::SSL::OP_ALL
+        self.ssl_version = version if version
+      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.
+      # 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)
+        self.options = params.delete(:options) # set before min_version/max_version
+        params.each{|name, value| self.__send__("#{name}=", value) }
+        if self.verify_mode != OpenSSL::SSL::VERIFY_NONE
+          unless self.ca_file or self.ca_path or self.cert_store
+            self.cert_store = DEFAULT_CERT_STORE
+          end
+        end
+        return params
+      end
+
+      # call-seq:
+      #    ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
+      #    ctx.min_version = :TLS1_2
+      #    ctx.min_version = nil
+      #
+      # Sets the lower bound on the supported SSL/TLS protocol version. The
+      # version may be specified by an integer constant named
+      # OpenSSL::SSL::*_VERSION, a Symbol, or +nil+ which means "any version".
+      #
+      # Be careful that you don't overwrite OpenSSL::SSL::OP_NO_{SSL,TLS}v*
+      # options by #options= once you have called #min_version= or
+      # #max_version=.
+      #
+      # === Example
+      #   ctx = OpenSSL::SSL::SSLContext.new
+      #   ctx.min_version = OpenSSL::SSL::TLS1_1_VERSION
+      #   ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+      #
+      #   sock = OpenSSL::SSL::SSLSocket.new(tcp_sock, ctx)
+      #   sock.connect # Initiates a connection using either TLS 1.1 or TLS 1.2
+      def min_version=(version)
+        set_minmax_proto_version(version, @max_proto_version ||= nil)
+        @min_proto_version = version
+      end
+
+      # call-seq:
+      #    ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+      #    ctx.max_version = :TLS1_2
+      #    ctx.max_version = nil
+      #
+      # Sets the upper bound of the supported SSL/TLS protocol version. See
+      # #min_version= for the possible values.
+      def max_version=(version)
+        set_minmax_proto_version(@min_proto_version ||= nil, version)
+        @max_proto_version = version
+      end
+
+      # call-seq:
+      #    ctx.ssl_version = :TLSv1
+      #    ctx.ssl_version = "SSLv23"
+      #
+      # Sets the SSL/TLS protocol version for the context. This forces
+      # connections to use only the specified protocol version. This is
+      # deprecated and only provided for backwards compatibility. Use
+      # #min_version= and #max_version= instead.
+      #
+      # === History
+      # As the name hints, this used to call the SSL_CTX_set_ssl_version()
+      # function which sets the SSL method used for connections created from
+      # the context. As of Ruby/OpenSSL 2.1, this accessor method is
+      # implemented to call #min_version= and #max_version= instead.
+      def ssl_version=(meth)
+        meth = meth.to_s if meth.is_a?(Symbol)
+        if /(?<type>_client|_server)\z/ =~ meth
+          meth = $`
+          if $VERBOSE
+            warn "#{caller(1, 1)[0]}: method type #{type.inspect} is ignored"
+          end
+        end
+        version = METHODS_MAP[meth.intern] or
+          raise ArgumentError, "unknown SSL method `%s'" % meth
+        set_minmax_proto_version(version, version)
+        @min_proto_version = @max_proto_version = version
+      end
+
+      METHODS_MAP = {
+        SSLv23: 0,
+        SSLv2: OpenSSL::SSL::SSL2_VERSION,
+        SSLv3: OpenSSL::SSL::SSL3_VERSION,
+        TLSv1: OpenSSL::SSL::TLS1_VERSION,
+        TLSv1_1: OpenSSL::SSL::TLS1_1_VERSION,
+        TLSv1_2: OpenSSL::SSL::TLS1_2_VERSION,
+      }.freeze
+      private_constant :METHODS_MAP
+
+      # The list of available SSL/TLS methods. This constant is only provided
+      # for backwards compatibility.
+      METHODS = METHODS_MAP.flat_map { |name,|
+        [name, :"#{name}_client", :"#{name}_server"]
+      }.freeze
+      deprecate_constant :METHODS
+    end
+
+    module SocketForwarder
+      def addr
+        to_io.addr
+      end
+
+      def peeraddr
+        to_io.peeraddr
+      end
+
+      def setsockopt(level, optname, optval)
+        to_io.setsockopt(level, optname, optval)
+      end
+
+      def getsockopt(level, optname)
+        to_io.getsockopt(level, optname)
+      end
+
+      def fcntl(*args)
+        to_io.fcntl(*args)
+      end
+
+      def closed?
+        to_io.closed?
+      end
+
+      def do_not_reverse_lookup=(flag)
+        to_io.do_not_reverse_lookup = flag
+      end
+    end
+
+    def verify_certificate_identity(cert, hostname)
+      should_verify_common_name = true
+      cert.extensions.each{|ext|
+        next if ext.oid != "subjectAltName"
+        ostr = OpenSSL::ASN1.decode(ext.to_der).value.last
+        sequence = OpenSSL::ASN1.decode(ostr.value)
+        sequence.value.each{|san|
+          case san.tag
+          when 2 # dNSName in GeneralName (RFC5280)
+            should_verify_common_name = false
+            return true if verify_hostname(hostname, san.value)
+          when 7 # iPAddress in GeneralName (RFC5280)
+            should_verify_common_name = false
+            if san.value.size == 4 || san.value.size == 16
+              begin
+                return true if san.value == IPAddr.new(hostname).hton
+              rescue IPAddr::InvalidAddressError
+              end
+            end
+          end
+        }
+      }
+      if should_verify_common_name
+        cert.subject.to_a.each{|oid, value|
+          if oid == "CN"
+            return true if verify_hostname(hostname, value)
+          end
+        }
+      end
+      return false
+    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
+
+      attr_reader :hostname
+
+      # 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::SSL::SSLContext::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
+
+    ##
+    # SSLServer represents a TCP/IP server socket with Secure Sockets Layer.
+    class SSLServer
+      include SocketForwarder
+      # When true then #accept works exactly the same as TCPServer#accept
+      attr_accessor :start_immediately
+
+      # Creates a new instance of SSLServer.
+      # * _srv_ is an instance of TCPServer.
+      # * _ctx_ is an instance of OpenSSL::SSL::SSLContext.
+      def initialize(svr, ctx)
+        @svr = svr
+        @ctx = ctx
+        unless ctx.session_id_context
+          # see #6137 - session id may not exceed 32 bytes
+          prng = ::Random.new($0.hash)
+          session_id = prng.bytes(16).unpack('H*')[0]
+          @ctx.session_id_context = session_id
+        end
+        @start_immediately = true
+      end
+
+      # Returns the TCPServer passed to the SSLServer when initialized.
+      def to_io
+        @svr
+      end
+
+      # See TCPServer#listen for details.
+      def listen(backlog=5)
+        @svr.listen(backlog)
+      end
+
+      # See BasicSocket#shutdown for details.
+      def shutdown(how=Socket::SHUT_RDWR)
+        @svr.shutdown(how)
+      end
+
+      # Works similar to TCPServer#accept.
+      def accept
+        # Socket#accept returns [socket, addrinfo].
+        # TCPServer#accept returns a socket.
+        # The following comma strips addrinfo.
+        sock, = @svr.accept
+        begin
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
+          ssl.sync_close = true
+          ssl.accept if @start_immediately
+          ssl
+        rescue Exception => ex
+          if ssl
+            ssl.close
+          else
+            sock.close
+          end
+          raise ex
+        end
+      end
+
+      # See IO#close for details.
+      def close
+        @svr.close
+      end
+    end
+  end
+end
diff --git a/ext/openssl/lib/openssl/x509-internal.rb b/ext/openssl/lib/openssl/x509-internal.rb
deleted file mode 100644
index 47e3a6f876..0000000000
--- a/ext/openssl/lib/openssl/x509-internal.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-=begin
-= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for X509 and subclasses
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
-
-module OpenSSL
-  module X509
-    class ExtensionFactory
-      def create_extension(*arg)
-        if arg.size > 1
-          create_ext(*arg)
-        else
-          send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
-        end
-      end
-
-      def create_ext_from_array(ary)
-        raise ExtensionError, "unexpected array form" if ary.size > 3
-        create_ext(ary[0], ary[1], ary[2])
-      end
-
-      def create_ext_from_string(str) # "oid = critical, value"
-        oid, value = str.split(/=/, 2)
-        oid.strip!
-        value.strip!
-        create_ext(oid, value)
-      end
-
-      def create_ext_from_hash(hash)
-        create_ext(hash["oid"], hash["value"], hash["critical"])
-      end
-    end
-
-    class Extension
-      def to_s # "oid = critical, value"
-        str = self.oid
-        str << " = "
-        str << "critical, " if self.critical?
-        str << self.value.gsub(/\n/, ", ")
-      end
-
-      def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
-        {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
-      end
-
-      def to_a
-        [ self.oid, self.value, self.critical? ]
-      end
-    end
-
-    class Name
-      module RFC2253DN
-        Special = ',=+<>#;'
-        HexChar = /[0-9a-fA-F]/
-        HexPair = /#{HexChar}#{HexChar}/
-        HexString = /#{HexPair}+/
-        Pair = /\\(?:[#{Special}]|\\|"|#{HexPair})/
-        StringChar = /[^#{Special}\\"]/
-        QuoteChar = /[^\\"]/
-        AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/
-        AttributeValue = /
-          (?!["#])((?:#{StringChar}|#{Pair})*)|
-          \#(#{HexString})|
-          "((?:#{QuoteChar}|#{Pair})*)"
-        /x
-        TypeAndValue = /\A(#{AttributeType})=#{AttributeValue}/
-
-        module_function
-
-        def expand_pair(str)
-          return nil unless str
-          return str.gsub(Pair){
-            pair = $&
-            case pair.size
-            when 2 then pair[1,1]
-            when 3 then Integer("0x#{pair[1,2]}").chr
-            else raise OpenSSL::X509::NameError, "invalid pair: #{str}"
-            end
-          }
-        end
-
-        def expand_hexstring(str)
-          return nil unless str
-          der = str.gsub(HexPair){$&.to_i(16).chr }
-          a1 = OpenSSL::ASN1.decode(der)
-          return a1.value, a1.tag
-        end
-
-        def expand_value(str1, str2, str3)
-          value = expand_pair(str1)
-          value, tag = expand_hexstring(str2) unless value
-          value = expand_pair(str3) unless value
-          return value, tag
-        end
-
-        def scan(dn)
-          str = dn
-          ary = []
-          while true
-            if md = TypeAndValue.match(str)
-              remain = md.post_match
-              type = md[1]
-              value, tag = expand_value(md[2], md[3], md[4]) rescue nil
-              if value
-                type_and_value = [type, value]
-                type_and_value.push(tag) if tag
-                ary.unshift(type_and_value)
-                if remain.length > 2 && remain[0] == ?,
-                  str = remain[1..-1]
-                  next
-                elsif remain.length > 2 && remain[0] == ?+
-                  raise OpenSSL::X509::NameError,
-                    "multi-valued RDN is not supported: #{dn}"
-                elsif remain.empty?
-                  break
-                end
-              end
-            end
-            msg_dn = dn[0, dn.length - str.length] + " =>" + str
-            raise OpenSSL::X509::NameError, "malformed RDN: #{msg_dn}"
-          end
-          return ary
-        end
-      end
-
-      class << self
-        def parse_rfc2253(str, template=OBJECT_TYPE_TEMPLATE)
-          ary = OpenSSL::X509::Name::RFC2253DN.scan(str)
-          self.new(ary, template)
-        end
-
-        def parse_openssl(str, template=OBJECT_TYPE_TEMPLATE)
-          ary = str.scan(/\s*([^\/,]+)\s*/).collect{|i| i[0].split("=", 2) }
-          self.new(ary, template)
-        end
-
-        alias parse parse_openssl
-      end
-    end
-
-    class StoreContext
-      def cleanup
-        warn "(#{caller.first}) OpenSSL::X509::StoreContext#cleanup is deprecated with no replacement" if $VERBOSE
-      end
-    end
-  end
-end
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
index f1777cdf06..98358f90da 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -1,2 +1,215 @@
-warn 'deprecated openssl/x509 use: require "openssl" instead of "openssl/x509"'
-require 'openssl'
+# frozen_string_literal: false
+#--
+# = Ruby-space definitions that completes C-space funcs for X509 and subclasses
+#
+# = Info
+# 'OpenSSL for Ruby 2' project
+# Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
+# All rights reserved.
+#
+# = Licence
+# This program is licensed under the same licence as Ruby.
+# (See the file 'LICENCE'.)
+#++
+
+module OpenSSL
+  module X509
+    class ExtensionFactory
+      def create_extension(*arg)
+        if arg.size > 1
+          create_ext(*arg)
+        else
+          send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
+        end
+      end
+
+      def create_ext_from_array(ary)
+        raise ExtensionError, "unexpected array form" if ary.size > 3
+        create_ext(ary[0], ary[1], ary[2])
+      end
+
+      def create_ext_from_string(str) # "oid = critical, value"
+        oid, value = str.split(/=/, 2)
+        oid.strip!
+        value.strip!
+        create_ext(oid, value)
+      end
+
+      def create_ext_from_hash(hash)
+        create_ext(hash["oid"], hash["value"], hash["critical"])
+      end
+    end
+
+    class Extension
+      def ==(other)
+        return false unless Extension === other
+        to_der == other.to_der
+      end
+
+      def to_s # "oid = critical, value"
+        str = self.oid
+        str << " = "
+        str << "critical, " if self.critical?
+        str << self.value.gsub(/\n/, ", ")
+      end
+
+      def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
+        {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
+      end
+
+      def to_a
+        [ self.oid, self.value, self.critical? ]
+      end
+    end
+
+    class Name
+      module RFC2253DN
+        Special = ',=+<>#;'
+        HexChar = /[0-9a-fA-F]/
+        HexPair = /#{HexChar}#{HexChar}/
+        HexString = /#{HexPair}+/
+        Pair = /\\(?:[#{Special}]|\\|"|#{HexPair})/
+        StringChar = /[^\\"#{Special}]/
+        QuoteChar = /[^\\"]/
+        AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/
+        AttributeValue = /
+          (?!["#])((?:#{StringChar}|#{Pair})*)|
+          \#(#{HexString})|
+          "((?:#{QuoteChar}|#{Pair})*)"
+        /x
+        TypeAndValue = /\A(#{AttributeType})=#{AttributeValue}/
+
+        module_function
+
+        def expand_pair(str)
+          return nil unless str
+          return str.gsub(Pair){
+            pair = $&
+            case pair.size
+            when 2 then pair[1,1]
+            when 3 then Integer("0x#{pair[1,2]}").chr
+            else raise OpenSSL::X509::NameError, "invalid pair: #{str}"
+            end
+          }
+        end
+
+        def expand_hexstring(str)
+          return nil unless str
+          der = str.gsub(HexPair){$&.to_i(16).chr }
+          a1 = OpenSSL::ASN1.decode(der)
+          return a1.value, a1.tag
+        end
+
+        def expand_value(str1, str2, str3)
+          value = expand_pair(str1)
+          value, tag = expand_hexstring(str2) unless value
+          value = expand_pair(str3) unless value
+          return value, tag
+        end
+
+        def scan(dn)
+          str = dn
+          ary = []
+          while true
+            if md = TypeAndValue.match(str)
+              remain = md.post_match
+              type = md[1]
+              value, tag = expand_value(md[2], md[3], md[4]) rescue nil
+              if value
+                type_and_value = [type, value]
+                type_and_value.push(tag) if tag
+                ary.unshift(type_and_value)
+                if remain.length > 2 && remain[0] == ?,
+                  str = remain[1..-1]
+                  next
+                elsif remain.length > 2 && remain[0] == ?+
+                  raise OpenSSL::X509::NameError,
+                    "multi-valued RDN is not supported: #{dn}"
+                elsif remain.empty?
+                  break
+                end
+              end
+            end
+            msg_dn = dn[0, dn.length - str.length] + " =>" + str
+            raise OpenSSL::X509::NameError, "malformed RDN: #{msg_dn}"
+          end
+          return ary
+        end
+      end
+
+      class << self
+        def parse_rfc2253(str, template=OBJECT_TYPE_TEMPLATE)
+          ary = OpenSSL::X509::Name::RFC2253DN.scan(str)
+          self.new(ary, template)
+        end
+
+        def parse_openssl(str, template=OBJECT_TYPE_TEMPLATE)
+          if str.start_with?("/")
+            # /A=B/C=D format
+            ary = str[1..-1].split("/").map { |i| i.split("=", 2) }
+          else
+            # Comma-separated
+            ary = str.split(",").map { |i| i.strip.split("=", 2) }
+          end
+          self.new(ary, template)
+        end
+
+        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 Attribute
+      def ==(other)
+        return false unless Attribute === other
+        to_der == other.to_der
+      end
+    end
+
+    class StoreContext
+      def cleanup
+        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
+
+    class CRL
+      def ==(other)
+        return false unless CRL === other
+        to_der == other.to_der
+      end
+    end
+
+    class Revoked
+      def ==(other)
+        return false unless Revoked === other
+        to_der == other.to_der
+      end
+    end
+
+    class Request
+      def ==(other)
+        return false unless Request === other
+        to_der == other.to_der
+      end
+    end
+  end
+end
diff --git a/ext/openssl/openssl.gemspec b/ext/openssl/openssl.gemspec
new file mode 100644
index 0000000000..295379fb6c
--- /dev/null
+++ b/ext/openssl/openssl.gemspec
@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "openssl"
+  s.version = "2.1.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.metadata = { "msys2_mingw_dependencies" => "openssl" } if s.respond_to? :metadata=
+  s.require_paths = ["lib"]
+  s.authors = ["Martin Bosslet", "SHIBATA Hiroshi", "Zachary Scott", "Kazuki Yamaguchi"]
+  s.date = "2018-10-17"
+  s.description = "It wraps the OpenSSL library."
+  s.email = ["ruby-core@ruby-lang.org"]
+  s.extensions = ["ext/openssl/extconf.rb"]
+  s.extra_rdoc_files = ["README.md", "CONTRIBUTING.md", "History.md"]
+  s.files = ["BSDL", "CONTRIBUTING.md", "History.md", "LICENSE.txt", "README.md", "ext/openssl/deprecation.rb", "ext/openssl/extconf.rb", "ext/openssl/openssl_missing.c", "ext/openssl/openssl_missing.h", "ext/openssl/ossl.c", "ext/openssl/ossl.h", "ext/openssl/ossl_asn1.c", "ext/openssl/ossl_asn1.h", "ext/openssl/ossl_bio.c", "ext/openssl/ossl_bio.h", "ext/openssl/ossl_bn.c", "ext/openssl/ossl_bn.h", "ext/openssl/ossl_cipher.c", "ext/openssl/ossl_cipher.h", "ext/openssl/ossl_config.c", "ext/openssl/ossl_config.h", "ext/openssl/ossl_digest.c", "ext/openssl/ossl_digest.h", "ext/openssl/ossl_engine.c", "ext/openssl/ossl_engine.h", "ext/openssl/ossl_hmac.c", "ext/openssl/ossl_hmac.h", "ext/openssl/ossl_kdf.c", "ext/openssl/ossl_kdf.h", "ext/openssl/ossl_ns_spki.c", "ext/openssl/ossl_ns_spki.h", "ext/openssl/ossl_ocsp.c", "ext/openssl/ossl_ocsp.h", "ext/openssl/ossl_pkcs12.c", "ext/openssl/ossl_pkcs12.h", "ext/openssl/ossl_pkcs7.c", "ext/openssl/ossl_pkcs7.h", "ext/openssl/ossl_pkey.c", "ext/openssl/ossl_pkey.h", "ext/openssl/ossl_pkey_dh.c", "ext/openssl/ossl_pkey_dsa.c", "ext/openssl/ossl_pkey_ec.c", "ext/openssl/ossl_pkey_rsa.c", "ext/openssl/ossl_rand.c", "ext/openssl/ossl_rand.h", "ext/openssl/ossl_ssl.c", "ext/openssl/ossl_ssl.h", "ext/openssl/ossl_ssl_session.c", "ext/openssl/ossl_version.h", "ext/openssl/ossl_x509.c", "ext/openssl/ossl_x509.h", "ext/openssl/ossl_x509attr.c", "ext/openssl/ossl_x509cert.c", "ext/openssl/ossl_x509crl.c", "ext/openssl/ossl_x509ext.c", "ext/openssl/ossl_x509name.c", "ext/openssl/ossl_x509req.c", "ext/openssl/ossl_x509revoked.c", "ext/openssl/ossl_x509store.c", "ext/openssl/ruby_missing.h", "lib/openssl.rb", "lib/openssl/bn.rb", "lib/openssl/buffering.rb", "lib/openssl/cipher.rb", "lib/openssl/config.rb", "lib/openssl/digest.rb", "lib/openssl/pkcs5.rb", "lib/openssl/pkey.rb", "lib/openssl/ssl.rb", "lib/openssl/x509.rb"]
+  s.homepage = "https://github.com/ruby/openssl"
+  s.licenses = ["Ruby"]
+  s.rdoc_options = ["--main", "README.md"]
+  s.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  s.rubygems_version = "3.0.0.beta1"
+  s.summary = "OpenSSL provides SSL, TLS and general purpose cryptography."
+
+  s.add_runtime_dependency("ipaddr", [">= 0"])
+  s.add_development_dependency("rake", [">= 0"])
+  s.add_development_dependency("rake-compiler", [">= 0"])
+  s.add_development_dependency("test-unit", ["~> 3.0"])
+  s.add_development_dependency("rdoc", [">= 0"])
+end
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
index f88dd403be..b36ef0288e 100644
--- a/ext/openssl/openssl_missing.c
+++ b/ext/openssl/openssl_missing.c
@@ -1,356 +1,106 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include RUBY_EXTCONF_H
 
-#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ST_ENGINE)
+#include <string.h> /* memcpy() */
+#if !defined(OPENSSL_NO_ENGINE)
 # include <openssl/engine.h>
 #endif
-#include <openssl/x509_vfy.h>
-
 #if !defined(OPENSSL_NO_HMAC)
-#include <string.h> /* memcpy() */
-#include <openssl/hmac.h>
+# include <openssl/hmac.h>
+#endif
+#include <openssl/x509_vfy.h>
 
 #include "openssl_missing.h"
 
-#if !defined(HAVE_HMAC_CTX_COPY)
-void
-HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
-{
-    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 */
+/* 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_X509_STORE_SET_EX_DATA)
-int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data)
+int
+ossl_EC_curve_nist2nid(const char *name)
 {
-    return CRYPTO_set_ex_data(&str->ex_data, idx, data);
+    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;
+    }
+    return NID_undef;
 }
 #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)
+/*** added in 1.1.0 ***/
+#if !defined(HAVE_HMAC_CTX_NEW)
+HMAC_CTX *
+ossl_HMAC_CTX_new(void)
 {
-    EVP_MD_CTX *ctx = OPENSSL_malloc(sizeof(EVP_MD_CTX));
-    if (!ctx) return NULL;
-
-    memset(ctx, 0, sizeof(EVP_MD_CTX));
-
+    HMAC_CTX *ctx = OPENSSL_malloc(sizeof(HMAC_CTX));
+    if (!ctx)
+	return NULL;
+    HMAC_CTX_init(ctx);
     return ctx;
 }
 #endif
 
-#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
-EVP_MD_CTX_destroy(EVP_MD_CTX *ctx)
-{
-    EVP_MD_CTX_cleanup(ctx);
-    OPENSSL_free(ctx);
-}
-#endif
-
-#if !defined(HAVE_EVP_MD_CTX_INIT)
+#if !defined(HAVE_HMAC_CTX_FREE)
 void
-EVP_MD_CTX_init(EVP_MD_CTX *ctx)
+ossl_HMAC_CTX_free(HMAC_CTX *ctx)
 {
-    memset(ctx, 0, sizeof(EVP_MD_CTX));
+    if (ctx) {
+	HMAC_CTX_cleanup(ctx);
+	OPENSSL_free(ctx);
+    }
 }
 #endif
 
-#if !defined(HAVE_HMAC_CTX_INIT)
+#if !defined(HAVE_X509_CRL_GET0_SIGNATURE)
 void
-HMAC_CTX_init(HMAC_CTX *ctx)
+ossl_X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
+			     const X509_ALGOR **palg)
 {
-    EVP_MD_CTX_init(&ctx->i_ctx);
-    EVP_MD_CTX_init(&ctx->o_ctx);
-    EVP_MD_CTX_init(&ctx->md_ctx);
+    if (psig != NULL)
+	*psig = crl->signature;
+    if (palg != NULL)
+	*palg = crl->sig_alg;
 }
 #endif
 
-#if !defined(HAVE_HMAC_CTX_CLEANUP)
+#if !defined(HAVE_X509_REQ_GET0_SIGNATURE)
 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
-
-#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
-/*
- * this function does not exist in OpenSSL yet... or ever?.
- * a future version may break this function.
- * tested on 0.9.7d.
- */
-int
-EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in)
-{
-    memcpy(out, in, sizeof(EVP_CIPHER_CTX));
-
-#if defined(HAVE_ENGINE_ADD) && defined(HAVE_ST_ENGINE)
-    if (in->engine) ENGINE_add(out->engine);
-    if (in->cipher_data) {
-	out->cipher_data = OPENSSL_malloc(in->cipher->ctx_size);
-	memcpy(out->cipher_data, in->cipher_data, in->cipher->ctx_size);
-    }
-#endif
-
-    return 1;
-}
-#endif
-
-#if !defined(HAVE_X509_CRL_SET_VERSION)
-int
-X509_CRL_set_version(X509_CRL *x, long version)
-{
-    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
-
-#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
-
-#if !defined(HAVE_X509_CRL_SORT)
-int
-X509_CRL_sort(X509_CRL *c)
+ossl_X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
+			     const X509_ALGOR **palg)
 {
-    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;
+    if (psig != NULL)
+	*psig = req->signature;
+    if (palg != NULL)
+	*palg = req->sig_alg;
 }
 #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
-
-#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
-
-#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
-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)
-{
-    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 1;
-}
-#endif
-
-#if !defined(HAVE_BN_RAND_RANGE)
-int
-BN_rand_range(BIGNUM *r, BIGNUM *range)
-{
-    return bn_rand_range(0, r, range);
-}
-#endif
-
-#if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
-int
-BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range)
-{
-    return bn_rand_range(1, r, range);
-}
-#endif
-
-#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
-#define OPENSSL_CONF "openssl.cnf"
-char *
-CONF_get1_default_config_file(void)
-{
-    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_PEM_DEF_CALLBACK)
-#define OSSL_PASS_MIN_LENGTH 4
-int
-PEM_def_callback(char *buf, int num, int w, void *key)
-{
-    int i,j;
-    const char *prompt;
-
-    if (key) {
-	i = strlen(key);
-	i = (i > num) ? num : i;
-	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_ASN1_PUT_EOC)
-int
-ASN1_put_eoc(unsigned char **pp)
-{
-    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 3635f88b73..09998214e1 100644
--- a/ext/openssl/openssl_missing.h
+++ b/ext/openssl/openssl_missing.h
@@ -1,198 +1,222 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_OPENSSL_MISSING_H_)
 #define _OSSL_OPENSSL_MISSING_H_
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#ifndef TYPEDEF_D2I_OF
-typedef char *d2i_of_void();
-#endif
-#ifndef TYPEDEF_I2D_OF
-typedef int i2d_of_void();
-#endif
-
-/*
- * These functions are not included in headers of OPENSSL <= 0.9.6b
- */
-
-#if !defined(PEM_read_bio_DSAPublicKey)
-# define PEM_read_bio_DSAPublicKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
-        (d2i_of_void *)d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,(bp),(void **)(x),(cb),(u))
-#endif
-
-#if !defined(PEM_write_bio_DSAPublicKey)
-# define PEM_write_bio_DSAPublicKey(bp,x) \
-	PEM_ASN1_write_bio((i2d_of_void *)i2d_DSAPublicKey,\
-		PEM_STRING_DSA_PUBLIC,\
-		(bp),(char *)(x), NULL, NULL, 0, NULL, NULL)
-#endif
+#include "ruby/config.h"
 
-#if !defined(DSAPrivateKey_dup)
-# define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPrivateKey, \
-	(d2i_of_void *)d2i_DSAPrivateKey,(char *)(dsa))
+/* 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(DSAPublicKey_dup)
-# define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPublicKey, \
-	(d2i_of_void *)d2i_DSAPublicKey,(char *)(dsa))
 #endif
 
-#if !defined(X509_REVOKED_dup)
+#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))
 #endif
 
-#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))
+#if !defined(HAVE_X509_STORE_CTX_GET0_STORE)
+#  define X509_STORE_CTX_get0_store(x) ((x)->ctx)
 #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))
+#if !defined(HAVE_SSL_IS_SERVER)
+#  define SSL_is_server(s) ((s)->server)
 #endif
 
-#if !defined(HAVE_HMAC_CTX_INIT)
-void HMAC_CTX_init(HMAC_CTX *ctx);
+/* added in 1.1.0 */
+#if !defined(HAVE_BN_GENCB_NEW)
+#  define BN_GENCB_new() ((BN_GENCB *)OPENSSL_malloc(sizeof(BN_GENCB)))
 #endif
 
-#if !defined(HAVE_HMAC_CTX_COPY)
-void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
+#if !defined(HAVE_BN_GENCB_FREE)
+#  define BN_GENCB_free(cb) OPENSSL_free(cb)
 #endif
 
-#if !defined(HAVE_HMAC_CTX_CLEANUP)
-void HMAC_CTX_cleanup(HMAC_CTX *ctx);
+#if !defined(HAVE_BN_GENCB_GET_ARG)
+#  define BN_GENCB_get_arg(cb) (cb)->arg
 #endif
 
-#if !defined(HAVE_EVP_MD_CTX_CREATE)
-EVP_MD_CTX *EVP_MD_CTX_create(void);
+#if !defined(HAVE_EVP_MD_CTX_NEW)
+#  define EVP_MD_CTX_new EVP_MD_CTX_create
 #endif
 
-#if !defined(HAVE_EVP_MD_CTX_INIT)
-void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
+#if !defined(HAVE_EVP_MD_CTX_FREE)
+#  define EVP_MD_CTX_free EVP_MD_CTX_destroy
 #endif
 
-#if !defined(HAVE_EVP_MD_CTX_CLEANUP)
-int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
+#if !defined(HAVE_HMAC_CTX_NEW)
+HMAC_CTX *ossl_HMAC_CTX_new(void);
+#  define HMAC_CTX_new ossl_HMAC_CTX_new
 #endif
 
-#if !defined(HAVE_EVP_MD_CTX_DESTROY)
-void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
+#if !defined(HAVE_HMAC_CTX_FREE)
+void ossl_HMAC_CTX_free(HMAC_CTX *);
+#  define HMAC_CTX_free ossl_HMAC_CTX_free
 #endif
 
-#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
-int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
+#if !defined(HAVE_X509_STORE_GET_EX_DATA)
+#  define X509_STORE_get_ex_data(x, idx) \
+	CRYPTO_get_ex_data(&(x)->ex_data, (idx))
 #endif
 
-#if !defined(HAVE_EVP_DIGESTINIT_EX)
-#  define EVP_DigestInit_ex(ctx, md, engine) EVP_DigestInit((ctx), (md))
-#endif
-#if !defined(HAVE_EVP_DIGESTFINAL_EX)
-#  define EVP_DigestFinal_ex(ctx, buf, len) EVP_DigestFinal((ctx), (buf), (len))
+#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))
 #endif
 
-#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_EVP_CIPHERFINAL_EX)
-#  define EVP_CipherFinal_ex(ctx, outm, outl) EVP_CipherFinal((ctx), (outm), (outl))
+#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
 #endif
 
-#if !defined(EVP_CIPHER_name)
-#  define EVP_CIPHER_name(e) OBJ_nid2sn(EVP_CIPHER_nid(e))
+#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
 #endif
 
-#if !defined(EVP_MD_name)
-#  define EVP_MD_name(e) OBJ_nid2sn(EVP_MD_type(e))
+#if !defined(HAVE_X509_REVOKED_GET0_SERIALNUMBER)
+#  define X509_REVOKED_get0_serialNumber(x) ((x)->serialNumber)
 #endif
 
-#if !defined(HAVE_EVP_HMAC_INIT_EX)
-#  define HMAC_Init_ex(ctx, key, len, digest, engine) HMAC_Init((ctx), (key), (len), (digest))
+#if !defined(HAVE_X509_REVOKED_GET0_REVOCATIONDATE)
+#  define X509_REVOKED_get0_revocationDate(x) ((x)->revocationDate)
 #endif
 
-#if !defined(PKCS7_is_detached)
-#  define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
+#if !defined(HAVE_X509_GET0_TBS_SIGALG)
+#  define X509_get0_tbs_sigalg(x) ((x)->cert_info->signature)
 #endif
 
-#if !defined(PKCS7_type_is_encrypted)
-#  define PKCS7_type_is_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
+#if !defined(HAVE_X509_STORE_CTX_GET0_UNTRUSTED)
+#  define X509_STORE_CTX_get0_untrusted(x) ((x)->untrusted)
 #endif
 
-#if !defined(HAVE_OPENSSL_CLEANSE)
-#define OPENSSL_cleanse(p, l) memset((p), 0, (l))
+#if !defined(HAVE_X509_STORE_CTX_GET0_CERT)
+#  define X509_STORE_CTX_get0_cert(x) ((x)->cert)
 #endif
 
-#if !defined(HAVE_X509_STORE_GET_EX_DATA)
-void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
+#if !defined(HAVE_X509_STORE_CTX_GET0_CHAIN)
+#  define X509_STORE_CTX_get0_chain(ctx) X509_STORE_CTX_get_chain(ctx)
 #endif
 
-#if !defined(HAVE_X509_STORE_SET_EX_DATA)
-int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
+#if !defined(HAVE_OCSP_SINGLERESP_GET0_ID)
+#  define OCSP_SINGLERESP_get0_id(s) ((s)->certId)
 #endif
 
-#if !defined(HAVE_X509_CRL_SET_VERSION)
-int X509_CRL_set_version(X509_CRL *x, long version);
+#if !defined(HAVE_SSL_CTX_GET_CIPHERS)
+#  define SSL_CTX_get_ciphers(ctx) ((ctx)->cipher_list)
 #endif
 
-#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME)
-int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
+#if !defined(HAVE_X509_UP_REF)
+#  define X509_up_ref(x) \
+	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509)
 #endif
 
-#if !defined(HAVE_X509_CRL_SORT)
-int X509_CRL_sort(X509_CRL *c);
+#if !defined(HAVE_X509_CRL_UP_REF)
+#  define X509_CRL_up_ref(x) \
+	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509_CRL);
 #endif
 
-#if !defined(HAVE_X509_CRL_ADD0_REVOKED)
-int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
+#if !defined(HAVE_X509_STORE_UP_REF)
+#  define X509_STORE_up_ref(x) \
+	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509_STORE);
 #endif
 
-#if !defined(HAVE_BN_MOD_SQR)
-int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
+#if !defined(HAVE_SSL_SESSION_UP_REF)
+#  define SSL_SESSION_up_ref(x) \
+	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_SSL_SESSION);
 #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 !defined(HAVE_EVP_PKEY_UP_REF)
+#  define EVP_PKEY_up_ref(x) \
+	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_EVP_PKEY);
 #endif
 
-#if !defined(HAVE_BN_MOD_SUB)
-int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-#endif
+#if !defined(HAVE_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(const _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(const _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(HAVE_BN_RAND_RANGE)
-int BN_rand_range(BIGNUM *r, BIGNUM *range);
+#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))
 #endif
 
-#if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
-int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
+#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))
 #endif
 
-#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
-char *CONF_get1_default_config_file(void);
+#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; }
 #endif
 
-#if !defined(HAVE_PEM_DEF_CALLBACK)
-int PEM_def_callback(char *buf, int num, int w, void *key);
+#if !defined(OPENSSL_NO_EC)
+IMPL_PKEY_GETTER(EC_KEY, ec)
 #endif
 
-#if !defined(HAVE_ASN1_PUT_EOC)
-int ASN1_put_eoc(unsigned char **pp);
+#undef IMPL_PKEY_GETTER
+#undef IMPL_KEY_ACCESSOR2
+#undef IMPL_KEY_ACCESSOR3
+#endif /* HAVE_OPAQUE_OPENSSL */
+
+#if !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
 #endif
 
-#if defined(__cplusplus)
-}
+#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)
+#  define X509_set1_notBefore(x, t) X509_set_notBefore(x, t)
+#  define X509_set1_notAfter(x, t) X509_set_notAfter(x, t)
+#  define X509_CRL_set1_lastUpdate(x, t) X509_CRL_set_lastUpdate(x, t)
+#  define X509_CRL_set1_nextUpdate(x, t) X509_CRL_set_nextUpdate(x, t)
 #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 f3410b64e8..e4196f0754 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -1,48 +1,15 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 #include <stdarg.h> /* for ossl_raise */
-
-/*
- * 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 = 2 * buf_len;
-
-    if (buf_len < 0 || len < buf_len) { /* PARANOIA? */
-	return -1;
-    }
-    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;
-}
+#include <ruby/thread_native.h> /* for OpenSSL < 1.1.0 locks */
 
 /*
  * Data Conversion
@@ -77,7 +44,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);						\
 }								\
@@ -97,7 +64,7 @@ OSSL_IMPL_ARY2SK(x509, X509, cX509Cert, DupX509CertPtr)
 
 #define OSSL_IMPL_SK2ARY(name, type)	        \
 VALUE						\
-ossl_##name##_sk2ary(STACK_OF(type) *sk)	\
+ossl_##name##_sk2ary(const STACK_OF(type) *sk)	\
 {						\
     type *t;					\
     int i, num;					\
@@ -125,47 +92,112 @@ OSSL_IMPL_SK2ARY(x509crl, X509_CRL)
 OSSL_IMPL_SK2ARY(x509name, X509_NAME)
 
 static VALUE
-ossl_str_new(int size)
+ossl_str_new_i(VALUE size)
 {
-    return rb_str_new(0, size);
+    return rb_str_new(NULL, (long)size);
+}
+
+VALUE
+ossl_str_new(const char *ptr, long len, int *pstate)
+{
+    VALUE str;
+    int state;
+
+    str = rb_protect(ossl_str_new_i, len, &state);
+    if (pstate)
+	*pstate = state;
+    if (state) {
+	if (!pstate)
+	    rb_set_errinfo(Qnil);
+	return Qnil;
+    }
+    if (ptr)
+	memcpy(RSTRING_PTR(str), ptr, len);
+    return str;
 }
 
 VALUE
 ossl_buf2str(char *buf, int len)
 {
     VALUE str;
-    int status = 0;
+    int state;
 
-    str = rb_protect((VALUE(*)_((VALUE)))ossl_str_new, len, &status);
-    if(!NIL_P(str)) memcpy(RSTRING_PTR(str), buf, len);
+    str = ossl_str_new(buf, len, &state);
     OPENSSL_free(buf);
-    if(status) rb_jump_tag(status);
-
+    if (state)
+	rb_jump_tag(state);
     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
  */
-static VALUE
-ossl_pem_passwd_cb0(VALUE flag)
+VALUE
+ossl_pem_passwd_value(VALUE pass)
 {
-    VALUE pass;
+    if (NIL_P(pass))
+	return Qnil;
 
-    pass = rb_yield(flag);
-    SafeStringValue(pass);
+    StringValue(pass);
+
+    /* 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)
+{
+    VALUE pass = rb_yield(flag);
+    if (NIL_P(pass))
+	return Qnil;
+    StringValue(pass);
     return pass;
 }
 
 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_)
 {
-    int len, status = 0;
-    VALUE rflag, pass;
+    long len;
+    int status;
+    VALUE rflag, pass = (VALUE)pwd_;
 
-    if (pwd || !rb_block_given_p())
-	return PEM_def_callback(buf, max_len, flag, 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 <= max_len) {
+		memcpy(buf, RSTRING_PTR(pass), len);
+		return (int)len;
+	    }
+	}
+	OSSL_Debug("passed data is not valid String???");
+	return -1;
+    }
+
+    if (!rb_block_given_p()) {
+	return PEM_def_callback(buf, max_len, flag, NULL);
+    }
 
     while (1) {
 	/*
@@ -175,73 +207,22 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd)
 	 */
 	rflag = flag ? Qtrue : Qfalse;
 	pass  = rb_protect(ossl_pem_passwd_cb0, rflag, &status);
-	if (status) return -1; /* exception was raised. */
-	len = RSTRING_LENINT(pass);
-	if (len < 4) { /* 4 is OpenSSL hardcoded limit */
-	    rb_warning("password must be longer than 4 bytes");
-	    continue;
+	if (status) {
+	    /* ignore an exception raised. */
+	    rb_set_errinfo(Qnil);
+	    return -1;
 	}
+	if (NIL_P(pass))
+	    return -1;
+	len = RSTRING_LEN(pass);
 	if (len > max_len) {
-	    rb_warning("password must be shorter then %d bytes", max_len-1);
+	    rb_warning("password must not be longer than %d bytes", max_len);
 	    continue;
 	}
 	memcpy(buf, RSTRING_PTR(pass), len);
 	break;
     }
-    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)) {
-	rctx = rb_protect((VALUE(*)(VALUE))ossl_x509stctx_new,
-			  (VALUE)ctx, &state);
-	ret = Qfalse;
-	if (!state) {
-	    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);
-	    ossl_x509stctx_clear_ptr(rctx);
-	    if (state) {
-		rb_warn("exception in verify_callback is ignored");
-	    }
-	}
-	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;
+    return (int)len;
 }
 
 /*
@@ -257,7 +238,7 @@ VALUE eOSSLError;
 /*
  * Convert to DER string
  */
-ID ossl_s_to_der;
+static ID ossl_s_to_der;
 
 VALUE
 ossl_to_der(VALUE obj)
@@ -284,35 +265,28 @@ ossl_to_der_if_possible(VALUE obj)
 static VALUE
 ossl_make_error(VALUE exc, const char *fmt, va_list args)
 {
-    char buf[BUFSIZ];
-    const char *msg;
-    long e;
-    int len = 0;
+    VALUE str = Qnil;
+    unsigned long e;
 
-#ifdef HAVE_ERR_PEEK_LAST_ERROR
-    e = ERR_peek_last_error();
-#else
-    e = ERR_peek_error();
-#endif
     if (fmt) {
-	len = vsnprintf(buf, BUFSIZ, fmt, args);
-    }
-    if (len < BUFSIZ && e) {
-	if (dOSSL == Qtrue) /* FULL INFO */
-	    msg = ERR_error_string(e, NULL);
-	else
-	    msg = ERR_reason_error_string(e);
-	len += snprintf(buf+len, BUFSIZ-len, "%s%s", (len ? ": " : ""), msg);
+	str = rb_vsprintf(fmt, args);
     }
-    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));
+    e = ERR_peek_last_error();
+    if (e) {
+	const char *msg = ERR_reason_error_string(e);
+
+	if (NIL_P(str)) {
+	    if (msg) str = rb_str_new_cstr(msg);
 	}
+	else {
+	    if (RSTRING_LEN(str)) rb_str_cat2(str, ": ");
+	    rb_str_cat2(str, msg ? msg : "(null)");
+	}
+	ossl_clear_error();
     }
-    ERR_clear_error();
 
-    if(len > BUFSIZ) len = rb_long2int(strlen(buf));
-    return rb_exc_new(exc, buf, len);
+    if (NIL_P(str)) str = rb_str_new(0, 0);
+    return rb_exc_new3(exc, str);
 }
 
 void
@@ -326,15 +300,32 @@ ossl_raise(VALUE exc, const char *fmt, ...)
     rb_exc_raise(err);
 }
 
-VALUE
-ossl_exc_new(VALUE exc, const char *fmt, ...)
+void
+ossl_clear_error(void)
 {
-    va_list args;
-    VALUE err;
-    va_start(args, fmt);
-    err = ossl_make_error(exc, fmt, args);
-    va_end(args);
-    return err;
+    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();
+    }
 }
 
 /*
@@ -343,10 +334,11 @@ ossl_exc_new(VALUE exc, const char *fmt, ...)
  *
  * See any remaining errors held in queue.
  *
- * Any errors you see here are probably due to a bug in ruby's OpenSSL implementation.
+ * Any errors you see here are probably due to a bug in Ruby's OpenSSL
+ * implementation.
  */
 VALUE
-ossl_get_errors()
+ossl_get_errors(VALUE _)
 {
     VALUE ary;
     long e;
@@ -394,30 +386,227 @@ ossl_debug_get(VALUE self)
  * call-seq:
  *   OpenSSL.debug = boolean -> boolean
  *
- * Turns on or off CRYPTO_MEM_CHECK.
- * Also shows some debugging message on stderr.
+ * Turns on or off debug mode. With debug mode, all erros added to the OpenSSL
+ * error queue will be printed to stderr.
  */
 static VALUE
 ossl_debug_set(VALUE self, VALUE val)
 {
-    VALUE old = dOSSL;
-    dOSSL = val;
-
-    if (old != dOSSL) {
-	if (dOSSL == Qtrue) {
-	    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-	    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");
+    dOSSL = RTEST(val) ? Qtrue : Qfalse;
+
+    return val;
+}
+
+/*
+ * call-seq:
+ *   OpenSSL.fips_mode -> true | false
+ */
+static VALUE
+ossl_fips_mode_get(VALUE self)
+{
+
+#ifdef OPENSSL_FIPS
+    VALUE enabled;
+    enabled = FIPS_mode() ? Qtrue : Qfalse;
+    return enabled;
+#else
+    return Qfalse;
+#endif
+}
+
+/*
+ * call-seq:
+ *   OpenSSL.fips_mode = boolean -> boolean
+ *
+ * Turns FIPS mode on or off. Turning on FIPS mode will obviously only have an
+ * effect for FIPS-capable installations of the OpenSSL library. Trying to do
+ * so otherwise will result in an error.
+ *
+ * === Examples
+ *   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
+    if (RTEST(enabled)) {
+	int mode = FIPS_mode();
+	if(!mode && !FIPS_mode_set(1)) /* turning on twice leads to an error */
+	    ossl_raise(eOSSLError, "Turning on FIPS mode failed");
+    } else {
+	if(!FIPS_mode_set(0)) /* turning off twice is OK */
+	    ossl_raise(eOSSLError, "Turning off FIPS mode failed");
+    }
+    return enabled;
+#else
+    if (RTEST(enabled))
+	ossl_raise(eOSSLError, "This version of OpenSSL does not support FIPS mode");
+    return enabled;
+#endif
+}
+
+#if defined(OSSL_DEBUG)
+#if !defined(LIBRESSL_VERSION_NUMBER) && \
+    (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(OPENSSL_NO_CRYPTO_MDEBUG) || \
+     defined(CRYPTO_malloc_debug_init))
+/*
+ * call-seq:
+ *   OpenSSL.mem_check_start -> nil
+ *
+ * Calls CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON). Starts tracking memory
+ * allocations. See also OpenSSL.print_mem_leaks.
+ *
+ * This is available only when built with a capable OpenSSL and --enable-debug
+ * configure option.
+ */
+static VALUE
+mem_check_start(VALUE self)
+{
+	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+	return Qnil;
+}
+
+/*
+ * call-seq:
+ *   OpenSSL.print_mem_leaks -> true | false
+ *
+ * For debugging the Ruby/OpenSSL library. Calls CRYPTO_mem_leaks_fp(stderr).
+ * Prints detected memory leaks to standard error. This cleans the global state
+ * up thus you cannot use any methods of the library after calling this.
+ *
+ * Returns +true+ if leaks detected, +false+ otherwise.
+ *
+ * This is available only when built with a capable OpenSSL and --enable-debug
+ * configure option.
+ *
+ * === Example
+ *   OpenSSL.mem_check_start
+ *   NOT_GCED = OpenSSL::PKey::RSA.new(256)
+ *
+ *   END {
+ *     GC.start
+ *     OpenSSL.print_mem_leaks # will print the leakage
+ *   }
+ */
+static VALUE
+print_mem_leaks(VALUE self)
+{
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+    int ret;
+#endif
+
+    BN_CTX_free(ossl_bn_ctx);
+    ossl_bn_ctx = NULL;
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+    ret = CRYPTO_mem_leaks_fp(stderr);
+    if (ret < 0)
+	ossl_raise(eOSSLError, "CRYPTO_mem_leaks_fp");
+    return ret ? Qfalse : Qtrue;
+#else
+    CRYPTO_mem_leaks_fp(stderr);
+    return Qnil;
+#endif
+}
+#endif
+#endif
+
+#if !defined(HAVE_OPENSSL_110_THREADING_API)
+/**
+ * Stores locks needed for OpenSSL thread safety
+ */
+struct CRYPTO_dynlock_value {
+    rb_nativethread_lock_t lock;
+    rb_nativethread_id_t owner;
+    size_t count;
+};
+
+static void
+ossl_lock_init(struct CRYPTO_dynlock_value *l)
+{
+    rb_nativethread_lock_initialize(&l->lock);
+    l->count = 0;
+}
+
+static void
+ossl_lock_unlock(int mode, struct CRYPTO_dynlock_value *l)
+{
+    if (mode & CRYPTO_LOCK) {
+	/* TODO: rb_nativethread_id_t is not necessarily compared with ==. */
+	rb_nativethread_id_t tid = rb_nativethread_self();
+	if (l->count && l->owner == tid) {
+	    l->count++;
+	    return;
 	}
+	rb_nativethread_lock_lock(&l->lock);
+	l->owner = tid;
+	l->count = 1;
+    } else {
+	if (!--l->count)
+	    rb_nativethread_lock_unlock(&l->lock);
     }
-    return val;
 }
 
+static struct CRYPTO_dynlock_value *
+ossl_dyn_create_callback(const char *file, int line)
+{
+    /* Do not use xmalloc() here, since it may raise NoMemoryError */
+    struct CRYPTO_dynlock_value *dynlock =
+	OPENSSL_malloc(sizeof(struct CRYPTO_dynlock_value));
+    if (dynlock)
+	ossl_lock_init(dynlock);
+    return dynlock;
+}
+
+static void
+ossl_dyn_lock_callback(int mode, struct CRYPTO_dynlock_value *l, const char *file, int line)
+{
+    ossl_lock_unlock(mode, l);
+}
+
+static void
+ossl_dyn_destroy_callback(struct CRYPTO_dynlock_value *l, const char *file, int line)
+{
+    rb_nativethread_lock_destroy(&l->lock);
+    OPENSSL_free(l);
+}
+
+static void ossl_threadid_func(CRYPTO_THREADID *id)
+{
+    /* register native thread id */
+    CRYPTO_THREADID_set_pointer(id, (void *)rb_nativethread_self());
+}
+
+static struct CRYPTO_dynlock_value *ossl_locks;
+
+static void
+ossl_lock_callback(int mode, int type, const char *file, int line)
+{
+    ossl_lock_unlock(mode, &ossl_locks[type]);
+}
+
+static void Init_ossl_locks(void)
+{
+    int i;
+    int num_locks = CRYPTO_num_locks();
+
+    ossl_locks = ALLOC_N(struct CRYPTO_dynlock_value, num_locks);
+    for (i = 0; i < num_locks; i++)
+	ossl_lock_init(&ossl_locks[i]);
+
+    CRYPTO_THREADID_set_callback(ossl_threadid_func);
+    CRYPTO_set_locking_callback(ossl_lock_callback);
+    CRYPTO_set_dynlock_create_callback(ossl_dyn_create_callback);
+    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
- * OpenSSL[http://www.openssl.org/] library.
+ * OpenSSL[https://www.openssl.org/] library.
  *
  * = Examples
  *
@@ -446,7 +635,7 @@ ossl_debug_set(VALUE self, VALUE val)
  * ahold of the key may use it unless it is encrypted.  In order to securely
  * export a key you may export it with a pass phrase.
  *
- *   cipher = OpenSSL::Cipher::Cipher.new 'AES-128-CBC'
+ *   cipher = OpenSSL::Cipher.new 'AES-128-CBC'
  *   pass_phrase = 'my secure pass phrase goes here'
  *
  *   key_secure = key.export cipher, pass_phrase
@@ -463,10 +652,12 @@ ossl_debug_set(VALUE self, VALUE val)
  *
  *   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
@@ -476,39 +667,131 @@ ossl_debug_set(VALUE self, VALUE val)
  * 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
  *
- * RSA provides ecryption and decryption using the public and private keys.
+ * RSA provides encryption and decryption using the public and private keys.
  * You can use a variety of padding methods depending upon the intended use of
  * encrypted data.
  *
+ * === Encryption & Decryption
+ *
+ * Asymmetric public/private key encryption is slow and victim to attack in
+ * cases where it is used without padding or directly to encrypt larger chunks
+ * of data. Typical use cases for RSA encryption involve "wrapping" a symmetric
+ * key with the public key of the recipient who would "unwrap" that symmetric
+ * key again using their private key.
+ * The following illustrates a simplified example of such a key transport
+ * scheme. It shouldn't be used in practice, though, standardized protocols
+ * should always be preferred.
+ *
+ *   wrapped_key = key.public_encrypt key
+ *
+ * A symmetric key encrypted with the public key can only be decrypted with
+ * the corresponding private key of the recipient.
+ *
+ *   original_key = key.private_decrypt wrapped_key
+ *
+ * By default PKCS#1 padding will be used, but it is also possible to use
+ * other forms of padding, see PKey::RSA for further details.
+ *
+ * === Signatures
+ *
+ * Using "private_encrypt" to encrypt some data with the private key is
+ * equivalent to applying a digital signature to the data. A verifying
+ * party may validate the signature by comparing the result of decrypting
+ * the signature with "public_decrypt" to the original data. However,
+ * OpenSSL::PKey already has methods "sign" and "verify" that handle
+ * digital signatures in a standardized way - "private_encrypt" and
+ * "public_decrypt" shouldn't be used in practice.
+ *
+ * To sign a document, a cryptographically secure hash of the document is
+ * computed first, which is then signed using the private key.
+ *
+ *   digest = OpenSSL::Digest::SHA256.new
+ *   signature = key.sign digest, document
+ *
+ * To validate the signature, again a hash of the document is computed and
+ * the signature is decrypted using the public key. The result is then
+ * compared to the hash just computed, if they are equal the signature was
+ * valid.
+ *
+ *   digest = OpenSSL::Digest::SHA256.new
+ *   if key.verify digest, signature, document
+ *     puts 'Valid'
+ *   else
+ *     puts 'Invalid'
+ *   end
+ *
+ * == PBKDF2 Password-based Encryption
+ *
+ * If supported by the underlying OpenSSL version used, Password-based
+ * Encryption should use the features of PKCS5. If not supported or if
+ * required by legacy applications, the older, less secure methods specified
+ * in RFC 2898 are also supported (see below).
+ *
+ * PKCS5 supports PBKDF2 as it was specified in PKCS#5
+ * v2.0[http://www.rsa.com/rsalabs/node.asp?id=2127]. It still uses a
+ * password, a salt, and additionally a number of iterations that will
+ * slow the key derivation process down. The slower this is, the more work
+ * it requires being able to brute-force the resulting key.
+ *
  * === Encryption
  *
- * Documents encrypted with the public key can only be decrypted with the
- * private key.
+ * The strategy is to first instantiate a Cipher for encryption, and
+ * then to generate a random IV plus a key derived from the password
+ * using PBKDF2. PKCS #5 v2.0 recommends at least 8 bytes for the salt,
+ * the number of iterations largely depends on the hardware being used.
+ *
+ *   cipher = OpenSSL::Cipher.new 'AES-128-CBC'
+ *   cipher.encrypt
+ *   iv = cipher.random_iv
  *
- *   public_encrypted = key.public_encrypt 'top secret document'
+ *   pwd = 'some hopefully not to easily guessable password'
+ *   salt = OpenSSL::Random.random_bytes 16
+ *   iter = 20000
+ *   key_len = cipher.key_len
+ *   digest = OpenSSL::Digest::SHA256.new
  *
- * Documents encrypted with the private key can only be decrypted with the
- * public key.
+ *   key = OpenSSL::PKCS5.pbkdf2_hmac(pwd, salt, iter, key_len, digest)
+ *   cipher.key = key
  *
- *   private_encrypted = key.private_encrypt 'public release document'
+ *   Now encrypt the data:
+ *
+ *   encrypted = cipher.update document
+ *   encrypted << cipher.final
  *
  * === Decryption
  *
- * Use the opposite key type do decrypt the document
+ * Use the same steps as before to derive the symmetric AES key, this time
+ * setting the Cipher up for decryption.
+ *
+ *   cipher = OpenSSL::Cipher.new 'AES-128-CBC'
+ *   cipher.decrypt
+ *   cipher.iv = iv # the one generated with #random_iv
  *
- *   top_secret = key.public_decrypt public_encrypted
+ *   pwd = 'some hopefully not to easily guessable password'
+ *   salt = ... # the one generated above
+ *   iter = 20000
+ *   key_len = cipher.key_len
+ *   digest = OpenSSL::Digest::SHA256.new
  *
- *   public_release = key.private_decrypt private_encrypted
+ *   key = OpenSSL::PKCS5.pbkdf2_hmac(pwd, salt, iter, key_len, digest)
+ *   cipher.key = key
+ *
+ *   Now decrypt the data:
+ *
+ *   decrypted = cipher.update encrypted
+ *   decrypted << cipher.final
  *
  * == PKCS #5 Password-based Encryption
  *
  * PKCS #5 is a password-based encryption standard documented at
  * RFC2898[http://www.ietf.org/rfc/rfc2898.txt].  It allows a short password or
- * passphrase to be used to create a secure encryption key.
+ * passphrase to be used to create a secure encryption key. If possible, PBKDF2
+ * as described above should be used if the circumstances allow it.
  *
  * PKCS #5 uses a Cipher, a pass phrase and a salt to generate an encryption
  * key.
@@ -520,27 +803,27 @@ ossl_debug_set(VALUE self, VALUE val)
  *
  * First set up the cipher for encryption
  *
- *   encrypter = OpenSSL::Cipher::Cipher.new 'AES-128-CBC'
- *   encrypter.encrypt
- *   encrypter.pkcs5_keyivgen pass_phrase, salt
+ *   encryptor = OpenSSL::Cipher.new 'AES-128-CBC'
+ *   encryptor.encrypt
+ *   encryptor.pkcs5_keyivgen pass_phrase, salt
  *
  * Then pass the data you want to encrypt through
  *
- *   encrypted = encrypter.update 'top secret document'
- *   encrypted << encrypter.final
+ *   encrypted = encryptor.update 'top secret document'
+ *   encrypted << encryptor.final
  *
  * === Decryption
  *
  * Use a new Cipher instance set up for decryption
  *
- *   decrypter = OpenSSL::Cipher::Cipher.new 'AES-128-CBC'
- *   decrypter.decrypt
- *   decrypter.pkcs5_keyivgen pass_phrase, salt
+ *   decryptor = OpenSSL::Cipher.new 'AES-128-CBC'
+ *   decryptor.decrypt
+ *   decryptor.pkcs5_keyivgen pass_phrase, salt
  *
  * Then pass the data you want to decrypt through
  *
- *   plain = decrypter.update encrypted
- *   plain << decrypter.final
+ *   plain = decryptor.update encrypted
+ *   plain << decryptor.final
  *
  * == X509 Certificates
  *
@@ -549,6 +832,7 @@ ossl_debug_set(VALUE self, VALUE val)
  * 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
@@ -567,10 +851,18 @@ ossl_debug_set(VALUE self, VALUE val)
  *
  *   extension_factory = OpenSSL::X509::ExtensionFactory.new nil, cert
  *
- *   extension_factory.create_extension 'basicConstraints', 'CA:FALSE'
- *   extension_factory.create_extension 'keyUsage',
- *     'keyEncipherment,dataEncipherment,digitalSignature'
- *   extension_factory.create_extension 'subjectKeyIdentifier', 'hash'
+ *   cert.add_extension \
+ *     extension_factory.create_extension('basicConstraints', 'CA:FALSE', true)
+ *
+ *   cert.add_extension \
+ *     extension_factory.create_extension(
+ *       'keyUsage', 'keyEncipherment,dataEncipherment,digitalSignature')
+ *
+ *   cert.add_extension \
+ *     extension_factory.create_extension('subjectKeyIdentifier', 'hash')
+ *
+ * The list of supported extensions (and in some cases their possible values)
+ * can be derived from the "objects.h" file in the OpenSSL source code.
  *
  * === Signing a Certificate
  *
@@ -610,11 +902,12 @@ ossl_debug_set(VALUE self, VALUE val)
  * not readable by other users.
  *
  *   ca_key = OpenSSL::PKey::RSA.new 2048
+ *   pass_phrase = 'my secure pass phrase goes here'
  *
- *   cipher = OpenSSL::Cipher::Cipher.new 'AES-128-CBC'
+ *   cipher = OpenSSL::Cipher.new 'AES-128-CBC'
  *
  *   open 'ca_key.pem', 'w', 0400 do |io|
- *     io.write key.export(cipher, pass_phrase)
+ *     io.write ca_key.export(cipher, pass_phrase)
  *   end
  *
  * === CA Certificate
@@ -638,16 +931,20 @@ ossl_debug_set(VALUE self, VALUE val)
  *   extension_factory.subject_certificate = ca_cert
  *   extension_factory.issuer_certificate = ca_cert
  *
- *   extension_factory.create_extension 'subjectKeyIdentifier', 'hash'
+ *   ca_cert.add_extension \
+ *     extension_factory.create_extension('subjectKeyIdentifier', 'hash')
  *
  * This extension indicates the CA's key may be used as a CA.
  *
- *   extension_factory.create_extension 'basicConstraints', 'CA:TRUE', true
+ *   ca_cert.add_extension \
+ *     extension_factory.create_extension('basicConstraints', 'CA:TRUE', true)
  *
  * This extension indicates the CA's key may be used to verify signatures on
  * both certificates and certificate revocations.
  *
- *   extension_factory.create_extension 'keyUsage', 'cRLSign,keyCertSign', true
+ *   ca_cert.add_extension \
+ *     extension_factory.create_extension(
+ *       'keyUsage', 'cRLSign,keyCertSign', true)
  *
  * Root CA certificates are self-signed.
  *
@@ -703,10 +1000,15 @@ ossl_debug_set(VALUE self, VALUE val)
  *   extension_factory.subject_certificate = csr_cert
  *   extension_factory.issuer_certificate = ca_cert
  *
- *   extension_factory.create_extension 'basicConstraints', 'CA:FALSE'
- *   extension_factory.create_extension 'keyUsage',
- *     'keyEncipherment,dataEncipherment,digitalSignature'
- *   extension_factory.create_extension 'subjectKeyIdentifier', 'hash'
+ *   csr_cert.add_extension \
+ *     extension_factory.create_extension('basicConstraints', 'CA:FALSE')
+ *
+ *   csr_cert.add_extension \
+ *     extension_factory.create_extension(
+ *       'keyUsage', 'keyEncipherment,dataEncipherment,digitalSignature')
+ *
+ *   csr_cert.add_extension \
+ *     extension_factory.create_extension('subjectKeyIdentifier', 'hash')
  *
  *   csr_cert.sign ca_key, OpenSSL::Digest::SHA1.new
  *
@@ -755,15 +1057,21 @@ ossl_debug_set(VALUE self, VALUE val)
  * 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_client = TCPSocket.new 'localhost', 5000
- *   ssl_client = OpenSSL::SSL::SSLSocket.new client_socket, context
+ *   tcp_socket = TCPSocket.new 'localhost', 5000
+ *   ssl_client = OpenSSL::SSL::SSLSocket.new tcp_socket, context
+ *   ssl_client.sync_close = true
  *   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
@@ -777,8 +1085,8 @@ ossl_debug_set(VALUE self, VALUE val)
  *
  *   require 'socket'
  *
- *   tcp_client = TCPSocket.new 'localhost', 5000
- *   ssl_client = OpenSSL::SSL::SSLSocket.new client_socket, context
+ *   tcp_socket = TCPSocket.new 'localhost', 5000
+ *   ssl_client = OpenSSL::SSL::SSLSocket.new tcp_socket, context
  *   ssl_client.connect
  *
  *   ssl_client.puts "hello server!"
@@ -789,8 +1097,9 @@ ossl_debug_set(VALUE self, VALUE val)
  *
  */
 void
-Init_openssl()
+Init_openssl(void)
 {
+#undef rb_intern
     /*
      * Init timezone info
      */
@@ -801,31 +1110,21 @@ Init_openssl()
     /*
      * Init all digests, ciphers
      */
-    /* CRYPTO_malloc_init(); */
-    /* ENGINE_load_builtin_engines(); */
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
+    if (!OPENSSL_init_ssl(0, NULL))
+        rb_raise(rb_eRuntimeError, "OPENSSL_init_ssl");
+#else
     OpenSSL_add_ssl_algorithms();
     OpenSSL_add_all_algorithms();
     ERR_load_crypto_strings();
     SSL_load_error_strings();
-
-    /*
-     * FIXME:
-     * On unload do:
-     */
-#if 0
-    CONF_modules_unload(1);
-    destroy_ui_method();
-    EVP_cleanup();
-    ENGINE_cleanup();
-    CRYPTO_cleanup_all_ex_data();
-    ERR_remove_state(0);
-    ERR_free_strings();
 #endif
 
     /*
      * Init main module
      */
     mOSSL = rb_define_module("OpenSSL");
+    rb_global_variable(&mOSSL);
 
     /*
      * OpenSSL ruby extension version
@@ -836,6 +1135,16 @@ Init_openssl()
      * Version of OpenSSL the ruby OpenSSL extension was built with
      */
     rb_define_const(mOSSL, "OPENSSL_VERSION", rb_str_new2(OPENSSL_VERSION_TEXT));
+
+    /*
+     * Version of OpenSSL the ruby OpenSSL extension is running with
+     */
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
+    rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(OpenSSL_version(OPENSSL_VERSION)));
+#else
+    rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(SSLeay_version(SSLEAY_VERSION)));
+#endif
+
     /*
      * Version number of OpenSSL the ruby OpenSSL extension was built with
      * (base 16)
@@ -843,21 +1152,32 @@ Init_openssl()
     rb_define_const(mOSSL, "OPENSSL_VERSION_NUMBER", INT2NUM(OPENSSL_VERSION_NUMBER));
 
     /*
-     * Generic error,
-     * common for all classes under OpenSSL module
+     * Boolean indicating whether OpenSSL is FIPS-capable or not
      */
-    eOSSLError = rb_define_class_under(mOSSL,"OpenSSLError",rb_eStandardError);
+    rb_define_const(mOSSL, "OPENSSL_FIPS",
+#ifdef OPENSSL_FIPS
+		    Qtrue
+#else
+		    Qfalse
+#endif
+		   );
+
+    rb_define_module_function(mOSSL, "fips_mode", ossl_fips_mode_get, 0);
+    rb_define_module_function(mOSSL, "fips_mode=", ossl_fips_mode_set, 1);
 
     /*
-     * Verify callback Proc index for ext-data
+     * Generic error,
+     * common for all classes under OpenSSL module
      */
-    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");
+    eOSSLError = rb_define_class_under(mOSSL,"OpenSSLError",rb_eStandardError);
+    rb_global_variable(&eOSSLError);
 
     /*
      * Init debug core
      */
     dOSSL = Qfalse;
+    rb_global_variable(&dOSSL);
+
     rb_define_module_function(mOSSL, "debug", ossl_debug_get, 0);
     rb_define_module_function(mOSSL, "debug=", ossl_debug_set, 1);
     rb_define_module_function(mOSSL, "errors", ossl_get_errors, 0);
@@ -867,6 +1187,10 @@ Init_openssl()
      */
     ossl_s_to_der = rb_intern("to_der");
 
+#if !defined(HAVE_OPENSSL_110_THREADING_API)
+    Init_ossl_locks();
+#endif
+
     /*
      * Init components
      */
@@ -878,7 +1202,6 @@ Init_openssl()
     Init_ossl_ns_spki();
     Init_ossl_pkcs12();
     Init_ossl_pkcs7();
-    Init_ossl_pkcs5();
     Init_ossl_pkey();
     Init_ossl_rand();
     Init_ossl_ssl();
@@ -886,16 +1209,41 @@ Init_openssl()
     Init_ossl_ocsp();
     Init_ossl_engine();
     Init_ossl_asn1();
-}
+    Init_ossl_kdf();
 
 #if defined(OSSL_DEBUG)
-/*
- * Check if all symbols are OK with 'make LDSHARED=gcc all'
- */
-int
-main(int argc, char *argv[])
-{
-    return 0;
-}
-#endif /* OSSL_DEBUG */
+    /*
+     * For debugging Ruby/OpenSSL. Enable only when built with --enable-debug
+     */
+#if !defined(LIBRESSL_VERSION_NUMBER) && \
+    (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(OPENSSL_NO_CRYPTO_MDEBUG) || \
+     defined(CRYPTO_malloc_debug_init))
+    rb_define_module_function(mOSSL, "mem_check_start", mem_check_start, 0);
+    rb_define_module_function(mOSSL, "print_mem_leaks", print_mem_leaks, 0);
+
+#if defined(CRYPTO_malloc_debug_init) /* <= 1.0.2 */
+    CRYPTO_malloc_debug_init();
+#endif
+
+#if defined(V_CRYPTO_MDEBUG_ALL) /* <= 1.0.2 */
+    CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
+#endif
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000 /* <= 1.0.2 */
+    {
+	int i;
+	/*
+	 * See crypto/ex_data.c; call def_get_class() immediately to avoid
+	 * allocations. 15 is the maximum number that is used as the class index
+	 * in OpenSSL 1.0.2.
+	 */
+	for (i = 0; i <= 15; i++) {
+	    if (CRYPTO_get_ex_new_index(i, 0, (void *)"ossl-mdebug-dummy", 0, 0, 0) < 0)
+		rb_raise(rb_eRuntimeError, "CRYPTO_get_ex_new_index for "
+			 "class index %d failed", i);
+	}
+    }
+#endif
+#endif
+#endif
+}
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 97095f7d6f..6af7ddd7d0 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_H_)
@@ -13,48 +12,14 @@
 
 #include RUBY_EXTCONF_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 <assert.h>
 #include <ruby.h>
+#include <errno.h>
 #include <ruby/io.h>
-
-/*
- * Check the OpenSSL version
- * The only supported are:
- * 	OpenSSL >= 0.9.7
- */
+#include <ruby/thread.h>
 #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_mac.h>
+#include <openssl/asn1.h>
 #include <openssl/x509v3.h>
 #include <openssl/ssl.h>
 #include <openssl/pkcs12.h>
@@ -62,17 +27,18 @@ extern "C" {
 #include <openssl/hmac.h>
 #include <openssl/rand.h>
 #include <openssl/conf.h>
-#include <openssl/conf_api.h>
-#undef X509_NAME
-#undef PKCS7_SIGNER_INFO
-#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ST_ENGINE)
-#  define OSSL_ENGINE_ENABLED
+#include <openssl/crypto.h>
+#if !defined(OPENSSL_NO_ENGINE)
 #  include <openssl/engine.h>
 #endif
-#if defined(HAVE_OPENSSL_OCSP_H)
-#  define OSSL_OCSP_ENABLED
+#if !defined(OPENSSL_NO_OCSP)
 #  include <openssl/ocsp.h>
 #endif
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/evp.h>
+#include <openssl/dh.h>
 
 /*
  * Common Module
@@ -89,91 +55,77 @@ extern VALUE eOSSLError;
  */
 #define OSSL_Check_Kind(obj, klass) do {\
   if (!rb_obj_is_kind_of((obj), (klass))) {\
-    ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected kind of %s)",\
-               rb_obj_classname(obj), rb_class2name(klass));\
-  }\
-} while (0)
-
-#define OSSL_Check_Instance(obj, klass) do {\
-  if (!rb_obj_is_instance_of((obj), (klass))) {\
-    ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected instance of %s)",\
-               rb_obj_classname(obj), rb_class2name(klass));\
-  }\
-} while (0)
-
-#define OSSL_Check_Same_Class(obj1, obj2) do {\
-  if (!rb_obj_is_instance_of((obj1), rb_obj_class(obj2))) {\
-    ossl_raise(rb_eTypeError, "wrong argument type");\
+    ossl_raise(rb_eTypeError, "wrong argument (%"PRIsVALUE")! (Expected kind of %"PRIsVALUE")",\
+               rb_obj_class(obj), (klass));\
   }\
 } while (0)
 
 /*
- * Compatibility
+ * Type conversions
  */
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-#define STACK _STACK
+#if !defined(NUM2UINT64T) /* in case Ruby starts to provide */
+#  if SIZEOF_LONG == 8
+#    define NUM2UINT64T(x) ((uint64_t)NUM2ULONG(x))
+#  elif defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8
+#    define NUM2UINT64T(x) ((uint64_t)NUM2ULL(x))
+#  else
+#    error "unknown platform; no 64-bit width integer"
+#  endif
 #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(STACK_OF(X509) *certs);
-VALUE ossl_x509crl_sk2ary(STACK_OF(X509_CRL) *crl);
-VALUE ossl_x509name_sk2ary(STACK_OF(X509_NAME) *names);
+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_buf2str(char *buf, int len);
+VALUE ossl_str_new(const char *, long, int *);
 #define ossl_str_adjust(str, p) \
 do{\
-    int len = RSTRING_LENINT(str);\
-    int newlen = rb_long2int((p) - (unsigned char*)RSTRING_PTR(str));\
+    long len = RSTRING_LEN(str);\
+    long newlen = (long)((p) - (unsigned char*)RSTRING_PTR(str));\
     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)	(void)BIO_reset((bio)); \
-				ERR_clear_error();
+#define OSSL_BIO_reset(bio) do { \
+    (void)BIO_reset((bio)); \
+    ossl_clear_error(); \
+} while (0)
 
 /*
  * ERRor messages
  */
-#define OSSL_ErrMsg() ERR_reason_error_string(ERR_get_error())
 NORETURN(void ossl_raise(VALUE, const char *, ...));
-VALUE ossl_exc_new(VALUE, const char *, ...);
-
-/*
- * Verify callback
- */
-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 *);
+/* Clear OpenSSL error queue. If dOSSL is set, rb_warn() them. */
+void ossl_clear_error(void);
 
 /*
  * String to DER String
  */
-extern ID ossl_s_to_der;
 VALUE ossl_to_der(VALUE);
 VALUE ossl_to_der_if_possible(VALUE);
 
@@ -191,20 +143,9 @@ extern VALUE dOSSL;
   } \
 } while (0)
 
-#define OSSL_Warning(fmt, ...) do { \
-  OSSL_Debug((fmt), ##__VA_ARGS__); \
-  rb_warning((fmt), ##__VA_ARGS__); \
-} while (0)
-
-#define OSSL_Warn(fmt, ...) do { \
-  OSSL_Debug((fmt), ##__VA_ARGS__); \
-  rb_warn((fmt), ##__VA_ARGS__); \
-} while (0)
 #else
 void ossl_debug(const char *, ...);
 #define OSSL_Debug ossl_debug
-#define OSSL_Warning rb_warning
-#define OSSL_Warn rb_warn
 #endif
 
 /*
@@ -223,19 +164,14 @@ void ossl_debug(const char *, ...);
 #include "ossl_ocsp.h"
 #include "ossl_pkcs12.h"
 #include "ossl_pkcs7.h"
-#include "ossl_pkcs5.h"
 #include "ossl_pkey.h"
 #include "ossl_rand.h"
 #include "ossl_ssl.h"
 #include "ossl_version.h"
 #include "ossl_x509.h"
 #include "ossl_engine.h"
+#include "ossl_kdf.h"
 
 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 fe7256ae61..0085d4beab 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -1,47 +1,41 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' team members
  * Copyright (C) 2003
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed 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);
 static VALUE ossl_asn1_initialize(int argc, VALUE *argv, VALUE self);
-static VALUE ossl_asn1eoc_initialize(VALUE self);
 
 /*
  * DATE conversion
  */
 VALUE
-asn1time_to_time(ASN1_TIME *time)
+asn1time_to_time(const ASN1_TIME *time)
 {
     struct tm tm;
     VALUE argv[6];
+    int count;
 
-    if (!time || !time->data) return Qnil;
     memset(&tm, 0, sizeof(struct tm));
 
     switch (time->type) {
     case V_ASN1_UTCTIME:
-	if (sscanf((const char *)time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
-    		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
-	    ossl_raise(rb_eTypeError, "bad UTCTIME format");
+	count = sscanf((const char *)time->data, "%2d%2d%2d%2d%2d%2dZ",
+		&tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min,
+		&tm.tm_sec);
+
+	if (count == 5) {
+	    tm.tm_sec = 0;
+	} else if (count != 6) {
+	    ossl_raise(rb_eTypeError, "bad UTCTIME format: \"%s\"",
+		    time->data);
 	}
 	if (tm.tm_year < 69) {
 	    tm.tm_year += 2000;
@@ -50,9 +44,15 @@ asn1time_to_time(ASN1_TIME *time)
 	}
 	break;
     case V_ASN1_GENERALIZEDTIME:
-	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" );
+	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);
 	}
 	break;
     default:
@@ -69,94 +69,72 @@ asn1time_to_time(ASN1_TIME *time)
     return rb_funcall2(rb_cTime, rb_intern("utc"), 6, argv);
 }
 
-/*
- * This function is not exported in Ruby's *.h
- */
-extern struct timeval rb_time_timeval(VALUE);
-
-time_t
-time_to_time_t(VALUE time)
+void
+ossl_time_split(VALUE time, time_t *sec, int *days)
 {
-    return (time_t)NUM2LONG(rb_Integer(time));
+    VALUE num = rb_Integer(time);
+
+    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)));
+    }
 }
 
 /*
  * STRING conversion
  */
 VALUE
-asn1str_to_str(ASN1_STRING *str)
+asn1str_to_str(const 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(ASN1_INTEGER *ai)
+asn1integer_to_num(const 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 (!(bn = ASN1_INTEGER_to_BN(ai, NULL))) {
-	ossl_raise(eOSSLError, NULL);
-    }
-#if DO_IT_VIA_RUBY
-    if (!(txt = BN_bn2dec(bn))) {
-	BN_free(bn);
+    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)
 	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)
-{
-    BIGNUM *bn = GetBNPtr(obj);
+    BIGNUM *bn;
 
-    if (!(ai = BN_to_ASN1_INTEGER(bn, ai))) {
+    if (NIL_P(obj))
+	ossl_raise(rb_eTypeError, "Can't convert nil into Integer");
+
+    bn = GetBNPtr(obj);
+
+    if (!(ai = BN_to_ASN1_INTEGER(bn, ai)))
 	ossl_raise(eOSSLError, NULL);
-    }
+
     return ai;
 }
-#endif
 
 /********/
 /*
@@ -166,13 +144,13 @@ num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
 #define ossl_asn1_get_tag(o)             rb_attr_get((o),sivTAG)
 #define ossl_asn1_get_tagging(o)         rb_attr_get((o),sivTAGGING)
 #define ossl_asn1_get_tag_class(o)       rb_attr_get((o),sivTAG_CLASS)
-#define ossl_asn1_get_infinite_length(o) rb_attr_get((o),sivINFINITE_LENGTH)
+#define ossl_asn1_get_indefinite_length(o) rb_attr_get((o),sivINDEFINITE_LENGTH)
 
 #define ossl_asn1_set_value(o,v)           rb_ivar_set((o),sivVALUE,(v))
 #define ossl_asn1_set_tag(o,v)             rb_ivar_set((o),sivTAG,(v))
 #define ossl_asn1_set_tagging(o,v)         rb_ivar_set((o),sivTAGGING,(v))
 #define ossl_asn1_set_tag_class(o,v)       rb_ivar_set((o),sivTAG_CLASS,(v))
-#define ossl_asn1_set_infinite_length(o,v) rb_ivar_set((o),sivINFINITE_LENGTH,(v))
+#define ossl_asn1_set_indefinite_length(o,v) rb_ivar_set((o),sivINDEFINITE_LENGTH,(v))
 
 VALUE mASN1;
 VALUE eASN1Error;
@@ -196,22 +174,10 @@ VALUE cASN1ObjectId;                          /* OBJECT IDENTIFIER */
 VALUE cASN1UTCTime, cASN1GeneralizedTime;     /* TIME              */
 VALUE cASN1Sequence, cASN1Set;                /* CONSTRUCTIVE      */
 
-static ID sIMPLICIT, sEXPLICIT;
-static ID sUNIVERSAL, sAPPLICATION, sCONTEXT_SPECIFIC, sPRIVATE;
-static ID sivVALUE, sivTAG, sivTAG_CLASS, sivTAGGING, sivINFINITE_LENGTH, sivUNUSED_BITS;
-
-/*
- * 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
+static VALUE sym_IMPLICIT, sym_EXPLICIT;
+static VALUE sym_UNIVERSAL, sym_APPLICATION, sym_CONTEXT_SPECIFIC, sym_PRIVATE;
+static ID sivVALUE, sivTAG, sivTAG_CLASS, sivTAGGING, sivINDEFINITE_LENGTH, sivUNUSED_BITS;
+static ID id_each;
 
 /*
  * Ruby to ASN1 converters
@@ -219,11 +185,10 @@ static ID sivVALUE, sivTAG, sivTAG_CLASS, sivTAGGING, sivINFINITE_LENGTH, sivUNU
 static ASN1_BOOLEAN
 obj_to_asn1bool(VALUE obj)
 {
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
-     return RTEST(obj) ? 0xff : 0x100;
-#else
+    if (NIL_P(obj))
+	ossl_raise(rb_eTypeError, "Can't convert nil into Boolean");
+
      return RTEST(obj) ? 0xff : 0x0;
-#endif
 }
 
 static ASN1_INTEGER*
@@ -237,13 +202,15 @@ obj_to_asn1bstr(VALUE obj, long unused_bits)
 {
     ASN1_BIT_STRING *bstr;
 
-    if(unused_bits < 0) unused_bits = 0;
+    if (unused_bits < 0 || unused_bits > 7)
+	ossl_raise(eASN1Error, "unused_bits for a bitstring value must be in "\
+		   "the range 0 to 7");
     StringValue(obj);
     if(!(bstr = ASN1_BIT_STRING_new()))
 	ossl_raise(eASN1Error, NULL);
     ASN1_BIT_STRING_set(bstr, (unsigned char *)RSTRING_PTR(obj), RSTRING_LENINT(obj));
     bstr->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */
-    bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT|(unused_bits&0x07);
+    bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT | unused_bits;
 
     return bstr;
 }
@@ -279,36 +246,40 @@ obj_to_asn1obj(VALUE obj)
 {
     ASN1_OBJECT *a1obj;
 
-    StringValue(obj);
+    StringValueCStr(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");
+    if(!a1obj) ossl_raise(eASN1Error, "invalid OBJECT ID %"PRIsVALUE, obj);
 
     return a1obj;
 }
 
-static ASN1_UTCTIME*
+static ASN1_UTCTIME *
 obj_to_asn1utime(VALUE time)
 {
     time_t sec;
     ASN1_UTCTIME *t;
 
-    sec = time_to_time_t(time);
-    if(!(t = ASN1_UTCTIME_set(NULL, sec)))
-        ossl_raise(eASN1Error, NULL);
+    int off_days;
+
+    ossl_time_split(time, &sec, &off_days);
+    if (!(t = ASN1_UTCTIME_adj(NULL, sec, off_days, 0)))
+	ossl_raise(eASN1Error, NULL);
 
     return t;
 }
 
-static ASN1_GENERALIZEDTIME*
+static ASN1_GENERALIZEDTIME *
 obj_to_asn1gtime(VALUE time)
 {
     time_t sec;
     ASN1_GENERALIZEDTIME *t;
 
-    sec = time_to_time_t(time);
-    if(!(t =ASN1_GENERALIZEDTIME_set(NULL, sec)))
-        ossl_raise(eASN1Error, NULL);
+    int off_days;
+
+    ossl_time_split(time, &sec, &off_days);
+    if (!(t = ASN1_GENERALIZEDTIME_adj(NULL, sec, off_days, 0)))
+	ossl_raise(eASN1Error, NULL);
 
     return t;
 }
@@ -331,20 +302,20 @@ obj_to_asn1derstr(VALUE obj)
  * DER to Ruby converters
  */
 static VALUE
-decode_bool(unsigned char* der, int length)
+decode_bool(unsigned char* der, long length)
 {
-    int val;
-    const unsigned char *p;
+    const unsigned char *p = der;
 
-    p = der;
-    if((val = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
-	ossl_raise(eASN1Error, NULL);
+    if (length != 3)
+	ossl_raise(eASN1Error, "invalid length for BOOLEAN");
+    if (p[0] != 1 || p[1] != 1)
+	ossl_raise(eASN1Error, "invalid BOOLEAN");
 
-    return val ? Qtrue : Qfalse;
+    return p[2] ? Qtrue : Qfalse;
 }
 
 static VALUE
-decode_int(unsigned char* der, int length)
+decode_int(unsigned char* der, long length)
 {
     ASN1_INTEGER *ai;
     const unsigned char *p;
@@ -354,7 +325,7 @@ decode_int(unsigned char* der, int 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);
@@ -363,7 +334,7 @@ decode_int(unsigned char* der, int length)
 }
 
 static VALUE
-decode_bstr(unsigned char* der, int length, long *unused_bits)
+decode_bstr(unsigned char* der, long length, long *unused_bits)
 {
     ASN1_BIT_STRING *bstr;
     const unsigned char *p;
@@ -384,7 +355,7 @@ decode_bstr(unsigned char* der, int length, long *unused_bits)
 }
 
 static VALUE
-decode_enum(unsigned char* der, int length)
+decode_enum(unsigned char* der, long length)
 {
     ASN1_ENUMERATED *ai;
     const unsigned char *p;
@@ -394,7 +365,7 @@ decode_enum(unsigned char* der, int 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);
@@ -403,7 +374,7 @@ decode_enum(unsigned char* der, int length)
 }
 
 static VALUE
-decode_null(unsigned char* der, int length)
+decode_null(unsigned char* der, long length)
 {
     ASN1_NULL *null;
     const unsigned char *p;
@@ -417,7 +388,7 @@ decode_null(unsigned char* der, int length)
 }
 
 static VALUE
-decode_obj(unsigned char* der, int length)
+decode_obj(unsigned char* der, long length)
 {
     ASN1_OBJECT *obj;
     const unsigned char *p;
@@ -446,7 +417,7 @@ decode_obj(unsigned char* der, int length)
 }
 
 static VALUE
-decode_time(unsigned char* der, int length)
+decode_time(unsigned char* der, long length)
 {
     ASN1_TIME *time;
     const unsigned char *p;
@@ -456,7 +427,7 @@ decode_time(unsigned char* der, int 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);
@@ -465,7 +436,7 @@ decode_time(unsigned char* der, int length)
 }
 
 static VALUE
-decode_eoc(unsigned char *der, int length)
+decode_eoc(unsigned char *der, long length)
 {
     if (length != 2 || !(der[0] == 0x00 && der[1] == 0x00))
 	ossl_raise(eASN1Error, NULL);
@@ -480,7 +451,7 @@ typedef struct {
     VALUE *klass;
 } ossl_asn1_info_t;
 
-static ossl_asn1_info_t ossl_asn1_info[] = {
+static const ossl_asn1_info_t ossl_asn1_info[] = {
     { "EOC",               &cASN1EndOfContent,    },  /*  0 */
     { "BOOLEAN",           &cASN1Boolean,         },  /*  1 */
     { "INTEGER",           &cASN1Integer,         },  /*  2 */
@@ -514,7 +485,7 @@ static ossl_asn1_info_t ossl_asn1_info[] = {
     { "BMPSTRING",         &cASN1BMPString,       },  /* 30 */
 };
 
-int ossl_asn1_info_size = (sizeof(ossl_asn1_info)/sizeof(ossl_asn1_info[0]));
+enum {ossl_asn1_info_size = (sizeof(ossl_asn1_info)/sizeof(ossl_asn1_info[0]))};
 
 static VALUE class_tag_map;
 
@@ -527,7 +498,7 @@ ossl_asn1_get_asn1type(VALUE obj)
     VALUE value, rflag;
     void *ptr;
     void (*free_func)();
-    int tag, flag;
+    int tag;
 
     tag = ossl_asn1_default_tag(obj);
     value = ossl_asn1_get_value(obj);
@@ -543,8 +514,7 @@ ossl_asn1_get_asn1type(VALUE obj)
 	break;
     case V_ASN1_BIT_STRING:
         rflag = rb_attr_get(obj, sivUNUSED_BITS);
-        flag = NIL_P(rflag) ? -1 : NUM2INT(rflag);
-	ptr = obj_to_asn1bstr(value, flag);
+	ptr = obj_to_asn1bstr(value, NUM2INT(rflag));
 	free_func = ASN1_BIT_STRING_free;
 	break;
     case V_ASN1_NULL:
@@ -602,17 +572,14 @@ ossl_asn1_default_tag(VALUE obj)
     VALUE tmp_class, tag;
 
     tmp_class = CLASS_OF(obj);
-    while (tmp_class) {
+    while (!NIL_P(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 %s not found",
-	       rb_class2name(CLASS_OF(obj)));
 
-    return -1; /* dummy */
+    return -1;
 }
 
 static int
@@ -628,74 +595,46 @@ ossl_asn1_tag(VALUE obj)
 }
 
 static int
-ossl_asn1_is_explicit(VALUE obj)
-{
-    VALUE s;
-    int ret = -1;
-
-    s = ossl_asn1_get_tagging(obj);
-    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)) 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){
+    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
 	ossl_raise(eASN1Error, "invalid tag class");
-    }
-
-    return ret;
 }
 
 static VALUE
 ossl_asn1_class2sym(int tc)
 {
     if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
-	return ID2SYM(sPRIVATE);
+	return sym_PRIVATE;
     else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
-	return ID2SYM(sCONTEXT_SPECIFIC);
+	return sym_CONTEXT_SPECIFIC;
     else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
-	return ID2SYM(sAPPLICATION);
+	return sym_APPLICATION;
     else
-	return ID2SYM(sUNIVERSAL);
+	return sym_UNIVERSAL;
 }
 
 /*
  * call-seq:
  *    OpenSSL::ASN1::ASN1Data.new(value, tag, tag_class) => ASN1Data
  *
- * +value+: Please have a look at Constructive and Primitive to see how Ruby
+ * _value_: Please have a look at Constructive and Primitive to see how Ruby
  * types are mapped to ASN.1 types and vice versa.
  *
- * +tag+: A +Number+ indicating the tag number.
+ * _tag_: An Integer indicating the tag number.
  *
- * +tag_class+: A +Symbol+ indicating the tag class. Please cf. ASN1 for
+ * _tag_class_: A Symbol indicating the tag class. Please cf. ASN1 for
  * possible values.
  *
  * == Example
@@ -707,77 +646,89 @@ ossl_asn1data_initialize(VALUE self, VALUE value, VALUE tag, VALUE tag_class)
 {
     if(!SYMBOL_P(tag_class))
 	ossl_raise(eASN1Error, "invalid tag class");
-    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);
     ossl_asn1_set_tag_class(self, tag_class);
-    ossl_asn1_set_infinite_length(self, Qfalse);
+    ossl_asn1_set_indefinite_length(self, Qfalse);
 
     return self;
 }
 
 static VALUE
-join_der_i(VALUE i, VALUE str)
+to_der_internal(VALUE self, int constructed, int indef_len, VALUE body)
 {
-    i = ossl_to_der_if_possible(i);
-    StringValue(i);
-    rb_str_append(str, i);
-    return Qnil;
-}
+    int encoding = constructed ? indef_len ? 2 : 1 : 0;
+    int tag_class = ossl_asn1_tag_class(self);
+    int tag_number = ossl_asn1_tag(self);
+    int default_tag_number = ossl_asn1_default_tag(self);
+    int body_length, total_length;
+    VALUE str;
+    unsigned char *p;
 
-static VALUE
-join_der(VALUE enumerable)
-{
-    VALUE str = rb_str_new(0, 0);
-    rb_block_call(enumerable, rb_intern("each"), 0, 0, join_der_i, str);
+    body_length = RSTRING_LENINT(body);
+    if (ossl_asn1_get_tagging(self) == sym_EXPLICIT) {
+	int inner_length, e_encoding = indef_len ? 2 : 1;
+
+	if (default_tag_number == -1)
+	    ossl_raise(eASN1Error, "explicit tagging of unknown tag");
+
+	inner_length = ASN1_object_size(encoding, body_length, default_tag_number);
+	total_length = ASN1_object_size(e_encoding, inner_length, tag_number);
+	str = rb_str_new(NULL, total_length);
+	p = (unsigned char *)RSTRING_PTR(str);
+	/* Put explicit tag */
+	ASN1_put_object(&p, e_encoding, inner_length, tag_number, tag_class);
+	/* Append inner object */
+	ASN1_put_object(&p, encoding, body_length, default_tag_number, V_ASN1_UNIVERSAL);
+	memcpy(p, RSTRING_PTR(body), body_length);
+	p += body_length;
+	if (indef_len) {
+	    ASN1_put_eoc(&p); /* For inner object */
+	    ASN1_put_eoc(&p); /* For wrapper object */
+	}
+    }
+    else {
+	total_length = ASN1_object_size(encoding, body_length, tag_number);
+	str = rb_str_new(NULL, total_length);
+	p = (unsigned char *)RSTRING_PTR(str);
+	ASN1_put_object(&p, encoding, body_length, tag_number, tag_class);
+	memcpy(p, RSTRING_PTR(body), body_length);
+	p += body_length;
+	if (indef_len)
+	    ASN1_put_eoc(&p);
+    }
+    assert(p - (unsigned char *)RSTRING_PTR(str) == total_length);
     return str;
 }
 
+static VALUE ossl_asn1prim_to_der(VALUE);
+static VALUE ossl_asn1cons_to_der(VALUE);
 /*
  * call-seq:
  *    asn1.to_der => DER-encoded String
  *
  * Encodes this ASN1Data into a DER-encoded String value. The result is
- * DER-encoded except for the possibility of infinite length encodings.
- * Infinite length encodings are not allowed in strict DER, so strictly
- * speaking the result of such an encoding would be a BER-encoding.
+ * DER-encoded except for the possibility of indefinite length forms.
+ * Indefinite length forms are not allowed in strict DER, so strictly speaking
+ * the result of such an encoding would be a BER-encoding.
  */
 static VALUE
 ossl_asn1data_to_der(VALUE self)
 {
-    VALUE value, der, inf_length;
-    int tag, tag_class, is_cons = 0;
-    long length;
-    unsigned char *p;
-
-    value = ossl_asn1_get_value(self);
-    if(rb_obj_is_kind_of(value, rb_cArray)){
-	is_cons = 1;
-	value = join_der(value);
-    }
-    StringValue(value);
+    VALUE value = ossl_asn1_get_value(self);
 
-    tag = ossl_asn1_tag(self);
-    tag_class = ossl_asn1_tag_class(self);
-    inf_length = ossl_asn1_get_infinite_length(self);
-    if (inf_length == Qtrue) {
-	is_cons = 2;
+    if (rb_obj_is_kind_of(value, rb_cArray))
+	return ossl_asn1cons_to_der(self);
+    else {
+	if (RTEST(ossl_asn1_get_indefinite_length(self)))
+	    ossl_raise(eASN1Error, "indefinite length form cannot be used " \
+		       "with primitive encoding");
+	return ossl_asn1prim_to_der(self);
     }
-    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);
-    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);
-
-    return der;
 }
 
 static VALUE
-int_ossl_asn1_decode0_prim(unsigned char **pp, long length, int hlen, int tag,
+int_ossl_asn1_decode0_prim(unsigned char **pp, long length, long hlen, int tag,
 			   VALUE tc, long *num_read)
 {
     VALUE value, asn1data;
@@ -786,7 +737,7 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, int hlen, int tag,
 
     p = *pp;
 
-    if(tc == sUNIVERSAL && tag < ossl_asn1_info_size) {
+    if(tc == sym_UNIVERSAL && tag < ossl_asn1_info_size) {
 	switch(tag){
 	case V_ASN1_EOC:
 	    value = decode_eoc(p, hlen+length);
@@ -828,13 +779,14 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, int hlen, int tag,
     *pp += hlen + length;
     *num_read = hlen + length;
 
-    if (tc == sUNIVERSAL && tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass) {
+    if (tc == sym_UNIVERSAL &&
+	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] = ID2SYM(tc);
+	args[3] = tc;
 	asn1data = rb_obj_alloc(klass);
 	ossl_asn1_initialize(4, args, asn1data);
 	if(tag == V_ASN1_BIT_STRING){
@@ -843,7 +795,7 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, int hlen, int tag,
     }
     else {
 	asn1data = rb_obj_alloc(cASN1Data);
-	ossl_asn1data_initialize(asn1data, value, INT2NUM(tag), ID2SYM(tc));
+	ossl_asn1data_initialize(asn1data, value, INT2NUM(tag), tc);
     }
 
     return asn1data;
@@ -855,52 +807,48 @@ int_ossl_asn1_decode0_cons(unsigned char **pp, long max_len, long length,
 			   int tag, VALUE tc, long *num_read)
 {
     VALUE value, asn1data, ary;
-    int infinite;
-    long off = *offset;
+    int indefinite;
+    long available_len, off = *offset;
 
-    infinite = (j == 0x21);
+    indefinite = (j == 0x21);
     ary = rb_ary_new();
 
-    while (length > 0 || infinite) {
+    available_len = indefinite ? max_len : length;
+    while (available_len > 0) {
 	long inner_read = 0;
-	value = ossl_asn1_decode0(pp, max_len, &off, depth + 1, yield, &inner_read);
+	value = ossl_asn1_decode0(pp, available_len, &off, depth + 1, yield, &inner_read);
 	*num_read += 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 &&
-	    SYM2ID(ossl_asn1_get_tag_class(value)) == sUNIVERSAL) {
+	available_len -= inner_read;
+
+	if (indefinite &&
+	    ossl_asn1_tag(value) == V_ASN1_EOC &&
+	    ossl_asn1_get_tag_class(value) == sym_UNIVERSAL) {
 	    break;
 	}
+	rb_ary_push(ary, value);
     }
 
-    if (tc == sUNIVERSAL && (tag == V_ASN1_SEQUENCE || V_ASN1_SET)) {
+    if (tc == sym_UNIVERSAL) {
 	VALUE args[4];
-	VALUE klass = *ossl_asn1_info[tag].klass;
-	if (infinite && tag != V_ASN1_SEQUENCE && tag != V_ASN1_SET) {
+	if (tag == V_ASN1_SEQUENCE || tag == V_ASN1_SET)
+	    asn1data = rb_obj_alloc(*ossl_asn1_info[tag].klass);
+	else
 	    asn1data = rb_obj_alloc(cASN1Constructive);
-	}
-	else {
-	    asn1data = rb_obj_alloc(klass);
-	}
 	args[0] = ary;
 	args[1] = INT2NUM(tag);
 	args[2] = Qnil;
-	args[3] = ID2SYM(tc);
+	args[3] = tc;
 	ossl_asn1_initialize(4, args, asn1data);
     }
     else {
 	asn1data = rb_obj_alloc(cASN1Data);
-	ossl_asn1data_initialize(asn1data, ary, INT2NUM(tag), ID2SYM(tc));
+	ossl_asn1data_initialize(asn1data, ary, INT2NUM(tag), tc);
     }
 
-    if (infinite)
-	ossl_asn1_set_infinite_length(asn1data, Qtrue);
+    if (indefinite)
+	ossl_asn1_set_indefinite_length(asn1data, Qtrue);
     else
-	ossl_asn1_set_infinite_length(asn1data, Qfalse);
+	ossl_asn1_set_indefinite_length(asn1data, Qfalse);
 
     *offset = off;
     return asn1data;
@@ -912,8 +860,8 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, int depth,
 {
     unsigned char *start, *p;
     const unsigned char *p0;
-    long len = 0, inner_read = 0, off = *offset;
-    int hlen, tag, tc, j;
+    long len = 0, inner_read = 0, off = *offset, hlen;
+    int tag, tc, j;
     VALUE asn1data, tag_class;
 
     p = *pp;
@@ -924,13 +872,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 = sPRIVATE;
+	tag_class = sym_PRIVATE;
     else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
-	tag_class = sCONTEXT_SPECIFIC;
+	tag_class = sym_CONTEXT_SPECIFIC;
     else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
-	tag_class = sAPPLICATION;
+	tag_class = sym_APPLICATION;
     else
-	tag_class = sUNIVERSAL;
+	tag_class = sym_UNIVERSAL;
 
     hlen = p - start;
 
@@ -949,11 +897,12 @@ 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, len, &off, depth, yield, j, tag, tag_class, &inner_read);
+	asn1data = int_ossl_asn1_decode0_cons(pp, length - hlen, len, &off, depth, yield, j, tag, tag_class, &inner_read);
 	inner_read += hlen;
     }
     else {
-    	if ((j & 0x01) && (len == 0)) ossl_raise(eASN1Error, "Infinite length for primitive value");
+	if ((j & 0x01) && (len == 0))
+	    ossl_raise(eASN1Error, "indefinite length for primitive value");
 	asn1data = int_ossl_asn1_decode0_prim(pp, len, hlen, tag, tag_class, &inner_read);
 	off += hlen + len;
     }
@@ -985,13 +934,13 @@ int_ossl_decode_sanity_check(long len, long read, long offset)
  *
  * If a block is given, it prints out each of the elements encountered.
  * Block parameters are (in that order):
- * * depth: The recursion depth, plus one with each constructed value being encountered (Number)
- * * offset: Current byte offset (Number)
- * * header length: Combined length in bytes of the Tag and Length headers. (Number)
- * * length: The overall remaining length of the entire data (Number)
+ * * depth: The recursion depth, plus one with each constructed value being encountered (Integer)
+ * * offset: Current byte offset (Integer)
+ * * header length: Combined length in bytes of the Tag and Length headers. (Integer)
+ * * length: The overall remaining length of the entire data (Integer)
  * * constructed: Whether this value is constructed or not (Boolean)
  * * tag_class: Current tag class (Symbol)
- * * tag: The current tag (Number)
+ * * tag: The current tag number (Integer)
  *
  * == Example
  *   der = File.binread('asn1data.der')
@@ -1004,7 +953,7 @@ static VALUE
 ossl_asn1_traverse(VALUE self, VALUE obj)
 {
     unsigned char *p;
-    volatile VALUE tmp;
+    VALUE tmp;
     long len, read = 0, offset = 0;
 
     obj = ossl_to_der_if_possible(obj);
@@ -1012,6 +961,7 @@ 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;
 }
@@ -1020,9 +970,9 @@ ossl_asn1_traverse(VALUE self, VALUE obj)
  * call-seq:
  *    OpenSSL::ASN1.decode(der) -> ASN1Data
  *
- * Decodes a BER- or DER-encoded value and creates an ASN1Data instance. +der+
- * may be a +String+ or any object that features a +#to_der+ method transforming
- * it into a BER-/DER-encoded +String+.
+ * Decodes a BER- or DER-encoded value and creates an ASN1Data instance. _der_
+ * may be a String or any object that features a +.to_der+ method transforming
+ * it into a BER-/DER-encoded String+
  *
  * == Example
  *   der = File.binread('asn1data')
@@ -1033,7 +983,7 @@ ossl_asn1_decode(VALUE self, VALUE obj)
 {
     VALUE ret;
     unsigned char *p;
-    volatile VALUE tmp;
+    VALUE tmp;
     long len, read = 0, offset = 0;
 
     obj = ossl_to_der_if_possible(obj);
@@ -1041,6 +991,7 @@ 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,9 +1000,9 @@ ossl_asn1_decode(VALUE self, VALUE obj)
  * call-seq:
  *    OpenSSL::ASN1.decode_all(der) -> Array of ASN1Data
  *
- * Similar to +decode+ with the difference that +decode+ expects one
- * distinct value represented in +der+. +decode_all+ on the contrary
- * decodes a sequence of sequential BER/DER values lined up in +der+
+ * Similar to #decode with the difference that #decode expects one
+ * distinct value represented in _der_. #decode_all on the contrary
+ * decodes a sequence of sequential BER/DER values lined up in _der_
  * and returns them as an array.
  *
  * == Example
@@ -1064,7 +1015,7 @@ ossl_asn1_decode_all(VALUE self, VALUE obj)
     VALUE ary, val;
     unsigned char *p;
     long len, tmp_len = 0, read = 0, offset = 0;
-    volatile VALUE tmp;
+    VALUE tmp;
 
     obj = ossl_to_der_if_possible(obj);
     tmp = rb_str_new4(StringValue(obj));
@@ -1079,25 +1030,26 @@ 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;
 }
 
 /*
  * call-seq:
- *    OpenSSL::ASN1::Primitive.new( value [, tag, tagging, tag_class ]) => Primitive
+ *    OpenSSL::ASN1::Primitive.new(value [, tag, tagging, tag_class ]) => Primitive
  *
- * +value+: is mandatory.
+ * _value_: is mandatory.
  *
- * +tag+: optional, may be specified for tagged values. If no +tag+ is
+ * _tag_: optional, may be specified for tagged values. If no _tag_ is
  * specified, the UNIVERSAL tag corresponding to the Primitive sub-class
  * is used by default.
  *
- * +tagging+: may be used as an encoding hint to encode a value either
+ * _tagging_: may be used as an encoding hint to encode a value either
  * explicitly or implicitly, see ASN1 for possible values.
  *
- * +tag_class+: if +tag+ and +tagging+ are +nil+ then this is set to
- * +:UNIVERSAL+ by default. If either +tag+ or +tagging+ are set then
+ * _tag_class_: if _tag_ and _tagging_ are +nil+ then this is set to
+ * +:UNIVERSAL+ by default. If either _tag_ or _tagging_ are set then
  * +:CONTEXT_SPECIFIC+ is used as the default. For possible values please
  * cf. ASN1.
  *
@@ -1110,34 +1062,37 @@ static VALUE
 ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE value, tag, tagging, tag_class;
+    int default_tag;
 
     rb_scan_args(argc, argv, "13", &value, &tag, &tagging, &tag_class);
-    if(argc > 1){
+    default_tag = ossl_asn1_default_tag(self);
+
+    if (default_tag == -1 || argc > 1) {
 	if(NIL_P(tag))
 	    ossl_raise(eASN1Error, "must specify tag number");
 	if(!NIL_P(tagging) && !SYMBOL_P(tagging))
 	    ossl_raise(eASN1Error, "invalid tagging method");
 	if(NIL_P(tag_class)) {
 	    if (NIL_P(tagging))
-		tag_class = ID2SYM(sUNIVERSAL);
+		tag_class = sym_UNIVERSAL;
 	    else
-		tag_class = ID2SYM(sCONTEXT_SPECIFIC);
+		tag_class = sym_CONTEXT_SPECIFIC;
 	}
 	if(!SYMBOL_P(tag_class))
 	    ossl_raise(eASN1Error, "invalid tag class");
-	if(SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31)
-	    ossl_raise(eASN1Error, "tag number for Universal too large");
     }
     else{
-	tag = INT2NUM(ossl_asn1_default_tag(self));
+	tag = INT2NUM(default_tag);
 	tagging = Qnil;
-	tag_class = ID2SYM(sUNIVERSAL);
+	tag_class = sym_UNIVERSAL;
     }
     ossl_asn1_set_tag(self, tag);
     ossl_asn1_set_value(self, value);
     ossl_asn1_set_tagging(self, tagging);
     ossl_asn1_set_tag_class(self, tag_class);
-    ossl_asn1_set_infinite_length(self, Qfalse);
+    ossl_asn1_set_indefinite_length(self, Qfalse);
+    if (default_tag == V_ASN1_BIT_STRING)
+	rb_ivar_set(self, sivUNUSED_BITS, INT2FIX(0));
 
     return self;
 }
@@ -1145,83 +1100,66 @@ ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_asn1eoc_initialize(VALUE self) {
     VALUE tag, tagging, tag_class, value;
-    tag = INT2NUM(ossl_asn1_default_tag(self));
+    tag = INT2FIX(0);
     tagging = Qnil;
-    tag_class = ID2SYM(sUNIVERSAL);
+    tag_class = sym_UNIVERSAL;
     value = rb_str_new("", 0);
     ossl_asn1_set_tag(self, tag);
     ossl_asn1_set_value(self, value);
     ossl_asn1_set_tagging(self, tagging);
     ossl_asn1_set_tag_class(self, tag_class);
-    ossl_asn1_set_infinite_length(self, Qfalse);
+    ossl_asn1_set_indefinite_length(self, Qfalse);
     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)
+static VALUE
+ossl_asn1eoc_to_der(VALUE self)
 {
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
-    if(!a) return;
-    if(a->type == V_ASN1_BOOLEAN){
-        OPENSSL_free(a);
-        return;
-    }
-#endif
-    ASN1_TYPE_free(a);
+    return rb_str_new("\0\0", 2);
 }
 
 /*
  * call-seq:
  *    asn1.to_der => DER-encoded String
  *
- * See ASN1Data#to_der for details. *
+ * See ASN1Data#to_der for details.
  */
 static VALUE
 ossl_asn1prim_to_der(VALUE self)
 {
     ASN1_TYPE *asn1;
-    int tn, tc, explicit;
-    long len, reallen;
-    unsigned char *buf, *p;
+    long alllen, bodylen;
+    unsigned char *p0, *p1;
+    int j, tag, tc, state;
     VALUE str;
 
-    tn = NUM2INT(ossl_asn1_get_tag(self));
-    tc = ossl_asn1_tag_class(self);
-    explicit = ossl_asn1_is_explicit(self);
-    asn1 = ossl_asn1_get_asn1type(self);
+    if (ossl_asn1_default_tag(self) == -1) {
+	str = ossl_asn1_get_value(self);
+	return to_der_internal(self, 0, 0, StringValue(str));
+    }
 
-    len = ossl_asn1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
-    if(!(buf = OPENSSL_malloc(len))){
-	ossl_ASN1_TYPE_free(asn1);
-	ossl_raise(eASN1Error, "cannot alloc buffer");
+    asn1 = ossl_asn1_get_asn1type(self);
+    alllen = i2d_ASN1_TYPE(asn1, NULL);
+    if (alllen < 0) {
+	ASN1_TYPE_free(asn1);
+	ossl_raise(eASN1Error, "i2d_ASN1_TYPE");
     }
-    p = buf;
-    if (tc == V_ASN1_UNIVERSAL) {
-        ossl_i2d_ASN1_TYPE(asn1, &p);
-    } else if (explicit) {
-        ossl_asn1_put_object(&p, 1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn, tc);
-        ossl_i2d_ASN1_TYPE(asn1, &p);
-    } else {
-        ossl_i2d_ASN1_TYPE(asn1, &p);
-        *buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
+    str = ossl_str_new(NULL, alllen, &state);
+    if (state) {
+	ASN1_TYPE_free(asn1);
+	rb_jump_tag(state);
     }
-    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 */
+    p0 = p1 = (unsigned char *)RSTRING_PTR(str);
+    i2d_ASN1_TYPE(asn1, &p0);
+    ASN1_TYPE_free(asn1);
+    assert(p0 - p1 == alllen);
 
-    return str;
+    /* Strip header since to_der_internal() wants only the payload */
+    j = ASN1_get_object((const unsigned char **)&p1, &bodylen, &tag, &tc, alllen);
+    if (j & 0x80)
+	ossl_raise(eASN1Error, "ASN1_get_object"); /* should not happen */
+
+    return to_der_internal(self, 0, 0, rb_str_drop_bytes(str, alllen - bodylen));
 }
 
 /*
@@ -1233,92 +1171,41 @@ ossl_asn1prim_to_der(VALUE self)
 static VALUE
 ossl_asn1cons_to_der(VALUE self)
 {
-    int tag, tn, tc, explicit, constructed = 1;
-    int found_prim = 0, seq_len;
-    long length;
-    unsigned char *p;
-    VALUE value, str, inf_length;
-
-    tn = NUM2INT(ossl_asn1_get_tag(self));
-    tc = ossl_asn1_tag_class(self);
-    inf_length = ossl_asn1_get_infinite_length(self);
-    if (inf_length == Qtrue) {
-	VALUE ary, example;
-	constructed = 2;
-	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 */
-	    ary = ossl_asn1_get_value(self);
-	    if (!rb_obj_is_kind_of(ary, rb_cArray))
-		ossl_raise(eASN1Error, "Constructive value must be an Array");
-	    /* Recursively descend until a primitive value is found.
-	    The overall value of the entire constructed encoding
-	    is of the type of the first primitive encoding to be
-	    found. */
-	    while (!found_prim){
-		example = rb_ary_entry(ary, 0);
-		if (rb_obj_is_kind_of(example, cASN1Primitive)){
-		    found_prim = 1;
-		}
-		else {
-		    /* example is another ASN1Constructive */
-		    if (!rb_obj_is_kind_of(example, cASN1Constructive)){
-			ossl_raise(eASN1Error, "invalid constructed encoding");
-			return Qnil; /* dummy */
-		    }
-		    ary = ossl_asn1_get_value(example);
-		}
-	    }
-	    tag = ossl_asn1_default_tag(example);
-	}
-    }
-    else {
-	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 = 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)
-	ossl_asn1_put_object(&p, constructed, RSTRING_LENINT(value), tn, tc);
-    else{
-	if(explicit){
-	    ossl_asn1_put_object(&p, constructed, seq_len, tn, tc);
-	    ossl_asn1_put_object(&p, constructed, RSTRING_LENINT(value), tag, V_ASN1_UNIVERSAL);
-	}
-	else{
-	    ossl_asn1_put_object(&p, constructed, RSTRING_LENINT(value), tn, tc);
+    VALUE ary, str;
+    long i;
+    int indef_len;
+
+    indef_len = RTEST(ossl_asn1_get_indefinite_length(self));
+    ary = rb_convert_type(ossl_asn1_get_value(self), T_ARRAY, "Array", "to_a");
+    str = rb_str_new(NULL, 0);
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	VALUE item = RARRAY_AREF(ary, i);
+
+	if (indef_len && rb_obj_is_kind_of(item, cASN1EndOfContent)) {
+	    if (i != RARRAY_LEN(ary) - 1)
+		ossl_raise(eASN1Error, "illegal EOC octets in value");
+
+	    /*
+	     * EOC is not really part of the content, but we required to add one
+	     * at the end in the past.
+	     */
+	    break;
 	}
-    }
-    memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
-    p += RSTRING_LEN(value);
 
-    /* In this case we need an additional EOC (one for the explicit part and
-     * one for the Constructive itself. The EOC for the Constructive is
-     * supplied by the user, but that for the "explicit wrapper" must be
-     * added here.
-     */
-    if (explicit && inf_length == Qtrue) {
-	ASN1_put_eoc(&p);
+	item = ossl_to_der_if_possible(item);
+	StringValue(item);
+	rb_str_append(str, item);
     }
-    ossl_str_adjust(str, p);
 
-    return str;
+    return to_der_internal(self, 1, indef_len, str);
 }
 
 /*
  * call-seq:
  *    asn1_ary.each { |asn1| block } => asn1_ary
  *
- * Calls <i>block</i> once for each element in +self+, passing that element
- * as parameter +asn1+. If no block is given, an enumerator is returned
+ * Calls the given block once for each element in self, passing that element
+ * as parameter _asn1_. If no block is given, an enumerator is returned
  * instead.
  *
  * == Example
@@ -1329,16 +1216,28 @@ ossl_asn1cons_to_der(VALUE self)
 static VALUE
 ossl_asn1cons_each(VALUE self)
 {
-    rb_ary_each(ossl_asn1_get_value(self));
+    rb_block_call(ossl_asn1_get_value(self), id_each, 0, 0, 0, 0);
+
     return self;
 }
 
+/*
+ * call-seq:
+ *    OpenSSL::ASN1::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.
+ *
+ */
 static VALUE
 ossl_asn1obj_s_register(VALUE self, VALUE oid, VALUE sn, VALUE ln)
 {
-    StringValue(oid);
-    StringValue(sn);
-    StringValue(ln);
+    StringValueCStr(oid);
+    StringValueCStr(sn);
+    StringValueCStr(ln);
 
     if(!OBJ_create(RSTRING_PTR(oid), RSTRING_PTR(sn), RSTRING_PTR(ln)))
 	ossl_raise(eASN1Error, NULL);
@@ -1346,6 +1245,13 @@ ossl_asn1obj_s_register(VALUE self, VALUE oid, VALUE sn, VALUE ln)
     return Qtrue;
 }
 
+/*
+ * call-seq:
+ *    oid.sn -> string
+ *    oid.short_name -> string
+ *
+ * The short name of the ObjectId, as defined in <openssl/objects.h>.
+ */
 static VALUE
 ossl_asn1obj_get_sn(VALUE self)
 {
@@ -1353,12 +1259,19 @@ ossl_asn1obj_get_sn(VALUE self)
     int nid;
 
     val = ossl_asn1_get_value(self);
-    if ((nid = OBJ_txt2nid(StringValuePtr(val))) != NID_undef)
+    if ((nid = OBJ_txt2nid(StringValueCStr(val))) != NID_undef)
 	ret = rb_str_new2(OBJ_nid2sn(nid));
 
     return ret;
 }
 
+/*
+ * call-seq:
+ *    oid.ln -> string
+ *    oid.long_name -> string
+ *
+ * The long name of the ObjectId, as defined in <openssl/objects.h>.
+ */
 static VALUE
 ossl_asn1obj_get_ln(VALUE self)
 {
@@ -1366,25 +1279,54 @@ ossl_asn1obj_get_ln(VALUE self)
     int nid;
 
     val = ossl_asn1_get_value(self);
-    if ((nid = OBJ_txt2nid(StringValuePtr(val))) != NID_undef)
+    if ((nid = OBJ_txt2nid(StringValueCStr(val))) != NID_undef)
 	ret = rb_str_new2(OBJ_nid2ln(nid));
 
     return ret;
 }
 
 static VALUE
+asn1obj_get_oid_i(VALUE vobj)
+{
+    ASN1_OBJECT *a1obj = (void *)vobj;
+    VALUE str;
+    int len;
+
+    str = rb_usascii_str_new(NULL, 127);
+    len = OBJ_obj2txt(RSTRING_PTR(str), RSTRING_LENINT(str), a1obj, 1);
+    if (len <= 0 || len == INT_MAX)
+	ossl_raise(eASN1Error, "OBJ_obj2txt");
+    if (len > RSTRING_LEN(str)) {
+	/* +1 is for the \0 terminator added by OBJ_obj2txt() */
+	rb_str_resize(str, len + 1);
+	len = OBJ_obj2txt(RSTRING_PTR(str), len + 1, a1obj, 1);
+	if (len <= 0)
+	    ossl_raise(eASN1Error, "OBJ_obj2txt");
+    }
+    rb_str_set_len(str, len);
+    return str;
+}
+
+/*
+ * call-seq:
+ *    oid.oid -> string
+ *
+ * Returns a String representing the Object Identifier in the dot notation,
+ * e.g. "1.2.3.4.5"
+ */
+static VALUE
 ossl_asn1obj_get_oid(VALUE self)
 {
-    VALUE val;
+    VALUE str;
     ASN1_OBJECT *a1obj;
-    char buf[128];
+    int state;
 
-    val = ossl_asn1_get_value(self);
-    a1obj = obj_to_asn1obj(val);
-    OBJ_obj2txt(buf, sizeof(buf), a1obj, 1);
+    a1obj = obj_to_asn1obj(ossl_asn1_get_value(self));
+    str = rb_protect(asn1obj_get_oid_i, (VALUE)a1obj, &state);
     ASN1_OBJECT_free(a1obj);
-
-    return rb_str_new2(buf);
+    if (state)
+	rb_jump_tag(state);
+    return str;
 }
 
 #define OSSL_ASN1_IMPL_FACTORY_METHOD(klass) \
@@ -1416,27 +1358,29 @@ OSSL_ASN1_IMPL_FACTORY_METHOD(Set)
 OSSL_ASN1_IMPL_FACTORY_METHOD(EndOfContent)
 
 void
-Init_ossl_asn1()
+Init_ossl_asn1(void)
 {
+#undef rb_intern
     VALUE ary;
     int i;
 
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
-    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");
+    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"));
 
     sivVALUE = rb_intern("@value");
     sivTAG = rb_intern("@tag");
     sivTAGGING = rb_intern("@tagging");
     sivTAG_CLASS = rb_intern("@tag_class");
-    sivINFINITE_LENGTH = rb_intern("@infinite_length");
+    sivINDEFINITE_LENGTH = rb_intern("@indefinite_length");
     sivUNUSED_BITS = rb_intern("@unused_bits");
 
     /*
@@ -1462,24 +1406,21 @@ Init_ossl_asn1()
      * == ASN.1 class hierarchy
      *
      * The base class representing ASN.1 structures is ASN1Data. ASN1Data offers
-     * attributes to read and set the +tag+, the +tag_class+ and finally the
-     * +value+ of a particular ASN.1 item. Upon parsing, any tagged values
+     * attributes to read and set the _tag_, the _tag_class_ and finally the
+     * _value_ of a particular ASN.1 item. Upon parsing, any tagged values
      * (implicit or explicit) will be represented by ASN1Data instances because
      * their "real type" can only be determined using out-of-band information
      * from the ASN.1 type declaration. Since this information is normally
      * known when encoding a type, all sub-classes of ASN1Data offer an
-     * additional attribute +tagging+ that allows to encode a value implicitly
+     * additional attribute _tagging_ that allows to encode a value implicitly
      * (+:IMPLICIT+) or explicitly (+:EXPLICIT+).
      *
      * === Constructive
      *
      * Constructive is, as its name implies, the base class for all
      * constructed encodings, i.e. those that consist of several values,
-     * opposed to "primitive" encodings with just one single value.
-     * Primitive values that are encoded with "infinite length" are typically
-     * constructed (their values come in multiple chunks) and are therefore
-     * represented by instances of Constructive. The value of an Constructive
-     * is always an Array.
+     * opposed to "primitive" encodings with just one single value. The value of
+     * an Constructive is always an Array.
      *
      * ==== ASN1::Set and ASN1::Sequence
      *
@@ -1496,18 +1437,18 @@ Init_ossl_asn1()
      * Please cf. Primitive documentation for details on sub-classes and
      * their respective mappings of ASN.1 data types to Ruby objects.
      *
-     * == Possible values for +tagging+
+     * == Possible values for _tagging_
      *
      * When constructing an ASN1Data object the ASN.1 type definition may
      * require certain elements to be either implicitly or explicitly tagged.
-     * This can be achieved by setting the +tagging+ attribute manually for
+     * This can be achieved by setting the _tagging_ attribute manually for
      * sub-classes of ASN1Data. Use the symbol +:IMPLICIT+ for implicit
      * tagging and +:EXPLICIT+ if the element requires explicit tagging.
      *
-     * == Possible values for +tag_class+
+     * == Possible values for _tag_class_
      *
      * It is possible to create arbitrary ASN1Data objects that also support
-     * a PRIVATE or APPLICATION tag class. Possible values for the +tag_class+
+     * a PRIVATE or APPLICATION tag class. Possible values for the _tag_class_
      * attribute are:
      * * +:UNIVERSAL+ (the default for untagged values)
      * * +:CONTEXT_SPECIFIC+ (the default for tagged values)
@@ -1609,9 +1550,9 @@ Init_ossl_asn1()
      *
      * An implicitly 1-tagged INTEGER value will be parsed as an
      * ASN1Data with
-     * * +tag+ equal to 1
-     * * +tag_class+ equal to +:CONTEXT_SPECIFIC+
-     * * +value+ equal to a +String+ that carries the raw encoding
+     * * _tag_ equal to 1
+     * * _tag_class_ equal to +:CONTEXT_SPECIFIC+
+     * * _value_ equal to a String that carries the raw encoding
      *   of the INTEGER.
      * This implies that a subsequent decoding step is required to
      * completely decode implicitly tagged values.
@@ -1620,9 +1561,9 @@ Init_ossl_asn1()
      *
      * An explicitly 1-tagged INTEGER value will be parsed as an
      * ASN1Data with
-     * * +tag+ equal to 1
-     * * +tag_class+ equal to +:CONTEXT_SPECIFIC+
-     * * +value+ equal to an +Array+ with one single element, an
+     * * _tag_ equal to 1
+     * * _tag_class_ equal to +:CONTEXT_SPECIFIC+
+     * * _value_ equal to an Array with one single element, an
      *   instance of OpenSSL::ASN1::Integer, i.e. the inner element
      *   is the non-tagged primitive value, and the tagging is represented
      *   in the outer ASN1Data
@@ -1633,13 +1574,13 @@ Init_ossl_asn1()
      *   der = seq.to_der
      *   asn1 = OpenSSL::ASN1.decode(der)
      *   # pp asn1 => #<OpenSSL::ASN1::Sequence:0x87326e0
-     *   #              @infinite_length=false,
+     *   #              @indefinite_length=false,
      *   #              @tag=16,
      *   #              @tag_class=:UNIVERSAL,
      *   #              @tagging=nil,
      *   #              @value=
      *   #                [#<OpenSSL::ASN1::ASN1Data:0x87326f4
-     *   #                   @infinite_length=false,
+     *   #                   @indefinite_length=false,
      *   #                   @tag=0,
      *   #                   @tag_class=:CONTEXT_SPECIFIC,
      *   #                   @value="\x01">]>
@@ -1656,18 +1597,18 @@ Init_ossl_asn1()
      *   der = seq.to_der
      *   asn1 = OpenSSL::ASN1.decode(der)
      *   # pp asn1 => #<OpenSSL::ASN1::Sequence:0x87326e0
-     *   #              @infinite_length=false,
+     *   #              @indefinite_length=false,
      *   #              @tag=16,
      *   #              @tag_class=:UNIVERSAL,
      *   #              @tagging=nil,
      *   #              @value=
      *   #                [#<OpenSSL::ASN1::ASN1Data:0x87326f4
-     *   #                   @infinite_length=false,
+     *   #                   @indefinite_length=false,
      *   #                   @tag=0,
      *   #                   @tag_class=:CONTEXT_SPECIFIC,
      *   #                   @value=
      *   #                     [#<OpenSSL::ASN1::Integer:0x85bf308
-     *   #                        @infinite_length=false,
+     *   #                        @indefinite_length=false,
      *   #                        @tag=2,
      *   #                        @tag_class=:UNIVERSAL
      *   #                        @tagging=nil,
@@ -1683,86 +1624,92 @@ Init_ossl_asn1()
      */
     rb_attr(cASN1Data, rb_intern("value"), 1, 1, 0);
     /*
-     * A +Number+ representing the tag number of this ASN1Data. Never +nil+.
+     * An Integer representing the tag number of this ASN1Data. Never +nil+.
      */
     rb_attr(cASN1Data, rb_intern("tag"), 1, 1, 0);
     /*
-     * A +Symbol+ representing the tag class of this ASN1Data. Never +nil+.
+     * A Symbol representing the tag class of this ASN1Data. Never +nil+.
      * See ASN1Data for possible values.
      */
     rb_attr(cASN1Data, rb_intern("tag_class"), 1, 1, 0);
     /*
-     * Never +nil+. A +Boolean+ indicating whether the encoding was infinite
-     * length (in the case of parsing) or whether an infinite length encoding
-     * shall be used (in the encoding case).
-     * In DER, every value has a finite length associated with it. But in
-     * scenarios where large amounts of data need to be transferred it
-     * might be desirable to have some kind of streaming support available.
+     * Never +nil+. A boolean value indicating whether the encoding uses
+     * indefinite length (in the case of parsing) or whether an indefinite
+     * length form shall be used (in the encoding case).
+     * In DER, every value uses definite length form. But in scenarios where
+     * large amounts of data need to be transferred it might be desirable to
+     * have some kind of streaming support available.
      * For example, huge OCTET STRINGs are preferably sent in smaller-sized
      * chunks, each at a time.
      * This is possible in BER by setting the length bytes of an encoding
      * to zero and by this indicating that the following value will be
-     * sent in chunks. Infinite length encodings are always constructed.
+     * sent in chunks. Indefinite length encodings are always constructed.
      * The end of such a stream of chunks is indicated by sending a EOC
-     * (End of Content) tag. SETs and SEQUENCEs may use an infinite length
+     * (End of Content) tag. SETs and SEQUENCEs may use an indefinite length
      * encoding, but also primitive types such as e.g. OCTET STRINGS or
      * BIT STRINGS may leverage this functionality (cf. ITU-T X.690).
      */
-    rb_attr(cASN1Data, rb_intern("infinite_length"), 1, 1, 0);
+    rb_attr(cASN1Data, rb_intern("indefinite_length"), 1, 1, 0);
+    rb_define_alias(cASN1Data, "infinite_length", "indefinite_length");
+    rb_define_alias(cASN1Data, "infinite_length=", "indefinite_length=");
     rb_define_method(cASN1Data, "initialize", ossl_asn1data_initialize, 3);
     rb_define_method(cASN1Data, "to_der", ossl_asn1data_to_der, 0);
 
     /* Document-class: OpenSSL::ASN1::Primitive
      *
      * The parent class for all primitive encodings. Attributes are the same as
-     * for ASN1Data, with the addition of +tagging+.
-     * Primitive values can never be infinite length encodings, thus it is not
-     * possible to set the +infinite_length+ attribute for Primitive and its
-     * sub-classes.
+     * for ASN1Data, with the addition of _tagging_.
+     * Primitive values can never be encoded with indefinite length form, thus
+     * it is not possible to set the _indefinite_length_ attribute for Primitive
+     * and its sub-classes.
      *
      * == Primitive sub-classes and their mapping to Ruby classes
-     * * OpenSSL::ASN1::EndOfContent    <=> +value+ is always +nil+
-     * * OpenSSL::ASN1::Boolean         <=> +value+ is a +Boolean+
-     * * OpenSSL::ASN1::Integer         <=> +value+ is a +Number+
-     * * OpenSSL::ASN1::BitString       <=> +value+ is a +String+
-     * * OpenSSL::ASN1::OctetString     <=> +value+ is a +String+
-     * * OpenSSL::ASN1::Null            <=> +value+ is always +nil+
-     * * OpenSSL::ASN1::Object          <=> +value+ is a +String+
-     * * OpenSSL::ASN1::Enumerated      <=> +value+ is a +Number+
-     * * OpenSSL::ASN1::UTF8String      <=> +value+ is a +String+
-     * * OpenSSL::ASN1::NumericString   <=> +value+ is a +String+
-     * * OpenSSL::ASN1::PrintableString <=> +value+ is a +String+
-     * * OpenSSL::ASN1::T61String       <=> +value+ is a +String+
-     * * OpenSSL::ASN1::VideotexString  <=> +value+ is a +String+
-     * * OpenSSL::ASN1::IA5String       <=> +value+ is a +String+
-     * * OpenSSL::ASN1::UTCTime         <=> +value+ is a +Time+
-     * * OpenSSL::ASN1::GeneralizedTime <=> +value+ is a +Time+
-     * * OpenSSL::ASN1::GraphicString   <=> +value+ is a +String+
-     * * OpenSSL::ASN1::ISO64String     <=> +value+ is a +String+
-     * * OpenSSL::ASN1::GeneralString   <=> +value+ is a +String+
-     * * OpenSSL::ASN1::UniversalString <=> +value+ is a +String+
-     * * OpenSSL::ASN1::BMPString       <=> +value+ is a +String+
+     * * OpenSSL::ASN1::EndOfContent    <=> _value_ is always +nil+
+     * * OpenSSL::ASN1::Boolean         <=> _value_ is +true+ or +false+
+     * * OpenSSL::ASN1::Integer         <=> _value_ is an OpenSSL::BN
+     * * OpenSSL::ASN1::BitString       <=> _value_ is a String
+     * * OpenSSL::ASN1::OctetString     <=> _value_ is a String
+     * * OpenSSL::ASN1::Null            <=> _value_ is always +nil+
+     * * OpenSSL::ASN1::Object          <=> _value_ is a String
+     * * OpenSSL::ASN1::Enumerated      <=> _value_ is an OpenSSL::BN
+     * * OpenSSL::ASN1::UTF8String      <=> _value_ is a String
+     * * OpenSSL::ASN1::NumericString   <=> _value_ is a String
+     * * OpenSSL::ASN1::PrintableString <=> _value_ is a String
+     * * OpenSSL::ASN1::T61String       <=> _value_ is a String
+     * * OpenSSL::ASN1::VideotexString  <=> _value_ is a String
+     * * OpenSSL::ASN1::IA5String       <=> _value_ is a String
+     * * OpenSSL::ASN1::UTCTime         <=> _value_ is a Time
+     * * OpenSSL::ASN1::GeneralizedTime <=> _value_ is a Time
+     * * OpenSSL::ASN1::GraphicString   <=> _value_ is a String
+     * * OpenSSL::ASN1::ISO64String     <=> _value_ is a String
+     * * OpenSSL::ASN1::GeneralString   <=> _value_ is a String
+     * * OpenSSL::ASN1::UniversalString <=> _value_ is a String
+     * * OpenSSL::ASN1::BMPString       <=> _value_ is a String
      *
      * == OpenSSL::ASN1::BitString
      *
      * === Additional attributes
-     * +unused_bits+: if the underlying BIT STRING's
-     * length is a multiple of 8 then +unused_bits+ is 0. Otherwise
-     * +unused_bits+ indicates the number of bits that are to be ignored in
-     * the final octet of the +BitString+'s +value+.
+     * _unused_bits_: if the underlying BIT STRING's
+     * length is a multiple of 8 then _unused_bits_ is 0. Otherwise
+     * _unused_bits_ indicates the number of bits that are to be ignored in
+     * the final octet of the BitString's _value_.
      *
      * == 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
+     * parsed ASN1 encodings.
+     *
      * === Additional attributes
-     * * +sn+: the short name as defined in <openssl/objects.h>.
-     * * +ln+: the long name as defined in <openssl/objects.h>.
-     * * +oid+: the object identifier as a +String+, e.g. "1.2.3.4.5"
-     * * +short_name+: alias for +sn+.
-     * * +long_name+: alias for +ln+.
+     * * _sn_: the short name as defined in <openssl/objects.h>.
+     * * _ln_: the long name as defined in <openssl/objects.h>.
+     * * _oid_: the object identifier as a String, e.g. "1.2.3.4.5"
+     * * _short_name_: alias for _sn_.
+     * * _long_name_: alias for _ln_.
      *
      * == Examples
      * With the Exception of OpenSSL::ASN1::EndOfContent, each Primitive class
-     * constructor takes at least one parameter, the +value+.
+     * constructor takes at least one parameter, the _value_.
      *
      * === Creating EndOfContent
      *   eoc = OpenSSL::ASN1::EndOfContent.new
@@ -1776,19 +1723,20 @@ Init_ossl_asn1()
     /*
      * May be used as a hint for encoding a value either implicitly or
      * explicitly by setting it either to +:IMPLICIT+ or to +:EXPLICIT+.
-     * +tagging+ is not set when a ASN.1 structure is parsed using
+     * _tagging_ is not set when a ASN.1 structure is parsed using
      * OpenSSL::ASN1.decode.
      */
     rb_attr(cASN1Primitive, rb_intern("tagging"), 1, 1, Qtrue);
+    rb_undef_method(cASN1Primitive, "indefinite_length=");
     rb_undef_method(cASN1Primitive, "infinite_length=");
     rb_define_method(cASN1Primitive, "initialize", ossl_asn1_initialize, -1);
     rb_define_method(cASN1Primitive, "to_der", ossl_asn1prim_to_der, 0);
 
     /* Document-class: OpenSSL::ASN1::Constructive
      *
-     * The parent class for all constructed encodings. The +value+ attribute
-     * of a Constructive is always an +Array+. Attributes are the same as
-     * for ASN1Data, with the addition of +tagging+.
+     * The parent class for all constructed encodings. The _value_ attribute
+     * of a Constructive is always an Array. Attributes are the same as
+     * for ASN1Data, with the addition of _tagging_.
      *
      * == SET and SEQUENCE
      *
@@ -1810,48 +1758,13 @@ Init_ossl_asn1()
      *   int = OpenSSL::ASN1::Integer.new(1)
      *   str = OpenSSL::ASN1::PrintableString.new('abc')
      *   set = OpenSSL::ASN1::Set.new( [ int, str ] )
-     *
-     * == Infinite length primitive values
-     *
-     * The only case where Constructive is used directly is for infinite
-     * length encodings of primitive values. These encodings are always
-     * constructed, with the contents of the +value+ +Array+ being either
-     * UNIVERSAL non-infinite length partial encodings of the actual value
-     * or again constructive encodings with infinite length (i.e. infinite
-     * length primitive encodings may be constructed recursively with another
-     * infinite length value within an already infinite length value). Each
-     * partial encoding must be of the same UNIVERSAL type as the overall
-     * encoding. The value of the overall encoding consists of the
-     * concatenation of each partial encoding taken in sequence. The +value+
-     * array of the outer infinite length value must end with a
-     * OpenSSL::ASN1::EndOfContent instance.
-     *
-     * Please note that it is not possible to encode Constructive without
-     * the +infinite_length+ attribute being set to +true+, use
-     * OpenSSL::ASN1::Sequence or OpenSSL::ASN1::Set in these cases instead.
-     *
-     * === Example - Infinite length OCTET STRING
-     *   partial1 = OpenSSL::ASN1::OctetString.new("\x01")
-     *   partial2 = OpenSSL::ASN1::OctetString.new("\x02")
-     *   inf_octets = OpenSSL::ASN1::Constructive.new( [ partial1,
-     *                                                   partial2,
-     *                                                   OpenSSL::ASN1::EndOfContent.new ],
-     *                                                 OpenSSL::ASN1::OCTET_STRING,
-     *                                                 nil,
-     *                                                 :UNIVERSAL )
-     *   # The real value of inf_octets is "\x01\x02", i.e. the concatenation
-     *   # of partial1 and partial2
-     *   inf_octets.infinite_length = true
-     *   der = inf_octets.to_der
-     *   asn1 = OpenSSL::ASN1.decode(der)
-     *   puts asn1.infinite_length # => true
      */
     cASN1Constructive = rb_define_class_under(mASN1,"Constructive", cASN1Data);
     rb_include_module(cASN1Constructive, rb_mEnumerable);
     /*
      * May be used as a hint for encoding a value either implicitly or
      * explicitly by setting it either to +:IMPLICIT+ or to +:EXPLICIT+.
-     * +tagging+ is not set when a ASN.1 structure is parsed using
+     * _tagging_ is not set when a ASN.1 structure is parsed using
      * OpenSSL::ASN1.decode.
      */
     rb_attr(cASN1Constructive, rb_intern("tagging"), 1, 1, Qtrue);
@@ -1891,6 +1804,14 @@ do{\
 
     OSSL_ASN1_DEFINE_CLASS(EndOfContent, Data);
 
+
+    /* Document-class: OpenSSL::ASN1::ObjectId
+     *
+     * Represents the primitive object id for OpenSSL::ASN1
+     */
+#if 0
+    cASN1ObjectId = rb_define_class_under(mASN1, "ObjectId", cASN1Primitive);  /* let rdoc know */
+#endif
     rb_define_singleton_method(cASN1ObjectId, "register", ossl_asn1obj_s_register, 3);
     rb_define_method(cASN1ObjectId, "sn", ossl_asn1obj_get_sn, 0);
     rb_define_method(cASN1ObjectId, "ln", ossl_asn1obj_get_ln, 0);
@@ -1900,8 +1821,10 @@ do{\
     rb_attr(cASN1BitString, rb_intern("unused_bits"), 1, 1, 0);
 
     rb_define_method(cASN1EndOfContent, "initialize", ossl_asn1eoc_initialize, 0);
+    rb_define_method(cASN1EndOfContent, "to_der", ossl_asn1eoc_to_der, 0);
 
     class_tag_map = rb_hash_new();
+    rb_gc_register_mark_object(class_tag_map);
     rb_hash_aset(class_tag_map, cASN1EndOfContent, INT2NUM(V_ASN1_EOC));
     rb_hash_aset(class_tag_map, cASN1Boolean, INT2NUM(V_ASN1_BOOLEAN));
     rb_hash_aset(class_tag_map, cASN1Integer, INT2NUM(V_ASN1_INTEGER));
@@ -1922,8 +1845,9 @@ do{\
     rb_hash_aset(class_tag_map, cASN1GeneralizedTime, INT2NUM(V_ASN1_GENERALIZEDTIME));
     rb_hash_aset(class_tag_map, cASN1GraphicString, INT2NUM(V_ASN1_GRAPHICSTRING));
     rb_hash_aset(class_tag_map, cASN1ISO64String, INT2NUM(V_ASN1_ISO64STRING));
-    rb_hash_aset(class_tag_map, cASN1GeneralString, INT2NUM(INT2NUM(V_ASN1_GENERALSTRING)));
+    rb_hash_aset(class_tag_map, cASN1GeneralString, INT2NUM(V_ASN1_GENERALSTRING));
     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 718f43f068..939a96ce74 100644
--- a/ext/openssl/ossl_asn1.h
+++ b/ext/openssl/ossl_asn1.h
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' team members
  * Copyright (C) 2003
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_ASN1_H_)
@@ -14,18 +13,22 @@
 /*
  * ASN1_DATE conversions
  */
-VALUE asn1time_to_time(ASN1_TIME *);
-time_t time_to_time_t(VALUE);
+VALUE asn1time_to_time(const ASN1_TIME *);
+/* 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 *);
 
 /*
  * ASN1_STRING conversions
  */
-VALUE asn1str_to_str(ASN1_STRING *);
+VALUE asn1str_to_str(const ASN1_STRING *);
 
 /*
  * ASN1_INTEGER conversions
  */
-VALUE asn1integer_to_num(ASN1_INTEGER *);
+VALUE asn1integer_to_num(const 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 ed7c0a71a5..42833d901a 100644
--- a/ext/openssl/ossl_bio.c
+++ b/ext/openssl/ossl_bio.c
@@ -1,87 +1,42 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' team members
  * Copyright (C) 2003
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed 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)
+ossl_obj2bio(volatile VALUE *pobj)
 {
+    VALUE obj = *pobj;
     BIO *bio;
 
-    if (TYPE(obj) == T_FILE) {
-	rb_io_t *fptr;
-	FILE *fp;
-	int fd;
-
-	GetOpenFile(obj, fptr);
-	rb_io_check_readable(fptr);
-	if ((fd = dup(FPTR_TO_FD(fptr))) < 0){
-	    rb_sys_fail(0);
-	}
-        rb_update_max_fd(fd);
-	if (!(fp = fdopen(fd, "r"))){
-	    close(fd);
-	    rb_sys_fail(0);
-	}
-	if (!(bio = BIO_new_fp(fp, BIO_CLOSE))){
-	    fclose(fp);
-	    ossl_raise(eOSSLError, NULL);
-	}
-    }
-    else {
-	StringValue(obj);
-	bio = BIO_new_mem_buf(RSTRING_PTR(obj), RSTRING_LENINT(obj));
-	if (!bio) ossl_raise(eOSSLError, NULL);
-    }
-
+    if (RB_TYPE_P(obj, T_FILE))
+	obj = rb_funcallv(obj, rb_intern("read"), 0, NULL);
+    StringValue(obj);
+    bio = BIO_new_mem_buf(RSTRING_PTR(obj), RSTRING_LENINT(obj));
+    if (!bio)
+	ossl_raise(eOSSLError, "BIO_new_mem_buf");
+    *pobj = obj;
     return bio;
 }
 
-BIO *
-ossl_protect_obj2bio(VALUE obj, int *status)
-{
-     BIO *ret = NULL;
-     ret = (BIO*)rb_protect((VALUE(*)_((VALUE)))ossl_obj2bio, obj, status);
-     return ret;
-}
-
 VALUE
-ossl_membio2str0(BIO *bio)
+ossl_membio2str(BIO *bio)
 {
     VALUE ret;
+    int state;
     BUF_MEM *buf;
 
     BIO_get_mem_ptr(bio, &buf);
-    ret = rb_str_new(buf->data, buf->length);
-
-    return ret;
-}
-
-VALUE
-ossl_protect_membio2str(BIO *bio, int *status)
-{
-    return rb_protect((VALUE(*)_((VALUE)))ossl_membio2str0, (VALUE)bio, status);
-}
-
-VALUE
-ossl_membio2str(BIO *bio)
-{
-    VALUE ret;
-    int status = 0;
-
-    ret = ossl_protect_membio2str(bio, &status);
+    ret = ossl_str_new(buf->data, buf->length, &state);
     BIO_free(bio);
-    if(status) rb_jump_tag(status);
+    if (state)
+	rb_jump_tag(state);
 
     return ret;
 }
diff --git a/ext/openssl/ossl_bio.h b/ext/openssl/ossl_bio.h
index 2d8f675c5b..da68c5e5a2 100644
--- a/ext/openssl/ossl_bio.h
+++ b/ext/openssl/ossl_bio.h
@@ -1,21 +1,16 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' team members
  * Copyright (C) 2003
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_BIO_H_)
 #define _OSSL_BIO_H_
 
-BIO *ossl_obj2bio(VALUE);
-BIO *ossl_protect_obj2bio(VALUE,int*);
-VALUE ossl_membio2str0(BIO*);
+BIO *ossl_obj2bio(volatile VALUE *);
 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 5d690af52d..6f0064e966 100644
--- a/ext/openssl/ossl_bn.c
+++ b/ext/openssl/ossl_bn.c
@@ -1,39 +1,54 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Technorama team <oss-ruby@technorama.net>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 /* modified by Michal Rokos <m.rokos@sh.cvut.cz> */
 #include "ossl.h"
 
-#define WrapBN(klass, obj, bn) do { \
+#define NewBN(klass) \
+  TypedData_Wrap_Struct((klass), &ossl_bn_type, 0)
+#define SetBN(obj, bn) do { \
   if (!(bn)) { \
     ossl_raise(rb_eRuntimeError, "BN wasn't initialized!"); \
   } \
-  (obj) = Data_Wrap_Struct((klass), 0, BN_clear_free, (bn)); \
+  RTYPEDDATA_DATA(obj) = (bn); \
 } while (0)
 
 #define GetBN(obj, bn) do { \
-  Data_Get_Struct((obj), BIGNUM, (bn)); \
+  TypedData_Get_Struct((obj), BIGNUM, &ossl_bn_type, (bn)); \
   if (!(bn)) { \
     ossl_raise(rb_eRuntimeError, "BN wasn't initialized!"); \
   } \
 } while (0)
 
-#define SafeGetBN(obj, bn) do { \
-  OSSL_Check_Kind((obj), cBN); \
-  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;
 
 /*
@@ -45,36 +60,90 @@ 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);
     }
-    WrapBN(cBN, obj, newbn);
+    SetBN(obj, newbn);
 
     return obj;
 }
 
-BIGNUM *
-GetBNPtr(VALUE obj)
+static BIGNUM *
+integer_to_bnptr(VALUE obj, BIGNUM *orig)
 {
-    BIGNUM *bn = NULL;
+    BIGNUM *bn;
 
-    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);
+    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;
 	}
-	WrapBN(cBN, obj, bn); /* Handle potencial mem leaks */
-	break;
-    case T_NIL:
-	break;
-    default:
-	ossl_raise(rb_eTypeError, "Cannot convert into OpenSSL::BN");
+
+	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 potential mem leaks */
+	bn = integer_to_bnptr(obj, NULL);
+	SetBN(newobj, bn);
     }
+
+    return newobj;
+}
+
+BIGNUM *
+ossl_bn_value_ptr(volatile VALUE *ptr)
+{
+    VALUE tmp;
+    BIGNUM *bn;
+
+    tmp = try_convert_to_bn(*ptr);
+    if (NIL_P(tmp))
+	ossl_raise(rb_eTypeError, "Cannot convert into OpenSSL::BN");
+    GetBN(tmp, bn);
+    *ptr = tmp;
+
     return bn;
 }
 
@@ -92,22 +161,25 @@ static VALUE
 ossl_bn_alloc(VALUE klass)
 {
     BIGNUM *bn;
-    VALUE obj;
+    VALUE obj = NewBN(klass);
 
     if (!(bn = BN_new())) {
 	ossl_raise(eBNError, NULL);
     }
-    WrapBN(klass, obj, bn);
+    SetBN(obj, bn);
 
     return obj;
 }
 
 /*
  * call-seq:
- *    BN.new => aBN
- *    BN.new(bn) => aBN
- *    BN.new(string) => aBN
- *    BN.new(string, 0 | 2 | 10 | 16) => aBN
+ *    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.
  */
 static VALUE
 ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
@@ -115,15 +187,23 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
     BIGNUM *bn;
     VALUE str, bs;
     int base = 10;
+    char *ptr;
 
     if (rb_scan_args(argc, argv, "11", &str, &bs) == 2) {
 	base = NUM2INT(bs);
     }
-    StringValue(str);
-    GetBN(self, bn);
+
+    if (RB_INTEGER_TYPE_P(str)) {
+	GetBN(self, bn);
+	integer_to_bnptr(str, bn);
+
+	return self;
+    }
+
     if (RTEST(rb_obj_is_kind_of(str, cBN))) {
 	BIGNUM *other;
 
+	GetBN(self, bn);
 	GetBN(str, other); /* Safe - we checked kind_of? above */
 	if (!BN_copy(bn, other)) {
 	    ossl_raise(eBNError, NULL);
@@ -131,24 +211,27 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
     }
 
+    GetBN(self, bn);
     switch (base) {
     case 0:
-	if (!BN_mpi2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LENINT(str), bn)) {
+        ptr = StringValuePtr(str);
+        if (!BN_mpi2bn((unsigned char *)ptr, RSTRING_LENINT(str), bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 2:
-	if (!BN_bin2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LENINT(str), bn)) {
+        ptr = StringValuePtr(str);
+        if (!BN_bin2bn((unsigned char *)ptr, RSTRING_LENINT(str), bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 10:
-	if (!BN_dec2bn(&bn, RSTRING_PTR(str))) {
+	if (!BN_dec2bn(&bn, StringValueCStr(str))) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 16:
-	if (!BN_hex2bn(&bn, RSTRING_PTR(str))) {
+	if (!BN_hex2bn(&bn, StringValueCStr(str))) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
@@ -164,12 +247,12 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
  *    bn.to_s(base) => string
  *
  * === Parameters
- * * +base+ - integer
- * * * Valid values:
- * * * * 0 - MPI
- * * * * 2 - binary
- * * * * 10 - the default
- * * * * 16 - hex
+ * * _base_ - Integer
+ *   Valid values:
+ *   * 0 - MPI
+ *   * 2 - binary
+ *   * 10 - the default
+ *   * 16 - hex
  */
 static VALUE
 ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
@@ -224,10 +307,10 @@ ossl_bn_to_i(VALUE self)
 
     GetBN(self, bn);
 
-    if (!(txt = BN_bn2dec(bn))) {
+    if (!(txt = BN_bn2hex(bn))) {
 	ossl_raise(eBNError, NULL);
     }
-    num = rb_cstr_to_inum(txt, 10, Qtrue);
+    num = rb_cstr_to_inum(txt, 16, Qtrue);
     OPENSSL_free(txt);
 
     return num;
@@ -259,11 +342,6 @@ ossl_bn_coerce(VALUE self, VALUE other)
 }
 
 #define BIGNUM_BOOL1(func)				\
-    /*							\
-     * call-seq:					\
-     *   bn.##func -> true | false			\
-     *							\
-     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self)				\
     {							\
@@ -274,22 +352,51 @@ 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)
 
+/*
+ * call-seq:
+ *   bn.negative? => true | false
+ */
+static VALUE
+ossl_bn_is_negative(VALUE self)
+{
+    BIGNUM *bn;
+
+    GetBN(self, bn);
+    if (BN_is_zero(bn))
+	return Qfalse;
+    return BN_is_negative(bn) ? Qtrue : Qfalse;
+}
+
 #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);			\
 	}						\
@@ -297,23 +404,25 @@ BIGNUM_BOOL1(is_odd)
 	    BN_free(result);				\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
-	WrapBN(CLASS_OF(self), obj, result);		\
+	SetBN(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);			\
 	}						\
@@ -321,24 +430,32 @@ BIGNUM_1c(sqr)
 	    BN_free(result);				\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
-	WrapBN(CLASS_OF(self), obj, result);		\
+	SetBN(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);				\
 	}							\
@@ -346,28 +463,69 @@ BIGNUM_2(sub)
 	    BN_free(result);					\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
-	WrapBN(CLASS_OF(self), obj, result);			\
+	SetBN(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)
 
 /*
  * 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 obj1, obj2;
+    VALUE klass, obj1, obj2;
 
     GetBN(self, bn1);
 
+    klass = rb_obj_class(self);
+    obj1 = NewBN(klass);
+    obj2 = NewBN(klass);
     if (!(r1 = BN_new())) {
 	ossl_raise(eBNError, NULL);
     }
@@ -380,18 +538,13 @@ ossl_bn_div(VALUE self, VALUE other)
 	BN_free(r2);
 	ossl_raise(eBNError, NULL);
     }
-    WrapBN(CLASS_OF(self), obj1, r1);
-    WrapBN(CLASS_OF(self), obj2, r2);
+    SetBN(obj1, r1);
+    SetBN(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)	\
     {								\
@@ -399,6 +552,7 @@ 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);				\
 	}							\
@@ -406,20 +560,39 @@ ossl_bn_div(VALUE self, VALUE other)
 	    BN_free(result);					\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
-	WrapBN(CLASS_OF(self), obj, result);			\
+	SetBN(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)		\
     {							\
@@ -430,13 +603,33 @@ 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)
+
+/*
+ * Document-method: OpenSSL::BN#mask_bit!
+ * call-seq:
+ *   bn.mask_bit!(bit) -> self
+ */
 BIGNUM_BIT(mask_bits)
 
 /*
  * call-seq:
- *    bn.bit_set?(bit) => true | false
+ *   bn.bit_set?(bit) => true | false
+ *
+ * Tests bit _bit_ in _bn_ and returns +true+ if set, +false+ if not set.
  */
 static VALUE
 ossl_bn_is_bit_set(VALUE self, VALUE bit)
@@ -453,11 +646,6 @@ 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)		\
     {							\
@@ -466,6 +654,7 @@ 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);		\
 	}						\
@@ -473,18 +662,25 @@ ossl_bn_is_bit_set(VALUE self, VALUE bit)
 		BN_free(result);			\
 		ossl_raise(eBNError, NULL);		\
 	}						\
-	WrapBN(CLASS_OF(self), obj, result);		\
+	SetBN(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)		\
     {							\
@@ -496,15 +692,22 @@ 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)	\
     {								\
@@ -520,6 +723,7 @@ BIGNUM_SELF_SHIFT(rshift)
 	    top = NUM2INT(fill);				\
 	}							\
 	b = NUM2INT(bits);					\
+	obj = NewBN(klass);					\
 	if (!(result = BN_new())) {				\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
@@ -527,23 +731,28 @@ BIGNUM_SELF_SHIFT(rshift)
 	    BN_free(result);					\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
-	WrapBN(klass, obj, result);				\
+	SetBN(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;						\
+	VALUE obj = NewBN(klass);				\
 	if (!(result = BN_new())) {				\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
@@ -551,21 +760,39 @@ BIGNUM_RAND(pseudo_rand)
 	    BN_free(result);					\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
-	WrapBN(klass, obj, result);				\
+	SetBN(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 set to
+ * +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
- * * +add+ - BN
- * * +rem+ - BN
+ * * _bits_ - integer
+ * * _safe_ - boolean
+ * * _add_ - BN
+ * * _rem_ - BN
  */
 static VALUE
 ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
@@ -585,32 +812,40 @@ 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(result, num, safe, add, rem, NULL, NULL)) {
+    if (!BN_generate_prime_ex(result, num, safe, add, rem, NULL)) {
 	BN_free(result);
 	ossl_raise(eBNError, NULL);
     }
-    WrapBN(klass, obj, result);
+    SetBN(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 INT2FIX(BN_##func(bn));		\
+	return INT2NUM(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
@@ -631,38 +866,151 @@ ossl_bn_copy(VALUE self, VALUE other)
     return self;
 }
 
+/*
+ * call-seq:
+ *   +bn -> aBN
+ */
+static VALUE
+ossl_bn_uplus(VALUE self)
+{
+    return self;
+}
+
+/*
+ * call-seq:
+ *   -bn -> aBN
+ */
+static VALUE
+ossl_bn_uminus(VALUE self)
+{
+    VALUE obj;
+    BIGNUM *bn1, *bn2;
+
+    GetBN(self, bn1);
+    obj = NewBN(cBN);
+    bn2 = BN_dup(bn1);
+    if (!bn2)
+	ossl_raise(eBNError, "BN_dup");
+    SetBN(obj, bn2);
+    BN_set_negative(bn2, !BN_is_negative(bn2));
+
+    return obj;
+}
+
 #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 INT2FIX(BN_##func(bn1, bn2));		\
+	return INT2NUM(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_eql(VALUE self, VALUE other)
+ossl_bn_eq(VALUE self, VALUE other)
 {
-    if (ossl_bn_cmp(self, other) == INT2FIX(0)) {
+    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)) {
 	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>bn</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 tmp, hash;
+    unsigned char *buf;
+    int len;
+
+    GetBN(self, bn);
+    len = BN_num_bytes(bn);
+    buf = ALLOCV(tmp, len);
+    if (BN_bn2bin(bn, buf) != len) {
+	ALLOCV_END(tmp);
+	ossl_raise(eBNError, "BN_bn2bin");
+    }
+
+    hash = ST2FIX(rb_memhash(buf, len));
+    ALLOCV_END(tmp);
+
+    return hash;
+}
+
+/*
  * call-seq:
  *    bn.prime? => true | false
  *    bn.prime?(checks) => true | false
  *
+ * Performs a Miller-Rabin probabilistic primality test with _checks_
+ * iterations. If _checks_ 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
+ * * _checks_ - integer
  */
 static VALUE
 ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
@@ -675,7 +1023,7 @@ ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
 	checks = NUM2INT(vchecks);
     }
     GetBN(self, bn);
-    switch (BN_is_prime(bn, checks, NULL, ossl_bn_ctx, NULL)) {
+    switch (BN_is_prime_ex(bn, checks, ossl_bn_ctx, NULL)) {
     case 1:
 	return Qtrue;
     case 0:
@@ -693,9 +1041,12 @@ 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
+ * * _checks_ - integer
+ * * _trial_div_ - boolean
  */
 static VALUE
 ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
@@ -714,7 +1065,7 @@ ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
     if (vtrivdiv == Qfalse) {
 	do_trial_division = 0;
     }
-    switch (BN_is_prime_fasttest(bn, checks, NULL, ossl_bn_ctx, NULL, do_trial_division)) {
+    switch (BN_is_prime_fasttest_ex(bn, checks, ossl_bn_ctx, do_trial_division, NULL)) {
     case 1:
 	return Qtrue;
     case 0:
@@ -731,10 +1082,11 @@ 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()
+Init_ossl_bn(void)
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
     if (!(ossl_bn_ctx = BN_CTX_new())) {
@@ -748,7 +1100,7 @@ Init_ossl_bn()
     rb_define_alloc_func(cBN, ossl_bn_alloc);
     rb_define_method(cBN, "initialize", ossl_bn_initialize, -1);
 
-    rb_define_copy_func(cBN, ossl_bn_copy);
+    rb_define_method(cBN, "initialize_copy", ossl_bn_copy, 1);
     rb_define_method(cBN, "copy", ossl_bn_copy, 1);
 
     /* swap (=coerce?) */
@@ -757,6 +1109,9 @@ Init_ossl_bn()
     rb_define_method(cBN, "num_bits", ossl_bn_num_bits, 0);
     /* num_bits_word */
 
+    rb_define_method(cBN, "+@", ossl_bn_uplus, 0);
+    rb_define_method(cBN, "-@", ossl_bn_uminus, 0);
+
     rb_define_method(cBN, "+", ossl_bn_add, 1);
     rb_define_method(cBN, "-", ossl_bn_sub, 1);
     rb_define_method(cBN, "*", ossl_bn_mul, 1);
@@ -783,12 +1138,14 @@ Init_ossl_bn()
     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_alias(cBN, "==", "eql?");
-    rb_define_alias(cBN, "===", "eql?");
+    rb_define_method(cBN, "hash", ossl_bn_hash, 0);
+    rb_define_method(cBN, "==", ossl_bn_eq, 1);
+    rb_define_alias(cBN, "===", "==");
     rb_define_method(cBN, "zero?", ossl_bn_is_zero, 0);
     rb_define_method(cBN, "one?", ossl_bn_is_one, 0);
     /* is_word */
     rb_define_method(cBN, "odd?", ossl_bn_is_odd, 0);
+    rb_define_method(cBN, "negative?", ossl_bn_is_negative, 0);
 
     /* zero
      * one
@@ -803,6 +1160,7 @@ Init_ossl_bn()
 
     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);
@@ -844,11 +1202,4 @@ Init_ossl_bn()
 
     /* 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 d6c396227b..a19ba19487 100644
--- a/ext/openssl/ossl_bn.h
+++ b/ext/openssl/ossl_bn.h
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_BN_H_)
@@ -16,10 +15,11 @@ extern VALUE eBNError;
 
 extern BN_CTX *ossl_bn_ctx;
 
+#define GetBNPtr(obj) ossl_bn_value_ptr(&(obj))
+
 VALUE ossl_bn_new(const BIGNUM *);
-BIGNUM *GetBNPtr(VALUE);
+BIGNUM *ossl_bn_value_ptr(volatile 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 7a30641153..0840c84a71 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -1,54 +1,74 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#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 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 GetCipherInit(obj, ctx) do { \
-    Data_Get_Struct((obj), EVP_CIPHER_CTX, (ctx)); \
+    TypedData_Get_Struct((obj), EVP_CIPHER_CTX, &ossl_cipher_type, (ctx)); \
 } while (0)
 #define GetCipher(obj, ctx) do { \
     GetCipherInit((obj), (ctx)); \
     if (!(ctx)) { \
-	ossl_raise(rb_eRuntimeError, "Cipher not inititalized!"); \
+	ossl_raise(rb_eRuntimeError, "Cipher not initialized!"); \
     } \
 } while (0)
-#define SafeGetCipher(obj, ctx) do { \
-    OSSL_Check_Kind((obj), cCipher); \
-    GetCipher((obj), (ctx)); \
-} while (0)
 
 /*
  * Classes
  */
 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
  */
 const EVP_CIPHER *
-GetCipherPtr(VALUE obj)
+ossl_evp_get_cipherbyname(VALUE obj)
 {
-    EVP_CIPHER_CTX *ctx;
+    if (rb_obj_is_kind_of(obj, cCipher)) {
+	EVP_CIPHER_CTX *ctx;
 
-    SafeGetCipher(obj, ctx);
+	GetCipher(obj, ctx);
 
-    return EVP_CIPHER_CTX_cipher(ctx);
+	return EVP_CIPHER_CTX_cipher(ctx);
+    }
+    else {
+	const EVP_CIPHER *cipher;
+
+	StringValueCStr(obj);
+	cipher = EVP_get_cipherbyname(RSTRING_PTR(obj));
+	if (!cipher)
+	    ossl_raise(rb_eArgError,
+		       "unsupported cipher algorithm: %"PRIsVALUE, obj);
+
+	return cipher;
+    }
 }
 
 VALUE
@@ -59,7 +79,6 @@ 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);
 
@@ -70,29 +89,22 @@ ossl_cipher_new(const EVP_CIPHER *cipher)
  * PRIVATE
  */
 static void
-ossl_cipher_free(EVP_CIPHER_CTX *ctx)
+ossl_cipher_free(void *ptr)
 {
-    if (ctx) {
-	EVP_CIPHER_CTX_cleanup(ctx);
-	ruby_xfree(ctx);
-    }
+    EVP_CIPHER_CTX_free(ptr);
 }
 
 static VALUE
 ossl_cipher_alloc(VALUE klass)
 {
-    VALUE obj;
-
-    WrapCipher(obj, klass, 0);
-
-    return obj;
+    return NewCipher(klass);
 }
 
 /*
  *  call-seq:
  *     Cipher.new(string) -> cipher
  *
- *  The string must contain a valid cipher name like "AES-128-CBC" or "3DES".
+ *  The string must be a valid cipher name like "AES-128-CBC" or "3DES".
  *
  *  A list of cipher names is available by calling OpenSSL::Cipher.ciphers.
  */
@@ -102,30 +114,22 @@ 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 = StringValuePtr(str);
+    name = StringValueCStr(str);
     GetCipherInit(self, ctx);
     if (ctx) {
-	ossl_raise(rb_eRuntimeError, "Cipher already inititalized!");
+	ossl_raise(rb_eRuntimeError, "Cipher already initialized!");
     }
     AllocCipher(self, ctx);
-    EVP_CIPHER_CTX_init(ctx);
     if (!(cipher = EVP_get_cipherbyname(name))) {
-	ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%s)", name);
+	ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%"PRIsVALUE")", str);
     }
-    /*
-     * 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)
+    if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) != 1)
 	ossl_raise(eCipherError, NULL);
 
     return self;
 }
+
 static VALUE
 ossl_cipher_copy(VALUE self, VALUE other)
 {
@@ -138,26 +142,23 @@ ossl_cipher_copy(VALUE self, VALUE other)
     if (!ctx1) {
 	AllocCipher(self, ctx1);
     }
-    SafeGetCipher(other, ctx2);
+    GetCipher(other, ctx2);
     if (EVP_CIPHER_CTX_copy(ctx1, ctx2) != 1)
 	ossl_raise(eCipherError, NULL);
 
     return self;
 }
 
-#ifdef HAVE_OBJ_NAME_DO_ALL_SORTED
 static void*
 add_cipher_name_to_ary(const OBJ_NAME *name, VALUE ary)
 {
     rb_ary_push(ary, rb_str_new2(name->name));
     return NULL;
 }
-#endif
 
-#ifdef HAVE_OBJ_NAME_DO_ALL_SORTED
 /*
  *  call-seq:
- *     Cipher.ciphers -> array[string...]
+ *     OpenSSL::Cipher.ciphers -> array[string...]
  *
  *  Returns the names of all available ciphers in an array.
  */
@@ -173,14 +174,14 @@ ossl_s_ciphers(VALUE self)
 
     return ary;
 }
-#else
-#define ossl_s_ciphers rb_f_notimplement
-#endif
 
 /*
  *  call-seq:
  *     cipher.reset -> self
  *
+ *  Fully resets the internal state of the Cipher. By using this, the same
+ *  Cipher instance may be used several times for encryption or decryption tasks.
+ *
  *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, -1).
  */
 static VALUE
@@ -209,9 +210,9 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
 	 * We deprecated the arguments for this method, but we decided
 	 * keeping this behaviour for backward compatibility.
 	 */
-	const char *cname  = rb_class2name(rb_obj_class(self));
-	rb_warn("arguments for %s#encrypt and %s#decrypt were deprecated; "
-                "use %s#pkcs5_keyivgen to derive key and IV",
+	VALUE cname  = rb_class_path(rb_obj_class(self));
+	rb_warn("arguments for %"PRIsVALUE"#encrypt and %"PRIsVALUE"#decrypt were deprecated; "
+                "use %"PRIsVALUE"#pkcs5_keyivgen to derive key and IV",
                 cname, cname, cname);
 	StringValue(pass);
 	GetCipher(self, ctx);
@@ -236,6 +237,9 @@ 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;
 }
 
@@ -243,8 +247,11 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
  *  call-seq:
  *     cipher.encrypt -> self
  *
- *  Make sure to call .encrypt or .decrypt before using any of the following methods:
- *  * [key=, iv=, random_key, random_iv, pkcs5_keyivgen]
+ *  Initializes the Cipher for encryption.
+ *
+ *  Make sure to call Cipher#encrypt or Cipher#decrypt before using any of the
+ *  following methods:
+ *  * [#key=, #iv=, #random_key, #random_iv, #pkcs5_keyivgen]
  *
  *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 1).
  */
@@ -258,8 +265,11 @@ ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self)
  *  call-seq:
  *     cipher.decrypt -> self
  *
- *  Make sure to call .encrypt or .decrypt before using any of the following methods:
- *  * [key=, iv=, random_key, random_iv, pkcs5_keyivgen]
+ *  Initializes the Cipher for decryption.
+ *
+ *  Make sure to call Cipher#encrypt or Cipher#decrypt before using any of the
+ *  following methods:
+ *  * [#key=, #iv=, #random_key, #random_iv, #pkcs5_keyivgen]
  *
  *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 0).
  */
@@ -271,18 +281,20 @@ ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self)
 
 /*
  *  call-seq:
- *     cipher.pkcs5_keyivgen(pass [, salt [, iterations [, digest]]] ) -> nil
+ *     cipher.pkcs5_keyivgen(pass, salt = nil, iterations = 2048, digest = "MD5") -> nil
  *
- *  Generates and sets the key/iv based on a password.
+ *  Generates and sets the key/IV based on a password.
  *
- *  WARNING: This method is only PKCS5 v1.5 compliant when using RC2, RC4-40, or DES
- *  with MD5 or SHA1.  Using anything else (like AES) will generate the key/iv using an
- *  OpenSSL specific method.  Use a PKCS5 v2 key generation method instead.
+ *  *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 a 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 an integer with a default of 2048.
+ *  * _digest_ is a Digest object that defaults to 'MD5'
  *
  *  A minimum of 1000 iterations is recommended.
  *
@@ -305,7 +317,9 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
 	salt = (unsigned char *)RSTRING_PTR(vsalt);
     }
     iter = NIL_P(viter) ? 2048 : NUM2INT(viter);
-    digest = NIL_P(vdigest) ? EVP_md5() : GetDigestPtr(vdigest);
+    if (iter <= 0)
+	rb_raise(rb_eArgError, "iterations must be a positive integer");
+    digest = NIL_P(vdigest) ? EVP_md5() : ossl_evp_get_digestbyname(vdigest);
     GetCipher(self, ctx);
     EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), digest, salt,
 		   (unsigned char *)RSTRING_PTR(vpass), RSTRING_LENINT(vpass), iter, key, iv);
@@ -314,34 +328,71 @@ 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
  *
- *  === Parameters
- *  +data+ is a nonempty string.
- *  +buffer+ is an optional string to store the result.
+ *  Encrypts data in a streaming fashion. Hand consecutive blocks of data
+ *  to the #update method in order to encrypt it. Returns the encrypted
+ *  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.
  */
 static VALUE
 ossl_cipher_update(int argc, VALUE *argv, VALUE self)
 {
     EVP_CIPHER_CTX *ctx;
     unsigned char *in;
-    int in_len, out_len;
+    long 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_LENINT(data)) == 0)
+    if ((in_len = RSTRING_LEN(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);
@@ -350,7 +401,7 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
         rb_str_resize(str, out_len);
     }
 
-    if (!EVP_CipherUpdate(ctx, (unsigned char *)RSTRING_PTR(str), &out_len, in, in_len))
+    if (!ossl_cipher_update_long(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);
@@ -360,11 +411,17 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
 
 /*
  *  call-seq:
- *     cipher.final -> aString
+ *     cipher.final -> string
  *
- *  Returns the remaining data held in the cipher object.  Further calls to update() or final() will return garbage.
+ *  Returns the remaining data held in the cipher object. Further calls to
+ *  Cipher#update or Cipher#final will return garbage. This call should always
+ *  be made as the last call of an encryption or decryption operation, after
+ *  having fed the entire plaintext or ciphertext to the Cipher instance.
  *
- *  See EVP_CipherFinal_ex for further information.
+ *  If an authenticated cipher was used, a CipherError is raised if the tag
+ *  could not be authenticated successfully. Only call this method after
+ *  setting the authentication tag and passing the entire contents of the
+ *  ciphertext into the cipher.
  */
 static VALUE
 ossl_cipher_final(VALUE self)
@@ -387,7 +444,8 @@ ossl_cipher_final(VALUE self)
  *  call-seq:
  *     cipher.name -> string
  *
- *  Returns the name of the cipher which may differ slightly from the original name provided.
+ *  Returns the name of the cipher which may differ slightly from the original
+ *  name provided.
  */
 static VALUE
 ossl_cipher_name(VALUE self)
@@ -403,23 +461,30 @@ ossl_cipher_name(VALUE self)
  *  call-seq:
  *     cipher.key = string -> string
  *
- *  Sets the cipher key.
+ *  Sets the cipher key. To generate a key, you should either use a secure
+ *  random byte string or, if the key is to be derived from a password, you
+ *  should rely on PBKDF2 functionality provided by OpenSSL::PKCS5. To
+ *  generate a secure random-based key, Cipher#random_key may be used.
  *
- *  Only call this method after calling cipher.encrypt or cipher.decrypt.
+ *  Only call this method after calling Cipher#encrypt or Cipher#decrypt.
  */
 static VALUE
 ossl_cipher_set_key(VALUE self, VALUE key)
 {
     EVP_CIPHER_CTX *ctx;
+    int key_len;
 
     StringValue(key);
     GetCipher(self, ctx);
 
-    if (RSTRING_LEN(key) < EVP_CIPHER_CTX_key_length(ctx))
-        ossl_raise(eCipherError, "key length too short");
+    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 (EVP_CipherInit_ex(ctx, NULL, NULL, (unsigned char *)RSTRING_PTR(key), NULL, -1) != 1)
-        ossl_raise(eCipherError, NULL);
+	ossl_raise(eCipherError, NULL);
+
+    rb_ivar_set(self, id_key_set, Qtrue);
 
     return key;
 }
@@ -428,20 +493,29 @@ ossl_cipher_set_key(VALUE self, VALUE key)
  *  call-seq:
  *     cipher.iv = string -> string
  *
- *  Sets the cipher iv.
+ *  Sets the cipher IV. Please note that since you should never be using ECB
+ *  mode, an IV is always explicitly required and should be set prior to
+ *  encryption. The IV itself can be safely transmitted in public, but it
+ *  should be unpredictable to prevent certain kinds of attacks. You may use
+ *  Cipher#random_iv to create a secure random IV.
  *
- *  Only call this method after calling cipher.encrypt or cipher.decrypt.
+ *  Only call this method after calling Cipher#encrypt or Cipher#decrypt.
  */
 static VALUE
 ossl_cipher_set_iv(VALUE self, VALUE iv)
 {
     EVP_CIPHER_CTX *ctx;
+    int iv_len = 0;
 
     StringValue(iv);
     GetCipher(self, ctx);
 
-    if (RSTRING_LEN(iv) < EVP_CIPHER_CTX_iv_length(ctx))
-        ossl_raise(eCipherError, "iv length too short");
+    if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)
+	iv_len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx);
+    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 (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, (unsigned char *)RSTRING_PTR(iv), -1) != 1)
 	ossl_raise(eCipherError, NULL);
@@ -449,13 +523,204 @@ 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);
+
+    return (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     cipher.auth_data = string -> string
+ *
+ *  Sets the cipher's additional authenticated data. This field must be
+ *  set when using AEAD cipher modes such as GCM or CCM. If no associated
+ *  data shall be used, this method must *still* be called with a value of "".
+ *  The contents of this field should be non-sensitive data which will be
+ *  added to the ciphertext to generate the authentication tag which validates
+ *  the contents of the ciphertext.
+ *
+ *  The AAD must be set prior to encryption or decryption. In encryption mode,
+ *  it must be set after calling Cipher#encrypt and setting Cipher#key= and
+ *  Cipher#iv=. When decrypting, the authenticated data must be set after key,
+ *  iv and especially *after* the authentication tag has been set. I.e. set it
+ *  only after calling Cipher#decrypt, Cipher#key=, Cipher#iv= and
+ *  Cipher#auth_tag= first.
+ */
+static VALUE
+ossl_cipher_set_auth_data(VALUE self, VALUE data)
+{
+    EVP_CIPHER_CTX *ctx;
+    unsigned char *in;
+    long in_len, out_len;
+
+    StringValue(data);
+
+    in = (unsigned char *) RSTRING_PTR(data);
+    in_len = RSTRING_LEN(data);
+
+    GetCipher(self, ctx);
+    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
+	ossl_raise(eCipherError, "AEAD not supported by this cipher");
+
+    if (!ossl_cipher_update_long(ctx, NULL, &out_len, in, in_len))
+        ossl_raise(eCipherError, "couldn't set additional authenticated data");
+
+    return data;
+}
+
+/*
+ *  call-seq:
+ *     cipher.auth_tag(tag_len = 16) -> 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.
+ *
+ *  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;
+    EVP_CIPHER_CTX *ctx;
+    int tag_len = 16;
+
+    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))
+	tag_len = NUM2INT(vtag_len);
+
+    GetCipher(self, ctx);
+
+    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
+	ossl_raise(eCipherError, "authentication tag not supported by this cipher");
+
+    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;
+}
+
+/*
+ *  call-seq:
+ *     cipher.auth_tag = string -> string
+ *
+ *  Sets the authentication tag to verify the integrity of the ciphertext.
+ *  This can be called only when the cipher supports AE. The tag must be set
+ *  after calling Cipher#decrypt, Cipher#key= and Cipher#iv=, but before
+ *  calling Cipher#final. 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;
+    unsigned char *tag;
+    int tag_len;
+
+    StringValue(vtag);
+    tag = (unsigned char *) RSTRING_PTR(vtag);
+    tag_len = RSTRING_LENINT(vtag);
+
+    GetCipher(self, ctx);
+    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
+	ossl_raise(eCipherError, "authentication tag not supported by this cipher");
+
+    if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, tag))
+	ossl_raise(eCipherError, "unable to set AEAD tag");
+
+    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_flags(EVP_CIPHER_CTX_cipher(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
+ *
+ * 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.
+ */
+static VALUE
+ossl_cipher_set_iv_length(VALUE self, VALUE iv_length)
+{
+    int len = NUM2INT(iv_length);
+    EVP_CIPHER_CTX *ctx;
+
+    GetCipher(self, ctx);
+    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(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);
+
+    return iv_length;
+}
 
 /*
  *  call-seq:
  *     cipher.key_len = integer -> integer
  *
- *  Sets the key length of the cipher.  If the cipher is a fixed length cipher then attempting to set the key
- *  length to any value other than the fixed value is an error.
+ *  Sets the key length of the cipher.  If the cipher is a fixed length cipher
+ *  then attempting to set the key length to any value other than the fixed
+ *  value is an error.
  *
  *  Under normal circumstances you do not need to call this method (and probably shouldn't).
  *
@@ -474,7 +739,6 @@ 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
@@ -496,42 +760,59 @@ 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)));	\
-    }
-CIPHER_0ARG_INT(key_length)
-CIPHER_0ARG_INT(iv_length)
-CIPHER_0ARG_INT(block_size)
 
-#if 0
 /*
  *  call-seq:
  *     cipher.key_len -> integer
  *
+ *  Returns the key length in bytes of the Cipher.
  */
-static VALUE ossl_cipher_key_length() { }
+static VALUE
+ossl_cipher_key_length(VALUE self)
+{
+    EVP_CIPHER_CTX *ctx;
+
+    GetCipher(self, ctx);
+
+    return INT2NUM(EVP_CIPHER_CTX_key_length(ctx));
+}
+
 /*
  *  call-seq:
  *     cipher.iv_len -> integer
  *
+ *  Returns the expected length in bytes for an IV for this Cipher.
  */
-static VALUE ossl_cipher_iv_length() { }
+static VALUE
+ossl_cipher_iv_length(VALUE self)
+{
+    EVP_CIPHER_CTX *ctx;
+    int len = 0;
+
+    GetCipher(self, ctx);
+    if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)
+	len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx);
+    if (!len)
+	len = EVP_CIPHER_CTX_iv_length(ctx);
+
+    return INT2NUM(len);
+}
+
 /*
  *  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() { }
-#endif
+static VALUE
+ossl_cipher_block_size(VALUE self)
+{
+    EVP_CIPHER_CTX *ctx;
+
+    GetCipher(self, ctx);
+
+    return INT2NUM(EVP_CIPHER_CTX_block_size(ctx));
+}
 
 /*
  * INIT
@@ -540,13 +821,223 @@ void
 Init_ossl_cipher(void)
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
+
+    /* Document-class: OpenSSL::Cipher
+     *
+     * Provides symmetric algorithms for encryption and decryption. The
+     * algorithms that are available depend on the particular version
+     * of OpenSSL that is installed.
+     *
+     * === Listing all supported algorithms
+     *
+     * A list of supported algorithms can be obtained by
+     *
+     *   puts OpenSSL::Cipher.ciphers
+     *
+     * === Instantiating a Cipher
+     *
+     * There are several ways to create a Cipher instance. Generally, a
+     * Cipher algorithm is categorized by its name, the key length in bits
+     * and the cipher mode to be used. The most generic way to create a
+     * Cipher is the following
+     *
+     *   cipher = OpenSSL::Cipher.new('<name>-<key length>-<mode>')
+     *
+     * That is, a string consisting of the hyphenated concatenation of the
+     * individual components name, key length and mode. Either all uppercase
+     * or all lowercase strings may be used, for example:
+     *
+     *  cipher = OpenSSL::Cipher.new('AES-128-CBC')
+     *
+     * For each algorithm supported, there is a class defined under the
+     * Cipher class that goes by the name of the cipher, e.g. to obtain an
+     * instance of AES, you could also use
+     *
+     *   # these are equivalent
+     *   cipher = OpenSSL::Cipher::AES.new(128, :CBC)
+     *   cipher = OpenSSL::Cipher::AES.new(128, 'CBC')
+     *   cipher = OpenSSL::Cipher::AES.new('128-CBC')
+     *
+     * Finally, due to its wide-spread use, there are also extra classes
+     * defined for the different key sizes of AES
+     *
+     *   cipher = OpenSSL::Cipher::AES128.new(:CBC)
+     *   cipher = OpenSSL::Cipher::AES192.new(:CBC)
+     *   cipher = OpenSSL::Cipher::AES256.new(:CBC)
+     *
+     * === Choosing either encryption or decryption mode
+     *
+     * Encryption and decryption are often very similar operations for
+     * symmetric algorithms, this is reflected by not having to choose
+     * different classes for either operation, both can be done using the
+     * same class. Still, after obtaining a Cipher instance, we need to
+     * tell the instance what it is that we intend to do with it, so we
+     * need to call either
+     *
+     *   cipher.encrypt
+     *
+     * or
+     *
+     *   cipher.decrypt
+     *
+     * on the Cipher instance. This should be the first call after creating
+     * the instance, otherwise configuration that has already been set could
+     * get lost in the process.
+     *
+     * === Choosing a key
+     *
+     * Symmetric encryption requires a key that is the same for the encrypting
+     * and for the decrypting party and after initial key establishment should
+     * be kept as private information. There are a lot of ways to create
+     * insecure keys, the most notable is to simply take a password as the key
+     * without processing the password further. A simple and secure way to
+     * create a key for a particular Cipher is
+     *
+     *  cipher = OpenSSL::AES256.new(:CFB)
+     *  cipher.encrypt
+     *  key = cipher.random_key # also sets the generated key on the Cipher
+     *
+     * If you absolutely need to use passwords as encryption keys, you
+     * should use Password-Based Key Derivation Function 2 (PBKDF2) by
+     * generating the key with the help of the functionality provided by
+     * OpenSSL::PKCS5.pbkdf2_hmac_sha1 or OpenSSL::PKCS5.pbkdf2_hmac.
+     *
+     * Although there is Cipher#pkcs5_keyivgen, its use is deprecated and
+     * it should only be used in legacy applications because it does not use
+     * the newer PKCS#5 v2 algorithms.
+     *
+     * === Choosing an IV
+     *
+     * The cipher modes CBC, CFB, OFB and CTR all need an "initialization
+     * vector", or short, IV. ECB mode is the only mode that does not require
+     * an IV, but there is almost no legitimate use case for this mode
+     * because of the fact that it does not sufficiently hide plaintext
+     * patterns. Therefore
+     *
+     * <b>You should never use ECB mode unless you are absolutely sure that
+     * 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
+     *
+     * <b>Always create a secure random IV for every encryption of your
+     * Cipher</b>
+     *
+     * A new, random IV should be created for every encryption of data. Think
+     * 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
+     *
+     * 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
+     *
+     * ECB (which should not be used) and CBC are both block-based modes.
+     * This means that unlike for the other streaming-based modes, they
+     * operate on fixed-size blocks of data, and therefore they require a
+     * "finalization" step to produce or correctly decrypt the last block of
+     * data by appropriately handling some form of padding. Therefore it is
+     * essential to add the output of OpenSSL::Cipher#final to your
+     * encryption/decryption buffer or you will end up with decryption errors
+     * or truncated data.
+     *
+     * Although this is not really necessary for streaming-mode ciphers, it is
+     * still recommended to apply the same pattern of adding the output of
+     * Cipher#final there as well - it also enables you to switch between
+     * modes more easily in the future.
+     *
+     * === Encrypting and decrypting some data
+     *
+     *   data = "Very, very confidential data"
+     *
+     *   cipher = OpenSSL::Cipher::AES.new(128, :CBC)
+     *   cipher.encrypt
+     *   key = cipher.random_key
+     *   iv = cipher.random_iv
+     *
+     *   encrypted = cipher.update(data) + cipher.final
+     *   ...
+     *   decipher = OpenSSL::Cipher::AES.new(128, :CBC)
+     *   decipher.decrypt
+     *   decipher.key = key
+     *   decipher.iv = iv
+     *
+     *   plain = decipher.update(encrypted) + decipher.final
+     *
+     *   puts data == plain #=> true
+     *
+     * === Authenticated Encryption and Associated Data (AEAD)
+     *
+     * If the OpenSSL version used supports it, an Authenticated Encryption
+     * mode (such as GCM or CCM) should always be preferred over any
+     * unauthenticated mode. Currently, OpenSSL supports AE only in combination
+     * with Associated Data (AEAD) where additional associated data is included
+     * in the encryption process to compute a tag at the end of the encryption.
+     * This tag will also be used in the decryption process and by verifying
+     * its validity, the authenticity of a given ciphertext is established.
+     *
+     * This is superior to unauthenticated modes in that it allows to detect
+     * if somebody effectively changed the ciphertext after it had been
+     * encrypted. This prevents malicious modifications of the ciphertext that
+     * 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 guarantees of GCM mode.
+     *
+     *   cipher = OpenSSL::Cipher::AES.new(128, :GCM).encrypt
+     *   cipher.key = key
+     *   cipher.iv = nonce
+     *   cipher.auth_data = 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.
+     *
+     *   raise "tag is truncated!" unless tag.bytesize == 16
+     *   decipher = OpenSSL::Cipher::AES.new(128, :GCM).decrypt
+     *   decipher.key = key
+     *   decipher.iv = nonce
+     *   decipher.auth_tag = tag
+     *   decipher.auth_data = auth_data
+     *
+     *   decrypted = decipher.update(encrypted) + decipher.final
+     *
+     *   puts data == decrypted #=> true
+     */
     cCipher = rb_define_class_under(mOSSL, "Cipher", rb_cObject);
     eCipherError = rb_define_class_under(cCipher, "CipherError", eOSSLError);
 
     rb_define_alloc_func(cCipher, ossl_cipher_alloc);
-    rb_define_copy_func(cCipher, ossl_cipher_copy);
+    rb_define_method(cCipher, "initialize_copy", ossl_cipher_copy, 1);
     rb_define_module_function(cCipher, "ciphers", ossl_s_ciphers, 0);
     rb_define_method(cCipher, "initialize", ossl_cipher_initialize, 1);
     rb_define_method(cCipher, "reset", ossl_cipher_reset, 0);
@@ -557,11 +1048,19 @@ Init_ossl_cipher(void)
     rb_define_method(cCipher, "final", ossl_cipher_final, 0);
     rb_define_method(cCipher, "name", ossl_cipher_name, 0);
     rb_define_method(cCipher, "key=", ossl_cipher_set_key, 1);
+    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 bed4fa853b..2392d41c6a 100644
--- a/ext/openssl/ossl_cipher.h
+++ b/ext/openssl/ossl_cipher.h
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_CIPHER_H_)
@@ -14,9 +13,8 @@
 extern VALUE cCipher;
 extern VALUE eCipherError;
 
-const EVP_CIPHER *GetCipherPtr(VALUE);
+const EVP_CIPHER *ossl_evp_get_cipherbyname(VALUE);
 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 e700833076..28392e208c 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
@@ -15,6 +14,11 @@
  * Classes
  */
 VALUE cConfig;
+/* Document-class: OpenSSL::ConfigError
+ *
+ * General error for openssl library configuration files. Including formatting,
+ * parsing errors, etc.
+ */
 VALUE eConfigError;
 
 /*
@@ -22,13 +26,13 @@ VALUE eConfigError;
  */
 
 /*
- * GetConfigPtr is a public C-level function for getting OpenSSL CONF struct
+ * DupConfigPtr 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 *
-GetConfigPtr(VALUE obj)
+DupConfigPtr(VALUE obj)
 {
     CONF *conf;
     VALUE str;
@@ -37,7 +41,7 @@ GetConfigPtr(VALUE obj)
 
     OSSL_Check_Kind(obj, cConfig);
     str = rb_funcall(obj, rb_intern("to_s"), 0);
-    bio = ossl_obj2bio(str);
+    bio = ossl_obj2bio(&str);
     conf = NCONF_new(NULL);
     if(!conf){
 	BIO_free(bio);
@@ -46,23 +50,34 @@ GetConfigPtr(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);
-	ossl_raise(eConfigError, NULL);
+	if (eline <= 0)
+	    ossl_raise(eConfigError, "wrong config format");
+	else
+	    ossl_raise(eConfigError, "error in line %d", eline);
     }
     BIO_free(bio);
 
     return conf;
 }
 
+/* Document-const: DEFAULT_CONFIG_FILE
+ *
+ * The default system configuration file for openssl
+ */
 
 /*
  * INIT
  */
 void
-Init_ossl_config()
+Init_ossl_config(void)
 {
     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 cb226b27e5..627d297ba3 100644
--- a/ext/openssl/ossl_config.h
+++ b/ext/openssl/ossl_config.h
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_CONFIG_H_)
@@ -14,9 +13,7 @@
 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 8fd6b75c36..112ce33647 100644
--- a/ext/openssl/ossl_digest.c
+++ b/ext/openssl/ossl_digest.c
@@ -1,25 +1,20 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
 #define GetDigest(obj, ctx) do { \
-    Data_Get_Struct((obj), EVP_MD_CTX, (ctx)); \
+    TypedData_Get_Struct((obj), EVP_MD_CTX, &ossl_digest_type, (ctx)); \
     if (!(ctx)) { \
 	ossl_raise(rb_eRuntimeError, "Digest CTX wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetDigest(obj, ctx) do { \
-    OSSL_Check_Kind((obj), cDigest); \
-    GetDigest((obj), (ctx)); \
-} while (0)
 
 /*
  * Classes
@@ -29,16 +24,30 @@ 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
  */
 const EVP_MD *
-GetDigestPtr(VALUE obj)
+ossl_evp_get_digestbyname(VALUE obj)
 {
     const EVP_MD *md;
     ASN1_OBJECT *oid = NULL;
 
-    if (TYPE(obj) == T_STRING) {
+    if (RB_TYPE_P(obj, T_STRING)) {
     	const char *name = StringValueCStr(obj);
 
 	md = EVP_get_digestbyname(name);
@@ -48,11 +57,11 @@ GetDigestPtr(VALUE obj)
 	    ASN1_OBJECT_free(oid);
 	}
 	if(!md)
-            ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%s).", name);
+            ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%"PRIsVALUE").", obj);
     } else {
         EVP_MD_CTX *ctx;
 
-        SafeGetDigest(obj, ctx);
+        GetDigest(obj, ctx);
 
         md = EVP_MD_CTX_md(ctx);
     }
@@ -67,10 +76,13 @@ ossl_digest_new(const EVP_MD *md)
     EVP_MD_CTX *ctx;
 
     ret = ossl_digest_alloc(cDigest);
-    GetDigest(ret, ctx);
-    if (EVP_DigestInit_ex(ctx, md, NULL) != 1) {
-	ossl_raise(eDigestError, "Digest initialization failed.");
-    }
+    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");
 
     return ret;
 }
@@ -81,15 +93,7 @@ ossl_digest_new(const EVP_MD *md)
 static VALUE
 ossl_digest_alloc(VALUE klass)
 {
-    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;
+    return TypedData_Wrap_Struct(klass, &ossl_digest_type, 0);
 }
 
 VALUE ossl_digest_update(VALUE, VALUE);
@@ -98,19 +102,18 @@ VALUE ossl_digest_update(VALUE, VALUE);
  *  call-seq:
  *     Digest.new(string [, data]) -> Digest
  *
- * Creates a Digest instance based on +string+, which is either the ln
+ * 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
+ *
+ * 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')
+ *   digest = OpenSSL::Digest.new('sha256', 'digestdata')
  *
+ * is equivalent to
  *
+ *   digest = OpenSSL::Digest.new('sha256')
+ *   digest.update('digestdata')
  */
 static VALUE
 ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
@@ -120,14 +123,19 @@ ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
     VALUE type, data;
 
     rb_scan_args(argc, argv, "11", &type, &data);
-    md = GetDigestPtr(type);
+    md = ossl_evp_get_digestbyname(type);
     if (!NIL_P(data)) StringValue(data);
 
-    GetDigest(self, ctx);
-    if (EVP_DigestInit_ex(ctx, md, NULL) != 1) {
-	ossl_raise(eDigestError, "Digest initialization failed.");
+    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");
     }
 
+    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;
 }
@@ -140,8 +148,13 @@ ossl_digest_copy(VALUE self, VALUE other)
     rb_check_frozen(self);
     if (self == other) return self;
 
-    GetDigest(self, ctx1);
-    SafeGetDigest(other, ctx2);
+    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(other, ctx2);
 
     if (!EVP_MD_CTX_copy(ctx1, ctx2)) {
 	ossl_raise(eDigestError, NULL);
@@ -192,7 +205,9 @@ ossl_digest_update(VALUE self, VALUE data)
 
     StringValue(data);
     GetDigest(self, ctx);
-    EVP_DigestUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data));
+
+    if (!EVP_DigestUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data)))
+	ossl_raise(eDigestError, "EVP_DigestUpdate");
 
     return self;
 }
@@ -207,19 +222,21 @@ ossl_digest_finish(int argc, VALUE *argv, VALUE self)
 {
     EVP_MD_CTX *ctx;
     VALUE str;
-
-    rb_scan_args(argc, argv, "01", &str);
+    int out_len;
 
     GetDigest(self, ctx);
+    rb_scan_args(argc, argv, "01", &str);
+    out_len = EVP_MD_CTX_size(ctx);
 
     if (NIL_P(str)) {
-        str = rb_str_new(NULL, EVP_MD_CTX_size(ctx));
+        str = rb_str_new(NULL, out_len);
     } else {
         StringValue(str);
-        rb_str_resize(str, EVP_MD_CTX_size(ctx));
+        rb_str_resize(str, out_len);
     }
 
-    EVP_DigestFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), NULL);
+    if (!EVP_DigestFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), NULL))
+	ossl_raise(eDigestError, "EVP_DigestFinal_ex");
 
     return str;
 }
@@ -228,7 +245,7 @@ ossl_digest_finish(int argc, VALUE *argv, VALUE self)
  *  call-seq:
  *      digest.name -> string
  *
- * Returns the sn of this Digest instance.
+ * Returns the sn of this Digest algorithm.
  *
  * === Example
  *   digest = OpenSSL::Digest::SHA512.new
@@ -294,12 +311,13 @@ ossl_digest_block_length(VALUE self)
  * INIT
  */
 void
-Init_ossl_digest()
+Init_ossl_digest(void)
 {
     rb_require("digest");
 
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
     /* Document-class: OpenSSL::Digest
@@ -409,7 +427,7 @@ Init_ossl_digest()
      *   data1 = File.read('file1')
      *   sha256 = OpenSSL::Digest::SHA256.new
      *   digest1 = sha256.digest(data1)
-     *   
+     *
      *   data2 = File.read('file2')
      *   sha256.reset
      *   digest2 = sha256.digest(data2)
@@ -426,7 +444,7 @@ Init_ossl_digest()
     rb_define_alloc_func(cDigest, ossl_digest_alloc);
 
     rb_define_method(cDigest, "initialize", ossl_digest_initialize, -1);
-    rb_define_copy_func(cDigest, ossl_digest_copy);
+    rb_define_method(cDigest, "initialize_copy", ossl_digest_copy, 1);
     rb_define_method(cDigest, "reset", ossl_digest_reset, 0);
     rb_define_method(cDigest, "update", ossl_digest_update, 1);
     rb_define_alias(cDigest, "<<", "update");
diff --git a/ext/openssl/ossl_digest.h b/ext/openssl/ossl_digest.h
index 8cc5b1bc56..50bf5666a3 100644
--- a/ext/openssl/ossl_digest.h
+++ b/ext/openssl/ossl_digest.h
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_DIGEST_H_)
@@ -14,9 +13,8 @@
 extern VALUE cDigest;
 extern VALUE eDigestError;
 
-const EVP_MD *GetDigestPtr(VALUE);
+const EVP_MD *ossl_evp_get_digestbyname(VALUE);
 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 79f51b8cdb..5ca0d4ca3f 100644
--- a/ext/openssl/ossl_engine.c
+++ b/ext/openssl/ossl_engine.c
@@ -1,51 +1,95 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#if defined(OSSL_ENGINE_ENABLED)
+#if !defined(OPENSSL_NO_ENGINE)
 
-#define WrapEngine(klass, obj, engine) do { \
+#define NewEngine(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_engine_type, 0)
+#define SetEngine(obj, engine) do { \
     if (!(engine)) { \
 	ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, ENGINE_free, (engine)); \
+    RTYPEDDATA_DATA(obj) = (engine); \
 } while(0)
 #define GetEngine(obj, engine) do { \
-    Data_Get_Struct((obj), ENGINE, (engine)); \
+    TypedData_Get_Struct((obj), ENGINE, &ossl_engine_type, (engine)); \
     if (!(engine)) { \
         ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \
     } \
 } while (0)
-#define SafeGetEngine(obj, engine) do { \
-    OSSL_Check_Kind((obj), cEngine); \
-    GetPKCS7((obj), (engine)); \
-} while (0)
 
 /*
  * Classes
  */
+/* Document-class: OpenSSL::Engine
+ *
+ * This class is the access to openssl's ENGINE cryptographic module
+ * implementation.
+ *
+ * See also, https://www.openssl.org/docs/crypto/engine.html
+ */
 VALUE cEngine;
+/* Document-class: OpenSSL::Engine::EngineError
+ *
+ * This is the generic exception for OpenSSL::Engine related errors
+ */
 VALUE eEngineError;
 
 /*
  * Private
  */
-#define OSSL_ENGINE_LOAD_IF_MATCH(x) \
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
+#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x) \
 do{\
-  if(!strcmp(#x, RSTRING_PTR(name))){\
-    ENGINE_load_##x();\
+  if(!strcmp(#engine_name, RSTRING_PTR(name))){\
+    if (OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_##x, NULL))\
+      return Qtrue;\
+    else\
+      ossl_raise(eEngineError, "OPENSSL_init_crypto"); \
+  }\
+}while(0)
+#else
+#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x)  \
+do{\
+  if(!strcmp(#engine_name, RSTRING_PTR(name))){\
+    ENGINE_load_##engine_name();\
     return Qtrue;\
   }\
 }while(0)
+#endif
+
+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,
+};
+
+/*
+ * call-seq:
+ *    OpenSSL::Engine.load(name = nil)
+ *
+ * This method loads engines. If _name_ is nil, then all builtin engines are
+ * loaded. Otherwise, the given _name_, as a String,  is loaded if available to
+ * your runtime, and returns true. If _name_ is not found, then nil is
+ * returned.
+ *
+ */
 static VALUE
 ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
 {
@@ -59,54 +103,87 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
         ENGINE_load_builtin_engines();
         return Qtrue;
     }
-    StringValue(name);
+    StringValueCStr(name);
 #ifndef OPENSSL_NO_STATIC_ENGINE
 #if HAVE_ENGINE_LOAD_DYNAMIC
-    OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
+    OSSL_ENGINE_LOAD_IF_MATCH(dynamic, DYNAMIC);
 #endif
-#if HAVE_ENGINE_LOAD_CSWIFT
-    OSSL_ENGINE_LOAD_IF_MATCH(cswift);
+#if HAVE_ENGINE_LOAD_4758CCA
+    OSSL_ENGINE_LOAD_IF_MATCH(4758cca, 4758CCA);
 #endif
-#if HAVE_ENGINE_LOAD_CHIL
-    OSSL_ENGINE_LOAD_IF_MATCH(chil);
+#if HAVE_ENGINE_LOAD_AEP
+    OSSL_ENGINE_LOAD_IF_MATCH(aep, AEP);
 #endif
 #if HAVE_ENGINE_LOAD_ATALLA
-    OSSL_ENGINE_LOAD_IF_MATCH(atalla);
+    OSSL_ENGINE_LOAD_IF_MATCH(atalla, ATALLA);
+#endif
+#if HAVE_ENGINE_LOAD_CHIL
+    OSSL_ENGINE_LOAD_IF_MATCH(chil, CHIL);
+#endif
+#if HAVE_ENGINE_LOAD_CSWIFT
+    OSSL_ENGINE_LOAD_IF_MATCH(cswift, CSWIFT);
 #endif
 #if HAVE_ENGINE_LOAD_NURON
-    OSSL_ENGINE_LOAD_IF_MATCH(nuron);
+    OSSL_ENGINE_LOAD_IF_MATCH(nuron, NURON);
+#endif
+#if HAVE_ENGINE_LOAD_SUREWARE
+    OSSL_ENGINE_LOAD_IF_MATCH(sureware, SUREWARE);
 #endif
 #if HAVE_ENGINE_LOAD_UBSEC
-    OSSL_ENGINE_LOAD_IF_MATCH(ubsec);
+    OSSL_ENGINE_LOAD_IF_MATCH(ubsec, UBSEC);
 #endif
-#if HAVE_ENGINE_LOAD_AEP
-    OSSL_ENGINE_LOAD_IF_MATCH(aep);
+#if HAVE_ENGINE_LOAD_PADLOCK
+    OSSL_ENGINE_LOAD_IF_MATCH(padlock, PADLOCK);
 #endif
-#if HAVE_ENGINE_LOAD_SUREWARE
-    OSSL_ENGINE_LOAD_IF_MATCH(sureware);
+#if HAVE_ENGINE_LOAD_CAPI
+    OSSL_ENGINE_LOAD_IF_MATCH(capi, CAPI);
 #endif
-#if HAVE_ENGINE_LOAD_4758CCA
-    OSSL_ENGINE_LOAD_IF_MATCH(4758cca);
+#if HAVE_ENGINE_LOAD_GMP
+    OSSL_ENGINE_LOAD_IF_MATCH(gmp, GMP);
+#endif
+#if HAVE_ENGINE_LOAD_GOST
+    OSSL_ENGINE_LOAD_IF_MATCH(gost, GOST);
+#endif
+#if HAVE_ENGINE_LOAD_CRYPTODEV
+    OSSL_ENGINE_LOAD_IF_MATCH(cryptodev, CRYPTODEV);
+#endif
+#if HAVE_ENGINE_LOAD_AESNI
+    OSSL_ENGINE_LOAD_IF_MATCH(aesni, AESNI);
 #endif
 #endif
 #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
-    OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
+    OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto, OPENBSD_DEV_CRYPTO);
 #endif
-    OSSL_ENGINE_LOAD_IF_MATCH(openssl);
-    rb_warning("no such builtin loader for `%s'", RSTRING_PTR(name));
+    OSSL_ENGINE_LOAD_IF_MATCH(openssl, OPENSSL);
+    rb_warning("no such builtin loader for `%"PRIsVALUE"'", name);
     return Qnil;
 #endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
 }
 
+/*
+ * call-seq:
+ *    OpenSSL::Engine.cleanup
+ *
+ * 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.
+ */
 static VALUE
 ossl_engine_s_cleanup(VALUE self)
 {
-#if defined(HAVE_ENGINE_CLEANUP)
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000
     ENGINE_cleanup();
 #endif
     return Qnil;
 }
 
+/*
+ * call-seq:
+ *    OpenSSL::Engine.engines -> [engine, ...]
+ *
+ * Returns an array of currently loaded engines.
+ */
 static VALUE
 ossl_engine_s_engines(VALUE klass)
 {
@@ -115,52 +192,62 @@ 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); 
-	WrapEngine(klass, obj, e);
+	ENGINE_up_ref(e);
+	SetEngine(obj, e);
         rb_ary_push(ary, obj);
     }
 
     return ary;
 }
 
+/*
+ * call-seq:
+ *    OpenSSL::Engine.by_id(name) -> engine
+ *
+ * Fetches the engine as specified by the _id_ String.
+ *
+ *   OpenSSL::Engine.by_id("openssl")
+ *    => #<OpenSSL::Engine id="openssl" name="Software engine support">
+ *
+ * See OpenSSL::Engine.engines for the currently loaded engines.
+ */
 static VALUE
 ossl_engine_s_by_id(VALUE klass, VALUE id)
 {
     ENGINE *e;
     VALUE obj;
 
-    StringValue(id);
+    StringValueCStr(id);
     ossl_engine_s_load(1, &id, klass);
+    obj = NewEngine(klass);
     if(!(e = ENGINE_by_id(RSTRING_PTR(id))))
 	ossl_raise(eEngineError, NULL);
-    WrapEngine(klass, obj, e);
+    SetEngine(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);
-    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);
+    ossl_clear_error();
 
     return obj;
 }
 
+/*
+ * call-seq:
+ *    engine.id -> string
+ *
+ * Gets the id for this engine.
+ *
+ *    OpenSSL::Engine.load
+ *    OpenSSL::Engine.engines #=> [#<OpenSSL::Engine#>, ...]
+ *    OpenSSL::Engine.engines.first.id
+ *	#=> "rsax"
+ */
 static VALUE
 ossl_engine_get_id(VALUE self)
 {
@@ -169,6 +256,18 @@ ossl_engine_get_id(VALUE self)
     return rb_str_new2(ENGINE_get_id(e));
 }
 
+/*
+ * call-seq:
+ *    engine.name -> string
+ *
+ * Get the descriptive name for this engine.
+ *
+ *    OpenSSL::Engine.load
+ *    OpenSSL::Engine.engines #=> [#<OpenSSL::Engine#>, ...]
+ *    OpenSSL::Engine.engines.first.name
+ *	#=> "RSAX engine support"
+ *
+ */
 static VALUE
 ossl_engine_get_name(VALUE self)
 {
@@ -177,6 +276,14 @@ ossl_engine_get_name(VALUE self)
     return rb_str_new2(ENGINE_get_name(e));
 }
 
+/*
+ * call-seq:
+ *    engine.finish -> nil
+ *
+ * Releases all internal structural references for this engine.
+ *
+ * May raise an EngineError if the engine is unavailable
+ */
 static VALUE
 ossl_engine_finish(VALUE self)
 {
@@ -188,18 +295,30 @@ ossl_engine_finish(VALUE self)
     return Qnil;
 }
 
-#if defined(HAVE_ENGINE_GET_CIPHER)
+/*
+ * call-seq:
+ *   engine.cipher(name) -> OpenSSL::Cipher
+ *
+ * Returns a new instance of OpenSSL::Cipher by _name_, if it is available in
+ * this engine.
+ *
+ * An EngineError will be raised if the cipher is unavailable.
+ *
+ *    e = OpenSSL::Engine.by_id("openssl")
+ *     => #<OpenSSL::Engine id="openssl" name="Software engine support">
+ *    e.cipher("RC4")
+ *     => #<OpenSSL::Cipher:0x007fc5cacc3048>
+ *
+ */
 static VALUE
 ossl_engine_get_cipher(VALUE self, VALUE name)
 {
     ENGINE *e;
     const EVP_CIPHER *ciph, *tmp;
-    char *s;
     int nid;
 
-    s = StringValuePtr(name);
-    tmp = EVP_get_cipherbyname(s);
-    if(!tmp) ossl_raise(eEngineError, "no such cipher `%s'", s);
+    tmp = EVP_get_cipherbyname(StringValueCStr(name));
+    if(!tmp) ossl_raise(eEngineError, "no such cipher `%"PRIsVALUE"'", name);
     nid = EVP_CIPHER_nid(tmp);
     GetEngine(self, e);
     ciph = ENGINE_get_cipher(e, nid);
@@ -207,22 +326,31 @@ 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)
+/*
+ * call-seq:
+ *   engine.digest(name) -> OpenSSL::Digest
+ *
+ * Returns a new instance of OpenSSL::Digest by _name_.
+ *
+ * Will raise an EngineError if the digest is unavailable.
+ *
+ *    e = OpenSSL::Engine.by_id("openssl")
+ *	#=> #<OpenSSL::Engine id="openssl" name="Software engine support">
+ *    e.digest("SHA1")
+ *	#=> #<OpenSSL::Digest: da39a3ee5e6b4b0d3255bfef95601890afd80709>
+ *    e.digest("zomg")
+ *	#=> OpenSSL::Engine::EngineError: no such digest `zomg'
+ */
 static VALUE
 ossl_engine_get_digest(VALUE self, VALUE name)
 {
     ENGINE *e;
     const EVP_MD *md, *tmp;
-    char *s;
     int nid;
 
-    s = StringValuePtr(name);
-    tmp = EVP_get_digestbyname(s);
-    if(!tmp) ossl_raise(eEngineError, "no such digest `%s'", s);
+    tmp = EVP_get_digestbyname(StringValueCStr(name));
+    if(!tmp) ossl_raise(eEngineError, "no such digest `%"PRIsVALUE"'", name);
     nid = EVP_MD_nid(tmp);
     GetEngine(self, e);
     md = ENGINE_get_digest(e, nid);
@@ -230,10 +358,16 @@ ossl_engine_get_digest(VALUE self, VALUE name)
 
     return ossl_digest_new(md);
 }
-#else
-#define ossl_engine_get_digest rb_f_notimplement
-#endif
 
+/*
+ * call-seq:
+ *    engine.load_private_key(id = nil, data = nil) -> OpenSSL::PKey
+ *
+ * Loads the given private key identified by _id_ and _data_.
+ *
+ * An EngineError is raised of the OpenSSL::PKey is unavailable.
+ *
+ */
 static VALUE
 ossl_engine_load_privkey(int argc, VALUE *argv, VALUE self)
 {
@@ -243,14 +377,10 @@ 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 : StringValuePtr(id);
-    sdata = NIL_P(data) ? NULL : StringValuePtr(data);
+    sid = NIL_P(id) ? NULL : StringValueCStr(id);
+    sdata = NIL_P(data) ? NULL : StringValueCStr(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);
@@ -258,6 +388,15 @@ ossl_engine_load_privkey(int argc, VALUE *argv, VALUE self)
     return obj;
 }
 
+/*
+ * call-seq:
+ *    engine.load_public_key(id = nil, data = nil) -> OpenSSL::PKey
+ *
+ * Loads the given public key identified by _id_ and _data_.
+ *
+ * An EngineError is raised of the OpenSSL::PKey is unavailable.
+ *
+ */
 static VALUE
 ossl_engine_load_pubkey(int argc, VALUE *argv, VALUE self)
 {
@@ -267,19 +406,31 @@ 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 : StringValuePtr(id);
-    sdata = NIL_P(data) ? NULL : StringValuePtr(data);
+    sid = NIL_P(id) ? NULL : StringValueCStr(id);
+    sdata = NIL_P(data) ? NULL : StringValueCStr(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);
 }
 
+/*
+ * call-seq:
+ *    engine.set_default(flag)
+ *
+ * Set the defaults for this engine with the given _flag_.
+ *
+ * These flags are used to control combinations of algorithm methods.
+ *
+ * _flag_ can be one of the following, other flags are available depending on
+ * your OS.
+ *
+ * [All flags]  0xFFFF
+ * [No flags]	0x0000
+ *
+ * See also <openssl/engine.h>
+ */
 static VALUE
 ossl_engine_set_default(VALUE self, VALUE flag)
 {
@@ -292,6 +443,14 @@ ossl_engine_set_default(VALUE self, VALUE flag)
     return Qtrue;
 }
 
+/*
+ * call-seq:
+ *    engine.ctrl_cmd(command, value = nil) -> engine
+ *
+ * Sends the given _command_ to this engine.
+ *
+ * Raises an EngineError if the command fails.
+ */
 static VALUE
 ossl_engine_ctrl_cmd(int argc, VALUE *argv, VALUE self)
 {
@@ -301,10 +460,8 @@ ossl_engine_ctrl_cmd(int argc, VALUE *argv, VALUE self)
 
     GetEngine(self, e);
     rb_scan_args(argc, argv, "11", &cmd, &val);
-    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);
+    ret = ENGINE_ctrl_cmd_string(e, StringValueCStr(cmd),
+				 NIL_P(val) ? NULL : StringValueCStr(val), 0);
     if (!ret) ossl_raise(eEngineError, NULL);
 
     return self;
@@ -322,6 +479,12 @@ ossl_engine_cmd_flag_to_name(int flag)
     }
 }
 
+/*
+ * call-seq:
+ *    engine.cmds -> [["name", "description", "flags"], ...]
+ *
+ * Returns an array of command definitions for the current engine
+ */
 static VALUE
 ossl_engine_get_cmds(VALUE self)
 {
@@ -344,37 +507,40 @@ ossl_engine_get_cmds(VALUE self)
     return ary;
 }
 
+/*
+ * call-seq:
+ *    engine.inspect -> string
+ *
+ * Pretty prints this engine.
+ */
 static VALUE
 ossl_engine_inspect(VALUE self)
 {
-    VALUE str;
-    const char *cname = rb_class2name(rb_obj_class(self));
-
-    str = rb_str_new2("#<");
-    rb_str_cat2(str, cname);
-    rb_str_cat2(str, " id=\"");
-    rb_str_append(str, ossl_engine_get_id(self));
-    rb_str_cat2(str, "\" name=\"");
-    rb_str_append(str, ossl_engine_get_name(self));
-    rb_str_cat2(str, "\">");
-
-    return str;
+    ENGINE *e;
+
+    GetEngine(self, e);
+    return rb_sprintf("#<%"PRIsVALUE" id=\"%s\" name=\"%s\">",
+		      rb_obj_class(self), ENGINE_get_id(e), ENGINE_get_name(e));
 }
 
 #define DefEngineConst(x) rb_define_const(cEngine, #x, INT2NUM(ENGINE_##x))
 
 void
-Init_ossl_engine()
+Init_ossl_engine(void)
 {
+#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_define_alloc_func(cEngine, ossl_engine_s_alloc);
+    rb_undef_alloc_func(cEngine);
     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);
@@ -398,18 +564,14 @@ Init_ossl_engine()
 #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()
+Init_ossl_engine(void)
 {
 }
 #endif
diff --git a/ext/openssl/ossl_engine.h b/ext/openssl/ossl_engine.h
index ea2f256912..cd548beea3 100644
--- a/ext/openssl/ossl_engine.h
+++ b/ext/openssl/ossl_engine.h
@@ -1,12 +1,11 @@
 /*
- * $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 licenced under the same licence as Ruby.
+ * This program is licensed 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 5220c9e73d..564dcab522 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -1,29 +1,24 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(OPENSSL_NO_HMAC)
 
 #include "ossl.h"
 
-#define MakeHMAC(obj, klass, ctx) \
-    (obj) = Data_Make_Struct((klass), HMAC_CTX, 0, ossl_hmac_free, (ctx))
+#define NewHMAC(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_hmac_type, 0)
 #define GetHMAC(obj, ctx) do { \
-    Data_Get_Struct((obj), HMAC_CTX, (ctx)); \
+    TypedData_Get_Struct((obj), HMAC_CTX, &ossl_hmac_type, (ctx)); \
     if (!(ctx)) { \
 	ossl_raise(rb_eRuntimeError, "HMAC wasn't initialized"); \
     } \
 } while (0)
-#define SafeGetHMAC(obj, ctx) do { \
-    OSSL_Check_Kind((obj), cHMAC); \
-    GetHMAC((obj), (ctx)); \
-} while (0)
 
 /*
  * Classes
@@ -39,20 +34,30 @@ VALUE eHMACError;
  * Private
  */
 static void
-ossl_hmac_free(HMAC_CTX *ctx)
+ossl_hmac_free(void *ctx)
 {
-    HMAC_CTX_cleanup(ctx);
-    ruby_xfree(ctx);
+    HMAC_CTX_free(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)
 {
-    HMAC_CTX *ctx;
     VALUE obj;
+    HMAC_CTX *ctx;
 
-    MakeHMAC(obj, klass, ctx);
-    HMAC_CTX_init(ctx);
+    obj = NewHMAC(klass);
+    ctx = HMAC_CTX_new();
+    if (!ctx)
+	ossl_raise(eHMACError, NULL);
+    RTYPEDDATA_DATA(obj) = ctx;
 
     return obj;
 }
@@ -62,6 +67,36 @@ ossl_hmac_alloc(VALUE klass)
  *  call-seq:
  *     HMAC.new(key, digest) -> hmac
  *
+ * Returns an instance of OpenSSL::HMAC set with the key and digest
+ * algorithm to be used. The instance represents the initial state of
+ * the message authentication code before any data has been processed.
+ * To process data with it, use the instance method #update with your
+ * data as an argument.
+ *
+ * === Example
+ *
+ *	key = 'key'
+ * 	digest = OpenSSL::Digest.new('sha1')
+ * 	instance = OpenSSL::HMAC.new(key, digest)
+ * 	#=> f42bb0eeb018ebbd4597ae7213711ec60760843f
+ * 	instance.class
+ * 	#=> OpenSSL::HMAC
+ *
+ * === A note about comparisons
+ *
+ * Two instances won't be equal when they're compared, even if they have the
+ * same value. Use #to_s or #hexdigest to return the authentication code that
+ * the instance represents. For example:
+ *
+ *	other_instance = OpenSSL::HMAC.new('key', OpenSSL::Digest.new('sha1'))
+ *  	#=> f42bb0eeb018ebbd4597ae7213711ec60760843f
+ *  	instance
+ *  	#=> f42bb0eeb018ebbd4597ae7213711ec60760843f
+ *  	instance == other_instance
+ *  	#=> false
+ *  	instance.to_s == other_instance.to_s
+ *  	#=> true
+ *
  */
 static VALUE
 ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
@@ -70,8 +105,8 @@ ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
 
     StringValue(key);
     GetHMAC(self, ctx);
-    HMAC_Init(ctx, RSTRING_PTR(key), RSTRING_LENINT(key),
-		 GetDigestPtr(digest));
+    HMAC_Init_ex(ctx, RSTRING_PTR(key), RSTRING_LENINT(key),
+		 ossl_evp_get_digestbyname(digest), NULL);
 
     return self;
 }
@@ -85,9 +120,10 @@ ossl_hmac_copy(VALUE self, VALUE other)
     if (self == other) return self;
 
     GetHMAC(self, ctx1);
-    SafeGetHMAC(other, ctx2);
+    GetHMAC(other, ctx2);
 
-    HMAC_CTX_copy(ctx1, ctx2);
+    if (!HMAC_CTX_copy(ctx1, ctx2))
+	ossl_raise(eHMACError, "HMAC_CTX_copy");
     return self;
 }
 
@@ -95,6 +131,19 @@ ossl_hmac_copy(VALUE self, VALUE other)
  *  call-seq:
  *     hmac.update(string) -> self
  *
+ * Returns _hmac_ updated with the message to be authenticated.
+ * Can be called repeatedly with chunks of the message.
+ *
+ * === Example
+ *
+ *	first_chunk = 'The quick brown fox jumps '
+ * 	second_chunk = 'over the lazy dog'
+ *
+ * 	instance.update(first_chunk)
+ * 	#=> 5b9a8038a65d571076d97fe783989e52278a492a
+ * 	instance.update(second_chunk)
+ * 	#=> de7c9b85b8b78aa6bc8a7a36f70a90701c9db4d9
+ *
  */
 static VALUE
 ossl_hmac_update(VALUE self, VALUE data)
@@ -109,70 +158,92 @@ 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;
 
-    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");
+    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_Final(&final, *buf, buf_len);
-    HMAC_CTX_cleanup(&final);
+
+    HMAC_Final(final, buf, buf_len);
+    HMAC_CTX_free(final);
 }
 
 /*
  *  call-seq:
- *     hmac.digest -> aString
+ *     hmac.digest -> string
  *
+ * 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?"
  */
 static VALUE
 ossl_hmac_digest(VALUE self)
 {
     HMAC_CTX *ctx;
-    unsigned char *buf;
     unsigned int buf_len;
-    VALUE digest;
+    VALUE ret;
 
     GetHMAC(self, ctx);
-    hmac_final(ctx, &buf, &buf_len);
-    digest = ossl_buf2str((char *)buf, buf_len);
+    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);
 
-    return digest;
+    return ret;
 }
 
 /*
  *  call-seq:
- *     hmac.hexdigest -> aString
+ *     hmac.hexdigest -> string
  *
+ * 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;
-    char *hexbuf;
+    unsigned char buf[EVP_MAX_MD_SIZE];
     unsigned int buf_len;
-    VALUE hexdigest;
+    VALUE ret;
 
     GetHMAC(self, ctx);
-    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);
+    hmac_final(ctx, buf, &buf_len);
+    ret = rb_str_new(NULL, buf_len * 2);
+    ossl_bin2hex(buf, RSTRING_PTR(ret), buf_len);
 
-    return hexdigest;
+    return ret;
 }
 
 /*
  *  call-seq:
  *     hmac.reset -> self
  *
+ * Returns _hmac_ as it was when it was first initialized, with all processed
+ * data cleared from it.
+ *
+ * === Example
+ *
+ *	data = "The quick brown fox jumps over the lazy dog"
+ * 	instance = OpenSSL::HMAC.new('key', OpenSSL::Digest.new('sha1'))
+ * 	#=> f42bb0eeb018ebbd4597ae7213711ec60760843f
+ *
+ * 	instance.update(data)
+ * 	#=> de7c9b85b8b78aa6bc8a7a36f70a90701c9db4d9
+ * 	instance.reset
+ * 	#=> f42bb0eeb018ebbd4597ae7213711ec60760843f
+ *
  */
 static VALUE
 ossl_hmac_reset(VALUE self)
@@ -180,7 +251,7 @@ ossl_hmac_reset(VALUE self)
     HMAC_CTX *ctx;
 
     GetHMAC(self, ctx);
-    HMAC_Init(ctx, NULL, 0, NULL);
+    HMAC_Init_ex(ctx, NULL, 0, NULL, NULL);
 
     return self;
 }
@@ -189,6 +260,18 @@ ossl_hmac_reset(VALUE self)
  *  call-seq:
  *     HMAC.digest(digest, key, data) -> aString
  *
+ * Returns the authentication code as a binary string. The _digest_ parameter
+ * specifies the digest algorithm to use. This may be a String representing
+ * the algorithm name or an instance of OpenSSL::Digest.
+ *
+ * === Example
+ *
+ *	key = 'key'
+ * 	data = 'The quick brown fox jumps over the lazy dog'
+ *
+ * 	hmac = OpenSSL::HMAC.digest('sha1', key, data)
+ * 	#=> "\xDE|\x9B\x85\xB8\xB7\x8A\xA6\xBC\x8Az6\xF7\n\x90p\x1C\x9D\xB4\xD9"
+ *
  */
 static VALUE
 ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
@@ -198,48 +281,90 @@ ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 
     StringValue(key);
     StringValue(data);
-    buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LENINT(key),
-	       (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
+    buf = HMAC(ossl_evp_get_digestbyname(digest), RSTRING_PTR(key),
+	       RSTRING_LENINT(key), (unsigned char *)RSTRING_PTR(data),
+	       RSTRING_LEN(data), NULL, &buf_len);
 
     return rb_str_new((const char *)buf, buf_len);
 }
 
 /*
  *  call-seq:
- *     HMAC.digest(digest, key, data) -> aString
+ *     HMAC.hexdigest(digest, key, data) -> aString
+ *
+ * Returns the authentication code as a hex-encoded string. The _digest_
+ * parameter specifies the digest algorithm to use. This may be a String
+ * representing the algorithm name or an instance of OpenSSL::Digest.
+ *
+ * === Example
+ *
+ *	key = 'key'
+ * 	data = 'The quick brown fox jumps over the lazy dog'
+ *
+ * 	hmac = OpenSSL::HMAC.hexdigest('sha1', key, data)
+ * 	#=> "de7c9b85b8b78aa6bc8a7a36f70a90701c9db4d9"
  *
  */
 static VALUE
 ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 {
-    unsigned char *buf;
-    char *hexbuf;
+    unsigned char buf[EVP_MAX_MD_SIZE];
     unsigned int buf_len;
-    VALUE hexdigest;
+    VALUE ret;
 
     StringValue(key);
     StringValue(data);
 
-    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);
+    if (!HMAC(ossl_evp_get_digestbyname(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);
 
-    return hexdigest;
+    return ret;
 }
 
 /*
  * INIT
  */
 void
-Init_ossl_hmac()
+Init_ossl_hmac(void)
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #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);
@@ -249,7 +374,7 @@ Init_ossl_hmac()
     rb_define_singleton_method(cHMAC, "hexdigest", ossl_hmac_s_hexdigest, 3);
 
     rb_define_method(cHMAC, "initialize", ossl_hmac_initialize, 2);
-    rb_define_copy_func(cHMAC, ossl_hmac_copy);
+    rb_define_method(cHMAC, "initialize_copy", ossl_hmac_copy, 1);
 
     rb_define_method(cHMAC, "reset", ossl_hmac_reset, 0);
     rb_define_method(cHMAC, "update", ossl_hmac_update, 1);
@@ -263,8 +388,8 @@ Init_ossl_hmac()
 #else /* NO_HMAC */
 #  warning >>> OpenSSL is compiled without HMAC support <<<
 void
-Init_ossl_hmac()
+Init_ossl_hmac(void)
 {
-    rb_warning("HMAC will NOT be avaible: OpenSSL is compiled without HMAC.");
+    rb_warning("HMAC is not available: OpenSSL is compiled without HMAC.");
 }
 #endif /* NO_HMAC */
diff --git a/ext/openssl/ossl_hmac.h b/ext/openssl/ossl_hmac.h
index 1a2978b39a..7c51f4722d 100644
--- a/ext/openssl/ossl_hmac.h
+++ b/ext/openssl/ossl_hmac.h
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_HMAC_H_)
diff --git a/ext/openssl/ossl_kdf.c b/ext/openssl/ossl_kdf.c
new file mode 100644
index 0000000000..ee124718b5
--- /dev/null
+++ b/ext/openssl/ossl_kdf.c
@@ -0,0 +1,319 @@
+/*
+ * Ruby/OpenSSL Project
+ * Copyright (C) 2007, 2017 Ruby/OpenSSL Project Authors
+ */
+#include "ossl.h"
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+# include <openssl/kdf.h>
+#endif
+
+static VALUE mKDF, eKDF;
+
+/*
+ * call-seq:
+ *   KDF.pbkdf2_hmac(pass, salt:, iterations:, length:, hash:) -> aString
+ *
+ * PKCS #5 PBKDF2 (Password-Based Key Derivation Function 2) in combination
+ * with HMAC. Takes _pass_, _salt_ and _iterations_, and then derives a key
+ * of _length_ bytes.
+ *
+ * For more information about PBKDF2, see RFC 2898 Section 5.2
+ * (https://tools.ietf.org/html/rfc2898#section-5.2).
+ *
+ * === Parameters
+ * pass       :: The passphrase.
+ * salt       :: The salt. Salts prevent attacks based on dictionaries of common
+ *               passwords and attacks based on rainbow tables. It is a public
+ *               value that can be safely stored along with the password (e.g.
+ *               if the derived value is used for password storage).
+ * iterations :: The iteration count. This provides the ability to tune the
+ *               algorithm. It is better to use the highest count possible for
+ *               the maximum resistance to brute-force attacks.
+ * length     :: The desired length of the derived key in octets.
+ * hash       :: The hash algorithm used with HMAC for the PRF. May be a String
+ *               representing the algorithm name, or an instance of
+ *               OpenSSL::Digest.
+ */
+static VALUE
+kdf_pbkdf2_hmac(int argc, VALUE *argv, VALUE self)
+{
+    VALUE pass, salt, opts, kwargs[4], str;
+    static ID kwargs_ids[4];
+    int iters, len;
+    const EVP_MD *md;
+
+    if (!kwargs_ids[0]) {
+	kwargs_ids[0] = rb_intern_const("salt");
+	kwargs_ids[1] = rb_intern_const("iterations");
+	kwargs_ids[2] = rb_intern_const("length");
+	kwargs_ids[3] = rb_intern_const("hash");
+    }
+    rb_scan_args(argc, argv, "1:", &pass, &opts);
+    rb_get_kwargs(opts, kwargs_ids, 4, 0, kwargs);
+
+    StringValue(pass);
+    salt = StringValue(kwargs[0]);
+    iters = NUM2INT(kwargs[1]);
+    len = NUM2INT(kwargs[2]);
+    md = ossl_evp_get_digestbyname(kwargs[3]);
+
+    str = rb_str_new(0, len);
+    if (!PKCS5_PBKDF2_HMAC(RSTRING_PTR(pass), RSTRING_LENINT(pass),
+			   (unsigned char *)RSTRING_PTR(salt),
+			   RSTRING_LENINT(salt), iters, md, len,
+			   (unsigned char *)RSTRING_PTR(str)))
+	ossl_raise(eKDF, "PKCS5_PBKDF2_HMAC");
+
+    return str;
+}
+
+#if defined(HAVE_EVP_PBE_SCRYPT)
+/*
+ * call-seq:
+ *   KDF.scrypt(pass, salt:, N:, r:, p:, length:) -> aString
+ *
+ * Derives a key from _pass_ using given parameters with the scrypt
+ * password-based key derivation function. The result can be used for password
+ * storage.
+ *
+ * scrypt is designed to be memory-hard and more secure against brute-force
+ * attacks using custom hardwares than alternative KDFs such as PBKDF2 or
+ * bcrypt.
+ *
+ * The keyword arguments _N_, _r_ and _p_ can be used to tune scrypt. RFC 7914
+ * (published on 2016-08, https://tools.ietf.org/html/rfc7914#section-2) states
+ * that using values r=8 and p=1 appears to yield good results.
+ *
+ * See RFC 7914 (https://tools.ietf.org/html/rfc7914) for more information.
+ *
+ * === Parameters
+ * pass   :: Passphrase.
+ * salt   :: Salt.
+ * N      :: CPU/memory cost parameter. This must be a power of 2.
+ * r      :: Block size parameter.
+ * p      :: Parallelization parameter.
+ * length :: Length in octets of the derived key.
+ *
+ * === Example
+ *   pass = "password"
+ *   salt = SecureRandom.random_bytes(16)
+ *   dk = OpenSSL::KDF.scrypt(pass, salt: salt, N: 2**14, r: 8, p: 1, length: 32)
+ *   p dk #=> "\xDA\xE4\xE2...\x7F\xA1\x01T"
+ */
+static VALUE
+kdf_scrypt(int argc, VALUE *argv, VALUE self)
+{
+    VALUE pass, salt, opts, kwargs[5], str;
+    static ID kwargs_ids[5];
+    size_t len;
+    uint64_t N, r, p, maxmem;
+
+    if (!kwargs_ids[0]) {
+	kwargs_ids[0] = rb_intern_const("salt");
+	kwargs_ids[1] = rb_intern_const("N");
+	kwargs_ids[2] = rb_intern_const("r");
+	kwargs_ids[3] = rb_intern_const("p");
+	kwargs_ids[4] = rb_intern_const("length");
+    }
+    rb_scan_args(argc, argv, "1:", &pass, &opts);
+    rb_get_kwargs(opts, kwargs_ids, 5, 0, kwargs);
+
+    StringValue(pass);
+    salt = StringValue(kwargs[0]);
+    N = NUM2UINT64T(kwargs[1]);
+    r = NUM2UINT64T(kwargs[2]);
+    p = NUM2UINT64T(kwargs[3]);
+    len = NUM2LONG(kwargs[4]);
+    /*
+     * OpenSSL uses 32MB by default (if zero is specified), which is too small.
+     * Let's not limit memory consumption but just let malloc() fail inside
+     * OpenSSL. The amount is controllable by other parameters.
+     */
+    maxmem = SIZE_MAX;
+
+    str = rb_str_new(0, len);
+    if (!EVP_PBE_scrypt(RSTRING_PTR(pass), RSTRING_LEN(pass),
+			(unsigned char *)RSTRING_PTR(salt), RSTRING_LEN(salt),
+			N, r, p, maxmem, (unsigned char *)RSTRING_PTR(str), len))
+	ossl_raise(eKDF, "EVP_PBE_scrypt");
+
+    return str;
+}
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+/*
+ * call-seq:
+ *    KDF.hkdf(ikm, salt:, info:, length:, hash:) -> String
+ *
+ * HMAC-based Extract-and-Expand Key Derivation Function (HKDF) as specified in
+ * {RFC 5869}[https://tools.ietf.org/html/rfc5869].
+ *
+ * New in OpenSSL 1.1.0.
+ *
+ * === Parameters
+ * _ikm_::
+ *   The input keying material.
+ * _salt_::
+ *   The salt.
+ * _info_::
+ *   The context and application specific information.
+ * _length_::
+ *   The output length in octets. Must be <= <tt>255 * HashLen</tt>, where
+ *   HashLen is the length of the hash function output in octets.
+ * _hash_::
+ *   The hash function.
+ */
+static VALUE
+kdf_hkdf(int argc, VALUE *argv, VALUE self)
+{
+    VALUE ikm, salt, info, opts, kwargs[4], str;
+    static ID kwargs_ids[4];
+    int saltlen, ikmlen, infolen;
+    size_t len;
+    const EVP_MD *md;
+    EVP_PKEY_CTX *pctx;
+
+    if (!kwargs_ids[0]) {
+	kwargs_ids[0] = rb_intern_const("salt");
+	kwargs_ids[1] = rb_intern_const("info");
+	kwargs_ids[2] = rb_intern_const("length");
+	kwargs_ids[3] = rb_intern_const("hash");
+    }
+    rb_scan_args(argc, argv, "1:", &ikm, &opts);
+    rb_get_kwargs(opts, kwargs_ids, 4, 0, kwargs);
+
+    StringValue(ikm);
+    ikmlen = RSTRING_LENINT(ikm);
+    salt = StringValue(kwargs[0]);
+    saltlen = RSTRING_LENINT(salt);
+    info = StringValue(kwargs[1]);
+    infolen = RSTRING_LENINT(info);
+    len = (size_t)NUM2LONG(kwargs[2]);
+    if (len > LONG_MAX)
+	rb_raise(rb_eArgError, "length must be non-negative");
+    md = ossl_evp_get_digestbyname(kwargs[3]);
+
+    str = rb_str_new(NULL, (long)len);
+    pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
+    if (!pctx)
+	ossl_raise(eKDF, "EVP_PKEY_CTX_new_id");
+    if (EVP_PKEY_derive_init(pctx) <= 0) {
+	EVP_PKEY_CTX_free(pctx);
+	ossl_raise(eKDF, "EVP_PKEY_derive_init");
+    }
+    if (EVP_PKEY_CTX_set_hkdf_md(pctx, md) <= 0) {
+	EVP_PKEY_CTX_free(pctx);
+	ossl_raise(eKDF, "EVP_PKEY_CTX_set_hkdf_md");
+    }
+    if (EVP_PKEY_CTX_set1_hkdf_salt(pctx, (unsigned char *)RSTRING_PTR(salt),
+				    saltlen) <= 0) {
+	EVP_PKEY_CTX_free(pctx);
+	ossl_raise(eKDF, "EVP_PKEY_CTX_set_hkdf_salt");
+    }
+    if (EVP_PKEY_CTX_set1_hkdf_key(pctx, (unsigned char *)RSTRING_PTR(ikm),
+				   ikmlen) <= 0) {
+	EVP_PKEY_CTX_free(pctx);
+	ossl_raise(eKDF, "EVP_PKEY_CTX_set_hkdf_key");
+    }
+    if (EVP_PKEY_CTX_add1_hkdf_info(pctx, (unsigned char *)RSTRING_PTR(info),
+				    infolen) <= 0) {
+	EVP_PKEY_CTX_free(pctx);
+	ossl_raise(eKDF, "EVP_PKEY_CTX_set_hkdf_info");
+    }
+    if (EVP_PKEY_derive(pctx, (unsigned char *)RSTRING_PTR(str), &len) <= 0) {
+	EVP_PKEY_CTX_free(pctx);
+	ossl_raise(eKDF, "EVP_PKEY_derive");
+    }
+    rb_str_set_len(str, (long)len);
+    EVP_PKEY_CTX_free(pctx);
+
+    return str;
+}
+#endif
+
+void
+Init_ossl_kdf(void)
+{
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+#endif
+
+    /*
+     * Document-module: OpenSSL::KDF
+     *
+     * Provides functionality of various KDFs (key derivation function).
+     *
+     * KDF is typically used for securely deriving arbitrary length symmetric
+     * keys to be used with an OpenSSL::Cipher from passwords. Another use case
+     * is for storing passwords: Due to the ability to tweak the effort of
+     * computation by increasing the iteration count, computation can be slowed
+     * down artificially in order to render possible attacks infeasible.
+     *
+     * Currently, OpenSSL::KDF provides implementations for the following KDF:
+     *
+     * * PKCS #5 PBKDF2 (Password-Based Key Derivation Function 2) in
+     *   combination with HMAC
+     * * scrypt
+     * * HKDF
+     *
+     * == Examples
+     * === Generating a 128 bit key for a Cipher (e.g. AES)
+     *   pass = "secret"
+     *   salt = OpenSSL::Random.random_bytes(16)
+     *   iter = 20_000
+     *   key_len = 16
+     *   key = OpenSSL::KDF.pbkdf2_hmac(pass, salt: salt, iterations: iter,
+     *                                  length: key_len, hash: "sha1")
+     *
+     * === Storing Passwords
+     *   pass = "secret"
+     *   # store this with the generated value
+     *   salt = OpenSSL::Random.random_bytes(16)
+     *   iter = 20_000
+     *   hash = OpenSSL::Digest::SHA256.new
+     *   len = hash.digest_length
+     *   # the final value to be stored
+     *   value = OpenSSL::KDF.pbkdf2_hmac(pass, salt: salt, iterations: iter,
+     *                                    length: len, hash: hash)
+     *
+     * == Important Note on Checking Passwords
+     * When comparing passwords provided by the user with previously stored
+     * values, a common mistake made is comparing the two values using "==".
+     * Typically, "==" short-circuits on evaluation, and is therefore
+     * vulnerable to timing attacks. The proper way is to use a method that
+     * always takes the same amount of time when comparing two values, thus
+     * not leaking any information to potential attackers. To compare two
+     * values, the following could be used:
+     *
+     *   def eql_time_cmp(a, b)
+     *     unless a.length == b.length
+     *       return false
+     *     end
+     *     cmp = b.bytes
+     *     result = 0
+     *     a.bytes.each_with_index {|c,i|
+     *       result |= c ^ cmp[i]
+     *     }
+     *     result == 0
+     *   end
+     *
+     * Please note that the premature return in case of differing lengths
+     * typically does not leak valuable information - when using PBKDF2, the
+     * length of the values to be compared is of fixed size.
+     */
+    mKDF = rb_define_module_under(mOSSL, "KDF");
+    /*
+     * Generic exception class raised if an error occurs in OpenSSL::KDF module.
+     */
+    eKDF = rb_define_class_under(mKDF, "KDFError", eOSSLError);
+
+    rb_define_module_function(mKDF, "pbkdf2_hmac", kdf_pbkdf2_hmac, -1);
+#if defined(HAVE_EVP_PBE_SCRYPT)
+    rb_define_module_function(mKDF, "scrypt", kdf_scrypt, -1);
+#endif
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+    rb_define_module_function(mKDF, "hkdf", kdf_hkdf, -1);
+#endif
+}
diff --git a/ext/openssl/ossl_kdf.h b/ext/openssl/ossl_kdf.h
new file mode 100644
index 0000000000..b6503f8d9d
--- /dev/null
+++ b/ext/openssl/ossl_kdf.h
@@ -0,0 +1,6 @@
+#if !defined(OSSL_KDF_H)
+#define OSSL_KDF_H
+
+void Init_ossl_kdf(void);
+
+#endif
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
index bf828cbb83..6f61e61bf5 100644
--- a/ext/openssl/ossl_ns_spki.c
+++ b/ext/openssl/ossl_ns_spki.c
@@ -1,23 +1,24 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define WrapSPKI(klass, obj, spki) do { \
+#define NewSPKI(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_netscape_spki_type, 0)
+#define SetSPKI(obj, spki) do { \
     if (!(spki)) { \
 	ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, NETSCAPE_SPKI_free, (spki)); \
+    RTYPEDDATA_DATA(obj) = (spki); \
 } while (0)
 #define GetSPKI(obj, spki) do { \
-    Data_Get_Struct((obj), NETSCAPE_SPKI, (spki)); \
+    TypedData_Get_Struct((obj), NETSCAPE_SPKI, &ossl_netscape_spki_type, (spki)); \
     if (!(spki)) { \
 	ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
     } \
@@ -37,20 +38,43 @@ 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);
     }
-    WrapSPKI(klass, obj, spki);
+    SetSPKI(obj, spki);
 
     return obj;
 }
 
+/*
+ * call-seq:
+ *    SPKI.new([request]) => spki
+ *
+ * === Parameters
+ * * _request_ - optional raw request, either in PEM or DER format.
+ */
 static VALUE
 ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -62,19 +86,25 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
     }
     StringValue(buffer);
-    if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING_PTR(buffer), -1))) {
+    if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING_PTR(buffer), RSTRING_LENINT(buffer)))) {
+	ossl_clear_error();
 	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));
-    DATA_PTR(self) = spki;
-    ERR_clear_error();
+    SetSPKI(self, spki);
 
     return self;
 }
 
+/*
+ * call-seq:
+ *    spki.to_der => DER-encoded string
+ *
+ * Returns the DER encoding of this SPKI.
+ */
 static VALUE
 ossl_spki_to_der(VALUE self)
 {
@@ -95,6 +125,12 @@ ossl_spki_to_der(VALUE self)
     return str;
 }
 
+/*
+ * call-seq:
+ *    spki.to_pem => PEM-encoded string
+ *
+ * Returns the PEM encoding of this SPKI.
+ */
 static VALUE
 ossl_spki_to_pem(VALUE self)
 {
@@ -111,13 +147,18 @@ ossl_spki_to_pem(VALUE self)
     return str;
 }
 
+/*
+ * call-seq:
+ *    spki.to_text => string
+ *
+ * Returns a textual representation of this SPKI, useful for debugging
+ * purposes.
+ */
 static VALUE
 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()))) {
@@ -127,13 +168,17 @@ 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 str;
+    return ossl_membio2str(out);
 }
 
+/*
+ * call-seq:
+ *    spki.public_key => pkey
+ *
+ * Returns the public key associated with the SPKI, an instance of
+ * OpenSSL::PKey.
+ */
 static VALUE
 ossl_spki_get_public_key(VALUE self)
 {
@@ -148,19 +193,37 @@ ossl_spki_get_public_key(VALUE self)
     return ossl_pkey_new(pkey); /* NO DUP - OK */
 }
 
+/*
+ * call-seq:
+ *    spki.public_key = pub => pkey
+ *
+ * === Parameters
+ * * _pub_ - the public key to be set for this instance
+ *
+ * Sets the public key to be associated with the SPKI, an instance of
+ * OpenSSL::PKey. This should be the public key corresponding to the
+ * private key used for signing the SPKI.
+ */
 static VALUE
 ossl_spki_set_public_key(VALUE self, VALUE key)
 {
     NETSCAPE_SPKI *spki;
+    EVP_PKEY *pkey;
 
     GetSPKI(self, spki);
-    if (!NETSCAPE_SPKI_set_pubkey(spki, GetPKeyPtr(key))) { /* NO NEED TO DUP */
-	ossl_raise(eSPKIError, NULL);
-    }
-
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
+    if (!NETSCAPE_SPKI_set_pubkey(spki, pkey))
+	ossl_raise(eSPKIError, "NETSCAPE_SPKI_set_pubkey");
     return key;
 }
 
+/*
+ * call-seq:
+ *    spki.challenge => string
+ *
+ * Returns the challenge string associated with this SPKI.
+ */
 static VALUE
 ossl_spki_get_challenge(VALUE self)
 {
@@ -176,6 +239,16 @@ ossl_spki_get_challenge(VALUE self)
 		      spki->spkac->challenge->length);
 }
 
+/*
+ * call-seq:
+ *    spki.challenge = str => string
+ *
+ * === Parameters
+ * * _str_ - the challenge string to be set for this instance
+ *
+ * Sets the challenge to be associated with the SPKI. May be used by the
+ * server, e.g. to prevent replay.
+ */
 static VALUE
 ossl_spki_set_challenge(VALUE self, VALUE str)
 {
@@ -191,6 +264,19 @@ ossl_spki_set_challenge(VALUE self, VALUE str)
     return str;
 }
 
+/*
+ * call-seq:
+ *    spki.sign(key, digest) => spki
+ *
+ * === Parameters
+ * * _key_ - the private key to be used for signing this instance
+ * * _digest_ - the digest to be used for signing this instance
+ *
+ * To sign an SPKI, the private key corresponding to the public key set
+ * for this instance should be used, in addition to a digest algorithm in
+ * the form of an OpenSSL::Digest. The private key should be an instance of
+ * OpenSSL::PKey.
+ */
 static VALUE
 ossl_spki_sign(VALUE self, VALUE key, VALUE digest)
 {
@@ -199,7 +285,7 @@ ossl_spki_sign(VALUE self, VALUE key, VALUE digest)
     const EVP_MD *md;
 
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
+    md = ossl_evp_get_digestbyname(digest);
     GetSPKI(self, spki);
     if (!NETSCAPE_SPKI_sign(spki, pkey, md)) {
 	ossl_raise(eSPKIError, NULL);
@@ -209,31 +295,94 @@ ossl_spki_sign(VALUE self, VALUE key, VALUE digest)
 }
 
 /*
- * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
+ * call-seq:
+ *    spki.verify(key) => boolean
+ *
+ * === Parameters
+ * * _key_ - the public key to be used for verifying the SPKI signature
+ *
+ * Returns +true+ if the signature is valid, +false+ otherwise. To verify an
+ * SPKI, the public key contained within the SPKI should be used.
  */
 static VALUE
 ossl_spki_verify(VALUE self, VALUE key)
 {
     NETSCAPE_SPKI *spki;
+    EVP_PKEY *pkey;
 
     GetSPKI(self, spki);
-    switch (NETSCAPE_SPKI_verify(spki, GetPKeyPtr(key))) { /* NO NEED TO DUP */
-    case 0:
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
+    switch (NETSCAPE_SPKI_verify(spki, pkey)) {
+      case 0:
+	ossl_clear_error();
 	return Qfalse;
-    case 1:
+      case 1:
 	return Qtrue;
-    default:
-	ossl_raise(eSPKIError, NULL);
+      default:
+	ossl_raise(eSPKIError, "NETSCAPE_SPKI_verify");
     }
-    return Qnil; /* dummy */
 }
 
-/*
- * NETSCAPE_SPKI init
+/* Document-class: OpenSSL::Netscape::SPKI
+ *
+ * A Simple Public Key Infrastructure implementation (pronounced "spooky").
+ * The structure is defined as
+ *   PublicKeyAndChallenge ::= SEQUENCE {
+ *     spki SubjectPublicKeyInfo,
+ *     challenge IA5STRING
+ *   }
+ *
+ *   SignedPublicKeyAndChallenge ::= SEQUENCE {
+ *     publicKeyAndChallenge PublicKeyAndChallenge,
+ *     signatureAlgorithm AlgorithmIdentifier,
+ *     signature BIT STRING
+ *   }
+ * where the definitions of SubjectPublicKeyInfo and AlgorithmIdentifier can
+ * be found in RFC5280. SPKI is typically used in browsers for generating
+ * a public/private key pair and a subsequent certificate request, using
+ * the HTML <keygen> element.
+ *
+ * == Examples
+ *
+ * === Creating an SPKI
+ *   key = OpenSSL::PKey::RSA.new 2048
+ *   spki = OpenSSL::Netscape::SPKI.new
+ *   spki.challenge = "RandomChallenge"
+ *   spki.public_key = key.public_key
+ *   spki.sign(key, OpenSSL::Digest::SHA256.new)
+ *   #send a request containing this to a server generating a certificate
+ * === Verifying an SPKI request
+ *   request = #...
+ *   spki = OpenSSL::Netscape::SPKI.new request
+ *   unless spki.verify(spki.public_key)
+ *     # signature is invalid
+ *   end
+ *   #proceed
  */
+
+/* Document-module: OpenSSL::Netscape
+ *
+ * OpenSSL::Netscape is a namespace for SPKI (Simple Public Key
+ * Infrastructure) which implements Signed Public Key and Challenge.
+ * See {RFC 2692}[http://tools.ietf.org/html/rfc2692] and {RFC
+ * 2693}[http://tools.ietf.org/html/rfc2692] for details.
+ */
+
+/* Document-class: OpenSSL::Netscape::SPKIError
+ *
+ * Generic Exception class that is raised if an error occurs during an
+ * operation on an instance of OpenSSL::Netscape::SPKI.
+ */
+
 void
-Init_ossl_ns_spki()
+Init_ossl_ns_spki(void)
 {
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+#endif
+
     mNetscape = rb_define_module_under(mOSSL, "Netscape");
 
     eSPKIError = rb_define_class_under(mNetscape, "SPKIError", eOSSLError);
@@ -254,4 +403,3 @@ Init_ossl_ns_spki()
     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 9977035a9c..62ba8cb163 100644
--- a/ext/openssl/ossl_ns_spki.h
+++ b/ext/openssl/ossl_ns_spki.h
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_NS_SPKI_H_)
@@ -18,4 +17,3 @@ 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 e82c2d859a..c0237791da 100644
--- a/ext/openssl/ossl_ocsp.c
+++ b/ext/openssl/ossl_ocsp.c
@@ -1,85 +1,158 @@
 /*
- * $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 licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#if defined(OSSL_OCSP_ENABLED)
+#if !defined(OPENSSL_NO_OCSP)
 
-#define WrapOCSPReq(klass, obj, req) do { \
+#define NewOCSPReq(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_ocsp_request_type, 0)
+#define SetOCSPReq(obj, req) do { \
     if(!(req)) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
-    (obj) = Data_Wrap_Struct((klass), 0, OCSP_REQUEST_free, (req)); \
+    RTYPEDDATA_DATA(obj) = (req); \
 } while (0)
 #define GetOCSPReq(obj, req) do { \
-    Data_Get_Struct((obj), OCSP_REQUEST, (req)); \
+    TypedData_Get_Struct((obj), OCSP_REQUEST, &ossl_ocsp_request_type, (req)); \
     if(!(req)) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
 } while (0)
-#define SafeGetOCSPReq(obj, req) do { \
-    OSSL_Check_Kind((obj), cOCSPReq); \
-    GetOCSPReq((obj), (req)); \
-} while (0)
 
-#define WrapOCSPRes(klass, obj, res) do { \
+#define NewOCSPRes(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_ocsp_response_type, 0)
+#define SetOCSPRes(obj, res) do { \
     if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
-    (obj) = Data_Wrap_Struct((klass), 0, OCSP_RESPONSE_free, (res)); \
+    RTYPEDDATA_DATA(obj) = (res); \
 } while (0)
 #define GetOCSPRes(obj, res) do { \
-    Data_Get_Struct((obj), OCSP_RESPONSE, (res)); \
+    TypedData_Get_Struct((obj), OCSP_RESPONSE, &ossl_ocsp_response_type, (res)); \
     if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
 } while (0)
-#define SafeGetOCSPRes(obj, res) do { \
-    OSSL_Check_Kind((obj), cOCSPRes); \
-    GetOCSPRes((obj), (res)); \
-} while (0)
 
-#define WrapOCSPBasicRes(klass, obj, res) do { \
+#define NewOCSPBasicRes(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_ocsp_basicresp_type, 0)
+#define SetOCSPBasicRes(obj, res) do { \
     if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
-    (obj) = Data_Wrap_Struct((klass), 0, OCSP_BASICRESP_free, (res)); \
+    RTYPEDDATA_DATA(obj) = (res); \
 } while (0)
 #define GetOCSPBasicRes(obj, res) do { \
-    Data_Get_Struct((obj), OCSP_BASICRESP, (res)); \
+    TypedData_Get_Struct((obj), OCSP_BASICRESP, &ossl_ocsp_basicresp_type, (res)); \
     if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
 } while (0)
-#define SafeGetOCSPBasicRes(obj, res) do { \
-    OSSL_Check_Kind((obj), cOCSPBasicRes); \
-    GetOCSPBasicRes((obj), (res)); \
+
+#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 WrapOCSPCertId(klass, obj, cid) do { \
+#define NewOCSPCertId(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_ocsp_certid_type, 0)
+#define SetOCSPCertId(obj, cid) do { \
     if(!(cid)) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
-    (obj) = Data_Wrap_Struct((klass), 0, OCSP_CERTID_free, (cid)); \
+    RTYPEDDATA_DATA(obj) = (cid); \
 } while (0)
 #define GetOCSPCertId(obj, cid) do { \
-    Data_Get_Struct((obj), OCSP_CERTID, (cid)); \
+    TypedData_Get_Struct((obj), OCSP_CERTID, &ossl_ocsp_certid_type, (cid)); \
     if(!(cid)) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
 } while (0)
-#define SafeGetOCSPCertId(obj, cid) do { \
-    OSSL_Check_Kind((obj), cOCSPCertId); \
-    GetOCSPCertId((obj), (cid)); \
-} while (0)
 
 VALUE mOCSP;
 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;
-    WrapOCSPCertId(cOCSPCertId, obj, cid);
+    VALUE obj = NewOCSPCertId(cOCSPCertId);
+    SetOCSPCertId(obj, cid);
     return obj;
 }
 
@@ -92,35 +165,76 @@ ossl_ocspreq_alloc(VALUE klass)
     OCSP_REQUEST *req;
     VALUE obj;
 
+    obj = NewOCSPReq(klass);
     if (!(req = OCSP_REQUEST_new()))
 	ossl_raise(eOCSPError, NULL);
-    WrapOCSPReq(klass, obj, req);
+    SetOCSPReq(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);
+    GetOCSPReq(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
+ *   OpenSSL::OCSP::Request.new(request_der) -> request
+ *
+ * Creates a new OpenSSL::OCSP::Request.  The request may be created empty or
+ * from a _request_der_ string.
+ */
+
+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)){
-	OCSP_REQUEST *req = DATA_PTR(self), *x;
+	GetOCSPReq(self, req);
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
-	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");
-	}
+	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);
     }
 
     return self;
 }
 
+/*
+ * call-seq:
+ *   request.add_nonce(nonce = nil) -> request
+ *
+ * Adds a _nonce_ to the OCSP request.  If no nonce is given a random one will
+ * be generated.
+ *
+ * The nonce is used to prevent replay attacks but some servers do not support
+ * it.
+ */
+
 static VALUE
 ossl_ocspreq_add_nonce(int argc, VALUE *argv, VALUE self)
 {
@@ -143,18 +257,25 @@ ossl_ocspreq_add_nonce(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-/* Check nonce validity in a request and response.
- * Return value reflects result:
- *  1: nonces present and equal.
- *  2: nonces both absent.
- *  3: nonce present in response only.
- *  0: nonces both present and not equal.
- * -1: nonce in request only.
+/*
+ * call-seq:
+ *   request.check_nonce(response) -> result
+ *
+ * Checks the nonce validity for this request and _response_.
+ *
+ * The return value is one of the following:
+ *
+ * -1 :: nonce in request only.
+ *  0 :: nonces both present and not equal.
+ *  1 :: nonces present and equal.
+ *  2 :: nonces both absent.
+ *  3 :: nonce present in response only.
  *
- *  For most responders clients can check return > 0.
- *  If responder doesn't handle nonces return != 0 may be
- *  necessary. return == 0 is always an error.
+ * For most responses, clients can check _result_ > 0.  If a responder doesn't
+ * handle nonces <code>result.nonzero?</code> may be necessary.  A result of
+ * <code>0</code> is always an error.
  */
+
 static VALUE
 ossl_ocspreq_check_nonce(VALUE self, VALUE basic_resp)
 {
@@ -163,26 +284,45 @@ ossl_ocspreq_check_nonce(VALUE self, VALUE basic_resp)
     int res;
 
     GetOCSPReq(self, req);
-    SafeGetOCSPBasicRes(basic_resp, bs);
+    GetOCSPBasicRes(basic_resp, bs);
     res = OCSP_check_nonce(req, bs);
 
     return INT2NUM(res);
 }
 
+/*
+ * call-seq:
+ *   request.add_certid(certificate_id) -> request
+ *
+ * Adds _certificate_id_ to the request.
+ */
+
 static VALUE
 ossl_ocspreq_add_certid(VALUE self, VALUE certid)
 {
     OCSP_REQUEST *req;
-    OCSP_CERTID *id;
+    OCSP_CERTID *id, *id_new;
 
     GetOCSPReq(self, req);
     GetOCSPCertId(certid, id);
-    if(!OCSP_request_add0_id(req, OCSP_CERTID_dup(id)))
-	ossl_raise(eOCSPError, NULL);
+
+    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");
+    }
 
     return self;
 }
 
+/*
+ * call-seq:
+ *   request.certid -> [certificate_id, ...]
+ *
+ * Returns all certificate IDs in this request.
+ */
+
 static VALUE
 ossl_ocspreq_get_certid(VALUE self)
 {
@@ -197,43 +337,78 @@ 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);
-	WrapOCSPCertId(cOCSPCertId, tmp, id);
+	SetOCSPCertId(tmp, id);
 	rb_ary_push(ary, tmp);
     }
 
     return ary;
 }
 
+/*
+ * call-seq:
+ *   request.sign(cert, key, certs = nil, flags = 0, digest = nil) -> 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_ is a bitwise OR of the following constants:
+ *
+ * OpenSSL::OCSP::NOCERTS::
+ *   Don't include any certificates in the request. _certs_ will be ignored.
+ */
 static VALUE
 ossl_ocspreq_sign(int argc, VALUE *argv, VALUE self)
 {
-    VALUE signer_cert, signer_key, certs, flags;
+    VALUE signer_cert, signer_key, certs, flags, digest;
     OCSP_REQUEST *req;
     X509 *signer;
     EVP_PKEY *key;
-    STACK_OF(X509) *x509s;
-    unsigned long flg;
+    STACK_OF(X509) *x509s = NULL;
+    unsigned long flg = 0;
+    const EVP_MD *md;
     int ret;
 
-    rb_scan_args(argc, argv, "22", &signer_cert, &signer_key, &certs, &flags);
+    rb_scan_args(argc, argv, "23", &signer_cert, &signer_key, &certs, &flags, &digest);
+    GetOCSPReq(self, req);
     signer = GetX509CertPtr(signer_cert);
     key = GetPrivPKeyPtr(signer_key);
-    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);
+    if (!NIL_P(flags))
+	flg = NUM2INT(flags);
+    if (NIL_P(digest))
+	md = EVP_sha1();
+    else
+	md = ossl_evp_get_digestbyname(digest);
+    if (NIL_P(certs))
+	flg |= OCSP_NOCERTS;
+    else
+	x509s = ossl_x509_ary2sk(certs);
+
+    ret = OCSP_request_sign(req, signer, key, md, 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
+ *
+ * Verifies this request using the given _certificates_ and _store_.
+ * _certificates_ is an array of OpenSSL::X509::Certificate, _store_ is an
+ * OpenSSL::X509::Store.
+ *
+ * Note that +false+ is returned if the request does not have a signature.
+ * Use #signed? to check whether the request is signed or not.
+ */
+
 static VALUE
 ossl_ocspreq_verify(int argc, VALUE *argv, VALUE self)
 {
@@ -244,17 +419,22 @@ 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) rb_warn("%s", ERR_error_string(ERR_peek_error(), NULL));
+    if (result <= 0)
+	ossl_clear_error();
 
-    return result ? Qtrue : Qfalse;
+    return result > 0 ? Qtrue : Qfalse;
 }
 
+/*
+ * Returns this request as a DER-encoded string
+ */
+
 static VALUE
 ossl_ocspreq_to_der(VALUE self)
 {
@@ -276,8 +456,31 @@ ossl_ocspreq_to_der(VALUE self)
 }
 
 /*
+ * call-seq:
+ *    request.signed? -> true or false
+ *
+ * Returns +true+ if the request is signed, +false+ otherwise. Note that the
+ * validity of the signature is *not* checked. Use #verify to verify that.
+ */
+static VALUE
+ossl_ocspreq_signed_p(VALUE self)
+{
+    OCSP_REQUEST *req;
+
+    GetOCSPReq(self, req);
+    return OCSP_request_is_signed(req) ? Qtrue : Qfalse;
+}
+
+/*
  * OCSP::Response
  */
+
+/* call-seq:
+ *   OpenSSL::OCSP::Response.create(status, basic_response = nil) -> response
+ *
+ * Creates an OpenSSL::OCSP::Response from _status_ and _basic_response_.
+ */
+
 static VALUE
 ossl_ocspres_s_create(VALUE klass, VALUE status, VALUE basic_resp)
 {
@@ -288,9 +491,10 @@ 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);
-    WrapOCSPRes(klass, obj, res);
+    SetOCSPRes(obj, res);
 
     return obj;
 }
@@ -301,35 +505,72 @@ ossl_ocspres_alloc(VALUE klass)
     OCSP_RESPONSE *res;
     VALUE obj;
 
+    obj = NewOCSPRes(klass);
     if(!(res = OCSP_RESPONSE_new()))
 	ossl_raise(eOCSPError, NULL);
-    WrapOCSPRes(klass, obj, res);
+    SetOCSPRes(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);
+    GetOCSPRes(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
+ *   OpenSSL::OCSP::Response.new(response_der) -> response
+ *
+ * Creates a new OpenSSL::OCSP::Response.  The response may be created empty or
+ * from a _response_der_ string.
+ */
+
+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)){
-	OCSP_RESPONSE *res = DATA_PTR(self), *x;
+	GetOCSPRes(self, res);
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
 	p = (unsigned char *)RSTRING_PTR(arg);
-	x = d2i_OCSP_RESPONSE(&res, &p, RSTRING_LEN(arg));
-	DATA_PTR(self) = res;
-	if(!x){
-	    ossl_raise(eOCSPError, "cannot load DER encoded response");
-	}
+	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);
     }
 
     return self;
 }
 
+/*
+ * call-seq:
+ *   response.status -> Integer
+ *
+ * Returns the status of the response.
+ */
+
 static VALUE
 ossl_ocspres_status(VALUE self)
 {
@@ -342,6 +583,13 @@ ossl_ocspres_status(VALUE self)
     return INT2NUM(st);
 }
 
+/*
+ * call-seq:
+ *   response.status_string -> String
+ *
+ * Returns a status string for the response.
+ */
+
 static VALUE
 ossl_ocspres_status_string(VALUE self)
 {
@@ -354,6 +602,13 @@ ossl_ocspres_status_string(VALUE self)
     return rb_str_new2(OCSP_response_status_str(st));
 }
 
+/*
+ * call-seq:
+ *   response.basic
+ *
+ * Returns a BasicResponse for this response
+ */
+
 static VALUE
 ossl_ocspres_get_basic(VALUE self)
 {
@@ -362,13 +617,21 @@ ossl_ocspres_get_basic(VALUE self)
     VALUE ret;
 
     GetOCSPRes(self, res);
+    ret = NewOCSPBasicRes(cOCSPBasicRes);
     if(!(bs = OCSP_response_get1_basic(res)))
 	return Qnil;
-    WrapOCSPBasicRes(cOCSPBasicRes, ret, bs);
+    SetOCSPBasicRes(ret, bs);
 
     return ret;
 }
 
+/*
+ * call-seq:
+ *   response.to_der -> String
+ *
+ * Returns this response as a DER-encoded string.
+ */
+
 static VALUE
 ossl_ocspres_to_der(VALUE self)
 {
@@ -398,19 +661,72 @@ ossl_ocspbres_alloc(VALUE klass)
     OCSP_BASICRESP *bs;
     VALUE obj;
 
+    obj = NewOCSPBasicRes(klass);
     if(!(bs = OCSP_BASICRESP_new()))
 	ossl_raise(eOCSPError, NULL);
-    WrapOCSPBasicRes(klass, obj, bs);
+    SetOCSPBasicRes(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);
+    GetOCSPBasicRes(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
+ *
+ * Creates a new BasicResponse. If _der_string_ is given, decodes _der_string_
+ * as DER.
+ */
+
+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;
 }
 
+/*
+ * call-seq:
+ *   basic_response.copy_nonce(request) -> Integer
+ *
+ * Copies the nonce from _request_ into this response.  Returns 1 on success
+ * and 0 on failure.
+ */
+
 static VALUE
 ossl_ocspbres_copy_nonce(VALUE self, VALUE request)
 {
@@ -419,12 +735,20 @@ ossl_ocspbres_copy_nonce(VALUE self, VALUE request)
     int ret;
 
     GetOCSPBasicRes(self, bs);
-    SafeGetOCSPReq(request, req);
+    GetOCSPReq(request, req);
     ret = OCSP_copy_nonce(bs, req);
 
     return INT2NUM(ret);
 }
 
+/*
+ * call-seq:
+ *   basic_response.add_nonce(nonce = nil)
+ *
+ * Adds _nonce_ to this response.  If no nonce was provided a random nonce
+ * will be added.
+ */
+
 static VALUE
 ossl_ocspbres_add_nonce(int argc, VALUE *argv, VALUE self)
 {
@@ -448,6 +772,49 @@ ossl_ocspbres_add_nonce(int argc, VALUE *argv, VALUE 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
+ *
+ * _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.
+ *
+ * _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.
+ */
+static VALUE
 ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
 			 VALUE reason, VALUE revtime,
 			 VALUE thisupd, VALUE nextupd, VALUE ext)
@@ -455,36 +822,37 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
     OCSP_BASICRESP *bs;
     OCSP_SINGLERESP *single;
     OCSP_CERTID *id;
-    int st, rsn;
-    ASN1_TIME *ths, *nxt, *rev;
-    int error, i, rstatus = 0;
+    ASN1_TIME *ths = NULL, *nxt = NULL, *rev = NULL;
+    int st, rsn = 0, error = 0, rstatus = 0;
+    long i;
     VALUE tmp;
 
+    GetOCSPBasicRes(self, bs);
+    GetOCSPCertId(cid, id);
     st = NUM2INT(status);
-    rsn = NIL_P(status) ? 0 : NUM2INT(reason);
-    if(!NIL_P(ext)){
-	/* All ary's members should be X509Extension */
-	Check_Type(ext, T_ARRAY);
+    if (!NIL_P(ext)) { /* All ext's members must be X509::Extension */
+	ext = rb_check_array_type(ext);
 	for (i = 0; i < RARRAY_LEN(ext); i++)
-	    OSSL_Check_Kind(RARRAY_PTR(ext)[i], cX509Ext);
+	    OSSL_Check_Kind(RARRAY_AREF(ext, i), cX509Ext);
     }
 
-    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));
+    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;
     }
-    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;
@@ -492,16 +860,13 @@ 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 = DupX509ExtPtr(RARRAY_PTR(ext)[i]);
+	    x509ext = GetX509ExtPtr(RARRAY_AREF(ext, i));
 	    if(!OCSP_SINGLERESP_add_ext(single, x509ext, -1)){
-		X509_EXTENSION_free(x509ext);
 		error = 1;
 		goto err;
 	    }
-	    X509_EXTENSION_free(x509ext);
 	}
     }
 
@@ -515,6 +880,18 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
     return self;
 }
 
+/*
+ * call-seq:
+ *   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::Extension.
+ *
+ * This should be superseded by BasicResponse#responses and #find_response that
+ * return SingleResponse.
+ */
 static VALUE
 ossl_ocspbres_get_status(VALUE self)
 {
@@ -538,7 +915,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(single->certId)))
+	if(!(cid = OCSP_CERTID_dup((OCSP_CERTID *)OCSP_SINGLERESP_get0_id(single)))) /* FIXME */
 	    ossl_raise(eOCSPError, NULL);
 	ary = rb_ary_new();
 	rb_ary_push(ary, ossl_ocspcertid_new(cid));
@@ -560,58 +937,519 @@ 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;
+
+    GetOCSPCertId(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.
+ *
+ * _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
+ */
+
 static VALUE
 ossl_ocspbres_sign(int argc, VALUE *argv, VALUE self)
 {
-    VALUE signer_cert, signer_key, certs, flags;
+    VALUE signer_cert, signer_key, certs, flags, digest;
     OCSP_BASICRESP *bs;
     X509 *signer;
     EVP_PKEY *key;
-    STACK_OF(X509) *x509s;
-    unsigned long flg;
+    STACK_OF(X509) *x509s = NULL;
+    unsigned long flg = 0;
+    const EVP_MD *md;
     int ret;
 
-    rb_scan_args(argc, argv, "22", &signer_cert, &signer_key, &certs, &flags);
+    rb_scan_args(argc, argv, "23", &signer_cert, &signer_key, &certs, &flags, &digest);
+    GetOCSPBasicRes(self, bs);
     signer = GetX509CertPtr(signer_cert);
     key = GetPrivPKeyPtr(signer_key);
-    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    if(NIL_P(certs)){
-	x509s = sk_X509_new_null();
+    if (!NIL_P(flags))
+	flg = NUM2INT(flags);
+    if (NIL_P(digest))
+	md = EVP_sha1();
+    else
+	md = ossl_evp_get_digestbyname(digest);
+    if (NIL_P(certs))
 	flg |= OCSP_NOCERTS;
-    }
-    else{
+    else
 	x509s = ossl_x509_ary2sk(certs);
-    }
-    GetOCSPBasicRes(self, bs);
-    ret = OCSP_basic_sign(bs, signer, key, EVP_sha1(), x509s, flg);
+
+    ret = OCSP_basic_sign(bs, signer, key, md, 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
+ *
+ * Verifies the signature of the response using the given _certificates_ and
+ * _store_. This works in the similar way as OpenSSL::OCSP::Request#verify.
+ */
 static VALUE
 ossl_ocspbres_verify(int argc, VALUE *argv, VALUE self)
 {
-    VALUE certs, store, flags, result;
+    VALUE certs, store, flags;
     OCSP_BASICRESP *bs;
     STACK_OF(X509) *x509s;
     X509_STORE *x509st;
-    int flg;
+    int flg, result;
 
     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);
-    GetOCSPBasicRes(self, bs);
-    result = OCSP_basic_verify(bs, x509s, x509st, flg) > 0 ? Qtrue : Qfalse;
+#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
     sk_X509_pop_free(x509s, X509_free);
-    if(!result) rb_warn("%s", ERR_error_string(ERR_peek_error(), NULL));
+    if (result <= 0)
+	ossl_clear_error();
 
-    return result;
+    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;
+
+    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;
+}
+
+/*
+ * 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);
+    GetOCSPSingleRes(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_ seconds 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");
+    if (!time)
+	return Qnil;
+
+    return asn1time_to_time(time);
+}
+
+/*
+ * 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");
+    if (!time)
+	return Qnil;
+
+    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");
+    if (!time)
+	return Qnil;
+
+    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
@@ -620,43 +1458,89 @@ ossl_ocspcid_alloc(VALUE klass)
     OCSP_CERTID *id;
     VALUE obj;
 
+    obj = NewOCSPCertId(klass);
     if(!(id = OCSP_CERTID_new()))
 	ossl_raise(eOCSPError, NULL);
-    WrapOCSPCertId(klass, obj, id);
+    SetOCSPCertId(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);
+    GetOCSPCertId(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 a digest algorithm that is used
+ * to compute the hash values. This defaults to SHA-1.
+ *
+ * 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;
 
-    if (rb_scan_args(argc, argv, "21", &subject, &issuer, &digest) == 0) {
-	return self;
+    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");
     }
+    else {
+	X509 *x509s, *x509i;
+	const EVP_MD *md;
 
-    x509s = GetX509CertPtr(subject); /* NO NEED TO DUP */
-    x509i = GetX509CertPtr(issuer); /* NO NEED TO DUP */
+	x509s = GetX509CertPtr(subject); /* NO NEED TO DUP */
+	x509i = GetX509CertPtr(issuer); /* NO NEED TO DUP */
+	md = !NIL_P(digest) ? ossl_evp_get_digestbyname(digest) : NULL;
 
-    if (!NIL_P(digest)) {
-	md = GetDigestPtr(digest);
 	newid = OCSP_cert_to_id(md, x509s, x509i);
-    } else {
-	newid = OCSP_cert_to_id(NULL, x509s, x509i);
+	if (!newid)
+	    ossl_raise(eOCSPError, "OCSP_cert_to_id");
     }
-    if(!newid)
-	ossl_raise(eOCSPError, NULL);
-    GetOCSPCertId(self, id);
+
+    SetOCSPCertId(self, newid);
     OCSP_CERTID_free(id);
-    RDATA(self)->data = newid;
 
     return self;
 }
 
+/*
+ * call-seq:
+ *   certificate_id.cmp(other) -> true or false
+ *
+ * Compares this certificate id with _other_ and returns +true+ if they are the
+ * same.
+ */
 static VALUE
 ossl_ocspcid_cmp(VALUE self, VALUE other)
 {
@@ -664,12 +1548,20 @@ ossl_ocspcid_cmp(VALUE self, VALUE other)
     int result;
 
     GetOCSPCertId(self, id);
-    SafeGetOCSPCertId(other, id2);
+    GetOCSPCertId(other, id2);
     result = OCSP_id_cmp(id, id2);
 
     return (result == 0) ? Qtrue : Qfalse;
 }
 
+/*
+ * call-seq:
+ *   certificate_id.cmp_issuer(other) -> true or false
+ *
+ * Compares this certificate id's issuer with _other_ and returns +true+ if
+ * they are the same.
+ */
+
 static VALUE
 ossl_ocspcid_cmp_issuer(VALUE self, VALUE other)
 {
@@ -677,110 +1569,450 @@ ossl_ocspcid_cmp_issuer(VALUE self, VALUE other)
     int result;
 
     GetOCSPCertId(self, id);
-    SafeGetOCSPCertId(other, id2);
+    GetOCSPCertId(other, id2);
     result = OCSP_id_issuer_cmp(id, id2);
 
     return (result == 0) ? Qtrue : Qfalse;
 }
 
+/*
+ * 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(id->serialNumber);
+    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
+ *
+ * Returns the issuerKeyHash of this certificate ID, the hash of the issuer's
+ * public key.
+ */
+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)
+{
+    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;
 }
 
 void
-Init_ossl_ocsp()
+Init_ossl_ocsp(void)
 {
+#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.
+     *
+     * Creating and sending an OCSP request requires a subject certificate
+     * that contains an OCSP URL in an authorityInfoAccess extension and the
+     * issuer certificate for the subject certificate.  First, load the issuer
+     * and subject certificates:
+     *
+     *   subject = OpenSSL::X509::Certificate.new subject_pem
+     *   issuer  = OpenSSL::X509::Certificate.new issuer_pem
+     *
+     * To create the request we need to create a certificate ID for the
+     * subject certificate so the CA knows which certificate we are asking
+     * about:
+     *
+     *   digest = OpenSSL::Digest::SHA1.new
+     *   certificate_id =
+     *     OpenSSL::OCSP::CertificateId.new subject, issuer, digest
+     *
+     * Then create a request and add the certificate ID to it:
+     *
+     *   request = OpenSSL::OCSP::Request.new
+     *   request.add_certid certificate_id
+     *
+     * Adding a nonce to the request protects against replay attacks but not
+     * all CA process the nonce.
+     *
+     *   request.add_nonce
+     *
+     * To submit the request to the CA for verification we need to extract the
+     * OCSP URI from the subject certificate:
+     *
+     *   authority_info_access = subject.extensions.find do |extension|
+     *     extension.oid == 'authorityInfoAccess'
+     *   end
+     *
+     *   descriptions = authority_info_access.value.split "\n"
+     *   ocsp = descriptions.find do |description|
+     *     description.start_with? 'OCSP'
+     *   end
+     *
+     *   require 'uri'
+     *
+     *   ocsp_uri = URI ocsp[/URI:(.*)/, 1]
+     *
+     * To submit the request we'll POST the request to the OCSP URI (per RFC
+     * 2560).  Note that we only handle HTTP requests and don't handle any
+     * redirects in this example, so this is insufficient for serious use.
+     *
+     *   require 'net/http'
+     *
+     *   http_response =
+     *     Net::HTTP.start ocsp_uri.hostname, ocsp.port do |http|
+     *       http.post ocsp_uri.path, request.to_der,
+     *                 'content-type' => 'application/ocsp-request'
+     *   end
+     *
+     *   response = OpenSSL::OCSP::Response.new http_response.body
+     *   response_basic = response.basic
+     *
+     * First we check if the response has a valid signature.  Without a valid
+     * signature we cannot trust it.  If you get a failure here you may be
+     * missing a system certificate store or may be missing the intermediate
+     * certificates.
+     *
+     *   store = OpenSSL::X509::Store.new
+     *   store.set_default_paths
+     *
+     *   unless response_basic.verify [], store then
+     *     raise 'response is not signed by a trusted certificate'
+     *   end
+     *
+     * The response contains the status information (success/fail).  We can
+     * display the status as a string:
+     *
+     *   puts response.status_string #=> successful
+     *
+     * Next we need to know the response details to determine if the response
+     * matches our request.  First we check the nonce.  Again, not all CAs
+     * support a nonce.  See Request#check_nonce for the meanings of the
+     * return values.
+     *
+     *   p request.check_nonce basic_response #=> value from -1 to 3
+     *
+     * Then extract the status information for the certificate from the basic
+     * response.
+     *
+     *   single_response = basic_response.find_response(certificate_id)
+     *
+     *   unless single_response
+     *     raise 'basic_response does not have the status for the certificiate'
+     *   end
+     *
+     * Then check the validity. A status issued in the future must be rejected.
+     *
+     *   unless single_response.check_validity
+     *     raise 'this_update is in the future or next_update time has passed'
+     *   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'
+     *   end
+     */
+
     mOCSP = rb_define_module_under(mOSSL, "OCSP");
 
+    /*
+     * OCSP error class.
+     */
+
     eOCSPError = rb_define_class_under(mOCSP, "OCSPError", eOSSLError);
 
+    /*
+     * An OpenSSL::OCSP::Request contains the certificate information for
+     * determining if a certificate has been revoked or not.  A Request can be
+     * created for a certificate or from a DER-encoded request created
+     * elsewhere.
+     */
+
     cOCSPReq = rb_define_class_under(mOCSP, "Request", rb_cObject);
     rb_define_alloc_func(cOCSPReq, ossl_ocspreq_alloc);
+    rb_define_method(cOCSPReq, "initialize_copy", ossl_ocspreq_initialize_copy, 1);
     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);
     rb_define_method(cOCSPReq, "add_certid", ossl_ocspreq_add_certid, 1);
     rb_define_method(cOCSPReq, "certid", ossl_ocspreq_get_certid, 0);
+    rb_define_method(cOCSPReq, "signed?", ossl_ocspreq_signed_p, 0);
     rb_define_method(cOCSPReq, "sign", ossl_ocspreq_sign, -1);
     rb_define_method(cOCSPReq, "verify", ossl_ocspreq_verify, -1);
     rb_define_method(cOCSPReq, "to_der", ossl_ocspreq_to_der, 0);
 
+    /*
+     * An OpenSSL::OCSP::Response contains the status of a certificate check
+     * which is created from an OpenSSL::OCSP::Request.
+     */
+
     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_method(cOCSPRes, "initialize_copy", ossl_ocspres_initialize_copy, 1);
     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);
     rb_define_method(cOCSPRes, "basic", ossl_ocspres_get_basic, 0);
     rb_define_method(cOCSPRes, "to_der", ossl_ocspres_to_der, 0);
 
+    /*
+     * An OpenSSL::OCSP::BasicResponse contains the status of a certificate
+     * check which is created from an OpenSSL::OCSP::Request.  A
+     * BasicResponse is more detailed than a Response.
+     */
+
     cOCSPBasicRes = rb_define_class_under(mOCSP, "BasicResponse", rb_cObject);
     rb_define_alloc_func(cOCSPBasicRes, ossl_ocspbres_alloc);
+    rb_define_method(cOCSPBasicRes, "initialize_copy", ossl_ocspbres_initialize_copy, 1);
     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_method(cOCSPSingleRes, "initialize_copy", ossl_ocspsres_initialize_copy, 1);
+    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
+     * that a status check can be performed.
+     */
 
     cOCSPCertId = rb_define_class_under(mOCSP, "CertificateId", rb_cObject);
     rb_define_alloc_func(cOCSPCertId, ossl_ocspcid_alloc);
+    rb_define_method(cOCSPCertId, "initialize_copy", ossl_ocspcid_initialize_copy, 1);
     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));
+
+    /* Illegal confirmation request */
+    rb_define_const(mOCSP, "RESPONSE_STATUS_MALFORMEDREQUEST", INT2NUM(OCSP_RESPONSE_STATUS_MALFORMEDREQUEST));
+
+    /* The certificate was revoked for an unknown reason */
+    rb_define_const(mOCSP, "REVOKED_STATUS_NOSTATUS", INT2NUM(OCSP_REVOKED_STATUS_NOSTATUS));
+
+    /* You must sign the request and resubmit */
+    rb_define_const(mOCSP, "RESPONSE_STATUS_SIGREQUIRED", INT2NUM(OCSP_RESPONSE_STATUS_SIGREQUIRED));
+
+    /* Response has valid confirmations */
+    rb_define_const(mOCSP, "RESPONSE_STATUS_SUCCESSFUL", INT2NUM(OCSP_RESPONSE_STATUS_SUCCESSFUL));
+
+    /* Try again later */
+    rb_define_const(mOCSP, "RESPONSE_STATUS_TRYLATER", INT2NUM(OCSP_RESPONSE_STATUS_TRYLATER));
+
+    /* The certificate subject's name or other information changed */
+    rb_define_const(mOCSP, "REVOKED_STATUS_AFFILIATIONCHANGED", INT2NUM(OCSP_REVOKED_STATUS_AFFILIATIONCHANGED));
+
+    /* This CA certificate was revoked due to a key compromise */
+    rb_define_const(mOCSP, "REVOKED_STATUS_CACOMPROMISE", INT2NUM(OCSP_REVOKED_STATUS_CACOMPROMISE));
+
+    /* The certificate is on hold */
+    rb_define_const(mOCSP, "REVOKED_STATUS_CERTIFICATEHOLD", INT2NUM(OCSP_REVOKED_STATUS_CERTIFICATEHOLD));
+
+    /* The certificate is no longer needed */
+    rb_define_const(mOCSP, "REVOKED_STATUS_CESSATIONOFOPERATION", INT2NUM(OCSP_REVOKED_STATUS_CESSATIONOFOPERATION));
+
+    /* The certificate was revoked due to a key compromise */
+    rb_define_const(mOCSP, "REVOKED_STATUS_KEYCOMPROMISE", INT2NUM(OCSP_REVOKED_STATUS_KEYCOMPROMISE));
+
+    /* The certificate was previously on hold and should now be removed from
+     * the CRL */
+    rb_define_const(mOCSP, "REVOKED_STATUS_REMOVEFROMCRL", INT2NUM(OCSP_REVOKED_STATUS_REMOVEFROMCRL));
+
+    /* The certificate was superseded by a new certificate */
+    rb_define_const(mOCSP, "REVOKED_STATUS_SUPERSEDED", INT2NUM(OCSP_REVOKED_STATUS_SUPERSEDED));
+
+    /* Your request is unauthorized. */
+    rb_define_const(mOCSP, "RESPONSE_STATUS_UNAUTHORIZED", INT2NUM(OCSP_RESPONSE_STATUS_UNAUTHORIZED));
+
+    /* The certificate was revoked for an unspecified reason */
+    rb_define_const(mOCSP, "REVOKED_STATUS_UNSPECIFIED", INT2NUM(OCSP_REVOKED_STATUS_UNSPECIFIED));
 
-#define DefOCSPConst(x) rb_define_const(mOCSP, #x, INT2NUM(OCSP_##x))
-
-    DefOCSPConst(RESPONSE_STATUS_SUCCESSFUL);
-    DefOCSPConst(RESPONSE_STATUS_MALFORMEDREQUEST);
-    DefOCSPConst(RESPONSE_STATUS_INTERNALERROR);
-    DefOCSPConst(RESPONSE_STATUS_TRYLATER);
-    DefOCSPConst(RESPONSE_STATUS_SIGREQUIRED);
-    DefOCSPConst(RESPONSE_STATUS_UNAUTHORIZED);
-
-    DefOCSPConst(REVOKED_STATUS_NOSTATUS);
-    DefOCSPConst(REVOKED_STATUS_UNSPECIFIED);
-    DefOCSPConst(REVOKED_STATUS_KEYCOMPROMISE);
-    DefOCSPConst(REVOKED_STATUS_CACOMPROMISE);
-    DefOCSPConst(REVOKED_STATUS_AFFILIATIONCHANGED);
-    DefOCSPConst(REVOKED_STATUS_SUPERSEDED);
-    DefOCSPConst(REVOKED_STATUS_CESSATIONOFOPERATION);
-    DefOCSPConst(REVOKED_STATUS_CERTIFICATEHOLD);
-    DefOCSPConst(REVOKED_STATUS_REMOVEFROMCRL);
-
-    DefOCSPConst(NOCERTS);
-    DefOCSPConst(NOINTERN);
-    DefOCSPConst(NOSIGS);
-    DefOCSPConst(NOCHAIN);
-    DefOCSPConst(NOVERIFY);
-    DefOCSPConst(NOEXPLICIT);
-    DefOCSPConst(NOCASIGN);
-    DefOCSPConst(NODELEGATED);
-    DefOCSPConst(NOCHECKS);
-    DefOCSPConst(TRUSTOTHER);
-    DefOCSPConst(RESPID_KEY);
-    DefOCSPConst(NOTIME);
-
-#define DefOCSPVConst(x) rb_define_const(mOCSP, "V_" #x, INT2NUM(V_OCSP_##x))
-
-    DefOCSPVConst(CERTSTATUS_GOOD);
-    DefOCSPVConst(CERTSTATUS_REVOKED);
-    DefOCSPVConst(CERTSTATUS_UNKNOWN);
-    DefOCSPVConst(RESPID_NAME);
-    DefOCSPVConst(RESPID_KEY);
-}
-
-#else /* ! OSSL_OCSP_ENABLED */
+    /* Do not include certificates in the response */
+    rb_define_const(mOCSP, "NOCERTS", INT2NUM(OCSP_NOCERTS));
+
+    /* Do not search certificates contained in the response for a signer */
+    rb_define_const(mOCSP, "NOINTERN", INT2NUM(OCSP_NOINTERN));
+
+    /* Do not check the signature on the response */
+    rb_define_const(mOCSP, "NOSIGS", INT2NUM(OCSP_NOSIGS));
+
+    /* Do not verify the certificate chain on the response */
+    rb_define_const(mOCSP, "NOCHAIN", INT2NUM(OCSP_NOCHAIN));
+
+    /* Do not verify the response at all */
+    rb_define_const(mOCSP, "NOVERIFY", INT2NUM(OCSP_NOVERIFY));
+
+    /* Do not check trust */
+    rb_define_const(mOCSP, "NOEXPLICIT", INT2NUM(OCSP_NOEXPLICIT));
+
+    /* (This flag is not used by OpenSSL 1.0.1g) */
+    rb_define_const(mOCSP, "NOCASIGN", INT2NUM(OCSP_NOCASIGN));
+
+    /* (This flag is not used by OpenSSL 1.0.1g) */
+    rb_define_const(mOCSP, "NODELEGATED", INT2NUM(OCSP_NODELEGATED));
+
+    /* Do not make additional signing certificate checks */
+    rb_define_const(mOCSP, "NOCHECKS", INT2NUM(OCSP_NOCHECKS));
+
+    /* Do not verify additional certificates */
+    rb_define_const(mOCSP, "TRUSTOTHER", INT2NUM(OCSP_TRUSTOTHER));
+
+    /* Identify the response by signing the certificate key ID */
+    rb_define_const(mOCSP, "RESPID_KEY", INT2NUM(OCSP_RESPID_KEY));
+
+    /* Do not include producedAt time in response */
+    rb_define_const(mOCSP, "NOTIME", INT2NUM(OCSP_NOTIME));
+
+    /* Indicates the certificate is not revoked but does not necessarily mean
+     * the certificate was issued or that this response is within the
+     * certificate's validity interval */
+    rb_define_const(mOCSP, "V_CERTSTATUS_GOOD", INT2NUM(V_OCSP_CERTSTATUS_GOOD));
+    /* Indicates the certificate has been revoked either permanently or
+     * temporarily (on hold). */
+    rb_define_const(mOCSP, "V_CERTSTATUS_REVOKED", INT2NUM(V_OCSP_CERTSTATUS_REVOKED));
+
+    /* Indicates the responder does not know about the certificate being
+     * requested. */
+    rb_define_const(mOCSP, "V_CERTSTATUS_UNKNOWN", INT2NUM(V_OCSP_CERTSTATUS_UNKNOWN));
+
+    /* The responder ID is based on the key name. */
+    rb_define_const(mOCSP, "V_RESPID_NAME", INT2NUM(V_OCSP_RESPID_NAME));
+
+    /* The responder ID is based on the public key. */
+    rb_define_const(mOCSP, "V_RESPID_KEY", INT2NUM(V_OCSP_RESPID_KEY));
+}
+#else
 void
-Init_ossl_ocsp()
+Init_ossl_ocsp(void)
 {
 }
 #endif
diff --git a/ext/openssl/ossl_ocsp.h b/ext/openssl/ossl_ocsp.h
index 65b4f2e23f..21e2c99a2e 100644
--- a/ext/openssl/ossl_ocsp.h
+++ b/ext/openssl/ossl_ocsp.h
@@ -1,18 +1,17 @@
 /*
- * $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 licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_OCSP_H_)
 #define _OSSL_OCSP_H_
 
-#if defined(OSSL_OCSP_ENABLED)
+#if !defined(OPENSSL_NO_OCSP)
 extern VALUE mOCSP;
 extern VALUE cOPCSReq;
 extern VALUE cOPCSRes;
diff --git a/ext/openssl/ossl_pkcs12.c b/ext/openssl/ossl_pkcs12.c
index 8a5f816082..4566334481 100644
--- a/ext/openssl/ossl_pkcs12.c
+++ b/ext/openssl/ossl_pkcs12.c
@@ -1,25 +1,22 @@
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
- * $Id$
  */
 #include "ossl.h"
 
-#define WrapPKCS12(klass, obj, p12) do { \
+#define NewPKCS12(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_pkcs12_type, 0)
+
+#define SetPKCS12(obj, p12) do { \
     if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
-    (obj) = Data_Wrap_Struct((klass), 0, PKCS12_free, (p12)); \
+    RTYPEDDATA_DATA(obj) = (p12); \
 } while (0)
 
 #define GetPKCS12(obj, p12) do { \
-    Data_Get_Struct((obj), PKCS12, (p12)); \
+    TypedData_Get_Struct((obj), PKCS12, &ossl_pkcs12_type, (p12)); \
     if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
 } while (0)
 
-#define SafeGetPKCS12(obj, p12) do { \
-    OSSL_Check_Kind((obj), cPKCS12); \
-    GetPKCS12((obj), (p12)); \
-} while (0)
-
 #define ossl_pkcs12_set_key(o,v)      rb_iv_set((o), "@key", (v))
 #define ossl_pkcs12_set_cert(o,v)     rb_iv_set((o), "@certificate", (v))
 #define ossl_pkcs12_set_ca_certs(o,v) rb_iv_set((o), "@ca_certs", (v))
@@ -36,37 +33,71 @@ 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);
-    WrapPKCS12(klass, obj, p12);
+    SetPKCS12(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);
+    GetPKCS12(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]]]]]])
  *
  * === Parameters
- * * +pass+ - string
- * * +name+ - A string describing the key.
- * * +key+ - Any PKey.
- * * +cert+ - A X509::Certificate.
- * * * The public_key portion of the certificate must contain a valid public key.
- * * * The not_before and not_after fields must be filled in.
- * * +ca+ - An optional array of X509::Certificate's.
- * * +key_pbe+ - string
- * * +cert_pbe+ - string
- * * +key_iter+ - integer
- * * +mac_iter+ - integer
- * * +keytype+ - An integer representing an MSIE specific extension.
+ * * _pass_ - string
+ * * _name_ - A string describing the key.
+ * * _key_ - Any PKey.
+ * * _cert_ - A X509::Certificate.
+ *   * The public_key portion of the certificate must contain a valid public key.
+ *   * The not_before and not_after fields must be filled in.
+ * * _ca_ - An optional array of X509::Certificate's.
+ * * _key_pbe_ - string
+ * * _cert_pbe_ - string
+ * * _key_iter_ - integer
+ * * _mac_iter_ - integer
+ * * _keytype_ - An integer representing an MSIE specific extension.
  *
- * Any optional arguments may be supplied as nil to preserve the OpenSSL defaults.
+ * Any optional arguments may be supplied as +nil+ to preserve the OpenSSL defaults.
  *
  * See the OpenSSL documentation for PKCS12_create().
  */
@@ -83,19 +114,18 @@ 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 : StringValuePtr(pass);
-    friendlyname = NIL_P(name) ? NULL : StringValuePtr(name);
+    passphrase = NIL_P(pass) ? NULL : StringValueCStr(pass);
+    friendlyname = NIL_P(name) ? NULL : StringValueCStr(name);
     key = GetPKeyPtr(pkey);
     x509 = GetX509CertPtr(cert);
-    x509s = NIL_P(ca) ? NULL : ossl_x509_ary2sk(ca);
 /* TODO: make a VALUE to nid function */
     if (!NIL_P(key_nid)) {
-        if ((nkey = OBJ_txt2nid(StringValuePtr(key_nid))) == NID_undef)
-            ossl_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValuePtr(key_nid));
+        if ((nkey = OBJ_txt2nid(StringValueCStr(key_nid))) == NID_undef)
+	    ossl_raise(rb_eArgError, "Unknown PBE algorithm %"PRIsVALUE, key_nid);
     }
     if (!NIL_P(cert_nid)) {
-        if ((ncert = OBJ_txt2nid(StringValuePtr(cert_nid))) == NID_undef)
-            ossl_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValuePtr(cert_nid));
+        if ((ncert = OBJ_txt2nid(StringValueCStr(cert_nid))) == NID_undef)
+	    ossl_raise(rb_eArgError, "Unknown PBE algorithm %"PRIsVALUE, cert_nid);
     }
     if (!NIL_P(key_iter))
         kiter = NUM2INT(key_iter);
@@ -104,11 +134,13 @@ 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);
-    WrapPKCS12(cPKCS12, obj, p12);
+    SetPKCS12(obj, p12);
 
     ossl_pkcs12_set_key(obj, pkey);
     ossl_pkcs12_set_cert(obj, cert);
@@ -124,8 +156,8 @@ ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
  *    PKCS12.new(str, pass) -> pkcs12
  *
  * === Parameters
- * * +str+ - Must be a DER encoded PKCS12 string.
- * * +pass+ - string
+ * * _str_ - Must be a DER encoded PKCS12 string.
+ * * _pass_ - string
  */
 static VALUE
 ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
@@ -140,24 +172,30 @@ 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 : StringValuePtr(pass);
-    in = ossl_obj2bio(arg);
+    passphrase = NIL_P(pass) ? NULL : StringValueCStr(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");
-    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_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;
     }
 
   err:
@@ -192,8 +230,14 @@ ossl_pkcs12_to_der(VALUE self)
 }
 
 void
-Init_ossl_pkcs12()
+Init_ossl_pkcs12(void)
 {
+#undef rb_intern
+#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
@@ -204,6 +248,7 @@ Init_ossl_pkcs12()
     rb_define_singleton_method(cPKCS12, "create", ossl_pkcs12_s_create, -1);
 
     rb_define_alloc_func(cPKCS12, ossl_pkcs12_s_allocate);
+    rb_define_method(cPKCS12, "initialize_copy", ossl_pkcs12_initialize_copy, 1);
     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 24d25d00bb..fe4f15ef60 100644
--- a/ext/openssl/ossl_pkcs12.h
+++ b/ext/openssl/ossl_pkcs12.h
@@ -1,7 +1,6 @@
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
- * $Id$
  */
 #if !defined(_OSSL_PKCS12_H_)
 #define _OSSL_PKCS12_H_
@@ -12,4 +11,3 @@ 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
deleted file mode 100644
index d3eaf2d073..0000000000
--- a/ext/openssl/ossl_pkcs5.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * $Id$
- * Copyright (C) 2007 Technorama Ltd. <oss-ruby@technorama.net>
- */
-#include "ossl.h"
-
-VALUE mPKCS5;
-VALUE ePKCS5;
-
-#ifdef HAVE_PKCS5_PBKDF2_HMAC
-/*
- * call-seq:
- *    PKCS5.pbkdf2_hmac(pass, salt, iter, keylen, digest) => string
- *
- * === Parameters
- * * +pass+ - string
- * * +salt+ - string
- * * +iter+ - integer - should be greater than 1000.  2000 is better.
- * * +keylen+ - integer
- * * +digest+ - a string or OpenSSL::Digest object.
- *
- * Available in OpenSSL 0.9.9?.
- *
- * Digests other than SHA1 may not be supported by other cryptography libraries.
- */
-static VALUE
-ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen, VALUE digest)
-{
-    VALUE str;
-    const EVP_MD *md;
-    int len = NUM2INT(keylen);
-
-    StringValue(pass);
-    StringValue(salt);
-    md = GetDigestPtr(digest);
-
-    str = rb_str_new(0, len);
-
-    if (PKCS5_PBKDF2_HMAC(RSTRING_PTR(pass), RSTRING_LEN(pass),
-			  (unsigned char *)RSTRING_PTR(salt), RSTRING_LEN(salt),
-			  NUM2INT(iter), md, len,
-			  (unsigned char *)RSTRING_PTR(str)) != 1)
-        ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC");
-
-    return str;
-}
-#else
-#define ossl_pkcs5_pbkdf2_hmac rb_f_notimplement
-#endif
-
-
-#ifdef HAVE_PKCS5_PBKDF2_HMAC_SHA1
-/*
- * call-seq:
- *    PKCS5.pbkdf2_hmac_sha1(pass, salt, iter, keylen) => string
- *
- * === Parameters
- * * +pass+ - string
- * * +salt+ - string
- * * +iter+ - integer - should be greater than 1000.  2000 is better.
- * * +keylen+ - integer
- *
- * This method is available almost any version OpenSSL.
- *
- * Conforms to rfc2898.
- */
-static VALUE
-ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen)
-{
-    VALUE str;
-    int len = NUM2INT(keylen);
-
-    StringValue(pass);
-    StringValue(salt);
-
-    str = rb_str_new(0, len);
-
-    if (PKCS5_PBKDF2_HMAC_SHA1(RSTRING_PTR(pass), RSTRING_LENINT(pass),
-			       (const unsigned char *)RSTRING_PTR(salt), RSTRING_LENINT(salt), NUM2INT(iter),
-			       len, (unsigned char *)RSTRING_PTR(str)) != 1)
-        ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC_SHA1");
-
-    return str;
-}
-#else
-#define ossl_pkcs5_pbkdf2_hmac_sha1 rb_f_notimplement
-#endif
-
-void
-Init_ossl_pkcs5()
-{
-    /*
-     * Password-based Encryption
-     *
-     */
-    mPKCS5 = rb_define_module_under(mOSSL, "PKCS5");
-    ePKCS5 = rb_define_class_under(mPKCS5, "PKCS5Error", eOSSLError);
-
-    rb_define_module_function(mPKCS5, "pbkdf2_hmac", ossl_pkcs5_pbkdf2_hmac, 5);
-    rb_define_module_function(mPKCS5, "pbkdf2_hmac_sha1", ossl_pkcs5_pbkdf2_hmac_sha1, 4);
-}
diff --git a/ext/openssl/ossl_pkcs5.h b/ext/openssl/ossl_pkcs5.h
deleted file mode 100644
index a3b132bc50..0000000000
--- a/ext/openssl/ossl_pkcs5.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if !defined(_OSSL_PKCS5_H_)
-#define _OSSL_PKCS5_H_
-
-void Init_ossl_pkcs5(void);
-
-#endif /* _OSSL_PKCS5_H_ */
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
index f59d3c71d9..28010c81fb 100644
--- a/ext/openssl/ossl_pkcs7.c
+++ b/ext/openssl/ossl_pkcs7.c
@@ -1,65 +1,58 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define WrapPKCS7(klass, obj, pkcs7) do { \
+#define NewPKCS7(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_pkcs7_type, 0)
+#define SetPKCS7(obj, pkcs7) do { \
     if (!(pkcs7)) { \
 	ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, PKCS7_free, (pkcs7)); \
+    RTYPEDDATA_DATA(obj) = (pkcs7); \
 } while (0)
 #define GetPKCS7(obj, pkcs7) do { \
-    Data_Get_Struct((obj), PKCS7, (pkcs7)); \
+    TypedData_Get_Struct((obj), PKCS7, &ossl_pkcs7_type, (pkcs7)); \
     if (!(pkcs7)) { \
 	ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
     } \
 } while (0)
-#define SafeGetPKCS7(obj, pkcs7) do { \
-    OSSL_Check_Kind((obj), cPKCS7); \
-    GetPKCS7((obj), (pkcs7)); \
-} while (0)
 
-#define WrapPKCS7si(klass, obj, p7si) do { \
+#define NewPKCS7si(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_pkcs7_signer_info_type, 0)
+#define SetPKCS7si(obj, p7si) do { \
     if (!(p7si)) { \
 	ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, PKCS7_SIGNER_INFO_free, (p7si)); \
+    RTYPEDDATA_DATA(obj) = (p7si); \
 } while (0)
 #define GetPKCS7si(obj, p7si) do { \
-    Data_Get_Struct((obj), PKCS7_SIGNER_INFO, (p7si)); \
+    TypedData_Get_Struct((obj), PKCS7_SIGNER_INFO, &ossl_pkcs7_signer_info_type, (p7si)); \
     if (!(p7si)) { \
 	ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
     } \
 } while (0)
-#define SafeGetPKCS7si(obj, p7si) do { \
-    OSSL_Check_Kind((obj), cPKCS7Signer); \
-    GetPKCS7si((obj), (p7si)); \
-} while (0)
 
-#define WrapPKCS7ri(klass, obj, p7ri) do { \
+#define NewPKCS7ri(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_pkcs7_recip_info_type, 0)
+#define SetPKCS7ri(obj, p7ri) do { \
     if (!(p7ri)) { \
 	ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, PKCS7_RECIP_INFO_free, (p7ri)); \
+    RTYPEDDATA_DATA(obj) = (p7ri); \
 } while (0)
 #define GetPKCS7ri(obj, p7ri) do { \
-    Data_Get_Struct((obj), PKCS7_RECIP_INFO, (p7ri)); \
+    TypedData_Get_Struct((obj), PKCS7_RECIP_INFO, &ossl_pkcs7_recip_info_type, (p7ri)); \
     if (!(p7ri)) { \
 	ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
     } \
 } while (0)
-#define SafeGetPKCS7ri(obj, p7ri) do { \
-    OSSL_Check_Kind((obj), cPKCS7Recipient); \
-    GetPKCS7ri((obj), (p7ri)); \
-} while (0)
 
 #define numberof(ary) (int)(sizeof(ary)/sizeof((ary)[0]))
 
@@ -76,19 +69,78 @@ 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;
 
-    pkcs7 = p7si ? PKCS7_SIGNER_INFO_dup(p7si) : PKCS7_SIGNER_INFO_new();
+    obj = NewPKCS7si(cPKCS7Signer);
+    pkcs7 = p7si ? ossl_PKCS7_SIGNER_INFO_dup(p7si) : PKCS7_SIGNER_INFO_new();
     if (!pkcs7) ossl_raise(ePKCS7Error, NULL);
-    WrapPKCS7si(cPKCS7Signer, obj, pkcs7);
+    SetPKCS7si(obj, pkcs7);
 
     return obj;
 }
@@ -98,8 +150,8 @@ DupPKCS7SignerPtr(VALUE obj)
 {
     PKCS7_SIGNER_INFO *p7si, *pkcs7;
 
-    SafeGetPKCS7si(obj, p7si);
-    if (!(pkcs7 = PKCS7_SIGNER_INFO_dup(p7si))) {
+    GetPKCS7si(obj, p7si);
+    if (!(pkcs7 = ossl_PKCS7_SIGNER_INFO_dup(p7si))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
 
@@ -112,9 +164,10 @@ ossl_pkcs7ri_new(PKCS7_RECIP_INFO *p7ri)
     PKCS7_RECIP_INFO *pkcs7;
     VALUE obj;
 
-    pkcs7 = p7ri ? PKCS7_RECIP_INFO_dup(p7ri) : PKCS7_RECIP_INFO_new();
+    obj = NewPKCS7ri(cPKCS7Recipient);
+    pkcs7 = p7ri ? ossl_PKCS7_RECIP_INFO_dup(p7ri) : PKCS7_RECIP_INFO_new();
     if (!pkcs7) ossl_raise(ePKCS7Error, NULL);
-    WrapPKCS7ri(cPKCS7Recipient, obj, pkcs7);
+    SetPKCS7ri(obj, pkcs7);
 
     return obj;
 }
@@ -124,8 +177,8 @@ DupPKCS7RecipientPtr(VALUE obj)
 {
     PKCS7_RECIP_INFO *p7ri, *pkcs7;
 
-    SafeGetPKCS7ri(obj, p7ri);
-    if (!(pkcs7 = PKCS7_RECIP_INFO_dup(p7ri))) {
+    GetPKCS7ri(obj, p7ri);
+    if (!(pkcs7 = ossl_PKCS7_RECIP_INFO_dup(p7ri))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
 
@@ -143,13 +196,14 @@ ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg)
     PKCS7 *pkcs7;
     VALUE ret, data;
 
-    in = ossl_obj2bio(arg);
+    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;
-    WrapPKCS7(cPKCS7, ret, pkcs7);
+    SetPKCS7(ret, pkcs7);
     ossl_pkcs7_set_data(ret, data);
     ossl_pkcs7_set_err_string(ret, Qnil);
 
@@ -172,10 +226,10 @@ ossl_pkcs7_s_write_smime(int argc, VALUE *argv, VALUE klass)
     rb_scan_args(argc, argv, "12", &pkcs7, &data, &flags);
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     if(NIL_P(data)) data = ossl_pkcs7_get_data(pkcs7);
-    SafeGetPKCS7(pkcs7, p7);
+    GetPKCS7(pkcs7, p7);
     if(!NIL_P(data) && PKCS7_is_detached(p7))
 	flg |= PKCS7_DETACHED;
-    in = NIL_P(data) ? NULL : ossl_obj2bio(data);
+    in = NIL_P(data) ? NULL : ossl_obj2bio(&data);
     if(!(out = BIO_new(BIO_s_mem()))){
         BIO_free(in);
         ossl_raise(ePKCS7Error, NULL);
@@ -211,7 +265,8 @@ 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);
-    in = ossl_obj2bio(data);
+    ret = NewPKCS7(cPKCS7);
+    in = ossl_obj2bio(&data);
     if(NIL_P(certs)) x509s = NULL;
     else{
 	x509s = ossl_protect_x509_ary2sk(certs, &status);
@@ -225,7 +280,7 @@ ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
 	sk_X509_pop_free(x509s, X509_free);
 	ossl_raise(ePKCS7Error, NULL);
     }
-    WrapPKCS7(cPKCS7, ret, pkcs7);
+    SetPKCS7(ret, pkcs7);
     ossl_pkcs7_set_data(ret, data);
     ossl_pkcs7_set_err_string(ret, Qnil);
     BIO_free(in);
@@ -264,9 +319,10 @@ ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
 #endif
 
     }
-    else ciph = GetCipherPtr(cipher); /* NO NEED TO DUP */
+    else ciph = ossl_evp_get_cipherbyname(cipher);
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    in = ossl_obj2bio(data);
+    ret = NewPKCS7(cPKCS7);
+    in = ossl_obj2bio(&data);
     x509s = ossl_protect_x509_ary2sk(certs, &status);
     if(status){
 	BIO_free(in);
@@ -278,7 +334,7 @@ ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
 	ossl_raise(ePKCS7Error, NULL);
     }
     BIO_free(in);
-    WrapPKCS7(cPKCS7, ret, p7);
+    SetPKCS7(ret, p7);
     ossl_pkcs7_set_data(ret, data);
     sk_X509_pop_free(x509s, X509_free);
 
@@ -291,10 +347,11 @@ ossl_pkcs7_alloc(VALUE klass)
     PKCS7 *pkcs7;
     VALUE obj;
 
+    obj = NewPKCS7(klass);
     if (!(pkcs7 = PKCS7_new())) {
 	ossl_raise(ePKCS7Error, NULL);
     }
-    WrapPKCS7(klass, obj, pkcs7);
+    SetPKCS7(obj, pkcs7);
 
     return obj;
 }
@@ -316,16 +373,19 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
     if(rb_scan_args(argc, argv, "01", &arg) == 0)
 	return self;
     arg = ossl_to_der_if_possible(arg);
-    in = ossl_obj2bio(arg);
+    in = ossl_obj2bio(&arg);
     p7 = PEM_read_bio_PKCS7(in, &pkcs, NULL, NULL);
-    DATA_PTR(self) = pkcs;
     if (!p7) {
 	OSSL_BIO_reset(in);
         p7 = d2i_PKCS7_bio(in, &pkcs);
-	if (!p7)
+	if (!p7) {
+	    BIO_free(in);
+	    PKCS7_free(pkcs);
+	    DATA_PTR(self) = NULL;
 	    ossl_raise(rb_eArgError, "Could not parse the PKCS7");
-	DATA_PTR(self) = pkcs;
+	}
     }
+    DATA_PTR(self) = pkcs;
     BIO_free(in);
     ossl_pkcs7_set_data(self, Qnil);
     ossl_pkcs7_set_err_string(self, Qnil);
@@ -342,7 +402,7 @@ ossl_pkcs7_copy(VALUE self, VALUE other)
     if (self == other) return self;
 
     GetPKCS7(self, a);
-    SafeGetPKCS7(other, b);
+    GetPKCS7(other, b);
 
     pkcs7 = PKCS7_dup(b);
     if (!pkcs7) {
@@ -359,9 +419,10 @@ ossl_pkcs7_sym2typeid(VALUE sym)
 {
     int i, ret = Qnil;
     const char *s;
+    size_t l;
 
-    static struct {
-        const char *name;
+    static const struct {
+        char name[20];
         int nid;
     } p7_type_tab[] = {
         { "signed",             NID_pkcs7_signed },
@@ -370,14 +431,16 @@ ossl_pkcs7_sym2typeid(VALUE sym)
         { "enveloped",          NID_pkcs7_enveloped },
         { "encrypted",          NID_pkcs7_encrypted },
         { "digest",             NID_pkcs7_digest },
-        { NULL,                 0 },
     };
 
-    if(TYPE(sym) == T_SYMBOL) s = rb_id2name(SYM2ID(sym));
-    else s = StringValuePtr(sym);
-    for(i = 0; i < numberof(p7_type_tab); i++){
-	if(p7_type_tab[i].name == NULL)
-	    ossl_raise(ePKCS7Error, "unknown type \"%s\"", s);
+    if (SYMBOL_P(sym)) 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);
+	if(strlen(p7_type_tab[i].name) != l) continue;
 	if(strcmp(p7_type_tab[i].name, s) == 0){
 	    ret = p7_type_tab[i].nid;
 	    break;
@@ -462,7 +525,7 @@ ossl_pkcs7_set_cipher(VALUE self, VALUE cipher)
     PKCS7 *pkcs7;
 
     GetPKCS7(self, pkcs7);
-    if (!PKCS7_set_cipher(pkcs7, GetCipherPtr(cipher))) {
+    if (!PKCS7_set_cipher(pkcs7, ossl_evp_get_cipherbyname(cipher))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
 
@@ -621,7 +684,7 @@ pkcs7_get_crls(VALUE self)
 }
 
 static VALUE
-ossl_pkcs7_set_certs_i(VALUE i, VALUE arg)
+ossl_pkcs7_set_certs_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg))
 {
     return ossl_pkcs7_add_certificate(arg, i);
 }
@@ -661,7 +724,7 @@ ossl_pkcs7_add_crl(VALUE self, VALUE crl)
 }
 
 static VALUE
-ossl_pkcs7_set_crls_i(VALUE i, VALUE arg)
+ossl_pkcs7_set_crls_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg))
 {
     return ossl_pkcs7_add_crl(arg, i);
 }
@@ -697,10 +760,12 @@ 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);
+    in = NIL_P(indata) ? NULL : ossl_obj2bio(&indata);
     if(NIL_P(certs)) x509s = NULL;
     else{
 	x509s = ossl_protect_x509_ary2sk(certs, &status);
@@ -709,8 +774,6 @@ 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);
@@ -718,13 +781,13 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
     }
     ok = PKCS7_verify(p7, x509s, x509st, in, out, flg);
     BIO_free(in);
-    if (ok < 0) ossl_raise(ePKCS7Error, NULL);
-    msg = ERR_reason_error_string(ERR_get_error());
+    sk_X509_pop_free(x509s, X509_free);
+    if (ok < 0) ossl_raise(ePKCS7Error, "PKCS7_verify");
+    msg = ERR_reason_error_string(ERR_peek_error());
     ossl_pkcs7_set_err_string(self, msg ? rb_str_new2(msg) : Qnil);
-    ERR_clear_error();
+    ossl_clear_error();
     data = ossl_membio2str(out);
     ossl_pkcs7_set_data(self, data);
-    sk_X509_pop_free(x509s, X509_free);
 
     return (ok == 1) ? Qtrue : Qfalse;
 }
@@ -740,9 +803,9 @@ ossl_pkcs7_decrypt(int argc, VALUE *argv, VALUE self)
     BIO *out;
     VALUE str;
 
-    rb_scan_args(argc, argv, "21", &pkey, &cert, &flags);
+    rb_scan_args(argc, argv, "12", &pkey, &cert, &flags);
     key = GetPrivPKeyPtr(pkey); /* NO NEED TO DUP */
-    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
+    x509 = NIL_P(cert) ? NULL : GetX509CertPtr(cert); /* NO NEED TO DUP */
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     GetPKCS7(self, p7);
     if(!(out = BIO_new(BIO_s_mem())))
@@ -764,12 +827,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)
@@ -781,7 +844,7 @@ ossl_pkcs7_add_data(VALUE self, VALUE data)
     ossl_pkcs7_set_data(self, Qnil);
 
  err:
-    BIO_free(out);
+    BIO_free_all(out);
     BIO_free(in);
     if(ERR_peek_error()){
 	ossl_raise(ePKCS7Error, NULL);
@@ -839,10 +902,11 @@ ossl_pkcs7si_alloc(VALUE klass)
     PKCS7_SIGNER_INFO *p7si;
     VALUE obj;
 
+    obj = NewPKCS7si(klass);
     if (!(p7si = PKCS7_SIGNER_INFO_new())) {
 	ossl_raise(ePKCS7Error, NULL);
     }
-    WrapPKCS7si(klass, obj, p7si);
+    SetPKCS7si(obj, p7si);
 
     return obj;
 }
@@ -857,7 +921,7 @@ ossl_pkcs7si_initialize(VALUE self, VALUE cert, VALUE key, VALUE digest)
 
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
     x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
+    md = ossl_evp_get_digestbyname(digest);
     GetPKCS7si(self, p7si);
     if (!(PKCS7_SIGNER_INFO_set(p7si, x509, pkey, (EVP_MD*)md))) {
 	ossl_raise(ePKCS7Error, NULL);
@@ -918,10 +982,11 @@ ossl_pkcs7ri_alloc(VALUE klass)
     PKCS7_RECIP_INFO *p7ri;
     VALUE obj;
 
+    obj = NewPKCS7ri(klass);
     if (!(p7ri = PKCS7_RECIP_INFO_new())) {
 	ossl_raise(ePKCS7Error, NULL);
     }
-    WrapPKCS7ri(klass, obj, p7ri);
+    SetPKCS7ri(obj, p7ri);
 
     return obj;
 }
@@ -975,8 +1040,14 @@ ossl_pkcs7ri_get_enc_key(VALUE self)
  * INIT
  */
 void
-Init_ossl_pkcs7()
+Init_ossl_pkcs7(void)
 {
+#undef rb_intern
+#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);
@@ -986,7 +1057,7 @@ Init_ossl_pkcs7()
     rb_attr(cPKCS7, rb_intern("data"), 1, 0, Qfalse);
     rb_attr(cPKCS7, rb_intern("error_string"), 1, 1, Qfalse);
     rb_define_alloc_func(cPKCS7, ossl_pkcs7_alloc);
-    rb_define_copy_func(cPKCS7, ossl_pkcs7_copy);
+    rb_define_method(cPKCS7, "initialize_copy", ossl_pkcs7_copy, 1);
     rb_define_method(cPKCS7, "initialize", ossl_pkcs7_initialize, -1);
     rb_define_method(cPKCS7, "type=", ossl_pkcs7_set_type, 1);
     rb_define_method(cPKCS7, "type", ossl_pkcs7_get_type, 0);
diff --git a/ext/openssl/ossl_pkcs7.h b/ext/openssl/ossl_pkcs7.h
index 371c421103..139e00d640 100644
--- a/ext/openssl/ossl_pkcs7.h
+++ b/ext/openssl/ossl_pkcs7.h
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_PKCS7_H_)
@@ -19,4 +18,3 @@ 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 f785e66c00..e1fffb2446 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
@@ -16,33 +15,93 @@
 VALUE mPKey;
 VALUE cPKey;
 VALUE ePKeyError;
-ID id_private_q;
+static ID id_private_q;
 
 /*
  * callback for generating keys
  */
-void
-ossl_generate_cb(int p, int n, void *arg)
+static VALUE
+call_check_ints0(VALUE arg)
+{
+    rb_thread_check_ints();
+    return Qnil;
+}
+
+static void *
+call_check_ints(void *arg)
+{
+    int state;
+    rb_protect(call_check_ints0, Qnil, &state);
+    return (void *)(VALUE)state;
+}
+
+int
+ossl_generate_cb_2(int p, int n, BN_GENCB *cb)
 {
     VALUE ary;
+    struct ossl_generate_cb_arg *arg;
+    int state;
+
+    arg = (struct ossl_generate_cb_arg *)BN_GENCB_get_arg(cb);
+    if (arg->yield) {
+	ary = rb_ary_new2(2);
+	rb_ary_store(ary, 0, INT2NUM(p));
+	rb_ary_store(ary, 1, INT2NUM(n));
+
+	/*
+	* can be break by raising exception or 'break'
+	*/
+	rb_protect(rb_yield, ary, &state);
+	if (state) {
+	    arg->state = state;
+	    return 0;
+	}
+    }
+    if (arg->interrupted) {
+	arg->interrupted = 0;
+	state = (int)(VALUE)rb_thread_call_with_gvl(call_check_ints, NULL);
+	if (state) {
+	    arg->state = state;
+	    return 0;
+	}
+    }
+    return 1;
+}
 
-    ary = rb_ary_new2(2);
-    rb_ary_store(ary, 0, INT2NUM(p));
-    rb_ary_store(ary, 1, INT2NUM(n));
+void
+ossl_generate_cb_stop(void *ptr)
+{
+    struct ossl_generate_cb_arg *arg = (struct ossl_generate_cb_arg *)ptr;
+    arg->interrupted = 1;
+}
 
-    rb_yield(ary);
+static void
+ossl_evp_pkey_free(void *ptr)
+{
+    EVP_PKEY_free(ptr);
 }
 
 /*
  * Public
  */
-VALUE
-ossl_pkey_new(EVP_PKEY *pkey)
+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)
 {
-    if (!pkey) {
-	ossl_raise(ePKeyError, "Cannot make new key from NULL.");
-    }
-    switch (EVP_PKEY_type(pkey->type)) {
+    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 !defined(OPENSSL_NO_RSA)
     case EVP_PKEY_RSA:
 	return ossl_rsa_new(pkey);
@@ -55,89 +114,123 @@ ossl_pkey_new(EVP_PKEY *pkey)
     case EVP_PKEY_DH:
 	return ossl_dh_new(pkey);
 #endif
-#if !defined(OPENSSL_NO_EC) && (OPENSSL_VERSION_NUMBER >= 0x0090802fL)
+#if !defined(OPENSSL_NO_EC)
     case EVP_PKEY_EC:
 	return ossl_ec_new(pkey);
 #endif
     default:
-	ossl_raise(ePKeyError, "unsupported key type");
+	obj = NewPKey(cPKey);
+	SetPKey(obj, pkey);
+	return obj;
     }
-    return Qnil; /* not reached */
 }
 
 VALUE
-ossl_pkey_new_from_file(VALUE filename)
+ossl_pkey_new(EVP_PKEY *pkey)
 {
-    FILE *fp;
-    EVP_PKEY *pkey;
-
-    SafeStringValue(filename);
-    if (!(fp = fopen(RSTRING_PTR(filename), "r"))) {
-	ossl_raise(ePKeyError, "%s", strerror(errno));
-    }
+    VALUE obj;
+    int status;
 
-    pkey = PEM_read_PrivateKey(fp, NULL, ossl_pem_passwd_cb, NULL);
-    fclose(fp);
-    if (!pkey) {
-	ossl_raise(ePKeyError, NULL);
+    obj = rb_protect((VALUE (*)(VALUE))pkey_new0, (VALUE)pkey, &status);
+    if (status) {
+	EVP_PKEY_free(pkey);
+	rb_jump_tag(status);
     }
 
-    return ossl_pkey_new(pkey);
+    return obj;
 }
 
 /*
  *  call-seq:
- *     OpenSSL::PKey.read(string [, pwd ] ) -> PKey
- *     OpenSSL::PKey.read(file [, pwd ]) -> PKey
+ *     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.
  *
  * === Parameters
- * * +string+ is a DER- or PEM-encoded string containing an arbitrary private
- * 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.
+ * * _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.
+ * * _pwd_ is an optional password in case _string_ or _io_ is an encrypted
+ *   PEM resource.
  */
 static VALUE
 ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self)
 {
-     EVP_PKEY *pkey;
-     BIO *bio;
-     VALUE data, pass;
-     char *passwd = NULL;
+    EVP_PKEY *pkey;
+    BIO *bio;
+    VALUE data, pass;
 
-     rb_scan_args(argc, argv, "11", &data, &pass);
+    rb_scan_args(argc, argv, "11", &data, &pass);
+    pass = ossl_pem_passwd_value(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 (!NIL_P(pass)) {
-	    passwd = StringValuePtr(pass);
-	}
-	if (!(pkey = PEM_read_bio_PrivateKey(bio, NULL, ossl_pem_passwd_cb, passwd))) {
+	if (!(pkey = PEM_read_bio_PrivateKey(bio, NULL, ossl_pem_passwd_cb, (void *)pass))) {
 	    OSSL_BIO_reset(bio);
 	    if (!(pkey = d2i_PUBKEY_bio(bio, NULL))) {
 		OSSL_BIO_reset(bio);
-		if (!NIL_P(pass)) {
-		    passwd = StringValuePtr(pass);
-		}
-		pkey = PEM_read_bio_PUBKEY(bio, NULL, ossl_pem_passwd_cb, passwd);
+		pkey = PEM_read_bio_PUBKEY(bio, NULL, ossl_pem_passwd_cb, (void *)pass);
 	    }
 	}
     }
 
     BIO_free(bio);
     if (!pkey)
-	ossl_raise(rb_eArgError, "Could not parse PKey");
+	ossl_raise(ePKeyError, "Could not parse PKey");
+
     return ossl_pkey_new(pkey);
 }
 
+void
+ossl_pkey_check_public_key(const EVP_PKEY *pkey)
+{
+    void *ptr;
+    const BIGNUM *n, *e, *pubkey;
+
+    if (EVP_PKEY_missing_parameters(pkey))
+	ossl_raise(ePKeyError, "parameters missing");
+
+    /* OpenSSL < 1.1.0 takes non-const pointer */
+    ptr = EVP_PKEY_get0((EVP_PKEY *)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)
 {
     EVP_PKEY *pkey;
 
-    SafeGetPKey(obj, pkey);
+    GetPKey(obj, pkey);
 
     return pkey;
 }
@@ -147,10 +240,10 @@ GetPrivPKeyPtr(VALUE obj)
 {
     EVP_PKEY *pkey;
 
-    if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) {
+    if (rb_funcallv(obj, id_private_q, 0, NULL) != Qtrue) {
 	ossl_raise(rb_eArgError, "Private key is needed.");
     }
-    SafeGetPKey(obj, pkey);
+    GetPKey(obj, pkey);
 
     return pkey;
 }
@@ -160,22 +253,8 @@ DupPKeyPtr(VALUE obj)
 {
     EVP_PKEY *pkey;
 
-    SafeGetPKey(obj, 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);
+    GetPKey(obj, pkey);
+    EVP_PKEY_up_ref(pkey);
 
     return pkey;
 }
@@ -189,10 +268,11 @@ ossl_pkey_alloc(VALUE klass)
     EVP_PKEY *pkey;
     VALUE obj;
 
+    obj = NewPKey(klass);
     if (!(pkey = EVP_PKEY_new())) {
 	ossl_raise(ePKeyError, NULL);
     }
-    WrapPKey(klass, obj, pkey);
+    SetPKey(obj, pkey);
 
     return obj;
 }
@@ -202,13 +282,13 @@ ossl_pkey_alloc(VALUE klass)
  *      PKeyClass.new -> self
  *
  * Because PKey is an abstract class, actually calling this method explicitly
- * will raise a +NotImplementedError+.
+ * will raise a NotImplementedError.
  */
 static VALUE
 ossl_pkey_initialize(VALUE self)
 {
     if (rb_obj_is_instance_of(self, cPKey)) {
-	ossl_raise(rb_eNotImpError, "OpenSSL::PKey::PKey is an abstract class.");
+	ossl_raise(rb_eTypeError, "OpenSSL::PKey::PKey can't be instantiated directly");
     }
     return self;
 }
@@ -217,10 +297,10 @@ ossl_pkey_initialize(VALUE self)
  *  call-seq:
  *      pkey.sign(digest, data) -> String
  *
- * To sign the +String+ +data+, +digest+, an instance of OpenSSL::Digest, must
- * be provided. The return value is again a +String+ containing the signature.
+ * To sign the String _data_, _digest_, an instance of OpenSSL::Digest, must
+ * be provided. The return value is again a String containing the signature.
  * A PKeyError is raised should errors occur.
- * Any previous state of the +Digest+ instance is irrelevant to the signature
+ * Any previous state of the Digest instance is irrelevant to the signature
  * outcome, the digest instance is reset to its initial state during the
  * operation.
  *
@@ -234,21 +314,32 @@ static VALUE
 ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
 {
     EVP_PKEY *pkey;
-    EVP_MD_CTX ctx;
+    const EVP_MD *md;
+    EVP_MD_CTX *ctx;
     unsigned int buf_len;
     VALUE str;
+    int result;
 
-    if (rb_funcall(self, id_private_q, 0, NULL) != Qtrue) {
-	ossl_raise(rb_eArgError, "Private key is needed.");
-    }
-    GetPKey(self, pkey);
-    EVP_SignInit(&ctx, GetDigestPtr(digest));
+    pkey = GetPrivPKeyPtr(self);
+    md = ossl_evp_get_digestbyname(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));
+    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");
+    }
+    result = EVP_SignFinal(ctx, (unsigned char *)RSTRING_PTR(str), &buf_len, pkey);
+    EVP_MD_CTX_free(ctx);
+    if (!result)
+	ossl_raise(ePKeyError, "EVP_SignFinal");
     rb_str_set_len(str, buf_len);
 
     return str;
@@ -258,12 +349,12 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
  *  call-seq:
  *      pkey.verify(digest, signature, data) -> String
  *
- * To verify the +String+ +signature+, +digest+, an instance of
+ * To verify the String _signature_, _digest_, an instance of
  * OpenSSL::Digest, must be provided to re-compute the message digest of the
- * original +data+, also a +String+. The return value is +true+ if the
+ * original _data_, also a String. The return value is +true+ if the
  * signature is valid, +false+ otherwise. A PKeyError is raised should errors
  * occur.
- * Any previous state of the +Digest+ instance is irrelevant to the validation
+ * Any previous state of the Digest instance is irrelevant to the validation
  * outcome, the digest instance is reset to its initial state during the
  * operation.
  *
@@ -279,32 +370,51 @@ static VALUE
 ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
 {
     EVP_PKEY *pkey;
-    EVP_MD_CTX ctx;
+    const EVP_MD *md;
+    EVP_MD_CTX *ctx;
+    int siglen, result;
 
     GetPKey(self, pkey);
-    EVP_VerifyInit(&ctx, GetDigestPtr(digest));
+    ossl_pkey_check_public_key(pkey);
+    md = ossl_evp_get_digestbyname(digest);
     StringValue(sig);
+    siglen = RSTRING_LENINT(sig);
     StringValue(data);
-    EVP_VerifyUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
-    switch (EVP_VerifyFinal(&ctx, (unsigned char *)RSTRING_PTR(sig), RSTRING_LENINT(sig), pkey)) {
+
+    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);
+    switch (result) {
     case 0:
+	ossl_clear_error();
 	return Qfalse;
     case 1:
 	return Qtrue;
     default:
-	ossl_raise(ePKeyError, NULL);
+	ossl_raise(ePKeyError, "EVP_VerifyFinal");
     }
-    return Qnil; /* dummy */
 }
 
 /*
  * INIT
  */
 void
-Init_ossl_pkey()
+Init_ossl_pkey(void)
 {
+#undef rb_intern
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
     /* Document-module: OpenSSL::PKey
@@ -316,7 +426,7 @@ Init_ossl_pkey()
      * 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 encrypted by
+     * Messages encrypted with a public key can only be decrypted 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
@@ -395,4 +505,3 @@ Init_ossl_pkey()
     Init_ossl_dh();
     Init_ossl_ec();
 }
-
diff --git a/ext/openssl/ossl_pkey.h b/ext/openssl/ossl_pkey.h
index 5e3329d326..0db59305f7 100644
--- a/ext/openssl/ossl_pkey.h
+++ b/ext/openssl/ossl_pkey.h
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_PKEY_H_)
@@ -14,38 +13,41 @@
 extern VALUE mPKey;
 extern VALUE cPKey;
 extern VALUE ePKeyError;
-extern ID id_private_q;
+extern const rb_data_type_t ossl_evp_pkey_type;
 
 #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 WrapPKey(klass, obj, pkey) do { \
+#define NewPKey(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_evp_pkey_type, 0)
+#define SetPKey(obj, pkey) do { \
     if (!(pkey)) { \
 	rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!"); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, EVP_PKEY_free, (pkey)); \
+    RTYPEDDATA_DATA(obj) = (pkey); \
     OSSL_PKEY_SET_PUBLIC(obj); \
 } while (0)
 #define GetPKey(obj, pkey) do {\
-    Data_Get_Struct((obj), EVP_PKEY, (pkey));\
+    TypedData_Get_Struct((obj), EVP_PKEY, &ossl_evp_pkey_type, (pkey)); \
     if (!(pkey)) { \
 	rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!");\
     } \
 } while (0)
-#define SafeGetPKey(obj, pkey) do { \
-    OSSL_Check_Kind((obj), cPKey); \
-    GetPKey((obj), (pkey)); \
-} while (0)
 
-void ossl_generate_cb(int, int, void *);
+struct ossl_generate_cb_arg {
+    int yield;
+    int interrupted;
+    int state;
+};
+int ossl_generate_cb_2(int p, int n, BN_GENCB *cb);
+void ossl_generate_cb_stop(void *ptr);
 
 VALUE ossl_pkey_new(EVP_PKEY *);
-VALUE ossl_pkey_new_from_file(VALUE);
+void ossl_pkey_check_public_key(const EVP_PKEY *);
 EVP_PKEY *GetPKeyPtr(VALUE);
 EVP_PKEY *DupPKeyPtr(VALUE);
 EVP_PKEY *GetPrivPKeyPtr(VALUE);
-EVP_PKEY *DupPrivPKeyPtr(VALUE);
 void Init_ossl_pkey(void);
 
 /*
@@ -71,8 +73,6 @@ 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);
@@ -89,53 +89,153 @@ extern VALUE eEC_POINT;
 VALUE ossl_ec_new(EVP_PKEY *);
 void Init_ossl_ec(void);
 
-
-#define OSSL_PKEY_BN(keytype, name)					\
+#define OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, _name, _get)		\
 /*									\
  *  call-seq:								\
- *     key.##name -> aBN						\
+ *     _keytype##.##_name -> aBN					\
  */									\
-static VALUE ossl_##keytype##_get_##name(VALUE self)			\
+static VALUE ossl_##_keytype##_get_##_name(VALUE self)			\
 {									\
-	EVP_PKEY *pkey;							\
-	BIGNUM *bn;							\
+	_type *obj;							\
+	const BIGNUM *bn;						\
 									\
-	GetPKey(self, pkey);						\
-	bn = pkey->pkey.keytype->name;					\
+	Get##_type(self, obj);						\
+	_get;								\
 	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:								\
- *     key.##name = bn -> bn						\
+ *     _keytype##.set_##_group(a1, a2, a3) -> self			\
  */									\
-static VALUE ossl_##keytype##_set_##name(VALUE self, VALUE bignum)	\
+static VALUE ossl_##_keytype##_set_##_group(VALUE self, VALUE v1, VALUE v2, VALUE v3) \
 {									\
-	EVP_PKEY *pkey;							\
+	_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					\
+ */									\
+static VALUE ossl_##_keytype##_set_##_name(VALUE self, VALUE bignum)	\
+{									\
+	_type *obj;							\
 	BIGNUM *bn;							\
 									\
-	GetPKey(self, pkey);						\
+	rb_warning("#"#_name"= is deprecated; use #set_"#_group);	\
+	Get##_type(self, obj);						\
 	if (NIL_P(bignum)) {						\
-		BN_clear_free(pkey->pkey.keytype->name);		\
-		pkey->pkey.keytype->name = NULL;			\
+		BN_clear_free(obj->_name);				\
+		obj->_name = NULL;					\
 		return Qnil;						\
 	}								\
 									\
 	bn = GetBNPtr(bignum);						\
-	if (pkey->pkey.keytype->name == NULL)				\
-		pkey->pkey.keytype->name = BN_new();			\
-	if (pkey->pkey.keytype->name == NULL)				\
+	if (obj->_name == NULL)						\
+		obj->_name = BN_new();					\
+	if (obj->_name == NULL)						\
 		ossl_raise(eBNError, NULL);				\
-	if (BN_copy(pkey->pkey.keytype->name, bn) == NULL)		\
+	if (BN_copy(obj->_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)				\
-do {									\
-	rb_define_method((class), #name, ossl_##keytype##_get_##name, 0);	\
+	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);\
 	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 748d9c82fd..bf4e3f9322 100644
--- a/ext/openssl/ossl_pkey_dh.c
+++ b/ext/openssl/ossl_pkey_dh.c
@@ -1,32 +1,27 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
-#if !defined(OPENSSL_NO_DH)
-
 #include "ossl.h"
 
+#if !defined(OPENSSL_NO_DH)
+
 #define GetPKeyDH(obj, pkey) do { \
     GetPKey((obj), (pkey)); \
-    if (EVP_PKEY_type((pkey)->type) != EVP_PKEY_DH) { /* PARANOIA? */ \
+    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) { /* PARANOIA? */ \
 	ossl_raise(rb_eRuntimeError, "THIS IS NOT A DH!") ; \
     } \
 } 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
-
+#define GetDH(obj, dh) do { \
+    EVP_PKEY *_pkey; \
+    GetPKeyDH((obj), _pkey); \
+    (dh) = EVP_PKEY_get0_DH(_pkey); \
+} while (0)
 
 /*
  * Classes
@@ -46,6 +41,7 @@ dh_instance(VALUE klass, DH *dh)
     if (!dh) {
 	return Qfalse;
     }
+    obj = NewPKey(klass);
     if (!(pkey = EVP_PKEY_new())) {
 	return Qfalse;
     }
@@ -53,7 +49,7 @@ dh_instance(VALUE klass, DH *dh)
 	EVP_PKEY_free(pkey);
 	return Qfalse;
     }
-    WrapPKey(klass, obj, pkey);
+    SetPKey(obj, pkey);
 
     return obj;
 }
@@ -66,10 +62,11 @@ ossl_dh_new(EVP_PKEY *pkey)
     if (!pkey) {
 	obj = dh_instance(cDH, DH_new());
     } else {
-	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) {
+	obj = NewPKey(cDH);
+	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) {
 	    ossl_raise(rb_eTypeError, "Not a DH key!");
 	}
-	WrapPKey(cDH, obj, pkey);
+	SetPKey(obj, pkey);
     }
     if (obj == Qfalse) {
 	ossl_raise(eDHError, NULL);
@@ -81,19 +78,65 @@ ossl_dh_new(EVP_PKEY *pkey)
 /*
  * Private
  */
+struct dh_blocking_gen_arg {
+    DH *dh;
+    int size;
+    int gen;
+    BN_GENCB *cb;
+    int result;
+};
+
+static void *
+dh_blocking_gen(void *arg)
+{
+    struct dh_blocking_gen_arg *gen = (struct dh_blocking_gen_arg *)arg;
+    gen->result = DH_generate_parameters_ex(gen->dh, gen->size, gen->gen, gen->cb);
+    return 0;
+}
+
 static DH *
 dh_generate(int size, int gen)
 {
-    DH *dh;
+    struct ossl_generate_cb_arg cb_arg = { 0 };
+    struct dh_blocking_gen_arg gen_arg;
+    DH *dh = DH_new();
+    BN_GENCB *cb = BN_GENCB_new();
 
-    dh = DH_generate_parameters(size, gen,
-	    rb_block_given_p() ? ossl_generate_cb : NULL,
-	    NULL);
-    if (!dh) return 0;
+    if (!dh || !cb) {
+	DH_free(dh);
+	BN_GENCB_free(cb);
+	return NULL;
+    }
 
-    if (!DH_generate_key(dh)) {
+    if (rb_block_given_p())
+	cb_arg.yield = 1;
+    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;
+    if (cb_arg.yield == 1) {
+	/* we cannot release GVL when callback proc is supplied */
+	dh_blocking_gen(&gen_arg);
+    } else {
+	/* there's a chance to unblock */
+	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);
-	return 0;
+	if (cb_arg.state) {
+	    /* Clear OpenSSL error queue before re-raising. */
+	    ossl_clear_error();
+	    rb_jump_tag(cb_arg.state);
+	}
+	return NULL;
+    }
+
+    if (!DH_generate_key(dh)) {
+        DH_free(dh);
+        return NULL;
     }
 
     return dh;
@@ -107,8 +150,8 @@ dh_generate(int size, int gen)
  * components alike.
  *
  * === Parameters
- * * +size+ is an integer representing the desired key size. Keys smaller than 1024 bits should be considered insecure.
- * * +generator+ is a small number > 1, typically 2 or 5.
+ * * _size_ is an integer representing the desired key size. Keys smaller than 1024 bits should be considered insecure.
+ * * _generator_ is a small number > 1, typically 2 or 5.
  *
  */
 static VALUE
@@ -132,19 +175,21 @@ ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
 }
 
 /*
- *  call-seq:
- *     DH.new([size [, generator] | string]) -> dh
+ * call-seq:
+ *   DH.new -> dh
+ *   DH.new(string) -> dh
+ *   DH.new(size [, generator]) -> 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
+ * DH parameters from _string_. Note that when reading a DH instance from
  * data that was encoded from a DH instance by using DH#to_pem or DH#to_der
  * the result will *not* contain a public/private key pair yet. This needs to
  * be generated using DH#generate_key! first.
  *
  * === Parameters
- * * +size+ is an integer representing the desired key size. Keys smaller than 1024 bits should be considered insecure.
- * * +generator+ is a small number > 1, typically 2 or 5.
- * * +string+ contains the DER or PEM encoded key.
+ * * _size_ is an integer representing the desired key size. Keys smaller than 1024 bits should be considered insecure.
+ * * _generator_ is a small number > 1, typically 2 or 5.
+ * * _string_ contains the DER or PEM encoded key.
  *
  * === Examples
  *  DH.new # -> dh
@@ -167,17 +212,17 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
     if(rb_scan_args(argc, argv, "02", &arg, &gen) == 0) {
       dh = DH_new();
     }
-    else if (FIXNUM_P(arg)) {
+    else if (RB_INTEGER_TYPE_P(arg)) {
 	if (!NIL_P(gen)) {
 	    g = NUM2INT(gen);
 	}
-	if (!(dh = dh_generate(FIX2INT(arg), g))) {
+	if (!(dh = dh_generate(NUM2INT(arg), g))) {
 	    ossl_raise(eDHError, NULL);
 	}
     }
     else {
 	arg = ossl_to_der_if_possible(arg);
-	in = ossl_obj2bio(arg);
+	in = ossl_obj2bio(&arg);
 	dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
 	if (!dh){
 	    OSSL_BIO_reset(in);
@@ -195,6 +240,39 @@ 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
@@ -205,11 +283,13 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_dh_is_public(VALUE self)
 {
-    EVP_PKEY *pkey;
+    DH *dh;
+    const BIGNUM *bn;
 
-    GetPKeyDH(self, pkey);
+    GetDH(self, dh);
+    DH_get0_key(dh, &bn, NULL);
 
-    return (pkey->pkey.dh->pub_key) ? Qtrue : Qfalse;
+    return bn ? Qtrue : Qfalse;
 }
 
 /*
@@ -222,16 +302,24 @@ ossl_dh_is_public(VALUE self)
 static VALUE
 ossl_dh_is_private(VALUE self)
 {
-    EVP_PKEY *pkey;
+    DH *dh;
+    const BIGNUM *bn;
 
-    GetPKeyDH(self, pkey);
+    GetDH(self, dh);
+    DH_get0_key(dh, NULL, &bn);
 
-    return (DH_PRIVATE(pkey->pkey.dh)) ? Qtrue : Qfalse;
+#if !defined(OPENSSL_NO_ENGINE)
+    return (bn || DH_get0_engine(dh)) ? Qtrue : Qfalse;
+#else
+    return bn ? Qtrue : Qfalse;
+#endif
 }
 
 /*
  *  call-seq:
+ *     dh.export -> aString
  *     dh.to_pem -> aString
+ *     dh.to_s -> aString
  *
  * Encodes this DH to its PEM encoding. Note that any existing per-session
  * public/private keys will *not* get encoded, just the Diffie-Hellman
@@ -240,15 +328,15 @@ ossl_dh_is_private(VALUE self)
 static VALUE
 ossl_dh_export(VALUE self)
 {
-    EVP_PKEY *pkey;
+    DH *dh;
     BIO *out;
     VALUE str;
 
-    GetPKeyDH(self, pkey);
+    GetDH(self, dh);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eDHError, NULL);
     }
-    if (!PEM_write_bio_DHparams(out, pkey->pkey.dh)) {
+    if (!PEM_write_bio_DHparams(out, dh)) {
 	BIO_free(out);
 	ossl_raise(eDHError, NULL);
     }
@@ -269,17 +357,17 @@ ossl_dh_export(VALUE self)
 static VALUE
 ossl_dh_to_der(VALUE self)
 {
-    EVP_PKEY *pkey;
+    DH *dh;
     unsigned char *p;
     long len;
     VALUE str;
 
-    GetPKeyDH(self, pkey);
-    if((len = i2d_DHparams(pkey->pkey.dh, NULL)) <= 0)
+    GetDH(self, dh);
+    if((len = i2d_DHparams(dh, NULL)) <= 0)
 	ossl_raise(eDHError, NULL);
     str = rb_str_new(0, len);
     p = (unsigned char *)RSTRING_PTR(str);
-    if(i2d_DHparams(pkey->pkey.dh, &p) < 0)
+    if(i2d_DHparams(dh, &p) < 0)
 	ossl_raise(eDHError, NULL);
     ossl_str_adjust(str, p);
 
@@ -297,17 +385,20 @@ ossl_dh_to_der(VALUE self)
 static VALUE
 ossl_dh_get_params(VALUE self)
 {
-    EVP_PKEY *pkey;
+    DH *dh;
     VALUE hash;
+    const BIGNUM *p, *q, *g, *pub_key, *priv_key;
 
-    GetPKeyDH(self, pkey);
+    GetDH(self, dh);
+    DH_get0_pqg(dh, &p, &q, &g);
+    DH_get0_key(dh, &pub_key, &priv_key);
 
     hash = rb_hash_new();
-
-    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));
+    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));
 
     return hash;
 }
@@ -323,15 +414,15 @@ ossl_dh_get_params(VALUE self)
 static VALUE
 ossl_dh_to_text(VALUE self)
 {
-    EVP_PKEY *pkey;
+    DH *dh;
     BIO *out;
     VALUE str;
 
-    GetPKeyDH(self, pkey);
+    GetDH(self, dh);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eDHError, NULL);
     }
-    if (!DHparams_print(out, pkey->pkey.dh)) {
+    if (!DHparams_print(out, dh)) {
 	BIO_free(out);
 	ossl_raise(eDHError, NULL);
     }
@@ -345,7 +436,7 @@ ossl_dh_to_text(VALUE self)
  *     dh.public_key -> aDH
  *
  * Returns a new DH instance that carries just the public information, i.e.
- * the prime +p+ and the generator +g+, but no public/private key yet. Such
+ * the prime _p_ and the generator _g_, but no public/private key yet. Such
  * a pair may be generated using DH#generate_key!. The "public key" needed
  * for a key exchange with DH#compute_key is considered as per-session
  * information and may be retrieved with DH#pub_key once a key pair has
@@ -364,13 +455,12 @@ ossl_dh_to_text(VALUE self)
 static VALUE
 ossl_dh_to_public_key(VALUE self)
 {
-    EVP_PKEY *pkey;
-    DH *dh;
+    DH *orig_dh, *dh;
     VALUE obj;
 
-    GetPKeyDH(self, pkey);
-    dh = DHparams_dup(pkey->pkey.dh); /* err check perfomed by dh_instance */
-    obj = dh_instance(CLASS_OF(self), dh);
+    GetDH(self, orig_dh);
+    dh = DHparams_dup(orig_dh); /* err check perfomed by dh_instance */
+    obj = dh_instance(rb_obj_class(self), dh);
     if (obj == Qfalse) {
 	DH_free(dh);
 	ossl_raise(eDHError, NULL);
@@ -381,7 +471,7 @@ ossl_dh_to_public_key(VALUE self)
 
 /*
  *  call-seq:
- *     dh.check_params -> true | false
+ *     dh.params_ok? -> true | false
  *
  * Validates the Diffie-Hellman parameters associated with this instance.
  * It checks whether a safe prime and a suitable generator are used. If this
@@ -391,12 +481,9 @@ static VALUE
 ossl_dh_check_params(VALUE self)
 {
     DH *dh;
-    EVP_PKEY *pkey;
     int codes;
 
-    GetPKeyDH(self, pkey);
-    dh = pkey->pkey.dh;
-
+    GetDH(self, dh);
     if (!DH_check(dh, &codes)) {
 	return Qfalse;
     }
@@ -424,11 +511,8 @@ 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;
@@ -442,20 +526,21 @@ ossl_dh_generate_key(VALUE self)
  * See DH_compute_key() for further information.
  *
  * === Parameters
- * * +pub_bn+ is a OpenSSL::BN, *not* the DH instance returned by
- * DH#public_key as that contains the DH parameters only.
+ * * _pub_bn_ is a OpenSSL::BN, *not* the DH instance returned by
+ *   DH#public_key as that contains the DH parameters only.
  */
 static VALUE
 ossl_dh_compute_key(VALUE self, VALUE pub)
 {
     DH *dh;
-    EVP_PKEY *pkey;
-    BIGNUM *pub_key;
+    const BIGNUM *pub_key, *dh_p;
     VALUE str;
     int len;
 
-    GetPKeyDH(self, pkey);
-    dh = pkey->pkey.dh;
+    GetDH(self, dh);
+    DH_get0_pqg(dh, &dh_p, NULL, NULL);
+    if (!dh_p)
+	ossl_raise(eDHError, "incomplete DH");
     pub_key = GetBNPtr(pub);
     len = DH_size(dh);
     str = rb_str_new(0, len);
@@ -467,83 +552,33 @@ 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)
-
 /*
- * -----BEGIN DH PARAMETERS-----
- * MEYCQQD0zXHljRg/mJ9PYLACLv58Cd8VxBxxY7oEuCeURMiTqEhMym16rhhKgZG2
- * zk2O9uUIBIxSj+NKMURHGaFKyIvLAgEC
- * -----END DH PARAMETERS-----
+ * Document-method: OpenSSL::PKey::DH#set_pqg
+ * call-seq:
+ *   dh.set_pqg(p, q, g) -> self
+ *
+ * Sets _p_, _q_, _g_ to the DH instance.
  */
-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;
-
+OSSL_PKEY_BN_DEF3(dh, DH, pqg, p, q, g)
 /*
- * -----BEGIN DH PARAMETERS-----
- * MIGHAoGBAJ0lOVy0VIr/JebWn0zDwY2h+rqITFOpdNr6ugsgvkDXuucdcChhYExJ
- * AV/ZD2AWPbrTqV76mGRgJg4EddgT1zG0jq3rnFdMj2XzkBYx3BVvfR0Arnby0RHR
- * T4h7KZ/2zmjvV+eF8kBUHBJAojUlzxKj4QeO2x20FP9X5xmNUXeDAgEC
- * -----END DH PARAMETERS-----
+ * 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+.
  */
-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;
-}
+OSSL_PKEY_BN_DEF2(dh, DH, key, pub_key, priv_key)
 
 /*
  * INIT
  */
 void
-Init_ossl_dh()
+Init_ossl_dh(void)
 {
 #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
@@ -560,19 +595,19 @@ Init_ossl_dh()
      * 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)
-     *  params = dh1.public_key.to_der #you may send this publicly to the participating party
+     *  der = dh1.public_key.to_der #you may send this publicly to the participating party
      *  dh2 = OpenSSL::PKey::DH.new(der)
      *  dh2.generate_key! #generate the per-session key pair
      *  symm_key1 = dh1.compute_key(dh2.pub_key)
@@ -583,6 +618,7 @@ Init_ossl_dh()
     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_method(cDH, "initialize_copy", ossl_dh_initialize_copy, 1);
     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);
@@ -596,23 +632,19 @@ Init_ossl_dh()
     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, "params", ossl_dh_get_params, 0);
+    rb_define_method(cDH, "set_pqg", ossl_dh_set_pqg, 3);
+    rb_define_method(cDH, "set_key", ossl_dh_set_key, 2);
 
-    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));
+    rb_define_method(cDH, "params", ossl_dh_get_params, 0);
 }
 
 #else /* defined NO_DH */
 void
-Init_ossl_dh()
+Init_ossl_dh(void)
 {
 }
 #endif /* NO_DH */
-
diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c
index 6b10e8fdf8..56cc9dd4f1 100644
--- a/ext/openssl/ossl_pkey_dsa.c
+++ b/ext/openssl/ossl_pkey_dsa.c
@@ -1,26 +1,41 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
-#if !defined(OPENSSL_NO_DSA)
-
 #include "ossl.h"
 
+#if !defined(OPENSSL_NO_DSA)
+
 #define GetPKeyDSA(obj, pkey) do { \
     GetPKey((obj), (pkey)); \
-    if (EVP_PKEY_type((pkey)->type) != EVP_PKEY_DSA) { /* PARANOIA? */ \
+    if (EVP_PKEY_base_id(pkey) != 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)
 
-#define DSA_HAS_PRIVATE(dsa) ((dsa)->priv_key)
-#define DSA_PRIVATE(obj,dsa) (DSA_HAS_PRIVATE(dsa)||OSSL_PKEY_IS_PRIVATE(obj))
+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);
+}
 
 /*
  * Classes
@@ -40,6 +55,7 @@ dsa_instance(VALUE klass, DSA *dsa)
     if (!dsa) {
 	return Qfalse;
     }
+    obj = NewPKey(klass);
     if (!(pkey = EVP_PKEY_new())) {
 	return Qfalse;
     }
@@ -47,7 +63,7 @@ dsa_instance(VALUE klass, DSA *dsa)
 	EVP_PKEY_free(pkey);
 	return Qfalse;
     }
-    WrapPKey(klass, obj, pkey);
+    SetPKey(obj, pkey);
 
     return obj;
 }
@@ -60,10 +76,11 @@ ossl_dsa_new(EVP_PKEY *pkey)
     if (!pkey) {
 	obj = dsa_instance(cDSA, DSA_new());
     } else {
-	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DSA) {
+	obj = NewPKey(cDSA);
+	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DSA) {
 	    ossl_raise(rb_eTypeError, "Not a DSA key!");
 	}
-	WrapPKey(cDSA, obj, pkey);
+	SetPKey(obj, pkey);
     }
     if (obj == Qfalse) {
 	ossl_raise(eDSAError, NULL);
@@ -75,25 +92,73 @@ ossl_dsa_new(EVP_PKEY *pkey)
 /*
  * Private
  */
+struct dsa_blocking_gen_arg {
+    DSA *dsa;
+    int size;
+    int *counter;
+    unsigned long *h;
+    BN_GENCB *cb;
+    int result;
+};
+
+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);
+    return 0;
+}
+
 static DSA *
 dsa_generate(int size)
 {
-    DSA *dsa;
-    unsigned char seed[20];
-    int seed_len = 20, counter;
+    struct ossl_generate_cb_arg cb_arg = { 0 };
+    struct dsa_blocking_gen_arg gen_arg;
+    DSA *dsa = DSA_new();
+    BN_GENCB *cb = BN_GENCB_new();
+    int counter;
     unsigned long h;
 
-    if (!RAND_bytes(seed, seed_len)) {
-	return 0;
+    if (!dsa || !cb) {
+	DSA_free(dsa);
+	BN_GENCB_free(cb);
+	return NULL;
+    }
+
+    if (rb_block_given_p())
+	cb_arg.yield = 1;
+    BN_GENCB_set(cb, ossl_generate_cb_2, &cb_arg);
+    gen_arg.dsa = dsa;
+    gen_arg.size = size;
+    gen_arg.counter = &counter;
+    gen_arg.h = &h;
+    gen_arg.cb = cb;
+    if (cb_arg.yield == 1) {
+	/* we cannot release GVL when callback proc is supplied */
+	dsa_blocking_gen(&gen_arg);
+    } else {
+	/* 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;
     }
-    dsa = DSA_generate_parameters(size, seed, seed_len, &counter, &h,
-	    rb_block_given_p() ? ossl_generate_cb : NULL,
-	    NULL);
-    if(!dsa) return 0;
 
     if (!DSA_generate_key(dsa)) {
 	DSA_free(dsa);
-	return 0;
+	return NULL;
     }
 
     return dsa;
@@ -107,7 +172,7 @@ dsa_generate(int size)
  * from scratch.
  *
  * === Parameters
- * * +size+ is an integer representing the desired key size.
+ * * _size_ is an integer representing the desired key size.
  *
  */
 static VALUE
@@ -126,14 +191,16 @@ ossl_dsa_s_generate(VALUE klass, VALUE size)
 
 /*
  *  call-seq:
- *    DSA.new([size | string [, pass]) -> dsa
+ *    DSA.new -> dsa
+ *    DSA.new(size) -> dsa
+ *    DSA.new(string [, pass]) -> dsa
  *
- * Creates a new DSA instance by reading an existing key from +string+.
+ * Creates a new DSA instance by reading an existing key from _string_.
  *
  * === Parameters
- * * +size+ is an integer representing the desired key size.
- * * +string+ contains a DER or PEM encoded key.
- * * +pass+ is a string that contains an optional password.
+ * * _size_ is an integer representing the desired key size.
+ * * _string_ contains a DER or PEM encoded key.
+ * * _pass_ is a string that contains an optional password.
  *
  * === Examples
  *  DSA.new -> dsa
@@ -148,23 +215,22 @@ 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 (FIXNUM_P(arg)) {
-	if (!(dsa = dsa_generate(FIX2INT(arg)))) {
+    else if (RB_INTEGER_TYPE_P(arg)) {
+	if (!(dsa = dsa_generate(NUM2INT(arg)))) {
 	    ossl_raise(eDSAError, NULL);
 	}
     }
     else {
-	if (!NIL_P(pass)) passwd = StringValuePtr(pass);
+	pass = ossl_pem_passwd_value(pass);
 	arg = ossl_to_der_if_possible(arg);
-	in = ossl_obj2bio(arg);
-	dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
+	in = ossl_obj2bio(&arg);
+	dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, (void *)pass);
 	if (!dsa) {
 	    OSSL_BIO_reset(in);
 	    dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL);
@@ -179,12 +245,15 @@ 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) {
-	    ERR_clear_error();
-	    ossl_raise(eDSAError, "Neither PUB key nor PRIV key:");
+	    ossl_clear_error();
+	    ossl_raise(eDSAError, "Neither PUB key nor PRIV key");
 	}
     }
     if (!EVP_PKEY_assign_DSA(pkey, dsa)) {
@@ -195,6 +264,26 @@ 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
@@ -205,11 +294,13 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_dsa_is_public(VALUE self)
 {
-    EVP_PKEY *pkey;
+    DSA *dsa;
+    const BIGNUM *bn;
 
-    GetPKeyDSA(self, pkey);
+    GetDSA(self, dsa);
+    DSA_get0_key(dsa, &bn, NULL);
 
-    return (pkey->pkey.dsa->pub_key) ? Qtrue : Qfalse;
+    return bn ? Qtrue : Qfalse;
 }
 
 /*
@@ -222,22 +313,24 @@ ossl_dsa_is_public(VALUE self)
 static VALUE
 ossl_dsa_is_private(VALUE self)
 {
-    EVP_PKEY *pkey;
+    DSA *dsa;
 
-    GetPKeyDSA(self, pkey);
+    GetDSA(self, dsa);
 
-    return (DSA_PRIVATE(self, pkey->pkey.dsa)) ? Qtrue : Qfalse;
+    return DSA_PRIVATE(self, dsa) ? Qtrue : Qfalse;
 }
 
 /*
  *  call-seq:
+ *    dsa.export([cipher, password]) -> aString
  *    dsa.to_pem([cipher, password]) -> aString
+ *    dsa.to_s([cipher, password]) -> aString
  *
  * Encodes this DSA to its PEM encoding.
  *
  * === Parameters
- * * +cipher+ is an OpenSSL::Cipher.
- * * +password+ is a string containing your password.
+ * * _cipher_ is an OpenSSL::Cipher.
+ * * _password_ is a string containing your password.
  *
  * === Examples
  *  DSA.to_pem -> aString
@@ -247,31 +340,28 @@ ossl_dsa_is_private(VALUE self)
 static VALUE
 ossl_dsa_export(int argc, VALUE *argv, VALUE self)
 {
-    EVP_PKEY *pkey;
+    DSA *dsa;
     BIO *out;
     const EVP_CIPHER *ciph = NULL;
-    char *passwd = NULL;
     VALUE cipher, pass, str;
 
-    GetPKeyDSA(self, pkey);
+    GetDSA(self, dsa);
     rb_scan_args(argc, argv, "02", &cipher, &pass);
     if (!NIL_P(cipher)) {
-	ciph = GetCipherPtr(cipher);
-	if (!NIL_P(pass)) {
-	    passwd = StringValuePtr(pass);
-	}
+	ciph = ossl_evp_get_cipherbyname(cipher);
+	pass = ossl_pem_passwd_value(pass);
     }
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eDSAError, NULL);
     }
-    if (DSA_HAS_PRIVATE(pkey->pkey.dsa)) {
-	if (!PEM_write_bio_DSAPrivateKey(out, pkey->pkey.dsa, ciph,
-					 NULL, 0, ossl_pem_passwd_cb, passwd)){
+    if (DSA_HAS_PRIVATE(dsa)) {
+	if (!PEM_write_bio_DSAPrivateKey(out, dsa, ciph, NULL, 0,
+					 ossl_pem_passwd_cb, (void *)pass)){
 	    BIO_free(out);
 	    ossl_raise(eDSAError, NULL);
 	}
     } else {
-	if (!PEM_write_bio_DSA_PUBKEY(out, pkey->pkey.dsa)) {
+	if (!PEM_write_bio_DSA_PUBKEY(out, dsa)) {
 	    BIO_free(out);
 	    ossl_raise(eDSAError, NULL);
 	}
@@ -291,28 +381,29 @@ ossl_dsa_export(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_dsa_to_der(VALUE self)
 {
-    EVP_PKEY *pkey;
-    int (*i2d_func)_((DSA*, unsigned char**));
+    DSA *dsa;
+    int (*i2d_func)(DSA *, unsigned char **);
     unsigned char *p;
     long len;
     VALUE str;
 
-    GetPKeyDSA(self, pkey);
-    if(DSA_HAS_PRIVATE(pkey->pkey.dsa))
-	i2d_func = (int(*)_((DSA*,unsigned char**)))i2d_DSAPrivateKey;
+    GetDSA(self, dsa);
+    if(DSA_HAS_PRIVATE(dsa))
+	i2d_func = (int (*)(DSA *,unsigned char **))i2d_DSAPrivateKey;
     else
 	i2d_func = i2d_DSA_PUBKEY;
-    if((len = i2d_func(pkey->pkey.dsa, NULL)) <= 0)
+    if((len = i2d_func(dsa, NULL)) <= 0)
 	ossl_raise(eDSAError, NULL);
     str = rb_str_new(0, len);
     p = (unsigned char *)RSTRING_PTR(str);
-    if(i2d_func(pkey->pkey.dsa, &p) < 0)
+    if(i2d_func(dsa, &p) < 0)
 	ossl_raise(eDSAError, NULL);
     ossl_str_adjust(str, p);
 
     return str;
 }
 
+
 /*
  *  call-seq:
  *    dsa.params -> hash
@@ -324,18 +415,20 @@ ossl_dsa_to_der(VALUE self)
 static VALUE
 ossl_dsa_get_params(VALUE self)
 {
-    EVP_PKEY *pkey;
+    DSA *dsa;
     VALUE hash;
+    const BIGNUM *p, *q, *g, *pub_key, *priv_key;
 
-    GetPKeyDSA(self, pkey);
+    GetDSA(self, dsa);
+    DSA_get0_pqg(dsa, &p, &q, &g);
+    DSA_get0_key(dsa, &pub_key, &priv_key);
 
     hash = rb_hash_new();
-
-    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));
+    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));
 
     return hash;
 }
@@ -351,15 +444,15 @@ ossl_dsa_get_params(VALUE self)
 static VALUE
 ossl_dsa_to_text(VALUE self)
 {
-    EVP_PKEY *pkey;
+    DSA *dsa;
     BIO *out;
     VALUE str;
 
-    GetPKeyDSA(self, pkey);
+    GetDSA(self, dsa);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eDSAError, NULL);
     }
-    if (!DSA_print(out, pkey->pkey.dsa, 0)) { /* offset = 0 */
+    if (!DSA_print(out, dsa, 0)) { /* offset = 0 */
 	BIO_free(out);
 	ossl_raise(eDSAError, NULL);
     }
@@ -394,8 +487,11 @@ ossl_dsa_to_public_key(VALUE self)
 
     GetPKeyDSA(self, pkey);
     /* err check performed by dsa_instance */
-    dsa = DSAPublicKey_dup(pkey->pkey.dsa);
-    obj = dsa_instance(CLASS_OF(self), dsa);
+#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);
     if (obj == Qfalse) {
 	DSA_free(dsa);
 	ossl_raise(eDSAError, NULL);
@@ -403,18 +499,16 @@ 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
  *
- * Computes and returns the DSA signature of +string+, where +string+ is
+ * Computes and returns the DSA signature of _string_, where _string_ is
  * expected to be an already-computed message digest of the original input
  * data. The signature is issued using the private key of this DSA instance.
  *
  * === Parameters
- * * +string+ is a message digest of the original input data to be signed
+ * * _string_ is a message digest of the original input data to be signed.
  *
  * === Example
  *  dsa = OpenSSL::PKey::DSA.new(2048)
@@ -427,19 +521,22 @@ ossl_dsa_to_public_key(VALUE self)
 static VALUE
 ossl_dsa_sign(VALUE self, VALUE data)
 {
-    EVP_PKEY *pkey;
+    DSA *dsa;
+    const BIGNUM *dsa_q;
     unsigned int buf_len;
     VALUE str;
 
-    GetPKeyDSA(self, pkey);
-    StringValue(data);
-    if (!DSA_PRIVATE(self, pkey->pkey.dsa)) {
+    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!");
-    }
-    str = rb_str_new(0, ossl_dsa_buf_size(pkey));
+    StringValue(data);
+    str = rb_str_new(0, DSA_size(dsa));
     if (!DSA_sign(0, (unsigned char *)RSTRING_PTR(data), RSTRING_LENINT(data),
 		  (unsigned char *)RSTRING_PTR(str),
-		  &buf_len, pkey->pkey.dsa)) { /* type is ignored (0) */
+		  &buf_len, dsa)) { /* type is ignored (0) */
 	ossl_raise(eDSAError, NULL);
     }
     rb_str_set_len(str, buf_len);
@@ -452,11 +549,11 @@ ossl_dsa_sign(VALUE self, VALUE data)
  *    dsa.sysverify(digest, sig) -> true | false
  *
  * Verifies whether the signature is valid given the message digest input. It
- * does so by validating +sig+ using the public key of this DSA instance.
+ * does so by validating _sig_ using the public key of this DSA instance.
  *
  * === Parameters
- * * +digest+ is a message digest of the original input data to be signed
- * * +sig+ is a DSA signature value
+ * * _digest_ is a message digest of the original input data to be signed
+ * * _sig_ is a DSA signature value
  *
  * === Example
  *  dsa = OpenSSL::PKey::DSA.new(2048)
@@ -469,15 +566,15 @@ ossl_dsa_sign(VALUE self, VALUE data)
 static VALUE
 ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
 {
-    EVP_PKEY *pkey;
+    DSA *dsa;
     int ret;
 
-    GetPKeyDSA(self, pkey);
+    GetDSA(self, dsa);
     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), pkey->pkey.dsa);
+		     (unsigned char *)RSTRING_PTR(sig), RSTRING_LENINT(sig), dsa);
     if (ret < 0) {
 	ossl_raise(eDSAError, NULL);
     }
@@ -488,21 +585,33 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
     return Qfalse;
 }
 
-OSSL_PKEY_BN(dsa, p)
-OSSL_PKEY_BN(dsa, q)
-OSSL_PKEY_BN(dsa, g)
-OSSL_PKEY_BN(dsa, pub_key)
-OSSL_PKEY_BN(dsa, priv_key)
+/*
+ * Document-method: OpenSSL::PKey::DSA#set_pqg
+ * call-seq:
+ *   dsa.set_pqg(p, q, g) -> self
+ *
+ * Sets _p_, _q_, _g_ to 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)
 
 /*
  * INIT
  */
 void
-Init_ossl_dsa()
+Init_ossl_dsa(void)
 {
 #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
@@ -518,17 +627,12 @@ Init_ossl_dsa()
      * DSA, the Digital Signature Algorithm, is specified in NIST's
      * FIPS 186-3. It is an asymmetric public key algorithm that may be used
      * similar to e.g. RSA.
-     * Please note that for OpenSSL versions prior to 1.0.0 the digest
-     * algorithms OpenSSL::Digest::DSS (equivalent to SHA) or
-     * OpenSSL::Digest::DSS1 (equivalent to SHA-1) must be used for issuing
-     * signatures with a DSA key using OpenSSL::PKey#sign.
-     * Starting with OpenSSL 1.0.0, digest algorithms are no longer restricted,
-     * any Digest may be used for signing.
      */
     cDSA = rb_define_class_under(mPKey, "DSA", cPKey);
 
     rb_define_singleton_method(cDSA, "generate", ossl_dsa_s_generate, 1);
     rb_define_method(cDSA, "initialize", ossl_dsa_initialize, -1);
+    rb_define_method(cDSA, "initialize_copy", ossl_dsa_initialize_copy, 1);
 
     rb_define_method(cDSA, "public?", ossl_dsa_is_public, 0);
     rb_define_method(cDSA, "private?", ossl_dsa_is_private, 0);
@@ -546,13 +650,15 @@ Init_ossl_dsa()
     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()
+Init_ossl_dsa(void)
 {
 }
 #endif /* NO_DSA */
diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c
index 9f1050f62d..8bb611248b 100644
--- a/ext/openssl/ossl_pkey_ec.c
+++ b/ext/openssl/ossl_pkey_ec.c
@@ -4,89 +4,41 @@
 
 #include "ossl.h"
 
-#if !defined(OPENSSL_NO_EC) && (OPENSSL_VERSION_NUMBER >= 0x0090802fL)
-
-typedef struct {
-	EC_GROUP *group;
-	int dont_free;
-} ossl_ec_group;
-
-typedef struct {
-	EC_POINT *point;
-	int dont_free;
-} ossl_ec_point;
-
+#if !defined(OPENSSL_NO_EC)
 
 #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_type((pkey)->type) != EVP_PKEY_EC) { \
+    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_EC) { \
 	ossl_raise(rb_eRuntimeError, "THIS IS NOT A EC PKEY!"); \
     } \
 } while (0)
-
-#define SafeGet_ec_group(obj, group) do { \
-    OSSL_Check_Kind((obj), cEC_GROUP); \
-    Data_Get_Struct((obj), ossl_ec_group, (group)); \
-} while(0)
-
-#define Get_EC_KEY(obj, key) do { \
-    EVP_PKEY *pkey; \
-    GetPKeyEC((obj), pkey); \
-    (key) = pkey->pkey.ec; \
-} while(0)
-
-#define Require_EC_KEY(obj, key) do { \
-    Get_EC_KEY((obj), (key)); \
-    if ((key) == NULL) \
-        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)); \
+#define GetEC(obj, key) do { \
+    EVP_PKEY *_pkey; \
+    GetPKeyEC(obj, _pkey); \
+    (key) = EVP_PKEY_get0_EC_KEY(_pkey); \
 } while (0)
 
-#define Get_EC_GROUP(obj, g) do { \
-    ossl_ec_group *ec_group; \
-    Data_Get_Struct((obj), ossl_ec_group, ec_group); \
-    if (ec_group == NULL) \
-        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)); \
+#define GetECGroup(obj, group) do { \
+    TypedData_Get_Struct(obj, EC_GROUP, &ossl_ec_group_type, group); \
     if ((group) == NULL) \
-        ossl_raise(eEC_GROUP, "EC_GROUP is not initialized"); \
-} while(0)
-
-#define SafeRequire_EC_GROUP(obj, group) do { \
-    OSSL_Check_Kind((obj), cEC_GROUP); \
-    Require_EC_GROUP((obj), (group)); \
-} while(0)
-
-#define Get_EC_POINT(obj, p) do { \
-    ossl_ec_point *ec_point; \
-    Data_Get_Struct((obj), ossl_ec_point, ec_point); \
-    if (ec_point == NULL) \
-        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)
+	ossl_raise(eEC_GROUP, "EC_GROUP is not initialized"); \
+} while (0)
 
-#define SafeRequire_EC_POINT(obj, point) do { \
-    OSSL_Check_Kind((obj), cEC_POINT); \
-    Require_EC_POINT((obj), (point)); \
-} while(0)
+#define GetECPoint(obj, point) do { \
+    TypedData_Get_Struct(obj, EC_POINT, &ossl_ec_point_type, point); \
+    if ((point) == NULL) \
+	ossl_raise(eEC_POINT, "EC_POINT is not initialized"); \
+} while (0)
+#define GetECPointGroup(obj, group) do { \
+    VALUE _group = rb_attr_get(obj, id_i_group); \
+    GetECGroup(_group, group); \
+} while (0)
 
 VALUE cEC;
 VALUE eECError;
@@ -106,6 +58,11 @@ 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;
@@ -114,6 +71,7 @@ static VALUE ec_instance(VALUE klass, EC_KEY *ec)
     if (!ec) {
 	return Qfalse;
     }
+    obj = NewPKey(klass);
     if (!(pkey = EVP_PKEY_new())) {
 	return Qfalse;
     }
@@ -121,7 +79,7 @@ static VALUE ec_instance(VALUE klass, EC_KEY *ec)
 	EVP_PKEY_free(pkey);
 	return Qfalse;
     }
-    WrapPKey(klass, obj, pkey);
+    SetPKey(obj, pkey);
 
     return obj;
 }
@@ -133,10 +91,11 @@ VALUE ossl_ec_new(EVP_PKEY *pkey)
     if (!pkey) {
 	obj = ec_instance(cEC, EC_KEY_new());
     } else {
-	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_EC) {
+	obj = NewPKey(cEC);
+	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_EC) {
 	    ossl_raise(rb_eTypeError, "Not a EC key!");
 	}
-	WrapPKey(cEC, obj, pkey);
+	SetPKey(obj, pkey);
     }
     if (obj == Qfalse) {
 	ossl_raise(eECError, NULL);
@@ -145,168 +104,196 @@ 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;
+
+	GetECGroup(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);
+    }
 
-/*  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)
+    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)
  *
- *  See the OpenSSL documentation for:
- *     EC_KEY_*
+ * Creates a new EC object from given arguments.
  */
 static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
 {
     EVP_PKEY *pkey;
-    EC_KEY *ec = NULL;
+    EC_KEY *ec;
     VALUE arg, pass;
-    VALUE group = Qnil;
-    char *passwd = NULL;
 
     GetPKey(self, pkey);
-    if (pkey->pkey.ec)
+    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_NONE)
         ossl_raise(eECError, "EC_KEY already initialized");
 
     rb_scan_args(argc, argv, "02", &arg, &pass);
 
     if (NIL_P(arg)) {
-        ec = EC_KEY_new();
+        if (!(ec = EC_KEY_new()))
+	    ossl_raise(eECError, NULL);
+    } else if (rb_obj_is_kind_of(arg, cEC)) {
+	EC_KEY *other_ec = NULL;
+
+	GetEC(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);
     } else {
-        if (rb_obj_is_kind_of(arg, cEC)) {
-            EC_KEY *other_ec = NULL;
-
-            SafeRequire_EC_KEY(arg, other_ec);
-            ec = EC_KEY_dup(other_ec);
-        } else if (rb_obj_is_kind_of(arg, cEC_GROUP)) {
-        	ec = EC_KEY_new();
-        	group = arg;
-        } else {
-            BIO *in = ossl_obj2bio(arg);
+	BIO *in;
 
-            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);
-            }
-
-            BIO_free(in);
+	pass = ossl_pem_passwd_value(pass);
+	in = ossl_obj2bio(&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 = 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);
 
-                EC_KEY_set_asn1_flag(ec, OPENSSL_EC_NAMED_CURVE);
-                EC_KEY_set_conv_form(ec, POINT_CONVERSION_UNCOMPRESSED);
-            }
-        }
+	if (!ec) {
+	    ossl_clear_error();
+	    ec = ec_key_new_from_group(arg);
+	}
     }
 
-    if (ec == NULL)
-        ossl_raise(eECError, NULL);
-
     if (!EVP_PKEY_assign_EC_KEY(pkey, ec)) {
 	EC_KEY_free(ec);
 	ossl_raise(eECError, "EVP_PKEY_assign_EC_KEY");
     }
 
-    rb_iv_set(self, "@group", Qnil);
+    return self;
+}
 
-    if (!NIL_P(group))
-        rb_funcall(self, rb_intern("group="), 1, arg);
+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");
+    GetEC(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");
+    }
 
     return self;
 }
 
 /*
- *  call-seq:
- *     key.group   => group
+ * call-seq:
+ *   key.group   => group
  *
- *  Returns a constant <code>OpenSSL::EC::Group</code> that is tied to the key.
- *  Modifying the returned group can make the key invalid.
+ * Returns the EC::Group that the key is associated with. Modifying the returned
+ * group does not affect _key_.
  */
-static VALUE ossl_ec_key_get_group(VALUE self)
+static VALUE
+ossl_ec_key_get_group(VALUE self)
 {
-    VALUE group_v;
     EC_KEY *ec;
-    ossl_ec_group *ec_group;
-    EC_GROUP *group;
-
-    Require_EC_KEY(self, ec);
-
-    group_v = rb_iv_get(self, "@group");
-    if (!NIL_P(group_v))
-        return group_v;
+    const EC_GROUP *group;
 
-    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;
-    }
+    GetEC(self, ec);
+    group = EC_KEY_get0_group(ec);
+    if (!group)
+	return Qnil;
 
-    return Qnil;
+    return ec_group_new(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.
- *
- *  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.
+ * call-seq:
+ *   key.group = group
  *
- *  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.
+ * Sets the EC::Group for the key. The group structure is internally copied so
+ * modification to _group_ after assigning to a key has no effect on the key.
  */
-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;
 
-    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);
+    GetEC(self, ec);
+    GetECGroup(group_v, group);
 
     if (EC_KEY_set_group(ec, group) != 1)
         ossl_raise(eECError, "EC_KEY_set_group");
@@ -325,8 +312,7 @@ static VALUE ossl_ec_key_get_private_key(VALUE self)
     EC_KEY *ec;
     const BIGNUM *bn;
 
-    Require_EC_KEY(self, ec);
-
+    GetEC(self, ec);
     if ((bn = EC_KEY_get0_private_key(ec)) == NULL)
         return Qnil;
 
@@ -344,7 +330,7 @@ static VALUE ossl_ec_key_set_private_key(VALUE self, VALUE private_key)
     EC_KEY *ec;
     BIGNUM *bn = NULL;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
     if (!NIL_P(private_key))
         bn = GetBNPtr(private_key);
 
@@ -361,26 +347,6 @@ 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
@@ -391,18 +357,12 @@ 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;
 
-    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);
+    return ec_point_new(point, EC_KEY_get0_group(ec));
 }
 
 /*
@@ -416,9 +376,9 @@ static VALUE ossl_ec_key_set_public_key(VALUE self, VALUE public_key)
     EC_KEY *ec;
     EC_POINT *point = NULL;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
     if (!NIL_P(public_key))
-        SafeRequire_EC_POINT(public_key, point);
+        GetECPoint(public_key, point);
 
     switch (EC_KEY_set_public_key(ec, point)) {
     case 1:
@@ -435,32 +395,34 @@ static VALUE ossl_ec_key_set_public_key(VALUE self, VALUE public_key)
 
 /*
  *  call-seq:
- *     key.public_key? => true or false
+ *     key.public? => true or false
  *
- *  Both public_key? and private_key? may return false at the same time unlike other PKey classes.
+ *  Returns whether this EC instance has a public key. The public key
+ *  (EC::Point) can be retrieved with EC#public_key.
  */
-static VALUE ossl_ec_key_is_public_key(VALUE self)
+static VALUE ossl_ec_key_is_public(VALUE self)
 {
     EC_KEY *ec;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
 
-    return (EC_KEY_get0_public_key(ec) ? Qtrue : Qfalse);
+    return EC_KEY_get0_public_key(ec) ? Qtrue : Qfalse;
 }
 
 /*
  *  call-seq:
- *     key.private_key? => true or false
+ *     key.private? => true or false
  *
- *  Both public_key? and private_key? may return false at the same time unlike other PKey classes.
+ *  Returns whether this EC instance has a private key. The private key (BN) can
+ *  be retrieved with EC#private_key.
  */
-static VALUE ossl_ec_key_is_private_key(VALUE self)
+static VALUE ossl_ec_key_is_private(VALUE self)
 {
     EC_KEY *ec;
 
-    Require_EC_KEY(self, ec);
+    GetEC(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)
@@ -469,10 +431,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;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
 
     if (EC_KEY_get0_public_key(ec) == NULL)
         ossl_raise(eECError, "can't export - no public key set");
@@ -483,23 +445,18 @@ 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 = ossl_evp_get_cipherbyname(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) {
-	    const EVP_CIPHER *cipher;
-	    if (!NIL_P(ciph)) {
-		cipher = GetCipherPtr(ciph);
-		if (!NIL_P(pass)) {
-		    password = StringValuePtr(pass);
-		}
-	    }
-	    else {
-		cipher = NULL;
-	    }
-            i = PEM_write_bio_ECPrivateKey(out, ec, cipher, NULL, 0, NULL, password);
+            i = PEM_write_bio_ECPrivateKey(out, ec, cipher, NULL, 0, ossl_pem_passwd_cb, (void *)pass);
     	} else {
             i = PEM_write_bio_EC_PUBKEY(out, ec);
         }
@@ -530,17 +487,15 @@ static VALUE ossl_ec_key_to_string(VALUE self, VALUE ciph, VALUE pass, int forma
 
 /*
  *  call-seq:
- *     key.to_pem   => 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::Cipher instance. Note that encryption will only be
- * effective for a private key, public keys will always be encoded in plain
- * text.
+ *     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.
  */
-static VALUE ossl_ec_key_to_pem(int argc, VALUE *argv, VALUE self)
+static VALUE ossl_ec_key_export(int argc, VALUE *argv, VALUE self)
 {
     VALUE cipher, passwd;
     rb_scan_args(argc, argv, "02", &cipher, &passwd);
@@ -570,7 +525,7 @@ static VALUE ossl_ec_key_to_text(VALUE self)
     BIO *out;
     VALUE str;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eECError, "BIO_new(BIO_s_mem())");
     }
@@ -585,16 +540,23 @@ static VALUE ossl_ec_key_to_text(VALUE self)
 
 /*
  *  call-seq:
- *     key.generate_key   => self
+ *     key.generate_key!   => self
+ *
+ * Generates a new random private and public key.
+ *
+ * See also the OpenSSL documentation for EC_KEY_generate_key()
  *
- *  See 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>
  */
 static VALUE ossl_ec_key_generate_key(VALUE self)
 {
     EC_KEY *ec;
 
-    Require_EC_KEY(self, ec);
-
+    GetEC(self, ec);
     if (EC_KEY_generate_key(ec) != 1)
 	ossl_raise(eECError, "EC_KEY_generate_key");
 
@@ -613,8 +575,7 @@ static VALUE ossl_ec_key_check_key(VALUE self)
 {
     EC_KEY *ec;
 
-    Require_EC_KEY(self, ec);
-
+    GetEC(self, ec);
     if (EC_KEY_check_key(ec) != 1)
 	ossl_raise(eECError, "EC_KEY_check_key");
 
@@ -634,8 +595,8 @@ static VALUE ossl_ec_key_dh_compute_key(VALUE self, VALUE pubkey)
     int buf_len;
     VALUE str;
 
-    Require_EC_KEY(self, ec);
-    SafeRequire_EC_POINT(pubkey, point);
+    GetEC(self, ec);
+    GetECPoint(pubkey, point);
 
 /* BUG: need a way to figure out the maximum string size */
     buf_len = 1024;
@@ -664,17 +625,16 @@ static VALUE ossl_ec_key_dsa_sign_asn1(VALUE self, VALUE data)
     unsigned int buf_len;
     VALUE str;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
     StringValue(data);
 
     if (EC_KEY_get0_private_key(ec) == NULL)
 	ossl_raise(eECError, "Private EC key needed!");
 
-    str = rb_str_new(0, ECDSA_size(ec) + 16);
+    str = rb_str_new(0, ECDSA_size(ec));
     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_resize(str, buf_len);
+	ossl_raise(eECError, "ECDSA_sign");
+    rb_str_set_len(str, buf_len);
 
     return str;
 }
@@ -689,7 +649,7 @@ static VALUE ossl_ec_key_dsa_verify_asn1(VALUE self, VALUE data, VALUE sig)
 {
     EC_KEY *ec;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
     StringValue(data);
     StringValue(sig);
 
@@ -700,49 +660,76 @@ static VALUE ossl_ec_key_dsa_verify_asn1(VALUE self, VALUE data, VALUE sig)
     }
 
     ossl_raise(eECError, "ECDSA_verify");
+
+    UNREACHABLE;
+}
+
+/*
+ * OpenSSL::PKey::EC::Group
+ */
+static void
+ossl_ec_group_free(void *ptr)
+{
+    EC_GROUP_clear_free(ptr);
 }
 
-static void ossl_ec_group_free(ossl_ec_group *ec_group)
+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)
 {
-    if (!ec_group->dont_free && ec_group->group)
-        EC_GROUP_clear_free(ec_group->group);
-    ruby_xfree(ec_group);
+    return TypedData_Wrap_Struct(klass, &ossl_ec_group_type, NULL);
 }
 
-static VALUE ossl_ec_group_alloc(VALUE klass)
+static VALUE
+ec_group_new(const EC_GROUP *group)
 {
-    ossl_ec_group *ec_group;
     VALUE obj;
+    EC_GROUP *group_new;
 
-    obj = Data_Make_Struct(klass, ossl_ec_group, 0, ossl_ec_group_free, ec_group);
+    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;
 
     return obj;
 }
 
-/*  call-seq:
- *     OpenSSL::PKey::EC::Group.new("secp112r1")
- *     OpenSSL::PKey::EC::Group.new(ec_group)
- *     OpenSSL::PKey::EC::Group.new(pem_string)
- *     OpenSSL::PKey::EC::Group.new(der_string)
- *     OpenSSL::PKey::EC::Group.new(pem_file)
- *     OpenSSL::PKey::EC::Group.new(der_file)
- *     OpenSSL::PKey::EC::Group.new(:GFp_simple)
- *     OpenSSL::PKey::EC::Group.new(:GFp_mult)
- *     OpenSSL::PKey::EC::Group.new(:GFp_nist)
- *     OpenSSL::PKey::EC::Group.new(:GF2m_simple)
- *     OpenSSL::PKey::EC::Group.new(:GFp, bignum_p, bignum_a, bignum_b)
- *     OpenSSL::PKey::EC::Group.new(:GF2m, bignum_p, bignum_a, bignum_b)
- *
- *  See the OpenSSL documentation for EC_GROUP_*
+/*
+ * 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:
+ *
+ * * :GFp_simple
+ * * :GFp_mont
+ * * :GFp_nist
+ * * :GF2m_simple
+ *
+ * If the first argument is :GFp or :GF2m, creates a new curve with given
+ * parameters.
  */
 static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2, arg3, arg4;
-    ossl_ec_group *ec_group;
-    EC_GROUP *group = NULL;
+    EC_GROUP *group;
 
-    Data_Get_Struct(self, ossl_ec_group, ec_group);
-    if (ec_group->group != NULL)
+    TypedData_Get_Struct(self, EC_GROUP, &ossl_ec_group_type, group);
+    if (group)
         ossl_raise(rb_eRuntimeError, "EC_GROUP is already initialized");
 
     switch (rb_scan_args(argc, argv, "13", &arg1, &arg2, &arg3, &arg4)) {
@@ -757,8 +744,10 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
                 method = EC_GFp_mont_method();
             } else if (id == s_GFp_nist) {
                 method = EC_GFp_nist_method();
+#if !defined(OPENSSL_NO_EC2M)
             } else if (id == s_GF2m_simple) {
                 method = EC_GF2m_simple_method();
+#endif
             }
 
             if (method) {
@@ -770,11 +759,11 @@ 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;
 
-            SafeRequire_EC_GROUP(arg1, arg1_group);
+            GetECGroup(arg1, arg1_group);
             if ((group = EC_GROUP_dup(arg1_group)) == NULL)
                 ossl_raise(eEC_GROUP, "EC_GROUP_dup");
         } else {
-            BIO *in = ossl_obj2bio(arg1);
+            BIO *in = ossl_obj2bio(&arg1);
 
             group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
             if (!group) {
@@ -788,13 +777,13 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
                 const char *name = StringValueCStr(arg1);
                 int nid = OBJ_sn2nid(name);
 
-		(void)ERR_get_error();
+		ossl_clear_error(); /* ignore errors in d2i_ECPKParameters_bio() */
                 if (nid == NID_undef)
-                    ossl_raise(eEC_GROUP, "unknown curve name (%s)", name);
+                    ossl_raise(eEC_GROUP, "unknown curve name (%"PRIsVALUE")", arg1);
 
                 group = EC_GROUP_new_by_curve_name(nid);
                 if (group == NULL)
-                    ossl_raise(eEC_GROUP, "unable to create curve (%s)", name);
+                    ossl_raise(eEC_GROUP, "unable to create curve (%"PRIsVALUE")", arg1);
 
                 EC_GROUP_set_asn1_flag(group, OPENSSL_EC_NAMED_CURVE);
                 EC_GROUP_set_point_conversion_form(group, POINT_CONVERSION_UNCOMPRESSED);
@@ -812,8 +801,10 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
 
             if (id == s_GFp) {
                 new_curve = EC_GROUP_new_curve_GFp;
+#if !defined(OPENSSL_NO_EC2M)
             } else if (id == s_GF2m) {
                 new_curve = EC_GROUP_new_curve_GF2m;
+#endif
             } else {
                 ossl_raise(rb_eArgError, "unknown symbol, must be :GFp or :GF2m");
             }
@@ -831,22 +822,43 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
 
     if (group == NULL)
         ossl_raise(eEC_GROUP, "");
+    RTYPEDDATA_DATA(self) = group;
 
-    ec_group->group = 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");
+    GetECGroup(other, group);
+
+    group_new = EC_GROUP_dup(group);
+    if (!group_new)
+	ossl_raise(eEC_GROUP, "EC_GROUP_dup");
+    RTYPEDDATA_DATA(self) = group_new;
 
     return self;
 }
 
-/*  call-seq:
- *     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;
 
-    Require_EC_GROUP(a, group1);
-    SafeRequire_EC_GROUP(b, group2);
+    GetECGroup(a, group1);
+    GetECGroup(b, group2);
 
     if (EC_GROUP_cmp(group1, group2, ossl_bn_ctx) == 1)
        return Qfalse;
@@ -854,27 +866,35 @@ static VALUE ossl_ec_group_eql(VALUE a, VALUE b)
     return Qtrue;
 }
 
-/*  call-seq:
- *     group.generator   => ec_point
+/*
+ * call-seq:
+ *   group.generator   => ec_point
+ *
+ * Returns the generator of the group.
  *
- *  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)
 {
-    VALUE point_obj;
-    EC_GROUP *group = NULL;
-
-    Require_EC_GROUP(self, group);
+    EC_GROUP *group;
+    const EC_POINT *generator;
 
-    point_obj = ossl_ec_point_dup(EC_GROUP_get0_generator(group), self);
+    GetECGroup(self, group);
+    generator = EC_GROUP_get0_generator(group);
+    if (!generator)
+	return Qnil;
 
-    return point_obj;
+    return ec_point_new(generator, group);
 }
 
-/*  call-seq:
- *     group.set_generator(generator, order, cofactor)   => self
+/*
+ * call-seq:
+ *   group.set_generator(generator, order, cofactor)   => self
  *
- *  See the OpenSSL documentation for EC_GROUP_set_generator()
+ * Sets the curve parameters. _generator_ must be an instance of EC::Point that
+ * is on the curve. _order_ and _cofactor_ are integers.
+ *
+ * See the OpenSSL documentation for EC_GROUP_set_generator()
  */
 static VALUE ossl_ec_group_set_generator(VALUE self, VALUE generator, VALUE order, VALUE cofactor)
 {
@@ -882,8 +902,8 @@ static VALUE ossl_ec_group_set_generator(VALUE self, VALUE generator, VALUE orde
     const EC_POINT *point;
     const BIGNUM *o, *co;
 
-    Require_EC_GROUP(self, group);
-    SafeRequire_EC_POINT(generator, point);
+    GetECGroup(self, group);
+    GetECPoint(generator, point);
     o = GetBNPtr(order);
     co = GetBNPtr(cofactor);
 
@@ -893,10 +913,13 @@ static VALUE ossl_ec_group_set_generator(VALUE self, VALUE generator, VALUE orde
     return self;
 }
 
-/*  call-seq:
- *     group.get_order   => order_bn
+/*
+ * call-seq:
+ *   group.get_order   => order_bn
  *
- *  See the OpenSSL documentation for EC_GROUP_get_order()
+ * Returns the order of the group.
+ *
+ * See the OpenSSL documentation for EC_GROUP_get_order()
  */
 static VALUE ossl_ec_group_get_order(VALUE self)
 {
@@ -904,7 +927,7 @@ static VALUE ossl_ec_group_get_order(VALUE self)
     BIGNUM *bn;
     EC_GROUP *group = NULL;
 
-    Require_EC_GROUP(self, group);
+    GetECGroup(self, group);
 
     bn_obj = ossl_bn_new(NULL);
     bn = GetBNPtr(bn_obj);
@@ -915,10 +938,13 @@ static VALUE ossl_ec_group_get_order(VALUE self)
     return bn_obj;
 }
 
-/*  call-seq:
- *     group.get_cofactor   => cofactor_bn
+/*
+ * call-seq:
+ *   group.get_cofactor   => cofactor_bn
  *
- *  See the OpenSSL documentation for EC_GROUP_get_cofactor()
+ * Returns the cofactor of the group.
+ *
+ * See the OpenSSL documentation for EC_GROUP_get_cofactor()
  */
 static VALUE ossl_ec_group_get_cofactor(VALUE self)
 {
@@ -926,7 +952,7 @@ static VALUE ossl_ec_group_get_cofactor(VALUE self)
     BIGNUM *bn;
     EC_GROUP *group = NULL;
 
-    Require_EC_GROUP(self, group);
+    GetECGroup(self, group);
 
     bn_obj = ossl_bn_new(NULL);
     bn = GetBNPtr(bn_obj);
@@ -937,17 +963,20 @@ static VALUE ossl_ec_group_get_cofactor(VALUE self)
     return bn_obj;
 }
 
-/*  call-seq:
- *     group.curve_name  => String
+/*
+ * call-seq:
+ *   group.curve_name  => String
+ *
+ * Returns the curve name (sn).
  *
- *  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;
 
-    Get_EC_GROUP(self, group);
+    GetECGroup(self, group);
     if (group == NULL)
         return Qnil;
 
@@ -957,10 +986,14 @@ static VALUE ossl_ec_group_get_curve_name(VALUE self)
     return rb_str_new2(OBJ_nid2sn(nid));
 }
 
-/*  call-seq:
- *     EC.builtin_curves => [[name, comment], ...]
+/*
+ * call-seq:
+ *   EC.builtin_curves => [[sn, comment], ...]
+ *
+ * Obtains a list of all predefined curves by the OpenSSL. Curve names are
+ * returned as sn.
  *
- *  See the OpenSSL documentation for EC_builtin_curves()
+ * See the OpenSSL documentation for EC_get_builtin_curves().
  */
 static VALUE ossl_s_builtin_curves(VALUE self)
 {
@@ -990,43 +1023,56 @@ static VALUE ossl_s_builtin_curves(VALUE self)
     return ret;
 }
 
-/*  call-seq:
- *     group.asn1_flag  => Fixnum
+/*
+ * call-seq:
+ *   group.asn1_flag -> Integer
+ *
+ * Returns the flags set on the group.
  *
- *  See the OpenSSL documentation for EC_GROUP_get_asn1_flag()
+ * See also #asn1_flag=.
  */
 static VALUE ossl_ec_group_get_asn1_flag(VALUE self)
 {
     EC_GROUP *group = NULL;
     int flag;
 
-    Require_EC_GROUP(self, group);
-
+    GetECGroup(self, group);
     flag = EC_GROUP_get_asn1_flag(group);
 
-    return INT2FIX(flag);
+    return INT2NUM(flag);
 }
 
-/*  call-seq:
- *     group.asn1_flag = Fixnum   => Fixnum
+/*
+ * call-seq:
+ *   group.asn1_flag = flags
  *
- *  See the OpenSSL documentation for EC_GROUP_set_asn1_flag()
+ * 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:
+ *
+ * * EC::NAMED_CURVE
+ * * EC::EXPLICIT_CURVE
+ *
+ * See the OpenSSL documentation for EC_GROUP_set_asn1_flag().
  */
 static VALUE ossl_ec_group_set_asn1_flag(VALUE self, VALUE flag_v)
 {
     EC_GROUP *group = NULL;
 
-    Require_EC_GROUP(self, group);
-
+    GetECGroup(self, group);
     EC_GROUP_set_asn1_flag(group, NUM2INT(flag_v));
 
     return flag_v;
 }
 
-/*  call-seq:
- *     group.point_conversion_form  => :uncompressed | :compressed | :hybrid
+/*
+ * call-seq:
+ *   group.point_conversion_form -> Symbol
+ *
+ * Returns the form how EC::Point data is encoded as ASN.1.
  *
- *  See the OpenSSL documentation for EC_GROUP_get_point_conversion_form()
+ * See also #point_conversion_form=.
  */
 static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
 {
@@ -1034,8 +1080,7 @@ static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
     point_conversion_form_t form;
     VALUE ret;
 
-    Require_EC_GROUP(self, group);
-
+    GetECGroup(self, group);
     form = EC_GROUP_get_point_conversion_form(group);
 
     switch (form) {
@@ -1048,46 +1093,67 @@ static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
    return ID2SYM(ret);
 }
 
-/*  call-seq:
- *     group.point_conversion_form = form => form
+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:
  *
- *  See the OpenSSL documentation for EC_GROUP_set_point_conversion_form()
+ * +: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.
+ *
+ * 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 = NULL;
+    EC_GROUP *group;
     point_conversion_form_t form;
-    ID form_id = SYM2ID(form_v);
 
-    Require_EC_GROUP(self, group);
-
-    if (form_id == ID_uncompressed) {
-        form = POINT_CONVERSION_UNCOMPRESSED;
-    } else if (form_id == ID_compressed) {
-        form = POINT_CONVERSION_COMPRESSED;
-    } else if (form_id == ID_hybrid) {
-        form = POINT_CONVERSION_HYBRID;
-    } else {
-        ossl_raise(rb_eArgError, "form must be :compressed, :uncompressed, or :hybrid");
-    }
+    GetECGroup(self, group);
+    form = parse_point_conversion_form_symbol(form_v);
 
     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;
 
-    Require_EC_GROUP(self, group);
-
+    GetECGroup(self, group);
     seed_len = EC_GROUP_get_seed_len(group);
 
     if (seed_len == 0)
@@ -1096,16 +1162,17 @@ 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;
 
-    Require_EC_GROUP(self, group);
+    GetECGroup(self, group);
     StringValue(seed);
 
     if (EC_GROUP_set_seed(group, (unsigned char *)RSTRING_PTR(seed), RSTRING_LEN(seed)) != (size_t)RSTRING_LEN(seed))
@@ -1116,16 +1183,17 @@ static VALUE ossl_ec_group_set_seed(VALUE self, VALUE seed)
 
 /* get/set curve GFp, GF2m */
 
-/*  call-seq:
- *     group.degree   => Fixnum
+/*
+ * call-seq:
+ *   group.degree   => integer
  *
- *  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;
 
-    Require_EC_GROUP(self, group);
+    GetECGroup(self, group);
 
     return INT2NUM(EC_GROUP_get_degree(group));
 }
@@ -1137,7 +1205,7 @@ static VALUE ossl_ec_group_to_string(VALUE self, int format)
     int i = -1;
     VALUE str;
 
-    Get_EC_GROUP(self, group);
+    GetECGroup(self, group);
 
     if (!(out = BIO_new(BIO_s_mem())))
         ossl_raise(eEC_GROUP, "BIO_new(BIO_s_mem())");
@@ -1164,8 +1232,9 @@ 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()
  */
@@ -1174,20 +1243,22 @@ 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)
 {
@@ -1195,7 +1266,7 @@ static VALUE ossl_ec_group_to_text(VALUE self)
     BIO *out;
     VALUE str;
 
-    Require_EC_GROUP(self, group);
+    GetECGroup(self, group);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eEC_GROUP, "BIO_new(BIO_s_mem())");
     }
@@ -1209,120 +1280,149 @@ static VALUE ossl_ec_group_to_text(VALUE self)
 }
 
 
-static void ossl_ec_point_free(ossl_ec_point *ec_point)
+/*
+ * OpenSSL::PKey::EC::Point
+ */
+static void
+ossl_ec_point_free(void *ptr)
 {
-    if (!ec_point->dont_free && ec_point->point)
-        EC_POINT_clear_free(ec_point->point);
-    ruby_xfree(ec_point);
+    EC_POINT_clear_free(ptr);
 }
 
-static VALUE ossl_ec_point_alloc(VALUE klass)
+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)
 {
-    ossl_ec_point *ec_point;
+    return TypedData_Wrap_Struct(klass, &ossl_ec_point_type, NULL);
+}
+
+static VALUE
+ec_point_new(const EC_POINT *point, const EC_GROUP *group)
+{
+    EC_POINT *point_new;
     VALUE obj;
 
-    obj = Data_Make_Struct(klass, ossl_ec_point, 0, ossl_ec_point_free, ec_point);
+    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));
 
     return obj;
 }
 
+static VALUE ossl_ec_point_initialize_copy(VALUE, VALUE);
 /*
- *  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 [, encoded_point])
+ *
+ * Creates a new instance of OpenSSL::PKey::EC::Point. If the only argument is
+ * an instance of EC::Point, a copy is returned. Otherwise, creates a point
+ * that belongs to _group_.
  *
- *  See the OpenSSL documentation for EC_POINT_*
+ * _encoded_point_ is the octet string representation of the point. This
+ * must be either a String or an OpenSSL::BN.
  */
 static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
 {
-    ossl_ec_point *ec_point;
-    EC_POINT *point = NULL;
-    VALUE arg1, arg2;
-    VALUE group_v = Qnil;
-    const EC_GROUP *group = NULL;
-
-    Data_Get_Struct(self, ossl_ec_point, ec_point);
-    if (ec_point->point)
-        ossl_raise(eEC_POINT, "EC_POINT already initialized");
-
-    switch (rb_scan_args(argc, argv, "11", &arg1, &arg2)) {
-    case 1:
-        if (rb_obj_is_kind_of(arg1, cEC_POINT)) {
-            const EC_POINT *arg_point;
-
-            group_v = rb_iv_get(arg1, "@group");
-            SafeRequire_EC_GROUP(group_v, group);
-            SafeRequire_EC_POINT(arg1, arg_point);
-
-            point = EC_POINT_dup(arg_point, group);
-        } else if (rb_obj_is_kind_of(arg1, cEC_GROUP)) {
-            group_v = arg1;
-            SafeRequire_EC_GROUP(group_v, group);
-
-            point = EC_POINT_new(group);
-        } else {
-            ossl_raise(eEC_POINT, "wrong argument type: must be OpenSSL::PKey::EC::Point or OpenSSL::Pkey::EC::Group");
-        }
-
-        break;
-     case 2:
-        if (!rb_obj_is_kind_of(arg1, cEC_GROUP))
-            ossl_raise(rb_eArgError, "1st argument must be OpenSSL::PKey::EC::Group");
-        group_v = arg1;
-        SafeRequire_EC_GROUP(group_v, group);
+    EC_POINT *point;
+    VALUE group_v, arg2;
+    const EC_GROUP *group;
 
-        if (rb_obj_is_kind_of(arg2, cBN)) {
-            const BIGNUM *bn = GetBNPtr(arg2);
+    TypedData_Get_Struct(self, EC_POINT, &ossl_ec_point_type, point);
+    if (point)
+	rb_raise(eEC_POINT, "EC_POINT already initialized");
 
-            point = EC_POINT_bn2point(group, bn, NULL, ossl_bn_ctx);
-        } else {
-            BIO *in = ossl_obj2bio(arg1);
+    rb_scan_args(argc, argv, "11", &group_v, &arg2);
+    if (rb_obj_is_kind_of(group_v, cEC_POINT)) {
+	if (argc != 1)
+	    rb_raise(rb_eArgError, "invalid second argument");
+	return ossl_ec_point_initialize_copy(self, group_v);
+    }
 
-/* BUG: finish me */
+    GetECGroup(group_v, group);
+    if (argc == 1) {
+	point = EC_POINT_new(group);
+	if (!point)
+	    ossl_raise(eEC_POINT, "EC_POINT_new");
+    }
+    else {
+	if (rb_obj_is_kind_of(arg2, cBN)) {
+	    point = EC_POINT_bn2point(group, GetBNPtr(arg2), NULL, ossl_bn_ctx);
+	    if (!point)
+		ossl_raise(eEC_POINT, "EC_POINT_bn2point");
+	}
+	else {
+	    StringValue(arg2);
+	    point = EC_POINT_new(group);
+	    if (!point)
+		ossl_raise(eEC_POINT, "EC_POINT_new");
+	    if (!EC_POINT_oct2point(group, point,
+				    (unsigned char *)RSTRING_PTR(arg2),
+				    RSTRING_LEN(arg2), ossl_bn_ctx)) {
+		EC_POINT_free(point);
+		ossl_raise(eEC_POINT, "EC_POINT_oct2point");
+	    }
+	}
+    }
 
-            BIO_free(in);
+    RTYPEDDATA_DATA(self) = point;
+    rb_ivar_set(self, id_i_group, group_v);
 
-            if (point == NULL) {
-                ossl_raise(eEC_POINT, "unknown type for 2nd arg");
-            }
-        }
-        break;
-    default:
-        ossl_raise(rb_eArgError, "wrong number of arguments");
-    }
+    return self;
+}
 
-    if (point == NULL)
-        ossl_raise(eEC_POINT, NULL);
+static VALUE
+ossl_ec_point_initialize_copy(VALUE self, VALUE other)
+{
+    EC_POINT *point, *point_new;
+    EC_GROUP *group;
+    VALUE group_v;
 
-    if (NIL_P(group_v))
-        ossl_raise(rb_eRuntimeError, "missing group (internal error)");
+    TypedData_Get_Struct(self, EC_POINT, &ossl_ec_point_type, point_new);
+    if (point_new)
+	ossl_raise(eEC_POINT, "EC::Point already initialized");
+    GetECPoint(other, point);
 
-    ec_point->point = point;
+    group_v = rb_obj_dup(rb_attr_get(other, id_i_group));
+    GetECGroup(group_v, group);
 
-    rb_iv_set(self, "@group", group_v);
+    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);
 
     return self;
 }
 
 /*
- *  call-seq:
- *     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_iv_get(a, "@group");
-    VALUE group_v2 = rb_iv_get(b, "@group");
+    VALUE group_v1 = rb_attr_get(a, id_i_group);
+    VALUE group_v2 = rb_attr_get(b, id_i_group);
     const EC_GROUP *group;
 
     if (ossl_ec_group_eql(group_v1, group_v2) == Qfalse)
         return Qfalse;
 
-    Require_EC_POINT(a, point1);
-    SafeRequire_EC_POINT(b, point2);
-    SafeRequire_EC_GROUP(group_v1, group);
+    GetECPoint(a, point1);
+    GetECPoint(b, point2);
+    GetECGroup(group_v1, group);
 
     if (EC_POINT_cmp(group, point1, point2, ossl_bn_ctx) == 1)
         return Qfalse;
@@ -1331,60 +1431,58 @@ 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;
 
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
+    GetECPoint(self, point);
+    GetECPointGroup(self, group);
 
     switch (EC_POINT_is_at_infinity(group, point)) {
     case 1: return Qtrue;
     case 0: return Qfalse;
     default: ossl_raise(cEC_POINT, "EC_POINT_is_at_infinity");
     }
+
+    UNREACHABLE;
 }
 
 /*
- *  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;
 
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
+    GetECPoint(self, point);
+    GetECPointGroup(self, group);
 
     switch (EC_POINT_is_on_curve(group, point, ossl_bn_ctx)) {
     case 1: return Qtrue;
     case 0: return Qfalse;
     default: ossl_raise(cEC_POINT, "EC_POINT_is_on_curve");
     }
+
+    UNREACHABLE;
 }
 
 /*
- *  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;
 
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
+    GetECPoint(self, point);
+    GetECPointGroup(self, group);
 
     if (EC_POINT_make_affine(group, point, ossl_bn_ctx) != 1)
         ossl_raise(cEC_POINT, "EC_POINT_make_affine");
@@ -1393,18 +1491,16 @@ 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;
 
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
+    GetECPoint(self, point);
+    GetECPointGroup(self, group);
 
     if (EC_POINT_invert(group, point, ossl_bn_ctx) != 1)
         ossl_raise(cEC_POINT, "EC_POINT_invert");
@@ -1413,18 +1509,16 @@ 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;
 
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
+    GetECPoint(self, point);
+    GetECPointGroup(self, group);
 
     if (EC_POINT_set_to_infinity(group, point) != 1)
         ossl_raise(cEC_POINT, "EC_POINT_set_to_infinity");
@@ -1433,51 +1527,153 @@ static VALUE ossl_ec_point_set_to_infinity(VALUE self)
 }
 
 /*
- *  call-seq:
- *     point.to_bn   => OpenSSL::BN
+ * call-seq:
+ *    point.to_octet_string(conversion_form) -> String
+ *
+ * Returns the octet string representation of the elliptic curve point.
  *
- *  See the OpenSSL documentation for EC_POINT_point2bn()
+ * _conversion_form_ specifies how the point is converted. Possible values are:
+ *
+ * - +:compressed+
+ * - +:uncompressed+
+ * - +:hybrid+
  */
-static VALUE ossl_ec_point_to_bn(VALUE self)
+static VALUE
+ossl_ec_point_to_octet_string(VALUE self, VALUE conversion_form)
 {
     EC_POINT *point;
-    VALUE bn_obj;
-    VALUE group_v = rb_iv_get(self, "@group");
     const EC_GROUP *group;
     point_conversion_form_t form;
-    BIGNUM *bn;
+    VALUE str;
+    size_t len;
+
+    GetECPoint(self, point);
+    GetECPointGroup(self, group);
+    form = parse_point_conversion_form_symbol(conversion_form);
+
+    len = EC_POINT_point2oct(group, point, form, NULL, 0, ossl_bn_ctx);
+    if (!len)
+	ossl_raise(eEC_POINT, "EC_POINT_point2oct");
+    str = rb_str_new(NULL, (long)len);
+    if (!EC_POINT_point2oct(group, point, form,
+			    (unsigned char *)RSTRING_PTR(str), len,
+			    ossl_bn_ctx))
+	ossl_raise(eEC_POINT, "EC_POINT_point2oct");
+    return str;
+}
 
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
+/*
+ * 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 omitted, 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 omitted. _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>.
+ */
+static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
+{
+    EC_POINT *point_self, *point_result;
+    const EC_GROUP *group;
+    VALUE group_v = rb_attr_get(self, id_i_group);
+    VALUE arg1, arg2, arg3, result;
+    const BIGNUM *bn_g = NULL;
 
-    form = EC_GROUP_get_point_conversion_form(group);
+    GetECPoint(self, point_self);
+    GetECGroup(group_v, group);
 
-    bn_obj = rb_obj_alloc(cBN);
-    bn = GetBNPtr(bn_obj);
+    result = rb_obj_alloc(cEC_POINT);
+    ossl_ec_point_initialize(1, &group_v, result);
+    GetECPoint(result, point_result);
 
-    if (EC_POINT_point2bn(group, point, form, bn, ossl_bn_ctx) == NULL)
-        ossl_raise(eEC_POINT, "EC_POINT_point2bn");
+    rb_scan_args(argc, argv, "12", &arg1, &arg2, &arg3);
+    if (!RB_TYPE_P(arg1, T_ARRAY)) {
+	BIGNUM *bn = GetBNPtr(arg1);
 
-    return bn_obj;
-}
+	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);
+    } 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);
+	}
 
-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");
+	points = ALLOCV_N(const EC_POINT *, tmp_p, num);
+	points[0] = point_self; /* self */
+	for (i = 0; i < num - 1; i++)
+	    GetECPoint(RARRAY_AREF(arg2, i), points[i + 1]);
+
+	if (!NIL_P(arg3))
+	    bn_g = GetBNPtr(arg3);
+
+	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);
+	}
+
+	ALLOCV_END(tmp_b);
+	ALLOCV_END(tmp_p);
+    }
+
+    return result;
 }
 
-void Init_ossl_ec()
+void Init_ossl_ec(void)
 {
-#ifdef DONT_NEED_RDOC_WORKAROUND
-    mOSSL = rb_define_module("OpenSSL");
+#undef rb_intern
+#if 0
     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);
@@ -1495,13 +1691,16 @@ void Init_ossl_ec()
     ID_compressed = rb_intern("compressed");
     ID_hybrid = rb_intern("hybrid");
 
-#ifdef OPENSSL_EC_NAMED_CURVE
-    rb_define_const(cEC, "NAMED_CURVE", ULONG2NUM(OPENSSL_EC_NAMED_CURVE));
+    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));
 #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_method(cEC, "initialize_copy", ossl_ec_key_initialize_copy, 1);
 /* copy/dup/cmp */
 
     rb_define_method(cEC, "group", ossl_ec_key_get_group, 0);
@@ -1510,8 +1709,10 @@ void Init_ossl_ec()
     rb_define_method(cEC, "private_key=", ossl_ec_key_set_private_key, 1);
     rb_define_method(cEC, "public_key", ossl_ec_key_get_public_key, 0);
     rb_define_method(cEC, "public_key=", ossl_ec_key_set_public_key, 1);
-    rb_define_method(cEC, "private_key?", ossl_ec_key_is_private_key, 0);
-    rb_define_method(cEC, "public_key?", ossl_ec_key_is_public_key, 0);
+    rb_define_method(cEC, "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, "", ossl_ec_key_get_, 0);
     rb_define_method(cEC, "=", ossl_ec_key_set_ 1);
     set/get enc_flags
@@ -1519,7 +1720,8 @@ void Init_ossl_ec()
     set/get asn1_flag (can use ruby to call self.group.asn1_flag)
     set/get precompute_mult
 */
-    rb_define_method(cEC, "generate_key", ossl_ec_key_generate_key, 0);
+    rb_define_method(cEC, "generate_key!", ossl_ec_key_generate_key, 0);
+    rb_define_alias(cEC, "generate_key", "generate_key!");
     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);
@@ -1527,13 +1729,15 @@ void Init_ossl_ec()
     rb_define_method(cEC, "dsa_verify_asn1", ossl_ec_key_dsa_verify_asn1, 2);
 /* do_sign/do_verify */
 
-    rb_define_method(cEC, "to_pem", ossl_ec_key_to_pem, -1);
+    rb_define_method(cEC, "export", ossl_ec_key_export, -1);
+    rb_define_alias(cEC, "to_pem", "export");
     rb_define_method(cEC, "to_der", ossl_ec_key_to_der, 0);
     rb_define_method(cEC, "to_text", ossl_ec_key_to_text, 0);
 
 
     rb_define_alloc_func(cEC_GROUP, ossl_ec_group_alloc);
     rb_define_method(cEC_GROUP, "initialize", ossl_ec_group_initialize, -1);
+    rb_define_method(cEC_GROUP, "initialize_copy", ossl_ec_group_initialize_copy, 1);
     rb_define_method(cEC_GROUP, "eql?", ossl_ec_group_eql, 1);
     rb_define_alias(cEC_GROUP, "==", "eql?");
 /* copy/dup/cmp */
@@ -1569,6 +1773,7 @@ void Init_ossl_ec()
 
     rb_define_alloc_func(cEC_POINT, ossl_ec_point_alloc);
     rb_define_method(cEC_POINT, "initialize", ossl_ec_point_initialize, -1);
+    rb_define_method(cEC_POINT, "initialize_copy", ossl_ec_point_initialize_copy, 1);
     rb_attr(cEC_POINT, rb_intern("group"), 1, 0, 0);
     rb_define_method(cEC_POINT, "eql?", ossl_ec_point_eql, 1);
     rb_define_alias(cEC_POINT, "==", "eql?");
@@ -1580,15 +1785,14 @@ void Init_ossl_ec()
     rb_define_method(cEC_POINT, "set_to_infinity!", ossl_ec_point_set_to_infinity, 0);
 /* all the other methods */
 
-    rb_define_method(cEC_POINT, "to_bn", ossl_ec_point_to_bn, 0);
+    rb_define_method(cEC_POINT, "to_octet_string", ossl_ec_point_to_octet_string, 1);
+    rb_define_method(cEC_POINT, "mul", ossl_ec_point_mul, -1);
 
-    no_copy(cEC);
-    no_copy(cEC_GROUP);
-    no_copy(cEC_POINT);
+    id_i_group = rb_intern("@group");
 }
 
 #else /* defined NO_EC */
-void Init_ossl_ec()
+void Init_ossl_ec(void)
 {
 }
 #endif /* NO_EC */
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
index eba693b057..4800fb2710 100644
--- a/ext/openssl/ossl_pkey_rsa.c
+++ b/ext/openssl/ossl_pkey_rsa.c
@@ -1,26 +1,42 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
-#if !defined(OPENSSL_NO_RSA)
-
 #include "ossl.h"
 
+#if !defined(OPENSSL_NO_RSA)
+
 #define GetPKeyRSA(obj, pkey) do { \
     GetPKey((obj), (pkey)); \
-    if (EVP_PKEY_type((pkey)->type) != EVP_PKEY_RSA) { /* PARANOIA? */ \
+    if (EVP_PKEY_base_id(pkey) != 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)
 
-#define RSA_HAS_PRIVATE(rsa) ((rsa)->p && (rsa)->q)
-#define RSA_PRIVATE(obj,rsa) (RSA_HAS_PRIVATE(rsa)||OSSL_PKEY_IS_PRIVATE(obj))
+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);
+}
 
 /*
  * Classes
@@ -40,6 +56,7 @@ rsa_instance(VALUE klass, RSA *rsa)
     if (!rsa) {
 	return Qfalse;
     }
+    obj = NewPKey(klass);
     if (!(pkey = EVP_PKEY_new())) {
 	return Qfalse;
     }
@@ -47,7 +64,7 @@ rsa_instance(VALUE klass, RSA *rsa)
 	EVP_PKEY_free(pkey);
 	return Qfalse;
     }
-    WrapPKey(klass, obj, pkey);
+    SetPKey(obj, pkey);
 
     return obj;
 }
@@ -61,10 +78,11 @@ ossl_rsa_new(EVP_PKEY *pkey)
 	obj = rsa_instance(cRSA, RSA_new());
     }
     else {
-	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_RSA) {
+	obj = NewPKey(cRSA);
+	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_RSA) {
 	    ossl_raise(rb_eTypeError, "Not a RSA key!");
 	}
-	WrapPKey(cRSA, obj, pkey);
+	SetPKey(obj, pkey);
     }
     if (obj == Qfalse) {
 	ossl_raise(eRSAError, NULL);
@@ -76,12 +94,77 @@ ossl_rsa_new(EVP_PKEY *pkey)
 /*
  * Private
  */
+struct rsa_blocking_gen_arg {
+    RSA *rsa;
+    BIGNUM *e;
+    int size;
+    BN_GENCB *cb;
+    int result;
+};
+
+static void *
+rsa_blocking_gen(void *arg)
+{
+    struct rsa_blocking_gen_arg *gen = (struct rsa_blocking_gen_arg *)arg;
+    gen->result = RSA_generate_key_ex(gen->rsa, gen->size, gen->e, gen->cb);
+    return 0;
+}
+
 static RSA *
-rsa_generate(int size, int exp)
+rsa_generate(int size, unsigned long exp)
 {
-    return RSA_generate_key(size, exp,
-	    rb_block_given_p() ? ossl_generate_cb : NULL,
-	    NULL);
+    int i;
+    struct ossl_generate_cb_arg cb_arg = { 0 };
+    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;
+    }
+    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;
+	    }
+	}
+    }
+
+    if (rb_block_given_p())
+	cb_arg.yield = 1;
+    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;
+    if (cb_arg.yield == 1) {
+	/* we cannot release GVL when callback proc is supplied */
+	rsa_blocking_gen(&gen_arg);
+    } else {
+	/* 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) {
+	RSA_free(rsa);
+	if (cb_arg.state) {
+	    /* must clear OpenSSL error stack */
+	    ossl_clear_error();
+	    rb_jump_tag(cb_arg.state);
+	}
+	return NULL;
+    }
+
+    return rsa;
 }
 
 /*
@@ -89,8 +172,8 @@ rsa_generate(int size, int exp)
  *   RSA.generate(size)           => RSA instance
  *   RSA.generate(size, exponent) => RSA instance
  *
- * Generates an RSA keypair.  +size+ is an integer representing the desired key
- * size.  Keys smaller than 1024 should be considered insecure.  +exponent+ is
+ * Generates an RSA keypair.  _size_ is an integer representing the desired key
+ * size.  Keys smaller than 1024 should be considered insecure.  _exponent_ is
  * an odd number normally 3, 17, or 65537.
  */
 static VALUE
@@ -103,7 +186,7 @@ ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
 
     rb_scan_args(argc, argv, "11", &size, &exp);
 
-    rsa = rsa_generate(NUM2INT(size), NIL_P(exp) ? RSA_F4 : NUM2INT(exp)); /* err handled by rsa_instance */
+    rsa = rsa_generate(NUM2INT(size), NIL_P(exp) ? RSA_F4 : NUM2ULONG(exp)); /* err handled by rsa_instance */
     obj = rsa_instance(klass, rsa);
 
     if (obj == Qfalse) {
@@ -120,12 +203,12 @@ ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
  *   RSA.new(encoded_key)              => RSA instance
  *   RSA.new(encoded_key, pass_phrase) => RSA instance
  *
- * Generates or loads an RSA keypair.  If an integer +key_size+ is given it
+ * Generates or loads an RSA keypair.  If an integer _key_size_ is given it
  * represents the desired key size.  Keys less than 1024 bits should be
  * considered insecure.
  *
- * A key can instead be loaded from an +encoded_key+ which must be PEM or DER
- * encoded.  A +pass_phrase+ can be used to decrypt the key.  If none is given
+ * A key can instead be loaded from an _encoded_key_ which must be PEM or DER
+ * encoded.  A _pass_phrase_ can be used to decrypt the key.  If none is given
  * OpenSSL will prompt for the pass phrase.
  *
  * = Examples
@@ -140,22 +223,21 @@ 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 (FIXNUM_P(arg)) {
-	rsa = rsa_generate(FIX2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2INT(pass));
+    else if (RB_INTEGER_TYPE_P(arg)) {
+	rsa = rsa_generate(NUM2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2ULONG(pass));
 	if (!rsa) ossl_raise(eRSAError, NULL);
     }
     else {
-	if (!NIL_P(pass)) passwd = StringValuePtr(pass);
+	pass = ossl_pem_passwd_value(pass);
 	arg = ossl_to_der_if_possible(arg);
-	in = ossl_obj2bio(arg);
-	rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
+	in = ossl_obj2bio(&arg);
+	rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, (void *)pass);
 	if (!rsa) {
 	    OSSL_BIO_reset(in);
 	    rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL);
@@ -178,7 +260,7 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
 	}
 	BIO_free(in);
 	if (!rsa) {
-	    ossl_raise(eRSAError, "Neither PUB key nor PRIV key:");
+	    ossl_raise(eRSAError, "Neither PUB key nor PRIV key");
 	}
     }
     if (!EVP_PKEY_assign_RSA(pkey, rsa)) {
@@ -189,22 +271,43 @@ 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
  *
- * The return value is always true since every private key is also a public
+ * The return value is always +true+ since every private key is also a public
  * key.
  */
 static VALUE
 ossl_rsa_is_public(VALUE self)
 {
-    EVP_PKEY *pkey;
+    RSA *rsa;
 
-    GetPKeyRSA(self, pkey);
+    GetRSA(self, rsa);
     /*
      * This method should check for n and e.  BUG.
      */
+    (void)rsa;
     return Qtrue;
 }
 
@@ -217,52 +320,50 @@ ossl_rsa_is_public(VALUE self)
 static VALUE
 ossl_rsa_is_private(VALUE self)
 {
-    EVP_PKEY *pkey;
+    RSA *rsa;
 
-    GetPKeyRSA(self, pkey);
+    GetRSA(self, rsa);
 
-    return (RSA_PRIVATE(self, pkey->pkey.rsa)) ? Qtrue : Qfalse;
+    return RSA_PRIVATE(self, rsa) ? Qtrue : Qfalse;
 }
 
 /*
  * call-seq:
- *   rsa.to_pem                      => PEM-format String
- *   rsa.to_pem(cipher, pass_phrase) => PEM-format String
+ *   rsa.export([cipher, pass_phrase]) => PEM-format String
+ *   rsa.to_pem([cipher, pass_phrase]) => PEM-format String
+ *   rsa.to_s([cipher, pass_phrase]) => PEM-format String
  *
- * 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::Cipher instance.
+ * 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.
  */
 static VALUE
 ossl_rsa_export(int argc, VALUE *argv, VALUE self)
 {
-    EVP_PKEY *pkey;
+    RSA *rsa;
     BIO *out;
     const EVP_CIPHER *ciph = NULL;
-    char *passwd = NULL;
     VALUE cipher, pass, str;
 
-    GetPKeyRSA(self, pkey);
+    GetRSA(self, rsa);
 
     rb_scan_args(argc, argv, "02", &cipher, &pass);
 
     if (!NIL_P(cipher)) {
-	ciph = GetCipherPtr(cipher);
-	if (!NIL_P(pass)) {
-	    passwd = StringValuePtr(pass);
-	}
+	ciph = ossl_evp_get_cipherbyname(cipher);
+	pass = ossl_pem_passwd_value(pass);
     }
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eRSAError, NULL);
     }
-    if (RSA_HAS_PRIVATE(pkey->pkey.rsa)) {
-	if (!PEM_write_bio_RSAPrivateKey(out, pkey->pkey.rsa, ciph,
-					 NULL, 0, ossl_pem_passwd_cb, passwd)) {
+    if (RSA_HAS_PRIVATE(rsa)) {
+	if (!PEM_write_bio_RSAPrivateKey(out, rsa, ciph, NULL, 0,
+					 ossl_pem_passwd_cb, (void *)pass)) {
 	    BIO_free(out);
 	    ossl_raise(eRSAError, NULL);
 	}
     } else {
-	if (!PEM_write_bio_RSA_PUBKEY(out, pkey->pkey.rsa)) {
+	if (!PEM_write_bio_RSA_PUBKEY(out, rsa)) {
 	    BIO_free(out);
 	    ossl_raise(eRSAError, NULL);
 	}
@@ -281,53 +382,54 @@ ossl_rsa_export(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_rsa_to_der(VALUE self)
 {
-    EVP_PKEY *pkey;
-    int (*i2d_func)_((const RSA*, unsigned char**));
+    RSA *rsa;
+    int (*i2d_func)(const RSA *, unsigned char **);
     unsigned char *p;
     long len;
     VALUE str;
 
-    GetPKeyRSA(self, pkey);
-    if(RSA_HAS_PRIVATE(pkey->pkey.rsa))
+    GetRSA(self, rsa);
+    if (RSA_HAS_PRIVATE(rsa))
 	i2d_func = i2d_RSAPrivateKey;
     else
-	i2d_func = (int (*)(const RSA*, unsigned char**))i2d_RSA_PUBKEY;
-    if((len = i2d_func(pkey->pkey.rsa, NULL)) <= 0)
+	i2d_func = (int (*)(const RSA *, unsigned char **))i2d_RSA_PUBKEY;
+    if((len = i2d_func(rsa, NULL)) <= 0)
 	ossl_raise(eRSAError, NULL);
     str = rb_str_new(0, len);
     p = (unsigned char *)RSTRING_PTR(str);
-    if(i2d_func(pkey->pkey.rsa, &p) < 0)
+    if(i2d_func(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
  *   rsa.public_encrypt(string, padding) => String
  *
- * Encrypt +string+ with the public key.  +padding+ defaults to PKCS1_PADDING.
+ * Encrypt _string_ with the public key.  _padding_ defaults to PKCS1_PADDING.
  * The encrypted string output can be decrypted using #private_decrypt.
  */
 static VALUE
 ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
 {
-    EVP_PKEY *pkey;
+    RSA *rsa;
+    const BIGNUM *rsa_n;
     int buf_len, pad;
     VALUE str, buffer, padding;
 
-    GetPKeyRSA(self, pkey);
+    GetRSA(self, rsa);
+    RSA_get0_key(rsa, &rsa_n, NULL, NULL);
+    if (!rsa_n)
+	ossl_raise(eRSAError, "incomplete RSA");
     rb_scan_args(argc, argv, "11", &buffer, &padding);
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
-    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
+    str = rb_str_new(0, RSA_size(rsa));
     buf_len = RSA_public_encrypt(RSTRING_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				 (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
-				 pad);
+				 (unsigned char *)RSTRING_PTR(str), rsa, pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
 
@@ -339,24 +441,27 @@ ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
  *   rsa.public_decrypt(string)          => String
  *   rsa.public_decrypt(string, padding) => String
  *
- * Decrypt +string+, which has been encrypted with the private key, with the
- * public key.  +padding+ defaults to PKCS1_PADDING.
+ * Decrypt _string_, which has been encrypted with the private key, with the
+ * public key.  _padding_ defaults to PKCS1_PADDING.
  */
 static VALUE
 ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
 {
-    EVP_PKEY *pkey;
+    RSA *rsa;
+    const BIGNUM *rsa_n;
     int buf_len, pad;
     VALUE str, buffer, padding;
 
-    GetPKeyRSA(self, pkey);
+    GetRSA(self, rsa);
+    RSA_get0_key(rsa, &rsa_n, NULL, NULL);
+    if (!rsa_n)
+	ossl_raise(eRSAError, "incomplete RSA");
     rb_scan_args(argc, argv, "11", &buffer, &padding);
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
-    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
+    str = rb_str_new(0, RSA_size(rsa));
     buf_len = RSA_public_decrypt(RSTRING_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				 (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
-				 pad);
+				 (unsigned char *)RSTRING_PTR(str), rsa, pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
 
@@ -368,27 +473,29 @@ ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
  *   rsa.private_encrypt(string)          => String
  *   rsa.private_encrypt(string, padding) => String
  *
- * Encrypt +string+ with the private key.  +padding+ defaults to PKCS1_PADDING.
+ * Encrypt _string_ with the private key.  _padding_ defaults to PKCS1_PADDING.
  * The encrypted string output can be decrypted using #public_decrypt.
  */
 static VALUE
 ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
 {
-    EVP_PKEY *pkey;
+    RSA *rsa;
+    const BIGNUM *rsa_n;
     int buf_len, pad;
     VALUE str, buffer, padding;
 
-    GetPKeyRSA(self, pkey);
-    if (!RSA_PRIVATE(self, pkey->pkey.rsa)) {
+    GetRSA(self, rsa);
+    RSA_get0_key(rsa, &rsa_n, NULL, NULL);
+    if (!rsa_n)
+	ossl_raise(eRSAError, "incomplete RSA");
+    if (!RSA_PRIVATE(self, rsa))
 	ossl_raise(eRSAError, "private key needed.");
-    }
     rb_scan_args(argc, argv, "11", &buffer, &padding);
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
-    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
+    str = rb_str_new(0, RSA_size(rsa));
     buf_len = RSA_private_encrypt(RSTRING_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				  (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
-				  pad);
+				  (unsigned char *)RSTRING_PTR(str), rsa, pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
 
@@ -400,27 +507,29 @@ ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
  *   rsa.private_decrypt(string)          => String
  *   rsa.private_decrypt(string, padding) => String
  *
- * Decrypt +string+, which has been encrypted with the public key, with the
- * private key.  +padding+ defaults to PKCS1_PADDING.
+ * Decrypt _string_, which has been encrypted with the public key, with the
+ * private key.  _padding_ defaults to PKCS1_PADDING.
  */
 static VALUE
 ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
 {
-    EVP_PKEY *pkey;
+    RSA *rsa;
+    const BIGNUM *rsa_n;
     int buf_len, pad;
     VALUE str, buffer, padding;
 
-    GetPKeyRSA(self, pkey);
-    if (!RSA_PRIVATE(self, pkey->pkey.rsa)) {
+    GetRSA(self, rsa);
+    RSA_get0_key(rsa, &rsa_n, NULL, NULL);
+    if (!rsa_n)
+	ossl_raise(eRSAError, "incomplete RSA");
+    if (!RSA_PRIVATE(self, rsa))
 	ossl_raise(eRSAError, "private key needed.");
-    }
     rb_scan_args(argc, argv, "11", &buffer, &padding);
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
-    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
+    str = rb_str_new(0, RSA_size(rsa));
     buf_len = RSA_private_decrypt(RSTRING_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				  (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
-				  pad);
+				  (unsigned char *)RSTRING_PTR(str), rsa, pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
 
@@ -429,6 +538,196 @@ ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
+ *    rsa.sign_pss(digest, data, salt_length:, mgf1_hash:) -> String
+ *
+ * Signs _data_ using the Probabilistic Signature Scheme (RSA-PSS) and returns
+ * the calculated signature.
+ *
+ * RSAError will be raised if an error occurs.
+ *
+ * See #verify_pss for the verification operation.
+ *
+ * === Parameters
+ * _digest_::
+ *   A String containing the message digest algorithm name.
+ * _data_::
+ *   A String. The data to be signed.
+ * _salt_length_::
+ *   The length in octets of the salt. Two special values are reserved:
+ *   +:digest+ means the digest length, and +:max+ means the maximum possible
+ *   length for the combination of the private key and the selected message
+ *   digest algorithm.
+ * _mgf1_hash_::
+ *   The hash algorithm used in MGF1 (the currently supported mask generation
+ *   function (MGF)).
+ *
+ * === Example
+ *   data = "Sign me!"
+ *   pkey = OpenSSL::PKey::RSA.new(2048)
+ *   signature = pkey.sign_pss("SHA256", data, salt_length: :max, mgf1_hash: "SHA256")
+ *   pub_key = pkey.public_key
+ *   puts pub_key.verify_pss("SHA256", signature, data,
+ *                           salt_length: :auto, mgf1_hash: "SHA256") # => true
+ */
+static VALUE
+ossl_rsa_sign_pss(int argc, VALUE *argv, VALUE self)
+{
+    VALUE digest, data, options, kwargs[2], signature;
+    static ID kwargs_ids[2];
+    EVP_PKEY *pkey;
+    EVP_PKEY_CTX *pkey_ctx;
+    const EVP_MD *md, *mgf1md;
+    EVP_MD_CTX *md_ctx;
+    size_t buf_len;
+    int salt_len;
+
+    if (!kwargs_ids[0]) {
+	kwargs_ids[0] = rb_intern_const("salt_length");
+	kwargs_ids[1] = rb_intern_const("mgf1_hash");
+    }
+    rb_scan_args(argc, argv, "2:", &digest, &data, &options);
+    rb_get_kwargs(options, kwargs_ids, 2, 0, kwargs);
+    if (kwargs[0] == ID2SYM(rb_intern("max")))
+	salt_len = -2; /* RSA_PSS_SALTLEN_MAX_SIGN */
+    else if (kwargs[0] == ID2SYM(rb_intern("digest")))
+	salt_len = -1; /* RSA_PSS_SALTLEN_DIGEST */
+    else
+	salt_len = NUM2INT(kwargs[0]);
+    mgf1md = ossl_evp_get_digestbyname(kwargs[1]);
+
+    pkey = GetPrivPKeyPtr(self);
+    buf_len = EVP_PKEY_size(pkey);
+    md = ossl_evp_get_digestbyname(digest);
+    StringValue(data);
+    signature = rb_str_new(NULL, (long)buf_len);
+
+    md_ctx = EVP_MD_CTX_new();
+    if (!md_ctx)
+	goto err;
+
+    if (EVP_DigestSignInit(md_ctx, &pkey_ctx, md, NULL, pkey) != 1)
+	goto err;
+
+    if (EVP_PKEY_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_PSS_PADDING) != 1)
+	goto err;
+
+    if (EVP_PKEY_CTX_set_rsa_pss_saltlen(pkey_ctx, salt_len) != 1)
+	goto err;
+
+    if (EVP_PKEY_CTX_set_rsa_mgf1_md(pkey_ctx, mgf1md) != 1)
+	goto err;
+
+    if (EVP_DigestSignUpdate(md_ctx, RSTRING_PTR(data), RSTRING_LEN(data)) != 1)
+	goto err;
+
+    if (EVP_DigestSignFinal(md_ctx, (unsigned char *)RSTRING_PTR(signature), &buf_len) != 1)
+	goto err;
+
+    rb_str_set_len(signature, (long)buf_len);
+
+    EVP_MD_CTX_free(md_ctx);
+    return signature;
+
+  err:
+    EVP_MD_CTX_free(md_ctx);
+    ossl_raise(eRSAError, NULL);
+}
+
+/*
+ * call-seq:
+ *    rsa.verify_pss(digest, signature, data, salt_length:, mgf1_hash:) -> true | false
+ *
+ * Verifies _data_ using the Probabilistic Signature Scheme (RSA-PSS).
+ *
+ * The return value is +true+ if the signature is valid, +false+ otherwise.
+ * RSAError will be raised if an error occurs.
+ *
+ * See #sign_pss for the signing operation and an example code.
+ *
+ * === Parameters
+ * _digest_::
+ *   A String containing the message digest algorithm name.
+ * _data_::
+ *   A String. The data to be signed.
+ * _salt_length_::
+ *   The length in octets of the salt. Two special values are reserved:
+ *   +:digest+ means the digest length, and +:auto+ means automatically
+ *   determining the length based on the signature.
+ * _mgf1_hash_::
+ *   The hash algorithm used in MGF1.
+ */
+static VALUE
+ossl_rsa_verify_pss(int argc, VALUE *argv, VALUE self)
+{
+    VALUE digest, signature, data, options, kwargs[2];
+    static ID kwargs_ids[2];
+    EVP_PKEY *pkey;
+    EVP_PKEY_CTX *pkey_ctx;
+    const EVP_MD *md, *mgf1md;
+    EVP_MD_CTX *md_ctx;
+    int result, salt_len;
+
+    if (!kwargs_ids[0]) {
+	kwargs_ids[0] = rb_intern_const("salt_length");
+	kwargs_ids[1] = rb_intern_const("mgf1_hash");
+    }
+    rb_scan_args(argc, argv, "3:", &digest, &signature, &data, &options);
+    rb_get_kwargs(options, kwargs_ids, 2, 0, kwargs);
+    if (kwargs[0] == ID2SYM(rb_intern("auto")))
+	salt_len = -2; /* RSA_PSS_SALTLEN_AUTO */
+    else if (kwargs[0] == ID2SYM(rb_intern("digest")))
+	salt_len = -1; /* RSA_PSS_SALTLEN_DIGEST */
+    else
+	salt_len = NUM2INT(kwargs[0]);
+    mgf1md = ossl_evp_get_digestbyname(kwargs[1]);
+
+    GetPKey(self, pkey);
+    md = ossl_evp_get_digestbyname(digest);
+    StringValue(signature);
+    StringValue(data);
+
+    md_ctx = EVP_MD_CTX_new();
+    if (!md_ctx)
+	goto err;
+
+    if (EVP_DigestVerifyInit(md_ctx, &pkey_ctx, md, NULL, pkey) != 1)
+	goto err;
+
+    if (EVP_PKEY_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_PSS_PADDING) != 1)
+	goto err;
+
+    if (EVP_PKEY_CTX_set_rsa_pss_saltlen(pkey_ctx, salt_len) != 1)
+	goto err;
+
+    if (EVP_PKEY_CTX_set_rsa_mgf1_md(pkey_ctx, mgf1md) != 1)
+	goto err;
+
+    if (EVP_DigestVerifyUpdate(md_ctx, RSTRING_PTR(data), RSTRING_LEN(data)) != 1)
+	goto err;
+
+    result = EVP_DigestVerifyFinal(md_ctx,
+				   (unsigned char *)RSTRING_PTR(signature),
+				   RSTRING_LEN(signature));
+
+    switch (result) {
+      case 0:
+	ossl_clear_error();
+	EVP_MD_CTX_free(md_ctx);
+	return Qfalse;
+      case 1:
+	EVP_MD_CTX_free(md_ctx);
+	return Qtrue;
+      default:
+	goto err;
+    }
+
+  err:
+    EVP_MD_CTX_free(md_ctx);
+    ossl_raise(eRSAError, NULL);
+}
+
+/*
+ * call-seq:
  *   rsa.params => hash
  *
  * THIS METHOD IS INSECURE, PRIVATE INFORMATION CAN LEAK OUT!!!
@@ -441,21 +740,24 @@ ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_rsa_get_params(VALUE self)
 {
-    EVP_PKEY *pkey;
+    RSA *rsa;
     VALUE hash;
+    const BIGNUM *n, *e, *d, *p, *q, *dmp1, *dmq1, *iqmp;
 
-    GetPKeyRSA(self, pkey);
+    GetRSA(self, rsa);
+    RSA_get0_key(rsa, &n, &e, &d);
+    RSA_get0_factors(rsa, &p, &q);
+    RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp);
 
     hash = rb_hash_new();
-
-    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));
+    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));
 
     return hash;
 }
@@ -473,15 +775,15 @@ ossl_rsa_get_params(VALUE self)
 static VALUE
 ossl_rsa_to_text(VALUE self)
 {
-    EVP_PKEY *pkey;
+    RSA *rsa;
     BIO *out;
     VALUE str;
 
-    GetPKeyRSA(self, pkey);
+    GetRSA(self, rsa);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eRSAError, NULL);
     }
-    if (!RSA_print(out, pkey->pkey.rsa, 0)) { /* offset = 0 */
+    if (!RSA_print(out, rsa, 0)) { /* offset = 0 */
 	BIO_free(out);
 	ossl_raise(eRSAError, NULL);
     }
@@ -505,8 +807,8 @@ ossl_rsa_to_public_key(VALUE self)
 
     GetPKeyRSA(self, pkey);
     /* err check performed by rsa_instance */
-    rsa = RSAPublicKey_dup(pkey->pkey.rsa);
-    obj = rsa_instance(CLASS_OF(self), rsa);
+    rsa = RSAPublicKey_dup(EVP_PKEY_get0_RSA(pkey));
+    obj = rsa_instance(rb_obj_class(self), rsa);
     if (obj == Qfalse) {
 	RSA_free(rsa);
 	ossl_raise(eRSAError, NULL);
@@ -520,11 +822,11 @@ ossl_rsa_to_public_key(VALUE self)
 static VALUE
 ossl_rsa_blinding_on(VALUE self)
 {
-    EVP_PKEY *pkey;
+    RSA *rsa;
 
-    GetPKeyRSA(self, pkey);
+    GetRSA(self, rsa);
 
-    if (RSA_blinding_on(pkey->pkey.rsa, ossl_bn_ctx) != 1) {
+    if (RSA_blinding_on(rsa, ossl_bn_ctx) != 1) {
 	ossl_raise(eRSAError, NULL);
     }
     return self;
@@ -533,35 +835,54 @@ ossl_rsa_blinding_on(VALUE self)
 static VALUE
 ossl_rsa_blinding_off(VALUE self)
 {
-    EVP_PKEY *pkey;
+    RSA *rsa;
 
-    GetPKeyRSA(self, pkey);
-    RSA_blinding_off(pkey->pkey.rsa);
+    GetRSA(self, rsa);
+    RSA_blinding_off(rsa);
 
     return self;
 }
  */
 
-OSSL_PKEY_BN(rsa, n)
-OSSL_PKEY_BN(rsa, e)
-OSSL_PKEY_BN(rsa, d)
-OSSL_PKEY_BN(rsa, p)
-OSSL_PKEY_BN(rsa, q)
-OSSL_PKEY_BN(rsa, dmp1)
-OSSL_PKEY_BN(rsa, dmq1)
-OSSL_PKEY_BN(rsa, iqmp)
+/*
+ * 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)
 
 /*
  * INIT
  */
-#define DefRSAConst(x) rb_define_const(cRSA, #x,INT2FIX(RSA_##x))
+#define DefRSAConst(x) rb_define_const(cRSA, #x, INT2NUM(RSA_##x))
 
 void
-Init_ossl_rsa()
+Init_ossl_rsa(void)
 {
 #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
@@ -575,7 +896,7 @@ Init_ossl_rsa()
     /* Document-class: OpenSSL::PKey::RSA
      *
      * RSA is an asymmetric public key algorithm that has been formalized in
-     * RFC 3447. It is in widespread use in public key infrastuctures (PKI)
+     * RFC 3447. It is in widespread use in public key infrastructures (PKI)
      * where certificates (cf. OpenSSL::X509::Certificate) often are issued
      * on the basis of a public/private RSA key pair. RSA is used in a wide
      * field of applications such as secure (symmetric) key exchange, e.g.
@@ -586,6 +907,7 @@ Init_ossl_rsa()
 
     rb_define_singleton_method(cRSA, "generate", ossl_rsa_s_generate, -1);
     rb_define_method(cRSA, "initialize", ossl_rsa_initialize, -1);
+    rb_define_method(cRSA, "initialize_copy", ossl_rsa_initialize_copy, 1);
 
     rb_define_method(cRSA, "public?", ossl_rsa_is_public, 0);
     rb_define_method(cRSA, "private?", ossl_rsa_is_private, 0);
@@ -599,6 +921,8 @@ Init_ossl_rsa()
     rb_define_method(cRSA, "public_decrypt", ossl_rsa_public_decrypt, -1);
     rb_define_method(cRSA, "private_encrypt", ossl_rsa_private_encrypt, -1);
     rb_define_method(cRSA, "private_decrypt", ossl_rsa_private_decrypt, -1);
+    rb_define_method(cRSA, "sign_pss", ossl_rsa_sign_pss, -1);
+    rb_define_method(cRSA, "verify_pss", ossl_rsa_verify_pss, -1);
 
     DEF_OSSL_PKEY_BN(cRSA, rsa, n);
     DEF_OSSL_PKEY_BN(cRSA, rsa, e);
@@ -608,6 +932,9 @@ Init_ossl_rsa()
     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);
 
@@ -625,8 +952,7 @@ Init_ossl_rsa()
 
 #else /* defined NO_RSA */
 void
-Init_ossl_rsa()
+Init_ossl_rsa(void)
 {
 }
 #endif /* NO_RSA */
-
diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
index 270a4b7437..4a4f9dd5bf 100644
--- a/ext/openssl/ossl_rand.c
+++ b/ext/openssl/ossl_rand.c
@@ -1,37 +1,22 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ *
  * All rights reserved.
- */
-/*
- * This program is licenced under the same licence as Ruby.
+ *
+ * This program is licensed 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)
@@ -46,6 +31,23 @@ 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)
@@ -60,13 +62,12 @@ 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)
 {
-    SafeStringValue(filename);
-
-    if(!RAND_load_file(RSTRING_PTR(filename), -1)) {
+    if(!RAND_load_file(StringValueCStr(filename), -1)) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
@@ -76,12 +77,14 @@ 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)
 {
-    SafeStringValue(filename);
-    if (RAND_write_file(RSTRING_PTR(filename)) == -1) {
+    if (RAND_write_file(StringValueCStr(filename)) == -1) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
@@ -89,27 +92,48 @@ ossl_rand_write_file(VALUE self, VALUE filename)
 
 /*
  *  call-seq:
- *     random_bytes(length) -> aString
+ *	random_bytes(length) -> string
+ *
+ * Generates a 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);
-    if (!RAND_bytes((unsigned char *)RSTRING_PTR(str), n)) {
-	ossl_raise(eRandomError, NULL);
+    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");
     }
 
     return str;
 }
 
+#if defined(HAVE_RAND_PSEUDO_BYTES)
 /*
  *  call-seq:
- *     pseudo_bytes(length) -> aString
+ *	pseudo_bytes(length) -> string
+ *
+ * Generates a String with _length_ number of pseudo-random bytes.
+ *
+ * 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)
@@ -118,24 +142,25 @@ 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)) {
+    if (RAND_pseudo_bytes((unsigned char *)RSTRING_PTR(str), n) < 1) {
 	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)
 {
-    SafeStringValue(filename);
-
-    if(!RAND_egd(RSTRING_PTR(filename))) {
+    if (RAND_egd(StringValueCStr(filename)) == -1) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
@@ -145,25 +170,28 @@ 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);
 
-    SafeStringValue(filename);
-
-    if (!RAND_egd_bytes(RSTRING_PTR(filename), n)) {
+    if (RAND_egd_bytes(StringValueCStr(filename), n) == -1) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
 }
+#endif /* HAVE_RAND_EGD */
 
 /*
  *  call-seq:
  *     status? => true | false
  *
- * Return true if the PRNG has been seeded with enough data, false otherwise.
+ * Return +true+ if the PRNG has been seeded with enough data, +false+ otherwise.
  */
 static VALUE
 ossl_rand_status(VALUE self)
@@ -171,32 +199,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()
+Init_ossl_rand(void)
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
     mRandom = rb_define_module_under(mOSSL, "Random");
 
     eRandomError = rb_define_class_under(mRandom, "RandomError", eOSSLError);
 
-    DEFMETH(mRandom, "seed", ossl_rand_seed, 1);
-    DEFMETH(mRandom, "random_add", ossl_rand_add, 2);
-    DEFMETH(mRandom, "load_random_file", ossl_rand_load_file, 1);
-    DEFMETH(mRandom, "write_random_file", ossl_rand_write_file, 1);
-    DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1);
-    DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
-    DEFMETH(mRandom, "egd", ossl_rand_egd, 1);
-    DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
-    DEFMETH(mRandom, "status?", ossl_rand_status, 0)
+    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);
 }
-
diff --git a/ext/openssl/ossl_rand.h b/ext/openssl/ossl_rand.h
index ce2ae0d129..8f77a3b239 100644
--- a/ext/openssl/ossl_rand.h
+++ b/ext/openssl/ossl_rand.h
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_RAND_H_)
@@ -17,4 +16,3 @@ 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 3769633468..de0556f543 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -1,5 +1,4 @@
 /*
- * $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>
@@ -7,15 +6,11 @@
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed 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
@@ -24,329 +19,384 @@
 #  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;
-VALUE eSSLError;
+static VALUE mSSLExtConfig;
+static VALUE eSSLError;
 VALUE cSSLContext;
 VALUE cSSLSocket;
 
-#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_get((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",
-    "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",
+static VALUE eSSLErrorWaitReadable;
+static VALUE eSSLErrorWaitWritable;
+
+static ID id_call, 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;
+
+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 int ossl_ssl_ex_vcb_idx;
+static int ossl_ssl_ex_ptr_idx;
+static int ossl_sslctx_ex_ptr_idx;
+#if !defined(HAVE_X509_STORE_UP_REF)
+static int ossl_sslctx_ex_store_p;
 #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;
-
-/*
- * SSLContext class
- */
-struct {
-    const char *name;
-    SSL_METHOD *(*func)(void);
-} ossl_ssl_method_tab[] = {
-#define OSSL_SSL_METHOD_ENTRY(name) { #name, (SSL_METHOD *(*)(void))name##_method }
-    OSSL_SSL_METHOD_ENTRY(TLSv1),
-    OSSL_SSL_METHOD_ENTRY(TLSv1_server),
-    OSSL_SSL_METHOD_ENTRY(TLSv1_client),
-#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
-        defined(HAVE_SSLV2_CLIENT_METHOD)
-    OSSL_SSL_METHOD_ENTRY(SSLv2),
-    OSSL_SSL_METHOD_ENTRY(SSLv2_server),
-    OSSL_SSL_METHOD_ENTRY(SSLv2_client),
-#endif
-    OSSL_SSL_METHOD_ENTRY(SSLv3),
-    OSSL_SSL_METHOD_ENTRY(SSLv3_server),
-    OSSL_SSL_METHOD_ENTRY(SSLv3_client),
-    OSSL_SSL_METHOD_ENTRY(SSLv23),
-    OSSL_SSL_METHOD_ENTRY(SSLv23_server),
-    OSSL_SSL_METHOD_ENTRY(SSLv23_client),
-#undef OSSL_SSL_METHOD_ENTRY
-};
-
-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(SSL_CTX *ctx)
+ossl_sslctx_free(void *ptr)
 {
-    if(ctx && SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_store_p)== (void*)1)
+    SSL_CTX *ctx = ptr;
+#if !defined(HAVE_X509_STORE_UP_REF)
+    if (ctx && SSL_CTX_get_ex_data(ctx, ossl_sslctx_ex_store_p))
 	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;
-
-#ifdef SSL_MODE_RELEASE_BUFFERS
-    mode |= SSL_MODE_RELEASE_BUFFERS;
-#endif
+    long mode = 0 |
+	SSL_MODE_ENABLE_PARTIAL_WRITE |
+	SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER |
+	SSL_MODE_RELEASE_BUFFERS;
+    VALUE obj;
 
+    obj = TypedData_Wrap_Struct(klass, &ossl_sslctx_type, 0);
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+    ctx = SSL_CTX_new(TLS_method());
+#else
     ctx = SSL_CTX_new(SSLv23_method());
+#endif
     if (!ctx) {
-        ossl_raise(eSSLError, "SSL_CTX_new:");
+        ossl_raise(eSSLError, "SSL_CTX_new");
     }
     SSL_CTX_set_mode(ctx, mode);
-    SSL_CTX_set_options(ctx, SSL_OP_ALL);
-    return Data_Wrap_Struct(klass, 0, ossl_sslctx_free, ctx);
+    RTYPEDDATA_DATA(obj) = ctx;
+    SSL_CTX_set_ex_data(ctx, ossl_sslctx_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;
 }
 
-/*
- * call-seq:
- *    ctx.ssl_version = :TLSv1
- *    ctx.ssl_version = "SSLv23_client"
- *
- * 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)
+static int
+parse_proto_version(VALUE str)
 {
-    SSL_METHOD *method = NULL;
-    const char *s;
     int i;
+    static const struct {
+	const char *name;
+	int version;
+    } map[] = {
+	{ "SSL2", SSL2_VERSION },
+	{ "SSL3", SSL3_VERSION },
+	{ "TLS1", TLS1_VERSION },
+	{ "TLS1_1", TLS1_1_VERSION },
+	{ "TLS1_2", TLS1_2_VERSION },
+#ifdef TLS1_3_VERSION
+	{ "TLS1_3", TLS1_3_VERSION },
+#endif
+    };
 
-    SSL_CTX *ctx;
-    if(TYPE(ssl_method) == T_SYMBOL)
-	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) {
-            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 (NIL_P(str))
+	return 0;
+    if (RB_INTEGER_TYPE_P(str))
+	return NUM2INT(str);
 
-    return ssl_method;
+    if (SYMBOL_P(str))
+	str = rb_sym2str(str);
+    StringValue(str);
+    for (i = 0; i < numberof(map); i++)
+	if (!strncmp(map[i].name, RSTRING_PTR(str), RSTRING_LEN(str)))
+	    return map[i].version;
+    rb_raise(rb_eArgError, "unrecognized version %+"PRIsVALUE, str);
 }
 
 /*
  * call-seq:
- *    SSLContext.new => ctx
- *    SSLContext.new(:TLSv1) => ctx
- *    SSLContext.new("SSLv23_client") => ctx
+ *    ctx.set_minmax_proto_version(min, max) -> nil
  *
- * You can get a list of valid methods with OpenSSL::SSL::SSLContext::METHODS
+ * Sets the minimum and maximum supported protocol versions. See #min_version=
+ * and #max_version=.
  */
 static VALUE
-ossl_sslctx_initialize(int argc, VALUE *argv, VALUE self)
+ossl_sslctx_set_minmax_proto_version(VALUE self, VALUE min_v, VALUE max_v)
 {
-    VALUE ssl_method;
-    int i;
+    SSL_CTX *ctx;
+    int min, max;
 
-    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;
+    GetSSLCTX(self, ctx);
+    min = parse_proto_version(min_v);
+    max = parse_proto_version(max_v);
+
+#ifdef HAVE_SSL_CTX_SET_MIN_PROTO_VERSION
+    if (!SSL_CTX_set_min_proto_version(ctx, min))
+	ossl_raise(eSSLError, "SSL_CTX_set_min_proto_version");
+    if (!SSL_CTX_set_max_proto_version(ctx, max))
+	ossl_raise(eSSLError, "SSL_CTX_set_max_proto_version");
+#else
+    {
+	unsigned long sum = 0, opts = 0;
+	int i;
+	static const struct {
+	    int ver;
+	    unsigned long opts;
+	} options_map[] = {
+	    { SSL2_VERSION, SSL_OP_NO_SSLv2 },
+	    { SSL3_VERSION, SSL_OP_NO_SSLv3 },
+	    { TLS1_VERSION, SSL_OP_NO_TLSv1 },
+	    { TLS1_1_VERSION, SSL_OP_NO_TLSv1_1 },
+	    { TLS1_2_VERSION, SSL_OP_NO_TLSv1_2 },
+# if defined(TLS1_3_VERSION)
+	    { TLS1_3_VERSION, SSL_OP_NO_TLSv1_3 },
+# endif
+	};
+
+	for (i = 0; i < numberof(options_map); i++) {
+	    sum |= options_map[i].opts;
+            if ((min && min > options_map[i].ver) ||
+                (max && max < options_map[i].ver)) {
+		opts |= options_map[i].opts;
+            }
+	}
+	SSL_CTX_clear_options(ctx, sum);
+	SSL_CTX_set_options(ctx, opts);
     }
-    ossl_sslctx_set_ssl_version(self, ssl_method);
+#endif
 
-    return self;
+    return Qnil;
 }
 
 static VALUE
 ossl_call_client_cert_cb(VALUE obj)
 {
-    VALUE cb, ary, cert, key;
-    SSL *ssl;
+    VALUE ctx_obj, cb, ary, cert, key;
 
-    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);
+    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;
+
+    ary = rb_funcallv(cb, id_call, 1, &obj);
     Check_Type(ary, T_ARRAY);
     GetX509CertPtr(cert = rb_ary_entry(ary, 0));
-    GetPKeyPtr(key = rb_ary_entry(ary, 1));
-    ossl_ssl_set_x509(obj, cert);
-    ossl_ssl_set_key(obj, key);
+    GetPrivPKeyPtr(key = rb_ary_entry(ary, 1));
 
-    return Qtrue;
+    return rb_ary_new3(2, cert, key);
 }
 
 static int
 ossl_client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 {
-    VALUE obj, success;
+    VALUE obj, ret;
 
     obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
-    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));
+    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));
 
     return 1;
 }
 
-#if !defined(OPENSSL_NO_DH)
-static VALUE
-ossl_call_tmp_dh_callback(VALUE *args)
+#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)
 {
-    SSL *ssl;
     VALUE cb, dh;
     EVP_PKEY *pkey;
 
-    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]);
+    cb = rb_funcall(args->ssl_obj, args->id, 0);
+    if (NIL_P(cb))
+	return NULL;
+    dh = rb_funcall(cb, id_call, 3, args->ssl_obj, INT2NUM(args->is_export),
+		    INT2NUM(args->keylength));
     pkey = GetPKeyPtr(dh);
-    if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) return Qfalse;
-    ossl_ssl_set_tmp_dh(args[0], dh);
+    if (EVP_PKEY_base_id(pkey) != args->type)
+	return NULL;
 
-    return Qtrue;
+    return pkey;
 }
+#endif
 
-static DH*
+#if !defined(OPENSSL_NO_DH)
+static DH *
 ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
 {
-    VALUE args[3], success;
+    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 */
 
-    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;
+#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;
 
-    return GetPKeyPtr(ossl_ssl_get_tmp_dh(args[0]))->pkey.dh;
+    return EVP_PKEY_get0_EC_KEY(pkey);
 }
+#endif
 
-static DH*
-ossl_default_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
+static VALUE
+call_verify_certificate_identity(VALUE ctx_v)
 {
-    rb_warning("using default DH parameters.");
+    X509_STORE_CTX *ctx = (X509_STORE_CTX *)ctx_v;
+    SSL *ssl;
+    VALUE ssl_obj, hostname, cert_obj;
 
-    switch(keylength){
-    case 512:
-	return OSSL_DEFAULT_DH_512;
-    case 1024:
-	return OSSL_DEFAULT_DH_1024;
+    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);
+
+    if (!RTEST(hostname)) {
+	rb_warning("verify_hostname requires hostname to be set");
+	return Qtrue;
     }
-    return NULL;
+
+    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);
 }
-#endif /* OPENSSL_NO_DH */
 
 static int
 ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
 {
-    VALUE cb;
+    VALUE cb, ssl_obj, sslctx_obj, verify_hostname, ret;
     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);
-    X509_STORE_CTX_set_ex_data(ctx, ossl_verify_cb_idx, (void*)cb);
-    return ossl_verify_cb(preverify_ok, ctx);
+    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);
 }
 
 static VALUE
 ossl_call_session_get_cb(VALUE ary)
 {
-    VALUE ssl_obj, sslctx_obj, cb;
+    VALUE ssl_obj, cb;
 
     Check_Type(ary, T_ARRAY);
     ssl_obj = rb_ary_entry(ary, 0);
 
-    sslctx_obj = rb_iv_get(ssl_obj, "@context");
-    if (NIL_P(sslctx_obj)) return Qnil;
-    cb = rb_iv_get(sslctx_obj, "@session_get_cb");
+    cb = rb_funcall(ssl_obj, rb_intern("session_get_cb"), 0);
     if (NIL_P(cb)) return Qnil;
 
-    return rb_funcall(cb, rb_intern("call"), 1, ary);
+    return rb_funcallv(cb, id_call, 1, &ary);
 }
 
-/* this method is currently only called for servers (in OpenSSL <= 0.9.8e) */
 static SSL_SESSION *
+#if (!defined(LIBRESSL_VERSION_NUMBER) ? OPENSSL_VERSION_NUMBER >= 0x10100000 : LIBRESSL_VERSION_NUMBER >= 0x2080000f)
+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;
-    void *ptr;
     int state = 0;
 
     OSSL_Debug("SSL SESSION get callback entered");
-    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
-    	return NULL;
-    ssl_obj = (VALUE)ptr;
+    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
     ary = rb_ary_new2(2);
     rb_ary_push(ary, ssl_obj);
     rb_ary_push(ary, rb_str_new((const char *)buf, len));
 
-    ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_get_cb, ary, &state);
+    ret_obj = rb_protect(ossl_call_session_get_cb, ary, &state);
     if (state) {
         rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
         return NULL;
@@ -354,7 +404,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
     if (!rb_obj_is_instance_of(ret_obj, cSSLSession))
         return NULL;
 
-    SafeGetSSLSession(ret_obj, sess);
+    GetSSLSession(ret_obj, sess);
     *copy = 1;
 
     return sess;
@@ -363,47 +413,42 @@ 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, sslctx_obj, cb;
+    VALUE ssl_obj, cb;
 
     Check_Type(ary, T_ARRAY);
     ssl_obj = rb_ary_entry(ary, 0);
 
-    sslctx_obj = rb_iv_get(ssl_obj, "@context");
-    if (NIL_P(sslctx_obj)) return Qnil;
-    cb = rb_iv_get(sslctx_obj, "@session_new_cb");
+    cb = rb_funcall(ssl_obj, rb_intern("session_new_cb"), 0);
     if (NIL_P(cb)) return Qnil;
 
-    return rb_funcall(cb, rb_intern("call"), 1, ary);
+    return rb_funcallv(cb, id_call, 1, &ary);
 }
 
 /* return 1 normal.  return 0 removes the session */
 static int
 ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess)
 {
-    VALUE ary, ssl_obj, sess_obj, ret_obj;
-    void *ptr;
+    VALUE ary, ssl_obj, sess_obj;
     int state = 0;
 
     OSSL_Debug("SSL SESSION new callback entered");
 
-    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
-    	return 1;
-    ssl_obj = (VALUE)ptr;
+    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
     sess_obj = rb_obj_alloc(cSSLSession);
-    CRYPTO_add(&sess->references, 1, CRYPTO_LOCK_SSL_SESSION);
+    SSL_SESSION_up_ref(sess);
     DATA_PTR(sess_obj) = sess;
 
     ary = rb_ary_new2(2);
     rb_ary_push(ary, ssl_obj);
     rb_ary_push(ary, sess_obj);
 
-    ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_new_cb, ary, &state);
+    rb_protect(ossl_call_session_new_cb, ary, &state);
     if (state) {
         rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
     }
 
     /*
-     * return 0 which means to OpenSSL that the the session is still
+     * return 0 which means to OpenSSL that the session is still
      * valid (since we created Ruby Session object) and was not freed by us
      * with SSL_SESSION_free(). Call SSLContext#remove_session(sess) in
      * session_get_cb block if you don't want OpenSSL to cache the session
@@ -420,33 +465,37 @@ ossl_call_session_remove_cb(VALUE ary)
     Check_Type(ary, T_ARRAY);
     sslctx_obj = rb_ary_entry(ary, 0);
 
-    cb = rb_iv_get(sslctx_obj, "@session_remove_cb");
+    cb = rb_attr_get(sslctx_obj, id_i_session_remove_cb);
     if (NIL_P(cb)) return Qnil;
 
-    return rb_funcall(cb, rb_intern("call"), 1, ary);
+    return rb_funcallv(cb, id_call, 1, &ary);
 }
 
 static void
 ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
 {
-    VALUE ary, sslctx_obj, sess_obj, ret_obj;
-    void *ptr;
+    VALUE ary, sslctx_obj, sess_obj;
     int state = 0;
 
+    /*
+     * This callback is also called for all sessions in the internal store
+     * when SSL_CTX_free() is called.
+     */
+    if (rb_during_gc())
+	return;
+
     OSSL_Debug("SSL SESSION remove callback entered");
 
-    if ((ptr = SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_ptr_idx)) == NULL)
-    	return;
-    sslctx_obj = (VALUE)ptr;
+    sslctx_obj = (VALUE)SSL_CTX_get_ex_data(ctx, ossl_sslctx_ex_ptr_idx);
     sess_obj = rb_obj_alloc(cSSLSession);
-    CRYPTO_add(&sess->references, 1, CRYPTO_LOCK_SSL_SESSION);
+    SSL_SESSION_up_ref(sess);
     DATA_PTR(sess_obj) = sess;
 
     ary = rb_ary_new2(2);
     rb_ary_push(ary, sslctx_obj);
     rb_ary_push(ary, sess_obj);
 
-    ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_remove_cb, ary, &state);
+    rb_protect(ossl_call_session_remove_cb, ary, &state);
     if (state) {
 /*
   the SSL_CTX is frozen, nowhere to save state.
@@ -457,12 +506,12 @@ ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
 }
 
 static VALUE
-ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg)
+ossl_sslctx_add_extra_chain_cert_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg))
 {
     X509 *x509;
     SSL_CTX *ctx;
 
-    Data_Get_Struct(arg, SSL_CTX, ctx);
+    GetSSLCTX(arg, ctx);
     x509 = DupX509CertPtr(i);
     if(!SSL_CTX_add_extra_chain_cert(ctx, x509)){
 	ossl_raise(eSSLError, NULL);
@@ -473,7 +522,6 @@ ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg)
 
 static VALUE ossl_sslctx_setup(VALUE self);
 
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
 static VALUE
 ossl_call_servername_cb(VALUE ary)
 {
@@ -482,22 +530,23 @@ ossl_call_servername_cb(VALUE ary)
     Check_Type(ary, T_ARRAY);
     ssl_obj = rb_ary_entry(ary, 0);
 
-    sslctx_obj = rb_iv_get(ssl_obj, "@context");
-    if (NIL_P(sslctx_obj)) return Qnil;
-    cb = rb_iv_get(sslctx_obj, "@servername_cb");
+    sslctx_obj = rb_attr_get(ssl_obj, id_i_context);
+    cb = rb_attr_get(sslctx_obj, id_i_servername_cb);
     if (NIL_P(cb)) return Qnil;
 
-    ret_obj = rb_funcall(cb, rb_intern("call"), 1, ary);
+    ret_obj = rb_funcallv(cb, id_call, 1, &ary);
     if (rb_obj_is_kind_of(ret_obj, cSSLContext)) {
         SSL *ssl;
         SSL_CTX *ctx2;
 
         ossl_sslctx_setup(ret_obj);
-        Data_Get_Struct(ssl_obj, SSL, ssl);
-        Data_Get_Struct(ret_obj, SSL_CTX, ctx2);
+        GetSSL(ssl_obj, ssl);
+        GetSSLCTX(ret_obj, 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;
@@ -506,22 +555,19 @@ ossl_call_servername_cb(VALUE ary)
 static int
 ssl_servername_cb(SSL *ssl, int *ad, void *arg)
 {
-    VALUE ary, ssl_obj, ret_obj;
-    void *ptr;
+    VALUE ary, ssl_obj;
     int state = 0;
     const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
 
     if (!servername)
         return SSL_TLSEXT_ERR_OK;
 
-    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
-    	return SSL_TLSEXT_ERR_ALERT_FATAL;
-    ssl_obj = (VALUE)ptr;
+    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
     ary = rb_ary_new2(2);
     rb_ary_push(ary, ssl_obj);
     rb_ary_push(ary, rb_str_new2(servername));
 
-    ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_servername_cb, ary, &state);
+    rb_protect(ossl_call_servername_cb, ary, &state);
     if (state) {
         rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
         return SSL_TLSEXT_ERR_ALERT_FATAL;
@@ -529,83 +575,287 @@ ssl_servername_cb(SSL *ssl, int *ad, void *arg)
 
     return SSL_TLSEXT_ERR_OK;
 }
+
+static void
+ssl_renegotiation_cb(const SSL *ssl)
+{
+    VALUE ssl_obj, sslctx_obj, cb;
+
+    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    sslctx_obj = rb_attr_get(ssl_obj, id_i_context);
+    cb = rb_attr_get(sslctx_obj, id_i_renegotiation_cb);
+    if (NIL_P(cb)) return;
+
+    rb_funcallv(cb, id_call, 1, &ssl_obj);
+}
+
+#if !defined(OPENSSL_NO_NEXTPROTONEG) || \
+    defined(HAVE_SSL_CTX_SET_ALPN_SELECT_CB)
+static VALUE
+ssl_npn_encode_protocol_i(RB_BLOCK_CALL_FUNC_ARGLIST(cur, encoded))
+{
+    int len = RSTRING_LENINT(cur);
+    char len_byte;
+    if (len < 1 || len > 255)
+	ossl_raise(eSSLError, "Advertised protocol must have length 1..255");
+    /* Encode the length byte */
+    len_byte = len;
+    rb_str_buf_cat(encoded, &len_byte, 1);
+    rb_str_buf_cat(encoded, RSTRING_PTR(cur), len);
+    return Qnil;
+}
+
+static VALUE
+ssl_encode_npn_protocols(VALUE protocols)
+{
+    VALUE encoded = rb_str_new(NULL, 0);
+    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_funcallv(args->cb, id_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;
+}
+
+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)
+{
+    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
+
+#ifndef OPENSSL_NO_NEXTPROTONEG
+static int
+ssl_npn_advertise_cb(SSL *ssl, const unsigned char **out, unsigned int *outlen,
+		     void *arg)
+{
+    VALUE protocols = (VALUE)arg;
+
+    *out = (const unsigned char *) RSTRING_PTR(protocols);
+    *outlen = RSTRING_LENINT(protocols);
+
+    return SSL_TLSEXT_ERR_OK;
+}
+
+static int
+ssl_npn_select_cb(SSL *ssl, unsigned char **out, unsigned char *outlen,
+		  const unsigned char *in, unsigned int inlen, void *arg)
+{
+    VALUE sslctx_obj, cb;
+
+    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;
+
+    sslctx_obj = (VALUE) arg;
+    cb = rb_attr_get(sslctx_obj, id_i_alpn_select_cb);
+
+    return ssl_npn_select_cb_common(ssl, cb, out, outlen, in, inlen);
+}
 #endif
 
+/* 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);
+
+    if (is_server && where & SSL_CB_HANDSHAKE_START) {
+	ssl_renegotiation_cb(ssl);
+    }
+}
+
+/*
+ * Gets various OpenSSL options.
+ */
+static VALUE
+ossl_sslctx_get_options(VALUE self)
+{
+    SSL_CTX *ctx;
+    GetSSLCTX(self, ctx);
+    /*
+     * Do explicit cast because SSL_CTX_get_options() returned (signed) long in
+     * OpenSSL before 1.1.0.
+     */
+    return ULONG2NUM((unsigned long)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, NUM2ULONG(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.
- * Normally you do not need to call this method (unless you are writing an
- * extension in C).
+ * However, it is not thread-safe and must be called before creating
+ * SSLSocket objects in a multi-threaded program.
  */
 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 i, verify_mode;
+    int verify_mode;
+    long i;
     VALUE val;
 
     if(OBJ_FROZEN(self)) return Qnil;
-    Data_Get_Struct(self, SSL_CTX, ctx);
+    GetSSLCTX(self, ctx);
 
 #if !defined(OPENSSL_NO_DH)
-    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);
-    }
+    SSL_CTX_set_tmp_dh_callback(ctx, ossl_tmp_dh_callback);
 #endif
-    SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_ptr_idx, (void*)self);
 
-    val = ossl_sslctx_get_cert_store(self);
-    if(!NIL_P(val)){
+#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
+    }
+#endif /* OPENSSL_NO_EC */
+
+    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)
 	/*
          * 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.
 	 */
-        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);
+        SSL_CTX_set_ex_data(ctx, ossl_sslctx_ex_store_p, ctx);
+#else /* Fixed in OpenSSL 1.0.2; bff9ce4db38b (master), 5b4b9ce976fc (1.0.2) */
+	X509_STORE_up_ref(store);
+#endif
     }
 
-    val = ossl_sslctx_get_extra_cert(self);
+    val = rb_attr_get(self, id_i_extra_chain_cert);
     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 = ossl_sslctx_get_cert(self);
+    val = rb_attr_get(self, id_i_cert);
     cert = NIL_P(val) ? NULL : GetX509CertPtr(val); /* NO DUP NEEDED */
-    val = ossl_sslctx_get_key(self);
-    key = NIL_P(val) ? NULL : GetPKeyPtr(val); /* NO DUP NEEDED */
+    val = rb_attr_get(self, id_i_key);
+    key = NIL_P(val) ? NULL : GetPrivPKeyPtr(val); /* NO DUP NEEDED */
     if (cert && key) {
         if (!SSL_CTX_use_certificate(ctx, cert)) {
             /* Adds a ref => Safe to FREE */
-            ossl_raise(eSSLError, "SSL_CTX_use_certificate:");
+            ossl_raise(eSSLError, "SSL_CTX_use_certificate");
         }
         if (!SSL_CTX_use_PrivateKey(ctx, key)) {
             /* Adds a ref => Safe to FREE */
-            ossl_raise(eSSLError, "SSL_CTX_use_PrivateKey:");
+            ossl_raise(eSSLError, "SSL_CTX_use_PrivateKey");
         }
         if (!SSL_CTX_check_private_key(ctx)) {
-            ossl_raise(eSSLError, "SSL_CTX_check_private_key:");
+            ossl_raise(eSSLError, "SSL_CTX_check_private_key");
         }
     }
 
-    val = ossl_sslctx_get_client_ca(self);
+    val = rb_attr_get(self, id_i_client_ca);
     if(!NIL_P(val)){
-	if(TYPE(val) == T_ARRAY){
+	if (RB_TYPE_P(val, T_ARRAY)) {
 	    for(i = 0; i < RARRAY_LEN(val); i++){
-		client_ca = GetX509CertPtr(RARRAY_PTR(val)[i]);
+		client_ca = GetX509CertPtr(RARRAY_AREF(val, i));
         	if (!SSL_CTX_add_client_CA(ctx, client_ca)){
 		    /* Copies X509_NAME => FREE it. */
         	    ossl_raise(eSSLError, "SSL_CTX_add_client_CA");
@@ -621,66 +871,93 @@ ossl_sslctx_setup(VALUE self)
 	}
     }
 
-    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);
+    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);
     if(ca_file || ca_path){
 	if (!SSL_CTX_load_verify_locations(ctx, ca_file, ca_path))
 	    rb_warning("can't set verify locations");
     }
 
-    val = ossl_sslctx_get_verify_mode(self);
+    val = rb_attr_get(self, id_i_verify_mode);
     verify_mode = NIL_P(val) ? SSL_VERIFY_NONE : NUM2INT(val);
     SSL_CTX_set_verify(ctx, verify_mode, ossl_ssl_verify_callback);
-    if (RTEST(ossl_sslctx_get_client_cert_cb(self)))
+    if (RTEST(rb_attr_get(self, id_i_client_cert_cb)))
 	SSL_CTX_set_client_cert_cb(ctx, ossl_client_cert_cb);
 
-    val = ossl_sslctx_get_timeout(self);
+    val = rb_attr_get(self, id_i_timeout);
     if(!NIL_P(val)) SSL_CTX_set_timeout(ctx, NUM2LONG(val));
 
-    val = ossl_sslctx_get_verify_dep(self);
+    val = rb_attr_get(self, id_i_verify_depth);
     if(!NIL_P(val)) SSL_CTX_set_verify_depth(ctx, NUM2INT(val));
 
-    val = ossl_sslctx_get_options(self);
-    if(!NIL_P(val)) SSL_CTX_set_options(ctx, NUM2LONG(val));
+#ifndef OPENSSL_NO_NEXTPROTONEG
+    val = rb_attr_get(self, id_i_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);
+	OSSL_Debug("SSL NPN advertise callback added");
+    }
+    if (RTEST(rb_attr_get(self, id_i_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 = ossl_sslctx_get_sess_id_ctx(self);
+    val = rb_attr_get(self, id_i_session_id_context);
     if (!NIL_P(val)){
 	StringValue(val);
 	if (!SSL_CTX_set_session_id_context(ctx, (unsigned char *)RSTRING_PTR(val),
 					    RSTRING_LENINT(val))){
-	    ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
+	    ossl_raise(eSSLError, "SSL_CTX_set_session_id_context");
 	}
     }
 
-    if (RTEST(rb_iv_get(self, "@session_get_cb"))) {
+    if (RTEST(rb_attr_get(self, id_i_session_get_cb))) {
 	SSL_CTX_sess_set_get_cb(ctx, ossl_sslctx_session_get_cb);
 	OSSL_Debug("SSL SESSION get callback added");
     }
-    if (RTEST(rb_iv_get(self, "@session_new_cb"))) {
+    if (RTEST(rb_attr_get(self, id_i_session_new_cb))) {
 	SSL_CTX_sess_set_new_cb(ctx, ossl_sslctx_session_new_cb);
 	OSSL_Debug("SSL SESSION new callback added");
     }
-    if (RTEST(rb_iv_get(self, "@session_remove_cb"))) {
+    if (RTEST(rb_attr_get(self, id_i_session_remove_cb))) {
 	SSL_CTX_sess_set_remove_cb(ctx, ossl_sslctx_session_remove_cb);
 	OSSL_Debug("SSL SESSION remove callback added");
     }
 
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-    val = rb_iv_get(self, "@servername_cb");
+    val = rb_attr_get(self, id_i_servername_cb);
     if (!NIL_P(val)) {
         SSL_CTX_set_tlsext_servername_callback(ctx, ssl_servername_cb);
 	OSSL_Debug("SSL TLSEXT servername callback added");
     }
-#endif
 
     return Qtrue;
 }
 
 static VALUE
-ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
+ossl_ssl_cipher_to_ary(const SSL_CIPHER *cipher)
 {
     VALUE ary;
     int bits, alg_bits;
@@ -689,8 +966,8 @@ ossl_ssl_cipher_to_ary(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, INT2FIX(bits));
-    rb_ary_push(ary, INT2FIX(alg_bits));
+    rb_ary_push(ary, INT2NUM(bits));
+    rb_ary_push(ary, INT2NUM(alg_bits));
 
     return ary;
 }
@@ -699,24 +976,19 @@ ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
  * call-seq:
  *    ctx.ciphers => [[name, version, bits, alg_bits], ...]
  *
- * The list of ciphers configured for this context.
+ * The list of cipher suites configured for this context.
  */
 static VALUE
 ossl_sslctx_get_ciphers(VALUE self)
 {
     SSL_CTX *ctx;
     STACK_OF(SSL_CIPHER) *ciphers;
-    SSL_CIPHER *cipher;
+    const SSL_CIPHER *cipher;
     VALUE ary;
     int i, num;
 
-    Data_Get_Struct(self, SSL_CTX, ctx);
-    if(!ctx){
-        rb_warning("SSL_CTX is not initialized.");
-        return Qnil;
-    }
-    ciphers = ctx->cipher_list;
-
+    GetSSLCTX(self, ctx);
+    ciphers = SSL_CTX_get_ciphers(ctx);
     if (!ciphers)
         return rb_ary_new();
 
@@ -735,11 +1007,9 @@ ossl_sslctx_get_ciphers(VALUE self)
  *    ctx.ciphers = [name, ...]
  *    ctx.ciphers = [[name, version, bits, alg_bits], ...]
  *
- * Sets the list of available ciphers for this context.  Note in a server
+ * Sets the list of available cipher suites for this context.  Note in a server
  * context some ciphers require the appropriate certificates.  For example, an
- * RSA cipher can only be chosen when an RSA certificate is available.
- *
- * See also OpenSSL::Cipher and OpenSSL::Cipher::ciphers
+ * RSA cipher suite can only be chosen when an RSA certificate is available.
  */
 static VALUE
 ossl_sslctx_set_ciphers(VALUE self, VALUE v)
@@ -751,11 +1021,11 @@ ossl_sslctx_set_ciphers(VALUE self, VALUE v)
     rb_check_frozen(self);
     if (NIL_P(v))
 	return v;
-    else if (TYPE(v) == T_ARRAY) {
+    else if (RB_TYPE_P(v, T_ARRAY)) {
         str = rb_str_new(0, 0);
         for (i = 0; i < RARRAY_LEN(v); i++) {
             elem = rb_ary_entry(v, i);
-            if (TYPE(elem) == T_ARRAY) elem = rb_ary_entry(elem, 0);
+            if (RB_TYPE_P(elem, T_ARRAY)) elem = rb_ary_entry(elem, 0);
             elem = rb_String(elem);
             rb_str_append(str, elem);
             if (i < RARRAY_LEN(v)-1) rb_str_cat2(str, ":");
@@ -765,24 +1035,294 @@ ossl_sslctx_set_ciphers(VALUE self, VALUE v)
         StringValue(str);
     }
 
-    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, RSTRING_PTR(str))) {
-        ossl_raise(eSSLError, "SSL_CTX_set_cipher_list:");
+    GetSSLCTX(self, ctx);
+    if (!SSL_CTX_set_cipher_list(ctx, StringValueCStr(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;
+}
+
+#ifdef SSL_MODE_SEND_FALLBACK_SCSV
+/*
+ * call-seq:
+ *    ctx.enable_fallback_scsv() => nil
+ *
+ * Activate TLS_FALLBACK_SCSV for this context.
+ * See RFC 7507.
+ */
+static VALUE
+ossl_sslctx_enable_fallback_scsv(VALUE self)
+{
+    SSL_CTX *ctx;
+
+    GetSSLCTX(self, ctx);
+    SSL_CTX_set_mode(ctx, SSL_MODE_SEND_FALLBACK_SCSV);
+
+    return Qnil;
+}
+#endif
+
+/*
+ * call-seq:
+ *    ctx.add_certificate(certiticate, pkey [, extra_certs]) -> self
+ *
+ * Adds a certificate to the context. _pkey_ must be a corresponding private
+ * key with _certificate_.
+ *
+ * Multiple certificates with different public key type can be added by
+ * repeated calls of this method, and OpenSSL will choose the most appropriate
+ * certificate during the handshake.
+ *
+ * #cert=, #key=, and #extra_chain_cert= are old accessor methods for setting
+ * certificate and internally call this method.
+ *
+ * === Parameters
+ * _certificate_::
+ *   A certificate. An instance of OpenSSL::X509::Certificate.
+ * _pkey_::
+ *   The private key for _certificate_. An instance of OpenSSL::PKey::PKey.
+ * _extra_certs_::
+ *   Optional. An array of OpenSSL::X509::Certificate. When sending a
+ *   certificate chain, the certificates specified by this are sent following
+ *   _certificate_, in the order in the array.
+ *
+ * === Example
+ *   rsa_cert = OpenSSL::X509::Certificate.new(...)
+ *   rsa_pkey = OpenSSL::PKey.read(...)
+ *   ca_intermediate_cert = OpenSSL::X509::Certificate.new(...)
+ *   ctx.add_certificate(rsa_cert, rsa_pkey, [ca_intermediate_cert])
+ *
+ *   ecdsa_cert = ...
+ *   ecdsa_pkey = ...
+ *   another_ca_cert = ...
+ *   ctx.add_certificate(ecdsa_cert, ecdsa_pkey, [another_ca_cert])
+ *
+ * === Note
+ * OpenSSL before the version 1.0.2 could handle only one extra chain across
+ * all key types. Calling this method discards the chain set previously.
+ */
+static VALUE
+ossl_sslctx_add_certificate(int argc, VALUE *argv, VALUE self)
+{
+    VALUE cert, key, extra_chain_ary;
+    SSL_CTX *ctx;
+    X509 *x509;
+    STACK_OF(X509) *extra_chain = NULL;
+    EVP_PKEY *pkey, *pub_pkey;
+
+    GetSSLCTX(self, ctx);
+    rb_scan_args(argc, argv, "21", &cert, &key, &extra_chain_ary);
+    rb_check_frozen(self);
+    x509 = GetX509CertPtr(cert);
+    pkey = GetPrivPKeyPtr(key);
+
+    /*
+     * The reference counter is bumped, and decremented immediately.
+     * X509_get0_pubkey() is only available in OpenSSL >= 1.1.0.
+     */
+    pub_pkey = X509_get_pubkey(x509);
+    EVP_PKEY_free(pub_pkey);
+    if (!pub_pkey)
+	rb_raise(rb_eArgError, "certificate does not contain public key");
+    if (EVP_PKEY_cmp(pub_pkey, pkey) != 1)
+	rb_raise(rb_eArgError, "public key mismatch");
+
+    if (argc >= 3)
+	extra_chain = ossl_x509_ary2sk(extra_chain_ary);
+
+    if (!SSL_CTX_use_certificate(ctx, x509)) {
+	sk_X509_pop_free(extra_chain, X509_free);
+	ossl_raise(eSSLError, "SSL_CTX_use_certificate");
+    }
+    if (!SSL_CTX_use_PrivateKey(ctx, pkey)) {
+	sk_X509_pop_free(extra_chain, X509_free);
+	ossl_raise(eSSLError, "SSL_CTX_use_PrivateKey");
+    }
+
+    if (extra_chain) {
+#if OPENSSL_VERSION_NUMBER >= 0x10002000 && !defined(LIBRESSL_VERSION_NUMBER)
+	if (!SSL_CTX_set0_chain(ctx, extra_chain)) {
+	    sk_X509_pop_free(extra_chain, X509_free);
+	    ossl_raise(eSSLError, "SSL_CTX_set0_chain");
+	}
+#else
+	STACK_OF(X509) *orig_extra_chain;
+	X509 *x509_tmp;
+
+	/* First, clear the existing chain */
+	SSL_CTX_get_extra_chain_certs(ctx, &orig_extra_chain);
+	if (orig_extra_chain && sk_X509_num(orig_extra_chain)) {
+	    rb_warning("SSL_CTX_set0_chain() is not available; " \
+		       "clearing previously set certificate chain");
+	    SSL_CTX_clear_extra_chain_certs(ctx);
+	}
+	while ((x509_tmp = sk_X509_shift(extra_chain))) {
+	    /* Transfers ownership */
+	    if (!SSL_CTX_add_extra_chain_cert(ctx, x509_tmp)) {
+		X509_free(x509_tmp);
+		sk_X509_pop_free(extra_chain, X509_free);
+		ossl_raise(eSSLError, "SSL_CTX_add_extra_chain_cert");
+	    }
+	}
+	sk_X509_free(extra_chain);
+#endif
+    }
+    return self;
+}
 
 /*
  *  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)
@@ -790,8 +1330,8 @@ ossl_sslctx_session_add(VALUE self, VALUE arg)
     SSL_CTX *ctx;
     SSL_SESSION *sess;
 
-    Data_Get_Struct(self, SSL_CTX, ctx);
-    SafeGetSSLSession(arg, sess);
+    GetSSLCTX(self, ctx);
+    GetSSLSession(arg, sess);
 
     return SSL_CTX_add_session(ctx, sess) == 1 ? Qtrue : Qfalse;
 }
@@ -800,7 +1340,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)
@@ -808,8 +1348,8 @@ ossl_sslctx_session_remove(VALUE self, VALUE arg)
     SSL_CTX *ctx;
     SSL_SESSION *sess;
 
-    Data_Get_Struct(self, SSL_CTX, ctx);
-    SafeGetSSLSession(arg, sess);
+    GetSSLCTX(self, ctx);
+    GetSSLSession(arg, sess);
 
     return SSL_CTX_remove_session(ctx, sess) == 1 ? Qtrue : Qfalse;
 }
@@ -825,7 +1365,7 @@ ossl_sslctx_get_session_cache_mode(VALUE self)
 {
     SSL_CTX *ctx;
 
-    Data_Get_Struct(self, SSL_CTX, ctx);
+    GetSSLCTX(self, ctx);
 
     return LONG2NUM(SSL_CTX_get_session_cache_mode(ctx));
 }
@@ -843,7 +1383,7 @@ ossl_sslctx_set_session_cache_mode(VALUE self, VALUE arg)
 {
     SSL_CTX *ctx;
 
-    Data_Get_Struct(self, SSL_CTX, ctx);
+    GetSSLCTX(self, ctx);
 
     SSL_CTX_set_session_cache_mode(ctx, NUM2LONG(arg));
 
@@ -862,7 +1402,7 @@ ossl_sslctx_get_session_cache_size(VALUE self)
 {
     SSL_CTX *ctx;
 
-    Data_Get_Struct(self, SSL_CTX, ctx);
+    GetSSLCTX(self, ctx);
 
     return LONG2NUM(SSL_CTX_sess_get_cache_size(ctx));
 }
@@ -879,7 +1419,7 @@ ossl_sslctx_set_session_cache_size(VALUE self, VALUE arg)
 {
     SSL_CTX *ctx;
 
-    Data_Get_Struct(self, SSL_CTX, ctx);
+    GetSSLCTX(self, ctx);
 
     SSL_CTX_sess_set_cache_size(ctx, NUM2LONG(arg));
 
@@ -914,7 +1454,7 @@ ossl_sslctx_get_session_cache_stats(VALUE self)
     SSL_CTX *ctx;
     VALUE hash;
 
-    Data_Get_Struct(self, SSL_CTX, ctx);
+    GetSSLCTX(self, ctx);
 
     hash = rb_hash_new();
     rb_hash_aset(hash, ID2SYM(rb_intern("cache_num")), LONG2NUM(SSL_CTX_sess_number(ctx)));
@@ -936,9 +1476,9 @@ ossl_sslctx_get_session_cache_stats(VALUE self)
 
 /*
  *  call-seq:
- *     ctx.flush_sessions(time | nil) -> self
+ *     ctx.flush_sessions(time) -> self
  *
- * Removes sessions in the internal cache that have expired at +time+.
+ * Removes sessions in the internal cache that have expired at _time_.
  */
 static VALUE
 ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
@@ -949,7 +1489,7 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "01", &arg1);
 
-    Data_Get_Struct(self, SSL_CTX, ctx);
+    GetSSLCTX(self, ctx);
 
     if (NIL_P(arg1)) {
         tm = time(0);
@@ -967,38 +1507,32 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
 /*
  * SSLSocket class
  */
-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;
-	}
-	ERR_clear_error();
-	SSL_clear(ssl);
-    }
+#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_free(SSL *ssl)
+ossl_ssl_free(void *ssl)
 {
-    ossl_ssl_shutdown(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 Data_Wrap_Struct(klass, 0, ossl_ssl_free, NULL);
+    return TypedData_Wrap_Struct(klass, &ossl_ssl_type, NULL);
 }
 
 /*
@@ -1006,10 +1540,10 @@ 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 ruby object (not an
- * IO-like object that responds to read/write.
+ * Creates a new SSL socket from _io_ which must be a real IO object (not an
+ * IO-like object that responds to read/write).
  *
- * If +ctx+ is provided the SSL Sockets initial params will be taken from
+ * If _ctx_ is provided the SSL Sockets initial params will be taken from
  * the context.
  *
  * The OpenSSL::Buffering module provides additional IO methods.
@@ -1020,21 +1554,36 @@ ossl_ssl_s_alloc(VALUE klass)
 static VALUE
 ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
 {
-    VALUE io, ctx;
+    VALUE io, v_ctx, verify_cb;
+    SSL *ssl;
+    SSL_CTX *ctx;
 
-    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);
+    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);
 
-    rb_iv_set(self, "@hostname", Qnil);
+    GetSSLCTX(v_ctx, ctx);
+    rb_ivar_set(self, id_i_context, v_ctx);
+    ossl_sslctx_setup(v_ctx);
 
-    rb_call_super(0, 0);
+    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;
+
+    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_call_super(0, NULL);
 
     return self;
 }
@@ -1042,45 +1591,20 @@ ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_ssl_setup(VALUE self)
 {
-    VALUE io, v_ctx, cb;
-    SSL_CTX *ctx;
+    VALUE io;
     SSL *ssl;
     rb_io_t *fptr;
 
-    Data_Get_Struct(self, SSL, ssl);
-    if(!ssl){
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-	VALUE hostname = rb_iv_get(self, "@hostname");
-#endif
-
-        v_ctx = ossl_ssl_get_ctx(self);
-        Data_Get_Struct(v_ctx, SSL_CTX, ctx);
-
-        ssl = SSL_new(ctx);
-        if (!ssl) {
-            ossl_raise(eSSLError, "SSL_new:");
-        }
-        DATA_PTR(self) = ssl;
+    GetSSL(self, ssl);
+    if (ssl_started(ssl))
+	return Qtrue;
 
-#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);
-    }
+    io = rb_attr_get(self, id_i_io);
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+    rb_io_check_writable(fptr);
+    if (!SSL_set_fd(ssl, TO_SOCKET(fptr->fd)))
+	ossl_raise(eSSLError, "SSL_set_fd");
 
     return Qtrue;
 }
@@ -1094,57 +1618,87 @@ ossl_ssl_setup(VALUE self)
 static void
 write_would_block(int nonblock)
 {
-    if (nonblock) {
-        VALUE exc = ossl_exc_new(eSSLError, "write would block");
-        rb_extend_object(exc, rb_mWaitWritable);
-        rb_exc_raise(exc);
-    }
+    if (nonblock)
+	ossl_raise(eSSLErrorWaitWritable, "write would block");
 }
 
 static void
 read_would_block(int nonblock)
 {
-    if (nonblock) {
-        VALUE exc = ossl_exc_new(eSSLError, "read would block");
-        rb_extend_object(exc, rb_mWaitReadable);
-        rb_exc_raise(exc);
-    }
+    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;
 }
 
 static VALUE
-ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, int nonblock)
+ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, VALUE opts)
 {
     SSL *ssl;
     rb_io_t *fptr;
     int ret, ret2;
     VALUE cb_state;
+    int nonblock = opts != Qfalse;
+#if defined(SSL_R_CERTIFICATE_VERIFY_FAILED)
+    unsigned long err;
+#endif
 
     rb_ivar_set(self, ID_callback_state, Qnil);
 
-    Data_Get_Struct(self, SSL, ssl);
-    GetOpenFile(ossl_ssl_get_io(self), fptr);
+    GetSSL(self, ssl);
+
+    GetOpenFile(rb_attr_get(self, id_i_io), fptr);
     for(;;){
 	ret = func(ssl);
 
-        cb_state = rb_ivar_get(self, ID_callback_state);
-        if (!NIL_P(cb_state))
-            rb_jump_tag(NUM2INT(cb_state));
+	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));
+	}
 
 	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));
+            rb_io_wait_writable(fptr->fd);
             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));
+            rb_io_wait_readable(fptr->fd);
             continue;
 	case SSL_ERROR_SYSCALL:
 	    if (errno) rb_sys_fail(funcname);
 	    ossl_raise(eSSLError, "%s SYSCALL returned=%d errno=%d state=%s", funcname, ret2, errno, SSL_state_string_long(ssl));
+#if defined(SSL_R_CERTIFICATE_VERIFY_FAILED)
+	case SSL_ERROR_SSL:
+	    err = ERR_peek_last_error();
+	    if (ERR_GET_LIB(err) == ERR_LIB_SSL &&
+		ERR_GET_REASON(err) == SSL_R_CERTIFICATE_VERIFY_FAILED) {
+		const char *err_msg = ERR_reason_error_string(err),
+		      *verify_msg = X509_verify_cert_error_string(SSL_get_verify_result(ssl));
+		if (!err_msg)
+		    err_msg = "(null)";
+		if (!verify_msg)
+		    verify_msg = "(null)";
+		ossl_clear_error(); /* let ossl_raise() not append message */
+		ossl_raise(eSSLError, "%s returned=%d errno=%d state=%s: %s (%s)",
+			   funcname, ret2, errno, SSL_state_string_long(ssl),
+			   err_msg, verify_msg);
+	    }
+#endif
 	default:
 	    ossl_raise(eSSLError, "%s returned=%d errno=%d state=%s", funcname, ret2, errno, SSL_state_string_long(ssl));
 	}
@@ -1164,12 +1718,13 @@ static VALUE
 ossl_ssl_connect(VALUE self)
 {
     ossl_ssl_setup(self);
-    return ossl_start_ssl(self, SSL_connect, "SSL_connect", 0);
+
+    return ossl_start_ssl(self, SSL_connect, "SSL_connect", Qfalse);
 }
 
 /*
  * call-seq:
- *    ssl.connect_nonblock => self
+ *    ssl.connect_nonblock([options]) => self
  *
  * Initiates the SSL/TLS handshake as a client in non-blocking manner.
  *
@@ -1184,12 +1739,20 @@ ossl_ssl_connect(VALUE self)
  *     retry
  *   end
  *
+ * By specifying a keyword argument _exception_ to +false+, you can 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(VALUE self)
+ossl_ssl_connect_nonblock(int argc, VALUE *argv, VALUE self)
 {
+    VALUE opts;
+    rb_scan_args(argc, argv, "0:", &opts);
+
     ossl_ssl_setup(self);
-    return ossl_start_ssl(self, SSL_connect, "SSL_connect", 1);
+
+    return ossl_start_ssl(self, SSL_connect, "SSL_connect", opts);
 }
 
 /*
@@ -1203,12 +1766,13 @@ static VALUE
 ossl_ssl_accept(VALUE self)
 {
     ossl_ssl_setup(self);
-    return ossl_start_ssl(self, SSL_accept, "SSL_accept", 0);
+
+    return ossl_start_ssl(self, SSL_accept, "SSL_accept", Qfalse);
 }
 
 /*
  * call-seq:
- *    ssl.accept_nonblock => self
+ *    ssl.accept_nonblock([options]) => self
  *
  * Initiates the SSL/TLS handshake as a server in non-blocking manner.
  *
@@ -1223,12 +1787,20 @@ ossl_ssl_accept(VALUE self)
  *     retry
  *   end
  *
+ * By specifying a keyword argument _exception_ to +false+, you can 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(VALUE self)
+ossl_ssl_accept_nonblock(int argc, VALUE *argv, VALUE self)
 {
+    VALUE opts;
+
+    rb_scan_args(argc, argv, "0:", &opts);
     ossl_ssl_setup(self);
-    return ossl_start_ssl(self, SSL_accept, "SSL_accept", 1);
+
+    return ossl_start_ssl(self, SSL_accept, "SSL_accept", opts);
 }
 
 static VALUE
@@ -1238,65 +1810,98 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
     int ilen, nread = 0;
     VALUE len, str;
     rb_io_t *fptr;
+    VALUE io, opts = Qnil;
 
-    rb_scan_args(argc, argv, "11", &len, &str);
-    ilen = NUM2INT(len);
-    if(NIL_P(str)) str = rb_str_new(0, ilen);
-    else{
-        StringValue(str);
-        rb_str_modify(str);
-        rb_str_resize(str, ilen);
+    if (nonblock) {
+	rb_scan_args(argc, argv, "11:", &len, &str, &opts);
+    } else {
+	rb_scan_args(argc, argv, "11", &len, &str);
     }
-    if(ilen == 0) return str;
 
-    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));
+    ilen = NUM2INT(len);
+    if (NIL_P(str))
+	str = rb_str_new(0, ilen);
+    else {
+	StringValue(str);
+	if (RSTRING_LEN(str) >= ilen)
+	    rb_str_modify(str);
+	else
+	    rb_str_modify_expand(str, ilen - RSTRING_LEN(str));
+    }
+    rb_str_set_len(str, 0);
+    if (ilen == 0)
+	return str;
+
+    GetSSL(self, ssl);
+    io = rb_attr_get(self, id_i_io);
+    GetOpenFile(io, fptr);
+    if (ssl_started(ssl)) {
 	for (;;){
-	    nread = SSL_read(ssl, RSTRING_PTR(str), RSTRING_LENINT(str));
+	    nread = SSL_read(ssl, RSTRING_PTR(str), ilen);
 	    switch(ssl_get_error(ssl, nread)){
 	    case SSL_ERROR_NONE:
 		goto end;
 	    case SSL_ERROR_ZERO_RETURN:
+		if (no_exception_p(opts)) { return Qnil; }
 		rb_eof_error();
 	    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));
+                rb_io_wait_writable(fptr->fd);
                 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));
+                rb_io_wait_readable(fptr->fd);
 		continue;
 	    case SSL_ERROR_SYSCALL:
-		if(ERR_peek_error() == 0 && nread == 0) rb_eof_error();
-		rb_sys_fail(0);
+		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();
+		    }
+		}
+                /* fall through */
 	    default:
-		ossl_raise(eSSLError, "SSL_read:");
+		ossl_raise(eSSLError, "SSL_read");
 	    }
         }
     }
     else {
-        ID meth = nonblock ? rb_intern("read_nonblock") : rb_intern("sysread");
-        rb_warning("SSL session is not started yet.");
-        return rb_funcall(ossl_ssl_get_io(self), meth, 2, len, str);
+	ID meth = nonblock ? rb_intern("read_nonblock") : rb_intern("sysread");
+
+	rb_warning("SSL session is not started yet.");
+	if (nonblock) {
+            VALUE argv[3];
+            argv[0] = len;
+            argv[1] = str;
+            argv[2] = opts;
+            return rb_funcallv_kw(io, meth, 3, argv, RB_PASS_KEYWORDS);
+        }
+	else
+	    return rb_funcall(io, meth, 2, len, str);
     }
 
   end:
     rb_str_set_len(str, nread);
-    OBJ_TAINT(str);
-
     return str;
 }
 
-
 /*
  * call-seq:
  *    ssl.sysread(length) => string
  *    ssl.sysread(length, buffer) => buffer
  *
- * Reads +length+ bytes from the SSL connection.  If a pre-allocated +buffer+
+ * Reads _length_ bytes from the SSL connection.  If a pre-allocated _buffer_
  * is provided the data will be written into it.
  */
 static VALUE
@@ -1309,11 +1914,13 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    ssl.sysread_nonblock(length) => string
  *    ssl.sysread_nonblock(length, buffer) => buffer
+ *    ssl.sysread_nonblock(length[, buffer [, opts]) => buffer
  *
  * A non-blocking version of #sysread.  Raises an SSLError if reading would
- * block.
+ * block.  If "exception: false" is passed, this method returns a symbol of
+ * :wait_readable, :wait_writable, or nil, rather than raising an exception.
  *
- * Reads +length+ bytes from the SSL connection.  If a pre-allocated +buffer+
+ * Reads _length_ bytes from the SSL connection.  If a pre-allocated _buffer_
  * is provided the data will be written into it.
  */
 static VALUE
@@ -1323,41 +1930,60 @@ ossl_ssl_read_nonblock(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-ossl_ssl_write_internal(VALUE self, VALUE str, int nonblock)
+ossl_ssl_write_internal(VALUE self, VALUE str, VALUE opts)
 {
     SSL *ssl;
     int nwrite = 0;
     rb_io_t *fptr;
+    int nonblock = opts != Qfalse;
+    VALUE io;
 
     StringValue(str);
-    Data_Get_Struct(self, SSL, ssl);
-    GetOpenFile(ossl_ssl_get_io(self), fptr);
-
-    if (ssl) {
+    GetSSL(self, ssl);
+    io = rb_attr_get(self, id_i_io);
+    GetOpenFile(io, fptr);
+    if (ssl_started(ssl)) {
 	for (;;){
-	    nwrite = SSL_write(ssl, RSTRING_PTR(str), RSTRING_LENINT(str));
+	    int num = RSTRING_LENINT(str);
+
+	    /* SSL_write(3ssl) manpage states num == 0 is undefined */
+	    if (num == 0)
+		goto end;
+
+	    nwrite = SSL_write(ssl, RSTRING_PTR(str), num);
 	    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; }
                 write_would_block(nonblock);
-                rb_io_wait_writable(FPTR_TO_FD(fptr));
+                rb_io_wait_writable(fptr->fd);
                 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));
+                rb_io_wait_readable(fptr->fd);
                 continue;
 	    case SSL_ERROR_SYSCALL:
 		if (errno) rb_sys_fail(0);
 	    default:
-		ossl_raise(eSSLError, "SSL_write:");
+		ossl_raise(eSSLError, "SSL_write");
 	    }
         }
     }
     else {
-        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);
+	ID meth = nonblock ?
+	    rb_intern("write_nonblock") : rb_intern("syswrite");
+
+	rb_warning("SSL session is not started yet.");
+	if (nonblock) {
+            VALUE argv[2];
+            argv[0] = str;
+            argv[1] = opts;
+            return rb_funcallv_kw(io, meth, 2, argv, RB_PASS_KEYWORDS);
+        }
+	else
+	    return rb_funcall(io, meth, 1, str);
     }
 
   end:
@@ -1368,43 +1994,60 @@ ossl_ssl_write_internal(VALUE self, VALUE str, int nonblock)
  * call-seq:
  *    ssl.syswrite(string) => Integer
  *
- * Writes +string+ to the SSL connection.
+ * Writes _string_ to the SSL connection.
  */
 static VALUE
 ossl_ssl_write(VALUE self, VALUE str)
 {
-    return ossl_ssl_write_internal(self, str, 0);
+    return ossl_ssl_write_internal(self, str, Qfalse);
 }
 
 /*
  * call-seq:
  *    ssl.syswrite_nonblock(string) => Integer
  *
- * Writes +string+ to the SSL connection in a non-blocking manner.  Raises an
+ * Writes _string_ to the SSL connection in a non-blocking manner.  Raises an
  * SSLError if writing would block.
  */
 static VALUE
-ossl_ssl_write_nonblock(VALUE self, VALUE str)
+ossl_ssl_write_nonblock(int argc, VALUE *argv, VALUE self)
 {
-    return ossl_ssl_write_internal(self, str, 1);
+    VALUE str, opts;
+
+    rb_scan_args(argc, argv, "1:", &str, &opts);
+
+    return ossl_ssl_write_internal(self, str, opts);
 }
 
 /*
  * call-seq:
- *    ssl.sysclose => nil
+ *    ssl.stop => nil
  *
- * Shuts down the SSL connection and prepares it for another connection.
+ * Sends "close notify" to the peer and tries to shut down the SSL connection
+ * gracefully.
  */
 static VALUE
-ossl_ssl_close(VALUE self)
+ossl_ssl_stop(VALUE self)
 {
     SSL *ssl;
+    int ret;
 
-    Data_Get_Struct(self, SSL, ssl);
-    ossl_ssl_shutdown(ssl);
-    if (RTEST(ossl_ssl_get_sync_close(self)))
-	rb_funcall(ossl_ssl_get_io(self), rb_intern("close"), 0);
+    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;
 
+    /*
+     * 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;
 }
 
@@ -1420,11 +2063,7 @@ ossl_ssl_get_cert(VALUE self)
     SSL *ssl;
     X509 *cert = NULL;
 
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
+    GetSSL(self, ssl);
 
     /*
      * Is this OpenSSL bug? Should add a ref?
@@ -1451,12 +2090,7 @@ ossl_ssl_get_peer_cert(VALUE self)
     X509 *cert = NULL;
     VALUE obj;
 
-    Data_Get_Struct(self, SSL, ssl);
-
-    if (!ssl){
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
+    GetSSL(self, ssl);
 
     cert = SSL_get_peer_certificate(ssl); /* Adds a ref => Safe to FREE. */
 
@@ -1484,11 +2118,8 @@ ossl_ssl_get_peer_cert_chain(VALUE self)
     VALUE ary;
     int i, num;
 
-    Data_Get_Struct(self, SSL, ssl);
-    if(!ssl){
-	rb_warning("SSL session is not started yet.");
-	return Qnil;
-    }
+    GetSSL(self, ssl);
+
     chain = SSL_get_peer_cert_chain(ssl);
     if(!chain) return Qnil;
     num = sk_X509_num(chain);
@@ -1502,32 +2133,46 @@ ossl_ssl_get_peer_cert_chain(VALUE self)
 }
 
 /*
+* call-seq:
+*    ssl.ssl_version => String
+*
+* Returns a String representing the SSL/TLS version that was negotiated
+* for the connection, for example "TLSv1.2".
+*/
+static VALUE
+ossl_ssl_get_version(VALUE self)
+{
+    SSL *ssl;
+
+    GetSSL(self, ssl);
+
+    return rb_str_new2(SSL_get_version(ssl));
+}
+
+/*
  * call-seq:
- *    ssl.cipher => [name, version, bits, alg_bits]
+ *    ssl.cipher -> nil or [name, version, bits, alg_bits]
  *
- * The cipher being used for the current connection
+ * Returns the cipher suite actually used in the current session, or nil if
+ * no session has been established.
  */
 static VALUE
 ossl_ssl_get_cipher(VALUE self)
 {
     SSL *ssl;
-    SSL_CIPHER *cipher;
-
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
-    cipher = (SSL_CIPHER *)SSL_get_current_cipher(ssl);
+    const SSL_CIPHER *cipher;
 
-    return ossl_ssl_cipher_to_ary(cipher);
+    GetSSL(self, ssl);
+    cipher = SSL_get_current_cipher(ssl);
+    return cipher ? ossl_ssl_cipher_to_ary(cipher) : Qnil;
 }
 
 /*
  * call-seq:
  *    ssl.state => string
  *
- * A description of the current connection state.
+ * A description of the current connection state. This is for diagnostic
+ * purposes only.
  */
 static VALUE
 ossl_ssl_get_state(VALUE self)
@@ -1535,11 +2180,8 @@ ossl_ssl_get_state(VALUE self)
     SSL *ssl;
     VALUE ret;
 
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
+    GetSSL(self, ssl);
+
     ret = rb_str_new2(SSL_state_string(ssl));
     if (ruby_verbose) {
         rb_str_cat2(ret, ": ");
@@ -1552,18 +2194,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;
 
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
+    GetSSL(self, ssl);
 
     return INT2NUM(SSL_pending(ssl));
 }
@@ -1572,24 +2210,16 @@ ossl_ssl_pending(VALUE self)
  * call-seq:
  *    ssl.session_reused? -> true | false
  *
- * Returns true if a reused session was negotiated during the handshake.
+ * Returns +true+ if a reused session was negotiated during the handshake.
  */
 static VALUE
 ossl_ssl_session_reused(VALUE self)
 {
     SSL *ssl;
 
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
+    GetSSL(self, ssl);
 
-    switch(SSL_session_reused(ssl)) {
-    case 1:	return Qtrue;
-    case 0:	return Qfalse;
-    default:	ossl_raise(eSSLError, "SSL_session_reused");
-    }
+    return SSL_session_reused(ssl) ? Qtrue : Qfalse;
 }
 
 /*
@@ -1604,16 +2234,8 @@ ossl_ssl_set_session(VALUE self, VALUE arg1)
     SSL *ssl;
     SSL_SESSION *sess;
 
-/* why is ossl_ssl_setup delayed? */
-    ossl_ssl_setup(self);
-
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
-
-    SafeGetSSLSession(arg1, sess);
+    GetSSL(self, ssl);
+    GetSSLSession(arg1, sess);
 
     if (SSL_set_session(ssl, sess) != 1)
         ossl_raise(eSSLError, "SSL_set_session");
@@ -1623,6 +2245,33 @@ ossl_ssl_set_session(VALUE self, VALUE arg1)
 
 /*
  * 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;
+}
+
+/*
+ * call-seq:
  *    ssl.verify_result => Integer
  *
  * Returns the result of the peer certificates verification.  See verify(1)
@@ -1635,13 +2284,9 @@ ossl_ssl_get_verify_result(VALUE self)
 {
     SSL *ssl;
 
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-        rb_warning("SSL session is not started yet.");
-        return Qnil;
-    }
+    GetSSL(self, ssl);
 
-    return INT2FIX(SSL_get_verify_result(ssl));
+    return INT2NUM(SSL_get_verify_result(ssl));
 }
 
 /*
@@ -1661,38 +2306,141 @@ ossl_ssl_get_client_ca_list(VALUE self)
     SSL *ssl;
     STACK_OF(X509_NAME) *ca;
 
-    Data_Get_Struct(self, SSL, ssl);
-    if (!ssl) {
-	rb_warning("SSL session is not started yet.");
-	return Qnil;
-    }
+    GetSSL(self, ssl);
 
     ca = SSL_get_client_CA_list(ssl);
     return ossl_x509name_sk2ary(ca);
 }
 
-void
-Init_ossl_ssl()
+# ifndef OPENSSL_NO_NEXTPROTONEG
+/*
+ * call-seq:
+ *    ssl.npn_protocol => String | nil
+ *
+ * Returns the protocol string that was finally selected by the client
+ * during the handshake.
+ */
+static VALUE
+ossl_ssl_npn_protocol(VALUE self)
 {
-    int i;
-    VALUE ary;
+    SSL *ssl;
+    const unsigned char *out;
+    unsigned int outlen;
 
+    GetSSL(self, ssl);
+
+    SSL_get0_next_proto_negotiated(ssl, &out, &outlen);
+    if (!outlen)
+	return Qnil;
+    else
+	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)
+{
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    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");
 #endif
 
-    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);
+    id_call = rb_intern("call");
+    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);
+    if (ossl_ssl_ex_vcb_idx < 0)
+	ossl_raise(rb_eRuntimeError, "SSL_get_ex_new_index");
+    ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0, (void *)"ossl_ssl_ex_ptr_idx", 0, 0, 0);
+    if (ossl_ssl_ex_ptr_idx < 0)
+	ossl_raise(rb_eRuntimeError, "SSL_get_ex_new_index");
+    ossl_sslctx_ex_ptr_idx = SSL_CTX_get_ex_new_index(0, (void *)"ossl_sslctx_ex_ptr_idx", 0, 0, 0);
+    if (ossl_sslctx_ex_ptr_idx < 0)
+	ossl_raise(rb_eRuntimeError, "SSL_CTX_get_ex_new_index");
+#if !defined(HAVE_X509_STORE_UP_REF)
+    ossl_sslctx_ex_store_p = SSL_CTX_get_ex_new_index(0, (void *)"ossl_sslctx_ex_store_p", 0, 0, 0);
+    if (ossl_sslctx_ex_store_p < 0)
+	ossl_raise(rb_eRuntimeError, "SSL_CTX_get_ex_new_index");
+#endif
 
+    /* Document-module: OpenSSL::SSL
+     *
+     * Use SSLContext to set up the parameters for a TLS (former SSL)
+     * connection. Both client and server TLS connections are supported,
+     * SSLSocket and SSLServer may be used in conjunction with an instance
+     * 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.
+     */
     eSSLError = rb_define_class_under(mSSL, "SSLError", eOSSLError);
+    eSSLErrorWaitReadable = rb_define_class_under(mSSL, "SSLErrorWaitReadable", eSSLError);
+    rb_include_module(eSSLErrorWaitReadable, rb_mWaitReadable);
+    eSSLErrorWaitWritable = rb_define_class_under(mSSL, "SSLErrorWaitWritable", eSSLError);
+    rb_include_module(eSSLErrorWaitWritable, rb_mWaitWritable);
 
     Init_ossl_ssl_session();
 
@@ -1704,22 +2452,24 @@ Init_ossl_ssl()
      *
      * 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
+     *
+     * The _cert_, _key_, and _extra_chain_cert_ attributes are deprecated.
+     * It is recommended to use #add_certificate instead.
      */
     rb_attr(cSSLContext, rb_intern("cert"), 1, 1, Qfalse);
 
     /*
      * Context private key
+     *
+     * The _cert_, _key_, and _extra_chain_cert_ attributes are deprecated.
+     * It is recommended to use #add_certificate instead.
      */
     rb_attr(cSSLContext, rb_intern("key"), 1, 1, Qfalse);
 
@@ -1741,7 +2491,7 @@ Init_ossl_ssl()
     rb_attr(cSSLContext, rb_intern("ca_path"), 1, 1, Qfalse);
 
     /*
-     * Maximum session lifetime.
+     * Maximum session lifetime in seconds.
      */
     rb_attr(cSSLContext, rb_intern("timeout"), 1, 1, Qfalse);
 
@@ -1750,6 +2500,11 @@ Init_ossl_ssl()
      *
      * 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);
 
@@ -1762,28 +2517,35 @@ Init_ossl_ssl()
      * A callback for additional certificate verification.  The callback is
      * invoked for each certificate in the chain.
      *
-     * The callback is invoked with two values.  +preverify_ok+ indicates
-     * indicates if the verification was passed (true) or not (false).
-     * +store_context+ is an OpenSSL::X509::StoreContext containing the
+     * The callback is invoked with two values.  _preverify_ok_ indicates
+     * indicates if the verification was passed (+true+) or not (+false+).
+     * _store_context_ is an OpenSSL::X509::StoreContext containing the
      * context used for certificate verification.
      *
-     * If the callback returns false verification is stopped.
+     * If the callback returns +false+, the chain verification is immediately
+     * stopped and a bad_certificate alert is then sent.
      */
     rb_attr(cSSLContext, rb_intern("verify_callback"), 1, 1, Qfalse);
 
     /*
-     * Sets various OpenSSL options.
+     * 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=.
      */
-    rb_attr(cSSLContext, rb_intern("options"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern("verify_hostname"), 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);
 
     /*
      * An Array of extra X509 certificates to be added to the certificate
      * chain.
+     *
+     * The _cert_, _key_, and _extra_chain_cert_ attributes are deprecated.
+     * It is recommended to use #add_certificate instead.
      */
     rb_attr(cSSLContext, rb_intern("extra_chain_cert"), 1, 1, Qfalse);
 
@@ -1797,21 +2559,23 @@ Init_ossl_ssl()
      */
     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 DH parameters are required.
+     * A callback invoked when ECDH 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.
+     * The callback is deprecated. This does not work with recent versions of
+     * OpenSSL. Use OpenSSL::SSL::SSLContext#ecdh_curves= instead.
      */
-    rb_attr(cSSLContext, rb_intern("tmp_dh_callback"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern("tmp_ecdh_callback"), 1, 1, Qfalse);
+#endif
 
     /*
      * Sets the context in which a session can be reused.  This allows
-     * sessions for multiple applications to be distinguished, for exapmle, by
+     * sessions for multiple applications to be distinguished, for example, by
      * name.
      */
     rb_attr(cSSLContext, rb_intern("session_id_context"), 1, 1, Qfalse);
@@ -1826,9 +2590,9 @@ Init_ossl_ssl()
     rb_attr(cSSLContext, rb_intern("session_get_cb"), 1, 1, Qfalse);
 
     /*
-     * A callback invoked when a new session was negotiatied.
+     * A callback invoked when a new session was negotiated.
      *
-     * The callback is invoked with an SSLSocket.  If false is returned the
+     * The callback is invoked with an SSLSocket.  If +false+ is returned the
      * session will be removed from the internal cache.
      */
     rb_attr(cSSLContext, rb_intern("session_new_cb"), 1, 1, Qfalse);
@@ -1837,57 +2601,145 @@ Init_ossl_ssl()
      * A callback invoked when a session is removed from the internal cache.
      *
      * The callback is invoked with an SSLContext and a Session.
+     *
+     * IMPORTANT NOTE: It is currently not possible to use this safely in a
+     * multi-threaded application. The callback is called inside a global lock
+     * and it can randomly cause deadlock on Ruby thread switching.
      */
     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);
+
+    /*
+     * A callback invoked whenever a new handshake is initiated. May be used
+     * to disable renegotiation entirely.
+     *
+     * The callback is invoked with the active SSLSocket. The callback's
+     * return value is irrelevant, normal return indicates "approval" of the
+     * renegotiation and will continue the process. To forbid renegotiation
+     * and to cancel the process, an Error may be raised within the callback.
+     *
+     * === Disable client renegotiation
+     *
+     * When running a server, it is often desirable to disable client
+     * renegotiation entirely. You may use a callback as follows to implement
+     * this feature:
+     *
+     *   num_handshakes = 0
+     *   ctx.renegotiation_cb = lambda do |ssl|
+     *     num_handshakes += 1
+     *     raise RuntimeError.new("Client renegotiation disabled") if num_handshakes > 1
+     *   end
+     */
+    rb_attr(cSSLContext, rb_intern("renegotiation_cb"), 1, 1, Qfalse);
+#ifndef OPENSSL_NO_NEXTPROTONEG
+    /*
+     * An Enumerable of Strings. Each String represents a protocol to be
+     * advertised as the list of supported protocols for Next Protocol
+     * Negotiation. Supported in OpenSSL 1.0.1 and higher. Has no effect
+     * on the client side. If not set explicitly, the NPN extension will
+     * not be sent by the server in the handshake.
+     *
+     * === Example
+     *
+     *   ctx.npn_protocols = ["http/1.1", "spdy/2"]
+     */
+    rb_attr(cSSLContext, rb_intern("npn_protocols"), 1, 1, Qfalse);
+    /*
+     * A callback invoked on the client side when the client needs to select
+     * a protocol from the list sent by the server. Supported in OpenSSL 1.0.1
+     * and higher. The client MUST select a protocol of those advertised by
+     * the server. 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 NPN extension on the client - any protocols
+     * advertised by the server will be ignored.
+     *
+     * === Example
+     *
+     *   ctx.npn_select_cb = lambda do |protocols|
+     *     # 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
     /*
-     * A callback invoked at connect time to distinguish between multiple
-     * server names.
+     * 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
      *
-     * The callback is invoked with an SSLSocket and a server name.  The
-     * callback must return an SSLContext for the server name or nil.
+     *   ctx.alpn_protocols = ["http/1.1", "spdy/2", "h2"]
      */
-    rb_attr(cSSLContext, rb_intern("servername_cb"), 1, 1, Qfalse);
+    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_private_method(cSSLContext, "set_minmax_proto_version",
+			     ossl_sslctx_set_minmax_proto_version, 2);
     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);
+#ifdef SSL_MODE_SEND_FALLBACK_SCSV
+    rb_define_method(cSSLContext, "enable_fallback_scsv", ossl_sslctx_enable_fallback_scsv, 0);
+#endif
+    rb_define_method(cSSLContext, "add_certificate", ossl_sslctx_add_certificate, -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", LONG2FIX(SSL_SESS_CACHE_OFF));
+    rb_define_const(cSSLContext, "SESSION_CACHE_OFF", LONG2NUM(SSL_SESS_CACHE_OFF));
 
     /*
      * Client sessions are added to the session cache
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_CLIENT", LONG2FIX(SSL_SESS_CACHE_CLIENT)); /* doesn't actually do anything in 0.9.8e */
+    rb_define_const(cSSLContext, "SESSION_CACHE_CLIENT", LONG2NUM(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", LONG2FIX(SSL_SESS_CACHE_SERVER));
+    rb_define_const(cSSLContext, "SESSION_CACHE_SERVER", LONG2NUM(SSL_SESS_CACHE_SERVER));
 
     /*
      * Both client and server sessions are added to the session cache
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_BOTH", LONG2FIX(SSL_SESS_CACHE_BOTH)); /* no different than CACHE_SERVER in 0.9.8e */
+    rb_define_const(cSSLContext, "SESSION_CACHE_BOTH", LONG2NUM(SSL_SESS_CACHE_BOTH)); /* no different than CACHE_SERVER in 0.9.8e */
 
     /*
-     * Normally the sesison cache is checked for expired sessions every 255
+     * Normally the session cache is checked for expired sessions every 255
      * connections.  Since this may lead to a delay that cannot be controlled,
      * the automatic flushing may be disabled and #flush_sessions can be
      * called explicitly.
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_AUTO_CLEAR", LONG2FIX(SSL_SESS_CACHE_NO_AUTO_CLEAR));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_AUTO_CLEAR", LONG2NUM(SSL_SESS_CACHE_NO_AUTO_CLEAR));
 
     /*
      * Always perform external lookups of sessions even if they are in the
@@ -1895,18 +2747,18 @@ Init_ossl_ssl()
      *
      * This flag has no effect on clients
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_LOOKUP", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL_LOOKUP));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_LOOKUP", LONG2NUM(SSL_SESS_CACHE_NO_INTERNAL_LOOKUP));
 
     /*
      * Never automatically store sessions in the internal store.
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_STORE", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL_STORE));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_STORE", LONG2NUM(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", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL", LONG2NUM(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);
@@ -1916,92 +2768,194 @@ Init_ossl_ssl()
     rb_define_method(cSSLContext, "session_cache_size=",     ossl_sslctx_set_session_cache_size, 1);
     rb_define_method(cSSLContext, "session_cache_stats",     ossl_sslctx_get_session_cache_stats, 0);
     rb_define_method(cSSLContext, "flush_sessions",     ossl_sslctx_flush_sessions, -1);
-
-    ary = rb_ary_new2(numberof(ossl_ssl_method_tab));
-    for (i = 0; i < numberof(ossl_ssl_method_tab); i++) {
-        rb_ary_push(ary, ID2SYM(rb_intern(ossl_ssl_method_tab[i].name)));
-    }
-    rb_obj_freeze(ary);
-    /* The list of available SSL/TLS methods */
-    rb_define_const(cSSLContext, "METHODS", ary);
+    rb_define_method(cSSLContext, "options",     ossl_sslctx_get_options, 0);
+    rb_define_method(cSSLContext, "options=",     ossl_sslctx_set_options, 1);
 
     /*
      * 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);
+#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, 0);
+    rb_define_method(cSSLSocket, "connect_nonblock",    ossl_ssl_connect_nonblock, -1);
     rb_define_method(cSSLSocket, "accept",     ossl_ssl_accept, 0);
-    rb_define_method(cSSLSocket, "accept_nonblock",     ossl_ssl_accept_nonblock, 0);
+    rb_define_method(cSSLSocket, "accept_nonblock", ossl_ssl_accept_nonblock, -1);
     rb_define_method(cSSLSocket, "sysread",    ossl_ssl_read, -1);
     rb_define_private_method(cSSLSocket, "sysread_nonblock",    ossl_ssl_read_nonblock, -1);
     rb_define_method(cSSLSocket, "syswrite",   ossl_ssl_write, 1);
-    rb_define_private_method(cSSLSocket, "syswrite_nonblock",    ossl_ssl_write_nonblock, 1);
-    rb_define_method(cSSLSocket, "sysclose",   ossl_ssl_close, 0);
+    rb_define_private_method(cSSLSocket, "syswrite_nonblock",    ossl_ssl_write_nonblock, -1);
+    rb_define_private_method(cSSLSocket, "stop",   ossl_ssl_stop, 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);
+    rb_define_method(cSSLSocket, "ssl_version",    ossl_ssl_get_version, 0);
     rb_define_method(cSSLSocket, "cipher",     ossl_ssl_get_cipher, 0);
     rb_define_method(cSSLSocket, "state",      ossl_ssl_get_state, 0);
     rb_define_method(cSSLSocket, "pending",    ossl_ssl_pending, 0);
     rb_define_method(cSSLSocket, "session_reused?",    ossl_ssl_session_reused, 0);
+    /* implementation of OpenSSL::SSL::SSLSocket#session is in lib/openssl/ssl.rb */
     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);
+    /* #hostname is defined in lib/openssl/ssl.rb */
+    rb_define_method(cSSLSocket, "hostname=", ossl_ssl_set_hostname, 1);
+# 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
+# ifndef OPENSSL_NO_NEXTPROTONEG
+    rb_define_method(cSSLSocket, "npn_protocol", ossl_ssl_npn_protocol, 0);
+# endif
+#endif
 
-#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, INT2NUM(SSL_##x))
-
-    ossl_ssl_def_const(VERIFY_NONE);
-    ossl_ssl_def_const(VERIFY_PEER);
-    ossl_ssl_def_const(VERIFY_FAIL_IF_NO_PEER_CERT);
-    ossl_ssl_def_const(VERIFY_CLIENT_ONCE);
-    /* Not introduce constants included in OP_ALL such as...
-     * ossl_ssl_def_const(OP_MICROSOFT_SESS_ID_BUG);
-     * ossl_ssl_def_const(OP_NETSCAPE_CHALLENGE_BUG);
-     * ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
-     * ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG);
-     * ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER);
-     * ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING);
-     * ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG);
-     * ossl_ssl_def_const(OP_TLS_D5_BUG);
-     * ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG);
-     * ossl_ssl_def_const(OP_DONT_INSERT_EMPTY_FRAGMENTS);
-     */
-    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);
+    rb_define_const(mSSL, "VERIFY_NONE", INT2NUM(SSL_VERIFY_NONE));
+    rb_define_const(mSSL, "VERIFY_PEER", INT2NUM(SSL_VERIFY_PEER));
+    rb_define_const(mSSL, "VERIFY_FAIL_IF_NO_PEER_CERT", INT2NUM(SSL_VERIFY_FAIL_IF_NO_PEER_CERT));
+    rb_define_const(mSSL, "VERIFY_CLIENT_ONCE", INT2NUM(SSL_VERIFY_CLIENT_ONCE));
+
+    rb_define_const(mSSL, "OP_ALL", ULONG2NUM(SSL_OP_ALL));
+    rb_define_const(mSSL, "OP_LEGACY_SERVER_CONNECT", ULONG2NUM(SSL_OP_LEGACY_SERVER_CONNECT));
+#ifdef SSL_OP_TLSEXT_PADDING /* OpenSSL 1.0.1h and OpenSSL 1.0.2 */
+    rb_define_const(mSSL, "OP_TLSEXT_PADDING", ULONG2NUM(SSL_OP_TLSEXT_PADDING));
 #endif
-#if defined(SSL_OP_SINGLE_ECDH_USE)
-    ossl_ssl_def_const(OP_SINGLE_ECDH_USE);
+#ifdef SSL_OP_SAFARI_ECDHE_ECDSA_BUG /* OpenSSL 1.0.1f and OpenSSL 1.0.2 */
+    rb_define_const(mSSL, "OP_SAFARI_ECDHE_ECDSA_BUG", ULONG2NUM(SSL_OP_SAFARI_ECDHE_ECDSA_BUG));
 #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);
+#ifdef SSL_OP_ALLOW_NO_DHE_KEX /* OpenSSL 1.1.1 */
+    rb_define_const(mSSL, "OP_ALLOW_NO_DHE_KEX", ULONG2NUM(SSL_OP_ALLOW_NO_DHE_KEX));
 #endif
-    ossl_ssl_def_const(OP_TLS_ROLLBACK_BUG);
-    ossl_ssl_def_const(OP_NO_SSLv2);
-    ossl_ssl_def_const(OP_NO_SSLv3);
-    ossl_ssl_def_const(OP_NO_TLSv1);
-#if defined(SSL_OP_NO_TICKET)
-    ossl_ssl_def_const(OP_NO_TICKET);
+    rb_define_const(mSSL, "OP_DONT_INSERT_EMPTY_FRAGMENTS", ULONG2NUM(SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS));
+    rb_define_const(mSSL, "OP_NO_TICKET", ULONG2NUM(SSL_OP_NO_TICKET));
+    rb_define_const(mSSL, "OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION", ULONG2NUM(SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION));
+    rb_define_const(mSSL, "OP_NO_COMPRESSION", ULONG2NUM(SSL_OP_NO_COMPRESSION));
+    rb_define_const(mSSL, "OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION", ULONG2NUM(SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION));
+#ifdef SSL_OP_NO_ENCRYPT_THEN_MAC /* OpenSSL 1.1.1 */
+    rb_define_const(mSSL, "OP_NO_ENCRYPT_THEN_MAC", ULONG2NUM(SSL_OP_NO_ENCRYPT_THEN_MAC));
+#endif
+    rb_define_const(mSSL, "OP_CIPHER_SERVER_PREFERENCE", ULONG2NUM(SSL_OP_CIPHER_SERVER_PREFERENCE));
+    rb_define_const(mSSL, "OP_TLS_ROLLBACK_BUG", ULONG2NUM(SSL_OP_TLS_ROLLBACK_BUG));
+#ifdef SSL_OP_NO_RENEGOTIATION /* OpenSSL 1.1.1 */
+    rb_define_const(mSSL, "OP_NO_RENEGOTIATION", ULONG2NUM(SSL_OP_NO_RENEGOTIATION));
+#endif
+    rb_define_const(mSSL, "OP_CRYPTOPRO_TLSEXT_BUG", ULONG2NUM(SSL_OP_CRYPTOPRO_TLSEXT_BUG));
+
+    rb_define_const(mSSL, "OP_NO_SSLv3", ULONG2NUM(SSL_OP_NO_SSLv3));
+    rb_define_const(mSSL, "OP_NO_TLSv1", ULONG2NUM(SSL_OP_NO_TLSv1));
+    rb_define_const(mSSL, "OP_NO_TLSv1_1", ULONG2NUM(SSL_OP_NO_TLSv1_1));
+    rb_define_const(mSSL, "OP_NO_TLSv1_2", ULONG2NUM(SSL_OP_NO_TLSv1_2));
+#ifdef SSL_OP_NO_TLSv1_3 /* OpenSSL 1.1.1 */
+    rb_define_const(mSSL, "OP_NO_TLSv1_3", ULONG2NUM(SSL_OP_NO_TLSv1_3));
+#endif
+
+    /* SSL_OP_* flags for DTLS */
+#if 0
+    rb_define_const(mSSL, "OP_NO_QUERY_MTU", ULONG2NUM(SSL_OP_NO_QUERY_MTU));
+    rb_define_const(mSSL, "OP_COOKIE_EXCHANGE", ULONG2NUM(SSL_OP_COOKIE_EXCHANGE));
+    rb_define_const(mSSL, "OP_CISCO_ANYCONNECT", ULONG2NUM(SSL_OP_CISCO_ANYCONNECT));
 #endif
-#if defined(SSL_OP_NO_COMPRESSION)
-    ossl_ssl_def_const(OP_NO_COMPRESSION);
+
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_MICROSOFT_SESS_ID_BUG", ULONG2NUM(SSL_OP_MICROSOFT_SESS_ID_BUG));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_NETSCAPE_CHALLENGE_BUG", ULONG2NUM(SSL_OP_NETSCAPE_CHALLENGE_BUG));
+    /* Deprecated in OpenSSL 0.9.8q and 1.0.0c. */
+    rb_define_const(mSSL, "OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG", ULONG2NUM(SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG));
+    /* Deprecated in OpenSSL 1.0.1h and 1.0.2. */
+    rb_define_const(mSSL, "OP_SSLREF2_REUSE_CERT_TYPE_BUG", ULONG2NUM(SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_MICROSOFT_BIG_SSLV3_BUFFER", ULONG2NUM(SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER));
+    /* Deprecated in OpenSSL 0.9.7h and 0.9.8b. */
+    rb_define_const(mSSL, "OP_MSIE_SSLV2_RSA_PADDING", ULONG2NUM(SSL_OP_MSIE_SSLV2_RSA_PADDING));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_SSLEAY_080_CLIENT_DH_BUG", ULONG2NUM(SSL_OP_SSLEAY_080_CLIENT_DH_BUG));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_TLS_D5_BUG", ULONG2NUM(SSL_OP_TLS_D5_BUG));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_TLS_BLOCK_PADDING_BUG", ULONG2NUM(SSL_OP_TLS_BLOCK_PADDING_BUG));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_SINGLE_ECDH_USE", ULONG2NUM(SSL_OP_SINGLE_ECDH_USE));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_SINGLE_DH_USE", ULONG2NUM(SSL_OP_SINGLE_DH_USE));
+    /* Deprecated in OpenSSL 1.0.1k and 1.0.2. */
+    rb_define_const(mSSL, "OP_EPHEMERAL_RSA", ULONG2NUM(SSL_OP_EPHEMERAL_RSA));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_NO_SSLv2", ULONG2NUM(SSL_OP_NO_SSLv2));
+    /* Deprecated in OpenSSL 1.0.1. */
+    rb_define_const(mSSL, "OP_PKCS1_CHECK_1", ULONG2NUM(SSL_OP_PKCS1_CHECK_1));
+    /* Deprecated in OpenSSL 1.0.1. */
+    rb_define_const(mSSL, "OP_PKCS1_CHECK_2", ULONG2NUM(SSL_OP_PKCS1_CHECK_2));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_NETSCAPE_CA_DN_BUG", ULONG2NUM(SSL_OP_NETSCAPE_CA_DN_BUG));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG", ULONG2NUM(SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG));
+
+
+    /*
+     * SSL/TLS version constants. Used by SSLContext#min_version= and
+     * #max_version=
+     */
+    /* SSL 2.0 */
+    rb_define_const(mSSL, "SSL2_VERSION", INT2NUM(SSL2_VERSION));
+    /* SSL 3.0 */
+    rb_define_const(mSSL, "SSL3_VERSION", INT2NUM(SSL3_VERSION));
+    /* TLS 1.0 */
+    rb_define_const(mSSL, "TLS1_VERSION", INT2NUM(TLS1_VERSION));
+    /* TLS 1.1 */
+    rb_define_const(mSSL, "TLS1_1_VERSION", INT2NUM(TLS1_1_VERSION));
+    /* TLS 1.2 */
+    rb_define_const(mSSL, "TLS1_2_VERSION", INT2NUM(TLS1_2_VERSION));
+#ifdef TLS1_3_VERSION /* OpenSSL 1.1.1 */
+    /* TLS 1.3 */
+    rb_define_const(mSSL, "TLS1_3_VERSION", INT2NUM(TLS1_3_VERSION));
 #endif
-    ossl_ssl_def_const(OP_PKCS1_CHECK_1);
-    ossl_ssl_def_const(OP_PKCS1_CHECK_2);
-    ossl_ssl_def_const(OP_NETSCAPE_CA_DN_BUG);
-    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 034762fc46..535c56097c 100644
--- a/ext/openssl/ossl_ssl.h
+++ b/ext/openssl/ossl_ssl.h
@@ -1,36 +1,36 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed 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 { \
-	Data_Get_Struct((obj), SSL_SESSION, (sess)); \
+	TypedData_Get_Struct((obj), SSL_SESSION, &ossl_ssl_session_type, (sess)); \
 	if (!(sess)) { \
 		ossl_raise(rb_eRuntimeError, "SSL Session wasn't initialized."); \
 	} \
 } while (0)
 
-#define SafeGetSSLSession(obj, sess) do { \
-	OSSL_Check_Kind((obj), cSSLSession); \
-	GetSSLSession((obj), (sess)); \
-} while (0)
-
+extern 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 a7437caf37..5514087387 100644
--- a/ext/openssl/ossl_ssl_session.c
+++ b/ext/openssl/ossl_ssl_session.c
@@ -4,35 +4,36 @@
 
 #include "ossl.h"
 
-#define GetSSLSession(obj, sess) do { \
-	Data_Get_Struct((obj), SSL_SESSION, (sess)); \
-	if (!(sess)) { \
-		ossl_raise(rb_eRuntimeError, "SSL Session wasn't initialized."); \
-	} \
-} while (0)
-
-#define SafeGetSSLSession(obj, sess) do { \
-	OSSL_Check_Kind((obj), cSSLSession); \
-	GetSSLSession((obj), (sess)); \
-} while (0)
-
-
 VALUE cSSLSession;
 static VALUE eSSLSession;
 
+static void
+ossl_ssl_session_free(void *ptr)
+{
+    SSL_SESSION_free(ptr);
+}
+
+const rb_data_type_t ossl_ssl_session_type = {
+    "OpenSSL/SSL/Session",
+    {
+	0, ossl_ssl_session_free,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static VALUE ossl_ssl_session_alloc(VALUE klass)
 {
-	return Data_Wrap_Struct(klass, 0, SSL_SESSION_free, NULL);
+	return TypedData_Wrap_Struct(klass, &ossl_ssl_session_type, NULL);
 }
 
 /*
  * call-seq:
- *    Session.new(SSLSocket | string) => session
+ *   Session.new(ssl_socket) -> Session
+ *   Session.new(string) -> Session
  *
- * === Parameters
- * +SSLSocket+ is an OpenSSL::SSL::SSLSocket
- * +string+ must be a DER or PEM encoded Session.
-*/
+ * Creates a new Session object from an instance of SSLSocket or DER/PEM encoded
+ * String.
+ */
 static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
 {
 	SSL_SESSION *ctx = NULL;
@@ -43,12 +44,12 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
 	if (rb_obj_is_instance_of(arg1, cSSLSocket)) {
 		SSL *ssl;
 
-		Data_Get_Struct(arg1, SSL, ssl);
+		GetSSL(arg1, ssl);
 
-		if (!ssl || (ctx = SSL_get1_session(ssl)) == NULL)
+		if ((ctx = SSL_get1_session(ssl)) == NULL)
 			ossl_raise(eSSLSession, "no session available");
 	} else {
-		BIO *in = ossl_obj2bio(arg1);
+		BIO *in = ossl_obj2bio(&arg1);
 
 		ctx = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
 
@@ -72,29 +73,56 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
 	return self;
 }
 
-#if HAVE_SSL_SESSION_CMP == 0
-int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b)
+static VALUE
+ossl_ssl_session_initialize_copy(VALUE self, VALUE other)
 {
-    if (a->ssl_version != b->ssl_version ||
-	a->session_id_length != b->session_id_length)
+    SSL_SESSION *sess, *sess_other, *sess_new;
+
+    rb_check_frozen(self);
+    sess = RTYPEDDATA_DATA(self); /* XXX */
+    GetSSLSession(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;
+}
+
+static int
+ossl_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))
+	return 1;
+    if (a_len != b_len)
 	return 1;
-    return memcmp(a->session_id,b-> session_id, a->session_id_length);
+
+    return CRYPTO_memcmp(a_sid, b_sid, a_len);
 }
-#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;
 
 	GetSSLSession(val1, ctx1);
-	SafeGetSSLSession(val2, ctx2);
+	GetSSLSession(val2, ctx2);
 
-	switch (SSL_SESSION_cmp(ctx1, ctx2)) {
+	switch (ossl_SSL_SESSION_cmp(ctx1, ctx2)) {
 	case 0:		return Qtrue;
 	default:	return Qfalse;
 	}
@@ -104,51 +132,50 @@ static VALUE ossl_ssl_session_eq(VALUE val1, VALUE val2)
  * call-seq:
  *    session.time -> Time
  *
- * Gets start time of the session.
- *
-*/
-static VALUE ossl_ssl_session_get_time(VALUE self)
+ * Returns the time at which the session was established.
+ */
+static VALUE
+ossl_ssl_session_get_time(VALUE self)
 {
-	SSL_SESSION *ctx;
-	time_t t;
+    SSL_SESSION *ctx;
+    long t;
 
-	GetSSLSession(self, ctx);
+    GetSSLSession(self, ctx);
+    t = SSL_SESSION_get_time(ctx);
+    if (t == 0)
+	return Qnil;
 
-	t = SSL_SESSION_get_time(ctx);
-
-	if (t == 0)
-		return Qnil;
-
-	return rb_funcall(rb_cTime, rb_intern("at"), 1, TIMET2NUM(t));
+    return rb_funcall(rb_cTime, rb_intern("at"), 1, LONG2NUM(t));
 }
 
 /*
  * call-seq:
- *    session.timeout -> integer
+ *    session.timeout -> Integer
  *
- * Gets how long until the session expires in seconds.
+ * Returns the timeout value set for the session, in seconds from the
+ * established time.
  *
-*/
-static VALUE ossl_ssl_session_get_timeout(VALUE self)
+ */
+static VALUE
+ossl_ssl_session_get_timeout(VALUE self)
 {
-	SSL_SESSION *ctx;
-	time_t t;
-
-	GetSSLSession(self, ctx);
+    SSL_SESSION *ctx;
+    long t;
 
-	t = SSL_SESSION_get_timeout(ctx);
+    GetSSLSession(self, ctx);
+    t = SSL_SESSION_get_timeout(ctx);
 
-	return TIMET2NUM(t);
+    return LONG2NUM(t);
 }
 
 /*
  * call-seq:
- *    session.time=(Time) -> Time
- *    session.time=(integer) -> Time
+ *    session.time = time
+ *    session.time = integer
  *
  * 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;
@@ -165,11 +192,10 @@ static VALUE ossl_ssl_session_set_time(VALUE self, VALUE time_v)
 
 /*
  * call-seq:
- *    session.timeout=(integer) -> integer
+ *    session.timeout = 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;
@@ -181,10 +207,9 @@ 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 -> aString
+ *    session.id -> String
  *
  * Returns the Session ID.
 */
@@ -200,14 +225,13 @@ static VALUE ossl_ssl_session_get_id(VALUE self)
 
 	return rb_str_new((const char *) p, i);
 }
-#endif
 
 /*
  * call-seq:
- *    session.to_der -> aString
+ *    session.to_der -> String
  *
  * Returns an ASN1 encoded String that contains the Session object.
-*/
+ */
 static VALUE ossl_ssl_session_to_der(VALUE self)
 {
 	SSL_SESSION *ctx;
@@ -233,14 +257,11 @@ 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);
 
@@ -248,16 +269,13 @@ static VALUE ossl_ssl_session_to_pem(VALUE self)
 		ossl_raise(eSSLSession, "BIO_s_mem()");
 	}
 
-	if (!(i=PEM_write_bio_SSL_SESSION(out, ctx))) {
+	if (!PEM_write_bio_SSL_SESSION(out, ctx)) {
 		BIO_free(out);
 		ossl_raise(eSSLSession, "SSL_SESSION_print()");
 	}
 
-	BIO_get_mem_ptr(out, &buf);
-	str = rb_str_new(buf->data, buf->length);
-	BIO_free(out);
 
-	return str;
+	return ossl_membio2str(out);
 }
 
 
@@ -265,14 +283,12 @@ static VALUE ossl_ssl_session_to_pem(VALUE self)
  * call-seq:
  *    session.to_text -> String
  *
- * Shows everything in the Session object.
-*/
+ * Shows everything in the Session object. This is for diagnostic purposes.
+ */
 static VALUE ossl_ssl_session_to_text(VALUE self)
 {
 	SSL_SESSION *ctx;
 	BIO *out;
-	BUF_MEM *buf;
-	VALUE str;
 
 	GetSSLSession(self, ctx);
 
@@ -285,25 +301,23 @@ static VALUE ossl_ssl_session_to_text(VALUE self)
 		ossl_raise(eSSLSession, "SSL_SESSION_print()");
 	}
 
-	BIO_get_mem_ptr(out, &buf);
-	str = rb_str_new(buf->data, buf->length);
-	BIO_free(out);
-
-	return str;
+	return ossl_membio2str(out);
 }
 
 
 void Init_ossl_ssl_session(void)
 {
 #if 0
-	mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
-	mSSL = rb_define_module_under(mOSSL, "SSL");
+    mOSSL = rb_define_module("OpenSSL");
+    mSSL = rb_define_module_under(mOSSL, "SSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 	cSSLSession = rb_define_class_under(mSSL, "Session", rb_cObject);
 	eSSLSession = rb_define_class_under(cSSLSession, "SessionError", eOSSLError);
 
 	rb_define_alloc_func(cSSLSession, ossl_ssl_session_alloc);
 	rb_define_method(cSSLSession, "initialize", ossl_ssl_session_initialize, 1);
+	rb_define_method(cSSLSession, "initialize_copy", ossl_ssl_session_initialize_copy, 1);
 
 	rb_define_method(cSSLSession, "==", ossl_ssl_session_eq, 1);
 
@@ -311,12 +325,7 @@ 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 193ceab089..c162f8c2a8 100644
--- a/ext/openssl/ossl_version.h
+++ b/ext/openssl/ossl_version.h
@@ -1,16 +1,15 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_VERSION_H_)
 #define _OSSL_VERSION_H_
 
-#define OSSL_VERSION "1.1.0"
+#define OSSL_VERSION "2.1.2"
 
 #endif /* _OSSL_VERSION_H_ */
diff --git a/ext/openssl/ossl_x509.c b/ext/openssl/ossl_x509.c
index fd1d9b6c7e..8a061b0687 100644
--- a/ext/openssl/ossl_x509.c
+++ b/ext/openssl/ossl_x509.c
@@ -1,24 +1,38 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
 VALUE mX509;
 
-#define DefX509Const(x) rb_define_const(mX509, #x,INT2FIX(X509_##x))
+#define DefX509Const(x) rb_define_const(mX509, #x, INT2NUM(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;
+
+    int off_days;
+
+    ossl_time_split(time, &sec, &off_days);
+    return X509_time_adj_ex(s, off_days, 0, &sec);
+}
+
 void
-Init_ossl_x509()
+Init_ossl_x509(void)
 {
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+#endif
+
     mX509 = rb_define_module_under(mOSSL, "X509");
 
     Init_ossl_x509attr();
@@ -64,35 +78,89 @@ Init_ossl_x509()
     DefX509Const(V_ERR_KEYUSAGE_NO_CERTSIGN);
     DefX509Const(V_ERR_APPLICATION_VERIFICATION);
 
-#if defined(X509_V_FLAG_CRL_CHECK)
+    /* Set by Store#flags= and StoreContext#flags=. Enables CRL checking for the
+     * certificate chain leaf. */
     DefX509Const(V_FLAG_CRL_CHECK);
-#endif
-#if defined(X509_V_FLAG_CRL_CHECK_ALL)
+    /* 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);
+    /* Set by Store#flags= and StoreContext#flags=. Enables some additional
+     * features including support for indirect signed CRLs. */
+    DefX509Const(V_FLAG_EXTENDED_CRL_SUPPORT);
+    /* Set by Store#flags= and StoreContext#flags=. Uses delta CRLs. If not
+     * specified, deltas are ignored. */
+    DefX509Const(V_FLAG_USE_DELTAS);
+    /* Set by Store#flags= and StoreContext#flags=. Enables checking of the
+     * signature of the root self-signed CA. */
+    DefX509Const(V_FLAG_CHECK_SS_SIGNATURE);
+#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);
 #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);
-#if defined(X509_PURPOSE_OCSP_HELPER)
+    /* Set by Store#purpose=. OCSP helper. */
     DefX509Const(PURPOSE_OCSP_HELPER);
-#endif
+    /* Set by Store#purpose=. Time stamps signer. */
+    DefX509Const(PURPOSE_TIMESTAMP_SIGN);
 
     DefX509Const(TRUST_COMPAT);
     DefX509Const(TRUST_SSL_CLIENT);
     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);
-#endif
+    DefX509Const(TRUST_TSA);
 
     DefX509Default(CERT_AREA, cert_area);
     DefX509Default(CERT_DIR, cert_dir);
@@ -101,4 +169,3 @@ Init_ossl_x509()
     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 1a43569073..4fadfa6b82 100644
--- a/ext/openssl/ossl_x509.h
+++ b/ext/openssl/ossl_x509.h
@@ -1,11 +1,10 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_X509_H_)
@@ -16,6 +15,13 @@
  */
 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);
 
 /*
@@ -25,7 +31,7 @@ extern VALUE cX509Attr;
 extern VALUE eX509AttrError;
 
 VALUE ossl_x509attr_new(X509_ATTRIBUTE *);
-X509_ATTRIBUTE *DupX509AttrPtr(VALUE);
+X509_ATTRIBUTE *GetX509AttrPtr(VALUE);
 void Init_ossl_x509attr(void);
 
 /*
@@ -35,7 +41,6 @@ extern VALUE cX509Cert;
 extern VALUE eX509CertError;
 
 VALUE ossl_x509_new(X509 *);
-VALUE ossl_x509_new_from_file(VALUE);
 X509 *GetX509CertPtr(VALUE);
 X509 *DupX509CertPtr(VALUE);
 void Init_ossl_x509cert(void);
@@ -48,7 +53,6 @@ extern VALUE eX509CRLError;
 
 VALUE ossl_x509crl_new(X509_CRL *);
 X509_CRL *GetX509CRLPtr(VALUE);
-X509_CRL *DupX509CRLPtr(VALUE);
 void Init_ossl_x509crl(void);
 
 /*
@@ -60,7 +64,6 @@ extern VALUE eX509ExtError;
 
 VALUE ossl_x509ext_new(X509_EXTENSION *);
 X509_EXTENSION *GetX509ExtPtr(VALUE);
-X509_EXTENSION *DupX509ExtPtr(VALUE);
 void Init_ossl_x509ext(void);
 
 /*
@@ -79,9 +82,7 @@ void Init_ossl_x509name(void);
 extern VALUE cX509Req;
 extern VALUE eX509ReqError;
 
-VALUE ossl_x509req_new(X509_REQ *);
 X509_REQ *GetX509ReqPtr(VALUE);
-X509_REQ *DupX509ReqPtr(VALUE);
 void Init_ossl_x509req(void);
 
 /*
@@ -101,14 +102,14 @@ extern VALUE cX509Store;
 extern VALUE cX509StoreContext;
 extern VALUE eX509StoreError;
 
-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 *);
+
 #endif /* _OSSL_X509_H_ */
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c
index 1f36ca8b12..60846cfe9d 100644
--- a/ext/openssl/ossl_x509attr.c
+++ b/ext/openssl/ossl_x509attr.c
@@ -1,31 +1,28 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define WrapX509Attr(klass, obj, attr) do { \
+#define NewX509Attr(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_x509attr_type, 0)
+#define SetX509Attr(obj, attr) do { \
     if (!(attr)) { \
 	ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, X509_ATTRIBUTE_free, (attr)); \
+    RTYPEDDATA_DATA(obj) = (attr); \
 } while (0)
 #define GetX509Attr(obj, attr) do { \
-    Data_Get_Struct((obj), X509_ATTRIBUTE, (attr)); \
+    TypedData_Get_Struct((obj), X509_ATTRIBUTE, &ossl_x509attr_type, (attr)); \
     if (!(attr)) { \
 	ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509Attr(obj, attr) do { \
-    OSSL_Check_Kind((obj), cX509Attr); \
-    GetX509Attr((obj), (attr)); \
-} while (0)
 
 /*
  * Classes
@@ -33,6 +30,20 @@
 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
  */
@@ -42,6 +53,7 @@ ossl_x509attr_new(X509_ATTRIBUTE *attr)
     X509_ATTRIBUTE *new;
     VALUE obj;
 
+    obj = NewX509Attr(cX509Attr);
     if (!attr) {
 	new = X509_ATTRIBUTE_new();
     } else {
@@ -50,22 +62,19 @@ ossl_x509attr_new(X509_ATTRIBUTE *attr)
     if (!new) {
 	ossl_raise(eX509AttrError, NULL);
     }
-    WrapX509Attr(cX509Attr, obj, new);
+    SetX509Attr(obj, new);
 
     return obj;
 }
 
 X509_ATTRIBUTE *
-DupX509AttrPtr(VALUE obj)
+GetX509AttrPtr(VALUE obj)
 {
-    X509_ATTRIBUTE *attr, *new;
+    X509_ATTRIBUTE *attr;
 
-    SafeGetX509Attr(obj, attr);
-    if (!(new = X509_ATTRIBUTE_dup(attr))) {
-	ossl_raise(eX509AttrError, NULL);
-    }
+    GetX509Attr(obj, attr);
 
-    return new;
+    return attr;
 }
 
 /*
@@ -77,9 +86,10 @@ ossl_x509attr_alloc(VALUE klass)
     X509_ATTRIBUTE *attr;
     VALUE obj;
 
+    obj = NewX509Attr(klass);
     if (!(attr = X509_ATTRIBUTE_new()))
 	ossl_raise(eX509AttrError, NULL);
-    WrapX509Attr(klass, obj, attr);
+    SetX509Attr(obj, attr);
 
     return obj;
 }
@@ -113,6 +123,25 @@ 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);
+    GetX509Attr(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
@@ -124,12 +153,15 @@ ossl_x509attr_set_oid(VALUE self, VALUE oid)
     ASN1_OBJECT *obj;
     char *s;
 
-    s = StringValuePtr(oid);
+    GetX509Attr(self, attr);
+    s = StringValueCStr(oid);
     obj = OBJ_txt2obj(s, 0);
-    if(!obj) obj = OBJ_txt2obj(s, 1);
     if(!obj) ossl_raise(eX509AttrError, NULL);
-    GetX509Attr(self, attr);
-    X509_ATTRIBUTE_set1_object(attr, obj);
+    if (!X509_ATTRIBUTE_set1_object(attr, obj)) {
+	ASN1_OBJECT_free(obj);
+	ossl_raise(eX509AttrError, "X509_ATTRIBUTE_set1_object");
+    }
+    ASN1_OBJECT_free(obj);
 
     return oid;
 }
@@ -161,14 +193,6 @@ 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)->set)
-#  define OSSL_X509ATTR_SET_SINGLE(attr) ((attr)->set = 0)
-#endif
-
 /*
  * call-seq:
  *    attr.value = asn1 => asn1
@@ -177,21 +201,37 @@ static VALUE
 ossl_x509attr_set_value(VALUE self, VALUE value)
 {
     X509_ATTRIBUTE *attr;
-    ASN1_TYPE *a1type;
+    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");
 
-    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);
+    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;
+    }
+
+    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);
+	}
+	ASN1_TYPE_free(a1type);
     }
-    OSSL_X509ATTR_SET_SINGLE(attr);
-    attr->value.single = a1type;
 
     return value;
 }
@@ -204,32 +244,34 @@ static VALUE
 ossl_x509attr_get_value(VALUE self)
 {
     X509_ATTRIBUTE *attr;
-    VALUE str, asn1;
-    long length;
+    STACK_OF(ASN1_TYPE) *sk;
+    VALUE str;
+    int i, count, len;
     unsigned char *p;
 
     GetX509Attr(self, attr);
-    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);
+    /* 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);
     }
-    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);
+    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);
     }
-    asn1 = rb_funcall(mASN1, rb_intern("decode"), 1, str);
+    ossl_str_adjust(str, p);
+    sk_ASN1_TYPE_free(sk);
 
-    return asn1;
+    return rb_funcall(mASN1, rb_intern("decode"), 1, str);
 }
 
 /*
@@ -251,7 +293,7 @@ ossl_x509attr_to_der(VALUE self)
     p = (unsigned char *)RSTRING_PTR(str);
     if(i2d_X509_ATTRIBUTE(attr, &p) <= 0)
 	ossl_raise(eX509AttrError, NULL);
-    rb_str_set_len(str, p - (unsigned char*)RSTRING_PTR(str));
+    ossl_str_adjust(str, p);
 
     return str;
 }
@@ -260,13 +302,20 @@ ossl_x509attr_to_der(VALUE self)
  * X509_ATTRIBUTE init
  */
 void
-Init_ossl_x509attr()
+Init_ossl_x509attr(void)
 {
+#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_method(cX509Attr, "initialize_copy", ossl_x509attr_initialize_copy, 1);
     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 0aae3ba6b1..40542c4a78 100644
--- a/ext/openssl/ossl_x509cert.c
+++ b/ext/openssl/ossl_x509cert.c
@@ -1,31 +1,28 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define WrapX509(klass, obj, x509) do { \
+#define NewX509(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_x509_type, 0)
+#define SetX509(obj, x509) do { \
     if (!(x509)) { \
 	ossl_raise(rb_eRuntimeError, "CERT wasn't initialized!"); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, X509_free, (x509)); \
+    RTYPEDDATA_DATA(obj) = (x509); \
 } while (0)
 #define GetX509(obj, x509) do { \
-    Data_Get_Struct((obj), X509, (x509)); \
+    TypedData_Get_Struct((obj), X509, &ossl_x509_type, (x509)); \
     if (!(x509)) { \
 	ossl_raise(rb_eRuntimeError, "CERT wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509(obj, x509) do { \
-    OSSL_Check_Kind((obj), cX509Cert); \
-    GetX509((obj), (x509)); \
-} while (0)
 
 /*
  * Classes
@@ -33,6 +30,20 @@
 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
  */
@@ -42,6 +53,7 @@ ossl_x509_new(X509 *x509)
     X509 *new;
     VALUE obj;
 
+    obj = NewX509(cX509Cert);
     if (!x509) {
 	new = X509_new();
     } else {
@@ -50,39 +62,7 @@ ossl_x509_new(X509 *x509)
     if (!new) {
 	ossl_raise(eX509CertError, NULL);
     }
-    WrapX509(cX509Cert, obj, new);
-
-    return obj;
-}
-
-VALUE
-ossl_x509_new_from_file(VALUE filename)
-{
-    X509 *x509;
-    FILE *fp;
-    VALUE obj;
-
-    SafeStringValue(filename);
-    if (!(fp = fopen(RSTRING_PTR(filename), "r"))) {
-	ossl_raise(eX509CertError, "%s", strerror(errno));
-    }
-    x509 = PEM_read_X509(fp, NULL, NULL, NULL);
-    /*
-     * prepare for DER...
-#if !defined(OPENSSL_NO_FP_API)
-    if (!x509) {
-    	(void)ERR_get_error();
-	rewind(fp);
-
-	x509 = d2i_X509_fp(fp, NULL);
-    }
-#endif
-    */
-    fclose(fp);
-    if (!x509) {
-	ossl_raise(eX509CertError, NULL);
-    }
-    WrapX509(cX509Cert, obj, x509);
+    SetX509(obj, new);
 
     return obj;
 }
@@ -92,7 +72,7 @@ GetX509CertPtr(VALUE obj)
 {
     X509 *x509;
 
-    SafeGetX509(obj, x509);
+    GetX509(obj, x509);
 
     return x509;
 }
@@ -102,9 +82,9 @@ DupX509CertPtr(VALUE obj)
 {
     X509 *x509;
 
-    SafeGetX509(obj, x509);
+    GetX509(obj, x509);
 
-    CRYPTO_add(&x509->references, 1, CRYPTO_LOCK_X509);
+    X509_up_ref(x509);
 
     return x509;
 }
@@ -118,10 +98,10 @@ ossl_x509_alloc(VALUE klass)
     X509 *x509;
     VALUE obj;
 
+    obj = NewX509(klass);
     x509 = X509_new();
     if (!x509) ossl_raise(eX509CertError, NULL);
-
-    WrapX509(klass, obj, x509);
+    SetX509(obj, x509);
 
     return obj;
 }
@@ -143,7 +123,7 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
     }
     arg = ossl_to_der_if_possible(arg);
-    in = ossl_obj2bio(arg);
+    in = ossl_obj2bio(&arg);
     x509 = PEM_read_bio_X509(in, &x, NULL, NULL);
     DATA_PTR(self) = x;
     if (!x509) {
@@ -166,7 +146,7 @@ ossl_x509_copy(VALUE self, VALUE other)
     if (self == other) return self;
 
     GetX509(self, a);
-    SafeGetX509(other, b);
+    GetX509(other, b);
 
     x509 = X509_dup(b);
     if (!x509) ossl_raise(eX509CertError, NULL);
@@ -331,9 +311,7 @@ ossl_x509_set_serial(VALUE self, VALUE num)
     X509 *x509;
 
     GetX509(self, x509);
-
-    x509->cert_info->serialNumber =
-	num_to_asn1integer(num, X509_get_serialNumber(x509));
+    X509_set_serialNumber(x509, num_to_asn1integer(num, X509_get_serialNumber(x509)));
 
     return num;
 }
@@ -353,7 +331,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->cert_info->signature->algorithm)) {
+    if (!i2a_ASN1_OBJECT(out, X509_get0_tbs_sigalg(x509)->algorithm)) {
 	BIO_free(out);
 	ossl_raise(eX509CertError, NULL);
     }
@@ -440,10 +418,10 @@ static VALUE
 ossl_x509_get_not_before(VALUE self)
 {
     X509 *x509;
-    ASN1_UTCTIME *asn1time;
+    const ASN1_TIME *asn1time;
 
     GetX509(self, x509);
-    if (!(asn1time = X509_get_notBefore(x509))) { /* NO DUP - don't free! */
+    if (!(asn1time = X509_get0_notBefore(x509))) {
 	ossl_raise(eX509CertError, NULL);
     }
 
@@ -458,13 +436,15 @@ static VALUE
 ossl_x509_set_not_before(VALUE self, VALUE time)
 {
     X509 *x509;
-    time_t sec;
+    ASN1_TIME *asn1time;
 
-    sec = time_to_time_t(time);
     GetX509(self, x509);
-    if (!X509_time_adj(X509_get_notBefore(x509), 0, &sec)) {
-	ossl_raise(eX509CertError, NULL);
+    asn1time = ossl_x509_time_adjust(NULL, time);
+    if (!X509_set1_notBefore(x509, asn1time)) {
+	ASN1_TIME_free(asn1time);
+	ossl_raise(eX509CertError, "X509_set_notBefore");
     }
+    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -477,10 +457,10 @@ static VALUE
 ossl_x509_get_not_after(VALUE self)
 {
     X509 *x509;
-    ASN1_TIME *asn1time;
+    const ASN1_TIME *asn1time;
 
     GetX509(self, x509);
-    if (!(asn1time = X509_get_notAfter(x509))) { /* NO DUP - don't free! */
+    if (!(asn1time = X509_get0_notAfter(x509))) {
 	ossl_raise(eX509CertError, NULL);
     }
 
@@ -489,19 +469,21 @@ ossl_x509_get_not_after(VALUE self)
 
 /*
  * call-seq:
- *    cert.not_before = time => time
+ *    cert.not_after = time => time
  */
 static VALUE
 ossl_x509_set_not_after(VALUE self, VALUE time)
 {
     X509 *x509;
-    time_t sec;
+    ASN1_TIME *asn1time;
 
-    sec = time_to_time_t(time);
     GetX509(self, x509);
-    if (!X509_time_adj(X509_get_notAfter(x509), 0, &sec)) {
-	ossl_raise(eX509CertError, NULL);
+    asn1time = ossl_x509_time_adjust(NULL, time);
+    if (!X509_set1_notAfter(x509, asn1time)) {
+	ASN1_TIME_free(asn1time);
+	ossl_raise(eX509CertError, "X509_set_notAfter");
     }
+    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -526,18 +508,19 @@ ossl_x509_get_public_key(VALUE self)
 
 /*
  * call-seq:
- *    cert.public_key = key => key
+ *    cert.public_key = key
  */
 static VALUE
 ossl_x509_set_public_key(VALUE self, VALUE key)
 {
     X509 *x509;
+    EVP_PKEY *pkey;
 
     GetX509(self, x509);
-    if (!X509_set_pubkey(x509, GetPKeyPtr(key))) { /* DUPs pkey */
-	ossl_raise(eX509CertError, NULL);
-    }
-
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
+    if (!X509_set_pubkey(x509, pkey))
+	ossl_raise(eX509CertError, "X509_set_pubkey");
     return key;
 }
 
@@ -553,7 +536,7 @@ ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
     const EVP_MD *md;
 
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
+    md = ossl_evp_get_digestbyname(digest);
     GetX509(self, x509);
     if (!X509_sign(x509, pkey, md)) {
 	ossl_raise(eX509CertError, NULL);
@@ -566,32 +549,35 @@ ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
  * call-seq:
  *    cert.verify(key) => true | false
  *
- * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
+ * Verifies the signature of the certificate, with the public key _key_. _key_
+ * must be an instance of OpenSSL::PKey.
  */
 static VALUE
 ossl_x509_verify(VALUE self, VALUE key)
 {
     X509 *x509;
     EVP_PKEY *pkey;
-    int i;
 
-    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
     GetX509(self, x509);
-    if ((i = X509_verify(x509, pkey)) < 0) {
-	ossl_raise(eX509CertError, NULL);
-    }
-    if (i > 0) {
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
+    switch (X509_verify(x509, pkey)) {
+      case 1:
 	return Qtrue;
+      case 0:
+	ossl_clear_error();
+	return Qfalse;
+      default:
+	ossl_raise(eX509CertError, NULL);
     }
-
-    return Qfalse;
 }
 
 /*
  * call-seq:
- *    cert.check_private_key(key)
+ *    cert.check_private_key(key) -> true | false
  *
- * Checks if 'key' is PRIV key for this cert
+ * Returns +true+ if _key_ is the corresponding private key to the Subject
+ * Public Key Information, +false+ otherwise.
  */
 static VALUE
 ossl_x509_check_private_key(VALUE self, VALUE key)
@@ -603,7 +589,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_Warning("Check private key:%s", OSSL_ErrMsg());
+	ossl_clear_error();
 	return Qfalse;
     }
 
@@ -645,24 +631,21 @@ ossl_x509_set_extensions(VALUE self, VALUE ary)
 {
     X509 *x509;
     X509_EXTENSION *ext;
-    int i;
+    long 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_PTR(ary)[i], cX509Ext);
+	OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Ext);
     }
     GetX509(self, x509);
-    sk_X509_EXTENSION_pop_free(x509->cert_info->extensions, X509_EXTENSION_free);
-    x509->cert_info->extensions = NULL;
+    while ((ext = X509_delete_ext(x509, 0)))
+	X509_EXTENSION_free(ext);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	ext = DupX509ExtPtr(RARRAY_PTR(ary)[i]);
-
-	if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
-	    X509_EXTENSION_free(ext);
+	ext = GetX509ExtPtr(RARRAY_AREF(ary, i));
+	if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext */
 	    ossl_raise(eX509CertError, NULL);
 	}
-	X509_EXTENSION_free(ext);
     }
 
     return ary;
@@ -679,12 +662,10 @@ ossl_x509_add_extension(VALUE self, VALUE extension)
     X509_EXTENSION *ext;
 
     GetX509(self, x509);
-    ext = DupX509ExtPtr(extension);
+    ext = GetX509ExtPtr(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;
 }
@@ -692,46 +673,46 @@ ossl_x509_add_extension(VALUE self, VALUE extension)
 static VALUE
 ossl_x509_inspect(VALUE self)
 {
-    VALUE str;
-    const char *cname = rb_class2name(rb_obj_class(self));
-
-    str = rb_str_new2("#<");
-    rb_str_cat2(str, cname);
-    rb_str_cat2(str, " ");
-
-    rb_str_cat2(str, "subject=");
-    rb_str_append(str, rb_inspect(ossl_x509_get_subject(self)));
-    rb_str_cat2(str, ", ");
-
-    rb_str_cat2(str, "issuer=");
-    rb_str_append(str, rb_inspect(ossl_x509_get_issuer(self)));
-    rb_str_cat2(str, ", ");
-
-    rb_str_cat2(str, "serial=");
-    rb_str_append(str, rb_inspect(ossl_x509_get_serial(self)));
-    rb_str_cat2(str, ", ");
-
-    rb_str_cat2(str, "not_before=");
-    rb_str_append(str, rb_inspect(ossl_x509_get_not_before(self)));
-    rb_str_cat2(str, ", ");
+    return rb_sprintf("#<%"PRIsVALUE": subject=%+"PRIsVALUE", "
+		      "issuer=%+"PRIsVALUE", serial=%+"PRIsVALUE", "
+		      "not_before=%+"PRIsVALUE", not_after=%+"PRIsVALUE">",
+		      rb_obj_class(self),
+		      ossl_x509_get_subject(self),
+		      ossl_x509_get_issuer(self),
+		      ossl_x509_get_serial(self),
+		      ossl_x509_get_not_before(self),
+		      ossl_x509_get_not_after(self));
+}
 
-    rb_str_cat2(str, "not_after=");
-    rb_str_append(str, rb_inspect(ossl_x509_get_not_after(self)));
+/*
+ * call-seq:
+ *    cert1 == cert2 -> true | false
+ *
+ * Compares the two certificates. Note that this takes into account all fields,
+ * not just the issuer name and the serial number.
+ */
+static VALUE
+ossl_x509_eq(VALUE self, VALUE other)
+{
+    X509 *a, *b;
 
-    str = rb_str_cat2(str, ">");
+    GetX509(self, a);
+    if (!rb_obj_is_kind_of(other, cX509Cert))
+	return Qfalse;
+    GetX509(other, b);
 
-    return str;
+    return !X509_cmp(a, b) ? Qtrue : Qfalse;
 }
 
 /*
  * INIT
  */
 void
-Init_ossl_x509cert()
+Init_ossl_x509cert(void)
 {
-
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
     mX509 = rb_define_module_under(mOSSL, "X509");
 #endif
 
@@ -829,14 +810,11 @@ Init_ossl_x509cert()
      *   cert.sign(root_key, OpenSSL::Digest::SHA256.new)
      *
      */
-
-    eX509CertError = rb_define_class_under(mX509, "CertificateError", eOSSLError);
-
     cX509Cert = rb_define_class_under(mX509, "Certificate", rb_cObject);
 
     rb_define_alloc_func(cX509Cert, ossl_x509_alloc);
     rb_define_method(cX509Cert, "initialize", ossl_x509_initialize, -1);
-    rb_define_copy_func(cX509Cert, ossl_x509_copy);
+    rb_define_method(cX509Cert, "initialize_copy", ossl_x509_copy, 1);
 
     rb_define_method(cX509Cert, "to_der", ossl_x509_to_der, 0);
     rb_define_method(cX509Cert, "to_pem", ossl_x509_to_pem, 0);
@@ -864,5 +842,5 @@ Init_ossl_x509cert()
     rb_define_method(cX509Cert, "extensions=", ossl_x509_set_extensions, 1);
     rb_define_method(cX509Cert, "add_extension", ossl_x509_add_extension, 1);
     rb_define_method(cX509Cert, "inspect", ossl_x509_inspect, 0);
+    rb_define_method(cX509Cert, "==", ossl_x509_eq, 1);
 }
-
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
index dec13c8cae..b0badf45c4 100644
--- a/ext/openssl/ossl_x509crl.c
+++ b/ext/openssl/ossl_x509crl.c
@@ -1,31 +1,28 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define WrapX509CRL(klass, obj, crl) do { \
+#define NewX509CRL(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_x509crl_type, 0)
+#define SetX509CRL(obj, crl) do { \
     if (!(crl)) { \
 	ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, X509_CRL_free, (crl)); \
+    RTYPEDDATA_DATA(obj) = (crl); \
 } while (0)
 #define GetX509CRL(obj, crl) do { \
-    Data_Get_Struct((obj), X509_CRL, (crl)); \
+    TypedData_Get_Struct((obj), X509_CRL, &ossl_x509crl_type, (crl)); \
     if (!(crl)) { \
 	ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509CRL(obj, crl) do { \
-    OSSL_Check_Kind((obj), cX509CRL); \
-    GetX509CRL((obj), (crl)); \
-} while (0)
 
 /*
  * Classes
@@ -33,6 +30,20 @@
 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
  */
@@ -41,18 +52,7 @@ GetX509CRLPtr(VALUE obj)
 {
     X509_CRL *crl;
 
-    SafeGetX509CRL(obj, crl);
-
-    return crl;
-}
-
-X509_CRL *
-DupX509CRLPtr(VALUE obj)
-{
-    X509_CRL *crl;
-
-    SafeGetX509CRL(obj, crl);
-    CRYPTO_add(&crl->references, 1, CRYPTO_LOCK_X509_CRL);
+    GetX509CRL(obj, crl);
 
     return crl;
 }
@@ -63,9 +63,10 @@ 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);
-    WrapX509CRL(cX509CRL, obj, tmp);
+    SetX509CRL(obj, tmp);
 
     return obj;
 }
@@ -79,10 +80,11 @@ ossl_x509crl_alloc(VALUE klass)
     X509_CRL *crl;
     VALUE obj;
 
+    obj = NewX509CRL(klass);
     if (!(crl = X509_CRL_new())) {
 	ossl_raise(eX509CRLError, NULL);
     }
-    WrapX509CRL(klass, obj, crl);
+    SetX509CRL(obj, crl);
 
     return obj;
 }
@@ -98,7 +100,7 @@ ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
     }
     arg = ossl_to_der_if_possible(arg);
-    in = ossl_obj2bio(arg);
+    in = ossl_obj2bio(&arg);
     crl = PEM_read_bio_X509_CRL(in, &x, NULL, NULL);
     DATA_PTR(self) = x;
     if (!crl) {
@@ -120,7 +122,7 @@ ossl_x509crl_copy(VALUE self, VALUE other)
     rb_check_frozen(self);
     if (self == other) return self;
     GetX509CRL(self, a);
-    SafeGetX509CRL(other, b);
+    GetX509CRL(other, b);
     if (!(crl = X509_CRL_dup(b))) {
 	ossl_raise(eX509CRLError, NULL);
     }
@@ -163,22 +165,20 @@ 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);
     }
-    if (!i2a_ASN1_OBJECT(out, crl->sig_alg->algorithm)) {
+    X509_CRL_get0_signature(crl, NULL, &alg);
+    if (!i2a_ASN1_OBJECT(out, alg->algorithm)) {
 	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 str;
+
+    return ossl_membio2str(out);
 }
 
 static VALUE
@@ -208,23 +208,29 @@ static VALUE
 ossl_x509crl_get_last_update(VALUE self)
 {
     X509_CRL *crl;
+    const ASN1_TIME *time;
 
     GetX509CRL(self, crl);
+    time = X509_CRL_get0_lastUpdate(crl);
+    if (!time)
+	return Qnil;
 
-    return asn1time_to_time(X509_CRL_get_lastUpdate(crl));
+    return asn1time_to_time(time);
 }
 
 static VALUE
 ossl_x509crl_set_last_update(VALUE self, VALUE time)
 {
     X509_CRL *crl;
-    time_t sec;
+    ASN1_TIME *asn1time;
 
-    sec = time_to_time_t(time);
     GetX509CRL(self, crl);
-    if (!X509_time_adj(crl->crl->lastUpdate, 0, &sec)) {
-	ossl_raise(eX509CRLError, NULL);
+    asn1time = ossl_x509_time_adjust(NULL, time);
+    if (!X509_CRL_set1_lastUpdate(crl, asn1time)) {
+	ASN1_TIME_free(asn1time);
+	ossl_raise(eX509CRLError, "X509_CRL_set_lastUpdate");
     }
+    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -233,24 +239,29 @@ static VALUE
 ossl_x509crl_get_next_update(VALUE self)
 {
     X509_CRL *crl;
+    const ASN1_TIME *time;
 
     GetX509CRL(self, crl);
+    time = X509_CRL_get0_nextUpdate(crl);
+    if (!time)
+	return Qnil;
 
-    return asn1time_to_time(X509_CRL_get_nextUpdate(crl));
+    return asn1time_to_time(time);
 }
 
 static VALUE
 ossl_x509crl_set_next_update(VALUE self, VALUE time)
 {
     X509_CRL *crl;
-    time_t sec;
+    ASN1_TIME *asn1time;
 
-    sec = time_to_time_t(time);
     GetX509CRL(self, crl);
-    /* This must be some thinko in OpenSSL */
-    if (!(crl->crl->nextUpdate = X509_time_adj(crl->crl->nextUpdate, 0, &sec))){
-	ossl_raise(eX509CRLError, NULL);
+    asn1time = ossl_x509_time_adjust(NULL, time);
+    if (!X509_CRL_set1_nextUpdate(crl, asn1time)) {
+	ASN1_TIME_free(asn1time);
+	ossl_raise(eX509CRLError, "X509_CRL_set_nextUpdate");
     }
+    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -285,20 +296,24 @@ ossl_x509crl_set_revoked(VALUE self, VALUE ary)
 {
     X509_CRL *crl;
     X509_REVOKED *rev;
-    int i;
+    STACK_OF(X509_REVOKED) *sk;
+    long 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_PTR(ary)[i], cX509Rev);
+	OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Rev);
     }
     GetX509CRL(self, crl);
-    sk_X509_REVOKED_pop_free(crl->crl->revoked, X509_REVOKED_free);
-    crl->crl->revoked = NULL;
+    if ((sk = X509_CRL_get_REVOKED(crl))) {
+	while ((rev = sk_X509_REVOKED_pop(sk)))
+	    X509_REVOKED_free(rev);
+    }
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	rev = DupX509RevokedPtr(RARRAY_PTR(ary)[i]);
+	rev = DupX509RevokedPtr(RARRAY_AREF(ary, i));
 	if (!X509_CRL_add0_revoked(crl, rev)) { /* NO DUP - don't free! */
-	    ossl_raise(eX509CRLError, NULL);
+	    X509_REVOKED_free(rev);
+	    ossl_raise(eX509CRLError, "X509_CRL_add0_revoked");
 	}
     }
     X509_CRL_sort(crl);
@@ -315,7 +330,8 @@ 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! */
-	ossl_raise(eX509CRLError, NULL);
+	X509_REVOKED_free(rev);
+	ossl_raise(eX509CRLError, "X509_CRL_add0_revoked");
     }
     X509_CRL_sort(crl);
 
@@ -331,7 +347,7 @@ ossl_x509crl_sign(VALUE self, VALUE key, VALUE digest)
 
     GetX509CRL(self, crl);
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
+    md = ossl_evp_get_digestbyname(digest);
     if (!X509_CRL_sign(crl, pkey, md)) {
 	ossl_raise(eX509CRLError, NULL);
     }
@@ -343,17 +359,20 @@ static VALUE
 ossl_x509crl_verify(VALUE self, VALUE key)
 {
     X509_CRL *crl;
-    int ret;
+    EVP_PKEY *pkey;
 
     GetX509CRL(self, crl);
-    if ((ret = X509_CRL_verify(crl, GetPKeyPtr(key))) < 0) {
-	ossl_raise(eX509CRLError, NULL);
-    }
-    if (ret == 1) {
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
+    switch (X509_CRL_verify(crl, pkey)) {
+      case 1:
 	return Qtrue;
+      case 0:
+	ossl_clear_error();
+	return Qfalse;
+      default:
+	ossl_raise(eX509CRLError, NULL);
     }
-
-    return Qfalse;
 }
 
 static VALUE
@@ -361,8 +380,6 @@ 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()))) {
@@ -372,11 +389,8 @@ 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 str;
+    return ossl_membio2str(out);
 }
 
 static VALUE
@@ -384,8 +398,6 @@ 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()))) {
@@ -395,11 +407,8 @@ 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 str;
+    return ossl_membio2str(out);
 }
 
 static VALUE
@@ -407,8 +416,6 @@ 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()))) {
@@ -418,11 +425,8 @@ 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 str;
+    return ossl_membio2str(out);
 }
 
 /*
@@ -459,23 +463,21 @@ ossl_x509crl_set_extensions(VALUE self, VALUE ary)
 {
     X509_CRL *crl;
     X509_EXTENSION *ext;
-    int i;
+    long 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_PTR(ary)[i], cX509Ext);
+	OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Ext);
     }
     GetX509CRL(self, crl);
-    sk_X509_EXTENSION_pop_free(crl->crl->extensions, X509_EXTENSION_free);
-    crl->crl->extensions = NULL;
+    while ((ext = X509_CRL_delete_ext(crl, 0)))
+	X509_EXTENSION_free(ext);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	ext = DupX509ExtPtr(RARRAY_PTR(ary)[i]);
-	if(!X509_CRL_add_ext(crl, ext, -1)) { /* DUPs ext - FREE it */
-	    X509_EXTENSION_free(ext);
+	ext = GetX509ExtPtr(RARRAY_AREF(ary, i)); /* NO NEED TO DUP */
+	if (!X509_CRL_add_ext(crl, ext, -1)) {
 	    ossl_raise(eX509CRLError, NULL);
 	}
-	X509_EXTENSION_free(ext);
     }
 
     return ary;
@@ -488,12 +490,10 @@ ossl_x509crl_add_extension(VALUE self, VALUE extension)
     X509_EXTENSION *ext;
 
     GetX509CRL(self, crl);
-    ext = DupX509ExtPtr(extension);
-    if (!X509_CRL_add_ext(crl, ext, -1)) { /* DUPs ext - FREE it */
-	X509_EXTENSION_free(ext);
+    ext = GetX509ExtPtr(extension);
+    if (!X509_CRL_add_ext(crl, ext, -1)) {
 	ossl_raise(eX509CRLError, NULL);
     }
-    X509_EXTENSION_free(ext);
 
     return extension;
 }
@@ -502,15 +502,21 @@ ossl_x509crl_add_extension(VALUE self, VALUE extension)
  * INIT
  */
 void
-Init_ossl_x509crl()
+Init_ossl_x509crl(void)
 {
+#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);
 
     rb_define_alloc_func(cX509CRL, ossl_x509crl_alloc);
     rb_define_method(cX509CRL, "initialize", ossl_x509crl_initialize, -1);
-    rb_define_copy_func(cX509CRL, ossl_x509crl_copy);
+    rb_define_method(cX509CRL, "initialize_copy", ossl_x509crl_copy, 1);
 
     rb_define_method(cX509CRL, "version", ossl_x509crl_get_version, 0);
     rb_define_method(cX509CRL, "version=", ossl_x509crl_set_version, 1);
@@ -534,4 +540,3 @@ Init_ossl_x509crl()
     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 bd2e1dd2fa..30ec09d7a3 100644
--- a/ext/openssl/ossl_x509ext.c
+++ b/ext/openssl/ossl_x509ext.c
@@ -1,39 +1,37 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define WrapX509Ext(klass, obj, ext) do { \
+#define NewX509Ext(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_x509ext_type, 0)
+#define SetX509Ext(obj, ext) do { \
     if (!(ext)) { \
 	ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, X509_EXTENSION_free, (ext)); \
+    RTYPEDDATA_DATA(obj) = (ext); \
 } while (0)
 #define GetX509Ext(obj, ext) do { \
-    Data_Get_Struct((obj), X509_EXTENSION, (ext)); \
+    TypedData_Get_Struct((obj), X509_EXTENSION, &ossl_x509ext_type, (ext)); \
     if (!(ext)) { \
 	ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509Ext(obj, ext) do { \
-    OSSL_Check_Kind((obj), cX509Ext); \
-    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); \
-    (obj) = Data_Wrap_Struct((klass), 0, ossl_x509extfactory_free, (ctx)); \
+    RTYPEDDATA_DATA(obj) = (ctx); \
 } while (0)
 #define GetX509ExtFactory(obj, ctx) do { \
-    Data_Get_Struct((obj), X509V3_CTX, (ctx)); \
+    TypedData_Get_Struct((obj), X509V3_CTX, &ossl_x509extfactory_type, (ctx)); \
     if (!(ctx)) { \
 	ossl_raise(rb_eRuntimeError, "CTX wasn't initialized!"); \
     } \
@@ -46,6 +44,20 @@ 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
  */
@@ -55,6 +67,7 @@ ossl_x509ext_new(X509_EXTENSION *ext)
     X509_EXTENSION *new;
     VALUE obj;
 
+    obj = NewX509Ext(cX509Ext);
     if (!ext) {
 	new = X509_EXTENSION_new();
     } else {
@@ -63,7 +76,7 @@ ossl_x509ext_new(X509_EXTENSION *ext)
     if (!new) {
 	ossl_raise(eX509ExtError, NULL);
     }
-    WrapX509Ext(cX509Ext, obj, new);
+    SetX509Ext(obj, new);
 
     return obj;
 }
@@ -73,24 +86,11 @@ GetX509ExtPtr(VALUE obj)
 {
     X509_EXTENSION *ext;
 
-    SafeGetX509Ext(obj, ext);
+    GetX509Ext(obj, ext);
 
     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
  */
@@ -98,11 +98,19 @@ DupX509ExtPtr(VALUE obj)
  * Ext factory
  */
 static void
-ossl_x509extfactory_free(X509V3_CTX *ctx)
+ossl_x509extfactory_free(void *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)
 {
@@ -163,24 +171,6 @@ 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)
 {
@@ -204,12 +194,11 @@ ossl_x509extfactory_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 /*
- * 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
+ * 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).
  */
 static VALUE
 ossl_x509extfactory_create_ext(int argc, VALUE *argv, VALUE self)
@@ -218,37 +207,34 @@ 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);
-    StringValue(oid);
+    StringValueCStr(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 `%s'", RSTRING_PTR(oid));
+    if(!nid) ossl_raise(eX509ExtError, "unknown OID `%"PRIsVALUE"'", oid);
+
     valstr = rb_str_new2(RTEST(critical) ? "critical," : "");
     rb_str_append(valstr, value);
+    StringValueCStr(valstr);
+
     GetX509ExtFactory(self, ctx);
-#ifdef HAVE_X509V3_EXT_NCONF_NID
+    obj = NewX509Ext(cX509Ext);
     rconf = rb_iv_get(self, "@config");
-    conf = NIL_P(rconf) ? NULL : GetConfigPtr(rconf);
+    conf = NIL_P(rconf) ? NULL : DupConfigPtr(rconf);
+    X509V3_set_nconf(ctx, conf);
     ext = X509V3_EXT_nconf_nid(conf, ctx, nid, RSTRING_PTR(valstr));
-#else
-    if (!empty_lhash) empty_lhash = lh_new(NULL, NULL);
-    ext = X509V3_EXT_conf_nid(empty_lhash, ctx, nid, RSTRING_PTR(valstr));
-#endif
+    X509V3_set_ctx_nodb(ctx);
+    NCONF_free(conf);
     if (!ext){
-	ossl_raise(eX509ExtError, "%s = %s",
-		   RSTRING_PTR(oid), RSTRING_PTR(value));
+	ossl_raise(eX509ExtError, "%"PRIsVALUE" = %"PRIsVALUE, oid, valstr);
     }
-    WrapX509Ext(cX509Ext, obj, ext);
+    SetX509Ext(obj, ext);
 
     return obj;
 }
@@ -262,25 +248,26 @@ ossl_x509ext_alloc(VALUE klass)
     X509_EXTENSION *ext;
     VALUE obj;
 
+    obj = NewX509Ext(klass);
     if(!(ext = X509_EXTENSION_new())){
 	ossl_raise(eX509ExtError, NULL);
     }
-    WrapX509Ext(klass, obj, ext);
+    SetX509Ext(obj, ext);
 
     return obj;
 }
 
 /*
  * call-seq:
- *    OpenSSL::X509::Extension.new asn1
- *    OpenSSL::X509::Extension.new name, value
- *    OpenSSL::X509::Extension.new name, value, critical
+ *    OpenSSL::X509::Extension.new(der)
+ *    OpenSSL::X509::Extension.new(oid, value)
+ *    OpenSSL::X509::Extension.new(oid, value, critical)
  *
  * Creates an X509 extension.
  *
- * The extension may be created from +asn1+ data or from an extension +name+
- * and +value+.  The +name+ may be either an OID or an extension name.  If
- * +critical+ is true the extension is marked critical.
+ * The extension may be created from _der_ data or from an extension _oid_
+ * and _value_.  The _oid_ may be either an OID or an extension name.  If
+ * _critical_ is +true+ the extension is marked critical.
  */
 static VALUE
 ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
@@ -308,18 +295,39 @@ 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);
+    GetX509Ext(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);
-    X509_EXTENSION_set_object(ext, obj);
+    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);
 
     return oid;
 }
@@ -329,25 +337,16 @@ 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);
-    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);
+    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");
     }
-    OPENSSL_free(s);
-    GetX509Ext(self, ext);
-    X509_EXTENSION_set_data(ext, asn1s);
 
     return data;
 }
@@ -397,7 +396,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))
-	M_ASN1_OCTET_STRING_print(out, ext->value);
+	ASN1_STRING_print(out, (ASN1_STRING *)X509_EXTENSION_get_data(ext));
     ret = ossl_membio2str(out);
 
     return ret;
@@ -436,8 +435,15 @@ ossl_x509ext_to_der(VALUE obj)
  * INIT
  */
 void
-Init_ossl_x509ext()
+Init_ossl_x509ext(void)
 {
+#undef rb_intern
+#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);
@@ -449,18 +455,18 @@ Init_ossl_x509ext()
     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, 0, Qfalse);
+    rb_attr(cX509ExtFactory, rb_intern("config"), 1, 1, 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_method(cX509Ext, "initialize_copy", ossl_x509ext_initialize_copy, 1);
     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 13e18eecf1..1ea8400dbb 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -1,31 +1,28 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define WrapX509Name(klass, obj, name) do { \
+#define NewX509Name(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_x509name_type, 0)
+#define SetX509Name(obj, name) do { \
     if (!(name)) { \
 	ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, X509_NAME_free, (name)); \
+    RTYPEDDATA_DATA(obj) = (name); \
 } while (0)
 #define GetX509Name(obj, name) do { \
-    Data_Get_Struct((obj), X509_NAME, (name)); \
+    TypedData_Get_Struct((obj), X509_NAME, &ossl_x509name_type, (name)); \
     if (!(name)) { \
 	ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \
     } \
 } while (0)
-#define SafeGetX509Name(obj, name) do { \
-    OSSL_Check_Kind((obj), cX509Name); \
-    GetX509Name((obj), (name)); \
-} while (0)
 
 #define OBJECT_TYPE_TEMPLATE \
   rb_const_get(cX509Name, rb_intern("OBJECT_TYPE_TEMPLATE"))
@@ -38,6 +35,20 @@
 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
  */
@@ -47,6 +58,7 @@ ossl_x509name_new(X509_NAME *name)
     X509_NAME *new;
     VALUE obj;
 
+    obj = NewX509Name(cX509Name);
     if (!name) {
 	new = X509_NAME_new();
     } else {
@@ -55,7 +67,7 @@ ossl_x509name_new(X509_NAME *name)
     if (!new) {
 	ossl_raise(eX509NameError, NULL);
     }
-    WrapX509Name(cX509Name, obj, new);
+    SetX509Name(obj, new);
 
     return obj;
 }
@@ -65,7 +77,7 @@ GetX509NamePtr(VALUE obj)
 {
     X509_NAME *name;
 
-    SafeGetX509Name(obj, name);
+    GetX509Name(obj, name);
 
     return name;
 }
@@ -79,10 +91,11 @@ ossl_x509name_alloc(VALUE klass)
     X509_NAME *name;
     VALUE obj;
 
+    obj = NewX509Name(klass);
     if (!(name = X509_NAME_new())) {
 	ossl_raise(eX509NameError, NULL);
     }
-    WrapX509Name(klass, obj, name);
+    SetX509Name(obj, name);
 
     return obj;
 }
@@ -92,7 +105,7 @@ static VALUE ossl_x509name_add_entry(int, VALUE*, VALUE);
 #define rb_aref(obj, key) rb_funcall((obj), id_aref, 1, (key))
 
 static VALUE
-ossl_x509name_init_i(VALUE i, VALUE args)
+ossl_x509name_init_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
     VALUE self = rb_ary_entry(args, 0);
     VALUE template = rb_ary_entry(args, 1);
@@ -111,10 +124,23 @@ ossl_x509name_init_i(VALUE i, VALUE args)
 
 /*
  * call-seq:
- *    X509::Name.new => name
- *    X509::Name.new(string) => name
- *    X509::Name.new(dn) => name
- *    X509::Name.new(dn, template) => name
+ *    X509::Name.new                               => name
+ *    X509::Name.new(der)                          => name
+ *    X509::Name.new(distinguished_name)           => name
+ *    X509::Name.new(distinguished_name, template) => name
+ *
+ * Creates a new Name.
+ *
+ * A name may be created from a DER encoded string _der_, an Array
+ * representing a _distinguished_name_ or a _distinguished_name_ along with a
+ * _template_.
+ *
+ *   name = OpenSSL::X509::Name.new [['CN', 'nobody'], ['DC', 'example']]
+ *
+ *   name = OpenSSL::X509::Name.new name.to_der
+ *
+ * See add_entry for a description of the _distinguished_name_ Array's
+ * contents
  */
 static VALUE
 ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
@@ -151,26 +177,71 @@ 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);
+    GetX509Name(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
+ *    name.add_entry(oid, value [, type], loc: -1, set: 0) => self
+ *
+ * Adds a new entry with the given _oid_ and _value_ to this name.  The _oid_
+ * is an object identifier defined in ASN.1.  Some common OIDs are:
+ *
+ * C::  Country Name
+ * CN:: Common Name
+ * DC:: Domain Component
+ * O::  Organization Name
+ * OU:: Organizational Unit Name
+ * ST:: State or Province Name
+ *
+ * The optional keyword parameters _loc_ and _set_ specify where to insert the
+ * new attribute. Refer to the manpage of X509_NAME_add_entry(3) for details.
+ * _loc_ defaults to -1 and _set_ defaults to 0. This appends a single-valued
+ * RDN to the end.
  */
 static
 VALUE ossl_x509name_add_entry(int argc, VALUE *argv, VALUE self)
 {
     X509_NAME *name;
-    VALUE oid, value, type;
-
-    rb_scan_args(argc, argv, "21", &oid, &value, &type);
-    StringValue(oid);
+    VALUE oid, value, type, opts, kwargs[2];
+    static ID kwargs_ids[2];
+    const char *oid_name;
+    int loc = -1, set = 0;
+
+    if (!kwargs_ids[0]) {
+	kwargs_ids[0] = rb_intern_const("loc");
+	kwargs_ids[1] = rb_intern_const("set");
+    }
+    rb_scan_args(argc, argv, "21:", &oid, &value, &type, &opts);
+    rb_get_kwargs(opts, kwargs_ids, 0, 2, kwargs);
+    oid_name = StringValueCStr(oid);
     StringValue(value);
     if(NIL_P(type)) type = rb_aref(OBJECT_TYPE_TEMPLATE, oid);
+    if (kwargs[0] != Qundef)
+	loc = NUM2INT(kwargs[0]);
+    if (kwargs[1] != Qundef)
+	set = NUM2INT(kwargs[1]);
     GetX509Name(self, name);
-    if (!X509_NAME_add_entry_by_txt(name, RSTRING_PTR(oid), NUM2INT(type),
-		(const unsigned char *)RSTRING_PTR(value), RSTRING_LENINT(value), -1, 0)) {
-	ossl_raise(eX509NameError, NULL);
-    }
-
+    if (!X509_NAME_add_entry_by_txt(name, oid_name, NUM2INT(type),
+				    (unsigned char *)RSTRING_PTR(value),
+				    RSTRING_LENINT(value), loc, set))
+	ossl_raise(eX509NameError, "X509_NAME_add_entry_by_txt");
     return self;
 }
 
@@ -179,58 +250,100 @@ ossl_x509name_to_s_old(VALUE self)
 {
     X509_NAME *name;
     char *buf;
-    VALUE str;
 
     GetX509Name(self, name);
     buf = X509_NAME_oneline(name, NULL, 0);
-    str = rb_str_new2(buf);
-    OPENSSL_free(buf);
-
-    return str;
+    if (!buf)
+	ossl_raise(eX509NameError, "X509_NAME_oneline");
+    return ossl_buf2str(buf, rb_long2int(strlen(buf)));
 }
 
-/*
- * call-seq:
- *    name.to_s => string
- *    name.to_s(integer) => string
- */
 static VALUE
-ossl_x509name_to_s(int argc, VALUE *argv, VALUE self)
+x509name_print(VALUE self, unsigned long iflag)
 {
     X509_NAME *name;
-    VALUE flag, str;
     BIO *out;
-    unsigned long iflag;
+    int ret;
 
-    rb_scan_args(argc, argv, "01", &flag);
-    if (NIL_P(flag))
-	return ossl_x509name_to_s_old(self);
-    else iflag = NUM2ULONG(flag);
-    if (!(out = BIO_new(BIO_s_mem())))
-	ossl_raise(eX509NameError, NULL);
     GetX509Name(self, name);
-    if (!X509_NAME_print_ex(out, name, 0, iflag)){
-	BIO_free(out);
+    out = BIO_new(BIO_s_mem());
+    if (!out)
 	ossl_raise(eX509NameError, NULL);
+    ret = X509_NAME_print_ex(out, name, 0, iflag);
+    if (ret < 0 || (iflag == XN_FLAG_COMPAT && ret == 0)) {
+	BIO_free(out);
+	ossl_raise(eX509NameError, "X509_NAME_print_ex");
     }
-    str = ossl_membio2str(out);
+    return ossl_membio2str(out);
+}
+
+/*
+ * call-seq:
+ *    name.to_s         -> string
+ *    name.to_s(format) -> string
+ *
+ * Returns a String representation of the Distinguished Name. _format_ is
+ * one of:
+ *
+ * * OpenSSL::X509::Name::COMPAT
+ * * OpenSSL::X509::Name::RFC2253
+ * * OpenSSL::X509::Name::ONELINE
+ * * OpenSSL::X509::Name::MULTILINE
+ *
+ * If _format_ is omitted, the largely broken and traditional OpenSSL format
+ * is used.
+ */
+static VALUE
+ossl_x509name_to_s(int argc, VALUE *argv, VALUE self)
+{
+    rb_check_arity(argc, 0, 1);
+    /* name.to_s(nil) was allowed */
+    if (!argc || NIL_P(argv[0]))
+	return ossl_x509name_to_s_old(self);
+    else
+	return x509name_print(self, NUM2ULONG(argv[0]));
+}
 
+/*
+ * call-seq:
+ *    name.to_utf8 -> string
+ *
+ * Returns an UTF-8 representation of the distinguished name, as specified
+ * in {RFC 2253}[https://www.ietf.org/rfc/rfc2253.txt].
+ */
+static VALUE
+ossl_x509name_to_utf8(VALUE self)
+{
+    VALUE str = x509name_print(self, XN_FLAG_RFC2253 & ~ASN1_STRFLGS_ESC_MSB);
+    rb_enc_associate_index(str, rb_utf8_encindex());
     return str;
 }
 
+/* :nodoc: */
+static VALUE
+ossl_x509name_inspect(VALUE self)
+{
+    return rb_enc_sprintf(rb_utf8_encoding(), "#<%"PRIsVALUE" %"PRIsVALUE">",
+			  rb_obj_class(self), ossl_x509name_to_utf8(self));
+}
+
 /*
  * call-seq:
  *    name.to_a => [[name, data, type], ...]
+ *
+ * Returns an Array representation of the distinguished name suitable for
+ * passing to ::new
  */
 static VALUE
 ossl_x509name_to_a(VALUE self)
 {
     X509_NAME *name;
     X509_NAME_ENTRY *entry;
-    int i,entries;
+    int i,entries,nid;
     char long_name[512];
     const char *short_name;
-    VALUE ary, ret;
+    VALUE ary, vname, ret;
+    ASN1_STRING *value;
 
     GetX509Name(self, name);
     entries = X509_NAME_entry_count(name);
@@ -243,13 +356,19 @@ 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), entry->object)) {
+	if (!i2t_ASN1_OBJECT(long_name, sizeof(long_name),
+			     X509_NAME_ENTRY_get_object(entry))) {
 	    ossl_raise(eX509NameError, NULL);
 	}
-	short_name = OBJ_nid2sn(OBJ_ln2nid(long_name));
-	ary = rb_ary_new3(3, rb_str_new2(short_name),
-        		  rb_str_new((const char *)entry->value->data, entry->value->length),
-        		  INT2FIX(entry->value->type));
+	nid = OBJ_ln2nid(long_name);
+	if (nid == NID_undef) {
+	    vname = rb_str_new2((const char *) &long_name);
+	} else {
+	    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));
 	rb_ary_push(ret, ary);
     }
     return ret;
@@ -261,18 +380,18 @@ ossl_x509name_cmp0(VALUE self, VALUE other)
     X509_NAME *name1, *name2;
 
     GetX509Name(self, name1);
-    SafeGetX509Name(other, name2);
+    GetX509Name(other, name2);
 
     return X509_NAME_cmp(name1, name2);
 }
 
 /*
  * call-seq:
- *    name.cmp other => integer
- *    name.<=> other => integer
+ *    name.cmp(other) -> -1 | 0 | 1
+ *    name <=> other  -> -1 | 0 | 1
  *
- * Compares this Name with +other+ and returns 0 if they are the same and -1 or
- * +1 if they are greater or less than each other respectively.
+ * Compares this Name with _other_ and returns +0+ if they are the same and +-1+
+ * or ++1+ if they are greater or less than each other respectively.
  */
 static VALUE
 ossl_x509name_cmp(VALUE self, VALUE other)
@@ -281,20 +400,24 @@ ossl_x509name_cmp(VALUE self, VALUE other)
 
     result = ossl_x509name_cmp0(self, other);
     if (result < 0) return INT2FIX(-1);
-    if (result > 1) return INT2FIX(1);
+    if (result > 0) return INT2FIX(1);
 
     return INT2FIX(0);
 }
 
+/*
+ * call-seq:
+ *   name.eql?(other) -> true | false
+ *
+ * Returns true if _name_ and _other_ refer to the same hash key.
+ */
 static VALUE
 ossl_x509name_eql(VALUE self, VALUE other)
 {
-    int result;
-
-    if(CLASS_OF(other) != cX509Name) return Qfalse;
-    result = ossl_x509name_cmp0(self, other);
+    if (!rb_obj_is_kind_of(other, cX509Name))
+	return Qfalse;
 
-    return (result == 0) ? Qtrue : Qfalse;
+    return ossl_x509name_cmp0(self, other) == 0 ? Qtrue : Qfalse;
 }
 
 /*
@@ -317,12 +440,11 @@ ossl_x509name_hash(VALUE self)
     return ULONG2NUM(hash);
 }
 
-#ifdef HAVE_X509_NAME_HASH_OLD
 /*
  * call-seq:
  *    name.hash_old => integer
  *
- * hash_old returns MD5 based hash used in OpenSSL 0.9.X.
+ * Returns an MD5 based hash used in OpenSSL 0.9.X.
  */
 static VALUE
 ossl_x509name_hash_old(VALUE self)
@@ -336,11 +458,12 @@ ossl_x509name_hash_old(VALUE self)
 
     return ULONG2NUM(hash);
 }
-#endif
 
 /*
  * call-seq:
  *    name.to_der => string
+ *
+ * Converts the name to DER encoding
  */
 static VALUE
 ossl_x509name_to_der(VALUE self)
@@ -363,13 +486,31 @@ ossl_x509name_to_der(VALUE self)
 }
 
 /*
- * INIT
+ * Document-class: OpenSSL::X509::Name
+ *
+ * An X.509 name represents a hostname, email address or other entity
+ * associated with a public key.
+ *
+ * You can create a Name by parsing a distinguished name String or by
+ * supplying the distinguished name as an Array.
+ *
+ *   name = OpenSSL::X509::Name.parse 'CN=nobody/DC=example'
+ *
+ *   name = OpenSSL::X509::Name.new [['CN', 'nobody'], ['DC', 'example']]
  */
+
 void
-Init_ossl_x509name()
+Init_ossl_x509name(void)
 {
+#undef rb_intern
     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);
@@ -378,24 +519,29 @@ Init_ossl_x509name()
 
     rb_define_alloc_func(cX509Name, ossl_x509name_alloc);
     rb_define_method(cX509Name, "initialize", ossl_x509name_initialize, -1);
+    rb_define_method(cX509Name, "initialize_copy", ossl_x509name_initialize_copy, 1);
     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_utf8", ossl_x509name_to_utf8, 0);
+    rb_define_method(cX509Name, "inspect", ossl_x509name_inspect, 0);
     rb_define_method(cX509Name, "to_a", ossl_x509name_to_a, 0);
     rb_define_method(cX509Name, "cmp", ossl_x509name_cmp, 1);
     rb_define_alias(cX509Name, "<=>", "cmp");
     rb_define_method(cX509Name, "eql?", ossl_x509name_eql, 1);
     rb_define_method(cX509Name, "hash", ossl_x509name_hash, 0);
-#ifdef HAVE_X509_NAME_HASH_OLD
     rb_define_method(cX509Name, "hash_old", ossl_x509name_hash_old, 0);
-#endif
     rb_define_method(cX509Name, "to_der", ossl_x509name_to_der, 0);
 
     utf8str = INT2NUM(V_ASN1_UTF8STRING);
     ptrstr = INT2NUM(V_ASN1_PRINTABLESTRING);
     ia5str = INT2NUM(V_ASN1_IA5STRING);
+
+    /*
+     * The default object type for name entries.
+     */
     rb_define_const(cX509Name, "DEFAULT_OBJECT_TYPE", utf8str);
     hash = rb_hash_new();
-    RHASH(hash)->ifnone = utf8str;
+    RHASH_SET_IFNONE(hash, utf8str);
     rb_hash_aset(hash, rb_str_new2("C"), ptrstr);
     rb_hash_aset(hash, rb_str_new2("countryName"), ptrstr);
     rb_hash_aset(hash, rb_str_new2("serialNumber"), ptrstr);
@@ -403,10 +549,38 @@ Init_ossl_x509name()
     rb_hash_aset(hash, rb_str_new2("DC"), ia5str);
     rb_hash_aset(hash, rb_str_new2("domainComponent"), ia5str);
     rb_hash_aset(hash, rb_str_new2("emailAddress"), ia5str);
+
+    /*
+     * The default object type template for name entries.
+     */
     rb_define_const(cX509Name, "OBJECT_TYPE_TEMPLATE", hash);
 
+    /*
+     * A flag for #to_s.
+     *
+     * Breaks the name returned into multiple lines if longer than 80
+     * characters.
+     */
     rb_define_const(cX509Name, "COMPAT", ULONG2NUM(XN_FLAG_COMPAT));
+
+    /*
+     * A flag for #to_s.
+     *
+     * Returns an RFC2253 format name.
+     */
     rb_define_const(cX509Name, "RFC2253", ULONG2NUM(XN_FLAG_RFC2253));
+
+    /*
+     * A flag for #to_s.
+     *
+     * Returns a more readable format than RFC2253.
+     */
     rb_define_const(cX509Name, "ONELINE", ULONG2NUM(XN_FLAG_ONELINE));
+
+    /*
+     * A flag for #to_s.
+     *
+     * Returns a multiline format.
+     */
     rb_define_const(cX509Name, "MULTILINE", ULONG2NUM(XN_FLAG_MULTILINE));
 }
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
index 5927f76d44..2c20042a92 100644
--- a/ext/openssl/ossl_x509req.c
+++ b/ext/openssl/ossl_x509req.c
@@ -1,31 +1,28 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define WrapX509Req(klass, obj, req) do { \
+#define NewX509Req(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_x509req_type, 0)
+#define SetX509Req(obj, req) do { \
     if (!(req)) { \
 	ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, X509_REQ_free, (req)); \
+    RTYPEDDATA_DATA(obj) = (req); \
 } while (0)
 #define GetX509Req(obj, req) do { \
-    Data_Get_Struct((obj), X509_REQ, (req)); \
+    TypedData_Get_Struct((obj), X509_REQ, &ossl_x509req_type, (req)); \
     if (!(req)) { \
 	ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509Req(obj, req) do { \
-    OSSL_Check_Kind((obj), cX509Req); \
-    GetX509Req((obj), (req)); \
-} while (0)
 
 /*
  * Classes
@@ -33,51 +30,33 @@
 VALUE cX509Req;
 VALUE eX509ReqError;
 
-/*
- * Public functions
- */
-VALUE
-ossl_x509req_new(X509_REQ *req)
+static void
+ossl_x509req_free(void *ptr)
 {
-    X509_REQ *new;
-    VALUE obj;
-
-    if (!req) {
-	new = X509_REQ_new();
-    } else {
-	new = X509_REQ_dup(req);
-    }
-    if (!new) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-    WrapX509Req(cX509Req, obj, new);
-
-    return obj;
+    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
+ */
 X509_REQ *
 GetX509ReqPtr(VALUE obj)
 {
     X509_REQ *req;
 
-    SafeGetX509Req(obj, req);
+    GetX509Req(obj, req);
 
     return req;
 }
 
-X509_REQ *
-DupX509ReqPtr(VALUE obj)
-{
-    X509_REQ *req, *new;
-
-    SafeGetX509Req(obj, req);
-    if (!(new = X509_REQ_dup(req))) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-
-    return new;
-}
-
 /*
  * Private functions
  */
@@ -87,10 +66,11 @@ ossl_x509req_alloc(VALUE klass)
     X509_REQ *req;
     VALUE obj;
 
+    obj = NewX509Req(klass);
     if (!(req = X509_REQ_new())) {
 	ossl_raise(eX509ReqError, NULL);
     }
-    WrapX509Req(klass, obj, req);
+    SetX509Req(obj, req);
 
     return obj;
 }
@@ -106,7 +86,7 @@ ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
     }
     arg = ossl_to_der_if_possible(arg);
-    in = ossl_obj2bio(arg);
+    in = ossl_obj2bio(&arg);
     req = PEM_read_bio_X509_REQ(in, &x, NULL, NULL);
     DATA_PTR(self) = x;
     if (!req) {
@@ -128,7 +108,7 @@ ossl_x509req_copy(VALUE self, VALUE other)
     rb_check_frozen(self);
     if (self == other) return self;
     GetX509Req(self, a);
-    SafeGetX509Req(other, b);
+    GetX509Req(other, b);
     if (!(req = X509_REQ_dup(b))) {
 	ossl_raise(eX509ReqError, NULL);
     }
@@ -143,8 +123,6 @@ 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()))) {
@@ -154,11 +132,8 @@ 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 str;
+    return ossl_membio2str(out);
 }
 
 static VALUE
@@ -186,8 +161,6 @@ 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()))) {
@@ -197,11 +170,8 @@ 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 str;
+    return ossl_membio2str(out);
 }
 
 #if 0
@@ -233,7 +203,7 @@ ossl_x509req_get_version(VALUE self)
     GetX509Req(self, req);
     version = X509_REQ_get_version(req);
 
-    return LONG2FIX(version);
+    return LONG2NUM(version);
 }
 
 static VALUE
@@ -242,12 +212,12 @@ ossl_x509req_set_version(VALUE self, VALUE version)
     X509_REQ *req;
     long ver;
 
-    if ((ver = FIX2LONG(version)) < 0) {
+    if ((ver = NUM2LONG(version)) < 0) {
 	ossl_raise(eX509ReqError, "version must be >= 0!");
     }
     GetX509Req(self, req);
     if (!X509_REQ_set_version(req, ver)) {
-	ossl_raise(eX509ReqError, NULL);
+	ossl_raise(eX509ReqError, "X509_REQ_set_version");
     }
 
     return version;
@@ -285,23 +255,21 @@ 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);
     }
-    if (!i2a_ASN1_OBJECT(out, req->sig_alg->algorithm)) {
+    X509_REQ_get0_signature(req, NULL, &alg);
+    if (!i2a_ASN1_OBJECT(out, alg->algorithm)) {
 	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 str;
+
+    return ossl_membio2str(out);
 }
 
 static VALUE
@@ -325,11 +293,10 @@ ossl_x509req_set_public_key(VALUE self, VALUE key)
     EVP_PKEY *pkey;
 
     GetX509Req(self, req);
-    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
-    if (!X509_REQ_set_pubkey(req, pkey)) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
+    if (!X509_REQ_set_pubkey(req, pkey))
+	ossl_raise(eX509ReqError, "X509_REQ_set_pubkey");
     return key;
 }
 
@@ -342,7 +309,7 @@ ossl_x509req_sign(VALUE self, VALUE key, VALUE digest)
 
     GetX509Req(self, req);
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
+    md = ossl_evp_get_digestbyname(digest);
     if (!X509_REQ_sign(req, pkey, md)) {
 	ossl_raise(eX509ReqError, NULL);
     }
@@ -358,18 +325,19 @@ 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 */
-    if ((i = X509_REQ_verify(req, pkey)) < 0) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-    if (i > 0) {
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
+    switch (X509_REQ_verify(req, pkey)) {
+      case 1:
 	return Qtrue;
+      case 0:
+	ossl_clear_error();
+	return Qfalse;
+      default:
+	ossl_raise(eX509ReqError, NULL);
     }
-
-    return Qfalse;
 }
 
 static VALUE
@@ -401,19 +369,19 @@ ossl_x509req_set_attributes(VALUE self, VALUE ary)
 {
     X509_REQ *req;
     X509_ATTRIBUTE *attr;
-    int i;
+    long i;
     VALUE item;
 
     Check_Type(ary, T_ARRAY);
     for (i=0;i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Attr);
+	OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Attr);
     }
     GetX509Req(self, req);
-    sk_X509_ATTRIBUTE_pop_free(req->req_info->attributes, X509_ATTRIBUTE_free);
-    req->req_info->attributes = NULL;
+    while ((attr = X509_REQ_delete_attr(req, 0)))
+	X509_ATTRIBUTE_free(attr);
     for (i=0;i<RARRAY_LEN(ary); i++) {
-	item = RARRAY_PTR(ary)[i];
-	attr = DupX509AttrPtr(item);
+	item = RARRAY_AREF(ary, i);
+	attr = GetX509AttrPtr(item);
 	if (!X509_REQ_add1_attr(req, attr)) {
 	    ossl_raise(eX509ReqError, NULL);
 	}
@@ -427,7 +395,7 @@ ossl_x509req_add_attribute(VALUE self, VALUE attr)
     X509_REQ *req;
 
     GetX509Req(self, req);
-    if (!X509_REQ_add1_attr(req, DupX509AttrPtr(attr))) {
+    if (!X509_REQ_add1_attr(req, GetX509AttrPtr(attr))) {
 	ossl_raise(eX509ReqError, NULL);
     }
 
@@ -438,15 +406,21 @@ ossl_x509req_add_attribute(VALUE self, VALUE attr)
  * X509_REQUEST init
  */
 void
-Init_ossl_x509req()
+Init_ossl_x509req(void)
 {
+#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);
 
     rb_define_alloc_func(cX509Req, ossl_x509req_alloc);
     rb_define_method(cX509Req, "initialize", ossl_x509req_initialize, -1);
-    rb_define_copy_func(cX509Req, ossl_x509req_copy);
+    rb_define_method(cX509Req, "initialize_copy", ossl_x509req_copy, 1);
 
     rb_define_method(cX509Req, "to_pem", ossl_x509req_to_pem, 0);
     rb_define_method(cX509Req, "to_der", ossl_x509req_to_der, 0);
@@ -465,4 +439,3 @@ Init_ossl_x509req()
     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 320abaa7ae..5fe6853430 100644
--- a/ext/openssl/ossl_x509revoked.c
+++ b/ext/openssl/ossl_x509revoked.c
@@ -1,31 +1,28 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define WrapX509Rev(klass, obj, rev) do { \
+#define NewX509Rev(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_x509rev_type, 0)
+#define SetX509Rev(obj, rev) do { \
     if (!(rev)) { \
 	ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, X509_REVOKED_free, (rev)); \
+    RTYPEDDATA_DATA(obj) = (rev); \
 } while (0)
 #define GetX509Rev(obj, rev) do { \
-    Data_Get_Struct((obj), X509_REVOKED, (rev)); \
+    TypedData_Get_Struct((obj), X509_REVOKED, &ossl_x509rev_type, (rev)); \
     if (!(rev)) { \
 	ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509Rev(obj, rev) do { \
-    OSSL_Check_Kind((obj), cX509Rev); \
-    GetX509Rev((obj), (rev)); \
-} while (0)
 
 /*
  * Classes
@@ -33,6 +30,20 @@
 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
  */
@@ -42,6 +53,7 @@ ossl_x509revoked_new(X509_REVOKED *rev)
     X509_REVOKED *new;
     VALUE obj;
 
+    obj = NewX509Rev(cX509Rev);
     if (!rev) {
 	new = X509_REVOKED_new();
     } else {
@@ -50,7 +62,7 @@ ossl_x509revoked_new(X509_REVOKED *rev)
     if (!new) {
 	ossl_raise(eX509RevError, NULL);
     }
-    WrapX509Rev(cX509Rev, obj, new);
+    SetX509Rev(obj, new);
 
     return obj;
 }
@@ -60,7 +72,7 @@ DupX509RevokedPtr(VALUE obj)
 {
     X509_REVOKED *rev, *new;
 
-    SafeGetX509Rev(obj, rev);
+    GetX509Rev(obj, rev);
     if (!(new = X509_REVOKED_dup(rev))) {
 	ossl_raise(eX509RevError, NULL);
     }
@@ -77,10 +89,11 @@ ossl_x509revoked_alloc(VALUE klass)
     X509_REVOKED *rev;
     VALUE obj;
 
+    obj = NewX509Rev(klass);
     if (!(rev = X509_REVOKED_new())) {
 	ossl_raise(eX509RevError, NULL);
     }
-    WrapX509Rev(klass, obj, rev);
+    SetX509Rev(obj, rev);
 
     return obj;
 }
@@ -93,22 +106,47 @@ 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);
+    GetX509Rev(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(rev->serialNumber);
+    return asn1integer_to_num(X509_REVOKED_get0_serialNumber(rev));
 }
 
 static VALUE
 ossl_x509revoked_set_serial(VALUE self, VALUE num)
 {
     X509_REVOKED *rev;
+    ASN1_INTEGER *asn1int;
 
     GetX509Rev(self, rev);
-    rev->serialNumber = num_to_asn1integer(num, rev->serialNumber);
+    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);
 
     return num;
 }
@@ -117,23 +155,29 @@ static VALUE
 ossl_x509revoked_get_time(VALUE self)
 {
     X509_REVOKED *rev;
+    const ASN1_TIME *time;
 
     GetX509Rev(self, rev);
+    time = X509_REVOKED_get0_revocationDate(rev);
+    if (!time)
+	return Qnil;
 
-    return asn1time_to_time(rev->revocationDate);
+    return asn1time_to_time(time);
 }
 
 static VALUE
 ossl_x509revoked_set_time(VALUE self, VALUE time)
 {
     X509_REVOKED *rev;
-    time_t sec;
+    ASN1_TIME *asn1time;
 
-    sec = time_to_time_t(time);
     GetX509Rev(self, rev);
-    if (!X509_time_adj(rev->revocationDate, 0, &sec)) {
-	ossl_raise(eX509RevError, NULL);
+    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");
     }
+    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -171,19 +215,19 @@ ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
 {
     X509_REVOKED *rev;
     X509_EXTENSION *ext;
-    int i;
+    long i;
     VALUE item;
 
     Check_Type(ary, T_ARRAY);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
+	OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Ext);
     }
     GetX509Rev(self, rev);
-    sk_X509_EXTENSION_pop_free(rev->extensions, X509_EXTENSION_free);
-    rev->extensions = NULL;
+    while ((ext = X509_REVOKED_delete_ext(rev, 0)))
+	X509_EXTENSION_free(ext);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	item = RARRAY_PTR(ary)[i];
-	ext = DupX509ExtPtr(item);
+	item = RARRAY_AREF(ary, i);
+	ext = GetX509ExtPtr(item);
 	if(!X509_REVOKED_add_ext(rev, ext, -1)) {
 	    ossl_raise(eX509RevError, NULL);
 	}
@@ -198,25 +242,52 @@ ossl_x509revoked_add_extension(VALUE self, VALUE ext)
     X509_REVOKED *rev;
 
     GetX509Rev(self, rev);
-    if(!X509_REVOKED_add_ext(rev, DupX509ExtPtr(ext), -1)) {
+    if (!X509_REVOKED_add_ext(rev, GetX509ExtPtr(ext), -1)) {
 	ossl_raise(eX509RevError, NULL);
     }
 
     return ext;
 }
 
+static VALUE
+ossl_x509revoked_to_der(VALUE self)
+{
+    X509_REVOKED *rev;
+    VALUE str;
+    int len;
+    unsigned char *p;
+
+    GetX509Rev(self, rev);
+    len = i2d_X509_REVOKED(rev, NULL);
+    if (len <= 0)
+	ossl_raise(eX509RevError, "i2d_X509_REVOKED");
+    str = rb_str_new(NULL, len);
+    p = (unsigned char *)RSTRING_PTR(str);
+    if (i2d_X509_REVOKED(rev, &p) <= 0)
+	ossl_raise(eX509RevError, "i2d_X509_REVOKED");
+    ossl_str_adjust(str, p);
+    return str;
+}
+
 /*
  * INIT
  */
 void
-Init_ossl_x509revoked()
+Init_ossl_x509revoked(void)
 {
+#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_method(cX509Rev, "initialize_copy", ossl_x509revoked_initialize_copy, 1);
 
     rb_define_method(cX509Rev, "serial", ossl_x509revoked_get_serial, 0);
     rb_define_method(cX509Rev, "serial=", ossl_x509revoked_set_serial, 1);
@@ -225,5 +296,5 @@ Init_ossl_x509revoked()
     rb_define_method(cX509Rev, "extensions", ossl_x509revoked_get_extensions, 0);
     rb_define_method(cX509Rev, "extensions=", ossl_x509revoked_set_extensions, 1);
     rb_define_method(cX509Rev, "add_extension", ossl_x509revoked_add_extension, 1);
+    rb_define_method(cX509Rev, "to_der", ossl_x509revoked_to_der, 0);
 }
-
diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
index 5d341c5192..61543d44f6 100644
--- a/ext/openssl/ossl_x509store.c
+++ b/ext/openssl/ossl_x509store.c
@@ -1,48 +1,102 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define WrapX509Store(klass, obj, st) do { \
+#define NewX509Store(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_x509store_type, 0)
+#define SetX509Store(obj, st) do { \
     if (!(st)) { \
 	ossl_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, X509_STORE_free, (st)); \
+    RTYPEDDATA_DATA(obj) = (st); \
 } while (0)
 #define GetX509Store(obj, st) do { \
-    Data_Get_Struct((obj), X509_STORE, (st)); \
+    TypedData_Get_Struct((obj), X509_STORE, &ossl_x509store_type, (st)); \
     if (!(st)) { \
 	ossl_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509Store(obj, st) do { \
-    OSSL_Check_Kind((obj), cX509Store); \
-    GetX509Store((obj), (st)); \
-} while (0)
 
-#define WrapX509StCtx(klass, obj, ctx) do { \
+#define NewX509StCtx(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_x509stctx_type, 0)
+#define SetX509StCtx(obj, ctx) do { \
     if (!(ctx)) { \
 	ossl_raise(rb_eRuntimeError, "STORE_CTX wasn't initialized!"); \
     } \
-    (obj) = Data_Wrap_Struct((klass), 0, ossl_x509stctx_free, (ctx)); \
+    RTYPEDDATA_DATA(obj) = (ctx); \
 } while (0)
 #define GetX509StCtx(obj, ctx) do { \
-    Data_Get_Struct((obj), X509_STORE_CTX, (ctx)); \
+    TypedData_Get_Struct((obj), X509_STORE_CTX, &ossl_x509stctx_type, (ctx)); \
     if (!(ctx)) { \
 	ossl_raise(rb_eRuntimeError, "STORE_CTX is out of scope!"); \
     } \
 } while (0)
-#define SafeGetX509StCtx(obj, storep) do { \
-    OSSL_Check_Kind((obj), cX509StoreContext); \
-    GetX509Store((obj), (ctx)); \
-} 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
@@ -51,53 +105,62 @@ VALUE cX509Store;
 VALUE cX509StoreContext;
 VALUE eX509StoreError;
 
-/*
- * Public functions
- */
-VALUE
-ossl_x509store_new(X509_STORE *store)
+static void
+ossl_x509store_free(void *ptr)
 {
-    VALUE obj;
-
-    WrapX509Store(cX509Store, obj, store);
-
-    return obj;
+    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
+ */
 X509_STORE *
 GetX509StorePtr(VALUE obj)
 {
     X509_STORE *store;
 
-    SafeGetX509Store(obj, store);
+    GetX509Store(obj, store);
 
     return store;
 }
 
-X509_STORE *
-DupX509StorePtr(VALUE obj)
+/*
+ * Private functions
+ */
+static int
+x509store_verify_cb(int ok, X509_STORE_CTX *ctx)
 {
-    X509_STORE *store;
+    VALUE proc;
 
-    SafeGetX509Store(obj, store);
-    CRYPTO_add(&store->references, 1, CRYPTO_LOCK_X509_STORE);
+    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 store;
+    return ossl_verify_cb_call(proc, ok, ctx);
 }
 
-/*
- * Private functions
- */
 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);
     }
-    WrapX509Store(klass, obj, store);
+    SetX509Store(obj, store);
 
     return obj;
 }
@@ -111,7 +174,7 @@ ossl_x509store_set_vfy_cb(VALUE self, VALUE cb)
     X509_STORE *store;
 
     GetX509Store(self, store);
-    X509_STORE_set_ex_data(store, ossl_verify_cb_idx, (void*)cb);
+    X509_STORE_set_ex_data(store, store_ex_verify_cb_idx, (void *)cb);
     rb_iv_set(self, "@verify_callback", cb);
 
     return cb;
@@ -122,6 +185,7 @@ 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)
@@ -130,15 +194,12 @@ 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;
-    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", INT2NUM(0));
-    rb_iv_set(self, "@purpose", INT2NUM(0));
-    rb_iv_set(self, "@trust", INT2NUM(0));
 #endif
+    X509_STORE_set_verify_cb(store, x509store_verify_cb);
+    ossl_x509store_set_vfy_cb(self, Qnil);
 
     /* last verification status */
     rb_iv_set(self, "@error", Qnil);
@@ -149,54 +210,77 @@ ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/*
+ * call-seq:
+ *   store.flags = flags
+ *
+ * Sets _flags_ to the Store. _flags_ 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)
 {
@@ -204,6 +288,14 @@ ossl_x509store_set_time(VALUE self, VALUE time)
     return time;
 }
 
+/*
+ * call-seq:
+ *   store.add_file(file) -> self
+ *
+ * Adds the certificates in _file_ to the certificate store. _file_ is the path
+ * to the file, and the file contains one or more certificates in PEM format
+ * concatenated together.
+ */
 static VALUE
 ossl_x509store_add_file(VALUE self, VALUE file)
 {
@@ -212,8 +304,7 @@ ossl_x509store_add_file(VALUE self, VALUE file)
     char *path = NULL;
 
     if(file != Qnil){
-        SafeStringValue(file);
-	path = RSTRING_PTR(file);
+	path = StringValueCStr(file);
     }
     GetX509Store(self, store);
     lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
@@ -221,10 +312,25 @@ ossl_x509store_add_file(VALUE self, VALUE file)
     if(X509_LOOKUP_load_file(lookup, path, X509_FILETYPE_PEM) != 1){
         ossl_raise(eX509StoreError, NULL);
     }
+#if OPENSSL_VERSION_NUMBER < 0x10101000 || defined(LIBRESSL_VERSION_NUMBER)
+    /*
+     * X509_load_cert_crl_file() which is called from X509_LOOKUP_load_file()
+     * did not check the return value of X509_STORE_add_{cert,crl}(), leaking
+     * "cert already in hash table" errors on the error queue, if duplicate
+     * certificates are found. This will be fixed by OpenSSL 1.1.1.
+     */
+    ossl_clear_error();
+#endif
 
     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)
 {
@@ -233,8 +339,7 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
     char *path = NULL;
 
     if(dir != Qnil){
-        SafeStringValue(dir);
-	path = RSTRING_PTR(dir);
+	path = StringValueCStr(dir);
     }
     GetX509Store(self, store);
     lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
@@ -246,6 +351,17 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
     return self;
 }
 
+/*
+ * 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
+ * determined by:
+ *
+ * * OpenSSL::X509::DEFAULT_CERT_FILE
+ * * OpenSSL::X509::DEFAULT_CERT_DIR
+ */
 static VALUE
 ossl_x509store_set_default_paths(VALUE self)
 {
@@ -259,6 +375,12 @@ ossl_x509store_set_default_paths(VALUE self)
     return Qnil;
 }
 
+/*
+ * call-seq:
+ *   store.add_cert(cert)
+ *
+ * Adds the OpenSSL::X509::Certificate _cert_ to the certificate store.
+ */
 static VALUE
 ossl_x509store_add_cert(VALUE self, VALUE arg)
 {
@@ -274,6 +396,12 @@ 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)
 {
@@ -293,6 +421,21 @@ 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 resulting complete certificate chain can be
+ * retrieved by #chain.
+ */
 static VALUE
 ossl_x509store_verify(int argc, VALUE *argv, VALUE self)
 {
@@ -316,37 +459,28 @@ ossl_x509store_verify(int argc, VALUE *argv, VALUE self)
 /*
  * Public Functions
  */
-static void ossl_x509stctx_free(X509_STORE_CTX*);
+static void ossl_x509stctx_free(void*);
 
-VALUE
-ossl_x509stctx_new(X509_STORE_CTX *ctx)
-{
-    VALUE obj;
-
-    WrapX509StCtx(cX509StoreContext, obj, ctx);
-
-    return obj;
-}
 
-VALUE
-ossl_x509stctx_clear_ptr(VALUE obj)
-{
-    OSSL_Check_Kind(obj, cX509StoreContext);
-    RDATA(obj)->data = NULL;
-
-    return obj;
-}
+static const rb_data_type_t ossl_x509stctx_type = {
+    "OpenSSL/X509/STORE_CTX",
+    {
+	0, ossl_x509stctx_free,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
+};
 
 /*
  * Private functions
  */
 static void
-ossl_x509stctx_free(X509_STORE_CTX *ctx)
+ossl_x509stctx_free(void *ptr)
 {
-    if(ctx->untrusted)
-	sk_X509_pop_free(ctx->untrusted, X509_free);
-    if(ctx->cert)
-	X509_free(ctx->cert);
+    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));
     X509_STORE_CTX_free(ctx);
 }
 
@@ -356,10 +490,22 @@ 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);
     }
-    WrapX509StCtx(klass, obj, ctx);
+    SetX509StCtx(obj, ctx);
+
+    return obj;
+}
+
+static VALUE
+ossl_x509stctx_new(X509_STORE_CTX *ctx)
+{
+    VALUE obj;
+
+    obj = NewX509StCtx(cX509StoreContext);
+    SetX509StCtx(obj, ctx);
 
     return obj;
 }
@@ -369,6 +515,10 @@ 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)
 {
@@ -380,20 +530,13 @@ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "12", &store, &cert, &chain);
     GetX509StCtx(self, ctx);
-    SafeGetX509Store(store, x509st);
+    GetX509Store(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"));
@@ -402,20 +545,34 @@ 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, ossl_verify_cb_idx,
-                               (void*)rb_iv_get(self, "@verify_callback"));
-    result = X509_verify_cert(ctx);
-
-    return result ? Qtrue : Qfalse;
+    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);
+    }
 }
 
+/*
+ * call-seq:
+ *   stctx.chain -> Array of X509::Certificate
+ */
 static VALUE
 ossl_x509stctx_get_chain(VALUE self)
 {
@@ -426,7 +583,7 @@ ossl_x509stctx_get_chain(VALUE self)
     VALUE ary;
 
     GetX509StCtx(self, ctx);
-    if((chain = X509_STORE_CTX_get_chain(ctx)) == NULL){
+    if((chain = X509_STORE_CTX_get0_chain(ctx)) == NULL){
         return Qnil;
     }
     if((num = sk_X509_num(chain)) < 0){
@@ -442,6 +599,10 @@ ossl_x509stctx_get_chain(VALUE self)
     return ary;
 }
 
+/*
+ * call-seq:
+ *   stctx.error -> Integer
+ */
 static VALUE
 ossl_x509stctx_get_err(VALUE self)
 {
@@ -449,9 +610,13 @@ ossl_x509stctx_get_err(VALUE self)
 
     GetX509StCtx(self, ctx);
 
-    return INT2FIX(X509_STORE_CTX_get_error(ctx));
+    return INT2NUM(X509_STORE_CTX_get_error(ctx));
 }
 
+/*
+ * call-seq:
+ *   stctx.error = error_code
+ */
 static VALUE
 ossl_x509stctx_set_error(VALUE self, VALUE err)
 {
@@ -463,6 +628,12 @@ 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)
 {
@@ -475,6 +646,10 @@ 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)
 {
@@ -482,9 +657,13 @@ ossl_x509stctx_get_err_depth(VALUE self)
 
     GetX509StCtx(self, ctx);
 
-    return INT2FIX(X509_STORE_CTX_get_error_depth(ctx));
+    return INT2NUM(X509_STORE_CTX_get_error_depth(ctx));
 }
 
+/*
+ * call-seq:
+ *   stctx.current_cert -> X509::Certificate
+ */
 static VALUE
 ossl_x509stctx_get_curr_cert(VALUE self)
 {
@@ -495,21 +674,30 @@ 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);
-    if(!ctx->current_crl) return Qnil;
+    crl = X509_STORE_CTX_get0_current_crl(ctx);
+    if (!crl)
+	return Qnil;
 
-    return ossl_x509crl_new(ctx->current_crl);
-#else
-    return Qnil;
-#endif
+    return ossl_x509crl_new(crl);
 }
 
+/*
+ * 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)
 {
@@ -522,6 +710,12 @@ 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)
 {
@@ -534,6 +728,10 @@ 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)
 {
@@ -548,7 +746,9 @@ ossl_x509stctx_set_trust(VALUE self, VALUE trust)
 
 /*
  * call-seq:
- *    storectx.time = time => time
+ *   stctx.time = time
+ *
+ * Sets the time used in the verification. If not set, the current time is used.
  */
 static VALUE
 ossl_x509stctx_set_time(VALUE self, VALUE time)
@@ -567,19 +767,85 @@ ossl_x509stctx_set_time(VALUE self, VALUE time)
  * INIT
  */
 void
-Init_ossl_x509store()
+Init_ossl_x509store(void)
 {
-    VALUE x509stctx;
+#undef rb_intern
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    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
+     *
+     * The X509 certificate store holds trusted CA certificates used to verify
+     * peer certificates.
+     *
+     * The easiest way to create a useful certificate store is:
+     *
+     *   cert_store = OpenSSL::X509::Store.new
+     *   cert_store.set_default_paths
+     *
+     * 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.)
+     *
+     * After downloading or generating a cacert.pem from the above link you
+     * can create a certificate store from the pem file like this:
+     *
+     *   cert_store = OpenSSL::X509::Store.new
+     *   cert_store.add_file 'cacert.pem'
+     *
+     * 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
+     *
+     *   ssl_socket = OpenSSL::SSL::SSLSocket.new tcp_socket, ssl_context
+     */
+
     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);
@@ -592,21 +858,26 @@ Init_ossl_x509store()
     rb_define_method(cX509Store, "add_crl",      ossl_x509store_add_crl, 1);
     rb_define_method(cX509Store, "verify",       ossl_x509store_verify, -1);
 
-    cX509StoreContext = rb_define_class_under(mX509,"StoreContext",rb_cObject);
-    x509stctx = cX509StoreContext;
+    /*
+     * 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);
     rb_define_alloc_func(cX509StoreContext, ossl_x509stctx_alloc);
-    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);
-
+    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);
 }
diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h
index 1c5d05baca..069acc8b14 100644
--- a/ext/openssl/ruby_missing.h
+++ b/ext/openssl/ruby_missing.h
@@ -1,41 +1,24 @@
 /*
- * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2003  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licenced under the same licence as Ruby.
+ * This program is licensed under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_RUBY_MISSING_H_)
 #define _OSSL_RUBY_MISSING_H_
 
-#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)))
+/* Ruby 2.4 */
+#ifndef RB_INTEGER_TYPE_P
+# define RB_INTEGER_TYPE_P(obj) (RB_FIXNUM_P(obj) || RB_TYPE_P(obj, T_BIGNUM))
 #endif
 
-#ifndef HAVE_RB_IO_T
-#define rb_io_t OpenFile
+/* Ruby 2.5 */
+#ifndef ST2FIX
+# define RB_ST2FIX(h) LONG2FIX((long)(h))
+# define ST2FIX(h) RB_ST2FIX(h)
 #endif
 
-#ifndef HAVE_RB_STR_SET_LEN
-/* these methods should probably be backported to 1.8 */
-#define rb_str_set_len(str, length) do {	\
-	RSTRING(str)->ptr[(length)] = 0;		\
-	RSTRING(str)->len = (length);		\
-} while(0)
-#endif /* ! HAVE_RB_STR_SET_LEN */
-
-#ifndef HAVE_RB_BLOCK_CALL
-/* the openssl module doesn't use arg[3-4] and arg2 is always rb_each */
-#define rb_block_call(arg1, arg2, arg3, arg4, arg5, arg6) rb_iterate(rb_each, (arg1), (arg5), (arg6))
-#endif /* ! HAVE_RB_BLOCK_CALL */
-
 #endif /* _OSSL_RUBY_MISSING_H_ */
diff --git a/ext/pathname/depend b/ext/pathname/depend
new file mode 100644
index 0000000000..1e13dd5f37
--- /dev/null
+++ b/ext/pathname/depend
@@ -0,0 +1,17 @@
+# AUTOGENERATED DEPENDENCIES START
+pathname.o: $(RUBY_EXTCONF_H)
+pathname.o: $(arch_hdrdir)/ruby/config.h
+pathname.o: $(hdrdir)/ruby.h
+pathname.o: $(hdrdir)/ruby/assert.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/onigmo.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: pathname.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/pathname/extconf.rb b/ext/pathname/extconf.rb
index 6720903e88..84e68277aa 100644
--- a/ext/pathname/extconf.rb
+++ b/ext/pathname/extconf.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: false
 require 'mkmf'
+have_func("rb_file_s_birthtime")
 create_makefile('pathname')
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index 1d2b37c66b..dc4a7c0220 100644
--- a/ext/pathname/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # = pathname.rb
 #
@@ -8,28 +9,23 @@
 #
 # For documentation, see class Pathname.
 #
-# <tt>pathname.rb</tt> is distributed with Ruby since 1.8.0.
-#
 
 require 'pathname.so'
 
 class Pathname
 
   # :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
+
+  # to_path is implemented so Pathname objects are usable with File.open, etc.
+  TO_PATH = :to_path
 
   SAME_PATHS = if File::FNM_SYSCASE.nonzero?
-    proc {|a, b| a.casecmp(b).zero?}
+    # Avoid #zero? here because #casecmp can return nil.
+    proc {|a, b| a.casecmp(b) == 0}
   else
     proc {|a, b| a == b}
   end
 
-  # :startdoc:
 
   if File::ALT_SEPARATOR
     SEPARATOR_LIST = "#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}"
@@ -39,10 +35,12 @@ class Pathname
     SEPARATOR_PAT = /#{Regexp.quote File::SEPARATOR}/
   end
 
+  # :startdoc:
+
   # chop_basename(path) -> [pre-basename, basename] or nil
-  def chop_basename(path)
+  def chop_basename(path) # :nodoc:
     base = File.basename(path)
-    if /\A#{SEPARATOR_PAT}?\z/o =~ base
+    if /\A#{SEPARATOR_PAT}?\z/o.match?(base)
       return nil
     else
       return path[0, path.rindex(base)], base
@@ -51,7 +49,7 @@ class Pathname
   private :chop_basename
 
   # split_names(path) -> prefix, [name, ...]
-  def split_names(path)
+  def split_names(path) # :nodoc:
     names = []
     while r = chop_basename(path)
       path, basename = r
@@ -61,10 +59,10 @@ class Pathname
   end
   private :split_names
 
-  def prepend_prefix(prefix, relpath)
+  def prepend_prefix(prefix, relpath) # :nodoc:
     if relpath.empty?
       File.dirname(prefix)
-    elsif /#{SEPARATOR_PAT}/o =~ prefix
+    elsif /#{SEPARATOR_PAT}/o.match?(prefix)
       prefix = File.dirname(prefix)
       prefix = File.join(prefix, "") if File.basename(prefix + 'a') != 'a'
       prefix + relpath
@@ -78,9 +76,11 @@ class Pathname
   # removed.  The filesystem is not accessed.
   #
   # If +consider_symlink+ is +true+, then a more conservative algorithm is used
-  # to avoid breaking symbolic linkages.  This may retain more <tt>..</tt>
+  # to avoid breaking symbolic linkages.  This may retain more +..+
   # entries than absolutely necessary, but without accessing the filesystem,
-  # this can't be avoided.  See #realpath.
+  # this can't be avoided.
+  #
+  # See Pathname#realpath.
   #
   def cleanpath(consider_symlink=false)
     if consider_symlink
@@ -91,10 +91,10 @@ class Pathname
   end
 
   #
-  # Clean the path simply by resolving and removing excess "." and ".." entries.
+  # Clean the path simply by resolving and removing excess +.+ and +..+ entries.
   # Nothing more, nothing less.
   #
-  def cleanpath_aggressive
+  def cleanpath_aggressive # :nodoc:
     path = @path
     names = []
     pre = path
@@ -112,7 +112,8 @@ class Pathname
         end
       end
     end
-    if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
+    pre.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
+    if /#{SEPARATOR_PAT}/o.match?(File.basename(pre))
       names.shift while names[0] == '..'
     end
     self.class.new(prepend_prefix(pre, File.join(*names)))
@@ -120,7 +121,7 @@ class Pathname
   private :cleanpath_aggressive
 
   # has_trailing_separator?(path) -> bool
-  def has_trailing_separator?(path)
+  def has_trailing_separator?(path) # :nodoc:
     if r = chop_basename(path)
       pre, basename = r
       pre.length + basename.length < path.length
@@ -131,7 +132,7 @@ class Pathname
   private :has_trailing_separator?
 
   # add_trailing_separator(path) -> path
-  def add_trailing_separator(path)
+  def add_trailing_separator(path) # :nodoc:
     if File.basename(path + 'a') == 'a'
       path
     else
@@ -140,7 +141,7 @@ class Pathname
   end
   private :add_trailing_separator
 
-  def del_trailing_separator(path)
+  def del_trailing_separator(path) # :nodoc:
     if r = chop_basename(path)
       pre, basename = r
       pre + basename
@@ -152,7 +153,7 @@ class Pathname
   end
   private :del_trailing_separator
 
-  def cleanpath_conservative
+  def cleanpath_conservative # :nodoc:
     path = @path
     names = []
     pre = path
@@ -160,7 +161,8 @@ class Pathname
       pre, base = r
       names.unshift base if base != '.'
     end
-    if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
+    pre.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
+    if /#{SEPARATOR_PAT}/o.match?(File.basename(pre))
       names.shift while names[0] == '..'
     end
     if names.empty?
@@ -179,43 +181,61 @@ class Pathname
   end
   private :cleanpath_conservative
 
-  # #parent returns the parent directory.
+  # Returns the parent directory.
   #
-  # This is same as <tt>self + '..'</tt>.
+  # This is same as <code>self + '..'</code>.
   def parent
     self + '..'
   end
 
-  # #mountpoint? returns +true+ if <tt>self</tt> points to a mountpoint.
+  # Returns +true+ if +self+ points to a mountpoint.
   def mountpoint?
     begin
       stat1 = self.lstat
       stat2 = self.parent.lstat
-      stat1.dev == stat2.dev && stat1.ino == stat2.ino ||
-        stat1.dev != stat2.dev
+      stat1.dev != stat2.dev || stat1.ino == stat2.ino
     rescue Errno::ENOENT
       false
     end
   end
 
   #
-  # #root? is a predicate for root directories.  I.e. it returns +true+ if the
+  # Predicate method for root directories.  Returns +true+ if the
   # pathname consists of consecutive slashes.
   #
-  # It doesn't access actual filesystem.  So it may return +false+ for some
+  # It doesn't access the filesystem.  So it may return +false+ for some
   # pathnames which points to roots such as <tt>/usr/..</tt>.
   #
   def root?
-    !!(chop_basename(@path) == nil && /#{SEPARATOR_PAT}/o =~ @path)
+    chop_basename(@path) == nil && /#{SEPARATOR_PAT}/o.match?(@path)
   end
 
   # Predicate method for testing whether a path is absolute.
+  #
   # It returns +true+ if the pathname begins with a slash.
+  #
+  #   p = Pathname.new('/im/sure')
+  #   p.absolute?
+  #       #=> true
+  #
+  #   p = Pathname.new('not/so/sure')
+  #   p.absolute?
+  #       #=> false
   def absolute?
     !relative?
   end
 
-  # The opposite of #absolute?
+  # The opposite of Pathname#absolute?
+  #
+  # It returns +false+ if the pathname begins with a slash.
+  #
+  #   p = Pathname.new('/im/sure')
+  #   p.relative?
+  #       #=> false
+  #
+  #   p = Pathname.new('not/so/sure')
+  #   p.relative?
+  #       #=> true
   def relative?
     path = @path
     while r = chop_basename(path)
@@ -230,6 +250,13 @@ class Pathname
   #   Pathname.new("/usr/bin/ruby").each_filename {|filename| ... }
   #     # yields "usr", "bin", and "ruby".
   #
+  # Returns an Enumerator if no block was given.
+  #
+  #   enum = Pathname.new("/usr/bin/ruby").each_filename
+  #     # ... do stuff ...
+  #   enum.each { |e| ... }
+  #     # yields "usr", "bin", and "ruby".
+  #
   def each_filename # :yield: filename
     return to_enum(__method__) unless block_given?
     _, names = split_names(@path)
@@ -253,11 +280,17 @@ class Pathname
   #     #<Pathname:path/to/some>
   #     #<Pathname:path/to/some/file.rb>
   #
-  # It doesn't access actual filesystem.
+  # Returns an Enumerator if no block was given.
   #
-  # This method is available since 1.8.5.
+  #   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 }
@@ -280,11 +313,17 @@ class Pathname
   #     #<Pathname:path/to>
   #     #<Pathname:path>
   #
-  # It doesn't access actual filesystem.
+  # Returns an Enumerator if no block was given.
   #
-  # This method is available since 1.8.5.
+  #   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)
@@ -295,21 +334,25 @@ class Pathname
   end
 
   #
-  # Pathname#+ appends a pathname fragment to this one to produce a new Pathname
-  # object.
+  # Appends a pathname fragment to +self+ to produce a new Pathname object.
   #
   #   p1 = Pathname.new("/usr")      # Pathname:/usr
   #   p2 = p1 + "bin/ruby"           # Pathname:/usr/bin/ruby
   #   p3 = p1 + "/etc/passwd"        # Pathname:/etc/passwd
   #
+  #   # / is aliased to +.
+  #   p4 = p1 / "bin/ruby"           # Pathname:/usr/bin/ruby
+  #   p5 = p1 / "/etc/passwd"        # Pathname:/etc/passwd
+  #
   # This method doesn't access the file system; it is pure string manipulation.
   #
   def +(other)
     other = Pathname.new(other) unless Pathname === other
     Pathname.new(plus(@path, other.to_s))
   end
+  alias / +
 
-  def plus(path1, path2) # -> path
+  def plus(path1, path2) # -> path # :nodoc:
     prefix2 = path2
     index_list2 = []
     basename_list2 = []
@@ -336,7 +379,7 @@ class Pathname
       basename_list2.shift
     end
     r1 = chop_basename(prefix1)
-    if !r1 && /#{SEPARATOR_PAT}/o =~ File.basename(prefix1)
+    if !r1 && (r1 = /#{SEPARATOR_PAT}/o.match?(File.basename(prefix1)))
       while !basename_list2.empty? && basename_list2.first == '..'
         index_list2.shift
         basename_list2.shift
@@ -352,13 +395,17 @@ class Pathname
   private :plus
 
   #
-  # Pathname#join joins pathnames.
+  # Joins the given pathnames onto +self+ to create a new Pathname object.
   #
-  # <tt>path0.join(path1, ..., pathN)</tt> is the same as
-  # <tt>path0 + path1 + ... + pathN</tt>.
+  #   path0 = Pathname.new("/usr")                # Pathname:/usr
+  #   path0 = path0.join("bin/ruby")              # Pathname:/usr/bin/ruby
+  #       # is the same as
+  #   path1 = Pathname.new("/usr") + "bin/ruby"   # Pathname:/usr/bin/ruby
+  #   path0 == path1
+  #       #=> true
   #
   def join(*args)
-    args.unshift self
+    return self if args.empty?
     result = args.pop
     result = Pathname.new(result) unless Pathname === result
     return result if result.absolute?
@@ -367,15 +414,16 @@ class Pathname
       result = arg + result
       return result if result.absolute?
     }
-    result
+    self + result
   end
 
   #
   # Returns the children of the directory (files and subdirectories, not
-  # recursive) as an array of Pathname objects.  By default, the returned
-  # pathnames will have enough information to access the files.  If you set
-  # +with_directory+ to +false+, then the returned pathnames will contain the
-  # filename only.
+  # recursive) as an array of Pathname objects.
+  #
+  # By default, the returned pathnames will have enough information to access
+  # the files. If you set +with_directory+ to +false+, then the returned
+  # pathnames will contain the filename only.
   #
   # For example:
   #   pn = Pathname("/usr/lib/ruby/1.8")
@@ -386,11 +434,9 @@ class Pathname
   #   pn.children(false)
   #       # -> [ Pathname:English.rb, Pathname:Env.rb, Pathname:abbrev.rb, ... ]
   #
-  # Note that the results never contain the entries <tt>.</tt> and <tt>..</tt> in
+  # Note that the results never contain the entries +.+ and +..+ in
   # the directory because they are not children.
   #
-  # This method has existed since 1.8.1.
-  #
   def children(with_directory=true)
     with_directory = false if @path == '.'
     result = []
@@ -407,9 +453,14 @@ class Pathname
 
   # Iterates over the children of the directory
   # (files and subdirectories, not recursive).
+  #
   # It yields Pathname object for each child.
-  # By default, the yielded pathnames will have enough information to access the files.
-  # If you set +with_directory+ to +false+, then the returned pathnames will contain the filename only.
+  #
+  # By default, the yielded pathnames will have enough information to access
+  # the files.
+  #
+  # If you set +with_directory+ to +false+, then the returned pathnames will
+  # contain the filename only.
   #
   #   Pathname("/usr/local").each_child {|f| p f }
   #   #=> #<Pathname:/usr/local/share>
@@ -431,22 +482,28 @@ class Pathname
   #   #   #<Pathname:src>
   #   #   #<Pathname:man>
   #
+  # Note that the results never contain the entries +.+ and +..+ in
+  # the directory because they are not children.
+  #
+  # See Pathname#children
+  #
   def each_child(with_directory=true, &b)
     children(with_directory).each(&b)
   end
 
   #
-  # #relative_path_from returns a relative path from the argument to the
-  # receiver.  If +self+ is absolute, the argument must be absolute too.  If
-  # +self+ is relative, the argument must be relative too.
+  # Returns a relative path from the given +base_directory+ to the receiver.
   #
-  # #relative_path_from doesn't access the filesystem.  It assumes no symlinks.
+  # If +self+ is absolute, then +base_directory+ must be absolute too.
   #
-  # ArgumentError is raised when it cannot find a relative path.
+  # If +self+ is relative, then +base_directory+ must be relative too.
   #
-  # This method has existed since 1.8.1.
+  # This method doesn't access the filesystem.  It assumes no symlinks.
+  #
+  # ArgumentError is raised when it cannot find a relative path.
   #
   def relative_path_from(base_directory)
+    base_directory = Pathname.new(base_directory) unless base_directory.is_a? Pathname
     dest_directory = self.cleanpath.to_s
     base_directory = base_directory.cleanpath.to_s
     dest_prefix = dest_directory
@@ -486,36 +543,45 @@ end
 
 class Pathname    # * Find *
   #
-  # Pathname#find is an iterator to traverse a directory tree in a depth first
-  # manner.  It yields a Pathname for each file under "this" directory.
+  # Iterates over the directory tree in a depth first manner, yielding a
+  # Pathname for each file under "this" directory.
   #
-  # Since it is implemented by <tt>find.rb</tt>, <tt>Find.prune</tt> can be used
-  # to control the traversal.
+  # Returns an Enumerator if no block is given.
   #
-  # If +self+ is <tt>.</tt>, yielded pathnames begin with a filename in the
-  # current directory, not <tt>./</tt>.
+  # Since it is implemented by the standard library module Find, Find.prune can
+  # be used to control the traversal.
   #
-  def find(&block) # :yield: pathname
+  # If +self+ is +.+, yielded pathnames begin with a filename in the
+  # current directory, not +./+.
+  #
+  # See Find.find
+  #
+  def find(ignore_error: true) # :yield: pathname
+    return to_enum(__method__, ignore_error: ignore_error) unless block_given?
     require 'find'
     if @path == '.'
-      Find.find(@path) {|f| yield self.class.new(f.sub(%r{\A\./}, '')) }
+      Find.find(@path, ignore_error: ignore_error) {|f| yield self.class.new(f.sub(%r{\A\./}, '')) }
     else
-      Find.find(@path) {|f| yield self.class.new(f) }
+      Find.find(@path, ignore_error: ignore_error) {|f| yield self.class.new(f) }
     end
   end
 end
 
 
 class Pathname    # * FileUtils *
-  # See <tt>FileUtils.mkpath</tt>.  Creates a full path, including any
-  # intermediate directories that don't yet exist.
+  # Creates a full path, including any intermediate directories that don't yet
+  # exist.
+  #
+  # See FileUtils.mkpath and FileUtils.mkdir_p
   def mkpath
     require 'fileutils'
     FileUtils.mkpath(@path)
     nil
   end
 
-  # See <tt>FileUtils.rm_r</tt>.  Deletes a directory and all beneath it.
+  # Recursively deletes a directory, including all directories beneath it.
+  #
+  # See FileUtils.rm_r
   def rmtree
     # The name "rmtree" is borrowed from File::Path of Perl.
     # File::Path provides "mkpath" and "rmtree".
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index e1632c524b..15f80d487e 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -1,14 +1,83 @@
 #include "ruby.h"
+#include "ruby/encoding.h"
 
 static VALUE rb_cPathname;
-static ID id_at_path, id_to_path;
+static ID id_ENOTDIR;
+static ID id_at_path;
+static ID id_atime;
+static ID id_base;
+static ID id_basename;
+static ID id_binread;
+static ID id_binwrite;
+static ID id_birthtime;
+static ID id_blockdev_p;
+static ID id_chardev_p;
+static ID id_chmod;
+static ID id_chown;
+static ID id_ctime;
+static ID id_directory_p;
+static ID id_dirname;
+static ID id_empty_p;
+static ID id_entries;
+static ID id_executable_p;
+static ID id_executable_real_p;
+static ID id_exist_p;
+static ID id_expand_path;
+static ID id_extname;
+static ID id_file_p;
+static ID id_fnmatch;
+static ID id_foreach;
+static ID id_ftype;
+static ID id_getwd;
+static ID id_glob;
+static ID id_grpowned_p;
+static ID id_lchmod;
+static ID id_lchown;
+static ID id_link;
+static ID id_lstat;
+static ID id_mkdir;
+static ID id_mtime;
+static ID id_open;
+static ID id_owned_p;
+static ID id_pipe_p;
+static ID id_read;
+static ID id_readable_p;
+static ID id_readable_real_p;
+static ID id_readlines;
+static ID id_readlink;
+static ID id_realdirpath;
+static ID id_realpath;
+static ID id_rename;
+static ID id_rmdir;
+static ID id_setgid_p;
+static ID id_setuid_p;
+static ID id_size;
+static ID id_size_p;
+static ID id_socket_p;
+static ID id_split;
+static ID id_stat;
+static ID id_sticky_p;
+static ID id_sub;
+static ID id_symlink;
+static ID id_symlink_p;
+static ID id_sysopen;
+static ID id_to_path;
+static ID id_truncate;
+static ID id_unlink;
+static ID id_utime;
+static ID id_world_readable_p;
+static ID id_world_writable_p;
+static ID id_writable_p;
+static ID id_writable_real_p;
+static ID id_write;
+static ID id_zero_p;
 
 static VALUE
 get_strpath(VALUE obj)
 {
     VALUE strpath;
     strpath = rb_ivar_get(obj, id_at_path);
-    if (TYPE(strpath) != T_STRING)
+    if (!RB_TYPE_P(strpath, T_STRING))
         rb_raise(rb_eTypeError, "unexpected @path");
     return strpath;
 }
@@ -21,13 +90,13 @@ set_strpath(VALUE obj, VALUE val)
 
 /*
  * Create a Pathname object from the given String (or String-like object).
- * If +path+ contains a NUL character (<tt>\0</tt>), an ArgumentError is raised.
+ * If +path+ contains a NULL character (<tt>\0</tt>), an ArgumentError is raised.
  */
 static VALUE
 path_initialize(VALUE self, VALUE arg)
 {
     VALUE str;
-    if (TYPE(arg) == T_STRING) {
+    if (RB_TYPE_P(arg, T_STRING)) {
         str = arg;
     }
     else {
@@ -41,10 +110,17 @@ path_initialize(VALUE self, VALUE arg)
     str = rb_obj_dup(str);
 
     set_strpath(self, str);
-    OBJ_INFECT(self, str);
     return self;
 }
 
+/*
+ * call-seq:
+ *   pathname.freeze -> obj
+ *
+ * Freezes this Pathname.
+ *
+ * See Object.freeze.
+ */
 static VALUE
 path_freeze(VALUE self)
 {
@@ -53,19 +129,29 @@ path_freeze(VALUE self)
     return self;
 }
 
+/*
+ * call-seq:
+ *   pathname.taint -> obj
+ *
+ * Returns pathname.  This method is deprecated and will be removed in Ruby 3.2.
+ */
 static VALUE
 path_taint(VALUE self)
 {
-    rb_call_super(0, 0);
-    rb_obj_taint(get_strpath(self));
+    rb_warning("Pathname#taint is deprecated and will be removed in Ruby 3.2.");
     return self;
 }
 
+/*
+ * call-seq:
+ *   pathname.untaint -> obj
+ *
+ * Returns pathname.  This method is deprecated and will be removed in Ruby 3.2.
+ */
 static VALUE
 path_untaint(VALUE self)
 {
-    rb_call_super(0, 0);
-    rb_obj_untaint(get_strpath(self));
+    rb_warning("Pathname#untaint is deprecated and will be removed in Ruby 3.2.");
     return self;
 }
 
@@ -83,7 +169,18 @@ path_eq(VALUE self, VALUE other)
 }
 
 /*
- *  Provides for comparing pathnames, case-sensitively.
+ *  Provides a case-sensitive comparison operator for pathnames.
+ *
+ *	Pathname.new('/usr') <=> Pathname.new('/usr/bin')
+ *	    #=> -1
+ *	Pathname.new('/usr/bin') <=> Pathname.new('/usr/bin')
+ *	    #=> 0
+ *	Pathname.new('/usr/bin') <=> Pathname.new('/USR/BIN')
+ *	    #=> 1
+ *
+ *  It will return +-1+, +0+ or +1+ depending on the value of the left argument
+ *  relative to the right argument. Or it will return +nil+ if the arguments
+ *  are not comparable.
  */
 static VALUE
 path_cmp(VALUE self, VALUE other)
@@ -119,11 +216,15 @@ 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 INT2FIX(rb_str_hash(get_strpath(self)));
+    return ST2FIX(rb_str_hash(get_strpath(self)));
 }
 
 /*
@@ -147,11 +248,15 @@ path_inspect(VALUE self)
 {
     const char *c = rb_obj_classname(self);
     VALUE str = get_strpath(self);
-    return rb_sprintf("#<%s:%s>", c, RSTRING_PTR(str));
+    return rb_sprintf("#<%s:%"PRIsVALUE">", c, str);
 }
 
 /*
  * Return a pathname which is substituted by String#sub.
+ *
+ *	path1 = Pathname.new('/usr/bin/perl')
+ *	path1.sub('perl', 'ruby')
+ *	    #=> #<Pathname:/usr/bin/ruby>
  */
 static VALUE
 path_sub(int argc, VALUE *argv, VALUE self)
@@ -159,19 +264,21 @@ path_sub(int argc, VALUE *argv, VALUE self)
     VALUE str = get_strpath(self);
 
     if (rb_block_given_p()) {
-        str = rb_block_call(str, rb_intern("sub"), argc, argv, 0, 0);
+        str = rb_block_call(str, id_sub, argc, argv, 0, 0);
     }
     else {
-        str = rb_funcall2(str, rb_intern("sub"), argc, argv);
+        str = rb_funcallv(str, id_sub, argc, argv);
     }
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
 /*
- * Return a pathname which the extension of the basename is substituted by
- * <i>repl</i>.
+ * Return a pathname with +repl+ added as a suffix to the basename.
  *
- * If self has no extension part, <i>repl</i> is appended.
+ * If self has no extension part, +repl+ is appended.
+ *
+ *	Pathname.new('/usr/bin/shutdown').sub_ext('.rb')
+ *	    #=> #<Pathname:/usr/bin/shutdown.rb>
  */
 static VALUE
 path_sub_ext(VALUE self, VALUE repl)
@@ -184,25 +291,26 @@ path_sub_ext(VALUE self, VALUE repl)
 
     StringValue(repl);
     p = RSTRING_PTR(str);
-    ext = ruby_find_extname(p, &extlen);
+    extlen = RSTRING_LEN(str);
+    ext = ruby_enc_find_extname(p, &extlen, rb_enc_get(str));
     if (ext == NULL) {
         ext = p + RSTRING_LEN(str);
     }
     else if (extlen <= 1) {
         ext += extlen;
     }
-    str2 = rb_str_dup(str);
-    rb_str_resize(str2, ext-p);
+    str2 = rb_str_subseq(str, 0, ext-p);
     rb_str_append(str2, repl);
-    OBJ_INFECT(str2, str);
     return rb_class_new_instance(1, &str2, rb_obj_class(self));
 }
 
 /* Facade for File */
 
 /*
- * Returns the real (absolute) pathname of +self+ in the actual
- * filesystem not containing symlinks or useless dots.
+ * Returns the real (absolute) pathname for +self+ in the actual
+ * filesystem.
+ *
+ * Does not contain symlinks or useless dots, +..+ and +.+.
  *
  * All components of the pathname must exist when this method is
  * called.
@@ -213,13 +321,14 @@ path_realpath(int argc, VALUE *argv, VALUE self)
 {
     VALUE basedir, str;
     rb_scan_args(argc, argv, "01", &basedir);
-    str = rb_funcall(rb_cFile, rb_intern("realpath"), 2, get_strpath(self), basedir);
+    str = rb_funcall(rb_cFile, id_realpath, 2, get_strpath(self), basedir);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
 /*
  * Returns the real (absolute) pathname of +self+ in the actual filesystem.
- * The real pathname doesn't contain symlinks or useless dots.
+ *
+ * Does not contain symlinks or useless dots, +..+ and +.+.
  *
  * The last component of the real pathname can be nonexistent.
  */
@@ -228,7 +337,7 @@ path_realdirpath(int argc, VALUE *argv, VALUE self)
 {
     VALUE basedir, str;
     rb_scan_args(argc, argv, "01", &basedir);
-    str = rb_funcall(rb_cFile, rb_intern("realdirpath"), 2, get_strpath(self), basedir);
+    str = rb_funcall(rb_cFile, id_realdirpath, 2, get_strpath(self), basedir);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -240,10 +349,7 @@ path_realdirpath(int argc, VALUE *argv, VALUE self)
  *   pathname.each_line(sep, limit [, open_args]) {|line| block } -> nil
  *   pathname.each_line(...)                                      -> an_enumerator
  *
- * #each_line iterates over the line in the file.  It yields a String object
- * for each line.
- *
- * This method is availabel since 1.8.1.
+ * Iterates over each line in the file and yields a String object for each.
  */
 static VALUE
 path_each_line(int argc, VALUE *argv, VALUE self)
@@ -254,10 +360,10 @@ path_each_line(int argc, VALUE *argv, VALUE self)
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
     if (rb_block_given_p()) {
-        return rb_block_call(rb_cIO, rb_intern("foreach"), 1+n, args, 0, 0);
+        return rb_block_call(rb_cFile, id_foreach, 1+n, args, 0, 0);
     }
     else {
-        return rb_funcall2(rb_cIO, rb_intern("foreach"), 1+n, args);
+        return rb_funcallv(rb_cFile, id_foreach, 1+n, args);
     }
 }
 
@@ -266,8 +372,9 @@ path_each_line(int argc, VALUE *argv, VALUE self)
  *   pathname.read([length [, offset]]) -> string
  *   pathname.read([length [, offset]], open_args) -> string
  *
- * See <tt>IO.read</tt>.  Returns all data from the file, or the first +N+ bytes
- * if specified.
+ * Returns all data from the file, or the first +N+ bytes if specified.
+ *
+ * See File.read.
  *
  */
 static VALUE
@@ -278,15 +385,16 @@ 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_funcall2(rb_cIO, rb_intern("read"), 1+n, args);
+    return rb_funcallv_kw(rb_cFile, id_read, 1+n, args, RB_PASS_CALLED_KEYWORDS);
 }
 
 /*
  * call-seq:
  *   pathname.binread([length [, offset]]) -> string
  *
- * See <tt>IO.binread</tt>.  Returns all the bytes from the file, or the first +N+
- * if specified.
+ * Returns all the bytes from the file, or the first +N+ if specified.
+ *
+ * See File.binread.
  *
  */
 static VALUE
@@ -297,7 +405,49 @@ 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_funcall2(rb_cIO, rb_intern("binread"), 1+n, args);
+    return rb_funcallv(rb_cFile, id_binread, 1+n, args);
+}
+
+/*
+ * call-seq:
+ *   pathname.write(string, [offset] )   => fixnum
+ *   pathname.write(string, [offset], open_args )   => fixnum
+ *
+ * Writes +contents+ to the file.
+ *
+ * See File.write.
+ *
+ */
+static VALUE
+path_write(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n;
+
+    args[0] = get_strpath(self);
+    n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
+    return rb_funcallv_kw(rb_cFile, id_write, 1+n, args, RB_PASS_CALLED_KEYWORDS);
+}
+
+/*
+ * call-seq:
+ *   pathname.binwrite(string, [offset] )   => fixnum
+ *   pathname.binwrite(string, [offset], open_args )   => fixnum
+ *
+ * Writes +contents+ to the file, opening it in binary mode.
+ *
+ * See File.binwrite.
+ *
+ */
+static VALUE
+path_binwrite(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n;
+
+    args[0] = get_strpath(self);
+    n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
+    return rb_funcallv_kw(rb_cFile, id_binwrite, 1+n, args, RB_PASS_CALLED_KEYWORDS);
 }
 
 /*
@@ -306,7 +456,9 @@ path_binread(int argc, VALUE *argv, VALUE self)
  *   pathname.readlines(limit [, open_args])      -> array
  *   pathname.readlines(sep, limit [, open_args]) -> array
  *
- * See <tt>IO.readlines</tt>.  Returns all the lines from the file.
+ * Returns all the lines from the file.
+ *
+ * See File.readlines.
  *
  */
 static VALUE
@@ -317,14 +469,14 @@ 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_funcall2(rb_cIO, rb_intern("readlines"), 1+n, args);
+    return rb_funcallv_kw(rb_cFile, id_readlines, 1+n, args, RB_PASS_CALLED_KEYWORDS);
 }
 
 /*
  * call-seq:
  *   pathname.sysopen([mode, [perm]])  -> fixnum
  *
- * See <tt>IO.sysopen</tt>.
+ * See IO.sysopen.
  *
  */
 static VALUE
@@ -335,70 +487,125 @@ 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_funcall2(rb_cIO, rb_intern("sysopen"), 1+n, args);
+    return rb_funcallv(rb_cIO, id_sysopen, 1+n, args);
 }
 
 /*
- * See <tt>File.atime</tt>.  Returns last access time.
+ * call-seq:
+ *   pathname.atime	-> time
+ *
+ * Returns the last access time for the file.
+ *
+ * See File.atime.
  */
 static VALUE
 path_atime(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("atime"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_atime, 1, get_strpath(self));
+}
+
+#if defined(HAVE_RB_FILE_S_BIRTHTIME)
+/*
+ * call-seq:
+ *   pathname.birthtime	-> time
+ *
+ * Returns the birth time for the file.
+ * If the platform doesn't have birthtime, raises NotImplementedError.
+ *
+ * See File.birthtime.
+ */
+static VALUE
+path_birthtime(VALUE self)
+{
+    return rb_funcall(rb_cFile, id_birthtime, 1, get_strpath(self));
 }
+#else
+/* check at compilation time for `respond_to?` */
+# define path_birthtime rb_f_notimplement
+#endif
 
 /*
- * See <tt>File.ctime</tt>.  Returns last (directory entry, not file) change time.
+ * call-seq:
+ *   pathname.ctime	-> time
+ *
+ * Returns the last change time, using directory information, not the file itself.
+ *
+ * See File.ctime.
  */
 static VALUE
 path_ctime(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("ctime"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_ctime, 1, get_strpath(self));
 }
 
 /*
- * See <tt>File.mtime</tt>.  Returns last modification time.
+ * call-seq:
+ *   pathname.mtime	-> time
+ *
+ * Returns the last modified time of the file.
+ *
+ * See File.mtime.
  */
 static VALUE
 path_mtime(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("mtime"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_mtime, 1, get_strpath(self));
 }
 
 /*
- * See <tt>File.chmod</tt>.  Changes permissions.
+ * call-seq:
+ *   pathname.chmod	-> integer
+ *
+ * Changes file permissions.
+ *
+ * See File.chmod.
  */
 static VALUE
 path_chmod(VALUE self, VALUE mode)
 {
-    return rb_funcall(rb_cFile, rb_intern("chmod"), 2, mode, get_strpath(self));
+    return rb_funcall(rb_cFile, id_chmod, 2, mode, get_strpath(self));
 }
 
 /*
- * See <tt>File.lchmod</tt>.
+ * call-seq:
+ *   pathname.lchmod	-> integer
+ *
+ * Same as Pathname.chmod, but does not follow symbolic links.
+ *
+ * See File.lchmod.
  */
 static VALUE
 path_lchmod(VALUE self, VALUE mode)
 {
-    return rb_funcall(rb_cFile, rb_intern("lchmod"), 2, mode, get_strpath(self));
+    return rb_funcall(rb_cFile, id_lchmod, 2, mode, get_strpath(self));
 }
 
 /*
- * See <tt>File.chown</tt>.  Change owner and group of file.
+ * call-seq:
+ *   pathname.chown	-> integer
+ *
+ * Change owner and group of the file.
+ *
+ * See File.chown.
  */
 static VALUE
 path_chown(VALUE self, VALUE owner, VALUE group)
 {
-    return rb_funcall(rb_cFile, rb_intern("chown"), 3, owner, group, get_strpath(self));
+    return rb_funcall(rb_cFile, id_chown, 3, owner, group, get_strpath(self));
 }
 
 /*
- * See <tt>File.lchown</tt>.
+ * call-seq:
+ *   pathname.lchown	-> integer
+ *
+ * Same as Pathname.chown, but does not follow symbolic links.
+ *
+ * See File.lchown.
  */
 static VALUE
 path_lchown(VALUE self, VALUE owner, VALUE group)
 {
-    return rb_funcall(rb_cFile, rb_intern("lchown"), 3, owner, group, get_strpath(self));
+    return rb_funcall(rb_cFile, id_lchown, 3, owner, group, get_strpath(self));
 }
 
 /*
@@ -406,8 +613,9 @@ path_lchown(VALUE self, VALUE owner, VALUE group)
  *    pathname.fnmatch(pattern, [flags])        -> string
  *    pathname.fnmatch?(pattern, [flags])       -> string
  *
- * See <tt>File.fnmatch</tt>.  Return +true+ if the receiver matches the given
- * pattern.
+ * Return +true+ if the receiver matches the given pattern.
+ *
+ * See File.fnmatch.
  */
 static VALUE
 path_fnmatch(int argc, VALUE *argv, VALUE self)
@@ -415,35 +623,43 @@ path_fnmatch(int argc, VALUE *argv, VALUE self)
     VALUE str = get_strpath(self);
     VALUE pattern, flags;
     if (rb_scan_args(argc, argv, "11", &pattern, &flags) == 1)
-        return rb_funcall(rb_cFile, rb_intern("fnmatch"), 2, pattern, str);
+        return rb_funcall(rb_cFile, id_fnmatch, 2, pattern, str);
     else
-        return rb_funcall(rb_cFile, rb_intern("fnmatch"), 3, pattern, str, flags);
+        return rb_funcall(rb_cFile, id_fnmatch, 3, pattern, str, flags);
 }
 
 /*
- * See <tt>File.ftype</tt>.  Returns "type" of file ("file", "directory",
- * etc).
+ * call-seq:
+ *   pathname.ftype	-> string
+ *
+ * Returns "type" of file ("file", "directory", etc).
+ *
+ * See File.ftype.
  */
 static VALUE
 path_ftype(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("ftype"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_ftype, 1, get_strpath(self));
 }
 
 /*
  * call-seq:
  *   pathname.make_link(old)
  *
- * See <tt>File.link</tt>.  Creates a hard link at _pathname_.
+ * Creates a hard link at _pathname_.
+ *
+ * See File.link.
  */
 static VALUE
 path_make_link(VALUE self, VALUE old)
 {
-    return rb_funcall(rb_cFile, rb_intern("link"), 2, old, get_strpath(self));
+    return rb_funcall(rb_cFile, id_link, 2, old, get_strpath(self));
 }
 
 /*
- * See <tt>File.open</tt>.  Opens the file for reading or writing.
+ * Opens the file for reading or writing.
+ *
+ * See File.open.
  */
 static VALUE
 path_open(int argc, VALUE *argv, VALUE self)
@@ -454,83 +670,97 @@ path_open(int argc, VALUE *argv, VALUE self)
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
     if (rb_block_given_p()) {
-        return rb_block_call(rb_cFile, rb_intern("open"), 1+n, args, 0, 0);
+        return rb_block_call_kw(rb_cFile, id_open, 1+n, args, 0, 0, RB_PASS_CALLED_KEYWORDS);
     }
     else {
-        return rb_funcall2(rb_cFile, rb_intern("open"), 1+n, args);
+        return rb_funcallv_kw(rb_cFile, id_open, 1+n, args, RB_PASS_CALLED_KEYWORDS);
     }
 }
 
 /*
- * See <tt>File.readlink</tt>.  Read symbolic link.
+ * Read symbolic link.
+ *
+ * See File.readlink.
  */
 static VALUE
 path_readlink(VALUE self)
 {
     VALUE str;
-    str = rb_funcall(rb_cFile, rb_intern("readlink"), 1, get_strpath(self));
+    str = rb_funcall(rb_cFile, id_readlink, 1, get_strpath(self));
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
 /*
- * See <tt>File.rename</tt>.  Rename the file.
+ * Rename the file.
+ *
+ * See File.rename.
  */
 static VALUE
 path_rename(VALUE self, VALUE to)
 {
-    return rb_funcall(rb_cFile, rb_intern("rename"), 2, get_strpath(self), to);
+    return rb_funcall(rb_cFile, id_rename, 2, get_strpath(self), to);
 }
 
 /*
- * See <tt>File.stat</tt>.  Returns a <tt>File::Stat</tt> object.
+ * Returns a File::Stat object.
+ *
+ * See File.stat.
  */
 static VALUE
 path_stat(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("stat"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_stat, 1, get_strpath(self));
 }
 
 /*
- * See <tt>File.lstat</tt>.
+ * See File.lstat.
  */
 static VALUE
 path_lstat(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("lstat"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_lstat, 1, get_strpath(self));
 }
 
 /*
  * call-seq:
  *   pathname.make_symlink(old)
  *
- * See <tt>File.symlink</tt>.  Creates a symbolic link.
+ * Creates a symbolic link.
+ *
+ * See File.symlink.
  */
 static VALUE
 path_make_symlink(VALUE self, VALUE old)
 {
-    return rb_funcall(rb_cFile, rb_intern("symlink"), 2, old, get_strpath(self));
+    return rb_funcall(rb_cFile, id_symlink, 2, old, get_strpath(self));
 }
 
 /*
- * See <tt>File.truncate</tt>.  Truncate the file to +length+ bytes.
+ * Truncates the file to +length+ bytes.
+ *
+ * See File.truncate.
  */
 static VALUE
 path_truncate(VALUE self, VALUE length)
 {
-    return rb_funcall(rb_cFile, rb_intern("truncate"), 2, get_strpath(self), length);
+    return rb_funcall(rb_cFile, id_truncate, 2, get_strpath(self), length);
 }
 
 /*
- * See <tt>File.utime</tt>.  Update the access and modification times.
+ * Update the access and modification times of the file.
+ *
+ * See File.utime.
  */
 static VALUE
 path_utime(VALUE self, VALUE atime, VALUE mtime)
 {
-    return rb_funcall(rb_cFile, rb_intern("utime"), 3, atime, mtime, get_strpath(self));
+    return rb_funcall(rb_cFile, id_utime, 3, atime, mtime, get_strpath(self));
 }
 
 /*
- * See <tt>File.basename</tt>.  Returns the last component of the path.
+ * Returns the last component of the path.
+ *
+ * See File.basename.
  */
 static VALUE
 path_basename(int argc, VALUE *argv, VALUE self)
@@ -538,35 +768,41 @@ path_basename(int argc, VALUE *argv, VALUE self)
     VALUE str = get_strpath(self);
     VALUE fext;
     if (rb_scan_args(argc, argv, "01", &fext) == 0)
-        str = rb_funcall(rb_cFile, rb_intern("basename"), 1, str);
+        str = rb_funcall(rb_cFile, id_basename, 1, str);
     else
-        str = rb_funcall(rb_cFile, rb_intern("basename"), 2, str, fext);
+        str = rb_funcall(rb_cFile, id_basename, 2, str, fext);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
 /*
- * See <tt>File.dirname</tt>.  Returns all but the last component of the path.
+ * Returns all but the last component of the path.
+ *
+ * See File.dirname.
  */
 static VALUE
 path_dirname(VALUE self)
 {
     VALUE str = get_strpath(self);
-    str = rb_funcall(rb_cFile, rb_intern("dirname"), 1, str);
+    str = rb_funcall(rb_cFile, id_dirname, 1, str);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
 /*
- * See <tt>File.extname</tt>.  Returns the file's extension.
+ * Returns the file's extension.
+ *
+ * See File.extname.
  */
 static VALUE
 path_extname(VALUE self)
 {
     VALUE str = get_strpath(self);
-    return rb_funcall(rb_cFile, rb_intern("extname"), 1, str);
+    return rb_funcall(rb_cFile, id_extname, 1, str);
 }
 
 /*
- * See <tt>File.expand_path</tt>.
+ * Returns the absolute path for the file.
+ *
+ * See File.expand_path.
  */
 static VALUE
 path_expand_path(int argc, VALUE *argv, VALUE self)
@@ -574,21 +810,23 @@ path_expand_path(int argc, VALUE *argv, VALUE self)
     VALUE str = get_strpath(self);
     VALUE dname;
     if (rb_scan_args(argc, argv, "01", &dname) == 0)
-        str = rb_funcall(rb_cFile, rb_intern("expand_path"), 1, str);
+        str = rb_funcall(rb_cFile, id_expand_path, 1, str);
     else
-        str = rb_funcall(rb_cFile, rb_intern("expand_path"), 2, str, dname);
+        str = rb_funcall(rb_cFile, id_expand_path, 2, str, dname);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
 /*
- * See <tt>File.split</tt>.  Returns the #dirname and the #basename in an Array.
+ * Returns the #dirname and the #basename in an Array.
+ *
+ * See File.split.
  */
 static VALUE
 path_split(VALUE self)
 {
     VALUE str = get_strpath(self);
     VALUE ary, dirname, basename;
-    ary = rb_funcall(rb_cFile, rb_intern("split"), 1, str);
+    ary = rb_funcall(rb_cFile, id_split, 1, str);
     ary = rb_check_array_type(ary);
     dirname = rb_ary_entry(ary, 0);
     basename = rb_ary_entry(ary, 1);
@@ -598,247 +836,268 @@ path_split(VALUE self)
 }
 
 /*
- * See <tt>FileTest.blockdev?</tt>.
+ * See FileTest.blockdev?.
  */
 static VALUE
 path_blockdev_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("blockdev?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_blockdev_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.chardev?</tt>.
+ * See FileTest.chardev?.
  */
 static VALUE
 path_chardev_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("chardev?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_chardev_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.executable?</tt>.
+ * See FileTest.executable?.
  */
 static VALUE
 path_executable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("executable?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_executable_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.executable_real?</tt>.
+ * See FileTest.executable_real?.
  */
 static VALUE
 path_executable_real_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("executable_real?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_executable_real_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.exist?</tt>.
+ * See FileTest.exist?.
  */
 static VALUE
 path_exist_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("exist?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_exist_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.grpowned?</tt>.
+ * See FileTest.grpowned?.
  */
 static VALUE
 path_grpowned_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("grpowned?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_grpowned_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.directory?</tt>.
+ * See FileTest.directory?.
  */
 static VALUE
 path_directory_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("directory?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_directory_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.file?</tt>.
+ * See FileTest.file?.
  */
 static VALUE
 path_file_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("file?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_file_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.pipe?</tt>.
+ * See FileTest.pipe?.
  */
 static VALUE
 path_pipe_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("pipe?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_pipe_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.socket?</tt>.
+ * See FileTest.socket?.
  */
 static VALUE
 path_socket_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("socket?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_socket_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.owned?</tt>.
+ * See FileTest.owned?.
  */
 static VALUE
 path_owned_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("owned?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_owned_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.readable?</tt>.
+ * See FileTest.readable?.
  */
 static VALUE
 path_readable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("readable?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_readable_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.world_readable?</tt>.
+ * See FileTest.world_readable?.
  */
 static VALUE
 path_world_readable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("world_readable?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_world_readable_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.readable_real?</tt>.
+ * See FileTest.readable_real?.
  */
 static VALUE
 path_readable_real_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("readable_real?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_readable_real_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.setuid?</tt>.
+ * See FileTest.setuid?.
  */
 static VALUE
 path_setuid_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("setuid?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_setuid_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.setgid?</tt>.
+ * See FileTest.setgid?.
  */
 static VALUE
 path_setgid_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("setgid?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_setgid_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.size</tt>.
+ * See FileTest.size.
  */
 static VALUE
 path_size(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("size"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_size, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.size?</tt>.
+ * See FileTest.size?.
  */
 static VALUE
 path_size_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("size?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_size_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.sticky?</tt>.
+ * See FileTest.sticky?.
  */
 static VALUE
 path_sticky_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("sticky?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_sticky_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.symlink?</tt>.
+ * See FileTest.symlink?.
  */
 static VALUE
 path_symlink_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("symlink?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_symlink_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.writable?</tt>.
+ * See FileTest.writable?.
  */
 static VALUE
 path_writable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("writable?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_writable_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.world_writable?</tt>.
+ * See FileTest.world_writable?.
  */
 static VALUE
 path_world_writable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("world_writable?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_world_writable_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.writable_real?</tt>.
+ * See FileTest.writable_real?.
  */
 static VALUE
 path_writable_real_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("writable_real?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_writable_real_p, 1, get_strpath(self));
 }
 
 /*
- * See <tt>FileTest.zero?</tt>.
+ * See FileTest.zero?.
  */
 static VALUE
 path_zero_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("zero?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_zero_p, 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, id_directory_p, 1, path)))
+        return rb_funcall(rb_cDir, id_empty_p, 1, path);
+    else
+        return rb_funcall(rb_mFileTest, id_empty_p, 1, path);
 }
 
 static VALUE
-glob_i(VALUE elt, VALUE klass, int argc, VALUE *argv)
+s_glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass))
 {
     return rb_yield(rb_class_new_instance(1, &elt, klass));
 }
 
 /*
- * See <tt>Dir.glob</tt>.  Returns or yields Pathname objects.
+ * Returns or yields Pathname objects.
+ *
+ *  Pathname.glob("lib/i*.rb")
+ *	#=> [#<Pathname:lib/ipaddr.rb>, #<Pathname:lib/irb.rb>]
+ *
+ * See Dir.glob.
  */
 static VALUE
 path_s_glob(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE args[2];
+    VALUE args[3];
     int n;
 
-    n = rb_scan_args(argc, argv, "11", &args[0], &args[1]);
+    n = rb_scan_args(argc, argv, "12", &args[0], &args[1], &args[2]);
     if (rb_block_given_p()) {
-        return rb_block_call(rb_cDir, rb_intern("glob"), n, args, glob_i, klass);
+        return rb_block_call_kw(rb_cDir, id_glob, n, args, s_glob_i, klass, RB_PASS_CALLED_KEYWORDS);
     }
     else {
         VALUE ary;
         long i;
-        ary = rb_funcall2(rb_cDir, rb_intern("glob"), n, args);
+        ary = rb_funcallv_kw(rb_cDir, id_glob, n, args, RB_PASS_CALLED_KEYWORDS);
         ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
         for (i = 0; i < RARRAY_LEN(ary); i++) {
-            VALUE elt = RARRAY_PTR(ary)[i];
+            VALUE elt = RARRAY_AREF(ary, i);
             elt = rb_class_new_instance(1, &elt, klass);
             rb_ary_store(ary, i, elt);
         }
@@ -846,14 +1105,67 @@ path_s_glob(int argc, VALUE *argv, VALUE klass)
     }
 }
 
+static VALUE
+glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, self))
+{
+    elt = rb_funcall(self, '+', 1, elt);
+    return rb_yield(elt);
+}
+
+/*
+ * Returns or yields Pathname objects.
+ *
+ *  Pathname("ruby-2.4.2").glob("R*.md")
+ *  #=> [#<Pathname:ruby-2.4.2/README.md>, #<Pathname:ruby-2.4.2/README.ja.md>]
+ *
+ * See Dir.glob.
+ * This method uses the +base+ keyword argument of Dir.glob.
+ */
+static VALUE
+path_glob(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n;
+
+    n = rb_scan_args(argc, argv, "11", &args[0], &args[1]);
+    if (n == 1)
+      args[1] = INT2FIX(0);
+
+    args[2] = rb_hash_new();
+    rb_hash_aset(args[2], ID2SYM(id_base), get_strpath(self));
+
+    n = 3;
+
+    if (rb_block_given_p()) {
+        return rb_block_call_kw(rb_cDir, id_glob, n, args, glob_i, self, RB_PASS_KEYWORDS);
+    }
+    else {
+        VALUE ary;
+        long i;
+        ary = rb_funcallv_kw(rb_cDir, id_glob, n, args, RB_PASS_KEYWORDS);
+        ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
+            VALUE elt = RARRAY_AREF(ary, i);
+            elt = rb_funcall(self, '+', 1, elt);
+            rb_ary_store(ary, i, elt);
+        }
+        return ary;
+    }
+}
+
 /*
- * See <tt>Dir.getwd</tt>.  Returns the current working directory as a Pathname.
+ * Returns the current working directory as a Pathname.
+ *
+ *	Pathname.getwd
+ *	    #=> #<Pathname:/home/zzak/projects/ruby>
+ *
+ * See Dir.getwd.
  */
 static VALUE
 path_s_getwd(VALUE klass)
 {
     VALUE str;
-    str = rb_funcall(rb_cDir, rb_intern("getwd"), 0);
+    str = rb_funcall(rb_cDir, id_getwd, 0);
     return rb_class_new_instance(1, &str, klass);
 }
 
@@ -861,8 +1173,27 @@ path_s_getwd(VALUE klass)
  * Return the entries (files and subdirectories) in the directory, each as a
  * Pathname object.
  *
- * The result may contain the current directory #<Pathname:.> and the parent
- * directory #<Pathname:..>.
+ * The results contains just the names in the directory, without any trailing
+ * slashes or recursive look-up.
+ *
+ *   pp Pathname.new('/usr/local').entries
+ *   #=> [#<Pathname:share>,
+ *   #    #<Pathname:lib>,
+ *   #    #<Pathname:..>,
+ *   #    #<Pathname:include>,
+ *   #    #<Pathname:etc>,
+ *   #    #<Pathname:bin>,
+ *   #    #<Pathname:man>,
+ *   #    #<Pathname:games>,
+ *   #    #<Pathname:.>,
+ *   #    #<Pathname:sbin>,
+ *   #    #<Pathname:src>]
+ *
+ * The result may contain the current directory <code>#<Pathname:.></code> and
+ * the parent directory <code>#<Pathname:..></code>.
+ *
+ * If you don't want +.+ and +..+ and
+ * want directories, consider Pathname#children.
  */
 static VALUE
 path_entries(VALUE self)
@@ -871,10 +1202,10 @@ path_entries(VALUE self)
     long i;
     klass = rb_obj_class(self);
     str = get_strpath(self);
-    ary = rb_funcall(rb_cDir, rb_intern("entries"), 1, str);
+    ary = rb_funcall(rb_cDir, id_entries, 1, str);
     ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-        VALUE elt = RARRAY_PTR(ary)[i];
+	VALUE elt = RARRAY_AREF(ary, i);
         elt = rb_class_new_instance(1, &elt, klass);
         rb_ary_store(ary, i, elt);
     }
@@ -882,7 +1213,9 @@ path_entries(VALUE self)
 }
 
 /*
- * See <tt>Dir.mkdir</tt>.  Create the referenced directory.
+ * Create the referenced directory.
+ *
+ * See Dir.mkdir.
  */
 static VALUE
 path_mkdir(int argc, VALUE *argv, VALUE self)
@@ -890,22 +1223,26 @@ path_mkdir(int argc, VALUE *argv, VALUE self)
     VALUE str = get_strpath(self);
     VALUE vmode;
     if (rb_scan_args(argc, argv, "01", &vmode) == 0)
-        return rb_funcall(rb_cDir, rb_intern("mkdir"), 1, str);
+        return rb_funcall(rb_cDir, id_mkdir, 1, str);
     else
-        return rb_funcall(rb_cDir, rb_intern("mkdir"), 2, str, vmode);
+        return rb_funcall(rb_cDir, id_mkdir, 2, str, vmode);
 }
 
 /*
- * See <tt>Dir.rmdir</tt>.  Remove the referenced directory.
+ * Remove the referenced directory.
+ *
+ * See Dir.rmdir.
  */
 static VALUE
 path_rmdir(VALUE self)
 {
-    return rb_funcall(rb_cDir, rb_intern("rmdir"), 1, get_strpath(self));
+    return rb_funcall(rb_cDir, id_rmdir, 1, get_strpath(self));
 }
 
 /*
- * See <tt>Dir.open</tt>.
+ * Opens the referenced directory.
+ *
+ * See Dir.open.
  */
 static VALUE
 path_opendir(VALUE self)
@@ -913,20 +1250,18 @@ path_opendir(VALUE self)
     VALUE args[1];
 
     args[0] = get_strpath(self);
-    return rb_block_call(rb_cDir, rb_intern("open"), 1, args, 0, 0);
+    return rb_block_call(rb_cDir, id_open, 1, args, 0, 0);
 }
 
 static VALUE
-each_entry_i(VALUE elt, VALUE klass, int argc, VALUE *argv)
+each_entry_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass))
 {
     return rb_yield(rb_class_new_instance(1, &elt, klass));
 }
 
 /*
- * Iterates over the entries (files and subdirectories) in the directory.  It
- * yields a Pathname object for each entry.
- *
- * This method has available since 1.8.1.
+ * Iterates over the entries (files and subdirectories) in the directory,
+ * yielding a Pathname object for each entry.
  */
 static VALUE
 path_each_entry(VALUE self)
@@ -934,63 +1269,78 @@ path_each_entry(VALUE self)
     VALUE args[1];
 
     args[0] = get_strpath(self);
-    return rb_block_call(rb_cDir, rb_intern("foreach"), 1, args, each_entry_i, rb_obj_class(self));
+    return rb_block_call(rb_cDir, id_foreach, 1, args, each_entry_i, rb_obj_class(self));
 }
 
 static VALUE
 unlink_body(VALUE str)
 {
-    return rb_funcall(rb_cDir, rb_intern("unlink"), 1, str);
+    return rb_funcall(rb_cDir, id_unlink, 1, str);
 }
 
 static VALUE
 unlink_rescue(VALUE str, VALUE errinfo)
 {
-    return rb_funcall(rb_cFile, rb_intern("unlink"), 1, str);
+    return rb_funcall(rb_cFile, id_unlink, 1, str);
 }
 
 /*
- * Removes a file or directory, using <tt>File.unlink</tt> or
- * <tt>Dir.unlink</tt> as necessary.
+ * Removes a file or directory, using File.unlink if +self+ is a file, or
+ * Dir.unlink as necessary.
  */
 static VALUE
 path_unlink(VALUE self)
 {
-    VALUE eENOTDIR = rb_const_get_at(rb_mErrno, rb_intern("ENOTDIR"));
+    VALUE eENOTDIR = rb_const_get_at(rb_mErrno, id_ENOTDIR);
     VALUE str = get_strpath(self);
     return rb_rescue2(unlink_body, str, unlink_rescue, str, eENOTDIR, (VALUE)0);
 }
 
 /*
- * create a pathname object.
+ * :call-seq:
+ *  Pathname(path)  -> pathname
+ *
+ * Creates a new Pathname object from the given string, +path+, and returns
+ * pathname object.
+ *
+ * In order to use this constructor, you must first require the Pathname
+ * standard library extension.
+ *
+ *	require 'pathname'
+ *	Pathname("/home/zzak")
+ *	#=> #<Pathname:/home/zzak>
  *
- * This method is available since 1.8.5.
+ * See also Pathname::new for more information.
  */
 static VALUE
 path_f_pathname(VALUE self, VALUE str)
 {
+    if (CLASS_OF(str) == rb_cPathname)
+        return str;
     return rb_class_new_instance(1, &str, rb_cPathname);
 }
 
 /*
- * == Pathname
  *
- * Pathname represents a pathname which locates a file in a filesystem.
- * The pathname depends on OS: Unix, Windows, etc.
- * Pathname library works with pathnames of local OS.
- * However non-Unix pathnames are supported experimentally.
+ * Pathname represents the name of a file or directory on the filesystem,
+ * but not the file itself.
+ *
+ * The pathname depends on the Operating System: Unix, Windows, etc.
+ * This library works with pathnames of local OS, however non-Unix pathnames
+ * are supported experimentally.
  *
- * It does not represent the file itself.
  * A Pathname can be relative or absolute.  It's not until you try to
  * reference the file that it even matters whether the file exists or not.
  *
  * Pathname is immutable.  It has no method for destructive update.
  *
- * The value of this class is to manipulate file path information in a neater
+ * The goal of this class is to manipulate file path information in a neater
  * way than standard Ruby provides.  The examples below demonstrate the
- * difference.  *All* functionality from File, FileTest, and some from Dir and
- * FileUtils is included, in an unsurprising way.  It is essentially a facade for
- * all of these, and more.
+ * difference.
+ *
+ * *All* functionality from File, FileTest, and some from Dir and FileUtils is
+ * included, in an unsurprising way.  It is essentially a facade for all of
+ * these, and more.
  *
  * == Examples
  *
@@ -1038,8 +1388,8 @@ path_f_pathname(VALUE self, VALUE str)
  * === Core methods
  *
  * These methods are effectively manipulating a String, because that's
- * all a path is.  Except for #mountpoint?, #children, #each_child,
- * #realdirpath and #realpath, they don't access the filesystem.
+ * all a path is.  None of these access the file system except for
+ * #mountpoint?, #children, #each_child, #realdirpath and #realpath.
  *
  * - +
  * - #join
@@ -1088,6 +1438,7 @@ path_f_pathname(VALUE self, VALUE str)
  *
  * These methods are a facade for File:
  * - #atime
+ * - #birthtime
  * - #ctime
  * - #mtime
  * - #chmod(mode)
@@ -1150,10 +1501,9 @@ path_f_pathname(VALUE self, VALUE str)
  * information.  In some cases, a brief description will follow.
  */
 void
-Init_pathname()
+Init_pathname(void)
 {
-    id_at_path = rb_intern("@path");
-    id_to_path = rb_intern("to_path");
+    InitVM(pathname);
 
     rb_cPathname = rb_define_class("Pathname", rb_cObject);
     rb_define_method(rb_cPathname, "initialize", path_initialize, 1);
@@ -1176,8 +1526,11 @@ Init_pathname()
     rb_define_method(rb_cPathname, "read", path_read, -1);
     rb_define_method(rb_cPathname, "binread", path_binread, -1);
     rb_define_method(rb_cPathname, "readlines", path_readlines, -1);
+    rb_define_method(rb_cPathname, "write", path_write, -1);
+    rb_define_method(rb_cPathname, "binwrite", path_binwrite, -1);
     rb_define_method(rb_cPathname, "sysopen", path_sysopen, -1);
     rb_define_method(rb_cPathname, "atime", path_atime, 0);
+    rb_define_method(rb_cPathname, "birthtime", path_birthtime, 0);
     rb_define_method(rb_cPathname, "ctime", path_ctime, 0);
     rb_define_method(rb_cPathname, "mtime", path_mtime, 0);
     rb_define_method(rb_cPathname, "chmod", path_chmod, 1);
@@ -1225,9 +1578,11 @@ Init_pathname()
     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);
+    rb_define_method(rb_cPathname, "glob", path_glob, -1);
     rb_define_method(rb_cPathname, "entries", path_entries, 0);
     rb_define_method(rb_cPathname, "mkdir", path_mkdir, -1);
     rb_define_method(rb_cPathname, "rmdir", path_rmdir, 0);
@@ -1238,3 +1593,78 @@ Init_pathname()
     rb_undef_method(rb_cPathname, "=~");
     rb_define_global_function("Pathname", path_f_pathname, 1);
 }
+
+void
+InitVM_pathname(void)
+{
+#undef rb_intern
+    id_at_path = rb_intern("@path");
+    id_to_path = rb_intern("to_path");
+    id_ENOTDIR = rb_intern("ENOTDIR");
+    id_atime = rb_intern("atime");
+    id_basename = rb_intern("basename");
+    id_base = rb_intern("base");
+    id_binread = rb_intern("binread");
+    id_binwrite = rb_intern("binwrite");
+    id_birthtime = rb_intern("birthtime");
+    id_blockdev_p = rb_intern("blockdev?");
+    id_chardev_p = rb_intern("chardev?");
+    id_chmod = rb_intern("chmod");
+    id_chown = rb_intern("chown");
+    id_ctime = rb_intern("ctime");
+    id_directory_p = rb_intern("directory?");
+    id_dirname = rb_intern("dirname");
+    id_empty_p = rb_intern("empty?");
+    id_entries = rb_intern("entries");
+    id_executable_p = rb_intern("executable?");
+    id_executable_real_p = rb_intern("executable_real?");
+    id_exist_p = rb_intern("exist?");
+    id_expand_path = rb_intern("expand_path");
+    id_extname = rb_intern("extname");
+    id_file_p = rb_intern("file?");
+    id_fnmatch = rb_intern("fnmatch");
+    id_foreach = rb_intern("foreach");
+    id_ftype = rb_intern("ftype");
+    id_getwd = rb_intern("getwd");
+    id_glob = rb_intern("glob");
+    id_grpowned_p = rb_intern("grpowned?");
+    id_lchmod = rb_intern("lchmod");
+    id_lchown = rb_intern("lchown");
+    id_link = rb_intern("link");
+    id_lstat = rb_intern("lstat");
+    id_mkdir = rb_intern("mkdir");
+    id_mtime = rb_intern("mtime");
+    id_open = rb_intern("open");
+    id_owned_p = rb_intern("owned?");
+    id_pipe_p = rb_intern("pipe?");
+    id_read = rb_intern("read");
+    id_readable_p = rb_intern("readable?");
+    id_readable_real_p = rb_intern("readable_real?");
+    id_readlines = rb_intern("readlines");
+    id_readlink = rb_intern("readlink");
+    id_realdirpath = rb_intern("realdirpath");
+    id_realpath = rb_intern("realpath");
+    id_rename = rb_intern("rename");
+    id_rmdir = rb_intern("rmdir");
+    id_setgid_p = rb_intern("setgid?");
+    id_setuid_p = rb_intern("setuid?");
+    id_size = rb_intern("size");
+    id_size_p = rb_intern("size?");
+    id_socket_p = rb_intern("socket?");
+    id_split = rb_intern("split");
+    id_stat = rb_intern("stat");
+    id_sticky_p = rb_intern("sticky?");
+    id_sub = rb_intern("sub");
+    id_symlink = rb_intern("symlink");
+    id_symlink_p = rb_intern("symlink?");
+    id_sysopen = rb_intern("sysopen");
+    id_truncate = rb_intern("truncate");
+    id_unlink = rb_intern("unlink");
+    id_utime = rb_intern("utime");
+    id_world_readable_p = rb_intern("world_readable?");
+    id_world_writable_p = rb_intern("world_writable?");
+    id_writable_p = rb_intern("writable?");
+    id_writable_real_p = rb_intern("writable_real?");
+    id_write = rb_intern("write");
+    id_zero_p = rb_intern("zero?");
+}
diff --git a/ext/psych/depend b/ext/psych/depend
new file mode 100644
index 0000000000..dc358eaed3
--- /dev/null
+++ b/ext/psych/depend
@@ -0,0 +1,104 @@
+$(OBJS): $(YAML_H)
+
+# AUTOGENERATED DEPENDENCIES START
+psych.o: $(RUBY_EXTCONF_H)
+psych.o: $(arch_hdrdir)/ruby/config.h
+psych.o: $(hdrdir)/ruby.h
+psych.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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.h
+psych_emitter.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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.h
+psych_parser.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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.h
+psych_to_ruby.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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.h
+psych_yaml_tree.o: $(hdrdir)/ruby/assert.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/onigmo.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: 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
diff --git a/ext/psych/emitter.c b/ext/psych/emitter.c
deleted file mode 100644
index a85fa45ef5..0000000000
--- a/ext/psych/emitter.c
+++ /dev/null
@@ -1,517 +0,0 @@
-#include <psych.h>
-
-VALUE cPsychEmitter;
-static ID id_write;
-
-static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
-{
-    if(!yaml_emitter_emit(emitter, event))
-	rb_raise(rb_eRuntimeError, "%s", emitter->problem);
-}
-
-static int writer(void *ctx, unsigned char *buffer, size_t size)
-{
-    VALUE io = (VALUE)ctx;
-    VALUE str = rb_str_new((const char *)buffer, (long)size);
-    VALUE wrote = rb_funcall(io, id_write, 1, str);
-    return (int)NUM2INT(wrote);
-}
-
-static void dealloc(void * ptr)
-{
-    yaml_emitter_t * emitter;
-
-    emitter = (yaml_emitter_t *)ptr;
-    yaml_emitter_delete(emitter);
-    xfree(emitter);
-}
-
-static VALUE allocate(VALUE klass)
-{
-    yaml_emitter_t * emitter;
-
-    emitter = xmalloc(sizeof(yaml_emitter_t));
-
-    yaml_emitter_initialize(emitter);
-    yaml_emitter_set_unicode(emitter, 1);
-    yaml_emitter_set_indent(emitter, 2);
-
-    return Data_Wrap_Struct(klass, 0, dealloc, emitter);
-}
-
-/* call-seq: Psych::Emitter.new(io)
- *
- * Create a new Psych::Emitter that writes to +io+.
- */
-static VALUE initialize(VALUE self, VALUE io)
-{
-    yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-    yaml_emitter_set_output(emitter, writer, (void *)io);
-
-    return self;
-}
-
-/* call-seq: emitter.start_stream(encoding)
- *
- * Start a stream emission with +encoding+
- *
- * See Psych::Handler#start_stream
- */
-static VALUE start_stream(VALUE self, VALUE encoding)
-{
-    yaml_emitter_t * emitter;
-    yaml_event_t event;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-    Check_Type(encoding, T_FIXNUM);
-
-    yaml_stream_start_event_initialize(&event, (yaml_encoding_t)NUM2INT(encoding));
-
-    emit(emitter, &event);
-
-    return self;
-}
-
-/* call-seq: emitter.end_stream
- *
- * End a stream emission
- *
- * See Psych::Handler#end_stream
- */
-static VALUE end_stream(VALUE self)
-{
-    yaml_emitter_t * emitter;
-    yaml_event_t event;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-    yaml_stream_end_event_initialize(&event);
-
-    emit(emitter, &event);
-
-    return self;
-}
-
-/* call-seq: emitter.start_document(version, tags, implicit)
- *
- * Start a document emission with YAML +version+, +tags+, and an +implicit+
- * start.
- *
- * See Psych::Handler#start_document
- */
-static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
-{
-    yaml_emitter_t * emitter;
-    yaml_tag_directive_t * head = NULL;
-    yaml_tag_directive_t * tail = NULL;
-    yaml_event_t event;
-    yaml_version_directive_t version_directive;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-
-    Check_Type(version, T_ARRAY);
-
-    if(RARRAY_LEN(version) > 0) {
-	VALUE major = rb_ary_entry(version, (long)0);
-	VALUE minor = rb_ary_entry(version, (long)1);
-
-	version_directive.major = NUM2INT(major);
-	version_directive.minor = NUM2INT(minor);
-    }
-
-    if(RTEST(tags)) {
-	int i = 0;
-#ifdef HAVE_RUBY_ENCODING_H
-	rb_encoding * encoding = rb_utf8_encoding();
-#endif
-
-	Check_Type(tags, T_ARRAY);
-
-	head  = xcalloc((size_t)RARRAY_LEN(tags), sizeof(yaml_tag_directive_t));
-	tail  = head;
-
-	for(i = 0; i < RARRAY_LEN(tags); i++) {
-	    VALUE tuple = RARRAY_PTR(tags)[i];
-	    VALUE name;
-	    VALUE value;
-
-	    Check_Type(tuple, T_ARRAY);
-
-	    if(RARRAY_LEN(tuple) < 2) {
-		xfree(head);
-		rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
-	    }
-	    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 *)StringValuePtr(name);
-	    tail->prefix = (yaml_char_t *)StringValuePtr(value);
-
-	    tail++;
-	}
-    }
-
-    yaml_document_start_event_initialize(
-	    &event,
-	    (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
-	    head,
-	    tail,
-	    imp ? 1 : 0
-	    );
-
-    emit(emitter, &event);
-
-    if(head) xfree(head);
-
-    return self;
-}
-
-/* call-seq: emitter.end_document(implicit)
- *
- * End a document emission with an +implicit+ ending.
- *
- * See Psych::Handler#end_document
- */
-static VALUE end_document(VALUE self, VALUE imp)
-{
-    yaml_emitter_t * emitter;
-    yaml_event_t event;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-    yaml_document_end_event_initialize(&event, imp ? 1 : 0);
-
-    emit(emitter, &event);
-
-    return self;
-}
-
-/* call-seq: emitter.scalar(value, anchor, tag, plain, quoted, style)
- *
- * Emit a scalar with +value+, +anchor+, +tag+, and a +plain+ or +quoted+
- * string type with +style+.
- *
- * See Psych::Handler#scalar
- */
-static VALUE scalar(
-	VALUE self,
-	VALUE value,
-	VALUE anchor,
-	VALUE tag,
-	VALUE plain,
-	VALUE quoted,
-	VALUE style
-	) {
-    yaml_emitter_t * emitter;
-    yaml_event_t event;
-#ifdef HAVE_RUBY_ENCODING_H
-    rb_encoding *encoding;
-#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);
-
-    if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
-    }
-
-    if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
-    }
-#endif
-
-    yaml_scalar_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
-	    (yaml_char_t*)StringValuePtr(value),
-	    (int)RSTRING_LEN(value),
-	    plain ? 1 : 0,
-	    quoted ? 1 : 0,
-	    (yaml_scalar_style_t)NUM2INT(style)
-	    );
-
-    emit(emitter, &event);
-
-    return self;
-}
-
-/* call-seq: emitter.start_sequence(anchor, tag, implicit, style)
- *
- * Start emitting a sequence with +anchor+, a +tag+, +implicit+ sequence
- * start and end, along with +style+.
- *
- * See Psych::Handler#start_sequence
- */
-static VALUE start_sequence(
-	VALUE self,
-	VALUE anchor,
-	VALUE tag,
-	VALUE implicit,
-	VALUE style
-	) {
-    yaml_emitter_t * emitter;
-    yaml_event_t event;
-
-#ifdef HAVE_RUBY_ENCODING_H
-    rb_encoding * encoding = rb_utf8_encoding();
-
-    if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
-    }
-
-    if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
-    }
-#endif
-
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-    yaml_sequence_start_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
-	    implicit ? 1 : 0,
-	    (yaml_sequence_style_t)NUM2INT(style)
-	    );
-
-    emit(emitter, &event);
-
-    return self;
-}
-
-/* call-seq: emitter.end_sequence
- *
- * End sequence emission.
- *
- * See Psych::Handler#end_sequence
- */
-static VALUE end_sequence(VALUE self)
-{
-    yaml_emitter_t * emitter;
-    yaml_event_t event;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-    yaml_sequence_end_event_initialize(&event);
-
-    emit(emitter, &event);
-
-    return self;
-}
-
-/* call-seq: emitter.start_mapping(anchor, tag, implicit, style)
- *
- * Start emitting a YAML map with +anchor+, +tag+, an +implicit+ start
- * and end, and +style+.
- *
- * See Psych::Handler#start_mapping
- */
-static VALUE start_mapping(
-	VALUE self,
-	VALUE anchor,
-	VALUE tag,
-	VALUE implicit,
-	VALUE style
-	) {
-    yaml_emitter_t * emitter;
-    yaml_event_t event;
-#ifdef HAVE_RUBY_ENCODING_H
-    rb_encoding *encoding;
-#endif
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-#ifdef HAVE_RUBY_ENCODING_H
-    encoding = rb_utf8_encoding();
-
-    if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
-    }
-
-    if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
-    }
-#endif
-
-    yaml_mapping_start_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
-	    implicit ? 1 : 0,
-	    (yaml_sequence_style_t)NUM2INT(style)
-	    );
-
-    emit(emitter, &event);
-
-    return self;
-}
-
-/* call-seq: emitter.end_mapping
- *
- * Emit the end of a mapping.
- *
- * See Psych::Handler#end_mapping
- */
-static VALUE end_mapping(VALUE self)
-{
-    yaml_emitter_t * emitter;
-    yaml_event_t event;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-    yaml_mapping_end_event_initialize(&event);
-
-    emit(emitter, &event);
-
-    return self;
-}
-
-/* call-seq: emitter.alias(anchor)
- *
- * Emit an alias with +anchor+.
- *
- * See Psych::Handler#alias
- */
-static VALUE alias(VALUE self, VALUE anchor)
-{
-    yaml_emitter_t * emitter;
-    yaml_event_t event;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-#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,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor))
-	    );
-
-    emit(emitter, &event);
-
-    return self;
-}
-
-/* call-seq: emitter.canonical = true
- *
- * Set the output style to canonical, or not.
- */
-static VALUE set_canonical(VALUE self, VALUE style)
-{
-    yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-    yaml_emitter_set_canonical(emitter, Qtrue == style ? 1 : 0);
-
-    return style;
-}
-
-/* call-seq: emitter.canonical
- *
- * Get the output style, canonical or not.
- */
-static VALUE canonical(VALUE self)
-{
-    yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-    return (emitter->canonical == 0) ? Qfalse : Qtrue;
-}
-
-/* call-seq: emitter.indentation = level
- *
- * Set the indentation level to +level+.  The level must be less than 10 and
- * greater than 1.
- */
-static VALUE set_indentation(VALUE self, VALUE level)
-{
-    yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-    yaml_emitter_set_indent(emitter, NUM2INT(level));
-
-    return level;
-}
-
-/* call-seq: emitter.indentation
- *
- * Get the indentation level.
- */
-static VALUE indentation(VALUE self)
-{
-    yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-    return INT2NUM(emitter->best_indent);
-}
-
-/* call-seq: emitter.line_width
- *
- * Get the preferred line width.
- */
-static VALUE line_width(VALUE self)
-{
-    yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-    return INT2NUM(emitter->best_width);
-}
-
-/* call-seq: emitter.line_width = width
- *
- * Set the preferred line with to +width+.
- */
-static VALUE set_line_width(VALUE self, VALUE width)
-{
-    yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-    yaml_emitter_set_width(emitter, NUM2INT(width));
-
-    return width;
-}
-
-void Init_psych_emitter()
-{
-    VALUE psych     = rb_define_module("Psych");
-    VALUE handler   = rb_define_class_under(psych, "Handler", rb_cObject);
-    cPsychEmitter   = rb_define_class_under(psych, "Emitter", handler);
-
-    rb_define_alloc_func(cPsychEmitter, allocate);
-
-    rb_define_method(cPsychEmitter, "initialize", initialize, 1);
-    rb_define_method(cPsychEmitter, "start_stream", start_stream, 1);
-    rb_define_method(cPsychEmitter, "end_stream", end_stream, 0);
-    rb_define_method(cPsychEmitter, "start_document", start_document, 3);
-    rb_define_method(cPsychEmitter, "end_document", end_document, 1);
-    rb_define_method(cPsychEmitter, "scalar", scalar, 6);
-    rb_define_method(cPsychEmitter, "start_sequence", start_sequence, 4);
-    rb_define_method(cPsychEmitter, "end_sequence", end_sequence, 0);
-    rb_define_method(cPsychEmitter, "start_mapping", start_mapping, 4);
-    rb_define_method(cPsychEmitter, "end_mapping", end_mapping, 0);
-    rb_define_method(cPsychEmitter, "alias", alias, 1);
-    rb_define_method(cPsychEmitter, "canonical", canonical, 0);
-    rb_define_method(cPsychEmitter, "canonical=", set_canonical, 1);
-    rb_define_method(cPsychEmitter, "indentation", indentation, 0);
-    rb_define_method(cPsychEmitter, "indentation=", set_indentation, 1);
-    rb_define_method(cPsychEmitter, "line_width", line_width, 0);
-    rb_define_method(cPsychEmitter, "line_width=", set_line_width, 1);
-
-    id_write = rb_intern("write");
-}
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/emitter.h b/ext/psych/emitter.h
deleted file mode 100644
index 560451ef31..0000000000
--- a/ext/psych/emitter.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef PSYCH_EMITTER_H
-#define PSYCH_EMITTER_H
-
-#include <psych.h>
-
-void Init_psych_emitter();
-
-#endif
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index 11f44ac104..857f8e68c4 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -1,16 +1,43 @@
+# -*- coding: us-ascii -*-
+# frozen_string_literal: true
 require 'mkmf'
+require 'fileutils'
 
 # :stopdoc:
 
 dir_config 'libyaml'
 
-def asplode missing
-  abort "#{missing} is missing. Please install libyaml."
-end
+if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_library('yaml', 'yaml_get_version'))
+  # Embed libyaml since we could not find it.
+
+  $VPATH << "$(srcdir)/yaml"
+  $INCFLAGS << " -I$(srcdir)/yaml"
+
+  $srcs = Dir.glob("#{$srcdir}/{,yaml/}*.c").map {|n| File.basename(n)}.sort
+
+  header = 'yaml/yaml.h'
+  header = "{$(VPATH)}#{header}" if $nmake
+  if have_macro("_WIN32")
+    $CPPFLAGS << " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"
+  end
 
-asplode('yaml.h')  unless find_header  'yaml.h'
-asplode('libyaml') unless find_library 'yaml', 'yaml_get_version'
+  have_header 'dlfcn.h'
+  have_header 'inttypes.h'
+  have_header 'memory.h'
+  have_header 'stdint.h'
+  have_header 'stdlib.h'
+  have_header 'strings.h'
+  have_header 'string.h'
+  have_header 'sys/stat.h'
+  have_header 'sys/types.h'
+  have_header 'unistd.h'
 
-create_makefile 'psych'
+  find_header 'yaml.h'
+  have_header 'config.h'
+end
+
+create_makefile 'psych' do |mk|
+  mk << "YAML_H = #{header}".strip << "\n"
+end
 
 # :startdoc:
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index cf17eaaa27..c719b036d0 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -1,4 +1,17 @@
-require 'psych.so'
+# frozen_string_literal: true
+require 'psych/versions'
+case RUBY_ENGINE
+when 'jruby'
+  require 'psych_jars'
+  if JRuby::Util.respond_to?(:load_ext)
+    JRuby::Util.load_ext('org.jruby.ext.psych.PsychLibrary')
+  else
+    require 'java'; require 'jruby'
+    org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
+  end
+else
+  require 'psych.so'
+end
 require 'psych/nodes'
 require 'psych/streaming'
 require 'psych/visitors'
@@ -9,16 +22,21 @@ require 'psych/omap'
 require 'psych/set'
 require 'psych/coder'
 require 'psych/core_ext'
-require 'psych/deprecated'
-require 'psych/json'
+require 'psych/stream'
+require 'psych/json/tree_builder'
+require 'psych/json/stream'
+require 'psych/handlers/document_stream'
+require 'psych/class_loader'
 
 ###
 # = Overview
 #
-# Psych is a YAML parser and emitter.  Psych leverages
-# libyaml[http://libyaml.org] for it's YAML parsing and emitting capabilities.
-# In addition to wrapping libyaml, Psych also knows how to serialize and
-# de-serialize most Ruby objects to and from the YAML format.
+# Psych is a YAML parser and emitter.
+# Psych leverages libyaml [Home page: https://pyyaml.org/wiki/LibYAML]
+# or [HG repo: https://bitbucket.org/xi/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.
 #
 # = I NEED TO PARSE OR EMIT YAML RIGHT NOW!
 #
@@ -36,16 +54,74 @@ require 'psych/json'
 # Psych provides a range of interfaces for parsing a YAML document ranging from
 # low level to high level, depending on your parsing needs.  At the lowest
 # level, is an event based parser.  Mid level is access to the raw YAML AST,
-# and at the highest level is the ability to unmarshal YAML to ruby objects.
+# and at the highest level is the ability to unmarshal YAML to Ruby objects.
 #
-# === Low level parsing
+# == YAML Emitting
 #
-# The lowest level parser should be used when the YAML input is already known,
-# and the developer does not want to pay the price of building an AST or
-# automatic detection and conversion to ruby objects.  See Psych::Parser for
-# more information on using the event based parser.
+# Psych provides a range of interfaces ranging from low to high level for
+# producing YAML documents.  Very similar to the YAML parsing interfaces, Psych
+# provides at the lowest level, an event based system, mid-level is building
+# a YAML AST, and the highest level is converting a Ruby object straight to
+# a YAML document.
+#
+# == High-level API
+#
+# === Parsing
+#
+# The high level YAML parser provided by Psych simply takes YAML as input and
+# returns a Ruby data structure.  For information on using the high level parser
+# see Psych.load
+#
+# ==== Reading from a string
+#
+#   Psych.load("--- a")             # => 'a'
+#   Psych.load("---\n - a\n - b")   # => ['a', 'b']
+#
+# ==== Reading from a file
 #
-# === Mid level parsing
+#   Psych.load_file("database.yml")
+#
+# ==== Exception handling
+#
+#   begin
+#     # The second argument changes only the exception contents
+#     Psych.parse("--- `", "file.txt")
+#   rescue Psych::SyntaxError => ex
+#     ex.file    # => 'file.txt'
+#     ex.message # => "(file.txt): found character that cannot start any token"
+#   end
+#
+# === Emitting
+#
+# The high level emitter has the easiest interface.  Psych simply takes a Ruby
+# data structure and converts it to a YAML document.  See Psych.dump for more
+# information on dumping a Ruby data structure.
+#
+# ==== Writing to a string
+#
+#   # Dump an array, get back a YAML string
+#   Psych.dump(['a', 'b'])  # => "---\n- a\n- b\n"
+#
+#   # Dump an array to an IO object
+#   Psych.dump(['a', 'b'], StringIO.new)  # => #<StringIO:0x000001009d0890>
+#
+#   # Dump an array with indentation set
+#   Psych.dump(['a', ['b']], :indentation => 3) # => "---\n- a\n-  - b\n"
+#
+#   # Dump an array to an IO with indentation set
+#   Psych.dump(['a', ['b']], StringIO.new, :indentation => 3)
+#
+# ==== Writing to a file
+#
+# Currently there is no direct API for dumping Ruby structure to file:
+#
+#   File.open('database.yml', 'w') do |file|
+#     file.write(Psych.dump(['a', 'b']))
+#   end
+#
+# == Mid-level API
+#
+# === Parsing
 #
 # Psych provides access to an AST produced from parsing a YAML document.  This
 # tree is built using the Psych::Parser and Psych::TreeBuilder.  The AST can
@@ -53,28 +129,33 @@ require 'psych/json'
 # Psych::Nodes, and Psych::Nodes::Node for more information on dealing with
 # YAML syntax trees.
 #
-# === High level parsing
+# ==== Reading from a string
 #
-# The high level YAML parser provided by Psych simply takes YAML as input and
-# returns a Ruby data structure.  For information on using the high level parser
-# see Psych.load
+#   # Returns Psych::Nodes::Stream
+#   Psych.parse_stream("---\n - a\n - b")
 #
-# == YAML Emitting
+#   # Returns Psych::Nodes::Document
+#   Psych.parse("---\n - a\n - b")
 #
-# Psych provides a range of interfaces ranging from low to high level for
-# producing YAML documents.  Very similar to the YAML parsing interfaces, Psych
-# provides at the lowest level, an event based system, mid-level is building
-# a YAML AST, and the highest level is converting a Ruby object straight to
-# a YAML document.
+# ==== Reading from a file
 #
-# === Low level emitting
+#   # Returns Psych::Nodes::Stream
+#   Psych.parse_stream(File.read('database.yml'))
 #
-# The lowest level emitter is an event based system.  Events are sent to a
-# Psych::Emitter object.  That object knows how to convert the events to a YAML
-# document.  This interface should be used when document format is known in
-# advance or speed is a concern.  See Psych::Emitter for more information.
+#   # Returns Psych::Nodes::Document
+#   Psych.parse_file('database.yml')
+#
+# ==== Exception handling
+#
+#   begin
+#     # The second argument changes only the exception contents
+#     Psych.parse("--- `", "file.txt")
+#   rescue Psych::SyntaxError => ex
+#     ex.file    # => 'file.txt'
+#     ex.message # => "(file.txt): found character that cannot start any token"
+#   end
 #
-# === Mid level emitting
+# === Emitting
 #
 # At the mid level is building an AST.  This AST is exactly the same as the AST
 # used when parsing a YAML document.  Users can build an AST by hand and the
@@ -82,56 +163,251 @@ require 'psych/json'
 # Psych::Nodes::Node, and Psych::TreeBuilder for more information on building
 # a YAML AST.
 #
-# === High level emitting
+# ==== Writing to a string
 #
-# The high level emitter has the easiest interface.  Psych simply takes a Ruby
-# data structure and converts it to a YAML document.  See Psych.dump for more
-# information on dumping a Ruby data structure.
+#   # We need Psych::Nodes::Stream (not Psych::Nodes::Document)
+#   stream = Psych.parse_stream("---\n - a\n - b")
+#
+#   stream.to_yaml # => "---\n- a\n- b\n"
+#
+# ==== Writing to a file
+#
+#   # We need Psych::Nodes::Stream (not Psych::Nodes::Document)
+#   stream = Psych.parse_stream(File.read('database.yml'))
+#
+#   File.open('database.yml', 'w') do |file|
+#     file.write(stream.to_yaml)
+#   end
+#
+# == Low-level API
+#
+# === Parsing
+#
+# The lowest level parser should be used when the YAML input is already known,
+# and the developer does not want to pay the price of building an AST or
+# automatic detection and conversion to Ruby objects.  See Psych::Parser for
+# more information on using the event based parser.
+#
+# ==== Reading to Psych::Nodes::Stream structure
+#
+#   parser = Psych::Parser.new(TreeBuilder.new) # => #<Psych::Parser>
+#   parser = Psych.parser                       # it's an alias for the above
+#
+#   parser.parse("---\n - a\n - b")             # => #<Psych::Parser>
+#   parser.handler                              # => #<Psych::TreeBuilder>
+#   parser.handler.root                         # => #<Psych::Nodes::Stream>
+#
+# ==== Receiving an events stream
+#
+#   recorder = Psych::Handlers::Recorder.new
+#   parser = Psych::Parser.new(recorder)
+#
+#   parser.parse("---\n - a\n - b")
+#   recorder.events # => [list of [event, args] lists]
+#                   # event is one of: Psych::Handler::EVENTS
+#                   # args are the arguments passed to the event
+#
+# === Emitting
+#
+# The lowest level emitter is an event based system.  Events are sent to a
+# Psych::Emitter object.  That object knows how to convert the events to a YAML
+# document.  This interface should be used when document format is known in
+# advance or speed is a concern.  See Psych::Emitter for more information.
+#
+# ==== Writing to a Ruby structure
+#
+#   Psych.parser.parse("--- a")       # => #<Psych::Parser>
+#
+#   parser.handler.first              # => #<Psych::Nodes::Stream>
+#   parser.handler.first.to_ruby      # => ["a"]
+#
+#   parser.handler.root.first         # => #<Psych::Nodes::Document>
+#   parser.handler.root.first.to_ruby # => "a"
+#
+#   # You can instantiate an Emitter manually
+#   Psych::Visitors::ToRuby.new.accept(parser.handler.root.first)
+#   # => "a"
 
 module Psych
-  # The version is Psych you're using
-  VERSION         = '1.2.1'
-
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'
-
-  class Exception < RuntimeError
-  end
-
-  autoload :Stream, 'psych/stream'
+  # Deprecation guard
+  NOT_GIVEN = Object.new
+  private_constant :NOT_GIVEN
 
   ###
   # Load +yaml+ in to a Ruby data structure.  If multiple documents are
   # provided, the object contained in the first document will be returned.
+  # +filename+ will be used in the exception message if any exception
+  # is raised while parsing.  If +yaml+ is empty, it returns
+  # the specified +fallback+ return value, which defaults to +false+.
+  #
+  # Raises a Psych::SyntaxError when a YAML syntax error is detected.
   #
   # Example:
   #
-  #   Psych.load("--- a")           # => 'a'
-  #   Psych.load("---\n - a\n - b") # => ['a', 'b']
-  def self.load yaml
-    result = parse(yaml)
-    result ? result.to_ruby : result
+  #   Psych.load("--- a")             # => 'a'
+  #   Psych.load("---\n - a\n - b")   # => ['a', 'b']
+  #
+  #   begin
+  #     Psych.load("--- `", filename: "file.txt")
+  #   rescue Psych::SyntaxError => ex
+  #     ex.file    # => 'file.txt'
+  #     ex.message # => "(file.txt): found character that cannot start any token"
+  #   end
+  #
+  # When the optional +symbolize_names+ keyword argument is set to a
+  # true value, returns symbols for keys in Hash objects (default: strings).
+  #
+  #   Psych.load("---\n foo: bar")                         # => {"foo"=>"bar"}
+  #   Psych.load("---\n foo: bar", symbolize_names: true)  # => {:foo=>"bar"}
+  #
+  # Raises a TypeError when `yaml` parameter is NilClass
+  #
+  # NOTE: This method *should not* be used to parse untrusted documents, such as
+  # YAML documents that are supplied via user input.  Instead, please use the
+  # safe_load method.
+  #
+  def self.load yaml, legacy_filename = NOT_GIVEN, filename: nil, fallback: false, symbolize_names: false
+    if legacy_filename != NOT_GIVEN
+      warn_with_uplevel 'Passing filename with the 2nd argument of Psych.load is deprecated. Use keyword argument like Psych.load(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
+      filename = legacy_filename
+    end
+
+    result = parse(yaml, filename: filename)
+    return fallback unless result
+    result = result.to_ruby if result
+    symbolize_names!(result) if symbolize_names
+    result
+  end
+
+  ###
+  # Safely load the yaml string in +yaml+.  By default, only the following
+  # classes are allowed to be deserialized:
+  #
+  # * TrueClass
+  # * FalseClass
+  # * NilClass
+  # * Numeric
+  # * String
+  # * Array
+  # * Hash
+  #
+  # Recursive data structures are not allowed by default.  Arbitrary classes
+  # can be allowed by adding those classes to the +permitted_classes+ keyword argument.  They are
+  # additive.  For example, to allow Date deserialization:
+  #
+  #   Psych.safe_load(yaml, permitted_classes: [Date])
+  #
+  # Now the Date class can be loaded in addition to the classes listed above.
+  #
+  # Aliases can be explicitly allowed by changing the +aliases+ keyword argument.
+  # For example:
+  #
+  #   x = []
+  #   x << x
+  #   yaml = Psych.dump x
+  #   Psych.safe_load yaml               # => raises an exception
+  #   Psych.safe_load yaml, aliases: true # => loads the aliases
+  #
+  # A Psych::DisallowedClass exception will be raised if the yaml contains a
+  # class that isn't in the +permitted_classes+ list.
+  #
+  # A Psych::BadAlias exception will be raised if the yaml contains aliases
+  # but the +aliases+ keyword argument is set to false.
+  #
+  # +filename+ will be used in the exception message if any exception is raised
+  # while parsing.
+  #
+  # When the optional +symbolize_names+ keyword argument is set to a
+  # true value, returns symbols for keys in Hash objects (default: strings).
+  #
+  #   Psych.safe_load("---\n foo: bar")                         # => {"foo"=>"bar"}
+  #   Psych.safe_load("---\n foo: bar", symbolize_names: true)  # => {:foo=>"bar"}
+  #
+  def self.safe_load yaml, legacy_permitted_classes = NOT_GIVEN, legacy_permitted_symbols = NOT_GIVEN, legacy_aliases = NOT_GIVEN, legacy_filename = NOT_GIVEN, permitted_classes: [], permitted_symbols: [], aliases: false, filename: nil, fallback: nil, symbolize_names: false
+    if legacy_permitted_classes != NOT_GIVEN
+      warn_with_uplevel 'Passing permitted_classes with the 2nd argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, permitted_classes: ...) instead.', uplevel: 1 if $VERBOSE
+      permitted_classes = legacy_permitted_classes
+    end
+
+    if legacy_permitted_symbols != NOT_GIVEN
+      warn_with_uplevel 'Passing permitted_symbols with the 3rd argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, permitted_symbols: ...) instead.', uplevel: 1 if $VERBOSE
+      permitted_symbols = legacy_permitted_symbols
+    end
+
+    if legacy_aliases != NOT_GIVEN
+      warn_with_uplevel 'Passing aliases with the 4th argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, aliases: ...) instead.', uplevel: 1 if $VERBOSE
+      aliases = legacy_aliases
+    end
+
+    if legacy_filename != NOT_GIVEN
+      warn_with_uplevel 'Passing filename with the 5th argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
+      filename = legacy_filename
+    end
+
+    result = parse(yaml, filename: filename)
+    return fallback unless result
+
+    class_loader = ClassLoader::Restricted.new(permitted_classes.map(&:to_s),
+                                               permitted_symbols.map(&:to_s))
+    scanner      = ScalarScanner.new class_loader
+    visitor = if aliases
+                Visitors::ToRuby.new scanner, class_loader
+              else
+                Visitors::NoAliasRuby.new scanner, class_loader
+              end
+    result = visitor.accept result
+    symbolize_names!(result) if symbolize_names
+    result
   end
 
   ###
-  # Parse a YAML string in +yaml+.  Returns the first object of a YAML AST.
+  # Parse a YAML string in +yaml+.  Returns the Psych::Nodes::Document.
+  # +filename+ is used in the exception message if a Psych::SyntaxError is
+  # raised.
+  #
+  # Raises a Psych::SyntaxError when a YAML syntax error is detected.
   #
   # Example:
   #
-  #   Psych.parse("---\n - a\n - b") # => #<Psych::Nodes::Sequence:0x00>
+  #   Psych.parse("---\n - a\n - b") # => #<Psych::Nodes::Document:0x00>
+  #
+  #   begin
+  #     Psych.parse("--- `", filename: "file.txt")
+  #   rescue Psych::SyntaxError => ex
+  #     ex.file    # => 'file.txt'
+  #     ex.message # => "(file.txt): found character that cannot start any token"
+  #   end
   #
   # See Psych::Nodes for more information about YAML AST.
-  def self.parse yaml
-    children = parse_stream(yaml).children
-    children.empty? ? false : children.first.children.first
+  def self.parse yaml, legacy_filename = NOT_GIVEN, filename: nil, fallback: NOT_GIVEN
+    if legacy_filename != NOT_GIVEN
+      warn_with_uplevel 'Passing filename with the 2nd argument of Psych.parse is deprecated. Use keyword argument like Psych.parse(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
+      filename = legacy_filename
+    end
+
+    parse_stream(yaml, filename: filename) do |node|
+      return node
+    end
+
+    if fallback != NOT_GIVEN
+      warn_with_uplevel 'Passing the `fallback` keyword argument of Psych.parse is deprecated.', uplevel: 1 if $VERBOSE
+      fallback
+    else
+      false
+    end
   end
 
   ###
-  # Parse a file at +filename+. Returns the YAML AST.
-  def self.parse_file filename
-    File.open filename do |f|
-      parse f
+  # Parse a file at +filename+. Returns the Psych::Nodes::Document.
+  #
+  # Raises a Psych::SyntaxError when a YAML syntax error is detected.
+  def self.parse_file filename, fallback: false
+    result = File.open filename, 'r:bom|utf-8' do |f|
+      parse f, filename: filename
     end
+    result || fallback
   end
 
   ###
@@ -141,18 +417,48 @@ module Psych
   end
 
   ###
-  # Parse a YAML string in +yaml+.  Returns the full AST for the YAML document.
+  # Parse a YAML string in +yaml+.  Returns the Psych::Nodes::Stream.
   # This method can handle multiple YAML documents contained in +yaml+.
+  # +filename+ is used in the exception message if a Psych::SyntaxError is
+  # raised.
+  #
+  # If a block is given, a Psych::Nodes::Document node will be yielded to the
+  # block as it's being parsed.
+  #
+  # Raises a Psych::SyntaxError when a YAML syntax error is detected.
   #
   # Example:
   #
   #   Psych.parse_stream("---\n - a\n - b") # => #<Psych::Nodes::Stream:0x00>
   #
+  #   Psych.parse_stream("--- a\n--- b") do |node|
+  #     node # => #<Psych::Nodes::Document:0x00>
+  #   end
+  #
+  #   begin
+  #     Psych.parse_stream("--- `", filename: "file.txt")
+  #   rescue Psych::SyntaxError => ex
+  #     ex.file    # => 'file.txt'
+  #     ex.message # => "(file.txt): found character that cannot start any token"
+  #   end
+  #
+  # Raises a TypeError when NilClass is passed.
+  #
   # See Psych::Nodes for more information about YAML AST.
-  def self.parse_stream yaml
-    parser = self.parser
-    parser.parse yaml
-    parser.handler.root
+  def self.parse_stream yaml, legacy_filename = NOT_GIVEN, filename: nil, &block
+    if legacy_filename != NOT_GIVEN
+      warn_with_uplevel 'Passing filename with the 2nd argument of Psych.parse_stream is deprecated. Use keyword argument like Psych.parse_stream(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
+      filename = legacy_filename
+    end
+
+    if block_given?
+      parser = Psych::Parser.new(Handlers::DocumentStream.new(&block))
+      parser.parse yaml, filename
+    else
+      parser = self.parser
+      parser.parse yaml, filename
+      parser.handler.root
+    end
   end
 
   ###
@@ -166,6 +472,24 @@ module Psych
   # to control the output format.  If an IO object is passed in, the YAML will
   # be dumped to that IO object.
   #
+  # Currently supported options are:
+  #
+  # [<tt>:indentation</tt>]   Number of space characters used to indent.
+  #                           Acceptable value should be in <tt>0..9</tt> range,
+  #                           otherwise option is ignored.
+  #
+  #                           Default: <tt>2</tt>.
+  # [<tt>:line_width</tt>]    Max character to wrap line at.
+  #
+  #                           Default: <tt>0</tt> (meaning "wrap at 81").
+  # [<tt>:canonical</tt>]     Write "canonical" YAML form (very verbose, yet
+  #                           strictly formal).
+  #
+  #                           Default: <tt>false</tt>.
+  # [<tt>:header</tt>]        Write <tt>%YAML [version]</tt> at the beginning of document.
+  #
+  #                           Default: <tt>false</tt>.
+  #
   # Example:
   #
   #   # Dump an array, get back a YAML string
@@ -175,19 +499,19 @@ module Psych
   #   Psych.dump(['a', 'b'], StringIO.new)  # => #<StringIO:0x000001009d0890>
   #
   #   # Dump an array with indentation set
-  #   Psych.dump(['a', ['b']], :indentation => 3) # => "---\n- a\n-  - b\n"
+  #   Psych.dump(['a', ['b']], indentation: 3) # => "---\n- a\n-  - b\n"
   #
   #   # Dump an array to an IO with indentation set
-  #   Psych.dump(['a', ['b']], StringIO.new, :indentation => 3)
+  #   Psych.dump(['a', ['b']], StringIO.new, indentation: 3)
   def self.dump o, io = nil, options = {}
     if Hash === io
       options = io
       io      = nil
     end
 
-    visitor = Psych::Visitors::YAMLTree.new options
+    visitor = Psych::Visitors::YAMLTree.create options
     visitor << o
-    visitor.tree.to_yaml io, options
+    visitor.tree.yaml io, options
   end
 
   ###
@@ -197,36 +521,62 @@ module Psych
   #
   #   Psych.dump_stream("foo\n  ", {}) # => "--- ! \"foo\\n  \"\n--- {}\n"
   def self.dump_stream *objects
-    visitor = Psych::Visitors::YAMLTree.new {}
+    visitor = Psych::Visitors::YAMLTree.create({})
     objects.each do |o|
       visitor << o
     end
-    visitor.tree.to_yaml
+    visitor.tree.yaml
   end
 
   ###
-  # Dump Ruby object +o+ to a JSON string.
-  def self.to_json o
-    visitor = Psych::Visitors::JSONTree.new
-    visitor << o
-    visitor.tree.to_yaml
+  # Dump Ruby +object+ to a JSON string.
+  def self.to_json object
+    visitor = Psych::Visitors::JSONTree.create
+    visitor << object
+    visitor.tree.yaml
   end
 
   ###
   # Load multiple documents given in +yaml+.  Returns the parsed documents
-  # as a list.  For example:
+  # as a list.  If a block is given, each document will be converted to Ruby
+  # and passed to the block during parsing
+  #
+  # Example:
   #
   #   Psych.load_stream("--- foo\n...\n--- bar\n...") # => ['foo', 'bar']
   #
-  def self.load_stream yaml
-    parse_stream(yaml).children.map { |child| child.to_ruby }
+  #   list = []
+  #   Psych.load_stream("--- foo\n...\n--- bar\n...") do |ruby|
+  #     list << ruby
+  #   end
+  #   list # => ['foo', 'bar']
+  #
+  def self.load_stream yaml, legacy_filename = NOT_GIVEN, filename: nil, fallback: []
+    if legacy_filename != NOT_GIVEN
+      warn_with_uplevel 'Passing filename with the 2nd argument of Psych.load_stream is deprecated. Use keyword argument like Psych.load_stream(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
+      filename = legacy_filename
+    end
+
+    result = if block_given?
+               parse_stream(yaml, filename: filename) do |node|
+                 yield node.to_ruby
+               end
+             else
+               parse_stream(yaml, filename: filename).children.map(&:to_ruby)
+             end
+
+    return fallback if result.is_a?(Array) && result.empty?
+    result
   end
 
   ###
   # Load the document contained in +filename+.  Returns the yaml contained in
-  # +filename+ as a ruby object
-  def self.load_file filename
-    self.load File.open(filename)
+  # +filename+ as a Ruby object, or if the file is empty, it returns
+  # the specified +fallback+ return value, which defaults to +false+.
+  def self.load_file filename, fallback: false
+    File.open(filename, 'r:bom|utf-8') { |f|
+      self.load f, filename: filename, fallback: fallback
+    }
   end
 
   # :stopdoc:
@@ -250,10 +600,38 @@ module Psych
   @load_tags = {}
   @dump_tags = {}
   def self.add_tag tag, klass
-    @load_tags[tag] = klass
+    @load_tags[tag] = klass.name
     @dump_tags[klass] = tag
   end
 
+  def self.symbolize_names!(result)
+    case result
+    when Hash
+      result.keys.each do |key|
+        result[key.to_sym] = symbolize_names!(result.delete(key))
+      end
+    when Array
+      result.map! { |r| symbolize_names!(r) }
+    end
+    result
+  end
+  private_class_method :symbolize_names!
+
+  # Workaround for emulating `warn '...', uplevel: 1` in Ruby 2.4 or lower.
+  def self.warn_with_uplevel(message, uplevel: 1)
+    at = parse_caller(caller[uplevel]).join(':')
+    warn "#{at}: #{message}"
+  end
+
+  def self.parse_caller(at)
+    if /^(.+?):(\d+)(?::in `.*')?/ =~ at
+      file = $1
+      line = $2.to_i
+      [file, line]
+    end
+  end
+  private_class_method :warn_with_uplevel, :parse_caller
+
   class << self
     attr_accessor :load_tags
     attr_accessor :dump_tags
diff --git a/ext/psych/lib/psych/class_loader.rb b/ext/psych/lib/psych/class_loader.rb
new file mode 100644
index 0000000000..cfca86845a
--- /dev/null
+++ b/ext/psych/lib/psych/class_loader.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+require 'psych/omap'
+require 'psych/set'
+
+module Psych
+  class ClassLoader # :nodoc:
+    BIG_DECIMAL = 'BigDecimal'
+    COMPLEX     = 'Complex'
+    DATE        = 'Date'
+    DATE_TIME   = 'DateTime'
+    EXCEPTION   = 'Exception'
+    OBJECT      = 'Object'
+    PSYCH_OMAP  = 'Psych::Omap'
+    PSYCH_SET   = 'Psych::Set'
+    RANGE       = 'Range'
+    RATIONAL    = 'Rational'
+    REGEXP      = 'Regexp'
+    STRUCT      = 'Struct'
+    SYMBOL      = 'Symbol'
+
+    def initialize
+      @cache = CACHE.dup
+    end
+
+    def load klassname
+      return nil if !klassname || klassname.empty?
+
+      find klassname
+    end
+
+    def symbolize sym
+      symbol
+      sym.to_sym
+    end
+
+    constants.each do |const|
+      konst = const_get const
+      define_method(const.to_s.downcase) do
+        load konst
+      end
+    end
+
+    private
+
+    def find klassname
+      @cache[klassname] ||= resolve(klassname)
+    end
+
+    def resolve klassname
+      name    = klassname
+      retried = false
+
+      begin
+        path2class(name)
+      rescue ArgumentError, NameError => ex
+        unless retried
+          name    = "Struct::#{name}"
+          retried = ex
+          retry
+        end
+        raise retried
+      end
+    end
+
+    CACHE = Hash[constants.map { |const|
+      val = const_get const
+      begin
+        [val, ::Object.const_get(val)]
+      rescue
+        nil
+      end
+    }.compact]
+
+    class Restricted < ClassLoader
+      def initialize classes, symbols
+        @classes = classes
+        @symbols = symbols
+        super()
+      end
+
+      def symbolize sym
+        return super if @symbols.empty?
+
+        if @symbols.include? sym
+          super
+        else
+          raise DisallowedClass, 'Symbol'
+        end
+      end
+
+      private
+
+      def find klassname
+        if @classes.include? klassname
+          super
+        else
+          raise DisallowedClass, klassname
+        end
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/coder.rb b/ext/psych/lib/psych/coder.rb
index 2b830d2b21..96a9c3fbad 100644
--- a/ext/psych/lib/psych/coder.rb
+++ b/ext/psych/lib/psych/coder.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 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 2ad75e1661..81055cc501 100644
--- a/ext/psych/lib/psych/core_ext.rb
+++ b/ext/psych/lib/psych/core_ext.rb
@@ -1,40 +1,19 @@
+# frozen_string_literal: true
 class Object
   def self.yaml_tag url
     Psych.add_tag(url, self)
   end
 
-  # FIXME: rename this to "to_yaml" when syck is removed
-
   ###
   # call-seq: to_yaml(options = {})
   #
   # Convert an object to YAML.  See Psych.dump for more information on the
   # available +options+.
-  def psych_to_yaml options = {}
+  def to_yaml options = {}
     Psych.dump self, options
   end
-  remove_method :to_yaml rescue nil
-  alias :to_yaml :psych_to_yaml
 end
 
-class Module
-  def psych_yaml_as url
-    return if caller[0].end_with?('rubytypes.rb')
-    if $VERBOSE
-      warn "#{caller[0]}: yaml_as is deprecated, please use yaml_tag"
-    end
-    Psych.add_tag(url, self)
-  end
-
-  remove_method :yaml_as rescue nil
-  alias :yaml_as :psych_yaml_as
-end
-
-module Kernel
-  def psych_y *objects
-    puts Psych.dump_stream(*objects)
-  end
-  remove_method :y rescue nil
-  alias y psych_y
-  private :y
+if defined?(::IRB)
+  require 'psych/y'
 end
diff --git a/ext/psych/lib/psych/deprecated.rb b/ext/psych/lib/psych/deprecated.rb
deleted file mode 100644
index 333c3a1016..0000000000
--- a/ext/psych/lib/psych/deprecated.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-require 'date'
-
-module Psych
-  DEPRECATED = __FILE__ # :nodoc:
-
-  module DeprecatedMethods # :nodoc:
-    attr_accessor :taguri
-    attr_accessor :to_yaml_style
-  end
-
-  def self.quick_emit thing, opts = {}, &block # :nodoc:
-    warn "#{caller[0]}: YAML.quick_emit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-    target = eval 'self', block.binding
-    target.extend DeprecatedMethods
-    metaclass = class << target; self; end
-    metaclass.send(:define_method, :encode_with) do |coder|
-      target.taguri        = coder.tag
-      target.to_yaml_style = coder.style
-      block.call coder
-    end
-    target.psych_to_yaml unless opts[:nodump]
-  end
-
-  def self.load_documents yaml, &block
-    if $VERBOSE
-      warn "#{caller[0]}: load_documents is deprecated, use load_stream"
-    end
-    list = load_stream yaml
-    return list unless block_given?
-    list.each(&block)
-  end
-
-  def self.detect_implicit thing
-    warn "#{caller[0]}: detect_implicit is deprecated" if $VERBOSE
-    return '' unless String === thing
-    return 'null' if '' == thing
-    ScalarScanner.new.tokenize(thing).class.name.downcase
-  end
-
-  def self.add_ruby_type type_tag, &block
-    warn "#{caller[0]}: add_ruby_type is deprecated, use add_domain_type" if $VERBOSE
-    domain = 'ruby.yaml.org,2002'
-    key = ['tag', domain, type_tag].join ':'
-    @domain_types[key] = [key, block]
-  end
-
-  def self.add_private_type type_tag, &block
-    warn "#{caller[0]}: add_private_type is deprecated, use add_domain_type" if $VERBOSE
-    domain = 'x-private'
-    key = [domain, type_tag].join ':'
-    @domain_types[key] = [key, block]
-  end
-
-  def self.tagurize thing
-    warn "#{caller[0]}: add_private_type is deprecated, use add_domain_type" if $VERBOSE
-    return thing unless String === thing
-    "tag:yaml.org,2002:#{thing}"
-  end
-
-  def self.read_type_class type, reference
-    warn "#{caller[0]}: read_type_class is deprecated" if $VERBOSE
-    _, _, type, name = type.split ':', 4
-
-    reference = name.split('::').inject(reference) do |k,n|
-      k.const_get(n.to_sym)
-    end if name
-    [type, reference]
-  end
-
-  def self.object_maker klass, hash
-    warn "#{caller[0]}: object_maker is deprecated" if $VERBOSE
-    klass.allocate.tap do |obj|
-      hash.each { |k,v| obj.instance_variable_set(:"@#{k}", v) }
-    end
-  end
-end
-
-class Object
-  undef :to_yaml_properties rescue nil
-  def to_yaml_properties # :nodoc:
-    instance_variables
-  end
-end
diff --git a/ext/psych/lib/psych/exception.rb b/ext/psych/lib/psych/exception.rb
new file mode 100644
index 0000000000..fac0c42b9f
--- /dev/null
+++ b/ext/psych/lib/psych/exception.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module Psych
+  class Exception < RuntimeError
+  end
+
+  class BadAlias < Exception
+  end
+
+  class DisallowedClass < Exception
+    def initialize klass_name
+      super "Tried to load unspecified class: #{klass_name}"
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/handler.rb b/ext/psych/lib/psych/handler.rb
index a2aa6bb178..8f23e366fa 100644
--- a/ext/psych/lib/psych/handler.rb
+++ b/ext/psych/lib/psych/handler.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Psych
   ###
   # Psych::Handler is an abstract base class that defines the events used
@@ -11,6 +12,34 @@ module Psych
   # See Psych::Parser for more details
   class Handler
     ###
+    # Configuration options for dumping YAML.
+    class DumperOptions
+      attr_accessor :line_width, :indentation, :canonical
+
+      def initialize
+        @line_width  = 0
+        @indentation = 2
+        @canonical   = false
+      end
+    end
+
+    # Default dumping options
+    OPTIONS = DumperOptions.new
+
+    # Events that a Handler should respond to.
+    EVENTS = [ :alias,
+               :empty,
+               :end_document,
+               :end_mapping,
+               :end_sequence,
+               :end_stream,
+               :scalar,
+               :start_document,
+               :start_mapping,
+               :start_sequence,
+               :start_stream ]
+
+    ###
     # Called with +encoding+ when the YAML stream starts.  This method is
     # called once per stream.  A stream may contain multiple documents.
     #
@@ -76,7 +105,7 @@ module Psych
     #   - first element
     #   - *ponies
     #
-    # &ponies is the achor, *ponies is the alias.  In this case, alias is
+    # &ponies is the anchor, *ponies is the alias.  In this case, alias is
     # called with "ponies".
     def alias anchor
     end
@@ -213,6 +242,11 @@ module Psych
     end
 
     ###
+    # Called before each event with line/column information.
+    def event_location(start_line, start_column, end_line, end_column)
+    end
+
+    ###
     # Is this handler a streaming handler?
     def streaming?
       false
diff --git a/ext/psych/lib/psych/handlers/document_stream.rb b/ext/psych/lib/psych/handlers/document_stream.rb
new file mode 100644
index 0000000000..67da794093
--- /dev/null
+++ b/ext/psych/lib/psych/handlers/document_stream.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+require 'psych/tree_builder'
+
+module Psych
+  module Handlers
+    class DocumentStream < Psych::TreeBuilder # :nodoc:
+      def initialize &block
+        super
+        @block = block
+      end
+
+      def start_document version, tag_directives, implicit
+        n = Nodes::Document.new version, tag_directives, implicit
+        push n
+      end
+
+      def end_document implicit_end = !streaming?
+        @last.implicit_end = implicit_end
+        @block.call pop
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/handlers/recorder.rb b/ext/psych/lib/psych/handlers/recorder.rb
new file mode 100644
index 0000000000..a8fc7b1144
--- /dev/null
+++ b/ext/psych/lib/psych/handlers/recorder.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+require 'psych/handler'
+
+module Psych
+  module Handlers
+    ###
+    # This handler will capture an event and record the event.  Recorder events
+    # are available vial Psych::Handlers::Recorder#events.
+    #
+    # For example:
+    #
+    #   recorder = Psych::Handlers::Recorder.new
+    #   parser = Psych::Parser.new recorder
+    #   parser.parse '--- foo'
+    #
+    #   recorder.events # => [list of events]
+    #
+    #   # Replay the events
+    #
+    #   emitter = Psych::Emitter.new $stdout
+    #   recorder.events.each do |m, args|
+    #     emitter.send m, *args
+    #   end
+
+    class Recorder < Psych::Handler
+      attr_reader :events
+
+      def initialize
+        @events = []
+        super
+      end
+
+      EVENTS.each do |event|
+        define_method event do |*args|
+          @events << [event, args]
+        end
+      end
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/json.rb b/ext/psych/lib/psych/json.rb
deleted file mode 100644
index 412ab2708b..0000000000
--- a/ext/psych/lib/psych/json.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Psych
-  module JSON
-    autoload :TreeBuilder, 'psych/json/tree_builder'
-    autoload :Stream, 'psych/json/stream'
-  end
-end
diff --git a/ext/psych/lib/psych/json/ruby_events.rb b/ext/psych/lib/psych/json/ruby_events.rb
index 6b73249c06..17b7ddc386 100644
--- a/ext/psych/lib/psych/json/ruby_events.rb
+++ b/ext/psych/lib/psych/json/ruby_events.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 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 be1a0a8a82..2ebd3d7a66 100644
--- a/ext/psych/lib/psych/json/stream.rb
+++ b/ext/psych/lib/psych/json/stream.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'psych/json/ruby_events'
 require 'psych/json/yaml_events'
 
@@ -6,6 +7,7 @@ module Psych
     class Stream < Psych::Visitors::JSONTree
       include Psych::JSON::RubyEvents
       include Psych::Streaming
+      extend Psych::Streaming::ClassMethods
 
       class Emitter < Psych::Stream::Emitter # :nodoc:
         include Psych::JSON::YAMLEvents
diff --git a/ext/psych/lib/psych/json/tree_builder.rb b/ext/psych/lib/psych/json/tree_builder.rb
index b799c93f58..5c2ee8ca25 100644
--- a/ext/psych/lib/psych/json/tree_builder.rb
+++ b/ext/psych/lib/psych/json/tree_builder.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 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 01d4660f85..eb973f5361 100644
--- a/ext/psych/lib/psych/json/yaml_events.rb
+++ b/ext/psych/lib/psych/json/yaml_events.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Psych
   module JSON
     module YAMLEvents # :nodoc:
@@ -10,11 +11,11 @@ module Psych
       end
 
       def start_mapping anchor, tag, implicit, style
-        super(anchor, nil, implicit, Nodes::Mapping::FLOW)
+        super(anchor, nil, true, Nodes::Mapping::FLOW)
       end
 
       def start_sequence anchor, tag, implicit, style
-        super(anchor, nil, implicit, Nodes::Sequence::FLOW)
+        super(anchor, nil, true, Nodes::Sequence::FLOW)
       end
 
       def scalar value, anchor, tag, plain, quoted, style
diff --git a/ext/psych/lib/psych/nodes.rb b/ext/psych/lib/psych/nodes.rb
index f3b33fe975..5842c2e3e5 100644
--- a/ext/psych/lib/psych/nodes.rb
+++ b/ext/psych/lib/psych/nodes.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 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 5bd4df13d1..6da655f0fd 100644
--- a/ext/psych/lib/psych/nodes/alias.rb
+++ b/ext/psych/lib/psych/nodes/alias.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###
@@ -13,6 +14,8 @@ module Psych
       def initialize anchor
         @anchor = anchor
       end
+
+      def alias?; true; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/nodes/document.rb b/ext/psych/lib/psych/nodes/document.rb
index 32014d60dc..f57410d636 100644
--- a/ext/psych/lib/psych/nodes/document.rb
+++ b/ext/psych/lib/psych/nodes/document.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###
@@ -55,6 +56,8 @@ module Psych
       def root
         children.first
       end
+
+      def document?; true; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/nodes/mapping.rb b/ext/psych/lib/psych/nodes/mapping.rb
index 5ba95ce4b6..d49678cb0e 100644
--- a/ext/psych/lib/psych/nodes/mapping.rb
+++ b/ext/psych/lib/psych/nodes/mapping.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###
@@ -51,6 +52,8 @@ module Psych
         @implicit = implicit
         @style    = style
       end
+
+      def mapping?; true; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/nodes/node.rb b/ext/psych/lib/psych/nodes/node.rb
index 2a5573a2bd..f59fb8916b 100644
--- a/ext/psych/lib/psych/nodes/node.rb
+++ b/ext/psych/lib/psych/nodes/node.rb
@@ -1,4 +1,7 @@
+# frozen_string_literal: true
 require 'stringio'
+require 'psych/class_loader'
+require 'psych/scalar_scanner'
 
 module Psych
   module Nodes
@@ -14,6 +17,18 @@ module Psych
       # An associated tag
       attr_reader :tag
 
+      # The line number where this node start
+      attr_accessor :start_line
+
+      # The column number where this node start
+      attr_accessor :start_column
+
+      # The line number where this node ends
+      attr_accessor :end_line
+
+      # The column number where this node ends
+      attr_accessor :end_column
+
       # Create a new Psych::Nodes::Node
       def initialize
         @children = []
@@ -32,7 +47,7 @@ module Psych
       #
       # See also Psych::Visitors::ToRuby
       def to_ruby
-        Visitors::ToRuby.new.accept self
+        Visitors::ToRuby.create.accept(self)
       end
       alias :transform :to_ruby
 
@@ -40,13 +55,21 @@ module Psych
       # Convert this node to YAML.
       #
       # See also Psych::Visitors::Emitter
-      def to_yaml io = nil, options = {}
+      def yaml io = nil, options = {}
         real_io = io || StringIO.new(''.encode('utf-8'))
 
         Visitors::Emitter.new(real_io, options).accept self
         return real_io.string unless io
         io
       end
+      alias :to_yaml :yaml
+
+      def alias?;    false; end
+      def document?; false; end
+      def mapping?;  false; end
+      def scalar?;   false; end
+      def sequence?; false; end
+      def stream?;   false; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/nodes/scalar.rb b/ext/psych/lib/psych/nodes/scalar.rb
index 1b1b25b98a..e2616b6a84 100644
--- a/ext/psych/lib/psych/nodes/scalar.rb
+++ b/ext/psych/lib/psych/nodes/scalar.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###
@@ -62,6 +63,8 @@ module Psych
         @quoted = quoted
         @style  = style
       end
+
+      def scalar?; true; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/nodes/sequence.rb b/ext/psych/lib/psych/nodes/sequence.rb
index e4b833d330..740f1938a4 100644
--- a/ext/psych/lib/psych/nodes/sequence.rb
+++ b/ext/psych/lib/psych/nodes/sequence.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###
@@ -56,7 +57,7 @@ module Psych
       # Is this sequence started implicitly?
       attr_accessor :implicit
 
-      # The sequece style used
+      # The sequence style used
       attr_accessor :style
 
       ###
@@ -76,6 +77,8 @@ module Psych
         @implicit = implicit
         @style    = style
       end
+
+      def sequence?; true; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/nodes/stream.rb b/ext/psych/lib/psych/nodes/stream.rb
index 7cf5e033ec..b525217821 100644
--- a/ext/psych/lib/psych/nodes/stream.rb
+++ b/ext/psych/lib/psych/nodes/stream.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###
@@ -32,6 +33,8 @@ module Psych
         super()
         @encoding = encoding
       end
+
+      def stream?; true; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/omap.rb b/ext/psych/lib/psych/omap.rb
index 6286270616..29cde0be50 100644
--- a/ext/psych/lib/psych/omap.rb
+++ b/ext/psych/lib/psych/omap.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Psych
   class Omap < ::Hash
   end
diff --git a/ext/psych/lib/psych/parser.rb b/ext/psych/lib/psych/parser.rb
index 5d75605d49..39bc8289be 100644
--- a/ext/psych/lib/psych/parser.rb
+++ b/ext/psych/lib/psych/parser.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Psych
   ###
   # YAML event parser class.  This class parses a YAML document and calls
@@ -36,12 +37,16 @@ module Psych
     # The handler on which events will be called
     attr_accessor :handler
 
+    # Set the encoding for this parser to +encoding+
+    attr_writer :external_encoding
+
     ###
     # Creates a new Psych::Parser instance with +handler+.  YAML events will
     # be called on +handler+.  See Psych::Parser for more details.
 
     def initialize handler = Handler.new
       @handler = handler
+      @external_encoding = ANY
     end
   end
 end
diff --git a/ext/psych/lib/psych/scalar_scanner.rb b/ext/psych/lib/psych/scalar_scanner.rb
index 29d66ee4cc..cea2a453dd 100644
--- a/ext/psych/lib/psych/scalar_scanner.rb
+++ b/ext/psych/lib/psych/scalar_scanner.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'strscan'
 
 module Psych
@@ -5,90 +6,120 @@ module Psych
   # Scan scalars for built in types
   class ScalarScanner
     # Taken from http://yaml.org/type/timestamp.html
-    TIME = /^\d{4}-\d{1,2}-\d{1,2}([Tt]|\s+)\d{1,2}:\d\d:\d\d(\.\d*)?(\s*Z|[-+]\d{1,2}(:\d\d)?)?/
+    TIME = /^-?\d{4}-\d{1,2}-\d{1,2}(?:[Tt]|\s+)\d{1,2}:\d\d:\d\d(?:\.\d*)?(?:\s*(?:Z|[-+]\d{1,2}:?(?:\d\d)?))?$/
+
+    # Taken from http://yaml.org/type/float.html
+    FLOAT = /^(?:[-+]?([0-9][0-9_,]*)?\.[0-9]*([eE][-+][0-9]+)?(?# base 10)
+              |[-+]?\.(inf|Inf|INF)(?# infinity)
+              |\.(nan|NaN|NAN)(?# not a number))$/x
+
+    # Taken from http://yaml.org/type/int.html
+    INTEGER = /^(?:[-+]?0b[0-1_,]+          (?# base 2)
+                  |[-+]?0[0-7_,]+           (?# base 8)
+                  |[-+]?(?:0|[1-9][0-9_,]*) (?# base 10)
+                  |[-+]?0x[0-9a-fA-F_,]+    (?# base 16))$/x
+
+    attr_reader :class_loader
 
     # Create a new scanner
-    def initialize
-      @string_cache = {}
+    def initialize class_loader
+      @symbol_cache = {}
+      @class_loader = class_loader
     end
 
-    # Tokenize +string+ returning the ruby object
+    # Tokenize +string+ returning the Ruby object
     def tokenize string
       return nil if string.empty?
-      return string if @string_cache.key?(string)
+      return @symbol_cache[string] if @symbol_cache.key?(string)
 
-      case string
-      when /^[A-Za-z~]/
-        if string.length > 5
-          @string_cache[string] = true
-          return string
-        end
+      # Check for a String type, being careful not to get caught by hash keys, hex values, and
+      # special floats (e.g., -.inf).
+      if string.match?(/^[^\d\.:-]?[A-Za-z_\s!@#\$%\^&\*\(\)\{\}\<\>\|\/\\~;=]+/) || string.match?(/\n/)
+        return string if string.length > 5
 
-        case string
-        when /^[^ytonf~]/i
-          @string_cache[string] = true
+        if string.match?(/^[^ytonf~]/i)
           string
-        when '~', /^null$/i
+        elsif string == '~' || string.match?(/^null$/i)
           nil
-        when /^(yes|true|on)$/i
+        elsif string.match?(/^(yes|true|on)$/i)
           true
-        when /^(no|false|off)$/i
+        elsif string.match?(/^(no|false|off)$/i)
           false
         else
-          @string_cache[string] = true
           string
         end
-      when TIME
-        parse_time string
-      when /^\d{4}-\d{1,2}-\d{1,2}$/
+      elsif string.match?(TIME)
+        begin
+          parse_time string
+        rescue ArgumentError
+          string
+        end
+      elsif string.match?(/^\d{4}-(?:1[012]|0\d|\d)-(?:[12]\d|3[01]|0\d|\d)$/)
         require 'date'
-        Date.strptime(string, '%Y-%m-%d')
-      when /^\.inf$/i
-        1 / 0.0
-      when /^-\.inf$/i
-        -1 / 0.0
-      when /^\.nan$/i
-        0.0 / 0.0
-      when /^:./
+        begin
+          class_loader.date.strptime(string, '%Y-%m-%d')
+        rescue ArgumentError
+          string
+        end
+      elsif string.match?(/^\.inf$/i)
+        Float::INFINITY
+      elsif string.match?(/^-\.inf$/i)
+        -Float::INFINITY
+      elsif string.match?(/^\.nan$/i)
+        Float::NAN
+      elsif string.match?(/^:./)
         if string =~ /^:(["'])(.*)\1/
-          $2.sub(/^:/, '').to_sym
+          @symbol_cache[string] = class_loader.symbolize($2.sub(/^:/, ''))
         else
-          string.sub(/^:/, '').to_sym
+          @symbol_cache[string] = class_loader.symbolize(string.sub(/^:/, ''))
         end
-      when /^[-+]?[1-9][0-9_]*(:[0-5]?[0-9])+$/
+      elsif string.match?(/^[-+]?[0-9][0-9_]*(:[0-5]?[0-9]){1,2}$/)
         i = 0
         string.split(':').each_with_index do |n,e|
           i += (n.to_i * 60 ** (e - 2).abs)
         end
         i
-      when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9])+\.[0-9_]*$/
+      elsif string.match?(/^[-+]?[0-9][0-9_]*(:[0-5]?[0-9]){1,2}\.[0-9_]*$/)
         i = 0
         string.split(':').each_with_index do |n,e|
           i += (n.to_f * 60 ** (e - 2).abs)
         end
         i
+      elsif string.match?(FLOAT)
+        if string.match?(/\A[-+]?\.\Z/)
+          string
+        else
+          Float(string.gsub(/[,_]|\.([Ee]|$)/, '\1'))
+        end
+      elsif string.match?(INTEGER)
+        parse_int string
       else
-        return Integer(string.gsub(/[,_]/, '')) rescue ArgumentError
-        return Float(string.gsub(/[,_]/, '')) rescue ArgumentError
-        @string_cache[string] = true
         string
       end
     end
 
     ###
+    # Parse and return an int from +string+
+    def parse_int string
+      Integer(string.gsub(/[,]/, ''))
+    end
+
+    ###
     # Parse and return a Time from +string+
     def parse_time string
+      klass = class_loader.load 'Time'
+
       date, time = *(string.split(/[ tT]/, 2))
-      (yy, m, dd) = date.split('-').map { |x| x.to_i }
+      (yy, m, dd) = date.match(/^(-?\d{4})-(\d{1,2})-(\d{1,2})/).captures.map { |x| x.to_i }
       md = time.match(/(\d+:\d+:\d+)(?:\.(\d*))?\s*(Z|[-+]\d+(:\d\d)?)?/)
 
       (hh, mm, ss) = md[1].split(':').map { |x| x.to_i }
       us = (md[2] ? Rational("0.#{md[2]}") : 0) * 1000000
 
-      time = Time.utc(yy, m, dd, hh, mm, ss, us)
+      time = klass.utc(yy, m, dd, hh, mm, ss, us)
 
       return time if 'Z' == md[3]
-      return Time.at(time.to_i, us) unless md[3]
+      return klass.at(time.to_i, us) unless md[3]
 
       tz = md[3].match(/^([+\-]?\d{1,2})\:?(\d{1,2})?$/)[1..-1].compact.map { |digit| Integer(digit, 10) }
       offset = tz.first * 3600
@@ -99,7 +130,7 @@ module Psych
         offset += ((tz[1] || 0) * 60)
       end
 
-      Time.at((time - offset).to_i, us)
+      klass.new(yy, m, dd, hh, mm, ss+us/(1_000_000r), offset)
     end
   end
 end
diff --git a/ext/psych/lib/psych/set.rb b/ext/psych/lib/psych/set.rb
index 6793a8ed1b..760d217098 100644
--- a/ext/psych/lib/psych/set.rb
+++ b/ext/psych/lib/psych/set.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Psych
   class Set < ::Hash
   end
diff --git a/ext/psych/lib/psych/stream.rb b/ext/psych/lib/psych/stream.rb
index 567c1bb790..24e45afc3b 100644
--- a/ext/psych/lib/psych/stream.rb
+++ b/ext/psych/lib/psych/stream.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Psych
   ###
   # Psych::Stream is a streaming YAML emitter.  It will not buffer your YAML,
@@ -32,5 +33,6 @@ module Psych
     end
 
     include Psych::Streaming
+    extend Psych::Streaming::ClassMethods
   end
 end
diff --git a/ext/psych/lib/psych/streaming.rb b/ext/psych/lib/psych/streaming.rb
index c6fa109d5a..eb19792ad0 100644
--- a/ext/psych/lib/psych/streaming.rb
+++ b/ext/psych/lib/psych/streaming.rb
@@ -1,10 +1,16 @@
+# frozen_string_literal: true
 module Psych
   module Streaming
-    ###
-    # Create a new streaming emitter.  Emitter will print to +io+.  See
-    # Psych::Stream for an example.
-    def initialize io
-      super({}, self.class.const_get(:Emitter).new(io))
+    module ClassMethods
+      ###
+      # Create a new streaming emitter.  Emitter will print to +io+.  See
+      # Psych::Stream for an example.
+      def new io
+        emitter      = const_get(:Emitter).new(io)
+        class_loader = ClassLoader.new
+        ss           = ScalarScanner.new class_loader
+        super(emitter, ss, {})
+      end
     end
 
     ###
diff --git a/ext/psych/lib/psych/syntax_error.rb b/ext/psych/lib/psych/syntax_error.rb
new file mode 100644
index 0000000000..1598e6ff36
--- /dev/null
+++ b/ext/psych/lib/psych/syntax_error.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require 'psych/exception'
+
+module Psych
+  class SyntaxError < Psych::Exception
+    attr_reader :file, :line, :column, :offset, :problem, :context
+
+    def initialize file, line, col, offset, problem, context
+      err      = [problem, context].compact.join ' '
+      filename = file || '<unknown>'
+      message  = "(%s): %s at line %d column %d" % [filename, err, line, col]
+
+      @file    = file
+      @line    = line
+      @column  = col
+      @offset  = offset
+      @problem = problem
+      @context = context
+      super(message)
+    end
+  end
+end
diff --git a/ext/psych/lib/psych/tree_builder.rb b/ext/psych/lib/psych/tree_builder.rb
index 8b4e972314..47a1695643 100644
--- a/ext/psych/lib/psych/tree_builder.rb
+++ b/ext/psych/lib/psych/tree_builder.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'psych/handler'
 
 module Psych
@@ -22,6 +23,18 @@ module Psych
       @stack = []
       @last  = nil
       @root  = nil
+
+      @start_line   = nil
+      @start_column = nil
+      @end_line     = nil
+      @end_column   = nil
+    end
+
+    def event_location(start_line, start_column, end_line, end_column)
+      @start_line   = start_line
+      @start_column = start_column
+      @end_line     = end_line
+      @end_column   = end_column
     end
 
     %w{
@@ -31,12 +44,15 @@ module Psych
       class_eval %{
         def start_#{node.downcase}(anchor, tag, implicit, style)
           n = Nodes::#{node}.new(anchor, tag, implicit, style)
+          set_start_location(n)
           @last.children << n
           push n
         end
 
         def end_#{node.downcase}
-          pop
+          n = pop
+          set_end_location(n)
+          n
         end
       }
     end
@@ -48,6 +64,7 @@ module Psych
     # See Psych::Handler#start_document
     def start_document version, tag_directives, implicit
       n = Nodes::Document.new version, tag_directives, implicit
+      set_start_location(n)
       @last.children << n
       push n
     end
@@ -59,24 +76,35 @@ module Psych
     # See Psych::Handler#start_document
     def end_document implicit_end = !streaming?
       @last.implicit_end = implicit_end
-      pop
+      n = pop
+      set_end_location(n)
+      n
     end
 
     def start_stream encoding
       @root = Nodes::Stream.new(encoding)
+      set_start_location(@root)
       push @root
     end
 
     def end_stream
-      pop
+      n = pop
+      set_end_location(n)
+      n
     end
 
     def scalar value, anchor, tag, plain, quoted, style
-      @last.children << Nodes::Scalar.new(value,anchor,tag,plain,quoted,style)
+      s = Nodes::Scalar.new(value,anchor,tag,plain,quoted,style)
+      set_location(s)
+      @last.children << s
+      s
     end
 
     def alias anchor
-      @last.children << Nodes::Alias.new(anchor)
+      a = Nodes::Alias.new(anchor)
+      set_location(a)
+      @last.children << a
+      a
     end
 
     private
@@ -90,5 +118,20 @@ module Psych
       @last = @stack.last
       x
     end
+
+    def set_location(node)
+      set_start_location(node)
+      set_end_location(node)
+    end
+
+    def set_start_location(node)
+      node.start_line   = @start_line
+      node.start_column = @start_column
+    end
+
+    def set_end_location(node)
+      node.end_line   = @end_line
+      node.end_column = @end_column
+    end
   end
 end
diff --git a/ext/psych/lib/psych/versions.rb b/ext/psych/lib/psych/versions.rb
new file mode 100644
index 0000000000..731ba9545e
--- /dev/null
+++ b/ext/psych/lib/psych/versions.rb
@@ -0,0 +1,10 @@
+
+# frozen_string_literal: true
+module Psych
+  # The version of Psych you are using
+  VERSION = '3.1.0' unless defined?(::Psych::VERSION)
+
+  if RUBY_ENGINE == 'jruby'
+    DEFAULT_SNAKEYAML_VERSION = '1.23'.freeze
+  end
+end
diff --git a/ext/psych/lib/psych/visitors.rb b/ext/psych/lib/psych/visitors.rb
index cc98b103f1..e2b084daee 100644
--- a/ext/psych/lib/psych/visitors.rb
+++ b/ext/psych/lib/psych/visitors.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 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 c6eb814ac0..b4ff9e40e7 100644
--- a/ext/psych/lib/psych/visitors/depth_first.rb
+++ b/ext/psych/lib/psych/visitors/depth_first.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 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 30db17612d..e3b92b7d03 100644
--- a/ext/psych/lib/psych/visitors/emitter.rb
+++ b/ext/psych/lib/psych/visitors/emitter.rb
@@ -1,11 +1,19 @@
+# frozen_string_literal: true
 module Psych
   module Visitors
     class Emitter < Psych::Visitors::Visitor
       def initialize io, options = {}
-        @handler = Psych::Emitter.new io
-        @handler.indentation = options[:indentation] if options[:indentation]
-        @handler.canonical = options[:canonical] if options[:canonical]
-        @handler.line_width = options[:line_width] if options[:line_width]
+        opts = [:indentation, :canonical, :line_width].find_all { |opt|
+          options.key?(opt)
+        }
+
+        if opts.empty?
+          @handler = Psych::Emitter.new io
+        else
+          du = Handler::DumperOptions.new
+          opts.each { |option| du.send :"#{option}=", options[option] }
+          @handler = Psych::Emitter.new io, du
+        end
       end
 
       def visit_Psych_Nodes_Stream o
diff --git a/ext/psych/lib/psych/visitors/json_tree.rb b/ext/psych/lib/psych/visitors/json_tree.rb
index 0350dd1faa..9912cb1362 100644
--- a/ext/psych/lib/psych/visitors/json_tree.rb
+++ b/ext/psych/lib/psych/visitors/json_tree.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'psych/json/ruby_events'
 
 module Psych
@@ -5,8 +6,11 @@ module Psych
     class JSONTree < YAMLTree
       include Psych::JSON::RubyEvents
 
-      def initialize options = {}, emitter = Psych::JSON::TreeBuilder.new
-        super
+      def self.create options = {}
+        emitter = Psych::JSON::TreeBuilder.new
+        class_loader = ClassLoader.new
+        ss           = ScalarScanner.new class_loader
+        new(emitter, ss, options)
       end
 
       def accept target
diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb
index b8eb698754..b72fb4a1dc 100644
--- a/ext/psych/lib/psych/visitors/to_ruby.rb
+++ b/ext/psych/lib/psych/visitors/to_ruby.rb
@@ -1,15 +1,31 @@
+# frozen_string_literal: true
 require 'psych/scalar_scanner'
+require 'psych/class_loader'
+require 'psych/exception'
+
+unless defined?(Regexp::NOENCODING)
+  Regexp::NOENCODING = 32
+end
 
 module Psych
   module Visitors
     ###
-    # This class walks a YAML AST, converting each node to ruby
+    # This class walks a YAML AST, converting each node to Ruby
     class ToRuby < Psych::Visitors::Visitor
-      def initialize
-        super
+      def self.create
+        class_loader = ClassLoader.new
+        scanner      = ScalarScanner.new class_loader
+        new(scanner, class_loader)
+      end
+
+      attr_reader :class_loader
+
+      def initialize ss, class_loader
+        super()
         @st = {}
-        @ss = ScalarScanner.new
+        @ss = ss
         @domain_types = Psych.domain_types
+        @class_loader = class_loader
       end
 
       def accept target
@@ -17,7 +33,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]
@@ -27,10 +43,8 @@ module Psych
         result
       end
 
-      def visit_Psych_Nodes_Scalar o
-        @st[o.anchor] = o.value if o.anchor
-
-        if klass = Psych.load_tags[o.tag]
+      def deserialize o
+        if klass = resolve_class(Psych.load_tags[o.tag])
           instance = klass.allocate
 
           if instance.respond_to?(:init_with)
@@ -48,21 +62,35 @@ module Psych
         case o.tag
         when '!binary', 'tag:yaml.org,2002:binary'
           o.value.unpack('m').first
-        when '!str', 'tag:yaml.org,2002:str'
-          o.value
+        when /^!(?:str|ruby\/string)(?::(.*))?$/, 'tag:yaml.org,2002:str'
+          klass = resolve_class($1)
+          if klass
+            klass.allocate.replace o.value
+          else
+            o.value
+          end
+        when '!ruby/object:BigDecimal'
+          require 'bigdecimal' unless defined? BigDecimal
+          class_loader.big_decimal._load o.value
         when "!ruby/object:DateTime"
-          require 'date'
+          class_loader.date_time
+          require 'date' unless defined? DateTime
           @ss.parse_time(o.value).to_datetime
+        when '!ruby/encoding'
+          ::Encoding.find o.value
         when "!ruby/object:Complex"
+          class_loader.complex
           Complex(o.value)
         when "!ruby/object:Rational"
+          class_loader.rational
           Rational(o.value)
         when "!ruby/class", "!ruby/module"
           resolve_class o.value
         when "tag:yaml.org,2002:float", "!float"
           Float(@ss.tokenize(o.value))
         when "!ruby/regexp"
-          o.value =~ /^\/(.*)\/([mixn]*)$/
+          klass = class_loader.regexp
+          o.value =~ /^\/(.*)\/([mixn]*)$/m
           source  = $1
           options = 0
           lang    = nil
@@ -75,22 +103,28 @@ module Psych
             else lang = option
             end
           end
-          Regexp.new(*[source, options, lang].compact)
+          klass.new(*[source, options, lang].compact)
         when "!ruby/range"
+          klass = class_loader.range
           args = o.value.split(/([.]{2,3})/, 2).map { |s|
             accept Nodes::Scalar.new(s)
           }
           args.push(args.delete_at(1) == '...')
-          Range.new(*args)
+          klass.new(*args)
         when /^!ruby\/sym(bol)?:?(.*)?$/
-          o.value.to_sym
+          class_loader.symbolize o.value
         else
           @ss.tokenize o.value
         end
       end
+      private :deserialize
+
+      def visit_Psych_Nodes_Scalar o
+        register o, deserialize(o)
+      end
 
       def visit_Psych_Nodes_Sequence o
-        if klass = Psych.load_tags[o.tag]
+        if klass = resolve_class(Psych.load_tags[o.tag])
           instance = klass.allocate
 
           if instance.respond_to?(:init_with)
@@ -103,43 +137,43 @@ module Psych
         end
 
         case o.tag
+        when nil
+          register_empty(o)
         when '!omap', 'tag:yaml.org,2002:omap'
-          map = Psych::Omap.new
-          @st[o.anchor] = map if o.anchor
+          map = register(o, Psych::Omap.new)
           o.children.each { |a|
             map[accept(a.children.first)] = accept a.children.last
           }
           map
-        else
-          list = []
-          @st[o.anchor] = list if o.anchor
+        when /^!(?:seq|ruby\/array):(.*)$/
+          klass = resolve_class($1)
+          list  = register(o, klass.allocate)
           o.children.each { |c| list.push accept c }
           list
+        else
+          register_empty(o)
         end
       end
 
       def visit_Psych_Nodes_Mapping o
-        return revive(Psych.load_tags[o.tag], o) if Psych.load_tags[o.tag]
-        return revive_hash({}, o) unless o.tag
+        if Psych.load_tags[o.tag]
+          return revive(resolve_class(Psych.load_tags[o.tag]), o)
+        end
+        return revive_hash(register(o, {}), o) unless o.tag
 
         case o.tag
-        when '!str', 'tag:yaml.org,2002:str'
-          members = Hash[*o.children.map { |c| accept c }]
-          string = members.delete 'str'
-          init_with(string, members.map { |k,v| [k.to_s.sub(/^@/, ''),v] }, o)
         when /^!ruby\/struct:?(.*)?$/
-          klass = resolve_class($1)
+          klass = resolve_class($1) if $1
 
           if klass
-            s = klass.allocate
-            @st[o.anchor] = s if o.anchor
+            s = register(o, klass.allocate)
 
             members = {}
-            struct_members = s.members.map { |x| x.to_sym }
+            struct_members = s.members.map { |x| class_loader.symbolize x }
             o.children.each_slice(2) do |k,v|
               member = accept(k)
               value  = accept(v)
-              if struct_members.include?(member.to_sym)
+              if struct_members.include?(class_loader.symbolize(member))
                 s.send("#{member}=", value)
               else
                 members[member.to_s.sub(/^@/, '')] = value
@@ -147,48 +181,131 @@ module Psych
             end
             init_with(s, members, o)
           else
+            klass = class_loader.struct
             members = o.children.map { |c| accept c }
             h = Hash[*members]
-            Struct.new(*h.map { |k,v| k.to_sym }).new(*h.map { |k,v| v })
+            s = klass.new(*h.map { |k,v|
+              class_loader.symbolize k
+            }).new(*h.map { |k,v| v })
+            register(o, s)
+            s
           end
 
+        when /^!ruby\/object:?(.*)?$/
+          name = $1 || 'Object'
+
+          if name == 'Complex'
+            class_loader.complex
+            h = Hash[*o.children.map { |c| accept c }]
+            register o, Complex(h['real'], h['image'])
+          elsif name == 'Rational'
+            class_loader.rational
+            h = Hash[*o.children.map { |c| accept c }]
+            register o, Rational(h['numerator'], h['denominator'])
+          elsif name == 'Hash'
+            revive_hash(register(o, {}), o)
+          else
+            obj = revive((resolve_class(name) || class_loader.object), o)
+            obj
+          end
+
+        when /^!(?:str|ruby\/string)(?::(.*))?$/, 'tag:yaml.org,2002:str'
+          klass   = resolve_class($1)
+          members = {}
+          string  = nil
+
+          o.children.each_slice(2) do |k,v|
+            key   = accept k
+            value = accept v
+
+            if key == 'str'
+              if klass
+                string = klass.allocate.replace value
+              else
+                string = value
+              end
+              register(o, string)
+            else
+              members[key] = value
+            end
+          end
+          init_with(string, members.map { |k,v| [k.to_s.sub(/^@/, ''),v] }, o)
+        when /^!ruby\/array:(.*)$/
+          klass = resolve_class($1)
+          list  = register(o, klass.allocate)
+
+          members = Hash[o.children.map { |c| accept c }.each_slice(2).to_a]
+          list.replace members['internal']
+
+          members['ivars'].each do |ivar, v|
+            list.instance_variable_set ivar, v
+          end
+          list
+
         when '!ruby/range'
+          klass = class_loader.range
           h = Hash[*o.children.map { |c| accept c }]
-          Range.new(h['begin'], h['end'], h['excl'])
+          register o, klass.new(h['begin'], h['end'], h['excl'])
 
         when /^!ruby\/exception:?(.*)?$/
           h = Hash[*o.children.map { |c| accept c }]
 
-          e = build_exception((resolve_class($1) || Exception),
+          e = build_exception((resolve_class($1) || class_loader.exception),
                               h.delete('message'))
+
+          e.set_backtrace h.delete('backtrace') if h.key? 'backtrace'
           init_with(e, h, o)
 
         when '!set', 'tag:yaml.org,2002:set'
-          set = Psych::Set.new
+          set = class_loader.psych_set.new
           @st[o.anchor] = set if o.anchor
           o.children.each_slice(2) do |k,v|
             set[accept(k)] = accept(v)
           end
           set
 
-        when '!ruby/object:Complex'
-          h = Hash[*o.children.map { |c| accept c }]
-          Complex(h['real'], h['image'])
+        when /^!ruby\/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 '!ruby/object:Rational'
-          h = Hash[*o.children.map { |c| accept c }]
-          Rational(h['numerator'], h['denominator'])
+        when /^!map:(.*)$/, /^!ruby\/hash:(.*)$/
+          revive_hash register(o, resolve_class($1).allocate), o
 
-        when /^!ruby\/object:?(.*)?$/
-          name = $1 || 'Object'
-          obj = revive((resolve_class(name) || Object), o)
-          obj
+        when '!omap', 'tag:yaml.org,2002:omap'
+          map = register(o, class_loader.psych_omap.new)
+          o.children.each_slice(2) do |l,r|
+            map[accept(l)] = accept r
+          end
+          map
 
-        when /^!map:(.*)$/, /^!ruby\/hash:(.*)$/
-          revive_hash resolve_class($1).new, o
+        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({}, o)
+          revive_hash(register(o, {}), o)
         end
       end
 
@@ -201,40 +318,80 @@ module Psych
       end
 
       def visit_Psych_Nodes_Alias o
-        @st[o.anchor]
+        @st.fetch(o.anchor) { raise BadAlias, "Unknown alias: #{o.anchor}" }
       end
 
       private
-      def revive_hash hash, o
-        @st[o.anchor] = hash if o.anchor
+      def register node, object
+        @st[node.anchor] = object if node.anchor
+        object
+      end
 
-          o.children.each_slice(2) { |k,v|
-          key = accept(k)
+      def register_empty object
+        list = register(object, [])
+        object.children.each { |c| list.push accept c }
+        list
+      end
 
-          if key == '<<'
+      SHOVEL = '<<'
+      def revive_hash hash, o
+        o.children.each_slice(2) { |k,v|
+          key = deduplicate(accept(k))
+          val = accept(v)
+
+          if key == SHOVEL && k.tag != "tag:yaml.org,2002:str"
             case v
-            when Nodes::Alias
-              hash.merge! accept(v)
+            when Nodes::Alias, Nodes::Mapping
+              begin
+                hash.merge! val
+              rescue TypeError
+                hash[key] = val
+              end
             when Nodes::Sequence
-              accept(v).reverse_each do |value|
-                hash.merge! value
+              begin
+                h = {}
+                val.reverse_each do |value|
+                  h.merge! value
+                end
+                hash.merge! h
+              rescue TypeError
+                hash[key] = val
               end
             else
-              hash[key] = accept(v)
+              hash[key] = val
             end
           else
-            hash[key] = accept(v)
+            hash[key] = val
           end
 
         }
         hash
       end
 
+      if RUBY_VERSION < '2.7'
+        def deduplicate key
+          if key.is_a?(String)
+            -(key.untaint)
+          else
+            key
+          end
+        end
+      else
+        def deduplicate key
+          if key.is_a?(String)
+            -key
+          else
+            key
+          end
+        end
+      end
+
+      def merge_key hash, key, val
+      end
+
       def revive klass, node
-        s = klass.allocate
-        @st[node.anchor] = s if node.anchor
-        h = Hash[*node.children.map { |c| accept c }]
-        init_with(s, h, node)
+        s = register(node, klass.allocate)
+        init_with(s, revive_hash({}, node), node)
       end
 
       def init_with o, h, node
@@ -243,11 +400,6 @@ module Psych
 
         if o.respond_to?(:init_with)
           o.init_with c
-        elsif o.respond_to?(:yaml_initialize)
-          if $VERBOSE
-            "Implementing #{o.class}#yaml_initialize is deprecated, please implement \"init_with(coder)\""
-          end
-          o.yaml_initialize c.tag, c.map
         else
           h.each { |k,v| o.instance_variable_set(:"@#{k}", v) }
         end
@@ -256,21 +408,13 @@ module Psych
 
       # Convert +klassname+ to a Class
       def resolve_class klassname
-        return nil unless klassname and not klassname.empty?
-
-        name    = klassname
-        retried = false
-
-        begin
-          path2class(name)
-        rescue ArgumentError, NameError => ex
-          unless retried
-            name    = "Struct::#{name}"
-            retried = ex
-            retry
-          end
-          raise retried
-        end
+        class_loader.load klassname
+      end
+    end
+
+    class NoAliasRuby < ToRuby
+      def visit_Psych_Nodes_Alias o
+        raise BadAlias, "Unknown alias: #{o.anchor}"
       end
     end
   end
diff --git a/ext/psych/lib/psych/visitors/visitor.rb b/ext/psych/lib/psych/visitors/visitor.rb
index 4d7772f428..3f4ba64e57 100644
--- a/ext/psych/lib/psych/visitors/visitor.rb
+++ b/ext/psych/lib/psych/visitors/visitor.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 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 eef6125ff1..79ca129b83 100644
--- a/ext/psych/lib/psych/visitors/yaml_tree.rb
+++ b/ext/psych/lib/psych/visitors/yaml_tree.rb
@@ -1,25 +1,76 @@
+# frozen_string_literal: true
+require 'psych/tree_builder'
+require 'psych/scalar_scanner'
+require 'psych/class_loader'
+
 module Psych
   module Visitors
     ###
-    # YAMLTree builds a YAML ast given a ruby object.  For example:
+    # YAMLTree builds a YAML ast given a Ruby object.  For example:
     #
     #   builder = Psych::Visitors::YAMLTree.new
     #   builder << { :foo => 'bar' }
     #   builder.tree # => #<Psych::Nodes::Stream .. }
     #
     class YAMLTree < Psych::Visitors::Visitor
+      class Registrar # :nodoc:
+        def initialize
+          @obj_to_id   = {}
+          @obj_to_node = {}
+          @targets     = []
+          @counter     = 0
+        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
+          @obj_to_id[target.object_id] ||= (@counter += 1)
+        end
+
+        def node_for target
+          @obj_to_node[target.object_id]
+        end
+      end
+
       attr_reader :started, :finished
       alias :finished? :finished
       alias :started? :started
 
-      def initialize options = {}, emitter = Psych::TreeBuilder.new
+      def self.create options = {}, emitter = nil
+        emitter      ||= TreeBuilder.new
+        class_loader = ClassLoader.new
+        ss           = ScalarScanner.new class_loader
+        new(emitter, ss, options)
+      end
+
+      def initialize emitter, ss, options
         super()
-        @started  = false
-        @finished = false
-        @emitter  = emitter
-        @st       = {}
-        @ss       = ScalarScanner.new
-        @options  = options
+        @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     = []
 
         @dispatch_cache = Hash.new do |h,klass|
           method = "visit_#{(klass.name || '').split('::').join('_')}"
@@ -46,6 +97,7 @@ module Psych
 
       def tree
         finish unless finished?
+        @emitter.root
       end
 
       def push object
@@ -64,38 +116,20 @@ module Psych
 
         @emitter.start_document version, [], false
         accept object
-        @emitter.end_document
+        @emitter.end_document !@emitter.streaming?
       end
       alias :<< :push
 
       def accept target
         # return any aliases we find
-        if @st.key? target.object_id
-          oid         = target.object_id
-          node        = @st[oid]
+        if @st.key? target
+          oid         = @st.id_for target
+          node        = @st.node_for target
           anchor      = oid.to_s
           node.anchor = anchor
           return @emitter.alias anchor
         end
 
-        if target.respond_to?(:to_yaml)
-          begin
-            loc = target.method(:to_yaml).source_location.first
-            if loc !~ /(syck\/rubytypes.rb|psych\/core_ext.rb)/
-              unless target.respond_to?(:encode_with)
-                if $VERBOSE
-                  warn "implementing to_yaml is deprecated, please implement \"encode_with\""
-                end
-
-                target.to_yaml(:nodump => true)
-              end
-            end
-          rescue
-            # public_method or source_location might be overridden,
-            # and it's OK to skip it since it's only to emit a warning
-          end
-        end
-
         if target.respond_to?(:encode_with)
           dump_coder target
         else
@@ -104,13 +138,18 @@ module Psych
       end
 
       def visit_Psych_Omap o
-        seq = @emitter.start_sequence(nil, '!omap', false, Nodes::Sequence::BLOCK)
+        seq = @emitter.start_sequence(nil, 'tag:yaml.org,2002:omap', false, Nodes::Sequence::BLOCK)
         register(o, seq)
 
         o.each { |k,v| visit_Hash k => v }
         @emitter.end_sequence
       end
 
+      def visit_Encoding o
+        tag = "!ruby/encoding"
+        @emitter.scalar o.name, nil, tag, false, false, Nodes::Scalar::ANY
+      end
+
       def visit_Object o
         tag = Psych.dump_tags[o.class]
         unless tag
@@ -125,6 +164,8 @@ module Psych
         @emitter.end_mapping
       end
 
+      alias :visit_Delegator :visit_Object
+
       def visit_Struct o
         tag = ['!ruby/struct', o.class.name].compact.join(':')
 
@@ -140,41 +181,34 @@ module Psych
       end
 
       def visit_Exception o
-        tag = ['!ruby/exception', o.class.name].join ':'
-
-        @emitter.start_mapping nil, tag, false, Nodes::Mapping::BLOCK
-
-        {
-          'message'   => private_iv_get(o, 'mesg'),
-          'backtrace' => private_iv_get(o, 'backtrace'),
-        }.each do |k,v|
-          next unless v
-          @emitter.scalar k, nil, nil, true, false, Nodes::Scalar::ANY
-          accept v
-        end
-
-        dump_ivars o
+        dump_exception o, private_iv_get(o, 'mesg')
+      end
 
-        @emitter.end_mapping
+      def visit_NameError o
+        dump_exception o, o.message.to_s
       end
 
       def visit_Regexp o
-        @emitter.scalar o.inspect, nil, '!ruby/regexp', false, false, Nodes::Scalar::ANY
+        register o, @emitter.scalar(o.inspect, nil, '!ruby/regexp', false, false, Nodes::Scalar::ANY)
       end
 
       def visit_DateTime o
-        formatted = format_time o.to_time
+        formatted = if o.offset.zero?
+                      o.strftime("%Y-%m-%d %H:%M:%S.%9N Z".freeze)
+                    else
+                      o.strftime("%Y-%m-%d %H:%M:%S.%9N %:z".freeze)
+                    end
         tag = '!ruby/object:DateTime'
-        @emitter.scalar formatted, nil, tag, false, false, Nodes::Scalar::ANY
+        register o, @emitter.scalar(formatted, nil, tag, false, false, Nodes::Scalar::ANY)
       end
 
       def visit_Time o
         formatted = format_time o
-        @emitter.scalar formatted, nil, nil, true, false, Nodes::Scalar::ANY
+        register o, @emitter.scalar(formatted, nil, nil, true, false, Nodes::Scalar::ANY)
       end
 
       def visit_Rational o
-        @emitter.start_mapping(nil, '!ruby/object:Rational', false, Nodes::Mapping::BLOCK)
+        register o, @emitter.start_mapping(nil, '!ruby/object:Rational', false, Nodes::Mapping::BLOCK)
 
         [
           'denominator', o.denominator.to_s,
@@ -187,7 +221,7 @@ module Psych
       end
 
       def visit_Complex o
-        @emitter.start_mapping(nil, '!ruby/object:Complex', false, Nodes::Mapping::BLOCK)
+        register o, @emitter.start_mapping(nil, '!ruby/object:Complex', false, Nodes::Mapping::BLOCK)
 
         ['real', o.real.to_s, 'image', o.imag.to_s].each do |m|
           @emitter.scalar m, nil, nil, true, false, Nodes::Scalar::ANY
@@ -214,31 +248,55 @@ module Psych
         end
       end
 
+      def visit_BigDecimal o
+        @emitter.scalar o._dump, nil, '!ruby/object:BigDecimal', false, false, Nodes::Scalar::ANY
+      end
+
       def visit_String o
-        plain = false
-        quote = false
-        style = Nodes::Scalar::ANY
+        plain = true
+        quote = true
+        style = Nodes::Scalar::PLAIN
+        tag   = nil
 
-        if o.index("\x00") || o.count("\x00-\x7F", "^ -~\t\r\n").fdiv(o.length) > 0.3
-          str   = [o].pack('m').chomp
+        if binary?(o)
+          o     = [o].pack('m0')
           tag   = '!binary' # FIXME: change to below when syck is removed
           #tag   = 'tag:yaml.org,2002:binary'
           style = Nodes::Scalar::LITERAL
-        else
-          str   = o
-          tag   = nil
-          quote = !(String === @ss.tokenize(o))
-          plain = !quote
+          plain = false
+          quote = false
+        elsif o =~ /\n(?!\Z)/  # match \n except blank line at the end of string
+          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:]][^"]*$/
+          style = Nodes::Scalar::DOUBLE_QUOTED
+        elsif not String === @ss.tokenize(o) or /\A0[0-7]*[89]/ =~ o
+          style = Nodes::Scalar::SINGLE_QUOTED
         end
 
-        ivars = find_ivars o
+        is_primitive = o.class == ::String
+        ivars = is_primitive ? [] : o.instance_variables
 
         if ivars.empty?
-          @emitter.scalar str, nil, tag, plain, quote, style
+          unless is_primitive
+            tag = "!ruby/string:#{o.class}"
+            plain = false
+            quote = false
+          end
+          @emitter.scalar o, nil, tag, plain, quote, style
         else
-          @emitter.start_mapping nil, '!str', false, Nodes::Mapping::BLOCK
+          maptag = '!ruby/string'.dup
+          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 str, nil, tag, plain, quote, style
+          @emitter.scalar o, nil, tag, plain, quote, style
 
           dump_ivars o
 
@@ -248,16 +306,16 @@ module Psych
 
       def visit_Module o
         raise TypeError, "can't dump anonymous module: #{o}" unless o.name
-        @emitter.scalar o.name, nil, '!ruby/module', false, false, Nodes::Scalar::SINGLE_QUOTED
+        register o, @emitter.scalar(o.name, nil, '!ruby/module', false, false, Nodes::Scalar::SINGLE_QUOTED)
       end
 
       def visit_Class o
         raise TypeError, "can't dump anonymous class: #{o}" unless o.name
-        @emitter.scalar o.name, nil, '!ruby/class', false, false, Nodes::Scalar::SINGLE_QUOTED
+        register o, @emitter.scalar(o.name, nil, '!ruby/class', false, false, Nodes::Scalar::SINGLE_QUOTED)
       end
 
       def visit_Range o
-        @emitter.start_mapping nil, '!ruby/range', false, Nodes::Mapping::BLOCK
+        register o, @emitter.start_mapping(nil, '!ruby/range', false, Nodes::Mapping::BLOCK)
         ['begin', o.begin, 'end', o.end, 'excl', o.exclude_end?].each do |m|
           accept m
         end
@@ -265,17 +323,16 @@ module Psych
       end
 
       def visit_Hash 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
+        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
         end
-
-        @emitter.end_mapping
       end
 
       def visit_Psych_Set o
@@ -290,6 +347,14 @@ module Psych
       end
 
       def visit_Array o
+        if o.class == ::Array
+          visit_Enumerator o
+        else
+          visit_array_subclass o
+        end
+      end
+
+      def visit_Enumerator o
         register o, @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK)
         o.each { |c| accept c }
         @emitter.end_sequence
@@ -300,42 +365,136 @@ module Psych
       end
 
       def visit_Symbol o
-        @emitter.scalar ":#{o}", nil, nil, true, false, Nodes::Scalar::ANY
+        if o.empty?
+          @emitter.scalar "", nil, '!ruby/symbol', false, false, Nodes::Scalar::ANY
+        else
+          @emitter.scalar ":#{o}", nil, nil, true, false, Nodes::Scalar::ANY
+        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
-      def format_time time
-        if time.utc?
-          time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
+
+      def binary? string
+        string.encoding == Encoding::ASCII_8BIT && !string.ascii_only?
+      end
+
+      def visit_array_subclass o
+        tag = "!ruby/array:#{o.class}"
+        ivars = o.instance_variables
+        if ivars.empty?
+          node = @emitter.start_sequence(nil, tag, false, Nodes::Sequence::BLOCK)
+          register o, node
+          o.each { |c| accept c }
+          @emitter.end_sequence
         else
-          time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
+          node = @emitter.start_mapping(nil, tag, false, Nodes::Sequence::BLOCK)
+          register o, node
+
+          # Dump the internal list
+          accept 'internal'
+          @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK)
+          o.each { |c| accept c }
+          @emitter.end_sequence
+
+          # Dump the ivars
+          accept 'ivars'
+          @emitter.start_mapping(nil, nil, true, Nodes::Sequence::BLOCK)
+          ivars.each do |ivar|
+            accept ivar
+            accept o.instance_variable_get ivar
+          end
+          @emitter.end_mapping
+
+          @emitter.end_mapping
         end
       end
 
-      # FIXME: remove this method once "to_yaml_properties" is removed
-      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')
-            if $VERBOSE
-              warn "#{loc}: to_yaml_properties is deprecated, please implement \"encode_with(coder)\""
-            end
-            return target.to_yaml_properties
+      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)
+
+          # 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
           end
-        rescue
-          # public_method or source_location might be overridden,
-          # and it's OK to skip it since it's only to emit a warning.
+          @emitter.end_mapping
+
+          # 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
+
+          @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
+        end
+      end
+
+      def dump_list o
+      end
+
+      def dump_exception o, msg
+        tag = ['!ruby/exception', o.class.name].join ':'
+
+        @emitter.start_mapping nil, tag, false, Nodes::Mapping::BLOCK
+
+        if msg
+          @emitter.scalar 'message', nil, nil, true, false, Nodes::Scalar::ANY
+          accept msg
         end
 
-        target.instance_variables
+        @emitter.scalar 'backtrace', nil, nil, true, false, Nodes::Scalar::ANY
+        accept o.backtrace
+
+        dump_ivars o
+
+        @emitter.end_mapping
+      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")
+        end
       end
 
       def register target, yaml_obj
-        @st[target.object_id] = yaml_obj
+        @st.register target, yaml_obj
         yaml_obj
       end
 
       def dump_coder o
+        @coders << o
         tag = Psych.dump_tags[o.class]
         unless tag
           klass = o.class == Object ? nil : o.class.name
@@ -344,10 +503,10 @@ module Psych
 
         c = Psych::Coder.new(tag)
         o.encode_with(c)
-        emit_coder c
+        emit_coder c, o
       end
 
-      def emit_coder c
+      def emit_coder c, o
         case c.type
         when :scalar
           @emitter.scalar c.scalar, nil, c.tag, c.tag.nil?, false, Nodes::Scalar::ANY
@@ -358,9 +517,9 @@ module Psych
           end
           @emitter.end_sequence
         when :map
-          @emitter.start_mapping nil, c.tag, c.implicit, c.style
+          register o, @emitter.start_mapping(nil, c.tag, c.implicit, c.style)
           c.map.each do |k,v|
-            @emitter.scalar k, nil, nil, true, false, Nodes::Scalar::ANY
+            accept k
             accept v
           end
           @emitter.end_mapping
@@ -370,9 +529,7 @@ module Psych
       end
 
       def dump_ivars target
-        ivars = find_ivars target
-
-        ivars.each do |iv|
+        target.instance_variables.each do |iv|
           @emitter.scalar("#{iv.to_s.sub(/^@/, '')}", nil, nil, true, false, Nodes::Scalar::ANY)
           accept target.instance_variable_get(iv)
         end
diff --git a/ext/psych/lib/psych/y.rb b/ext/psych/lib/psych/y.rb
new file mode 100644
index 0000000000..e857953c04
--- /dev/null
+++ b/ext/psych/lib/psych/y.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module Kernel
+  ###
+  # An alias for Psych.dump_stream meant to be used with IRB.
+  def y *objects
+    puts Psych.dump_stream(*objects)
+  end
+  private :y
+end
+
diff --git a/ext/psych/parser.c b/ext/psych/parser.c
deleted file mode 100644
index e68768f562..0000000000
--- a/ext/psych/parser.c
+++ /dev/null
@@ -1,399 +0,0 @@
-#include <psych.h>
-
-VALUE cPsychParser;
-VALUE ePsychSyntaxError;
-
-static ID id_read;
-static ID id_path;
-static ID id_empty;
-static ID id_start_stream;
-static ID id_end_stream;
-static ID id_start_document;
-static ID id_end_document;
-static ID id_alias;
-static ID id_scalar;
-static ID id_start_sequence;
-static ID id_end_sequence;
-static ID id_start_mapping;
-static ID id_end_mapping;
-
-#define PSYCH_TRANSCODE(_str, _yaml_enc, _internal_enc) \
-  do { \
-    rb_enc_associate_index((_str), (_yaml_enc)); \
-    if(_internal_enc) \
-      (_str) = rb_str_export_to_enc((_str), (_internal_enc)); \
-  } while (0)
-
-static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read)
-{
-    VALUE io = (VALUE)data;
-    VALUE string = rb_funcall(io, id_read, 1, INT2NUM(size));
-
-    *read = 0;
-
-    if(! NIL_P(string)) {
-	void * str = (void *)StringValuePtr(string);
-	*read = (size_t)RSTRING_LEN(string);
-	memcpy(buf, str, *read);
-    }
-
-    return 1;
-}
-
-static void dealloc(void * ptr)
-{
-    yaml_parser_t * parser;
-
-    parser = (yaml_parser_t *)ptr;
-    yaml_parser_delete(parser);
-    xfree(parser);
-}
-
-static VALUE allocate(VALUE klass)
-{
-    yaml_parser_t * parser;
-
-    parser = xmalloc(sizeof(yaml_parser_t));
-    yaml_parser_initialize(parser);
-
-    return Data_Wrap_Struct(klass, 0, dealloc, parser);
-}
-
-/*
- * call-seq:
- *    parser.parse(yaml)
- *
- * Parse the YAML document contained in +yaml+.  Events will be called on
- * the handler set on the parser instance.
- *
- * See Psych::Parser and Psych::Parser#handler
- */
-static VALUE parse(VALUE self, VALUE yaml)
-{
-    yaml_parser_t * parser;
-    yaml_event_t event;
-    int done = 0;
-    int tainted = 0;
-#ifdef HAVE_RUBY_ENCODING_H
-    int encoding = rb_utf8_encindex();
-    rb_encoding * internal_enc = rb_default_internal_encoding();
-#endif
-    VALUE handler = rb_iv_get(self, "@handler");
-
-    Data_Get_Struct(self, yaml_parser_t, parser);
-
-    if (OBJ_TAINTED(yaml)) tainted = 1;
-
-    if(rb_respond_to(yaml, id_read)) {
-	yaml_parser_set_input(parser, io_reader, (void *)yaml);
-	if (RTEST(rb_obj_is_kind_of(yaml, rb_cIO))) tainted = 1;
-    } else {
-	StringValue(yaml);
-	yaml_parser_set_input_string(
-		parser,
-		(const unsigned char *)RSTRING_PTR(yaml),
-		(size_t)RSTRING_LEN(yaml)
-		);
-    }
-
-    while(!done) {
-	if(!yaml_parser_parse(parser, &event)) {
-	    VALUE path;
-	    size_t line   = parser->mark.line;
-	    size_t column = parser->mark.column;
-
-	    if(rb_respond_to(yaml, id_path))
-		path = rb_funcall(yaml, id_path, 0);
-	    else
-		path = rb_str_new2("<unknown>");
-
-	    yaml_parser_delete(parser);
-	    yaml_parser_initialize(parser);
-
-	    rb_raise(ePsychSyntaxError, "(%s): couldn't parse YAML at line %d column %d",
-		    StringValuePtr(path),
-		    (int)line, (int)column);
-	}
-
-	switch(event.type) {
-	  case YAML_STREAM_START_EVENT:
-
-	    rb_funcall(handler, id_start_stream, 1,
-		       INT2NUM((long)event.data.stream_start.encoding)
-		);
-	    break;
-	  case YAML_DOCUMENT_START_EVENT:
-	    {
-		/* Get a list of tag directives (if any) */
-		VALUE tag_directives = rb_ary_new();
-		/* Grab the document version */
-		VALUE version = event.data.document_start.version_directive ?
-		    rb_ary_new3(
-			(long)2,
-			INT2NUM((long)event.data.document_start.version_directive->major),
-			INT2NUM((long)event.data.document_start.version_directive->minor)
-			) : rb_ary_new();
-
-		if(event.data.document_start.tag_directives.start) {
-		    yaml_tag_directive_t *start =
-			event.data.document_start.tag_directives.start;
-		    yaml_tag_directive_t *end =
-			event.data.document_start.tag_directives.end;
-		    for(; start != end; start++) {
-			VALUE handle = Qnil;
-			VALUE prefix = Qnil;
-			if(start->handle) {
-			    handle = rb_str_new2((const char *)start->handle);
-			    if (tainted) OBJ_TAINT(handle);
-#ifdef HAVE_RUBY_ENCODING_H
-			    PSYCH_TRANSCODE(handle, encoding, internal_enc);
-#endif
-			}
-
-			if(start->prefix) {
-			    prefix = rb_str_new2((const char *)start->prefix);
-			    if (tainted) OBJ_TAINT(prefix);
-#ifdef HAVE_RUBY_ENCODING_H
-			    PSYCH_TRANSCODE(prefix, encoding, internal_enc);
-#endif
-			}
-
-			rb_ary_push(tag_directives, rb_ary_new3((long)2, handle, prefix));
-		    }
-		}
-		rb_funcall(handler, id_start_document, 3,
-			   version, tag_directives,
-			   event.data.document_start.implicit == 1 ? Qtrue : Qfalse
-		    );
-	    }
-	    break;
-	  case YAML_DOCUMENT_END_EVENT:
-	    rb_funcall(handler, id_end_document, 1,
-		       event.data.document_end.implicit == 1 ? Qtrue : Qfalse
-		);
-	    break;
-	  case YAML_ALIAS_EVENT:
-	    {
-		VALUE alias = Qnil;
-		if(event.data.alias.anchor) {
-		    alias = rb_str_new2((const char *)event.data.alias.anchor);
-		    if (tainted) OBJ_TAINT(alias);
-#ifdef HAVE_RUBY_ENCODING_H
-		    PSYCH_TRANSCODE(alias, encoding, internal_enc);
-#endif
-		}
-
-		rb_funcall(handler, id_alias, 1, alias);
-	    }
-	    break;
-	  case YAML_SCALAR_EVENT:
-	    {
-		VALUE anchor = Qnil;
-		VALUE tag = Qnil;
-		VALUE plain_implicit, quoted_implicit, style;
-		VALUE val = rb_str_new(
-		    (const char *)event.data.scalar.value,
-		    (long)event.data.scalar.length
-		    );
-		if (tainted) OBJ_TAINT(val);
-
-#ifdef HAVE_RUBY_ENCODING_H
-		PSYCH_TRANSCODE(val, encoding, internal_enc);
-#endif
-
-		if(event.data.scalar.anchor) {
-		    anchor = rb_str_new2((const char *)event.data.scalar.anchor);
-		    if (tainted) OBJ_TAINT(anchor);
-#ifdef HAVE_RUBY_ENCODING_H
-		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-#endif
-		}
-
-		if(event.data.scalar.tag) {
-		    tag = rb_str_new2((const char *)event.data.scalar.tag);
-		    if (tainted) OBJ_TAINT(tag);
-#ifdef HAVE_RUBY_ENCODING_H
-		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-#endif
-		}
-
-		plain_implicit =
-		    event.data.scalar.plain_implicit == 0 ? Qfalse : Qtrue;
-
-		quoted_implicit =
-		    event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
-
-		style = INT2NUM((long)event.data.scalar.style);
-
-		rb_funcall(handler, id_scalar, 6,
-			   val, anchor, tag, plain_implicit, quoted_implicit, style);
-	    }
-	    break;
-	  case YAML_SEQUENCE_START_EVENT:
-	    {
-		VALUE anchor = Qnil;
-		VALUE tag = Qnil;
-		VALUE implicit, style;
-		if(event.data.sequence_start.anchor) {
-		    anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
-		    if (tainted) OBJ_TAINT(anchor);
-#ifdef HAVE_RUBY_ENCODING_H
-		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-#endif
-		}
-
-		tag = Qnil;
-		if(event.data.sequence_start.tag) {
-		    tag = rb_str_new2((const char *)event.data.sequence_start.tag);
-		    if (tainted) OBJ_TAINT(tag);
-#ifdef HAVE_RUBY_ENCODING_H
-		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-#endif
-		}
-
-		implicit =
-		    event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
-
-		style = INT2NUM((long)event.data.sequence_start.style);
-
-		rb_funcall(handler, id_start_sequence, 4,
-			   anchor, tag, implicit, style);
-	    }
-	    break;
-	  case YAML_SEQUENCE_END_EVENT:
-	    rb_funcall(handler, id_end_sequence, 0);
-	    break;
-	  case YAML_MAPPING_START_EVENT:
-	    {
-		VALUE anchor = Qnil;
-		VALUE tag = Qnil;
-		VALUE implicit, style;
-		if(event.data.mapping_start.anchor) {
-		    anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
-		    if (tainted) OBJ_TAINT(anchor);
-#ifdef HAVE_RUBY_ENCODING_H
-		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-#endif
-		}
-
-		if(event.data.mapping_start.tag) {
-		    tag = rb_str_new2((const char *)event.data.mapping_start.tag);
-		    if (tainted) OBJ_TAINT(tag);
-#ifdef HAVE_RUBY_ENCODING_H
-		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-#endif
-		}
-
-		implicit =
-		    event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
-
-		style = INT2NUM((long)event.data.mapping_start.style);
-
-		rb_funcall(handler, id_start_mapping, 4,
-			   anchor, tag, implicit, style);
-	    }
-	    break;
-	  case YAML_MAPPING_END_EVENT:
-	    rb_funcall(handler, id_end_mapping, 0);
-	    break;
-	  case YAML_NO_EVENT:
-	    rb_funcall(handler, id_empty, 0);
-	    break;
-	  case YAML_STREAM_END_EVENT:
-	    rb_funcall(handler, id_end_stream, 0);
-	    done = 1;
-	    break;
-	}
-	yaml_event_delete(&event);
-    }
-
-    return self;
-}
-
-/*
- * call-seq:
- *    parser.external_encoding=(encoding)
- *
- * Set the encoding for this parser to +encoding+
- */
-static VALUE set_external_encoding(VALUE self, VALUE encoding)
-{
-    yaml_parser_t * parser;
-    VALUE exception;
-
-    Data_Get_Struct(self, yaml_parser_t, parser);
-
-    if(parser->encoding) {
-	exception = rb_const_get_at(mPsych, rb_intern("Exception"));
-	rb_raise(exception, "don't set the encoding twice!");
-    }
-
-    yaml_parser_set_encoding(parser, NUM2INT(encoding));
-
-    return encoding;
-}
-
-/*
- * call-seq:
- *    parser.mark # => #<Psych::Parser::Mark>
- *
- * Returns a Psych::Parser::Mark object that contains line, column, and index
- * information.
- */
-static VALUE mark(VALUE self)
-{
-    VALUE mark_klass;
-    VALUE args[3];
-    yaml_parser_t * 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);
-    args[2] = INT2NUM(parser->mark.column);
-
-    return rb_class_new_instance(3, args, mark_klass);
-}
-
-void Init_psych_parser()
-{
-#if 0
-    mPsych = rb_define_module("Psych");
-#endif
-
-    cPsychParser = rb_define_class_under(mPsych, "Parser", rb_cObject);
-    rb_define_alloc_func(cPsychParser, allocate);
-
-    /* Any encoding: Let the parser choose the encoding */
-    rb_define_const(cPsychParser, "ANY", INT2NUM(YAML_ANY_ENCODING));
-
-    /* UTF-8 Encoding */
-    rb_define_const(cPsychParser, "UTF8", INT2NUM(YAML_UTF8_ENCODING));
-
-    /* UTF-16-LE Encoding with BOM */
-    rb_define_const(cPsychParser, "UTF16LE", INT2NUM(YAML_UTF16LE_ENCODING));
-
-    /* UTF-16-BE Encoding with BOM */
-    rb_define_const(cPsychParser, "UTF16BE", INT2NUM(YAML_UTF16BE_ENCODING));
-
-    ePsychSyntaxError = rb_define_class_under(mPsych, "SyntaxError", rb_eSyntaxError);
-
-    rb_define_method(cPsychParser, "parse", parse, 1);
-    rb_define_method(cPsychParser, "mark", mark, 0);
-    rb_define_method(cPsychParser, "external_encoding=", set_external_encoding, 1);
-
-    id_read           = rb_intern("read");
-    id_path           = rb_intern("path");
-    id_empty          = rb_intern("empty");
-    id_start_stream   = rb_intern("start_stream");
-    id_end_stream     = rb_intern("end_stream");
-    id_start_document = rb_intern("start_document");
-    id_end_document   = rb_intern("end_document");
-    id_alias          = rb_intern("alias");
-    id_scalar         = rb_intern("scalar");
-    id_start_sequence = rb_intern("start_sequence");
-    id_end_sequence   = rb_intern("end_sequence");
-    id_start_mapping  = rb_intern("start_mapping");
-    id_end_mapping    = rb_intern("end_mapping");
-}
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/parser.h b/ext/psych/parser.h
deleted file mode 100644
index 25e896f01d..0000000000
--- a/ext/psych/parser.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef PSYCH_PARSER_H
-#define PSYCH_PARSER_H
-
-void Init_psych_parser();
-
-#endif
diff --git a/ext/psych/psych.c b/ext/psych/psych.c
index 69ff1d8dfc..3bb59bfc11 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 Init_psych(void)
 {
     mPsych = rb_define_module("Psych");
 
diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec
new file mode 100644
index 0000000000..e0168af7d8
--- /dev/null
+++ b/ext/psych/psych.gemspec
@@ -0,0 +1,70 @@
+# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
+begin
+  require_relative 'lib/psych/versions'
+rescue LoadError
+  # for Ruby core repository
+  require_relative 'versions'
+end
+
+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.summary = "Psych is a YAML parser and emitter"
+  s.description = <<-DESCRIPTION
+Psych is a YAML parser and emitter. Psych leverages libyaml[https://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", "Gemfile", "Mavenfile", "README.md", "Rakefile", "bin/console",
+    "bin/setup", "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/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 = ["README.md"]
+
+  s.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  s.rubygems_version = "2.5.1"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0")
+
+  if RUBY_ENGINE == 'jruby'
+    s.platform = 'java'
+    s.files.concat [
+      "ext/java/org/jruby/ext/psych/PsychEmitter.java",
+      "ext/java/org/jruby/ext/psych/PsychLibrary.java",
+      "ext/java/org/jruby/ext/psych/PsychParser.java",
+      "ext/java/org/jruby/ext/psych/PsychToRuby.java",
+      "ext/java/org/jruby/ext/psych/PsychYamlTree.java",
+      "lib/psych_jars.rb",
+      "lib/psych.jar"
+    ]
+    s.requirements = "jar org.yaml:snakeyaml, #{Psych::DEFAULT_SNAKEYAML_VERSION}"
+    s.add_dependency 'jar-dependencies', '>= 0.1.7'
+  else
+    s.extensions = ["ext/psych/extconf.rb"]
+  end
+end
diff --git a/ext/psych/psych.h b/ext/psych/psych.h
index 9f1be449a2..6b3d63f246 100644
--- a/ext/psych/psych.h
+++ b/ext/psych/psych.h
@@ -2,17 +2,14 @@
 #define PSYCH_H
 
 #include <ruby.h>
-
-#ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/encoding.h>
-#endif
 
 #include <yaml.h>
 
-#include <parser.h>
-#include <emitter.h>
-#include <to_ruby.h>
-#include <yaml_tree.h>
+#include <psych_parser.h>
+#include <psych_emitter.h>
+#include <psych_to_ruby.h>
+#include <psych_yaml_tree.h>
 
 extern VALUE mPsych;
 
diff --git a/ext/psych/psych_emitter.c b/ext/psych/psych_emitter.c
new file mode 100644
index 0000000000..022ffa0946
--- /dev/null
+++ b/ext/psych/psych_emitter.c
@@ -0,0 +1,555 @@
+#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;
+static ID id_canonical;
+
+static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
+{
+    if(!yaml_emitter_emit(emitter, event))
+	rb_raise(rb_eRuntimeError, "%s", emitter->problem);
+}
+
+static int writer(void *ctx, unsigned char *buffer, size_t size)
+{
+    VALUE 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 wrote = rb_funcall(io, id_write, 1, str);
+    return (int)NUM2INT(wrote);
+}
+
+static void dealloc(void * ptr)
+{
+    yaml_emitter_t * emitter;
+
+    emitter = (yaml_emitter_t *)ptr;
+    yaml_emitter_delete(emitter);
+    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);
+
+    yaml_emitter_initialize(emitter);
+    yaml_emitter_set_unicode(emitter, 1);
+    yaml_emitter_set_indent(emitter, 2);
+
+    return obj;
+}
+
+/* call-seq: Psych::Emitter.new(io, options = Psych::Emitter::OPTIONS)
+ *
+ * Create a new Psych::Emitter that writes to +io+.
+ */
+static VALUE initialize(int argc, VALUE *argv, VALUE self)
+{
+    yaml_emitter_t * emitter;
+    VALUE io, options;
+    VALUE line_width;
+    VALUE indent;
+    VALUE canonical;
+
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    if (rb_scan_args(argc, argv, "11", &io, &options) == 2) {
+	line_width = rb_funcall(options, id_line_width, 0);
+	indent     = rb_funcall(options, id_indentation, 0);
+	canonical  = rb_funcall(options, id_canonical, 0);
+
+	yaml_emitter_set_width(emitter, NUM2INT(line_width));
+	yaml_emitter_set_indent(emitter, NUM2INT(indent));
+	yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
+    }
+
+    rb_ivar_set(self, id_io, io);
+    yaml_emitter_set_output(emitter, writer, (void *)self);
+
+    return self;
+}
+
+/* call-seq: emitter.start_stream(encoding)
+ *
+ * Start a stream emission with +encoding+
+ *
+ * See Psych::Handler#start_stream
+ */
+static VALUE start_stream(VALUE self, VALUE encoding)
+{
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Check_Type(encoding, T_FIXNUM);
+
+    yaml_stream_start_event_initialize(&event, (yaml_encoding_t)NUM2INT(encoding));
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.end_stream
+ *
+ * End a stream emission
+ *
+ * See Psych::Handler#end_stream
+ */
+static VALUE end_stream(VALUE self)
+{
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    yaml_stream_end_event_initialize(&event);
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.start_document(version, tags, implicit)
+ *
+ * Start a document emission with YAML +version+, +tags+, and an +implicit+
+ * start.
+ *
+ * See Psych::Handler#start_document
+ */
+static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
+{
+    yaml_emitter_t * emitter;
+    yaml_tag_directive_t * head = NULL;
+    yaml_tag_directive_t * tail = NULL;
+    yaml_event_t event;
+    yaml_version_directive_t version_directive;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+
+    Check_Type(version, T_ARRAY);
+
+    if(RARRAY_LEN(version) > 0) {
+	VALUE major = rb_ary_entry(version, (long)0);
+	VALUE minor = rb_ary_entry(version, (long)1);
+
+	version_directive.major = NUM2INT(major);
+	version_directive.minor = NUM2INT(minor);
+    }
+
+    if(RTEST(tags)) {
+	long i = 0;
+	long len;
+	rb_encoding * encoding = rb_utf8_encoding();
+
+	Check_Type(tags, T_ARRAY);
+
+	len = RARRAY_LEN(tags);
+	head  = xcalloc((size_t)len, sizeof(yaml_tag_directive_t));
+	tail  = head;
+
+	for(i = 0; i < len && i < RARRAY_LEN(tags); i++) {
+	    VALUE tuple = RARRAY_AREF(tags, i);
+	    VALUE name;
+	    VALUE value;
+
+	    Check_Type(tuple, T_ARRAY);
+
+	    if(RARRAY_LEN(tuple) < 2) {
+		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 = rb_str_export_to_enc(name, encoding);
+	    value = rb_str_export_to_enc(value, encoding);
+
+	    tail->handle = (yaml_char_t *)StringValueCStr(name);
+	    tail->prefix = (yaml_char_t *)StringValueCStr(value);
+
+	    tail++;
+	}
+    }
+
+    yaml_document_start_event_initialize(
+	    &event,
+	    (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
+	    head,
+	    tail,
+	    imp ? 1 : 0
+	    );
+
+    emit(emitter, &event);
+
+    if(head) xfree(head);
+
+    return self;
+}
+
+/* call-seq: emitter.end_document(implicit)
+ *
+ * End a document emission with an +implicit+ ending.
+ *
+ * See Psych::Handler#end_document
+ */
+static VALUE end_document(VALUE self, VALUE imp)
+{
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    yaml_document_end_event_initialize(&event, imp ? 1 : 0);
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.scalar(value, anchor, tag, plain, quoted, style)
+ *
+ * Emit a scalar with +value+, +anchor+, +tag+, and a +plain+ or +quoted+
+ * string type with +style+.
+ *
+ * See Psych::Handler#scalar
+ */
+static VALUE scalar(
+	VALUE self,
+	VALUE value,
+	VALUE anchor,
+	VALUE tag,
+	VALUE plain,
+	VALUE quoted,
+	VALUE style
+	) {
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    rb_encoding *encoding;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    Check_Type(value, T_STRING);
+
+    encoding = rb_utf8_encoding();
+
+    value = rb_str_export_to_enc(value, encoding);
+
+    if(!NIL_P(anchor)) {
+	Check_Type(anchor, T_STRING);
+	anchor = rb_str_export_to_enc(anchor, encoding);
+    }
+
+    if(!NIL_P(tag)) {
+	Check_Type(tag, T_STRING);
+	tag = rb_str_export_to_enc(tag, encoding);
+    }
+
+    yaml_scalar_event_initialize(
+	    &event,
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+	    (yaml_char_t*)StringValuePtr(value),
+	    (int)RSTRING_LEN(value),
+	    plain ? 1 : 0,
+	    quoted ? 1 : 0,
+	    (yaml_scalar_style_t)NUM2INT(style)
+	    );
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.start_sequence(anchor, tag, implicit, style)
+ *
+ * Start emitting a sequence with +anchor+, a +tag+, +implicit+ sequence
+ * start and end, along with +style+.
+ *
+ * See Psych::Handler#start_sequence
+ */
+static VALUE start_sequence(
+	VALUE self,
+	VALUE anchor,
+	VALUE tag,
+	VALUE implicit,
+	VALUE style
+	) {
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+
+    rb_encoding * encoding = rb_utf8_encoding();
+
+    if(!NIL_P(anchor)) {
+	Check_Type(anchor, T_STRING);
+	anchor = rb_str_export_to_enc(anchor, encoding);
+    }
+
+    if(!NIL_P(tag)) {
+	Check_Type(tag, T_STRING);
+	tag = rb_str_export_to_enc(tag, encoding);
+    }
+
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    yaml_sequence_start_event_initialize(
+	    &event,
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+	    implicit ? 1 : 0,
+	    (yaml_sequence_style_t)NUM2INT(style)
+	    );
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.end_sequence
+ *
+ * End sequence emission.
+ *
+ * See Psych::Handler#end_sequence
+ */
+static VALUE end_sequence(VALUE self)
+{
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    yaml_sequence_end_event_initialize(&event);
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.start_mapping(anchor, tag, implicit, style)
+ *
+ * Start emitting a YAML map with +anchor+, +tag+, an +implicit+ start
+ * and end, and +style+.
+ *
+ * See Psych::Handler#start_mapping
+ */
+static VALUE start_mapping(
+	VALUE self,
+	VALUE anchor,
+	VALUE tag,
+	VALUE implicit,
+	VALUE style
+	) {
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    rb_encoding *encoding;
+
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    encoding = rb_utf8_encoding();
+
+    if(!NIL_P(anchor)) {
+	Check_Type(anchor, T_STRING);
+	anchor = rb_str_export_to_enc(anchor, encoding);
+    }
+
+    if(!NIL_P(tag)) {
+	Check_Type(tag, T_STRING);
+	tag = rb_str_export_to_enc(tag, encoding);
+    }
+
+    yaml_mapping_start_event_initialize(
+	    &event,
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+	    implicit ? 1 : 0,
+	    (yaml_mapping_style_t)NUM2INT(style)
+	    );
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.end_mapping
+ *
+ * Emit the end of a mapping.
+ *
+ * See Psych::Handler#end_mapping
+ */
+static VALUE end_mapping(VALUE self)
+{
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    yaml_mapping_end_event_initialize(&event);
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.alias(anchor)
+ *
+ * Emit an alias with +anchor+.
+ *
+ * See Psych::Handler#alias
+ */
+static VALUE alias(VALUE self, VALUE anchor)
+{
+    yaml_emitter_t * emitter;
+    yaml_event_t event;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    if(!NIL_P(anchor)) {
+	Check_Type(anchor, T_STRING);
+	anchor = rb_str_export_to_enc(anchor, rb_utf8_encoding());
+    }
+
+    yaml_alias_event_initialize(
+	    &event,
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor))
+	    );
+
+    emit(emitter, &event);
+
+    return self;
+}
+
+/* call-seq: emitter.canonical = true
+ *
+ * Set the output style to canonical, or not.
+ */
+static VALUE set_canonical(VALUE self, VALUE style)
+{
+    yaml_emitter_t * emitter;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    yaml_emitter_set_canonical(emitter, Qtrue == style ? 1 : 0);
+
+    return style;
+}
+
+/* call-seq: emitter.canonical
+ *
+ * Get the output style, canonical or not.
+ */
+static VALUE canonical(VALUE self)
+{
+    yaml_emitter_t * emitter;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    return (emitter->canonical == 0) ? Qfalse : Qtrue;
+}
+
+/* call-seq: emitter.indentation = level
+ *
+ * Set the indentation level to +level+.  The level must be less than 10 and
+ * greater than 1.
+ */
+static VALUE set_indentation(VALUE self, VALUE level)
+{
+    yaml_emitter_t * emitter;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    yaml_emitter_set_indent(emitter, NUM2INT(level));
+
+    return level;
+}
+
+/* call-seq: emitter.indentation
+ *
+ * Get the indentation level.
+ */
+static VALUE indentation(VALUE self)
+{
+    yaml_emitter_t * emitter;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    return INT2NUM(emitter->best_indent);
+}
+
+/* call-seq: emitter.line_width
+ *
+ * Get the preferred line width.
+ */
+static VALUE line_width(VALUE self)
+{
+    yaml_emitter_t * emitter;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    return INT2NUM(emitter->best_width);
+}
+
+/* call-seq: emitter.line_width = width
+ *
+ * Set the preferred line with to +width+.
+ */
+static VALUE set_line_width(VALUE self, VALUE width)
+{
+    yaml_emitter_t * emitter;
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    yaml_emitter_set_width(emitter, NUM2INT(width));
+
+    return width;
+}
+
+void Init_psych_emitter(void)
+{
+#undef rb_intern
+    VALUE psych     = rb_define_module("Psych");
+    VALUE handler   = rb_define_class_under(psych, "Handler", rb_cObject);
+    cPsychEmitter   = rb_define_class_under(psych, "Emitter", handler);
+
+    rb_define_alloc_func(cPsychEmitter, allocate);
+
+    rb_define_method(cPsychEmitter, "initialize", initialize, -1);
+    rb_define_method(cPsychEmitter, "start_stream", start_stream, 1);
+    rb_define_method(cPsychEmitter, "end_stream", end_stream, 0);
+    rb_define_method(cPsychEmitter, "start_document", start_document, 3);
+    rb_define_method(cPsychEmitter, "end_document", end_document, 1);
+    rb_define_method(cPsychEmitter, "scalar", scalar, 6);
+    rb_define_method(cPsychEmitter, "start_sequence", start_sequence, 4);
+    rb_define_method(cPsychEmitter, "end_sequence", end_sequence, 0);
+    rb_define_method(cPsychEmitter, "start_mapping", start_mapping, 4);
+    rb_define_method(cPsychEmitter, "end_mapping", end_mapping, 0);
+    rb_define_method(cPsychEmitter, "alias", alias, 1);
+    rb_define_method(cPsychEmitter, "canonical", canonical, 0);
+    rb_define_method(cPsychEmitter, "canonical=", set_canonical, 1);
+    rb_define_method(cPsychEmitter, "indentation", indentation, 0);
+    rb_define_method(cPsychEmitter, "indentation=", set_indentation, 1);
+    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");
+    id_canonical   = rb_intern("canonical");
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych_emitter.h b/ext/psych/psych_emitter.h
new file mode 100644
index 0000000000..4c1482a78b
--- /dev/null
+++ b/ext/psych/psych_emitter.h
@@ -0,0 +1,8 @@
+#ifndef PSYCH_EMITTER_H
+#define PSYCH_EMITTER_H
+
+#include <psych.h>
+
+void Init_psych_emitter(void);
+
+#endif
diff --git a/ext/psych/psych_parser.c b/ext/psych/psych_parser.c
new file mode 100644
index 0000000000..fb1a917bb2
--- /dev/null
+++ b/ext/psych/psych_parser.c
@@ -0,0 +1,579 @@
+#include <psych.h>
+
+VALUE cPsychParser;
+
+static ID id_read;
+static ID id_path;
+static ID id_empty;
+static ID id_start_stream;
+static ID id_end_stream;
+static ID id_start_document;
+static ID id_end_document;
+static ID id_alias;
+static ID id_scalar;
+static ID id_start_sequence;
+static ID id_end_sequence;
+static ID id_start_mapping;
+static ID id_end_mapping;
+static ID id_event_location;
+
+#define PSYCH_TRANSCODE(_str, _yaml_enc, _internal_enc) \
+  do { \
+    rb_enc_associate_index((_str), (_yaml_enc)); \
+    if(_internal_enc) \
+      (_str) = rb_str_export_to_enc((_str), (_internal_enc)); \
+  } while (0)
+
+static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read)
+{
+    VALUE io = (VALUE)data;
+    VALUE string = rb_funcall(io, id_read, 1, INT2NUM(size));
+
+    *read = 0;
+
+    if(! NIL_P(string)) {
+	void * str = (void *)StringValuePtr(string);
+	*read = (size_t)RSTRING_LEN(string);
+	memcpy(buf, str, *read);
+    }
+
+    return 1;
+}
+
+static void dealloc(void * ptr)
+{
+    yaml_parser_t * parser;
+
+    parser = (yaml_parser_t *)ptr;
+    yaml_parser_delete(parser);
+    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);
+
+    yaml_parser_initialize(parser);
+
+    return obj;
+}
+
+static VALUE make_exception(yaml_parser_t * parser, VALUE path)
+{
+    size_t line, column;
+    VALUE ePsychSyntaxError;
+
+    line = parser->context_mark.line + 1;
+    column = parser->context_mark.column + 1;
+
+    ePsychSyntaxError = rb_const_get(mPsych, rb_intern("SyntaxError"));
+
+    return rb_funcall(ePsychSyntaxError, rb_intern("new"), 6,
+	    path,
+	    INT2NUM(line),
+	    INT2NUM(column),
+	    INT2NUM(parser->problem_offset),
+	    parser->problem ? rb_usascii_str_new2(parser->problem) : Qnil,
+	    parser->context ? rb_usascii_str_new2(parser->context) : Qnil);
+}
+
+static VALUE transcode_string(VALUE src, int * parser_encoding)
+{
+    int utf8    = rb_utf8_encindex();
+    int utf16le = rb_enc_find_index("UTF-16LE");
+    int utf16be = rb_enc_find_index("UTF-16BE");
+    int source_encoding = rb_enc_get_index(src);
+
+    if (source_encoding == utf8) {
+	*parser_encoding = YAML_UTF8_ENCODING;
+	return src;
+    }
+
+    if (source_encoding == utf16le) {
+	*parser_encoding = YAML_UTF16LE_ENCODING;
+	return src;
+    }
+
+    if (source_encoding == utf16be) {
+	*parser_encoding = YAML_UTF16BE_ENCODING;
+	return src;
+    }
+
+    src = rb_str_export_to_enc(src, rb_utf8_encoding());
+    RB_GC_GUARD(src);
+
+    *parser_encoding = YAML_UTF8_ENCODING;
+    return src;
+}
+
+static VALUE transcode_io(VALUE src, int * parser_encoding)
+{
+    VALUE io_external_encoding;
+    int io_external_enc_index;
+
+    io_external_encoding = rb_funcall(src, rb_intern("external_encoding"), 0);
+
+    /* if no encoding is returned, assume ascii8bit. */
+    if (NIL_P(io_external_encoding)) {
+	io_external_enc_index = rb_ascii8bit_encindex();
+    } else {
+	io_external_enc_index = rb_to_encoding_index(io_external_encoding);
+    }
+
+    /* Treat US-ASCII as utf_8 */
+    if (io_external_enc_index == rb_usascii_encindex()) {
+	*parser_encoding = YAML_UTF8_ENCODING;
+	return src;
+    }
+
+    if (io_external_enc_index == rb_utf8_encindex()) {
+	*parser_encoding = YAML_UTF8_ENCODING;
+	return src;
+    }
+
+    if (io_external_enc_index == rb_enc_find_index("UTF-16LE")) {
+	*parser_encoding = YAML_UTF16LE_ENCODING;
+	return src;
+    }
+
+    if (io_external_enc_index == rb_enc_find_index("UTF-16BE")) {
+	*parser_encoding = YAML_UTF16BE_ENCODING;
+	return src;
+    }
+
+    /* Just guess on ASCII-8BIT */
+    if (io_external_enc_index == rb_ascii8bit_encindex()) {
+	*parser_encoding = YAML_ANY_ENCODING;
+	return src;
+    }
+
+    /* If the external encoding is something we don't know how to handle,
+     * fall back to YAML_ANY_ENCODING. */
+    *parser_encoding = YAML_ANY_ENCODING;
+
+    return src;
+}
+
+static VALUE protected_start_stream(VALUE pointer)
+{
+    VALUE *args = (VALUE *)pointer;
+    return rb_funcall(args[0], id_start_stream, 1, args[1]);
+}
+
+static VALUE protected_start_document(VALUE pointer)
+{
+    VALUE *args = (VALUE *)pointer;
+    return rb_funcall3(args[0], id_start_document, 3, args + 1);
+}
+
+static VALUE protected_end_document(VALUE pointer)
+{
+    VALUE *args = (VALUE *)pointer;
+    return rb_funcall(args[0], id_end_document, 1, args[1]);
+}
+
+static VALUE protected_alias(VALUE pointer)
+{
+    VALUE *args = (VALUE *)pointer;
+    return rb_funcall(args[0], id_alias, 1, args[1]);
+}
+
+static VALUE protected_scalar(VALUE pointer)
+{
+    VALUE *args = (VALUE *)pointer;
+    return rb_funcall3(args[0], id_scalar, 6, args + 1);
+}
+
+static VALUE protected_start_sequence(VALUE pointer)
+{
+    VALUE *args = (VALUE *)pointer;
+    return rb_funcall3(args[0], id_start_sequence, 4, args + 1);
+}
+
+static VALUE protected_end_sequence(VALUE handler)
+{
+    return rb_funcall(handler, id_end_sequence, 0);
+}
+
+static VALUE protected_start_mapping(VALUE pointer)
+{
+    VALUE *args = (VALUE *)pointer;
+    return rb_funcall3(args[0], id_start_mapping, 4, args + 1);
+}
+
+static VALUE protected_end_mapping(VALUE handler)
+{
+    return rb_funcall(handler, id_end_mapping, 0);
+}
+
+static VALUE protected_empty(VALUE handler)
+{
+    return rb_funcall(handler, id_empty, 0);
+}
+
+static VALUE protected_end_stream(VALUE handler)
+{
+    return rb_funcall(handler, id_end_stream, 0);
+}
+
+static VALUE protected_event_location(VALUE pointer)
+{
+    VALUE *args = (VALUE *)pointer;
+    return rb_funcall3(args[0], id_event_location, 4, args + 1);
+}
+
+/*
+ * call-seq:
+ *    parser.parse(yaml)
+ *
+ * Parse the YAML document contained in +yaml+.  Events will be called on
+ * the handler set on the parser instance.
+ *
+ * See Psych::Parser and Psych::Parser#handler
+ */
+static VALUE parse(int argc, VALUE *argv, VALUE self)
+{
+    VALUE yaml, path;
+    yaml_parser_t * parser;
+    yaml_event_t event;
+    int done = 0;
+    int state = 0;
+    int parser_encoding = YAML_ANY_ENCODING;
+    int encoding = rb_utf8_encindex();
+    rb_encoding * internal_enc = rb_default_internal_encoding();
+    VALUE handler = rb_iv_get(self, "@handler");
+
+    if (rb_scan_args(argc, argv, "11", &yaml, &path) == 1) {
+	if(rb_respond_to(yaml, id_path))
+	    path = rb_funcall(yaml, id_path, 0);
+	else
+	    path = rb_str_new2("<unknown>");
+    }
+
+    TypedData_Get_Struct(self, yaml_parser_t, &psych_parser_type, parser);
+
+    yaml_parser_delete(parser);
+    yaml_parser_initialize(parser);
+
+    if (rb_respond_to(yaml, id_read)) {
+	yaml = transcode_io(yaml, &parser_encoding);
+	yaml_parser_set_encoding(parser, parser_encoding);
+	yaml_parser_set_input(parser, io_reader, (void *)yaml);
+    } else {
+	StringValue(yaml);
+	yaml = transcode_string(yaml, &parser_encoding);
+	yaml_parser_set_encoding(parser, parser_encoding);
+	yaml_parser_set_input_string(
+		parser,
+		(const unsigned char *)RSTRING_PTR(yaml),
+		(size_t)RSTRING_LEN(yaml)
+		);
+    }
+
+    while(!done) {
+	VALUE event_args[5];
+	VALUE start_line, start_column, end_line, end_column;
+
+	if(!yaml_parser_parse(parser, &event)) {
+	    VALUE exception;
+
+	    exception = make_exception(parser, path);
+	    yaml_parser_delete(parser);
+	    yaml_parser_initialize(parser);
+
+	    rb_exc_raise(exception);
+	}
+
+	start_line = INT2NUM((long)event.start_mark.line);
+	start_column = INT2NUM((long)event.start_mark.column);
+	end_line = INT2NUM((long)event.end_mark.line);
+	end_column = INT2NUM((long)event.end_mark.column);
+
+	event_args[0] = handler;
+	event_args[1] = start_line;
+	event_args[2] = start_column;
+	event_args[3] = end_line;
+	event_args[4] = end_column;
+	rb_protect(protected_event_location, (VALUE)event_args, &state);
+
+	switch(event.type) {
+	    case YAML_STREAM_START_EVENT:
+	      {
+		  VALUE args[2];
+
+		  args[0] = handler;
+		  args[1] = INT2NUM((long)event.data.stream_start.encoding);
+		  rb_protect(protected_start_stream, (VALUE)args, &state);
+	      }
+	      break;
+	  case YAML_DOCUMENT_START_EVENT:
+	    {
+		VALUE args[4];
+		/* Get a list of tag directives (if any) */
+		VALUE tag_directives = rb_ary_new();
+		/* Grab the document version */
+		VALUE version = event.data.document_start.version_directive ?
+		    rb_ary_new3(
+			(long)2,
+			INT2NUM((long)event.data.document_start.version_directive->major),
+			INT2NUM((long)event.data.document_start.version_directive->minor)
+			) : rb_ary_new();
+
+		if(event.data.document_start.tag_directives.start) {
+		    yaml_tag_directive_t *start =
+			event.data.document_start.tag_directives.start;
+		    yaml_tag_directive_t *end =
+			event.data.document_start.tag_directives.end;
+		    for(; start != end; start++) {
+			VALUE handle = Qnil;
+			VALUE prefix = Qnil;
+			if(start->handle) {
+			    handle = rb_str_new2((const char *)start->handle);
+			    PSYCH_TRANSCODE(handle, encoding, internal_enc);
+			}
+
+			if(start->prefix) {
+			    prefix = rb_str_new2((const char *)start->prefix);
+			    PSYCH_TRANSCODE(prefix, encoding, internal_enc);
+			}
+
+			rb_ary_push(tag_directives, rb_ary_new3((long)2, handle, prefix));
+		    }
+		}
+		args[0] = handler;
+		args[1] = version;
+		args[2] = tag_directives;
+		args[3] = event.data.document_start.implicit == 1 ? Qtrue : Qfalse;
+		rb_protect(protected_start_document, (VALUE)args, &state);
+	    }
+	    break;
+	  case YAML_DOCUMENT_END_EVENT:
+	    {
+		VALUE args[2];
+
+		args[0] = handler;
+		args[1] = event.data.document_end.implicit == 1 ? Qtrue : Qfalse;
+		rb_protect(protected_end_document, (VALUE)args, &state);
+	    }
+	    break;
+	  case YAML_ALIAS_EVENT:
+	    {
+		VALUE args[2];
+		VALUE alias = Qnil;
+		if(event.data.alias.anchor) {
+		    alias = rb_str_new2((const char *)event.data.alias.anchor);
+		    PSYCH_TRANSCODE(alias, encoding, internal_enc);
+		}
+
+		args[0] = handler;
+		args[1] = alias;
+		rb_protect(protected_alias, (VALUE)args, &state);
+	    }
+	    break;
+	  case YAML_SCALAR_EVENT:
+	    {
+		VALUE args[7];
+		VALUE anchor = Qnil;
+		VALUE tag = Qnil;
+		VALUE plain_implicit, quoted_implicit, style;
+		VALUE val = rb_str_new(
+		    (const char *)event.data.scalar.value,
+		    (long)event.data.scalar.length
+		    );
+
+		PSYCH_TRANSCODE(val, encoding, internal_enc);
+
+		if(event.data.scalar.anchor) {
+		    anchor = rb_str_new2((const char *)event.data.scalar.anchor);
+		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+		}
+
+		if(event.data.scalar.tag) {
+		    tag = rb_str_new2((const char *)event.data.scalar.tag);
+		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+		}
+
+		plain_implicit =
+		    event.data.scalar.plain_implicit == 0 ? Qfalse : Qtrue;
+
+		quoted_implicit =
+		    event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
+
+		style = INT2NUM((long)event.data.scalar.style);
+
+		args[0] = handler;
+		args[1] = val;
+		args[2] = anchor;
+		args[3] = tag;
+		args[4] = plain_implicit;
+		args[5] = quoted_implicit;
+		args[6] = style;
+		rb_protect(protected_scalar, (VALUE)args, &state);
+	    }
+	    break;
+	  case YAML_SEQUENCE_START_EVENT:
+	    {
+		VALUE args[5];
+		VALUE anchor = Qnil;
+		VALUE tag = Qnil;
+		VALUE implicit, style;
+		if(event.data.sequence_start.anchor) {
+		    anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
+		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+		}
+
+		tag = Qnil;
+		if(event.data.sequence_start.tag) {
+		    tag = rb_str_new2((const char *)event.data.sequence_start.tag);
+		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+		}
+
+		implicit =
+		    event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
+
+		style = INT2NUM((long)event.data.sequence_start.style);
+
+		args[0] = handler;
+		args[1] = anchor;
+		args[2] = tag;
+		args[3] = implicit;
+		args[4] = style;
+
+		rb_protect(protected_start_sequence, (VALUE)args, &state);
+	    }
+	    break;
+	  case YAML_SEQUENCE_END_EVENT:
+	    rb_protect(protected_end_sequence, handler, &state);
+	    break;
+	  case YAML_MAPPING_START_EVENT:
+	    {
+		VALUE args[5];
+		VALUE anchor = Qnil;
+		VALUE tag = Qnil;
+		VALUE implicit, style;
+		if(event.data.mapping_start.anchor) {
+		    anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
+		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+		}
+
+		if(event.data.mapping_start.tag) {
+		    tag = rb_str_new2((const char *)event.data.mapping_start.tag);
+		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+		}
+
+		implicit =
+		    event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
+
+		style = INT2NUM((long)event.data.mapping_start.style);
+
+		args[0] = handler;
+		args[1] = anchor;
+		args[2] = tag;
+		args[3] = implicit;
+		args[4] = style;
+
+		rb_protect(protected_start_mapping, (VALUE)args, &state);
+	    }
+	    break;
+	  case YAML_MAPPING_END_EVENT:
+	    rb_protect(protected_end_mapping, handler, &state);
+	    break;
+	  case YAML_NO_EVENT:
+	    rb_protect(protected_empty, handler, &state);
+	    break;
+	  case YAML_STREAM_END_EVENT:
+	    rb_protect(protected_end_stream, handler, &state);
+	    done = 1;
+	    break;
+	}
+	yaml_event_delete(&event);
+	if (state) rb_jump_tag(state);
+    }
+
+    return self;
+}
+
+/*
+ * call-seq:
+ *    parser.mark # => #<Psych::Parser::Mark>
+ *
+ * Returns a Psych::Parser::Mark object that contains line, column, and index
+ * information.
+ */
+static VALUE mark(VALUE self)
+{
+    VALUE mark_klass;
+    VALUE args[3];
+    yaml_parser_t * parser;
+
+    TypedData_Get_Struct(self, yaml_parser_t, &psych_parser_type, parser);
+    mark_klass = rb_const_get_at(cPsychParser, rb_intern("Mark"));
+    args[0] = INT2NUM(parser->mark.index);
+    args[1] = INT2NUM(parser->mark.line);
+    args[2] = INT2NUM(parser->mark.column);
+
+    return rb_class_new_instance(3, args, mark_klass);
+}
+
+void Init_psych_parser(void)
+{
+#undef rb_intern
+#if 0
+    mPsych = rb_define_module("Psych");
+#endif
+
+    cPsychParser = rb_define_class_under(mPsych, "Parser", rb_cObject);
+    rb_define_alloc_func(cPsychParser, allocate);
+
+    /* Any encoding: Let the parser choose the encoding */
+    rb_define_const(cPsychParser, "ANY", INT2NUM(YAML_ANY_ENCODING));
+
+    /* UTF-8 Encoding */
+    rb_define_const(cPsychParser, "UTF8", INT2NUM(YAML_UTF8_ENCODING));
+
+    /* UTF-16-LE Encoding with BOM */
+    rb_define_const(cPsychParser, "UTF16LE", INT2NUM(YAML_UTF16LE_ENCODING));
+
+    /* UTF-16-BE Encoding with BOM */
+    rb_define_const(cPsychParser, "UTF16BE", INT2NUM(YAML_UTF16BE_ENCODING));
+
+    rb_require("psych/syntax_error");
+
+    rb_define_method(cPsychParser, "parse", parse, -1);
+    rb_define_method(cPsychParser, "mark", mark, 0);
+
+    id_read            = rb_intern("read");
+    id_path            = rb_intern("path");
+    id_empty           = rb_intern("empty");
+    id_start_stream    = rb_intern("start_stream");
+    id_end_stream      = rb_intern("end_stream");
+    id_start_document  = rb_intern("start_document");
+    id_end_document    = rb_intern("end_document");
+    id_alias           = rb_intern("alias");
+    id_scalar          = rb_intern("scalar");
+    id_start_sequence  = rb_intern("start_sequence");
+    id_end_sequence    = rb_intern("end_sequence");
+    id_start_mapping   = rb_intern("start_mapping");
+    id_end_mapping     = rb_intern("end_mapping");
+    id_event_location  = rb_intern("event_location");
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych_parser.h b/ext/psych/psych_parser.h
new file mode 100644
index 0000000000..beb3dd0709
--- /dev/null
+++ b/ext/psych/psych_parser.h
@@ -0,0 +1,6 @@
+#ifndef PSYCH_PARSER_H
+#define PSYCH_PARSER_H
+
+void Init_psych_parser(void);
+
+#endif
diff --git a/ext/psych/psych_to_ruby.c b/ext/psych/psych_to_ruby.c
new file mode 100644
index 0000000000..b388ff7754
--- /dev/null
+++ b/ext/psych/psych_to_ruby.c
@@ -0,0 +1,39 @@
+#include <psych.h>
+
+VALUE cPsychVisitorsToRuby;
+
+/* call-seq: vis.build_exception(klass, message)
+ *
+ * Create an exception with class +klass+ and +message+
+ */
+static VALUE build_exception(VALUE self, VALUE klass, VALUE mesg)
+{
+    VALUE e = rb_obj_alloc(klass);
+
+    rb_iv_set(e, "mesg", mesg);
+
+    return e;
+}
+
+/* call-seq: vis.path2class(path)
+ *
+ * Convert +path+ string to a class
+ */
+static VALUE path2class(VALUE self, VALUE path)
+{
+    return rb_path_to_class(path);
+}
+
+void Init_psych_to_ruby(void)
+{
+    VALUE psych     = rb_define_module("Psych");
+    VALUE class_loader  = rb_define_class_under(psych, "ClassLoader", rb_cObject);
+
+    VALUE visitors  = rb_define_module_under(psych, "Visitors");
+    VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
+    cPsychVisitorsToRuby = rb_define_class_under(visitors, "ToRuby", visitor);
+
+    rb_define_private_method(cPsychVisitorsToRuby, "build_exception", build_exception, 2);
+    rb_define_private_method(class_loader, "path2class", path2class, 1);
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/to_ruby.h b/ext/psych/psych_to_ruby.h
index 7b8e757a45..7b8e757a45 100644
--- a/ext/psych/to_ruby.h
+++ b/ext/psych/psych_to_ruby.h
diff --git a/ext/psych/psych_yaml_tree.c b/ext/psych/psych_yaml_tree.c
new file mode 100644
index 0000000000..7aca9114c9
--- /dev/null
+++ b/ext/psych/psych_yaml_tree.c
@@ -0,0 +1,24 @@
+#include <psych.h>
+
+VALUE cPsychVisitorsYamlTree;
+
+/*
+ * call-seq: private_iv_get(target, prop)
+ *
+ * Get the private instance variable +prop+ from +target+
+ */
+static VALUE private_iv_get(VALUE self, VALUE target, VALUE prop)
+{
+    return rb_attr_get(target, rb_intern(StringValueCStr(prop)));
+}
+
+void Init_psych_yaml_tree(void)
+{
+    VALUE psych     = rb_define_module("Psych");
+    VALUE visitors  = rb_define_module_under(psych, "Visitors");
+    VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
+    cPsychVisitorsYamlTree = rb_define_class_under(visitors, "YAMLTree", visitor);
+
+    rb_define_private_method(cPsychVisitorsYamlTree, "private_iv_get", private_iv_get, 2);
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/yaml_tree.h b/ext/psych/psych_yaml_tree.h
index 4628a69d71..4628a69d71 100644
--- a/ext/psych/yaml_tree.h
+++ b/ext/psych/psych_yaml_tree.h
diff --git a/ext/psych/to_ruby.c b/ext/psych/to_ruby.c
deleted file mode 100644
index ed5245e12e..0000000000
--- a/ext/psych/to_ruby.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <psych.h>
-
-VALUE cPsychVisitorsToRuby;
-
-/* call-seq: vis.build_exception(klass, message)
- *
- * Create an exception with class +klass+ and +message+
- */
-static VALUE build_exception(VALUE self, VALUE klass, VALUE mesg)
-{
-    VALUE e = rb_obj_alloc(klass);
-
-    rb_iv_set(e, "mesg", mesg);
-
-    return e;
-}
-
-/* call-seq: vis.path2class(path)
- *
- * Convert +path+ string to a class
- */
-static VALUE path2class(VALUE self, VALUE path)
-{
-#ifdef HAVE_RUBY_ENCODING_H
-    return rb_path_to_class(path);
-#else
-    return rb_path2class(StringValuePtr(path));
-#endif
-}
-
-void Init_psych_to_ruby(void)
-{
-    VALUE psych     = rb_define_module("Psych");
-    VALUE visitors  = rb_define_module_under(psych, "Visitors");
-    VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
-    cPsychVisitorsToRuby = rb_define_class_under(visitors, "ToRuby", visitor);
-
-    rb_define_private_method(cPsychVisitorsToRuby, "build_exception", build_exception, 2);
-    rb_define_private_method(cPsychVisitorsToRuby, "path2class", path2class, 1);
-}
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/yaml/api.c b/ext/psych/yaml/api.c
new file mode 100644
index 0000000000..95dc6b4de3
--- /dev/null
+++ b/ext/psych/yaml/api.c
@@ -0,0 +1,1395 @@
+
+#include "yaml_private.h"
+
+/*
+ * Get the library version.
+ */
+
+YAML_DECLARE(const char *)
+yaml_get_version_string(void)
+{
+    return YAML_VERSION_STRING;
+}
+
+/*
+ * Get the library version numbers.
+ */
+
+YAML_DECLARE(void)
+yaml_get_version(int *major, int *minor, int *patch)
+{
+    *major = YAML_VERSION_MAJOR;
+    *minor = YAML_VERSION_MINOR;
+    *patch = YAML_VERSION_PATCH;
+}
+
+/*
+ * Allocate a dynamic memory block.
+ */
+
+YAML_DECLARE(void *)
+yaml_malloc(size_t size)
+{
+    return malloc(size ? size : 1);
+}
+
+/*
+ * Reallocate a dynamic memory block.
+ */
+
+YAML_DECLARE(void *)
+yaml_realloc(void *ptr, size_t size)
+{
+    return ptr ? realloc(ptr, size ? size : 1) : malloc(size ? size : 1);
+}
+
+/*
+ * Free a dynamic memory block.
+ */
+
+YAML_DECLARE(void)
+yaml_free(void *ptr)
+{
+    if (ptr) free(ptr);
+}
+
+/*
+ * Duplicate a string.
+ */
+
+YAML_DECLARE(yaml_char_t *)
+yaml_strdup(const yaml_char_t *str)
+{
+    if (!str)
+        return NULL;
+
+    return (yaml_char_t *)strdup((char *)str);
+}
+
+/*
+ * Extend a string.
+ */
+
+YAML_DECLARE(int)
+yaml_string_extend(yaml_char_t **start,
+        yaml_char_t **pointer, yaml_char_t **end)
+{
+    yaml_char_t *new_start = (yaml_char_t *)yaml_realloc((void*)*start, (*end - *start)*2);
+
+    if (!new_start) return 0;
+
+    memset(new_start + (*end - *start), 0, *end - *start);
+
+    *pointer = new_start + (*pointer - *start);
+    *end = new_start + (*end - *start)*2;
+    *start = new_start;
+
+    return 1;
+}
+
+/*
+ * Append a string B to a string A.
+ */
+
+YAML_DECLARE(int)
+yaml_string_join(
+        yaml_char_t **a_start, yaml_char_t **a_pointer, yaml_char_t **a_end,
+        yaml_char_t **b_start, yaml_char_t **b_pointer, SHIM(yaml_char_t **b_end))
+{
+    UNUSED_PARAM(b_end)
+    if (*b_start == *b_pointer)
+        return 1;
+
+    while (*a_end - *a_pointer <= *b_pointer - *b_start) {
+        if (!yaml_string_extend(a_start, a_pointer, a_end))
+            return 0;
+    }
+
+    memcpy(*a_pointer, *b_start, *b_pointer - *b_start);
+    *a_pointer += *b_pointer - *b_start;
+
+    return 1;
+}
+
+/*
+ * Extend a stack.
+ */
+
+YAML_DECLARE(int)
+yaml_stack_extend(void **start, void **top, void **end)
+{
+    void *new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
+
+    if (!new_start) return 0;
+
+    *top = (char *)new_start + ((char *)*top - (char *)*start);
+    *end = (char *)new_start + ((char *)*end - (char *)*start)*2;
+    *start = new_start;
+
+    return 1;
+}
+
+/*
+ * Extend or move a queue.
+ */
+
+YAML_DECLARE(int)
+yaml_queue_extend(void **start, void **head, void **tail, void **end)
+{
+    /* Check if we need to resize the queue. */
+
+    if (*start == *head && *tail == *end) {
+        void *new_start = yaml_realloc(*start,
+                ((char *)*end - (char *)*start)*2);
+
+        if (!new_start) return 0;
+
+        *head = (char *)new_start + ((char *)*head - (char *)*start);
+        *tail = (char *)new_start + ((char *)*tail - (char *)*start);
+        *end = (char *)new_start + ((char *)*end - (char *)*start)*2;
+        *start = new_start;
+    }
+
+    /* Check if we need to move the queue at the beginning of the buffer. */
+
+    if (*tail == *end) {
+        if (*head != *tail) {
+            memmove(*start, *head, (char *)*tail - (char *)*head);
+        }
+        *tail = (char *)*tail - (char *)*head + (char *)*start;
+        *head = *start;
+    }
+
+    return 1;
+}
+
+
+/*
+ * Create a new parser object.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_initialize(yaml_parser_t *parser)
+{
+    assert(parser);     /* Non-NULL parser object expected. */
+
+    memset(parser, 0, sizeof(yaml_parser_t));
+    if (!BUFFER_INIT(parser, parser->raw_buffer, INPUT_RAW_BUFFER_SIZE))
+        goto error;
+    if (!BUFFER_INIT(parser, parser->buffer, INPUT_BUFFER_SIZE))
+        goto error;
+    if (!QUEUE_INIT(parser, parser->tokens, INITIAL_QUEUE_SIZE, yaml_token_t*))
+        goto error;
+    if (!STACK_INIT(parser, parser->indents, int*))
+        goto error;
+    if (!STACK_INIT(parser, parser->simple_keys, yaml_simple_key_t*))
+        goto error;
+    if (!STACK_INIT(parser, parser->states, yaml_parser_state_t*))
+        goto error;
+    if (!STACK_INIT(parser, parser->marks, yaml_mark_t*))
+        goto error;
+    if (!STACK_INIT(parser, parser->tag_directives, yaml_tag_directive_t*))
+        goto error;
+
+    return 1;
+
+error:
+
+    BUFFER_DEL(parser, parser->raw_buffer);
+    BUFFER_DEL(parser, parser->buffer);
+    QUEUE_DEL(parser, parser->tokens);
+    STACK_DEL(parser, parser->indents);
+    STACK_DEL(parser, parser->simple_keys);
+    STACK_DEL(parser, parser->states);
+    STACK_DEL(parser, parser->marks);
+    STACK_DEL(parser, parser->tag_directives);
+
+    return 0;
+}
+
+/*
+ * Destroy a parser object.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_delete(yaml_parser_t *parser)
+{
+    assert(parser); /* Non-NULL parser object expected. */
+
+    BUFFER_DEL(parser, parser->raw_buffer);
+    BUFFER_DEL(parser, parser->buffer);
+    while (!QUEUE_EMPTY(parser, parser->tokens)) {
+        yaml_token_delete(&DEQUEUE(parser, parser->tokens));
+    }
+    QUEUE_DEL(parser, parser->tokens);
+    STACK_DEL(parser, parser->indents);
+    STACK_DEL(parser, parser->simple_keys);
+    STACK_DEL(parser, parser->states);
+    STACK_DEL(parser, parser->marks);
+    while (!STACK_EMPTY(parser, parser->tag_directives)) {
+        yaml_tag_directive_t tag_directive = POP(parser, parser->tag_directives);
+        yaml_free(tag_directive.handle);
+        yaml_free(tag_directive.prefix);
+    }
+    STACK_DEL(parser, parser->tag_directives);
+
+    memset(parser, 0, sizeof(yaml_parser_t));
+}
+
+/*
+ * String read handler.
+ */
+
+static int
+yaml_string_read_handler(void *data, unsigned char *buffer, size_t size,
+        size_t *size_read)
+{
+    yaml_parser_t *parser = (yaml_parser_t *)data;
+
+    if (parser->input.string.current == parser->input.string.end) {
+        *size_read = 0;
+        return 1;
+    }
+
+    if (size > (size_t)(parser->input.string.end
+                - parser->input.string.current)) {
+        size = parser->input.string.end - parser->input.string.current;
+    }
+
+    memcpy(buffer, parser->input.string.current, size);
+    parser->input.string.current += size;
+    *size_read = size;
+    return 1;
+}
+
+/*
+ * File read handler.
+ */
+
+static int
+yaml_file_read_handler(void *data, unsigned char *buffer, size_t size,
+        size_t *size_read)
+{
+    yaml_parser_t *parser = (yaml_parser_t *)data;
+
+    *size_read = fread(buffer, 1, size, parser->input.file);
+    return !ferror(parser->input.file);
+}
+
+/*
+ * Set a string input.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_set_input_string(yaml_parser_t *parser,
+        const unsigned char *input, size_t size)
+{
+    assert(parser); /* Non-NULL parser object expected. */
+    assert(!parser->read_handler);  /* You can set the source only once. */
+    assert(input);  /* Non-NULL input string expected. */
+
+    parser->read_handler = yaml_string_read_handler;
+    parser->read_handler_data = parser;
+
+    parser->input.string.start = input;
+    parser->input.string.current = input;
+    parser->input.string.end = input+size;
+}
+
+/*
+ * Set a file input.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_set_input_file(yaml_parser_t *parser, FILE *file)
+{
+    assert(parser); /* Non-NULL parser object expected. */
+    assert(!parser->read_handler);  /* You can set the source only once. */
+    assert(file);   /* Non-NULL file object expected. */
+
+    parser->read_handler = yaml_file_read_handler;
+    parser->read_handler_data = parser;
+
+    parser->input.file = file;
+}
+
+/*
+ * Set a generic input.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_set_input(yaml_parser_t *parser,
+        yaml_read_handler_t *handler, void *data)
+{
+    assert(parser); /* Non-NULL parser object expected. */
+    assert(!parser->read_handler);  /* You can set the source only once. */
+    assert(handler);    /* Non-NULL read handler expected. */
+
+    parser->read_handler = handler;
+    parser->read_handler_data = data;
+}
+
+/*
+ * Set the source encoding.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_set_encoding(yaml_parser_t *parser, yaml_encoding_t encoding)
+{
+    assert(parser); /* Non-NULL parser object expected. */
+    assert(!parser->encoding); /* Encoding is already set or detected. */
+
+    parser->encoding = encoding;
+}
+
+/*
+ * Create a new emitter object.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_initialize(yaml_emitter_t *emitter)
+{
+    assert(emitter);    /* Non-NULL emitter object expected. */
+
+    memset(emitter, 0, sizeof(yaml_emitter_t));
+    if (!BUFFER_INIT(emitter, emitter->buffer, OUTPUT_BUFFER_SIZE))
+        goto error;
+    if (!BUFFER_INIT(emitter, emitter->raw_buffer, OUTPUT_RAW_BUFFER_SIZE))
+        goto error;
+    if (!STACK_INIT(emitter, emitter->states, yaml_emitter_state_t*))
+        goto error;
+    if (!QUEUE_INIT(emitter, emitter->events, INITIAL_QUEUE_SIZE, yaml_event_t*))
+        goto error;
+    if (!STACK_INIT(emitter, emitter->indents, int*))
+        goto error;
+    if (!STACK_INIT(emitter, emitter->tag_directives, yaml_tag_directive_t*))
+        goto error;
+
+    return 1;
+
+error:
+
+    BUFFER_DEL(emitter, emitter->buffer);
+    BUFFER_DEL(emitter, emitter->raw_buffer);
+    STACK_DEL(emitter, emitter->states);
+    QUEUE_DEL(emitter, emitter->events);
+    STACK_DEL(emitter, emitter->indents);
+    STACK_DEL(emitter, emitter->tag_directives);
+
+    return 0;
+}
+
+/*
+ * Destroy an emitter object.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_delete(yaml_emitter_t *emitter)
+{
+    assert(emitter);    /* Non-NULL emitter object expected. */
+
+    BUFFER_DEL(emitter, emitter->buffer);
+    BUFFER_DEL(emitter, emitter->raw_buffer);
+    STACK_DEL(emitter, emitter->states);
+    while (!QUEUE_EMPTY(emitter, emitter->events)) {
+        yaml_event_delete(&DEQUEUE(emitter, emitter->events));
+    }
+    QUEUE_DEL(emitter, emitter->events);
+    STACK_DEL(emitter, emitter->indents);
+    while (!STACK_EMPTY(empty, emitter->tag_directives)) {
+        yaml_tag_directive_t tag_directive = POP(emitter, emitter->tag_directives);
+        yaml_free(tag_directive.handle);
+        yaml_free(tag_directive.prefix);
+    }
+    STACK_DEL(emitter, emitter->tag_directives);
+    yaml_free(emitter->anchors);
+
+    memset(emitter, 0, sizeof(yaml_emitter_t));
+}
+
+/*
+ * String write handler.
+ */
+
+static int
+yaml_string_write_handler(void *data, unsigned char *buffer, size_t size)
+{
+  yaml_emitter_t *emitter = (yaml_emitter_t *)data;
+
+    if (emitter->output.string.size - *emitter->output.string.size_written
+            < size) {
+        memcpy(emitter->output.string.buffer
+                + *emitter->output.string.size_written,
+                buffer,
+                emitter->output.string.size
+                - *emitter->output.string.size_written);
+        *emitter->output.string.size_written = emitter->output.string.size;
+        return 0;
+    }
+
+    memcpy(emitter->output.string.buffer
+            + *emitter->output.string.size_written, buffer, size);
+    *emitter->output.string.size_written += size;
+    return 1;
+}
+
+/*
+ * File write handler.
+ */
+
+static int
+yaml_file_write_handler(void *data, unsigned char *buffer, size_t size)
+{
+    yaml_emitter_t *emitter = (yaml_emitter_t *)data;
+
+    return (fwrite(buffer, 1, size, emitter->output.file) == size);
+}
+/*
+ * Set a string output.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_output_string(yaml_emitter_t *emitter,
+        unsigned char *output, size_t size, size_t *size_written)
+{
+    assert(emitter);    /* Non-NULL emitter object expected. */
+    assert(!emitter->write_handler);    /* You can set the output only once. */
+    assert(output);     /* Non-NULL output string expected. */
+
+    emitter->write_handler = yaml_string_write_handler;
+    emitter->write_handler_data = emitter;
+
+    emitter->output.string.buffer = output;
+    emitter->output.string.size = size;
+    emitter->output.string.size_written = size_written;
+    *size_written = 0;
+}
+
+/*
+ * Set a file output.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_output_file(yaml_emitter_t *emitter, FILE *file)
+{
+    assert(emitter);    /* Non-NULL emitter object expected. */
+    assert(!emitter->write_handler);    /* You can set the output only once. */
+    assert(file);       /* Non-NULL file object expected. */
+
+    emitter->write_handler = yaml_file_write_handler;
+    emitter->write_handler_data = emitter;
+
+    emitter->output.file = file;
+}
+
+/*
+ * Set a generic output handler.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_output(yaml_emitter_t *emitter,
+        yaml_write_handler_t *handler, void *data)
+{
+    assert(emitter);    /* Non-NULL emitter object expected. */
+    assert(!emitter->write_handler);    /* You can set the output only once. */
+    assert(handler);    /* Non-NULL handler object expected. */
+
+    emitter->write_handler = handler;
+    emitter->write_handler_data = data;
+}
+
+/*
+ * Set the output encoding.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_encoding(yaml_emitter_t *emitter, yaml_encoding_t encoding)
+{
+    assert(emitter);    /* Non-NULL emitter object expected. */
+    assert(!emitter->encoding);     /* You can set encoding only once. */
+
+    emitter->encoding = encoding;
+}
+
+/*
+ * Set the canonical output style.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_canonical(yaml_emitter_t *emitter, int canonical)
+{
+    assert(emitter);    /* Non-NULL emitter object expected. */
+
+    emitter->canonical = (canonical != 0);
+}
+
+/*
+ * Set the indentation increment.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_indent(yaml_emitter_t *emitter, int indent)
+{
+    assert(emitter);    /* Non-NULL emitter object expected. */
+
+    emitter->best_indent = (1 < indent && indent < 10) ? indent : 2;
+}
+
+/*
+ * Set the preferred line width.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_width(yaml_emitter_t *emitter, int width)
+{
+    assert(emitter);    /* Non-NULL emitter object expected. */
+
+    emitter->best_width = (width >= 0) ? width : -1;
+}
+
+/*
+ * Set if unescaped non-ASCII characters are allowed.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_unicode(yaml_emitter_t *emitter, int unicode)
+{
+    assert(emitter);    /* Non-NULL emitter object expected. */
+
+    emitter->unicode = (unicode != 0);
+}
+
+/*
+ * Set the preferred line break character.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_break(yaml_emitter_t *emitter, yaml_break_t line_break)
+{
+    assert(emitter);    /* Non-NULL emitter object expected. */
+
+    emitter->line_break = line_break;
+}
+
+/*
+ * Destroy a token object.
+ */
+
+YAML_DECLARE(void)
+yaml_token_delete(yaml_token_t *token)
+{
+    assert(token);  /* Non-NULL token object expected. */
+
+    switch (token->type)
+    {
+        case YAML_TAG_DIRECTIVE_TOKEN:
+            yaml_free(token->data.tag_directive.handle);
+            yaml_free(token->data.tag_directive.prefix);
+            break;
+
+        case YAML_ALIAS_TOKEN:
+            yaml_free(token->data.alias.value);
+            break;
+
+        case YAML_ANCHOR_TOKEN:
+            yaml_free(token->data.anchor.value);
+            break;
+
+        case YAML_TAG_TOKEN:
+            yaml_free(token->data.tag.handle);
+            yaml_free(token->data.tag.suffix);
+            break;
+
+        case YAML_SCALAR_TOKEN:
+            yaml_free(token->data.scalar.value);
+            break;
+
+        default:
+            break;
+    }
+
+    memset(token, 0, sizeof(yaml_token_t));
+}
+
+/*
+ * Check if a string is a valid UTF-8 sequence.
+ *
+ * Check 'reader.c' for more details on UTF-8 encoding.
+ */
+
+static int
+yaml_check_utf8(yaml_char_t *start, size_t length)
+{
+    yaml_char_t *end = start+length;
+    yaml_char_t *pointer = start;
+
+    while (pointer < end) {
+        unsigned char octet;
+        unsigned int width;
+        unsigned int value;
+        size_t k;
+
+        octet = pointer[0];
+        width = (octet & 0x80) == 0x00 ? 1 :
+                (octet & 0xE0) == 0xC0 ? 2 :
+                (octet & 0xF0) == 0xE0 ? 3 :
+                (octet & 0xF8) == 0xF0 ? 4 : 0;
+        value = (octet & 0x80) == 0x00 ? octet & 0x7F :
+                (octet & 0xE0) == 0xC0 ? octet & 0x1F :
+                (octet & 0xF0) == 0xE0 ? octet & 0x0F :
+                (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
+        if (!width) return 0;
+        if (pointer+width > end) return 0;
+        for (k = 1; k < width; k ++) {
+            octet = pointer[k];
+            if ((octet & 0xC0) != 0x80) return 0;
+            value = (value << 6) + (octet & 0x3F);
+        }
+        if (!((width == 1) ||
+            (width == 2 && value >= 0x80) ||
+            (width == 3 && value >= 0x800) ||
+            (width == 4 && value >= 0x10000))) return 0;
+
+        pointer += width;
+    }
+
+    return 1;
+}
+
+/*
+ * Create STREAM-START.
+ */
+
+YAML_DECLARE(int)
+yaml_stream_start_event_initialize(yaml_event_t *event,
+        yaml_encoding_t encoding)
+{
+    yaml_mark_t mark = { 0, 0, 0 };
+
+    assert(event);  /* Non-NULL event object is expected. */
+
+    STREAM_START_EVENT_INIT(*event, encoding, mark, mark);
+
+    return 1;
+}
+
+/*
+ * Create STREAM-END.
+ */
+
+YAML_DECLARE(int)
+yaml_stream_end_event_initialize(yaml_event_t *event)
+{
+    yaml_mark_t mark = { 0, 0, 0 };
+
+    assert(event);  /* Non-NULL event object is expected. */
+
+    STREAM_END_EVENT_INIT(*event, mark, mark);
+
+    return 1;
+}
+
+/*
+ * Create DOCUMENT-START.
+ */
+
+YAML_DECLARE(int)
+yaml_document_start_event_initialize(yaml_event_t *event,
+        yaml_version_directive_t *version_directive,
+        yaml_tag_directive_t *tag_directives_start,
+        yaml_tag_directive_t *tag_directives_end,
+        int implicit)
+{
+    struct {
+        yaml_error_type_t error;
+    } context;
+    yaml_mark_t mark = { 0, 0, 0 };
+    yaml_version_directive_t *version_directive_copy = NULL;
+    struct {
+        yaml_tag_directive_t *start;
+        yaml_tag_directive_t *end;
+        yaml_tag_directive_t *top;
+    } tag_directives_copy = { NULL, NULL, NULL };
+    yaml_tag_directive_t value = { NULL, NULL };
+
+    assert(event);          /* Non-NULL event object is expected. */
+    assert((tag_directives_start && tag_directives_end) ||
+            (tag_directives_start == tag_directives_end));
+                            /* Valid tag directives are expected. */
+
+    if (version_directive) {
+        version_directive_copy = YAML_MALLOC_STATIC(yaml_version_directive_t);
+        if (!version_directive_copy) goto error;
+        version_directive_copy->major = version_directive->major;
+        version_directive_copy->minor = version_directive->minor;
+    }
+
+    if (tag_directives_start != tag_directives_end) {
+        yaml_tag_directive_t *tag_directive;
+        if (!STACK_INIT(&context, tag_directives_copy, yaml_tag_directive_t*))
+            goto error;
+        for (tag_directive = tag_directives_start;
+                tag_directive != tag_directives_end; tag_directive ++) {
+            assert(tag_directive->handle);
+            assert(tag_directive->prefix);
+            if (!yaml_check_utf8(tag_directive->handle,
+                        strlen((char *)tag_directive->handle)))
+                goto error;
+            if (!yaml_check_utf8(tag_directive->prefix,
+                        strlen((char *)tag_directive->prefix)))
+                goto error;
+            value.handle = yaml_strdup(tag_directive->handle);
+            value.prefix = yaml_strdup(tag_directive->prefix);
+            if (!value.handle || !value.prefix) goto error;
+            if (!PUSH(&context, tag_directives_copy, value))
+                goto error;
+            value.handle = NULL;
+            value.prefix = NULL;
+        }
+    }
+
+    DOCUMENT_START_EVENT_INIT(*event, version_directive_copy,
+            tag_directives_copy.start, tag_directives_copy.top,
+            implicit, mark, mark);
+
+    return 1;
+
+error:
+    yaml_free(version_directive_copy);
+    while (!STACK_EMPTY(context, tag_directives_copy)) {
+        yaml_tag_directive_t value = POP(context, tag_directives_copy);
+        yaml_free(value.handle);
+        yaml_free(value.prefix);
+    }
+    STACK_DEL(context, tag_directives_copy);
+    yaml_free(value.handle);
+    yaml_free(value.prefix);
+
+    return 0;
+}
+
+/*
+ * Create DOCUMENT-END.
+ */
+
+YAML_DECLARE(int)
+yaml_document_end_event_initialize(yaml_event_t *event, int implicit)
+{
+    yaml_mark_t mark = { 0, 0, 0 };
+
+    assert(event);      /* Non-NULL emitter object is expected. */
+
+    DOCUMENT_END_EVENT_INIT(*event, implicit, mark, mark);
+
+    return 1;
+}
+
+/*
+ * Create ALIAS.
+ */
+
+YAML_DECLARE(int)
+yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor)
+{
+    yaml_mark_t mark = { 0, 0, 0 };
+    yaml_char_t *anchor_copy = NULL;
+
+    assert(event);      /* Non-NULL event object is expected. */
+    assert(anchor);     /* Non-NULL anchor is expected. */
+
+    if (!yaml_check_utf8(anchor, strlen((char *)anchor))) return 0;
+
+    anchor_copy = yaml_strdup(anchor);
+    if (!anchor_copy)
+        return 0;
+
+    ALIAS_EVENT_INIT(*event, anchor_copy, mark, mark);
+
+    return 1;
+}
+
+/*
+ * Create SCALAR.
+ */
+
+YAML_DECLARE(int)
+yaml_scalar_event_initialize(yaml_event_t *event,
+        yaml_char_t *anchor, yaml_char_t *tag,
+        yaml_char_t *value, int length,
+        int plain_implicit, int quoted_implicit,
+        yaml_scalar_style_t style)
+{
+    yaml_mark_t mark = { 0, 0, 0 };
+    yaml_char_t *anchor_copy = NULL;
+    yaml_char_t *tag_copy = NULL;
+    yaml_char_t *value_copy = NULL;
+
+    assert(event);      /* Non-NULL event object is expected. */
+    assert(value);      /* Non-NULL anchor is expected. */
+
+    if (anchor) {
+        if (!yaml_check_utf8(anchor, strlen((char *)anchor))) goto error;
+        anchor_copy = yaml_strdup(anchor);
+        if (!anchor_copy) goto error;
+    }
+
+    if (tag) {
+        if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error;
+        tag_copy = yaml_strdup(tag);
+        if (!tag_copy) goto error;
+    }
+
+    if (length < 0) {
+        length = (int)strlen((char *)value);
+    }
+
+    if (!yaml_check_utf8(value, length)) goto error;
+    value_copy = YAML_MALLOC(length+1);
+    if (!value_copy) goto error;
+    memcpy(value_copy, value, length);
+    value_copy[length] = '\0';
+
+    SCALAR_EVENT_INIT(*event, anchor_copy, tag_copy, value_copy, length,
+            plain_implicit, quoted_implicit, style, mark, mark);
+
+    return 1;
+
+error:
+    yaml_free(anchor_copy);
+    yaml_free(tag_copy);
+    yaml_free(value_copy);
+
+    return 0;
+}
+
+/*
+ * Create SEQUENCE-START.
+ */
+
+YAML_DECLARE(int)
+yaml_sequence_start_event_initialize(yaml_event_t *event,
+        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        yaml_sequence_style_t style)
+{
+    yaml_mark_t mark = { 0, 0, 0 };
+    yaml_char_t *anchor_copy = NULL;
+    yaml_char_t *tag_copy = NULL;
+
+    assert(event);      /* Non-NULL event object is expected. */
+
+    if (anchor) {
+        if (!yaml_check_utf8(anchor, strlen((char *)anchor))) goto error;
+        anchor_copy = yaml_strdup(anchor);
+        if (!anchor_copy) goto error;
+    }
+
+    if (tag) {
+        if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error;
+        tag_copy = yaml_strdup(tag);
+        if (!tag_copy) goto error;
+    }
+
+    SEQUENCE_START_EVENT_INIT(*event, anchor_copy, tag_copy,
+            implicit, style, mark, mark);
+
+    return 1;
+
+error:
+    yaml_free(anchor_copy);
+    yaml_free(tag_copy);
+
+    return 0;
+}
+
+/*
+ * Create SEQUENCE-END.
+ */
+
+YAML_DECLARE(int)
+yaml_sequence_end_event_initialize(yaml_event_t *event)
+{
+    yaml_mark_t mark = { 0, 0, 0 };
+
+    assert(event);      /* Non-NULL event object is expected. */
+
+    SEQUENCE_END_EVENT_INIT(*event, mark, mark);
+
+    return 1;
+}
+
+/*
+ * Create MAPPING-START.
+ */
+
+YAML_DECLARE(int)
+yaml_mapping_start_event_initialize(yaml_event_t *event,
+        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        yaml_mapping_style_t style)
+{
+    yaml_mark_t mark = { 0, 0, 0 };
+    yaml_char_t *anchor_copy = NULL;
+    yaml_char_t *tag_copy = NULL;
+
+    assert(event);      /* Non-NULL event object is expected. */
+
+    if (anchor) {
+        if (!yaml_check_utf8(anchor, strlen((char *)anchor))) goto error;
+        anchor_copy = yaml_strdup(anchor);
+        if (!anchor_copy) goto error;
+    }
+
+    if (tag) {
+        if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error;
+        tag_copy = yaml_strdup(tag);
+        if (!tag_copy) goto error;
+    }
+
+    MAPPING_START_EVENT_INIT(*event, anchor_copy, tag_copy,
+            implicit, style, mark, mark);
+
+    return 1;
+
+error:
+    yaml_free(anchor_copy);
+    yaml_free(tag_copy);
+
+    return 0;
+}
+
+/*
+ * Create MAPPING-END.
+ */
+
+YAML_DECLARE(int)
+yaml_mapping_end_event_initialize(yaml_event_t *event)
+{
+    yaml_mark_t mark = { 0, 0, 0 };
+
+    assert(event);      /* Non-NULL event object is expected. */
+
+    MAPPING_END_EVENT_INIT(*event, mark, mark);
+
+    return 1;
+}
+
+/*
+ * Destroy an event object.
+ */
+
+YAML_DECLARE(void)
+yaml_event_delete(yaml_event_t *event)
+{
+    yaml_tag_directive_t *tag_directive;
+
+    assert(event);  /* Non-NULL event object expected. */
+
+    switch (event->type)
+    {
+        case YAML_DOCUMENT_START_EVENT:
+            yaml_free(event->data.document_start.version_directive);
+            for (tag_directive = event->data.document_start.tag_directives.start;
+                    tag_directive != event->data.document_start.tag_directives.end;
+                    tag_directive++) {
+                yaml_free(tag_directive->handle);
+                yaml_free(tag_directive->prefix);
+            }
+            yaml_free(event->data.document_start.tag_directives.start);
+            break;
+
+        case YAML_ALIAS_EVENT:
+            yaml_free(event->data.alias.anchor);
+            break;
+
+        case YAML_SCALAR_EVENT:
+            yaml_free(event->data.scalar.anchor);
+            yaml_free(event->data.scalar.tag);
+            yaml_free(event->data.scalar.value);
+            break;
+
+        case YAML_SEQUENCE_START_EVENT:
+            yaml_free(event->data.sequence_start.anchor);
+            yaml_free(event->data.sequence_start.tag);
+            break;
+
+        case YAML_MAPPING_START_EVENT:
+            yaml_free(event->data.mapping_start.anchor);
+            yaml_free(event->data.mapping_start.tag);
+            break;
+
+        default:
+            break;
+    }
+
+    memset(event, 0, sizeof(yaml_event_t));
+}
+
+/*
+ * Create a document object.
+ */
+
+YAML_DECLARE(int)
+yaml_document_initialize(yaml_document_t *document,
+        yaml_version_directive_t *version_directive,
+        yaml_tag_directive_t *tag_directives_start,
+        yaml_tag_directive_t *tag_directives_end,
+        int start_implicit, int end_implicit)
+{
+    struct {
+        yaml_error_type_t error;
+    } context;
+    struct {
+        yaml_node_t *start;
+        yaml_node_t *end;
+        yaml_node_t *top;
+    } nodes = { NULL, NULL, NULL };
+    yaml_version_directive_t *version_directive_copy = NULL;
+    struct {
+        yaml_tag_directive_t *start;
+        yaml_tag_directive_t *end;
+        yaml_tag_directive_t *top;
+    } tag_directives_copy = { NULL, NULL, NULL };
+    yaml_tag_directive_t value = { NULL, NULL };
+    yaml_mark_t mark = { 0, 0, 0 };
+
+    assert(document);       /* Non-NULL document object is expected. */
+    assert((tag_directives_start && tag_directives_end) ||
+            (tag_directives_start == tag_directives_end));
+                            /* Valid tag directives are expected. */
+
+    if (!STACK_INIT(&context, nodes, yaml_node_t*)) goto error;
+
+    if (version_directive) {
+        version_directive_copy = YAML_MALLOC_STATIC(yaml_version_directive_t);
+        if (!version_directive_copy) goto error;
+        version_directive_copy->major = version_directive->major;
+        version_directive_copy->minor = version_directive->minor;
+    }
+
+    if (tag_directives_start != tag_directives_end) {
+        yaml_tag_directive_t *tag_directive;
+        if (!STACK_INIT(&context, tag_directives_copy, yaml_tag_directive_t*))
+            goto error;
+        for (tag_directive = tag_directives_start;
+                tag_directive != tag_directives_end; tag_directive ++) {
+            assert(tag_directive->handle);
+            assert(tag_directive->prefix);
+            if (!yaml_check_utf8(tag_directive->handle,
+                        strlen((char *)tag_directive->handle)))
+                goto error;
+            if (!yaml_check_utf8(tag_directive->prefix,
+                        strlen((char *)tag_directive->prefix)))
+                goto error;
+            value.handle = yaml_strdup(tag_directive->handle);
+            value.prefix = yaml_strdup(tag_directive->prefix);
+            if (!value.handle || !value.prefix) goto error;
+            if (!PUSH(&context, tag_directives_copy, value))
+                goto error;
+            value.handle = NULL;
+            value.prefix = NULL;
+        }
+    }
+
+    DOCUMENT_INIT(*document, nodes.start, nodes.end, version_directive_copy,
+            tag_directives_copy.start, tag_directives_copy.top,
+            start_implicit, end_implicit, mark, mark);
+
+    return 1;
+
+error:
+    STACK_DEL(&context, nodes);
+    yaml_free(version_directive_copy);
+    while (!STACK_EMPTY(&context, tag_directives_copy)) {
+        yaml_tag_directive_t value = POP(&context, tag_directives_copy);
+        yaml_free(value.handle);
+        yaml_free(value.prefix);
+    }
+    STACK_DEL(&context, tag_directives_copy);
+    yaml_free(value.handle);
+    yaml_free(value.prefix);
+
+    return 0;
+}
+
+/*
+ * Destroy a document object.
+ */
+
+YAML_DECLARE(void)
+yaml_document_delete(yaml_document_t *document)
+{
+    struct {
+        yaml_error_type_t error;
+    } context;
+    yaml_tag_directive_t *tag_directive;
+
+    /* Eliminate a compliler warning. */
+    context.error = YAML_NO_ERROR;
+    (void)context.error;
+
+    assert(document);   /* Non-NULL document object is expected. */
+
+    while (!STACK_EMPTY(&context, document->nodes)) {
+        yaml_node_t node = POP(&context, document->nodes);
+        yaml_free(node.tag);
+        switch (node.type) {
+            case YAML_SCALAR_NODE:
+                yaml_free(node.data.scalar.value);
+                break;
+            case YAML_SEQUENCE_NODE:
+                STACK_DEL(&context, node.data.sequence.items);
+                break;
+            case YAML_MAPPING_NODE:
+                STACK_DEL(&context, node.data.mapping.pairs);
+                break;
+            default:
+                assert(0);  /* Should not happen. */
+        }
+    }
+    STACK_DEL(&context, document->nodes);
+
+    yaml_free(document->version_directive);
+    for (tag_directive = document->tag_directives.start;
+            tag_directive != document->tag_directives.end;
+            tag_directive++) {
+        yaml_free(tag_directive->handle);
+        yaml_free(tag_directive->prefix);
+    }
+    yaml_free(document->tag_directives.start);
+
+    memset(document, 0, sizeof(yaml_document_t));
+}
+
+/**
+ * Get a document node.
+ */
+
+YAML_DECLARE(yaml_node_t *)
+yaml_document_get_node(yaml_document_t *document, int index)
+{
+    assert(document);   /* Non-NULL document object is expected. */
+
+    if (index > 0 && document->nodes.start + index <= document->nodes.top) {
+        return document->nodes.start + index - 1;
+    }
+    return NULL;
+}
+
+/**
+ * Get the root object.
+ */
+
+YAML_DECLARE(yaml_node_t *)
+yaml_document_get_root_node(yaml_document_t *document)
+{
+    assert(document);   /* Non-NULL document object is expected. */
+
+    if (document->nodes.top != document->nodes.start) {
+        return document->nodes.start;
+    }
+    return NULL;
+}
+
+/*
+ * Add a scalar node to a document.
+ */
+
+YAML_DECLARE(int)
+yaml_document_add_scalar(yaml_document_t *document,
+        yaml_char_t *tag, yaml_char_t *value, int length,
+        yaml_scalar_style_t style)
+{
+    struct {
+        yaml_error_type_t error;
+    } context;
+    yaml_mark_t mark = { 0, 0, 0 };
+    yaml_char_t *tag_copy = NULL;
+    yaml_char_t *value_copy = NULL;
+    yaml_node_t node;
+
+    assert(document);   /* Non-NULL document object is expected. */
+    assert(value);      /* Non-NULL value is expected. */
+
+    if (!tag) {
+        tag = (yaml_char_t *)YAML_DEFAULT_SCALAR_TAG;
+    }
+
+    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error;
+    tag_copy = yaml_strdup(tag);
+    if (!tag_copy) goto error;
+
+    if (length < 0) {
+        length = (int)strlen((char *)value);
+    }
+
+    if (!yaml_check_utf8(value, length)) goto error;
+    value_copy = YAML_MALLOC(length+1);
+    if (!value_copy) goto error;
+    memcpy(value_copy, value, length);
+    value_copy[length] = '\0';
+
+    SCALAR_NODE_INIT(node, tag_copy, value_copy, length, style, mark, mark);
+    if (!PUSH(&context, document->nodes, node)) goto error;
+
+    return (int)(document->nodes.top - document->nodes.start);
+
+error:
+    yaml_free(tag_copy);
+    yaml_free(value_copy);
+
+    return 0;
+}
+
+/*
+ * Add a sequence node to a document.
+ */
+
+YAML_DECLARE(int)
+yaml_document_add_sequence(yaml_document_t *document,
+        yaml_char_t *tag, yaml_sequence_style_t style)
+{
+    struct {
+        yaml_error_type_t error;
+    } context;
+    yaml_mark_t mark = { 0, 0, 0 };
+    yaml_char_t *tag_copy = NULL;
+    struct {
+        yaml_node_item_t *start;
+        yaml_node_item_t *end;
+        yaml_node_item_t *top;
+    } items = { NULL, NULL, NULL };
+    yaml_node_t node;
+
+    assert(document);   /* Non-NULL document object is expected. */
+
+    if (!tag) {
+        tag = (yaml_char_t *)YAML_DEFAULT_SEQUENCE_TAG;
+    }
+
+    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error;
+    tag_copy = yaml_strdup(tag);
+    if (!tag_copy) goto error;
+
+    if (!STACK_INIT(&context, items, yaml_node_item_t*)) goto error;
+
+    SEQUENCE_NODE_INIT(node, tag_copy, items.start, items.end,
+            style, mark, mark);
+    if (!PUSH(&context, document->nodes, node)) goto error;
+
+    return (int)(document->nodes.top - document->nodes.start);
+
+error:
+    STACK_DEL(&context, items);
+    yaml_free(tag_copy);
+
+    return 0;
+}
+
+/*
+ * Add a mapping node to a document.
+ */
+
+YAML_DECLARE(int)
+yaml_document_add_mapping(yaml_document_t *document,
+        yaml_char_t *tag, yaml_mapping_style_t style)
+{
+    struct {
+        yaml_error_type_t error;
+    } context;
+    yaml_mark_t mark = { 0, 0, 0 };
+    yaml_char_t *tag_copy = NULL;
+    struct {
+        yaml_node_pair_t *start;
+        yaml_node_pair_t *end;
+        yaml_node_pair_t *top;
+    } pairs = { NULL, NULL, NULL };
+    yaml_node_t node;
+
+    assert(document);   /* Non-NULL document object is expected. */
+
+    if (!tag) {
+        tag = (yaml_char_t *)YAML_DEFAULT_MAPPING_TAG;
+    }
+
+    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error;
+    tag_copy = yaml_strdup(tag);
+    if (!tag_copy) goto error;
+
+    if (!STACK_INIT(&context, pairs, yaml_node_pair_t*)) goto error;
+
+    MAPPING_NODE_INIT(node, tag_copy, pairs.start, pairs.end,
+            style, mark, mark);
+    if (!PUSH(&context, document->nodes, node)) goto error;
+
+    return (int)(document->nodes.top - document->nodes.start);
+
+error:
+    STACK_DEL(&context, pairs);
+    yaml_free(tag_copy);
+
+    return 0;
+}
+
+/*
+ * Append an item to a sequence node.
+ */
+
+YAML_DECLARE(int)
+yaml_document_append_sequence_item(yaml_document_t *document,
+        int sequence, int item)
+{
+    struct {
+        yaml_error_type_t error;
+    } context;
+
+    assert(document);       /* Non-NULL document is required. */
+    assert(sequence > 0
+            && document->nodes.start + sequence <= document->nodes.top);
+                            /* Valid sequence id is required. */
+    assert(document->nodes.start[sequence-1].type == YAML_SEQUENCE_NODE);
+                            /* A sequence node is required. */
+    assert(item > 0 && document->nodes.start + item <= document->nodes.top);
+                            /* Valid item id is required. */
+
+    if (!PUSH(&context,
+                document->nodes.start[sequence-1].data.sequence.items, item))
+        return 0;
+
+    return 1;
+}
+
+/*
+ * Append a pair of a key and a value to a mapping node.
+ */
+
+YAML_DECLARE(int)
+yaml_document_append_mapping_pair(yaml_document_t *document,
+        int mapping, int key, int value)
+{
+    struct {
+        yaml_error_type_t error;
+    } context;
+
+    yaml_node_pair_t pair;
+
+    assert(document);       /* Non-NULL document is required. */
+    assert(mapping > 0
+            && document->nodes.start + mapping <= document->nodes.top);
+                            /* Valid mapping id is required. */
+    assert(document->nodes.start[mapping-1].type == YAML_MAPPING_NODE);
+                            /* A mapping node is required. */
+    assert(key > 0 && document->nodes.start + key <= document->nodes.top);
+                            /* Valid key id is required. */
+    assert(value > 0 && document->nodes.start + value <= document->nodes.top);
+                            /* Valid value id is required. */
+
+    pair.key = key;
+    pair.value = value;
+
+    if (!PUSH(&context,
+                document->nodes.start[mapping-1].data.mapping.pairs, pair))
+        return 0;
+
+    return 1;
+}
+
+
diff --git a/ext/psych/yaml/config.h b/ext/psych/yaml/config.h
new file mode 100644
index 0000000000..da905133ff
--- /dev/null
+++ b/ext/psych/yaml/config.h
@@ -0,0 +1,10 @@
+#define PACKAGE_NAME "yaml"
+#define PACKAGE_TARNAME "yaml"
+#define PACKAGE_VERSION "0.2.1"
+#define PACKAGE_STRING "yaml 0.2.1"
+#define PACKAGE_BUGREPORT "https://github.com/yaml/libyaml/issues"
+#define PACKAGE_URL "https://github.com/yaml/libyaml"
+#define YAML_VERSION_MAJOR 0
+#define YAML_VERSION_MINOR 2
+#define YAML_VERSION_PATCH 1
+#define YAML_VERSION_STRING "0.2.1"
diff --git a/ext/psych/yaml/dumper.c b/ext/psych/yaml/dumper.c
new file mode 100644
index 0000000000..29fb9c0784
--- /dev/null
+++ b/ext/psych/yaml/dumper.c
@@ -0,0 +1,394 @@
+
+#include "yaml_private.h"
+
+/*
+ * API functions.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_open(yaml_emitter_t *emitter);
+
+YAML_DECLARE(int)
+yaml_emitter_close(yaml_emitter_t *emitter);
+
+YAML_DECLARE(int)
+yaml_emitter_dump(yaml_emitter_t *emitter, yaml_document_t *document);
+
+/*
+ * Clean up functions.
+ */
+
+static void
+yaml_emitter_delete_document_and_anchors(yaml_emitter_t *emitter);
+
+/*
+ * Anchor functions.
+ */
+
+static void
+yaml_emitter_anchor_node(yaml_emitter_t *emitter, int index);
+
+static yaml_char_t *
+yaml_emitter_generate_anchor(yaml_emitter_t *emitter, int anchor_id);
+
+
+/*
+ * Serialize functions.
+ */
+
+static int
+yaml_emitter_dump_node(yaml_emitter_t *emitter, int index);
+
+static int
+yaml_emitter_dump_alias(yaml_emitter_t *emitter, yaml_char_t *anchor);
+
+static int
+yaml_emitter_dump_scalar(yaml_emitter_t *emitter, yaml_node_t *node,
+        yaml_char_t *anchor);
+
+static int
+yaml_emitter_dump_sequence(yaml_emitter_t *emitter, yaml_node_t *node,
+        yaml_char_t *anchor);
+
+static int
+yaml_emitter_dump_mapping(yaml_emitter_t *emitter, yaml_node_t *node,
+        yaml_char_t *anchor);
+
+/*
+ * Issue a STREAM-START event.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_open(yaml_emitter_t *emitter)
+{
+    yaml_event_t event;
+    yaml_mark_t mark = { 0, 0, 0 };
+
+    assert(emitter);            /* Non-NULL emitter object is required. */
+    assert(!emitter->opened);   /* Emitter should not be opened yet. */
+
+    STREAM_START_EVENT_INIT(event, YAML_ANY_ENCODING, mark, mark);
+
+    if (!yaml_emitter_emit(emitter, &event)) {
+        return 0;
+    }
+
+    emitter->opened = 1;
+
+    return 1;
+}
+
+/*
+ * Issue a STREAM-END event.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_close(yaml_emitter_t *emitter)
+{
+    yaml_event_t event;
+    yaml_mark_t mark = { 0, 0, 0 };
+
+    assert(emitter);            /* Non-NULL emitter object is required. */
+    assert(emitter->opened);    /* Emitter should be opened. */
+
+    if (emitter->closed) return 1;
+
+    STREAM_END_EVENT_INIT(event, mark, mark);
+
+    if (!yaml_emitter_emit(emitter, &event)) {
+        return 0;
+    }
+
+    emitter->closed = 1;
+
+    return 1;
+}
+
+/*
+ * Dump a YAML document.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_dump(yaml_emitter_t *emitter, yaml_document_t *document)
+{
+    yaml_event_t event;
+    yaml_mark_t mark = { 0, 0, 0 };
+
+    assert(emitter);            /* Non-NULL emitter object is required. */
+    assert(document);           /* Non-NULL emitter object is expected. */
+
+    emitter->document = document;
+
+    if (!emitter->opened) {
+        if (!yaml_emitter_open(emitter)) goto error;
+    }
+
+    if (STACK_EMPTY(emitter, document->nodes)) {
+        if (!yaml_emitter_close(emitter)) goto error;
+        yaml_emitter_delete_document_and_anchors(emitter);
+        return 1;
+    }
+
+    assert(emitter->opened);    /* Emitter should be opened. */
+
+    emitter->anchors = yaml_malloc(sizeof(*(emitter->anchors))
+            * (document->nodes.top - document->nodes.start));
+    if (!emitter->anchors) goto error;
+    memset(emitter->anchors, 0, sizeof(*(emitter->anchors))
+            * (document->nodes.top - document->nodes.start));
+
+    DOCUMENT_START_EVENT_INIT(event, document->version_directive,
+            document->tag_directives.start, document->tag_directives.end,
+            document->start_implicit, mark, mark);
+    if (!yaml_emitter_emit(emitter, &event)) goto error;
+
+    yaml_emitter_anchor_node(emitter, 1);
+    if (!yaml_emitter_dump_node(emitter, 1)) goto error;
+
+    DOCUMENT_END_EVENT_INIT(event, document->end_implicit, mark, mark);
+    if (!yaml_emitter_emit(emitter, &event)) goto error;
+
+    yaml_emitter_delete_document_and_anchors(emitter);
+
+    return 1;
+
+error:
+
+    yaml_emitter_delete_document_and_anchors(emitter);
+
+    return 0;
+}
+
+/*
+ * Clean up the emitter object after a document is dumped.
+ */
+
+static void
+yaml_emitter_delete_document_and_anchors(yaml_emitter_t *emitter)
+{
+    int index;
+
+    if (!emitter->anchors) {
+        yaml_document_delete(emitter->document);
+        emitter->document = NULL;
+        return;
+    }
+
+    for (index = 0; emitter->document->nodes.start + index
+            < emitter->document->nodes.top; index ++) {
+        yaml_node_t node = emitter->document->nodes.start[index];
+        if (!emitter->anchors[index].serialized) {
+            yaml_free(node.tag);
+            if (node.type == YAML_SCALAR_NODE) {
+                yaml_free(node.data.scalar.value);
+            }
+        }
+        if (node.type == YAML_SEQUENCE_NODE) {
+            STACK_DEL(emitter, node.data.sequence.items);
+        }
+        if (node.type == YAML_MAPPING_NODE) {
+            STACK_DEL(emitter, node.data.mapping.pairs);
+        }
+    }
+
+    STACK_DEL(emitter, emitter->document->nodes);
+    yaml_free(emitter->anchors);
+
+    emitter->anchors = NULL;
+    emitter->last_anchor_id = 0;
+    emitter->document = NULL;
+}
+
+/*
+ * Check the references of a node and assign the anchor id if needed.
+ */
+
+static void
+yaml_emitter_anchor_node(yaml_emitter_t *emitter, int index)
+{
+    yaml_node_t *node = emitter->document->nodes.start + index - 1;
+    yaml_node_item_t *item;
+    yaml_node_pair_t *pair;
+
+    emitter->anchors[index-1].references ++;
+
+    if (emitter->anchors[index-1].references == 1) {
+        switch (node->type) {
+            case YAML_SEQUENCE_NODE:
+                for (item = node->data.sequence.items.start;
+                        item < node->data.sequence.items.top; item ++) {
+                    yaml_emitter_anchor_node(emitter, *item);
+                }
+                break;
+            case YAML_MAPPING_NODE:
+                for (pair = node->data.mapping.pairs.start;
+                        pair < node->data.mapping.pairs.top; pair ++) {
+                    yaml_emitter_anchor_node(emitter, pair->key);
+                    yaml_emitter_anchor_node(emitter, pair->value);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    else if (emitter->anchors[index-1].references == 2) {
+        emitter->anchors[index-1].anchor = (++ emitter->last_anchor_id);
+    }
+}
+
+/*
+ * Generate a textual representation for an anchor.
+ */
+
+#define ANCHOR_TEMPLATE         "id%03d"
+#define ANCHOR_TEMPLATE_LENGTH  16
+
+static yaml_char_t *
+yaml_emitter_generate_anchor(SHIM(yaml_emitter_t *emitter), int anchor_id)
+{
+    yaml_char_t *anchor = YAML_MALLOC(ANCHOR_TEMPLATE_LENGTH);
+
+    if (!anchor) return NULL;
+
+    sprintf((char *)anchor, ANCHOR_TEMPLATE, anchor_id);
+
+    return anchor;
+}
+
+/*
+ * Serialize a node.
+ */
+
+static int
+yaml_emitter_dump_node(yaml_emitter_t *emitter, int index)
+{
+    yaml_node_t *node = emitter->document->nodes.start + index - 1;
+    int anchor_id = emitter->anchors[index-1].anchor;
+    yaml_char_t *anchor = NULL;
+
+    if (anchor_id) {
+        anchor = yaml_emitter_generate_anchor(emitter, anchor_id);
+        if (!anchor) return 0;
+    }
+
+    if (emitter->anchors[index-1].serialized) {
+        return yaml_emitter_dump_alias(emitter, anchor);
+    }
+
+    emitter->anchors[index-1].serialized = 1;
+
+    switch (node->type) {
+        case YAML_SCALAR_NODE:
+            return yaml_emitter_dump_scalar(emitter, node, anchor);
+        case YAML_SEQUENCE_NODE:
+            return yaml_emitter_dump_sequence(emitter, node, anchor);
+        case YAML_MAPPING_NODE:
+            return yaml_emitter_dump_mapping(emitter, node, anchor);
+        default:
+            assert(0);      /* Could not happen. */
+            break;
+    }
+
+    return 0;       /* Could not happen. */
+}
+
+/*
+ * Serialize an alias.
+ */
+
+static int
+yaml_emitter_dump_alias(yaml_emitter_t *emitter, yaml_char_t *anchor)
+{
+    yaml_event_t event;
+    yaml_mark_t mark  = { 0, 0, 0 };
+
+    ALIAS_EVENT_INIT(event, anchor, mark, mark);
+
+    return yaml_emitter_emit(emitter, &event);
+}
+
+/*
+ * Serialize a scalar.
+ */
+
+static int
+yaml_emitter_dump_scalar(yaml_emitter_t *emitter, yaml_node_t *node,
+        yaml_char_t *anchor)
+{
+    yaml_event_t event;
+    yaml_mark_t mark  = { 0, 0, 0 };
+
+    int plain_implicit = (strcmp((char *)node->tag,
+                YAML_DEFAULT_SCALAR_TAG) == 0);
+    int quoted_implicit = (strcmp((char *)node->tag,
+                YAML_DEFAULT_SCALAR_TAG) == 0);
+
+    SCALAR_EVENT_INIT(event, anchor, node->tag, node->data.scalar.value,
+            node->data.scalar.length, plain_implicit, quoted_implicit,
+            node->data.scalar.style, mark, mark);
+
+    return yaml_emitter_emit(emitter, &event);
+}
+
+/*
+ * Serialize a sequence.
+ */
+
+static int
+yaml_emitter_dump_sequence(yaml_emitter_t *emitter, yaml_node_t *node,
+        yaml_char_t *anchor)
+{
+    yaml_event_t event;
+    yaml_mark_t mark  = { 0, 0, 0 };
+
+    int implicit = (strcmp((char *)node->tag, YAML_DEFAULT_SEQUENCE_TAG) == 0);
+
+    yaml_node_item_t *item;
+
+    SEQUENCE_START_EVENT_INIT(event, anchor, node->tag, implicit,
+            node->data.sequence.style, mark, mark);
+    if (!yaml_emitter_emit(emitter, &event)) return 0;
+
+    for (item = node->data.sequence.items.start;
+            item < node->data.sequence.items.top; item ++) {
+        if (!yaml_emitter_dump_node(emitter, *item)) return 0;
+    }
+
+    SEQUENCE_END_EVENT_INIT(event, mark, mark);
+    if (!yaml_emitter_emit(emitter, &event)) return 0;
+
+    return 1;
+}
+
+/*
+ * Serialize a mapping.
+ */
+
+static int
+yaml_emitter_dump_mapping(yaml_emitter_t *emitter, yaml_node_t *node,
+        yaml_char_t *anchor)
+{
+    yaml_event_t event;
+    yaml_mark_t mark  = { 0, 0, 0 };
+
+    int implicit = (strcmp((char *)node->tag, YAML_DEFAULT_MAPPING_TAG) == 0);
+
+    yaml_node_pair_t *pair;
+
+    MAPPING_START_EVENT_INIT(event, anchor, node->tag, implicit,
+            node->data.mapping.style, mark, mark);
+    if (!yaml_emitter_emit(emitter, &event)) return 0;
+
+    for (pair = node->data.mapping.pairs.start;
+            pair < node->data.mapping.pairs.top; pair ++) {
+        if (!yaml_emitter_dump_node(emitter, pair->key)) return 0;
+        if (!yaml_emitter_dump_node(emitter, pair->value)) return 0;
+    }
+
+    MAPPING_END_EVENT_INIT(event, mark, mark);
+    if (!yaml_emitter_emit(emitter, &event)) return 0;
+
+    return 1;
+}
+
diff --git a/ext/psych/yaml/emitter.c b/ext/psych/yaml/emitter.c
new file mode 100644
index 0000000000..92e21cdb73
--- /dev/null
+++ b/ext/psych/yaml/emitter.c
@@ -0,0 +1,2324 @@
+
+#include "yaml_private.h"
+
+/*
+ * Flush the buffer if needed.
+ */
+
+#define FLUSH(emitter)                                                          \
+    ((emitter->buffer.pointer+5 < emitter->buffer.end)                          \
+     || yaml_emitter_flush(emitter))
+
+/*
+ * Put a character to the output buffer.
+ */
+
+#define PUT(emitter,value)                                                      \
+    (FLUSH(emitter)                                                             \
+     && (*(emitter->buffer.pointer++) = (yaml_char_t)(value),                   \
+         emitter->column ++,                                                    \
+         1))
+
+/*
+ * Put a line break to the output buffer.
+ */
+
+#define PUT_BREAK(emitter)                                                      \
+    (FLUSH(emitter) ?                                                            \
+      ((emitter->line_break == YAML_CR_BREAK ?                                \
+             (*(emitter->buffer.pointer++) = (yaml_char_t) '\r') :              \
+          emitter->line_break == YAML_LN_BREAK ?                                \
+             (*(emitter->buffer.pointer++) = (yaml_char_t) '\n') :              \
+          emitter->line_break == YAML_CRLN_BREAK ?                              \
+             (*(emitter->buffer.pointer++) = (yaml_char_t) '\r',                \
+              *(emitter->buffer.pointer++) = (yaml_char_t) '\n') : 0),          \
+         emitter->column = 0,                                                   \
+         emitter->line ++,                                                      \
+         1) : 0)
+
+/*
+ * Copy a character from a string into buffer.
+ */
+
+#define WRITE(emitter,string)                                                   \
+    (FLUSH(emitter)                                                             \
+     && (COPY(emitter->buffer,string),                                          \
+         emitter->column ++,                                                    \
+         1))
+
+/*
+ * Copy a line break character from a string into buffer.
+ */
+
+#define WRITE_BREAK(emitter,string)                                             \
+    (FLUSH(emitter)                                                             \
+     && (CHECK(string,'\n') ?                                                   \
+         (PUT_BREAK(emitter),                                                   \
+          string.pointer ++,                                                    \
+          1) :                                                                  \
+         (COPY(emitter->buffer,string),                                         \
+          emitter->column = 0,                                                  \
+          emitter->line ++,                                                     \
+          1)))
+
+/*
+ * API functions.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_emit(yaml_emitter_t *emitter, yaml_event_t *event);
+
+/*
+ * Utility functions.
+ */
+
+static int
+yaml_emitter_set_emitter_error(yaml_emitter_t *emitter, const char *problem);
+
+static int
+yaml_emitter_need_more_events(yaml_emitter_t *emitter);
+
+static int
+yaml_emitter_append_tag_directive(yaml_emitter_t *emitter,
+        yaml_tag_directive_t value, int allow_duplicates);
+
+static int
+yaml_emitter_increase_indent(yaml_emitter_t *emitter,
+        int flow, int indentless);
+
+/*
+ * State functions.
+ */
+
+static int
+yaml_emitter_state_machine(yaml_emitter_t *emitter, yaml_event_t *event);
+
+static int
+yaml_emitter_emit_stream_start(yaml_emitter_t *emitter,
+        yaml_event_t *event);
+
+static int
+yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
+        yaml_event_t *event, int first);
+
+static int
+yaml_emitter_emit_document_content(yaml_emitter_t *emitter,
+        yaml_event_t *event);
+
+static int
+yaml_emitter_emit_document_end(yaml_emitter_t *emitter,
+        yaml_event_t *event);
+
+static int
+yaml_emitter_emit_flow_sequence_item(yaml_emitter_t *emitter,
+        yaml_event_t *event, int first);
+
+static int
+yaml_emitter_emit_flow_mapping_key(yaml_emitter_t *emitter,
+        yaml_event_t *event, int first);
+
+static int
+yaml_emitter_emit_flow_mapping_value(yaml_emitter_t *emitter,
+        yaml_event_t *event, int simple);
+
+static int
+yaml_emitter_emit_block_sequence_item(yaml_emitter_t *emitter,
+        yaml_event_t *event, int first);
+
+static int
+yaml_emitter_emit_block_mapping_key(yaml_emitter_t *emitter,
+        yaml_event_t *event, int first);
+
+static int
+yaml_emitter_emit_block_mapping_value(yaml_emitter_t *emitter,
+        yaml_event_t *event, int simple);
+
+static int
+yaml_emitter_emit_node(yaml_emitter_t *emitter, yaml_event_t *event,
+        int root, int sequence, int mapping, int simple_key);
+
+static int
+yaml_emitter_emit_alias(yaml_emitter_t *emitter, yaml_event_t *event);
+
+static int
+yaml_emitter_emit_scalar(yaml_emitter_t *emitter, yaml_event_t *event);
+
+static int
+yaml_emitter_emit_sequence_start(yaml_emitter_t *emitter, yaml_event_t *event);
+
+static int
+yaml_emitter_emit_mapping_start(yaml_emitter_t *emitter, yaml_event_t *event);
+
+/*
+ * Checkers.
+ */
+
+static int
+yaml_emitter_check_empty_document(yaml_emitter_t *emitter);
+
+static int
+yaml_emitter_check_empty_sequence(yaml_emitter_t *emitter);
+
+static int
+yaml_emitter_check_empty_mapping(yaml_emitter_t *emitter);
+
+static int
+yaml_emitter_check_simple_key(yaml_emitter_t *emitter);
+
+static int
+yaml_emitter_select_scalar_style(yaml_emitter_t *emitter, yaml_event_t *event);
+
+/*
+ * Processors.
+ */
+
+static int
+yaml_emitter_process_anchor(yaml_emitter_t *emitter);
+
+static int
+yaml_emitter_process_tag(yaml_emitter_t *emitter);
+
+static int
+yaml_emitter_process_scalar(yaml_emitter_t *emitter);
+
+/*
+ * Analyzers.
+ */
+
+static int
+yaml_emitter_analyze_version_directive(yaml_emitter_t *emitter,
+        yaml_version_directive_t version_directive);
+
+static int
+yaml_emitter_analyze_tag_directive(yaml_emitter_t *emitter,
+        yaml_tag_directive_t tag_directive);
+
+static int
+yaml_emitter_analyze_anchor(yaml_emitter_t *emitter,
+        yaml_char_t *anchor, int alias);
+
+static int
+yaml_emitter_analyze_tag(yaml_emitter_t *emitter,
+        yaml_char_t *tag);
+
+static int
+yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length);
+
+static int
+yaml_emitter_analyze_event(yaml_emitter_t *emitter,
+        yaml_event_t *event);
+
+/*
+ * Writers.
+ */
+
+static int
+yaml_emitter_write_bom(yaml_emitter_t *emitter);
+
+static int
+yaml_emitter_write_indent(yaml_emitter_t *emitter);
+
+static int
+yaml_emitter_write_indicator(yaml_emitter_t *emitter,
+        const char *indicator, int need_whitespace,
+        int is_whitespace, int is_indention);
+
+static int
+yaml_emitter_write_anchor(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length);
+
+static int
+yaml_emitter_write_tag_handle(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length);
+
+static int
+yaml_emitter_write_tag_content(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length, int need_whitespace);
+
+static int
+yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length, int allow_breaks);
+
+static int
+yaml_emitter_write_single_quoted_scalar(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length, int allow_breaks);
+
+static int
+yaml_emitter_write_double_quoted_scalar(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length, int allow_breaks);
+
+static int
+yaml_emitter_write_block_scalar_hints(yaml_emitter_t *emitter,
+        yaml_string_t string);
+
+static int
+yaml_emitter_write_literal_scalar(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length);
+
+static int
+yaml_emitter_write_folded_scalar(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length);
+
+/*
+ * Set an emitter error and return 0.
+ */
+
+static int
+yaml_emitter_set_emitter_error(yaml_emitter_t *emitter, const char *problem)
+{
+    emitter->error = YAML_EMITTER_ERROR;
+    emitter->problem = problem;
+
+    return 0;
+}
+
+/*
+ * Emit an event.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_emit(yaml_emitter_t *emitter, yaml_event_t *event)
+{
+    if (!ENQUEUE(emitter, emitter->events, *event)) {
+        yaml_event_delete(event);
+        return 0;
+    }
+
+    while (!yaml_emitter_need_more_events(emitter)) {
+        if (!yaml_emitter_analyze_event(emitter, emitter->events.head))
+            return 0;
+        if (!yaml_emitter_state_machine(emitter, emitter->events.head))
+            return 0;
+        yaml_event_delete(&DEQUEUE(emitter, emitter->events));
+    }
+
+    return 1;
+}
+
+/*
+ * Check if we need to accumulate more events before emitting.
+ *
+ * We accumulate extra
+ *  - 1 event for DOCUMENT-START
+ *  - 2 events for SEQUENCE-START
+ *  - 3 events for MAPPING-START
+ */
+
+static int
+yaml_emitter_need_more_events(yaml_emitter_t *emitter)
+{
+    int level = 0;
+    int accumulate = 0;
+    yaml_event_t *event;
+
+    if (QUEUE_EMPTY(emitter, emitter->events))
+        return 1;
+
+    switch (emitter->events.head->type) {
+        case YAML_DOCUMENT_START_EVENT:
+            accumulate = 1;
+            break;
+        case YAML_SEQUENCE_START_EVENT:
+            accumulate = 2;
+            break;
+        case YAML_MAPPING_START_EVENT:
+            accumulate = 3;
+            break;
+        default:
+            return 0;
+    }
+
+    if (emitter->events.tail - emitter->events.head > accumulate)
+        return 0;
+
+    for (event = emitter->events.head; event != emitter->events.tail; event ++) {
+        switch (event->type) {
+            case YAML_STREAM_START_EVENT:
+            case YAML_DOCUMENT_START_EVENT:
+            case YAML_SEQUENCE_START_EVENT:
+            case YAML_MAPPING_START_EVENT:
+                level += 1;
+                break;
+            case YAML_STREAM_END_EVENT:
+            case YAML_DOCUMENT_END_EVENT:
+            case YAML_SEQUENCE_END_EVENT:
+            case YAML_MAPPING_END_EVENT:
+                level -= 1;
+                break;
+            default:
+                break;
+        }
+        if (!level)
+            return 0;
+    }
+
+    return 1;
+}
+
+/*
+ * Append a directive to the directives stack.
+ */
+
+static int
+yaml_emitter_append_tag_directive(yaml_emitter_t *emitter,
+        yaml_tag_directive_t value, int allow_duplicates)
+{
+    yaml_tag_directive_t *tag_directive;
+    yaml_tag_directive_t copy = { NULL, NULL };
+
+    for (tag_directive = emitter->tag_directives.start;
+            tag_directive != emitter->tag_directives.top; tag_directive ++) {
+        if (strcmp((char *)value.handle, (char *)tag_directive->handle) == 0) {
+            if (allow_duplicates)
+                return 1;
+            return yaml_emitter_set_emitter_error(emitter,
+                    "duplicate %TAG directive");
+        }
+    }
+
+    copy.handle = yaml_strdup(value.handle);
+    copy.prefix = yaml_strdup(value.prefix);
+    if (!copy.handle || !copy.prefix) {
+        emitter->error = YAML_MEMORY_ERROR;
+        goto error;
+    }
+
+    if (!PUSH(emitter, emitter->tag_directives, copy))
+        goto error;
+
+    return 1;
+
+error:
+    yaml_free(copy.handle);
+    yaml_free(copy.prefix);
+    return 0;
+}
+
+/*
+ * Increase the indentation level.
+ */
+
+static int
+yaml_emitter_increase_indent(yaml_emitter_t *emitter,
+        int flow, int indentless)
+{
+    if (!PUSH(emitter, emitter->indents, emitter->indent))
+        return 0;
+
+    if (emitter->indent < 0) {
+        emitter->indent = flow ? emitter->best_indent : 0;
+    }
+    else if (!indentless) {
+        emitter->indent += emitter->best_indent;
+    }
+
+    return 1;
+}
+
+/*
+ * State dispatcher.
+ */
+
+static int
+yaml_emitter_state_machine(yaml_emitter_t *emitter, yaml_event_t *event)
+{
+    switch (emitter->state)
+    {
+        case YAML_EMIT_STREAM_START_STATE:
+            return yaml_emitter_emit_stream_start(emitter, event);
+
+        case YAML_EMIT_FIRST_DOCUMENT_START_STATE:
+            return yaml_emitter_emit_document_start(emitter, event, 1);
+
+        case YAML_EMIT_DOCUMENT_START_STATE:
+            return yaml_emitter_emit_document_start(emitter, event, 0);
+
+        case YAML_EMIT_DOCUMENT_CONTENT_STATE:
+            return yaml_emitter_emit_document_content(emitter, event);
+
+        case YAML_EMIT_DOCUMENT_END_STATE:
+            return yaml_emitter_emit_document_end(emitter, event);
+
+        case YAML_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE:
+            return yaml_emitter_emit_flow_sequence_item(emitter, event, 1);
+
+        case YAML_EMIT_FLOW_SEQUENCE_ITEM_STATE:
+            return yaml_emitter_emit_flow_sequence_item(emitter, event, 0);
+
+        case YAML_EMIT_FLOW_MAPPING_FIRST_KEY_STATE:
+            return yaml_emitter_emit_flow_mapping_key(emitter, event, 1);
+
+        case YAML_EMIT_FLOW_MAPPING_KEY_STATE:
+            return yaml_emitter_emit_flow_mapping_key(emitter, event, 0);
+
+        case YAML_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE:
+            return yaml_emitter_emit_flow_mapping_value(emitter, event, 1);
+
+        case YAML_EMIT_FLOW_MAPPING_VALUE_STATE:
+            return yaml_emitter_emit_flow_mapping_value(emitter, event, 0);
+
+        case YAML_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE:
+            return yaml_emitter_emit_block_sequence_item(emitter, event, 1);
+
+        case YAML_EMIT_BLOCK_SEQUENCE_ITEM_STATE:
+            return yaml_emitter_emit_block_sequence_item(emitter, event, 0);
+
+        case YAML_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE:
+            return yaml_emitter_emit_block_mapping_key(emitter, event, 1);
+
+        case YAML_EMIT_BLOCK_MAPPING_KEY_STATE:
+            return yaml_emitter_emit_block_mapping_key(emitter, event, 0);
+
+        case YAML_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE:
+            return yaml_emitter_emit_block_mapping_value(emitter, event, 1);
+
+        case YAML_EMIT_BLOCK_MAPPING_VALUE_STATE:
+            return yaml_emitter_emit_block_mapping_value(emitter, event, 0);
+
+        case YAML_EMIT_END_STATE:
+            return yaml_emitter_set_emitter_error(emitter,
+                    "expected nothing after STREAM-END");
+
+        default:
+            assert(1);      /* Invalid state. */
+    }
+
+    return 0;
+}
+
+/*
+ * Expect STREAM-START.
+ */
+
+static int
+yaml_emitter_emit_stream_start(yaml_emitter_t *emitter,
+        yaml_event_t *event)
+{
+    if (event->type == YAML_STREAM_START_EVENT)
+    {
+        if (!emitter->encoding) {
+            emitter->encoding = event->data.stream_start.encoding;
+        }
+
+        if (!emitter->encoding) {
+            emitter->encoding = YAML_UTF8_ENCODING;
+        }
+
+        if (emitter->best_indent < 2 || emitter->best_indent > 9) {
+            emitter->best_indent  = 2;
+        }
+
+        if (emitter->best_width >= 0
+                && emitter->best_width <= emitter->best_indent*2) {
+            emitter->best_width = 80;
+        }
+
+        if (emitter->best_width < 0) {
+            emitter->best_width = INT_MAX;
+        }
+
+        if (!emitter->line_break) {
+            emitter->line_break = YAML_LN_BREAK;
+        }
+
+        emitter->indent = -1;
+
+        emitter->line = 0;
+        emitter->column = 0;
+        emitter->whitespace = 1;
+        emitter->indention = 1;
+
+        if (emitter->encoding != YAML_UTF8_ENCODING) {
+            if (!yaml_emitter_write_bom(emitter))
+                return 0;
+        }
+
+        emitter->state = YAML_EMIT_FIRST_DOCUMENT_START_STATE;
+
+        return 1;
+    }
+
+    return yaml_emitter_set_emitter_error(emitter,
+            "expected STREAM-START");
+}
+
+/*
+ * Expect DOCUMENT-START or STREAM-END.
+ */
+
+static int
+yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
+        yaml_event_t *event, int first)
+{
+    if (event->type == YAML_DOCUMENT_START_EVENT)
+    {
+        yaml_tag_directive_t default_tag_directives[] = {
+            {(yaml_char_t *)"!", (yaml_char_t *)"!"},
+            {(yaml_char_t *)"!!", (yaml_char_t *)"tag:yaml.org,2002:"},
+            {NULL, NULL}
+        };
+        yaml_tag_directive_t *tag_directive;
+        int implicit;
+
+        if (event->data.document_start.version_directive) {
+            if (!yaml_emitter_analyze_version_directive(emitter,
+                        *event->data.document_start.version_directive))
+                return 0;
+        }
+
+        for (tag_directive = event->data.document_start.tag_directives.start;
+                tag_directive != event->data.document_start.tag_directives.end;
+                tag_directive ++) {
+            if (!yaml_emitter_analyze_tag_directive(emitter, *tag_directive))
+                return 0;
+            if (!yaml_emitter_append_tag_directive(emitter, *tag_directive, 0))
+                return 0;
+        }
+
+        for (tag_directive = default_tag_directives;
+                tag_directive->handle; tag_directive ++) {
+            if (!yaml_emitter_append_tag_directive(emitter, *tag_directive, 1))
+                return 0;
+        }
+
+        implicit = event->data.document_start.implicit;
+        if (!first || emitter->canonical) {
+            implicit = 0;
+        }
+
+        if ((event->data.document_start.version_directive ||
+                    (event->data.document_start.tag_directives.start
+                     != event->data.document_start.tag_directives.end)) &&
+                emitter->open_ended)
+        {
+            if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
+                return 0;
+            if (!yaml_emitter_write_indent(emitter))
+                return 0;
+        }
+
+        if (event->data.document_start.version_directive) {
+            implicit = 0;
+            if (!yaml_emitter_write_indicator(emitter, "%YAML", 1, 0, 0))
+                return 0;
+            if (!yaml_emitter_write_indicator(emitter, "1.1", 1, 0, 0))
+                return 0;
+            if (!yaml_emitter_write_indent(emitter))
+                return 0;
+        }
+
+        if (event->data.document_start.tag_directives.start
+                != event->data.document_start.tag_directives.end) {
+            implicit = 0;
+            for (tag_directive = event->data.document_start.tag_directives.start;
+                    tag_directive != event->data.document_start.tag_directives.end;
+                    tag_directive ++) {
+                if (!yaml_emitter_write_indicator(emitter, "%TAG", 1, 0, 0))
+                    return 0;
+                if (!yaml_emitter_write_tag_handle(emitter, tag_directive->handle,
+                            strlen((char *)tag_directive->handle)))
+                    return 0;
+                if (!yaml_emitter_write_tag_content(emitter, tag_directive->prefix,
+                            strlen((char *)tag_directive->prefix), 1))
+                    return 0;
+                if (!yaml_emitter_write_indent(emitter))
+                    return 0;
+            }
+        }
+
+        if (yaml_emitter_check_empty_document(emitter)) {
+            implicit = 0;
+        }
+
+        if (!implicit) {
+            if (!yaml_emitter_write_indent(emitter))
+                return 0;
+            if (!yaml_emitter_write_indicator(emitter, "---", 1, 0, 0))
+                return 0;
+            if (emitter->canonical) {
+                if (!yaml_emitter_write_indent(emitter))
+                    return 0;
+            }
+        }
+
+        emitter->state = YAML_EMIT_DOCUMENT_CONTENT_STATE;
+
+        return 1;
+    }
+
+    else if (event->type == YAML_STREAM_END_EVENT)
+    {
+        if (emitter->open_ended)
+        {
+            if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
+                return 0;
+            if (!yaml_emitter_write_indent(emitter))
+                return 0;
+        }
+
+        if (!yaml_emitter_flush(emitter))
+            return 0;
+
+        emitter->state = YAML_EMIT_END_STATE;
+
+        return 1;
+    }
+
+    return yaml_emitter_set_emitter_error(emitter,
+            "expected DOCUMENT-START or STREAM-END");
+}
+
+/*
+ * Expect the root node.
+ */
+
+static int
+yaml_emitter_emit_document_content(yaml_emitter_t *emitter,
+        yaml_event_t *event)
+{
+    if (!PUSH(emitter, emitter->states, YAML_EMIT_DOCUMENT_END_STATE))
+        return 0;
+
+    return yaml_emitter_emit_node(emitter, event, 1, 0, 0, 0);
+}
+
+/*
+ * Expect DOCUMENT-END.
+ */
+
+static int
+yaml_emitter_emit_document_end(yaml_emitter_t *emitter,
+        yaml_event_t *event)
+{
+    if (event->type == YAML_DOCUMENT_END_EVENT)
+    {
+        if (!yaml_emitter_write_indent(emitter))
+            return 0;
+        if (!event->data.document_end.implicit) {
+            if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
+                return 0;
+            if (!yaml_emitter_write_indent(emitter))
+                return 0;
+        }
+        if (!yaml_emitter_flush(emitter))
+            return 0;
+
+        emitter->state = YAML_EMIT_DOCUMENT_START_STATE;
+
+        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);
+        }
+
+        return 1;
+    }
+
+    return yaml_emitter_set_emitter_error(emitter,
+            "expected DOCUMENT-END");
+}
+
+/*
+ *
+ * Expect a flow item node.
+ */
+
+static int
+yaml_emitter_emit_flow_sequence_item(yaml_emitter_t *emitter,
+        yaml_event_t *event, int first)
+{
+    if (first)
+    {
+        if (!yaml_emitter_write_indicator(emitter, "[", 1, 1, 0))
+            return 0;
+        if (!yaml_emitter_increase_indent(emitter, 1, 0))
+            return 0;
+        emitter->flow_level ++;
+    }
+
+    if (event->type == YAML_SEQUENCE_END_EVENT)
+    {
+        emitter->flow_level --;
+        emitter->indent = POP(emitter, emitter->indents);
+        if (emitter->canonical && !first) {
+            if (!yaml_emitter_write_indicator(emitter, ",", 0, 0, 0))
+                return 0;
+            if (!yaml_emitter_write_indent(emitter))
+                return 0;
+        }
+        if (!yaml_emitter_write_indicator(emitter, "]", 0, 0, 0))
+            return 0;
+        emitter->state = POP(emitter, emitter->states);
+
+        return 1;
+    }
+
+    if (!first) {
+        if (!yaml_emitter_write_indicator(emitter, ",", 0, 0, 0))
+            return 0;
+    }
+
+    if (emitter->canonical || emitter->column > emitter->best_width) {
+        if (!yaml_emitter_write_indent(emitter))
+            return 0;
+    }
+    if (!PUSH(emitter, emitter->states, YAML_EMIT_FLOW_SEQUENCE_ITEM_STATE))
+        return 0;
+
+    return yaml_emitter_emit_node(emitter, event, 0, 1, 0, 0);
+}
+
+/*
+ * Expect a flow key node.
+ */
+
+static int
+yaml_emitter_emit_flow_mapping_key(yaml_emitter_t *emitter,
+        yaml_event_t *event, int first)
+{
+    if (first)
+    {
+        if (!yaml_emitter_write_indicator(emitter, "{", 1, 1, 0))
+            return 0;
+        if (!yaml_emitter_increase_indent(emitter, 1, 0))
+            return 0;
+        emitter->flow_level ++;
+    }
+
+    if (event->type == YAML_MAPPING_END_EVENT)
+    {
+        emitter->flow_level --;
+        emitter->indent = POP(emitter, emitter->indents);
+        if (emitter->canonical && !first) {
+            if (!yaml_emitter_write_indicator(emitter, ",", 0, 0, 0))
+                return 0;
+            if (!yaml_emitter_write_indent(emitter))
+                return 0;
+        }
+        if (!yaml_emitter_write_indicator(emitter, "}", 0, 0, 0))
+            return 0;
+        emitter->state = POP(emitter, emitter->states);
+
+        return 1;
+    }
+
+    if (!first) {
+        if (!yaml_emitter_write_indicator(emitter, ",", 0, 0, 0))
+            return 0;
+    }
+    if (emitter->canonical || emitter->column > emitter->best_width) {
+        if (!yaml_emitter_write_indent(emitter))
+            return 0;
+    }
+
+    if (!emitter->canonical && yaml_emitter_check_simple_key(emitter))
+    {
+        if (!PUSH(emitter, emitter->states,
+                    YAML_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE))
+            return 0;
+
+        return yaml_emitter_emit_node(emitter, event, 0, 0, 1, 1);
+    }
+    else
+    {
+        if (!yaml_emitter_write_indicator(emitter, "?", 1, 0, 0))
+            return 0;
+        if (!PUSH(emitter, emitter->states,
+                    YAML_EMIT_FLOW_MAPPING_VALUE_STATE))
+            return 0;
+
+        return yaml_emitter_emit_node(emitter, event, 0, 0, 1, 0);
+    }
+}
+
+/*
+ * Expect a flow value node.
+ */
+
+static int
+yaml_emitter_emit_flow_mapping_value(yaml_emitter_t *emitter,
+        yaml_event_t *event, int simple)
+{
+    if (simple) {
+        if (!yaml_emitter_write_indicator(emitter, ":", 0, 0, 0))
+            return 0;
+    }
+    else {
+        if (emitter->canonical || emitter->column > emitter->best_width) {
+            if (!yaml_emitter_write_indent(emitter))
+                return 0;
+        }
+        if (!yaml_emitter_write_indicator(emitter, ":", 1, 0, 0))
+            return 0;
+    }
+    if (!PUSH(emitter, emitter->states, YAML_EMIT_FLOW_MAPPING_KEY_STATE))
+        return 0;
+    return yaml_emitter_emit_node(emitter, event, 0, 0, 1, 0);
+}
+
+/*
+ * Expect a block item node.
+ */
+
+static int
+yaml_emitter_emit_block_sequence_item(yaml_emitter_t *emitter,
+        yaml_event_t *event, int first)
+{
+    if (first)
+    {
+        if (!yaml_emitter_increase_indent(emitter, 0,
+                    (emitter->mapping_context && !emitter->indention)))
+            return 0;
+    }
+
+    if (event->type == YAML_SEQUENCE_END_EVENT)
+    {
+        emitter->indent = POP(emitter, emitter->indents);
+        emitter->state = POP(emitter, emitter->states);
+
+        return 1;
+    }
+
+    if (!yaml_emitter_write_indent(emitter))
+        return 0;
+    if (!yaml_emitter_write_indicator(emitter, "-", 1, 0, 1))
+        return 0;
+    if (!PUSH(emitter, emitter->states,
+                YAML_EMIT_BLOCK_SEQUENCE_ITEM_STATE))
+        return 0;
+
+    return yaml_emitter_emit_node(emitter, event, 0, 1, 0, 0);
+}
+
+/*
+ * Expect a block key node.
+ */
+
+static int
+yaml_emitter_emit_block_mapping_key(yaml_emitter_t *emitter,
+        yaml_event_t *event, int first)
+{
+    if (first)
+    {
+        if (!yaml_emitter_increase_indent(emitter, 0, 0))
+            return 0;
+    }
+
+    if (event->type == YAML_MAPPING_END_EVENT)
+    {
+        emitter->indent = POP(emitter, emitter->indents);
+        emitter->state = POP(emitter, emitter->states);
+
+        return 1;
+    }
+
+    if (!yaml_emitter_write_indent(emitter))
+        return 0;
+
+    if (yaml_emitter_check_simple_key(emitter))
+    {
+        if (!PUSH(emitter, emitter->states,
+                    YAML_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE))
+            return 0;
+
+        return yaml_emitter_emit_node(emitter, event, 0, 0, 1, 1);
+    }
+    else
+    {
+        if (!yaml_emitter_write_indicator(emitter, "?", 1, 0, 1))
+            return 0;
+        if (!PUSH(emitter, emitter->states,
+                    YAML_EMIT_BLOCK_MAPPING_VALUE_STATE))
+            return 0;
+
+        return yaml_emitter_emit_node(emitter, event, 0, 0, 1, 0);
+    }
+}
+
+/*
+ * Expect a block value node.
+ */
+
+static int
+yaml_emitter_emit_block_mapping_value(yaml_emitter_t *emitter,
+        yaml_event_t *event, int simple)
+{
+    if (simple) {
+        if (!yaml_emitter_write_indicator(emitter, ":", 0, 0, 0))
+            return 0;
+    }
+    else {
+        if (!yaml_emitter_write_indent(emitter))
+            return 0;
+        if (!yaml_emitter_write_indicator(emitter, ":", 1, 0, 1))
+            return 0;
+    }
+    if (!PUSH(emitter, emitter->states,
+                YAML_EMIT_BLOCK_MAPPING_KEY_STATE))
+        return 0;
+
+    return yaml_emitter_emit_node(emitter, event, 0, 0, 1, 0);
+}
+
+/*
+ * Expect a node.
+ */
+
+static int
+yaml_emitter_emit_node(yaml_emitter_t *emitter, yaml_event_t *event,
+        int root, int sequence, int mapping, int simple_key)
+{
+    emitter->root_context = root;
+    emitter->sequence_context = sequence;
+    emitter->mapping_context = mapping;
+    emitter->simple_key_context = simple_key;
+
+    switch (event->type)
+    {
+        case YAML_ALIAS_EVENT:
+            return yaml_emitter_emit_alias(emitter, event);
+
+        case YAML_SCALAR_EVENT:
+            return yaml_emitter_emit_scalar(emitter, event);
+
+        case YAML_SEQUENCE_START_EVENT:
+            return yaml_emitter_emit_sequence_start(emitter, event);
+
+        case YAML_MAPPING_START_EVENT:
+            return yaml_emitter_emit_mapping_start(emitter, event);
+
+        default:
+            return yaml_emitter_set_emitter_error(emitter,
+                    "expected SCALAR, SEQUENCE-START, MAPPING-START, or ALIAS");
+    }
+
+    return 0;
+}
+
+/*
+ * Expect ALIAS.
+ */
+
+static int
+yaml_emitter_emit_alias(yaml_emitter_t *emitter, SHIM(yaml_event_t *event))
+{
+    if (!yaml_emitter_process_anchor(emitter))
+        return 0;
+    emitter->state = POP(emitter, emitter->states);
+
+    return 1;
+}
+
+/*
+ * Expect SCALAR.
+ */
+
+static int
+yaml_emitter_emit_scalar(yaml_emitter_t *emitter, yaml_event_t *event)
+{
+    if (!yaml_emitter_select_scalar_style(emitter, event))
+        return 0;
+    if (!yaml_emitter_process_anchor(emitter))
+        return 0;
+    if (!yaml_emitter_process_tag(emitter))
+        return 0;
+    if (!yaml_emitter_increase_indent(emitter, 1, 0))
+        return 0;
+    if (!yaml_emitter_process_scalar(emitter))
+        return 0;
+    emitter->indent = POP(emitter, emitter->indents);
+    emitter->state = POP(emitter, emitter->states);
+
+    return 1;
+}
+
+/*
+ * Expect SEQUENCE-START.
+ */
+
+static int
+yaml_emitter_emit_sequence_start(yaml_emitter_t *emitter, yaml_event_t *event)
+{
+    if (!yaml_emitter_process_anchor(emitter))
+        return 0;
+    if (!yaml_emitter_process_tag(emitter))
+        return 0;
+
+    if (emitter->flow_level || emitter->canonical
+            || event->data.sequence_start.style == YAML_FLOW_SEQUENCE_STYLE
+            || yaml_emitter_check_empty_sequence(emitter)) {
+        emitter->state = YAML_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE;
+    }
+    else {
+        emitter->state = YAML_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE;
+    }
+
+    return 1;
+}
+
+/*
+ * Expect MAPPING-START.
+ */
+
+static int
+yaml_emitter_emit_mapping_start(yaml_emitter_t *emitter, yaml_event_t *event)
+{
+    if (!yaml_emitter_process_anchor(emitter))
+        return 0;
+    if (!yaml_emitter_process_tag(emitter))
+        return 0;
+
+    if (emitter->flow_level || emitter->canonical
+            || event->data.mapping_start.style == YAML_FLOW_MAPPING_STYLE
+            || yaml_emitter_check_empty_mapping(emitter)) {
+        emitter->state = YAML_EMIT_FLOW_MAPPING_FIRST_KEY_STATE;
+    }
+    else {
+        emitter->state = YAML_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE;
+    }
+
+    return 1;
+}
+
+/*
+ * Check if the document content is an empty scalar.
+ */
+
+static int
+yaml_emitter_check_empty_document(SHIM(yaml_emitter_t *emitter))
+{
+    return 0;
+}
+
+/*
+ * Check if the next events represent an empty sequence.
+ */
+
+static int
+yaml_emitter_check_empty_sequence(yaml_emitter_t *emitter)
+{
+    if (emitter->events.tail - emitter->events.head < 2)
+        return 0;
+
+    return (emitter->events.head[0].type == YAML_SEQUENCE_START_EVENT
+            && emitter->events.head[1].type == YAML_SEQUENCE_END_EVENT);
+}
+
+/*
+ * Check if the next events represent an empty mapping.
+ */
+
+static int
+yaml_emitter_check_empty_mapping(yaml_emitter_t *emitter)
+{
+    if (emitter->events.tail - emitter->events.head < 2)
+        return 0;
+
+    return (emitter->events.head[0].type == YAML_MAPPING_START_EVENT
+            && emitter->events.head[1].type == YAML_MAPPING_END_EVENT);
+}
+
+/*
+ * Check if the next node can be expressed as a simple key.
+ */
+
+static int
+yaml_emitter_check_simple_key(yaml_emitter_t *emitter)
+{
+    yaml_event_t *event = emitter->events.head;
+    size_t length = 0;
+
+    switch (event->type)
+    {
+        case YAML_ALIAS_EVENT:
+            length += emitter->anchor_data.anchor_length;
+            break;
+
+        case YAML_SCALAR_EVENT:
+            if (emitter->scalar_data.multiline)
+                return 0;
+            length += emitter->anchor_data.anchor_length
+                + emitter->tag_data.handle_length
+                + emitter->tag_data.suffix_length
+                + emitter->scalar_data.length;
+            break;
+
+        case YAML_SEQUENCE_START_EVENT:
+            if (!yaml_emitter_check_empty_sequence(emitter))
+                return 0;
+            length += emitter->anchor_data.anchor_length
+                + emitter->tag_data.handle_length
+                + emitter->tag_data.suffix_length;
+            break;
+
+        case YAML_MAPPING_START_EVENT:
+            if (!yaml_emitter_check_empty_mapping(emitter))
+                return 0;
+            length += emitter->anchor_data.anchor_length
+                + emitter->tag_data.handle_length
+                + emitter->tag_data.suffix_length;
+            break;
+
+        default:
+            return 0;
+    }
+
+    if (length > 128)
+        return 0;
+
+    return 1;
+}
+
+/*
+ * Determine an acceptable scalar style.
+ */
+
+static int
+yaml_emitter_select_scalar_style(yaml_emitter_t *emitter, yaml_event_t *event)
+{
+    yaml_scalar_style_t style = event->data.scalar.style;
+    int no_tag = (!emitter->tag_data.handle && !emitter->tag_data.suffix);
+
+    if (no_tag && !event->data.scalar.plain_implicit
+            && !event->data.scalar.quoted_implicit) {
+        return yaml_emitter_set_emitter_error(emitter,
+                "neither tag nor implicit flags are specified");
+    }
+
+    if (style == YAML_ANY_SCALAR_STYLE)
+        style = YAML_PLAIN_SCALAR_STYLE;
+
+    if (emitter->canonical)
+        style = YAML_DOUBLE_QUOTED_SCALAR_STYLE;
+
+    if (emitter->simple_key_context && emitter->scalar_data.multiline)
+        style = YAML_DOUBLE_QUOTED_SCALAR_STYLE;
+
+    if (style == YAML_PLAIN_SCALAR_STYLE)
+    {
+        if ((emitter->flow_level && !emitter->scalar_data.flow_plain_allowed)
+                || (!emitter->flow_level && !emitter->scalar_data.block_plain_allowed))
+            style = YAML_SINGLE_QUOTED_SCALAR_STYLE;
+        if (!emitter->scalar_data.length
+                && (emitter->flow_level || emitter->simple_key_context))
+            style = YAML_SINGLE_QUOTED_SCALAR_STYLE;
+        if (no_tag && !event->data.scalar.plain_implicit)
+            style = YAML_SINGLE_QUOTED_SCALAR_STYLE;
+    }
+
+    if (style == YAML_SINGLE_QUOTED_SCALAR_STYLE)
+    {
+        if (!emitter->scalar_data.single_quoted_allowed)
+            style = YAML_DOUBLE_QUOTED_SCALAR_STYLE;
+    }
+
+    if (style == YAML_LITERAL_SCALAR_STYLE || style == YAML_FOLDED_SCALAR_STYLE)
+    {
+        if (!emitter->scalar_data.block_allowed
+                || emitter->flow_level || emitter->simple_key_context)
+            style = YAML_DOUBLE_QUOTED_SCALAR_STYLE;
+    }
+
+    if (no_tag && !event->data.scalar.quoted_implicit
+            && style != YAML_PLAIN_SCALAR_STYLE)
+    {
+        emitter->tag_data.handle = (yaml_char_t *)"!";
+        emitter->tag_data.handle_length = 1;
+    }
+
+    emitter->scalar_data.style = style;
+
+    return 1;
+}
+
+/*
+ * Write an anchor.
+ */
+
+static int
+yaml_emitter_process_anchor(yaml_emitter_t *emitter)
+{
+    if (!emitter->anchor_data.anchor)
+        return 1;
+
+    if (!yaml_emitter_write_indicator(emitter,
+                (emitter->anchor_data.alias ? "*" : "&"), 1, 0, 0))
+        return 0;
+
+    return yaml_emitter_write_anchor(emitter,
+            emitter->anchor_data.anchor, emitter->anchor_data.anchor_length);
+}
+
+/*
+ * Write a tag.
+ */
+
+static int
+yaml_emitter_process_tag(yaml_emitter_t *emitter)
+{
+    if (!emitter->tag_data.handle && !emitter->tag_data.suffix)
+        return 1;
+
+    if (emitter->tag_data.handle)
+    {
+        if (!yaml_emitter_write_tag_handle(emitter, emitter->tag_data.handle,
+                    emitter->tag_data.handle_length))
+            return 0;
+        if (emitter->tag_data.suffix) {
+            if (!yaml_emitter_write_tag_content(emitter, emitter->tag_data.suffix,
+                        emitter->tag_data.suffix_length, 0))
+                return 0;
+        }
+    }
+    else
+    {
+        if (!yaml_emitter_write_indicator(emitter, "!<", 1, 0, 0))
+            return 0;
+        if (!yaml_emitter_write_tag_content(emitter, emitter->tag_data.suffix,
+                    emitter->tag_data.suffix_length, 0))
+            return 0;
+        if (!yaml_emitter_write_indicator(emitter, ">", 0, 0, 0))
+            return 0;
+    }
+
+    return 1;
+}
+
+/*
+ * Write a scalar.
+ */
+
+static int
+yaml_emitter_process_scalar(yaml_emitter_t *emitter)
+{
+    switch (emitter->scalar_data.style)
+    {
+        case YAML_PLAIN_SCALAR_STYLE:
+            return yaml_emitter_write_plain_scalar(emitter,
+                    emitter->scalar_data.value, emitter->scalar_data.length,
+                    !emitter->simple_key_context);
+
+        case YAML_SINGLE_QUOTED_SCALAR_STYLE:
+            return yaml_emitter_write_single_quoted_scalar(emitter,
+                    emitter->scalar_data.value, emitter->scalar_data.length,
+                    !emitter->simple_key_context);
+
+        case YAML_DOUBLE_QUOTED_SCALAR_STYLE:
+            return yaml_emitter_write_double_quoted_scalar(emitter,
+                    emitter->scalar_data.value, emitter->scalar_data.length,
+                    !emitter->simple_key_context);
+
+        case YAML_LITERAL_SCALAR_STYLE:
+            return yaml_emitter_write_literal_scalar(emitter,
+                    emitter->scalar_data.value, emitter->scalar_data.length);
+
+        case YAML_FOLDED_SCALAR_STYLE:
+            return yaml_emitter_write_folded_scalar(emitter,
+                    emitter->scalar_data.value, emitter->scalar_data.length);
+
+        default:
+            assert(1);      /* Impossible. */
+    }
+
+    return 0;
+}
+
+/*
+ * Check if a %YAML directive is valid.
+ */
+
+static int
+yaml_emitter_analyze_version_directive(yaml_emitter_t *emitter,
+        yaml_version_directive_t version_directive)
+{
+    if (version_directive.major != 1 || version_directive.minor != 1) {
+        return yaml_emitter_set_emitter_error(emitter,
+                "incompatible %YAML directive");
+    }
+
+    return 1;
+}
+
+/*
+ * Check if a %TAG directive is valid.
+ */
+
+static int
+yaml_emitter_analyze_tag_directive(yaml_emitter_t *emitter,
+        yaml_tag_directive_t tag_directive)
+{
+    yaml_string_t handle;
+    yaml_string_t prefix;
+    size_t handle_length;
+    size_t prefix_length;
+
+    handle_length = strlen((char *)tag_directive.handle);
+    prefix_length = strlen((char *)tag_directive.prefix);
+    STRING_ASSIGN(handle, tag_directive.handle, handle_length);
+    STRING_ASSIGN(prefix, tag_directive.prefix, prefix_length);
+
+    if (handle.start == handle.end) {
+        return yaml_emitter_set_emitter_error(emitter,
+                "tag handle must not be empty");
+    }
+
+    if (handle.start[0] != '!') {
+        return yaml_emitter_set_emitter_error(emitter,
+                "tag handle must start with '!'");
+    }
+
+    if (handle.end[-1] != '!') {
+        return yaml_emitter_set_emitter_error(emitter,
+                "tag handle must end with '!'");
+    }
+
+    handle.pointer ++;
+
+    while (handle.pointer < handle.end-1) {
+        if (!IS_ALPHA(handle)) {
+            return yaml_emitter_set_emitter_error(emitter,
+                    "tag handle must contain alphanumerical characters only");
+        }
+        MOVE(handle);
+    }
+
+    if (prefix.start == prefix.end) {
+        return yaml_emitter_set_emitter_error(emitter,
+                "tag prefix must not be empty");
+    }
+
+    return 1;
+}
+
+/*
+ * Check if an anchor is valid.
+ */
+
+static int
+yaml_emitter_analyze_anchor(yaml_emitter_t *emitter,
+        yaml_char_t *anchor, int alias)
+{
+    size_t anchor_length;
+    yaml_string_t string;
+
+    anchor_length = strlen((char *)anchor);
+    STRING_ASSIGN(string, anchor, anchor_length);
+
+    if (string.start == string.end) {
+        return yaml_emitter_set_emitter_error(emitter, alias ?
+                "alias value must not be empty" :
+                "anchor value must not be empty");
+    }
+
+    while (string.pointer != string.end) {
+        if (!IS_ALPHA(string)) {
+            return yaml_emitter_set_emitter_error(emitter, alias ?
+                    "alias value must contain alphanumerical characters only" :
+                    "anchor value must contain alphanumerical characters only");
+        }
+        MOVE(string);
+    }
+
+    emitter->anchor_data.anchor = string.start;
+    emitter->anchor_data.anchor_length = string.end - string.start;
+    emitter->anchor_data.alias = alias;
+
+    return 1;
+}
+
+/*
+ * Check if a tag is valid.
+ */
+
+static int
+yaml_emitter_analyze_tag(yaml_emitter_t *emitter,
+        yaml_char_t *tag)
+{
+    size_t tag_length;
+    yaml_string_t string;
+    yaml_tag_directive_t *tag_directive;
+
+    tag_length = strlen((char *)tag);
+    STRING_ASSIGN(string, tag, tag_length);
+
+    if (string.start == string.end) {
+        return yaml_emitter_set_emitter_error(emitter,
+                "tag value must not be empty");
+    }
+
+    for (tag_directive = emitter->tag_directives.start;
+            tag_directive != emitter->tag_directives.top; tag_directive ++) {
+        size_t prefix_length = strlen((char *)tag_directive->prefix);
+        if (prefix_length < (size_t)(string.end - string.start)
+                && strncmp((char *)tag_directive->prefix, (char *)string.start,
+                    prefix_length) == 0)
+        {
+            emitter->tag_data.handle = tag_directive->handle;
+            emitter->tag_data.handle_length =
+                strlen((char *)tag_directive->handle);
+            emitter->tag_data.suffix = string.start + prefix_length;
+            emitter->tag_data.suffix_length =
+                (string.end - string.start) - prefix_length;
+            return 1;
+        }
+    }
+
+    emitter->tag_data.suffix = string.start;
+    emitter->tag_data.suffix_length = string.end - string.start;
+
+    return 1;
+}
+
+/*
+ * Check if a scalar is valid.
+ */
+
+static int
+yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length)
+{
+    yaml_string_t string;
+
+    int block_indicators = 0;
+    int flow_indicators = 0;
+    int line_breaks = 0;
+    int special_characters = 0;
+
+    int leading_space = 0;
+    int leading_break = 0;
+    int trailing_space = 0;
+    int trailing_break = 0;
+    int break_space = 0;
+    int space_break = 0;
+
+    int preceded_by_whitespace = 0;
+    int followed_by_whitespace = 0;
+    int previous_space = 0;
+    int previous_break = 0;
+
+    STRING_ASSIGN(string, value, length);
+
+    emitter->scalar_data.value = value;
+    emitter->scalar_data.length = length;
+
+    if (string.start == string.end)
+    {
+        emitter->scalar_data.multiline = 0;
+        emitter->scalar_data.flow_plain_allowed = 0;
+        emitter->scalar_data.block_plain_allowed = 1;
+        emitter->scalar_data.single_quoted_allowed = 1;
+        emitter->scalar_data.block_allowed = 0;
+
+        return 1;
+    }
+
+    if ((CHECK_AT(string, '-', 0)
+                && CHECK_AT(string, '-', 1)
+                && CHECK_AT(string, '-', 2))
+            || (CHECK_AT(string, '.', 0)
+                && CHECK_AT(string, '.', 1)
+                && CHECK_AT(string, '.', 2))) {
+        block_indicators = 1;
+        flow_indicators = 1;
+    }
+
+    preceded_by_whitespace = 1;
+    followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string));
+
+    while (string.pointer != string.end)
+    {
+        if (string.start == string.pointer)
+        {
+            if (CHECK(string, '#') || CHECK(string, ',')
+                    || CHECK(string, '[') || CHECK(string, ']')
+                    || CHECK(string, '{') || CHECK(string, '}')
+                    || CHECK(string, '&') || CHECK(string, '*')
+                    || CHECK(string, '!') || CHECK(string, '|')
+                    || CHECK(string, '>') || CHECK(string, '\'')
+                    || CHECK(string, '"') || CHECK(string, '%')
+                    || CHECK(string, '@') || CHECK(string, '`')) {
+                flow_indicators = 1;
+                block_indicators = 1;
+            }
+
+            if (CHECK(string, '?') || CHECK(string, ':')) {
+                flow_indicators = 1;
+                if (followed_by_whitespace) {
+                    block_indicators = 1;
+                }
+            }
+
+            if (CHECK(string, '-') && followed_by_whitespace) {
+                flow_indicators = 1;
+                block_indicators = 1;
+            }
+        }
+        else
+        {
+            if (CHECK(string, ',') || CHECK(string, '?')
+                    || CHECK(string, '[') || CHECK(string, ']')
+                    || CHECK(string, '{') || CHECK(string, '}')) {
+                flow_indicators = 1;
+            }
+
+            if (CHECK(string, ':')) {
+                flow_indicators = 1;
+                if (followed_by_whitespace) {
+                    block_indicators = 1;
+                }
+            }
+
+            if (CHECK(string, '#') && preceded_by_whitespace) {
+                flow_indicators = 1;
+                block_indicators = 1;
+            }
+        }
+
+        if (!IS_PRINTABLE(string)
+                || (!IS_ASCII(string) && !emitter->unicode)) {
+            special_characters = 1;
+        }
+
+        if (IS_BREAK(string)) {
+            line_breaks = 1;
+        }
+
+        if (IS_SPACE(string))
+        {
+            if (string.start == string.pointer) {
+                leading_space = 1;
+            }
+            if (string.pointer+WIDTH(string) == string.end) {
+                trailing_space = 1;
+            }
+            if (previous_break) {
+                break_space = 1;
+            }
+            previous_space = 1;
+            previous_break = 0;
+        }
+        else if (IS_BREAK(string))
+        {
+            if (string.start == string.pointer) {
+                leading_break = 1;
+            }
+            if (string.pointer+WIDTH(string) == string.end) {
+                trailing_break = 1;
+            }
+            if (previous_space) {
+                space_break = 1;
+            }
+            previous_space = 0;
+            previous_break = 1;
+        }
+        else
+        {
+            previous_space = 0;
+            previous_break = 0;
+        }
+
+        preceded_by_whitespace = IS_BLANKZ(string);
+        MOVE(string);
+        if (string.pointer != string.end) {
+            followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string));
+        }
+    }
+
+    emitter->scalar_data.multiline = line_breaks;
+
+    emitter->scalar_data.flow_plain_allowed = 1;
+    emitter->scalar_data.block_plain_allowed = 1;
+    emitter->scalar_data.single_quoted_allowed = 1;
+    emitter->scalar_data.block_allowed = 1;
+
+    if (leading_space || leading_break || trailing_space || trailing_break) {
+        emitter->scalar_data.flow_plain_allowed = 0;
+        emitter->scalar_data.block_plain_allowed = 0;
+    }
+
+    if (trailing_space) {
+        emitter->scalar_data.block_allowed = 0;
+    }
+
+    if (break_space) {
+        emitter->scalar_data.flow_plain_allowed = 0;
+        emitter->scalar_data.block_plain_allowed = 0;
+        emitter->scalar_data.single_quoted_allowed = 0;
+    }
+
+    if (space_break || special_characters) {
+        emitter->scalar_data.flow_plain_allowed = 0;
+        emitter->scalar_data.block_plain_allowed = 0;
+        emitter->scalar_data.single_quoted_allowed = 0;
+        emitter->scalar_data.block_allowed = 0;
+    }
+
+    if (line_breaks) {
+        emitter->scalar_data.flow_plain_allowed = 0;
+        emitter->scalar_data.block_plain_allowed = 0;
+    }
+
+    if (flow_indicators) {
+        emitter->scalar_data.flow_plain_allowed = 0;
+    }
+
+    if (block_indicators) {
+        emitter->scalar_data.block_plain_allowed = 0;
+    }
+
+    return 1;
+}
+
+/*
+ * Check if the event data is valid.
+ */
+
+static int
+yaml_emitter_analyze_event(yaml_emitter_t *emitter,
+        yaml_event_t *event)
+{
+    emitter->anchor_data.anchor = NULL;
+    emitter->anchor_data.anchor_length = 0;
+    emitter->tag_data.handle = NULL;
+    emitter->tag_data.handle_length = 0;
+    emitter->tag_data.suffix = NULL;
+    emitter->tag_data.suffix_length = 0;
+    emitter->scalar_data.value = NULL;
+    emitter->scalar_data.length = 0;
+
+    switch (event->type)
+    {
+        case YAML_ALIAS_EVENT:
+            if (!yaml_emitter_analyze_anchor(emitter,
+                        event->data.alias.anchor, 1))
+                return 0;
+            return 1;
+
+        case YAML_SCALAR_EVENT:
+            if (event->data.scalar.anchor) {
+                if (!yaml_emitter_analyze_anchor(emitter,
+                            event->data.scalar.anchor, 0))
+                    return 0;
+            }
+            if (event->data.scalar.tag && (emitter->canonical ||
+                        (!event->data.scalar.plain_implicit
+                         && !event->data.scalar.quoted_implicit))) {
+                if (!yaml_emitter_analyze_tag(emitter, event->data.scalar.tag))
+                    return 0;
+            }
+            if (!yaml_emitter_analyze_scalar(emitter,
+                        event->data.scalar.value, event->data.scalar.length))
+                return 0;
+            return 1;
+
+        case YAML_SEQUENCE_START_EVENT:
+            if (event->data.sequence_start.anchor) {
+                if (!yaml_emitter_analyze_anchor(emitter,
+                            event->data.sequence_start.anchor, 0))
+                    return 0;
+            }
+            if (event->data.sequence_start.tag && (emitter->canonical ||
+                        !event->data.sequence_start.implicit)) {
+                if (!yaml_emitter_analyze_tag(emitter,
+                            event->data.sequence_start.tag))
+                    return 0;
+            }
+            return 1;
+
+        case YAML_MAPPING_START_EVENT:
+            if (event->data.mapping_start.anchor) {
+                if (!yaml_emitter_analyze_anchor(emitter,
+                            event->data.mapping_start.anchor, 0))
+                    return 0;
+            }
+            if (event->data.mapping_start.tag && (emitter->canonical ||
+                        !event->data.mapping_start.implicit)) {
+                if (!yaml_emitter_analyze_tag(emitter,
+                            event->data.mapping_start.tag))
+                    return 0;
+            }
+            return 1;
+
+        default:
+            return 1;
+    }
+}
+
+/*
+ * Write the BOM character.
+ */
+
+static int
+yaml_emitter_write_bom(yaml_emitter_t *emitter)
+{
+    if (!FLUSH(emitter)) return 0;
+
+    *(emitter->buffer.pointer++) = (yaml_char_t) '\xEF';
+    *(emitter->buffer.pointer++) = (yaml_char_t) '\xBB';
+    *(emitter->buffer.pointer++) = (yaml_char_t) '\xBF';
+
+    return 1;
+}
+
+static int
+yaml_emitter_write_indent(yaml_emitter_t *emitter)
+{
+    int indent = (emitter->indent >= 0) ? emitter->indent : 0;
+
+    if (!emitter->indention || emitter->column > indent
+            || (emitter->column == indent && !emitter->whitespace)) {
+        if (!PUT_BREAK(emitter)) return 0;
+    }
+
+    while (emitter->column < indent) {
+        if (!PUT(emitter, ' ')) return 0;
+    }
+
+    emitter->whitespace = 1;
+    emitter->indention = 1;
+
+    return 1;
+}
+
+static int
+yaml_emitter_write_indicator(yaml_emitter_t *emitter,
+        const char *indicator, int need_whitespace,
+        int is_whitespace, int is_indention)
+{
+    size_t indicator_length;
+    yaml_string_t string;
+
+    indicator_length = strlen(indicator);
+    STRING_ASSIGN(string, (yaml_char_t *)indicator, indicator_length);
+
+    if (need_whitespace && !emitter->whitespace) {
+        if (!PUT(emitter, ' ')) return 0;
+    }
+
+    while (string.pointer != string.end) {
+        if (!WRITE(emitter, string)) return 0;
+    }
+
+    emitter->whitespace = is_whitespace;
+    emitter->indention = (emitter->indention && is_indention);
+    emitter->open_ended = 0;
+
+    return 1;
+}
+
+static int
+yaml_emitter_write_anchor(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length)
+{
+    yaml_string_t string;
+    STRING_ASSIGN(string, value, length);
+
+    while (string.pointer != string.end) {
+        if (!WRITE(emitter, string)) return 0;
+    }
+
+    emitter->whitespace = 0;
+    emitter->indention = 0;
+
+    return 1;
+}
+
+static int
+yaml_emitter_write_tag_handle(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length)
+{
+    yaml_string_t string;
+    STRING_ASSIGN(string, value, length);
+
+    if (!emitter->whitespace) {
+        if (!PUT(emitter, ' ')) return 0;
+    }
+
+    while (string.pointer != string.end) {
+        if (!WRITE(emitter, string)) return 0;
+    }
+
+    emitter->whitespace = 0;
+    emitter->indention = 0;
+
+    return 1;
+}
+
+static int
+yaml_emitter_write_tag_content(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length,
+        int need_whitespace)
+{
+    yaml_string_t string;
+    STRING_ASSIGN(string, value, length);
+
+    if (need_whitespace && !emitter->whitespace) {
+        if (!PUT(emitter, ' ')) return 0;
+    }
+
+    while (string.pointer != string.end) {
+        if (IS_ALPHA(string)
+                || CHECK(string, ';') || CHECK(string, '/')
+                || CHECK(string, '?') || CHECK(string, ':')
+                || CHECK(string, '@') || CHECK(string, '&')
+                || CHECK(string, '=') || CHECK(string, '+')
+                || CHECK(string, '$') || CHECK(string, ',')
+                || CHECK(string, '_') || CHECK(string, '.')
+                || CHECK(string, '~') || CHECK(string, '*')
+                || CHECK(string, '\'') || CHECK(string, '(')
+                || CHECK(string, ')') || CHECK(string, '[')
+                || CHECK(string, ']')) {
+            if (!WRITE(emitter, string)) return 0;
+        }
+        else {
+            int width = WIDTH(string);
+            unsigned int value;
+            while (width --) {
+                value = *(string.pointer++);
+                if (!PUT(emitter, '%')) return 0;
+                if (!PUT(emitter, (value >> 4)
+                            + ((value >> 4) < 10 ? '0' : 'A' - 10)))
+                    return 0;
+                if (!PUT(emitter, (value & 0x0F)
+                            + ((value & 0x0F) < 10 ? '0' : 'A' - 10)))
+                    return 0;
+            }
+        }
+    }
+
+    emitter->whitespace = 0;
+    emitter->indention = 0;
+
+    return 1;
+}
+
+static int
+yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length, int allow_breaks)
+{
+    yaml_string_t string;
+    int spaces = 0;
+    int breaks = 0;
+
+    STRING_ASSIGN(string, value, length);
+
+    if (!emitter->whitespace) {
+        if (!PUT(emitter, ' ')) return 0;
+    }
+
+    while (string.pointer != string.end)
+    {
+        if (IS_SPACE(string))
+        {
+            if (allow_breaks && !spaces
+                    && emitter->column > emitter->best_width
+                    && !IS_SPACE_AT(string, 1)) {
+                if (!yaml_emitter_write_indent(emitter)) return 0;
+                MOVE(string);
+            }
+            else {
+                if (!WRITE(emitter, string)) return 0;
+            }
+            spaces = 1;
+        }
+        else if (IS_BREAK(string))
+        {
+            if (!breaks && CHECK(string, '\n')) {
+                if (!PUT_BREAK(emitter)) return 0;
+            }
+            if (!WRITE_BREAK(emitter, string)) return 0;
+            emitter->indention = 1;
+            breaks = 1;
+        }
+        else
+        {
+            if (breaks) {
+                if (!yaml_emitter_write_indent(emitter)) return 0;
+            }
+            if (!WRITE(emitter, string)) return 0;
+            emitter->indention = 0;
+            spaces = 0;
+            breaks = 0;
+        }
+    }
+
+    emitter->whitespace = 0;
+    emitter->indention = 0;
+
+    return 1;
+}
+
+static int
+yaml_emitter_write_single_quoted_scalar(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length, int allow_breaks)
+{
+    yaml_string_t string;
+    int spaces = 0;
+    int breaks = 0;
+
+    STRING_ASSIGN(string, value, length);
+
+    if (!yaml_emitter_write_indicator(emitter, "'", 1, 0, 0))
+        return 0;
+
+    while (string.pointer != string.end)
+    {
+        if (IS_SPACE(string))
+        {
+            if (allow_breaks && !spaces
+                    && emitter->column > emitter->best_width
+                    && string.pointer != string.start
+                    && string.pointer != string.end - 1
+                    && !IS_SPACE_AT(string, 1)) {
+                if (!yaml_emitter_write_indent(emitter)) return 0;
+                MOVE(string);
+            }
+            else {
+                if (!WRITE(emitter, string)) return 0;
+            }
+            spaces = 1;
+        }
+        else if (IS_BREAK(string))
+        {
+            if (!breaks && CHECK(string, '\n')) {
+                if (!PUT_BREAK(emitter)) return 0;
+            }
+            if (!WRITE_BREAK(emitter, string)) return 0;
+            emitter->indention = 1;
+            breaks = 1;
+        }
+        else
+        {
+            if (breaks) {
+                if (!yaml_emitter_write_indent(emitter)) return 0;
+            }
+            if (CHECK(string, '\'')) {
+                if (!PUT(emitter, '\'')) return 0;
+            }
+            if (!WRITE(emitter, string)) return 0;
+            emitter->indention = 0;
+            spaces = 0;
+            breaks = 0;
+        }
+    }
+
+    if (!yaml_emitter_write_indicator(emitter, "'", 0, 0, 0))
+        return 0;
+
+    emitter->whitespace = 0;
+    emitter->indention = 0;
+
+    return 1;
+}
+
+static int
+yaml_emitter_write_double_quoted_scalar(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length, int allow_breaks)
+{
+    yaml_string_t string;
+    int spaces = 0;
+
+    STRING_ASSIGN(string, value, length);
+
+    if (!yaml_emitter_write_indicator(emitter, "\"", 1, 0, 0))
+        return 0;
+
+    while (string.pointer != string.end)
+    {
+        if (!IS_PRINTABLE(string) || (!emitter->unicode && !IS_ASCII(string))
+                || IS_BOM(string) || IS_BREAK(string)
+                || CHECK(string, '"') || CHECK(string, '\\'))
+        {
+            unsigned char octet;
+            unsigned int width;
+            unsigned int value;
+            int k;
+
+            octet = string.pointer[0];
+            width = (octet & 0x80) == 0x00 ? 1 :
+                    (octet & 0xE0) == 0xC0 ? 2 :
+                    (octet & 0xF0) == 0xE0 ? 3 :
+                    (octet & 0xF8) == 0xF0 ? 4 : 0;
+            value = (octet & 0x80) == 0x00 ? octet & 0x7F :
+                    (octet & 0xE0) == 0xC0 ? octet & 0x1F :
+                    (octet & 0xF0) == 0xE0 ? octet & 0x0F :
+                    (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
+            for (k = 1; k < (int)width; k ++) {
+                octet = string.pointer[k];
+                value = (value << 6) + (octet & 0x3F);
+            }
+            string.pointer += width;
+
+            if (!PUT(emitter, '\\')) return 0;
+
+            switch (value)
+            {
+                case 0x00:
+                    if (!PUT(emitter, '0')) return 0;
+                    break;
+
+                case 0x07:
+                    if (!PUT(emitter, 'a')) return 0;
+                    break;
+
+                case 0x08:
+                    if (!PUT(emitter, 'b')) return 0;
+                    break;
+
+                case 0x09:
+                    if (!PUT(emitter, 't')) return 0;
+                    break;
+
+                case 0x0A:
+                    if (!PUT(emitter, 'n')) return 0;
+                    break;
+
+                case 0x0B:
+                    if (!PUT(emitter, 'v')) return 0;
+                    break;
+
+                case 0x0C:
+                    if (!PUT(emitter, 'f')) return 0;
+                    break;
+
+                case 0x0D:
+                    if (!PUT(emitter, 'r')) return 0;
+                    break;
+
+                case 0x1B:
+                    if (!PUT(emitter, 'e')) return 0;
+                    break;
+
+                case 0x22:
+                    if (!PUT(emitter, '\"')) return 0;
+                    break;
+
+                case 0x5C:
+                    if (!PUT(emitter, '\\')) return 0;
+                    break;
+
+                case 0x85:
+                    if (!PUT(emitter, 'N')) return 0;
+                    break;
+
+                case 0xA0:
+                    if (!PUT(emitter, '_')) return 0;
+                    break;
+
+                case 0x2028:
+                    if (!PUT(emitter, 'L')) return 0;
+                    break;
+
+                case 0x2029:
+                    if (!PUT(emitter, 'P')) return 0;
+                    break;
+
+                default:
+                    if (value <= 0xFF) {
+                        if (!PUT(emitter, 'x')) return 0;
+                        width = 2;
+                    }
+                    else if (value <= 0xFFFF) {
+                        if (!PUT(emitter, 'u')) return 0;
+                        width = 4;
+                    }
+                    else {
+                        if (!PUT(emitter, 'U')) return 0;
+                        width = 8;
+                    }
+                    for (k = (width-1)*4; k >= 0; k -= 4) {
+                        int digit = (value >> k) & 0x0F;
+                        if (!PUT(emitter, digit + (digit < 10 ? '0' : 'A'-10)))
+                            return 0;
+                    }
+            }
+            spaces = 0;
+        }
+        else if (IS_SPACE(string))
+        {
+            if (allow_breaks && !spaces
+                    && emitter->column > emitter->best_width
+                    && string.pointer != string.start
+                    && string.pointer != string.end - 1) {
+                if (!yaml_emitter_write_indent(emitter)) return 0;
+                if (IS_SPACE_AT(string, 1)) {
+                    if (!PUT(emitter, '\\')) return 0;
+                }
+                MOVE(string);
+            }
+            else {
+                if (!WRITE(emitter, string)) return 0;
+            }
+            spaces = 1;
+        }
+        else
+        {
+            if (!WRITE(emitter, string)) return 0;
+            spaces = 0;
+        }
+    }
+
+    if (!yaml_emitter_write_indicator(emitter, "\"", 0, 0, 0))
+        return 0;
+
+    emitter->whitespace = 0;
+    emitter->indention = 0;
+
+    return 1;
+}
+
+static int
+yaml_emitter_write_block_scalar_hints(yaml_emitter_t *emitter,
+        yaml_string_t string)
+{
+    char indent_hint[2];
+    const char *chomp_hint = NULL;
+
+    if (IS_SPACE(string) || IS_BREAK(string))
+    {
+        indent_hint[0] = '0' + (char)emitter->best_indent;
+        indent_hint[1] = '\0';
+        if (!yaml_emitter_write_indicator(emitter, indent_hint, 0, 0, 0))
+            return 0;
+    }
+
+    emitter->open_ended = 0;
+
+    string.pointer = string.end;
+    if (string.start == string.pointer)
+    {
+        chomp_hint = "-";
+    }
+    else
+    {
+        do {
+            string.pointer --;
+        } while ((*string.pointer & 0xC0) == 0x80);
+        if (!IS_BREAK(string))
+        {
+            chomp_hint = "-";
+        }
+        else if (string.start == string.pointer)
+        {
+            chomp_hint = "+";
+            emitter->open_ended = 1;
+        }
+        else
+        {
+            do {
+                string.pointer --;
+            } while ((*string.pointer & 0xC0) == 0x80);
+            if (IS_BREAK(string))
+            {
+                chomp_hint = "+";
+                emitter->open_ended = 1;
+            }
+        }
+    }
+
+    if (chomp_hint)
+    {
+        if (!yaml_emitter_write_indicator(emitter, chomp_hint, 0, 0, 0))
+            return 0;
+    }
+
+    return 1;
+}
+
+static int
+yaml_emitter_write_literal_scalar(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length)
+{
+    yaml_string_t string;
+    int breaks = 1;
+
+    STRING_ASSIGN(string, value, length);
+
+    if (!yaml_emitter_write_indicator(emitter, "|", 1, 0, 0))
+        return 0;
+    if (!yaml_emitter_write_block_scalar_hints(emitter, string))
+        return 0;
+    if (!PUT_BREAK(emitter)) return 0;
+    emitter->indention = 1;
+    emitter->whitespace = 1;
+
+    while (string.pointer != string.end)
+    {
+        if (IS_BREAK(string))
+        {
+            if (!WRITE_BREAK(emitter, string)) return 0;
+            emitter->indention = 1;
+            breaks = 1;
+        }
+        else
+        {
+            if (breaks) {
+                if (!yaml_emitter_write_indent(emitter)) return 0;
+            }
+            if (!WRITE(emitter, string)) return 0;
+            emitter->indention = 0;
+            breaks = 0;
+        }
+    }
+
+    return 1;
+}
+
+static int
+yaml_emitter_write_folded_scalar(yaml_emitter_t *emitter,
+        yaml_char_t *value, size_t length)
+{
+    yaml_string_t string;
+    int breaks = 1;
+    int leading_spaces = 1;
+
+    STRING_ASSIGN(string, value, length);
+
+    if (!yaml_emitter_write_indicator(emitter, ">", 1, 0, 0))
+        return 0;
+    if (!yaml_emitter_write_block_scalar_hints(emitter, string))
+        return 0;
+    if (!PUT_BREAK(emitter)) return 0;
+    emitter->indention = 1;
+    emitter->whitespace = 1;
+
+    while (string.pointer != string.end)
+    {
+        if (IS_BREAK(string))
+        {
+            if (!breaks && !leading_spaces && CHECK(string, '\n')) {
+                int k = 0;
+                while (IS_BREAK_AT(string, k)) {
+                    k += WIDTH_AT(string, k);
+                }
+                if (!IS_BLANKZ_AT(string, k)) {
+                    if (!PUT_BREAK(emitter)) return 0;
+                }
+            }
+            if (!WRITE_BREAK(emitter, string)) return 0;
+            emitter->indention = 1;
+            breaks = 1;
+        }
+        else
+        {
+            if (breaks) {
+                if (!yaml_emitter_write_indent(emitter)) return 0;
+                leading_spaces = IS_BLANK(string);
+            }
+            if (!breaks && IS_SPACE(string) && !IS_SPACE_AT(string, 1)
+                    && emitter->column > emitter->best_width) {
+                if (!yaml_emitter_write_indent(emitter)) return 0;
+                MOVE(string);
+            }
+            else {
+                if (!WRITE(emitter, string)) return 0;
+            }
+            emitter->indention = 0;
+            breaks = 0;
+        }
+    }
+
+    return 1;
+}
diff --git a/ext/psych/yaml/loader.c b/ext/psych/yaml/loader.c
new file mode 100644
index 0000000000..e5d90be9bc
--- /dev/null
+++ b/ext/psych/yaml/loader.c
@@ -0,0 +1,444 @@
+
+#include "yaml_private.h"
+
+/*
+ * API functions.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document);
+
+/*
+ * Error handling.
+ */
+
+static int
+yaml_parser_set_composer_error(yaml_parser_t *parser,
+        const char *problem, yaml_mark_t problem_mark);
+
+static int
+yaml_parser_set_composer_error_context(yaml_parser_t *parser,
+        const char *context, yaml_mark_t context_mark,
+        const char *problem, yaml_mark_t problem_mark);
+
+
+/*
+ * Alias handling.
+ */
+
+static int
+yaml_parser_register_anchor(yaml_parser_t *parser,
+        int index, yaml_char_t *anchor);
+
+/*
+ * Clean up functions.
+ */
+
+static void
+yaml_parser_delete_aliases(yaml_parser_t *parser);
+
+/*
+ * Composer functions.
+ */
+
+static int
+yaml_parser_load_document(yaml_parser_t *parser, yaml_event_t *first_event);
+
+static int
+yaml_parser_load_node(yaml_parser_t *parser, yaml_event_t *first_event);
+
+static int
+yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *first_event);
+
+static int
+yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event);
+
+static int
+yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event);
+
+static int
+yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event);
+
+/*
+ * Load the next document of the stream.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document)
+{
+    yaml_event_t event;
+
+    assert(parser);     /* Non-NULL parser object is expected. */
+    assert(document);   /* Non-NULL document object is expected. */
+
+    memset(document, 0, sizeof(yaml_document_t));
+    if (!STACK_INIT(parser, document->nodes, yaml_node_t*))
+        goto error;
+
+    if (!parser->stream_start_produced) {
+        if (!yaml_parser_parse(parser, &event)) goto error;
+        assert(event.type == YAML_STREAM_START_EVENT);
+                        /* STREAM-START is expected. */
+    }
+
+    if (parser->stream_end_produced) {
+        return 1;
+    }
+
+    if (!yaml_parser_parse(parser, &event)) goto error;
+    if (event.type == YAML_STREAM_END_EVENT) {
+        return 1;
+    }
+
+    if (!STACK_INIT(parser, parser->aliases, yaml_alias_data_t*))
+        goto error;
+
+    parser->document = document;
+
+    if (!yaml_parser_load_document(parser, &event)) goto error;
+
+    yaml_parser_delete_aliases(parser);
+    parser->document = NULL;
+
+    return 1;
+
+error:
+
+    yaml_parser_delete_aliases(parser);
+    yaml_document_delete(document);
+    parser->document = NULL;
+
+    return 0;
+}
+
+/*
+ * Set composer error.
+ */
+
+static int
+yaml_parser_set_composer_error(yaml_parser_t *parser,
+        const char *problem, yaml_mark_t problem_mark)
+{
+    parser->error = YAML_COMPOSER_ERROR;
+    parser->problem = problem;
+    parser->problem_mark = problem_mark;
+
+    return 0;
+}
+
+/*
+ * Set composer error with context.
+ */
+
+static int
+yaml_parser_set_composer_error_context(yaml_parser_t *parser,
+        const char *context, yaml_mark_t context_mark,
+        const char *problem, yaml_mark_t problem_mark)
+{
+    parser->error = YAML_COMPOSER_ERROR;
+    parser->context = context;
+    parser->context_mark = context_mark;
+    parser->problem = problem;
+    parser->problem_mark = problem_mark;
+
+    return 0;
+}
+
+/*
+ * Delete the stack of aliases.
+ */
+
+static void
+yaml_parser_delete_aliases(yaml_parser_t *parser)
+{
+    while (!STACK_EMPTY(parser, parser->aliases)) {
+        yaml_free(POP(parser, parser->aliases).anchor);
+    }
+    STACK_DEL(parser, parser->aliases);
+}
+
+/*
+ * Compose a document object.
+ */
+
+static int
+yaml_parser_load_document(yaml_parser_t *parser, yaml_event_t *first_event)
+{
+    yaml_event_t event;
+
+    assert(first_event->type == YAML_DOCUMENT_START_EVENT);
+                        /* DOCUMENT-START is expected. */
+
+    parser->document->version_directive
+        = first_event->data.document_start.version_directive;
+    parser->document->tag_directives.start
+        = first_event->data.document_start.tag_directives.start;
+    parser->document->tag_directives.end
+        = first_event->data.document_start.tag_directives.end;
+    parser->document->start_implicit
+        = first_event->data.document_start.implicit;
+    parser->document->start_mark = first_event->start_mark;
+
+    if (!yaml_parser_parse(parser, &event)) return 0;
+
+    if (!yaml_parser_load_node(parser, &event)) return 0;
+
+    if (!yaml_parser_parse(parser, &event)) return 0;
+    assert(event.type == YAML_DOCUMENT_END_EVENT);
+                        /* DOCUMENT-END is expected. */
+
+    parser->document->end_implicit = event.data.document_end.implicit;
+    parser->document->end_mark = event.end_mark;
+
+    return 1;
+}
+
+/*
+ * Compose a node.
+ */
+
+static int
+yaml_parser_load_node(yaml_parser_t *parser, yaml_event_t *first_event)
+{
+    switch (first_event->type) {
+        case YAML_ALIAS_EVENT:
+            return yaml_parser_load_alias(parser, first_event);
+        case YAML_SCALAR_EVENT:
+            return yaml_parser_load_scalar(parser, first_event);
+        case YAML_SEQUENCE_START_EVENT:
+            return yaml_parser_load_sequence(parser, first_event);
+        case YAML_MAPPING_START_EVENT:
+            return yaml_parser_load_mapping(parser, first_event);
+        default:
+            assert(0);  /* Could not happen. */
+            return 0;
+    }
+
+    return 0;
+}
+
+/*
+ * Add an anchor.
+ */
+
+static int
+yaml_parser_register_anchor(yaml_parser_t *parser,
+        int index, yaml_char_t *anchor)
+{
+    yaml_alias_data_t data;
+    yaml_alias_data_t *alias_data;
+
+    if (!anchor) return 1;
+
+    data.anchor = anchor;
+    data.index = index;
+    data.mark = parser->document->nodes.start[index-1].start_mark;
+
+    for (alias_data = parser->aliases.start;
+            alias_data != parser->aliases.top; alias_data ++) {
+        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);
+        }
+    }
+
+    if (!PUSH(parser, parser->aliases, data)) {
+        yaml_free(anchor);
+        return 0;
+    }
+
+    return 1;
+}
+
+/*
+ * Compose a node corresponding to an alias.
+ */
+
+static int
+yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *first_event)
+{
+    yaml_char_t *anchor = first_event->data.alias.anchor;
+    yaml_alias_data_t *alias_data;
+
+    for (alias_data = parser->aliases.start;
+            alias_data != parser->aliases.top; alias_data ++) {
+        if (strcmp((char *)alias_data->anchor, (char *)anchor) == 0) {
+            yaml_free(anchor);
+            return alias_data->index;
+        }
+    }
+
+    yaml_free(anchor);
+    return yaml_parser_set_composer_error(parser, "found undefined alias",
+            first_event->start_mark);
+}
+
+/*
+ * Compose a scalar node.
+ */
+
+static int
+yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event)
+{
+    yaml_node_t node;
+    int index;
+    yaml_char_t *tag = first_event->data.scalar.tag;
+
+    if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
+
+    if (!tag || strcmp((char *)tag, "!") == 0) {
+        yaml_free(tag);
+        tag = yaml_strdup((yaml_char_t *)YAML_DEFAULT_SCALAR_TAG);
+        if (!tag) goto error;
+    }
+
+    SCALAR_NODE_INIT(node, tag, first_event->data.scalar.value,
+            first_event->data.scalar.length, first_event->data.scalar.style,
+            first_event->start_mark, first_event->end_mark);
+
+    if (!PUSH(parser, parser->document->nodes, node)) goto error;
+
+    index = (int)(parser->document->nodes.top - parser->document->nodes.start);
+
+    if (!yaml_parser_register_anchor(parser, index,
+                first_event->data.scalar.anchor)) return 0;
+
+    return index;
+
+error:
+    yaml_free(tag);
+    yaml_free(first_event->data.scalar.anchor);
+    yaml_free(first_event->data.scalar.value);
+    return 0;
+}
+
+/*
+ * Compose a sequence node.
+ */
+
+static int
+yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
+{
+    yaml_event_t event;
+    yaml_node_t node;
+    struct {
+        yaml_node_item_t *start;
+        yaml_node_item_t *end;
+        yaml_node_item_t *top;
+    } items = { NULL, NULL, NULL };
+    int index, item_index;
+    yaml_char_t *tag = first_event->data.sequence_start.tag;
+
+    if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
+
+    if (!tag || strcmp((char *)tag, "!") == 0) {
+        yaml_free(tag);
+        tag = yaml_strdup((yaml_char_t *)YAML_DEFAULT_SEQUENCE_TAG);
+        if (!tag) goto error;
+    }
+
+    if (!STACK_INIT(parser, items, yaml_node_item_t*)) goto error;
+
+    SEQUENCE_NODE_INIT(node, tag, items.start, items.end,
+            first_event->data.sequence_start.style,
+            first_event->start_mark, first_event->end_mark);
+
+    if (!PUSH(parser, parser->document->nodes, node)) goto error;
+
+    index = (int)(parser->document->nodes.top - parser->document->nodes.start);
+
+    if (!yaml_parser_register_anchor(parser, index,
+                first_event->data.sequence_start.anchor)) return 0;
+
+    if (!yaml_parser_parse(parser, &event)) return 0;
+
+    while (event.type != YAML_SEQUENCE_END_EVENT) {
+        if (!STACK_LIMIT(parser,
+                    parser->document->nodes.start[index-1].data.sequence.items,
+                    INT_MAX-1)) return 0;
+        item_index = yaml_parser_load_node(parser, &event);
+        if (!item_index) return 0;
+        if (!PUSH(parser,
+                    parser->document->nodes.start[index-1].data.sequence.items,
+                    item_index)) return 0;
+        if (!yaml_parser_parse(parser, &event)) return 0;
+    }
+
+    parser->document->nodes.start[index-1].end_mark = event.end_mark;
+
+    return index;
+
+error:
+    yaml_free(tag);
+    yaml_free(first_event->data.sequence_start.anchor);
+    return 0;
+}
+
+/*
+ * Compose a mapping node.
+ */
+
+static int
+yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
+{
+    yaml_event_t event;
+    yaml_node_t node;
+    struct {
+        yaml_node_pair_t *start;
+        yaml_node_pair_t *end;
+        yaml_node_pair_t *top;
+    } pairs = { NULL, NULL, NULL };
+    int index;
+    yaml_node_pair_t pair;
+    yaml_char_t *tag = first_event->data.mapping_start.tag;
+
+    if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
+
+    if (!tag || strcmp((char *)tag, "!") == 0) {
+        yaml_free(tag);
+        tag = yaml_strdup((yaml_char_t *)YAML_DEFAULT_MAPPING_TAG);
+        if (!tag) goto error;
+    }
+
+    if (!STACK_INIT(parser, pairs, yaml_node_pair_t*)) goto error;
+
+    MAPPING_NODE_INIT(node, tag, pairs.start, pairs.end,
+            first_event->data.mapping_start.style,
+            first_event->start_mark, first_event->end_mark);
+
+    if (!PUSH(parser, parser->document->nodes, node)) goto error;
+
+    index = (int)(parser->document->nodes.top - parser->document->nodes.start);
+
+    if (!yaml_parser_register_anchor(parser, index,
+                first_event->data.mapping_start.anchor)) return 0;
+
+    if (!yaml_parser_parse(parser, &event)) return 0;
+
+    while (event.type != YAML_MAPPING_END_EVENT) {
+        if (!STACK_LIMIT(parser,
+                    parser->document->nodes.start[index-1].data.mapping.pairs,
+                    INT_MAX-1)) return 0;
+        pair.key = yaml_parser_load_node(parser, &event);
+        if (!pair.key) return 0;
+        if (!yaml_parser_parse(parser, &event)) return 0;
+        pair.value = yaml_parser_load_node(parser, &event);
+        if (!pair.value) return 0;
+        if (!PUSH(parser,
+                    parser->document->nodes.start[index-1].data.mapping.pairs,
+                    pair)) return 0;
+        if (!yaml_parser_parse(parser, &event)) return 0;
+    }
+
+    parser->document->nodes.start[index-1].end_mark = event.end_mark;
+
+    return index;
+
+error:
+    yaml_free(tag);
+    yaml_free(first_event->data.mapping_start.anchor);
+    return 0;
+}
+
diff --git a/ext/psych/yaml/parser.c b/ext/psych/yaml/parser.c
new file mode 100644
index 0000000000..621f676bf2
--- /dev/null
+++ b/ext/psych/yaml/parser.c
@@ -0,0 +1,1370 @@
+
+/*
+ * The parser implements the following grammar:
+ *
+ * stream               ::= STREAM-START implicit_document? explicit_document* STREAM-END
+ * implicit_document    ::= block_node DOCUMENT-END*
+ * explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
+ * block_node_or_indentless_sequence    ::=
+ *                          ALIAS
+ *                          | properties (block_content | indentless_block_sequence)?
+ *                          | block_content
+ *                          | indentless_block_sequence
+ * block_node           ::= ALIAS
+ *                          | properties block_content?
+ *                          | block_content
+ * flow_node            ::= ALIAS
+ *                          | properties flow_content?
+ *                          | flow_content
+ * properties           ::= TAG ANCHOR? | ANCHOR TAG?
+ * block_content        ::= block_collection | flow_collection | SCALAR
+ * flow_content         ::= flow_collection | SCALAR
+ * block_collection     ::= block_sequence | block_mapping
+ * flow_collection      ::= flow_sequence | flow_mapping
+ * block_sequence       ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
+ * indentless_sequence  ::= (BLOCK-ENTRY block_node?)+
+ * block_mapping        ::= BLOCK-MAPPING_START
+ *                          ((KEY block_node_or_indentless_sequence?)?
+ *                          (VALUE block_node_or_indentless_sequence?)?)*
+ *                          BLOCK-END
+ * flow_sequence        ::= FLOW-SEQUENCE-START
+ *                          (flow_sequence_entry FLOW-ENTRY)*
+ *                          flow_sequence_entry?
+ *                          FLOW-SEQUENCE-END
+ * flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+ * flow_mapping         ::= FLOW-MAPPING-START
+ *                          (flow_mapping_entry FLOW-ENTRY)*
+ *                          flow_mapping_entry?
+ *                          FLOW-MAPPING-END
+ * flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+ */
+
+#include "yaml_private.h"
+
+/*
+ * Peek the next token in the token queue.
+ */
+
+#define PEEK_TOKEN(parser)                                                      \
+    ((parser->token_available || yaml_parser_fetch_more_tokens(parser)) ?       \
+        parser->tokens.head : NULL)
+
+/*
+ * Remove the next token from the queue (must be called after PEEK_TOKEN).
+ */
+
+#define SKIP_TOKEN(parser)                                                      \
+    (parser->token_available = 0,                                               \
+     parser->tokens_parsed ++,                                                  \
+     parser->stream_end_produced =                                              \
+        (parser->tokens.head->type == YAML_STREAM_END_TOKEN),                   \
+     parser->tokens.head ++)
+
+/*
+ * Public API declarations.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_parse(yaml_parser_t *parser, yaml_event_t *event);
+
+/*
+ * Error handling.
+ */
+
+static int
+yaml_parser_set_parser_error(yaml_parser_t *parser,
+        const char *problem, yaml_mark_t problem_mark);
+
+static int
+yaml_parser_set_parser_error_context(yaml_parser_t *parser,
+        const char *context, yaml_mark_t context_mark,
+        const char *problem, yaml_mark_t problem_mark);
+
+/*
+ * State functions.
+ */
+
+static int
+yaml_parser_state_machine(yaml_parser_t *parser, yaml_event_t *event);
+
+static int
+yaml_parser_parse_stream_start(yaml_parser_t *parser, yaml_event_t *event);
+
+static int
+yaml_parser_parse_document_start(yaml_parser_t *parser, yaml_event_t *event,
+        int implicit);
+
+static int
+yaml_parser_parse_document_content(yaml_parser_t *parser, yaml_event_t *event);
+
+static int
+yaml_parser_parse_document_end(yaml_parser_t *parser, yaml_event_t *event);
+
+static int
+yaml_parser_parse_node(yaml_parser_t *parser, yaml_event_t *event,
+        int block, int indentless_sequence);
+
+static int
+yaml_parser_parse_block_sequence_entry(yaml_parser_t *parser,
+        yaml_event_t *event, int first);
+
+static int
+yaml_parser_parse_indentless_sequence_entry(yaml_parser_t *parser,
+        yaml_event_t *event);
+
+static int
+yaml_parser_parse_block_mapping_key(yaml_parser_t *parser,
+        yaml_event_t *event, int first);
+
+static int
+yaml_parser_parse_block_mapping_value(yaml_parser_t *parser,
+        yaml_event_t *event);
+
+static int
+yaml_parser_parse_flow_sequence_entry(yaml_parser_t *parser,
+        yaml_event_t *event, int first);
+
+static int
+yaml_parser_parse_flow_sequence_entry_mapping_key(yaml_parser_t *parser,
+        yaml_event_t *event);
+
+static int
+yaml_parser_parse_flow_sequence_entry_mapping_value(yaml_parser_t *parser,
+        yaml_event_t *event);
+
+static int
+yaml_parser_parse_flow_sequence_entry_mapping_end(yaml_parser_t *parser,
+        yaml_event_t *event);
+
+static int
+yaml_parser_parse_flow_mapping_key(yaml_parser_t *parser,
+        yaml_event_t *event, int first);
+
+static int
+yaml_parser_parse_flow_mapping_value(yaml_parser_t *parser,
+        yaml_event_t *event, int empty);
+
+/*
+ * Utility functions.
+ */
+
+static int
+yaml_parser_process_empty_scalar(yaml_parser_t *parser,
+        yaml_event_t *event, yaml_mark_t mark);
+
+static int
+yaml_parser_process_directives(yaml_parser_t *parser,
+        yaml_version_directive_t **version_directive_ref,
+        yaml_tag_directive_t **tag_directives_start_ref,
+        yaml_tag_directive_t **tag_directives_end_ref);
+
+static int
+yaml_parser_append_tag_directive(yaml_parser_t *parser,
+        yaml_tag_directive_t value, int allow_duplicates, yaml_mark_t mark);
+
+/*
+ * Get the next event.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_parse(yaml_parser_t *parser, yaml_event_t *event)
+{
+    assert(parser);     /* Non-NULL parser object is expected. */
+    assert(event);      /* Non-NULL event object is expected. */
+
+    /* Erase the event object. */
+
+    memset(event, 0, sizeof(yaml_event_t));
+
+    /* No events after the end of the stream or error. */
+
+    if (parser->stream_end_produced || parser->error ||
+            parser->state == YAML_PARSE_END_STATE) {
+        return 1;
+    }
+
+    /* Generate the next event. */
+
+    return yaml_parser_state_machine(parser, event);
+}
+
+/*
+ * Set parser error.
+ */
+
+static int
+yaml_parser_set_parser_error(yaml_parser_t *parser,
+        const char *problem, yaml_mark_t problem_mark)
+{
+    parser->error = YAML_PARSER_ERROR;
+    parser->problem = problem;
+    parser->problem_mark = problem_mark;
+
+    return 0;
+}
+
+static int
+yaml_parser_set_parser_error_context(yaml_parser_t *parser,
+        const char *context, yaml_mark_t context_mark,
+        const char *problem, yaml_mark_t problem_mark)
+{
+    parser->error = YAML_PARSER_ERROR;
+    parser->context = context;
+    parser->context_mark = context_mark;
+    parser->problem = problem;
+    parser->problem_mark = problem_mark;
+
+    return 0;
+}
+
+
+/*
+ * State dispatcher.
+ */
+
+static int
+yaml_parser_state_machine(yaml_parser_t *parser, yaml_event_t *event)
+{
+    switch (parser->state)
+    {
+        case YAML_PARSE_STREAM_START_STATE:
+            return yaml_parser_parse_stream_start(parser, event);
+
+        case YAML_PARSE_IMPLICIT_DOCUMENT_START_STATE:
+            return yaml_parser_parse_document_start(parser, event, 1);
+
+        case YAML_PARSE_DOCUMENT_START_STATE:
+            return yaml_parser_parse_document_start(parser, event, 0);
+
+        case YAML_PARSE_DOCUMENT_CONTENT_STATE:
+            return yaml_parser_parse_document_content(parser, event);
+
+        case YAML_PARSE_DOCUMENT_END_STATE:
+            return yaml_parser_parse_document_end(parser, event);
+
+        case YAML_PARSE_BLOCK_NODE_STATE:
+            return yaml_parser_parse_node(parser, event, 1, 0);
+
+        case YAML_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE:
+            return yaml_parser_parse_node(parser, event, 1, 1);
+
+        case YAML_PARSE_FLOW_NODE_STATE:
+            return yaml_parser_parse_node(parser, event, 0, 0);
+
+        case YAML_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE:
+            return yaml_parser_parse_block_sequence_entry(parser, event, 1);
+
+        case YAML_PARSE_BLOCK_SEQUENCE_ENTRY_STATE:
+            return yaml_parser_parse_block_sequence_entry(parser, event, 0);
+
+        case YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE:
+            return yaml_parser_parse_indentless_sequence_entry(parser, event);
+
+        case YAML_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE:
+            return yaml_parser_parse_block_mapping_key(parser, event, 1);
+
+        case YAML_PARSE_BLOCK_MAPPING_KEY_STATE:
+            return yaml_parser_parse_block_mapping_key(parser, event, 0);
+
+        case YAML_PARSE_BLOCK_MAPPING_VALUE_STATE:
+            return yaml_parser_parse_block_mapping_value(parser, event);
+
+        case YAML_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE:
+            return yaml_parser_parse_flow_sequence_entry(parser, event, 1);
+
+        case YAML_PARSE_FLOW_SEQUENCE_ENTRY_STATE:
+            return yaml_parser_parse_flow_sequence_entry(parser, event, 0);
+
+        case YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE:
+            return yaml_parser_parse_flow_sequence_entry_mapping_key(parser, event);
+
+        case YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE:
+            return yaml_parser_parse_flow_sequence_entry_mapping_value(parser, event);
+
+        case YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE:
+            return yaml_parser_parse_flow_sequence_entry_mapping_end(parser, event);
+
+        case YAML_PARSE_FLOW_MAPPING_FIRST_KEY_STATE:
+            return yaml_parser_parse_flow_mapping_key(parser, event, 1);
+
+        case YAML_PARSE_FLOW_MAPPING_KEY_STATE:
+            return yaml_parser_parse_flow_mapping_key(parser, event, 0);
+
+        case YAML_PARSE_FLOW_MAPPING_VALUE_STATE:
+            return yaml_parser_parse_flow_mapping_value(parser, event, 0);
+
+        case YAML_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE:
+            return yaml_parser_parse_flow_mapping_value(parser, event, 1);
+
+        default:
+            assert(1);      /* Invalid state. */
+    }
+
+    return 0;
+}
+
+/*
+ * Parse the production:
+ * stream   ::= STREAM-START implicit_document? explicit_document* STREAM-END
+ *              ************
+ */
+
+static int
+yaml_parser_parse_stream_start(yaml_parser_t *parser, yaml_event_t *event)
+{
+    yaml_token_t *token;
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    if (token->type != YAML_STREAM_START_TOKEN) {
+        return yaml_parser_set_parser_error(parser,
+                "did not find expected <stream-start>", token->start_mark);
+    }
+
+    parser->state = YAML_PARSE_IMPLICIT_DOCUMENT_START_STATE;
+    STREAM_START_EVENT_INIT(*event, token->data.stream_start.encoding,
+            token->start_mark, token->start_mark);
+    SKIP_TOKEN(parser);
+
+    return 1;
+}
+
+/*
+ * Parse the productions:
+ * implicit_document    ::= block_node DOCUMENT-END*
+ *                          *
+ * explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
+ *                          *************************
+ */
+
+static int
+yaml_parser_parse_document_start(yaml_parser_t *parser, yaml_event_t *event,
+        int implicit)
+{
+    yaml_token_t *token;
+    yaml_version_directive_t *version_directive = NULL;
+    struct {
+        yaml_tag_directive_t *start;
+        yaml_tag_directive_t *end;
+    } tag_directives = { NULL, NULL };
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    /* Parse extra document end indicators. */
+
+    if (!implicit)
+    {
+        while (token->type == YAML_DOCUMENT_END_TOKEN) {
+            SKIP_TOKEN(parser);
+            token = PEEK_TOKEN(parser);
+            if (!token) return 0;
+        }
+    }
+
+    /* Parse an implicit document. */
+
+    if (implicit && token->type != YAML_VERSION_DIRECTIVE_TOKEN &&
+            token->type != YAML_TAG_DIRECTIVE_TOKEN &&
+            token->type != YAML_DOCUMENT_START_TOKEN &&
+            token->type != YAML_STREAM_END_TOKEN)
+    {
+        if (!yaml_parser_process_directives(parser, NULL, NULL, NULL))
+            return 0;
+        if (!PUSH(parser, parser->states, YAML_PARSE_DOCUMENT_END_STATE))
+            return 0;
+        parser->state = YAML_PARSE_BLOCK_NODE_STATE;
+        DOCUMENT_START_EVENT_INIT(*event, NULL, NULL, NULL, 1,
+                token->start_mark, token->start_mark);
+        return 1;
+    }
+
+    /* Parse an explicit document. */
+
+    else if (token->type != YAML_STREAM_END_TOKEN)
+    {
+        yaml_mark_t start_mark, end_mark;
+        start_mark = token->start_mark;
+        if (!yaml_parser_process_directives(parser, &version_directive,
+                    &tag_directives.start, &tag_directives.end))
+            return 0;
+        token = PEEK_TOKEN(parser);
+        if (!token) goto error;
+        if (token->type != YAML_DOCUMENT_START_TOKEN) {
+            yaml_parser_set_parser_error(parser,
+                    "did not find expected <document start>", token->start_mark);
+            goto error;
+        }
+        if (!PUSH(parser, parser->states, YAML_PARSE_DOCUMENT_END_STATE))
+            goto error;
+        parser->state = YAML_PARSE_DOCUMENT_CONTENT_STATE;
+        end_mark = token->end_mark;
+        DOCUMENT_START_EVENT_INIT(*event, version_directive,
+                tag_directives.start, tag_directives.end, 0,
+                start_mark, end_mark);
+        SKIP_TOKEN(parser);
+        version_directive = NULL;
+        tag_directives.start = tag_directives.end = NULL;
+        return 1;
+    }
+
+    /* Parse the stream end. */
+
+    else
+    {
+        parser->state = YAML_PARSE_END_STATE;
+        STREAM_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
+        SKIP_TOKEN(parser);
+        return 1;
+    }
+
+error:
+    yaml_free(version_directive);
+    while (tag_directives.start != tag_directives.end) {
+        yaml_free(tag_directives.end[-1].handle);
+        yaml_free(tag_directives.end[-1].prefix);
+        tag_directives.end --;
+    }
+    yaml_free(tag_directives.start);
+    return 0;
+}
+
+/*
+ * Parse the productions:
+ * explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
+ *                                                    ***********
+ */
+
+static int
+yaml_parser_parse_document_content(yaml_parser_t *parser, yaml_event_t *event)
+{
+    yaml_token_t *token;
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    if (token->type == YAML_VERSION_DIRECTIVE_TOKEN ||
+            token->type == YAML_TAG_DIRECTIVE_TOKEN ||
+            token->type == YAML_DOCUMENT_START_TOKEN ||
+            token->type == YAML_DOCUMENT_END_TOKEN ||
+            token->type == YAML_STREAM_END_TOKEN) {
+        parser->state = POP(parser, parser->states);
+        return yaml_parser_process_empty_scalar(parser, event,
+                token->start_mark);
+    }
+    else {
+        return yaml_parser_parse_node(parser, event, 1, 0);
+    }
+}
+
+/*
+ * Parse the productions:
+ * implicit_document    ::= block_node DOCUMENT-END*
+ *                                     *************
+ * explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
+ *                                                                *************
+ */
+
+static int
+yaml_parser_parse_document_end(yaml_parser_t *parser, yaml_event_t *event)
+{
+    yaml_token_t *token;
+    yaml_mark_t start_mark, end_mark;
+    int implicit = 1;
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    start_mark = end_mark = token->start_mark;
+
+    if (token->type == YAML_DOCUMENT_END_TOKEN) {
+        end_mark = token->end_mark;
+        SKIP_TOKEN(parser);
+        implicit = 0;
+    }
+
+    while (!STACK_EMPTY(parser, parser->tag_directives)) {
+        yaml_tag_directive_t tag_directive = POP(parser, parser->tag_directives);
+        yaml_free(tag_directive.handle);
+        yaml_free(tag_directive.prefix);
+    }
+
+    parser->state = YAML_PARSE_DOCUMENT_START_STATE;
+    DOCUMENT_END_EVENT_INIT(*event, implicit, start_mark, end_mark);
+
+    return 1;
+}
+
+/*
+ * Parse the productions:
+ * block_node_or_indentless_sequence    ::=
+ *                          ALIAS
+ *                          *****
+ *                          | properties (block_content | indentless_block_sequence)?
+ *                            **********  *
+ *                          | block_content | indentless_block_sequence
+ *                            *
+ * block_node           ::= ALIAS
+ *                          *****
+ *                          | properties block_content?
+ *                            ********** *
+ *                          | block_content
+ *                            *
+ * flow_node            ::= ALIAS
+ *                          *****
+ *                          | properties flow_content?
+ *                            ********** *
+ *                          | flow_content
+ *                            *
+ * properties           ::= TAG ANCHOR? | ANCHOR TAG?
+ *                          *************************
+ * block_content        ::= block_collection | flow_collection | SCALAR
+ *                                                               ******
+ * flow_content         ::= flow_collection | SCALAR
+ *                                            ******
+ */
+
+static int
+yaml_parser_parse_node(yaml_parser_t *parser, yaml_event_t *event,
+        int block, int indentless_sequence)
+{
+    yaml_token_t *token;
+    yaml_char_t *anchor = NULL;
+    yaml_char_t *tag_handle = NULL;
+    yaml_char_t *tag_suffix = NULL;
+    yaml_char_t *tag = NULL;
+    yaml_mark_t start_mark, end_mark, tag_mark;
+    int implicit;
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    if (token->type == YAML_ALIAS_TOKEN)
+    {
+        parser->state = POP(parser, parser->states);
+        ALIAS_EVENT_INIT(*event, token->data.alias.value,
+                token->start_mark, token->end_mark);
+        SKIP_TOKEN(parser);
+        return 1;
+    }
+
+    else
+    {
+        start_mark = end_mark = token->start_mark;
+
+        if (token->type == YAML_ANCHOR_TOKEN)
+        {
+            anchor = token->data.anchor.value;
+            start_mark = token->start_mark;
+            end_mark = token->end_mark;
+            SKIP_TOKEN(parser);
+            token = PEEK_TOKEN(parser);
+            if (!token) goto error;
+            if (token->type == YAML_TAG_TOKEN)
+            {
+                tag_handle = token->data.tag.handle;
+                tag_suffix = token->data.tag.suffix;
+                tag_mark = token->start_mark;
+                end_mark = token->end_mark;
+                SKIP_TOKEN(parser);
+                token = PEEK_TOKEN(parser);
+                if (!token) goto error;
+            }
+        }
+        else if (token->type == YAML_TAG_TOKEN)
+        {
+            tag_handle = token->data.tag.handle;
+            tag_suffix = token->data.tag.suffix;
+            start_mark = tag_mark = token->start_mark;
+            end_mark = token->end_mark;
+            SKIP_TOKEN(parser);
+            token = PEEK_TOKEN(parser);
+            if (!token) goto error;
+            if (token->type == YAML_ANCHOR_TOKEN)
+            {
+                anchor = token->data.anchor.value;
+                end_mark = token->end_mark;
+                SKIP_TOKEN(parser);
+                token = PEEK_TOKEN(parser);
+                if (!token) goto error;
+            }
+        }
+
+        if (tag_handle) {
+            if (!*tag_handle) {
+                tag = tag_suffix;
+                yaml_free(tag_handle);
+                tag_handle = tag_suffix = NULL;
+            }
+            else {
+                yaml_tag_directive_t *tag_directive;
+                for (tag_directive = parser->tag_directives.start;
+                        tag_directive != parser->tag_directives.top;
+                        tag_directive ++) {
+                    if (strcmp((char *)tag_directive->handle, (char *)tag_handle) == 0) {
+                        size_t prefix_len = strlen((char *)tag_directive->prefix);
+                        size_t suffix_len = strlen((char *)tag_suffix);
+                        tag = YAML_MALLOC(prefix_len+suffix_len+1);
+                        if (!tag) {
+                            parser->error = YAML_MEMORY_ERROR;
+                            goto error;
+                        }
+                        memcpy(tag, tag_directive->prefix, prefix_len);
+                        memcpy(tag+prefix_len, tag_suffix, suffix_len);
+                        tag[prefix_len+suffix_len] = '\0';
+                        yaml_free(tag_handle);
+                        yaml_free(tag_suffix);
+                        tag_handle = tag_suffix = NULL;
+                        break;
+                    }
+                }
+                if (!tag) {
+                    yaml_parser_set_parser_error_context(parser,
+                            "while parsing a node", start_mark,
+                            "found undefined tag handle", tag_mark);
+                    goto error;
+                }
+            }
+        }
+
+        implicit = (!tag || !*tag);
+        if (indentless_sequence && token->type == YAML_BLOCK_ENTRY_TOKEN) {
+            end_mark = token->end_mark;
+            parser->state = YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE;
+            SEQUENCE_START_EVENT_INIT(*event, anchor, tag, implicit,
+                    YAML_BLOCK_SEQUENCE_STYLE, start_mark, end_mark);
+            return 1;
+        }
+        else {
+            if (token->type == YAML_SCALAR_TOKEN) {
+                int plain_implicit = 0;
+                int quoted_implicit = 0;
+                end_mark = token->end_mark;
+                if ((token->data.scalar.style == YAML_PLAIN_SCALAR_STYLE && !tag)
+                        || (tag && strcmp((char *)tag, "!") == 0)) {
+                    plain_implicit = 1;
+                }
+                else if (!tag) {
+                    quoted_implicit = 1;
+                }
+                parser->state = POP(parser, parser->states);
+                SCALAR_EVENT_INIT(*event, anchor, tag,
+                        token->data.scalar.value, token->data.scalar.length,
+                        plain_implicit, quoted_implicit,
+                        token->data.scalar.style, start_mark, end_mark);
+                SKIP_TOKEN(parser);
+                return 1;
+            }
+            else if (token->type == YAML_FLOW_SEQUENCE_START_TOKEN) {
+                end_mark = token->end_mark;
+                parser->state = YAML_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE;
+                SEQUENCE_START_EVENT_INIT(*event, anchor, tag, implicit,
+                        YAML_FLOW_SEQUENCE_STYLE, start_mark, end_mark);
+                return 1;
+            }
+            else if (token->type == YAML_FLOW_MAPPING_START_TOKEN) {
+                end_mark = token->end_mark;
+                parser->state = YAML_PARSE_FLOW_MAPPING_FIRST_KEY_STATE;
+                MAPPING_START_EVENT_INIT(*event, anchor, tag, implicit,
+                        YAML_FLOW_MAPPING_STYLE, start_mark, end_mark);
+                return 1;
+            }
+            else if (block && token->type == YAML_BLOCK_SEQUENCE_START_TOKEN) {
+                end_mark = token->end_mark;
+                parser->state = YAML_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE;
+                SEQUENCE_START_EVENT_INIT(*event, anchor, tag, implicit,
+                        YAML_BLOCK_SEQUENCE_STYLE, start_mark, end_mark);
+                return 1;
+            }
+            else if (block && token->type == YAML_BLOCK_MAPPING_START_TOKEN) {
+                end_mark = token->end_mark;
+                parser->state = YAML_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE;
+                MAPPING_START_EVENT_INIT(*event, anchor, tag, implicit,
+                        YAML_BLOCK_MAPPING_STYLE, start_mark, end_mark);
+                return 1;
+            }
+            else if (anchor || tag) {
+                yaml_char_t *value = YAML_MALLOC(1);
+                if (!value) {
+                    parser->error = YAML_MEMORY_ERROR;
+                    goto error;
+                }
+                value[0] = '\0';
+                parser->state = POP(parser, parser->states);
+                SCALAR_EVENT_INIT(*event, anchor, tag, value, 0,
+                        implicit, 0, YAML_PLAIN_SCALAR_STYLE,
+                        start_mark, end_mark);
+                return 1;
+            }
+            else {
+                yaml_parser_set_parser_error_context(parser,
+                        (block ? "while parsing a block node"
+                         : "while parsing a flow node"), start_mark,
+                        "did not find expected node content", token->start_mark);
+                goto error;
+            }
+        }
+    }
+
+error:
+    yaml_free(anchor);
+    yaml_free(tag_handle);
+    yaml_free(tag_suffix);
+    yaml_free(tag);
+
+    return 0;
+}
+
+/*
+ * Parse the productions:
+ * block_sequence ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
+ *                    ********************  *********** *             *********
+ */
+
+static int
+yaml_parser_parse_block_sequence_entry(yaml_parser_t *parser,
+        yaml_event_t *event, int first)
+{
+    yaml_token_t *token;
+
+    if (first) {
+        token = PEEK_TOKEN(parser);
+        if (!PUSH(parser, parser->marks, token->start_mark))
+            return 0;
+        SKIP_TOKEN(parser);
+    }
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    if (token->type == YAML_BLOCK_ENTRY_TOKEN)
+    {
+        yaml_mark_t mark = token->end_mark;
+        SKIP_TOKEN(parser);
+        token = PEEK_TOKEN(parser);
+        if (!token) return 0;
+        if (token->type != YAML_BLOCK_ENTRY_TOKEN &&
+                token->type != YAML_BLOCK_END_TOKEN) {
+            if (!PUSH(parser, parser->states,
+                        YAML_PARSE_BLOCK_SEQUENCE_ENTRY_STATE))
+                return 0;
+            return yaml_parser_parse_node(parser, event, 1, 0);
+        }
+        else {
+            parser->state = YAML_PARSE_BLOCK_SEQUENCE_ENTRY_STATE;
+            return yaml_parser_process_empty_scalar(parser, event, mark);
+        }
+    }
+
+    else if (token->type == YAML_BLOCK_END_TOKEN)
+    {
+        parser->state = POP(parser, parser->states);
+        (void)POP(parser, parser->marks);
+        SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
+        SKIP_TOKEN(parser);
+        return 1;
+    }
+
+    else
+    {
+        return yaml_parser_set_parser_error_context(parser,
+                "while parsing a block collection", POP(parser, parser->marks),
+                "did not find expected '-' indicator", token->start_mark);
+    }
+}
+
+/*
+ * Parse the productions:
+ * indentless_sequence  ::= (BLOCK-ENTRY block_node?)+
+ *                           *********** *
+ */
+
+static int
+yaml_parser_parse_indentless_sequence_entry(yaml_parser_t *parser,
+        yaml_event_t *event)
+{
+    yaml_token_t *token;
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    if (token->type == YAML_BLOCK_ENTRY_TOKEN)
+    {
+        yaml_mark_t mark = token->end_mark;
+        SKIP_TOKEN(parser);
+        token = PEEK_TOKEN(parser);
+        if (!token) return 0;
+        if (token->type != YAML_BLOCK_ENTRY_TOKEN &&
+                token->type != YAML_KEY_TOKEN &&
+                token->type != YAML_VALUE_TOKEN &&
+                token->type != YAML_BLOCK_END_TOKEN) {
+            if (!PUSH(parser, parser->states,
+                        YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE))
+                return 0;
+            return yaml_parser_parse_node(parser, event, 1, 0);
+        }
+        else {
+            parser->state = YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE;
+            return yaml_parser_process_empty_scalar(parser, event, mark);
+        }
+    }
+
+    else
+    {
+        parser->state = POP(parser, parser->states);
+        SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->start_mark);
+        return 1;
+    }
+}
+
+/*
+ * Parse the productions:
+ * block_mapping        ::= BLOCK-MAPPING_START
+ *                          *******************
+ *                          ((KEY block_node_or_indentless_sequence?)?
+ *                            *** *
+ *                          (VALUE block_node_or_indentless_sequence?)?)*
+ *
+ *                          BLOCK-END
+ *                          *********
+ */
+
+static int
+yaml_parser_parse_block_mapping_key(yaml_parser_t *parser,
+        yaml_event_t *event, int first)
+{
+    yaml_token_t *token;
+
+    if (first) {
+        token = PEEK_TOKEN(parser);
+        if (!PUSH(parser, parser->marks, token->start_mark))
+            return 0;
+        SKIP_TOKEN(parser);
+    }
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    if (token->type == YAML_KEY_TOKEN)
+    {
+        yaml_mark_t mark = token->end_mark;
+        SKIP_TOKEN(parser);
+        token = PEEK_TOKEN(parser);
+        if (!token) return 0;
+        if (token->type != YAML_KEY_TOKEN &&
+                token->type != YAML_VALUE_TOKEN &&
+                token->type != YAML_BLOCK_END_TOKEN) {
+            if (!PUSH(parser, parser->states,
+                        YAML_PARSE_BLOCK_MAPPING_VALUE_STATE))
+                return 0;
+            return yaml_parser_parse_node(parser, event, 1, 1);
+        }
+        else {
+            parser->state = YAML_PARSE_BLOCK_MAPPING_VALUE_STATE;
+            return yaml_parser_process_empty_scalar(parser, event, mark);
+        }
+    }
+
+    else if (token->type == YAML_BLOCK_END_TOKEN)
+    {
+        parser->state = POP(parser, parser->states);
+        (void)POP(parser, parser->marks);
+        MAPPING_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
+        SKIP_TOKEN(parser);
+        return 1;
+    }
+
+    else
+    {
+        return yaml_parser_set_parser_error_context(parser,
+                "while parsing a block mapping", POP(parser, parser->marks),
+                "did not find expected key", token->start_mark);
+    }
+}
+
+/*
+ * Parse the productions:
+ * block_mapping        ::= BLOCK-MAPPING_START
+ *
+ *                          ((KEY block_node_or_indentless_sequence?)?
+ *
+ *                          (VALUE block_node_or_indentless_sequence?)?)*
+ *                           ***** *
+ *                          BLOCK-END
+ *
+ */
+
+static int
+yaml_parser_parse_block_mapping_value(yaml_parser_t *parser,
+        yaml_event_t *event)
+{
+    yaml_token_t *token;
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    if (token->type == YAML_VALUE_TOKEN)
+    {
+        yaml_mark_t mark = token->end_mark;
+        SKIP_TOKEN(parser);
+        token = PEEK_TOKEN(parser);
+        if (!token) return 0;
+        if (token->type != YAML_KEY_TOKEN &&
+                token->type != YAML_VALUE_TOKEN &&
+                token->type != YAML_BLOCK_END_TOKEN) {
+            if (!PUSH(parser, parser->states,
+                        YAML_PARSE_BLOCK_MAPPING_KEY_STATE))
+                return 0;
+            return yaml_parser_parse_node(parser, event, 1, 1);
+        }
+        else {
+            parser->state = YAML_PARSE_BLOCK_MAPPING_KEY_STATE;
+            return yaml_parser_process_empty_scalar(parser, event, mark);
+        }
+    }
+
+    else
+    {
+        parser->state = YAML_PARSE_BLOCK_MAPPING_KEY_STATE;
+        return yaml_parser_process_empty_scalar(parser, event, token->start_mark);
+    }
+}
+
+/*
+ * Parse the productions:
+ * flow_sequence        ::= FLOW-SEQUENCE-START
+ *                          *******************
+ *                          (flow_sequence_entry FLOW-ENTRY)*
+ *                           *                   **********
+ *                          flow_sequence_entry?
+ *                          *
+ *                          FLOW-SEQUENCE-END
+ *                          *****************
+ * flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+ *                          *
+ */
+
+static int
+yaml_parser_parse_flow_sequence_entry(yaml_parser_t *parser,
+        yaml_event_t *event, int first)
+{
+    yaml_token_t *token;
+
+    if (first) {
+        token = PEEK_TOKEN(parser);
+        if (!PUSH(parser, parser->marks, token->start_mark))
+            return 0;
+        SKIP_TOKEN(parser);
+    }
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    if (token->type != YAML_FLOW_SEQUENCE_END_TOKEN)
+    {
+        if (!first) {
+            if (token->type == YAML_FLOW_ENTRY_TOKEN) {
+                SKIP_TOKEN(parser);
+                token = PEEK_TOKEN(parser);
+                if (!token) return 0;
+            }
+            else {
+                return yaml_parser_set_parser_error_context(parser,
+                        "while parsing a flow sequence", POP(parser, parser->marks),
+                        "did not find expected ',' or ']'", token->start_mark);
+            }
+        }
+
+        if (token->type == YAML_KEY_TOKEN) {
+            parser->state = YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE;
+            MAPPING_START_EVENT_INIT(*event, NULL, NULL,
+                    1, YAML_FLOW_MAPPING_STYLE,
+                    token->start_mark, token->end_mark);
+            SKIP_TOKEN(parser);
+            return 1;
+        }
+
+        else if (token->type != YAML_FLOW_SEQUENCE_END_TOKEN) {
+            if (!PUSH(parser, parser->states,
+                        YAML_PARSE_FLOW_SEQUENCE_ENTRY_STATE))
+                return 0;
+            return yaml_parser_parse_node(parser, event, 0, 0);
+        }
+    }
+
+    parser->state = POP(parser, parser->states);
+    (void)POP(parser, parser->marks);
+    SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
+    SKIP_TOKEN(parser);
+    return 1;
+}
+
+/*
+ * Parse the productions:
+ * flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+ *                                      *** *
+ */
+
+static int
+yaml_parser_parse_flow_sequence_entry_mapping_key(yaml_parser_t *parser,
+        yaml_event_t *event)
+{
+    yaml_token_t *token;
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    if (token->type != YAML_VALUE_TOKEN && token->type != YAML_FLOW_ENTRY_TOKEN
+            && token->type != YAML_FLOW_SEQUENCE_END_TOKEN) {
+        if (!PUSH(parser, parser->states,
+                    YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE))
+            return 0;
+        return yaml_parser_parse_node(parser, event, 0, 0);
+    }
+    else {
+        yaml_mark_t mark = token->end_mark;
+        SKIP_TOKEN(parser);
+        parser->state = YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE;
+        return yaml_parser_process_empty_scalar(parser, event, mark);
+    }
+}
+
+/*
+ * Parse the productions:
+ * flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+ *                                                      ***** *
+ */
+
+static int
+yaml_parser_parse_flow_sequence_entry_mapping_value(yaml_parser_t *parser,
+        yaml_event_t *event)
+{
+    yaml_token_t *token;
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    if (token->type == YAML_VALUE_TOKEN) {
+        SKIP_TOKEN(parser);
+        token = PEEK_TOKEN(parser);
+        if (!token) return 0;
+        if (token->type != YAML_FLOW_ENTRY_TOKEN
+                && token->type != YAML_FLOW_SEQUENCE_END_TOKEN) {
+            if (!PUSH(parser, parser->states,
+                        YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE))
+                return 0;
+            return yaml_parser_parse_node(parser, event, 0, 0);
+        }
+    }
+    parser->state = YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE;
+    return yaml_parser_process_empty_scalar(parser, event, token->start_mark);
+}
+
+/*
+ * Parse the productions:
+ * flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+ *                                                                      *
+ */
+
+static int
+yaml_parser_parse_flow_sequence_entry_mapping_end(yaml_parser_t *parser,
+        yaml_event_t *event)
+{
+    yaml_token_t *token;
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    parser->state = YAML_PARSE_FLOW_SEQUENCE_ENTRY_STATE;
+
+    MAPPING_END_EVENT_INIT(*event, token->start_mark, token->start_mark);
+    return 1;
+}
+
+/*
+ * Parse the productions:
+ * flow_mapping         ::= FLOW-MAPPING-START
+ *                          ******************
+ *                          (flow_mapping_entry FLOW-ENTRY)*
+ *                           *                  **********
+ *                          flow_mapping_entry?
+ *                          ******************
+ *                          FLOW-MAPPING-END
+ *                          ****************
+ * flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+ *                          *           *** *
+ */
+
+static int
+yaml_parser_parse_flow_mapping_key(yaml_parser_t *parser,
+        yaml_event_t *event, int first)
+{
+    yaml_token_t *token;
+
+    if (first) {
+        token = PEEK_TOKEN(parser);
+        if (!PUSH(parser, parser->marks, token->start_mark))
+            return 0;
+        SKIP_TOKEN(parser);
+    }
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    if (token->type != YAML_FLOW_MAPPING_END_TOKEN)
+    {
+        if (!first) {
+            if (token->type == YAML_FLOW_ENTRY_TOKEN) {
+                SKIP_TOKEN(parser);
+                token = PEEK_TOKEN(parser);
+                if (!token) return 0;
+            }
+            else {
+                return yaml_parser_set_parser_error_context(parser,
+                        "while parsing a flow mapping", POP(parser, parser->marks),
+                        "did not find expected ',' or '}'", token->start_mark);
+            }
+        }
+
+        if (token->type == YAML_KEY_TOKEN) {
+            SKIP_TOKEN(parser);
+            token = PEEK_TOKEN(parser);
+            if (!token) return 0;
+            if (token->type != YAML_VALUE_TOKEN
+                    && token->type != YAML_FLOW_ENTRY_TOKEN
+                    && token->type != YAML_FLOW_MAPPING_END_TOKEN) {
+                if (!PUSH(parser, parser->states,
+                            YAML_PARSE_FLOW_MAPPING_VALUE_STATE))
+                    return 0;
+                return yaml_parser_parse_node(parser, event, 0, 0);
+            }
+            else {
+                parser->state = YAML_PARSE_FLOW_MAPPING_VALUE_STATE;
+                return yaml_parser_process_empty_scalar(parser, event,
+                        token->start_mark);
+            }
+        }
+        else if (token->type != YAML_FLOW_MAPPING_END_TOKEN) {
+            if (!PUSH(parser, parser->states,
+                        YAML_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE))
+                return 0;
+            return yaml_parser_parse_node(parser, event, 0, 0);
+        }
+    }
+
+    parser->state = POP(parser, parser->states);
+    (void)POP(parser, parser->marks);
+    MAPPING_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
+    SKIP_TOKEN(parser);
+    return 1;
+}
+
+/*
+ * Parse the productions:
+ * flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+ *                                   *                  ***** *
+ */
+
+static int
+yaml_parser_parse_flow_mapping_value(yaml_parser_t *parser,
+        yaml_event_t *event, int empty)
+{
+    yaml_token_t *token;
+
+    token = PEEK_TOKEN(parser);
+    if (!token) return 0;
+
+    if (empty) {
+        parser->state = YAML_PARSE_FLOW_MAPPING_KEY_STATE;
+        return yaml_parser_process_empty_scalar(parser, event,
+                token->start_mark);
+    }
+
+    if (token->type == YAML_VALUE_TOKEN) {
+        SKIP_TOKEN(parser);
+        token = PEEK_TOKEN(parser);
+        if (!token) return 0;
+        if (token->type != YAML_FLOW_ENTRY_TOKEN
+                && token->type != YAML_FLOW_MAPPING_END_TOKEN) {
+            if (!PUSH(parser, parser->states,
+                        YAML_PARSE_FLOW_MAPPING_KEY_STATE))
+                return 0;
+            return yaml_parser_parse_node(parser, event, 0, 0);
+        }
+    }
+
+    parser->state = YAML_PARSE_FLOW_MAPPING_KEY_STATE;
+    return yaml_parser_process_empty_scalar(parser, event, token->start_mark);
+}
+
+/*
+ * Generate an empty scalar event.
+ */
+
+static int
+yaml_parser_process_empty_scalar(yaml_parser_t *parser, yaml_event_t *event,
+        yaml_mark_t mark)
+{
+    yaml_char_t *value;
+
+    value = YAML_MALLOC(1);
+    if (!value) {
+        parser->error = YAML_MEMORY_ERROR;
+        return 0;
+    }
+    value[0] = '\0';
+
+    SCALAR_EVENT_INIT(*event, NULL, NULL, value, 0,
+            1, 0, YAML_PLAIN_SCALAR_STYLE, mark, mark);
+
+    return 1;
+}
+
+/*
+ * Parse directives.
+ */
+
+static int
+yaml_parser_process_directives(yaml_parser_t *parser,
+        yaml_version_directive_t **version_directive_ref,
+        yaml_tag_directive_t **tag_directives_start_ref,
+        yaml_tag_directive_t **tag_directives_end_ref)
+{
+    yaml_tag_directive_t default_tag_directives[] = {
+        {(yaml_char_t *)"!", (yaml_char_t *)"!"},
+        {(yaml_char_t *)"!!", (yaml_char_t *)"tag:yaml.org,2002:"},
+        {NULL, NULL}
+    };
+    yaml_tag_directive_t *default_tag_directive;
+    yaml_version_directive_t *version_directive = NULL;
+    struct {
+        yaml_tag_directive_t *start;
+        yaml_tag_directive_t *end;
+        yaml_tag_directive_t *top;
+    } tag_directives = { NULL, NULL, NULL };
+    yaml_token_t *token;
+
+    if (!STACK_INIT(parser, tag_directives, yaml_tag_directive_t*))
+        goto error;
+
+    token = PEEK_TOKEN(parser);
+    if (!token) goto error;
+
+    while (token->type == YAML_VERSION_DIRECTIVE_TOKEN ||
+            token->type == YAML_TAG_DIRECTIVE_TOKEN)
+    {
+        if (token->type == YAML_VERSION_DIRECTIVE_TOKEN) {
+            if (version_directive) {
+                yaml_parser_set_parser_error(parser,
+                        "found duplicate %YAML directive", token->start_mark);
+                goto error;
+            }
+            if (token->data.version_directive.major != 1
+                    || token->data.version_directive.minor != 1) {
+                yaml_parser_set_parser_error(parser,
+                        "found incompatible YAML document", token->start_mark);
+                goto error;
+            }
+            version_directive = YAML_MALLOC_STATIC(yaml_version_directive_t);
+            if (!version_directive) {
+                parser->error = YAML_MEMORY_ERROR;
+                goto error;
+            }
+            version_directive->major = token->data.version_directive.major;
+            version_directive->minor = token->data.version_directive.minor;
+        }
+
+        else if (token->type == YAML_TAG_DIRECTIVE_TOKEN) {
+            yaml_tag_directive_t value;
+            value.handle = token->data.tag_directive.handle;
+            value.prefix = token->data.tag_directive.prefix;
+
+            if (!yaml_parser_append_tag_directive(parser, value, 0,
+                        token->start_mark))
+                goto error;
+            if (!PUSH(parser, tag_directives, value))
+                goto error;
+        }
+
+        SKIP_TOKEN(parser);
+        token = PEEK_TOKEN(parser);
+        if (!token) goto error;
+    }
+
+    for (default_tag_directive = default_tag_directives;
+            default_tag_directive->handle; default_tag_directive++) {
+        if (!yaml_parser_append_tag_directive(parser, *default_tag_directive, 1,
+                    token->start_mark))
+            goto error;
+    }
+
+    if (version_directive_ref) {
+        *version_directive_ref = version_directive;
+    }
+    if (tag_directives_start_ref) {
+        if (STACK_EMPTY(parser, tag_directives)) {
+            *tag_directives_start_ref = *tag_directives_end_ref = NULL;
+            STACK_DEL(parser, tag_directives);
+        }
+        else {
+            *tag_directives_start_ref = tag_directives.start;
+            *tag_directives_end_ref = tag_directives.top;
+        }
+    }
+    else {
+        STACK_DEL(parser, tag_directives);
+    }
+
+    return 1;
+
+error:
+    yaml_free(version_directive);
+    while (!STACK_EMPTY(parser, tag_directives)) {
+        yaml_tag_directive_t tag_directive = POP(parser, tag_directives);
+        yaml_free(tag_directive.handle);
+        yaml_free(tag_directive.prefix);
+    }
+    STACK_DEL(parser, tag_directives);
+    return 0;
+}
+
+/*
+ * Append a tag directive to the directives stack.
+ */
+
+static int
+yaml_parser_append_tag_directive(yaml_parser_t *parser,
+        yaml_tag_directive_t value, int allow_duplicates, yaml_mark_t mark)
+{
+    yaml_tag_directive_t *tag_directive;
+    yaml_tag_directive_t copy = { NULL, NULL };
+
+    for (tag_directive = parser->tag_directives.start;
+            tag_directive != parser->tag_directives.top; tag_directive ++) {
+        if (strcmp((char *)value.handle, (char *)tag_directive->handle) == 0) {
+            if (allow_duplicates)
+                return 1;
+            return yaml_parser_set_parser_error(parser,
+                    "found duplicate %TAG directive", mark);
+        }
+    }
+
+    copy.handle = yaml_strdup(value.handle);
+    copy.prefix = yaml_strdup(value.prefix);
+    if (!copy.handle || !copy.prefix) {
+        parser->error = YAML_MEMORY_ERROR;
+        goto error;
+    }
+
+    if (!PUSH(parser, parser->tag_directives, copy))
+        goto error;
+
+    return 1;
+
+error:
+    yaml_free(copy.handle);
+    yaml_free(copy.prefix);
+    return 0;
+}
+
diff --git a/ext/psych/yaml/reader.c b/ext/psych/yaml/reader.c
new file mode 100644
index 0000000000..f3ac54c251
--- /dev/null
+++ b/ext/psych/yaml/reader.c
@@ -0,0 +1,469 @@
+
+#include "yaml_private.h"
+
+/*
+ * Declarations.
+ */
+
+static int
+yaml_parser_set_reader_error(yaml_parser_t *parser, const char *problem,
+        size_t offset, int value);
+
+static int
+yaml_parser_update_raw_buffer(yaml_parser_t *parser);
+
+static int
+yaml_parser_determine_encoding(yaml_parser_t *parser);
+
+YAML_DECLARE(int)
+yaml_parser_update_buffer(yaml_parser_t *parser, size_t length);
+
+/*
+ * Set the reader error and return 0.
+ */
+
+static int
+yaml_parser_set_reader_error(yaml_parser_t *parser, const char *problem,
+        size_t offset, int value)
+{
+    parser->error = YAML_READER_ERROR;
+    parser->problem = problem;
+    parser->problem_offset = offset;
+    parser->problem_value = value;
+
+    return 0;
+}
+
+/*
+ * Byte order marks.
+ */
+
+#define BOM_UTF8    "\xef\xbb\xbf"
+#define BOM_UTF16LE "\xff\xfe"
+#define BOM_UTF16BE "\xfe\xff"
+
+/*
+ * Determine the input stream encoding by checking the BOM symbol. If no BOM is
+ * found, the UTF-8 encoding is assumed. Return 1 on success, 0 on failure.
+ */
+
+static int
+yaml_parser_determine_encoding(yaml_parser_t *parser)
+{
+    /* Ensure that we had enough bytes in the raw buffer. */
+
+    while (!parser->eof
+            && parser->raw_buffer.last - parser->raw_buffer.pointer < 3) {
+        if (!yaml_parser_update_raw_buffer(parser)) {
+            return 0;
+        }
+    }
+
+    /* Determine the encoding. */
+
+    if (parser->raw_buffer.last - parser->raw_buffer.pointer >= 2
+            && !memcmp(parser->raw_buffer.pointer, BOM_UTF16LE, 2)) {
+        parser->encoding = YAML_UTF16LE_ENCODING;
+        parser->raw_buffer.pointer += 2;
+        parser->offset += 2;
+    }
+    else if (parser->raw_buffer.last - parser->raw_buffer.pointer >= 2
+            && !memcmp(parser->raw_buffer.pointer, BOM_UTF16BE, 2)) {
+        parser->encoding = YAML_UTF16BE_ENCODING;
+        parser->raw_buffer.pointer += 2;
+        parser->offset += 2;
+    }
+    else if (parser->raw_buffer.last - parser->raw_buffer.pointer >= 3
+            && !memcmp(parser->raw_buffer.pointer, BOM_UTF8, 3)) {
+        parser->encoding = YAML_UTF8_ENCODING;
+        parser->raw_buffer.pointer += 3;
+        parser->offset += 3;
+    }
+    else {
+        parser->encoding = YAML_UTF8_ENCODING;
+    }
+
+    return 1;
+}
+
+/*
+ * Update the raw buffer.
+ */
+
+static int
+yaml_parser_update_raw_buffer(yaml_parser_t *parser)
+{
+    size_t size_read = 0;
+
+    /* Return if the raw buffer is full. */
+
+    if (parser->raw_buffer.start == parser->raw_buffer.pointer
+            && parser->raw_buffer.last == parser->raw_buffer.end)
+        return 1;
+
+    /* Return on EOF. */
+
+    if (parser->eof) return 1;
+
+    /* Move the remaining bytes in the raw buffer to the beginning. */
+
+    if (parser->raw_buffer.start < parser->raw_buffer.pointer
+            && parser->raw_buffer.pointer < parser->raw_buffer.last) {
+        memmove(parser->raw_buffer.start, parser->raw_buffer.pointer,
+                parser->raw_buffer.last - parser->raw_buffer.pointer);
+    }
+    parser->raw_buffer.last -=
+        parser->raw_buffer.pointer - parser->raw_buffer.start;
+    parser->raw_buffer.pointer = parser->raw_buffer.start;
+
+    /* Call the read handler to fill the buffer. */
+
+    if (!parser->read_handler(parser->read_handler_data, parser->raw_buffer.last,
+                parser->raw_buffer.end - parser->raw_buffer.last, &size_read)) {
+        return yaml_parser_set_reader_error(parser, "input error",
+                parser->offset, -1);
+    }
+    parser->raw_buffer.last += size_read;
+    if (!size_read) {
+        parser->eof = 1;
+    }
+
+    return 1;
+}
+
+/*
+ * Ensure that the buffer contains at least `length` characters.
+ * Return 1 on success, 0 on failure.
+ *
+ * The length is supposed to be significantly less that the buffer size.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_update_buffer(yaml_parser_t *parser, size_t length)
+{
+    int first = 1;
+
+    assert(parser->read_handler);   /* Read handler must be set. */
+
+    /* If the EOF flag is set and the raw buffer is empty, do nothing. */
+
+    if (parser->eof && parser->raw_buffer.pointer == parser->raw_buffer.last)
+        return 1;
+
+    /* Return if the buffer contains enough characters. */
+
+    if (parser->unread >= length)
+        return 1;
+
+    /* Determine the input encoding if it is not known yet. */
+
+    if (!parser->encoding) {
+        if (!yaml_parser_determine_encoding(parser))
+            return 0;
+    }
+
+    /* Move the unread characters to the beginning of the buffer. */
+
+    if (parser->buffer.start < parser->buffer.pointer
+            && parser->buffer.pointer < parser->buffer.last) {
+        size_t size = parser->buffer.last - parser->buffer.pointer;
+        memmove(parser->buffer.start, parser->buffer.pointer, size);
+        parser->buffer.pointer = parser->buffer.start;
+        parser->buffer.last = parser->buffer.start + size;
+    }
+    else if (parser->buffer.pointer == parser->buffer.last) {
+        parser->buffer.pointer = parser->buffer.start;
+        parser->buffer.last = parser->buffer.start;
+    }
+
+    /* Fill the buffer until it has enough characters. */
+
+    while (parser->unread < length)
+    {
+        /* Fill the raw buffer if necessary. */
+
+        if (!first || parser->raw_buffer.pointer == parser->raw_buffer.last) {
+            if (!yaml_parser_update_raw_buffer(parser)) return 0;
+        }
+        first = 0;
+
+        /* Decode the raw buffer. */
+
+        while (parser->raw_buffer.pointer != parser->raw_buffer.last)
+        {
+            unsigned int value = 0, value2 = 0;
+            int incomplete = 0;
+            unsigned char octet;
+            unsigned int width = 0;
+            int low, high;
+            size_t k;
+            size_t raw_unread = parser->raw_buffer.last - parser->raw_buffer.pointer;
+
+            /* Decode the next character. */
+
+            switch (parser->encoding)
+            {
+                case YAML_UTF8_ENCODING:
+
+                    /*
+                     * Decode a UTF-8 character.  Check RFC 3629
+                     * (http://www.ietf.org/rfc/rfc3629.txt) for more details.
+                     *
+                     * The following table (taken from the RFC) is used for
+                     * decoding.
+                     *
+                     *    Char. number range |        UTF-8 octet sequence
+                     *      (hexadecimal)    |              (binary)
+                     *   --------------------+------------------------------------
+                     *   0000 0000-0000 007F | 0xxxxxxx
+                     *   0000 0080-0000 07FF | 110xxxxx 10xxxxxx
+                     *   0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
+                     *   0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                     *
+                     * Additionally, the characters in the range 0xD800-0xDFFF
+                     * are prohibited as they are reserved for use with UTF-16
+                     * surrogate pairs.
+                     */
+
+                    /* Determine the length of the UTF-8 sequence. */
+
+                    octet = parser->raw_buffer.pointer[0];
+                    width = (octet & 0x80) == 0x00 ? 1 :
+                            (octet & 0xE0) == 0xC0 ? 2 :
+                            (octet & 0xF0) == 0xE0 ? 3 :
+                            (octet & 0xF8) == 0xF0 ? 4 : 0;
+
+                    /* Check if the leading octet is valid. */
+
+                    if (!width)
+                        return yaml_parser_set_reader_error(parser,
+                                "invalid leading UTF-8 octet",
+                                parser->offset, octet);
+
+                    /* Check if the raw buffer contains an incomplete character. */
+
+                    if (width > raw_unread) {
+                        if (parser->eof) {
+                            return yaml_parser_set_reader_error(parser,
+                                    "incomplete UTF-8 octet sequence",
+                                    parser->offset, -1);
+                        }
+                        incomplete = 1;
+                        break;
+                    }
+
+                    /* Decode the leading octet. */
+
+                    value = (octet & 0x80) == 0x00 ? octet & 0x7F :
+                            (octet & 0xE0) == 0xC0 ? octet & 0x1F :
+                            (octet & 0xF0) == 0xE0 ? octet & 0x0F :
+                            (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
+
+                    /* Check and decode the trailing octets. */
+
+                    for (k = 1; k < width; k ++)
+                    {
+                        octet = parser->raw_buffer.pointer[k];
+
+                        /* Check if the octet is valid. */
+
+                        if ((octet & 0xC0) != 0x80)
+                            return yaml_parser_set_reader_error(parser,
+                                    "invalid trailing UTF-8 octet",
+                                    parser->offset+k, octet);
+
+                        /* Decode the octet. */
+
+                        value = (value << 6) + (octet & 0x3F);
+                    }
+
+                    /* Check the length of the sequence against the value. */
+
+                    if (!((width == 1) ||
+                            (width == 2 && value >= 0x80) ||
+                            (width == 3 && value >= 0x800) ||
+                            (width == 4 && value >= 0x10000)))
+                        return yaml_parser_set_reader_error(parser,
+                                "invalid length of a UTF-8 sequence",
+                                parser->offset, -1);
+
+                    /* Check the range of the value. */
+
+                    if ((value >= 0xD800 && value <= 0xDFFF) || value > 0x10FFFF)
+                        return yaml_parser_set_reader_error(parser,
+                                "invalid Unicode character",
+                                parser->offset, value);
+
+                    break;
+
+                case YAML_UTF16LE_ENCODING:
+                case YAML_UTF16BE_ENCODING:
+
+                    low = (parser->encoding == YAML_UTF16LE_ENCODING ? 0 : 1);
+                    high = (parser->encoding == YAML_UTF16LE_ENCODING ? 1 : 0);
+
+                    /*
+                     * The UTF-16 encoding is not as simple as one might
+                     * naively think.  Check RFC 2781
+                     * (http://www.ietf.org/rfc/rfc2781.txt).
+                     *
+                     * Normally, two subsequent bytes describe a Unicode
+                     * character.  However a special technique (called a
+                     * surrogate pair) is used for specifying character
+                     * values larger than 0xFFFF.
+                     *
+                     * A surrogate pair consists of two pseudo-characters:
+                     *      high surrogate area (0xD800-0xDBFF)
+                     *      low surrogate area (0xDC00-0xDFFF)
+                     *
+                     * The following formulas are used for decoding
+                     * and encoding characters using surrogate pairs:
+                     *
+                     *  U  = U' + 0x10000   (0x01 00 00 <= U <= 0x10 FF FF)
+                     *  U' = yyyyyyyyyyxxxxxxxxxx   (0 <= U' <= 0x0F FF FF)
+                     *  W1 = 110110yyyyyyyyyy
+                     *  W2 = 110111xxxxxxxxxx
+                     *
+                     * where U is the character value, W1 is the high surrogate
+                     * area, W2 is the low surrogate area.
+                     */
+
+                    /* Check for incomplete UTF-16 character. */
+
+                    if (raw_unread < 2) {
+                        if (parser->eof) {
+                            return yaml_parser_set_reader_error(parser,
+                                    "incomplete UTF-16 character",
+                                    parser->offset, -1);
+                        }
+                        incomplete = 1;
+                        break;
+                    }
+
+                    /* Get the character. */
+
+                    value = parser->raw_buffer.pointer[low]
+                        + (parser->raw_buffer.pointer[high] << 8);
+
+                    /* Check for unexpected low surrogate area. */
+
+                    if ((value & 0xFC00) == 0xDC00)
+                        return yaml_parser_set_reader_error(parser,
+                                "unexpected low surrogate area",
+                                parser->offset, value);
+
+                    /* Check for a high surrogate area. */
+
+                    if ((value & 0xFC00) == 0xD800) {
+
+                        width = 4;
+
+                        /* Check for incomplete surrogate pair. */
+
+                        if (raw_unread < 4) {
+                            if (parser->eof) {
+                                return yaml_parser_set_reader_error(parser,
+                                        "incomplete UTF-16 surrogate pair",
+                                        parser->offset, -1);
+                            }
+                            incomplete = 1;
+                            break;
+                        }
+
+                        /* Get the next character. */
+
+                        value2 = parser->raw_buffer.pointer[low+2]
+                            + (parser->raw_buffer.pointer[high+2] << 8);
+
+                        /* Check for a low surrogate area. */
+
+                        if ((value2 & 0xFC00) != 0xDC00)
+                            return yaml_parser_set_reader_error(parser,
+                                    "expected low surrogate area",
+                                    parser->offset+2, value2);
+
+                        /* Generate the value of the surrogate pair. */
+
+                        value = 0x10000 + ((value & 0x3FF) << 10) + (value2 & 0x3FF);
+                    }
+
+                    else {
+                        width = 2;
+                    }
+
+                    break;
+
+                default:
+                    assert(1);      /* Impossible. */
+            }
+
+            /* Check if the raw buffer contains enough bytes to form a character. */
+
+            if (incomplete) break;
+
+            /*
+             * Check if the character is in the allowed range:
+             *      #x9 | #xA | #xD | [#x20-#x7E]               (8 bit)
+             *      | #x85 | [#xA0-#xD7FF] | [#xE000-#xFFFD]    (16 bit)
+             *      | [#x10000-#x10FFFF]                        (32 bit)
+             */
+
+            if (! (value == 0x09 || value == 0x0A || value == 0x0D
+                        || (value >= 0x20 && value <= 0x7E)
+                        || (value == 0x85) || (value >= 0xA0 && value <= 0xD7FF)
+                        || (value >= 0xE000 && value <= 0xFFFD)
+                        || (value >= 0x10000 && value <= 0x10FFFF)))
+                return yaml_parser_set_reader_error(parser,
+                        "control characters are not allowed",
+                        parser->offset, value);
+
+            /* Move the raw pointers. */
+
+            parser->raw_buffer.pointer += width;
+            parser->offset += width;
+
+            /* Finally put the character into the buffer. */
+
+            /* 0000 0000-0000 007F -> 0xxxxxxx */
+            if (value <= 0x7F) {
+                *(parser->buffer.last++) = value;
+            }
+            /* 0000 0080-0000 07FF -> 110xxxxx 10xxxxxx */
+            else if (value <= 0x7FF) {
+                *(parser->buffer.last++) = 0xC0 + (value >> 6);
+                *(parser->buffer.last++) = 0x80 + (value & 0x3F);
+            }
+            /* 0000 0800-0000 FFFF -> 1110xxxx 10xxxxxx 10xxxxxx */
+            else if (value <= 0xFFFF) {
+                *(parser->buffer.last++) = 0xE0 + (value >> 12);
+                *(parser->buffer.last++) = 0x80 + ((value >> 6) & 0x3F);
+                *(parser->buffer.last++) = 0x80 + (value & 0x3F);
+            }
+            /* 0001 0000-0010 FFFF -> 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+            else {
+                *(parser->buffer.last++) = 0xF0 + (value >> 18);
+                *(parser->buffer.last++) = 0x80 + ((value >> 12) & 0x3F);
+                *(parser->buffer.last++) = 0x80 + ((value >> 6) & 0x3F);
+                *(parser->buffer.last++) = 0x80 + (value & 0x3F);
+            }
+
+            parser->unread ++;
+        }
+
+        /* On EOF, put NUL into the buffer and return. */
+
+        if (parser->eof) {
+            *(parser->buffer.last++) = '\0';
+            parser->unread ++;
+            return 1;
+        }
+
+    }
+
+    if (parser->offset >= MAX_FILE_SIZE) {
+        return yaml_parser_set_reader_error(parser, "input is too long",
+            parser->offset, -1);
+    }
+
+    return 1;
+}
diff --git a/ext/psych/yaml/scanner.c b/ext/psych/yaml/scanner.c
new file mode 100644
index 0000000000..204593d910
--- /dev/null
+++ b/ext/psych/yaml/scanner.c
@@ -0,0 +1,3578 @@
+
+/*
+ * Introduction
+ * ************
+ *
+ * The following notes assume that you are familiar with the YAML specification
+ * (http://yaml.org/spec/cvs/current.html).  We mostly follow it, although in
+ * some cases we are less restrictive that it requires.
+ *
+ * The process of transforming a YAML stream into a sequence of events is
+ * divided on two steps: Scanning and Parsing.
+ *
+ * The Scanner transforms the input stream into a sequence of tokens, while the
+ * parser transform the sequence of tokens produced by the Scanner into a
+ * sequence of parsing events.
+ *
+ * The Scanner is rather clever and complicated. The Parser, on the contrary,
+ * is a straightforward implementation of a recursive-descendant parser (or,
+ * LL(1) parser, as it is usually called).
+ *
+ * Actually there are two issues of Scanning that might be called "clever", the
+ * rest is quite straightforward.  The issues are "block collection start" and
+ * "simple keys".  Both issues are explained below in details.
+ *
+ * Here the Scanning step is explained and implemented.  We start with the list
+ * of all the tokens produced by the Scanner together with short descriptions.
+ *
+ * Now, tokens:
+ *
+ *      STREAM-START(encoding)          # The stream start.
+ *      STREAM-END                      # The stream end.
+ *      VERSION-DIRECTIVE(major,minor)  # The '%YAML' directive.
+ *      TAG-DIRECTIVE(handle,prefix)    # The '%TAG' directive.
+ *      DOCUMENT-START                  # '---'
+ *      DOCUMENT-END                    # '...'
+ *      BLOCK-SEQUENCE-START            # Indentation increase denoting a block
+ *      BLOCK-MAPPING-START             # sequence or a block mapping.
+ *      BLOCK-END                       # Indentation decrease.
+ *      FLOW-SEQUENCE-START             # '['
+ *      FLOW-SEQUENCE-END               # ']'
+ *      BLOCK-SEQUENCE-START            # '{'
+ *      BLOCK-SEQUENCE-END              # '}'
+ *      BLOCK-ENTRY                     # '-'
+ *      FLOW-ENTRY                      # ','
+ *      KEY                             # '?' or nothing (simple keys).
+ *      VALUE                           # ':'
+ *      ALIAS(anchor)                   # '*anchor'
+ *      ANCHOR(anchor)                  # '&anchor'
+ *      TAG(handle,suffix)              # '!handle!suffix'
+ *      SCALAR(value,style)             # A scalar.
+ *
+ * The following two tokens are "virtual" tokens denoting the beginning and the
+ * end of the stream:
+ *
+ *      STREAM-START(encoding)
+ *      STREAM-END
+ *
+ * We pass the information about the input stream encoding with the
+ * STREAM-START token.
+ *
+ * The next two tokens are responsible for tags:
+ *
+ *      VERSION-DIRECTIVE(major,minor)
+ *      TAG-DIRECTIVE(handle,prefix)
+ *
+ * Example:
+ *
+ *      %YAML   1.1
+ *      %TAG    !   !foo
+ *      %TAG    !yaml!  tag:yaml.org,2002:
+ *      ---
+ *
+ * The corresponding sequence of tokens:
+ *
+ *      STREAM-START(utf-8)
+ *      VERSION-DIRECTIVE(1,1)
+ *      TAG-DIRECTIVE("!","!foo")
+ *      TAG-DIRECTIVE("!yaml","tag:yaml.org,2002:")
+ *      DOCUMENT-START
+ *      STREAM-END
+ *
+ * Note that the VERSION-DIRECTIVE and TAG-DIRECTIVE tokens occupy a whole
+ * line.
+ *
+ * The document start and end indicators are represented by:
+ *
+ *      DOCUMENT-START
+ *      DOCUMENT-END
+ *
+ * Note that if a YAML stream contains an implicit document (without '---'
+ * and '...' indicators), no DOCUMENT-START and DOCUMENT-END tokens will be
+ * produced.
+ *
+ * In the following examples, we present whole documents together with the
+ * produced tokens.
+ *
+ *      1. An implicit document:
+ *
+ *          'a scalar'
+ *
+ *      Tokens:
+ *
+ *          STREAM-START(utf-8)
+ *          SCALAR("a scalar",single-quoted)
+ *          STREAM-END
+ *
+ *      2. An explicit document:
+ *
+ *          ---
+ *          'a scalar'
+ *          ...
+ *
+ *      Tokens:
+ *
+ *          STREAM-START(utf-8)
+ *          DOCUMENT-START
+ *          SCALAR("a scalar",single-quoted)
+ *          DOCUMENT-END
+ *          STREAM-END
+ *
+ *      3. Several documents in a stream:
+ *
+ *          'a scalar'
+ *          ---
+ *          'another scalar'
+ *          ---
+ *          'yet another scalar'
+ *
+ *      Tokens:
+ *
+ *          STREAM-START(utf-8)
+ *          SCALAR("a scalar",single-quoted)
+ *          DOCUMENT-START
+ *          SCALAR("another scalar",single-quoted)
+ *          DOCUMENT-START
+ *          SCALAR("yet another scalar",single-quoted)
+ *          STREAM-END
+ *
+ * We have already introduced the SCALAR token above.  The following tokens are
+ * used to describe aliases, anchors, tag, and scalars:
+ *
+ *      ALIAS(anchor)
+ *      ANCHOR(anchor)
+ *      TAG(handle,suffix)
+ *      SCALAR(value,style)
+ *
+ * The following series of examples illustrate the usage of these tokens:
+ *
+ *      1. A recursive sequence:
+ *
+ *          &A [ *A ]
+ *
+ *      Tokens:
+ *
+ *          STREAM-START(utf-8)
+ *          ANCHOR("A")
+ *          FLOW-SEQUENCE-START
+ *          ALIAS("A")
+ *          FLOW-SEQUENCE-END
+ *          STREAM-END
+ *
+ *      2. A tagged scalar:
+ *
+ *          !!float "3.14"  # A good approximation.
+ *
+ *      Tokens:
+ *
+ *          STREAM-START(utf-8)
+ *          TAG("!!","float")
+ *          SCALAR("3.14",double-quoted)
+ *          STREAM-END
+ *
+ *      3. Various scalar styles:
+ *
+ *          --- # Implicit empty plain scalars do not produce tokens.
+ *          --- a plain scalar
+ *          --- 'a single-quoted scalar'
+ *          --- "a double-quoted scalar"
+ *          --- |-
+ *            a literal scalar
+ *          --- >-
+ *            a folded
+ *            scalar
+ *
+ *      Tokens:
+ *
+ *          STREAM-START(utf-8)
+ *          DOCUMENT-START
+ *          DOCUMENT-START
+ *          SCALAR("a plain scalar",plain)
+ *          DOCUMENT-START
+ *          SCALAR("a single-quoted scalar",single-quoted)
+ *          DOCUMENT-START
+ *          SCALAR("a double-quoted scalar",double-quoted)
+ *          DOCUMENT-START
+ *          SCALAR("a literal scalar",literal)
+ *          DOCUMENT-START
+ *          SCALAR("a folded scalar",folded)
+ *          STREAM-END
+ *
+ * Now it's time to review collection-related tokens. We will start with
+ * flow collections:
+ *
+ *      FLOW-SEQUENCE-START
+ *      FLOW-SEQUENCE-END
+ *      FLOW-MAPPING-START
+ *      FLOW-MAPPING-END
+ *      FLOW-ENTRY
+ *      KEY
+ *      VALUE
+ *
+ * The tokens FLOW-SEQUENCE-START, FLOW-SEQUENCE-END, FLOW-MAPPING-START, and
+ * FLOW-MAPPING-END represent the indicators '[', ']', '{', and '}'
+ * correspondingly.  FLOW-ENTRY represent the ',' indicator.  Finally the
+ * indicators '?' and ':', which are used for denoting mapping keys and values,
+ * are represented by the KEY and VALUE tokens.
+ *
+ * The following examples show flow collections:
+ *
+ *      1. A flow sequence:
+ *
+ *          [item 1, item 2, item 3]
+ *
+ *      Tokens:
+ *
+ *          STREAM-START(utf-8)
+ *          FLOW-SEQUENCE-START
+ *          SCALAR("item 1",plain)
+ *          FLOW-ENTRY
+ *          SCALAR("item 2",plain)
+ *          FLOW-ENTRY
+ *          SCALAR("item 3",plain)
+ *          FLOW-SEQUENCE-END
+ *          STREAM-END
+ *
+ *      2. A flow mapping:
+ *
+ *          {
+ *              a simple key: a value,  # Note that the KEY token is produced.
+ *              ? a complex key: another value,
+ *          }
+ *
+ *      Tokens:
+ *
+ *          STREAM-START(utf-8)
+ *          FLOW-MAPPING-START
+ *          KEY
+ *          SCALAR("a simple key",plain)
+ *          VALUE
+ *          SCALAR("a value",plain)
+ *          FLOW-ENTRY
+ *          KEY
+ *          SCALAR("a complex key",plain)
+ *          VALUE
+ *          SCALAR("another value",plain)
+ *          FLOW-ENTRY
+ *          FLOW-MAPPING-END
+ *          STREAM-END
+ *
+ * A simple key is a key which is not denoted by the '?' indicator.  Note that
+ * the Scanner still produce the KEY token whenever it encounters a simple key.
+ *
+ * For scanning block collections, the following tokens are used (note that we
+ * repeat KEY and VALUE here):
+ *
+ *      BLOCK-SEQUENCE-START
+ *      BLOCK-MAPPING-START
+ *      BLOCK-END
+ *      BLOCK-ENTRY
+ *      KEY
+ *      VALUE
+ *
+ * The tokens BLOCK-SEQUENCE-START and BLOCK-MAPPING-START denote indentation
+ * increase that precedes a block collection (cf. the INDENT token in Python).
+ * The token BLOCK-END denote indentation decrease that ends a block collection
+ * (cf. the DEDENT token in Python).  However YAML has some syntax pecularities
+ * that makes detections of these tokens more complex.
+ *
+ * The tokens BLOCK-ENTRY, KEY, and VALUE are used to represent the indicators
+ * '-', '?', and ':' correspondingly.
+ *
+ * The following examples show how the tokens BLOCK-SEQUENCE-START,
+ * BLOCK-MAPPING-START, and BLOCK-END are emitted by the Scanner:
+ *
+ *      1. Block sequences:
+ *
+ *          - item 1
+ *          - item 2
+ *          -
+ *            - item 3.1
+ *            - item 3.2
+ *          -
+ *            key 1: value 1
+ *            key 2: value 2
+ *
+ *      Tokens:
+ *
+ *          STREAM-START(utf-8)
+ *          BLOCK-SEQUENCE-START
+ *          BLOCK-ENTRY
+ *          SCALAR("item 1",plain)
+ *          BLOCK-ENTRY
+ *          SCALAR("item 2",plain)
+ *          BLOCK-ENTRY
+ *          BLOCK-SEQUENCE-START
+ *          BLOCK-ENTRY
+ *          SCALAR("item 3.1",plain)
+ *          BLOCK-ENTRY
+ *          SCALAR("item 3.2",plain)
+ *          BLOCK-END
+ *          BLOCK-ENTRY
+ *          BLOCK-MAPPING-START
+ *          KEY
+ *          SCALAR("key 1",plain)
+ *          VALUE
+ *          SCALAR("value 1",plain)
+ *          KEY
+ *          SCALAR("key 2",plain)
+ *          VALUE
+ *          SCALAR("value 2",plain)
+ *          BLOCK-END
+ *          BLOCK-END
+ *          STREAM-END
+ *
+ *      2. Block mappings:
+ *
+ *          a simple key: a value   # The KEY token is produced here.
+ *          ? a complex key
+ *          : another value
+ *          a mapping:
+ *            key 1: value 1
+ *            key 2: value 2
+ *          a sequence:
+ *            - item 1
+ *            - item 2
+ *
+ *      Tokens:
+ *
+ *          STREAM-START(utf-8)
+ *          BLOCK-MAPPING-START
+ *          KEY
+ *          SCALAR("a simple key",plain)
+ *          VALUE
+ *          SCALAR("a value",plain)
+ *          KEY
+ *          SCALAR("a complex key",plain)
+ *          VALUE
+ *          SCALAR("another value",plain)
+ *          KEY
+ *          SCALAR("a mapping",plain)
+ *          BLOCK-MAPPING-START
+ *          KEY
+ *          SCALAR("key 1",plain)
+ *          VALUE
+ *          SCALAR("value 1",plain)
+ *          KEY
+ *          SCALAR("key 2",plain)
+ *          VALUE
+ *          SCALAR("value 2",plain)
+ *          BLOCK-END
+ *          KEY
+ *          SCALAR("a sequence",plain)
+ *          VALUE
+ *          BLOCK-SEQUENCE-START
+ *          BLOCK-ENTRY
+ *          SCALAR("item 1",plain)
+ *          BLOCK-ENTRY
+ *          SCALAR("item 2",plain)
+ *          BLOCK-END
+ *          BLOCK-END
+ *          STREAM-END
+ *
+ * YAML does not always require to start a new block collection from a new
+ * line.  If the current line contains only '-', '?', and ':' indicators, a new
+ * block collection may start at the current line.  The following examples
+ * illustrate this case:
+ *
+ *      1. Collections in a sequence:
+ *
+ *          - - item 1
+ *            - item 2
+ *          - key 1: value 1
+ *            key 2: value 2
+ *          - ? complex key
+ *            : complex value
+ *
+ *      Tokens:
+ *
+ *          STREAM-START(utf-8)
+ *          BLOCK-SEQUENCE-START
+ *          BLOCK-ENTRY
+ *          BLOCK-SEQUENCE-START
+ *          BLOCK-ENTRY
+ *          SCALAR("item 1",plain)
+ *          BLOCK-ENTRY
+ *          SCALAR("item 2",plain)
+ *          BLOCK-END
+ *          BLOCK-ENTRY
+ *          BLOCK-MAPPING-START
+ *          KEY
+ *          SCALAR("key 1",plain)
+ *          VALUE
+ *          SCALAR("value 1",plain)
+ *          KEY
+ *          SCALAR("key 2",plain)
+ *          VALUE
+ *          SCALAR("value 2",plain)
+ *          BLOCK-END
+ *          BLOCK-ENTRY
+ *          BLOCK-MAPPING-START
+ *          KEY
+ *          SCALAR("complex key")
+ *          VALUE
+ *          SCALAR("complex value")
+ *          BLOCK-END
+ *          BLOCK-END
+ *          STREAM-END
+ *
+ *      2. Collections in a mapping:
+ *
+ *          ? a sequence
+ *          : - item 1
+ *            - item 2
+ *          ? a mapping
+ *          : key 1: value 1
+ *            key 2: value 2
+ *
+ *      Tokens:
+ *
+ *          STREAM-START(utf-8)
+ *          BLOCK-MAPPING-START
+ *          KEY
+ *          SCALAR("a sequence",plain)
+ *          VALUE
+ *          BLOCK-SEQUENCE-START
+ *          BLOCK-ENTRY
+ *          SCALAR("item 1",plain)
+ *          BLOCK-ENTRY
+ *          SCALAR("item 2",plain)
+ *          BLOCK-END
+ *          KEY
+ *          SCALAR("a mapping",plain)
+ *          VALUE
+ *          BLOCK-MAPPING-START
+ *          KEY
+ *          SCALAR("key 1",plain)
+ *          VALUE
+ *          SCALAR("value 1",plain)
+ *          KEY
+ *          SCALAR("key 2",plain)
+ *          VALUE
+ *          SCALAR("value 2",plain)
+ *          BLOCK-END
+ *          BLOCK-END
+ *          STREAM-END
+ *
+ * YAML also permits non-indented sequences if they are included into a block
+ * mapping.  In this case, the token BLOCK-SEQUENCE-START is not produced:
+ *
+ *      key:
+ *      - item 1    # BLOCK-SEQUENCE-START is NOT produced here.
+ *      - item 2
+ *
+ * Tokens:
+ *
+ *      STREAM-START(utf-8)
+ *      BLOCK-MAPPING-START
+ *      KEY
+ *      SCALAR("key",plain)
+ *      VALUE
+ *      BLOCK-ENTRY
+ *      SCALAR("item 1",plain)
+ *      BLOCK-ENTRY
+ *      SCALAR("item 2",plain)
+ *      BLOCK-END
+ */
+
+#include "yaml_private.h"
+
+/*
+ * Ensure that the buffer contains the required number of characters.
+ * Return 1 on success, 0 on failure (reader error or memory error).
+ */
+
+#define CACHE(parser,length)                                                    \
+    (parser->unread >= (length)                                                 \
+        ? 1                                                                     \
+        : yaml_parser_update_buffer(parser, (length)))
+
+/*
+ * Advance the buffer pointer.
+ */
+
+#define SKIP(parser)                                                            \
+     (parser->mark.index ++,                                                    \
+      parser->mark.column ++,                                                   \
+      parser->unread --,                                                        \
+      parser->buffer.pointer += WIDTH(parser->buffer))
+
+#define SKIP_LINE(parser)                                                       \
+     (IS_CRLF(parser->buffer) ?                                                 \
+      (parser->mark.index += 2,                                                 \
+       parser->mark.column = 0,                                                 \
+       parser->mark.line ++,                                                    \
+       parser->unread -= 2,                                                     \
+       parser->buffer.pointer += 2) :                                           \
+      IS_BREAK(parser->buffer) ?                                                \
+      (parser->mark.index ++,                                                   \
+       parser->mark.column = 0,                                                 \
+       parser->mark.line ++,                                                    \
+       parser->unread --,                                                       \
+       parser->buffer.pointer += WIDTH(parser->buffer)) : 0)
+
+/*
+ * Copy a character to a string buffer and advance pointers.
+ */
+
+#define READ(parser,string)                                                     \
+     (STRING_EXTEND(parser,string) ?                                            \
+         (COPY(string,parser->buffer),                                          \
+          parser->mark.index ++,                                                \
+          parser->mark.column ++,                                               \
+          parser->unread --,                                                    \
+          1) : 0)
+
+/*
+ * Copy a line break character to a string buffer and advance pointers.
+ */
+
+#define READ_LINE(parser,string)                                                \
+    (STRING_EXTEND(parser,string) ?                                             \
+    (((CHECK_AT(parser->buffer,'\r',0)                                          \
+       && CHECK_AT(parser->buffer,'\n',1)) ?        /* CR LF -> LF */           \
+     (*((string).pointer++) = (yaml_char_t) '\n',                               \
+      parser->buffer.pointer += 2,                                              \
+      parser->mark.index += 2,                                                  \
+      parser->mark.column = 0,                                                  \
+      parser->mark.line ++,                                                     \
+      parser->unread -= 2) :                                                    \
+     (CHECK_AT(parser->buffer,'\r',0)                                           \
+      || CHECK_AT(parser->buffer,'\n',0)) ?         /* CR|LF -> LF */           \
+     (*((string).pointer++) = (yaml_char_t) '\n',                               \
+      parser->buffer.pointer ++,                                                \
+      parser->mark.index ++,                                                    \
+      parser->mark.column = 0,                                                  \
+      parser->mark.line ++,                                                     \
+      parser->unread --) :                                                      \
+     (CHECK_AT(parser->buffer,'\xC2',0)                                         \
+      && CHECK_AT(parser->buffer,'\x85',1)) ?       /* NEL -> LF */             \
+     (*((string).pointer++) = (yaml_char_t) '\n',                               \
+      parser->buffer.pointer += 2,                                              \
+      parser->mark.index ++,                                                    \
+      parser->mark.column = 0,                                                  \
+      parser->mark.line ++,                                                     \
+      parser->unread --) :                                                      \
+     (CHECK_AT(parser->buffer,'\xE2',0) &&                                      \
+      CHECK_AT(parser->buffer,'\x80',1) &&                                      \
+      (CHECK_AT(parser->buffer,'\xA8',2) ||                                     \
+       CHECK_AT(parser->buffer,'\xA9',2))) ?        /* LS|PS -> LS|PS */        \
+     (*((string).pointer++) = *(parser->buffer.pointer++),                      \
+      *((string).pointer++) = *(parser->buffer.pointer++),                      \
+      *((string).pointer++) = *(parser->buffer.pointer++),                      \
+      parser->mark.index ++,                                                    \
+      parser->mark.column = 0,                                                  \
+      parser->mark.line ++,                                                     \
+      parser->unread --) : 0),                                                  \
+    1) : 0)
+
+/*
+ * Public API declarations.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_scan(yaml_parser_t *parser, yaml_token_t *token);
+
+/*
+ * Error handling.
+ */
+
+static int
+yaml_parser_set_scanner_error(yaml_parser_t *parser, const char *context,
+        yaml_mark_t context_mark, const char *problem);
+
+/*
+ * High-level token API.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_fetch_more_tokens(yaml_parser_t *parser);
+
+static int
+yaml_parser_fetch_next_token(yaml_parser_t *parser);
+
+/*
+ * Potential simple keys.
+ */
+
+static int
+yaml_parser_stale_simple_keys(yaml_parser_t *parser);
+
+static int
+yaml_parser_save_simple_key(yaml_parser_t *parser);
+
+static int
+yaml_parser_remove_simple_key(yaml_parser_t *parser);
+
+static int
+yaml_parser_increase_flow_level(yaml_parser_t *parser);
+
+static int
+yaml_parser_decrease_flow_level(yaml_parser_t *parser);
+
+/*
+ * Indentation treatment.
+ */
+
+static int
+yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column,
+        ptrdiff_t number, yaml_token_type_t type, yaml_mark_t mark);
+
+static int
+yaml_parser_unroll_indent(yaml_parser_t *parser, ptrdiff_t column);
+
+/*
+ * Token fetchers.
+ */
+
+static int
+yaml_parser_fetch_stream_start(yaml_parser_t *parser);
+
+static int
+yaml_parser_fetch_stream_end(yaml_parser_t *parser);
+
+static int
+yaml_parser_fetch_directive(yaml_parser_t *parser);
+
+static int
+yaml_parser_fetch_document_indicator(yaml_parser_t *parser,
+        yaml_token_type_t type);
+
+static int
+yaml_parser_fetch_flow_collection_start(yaml_parser_t *parser,
+        yaml_token_type_t type);
+
+static int
+yaml_parser_fetch_flow_collection_end(yaml_parser_t *parser,
+        yaml_token_type_t type);
+
+static int
+yaml_parser_fetch_flow_entry(yaml_parser_t *parser);
+
+static int
+yaml_parser_fetch_block_entry(yaml_parser_t *parser);
+
+static int
+yaml_parser_fetch_key(yaml_parser_t *parser);
+
+static int
+yaml_parser_fetch_value(yaml_parser_t *parser);
+
+static int
+yaml_parser_fetch_anchor(yaml_parser_t *parser, yaml_token_type_t type);
+
+static int
+yaml_parser_fetch_tag(yaml_parser_t *parser);
+
+static int
+yaml_parser_fetch_block_scalar(yaml_parser_t *parser, int literal);
+
+static int
+yaml_parser_fetch_flow_scalar(yaml_parser_t *parser, int single);
+
+static int
+yaml_parser_fetch_plain_scalar(yaml_parser_t *parser);
+
+/*
+ * Token scanners.
+ */
+
+static int
+yaml_parser_scan_to_next_token(yaml_parser_t *parser);
+
+static int
+yaml_parser_scan_directive(yaml_parser_t *parser, yaml_token_t *token);
+
+static int
+yaml_parser_scan_directive_name(yaml_parser_t *parser,
+        yaml_mark_t start_mark, yaml_char_t **name);
+
+static int
+yaml_parser_scan_version_directive_value(yaml_parser_t *parser,
+        yaml_mark_t start_mark, int *major, int *minor);
+
+static int
+yaml_parser_scan_version_directive_number(yaml_parser_t *parser,
+        yaml_mark_t start_mark, int *number);
+
+static int
+yaml_parser_scan_tag_directive_value(yaml_parser_t *parser,
+        yaml_mark_t mark, yaml_char_t **handle, yaml_char_t **prefix);
+
+static int
+yaml_parser_scan_anchor(yaml_parser_t *parser, yaml_token_t *token,
+        yaml_token_type_t type);
+
+static int
+yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token);
+
+static int
+yaml_parser_scan_tag_handle(yaml_parser_t *parser, int directive,
+        yaml_mark_t start_mark, yaml_char_t **handle);
+
+static int
+yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
+        yaml_char_t *head, yaml_mark_t start_mark, yaml_char_t **uri);
+
+static int
+yaml_parser_scan_uri_escapes(yaml_parser_t *parser, int directive,
+        yaml_mark_t start_mark, yaml_string_t *string);
+
+static int
+yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
+        int literal);
+
+static int
+yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser,
+        int *indent, yaml_string_t *breaks,
+        yaml_mark_t start_mark, yaml_mark_t *end_mark);
+
+static int
+yaml_parser_scan_flow_scalar(yaml_parser_t *parser, yaml_token_t *token,
+        int single);
+
+static int
+yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token);
+
+/*
+ * Get the next token.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_scan(yaml_parser_t *parser, yaml_token_t *token)
+{
+    assert(parser); /* Non-NULL parser object is expected. */
+    assert(token);  /* Non-NULL token object is expected. */
+
+    /* Erase the token object. */
+
+    memset(token, 0, sizeof(yaml_token_t));
+
+    /* No tokens after STREAM-END or error. */
+
+    if (parser->stream_end_produced || parser->error) {
+        return 1;
+    }
+
+    /* Ensure that the tokens queue contains enough tokens. */
+
+    if (!parser->token_available) {
+        if (!yaml_parser_fetch_more_tokens(parser))
+            return 0;
+    }
+
+    /* Fetch the next token from the queue. */
+
+    *token = DEQUEUE(parser, parser->tokens);
+    parser->token_available = 0;
+    parser->tokens_parsed ++;
+
+    if (token->type == YAML_STREAM_END_TOKEN) {
+        parser->stream_end_produced = 1;
+    }
+
+    return 1;
+}
+
+/*
+ * Set the scanner error and return 0.
+ */
+
+static int
+yaml_parser_set_scanner_error(yaml_parser_t *parser, const char *context,
+        yaml_mark_t context_mark, const char *problem)
+{
+    parser->error = YAML_SCANNER_ERROR;
+    parser->context = context;
+    parser->context_mark = context_mark;
+    parser->problem = problem;
+    parser->problem_mark = parser->mark;
+
+    return 0;
+}
+
+/*
+ * Ensure that the tokens queue contains at least one token which can be
+ * returned to the Parser.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_fetch_more_tokens(yaml_parser_t *parser)
+{
+    int need_more_tokens;
+
+    /* While we need more tokens to fetch, do it. */
+
+    while (1)
+    {
+        /*
+         * Check if we really need to fetch more tokens.
+         */
+
+        need_more_tokens = 0;
+
+        if (parser->tokens.head == parser->tokens.tail)
+        {
+            /* Queue is empty. */
+
+            need_more_tokens = 1;
+        }
+        else
+        {
+            yaml_simple_key_t *simple_key;
+
+            /* Check if any potential simple key may occupy the head position. */
+
+            if (!yaml_parser_stale_simple_keys(parser))
+                return 0;
+
+            for (simple_key = parser->simple_keys.start;
+                    simple_key != parser->simple_keys.top; simple_key++) {
+                if (simple_key->possible
+                        && simple_key->token_number == parser->tokens_parsed) {
+                    need_more_tokens = 1;
+                    break;
+                }
+            }
+        }
+
+        /* We are finished. */
+
+        if (!need_more_tokens)
+            break;
+
+        /* Fetch the next token. */
+
+        if (!yaml_parser_fetch_next_token(parser))
+            return 0;
+    }
+
+    parser->token_available = 1;
+
+    return 1;
+}
+
+/*
+ * The dispatcher for token fetchers.
+ */
+
+static int
+yaml_parser_fetch_next_token(yaml_parser_t *parser)
+{
+    /* Ensure that the buffer is initialized. */
+
+    if (!CACHE(parser, 1))
+        return 0;
+
+    /* Check if we just started scanning.  Fetch STREAM-START then. */
+
+    if (!parser->stream_start_produced)
+        return yaml_parser_fetch_stream_start(parser);
+
+    /* Eat whitespaces and comments until we reach the next token. */
+
+    if (!yaml_parser_scan_to_next_token(parser))
+        return 0;
+
+    /* Remove obsolete potential simple keys. */
+
+    if (!yaml_parser_stale_simple_keys(parser))
+        return 0;
+
+    /* Check the indentation level against the current column. */
+
+    if (!yaml_parser_unroll_indent(parser, parser->mark.column))
+        return 0;
+
+    /*
+     * Ensure that the buffer contains at least 4 characters.  4 is the length
+     * of the longest indicators ('--- ' and '... ').
+     */
+
+    if (!CACHE(parser, 4))
+        return 0;
+
+    /* Is it the end of the stream? */
+
+    if (IS_Z(parser->buffer))
+        return yaml_parser_fetch_stream_end(parser);
+
+    /* Is it a directive? */
+
+    if (parser->mark.column == 0 && CHECK(parser->buffer, '%'))
+        return yaml_parser_fetch_directive(parser);
+
+    /* Is it the document start indicator? */
+
+    if (parser->mark.column == 0
+            && CHECK_AT(parser->buffer, '-', 0)
+            && CHECK_AT(parser->buffer, '-', 1)
+            && CHECK_AT(parser->buffer, '-', 2)
+            && IS_BLANKZ_AT(parser->buffer, 3))
+        return yaml_parser_fetch_document_indicator(parser,
+                YAML_DOCUMENT_START_TOKEN);
+
+    /* Is it the document end indicator? */
+
+    if (parser->mark.column == 0
+            && CHECK_AT(parser->buffer, '.', 0)
+            && CHECK_AT(parser->buffer, '.', 1)
+            && CHECK_AT(parser->buffer, '.', 2)
+            && IS_BLANKZ_AT(parser->buffer, 3))
+        return yaml_parser_fetch_document_indicator(parser,
+                YAML_DOCUMENT_END_TOKEN);
+
+    /* Is it the flow sequence start indicator? */
+
+    if (CHECK(parser->buffer, '['))
+        return yaml_parser_fetch_flow_collection_start(parser,
+                YAML_FLOW_SEQUENCE_START_TOKEN);
+
+    /* Is it the flow mapping start indicator? */
+
+    if (CHECK(parser->buffer, '{'))
+        return yaml_parser_fetch_flow_collection_start(parser,
+                YAML_FLOW_MAPPING_START_TOKEN);
+
+    /* Is it the flow sequence end indicator? */
+
+    if (CHECK(parser->buffer, ']'))
+        return yaml_parser_fetch_flow_collection_end(parser,
+                YAML_FLOW_SEQUENCE_END_TOKEN);
+
+    /* Is it the flow mapping end indicator? */
+
+    if (CHECK(parser->buffer, '}'))
+        return yaml_parser_fetch_flow_collection_end(parser,
+                YAML_FLOW_MAPPING_END_TOKEN);
+
+    /* Is it the flow entry indicator? */
+
+    if (CHECK(parser->buffer, ','))
+        return yaml_parser_fetch_flow_entry(parser);
+
+    /* Is it the block entry indicator? */
+
+    if (CHECK(parser->buffer, '-') && IS_BLANKZ_AT(parser->buffer, 1))
+        return yaml_parser_fetch_block_entry(parser);
+
+    /* Is it the key indicator? */
+
+    if (CHECK(parser->buffer, '?')
+            && (parser->flow_level || IS_BLANKZ_AT(parser->buffer, 1)))
+        return yaml_parser_fetch_key(parser);
+
+    /* Is it the value indicator? */
+
+    if (CHECK(parser->buffer, ':')
+            && (parser->flow_level || IS_BLANKZ_AT(parser->buffer, 1)))
+        return yaml_parser_fetch_value(parser);
+
+    /* Is it an alias? */
+
+    if (CHECK(parser->buffer, '*'))
+        return yaml_parser_fetch_anchor(parser, YAML_ALIAS_TOKEN);
+
+    /* Is it an anchor? */
+
+    if (CHECK(parser->buffer, '&'))
+        return yaml_parser_fetch_anchor(parser, YAML_ANCHOR_TOKEN);
+
+    /* Is it a tag? */
+
+    if (CHECK(parser->buffer, '!'))
+        return yaml_parser_fetch_tag(parser);
+
+    /* Is it a literal scalar? */
+
+    if (CHECK(parser->buffer, '|') && !parser->flow_level)
+        return yaml_parser_fetch_block_scalar(parser, 1);
+
+    /* Is it a folded scalar? */
+
+    if (CHECK(parser->buffer, '>') && !parser->flow_level)
+        return yaml_parser_fetch_block_scalar(parser, 0);
+
+    /* Is it a single-quoted scalar? */
+
+    if (CHECK(parser->buffer, '\''))
+        return yaml_parser_fetch_flow_scalar(parser, 1);
+
+    /* Is it a double-quoted scalar? */
+
+    if (CHECK(parser->buffer, '"'))
+        return yaml_parser_fetch_flow_scalar(parser, 0);
+
+    /*
+     * Is it a plain scalar?
+     *
+     * A plain scalar may start with any non-blank characters except
+     *
+     *      '-', '?', ':', ',', '[', ']', '{', '}',
+     *      '#', '&', '*', '!', '|', '>', '\'', '\"',
+     *      '%', '@', '`'.
+     *
+     * In the block context (and, for the '-' indicator, in the flow context
+     * too), it may also start with the characters
+     *
+     *      '-', '?', ':'
+     *
+     * if it is followed by a non-space character.
+     *
+     * The last rule is more restrictive than the specification requires.
+     */
+
+    if (!(IS_BLANKZ(parser->buffer) || CHECK(parser->buffer, '-')
+                || CHECK(parser->buffer, '?') || CHECK(parser->buffer, ':')
+                || CHECK(parser->buffer, ',') || CHECK(parser->buffer, '[')
+                || CHECK(parser->buffer, ']') || CHECK(parser->buffer, '{')
+                || CHECK(parser->buffer, '}') || CHECK(parser->buffer, '#')
+                || CHECK(parser->buffer, '&') || CHECK(parser->buffer, '*')
+                || CHECK(parser->buffer, '!') || CHECK(parser->buffer, '|')
+                || CHECK(parser->buffer, '>') || CHECK(parser->buffer, '\'')
+                || CHECK(parser->buffer, '"') || CHECK(parser->buffer, '%')
+                || CHECK(parser->buffer, '@') || CHECK(parser->buffer, '`')) ||
+            (CHECK(parser->buffer, '-') && !IS_BLANK_AT(parser->buffer, 1)) ||
+            (!parser->flow_level &&
+             (CHECK(parser->buffer, '?') || CHECK(parser->buffer, ':'))
+             && !IS_BLANKZ_AT(parser->buffer, 1)))
+        return yaml_parser_fetch_plain_scalar(parser);
+
+    /*
+     * If we don't determine the token type so far, it is an error.
+     */
+
+    return yaml_parser_set_scanner_error(parser,
+            "while scanning for the next token", parser->mark,
+            "found character that cannot start any token");
+}
+
+/*
+ * Check the list of potential simple keys and remove the positions that
+ * cannot contain simple keys anymore.
+ */
+
+static int
+yaml_parser_stale_simple_keys(yaml_parser_t *parser)
+{
+    yaml_simple_key_t *simple_key;
+
+    /* Check for a potential simple key for each flow level. */
+
+    for (simple_key = parser->simple_keys.start;
+            simple_key != parser->simple_keys.top; simple_key ++)
+    {
+        /*
+         * The specification requires that a simple key
+         *
+         *  - is limited to a single line,
+         *  - is shorter than 1024 characters.
+         */
+
+        if (simple_key->possible
+                && (simple_key->mark.line < parser->mark.line
+                    || simple_key->mark.index+1024 < parser->mark.index)) {
+
+            /* Check if the potential simple key to be removed is required. */
+
+            if (simple_key->required) {
+                return yaml_parser_set_scanner_error(parser,
+                        "while scanning a simple key", simple_key->mark,
+                        "could not find expected ':'");
+            }
+
+            simple_key->possible = 0;
+        }
+    }
+
+    return 1;
+}
+
+/*
+ * Check if a simple key may start at the current position and add it if
+ * needed.
+ */
+
+static int
+yaml_parser_save_simple_key(yaml_parser_t *parser)
+{
+    /*
+     * A simple key is required at the current position if the scanner is in
+     * the block context and the current column coincides with the indentation
+     * level.
+     */
+
+    int required = (!parser->flow_level
+            && parser->indent == (ptrdiff_t)parser->mark.column);
+
+    /*
+     * If the current position may start a simple key, save it.
+     */
+
+    if (parser->simple_key_allowed)
+    {
+        yaml_simple_key_t simple_key;
+        simple_key.possible = 1;
+        simple_key.required = required;
+        simple_key.token_number =
+            parser->tokens_parsed + (parser->tokens.tail - parser->tokens.head);
+        simple_key.mark = parser->mark;
+
+        if (!yaml_parser_remove_simple_key(parser)) return 0;
+
+        *(parser->simple_keys.top-1) = simple_key;
+    }
+
+    return 1;
+}
+
+/*
+ * Remove a potential simple key at the current flow level.
+ */
+
+static int
+yaml_parser_remove_simple_key(yaml_parser_t *parser)
+{
+    yaml_simple_key_t *simple_key = parser->simple_keys.top-1;
+
+    if (simple_key->possible)
+    {
+        /* If the key is required, it is an error. */
+
+        if (simple_key->required) {
+            return yaml_parser_set_scanner_error(parser,
+                    "while scanning a simple key", simple_key->mark,
+                    "could not find expected ':'");
+        }
+    }
+
+    /* Remove the key from the stack. */
+
+    simple_key->possible = 0;
+
+    return 1;
+}
+
+/*
+ * Increase the flow level and resize the simple key list if needed.
+ */
+
+static int
+yaml_parser_increase_flow_level(yaml_parser_t *parser)
+{
+    yaml_simple_key_t empty_simple_key = { 0, 0, 0, { 0, 0, 0 } };
+
+    /* Reset the simple key on the next level. */
+
+    if (!PUSH(parser, parser->simple_keys, empty_simple_key))
+        return 0;
+
+    /* Increase the flow level. */
+
+    if (parser->flow_level == INT_MAX) {
+        parser->error = YAML_MEMORY_ERROR;
+        return 0;
+    }
+
+    parser->flow_level++;
+
+    return 1;
+}
+
+/*
+ * Decrease the flow level.
+ */
+
+static int
+yaml_parser_decrease_flow_level(yaml_parser_t *parser)
+{
+    if (parser->flow_level) {
+        parser->flow_level --;
+        (void)POP(parser, parser->simple_keys);
+    }
+
+    return 1;
+}
+
+/*
+ * Push the current indentation level to the stack and set the new level
+ * the current column is greater than the indentation level.  In this case,
+ * append or insert the specified token into the token queue.
+ *
+ */
+
+static int
+yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column,
+        ptrdiff_t number, yaml_token_type_t type, yaml_mark_t mark)
+{
+    yaml_token_t token;
+
+    /* In the flow context, do nothing. */
+
+    if (parser->flow_level)
+        return 1;
+
+    if (parser->indent < column)
+    {
+        /*
+         * Push the current indentation level to the stack and set the new
+         * indentation level.
+         */
+
+        if (!PUSH(parser, parser->indents, parser->indent))
+            return 0;
+
+        if (column > INT_MAX) {
+            parser->error = YAML_MEMORY_ERROR;
+            return 0;
+        }
+
+        parser->indent = (int)column;
+
+        /* Create a token and insert it into the queue. */
+
+        TOKEN_INIT(token, type, mark, mark);
+
+        if (number == -1) {
+            if (!ENQUEUE(parser, parser->tokens, token))
+                return 0;
+        }
+        else {
+            if (!QUEUE_INSERT(parser,
+                        parser->tokens, number - parser->tokens_parsed, token))
+                return 0;
+        }
+    }
+
+    return 1;
+}
+
+/*
+ * Pop indentation levels from the indents stack until the current level
+ * becomes less or equal to the column.  For each indentation level, append
+ * the BLOCK-END token.
+ */
+
+
+static int
+yaml_parser_unroll_indent(yaml_parser_t *parser, ptrdiff_t column)
+{
+    yaml_token_t token;
+
+    /* In the flow context, do nothing. */
+
+    if (parser->flow_level)
+        return 1;
+
+    /* Loop through the indentation levels in the stack. */
+
+    while (parser->indent > column)
+    {
+        /* Create a token and append it to the queue. */
+
+        TOKEN_INIT(token, YAML_BLOCK_END_TOKEN, parser->mark, parser->mark);
+
+        if (!ENQUEUE(parser, parser->tokens, token))
+            return 0;
+
+        /* Pop the indentation level. */
+
+        parser->indent = POP(parser, parser->indents);
+    }
+
+    return 1;
+}
+
+/*
+ * Initialize the scanner and produce the STREAM-START token.
+ */
+
+static int
+yaml_parser_fetch_stream_start(yaml_parser_t *parser)
+{
+    yaml_simple_key_t simple_key = { 0, 0, 0, { 0, 0, 0 } };
+    yaml_token_t token;
+
+    /* Set the initial indentation. */
+
+    parser->indent = -1;
+
+    /* Initialize the simple key stack. */
+
+    if (!PUSH(parser, parser->simple_keys, simple_key))
+        return 0;
+
+    /* A simple key is allowed at the beginning of the stream. */
+
+    parser->simple_key_allowed = 1;
+
+    /* We have started. */
+
+    parser->stream_start_produced = 1;
+
+    /* Create the STREAM-START token and append it to the queue. */
+
+    STREAM_START_TOKEN_INIT(token, parser->encoding,
+            parser->mark, parser->mark);
+
+    if (!ENQUEUE(parser, parser->tokens, token))
+        return 0;
+
+    return 1;
+}
+
+/*
+ * Produce the STREAM-END token and shut down the scanner.
+ */
+
+static int
+yaml_parser_fetch_stream_end(yaml_parser_t *parser)
+{
+    yaml_token_t token;
+
+    /* Force new line. */
+
+    if (parser->mark.column != 0) {
+        parser->mark.column = 0;
+        parser->mark.line ++;
+    }
+
+    /* Reset the indentation level. */
+
+    if (!yaml_parser_unroll_indent(parser, -1))
+        return 0;
+
+    /* Reset simple keys. */
+
+    if (!yaml_parser_remove_simple_key(parser))
+        return 0;
+
+    parser->simple_key_allowed = 0;
+
+    /* Create the STREAM-END token and append it to the queue. */
+
+    STREAM_END_TOKEN_INIT(token, parser->mark, parser->mark);
+
+    if (!ENQUEUE(parser, parser->tokens, token))
+        return 0;
+
+    return 1;
+}
+
+/*
+ * Produce a VERSION-DIRECTIVE or TAG-DIRECTIVE token.
+ */
+
+static int
+yaml_parser_fetch_directive(yaml_parser_t *parser)
+{
+    yaml_token_t token;
+
+    /* Reset the indentation level. */
+
+    if (!yaml_parser_unroll_indent(parser, -1))
+        return 0;
+
+    /* Reset simple keys. */
+
+    if (!yaml_parser_remove_simple_key(parser))
+        return 0;
+
+    parser->simple_key_allowed = 0;
+
+    /* Create the YAML-DIRECTIVE or TAG-DIRECTIVE token. */
+
+    if (!yaml_parser_scan_directive(parser, &token))
+        return 0;
+
+    /* Append the token to the queue. */
+
+    if (!ENQUEUE(parser, parser->tokens, token)) {
+        yaml_token_delete(&token);
+        return 0;
+    }
+
+    return 1;
+}
+
+/*
+ * Produce the DOCUMENT-START or DOCUMENT-END token.
+ */
+
+static int
+yaml_parser_fetch_document_indicator(yaml_parser_t *parser,
+        yaml_token_type_t type)
+{
+    yaml_mark_t start_mark, end_mark;
+    yaml_token_t token;
+
+    /* Reset the indentation level. */
+
+    if (!yaml_parser_unroll_indent(parser, -1))
+        return 0;
+
+    /* Reset simple keys. */
+
+    if (!yaml_parser_remove_simple_key(parser))
+        return 0;
+
+    parser->simple_key_allowed = 0;
+
+    /* Consume the token. */
+
+    start_mark = parser->mark;
+
+    SKIP(parser);
+    SKIP(parser);
+    SKIP(parser);
+
+    end_mark = parser->mark;
+
+    /* Create the DOCUMENT-START or DOCUMENT-END token. */
+
+    TOKEN_INIT(token, type, start_mark, end_mark);
+
+    /* Append the token to the queue. */
+
+    if (!ENQUEUE(parser, parser->tokens, token))
+        return 0;
+
+    return 1;
+}
+
+/*
+ * Produce the FLOW-SEQUENCE-START or FLOW-MAPPING-START token.
+ */
+
+static int
+yaml_parser_fetch_flow_collection_start(yaml_parser_t *parser,
+        yaml_token_type_t type)
+{
+    yaml_mark_t start_mark, end_mark;
+    yaml_token_t token;
+
+    /* The indicators '[' and '{' may start a simple key. */
+
+    if (!yaml_parser_save_simple_key(parser))
+        return 0;
+
+    /* Increase the flow level. */
+
+    if (!yaml_parser_increase_flow_level(parser))
+        return 0;
+
+    /* A simple key may follow the indicators '[' and '{'. */
+
+    parser->simple_key_allowed = 1;
+
+    /* Consume the token. */
+
+    start_mark = parser->mark;
+    SKIP(parser);
+    end_mark = parser->mark;
+
+    /* Create the FLOW-SEQUENCE-START of FLOW-MAPPING-START token. */
+
+    TOKEN_INIT(token, type, start_mark, end_mark);
+
+    /* Append the token to the queue. */
+
+    if (!ENQUEUE(parser, parser->tokens, token))
+        return 0;
+
+    return 1;
+}
+
+/*
+ * Produce the FLOW-SEQUENCE-END or FLOW-MAPPING-END token.
+ */
+
+static int
+yaml_parser_fetch_flow_collection_end(yaml_parser_t *parser,
+        yaml_token_type_t type)
+{
+    yaml_mark_t start_mark, end_mark;
+    yaml_token_t token;
+
+    /* Reset any potential simple key on the current flow level. */
+
+    if (!yaml_parser_remove_simple_key(parser))
+        return 0;
+
+    /* Decrease the flow level. */
+
+    if (!yaml_parser_decrease_flow_level(parser))
+        return 0;
+
+    /* No simple keys after the indicators ']' and '}'. */
+
+    parser->simple_key_allowed = 0;
+
+    /* Consume the token. */
+
+    start_mark = parser->mark;
+    SKIP(parser);
+    end_mark = parser->mark;
+
+    /* Create the FLOW-SEQUENCE-END of FLOW-MAPPING-END token. */
+
+    TOKEN_INIT(token, type, start_mark, end_mark);
+
+    /* Append the token to the queue. */
+
+    if (!ENQUEUE(parser, parser->tokens, token))
+        return 0;
+
+    return 1;
+}
+
+/*
+ * Produce the FLOW-ENTRY token.
+ */
+
+static int
+yaml_parser_fetch_flow_entry(yaml_parser_t *parser)
+{
+    yaml_mark_t start_mark, end_mark;
+    yaml_token_t token;
+
+    /* Reset any potential simple keys on the current flow level. */
+
+    if (!yaml_parser_remove_simple_key(parser))
+        return 0;
+
+    /* Simple keys are allowed after ','. */
+
+    parser->simple_key_allowed = 1;
+
+    /* Consume the token. */
+
+    start_mark = parser->mark;
+    SKIP(parser);
+    end_mark = parser->mark;
+
+    /* Create the FLOW-ENTRY token and append it to the queue. */
+
+    TOKEN_INIT(token, YAML_FLOW_ENTRY_TOKEN, start_mark, end_mark);
+
+    if (!ENQUEUE(parser, parser->tokens, token))
+        return 0;
+
+    return 1;
+}
+
+/*
+ * Produce the BLOCK-ENTRY token.
+ */
+
+static int
+yaml_parser_fetch_block_entry(yaml_parser_t *parser)
+{
+    yaml_mark_t start_mark, end_mark;
+    yaml_token_t token;
+
+    /* Check if the scanner is in the block context. */
+
+    if (!parser->flow_level)
+    {
+        /* Check if we are allowed to start a new entry. */
+
+        if (!parser->simple_key_allowed) {
+            return yaml_parser_set_scanner_error(parser, NULL, parser->mark,
+                    "block sequence entries are not allowed in this context");
+        }
+
+        /* Add the BLOCK-SEQUENCE-START token if needed. */
+
+        if (!yaml_parser_roll_indent(parser, parser->mark.column, -1,
+                    YAML_BLOCK_SEQUENCE_START_TOKEN, parser->mark))
+            return 0;
+    }
+    else
+    {
+        /*
+         * It is an error for the '-' indicator to occur in the flow context,
+         * but we let the Parser detect and report about it because the Parser
+         * is able to point to the context.
+         */
+    }
+
+    /* Reset any potential simple keys on the current flow level. */
+
+    if (!yaml_parser_remove_simple_key(parser))
+        return 0;
+
+    /* Simple keys are allowed after '-'. */
+
+    parser->simple_key_allowed = 1;
+
+    /* Consume the token. */
+
+    start_mark = parser->mark;
+    SKIP(parser);
+    end_mark = parser->mark;
+
+    /* Create the BLOCK-ENTRY token and append it to the queue. */
+
+    TOKEN_INIT(token, YAML_BLOCK_ENTRY_TOKEN, start_mark, end_mark);
+
+    if (!ENQUEUE(parser, parser->tokens, token))
+        return 0;
+
+    return 1;
+}
+
+/*
+ * Produce the KEY token.
+ */
+
+static int
+yaml_parser_fetch_key(yaml_parser_t *parser)
+{
+    yaml_mark_t start_mark, end_mark;
+    yaml_token_t token;
+
+    /* In the block context, additional checks are required. */
+
+    if (!parser->flow_level)
+    {
+        /* Check if we are allowed to start a new key (not necessary simple). */
+
+        if (!parser->simple_key_allowed) {
+            return yaml_parser_set_scanner_error(parser, NULL, parser->mark,
+                    "mapping keys are not allowed in this context");
+        }
+
+        /* Add the BLOCK-MAPPING-START token if needed. */
+
+        if (!yaml_parser_roll_indent(parser, parser->mark.column, -1,
+                    YAML_BLOCK_MAPPING_START_TOKEN, parser->mark))
+            return 0;
+    }
+
+    /* Reset any potential simple keys on the current flow level. */
+
+    if (!yaml_parser_remove_simple_key(parser))
+        return 0;
+
+    /* Simple keys are allowed after '?' in the block context. */
+
+    parser->simple_key_allowed = (!parser->flow_level);
+
+    /* Consume the token. */
+
+    start_mark = parser->mark;
+    SKIP(parser);
+    end_mark = parser->mark;
+
+    /* Create the KEY token and append it to the queue. */
+
+    TOKEN_INIT(token, YAML_KEY_TOKEN, start_mark, end_mark);
+
+    if (!ENQUEUE(parser, parser->tokens, token))
+        return 0;
+
+    return 1;
+}
+
+/*
+ * Produce the VALUE token.
+ */
+
+static int
+yaml_parser_fetch_value(yaml_parser_t *parser)
+{
+    yaml_mark_t start_mark, end_mark;
+    yaml_token_t token;
+    yaml_simple_key_t *simple_key = parser->simple_keys.top-1;
+
+    /* Have we found a simple key? */
+
+    if (simple_key->possible)
+    {
+
+        /* Create the KEY token and insert it into the queue. */
+
+        TOKEN_INIT(token, YAML_KEY_TOKEN, simple_key->mark, simple_key->mark);
+
+        if (!QUEUE_INSERT(parser, parser->tokens,
+                    simple_key->token_number - parser->tokens_parsed, token))
+            return 0;
+
+        /* In the block context, we may need to add the BLOCK-MAPPING-START token. */
+
+        if (!yaml_parser_roll_indent(parser, simple_key->mark.column,
+                    simple_key->token_number,
+                    YAML_BLOCK_MAPPING_START_TOKEN, simple_key->mark))
+            return 0;
+
+        /* Remove the simple key. */
+
+        simple_key->possible = 0;
+
+        /* A simple key cannot follow another simple key. */
+
+        parser->simple_key_allowed = 0;
+    }
+    else
+    {
+        /* The ':' indicator follows a complex key. */
+
+        /* In the block context, extra checks are required. */
+
+        if (!parser->flow_level)
+        {
+            /* Check if we are allowed to start a complex value. */
+
+            if (!parser->simple_key_allowed) {
+                return yaml_parser_set_scanner_error(parser, NULL, parser->mark,
+                        "mapping values are not allowed in this context");
+            }
+
+            /* Add the BLOCK-MAPPING-START token if needed. */
+
+            if (!yaml_parser_roll_indent(parser, parser->mark.column, -1,
+                        YAML_BLOCK_MAPPING_START_TOKEN, parser->mark))
+                return 0;
+        }
+
+        /* Simple keys after ':' are allowed in the block context. */
+
+        parser->simple_key_allowed = (!parser->flow_level);
+    }
+
+    /* Consume the token. */
+
+    start_mark = parser->mark;
+    SKIP(parser);
+    end_mark = parser->mark;
+
+    /* Create the VALUE token and append it to the queue. */
+
+    TOKEN_INIT(token, YAML_VALUE_TOKEN, start_mark, end_mark);
+
+    if (!ENQUEUE(parser, parser->tokens, token))
+        return 0;
+
+    return 1;
+}
+
+/*
+ * Produce the ALIAS or ANCHOR token.
+ */
+
+static int
+yaml_parser_fetch_anchor(yaml_parser_t *parser, yaml_token_type_t type)
+{
+    yaml_token_t token;
+
+    /* An anchor or an alias could be a simple key. */
+
+    if (!yaml_parser_save_simple_key(parser))
+        return 0;
+
+    /* A simple key cannot follow an anchor or an alias. */
+
+    parser->simple_key_allowed = 0;
+
+    /* Create the ALIAS or ANCHOR token and append it to the queue. */
+
+    if (!yaml_parser_scan_anchor(parser, &token, type))
+        return 0;
+
+    if (!ENQUEUE(parser, parser->tokens, token)) {
+        yaml_token_delete(&token);
+        return 0;
+    }
+    return 1;
+}
+
+/*
+ * Produce the TAG token.
+ */
+
+static int
+yaml_parser_fetch_tag(yaml_parser_t *parser)
+{
+    yaml_token_t token;
+
+    /* A tag could be a simple key. */
+
+    if (!yaml_parser_save_simple_key(parser))
+        return 0;
+
+    /* A simple key cannot follow a tag. */
+
+    parser->simple_key_allowed = 0;
+
+    /* Create the TAG token and append it to the queue. */
+
+    if (!yaml_parser_scan_tag(parser, &token))
+        return 0;
+
+    if (!ENQUEUE(parser, parser->tokens, token)) {
+        yaml_token_delete(&token);
+        return 0;
+    }
+
+    return 1;
+}
+
+/*
+ * Produce the SCALAR(...,literal) or SCALAR(...,folded) tokens.
+ */
+
+static int
+yaml_parser_fetch_block_scalar(yaml_parser_t *parser, int literal)
+{
+    yaml_token_t token;
+
+    /* Remove any potential simple keys. */
+
+    if (!yaml_parser_remove_simple_key(parser))
+        return 0;
+
+    /* A simple key may follow a block scalar. */
+
+    parser->simple_key_allowed = 1;
+
+    /* Create the SCALAR token and append it to the queue. */
+
+    if (!yaml_parser_scan_block_scalar(parser, &token, literal))
+        return 0;
+
+    if (!ENQUEUE(parser, parser->tokens, token)) {
+        yaml_token_delete(&token);
+        return 0;
+    }
+
+    return 1;
+}
+
+/*
+ * Produce the SCALAR(...,single-quoted) or SCALAR(...,double-quoted) tokens.
+ */
+
+static int
+yaml_parser_fetch_flow_scalar(yaml_parser_t *parser, int single)
+{
+    yaml_token_t token;
+
+    /* A plain scalar could be a simple key. */
+
+    if (!yaml_parser_save_simple_key(parser))
+        return 0;
+
+    /* A simple key cannot follow a flow scalar. */
+
+    parser->simple_key_allowed = 0;
+
+    /* Create the SCALAR token and append it to the queue. */
+
+    if (!yaml_parser_scan_flow_scalar(parser, &token, single))
+        return 0;
+
+    if (!ENQUEUE(parser, parser->tokens, token)) {
+        yaml_token_delete(&token);
+        return 0;
+    }
+
+    return 1;
+}
+
+/*
+ * Produce the SCALAR(...,plain) token.
+ */
+
+static int
+yaml_parser_fetch_plain_scalar(yaml_parser_t *parser)
+{
+    yaml_token_t token;
+
+    /* A plain scalar could be a simple key. */
+
+    if (!yaml_parser_save_simple_key(parser))
+        return 0;
+
+    /* A simple key cannot follow a flow scalar. */
+
+    parser->simple_key_allowed = 0;
+
+    /* Create the SCALAR token and append it to the queue. */
+
+    if (!yaml_parser_scan_plain_scalar(parser, &token))
+        return 0;
+
+    if (!ENQUEUE(parser, parser->tokens, token)) {
+        yaml_token_delete(&token);
+        return 0;
+    }
+
+    return 1;
+}
+
+/*
+ * Eat whitespaces and comments until the next token is found.
+ */
+
+static int
+yaml_parser_scan_to_next_token(yaml_parser_t *parser)
+{
+    /* Until the next token is not found. */
+
+    while (1)
+    {
+        /* Allow the BOM mark to start a line. */
+
+        if (!CACHE(parser, 1)) return 0;
+
+        if (parser->mark.column == 0 && IS_BOM(parser->buffer))
+            SKIP(parser);
+
+        /*
+         * Eat whitespaces.
+         *
+         * Tabs are allowed:
+         *
+         *  - in the flow context;
+         *  - in the block context, but not at the beginning of the line or
+         *  after '-', '?', or ':' (complex value).
+         */
+
+        if (!CACHE(parser, 1)) return 0;
+
+        while (CHECK(parser->buffer,' ') ||
+                ((parser->flow_level || !parser->simple_key_allowed) &&
+                 CHECK(parser->buffer, '\t'))) {
+            SKIP(parser);
+            if (!CACHE(parser, 1)) return 0;
+        }
+
+        /* Eat a comment until a line break. */
+
+        if (CHECK(parser->buffer, '#')) {
+            while (!IS_BREAKZ(parser->buffer)) {
+                SKIP(parser);
+                if (!CACHE(parser, 1)) return 0;
+            }
+        }
+
+        /* If it is a line break, eat it. */
+
+        if (IS_BREAK(parser->buffer))
+        {
+            if (!CACHE(parser, 2)) return 0;
+            SKIP_LINE(parser);
+
+            /* In the block context, a new line may start a simple key. */
+
+            if (!parser->flow_level) {
+                parser->simple_key_allowed = 1;
+            }
+        }
+        else
+        {
+            /* We have found a token. */
+
+            break;
+        }
+    }
+
+    return 1;
+}
+
+/*
+ * Scan a YAML-DIRECTIVE or TAG-DIRECTIVE token.
+ *
+ * Scope:
+ *      %YAML    1.1    # a comment \n
+ *      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ *      %TAG    !yaml!  tag:yaml.org,2002:  \n
+ *      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ */
+
+int
+yaml_parser_scan_directive(yaml_parser_t *parser, yaml_token_t *token)
+{
+    yaml_mark_t start_mark, end_mark;
+    yaml_char_t *name = NULL;
+    int major, minor;
+    yaml_char_t *handle = NULL, *prefix = NULL;
+
+    /* Eat '%'. */
+
+    start_mark = parser->mark;
+
+    SKIP(parser);
+
+    /* Scan the directive name. */
+
+    if (!yaml_parser_scan_directive_name(parser, start_mark, &name))
+        goto error;
+
+    /* Is it a YAML directive? */
+
+    if (strcmp((char *)name, "YAML") == 0)
+    {
+        /* Scan the VERSION directive value. */
+
+        if (!yaml_parser_scan_version_directive_value(parser, start_mark,
+                    &major, &minor))
+            goto error;
+
+        end_mark = parser->mark;
+
+        /* Create a VERSION-DIRECTIVE token. */
+
+        VERSION_DIRECTIVE_TOKEN_INIT(*token, major, minor,
+                start_mark, end_mark);
+    }
+
+    /* Is it a TAG directive? */
+
+    else if (strcmp((char *)name, "TAG") == 0)
+    {
+        /* Scan the TAG directive value. */
+
+        if (!yaml_parser_scan_tag_directive_value(parser, start_mark,
+                    &handle, &prefix))
+            goto error;
+
+        end_mark = parser->mark;
+
+        /* Create a TAG-DIRECTIVE token. */
+
+        TAG_DIRECTIVE_TOKEN_INIT(*token, handle, prefix,
+                start_mark, end_mark);
+    }
+
+    /* Unknown directive. */
+
+    else
+    {
+        yaml_parser_set_scanner_error(parser, "while scanning a directive",
+                start_mark, "found unknown directive name");
+        goto error;
+    }
+
+    /* Eat the rest of the line including any comments. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    while (IS_BLANK(parser->buffer)) {
+        SKIP(parser);
+        if (!CACHE(parser, 1)) goto error;
+    }
+
+    if (CHECK(parser->buffer, '#')) {
+        while (!IS_BREAKZ(parser->buffer)) {
+            SKIP(parser);
+            if (!CACHE(parser, 1)) goto error;
+        }
+    }
+
+    /* Check if we are at the end of the line. */
+
+    if (!IS_BREAKZ(parser->buffer)) {
+        yaml_parser_set_scanner_error(parser, "while scanning a directive",
+                start_mark, "did not find expected comment or line break");
+        goto error;
+    }
+
+    /* Eat a line break. */
+
+    if (IS_BREAK(parser->buffer)) {
+        if (!CACHE(parser, 2)) goto error;
+        SKIP_LINE(parser);
+    }
+
+    yaml_free(name);
+
+    return 1;
+
+error:
+    yaml_free(prefix);
+    yaml_free(handle);
+    yaml_free(name);
+    return 0;
+}
+
+/*
+ * Scan the directive name.
+ *
+ * Scope:
+ *      %YAML   1.1     # a comment \n
+ *       ^^^^
+ *      %TAG    !yaml!  tag:yaml.org,2002:  \n
+ *       ^^^
+ */
+
+static int
+yaml_parser_scan_directive_name(yaml_parser_t *parser,
+        yaml_mark_t start_mark, yaml_char_t **name)
+{
+    yaml_string_t string = NULL_STRING;
+
+    if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
+
+    /* Consume the directive name. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    while (IS_ALPHA(parser->buffer))
+    {
+        if (!READ(parser, string)) goto error;
+        if (!CACHE(parser, 1)) goto error;
+    }
+
+    /* Check if the name is empty. */
+
+    if (string.start == string.pointer) {
+        yaml_parser_set_scanner_error(parser, "while scanning a directive",
+                start_mark, "could not find expected directive name");
+        goto error;
+    }
+
+    /* Check for an blank character after the name. */
+
+    if (!IS_BLANKZ(parser->buffer)) {
+        yaml_parser_set_scanner_error(parser, "while scanning a directive",
+                start_mark, "found unexpected non-alphabetical character");
+        goto error;
+    }
+
+    *name = string.start;
+
+    return 1;
+
+error:
+    STRING_DEL(parser, string);
+    return 0;
+}
+
+/*
+ * Scan the value of VERSION-DIRECTIVE.
+ *
+ * Scope:
+ *      %YAML   1.1     # a comment \n
+ *           ^^^^^^
+ */
+
+static int
+yaml_parser_scan_version_directive_value(yaml_parser_t *parser,
+        yaml_mark_t start_mark, int *major, int *minor)
+{
+    /* Eat whitespaces. */
+
+    if (!CACHE(parser, 1)) return 0;
+
+    while (IS_BLANK(parser->buffer)) {
+        SKIP(parser);
+        if (!CACHE(parser, 1)) return 0;
+    }
+
+    /* Consume the major version number. */
+
+    if (!yaml_parser_scan_version_directive_number(parser, start_mark, major))
+        return 0;
+
+    /* Eat '.'. */
+
+    if (!CHECK(parser->buffer, '.')) {
+        return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
+                start_mark, "did not find expected digit or '.' character");
+    }
+
+    SKIP(parser);
+
+    /* Consume the minor version number. */
+
+    if (!yaml_parser_scan_version_directive_number(parser, start_mark, minor))
+        return 0;
+
+    return 1;
+}
+
+#define MAX_NUMBER_LENGTH   9
+
+/*
+ * Scan the version number of VERSION-DIRECTIVE.
+ *
+ * Scope:
+ *      %YAML   1.1     # a comment \n
+ *              ^
+ *      %YAML   1.1     # a comment \n
+ *                ^
+ */
+
+static int
+yaml_parser_scan_version_directive_number(yaml_parser_t *parser,
+        yaml_mark_t start_mark, int *number)
+{
+    int value = 0;
+    size_t length = 0;
+
+    /* Repeat while the next character is digit. */
+
+    if (!CACHE(parser, 1)) return 0;
+
+    while (IS_DIGIT(parser->buffer))
+    {
+        /* Check if the number is too long. */
+
+        if (++length > MAX_NUMBER_LENGTH) {
+            return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
+                    start_mark, "found extremely long version number");
+        }
+
+        value = value*10 + AS_DIGIT(parser->buffer);
+
+        SKIP(parser);
+
+        if (!CACHE(parser, 1)) return 0;
+    }
+
+    /* Check if the number was present. */
+
+    if (!length) {
+        return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
+                start_mark, "did not find expected version number");
+    }
+
+    *number = value;
+
+    return 1;
+}
+
+/*
+ * Scan the value of a TAG-DIRECTIVE token.
+ *
+ * Scope:
+ *      %TAG    !yaml!  tag:yaml.org,2002:  \n
+ *          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ */
+
+static int
+yaml_parser_scan_tag_directive_value(yaml_parser_t *parser,
+        yaml_mark_t start_mark, yaml_char_t **handle, yaml_char_t **prefix)
+{
+    yaml_char_t *handle_value = NULL;
+    yaml_char_t *prefix_value = NULL;
+
+    /* Eat whitespaces. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    while (IS_BLANK(parser->buffer)) {
+        SKIP(parser);
+        if (!CACHE(parser, 1)) goto error;
+    }
+
+    /* Scan a handle. */
+
+    if (!yaml_parser_scan_tag_handle(parser, 1, start_mark, &handle_value))
+        goto error;
+
+    /* Expect a whitespace. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    if (!IS_BLANK(parser->buffer)) {
+        yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive",
+                start_mark, "did not find expected whitespace");
+        goto error;
+    }
+
+    /* Eat whitespaces. */
+
+    while (IS_BLANK(parser->buffer)) {
+        SKIP(parser);
+        if (!CACHE(parser, 1)) goto error;
+    }
+
+    /* Scan a prefix. */
+
+    if (!yaml_parser_scan_tag_uri(parser, 1, NULL, start_mark, &prefix_value))
+        goto error;
+
+    /* Expect a whitespace or line break. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    if (!IS_BLANKZ(parser->buffer)) {
+        yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive",
+                start_mark, "did not find expected whitespace or line break");
+        goto error;
+    }
+
+    *handle = handle_value;
+    *prefix = prefix_value;
+
+    return 1;
+
+error:
+    yaml_free(handle_value);
+    yaml_free(prefix_value);
+    return 0;
+}
+
+static int
+yaml_parser_scan_anchor(yaml_parser_t *parser, yaml_token_t *token,
+        yaml_token_type_t type)
+{
+    int length = 0;
+    yaml_mark_t start_mark, end_mark;
+    yaml_string_t string = NULL_STRING;
+
+    if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
+
+    /* Eat the indicator character. */
+
+    start_mark = parser->mark;
+
+    SKIP(parser);
+
+    /* Consume the value. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    while (IS_ALPHA(parser->buffer)) {
+        if (!READ(parser, string)) goto error;
+        if (!CACHE(parser, 1)) goto error;
+        length ++;
+    }
+
+    end_mark = parser->mark;
+
+    /*
+     * Check if length of the anchor is greater than 0 and it is followed by
+     * a whitespace character or one of the indicators:
+     *
+     *      '?', ':', ',', ']', '}', '%', '@', '`'.
+     */
+
+    if (!length || !(IS_BLANKZ(parser->buffer) || CHECK(parser->buffer, '?')
+                || CHECK(parser->buffer, ':') || CHECK(parser->buffer, ',')
+                || CHECK(parser->buffer, ']') || CHECK(parser->buffer, '}')
+                || CHECK(parser->buffer, '%') || CHECK(parser->buffer, '@')
+                || CHECK(parser->buffer, '`'))) {
+        yaml_parser_set_scanner_error(parser, type == YAML_ANCHOR_TOKEN ?
+                "while scanning an anchor" : "while scanning an alias", start_mark,
+                "did not find expected alphabetic or numeric character");
+        goto error;
+    }
+
+    /* Create a token. */
+
+    if (type == YAML_ANCHOR_TOKEN) {
+        ANCHOR_TOKEN_INIT(*token, string.start, start_mark, end_mark);
+    }
+    else {
+        ALIAS_TOKEN_INIT(*token, string.start, start_mark, end_mark);
+    }
+
+    return 1;
+
+error:
+    STRING_DEL(parser, string);
+    return 0;
+}
+
+/*
+ * Scan a TAG token.
+ */
+
+static int
+yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
+{
+    yaml_char_t *handle = NULL;
+    yaml_char_t *suffix = NULL;
+    yaml_mark_t start_mark, end_mark;
+
+    start_mark = parser->mark;
+
+    /* Check if the tag is in the canonical form. */
+
+    if (!CACHE(parser, 2)) goto error;
+
+    if (CHECK_AT(parser->buffer, '<', 1))
+    {
+        /* Set the handle to '' */
+
+        handle = YAML_MALLOC(1);
+        if (!handle) goto error;
+        handle[0] = '\0';
+
+        /* Eat '!<' */
+
+        SKIP(parser);
+        SKIP(parser);
+
+        /* Consume the tag value. */
+
+        if (!yaml_parser_scan_tag_uri(parser, 0, NULL, start_mark, &suffix))
+            goto error;
+
+        /* Check for '>' and eat it. */
+
+        if (!CHECK(parser->buffer, '>')) {
+            yaml_parser_set_scanner_error(parser, "while scanning a tag",
+                    start_mark, "did not find the expected '>'");
+            goto error;
+        }
+
+        SKIP(parser);
+    }
+    else
+    {
+        /* The tag has either the '!suffix' or the '!handle!suffix' form. */
+
+        /* First, try to scan a handle. */
+
+        if (!yaml_parser_scan_tag_handle(parser, 0, start_mark, &handle))
+            goto error;
+
+        /* Check if it is, indeed, handle. */
+
+        if (handle[0] == '!' && handle[1] != '\0' && handle[strlen((char *)handle)-1] == '!')
+        {
+            /* Scan the suffix now. */
+
+            if (!yaml_parser_scan_tag_uri(parser, 0, NULL, start_mark, &suffix))
+                goto error;
+        }
+        else
+        {
+            /* It wasn't a handle after all.  Scan the rest of the tag. */
+
+            if (!yaml_parser_scan_tag_uri(parser, 0, handle, start_mark, &suffix))
+                goto error;
+
+            /* Set the handle to '!'. */
+
+            yaml_free(handle);
+            handle = YAML_MALLOC(2);
+            if (!handle) goto error;
+            handle[0] = '!';
+            handle[1] = '\0';
+
+            /*
+             * A special case: the '!' tag.  Set the handle to '' and the
+             * suffix to '!'.
+             */
+
+            if (suffix[0] == '\0') {
+                yaml_char_t *tmp = handle;
+                handle = suffix;
+                suffix = tmp;
+            }
+        }
+    }
+
+    /* Check the character which ends the tag. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    if (!IS_BLANKZ(parser->buffer)) {
+        yaml_parser_set_scanner_error(parser, "while scanning a tag",
+                start_mark, "did not find expected whitespace or line break");
+        goto error;
+    }
+
+    end_mark = parser->mark;
+
+    /* Create a token. */
+
+    TAG_TOKEN_INIT(*token, handle, suffix, start_mark, end_mark);
+
+    return 1;
+
+error:
+    yaml_free(handle);
+    yaml_free(suffix);
+    return 0;
+}
+
+/*
+ * Scan a tag handle.
+ */
+
+static int
+yaml_parser_scan_tag_handle(yaml_parser_t *parser, int directive,
+        yaml_mark_t start_mark, yaml_char_t **handle)
+{
+    yaml_string_t string = NULL_STRING;
+
+    if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
+
+    /* Check the initial '!' character. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    if (!CHECK(parser->buffer, '!')) {
+        yaml_parser_set_scanner_error(parser, directive ?
+                "while scanning a tag directive" : "while scanning a tag",
+                start_mark, "did not find expected '!'");
+        goto error;
+    }
+
+    /* Copy the '!' character. */
+
+    if (!READ(parser, string)) goto error;
+
+    /* Copy all subsequent alphabetical and numerical characters. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    while (IS_ALPHA(parser->buffer))
+    {
+        if (!READ(parser, string)) goto error;
+        if (!CACHE(parser, 1)) goto error;
+    }
+
+    /* Check if the trailing character is '!' and copy it. */
+
+    if (CHECK(parser->buffer, '!'))
+    {
+        if (!READ(parser, string)) goto error;
+    }
+    else
+    {
+        /*
+         * It's either the '!' tag or not really a tag handle.  If it's a %TAG
+         * directive, it's an error.  If it's a tag token, it must be a part of
+         * URI.
+         */
+
+        if (directive && !(string.start[0] == '!' && string.start[1] == '\0')) {
+            yaml_parser_set_scanner_error(parser, "while parsing a tag directive",
+                    start_mark, "did not find expected '!'");
+            goto error;
+        }
+    }
+
+    *handle = string.start;
+
+    return 1;
+
+error:
+    STRING_DEL(parser, string);
+    return 0;
+}
+
+/*
+ * Scan a tag.
+ */
+
+static int
+yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
+        yaml_char_t *head, yaml_mark_t start_mark, yaml_char_t **uri)
+{
+    size_t length = head ? strlen((char *)head) : 0;
+    yaml_string_t string = NULL_STRING;
+
+    if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
+
+    /* Resize the string to include the head. */
+
+    while ((size_t)(string.end - string.start) <= length) {
+        if (!yaml_string_extend(&string.start, &string.pointer, &string.end)) {
+            parser->error = YAML_MEMORY_ERROR;
+            goto error;
+        }
+    }
+
+    /*
+     * Copy the head if needed.
+     *
+     * Note that we don't copy the leading '!' character.
+     */
+
+    if (length > 1) {
+        memcpy(string.start, head+1, length-1);
+        string.pointer += length-1;
+    }
+
+    /* Scan the tag. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    /*
+     * The set of characters that may appear in URI is as follows:
+     *
+     *      '0'-'9', 'A'-'Z', 'a'-'z', '_', '-', ';', '/', '?', ':', '@', '&',
+     *      '=', '+', '$', ',', '.', '!', '~', '*', '\'', '(', ')', '[', ']',
+     *      '%'.
+     */
+
+    while (IS_ALPHA(parser->buffer) || CHECK(parser->buffer, ';')
+            || CHECK(parser->buffer, '/') || CHECK(parser->buffer, '?')
+            || CHECK(parser->buffer, ':') || CHECK(parser->buffer, '@')
+            || CHECK(parser->buffer, '&') || CHECK(parser->buffer, '=')
+            || CHECK(parser->buffer, '+') || CHECK(parser->buffer, '$')
+            || CHECK(parser->buffer, ',') || CHECK(parser->buffer, '.')
+            || CHECK(parser->buffer, '!') || CHECK(parser->buffer, '~')
+            || CHECK(parser->buffer, '*') || CHECK(parser->buffer, '\'')
+            || CHECK(parser->buffer, '(') || CHECK(parser->buffer, ')')
+            || CHECK(parser->buffer, '[') || CHECK(parser->buffer, ']')
+            || CHECK(parser->buffer, '%'))
+    {
+        /* Check if it is a URI-escape sequence. */
+
+        if (CHECK(parser->buffer, '%')) {
+            if (!STRING_EXTEND(parser, string))
+                goto error;
+
+            if (!yaml_parser_scan_uri_escapes(parser,
+                        directive, start_mark, &string)) goto error;
+        }
+        else {
+            if (!READ(parser, string)) goto error;
+        }
+
+        length ++;
+        if (!CACHE(parser, 1)) goto error;
+    }
+
+    /* Check if the tag is non-empty. */
+
+    if (!length) {
+        if (!STRING_EXTEND(parser, string))
+            goto error;
+
+        yaml_parser_set_scanner_error(parser, directive ?
+                "while parsing a %TAG directive" : "while parsing a tag",
+                start_mark, "did not find expected tag URI");
+        goto error;
+    }
+
+    *uri = string.start;
+
+    return 1;
+
+error:
+    STRING_DEL(parser, string);
+    return 0;
+}
+
+/*
+ * Decode an URI-escape sequence corresponding to a single UTF-8 character.
+ */
+
+static int
+yaml_parser_scan_uri_escapes(yaml_parser_t *parser, int directive,
+        yaml_mark_t start_mark, yaml_string_t *string)
+{
+    int width = 0;
+
+    /* Decode the required number of characters. */
+
+    do {
+
+        unsigned char octet = 0;
+
+        /* Check for a URI-escaped octet. */
+
+        if (!CACHE(parser, 3)) return 0;
+
+        if (!(CHECK(parser->buffer, '%')
+                    && IS_HEX_AT(parser->buffer, 1)
+                    && IS_HEX_AT(parser->buffer, 2))) {
+            return yaml_parser_set_scanner_error(parser, directive ?
+                    "while parsing a %TAG directive" : "while parsing a tag",
+                    start_mark, "did not find URI escaped octet");
+        }
+
+        /* Get the octet. */
+
+        octet = (AS_HEX_AT(parser->buffer, 1) << 4) + AS_HEX_AT(parser->buffer, 2);
+
+        /* If it is the leading octet, determine the length of the UTF-8 sequence. */
+
+        if (!width)
+        {
+            width = (octet & 0x80) == 0x00 ? 1 :
+                    (octet & 0xE0) == 0xC0 ? 2 :
+                    (octet & 0xF0) == 0xE0 ? 3 :
+                    (octet & 0xF8) == 0xF0 ? 4 : 0;
+            if (!width) {
+                return yaml_parser_set_scanner_error(parser, directive ?
+                        "while parsing a %TAG directive" : "while parsing a tag",
+                        start_mark, "found an incorrect leading UTF-8 octet");
+            }
+        }
+        else
+        {
+            /* Check if the trailing octet is correct. */
+
+            if ((octet & 0xC0) != 0x80) {
+                return yaml_parser_set_scanner_error(parser, directive ?
+                        "while parsing a %TAG directive" : "while parsing a tag",
+                        start_mark, "found an incorrect trailing UTF-8 octet");
+            }
+        }
+
+        /* Copy the octet and move the pointers. */
+
+        *(string->pointer++) = octet;
+        SKIP(parser);
+        SKIP(parser);
+        SKIP(parser);
+
+    } while (--width);
+
+    return 1;
+}
+
+/*
+ * Scan a block scalar.
+ */
+
+static int
+yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
+        int literal)
+{
+    yaml_mark_t start_mark;
+    yaml_mark_t end_mark;
+    yaml_string_t string = NULL_STRING;
+    yaml_string_t leading_break = NULL_STRING;
+    yaml_string_t trailing_breaks = NULL_STRING;
+    int chomping = 0;
+    int increment = 0;
+    int indent = 0;
+    int leading_blank = 0;
+    int trailing_blank = 0;
+
+    if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
+    if (!STRING_INIT(parser, leading_break, INITIAL_STRING_SIZE)) goto error;
+    if (!STRING_INIT(parser, trailing_breaks, INITIAL_STRING_SIZE)) goto error;
+
+    /* Eat the indicator '|' or '>'. */
+
+    start_mark = parser->mark;
+
+    SKIP(parser);
+
+    /* Scan the additional block scalar indicators. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    /* Check for a chomping indicator. */
+
+    if (CHECK(parser->buffer, '+') || CHECK(parser->buffer, '-'))
+    {
+        /* Set the chomping method and eat the indicator. */
+
+        chomping = CHECK(parser->buffer, '+') ? +1 : -1;
+
+        SKIP(parser);
+
+        /* Check for an indentation indicator. */
+
+        if (!CACHE(parser, 1)) goto error;
+
+        if (IS_DIGIT(parser->buffer))
+        {
+            /* Check that the indentation 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");
+                goto error;
+            }
+
+            /* Get the indentation level and eat the indicator. */
+
+            increment = AS_DIGIT(parser->buffer);
+
+            SKIP(parser);
+        }
+    }
+
+    /* Do the same as above, but in the opposite order. */
+
+    else if (IS_DIGIT(parser->buffer))
+    {
+        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");
+            goto error;
+        }
+
+        increment = AS_DIGIT(parser->buffer);
+
+        SKIP(parser);
+
+        if (!CACHE(parser, 1)) goto error;
+
+        if (CHECK(parser->buffer, '+') || CHECK(parser->buffer, '-')) {
+            chomping = CHECK(parser->buffer, '+') ? +1 : -1;
+
+            SKIP(parser);
+        }
+    }
+
+    /* Eat whitespaces and comments to the end of the line. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    while (IS_BLANK(parser->buffer)) {
+        SKIP(parser);
+        if (!CACHE(parser, 1)) goto error;
+    }
+
+    if (CHECK(parser->buffer, '#')) {
+        while (!IS_BREAKZ(parser->buffer)) {
+            SKIP(parser);
+            if (!CACHE(parser, 1)) goto error;
+        }
+    }
+
+    /* Check if we are at the end of the line. */
+
+    if (!IS_BREAKZ(parser->buffer)) {
+        yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
+                start_mark, "did not find expected comment or line break");
+        goto error;
+    }
+
+    /* Eat a line break. */
+
+    if (IS_BREAK(parser->buffer)) {
+        if (!CACHE(parser, 2)) goto error;
+        SKIP_LINE(parser);
+    }
+
+    end_mark = parser->mark;
+
+    /* Set the indentation level if it was specified. */
+
+    if (increment) {
+        indent = parser->indent >= 0 ? parser->indent+increment : increment;
+    }
+
+    /* Scan the leading line breaks and determine the indentation level if needed. */
+
+    if (!yaml_parser_scan_block_scalar_breaks(parser, &indent, &trailing_breaks,
+                start_mark, &end_mark)) goto error;
+
+    /* Scan the block scalar content. */
+
+    if (!CACHE(parser, 1)) goto error;
+
+    while ((int)parser->mark.column == indent && !IS_Z(parser->buffer))
+    {
+        /*
+         * We are at the beginning of a non-empty line.
+         */
+
+        /* Is it a trailing whitespace? */
+
+        trailing_blank = IS_BLANK(parser->buffer);
+
+        /* Check if we need to fold the leading line break. */
+
+        if (!literal && (*leading_break.start == '\n')
+                && !leading_blank && !trailing_blank)
+        {
+            /* Do we need to join the lines by space? */
+
+            if (*trailing_breaks.start == '\0') {
+                if (!STRING_EXTEND(parser, string)) goto error;
+                *(string.pointer ++) = ' ';
+            }
+
+            CLEAR(parser, leading_break);
+        }
+        else {
+            if (!JOIN(parser, string, leading_break)) goto error;
+            CLEAR(parser, leading_break);
+        }
+
+        /* Append the remaining line breaks. */
+
+        if (!JOIN(parser, string, trailing_breaks)) goto error;
+        CLEAR(parser, trailing_breaks);
+
+        /* Is it a leading whitespace? */
+
+        leading_blank = IS_BLANK(parser->buffer);
+
+        /* Consume the current line. */
+
+        while (!IS_BREAKZ(parser->buffer)) {
+            if (!READ(parser, string)) goto error;
+            if (!CACHE(parser, 1)) goto error;
+        }
+
+        /* Consume the line break. */
+
+        if (!CACHE(parser, 2)) goto error;
+
+        if (!READ_LINE(parser, leading_break)) goto error;
+
+        /* Eat the following indentation spaces and line breaks. */
+
+        if (!yaml_parser_scan_block_scalar_breaks(parser,
+                    &indent, &trailing_breaks, start_mark, &end_mark)) goto error;
+    }
+
+    /* Chomp the tail. */
+
+    if (chomping != -1) {
+        if (!JOIN(parser, string, leading_break)) goto error;
+    }
+    if (chomping == 1) {
+        if (!JOIN(parser, string, trailing_breaks)) goto error;
+    }
+
+    /* Create a token. */
+
+    SCALAR_TOKEN_INIT(*token, string.start, string.pointer-string.start,
+            literal ? YAML_LITERAL_SCALAR_STYLE : YAML_FOLDED_SCALAR_STYLE,
+            start_mark, end_mark);
+
+    STRING_DEL(parser, leading_break);
+    STRING_DEL(parser, trailing_breaks);
+
+    return 1;
+
+error:
+    STRING_DEL(parser, string);
+    STRING_DEL(parser, leading_break);
+    STRING_DEL(parser, trailing_breaks);
+
+    return 0;
+}
+
+/*
+ * Scan indentation spaces and line breaks for a block scalar.  Determine the
+ * indentation level if needed.
+ */
+
+static int
+yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser,
+        int *indent, yaml_string_t *breaks,
+        yaml_mark_t start_mark, yaml_mark_t *end_mark)
+{
+    int max_indent = 0;
+
+    *end_mark = parser->mark;
+
+    /* Eat the indentation spaces and line breaks. */
+
+    while (1)
+    {
+        /* Eat the indentation spaces. */
+
+        if (!CACHE(parser, 1)) return 0;
+
+        while ((!*indent || (int)parser->mark.column < *indent)
+                && IS_SPACE(parser->buffer)) {
+            SKIP(parser);
+            if (!CACHE(parser, 1)) return 0;
+        }
+
+        if ((int)parser->mark.column > max_indent)
+            max_indent = (int)parser->mark.column;
+
+        /* Check for a tab character messing the indentation. */
+
+        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");
+        }
+
+        /* Have we found a non-empty line? */
+
+        if (!IS_BREAK(parser->buffer)) break;
+
+        /* Consume the line break. */
+
+        if (!CACHE(parser, 2)) return 0;
+        if (!READ_LINE(parser, *breaks)) return 0;
+        *end_mark = parser->mark;
+    }
+
+    /* Determine the indentation level if needed. */
+
+    if (!*indent) {
+        *indent = max_indent;
+        if (*indent < parser->indent + 1)
+            *indent = parser->indent + 1;
+        if (*indent < 1)
+            *indent = 1;
+    }
+
+   return 1;
+}
+
+/*
+ * Scan a quoted scalar.
+ */
+
+static int
+yaml_parser_scan_flow_scalar(yaml_parser_t *parser, yaml_token_t *token,
+        int single)
+{
+    yaml_mark_t start_mark;
+    yaml_mark_t end_mark;
+    yaml_string_t string = NULL_STRING;
+    yaml_string_t leading_break = NULL_STRING;
+    yaml_string_t trailing_breaks = NULL_STRING;
+    yaml_string_t whitespaces = NULL_STRING;
+    int leading_blanks;
+
+    if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
+    if (!STRING_INIT(parser, leading_break, INITIAL_STRING_SIZE)) goto error;
+    if (!STRING_INIT(parser, trailing_breaks, INITIAL_STRING_SIZE)) goto error;
+    if (!STRING_INIT(parser, whitespaces, INITIAL_STRING_SIZE)) goto error;
+
+    /* Eat the left quote. */
+
+    start_mark = parser->mark;
+
+    SKIP(parser);
+
+    /* Consume the content of the quoted scalar. */
+
+    while (1)
+    {
+        /* Check that there are no document indicators at the beginning of the line. */
+
+        if (!CACHE(parser, 4)) goto error;
+
+        if (parser->mark.column == 0 &&
+            ((CHECK_AT(parser->buffer, '-', 0) &&
+              CHECK_AT(parser->buffer, '-', 1) &&
+              CHECK_AT(parser->buffer, '-', 2)) ||
+             (CHECK_AT(parser->buffer, '.', 0) &&
+              CHECK_AT(parser->buffer, '.', 1) &&
+              CHECK_AT(parser->buffer, '.', 2))) &&
+            IS_BLANKZ_AT(parser->buffer, 3))
+        {
+            yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar",
+                    start_mark, "found unexpected document indicator");
+            goto error;
+        }
+
+        /* Check for EOF. */
+
+        if (IS_Z(parser->buffer)) {
+            yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar",
+                    start_mark, "found unexpected end of stream");
+            goto error;
+        }
+
+        /* Consume non-blank characters. */
+
+        if (!CACHE(parser, 2)) goto error;
+
+        leading_blanks = 0;
+
+        while (!IS_BLANKZ(parser->buffer))
+        {
+            /* Check for an escaped single quote. */
+
+            if (single && CHECK_AT(parser->buffer, '\'', 0)
+                    && CHECK_AT(parser->buffer, '\'', 1))
+            {
+                if (!STRING_EXTEND(parser, string)) goto error;
+                *(string.pointer++) = '\'';
+                SKIP(parser);
+                SKIP(parser);
+            }
+
+            /* Check for the right quote. */
+
+            else if (CHECK(parser->buffer, single ? '\'' : '"'))
+            {
+                break;
+            }
+
+            /* Check for an escaped line break. */
+
+            else if (!single && CHECK(parser->buffer, '\\')
+                    && IS_BREAK_AT(parser->buffer, 1))
+            {
+                if (!CACHE(parser, 3)) goto error;
+                SKIP(parser);
+                SKIP_LINE(parser);
+                leading_blanks = 1;
+                break;
+            }
+
+            /* Check for an escape sequence. */
+
+            else if (!single && CHECK(parser->buffer, '\\'))
+            {
+                size_t code_length = 0;
+
+                if (!STRING_EXTEND(parser, string)) goto error;
+
+                /* Check the escape character. */
+
+                switch (parser->buffer.pointer[1])
+                {
+                    case '0':
+                        *(string.pointer++) = '\0';
+                        break;
+
+                    case 'a':
+                        *(string.pointer++) = '\x07';
+                        break;
+
+                    case 'b':
+                        *(string.pointer++) = '\x08';
+                        break;
+
+                    case 't':
+                    case '\t':
+                        *(string.pointer++) = '\x09';
+                        break;
+
+                    case 'n':
+                        *(string.pointer++) = '\x0A';
+                        break;
+
+                    case 'v':
+                        *(string.pointer++) = '\x0B';
+                        break;
+
+                    case 'f':
+                        *(string.pointer++) = '\x0C';
+                        break;
+
+                    case 'r':
+                        *(string.pointer++) = '\x0D';
+                        break;
+
+                    case 'e':
+                        *(string.pointer++) = '\x1B';
+                        break;
+
+                    case ' ':
+                        *(string.pointer++) = '\x20';
+                        break;
+
+                    case '"':
+                        *(string.pointer++) = '"';
+                        break;
+
+                    case '/':
+                        *(string.pointer++) = '/';
+                        break;
+
+                    case '\\':
+                        *(string.pointer++) = '\\';
+                        break;
+
+                    case 'N':   /* NEL (#x85) */
+                        *(string.pointer++) = '\xC2';
+                        *(string.pointer++) = '\x85';
+                        break;
+
+                    case '_':   /* #xA0 */
+                        *(string.pointer++) = '\xC2';
+                        *(string.pointer++) = '\xA0';
+                        break;
+
+                    case 'L':   /* LS (#x2028) */
+                        *(string.pointer++) = '\xE2';
+                        *(string.pointer++) = '\x80';
+                        *(string.pointer++) = '\xA8';
+                        break;
+
+                    case 'P':   /* PS (#x2029) */
+                        *(string.pointer++) = '\xE2';
+                        *(string.pointer++) = '\x80';
+                        *(string.pointer++) = '\xA9';
+                        break;
+
+                    case 'x':
+                        code_length = 2;
+                        break;
+
+                    case 'u':
+                        code_length = 4;
+                        break;
+
+                    case 'U':
+                        code_length = 8;
+                        break;
+
+                    default:
+                        yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
+                                start_mark, "found unknown escape character");
+                        goto error;
+                }
+
+                SKIP(parser);
+                SKIP(parser);
+
+                /* Consume an arbitrary escape code. */
+
+                if (code_length)
+                {
+                    unsigned int value = 0;
+                    size_t k;
+
+                    /* Scan the character value. */
+
+                    if (!CACHE(parser, code_length)) goto error;
+
+                    for (k = 0; k < code_length; k ++) {
+                        if (!IS_HEX_AT(parser->buffer, k)) {
+                            yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
+                                    start_mark, "did not find expected hexdecimal number");
+                            goto error;
+                        }
+                        value = (value << 4) + AS_HEX_AT(parser->buffer, k);
+                    }
+
+                    /* Check the value and write the character. */
+
+                    if ((value >= 0xD800 && value <= 0xDFFF) || value > 0x10FFFF) {
+                        yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
+                                start_mark, "found invalid Unicode character escape code");
+                        goto error;
+                    }
+
+                    if (value <= 0x7F) {
+                        *(string.pointer++) = value;
+                    }
+                    else if (value <= 0x7FF) {
+                        *(string.pointer++) = 0xC0 + (value >> 6);
+                        *(string.pointer++) = 0x80 + (value & 0x3F);
+                    }
+                    else if (value <= 0xFFFF) {
+                        *(string.pointer++) = 0xE0 + (value >> 12);
+                        *(string.pointer++) = 0x80 + ((value >> 6) & 0x3F);
+                        *(string.pointer++) = 0x80 + (value & 0x3F);
+                    }
+                    else {
+                        *(string.pointer++) = 0xF0 + (value >> 18);
+                        *(string.pointer++) = 0x80 + ((value >> 12) & 0x3F);
+                        *(string.pointer++) = 0x80 + ((value >> 6) & 0x3F);
+                        *(string.pointer++) = 0x80 + (value & 0x3F);
+                    }
+
+                    /* Advance the pointer. */
+
+                    for (k = 0; k < code_length; k ++) {
+                        SKIP(parser);
+                    }
+                }
+            }
+
+            else
+            {
+                /* It is a non-escaped non-blank character. */
+
+                if (!READ(parser, string)) goto error;
+            }
+
+            if (!CACHE(parser, 2)) goto error;
+        }
+
+        /* Check if we are at the end of the scalar. */
+
+        /* Fix for crash unitialized value crash
+         * Credit for the bug and input is to OSS Fuzz
+         * Credit for the fix to Alex Gaynor
+         */
+        if (!CACHE(parser, 1)) goto error;
+        if (CHECK(parser->buffer, single ? '\'' : '"'))
+            break;
+
+        /* Consume blank characters. */
+
+        if (!CACHE(parser, 1)) goto error;
+
+        while (IS_BLANK(parser->buffer) || IS_BREAK(parser->buffer))
+        {
+            if (IS_BLANK(parser->buffer))
+            {
+                /* Consume a space or a tab character. */
+
+                if (!leading_blanks) {
+                    if (!READ(parser, whitespaces)) goto error;
+                }
+                else {
+                    SKIP(parser);
+                }
+            }
+            else
+            {
+                if (!CACHE(parser, 2)) goto error;
+
+                /* Check if it is a first line break. */
+
+                if (!leading_blanks)
+                {
+                    CLEAR(parser, whitespaces);
+                    if (!READ_LINE(parser, leading_break)) goto error;
+                    leading_blanks = 1;
+                }
+                else
+                {
+                    if (!READ_LINE(parser, trailing_breaks)) goto error;
+                }
+            }
+            if (!CACHE(parser, 1)) goto error;
+        }
+
+        /* Join the whitespaces or fold line breaks. */
+
+        if (leading_blanks)
+        {
+            /* Do we need to fold line breaks? */
+
+            if (leading_break.start[0] == '\n') {
+                if (trailing_breaks.start[0] == '\0') {
+                    if (!STRING_EXTEND(parser, string)) goto error;
+                    *(string.pointer++) = ' ';
+                }
+                else {
+                    if (!JOIN(parser, string, trailing_breaks)) goto error;
+                    CLEAR(parser, trailing_breaks);
+                }
+                CLEAR(parser, leading_break);
+            }
+            else {
+                if (!JOIN(parser, string, leading_break)) goto error;
+                if (!JOIN(parser, string, trailing_breaks)) goto error;
+                CLEAR(parser, leading_break);
+                CLEAR(parser, trailing_breaks);
+            }
+        }
+        else
+        {
+            if (!JOIN(parser, string, whitespaces)) goto error;
+            CLEAR(parser, whitespaces);
+        }
+    }
+
+    /* Eat the right quote. */
+
+    SKIP(parser);
+
+    end_mark = parser->mark;
+
+    /* Create a token. */
+
+    SCALAR_TOKEN_INIT(*token, string.start, string.pointer-string.start,
+            single ? YAML_SINGLE_QUOTED_SCALAR_STYLE : YAML_DOUBLE_QUOTED_SCALAR_STYLE,
+            start_mark, end_mark);
+
+    STRING_DEL(parser, leading_break);
+    STRING_DEL(parser, trailing_breaks);
+    STRING_DEL(parser, whitespaces);
+
+    return 1;
+
+error:
+    STRING_DEL(parser, string);
+    STRING_DEL(parser, leading_break);
+    STRING_DEL(parser, trailing_breaks);
+    STRING_DEL(parser, whitespaces);
+
+    return 0;
+}
+
+/*
+ * Scan a plain scalar.
+ */
+
+static int
+yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
+{
+    yaml_mark_t start_mark;
+    yaml_mark_t end_mark;
+    yaml_string_t string = NULL_STRING;
+    yaml_string_t leading_break = NULL_STRING;
+    yaml_string_t trailing_breaks = NULL_STRING;
+    yaml_string_t whitespaces = NULL_STRING;
+    int leading_blanks = 0;
+    int indent = parser->indent+1;
+
+    if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
+    if (!STRING_INIT(parser, leading_break, INITIAL_STRING_SIZE)) goto error;
+    if (!STRING_INIT(parser, trailing_breaks, INITIAL_STRING_SIZE)) goto error;
+    if (!STRING_INIT(parser, whitespaces, INITIAL_STRING_SIZE)) goto error;
+
+    start_mark = end_mark = parser->mark;
+
+    /* Consume the content of the plain scalar. */
+
+    while (1)
+    {
+        /* Check for a document indicator. */
+
+        if (!CACHE(parser, 4)) goto error;
+
+        if (parser->mark.column == 0 &&
+            ((CHECK_AT(parser->buffer, '-', 0) &&
+              CHECK_AT(parser->buffer, '-', 1) &&
+              CHECK_AT(parser->buffer, '-', 2)) ||
+             (CHECK_AT(parser->buffer, '.', 0) &&
+              CHECK_AT(parser->buffer, '.', 1) &&
+              CHECK_AT(parser->buffer, '.', 2))) &&
+            IS_BLANKZ_AT(parser->buffer, 3)) break;
+
+        /* Check for a comment. */
+
+        if (CHECK(parser->buffer, '#'))
+            break;
+
+        /* Consume non-blank characters. */
+
+        while (!IS_BLANKZ(parser->buffer))
+        {
+            /* Check for 'x:x' in the flow context. TODO: Fix the test "spec-08-13". */
+
+            if (parser->flow_level
+                    && CHECK(parser->buffer, ':')
+                    && !IS_BLANKZ_AT(parser->buffer, 1)) {
+                yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
+                        start_mark, "found unexpected ':'");
+                goto error;
+            }
+
+            /* Check for indicators that may end a plain scalar. */
+
+            if ((CHECK(parser->buffer, ':') && IS_BLANKZ_AT(parser->buffer, 1))
+                    || (parser->flow_level &&
+                        (CHECK(parser->buffer, ',') || CHECK(parser->buffer, ':')
+                         || CHECK(parser->buffer, '?') || CHECK(parser->buffer, '[')
+                         || CHECK(parser->buffer, ']') || CHECK(parser->buffer, '{')
+                         || CHECK(parser->buffer, '}'))))
+                break;
+
+            /* Check if we need to join whitespaces and breaks. */
+
+            if (leading_blanks || whitespaces.start != whitespaces.pointer)
+            {
+                if (leading_blanks)
+                {
+                    /* Do we need to fold line breaks? */
+
+                    if (leading_break.start[0] == '\n') {
+                        if (trailing_breaks.start[0] == '\0') {
+                            if (!STRING_EXTEND(parser, string)) goto error;
+                            *(string.pointer++) = ' ';
+                        }
+                        else {
+                            if (!JOIN(parser, string, trailing_breaks)) goto error;
+                            CLEAR(parser, trailing_breaks);
+                        }
+                        CLEAR(parser, leading_break);
+                    }
+                    else {
+                        if (!JOIN(parser, string, leading_break)) goto error;
+                        if (!JOIN(parser, string, trailing_breaks)) goto error;
+                        CLEAR(parser, leading_break);
+                        CLEAR(parser, trailing_breaks);
+                    }
+
+                    leading_blanks = 0;
+                }
+                else
+                {
+                    if (!JOIN(parser, string, whitespaces)) goto error;
+                    CLEAR(parser, whitespaces);
+                }
+            }
+
+            /* Copy the character. */
+
+            if (!READ(parser, string)) goto error;
+
+            end_mark = parser->mark;
+
+            if (!CACHE(parser, 2)) goto error;
+        }
+
+        /* Is it the end? */
+
+        if (!(IS_BLANK(parser->buffer) || IS_BREAK(parser->buffer)))
+            break;
+
+        /* Consume blank characters. */
+
+        if (!CACHE(parser, 1)) goto error;
+
+        while (IS_BLANK(parser->buffer) || IS_BREAK(parser->buffer))
+        {
+            if (IS_BLANK(parser->buffer))
+            {
+                /* Check for tab characters that abuse indentation. */
+
+                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");
+                    goto error;
+                }
+
+                /* Consume a space or a tab character. */
+
+                if (!leading_blanks) {
+                    if (!READ(parser, whitespaces)) goto error;
+                }
+                else {
+                    SKIP(parser);
+                }
+            }
+            else
+            {
+                if (!CACHE(parser, 2)) goto error;
+
+                /* Check if it is a first line break. */
+
+                if (!leading_blanks)
+                {
+                    CLEAR(parser, whitespaces);
+                    if (!READ_LINE(parser, leading_break)) goto error;
+                    leading_blanks = 1;
+                }
+                else
+                {
+                    if (!READ_LINE(parser, trailing_breaks)) goto error;
+                }
+            }
+            if (!CACHE(parser, 1)) goto error;
+        }
+
+        /* Check indentation level. */
+
+        if (!parser->flow_level && (int)parser->mark.column < indent)
+            break;
+    }
+
+    /* Create a token. */
+
+    SCALAR_TOKEN_INIT(*token, string.start, string.pointer-string.start,
+            YAML_PLAIN_SCALAR_STYLE, start_mark, end_mark);
+
+    /* Note that we change the 'simple_key_allowed' flag. */
+
+    if (leading_blanks) {
+        parser->simple_key_allowed = 1;
+    }
+
+    STRING_DEL(parser, leading_break);
+    STRING_DEL(parser, trailing_breaks);
+    STRING_DEL(parser, whitespaces);
+
+    return 1;
+
+error:
+    STRING_DEL(parser, string);
+    STRING_DEL(parser, leading_break);
+    STRING_DEL(parser, trailing_breaks);
+    STRING_DEL(parser, whitespaces);
+
+    return 0;
+}
diff --git a/ext/psych/yaml/writer.c b/ext/psych/yaml/writer.c
new file mode 100644
index 0000000000..5d57f392f1
--- /dev/null
+++ b/ext/psych/yaml/writer.c
@@ -0,0 +1,141 @@
+
+#include "yaml_private.h"
+
+/*
+ * Declarations.
+ */
+
+static int
+yaml_emitter_set_writer_error(yaml_emitter_t *emitter, const char *problem);
+
+YAML_DECLARE(int)
+yaml_emitter_flush(yaml_emitter_t *emitter);
+
+/*
+ * Set the writer error and return 0.
+ */
+
+static int
+yaml_emitter_set_writer_error(yaml_emitter_t *emitter, const char *problem)
+{
+    emitter->error = YAML_WRITER_ERROR;
+    emitter->problem = problem;
+
+    return 0;
+}
+
+/*
+ * Flush the output buffer.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_flush(yaml_emitter_t *emitter)
+{
+    int low, high;
+
+    assert(emitter);    /* Non-NULL emitter object is expected. */
+    assert(emitter->write_handler); /* Write handler must be set. */
+    assert(emitter->encoding);  /* Output encoding must be set. */
+
+    emitter->buffer.last = emitter->buffer.pointer;
+    emitter->buffer.pointer = emitter->buffer.start;
+
+    /* Check if the buffer is empty. */
+
+    if (emitter->buffer.start == emitter->buffer.last) {
+        return 1;
+    }
+
+    /* If the output encoding is UTF-8, we don't need to recode the buffer. */
+
+    if (emitter->encoding == YAML_UTF8_ENCODING)
+    {
+        if (emitter->write_handler(emitter->write_handler_data,
+                    emitter->buffer.start,
+                    emitter->buffer.last - emitter->buffer.start)) {
+            emitter->buffer.last = emitter->buffer.start;
+            emitter->buffer.pointer = emitter->buffer.start;
+            return 1;
+        }
+        else {
+            return yaml_emitter_set_writer_error(emitter, "write error");
+        }
+    }
+
+    /* Recode the buffer into the raw buffer. */
+
+    low = (emitter->encoding == YAML_UTF16LE_ENCODING ? 0 : 1);
+    high = (emitter->encoding == YAML_UTF16LE_ENCODING ? 1 : 0);
+
+    while (emitter->buffer.pointer != emitter->buffer.last)
+    {
+        unsigned char octet;
+        unsigned int width;
+        unsigned int value;
+        size_t k;
+
+        /*
+         * See the "reader.c" code for more details on UTF-8 encoding.  Note
+         * that we assume that the buffer contains a valid UTF-8 sequence.
+         */
+
+        /* Read the next UTF-8 character. */
+
+        octet = emitter->buffer.pointer[0];
+
+        width = (octet & 0x80) == 0x00 ? 1 :
+                (octet & 0xE0) == 0xC0 ? 2 :
+                (octet & 0xF0) == 0xE0 ? 3 :
+                (octet & 0xF8) == 0xF0 ? 4 : 0;
+
+        value = (octet & 0x80) == 0x00 ? octet & 0x7F :
+                (octet & 0xE0) == 0xC0 ? octet & 0x1F :
+                (octet & 0xF0) == 0xE0 ? octet & 0x0F :
+                (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
+
+        for (k = 1; k < width; k ++) {
+            octet = emitter->buffer.pointer[k];
+            value = (value << 6) + (octet & 0x3F);
+        }
+
+        emitter->buffer.pointer += width;
+
+        /* Write the character. */
+
+        if (value < 0x10000)
+        {
+            emitter->raw_buffer.last[high] = value >> 8;
+            emitter->raw_buffer.last[low] = value & 0xFF;
+
+            emitter->raw_buffer.last += 2;
+        }
+        else
+        {
+            /* Write the character using a surrogate pair (check "reader.c"). */
+
+            value -= 0x10000;
+            emitter->raw_buffer.last[high] = 0xD8 + (value >> 18);
+            emitter->raw_buffer.last[low] = (value >> 10) & 0xFF;
+            emitter->raw_buffer.last[high+2] = 0xDC + ((value >> 8) & 0xFF);
+            emitter->raw_buffer.last[low+2] = value & 0xFF;
+
+            emitter->raw_buffer.last += 4;
+        }
+    }
+
+    /* Write the raw buffer. */
+
+    if (emitter->write_handler(emitter->write_handler_data,
+                emitter->raw_buffer.start,
+                emitter->raw_buffer.last - emitter->raw_buffer.start)) {
+        emitter->buffer.last = emitter->buffer.start;
+        emitter->buffer.pointer = emitter->buffer.start;
+        emitter->raw_buffer.last = emitter->raw_buffer.start;
+        emitter->raw_buffer.pointer = emitter->raw_buffer.start;
+        return 1;
+    }
+    else {
+        return yaml_emitter_set_writer_error(emitter, "write error");
+    }
+}
+
diff --git a/ext/psych/yaml/yaml.h b/ext/psych/yaml/yaml.h
new file mode 100644
index 0000000000..f33a152594
--- /dev/null
+++ b/ext/psych/yaml/yaml.h
@@ -0,0 +1,1971 @@
+/**
+ * @file yaml.h
+ * @brief Public interface for libyaml.
+ *
+ * Include the header file with the code:
+ * @code
+ * #include <yaml.h>
+ * @endcode
+ */
+
+#ifndef YAML_H
+#define YAML_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+/**
+ * @defgroup export Export Definitions
+ * @{
+ */
+
+/** The public API declaration. */
+
+#ifdef _WIN32
+#   if defined(YAML_DECLARE_STATIC)
+#       define  YAML_DECLARE(type)  type
+#   elif defined(YAML_DECLARE_EXPORT)
+#       define  YAML_DECLARE(type)  __declspec(dllexport) type
+#   else
+#       define  YAML_DECLARE(type)  __declspec(dllimport) type
+#   endif
+#else
+#   define  YAML_DECLARE(type)  type
+#endif
+
+/** @} */
+
+/**
+ * @defgroup version Version Information
+ * @{
+ */
+
+/**
+ * Get the library version as a string.
+ *
+ * @returns The function returns the pointer to a static string of the form
+ * @c "X.Y.Z", where @c X is the major version number, @c Y is a minor version
+ * number, and @c Z is the patch version number.
+ */
+
+YAML_DECLARE(const char *)
+yaml_get_version_string(void);
+
+/**
+ * Get the library version numbers.
+ *
+ * @param[out]      major   Major version number.
+ * @param[out]      minor   Minor version number.
+ * @param[out]      patch   Patch version number.
+ */
+
+YAML_DECLARE(void)
+yaml_get_version(int *major, int *minor, int *patch);
+
+/** @} */
+
+/**
+ * @defgroup basic Basic Types
+ * @{
+ */
+
+/** The character type (UTF-8 octet). */
+typedef unsigned char yaml_char_t;
+
+/** The version directive data. */
+typedef struct yaml_version_directive_s {
+    /** The major version number. */
+    int major;
+    /** The minor version number. */
+    int minor;
+} yaml_version_directive_t;
+
+/** The tag directive data. */
+typedef struct yaml_tag_directive_s {
+    /** The tag handle. */
+    yaml_char_t *handle;
+    /** The tag prefix. */
+    yaml_char_t *prefix;
+} yaml_tag_directive_t;
+
+/** The stream encoding. */
+typedef enum yaml_encoding_e {
+    /** Let the parser choose the encoding. */
+    YAML_ANY_ENCODING,
+    /** The default UTF-8 encoding. */
+    YAML_UTF8_ENCODING,
+    /** The UTF-16-LE encoding with BOM. */
+    YAML_UTF16LE_ENCODING,
+    /** The UTF-16-BE encoding with BOM. */
+    YAML_UTF16BE_ENCODING
+} yaml_encoding_t;
+
+/** Line break types. */
+
+typedef enum yaml_break_e {
+    /** Let the parser choose the break type. */
+    YAML_ANY_BREAK,
+    /** Use CR for line breaks (Mac style). */
+    YAML_CR_BREAK,
+    /** Use LN for line breaks (Unix style). */
+    YAML_LN_BREAK,
+    /** Use CR LN for line breaks (DOS style). */
+    YAML_CRLN_BREAK
+} yaml_break_t;
+
+/** Many bad things could happen with the parser and emitter. */
+typedef enum yaml_error_type_e {
+    /** No error is produced. */
+    YAML_NO_ERROR,
+
+    /** Cannot allocate or reallocate a block of memory. */
+    YAML_MEMORY_ERROR,
+
+    /** Cannot read or decode the input stream. */
+    YAML_READER_ERROR,
+    /** Cannot scan the input stream. */
+    YAML_SCANNER_ERROR,
+    /** Cannot parse the input stream. */
+    YAML_PARSER_ERROR,
+    /** Cannot compose a YAML document. */
+    YAML_COMPOSER_ERROR,
+
+    /** Cannot write to the output stream. */
+    YAML_WRITER_ERROR,
+    /** Cannot emit a YAML stream. */
+    YAML_EMITTER_ERROR
+} yaml_error_type_t;
+
+/** The pointer position. */
+typedef struct yaml_mark_s {
+    /** The position index. */
+    size_t index;
+
+    /** The position line. */
+    size_t line;
+
+    /** The position column. */
+    size_t column;
+} yaml_mark_t;
+
+/** @} */
+
+/**
+ * @defgroup styles Node Styles
+ * @{
+ */
+
+/** Scalar styles. */
+typedef enum yaml_scalar_style_e {
+    /** Let the emitter choose the style. */
+    YAML_ANY_SCALAR_STYLE,
+
+    /** The plain scalar style. */
+    YAML_PLAIN_SCALAR_STYLE,
+
+    /** The single-quoted scalar style. */
+    YAML_SINGLE_QUOTED_SCALAR_STYLE,
+    /** The double-quoted scalar style. */
+    YAML_DOUBLE_QUOTED_SCALAR_STYLE,
+
+    /** The literal scalar style. */
+    YAML_LITERAL_SCALAR_STYLE,
+    /** The folded scalar style. */
+    YAML_FOLDED_SCALAR_STYLE
+} yaml_scalar_style_t;
+
+/** Sequence styles. */
+typedef enum yaml_sequence_style_e {
+    /** Let the emitter choose the style. */
+    YAML_ANY_SEQUENCE_STYLE,
+
+    /** The block sequence style. */
+    YAML_BLOCK_SEQUENCE_STYLE,
+    /** The flow sequence style. */
+    YAML_FLOW_SEQUENCE_STYLE
+} yaml_sequence_style_t;
+
+/** Mapping styles. */
+typedef enum yaml_mapping_style_e {
+    /** Let the emitter choose the style. */
+    YAML_ANY_MAPPING_STYLE,
+
+    /** The block mapping style. */
+    YAML_BLOCK_MAPPING_STYLE,
+    /** The flow mapping style. */
+    YAML_FLOW_MAPPING_STYLE
+/*    YAML_FLOW_SET_MAPPING_STYLE   */
+} yaml_mapping_style_t;
+
+/** @} */
+
+/**
+ * @defgroup tokens Tokens
+ * @{
+ */
+
+/** Token types. */
+typedef enum yaml_token_type_e {
+    /** An empty token. */
+    YAML_NO_TOKEN,
+
+    /** A STREAM-START token. */
+    YAML_STREAM_START_TOKEN,
+    /** A STREAM-END token. */
+    YAML_STREAM_END_TOKEN,
+
+    /** A VERSION-DIRECTIVE token. */
+    YAML_VERSION_DIRECTIVE_TOKEN,
+    /** A TAG-DIRECTIVE token. */
+    YAML_TAG_DIRECTIVE_TOKEN,
+    /** A DOCUMENT-START token. */
+    YAML_DOCUMENT_START_TOKEN,
+    /** A DOCUMENT-END token. */
+    YAML_DOCUMENT_END_TOKEN,
+
+    /** A BLOCK-SEQUENCE-START token. */
+    YAML_BLOCK_SEQUENCE_START_TOKEN,
+    /** A BLOCK-SEQUENCE-END token. */
+    YAML_BLOCK_MAPPING_START_TOKEN,
+    /** A BLOCK-END token. */
+    YAML_BLOCK_END_TOKEN,
+
+    /** A FLOW-SEQUENCE-START token. */
+    YAML_FLOW_SEQUENCE_START_TOKEN,
+    /** A FLOW-SEQUENCE-END token. */
+    YAML_FLOW_SEQUENCE_END_TOKEN,
+    /** A FLOW-MAPPING-START token. */
+    YAML_FLOW_MAPPING_START_TOKEN,
+    /** A FLOW-MAPPING-END token. */
+    YAML_FLOW_MAPPING_END_TOKEN,
+
+    /** A BLOCK-ENTRY token. */
+    YAML_BLOCK_ENTRY_TOKEN,
+    /** A FLOW-ENTRY token. */
+    YAML_FLOW_ENTRY_TOKEN,
+    /** A KEY token. */
+    YAML_KEY_TOKEN,
+    /** A VALUE token. */
+    YAML_VALUE_TOKEN,
+
+    /** An ALIAS token. */
+    YAML_ALIAS_TOKEN,
+    /** An ANCHOR token. */
+    YAML_ANCHOR_TOKEN,
+    /** A TAG token. */
+    YAML_TAG_TOKEN,
+    /** A SCALAR token. */
+    YAML_SCALAR_TOKEN
+} yaml_token_type_t;
+
+/** The token structure. */
+typedef struct yaml_token_s {
+
+    /** The token type. */
+    yaml_token_type_t type;
+
+    /** The token data. */
+    union {
+
+        /** The stream start (for @c YAML_STREAM_START_TOKEN). */
+        struct {
+            /** The stream encoding. */
+            yaml_encoding_t encoding;
+        } stream_start;
+
+        /** The alias (for @c YAML_ALIAS_TOKEN). */
+        struct {
+            /** The alias value. */
+            yaml_char_t *value;
+        } alias;
+
+        /** The anchor (for @c YAML_ANCHOR_TOKEN). */
+        struct {
+            /** The anchor value. */
+            yaml_char_t *value;
+        } anchor;
+
+        /** The tag (for @c YAML_TAG_TOKEN). */
+        struct {
+            /** The tag handle. */
+            yaml_char_t *handle;
+            /** The tag suffix. */
+            yaml_char_t *suffix;
+        } tag;
+
+        /** The scalar value (for @c YAML_SCALAR_TOKEN). */
+        struct {
+            /** The scalar value. */
+            yaml_char_t *value;
+            /** The length of the scalar value. */
+            size_t length;
+            /** The scalar style. */
+            yaml_scalar_style_t style;
+        } scalar;
+
+        /** The version directive (for @c YAML_VERSION_DIRECTIVE_TOKEN). */
+        struct {
+            /** The major version number. */
+            int major;
+            /** The minor version number. */
+            int minor;
+        } version_directive;
+
+        /** The tag directive (for @c YAML_TAG_DIRECTIVE_TOKEN). */
+        struct {
+            /** The tag handle. */
+            yaml_char_t *handle;
+            /** The tag prefix. */
+            yaml_char_t *prefix;
+        } tag_directive;
+
+    } data;
+
+    /** The beginning of the token. */
+    yaml_mark_t start_mark;
+    /** The end of the token. */
+    yaml_mark_t end_mark;
+
+} yaml_token_t;
+
+/**
+ * Free any memory allocated for a token object.
+ *
+ * @param[in,out]   token   A token object.
+ */
+
+YAML_DECLARE(void)
+yaml_token_delete(yaml_token_t *token);
+
+/** @} */
+
+/**
+ * @defgroup events Events
+ * @{
+ */
+
+/** Event types. */
+typedef enum yaml_event_type_e {
+    /** An empty event. */
+    YAML_NO_EVENT,
+
+    /** A STREAM-START event. */
+    YAML_STREAM_START_EVENT,
+    /** A STREAM-END event. */
+    YAML_STREAM_END_EVENT,
+
+    /** A DOCUMENT-START event. */
+    YAML_DOCUMENT_START_EVENT,
+    /** A DOCUMENT-END event. */
+    YAML_DOCUMENT_END_EVENT,
+
+    /** An ALIAS event. */
+    YAML_ALIAS_EVENT,
+    /** A SCALAR event. */
+    YAML_SCALAR_EVENT,
+
+    /** A SEQUENCE-START event. */
+    YAML_SEQUENCE_START_EVENT,
+    /** A SEQUENCE-END event. */
+    YAML_SEQUENCE_END_EVENT,
+
+    /** A MAPPING-START event. */
+    YAML_MAPPING_START_EVENT,
+    /** A MAPPING-END event. */
+    YAML_MAPPING_END_EVENT
+} yaml_event_type_t;
+
+/** The event structure. */
+typedef struct yaml_event_s {
+
+    /** The event type. */
+    yaml_event_type_t type;
+
+    /** The event data. */
+    union {
+
+        /** The stream parameters (for @c YAML_STREAM_START_EVENT). */
+        struct {
+            /** The document encoding. */
+            yaml_encoding_t encoding;
+        } stream_start;
+
+        /** The document parameters (for @c YAML_DOCUMENT_START_EVENT). */
+        struct {
+            /** The version directive. */
+            yaml_version_directive_t *version_directive;
+
+            /** The list of tag directives. */
+            struct {
+                /** The beginning of the tag directives list. */
+                yaml_tag_directive_t *start;
+                /** The end of the tag directives list. */
+                yaml_tag_directive_t *end;
+            } tag_directives;
+
+            /** Is the document indicator implicit? */
+            int implicit;
+        } document_start;
+
+        /** The document end parameters (for @c YAML_DOCUMENT_END_EVENT). */
+        struct {
+            /** Is the document end indicator implicit? */
+            int implicit;
+        } document_end;
+
+        /** The alias parameters (for @c YAML_ALIAS_EVENT). */
+        struct {
+            /** The anchor. */
+            yaml_char_t *anchor;
+        } alias;
+
+        /** The scalar parameters (for @c YAML_SCALAR_EVENT). */
+        struct {
+            /** The anchor. */
+            yaml_char_t *anchor;
+            /** The tag. */
+            yaml_char_t *tag;
+            /** The scalar value. */
+            yaml_char_t *value;
+            /** The length of the scalar value. */
+            size_t length;
+            /** Is the tag optional for the plain style? */
+            int plain_implicit;
+            /** Is the tag optional for any non-plain style? */
+            int quoted_implicit;
+            /** The scalar style. */
+            yaml_scalar_style_t style;
+        } scalar;
+
+        /** The sequence parameters (for @c YAML_SEQUENCE_START_EVENT). */
+        struct {
+            /** The anchor. */
+            yaml_char_t *anchor;
+            /** The tag. */
+            yaml_char_t *tag;
+            /** Is the tag optional? */
+            int implicit;
+            /** The sequence style. */
+            yaml_sequence_style_t style;
+        } sequence_start;
+
+        /** The mapping parameters (for @c YAML_MAPPING_START_EVENT). */
+        struct {
+            /** The anchor. */
+            yaml_char_t *anchor;
+            /** The tag. */
+            yaml_char_t *tag;
+            /** Is the tag optional? */
+            int implicit;
+            /** The mapping style. */
+            yaml_mapping_style_t style;
+        } mapping_start;
+
+    } data;
+
+    /** The beginning of the event. */
+    yaml_mark_t start_mark;
+    /** The end of the event. */
+    yaml_mark_t end_mark;
+
+} yaml_event_t;
+
+/**
+ * Create the STREAM-START event.
+ *
+ * @param[out]      event       An empty event object.
+ * @param[in]       encoding    The stream encoding.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_stream_start_event_initialize(yaml_event_t *event,
+        yaml_encoding_t encoding);
+
+/**
+ * Create the STREAM-END event.
+ *
+ * @param[out]      event       An empty event object.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_stream_end_event_initialize(yaml_event_t *event);
+
+/**
+ * Create the DOCUMENT-START event.
+ *
+ * The @a implicit argument is considered as a stylistic parameter and may be
+ * ignored by the emitter.
+ *
+ * @param[out]      event                   An empty event object.
+ * @param[in]       version_directive       The %YAML directive value or
+ *                                          @c NULL.
+ * @param[in]       tag_directives_start    The beginning of the %TAG
+ *                                          directives list.
+ * @param[in]       tag_directives_end      The end of the %TAG directives
+ *                                          list.
+ * @param[in]       implicit                If the document start indicator is
+ *                                          implicit.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_document_start_event_initialize(yaml_event_t *event,
+        yaml_version_directive_t *version_directive,
+        yaml_tag_directive_t *tag_directives_start,
+        yaml_tag_directive_t *tag_directives_end,
+        int implicit);
+
+/**
+ * Create the DOCUMENT-END event.
+ *
+ * The @a implicit argument is considered as a stylistic parameter and may be
+ * ignored by the emitter.
+ *
+ * @param[out]      event       An empty event object.
+ * @param[in]       implicit    If the document end indicator is implicit.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_document_end_event_initialize(yaml_event_t *event, int implicit);
+
+/**
+ * Create an ALIAS event.
+ *
+ * @param[out]      event       An empty event object.
+ * @param[in]       anchor      The anchor value.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor);
+
+/**
+ * Create a SCALAR event.
+ *
+ * The @a style argument may be ignored by the emitter.
+ *
+ * Either the @a tag attribute or one of the @a plain_implicit and
+ * @a quoted_implicit flags must be set.
+ *
+ * @param[out]      event           An empty event object.
+ * @param[in]       anchor          The scalar anchor or @c NULL.
+ * @param[in]       tag             The scalar tag or @c NULL.
+ * @param[in]       value           The scalar value.
+ * @param[in]       length          The length of the scalar value.
+ * @param[in]       plain_implicit  If the tag may be omitted for the plain
+ *                                  style.
+ * @param[in]       quoted_implicit If the tag may be omitted for any
+ *                                  non-plain style.
+ * @param[in]       style           The scalar style.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_scalar_event_initialize(yaml_event_t *event,
+        yaml_char_t *anchor, yaml_char_t *tag,
+        yaml_char_t *value, int length,
+        int plain_implicit, int quoted_implicit,
+        yaml_scalar_style_t style);
+
+/**
+ * Create a SEQUENCE-START event.
+ *
+ * The @a style argument may be ignored by the emitter.
+ *
+ * Either the @a tag attribute or the @a implicit flag must be set.
+ *
+ * @param[out]      event       An empty event object.
+ * @param[in]       anchor      The sequence anchor or @c NULL.
+ * @param[in]       tag         The sequence tag or @c NULL.
+ * @param[in]       implicit    If the tag may be omitted.
+ * @param[in]       style       The sequence style.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_sequence_start_event_initialize(yaml_event_t *event,
+        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        yaml_sequence_style_t style);
+
+/**
+ * Create a SEQUENCE-END event.
+ *
+ * @param[out]      event       An empty event object.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_sequence_end_event_initialize(yaml_event_t *event);
+
+/**
+ * Create a MAPPING-START event.
+ *
+ * The @a style argument may be ignored by the emitter.
+ *
+ * Either the @a tag attribute or the @a implicit flag must be set.
+ *
+ * @param[out]      event       An empty event object.
+ * @param[in]       anchor      The mapping anchor or @c NULL.
+ * @param[in]       tag         The mapping tag or @c NULL.
+ * @param[in]       implicit    If the tag may be omitted.
+ * @param[in]       style       The mapping style.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_mapping_start_event_initialize(yaml_event_t *event,
+        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        yaml_mapping_style_t style);
+
+/**
+ * Create a MAPPING-END event.
+ *
+ * @param[out]      event       An empty event object.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_mapping_end_event_initialize(yaml_event_t *event);
+
+/**
+ * Free any memory allocated for an event object.
+ *
+ * @param[in,out]   event   An event object.
+ */
+
+YAML_DECLARE(void)
+yaml_event_delete(yaml_event_t *event);
+
+/** @} */
+
+/**
+ * @defgroup nodes Nodes
+ * @{
+ */
+
+/** The tag @c !!null with the only possible value: @c null. */
+#define YAML_NULL_TAG       "tag:yaml.org,2002:null"
+/** The tag @c !!bool with the values: @c true and @c falce. */
+#define YAML_BOOL_TAG       "tag:yaml.org,2002:bool"
+/** The tag @c !!str for string values. */
+#define YAML_STR_TAG        "tag:yaml.org,2002:str"
+/** The tag @c !!int for integer values. */
+#define YAML_INT_TAG        "tag:yaml.org,2002:int"
+/** The tag @c !!float for float values. */
+#define YAML_FLOAT_TAG      "tag:yaml.org,2002:float"
+/** The tag @c !!timestamp for date and time values. */
+#define YAML_TIMESTAMP_TAG  "tag:yaml.org,2002:timestamp"
+
+/** The tag @c !!seq is used to denote sequences. */
+#define YAML_SEQ_TAG        "tag:yaml.org,2002:seq"
+/** The tag @c !!map is used to denote mapping. */
+#define YAML_MAP_TAG        "tag:yaml.org,2002:map"
+
+/** The default scalar tag is @c !!str. */
+#define YAML_DEFAULT_SCALAR_TAG     YAML_STR_TAG
+/** The default sequence tag is @c !!seq. */
+#define YAML_DEFAULT_SEQUENCE_TAG   YAML_SEQ_TAG
+/** The default mapping tag is @c !!map. */
+#define YAML_DEFAULT_MAPPING_TAG    YAML_MAP_TAG
+
+/** Node types. */
+typedef enum yaml_node_type_e {
+    /** An empty node. */
+    YAML_NO_NODE,
+
+    /** A scalar node. */
+    YAML_SCALAR_NODE,
+    /** A sequence node. */
+    YAML_SEQUENCE_NODE,
+    /** A mapping node. */
+    YAML_MAPPING_NODE
+} yaml_node_type_t;
+
+/** The forward definition of a document node structure. */
+typedef struct yaml_node_s yaml_node_t;
+
+/** An element of a sequence node. */
+typedef int yaml_node_item_t;
+
+/** An element of a mapping node. */
+typedef struct yaml_node_pair_s {
+    /** The key of the element. */
+    int key;
+    /** The value of the element. */
+    int value;
+} yaml_node_pair_t;
+
+/** The node structure. */
+struct yaml_node_s {
+
+    /** The node type. */
+    yaml_node_type_t type;
+
+    /** The node tag. */
+    yaml_char_t *tag;
+
+    /** The node data. */
+    union {
+
+        /** The scalar parameters (for @c YAML_SCALAR_NODE). */
+        struct {
+            /** The scalar value. */
+            yaml_char_t *value;
+            /** The length of the scalar value. */
+            size_t length;
+            /** The scalar style. */
+            yaml_scalar_style_t style;
+        } scalar;
+
+        /** The sequence parameters (for @c YAML_SEQUENCE_NODE). */
+        struct {
+            /** The stack of sequence items. */
+            struct {
+                /** The beginning of the stack. */
+                yaml_node_item_t *start;
+                /** The end of the stack. */
+                yaml_node_item_t *end;
+                /** The top of the stack. */
+                yaml_node_item_t *top;
+            } items;
+            /** The sequence style. */
+            yaml_sequence_style_t style;
+        } sequence;
+
+        /** The mapping parameters (for @c YAML_MAPPING_NODE). */
+        struct {
+            /** The stack of mapping pairs (key, value). */
+            struct {
+                /** The beginning of the stack. */
+                yaml_node_pair_t *start;
+                /** The end of the stack. */
+                yaml_node_pair_t *end;
+                /** The top of the stack. */
+                yaml_node_pair_t *top;
+            } pairs;
+            /** The mapping style. */
+            yaml_mapping_style_t style;
+        } mapping;
+
+    } data;
+
+    /** The beginning of the node. */
+    yaml_mark_t start_mark;
+    /** The end of the node. */
+    yaml_mark_t end_mark;
+
+};
+
+/** The document structure. */
+typedef struct yaml_document_s {
+
+    /** The document nodes. */
+    struct {
+        /** The beginning of the stack. */
+        yaml_node_t *start;
+        /** The end of the stack. */
+        yaml_node_t *end;
+        /** The top of the stack. */
+        yaml_node_t *top;
+    } nodes;
+
+    /** The version directive. */
+    yaml_version_directive_t *version_directive;
+
+    /** The list of tag directives. */
+    struct {
+        /** The beginning of the tag directives list. */
+        yaml_tag_directive_t *start;
+        /** The end of the tag directives list. */
+        yaml_tag_directive_t *end;
+    } tag_directives;
+
+    /** Is the document start indicator implicit? */
+    int start_implicit;
+    /** Is the document end indicator implicit? */
+    int end_implicit;
+
+    /** The beginning of the document. */
+    yaml_mark_t start_mark;
+    /** The end of the document. */
+    yaml_mark_t end_mark;
+
+} yaml_document_t;
+
+/**
+ * Create a YAML document.
+ *
+ * @param[out]      document                An empty document object.
+ * @param[in]       version_directive       The %YAML directive value or
+ *                                          @c NULL.
+ * @param[in]       tag_directives_start    The beginning of the %TAG
+ *                                          directives list.
+ * @param[in]       tag_directives_end      The end of the %TAG directives
+ *                                          list.
+ * @param[in]       start_implicit          If the document start indicator is
+ *                                          implicit.
+ * @param[in]       end_implicit            If the document end indicator is
+ *                                          implicit.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_document_initialize(yaml_document_t *document,
+        yaml_version_directive_t *version_directive,
+        yaml_tag_directive_t *tag_directives_start,
+        yaml_tag_directive_t *tag_directives_end,
+        int start_implicit, int end_implicit);
+
+/**
+ * Delete a YAML document and all its nodes.
+ *
+ * @param[in,out]   document        A document object.
+ */
+
+YAML_DECLARE(void)
+yaml_document_delete(yaml_document_t *document);
+
+/**
+ * Get a node of a YAML document.
+ *
+ * The pointer returned by this function is valid until any of the functions
+ * modifying the documents are called.
+ *
+ * @param[in]       document        A document object.
+ * @param[in]       index           The node id.
+ *
+ * @returns the node objct or @c NULL if @c node_id is out of range.
+ */
+
+YAML_DECLARE(yaml_node_t *)
+yaml_document_get_node(yaml_document_t *document, int index);
+
+/**
+ * Get the root of a YAML document node.
+ *
+ * The root object is the first object added to the document.
+ *
+ * The pointer returned by this function is valid until any of the functions
+ * modifying the documents are called.
+ *
+ * An empty document produced by the parser signifies the end of a YAML
+ * stream.
+ *
+ * @param[in]       document        A document object.
+ *
+ * @returns the node object or @c NULL if the document is empty.
+ */
+
+YAML_DECLARE(yaml_node_t *)
+yaml_document_get_root_node(yaml_document_t *document);
+
+/**
+ * Create a SCALAR node and attach it to the document.
+ *
+ * The @a style argument may be ignored by the emitter.
+ *
+ * @param[in,out]   document        A document object.
+ * @param[in]       tag             The scalar tag.
+ * @param[in]       value           The scalar value.
+ * @param[in]       length          The length of the scalar value.
+ * @param[in]       style           The scalar style.
+ *
+ * @returns the node id or @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_document_add_scalar(yaml_document_t *document,
+        yaml_char_t *tag, yaml_char_t *value, int length,
+        yaml_scalar_style_t style);
+
+/**
+ * Create a SEQUENCE node and attach it to the document.
+ *
+ * The @a style argument may be ignored by the emitter.
+ *
+ * @param[in,out]   document    A document object.
+ * @param[in]       tag         The sequence tag.
+ * @param[in]       style       The sequence style.
+ *
+ * @returns the node id or @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_document_add_sequence(yaml_document_t *document,
+        yaml_char_t *tag, yaml_sequence_style_t style);
+
+/**
+ * Create a MAPPING node and attach it to the document.
+ *
+ * The @a style argument may be ignored by the emitter.
+ *
+ * @param[in,out]   document    A document object.
+ * @param[in]       tag         The sequence tag.
+ * @param[in]       style       The sequence style.
+ *
+ * @returns the node id or @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_document_add_mapping(yaml_document_t *document,
+        yaml_char_t *tag, yaml_mapping_style_t style);
+
+/**
+ * Add an item to a SEQUENCE node.
+ *
+ * @param[in,out]   document    A document object.
+ * @param[in]       sequence    The sequence node id.
+ * @param[in]       item        The item node id.
+*
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_document_append_sequence_item(yaml_document_t *document,
+        int sequence, int item);
+
+/**
+ * Add a pair of a key and a value to a MAPPING node.
+ *
+ * @param[in,out]   document    A document object.
+ * @param[in]       mapping     The mapping node id.
+ * @param[in]       key         The key node id.
+ * @param[in]       value       The value node id.
+*
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_document_append_mapping_pair(yaml_document_t *document,
+        int mapping, int key, int value);
+
+/** @} */
+
+/**
+ * @defgroup parser Parser Definitions
+ * @{
+ */
+
+/**
+ * The prototype of a read handler.
+ *
+ * The read handler is called when the parser needs to read more bytes from the
+ * source.  The handler should write not more than @a size bytes to the @a
+ * buffer.  The number of written bytes should be set to the @a length variable.
+ *
+ * @param[in,out]   data        A pointer to an application data specified by
+ *                              yaml_parser_set_input().
+ * @param[out]      buffer      The buffer to write the data from the source.
+ * @param[in]       size        The size of the buffer.
+ * @param[out]      size_read   The actual number of bytes read from the source.
+ *
+ * @returns On success, the handler should return @c 1.  If the handler failed,
+ * the returned value should be @c 0.  On EOF, the handler should set the
+ * @a size_read to @c 0 and return @c 1.
+ */
+
+typedef int yaml_read_handler_t(void *data, unsigned char *buffer, size_t size,
+        size_t *size_read);
+
+/**
+ * This structure holds information about a potential simple key.
+ */
+
+typedef struct yaml_simple_key_s {
+    /** Is a simple key possible? */
+    int possible;
+
+    /** Is a simple key required? */
+    int required;
+
+    /** The number of the token. */
+    size_t token_number;
+
+    /** The position mark. */
+    yaml_mark_t mark;
+} yaml_simple_key_t;
+
+/**
+ * The states of the parser.
+ */
+typedef enum yaml_parser_state_e {
+    /** Expect STREAM-START. */
+    YAML_PARSE_STREAM_START_STATE,
+    /** Expect the beginning of an implicit document. */
+    YAML_PARSE_IMPLICIT_DOCUMENT_START_STATE,
+    /** Expect DOCUMENT-START. */
+    YAML_PARSE_DOCUMENT_START_STATE,
+    /** Expect the content of a document. */
+    YAML_PARSE_DOCUMENT_CONTENT_STATE,
+    /** Expect DOCUMENT-END. */
+    YAML_PARSE_DOCUMENT_END_STATE,
+    /** Expect a block node. */
+    YAML_PARSE_BLOCK_NODE_STATE,
+    /** Expect a block node or indentless sequence. */
+    YAML_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE,
+    /** Expect a flow node. */
+    YAML_PARSE_FLOW_NODE_STATE,
+    /** Expect the first entry of a block sequence. */
+    YAML_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE,
+    /** Expect an entry of a block sequence. */
+    YAML_PARSE_BLOCK_SEQUENCE_ENTRY_STATE,
+    /** Expect an entry of an indentless sequence. */
+    YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE,
+    /** Expect the first key of a block mapping. */
+    YAML_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE,
+    /** Expect a block mapping key. */
+    YAML_PARSE_BLOCK_MAPPING_KEY_STATE,
+    /** Expect a block mapping value. */
+    YAML_PARSE_BLOCK_MAPPING_VALUE_STATE,
+    /** Expect the first entry of a flow sequence. */
+    YAML_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE,
+    /** Expect an entry of a flow sequence. */
+    YAML_PARSE_FLOW_SEQUENCE_ENTRY_STATE,
+    /** Expect a key of an ordered mapping. */
+    YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE,
+    /** Expect a value of an ordered mapping. */
+    YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE,
+    /** Expect the and of an ordered mapping entry. */
+    YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE,
+    /** Expect the first key of a flow mapping. */
+    YAML_PARSE_FLOW_MAPPING_FIRST_KEY_STATE,
+    /** Expect a key of a flow mapping. */
+    YAML_PARSE_FLOW_MAPPING_KEY_STATE,
+    /** Expect a value of a flow mapping. */
+    YAML_PARSE_FLOW_MAPPING_VALUE_STATE,
+    /** Expect an empty value of a flow mapping. */
+    YAML_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE,
+    /** Expect nothing. */
+    YAML_PARSE_END_STATE
+} yaml_parser_state_t;
+
+/**
+ * This structure holds aliases data.
+ */
+
+typedef struct yaml_alias_data_s {
+    /** The anchor. */
+    yaml_char_t *anchor;
+    /** The node id. */
+    int index;
+    /** The anchor mark. */
+    yaml_mark_t mark;
+} yaml_alias_data_t;
+
+/**
+ * The parser structure.
+ *
+ * All members are internal.  Manage the structure using the @c yaml_parser_
+ * family of functions.
+ */
+
+typedef struct yaml_parser_s {
+
+    /**
+     * @name Error handling
+     * @{
+     */
+
+    /** Error type. */
+    yaml_error_type_t error;
+    /** Error description. */
+    const char *problem;
+    /** The byte about which the problem occurred. */
+    size_t problem_offset;
+    /** The problematic value (@c -1 is none). */
+    int problem_value;
+    /** The problem position. */
+    yaml_mark_t problem_mark;
+    /** The error context. */
+    const char *context;
+    /** The context position. */
+    yaml_mark_t context_mark;
+
+    /**
+     * @}
+     */
+
+    /**
+     * @name Reader stuff
+     * @{
+     */
+
+    /** Read handler. */
+    yaml_read_handler_t *read_handler;
+
+    /** A pointer for passing to the read handler. */
+    void *read_handler_data;
+
+    /** Standard (string or file) input data. */
+    union {
+        /** String input data. */
+        struct {
+            /** The string start pointer. */
+            const unsigned char *start;
+            /** The string end pointer. */
+            const unsigned char *end;
+            /** The string current position. */
+            const unsigned char *current;
+        } string;
+
+        /** File input data. */
+        FILE *file;
+    } input;
+
+    /** EOF flag */
+    int eof;
+
+    /** The working buffer. */
+    struct {
+        /** The beginning of the buffer. */
+        yaml_char_t *start;
+        /** The end of the buffer. */
+        yaml_char_t *end;
+        /** The current position of the buffer. */
+        yaml_char_t *pointer;
+        /** The last filled position of the buffer. */
+        yaml_char_t *last;
+    } buffer;
+
+    /* The number of unread characters in the buffer. */
+    size_t unread;
+
+    /** The raw buffer. */
+    struct {
+        /** The beginning of the buffer. */
+        unsigned char *start;
+        /** The end of the buffer. */
+        unsigned char *end;
+        /** The current position of the buffer. */
+        unsigned char *pointer;
+        /** The last filled position of the buffer. */
+        unsigned char *last;
+    } raw_buffer;
+
+    /** The input encoding. */
+    yaml_encoding_t encoding;
+
+    /** The offset of the current position (in bytes). */
+    size_t offset;
+
+    /** The mark of the current position. */
+    yaml_mark_t mark;
+
+    /**
+     * @}
+     */
+
+    /**
+     * @name Scanner stuff
+     * @{
+     */
+
+    /** Have we started to scan the input stream? */
+    int stream_start_produced;
+
+    /** Have we reached the end of the input stream? */
+    int stream_end_produced;
+
+    /** The number of unclosed '[' and '{' indicators. */
+    int flow_level;
+
+    /** The tokens queue. */
+    struct {
+        /** The beginning of the tokens queue. */
+        yaml_token_t *start;
+        /** The end of the tokens queue. */
+        yaml_token_t *end;
+        /** The head of the tokens queue. */
+        yaml_token_t *head;
+        /** The tail of the tokens queue. */
+        yaml_token_t *tail;
+    } tokens;
+
+    /** The number of tokens fetched from the queue. */
+    size_t tokens_parsed;
+
+    /* Does the tokens queue contain a token ready for dequeueing. */
+    int token_available;
+
+    /** The indentation levels stack. */
+    struct {
+        /** The beginning of the stack. */
+        int *start;
+        /** The end of the stack. */
+        int *end;
+        /** The top of the stack. */
+        int *top;
+    } indents;
+
+    /** The current indentation level. */
+    int indent;
+
+    /** May a simple key occur at the current position? */
+    int simple_key_allowed;
+
+    /** The stack of simple keys. */
+    struct {
+        /** The beginning of the stack. */
+        yaml_simple_key_t *start;
+        /** The end of the stack. */
+        yaml_simple_key_t *end;
+        /** The top of the stack. */
+        yaml_simple_key_t *top;
+    } simple_keys;
+
+    /**
+     * @}
+     */
+
+    /**
+     * @name Parser stuff
+     * @{
+     */
+
+    /** The parser states stack. */
+    struct {
+        /** The beginning of the stack. */
+        yaml_parser_state_t *start;
+        /** The end of the stack. */
+        yaml_parser_state_t *end;
+        /** The top of the stack. */
+        yaml_parser_state_t *top;
+    } states;
+
+    /** The current parser state. */
+    yaml_parser_state_t state;
+
+    /** The stack of marks. */
+    struct {
+        /** The beginning of the stack. */
+        yaml_mark_t *start;
+        /** The end of the stack. */
+        yaml_mark_t *end;
+        /** The top of the stack. */
+        yaml_mark_t *top;
+    } marks;
+
+    /** The list of TAG directives. */
+    struct {
+        /** The beginning of the list. */
+        yaml_tag_directive_t *start;
+        /** The end of the list. */
+        yaml_tag_directive_t *end;
+        /** The top of the list. */
+        yaml_tag_directive_t *top;
+    } tag_directives;
+
+    /**
+     * @}
+     */
+
+    /**
+     * @name Dumper stuff
+     * @{
+     */
+
+    /** The alias data. */
+    struct {
+        /** The beginning of the list. */
+        yaml_alias_data_t *start;
+        /** The end of the list. */
+        yaml_alias_data_t *end;
+        /** The top of the list. */
+        yaml_alias_data_t *top;
+    } aliases;
+
+    /** The currently parsed document. */
+    yaml_document_t *document;
+
+    /**
+     * @}
+     */
+
+} yaml_parser_t;
+
+/**
+ * Initialize a parser.
+ *
+ * This function creates a new parser object.  An application is responsible
+ * for destroying the object using the yaml_parser_delete() function.
+ *
+ * @param[out]      parser  An empty parser object.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_initialize(yaml_parser_t *parser);
+
+/**
+ * Destroy a parser.
+ *
+ * @param[in,out]   parser  A parser object.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_delete(yaml_parser_t *parser);
+
+/**
+ * Set a string input.
+ *
+ * Note that the @a input pointer must be valid while the @a parser object
+ * exists.  The application is responsible for destroing @a input after
+ * destroying the @a parser.
+ *
+ * @param[in,out]   parser  A parser object.
+ * @param[in]       input   A source data.
+ * @param[in]       size    The length of the source data in bytes.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_set_input_string(yaml_parser_t *parser,
+        const unsigned char *input, size_t size);
+
+/**
+ * Set a file input.
+ *
+ * @a file should be a file object open for reading.  The application is
+ * responsible for closing the @a file.
+ *
+ * @param[in,out]   parser  A parser object.
+ * @param[in]       file    An open file.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_set_input_file(yaml_parser_t *parser, FILE *file);
+
+/**
+ * Set a generic input handler.
+ *
+ * @param[in,out]   parser  A parser object.
+ * @param[in]       handler A read handler.
+ * @param[in]       data    Any application data for passing to the read
+ *                          handler.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_set_input(yaml_parser_t *parser,
+        yaml_read_handler_t *handler, void *data);
+
+/**
+ * Set the source encoding.
+ *
+ * @param[in,out]   parser      A parser object.
+ * @param[in]       encoding    The source encoding.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_set_encoding(yaml_parser_t *parser, yaml_encoding_t encoding);
+
+/**
+ * Scan the input stream and produce the next token.
+ *
+ * Call the function subsequently to produce a sequence of tokens corresponding
+ * to the input stream.  The initial token has the type
+ * @c YAML_STREAM_START_TOKEN while the ending token has the type
+ * @c YAML_STREAM_END_TOKEN.
+ *
+ * An application is responsible for freeing any buffers associated with the
+ * produced token object using the @c yaml_token_delete function.
+ *
+ * An application must not alternate the calls of yaml_parser_scan() with the
+ * calls of yaml_parser_parse() or yaml_parser_load(). Doing this will break
+ * the parser.
+ *
+ * @param[in,out]   parser      A parser object.
+ * @param[out]      token       An empty token object.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_scan(yaml_parser_t *parser, yaml_token_t *token);
+
+/**
+ * Parse the input stream and produce the next parsing event.
+ *
+ * Call the function subsequently to produce a sequence of events corresponding
+ * to the input stream.  The initial event has the type
+ * @c YAML_STREAM_START_EVENT while the ending event has the type
+ * @c YAML_STREAM_END_EVENT.
+ *
+ * An application is responsible for freeing any buffers associated with the
+ * produced event object using the yaml_event_delete() function.
+ *
+ * An application must not alternate the calls of yaml_parser_parse() with the
+ * calls of yaml_parser_scan() or yaml_parser_load(). Doing this will break the
+ * parser.
+ *
+ * @param[in,out]   parser      A parser object.
+ * @param[out]      event       An empty event object.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_parse(yaml_parser_t *parser, yaml_event_t *event);
+
+/**
+ * Parse the input stream and produce the next YAML document.
+ *
+ * Call this function subsequently to produce a sequence of documents
+ * constituting the input stream.
+ *
+ * If the produced document has no root node, it means that the document
+ * end has been reached.
+ *
+ * An application is responsible for freeing any data associated with the
+ * produced document object using the yaml_document_delete() function.
+ *
+ * An application must not alternate the calls of yaml_parser_load() with the
+ * calls of yaml_parser_scan() or yaml_parser_parse(). Doing this will break
+ * the parser.
+ *
+ * @param[in,out]   parser      A parser object.
+ * @param[out]      document    An empty document object.
+ *
+ * @return @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document);
+
+/** @} */
+
+/**
+ * @defgroup emitter Emitter Definitions
+ * @{
+ */
+
+/**
+ * The prototype of a write handler.
+ *
+ * The write handler is called when the emitter needs to flush the accumulated
+ * characters to the output.  The handler should write @a size bytes of the
+ * @a buffer to the output.
+ *
+ * @param[in,out]   data        A pointer to an application data specified by
+ *                              yaml_emitter_set_output().
+ * @param[in]       buffer      The buffer with bytes to be written.
+ * @param[in]       size        The size of the buffer.
+ *
+ * @returns On success, the handler should return @c 1.  If the handler failed,
+ * the returned value should be @c 0.
+ */
+
+typedef int yaml_write_handler_t(void *data, unsigned char *buffer, size_t size);
+
+/** The emitter states. */
+typedef enum yaml_emitter_state_e {
+    /** Expect STREAM-START. */
+    YAML_EMIT_STREAM_START_STATE,
+    /** Expect the first DOCUMENT-START or STREAM-END. */
+    YAML_EMIT_FIRST_DOCUMENT_START_STATE,
+    /** Expect DOCUMENT-START or STREAM-END. */
+    YAML_EMIT_DOCUMENT_START_STATE,
+    /** Expect the content of a document. */
+    YAML_EMIT_DOCUMENT_CONTENT_STATE,
+    /** Expect DOCUMENT-END. */
+    YAML_EMIT_DOCUMENT_END_STATE,
+    /** Expect the first item of a flow sequence. */
+    YAML_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE,
+    /** Expect an item of a flow sequence. */
+    YAML_EMIT_FLOW_SEQUENCE_ITEM_STATE,
+    /** Expect the first key of a flow mapping. */
+    YAML_EMIT_FLOW_MAPPING_FIRST_KEY_STATE,
+    /** Expect a key of a flow mapping. */
+    YAML_EMIT_FLOW_MAPPING_KEY_STATE,
+    /** Expect a value for a simple key of a flow mapping. */
+    YAML_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE,
+    /** Expect a value of a flow mapping. */
+    YAML_EMIT_FLOW_MAPPING_VALUE_STATE,
+    /** Expect the first item of a block sequence. */
+    YAML_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE,
+    /** Expect an item of a block sequence. */
+    YAML_EMIT_BLOCK_SEQUENCE_ITEM_STATE,
+    /** Expect the first key of a block mapping. */
+    YAML_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE,
+    /** Expect the key of a block mapping. */
+    YAML_EMIT_BLOCK_MAPPING_KEY_STATE,
+    /** Expect a value for a simple key of a block mapping. */
+    YAML_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE,
+    /** Expect a value of a block mapping. */
+    YAML_EMIT_BLOCK_MAPPING_VALUE_STATE,
+    /** Expect nothing. */
+    YAML_EMIT_END_STATE
+} yaml_emitter_state_t;
+
+/**
+ * The emitter structure.
+ *
+ * All members are internal.  Manage the structure using the @c yaml_emitter_
+ * family of functions.
+ */
+
+typedef struct yaml_emitter_s {
+
+    /**
+     * @name Error handling
+     * @{
+     */
+
+    /** Error type. */
+    yaml_error_type_t error;
+    /** Error description. */
+    const char *problem;
+
+    /**
+     * @}
+     */
+
+    /**
+     * @name Writer stuff
+     * @{
+     */
+
+    /** Write handler. */
+    yaml_write_handler_t *write_handler;
+
+    /** A pointer for passing to the white handler. */
+    void *write_handler_data;
+
+    /** Standard (string or file) output data. */
+    union {
+        /** String output data. */
+        struct {
+            /** The buffer pointer. */
+            unsigned char *buffer;
+            /** The buffer size. */
+            size_t size;
+            /** The number of written bytes. */
+            size_t *size_written;
+        } string;
+
+        /** File output data. */
+        FILE *file;
+    } output;
+
+    /** The working buffer. */
+    struct {
+        /** The beginning of the buffer. */
+        yaml_char_t *start;
+        /** The end of the buffer. */
+        yaml_char_t *end;
+        /** The current position of the buffer. */
+        yaml_char_t *pointer;
+        /** The last filled position of the buffer. */
+        yaml_char_t *last;
+    } buffer;
+
+    /** The raw buffer. */
+    struct {
+        /** The beginning of the buffer. */
+        unsigned char *start;
+        /** The end of the buffer. */
+        unsigned char *end;
+        /** The current position of the buffer. */
+        unsigned char *pointer;
+        /** The last filled position of the buffer. */
+        unsigned char *last;
+    } raw_buffer;
+
+    /** The stream encoding. */
+    yaml_encoding_t encoding;
+
+    /**
+     * @}
+     */
+
+    /**
+     * @name Emitter stuff
+     * @{
+     */
+
+    /** If the output is in the canonical style? */
+    int canonical;
+    /** The number of indentation spaces. */
+    int best_indent;
+    /** The preferred width of the output lines. */
+    int best_width;
+    /** Allow unescaped non-ASCII characters? */
+    int unicode;
+    /** The preferred line break. */
+    yaml_break_t line_break;
+
+    /** The stack of states. */
+    struct {
+        /** The beginning of the stack. */
+        yaml_emitter_state_t *start;
+        /** The end of the stack. */
+        yaml_emitter_state_t *end;
+        /** The top of the stack. */
+        yaml_emitter_state_t *top;
+    } states;
+
+    /** The current emitter state. */
+    yaml_emitter_state_t state;
+
+    /** The event queue. */
+    struct {
+        /** The beginning of the event queue. */
+        yaml_event_t *start;
+        /** The end of the event queue. */
+        yaml_event_t *end;
+        /** The head of the event queue. */
+        yaml_event_t *head;
+        /** The tail of the event queue. */
+        yaml_event_t *tail;
+    } events;
+
+    /** The stack of indentation levels. */
+    struct {
+        /** The beginning of the stack. */
+        int *start;
+        /** The end of the stack. */
+        int *end;
+        /** The top of the stack. */
+        int *top;
+    } indents;
+
+    /** The list of tag directives. */
+    struct {
+        /** The beginning of the list. */
+        yaml_tag_directive_t *start;
+        /** The end of the list. */
+        yaml_tag_directive_t *end;
+        /** The top of the list. */
+        yaml_tag_directive_t *top;
+    } tag_directives;
+
+    /** The current indentation level. */
+    int indent;
+
+    /** The current flow level. */
+    int flow_level;
+
+    /** Is it the document root context? */
+    int root_context;
+    /** Is it a sequence context? */
+    int sequence_context;
+    /** Is it a mapping context? */
+    int mapping_context;
+    /** Is it a simple mapping key context? */
+    int simple_key_context;
+
+    /** The current line. */
+    int line;
+    /** The current column. */
+    int column;
+    /** If the last character was a whitespace? */
+    int whitespace;
+    /** If the last character was an indentation character (' ', '-', '?', ':')? */
+    int indention;
+    /** If an explicit document end is required? */
+    int open_ended;
+
+    /** Anchor analysis. */
+    struct {
+        /** The anchor value. */
+        yaml_char_t *anchor;
+        /** The anchor length. */
+        size_t anchor_length;
+        /** Is it an alias? */
+        int alias;
+    } anchor_data;
+
+    /** Tag analysis. */
+    struct {
+        /** The tag handle. */
+        yaml_char_t *handle;
+        /** The tag handle length. */
+        size_t handle_length;
+        /** The tag suffix. */
+        yaml_char_t *suffix;
+        /** The tag suffix length. */
+        size_t suffix_length;
+    } tag_data;
+
+    /** Scalar analysis. */
+    struct {
+        /** The scalar value. */
+        yaml_char_t *value;
+        /** The scalar length. */
+        size_t length;
+        /** Does the scalar contain line breaks? */
+        int multiline;
+        /** Can the scalar be expessed in the flow plain style? */
+        int flow_plain_allowed;
+        /** Can the scalar be expressed in the block plain style? */
+        int block_plain_allowed;
+        /** Can the scalar be expressed in the single quoted style? */
+        int single_quoted_allowed;
+        /** Can the scalar be expressed in the literal or folded styles? */
+        int block_allowed;
+        /** The output style. */
+        yaml_scalar_style_t style;
+    } scalar_data;
+
+    /**
+     * @}
+     */
+
+    /**
+     * @name Dumper stuff
+     * @{
+     */
+
+    /** If the stream was already opened? */
+    int opened;
+    /** If the stream was already closed? */
+    int closed;
+
+    /** The information associated with the document nodes. */
+    struct {
+        /** The number of references. */
+        int references;
+        /** The anchor id. */
+        int anchor;
+        /** If the node has been emitted? */
+        int serialized;
+    } *anchors;
+
+    /** The last assigned anchor id. */
+    int last_anchor_id;
+
+    /** The currently emitted document. */
+    yaml_document_t *document;
+
+    /**
+     * @}
+     */
+
+} yaml_emitter_t;
+
+/**
+ * Initialize an emitter.
+ *
+ * This function creates a new emitter object.  An application is responsible
+ * for destroying the object using the yaml_emitter_delete() function.
+ *
+ * @param[out]      emitter     An empty parser object.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_initialize(yaml_emitter_t *emitter);
+
+/**
+ * Destroy an emitter.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_delete(yaml_emitter_t *emitter);
+
+/**
+ * Set a string output.
+ *
+ * The emitter will write the output characters to the @a output buffer of the
+ * size @a size.  The emitter will set @a size_written to the number of written
+ * bytes.  If the buffer is smaller than required, the emitter produces the
+ * YAML_WRITE_ERROR error.
+ *
+ * @param[in,out]   emitter         An emitter object.
+ * @param[in]       output          An output buffer.
+ * @param[in]       size            The buffer size.
+ * @param[in]       size_written    The pointer to save the number of written
+ *                                  bytes.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_output_string(yaml_emitter_t *emitter,
+        unsigned char *output, size_t size, size_t *size_written);
+
+/**
+ * Set a file output.
+ *
+ * @a file should be a file object open for writing.  The application is
+ * responsible for closing the @a file.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ * @param[in]       file        An open file.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_output_file(yaml_emitter_t *emitter, FILE *file);
+
+/**
+ * Set a generic output handler.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ * @param[in]       handler     A write handler.
+ * @param[in]       data        Any application data for passing to the write
+ *                              handler.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_output(yaml_emitter_t *emitter,
+        yaml_write_handler_t *handler, void *data);
+
+/**
+ * Set the output encoding.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ * @param[in]       encoding    The output encoding.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_encoding(yaml_emitter_t *emitter, yaml_encoding_t encoding);
+
+/**
+ * Set if the output should be in the "canonical" format as in the YAML
+ * specification.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ * @param[in]       canonical   If the output is canonical.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_canonical(yaml_emitter_t *emitter, int canonical);
+
+/**
+ * Set the indentation increment.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ * @param[in]       indent      The indentation increment (1 < . < 10).
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_indent(yaml_emitter_t *emitter, int indent);
+
+/**
+ * Set the preferred line width. @c -1 means unlimited.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ * @param[in]       width       The preferred line width.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_width(yaml_emitter_t *emitter, int width);
+
+/**
+ * Set if unescaped non-ASCII characters are allowed.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ * @param[in]       unicode     If unescaped Unicode characters are allowed.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_unicode(yaml_emitter_t *emitter, int unicode);
+
+/**
+ * Set the preferred line break.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ * @param[in]       line_break  The preferred line break.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_break(yaml_emitter_t *emitter, yaml_break_t line_break);
+
+/**
+ * Emit an event.
+ *
+ * The event object may be generated using the yaml_parser_parse() function.
+ * The emitter takes the responsibility for the event object and destroys its
+ * content after it is emitted. The event object is destroyed even if the
+ * function fails.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ * @param[in,out]   event       An event object.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_emit(yaml_emitter_t *emitter, yaml_event_t *event);
+
+/**
+ * Start a YAML stream.
+ *
+ * This function should be used before yaml_emitter_dump() is called.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_open(yaml_emitter_t *emitter);
+
+/**
+ * Finish a YAML stream.
+ *
+ * This function should be used after yaml_emitter_dump() is called.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_close(yaml_emitter_t *emitter);
+
+/**
+ * Emit a YAML document.
+ *
+ * The documen object may be generated using the yaml_parser_load() function
+ * or the yaml_document_initialize() function.  The emitter takes the
+ * responsibility for the document object and destoys its content after
+ * it is emitted. The document object is destroyedeven if the function fails.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ * @param[in,out]   document    A document object.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_dump(yaml_emitter_t *emitter, yaml_document_t *document);
+
+/**
+ * Flush the accumulated characters to the output.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_emitter_flush(yaml_emitter_t *emitter);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* #ifndef YAML_H */
+
diff --git a/ext/psych/yaml/yaml_private.h b/ext/psych/yaml/yaml_private.h
new file mode 100644
index 0000000000..f4f244cbc8
--- /dev/null
+++ b/ext/psych/yaml/yaml_private.h
@@ -0,0 +1,688 @@
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <yaml.h>
+
+#include <assert.h>
+#include <limits.h>
+#include <stddef.h>
+
+/*
+ * Memory management.
+ */
+
+YAML_DECLARE(void *)
+yaml_malloc(size_t size);
+
+YAML_DECLARE(void *)
+yaml_realloc(void *ptr, size_t size);
+
+YAML_DECLARE(void)
+yaml_free(void *ptr);
+
+YAML_DECLARE(yaml_char_t *)
+yaml_strdup(const yaml_char_t *);
+
+/*
+ * Reader: Ensure that the buffer contains at least `length` characters.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_update_buffer(yaml_parser_t *parser, size_t length);
+
+/*
+ * Scanner: Ensure that the token stack contains at least one token ready.
+ */
+
+YAML_DECLARE(int)
+yaml_parser_fetch_more_tokens(yaml_parser_t *parser);
+
+/*
+ * The size of the input raw buffer.
+ */
+
+#define INPUT_RAW_BUFFER_SIZE   16384
+
+/*
+ * The size of the input buffer.
+ *
+ * It should be possible to decode the whole raw buffer.
+ */
+
+#define INPUT_BUFFER_SIZE       (INPUT_RAW_BUFFER_SIZE*3)
+
+/*
+ * The size of the output buffer.
+ */
+
+#define OUTPUT_BUFFER_SIZE      16384
+
+/*
+ * The size of the output raw buffer.
+ *
+ * It should be possible to encode the whole output buffer.
+ */
+
+#define OUTPUT_RAW_BUFFER_SIZE  (OUTPUT_BUFFER_SIZE*2+2)
+
+/*
+ * The maximum size of a YAML input file.
+ * This used to be PTRDIFF_MAX, but that's not entirely portable
+ * because stdint.h isn't available on all platforms.
+ * It is not entirely clear why this isn't the maximum value
+ * that can fit into the parser->offset field.
+ */
+
+#define MAX_FILE_SIZE (~(size_t)0 / 2)
+
+
+/*
+ * The size of other stacks and queues.
+ */
+
+#define INITIAL_STACK_SIZE  16
+#define INITIAL_QUEUE_SIZE  16
+#define INITIAL_STRING_SIZE 16
+
+/*
+ * Buffer management.
+ */
+
+#define BUFFER_INIT(context,buffer,size)                                        \
+  (((buffer).start = (yaml_char_t *)yaml_malloc(size)) ?                        \
+        ((buffer).last = (buffer).pointer = (buffer).start,                     \
+         (buffer).end = (buffer).start+(size),                                  \
+         1) :                                                                   \
+        ((context)->error = YAML_MEMORY_ERROR,                                  \
+         0))
+
+#define BUFFER_DEL(context,buffer)                                              \
+    (yaml_free((buffer).start),                                                 \
+     (buffer).start = (buffer).pointer = (buffer).end = 0)
+
+/*
+ * String management.
+ */
+
+typedef struct {
+    yaml_char_t *start;
+    yaml_char_t *end;
+    yaml_char_t *pointer;
+} yaml_string_t;
+
+YAML_DECLARE(int)
+yaml_string_extend(yaml_char_t **start,
+        yaml_char_t **pointer, yaml_char_t **end);
+
+YAML_DECLARE(int)
+yaml_string_join(
+        yaml_char_t **a_start, yaml_char_t **a_pointer, yaml_char_t **a_end,
+        yaml_char_t **b_start, yaml_char_t **b_pointer, yaml_char_t **b_end);
+
+#define NULL_STRING { NULL, NULL, NULL }
+
+#define STRING(string,length)   { (string), (string)+(length), (string) }
+
+#define STRING_ASSIGN(value,string,length)                                      \
+    ((value).start = (string),                                                  \
+     (value).end = (string)+(length),                                           \
+     (value).pointer = (string))
+
+#define STRING_INIT(context,string,size)                                        \
+    (((string).start = YAML_MALLOC(size)) ?                                     \
+        ((string).pointer = (string).start,                                     \
+         (string).end = (string).start+(size),                                  \
+         memset((string).start, 0, (size)),                                     \
+         1) :                                                                   \
+        ((context)->error = YAML_MEMORY_ERROR,                                  \
+         0))
+
+#define STRING_DEL(context,string)                                              \
+    (yaml_free((string).start),                                                 \
+     (string).start = (string).pointer = (string).end = 0)
+
+#define STRING_EXTEND(context,string)                                           \
+    ((((string).pointer+5 < (string).end)                                       \
+        || yaml_string_extend(&(string).start,                                  \
+            &(string).pointer, &(string).end)) ?                                \
+         1 :                                                                    \
+        ((context)->error = YAML_MEMORY_ERROR,                                  \
+         0))
+
+#define CLEAR(context,string)                                                   \
+    ((string).pointer = (string).start,                                         \
+     memset((string).start, 0, (string).end-(string).start))
+
+#define JOIN(context,string_a,string_b)                                         \
+    ((yaml_string_join(&(string_a).start, &(string_a).pointer,                  \
+                       &(string_a).end, &(string_b).start,                      \
+                       &(string_b).pointer, &(string_b).end)) ?                 \
+        ((string_b).pointer = (string_b).start,                                 \
+         1) :                                                                   \
+        ((context)->error = YAML_MEMORY_ERROR,                                  \
+         0))
+
+/*
+ * String check operations.
+ */
+
+/*
+ * Check the octet at the specified position.
+ */
+
+#define CHECK_AT(string,octet,offset)                                           \
+    ((string).pointer[offset] == (yaml_char_t)(octet))
+
+/*
+ * Check the current octet in the buffer.
+ */
+
+#define CHECK(string,octet) CHECK_AT((string),(octet),0)
+
+/*
+ * Check if the character at the specified position is an alphabetical
+ * character, a digit, '_', or '-'.
+ */
+
+#define IS_ALPHA_AT(string,offset)                                              \
+     (((string).pointer[offset] >= (yaml_char_t) '0' &&                         \
+       (string).pointer[offset] <= (yaml_char_t) '9') ||                        \
+      ((string).pointer[offset] >= (yaml_char_t) 'A' &&                         \
+       (string).pointer[offset] <= (yaml_char_t) 'Z') ||                        \
+      ((string).pointer[offset] >= (yaml_char_t) 'a' &&                         \
+       (string).pointer[offset] <= (yaml_char_t) 'z') ||                        \
+      (string).pointer[offset] == '_' ||                                        \
+      (string).pointer[offset] == '-')
+
+#define IS_ALPHA(string)    IS_ALPHA_AT((string),0)
+
+/*
+ * Check if the character at the specified position is a digit.
+ */
+
+#define IS_DIGIT_AT(string,offset)                                              \
+     (((string).pointer[offset] >= (yaml_char_t) '0' &&                         \
+       (string).pointer[offset] <= (yaml_char_t) '9'))
+
+#define IS_DIGIT(string)    IS_DIGIT_AT((string),0)
+
+/*
+ * Get the value of a digit.
+ */
+
+#define AS_DIGIT_AT(string,offset)                                              \
+     ((string).pointer[offset] - (yaml_char_t) '0')
+
+#define AS_DIGIT(string)    AS_DIGIT_AT((string),0)
+
+/*
+ * Check if the character at the specified position is a hex-digit.
+ */
+
+#define IS_HEX_AT(string,offset)                                                \
+     (((string).pointer[offset] >= (yaml_char_t) '0' &&                         \
+       (string).pointer[offset] <= (yaml_char_t) '9') ||                        \
+      ((string).pointer[offset] >= (yaml_char_t) 'A' &&                         \
+       (string).pointer[offset] <= (yaml_char_t) 'F') ||                        \
+      ((string).pointer[offset] >= (yaml_char_t) 'a' &&                         \
+       (string).pointer[offset] <= (yaml_char_t) 'f'))
+
+#define IS_HEX(string)    IS_HEX_AT((string),0)
+
+/*
+ * Get the value of a hex-digit.
+ */
+
+#define AS_HEX_AT(string,offset)                                                \
+      (((string).pointer[offset] >= (yaml_char_t) 'A' &&                        \
+        (string).pointer[offset] <= (yaml_char_t) 'F') ?                        \
+       ((string).pointer[offset] - (yaml_char_t) 'A' + 10) :                    \
+       ((string).pointer[offset] >= (yaml_char_t) 'a' &&                        \
+        (string).pointer[offset] <= (yaml_char_t) 'f') ?                        \
+       ((string).pointer[offset] - (yaml_char_t) 'a' + 10) :                    \
+       ((string).pointer[offset] - (yaml_char_t) '0'))
+
+#define AS_HEX(string)  AS_HEX_AT((string),0)
+
+/*
+ * Check if the character is ASCII.
+ */
+
+#define IS_ASCII_AT(string,offset)                                              \
+    ((string).pointer[offset] <= (yaml_char_t) '\x7F')
+
+#define IS_ASCII(string)    IS_ASCII_AT((string),0)
+
+/*
+ * Check if the character can be printed unescaped.
+ */
+
+#define IS_PRINTABLE_AT(string,offset)                                          \
+    (((string).pointer[offset] == 0x0A)         /* . == #x0A */                 \
+     || ((string).pointer[offset] >= 0x20       /* #x20 <= . <= #x7E */         \
+         && (string).pointer[offset] <= 0x7E)                                   \
+     || ((string).pointer[offset] == 0xC2       /* #0xA0 <= . <= #xD7FF */      \
+         && (string).pointer[offset+1] >= 0xA0)                                 \
+     || ((string).pointer[offset] > 0xC2                                        \
+         && (string).pointer[offset] < 0xED)                                    \
+     || ((string).pointer[offset] == 0xED                                       \
+         && (string).pointer[offset+1] < 0xA0)                                  \
+     || ((string).pointer[offset] == 0xEE)                                      \
+     || ((string).pointer[offset] == 0xEF      /* #xE000 <= . <= #xFFFD */      \
+         && !((string).pointer[offset+1] == 0xBB        /* && . != #xFEFF */    \
+             && (string).pointer[offset+2] == 0xBF)                             \
+         && !((string).pointer[offset+1] == 0xBF                                \
+             && ((string).pointer[offset+2] == 0xBE                             \
+                 || (string).pointer[offset+2] == 0xBF))))
+
+#define IS_PRINTABLE(string)    IS_PRINTABLE_AT((string),0)
+
+/*
+ * Check if the character at the specified position is NUL.
+ */
+
+#define IS_Z_AT(string,offset)    CHECK_AT((string),'\0',(offset))
+
+#define IS_Z(string)    IS_Z_AT((string),0)
+
+/*
+ * Check if the character at the specified position is BOM.
+ */
+
+#define IS_BOM_AT(string,offset)                                                \
+     (CHECK_AT((string),'\xEF',(offset))                                        \
+      && CHECK_AT((string),'\xBB',(offset)+1)                                   \
+      && CHECK_AT((string),'\xBF',(offset)+2))  /* BOM (#xFEFF) */
+
+#define IS_BOM(string)  IS_BOM_AT(string,0)
+
+/*
+ * Check if the character at the specified position is space.
+ */
+
+#define IS_SPACE_AT(string,offset)  CHECK_AT((string),' ',(offset))
+
+#define IS_SPACE(string)    IS_SPACE_AT((string),0)
+
+/*
+ * Check if the character at the specified position is tab.
+ */
+
+#define IS_TAB_AT(string,offset)    CHECK_AT((string),'\t',(offset))
+
+#define IS_TAB(string)  IS_TAB_AT((string),0)
+
+/*
+ * Check if the character at the specified position is blank (space or tab).
+ */
+
+#define IS_BLANK_AT(string,offset)                                              \
+    (IS_SPACE_AT((string),(offset)) || IS_TAB_AT((string),(offset)))
+
+#define IS_BLANK(string)    IS_BLANK_AT((string),0)
+
+/*
+ * Check if the character at the specified position is a line break.
+ */
+
+#define IS_BREAK_AT(string,offset)                                              \
+    (CHECK_AT((string),'\r',(offset))               /* CR (#xD)*/               \
+     || CHECK_AT((string),'\n',(offset))            /* LF (#xA) */              \
+     || (CHECK_AT((string),'\xC2',(offset))                                     \
+         && CHECK_AT((string),'\x85',(offset)+1))   /* NEL (#x85) */            \
+     || (CHECK_AT((string),'\xE2',(offset))                                     \
+         && CHECK_AT((string),'\x80',(offset)+1)                                \
+         && CHECK_AT((string),'\xA8',(offset)+2))   /* LS (#x2028) */           \
+     || (CHECK_AT((string),'\xE2',(offset))                                     \
+         && CHECK_AT((string),'\x80',(offset)+1)                                \
+         && CHECK_AT((string),'\xA9',(offset)+2)))  /* PS (#x2029) */
+
+#define IS_BREAK(string)    IS_BREAK_AT((string),0)
+
+#define IS_CRLF_AT(string,offset)                                               \
+     (CHECK_AT((string),'\r',(offset)) && CHECK_AT((string),'\n',(offset)+1))
+
+#define IS_CRLF(string) IS_CRLF_AT((string),0)
+
+/*
+ * Check if the character is a line break or NUL.
+ */
+
+#define IS_BREAKZ_AT(string,offset)                                             \
+    (IS_BREAK_AT((string),(offset)) || IS_Z_AT((string),(offset)))
+
+#define IS_BREAKZ(string)   IS_BREAKZ_AT((string),0)
+
+/*
+ * Check if the character is a line break, space, or NUL.
+ */
+
+#define IS_SPACEZ_AT(string,offset)                                             \
+    (IS_SPACE_AT((string),(offset)) || IS_BREAKZ_AT((string),(offset)))
+
+#define IS_SPACEZ(string)   IS_SPACEZ_AT((string),0)
+
+/*
+ * Check if the character is a line break, space, tab, or NUL.
+ */
+
+#define IS_BLANKZ_AT(string,offset)                                             \
+    (IS_BLANK_AT((string),(offset)) || IS_BREAKZ_AT((string),(offset)))
+
+#define IS_BLANKZ(string)   IS_BLANKZ_AT((string),0)
+
+/*
+ * Determine the width of the character.
+ */
+
+#define WIDTH_AT(string,offset)                                                 \
+     (((string).pointer[offset] & 0x80) == 0x00 ? 1 :                           \
+      ((string).pointer[offset] & 0xE0) == 0xC0 ? 2 :                           \
+      ((string).pointer[offset] & 0xF0) == 0xE0 ? 3 :                           \
+      ((string).pointer[offset] & 0xF8) == 0xF0 ? 4 : 0)
+
+#define WIDTH(string)   WIDTH_AT((string),0)
+
+/*
+ * Move the string pointer to the next character.
+ */
+
+#define MOVE(string)    ((string).pointer += WIDTH((string)))
+
+/*
+ * Copy a character and move the pointers of both strings.
+ */
+
+#define COPY(string_a,string_b)                                                 \
+    ((*(string_b).pointer & 0x80) == 0x00 ?                                     \
+     (*((string_a).pointer++) = *((string_b).pointer++)) :                      \
+     (*(string_b).pointer & 0xE0) == 0xC0 ?                                     \
+     (*((string_a).pointer++) = *((string_b).pointer++),                        \
+      *((string_a).pointer++) = *((string_b).pointer++)) :                      \
+     (*(string_b).pointer & 0xF0) == 0xE0 ?                                     \
+     (*((string_a).pointer++) = *((string_b).pointer++),                        \
+      *((string_a).pointer++) = *((string_b).pointer++),                        \
+      *((string_a).pointer++) = *((string_b).pointer++)) :                      \
+     (*(string_b).pointer & 0xF8) == 0xF0 ?                                     \
+     (*((string_a).pointer++) = *((string_b).pointer++),                        \
+      *((string_a).pointer++) = *((string_b).pointer++),                        \
+      *((string_a).pointer++) = *((string_b).pointer++),                        \
+      *((string_a).pointer++) = *((string_b).pointer++)) : 0)
+
+/*
+ * Stack and queue management.
+ */
+
+YAML_DECLARE(int)
+yaml_stack_extend(void **start, void **top, void **end);
+
+YAML_DECLARE(int)
+yaml_queue_extend(void **start, void **head, void **tail, void **end);
+
+#define STACK_INIT(context,stack,type)                                     \
+  (((stack).start = (type)yaml_malloc(INITIAL_STACK_SIZE*sizeof(*(stack).start))) ? \
+        ((stack).top = (stack).start,                                           \
+         (stack).end = (stack).start+INITIAL_STACK_SIZE,                        \
+         1) :                                                                   \
+        ((context)->error = YAML_MEMORY_ERROR,                                  \
+         0))
+
+#define STACK_DEL(context,stack)                                                \
+    (yaml_free((stack).start),                                                  \
+     (stack).start = (stack).top = (stack).end = 0)
+
+#define STACK_EMPTY(context,stack)                                              \
+    ((stack).start == (stack).top)
+
+#define STACK_LIMIT(context,stack,size)                                         \
+    ((stack).top - (stack).start < (size) ?                                     \
+        1 :                                                                     \
+        ((context)->error = YAML_MEMORY_ERROR,                                  \
+         0))
+
+#define PUSH(context,stack,value)                                               \
+    (((stack).top != (stack).end                                                \
+      || yaml_stack_extend((void **)&(stack).start,                             \
+              (void **)&(stack).top, (void **)&(stack).end)) ?                  \
+        (*((stack).top++) = value,                                              \
+         1) :                                                                   \
+        ((context)->error = YAML_MEMORY_ERROR,                                  \
+         0))
+
+#define POP(context,stack)                                                      \
+    (*(--(stack).top))
+
+#define QUEUE_INIT(context,queue,size,type)                                     \
+  (((queue).start = (type)yaml_malloc((size)*sizeof(*(queue).start))) ?         \
+        ((queue).head = (queue).tail = (queue).start,                           \
+         (queue).end = (queue).start+(size),                                    \
+         1) :                                                                   \
+        ((context)->error = YAML_MEMORY_ERROR,                                  \
+         0))
+
+#define QUEUE_DEL(context,queue)                                                \
+    (yaml_free((queue).start),                                                  \
+     (queue).start = (queue).head = (queue).tail = (queue).end = 0)
+
+#define QUEUE_EMPTY(context,queue)                                              \
+    ((queue).head == (queue).tail)
+
+#define ENQUEUE(context,queue,value)                                            \
+    (((queue).tail != (queue).end                                               \
+      || yaml_queue_extend((void **)&(queue).start, (void **)&(queue).head,     \
+            (void **)&(queue).tail, (void **)&(queue).end)) ?                   \
+        (*((queue).tail++) = value,                                             \
+         1) :                                                                   \
+        ((context)->error = YAML_MEMORY_ERROR,                                  \
+         0))
+
+#define DEQUEUE(context,queue)                                                  \
+    (*((queue).head++))
+
+#define QUEUE_INSERT(context,queue,index,value)                                 \
+    (((queue).tail != (queue).end                                               \
+      || yaml_queue_extend((void **)&(queue).start, (void **)&(queue).head,     \
+            (void **)&(queue).tail, (void **)&(queue).end)) ?                   \
+        (memmove((queue).head+(index)+1,(queue).head+(index),                   \
+            ((queue).tail-(queue).head-(index))*sizeof(*(queue).start)),        \
+         *((queue).head+(index)) = value,                                       \
+         (queue).tail++,                                                        \
+         1) :                                                                   \
+        ((context)->error = YAML_MEMORY_ERROR,                                  \
+         0))
+
+/*
+ * Token initializers.
+ */
+
+#define TOKEN_INIT(token,token_type,token_start_mark,token_end_mark)            \
+    (memset(&(token), 0, sizeof(yaml_token_t)),                                 \
+     (token).type = (token_type),                                               \
+     (token).start_mark = (token_start_mark),                                   \
+     (token).end_mark = (token_end_mark))
+
+#define STREAM_START_TOKEN_INIT(token,token_encoding,start_mark,end_mark)       \
+    (TOKEN_INIT((token),YAML_STREAM_START_TOKEN,(start_mark),(end_mark)),       \
+     (token).data.stream_start.encoding = (token_encoding))
+
+#define STREAM_END_TOKEN_INIT(token,start_mark,end_mark)                        \
+    (TOKEN_INIT((token),YAML_STREAM_END_TOKEN,(start_mark),(end_mark)))
+
+#define ALIAS_TOKEN_INIT(token,token_value,start_mark,end_mark)                 \
+    (TOKEN_INIT((token),YAML_ALIAS_TOKEN,(start_mark),(end_mark)),              \
+     (token).data.alias.value = (token_value))
+
+#define ANCHOR_TOKEN_INIT(token,token_value,start_mark,end_mark)                \
+    (TOKEN_INIT((token),YAML_ANCHOR_TOKEN,(start_mark),(end_mark)),             \
+     (token).data.anchor.value = (token_value))
+
+#define TAG_TOKEN_INIT(token,token_handle,token_suffix,start_mark,end_mark)     \
+    (TOKEN_INIT((token),YAML_TAG_TOKEN,(start_mark),(end_mark)),                \
+     (token).data.tag.handle = (token_handle),                                  \
+     (token).data.tag.suffix = (token_suffix))
+
+#define SCALAR_TOKEN_INIT(token,token_value,token_length,token_style,start_mark,end_mark)   \
+    (TOKEN_INIT((token),YAML_SCALAR_TOKEN,(start_mark),(end_mark)),             \
+     (token).data.scalar.value = (token_value),                                 \
+     (token).data.scalar.length = (token_length),                               \
+     (token).data.scalar.style = (token_style))
+
+#define VERSION_DIRECTIVE_TOKEN_INIT(token,token_major,token_minor,start_mark,end_mark)     \
+    (TOKEN_INIT((token),YAML_VERSION_DIRECTIVE_TOKEN,(start_mark),(end_mark)),  \
+     (token).data.version_directive.major = (token_major),                      \
+     (token).data.version_directive.minor = (token_minor))
+
+#define TAG_DIRECTIVE_TOKEN_INIT(token,token_handle,token_prefix,start_mark,end_mark)       \
+    (TOKEN_INIT((token),YAML_TAG_DIRECTIVE_TOKEN,(start_mark),(end_mark)),      \
+     (token).data.tag_directive.handle = (token_handle),                        \
+     (token).data.tag_directive.prefix = (token_prefix))
+
+/*
+ * Event initializers.
+ */
+
+#define EVENT_INIT(event,event_type,event_start_mark,event_end_mark)            \
+    (memset(&(event), 0, sizeof(yaml_event_t)),                                 \
+     (event).type = (event_type),                                               \
+     (event).start_mark = (event_start_mark),                                   \
+     (event).end_mark = (event_end_mark))
+
+#define STREAM_START_EVENT_INIT(event,event_encoding,start_mark,end_mark)       \
+    (EVENT_INIT((event),YAML_STREAM_START_EVENT,(start_mark),(end_mark)),       \
+     (event).data.stream_start.encoding = (event_encoding))
+
+#define STREAM_END_EVENT_INIT(event,start_mark,end_mark)                        \
+    (EVENT_INIT((event),YAML_STREAM_END_EVENT,(start_mark),(end_mark)))
+
+#define DOCUMENT_START_EVENT_INIT(event,event_version_directive,                \
+        event_tag_directives_start,event_tag_directives_end,event_implicit,start_mark,end_mark) \
+    (EVENT_INIT((event),YAML_DOCUMENT_START_EVENT,(start_mark),(end_mark)),     \
+     (event).data.document_start.version_directive = (event_version_directive), \
+     (event).data.document_start.tag_directives.start = (event_tag_directives_start),   \
+     (event).data.document_start.tag_directives.end = (event_tag_directives_end),   \
+     (event).data.document_start.implicit = (event_implicit))
+
+#define DOCUMENT_END_EVENT_INIT(event,event_implicit,start_mark,end_mark)       \
+    (EVENT_INIT((event),YAML_DOCUMENT_END_EVENT,(start_mark),(end_mark)),       \
+     (event).data.document_end.implicit = (event_implicit))
+
+#define ALIAS_EVENT_INIT(event,event_anchor,start_mark,end_mark)                \
+    (EVENT_INIT((event),YAML_ALIAS_EVENT,(start_mark),(end_mark)),              \
+     (event).data.alias.anchor = (event_anchor))
+
+#define SCALAR_EVENT_INIT(event,event_anchor,event_tag,event_value,event_length,    \
+        event_plain_implicit, event_quoted_implicit,event_style,start_mark,end_mark)    \
+    (EVENT_INIT((event),YAML_SCALAR_EVENT,(start_mark),(end_mark)),             \
+     (event).data.scalar.anchor = (event_anchor),                               \
+     (event).data.scalar.tag = (event_tag),                                     \
+     (event).data.scalar.value = (event_value),                                 \
+     (event).data.scalar.length = (event_length),                               \
+     (event).data.scalar.plain_implicit = (event_plain_implicit),               \
+     (event).data.scalar.quoted_implicit = (event_quoted_implicit),             \
+     (event).data.scalar.style = (event_style))
+
+#define SEQUENCE_START_EVENT_INIT(event,event_anchor,event_tag,                 \
+        event_implicit,event_style,start_mark,end_mark)                         \
+    (EVENT_INIT((event),YAML_SEQUENCE_START_EVENT,(start_mark),(end_mark)),     \
+     (event).data.sequence_start.anchor = (event_anchor),                       \
+     (event).data.sequence_start.tag = (event_tag),                             \
+     (event).data.sequence_start.implicit = (event_implicit),                   \
+     (event).data.sequence_start.style = (event_style))
+
+#define SEQUENCE_END_EVENT_INIT(event,start_mark,end_mark)                      \
+    (EVENT_INIT((event),YAML_SEQUENCE_END_EVENT,(start_mark),(end_mark)))
+
+#define MAPPING_START_EVENT_INIT(event,event_anchor,event_tag,                  \
+        event_implicit,event_style,start_mark,end_mark)                         \
+    (EVENT_INIT((event),YAML_MAPPING_START_EVENT,(start_mark),(end_mark)),      \
+     (event).data.mapping_start.anchor = (event_anchor),                        \
+     (event).data.mapping_start.tag = (event_tag),                              \
+     (event).data.mapping_start.implicit = (event_implicit),                    \
+     (event).data.mapping_start.style = (event_style))
+
+#define MAPPING_END_EVENT_INIT(event,start_mark,end_mark)                       \
+    (EVENT_INIT((event),YAML_MAPPING_END_EVENT,(start_mark),(end_mark)))
+
+/*
+ * Document initializer.
+ */
+
+#define DOCUMENT_INIT(document,document_nodes_start,document_nodes_end,         \
+        document_version_directive,document_tag_directives_start,               \
+        document_tag_directives_end,document_start_implicit,                    \
+        document_end_implicit,document_start_mark,document_end_mark)            \
+    (memset(&(document), 0, sizeof(yaml_document_t)),                           \
+     (document).nodes.start = (document_nodes_start),                           \
+     (document).nodes.end = (document_nodes_end),                               \
+     (document).nodes.top = (document_nodes_start),                             \
+     (document).version_directive = (document_version_directive),               \
+     (document).tag_directives.start = (document_tag_directives_start),         \
+     (document).tag_directives.end = (document_tag_directives_end),             \
+     (document).start_implicit = (document_start_implicit),                     \
+     (document).end_implicit = (document_end_implicit),                         \
+     (document).start_mark = (document_start_mark),                             \
+     (document).end_mark = (document_end_mark))
+
+/*
+ * Node initializers.
+ */
+
+#define NODE_INIT(node,node_type,node_tag,node_start_mark,node_end_mark)        \
+    (memset(&(node), 0, sizeof(yaml_node_t)),                                   \
+     (node).type = (node_type),                                                 \
+     (node).tag = (node_tag),                                                   \
+     (node).start_mark = (node_start_mark),                                     \
+     (node).end_mark = (node_end_mark))
+
+#define SCALAR_NODE_INIT(node,node_tag,node_value,node_length,                  \
+        node_style,start_mark,end_mark)                                         \
+    (NODE_INIT((node),YAML_SCALAR_NODE,(node_tag),(start_mark),(end_mark)),     \
+     (node).data.scalar.value = (node_value),                                   \
+     (node).data.scalar.length = (node_length),                                 \
+     (node).data.scalar.style = (node_style))
+
+#define SEQUENCE_NODE_INIT(node,node_tag,node_items_start,node_items_end,       \
+        node_style,start_mark,end_mark)                                         \
+    (NODE_INIT((node),YAML_SEQUENCE_NODE,(node_tag),(start_mark),(end_mark)),   \
+     (node).data.sequence.items.start = (node_items_start),                     \
+     (node).data.sequence.items.end = (node_items_end),                         \
+     (node).data.sequence.items.top = (node_items_start),                       \
+     (node).data.sequence.style = (node_style))
+
+#define MAPPING_NODE_INIT(node,node_tag,node_pairs_start,node_pairs_end,        \
+        node_style,start_mark,end_mark)                                         \
+    (NODE_INIT((node),YAML_MAPPING_NODE,(node_tag),(start_mark),(end_mark)),    \
+     (node).data.mapping.pairs.start = (node_pairs_start),                      \
+     (node).data.mapping.pairs.end = (node_pairs_end),                          \
+     (node).data.mapping.pairs.top = (node_pairs_start),                        \
+     (node).data.mapping.style = (node_style))
+
+/* Strict C compiler warning helpers */
+
+#if defined(__clang__) || defined(__GNUC__)
+#  define HASATTRIBUTE_UNUSED
+#endif
+#ifdef HASATTRIBUTE_UNUSED
+#  define __attribute__unused__             __attribute__((__unused__))
+#else
+#  define __attribute__unused__
+#endif
+
+/* Shim arguments are arguments that must be included in your function,
+ * but serve no purpose inside.  Silence compiler warnings. */
+#define SHIM(a) /*@unused@*/ a __attribute__unused__
+
+/* UNUSED_PARAM() marks a shim argument in the body to silence compiler warnings */
+#ifdef __clang__
+#  define UNUSED_PARAM(a) (void)(a);
+#else
+#  define UNUSED_PARAM(a) /*@-noeffect*/if (0) (void)(a)/*@=noeffect*/;
+#endif
+
+#define YAML_MALLOC_STATIC(type) (type*)yaml_malloc(sizeof(type))
+#define YAML_MALLOC(size)        (yaml_char_t *)yaml_malloc(size)
diff --git a/ext/psych/yaml_tree.c b/ext/psych/yaml_tree.c
deleted file mode 100644
index bcf24d2070..0000000000
--- a/ext/psych/yaml_tree.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <psych.h>
-
-VALUE cPsychVisitorsYamlTree;
-
-/*
- * call-seq: private_iv_get(target, prop)
- *
- * Get the private instance variable +prop+ from +target+
- */
-static VALUE private_iv_get(VALUE self, VALUE target, VALUE prop)
-{
-    return rb_attr_get(target, rb_intern(StringValuePtr(prop)));
-}
-
-void Init_psych_yaml_tree(void)
-{
-    VALUE psych     = rb_define_module("Psych");
-    VALUE visitors  = rb_define_module_under(psych, "Visitors");
-    VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
-    cPsychVisitorsYamlTree = rb_define_class_under(visitors, "YAMLTree", visitor);
-
-    rb_define_private_method(cPsychVisitorsYamlTree, "private_iv_get", private_iv_get, 2);
-}
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/pty/depend b/ext/pty/depend
index 2249eb8fcd..1e89dc824c 100644
--- a/ext/pty/depend
+++ b/ext/pty/depend
@@ -1 +1,20 @@
-pty.o: pty.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/io.h
+# AUTOGENERATED DEPENDENCIES START
+pty.o: $(RUBY_EXTCONF_H)
+pty.o: $(arch_hdrdir)/ruby/config.h
+pty.o: $(hdrdir)/ruby.h
+pty.o: $(hdrdir)/ruby/assert.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/onigmo.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)/internal.h
+pty.o: pty.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/pty/extconf.rb b/ext/pty/extconf.rb
index 3d6d0f1e46..7721a744c8 100644
--- a/ext/pty/extconf.rb
+++ b/ext/pty/extconf.rb
@@ -1,11 +1,15 @@
+# frozen_string_literal: true
 require 'mkmf'
 
+$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
+
 if /mswin|mingw|bccwin/ !~ RUBY_PLATFORM
   have_header("sys/stropts.h")
   have_func("setresuid")
   have_header("libutil.h")
   have_header("util.h") # OpenBSD openpty
   have_header("pty.h")
+  have_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 c15044bd2a..5dbfa09ae9 100644
--- a/ext/pty/lib/expect.rb
+++ b/ext/pty/lib/expect.rb
@@ -1,34 +1,55 @@
+# frozen_string_literal: true
 $expect_verbose = false
 
+# Expect library adds the IO instance method #expect, which does similar act to
+# tcl's expect extension.
+#
+# In order to use this method, you must require expect:
+#
+#   require 'expect'
+#
+# Please see #expect for usage.
 class IO
-  # Reads from the IO until pattern +pat+ matches or the +timeout+ is over.
+  # call-seq:
+  #   IO#expect(pattern,timeout=9999999)                  ->  Array
+  #   IO#expect(pattern,timeout=9999999) { |result| ... } ->  nil
+  #
+  # Reads from the IO until the given +pattern+ matches or the +timeout+ is over.
+  #
   # It returns an array with the read buffer, followed by the matches.
   # If a block is given, the result is yielded to the block and returns nil.
   #
+  # When called without a block, it waits until the input that matches the
+  # given +pattern+ is obtained from the IO or the time specified as the
+  # timeout passes. An array is returned when the pattern is obtained from the
+  # IO. The first element of the array is the entire string obtained from the
+  # IO until the pattern matches, followed by elements indicating which the
+  # pattern which matched to the anchor in the regular expression.
+  #
   # The optional timeout parameter defines, in seconds, the total time to wait
   # for the pattern.  If the timeout expires or eof is found, nil is returned
   # or yielded.  However, the buffer in a timeout session is kept for the next
   # expect call.  The default timeout is 9999999 seconds.
   def expect(pat,timeout=9999999)
-    buf = ''
+    buf = ''.dup
     case pat
     when String
       e_pat = Regexp.new(Regexp.quote(pat))
     when Regexp
       e_pat = pat
     else
-      raise TypeError, "unsupported pattern class: #{pattern.class}"
+      raise TypeError, "unsupported pattern class: #{pat.class}"
     end
     @unusedBuf ||= ''
     while true
       if not @unusedBuf.empty?
-        c = @unusedBuf.slice!(0).chr
+        c = @unusedBuf.slice!(0)
       elsif !IO.select([self],nil,nil,timeout) or eof? then
         result = nil
         @unusedBuf = buf
         break
       else
-        c = getc.chr
+        c = getc
       end
       buf << c
       if $expect_verbose
@@ -36,7 +57,7 @@ class IO
         STDOUT.flush
       end
       if mat=e_pat.match(buf) then
-        result = [buf,*mat.to_a[1..-1]]
+        result = [buf,*mat.captures]
         break
       end
     end
@@ -48,4 +69,3 @@ class IO
     nil
   end
 end
-
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 3797972975..4c6ae26127 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -9,7 +9,9 @@
 #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
@@ -22,6 +24,10 @@
 #ifdef HAVE_PTY_H
 #include	<pty.h>
 #endif
+#if defined(HAVE_SYS_PARAM_H)
+  /* for __FreeBSD_version */
+# include <sys/param.h>
+#endif
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #else
@@ -29,8 +35,8 @@
 #endif
 #include <ctype.h>
 
-#include "ruby/ruby.h"
 #include "ruby/io.h"
+#include "internal.h"
 #include "ruby/util.h"
 
 #include <signal.h>
@@ -44,70 +50,6 @@
 
 #define	DEVICELEN	16
 
-#if !defined(HAVE_OPENPTY)
-#if defined(__hpux)
-static const
-char	MasterDevice[] = "/dev/ptym/pty%s",
-	SlaveDevice[] =  "/dev/pty/tty%s",
-	*const deviceNo[] = {
-		"p0","p1","p2","p3","p4","p5","p6","p7",
-		"p8","p9","pa","pb","pc","pd","pe","pf",
-		"q0","q1","q2","q3","q4","q5","q6","q7",
-		"q8","q9","qa","qb","qc","qd","qe","qf",
-		"r0","r1","r2","r3","r4","r5","r6","r7",
-		"r8","r9","ra","rb","rc","rd","re","rf",
-		"s0","s1","s2","s3","s4","s5","s6","s7",
-		"s8","s9","sa","sb","sc","sd","se","sf",
-		"t0","t1","t2","t3","t4","t5","t6","t7",
-		"t8","t9","ta","tb","tc","td","te","tf",
-		"u0","u1","u2","u3","u4","u5","u6","u7",
-		"u8","u9","ua","ub","uc","ud","ue","uf",
-		"v0","v1","v2","v3","v4","v5","v6","v7",
-		"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",
-  	SlaveDevice[] = "/dev/ttyp%s",
-	*const deviceNo[] = {
-"00","01","02","03","04","05","06","07","08","09","0a","0b","0c","0d","0e","0f",
-"10","11","12","13","14","15","16","17","18","19","1a","1b","1c","1d","1e","1f",
-"20","21","22","23","24","25","26","27","28","29","2a","2b","2c","2d","2e","2f",
-"30","31","32","33","34","35","36","37","38","39","3a","3b","3c","3d","3e","3f",
-"40","41","42","43","44","45","46","47","48","49","4a","4b","4c","4d","4e","4f",
-"50","51","52","53","54","55","56","57","58","59","5a","5b","5c","5d","5e","5f",
-"60","61","62","63","64","65","66","67","68","69","6a","6b","6c","6d","6e","6f",
-"70","71","72","73","74","75","76","77","78","79","7a","7b","7c","7d","7e","7f",
-"80","81","82","83","84","85","86","87","88","89","8a","8b","8c","8d","8e","8f",
-"90","91","92","93","94","95","96","97","98","99","9a","9b","9c","9d","9e","9f",
-"a0","a1","a2","a3","a4","a5","a6","a7","a8","a9","aa","ab","ac","ad","ae","af",
-"b0","b1","b2","b3","b4","b5","b6","b7","b8","b9","ba","bb","bc","bd","be","bf",
-"c0","c1","c2","c3","c4","c5","c6","c7","c8","c9","ca","cb","cc","cd","ce","cf",
-"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",
-		};
-#elif !defined(HAVE_PTSNAME)
-static const
-char	MasterDevice[] = "/dev/pty%s",
-	SlaveDevice[] = "/dev/tty%s",
-	*const deviceNo[] = {
-		"p0","p1","p2","p3","p4","p5","p6","p7",
-		"p8","p9","pa","pb","pc","pd","pe","pf",
-		"q0","q1","q2","q3","q4","q5","q6","q7",
-		"q8","q9","qa","qb","qc","qd","qe","qf",
-		"r0","r1","r2","r3","r4","r5","r6","r7",
-		"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
-#endif /* !defined(HAVE_OPENPTY) */
-
 #ifndef HAVE_SETEUID
 # ifdef HAVE_SETREUID
 #  define seteuid(e)	setreuid(-1, (e))
@@ -141,8 +83,8 @@ static void getDevice(int*, int*, char [DEVICELEN], int);
 struct child_info {
     int master, slave;
     char *slavename;
-    int argc;
-    VALUE *argv;
+    VALUE execarg_obj;
+    struct rb_execarg *eargp;
 };
 
 static int
@@ -151,16 +93,12 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
     struct child_info *carg = data;
     int master = carg->master;
     int slave = carg->slave;
-    int argc = carg->argc;
-    VALUE *argv = carg->argv;
 
 #define ERROR_EXIT(str) do { \
 	strlcpy(errbuf, (str), errbuf_len); \
 	return -1; \
     } while (0)
 
-    rb_thread_atfork_before_exec();
-
     /*
      * Set free from process group and controlling terminal
      */
@@ -175,7 +113,7 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
     if (setpgrp(0, getpid()) == -1)
         ERROR_EXIT("setpgrp()");
     {
-        int i = open("/dev/tty", O_RDONLY);
+        int i = rb_cloexec_open("/dev/tty", O_RDONLY, 0);
         if (i < 0) ERROR_EXIT("/dev/tty");
         rb_update_max_fd(i);
         if (ioctl(i, TIOCNOTTY, (char *)0))
@@ -195,7 +133,7 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
     /* errors ignored for sun */
 #else
     close(slave);
-    slave = open(carg->slavename, O_RDWR);
+    slave = rb_cloexec_open(carg->slavename, O_RDWR, 0);
     if (slave < 0) {
         ERROR_EXIT("open: pty slave");
     }
@@ -205,13 +143,12 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
     dup2(slave,0);
     dup2(slave,1);
     dup2(slave,2);
-    close(slave);
+    if (slave < 0 || slave > 2) (void)!close(slave);
 #if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
-    seteuid(getuid());
+    if (seteuid(getuid())) ERROR_EXIT("seteuid()");
 #endif
 
-    rb_f_exec(argc, argv);
-    return 0;
+    return rb_exec_async_signal_safe(carg->eargp, errbuf, sizeof(errbuf_len));
 #undef ERROR_EXIT
 }
 
@@ -219,56 +156,64 @@ static void
 establishShell(int argc, VALUE *argv, struct pty_info *info,
 	       char SlaveName[DEVICELEN])
 {
-    int 		master,slave;
+    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;
+	const char *shellname = "/bin/sh";
 
 	if ((p = getenv("SHELL")) != NULL) {
 	    shellname = p;
 	}
 	else {
-	    pwent = getpwuid(getuid());
+#if defined HAVE_PWD_H
+	    const char *username = getenv("USER");
+	    struct passwd *pwent = getpwnam(username ? username : getlogin());
 	    if (pwent && pwent->pw_shell)
 		shellname = pwent->pw_shell;
-	    else
-		shellname = "/bin/sh";
+#endif
 	}
 	v = rb_str_new2(shellname);
 	argc = 1;
 	argv = &v;
     }
 
+    carg.execarg_obj = rb_execarg_new(argc, argv, 1, 0);
+    carg.eargp = rb_execarg_get(carg.execarg_obj);
+    rb_execarg_parent_start(carg.execarg_obj);
+
     getDevice(&master, &slave, SlaveName, 0);
 
     carg.master = master;
     carg.slave = slave;
     carg.slavename = SlaveName;
-    carg.argc = argc;
-    carg.argv = argv;
     errbuf[0] = '\0';
-    pid = rb_fork_err(0, chfunc, &carg, Qnil, errbuf, sizeof(errbuf));
+    pid = rb_fork_async_signal_safe(&status, chfunc, &carg, Qnil, errbuf, sizeof(errbuf));
 
     if (pid < 0) {
 	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;
+
+    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)
 {
@@ -277,34 +222,62 @@ no_mesg(char *slavedevice, int nomesg)
     else
         return 0;
 }
+#endif
+
+#if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX)
+static inline int
+ioctl_I_PUSH(int fd, const char *const name)
+{
+    int ret = 0;
+# if defined(I_FIND)
+    ret = ioctl(fd, I_FIND, name);
+# endif
+    if (ret == 0) {
+        ret = ioctl(fd, I_PUSH, name);
+    }
+    return ret;
+}
+#endif
 
 static int
 get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, int fail)
 {
 #if defined(HAVE_POSIX_OPENPT)
+    /* Unix98 PTY */
     int masterfd = -1, slavefd = -1;
     char *slavedevice;
-    struct sigaction dfl, old;
-
-    dfl.sa_handler = SIG_DFL;
-    dfl.sa_flags = 0;
-    sigemptyset(&dfl.sa_mask);
 
+#if defined(__sun) || defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD_version < 902000)
+    /* workaround for Solaris 10: grantpt() doesn't work if FD_CLOEXEC is set.  [ruby-dev:44688] */
+    /* FreeBSD 9.2 or later supports O_CLOEXEC
+     * http://www.freebsd.org/cgi/query-pr.cgi?pr=162374 */
     if ((masterfd = posix_openpt(O_RDWR|O_NOCTTY)) == -1) goto error;
-    rb_update_max_fd(masterfd);
-    if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error;
-    if (grantpt(masterfd) == -1) goto grantpt_error;
-    if (sigaction(SIGCHLD, &old, NULL) == -1) goto error;
+    if (rb_grantpt(masterfd) == -1) goto error;
+    rb_fd_fix_cloexec(masterfd);
+#else
+    {
+	int flags = O_RDWR|O_NOCTTY;
+# if defined(O_CLOEXEC)
+	/* glibc posix_openpt() in GNU/Linux calls open("/dev/ptmx", flags) internally.
+	 * So version dependency on GNU/Linux is same as O_CLOEXEC with open().
+	 * O_CLOEXEC is available since Linux 2.6.23.  Linux 2.6.18 silently ignore it. */
+	flags |= O_CLOEXEC;
+# endif
+	if ((masterfd = posix_openpt(flags)) == -1) goto error;
+    }
+    rb_fd_fix_cloexec(masterfd);
+    if (rb_grantpt(masterfd) == -1) goto error;
+#endif
     if (unlockpt(masterfd) == -1) goto error;
     if ((slavedevice = ptsname(masterfd)) == NULL) goto error;
     if (no_mesg(slavedevice, nomesg) == -1) goto error;
-    if ((slavefd = open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error;
+    if ((slavefd = rb_cloexec_open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error;
     rb_update_max_fd(slavefd);
 
-#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;
+#if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX)
+    if (ioctl_I_PUSH(slavefd, "ptem") == -1) goto error;
+    if (ioctl_I_PUSH(slavefd, "ldterm") == -1) goto error;
+    if (ioctl_I_PUSH(slavefd, "ttcompat") == -1) goto error;
 #endif
 
     *master = masterfd;
@@ -312,8 +285,6 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     strlcpy(SlaveName, slavedevice, DEVICELEN);
     return 0;
 
-  grantpt_error:
-    sigaction(SIGCHLD, &old, NULL);
   error:
     if (slavefd != -1) close(slavefd);
     if (masterfd != -1) close(masterfd);
@@ -331,8 +302,8 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
 	if (!fail) return -1;
 	rb_raise(rb_eRuntimeError, "openpty() failed");
     }
-    rb_update_max_fd(*master);
-    rb_update_max_fd(*slave);
+    rb_fd_fix_cloexec(*master);
+    rb_fd_fix_cloexec(*slave);
     if (no_mesg(SlaveName, nomesg) == -1) {
 	if (!fail) return -1;
 	rb_raise(rb_eRuntimeError, "can't chmod slave pty");
@@ -341,6 +312,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     return 0;
 
 #elif defined HAVE__GETPTY
+    /* SGI IRIX */
     char *name;
     mode_t mode = nomesg ? 0600 : 0622;
 
@@ -348,37 +320,42 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
 	if (!fail) return -1;
 	rb_raise(rb_eRuntimeError, "_getpty() failed");
     }
-    rb_update_max_fd(*master);
+    rb_fd_fix_cloexec(*master);
 
-    *slave = open(name, O_RDWR);
+    *slave = rb_cloexec_open(name, O_RDWR, 0);
     /* error check? */
     rb_update_max_fd(*slave);
     strlcpy(SlaveName, name, DEVICELEN);
 
     return 0;
 #elif defined(HAVE_PTSNAME)
+    /* System V */
     int	 masterfd = -1, slavefd = -1;
     char *slavedevice;
     void (*s)();
 
     extern char *ptsname(int);
     extern int unlockpt(int);
-    extern int grantpt(int);
 
+#if defined(__sun)
+    /* workaround for Solaris 10: grantpt() doesn't work if FD_CLOEXEC is set.  [ruby-dev:44688] */
     if((masterfd = open("/dev/ptmx", O_RDWR, 0)) == -1) goto error;
+    if(rb_grantpt(masterfd) == -1) goto error;
+    rb_fd_fix_cloexec(masterfd);
+#else
+    if((masterfd = rb_cloexec_open("/dev/ptmx", O_RDWR, 0)) == -1) goto error;
     rb_update_max_fd(masterfd);
-    s = signal(SIGCHLD, SIG_DFL);
-    if(grantpt(masterfd) == -1) goto error;
-    signal(SIGCHLD, s);
+    if(rb_grantpt(masterfd) == -1) goto error;
+#endif
     if(unlockpt(masterfd) == -1) goto error;
     if((slavedevice = ptsname(masterfd)) == NULL) goto error;
     if (no_mesg(slavedevice, nomesg) == -1) goto error;
-    if((slavefd = open(slavedevice, O_RDWR, 0)) == -1) goto error;
+    if((slavefd = rb_cloexec_open(slavedevice, O_RDWR, 0)) == -1) goto error;
     rb_update_max_fd(slavefd);
-#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");
+#if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX)
+    if(ioctl_I_PUSH(slavefd, "ptem") == -1) goto error;
+    if(ioctl_I_PUSH(slavefd, "ldterm") == -1) goto error;
+    ioctl_I_PUSH(slavefd, "ttcompat");
 #endif
     *master = masterfd;
     *slave = slavefd;
@@ -391,17 +368,47 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     if (fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
     return -1;
 #else
+    /* BSD */
     int	 masterfd = -1, slavefd = -1;
-    const char *const *p;
+    int  i;
     char MasterName[DEVICELEN];
 
-    for (p = deviceNo; *p != NULL; p++) {
-	snprintf(MasterName, sizeof MasterName, MasterDevice, *p);
-	if ((masterfd = open(MasterName,O_RDWR,0)) >= 0) {
+#define HEX1(c) \
+	c"0",c"1",c"2",c"3",c"4",c"5",c"6",c"7", \
+	c"8",c"9",c"a",c"b",c"c",c"d",c"e",c"f"
+
+#if defined(__hpux)
+    static const char MasterDevice[] = "/dev/ptym/pty%s";
+    static const char SlaveDevice[] =  "/dev/pty/tty%s";
+    static const char deviceNo[][3] = {
+	HEX1("p"), HEX1("q"), HEX1("r"), HEX1("s"),
+	HEX1("t"), HEX1("u"), HEX1("v"), HEX1("w"),
+    };
+#elif defined(_IBMESA)  /* AIX/ESA */
+    static const char MasterDevice[] = "/dev/ptyp%s";
+    static const char SlaveDevice[] = "/dev/ttyp%s";
+    static const char deviceNo[][3] = {
+	HEX1("0"), HEX1("1"), HEX1("2"), HEX1("3"),
+	HEX1("4"), HEX1("5"), HEX1("6"), HEX1("7"),
+	HEX1("8"), HEX1("9"), HEX1("a"), HEX1("b"),
+	HEX1("c"), HEX1("d"), HEX1("e"), HEX1("f"),
+    };
+#else /* 4.2BSD */
+    static const char MasterDevice[] = "/dev/pty%s";
+    static const char SlaveDevice[] = "/dev/tty%s";
+    static const char deviceNo[][3] = {
+	HEX1("p"), HEX1("q"), HEX1("r"), HEX1("s"),
+    };
+#endif
+#undef HEX1
+    for (i = 0; i < numberof(deviceNo); i++) {
+	const char *const devno = deviceNo[i];
+	snprintf(MasterName, sizeof MasterName, MasterDevice, devno);
+	if ((masterfd = rb_cloexec_open(MasterName,O_RDWR,0)) >= 0) {
             rb_update_max_fd(masterfd);
 	    *master = masterfd;
-	    snprintf(SlaveName, DEVICELEN, SlaveDevice, *p);
-	    if ((slavefd = open(SlaveName,O_RDWR,0)) >= 0) {
+	    snprintf(SlaveName, DEVICELEN, SlaveDevice, devno);
+	    if ((slavefd = rb_cloexec_open(SlaveName,O_RDWR,0)) >= 0) {
                 rb_update_max_fd(slavefd);
 		*slave = slavefd;
 		if (chown(SlaveName, getuid(), getgid()) != 0) goto error;
@@ -436,7 +443,7 @@ pty_close_pty(VALUE assoc)
 
     for (i = 0; i < 2; i++) {
         io = rb_ary_entry(assoc, i);
-        if (TYPE(io) == T_FILE && 0 <= RFILE(io)->fptr->fd)
+        if (RB_TYPE_P(io, T_FILE) && 0 <= RFILE(io)->fptr->fd)
             rb_io_close(io);
     }
     return Qnil;
@@ -449,55 +456,38 @@ pty_close_pty(VALUE assoc)
  *
  * Allocates a pty (pseudo-terminal).
  *
- * In the non-block form, returns a two element array, <tt>[master_io,
- * slave_file]</tt>.
- *
  * In the block form, yields two arguments <tt>master_io, slave_file</tt>
  * and the value of the block is returned from +open+.
  *
  * The IO and File are both closed after the block completes if they haven't
  * been already closed.
  *
+ *   PTY.open {|master, slave|
+ *     p master      #=> #<IO:masterpty:/dev/pts/1>
+ *     p slave      #=> #<File:/dev/pts/1>
+ *     p slave.path #=> "/dev/pts/1"
+ *   }
+ *
+ * In the non-block form, returns a two element array, <tt>[master_io,
+ * slave_file]</tt>.
+ *
+ *   master, slave = PTY.open
+ *   # do something with master for IO, or the slave file
+ *
  * The arguments in both forms are:
  *
- * <tt>master_io</tt>:: the master of the pty, as an IO.
- * <tt>slave_file</tt>:: the slave of the pty, as a File.  The path to the
- *                       terminal device is available via
- *                       <tt>slave_file.path</tt>
+ * +master_io+::    the master of the pty, as an IO.
+ * +slave_file+::   the slave of the pty, as a File.  The path to the
+ *		    terminal device is available via +slave_file.path+
  *
- * === Example
+ * IO#raw! is usable to disable newline conversions:
  *
+ *   require 'io/console'
  *   PTY.open {|m, s|
- *     p m      #=> #<IO:masterpty:/dev/pts/1>
- *     p s      #=> #<File:/dev/pts/1>
- *     p s.path #=> "/dev/pts/1"
+ *     s.raw!
+ *     ...
  *   }
  *
- *   # Change the buffering type in factor command,
- *   # assuming that factor uses stdio for stdout buffering.
- *   # If IO.pipe is used instead of PTY.open,
- *   # this code deadlocks because factor's stdout is fully buffered.
- *   require 'io/console' # for IO#raw!
- *   m, s = PTY.open
- *   s.raw! # disable newline conversion.
- *   r, w = IO.pipe
- *   pid = spawn("factor", :in=>r, :out=>s)
- *   r.close
- *   s.close
- *   w.puts "42"
- *   p m.gets #=> "42: 2 3 7\n"
- *   w.puts "144"
- *   p m.gets #=> "144: 2 2 2 2 3 3\n"
- *   w.close
- *   # The result of read operation when pty slave is closed is platform
- *   # dependent.
- *   ret = begin
- *           m.gets          # FreeBSD returns nil.
- *         rescue Errno::EIO # GNU/Linux raises EIO.
- *           nil
- *         end
- *   p ret #=> nil
- *
  */
 static VALUE
 pty_open(VALUE klass)
@@ -530,8 +520,14 @@ pty_open(VALUE klass)
 }
 
 static VALUE
-pty_detach_process(struct pty_info *info)
+pty_detach_process(VALUE v)
 {
+    struct pty_info *info = (void *)v;
+#ifdef WNOHANG
+    int st;
+    if (rb_waitpid(info->child_pid, &st, WNOHANG) <= 0)
+	return Qnil;
+#endif
     rb_detach_process(info->child_pid);
     return Qnil;
 }
@@ -540,31 +536,28 @@ pty_detach_process(struct pty_info *info)
  * call-seq:
  *   PTY.spawn(command_line)  { |r, w, pid| ... }
  *   PTY.spawn(command_line)  => [r, w, pid]
- *   PTY.spawn(command, args, ...)  { |r, w, pid| ... }
- *   PTY.spawn(command, args, ...)  => [r, w, pid]
- *   PTY.getpty(command_line)  { |r, w, pid| ... }
- *   PTY.getpty(command_line)  => [r, w, pid]
- *   PTY.getpty(command, args, ...)  { |r, w, pid| ... }
- *   PTY.getpty(command, args, ...)  => [r, w, pid]
+ *   PTY.spawn(command, arguments, ...)  { |r, w, pid| ... }
+ *   PTY.spawn(command, arguments, ...)  => [r, w, pid]
  *
- * Spawns the specified command on a newly allocated pty.
+ * Spawns the specified command on a newly allocated pty. You can also use the
+ * alias ::getpty.
  *
  * The command's controlling tty is set to the slave device of the pty
  * and its standard input/output/error is redirected to the slave device.
  *
- * <tt>command_line</tt>:: The full command line to run
- * <tt>command</tt>:: The command to run, as a String.
- * <tt>args</tt>:: Zero or more arguments, as Strings, representing
- *                 the arguments to +command+
+ * +command+ and +command_line+ are the full commands to run, given a String.
+ * Any additional +arguments+ will be passed to the command.
+ *
+ * === Return values
  *
  * In the non-block form this returns an array of size three,
- * <tt>[r, w, pid]</tt>.  In the block form the block will be called with
- * these as arguments, <tt>|r,w,pid|</tt>:
+ * <tt>[r, w, pid]</tt>.
  *
- * +r+:: An IO that can be read from that contains the command's
+ * In the block form these same values will be yielded to the block:
+ *
+ * +r+:: A readable IO that contains the command's
  *       standard output and standard error
- * +w+:: An IO that can be written to that is the command's
- *       standard input
+ * +w+:: A writable IO that is the command's standard input
  * +pid+:: The process identifier for the command.
  */
 static VALUE
@@ -582,12 +575,12 @@ pty_getpty(int argc, VALUE *argv, VALUE self)
 
     establishShell(argc, argv, &info, SlaveName);
 
-    rfptr->mode = rb_io_mode_flags("r");
+    rfptr->mode = rb_io_modestr_fmode("r");
     rfptr->fd = info.fd;
     rfptr->pathv = rb_obj_freeze(rb_str_new_cstr(SlaveName));
 
-    wfptr->mode = rb_io_mode_flags("w") | FMODE_SYNC;
-    wfptr->fd = dup(info.fd);
+    wfptr->mode = rb_io_modestr_fmode("w") | FMODE_SYNC;
+    wfptr->fd = rb_cloexec_dup(info.fd);
     if (wfptr->fd == -1)
         rb_sys_fail("dup()");
     rb_update_max_fd(wfptr->fd);
@@ -605,11 +598,12 @@ pty_getpty(int argc, VALUE *argv, VALUE self)
     return res;
 }
 
+NORETURN(static void raise_from_check(rb_pid_t pid, int status));
 static void
-raise_from_check(pid_t pid, int status)
+raise_from_check(rb_pid_t pid, int status)
 {
     const char *state;
-    char buf[1024];
+    VALUE msg;
     VALUE exc;
 
 #if defined(WIFSTOPPED)
@@ -627,8 +621,8 @@ raise_from_check(pid_t pid, int status)
     else {
 	state = "exited";
     }
-    snprintf(buf, sizeof(buf), "pty - %s: %ld", state, (long)pid);
-    exc = rb_exc_new2(eChildExited, buf);
+    msg = rb_sprintf("pty - %s: %ld", state, (long)pid);
+    exc = rb_exc_new_str(eChildExited, msg);
     rb_iv_set(exc, "status", rb_last_status_get());
     rb_exc_raise(exc);
 }
@@ -639,30 +633,40 @@ raise_from_check(pid_t pid, int status)
  *   PTY.check(pid, true)          => nil or raises PTY::ChildExited
  *
  * Checks the status of the child process specified by +pid+.
- * Returns +nil+ if the process is still alive.  If the process
- * is not alive, will return a <tt>Process::Status</tt> or raise
- * a <tt>PTY::ChildExited</tt> (if +raise+ was true).
+ * Returns +nil+ if the process is still alive.
+ *
+ * If the process is not alive, and +raise+ was true, a PTY::ChildExited
+ * exception will be raised. Otherwise it will return a Process::Status
+ * instance.
  *
  * +pid+:: The process id of the process to check
- * +raise+:: If true and the process identified by +pid+ is no longer
- *           alive a <tt>PTY::ChildExited</tt> is raised.
+ * +raise+:: If +true+ and the process identified by +pid+ is no longer
+ *           alive a PTY::ChildExited is raised.
  *
- * Returns nil or a <tt>Process::Status</tt> when +raise+ is false.
  */
 static VALUE
 pty_check(int argc, VALUE *argv, VALUE self)
 {
     VALUE pid, exc;
-    pid_t cpid;
+    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, WNOHANG|WUNTRACED);
-    if (cpid == -1) return Qnil;
+    cpid = rb_waitpid(NUM2PIDT(pid), &status, flag);
+    if (cpid == -1 || cpid == 0) return Qnil;
 
     if (!RTEST(exc)) return rb_last_status_get();
     raise_from_check(cpid, status);
-    return Qnil;		/* not reached */
+
+    UNREACHABLE_RETURN(Qnil);
 }
 
 static VALUE cPTY;
@@ -670,21 +674,74 @@ static VALUE cPTY;
 /*
  * Document-class: PTY::ChildExited
  *
- * Thrown when PTY#check is called for a pid that represents a process that
+ * Thrown when PTY::check is called for a pid that represents a process that
  * has exited.
  */
 
 /*
  * Document-class: PTY
  *
- * Creates and managed pseudo terminals (PTYs).  See also
+ * Creates and manages pseudo terminals (PTYs).  See also
  * http://en.wikipedia.org/wiki/Pseudo_terminal
+ *
+ * PTY allows you to allocate new terminals using ::open or ::spawn a new
+ * terminal with a specific command.
+ *
+ * == Example
+ *
+ * In this example we will change the buffering type in the +factor+ command,
+ * assuming that factor uses stdio for stdout buffering.
+ *
+ * If IO.pipe is used instead of PTY.open, this code deadlocks because factor's
+ * stdout is fully buffered.
+ *
+ *   # start by requiring the standard library PTY
+ *   require 'pty'
+ *
+ *   master, slave = PTY.open
+ *   read, write = IO.pipe
+ *   pid = spawn("factor", :in=>read, :out=>slave)
+ *   read.close	    # we dont need the read
+ *   slave.close    # or the slave
+ *
+ *   # pipe "42" to the factor command
+ *   write.puts "42"
+ *   # output the response from factor
+ *   p master.gets #=> "42: 2 3 7\n"
+ *
+ *   # pipe "144" to factor and print out the response
+ *   write.puts "144"
+ *   p master.gets #=> "144: 2 2 2 2 3 3\n"
+ *   write.close # close the pipe
+ *
+ *   # The result of read operation when pty slave is closed is platform
+ *   # dependent.
+ *   ret = begin
+ *           master.gets     # FreeBSD returns nil.
+ *         rescue Errno::EIO # GNU/Linux raises EIO.
+ *           nil
+ *         end
+ *   p ret #=> nil
+ *
+ * == License
+ *
+ *  C) Copyright 1998 by Akinori Ito.
+ *
+ *  This software may be redistributed freely for this purpose, in full
+ *  or in part, provided that this entire copyright notice is included
+ *  on any copies of this software and applications and derivations thereof.
+ *
+ *  This software is provided on an "as is" basis, without warranty of any
+ *  kind, either expressed or implied, as to any matter including, but not
+ *  limited to warranty of fitness of purpose, or merchantability, or
+ *  results obtained from use of this software.
  */
 
 void
-Init_pty()
+Init_pty(void)
 {
     cPTY = rb_define_module("PTY");
+    /* :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/README b/ext/racc/cparse/README
index 80b4dce311..550e8d49fe 100644
--- a/ext/racc/cparse/README
+++ b/ext/racc/cparse/README
@@ -6,5 +6,6 @@ Racc parser generator.  If you want to generate
 your own parser, you must get Racc full package.
 Get it from:
 
-  http://raa.ruby-lang.org/list.rhtml?name=racc
+  - http://i.loveruby.net/en/projects/racc
+  - https://github.com/ruby/racc
 
diff --git a/ext/racc/cparse/cparse.c b/ext/racc/cparse/cparse.c
index 3a2a8ae74e..ca74b80000 100644
--- a/ext/racc/cparse/cparse.c
+++ b/ext/racc/cparse/cparse.c
@@ -11,7 +11,7 @@
 
 */
 
-#include "ruby/ruby.h"
+#include <ruby.h>
 
 #ifndef FALSE
 #define FALSE 0
@@ -24,7 +24,7 @@
                         Important Constants
 ----------------------------------------------------------------------- */
 
-#define RACC_VERSION "1.4.5"
+#define RACC_VERSION "1.4.15"
 
 #define DEFAULT_TOKEN -1
 #define ERROR_TOKEN    1
@@ -72,6 +72,10 @@ static ID id_d_e_pop;
 #  define LONG2NUM(i) INT2NUM(i)
 #endif
 
+#ifndef HAVE_RB_ARY_SUBSEQ
+#  define rb_ary_subseq(ary, beg, len) rb_ary_new4(len, RARRAY_PTR(ary) + beg)
+#endif
+
 static ID value_to_id _((VALUE v));
 static inline long num_to_long _((VALUE n));
 
@@ -91,7 +95,7 @@ num_to_long(VALUE n)
 }
 
 #define AREF(s, idx) \
-    ((0 <= idx && idx < RARRAY_LEN(s)) ? RARRAY_PTR(s)[idx] : Qnil)
+    ((0 <= idx && idx < RARRAY_LEN(s)) ? rb_ary_entry(s, idx) : Qnil)
 
 /* -----------------------------------------------------------------------
                         Parser Stack Interfaces
@@ -105,7 +109,7 @@ get_stack_tail(VALUE stack, long len)
 {
     if (len < 0) return Qnil;  /* system error */
     if (len > RARRAY_LEN(stack)) len = RARRAY_LEN(stack);
-    return rb_ary_new4(len, RARRAY_PTR(stack) + RARRAY_LEN(stack) - len);
+    return rb_ary_subseq(stack, RARRAY_LEN(stack) - len, len);
 }
 
 static void
@@ -122,7 +126,7 @@ cut_stack_tail(VALUE stack, long len)
 #define PUSH(s, i) rb_ary_store(s, RARRAY_LEN(s), i)
 #define POP(s) rb_ary_pop(s)
 #define LAST_I(s) \
-    ((RARRAY_LEN(s) > 0) ? RARRAY_PTR(s)[RARRAY_LEN(s) - 1] : Qnil)
+    ((RARRAY_LEN(s) > 0) ? rb_ary_entry(s, RARRAY_LEN(s) - 1) : Qnil)
 #define GET_TAIL(s, len) get_stack_tail(s, len)
 #define CUT_TAIL(s, len) cut_stack_tail(s, len)
 
@@ -192,7 +196,7 @@ static VALUE racc_yyparse _((VALUE parser, VALUE lexer, VALUE lexmid,
                              VALUE arg, VALUE sysdebug));
 
 static void call_lexer _((struct cparse_params *v));
-static VALUE lexer_i _((VALUE block_args, VALUE data, VALUE self));
+static VALUE lexer_i _((RB_BLOCK_CALL_FUNC_ARGLIST(block_args, data)));
 
 static VALUE assert_array _((VALUE a));
 static long assert_integer _((VALUE n));
@@ -200,6 +204,7 @@ 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));
@@ -207,7 +212,7 @@ static void extract_user_token _((struct cparse_params *v,
                                   VALUE block_args, VALUE *tok, VALUE *val));
 static void shift _((struct cparse_params* v, long act, VALUE tok, VALUE val));
 static int reduce _((struct cparse_params* v, long act));
-static VALUE reduce0 _((VALUE block_args, VALUE data, VALUE self));
+static rb_block_call_func reduce0;
 
 #ifdef DEBUG
 # define D_puts(msg)        if (v->sys_debug) puts(msg)
@@ -217,31 +222,48 @@ 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)
 {
-    volatile VALUE vparams;
+    VALUE vparams;
     struct cparse_params *v;
 
-    vparams = Data_Make_Struct(CparseParams, struct cparse_params,
-                               cparse_params_mark, -1, v);
+    vparams = TypedData_Make_Struct(CparseParams, struct cparse_params,
+				    &cparse_params_type, 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)
 {
-    volatile VALUE vparams;
+    VALUE vparams;
     struct cparse_params *v;
 
-    vparams = Data_Make_Struct(CparseParams, struct cparse_params,
-                               cparse_params_mark, -1, v);
+    vparams = TypedData_Make_Struct(CparseParams, struct cparse_params,
+				    &cparse_params_type, v);
     v->sys_debug = RTEST(sysdebug);
     D_puts("start C yyparse");
     vparams = initialize_params(vparams, parser, arg, lexer, lexmid);
@@ -254,6 +276,7 @@ racc_yyparse(VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug)
                  rb_id2name(v->lexmid));
     }
 
+    RB_GC_GUARD(vparams);
     return v->retval;
 }
 
@@ -267,9 +290,8 @@ call_lexer(struct cparse_params *v)
 static VALUE
 lexer_iter(VALUE data)
 {
-    struct cparse_params *v;
+    struct cparse_params *v = rb_check_typeddata(data, &cparse_params_type);
 
-    Data_Get_Struct(data, struct cparse_params, v);
     rb_funcall(v->lexer, v->lexmid, 0);
     return Qnil;
 }
@@ -282,12 +304,11 @@ call_lexer(struct cparse_params *v)
 #endif
 
 static VALUE
-lexer_i(VALUE block_args, VALUE data, VALUE self)
+lexer_i(RB_BLOCK_CALL_FUNC_ARGLIST(block_args, data))
 {
-    struct cparse_params *v;
+    struct cparse_params *v = rb_check_typeddata(data, &cparse_params_type);
     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);
@@ -320,9 +341,8 @@ assert_integer(VALUE n)
 static VALUE
 initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lexmid)
 {
-    struct cparse_params *v;
+    struct cparse_params *v = rb_check_typeddata(vparams, &cparse_params_type);
 
-    Data_Get_Struct(vparams, struct cparse_params, v);
     v->value_v = vparams;
     v->parser = parser;
     v->lexer = lexer;
@@ -334,21 +354,21 @@ initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lex
     Check_Type(arg, T_ARRAY);
     if (!(13 <= RARRAY_LEN(arg) && RARRAY_LEN(arg) <= 14))
         rb_raise(RaccBug, "[Racc Bug] wrong arg.size %ld", RARRAY_LEN(arg));
-    v->action_table   = assert_array  (RARRAY_PTR(arg)[ 0]);
-    v->action_check   = assert_array  (RARRAY_PTR(arg)[ 1]);
-    v->action_default = assert_array  (RARRAY_PTR(arg)[ 2]);
-    v->action_pointer = assert_array  (RARRAY_PTR(arg)[ 3]);
-    v->goto_table     = assert_array  (RARRAY_PTR(arg)[ 4]);
-    v->goto_check     = assert_array  (RARRAY_PTR(arg)[ 5]);
-    v->goto_default   = assert_array  (RARRAY_PTR(arg)[ 6]);
-    v->goto_pointer   = assert_array  (RARRAY_PTR(arg)[ 7]);
-    v->nt_base        = assert_integer(RARRAY_PTR(arg)[ 8]);
-    v->reduce_table   = assert_array  (RARRAY_PTR(arg)[ 9]);
-    v->token_table    = assert_hash   (RARRAY_PTR(arg)[10]);
-    v->shift_n        = assert_integer(RARRAY_PTR(arg)[11]);
-    v->reduce_n       = assert_integer(RARRAY_PTR(arg)[12]);
+    v->action_table   = assert_array  (rb_ary_entry(arg,  0));
+    v->action_check   = assert_array  (rb_ary_entry(arg,  1));
+    v->action_default = assert_array  (rb_ary_entry(arg,  2));
+    v->action_pointer = assert_array  (rb_ary_entry(arg,  3));
+    v->goto_table     = assert_array  (rb_ary_entry(arg,  4));
+    v->goto_check     = assert_array  (rb_ary_entry(arg,  5));
+    v->goto_default   = assert_array  (rb_ary_entry(arg,  6));
+    v->goto_pointer   = assert_array  (rb_ary_entry(arg,  7));
+    v->nt_base        = assert_integer(rb_ary_entry(arg,  8));
+    v->reduce_table   = assert_array  (rb_ary_entry(arg,  9));
+    v->token_table    = assert_hash   (rb_ary_entry(arg, 10));
+    v->shift_n        = assert_integer(rb_ary_entry(arg, 11));
+    v->reduce_n       = assert_integer(rb_ary_entry(arg, 12));
     if (RARRAY_LEN(arg) > 13) {
-        v->use_result_var = RTEST(RARRAY_PTR(arg)[13]);
+        v->use_result_var = RTEST(rb_ary_entry(arg, 13));
     }
     else {
         v->use_result_var = TRUE;
@@ -405,6 +425,12 @@ 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)
@@ -416,12 +442,12 @@ extract_user_token(struct cparse_params *v, VALUE block_args,
         return;
     }
 
-    if (TYPE(block_args) != T_ARRAY) {
+    if (!RB_TYPE_P(block_args, T_ARRAY)) {
         rb_raise(rb_eTypeError,
-                 "%s() %s %s (must be Array[2])",
+                 "%s() %s %"PRIsVALUE" (must be Array[2])",
                  v->lex_is_iterator ? rb_id2name(v->lexmid) : "next_token",
                  v->lex_is_iterator ? "yielded" : "returned",
-                 rb_class2name(CLASS_OF(block_args)));
+                 rb_obj_class(block_args));
     }
     if (RARRAY_LEN(block_args) != 2) {
         rb_raise(rb_eArgError,
@@ -564,7 +590,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
 
   accept:
     if (v->debug) rb_funcall(v->parser, id_d_accept, 0);
-    v->retval = RARRAY_PTR(v->vstack)[0];
+    v->retval = rb_ary_entry(v->vstack, 0);
     v->fin = CP_FIN_ACCEPT;
     return;
 
@@ -682,9 +708,9 @@ reduce(struct cparse_params *v, long act)
 }
 
 static VALUE
-reduce0(VALUE val, VALUE data, VALUE self)
+reduce0(RB_BLOCK_CALL_FUNC_ARGLIST(_, data))
 {
-    struct cparse_params *v;
+    struct cparse_params *v = rb_check_typeddata(data, &cparse_params_type);
     VALUE reduce_to, reduce_len, method_id;
     long len;
     ID mid;
@@ -692,10 +718,9 @@ reduce0(VALUE val, VALUE data, VALUE self)
     long i, k1, k2;
     VALUE goto_state;
 
-    Data_Get_Struct(data, struct cparse_params, v);
-    reduce_len = RARRAY_PTR(v->reduce_table)[v->ruleno];
-    reduce_to  = RARRAY_PTR(v->reduce_table)[v->ruleno+1];
-    method_id  = RARRAY_PTR(v->reduce_table)[v->ruleno+2];
+    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);
     len = NUM2LONG(reduce_len);
     mid = value_to_id(method_id);
 
@@ -710,10 +735,10 @@ reduce0(VALUE val, VALUE data, VALUE self)
     else {
         if (mid != id_noreduce) {
             tmp_v = GET_TAIL(v->vstack, len);
-            tmp = RARRAY_PTR(tmp_v)[0];
+            tmp = rb_ary_entry(tmp_v, 0);
         }
         else {
-            tmp = RARRAY_PTR(v->vstack)[ RARRAY_LEN(v->vstack) - len ];
+            tmp = rb_ary_entry(v->vstack, RARRAY_LEN(v->vstack) - len);
         }
         CUT_TAIL(v->vstack, len);
         if (v->debug) {
@@ -794,6 +819,8 @@ 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");
 
@@ -813,6 +840,9 @@ 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
index 7b06a880f5..a156b32343 100644
--- a/ext/racc/cparse/depend
+++ b/ext/racc/cparse/depend
@@ -1 +1,14 @@
-cparse.o: cparse.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+# AUTOGENERATED DEPENDENCIES START
+cparse.o: $(RUBY_EXTCONF_H)
+cparse.o: $(arch_hdrdir)/ruby/config.h
+cparse.o: $(hdrdir)/ruby.h
+cparse.o: $(hdrdir)/ruby/assert.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 3710f6f7e7..47b455d992 100644
--- a/ext/racc/cparse/extconf.rb
+++ b/ext/racc/cparse/extconf.rb
@@ -1,5 +1,8 @@
-# $Id$
+# frozen_string_literal: false
+# $Id: a9187b5bc40e6adf05e7b6ee5b370b39a3429ecd $
 
 require 'mkmf'
-have_func('rb_block_call', 'ruby/ruby.h')
+
+have_func('rb_ary_subseq')
+
 create_makefile 'racc/cparse'
diff --git a/ext/rbconfig/sizeof/depend b/ext/rbconfig/sizeof/depend
new file mode 100644
index 0000000000..9433dd4156
--- /dev/null
+++ b/ext/rbconfig/sizeof/depend
@@ -0,0 +1,39 @@
+# sources
+
+limits.c: $(top_srcdir)/tool/generic_erb.rb $(top_srcdir)/template/limits.c.tmpl
+	$(Q) $(RUBY) $(top_srcdir)/tool/generic_erb.rb --output=$@ \
+		$(top_srcdir)/template/limits.c.tmpl \
+
+sizes.c: $(top_srcdir)/tool/generic_erb.rb \
+		   $(top_srcdir)/template/sizes.c.tmpl \
+		   $(top_srcdir)/configure.ac \
+		   $(top_srcdir)/ext/rbconfig/sizeof/extconf.rb
+	$(Q) $(RUBY) $(top_srcdir)/tool/generic_erb.rb --output=$@ \
+		$(top_srcdir)/template/sizes.c.tmpl \
+		$(top_srcdir)/configure.ac \
+		$(top_srcdir)/ext/rbconfig/sizeof/extconf.rb
+
+# AUTOGENERATED DEPENDENCIES START
+limits.o: $(RUBY_EXTCONF_H)
+limits.o: $(arch_hdrdir)/ruby/config.h
+limits.o: $(hdrdir)/ruby/assert.h
+limits.o: $(hdrdir)/ruby/backward.h
+limits.o: $(hdrdir)/ruby/defines.h
+limits.o: $(hdrdir)/ruby/intern.h
+limits.o: $(hdrdir)/ruby/missing.h
+limits.o: $(hdrdir)/ruby/ruby.h
+limits.o: $(hdrdir)/ruby/st.h
+limits.o: $(hdrdir)/ruby/subst.h
+limits.o: limits.c
+sizes.o: $(RUBY_EXTCONF_H)
+sizes.o: $(arch_hdrdir)/ruby/config.h
+sizes.o: $(hdrdir)/ruby/assert.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
diff --git a/ext/rbconfig/sizeof/extconf.rb b/ext/rbconfig/sizeof/extconf.rb
new file mode 100644
index 0000000000..f7cd58f2d9
--- /dev/null
+++ b/ext/rbconfig/sizeof/extconf.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: false
+$srcs = %w[sizes.c limits.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/.gitignore b/ext/readline/.gitignore
new file mode 100644
index 0000000000..3d372989ae
--- /dev/null
+++ b/ext/readline/.gitignore
@@ -0,0 +1 @@
+/readline-[1-9]*.*
diff --git a/ext/readline/README.ja b/ext/readline/README.ja
index 77ec55c3aa..57a6ee4126 100644
--- a/ext/readline/README.ja
+++ b/ext/readline/README.ja
@@ -1,20 +1,20 @@
-GNU Readline �ˤ�륳�ޥ�ɥ饤�����ϥ��󥿥ե��������󶡤���⥸�塼��
-�Ǥ���GNU Readline �θߴ��饤�֥��ΤҤȤĤǤ��� Edit Line(libedit) ��
-���ݡ��Ȥ��Ƥ��ޤ���
+GNU Readline によるコマンドライン入力インタフェースを提供するモジュール
+です。GNU Readline の互換ライブラリのひとつである Edit Line(libedit) も
+サポートしています。
 
 GNU Readline:: http://www.gnu.org/directory/readline.html
 libedit::      http://www.thrysoee.dk/editline/
 
-Readline.readline ����Ѥ��ƥ桼����������Ϥ�����Ǥ��ޤ������ΤȤ���
-GNU Readline �Τ褦�����Ϥ��䴰��Emacs �Τ褦�ʥ������ʤɤ��Ǥ��ޤ���
+Readline.readline を使用してユーザからの入力を取得できます。このとき、
+GNU Readline のように入力の補完やEmacs のようなキー操作などができます。
 
   require "readline"
   while buf = Readline.readline("> ", true)
     p buf
   end
 
-�桼�������Ϥ������Ƥ�����(�ʲ����ҥ��ȥ�)�Ȥ��Ƶ�Ͽ���뤳�Ȥ��Ǥ��ޤ���
-��� Readline::HISTORY ����Ѥ��ƥҥ��ȥ�˥��������Ǥ��ޤ���
+ユーザが入力した内容を履歴(以下、ヒストリ)として記録することができます。
+定数 Readline::HISTORY を使用してヒストリにアクセスできます。
 
   require "readline"
   while buf = Readline.readline("> ", true)
@@ -22,40 +22,38 @@ GNU Readline �Τ褦�����Ϥ��䴰��Emacs �Τ褦�ʥ������ʤɤ��Ǥ��ޤ���
     print("-> ", buf, "\n")
   end
 
-���Ѥ���饤�֥��ˤ�ꡢ�����Ĥ��Υ᥽�åɤ��㳰 NotImplementedError
-��ȯ�����ޤ���
+使用するライブラリにより、いくつかのメソッドで例外 NotImplementedError
+が発生します。
 
-$SAFE �� 4 �ξ�硢¿���Υ᥽�åɤ��㳰 SecurityError ��ȯ�����ޤ���
+== Readline モジュール
 
-== Readline �⥸�塼��
-
-=== �⥸�塼��ؿ�
+=== モジュール関数
 
 readline([prompt, [add_hist]]) -> String | nil
 
-  prompt ����Ϥ����桼������Υ������Ϥ��Ԥ��ޤ���
-  ���󥿡������β����ʤɤǥ桼����ʸ��������Ϥ�������ȡ�
-  ���Ϥ���ʸ������֤��ޤ���
-  ���ΤȤ���add_hist �� true �Ǥ���С����Ϥ���ʸ�����ҥ��ȥ���ɲä��ޤ���
+  prompt を出力し、ユーザからのキー入力を待ちます。
+  エンターキーの押下などでユーザが文字列を入力し終えると、
+  入力した文字列を返します。
+  このとき、add_hist が true であれば、入力した文字列をヒストリに追加します。
 
-  �������Ϥ��Ƥ��ʤ����֤� EOF(UNIX �Ǥ� ^D) �����Ϥ���ʤɤǡ�
-  �桼����������Ϥ��ʤ����� nil ���֤��ޤ���
+  何も入力していない状態で EOF(UNIX では ^D) を入力するなどで、
+  ユーザからの入力がない場合は nil を返します。
 
-  ���ξ���������������硢�㳰 IOError ��ȯ�����ޤ���
-  1. ɸ�����Ϥ� tty �Ǥʤ���
-  2. ɸ�����Ϥ򥯥��������Ƥ��롣(isatty(2) �� errno �� EBADF �Ǥ��롣)
+  次の条件を全て満たす場合、例外 IOError が発生します。
+  1. 標準入力が tty でない。
+  2. 標準入力をクローズしている。(isatty(2) の errno が EBADF である。)
 
-  �ܥ᥽�åɤϥ���åɤ��б����Ƥ��ޤ���
-  �����Ԥ����֤ΤȤ��ϥ���åɥ���ƥ����Ȥ����ؤ���ȯ�����ޤ���
+  本メソッドはスレッドに対応しています。
+  入力待ち状態のときはスレッドコンテキストの切替えが発生します。
 
-  ���ϻ��ˤϹ����Խ�����ǽ�ǡ�vi �⡼�ɤ� Emacs �⡼�ɤ��Ѱդ���Ƥ��ޤ���
-  �ǥե���Ȥ� Emacs �⡼�ɤǤ���
+  入力時には行内編集が可能で、vi モードと Emacs モードが用意されています。
+  デフォルトは Emacs モードです。
 
-  �ܥ᥽�åɤˤ����ջ��ब����ޤ���
-  �����Ԥ��ξ��֤� ^C ����� ruby ���󥿥ץ꥿����λ����ü�����֤��������ޤ���
-  �������򤹤뤿������3�ĵ󤲤ޤ���
+  本メソッドには注意事項があります。
+  入力待ちの状態で ^C すると ruby インタプリタが終了し、端末状態を復帰しません。
+  これを回避するための例を3つ挙げます。
 
-  * ^C�ˤ��Interrupt�㳰�������ơ�ü�����֤��������ޤ�:
+  * ^CによるInterrupt例外を補足して、端末状態を復帰します:
 
       require "readline"
 
@@ -71,7 +69,7 @@ readline([prompt, [add_hist]]) -> String | nil
         end
       end
 
-  * INT�����ʥ�������ơ�ü�����֤��������ޤ�:
+  * INTシグナルを補足して、端末状態を復帰します:
 
       require "readline"
 
@@ -82,7 +80,7 @@ readline([prompt, [add_hist]]) -> String | nil
         p buf
       end
 
-  * ñ�� ^C ��̵�뤹����ˡ�⤢��ޤ�:
+  * 単に ^C を無視する方法もあります:
 
       require "readline"
 
@@ -92,8 +90,8 @@ readline([prompt, [add_hist]]) -> String | nil
         p buf
       end
 
-  �������� Readline::HISTORY ����Ѥ��ơ����Ԥ�ľ�������Ϥ�Ʊ�����Ƥ�����
-  ����˻Ĥ��ʤ��Ȥ������Ȥ�Ǥ��ޤ���
+  入力履歴 Readline::HISTORY を使用して、空行や直前の入力と同じ内容は入力
+  履歴に残さないということもできます。
 
     require "readline"
 
@@ -112,287 +110,241 @@ readline([prompt, [add_hist]]) -> String | nil
       print "-> ", buf, "\n"
     end
 
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
-
-=== ���饹�᥽�å�
+=== クラスメソッド
 
 Readline.input = input
 
-  Readline.readline �᥽�åɤǻ��Ѥ��������Ѥ� File ���֥������� input
-  ����ꤷ�ޤ���
-
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  Readline.readline メソッドで使用する入力用の File オブジェクト input
+  を指定します。
 
 Readline.output = output
 
-  Readline.readline �᥽�åɤǻ��Ѥ�������Ѥ� File ���֥�������
-  output ����ꤷ�ޤ���
-
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  Readline.readline メソッドで使用する出力用の File オブジェクト
+  output を指定します。
 
 Readline.completion_proc = proc
 
-  �桼����������Ϥ��䴰������θ����������� Proc ���֥������� proc ��
-  ���ꤷ�ޤ���proc �ϡ����Τ�Τ����ꤷ�Ƥ��ޤ���
-  1. call �᥽�åɤ�����ޤ���
-     call �᥽�åɤ�����ʤ���硢�㳰 ArgumentError ��ȯ�����ޤ���
-  2. �����˥桼�����������ʸ����(��1)����ޤ���
-  3. �����ʸ�����������֤��ޤ���
+  ユーザからの入力を補完する時の候補を取得する Proc オブジェクト proc を
+  指定します。proc は、次のものを想定しています。
+  1. call メソッドを持ちます。
+     call メソッドを持たない場合、例外 ArgumentError が発生します。
+  2. 引数にユーザからの入力文字列(注1)を取ります。
+  3. 候補の文字列の配列を返します。
 
-  ��1:��/var/lib /v�פθ���䴰��Ԥ��ȡ�
-  �ǥե���ȤǤ� proc �ΰ����ˡ�/v�פ��Ϥ���ޤ���
-  ���Τ褦�ˡ��桼�������Ϥ���ʸ�����
-  Readline.completer_word_break_characters �˴ޤޤ��ʸ���Ƕ��ڤä���
-  �Τ�ñ��Ȥ���ȡ��������뤬����ñ��κǽ��ʸ�����鸽�ߤΥ��������
-  �֤ޤǤ�ʸ���� proc �ΰ������Ϥ���ޤ���
-
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  注1:「/var/lib /v」の後で補完を行うと、
+  デフォルトでは proc の引数に「/v」が渡されます。
+  このように、ユーザが入力した文字列を
+  Readline.completer_word_break_characters に含まれる文字で区切ったも
+  のを単語とすると、カーソルがある単語の最初の文字から現在のカーソル位
+  置までの文字列が proc の引数に渡されます。
 
 Readline.completion_proc -> proc
 
-  �桼����������Ϥ��䴰������θ����������� Proc ���֥������� proc
-  ��������ޤ���
-
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  ユーザからの入力を補完する時の候補を取得する Proc オブジェクト proc
+  を取得します。
 
 Readline.completion_case_fold = bool
 
-  �桼�������Ϥ��䴰����ݡ���ʸ���Ⱦ�ʸ������̤��롿���ʤ�����ꤷ�ޤ���
-  bool �����ʤ�ж��̤��ޤ���bool �����ʤ�ж��̤��ޤ���
-
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  ユーザの入力を補完する際、大文字と小文字を区別する／しないを指定します。
+  bool が真ならば区別しません。bool が偽ならば区別します。
 
 Readline.completion_case_fold -> bool
 
-  �桼�������Ϥ��䴰����ݡ���ʸ���Ⱦ�ʸ������̤��롿���ʤ���������ޤ���
-  bool �����ʤ�ж��̤��ޤ���bool �����ʤ�ж��̤��ޤ���
+  ユーザの入力を補完する際、大文字と小文字を区別する／しないを取得します。
+  bool が真ならば区別しません。bool が偽ならば区別します。
 
-  �ʤ���Readline.completion_case_fold= �᥽�åɤǻ��ꤷ�����֥������Ȥ�
-  ���Τޤ޼�������Τǡ����Τ褦��ư��򤷤ޤ���
+  なお、Readline.completion_case_fold= メソッドで指定したオブジェクトを
+  そのまま取得するので、次のような動作をします。
 
     require "readline"
 
     Readline.completion_case_fold = "This is a String."
     p Readline.completion_case_fold # => "This is a String."
 
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
-
 Readline.line_buffer -> string
 
-  ������ι����Τ��֤��ޤ���complete_proc ����ǻ��Ѥ��뤳�Ȥ����ꤷ
-  �Ƥ��ޤ���Readline.line_buffer ��Ĺ���� GNU Readline �� rl_end �ѿ���
-  �ͤȰ��פ��ޤ���
+  入力中の行全体を返します。complete_proc の中で使用することを想定し
+  ています。Readline.line_buffer の長さは GNU Readline の rl_end 変数の
+  値と一致します。
 
 Readline.point -> int
 
-  ���ߤΥ�������ΰ��֤��֤��ޤ���
-  Readline �⥸�塼����䴰�оݤ�ñ��γ��ϰ��֤ξ�����󶡤��Ƥ��ޤ���
-  �������ʤ��顢 completion_proc ��������Ϥ���ñ�� text ��
-  Readline.point ����Ѥ��뤳�Ȥǳ��ϰ��֤�Ƴ�����Ȥ��Ǥ��ޤ���
+  現在のカーソルの位置を返します。
+  Readline モジュールは補完対象の単語の開始位置の情報を提供していません。
+  しかしながら、 completion_proc の中で入力した単語 text と
+  Readline.point を使用することで開始位置を導くことができます。
 
-    ���ϰ��� = ���Ϥ���ñ���Ĺ�� - Readline.point
+    開始位置 = 入力した単語の長さ - Readline.point
 
 Readline.vi_editing_mode -> nil
 
-  �Խ��⡼�ɤ� vi �⡼�ɤˤ��ޤ���
-  vi �⡼�ɤξܺ٤ϡ�GNU Readline �Υޥ˥奢��򻲾Ȥ��Ƥ���������
-
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+  編集モードを vi モードにします。
+  vi モードの詳細は、GNU Readline のマニュアルを参照してください。
 
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.vi_editing_mode? -> bool
 
-  �Խ��⡼�ɤ� vi �⡼�ɤξ�硢true ���֤��ޤ��������Ǥʤ���� false
-  ���֤��ޤ���
-
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+  編集モードが vi モードの場合、true を返します。そうでなければ false
+  を返します。
 
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.emacs_editing_mode -> nil
 
-  �Խ��⡼�ɤ� Emacs �⡼�ɤˤ��ޤ���
-  �ǥե���Ȥ� Emacs �⡼�ɤǤ���
-  Emacs �⡼�ɤξܺ٤ϡ�GNU Readline �Υޥ˥奢��򻲾Ȥ��Ƥ���������
+  編集モードを Emacs モードにします。
+  デフォルトは Emacs モードです。
+  Emacs モードの詳細は、GNU Readline のマニュアルを参照してください。
 
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
-
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.emacs_editing_mode? -> bool
 
-  �Խ��⡼�ɤ� Emacs �⡼�ɤξ�硢true ���֤��ޤ��������Ǥʤ���� false
-  ���֤��ޤ���
-
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+  編集モードが Emacs モードの場合、true を返します。そうでなければ false
+  を返します。
 
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.completion_append_character = char
 
-  �桼�������Ϥ��䴰����λ�������ˡ��Ǹ���ղä���ʸ�� char ����ꤷ
-  �ޤ���Ⱦ�ѥ��ڡ�����" "�פʤɤ�ñ�����ڤ�ʸ������ꤹ��С�Ϣ³����
-  ���Ϥ���ݤ������Ǥ���
+  ユーザの入力の補完が完了した場合に、最後に付加する文字 char を指定し
+  ます。半角スペース「" "」などの単語を区切る文字を指定すれば、連続して
+  入力する際に便利です。
 
-  ������:
+  使用例:
 
     require "readline"
 
     Readline.readline("> ", true)
     Readline.completion_append_character = " "
 
-  �¹���:
+  実行例:
 
     >
-    ������ "/var/li" �����Ϥ��ޤ���
+    ここで "/var/li" を入力します。
 
     > /var/li
-    ������ TAB ���������Ϥ��ޤ���
+    ここで TAB キーを入力します。
 
     > /var/lib
-    "b" ���䴰���졢�Ǹ�� " " ���ɲä����Τǡ�"/usr" ��Ϣ³�������ϤǤ��ޤ���
+    "b" が補完され、最後に " " が追加されるので、"/usr" を連続して入力できます。
 
     > /var/lib /usr
 
-  �ʤ���1ʸ���������ꤹ�뤳�ȤϤǤ��ޤ���
-  �㤨�С�"string"����ꤷ�����Ϻǽ��ʸ���Ǥ���"s"��������Ѥ��ޤ���
+  なお、1文字しか指定することはできません。
+  例えば、"string"を指定した場合は最初の文字である"s"だけを使用します。
 
     require "readline"
 
     Readline.completion_append_character = "string"
     p Readline.completion_append_character # => "s"
 
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
-
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.completion_append_character -> char
 
-  �桼�������Ϥ��䴰����λ�������ˡ��Ǹ���ղä���ʸ����������ޤ���
-  �ǥե���Ȥ϶��� (" ") �Ǥ���
+  ユーザの入力の補完が完了した場合に、最後に付加する文字を取得します。
+  デフォルトは空白 (" ") です。
 
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
-
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.basic_word_break_characters = string
 
-  �桼�������Ϥ��䴰��Ԥ��ݡ�ñ��ζ��ڤ�򼨤�ʣ����ʸ���ǹ��������
-  ʸ���� string ����ꤷ�ޤ���
-
-  GNU Readline �Υǥե���Ȥ��ͤϡ�Bash ���䴰�����ǻ��Ѥ��Ƥ���ʸ����
-  " \t\n\"\\'`@$><=;|&{(" (���ڡ�����ޤ�) �ˤʤäƤ��ޤ���
+  ユーザの入力の補完を行う際、単語の区切りを示す複数の文字で構成される
+  文字列 string を指定します。
 
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+  GNU Readline のデフォルトの値は、Bash の補完処理で使用している文字列
+  " \t\n\"\\'`@$><=;|&{(" (スペースを含む) になっています。
 
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.basic_word_break_characters -> string
 
-  �桼�������Ϥ��䴰��Ԥ��ݡ�ñ��ζ��ڤ�򼨤�ʣ����ʸ���ǹ��������
-  ʸ�����������ޤ���
-
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+  ユーザの入力の補完を行う際、単語の区切りを示す複数の文字で構成される
+  文字列を取得します。
 
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.completer_word_break_characters = string
 
-  �桼�������Ϥ��䴰��Ԥ��ݡ�ñ��ζ��ڤ�򼨤�ʣ����ʸ���ǹ��������
-  ʸ���� string ����ꤷ�ޤ���
-  Readline.basic_word_break_characters= �Ȥΰ㤤�ϡ�
-  GNU Readline �� rl_complete_internal �ؿ��ǻ��Ѥ���뤳�ȤǤ���
+  ユーザの入力の補完を行う際、単語の区切りを示す複数の文字で構成される
+  文字列 string を指定します。
+  Readline.basic_word_break_characters= との違いは、
+  GNU Readline の rl_complete_internal 関数で使用されることです。
 
-  GNU Readline �Υǥե���Ȥ��ͤϡ�
-  Readline.basic_word_break_characters ��Ʊ���Ǥ���
+  GNU Readline のデフォルトの値は、
+  Readline.basic_word_break_characters と同じです。
 
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
-
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.completer_word_break_characters -> string
 
-  �桼�������Ϥ��䴰��Ԥ��ݡ�ñ��ζ��ڤ�򼨤�ʣ����ʸ���ǹ������줿
-  ʸ�����������ޤ���
-
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+  ユーザの入力の補完を行う際、単語の区切りを示す複数の文字で構成された
+  文字列を取得します。
 
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.basic_quote_characters = string
 
-  ���ڡ����ʤɤ�ñ��ζ��ڤ�򥯥����Ȥ��뤿���ʣ����ʸ���ǹ��������
-  ʸ���� string ����ꤷ�ޤ���
-
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+  スペースなどの単語の区切りをクオートするための複数の文字で構成される
+  文字列 string を指定します。
 
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.basic_quote_characters -> string
 
-  ���ڡ����ʤɤ�ñ��ζ��ڤ�򥯥����Ȥ��뤿���ʣ����ʸ���ǹ��������
-  ʸ�����������ޤ���
+  スペースなどの単語の区切りをクオートするための複数の文字で構成される
+  文字列を取得します。
 
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
-
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.completer_quote_characters = string
 
-  �桼�������Ϥ��䴰��Ԥ��ݡ����ڡ����ʤɤ�ñ��ζ��ڤ��
-  �������Ȥ��뤿���ʣ����ʸ���ǹ��������ʸ���� string ����ꤷ�ޤ���
-  ���ꤷ��ʸ���δ֤Ǥϡ�Readline.completer_word_break_characters=
-  �ǻ��ꤷ��ʸ����˴ޤޤ��ʸ���⡢���̤�ʸ����Ȥ��ư����ޤ���
-
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+  ユーザの入力の補完を行う際、スペースなどの単語の区切りを
+  クオートするための複数の文字で構成される文字列 string を指定します。
+  指定した文字の間では、Readline.completer_word_break_characters=
+  で指定した文字列に含まれる文字も、普通の文字列として扱われます。
 
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.completer_quote_characters -> string
 
-  �桼�������Ϥ��䴰��Ԥ��ݡ����ڡ����ʤɤ�ñ��ζ��ڤ��
-  �������Ȥ��뤿���ʣ����ʸ���ǹ��������ʸ�����������ޤ���
-
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+  ユーザの入力の補完を行う際、スペースなどの単語の区切りを
+  クオートするための複数の文字で構成される文字列を取得します。
 
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.filename_quote_characters = string
 
-  �桼�������ϻ��˥ե�����̾���䴰��Ԥ��ݡ����ڡ����ʤɤ�ñ��ζ��ڤ��
-  �������Ȥ��뤿���ʣ����ʸ���ǹ��������ʸ���� string ����ꤷ�ޤ���
+  ユーザの入力時にファイル名の補完を行う際、スペースなどの単語の区切りを
+  クオートするための複数の文字で構成される文字列 string を指定します。
 
-  GNU Readline �Υǥե�����ͤ� nil �Ǥ���
+  GNU Readline のデフォルト値は nil です。
 
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
-
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
 Readline.filename_quote_characters -> string
 
-  �桼�������ϻ��˥ե�����̾���䴰��Ԥ��ݡ����ڡ����ʤɤ�ñ��ζ��ڤ��
-  �������Ȥ��뤿���ʣ����ʸ���ǹ��������ʸ�����������ޤ���
-
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ��㳰 NotImplementedError ��ȯ�����ޤ���
+  ユーザの入力時にファイル名の補完を行う際、スペースなどの単語の区切りを
+  クオートするための複数の文字で構成される文字列を取得します。
 
-  $SAFE �� 4 �ξ�硢�㳰 SecurityError ��ȯ�����ޤ���
+  サポートしていない環境では、例外 NotImplementedError が発生します。
 
-=== ���饹���
+=== クラス定数
 
 HISTORY
 
-  ��� HISTORY ����Ѥ��ƥҥ��ȥ�˥��������Ǥ��ޤ���
-  Enumerable �⥸�塼��� extend ���Ƥ��ꡢ
-  ����Τ褦�˿����񤦤��Ȥ��Ǥ��ޤ���
-  �㤨�С�HISTORY[4] �ˤ�� 5 ���ܤ����Ϥ������Ƥ���Ф����Ȥ��Ǥ��ޤ���
+  定数 HISTORY を使用してヒストリにアクセスできます。
+  Enumerable モジュールを extend しており、
+  配列のように振る舞うことができます。
+  例えば、HISTORY[4] により 5 番目に入力した内容を取り出すことができます。
 
     require "readline"
 
     Readline::HISTORY.push("a", "b", "c", "d", "e")
     p Readline::HISTORY[4] # => "e"
 
-  �������Ƥ���᥽�åɤ򼡤˵󤲤ޤ���
+  実装しているメソッドを次に挙げます。
   * HISTORY.to_s -> "HISTORY"
   * HISTORY[index] -> string
   * HISTORY[index] = string
@@ -407,31 +359,28 @@ HISTORY
   * HISTORY.delete_at(index) -> string
   * HISTORY.clear -> self
 
-  ���ݡ��Ȥ��Ƥ��ʤ��Ķ��Ǥϡ����Υ᥽�åɤ��㳰 NotImplementedError ��
-  ȯ�����ޤ���
+  サポートしていない環境では、次のメソッドで例外 NotImplementedError が
+  発生します。
   * HISTORY[index] = string
   * HISTORY.pop -> string
   * HISTORY.shift -> string
   * HISTORY.delete_at(index) -> string
   * HISTORY.clear -> self
 
-  $SAFE �� 4 �ξ�硢�ҥ��ȥ�˥������������Ȥ����㳰 SecurityError ��
-  ȯ�����ޤ���
-
 FILENAME_COMPLETION_PROC
 
-  �ե�����̾���䴰��Ԥ� call �᥽�åɤ���ĥ��֥������ȤǤ���
+  ファイル名の補完を行う call メソッドを持つオブジェクトです。
 
-  Readline.completion_proc= �ˤ�ꡢ�桼�������ϻ��˥ե�����̾���䴰��
-  �Ԥ��褦�����ꤹ�뤿��˻��Ѥ��뤳�Ȥ����ꤷ�Ƥޤ���
+  Readline.completion_proc= により、ユーザの入力時にファイル名の補完を
+  行うように設定するために使用することを想定してます。
 
 USERNAME_COMPLETION_PROC
 
-  �桼��̾���䴰��Ԥ� call �᥽�åɤ���ĥ��֥������ȤǤ���
+  ユーザ名の補完を行う call メソッドを持つオブジェクトです。
 
-  Readline.completion_proc= �ˤ�ꡢ�桼�������ϻ��˥桼��̾���䴰���
-  ���褦�����ꤹ�뤿��˻��Ѥ��뤳�Ȥ����ꤷ�Ƥޤ���
+  Readline.completion_proc= により、ユーザの入力時にユーザ名の補完を行
+  うように設定するために使用することを想定してます。
 
 VERSION
 
-  ���Ѥ��Ƥ��� GNU Readline �ޤ��� libedit �ΥС������Ǥ���
+  使用している GNU Readline または libedit のバージョンです。
diff --git a/ext/readline/depend b/ext/readline/depend
index 6570c5a036..2dde7fca58 100644
--- a/ext/readline/depend
+++ b/ext/readline/depend
@@ -1 +1,18 @@
-readline.o: readline.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+# AUTOGENERATED DEPENDENCIES START
+readline.o: $(RUBY_EXTCONF_H)
+readline.o: $(arch_hdrdir)/ruby/config.h
+readline.o: $(hdrdir)/ruby/assert.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/onigmo.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: readline.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index b8e9e0fab4..fcc62921ae 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -1,26 +1,27 @@
+# frozen_string_literal: false
 require "mkmf"
 
-$readline_headers = ["stdio.h"]
+readline = Struct.new(:headers, :extra_check).new(["stdio.h"])
 
-def have_readline_header(header)
-  if have_header(header, &$readline_extra_check)
-    $readline_headers.push(header)
+def readline.have_header(header)
+  if super(header, &extra_check)
+    headers.push(header)
     return true
   else
     return false
   end
 end
 
-def have_readline_var(var)
-  return have_var(var, $readline_headers)
+def readline.have_var(var)
+  return super(var, headers)
 end
 
-def have_readline_func(func)
-  return have_func(func, $readline_headers)
+def readline.have_func(func)
+  return super(func, headers)
 end
 
-def have_readline_macro(macro)
-  return have_macro(macro, $readline_headers)
+def readline.have_type(type)
+  return super(type, headers)
 end
 
 dir_config('curses')
@@ -37,62 +38,76 @@ have_library("ncurses", "tgetnum") ||
 case enable_libedit
 when true
   # --enable-libedit
-  unless (have_readline_header("editline/readline.h") ||
-          have_readline_header("readline/readline.h")) &&
+  dir_config("libedit")
+  unless (readline.have_header("editline/readline.h") ||
+          readline.have_header("readline/readline.h")) &&
           have_library("edit", "readline")
-    exit
+    raise "libedit not found"
   end
 when false
   # --disable-libedit
-  unless ((have_readline_header("readline/readline.h") &&
-           have_readline_header("readline/history.h")) &&
+  unless ((readline.have_header("readline/readline.h") &&
+           readline.have_header("readline/history.h")) &&
            have_library("readline", "readline"))
-    exit
+    raise "readline not found"
   end
 else
   # does not specify
-  unless ((have_readline_header("readline/readline.h") &&
-           have_readline_header("readline/history.h")) &&
+  unless ((readline.have_header("readline/readline.h") &&
+           readline.have_header("readline/history.h")) &&
            (have_library("readline", "readline") ||
             have_library("edit", "readline"))) ||
-            (have_readline_header("editline/readline.h") &&
+            (readline.have_header("editline/readline.h") &&
              have_library("edit", "readline"))
-    exit
+    raise "Neither readline nor libedit was found"
   end
 end
 
-have_readline_func("rl_getc")
-have_readline_func("rl_getc_function")
-have_readline_func("rl_filename_completion_function")
-have_readline_func("rl_username_completion_function")
-have_readline_func("rl_completion_matches")
-have_readline_func("rl_refresh_line")
-have_readline_var("rl_deprep_term_function")
-have_readline_var("rl_completion_append_character")
-have_readline_var("rl_basic_word_break_characters")
-have_readline_var("rl_completer_word_break_characters")
-have_readline_var("rl_basic_quote_characters")
-have_readline_var("rl_completer_quote_characters")
-have_readline_var("rl_filename_quote_characters")
-have_readline_var("rl_attempted_completion_over")
-have_readline_var("rl_library_version")
-have_readline_var("rl_editing_mode")
-have_readline_var("rl_line_buffer")
-have_readline_var("rl_point")
+readline.have_func("rl_getc")
+readline.have_func("rl_getc_function")
+readline.have_func("rl_filename_completion_function")
+readline.have_func("rl_username_completion_function")
+readline.have_func("rl_completion_matches")
+readline.have_func("rl_refresh_line")
+readline.have_var("rl_deprep_term_function")
+readline.have_var("rl_completion_append_character")
+readline.have_var("rl_completion_quote_character")
+readline.have_var("rl_basic_word_break_characters")
+readline.have_var("rl_completer_word_break_characters")
+readline.have_var("rl_basic_quote_characters")
+readline.have_var("rl_completer_quote_characters")
+readline.have_var("rl_filename_quote_characters")
+readline.have_var("rl_attempted_completion_over")
+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 && have_readline_var("rl_event_hook")
-/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_sigwinch")
-/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_signals")
-have_readline_func("rl_cleanup_after_signal")
-have_readline_func("rl_free_line_state")
-have_readline_func("rl_clear_signals")
-have_readline_func("rl_set_screen_size")
-have_readline_func("rl_get_screen_size")
-have_readline_func("rl_vi_editing_mode")
-have_readline_func("rl_emacs_editing_mode")
-have_readline_func("replace_history_entry")
-have_readline_func("remove_history")
-have_readline_func("clear_history")
-have_readline_macro("RL_PROMPT_START_IGNORE")
-have_readline_macro("RL_PROMPT_END_IGNORE")
+/mswin|bccwin/ !~ RUBY_PLATFORM && readline.have_var("rl_event_hook")
+/mswin|bccwin/ !~ RUBY_PLATFORM && readline.have_var("rl_catch_sigwinch")
+/mswin|bccwin/ !~ RUBY_PLATFORM && readline.have_var("rl_catch_signals")
+readline.have_var("rl_pre_input_hook")
+readline.have_var("rl_special_prefixes")
+readline.have_func("rl_cleanup_after_signal")
+readline.have_func("rl_free_line_state")
+readline.have_func("rl_clear_signals")
+readline.have_func("rl_set_screen_size")
+readline.have_func("rl_get_screen_size")
+readline.have_func("rl_vi_editing_mode")
+readline.have_func("rl_emacs_editing_mode")
+readline.have_func("replace_history_entry")
+readline.have_func("remove_history")
+readline.have_func("clear_history")
+readline.have_func("rl_redisplay")
+readline.have_func("rl_insert_text")
+readline.have_func("rl_delete_text")
+unless readline.have_type("rl_hook_func_t*")
+  # rl_hook_func_t is available since readline-4.2 (2001).
+  # Function is removed at readline-6.3 (2014).
+  # However, editline (NetBSD 6.1.3, 2014) doesn't have rl_hook_func_t.
+  $defs << "-Drl_hook_func_t=Function"
+end
+
+$INCFLAGS << " -I$(top_srcdir)"
 create_makefile("readline")
diff --git a/ext/readline/readline-ext.gemspec b/ext/readline/readline-ext.gemspec
new file mode 100644
index 0000000000..a611a8ea9a
--- /dev/null
+++ b/ext/readline/readline-ext.gemspec
@@ -0,0 +1,21 @@
+Gem::Specification.new do |spec|
+  spec.name          = "readline-ext"
+  spec.version       = "0.1.0"
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{Provides an interface for GNU Readline and Edit Line (libedit).}
+  spec.description   = %q{Provides an interface for GNU Readline and Edit Line (libedit).}
+  spec.homepage      = "https://github.com/ruby/readline-ext"
+  spec.license       = "BSD-2-Clause"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index c035b67c54..646be2b194 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -6,12 +6,12 @@
   created at: Wed Jan 20 13:59:32 JST 1999
 
   Copyright (C) 1997-2008  Shugo Maeda
-  Copyright (C) 2008-2009  TAKAO Kouji
+  Copyright (C) 2008-2013  Kouji Takao
 
   $Id$
 
   Contact:
-   - TAKAO Kouji <kouji at takao7 dot net> (current maintainer)
+   - Kouji Takao <kouji dot takao at gmail dot com> (current maintainer)
 
 ************************************************/
 
@@ -33,18 +33,22 @@
 #include <editline/readline.h>
 #endif
 
-#include "ruby/ruby.h"
 #include "ruby/io.h"
+#include "ruby/thread.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
 static VALUE mReadline;
 
 #define EDIT_LINE_LIBRARY_VERSION "EditLine wrapper"
 #ifndef USE_INSERT_IGNORE_ESCAPE
-# if !defined(HAVE_EDITLINE_READLINE_H) && defined(HAVE_RL_PROMPT_START_IGNORE) && defined(HAVE_RL_PROMPT_END_IGNORE)
+# if !defined(HAVE_EDITLINE_READLINE_H) && defined(RL_PROMPT_START_IGNORE) && defined(RL_PROMPT_END_IGNORE)
 #  define USE_INSERT_IGNORE_ESCAPE 1
 # else
 #  define USE_INSERT_IGNORE_ESCAPE 0
@@ -53,28 +57,44 @@ static VALUE mReadline;
 
 #define COMPLETION_PROC "completion_proc"
 #define COMPLETION_CASE_FOLD "completion_case_fold"
-static ID completion_proc, 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
 #if USE_INSERT_IGNORE_ESCAPE
 static ID id_orig_prompt, id_last_prompt;
 #endif
+#if defined(HAVE_RL_PRE_INPUT_HOOK)
+static ID id_pre_input_hook;
+#endif
+#if defined(HAVE_RL_SPECIAL_PREFIXES)
+static ID id_special_prefixes;
+#endif
 
 #ifndef HAVE_RL_FILENAME_COMPLETION_FUNCTION
 # define rl_filename_completion_function filename_completion_function
 #endif
 #ifndef HAVE_RL_USERNAME_COMPLETION_FUNCTION
 # define rl_username_completion_function username_completion_function
+#else
+char *rl_username_completion_function(const char *, int);
 #endif
 #ifndef HAVE_RL_COMPLETION_MATCHES
 # define rl_completion_matches completion_matches
 #endif
 
 static int (*history_get_offset_func)(int);
+static int (*history_replace_offset_func)(int);
+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+static int readline_completion_append_character;
+#endif
 
 static char **readline_attempted_completion_function(const char *text,
                                                      int start, int end);
 
 #define OutputStringValue(str) do {\
-    SafeStringValue(str);\
+    StringValueCStr(str);\
     (str) = rb_str_conv_enc((str), rb_enc_get(str), rb_locale_encoding());\
 } while (0)\
 
@@ -109,60 +129,124 @@ static char **readline_attempted_completion_function(const char *text,
  *     print("-> ", buf, "\n")
  *   end
  *
- * Most of methods raise SecurityError exception if $SAFE is 4.
- *
- * Documented by TAKAO Kouji <kouji at takao7 dot net>.
+ * Documented by Kouji Takao <kouji dot takao at gmail dot com>.
  */
 
-#if defined HAVE_RL_GETC_FUNCTION
 static VALUE readline_instream;
-static ID id_getbyte;
+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
 #define rl_getc(f) EOF
 #endif
 
-static int readline_getc(FILE *);
+struct getc_struct {
+  FILE *input;
+  int fd;
+  int ret;
+  int err;
+};
+
 static int
-readline_getc(FILE *input)
+getc_body(struct getc_struct *p)
 {
-    rb_io_t *ifp = 0;
-    VALUE c;
-    if (!readline_instream) return rl_getc(input);
-    GetOpenFile(readline_instream, ifp);
-    if (rl_instream != ifp->stdio_file) return rl_getc(input);
+    char ch;
+    ssize_t ss;
+
 #if defined(_WIN32)
     {
         INPUT_RECORD ir;
-        int n;
+        DWORD n;
         static int prior_key = '0';
         for (;;) {
+            HANDLE h;
             if (prior_key > 0xff) {
-                prior_key = rl_getc(ifp->stdio_file);
+                prior_key = rl_getc(p->input);
                 return prior_key;
             }
-            if (PeekConsoleInput((HANDLE)_get_osfhandle(ifp->fd), &ir, 1, &n)) {
+            h = (HANDLE)_get_osfhandle(p->fd);
+            if (PeekConsoleInput(h, &ir, 1, &n)) {
                 if (n == 1) {
                     if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown) {
-                        prior_key = rl_getc(ifp->stdio_file);
+                        prior_key = rl_getc(p->input);
                         return prior_key;
                     } else {
-                        ReadConsoleInput((HANDLE)_get_osfhandle(ifp->fd), &ir, 1, &n);
+                        ReadConsoleInput(h, &ir, 1, &n);
                     }
                 } else {
-                    HANDLE h = (HANDLE)_get_osfhandle(ifp->fd);
-                    rb_w32_wait_events(&h, 1, INFINITE);
+                    rb_w32_wait_events_blocking(&h, 1, INFINITE);
                 }
             } else {
                 break;
             }
         }
     }
-#endif    
-    c = rb_funcall(readline_instream, id_getbyte, 0, 0);
-    if (NIL_P(c)) return EOF;
-    return NUM2CHR(c);
+#endif
+
+    ss = read(p->fd, &ch, 1);
+    if (ss == 0) {
+        errno = 0;
+        return EOF;
+    }
+    if (ss != 1)
+        return EOF;
+    return (unsigned char)ch;
+}
+
+static void *
+getc_func(void *data1)
+{
+    struct getc_struct *p = data1;
+    errno = 0;
+    p->ret = getc_body(p);
+    p->err = errno;
+    return NULL;
+}
+
+static int
+readline_getc(FILE *input)
+{
+    struct getc_struct data;
+    if (input == NULL) /* editline may give NULL as input. */
+        input = stdin;
+    data.input = input;
+    data.fd = fileno(input);
+  again:
+    data.ret = EOF;
+    data.err = EINTR; /* getc_func is not called if already interrupted. */
+    rb_thread_call_without_gvl2(getc_func, &data, RUBY_UBF_IO, NULL);
+    if (data.ret == EOF) {
+        if (data.err == 0) {
+            return EOF;
+        }
+        if (data.err == EINTR) {
+            rb_thread_check_ints();
+            goto again;
+        }
+        if (data.err == EWOULDBLOCK || data.err == EAGAIN) {
+            int ret;
+            if (fileno(input) != data.fd)
+                rb_bug("readline_getc: input closed unexpectedly or memory corrupted");
+            ret = rb_wait_for_single_fd(data.fd, RB_WAITFD_IN, NULL);
+            if (ret != -1 || errno == EINTR)
+                goto again;
+            rb_sys_fail("rb_wait_for_single_fd");
+        }
+        rb_syserr_fail(data.err, "read");
+    }
+    return data.ret;
 }
+
 #elif defined HAVE_RL_EVENT_HOOK
 #define BUSY_WAIT 0
 
@@ -194,56 +278,56 @@ insert_ignore_escape(VALUE self, VALUE prompt)
     if (orig_prompt == prompt) return last_prompt;
     len = RSTRING_LEN(prompt);
     if (NIL_P(last_prompt)) {
-	last_prompt = rb_str_tmp_new(len);
+        last_prompt = rb_str_tmp_new(len);
     }
 
     s = s0 = RSTRING_PTR(prompt);
     e = s0 + len;
     rb_str_set_len(last_prompt, 0);
     while (s < e && *s) {
-	switch (*s) {
-	  case RL_PROMPT_START_IGNORE:
-	    ignoring = -1;
-	    rb_str_cat(last_prompt, s0, ++s - s0);
-	    s0 = s;
-	    break;
-	  case RL_PROMPT_END_IGNORE:
-	    ignoring = 0;
-	    rb_str_cat(last_prompt, s0, ++s - s0);
-	    s0 = s;
-	    break;
-	  case '\033':
-	    if (++s < e && *s == '[') {
-		rb_str_cat(last_prompt, s0, s - s0 - 1);
-		s0 = s - 1;
-		while (++s < e && *s) {
-		    if (ISALPHA(*s)) {
-			if (!ignoring) {
-			    ignoring = 1;
-			    rb_str_cat(last_prompt, ignore_code+0, 1);
-			}
-			rb_str_cat(last_prompt, s0, ++s - s0);
-			s0 = s;
-			break;
-		    }
-		    else if (!('0' <= *s && *s <= '9' || *s == ';')) {
-			break;
-		    }
-		}
-	    }
-	    break;
-	  default:
-	    if (ignoring > 0) {
-		ignoring = 0;
-		rb_str_cat(last_prompt, ignore_code+1, 1);
-	    }
-	    s++;
-	    break;
-	}
+        switch (*s) {
+          case RL_PROMPT_START_IGNORE:
+            ignoring = -1;
+            rb_str_cat(last_prompt, s0, ++s - s0);
+            s0 = s;
+            break;
+          case RL_PROMPT_END_IGNORE:
+            ignoring = 0;
+            rb_str_cat(last_prompt, s0, ++s - s0);
+            s0 = s;
+            break;
+          case '\033':
+            if (++s < e && *s == '[') {
+                rb_str_cat(last_prompt, s0, s - s0 - 1);
+                s0 = s - 1;
+                while (++s < e && *s) {
+                    if (ISALPHA(*(unsigned char *)s)) {
+                        if (!ignoring) {
+                            ignoring = 1;
+                            rb_str_cat(last_prompt, ignore_code+0, 1);
+                        }
+                        rb_str_cat(last_prompt, s0, ++s - s0);
+                        s0 = s;
+                        break;
+                    }
+                    else if (!(('0' <= *s && *s <= '9') || *s == ';')) {
+                        break;
+                    }
+                }
+            }
+            break;
+          default:
+            if (ignoring > 0) {
+                ignoring = 0;
+                rb_str_cat(last_prompt, ignore_code+1, 1);
+            }
+            s++;
+            break;
+        }
     }
     if (ignoring > 0) {
-	ignoring = 0;
-	rb_str_cat(last_prompt, ignore_code+1, 1);
+        ignoring = 0;
+        rb_str_cat(last_prompt, ignore_code+1, 1);
     }
     rb_str_cat(last_prompt, s0, s - s0);
 
@@ -257,9 +341,64 @@ insert_ignore_escape(VALUE self, VALUE prompt)
 static VALUE
 readline_get(VALUE prompt)
 {
+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+    readline_completion_append_character = rl_completion_append_character;
+#endif
     return (VALUE)readline((char *)prompt);
 }
 
+static void
+clear_rl_instream(void)
+{
+    if (readline_rl_instream) {
+        fclose(readline_rl_instream);
+        if (rl_instream == readline_rl_instream)
+            rl_instream = NULL;
+        readline_rl_instream = NULL;
+    }
+    readline_instream = Qfalse;
+}
+
+static void
+clear_rl_outstream(void)
+{
+    if (readline_rl_outstream) {
+        fclose(readline_rl_outstream);
+        if (rl_outstream == readline_rl_outstream)
+            rl_outstream = NULL;
+        readline_rl_outstream = NULL;
+    }
+    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
@@ -270,11 +409,11 @@ readline_get(VALUE prompt)
  * Returns nil when the inputted line is empty and user inputs EOF
  * (Presses ^D on UNIX).
  *
- * Raises IOError exception if below conditions are satisfied.
- * 1. stdin is not tty.
- * 2. stdin was closed. (errno is EBADF after called isatty(2).)
+ * Raises IOError exception if one of below conditions are satisfied.
+ * 1. stdin was closed.
+ * 2. stdout was closed.
  *
- * This method supports thread. Switchs the thread context when waits
+ * This method supports thread. Switches the thread context when waits
  * inputting line.
  *
  * Supports line edit when inputs line. Provides VI and Emacs editing mode.
@@ -343,8 +482,6 @@ readline_get(VALUE prompt)
  *     # p Readline::HISTORY.to_a
  *     print "-> ", buf, "\n"
  *   end
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_readline(int argc, VALUE *argv, VALUE self)
@@ -354,17 +491,16 @@ readline_readline(int argc, VALUE *argv, VALUE self)
     char *buff;
     int status;
 
-    rb_secure(4);
     if (rb_scan_args(argc, argv, "02", &tmp, &add_hist) > 0) {
-	OutputStringValue(tmp);
+        OutputStringValue(tmp);
 #if USE_INSERT_IGNORE_ESCAPE
-	tmp = insert_ignore_escape(self, tmp);
-	rb_str_locktmp(tmp);
+        tmp = insert_ignore_escape(self, tmp);
+        rb_str_locktmp(tmp);
 #endif
-	prompt = RSTRING_PTR(tmp);
+        prompt = RSTRING_PTR(tmp);
     }
 
-    if (!isatty(fileno(rl_instream)) && errno == EBADF) rb_raise(rb_eIOError, "closed stdin");
+    prepare_readline();
 
 #ifdef _WIN32
     rl_prep_terminal(1);
@@ -372,7 +508,7 @@ readline_readline(int argc, VALUE *argv, VALUE self)
     buff = (char*)rb_protect(readline_get, (VALUE)prompt, &status);
 #if USE_INSERT_IGNORE_ESCAPE
     if (prompt) {
-	rb_str_unlocktmp(tmp);
+        rb_str_unlocktmp(tmp);
     }
 #endif
     if (status) {
@@ -384,9 +520,9 @@ readline_readline(int argc, VALUE *argv, VALUE self)
         rl_cleanup_after_signal();
 #elif defined HAVE_RL_DEPREP_TERM_FUNCTION
         /* restore terminal mode */
-	if (rl_deprep_term_function != NULL) /* NULL in libedit. [ruby-dev:29116] */
-	    (*rl_deprep_term_function)();
-	else
+        if (rl_deprep_term_function != NULL) /* NULL in libedit. [ruby-dev:29116] */
+            (*rl_deprep_term_function)();
+        else
 #else
         rl_deprep_terminal();
 #endif
@@ -394,13 +530,13 @@ readline_readline(int argc, VALUE *argv, VALUE self)
     }
 
     if (RTEST(add_hist) && buff) {
-	add_history(buff);
+        add_history(buff);
     }
     if (buff) {
-	result = rb_locale_str_new_cstr(buff);
+        result = rb_locale_str_new_cstr(buff);
     }
     else
-	result = Qnil;
+        result = Qnil;
     if (buff) free(buff);
     return result;
 }
@@ -411,21 +547,33 @@ readline_readline(int argc, VALUE *argv, VALUE self)
  *
  * Specifies a File object +input+ that is input stream for
  * Readline.readline method.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_set_input(VALUE self, VALUE input)
 {
     rb_io_t *ifp;
+    int fd;
+    FILE *f;
 
-    rb_secure(4);
-    Check_Type(input, T_FILE);
-    GetOpenFile(input, ifp);
-    rl_instream = rb_io_stdio_file(ifp);
-#ifdef HAVE_RL_GETC_FUNCTION
-    readline_instream = input;
-#endif
+    if (NIL_P(input)) {
+        clear_rl_instream();
+    }
+    else {
+        Check_Type(input, T_FILE);
+        GetOpenFile(input, ifp);
+        clear_rl_instream();
+        fd = rb_cloexec_dup(ifp->fd);
+        if (fd == -1)
+            rb_sys_fail("dup");
+        f = fdopen(fd, "r");
+        if (f == NULL) {
+            int save_errno = errno;
+            close(fd);
+            rb_syserr_fail(save_errno, "fdopen");
+        }
+        rl_instream = readline_rl_instream = f;
+        readline_instream = input;
+    }
     return input;
 }
 
@@ -435,21 +583,189 @@ readline_s_set_input(VALUE self, VALUE input)
  *
  * Specifies a File object +output+ that is output stream for
  * Readline.readline method.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_set_output(VALUE self, VALUE output)
 {
     rb_io_t *ofp;
+    int fd;
+    FILE *f;
 
-    rb_secure(4);
-    Check_Type(output, T_FILE);
-    GetOpenFile(output, ofp);
-    rl_outstream = rb_io_stdio_file(ofp);
+    if (NIL_P(output)) {
+        clear_rl_outstream();
+    }
+    else {
+        Check_Type(output, T_FILE);
+        GetOpenFile(output, ofp);
+        clear_rl_outstream();
+        fd = rb_cloexec_dup(ofp->fd);
+        if (fd == -1)
+            rb_sys_fail("dup");
+        f = fdopen(fd, "w");
+        if (f == NULL) {
+            int save_errno = errno;
+            close(fd);
+            rb_syserr_fail(save_errno, "fdopen");
+        }
+        rl_outstream = readline_rl_outstream = f;
+        readline_outstream = output;
+    }
     return output;
 }
 
+#if defined(HAVE_RL_PRE_INPUT_HOOK)
+/*
+ * call-seq:
+ *   Readline.pre_input_hook = proc
+ *
+ * Specifies a Proc object +proc+ to call after the first prompt has
+ * been printed and just before readline starts reading input
+ * characters.
+ *
+ * See GNU Readline's rl_pre_input_hook variable.
+ *
+ * Raises ArgumentError if +proc+ does not respond to the call method.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ */
+static VALUE
+readline_s_set_pre_input_hook(VALUE self, VALUE proc)
+{
+    mustbe_callable(proc);
+    return rb_ivar_set(mReadline, id_pre_input_hook, proc);
+}
+
+/*
+ * call-seq:
+ *   Readline.pre_input_hook -> proc
+ *
+ * Returns a Proc object +proc+ to call after the first prompt has
+ * been printed and just before readline starts reading input
+ * characters. The default is nil.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ */
+static VALUE
+readline_s_get_pre_input_hook(VALUE self)
+{
+    return rb_attr_get(mReadline, id_pre_input_hook);
+}
+
+static int
+readline_pre_input_hook(void)
+{
+    VALUE proc;
+
+    proc = rb_attr_get(mReadline, id_pre_input_hook);
+    if (!NIL_P(proc))
+        rb_funcall(proc, id_call, 0);
+    return 0;
+}
+#else
+#define readline_s_set_pre_input_hook rb_f_notimplement
+#define readline_s_get_pre_input_hook rb_f_notimplement
+#endif
+
+#if defined(HAVE_RL_INSERT_TEXT)
+/*
+ * call-seq:
+ *   Readline.insert_text(string) -> self
+ *
+ * Insert text into the line at the current cursor position.
+ *
+ * See GNU Readline's rl_insert_text function.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ */
+static VALUE
+readline_s_insert_text(VALUE self, VALUE str)
+{
+    OutputStringValue(str);
+    rl_insert_text(RSTRING_PTR(str));
+    return self;
+}
+#else
+#define readline_s_insert_text rb_f_notimplement
+#endif
+
+#if defined(HAVE_RL_DELETE_TEXT)
+int rl_delete_text(int, int);
+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
+ *   Readline.delete_text(start..end)        -> self
+ *   Readline.delete_text()                  -> self
+ *
+ * Delete text between start and end in the current line.
+ *
+ * See GNU Readline's rl_delete_text function.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ */
+static VALUE
+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();
+        if (argc == 2) {
+            beg = NUM2LONG(argv[0]);
+            len = NUM2LONG(argv[1]);
+          num_pos:
+            p = str_subpos(ptr, end, beg, &len, enc);
+            if (!p) rb_raise(rb_eArgError, "invalid index");
+            beg = p - ptr;
+        }
+        else if (argc == 1) {
+            len = rb_enc_strlen(ptr, ptr + len, enc);
+            if (!rb_range_beg_len(argv[0], &beg, &len, len, 1)) {
+                beg = NUM2LONG(argv[0]);
+                goto num_pos;
+            }
+        }
+        rl_delete_text(rb_long2int(beg), rb_long2int(beg + len));
+    }
+    return self;
+}
+#else
+#define readline_s_delete_text rb_f_notimplement
+#endif
+
+#if defined(HAVE_RL_REDISPLAY)
+/*
+ * call-seq:
+ *   Readline.redisplay -> self
+ *
+ * Change what's displayed on the screen to reflect the current
+ * contents.
+ *
+ * See GNU Readline's rl_redisplay function.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ */
+static VALUE
+readline_s_redisplay(VALUE self)
+{
+    rl_redisplay();
+    return self;
+}
+#else
+#define readline_s_redisplay rb_f_notimplement
+#endif
+
 /*
  * call-seq:
  *   Readline.completion_proc = proc
@@ -506,7 +822,7 @@ readline_s_set_output(VALUE self, VALUE output)
  *
  * When working with auto-complete there are some strategies that work well.
  * To get some ideas you can take a look at the
- * completion.rb[http://svn.ruby-lang.org/repos/ruby/trunk/lib/irb/completion.rb]
+ * completion.rb[https://git.ruby-lang.org/ruby.git/tree/lib/irb/completion.rb]
  * file for irb.
  *
  * The common strategy is to take a list of possible completions and filter it
@@ -517,15 +833,11 @@ readline_s_set_output(VALUE self, VALUE output)
  * It may also be helpful to use the Abbrev library to generate completions.
  *
  * Raises ArgumentError if +proc+ does not respond to the call method.
- *
- * Raises SecurityError if $SAFE is 4.
  */
 static VALUE
 readline_s_set_completion_proc(VALUE self, VALUE proc)
 {
-    rb_secure(4);
-    if (!NIL_P(proc) && !rb_respond_to(proc, rb_intern("call")))
-	rb_raise(rb_eArgError, "argument must respond to `call'");
+    mustbe_callable(proc);
     return rb_ivar_set(mReadline, completion_proc, proc);
 }
 
@@ -534,28 +846,67 @@ readline_s_set_completion_proc(VALUE self, VALUE proc)
  *   Readline.completion_proc -> proc
  *
  * Returns the completion Proc object.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_get_completion_proc(VALUE self)
 {
-    rb_secure(4);
     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
  *
  * Sets whether or not to ignore case on completion.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_set_completion_case_fold(VALUE self, VALUE val)
 {
-    rb_secure(4);
     return rb_ivar_set(mReadline, completion_case_fold, val);
 }
 
@@ -572,13 +923,10 @@ readline_s_set_completion_case_fold(VALUE self, VALUE val)
  *
  *   Readline.completion_case_fold = "This is a String."
  *   p Readline.completion_case_fold # => "This is a String."
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_get_completion_case_fold(VALUE self)
 {
-    rb_secure(4);
     return rb_attr_get(mReadline, completion_case_fold);
 }
 
@@ -593,13 +941,14 @@ readline_s_get_completion_case_fold(VALUE self)
  *
  * The length of +Readline.line_buffer+ and GNU Readline's rl_end are
  * same.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
  */
 static VALUE
 readline_s_get_line_buffer(VALUE self)
 {
-    rb_secure(4);
     if (rl_line_buffer == NULL)
-	return Qnil;
+        return Qnil;
     return rb_locale_str_new_cstr(rl_line_buffer);
 }
 #else
@@ -619,15 +968,35 @@ readline_s_get_line_buffer(VALUE self)
  * the length of input-string from +Readline.point+.
  *
  *   start = (the length of input-string) - Readline.point
+ *
+ * Raises NotImplementedError if the using readline library does not support.
  */
 static VALUE
 readline_s_get_point(VALUE self)
 {
-    rb_secure(4);
     return INT2NUM(rl_point);
 }
+
+/*
+ * call-seq:
+ *   Readline.point = int
+ *
+ * Set the index of the current cursor position in
+ * +Readline.line_buffer+.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ *
+ * See +Readline.point+.
+ */
+static VALUE
+readline_s_set_point(VALUE self, VALUE pos)
+{
+    rl_point = NUM2INT(pos);
+    return pos;
+}
 #else
 #define readline_s_get_point rb_f_notimplement
+#define readline_s_set_point rb_f_notimplement
 #endif
 
 static char **
@@ -637,25 +1006,35 @@ readline_attempted_completion_function(const char *text, int start, int end)
     char **result;
     int case_fold;
     long i, matches;
+    rb_encoding *enc;
+    VALUE encobj;
 
     proc = rb_attr_get(mReadline, completion_proc);
     if (NIL_P(proc))
-	return NULL;
+        return NULL;
+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+    rl_completion_append_character = readline_completion_append_character;
+#endif
 #ifdef HAVE_RL_ATTEMPTED_COMPLETION_OVER
     rl_attempted_completion_over = 1;
 #endif
     case_fold = RTEST(rb_attr_get(mReadline, completion_case_fold));
-    ary = rb_funcall(proc, rb_intern("call"), 1, rb_locale_str_new_cstr(text));
-    if (TYPE(ary) != T_ARRAY)
-	ary = rb_Array(ary);
+    ary = rb_funcall(proc, id_call, 1, rb_locale_str_new_cstr(text));
+    if (!RB_TYPE_P(ary, T_ARRAY))
+        ary = rb_Array(ary);
     matches = RARRAY_LEN(ary);
-    if (matches == 0)
-	return NULL;
-    result = ALLOC_N(char *, matches + 2);
+    if (matches == 0) return NULL;
+    result = (char**)malloc((matches + 2)*sizeof(char*));
+    if (result == NULL) rb_memerror();
+    enc = rb_locale_encoding();
+    encobj = rb_enc_from_encoding(enc);
     for (i = 0; i < matches; i++) {
-	temp = rb_obj_as_string(RARRAY_PTR(ary)[i]);
-	result[i + 1] = ALLOC_N(char, RSTRING_LEN(temp) + 1);
-	strcpy(result[i + 1], RSTRING_PTR(temp));
+        temp = rb_obj_as_string(RARRAY_AREF(ary, i));
+        StringValueCStr(temp);  /* must be NUL-terminated */
+        rb_enc_check(encobj, temp);
+        result[i + 1] = (char*)malloc(RSTRING_LEN(temp) + 1);
+        if (result[i + 1]  == NULL) rb_memerror();
+        strcpy(result[i + 1], RSTRING_PTR(temp));
     }
     result[matches + 1] = NULL;
 
@@ -663,37 +1042,63 @@ readline_attempted_completion_function(const char *text, int start, int end)
         result[0] = strdup(result[1]);
     }
     else {
-	register int i = 1;
-	int low = 100000;
-
-	while (i < matches) {
-	    register int c1, c2, si;
-
-	    if (case_fold) {
-		for (si = 0;
-		     (c1 = TOLOWER(result[i][si])) &&
-			 (c2 = TOLOWER(result[i + 1][si]));
-		     si++)
-		    if (c1 != c2) break;
-	    } else {
-		for (si = 0;
-		     (c1 = result[i][si]) &&
-			 (c2 = result[i + 1][si]);
-		     si++)
-		    if (c1 != c2) break;
-	    }
-
-	    if (low > si) low = si;
-	    i++;
-	}
-	result[0] = ALLOC_N(char, low + 1);
-	strncpy(result[0], result[1], low);
-	result[0][low] = '\0';
+        const char *result1 = result[1];
+        long low = strlen(result1);
+
+        for (i = 1; i < matches; ++i) {
+            register int c1, c2;
+            long i1, i2, l2;
+            int n1, n2;
+            const char *p2 = result[i + 1];
+
+            l2 = strlen(p2);
+            for (i1 = i2 = 0; i1 < low && i2 < l2; i1 += n1, i2 += n2) {
+                c1 = rb_enc_codepoint_len(result1 + i1, result1 + low, &n1, enc);
+                c2 = rb_enc_codepoint_len(p2 + i2, p2 + l2, &n2, enc);
+                if (case_fold) {
+                    c1 = rb_tolower(c1);
+                    c2 = rb_tolower(c2);
+                }
+                if (c1 != c2) break;
+            }
+
+            low = i1;
+        }
+        result[0] = (char*)malloc(low + 1);
+        if (result[0]  == NULL) rb_memerror();
+        strncpy(result[0], result[1], low);
+        result[0][low] = '\0';
     }
 
     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:
@@ -704,13 +1109,10 @@ readline_attempted_completion_function(const char *text, int start, int end)
  * See GNU Readline's rl_set_screen_size function.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_set_screen_size(VALUE self, VALUE rows, VALUE columns)
 {
-    rb_secure(4);
     rl_set_screen_size(NUM2INT(rows), NUM2INT(columns));
     return self;
 }
@@ -728,8 +1130,6 @@ readline_s_set_screen_size(VALUE self, VALUE rows, VALUE columns)
  * See GNU Readline's rl_get_screen_size function.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_get_screen_size(VALUE self)
@@ -737,7 +1137,6 @@ readline_s_get_screen_size(VALUE self)
     int rows, columns;
     VALUE res;
 
-    rb_secure(4);
     rl_get_screen_size(&rows, &columns);
     res = rb_ary_new();
     rb_ary_push(res, INT2NUM(rows));
@@ -749,6 +1148,7 @@ readline_s_get_screen_size(VALUE self)
 #endif
 
 #ifdef HAVE_RL_VI_EDITING_MODE
+int rl_vi_editing_mode(int, int);
 /*
  * call-seq:
  *   Readline.vi_editing_mode -> nil
@@ -757,13 +1157,10 @@ readline_s_get_screen_size(VALUE self)
  * details of VI editing mode.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_vi_editing_mode(VALUE self)
 {
-    rb_secure(4);
     rl_vi_editing_mode(1,0);
     return Qnil;
 }
@@ -779,13 +1176,10 @@ readline_s_vi_editing_mode(VALUE self)
  * Returns true if vi mode is active. Returns false if not.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_vi_editing_mode_p(VALUE self)
 {
-    rb_secure(4);
     return rl_editing_mode == 0 ? Qtrue : Qfalse;
 }
 #else
@@ -793,6 +1187,7 @@ readline_s_vi_editing_mode_p(VALUE self)
 #endif
 
 #ifdef HAVE_RL_EMACS_EDITING_MODE
+int rl_emacs_editing_mode(int, int);
 /*
  * call-seq:
  *   Readline.emacs_editing_mode -> nil
@@ -801,13 +1196,10 @@ readline_s_vi_editing_mode_p(VALUE self)
  * manual of GNU Readline for details of Emacs editing mode.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_emacs_editing_mode(VALUE self)
 {
-    rb_secure(4);
     rl_emacs_editing_mode(1,0);
     return Qnil;
 }
@@ -823,13 +1215,10 @@ readline_s_emacs_editing_mode(VALUE self)
  * Returns true if emacs mode is active. Returns false if not.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_emacs_editing_mode_p(VALUE self)
 {
-    rb_secure(4);
     return rl_editing_mode == 1 ? Qtrue : Qfalse;
 }
 #else
@@ -872,23 +1261,20 @@ readline_s_emacs_editing_mode_p(VALUE self)
  *   p Readline.completion_append_character # => "s"
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_set_completion_append_character(VALUE self, VALUE str)
 {
-    rb_secure(4);
     if (NIL_P(str)) {
-	rl_completion_append_character = '\0';
+        rl_completion_append_character = '\0';
     }
     else {
-	OutputStringValue(str);
-	if (RSTRING_LEN(str) == 0) {
-	    rl_completion_append_character = '\0';
-	} else {
-	    rl_completion_append_character = RSTRING_PTR(str)[0];
-	}
+        OutputStringValue(str);
+        if (RSTRING_LEN(str) == 0) {
+            rl_completion_append_character = '\0';
+        } else {
+            rl_completion_append_character = RSTRING_PTR(str)[0];
+        }
     }
     return self;
 }
@@ -905,17 +1291,14 @@ readline_s_set_completion_append_character(VALUE self, VALUE str)
  * completion. The default is a space (" ").
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_get_completion_append_character(VALUE self)
 {
     char buf[1];
 
-    rb_secure(4);
     if (rl_completion_append_character == '\0')
-	return Qnil;
+        return Qnil;
 
     buf[0] = (char) rl_completion_append_character;
     return rb_locale_str_new(buf, 1);
@@ -924,6 +1307,35 @@ readline_s_get_completion_append_character(VALUE self)
 #define readline_s_get_completion_append_character rb_f_notimplement
 #endif
 
+#ifdef HAVE_RL_COMPLETION_QUOTE_CHARACTER
+/*
+ * call-seq:
+ *   Readline.completion_quote_character -> char
+ *
+ * When called during a completion (e.g. from within your completion_proc),
+ * it will return a string containing the character used to quote the
+ * argument being completed, or nil if the argument is unquoted.
+ *
+ * When called at other times, it will always return nil.
+ *
+ * Note that Readline.completer_quote_characters must be set,
+ * or this method will always return nil.
+ */
+static VALUE
+readline_s_get_completion_quote_character(VALUE self)
+{
+    char buf[1];
+
+    if (rl_completion_quote_character == '\0')
+        return Qnil;
+
+    buf[0] = (char) rl_completion_quote_character;
+    return rb_locale_str_new(buf, 1);
+}
+#else
+#define readline_s_get_completion_quote_character rb_f_notimplement
+#endif
+
 #ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
 /*
  * call-seq:
@@ -931,28 +1343,25 @@ readline_s_get_completion_append_character(VALUE self)
  *
  * Sets the basic list of characters that signal a break between words
  * for the completer routine. The default is the characters which
- * break words for completion in Bash: "\t\n\"\\'`@$><=;|&{(".
+ * break words for completion in Bash: " \t\n\"\\'`@$><=;|&{(".
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_set_basic_word_break_characters(VALUE self, VALUE str)
 {
     static char *basic_word_break_characters = NULL;
 
-    rb_secure(4);
     OutputStringValue(str);
     if (basic_word_break_characters == NULL) {
-	basic_word_break_characters =
-	    ALLOC_N(char, RSTRING_LEN(str) + 1);
+        basic_word_break_characters =
+            ALLOC_N(char, RSTRING_LEN(str) + 1);
     }
     else {
-	REALLOC_N(basic_word_break_characters, char, RSTRING_LEN(str) + 1);
+        REALLOC_N(basic_word_break_characters, char, RSTRING_LEN(str) + 1);
     }
     strncpy(basic_word_break_characters,
-	    RSTRING_PTR(str), RSTRING_LEN(str));
+            RSTRING_PTR(str), RSTRING_LEN(str));
     basic_word_break_characters[RSTRING_LEN(str)] = '\0';
     rl_basic_word_break_characters = basic_word_break_characters;
     return self;
@@ -970,15 +1379,12 @@ readline_s_set_basic_word_break_characters(VALUE self, VALUE str)
  * for the completer routine.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
-readline_s_get_basic_word_break_characters(VALUE self, VALUE str)
+readline_s_get_basic_word_break_characters(VALUE self)
 {
-    rb_secure(4);
     if (rl_basic_word_break_characters == NULL)
-	return Qnil;
+        return Qnil;
     return rb_locale_str_new_cstr(rl_basic_word_break_characters);
 }
 #else
@@ -995,25 +1401,22 @@ readline_s_get_basic_word_break_characters(VALUE self, VALUE str)
  * Readline.basic_word_break_characters.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_set_completer_word_break_characters(VALUE self, VALUE str)
 {
     static char *completer_word_break_characters = NULL;
 
-    rb_secure(4);
     OutputStringValue(str);
     if (completer_word_break_characters == NULL) {
-	completer_word_break_characters =
-	    ALLOC_N(char, RSTRING_LEN(str) + 1);
+        completer_word_break_characters =
+            ALLOC_N(char, RSTRING_LEN(str) + 1);
     }
     else {
-	REALLOC_N(completer_word_break_characters, char, RSTRING_LEN(str) + 1);
+        REALLOC_N(completer_word_break_characters, char, RSTRING_LEN(str) + 1);
     }
     strncpy(completer_word_break_characters,
-	    RSTRING_PTR(str), RSTRING_LEN(str));
+            RSTRING_PTR(str), RSTRING_LEN(str));
     completer_word_break_characters[RSTRING_LEN(str)] = '\0';
     rl_completer_word_break_characters = completer_word_break_characters;
     return self;
@@ -1031,21 +1434,80 @@ readline_s_set_completer_word_break_characters(VALUE self, VALUE str)
  * for rl_complete_internal().
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
-readline_s_get_completer_word_break_characters(VALUE self, VALUE str)
+readline_s_get_completer_word_break_characters(VALUE self)
 {
-    rb_secure(4);
     if (rl_completer_word_break_characters == NULL)
-	return Qnil;
+        return Qnil;
     return rb_locale_str_new_cstr(rl_completer_word_break_characters);
 }
 #else
 #define readline_s_get_completer_word_break_characters rb_f_notimplement
 #endif
 
+#if defined(HAVE_RL_SPECIAL_PREFIXES)
+/*
+ * call-seq:
+ *   Readline.special_prefixes = string
+ *
+ * Sets the list of characters that are word break characters, but
+ * should be left in text when it is passed to the completion
+ * function. Programs can use this to help determine what kind of
+ * completing to do. For instance, Bash sets this variable to "$@" so
+ * that it can complete shell variables and hostnames.
+ *
+ * See GNU Readline's rl_special_prefixes variable.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ */
+static VALUE
+readline_s_set_special_prefixes(VALUE self, VALUE str)
+{
+    if (!NIL_P(str)) {
+        OutputStringValue(str);
+        str = rb_str_dup_frozen(str);
+        rb_obj_hide(str);
+    }
+    rb_ivar_set(mReadline, id_special_prefixes, str);
+    if (NIL_P(str)) {
+        rl_special_prefixes = NULL;
+    }
+    else {
+        rl_special_prefixes = RSTRING_PTR(str);
+    }
+    return self;
+}
+
+/*
+ * call-seq:
+ *   Readline.special_prefixes -> string
+ *
+ * Gets the list of characters that are word break characters, but
+ * should be left in text when it is passed to the completion
+ * function.
+ *
+ * See GNU Readline's rl_special_prefixes variable.
+ *
+ * Raises NotImplementedError if the using readline library does not support.
+ */
+static VALUE
+readline_s_get_special_prefixes(VALUE self)
+{
+    VALUE str;
+    if (rl_special_prefixes == NULL) return Qnil;
+    str = rb_ivar_get(mReadline, id_special_prefixes);
+    if (!NIL_P(str)) {
+        str = rb_str_dup_frozen(str);
+        rb_obj_reveal(str, rb_cString);
+    }
+    return str;
+}
+#else
+#define readline_s_set_special_prefixes rb_f_notimplement
+#define readline_s_get_special_prefixes rb_f_notimplement
+#endif
+
 #ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
 /*
  * call-seq:
@@ -1054,25 +1516,22 @@ readline_s_get_completer_word_break_characters(VALUE self, VALUE str)
  * Sets a list of quote characters which can cause a word break.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_set_basic_quote_characters(VALUE self, VALUE str)
 {
     static char *basic_quote_characters = NULL;
 
-    rb_secure(4);
     OutputStringValue(str);
     if (basic_quote_characters == NULL) {
-	basic_quote_characters =
-	    ALLOC_N(char, RSTRING_LEN(str) + 1);
+        basic_quote_characters =
+            ALLOC_N(char, RSTRING_LEN(str) + 1);
     }
     else {
-	REALLOC_N(basic_quote_characters, char, RSTRING_LEN(str) + 1);
+        REALLOC_N(basic_quote_characters, char, RSTRING_LEN(str) + 1);
     }
     strncpy(basic_quote_characters,
-	    RSTRING_PTR(str), RSTRING_LEN(str));
+            RSTRING_PTR(str), RSTRING_LEN(str));
     basic_quote_characters[RSTRING_LEN(str)] = '\0';
     rl_basic_quote_characters = basic_quote_characters;
 
@@ -1090,15 +1549,12 @@ readline_s_set_basic_quote_characters(VALUE self, VALUE str)
  * Gets a list of quote characters which can cause a word break.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
-readline_s_get_basic_quote_characters(VALUE self, VALUE str)
+readline_s_get_basic_quote_characters(VALUE self)
 {
-    rb_secure(4);
     if (rl_basic_quote_characters == NULL)
-	return Qnil;
+        return Qnil;
     return rb_locale_str_new_cstr(rl_basic_quote_characters);
 }
 #else
@@ -1116,22 +1572,19 @@ readline_s_get_basic_quote_characters(VALUE self, VALUE str)
  * as any other character, unless they also appear within this list.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_set_completer_quote_characters(VALUE self, VALUE str)
 {
     static char *completer_quote_characters = NULL;
 
-    rb_secure(4);
     OutputStringValue(str);
     if (completer_quote_characters == NULL) {
-	completer_quote_characters =
-	    ALLOC_N(char, RSTRING_LEN(str) + 1);
+        completer_quote_characters =
+            ALLOC_N(char, RSTRING_LEN(str) + 1);
     }
     else {
-	REALLOC_N(completer_quote_characters, char, RSTRING_LEN(str) + 1);
+        REALLOC_N(completer_quote_characters, char, RSTRING_LEN(str) + 1);
     }
     strncpy(completer_quote_characters, RSTRING_PTR(str), RSTRING_LEN(str));
     completer_quote_characters[RSTRING_LEN(str)] = '\0';
@@ -1152,15 +1605,12 @@ readline_s_set_completer_quote_characters(VALUE self, VALUE str)
  * the line.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
-readline_s_get_completer_quote_characters(VALUE self, VALUE str)
+readline_s_get_completer_quote_characters(VALUE self)
 {
-    rb_secure(4);
     if (rl_completer_quote_characters == NULL)
-	return Qnil;
+        return Qnil;
     return rb_locale_str_new_cstr(rl_completer_quote_characters);
 }
 #else
@@ -1176,22 +1626,19 @@ readline_s_get_completer_quote_characters(VALUE self, VALUE str)
  * when they appear in a completed filename. The default is nil.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_set_filename_quote_characters(VALUE self, VALUE str)
 {
     static char *filename_quote_characters = NULL;
 
-    rb_secure(4);
     OutputStringValue(str);
     if (filename_quote_characters == NULL) {
-	filename_quote_characters =
-	    ALLOC_N(char, RSTRING_LEN(str) + 1);
+        filename_quote_characters =
+            ALLOC_N(char, RSTRING_LEN(str) + 1);
     }
     else {
-	REALLOC_N(filename_quote_characters, char, RSTRING_LEN(str) + 1);
+        REALLOC_N(filename_quote_characters, char, RSTRING_LEN(str) + 1);
     }
     strncpy(filename_quote_characters, RSTRING_PTR(str), RSTRING_LEN(str));
     filename_quote_characters[RSTRING_LEN(str)] = '\0';
@@ -1212,15 +1659,12 @@ readline_s_set_filename_quote_characters(VALUE self, VALUE str)
  * when they appear in a completed filename.
  *
  * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
-readline_s_get_filename_quote_characters(VALUE self, VALUE str)
+readline_s_get_filename_quote_characters(VALUE self)
 {
-    rb_secure(4);
     if (rl_filename_quote_characters == NULL)
-	return Qnil;
+        return Qnil;
     return rb_locale_str_new_cstr(rl_filename_quote_characters);
 }
 #else
@@ -1228,18 +1672,17 @@ readline_s_get_filename_quote_characters(VALUE self, VALUE str)
 #endif
 
 #ifdef HAVE_RL_REFRESH_LINE
+int rl_refresh_line(int, int);
 /*
  * call-seq:
  *   Readline.refresh_line -> nil
  *
  * Clear the current input line.
- *
- * Raises SecurityError exception if $SAFE is 4.
  */
 static VALUE
 readline_s_refresh_line(VALUE self)
 {
-    rb_secure(4);
+    prepare_readline();
     rl_refresh_line(0, 0);
     return Qnil;
 }
@@ -1271,16 +1714,15 @@ hist_get(VALUE self, VALUE index)
     HIST_ENTRY *entry = NULL;
     int i;
 
-    rb_secure(4);
     i = NUM2INT(index);
     if (i < 0) {
         i += history_length;
     }
     if (i >= 0) {
-	entry = history_get(history_get_offset_func(i));
+        entry = history_get(history_get_offset_func(i));
     }
     if (entry == NULL) {
-	rb_raise(rb_eIndexError, "invalid index");
+        rb_raise(rb_eIndexError, "invalid index");
     }
     return rb_locale_str_new_cstr(entry->line);
 }
@@ -1292,17 +1734,16 @@ hist_set(VALUE self, VALUE index, VALUE str)
     HIST_ENTRY *entry = NULL;
     int i;
 
-    rb_secure(4);
     i = NUM2INT(index);
     OutputStringValue(str);
     if (i < 0) {
         i += history_length;
     }
     if (i >= 0) {
-	entry = replace_history_entry(i, RSTRING_PTR(str), NULL);
+        entry = replace_history_entry(history_replace_offset_func(i), RSTRING_PTR(str), NULL);
     }
     if (entry == NULL) {
-	rb_raise(rb_eIndexError, "invalid index");
+        rb_raise(rb_eIndexError, "invalid index");
     }
     return str;
 }
@@ -1313,7 +1754,6 @@ hist_set(VALUE self, VALUE index, VALUE str)
 static VALUE
 hist_push(VALUE self, VALUE str)
 {
-    rb_secure(4);
     OutputStringValue(str);
     add_history(RSTRING_PTR(str));
     return self;
@@ -1324,11 +1764,10 @@ hist_push_method(int argc, VALUE *argv, VALUE self)
 {
     VALUE str;
 
-    rb_secure(4);
     while (argc--) {
-	str = *argv++;
-	OutputStringValue(str);
-	add_history(RSTRING_PTR(str));
+        str = *argv++;
+        OutputStringValue(str);
+        add_history(RSTRING_PTR(str));
     }
     return self;
 }
@@ -1340,7 +1779,6 @@ rb_remove_history(int index)
     HIST_ENTRY *entry;
     VALUE val;
 
-    rb_secure(4);
     entry = remove_history(index);
     if (entry) {
         val = rb_locale_str_new_cstr(entry->line);
@@ -1351,29 +1789,28 @@ rb_remove_history(int index)
     return Qnil;
 #else
     rb_notimplement();
-    return Qnil; /* not reached */
+
+    UNREACHABLE_RETURN(Qnil);
 #endif
 }
 
 static VALUE
 hist_pop(VALUE self)
 {
-    rb_secure(4);
     if (history_length > 0) {
-	return rb_remove_history(history_length - 1);
+        return rb_remove_history(history_length - 1);
     } else {
-	return Qnil;
+        return Qnil;
     }
 }
 
 static VALUE
 hist_shift(VALUE self)
 {
-    rb_secure(4);
     if (history_length > 0) {
-	return rb_remove_history(0);
+        return rb_remove_history(0);
     } else {
-	return Qnil;
+        return Qnil;
     }
 }
 
@@ -1385,12 +1822,11 @@ hist_each(VALUE self)
 
     RETURN_ENUMERATOR(self, 0, 0);
 
-    rb_secure(4);
     for (i = 0; i < history_length; i++) {
         entry = history_get(history_get_offset_func(i));
         if (entry == NULL)
             break;
-	rb_yield(rb_locale_str_new_cstr(entry->line));
+        rb_yield(rb_locale_str_new_cstr(entry->line));
     }
     return self;
 }
@@ -1398,14 +1834,12 @@ hist_each(VALUE self)
 static VALUE
 hist_length(VALUE self)
 {
-    rb_secure(4);
     return INT2NUM(history_length);
 }
 
 static VALUE
 hist_empty_p(VALUE self)
 {
-    rb_secure(4);
     return history_length == 0 ? Qtrue : Qfalse;
 }
 
@@ -1414,12 +1848,11 @@ hist_delete_at(VALUE self, VALUE index)
 {
     int i;
 
-    rb_secure(4);
     i = NUM2INT(index);
     if (i < 0)
         i += history_length;
     if (i < 0 || i > history_length - 1) {
-	rb_raise(rb_eIndexError, "invalid index");
+        rb_raise(rb_eIndexError, "invalid index");
     }
     return rb_remove_history(i);
 }
@@ -1428,7 +1861,6 @@ hist_delete_at(VALUE self, VALUE index)
 static VALUE
 hist_clear(VALUE self)
 {
-    rb_secure(4);
     clear_history();
     return self;
 }
@@ -1444,19 +1876,19 @@ filename_completion_proc_call(VALUE self, VALUE str)
     int i;
 
     matches = rl_completion_matches(StringValuePtr(str),
-				    rl_filename_completion_function);
+                                    rl_filename_completion_function);
     if (matches) {
-	result = rb_ary_new();
-	for (i = 0; matches[i]; i++) {
-	    rb_ary_push(result, rb_locale_str_new_cstr(matches[i]));
-	    free(matches[i]);
-	}
-	free(matches);
-	if (RARRAY_LEN(result) >= 2)
-	    rb_ary_shift(result);
+        result = rb_ary_new();
+        for (i = 0; matches[i]; i++) {
+            rb_ary_push(result, rb_locale_str_new_cstr(matches[i]));
+            free(matches[i]);
+        }
+        free(matches);
+        if (RARRAY_LEN(result) >= 2)
+            rb_ary_shift(result);
     }
     else {
-	result = Qnil;
+        result = Qnil;
     }
     return result;
 }
@@ -1469,97 +1901,143 @@ username_completion_proc_call(VALUE self, VALUE str)
     int i;
 
     matches = rl_completion_matches(StringValuePtr(str),
-				    rl_username_completion_function);
+                                    rl_username_completion_function);
     if (matches) {
-	result = rb_ary_new();
-	for (i = 0; matches[i]; i++) {
-	    rb_ary_push(result, rb_locale_str_new_cstr(matches[i]));
-	    free(matches[i]);
-	}
-	free(matches);
-	if (RARRAY_LEN(result) >= 2)
-	    rb_ary_shift(result);
+        result = rb_ary_new();
+        for (i = 0; matches[i]; i++) {
+            rb_ary_push(result, rb_locale_str_new_cstr(matches[i]));
+            free(matches[i]);
+        }
+        free(matches);
+        if (RARRAY_LEN(result) >= 2)
+            rb_ary_shift(result);
     }
     else {
-	result = Qnil;
+        result = Qnil;
     }
     return result;
 }
 
+#ifdef HAVE_RL_CLEAR_SIGNALS
+int rl_clear_signals(void);
+#endif
+
+#undef rb_intern
 void
-Init_readline()
+Init_readline(void)
 {
     VALUE history, fcomp, ucomp, version;
 
     /* Allow conditional parsing of the ~/.inputrc file. */
     rl_readline_name = (char *)"Ruby";
 
+#if defined HAVE_RL_GETC_FUNCTION
+    /* libedit check rl_getc_function only when rl_initialize() is called, */
+    /* and using_history() call rl_initialize(). */
+    /* This assignment should be placed before using_history() */
+    rl_getc_function = readline_getc;
+#elif defined HAVE_RL_EVENT_HOOK
+    rl_event_hook = readline_event;
+#endif
+
     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)
+    id_pre_input_hook = rb_intern("pre_input_hook");
+#endif
+#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",
-			      readline_readline, -1);
+                              readline_readline, -1);
     rb_define_singleton_method(mReadline, "input=",
-			       readline_s_set_input, 1);
+                               readline_s_set_input, 1);
     rb_define_singleton_method(mReadline, "output=",
-			       readline_s_set_output, 1);
+                               readline_s_set_output, 1);
     rb_define_singleton_method(mReadline, "completion_proc=",
-			       readline_s_set_completion_proc, 1);
+                               readline_s_set_completion_proc, 1);
     rb_define_singleton_method(mReadline, "completion_proc",
-			       readline_s_get_completion_proc, 0);
+                               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);
+                               readline_s_set_completion_case_fold, 1);
     rb_define_singleton_method(mReadline, "completion_case_fold",
-			       readline_s_get_completion_case_fold, 0);
+                               readline_s_get_completion_case_fold, 0);
     rb_define_singleton_method(mReadline, "line_buffer",
-			       readline_s_get_line_buffer, 0);
+                               readline_s_get_line_buffer, 0);
     rb_define_singleton_method(mReadline, "point",
-			       readline_s_get_point, 0);
+                               readline_s_get_point, 0);
+    rb_define_singleton_method(mReadline, "point=",
+                               readline_s_set_point, 1);
     rb_define_singleton_method(mReadline, "set_screen_size",
-			       readline_s_set_screen_size, 2);
+                               readline_s_set_screen_size, 2);
     rb_define_singleton_method(mReadline, "get_screen_size",
-			       readline_s_get_screen_size, 0);
+                               readline_s_get_screen_size, 0);
     rb_define_singleton_method(mReadline, "vi_editing_mode",
-			       readline_s_vi_editing_mode, 0);
+                               readline_s_vi_editing_mode, 0);
     rb_define_singleton_method(mReadline, "vi_editing_mode?",
-			       readline_s_vi_editing_mode_p, 0);
+                               readline_s_vi_editing_mode_p, 0);
     rb_define_singleton_method(mReadline, "emacs_editing_mode",
-			       readline_s_emacs_editing_mode, 0);
+                               readline_s_emacs_editing_mode, 0);
     rb_define_singleton_method(mReadline, "emacs_editing_mode?",
-			       readline_s_emacs_editing_mode_p, 0);
+                               readline_s_emacs_editing_mode_p, 0);
     rb_define_singleton_method(mReadline, "completion_append_character=",
-			       readline_s_set_completion_append_character, 1);
+                               readline_s_set_completion_append_character, 1);
     rb_define_singleton_method(mReadline, "completion_append_character",
-			       readline_s_get_completion_append_character, 0);
+                               readline_s_get_completion_append_character, 0);
+    rb_define_singleton_method(mReadline, "completion_quote_character",
+                               readline_s_get_completion_quote_character, 0);
     rb_define_singleton_method(mReadline, "basic_word_break_characters=",
-			       readline_s_set_basic_word_break_characters, 1);
+                               readline_s_set_basic_word_break_characters, 1);
     rb_define_singleton_method(mReadline, "basic_word_break_characters",
-			       readline_s_get_basic_word_break_characters, 0);
+                               readline_s_get_basic_word_break_characters, 0);
     rb_define_singleton_method(mReadline, "completer_word_break_characters=",
-			       readline_s_set_completer_word_break_characters, 1);
+                               readline_s_set_completer_word_break_characters, 1);
     rb_define_singleton_method(mReadline, "completer_word_break_characters",
-			       readline_s_get_completer_word_break_characters, 0);
+                               readline_s_get_completer_word_break_characters, 0);
     rb_define_singleton_method(mReadline, "basic_quote_characters=",
-			       readline_s_set_basic_quote_characters, 1);
+                               readline_s_set_basic_quote_characters, 1);
     rb_define_singleton_method(mReadline, "basic_quote_characters",
-			       readline_s_get_basic_quote_characters, 0);
+                               readline_s_get_basic_quote_characters, 0);
     rb_define_singleton_method(mReadline, "completer_quote_characters=",
-			       readline_s_set_completer_quote_characters, 1);
+                               readline_s_set_completer_quote_characters, 1);
     rb_define_singleton_method(mReadline, "completer_quote_characters",
-			       readline_s_get_completer_quote_characters, 0);
+                               readline_s_get_completer_quote_characters, 0);
     rb_define_singleton_method(mReadline, "filename_quote_characters=",
-			       readline_s_set_filename_quote_characters, 1);
+                               readline_s_set_filename_quote_characters, 1);
     rb_define_singleton_method(mReadline, "filename_quote_characters",
-			       readline_s_get_filename_quote_characters, 0);
+                               readline_s_get_filename_quote_characters, 0);
     rb_define_singleton_method(mReadline, "refresh_line",
-			       readline_s_refresh_line, 0);
+                               readline_s_refresh_line, 0);
+    rb_define_singleton_method(mReadline, "pre_input_hook=",
+                               readline_s_set_pre_input_hook, 1);
+    rb_define_singleton_method(mReadline, "pre_input_hook",
+                               readline_s_get_pre_input_hook, 0);
+    rb_define_singleton_method(mReadline, "insert_text",
+                               readline_s_insert_text, 1);
+    rb_define_singleton_method(mReadline, "delete_text",
+                               readline_s_delete_text, -1);
+    rb_define_singleton_method(mReadline, "redisplay",
+                               readline_s_redisplay, 0);
+    rb_define_singleton_method(mReadline, "special_prefixes=",
+                               readline_s_set_special_prefixes, 1);
+    rb_define_singleton_method(mReadline, "special_prefixes",
+                               readline_s_get_special_prefixes, 0);
 
 #if USE_INSERT_IGNORE_ESCAPE
-    CONST_ID(id_orig_prompt, "orig_prompt");
-    CONST_ID(id_last_prompt, "last_prompt");
+    id_orig_prompt = rb_intern("orig_prompt");
+    id_last_prompt = rb_intern("last_prompt");
 #endif
 
     history = rb_obj_alloc(rb_cObject);
@@ -1588,7 +2066,7 @@ Init_readline()
 
     fcomp = rb_obj_alloc(rb_cObject);
     rb_define_singleton_method(fcomp, "call",
-			       filename_completion_proc_call, 1);
+                               filename_completion_proc_call, 1);
     /*
      * The Object with the call method that is a completion for filename.
      * This is sets by Readline.completion_proc= method.
@@ -1597,32 +2075,38 @@ Init_readline()
 
     ucomp = rb_obj_alloc(rb_cObject);
     rb_define_singleton_method(ucomp, "call",
-			       username_completion_proc_call, 1);
+                               username_completion_proc_call, 1);
     /*
      * The Object with the call method that is a completion for usernames.
      * This is sets by Readline.completion_proc= method.
      */
     rb_define_const(mReadline, "USERNAME_COMPLETION_PROC", ucomp);
     history_get_offset_func = history_get_offset_history_base;
+    history_replace_offset_func = history_get_offset_0;
 #if defined HAVE_RL_LIBRARY_VERSION
     version = rb_str_new_cstr(rl_library_version);
 #if defined HAVE_CLEAR_HISTORY || defined HAVE_REMOVE_HISTORY
     if (strncmp(rl_library_version, EDIT_LINE_LIBRARY_VERSION,
-		strlen(EDIT_LINE_LIBRARY_VERSION)) == 0) {
-	add_history("1");
-	if (history_get(history_get_offset_func(0)) == NULL) {
-	    history_get_offset_func = history_get_offset_0;
-	}
-#if !defined HAVE_CLEAR_HISTORY
-	clear_history();
+                strlen(EDIT_LINE_LIBRARY_VERSION)) == 0) {
+        add_history("1");
+        if (history_get(history_get_offset_func(0)) == NULL) {
+            history_get_offset_func = history_get_offset_0;
+        }
+#ifdef HAVE_REPLACE_HISTORY_ENTRY
+        if (replace_history_entry(0, "a", NULL) == NULL) {
+            history_replace_offset_func = history_get_offset_history_base;
+        }
+#endif
+#ifdef HAVE_CLEAR_HISTORY
+        clear_history();
 #else
-	{
-	    HIST_ENTRY *entry = remove_history(0);
-	    if (entry) {
-		free((char *)entry->line);
-		free(entry);
-	    }
-	}
+        {
+            HIST_ENTRY *entry = remove_history(0);
+            if (entry) {
+                free((char *)entry->line);
+                free(entry);
+            }
+        }
 #endif
     }
 #endif
@@ -1633,21 +2117,25 @@ Init_readline()
     rb_define_const(mReadline, "VERSION", version);
 
     rl_attempted_completion_function = readline_attempted_completion_function;
-#if defined HAVE_RL_GETC_FUNCTION
-    rl_getc_function = readline_getc;
-    id_getbyte = rb_intern_const("getbyte");
-#elif defined HAVE_RL_EVENT_HOOK
-    rl_event_hook = readline_event;
+#if defined(HAVE_RL_PRE_INPUT_HOOK)
+    rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
+#endif
+#if defined HAVE_RL_CHAR_IS_QUOTED_P
+    rl_char_is_quoted_p = &readline_char_is_quoted;
 #endif
 #ifdef HAVE_RL_CATCH_SIGNALS
     rl_catch_signals = 0;
 #endif
-#ifdef HAVE_RL_CATCH_SIGWINCH
-    rl_catch_sigwinch = 0;
-#endif
 #ifdef HAVE_RL_CLEAR_SIGNALS
     rl_clear_signals();
 #endif
 
-    readline_s_set_input(mReadline, rb_stdin);
+    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 40d54dab77..69759ec716 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -1,41 +1,42 @@
 GEN  = $(srcdir)/tools/generate.rb
 SRC1 = $(top_srcdir)/parse.y
 SRC2 = $(srcdir)/eventids2.c
-BISON = bison
 
 .SUFFIXES: .y
 
 src: ripper.c eventids1.c eventids2table.c
 
-ripper.o: ripper.c lex.c eventids1.c eventids2.c eventids2table.c \
-	$(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
-	$(hdrdir)/ruby/defines.h $(hdrdir)/ruby/intern.h \
-	$(hdrdir)/ruby/encoding.h $(hdrdir)/missing.h \
-	$(hdrdir)/../node.h $(hdrdir)/oniguruma.h \
-	$(hdrdir)/regex.h $(hdrdir)/st.h $(hdrdir)/util.h
+ripper.o: ripper.c
 
 .y.c:
 	$(ECHO) compiling compiler $<
 	$(Q) $(BISON) -t -v -oy.tab.c $<
-	$(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@
+	$(Q) sed -e "/^#/s!y\.tab\.c!$@!" -f $(top_srcdir)/tool/ytab.sed y.tab.c > $@
 	@$(RM) y.tab.c
 
 all: check
 static: check
 
-ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y
+ripper.y: $(srcdir)/tools/preproc.rb $(srcdir)/tools/dsl.rb $(top_srcdir)/parse.y {$(VPATH)}id.h
 	$(ECHO) extracting $@ from $(top_srcdir)/parse.y
-	$(Q) $(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@
+	$(Q) $(RUBY) $(top_srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ \
+		--vpath=$(VPATH)$(PATH_SEPARATOR)$(top_srcdir) id.h $(top_srcdir)/parse.y > ripper.tmp.y
+	$(Q) $(RUBY) $(top_srcdir)/tool/pure_parser.rb ripper.tmp.y $(BISON)
+	$(Q) $(RUBY) $(srcdir)/tools/preproc.rb ripper.tmp.y --output=$@
+	$(Q) $(RM) ripper.tmp.y
 
-check: $(GEN) $(SRC1) $(SRC2)
+check: .eventids2-check
+
+.eventids2-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)
+eventids1.c: $(GEN) $(srcdir)/tools/dsl.rb $(SRC1)
 	$(ECHO) generating $@ from $(SRC1)
 	$(Q) $(RUBY) $(GEN) --mode=eventids1 --ids1src=$(SRC1) --output=$@
 
-eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2)
+eventids2table.c: $(GEN) $(srcdir)/tools/dsl.rb $(SRC2)
 	$(ECHO) generating $@ from $(SRC2)
 	$(Q) $(RUBY) $(GEN) --mode=eventids2table --ids2src=$(SRC2) --output=$@
 
@@ -44,4 +45,37 @@ eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2)
 preproc: ripper.E
 ripper.E: ripper.c
 	$(ECHO) preprocessing ripper.c
-	$(Q) $(CC) -E $(CPPFLAGS) ripper.c | $(RUBY) $(srcdir)/tools/strip.rb > $@
+	$(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.h
+ripper.o: $(hdrdir)/ruby/assert.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/missing.h
+ripper.o: $(hdrdir)/ruby/onigmo.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)/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
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c
index 8b0d9c3757..cdac2081e6 100644
--- a/ext/ripper/eventids2.c
+++ b/ext/ripper/eventids2.c
@@ -1,279 +1,305 @@
-#define tIGNORED_NL      (tLAST_TOKEN + 1)
-#define tCOMMENT         (tLAST_TOKEN + 2)
-#define tEMBDOC_BEG      (tLAST_TOKEN + 3)
-#define tEMBDOC          (tLAST_TOKEN + 4)
-#define tEMBDOC_END      (tLAST_TOKEN + 5)
-#define tSP              (tLAST_TOKEN + 6)
-#define tHEREDOC_BEG     (tLAST_TOKEN + 7)
-#define tHEREDOC_END     (tLAST_TOKEN + 8)
-#define k__END__         (tLAST_TOKEN + 9)
+enum {
+    tIGNORED_NL  = tLAST_TOKEN + 1,
+    tCOMMENT,
+    tEMBDOC_BEG,
+    tEMBDOC,
+    tEMBDOC_END,
+    tHEREDOC_BEG,
+    tHEREDOC_END,
+    k__END__
+};
+
+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_int;
-static ID ripper_id_ivar;
-static ID ripper_id_kw;
-static ID ripper_id_lbrace;
-static ID ripper_id_lbracket;
-static ID ripper_id_lparen;
-static ID ripper_id_nl;
-static ID ripper_id_op;
-static ID ripper_id_period;
-static ID ripper_id_rbrace;
-static ID ripper_id_rbracket;
-static ID ripper_id_rparen;
-static ID ripper_id_semicolon;
-static ID ripper_id_symbeg;
-static ID ripper_id_tstring_beg;
-static ID ripper_id_tstring_content;
-static ID ripper_id_tstring_end;
-static ID ripper_id_words_beg;
-static ID ripper_id_qwords_beg;
-static ID ripper_id_words_sep;
-static ID ripper_id_regexp_beg;
-static ID ripper_id_regexp_end;
-static ID ripper_id_label;
-static ID ripper_id_tlambda;
-static ID ripper_id_tlambeg;
+    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 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;
+static ripper_scanner_ids_t ripper_scanner_ids;
 
 #include "eventids2table.c"
 
 static void
-ripper_init_eventids2(VALUE self)
+ripper_init_eventids2(void)
 {
-    ripper_id_backref = rb_intern_const("on_backref");
-    ripper_id_backtick = rb_intern_const("on_backtick");
-    ripper_id_comma = rb_intern_const("on_comma");
-    ripper_id_const = rb_intern_const("on_const");
-    ripper_id_cvar = rb_intern_const("on_cvar");
-    ripper_id_embexpr_beg = rb_intern_const("on_embexpr_beg");
-    ripper_id_embexpr_end = rb_intern_const("on_embexpr_end");
-    ripper_id_embvar = rb_intern_const("on_embvar");
-    ripper_id_float = rb_intern_const("on_float");
-    ripper_id_gvar = rb_intern_const("on_gvar");
-    ripper_id_ident = rb_intern_const("on_ident");
-    ripper_id_int = rb_intern_const("on_int");
-    ripper_id_ivar = rb_intern_const("on_ivar");
-    ripper_id_kw = rb_intern_const("on_kw");
-    ripper_id_lbrace = rb_intern_const("on_lbrace");
-    ripper_id_lbracket = rb_intern_const("on_lbracket");
-    ripper_id_lparen = rb_intern_const("on_lparen");
-    ripper_id_nl = rb_intern_const("on_nl");
-    ripper_id_op = rb_intern_const("on_op");
-    ripper_id_period = rb_intern_const("on_period");
-    ripper_id_rbrace = rb_intern_const("on_rbrace");
-    ripper_id_rbracket = rb_intern_const("on_rbracket");
-    ripper_id_rparen = rb_intern_const("on_rparen");
-    ripper_id_semicolon = rb_intern_const("on_semicolon");
-    ripper_id_symbeg = rb_intern_const("on_symbeg");
-    ripper_id_tstring_beg = rb_intern_const("on_tstring_beg");
-    ripper_id_tstring_content = rb_intern_const("on_tstring_content");
-    ripper_id_tstring_end = rb_intern_const("on_tstring_end");
-    ripper_id_words_beg = rb_intern_const("on_words_beg");
-    ripper_id_qwords_beg = rb_intern_const("on_qwords_beg");
-    ripper_id_words_sep = rb_intern_const("on_words_sep");
-    ripper_id_regexp_beg = rb_intern_const("on_regexp_beg");
-    ripper_id_regexp_end = rb_intern_const("on_regexp_end");
-    ripper_id_label = rb_intern_const("on_label");
-    ripper_id_tlambda = rb_intern_const("on_tlambda");
-    ripper_id_tlambeg = rb_intern_const("on_tlambeg");
+#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_ignored_nl = rb_intern_const("on_ignored_nl");
-    ripper_id_comment = rb_intern_const("on_comment");
-    ripper_id_embdoc_beg = rb_intern_const("on_embdoc_beg");
-    ripper_id_embdoc = rb_intern_const("on_embdoc");
-    ripper_id_embdoc_end = rb_intern_const("on_embdoc_end");
-    ripper_id_sp = rb_intern_const("on_sp");
-    ripper_id_heredoc_beg = rb_intern_const("on_heredoc_beg");
-    ripper_id_heredoc_end = rb_intern_const("on_heredoc_end");
-    ripper_id___end__ = rb_intern_const("on___end__");
-    ripper_id_CHAR = rb_intern_const("on_CHAR");
-
-    ripper_init_eventids2_table(self);
+    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);
 }
 
-static const struct token_assoc {
-    int token;
-    ID *id;
-} token_to_eventid[] = {
-    {' ',		&ripper_id_words_sep},
-    {'!',		&ripper_id_op},
-    {'%',		&ripper_id_op},
-    {'&',		&ripper_id_op},
-    {'*',		&ripper_id_op},
-    {'+',		&ripper_id_op},
-    {'-',		&ripper_id_op},
-    {'/',		&ripper_id_op},
-    {'<',		&ripper_id_op},
-    {'=',		&ripper_id_op},
-    {'>',		&ripper_id_op},
-    {'?',		&ripper_id_op},
-    {'^',		&ripper_id_op},
-    {'|',		&ripper_id_op},
-    {'~',		&ripper_id_op},
-    {':',		&ripper_id_op},
-    {',',		&ripper_id_comma},
-    {'.',		&ripper_id_period},
-    {';',		&ripper_id_semicolon},
-    {'`',		&ripper_id_backtick},
-    {'\n',              &ripper_id_nl},
-    {keyword_alias,	&ripper_id_kw},
-    {keyword_and,	&ripper_id_kw},
-    {keyword_begin,	&ripper_id_kw},
-    {keyword_break,	&ripper_id_kw},
-    {keyword_case,	&ripper_id_kw},
-    {keyword_class,	&ripper_id_kw},
-    {keyword_def,	&ripper_id_kw},
-    {keyword_defined,	&ripper_id_kw},
-    {keyword_do,	&ripper_id_kw},
-    {keyword_do_block,	&ripper_id_kw},
-    {keyword_do_cond,	&ripper_id_kw},
-    {keyword_else,	&ripper_id_kw},
-    {keyword_elsif,	&ripper_id_kw},
-    {keyword_end,	&ripper_id_kw},
-    {keyword_ensure,	&ripper_id_kw},
-    {keyword_false,	&ripper_id_kw},
-    {keyword_for,	&ripper_id_kw},
-    {keyword_if,	&ripper_id_kw},
-    {modifier_if,	&ripper_id_kw},
-    {keyword_in,	&ripper_id_kw},
-    {keyword_module,	&ripper_id_kw},
-    {keyword_next,	&ripper_id_kw},
-    {keyword_nil,	&ripper_id_kw},
-    {keyword_not,	&ripper_id_kw},
-    {keyword_or,	&ripper_id_kw},
-    {keyword_redo,	&ripper_id_kw},
-    {keyword_rescue,	&ripper_id_kw},
-    {modifier_rescue,	&ripper_id_kw},
-    {keyword_retry,	&ripper_id_kw},
-    {keyword_return,	&ripper_id_kw},
-    {keyword_self,	&ripper_id_kw},
-    {keyword_super,	&ripper_id_kw},
-    {keyword_then,	&ripper_id_kw},
-    {keyword_true,	&ripper_id_kw},
-    {keyword_undef,	&ripper_id_kw},
-    {keyword_unless,	&ripper_id_kw},
-    {modifier_unless,	&ripper_id_kw},
-    {keyword_until,	&ripper_id_kw},
-    {modifier_until,	&ripper_id_kw},
-    {keyword_when,	&ripper_id_kw},
-    {keyword_while,	&ripper_id_kw},
-    {modifier_while,	&ripper_id_kw},
-    {keyword_yield,	&ripper_id_kw},
-    {keyword__FILE__,	&ripper_id_kw},
-    {keyword__LINE__,	&ripper_id_kw},
-    {keyword__ENCODING__, &ripper_id_kw},
-    {keyword_BEGIN,	&ripper_id_kw},
-    {keyword_END,	&ripper_id_kw},
-    {keyword_do_LAMBDA,	&ripper_id_kw},
-    {tAMPER,		&ripper_id_op},
-    {tANDOP,		&ripper_id_op},
-    {tAREF,		&ripper_id_op},
-    {tASET,		&ripper_id_op},
-    {tASSOC,		&ripper_id_op},
-    {tBACK_REF,		&ripper_id_backref},
-    {tCHAR,		&ripper_id_CHAR},
-    {tCMP,		&ripper_id_op},
-    {tCOLON2,		&ripper_id_op},
-    {tCOLON3,		&ripper_id_op},
-    {tCONSTANT,		&ripper_id_const},
-    {tCVAR,		&ripper_id_cvar},
-    {tDOT2,		&ripper_id_op},
-    {tDOT3,		&ripper_id_op},
-    {tEQ,		&ripper_id_op},
-    {tEQQ,		&ripper_id_op},
-    {tFID,		&ripper_id_ident},
-    {tFLOAT,		&ripper_id_float},
-    {tGEQ,		&ripper_id_op},
-    {tGVAR,		&ripper_id_gvar},
-    {tIDENTIFIER,	&ripper_id_ident},
-    {tINTEGER,		&ripper_id_int},
-    {tIVAR,		&ripper_id_ivar},
-    {tLBRACE,		&ripper_id_lbrace},
-    {tLBRACE_ARG,	&ripper_id_lbrace},
-    {'{',       	&ripper_id_lbrace},
-    {'}',       	&ripper_id_rbrace},
-    {tLBRACK,		&ripper_id_lbracket},
-    {'[',       	&ripper_id_lbracket},
-    {']',       	&ripper_id_rbracket},
-    {tLEQ,		&ripper_id_op},
-    {tLPAREN,		&ripper_id_lparen},
-    {tLPAREN_ARG,	&ripper_id_lparen},
-    {'(',		&ripper_id_lparen},
-    {')',		&ripper_id_rparen},
-    {tLSHFT,		&ripper_id_op},
-    {tMATCH,		&ripper_id_op},
-    {tNEQ,		&ripper_id_op},
-    {tNMATCH,		&ripper_id_op},
-    {tNTH_REF,		&ripper_id_backref},
-    {tOP_ASGN,		&ripper_id_op},
-    {tOROP,		&ripper_id_op},
-    {tPOW,		&ripper_id_op},
-    {tQWORDS_BEG,	&ripper_id_qwords_beg},
-    {tREGEXP_BEG,	&ripper_id_regexp_beg},
-    {tREGEXP_END,	&ripper_id_regexp_end},
-    {tRPAREN,		&ripper_id_rparen},
-    {tRSHFT,		&ripper_id_op},
-    {tSTAR,		&ripper_id_op},
-    {tSTRING_BEG,	&ripper_id_tstring_beg},
-    {tSTRING_CONTENT,	&ripper_id_tstring_content},
-    {tSTRING_DBEG,	&ripper_id_embexpr_beg},
-    {tSTRING_DVAR,	&ripper_id_embvar},
-    {tSTRING_END,	&ripper_id_tstring_end},
-    {tSYMBEG,		&ripper_id_symbeg},
-    {tUMINUS,		&ripper_id_op},
-    {tUMINUS_NUM,	&ripper_id_op},
-    {tUPLUS,		&ripper_id_op},
-    {tWORDS_BEG,	&ripper_id_words_beg},
-    {tXSTRING_BEG,	&ripper_id_backtick},
-    {tLABEL,		&ripper_id_label},
-    {tLAMBDA,		&ripper_id_tlambda},
-    {tLAMBEG,		&ripper_id_tlambeg},
-
-    /* ripper specific tokens */
-    {tIGNORED_NL,       &ripper_id_ignored_nl},
-    {tCOMMENT,          &ripper_id_comment},
-    {tEMBDOC_BEG,       &ripper_id_embdoc_beg},
-    {tEMBDOC,           &ripper_id_embdoc},
-    {tEMBDOC_END,       &ripper_id_embdoc_end},
-    {tSP,               &ripper_id_sp},
-    {tHEREDOC_BEG,      &ripper_id_heredoc_beg},
-    {tHEREDOC_END,      &ripper_id_heredoc_end},
-    {k__END__,          &ripper_id___end__},
-    {0, NULL}
-};
+STATIC_ASSERT(k__END___range, k__END__ < SHRT_MAX);
+STATIC_ASSERT(ripper_scanner_ids_size, sizeof(ripper_scanner_ids) < SHRT_MAX);
 
 static ID
-ripper_token2eventid(int tok)
+ripper_token2eventid(enum yytokentype tok)
 {
-    const struct token_assoc *a;
+#define O(member) (int)offsetof(ripper_scanner_ids_t, ripper_id_##member)+1
+    static const unsigned short offsets[] = {
+        [' ']			= 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),
+        [tBDOT2]		= O(op),
+        [tBDOT3]		= 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 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__),
+    };
+#undef O
 
-    for (a = token_to_eventid; a->id != NULL; a++) {
-        if (a->token == tok)
-            return *a->id;
+    int i = (int)tok;
+    if (i >= 0 && i < numberof(offsets) && (i = offsets[i]) > 0) {
+        return *(const ID *)((const char *)&ripper_scanner_ids-1+i);
     }
-    if (tok < 256) {
-        return ripper_id_CHAR;
+    /* 128..256 are used as operator tokens */
+    if (tok < 128) {
+        return ripper_scanner_ids.ripper_id_CHAR;
     }
     rb_raise(rb_eRuntimeError, "[Ripper FATAL] unknown token %d", tok);
+
+    UNREACHABLE_RETURN(0);
 }
diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb
index 4914d70e78..2dde565bd9 100644
--- a/ext/ripper/extconf.rb
+++ b/ext/ripper/extconf.rb
@@ -1,22 +1,26 @@
 #!ruby -s
+# frozen_string_literal: true
 
 require 'mkmf'
 require 'rbconfig'
 
 def main
-  unless find_executable('bison')
+  yacc = ENV["YACC"] || "bison"
+
+  unless find_executable(yacc)
     unless File.exist?('ripper.c') or File.exist?("#{$srcdir}/ripper.c")
-      Logging.message 'missing bison; abort'
-      return
+      raise 'missing bison; abort'
     end
   end
   $objs = %w(ripper.o)
-  $cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output y.output eventids1.c eventids2table.c)
+  $cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output y.output eventids1.c eventids2table.c .eventids2-check)
   $defs << '-DRIPPER'
   $defs << '-DRIPPER_DEBUG' if $debug
   $VPATH << '$(topdir)' << '$(top_srcdir)'
   $INCFLAGS << ' -I$(topdir) -I$(top_srcdir)'
-  create_makefile 'ripper'
+  create_makefile 'ripper' do |conf|
+    conf << "BISON = #{yacc}"
+  end
 end
 
 main
diff --git a/ext/ripper/lib/ripper.rb b/ext/ripper/lib/ripper.rb
index cb19da334a..e937d65217 100644
--- a/ext/ripper/lib/ripper.rb
+++ b/ext/ripper/lib/ripper.rb
@@ -1,4 +1,74 @@
+# frozen_string_literal: true
 require 'ripper/core'
 require 'ripper/lexer'
 require 'ripper/filter'
 require 'ripper/sexp'
+
+# Ripper is a Ruby script parser.
+#
+# You can get information from the parser with event-based style.
+# Information such as abstract syntax trees or simple lexical analysis of the
+# Ruby program.
+#
+# == Usage
+#
+# Ripper provides an easy interface for parsing your program into a symbolic
+# expression tree (or S-expression).
+#
+# Understanding the output of the parser may come as a challenge, it's
+# recommended you use PP to format the output for legibility.
+#
+#   require 'ripper'
+#   require 'pp'
+#
+#   pp Ripper.sexp('def hello(world) "Hello, #{world}!"; end')
+#     #=> [:program,
+#          [[:def,
+#            [:@ident, "hello", [1, 4]],
+#            [:paren,
+#             [:params, [[:@ident, "world", [1, 10]]], nil, nil, nil, nil, nil, nil]],
+#            [:bodystmt,
+#             [[:string_literal,
+#               [:string_content,
+#                [:@tstring_content, "Hello, ", [1, 18]],
+#                [:string_embexpr, [[:var_ref, [:@ident, "world", [1, 27]]]]],
+#                [:@tstring_content, "!", [1, 33]]]]],
+#             nil,
+#             nil,
+#             nil]]]]
+#
+# You can see in the example above, the expression starts with +:program+.
+#
+# From here, a method definition at +:def+, followed by the method's identifier
+# <code>:@ident</code>. After the method's identifier comes the parentheses
+# +:paren+ and the method parameters under +:params+.
+#
+# Next is the method body, starting at +:bodystmt+ (+stmt+ meaning statement),
+# which contains the full definition of the method.
+#
+# In our case, we're simply returning a String, so next we have the
+# +:string_literal+ expression.
+#
+# Within our +:string_literal+ you'll notice two <code>@tstring_content</code>,
+# this is the literal part for <code>Hello, </code> and <code>!</code>. Between
+# the two <code>@tstring_content</code> statements is a +:string_embexpr+,
+# where _embexpr_ is an embedded expression. Our expression consists of a local
+# variable, or +var_ref+, with the identifier (<code>@ident</code>) of +world+.
+#
+# == Resources
+#
+# * {Ruby Inside}[http://www.rubyinside.com/using-ripper-to-see-how-ruby-is-parsing-your-code-5270.html]
+#
+# == Requirements
+#
+# * ruby 1.9 (support CVS HEAD only)
+# * bison 1.28 or later (Other yaccs do not work)
+#
+# == License
+#
+# Ruby License.
+#
+# - Minero Aoki
+# - aamine@loveruby.net
+# - http://i.loveruby.net
+class Ripper; end
diff --git a/ext/ripper/lib/ripper/core.rb b/ext/ripper/lib/ripper/core.rb
index 35aa54d090..fa075da5b9 100644
--- a/ext/ripper/lib/ripper/core.rb
+++ b/ext/ripper/lib/ripper/core.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # $Id$
 #
@@ -12,8 +13,8 @@ require 'ripper.so'
 
 class Ripper
 
-  # Parses Ruby program read from _src_.
-  # _src_ must be a String or a IO or a object which has #gets method.
+  # Parses the given Ruby program read from +src+.
+  # +src+ must be a String or an IO or a object with a #gets method.
   def Ripper.parse(src, filename = '(ripper)', lineno = 1)
     new(src, filename, lineno).parse
   end
@@ -29,25 +30,32 @@ class Ripper
 
   private
 
+  # :stopdoc:
+  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
+  # :startdoc:
+
   #
   # Parser Events
   #
 
   PARSER_EVENT_TABLE.each do |id, arity|
-    module_eval(<<-End, __FILE__, __LINE__ + 1)
-      def on_#{id}(#{ ('a'..'z').to_a[0, arity].join(', ') })
-        #{arity == 0 ? 'nil' : 'a'}
-      end
-    End
+    alias_method "on_#{id}", "_dispatch_#{arity}"
   end
 
   # This method is called when weak warning is produced by the parser.
-  # _fmt_ and _args_ is printf style.
+  # +fmt+ and +args+ is printf style.
   def warn(fmt, *args)
   end
 
   # This method is called when strong warning is produced by the parser.
-  # _fmt_ and _args_ is printf style.
+  # +fmt+ and +args+ is printf style.
   def warning(fmt, *args)
   end
 
@@ -60,11 +68,7 @@ class Ripper
   #
 
   SCANNER_EVENTS.each do |id|
-    module_eval(<<-End, __FILE__, __LINE__ + 1)
-      def on_#{id}(token)
-        token
-      end
-    End
+    alias_method "on_#{id}", :_dispatch_1
   end
 
 end
diff --git a/ext/ripper/lib/ripper/filter.rb b/ext/ripper/lib/ripper/filter.rb
index 898501b23c..9955d30550 100644
--- a/ext/ripper/lib/ripper/filter.rb
+++ b/ext/ripper/lib/ripper/filter.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # $Id$
 #
@@ -13,13 +14,18 @@ require 'ripper/lexer'
 class Ripper
 
   # This class handles only scanner events,
-  # and they are dispatched in the `right' order (same with input).
+  # which are dispatched in the 'right' order (same with input).
   class Filter
 
+    # Creates a new Ripper::Filter instance, passes parameters +src+,
+    # +filename+, and +lineno+ to Ripper::Lexer.new
+    #
+    # The lexer is for internal use only.
     def initialize(src, filename = '-', lineno = 1)
       @__lexer = Lexer.new(src, filename, lineno)
       @__line = nil
       @__col = nil
+      @__state = nil
     end
 
     # The file name of the input.
@@ -41,12 +47,20 @@ class Ripper
       @__col
     end
 
-    # Starts parsing.  _init_ is a data accumulator.
-    # It is passed to the next event handler (as of Enumerable#inject).
+    # The scanner's state of the current token.
+    # This value is the bitwise OR of zero or more of the +Ripper::EXPR_*+ constants.
+    def state
+      @__state
+    end
+
+    # Starts the parser.
+    # +init+ is a data accumulator and is passed to the next event handler (as
+    # of Enumerable#inject).
     def parse(init = nil)
       data = init
-      @__lexer.lex.each do |pos, event, tok|
+      @__lexer.lex.each do |pos, event, tok, state|
         @__line, @__col = *pos
+        @__state = state
         data = if respond_to?(event, true)
                then __send__(event, tok, data)
                else on_default(event, tok, data)
@@ -57,10 +71,12 @@ class Ripper
 
     private
 
-    # This method is called when some event handler have not defined.
-    # _event_ is :on_XXX, _token_ is scanned token, _data_ is a data
-    # accumulator.  The return value of this method is passed to the
-    # next event handler (as of Enumerable#inject).
+    # This method is called when some event handler is undefined.
+    # +event+ is :on_XXX, +token+ is the scanned token, and +data+ is a data
+    # accumulator.
+    #
+    # The return value of this method is passed to the next event handler (as
+    # of Enumerable#inject).
     def on_default(event, token, data)
       data
     end
diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb
index 5bbee39e06..9f613c3475 100644
--- a/ext/ripper/lib/ripper/lexer.rb
+++ b/ext/ripper/lib/ripper/lexer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # $Id$
 #
@@ -12,56 +13,176 @@ require 'ripper/core'
 
 class Ripper
 
-  # Tokenizes Ruby program and returns an Array of String.
+  # Tokenizes the Ruby program and returns an array of strings.
+  #
+  #   p Ripper.tokenize("def m(a) nil end")
+  #      # => ["def", " ", "m", "(", "a", ")", " ", "nil", " ", "end"]
+  #
   def Ripper.tokenize(src, filename = '-', lineno = 1)
     Lexer.new(src, filename, lineno).tokenize
   end
 
-  # Tokenizes Ruby program and returns an Array of Array,
-  # which is formatted like [[lineno, column], type, token].
+  # Tokenizes the Ruby program and returns an array of an array,
+  # which is formatted like
+  # <code>[[lineno, column], type, token, state]</code>.
   #
   #   require 'ripper'
   #   require 'pp'
   #
-  #   p Ripper.lex("def m(a) nil end")
-  #     #=> [[[1,  0], :on_kw,     "def"],
-  #          [[1,  3], :on_sp,     " "  ],
-  #          [[1,  4], :on_ident,  "m"  ],
-  #          [[1,  5], :on_lparen, "("  ],
-  #          [[1,  6], :on_ident,  "a"  ],
-  #          [[1,  7], :on_rparen, ")"  ],
-  #          [[1,  8], :on_sp,     " "  ],
-  #          [[1,  9], :on_kw,     "nil"],
-  #          [[1, 12], :on_sp,     " "  ],
-  #          [[1, 13], :on_kw,     "end"]]
+  #   pp Ripper.lex("def m(a) nil end")
+  #   #=> [[[1,  0], :on_kw,     "def", FNAME    ],
+  #        [[1,  3], :on_sp,     " ",   FNAME    ],
+  #        [[1,  4], :on_ident,  "m",   ENDFN    ],
+  #        [[1,  5], :on_lparen, "(",   BEG|LABEL],
+  #        [[1,  6], :on_ident,  "a",   ARG      ],
+  #        [[1,  7], :on_rparen, ")",   ENDFN    ],
+  #        [[1,  8], :on_sp,     " ",   BEG      ],
+  #        [[1,  9], :on_kw,     "nil", END      ],
+  #        [[1, 12], :on_sp,     " ",   END      ],
+  #        [[1, 13], :on_kw,     "end", END      ]]
   #
   def Ripper.lex(src, filename = '-', lineno = 1)
     Lexer.new(src, filename, lineno).lex
   end
 
   class Lexer < ::Ripper   #:nodoc: internal use only
+    State = Struct.new(:to_int, :to_s) do
+      alias to_i to_int
+      def initialize(i) super(i, Ripper.lex_state_name(i)).freeze end
+      # def inspect; "#<#{self.class}: #{self}>" end
+      alias inspect to_s
+      def pretty_print(q) q.text(to_s) end
+      def ==(i) super or to_int == i end
+      def &(i) self.class.new(to_int & i) end
+      def |(i) self.class.new(to_int | i) end
+      def allbits?(i) to_int.allbits?(i) end
+      def anybits?(i) to_int.anybits?(i) end
+      def nobits?(i) to_int.nobits?(i) end
+    end
+
+    Elem = Struct.new(:pos, :event, :tok, :state, :message) do
+      def initialize(pos, event, tok, state, message = nil)
+        super(pos, event, tok, State.new(state), message)
+      end
+
+      def inspect
+        "#<#{self.class}: #{event}@#{pos[0]}:#{pos[1]}:#{state}: #{tok.inspect}#{": " if message}#{message}>"
+      end
+
+      def pretty_print(q)
+        q.group(2, "#<#{self.class}:", ">") {
+          q.breakable
+          q.text("#{event}@#{pos[0]}:#{pos[1]}")
+          q.breakable
+          q.text(state)
+          q.breakable
+          q.text("token: ")
+          tok.pretty_print(q)
+          if message
+            q.breakable
+            q.text("message: ")
+            q.text(message)
+          end
+        }
+      end
+
+      def to_a
+        a = super
+        a.pop unless a.last
+        a
+      end
+    end
+
+    attr_reader :errors
+
     def tokenize
-      lex().map {|pos, event, tok| tok }
+      parse().sort_by(&:pos).map(&:tok)
     end
 
     def lex
-      parse().sort_by {|pos, event, tok| pos }
+      parse().sort_by(&:pos).map(&:to_a)
+    end
+
+    # parse the code and returns elements including errors.
+    def scan
+      result = (parse() + errors + @stack.flatten).uniq.sort_by {|e| [*e.pos, (e.message ? -1 : 0)]}
+      result.each_with_index do |e, i|
+        if e.event == :on_parse_error and e.tok.empty? and (pre = result[i-1]) and
+          pre.pos[0] == e.pos[0] and (pre.pos[1] + pre.tok.size) == e.pos[1]
+          e.tok = pre.tok
+          e.pos[1] = pre.pos[1]
+          result[i-1] = e
+          result[i] = pre
+        end
+      end
+      result
     end
 
     def parse
+      @errors = []
       @buf = []
+      @stack = []
       super
+      @buf.flatten!
       @buf
     end
 
     private
 
-    SCANNER_EVENTS.each do |event|
-      module_eval(<<-End, __FILE__+'/module_eval', __LINE__ + 1)
-        def on_#{event}(tok)
-          @buf.push [[lineno(), column()], :on_#{event}, tok]
+    unless SCANNER_EVENT_TABLE.key?(:ignored_sp)
+      SCANNER_EVENT_TABLE[:ignored_sp] = 1
+      SCANNER_EVENTS << :ignored_sp
+      EVENTS << :ignored_sp
+    end
+
+    def on_heredoc_dedent(v, w)
+      ignored_sp = []
+      heredoc = @buf.last
+      heredoc.each_with_index do |e, i|
+        if Elem === e and e.event == :on_tstring_content and e.pos[1].zero?
+          tok = e.tok.dup if w > 0 and /\A\s/ =~ e.tok
+          if (n = dedent_string(e.tok, w)) > 0
+            if e.tok.empty?
+              e.tok = tok[0, n]
+              e.event = :on_ignored_sp
+              next
+            end
+            ignored_sp << [i, Elem.new(e.pos.dup, :on_ignored_sp, tok[0, n], e.state)]
+            e.pos[1] += n
+          end
         end
-      End
+      end
+      ignored_sp.reverse_each do |i, e|
+        heredoc[i, 0] = [e]
+      end
+      v
+    end
+
+    def on_heredoc_beg(tok)
+      @stack.push @buf
+      buf = []
+      @buf.push buf
+      @buf = buf
+      @buf.push Elem.new([lineno(), column()], __callee__, tok, state())
+    end
+
+    def on_heredoc_end(tok)
+      @buf.push Elem.new([lineno(), column()], __callee__, tok, state())
+      @buf = @stack.pop
+    end
+
+    def _push_token(tok)
+      @buf.push Elem.new([lineno(), column()], __callee__, tok, state())
+    end
+
+    def on_error(mesg)
+      @errors.push Elem.new([lineno(), column()], __callee__, token(), state(), mesg)
+    end
+    alias on_parse_error on_error
+    alias compile_error on_error
+
+    (SCANNER_EVENTS.map {|event|:"on_#{event}"} - private_instance_methods(false)).each do |event|
+      alias_method event, :_push_token
     end
   end
 
@@ -90,9 +211,12 @@ class Ripper
 
   class TokenPattern   #:nodoc:
 
-    class Error < ::StandardError; end
-    class CompileError < Error; end
-    class MatchError < Error; end
+    class Error < ::StandardError # :nodoc:
+    end
+    class CompileError < Error # :nodoc:
+    end
+    class MatchError < Error # :nodoc:
+    end
 
     class << self
       alias compile new
@@ -120,7 +244,7 @@ class Ripper
       if m = /[^\w\s$()\[\]{}?*+\.]/.match(pattern)
         raise CompileError, "invalid char in pattern: #{m[0].inspect}"
       end
-      buf = ''
+      buf = +''
       pattern.scan(/(?:\w+|\$\(|[()\[\]\{\}?*+\.]+)/) do |tok|
         case tok
         when /\w/
@@ -141,21 +265,21 @@ class Ripper
     end
 
     def map_tokens(tokens)
-      tokens.map {|pos,type,str| map_token(type.to_s.sub(/\Aon_/,'')) }.join
+      tokens.map {|pos,type,str| map_token(type.to_s.delete_prefix('on_')) }.join
     end
 
     MAP = {}
     seed = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
     SCANNER_EVENT_TABLE.each do |ev, |
       raise CompileError, "[RIPPER FATAL] too many system token" if seed.empty?
-      MAP[ev.to_s.sub(/\Aon_/,'')] = seed.shift
+      MAP[ev.to_s.delete_prefix('on_')] = seed.shift
     end
 
     def map_token(tok)
       MAP[tok]  or raise CompileError, "unknown token: #{tok}"
     end
 
-    class MatchData
+    class MatchData # :nodoc:
       def initialize(tokens, match)
         @tokens = tokens
         @match = match
diff --git a/ext/ripper/lib/ripper/sexp.rb b/ext/ripper/lib/ripper/sexp.rb
index 37040e4c11..e71d52cd45 100644
--- a/ext/ripper/lib/ripper/sexp.rb
+++ b/ext/ripper/lib/ripper/sexp.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # $Id$
 #
@@ -15,7 +16,7 @@ class Ripper
   # [EXPERIMENTAL]
   # Parses +src+ and create S-exp tree.
   # Returns more readable tree rather than Ripper.sexp_raw.
-  # This method is for mainly developper use.
+  # This method is mainly for developer use.
   #
   #   require 'ripper'
   #   require 'pp'
@@ -24,16 +25,18 @@ class Ripper
   #     #=> [:program,
   #          [[:def,
   #           [:@ident, "m", [1, 4]],
-  #           [:paren, [:params, [[:@ident, "a", [1, 6]]], nil, nil, nil, nil]],
+  #           [:paren, [:params, [[:@ident, "a", [1, 6]]], nil, nil, nil, nil, nil, nil]],
   #           [:bodystmt, [[:var_ref, [:@kw, "nil", [1, 9]]]], nil, nil, nil]]]]
   #
   def Ripper.sexp(src, filename = '-', lineno = 1)
-    SexpBuilderPP.new(src, filename, lineno).parse
+    builder = SexpBuilderPP.new(src, filename, lineno)
+    sexp = builder.parse
+    sexp unless builder.error?
   end
 
   # [EXPERIMENTAL]
   # Parses +src+ and create S-exp tree.
-  # This method is for mainly developper use.
+  # This method is mainly for developer use.
   #
   #   require 'ripper'
   #   require 'pp'
@@ -52,48 +55,43 @@ class Ripper
   #             nil]]]]
   #
   def Ripper.sexp_raw(src, filename = '-', lineno = 1)
-    SexpBuilder.new(src, filename, lineno).parse
+    builder = SexpBuilder.new(src, filename, lineno)
+    sexp = builder.parse
+    sexp unless builder.error?
   end
 
-  class SexpBuilderPP < ::Ripper   #:nodoc:
+  class SexpBuilder < ::Ripper   #:nodoc:
     private
 
-    PARSER_EVENT_TABLE.each do |event, arity|
-      if /_new\z/ =~ event.to_s and arity == 0
-        module_eval(<<-End, __FILE__, __LINE__ + 1)
-          def on_#{event}
-            []
-          end
-        End
-      elsif /_add\z/ =~ event.to_s
-        module_eval(<<-End, __FILE__, __LINE__ + 1)
-          def on_#{event}(list, item)
-            list.push item
-            list
-          end
-        End
-      else
-        module_eval(<<-End, __FILE__, __LINE__ + 1)
-          def on_#{event}(*args)
-            [:#{event}, *args]
-          end
-        End
+    def dedent_element(e, width)
+      if (n = dedent_string(e[1], width)) > 0
+        e[2][1] += n
       end
+      e
     end
 
-    SCANNER_EVENTS.each do |event|
-      module_eval(<<-End, __FILE__, __LINE__ + 1)
-        def on_#{event}(tok)
-          [:@#{event}, tok, [lineno(), column()]]
+    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
         end
-      End
+      end
+      sub[val]
+      val
     end
-  end
 
-  class SexpBuilder < ::Ripper   #:nodoc:
-    private
-
-    PARSER_EVENTS.each do |event|
+    events = private_instance_methods(false).grep(/\Aon_/) {$'.to_sym}
+    (PARSER_EVENTS - events).each do |event|
       module_eval(<<-End, __FILE__, __LINE__ + 1)
         def on_#{event}(*args)
           args.unshift :#{event}
@@ -111,4 +109,50 @@ 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
+
+    def on_mlhs_paren(list)
+      [:mlhs, *list]
+    end
+
+    def on_mlhs_add_star(list, star)
+      list.push([:rest_param, star])
+    end
+
+    def on_mlhs_add_post(list, post)
+      list.concat(post)
+    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/dsl.rb b/ext/ripper/tools/dsl.rb
new file mode 100644
index 0000000000..d2b9715a71
--- /dev/null
+++ b/ext/ripper/tools/dsl.rb
@@ -0,0 +1,85 @@
+# Simple DSL implementation for Ripper code generation
+#
+# input: /*% ripper: stmts_add(stmts_new, void_stmt) %*/
+# output:
+#   VALUE v1, v2;
+#   v1 = dispatch0(stmts_new);
+#   v2 = dispatch0(void_stmt);
+#   $$ = dispatch2(stmts_add, v1, v2);
+
+class DSL
+  def initialize(code, options)
+    @events = {}
+    @error = options.include?("error")
+    @brace = options.include?("brace")
+    if options.include?("final")
+      @final = "p->result"
+    else
+      @final = (options.grep(/\A\$(?:\$|\d+)\z/)[0] || "$$")
+    end
+    @vars = 0
+
+    # create $1 == "$1", $2 == "$2", ...
+    s = (1..20).map {|n| "$#{n}"}
+    re = Array.new(s.size, "([^\0]+)")
+    /#{re.join("\0")}/ =~ s.join("\0")
+
+    # struct parser_params *p
+    p = p = "p"
+
+    @code = ""
+    @last_value = eval(code)
+  end
+
+  attr_reader :events
+
+  undef lambda
+  undef hash
+  undef class
+
+  def generate
+    s = "#@code#@final=#@last_value;"
+    s = "{VALUE #{ (1..@vars).map {|v| "v#{ v }" }.join(",") };#{ s }}" if @vars > 0
+    s << "ripper_error(p);" if @error
+    s = "{#{ s }}" if @brace
+    "\t\t\t#{s}"
+  end
+
+  def new_var
+    "v#{ @vars += 1 }"
+  end
+
+  def opt_event(event, default, addend)
+    add_event(event, [default, addend], true)
+  end
+
+  def add_event(event, args, qundef_check = false)
+    event = event.to_s.sub(/!\z/, "")
+    @events[event] = args.size
+    vars = []
+    args.each do |arg|
+      vars << v = new_var
+      @code << "#{ v }=#{ arg };"
+    end
+    v = new_var
+    d = "dispatch#{ args.size }(#{ [event, *vars].join(",") })"
+    d = "#{ vars.last }==Qundef ? #{ vars.first } : #{ d }" if qundef_check
+    @code << "#{ v }=#{ d };"
+    v
+  end
+
+  def method_missing(event, *args)
+    if event.to_s =~ /!\z/
+      add_event(event, args)
+    elsif args.empty? and /\Aid[A-Z_]/ =~ event.to_s
+      event
+    else
+      "#{ event }(#{ args.join(", ") })"
+    end
+  end
+
+  def self.const_missing(name)
+    name
+  end
+end
+
diff --git a/ext/ripper/tools/generate-param-macros.rb b/ext/ripper/tools/generate-param-macros.rb
index b19f6e8d5c..f0de55a5f2 100755..100644
--- a/ext/ripper/tools/generate-param-macros.rb
+++ b/ext/ripper/tools/generate-param-macros.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 off = true
 ARGF.each do |line|
   case line
diff --git a/ext/ripper/tools/generate.rb b/ext/ripper/tools/generate.rb
index 22c3ac0eb7..883e6ef2df 100755..100644
--- a/ext/ripper/tools/generate.rb
+++ b/ext/ripper/tools/generate.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # $Id$
 
 require 'optparse'
@@ -6,7 +7,6 @@ def main
   mode = nil
   ids1src = nil
   ids2src = nil
-  template = nil
   output = nil
 
   parser = @parser = OptionParser.new
@@ -68,41 +68,47 @@ def usage(msg)
 end
 
 def generate_eventids1(ids)
-  buf = ""
+  buf = "".dup
+  buf << %Q[static struct {\n]
   ids.each do |id, arity|
-    buf << %Q[static ID ripper_id_#{id};\n]
+    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]
   end
   buf << %Q[\n]
   buf << %Q[static void\n]
-  buf << %Q[ripper_init_eventids1(VALUE self)\n]
+  buf << %Q[ripper_init_eventids1(void)\n]
   buf << %Q[{\n]
-  buf << %Q[    VALUE h;\n]
-  buf << %Q[    ID id;\n]
+  buf << %Q[#define set_id1(name) ripper_id_##name = rb_intern_const("on_"#name)\n]
   ids.each do |id, arity|
-    buf << %Q[    ripper_id_#{id} = rb_intern_const("on_#{id}");\n]
+    buf << %Q[    set_id1(#{id});\n]
   end
+  buf << %Q[}\n]
   buf << %Q[\n]
-  buf << %Q[    h = rb_hash_new();\n]
+  buf << %Q[static void\n]
+  buf << %Q[ripper_init_eventids1_table(VALUE self)\n]
+  buf << %Q[{\n]
+  buf << %Q[    VALUE h = rb_hash_new();\n]
   buf << %Q[    rb_define_const(self, "PARSER_EVENT_TABLE", h);\n]
   ids.each do |id, arity|
-    buf << %Q[    id = rb_intern_const("#{id}");\n]
-    buf << %Q[    rb_hash_aset(h, ID2SYM(id), INT2NUM(#{arity}));\n]
+    buf << %Q[    rb_hash_aset(h, intern_sym("#{id}"), INT2FIX(#{arity}));\n]
   end
   buf << %Q[}\n]
   buf
 end
 
 def generate_eventids2_table(ids)
-  buf = ""
+  buf = "".dup
   buf << %Q[static void\n]
   buf << %Q[ripper_init_eventids2_table(VALUE self)\n]
   buf << %Q[{\n]
   buf << %Q[    VALUE h = rb_hash_new();\n]
-  buf << %Q[    ID id;\n]
   buf << %Q[    rb_define_const(self, "SCANNER_EVENT_TABLE", h);\n]
   ids.each do |id|
-    buf << %Q[    id = rb_intern_const("#{id}");\n]
-    buf << %Q[    rb_hash_aset(h, ID2SYM(id), INT2NUM(1));\n]
+    buf << %Q[    rb_hash_aset(h, intern_sym("#{id}"), INT2FIX(1));\n]
   end
   buf << %Q[}\n]
   buf
@@ -129,24 +135,37 @@ def check_arity(h)
   abort if invalid
 end
 
+require_relative "dsl"
+
 def read_ids1_with_locations(path)
   h = {}
   File.open(path) {|f|
     f.each do |line|
-      next if /\A\#\s*define\s+s?dispatch/ =~ line
+      next if /\A\#\s*define\s+dispatch/ =~ line
       next if /ripper_dispatch/ =~ line
-      line.scan(/dispatch(\d)\((\w+)/) do |arity, event|
+      line.scan(/\bdispatch(\d)\((\w+)/) do |arity, event|
         (h[event] ||= []).push [f.lineno, arity.to_i]
       end
+      if line =~ %r</\*% *ripper(?:\[(.*?)\])?: *(.*?) *%\*/>
+        gen = DSL.new($2, ($1 || "").split(","))
+        gen.generate
+        gen.events.each do |event, arity|
+          (h[event] ||= []).push [f.lineno, arity.to_i]
+        end
+      end
     end
   }
   h
 end
 
 def read_ids2(path)
-  File.open(path) {|f|
-    return f.read.scan(/ripper_id_(\w+)/).flatten.uniq.sort
-  }
+  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
 end
 
 main
diff --git a/ext/ripper/tools/preproc.rb b/ext/ripper/tools/preproc.rb
index 06397cea05..7639a901df 100755..100644
--- a/ext/ripper/tools/preproc.rb
+++ b/ext/ripper/tools/preproc.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # $Id$
 
 require 'optparse'
@@ -23,7 +24,7 @@ def main
   unless ARGV.size == 1
     abort "wrong number of arguments (#{ARGV.size} for 1)"
   end
-  out = ""
+  out = "".dup
   File.open(ARGV[0]) {|f|
     prelude f, out
     grammar f, out
@@ -39,14 +40,10 @@ def main
 end
 
 def prelude(f, out)
+  @exprs = {}
+  lex_state_def = false
   while line = f.gets
     case line
-    when %r</\*%%%\*/>
-      out << '/*' << $/
-    when %r</\*%>
-      out << '*/' << $/
-    when %r<%\*/>
-      out << $/
     when /\A%%/
       out << '%%' << $/
       return
@@ -54,21 +51,37 @@ def prelude(f, out)
       out << line.sub(/<\w+>/, '<val>')
     when /\A%type/
       out << line.sub(/<\w+>/, '<val>')
+    when /^enum lex_state_(?:bits|e) \{/
+      lex_state_def = true
+      out << line
+    when /^\}/
+      lex_state_def = false
+      out << line
     else
       out << line
     end
+    if lex_state_def
+      case line
+      when /^\s*(EXPR_\w+),\s+\/\*(.+)\*\//
+        @exprs[$1.chomp("_bit")] = $2.strip
+      when /^\s*(EXPR_\w+)\s+=\s+(.+)$/
+        name = $1
+        val = $2.chomp(",")
+        @exprs[name] = "equals to " + (val.start_with?("(") ? "<tt>#{val}</tt>" : "+#{val}+")
+      end
+    end
   end
 end
 
+require_relative "dsl"
+
 def grammar(f, out)
   while line = f.gets
     case line
+    when %r</\*% *ripper(?:\[(.*?)\])?: *(.*?) *%\*/>
+      out << DSL.new($2, ($1 || "").split(",")).generate << $/
     when %r</\*%%%\*/>
       out << '#if 0' << $/
-    when %r</\*%c%\*/>
-      out << '/*' << $/
-    when %r</\*%c>
-      out << '*/' << $/
     when %r</\*%>
       out << '#endif' << $/
     when %r<%\*/>
@@ -83,9 +96,12 @@ def grammar(f, out)
 end
 
 def usercode(f, out)
-  while line = f.gets
-    out << line
-  end
+  require 'erb'
+  compiler = ERB::Compiler.new('%-')
+  compiler.put_cmd = compiler.insert_cmd = "out.<<"
+  lineno = f.lineno
+  src, = compiler.compile(f.read)
+  eval(src, binding, f.path, lineno)
 end
 
 main
diff --git a/ext/ripper/tools/strip.rb b/ext/ripper/tools/strip.rb
index 99413c361d..23102f797a 100755..100644
--- a/ext/ripper/tools/strip.rb
+++ b/ext/ripper/tools/strip.rb
@@ -1,10 +1,10 @@
+# frozen_string_literal: true
 last_is_void = false
 ARGF.each do |line|
-  if line.strip.empty?
-    #puts() unless last_is_void
+  case line
+  when /\A\s*\z/, /\A\#/
+    puts unless last_is_void
     last_is_void = true
-  elsif /\A\#/ === line
-    ;
   else
     print line
     last_is_void = false
diff --git a/ext/rubyvm/depend b/ext/rubyvm/depend
new file mode 100644
index 0000000000..0301ce074c
--- /dev/null
+++ b/ext/rubyvm/depend
@@ -0,0 +1,2 @@
+# AUTOGENERATED DEPENDENCIES START
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/rubyvm/extconf.rb b/ext/rubyvm/extconf.rb
new file mode 100644
index 0000000000..8c40f58e2b
--- /dev/null
+++ b/ext/rubyvm/extconf.rb
@@ -0,0 +1 @@
+create_makefile("rubyvm")
diff --git a/ext/rubyvm/lib/forwardable/impl.rb b/ext/rubyvm/lib/forwardable/impl.rb
new file mode 100644
index 0000000000..e9bde2f299
--- /dev/null
+++ b/ext/rubyvm/lib/forwardable/impl.rb
@@ -0,0 +1,16 @@
+# :stopdoc:
+module Forwardable
+  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)
+      .eval
+  end
+end
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index 28e5b03b31..3a42b0e569 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -7,12 +7,7 @@
  * core routines
  */
 
-#ifndef lint
-/*char sdbm_rcsid[] = "$Id$";*/
-#endif
-
-#include "ruby/config.h"
-#include "ruby/defines.h"
+#include "ruby/ruby.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -110,7 +105,7 @@ static int   duppair proto((char *, datum));
 /*
  * externals
  */
-#if !defined sun && !defined _WIN32 && !defined __CYGWIN__ && !defined(errno)
+#if !defined(__sun) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(errno)
 extern int errno;
 #endif
 
@@ -160,7 +155,7 @@ sdbm_open(register char *file, register int flags, register int mode)
 	if (file == NULL || !*file)
 		return errno = EINVAL, (DBM *) NULL;
 /*
- * need space for two seperate filenames
+ * need space for two separate filenames
  */
 	n = strlen(file) * 2 + strlen(DIRFEXT) + strlen(PAGFEXT) + 2;
 
@@ -178,6 +173,29 @@ sdbm_open(register char *file, register int flags, register int mode)
 	return db;
 }
 
+static int
+fd_set_cloexec(int fd)
+{
+	/* MinGW don't have F_GETFD and FD_CLOEXEC.  [ruby-core:40281] */
+#ifdef F_GETFD
+	int flags, ret;
+	flags = fcntl(fd, F_GETFD); /* should not fail except EBADF. */
+	if (flags == -1) {
+		return -1;
+	}
+	if (2 < fd) {
+		if (!(flags & FD_CLOEXEC)) {
+			flags |= FD_CLOEXEC;
+			ret = fcntl(fd, F_SETFD, flags);
+			if (ret == -1) {
+				return -1;
+			}
+		}
+	}
+#endif
+	return 0;
+}
+
 DBM *
 sdbm_prep(char *dirname, char *pagname, int flags, int mode)
 {
@@ -187,6 +205,8 @@ sdbm_prep(char *dirname, char *pagname, int flags, int mode)
 	if ((db = (DBM *) malloc(sizeof(DBM))) == NULL)
 		return errno = ENOMEM, (DBM *) NULL;
 
+        db->pagf = -1;
+        db->dirf = -1;
         db->flags = 0;
         db->hmask = 0;
         db->blkptr = 0;
@@ -205,31 +225,38 @@ sdbm_prep(char *dirname, char *pagname, int flags, int mode)
  * If we fail anywhere, undo everything, return NULL.
  */
 	flags |= O_BINARY;
-	if ((db->pagf = open(pagname, flags, mode)) > -1) {
-		if ((db->dirf = open(dirname, flags, mode)) > -1) {
+#ifdef O_CLOEXEC
+        flags |= O_CLOEXEC;
+#endif
+
+	if ((db->pagf = open(pagname, flags, mode)) == -1) goto err;
+        if (fd_set_cloexec(db->pagf) == -1) goto err;
+        if ((db->dirf = open(dirname, flags, mode)) == -1) goto err;
+        if (fd_set_cloexec(db->dirf) == -1) goto err;
 /*
  * need the dirfile size to establish max bit number.
  */
-			if (fstat(db->dirf, &dstat) == 0) {
+        if (fstat(db->dirf, &dstat) == -1) goto err;
 /*
  * zero size: either a fresh database, or one with a single,
  * unsplit data page: dirpage is all zeros.
  */
-				db->dirbno = (!dstat.st_size) ? 0 : -1;
-				db->pagbno = -1;
-				db->maxbno = dstat.st_size * (long) BYTESIZ;
+        db->dirbno = (!dstat.st_size) ? 0 : -1;
+        db->pagbno = -1;
+        db->maxbno = dstat.st_size * (long) BYTESIZ;
 
-				(void) memset(db->pagbuf, 0, PBLKSIZ);
-				(void) memset(db->dirbuf, 0, DBLKSIZ);
-			/*
-			 * success
-			 */
-				return db;
-			}
-			(void) close(db->dirf);
-		}
-		(void) close(db->pagf);
-	}
+        (void) memset(db->pagbuf, 0, PBLKSIZ);
+        (void) memset(db->dirbuf, 0, DBLKSIZ);
+/*
+ * success
+ */
+        return db;
+
+    err:
+        if (db->pagf != -1)
+                (void) close(db->pagf);
+        if (db->dirf != -1)
+                (void) close(db->dirf);
 	free((char *) db);
 	return (DBM *) NULL;
 }
@@ -345,7 +372,7 @@ makroom(register DBM *db, long int hash, int need)
 {
 	long newp;
 	char twin[PBLKSIZ];
-#if defined _WIN32 && !defined __CYGWIN__
+#if defined _WIN32
 	char zer[PBLKSIZ];
 	long oldtail;
 #endif
@@ -364,7 +391,7 @@ makroom(register DBM *db, long int hash, int need)
 		newp = (hash & db->hmask) | (db->hmask + 1);
 		debug(("newp: %ld\n", newp));
 /*
- * write delay, read avoidence/cache shuffle:
+ * write delay, read avoidance/cache shuffle:
  * select the page for incoming pair: if key is to go to the new page,
  * write out the previous one, and copy the new one over, thus making
  * it the current page. If not, simply write the new page, and we are
@@ -372,21 +399,21 @@ 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 && !defined __CYGWIN__
-	/*
-	 * Fill hole with 0 if made it.
-	 * (hole is NOT read as 0)
-	 */
-	oldtail = lseek(db->pagf, 0L, SEEK_END);
-	memset(zer, 0, PBLKSIZ);
-	while (OFF_PAG(newp) > oldtail) {
-		if (lseek(db->pagf, 0L, SEEK_END) < 0 ||
-		    write(db->pagf, zer, PBLKSIZ) < 0) {
+#if defined _WIN32
+		/*
+		 * Fill hole with 0 if made it.
+		 * (hole is NOT read as 0)
+		 */
+		oldtail = lseek(db->pagf, 0L, SEEK_END);
+		memset(zer, 0, PBLKSIZ);
+		while (OFF_PAG(newp) > oldtail) {
+			if (lseek(db->pagf, 0L, SEEK_END) < 0 ||
+			    write(db->pagf, zer, PBLKSIZ) < 0) {
 
-			return 0;
+				return 0;
+			}
+			oldtail += PBLKSIZ;
 		}
-		oldtail += PBLKSIZ;
-	}
 #endif
 
 		if (hash & (db->hmask + 1)) {
@@ -479,7 +506,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: %d...", dbit));
+	debug(("dbit: %ld...", dbit));
 
 	db->curbit = dbit;
 	db->hmask = masks[hbit];
@@ -504,7 +531,7 @@ getpage(register DBM *db, register long int hash)
 		}
 		db->pagbno = pagb;
 
-		debug(("pag read: %d\n", pagb));
+		debug(("pag read: %ld\n", pagb));
 	}
 	return 1;
 }
@@ -524,7 +551,7 @@ getdbit(register DBM *db, register long int dbit)
 			return 0;
 		db->dirbno = dirb;
 
-		debug(("dir read: %d\n", dirb));
+		debug(("dir read: %ld\n", dirb));
 	}
 
 	return db->dirbuf[c % DBLKSIZ] & (1 << (dbit % BYTESIZ));
@@ -545,7 +572,7 @@ setdbit(register DBM *db, register long int dbit)
 			return 0;
 		db->dirbno = dirb;
 
-		debug(("dir read: %d\n", dirb));
+		debug(("dir read: %ld\n", dirb));
 	}
 
 	db->dirbuf[c % DBLKSIZ] |= (1 << (dbit % BYTESIZ));
@@ -604,10 +631,6 @@ getnext(register DBM *db)
  * page-level routines
  */
 
-#ifndef lint
-/*char pair_rcsid[] = "$Id$";*/
-#endif
-
 #ifndef BSD42
 /*#include <memory.h>*/
 #endif
@@ -648,8 +671,8 @@ fitpair(char *pag, int need)
 	register short *ino = (short *) pag;
 
 	off = ((n = GET_SHORT(ino,0)) > 0) ? GET_SHORT(ino,n) : PBLKSIZ;
-	free = off - (n + 1) * sizeof(short);
-	need += 2 * sizeof(short);
+	free = off - (n + 1) * (int)sizeof(short);
+	need += 2 * (int)sizeof(short);
 
 	debug(("free %d need %d\n", free, need));
 
@@ -779,7 +802,7 @@ delpair(char *pag, datum key)
 		}
 #else
 #ifdef MEMMOVE
-		memmove(dst, src, m);
+		memmove(dst-m, src-m, m);
 #else
 		while (m--)
 			*--dst = *--src;
diff --git a/ext/sdbm/depend b/ext/sdbm/depend
index f205edc611..d475ecccef 100644
--- a/ext/sdbm/depend
+++ b/ext/sdbm/depend
@@ -1,2 +1,27 @@
-_sdbm.o: _sdbm.c sdbm.h $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
-init.o: init.c sdbm.h $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+# AUTOGENERATED DEPENDENCIES START
+_sdbm.o: $(RUBY_EXTCONF_H)
+_sdbm.o: $(arch_hdrdir)/ruby/config.h
+_sdbm.o: $(hdrdir)/ruby/assert.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.h
+init.o: $(hdrdir)/ruby/assert.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: init.c
+init.o: sdbm.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/sdbm/extconf.rb b/ext/sdbm/extconf.rb
index 67796fbf8a..bdf3e299e6 100644
--- a/ext/sdbm/extconf.rb
+++ b/ext/sdbm/extconf.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'mkmf'
 
 $defs << "-D""BADMESS=0"
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index 7ba59c4e5c..42292b99cd 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -15,6 +15,55 @@
 #include <fcntl.h>
 #include <errno.h>
 
+/*
+ * Document-class: SDBM
+ *
+ * SDBM provides a simple file-based key-value store, which can only store
+ * String keys and values.
+ *
+ * Note that Ruby comes with the source code for SDBM, while the DBM and GDBM
+ * standard libraries rely on external libraries and headers.
+ *
+ * === Examples
+ *
+ * Insert values:
+ *
+ *   require 'sdbm'
+ *
+ *   SDBM.open 'my_database' do |db|
+ *     db['apple'] = 'fruit'
+ *     db['pear'] = 'fruit'
+ *     db['carrot'] = 'vegetable'
+ *     db['tomato'] = 'vegetable'
+ *   end
+ *
+ * Bulk update:
+ *
+ *   require 'sdbm'
+ *
+ *   SDBM.open 'my_database' do |db|
+ *     db.update('peach' => 'fruit', 'tomato' => 'fruit')
+ *   end
+ *
+ * Retrieve values:
+ *
+ *   require 'sdbm'
+ *
+ *   SDBM.open 'my_database' do |db|
+ *     db.each do |key, value|
+ *       puts "Key: #{key}, Value: #{value}"
+ *     end
+ *   end
+ *
+ * Outputs:
+ *
+ *   Key: apple, Value: fruit
+ *   Key: pear, Value: fruit
+ *   Key: carrot, Value: vegetable
+ *   Key: peach, Value: fruit
+ *   Key: tomato, Value: fruit
+ */
+
 static VALUE rb_cDBM, rb_eDBMError;
 
 struct dbmdata {
@@ -22,31 +71,58 @@ struct dbmdata {
     DBM *di_dbm;
 };
 
+NORETURN(static void closed_sdbm(void));
+
 static void
-closed_sdbm()
+closed_sdbm(void)
 {
     rb_raise(rb_eDBMError, "closed SDBM file");
 }
 
-#define GetDBM(obj, dbmp) {\
-    Data_Get_Struct((obj), struct dbmdata, (dbmp));\
-    if ((dbmp) == 0) closed_sdbm();\
+#define GetDBM(obj, dbmp) do {\
+    TypedData_Get_Struct((obj), struct dbmdata, &sdbm_type, (dbmp));\
     if ((dbmp)->di_dbm == 0) closed_sdbm();\
-}
+} while (0)
 
-#define GetDBM2(obj, data, dbm) {\
-    GetDBM((obj), (data));\
-    (dbm) = dbmp->di_dbm;\
-}
+#define GetDBM2(obj, dbmp, dbm) do {\
+    GetDBM((obj), (dbmp));\
+    (dbm) = (dbmp)->di_dbm;\
+} while (0)
 
 static void
-free_sdbm(struct dbmdata *dbmp)
+free_sdbm(void *ptr)
 {
+    struct dbmdata *dbmp = ptr;
 
     if (dbmp->di_dbm) sdbm_close(dbmp->di_dbm);
     ruby_xfree(dbmp);
 }
 
+static size_t
+memsize_dbm(const void *ptr)
+{
+    const struct dbmdata *dbmp = ptr;
+    size_t 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
+ *
+ * Closes the database file.
+ *
+ * Raises SDBMError if the database is already closed.
+ */
 static VALUE
 fsdbm_close(VALUE obj)
 {
@@ -59,14 +135,18 @@ fsdbm_close(VALUE obj)
     return Qnil;
 }
 
+/*
+ * call-seq:
+ *   sdbm.closed? -> true or false
+ *
+ * Returns +true+ if the database is closed.
+ */
 static VALUE
 fsdbm_closed(VALUE obj)
 {
     struct dbmdata *dbmp;
 
-    Data_Get_Struct(obj, struct dbmdata, dbmp);
-    if (dbmp == 0)
-	return Qtrue;
+    TypedData_Get_Struct(obj, struct dbmdata, &sdbm_type, dbmp);
     if (dbmp->di_dbm == 0)
 	return Qtrue;
 
@@ -76,18 +156,34 @@ fsdbm_closed(VALUE obj)
 static VALUE
 fsdbm_alloc(VALUE klass)
 {
-    return Data_Wrap_Struct(klass, 0, free_sdbm, 0);
-}
+    struct dbmdata *dbmp;
 
+    return TypedData_Make_Struct(klass, struct dbmdata, &sdbm_type, dbmp);
+}
+/*
+ * call-seq:
+ *   SDBM.new(filename, mode = 0666)
+ *
+ * Creates a new database handle by opening the given +filename+. SDBM actually
+ * uses two physical files, with extensions '.dir' and '.pag'. These extensions
+ * will automatically be appended to the +filename+.
+ *
+ * If the file does not exist, a new file will be created using the given
+ * +mode+, unless +mode+ is explicitly set to nil. In the latter case, no
+ * database will be created.
+ *
+ * If the file exists, it will be opened in read/write mode. If this fails, it
+ * will be opened in read-only mode.
+ */
 static VALUE
 fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
 {
-    volatile VALUE file;
-    VALUE vmode;
+    VALUE file, vmode;
     DBM *dbm;
     struct dbmdata *dbmp;
     int mode;
 
+    TypedData_Get_Struct(obj, struct dbmdata, &sdbm_type, dbmp);
     if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
 	mode = 0666;		/* default value */
     }
@@ -109,21 +205,39 @@ fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
 
     if (!dbm) {
 	if (mode == -1) return Qnil;
-	rb_sys_fail(RSTRING_PTR(file));
+	rb_sys_fail_str(file);
     }
 
-    dbmp = ALLOC(struct dbmdata);
-    DATA_PTR(obj) = dbmp;
+    if (dbmp->di_dbm)
+	sdbm_close(dbmp->di_dbm);
     dbmp->di_dbm = dbm;
     dbmp->di_size = -1;
 
     return obj;
 }
 
+/*
+ * call-seq:
+ *   SDBM.open(filename, mode = 0666)
+ *   SDBM.open(filename, mode = 0666) { |sdbm| ... }
+ *
+ * If called without a block, this is the same as SDBM.new.
+ *
+ * If a block is given, the new database will be passed to the block and
+ * will be safely closed after the block has executed.
+ *
+ * Example:
+ *
+ *     require 'sdbm'
+ *
+ *     SDBM.open('my_database') do |db|
+ *       db['hello'] = 'world'
+ *     end
+ */
 static VALUE
 fsdbm_s_open(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE obj = Data_Wrap_Struct(klass, 0, free_sdbm, 0);
+    VALUE obj = fsdbm_alloc(klass);
 
     if (NIL_P(fsdbm_initialize(argc, argv, obj))) {
 	return Qnil;
@@ -157,12 +271,34 @@ fsdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
     return rb_external_str_new(value.dptr, value.dsize);
 }
 
+/*
+ * call-seq:
+ *   sdbm[key] -> value or nil
+ *
+ * Returns the +value+ in the database associated with the given +key+ string.
+ *
+ * If no value is found, returns +nil+.
+ */
 static VALUE
 fsdbm_aref(VALUE obj, VALUE keystr)
 {
     return fsdbm_fetch(obj, keystr, Qnil);
 }
 
+/*
+ * call-seq:
+ *   sdbm.fetch(key) -> value or nil
+ *   sdbm.fetch(key) { |key| ... }
+ *
+ * Returns the +value+ in the database associated with the given +key+ string.
+ *
+ * If a block is provided, the block will be called when there is no
+ * +value+ associated with the given +key+. The +key+ will be passed in as an
+ * argument to the block.
+ *
+ * If no block is provided and no value is associated with the given +key+,
+ * then an IndexError will be raised.
+ */
 static VALUE
 fsdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
 {
@@ -176,6 +312,14 @@ fsdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
     return valstr;
 }
 
+/*
+ * call-seq:
+ *   sdbm.key(value) -> key
+ *
+ * Returns the +key+ associated with the given +value+. If more than one
+ * +key+ corresponds to the given +value+, then the first key to be found
+ * will be returned. If no keys are found, +nil+ will be returned.
+ */
 static VALUE
 fsdbm_key(VALUE obj, VALUE valstr)
 {
@@ -197,6 +341,9 @@ fsdbm_key(VALUE obj, VALUE valstr)
     return Qnil;
 }
 
+/*
+ * :nodoc:
+ */
 static VALUE
 fsdbm_index(VALUE hash, VALUE value)
 {
@@ -204,6 +351,25 @@ fsdbm_index(VALUE hash, VALUE value)
     return fsdbm_key(hash, value);
 }
 
+/* call-seq:
+ *   sdbm.select { |key, value| ... } -> Array
+ *
+ * Returns a new Array of key-value pairs for which the block returns +true+.
+ *
+ * Example:
+ *
+ *    require 'sdbm'
+ *
+ *    SDBM.open 'my_database' do |db|
+ *      db['apple'] = 'fruit'
+ *      db['pear'] = 'fruit'
+ *      db['spinach'] = 'vegetable'
+ *
+ *      veggies = db.select do |key, value|
+ *        value == 'vegetable'
+ *      end #=> [["apple", "fruit"], ["pear", "fruit"]]
+ *    end
+ */
 static VALUE
 fsdbm_select(VALUE obj)
 {
@@ -228,6 +394,11 @@ fsdbm_select(VALUE obj)
     return new;
 }
 
+/* call-seq:
+ *   sdbm.values_at(key, ...) -> Array
+ *
+ * Returns an Array of values corresponding to the given keys.
+ */
 static VALUE
 fsdbm_values_at(int argc, VALUE *argv, VALUE obj)
 {
@@ -244,10 +415,21 @@ fsdbm_values_at(int argc, VALUE *argv, VALUE obj)
 static void
 fdbm_modify(VALUE obj)
 {
-    rb_secure(4);
     if (OBJ_FROZEN(obj)) rb_error_frozen("SDBM");
 }
 
+/*
+ * call-seq:
+ *   sdbm.delete(key) -> value or nil
+ *   sdbm.delete(key) { |key, value| ... }
+ *
+ * Deletes the key-value pair corresponding to the given +key+. If the
+ * +key+ exists, the deleted value will be returned, otherwise +nil+.
+ *
+ * If a block is provided, the deleted +key+ and +value+ will be passed to
+ * the block as arguments. If the +key+ does not exist in the database, the
+ * value will be +nil+.
+ */
 static VALUE
 fsdbm_delete(VALUE obj, VALUE keystr)
 {
@@ -283,6 +465,13 @@ fsdbm_delete(VALUE obj, VALUE keystr)
     return valstr;
 }
 
+/*
+ * call-seq:
+ *   sdbm.shift -> Array or nil
+ *
+ * Removes a key-value pair from the database and returns them as an
+ * Array. If the database is empty, returns +nil+.
+ */
 static VALUE
 fsdbm_shift(VALUE obj)
 {
@@ -306,6 +495,14 @@ fsdbm_shift(VALUE obj)
     return rb_assoc_new(keystr, valstr);
 }
 
+/*
+ * call-seq:
+ *   sdbm.delete_if { |key, value| ... } -> self
+ *   sdbm.reject!   { |key, value| ... } -> self
+ *
+ * Iterates over the key-value pairs in the database, deleting those for
+ * which the block returns +true+.
+ */
 static VALUE
 fsdbm_delete_if(VALUE obj)
 {
@@ -314,7 +511,8 @@ fsdbm_delete_if(VALUE obj)
     DBM *dbm;
     VALUE keystr, valstr;
     VALUE ret, ary = rb_ary_new();
-    int i, status = 0, n;
+    long i;
+    int status = 0, n;
 
     fdbm_modify(obj);
     GetDBM2(obj, dbmp, dbm);
@@ -331,7 +529,7 @@ fsdbm_delete_if(VALUE obj)
     }
 
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	keystr = RARRAY_PTR(ary)[i];
+	keystr = RARRAY_AREF(ary, i);
 	ExportStringValue(keystr);
 	key.dptr = RSTRING_PTR(keystr);
 	key.dsize = RSTRING_LENINT(keystr);
@@ -345,6 +543,12 @@ fsdbm_delete_if(VALUE obj)
     return obj;
 }
 
+/*
+ * call-seq:
+ *   sdbm.clear -> self
+ *
+ * Deletes all data from the database.
+ */
 static VALUE
 fsdbm_clear(VALUE obj)
 {
@@ -365,6 +569,22 @@ fsdbm_clear(VALUE obj)
     return obj;
 }
 
+/*
+ * call-seq:
+ *   sdbm.invert -> Hash
+ *
+ * Returns a Hash in which the key-value pairs have been inverted.
+ *
+ * Example:
+ *
+ *   require 'sdbm'
+ *
+ *   SDBM.open 'my_database' do |db|
+ *     db.update('apple' => 'fruit', 'spinach' => 'vegetable')
+ *
+ *     db.invert  #=> {"fruit" => "apple", "vegetable" => "spinach"}
+ *   end
+ */
 static VALUE
 fsdbm_invert(VALUE obj)
 {
@@ -384,6 +604,18 @@ fsdbm_invert(VALUE obj)
     return hash;
 }
 
+/*
+ * call-seq:
+ *   sdbm[key] = value      -> value
+ *   sdbm.store(key, value) -> value
+ *
+ * Stores a new +value+ in the database with the given +key+ as an index.
+ *
+ * If the +key+ already exists, this will update the +value+ associated with
+ * the +key+.
+ *
+ * Returns the given +value+.
+ */
 static VALUE
 fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 {
@@ -420,16 +652,27 @@ fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 }
 
 static VALUE
-update_i(VALUE pair, VALUE dbm)
+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]");
     }
-    fsdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
+    ptr = RARRAY_CONST_PTR(pair);
+    fsdbm_store(dbm, ptr[0], ptr[1]);
     return Qnil;
 }
 
+/*
+ * call-seq:
+ *   sdbm.update(pairs) -> self
+ *
+ * Insert or update key-value pairs.
+ *
+ * This method will work with any object which implements an each_pair
+ * method, such as a Hash.
+ */
 static VALUE
 fsdbm_update(VALUE obj, VALUE other)
 {
@@ -437,6 +680,15 @@ fsdbm_update(VALUE obj, VALUE other)
     return obj;
 }
 
+/*
+ * call-seq:
+ *   sdbm.replace(pairs) -> self
+ *
+ * Empties the database, then inserts the given key-value pairs.
+ *
+ * This method will work with any object which implements an each_pair
+ * method, such as a Hash.
+ */
 static VALUE
 fsdbm_replace(VALUE obj, VALUE other)
 {
@@ -445,6 +697,13 @@ fsdbm_replace(VALUE obj, VALUE other)
     return obj;
 }
 
+/*
+ * call-seq:
+ *   sdbm.length -> integer
+ *   sdbm.size -> integer
+ *
+ * Returns the number of keys in the database.
+ */
 static VALUE
 fsdbm_length(VALUE obj)
 {
@@ -464,29 +723,43 @@ fsdbm_length(VALUE obj)
     return INT2FIX(i);
 }
 
+/*
+ * call-seq:
+ *   sdbm.empty? -> true or false
+ *
+ * Returns +true+ if the database is empty.
+ */
 static VALUE
 fsdbm_empty_p(VALUE obj)
 {
     datum key;
     struct dbmdata *dbmp;
     DBM *dbm;
-    int i = 0;
 
     GetDBM(obj, dbmp);
     if (dbmp->di_size < 0) {
 	dbm = dbmp->di_dbm;
 
 	for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	    i++;
+	    return Qfalse;
 	}
     }
     else {
-	i = dbmp->di_size;
+	if (dbmp->di_size)
+	    return Qfalse;
     }
-    if (i == 0) return Qtrue;
-    return Qfalse;
+    return Qtrue;
 }
 
+/*
+ * call-seq:
+ *   sdbm.each_value
+ *   sdbm.each_value { |value| ... }
+ *
+ * Iterates over each +value+ in the database.
+ *
+ * If no block is given, returns an Enumerator.
+ */
 static VALUE
 fsdbm_each_value(VALUE obj)
 {
@@ -505,6 +778,15 @@ fsdbm_each_value(VALUE obj)
     return obj;
 }
 
+/*
+ * call-seq:
+ *   sdbm.each_key
+ *   sdbm.each_key { |key| ... }
+ *
+ * Iterates over each +key+ in the database.
+ *
+ * If no block is given, returns an Enumerator.
+ */
 static VALUE
 fsdbm_each_key(VALUE obj)
 {
@@ -522,6 +804,17 @@ fsdbm_each_key(VALUE obj)
     return obj;
 }
 
+/*
+ * call-seq:
+ *   sdbm.each
+ *   sdbm.each { |key, value| ... }
+ *   sdbm.each_pair
+ *   sdbm.each_pair { |key, value| ... }
+ *
+ * Iterates over each key-value pair in the database.
+ *
+ * If no block is given, returns an Enumerator.
+ */
 static VALUE
 fsdbm_each_pair(VALUE obj)
 {
@@ -544,6 +837,12 @@ fsdbm_each_pair(VALUE obj)
     return obj;
 }
 
+/*
+ * call-seq:
+ *   sdbm.keys -> Array
+ *
+ * Returns a new Array containing the keys in the database.
+ */
 static VALUE
 fsdbm_keys(VALUE obj)
 {
@@ -561,6 +860,12 @@ fsdbm_keys(VALUE obj)
     return ary;
 }
 
+/*
+ * call-seq:
+ *   sdbm.values -> Array
+ *
+ * Returns a new Array containing the values in the database.
+ */
 static VALUE
 fsdbm_values(VALUE obj)
 {
@@ -579,6 +884,15 @@ fsdbm_values(VALUE obj)
     return ary;
 }
 
+/*
+ * call-seq:
+ *   sdbm.include?(key) -> true or false
+ *   sdbm.key?(key) -> true or false
+ *   sdbm.member?(key) -> true or false
+ *   sdbm.has_key?(key) -> true or false
+ *
+ * Returns +true+ if the database contains the given +key+.
+ */
 static VALUE
 fsdbm_has_key(VALUE obj, VALUE keystr)
 {
@@ -596,6 +910,13 @@ fsdbm_has_key(VALUE obj, VALUE keystr)
     return Qfalse;
 }
 
+/*
+ * call-seq:
+ *   sdbm.value?(key) -> true or false
+ *   sdbm.has_value?(key) -> true or false
+ *
+ * Returns +true+ if the database contains the given +value+.
+ */
 static VALUE
 fsdbm_has_value(VALUE obj, VALUE valstr)
 {
@@ -617,6 +938,22 @@ fsdbm_has_value(VALUE obj, VALUE valstr)
     return Qfalse;
 }
 
+/*
+ * call-seq:
+ *   sdbm.to_a -> Array
+ *
+ * Returns a new Array containing each key-value pair in the database.
+ *
+ * Example:
+ *
+ *   require 'sdbm'
+ *
+ *   SDBM.open 'my_database' do |db|
+ *     db.update('apple' => 'fruit', 'spinach' => 'vegetable')
+ *
+ *     db.to_a  #=> [["apple", "fruit"], ["spinach", "vegetable"]]
+ *   end
+ */
 static VALUE
 fsdbm_to_a(VALUE obj)
 {
@@ -636,6 +973,12 @@ fsdbm_to_a(VALUE obj)
     return ary;
 }
 
+/*
+ * call-seq:
+ *   sdbm.to_hash -> Hash
+ *
+ * Returns a new Hash containing each key-value pair in the database.
+ */
 static VALUE
 fsdbm_to_hash(VALUE obj)
 {
@@ -655,6 +998,14 @@ fsdbm_to_hash(VALUE obj)
     return hash;
 }
 
+/*
+ * call-seq:
+ *   sdbm.reject { |key, value| ... } -> Hash
+ *
+ * Creates a new Hash using the key-value pairs from the database, then
+ * calls Hash#reject with the given block, which returns a Hash with
+ * only the key-value pairs for which the block returns +false+.
+ */
 static VALUE
 fsdbm_reject(VALUE obj)
 {
@@ -662,10 +1013,13 @@ fsdbm_reject(VALUE obj)
 }
 
 void
-Init_sdbm()
+Init_sdbm(void)
 {
     rb_cDBM = rb_define_class("SDBM", rb_cObject);
     rb_eDBMError = rb_define_class("SDBMError", rb_eStandardError);
+    /* Document-class: SDBMError
+     * Exception class used to return errors from the sdbm library.
+     */
     rb_include_module(rb_cDBM, rb_mEnumerable);
 
     rb_define_alloc_func(rb_cDBM, fsdbm_alloc);
@@ -701,11 +1055,11 @@ Init_sdbm()
     rb_define_method(rb_cDBM,"update", fsdbm_update, 1);
     rb_define_method(rb_cDBM,"replace", fsdbm_replace, 1);
 
-    rb_define_method(rb_cDBM, "include?", fsdbm_has_key, 1);
     rb_define_method(rb_cDBM, "has_key?", fsdbm_has_key, 1);
+    rb_define_method(rb_cDBM, "include?", fsdbm_has_key, 1);
+    rb_define_method(rb_cDBM, "key?", fsdbm_has_key, 1);
     rb_define_method(rb_cDBM, "member?", fsdbm_has_key, 1);
     rb_define_method(rb_cDBM, "has_value?", fsdbm_has_value, 1);
-    rb_define_method(rb_cDBM, "key?", fsdbm_has_key, 1);
     rb_define_method(rb_cDBM, "value?", fsdbm_has_value, 1);
 
     rb_define_method(rb_cDBM, "to_a", fsdbm_to_a, 0);
diff --git a/ext/sdbm/sdbm.gemspec b/ext/sdbm/sdbm.gemspec
new file mode 100644
index 0000000000..6cf000b453
--- /dev/null
+++ b/ext/sdbm/sdbm.gemspec
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+Gem::Specification.new do |s|
+  s.name = "sdbm"
+  s.version = '1.0.0'
+  s.summary = "Provides a simple file-based key-value store with String keys and values."
+  s.description = "Provides a simple file-based key-value store with String keys and values."
+
+  s.require_path = %w{lib}
+  s.files = %w{ext/sdbm/_sdbm.c ext/sdbm/extconf.rb ext/sdbm/init.c ext/sdbm/sdbm.h}
+  s.extensions = ["ext/sdbm/extconf.rb"]
+  s.required_ruby_version = ">= 2.3.0"
+
+  s.authors = ["Yukihiro Matsumoto"]
+  s.email = ["matz@ruby-lang.org"]
+  s.homepage = "https://github.com/ruby/sdbm"
+  s.license = "BSD-2-Clause"
+
+  s.add_development_dependency "test-unit"
+  s.add_development_dependency "rake-compiler"
+end
diff --git a/ext/socket/.document b/ext/socket/.document
index 0216c5aa45..53cfac0b10 100644
--- a/ext/socket/.document
+++ b/ext/socket/.document
@@ -2,6 +2,7 @@ ancdata.c
 basicsocket.c
 constants.c
 constdefs.c
+ifaddr.c
 init.c
 ipsocket.c
 option.c
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index 9db4426a80..84463af061 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -2,7 +2,10 @@
 
 #include <time.h>
 
-#if defined(HAVE_ST_MSG_CONTROL)
+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;
 
 static VALUE
@@ -86,8 +89,7 @@ ancillary_initialize(VALUE self, VALUE vfamily, VALUE vlevel, VALUE vtype, VALUE
 static VALUE
 ancdata_new(int family, int level, int type, VALUE data)
 {
-    NEWOBJ(obj, struct RObject);
-    OBJSETUP(obj, rb_cAncillaryData, T_OBJECT);
+    NEWOBJ_OF(obj, struct RObject, rb_cAncillaryData, T_OBJECT);
     StringValue(data);
     ancillary_initialize((VALUE)obj, INT2NUM(family), INT2NUM(level), INT2NUM(type), data);
     return (VALUE)obj;
@@ -196,7 +198,7 @@ ancillary_s_unix_rights(int argc, VALUE *argv, VALUE klass)
 
     for (i = 0 ; i < argc; i++) {
         VALUE obj = argv[i];
-        if (TYPE(obj) != T_FILE) {
+        if (!RB_TYPE_P(obj, T_FILE)) {
             rb_raise(rb_eTypeError, "IO expected");
         }
         rb_ary_push(ary, obj);
@@ -205,7 +207,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_PTR(ary)[i];
+        VALUE obj = RARRAY_AREF(ary, i);
         rb_io_t *fptr;
         int fd;
         GetOpenFile(obj, fptr);
@@ -277,8 +279,8 @@ ancillary_unix_rights(VALUE self)
  * returns the timestamp as a time object.
  *
  * _ancillarydata_ should be one of following type:
- * - SOL_SOCKET/SCM_TIMESTAMP (micro second) GNU/Linux, FreeBSD, NetBSD, OpenBSD, Solaris, MacOS X
- * - SOL_SOCKET/SCM_TIMESTAMPNS (nano second) GNU/Linux
+ * - SOL_SOCKET/SCM_TIMESTAMP (microsecond) GNU/Linux, FreeBSD, NetBSD, OpenBSD, Solaris, MacOS X
+ * - SOL_SOCKET/SCM_TIMESTAMPNS (nanosecond) GNU/Linux
  * - SOL_SOCKET/SCM_BINTIME (2**(-64) second) FreeBSD
  *
  *   Addrinfo.udp("127.0.0.1", 0).bind {|s1|
@@ -358,6 +360,8 @@ 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>
  */
@@ -574,9 +578,7 @@ extract_ipv6_pktinfo(VALUE self, struct in6_pktinfo *pktinfo_ptr, struct sockadd
 
     memcpy(pktinfo_ptr, RSTRING_PTR(data), sizeof(*pktinfo_ptr));
 
-    memset(sa_ptr, 0, sizeof(*sa_ptr));
-    SET_SA_LEN((struct sockaddr *)sa_ptr, sizeof(struct sockaddr_in6));
-    sa_ptr->sin6_family = AF_INET6;
+    INIT_SOCKADDR((struct sockaddr *)sa_ptr, AF_INET6, sizeof(*sa_ptr));
     memcpy(&sa_ptr->sin6_addr, &pktinfo_ptr->ipi6_addr, sizeof(sa_ptr->sin6_addr));
     if (IN6_IS_ADDR_LINKLOCAL(&sa_ptr->sin6_addr))
         sa_ptr->sin6_scope_id = pktinfo_ptr->ipi6_ifindex;
@@ -990,7 +992,7 @@ ancillary_inspect(VALUE self)
 
         vtype = ip_cmsg_type_to_sym(level, type);
         if (SYMBOL_P(vtype))
-            rb_str_catf(ret, " %s", rb_id2name(SYM2ID(vtype)));
+            rb_str_catf(ret, " %"PRIsVALUE, rb_sym2str(vtype));
         else
             rb_str_catf(ret, " cmsg_type:%d", type);
     }
@@ -1055,7 +1057,7 @@ ancillary_inspect(VALUE self)
 #        if defined(IPPROTO_IPV6)
           case IPPROTO_IPV6:
             switch (type) {
-#            if defined(IPV6_PKTINFO) /* RFC 3542 */
+#            if defined(IPV6_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN6_PKTINFO) /* RFC 3542 */
               case IPV6_PKTINFO: inspected = anc_inspect_ipv6_pktinfo(level, type, data, ret); break;
 #            endif
             }
@@ -1106,15 +1108,15 @@ ancillary_cmsg_is_p(VALUE self, VALUE vlevel, VALUE vtype)
 #if defined(HAVE_SENDMSG)
 struct sendmsg_args_struct {
     int fd;
-    const struct msghdr *msg;
     int flags;
+    const struct msghdr *msg;
 };
 
-static VALUE
+static void *
 nogvl_sendmsg_func(void *ptr)
 {
     struct sendmsg_args_struct *args = ptr;
-    return sendmsg(args->fd, args->msg, args->flags);
+    return (void *)(VALUE)sendmsg(args->fd, args->msg, args->flags);
 }
 
 static ssize_t
@@ -1124,48 +1126,48 @@ rb_sendmsg(int fd, const struct msghdr *msg, int flags)
     args.fd = fd;
     args.msg = msg;
     args.flags = flags;
-    return rb_thread_blocking_region(nogvl_sendmsg_func, &args, RUBY_UBF_IO, 0);
+    return (ssize_t)rb_thread_call_without_gvl(nogvl_sendmsg_func, &args, RUBY_UBF_IO, 0);
 }
 
 static VALUE
-bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
+bsock_sendmsg_internal(VALUE sock, VALUE data, VALUE vflags,
+		       VALUE dest_sockaddr, VALUE controls, VALUE ex,
+		       int nonblock)
 {
     rb_io_t *fptr;
-    VALUE data, vflags, dest_sockaddr;
-    VALUE *controls_ptr;
-    int controls_num;
     struct msghdr mh;
     struct iovec iov;
-#if defined(HAVE_ST_MSG_CONTROL)
-    volatile VALUE controls_str = 0;
+    VALUE tmp;
+    int controls_num;
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
+    VALUE controls_str = 0;
+    int family;
 #endif
     int flags;
     ssize_t ss;
-    int family;
 
-    rb_secure(4);
     GetOpenFile(sock, fptr);
-    family = rsock_getfamily(fptr->fd);
-
-    data = vflags = dest_sockaddr = Qnil;
-    controls_ptr = NULL;
-    controls_num = 0;
-
-    if (argc == 0)
-        rb_raise(rb_eArgError, "mesg argument required");
-    data = argv[0];
-    if (1 < argc) vflags = argv[1];
-    if (2 < argc) dest_sockaddr = argv[2];
-    if (3 < argc) { controls_ptr = &argv[3]; controls_num = argc - 3; }
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
+    family = rsock_getfamily(fptr);
+#endif
 
     StringValue(data);
+    tmp = rb_str_tmp_frozen_acquire(data);
+
+    if (!RB_TYPE_P(controls, T_ARRAY)) {
+	controls = rb_ary_new();
+    }
+    controls_num = RARRAY_LENINT(controls);
 
     if (controls_num) {
-#if defined(HAVE_ST_MSG_CONTROL)
+#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;
+#endif
         controls_str = rb_str_tmp_new(0);
         for (i = 0; i < controls_num; i++) {
             VALUE elt = controls_ptr[i], v;
@@ -1204,8 +1206,10 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
             cmh.cmsg_len = (socklen_t)CMSG_LEN(RSTRING_LEN(cdata));
             MEMCPY(cmsg, &cmh, char, sizeof(cmh));
             MEMCPY(cmsg+((char*)CMSG_DATA(&cmh)-(char*)&cmh), RSTRING_PTR(cdata), char, RSTRING_LEN(cdata));
+#if defined(__NetBSD__)
             last_level = cmh.cmsg_level;
             last_type = cmh.cmsg_type;
+#endif
 	    last_pad = cspace - cmh.cmsg_len;
         }
 	if (last_pad) {
@@ -1234,6 +1238,7 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
                 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
@@ -1254,115 +1259,99 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
     memset(&mh, 0, sizeof(mh));
     if (!NIL_P(dest_sockaddr)) {
         mh.msg_name = RSTRING_PTR(dest_sockaddr);
-        mh.msg_namelen = RSTRING_LENINT(dest_sockaddr);
+        mh.msg_namelen = RSTRING_SOCKLEN(dest_sockaddr);
     }
     mh.msg_iovlen = 1;
     mh.msg_iov = &iov;
-    iov.iov_base = RSTRING_PTR(data);
-    iov.iov_len = RSTRING_LEN(data);
-#if defined(HAVE_ST_MSG_CONTROL)
+    iov.iov_base = RSTRING_PTR(tmp);
+    iov.iov_len = RSTRING_LEN(tmp);
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
     if (controls_str) {
         mh.msg_control = RSTRING_PTR(controls_str);
-        mh.msg_controllen = RSTRING_LENINT(controls_str);
-    }
-    else {
-        mh.msg_control = NULL;
-        mh.msg_controllen = 0;
+        mh.msg_controllen = RSTRING_SOCKLEN(controls_str);
     }
 #endif
 
     rb_io_check_closed(fptr);
-    if (nonblock)
+    if (nonblock && !MSG_DONTWAIT_RELIABLE)
         rb_io_set_nonblock(fptr);
 
     ss = rb_sendmsg(fptr->fd, &mh, flags);
 
-    if (!nonblock && rb_io_wait_writable(fptr->fd)) {
-        rb_io_check_closed(fptr);
-        goto retry;
-    }
-
     if (ss == -1) {
-        if (nonblock && (errno == EWOULDBLOCK || errno == EAGAIN))
-            rb_mod_sys_fail(rb_mWaitWritable, "sendmsg(2) would block");
-	rb_sys_fail("sendmsg(2)");
+	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 defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
+    RB_GC_GUARD(controls_str);
+#endif
+    rb_str_tmp_frozen_release(data, tmp);
 
     return SSIZET2NUM(ss);
 }
 #endif
 
 #if defined(HAVE_SENDMSG)
-/*
- * call-seq:
- *    basicsocket.sendmsg(mesg, flags=0, dest_sockaddr=nil, *controls) => numbytes_sent
- *
- * sendmsg sends a message using sendmsg(2) system call in blocking manner.
- *
- * _mesg_ is a string to send.
- *
- * _flags_ is bitwise OR of MSG_* constants such as Socket::MSG_OOB.
- *
- * _dest_sockaddr_ is a destination socket address for connection-less socket.
- * It should be a sockaddr such as a result of Socket.sockaddr_in.
- * An Addrinfo object can be used too.
- *
- * _controls_ is a list of ancillary data.
- * The element of _controls_ should be Socket::AncillaryData or
- * 3-elements array.
- * The 3-element array should contains cmsg_level, cmsg_type and data.
- *
- * The return value, _numbytes_sent_ is an integer which is the number of bytes sent.
- *
- * sendmsg can be used to implement send_io as follows:
- *
- *   # use Socket::AncillaryData.
- *   ancdata = Socket::AncillaryData.int(:UNIX, :SOCKET, :RIGHTS, io.fileno)
- *   sock.sendmsg("a", 0, nil, ancdata)
- *
- *   # use 3-element array.
- *   ancdata = [:SOCKET, :RIGHTS, [io.fileno].pack("i!")]
- *   sock.sendmsg("\0", 0, nil, ancdata)
- *
- */
 VALUE
-rsock_bsock_sendmsg(int argc, VALUE *argv, VALUE sock)
+rsock_bsock_sendmsg(VALUE sock, VALUE data, VALUE flags, VALUE dest_sockaddr,
+		    VALUE controls)
 {
-    return bsock_sendmsg_internal(argc, argv, sock, 0);
+    return bsock_sendmsg_internal(sock, data, flags, dest_sockaddr, controls,
+				  Qtrue, 0);
 }
 #endif
 
 #if defined(HAVE_SENDMSG)
-/*
- * call-seq:
- *    basicsocket.sendmsg_nonblock(mesg, flags=0, dest_sockaddr=nil, *controls) => numbytes_sent
- *
- * sendmsg_nonblock sends a message using sendmsg(2) system call in non-blocking manner.
- *
- * It is similar to BasicSocket#sendmsg
- * but the non-blocking flag is set before the system call
- * and it doesn't retry the system call.
- *
- */
 VALUE
-rsock_bsock_sendmsg_nonblock(int argc, VALUE *argv, VALUE sock)
+rsock_bsock_sendmsg_nonblock(VALUE sock, VALUE data, VALUE flags,
+			     VALUE dest_sockaddr, VALUE controls, VALUE ex)
 {
-    return bsock_sendmsg_internal(argc, argv, sock, 1);
+    return bsock_sendmsg_internal(sock, data, flags, dest_sockaddr,
+				  controls, ex, 1);
 }
 #endif
 
 #if defined(HAVE_RECVMSG)
 struct recvmsg_args_struct {
     int fd;
-    struct msghdr *msg;
     int flags;
+    struct msghdr *msg;
 };
 
-static VALUE
+ssize_t
+rsock_recvmsg(int socket, struct msghdr *message, int flags)
+{
+    ssize_t ret;
+    socklen_t len0;
+#ifdef MSG_CMSG_CLOEXEC
+    /* MSG_CMSG_CLOEXEC is available since Linux 2.6.23.  Linux 2.6.18 silently ignore it. */
+    flags |= MSG_CMSG_CLOEXEC;
+#endif
+    len0 = message->msg_namelen;
+    ret = recvmsg(socket, message, flags);
+    if (ret != -1 && len0 < message->msg_namelen)
+        message->msg_namelen = len0;
+    return ret;
+}
+
+static void *
 nogvl_recvmsg_func(void *ptr)
 {
     struct recvmsg_args_struct *args = ptr;
-    return recvmsg(args->fd, args->msg, args->flags);
+    int flags = args->flags;
+    return (void *)rsock_recvmsg(args->fd, args->msg, flags);
 }
 
 static ssize_t
@@ -1372,19 +1361,19 @@ rb_recvmsg(int fd, struct msghdr *msg, int flags)
     args.fd = fd;
     args.msg = msg;
     args.flags = flags;
-    return rb_thread_blocking_region(nogvl_recvmsg_func, &args, RUBY_UBF_IO, 0);
+    return (ssize_t)rb_thread_call_without_gvl(nogvl_recvmsg_func, &args, RUBY_UBF_IO, 0);
 }
 
-#if defined(HAVE_ST_MSG_CONTROL)
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
 static void
 discard_cmsg(struct cmsghdr *cmh, char *msg_end, int msg_peek_p)
 {
 # if !defined(FD_PASSING_WORK_WITH_RECVMSG_MSG_PEEK)
-    /* 
+    /*
      * FreeBSD 8.2.0, NetBSD 5 and MacOS X Snow Leopard doesn't
      * allocate fds by recvmsg with MSG_PEEK.
      * [ruby-dev:44189]
-     * http://redmine.ruby-lang.org/issues/5075
+     * http://bugs.ruby-lang.org/issues/5075
      *
      * Linux 2.6.38 allocate fds by recvmsg with MSG_PEEK.
      */
@@ -1407,7 +1396,7 @@ discard_cmsg(struct cmsghdr *cmh, char *msg_end, int msg_peek_p)
 void
 rsock_discard_cmsg_resource(struct msghdr *mh, int msg_peek_p)
 {
-#if defined(HAVE_ST_MSG_CONTROL)
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
     struct cmsghdr *cmh;
     char *msg_end;
 
@@ -1422,7 +1411,7 @@ rsock_discard_cmsg_resource(struct msghdr *mh, int msg_peek_p)
 #endif
 }
 
-#if defined(HAVE_ST_MSG_CONTROL)
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
 static void
 make_io_for_unix_rights(VALUE ctl, struct cmsghdr *cmh, char *msg_end)
 {
@@ -1440,6 +1429,10 @@ make_io_for_unix_rights(VALUE ctl, struct cmsghdr *cmh, char *msg_end)
             if (fstat(fd, &stbuf) == -1)
                 rb_raise(rb_eSocket, "invalid fd in SCM_RIGHTS");
             rb_update_max_fd(fd);
+            if (rsock_cmsg_cloexec_state < 0)
+                rsock_cmsg_cloexec_state = rsock_detect_cloexec(fd);
+            if (rsock_cmsg_cloexec_state == 0 || fd <= 2)
+                rb_maygvl_fd_fix_cloexec(fd);
             if (S_ISSOCK(stbuf.st_mode))
                 io = rsock_init_sock(rb_obj_alloc(rb_cSocket), fd);
             else
@@ -1454,50 +1447,39 @@ make_io_for_unix_rights(VALUE ctl, struct cmsghdr *cmh, char *msg_end)
 #endif
 
 static VALUE
-bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
+bsock_recvmsg_internal(VALUE sock,
+		VALUE vmaxdatlen, VALUE vflags, VALUE vmaxctllen,
+		VALUE scm_rights, VALUE ex, int nonblock)
 {
     rb_io_t *fptr;
-    VALUE vmaxdatlen, vmaxctllen, vflags, vopts;
     int grow_buffer;
     size_t maxdatlen;
     int flags, orig_flags;
-    int request_scm_rights;
     struct msghdr mh;
     struct iovec iov;
-    struct sockaddr_storage namebuf;
-    char datbuf0[4096], *datbuf;
+    union_sockaddr namebuf;
+    char *datbuf;
     VALUE dat_str = Qnil;
     VALUE ret;
     ssize_t ss;
-#if defined(HAVE_ST_MSG_CONTROL)
+    int request_scm_rights;
+#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
 
-    rb_secure(4);
-
-    vopts = Qnil;
-    if (0 < argc && TYPE(argv[argc-1]) == T_HASH)
-        vopts = argv[--argc];
-
-    rb_scan_args(argc, argv, "03", &vmaxdatlen, &vflags, &vmaxctllen);
-
-    maxdatlen = NIL_P(vmaxdatlen) ? sizeof(datbuf0) : NUM2SIZET(vmaxdatlen);
-#if defined(HAVE_ST_MSG_CONTROL)
-    maxctllen = NIL_P(vmaxctllen) ? sizeof(ctlbuf0) : NUM2SIZET(vmaxctllen);
+    maxdatlen = NIL_P(vmaxdatlen) ? 4096 : NUM2SIZET(vmaxdatlen);
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
+    maxctllen = NIL_P(vmaxctllen) ? 4096 : NUM2SIZET(vmaxctllen);
 #else
     if (!NIL_P(vmaxctllen))
         rb_raise(rb_eArgError, "control message not supported");
 #endif
-    flags = NIL_P(vflags) ? 0 : NUM2INT(vflags);
+    flags = NUM2INT(vflags);
 #ifdef MSG_DONTWAIT
     if (nonblock)
         flags |= MSG_DONTWAIT;
@@ -1507,15 +1489,19 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
     grow_buffer = NIL_P(vmaxdatlen) || NIL_P(vmaxctllen);
 
     request_scm_rights = 0;
-    if (!NIL_P(vopts) && RTEST(rb_hash_aref(vopts, ID2SYM(rb_intern("scm_rights")))))
+    if (RTEST(scm_rights))
         request_scm_rights = 1;
+#if !defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
+    if (request_scm_rights)
+        rb_raise(rb_eNotImpError, "control message for recvmsg is unimplemented");
+#endif
 
     GetOpenFile(sock, fptr);
     if (rb_io_read_pending(fptr)) {
         rb_raise(rb_eIOError, "recvmsg for buffered IO");
     }
 
-#if !defined(HAVE_ST_MSG_CONTROL)
+#if !defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
     if (grow_buffer) {
 	int socktype;
 	socklen_t optlen = (socklen_t)sizeof(socktype);
@@ -1528,32 +1514,24 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
 #endif
 
   retry:
-    if (maxdatlen <= sizeof(datbuf0))
-        datbuf = datbuf0;
-    else {
-        if (NIL_P(dat_str))
-            dat_str = rb_str_tmp_new(maxdatlen);
-        else
-            rb_str_resize(dat_str, maxdatlen);
-        datbuf = RSTRING_PTR(dat_str);
-    }
+    if (NIL_P(dat_str))
+	dat_str = rb_str_tmp_new(maxdatlen);
+    else
+	rb_str_resize(dat_str, maxdatlen);
+    datbuf = RSTRING_PTR(dat_str);
 
-#if defined(HAVE_ST_MSG_CONTROL)
-    if (maxctllen <= sizeof(ctlbuf0))
-        ctlbuf = ctlbuf0.bytes;
-    else {
-        if (NIL_P(ctl_str))
-            ctl_str = rb_str_tmp_new(maxctllen);
-        else
-            rb_str_resize(ctl_str, maxctllen);
-        ctlbuf = RSTRING_PTR(ctl_str);
-    }
+#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);
 #endif
 
     memset(&mh, 0, sizeof(mh));
 
     memset(&namebuf, 0, sizeof(namebuf));
-    mh.msg_name = (struct sockaddr *)&namebuf;
+    mh.msg_name = &namebuf.addr;
     mh.msg_namelen = (socklen_t)sizeof(namebuf);
 
     mh.msg_iov = &iov;
@@ -1561,7 +1539,7 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
     iov.iov_base = datbuf;
     iov.iov_len = maxdatlen;
 
-#if defined(HAVE_ST_MSG_CONTROL)
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
     mh.msg_control = ctlbuf;
     mh.msg_controllen = (socklen_t)maxctllen;
 #endif
@@ -1570,21 +1548,26 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
         flags |= MSG_PEEK;
 
     rb_io_check_closed(fptr);
-    if (nonblock)
+    if (nonblock && !MSG_DONTWAIT_RELIABLE)
         rb_io_set_nonblock(fptr);
 
     ss = rb_recvmsg(fptr->fd, &mh, flags);
 
-    if (!nonblock && rb_io_wait_readable(fptr->fd)) {
-        rb_io_check_closed(fptr);
-        goto retry;
-    }
-
     if (ss == -1) {
-        if (nonblock && (errno == EWOULDBLOCK || errno == EAGAIN))
-            rb_mod_sys_fail(rb_mWaitReadable, "recvmsg(2) would block");
-#if defined(HAVE_ST_MSG_CONTROL)
-        if (!gc_done && (errno == EMFILE || errno == EMSGSIZE)) {
+	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 defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
+	if (!gc_done && (e == EMFILE || e == EMSGSIZE)) {
           /*
            * When SCM_RIGHTS hit the file descriptors limit:
            * - Linux 2.6.18 causes success with MSG_CTRUNC
@@ -1596,23 +1579,27 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
             gc_done = 1;
 	    goto retry;
         }
+#else
+	if (NIL_P(vmaxdatlen) && grow_buffer && e == EMSGSIZE)
+	    ss = (ssize_t)iov.iov_len;
+	else
 #endif
-	rb_sys_fail("recvmsg(2)");
+	rb_syserr_fail(e, "recvmsg(2)");
     }
 
     if (grow_buffer) {
 	int grown = 0;
-#if defined(HAVE_ST_MSG_CONTROL)
-        if (NIL_P(vmaxdatlen) && (mh.msg_flags & MSG_TRUNC)) {
+	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;
 	}
+#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 &&
-                mh.msg_controllen < (socklen_t)(maxctllen - BIG_ENOUGH_SPACE)) {
+                (socklen_t)mh.msg_controllen < (socklen_t)(maxctllen - BIG_ENOUGH_SPACE)) {
                 /* there are big space bug truncated.
                  * file descriptors limit? */
                 if (!gc_done) {
@@ -1628,13 +1615,6 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
             }
 #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);
@@ -1651,24 +1631,23 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
     }
 
     if (NIL_P(dat_str))
-        dat_str = rb_tainted_str_new(datbuf, ss);
+        dat_str = rb_str_new(datbuf, ss);
     else {
         rb_str_resize(dat_str, ss);
-        OBJ_TAINT(dat_str);
-        RBASIC(dat_str)->klass = rb_cString;
+	rb_obj_reveal(dat_str, rb_cString);
     }
 
     ret = rb_ary_new3(3, dat_str,
                          rsock_io_socket_addrinfo(sock, mh.msg_name, mh.msg_namelen),
-#if defined(HAVE_ST_MSG_CONTROL)
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
 			 INT2NUM(mh.msg_flags)
 #else
 			 Qnil
 #endif
 			 );
 
-#if defined(HAVE_ST_MSG_CONTROL)
-    family = rsock_getfamily(fptr->fd);
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
+    family = rsock_getfamily(fptr);
     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)) {
@@ -1680,13 +1659,14 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
             }
             ctl_end = (char*)cmh + cmh->cmsg_len;
 	    clen = (ctl_end <= msg_end ? ctl_end : msg_end) - (char*)CMSG_DATA(cmh);
-            ctl = ancdata_new(family, cmh->cmsg_level, cmh->cmsg_type, rb_tainted_str_new((char*)CMSG_DATA(cmh), clen));
+            ctl = ancdata_new(family, cmh->cmsg_level, cmh->cmsg_type, rb_str_new((char*)CMSG_DATA(cmh), clen));
             if (request_scm_rights)
                 make_io_for_unix_rights(ctl, cmh, msg_end);
             else
                 discard_cmsg(cmh, msg_end, (flags & MSG_PEEK) != 0);
             rb_ary_push(ret, ctl);
         }
+        RB_GC_GUARD(ctl_str);
     }
 #endif
 
@@ -1695,89 +1675,28 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
 #endif
 
 #if defined(HAVE_RECVMSG)
-/*
- * call-seq:
- *    basicsocket.recvmsg(maxmesglen=nil, flags=0, maxcontrollen=nil, opts={}) => [mesg, sender_addrinfo, rflags, *controls]
- *
- * recvmsg receives a message using recvmsg(2) system call in blocking manner.
- *
- * _maxmesglen_ is the maximum length of mesg to receive.
- *
- * _flags_ is bitwise OR of MSG_* constants such as Socket::MSG_PEEK.
- *
- * _maxcontrollen_ is the maximum length of controls (ancillary data) to receive.
- *
- * _opts_ is option hash.
- * Currently :scm_rights=>bool is the only option.
- *
- * :scm_rights option specifies that application expects SCM_RIGHTS control message.
- * If the value is nil or false, application don't expects SCM_RIGHTS control message.
- * In this case, recvmsg closes the passed file descriptors immediately.
- * This is the default behavior.
- *
- * If :scm_rights value is neither nil nor false, application expects SCM_RIGHTS control message.
- * In this case, recvmsg creates IO objects for each file descriptors for
- * Socket::AncillaryData#unix_rights method.
- *
- * The return value is 4-elements array.
- *
- * _mesg_ is a string of the received message.
- *
- * _sender_addrinfo_ is a sender socket address for connection-less socket.
- * It is an Addrinfo object.
- * For connection-oriented socket such as TCP, sender_addrinfo is platform dependent.
- *
- * _rflags_ is a flags on the received message which is bitwise OR of MSG_* constants such as Socket::MSG_TRUNC.
- * It will be nil if the system uses 4.3BSD style old recvmsg system call.
- *
- * _controls_ is ancillary data which is an array of Socket::AncillaryData objects such as:
- *
- *   #<Socket::AncillaryData: AF_UNIX SOCKET RIGHTS 7>
- *
- * _maxmesglen_ and _maxcontrollen_ can be nil.
- * In that case, the buffer will be grown until the message is not truncated.
- * Internally, MSG_PEEK is used and MSG_TRUNC/MSG_CTRUNC are checked.
- *
- * recvmsg can be used to implement recv_io as follows:
- *
- *   mesg, sender_sockaddr, rflags, *controls = sock.recvmsg(:scm_rights=>true)
- *   controls.each {|ancdata|
- *     if ancdata.cmsg_is?(:SOCKET, :RIGHTS)
- *       return ancdata.unix_rights[0]
- *     end
- *   }
- *
- */
 VALUE
-rsock_bsock_recvmsg(int argc, VALUE *argv, VALUE sock)
+rsock_bsock_recvmsg(VALUE sock, VALUE dlen, VALUE flags, VALUE clen,
+		    VALUE scm_rights)
 {
-    return bsock_recvmsg_internal(argc, argv, sock, 0);
+    VALUE ex = Qtrue;
+    return bsock_recvmsg_internal(sock, dlen, flags, clen, scm_rights, ex, 0);
 }
 #endif
 
 #if defined(HAVE_RECVMSG)
-/*
- * call-seq:
- *    basicsocket.recvmsg_nonblock(maxdatalen=nil, flags=0, maxcontrollen=nil, opts={}) => [data, sender_addrinfo, rflags, *controls]
- *
- * recvmsg receives a message using recvmsg(2) system call in non-blocking manner.
- *
- * It is similar to BasicSocket#recvmsg
- * but non-blocking flag is set before the system call
- * and it doesn't retry the system call.
- *
- */
 VALUE
-rsock_bsock_recvmsg_nonblock(int argc, VALUE *argv, VALUE sock)
+rsock_bsock_recvmsg_nonblock(VALUE sock, VALUE dlen, VALUE flags, VALUE clen,
+			     VALUE scm_rights, VALUE ex)
 {
-    return bsock_recvmsg_internal(argc, argv, sock, 1);
+    return bsock_recvmsg_internal(sock, dlen, flags, clen, scm_rights, ex, 1);
 }
 #endif
 
 void
 rsock_init_ancdata(void)
 {
-#if defined(HAVE_ST_MSG_CONTROL)
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
     /*
      * Document-class: Socket::AncillaryData
      *
@@ -1811,4 +1730,7 @@ 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 b997043620..fb5beed81a 100644
--- a/ext/socket/basicsocket.c
+++ b/ext/socket/basicsocket.c
@@ -66,9 +66,6 @@ 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;
@@ -80,7 +77,7 @@ bsock_shutdown(int argc, VALUE *argv, VALUE sock)
     }
     GetOpenFile(sock, fptr);
     if (shutdown(fptr->fd, how) == -1)
-	rb_sys_fail(0);
+	rb_sys_fail("shutdown(2)");
 
     return INT2FIX(0);
 }
@@ -100,9 +97,6 @@ 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)) {
@@ -133,9 +127,6 @@ 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);
@@ -167,10 +158,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:
- *   - Fixnum: value is assigned to an int, and a pointer to the int is
+ *   - Integer: value is assigned to an int, and a pointer to the int is
  *     passed, with length of sizeof(int).
  *   - true or false: 1 or 0 (respectively) is assigned to an int, and the
- *     int is passed as for a Fixnum. Note that +false+ must be passed,
+ *     int is passed as for an Integer. 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
@@ -222,9 +213,8 @@ 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->fd);
+    family = rsock_getfamily(fptr);
     level = rsock_level_arg(family, lev);
     option = rsock_optname_arg(family, level, optname);
 
@@ -243,20 +233,17 @@ bsock_setsockopt(int argc, VALUE *argv, VALUE sock)
       default:
 	StringValue(val);
 	v = RSTRING_PTR(val);
-	vlen = RSTRING_LENINT(val);
+	vlen = RSTRING_SOCKLEN(val);
 	break;
     }
 
-#define rb_sys_fail_path(path) rb_sys_fail(NIL_P(path) ? 0 : RSTRING_PTR(path))
-
     rb_io_check_closed(fptr);
     if (setsockopt(fptr->fd, level, option, v, vlen) < 0)
-	rb_sys_fail_path(fptr->pathv);
+        rsock_sys_fail_path("setsockopt(2)", fptr->pathv);
 
     return INT2FIX(0);
 }
 
-#if !defined(__BEOS__)
 /*
  * Document-method: getsockopt
  * call-seq:
@@ -323,22 +310,31 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
     int family;
 
     GetOpenFile(sock, fptr);
-    family = rsock_getfamily(fptr->fd);
+    family = rsock_getfamily(fptr);
     level = rsock_level_arg(family, lev);
     option = rsock_optname_arg(family, level, optname);
     len = 256;
+#ifdef _AIX
+    switch (option) {
+      case SO_DEBUG:
+      case SO_REUSEADDR:
+      case SO_KEEPALIVE:
+      case SO_DONTROUTE:
+      case SO_BROADCAST:
+      case SO_OOBINLINE:
+        /* AIX doesn't set len for boolean options */
+        len = sizeof(int);
+    }
+#endif
     buf = ALLOCA_N(char,len);
 
     rb_io_check_closed(fptr);
 
     if (getsockopt(fptr->fd, level, option, buf, &len) < 0)
-	rb_sys_fail_path(fptr->pathv);
+	rsock_sys_fail_path("getsockopt(2)", fptr->pathv);
 
     return rsock_sockopt_new(family, level, option, rb_str_new(buf, len));
 }
-#else
-#define bsock_getsockopt rb_f_notimplement
-#endif
 
 /*
  * call-seq:
@@ -356,13 +352,15 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
 static VALUE
 bsock_getsockname(VALUE sock)
 {
-    struct sockaddr_storage buf;
+    union_sockaddr buf;
     socklen_t len = (socklen_t)sizeof buf;
+    socklen_t len0 = len;
     rb_io_t *fptr;
 
     GetOpenFile(sock, fptr);
-    if (getsockname(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
+    if (getsockname(fptr->fd, &buf.addr, &len) < 0)
 	rb_sys_fail("getsockname(2)");
+    if (len0 < len) len = len0;
     return rb_str_new((char*)&buf, len);
 }
 
@@ -385,13 +383,15 @@ bsock_getsockname(VALUE sock)
 static VALUE
 bsock_getpeername(VALUE sock)
 {
-    struct sockaddr_storage buf;
+    union_sockaddr buf;
     socklen_t len = (socklen_t)sizeof buf;
+    socklen_t len0 = len;
     rb_io_t *fptr;
 
     GetOpenFile(sock, fptr);
-    if (getpeername(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
+    if (getpeername(fptr->fd, &buf.addr, &len) < 0)
 	rb_sys_fail("getpeername(2)");
+    if (len0 < len) len = len0;
     return rb_str_new((char*)&buf, len);
 }
 
@@ -427,7 +427,7 @@ bsock_getpeereid(VALUE self)
     gid_t egid;
     GetOpenFile(self, fptr);
     if (getpeereid(fptr->fd, &euid, &egid) == -1)
-	rb_sys_fail("getpeereid");
+	rb_sys_fail("getpeereid(3)");
     return rb_assoc_new(UIDT2NUM(euid), GIDT2NUM(egid));
 #elif defined(SO_PEERCRED) /* GNU/Linux */
     rb_io_t *fptr;
@@ -443,7 +443,7 @@ bsock_getpeereid(VALUE self)
     VALUE ret;
     GetOpenFile(self, fptr);
     if (getpeerucred(fptr->fd, &uc) == -1)
-	rb_sys_fail("getpeerucred");
+	rb_sys_fail("getpeerucred(3C)");
     ret = rb_assoc_new(UIDT2NUM(ucred_geteuid(uc)), GIDT2NUM(ucred_getegid(uc)));
     ucred_free(uc);
     return ret;
@@ -473,14 +473,16 @@ bsock_getpeereid(VALUE self)
 static VALUE
 bsock_local_address(VALUE sock)
 {
-    struct sockaddr_storage buf;
+    union_sockaddr buf;
     socklen_t len = (socklen_t)sizeof buf;
+    socklen_t len0 = len;
     rb_io_t *fptr;
 
     GetOpenFile(sock, fptr);
-    if (getsockname(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
+    if (getsockname(fptr->fd, &buf.addr, &len) < 0)
 	rb_sys_fail("getsockname(2)");
-    return rsock_fd_socket_addrinfo(fptr->fd, (struct sockaddr *)&buf, len);
+    if (len0 < len) len = len0;
+    return rsock_fd_socket_addrinfo(fptr->fd, &buf.addr, len);
 }
 
 /*
@@ -505,14 +507,16 @@ bsock_local_address(VALUE sock)
 static VALUE
 bsock_remote_address(VALUE sock)
 {
-    struct sockaddr_storage buf;
+    union_sockaddr buf;
     socklen_t len = (socklen_t)sizeof buf;
+    socklen_t len0 = len;
     rb_io_t *fptr;
 
     GetOpenFile(sock, fptr);
-    if (getpeername(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
+    if (getpeername(fptr->fd, &buf.addr, &len) < 0)
 	rb_sys_fail("getpeername(2)");
-    return rsock_fd_socket_addrinfo(fptr->fd, (struct sockaddr *)&buf, len);
+    if (len0 < len) len = len0;
+    return rsock_fd_socket_addrinfo(fptr->fd, &buf.addr, len);
 }
 
 /*
@@ -538,10 +542,10 @@ rsock_bsock_send(int argc, VALUE *argv, VALUE sock)
     struct rsock_send_arg arg;
     VALUE flags, to;
     rb_io_t *fptr;
-    int n;
+    ssize_t n;
     rb_blocking_function_t *func;
+    const char *funcname;
 
-    rb_secure(4);
     rb_scan_args(argc, argv, "21", &arg.mesg, &flags, &to);
 
     StringValue(arg.mesg);
@@ -549,23 +553,25 @@ rsock_bsock_send(int argc, VALUE *argv, VALUE sock)
 	SockAddrStringValue(to);
 	to = rb_str_new4(to);
 	arg.to = (struct sockaddr *)RSTRING_PTR(to);
-	arg.tolen = (socklen_t)RSTRING_LENINT(to);
+	arg.tolen = RSTRING_SOCKLEN(to);
 	func = rsock_sendto_blocking;
+	funcname = "sendto(2)";
     }
     else {
 	func = rsock_send_blocking;
+	funcname = "send(2)";
     }
     GetOpenFile(sock, fptr);
     arg.fd = fptr->fd;
     arg.flags = NUM2INT(flags);
-    while (rb_thread_fd_writable(arg.fd),
-	   (n = (int)BLOCKING_REGION_FD(func, &arg)) < 0) {
+    while (rsock_maybe_fd_writable(arg.fd),
+	   (n = (ssize_t)BLOCKING_REGION_FD(func, &arg)) < 0) {
 	if (rb_io_wait_writable(arg.fd)) {
 	    continue;
 	}
-	rb_sys_fail("send(2)");
+	rb_sys_fail(funcname);
     }
-    return INT2FIX(n);
+    return SSIZET2NUM(n);
 }
 
 /*
@@ -574,11 +580,15 @@ 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
- *     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"]
+ *   }
+ *   BasicSocket.do_not_reverse_lookup = true
+ *   TCPSocket.open("www.ruby-lang.org", 80) {|sock|
+ *     p sock.do_not_reverse_lookup      #=> true
  *   }
  */
 static VALUE
@@ -596,10 +606,12 @@ bsock_do_not_reverse_lookup(VALUE sock)
  *
  * Sets the do_not_reverse_lookup flag of _basicsocket_.
  *
- *   BasicSocket.do_not_reverse_lookup = false
- *   p TCPSocket.new("127.0.0.1", 80).do_not_reverse_lookup #=> false
- *   BasicSocket.do_not_reverse_lookup = true
- *   p TCPSocket.new("127.0.0.1", 80).do_not_reverse_lookup #=> true
+ *   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"]
+ *   }
  *
  */
 static VALUE
@@ -607,7 +619,6 @@ bsock_do_not_reverse_lookup_set(VALUE sock, VALUE state)
 {
     rb_io_t *fptr;
 
-    rb_secure(4);
     GetOpenFile(sock, fptr);
     if (RTEST(state)) {
 	fptr->mode |= FMODE_NOREVLOOKUP;
@@ -620,8 +631,7 @@ bsock_do_not_reverse_lookup_set(VALUE sock, VALUE state)
 
 /*
  * call-seq:
- *   basicsocket.recv(maxlen) => mesg
- *   basicsocket.recv(maxlen, flags) => mesg
+ *   basicsocket.recv(maxlen[, flags[, outbuf]]) => mesg
  *
  * Receives a message.
  *
@@ -629,6 +639,9 @@ 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"
@@ -643,55 +656,11 @@ bsock_recv(int argc, VALUE *argv, VALUE sock)
     return rsock_s_recvfrom(sock, argc, argv, RECV_RECV);
 }
 
-/*
- * call-seq:
- * 	basicsocket.recv_nonblock(maxlen) => mesg
- * 	basicsocket.recv_nonblock(maxlen, flags) => mesg
- *
- * Receives up to _maxlen_ bytes from +socket+ using recvfrom(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * _flags_ is zero or more of the +MSG_+ options.
- * The result, _mesg_, is the data received.
- *
- * When recvfrom(2) returns 0, Socket#recv_nonblock returns
- * an empty string as data.
- * The meaning depends on the socket: EOF on TCP, empty packet on UDP, etc.
- *
- * === Parameters
- * * +maxlen+ - the number of bytes to receive from the socket
- * * +flags+ - zero or more of the +MSG_+ options
- *
- * === Example
- * 	serv = TCPServer.new("127.0.0.1", 0)
- * 	af, port, host, addr = serv.addr
- * 	c = TCPSocket.new(addr, port)
- * 	s = serv.accept
- * 	c.send "aaa", 0
- * 	begin # emulate blocking recv.
- * 	  p s.recv_nonblock(10) #=> "aaa"
- * 	rescue IO::WaitReadable
- * 	  IO.select([s])
- * 	  retry
- * 	end
- *
- * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
- * to _recv_nonblock_ fails.
- *
- * BasicSocket#recv_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EWOULDBLOCK.
- *
- * If the exception is Errno::EWOULDBLOCK or Errno::AGAIN,
- * it is extended by IO::WaitReadable.
- * So IO::WaitReadable can be used to rescue the exceptions for retrying recv_nonblock.
- *
- * === See
- * * Socket#recvfrom
- */
-
+/* :nodoc: */
 static VALUE
-bsock_recv_nonblock(int argc, VALUE *argv, VALUE sock)
+bsock_recv_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str, VALUE ex)
 {
-    return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_RECV);
+    return rsock_s_recvfrom_nonblock(sock, len, flg, str, ex, RECV_RECV);
 }
 
 /*
@@ -703,7 +672,7 @@ bsock_recv_nonblock(int argc, VALUE *argv, VALUE sock)
  *   BasicSocket.do_not_reverse_lookup  #=> false
  */
 static VALUE
-bsock_do_not_rev_lookup(void)
+bsock_do_not_rev_lookup(VALUE _)
 {
     return rsock_do_not_reverse_lookup?Qtrue:Qfalse;
 }
@@ -727,7 +696,6 @@ bsock_do_not_rev_lookup(void)
 static VALUE
 bsock_do_not_rev_lookup_set(VALUE self, VALUE val)
 {
-    rb_secure(4);
     rsock_do_not_reverse_lookup = RTEST(val);
     return val;
 }
@@ -761,13 +729,29 @@ 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);
 
-    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 */
+    /* for ext/socket/lib/socket.rb use only: */
+    rb_define_private_method(rb_cBasicSocket,
+			     "__recv_nonblock", bsock_recv_nonblock, 4);
+
+#if MSG_DONTWAIT_RELIABLE
+    rb_define_private_method(rb_cBasicSocket,
+			     "__read_nonblock", rsock_read_nonblock, 3);
+    rb_define_private_method(rb_cBasicSocket,
+			     "__write_nonblock", rsock_write_nonblock, 2);
+#endif
+
+    /* 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);
 
 }
diff --git a/ext/socket/constants.c b/ext/socket/constants.c
index 39f985b316..1bbb53b173 100644
--- a/ext/socket/constants.c
+++ b/ext/socket/constants.c
@@ -22,13 +22,12 @@ constant_arg(VALUE arg, int (*str_to_int)(const char*, long, int*), const char *
     int ret;
 
     if (SYMBOL_P(arg)) {
-        arg = rb_sym_to_s(arg);
+        arg = rb_sym2str(arg);
         goto str;
     }
     else if (!NIL_P(tmp = rb_check_string_type(arg))) {
 	arg = tmp;
       str:
-	rb_check_safe_obj(arg);
         ptr = RSTRING_PTR(arg);
         if (str_to_int(ptr, RSTRING_LEN(arg), &ret) == -1)
 	    rb_raise(rb_eSocket, "%s: %s", errmsg, ptr);
@@ -105,7 +104,7 @@ rsock_cmsg_type_arg(int family, int level, VALUE type)
             return constant_arg(type, rsock_scm_optname_to_int, "unknown UNIX control message");
           case IPPROTO_IP:
             return constant_arg(type, rsock_ip_optname_to_int, "unknown IP control message");
-#ifdef INET6
+#ifdef IPPROTO_IPV6
           case IPPROTO_IPV6:
             return constant_arg(type, rsock_ipv6_optname_to_int, "unknown IPv6 control message");
 #endif
diff --git a/ext/socket/depend b/ext/socket/depend
index ab0a5e81b3..e958b3dc5d 100644
--- a/ext/socket/depend
+++ b/ext/socket/depend
@@ -1,25 +1,344 @@
-SOCK_HEADERS = $(srcdir)/rubysocket.h $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
-	$(hdrdir)/ruby/defines.h $(hdrdir)/ruby/io.h \
-	$(srcdir)/addrinfo.h $(srcdir)/sockport.h constdefs.h $(top_srcdir)/internal.h
+srcs: constdefs.h constdefs.c
 
-init.o: init.c $(SOCK_HEADERS)
-constants.o: constants.c constdefs.c $(SOCK_HEADERS)
-basicsocket.o: basicsocket.c $(SOCK_HEADERS)
-socket.o: socket.c $(SOCK_HEADERS)
-ipsocket.o: ipsocket.c $(SOCK_HEADERS)
-tcpsocket.o: tcpsocket.c $(SOCK_HEADERS)
-tcpserver.o: tcpserver.c $(SOCK_HEADERS)
-sockssocket.o: sockssocket.c $(SOCK_HEADERS)
-udpsocket.o: udpsocket.c $(SOCK_HEADERS)
-unixsocket.o: unixsocket.c $(SOCK_HEADERS)
-unixserver.o: unixserver.c $(SOCK_HEADERS)
-option.o: option.c $(SOCK_HEADERS)
-ancdata.o: ancdata.c $(SOCK_HEADERS)
-raddrinfo.o: raddrinfo.c $(SOCK_HEADERS)
-
-getnameinfo.o: getnameinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h
+getnameinfo.o: getnameinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h rubysocket.h
 getaddrinfo.o: getaddrinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h
 
-constdefs.h constdefs.c : $(srcdir)/mkconstants.rb
+constdefs.h: $(srcdir)/mkconstants.rb
 	@echo "generating constant definitions"
 	@$(RUBY) $(srcdir)/mkconstants.rb -H constdefs.h -o constdefs.c
+
+constdefs.c: constdefs.h
+
+# AUTOGENERATED DEPENDENCIES START
+ancdata.o: $(RUBY_EXTCONF_H)
+ancdata.o: $(arch_hdrdir)/ruby/config.h
+ancdata.o: $(hdrdir)/ruby.h
+ancdata.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+basicsocket.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+constants.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+ifaddr.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+init.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+ipsocket.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+option.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+raddrinfo.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+socket.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+sockssocket.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+tcpserver.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+tcpsocket.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+udpsocket.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+unixserver.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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.h
+unixsocket.o: $(hdrdir)/ruby/assert.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/onigmo.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)/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 380b3ecde0..1a67e0013e 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -1,130 +1,128 @@
+# frozen_string_literal: false
 require 'mkmf'
 
-$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
-
-case RUBY_PLATFORM
-when /(ms|bcc)win(32|64)|mingw/
-  test_func = "WSACleanup"
-  have_library("ws2_32", "WSACleanup")
-  $defs << "-DHAVE_SOCKETPAIR"
-when /cygwin/
-  test_func = "socket"
-when /beos/
-  test_func = "socket"
-  have_library("net", "socket")
-when /haiku/
-  test_func = "socket"
-  have_library("network", "socket")
-when /i386-os2_emx/
-  test_func = "socket"
-  have_library("socket", "socket")
-else
-  test_func = "socket"
-  have_library("nsl", "t_open")
-  have_library("socket", "socket")
-end
-
-unless $mswin or $bccwin or $mingw
-  headers = %w<sys/types.h netdb.h string.h sys/socket.h netinet/in.h>
-end
-if /solaris/ =~ RUBY_PLATFORM and !try_compile("")
-  # bug of gcc 3.0 on Solaris 8 ?
-  headers << "sys/feature_tests.h"
-end
-if have_header("arpa/inet.h")
-  headers << "arpa/inet.h"
-end
-
-ipv6 = false
-default_ipv6 = /mswin|cygwin|beos|haiku/ !~ RUBY_PLATFORM
-if enable_config("ipv6", default_ipv6)
-  if checking_for("ipv6") {try_link(<<EOF)}
+AF_INET6_SOCKET_CREATION_TEST = <<EOF
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/socket.h>
 #endif
 int
-main()
+main(void)
 {
   socket(AF_INET6, SOCK_STREAM, 0);
+  return 0;
 }
 EOF
-    $defs << "-DENABLE_IPV6" << "-DINET6"
-    ipv6 = true
-  end
-end
-
-if ipv6
-  if $mingw
-    $CPPFLAGS << " -D_WIN32_WINNT=0x501"
-  end
-  ipv6lib = nil
-  class << (fmt = "unknown")
-    def %(s) s || self end
-  end
-  idirs, ldirs = dir_config("inet6", %w[/usr/inet6 /usr/local/v6].find {|d| File.directory?(d)})
-  checking_for("ipv6 type", fmt) do
-    if have_macro("IPV6_INRIA_VERSION", "netinet/in.h")
-      "inria"
-    elsif have_macro("__KAME__", "netinet/in.h")
-      have_library(ipv6lib = "inet6")
-      "kame"
-    elsif have_macro("_TOSHIBA_INET6", "sys/param.h")
-      have_library(ipv6lib = "inet6") and "toshiba"
-    elsif have_macro("__V6D__", "sys/v6config.h")
-      have_library(ipv6lib = "v6") and "v6d"
-    elsif have_macro("_ZETA_MINAMI_INET6", "sys/param.h")
-      have_library(ipv6lib = "inet6") and "zeta"
-    elsif ipv6lib = with_config("ipv6-lib")
-      warn <<EOS
---with-ipv6-lib and --with-ipv6-libdir option will be obsolete, use
---with-inet6lib and --with-inet6-{include,lib} options instead.
-EOS
-      find_library(ipv6lib, nil, with_config("ipv6-libdir", ldirs)) and
-        ipv6lib
-    elsif have_library("inet6")
-      "inet6"
-    end
-  end or not ipv6lib or abort <<EOS
 
-Fatal: no #{ipv6lib} library found.  cannot continue.
-You need to fetch lib#{ipv6lib}.a from appropriate
-ipv6 kit and compile beforehand.
-EOS
-end
+GETADDRINFO_GETNAMEINFO_TEST = <<EOF
+#include <stdlib.h>
 
-if have_struct_member("struct sockaddr_in", "sin_len", headers)
-  $defs[-1] = "-DHAVE_SIN_LEN"
-end
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
 
-#   doug's fix, NOW add -Dss_family... only if required!
-doug = proc {have_struct_member("struct sockaddr_storage", "ss_family", headers)}
-if (doug[] or
-    with_cppflags($CPPFLAGS + " -Dss_family=__ss_family", &doug))
-  $defs[-1] = "-DHAVE_SOCKADDR_STORAGE"
-  doug = proc {have_struct_member("struct sockaddr_storage", "ss_len", headers)}
-  doug[] or with_cppflags($CPPFLAGS + " -Dss_len=__ss_len", &doug)
-end
+#ifndef AF_LOCAL
+#define AF_LOCAL AF_UNIX
+#endif
 
-if have_struct_member("struct sockaddr", "sa_len", headers)
-  $defs[-1] = "-DHAVE_SA_LEN "
-end
+int
+main(void)
+{
+  int passive, gaierr, inet4 = 0, inet6 = 0;
+  struct addrinfo hints, *ai, *aitop;
+  char straddr[INET6_ADDRSTRLEN], strport[16];
+#ifdef _WIN32
+  WSADATA retdata;
 
-have_header("netinet/tcp.h") if /cygwin/ !~ RUBY_PLATFORM # for cygwin 1.1.5
-have_header("netinet/udp.h")
+  WSAStartup(MAKEWORD(2, 0), &retdata);
+#endif
 
-if !have_macro("IPPROTO_IPV6", headers) && have_const("IPPROTO_IPV6", headers)
-  IO.read(File.join(File.dirname(__FILE__), "mkconstants.rb")).sub(/\A.*^__END__$/m, '').split(/\r?\n/).grep(/\AIPPROTO_\w*/){$&}.each {|name|
-    have_const(name, headers) unless $defs.include?("-DHAVE_CONST_#{name.upcase}")
+  for (passive = 0; passive <= 1; passive++) {
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_protocol = IPPROTO_TCP;
+    hints.ai_flags = passive ? AI_PASSIVE : 0;
+    hints.ai_socktype = SOCK_STREAM;
+    if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
+      (void)gai_strerror(gaierr);
+      goto bad;
+    }
+    for (ai = aitop; ai; ai = ai->ai_next) {
+      if (ai->ai_family == AF_LOCAL) continue;
+      if (ai->ai_addr == NULL)
+        goto bad;
+#if defined(_AIX)
+      if (ai->ai_family == AF_INET6 && passive) {
+        inet6++;
+        continue;
+      }
+      ai->ai_addr->sa_len = ai->ai_addrlen;
+      ai->ai_addr->sa_family = ai->ai_family;
+#endif
+      if (ai->ai_addrlen == 0 ||
+          getnameinfo(ai->ai_addr, ai->ai_addrlen,
+                      straddr, sizeof(straddr), strport, sizeof(strport),
+                      NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
+        goto bad;
+      }
+      if (strcmp(strport, "54321") != 0) {
+        goto bad;
+      }
+      switch (ai->ai_family) {
+      case AF_INET:
+        if (passive) {
+          if (strcmp(straddr, "0.0.0.0") != 0) {
+            goto bad;
+          }
+        } else {
+          if (strcmp(straddr, "127.0.0.1") != 0) {
+            goto bad;
+          }
+        }
+        inet4++;
+        break;
+      case AF_INET6:
+        if (passive) {
+          if (strcmp(straddr, "::") != 0) {
+            goto bad;
+          }
+        } else {
+          if (strcmp(straddr, "::1") != 0) {
+            goto bad;
+          }
+        }
+        inet6++;
+        break;
+      case AF_UNSPEC:
+        goto bad;
+        break;
+      default:
+        /* another family support? */
+        break;
+      }
+    }
   }
-end
 
-if have_func("sendmsg") | have_func("recvmsg")
-  have_struct_member('struct msghdr', 'msg_control', ['sys/types.h', 'sys/socket.h'])
-  have_struct_member('struct msghdr', 'msg_accrights', ['sys/types.h', 'sys/socket.h'])
-end
+  if (!(inet4 == 0 || inet4 == 2))
+    goto bad;
+  if (!(inet6 == 0 || inet6 == 2))
+    goto bad;
 
-if checking_for("recvmsg() with MSG_PEEK allocate file descriptors") {try_run(cpp_include(headers) + <<'EOF')}
+  if (aitop)
+    freeaddrinfo(aitop);
+  return EXIT_SUCCESS;
+
+ bad:
+  if (aitop)
+    freeaddrinfo(aitop);
+  return EXIT_FAILURE;
+}
+EOF
+
+RECVMSG_WITH_MSG_PEEK_ALLOCATE_FD_TEST = <<'EOF'
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -244,147 +242,222 @@ int main(int argc, char *argv[])
     return EXIT_SUCCESS;
 }
 EOF
-  $defs << "-DFD_PASSING_WORK_WITH_RECVMSG_MSG_PEEK"
+
+def test_recvmsg_with_msg_peek_creates_fds(headers)
+  case RUBY_PLATFORM
+  when /linux/
+    # Linux 2.6.38 allocate fds by recvmsg with MSG_PEEK.
+    close_fds = true
+  when /bsd|darwin/
+    # FreeBSD 8.2.0, NetBSD 5 and MacOS X Snow Leopard doesn't
+    # allocate fds by recvmsg with MSG_PEEK.
+    # [ruby-dev:44189]
+    # http://bugs.ruby-lang.org/issues/5075
+    close_fds = false
+  when /cygwin/
+    # Cygwin doesn't support fd passing.
+    # http://cygwin.com/ml/cygwin/2003-09/msg01808.html
+    close_fds = false
+  else
+    close_fds = nil
+  end
+  if !CROSS_COMPILING
+    if checking_for("recvmsg() with MSG_PEEK allocate file descriptors") {
+        try_run(cpp_include(headers) + RECVMSG_WITH_MSG_PEEK_ALLOCATE_FD_TEST)
+       }
+      if close_fds == false
+        warn "unexpected fd-passing recvmsg() with MSG_PEEK behavor on #{RUBY_PLATFORM}: fd allocation unexpected."
+      elsif close_fds == nil
+        puts "info: #{RUBY_PLATFORM} recvmsg() with MSG_PEEK allocates fds on fd-passing."
+      end
+      close_fds = true
+    else
+      if close_fds == true
+        warn "unexpected fd-passing recvmsg() with MSG_PEEK behavor on #{RUBY_PLATFORM}: fd allocation expected."
+      elsif close_fds == nil
+        puts "info: #{RUBY_PLATFORM}: recvmsg() with MSG_PEEK doesn't allocates fds on fd-passing."
+      end
+      close_fds = false
+    end
+  end
+  if close_fds == nil
+    abort <<EOS
+Fatal: cannot test fd-passing recvmsg() with MSG_PEEK behavor
+because cross-compilation for #{RUBY_PLATFORM}.
+If recvmsg() with MSG_PEEK allocates fds on fd passing:
+--enable-close-fds-by-recvmsg-with-peek
+If recvmsg() with MSG_PEEK doesn't allocate fds on fd passing:
+--disable-close-fds-by-recvmsg-with-peek
+EOS
+  end
+  close_fds
 end
 
-getaddr_info_ok = (enable_config("wide-getaddrinfo") && :wide) ||
-  (checking_for("wide getaddrinfo") {try_run(<<EOF)} && :os)
-#{cpp_include(headers)}
-#include <stdlib.h>
+$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
 
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
+if /darwin/ =~ RUBY_PLATFORM
+  # For IPv6 extension header access on OS X 10.7+ [Bug #8517]
+  $CFLAGS << " -D__APPLE_USE_RFC_3542"
+end
 
-#ifndef AF_LOCAL
-#define AF_LOCAL AF_UNIX
-#endif
+headers = []
+unless $mswin or $mingw
+  headers = %w<sys/types.h netdb.h string.h sys/socket.h netinet/in.h>
+end
 
-int
-main()
-{
-  int passive, gaierr, inet4 = 0, inet6 = 0;
-  struct addrinfo hints, *ai, *aitop;
-  char straddr[INET6_ADDRSTRLEN], strport[16];
-#ifdef _WIN32
-  WSADATA retdata;
+%w[
+  sys/uio.h
+  xti.h
+  netinet/in_systm.h
+  netinet/tcp.h
+  netinet/tcp_fsm.h
+  netinet/udp.h
+  arpa/inet.h
+  netpacket/packet.h
+  net/ethernet.h
+  sys/un.h
+  ifaddrs.h
+  sys/ioctl.h
+  sys/sockio.h
+  net/if.h
+  sys/param.h
+  sys/ucred.h
+  ucred.h
+  net/if_dl.h
+  arpa/nameser.h
+  resolv.h
+].each {|h|
+  if have_header(h, headers)
+    headers << h
+  end
+}
 
-  WSAStartup(MAKEWORD(2, 0), &retdata);
-#endif
+have_struct_member("struct sockaddr", "sa_len", headers) # 4.4BSD
+have_struct_member("struct sockaddr_in", "sin_len", headers) # 4.4BSD
+have_struct_member("struct sockaddr_in6", "sin6_len", headers) # 4.4BSD
 
-  for (passive = 0; passive <= 1; passive++) {
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_protocol = IPPROTO_TCP;
-    hints.ai_flags = passive ? AI_PASSIVE : 0;
-    hints.ai_socktype = SOCK_STREAM;
-    if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
-      (void)gai_strerror(gaierr);
-      goto bad;
-    }
-    for (ai = aitop; ai; ai = ai->ai_next) {
-      if (ai->ai_family == AF_LOCAL) continue;
-      if (ai->ai_addr == NULL)
-        goto bad;
-#if defined(_AIX)
-      if (ai->ai_family == AF_INET6 && passive) {
-        inet6++;
-        continue;
-      }
-      ai->ai_addr->sa_len = ai->ai_addrlen;
-      ai->ai_addr->sa_family = ai->ai_family;
-#endif
-      if (ai->ai_addrlen == 0 ||
-          getnameinfo(ai->ai_addr, ai->ai_addrlen,
-                      straddr, sizeof(straddr), strport, sizeof(strport),
-                      NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
-        goto bad;
-      }
-      if (strcmp(strport, "54321") != 0) {
-        goto bad;
-      }
-      switch (ai->ai_family) {
-      case AF_INET:
-        if (passive) {
-          if (strcmp(straddr, "0.0.0.0") != 0) {
-            goto bad;
-          }
-        } else {
-          if (strcmp(straddr, "127.0.0.1") != 0) {
-            goto bad;
-          }
-        }
-        inet4++;
-        break;
-      case AF_INET6:
-        if (passive) {
-          if (strcmp(straddr, "::") != 0) {
-            goto bad;
-          }
-        } else {
-          if (strcmp(straddr, "::1") != 0) {
-            goto bad;
-          }
-        }
-        inet6++;
-        break;
-      case AF_UNSPEC:
-        goto bad;
-        break;
-      default:
-        /* another family support? */
-        break;
-      }
-    }
-  }
+if have_type("struct sockaddr_un", headers) # POSIX
+  have_struct_member("struct sockaddr_un", "sun_len", headers) # 4.4BSD
+end
 
-  if (!(inet4 == 0 || inet4 == 2))
-    goto bad;
-  if (!(inet6 == 0 || inet6 == 2))
-    goto bad;
+have_type("struct sockaddr_dl", headers) # AF_LINK address.  4.4BSD since Net2
 
-  if (aitop)
-    freeaddrinfo(aitop);
-  exit(EXIT_SUCCESS);
+have_type("struct sockaddr_storage", headers)
 
- bad:
-  if (aitop)
-    freeaddrinfo(aitop);
-  exit(EXIT_FAILURE);
+have_type("struct addrinfo", headers)
+
+if have_type("socklen_t", headers)
+  if try_static_assert("sizeof(socklen_t) >= sizeof(long)", headers)
+    $defs << "-DRSTRING_SOCKLEN=(socklen_t)RSTRING_LEN"
+  end
+end
+
+have_type("struct in_pktinfo", headers) {|src|
+  src.sub(%r'^/\*top\*/', '\&'"\n#if defined(IPPROTO_IP) && defined(IP_PKTINFO)") <<
+  "#else\n" << "#error\n" << ">>>>>> no in_pktinfo <<<<<<\n" << "#endif\n"
+} and have_struct_member("struct in_pktinfo", "ipi_spec_dst", headers)
+have_type("struct in6_pktinfo", headers) {|src|
+  src.sub(%r'^/\*top\*/', '\&'"\n#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO)") <<
+  "#else\n" << "#error\n" << ">>>>>> no in6_pktinfo <<<<<<\n" << "#endif\n"
 }
-EOF
-if ipv6 and not getaddr_info_ok
-  abort <<EOS
 
-Fatal: --enable-ipv6 is specified, and your OS seems to support IPv6 feature.
-But your getaddrinfo() and getnameinfo() are appeared to be broken.  Sorry,
-you cannot compile IPv6 socket classes with broken these functions.
-You can try --enable-wide-getaddrinfo.
-EOS
+have_type("struct sockcred", headers)
+have_type("struct cmsgcred", headers)
+
+have_type("struct ip_mreq", headers) # 4.4BSD
+have_type("struct ip_mreqn", headers) # Linux 2.4
+have_type("struct ipv6_mreq", headers) # RFC 3493
+
+have_msg_control = nil
+have_msg_control = have_struct_member('struct msghdr', 'msg_control', headers) unless $mswin or $mingw
+have_struct_member('struct msghdr', 'msg_accrights', headers)
+
+if have_type("struct tcp_info", headers)
+  have_const("TCP_ESTABLISHED", headers)
+  have_const("TCP_SYN_SENT", headers)
+  have_const("TCP_SYN_RECV", headers)
+  have_const("TCP_FIN_WAIT1", headers)
+  have_const("TCP_FIN_WAIT2", headers)
+  have_const("TCP_TIME_WAIT", headers)
+  have_const("TCP_CLOSE", headers)
+  have_const("TCP_CLOSE_WAIT", headers)
+  have_const("TCP_LAST_ACK", 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_retransmits', headers)
+  have_struct_member('struct tcp_info', 'tcpi_probes', headers)
+  have_struct_member('struct tcp_info', 'tcpi_backoff', headers)
+  have_struct_member('struct tcp_info', 'tcpi_options', headers)
+  have_struct_member('struct tcp_info', 'tcpi_snd_wscale', headers)
+  have_struct_member('struct tcp_info', 'tcpi_rcv_wscale', headers)
+  have_struct_member('struct tcp_info', 'tcpi_rto', headers)
+  have_struct_member('struct tcp_info', 'tcpi_ato', headers)
+  have_struct_member('struct tcp_info', 'tcpi_snd_mss', headers)
+  have_struct_member('struct tcp_info', 'tcpi_rcv_mss', headers)
+  have_struct_member('struct tcp_info', 'tcpi_unacked', headers)
+  have_struct_member('struct tcp_info', 'tcpi_sacked', headers)
+  have_struct_member('struct tcp_info', 'tcpi_lost', headers)
+  have_struct_member('struct tcp_info', 'tcpi_retrans', headers)
+  have_struct_member('struct tcp_info', 'tcpi_fackets', headers)
+  have_struct_member('struct tcp_info', 'tcpi_last_data_sent', headers)
+  have_struct_member('struct tcp_info', 'tcpi_last_ack_sent', headers)
+  have_struct_member('struct tcp_info', 'tcpi_last_data_recv', headers)
+  have_struct_member('struct tcp_info', 'tcpi_last_ack_recv', headers)
+  have_struct_member('struct tcp_info', 'tcpi_pmtu', headers)
+  have_struct_member('struct tcp_info', 'tcpi_rcv_ssthresh', headers)
+  have_struct_member('struct tcp_info', 'tcpi_rtt', headers)
+  have_struct_member('struct tcp_info', 'tcpi_rttvar', headers)
+  have_struct_member('struct tcp_info', 'tcpi_snd_ssthresh', headers)
+  have_struct_member('struct tcp_info', 'tcpi_snd_cwnd', headers)
+  have_struct_member('struct tcp_info', 'tcpi_advmss', headers)
+  have_struct_member('struct tcp_info', 'tcpi_reordering', headers)
+  have_struct_member('struct tcp_info', 'tcpi_rcv_rtt', headers)
+  have_struct_member('struct tcp_info', 'tcpi_rcv_space', headers)
+  have_struct_member('struct tcp_info', 'tcpi_total_retrans', headers)
+
+  # FreeBSD extension
+  have_struct_member('struct tcp_info', 'tcpi_snd_wnd', headers)
+  have_struct_member('struct tcp_info', 'tcpi_snd_bwnd', headers)
+  have_struct_member('struct tcp_info', 'tcpi_snd_nxt', headers)
+  have_struct_member('struct tcp_info', 'tcpi_rcv_nxt', headers)
+  have_struct_member('struct tcp_info', 'tcpi_toe_tid', headers)
+  have_struct_member('struct tcp_info', 'tcpi_snd_rexmitpack', headers)
+  have_struct_member('struct tcp_info', 'tcpi_rcv_ooopack', headers)
+  have_struct_member('struct tcp_info', 'tcpi_snd_zerowin', headers)
 end
 
-case with_config("lookup-order-hack", "UNSPEC")
-when "INET"
-  $defs << "-DLOOKUP_ORDER_HACK_INET"
-when "INET6"
-  $defs << "-DLOOKUP_ORDER_HACK_INET6"
-when "UNSPEC"
-  # nothing special
+case RUBY_PLATFORM
+when /mswin(32|64)|mingw/
+  test_func = "WSACleanup"
+  have_library("iphlpapi")
+  have_library("ws2_32", "WSACleanup", headers)
+when /cygwin/
+  test_func = "socket(0,0,0)"
+when /haiku/
+  test_func = "socket(0,0,0)"
+  have_library("network", "socket(0,0,0)", headers)
 else
-  abort <<EOS
-
-Fatal: invalid value for --with-lookup-order-hack (expected INET, INET6 or UNSPEC)
-EOS
+  test_func = "socket(0,0,0)"
+  have_library("nsl", 't_open("", 0, (struct t_info *)NULL)', headers) # SunOS
+  have_library("socket", "socket(0,0,0)", headers) # SunOS
+  have_library("anl", 'getaddrinfo_a', headers)
 end
 
-have_type("struct addrinfo", headers)
-have_func("freehostent")
-have_func("freeaddrinfo")
-if /haiku/ !~ RUBY_PLATFORM and have_func("gai_strerror")
-  if checking_for("gai_strerror() returns const pointer") {!try_compile(<<EOF)}
+if have_func(test_func, headers)
+
+  have_func("sendmsg(0, (struct msghdr *)NULL, 0)", headers) # POSIX
+  have_recvmsg = have_func("recvmsg(0, (struct msghdr *)NULL, 0)", headers) # POSIX
+
+  have_func("freehostent((struct hostent *)NULL)", headers) # RFC 2553
+  have_func("freeaddrinfo((struct addrinfo *)NULL)", headers) # RFC 2553
+
+  if /haiku/ !~ RUBY_PLATFORM and
+     have_func("gai_strerror(0)", headers) # POSIX
+    if checking_for("gai_strerror() returns const pointer") {!try_compile(<<EOF)}
 #{cpp_include(headers)}
 #include <stdlib.h>
 void
@@ -393,103 +466,216 @@ conftest_gai_strerror_is_const()
     *gai_strerror(0) = 0;
 }
 EOF
-    $defs << "-DGAI_STRERROR_CONST"
+      $defs << "-DGAI_STRERROR_CONST"
+    end
   end
-end
 
-$objs = [
-  "init.#{$OBJEXT}",
-  "constants.#{$OBJEXT}",
-  "basicsocket.#{$OBJEXT}",
-  "socket.#{$OBJEXT}",
-  "ipsocket.#{$OBJEXT}",
-  "tcpsocket.#{$OBJEXT}",
-  "tcpserver.#{$OBJEXT}",
-  "sockssocket.#{$OBJEXT}",
-  "udpsocket.#{$OBJEXT}",
-  "unixsocket.#{$OBJEXT}",
-  "unixserver.#{$OBJEXT}",
-  "option.#{$OBJEXT}",
-  "ancdata.#{$OBJEXT}",
-  "raddrinfo.#{$OBJEXT}"
-]
-
-if getaddr_info_ok == :wide or
-    !have_func("getnameinfo", headers) or !have_func("getaddrinfo", headers)
-  if have_struct_member("struct in6_addr", "s6_addr8", headers)
-    $defs[-1] = "s6_addr=s6_addr8"
+  have_func("accept4", headers)
+
+  have_func('inet_ntop(0, (const void *)0, (char *)0, 0)', headers) or
+    have_func("inet_ntoa(*(struct in_addr *)NULL)", headers)
+  have_func('inet_pton(0, "", (void *)0)', headers) or
+    have_func('inet_aton("", (struct in_addr *)0)', headers)
+  have_func('getservbyport(0, "")', headers)
+  have_func("getifaddrs((struct ifaddrs **)NULL)", headers)
+  have_struct_member("struct if_data", "ifi_vhid", headers) # FreeBSD
+
+  have_func("getpeereid", headers)
+
+  have_func("getpeerucred(0, (ucred_t **)NULL)", headers) # SunOS
+
+  have_func_decl = proc do |name, headers|
+    if !checking_for("declaration of #{name}()") {!%w[int void].all? {|ret| try_compile(<<EOF)}}
+#{cpp_include(headers)}
+#{ret} #{name}(void);
+EOF
+      $defs << "-DNEED_#{name.tr_cpp}_DECL"
+    end
   end
-  if ipv6 == "kame" && have_struct_member("struct in6_addr", "s6_addr32", headers)
-    $defs[-1] = "-DFAITH"
+  if have_func('if_indextoname(0, "")', headers)
+    have_func_decl["if_indextoname"]
+  end
+  if have_func('if_nametoindex("")', headers)
+    have_func_decl["if_nametoindex"]
   end
-  $CPPFLAGS="-I. "+$CPPFLAGS
-  $objs += ["getaddrinfo.#{$OBJEXT}"]
-  $objs += ["getnameinfo.#{$OBJEXT}"]
-  $defs << "-DGETADDRINFO_EMU"
-end
 
-have_func("inet_ntop") or have_func("inet_ntoa")
-have_func("inet_pton") or have_func("inet_aton")
-have_func("getservbyport")
-have_header("arpa/nameser.h")
-have_header("resolv.h")
+  have_func("hsterror", headers)
+  have_func('getipnodebyname("", 0, 0, (int *)0)', headers) # RFC 2553
+  have_func('gethostbyname2("", 0)', headers) # RFC 2133
+  have_func("socketpair(0, 0, 0, 0)", headers)
+  unless have_func("gethostname((char *)0, 0)", headers)
+    have_func("uname((struct utsname *)NULL)", headers)
+  end
+  have_func("getaddrinfo_a", headers)
+
+  ipv6 = false
+  default_ipv6 = /haiku/ !~ RUBY_PLATFORM
+  if enable_config("ipv6", default_ipv6)
+    if checking_for("ipv6") {try_link(AF_INET6_SOCKET_CREATION_TEST)}
+      $defs << "-DENABLE_IPV6" << "-DINET6"
+      ipv6 = true
+    end
+  end
 
-have_header("ifaddrs.h")
-have_func("getifaddrs")
-have_header("sys/ioctl.h")
-have_header("sys/sockio.h")
-have_header("net/if.h", headers)
+  if ipv6
+    if $mingw
+      $CPPFLAGS << " -D_WIN32_WINNT=0x501" unless $CPPFLAGS.include?("_WIN32_WINNT")
+    end
+    ipv6lib = nil
+    class << (fmt = "unknown")
+      def %(s) s || self end
+    end
+    idirs, ldirs = dir_config("inet6", %w[/usr/inet6 /usr/local/v6].find {|d| File.directory?(d)})
+    checking_for("ipv6 type", fmt) do
+      if have_macro("IPV6_INRIA_VERSION", "netinet/in.h")
+        "inria"
+      elsif have_macro("__KAME__", "netinet/in.h")
+        have_library(ipv6lib = "inet6")
+        "kame"
+      elsif have_macro("_TOSHIBA_INET6", "sys/param.h")
+        have_library(ipv6lib = "inet6") and "toshiba"
+      elsif have_macro("__V6D__", "sys/v6config.h")
+        have_library(ipv6lib = "v6") and "v6d"
+      elsif have_macro("_ZETA_MINAMI_INET6", "sys/param.h")
+        have_library(ipv6lib = "inet6") and "zeta"
+      elsif have_library("inet6")
+        "inet6"
+      end
+    end or not ipv6lib or abort <<EOS
 
-have_header("sys/param.h", headers)
-have_header("sys/ucred.h", headers)
+Fatal: no #{ipv6lib} library found.  cannot continue.
+You need to fetch lib#{ipv6lib}.a from appropriate
+ipv6 kit and compile beforehand.
+EOS
+  end
 
-unless have_type("socklen_t", headers)
-  $defs << "-Dsocklen_t=int"
-end
+  if !have_macro("IPPROTO_IPV6", headers) && have_const("IPPROTO_IPV6", headers)
+    IO.read(File.join(File.dirname(__FILE__), "mkconstants.rb")).sub(/\A.*^__END__$/m, '').split(/\r?\n/).grep(/\AIPPROTO_\w*/){$&}.each {|name|
+      have_const(name, headers) unless $defs.include?("-DHAVE_CONST_#{name.upcase}")
+    }
+  end
 
-have_header("sys/un.h")
-have_header("sys/uio.h")
-have_type("struct in_pktinfo", headers) {|src|
-  src.sub(%r'^/\*top\*/', '\1'"\n#if defined(IPPROTO_IP) && defined(IP_PKTINFO)") <<
-  "#else\n" << "#error\n" << ">>>>>> no in_pktinfo <<<<<<\n" << "#endif\n"
-} and have_struct_member("struct in_pktinfo", "ipi_spec_dst", headers)
-have_type("struct in6_pktinfo", headers) {|src|
-  src.sub(%r'^/\*top\*/', '\1'"\n#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO)") <<
-  "#else\n" << "#error\n" << ">>>>>> no in6_pktinfo <<<<<<\n" << "#endif\n"
-}
+  if enable_config("close-fds-by-recvmsg-with-peek") {
+      have_msg_control && have_recvmsg &&
+      have_const('AF_UNIX', headers) && have_const('SCM_RIGHTS', headers) &&
+      test_recvmsg_with_msg_peek_creates_fds(headers)
+     }
+    $defs << "-DFD_PASSING_WORK_WITH_RECVMSG_MSG_PEEK"
+  end
 
-have_type("struct sockcred", headers)
-have_type("struct cmsgcred", headers)
+  case enable_config("wide-getaddrinfo")
+  when true
+    getaddr_info_ok = :wide
+  when nil, false
+    getaddr_info_ok = (:wide if getaddr_info_ok.nil?)
+    if have_func("getnameinfo", headers) and have_func("getaddrinfo", headers)
+      if CROSS_COMPILING ||
+         $mingw || $mswin ||
+         checking_for("system getaddrinfo working") {
+           try_run(cpp_include(headers) + GETADDRINFO_GETNAMEINFO_TEST)
+         }
+        getaddr_info_ok = :os
+      end
+    end
+  else
+    raise "unexpected enable_config() value"
+  end
+
+  if ipv6 and not getaddr_info_ok
+    abort <<EOS
 
-have_func("getpeereid")
+Fatal: --enable-ipv6 is specified, and your OS seems to support IPv6 feature.
+But your getaddrinfo() and getnameinfo() are appeared to be broken.  Sorry,
+you cannot compile IPv6 socket classes with broken these functions.
+You can try --enable-wide-getaddrinfo.
+EOS
+  end
 
-have_header("ucred.h", headers)
-have_func("getpeerucred")
+  case with_config("lookup-order-hack", "UNSPEC")
+  when "INET"
+    $defs << "-DLOOKUP_ORDER_HACK_INET"
+  when "INET6"
+    $defs << "-DLOOKUP_ORDER_HACK_INET6"
+  when "UNSPEC"
+    # nothing special
+  else
+    abort <<EOS
 
-have_func("if_indextoname")
+Fatal: invalid value for --with-lookup-order-hack (expected INET, INET6 or UNSPEC)
+EOS
+  end
 
-have_type("struct ip_mreq", headers) # 4.4BSD
-have_type("struct ip_mreqn", headers) # Linux 2.4
-have_type("struct ipv6_mreq", headers) # RFC 3493
+  $objs = [
+    "init.#{$OBJEXT}",
+    "constants.#{$OBJEXT}",
+    "basicsocket.#{$OBJEXT}",
+    "socket.#{$OBJEXT}",
+    "ipsocket.#{$OBJEXT}",
+    "tcpsocket.#{$OBJEXT}",
+    "tcpserver.#{$OBJEXT}",
+    "sockssocket.#{$OBJEXT}",
+    "udpsocket.#{$OBJEXT}",
+    "unixsocket.#{$OBJEXT}",
+    "unixserver.#{$OBJEXT}",
+    "option.#{$OBJEXT}",
+    "ancdata.#{$OBJEXT}",
+    "raddrinfo.#{$OBJEXT}",
+    "ifaddr.#{$OBJEXT}"
+  ]
+
+  if getaddr_info_ok == :wide
+    if !have_type("struct in6_addr", headers) and have_type("struct in_addr6", headers)
+      $defs.pop(2)
+      $defs << "-Din_addr6=in6_addr"
+    end
+    if have_struct_member("struct in6_addr", "s6_addr8", headers)
+      $defs[-1] = "-Ds6_addr=s6_addr8"
+    end
+    if ipv6 == "kame" && have_struct_member("struct in6_addr", "s6_addr32", headers)
+      $defs[-1] = "-DFAITH"
+    end
+    $CPPFLAGS="-I. "+$CPPFLAGS
+    $objs += ["getaddrinfo.#{$OBJEXT}"]
+    $objs += ["getnameinfo.#{$OBJEXT}"]
+    $defs << "-DGETADDRINFO_EMU"
+  end
 
-# workaround for recent Windows SDK
-$defs << "-DIPPROTO_IPV6=IPPROTO_IPV6" if $defs.include?("-DHAVE_CONST_IPPROTO_IPV6") && !have_macro("IPPROTO_IPV6")
+  # workaround for recent Windows SDK
+  $defs << "-DIPPROTO_IPV6=IPPROTO_IPV6" if $defs.include?("-DHAVE_CONST_IPPROTO_IPV6") && !have_macro("IPPROTO_IPV6")
 
-$distcleanfiles << "constants.h" << "constdefs.*"
+  $distcleanfiles << "constants.h" << "constdefs.*"
 
-if have_func(test_func)
-  have_func("hsterror")
-  have_func("getipnodebyname") or have_func("gethostbyname2")
-  have_func("socketpair") unless $defs.include?("-DHAVE_SOCKETPAIR")
-  unless have_func("gethostname")
-    have_func("uname")
-  end
   if enable_config("socks", ENV["SOCKS_SERVER"])
     if have_library("socks5", "SOCKSinit")
       $defs << "-DSOCKS5" << "-DSOCKS"
-    elsif have_library("socks", "Rconnect")
+    elsif have_library("socksd", "Rconnect") || have_library("socks", "Rconnect")
       $defs << "-DSOCKS"
     end
   end
+
+  hdr = "netinet6/in6.h"
+  if /darwin/ =~ RUBY_PLATFORM and !try_compile(<<"SRC", nil, :werror=>true)
+#include <netinet/in.h>
+int t(struct in6_addr *addr) {return IN6_IS_ADDR_UNSPECIFIED(addr);}
+SRC
+    print "fixing apple's netinet6/in6.h ..."; $stdout.flush
+    in6 = File.read("/usr/include/#{hdr}")
+    if in6.gsub!(/\*\(const\s+__uint32_t\s+\*\)\(const\s+void\s+\*\)\(&(\(\w+\))->s6_addr\[(\d+)\]\)/) do
+        i, r = $2.to_i.divmod(4)
+        if r.zero?
+          "#$1->__u6_addr.__u6_addr32[#{i}]"
+        else
+          $&
+        end
+      end
+      FileUtils.mkdir_p(File.dirname(hdr))
+      open(hdr, "w") {|f| f.write(in6)}
+      $distcleanfiles << hdr
+      $distcleandirs << File.dirname(hdr)
+      puts "done"
+    else
+      puts "not needed"
+    end
+  end
   create_makefile("socket")
 end
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index aa966b3c52..ce6dc40478 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -45,11 +45,7 @@
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/param.h>
-#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
-# include <net/socket.h>
-#else
-# include <sys/socket.h>
-#endif
+#include <sys/socket.h>
 #include <netinet/in.h>
 #if defined(HAVE_ARPA_INET_H)
 #include <arpa/inet.h>
@@ -66,6 +62,9 @@
 #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>
@@ -80,6 +79,10 @@
 #include <socks.h>
 #endif
 
+#ifndef HAVE_TYPE_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
 #include "addrinfo.h"
 #include "sockport.h"
 
@@ -146,6 +149,7 @@ static int get_addr __P((const char *, int, struct addrinfo **,
 			struct addrinfo *, int));
 static int str_isnumber __P((const char *));
 
+#ifndef HAVE_GAI_STRERROR
 static const char *const ai_errlist[] = {
 	"success.",
 	"address family for hostname not supported.",	/* EAI_ADDRFAMILY */
@@ -163,6 +167,7 @@ static const char *const ai_errlist[] = {
 	"resolved protocol is unknown.",		/* EAI_PROTOCOL   */
 	"unknown error.", 				/* EAI_MAX        */
 };
+#endif
 
 #define GET_CANONNAME(ai, str) \
 if (pai->ai_flags & AI_CANONNAME) {\
@@ -184,9 +189,9 @@ if (pai->ai_flags & AI_CANONNAME) {\
 	}\
 	memcpy((ai), pai, sizeof(struct addrinfo));\
 	(ai)->ai_addr = (struct sockaddr *)((ai) + 1);\
-	memset((ai)->ai_addr, 0, (afd)->a_socklen);\
-	SET_SA_LEN((ai)->ai_addr, (ai)->ai_addrlen = (afd)->a_socklen);\
-	(ai)->ai_addr->sa_family = (ai)->ai_family = (afd)->a_af;\
+	(ai)->ai_family = (afd)->a_af;\
+	(ai)->ai_addrlen = (afd)->a_socklen;\
+	INIT_SOCKADDR((ai)->ai_addr, (afd)->a_af, (afd)->a_socklen);\
 	((struct sockinet *)(ai)->ai_addr)->si_port = (port);\
 	p = (char *)((ai)->ai_addr);\
 	memcpy(p + (afd)->a_off, (addr), (afd)->a_addrlen);\
@@ -432,11 +437,8 @@ 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,6 +591,7 @@ 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 d1d5ff6c73..94a5eb9439 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -41,11 +41,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #ifndef _WIN32
-#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
-# include <net/socket.h>
-#else
-# include <sys/socket.h>
-#endif
+#include <sys/socket.h>
 #include <netinet/in.h>
 #if defined(HAVE_ARPA_INET_H)
 #include <arpa/inet.h>
@@ -59,6 +55,9 @@
 #endif
 #endif
 #ifdef _WIN32
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+#include <windows.h>
+#endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #define snprintf _snprintf
@@ -71,8 +70,13 @@
 #include <socks.h>
 #endif
 
+#ifndef HAVE_TYPE_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
 #include "addrinfo.h"
 #include "sockport.h"
+#include "rubysocket.h"
 
 #define SUCCESS 0
 #define ANY 0
@@ -114,24 +118,6 @@ 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)
 {
@@ -151,8 +137,8 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, socklen_t ho
 	if (sa == NULL)
 		return ENI_NOSOCKET;
 
-	len = SA_LEN(sa);
-	if (len != salen) return ENI_SALEN;
+	if (!VALIDATE_SOCKLEN(sa, salen)) return ENI_SALEN;
+        len = salen;
 
 	family = sa->sa_family;
 	for (i = 0; afdl[i].a_af; i++)
diff --git a/ext/socket/ifaddr.c b/ext/socket/ifaddr.c
new file mode 100644
index 0000000000..26aa0c8082
--- /dev/null
+++ b/ext/socket/ifaddr.c
@@ -0,0 +1,477 @@
+#include "rubysocket.h"
+
+#ifdef HAVE_GETIFADDRS
+
+/*
+ * ifa_flags is usually unsigned int.
+ * However it is uint64_t on SunOS 5.11 (OpenIndiana).
+ */
+#ifdef HAVE_LONG_LONG
+typedef unsigned LONG_LONG ifa_flags_t;
+#define PRIxIFAFLAGS PRI_LL_PREFIX"x"
+#define IFAFLAGS2NUM(flags) ULL2NUM(flags)
+#else
+typedef unsigned int ifa_flags_t;
+#define PRIxIFAFLAGS "x"
+#define IFAFLAGS2NUM(flags) UINT2NUM(flags)
+#endif
+
+VALUE rb_cSockIfaddr;
+
+typedef struct rb_ifaddr_tag rb_ifaddr_t;
+typedef struct rb_ifaddr_root_tag rb_ifaddr_root_t;
+
+struct rb_ifaddr_tag {
+    int ord;
+    struct ifaddrs *ifaddr;
+};
+
+struct rb_ifaddr_root_tag {
+    int refcount;
+    int numifaddrs;
+    rb_ifaddr_t ary[1];
+};
+
+static rb_ifaddr_root_t *
+get_root(const rb_ifaddr_t *ifaddr)
+{
+    return (rb_ifaddr_root_t *)((char *)&ifaddr[-ifaddr->ord] -
+                                offsetof(rb_ifaddr_root_t, ary));
+}
+
+static void
+ifaddr_free(void *ptr)
+{
+    rb_ifaddr_t *ifaddr = ptr;
+    rb_ifaddr_root_t *root = get_root(ifaddr);
+    root->refcount--;
+    if (root->refcount == 0) {
+        freeifaddrs(root->ary[0].ifaddr);
+        xfree(root);
+    }
+}
+
+static size_t
+ifaddr_memsize(const void *ptr)
+{
+    size_t size = offsetof(rb_ifaddr_root_t, ary);
+    const rb_ifaddr_t *ifaddr;
+    ifaddr = ptr;
+    if (ifaddr->ord == 0) size = sizeof(rb_ifaddr_root_t);
+    size += sizeof(struct ifaddrs);
+    return size;
+}
+
+static const rb_data_type_t ifaddr_type = {
+    "socket/ifaddr",
+    {0, ifaddr_free, ifaddr_memsize,},
+};
+
+static inline rb_ifaddr_t *
+check_ifaddr(VALUE self)
+{
+      return rb_check_typeddata(self, &ifaddr_type);
+}
+
+static rb_ifaddr_t *
+get_ifaddr(VALUE self)
+{
+    rb_ifaddr_t *rifaddr = check_ifaddr(self);
+
+    if (!rifaddr) {
+        rb_raise(rb_eTypeError, "uninitialized ifaddr");
+    }
+    return rifaddr;
+}
+
+static struct ifaddrs *
+get_ifaddrs(VALUE self)
+{
+    return get_ifaddr(self)->ifaddr;
+}
+
+static VALUE
+rsock_getifaddrs(void)
+{
+    int ret;
+    int numifaddrs, i;
+    struct ifaddrs *ifaddrs, *ifa;
+    rb_ifaddr_root_t *root;
+    VALUE result, addr;
+
+    ret = getifaddrs(&ifaddrs);
+    if (ret == -1)
+        rb_sys_fail("getifaddrs");
+
+    if (!ifaddrs) {
+	return rb_ary_new();
+    }
+
+    numifaddrs = 0;
+    for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next)
+        numifaddrs++;
+
+    addr = TypedData_Wrap_Struct(rb_cSockIfaddr, &ifaddr_type, 0);
+    root = xmalloc(offsetof(rb_ifaddr_root_t, ary) + numifaddrs * sizeof(rb_ifaddr_t));
+    root->refcount = 0;
+    root->numifaddrs = numifaddrs;
+
+    ifa = ifaddrs;
+    for (i = 0; i < numifaddrs; i++) {
+        root->ary[i].ord = i;
+        root->ary[i].ifaddr = ifa;
+        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);
+    }
+
+    return result;
+}
+
+/*
+ * call-seq:
+ *   ifaddr.name => string
+ *
+ * Returns the interface name of _ifaddr_.
+ */
+
+static VALUE
+ifaddr_name(VALUE self)
+{
+    struct ifaddrs *ifa = get_ifaddrs(self);
+    return rb_str_new_cstr(ifa->ifa_name);
+}
+
+#ifdef HAVE_IF_NAMETOINDEX
+/*
+ * call-seq:
+ *   ifaddr.ifindex => integer
+ *
+ * Returns the interface index of _ifaddr_.
+ */
+
+static VALUE
+ifaddr_ifindex(VALUE self)
+{
+    struct ifaddrs *ifa = get_ifaddrs(self);
+    unsigned int ifindex = if_nametoindex(ifa->ifa_name);
+    if (ifindex == 0) {
+        rb_raise(rb_eArgError, "invalid interface name: %s", ifa->ifa_name);
+    }
+    return UINT2NUM(ifindex);
+}
+#else
+#define ifaddr_ifindex rb_f_notimplement
+#endif
+
+/*
+ * call-seq:
+ *   ifaddr.flags => integer
+ *
+ * Returns the flags of _ifaddr_.
+ */
+
+static VALUE
+ifaddr_flags(VALUE self)
+{
+    struct ifaddrs *ifa = get_ifaddrs(self);
+    return IFAFLAGS2NUM(ifa->ifa_flags);
+}
+
+/*
+ * call-seq:
+ *   ifaddr.addr => addrinfo
+ *
+ * Returns the address of _ifaddr_.
+ * nil is returned if address is not available in _ifaddr_.
+ */
+
+static VALUE
+ifaddr_addr(VALUE self)
+{
+    struct ifaddrs *ifa = get_ifaddrs(self);
+    if (ifa->ifa_addr)
+        return rsock_sockaddr_obj(ifa->ifa_addr, rsock_sockaddr_len(ifa->ifa_addr));
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   ifaddr.netmask => addrinfo
+ *
+ * Returns the netmask address of _ifaddr_.
+ * nil is returned if netmask is not available in _ifaddr_.
+ */
+
+static VALUE
+ifaddr_netmask(VALUE self)
+{
+    struct ifaddrs *ifa = get_ifaddrs(self);
+    if (ifa->ifa_netmask)
+        return rsock_sockaddr_obj(ifa->ifa_netmask, rsock_sockaddr_len(ifa->ifa_netmask));
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   ifaddr.broadaddr => addrinfo
+ *
+ * Returns the broadcast address of _ifaddr_.
+ * nil is returned if the flags doesn't have IFF_BROADCAST.
+ */
+
+static VALUE
+ifaddr_broadaddr(VALUE self)
+{
+    struct ifaddrs *ifa = get_ifaddrs(self);
+    if ((ifa->ifa_flags & IFF_BROADCAST) && ifa->ifa_broadaddr)
+        return rsock_sockaddr_obj(ifa->ifa_broadaddr, rsock_sockaddr_len(ifa->ifa_broadaddr));
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   ifaddr.dstaddr => addrinfo
+ *
+ * Returns the destination address of _ifaddr_.
+ * nil is returned if the flags doesn't have IFF_POINTOPOINT.
+ */
+
+static VALUE
+ifaddr_dstaddr(VALUE self)
+{
+    struct ifaddrs *ifa = get_ifaddrs(self);
+    if ((ifa->ifa_flags & IFF_POINTOPOINT) && ifa->ifa_dstaddr)
+        return rsock_sockaddr_obj(ifa->ifa_dstaddr, rsock_sockaddr_len(ifa->ifa_dstaddr));
+    return Qnil;
+}
+
+#ifdef HAVE_STRUCT_IF_DATA_IFI_VHID
+/*
+ * call-seq:
+ *   ifaddr.vhid => Integer
+ *
+ * Returns the vhid address of _ifaddr_.
+ * nil is returned if there is no vhid.
+ */
+
+static VALUE
+ifaddr_vhid(VALUE self)
+{
+    struct ifaddrs *ifa = get_ifaddrs(self);
+    if (ifa->ifa_data)
+        return (INT2FIX(((struct if_data*)ifa->ifa_data)->ifi_vhid));
+    else
+        return Qnil;
+}
+#endif
+
+static void
+ifaddr_inspect_flags(ifa_flags_t flags, VALUE result)
+{
+    const char *sep = " ";
+#define INSPECT_BIT(bit, name) \
+    if (flags & (bit)) { rb_str_catf(result, "%s" name, sep); flags &= ~(ifa_flags_t)(bit); sep = ","; }
+#ifdef IFF_UP
+    INSPECT_BIT(IFF_UP, "UP")
+#endif
+#ifdef IFF_BROADCAST
+    INSPECT_BIT(IFF_BROADCAST, "BROADCAST")
+#endif
+#ifdef IFF_DEBUG
+    INSPECT_BIT(IFF_DEBUG, "DEBUG")
+#endif
+#ifdef IFF_LOOPBACK
+    INSPECT_BIT(IFF_LOOPBACK, "LOOPBACK")
+#endif
+#ifdef IFF_POINTOPOINT
+    INSPECT_BIT(IFF_POINTOPOINT, "POINTOPOINT")
+#endif
+#ifdef IFF_RUNNING
+    INSPECT_BIT(IFF_RUNNING, "RUNNING")
+#endif
+#ifdef IFF_NOARP
+    INSPECT_BIT(IFF_NOARP, "NOARP")
+#endif
+#ifdef IFF_PROMISC
+    INSPECT_BIT(IFF_PROMISC, "PROMISC")
+#endif
+#ifdef IFF_NOTRAILERS
+    INSPECT_BIT(IFF_NOTRAILERS, "NOTRAILERS")
+#endif
+#ifdef IFF_ALLMULTI
+    INSPECT_BIT(IFF_ALLMULTI, "ALLMULTI")
+#endif
+#ifdef IFF_SIMPLEX
+    INSPECT_BIT(IFF_SIMPLEX, "SIMPLEX")
+#endif
+#ifdef IFF_MASTER
+    INSPECT_BIT(IFF_MASTER, "MASTER")
+#endif
+#ifdef IFF_SLAVE
+    INSPECT_BIT(IFF_SLAVE, "SLAVE")
+#endif
+#ifdef IFF_MULTICAST
+    INSPECT_BIT(IFF_MULTICAST, "MULTICAST")
+#endif
+#ifdef IFF_PORTSEL
+    INSPECT_BIT(IFF_PORTSEL, "PORTSEL")
+#endif
+#ifdef IFF_AUTOMEDIA
+    INSPECT_BIT(IFF_AUTOMEDIA, "AUTOMEDIA")
+#endif
+#ifdef IFF_DYNAMIC
+    INSPECT_BIT(IFF_DYNAMIC, "DYNAMIC")
+#endif
+#ifdef IFF_LOWER_UP
+    INSPECT_BIT(IFF_LOWER_UP, "LOWER_UP")
+#endif
+#ifdef IFF_DORMANT
+    INSPECT_BIT(IFF_DORMANT, "DORMANT")
+#endif
+#ifdef IFF_ECHO
+    INSPECT_BIT(IFF_ECHO, "ECHO")
+#endif
+#undef INSPECT_BIT
+    if (flags) {
+        rb_str_catf(result, "%s%#"PRIxIFAFLAGS, sep, flags);
+    }
+}
+
+/*
+ * call-seq:
+ *   ifaddr.inspect => string
+ *
+ * Returns a string to show contents of _ifaddr_.
+ */
+
+static VALUE
+ifaddr_inspect(VALUE self)
+{
+    struct ifaddrs *ifa = get_ifaddrs(self);
+    VALUE result;
+
+    result = rb_str_new_cstr("#<");
+
+    rb_str_append(result, rb_class_name(CLASS_OF(self)));
+    rb_str_cat2(result, " ");
+    rb_str_cat2(result, ifa->ifa_name);
+
+    if (ifa->ifa_flags)
+        ifaddr_inspect_flags(ifa->ifa_flags, result);
+
+    if (ifa->ifa_addr) {
+      rb_str_cat2(result, " ");
+      rsock_inspect_sockaddr(ifa->ifa_addr,
+          rsock_sockaddr_len(ifa->ifa_addr),
+          result);
+    }
+    if (ifa->ifa_netmask) {
+      rb_str_cat2(result, " netmask=");
+      rsock_inspect_sockaddr(ifa->ifa_netmask,
+          rsock_sockaddr_len(ifa->ifa_netmask),
+          result);
+    }
+
+    if ((ifa->ifa_flags & IFF_BROADCAST) && ifa->ifa_broadaddr) {
+      rb_str_cat2(result, " broadcast=");
+      rsock_inspect_sockaddr(ifa->ifa_broadaddr,
+          rsock_sockaddr_len(ifa->ifa_broadaddr),
+          result);
+    }
+
+    if ((ifa->ifa_flags & IFF_POINTOPOINT) && ifa->ifa_dstaddr) {
+      rb_str_cat2(result, " dstaddr=");
+      rsock_inspect_sockaddr(ifa->ifa_dstaddr,
+          rsock_sockaddr_len(ifa->ifa_dstaddr),
+          result);
+    }
+
+    rb_str_cat2(result, ">");
+    return result;
+}
+#endif
+
+#ifdef HAVE_GETIFADDRS
+/*
+ * call-seq:
+ *   Socket.getifaddrs => [ifaddr1, ...]
+ *
+ * Returns an array of interface addresses.
+ * An element of the array is an instance of Socket::Ifaddr.
+ *
+ * This method can be used to find multicast-enabled interfaces:
+ *
+ *   pp Socket.getifaddrs.reject {|ifaddr|
+ *     !ifaddr.addr.ip? || (ifaddr.flags & Socket::IFF_MULTICAST == 0)
+ *   }.map {|ifaddr| [ifaddr.name, ifaddr.ifindex, ifaddr.addr] }
+ *   #=> [["eth0", 2, #<Addrinfo: 221.186.184.67>],
+ *   #    ["eth0", 2, #<Addrinfo: fe80::216:3eff:fe95:88bb%eth0>]]
+ *
+ * Example result on GNU/Linux:
+ *   pp Socket.getifaddrs
+ *   #=> [#<Socket::Ifaddr lo UP,LOOPBACK,RUNNING,0x10000 PACKET[protocol=0 lo hatype=772 HOST hwaddr=00:00:00:00:00:00]>,
+ *   #    #<Socket::Ifaddr eth0 UP,BROADCAST,RUNNING,MULTICAST,0x10000 PACKET[protocol=0 eth0 hatype=1 HOST hwaddr=00:16:3e:95:88:bb] broadcast=PACKET[protocol=0 eth0 hatype=1 HOST hwaddr=ff:ff:ff:ff:ff:ff]>,
+ *   #    #<Socket::Ifaddr sit0 NOARP PACKET[protocol=0 sit0 hatype=776 HOST hwaddr=00:00:00:00]>,
+ *   #    #<Socket::Ifaddr lo UP,LOOPBACK,RUNNING,0x10000 127.0.0.1 netmask=255.0.0.0>,
+ *   #    #<Socket::Ifaddr eth0 UP,BROADCAST,RUNNING,MULTICAST,0x10000 221.186.184.67 netmask=255.255.255.240 broadcast=221.186.184.79>,
+ *   #    #<Socket::Ifaddr lo UP,LOOPBACK,RUNNING,0x10000 ::1 netmask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff>,
+ *   #    #<Socket::Ifaddr eth0 UP,BROADCAST,RUNNING,MULTICAST,0x10000 fe80::216:3eff:fe95:88bb%eth0 netmask=ffff:ffff:ffff:ffff::>]
+ *
+ * Example result on FreeBSD:
+ *   pp Socket.getifaddrs
+ *   #=> [#<Socket::Ifaddr usbus0 UP,0x10000 LINK[usbus0]>,
+ *   #    #<Socket::Ifaddr re0 UP,BROADCAST,RUNNING,MULTICAST,0x800 LINK[re0 3a:d0:40:9a:fe:e8]>,
+ *   #    #<Socket::Ifaddr re0 UP,BROADCAST,RUNNING,MULTICAST,0x800 10.250.10.18 netmask=255.255.255.? (7 bytes for 16 bytes sockaddr_in) broadcast=10.250.10.255>,
+ *   #    #<Socket::Ifaddr re0 UP,BROADCAST,RUNNING,MULTICAST,0x800 fe80:2::38d0:40ff:fe9a:fee8 netmask=ffff:ffff:ffff:ffff::>,
+ *   #    #<Socket::Ifaddr re0 UP,BROADCAST,RUNNING,MULTICAST,0x800 2001:2e8:408:10::12 netmask=UNSPEC>,
+ *   #    #<Socket::Ifaddr plip0 POINTOPOINT,MULTICAST,0x800 LINK[plip0]>,
+ *   #    #<Socket::Ifaddr lo0 UP,LOOPBACK,RUNNING,MULTICAST LINK[lo0]>,
+ *   #    #<Socket::Ifaddr lo0 UP,LOOPBACK,RUNNING,MULTICAST ::1 netmask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff>,
+ *   #    #<Socket::Ifaddr lo0 UP,LOOPBACK,RUNNING,MULTICAST fe80:4::1 netmask=ffff:ffff:ffff:ffff::>,
+ *   #    #<Socket::Ifaddr lo0 UP,LOOPBACK,RUNNING,MULTICAST 127.0.0.1 netmask=255.?.?.? (5 bytes for 16 bytes sockaddr_in)>]
+ *
+ */
+
+static VALUE
+socket_s_getifaddrs(VALUE self)
+{
+    return rsock_getifaddrs();
+}
+#else
+#define socket_s_getifaddrs rb_f_notimplement
+#endif
+
+void
+rsock_init_sockifaddr(void)
+{
+#ifdef HAVE_GETIFADDRS
+    /*
+     * Document-class: Socket::Ifaddr
+     *
+     * Socket::Ifaddr represents a result of getifaddrs() function.
+     */
+    rb_cSockIfaddr = rb_define_class_under(rb_cSocket, "Ifaddr", rb_cData);
+    rb_define_method(rb_cSockIfaddr, "inspect", ifaddr_inspect, 0);
+    rb_define_method(rb_cSockIfaddr, "name", ifaddr_name, 0);
+    rb_define_method(rb_cSockIfaddr, "ifindex", ifaddr_ifindex, 0);
+    rb_define_method(rb_cSockIfaddr, "flags", ifaddr_flags, 0);
+    rb_define_method(rb_cSockIfaddr, "addr", ifaddr_addr, 0);
+    rb_define_method(rb_cSockIfaddr, "netmask", ifaddr_netmask, 0);
+    rb_define_method(rb_cSockIfaddr, "broadaddr", ifaddr_broadaddr, 0);
+    rb_define_method(rb_cSockIfaddr, "dstaddr", ifaddr_dstaddr, 0);
+#ifdef HAVE_STRUCT_IF_DATA_IFI_VHID
+    rb_define_method(rb_cSockIfaddr, "vhid", ifaddr_vhid, 0);
+#endif
+#endif
+
+    rb_define_singleton_method(rb_cSocket, "getifaddrs", socket_s_getifaddrs, 0);
+}
diff --git a/ext/socket/init.c b/ext/socket/init.c
index 0a2365850f..0675194d74 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -10,6 +10,10 @@
 
 #include "rubysocket.h"
 
+#ifdef _WIN32
+VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
+#endif
+
 VALUE rb_cBasicSocket;
 VALUE rb_cIPSocket;
 VALUE rb_cTCPSocket;
@@ -29,33 +33,57 @@ 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
-    if (error == EAI_SYSTEM) rb_sys_fail(reason);
+    int e;
+    if (error == EAI_SYSTEM && (e = errno) != 0)
+	rb_syserr_fail(e, reason);
 #endif
+#ifdef _WIN32
+    rb_encoding *enc = rb_default_internal_encoding();
+    VALUE msg = rb_sprintf("%s: ", reason);
+    if (!enc) enc = rb_default_internal_encoding();
+    rb_str_concat(msg, rb_w32_conv_from_wchar(gai_strerrorW(error), enc));
+    rb_exc_raise(rb_exc_new_str(rb_eSocket, msg));
+#else
     rb_raise(rb_eSocket, "%s: %s", reason, gai_strerror(error));
+#endif
 }
 
-VALUE
-rsock_init_sock(VALUE sock, int fd)
+#ifdef _WIN32
+#define is_socket(fd) rb_w32_is_socket(fd)
+#else
+static int
+is_socket(int fd)
 {
-    rb_io_t *fp;
-#ifndef _WIN32
     struct stat sbuf;
 
     if (fstat(fd, &sbuf) < 0)
-        rb_sys_fail(0);
-    rb_update_max_fd(fd);
-    if (!S_ISSOCK(sbuf.st_mode))
-        rb_raise(rb_eArgError, "not a socket file descriptor");
+        rb_sys_fail("fstat(2)");
+    return S_ISSOCK(sbuf.st_mode);
+}
+#endif
+
+#if defined __APPLE__
+# define do_write_retry(code) do {ret = code;} while (ret == -1 && errno == EPROTOTYPE)
 #else
-    if (!rb_w32_is_socket(fd))
-        rb_raise(rb_eArgError, "not a socket file descriptor");
+# define do_write_retry(code) ret = code
 #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;
@@ -73,8 +101,10 @@ rsock_sendto_blocking(void *data)
 {
     struct rsock_send_arg *arg = data;
     VALUE mesg = arg->mesg;
-    return (VALUE)sendto(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
-                         arg->flags, arg->to, arg->tolen);
+    ssize_t ret;
+    do_write_retry(sendto(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
+			  arg->flags, arg->to, arg->tolen));
+    return (VALUE)ret;
 }
 
 VALUE
@@ -82,40 +112,74 @@ rsock_send_blocking(void *data)
 {
     struct rsock_send_arg *arg = data;
     VALUE mesg = arg->mesg;
-    return (VALUE)send(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
-                       arg->flags);
+    ssize_t ret;
+    do_write_retry(send(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
+			arg->flags));
+    return (VALUE)ret;
 }
 
 struct recvfrom_arg {
     int fd, flags;
     VALUE str;
     socklen_t alen;
-    struct sockaddr_storage buf;
+    union_sockaddr buf;
 };
 
 static VALUE
 recvfrom_blocking(void *data)
 {
     struct recvfrom_arg *arg = data;
-    return (VALUE)recvfrom(arg->fd, RSTRING_PTR(arg->str), RSTRING_LEN(arg->str),
-			   arg->flags, (struct sockaddr*)&arg->buf, &arg->alen);
+    socklen_t len0 = arg->alen;
+    ssize_t ret;
+    ret = recvfrom(arg->fd, RSTRING_PTR(arg->str), RSTRING_LEN(arg->str),
+                   arg->flags, &arg->buf.addr, &arg->alen);
+    if (ret != -1 && len0 < arg->alen)
+        arg->alen = len0;
+    return (VALUE)ret;
+}
+
+static VALUE
+rsock_strbuf(VALUE str, long buflen)
+{
+    long len;
+
+    if (NIL_P(str)) return rb_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, klass;
+    VALUE str;
     struct recvfrom_arg arg;
     VALUE len, flg;
     long buflen;
     long slen;
 
-    rb_scan_args(argc, argv, "11", &len, &flg);
+    rb_scan_args(argc, argv, "12", &len, &flg, &str);
 
     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)) {
@@ -123,27 +187,20 @@ 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 = rb_tainted_str_new(0, buflen);
-    klass = RBASIC(str)->klass;
-    RBASIC(str)->klass = 0;
+    arg.str = str;
 
     while (rb_io_check_closed(fptr),
-	   rb_thread_wait_fd(arg.fd),
-	   (slen = BLOCKING_REGION_FD(recvfrom_blocking, &arg)) < 0) {
+	   rsock_maybe_wait_fd(arg.fd),
+	   (slen = (long)rb_str_locktmp_ensure(str, recvfrom_locktmp,
+	                                       (VALUE)&arg)) < 0) {
         if (!rb_io_wait_readable(fptr->fd)) {
             rb_sys_fail("recvfrom(2)");
         }
-	if (RBASIC(str)->klass || RSTRING_LEN(str) != buflen) {
-	    rb_raise(rb_eRuntimeError, "buffer string modified");
-	}
     }
 
-    RBASIC(str)->klass = klass;
-    if (slen < RSTRING_LEN(str)) {
+    if (slen != RSTRING_LEN(str)) {
 	rb_str_set_len(str, slen);
     }
-    rb_obj_taint(str);
     switch (from) {
       case RECV_RECV:
 	return str;
@@ -154,39 +211,37 @@ rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
 	}
 #endif
 	if (arg.alen && arg.alen != sizeof(arg.buf)) /* OSX doesn't return a from result for connection-oriented sockets */
-	    return rb_assoc_new(str, rsock_ipaddr((struct sockaddr*)&arg.buf, fptr->mode & FMODE_NOREVLOOKUP));
+	    return rb_assoc_new(str, rsock_ipaddr(&arg.buf.addr, arg.alen, fptr->mode & FMODE_NOREVLOOKUP));
 	else
 	    return rb_assoc_new(str, Qnil);
 
 #ifdef HAVE_SYS_UN_H
       case RECV_UNIX:
-        return rb_assoc_new(str, rsock_unixaddr((struct sockaddr_un*)&arg.buf, arg.alen));
+        return rb_assoc_new(str, rsock_unixaddr(&arg.buf.un, arg.alen));
 #endif
       case RECV_SOCKET:
-	return rb_assoc_new(str, rsock_io_socket_addrinfo(sock, (struct sockaddr*)&arg.buf, arg.alen));
+	return rb_assoc_new(str, rsock_io_socket_addrinfo(sock, &arg.buf.addr, arg.alen));
       default:
 	rb_bug("rsock_s_recvfrom called with bad value");
     }
 }
 
 VALUE
-rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
+rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str,
+			  VALUE ex, enum sock_recv_type from)
 {
     rb_io_t *fptr;
-    VALUE str;
-    struct sockaddr_storage buf;
+    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;
 
-    rb_scan_args(argc, argv, "11", &len, &flg);
-
-    if (flg == Qnil) flags = 0;
-    else             flags = NUM2INT(flg);
+    flags = NUM2INT(flg);
     buflen = NUM2INT(len);
+    str = rsock_strbuf(str, buflen);
 
 #ifdef MSG_DONTWAIT
     /* MSG_DONTWAIT avoids the race condition between fcntl and recvfrom.
@@ -200,37 +255,43 @@ rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type
     }
     fd = fptr->fd;
 
-    str = rb_tainted_str_new(0, buflen);
-
     rb_io_check_closed(fptr);
-    rb_io_set_nonblock(fptr);
-    slen = recvfrom(fd, RSTRING_PTR(str), buflen, flags, (struct sockaddr*)&buf, &alen);
+
+    if (!MSG_DONTWAIT_RELIABLE)
+	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) {
-	switch (errno) {
+	int e = errno;
+	switch (e) {
 	  case EAGAIN:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 	  case EWOULDBLOCK:
 #endif
-            rb_mod_sys_fail(rb_mWaitReadable, "recvfrom(2) would block");
+            if (ex == Qfalse)
+		return sym_wait_readable;
+            rb_readwrite_syserr_fail(RB_IO_WAIT_READABLE, e, "recvfrom(2) would block");
 	}
-	rb_sys_fail("recvfrom(2)");
+	rb_syserr_fail(e, "recvfrom(2)");
     }
-    if (slen < RSTRING_LEN(str)) {
+    if (slen != RSTRING_LEN(str)) {
 	rb_str_set_len(str, slen);
     }
-    rb_obj_taint(str);
     switch (from) {
       case RECV_RECV:
         return str;
 
       case RECV_IP:
         if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */
-            addr = rsock_ipaddr((struct sockaddr*)&buf, fptr->mode & FMODE_NOREVLOOKUP);
+            addr = rsock_ipaddr(&buf.addr, alen, fptr->mode & FMODE_NOREVLOOKUP);
         break;
 
       case RECV_SOCKET:
-        addr = rsock_io_socket_addrinfo(sock, (struct sockaddr*)&buf, alen);
+        addr = rsock_io_socket_addrinfo(sock, &buf.addr, alen);
         break;
 
       default:
@@ -239,85 +300,292 @@ rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type
     return rb_assoc_new(str, addr);
 }
 
+#if MSG_DONTWAIT_RELIABLE
+static VALUE sym_wait_writable;
+
+/* copied from io.c :< */
+static long
+read_buffered_data(char *ptr, long len, rb_io_t *fptr)
+{
+    int n = fptr->rbuf.len;
+
+    if (n <= 0) return 0;
+    if (n > len) n = (int)len;
+    MEMMOVE(ptr, fptr->rbuf.ptr+fptr->rbuf.off, char, n);
+    fptr->rbuf.off += n;
+    fptr->rbuf.len -= n;
+    return n;
+}
+
+/* :nodoc: */
+VALUE
+rsock_read_nonblock(VALUE sock, VALUE length, VALUE buf, VALUE ex)
+{
+    rb_io_t *fptr;
+    long n;
+    long len = NUM2LONG(length);
+    VALUE str = rsock_strbuf(buf, len);
+    char *ptr;
+
+    GetOpenFile(sock, fptr);
+
+    if (len == 0) {
+	return str;
+    }
+
+    ptr = RSTRING_PTR(str);
+    n = read_buffered_data(ptr, len, fptr);
+    if (n <= 0) {
+	n = (long)recv(fptr->fd, ptr, len, MSG_DONTWAIT);
+	if (n < 0) {
+	    int e = errno;
+	    if ((e == EWOULDBLOCK || e == EAGAIN)) {
+		if (ex == Qfalse) return sym_wait_readable;
+		rb_readwrite_syserr_fail(RB_IO_WAIT_READABLE,
+					 e, "read would block");
+	    }
+	    rb_syserr_fail_path(e, fptr->pathv);
+	}
+    }
+    if (len != n) {
+	rb_str_modify(str);
+	rb_str_set_len(str, n);
+	if (str != buf) {
+	    rb_str_resize(str, n);
+	}
+    }
+    if (n == 0) {
+	if (ex == Qfalse) return Qnil;
+	rb_eof_error();
+    }
+
+    return str;
+}
+
+/* :nodoc: */
+VALUE
+rsock_write_nonblock(VALUE sock, VALUE str, VALUE ex)
+{
+    rb_io_t *fptr;
+    long n;
+
+    if (!RB_TYPE_P(str, T_STRING))
+	str = rb_obj_as_string(str);
+
+    sock = rb_io_get_write_io(sock);
+    GetOpenFile(sock, fptr);
+    rb_io_check_writable(fptr);
+
+    /*
+     * As with IO#write_nonblock, we may block if somebody is relying on
+     * buffered I/O; but nobody actually hits this because pipes and sockets
+     * are not userspace-buffered in Ruby by default.
+     */
+    if (fptr->wbuf.len > 0) {
+	rb_io_flush(sock);
+    }
+
+#ifdef __APPLE__
+  again:
+#endif
+    n = (long)send(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str), MSG_DONTWAIT);
+    if (n < 0) {
+	int e = errno;
+
+#ifdef __APPLE__
+	if (e == EPROTOTYPE) {
+	    goto again;
+	}
+#endif
+	if (e == EWOULDBLOCK || e == EAGAIN) {
+	    if (ex == Qfalse) return sym_wait_writable;
+	    rb_readwrite_syserr_fail(RB_IO_WAIT_WRITABLE, e,
+				    "write would block");
+	}
+	rb_syserr_fail_path(e, fptr->pathv);
+    }
+
+    return LONG2FIX(n);
+}
+#endif /* MSG_DONTWAIT_RELIABLE */
+
+/* returns true if SOCK_CLOEXEC is supported */
+int rsock_detect_cloexec(int fd)
+{
+#ifdef SOCK_CLOEXEC
+    int flags = fcntl(fd, F_GETFD);
+
+    if (flags == -1)
+	rb_bug("rsock_detect_cloexec: fcntl(%d, F_GETFD) failed: %s", fd, strerror(errno));
+
+    if (flags & FD_CLOEXEC)
+	return 1;
+#endif
+    return 0;
+}
+
+#ifdef SOCK_CLOEXEC
+static int
+rsock_socket0(int domain, int type, int proto)
+{
+    int ret;
+    static int cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
+
+    if (cloexec_state > 0) { /* common path, if SOCK_CLOEXEC is defined */
+        ret = socket(domain, type|SOCK_CLOEXEC|RSOCK_NONBLOCK_DEFAULT, proto);
+        if (ret >= 0) {
+            if (ret <= 2)
+                goto fix_cloexec;
+            goto update_max_fd;
+        }
+    }
+    else if (cloexec_state < 0) { /* usually runs once only for detection */
+        ret = socket(domain, type|SOCK_CLOEXEC|RSOCK_NONBLOCK_DEFAULT, proto);
+        if (ret >= 0) {
+            cloexec_state = rsock_detect_cloexec(ret);
+            if (cloexec_state == 0 || ret <= 2)
+                goto fix_cloexec;
+            goto update_max_fd;
+        }
+        else if (ret == -1 && errno == EINVAL) {
+            /* SOCK_CLOEXEC is available since Linux 2.6.27.  Linux 2.6.18 fails with EINVAL */
+            ret = socket(domain, type, proto);
+            if (ret != -1) {
+                cloexec_state = 0;
+                /* fall through to fix_cloexec */
+            }
+        }
+    }
+    else { /* cloexec_state == 0 */
+        ret = socket(domain, type, proto);
+    }
+    if (ret == -1)
+        return -1;
+fix_cloexec:
+    rb_maygvl_fd_fix_cloexec(ret);
+    if (RSOCK_NONBLOCK_DEFAULT) {
+        rsock_make_fd_nonblock(ret);
+    }
+update_max_fd:
+    rb_update_max_fd(ret);
+
+    return ret;
+}
+#else /* !SOCK_CLOEXEC */
+static int
+rsock_socket0(int domain, int type, int proto)
+{
+    int ret = socket(domain, type, proto);
+
+    if (ret == -1)
+        return -1;
+    rb_fd_fix_cloexec(ret);
+    if (RSOCK_NONBLOCK_DEFAULT) {
+        rsock_make_fd_nonblock(ret);
+    }
+
+    return ret;
+}
+#endif /* !SOCK_CLOEXEC */
+
 int
 rsock_socket(int domain, int type, int proto)
 {
     int fd;
 
-    fd = socket(domain, type, proto);
+    fd = rsock_socket0(domain, type, proto);
     if (fd < 0) {
-	if (errno == EMFILE || errno == ENFILE) {
-	    rb_gc();
-	    fd = socket(domain, type, proto);
-	}
+       if (rb_gc_for_fd(errno)) {
+           fd = rsock_socket0(domain, type, proto);
+       }
     }
     if (0 <= fd)
         rb_update_max_fd(fd);
     return fd;
 }
 
+/* emulate blocking connect behavior on EINTR or non-blocking socket */
 static int
 wait_connectable(int fd)
 {
-    int sockerr;
+    int sockerr, revents;
     socklen_t sockerrlen;
-    int revents;
-    int ret;
 
-    for (;;) {
-	/*
-	 * Stevens book says, succuessful 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)
-		continue;	/* workaround for winsock */
-
-	    /* BSD and Linux use sockerr. */
-	    errno = sockerr;
-	    ret = -1;
-	    break;
-	}
+    sockerrlen = (socklen_t)sizeof(sockerr);
+    if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen) < 0)
+        return -1;
 
-	if ((revents & (RB_WAITFD_IN|RB_WAITFD_OUT)) == RB_WAITFD_OUT) {
-	    ret = 0;
-	    break;
-	}
+    /* necessary for non-blocking sockets (at least ECONNREFUSED) */
+    switch (sockerr) {
+      case 0:
+        break;
+#ifdef EALREADY
+      case EALREADY:
+#endif
+#ifdef EISCONN
+      case EISCONN:
+#endif
+#ifdef ECONNREFUSED
+      case ECONNREFUSED:
+#endif
+#ifdef EHOSTUNREACH
+      case EHOSTUNREACH:
+#endif
+        errno = sockerr;
+        return -1;
     }
 
-    return ret;
-}
-
-#ifdef __CYGWIN__
-#define WAIT_IN_PROGRESS 10
+    /*
+     * 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);
+
+    if (revents < 0)
+        return -1;
+
+    sockerrlen = (socklen_t)sizeof(sockerr);
+    if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen) < 0)
+        return -1;
+
+    switch (sockerr) {
+      case 0:
+      /*
+       * be defensive in case some platforms set SO_ERROR on the original,
+       * interrupted connect()
+       */
+      case EINTR:
+#ifdef ERESTART
+      case ERESTART:
 #endif
-#ifdef __APPLE__
-#define WAIT_IN_PROGRESS 10
+      case EAGAIN:
+#ifdef EINPROGRESS
+      case EINPROGRESS:
 #endif
-#ifdef __linux__
-/* returns correct error */
-#define WAIT_IN_PROGRESS 0
+#ifdef EALREADY
+      case EALREADY:
 #endif
-#ifndef WAIT_IN_PROGRESS
-/* BSD origin code apparently has a problem */
-#define WAIT_IN_PROGRESS 1
+#ifdef EISCONN
+      case EISCONN:
 #endif
+	return 0; /* success */
+      default:
+        /* likely (but not limited to): ECONNREFUSED, ETIMEDOUT, EHOSTUNREACH */
+        errno = sockerr;
+        return -1;
+    }
+
+    return 0;
+}
 
 struct connect_arg {
     int fd;
-    const struct sockaddr *sockaddr;
     socklen_t len;
+    const struct sockaddr *sockaddr;
 };
 
 static VALUE
@@ -342,11 +610,6 @@ 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;
@@ -354,106 +617,106 @@ rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
 #if defined(SOCKS) && !defined(SOCKS5)
     if (socks) func = socks_connect_blocking;
 #endif
-    for (;;) {
-	status = (int)BLOCKING_REGION_FD(func, &arg);
-	if (status < 0) {
-	    switch (errno) {
-	      case EINTR:
-#if defined(ERESTART)
-	      case ERESTART:
-#endif
-		continue;
+    status = (int)BLOCKING_REGION_FD(func, &arg);
 
-	      case EAGAIN:
-#ifdef EINPROGRESS
-	      case EINPROGRESS:
-#endif
-#if WAIT_IN_PROGRESS > 0
-		sockerrlen = (socklen_t)sizeof(sockerr);
-		status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
-		if (status) break;
-		if (sockerr) {
-		    status = -1;
-		    errno = sockerr;
-		    break;
-		}
-#endif
-#ifdef EALREADY
-	      case EALREADY:
-#endif
-#if WAIT_IN_PROGRESS > 0
-		wait_in_progress = WAIT_IN_PROGRESS;
-#endif
-		status = wait_connectable(fd);
-		if (status) {
-		    break;
-		}
-		errno = 0;
-		continue;
-
-#if WAIT_IN_PROGRESS > 0
-	      case EINVAL:
-		if (wait_in_progress-- > 0) {
-		    /*
-		     * connect() after EINPROGRESS returns EINVAL on
-		     * some platforms, need to check true error
-		     * status.
-		     */
-		    sockerrlen = (socklen_t)sizeof(sockerr);
-		    status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
-		    if (!status && !sockerr) {
-			struct timeval tv = {0, 100000};
-			rb_thread_wait_for(tv);
-			continue;
-		    }
-		    status = -1;
-		    errno = sockerr;
-		}
-		break;
+    if (status < 0) {
+        switch (errno) {
+          case EINTR:
+#ifdef ERESTART
+          case ERESTART:
 #endif
-
-#ifdef EISCONN
-	      case EISCONN:
-		status = 0;
-		errno = 0;
-		break;
+          case EAGAIN:
+#ifdef EINPROGRESS
+          case EINPROGRESS:
 #endif
-	      default:
-		break;
-	    }
-	}
-	return status;
+            return wait_connectable(fd);
+        }
     }
+    return status;
 }
 
-static void
-make_fd_nonblock(int fd)
+void
+rsock_make_fd_nonblock(int fd)
 {
     int flags;
 #ifdef F_GETFL
     flags = fcntl(fd, F_GETFL);
     if (flags == -1) {
-        rb_sys_fail(0);
+        rb_sys_fail("fnctl(2)");
     }
 #else
     flags = 0;
 #endif
     flags |= O_NONBLOCK;
     if (fcntl(fd, F_SETFL, flags) == -1) {
-        rb_sys_fail(0);
+        rb_sys_fail("fnctl(2)");
     }
 }
 
+static int
+cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len,
+	       int nonblock)
+{
+    int ret;
+    socklen_t len0 = 0;
+#ifdef HAVE_ACCEPT4
+    static int try_accept4 = 1;
+#endif
+    if (RSOCK_NONBLOCK_DEFAULT) {
+        nonblock = 1;
+    }
+    if (address_len) len0 = *address_len;
+#ifdef HAVE_ACCEPT4
+    if (try_accept4) {
+        int flags = 0;
+#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) {
+                rsock_make_fd_nonblock(ret);
+            }
+#endif
+            if (address_len && len0 < *address_len) *address_len = len0;
+            return ret;
+        }
+        if (errno != ENOSYS) {
+            return -1;
+        }
+        try_accept4 = 0;
+    }
+#endif
+    ret = accept(socket, address, address_len);
+    if (ret == -1) return -1;
+    if (address_len && len0 < *address_len) *address_len = len0;
+    rb_maygvl_fd_fix_cloexec(ret);
+    if (nonblock) {
+        rsock_make_fd_nonblock(ret);
+    }
+    return ret;
+}
+
 VALUE
-rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen_t *len)
+rsock_s_accept_nonblock(VALUE klass, VALUE ex, rb_io_t *fptr,
+			struct sockaddr *sockaddr, socklen_t *len)
 {
     int fd2;
 
-    rb_secure(3);
     rb_io_set_nonblock(fptr);
-    fd2 = accept(fptr->fd, (struct sockaddr*)sockaddr, len);
+    fd2 = cloexec_accept(fptr->fd, (struct sockaddr*)sockaddr, len, 1);
     if (fd2 < 0) {
-	switch (errno) {
+	int e = errno;
+	switch (e) {
 	  case EAGAIN:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 	  case EWOULDBLOCK:
@@ -462,12 +725,13 @@ rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, s
 #if defined EPROTO
 	  case EPROTO:
 #endif
-            rb_mod_sys_fail(rb_mWaitReadable, "accept(2) would block");
+            if (ex == Qfalse)
+		return sym_wait_readable;
+            rb_readwrite_syserr_fail(RB_IO_WAIT_READABLE, e, "accept(2) would block");
 	}
-        rb_sys_fail("accept(2)");
+        rb_syserr_fail(e, "accept(2)");
     }
     rb_update_max_fd(fd2);
-    make_fd_nonblock(fd2);
     return rsock_init_sock(rb_obj_alloc(klass), fd2);
 }
 
@@ -481,7 +745,7 @@ static VALUE
 accept_blocking(void *data)
 {
     struct accept_arg *arg = data;
-    return (VALUE)accept(arg->fd, arg->sockaddr, arg->len);
+    return (VALUE)cloexec_accept(arg->fd, arg->sockaddr, arg->len, 0);
 }
 
 VALUE
@@ -491,17 +755,18 @@ 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;
   retry:
-    rb_thread_wait_fd(fd);
+    rsock_maybe_wait_fd(fd);
     fd2 = (int)BLOCKING_REGION_FD(accept_blocking, &arg);
     if (fd2 < 0) {
-	switch (errno) {
+	int e = errno;
+	switch (e) {
 	  case EMFILE:
 	  case ENFILE:
+	  case ENOMEM:
 	    if (retry) break;
 	    rb_gc();
 	    retry = 1;
@@ -511,7 +776,7 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
 	    retry = 0;
 	    goto retry;
 	}
-	rb_sys_fail(0);
+	rb_syserr_fail(e, "accept(2)");
     }
     rb_update_max_fd(fd2);
     if (!klass) return INT2NUM(fd2);
@@ -519,20 +784,39 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
 }
 
 int
-rsock_getfamily(int sockfd)
+rsock_getfamily(rb_io_t *fptr)
 {
-    struct sockaddr_storage ss;
+    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.ss_family = AF_UNSPEC;
-    if (getsockname(sockfd, (struct sockaddr*)&ss, &sslen) < 0)
+    ss.addr.sa_family = AF_UNSPEC;
+    if (getsockname(fptr->fd, &ss.addr, &sslen) < 0)
         return AF_UNSPEC;
 
-    return ss.ss_family;
+    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()
+rsock_init_socket_init(void)
 {
     /*
      * SocketError is the error class for socket.
@@ -548,5 +832,13 @@ rsock_init_socket_init()
     rsock_init_sockopt();
     rsock_init_ancdata();
     rsock_init_addrinfo();
+    rsock_init_sockifaddr();
     rsock_init_socket_constants();
+
+#undef rb_intern
+    sym_wait_readable = ID2SYM(rb_intern("wait_readable"));
+
+#if MSG_DONTWAIT_RELIABLE
+    sym_wait_writable = ID2SYM(rb_intern("wait_writable"));
+#endif
 }
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
index 2217fffc9d..a2cb6e0e12 100644
--- a/ext/socket/ipsocket.c
+++ b/ext/socket/ipsocket.c
@@ -15,21 +15,22 @@ struct inetsock_arg
     VALUE sock;
     struct {
 	VALUE host, serv;
-	struct addrinfo *res;
+	struct rb_addrinfo *res;
     } remote, local;
     int type;
     int fd;
 };
 
 static VALUE
-inetsock_cleanup(struct inetsock_arg *arg)
+inetsock_cleanup(VALUE v)
 {
+    struct inetsock_arg *arg = (void *)v;
     if (arg->remote.res) {
-	freeaddrinfo(arg->remote.res);
+	rb_freeaddrinfo(arg->remote.res);
 	arg->remote.res = 0;
     }
     if (arg->local.res) {
-	freeaddrinfo(arg->local.res);
+	rb_freeaddrinfo(arg->local.res);
 	arg->local.res = 0;
     }
     if (arg->fd >= 0) {
@@ -39,33 +40,53 @@ inetsock_cleanup(struct inetsock_arg *arg)
 }
 
 static VALUE
-init_inetsock_internal(struct inetsock_arg *arg)
+init_inetsock_internal(VALUE v)
 {
+    struct inetsock_arg *arg = (void *)v;
+    int error = 0;
     int type = arg->type;
-    struct addrinfo *res;
-    int fd, status = 0;
+    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, SOCK_STREAM,
-				    (type == INET_SERVER) ? AI_PASSIVE : 0);
+    arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv,
+				     family, SOCK_STREAM,
+				     (type == INET_SERVER) ? AI_PASSIVE : 0);
     /*
      * Maybe also accept a local address
      */
 
     if (type != INET_SERVER && (!NIL_P(arg->local.host) || !NIL_P(arg->local.serv))) {
-	arg->local.res = rsock_addrinfo(arg->local.host, arg->local.serv, SOCK_STREAM, 0);
+	arg->local.res = rsock_addrinfo(arg->local.host, arg->local.serv,
+					family, SOCK_STREAM, 0);
     }
 
     arg->fd = fd = -1;
-    for (res = arg->remote.res; res; res = res->ai_next) {
+    for (res = arg->remote.res->ai; res; res = res->ai_next) {
 #if !defined(INET6) && defined(AF_INET6)
 	if (res->ai_family == AF_INET6)
 	    continue;
 #endif
+        lres = NULL;
+        if (arg->local.res) {
+            for (lres = arg->local.res->ai; lres; lres = lres->ai_next) {
+                if (lres->ai_family == res->ai_family)
+                    break;
+            }
+            if (!lres) {
+                if (res->ai_next || status < 0)
+                    continue;
+                /* Use a different family local address if no choice, this
+                 * will cause EAFNOSUPPORT. */
+                lres = arg->local.res->ai;
+            }
+        }
 	status = rsock_socket(res->ai_family,res->ai_socktype,res->ai_protocol);
 	syscall = "socket(2)";
 	fd = status;
 	if (fd < 0) {
+	    error = errno;
 	    continue;
 	}
 	arg->fd = fd;
@@ -79,8 +100,14 @@ init_inetsock_internal(struct inetsock_arg *arg)
 	    syscall = "bind(2)";
 	}
 	else {
-	    if (arg->local.res) {
-		status = bind(fd, arg->local.res->ai_addr, arg->local.res->ai_addrlen);
+	    if (lres) {
+#if !defined(_WIN32) && !defined(__CYGWIN__)
+                status = 1;
+                setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
+                           (char*)&status, (socklen_t)sizeof(status));
+#endif
+		status = bind(fd, lres->ai_addr, lres->ai_addrlen);
+		local = status;
 		syscall = "bind(2)";
 	    }
 
@@ -92,6 +119,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
 	}
 
 	if (status < 0) {
+	    error = errno;
 	    close(fd);
 	    arg->fd = fd = -1;
 	    continue;
@@ -99,16 +127,27 @@ init_inetsock_internal(struct inetsock_arg *arg)
 	    break;
     }
     if (status < 0) {
-	rb_sys_fail(syscall);
+	VALUE host, port;
+
+	if (local < 0) {
+	    host = arg->local.host;
+	    port = arg->local.serv;
+	} else {
+	    host = arg->remote.host;
+	    port = arg->remote.serv;
+	}
+
+	rsock_syserr_fail_host_port(error, syscall, host, port);
     }
 
     arg->fd = -1;
 
     if (type == INET_SERVER) {
-	status = listen(fd, 5);
+	status = listen(fd, SOMAXCONN);
 	if (status < 0) {
+	    error = errno;
 	    close(fd);
-            rb_sys_fail("listen(2)");
+	    rb_syserr_fail(error, "listen(2)");
 	}
     }
 
@@ -159,6 +198,43 @@ rsock_revlookup_flag(VALUE revlookup, int *norevlookup)
 
 /*
  * call-seq:
+ *   ipsocket.inspect   -> string
+ *
+ * Return a string describing this IPSocket object.
+ */
+static VALUE
+ip_inspect(VALUE sock)
+{
+    VALUE str = rb_call_super(0, 0);
+    rb_io_t *fptr = RFILE(sock)->fptr;
+    union_sockaddr addr;
+    socklen_t len = (socklen_t)sizeof addr;
+    ID id;
+    if (fptr && fptr->fd >= 0 &&
+	getsockname(fptr->fd, &addr.addr, &len) >= 0 &&
+	(id = rsock_intern_family(addr.addr.sa_family)) != 0) {
+	VALUE family = rb_id2str(id);
+	char hbuf[1024], pbuf[1024];
+	long slen = RSTRING_LEN(str);
+	const char last = (slen > 1 && RSTRING_PTR(str)[slen - 1] == '>') ?
+	    (--slen, '>') : 0;
+	str = rb_str_subseq(str, 0, slen);
+	rb_str_cat_cstr(str, ", ");
+	rb_str_append(str, family);
+	if (!rb_getnameinfo(&addr.addr, len, hbuf, sizeof(hbuf),
+			    pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
+	    rb_str_cat_cstr(str, ", ");
+	    rb_str_cat_cstr(str, hbuf);
+	    rb_str_cat_cstr(str, ", ");
+	    rb_str_cat_cstr(str, pbuf);
+	}
+	if (last) rb_str_cat(str, &last, 1);
+    }
+    return str;
+}
+
+/*
+ * call-seq:
  *   ipsocket.addr([reverse_lookup]) => [address_family, port, hostname, numeric_address]
  *
  * Returns the local address as an array which contains
@@ -168,7 +244,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 ommitted, obeys to +ipsocket.do_not_reverse_lookup+.
+ * Or if it is +nil+ or omitted, obeys to +ipsocket.do_not_reverse_lookup+.
  * See +Socket.getaddrinfo+ also.
  *
  *   TCPSocket.open("www.ruby-lang.org", 80) {|sock|
@@ -184,7 +260,7 @@ static VALUE
 ip_addr(int argc, VALUE *argv, VALUE sock)
 {
     rb_io_t *fptr;
-    struct sockaddr_storage addr;
+    union_sockaddr addr;
     socklen_t len = (socklen_t)sizeof addr;
     int norevlookup;
 
@@ -192,9 +268,9 @@ ip_addr(int argc, VALUE *argv, VALUE sock)
 
     if (argc < 1 || !rsock_revlookup_flag(argv[0], &norevlookup))
 	norevlookup = fptr->mode & FMODE_NOREVLOOKUP;
-    if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
+    if (getsockname(fptr->fd, &addr.addr, &len) < 0)
 	rb_sys_fail("getsockname(2)");
-    return rsock_ipaddr((struct sockaddr*)&addr, norevlookup);
+    return rsock_ipaddr(&addr.addr, len, norevlookup);
 }
 
 /*
@@ -209,12 +285,12 @@ 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 ommitted, obeys to +ipsocket.do_not_reverse_lookup+.
+ * Or if it is +nil+ or omitted, obeys to +ipsocket.do_not_reverse_lookup+.
  * See +Socket.getaddrinfo+ also.
  *
  *   TCPSocket.open("www.ruby-lang.org", 80) {|sock|
  *     p sock.peeraddr #=> ["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68"]
- *     p sock.peeraddr(true)  #=> ["AF_INET", 80, "221.186.184.68", "221.186.184.68"]
+ *     p sock.peeraddr(true)  #=> ["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68"]
  *     p sock.peeraddr(false) #=> ["AF_INET", 80, "221.186.184.68", "221.186.184.68"]
  *     p sock.peeraddr(:hostname) #=> ["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68"]
  *     p sock.peeraddr(:numeric)  #=> ["AF_INET", 80, "221.186.184.68", "221.186.184.68"]
@@ -225,7 +301,7 @@ static VALUE
 ip_peeraddr(int argc, VALUE *argv, VALUE sock)
 {
     rb_io_t *fptr;
-    struct sockaddr_storage addr;
+    union_sockaddr addr;
     socklen_t len = (socklen_t)sizeof addr;
     int norevlookup;
 
@@ -233,9 +309,9 @@ ip_peeraddr(int argc, VALUE *argv, VALUE sock)
 
     if (argc < 1 || !rsock_revlookup_flag(argv[0], &norevlookup))
 	norevlookup = fptr->mode & FMODE_NOREVLOOKUP;
-    if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
+    if (getpeername(fptr->fd, &addr.addr, &len) < 0)
 	rb_sys_fail("getpeername(2)");
-    return rsock_ipaddr((struct sockaddr*)&addr, norevlookup);
+    return rsock_ipaddr(&addr.addr, len, norevlookup);
 }
 
 /*
@@ -271,6 +347,8 @@ 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"
  *
@@ -278,14 +356,15 @@ ip_recvfrom(int argc, VALUE *argv, VALUE sock)
 static VALUE
 ip_s_getaddress(VALUE obj, VALUE host)
 {
-    struct sockaddr_storage addr;
-    struct addrinfo *res = rsock_addrinfo(host, Qnil, SOCK_STREAM, 0);
+    union_sockaddr addr;
+    struct rb_addrinfo *res = rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, 0);
+    socklen_t len = res->ai->ai_addrlen;
 
     /* just take the first one */
-    memcpy(&addr, res->ai_addr, res->ai_addrlen);
-    freeaddrinfo(res);
+    memcpy(&addr, res->ai->ai_addr, len);
+    rb_freeaddrinfo(res);
 
-    return rsock_make_ipaddr((struct sockaddr*)&addr);
+    return rsock_make_ipaddr(&addr.addr, len);
 }
 
 void
@@ -297,6 +376,7 @@ rsock_init_ipsocket(void)
      * IPSocket is the super class of TCPSocket and UDPSocket.
      */
     rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket);
+    rb_define_method(rb_cIPSocket, "inspect", ip_inspect, 0);
     rb_define_method(rb_cIPSocket, "addr", ip_addr, -1);
     rb_define_method(rb_cIPSocket, "peeraddr", ip_peeraddr, -1);
     rb_define_method(rb_cIPSocket, "recvfrom", ip_recvfrom, -1);
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index d311eed28d..d756a32a5a 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'socket.so'
+require 'io/wait'
 
 class Addrinfo
   # creates an Addrinfo object from the arguments.
@@ -16,6 +19,12 @@ class Addrinfo
       raise ArgumentError, "no address specified"
     elsif Addrinfo === args.first
       raise ArgumentError, "too many arguments" if args.length != 1
+      addrinfo = args.first
+      if (self.pfamily != addrinfo.pfamily) ||
+         (self.socktype != addrinfo.socktype)
+        raise ArgumentError, "Addrinfo type mismatch"
+      end
+      addrinfo
     elsif self.ip?
       raise ArgumentError, "IP address needs host and port but #{args.length} arguments given" if args.length != 2
       host, port = args
@@ -31,34 +40,61 @@ class Addrinfo
 
   # creates a new Socket connected to the address of +local_addrinfo+.
   #
-  # If no arguments are given, the address of the socket is not bound.
+  # If _local_addrinfo_ is nil, the address of the socket is not bound.
+  #
+  # The _timeout_ specify the seconds for timeout.
+  # Errno::ETIMEDOUT is raised when timeout occur.
   #
   # If a block is given the created socket is yielded for each address.
   #
-  def connect_internal(local_addrinfo) # :yields: socket
+  def connect_internal(local_addrinfo, timeout=nil) # :yields: socket
     sock = Socket.new(self.pfamily, self.socktype, self.protocol)
     begin
       sock.ipv6only! if self.ipv6?
       sock.bind local_addrinfo if local_addrinfo
-      sock.connect(self)
-      if block_given?
-        yield sock
+      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
+            raise Errno::ETIMEDOUT, 'user specified timeout'
+        end while true
       else
-        sock
+        sock.connect(self)
+      end
+    rescue Exception
+      sock.close
+      raise
+    end
+    if block_given?
+      begin
+        yield sock
+      ensure
+        sock.close
       end
-    ensure
-      sock.close if !sock.closed? && (block_given? || $!)
+    else
+      sock
     end
   end
-  private :connect_internal
+  protected :connect_internal
 
+  # :call-seq:
+  #   addrinfo.connect_from([local_addr_args], [opts]) {|socket| ... }
+  #   addrinfo.connect_from([local_addr_args], [opts])
+  #
   # creates a socket connected to the address of self.
   #
   # If one or more arguments given as _local_addr_args_,
   # it is used as the local address of the socket.
   # _local_addr_args_ is given for family_addrinfo to obtain actual address.
   #
-  # If no arguments given, the local address of the socket is not bound.
+  # If _local_addr_args_ is not given, the local address of the socket is not bound.
+  #
+  # The optional last argument _opts_ is options represented by a hash.
+  # _opts_ may have following options:
+  #
+  # [:timeout] specify the timeout in seconds.
   #
   # If a block is given, it is called with the socket and the value of the block is returned.
   # The socket is returned otherwise.
@@ -74,12 +110,21 @@ class Addrinfo
   #     puts s.read
   #   }
   #
-  def connect_from(*local_addr_args, &block)
-    connect_internal(family_addrinfo(*local_addr_args), &block)
+  def connect_from(*args, timeout: nil, &block)
+    connect_internal(family_addrinfo(*args), timeout, &block)
   end
 
+  # :call-seq:
+  #   addrinfo.connect([opts]) {|socket| ... }
+  #   addrinfo.connect([opts])
+  #
   # creates a socket connected to the address of self.
   #
+  # The optional argument _opts_ is options represented by a hash.
+  # _opts_ may have following options:
+  #
+  # [:timeout] specify the timeout in seconds.
+  #
   # If a block is given, it is called with the socket and the value of the block is returned.
   # The socket is returned otherwise.
   #
@@ -88,12 +133,21 @@ class Addrinfo
   #     puts s.read
   #   }
   #
-  def connect(&block)
-    connect_internal(nil, &block)
+  def connect(timeout: nil, &block)
+    connect_internal(nil, timeout, &block)
   end
 
+  # :call-seq:
+  #   addrinfo.connect_to([remote_addr_args], [opts]) {|socket| ... }
+  #   addrinfo.connect_to([remote_addr_args], [opts])
+  #
   # creates a socket connected to _remote_addr_args_ and bound to self.
   #
+  # The optional last argument _opts_ is options represented by a hash.
+  # _opts_ may have following options:
+  #
+  # [:timeout] specify the timeout in seconds.
+  #
   # If a block is given, it is called with the socket and the value of the block is returned.
   # The socket is returned otherwise.
   #
@@ -102,9 +156,9 @@ class Addrinfo
   #     puts s.read
   #   }
   #
-  def connect_to(*remote_addr_args, &block)
-    remote_addrinfo = family_addrinfo(*remote_addr_args)
-    remote_addrinfo.send(:connect_internal, self, &block)
+  def connect_to(*args, timeout: nil, &block)
+    remote_addrinfo = family_addrinfo(*args)
+    remote_addrinfo.connect_internal(self, timeout, &block)
   end
 
   # creates a socket bound to self.
@@ -123,31 +177,41 @@ class Addrinfo
       sock.ipv6only! if self.ipv6?
       sock.setsockopt(:SOCKET, :REUSEADDR, 1)
       sock.bind(self)
-      if block_given?
+    rescue Exception
+      sock.close
+      raise
+    end
+    if block_given?
+      begin
         yield sock
-      else
-        sock
+      ensure
+        sock.close
       end
-    ensure
-      sock.close if !sock.closed? && (block_given? || $!)
+    else
+      sock
     end
   end
 
   # creates a listening socket bound to self.
-  def listen(backlog=5)
+  def listen(backlog=Socket::SOMAXCONN)
     sock = Socket.new(self.pfamily, self.socktype, self.protocol)
     begin
       sock.ipv6only! if self.ipv6?
       sock.setsockopt(:SOCKET, :REUSEADDR, 1)
       sock.bind(self)
       sock.listen(backlog)
-      if block_given?
+    rescue Exception
+      sock.close
+      raise
+    end
+    if block_given?
+      begin
         yield sock
-      else
-        sock
+      ensure
+        sock.close
       end
-    ensure
-      sock.close if !sock.closed? && (block_given? || $!)
+    else
+      sock
     end
   end
 
@@ -159,8 +223,8 @@ class Addrinfo
   #   #   #<Addrinfo: [::1]:80 TCP (:80)>
   #   #   #<Addrinfo: [::1]:80 UDP (:80)>
   #
-  def self.foreach(nodename, service, family=nil, socktype=nil, protocol=nil, flags=nil, &block)
-    Addrinfo.getaddrinfo(nodename, service, family, socktype, protocol, flags).each(&block)
+  def self.foreach(nodename, service, family=nil, socktype=nil, protocol=nil, flags=nil, timeout: nil, &block)
+    Addrinfo.getaddrinfo(nodename, service, family, socktype, protocol, flags, timeout: timeout).each(&block)
   end
 end
 
@@ -206,6 +270,192 @@ 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 a keyword argument _exception_ to +false+, you can 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
+  # * +buf+ - destination String buffer
+  # * +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 a keyword argument _exception_ to +false+, you can indicate
+  # that recv_nonblock should not raise an IO::WaitReadable exception, but
+  # return the symbol +:wait_readable+ 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 a keyword argument _exception_ to +false+, you can indicate
+  # that recvmsg_nonblock should not raise an IO::WaitReadable exception, but
+  # return the symbol +:wait_readable+ instead.
+  def recvmsg_nonblock(dlen = nil, flags = 0, clen = nil,
+                       scm_rights: false, exception: true)
+    __recvmsg_nonblock(dlen, flags, clen, scm_rights, exception)
+  end
+
+  # Linux-specific optimizations to avoid fcntl for IO#read_nonblock
+  # and IO#write_nonblock using MSG_DONTWAIT
+  # Do other platforms support MSG_DONTWAIT reliably?
+  if RUBY_PLATFORM =~ /linux/ && Socket.const_defined?(:MSG_DONTWAIT)
+    def read_nonblock(len, str = nil, exception: true) # :nodoc:
+      __read_nonblock(len, str, exception)
+    end
+
+    def write_nonblock(buf, exception: true) # :nodoc:
+      __write_nonblock(buf, exception)
+    end
+  end
 end
 
 class Socket < BasicSocket
@@ -216,11 +466,148 @@ 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 a keyword argument _exception_ to +false+, you can indicate
+  # that recvfrom_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 a keyword argument _exception_ to +false+, you can 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])
+  #
   # creates a new socket object connected to host:port using TCP/IP.
   #
   # If local_host:local_port is given,
   # the socket is bound to it.
   #
+  # The optional last argument _opts_ is options represented by a hash.
+  # _opts_ may have following options:
+  #
+  # [:connect_timeout] specify the timeout in seconds.
+  # [:resolv_timeout] specify the name resolution timeout in seconds.
+  #
   # If a block is given, the block is called with the socket.
   # The value of the block is returned.
   # The socket is closed when this method returns.
@@ -233,7 +620,7 @@ class Socket < BasicSocket
   #     puts sock.read
   #   }
   #
-  def self.tcp(host, port, local_host=nil, local_port=nil) # :yield: socket
+  def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: nil, resolv_timeout: nil) # :yield: socket
     last_error = nil
     ret = nil
 
@@ -242,15 +629,17 @@ class Socket < BasicSocket
       local_addr_list = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, nil)
     end
 
-    Addrinfo.foreach(host, port, nil, :STREAM) {|ai|
+    Addrinfo.foreach(host, port, nil, :STREAM, timeout: resolv_timeout) {|ai|
       if local_addr_list
         local_addr = local_addr_list.find {|local_ai| local_ai.afamily == ai.afamily }
-        next if !local_addr
+        next unless local_addr
       else
         local_addr = nil
       end
       begin
-        sock = local_addr ? ai.connect_from(local_addr) : ai.connect
+        sock = local_addr ?
+          ai.connect_from(local_addr, timeout: connect_timeout) :
+          ai.connect(timeout: connect_timeout)
       rescue SystemCallError
         last_error = $!
         next
@@ -258,7 +647,7 @@ class Socket < BasicSocket
       ret = sock
       break
     }
-    if !ret
+    unless ret
       if last_error
         raise last_error
       else
@@ -269,7 +658,7 @@ class Socket < BasicSocket
       begin
         yield ret
       ensure
-        ret.close if !ret.closed?
+        ret.close
       end
     else
       ret
@@ -278,8 +667,9 @@ class Socket < BasicSocket
 
   # :stopdoc:
   def self.ip_sockets_port0(ai_list, reuseaddr)
+    sockets = []
     begin
-      sockets = []
+      sockets.clear
       port = nil
       ai_list.each {|ai|
         begin
@@ -292,7 +682,7 @@ class Socket < BasicSocket
         if reuseaddr
           s.setsockopt(:SOCKET, :REUSEADDR, 1)
         end
-        if !port
+        unless port
           s.bind(ai)
           port = s.local_address.ip_port
         else
@@ -300,14 +690,13 @@ class Socket < BasicSocket
         end
       }
     rescue Errno::EADDRINUSE
-      sockets.each {|s|
-        s.close
-      }
+      sockets.each(&:close)
       retry
+    rescue Exception
+      sockets.each(&:close)
+      raise
     end
     sockets
-  ensure
-    sockets.each {|s| s.close if !s.closed? } if $!
   end
   class << self
     private :ip_sockets_port0
@@ -316,12 +705,15 @@ class Socket < BasicSocket
   def self.tcp_server_sockets_port0(host)
     ai_list = Addrinfo.getaddrinfo(host, 0, nil, :STREAM, nil, Socket::AI_PASSIVE)
     sockets = ip_sockets_port0(ai_list, true)
-    sockets.each {|s|
-      s.listen(5)
-    }
+    begin
+      sockets.each {|s|
+        s.listen(Socket::SOMAXCONN)
+      }
+    rescue Exception
+      sockets.each(&:close)
+      raise
+    end
     sockets
-  ensure
-    sockets.each {|s| s.close if !s.closed? } if $! && sockets
   end
   class << self
     private :tcp_server_sockets_port0
@@ -338,7 +730,7 @@ class Socket < BasicSocket
   # The value of the block is returned.
   # The socket is closed when this method returns.
   #
-  # If _port_ is 0, actual port number is choosen dynamically.
+  # If _port_ is 0, actual port number is chosen dynamically.
   # However all sockets in the result has same port number.
   #
   #   # tcp_server_sockets returns two sockets.
@@ -350,7 +742,7 @@ class Socket < BasicSocket
   #   #=> #<Addrinfo: [::]:1296 TCP>
   #   #   #<Addrinfo: 0.0.0.0:1296 TCP>
   #
-  #   # IPv6 and IPv4 socket has same port number, 53114, even if it is choosen dynamically.
+  #   # IPv6 and IPv4 socket has same port number, 53114, even if it is chosen dynamically.
   #   sockets = Socket.tcp_server_sockets(0)
   #   sockets.each {|s| p s.local_address }
   #   #=> #<Addrinfo: [::]:53114 TCP>
@@ -365,9 +757,9 @@ class Socket < BasicSocket
     if port == 0
       sockets = tcp_server_sockets_port0(host)
     else
+      last_error = nil
+      sockets = []
       begin
-        last_error = nil
-        sockets = []
         Addrinfo.foreach(host, port, nil, :STREAM, nil, Socket::AI_PASSIVE) {|ai|
           begin
             s = ai.listen
@@ -380,15 +772,16 @@ class Socket < BasicSocket
         if sockets.empty?
           raise last_error
         end
-      ensure
-        sockets.each {|s| s.close if !s.closed? } if $!
+      rescue Exception
+        sockets.each(&:close)
+        raise
       end
     end
     if block_given?
       begin
         yield sockets
       ensure
-        sockets.each {|s| s.close if !s.closed? }
+        sockets.each(&:close)
       end
     else
       sockets
@@ -412,11 +805,8 @@ class Socket < BasicSocket
     loop {
       readable, _, _ = IO.select(sockets)
       readable.each {|r|
-        begin
-          sock, addr = r.accept_nonblock
-        rescue IO::WaitReadable
-          next
-        end
+        sock, addr = r.accept_nonblock(exception: false)
+        next if sock == :wait_readable
         yield sock, addr
       }
     }
@@ -480,8 +870,8 @@ class Socket < BasicSocket
   # The value of the block is returned.
   # The sockets are closed when this method returns.
   #
-  # If _port_ is zero, some port is choosen.
-  # But the choosen port is used for the all sockets.
+  # If _port_ is zero, some port is chosen.
+  # But the chosen port is used for the all sockets.
   #
   #   # UDP/IP echo server
   #   Socket.udp_server_sockets(0) {|sockets|
@@ -510,18 +900,19 @@ 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 if !a.ipv4?
+          next unless a.ipv4?
           ip_list << Addrinfo.new(a.to_sockaddr, :INET, :DGRAM, 0);
         }
       elsif ai.ipv6? && ai.ip_address == "::" && !ipv6_recvpktinfo
         local_addrs.each {|a|
-          next if !a.ipv6?
+          next unless a.ipv6?
           ip_list << Addrinfo.new(a.to_sockaddr, :INET6, :DGRAM, 0);
         }
       else
         ip_list << ai
       end
     }
+    ip_list.uniq!(&:to_sockaddr)
 
     if port == 0
       sockets = ip_sockets_port0(ip_list, false)
@@ -552,7 +943,7 @@ class Socket < BasicSocket
       begin
         yield sockets
       ensure
-        sockets.each {|s| s.close if !s.closed? } if sockets
+        sockets.each(&:close) if sockets
       end
     else
       sockets
@@ -580,11 +971,8 @@ class Socket < BasicSocket
   #
   def self.udp_server_recv(sockets)
     sockets.each {|r|
-      begin
-        msg, sender_addrinfo, _, *controls = r.recvmsg_nonblock
-      rescue IO::WaitReadable
-        next
-      end
+      msg, sender_addrinfo, _, *controls = r.recvmsg_nonblock(exception: false)
+      next if msg == :wait_readable
       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)
@@ -643,9 +1031,9 @@ class Socket < BasicSocket
 
   # UDP/IP address information used by Socket.udp_server_loop.
   class UDPSource
-    # +remote_adress+ is an Addrinfo object.
+    # +remote_address+ is an Addrinfo object.
     #
-    # +local_adress+ is an Addrinfo object.
+    # +local_address+ is an Addrinfo object.
     #
     # +reply_proc+ is a Proc used to send reply back to the source.
     def initialize(remote_address, local_address, &reply_proc)
@@ -661,7 +1049,7 @@ class Socket < BasicSocket
     attr_reader :local_address
 
     def inspect # :nodoc:
-      "\#<#{self.class}: #{@remote_address.inspect_sockaddr} to #{@local_address.inspect_sockaddr}>"
+      "\#<#{self.class}: #{@remote_address.inspect_sockaddr} to #{@local_address.inspect_sockaddr}>".dup
     end
 
     # Sends the String +msg+ to the source
@@ -692,7 +1080,7 @@ class Socket < BasicSocket
       begin
         yield sock
       ensure
-        sock.close if !sock.closed?
+        sock.close
       end
     else
       sock
@@ -716,26 +1104,38 @@ class Socket < BasicSocket
   #   }
   #
   def self.unix_server_socket(path)
-    begin
-      st = File.lstat(path)
-    rescue Errno::ENOENT
-    end
-    if st && st.socket? && st.owned?
-      File.unlink path
+    unless unix_socket_abstract_name?(path)
+      begin
+        st = File.lstat(path)
+      rescue Errno::ENOENT
+      end
+      if st&.socket? && st.owned?
+        File.unlink path
+      end
     end
     s = Addrinfo.unix(path).listen
     if block_given?
       begin
         yield s
       ensure
-        s.close if !s.closed?
-        File.unlink path
+        s.close
+        unless unix_socket_abstract_name?(path)
+          File.unlink path
+        end
       end
     else
       s
     end
   end
 
+  class << self
+    private
+
+    def unix_socket_abstract_name?(path)
+      /linux/ =~ RUBY_PLATFORM && /\A(\0|\z)/ =~ path
+    end
+  end
+
   # creates a UNIX socket server on _path_.
   # It calls the block for each socket accepted.
   #
@@ -766,5 +1166,192 @@ 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 a keyword argument _exception_ to +false+, you can 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 a keyword argument _exception_ to +false+, you can indicate
+  # that recvfrom_nonblock should not raise an IO::WaitReadable exception, but
+  # return the symbol +:wait_readable+ 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 a keyword argument _exception_ to +false+, you can 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 a keyword argument _exception_ to +false+, you can 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 ae28630179..620a5f60ff 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'optparse'
 require 'erb'
 
@@ -56,17 +57,12 @@ DEFS = h.to_a
 
 def each_const
   DEFS.each {|name, default_value|
-    if name =~ /\AINADDR_/
-      make_value = "UINT2NUM"
-    else
-      make_value = "INT2NUM"
-    end
     guard = nil
     if /\A(AF_INET6|PF_INET6|IPV6_.*)\z/ =~ name
-      # IPv6 is not supported although AF_INET6 is defined on bcc32/mingw
+      # IPv6 is not supported although AF_INET6 is defined on mingw
       guard = "defined(INET6)"
     end
-    yield guard, make_value, name, default_value
+    yield guard, name, default_value
   }
 end
 
@@ -77,8 +73,16 @@ def each_name(pat)
   }
 end
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
-% each_const {|guard, make_value, name, default_value|
+erb_new = lambda do |src, safe, trim|
+  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+    ERB.new(src, trim_mode: trim)
+  else
+    ERB.new(src, safe, trim)
+  end
+end
+
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
+% each_const {|guard, name, default_value|
 #if !defined(<%=name%>)
 # if defined(HAVE_CONST_<%=name.upcase%>)
 #  define <%=name%> <%=name%>
@@ -91,23 +95,23 @@ ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
 % }
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(make_value, name, default_value)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(name, default_value)")
 #if defined(<%=name%>)
     /* <%= COMMENTS[name] %> */
-    rb_define_const(rb_cSocket, <%=c_str name%>, <%=make_value%>(<%=name%>));
+    rb_define_const(rb_cSocket, <%=c_str name%>, INTEGER2NUM(<%=name%>));
     /* <%= COMMENTS[name] %> */
-    rb_define_const(rb_mSockConst, <%=c_str name%>, <%=make_value%>(<%=name%>));
+    rb_define_const(rb_mSockConst, <%=c_str name%>, INTEGER2NUM(<%=name%>));
 #endif
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
-% each_const {|guard, make_value, name, default_value|
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
+% each_const {|guard, name, default_value|
 %   if guard
 #if <%=guard%>
-<%= gen_const_defs_in_guard(make_value, name, default_value).chomp %>
+<%= gen_const_defs_in_guard(name, default_value).chomp %>
 #endif
 %   else
-<%= gen_const_defs_in_guard(make_value, name, default_value).chomp %>
+<%= gen_const_defs_in_guard(name, default_value).chomp %>
 %   end
 % }
 EOS
@@ -150,7 +154,7 @@ def each_names_with_len(pat, prefix_optional=nil)
   }
 end
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_decl(funcname, pat, prefix_optional, guard=nil)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_decl(funcname, pat, prefix_optional, guard=nil)")
 %if guard
 #ifdef <%=guard%>
 int <%=funcname%>(const char *str, long len, int *valp);
@@ -160,7 +164,7 @@ int <%=funcname%>(const char *str, long len, int *valp);
 %end
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard=nil)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard=nil)")
 int
 <%=funcname%>(const char *str, long len, int *valp)
 {
@@ -176,12 +180,13 @@ int
 
 %    }
       default:
+        if (!str || !valp) {/* wrong argument */}
         return -1;
     }
 }
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func(funcname, pat, prefix_optional, guard=nil)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func(funcname, pat, prefix_optional, guard=nil)")
 %if guard
 #ifdef <%=guard%>
 <%=gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard)%>
@@ -210,7 +215,7 @@ def reverse_each_name_with_prefix_optional(pat, prefix_pat)
   end
 end
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_var, pat, prefix_pat)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_var, pat, prefix_pat)")
     <%=hash_var%> = st_init_numtable();
 % reverse_each_name_with_prefix_optional(pat, prefix_pat) {|n,s|
 #ifdef <%=n%>
@@ -219,7 +224,7 @@ ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_var, pa
 % }
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)")
 ID
 <%=func_name%>(int val)
 {
@@ -230,7 +235,7 @@ ID
 }
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_decl(func_name, hash_var)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_decl(func_name, hash_var)")
 ID <%=func_name%>(int val);
 EOS
 
@@ -279,11 +284,23 @@ def_intern('rsock_intern_udp_optname',  /\AUDP_/, "UDP_")
 def_intern('rsock_intern_scm_optname',  /\ASCM_/, "SCM_")
 def_intern('rsock_intern_local_optname',  /\ALOCAL_/, "LOCAL_")
 
-result = ERB.new(<<'EOS', nil, '%').result(binding)
+result = erb_new.call(<<'EOS', nil, '%').result(binding)
 /* autogenerated file */
 
 <%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| vardef }.join("\n") %>
 
+#ifdef HAVE_LONG_LONG
+#define INTEGER2NUM(n) \
+    (FIXNUM_MAX < (n) ? ULL2NUM(n) : \
+     FIXNUM_MIN > (LONG_LONG)(n) ? LL2NUM(n) : \
+     LONG2FIX(n))
+#else
+#define INTEGER2NUM(n) \
+    (FIXNUM_MAX < (n) ? ULONG2NUM(n) : \
+     FIXNUM_MIN > (long)(n) ? LONG2NUM(n) : \
+     LONG2FIX(n))
+#endif
+
 static void
 init_constants(void)
 {
@@ -310,7 +327,7 @@ init_constants(void)
 
 EOS
 
-header_result = ERB.new(<<'EOS', nil, '%').result(binding)
+header_result = erb_new.call(<<'EOS', nil, '%').result(binding)
 /* autogenerated file */
 <%= gen_const_decls %>
 <%= NAME_TO_INT_DEFS.map {|decl, func| decl }.join("\n") %>
@@ -446,6 +463,7 @@ MSG_RST
 MSG_ERRQUEUE	nil	Fetch message from error queue
 MSG_NOSIGNAL	nil	Do not generate SIGPIPE
 MSG_MORE	nil	Sender will send more
+MSG_FASTOPEN nil Reduce step of the handshake process
 
 SOL_SOCKET	nil	Socket-level options
 SOL_IP	nil	IP socket options
@@ -532,6 +550,7 @@ IP_FREEBIND	nil	Allow binding to nonexistent IP addresses
 IP_IPSEC_POLICY	nil	IPsec security policy
 IP_XFRM_POLICY
 IP_PASSSEC	nil	Retrieve security context with datagram
+IP_TRANSPARENT  nil     Transparent proxy
 IP_PMTUDISC_DONT	nil	Never send DF frames
 IP_PMTUDISC_WANT	nil	Use per-route hints
 IP_PMTUDISC_DO	nil	Always send DF frames
@@ -560,6 +579,8 @@ SO_DONTROUTE	nil	Use interface addresses
 SO_BROADCAST	nil	Permit sending of broadcast messages
 SO_SNDBUF	nil	Send buffer size
 SO_RCVBUF	nil	Receive buffer size
+SO_SNDBUFFORCE  nil     Send buffer size without wmem_max limit (Linux 2.6.14)
+SO_RCVBUFFORCE  nil     Receive buffer size without rmem_max limit (Linux 2.6.14)
 SO_KEEPALIVE	nil	Keep connections alive
 SO_OOBINLINE	nil	Leave received out-of-band data in-line
 SO_NO_CHECK	nil	Disable checksums
@@ -586,6 +607,7 @@ SO_SECURITY_ENCRYPTION_NETWORK
 SO_BINDTODEVICE	nil	Only send packets from the given interface
 SO_ATTACH_FILTER	nil	Attach an accept filter
 SO_DETACH_FILTER	nil	Detach an accept filter
+SO_GET_FILTER   nil     Obtain filter set by SO_ATTACH_FILTER (Linux 3.8)
 SO_PEERNAME	nil	Name of the connecting user
 SO_TIMESTAMP	nil	Receive timestamp with datagrams (timeval)
 SO_TIMESTAMPNS	nil	Receive nanosecond timestamp with datagrams (timespec)
@@ -593,6 +615,21 @@ SO_BINTIME	nil	Receive timestamp with datagrams (bintime)
 SO_RECVUCRED	nil	Receive user credentials with datagram
 SO_MAC_EXEMPT	nil	Mandatory Access Control exemption for unlabeled peers
 SO_ALLZONES	nil	Bypass zone boundaries
+SO_PEERSEC      nil     Obtain the security credentials (Linux 2.6.2)
+SO_PASSSEC      nil     Toggle security context passing (Linux 2.6.18)
+SO_MARK         nil     Set the mark for mark-based routing (Linux 2.6.25)
+SO_TIMESTAMPING nil     Time stamping of incoming and outgoing packets (Linux 2.6.30)
+SO_PROTOCOL     nil     Protocol given for socket() (Linux 2.6.32)
+SO_DOMAIN       nil     Domain given for socket() (Linux 2.6.32)
+SO_RXQ_OVFL     nil     Toggle cmsg for number of packets dropped (Linux 2.6.33)
+SO_WIFI_STATUS  nil     Toggle cmsg for wifi status (Linux 3.3)
+SO_PEEK_OFF     nil     Set the peek offset (Linux 3.4)
+SO_NOFCS        nil     Set netns of a socket (Linux 3.4)
+SO_LOCK_FILTER  nil     Lock the filter attached to a socket (Linux 3.9)
+SO_SELECT_ERR_QUEUE     nil     Make select() detect socket error queue with errorfds (Linux 3.10)
+SO_BUSY_POLL    nil     Set the threshold in microseconds for low latency polling (Linux 3.11)
+SO_MAX_PACING_RATE      nil     Cap the rate computed by transport layer. [bytes per second] (Linux 3.13)
+SO_BPF_EXTENSIONS       nil     Query supported BPF extensions (Linux 3.14)
 
 SOPRI_INTERACTIVE	nil	Interactive socket priority
 SOPRI_NORMAL	nil	Normal socket priority
@@ -602,21 +639,32 @@ IPX_TYPE
 
 TCP_NODELAY	nil	Don't delay sending to coalesce packets
 TCP_MAXSEG	nil	Set maximum segment size
-TCP_CORK	nil	Don't send partial frames
-TCP_DEFER_ACCEPT	nil	Don't notify a listening socket until data is ready
-TCP_INFO	nil	Retrieve information about this socket
-TCP_KEEPCNT	nil	Maximum number of keepalive probes allowed before dropping a connection
-TCP_KEEPIDLE	nil	Idle time before keepalive probes are sent
-TCP_KEEPINTVL	nil	Time between keepalive probes
-TCP_LINGER2	nil	Lifetime of orphaned FIN_WAIT2 sockets
-TCP_MD5SIG	nil	Use MD5 digests (RFC2385)
+TCP_CORK	nil	Don't send partial frames (Linux 2.2, glibc 2.2)
+TCP_DEFER_ACCEPT	nil	Don't notify a listening socket until data is ready (Linux 2.4, glibc 2.2)
+TCP_INFO	nil	Retrieve information about this socket (Linux 2.4, glibc 2.2)
+TCP_KEEPCNT	nil	Maximum number of keepalive probes allowed before dropping a connection (Linux 2.4, glibc 2.2)
+TCP_KEEPIDLE	nil	Idle time before keepalive probes are sent (Linux 2.4, glibc 2.2)
+TCP_KEEPINTVL	nil	Time between keepalive probes (Linux 2.4, glibc 2.2)
+TCP_LINGER2	nil	Lifetime of orphaned FIN_WAIT2 sockets (Linux 2.4, glibc 2.2)
+TCP_MD5SIG	nil	Use MD5 digests (RFC2385, Linux 2.6.20, glibc 2.7)
 TCP_NOOPT	nil	Don't use TCP options
 TCP_NOPUSH	nil	Don't push the last block of write
-TCP_QUICKACK	nil	Enable quickack mode
-TCP_SYNCNT	nil	Number of SYN retransmits before a connection is dropped
-TCP_WINDOW_CLAMP	nil	Clamp the size of the advertised window
-
-UDP_CORK	nil	Don't send partial frames
+TCP_QUICKACK	nil	Enable quickack mode (Linux 2.4.4, glibc 2.3)
+TCP_SYNCNT	nil	Number of SYN retransmits before a connection is dropped (Linux 2.4, glibc 2.2)
+TCP_WINDOW_CLAMP	nil	Clamp the size of the advertised window (Linux 2.4, glibc 2.2)
+TCP_FASTOPEN nil Reduce step of the handshake process (Linux 3.7, glibc 2.18)
+TCP_CONGESTION  nil     TCP congestion control algorithm (Linux 2.6.13, glibc 2.6)
+TCP_COOKIE_TRANSACTIONS nil     TCP Cookie Transactions (Linux 2.6.33, glibc 2.18)
+TCP_QUEUE_SEQ   nil     Sequence of a queue for repair mode (Linux 3.5, glibc 2.18)
+TCP_REPAIR      nil     Repair mode (Linux 3.5, glibc 2.18)
+TCP_REPAIR_OPTIONS      nil     Options for repair mode (Linux 3.5, glibc 2.18)
+TCP_REPAIR_QUEUE        nil     Queue for repair mode (Linux 3.5, glibc 2.18)
+TCP_THIN_DUPACK nil     Duplicated acknowledgments handling for thin-streams (Linux 2.6.34, glibc 2.18)
+TCP_THIN_LINEAR_TIMEOUTS        nil     Linear timeouts for thin-streams (Linux 2.6.34, glibc 2.18)
+TCP_TIMESTAMP   nil     TCP timestamp (Linux 3.9, glibc 2.18)
+TCP_USER_TIMEOUT        nil     Max timeout before a TCP connection is aborted (Linux 2.6.37, glibc 2.18)
+
+UDP_CORK	nil	Don't send partial frames (Linux 2.5.44, glibc 2.11)
 
 EAI_ADDRFAMILY	nil	Address family for hostname not supported
 EAI_AGAIN	nil	Temporary failure in name resolution
@@ -690,16 +738,77 @@ INET6_ADDRSTRLEN	46	Maximum length of an IPv6 address string
 IFNAMSIZ	nil	Maximum interface name size
 IF_NAMESIZE	nil	Maximum interface name size
 
-SOMAXCONN	nil	Maximum connection requests that may be queued for a socket
+SOMAXCONN	5	Maximum connection requests that may be queued for a socket
 
 SCM_RIGHTS	nil	Access rights
 SCM_TIMESTAMP	nil	Timestamp (timeval)
 SCM_TIMESTAMPNS	nil	Timespec (timespec)
+SCM_TIMESTAMPING        nil     Timestamp (timespec list) (Linux 2.6.30)
 SCM_BINTIME	nil	Timestamp (bintime)
 SCM_CREDENTIALS	nil	The sender's credentials
 SCM_CREDS	nil	Process credentials
 SCM_UCRED	nil	User credentials
+SCM_WIFI_STATUS nil     Wifi status (Linux 3.3)
 
 LOCAL_PEERCRED	nil	Retrieve peer credentials
 LOCAL_CREDS	nil	Pass credentials to receiver
 LOCAL_CONNWAIT	nil	Connect blocks until accepted
+
+IFF_802_1Q_VLAN      nil 802.1Q VLAN device
+IFF_ALLMULTI         nil receive all multicast packets
+IFF_ALTPHYS          nil use alternate physical connection
+IFF_AUTOMEDIA        nil auto media select active
+IFF_BONDING          nil bonding master or slave
+IFF_BRIDGE_PORT      nil device used as bridge port
+IFF_BROADCAST        nil broadcast address valid
+IFF_CANTCONFIG       nil unconfigurable using ioctl(2)
+IFF_DEBUG            nil turn on debugging
+IFF_DISABLE_NETPOLL  nil disable netpoll at run-time
+IFF_DONT_BRIDGE      nil disallow bridging this ether dev
+IFF_DORMANT          nil driver signals dormant
+IFF_DRV_OACTIVE      nil tx hardware queue is full
+IFF_DRV_RUNNING      nil resources allocated
+IFF_DYING            nil interface is winding down
+IFF_DYNAMIC          nil dialup device with changing addresses
+IFF_EBRIDGE          nil ethernet bridging device
+IFF_ECHO             nil echo sent packets
+IFF_ISATAP           nil ISATAP interface (RFC4214)
+IFF_LINK0            nil per link layer defined bit 0
+IFF_LINK1            nil per link layer defined bit 1
+IFF_LINK2            nil per link layer defined bit 2
+IFF_LIVE_ADDR_CHANGE nil hardware address change when it's running
+IFF_LOOPBACK         nil loopback net
+IFF_LOWER_UP         nil driver signals L1 up
+IFF_MACVLAN_PORT     nil device used as macvlan port
+IFF_MASTER           nil master of a load balancer
+IFF_MASTER_8023AD    nil bonding master, 802.3ad.
+IFF_MASTER_ALB       nil bonding master, balance-alb.
+IFF_MASTER_ARPMON    nil bonding master, ARP mon in use
+IFF_MONITOR          nil user-requested monitor mode
+IFF_MULTICAST        nil supports multicast
+IFF_NOARP            nil no address resolution protocol
+IFF_NOTRAILERS       nil avoid use of trailers
+IFF_OACTIVE          nil transmission in progress
+IFF_OVS_DATAPATH     nil device used as Open vSwitch datapath port
+IFF_POINTOPOINT      nil point-to-point link
+IFF_PORTSEL          nil can set media type
+IFF_PPROMISC         nil user-requested promisc mode
+IFF_PROMISC          nil receive all packets
+IFF_RENAMING         nil interface is being renamed
+IFF_ROUTE            nil routing entry installed
+IFF_RUNNING          nil resources allocated
+IFF_SIMPLEX          nil can't hear own transmissions
+IFF_SLAVE            nil slave of a load balancer
+IFF_SLAVE_INACTIVE   nil bonding slave not the curr. active
+IFF_SLAVE_NEEDARP    nil need ARPs for validation
+IFF_SMART            nil interface manages own routes
+IFF_STATICARP        nil static ARP
+IFF_SUPP_NOFCS       nil sending custom FCS
+IFF_TEAM_PORT        nil used as team port
+IFF_TX_SKB_SHARING   nil sharing skbs on transmit
+IFF_UNICAST_FLT      nil unicast filtering
+IFF_UP               nil interface is up
+IFF_WAN_HDLC         nil WAN HDLC device
+IFF_XMIT_DST_RELEASE nil dev_hard_start_xmit() is allowed to release skb->dst
+IFF_VOLATILE         nil volatile flags
+IFF_CANTCHANGE       nil flags not changeable
diff --git a/ext/socket/option.c b/ext/socket/option.c
index 1f334bbca0..5ad44cdcd8 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -2,6 +2,51 @@
 
 VALUE rb_cSockOpt;
 
+#define pack_var(v) rb_str_new((const char *)&(v), sizeof(v))
+
+#define CAT(x,y) x##y
+#define XCAT(x,y) CAT(x,y)
+
+#if defined(__linux__) || \
+    defined(__GNU__) /* GNU/Hurd */ || \
+    defined(__FreeBSD__) || \
+    defined(__DragonFly__) || \
+    defined(__APPLE__) || \
+    defined(_WIN32) || \
+    defined(__CYGWIN__)
+# define TYPE_IP_MULTICAST_LOOP int
+# define TYPE_IP_MULTICAST_TTL int
+#else
+/* The original IP multicast implementation by Steve Deering
+ * NetBSD
+ * OpenBSD
+ * SunOS
+ */
+# define TYPE_IP_MULTICAST_LOOP byte
+# define TYPE_IP_MULTICAST_TTL byte
+# 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)
+{
+    char i = NUM2CHR(rb_to_int(value));
+    return pack_var(i);
+}
+
+static VALUE
+sockopt_pack_int(VALUE value)
+{
+    int i = NUM2INT(rb_to_int(value));
+    return pack_var(i);
+}
+
 static VALUE
 constant_to_sym(int constant, ID (*intern_const)(int))
 {
@@ -21,7 +66,7 @@ optname_to_sym(int level, int optname)
         return constant_to_sym(optname, rsock_intern_so_optname);
       case IPPROTO_IP:
         return constant_to_sym(optname, rsock_intern_ip_optname);
-#ifdef INET6
+#ifdef IPPROTO_IPV6
       case IPPROTO_IPV6:
         return constant_to_sym(optname, rsock_intern_ipv6_optname);
 #endif
@@ -61,8 +106,7 @@ sockopt_initialize(VALUE self, VALUE vfamily, VALUE vlevel, VALUE voptname, VALU
 VALUE
 rsock_sockopt_new(int family, int level, int optname, VALUE data)
 {
-    NEWOBJ(obj, struct RObject);
-    OBJSETUP(obj, rb_cSockOpt, T_OBJECT);
+    NEWOBJ_OF(obj, struct RObject, rb_cSockOpt, T_OBJECT);
     StringValue(data);
     sockopt_initialize((VALUE)obj, INT2NUM(family), INT2NUM(level), INT2NUM(optname), data);
     return (VALUE)obj;
@@ -128,6 +172,7 @@ sockopt_optname_m(VALUE self)
 /*
  * call-seq:
  *   sockopt.data => string
+ *   sockopt.to_s => string
  *
  * returns the socket option data as a string.
  *
@@ -144,6 +189,42 @@ sockopt_data(VALUE self)
 
 /*
  * call-seq:
+ *   Socket::Option.byte(family, level, optname, integer) => sockopt
+ *
+ * Creates a new Socket::Option object which contains a byte as data.
+ *
+ *   p Socket::Option.byte(:INET, :SOCKET, :KEEPALIVE, 1)
+ *   #=> #<Socket::Option: INET SOCKET KEEPALIVE 1>
+ */
+static VALUE
+sockopt_s_byte(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE vint)
+{
+    int family = rsock_family_arg(vfamily);
+    int level = rsock_level_arg(family, vlevel);
+    int optname = rsock_optname_arg(family, level, voptname);
+    return rsock_sockopt_new(family, level, optname, sockopt_pack_byte(vint));
+}
+
+/*
+ * call-seq:
+ *   sockopt.byte => integer
+ *
+ * Returns the data in _sockopt_ as an byte.
+ *
+ *   sockopt = Socket::Option.byte(:INET, :SOCKET, :KEEPALIVE, 1)
+ *   p sockopt.byte => 1
+ */
+static VALUE
+sockopt_byte(VALUE self)
+{
+    VALUE data = sockopt_data(self);
+    StringValue(data);
+    check_size(RSTRING_LEN(data), sizeof(char));
+    return CHR2FIX(*RSTRING_PTR(data));
+}
+
+/*
+ * call-seq:
  *   Socket::Option.int(family, level, optname, integer) => sockopt
  *
  * Creates a new Socket::Option object which contains an int as data.
@@ -159,8 +240,7 @@ sockopt_s_int(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE vi
     int family = rsock_family_arg(vfamily);
     int level = rsock_level_arg(family, vlevel);
     int optname = rsock_optname_arg(family, level, voptname);
-    int i = NUM2INT(vint);
-    return rsock_sockopt_new(family, level, optname, rb_str_new((char*)&i, sizeof(i)));
+    return rsock_sockopt_new(family, level, optname, sockopt_pack_int(vint));
 }
 
 /*
@@ -180,9 +260,7 @@ sockopt_int(VALUE self)
     int i;
     VALUE data = sockopt_data(self);
     StringValue(data);
-    if (RSTRING_LEN(data) != sizeof(int))
-        rb_raise(rb_eTypeError, "size differ.  expected as sizeof(int)=%d but %ld",
-                 (int)sizeof(int), (long)RSTRING_LEN(data));
+    check_size(RSTRING_LEN(data), sizeof(int));
     memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
     return INT2NUM(i);
 }
@@ -194,6 +272,8 @@ 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>
  *
@@ -208,7 +288,7 @@ sockopt_s_bool(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE v
     int level = rsock_level_arg(family, vlevel);
     int optname = rsock_optname_arg(family, level, voptname);
     int i = RTEST(vbool) ? 1 : 0;
-    return rsock_sockopt_new(family, level, optname, rb_str_new((char*)&i, sizeof(i)));
+    return rsock_sockopt_new(family, level, optname, pack_var(i));
 }
 
 /*
@@ -224,12 +304,15 @@ static VALUE
 sockopt_bool(VALUE self)
 {
     int i;
+    long len;
     VALUE data = sockopt_data(self);
     StringValue(data);
-    if (RSTRING_LEN(data) != sizeof(int))
-        rb_raise(rb_eTypeError, "size differ.  expected as sizeof(int)=%d but %ld",
-                 (int)sizeof(int), (long)RSTRING_LEN(data));
-    memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
+    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);
     return i == 0 ? Qfalse : Qtrue;
 }
 
@@ -258,7 +341,7 @@ sockopt_s_linger(VALUE klass, VALUE vonoff, VALUE vsecs)
     else
         l.l_onoff = RTEST(vonoff) ? 1 : 0;
     l.l_linger = NUM2INT(vsecs);
-    return rsock_sockopt_new(AF_UNSPEC, SOL_SOCKET, SO_LINGER, rb_str_new((char*)&l, sizeof(l)));
+    return rsock_sockopt_new(AF_UNSPEC, SOL_SOCKET, SO_LINGER, pack_var(l));
 }
 
 /*
@@ -281,9 +364,7 @@ sockopt_linger(VALUE self)
 
     if (level != SOL_SOCKET || optname != SO_LINGER)
         rb_raise(rb_eTypeError, "linger socket option expected");
-    if (RSTRING_LEN(data) != sizeof(l))
-        rb_raise(rb_eTypeError, "size differ.  expected as sizeof(struct linger)=%d but %ld",
-                 (int)sizeof(struct linger), (long)RSTRING_LEN(data));
+    check_size(RSTRING_LEN(data), sizeof(struct linger));
     memcpy((char*)&l, RSTRING_PTR(data), sizeof(struct linger));
     switch (l.l_onoff) {
       case 0: vonoff = Qfalse; break;
@@ -294,6 +375,112 @@ sockopt_linger(VALUE self)
     return rb_assoc_new(vonoff, vsecs);
 }
 
+/*
+ * call-seq:
+ *   Socket::Option.ipv4_multicast_loop(integer) => sockopt
+ *
+ * Creates a new Socket::Option object for IP_MULTICAST_LOOP.
+ *
+ * The size is dependent on the platform.
+ *
+ *   sockopt = Socket::Option.int(:INET, :IPPROTO_IP, :IP_MULTICAST_LOOP, 1)
+ *   p sockopt.int => 1
+ *
+ *   p Socket::Option.ipv4_multicast_loop(10)
+ *   #=> #<Socket::Option: INET IP MULTICAST_LOOP 10>
+ *
+ */
+static VALUE
+sockopt_s_ipv4_multicast_loop(VALUE klass, VALUE value)
+{
+
+#if defined(IPPROTO_IP) && defined(IP_MULTICAST_LOOP)
+    VALUE o = XCAT(sockopt_pack_,TYPE_IP_MULTICAST_LOOP)(value);
+    return rsock_sockopt_new(AF_INET, IPPROTO_IP, IP_MULTICAST_LOOP, o);
+#else
+# error IPPROTO_IP or IP_MULTICAST_LOOP is not implemented
+#endif
+}
+
+/*
+ * call-seq:
+ *   sockopt.ipv4_multicast_loop => integer
+ *
+ * Returns the ipv4_multicast_loop data in _sockopt_ as an integer.
+ *
+ *   sockopt = Socket::Option.ipv4_multicast_loop(10)
+ *   p sockopt.ipv4_multicast_loop => 10
+ */
+static VALUE
+sockopt_ipv4_multicast_loop(VALUE self)
+{
+    int family = NUM2INT(sockopt_family_m(self));
+    int level = sockopt_level(self);
+    int optname = sockopt_optname(self);
+
+#if defined(IPPROTO_IP) && defined(IP_MULTICAST_LOOP)
+    if (family == AF_INET && level == IPPROTO_IP && optname == IP_MULTICAST_LOOP) {
+	return XCAT(sockopt_,TYPE_IP_MULTICAST_LOOP)(self);
+    }
+#endif
+    rb_raise(rb_eTypeError, "ipv4_multicast_loop socket option expected");
+    UNREACHABLE_RETURN(Qnil);
+}
+
+#define inspect_ipv4_multicast_loop(a,b,c,d) \
+  XCAT(inspect_,TYPE_IP_MULTICAST_LOOP)(a,b,c,d)
+
+/*
+ * call-seq:
+ *   Socket::Option.ipv4_multicast_ttl(integer) => sockopt
+ *
+ * Creates a new Socket::Option object for IP_MULTICAST_TTL.
+ *
+ * The size is dependent on the platform.
+ *
+ *   p Socket::Option.ipv4_multicast_ttl(10)
+ *   #=> #<Socket::Option: INET IP MULTICAST_TTL 10>
+ *
+ */
+static VALUE
+sockopt_s_ipv4_multicast_ttl(VALUE klass, VALUE value)
+{
+#if defined(IPPROTO_IP) && defined(IP_MULTICAST_TTL)
+    VALUE o = XCAT(sockopt_pack_,TYPE_IP_MULTICAST_TTL)(value);
+    return rsock_sockopt_new(AF_INET, IPPROTO_IP, IP_MULTICAST_TTL, o);
+#else
+# error IPPROTO_IP or IP_MULTICAST_TTL is not implemented
+#endif
+}
+
+/*
+ * call-seq:
+ *   sockopt.ipv4_multicast_ttl => integer
+ *
+ * Returns the ipv4_multicast_ttl data in _sockopt_ as an integer.
+ *
+ *   sockopt = Socket::Option.ipv4_multicast_ttl(10)
+ *   p sockopt.ipv4_multicast_ttl => 10
+ */
+static VALUE
+sockopt_ipv4_multicast_ttl(VALUE self)
+{
+    int family = NUM2INT(sockopt_family_m(self));
+    int level = sockopt_level(self);
+    int optname = sockopt_optname(self);
+
+#if defined(IPPROTO_IP) && defined(IP_MULTICAST_TTL)
+    if (family == AF_INET && level == IPPROTO_IP && optname == IP_MULTICAST_TTL) {
+	return XCAT(sockopt_,TYPE_IP_MULTICAST_TTL)(self);
+    }
+#endif
+    rb_raise(rb_eTypeError, "ipv4_multicast_ttl socket option expected");
+    UNREACHABLE_RETURN(Qnil);
+}
+
+#define inspect_ipv4_multicast_ttl(a,b,c,d) \
+    XCAT(inspect_,TYPE_IP_MULTICAST_TTL)(a,b,c,d)
+
 static int
 inspect_int(int level, int optname, VALUE data, VALUE ret)
 {
@@ -308,6 +495,20 @@ inspect_int(int level, int optname, VALUE data, VALUE ret)
     }
 }
 
+#ifdef USE_INSPECT_BYTE
+static int
+inspect_byte(int level, int optname, VALUE data, VALUE ret)
+{
+    if (RSTRING_LEN(data) == sizeof(unsigned char)) {
+        rb_str_catf(ret, " %d", (unsigned char)*RSTRING_PTR(data));
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
 static int
 inspect_errno(int level, int optname, VALUE data, VALUE ret)
 {
@@ -404,6 +605,15 @@ inspect_timeval_as_interval(int level, int optname, VALUE data, VALUE ret)
  *   (MULTICAST 1.2 Release)
  *   http://www.kohala.com/start/mcast.api.txt
  *
+ * There are 2 socket options which takes a u_char (unsigned char).
+ *
+ *   IP_MULTICAST_TTL
+ *   IP_MULTICAST_LOOP
+ *
+ * However Linux and FreeBSD setsockname accepts int argument
+ * as well as u_char.
+ * Their getsockname returns int.
+ *
  * There are 3 socket options which takes a struct.
  *
  *   IP_MULTICAST_IF: struct in_addr
@@ -436,8 +646,8 @@ inspect_timeval_as_interval(int level, int optname, VALUE data, VALUE ret)
  * it is not distinguishable by the size.
  */
 
-#ifndef HAVE_INET_NTOP
-static char *
+#if !defined HAVE_INET_NTOP && ! defined _WIN32
+const char *
 inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
 {
 #ifdef HAVE_INET_NTOA
@@ -600,6 +810,333 @@ inspect_ipv6_mreq(int level, int optname, VALUE data, VALUE ret)
 }
 #endif
 
+#if defined(IPPROTO_TCP) && defined(TCP_INFO) && defined(HAVE_TYPE_STRUCT_TCP_INFO)
+
+#ifdef __FreeBSD__
+# ifndef HAVE_CONST_TCP_ESTABLISHED
+#  define TCP_ESTABLISHED TCPS_ESTABLISHED
+# endif
+# ifndef HAVE_CONST_TCP_SYN_SENT
+#  define TCP_SYN_SENT TCPS_SYN_SENT
+# endif
+# ifndef HAVE_CONST_TCP_SYN_RECV
+#  define TCP_SYN_RECV TCPS_SYN_RECEIVED
+# endif
+# ifndef HAVE_CONST_TCP_FIN_WAIT1
+#  define TCP_FIN_WAIT1 TCPS_FIN_WAIT_1
+# endif
+# ifndef HAVE_CONST_TCP_FIN_WAIT2
+#  define TCP_FIN_WAIT2 TCPS_FIN_WAIT_2
+# endif
+# ifndef HAVE_CONST_TCP_TIME_WAIT
+#  define TCP_TIME_WAIT TCPS_TIME_WAIT
+# endif
+# ifndef HAVE_CONST_TCP_CLOSE
+#  define TCP_CLOSE TCPS_CLOSED
+# endif
+# ifndef HAVE_CONST_TCP_CLOSE_WAIT
+#  define TCP_CLOSE_WAIT TCPS_CLOSE_WAIT
+# endif
+# ifndef HAVE_CONST_TCP_LAST_ACK
+#  define TCP_LAST_ACK TCPS_LAST_ACK
+# endif
+# ifndef HAVE_CONST_TCP_LISTEN
+#  define TCP_LISTEN TCPS_LISTEN
+# endif
+# ifndef HAVE_CONST_TCP_CLOSING
+#  define TCP_CLOSING TCPS_CLOSING
+# endif
+#endif
+
+#if defined(HAVE_CONST_TCP_ESTABLISHED) && !defined(TCP_ESTABLISHED)
+# define TCP_ESTABLISHED TCP_ESTABLISHED
+#endif
+#if defined(HAVE_CONST_TCP_SYN_SENT) && !defined(TCP_SYN_SENT)
+# define TCP_SYN_SENT TCP_SYN_SENT
+#endif
+#if defined(HAVE_CONST_TCP_SYN_RECV) && !defined(TCP_SYN_RECV)
+# define TCP_SYN_RECV TCP_SYN_RECV
+#endif
+#if defined(HAVE_CONST_TCP_FIN_WAIT1) && !defined(TCP_FIN_WAIT1)
+# define TCP_FIN_WAIT1 TCP_FIN_WAIT1
+#endif
+#if defined(HAVE_CONST_TCP_FIN_WAIT2) && !defined(TCP_FIN_WAIT2)
+# define TCP_FIN_WAIT2 TCP_FIN_WAIT2
+#endif
+#if defined(HAVE_CONST_TCP_TIME_WAIT) && !defined(TCP_TIME_WAIT)
+# define TCP_TIME_WAIT TCP_TIME_WAIT
+#endif
+#if defined(HAVE_CONST_TCP_CLOSE) && !defined(TCP_CLOSE)
+# define TCP_CLOSE TCP_CLOSE
+#endif
+#if defined(HAVE_CONST_TCP_CLOSE_WAIT) && !defined(TCP_CLOSE_WAIT)
+# define TCP_CLOSE_WAIT TCP_CLOSE_WAIT
+#endif
+#if defined(HAVE_CONST_TCP_LAST_ACK) && !defined(TCP_LAST_ACK)
+# define TCP_LAST_ACK TCP_LAST_ACK
+#endif
+#if defined(HAVE_CONST_TCP_LISTEN) && !defined(TCP_LISTEN)
+# define TCP_LISTEN TCP_LISTEN
+#endif
+#if defined(HAVE_CONST_TCP_CLOSING) && !defined(TCP_CLOSING)
+# define TCP_CLOSING TCP_CLOSING
+#endif
+
+static void
+inspect_tcpi_options(VALUE ret, uint8_t options)
+{
+    int sep = '=';
+
+    rb_str_cat2(ret, " options");
+#define INSPECT_TCPI_OPTION(optval, name) \
+    if (options & (optval)) { \
+        options &= ~(uint8_t)(optval); \
+        rb_str_catf(ret, "%c%s", sep, name); \
+        sep = ','; \
+    }
+#ifdef TCPI_OPT_TIMESTAMPS /* GNU/Linux, FreeBSD */
+    INSPECT_TCPI_OPTION(TCPI_OPT_TIMESTAMPS, "TIMESTAMPS");
+#endif
+#ifdef TCPI_OPT_SACK /* GNU/Linux, FreeBSD */
+    INSPECT_TCPI_OPTION(TCPI_OPT_SACK, "SACK");
+#endif
+#ifdef TCPI_OPT_WSCALE /* GNU/Linux, FreeBSD */
+    INSPECT_TCPI_OPTION(TCPI_OPT_WSCALE, "WSCALE");
+#endif
+#ifdef TCPI_OPT_ECN /* GNU/Linux, FreeBSD */
+    INSPECT_TCPI_OPTION(TCPI_OPT_ECN, "ECN");
+#endif
+#ifdef TCPI_OPT_ECN_SEEN /* GNU/Linux */
+    INSPECT_TCPI_OPTION(TCPI_OPT_ECN_SEEN, "ECN_SEEN");
+#endif
+#ifdef TCPI_OPT_SYN_DATA /* GNU/Linux */
+    INSPECT_TCPI_OPTION(TCPI_OPT_SYN_DATA, "SYN_DATA");
+#endif
+#ifdef TCPI_OPT_TOE /* FreeBSD */
+    INSPECT_TCPI_OPTION(TCPI_OPT_TOE, "TOE");
+#endif
+#undef INSPECT_TCPI_OPTION
+
+    if (options || sep == '=') {
+        rb_str_catf(ret, "%c%u", sep, options);
+    }
+}
+
+static void
+inspect_tcpi_usec(VALUE ret, const char *prefix, uint32_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)
+static void
+inspect_tcpi_msec(VALUE ret, const char *prefix, uint32_t t)
+{
+    rb_str_catf(ret, "%s%u.%03us", prefix, t / 1000, t % 1000);
+}
+#endif
+
+#ifdef __FreeBSD__
+# define inspect_tcpi_rto(ret, t) inspect_tcpi_usec(ret, " rto=", t)
+# define inspect_tcpi_last_data_recv(ret, t) inspect_tcpi_usec(ret, " last_data_recv=", t)
+# define inspect_tcpi_rtt(ret, t) inspect_tcpi_usec(ret, " rtt=", t)
+# define inspect_tcpi_rttvar(ret, t) inspect_tcpi_usec(ret, " rttvar=", t)
+#else
+# define inspect_tcpi_rto(ret, t) inspect_tcpi_usec(ret, " rto=", t)
+# define inspect_tcpi_ato(ret, t) inspect_tcpi_usec(ret, " ato=", t)
+# define inspect_tcpi_last_data_sent(ret, t) inspect_tcpi_msec(ret, " last_data_sent=", t)
+# define inspect_tcpi_last_data_recv(ret, t) inspect_tcpi_msec(ret, " last_data_recv=", t)
+# define inspect_tcpi_last_ack_sent(ret, t) inspect_tcpi_msec(ret, " last_ack_sent=", t)
+# define inspect_tcpi_last_ack_recv(ret, t) inspect_tcpi_msec(ret, " last_ack_recv=", t)
+# define inspect_tcpi_rtt(ret, t) inspect_tcpi_usec(ret, " rtt=", t)
+# define inspect_tcpi_rttvar(ret, t) inspect_tcpi_usec(ret, " rttvar=", t)
+# define inspect_tcpi_rcv_rtt(ret, t) inspect_tcpi_usec(ret, " rcv_rtt=", t)
+#endif
+
+static int
+inspect_tcp_info(int level, int optname, VALUE data, VALUE ret)
+{
+    size_t actual_size = RSTRING_LEN(data);
+    if (sizeof(struct tcp_info) <= actual_size) {
+        struct tcp_info s;
+        memcpy((char*)&s, RSTRING_PTR(data), sizeof(s));
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_STATE
+        switch (s.tcpi_state) {
+# ifdef TCP_ESTABLISHED
+          case TCP_ESTABLISHED: rb_str_cat_cstr(ret, " state=ESTABLISHED"); break;
+# endif
+# ifdef TCP_SYN_SENT
+          case TCP_SYN_SENT: rb_str_cat_cstr(ret, " state=SYN_SENT"); break;
+# endif
+# ifdef TCP_SYN_RECV
+          case TCP_SYN_RECV: rb_str_cat_cstr(ret, " state=SYN_RECV"); break;
+# endif
+# ifdef TCP_FIN_WAIT1
+          case TCP_FIN_WAIT1: rb_str_cat_cstr(ret, " state=FIN_WAIT1"); break;
+# endif
+# ifdef TCP_FIN_WAIT2
+          case TCP_FIN_WAIT2: rb_str_cat_cstr(ret, " state=FIN_WAIT2"); break;
+# endif
+# ifdef TCP_TIME_WAIT
+          case TCP_TIME_WAIT: rb_str_cat_cstr(ret, " state=TIME_WAIT"); break;
+# endif
+# ifdef TCP_CLOSE
+          case TCP_CLOSE: rb_str_cat_cstr(ret, " state=CLOSED"); break; /* RFC 793 uses "CLOSED", not "CLOSE" */
+# endif
+# ifdef TCP_CLOSE_WAIT
+          case TCP_CLOSE_WAIT: rb_str_cat_cstr(ret, " state=CLOSE_WAIT"); break;
+# endif
+# ifdef TCP_LAST_ACK
+          case TCP_LAST_ACK: rb_str_cat_cstr(ret, " state=LAST_ACK"); break;
+# endif
+# ifdef TCP_LISTEN
+          case TCP_LISTEN: rb_str_cat_cstr(ret, " state=LISTEN"); break;
+# endif
+# ifdef TCP_CLOSING
+          case TCP_CLOSING: rb_str_cat_cstr(ret, " state=CLOSING"); break;
+# endif
+          default: rb_str_catf(ret, " state=%u", s.tcpi_state); break;
+        }
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_CA_STATE
+        switch (s.tcpi_ca_state) {
+          case TCP_CA_Open: rb_str_cat_cstr(ret, " ca_state=Open"); break;
+          case TCP_CA_Disorder: rb_str_cat_cstr(ret, " ca_state=Disorder"); break;
+          case TCP_CA_CWR: rb_str_cat_cstr(ret, " ca_state=CWR"); break;
+          case TCP_CA_Recovery: rb_str_cat_cstr(ret, " ca_state=Recovery"); break;
+          case TCP_CA_Loss: rb_str_cat_cstr(ret, " ca_state=Loss"); break;
+          default: rb_str_catf(ret, " ca_state=%u", s.tcpi_ca_state); break;
+        }
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_RETRANSMITS
+        rb_str_catf(ret, " retransmits=%u", s.tcpi_retransmits);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_PROBES
+        rb_str_catf(ret, " probes=%u", s.tcpi_probes);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_BACKOFF
+        rb_str_catf(ret, " backoff=%u", s.tcpi_backoff);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_OPTIONS
+        inspect_tcpi_options(ret, s.tcpi_options);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_SND_WSCALE
+        rb_str_catf(ret, " snd_wscale=%u", s.tcpi_snd_wscale);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_RCV_WSCALE
+        rb_str_catf(ret, " rcv_wscale=%u", s.tcpi_rcv_wscale);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_RTO
+        inspect_tcpi_rto(ret, s.tcpi_rto);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_ATO
+        inspect_tcpi_ato(ret, s.tcpi_ato);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_SND_MSS
+        rb_str_catf(ret, " snd_mss=%u", s.tcpi_snd_mss);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_RCV_MSS
+        rb_str_catf(ret, " rcv_mss=%u", s.tcpi_rcv_mss);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_UNACKED
+        rb_str_catf(ret, " unacked=%u", s.tcpi_unacked);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_SACKED
+        rb_str_catf(ret, " sacked=%u", s.tcpi_sacked);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_LOST
+        rb_str_catf(ret, " lost=%u", s.tcpi_lost);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_RETRANS
+        rb_str_catf(ret, " retrans=%u", s.tcpi_retrans);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_FACKETS
+        rb_str_catf(ret, " fackets=%u", s.tcpi_fackets);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_SENT
+	inspect_tcpi_last_data_sent(ret, s.tcpi_last_data_sent);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_SENT
+	inspect_tcpi_last_ack_sent(ret, s.tcpi_last_ack_sent);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_RECV
+	inspect_tcpi_last_data_recv(ret, s.tcpi_last_data_recv);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_RECV
+	inspect_tcpi_last_ack_recv(ret, s.tcpi_last_ack_recv);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_PMTU
+        rb_str_catf(ret, " pmtu=%u", s.tcpi_pmtu);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_RCV_SSTHRESH
+        rb_str_catf(ret, " rcv_ssthresh=%u", s.tcpi_rcv_ssthresh);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_RTT
+	inspect_tcpi_rtt(ret, s.tcpi_rtt);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_RTTVAR
+	inspect_tcpi_rttvar(ret, s.tcpi_rttvar);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_SND_SSTHRESH
+        rb_str_catf(ret, " snd_ssthresh=%u", s.tcpi_snd_ssthresh);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_SND_CWND
+        rb_str_catf(ret, " snd_cwnd=%u", s.tcpi_snd_cwnd);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_ADVMSS
+        rb_str_catf(ret, " advmss=%u", s.tcpi_advmss);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_REORDERING
+        rb_str_catf(ret, " reordering=%u", s.tcpi_reordering);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_RCV_RTT
+        inspect_tcpi_rcv_rtt(ret, s.tcpi_rcv_rtt);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_RCV_SPACE
+        rb_str_catf(ret, " rcv_space=%u", s.tcpi_rcv_space);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_TOTAL_RETRANS
+        rb_str_catf(ret, " total_retrans=%u", s.tcpi_total_retrans);
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_SND_WND
+        rb_str_catf(ret, " snd_wnd=%u", s.tcpi_snd_wnd); /* FreeBSD */
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_SND_BWND
+        rb_str_catf(ret, " snd_bwnd=%u", s.tcpi_snd_bwnd); /* FreeBSD */
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_SND_NXT
+        rb_str_catf(ret, " snd_nxt=%u", s.tcpi_snd_nxt); /* FreeBSD */
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_RCV_NXT
+        rb_str_catf(ret, " rcv_nxt=%u", s.tcpi_rcv_nxt); /* FreeBSD */
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_TOE_TID
+        rb_str_catf(ret, " toe_tid=%u", s.tcpi_toe_tid); /* FreeBSD */
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_SND_REXMITPACK
+        rb_str_catf(ret, " snd_rexmitpack=%u", s.tcpi_snd_rexmitpack); /* FreeBSD */
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_RCV_OOOPACK
+        rb_str_catf(ret, " rcv_ooopack=%u", s.tcpi_rcv_ooopack); /* FreeBSD */
+#endif
+#ifdef HAVE_STRUCT_TCP_INFO_TCPI_SND_ZEROWIN
+        rb_str_catf(ret, " snd_zerowin=%u", s.tcpi_snd_zerowin); /* FreeBSD */
+#endif
+        if (sizeof(struct tcp_info) < actual_size)
+            rb_str_catf(ret, " (%u bytes too long)", (unsigned)(actual_size - sizeof(struct tcp_info)));
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+#endif
+
 #if defined(SOL_SOCKET) && defined(SO_PEERCRED) /* GNU/Linux, OpenBSD */
 #if defined(__OpenBSD__)
 #define RUBY_SOCK_PEERCRED struct sockpeercred
@@ -712,7 +1249,7 @@ sockopt_inspect(VALUE self)
 
 	v = optname_to_sym(level, optname);
 	if (SYMBOL_P(v))
-	    rb_str_catf(ret, " %s", rb_id2name(SYM2ID(v)));
+	    rb_str_catf(ret, " %"PRIsVALUE, rb_sym2str(v));
 	else
 	    rb_str_catf(ret, " optname:%d", optname);
     }
@@ -803,6 +1340,12 @@ sockopt_inspect(VALUE self)
 #            if defined(IP_DROP_MEMBERSHIP) /* 4.4BSD, GNU/Linux */
               case IP_DROP_MEMBERSHIP: inspected = inspect_ipv4_add_drop_membership(level, optname, data, ret); break;
 #            endif
+#            if defined(IP_MULTICAST_LOOP) /* 4.4BSD, GNU/Linux */
+              case IP_MULTICAST_LOOP: inspected = inspect_ipv4_multicast_loop(level, optname, data, ret); break;
+#            endif
+#            if defined(IP_MULTICAST_TTL) /* 4.4BSD, GNU/Linux */
+              case IP_MULTICAST_TTL: inspected = inspect_ipv4_multicast_ttl(level, optname, data, ret); break;
+#            endif
             }
             break;
 #        endif
@@ -841,6 +1384,9 @@ sockopt_inspect(VALUE self)
 #            if defined(TCP_NODELAY) /* POSIX */
               case TCP_NODELAY: inspected = inspect_int(level, optname, data, ret); break;
 #            endif
+#            if defined(TCP_INFO) && defined(HAVE_TYPE_STRUCT_TCP_INFO) /* Linux, FreeBSD */
+              case TCP_INFO: inspected = inspect_tcp_info(level, optname, data, ret); break;
+#            endif
             }
             break;
 #        endif
@@ -910,14 +1456,22 @@ rsock_init_sockopt(void)
     rb_define_singleton_method(rb_cSockOpt, "int", sockopt_s_int, 4);
     rb_define_method(rb_cSockOpt, "int", sockopt_int, 0);
 
+    rb_define_singleton_method(rb_cSockOpt, "byte", sockopt_s_byte, 4);
+    rb_define_method(rb_cSockOpt, "byte", sockopt_byte, 0);
+
     rb_define_singleton_method(rb_cSockOpt, "bool", sockopt_s_bool, 4);
     rb_define_method(rb_cSockOpt, "bool", sockopt_bool, 0);
 
     rb_define_singleton_method(rb_cSockOpt, "linger", sockopt_s_linger, 2);
     rb_define_method(rb_cSockOpt, "linger", sockopt_linger, 0);
 
+    rb_define_singleton_method(rb_cSockOpt, "ipv4_multicast_ttl", sockopt_s_ipv4_multicast_ttl, 1);
+    rb_define_method(rb_cSockOpt, "ipv4_multicast_ttl", sockopt_ipv4_multicast_ttl, 0);
+
+    rb_define_singleton_method(rb_cSockOpt, "ipv4_multicast_loop", sockopt_s_ipv4_multicast_loop, 1);
+    rb_define_method(rb_cSockOpt, "ipv4_multicast_loop", sockopt_ipv4_multicast_loop, 0);
+
     rb_define_method(rb_cSockOpt, "unpack", sockopt_unpack, 1);
 
     rb_define_method(rb_cSockOpt, "to_s", sockopt_data, 0); /* compatibility for ruby before 1.9.2 */
 }
-
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
index 2229269212..9ec2fdc329 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -1,6 +1,6 @@
 /************************************************
 
-  ainfo.c -
+  raddrinfo.c -
 
   created at: Thu Mar 31 12:21:29 JST 1994
 
@@ -145,6 +145,34 @@ ruby_getaddrinfo__darwin(const char *nodename, const char *servname,
 #define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__darwin((node),(serv),(hints),(res))
 #endif
 
+#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
+
 #ifndef GETADDRINFO_EMU
 struct getaddrinfo_arg
 {
@@ -154,33 +182,232 @@ struct getaddrinfo_arg
     struct addrinfo **res;
 };
 
-static VALUE
+static void *
 nogvl_getaddrinfo(void *arg)
 {
+    int ret;
     struct getaddrinfo_arg *ptr = arg;
-    return getaddrinfo(ptr->node, ptr->service,
-                       ptr->hints, ptr->res);
+    ret = getaddrinfo(ptr->node, ptr->service, ptr->hints, ptr->res);
+#ifdef __linux__
+    /* On Linux (mainly Ubuntu 13.04) /etc/nsswitch.conf has mdns4 and
+     * it cause getaddrinfo to return EAI_SYSTEM/ENOENT. [ruby-list:49420]
+     */
+    if (ret == EAI_SYSTEM && errno == ENOENT)
+	ret = EAI_NONAME;
+#endif
+    return (void *)(VALUE)ret;
 }
 #endif
 
+#ifdef HAVE_GETADDRINFO_A
+struct gai_suspend_arg
+{
+    struct gaicb *req;
+    struct timespec *timeout;
+};
+
+static void *
+nogvl_gai_suspend(void *arg)
+{
+    int ret;
+    struct gai_suspend_arg *ptr = arg;
+    struct gaicb const *wait_reqs[1];
+
+    wait_reqs[0] = ptr->req;
+    ret = gai_suspend(wait_reqs, 1, ptr->timeout);
+
+    return (void *)(VALUE)ret;
+}
+#endif
+
+static int
+numeric_getaddrinfo(const char *node, const char *service,
+        const struct addrinfo *hints,
+        struct addrinfo **res)
+{
+#ifdef HAVE_INET_PTON
+# if defined __MINGW64__
+#   define inet_pton(f,s,d)        rb_w32_inet_pton(f,s,d)
+# endif
+
+    int port;
+
+    if (node && parse_numeric_port(service, &port)) {
+	static const struct {
+	    int socktype;
+	    int protocol;
+	} list[] = {
+	    { SOCK_STREAM, IPPROTO_TCP },
+	    { SOCK_DGRAM, IPPROTO_UDP },
+	    { SOCK_RAW, 0 }
+	};
+	struct addrinfo *ai = NULL;
+        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;
+        char ipv4addr[4];
+#ifdef AF_INET6
+        char ipv6addr[16];
+        if ((hint_family == PF_UNSPEC || hint_family == PF_INET6) &&
+            strspn(node, "0123456789abcdefABCDEF.:") == strlen(node) &&
+            inet_pton(AF_INET6, node, ipv6addr)) {
+            int i;
+            for (i = numberof(list)-1; 0 <= i; i--) {
+                if ((hint_socktype == 0 || hint_socktype == list[i].socktype) &&
+                    (hint_protocol == 0 || list[i].protocol == 0 || hint_protocol == list[i].protocol)) {
+                    struct addrinfo *ai0 = xcalloc(1, sizeof(struct addrinfo));
+                    struct sockaddr_in6 *sa = xmalloc(sizeof(struct sockaddr_in6));
+                    INIT_SOCKADDR_IN6(sa, sizeof(struct sockaddr_in6));
+                    memcpy(&sa->sin6_addr, ipv6addr, sizeof(ipv6addr));
+                    sa->sin6_port = htons(port);
+                    ai0->ai_family = PF_INET6;
+                    ai0->ai_socktype = list[i].socktype;
+                    ai0->ai_protocol = hint_protocol ? hint_protocol : list[i].protocol;
+                    ai0->ai_addrlen = sizeof(struct sockaddr_in6);
+                    ai0->ai_addr = (struct sockaddr *)sa;
+                    ai0->ai_canonname = NULL;
+                    ai0->ai_next = ai;
+                    ai = ai0;
+                }
+            }
+        }
+        else
+#endif
+        if ((hint_family == PF_UNSPEC || hint_family == PF_INET) &&
+            strspn(node, "0123456789.") == strlen(node) &&
+            inet_pton(AF_INET, node, ipv4addr)) {
+            int i;
+            for (i = numberof(list)-1; 0 <= i; i--) {
+                if ((hint_socktype == 0 || hint_socktype == list[i].socktype) &&
+                    (hint_protocol == 0 || list[i].protocol == 0 || hint_protocol == list[i].protocol)) {
+                    struct addrinfo *ai0 = xcalloc(1, sizeof(struct addrinfo));
+                    struct sockaddr_in *sa = xmalloc(sizeof(struct sockaddr_in));
+                    INIT_SOCKADDR_IN(sa, sizeof(struct sockaddr_in));
+                    memcpy(&sa->sin_addr, ipv4addr, sizeof(ipv4addr));
+                    sa->sin_port = htons(port);
+                    ai0->ai_family = PF_INET;
+                    ai0->ai_socktype = list[i].socktype;
+                    ai0->ai_protocol = hint_protocol ? hint_protocol : list[i].protocol;
+                    ai0->ai_addrlen = sizeof(struct sockaddr_in);
+                    ai0->ai_addr = (struct sockaddr *)sa;
+                    ai0->ai_canonname = NULL;
+                    ai0->ai_next = ai;
+                    ai = ai0;
+                }
+            }
+        }
+        if (ai) {
+            *res = ai;
+            return 0;
+        }
+    }
+#endif
+    return EAI_FAIL;
+}
+
 int
 rb_getaddrinfo(const char *node, const char *service,
                const struct addrinfo *hints,
-               struct addrinfo **res)
+               struct rb_addrinfo **res)
 {
+    struct addrinfo *ai;
+    int ret;
+    int allocated_by_malloc = 0;
+
+    ret = numeric_getaddrinfo(node, service, hints, &ai);
+    if (ret == 0)
+        allocated_by_malloc = 1;
+    else {
 #ifdef GETADDRINFO_EMU
-    return getaddrinfo(node, service, hints, res);
+        ret = getaddrinfo(node, service, hints, &ai);
 #else
-    struct getaddrinfo_arg arg;
+        struct getaddrinfo_arg arg;
+        MEMZERO(&arg, struct getaddrinfo_arg, 1);
+        arg.node = node;
+        arg.service = service;
+        arg.hints = hints;
+        arg.res = &ai;
+        ret = (int)(VALUE)rb_thread_call_without_gvl(nogvl_getaddrinfo, &arg, RUBY_UBF_IO, 0);
+#endif
+    }
+
+    if (ret == 0) {
+        *res = (struct rb_addrinfo *)xmalloc(sizeof(struct rb_addrinfo));
+        (*res)->allocated_by_malloc = allocated_by_malloc;
+        (*res)->ai = ai;
+    }
+    return ret;
+}
+
+#ifdef HAVE_GETADDRINFO_A
+int
+rb_getaddrinfo_a(const char *node, const char *service,
+               const struct addrinfo *hints,
+               struct rb_addrinfo **res, struct timespec *timeout)
+{
+    struct addrinfo *ai;
     int ret;
-    MEMZERO(&arg, sizeof arg, 1);
-    arg.node = node;
-    arg.service = service;
-    arg.hints = hints;
-    arg.res = res;
-    ret = (int)BLOCKING_REGION(nogvl_getaddrinfo, &arg);
+    int allocated_by_malloc = 0;
+
+    ret = numeric_getaddrinfo(node, service, hints, &ai);
+    if (ret == 0)
+        allocated_by_malloc = 1;
+    else {
+	struct gai_suspend_arg arg;
+	struct gaicb *reqs[1];
+	struct gaicb req;
+
+	req.ar_name = node;
+	req.ar_service = service;
+	req.ar_request = hints;
+
+	reqs[0] = &req;
+	ret = getaddrinfo_a(GAI_NOWAIT, reqs, 1, NULL);
+	if (ret) return ret;
+
+	arg.req = &req;
+	arg.timeout = timeout;
+
+	ret = (int)(VALUE)rb_thread_call_without_gvl(nogvl_gai_suspend, &arg, RUBY_UBF_IO, 0);
+
+	if (ret) {
+	    /* on Ubuntu 18.04 (or other systems), gai_suspend(3) returns EAI_SYSTEM/ENOENT on timeout */
+	    if (ret == EAI_SYSTEM && errno == ENOENT) {
+		return EAI_AGAIN;
+	    } else {
+		return ret;
+	    }
+	}
+
+	ret = gai_error(reqs[0]);
+	ai = reqs[0]->ar_result;
+    }
+
+    if (ret == 0) {
+        *res = (struct rb_addrinfo *)xmalloc(sizeof(struct rb_addrinfo));
+        (*res)->allocated_by_malloc = allocated_by_malloc;
+        (*res)->ai = ai;
+    }
     return ret;
+}
 #endif
+
+void
+rb_freeaddrinfo(struct rb_addrinfo *ai)
+{
+    if (!ai->allocated_by_malloc)
+        freeaddrinfo(ai->ai);
+    else {
+        struct addrinfo *ai1, *ai2;
+        ai1 = ai->ai;
+        while (ai1) {
+            ai2 = ai1->ai_next;
+            xfree(ai1->ai_addr);
+            xfree(ai1);
+            ai1 = ai2;
+        }
+    }
+    xfree(ai);
 }
 
 #ifndef GETADDRINFO_EMU
@@ -188,21 +415,21 @@ 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 VALUE
+static void *
 nogvl_getnameinfo(void *arg)
 {
     struct getnameinfo_arg *ptr = arg;
-    return getnameinfo(ptr->sa, ptr->salen,
-                       ptr->host, (socklen_t)ptr->hostlen,
-                       ptr->serv, (socklen_t)ptr->servlen,
-                       ptr->flags);
+    return (void *)(VALUE)getnameinfo(ptr->sa, ptr->salen,
+				      ptr->host, (socklen_t)ptr->hostlen,
+				      ptr->serv, (socklen_t)ptr->servlen,
+				      ptr->flags);
 }
 #endif
 
@@ -223,41 +450,39 @@ rb_getnameinfo(const struct sockaddr *sa, socklen_t salen,
     arg.serv = serv;
     arg.servlen = servlen;
     arg.flags = flags;
-    ret = (int)BLOCKING_REGION(nogvl_getnameinfo, &arg);
+    ret = (int)(VALUE)rb_thread_call_without_gvl(nogvl_getnameinfo, &arg, RUBY_UBF_IO, 0);
     return ret;
 #endif
 }
 
 static void
-make_ipaddr0(struct sockaddr *addr, char *buf, size_t len)
+make_ipaddr0(struct sockaddr *addr, socklen_t addrlen, char *buf, size_t buflen)
 {
     int error;
 
-    error = rb_getnameinfo(addr, SA_LEN(addr), buf, len, NULL, 0, NI_NUMERICHOST);
+    error = rb_getnameinfo(addr, addrlen, buf, buflen, NULL, 0, NI_NUMERICHOST);
     if (error) {
         rsock_raise_socket_error("getnameinfo", error);
     }
 }
 
 VALUE
-rsock_make_ipaddr(struct sockaddr *addr)
+rsock_make_ipaddr(struct sockaddr *addr, socklen_t addrlen)
 {
     char hbuf[1024];
 
-    make_ipaddr0(addr, hbuf, sizeof(hbuf));
+    make_ipaddr0(addr, addrlen, hbuf, sizeof(hbuf));
     return rb_str_new2(hbuf);
 }
 
 static void
-make_inetaddr(unsigned int host, char *buf, size_t len)
+make_inetaddr(unsigned int host, char *buf, size_t buflen)
 {
     struct sockaddr_in sin;
 
-    MEMZERO(&sin, struct sockaddr_in, 1);
-    sin.sin_family = AF_INET;
-    SET_SIN_LEN(&sin, sizeof(sin));
+    INIT_SOCKADDR_IN(&sin, sizeof(sin));
     sin.sin_addr.s_addr = host;
-    make_ipaddr0((struct sockaddr*)&sin, buf, len);
+    make_ipaddr0((struct sockaddr*)&sin, sizeof(sin), buf, buflen);
 }
 
 static int
@@ -266,17 +491,21 @@ str_is_number(const char *p)
     char *ep;
 
     if (!p || *p == '\0')
-       return 0;
+        return 0;
     ep = NULL;
     (void)STRTOUL(p, &ep, 10);
     if (ep && *ep == '\0')
-       return 1;
+        return 1;
     else
-       return 0;
+        return 0;
 }
 
+#define str_equal(ptr, len, name) \
+    ((ptr)[0] == name[0] && \
+     rb_strlen_lit(name) == (len) && memcmp(ptr, name, len) == 0)
+
 static char*
-host_str(VALUE host, char *hbuf, size_t len, int *flags_ptr)
+host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
 {
     if (NIL_P(host)) {
         return NULL;
@@ -284,65 +513,69 @@ host_str(VALUE host, char *hbuf, size_t len, int *flags_ptr)
     else if (rb_obj_is_kind_of(host, rb_cInteger)) {
         unsigned int i = NUM2UINT(host);
 
-        make_inetaddr(htonl(i), hbuf, len);
+        make_inetaddr(htonl(i), hbuf, hbuflen);
         if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
         return hbuf;
     }
     else {
-        char *name;
+        const char *name;
+        size_t len;
 
-        SafeStringValue(host);
-        name = RSTRING_PTR(host);
-        if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
-            make_inetaddr(INADDR_ANY, hbuf, len);
+        StringValueCStr(host);
+        RSTRING_GETMEM(host, name, len);
+        if (!len || str_equal(name, len, "<any>")) {
+            make_inetaddr(INADDR_ANY, hbuf, hbuflen);
             if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
         }
-        else if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
-            make_inetaddr(INADDR_BROADCAST, hbuf, len);
+        else if (str_equal(name, len, "<broadcast>")) {
+            make_inetaddr(INADDR_BROADCAST, hbuf, hbuflen);
             if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
         }
-        else if (strlen(name) >= len) {
+        else if (len >= hbuflen) {
             rb_raise(rb_eArgError, "hostname too long (%"PRIuSIZE")",
-                strlen(name));
+                     len);
         }
         else {
-            strcpy(hbuf, name);
+            memcpy(hbuf, name, len);
+            hbuf[len] = '\0';
         }
         return hbuf;
     }
 }
 
 static char*
-port_str(VALUE port, char *pbuf, size_t len, int *flags_ptr)
+port_str(VALUE port, char *pbuf, size_t pbuflen, int *flags_ptr)
 {
     if (NIL_P(port)) {
         return 0;
     }
     else if (FIXNUM_P(port)) {
-        snprintf(pbuf, len, "%ld", FIX2LONG(port));
+        snprintf(pbuf, pbuflen, "%ld", FIX2LONG(port));
 #ifdef AI_NUMERICSERV
         if (flags_ptr) *flags_ptr |= AI_NUMERICSERV;
 #endif
         return pbuf;
     }
     else {
-        char *serv;
+        const char *serv;
+        size_t len;
 
-        SafeStringValue(port);
-        serv = RSTRING_PTR(port);
-        if (strlen(serv) >= len) {
+        StringValueCStr(port);
+        RSTRING_GETMEM(port, serv, len);
+        if (len >= pbuflen) {
             rb_raise(rb_eArgError, "service name too long (%"PRIuSIZE")",
-                strlen(serv));
+                     len);
         }
-        strcpy(pbuf, serv);
+        memcpy(pbuf, serv, len);
+        pbuf[len] = '\0';
         return pbuf;
     }
 }
 
-struct addrinfo*
+struct rb_addrinfo*
 rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack)
 {
-    struct addrinfo* res = NULL;
+    struct rb_addrinfo* res = NULL;
     char *hostp, *portp;
     int error;
     char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
@@ -352,7 +585,7 @@ rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_h
     portp = port_str(port, pbuf, sizeof(pbuf), &additional_flags);
 
     if (socktype_hack && hints->ai_socktype == 0 && str_is_number(portp)) {
-       hints->ai_socktype = SOCK_DGRAM;
+        hints->ai_socktype = SOCK_DGRAM;
     }
     hints->ai_flags |= additional_flags;
 
@@ -367,20 +600,69 @@ rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_h
     return res;
 }
 
-struct addrinfo*
-rsock_addrinfo(VALUE host, VALUE port, int socktype, int flags)
+#ifdef HAVE_GETADDRINFO_A
+static struct rb_addrinfo*
+rsock_getaddrinfo_a(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack, VALUE timeout)
+{
+    struct rb_addrinfo* res = NULL;
+    char *hostp, *portp;
+    int error;
+    char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
+    int additional_flags = 0;
+
+    hostp = host_str(host, hbuf, sizeof(hbuf), &additional_flags);
+    portp = port_str(port, pbuf, sizeof(pbuf), &additional_flags);
+
+    if (socktype_hack && hints->ai_socktype == 0 && str_is_number(portp)) {
+       hints->ai_socktype = SOCK_DGRAM;
+    }
+    hints->ai_flags |= additional_flags;
+
+    if (NIL_P(timeout)) {
+	error = rb_getaddrinfo(hostp, portp, hints, &res);
+    } else {
+	struct timespec _timeout = rb_time_timespec_interval(timeout);
+	error = rb_getaddrinfo_a(hostp, portp, hints, &res, &_timeout);
+    }
+
+    if (error) {
+        if (hostp && hostp[strlen(hostp)-1] == '\n') {
+            rb_raise(rb_eSocket, "newline at the end of hostname");
+        }
+        rsock_raise_socket_error("getaddrinfo_a", error);
+    }
+
+    return res;
+}
+#endif
+
+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)
 {
     struct addrinfo hints;
 
     MEMZERO(&hints, struct addrinfo, 1);
-    hints.ai_family = AF_UNSPEC;
+    hints.ai_family = family;
     hints.ai_socktype = socktype;
     hints.ai_flags = flags;
     return rsock_getaddrinfo(host, port, &hints, 1);
 }
 
 VALUE
-rsock_ipaddr(struct sockaddr *sockaddr, int norevlookup)
+rsock_ipaddr(struct sockaddr *sockaddr, socklen_t sockaddrlen, int norevlookup)
 {
     VALUE family, port, addr1, addr2;
     VALUE ary;
@@ -399,13 +681,13 @@ rsock_ipaddr(struct sockaddr *sockaddr, int norevlookup)
 
     addr1 = Qnil;
     if (!norevlookup) {
-        error = rb_getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
+        error = rb_getnameinfo(sockaddr, sockaddrlen, hbuf, sizeof(hbuf),
                                NULL, 0, 0);
         if (! error) {
             addr1 = rb_str_new2(hbuf);
         }
     }
-    error = rb_getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
+    error = rb_getnameinfo(sockaddr, sockaddrlen, hbuf, sizeof(hbuf),
                            pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
     if (error) {
         rsock_raise_socket_error("getnameinfo", error);
@@ -421,35 +703,69 @@ rsock_ipaddr(struct sockaddr *sockaddr, int norevlookup)
 }
 
 #ifdef HAVE_SYS_UN_H
-const char*
-rsock_unixpath(struct sockaddr_un *sockaddr, socklen_t len)
+static long
+unixsocket_len(const struct sockaddr_un *su, socklen_t socklen)
+{
+    const char *s = su->sun_path, *e = (const char*)su + socklen;
+    while (s < e && *(e-1) == '\0')
+        e--;
+    return e - s;
+}
+
+VALUE
+rsock_unixpath_str(struct sockaddr_un *sockaddr, socklen_t len)
 {
-    if (sockaddr->sun_path < (char*)sockaddr + len)
-        return sockaddr->sun_path;
+    long n = unixsocket_len(sockaddr, len);
+    if (n >= 0)
+        return rb_str_new(sockaddr->sun_path, n);
     else
-        return "";
+        return rb_str_new2("");
 }
 
 VALUE
 rsock_unixaddr(struct sockaddr_un *sockaddr, socklen_t len)
 {
     return rb_assoc_new(rb_str_new2("AF_UNIX"),
-                        rb_str_new2(rsock_unixpath(sockaddr, len)));
+                        rsock_unixpath_str(sockaddr, len));
+}
+
+socklen_t
+rsock_unix_sockaddr_len(VALUE path)
+{
+#ifdef __linux__
+    if (RSTRING_LEN(path) == 0) {
+	/* autobind; see unix(7) for details. */
+	return (socklen_t) sizeof(sa_family_t);
+    }
+    else if (RSTRING_PTR(path)[0] == '\0') {
+	/* abstract namespace; see unix(7) for details. */
+        if (SOCKLEN_MAX - offsetof(struct sockaddr_un, sun_path) < (size_t)RSTRING_LEN(path))
+            rb_raise(rb_eArgError, "Linux abstract socket too long");
+	return (socklen_t) offsetof(struct sockaddr_un, sun_path) +
+	    RSTRING_SOCKLEN(path);
+    }
+    else {
+#endif
+	return (socklen_t) sizeof(struct sockaddr_un);
+#ifdef __linux__
+    }
+#endif
 }
 #endif
 
 struct hostent_arg {
     VALUE host;
-    struct addrinfo* addr;
-    VALUE (*ipaddr)(struct sockaddr*, size_t);
+    struct rb_addrinfo* addr;
+    VALUE (*ipaddr)(struct sockaddr*, socklen_t);
 };
 
 static VALUE
-make_hostent_internal(struct hostent_arg *arg)
+make_hostent_internal(VALUE v)
 {
+    struct hostent_arg *arg = (void *)v;
     VALUE host = arg->host;
-    struct addrinfo* addr = arg->addr;
-    VALUE (*ipaddr)(struct sockaddr*, size_t) = arg->ipaddr;
+    struct addrinfo* addr = arg->addr->ai;
+    VALUE (*ipaddr)(struct sockaddr*, socklen_t) = arg->ipaddr;
 
     struct addrinfo *ai;
     struct hostent *h;
@@ -467,7 +783,8 @@ make_hostent_internal(struct hostent_arg *arg)
     }
     rb_ary_push(ary, rb_str_new2(hostp));
 
-    if (addr->ai_canonname && (h = gethostbyname(addr->ai_canonname))) {
+    if (addr->ai_canonname && strlen(addr->ai_canonname) < NI_MAXHOST &&
+	(h = gethostbyname(addr->ai_canonname))) {
         names = rb_ary_new();
         if (h->h_aliases != NULL) {
             for (pch = h->h_aliases; *pch; pch++) {
@@ -488,14 +805,15 @@ make_hostent_internal(struct hostent_arg *arg)
 }
 
 VALUE
-rsock_freeaddrinfo(struct addrinfo *addr)
+rsock_freeaddrinfo(VALUE arg)
 {
-    freeaddrinfo(addr);
+    struct rb_addrinfo *addr = (struct rb_addrinfo *)arg;
+    rb_freeaddrinfo(addr);
     return Qnil;
 }
 
 VALUE
-rsock_make_hostent(VALUE host, struct addrinfo *addr, VALUE (*ipaddr)(struct sockaddr *, size_t))
+rsock_make_hostent(VALUE host, struct rb_addrinfo *addr, VALUE (*ipaddr)(struct sockaddr *, socklen_t))
 {
     struct hostent_arg arg;
 
@@ -513,17 +831,15 @@ typedef struct {
     int socktype;
     int protocol;
     socklen_t sockaddr_len;
-    struct sockaddr_storage addr;
+    union_sockaddr addr;
 } rb_addrinfo_t;
 
 static void
 addrinfo_mark(void *ptr)
 {
     rb_addrinfo_t *rai = ptr;
-    if (rai) {
-        rb_gc_mark(rai->inspectname);
-        rb_gc_mark(rai->canonname);
-    }
+    rb_gc_mark(rai->inspectname);
+    rb_gc_mark(rai->canonname);
 }
 
 #define addrinfo_free RUBY_TYPED_DEFAULT_FREE
@@ -531,7 +847,7 @@ addrinfo_mark(void *ptr)
 static size_t
 addrinfo_memsize(const void *ptr)
 {
-    return ptr ? sizeof(rb_addrinfo_t) : 0;
+    return sizeof(rb_addrinfo_t);
 }
 
 static const rb_data_type_t addrinfo_type = {
@@ -565,10 +881,9 @@ get_addrinfo(VALUE self)
 
 
 static rb_addrinfo_t *
-alloc_addrinfo()
+alloc_addrinfo(void)
 {
-    rb_addrinfo_t *rai = ALLOC(rb_addrinfo_t);
-    memset(rai, 0, sizeof(rb_addrinfo_t));
+    rb_addrinfo_t *rai = ZALLOC(rb_addrinfo_t);
     rai->inspectname = Qnil;
     rai->canonname = Qnil;
     return rai;
@@ -605,12 +920,13 @@ rsock_addrinfo_new(struct sockaddr *addr, socklen_t len,
     return a;
 }
 
-static struct addrinfo *
+static struct rb_addrinfo *
 call_getaddrinfo(VALUE node, VALUE service,
                  VALUE family, VALUE socktype, VALUE protocol, VALUE flags,
-                 int socktype_hack)
+                 int socktype_hack, VALUE timeout)
 {
-    struct addrinfo hints, *res;
+    struct addrinfo hints;
+    struct rb_addrinfo *res;
 
     MEMZERO(&hints, struct addrinfo, 1);
     hints.ai_family = NIL_P(family) ? PF_UNSPEC : rsock_family_arg(family);
@@ -624,7 +940,16 @@ call_getaddrinfo(VALUE node, VALUE service,
     if (!NIL_P(flags)) {
 	hints.ai_flags = NUM2INT(flags);
     }
+
+#ifdef HAVE_GETADDRINFO_A
+    if (NIL_P(timeout)) {
+	res = rsock_getaddrinfo(node, service, &hints, socktype_hack);
+    } else {
+	res = rsock_getaddrinfo_a(node, service, &hints, socktype_hack, timeout);
+    }
+#else
     res = rsock_getaddrinfo(node, service, &hints, socktype_hack);
+#endif
 
     if (res == NULL)
 	rb_raise(rb_eSocket, "host not found");
@@ -638,21 +963,21 @@ init_addrinfo_getaddrinfo(rb_addrinfo_t *rai, VALUE node, VALUE service,
                           VALUE family, VALUE socktype, VALUE protocol, VALUE flags,
                           VALUE inspectnode, VALUE inspectservice)
 {
-    struct addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 1);
+    struct rb_addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 1, Qnil);
     VALUE canonname;
-    VALUE inspectname = rb_str_equal(node, inspectnode) ? Qnil : make_inspectname(inspectnode, inspectservice, res);
+    VALUE inspectname = rb_str_equal(node, inspectnode) ? Qnil : make_inspectname(inspectnode, inspectservice, res->ai);
 
     canonname = Qnil;
-    if (res->ai_canonname) {
-        canonname = rb_tainted_str_new_cstr(res->ai_canonname);
+    if (res->ai->ai_canonname) {
+        canonname = rb_str_new_cstr(res->ai->ai_canonname);
         OBJ_FREEZE(canonname);
     }
 
-    init_addrinfo(rai, res->ai_addr, res->ai_addrlen,
+    init_addrinfo(rai, res->ai->ai_addr, res->ai->ai_addrlen,
                   NUM2INT(family), NUM2INT(socktype), NUM2INT(protocol),
                   canonname, inspectname);
 
-    freeaddrinfo(res);
+    rb_freeaddrinfo(res);
 }
 
 static VALUE
@@ -661,31 +986,32 @@ make_inspectname(VALUE node, VALUE service, struct addrinfo *res)
     VALUE inspectname = Qnil;
 
     if (res) {
+        /* drop redundant information which also shown in address:port part. */
         char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
         int ret;
         ret = rb_getnameinfo(res->ai_addr, res->ai_addrlen, hbuf,
                              sizeof(hbuf), pbuf, sizeof(pbuf),
                              NI_NUMERICHOST|NI_NUMERICSERV);
         if (ret == 0) {
-            if (TYPE(node) == T_STRING && strcmp(hbuf, RSTRING_PTR(node)) == 0)
+            if (RB_TYPE_P(node, T_STRING) && strcmp(hbuf, RSTRING_PTR(node)) == 0)
                 node = Qnil;
-            if (TYPE(service) == T_STRING && strcmp(pbuf, RSTRING_PTR(service)) == 0)
+            if (RB_TYPE_P(service, T_STRING) && strcmp(pbuf, RSTRING_PTR(service)) == 0)
                 service = Qnil;
-            else if (TYPE(service) == T_FIXNUM && atoi(pbuf) == FIX2INT(service))
+            else if (RB_TYPE_P(service, T_FIXNUM) && atoi(pbuf) == FIX2INT(service))
                 service = Qnil;
         }
     }
 
-    if (TYPE(node) == T_STRING) {
+    if (RB_TYPE_P(node, T_STRING)) {
         inspectname = rb_str_dup(node);
     }
-    if (TYPE(service) == T_STRING) {
+    if (RB_TYPE_P(service, T_STRING)) {
         if (NIL_P(inspectname))
             inspectname = rb_sprintf(":%s", StringValueCStr(service));
         else
             rb_str_catf(inspectname, ":%s", StringValueCStr(service));
     }
-    else if (TYPE(service) == T_FIXNUM && FIX2INT(service) != 0)
+    else if (RB_TYPE_P(service, T_FIXNUM) && FIX2INT(service) != 0)
     {
         if (NIL_P(inspectname))
             inspectname = rb_sprintf(":%d", FIX2INT(service));
@@ -693,8 +1019,6 @@ make_inspectname(VALUE node, VALUE service, struct addrinfo *res)
             rb_str_catf(inspectname, ":%d", FIX2INT(service));
     }
     if (!NIL_P(inspectname)) {
-        OBJ_INFECT(inspectname, node);
-        OBJ_INFECT(inspectname, service);
         OBJ_FREEZE(inspectname);
     }
     return inspectname;
@@ -707,42 +1031,43 @@ addrinfo_firstonly_new(VALUE node, VALUE service, VALUE family, VALUE socktype,
     VALUE canonname;
     VALUE inspectname;
 
-    struct addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 0);
+    struct rb_addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 0, Qnil);
 
-    inspectname = make_inspectname(node, service, res);
+    inspectname = make_inspectname(node, service, res->ai);
 
     canonname = Qnil;
-    if (res->ai_canonname) {
-        canonname = rb_tainted_str_new_cstr(res->ai_canonname);
+    if (res->ai->ai_canonname) {
+        canonname = rb_str_new_cstr(res->ai->ai_canonname);
         OBJ_FREEZE(canonname);
     }
 
-    ret = rsock_addrinfo_new(res->ai_addr, res->ai_addrlen,
-                             res->ai_family, res->ai_socktype, res->ai_protocol,
+    ret = rsock_addrinfo_new(res->ai->ai_addr, res->ai->ai_addrlen,
+                             res->ai->ai_family, res->ai->ai_socktype,
+                             res->ai->ai_protocol,
                              canonname, inspectname);
 
-    freeaddrinfo(res);
+    rb_freeaddrinfo(res);
     return ret;
 }
 
 static VALUE
-addrinfo_list_new(VALUE node, VALUE service, VALUE family, VALUE socktype, VALUE protocol, VALUE flags)
+addrinfo_list_new(VALUE node, VALUE service, VALUE family, VALUE socktype, VALUE protocol, VALUE flags, VALUE timeout)
 {
     VALUE ret;
     struct addrinfo *r;
     VALUE inspectname;
 
-    struct addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 0);
+    struct rb_addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 0, timeout);
 
-    inspectname = make_inspectname(node, service, res);
+    inspectname = make_inspectname(node, service, res->ai);
 
     ret = rb_ary_new();
-    for (r = res; r; r = r->ai_next) {
+    for (r = res->ai; r; r = r->ai_next) {
         VALUE addr;
         VALUE canonname = Qnil;
 
         if (r->ai_canonname) {
-            canonname = rb_tainted_str_new_cstr(r->ai_canonname);
+            canonname = rb_str_new_cstr(r->ai_canonname);
             OBJ_FREEZE(canonname);
         }
 
@@ -753,7 +1078,7 @@ addrinfo_list_new(VALUE node, VALUE service, VALUE family, VALUE socktype, VALUE
         rb_ary_push(ret, addr);
     }
 
-    freeaddrinfo(res);
+    rb_freeaddrinfo(res);
     return ret;
 }
 
@@ -763,21 +1088,28 @@ static void
 init_unix_addrinfo(rb_addrinfo_t *rai, VALUE path, int socktype)
 {
     struct sockaddr_un un;
+    socklen_t len;
 
     StringValue(path);
 
-    if (sizeof(un.sun_path) <= (size_t)RSTRING_LEN(path))
-        rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
-            (int)sizeof(un.sun_path)-1);
+    if (sizeof(un.sun_path) < (size_t)RSTRING_LEN(path))
+        rb_raise(rb_eArgError,
+            "too long unix socket path (%"PRIuSIZE" bytes given but %"PRIuSIZE" bytes max)",
+            (size_t)RSTRING_LEN(path), sizeof(un.sun_path));
 
-    MEMZERO(&un, struct sockaddr_un, 1);
-
-    un.sun_family = AF_UNIX;
+    INIT_SOCKADDR_UN(&un, sizeof(struct sockaddr_un));
     memcpy((void*)&un.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
 
-    init_addrinfo(rai, (struct sockaddr *)&un, (socklen_t)sizeof(un),
+    len = rsock_unix_sockaddr_len(path);
+    init_addrinfo(rai, (struct sockaddr *)&un, len,
 		  PF_UNIX, socktype, 0, Qnil, Qnil);
 }
+
+static long
+rai_unixsocket_len(const rb_addrinfo_t *rai)
+{
+    return unixsocket_len(&rai->addr.un, rai->sockaddr_len);
+}
 #endif
 
 /*
@@ -897,7 +1229,7 @@ addrinfo_initialize(int argc, VALUE *argv, VALUE self)
     else {
         StringValue(sockaddr_arg);
         sockaddr_ptr = (struct sockaddr *)RSTRING_PTR(sockaddr_arg);
-        sockaddr_len = RSTRING_LENINT(sockaddr_arg);
+        sockaddr_len = RSTRING_SOCKLEN(sockaddr_arg);
         init_addrinfo(rai, sockaddr_ptr, sockaddr_len,
                       i_pfamily, i_socktype, i_protocol,
                       canonname, inspectname);
@@ -907,52 +1239,80 @@ addrinfo_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static int
-get_afamily(struct sockaddr *addr, socklen_t len)
+get_afamily(const struct sockaddr *addr, socklen_t len)
 {
-    if ((socklen_t)((char*)&addr->sa_family + sizeof(addr->sa_family) - (char*)addr) <= len)
+    if ((socklen_t)((const char*)&addr->sa_family + sizeof(addr->sa_family) - (char*)addr) <= len)
         return addr->sa_family;
     else
         return AF_UNSPEC;
 }
 
 static int
-ai_get_afamily(rb_addrinfo_t *rai)
+ai_get_afamily(const rb_addrinfo_t *rai)
 {
-    return get_afamily((struct sockaddr *)&rai->addr, rai->sockaddr_len);
+    return get_afamily(&rai->addr.addr, rai->sockaddr_len);
 }
 
 static VALUE
 inspect_sockaddr(VALUE addrinfo, VALUE ret)
 {
     rb_addrinfo_t *rai = get_addrinfo(addrinfo);
+    union_sockaddr *sockaddr = &rai->addr;
+    socklen_t socklen = rai->sockaddr_len;
+    return rsock_inspect_sockaddr((struct sockaddr *)sockaddr, socklen, ret);
+}
 
-    if (rai->sockaddr_len == 0) {
+VALUE
+rsock_inspect_sockaddr(struct sockaddr *sockaddr_arg, socklen_t socklen, VALUE ret)
+{
+    union_sockaddr *sockaddr = (union_sockaddr *)sockaddr_arg;
+    if (socklen == 0) {
         rb_str_cat2(ret, "empty-sockaddr");
     }
-    else if ((long)rai->sockaddr_len < ((char*)&rai->addr.ss_family + sizeof(rai->addr.ss_family)) - (char*)&rai->addr)
+    else if ((long)socklen < ((char*)&sockaddr->addr.sa_family + sizeof(sockaddr->addr.sa_family)) - (char*)sockaddr)
         rb_str_cat2(ret, "too-short-sockaddr");
     else {
-        switch (rai->addr.ss_family) {
+        switch (sockaddr->addr.sa_family) {
+          case AF_UNSPEC:
+	  {
+	    rb_str_cat2(ret, "UNSPEC");
+            break;
+	  }
+
           case AF_INET:
           {
             struct sockaddr_in *addr;
             int port;
-            if (rai->sockaddr_len < (socklen_t)sizeof(struct sockaddr_in)) {
-                rb_str_cat2(ret, "too-short-AF_INET-sockaddr");
-            }
-            else {
-                addr = (struct sockaddr_in *)&rai->addr;
-                rb_str_catf(ret, "%d.%d.%d.%d",
-                            ((unsigned char*)&addr->sin_addr)[0],
-                            ((unsigned char*)&addr->sin_addr)[1],
-                            ((unsigned char*)&addr->sin_addr)[2],
-                            ((unsigned char*)&addr->sin_addr)[3]);
-                port = ntohs(addr->sin_port);
-                if (port)
-                    rb_str_catf(ret, ":%d", port);
-                if ((socklen_t)sizeof(struct sockaddr_in) < rai->sockaddr_len)
-                    rb_str_catf(ret, "(sockaddr %d bytes too long)", (int)(rai->sockaddr_len - sizeof(struct sockaddr_in)));
-            }
+	    addr = &sockaddr->in;
+	    if ((socklen_t)(((char*)&addr->sin_addr)-(char*)addr+0+1) <= socklen)
+		rb_str_catf(ret, "%d", ((unsigned char*)&addr->sin_addr)[0]);
+	    else
+		rb_str_cat2(ret, "?");
+	    if ((socklen_t)(((char*)&addr->sin_addr)-(char*)addr+1+1) <= socklen)
+		rb_str_catf(ret, ".%d", ((unsigned char*)&addr->sin_addr)[1]);
+	    else
+		rb_str_cat2(ret, ".?");
+	    if ((socklen_t)(((char*)&addr->sin_addr)-(char*)addr+2+1) <= socklen)
+		rb_str_catf(ret, ".%d", ((unsigned char*)&addr->sin_addr)[2]);
+	    else
+		rb_str_cat2(ret, ".?");
+	    if ((socklen_t)(((char*)&addr->sin_addr)-(char*)addr+3+1) <= socklen)
+		rb_str_catf(ret, ".%d", ((unsigned char*)&addr->sin_addr)[3]);
+	    else
+		rb_str_cat2(ret, ".?");
+
+	    if ((socklen_t)(((char*)&addr->sin_port)-(char*)addr+(int)sizeof(addr->sin_port)) < socklen) {
+		port = ntohs(addr->sin_port);
+		if (port)
+		    rb_str_catf(ret, ":%d", port);
+	    }
+	    else {
+		rb_str_cat2(ret, ":?");
+	    }
+	    if ((socklen_t)sizeof(struct sockaddr_in) != socklen)
+		rb_str_catf(ret, " (%d bytes for %d bytes sockaddr_in)",
+		  (int)socklen,
+		  (int)sizeof(struct sockaddr_in));
             break;
           }
 
@@ -963,16 +1323,16 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret)
             char hbuf[1024];
             int port;
             int error;
-            if (rai->sockaddr_len < (socklen_t)sizeof(struct sockaddr_in6)) {
-                rb_str_cat2(ret, "too-short-AF_INET6-sockaddr");
+            if (socklen < (socklen_t)sizeof(struct sockaddr_in6)) {
+                rb_str_catf(ret, "too-short-AF_INET6-sockaddr %d bytes", (int)socklen);
             }
             else {
-                addr = (struct sockaddr_in6 *)&rai->addr;
+                addr = &sockaddr->in6;
                 /* use getnameinfo for scope_id.
                  * RFC 4007: IPv6 Scoped Address Architecture
                  * draft-ietf-ipv6-scope-api-00.txt: Scoped Address Extensions to the IPv6 Basic Socket API
                  */
-                error = getnameinfo((struct sockaddr *)&rai->addr, rai->sockaddr_len,
+                error = getnameinfo(&sockaddr->addr, socklen,
                                     hbuf, (socklen_t)sizeof(hbuf), NULL, 0,
                                     NI_NUMERICHOST|NI_NUMERICSERV);
                 if (error) {
@@ -985,8 +1345,8 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret)
                     port = ntohs(addr->sin6_port);
                     rb_str_catf(ret, "[%s]:%d", hbuf, port);
                 }
-                if ((socklen_t)sizeof(struct sockaddr_in6) < rai->sockaddr_len)
-                    rb_str_catf(ret, "(sockaddr %d bytes too long)", (int)(rai->sockaddr_len - sizeof(struct sockaddr_in6)));
+                if ((socklen_t)sizeof(struct sockaddr_in6) < socklen)
+                    rb_str_catf(ret, "(sockaddr %d bytes too long)", (int)(socklen - sizeof(struct sockaddr_in6)));
             }
             break;
           }
@@ -995,55 +1355,188 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret)
 #ifdef HAVE_SYS_UN_H
           case AF_UNIX:
           {
-            struct sockaddr_un *addr = (struct sockaddr_un *)&rai->addr;
-            char *p, *s, *t, *e;
+            struct sockaddr_un *addr = &sockaddr->un;
+            char *p, *s, *e;
+            long len = unixsocket_len(addr, socklen);
             s = addr->sun_path;
-            e = (char*)addr + rai->sockaddr_len;
-            if (e < s)
+            if (len < 0)
                 rb_str_cat2(ret, "too-short-AF_UNIX-sockaddr");
-            else if (s == e)
+            else if (len == 0)
                 rb_str_cat2(ret, "empty-path-AF_UNIX-sockaddr");
             else {
                 int printable_only = 1;
+                e = s + len;
                 p = s;
-                while (p < e && *p != '\0') {
+                while (p < e) {
                     printable_only = printable_only && ISPRINT(*p) && !ISSPACE(*p);
                     p++;
                 }
-                t = p;
-                while (p < e && *p == '\0')
-                    p++;
-                if (printable_only && /* only printable, no space */
-                    t < e && /* NUL terminated */
-                    p == e) { /* no data after NUL */
-		    if (s == t)
-			rb_str_cat2(ret, "empty-path-AF_UNIX-sockaddr");
-		    else if (s[0] == '/') /* absolute path */
-			rb_str_cat2(ret, s);
-		    else
-                        rb_str_catf(ret, "AF_UNIX %s", s);
+                if (printable_only) { /* only printable, no space */
+                    if (s[0] != '/') /* relative path */
+                        rb_str_cat2(ret, "UNIX ");
+                    rb_str_cat(ret, s, p - s);
                 }
                 else {
-                    rb_str_cat2(ret, "AF_UNIX");
-                    e = (char *)addr->sun_path + sizeof(addr->sun_path);
-                    while (s < e && *(e-1) == '\0')
-                        e--;
+                    rb_str_cat2(ret, "UNIX");
                     while (s < e)
                         rb_str_catf(ret, ":%02x", (unsigned char)*s++);
                 }
-                if (addr->sun_path + sizeof(addr->sun_path) < (char*)&rai->addr + rai->sockaddr_len)
-                    rb_str_catf(ret, "(sockaddr %d bytes too long)",
-                            (int)(rai->sockaddr_len - (addr->sun_path + sizeof(addr->sun_path) - (char*)&rai->addr)));
             }
             break;
           }
 #endif
 
+#if defined(AF_PACKET) && defined(__linux__)
+          /* GNU/Linux */
+          case AF_PACKET:
+          {
+            struct sockaddr_ll *addr;
+            const char *sep = "[";
+#define CATSEP do { rb_str_cat2(ret, sep); sep = " "; } while (0);
+
+            addr = (struct sockaddr_ll *)sockaddr;
+
+            rb_str_cat2(ret, "PACKET");
+
+            if (offsetof(struct sockaddr_ll, sll_protocol) + sizeof(addr->sll_protocol) <= (size_t)socklen) {
+                CATSEP;
+                rb_str_catf(ret, "protocol=%d", ntohs(addr->sll_protocol));
+            }
+            if (offsetof(struct sockaddr_ll, sll_ifindex) + sizeof(addr->sll_ifindex) <= (size_t)socklen) {
+                char buf[IFNAMSIZ];
+                CATSEP;
+                if (if_indextoname(addr->sll_ifindex, buf) == NULL)
+                    rb_str_catf(ret, "ifindex=%d", addr->sll_ifindex);
+                else
+                    rb_str_catf(ret, "%s", buf);
+            }
+            if (offsetof(struct sockaddr_ll, sll_hatype) + sizeof(addr->sll_hatype) <= (size_t)socklen) {
+                CATSEP;
+                rb_str_catf(ret, "hatype=%d", addr->sll_hatype);
+            }
+            if (offsetof(struct sockaddr_ll, sll_pkttype) + sizeof(addr->sll_pkttype) <= (size_t)socklen) {
+                CATSEP;
+                if (addr->sll_pkttype == PACKET_HOST)
+                    rb_str_cat2(ret, "HOST");
+                else if (addr->sll_pkttype == PACKET_BROADCAST)
+                    rb_str_cat2(ret, "BROADCAST");
+                else if (addr->sll_pkttype == PACKET_MULTICAST)
+                    rb_str_cat2(ret, "MULTICAST");
+                else if (addr->sll_pkttype == PACKET_OTHERHOST)
+                    rb_str_cat2(ret, "OTHERHOST");
+                else if (addr->sll_pkttype == PACKET_OUTGOING)
+                    rb_str_cat2(ret, "OUTGOING");
+                else
+                    rb_str_catf(ret, "pkttype=%d", addr->sll_pkttype);
+            }
+            if (socklen != (socklen_t)(offsetof(struct sockaddr_ll, sll_addr) + addr->sll_halen)) {
+                CATSEP;
+                if (offsetof(struct sockaddr_ll, sll_halen) + sizeof(addr->sll_halen) <= (size_t)socklen) {
+                    rb_str_catf(ret, "halen=%d", addr->sll_halen);
+                }
+            }
+            if (offsetof(struct sockaddr_ll, sll_addr) < (size_t)socklen) {
+                socklen_t len, i;
+                CATSEP;
+                rb_str_cat2(ret, "hwaddr");
+                len = addr->sll_halen;
+                if ((size_t)socklen < offsetof(struct sockaddr_ll, sll_addr) + len)
+                    len = socklen - offsetof(struct sockaddr_ll, sll_addr);
+                for (i = 0; i < len; i++) {
+                    rb_str_cat2(ret, i == 0 ? "=" : ":");
+                    rb_str_catf(ret, "%02x", addr->sll_addr[i]);
+                }
+            }
+
+            if (socklen < (socklen_t)(offsetof(struct sockaddr_ll, sll_halen) + sizeof(addr->sll_halen)) ||
+                (socklen_t)(offsetof(struct sockaddr_ll, sll_addr) + addr->sll_halen) != socklen) {
+                CATSEP;
+                rb_str_catf(ret, "(%d bytes for %d bytes sockaddr_ll)",
+                    (int)socklen, (int)sizeof(struct sockaddr_ll));
+            }
+
+            rb_str_cat2(ret, "]");
+#undef CATSEP
+
+            break;
+          }
+#endif
+
+#if defined(AF_LINK) && defined(HAVE_TYPE_STRUCT_SOCKADDR_DL)
+	  /* AF_LINK is defined in 4.4BSD derivations since Net2.
+	     link_ntoa is also defined at Net2.
+             However Debian GNU/kFreeBSD defines AF_LINK but
+             don't have link_ntoa.  */
+          case AF_LINK:
+	  {
+	    /*
+	     * Simple implementation using link_ntoa():
+	     * This doesn't work on Debian GNU/kFreeBSD 6.0.7 (squeeze).
+             * Also, the format is bit different.
+	     *
+	     * rb_str_catf(ret, "LINK %s", link_ntoa(&sockaddr->dl));
+	     * break;
+	     */
+            struct sockaddr_dl *addr = &sockaddr->dl;
+            char *np = NULL, *ap = NULL, *endp;
+            int nlen = 0, alen = 0;
+            int i, off;
+            const char *sep = "[";
+#define CATSEP do { rb_str_cat2(ret, sep); sep = " "; } while (0);
+
+            rb_str_cat2(ret, "LINK");
+
+            endp = ((char *)addr) + socklen;
+
+            if (offsetof(struct sockaddr_dl, sdl_data) < socklen) {
+                np = addr->sdl_data;
+                nlen = addr->sdl_nlen;
+                if (endp - np < nlen)
+                    nlen = (int)(endp - np);
+            }
+            off = addr->sdl_nlen;
+
+            if (offsetof(struct sockaddr_dl, sdl_data) + off < socklen) {
+                ap = addr->sdl_data + off;
+                alen = addr->sdl_alen;
+                if (endp - ap < alen)
+                    alen = (int)(endp - ap);
+            }
+
+	    CATSEP;
+            if (np)
+                rb_str_catf(ret, "%.*s", nlen, np);
+            else
+                rb_str_cat2(ret, "?");
+
+            if (ap && 0 < alen) {
+		CATSEP;
+                for (i = 0; i < alen; i++)
+                    rb_str_catf(ret, "%s%02x", i == 0 ? "" : ":", (unsigned char)ap[i]);
+            }
+
+            if (socklen < (socklen_t)(offsetof(struct sockaddr_dl, sdl_nlen) + sizeof(addr->sdl_nlen)) ||
+                socklen < (socklen_t)(offsetof(struct sockaddr_dl, sdl_alen) + sizeof(addr->sdl_alen)) ||
+                socklen < (socklen_t)(offsetof(struct sockaddr_dl, sdl_slen) + sizeof(addr->sdl_slen)) ||
+                /* longer length is possible behavior because struct sockaddr_dl has "minimum work area, can be larger" as the last field.
+                 * cf. Net2:/usr/src/sys/net/if_dl.h. */
+                socklen < (socklen_t)(offsetof(struct sockaddr_dl, sdl_data) + addr->sdl_nlen + addr->sdl_alen + addr->sdl_slen)) {
+		CATSEP;
+                rb_str_catf(ret, "(%d bytes for %d bytes sockaddr_dl)",
+                    (int)socklen, (int)sizeof(struct sockaddr_dl));
+	    }
+
+            rb_str_cat2(ret, "]");
+#undef CATSEP
+            break;
+          }
+#endif
+
           default:
           {
-            ID id = rsock_intern_family(rai->addr.ss_family);
+            ID id = rsock_intern_family(sockaddr->addr.sa_family);
             if (id == 0)
-                rb_str_catf(ret, "unknown address family %d", rai->addr.ss_family);
+                rb_str_catf(ret, "unknown address family %d", sockaddr->addr.sa_family);
             else
                 rb_str_catf(ret, "%s address format unknown", rb_id2name(id));
             break;
@@ -1060,7 +1553,7 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret)
  *
  * returns a string which shows addrinfo in human-readable form.
  *
- *   Addrinfo.tcp("localhost", 80).inspect #=> "#<Addrinfo: 127.0.0.1:80 TCP (localhost:80)>"
+ *   Addrinfo.tcp("localhost", 80).inspect #=> "#<Addrinfo: 127.0.0.1:80 TCP (localhost)>"
  *   Addrinfo.unix("/tmp/sock").inspect    #=> "#<Addrinfo: /tmp/sock SOCK_STREAM>"
  *
  */
@@ -1144,8 +1637,8 @@ addrinfo_inspect(VALUE self)
  *   Addrinfo.unix("/tmp/sock").inspect_sockaddr        #=> "/tmp/sock"
  *
  */
-static VALUE
-addrinfo_inspect_sockaddr(VALUE self)
+VALUE
+rsock_addrinfo_inspect_sockaddr(VALUE self)
 {
     return inspect_sockaddr(self, rb_str_new("", 0));
 }
@@ -1198,13 +1691,7 @@ addrinfo_mdump(VALUE self)
 #ifdef HAVE_SYS_UN_H
       case AF_UNIX:
       {
-        struct sockaddr_un *su = (struct sockaddr_un *)&rai->addr;
-        char *s, *e;
-        s = su->sun_path;
-        e = (char*)s + sizeof(su->sun_path);
-        while (s < e && *(e-1) == '\0')
-            e--;
-        sockaddr = rb_str_new(s, e-s);
+        sockaddr = rb_str_new(rai->addr.un.sun_path, rai_unixsocket_len(rai));
         break;
       }
 #endif
@@ -1213,7 +1700,7 @@ addrinfo_mdump(VALUE self)
       {
         char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
         int error;
-        error = getnameinfo((struct sockaddr *)&rai->addr, rai->sockaddr_len,
+        error = getnameinfo(&rai->addr.addr, rai->sockaddr_len,
                             hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf),
                             NI_NUMERICHOST|NI_NUMERICSERV);
         if (error) {
@@ -1234,7 +1721,7 @@ addrinfo_mload(VALUE self, VALUE ary)
     VALUE v;
     VALUE canonname, inspectname;
     int afamily, pfamily, socktype, protocol;
-    struct sockaddr_storage ss;
+    union_sockaddr ss;
     socklen_t len;
     rb_addrinfo_t *rai;
 
@@ -1298,12 +1785,13 @@ addrinfo_mload(VALUE self, VALUE ary)
       case AF_UNIX:
       {
         struct sockaddr_un uaddr;
-        memset(&uaddr, 0, sizeof(uaddr));
-        uaddr.sun_family = AF_UNIX;
+        INIT_SOCKADDR_UN(&uaddr, sizeof(struct sockaddr_un));
 
         StringValue(v);
-        if (sizeof(uaddr.sun_path) <= (size_t)RSTRING_LEN(v))
-            rb_raise(rb_eSocket, "too long AF_UNIX path");
+        if (sizeof(uaddr.sun_path) < (size_t)RSTRING_LEN(v))
+            rb_raise(rb_eSocket,
+                "too long AF_UNIX path (%"PRIuSIZE" bytes given but %"PRIuSIZE" bytes max)",
+                (size_t)RSTRING_LEN(v), sizeof(uaddr.sun_path));
         memcpy(uaddr.sun_path, RSTRING_PTR(v), RSTRING_LEN(v));
         len = (socklen_t)sizeof(uaddr);
         memcpy(&ss, &uaddr, len);
@@ -1314,23 +1802,24 @@ addrinfo_mload(VALUE self, VALUE ary)
       default:
       {
         VALUE pair = rb_convert_type(v, T_ARRAY, "Array", "to_ary");
-        struct addrinfo *res;
+        struct rb_addrinfo *res;
         int flags = AI_NUMERICHOST;
 #ifdef AI_NUMERICSERV
         flags |= AI_NUMERICSERV;
 #endif
         res = call_getaddrinfo(rb_ary_entry(pair, 0), rb_ary_entry(pair, 1),
                                INT2NUM(pfamily), INT2NUM(socktype), INT2NUM(protocol),
-                               INT2NUM(flags), 1);
+                               INT2NUM(flags), 1, Qnil);
 
-        len = res->ai_addrlen;
-        memcpy(&ss, res->ai_addr, res->ai_addrlen);
+        len = res->ai->ai_addrlen;
+        memcpy(&ss, res->ai->ai_addr, res->ai->ai_addrlen);
+        rb_freeaddrinfo(res);
         break;
       }
     }
 
     DATA_PTR(self) = rai = alloc_addrinfo();
-    init_addrinfo(rai, (struct sockaddr *)&ss, len,
+    init_addrinfo(rai, &ss.addr, len,
                   pfamily, socktype, protocol,
                   canonname, inspectname);
     return self;
@@ -1417,7 +1906,6 @@ addrinfo_to_sockaddr(VALUE self)
     rb_addrinfo_t *rai = get_addrinfo(self);
     VALUE ret;
     ret = rb_str_new((char*)&rai->addr, rai->sockaddr_len);
-    OBJ_INFECT(ret, self);
     return ret;
 }
 
@@ -1432,7 +1920,7 @@ addrinfo_to_sockaddr(VALUE self)
  * The canonical name is set by Addrinfo.getaddrinfo when AI_CANONNAME is specified.
  *
  *   list = Addrinfo.getaddrinfo("www.ruby-lang.org", 80, :INET, :STREAM, nil, Socket::AI_CANONNAME)
- *   p list[0] #=> #<Addrinfo: 221.186.184.68:80 TCP carbon.ruby-lang.org (www.ruby-lang.org:80)>
+ *   p list[0] #=> #<Addrinfo: 221.186.184.68:80 TCP carbon.ruby-lang.org (www.ruby-lang.org)>
  *   p list[0].canonname #=> "carbon.ruby-lang.org"
  *
  */
@@ -1558,7 +2046,7 @@ addrinfo_getnameinfo(int argc, VALUE *argv, VALUE self)
     if (rai->socktype == SOCK_DGRAM)
         flags |= NI_DGRAM;
 
-    error = getnameinfo((struct sockaddr *)&rai->addr, rai->sockaddr_len,
+    error = getnameinfo(&rai->addr.addr, rai->sockaddr_len,
                         hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf),
                         flags);
     if (error) {
@@ -1649,14 +2137,14 @@ addrinfo_ip_port(VALUE self)
       case AF_INET:
         if (rai->sockaddr_len != sizeof(struct sockaddr_in))
             rb_raise(rb_eSocket, "unexpected sockaddr size for IPv4");
-        port = ntohs(((struct sockaddr_in *)&rai->addr)->sin_port);
+        port = ntohs(rai->addr.in.sin_port);
         break;
 
 #ifdef AF_INET6
       case AF_INET6:
         if (rai->sockaddr_len != sizeof(struct sockaddr_in6))
             rb_raise(rb_eSocket, "unexpected sockaddr size for IPv6");
-        port = ntohs(((struct sockaddr_in6 *)&rai->addr)->sin6_port);
+        port = ntohs(rai->addr.in6.sin6_port);
         break;
 #endif
 
@@ -1673,7 +2161,7 @@ extract_in_addr(VALUE self, uint32_t *addrp)
     rb_addrinfo_t *rai = get_addrinfo(self);
     int family = ai_get_afamily(rai);
     if (family != AF_INET) return 0;
-    *addrp = ntohl(((struct sockaddr_in *)&rai->addr)->sin_addr.s_addr);
+    *addrp = ntohl(rai->addr.in.sin_addr.s_addr);
     return 1;
 }
 
@@ -1729,7 +2217,7 @@ extract_in6_addr(VALUE self)
     rb_addrinfo_t *rai = get_addrinfo(self);
     int family = ai_get_afamily(rai);
     if (family != AF_INET6) return NULL;
-    return &((struct sockaddr_in6 *)&rai->addr)->sin6_addr;
+    return &rai->addr.in6.sin6_addr;
 }
 
 /*
@@ -1793,6 +2281,18 @@ addrinfo_ipv6_sitelocal_p(VALUE self)
 }
 
 /*
+ * Returns true for IPv6 unique local address (fc00::/7, RFC4193).
+ * It returns false otherwise.
+ */
+static VALUE
+addrinfo_ipv6_unique_local_p(VALUE self)
+{
+    struct in6_addr *addr = extract_in6_addr(self);
+    if (addr && IN6_IS_ADDR_UNIQUE_LOCAL(addr)) return Qtrue;
+    return Qfalse;
+}
+
+/*
  * Returns true for IPv4-mapped IPv6 address (::ffff:0:0/80).
  * It returns false otherwise.
  */
@@ -1893,12 +2393,10 @@ addrinfo_ipv6_to_ipv4(VALUE self)
     struct in6_addr *addr;
     int family = ai_get_afamily(rai);
     if (family != AF_INET6) return Qnil;
-    addr = &((struct sockaddr_in6 *)&rai->addr)->sin6_addr;
+    addr = &rai->addr.in6.sin6_addr;
     if (IN6_IS_ADDR_V4MAPPED(addr) || IN6_IS_ADDR_V4COMPAT(addr)) {
         struct sockaddr_in sin4;
-        MEMZERO(&sin4, struct sockaddr_in, 1);
-        sin4.sin_family = AF_INET;
-        SET_SIN_LEN(&sin4, sizeof(sin4));
+        INIT_SOCKADDR_IN(&sin4, sizeof(sin4));
         memcpy(&sin4.sin_addr, (char*)addr + sizeof(*addr) - sizeof(sin4.sin_addr), sizeof(sin4.sin_addr));
         return rsock_addrinfo_new((struct sockaddr *)&sin4, (socklen_t)sizeof(sin4),
                                   PF_INET, rai->socktype, rai->protocol,
@@ -1926,25 +2424,27 @@ addrinfo_unix_path(VALUE self)
     rb_addrinfo_t *rai = get_addrinfo(self);
     int family = ai_get_afamily(rai);
     struct sockaddr_un *addr;
-    char *s, *e;
+    long n;
 
     if (family != AF_UNIX)
 	rb_raise(rb_eSocket, "need AF_UNIX address");
 
-    addr = (struct sockaddr_un *)&rai->addr;
+    addr = &rai->addr.un;
 
-    s = addr->sun_path;
-    e = (char*)addr + rai->sockaddr_len;
-    if (e < s)
-        rb_raise(rb_eSocket, "too short AF_UNIX address");
-    if (addr->sun_path + sizeof(addr->sun_path) < e)
-        rb_raise(rb_eSocket, "too long AF_UNIX address");
-    while (s < e && *(e-1) == '\0')
-        e--;
-    return rb_str_new(s, e-s);
+    n = rai_unixsocket_len(rai);
+    if (n < 0)
+        rb_raise(rb_eSocket, "too short AF_UNIX address: %"PRIuSIZE" bytes given for minimum %"PRIuSIZE" bytes.",
+                 (size_t)rai->sockaddr_len, offsetof(struct sockaddr_un, sun_path));
+    if ((long)sizeof(addr->sun_path) < n)
+        rb_raise(rb_eSocket,
+            "too long AF_UNIX path (%"PRIuSIZE" bytes given but %"PRIuSIZE" bytes max)",
+            (size_t)n, sizeof(addr->sun_path));
+    return rb_str_new(addr->sun_path, n);
 }
 #endif
 
+static ID id_timeout;
+
 /*
  * call-seq:
  *   Addrinfo.getaddrinfo(nodename, service, family, socktype, protocol, flags) => [addrinfo, ...]
@@ -1968,24 +2468,39 @@ addrinfo_unix_path(VALUE self)
  *
  * Similarly, PF_INET6 as family restricts for IPv6.
  *
- * flags should be bitwise OR of Socket::AI_??? constants.
+ * flags should be bitwise OR of Socket::AI_??? constants such as follows.
+ * Note that the exact list of the constants depends on OS.
+ *
+ *   AI_PASSIVE      Get address to use with bind()
+ *   AI_CANONNAME    Fill in the canonical name
+ *   AI_NUMERICHOST  Prevent host name resolution
+ *   AI_NUMERICSERV  Prevent service name resolution
+ *   AI_V4MAPPED     Accept IPv4-mapped IPv6 addresses
+ *   AI_ALL          Allow all addresses
+ *   AI_ADDRCONFIG   Accept only if any address is assigned
  *
  * Note that socktype should be specified whenever application knows the usage of the address.
  * Some platform causes an error when socktype is omitted and servname is specified as an integer
  * because some port numbers, 512 for example, are ambiguous without socktype.
  *
  *   Addrinfo.getaddrinfo("www.kame.net", 80, nil, :STREAM)
- *   #=> [#<Addrinfo: 203.178.141.194:80 TCP (www.kame.net:80)>,
- *   #    #<Addrinfo: [2001:200:0:8002:203:47ff:fea5:3085]:80 TCP (www.kame.net:80)>]
+ *   #=> [#<Addrinfo: 203.178.141.194:80 TCP (www.kame.net)>,
+ *   #    #<Addrinfo: [2001:200:dff:fff1:216:3eff:feb1:44d7]:80 TCP (www.kame.net)>]
  *
  */
 static VALUE
 addrinfo_s_getaddrinfo(int argc, VALUE *argv, VALUE self)
 {
-    VALUE node, service, family, socktype, protocol, flags;
+    VALUE node, service, family, socktype, protocol, flags, opts, timeout;
 
-    rb_scan_args(argc, argv, "24", &node, &service, &family, &socktype, &protocol, &flags);
-    return addrinfo_list_new(node, service, family, socktype, protocol, flags);
+    rb_scan_args(argc, argv, "24:", &node, &service, &family, &socktype,
+		 &protocol, &flags, &opts);
+    rb_get_kwargs(opts, &id_timeout, 0, 1, &timeout);
+    if (timeout == Qundef) {
+	timeout = Qnil;
+    }
+
+    return addrinfo_list_new(node, service, family, socktype, protocol, flags, timeout);
 }
 
 /*
@@ -2073,7 +2588,6 @@ addrinfo_s_unix(int argc, VALUE *argv, VALUE self)
     addr = addrinfo_s_allocate(rb_cAddrinfo);
     DATA_PTR(addr) = rai = alloc_addrinfo();
     init_unix_addrinfo(rai, path, socktype);
-    OBJ_INFECT(addr, path);
     return addr;
 }
 
@@ -2090,6 +2604,19 @@ rsock_sockaddr_string_value(volatile VALUE *v)
     return *v;
 }
 
+VALUE
+rsock_sockaddr_string_value_with_addrinfo(volatile VALUE *v, VALUE *rai_ret)
+{
+    VALUE val = *v;
+    *rai_ret = Qnil;
+    if (IS_ADDRINFO(val)) {
+        *v = addrinfo_to_sockaddr(val);
+        *rai_ret = val;
+    }
+    StringValue(*v);
+    return *v;
+}
+
 char *
 rsock_sockaddr_string_value_ptr(volatile VALUE *v)
 {
@@ -2143,6 +2670,8 @@ rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len)
       default:
         rb_raise(rb_eTypeError, "neither IO nor file descriptor");
     }
+
+    UNREACHABLE_RETURN(Qnil);
 }
 
 /*
@@ -2155,11 +2684,13 @@ rsock_init_addrinfo(void)
      * The Addrinfo class maps <tt>struct addrinfo</tt> to ruby.  This
      * structure identifies an Internet host and a service.
      */
+    id_timeout = rb_intern("timeout");
+
     rb_cAddrinfo = rb_define_class("Addrinfo", rb_cData);
     rb_define_alloc_func(rb_cAddrinfo, addrinfo_s_allocate);
     rb_define_method(rb_cAddrinfo, "initialize", addrinfo_initialize, -1);
     rb_define_method(rb_cAddrinfo, "inspect", addrinfo_inspect, 0);
-    rb_define_method(rb_cAddrinfo, "inspect_sockaddr", addrinfo_inspect_sockaddr, 0);
+    rb_define_method(rb_cAddrinfo, "inspect_sockaddr", rsock_addrinfo_inspect_sockaddr, 0);
     rb_define_singleton_method(rb_cAddrinfo, "getaddrinfo", addrinfo_s_getaddrinfo, -1);
     rb_define_singleton_method(rb_cAddrinfo, "ip", addrinfo_s_ip, 1);
     rb_define_singleton_method(rb_cAddrinfo, "tcp", addrinfo_s_tcp, 2);
@@ -2193,6 +2724,7 @@ rsock_init_addrinfo(void)
     rb_define_method(rb_cAddrinfo, "ipv6_multicast?", addrinfo_ipv6_multicast_p, 0);
     rb_define_method(rb_cAddrinfo, "ipv6_linklocal?", addrinfo_ipv6_linklocal_p, 0);
     rb_define_method(rb_cAddrinfo, "ipv6_sitelocal?", addrinfo_ipv6_sitelocal_p, 0);
+    rb_define_method(rb_cAddrinfo, "ipv6_unique_local?", addrinfo_ipv6_unique_local_p, 0);
     rb_define_method(rb_cAddrinfo, "ipv6_v4mapped?", addrinfo_ipv6_v4mapped_p, 0);
     rb_define_method(rb_cAddrinfo, "ipv6_v4compat?", addrinfo_ipv6_v4compat_p, 0);
     rb_define_method(rb_cAddrinfo, "ipv6_mc_nodelocal?", addrinfo_ipv6_mc_nodelocal_p, 0);
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index 4c0efdb479..0ce77a5f6e 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -3,6 +3,7 @@
 
 #include "ruby/ruby.h"
 #include "ruby/io.h"
+#include "ruby/thread.h"
 #include "ruby/util.h"
 #include "internal.h"
 #include <stdio.h>
@@ -10,83 +11,127 @@
 #include <sys/stat.h>
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 
 #ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
+#  include <sys/uio.h>
 #endif
 
 #ifdef HAVE_XTI_H
-#include <xti.h>
+#  include <xti.h>
 #endif
 
-#ifndef _WIN32
-#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
-# include <net/socket.h>
+#ifdef _WIN32
+#  if defined(_MSC_VER)
+#    undef HAVE_TYPE_STRUCT_SOCKADDR_DL
+#  endif
+/*
+ * FIXME: failures if we make nonblocking the default
+ * [ruby-core:89973] [ruby-core:89976] [ruby-core:89977] [Bug #14968]
+ */
+#  define RSOCK_NONBLOCK_DEFAULT (0)
 #else
-# include <sys/socket.h>
-#endif
-#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-# include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-# include <netinet/tcp.h>
-#endif
-#ifdef HAVE_NETINET_UDP_H
-# include <netinet/udp.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-#include <netdb.h>
+#  define RSOCK_NONBLOCK_DEFAULT (0)
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  ifdef HAVE_NETINET_IN_SYSTM_H
+#    include <netinet/in_systm.h>
+#  endif
+#  ifdef HAVE_NETINET_TCP_H
+#    include <netinet/tcp.h>
+#  endif
+#  ifdef HAVE_NETINET_TCP_FSM_H
+#    include <netinet/tcp_fsm.h>
+#  endif
+#  ifdef HAVE_NETINET_UDP_H
+#    include <netinet/udp.h>
+#  endif
+#  ifdef HAVE_ARPA_INET_H
+#    include <arpa/inet.h>
+#  endif
+#  include <netdb.h>
+#endif
+
+#ifdef HAVE_NETPACKET_PACKET_H
+#  include <netpacket/packet.h>
+#endif
+#ifdef HAVE_NET_ETHERNET_H
+#  include <net/ethernet.h>
 #endif
+
 #include <errno.h>
+
 #ifdef HAVE_SYS_UN_H
-#include <sys/un.h>
+#  include <sys/un.h>
 #endif
 
 #if defined(HAVE_FCNTL)
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
+#  ifdef HAVE_SYS_SELECT_H
+#    include <sys/select.h>
+#  endif
+#  ifdef HAVE_SYS_TYPES_H
+#    include <sys/types.h>
+#  endif
+#  ifdef HAVE_SYS_TIME_H
+#    include <sys/time.h>
+#  endif
+#  ifdef HAVE_FCNTL_H
+#    include <fcntl.h>
+#  endif
 #endif
 
 #ifdef HAVE_IFADDRS_H
-#include <ifaddrs.h>
+#  ifdef __HAIKU__
+#    define _BSD_SOURCE
+#  endif
+#  include <ifaddrs.h>
 #endif
 #ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
+#  include <sys/ioctl.h>
 #endif
 #ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
+#  include <sys/sockio.h>
 #endif
 #ifdef HAVE_NET_IF_H
-#include <net/if.h>
+#  include <net/if.h>
 #endif
 
 #ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
+#  include <sys/param.h>
 #endif
 #ifdef HAVE_SYS_UCRED_H
-#include <sys/ucred.h>
+#  include <sys/ucred.h>
 #endif
 #ifdef HAVE_UCRED_H
-#include <ucred.h>
+#  include <ucred.h>
+#endif
+#ifdef HAVE_NET_IF_DL_H
+#  include <net/if_dl.h>
+#endif
+
+#ifndef HAVE_TYPE_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
+#ifdef NEED_IF_INDEXTONAME_DECL
+char *if_indextoname(unsigned int, char *);
+#endif
+#ifdef NEED_IF_NAMETOINDEX_DECL
+unsigned int if_nametoindex(const char *);
+#endif
+
+#define SOCKLEN_MAX \
+  (0 < (socklen_t)-1 ? \
+   ~(socklen_t)0 : \
+   (((((socklen_t)1) << (sizeof(socklen_t) * CHAR_BIT - 2)) - 1) * 2 + 1))
+
+#ifndef RSTRING_SOCKLEN
+#  define RSTRING_SOCKLEN (socklen_t)RSTRING_LENINT
 #endif
 
 #ifndef EWOULDBLOCK
-#define EWOULDBLOCK EAGAIN
+#  define EWOULDBLOCK EAGAIN
 #endif
 
 /*
@@ -99,68 +144,84 @@
 #define pseudo_AF_FTIP pseudo_AF_RTIP
 
 #ifndef HAVE_GETADDRINFO
-#include "addrinfo.h"
+#  include "addrinfo.h"
 #endif
+
 #include "sockport.h"
 
 #ifndef NI_MAXHOST
-# define NI_MAXHOST 1025
+#  define NI_MAXHOST 1025
 #endif
 #ifndef NI_MAXSERV
-# define NI_MAXSERV 32
+#  define NI_MAXSERV 32
 #endif
 
 #ifdef AF_INET6
-# define IS_IP_FAMILY(af) ((af) == AF_INET || (af) == AF_INET6)
+#  define IS_IP_FAMILY(af) ((af) == AF_INET || (af) == AF_INET6)
 #else
-# define IS_IP_FAMILY(af) ((af) == AF_INET)
+#  define IS_IP_FAMILY(af) ((af) == AF_INET)
+#endif
+
+#ifndef IN6_IS_ADDR_UNIQUE_LOCAL
+#  define IN6_IS_ADDR_UNIQUE_LOCAL(a) (((a)->s6_addr[0] == 0xfc) || ((a)->s6_addr[0] == 0xfd))
 #endif
 
-#ifndef HAVE_SOCKADDR_STORAGE
+#ifndef HAVE_TYPE_STRUCT_SOCKADDR_STORAGE
 /*
  * RFC 2553: protocol-independent placeholder for socket addresses
  */
-#define _SS_MAXSIZE     128
-#define _SS_ALIGNSIZE   (sizeof(double))
-#define _SS_PAD1SIZE    (_SS_ALIGNSIZE - sizeof(unsigned char) * 2)
-#define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(unsigned char) * 2 - \
+#  define _SS_MAXSIZE     128
+#  define _SS_ALIGNSIZE   (sizeof(double))
+#  define _SS_PAD1SIZE    (_SS_ALIGNSIZE - sizeof(unsigned char) * 2)
+#  define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(unsigned char) * 2 - \
                                 _SS_PAD1SIZE - _SS_ALIGNSIZE)
 
 struct sockaddr_storage {
-#ifdef HAVE_SA_LEN
+#  ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
         unsigned char ss_len;           /* address length */
         unsigned char ss_family;        /* address family */
-#else
+#  else
         unsigned short ss_family;
-#endif
+#  endif
         char    __ss_pad1[_SS_PAD1SIZE];
         double  __ss_align;     /* force desired structure storage alignment */
         char    __ss_pad2[_SS_PAD2SIZE];
 };
 #endif
 
-#if defined __APPLE__ && defined __MACH__
+typedef union {
+  struct sockaddr addr;
+  struct sockaddr_in in;
+#ifdef AF_INET6
+  struct sockaddr_in6 in6;
+#endif
+#ifdef HAVE_TYPE_STRUCT_SOCKADDR_UN
+  struct sockaddr_un un;
+#endif
+#ifdef HAVE_TYPE_STRUCT_SOCKADDR_DL
+  struct sockaddr_dl dl; /* AF_LINK */
+#endif
+  struct sockaddr_storage storage;
+  char place_holder[2048]; /* sockaddr_storage is not enough for Unix domain sockets on SunOS and Darwin. */
+} union_sockaddr;
+
+#ifdef __APPLE__
 /*
  * CMSG_ macros are broken on 64bit darwin, because __DARWIN_ALIGN
  * aligns up to __darwin_size_t which is 64bit, but CMSG_DATA is
  * 32bit-aligned.
  */
-#undef __DARWIN_ALIGNBYTES
-#define __DARWIN_ALIGNBYTES (sizeof(unsigned int) - 1)
+#  undef __DARWIN_ALIGNBYTES
+#  define __DARWIN_ALIGNBYTES (sizeof(unsigned int) - 1)
 #endif
 
 #if defined(_AIX)
-#ifndef CMSG_SPACE
-# define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
-#endif
-#ifndef CMSG_LEN
-# define CMSG_LEN(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
-#endif
-#endif
-
-#ifdef __BEOS__
-#undef close
-#define close closesocket
+#  ifndef CMSG_SPACE
+#    define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
+#  endif
+#  ifndef CMSG_LEN
+#    define CMSG_LEN(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
+#  endif
 #endif
 
 #define INET_CLIENT 0
@@ -168,8 +229,15 @@ struct sockaddr_storage {
 #define INET_SOCKS  2
 
 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;
@@ -187,23 +255,25 @@ extern VALUE rb_eSocket;
 
 #ifdef SOCKS
 extern VALUE rb_cSOCKSSocket;
-#ifdef SOCKS5
-#include <socks.h>
-#else
+#  ifdef SOCKS5
+#    include <socks.h>
+#  else
 void SOCKSinit();
 int Rconnect();
-#endif
+#  endif
 #endif
 
 #include "constdefs.h"
 
-#define BLOCKING_REGION(func, arg) (long)rb_thread_blocking_region((func), (arg), RUBY_UBF_IO, 0)
 #define BLOCKING_REGION_FD(func, arg) (long)rb_thread_io_blocking_region((func), (arg), (arg)->fd)
 
 #define SockAddrStringValue(v) rsock_sockaddr_string_value(&(v))
 #define SockAddrStringValuePtr(v) rsock_sockaddr_string_value_ptr(&(v))
+#define SockAddrStringValueWithAddrinfo(v, rai_ret) rsock_sockaddr_string_value_with_addrinfo(&(v), &(rai_ret))
 VALUE rsock_sockaddr_string_value(volatile VALUE *);
 char *rsock_sockaddr_string_value_ptr(volatile VALUE *);
+VALUE rsock_sockaddr_string_value_with_addrinfo(volatile VALUE *v, VALUE *ai_ret);
+
 VALUE rb_check_sockaddr_string_type(VALUE);
 
 NORETURN(void rsock_raise_socket_error(const char *, int));
@@ -215,29 +285,42 @@ int rsock_optname_arg(int family, int level, VALUE optname);
 int rsock_cmsg_type_arg(int family, int level, VALUE type);
 int rsock_shutdown_how_arg(VALUE how);
 
-int rsock_getfamily(int sockfd);
+int rsock_getfamily(rb_io_t *fptr);
 
-int rb_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);
+struct rb_addrinfo {
+  struct addrinfo *ai;
+  int allocated_by_malloc;
+};
+int rb_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct rb_addrinfo **res);
+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);
-struct addrinfo *rsock_addrinfo(VALUE host, VALUE port, int socktype, int flags);
-struct addrinfo *rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack);
+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_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack);
 VALUE rsock_fd_socket_addrinfo(int fd, struct sockaddr *addr, socklen_t len);
 VALUE rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len);
 
 VALUE rsock_addrinfo_new(struct sockaddr *addr, socklen_t len, int family, int socktype, int protocol, VALUE canonname, VALUE inspectname);
+VALUE rsock_addrinfo_inspect_sockaddr(VALUE rai);
 
-VALUE rsock_make_ipaddr(struct sockaddr *addr);
-VALUE rsock_ipaddr(struct sockaddr *sockaddr, int norevlookup);
-VALUE rsock_make_hostent(VALUE host, struct addrinfo *addr, VALUE (*ipaddr)(struct sockaddr *, size_t));
+VALUE rsock_make_ipaddr(struct sockaddr *addr, socklen_t addrlen);
+VALUE rsock_ipaddr(struct sockaddr *sockaddr, socklen_t sockaddrlen, int norevlookup);
+VALUE rsock_make_hostent(VALUE host, struct rb_addrinfo *addr, VALUE (*ipaddr)(struct sockaddr *, socklen_t));
+VALUE rsock_inspect_sockaddr(struct sockaddr *addr, socklen_t socklen, VALUE ret);
+socklen_t rsock_sockaddr_len(struct sockaddr *addr);
+VALUE rsock_sockaddr_obj(struct sockaddr *addr, socklen_t len);
 
 int rsock_revlookup_flag(VALUE revlookup, int *norevlookup);
 
 #ifdef HAVE_SYS_UN_H
-const char* rsock_unixpath(struct sockaddr_un *sockaddr, socklen_t len);
+VALUE rsock_unixpath_str(struct sockaddr_un *sockaddr, socklen_t len);
 VALUE rsock_unixaddr(struct sockaddr_un *sockaddr, socklen_t len);
+socklen_t rsock_unix_sockaddr_len(VALUE path);
 #endif
 
 int rsock_socket(int domain, int type, int proto);
+int rsock_detect_cloexec(int fd);
 VALUE rsock_init_sock(VALUE sock, int fd);
 VALUE rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass);
 VALUE rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv, VALUE local_host, VALUE local_serv, int type);
@@ -261,33 +344,41 @@ enum sock_recv_type {
     RECV_SOCKET                 /* Socket#recvfrom */
 };
 
-VALUE rsock_s_recvfrom_nonblock(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);
 VALUE rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from);
 
 int rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks);
 
 VALUE rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len);
-VALUE rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen_t *len);
+VALUE rsock_s_accept_nonblock(VALUE klass, VALUE ex, rb_io_t *fptr,
+			      struct sockaddr *sockaddr, socklen_t *len);
 VALUE rsock_sock_listen(VALUE sock, VALUE log);
 
 VALUE rsock_sockopt_new(int family, int level, int optname, VALUE data);
 
 #if defined(HAVE_SENDMSG)
-VALUE rsock_bsock_sendmsg(int argc, VALUE *argv, VALUE sock);
-VALUE rsock_bsock_sendmsg_nonblock(int argc, VALUE *argv, VALUE sock);
+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);
 #else
 #define rsock_bsock_sendmsg rb_f_notimplement
 #define rsock_bsock_sendmsg_nonblock rb_f_notimplement
 #endif
+
 #if defined(HAVE_RECVMSG)
-VALUE rsock_bsock_recvmsg(int argc, VALUE *argv, VALUE sock);
-VALUE rsock_bsock_recvmsg_nonblock(int argc, VALUE *argv, VALUE sock);
+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);
+ssize_t rsock_recvmsg(int socket, struct msghdr *message, int flags);
 #else
 #define rsock_bsock_recvmsg rb_f_notimplement
 #define rsock_bsock_recvmsg_nonblock rb_f_notimplement
 #endif
 
-#ifdef HAVE_ST_MSG_CONTROL
+#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
 void rsock_discard_cmsg_resource(struct msghdr *mh, int msg_peek_p);
 #endif
 
@@ -303,6 +394,59 @@ void rsock_init_socket_constants(void);
 void rsock_init_ancdata(void);
 void rsock_init_addrinfo(void);
 void rsock_init_sockopt(void);
+void rsock_init_sockifaddr(void);
 void rsock_init_socket_init(void);
 
+NORETURN(void rsock_syserr_fail_host_port(int err, const char *, VALUE, VALUE));
+NORETURN(void rsock_syserr_fail_path(int err, const char *, VALUE));
+NORETURN(void rsock_syserr_fail_sockaddr(int err, const char *mesg, struct sockaddr *addr, socklen_t len));
+NORETURN(void rsock_syserr_fail_raddrinfo(int err, const char *mesg, VALUE rai));
+NORETURN(void rsock_syserr_fail_raddrinfo_or_sockaddr(int err, const char *mesg, VALUE addr, VALUE rai));
+
+NORETURN(void rsock_sys_fail_host_port(const char *, VALUE, VALUE));
+NORETURN(void rsock_sys_fail_path(const char *, VALUE));
+NORETURN(void rsock_sys_fail_sockaddr(const char *, struct sockaddr *addr, socklen_t len));
+NORETURN(void rsock_sys_fail_raddrinfo(const char *, VALUE rai));
+NORETURN(void rsock_sys_fail_raddrinfo_or_sockaddr(const char *, VALUE addr, VALUE rai));
+
+/*
+ * It is safe on Linux to attempt using a socket without waiting on it in
+ * all cases.  For some syscalls (e.g. accept/accept4), blocking on the
+ * syscall instead of relying on select/poll allows the kernel to use
+ * "wake-one" behavior and avoid the thundering herd problem.
+ * This is likely safe on all other *nix-like systems, so this safe list
+ * can be expanded by interested parties.
+ */
+#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
+
+VALUE rsock_read_nonblock(VALUE sock, VALUE length, VALUE buf, VALUE ex);
+VALUE rsock_write_nonblock(VALUE sock, VALUE buf, VALUE ex);
+
+void rsock_make_fd_nonblock(int fd);
+
+#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 4613892e7d..bfeb30340c 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -10,6 +10,100 @@
 
 #include "rubysocket.h"
 
+static VALUE sym_wait_writable;
+
+static VALUE sock_s_unpack_sockaddr_in(VALUE, VALUE);
+
+void
+rsock_sys_fail_host_port(const char *mesg, VALUE host, VALUE port)
+{
+    rsock_syserr_fail_host_port(errno, mesg, host, port);
+}
+
+void
+rsock_syserr_fail_host_port(int err, const char *mesg, VALUE host, VALUE port)
+{
+    VALUE message;
+
+    message = rb_sprintf("%s for %+"PRIsVALUE" port % "PRIsVALUE"",
+			 mesg, host, port);
+
+    rb_syserr_fail_str(err, message);
+}
+
+void
+rsock_sys_fail_path(const char *mesg, VALUE path)
+{
+    rsock_syserr_fail_path(errno, mesg, path);
+}
+
+void
+rsock_syserr_fail_path(int err, const char *mesg, VALUE path)
+{
+    VALUE message;
+
+    if (RB_TYPE_P(path, T_STRING)) {
+	message = rb_sprintf("%s for % "PRIsVALUE"", mesg, path);
+	rb_syserr_fail_str(err, message);
+    }
+    else {
+	rb_syserr_fail(err, mesg);
+    }
+}
+
+void
+rsock_sys_fail_sockaddr(const char *mesg, struct sockaddr *addr, socklen_t len)
+{
+    rsock_syserr_fail_sockaddr(errno, mesg, addr, len);
+}
+
+void
+rsock_syserr_fail_sockaddr(int err, const char *mesg, struct sockaddr *addr, socklen_t len)
+{
+    VALUE rai;
+
+    rai = rsock_addrinfo_new(addr, len, PF_UNSPEC, 0, 0, Qnil, Qnil);
+
+    rsock_syserr_fail_raddrinfo(err, mesg, rai);
+}
+
+void
+rsock_sys_fail_raddrinfo(const char *mesg, VALUE rai)
+{
+    rsock_syserr_fail_raddrinfo(errno, mesg, rai);
+}
+
+void
+rsock_syserr_fail_raddrinfo(int err, const char *mesg, VALUE rai)
+{
+    VALUE str, message;
+
+    str = rsock_addrinfo_inspect_sockaddr(rai);
+    message = rb_sprintf("%s for %"PRIsVALUE"", mesg, str);
+
+    rb_syserr_fail_str(err, message);
+}
+
+void
+rsock_sys_fail_raddrinfo_or_sockaddr(const char *mesg, VALUE addr, VALUE rai)
+{
+    rsock_syserr_fail_raddrinfo_or_sockaddr(errno, mesg, addr, rai);
+}
+
+void
+rsock_syserr_fail_raddrinfo_or_sockaddr(int err, const char *mesg, VALUE addr, VALUE rai)
+{
+    if (NIL_P(rai)) {
+        StringValue(addr);
+
+	rsock_syserr_fail_sockaddr(err, mesg,
+            (struct sockaddr *)RSTRING_PTR(addr),
+            (socklen_t)RSTRING_LEN(addr)); /* overflow should be checked already */
+    }
+    else
+	rsock_syserr_fail_raddrinfo(err, mesg, rai);
+}
+
 static void
 setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
 {
@@ -27,9 +121,8 @@ setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
  *
  * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
  *
- * _protocol_ should be a protocol defined in the domain.
- * This is optional.
- * If it is not given, 0 is used internally.
+ * _protocol_ is optional and should be a protocol defined in the domain.
+ * If protocol is not given, 0 is used internally.
  *
  *   Socket.new(:INET, :STREAM) # TCP socket
  *   Socket.new(:INET, :DGRAM)  # UDP socket
@@ -47,7 +140,6 @@ 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)");
@@ -59,7 +151,7 @@ sock_initialize(int argc, VALUE *argv, VALUE sock)
 static VALUE
 io_call_close(VALUE io)
 {
-    return rb_funcall(io, rb_intern("close"), 0, 0);
+    return rb_funcallv(io, rb_intern("close"), 0, 0);
 }
 
 static VALUE
@@ -76,6 +168,95 @@ pair_yield(VALUE pair)
 #endif
 
 #if defined HAVE_SOCKETPAIR
+
+#ifdef SOCK_CLOEXEC
+static int
+rsock_socketpair0(int domain, int type, int protocol, int sv[2])
+{
+    int ret;
+    static int cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
+    static const int default_flags = SOCK_CLOEXEC|RSOCK_NONBLOCK_DEFAULT;
+
+    if (cloexec_state > 0) { /* common path, if SOCK_CLOEXEC is defined */
+        ret = socketpair(domain, type|default_flags, protocol, sv);
+        if (ret == 0 && (sv[0] <= 2 || sv[1] <= 2)) {
+            goto fix_cloexec; /* highly unlikely */
+        }
+        goto update_max_fd;
+    }
+    else if (cloexec_state < 0) { /* usually runs once only for detection */
+        ret = socketpair(domain, type|default_flags, protocol, sv);
+        if (ret == 0) {
+            cloexec_state = rsock_detect_cloexec(sv[0]);
+            if ((cloexec_state == 0) || (sv[0] <= 2 || sv[1] <= 2))
+                goto fix_cloexec;
+            goto update_max_fd;
+        }
+        else if (ret == -1 && errno == EINVAL) {
+            /* SOCK_CLOEXEC is available since Linux 2.6.27.  Linux 2.6.18 fails with EINVAL */
+            ret = socketpair(domain, type, protocol, sv);
+            if (ret != -1) {
+                /* The reason of EINVAL may be other than SOCK_CLOEXEC.
+                 * So disable SOCK_CLOEXEC only if socketpair() succeeds without SOCK_CLOEXEC.
+                 * Ex. Socket.pair(:UNIX, 0xff) fails with EINVAL.
+                 */
+                cloexec_state = 0;
+            }
+        }
+    }
+    else { /* cloexec_state == 0 */
+        ret = socketpair(domain, type, protocol, sv);
+    }
+    if (ret == -1) {
+        return -1;
+    }
+
+fix_cloexec:
+    rb_maygvl_fd_fix_cloexec(sv[0]);
+    rb_maygvl_fd_fix_cloexec(sv[1]);
+    if (RSOCK_NONBLOCK_DEFAULT) {
+        rsock_make_fd_nonblock(sv[0]);
+        rsock_make_fd_nonblock(sv[1]);
+    }
+
+update_max_fd:
+    rb_update_max_fd(sv[0]);
+    rb_update_max_fd(sv[1]);
+
+    return ret;
+}
+#else /* !SOCK_CLOEXEC */
+static int
+rsock_socketpair0(int domain, int type, int protocol, int sv[2])
+{
+    int ret = socketpair(domain, type, protocol, sv);
+
+    if (ret == -1)
+	return -1;
+
+    rb_fd_fix_cloexec(sv[0]);
+    rb_fd_fix_cloexec(sv[1]);
+    if (RSOCK_NONBLOCK_DEFAULT) {
+        rsock_make_fd_nonblock(sv[0]);
+        rsock_make_fd_nonblock(sv[1]);
+    }
+    return ret;
+}
+#endif /* !SOCK_CLOEXEC */
+
+static int
+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)) {
+        ret = rsock_socketpair0(domain, type, protocol, sv);
+    }
+
+    return ret;
+}
+
 /*
  * call-seq:
  *   Socket.pair(domain, type, protocol)       => [socket1, socket2]
@@ -87,8 +268,16 @@ pair_yield(VALUE pair)
  *
  * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
  *
- * _protocol_ should be a protocol defined in the domain.
- * 0 is default protocol for the domain.
+ * _protocol_ should be a protocol defined in the domain,
+ * defaults to 0 for the domain.
+ *
+ *   s1, s2 = Socket.pair(:UNIX, :STREAM, 0)
+ *   s1.send "a", 0
+ *   s1.send "b", 0
+ *   s1.close
+ *   p s2.recv(10) #=> "ab"
+ *   p s2.recv(10) #=> ""
+ *   p s2.recv(10) #=> ""
  *
  *   s1, s2 = Socket.pair(:UNIX, :DGRAM, 0)
  *   s1.send "a", 0
@@ -111,16 +300,10 @@ rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass)
 
     setup_domain_and_type(domain, &d, type, &t);
     p = NUM2INT(protocol);
-    ret = socketpair(d, t, p, sp);
-    if (ret < 0 && (errno == EMFILE || errno == ENFILE)) {
-        rb_gc();
-        ret = socketpair(d, t, p, sp);
-    }
+    ret = rsock_socketpair(d, t, p, sp);
     if (ret < 0) {
 	rb_sys_fail("socketpair(2)");
     }
-    rb_update_max_fd(sp[0]);
-    rb_update_max_fd(sp[1]);
 
     s1 = rsock_init_sock(rb_obj_alloc(klass), sp[0]);
     s2 = rsock_init_sock(rb_obj_alloc(klass), sp[1]);
@@ -136,7 +319,7 @@ rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- * 	socket.connect(remote_sockaddr) => 0
+ *   socket.connect(remote_sockaddr) => 0
  *
  * Requests a connection to be made on the given +remote_sockaddr+. Returns 0 if
  * successful, otherwise an exception is raised.
@@ -145,14 +328,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
@@ -248,78 +431,49 @@ rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass)
 static VALUE
 sock_connect(VALUE sock, VALUE addr)
 {
+    VALUE rai;
     rb_io_t *fptr;
     int fd, n;
 
-    SockAddrStringValue(addr);
+    SockAddrStringValueWithAddrinfo(addr, rai);
     addr = rb_str_new4(addr);
     GetOpenFile(sock, fptr);
     fd = fptr->fd;
-    n = rsock_connect(fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LENINT(addr), 0);
+    n = rsock_connect(fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_SOCKLEN(addr), 0);
     if (n < 0) {
-	rb_sys_fail("connect(2)");
+	rsock_sys_fail_raddrinfo_or_sockaddr("connect(2)", addr, rai);
     }
 
     return INT2FIX(n);
 }
 
-/*
- * 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
- */
+/* :nodoc: */
 static VALUE
-sock_connect_nonblock(VALUE sock, VALUE addr)
+sock_connect_nonblock(VALUE sock, VALUE addr, VALUE ex)
 {
+    VALUE rai;
     rb_io_t *fptr;
     int n;
 
-    SockAddrStringValue(addr);
+    SockAddrStringValueWithAddrinfo(addr, rai);
     addr = rb_str_new4(addr);
     GetOpenFile(sock, fptr);
     rb_io_set_nonblock(fptr);
-    n = connect(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LENINT(addr));
+    n = connect(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_SOCKLEN(addr));
     if (n < 0) {
-        if (errno == EINPROGRESS)
-            rb_mod_sys_fail(rb_mWaitWritable, "connect(2) would block");
-	rb_sys_fail("connect(2)");
+	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);
     }
 
     return INT2FIX(n);
@@ -327,7 +481,7 @@ sock_connect_nonblock(VALUE sock, VALUE addr)
 
 /*
  * call-seq:
- * 	socket.bind(local_sockaddr) => 0
+ *   socket.bind(local_sockaddr) => 0
  *
  * Binds to the given local address.
  *
@@ -335,18 +489,18 @@ sock_connect_nonblock(VALUE sock, VALUE addr)
  * * +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
@@ -414,19 +568,20 @@ sock_connect_nonblock(VALUE sock, VALUE addr)
 static VALUE
 sock_bind(VALUE sock, VALUE addr)
 {
+    VALUE rai;
     rb_io_t *fptr;
 
-    SockAddrStringValue(addr);
+    SockAddrStringValueWithAddrinfo(addr, rai);
     GetOpenFile(sock, fptr);
-    if (bind(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LENINT(addr)) < 0)
-	rb_sys_fail("bind(2)");
+    if (bind(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_SOCKLEN(addr)) < 0)
+	rsock_sys_fail_raddrinfo_or_sockaddr("bind(2)", addr, rai);
 
     return INT2FIX(0);
 }
 
 /*
  * call-seq:
- * 	socket.listen( int ) => 0
+ *   socket.listen( int ) => 0
  *
  * Listens for connections, using the specified +int+ as the backlog. A call
  * to _listen_ only applies if the +socket+ is of type SOCK_STREAM or
@@ -436,18 +591,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
@@ -500,7 +655,6 @@ rsock_sock_listen(VALUE sock, VALUE log)
     rb_io_t *fptr;
     int backlog;
 
-    rb_secure(4);
     backlog = NUM2INT(log);
     GetOpenFile(sock, fptr);
     if (listen(fptr->fd, backlog) < 0)
@@ -511,8 +665,8 @@ rsock_sock_listen(VALUE sock, VALUE log)
 
 /*
  * call-seq:
- * 	socket.recvfrom(maxlen) => [mesg, sender_addrinfo]
- * 	socket.recvfrom(maxlen, flags) => [mesg, sender_addrinfo]
+ *   socket.recvfrom(maxlen) => [mesg, sender_addrinfo]
+ *   socket.recvfrom(maxlen, flags) => [mesg, sender_addrinfo]
  *
  * Receives up to _maxlen_ bytes from +socket+. _flags_ is zero or more
  * of the +MSG_+ options. The first element of the results, _mesg_, is the data
@@ -524,27 +678,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
@@ -620,72 +774,11 @@ sock_recvfrom(int argc, VALUE *argv, VALUE sock)
     return rsock_s_recvfrom(sock, argc, argv, RECV_SOCKET);
 }
 
-/*
- * 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
- */
+/* :nodoc: */
 static VALUE
-sock_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
+sock_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str, VALUE ex)
 {
-    return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_SOCKET);
+    return rsock_s_recvfrom_nonblock(sock, len, flg, str, ex, RECV_SOCKET);
 }
 
 /*
@@ -707,110 +800,64 @@ sock_accept(VALUE sock)
 {
     rb_io_t *fptr;
     VALUE sock2;
-    struct sockaddr_storage buf;
+    union_sockaddr buf;
     socklen_t len = (socklen_t)sizeof buf;
 
     GetOpenFile(sock, fptr);
-    sock2 = rsock_s_accept(rb_cSocket,fptr->fd,(struct sockaddr*)&buf,&len);
+    sock2 = rsock_s_accept(rb_cSocket,fptr->fd,&buf.addr,&len);
 
-    return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len));
+    return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, &buf.addr, len));
 }
 
-/*
- * 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
- */
+/* :nodoc: */
 static VALUE
-sock_accept_nonblock(VALUE sock)
+sock_accept_nonblock(VALUE sock, VALUE ex)
 {
     rb_io_t *fptr;
     VALUE sock2;
-    struct sockaddr_storage buf;
+    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, fptr, (struct sockaddr *)&buf, &len);
-    return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len));
+    sock2 = rsock_s_accept_nonblock(rb_cSocket, ex, fptr, addr, &len);
+
+    if (SYMBOL_P(sock2)) /* :wait_readable */
+	return sock2;
+    return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, &buf.addr, len));
 }
 
 /*
  * call-seq:
- * 	socket.sysaccept => [client_socket_fd, client_addrinfo]
+ *   socket.sysaccept => [client_socket_fd, client_addrinfo]
  *
  * Accepts an incoming connection returning an array containing the (integer)
  * file descriptor for the incoming connection, _client_socket_fd_,
  * and 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.
@@ -823,13 +870,13 @@ sock_sysaccept(VALUE sock)
 {
     rb_io_t *fptr;
     VALUE sock2;
-    struct sockaddr_storage buf;
+    union_sockaddr buf;
     socklen_t len = (socklen_t)sizeof buf;
 
     GetOpenFile(sock, fptr);
-    sock2 = rsock_s_accept(0,fptr->fd,(struct sockaddr*)&buf,&len);
+    sock2 = rsock_s_accept(0,fptr->fd,&buf.addr,&len);
 
-    return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len));
+    return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, &buf.addr, len));
 }
 
 #ifdef HAVE_GETHOSTNAME
@@ -847,17 +894,35 @@ sock_sysaccept(VALUE sock)
 static VALUE
 sock_gethostname(VALUE obj)
 {
-#ifndef HOST_NAME_MAX
-#  define HOST_NAME_MAX 1024
+#if defined(NI_MAXHOST)
+#  define RUBY_MAX_HOST_NAME_LEN NI_MAXHOST
+#elif defined(HOST_NAME_MAX)
+#  define RUBY_MAX_HOST_NAME_LEN HOST_NAME_MAX
+#else
+#  define RUBY_MAX_HOST_NAME_LEN 1024
 #endif
-    char buf[HOST_NAME_MAX+1];
-
-    rb_secure(3);
-    if (gethostname(buf, (int)sizeof buf - 1) < 0)
-	rb_sys_fail("gethostname");
 
-    buf[sizeof buf - 1] = '\0';
-    return rb_str_new2(buf);
+    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;
 }
 #else
 #ifdef HAVE_UNAME
@@ -869,7 +934,6 @@ sock_gethostname(VALUE obj)
 {
     struct utsname un;
 
-    rb_secure(3);
     uname(&un);
     return rb_str_new2(un.nodename);
 }
@@ -879,7 +943,7 @@ sock_gethostname(VALUE obj)
 #endif
 
 static VALUE
-make_addrinfo(struct addrinfo *res0, int norevlookup)
+make_addrinfo(struct rb_addrinfo *res0, int norevlookup)
 {
     VALUE base, ary;
     struct addrinfo *res;
@@ -888,10 +952,10 @@ make_addrinfo(struct addrinfo *res0, int norevlookup)
 	rb_raise(rb_eSocket, "host not found");
     }
     base = rb_ary_new();
-    for (res = res0; res; res = res->ai_next) {
-	ary = rsock_ipaddr(res->ai_addr, 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_PTR(ary)[2] = rb_str_new2(res->ai_canonname);
+	    RARRAY_ASET(ary, 2, rb_str_new2(res->ai_canonname));
 	}
 	rb_ary_push(ary, INT2FIX(res->ai_family));
 	rb_ary_push(ary, INT2FIX(res->ai_socktype));
@@ -902,19 +966,19 @@ make_addrinfo(struct addrinfo *res0, int norevlookup)
 }
 
 static VALUE
-sock_sockaddr(struct sockaddr *addr, size_t len)
+sock_sockaddr(struct sockaddr *addr, socklen_t len)
 {
     char *ptr;
 
     switch (addr->sa_family) {
       case AF_INET:
 	ptr = (char*)&((struct sockaddr_in*)addr)->sin_addr.s_addr;
-	len = sizeof(((struct sockaddr_in*)addr)->sin_addr.s_addr);
+	len = (socklen_t)sizeof(((struct sockaddr_in*)addr)->sin_addr.s_addr);
 	break;
 #ifdef AF_INET6
       case AF_INET6:
 	ptr = (char*)&((struct sockaddr_in6*)addr)->sin6_addr.s6_addr;
-	len = sizeof(((struct sockaddr_in6*)addr)->sin6_addr.s6_addr);
+	len = (socklen_t)sizeof(((struct sockaddr_in6*)addr)->sin6_addr.s6_addr);
 	break;
 #endif
       default:
@@ -928,7 +992,18 @@ sock_sockaddr(struct sockaddr *addr, size_t len)
  * call-seq:
  *   Socket.gethostbyname(hostname) => [official_hostname, alias_hostnames, address_family, *address_list]
  *
- * Obtains the host information for _hostname_.
+ * Use Addrinfo.getaddrinfo instead.
+ * This method is deprecated for the following reasons:
+ *
+ * - The 3rd element of the result is the address family of the first address.
+ *   The address families of the rest of the addresses are not returned.
+ * - Uncommon address representation:
+ *   4/16-bytes binary string to represent IPv4/IPv6 address.
+ * - gethostbyname() may take a long time and it may block other threads.
+ *   (GVL cannot be released since gethostbyname() is not thread safe.)
+ * - This method uses gethostbyname() function already removed from POSIX.
+ *
+ * This method obtains the host information for _hostname_.
  *
  *   p Socket.gethostbyname("hal") #=> ["localhost", ["hal"], 2, "\x7F\x00\x00\x01"]
  *
@@ -936,31 +1011,47 @@ sock_sockaddr(struct sockaddr *addr, size_t len)
 static VALUE
 sock_s_gethostbyname(VALUE obj, VALUE host)
 {
-    rb_secure(3);
-    return rsock_make_hostent(host, rsock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), sock_sockaddr);
+    struct rb_addrinfo *res =
+	rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, AI_CANONNAME);
+    return rsock_make_hostent(host, res, sock_sockaddr);
 }
 
 /*
  * call-seq:
  *   Socket.gethostbyaddr(address_string [, address_family]) => hostent
  *
- * Obtains the host information for _address_.
+ * Use Addrinfo#getnameinfo instead.
+ * This method is deprecated for the following reasons:
+ *
+ * - Uncommon address representation:
+ *   4/16-bytes binary string to represent IPv4/IPv6 address.
+ * - gethostbyaddr() may take a long time and it may block other threads.
+ *   (GVL cannot be released since gethostbyname() is not thread safe.)
+ * - This method uses gethostbyname() function already removed from POSIX.
+ *
+ * This method obtains the host information for _address_.
  *
  *   p Socket.gethostbyaddr([221,186,184,68].pack("CCCC"))
  *   #=> ["carbon.ruby-lang.org", [], 2, "\xDD\xBA\xB8D"]
+ *
+ *   p Socket.gethostbyaddr([127,0,0,1].pack("CCCC"))
+ *   ["localhost", [], 2, "\x7F\x00\x00\x01"]
+ *   p Socket.gethostbyaddr(([0]*15+[1]).pack("C"*16))
+ *   #=> ["localhost", ["ip6-localhost", "ip6-loopback"], 10,
+ *        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01"]
+ *
  */
 static VALUE
-sock_s_gethostbyaddr(int argc, VALUE *argv)
+sock_s_gethostbyaddr(int argc, VALUE *argv, VALUE _)
 {
     VALUE addr, family;
     struct hostent *h;
-    struct sockaddr *sa;
     char **pch;
     VALUE ary, names;
     int t = AF_INET;
 
     rb_scan_args(argc, argv, "11", &addr, &family);
-    sa = (struct sockaddr*)StringValuePtr(addr);
+    StringValue(addr);
     if (!NIL_P(family)) {
 	t = rsock_family_arg(family);
     }
@@ -969,7 +1060,7 @@ sock_s_gethostbyaddr(int argc, VALUE *argv)
 	t = AF_INET6;
     }
 #endif
-    h = gethostbyaddr(RSTRING_PTR(addr), RSTRING_LENINT(addr), t);
+    h = gethostbyaddr(RSTRING_PTR(addr), RSTRING_SOCKLEN(addr), t);
     if (h == NULL) {
 #ifdef HAVE_HSTRERROR
 	extern int h_errno;
@@ -1013,7 +1104,7 @@ sock_s_gethostbyaddr(int argc, VALUE *argv)
  *   Socket.getservbyname("syslog", "udp") #=> 514
  */
 static VALUE
-sock_s_getservbyname(int argc, VALUE *argv)
+sock_s_getservbyname(int argc, VALUE *argv, VALUE _)
 {
     VALUE service, proto;
     struct servent *sp;
@@ -1054,7 +1145,7 @@ sock_s_getservbyname(int argc, VALUE *argv)
  *
  */
 static VALUE
-sock_s_getservbyport(int argc, VALUE *argv)
+sock_s_getservbyport(int argc, VALUE *argv, VALUE _)
 {
     VALUE port, proto;
     struct servent *sp;
@@ -1073,7 +1164,7 @@ sock_s_getservbyport(int argc, VALUE *argv)
     if (!sp) {
 	rb_raise(rb_eSocket, "no such service for port %d/%s", (int)portnum, protoname);
     }
-    return rb_tainted_str_new2(sp->s_name);
+    return rb_str_new2(sp->s_name);
 }
 
 /*
@@ -1082,12 +1173,15 @@ sock_s_getservbyport(int argc, VALUE *argv)
  *
  * Obtains address information for _nodename_:_servname_.
  *
- * _family_ should be an address family such as: :INET, :INET6, :UNIX, etc.
+ * Note that Addrinfo.getaddrinfo provides the same functionality in
+ * an object oriented style.
+ *
+ * _family_ should be an address family such as: :INET, :INET6, etc.
  *
  * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
  *
- * _protocol_ should be a protocol defined in the family.
- * 0 is default protocol for the family.
+ * _protocol_ should be a protocol defined in the family,
+ * and defaults to 0 for the family.
  *
  * _flags_ should be bitwise OR of Socket::AI_* constants.
  *
@@ -1100,8 +1194,7 @@ sock_s_getservbyport(int argc, VALUE *argv)
  *   #    ["AF_INET", 0, "localhost", "127.0.0.1", 2, 3, 0]]  # PF_INET/SOCK_RAW/IPPROTO_IP
  *
  * _reverse_lookup_ directs the form of the third element, and has to
- * be one of below.
- * If it is ommitted, the default value is +nil+.
+ * be one of below.  If _reverse_lookup_ is omitted, the default value is +nil+.
  *
  *   +true+, +:hostname+:  hostname is obtained from numeric address using reverse lookup, which may take a time.
  *   +false+, +:numeric+:  hostname is same as numeric address.
@@ -1110,10 +1203,11 @@ sock_s_getservbyport(int argc, VALUE *argv)
  * If Addrinfo object is preferred, use Addrinfo.getaddrinfo.
  */
 static VALUE
-sock_s_getaddrinfo(int argc, VALUE *argv)
+sock_s_getaddrinfo(int argc, VALUE *argv, VALUE _)
 {
     VALUE host, port, family, socktype, protocol, flags, ret, revlookup;
-    struct addrinfo hints, *res;
+    struct addrinfo hints;
+    struct rb_addrinfo *res;
     int norevlookup;
 
     rb_scan_args(argc, argv, "25", &host, &port, &family, &socktype, &protocol, &flags, &revlookup);
@@ -1136,7 +1230,7 @@ sock_s_getaddrinfo(int argc, VALUE *argv)
     res = rsock_getaddrinfo(host, port, &hints, 0);
 
     ret = make_addrinfo(res, norevlookup);
-    freeaddrinfo(res);
+    rb_freeaddrinfo(res);
     return ret;
 }
 
@@ -1153,7 +1247,8 @@ sock_s_getaddrinfo(int argc, VALUE *argv)
  *
  * _flags_ should be bitwise OR of Socket::NI_* constants.
  *
- * Note that the last form is compatible with IPSocket#{addr,peeraddr}.
+ * Note:
+ * The last form is compatible with IPSocket#addr and IPSocket#peeraddr.
  *
  *   Socket.getnameinfo(Socket.sockaddr_in(80, "127.0.0.1"))       #=> ["localhost", "www"]
  *   Socket.getnameinfo(["AF_INET", 80, "127.0.0.1"])              #=> ["localhost", "www"]
@@ -1162,16 +1257,18 @@ sock_s_getaddrinfo(int argc, VALUE *argv)
  * If Addrinfo object is preferred, use Addrinfo#getnameinfo.
  */
 static VALUE
-sock_s_getnameinfo(int argc, VALUE *argv)
+sock_s_getnameinfo(int argc, VALUE *argv, VALUE _)
 {
     VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags, tmp;
     char *hptr, *pptr;
     char hbuf[1024], pbuf[1024];
     int fl;
-    struct addrinfo hints, *res = NULL, *r;
-    int error;
-    struct sockaddr_storage ss;
+    struct rb_addrinfo *res = NULL;
+    struct addrinfo hints, *r;
+    int error, saved_errno;
+    union_sockaddr ss;
     struct sockaddr *sap;
+    socklen_t salen;
 
     sa = flags = Qnil;
     rb_scan_args(argc, argv, "11", &sa, &flags);
@@ -1187,10 +1284,11 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 	    rb_raise(rb_eTypeError, "sockaddr length too big");
 	}
 	memcpy(&ss, RSTRING_PTR(sa), RSTRING_LEN(sa));
-	if ((size_t)RSTRING_LEN(sa) != SS_LEN(&ss)) {
+        if (!VALIDATE_SOCKLEN(&ss.addr, RSTRING_LEN(sa))) {
 	    rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
 	}
-	sap = (struct sockaddr*)&ss;
+	sap = &ss.addr;
+        salen = RSTRING_SOCKLEN(sa);
 	goto call_nameinfo;
     }
     tmp = rb_check_array_type(sa);
@@ -1198,16 +1296,16 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 	sa = tmp;
 	MEMZERO(&hints, struct addrinfo, 1);
 	if (RARRAY_LEN(sa) == 3) {
-	    af = RARRAY_PTR(sa)[0];
-	    port = RARRAY_PTR(sa)[1];
-	    host = RARRAY_PTR(sa)[2];
+	    af = RARRAY_AREF(sa, 0);
+	    port = RARRAY_AREF(sa, 1);
+	    host = RARRAY_AREF(sa, 2);
 	}
 	else if (RARRAY_LEN(sa) >= 4) {
-	    af = RARRAY_PTR(sa)[0];
-	    port = RARRAY_PTR(sa)[1];
-	    host = RARRAY_PTR(sa)[3];
+	    af = RARRAY_AREF(sa, 0);
+	    port = RARRAY_AREF(sa, 1);
+	    host = RARRAY_AREF(sa, 3);
 	    if (NIL_P(host)) {
-		host = RARRAY_PTR(sa)[2];
+		host = RARRAY_AREF(sa, 2);
 	    }
 	    else {
 		/*
@@ -1228,7 +1326,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 	    hptr = NULL;
 	}
 	else {
-	    strncpy(hbuf, StringValuePtr(host), sizeof(hbuf));
+	    strncpy(hbuf, StringValueCStr(host), sizeof(hbuf));
 	    hbuf[sizeof(hbuf) - 1] = '\0';
 	    hptr = hbuf;
 	}
@@ -1242,7 +1340,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 	    pptr = pbuf;
 	}
 	else {
-	    strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
+	    strncpy(pbuf, StringValueCStr(port), sizeof(pbuf));
 	    pbuf[sizeof(pbuf) - 1] = '\0';
 	    pptr = pbuf;
 	}
@@ -1251,40 +1349,48 @@ sock_s_getnameinfo(int argc, VALUE *argv)
         hints.ai_family = NIL_P(af) ? PF_UNSPEC : rsock_family_arg(af);
 	error = rb_getaddrinfo(hptr, pptr, &hints, &res);
 	if (error) goto error_exit_addr;
-	sap = res->ai_addr;
+	sap = res->ai->ai_addr;
+        salen = res->ai->ai_addrlen;
     }
     else {
 	rb_raise(rb_eTypeError, "expecting String or Array");
     }
 
   call_nameinfo:
-    error = rb_getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf),
+    error = rb_getnameinfo(sap, salen, hbuf, sizeof(hbuf),
 			   pbuf, sizeof(pbuf), fl);
     if (error) goto error_exit_name;
     if (res) {
-	for (r = res->ai_next; r; r = r->ai_next) {
+	for (r = res->ai->ai_next; r; r = r->ai_next) {
 	    char hbuf2[1024], pbuf2[1024];
 
 	    sap = r->ai_addr;
-	    error = rb_getnameinfo(sap, SA_LEN(sap), hbuf2, sizeof(hbuf2),
+            salen = r->ai_addrlen;
+	    error = rb_getnameinfo(sap, salen, hbuf2, sizeof(hbuf2),
 				   pbuf2, sizeof(pbuf2), fl);
 	    if (error) goto error_exit_name;
 	    if (strcmp(hbuf, hbuf2) != 0|| strcmp(pbuf, pbuf2) != 0) {
-		freeaddrinfo(res);
+		rb_freeaddrinfo(res);
 		rb_raise(rb_eSocket, "sockaddr resolved to multiple nodename");
 	    }
 	}
-	freeaddrinfo(res);
+	rb_freeaddrinfo(res);
     }
     return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf));
 
   error_exit_addr:
-    if (res) freeaddrinfo(res);
+    saved_errno = errno;
+    if (res) rb_freeaddrinfo(res);
+    errno = saved_errno;
     rsock_raise_socket_error("getaddrinfo", error);
 
   error_exit_name:
-    if (res) freeaddrinfo(res);
+    saved_errno = errno;
+    if (res) rb_freeaddrinfo(res);
+    errno = saved_errno;
     rsock_raise_socket_error("getnameinfo", error);
+
+    UNREACHABLE_RETURN(Qnil);
 }
 
 /*
@@ -1304,12 +1410,10 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 static VALUE
 sock_s_pack_sockaddr_in(VALUE self, VALUE port, VALUE host)
 {
-    struct addrinfo *res = rsock_addrinfo(host, port, 0, 0);
-    VALUE addr = rb_str_new((char*)res->ai_addr, res->ai_addrlen);
+    struct rb_addrinfo *res = rsock_addrinfo(host, port, AF_UNSPEC, 0, 0);
+    VALUE addr = rb_str_new((char*)res->ai->ai_addr, res->ai->ai_addrlen);
 
-    freeaddrinfo(res);
-    OBJ_INFECT(addr, port);
-    OBJ_INFECT(addr, host);
+    rb_freeaddrinfo(res);
 
     return addr;
 }
@@ -1350,8 +1454,7 @@ sock_s_unpack_sockaddr_in(VALUE self, VALUE addr)
         rb_raise(rb_eArgError, "not an AF_INET sockaddr");
 #endif
     }
-    host = rsock_make_ipaddr((struct sockaddr*)sockaddr);
-    OBJ_INFECT(host, addr);
+    host = rsock_make_ipaddr((struct sockaddr*)sockaddr, RSTRING_SOCKLEN(addr));
     return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host);
 }
 
@@ -1371,19 +1474,16 @@ static VALUE
 sock_s_pack_sockaddr_un(VALUE self, VALUE path)
 {
     struct sockaddr_un sockaddr;
-    char *sun_path;
     VALUE addr;
 
-    MEMZERO(&sockaddr, struct sockaddr_un, 1);
-    sockaddr.sun_family = AF_UNIX;
-    sun_path = StringValueCStr(path);
-    if (sizeof(sockaddr.sun_path) <= strlen(sun_path)) {
-        rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
-            (int)sizeof(sockaddr.sun_path)-1);
+    StringValue(path);
+    INIT_SOCKADDR_UN(&sockaddr, sizeof(struct sockaddr_un));
+    if (sizeof(sockaddr.sun_path) < (size_t)RSTRING_LEN(path)) {
+        rb_raise(rb_eArgError, "too long unix socket path (%"PRIuSIZE" bytes given but %"PRIuSIZE" bytes max)",
+            (size_t)RSTRING_LEN(path), sizeof(sockaddr.sun_path));
     }
-    strncpy(sockaddr.sun_path, sun_path, sizeof(sockaddr.sun_path)-1);
-    addr = rb_str_new((char*)&sockaddr, sizeof(sockaddr));
-    OBJ_INFECT(addr, path);
+    memcpy(sockaddr.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
+    addr = rb_str_new((char*)&sockaddr, rsock_unix_sockaddr_len(path));
 
     return addr;
 }
@@ -1404,7 +1504,6 @@ static VALUE
 sock_s_unpack_sockaddr_un(VALUE self, VALUE addr)
 {
     struct sockaddr_un * sockaddr;
-    const char *sun_path;
     VALUE path;
 
     sockaddr = (struct sockaddr_un*)SockAddrStringValuePtr(addr);
@@ -1420,23 +1519,57 @@ sock_s_unpack_sockaddr_un(VALUE self, VALUE addr)
 	rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
 		 RSTRING_LEN(addr), (int)sizeof(struct sockaddr_un));
     }
-    sun_path = rsock_unixpath(sockaddr, RSTRING_LENINT(addr));
-    if (sizeof(struct sockaddr_un) == RSTRING_LEN(addr) &&
-        sun_path == sockaddr->sun_path &&
-        sun_path + strlen(sun_path) == RSTRING_PTR(addr) + RSTRING_LEN(addr)) {
-        rb_raise(rb_eArgError, "sockaddr_un.sun_path not NUL terminated");
-    }
-    path = rb_str_new2(sun_path);
-    OBJ_INFECT(path, addr);
+    path = rsock_unixpath_str(sockaddr, RSTRING_SOCKLEN(addr));
     return path;
 }
 #endif
 
 #if defined(HAVE_GETIFADDRS) || defined(SIOCGLIFCONF) || defined(SIOCGIFCONF) || defined(_WIN32)
+
+static socklen_t
+sockaddr_len(struct sockaddr *addr)
+{
+    if (addr == NULL)
+        return 0;
+
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+    if (addr->sa_len != 0)
+        return addr->sa_len;
+#endif
+
+    switch (addr->sa_family) {
+      case AF_INET:
+        return (socklen_t)sizeof(struct sockaddr_in);
+
+#ifdef AF_INET6
+      case AF_INET6:
+        return (socklen_t)sizeof(struct sockaddr_in6);
+#endif
+
+#ifdef HAVE_SYS_UN_H
+      case AF_UNIX:
+        return (socklen_t)sizeof(struct sockaddr_un);
+#endif
+
+#ifdef AF_PACKET
+      case AF_PACKET:
+        return (socklen_t)(offsetof(struct sockaddr_ll, sll_addr) + ((struct sockaddr_ll *)addr)->sll_halen);
+#endif
+
+      default:
+        return (socklen_t)(offsetof(struct sockaddr, sa_family) + sizeof(addr->sa_family));
+    }
+}
+
+socklen_t
+rsock_sockaddr_len(struct sockaddr *addr)
+{
+    return sockaddr_len(addr);
+}
+
 static VALUE
-sockaddr_obj(struct sockaddr *addr)
+sockaddr_obj(struct sockaddr *addr, socklen_t len)
 {
-    socklen_t len;
 #if defined(AF_INET6) && defined(__KAME__)
     struct sockaddr_in6 addr6;
 #endif
@@ -1444,18 +1577,14 @@ sockaddr_obj(struct sockaddr *addr)
     if (addr == NULL)
         return Qnil;
 
-    switch (addr->sa_family) {
-      case AF_INET:
-        len = (socklen_t)sizeof(struct sockaddr_in);
-        break;
+    len = sockaddr_len(addr);
 
-#ifdef AF_INET6
-      case AF_INET6:
-        len = (socklen_t)sizeof(struct sockaddr_in6);
-#  ifdef __KAME__
+#if defined(__KAME__) && defined(AF_INET6)
+    if (addr->sa_family == AF_INET6) {
 	/* KAME uses the 2nd 16bit word of link local IPv6 address as interface index internally */
         /* http://orange.kame.net/dev/cvsweb.cgi/kame/IMPLEMENTATION */
 	/* convert fe80:1::1 to fe80::1%1 */
+        len = (socklen_t)sizeof(struct sockaddr_in6);
 	memcpy(&addr6, addr, len);
 	addr = (struct sockaddr *)&addr6;
 	if (IN6_IS_ADDR_LINKLOCAL(&addr6.sin6_addr) &&
@@ -1465,27 +1594,18 @@ sockaddr_obj(struct sockaddr *addr)
 	    addr6.sin6_addr.s6_addr[2] = 0;
 	    addr6.sin6_addr.s6_addr[3] = 0;
 	}
-#  endif
-        break;
-#endif
-
-#ifdef HAVE_SYS_UN_H
-      case AF_UNIX:
-        len = (socklen_t)sizeof(struct sockaddr_un);
-        break;
-#endif
-
-      default:
-        len = (socklen_t)sizeof(struct sockaddr_in);
-        break;
     }
-#ifdef SA_LEN
-    if (len < (socklen_t)SA_LEN(addr))
-	len = (socklen_t)SA_LEN(addr);
 #endif
 
     return rsock_addrinfo_new(addr, len, addr->sa_family, 0, 0, Qnil, Qnil);
 }
+
+VALUE
+rsock_sockaddr_obj(struct sockaddr *addr, socklen_t len)
+{
+    return sockaddr_obj(addr, len);
+}
+
 #endif
 
 #if defined(HAVE_GETIFADDRS) || (defined(SIOCGLIFCONF) && defined(SIOCGLIFNUM) && !defined(__hpux)) || defined(SIOCGIFCONF) ||  defined(_WIN32)
@@ -1521,7 +1641,28 @@ socket_s_ip_address_list(VALUE self)
     list = rb_ary_new();
     for (p = ifp; p; p = p->ifa_next) {
         if (p->ifa_addr != NULL && IS_IP_FAMILY(p->ifa_addr->sa_family)) {
-            rb_ary_push(list, sockaddr_obj(p->ifa_addr));
+            struct sockaddr *addr = p->ifa_addr;
+#if defined(AF_INET6) && defined(__sun)
+            /*
+             * OpenIndiana SunOS 5.11 getifaddrs() returns IPv6 link local
+             * address with sin6_scope_id == 0.
+             * So fill it from the interface name (ifa_name).
+             */
+            struct sockaddr_in6 addr6;
+            if (addr->sa_family == AF_INET6) {
+                socklen_t len = (socklen_t)sizeof(struct sockaddr_in6);
+                memcpy(&addr6, addr, len);
+                addr = (struct sockaddr *)&addr6;
+                if (IN6_IS_ADDR_LINKLOCAL(&addr6.sin6_addr) &&
+                    addr6.sin6_scope_id == 0) {
+                    unsigned int ifindex = if_nametoindex(p->ifa_name);
+                    if (ifindex != 0) {
+                        addr6.sin6_scope_id = ifindex;
+                    }
+                }
+            }
+#endif
+            rb_ary_push(list, sockaddr_obj(addr, sockaddr_len(addr)));
         }
     }
 
@@ -1535,7 +1676,7 @@ socket_s_ip_address_list(VALUE self)
     int ret;
     struct lifnum ln;
     struct lifconf lc;
-    char *reason = NULL;
+    const char *reason = NULL;
     int save_errno;
     int i;
     VALUE list = Qnil;
@@ -1544,7 +1685,7 @@ socket_s_ip_address_list(VALUE self)
 
     fd = socket(AF_INET, SOCK_DGRAM, 0);
     if (fd == -1)
-        rb_sys_fail("socket");
+        rb_sys_fail("socket(2)");
 
     memset(&ln, 0, sizeof(ln));
     ln.lifn_family = AF_UNSPEC;
@@ -1583,7 +1724,7 @@ socket_s_ip_address_list(VALUE self)
                 }
                 ((struct sockaddr_in6 *)(&req->lifr_addr))->sin6_scope_id = req2.lifr_index;
             }
-            rb_ary_push(list, sockaddr_obj((struct sockaddr *)&req->lifr_addr));
+            rb_ary_push(list, sockaddr_obj((struct sockaddr *)&req->lifr_addr, req->lifr_addrlen));
         }
     }
 
@@ -1596,13 +1737,13 @@ socket_s_ip_address_list(VALUE self)
     errno = save_errno;
 
     if (reason)
-	rb_sys_fail(reason);
+	rb_syserr_fail(save_errno, reason);
     return list;
 
 #elif defined(SIOCGIFCONF)
     int fd = -1;
     int ret;
-#define EXTRA_SPACE (sizeof(struct ifconf) + sizeof(struct sockaddr_storage))
+#define EXTRA_SPACE ((int)(sizeof(struct ifconf) + sizeof(union_sockaddr)))
     char initbuf[4096+EXTRA_SPACE];
     char *buf = initbuf;
     int bufsize;
@@ -1614,7 +1755,7 @@ socket_s_ip_address_list(VALUE self)
 
     fd = socket(AF_INET, SOCK_DGRAM, 0);
     if (fd == -1)
-        rb_sys_fail("socket");
+        rb_sys_fail("socket(2)");
 
     bufsize = sizeof(initbuf);
     buf = initbuf;
@@ -1655,9 +1796,9 @@ socket_s_ip_address_list(VALUE self)
     while ((char*)req < (char*)conf.ifc_req + conf.ifc_len) {
 	struct sockaddr *addr = &req->ifr_addr;
         if (IS_IP_FAMILY(addr->sa_family)) {
-	    rb_ary_push(list, sockaddr_obj(addr));
+	    rb_ary_push(list, sockaddr_obj(addr, sockaddr_len(addr)));
 	}
-#ifdef HAVE_SA_LEN
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
 # ifndef _SIZEOF_ADDR_IFREQ
 #  define _SIZEOF_ADDR_IFREQ(r) \
           (sizeof(struct ifreq) + \
@@ -1681,7 +1822,7 @@ socket_s_ip_address_list(VALUE self)
     errno = save_errno;
 
     if (reason)
-	rb_sys_fail(reason);
+	rb_syserr_fail(save_errno, reason);
     return list;
 
 #undef EXTRA_SPACE
@@ -1772,7 +1913,7 @@ socket_s_ip_address_list(VALUE self)
 #else
 	    if (IS_IP_FAMILY(uni->Address.lpSockaddr->sa_family))
 #endif
-		rb_ary_push(list, sockaddr_obj(uni->Address.lpSockaddr));
+		rb_ary_push(list, sockaddr_obj(uni->Address.lpSockaddr, uni->Address.iSockaddrLength));
 	}
 	for (any = adapters->FirstAnycastAddress; any; any = any->Next) {
 #ifndef INET6
@@ -1780,7 +1921,7 @@ socket_s_ip_address_list(VALUE self)
 #else
 	    if (IS_IP_FAMILY(any->Address.lpSockaddr->sa_family))
 #endif
-		rb_ary_push(list, sockaddr_obj(any->Address.lpSockaddr));
+		rb_ary_push(list, sockaddr_obj(any->Address.lpSockaddr, any->Address.iSockaddrLength));
 	}
     }
 
@@ -1793,7 +1934,7 @@ socket_s_ip_address_list(VALUE self)
 #endif
 
 void
-Init_socket()
+Init_socket(void)
 {
     rsock_init_basicsocket();
 
@@ -1811,41 +1952,53 @@ Init_socket()
      *
      * === What's a socket?
      *
-     * Sockets are endpoints of a bidirectionnal communication channel.
+     * Sockets are endpoints of a bidirectional communication channel.
      * Sockets can communicate within a process, between processes on the same
      * machine or between different machines.  There are many types of socket:
      * TCPSocket, UDPSocket or UNIXSocket for example.
      *
      * Sockets have their own vocabulary:
-     * domain::
-     *   The family of protocols:  Socket::PF_INET, Socket::PF_INET6,
-     *   Socket::PF_UNIX, etc.
-     * type::
-     *   The type of communications between the two endpoints, typically
-     *   Socket::SOCK_STREAM or Socket::SOCK_DGRAM.
-     * protocol::
-     *   Typically zero.  This may be used to identify a variant of a
-     *   protocol.
-     * hostname::
-     *   The identifier of a network interface:
-     *     * a string (hostname, IPv4 or IPv6 adress or <tt><broadcast></tt>
-     *       which specifies a broadcast address)
-     *     * a zero-length string which specifies INADDR_ANY
-     *     * an integer (interpreted as binary address in host byte order).
+     *
+     * *domain:*
+     * The family of protocols:
+     * *    Socket::PF_INET
+     * *    Socket::PF_INET6
+     * *    Socket::PF_UNIX
+     * *    etc.
+     *
+     * *type:*
+     * The type of communications between the two endpoints, typically
+     * *    Socket::SOCK_STREAM
+     * *    Socket::SOCK_DGRAM.
+     *
+     * *protocol:*
+     * Typically _zero_.
+     * This may be used to identify a variant of a protocol.
+     *
+     * *hostname:*
+     * The identifier of a network interface:
+     * *    a string (hostname, IPv4 or IPv6 address or +broadcast+
+     *	    which specifies a broadcast address)
+     * *    a zero-length string which specifies INADDR_ANY
+     * *    an integer (interpreted as binary address in host byte order).
      *
      * === Quick start
      *
-     * Some classes such as TCPSocket, UDPSocket or UNIXSocket ease use of
-     * sockets of these types compared to C programming.
+     * Many of the classes, such as TCPSocket, UDPSocket or UNIXSocket,
+     * ease the use of sockets comparatively to the equivalent C programming interface.
+     *
+     * Let's create an internet socket using the IPv4 protocol in a C-like manner:
      *
-     *   # Creating a TCP socket in a C-like manner
-     *   s = Socket.new Socket::INET, Socket::SOCK_STREAM
+     *   require 'socket'
+     *
+     *   s = Socket.new Socket::AF_INET, Socket::SOCK_STREAM
      *   s.connect Socket.pack_sockaddr_in(80, 'example.com')
      *
-     *   # Using TCPSocket
+     * You could also use the TCPSocket class:
+     *
      *   s = TCPSocket.new 'example.com', 80
      *
-     * A simple server would look like:
+     * A simple server might look like this:
      *
      *   require 'socket'
      *
@@ -1858,7 +2011,7 @@ Init_socket()
      *     client.close
      *   end
      *
-     * A simple client may look like:
+     * A simple client may look like this:
      *
      *   require 'socket'
      *
@@ -1875,14 +2028,14 @@ Init_socket()
      * Ruby's Socket implementation raises exceptions based on the error
      * generated by the system dependent implementation.  This is why the
      * methods are documented in a way that isolate Unix-based system
-     * exceptions from Windows based exceptions. If more information on
-     * particular exception is needed please refer to the Unix manual pages or
+     * exceptions from Windows based exceptions. If more information on a
+     * particular exception is needed, please refer to the Unix manual pages or
      * the Windows WinSock reference.
      *
-     * === Convenient methods
+     * === Convenience methods
      *
      * Although the general way to create socket is Socket.new,
-     * there are several methods for socket creation for most cases.
+     * there are several methods of socket creation for most cases.
      *
      * TCP client socket::
      *   Socket.tcp, TCPSocket.open
@@ -1908,15 +2061,26 @@ Init_socket()
 
     rb_define_method(rb_cSocket, "initialize", sock_initialize, -1);
     rb_define_method(rb_cSocket, "connect", sock_connect, 1);
-    rb_define_method(rb_cSocket, "connect_nonblock", sock_connect_nonblock, 1);
+
+    /* 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, "bind", sock_bind, 1);
     rb_define_method(rb_cSocket, "listen", rsock_sock_listen, 1);
     rb_define_method(rb_cSocket, "accept", sock_accept, 0);
-    rb_define_method(rb_cSocket, "accept_nonblock", sock_accept_nonblock, 0);
+
+    /* 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, "sysaccept", sock_sysaccept, 0);
 
     rb_define_method(rb_cSocket, "recvfrom", sock_recvfrom, -1);
-    rb_define_method(rb_cSocket, "recvfrom_nonblock", sock_recvfrom_nonblock, -1);
+
+    /* for ext/socket/lib/socket.rb use only: */
+    rb_define_private_method(rb_cSocket,
+			     "__recvfrom_nonblock", sock_recvfrom_nonblock, 4);
 
     rb_define_singleton_method(rb_cSocket, "socketpair", rsock_sock_s_socketpair, -1);
     rb_define_singleton_method(rb_cSocket, "pair", rsock_sock_s_socketpair, -1);
@@ -1937,4 +2101,7 @@ Init_socket()
 #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/sockport.h b/ext/socket/sockport.h
index 5f2fd24530..2b58958ae7 100644
--- a/ext/socket/sockport.h
+++ b/ext/socket/sockport.h
@@ -10,42 +10,74 @@
 #ifndef SOCKPORT_H
 #define SOCKPORT_H
 
-#ifdef SA_LEN
-#  define SS_LEN(ss) (ss)->ss_len
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+# define VALIDATE_SOCKLEN(addr, len) ((addr)->sa_len == (len))
 #else
-# ifdef HAVE_SA_LEN
-#  define SA_LEN(sa) (sa)->sa_len
-#  define SS_LEN(ss) (ss)->ss_len
-# else
-#  ifdef AF_INET6
-#   define SA_LEN(sa) \
-	(((sa)->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) \
-				       : sizeof(struct sockaddr))
-#   define SS_LEN(ss) \
-	(((ss)->ss_family == AF_INET6) ? sizeof(struct sockaddr_in6) \
-				       : sizeof(struct sockaddr))
-#  else
-    /* by tradition, sizeof(struct sockaddr) covers most of the sockaddrs */
-#   define SA_LEN(sa)	(sizeof(struct sockaddr))
-#   define SS_LEN(ss)	(sizeof(struct sockaddr))
-#  endif
-# endif
+# define VALIDATE_SOCKLEN(addr, len) ((void)(addr), (void)(len), 1)
 #endif
 
-#ifdef HAVE_SA_LEN
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
 # define SET_SA_LEN(sa, len) (void)((sa)->sa_len = (len))
-# define SET_SS_LEN(ss, len) (void)((ss)->ss_len = (len))
 #else
 # define SET_SA_LEN(sa, len) (void)(len)
-# define SET_SS_LEN(ss, len) (void)(len)
 #endif
 
-#ifdef HAVE_SIN_LEN
-# define SIN_LEN(si) (si)->sin_len
-# define SET_SIN_LEN(si,len) (si)->sin_len = (len)
+/* for strict-aliasing rule */
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+# define SET_SIN_LEN(sa, len) (void)((sa)->sin_len = (len))
+#else
+# define SET_SIN_LEN(sa, len) SET_SA_LEN((struct sockaddr *)(sa), (len))
+#endif
+
+#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
+# define SET_SIN6_LEN(sa, len) (void)((sa)->sin6_len = (len))
 #else
-# define SIN_LEN(si) sizeof(struct sockaddr_in)
-# define SET_SIN_LEN(si,len)
+# define SET_SIN6_LEN(sa, len) SET_SA_LEN((struct sockaddr *)(sa), (len))
+#endif
+
+#define INIT_SOCKADDR(addr, family, len) \
+  do { \
+    struct sockaddr *init_sockaddr_ptr = (addr); \
+    socklen_t init_sockaddr_len = (len); \
+    memset(init_sockaddr_ptr, 0, init_sockaddr_len); \
+    init_sockaddr_ptr->sa_family = (family); \
+    SET_SA_LEN(init_sockaddr_ptr, init_sockaddr_len); \
+  } while (0)
+
+#define INIT_SOCKADDR_IN(addr, len) \
+  do { \
+    struct sockaddr_in *init_sockaddr_ptr = (addr); \
+    socklen_t init_sockaddr_len = (len); \
+    memset(init_sockaddr_ptr, 0, init_sockaddr_len); \
+    init_sockaddr_ptr->sin_family = AF_INET; \
+    SET_SIN_LEN(init_sockaddr_ptr, init_sockaddr_len); \
+  } while (0)
+
+#define INIT_SOCKADDR_IN6(addr, len) \
+  do { \
+    struct sockaddr_in6 *init_sockaddr_ptr = (addr); \
+    socklen_t init_sockaddr_len = (len); \
+    memset(init_sockaddr_ptr, 0, init_sockaddr_len); \
+    init_sockaddr_ptr->sin6_family = AF_INET6; \
+    SET_SIN6_LEN(init_sockaddr_ptr, init_sockaddr_len); \
+  } while (0)
+
+
+/* for strict-aliasing rule */
+#ifdef HAVE_TYPE_STRUCT_SOCKADDR_UN
+#  ifdef HAVE_STRUCT_SOCKADDR_IN_SUN_LEN
+#    define SET_SUN_LEN(sa, len) (void)((sa)->sun_len = (len))
+#  else
+#    define SET_SUN_LEN(sa, len) SET_SA_LEN((struct sockaddr *)(sa), (len))
+#  endif
+#  define INIT_SOCKADDR_UN(addr, len) \
+     do { \
+         struct sockaddr_un *init_sockaddr_ptr = (addr); \
+         socklen_t init_sockaddr_len = (len); \
+         memset(init_sockaddr_ptr, 0, init_sockaddr_len); \
+         init_sockaddr_ptr->sun_family = AF_UNIX; \
+         SET_SUN_LEN(init_sockaddr_ptr, init_sockaddr_len); \
+     } while (0)
 #endif
 
 #ifndef IN_MULTICAST
diff --git a/ext/socket/sockssocket.c b/ext/socket/sockssocket.c
index 48be4fcf99..82789eeaab 100644
--- a/ext/socket/sockssocket.c
+++ b/ext/socket/sockssocket.c
@@ -13,13 +13,19 @@
 #ifdef SOCKS
 /*
  * call-seq:
- *   SOCKSSocket.new(host, serv) => socket
+ *   SOCKSSocket.new(host, port) => socket
  *
- * Opens a SOCKS connection to +host+ via the SOCKS server +serv+.
+ * Opens a SOCKS connection to +host+ via the SOCKS server.
+ *
+ * The SOCKS server configuration varies by implementation
+ *
+ * When using the Dante libsocks/libsocksd implementation it is configured as SOCKS_SERVER env var.
+ *
+ * See: https://manpages.debian.org/testing/dante-client/socksify.1.en.html for full env variable support.
  *
  */
 static VALUE
-socks_init(VALUE sock, VALUE host, VALUE serv)
+socks_init(VALUE sock, VALUE host, VALUE port)
 {
     static int init = 0;
 
@@ -28,7 +34,7 @@ socks_init(VALUE sock, VALUE host, VALUE serv)
 	init = 1;
     }
 
-    return rsock_init_inetsock(sock, host, serv, Qnil, Qnil, INET_SOCKS);
+    return rsock_init_inetsock(sock, host, port, Qnil, Qnil, INET_SOCKS);
 }
 
 #ifdef SOCKS5
@@ -41,9 +47,6 @@ 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 6596733239..1bbb31adcf 100644
--- a/ext/socket/tcpserver.c
+++ b/ext/socket/tcpserver.c
@@ -12,7 +12,7 @@
 
 /*
  * call-seq:
- *   TCPServer.new([hostname,] port)                    => tcpserver
+ *   TCPServer.new([hostname,] port) => tcpserver
  *
  * Creates a new server socket bound to _port_.
  *
@@ -22,6 +22,13 @@
  *   s = serv.accept
  *   s.puts Time.now
  *   s.close
+ *
+ * Internally, TCPServer.new calls getaddrinfo() function to
+ * obtain addresses.
+ * If getaddrinfo() returns multiple addresses,
+ * TCPServer.new tries to create a server socket for each address
+ * and returns first one that is successful.
+ *
  */
 static VALUE
 tcp_svr_init(int argc, VALUE *argv, VALUE sock)
@@ -36,6 +43,8 @@ tcp_svr_init(int argc, VALUE *argv, VALUE sock)
  * call-seq:
  *   tcpserver.accept => tcpsocket
  *
+ * Accepts an incoming connection. It returns a new TCPSocket object.
+ *
  *   TCPServer.open("127.0.0.1", 14641) {|serv|
  *     s = serv.accept
  *     s.puts Time.now
@@ -47,59 +56,24 @@ static VALUE
 tcp_accept(VALUE sock)
 {
     rb_io_t *fptr;
-    struct sockaddr_storage from;
+    union_sockaddr from;
     socklen_t fromlen;
 
     GetOpenFile(sock, fptr);
     fromlen = (socklen_t)sizeof(from);
-    return rsock_s_accept(rb_cTCPSocket, fptr->fd,
-		          (struct sockaddr*)&from, &fromlen);
+    return rsock_s_accept(rb_cTCPSocket, fptr->fd, &from.addr, &fromlen);
 }
 
-/*
- * call-seq:
- * 	tcpserver.accept_nonblock => tcpsocket
- *
- * Accepts an incoming connection using accept(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * It returns an accepted TCPSocket for the incoming connection.
- *
- * === Example
- * 	require 'socket'
- * 	serv = TCPServer.new(2202)
- * 	begin # emulate blocking accept
- * 	  sock = serv.accept_nonblock
- * 	rescue IO::WaitReadable, Errno::EINTR
- * 	  IO.select([serv])
- * 	  retry
- * 	end
- * 	# sock is an accepted socket.
- *
- * Refer to Socket#accept for the exceptions that may be thrown if the call
- * to TCPServer#accept_nonblock fails.
- *
- * TCPServer#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EWOULDBLOCK.
- *
- * If the exception is Errno::EWOULDBLOCK, Errno::AGAIN, Errno::ECONNABORTED, Errno::EPROTO,
- * it is extended by IO::WaitReadable.
- * So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
- *
- * === See
- * * TCPServer#accept
- * * Socket#accept
- */
+/* :nodoc: */
 static VALUE
-tcp_accept_nonblock(VALUE sock)
+tcp_accept_nonblock(VALUE sock, VALUE ex)
 {
     rb_io_t *fptr;
-    struct sockaddr_storage from;
-    socklen_t fromlen;
+    union_sockaddr from;
+    socklen_t len = (socklen_t)sizeof(from);
 
     GetOpenFile(sock, fptr);
-    fromlen = (socklen_t)sizeof(from);
-    return rsock_s_accept_nonblock(rb_cTCPSocket, fptr,
-			           (struct sockaddr *)&from, &fromlen);
+    return rsock_s_accept_nonblock(rb_cTCPSocket, ex, fptr, &from.addr, &len);
 }
 
 /*
@@ -120,12 +94,12 @@ static VALUE
 tcp_sysaccept(VALUE sock)
 {
     rb_io_t *fptr;
-    struct sockaddr_storage from;
+    union_sockaddr from;
     socklen_t fromlen;
 
     GetOpenFile(sock, fptr);
     fromlen = (socklen_t)sizeof(from);
-    return rsock_s_accept(0, fptr->fd, (struct sockaddr*)&from, &fromlen);
+    return rsock_s_accept(0, fptr->fd, &from.addr, &fromlen);
 }
 
 void
@@ -164,7 +138,8 @@ rsock_init_tcpserver(void)
      */
     rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket);
     rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0);
-    rb_define_method(rb_cTCPServer, "accept_nonblock", tcp_accept_nonblock, 0);
+    rb_define_private_method(rb_cTCPServer,
+			     "__accept_nonblock", tcp_accept_nonblock, 1);
     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 7eb6fc7aa2..29a3eda45f 100644
--- a/ext/socket/tcpsocket.c
+++ b/ext/socket/tcpsocket.c
@@ -32,16 +32,25 @@ tcp_init(int argc, VALUE *argv, VALUE sock)
 }
 
 static VALUE
-tcp_sockaddr(struct sockaddr *addr, size_t len)
+tcp_sockaddr(struct sockaddr *addr, socklen_t len)
 {
-    return rsock_make_ipaddr(addr);
+    return rsock_make_ipaddr(addr, len);
 }
 
 /*
  * call-seq:
  *   TCPSocket.gethostbyname(hostname) => [official_hostname, alias_hostnames, address_family, *address_list]
  *
- * Lookups host information by _hostname_.
+ * Use Addrinfo.getaddrinfo instead.
+ * This method is deprecated for the following reasons:
+ *
+ * - The 3rd element of the result is the address family of the first address.
+ *   The address families of the rest of the addresses are not returned.
+ * - gethostbyname() may take a long time and it may block other threads.
+ *   (GVL cannot be released since gethostbyname() is not thread safe.)
+ * - This method uses gethostbyname() function already removed from POSIX.
+ *
+ * This method lookups host information by _hostname_.
  *
  *   TCPSocket.gethostbyname("localhost")
  *   #=> ["localhost", ["hal"], 2, "127.0.0.1"]
@@ -50,9 +59,9 @@ tcp_sockaddr(struct sockaddr *addr, size_t len)
 static VALUE
 tcp_s_gethostbyname(VALUE obj, VALUE host)
 {
-    rb_secure(3);
-    return rsock_make_hostent(host, rsock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME),
-			tcp_sockaddr);
+    struct rb_addrinfo *res =
+	rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, AI_CANONNAME);
+    return rsock_make_hostent(host, res, tcp_sockaddr);
 }
 
 void
diff --git a/ext/socket/udpsocket.c b/ext/socket/udpsocket.c
index 0ba4371f1a..6ef8242a1e 100644
--- a/ext/socket/udpsocket.c
+++ b/ext/socket/udpsocket.c
@@ -19,6 +19,8 @@
  * _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>
  *
@@ -30,7 +32,6 @@ 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);
     }
@@ -44,17 +45,21 @@ udp_init(int argc, VALUE *argv, VALUE sock)
 
 struct udp_arg
 {
-    struct addrinfo *res;
-    int fd;
+    struct rb_addrinfo *res;
+    rb_io_t *fptr;
 };
 
 static VALUE
-udp_connect_internal(struct udp_arg *arg)
+udp_connect_internal(VALUE v)
 {
-    int fd = arg->fd;
+    struct udp_arg *arg = (void *)v;
+    rb_io_t *fptr;
+    int fd;
     struct addrinfo *res;
 
-    for (res = arg->res; res; res = res->ai_next) {
+    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;
 	}
@@ -62,8 +67,6 @@ udp_connect_internal(struct udp_arg *arg)
     return Qfalse;
 }
 
-VALUE rsock_freeaddrinfo(struct addrinfo *addr);
-
 /*
  * call-seq:
  *   udpsocket.connect(host, port) => 0
@@ -83,20 +86,36 @@ VALUE rsock_freeaddrinfo(struct addrinfo *addr);
 static VALUE
 udp_connect(VALUE sock, VALUE host, VALUE port)
 {
-    rb_io_t *fptr;
     struct udp_arg arg;
     VALUE ret;
 
-    rb_secure(3);
-    arg.res = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
-    GetOpenFile(sock, fptr);
-    arg.fd = fptr->fd;
+    GetOpenFile(sock, arg.fptr);
+    arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0);
     ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
 		    rsock_freeaddrinfo, (VALUE)arg.res);
-    if (!ret) rb_sys_fail("connect(2)");
+    if (!ret) rsock_sys_fail_host_port("connect(2)", host, port);
     return INT2FIX(0);
 }
 
+static VALUE
+udp_bind_internal(VALUE v)
+{
+    struct udp_arg *arg = (void *)v;
+    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
@@ -112,22 +131,47 @@ udp_connect(VALUE sock, VALUE host, VALUE port)
 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 addrinfo *res0, *res;
+    struct rsock_send_arg sarg;
+};
 
-    rb_secure(3);
-    res0 = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
-    GetOpenFile(sock, fptr);
-    for (res = res0; res; res = res->ai_next) {
-	if (bind(fptr->fd, res->ai_addr, res->ai_addrlen) < 0) {
-	    continue;
+static VALUE
+udp_send_internal(VALUE v)
+{
+    struct udp_send_arg *arg = (void *)v;
+    rb_io_t *fptr;
+    int n;
+    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;
 	}
-	freeaddrinfo(res0);
-	return INT2FIX(0);
     }
-    freeaddrinfo(res0);
-    rb_sys_fail("bind(2)");
-    return INT2FIX(0);
+    return Qfalse;
 }
 
 /*
@@ -156,94 +200,30 @@ static VALUE
 udp_send(int argc, VALUE *argv, VALUE sock)
 {
     VALUE flags, host, port;
-    rb_io_t *fptr;
-    int n;
-    struct addrinfo *res0, *res;
-    struct rsock_send_arg arg;
+    struct udp_send_arg arg;
+    VALUE ret;
 
     if (argc == 2 || argc == 3) {
 	return rsock_bsock_send(argc, argv, sock);
     }
-    rb_secure(4);
-    rb_scan_args(argc, argv, "4", &arg.mesg, &flags, &host, &port);
-
-    StringValue(arg.mesg);
-    res0 = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
-    GetOpenFile(sock, fptr);
-    arg.fd = fptr->fd;
-    arg.flags = NUM2INT(flags);
-    for (res = res0; res; res = res->ai_next) {
-      retry:
-	arg.to = res->ai_addr;
-	arg.tolen = res->ai_addrlen;
-	rb_thread_fd_writable(arg.fd);
-	n = (int)BLOCKING_REGION_FD(rsock_sendto_blocking, &arg);
-	if (n >= 0) {
-	    freeaddrinfo(res0);
-	    return INT2FIX(n);
-	}
-	if (rb_io_wait_writable(fptr->fd)) {
-	    goto retry;
-	}
-    }
-    freeaddrinfo(res0);
-    rb_sys_fail("sendto(2)");
-    return INT2FIX(n);
+    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;
 }
 
-/*
- * 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
- */
+/* :nodoc: */
 static VALUE
-udp_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
+udp_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str, VALUE ex)
 {
-    return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_IP);
+    return rsock_s_recvfrom_nonblock(sock, len, flg, str, ex, RECV_IP);
 }
 
 void
@@ -260,6 +240,8 @@ 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);
-    rb_define_method(rb_cUDPSocket, "recvfrom_nonblock", udp_recvfrom_nonblock, -1);
-}
 
+    /* for ext/socket/lib/socket.rb use only: */
+    rb_define_private_method(rb_cUDPSocket,
+			     "__recvfrom_nonblock", udp_recvfrom_nonblock, 4);
+}
diff --git a/ext/socket/unixserver.c b/ext/socket/unixserver.c
index 9bd959d439..b1f2a38547 100644
--- a/ext/socket/unixserver.c
+++ b/ext/socket/unixserver.c
@@ -17,6 +17,8 @@
  *
  * Creates a new UNIX server socket bound to _path_.
  *
+ *   require 'socket'
+ *
  *   serv = UNIXServer.new("/tmp/sock")
  *   s = serv.accept
  *   p s.read
@@ -31,8 +33,8 @@ unix_svr_init(VALUE sock, VALUE path)
  * call-seq:
  *   unixserver.accept => unixsocket
  *
- * Accepts a new connection.
- * It returns new UNIXSocket object.
+ * Accepts an incoming connection.
+ * It returns a new UNIXSocket object.
  *
  *   UNIXServer.open("/tmp/sock") {|serv|
  *     UNIXSocket.open("/tmp/sock") {|c|
@@ -57,41 +59,9 @@ unix_accept(VALUE sock)
 		          (struct sockaddr*)&from, &fromlen);
 }
 
-/*
- * call-seq:
- * 	unixserver.accept_nonblock => unixsocket
- *
- * Accepts an incoming connection using accept(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * It returns an accepted UNIXSocket for the incoming connection.
- *
- * === Example
- * 	require 'socket'
- * 	serv = UNIXServer.new("/tmp/sock")
- * 	begin # emulate blocking accept
- * 	  sock = serv.accept_nonblock
- * 	rescue IO::WaitReadable, Errno::EINTR
- * 	  IO.select([serv])
- * 	  retry
- * 	end
- * 	# sock is an accepted socket.
- *
- * Refer to Socket#accept for the exceptions that may be thrown if the call
- * to UNIXServer#accept_nonblock fails.
- *
- * UNIXServer#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EWOULDBLOCK.
- *
- * If the exception is Errno::EWOULDBLOCK, Errno::AGAIN, Errno::ECONNABORTED or Errno::EPROTO,
- * it is extended by IO::WaitReadable.
- * So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
- *
- * === See
- * * UNIXServer#accept
- * * Socket#accept
- */
+/* :nodoc: */
 static VALUE
-unix_accept_nonblock(VALUE sock)
+unix_accept_nonblock(VALUE sock, VALUE ex)
 {
     rb_io_t *fptr;
     struct sockaddr_un from;
@@ -99,7 +69,7 @@ unix_accept_nonblock(VALUE sock)
 
     GetOpenFile(sock, fptr);
     fromlen = (socklen_t)sizeof(from);
-    return rsock_s_accept_nonblock(rb_cUNIXSocket, fptr,
+    return rsock_s_accept_nonblock(rb_cUNIXSocket, ex, fptr,
 			           (struct sockaddr *)&from, &fromlen);
 }
 
@@ -148,7 +118,10 @@ 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_method(rb_cUNIXServer, "accept_nonblock", unix_accept_nonblock, 0);
+
+    rb_define_private_method(rb_cUNIXServer,
+			     "__accept_nonblock", unix_accept_nonblock, 1);
+
     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 26822e5b4f..0c3a01d21e 100644
--- a/ext/socket/unixsocket.c
+++ b/ext/socket/unixsocket.c
@@ -13,6 +13,7 @@
 #ifdef HAVE_SYS_UN_H
 struct unixsock_arg {
     struct sockaddr_un *sockaddr;
+    socklen_t sockaddrlen;
     int fd;
 };
 
@@ -21,37 +22,61 @@ unixsock_connect_internal(VALUE a)
 {
     struct unixsock_arg *arg = (struct unixsock_arg *)a;
     return (VALUE)rsock_connect(arg->fd, (struct sockaddr*)arg->sockaddr,
-			        (socklen_t)sizeof(*arg->sockaddr), 0);
+			        arg->sockaddrlen, 0);
+}
+
+static VALUE
+unixsock_path_value(VALUE path)
+{
+#ifdef __linux__
+#define TO_STR_FOR_LINUX_ABSTRACT_NAMESPACE 0
+
+    VALUE name = path;
+#if TO_STR_FOR_LINUX_ABSTRACT_NAMESPACE
+    const int isstr = !NIL_P(name = rb_check_string_type(name));
+#else
+    const int isstr = RB_TYPE_P(name, T_STRING);
+#endif
+    if (isstr) {
+        if (RSTRING_LEN(name) == 0 || RSTRING_PTR(name)[0] == '\0') {
+            return name;             /* ignore encoding */
+        }
+    }
+#endif
+    return rb_get_path(path);
 }
 
 VALUE
 rsock_init_unixsock(VALUE sock, VALUE path, int server)
 {
     struct sockaddr_un sockaddr;
+    socklen_t sockaddrlen;
     int fd, status;
     rb_io_t *fptr;
 
-    SafeStringValue(path);
-    fd = rsock_socket(AF_UNIX, SOCK_STREAM, 0);
-    if (fd < 0) {
-	rb_sys_fail("socket(2)");
-    }
+    path = unixsock_path_value(path);
 
-    MEMZERO(&sockaddr, struct sockaddr_un, 1);
-    sockaddr.sun_family = AF_UNIX;
-    if (sizeof(sockaddr.sun_path) <= (size_t)RSTRING_LEN(path)) {
-        rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
-            (int)sizeof(sockaddr.sun_path)-1);
+    INIT_SOCKADDR_UN(&sockaddr, sizeof(struct sockaddr_un));
+    if (sizeof(sockaddr.sun_path) < (size_t)RSTRING_LEN(path)) {
+        rb_raise(rb_eArgError, "too long unix socket path (%ldbytes given but %dbytes max)",
+            RSTRING_LEN(path), (int)sizeof(sockaddr.sun_path));
     }
     memcpy(sockaddr.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
+    sockaddrlen = rsock_unix_sockaddr_len(path);
+
+    fd = rsock_socket(AF_UNIX, SOCK_STREAM, 0);
+    if (fd < 0) {
+	rsock_sys_fail_path("socket(2)", path);
+    }
 
     if (server) {
-        status = bind(fd, (struct sockaddr*)&sockaddr, (socklen_t)sizeof(sockaddr));
+        status = bind(fd, (struct sockaddr*)&sockaddr, sockaddrlen);
     }
     else {
 	int prot;
 	struct unixsock_arg arg;
 	arg.sockaddr = &sockaddr;
+	arg.sockaddrlen = sockaddrlen;
 	arg.fd = fd;
         status = (int)rb_protect(unixsock_connect_internal, (VALUE)&arg, &prot);
 	if (prot) {
@@ -61,14 +86,16 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
     }
 
     if (status < 0) {
+	int e = errno;
 	close(fd);
-	rb_sys_fail(sockaddr.sun_path);
+	rsock_syserr_fail_path(e, "connect(2)", path);
     }
 
     if (server) {
-	if (listen(fd, 5) < 0) {
+	if (listen(fd, SOMAXCONN) < 0) {
+	    int e = errno;
 	    close(fd);
-	    rb_sys_fail("listen(2)");
+	    rsock_syserr_fail_path(e, "listen(2)", path);
 	}
     }
 
@@ -87,6 +114,8 @@ 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
  *
@@ -116,16 +145,18 @@ unix_path(VALUE sock)
     if (NIL_P(fptr->pathv)) {
 	struct sockaddr_un addr;
 	socklen_t len = (socklen_t)sizeof(addr);
+	socklen_t len0 = len;
 	if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
-	    rb_sys_fail(0);
-	fptr->pathv = rb_obj_freeze(rb_str_new_cstr(rsock_unixpath(&addr, len)));
+            rsock_sys_fail_path("getsockname(2)", fptr->pathv);
+        if (len0 < len) len = len0;
+	fptr->pathv = rb_obj_freeze(rsock_unixpath_str(&addr, len));
     }
     return rb_str_dup(fptr->pathv);
 }
 
 /*
  * call-seq:
- *   unixsocket.recvfrom(maxlen [, flags]) => [mesg, unixaddress]
+ *   unixsocket.recvfrom(maxlen [, flags[, outbuf]]) => [mesg, unixaddress]
  *
  * Receives a message via _unixsocket_.
  *
@@ -133,6 +164,9 @@ 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)
@@ -152,13 +186,13 @@ unix_recvfrom(int argc, VALUE *argv, VALUE sock)
     return rsock_s_recvfrom(sock, argc, argv, RECV_UNIX);
 }
 
-#if defined(HAVE_ST_MSG_CONTROL) && defined(SCM_RIGHTS)
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) && defined(SCM_RIGHTS)
 #define FD_PASSING_BY_MSG_CONTROL 1
 #else
 #define FD_PASSING_BY_MSG_CONTROL 0
 #endif
 
-#if defined(HAVE_ST_MSG_ACCRIGHTS)
+#if defined(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS)
 #define FD_PASSING_BY_MSG_ACCRIGHTS 1
 #else
 #define FD_PASSING_BY_MSG_ACCRIGHTS 0
@@ -192,6 +226,8 @@ 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)
@@ -203,9 +239,9 @@ unix_send_io(VALUE sock, VALUE val)
     char buf[1];
 
 #if FD_PASSING_BY_MSG_CONTROL
-    struct {
+    union {
 	struct cmsghdr hdr;
-        char pad[8+sizeof(int)+8];
+	char pad[sizeof(struct cmsghdr)+8+sizeof(int)+8];
     } cmsg;
 #endif
 
@@ -250,7 +286,7 @@ unix_send_io(VALUE sock, VALUE val)
     arg.fd = fptr->fd;
     while ((int)BLOCKING_REGION_FD(sendmsg_blocking, &arg) == -1) {
 	if (!rb_io_wait_writable(arg.fd))
-	    rb_sys_fail("sendmsg(2)");
+	    rsock_sys_fail_path("sendmsg(2)", fptr->pathv);
     }
 
     return Qnil;
@@ -264,13 +300,16 @@ static VALUE
 recvmsg_blocking(void *data)
 {
     struct iomsg_arg *arg = data;
-    return recvmsg(arg->fd, &arg->msg, 0);
+    int flags = 0;
+    return rsock_recvmsg(arg->fd, &arg->msg, flags);
 }
 
 /*
  * call-seq:
  *   unixsocket.recv_io([klass [, mode]]) => io
  *
+ * Example
+ *
  *   UNIXServer.open("/tmp/sock") {|serv|
  *     UNIXSocket.open("/tmp/sock") {|c|
  *       s = serv.accept
@@ -285,6 +324,11 @@ 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)
@@ -294,12 +338,18 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
     struct iomsg_arg arg;
     struct iovec vec[2];
     char buf[1];
+    unsigned int gc_reason = 0;
+    enum {
+        GC_REASON_EMSGSIZE = 0x1,
+        GC_REASON_TRUNCATE = 0x2,
+        GC_REASON_ENOMEM = 0x4
+    };
 
     int fd;
 #if FD_PASSING_BY_MSG_CONTROL
-    struct {
+    union {
 	struct cmsghdr hdr;
-        char pad[8+sizeof(int)+8];
+	char pad[sizeof(struct cmsghdr)+8+sizeof(int)+8];
     } cmsg;
 #endif
 
@@ -309,6 +359,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
     if (argc <= 1)
 	mode = Qnil;
 
+retry:
     GetOpenFile(sock, fptr);
 
     arg.msg.msg_name = NULL;
@@ -336,12 +387,31 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
 
     arg.fd = fptr->fd;
     while ((int)BLOCKING_REGION_FD(recvmsg_blocking, &arg) == -1) {
+        int e = errno;
+        if (e == EMSGSIZE && !(gc_reason & GC_REASON_EMSGSIZE)) {
+            /* FreeBSD gets here when we're out of FDs */
+            gc_reason |= GC_REASON_EMSGSIZE;
+            rb_gc_for_fd(EMFILE);
+            goto retry;
+        }
+        else if (e == ENOMEM && !(gc_reason & GC_REASON_ENOMEM)) {
+            /* ENOMEM is documented in recvmsg manpages */
+            gc_reason |= GC_REASON_ENOMEM;
+            rb_gc_for_fd(e);
+            goto retry;
+        }
 	if (!rb_io_wait_readable(arg.fd))
-	    rb_sys_fail("recvmsg(2)");
+	    rsock_syserr_fail_path(e, "recvmsg(2)", fptr->pathv);
     }
 
 #if FD_PASSING_BY_MSG_CONTROL
     if (arg.msg.msg_controllen < (socklen_t)sizeof(struct cmsghdr)) {
+        /* FreeBSD and Linux both get here when we're out of FDs */
+        if (!(gc_reason & GC_REASON_TRUNCATE)) {
+            gc_reason |= GC_REASON_TRUNCATE;
+            rb_gc_for_fd(EMFILE);
+            goto retry;
+        }
 	rb_raise(rb_eSocket,
 		 "file descriptor was not passed (msg_controllen=%d smaller than sizeof(struct cmsghdr)=%d)",
 		 (int)arg.msg.msg_controllen, (int)sizeof(struct cmsghdr));
@@ -375,7 +445,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
 #else
     if (arg.msg.msg_accrightslen != sizeof(fd)) {
 	rb_raise(rb_eSocket,
-		 "file descriptor was not passed (accrightslen) : %d != %d",
+		 "file descriptor was not passed (accrightslen=%d, %d expected)",
 		 arg.msg.msg_accrightslen, (int)sizeof(fd));
     }
 #endif
@@ -383,8 +453,14 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
 #if FD_PASSING_BY_MSG_CONTROL
     memcpy(&fd, CMSG_DATA(&cmsg.hdr), sizeof(int));
 #endif
+
     rb_update_max_fd(fd);
 
+    if (rsock_cmsg_cloexec_state < 0)
+	rsock_cmsg_cloexec_state = rsock_detect_cloexec(fd);
+    if (rsock_cmsg_cloexec_state == 0 || fd <= 2)
+	rb_maygvl_fd_fix_cloexec(fd);
+
     if (klass == Qnil)
 	return INT2FIX(fd);
     else {
@@ -395,7 +471,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_funcall2(klass, for_fd, ff_argc, ff_argv);
+        return rb_funcallv(klass, for_fd, ff_argc, ff_argv);
     }
 }
 #else
@@ -419,11 +495,13 @@ unix_addr(VALUE sock)
     rb_io_t *fptr;
     struct sockaddr_un addr;
     socklen_t len = (socklen_t)sizeof addr;
+    socklen_t len0 = len;
 
     GetOpenFile(sock, fptr);
 
     if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
-	rb_sys_fail("getsockname(2)");
+        rsock_sys_fail_path("getsockname(2)", fptr->pathv);
+    if (len0 < len) len = len0;
     return rsock_unixaddr(&addr, len);
 }
 
@@ -445,11 +523,13 @@ unix_peeraddr(VALUE sock)
     rb_io_t *fptr;
     struct sockaddr_un addr;
     socklen_t len = (socklen_t)sizeof addr;
+    socklen_t len0 = len;
 
     GetOpenFile(sock, fptr);
 
     if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
-	rb_sys_fail("getpeername(2)");
+        rsock_sys_fail_path("getpeername(2)", fptr->pathv);
+    if (len0 < len) len = len0;
     return rsock_unixaddr(&addr, len);
 }
 
@@ -458,7 +538,7 @@ unix_peeraddr(VALUE sock)
  *   UNIXSocket.pair([type [, protocol]])       => [unixsocket1, unixsocket2]
  *   UNIXSocket.socketpair([type [, protocol]]) => [unixsocket1, unixsocket2]
  *
- * Creates a pair of sockets connected each other.
+ * Creates a pair of sockets connected to each other.
  *
  * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
  *
diff --git a/ext/stringio/README b/ext/stringio/README
deleted file mode 100644
index d03f37dfd3..0000000000
--- a/ext/stringio/README
+++ /dev/null
@@ -1,18 +0,0 @@
--*- 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
new file mode 100644
index 0000000000..94532ed688
--- /dev/null
+++ b/ext/stringio/README.md
@@ -0,0 +1,10 @@
+# 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 e3f3409ed7..02d468b306 100644
--- a/ext/stringio/depend
+++ b/ext/stringio/depend
@@ -1,3 +1,18 @@
-stringio.o: stringio.c $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
-  $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/io.h \
-  $(hdrdir)/ruby/encoding.h
+# AUTOGENERATED DEPENDENCIES START
+stringio.o: $(RUBY_EXTCONF_H)
+stringio.o: $(arch_hdrdir)/ruby/config.h
+stringio.o: $(hdrdir)/ruby.h
+stringio.o: $(hdrdir)/ruby/assert.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/onigmo.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: stringio.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/stringio/extconf.rb b/ext/stringio/extconf.rb
index 8fc84b3735..a933159766 100644
--- a/ext/stringio/extconf.rb
+++ b/ext/stringio/extconf.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: false
 require 'mkmf'
+have_func("rb_io_extract_modeenc", "ruby/io.h")
 create_makefile('stringio')
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 5aa2d27ef3..c8057eefb5 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -11,6 +11,8 @@
 
 **********************************************************************/
 
+#define STRINGIO_VERSION "0.1.0"
+
 #include "ruby.h"
 #include "ruby/io.h"
 #include "ruby/encoding.h"
@@ -20,18 +22,106 @@
 #include <sys/fcntl.h>
 #endif
 
+#ifndef RB_INTEGER_TYPE_P
+# define RB_INTEGER_TYPE_P(c) (FIXNUM_P(c) || RB_TYPE_P(c, T_BIGNUM))
+#endif
+
+#ifndef RB_PASS_CALLED_KEYWORDS
+# define rb_funcallv_kw(recv, mid, arg, argv, kw_splat) rb_funcallv(recv, mid, arg, argv)
+# define rb_class_new_instance_kw(argc, argv, klass, kw_splat) rb_class_new_instance(argc, argv, klass)
+#endif
+
+#ifndef HAVE_RB_IO_EXTRACT_MODEENC
+#define rb_io_extract_modeenc strio_extract_modeenc
+static void
+strio_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
+		      int *oflags_p, int *fmode_p, struct rb_io_enc_t *convconfig_p)
+{
+    VALUE mode = *vmode_p;
+    VALUE intmode;
+    int fmode;
+    int has_enc = 0, has_vmode = 0;
+
+    convconfig_p->enc = convconfig_p->enc2 = 0;
+
+  vmode_handle:
+    if (NIL_P(mode)) {
+	fmode = FMODE_READABLE;
+    }
+    else if (!NIL_P(intmode = rb_check_to_integer(mode, "to_int"))) {
+	int flags = NUM2INT(intmode);
+	fmode = rb_io_oflags_fmode(flags);
+    }
+    else {
+	const char *m = StringValueCStr(mode), *n, *e;
+	fmode = rb_io_modestr_fmode(m);
+	n = strchr(m, ':');
+	if (n) {
+	    long len;
+	    char encname[ENCODING_MAXNAMELEN+1];
+	    has_enc = 1;
+	    if (fmode & FMODE_SETENC_BY_BOM) {
+		n = strchr(n, '|');
+	    }
+	    e = strchr(++n, ':');
+	    len = e ? e - n : strlen(n);
+	    if (len > 0 && len <= ENCODING_MAXNAMELEN) {
+		if (e) {
+		    memcpy(encname, n, len);
+		    encname[len] = '\0';
+		    n = encname;
+		}
+		convconfig_p->enc = rb_enc_find(n);
+	    }
+	    if (e && (len = strlen(++e)) > 0 && len <= ENCODING_MAXNAMELEN) {
+		convconfig_p->enc2 = rb_enc_find(e);
+	    }
+	}
+    }
+
+    if (!NIL_P(opthash)) {
+	rb_encoding *extenc = 0, *intenc = 0;
+	VALUE v;
+	if (!has_vmode) {
+	    ID id_mode;
+	    CONST_ID(id_mode, "mode");
+	    v = rb_hash_aref(opthash, ID2SYM(id_mode));
+	    if (!NIL_P(v)) {
+		if (!NIL_P(mode)) {
+		    rb_raise(rb_eArgError, "mode specified twice");
+		}
+		has_vmode = 1;
+		mode = v;
+		goto vmode_handle;
+	    }
+	}
+
+	if (rb_io_extract_encoding_option(opthash, &extenc, &intenc, &fmode)) {
+	    if (has_enc) {
+		rb_raise(rb_eArgError, "encoding specified twice");
+	    }
+	}
+    }
+    *fmode_p = fmode;
+}
+#endif
+
 struct StringIO {
     VALUE string;
+    rb_encoding *enc;
     long pos;
     long lineno;
     int flags;
     int count;
 };
 
-static void strio_init(int, VALUE *, struct StringIO *);
+static VALUE strio_init(int, VALUE *, struct StringIO *, VALUE);
+static VALUE strio_unget_bytes(struct StringIO *, const char *, long);
+static long strio_write(VALUE self, VALUE str);
 
 #define IS_STRIO(obj) (rb_typeddata_is_kind_of((obj), &strio_data_type))
-#define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg))
+#define error_inval(msg) (rb_syserr_fail(EINVAL, msg))
+#define get_enc(ptr) ((ptr)->enc ? (ptr)->enc : rb_enc_get((ptr)->string))
 
 static struct StringIO *
 strio_alloc(void)
@@ -49,9 +139,8 @@ static void
 strio_mark(void *p)
 {
     struct StringIO *ptr = p;
-    if (ptr) {
-	rb_gc_mark(ptr->string);
-    }
+
+    rb_gc_mark(ptr->string);
 }
 
 static void
@@ -66,8 +155,6 @@ 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);
 }
 
@@ -78,6 +165,7 @@ static const rb_data_type_t strio_data_type = {
 	strio_free,
 	strio_memsize,
     },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 #define check_strio(self) ((struct StringIO*)rb_check_typeddata((self), &strio_data_type))
@@ -94,41 +182,57 @@ get_strio(VALUE self)
 }
 
 static VALUE
-strio_substr(struct StringIO *ptr, long pos, long len)
+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, rb_encoding *enc)
 {
     VALUE str = ptr->string;
-    rb_encoding *enc = rb_enc_get(str);
     long rlen = RSTRING_LEN(str) - pos;
 
     if (len > rlen) len = rlen;
     if (len < 0) len = 0;
-    return rb_enc_str_new(RSTRING_PTR(str)+pos, len, enc);
+    if (len == 0) return rb_enc_str_new(0, 0, enc);
+    return enc_subseq(str, pos, len, enc);
 }
 
 #define StringIO(obj) get_strio(obj)
 
-#define CLOSED(ptr) (!((ptr)->flags & FMODE_READWRITE))
-#define READABLE(ptr) ((ptr)->flags & FMODE_READABLE)
-#define WRITABLE(ptr) ((ptr)->flags & FMODE_WRITABLE)
+#define STRIO_READABLE FL_USER4
+#define STRIO_WRITABLE FL_USER5
+#define STRIO_READWRITE (STRIO_READABLE|STRIO_WRITABLE)
+typedef char strio_flags_check[(STRIO_READABLE/FMODE_READABLE == STRIO_WRITABLE/FMODE_WRITABLE) * 2 - 1];
+#define STRIO_MODE_SET_P(strio, mode) \
+    ((RBASIC(strio)->flags & STRIO_##mode) && \
+     ((struct StringIO*)DATA_PTR(strio))->flags & FMODE_##mode)
+#define CLOSED(strio) (!STRIO_MODE_SET_P(strio, READWRITE))
+#define READABLE(strio) STRIO_MODE_SET_P(strio, READABLE)
+#define WRITABLE(strio) STRIO_MODE_SET_P(strio, WRITABLE)
+
+static VALUE sym_exception;
 
 static struct StringIO*
-readable(struct StringIO *ptr)
+readable(VALUE strio)
 {
-    if (!READABLE(ptr)) {
+    struct StringIO *ptr = StringIO(strio);
+    if (!READABLE(strio)) {
 	rb_raise(rb_eIOError, "not opened for reading");
     }
     return ptr;
 }
 
 static struct StringIO*
-writable(struct StringIO *ptr)
+writable(VALUE strio)
 {
-    if (!WRITABLE(ptr)) {
+    struct StringIO *ptr = StringIO(strio);
+    if (!WRITABLE(strio)) {
 	rb_raise(rb_eIOError, "not opened for writing");
     }
-    if (!OBJ_TAINTED(ptr->string)) {
-	rb_secure(4);
-    }
     return ptr;
 }
 
@@ -160,49 +264,111 @@ strio_initialize(int argc, VALUE *argv, VALUE self)
 	DATA_PTR(self) = ptr = strio_alloc();
     }
     rb_call_super(0, 0);
-    strio_init(argc, argv, ptr);
-    return self;
+    return strio_init(argc, argv, ptr, self);
 }
 
-static void
-strio_init(int argc, VALUE *argv, struct StringIO *ptr)
+static int
+detect_bom(VALUE str, int *bomlen)
 {
-    VALUE string, mode;
-    int trunc = 0;
+    const char *p;
+    long len;
 
-    switch (rb_scan_args(argc, argv, "02", &string, &mode)) {
-      case 2:
-	if (FIXNUM_P(mode)) {
-	    int flags = FIX2INT(mode);
-	    ptr->flags = rb_io_modenum_flags(flags);
-	    trunc = flags & O_TRUNC;
+    RSTRING_GETMEM(str, p, len);
+    if (len < 1) return 0;
+    switch ((unsigned char)p[0]) {
+      case 0xEF:
+	if (len < 2) break;
+	if ((unsigned char)p[1] == 0xBB && len > 2) {
+	    if ((unsigned char)p[2] == 0xBF) {
+		*bomlen = 3;
+		return rb_utf8_encindex();
+	    }
 	}
-	else {
-	    const char *m = StringValueCStr(mode);
-	    ptr->flags = rb_io_mode_flags(m);
-	    trunc = *m == 'w';
+	break;
+
+      case 0xFE:
+	if (len < 2) break;
+	if ((unsigned char)p[1] == 0xFF) {
+	    *bomlen = 2;
+	    return rb_enc_find_index("UTF-16BE");
 	}
-	StringValue(string);
-	if ((ptr->flags & FMODE_WRITABLE) && OBJ_FROZEN(string)) {
-	    errno = EACCES;
-	    rb_sys_fail(0);
+	break;
+
+      case 0xFF:
+	if (len < 2) break;
+	if ((unsigned char)p[1] == 0xFE) {
+	    if (len >= 4 && (unsigned char)p[2] == 0 && (unsigned char)p[3] == 0) {
+		*bomlen = 4;
+		return rb_enc_find_index("UTF-32LE");
+	    }
+	    *bomlen = 2;
+	    return rb_enc_find_index("UTF-16LE");
 	}
-	if (trunc) {
-	    rb_str_resize(string, 0);
+	break;
+
+      case 0:
+	if (len < 4) break;
+	if ((unsigned char)p[1] == 0 && (unsigned char)p[2] == 0xFE && (unsigned char)p[3] == 0xFF) {
+	    *bomlen = 4;
+	    return rb_enc_find_index("UTF-32BE");
 	}
 	break;
-      case 1:
+    }
+    return 0;
+}
+
+static rb_encoding *
+set_encoding_by_bom(struct StringIO *ptr)
+{
+    int bomlen, idx = detect_bom(ptr->string, &bomlen);
+    rb_encoding *extenc = NULL;
+
+    if (idx) {
+	extenc = rb_enc_from_index(idx);
+	ptr->pos = bomlen;
+	if (ptr->flags & FMODE_WRITABLE) {
+	    rb_enc_associate_index(ptr->string, idx);
+	}
+    }
+    ptr->enc = extenc;
+    return extenc;
+}
+
+static VALUE
+strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
+{
+    VALUE string, vmode, opt;
+    int oflags;
+    struct rb_io_enc_t convconfig;
+
+    argc = rb_scan_args(argc, argv, "02:", &string, &vmode, &opt);
+    rb_io_extract_modeenc(&vmode, 0, opt, &oflags, &ptr->flags, &convconfig);
+    if (argc) {
 	StringValue(string);
-	ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
-	break;
-      case 0:
+    }
+    else {
 	string = rb_enc_str_new("", 0, rb_default_external_encoding());
-	ptr->flags = FMODE_READWRITE;
-	break;
+    }
+    if (OBJ_FROZEN_RAW(string)) {
+	if (ptr->flags & FMODE_WRITABLE) {
+	    rb_syserr_fail(EACCES, 0);
+	}
+    }
+    else {
+	if (NIL_P(vmode)) {
+	    ptr->flags |= FMODE_WRITABLE;
+	}
+    }
+    if (ptr->flags & FMODE_TRUNC) {
+	rb_str_resize(string, 0);
     }
     ptr->string = string;
+    ptr->enc = convconfig.enc;
     ptr->pos = 0;
     ptr->lineno = 0;
+    if (ptr->flags & FMODE_SETENC_BY_BOM) set_encoding_by_bom(ptr);
+    RBASIC(self)->flags |= (ptr->flags & FMODE_READWRITE) * (STRIO_READABLE / FMODE_READABLE);
+    return self;
 }
 
 static VALUE
@@ -224,11 +390,24 @@ strio_finalize(VALUE self)
 static VALUE
 strio_s_open(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE obj = rb_class_new_instance(argc, argv, klass);
+    VALUE obj = rb_class_new_instance_kw(argc, argv, klass, RB_PASS_CALLED_KEYWORDS);
     if (!rb_block_given_p()) return obj;
     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_kw(argc, argv, klass, RB_PASS_CALLED_KEYWORDS);
+}
+
 /*
  * Returns +false+.  Just for compatibility to IO.
  */
@@ -250,7 +429,7 @@ strio_nil(VALUE self)
 }
 
 /*
- * Returns *strio* itself.  Just for compatibility to IO.
+ * Returns an object itself.  Just for compatibility to IO.
  */
 static VALUE
 strio_self(VALUE self)
@@ -287,7 +466,8 @@ strio_unimpl(int argc, VALUE *argv, VALUE self)
 {
     StringIO(self);
     rb_notimplement();
-    return Qnil;		/* not reached */
+
+    UNREACHABLE;
 }
 
 /*
@@ -325,17 +505,14 @@ strio_set_string(VALUE self, VALUE string)
  * call-seq:
  *   strio.close  -> nil
  *
- * Closes strio.  The *strio* is unavailable for any further data
+ * Closes a StringIO. The stream is unavailable for any further data
  * operations; an +IOError+ is raised if such an attempt is made.
  */
 static VALUE
 strio_close(VALUE self)
 {
-    struct StringIO *ptr = StringIO(self);
-    if (CLOSED(ptr)) {
-	rb_raise(rb_eIOError, "closed stream");
-    }
-    ptr->flags &= ~FMODE_READWRITE;
+    StringIO(self);
+    RBASIC(self)->flags &= ~STRIO_READWRITE;
     return Qnil;
 }
 
@@ -344,16 +521,16 @@ strio_close(VALUE self)
  *   strio.close_read    -> nil
  *
  * Closes the read end of a StringIO.  Will raise an +IOError+ if the
- * *strio* is not readable.
+ * receiver is not readable.
  */
 static VALUE
 strio_close_read(VALUE self)
 {
     struct StringIO *ptr = StringIO(self);
-    if (!READABLE(ptr)) {
+    if (!(ptr->flags & FMODE_READABLE)) {
 	rb_raise(rb_eIOError, "closing non-duplex IO for reading");
     }
-    ptr->flags &= ~FMODE_READABLE;
+    RBASIC(self)->flags &= ~STRIO_READABLE;
     return Qnil;
 }
 
@@ -362,16 +539,16 @@ strio_close_read(VALUE self)
  *   strio.close_write    -> nil
  *
  * Closes the write end of a StringIO.  Will raise an  +IOError+ if the
- * *strio* is not writeable.
+ * receiver is not writeable.
  */
 static VALUE
 strio_close_write(VALUE self)
 {
     struct StringIO *ptr = StringIO(self);
-    if (!WRITABLE(ptr)) {
+    if (!(ptr->flags & FMODE_WRITABLE)) {
 	rb_raise(rb_eIOError, "closing non-duplex IO for writing");
     }
-    ptr->flags &= ~FMODE_WRITABLE;
+    RBASIC(self)->flags &= ~STRIO_WRITABLE;
     return Qnil;
 }
 
@@ -379,13 +556,13 @@ strio_close_write(VALUE self)
  * call-seq:
  *   strio.closed?    -> true or false
  *
- * Returns +true+ if *strio* is completely closed, +false+ otherwise.
+ * Returns +true+ if the stream is completely closed, +false+ otherwise.
  */
 static VALUE
 strio_closed(VALUE self)
 {
-    struct StringIO *ptr = StringIO(self);
-    if (!CLOSED(ptr)) return Qfalse;
+    StringIO(self);
+    if (!CLOSED(self)) return Qfalse;
     return Qtrue;
 }
 
@@ -393,13 +570,13 @@ strio_closed(VALUE self)
  * call-seq:
  *   strio.closed_read?    -> true or false
  *
- * Returns +true+ if *strio* is not readable, +false+ otherwise.
+ * Returns +true+ if the stream is not readable, +false+ otherwise.
  */
 static VALUE
 strio_closed_read(VALUE self)
 {
-    struct StringIO *ptr = StringIO(self);
-    if (READABLE(ptr)) return Qfalse;
+    StringIO(self);
+    if (READABLE(self)) return Qfalse;
     return Qtrue;
 }
 
@@ -407,13 +584,13 @@ strio_closed_read(VALUE self)
  * call-seq:
  *   strio.closed_write?    -> true or false
  *
- * Returns +true+ if *strio* is not writable, +false+ otherwise.
+ * Returns +true+ if the stream is not writable, +false+ otherwise.
  */
 static VALUE
 strio_closed_write(VALUE self)
 {
-    struct StringIO *ptr = StringIO(self);
-    if (WRITABLE(ptr)) return Qfalse;
+    StringIO(self);
+    if (WRITABLE(self)) return Qfalse;
     return Qtrue;
 }
 
@@ -422,13 +599,13 @@ strio_closed_write(VALUE self)
  *   strio.eof     -> true or false
  *   strio.eof?    -> true or false
  *
- * Returns true if *strio* is at end of file. The stringio must be
- * opened for reading or an +IOError+ will be raised.
+ * Returns true if the stream is at the end of the data (underlying string).
+ * The stream must be opened for reading or an +IOError+ will be raised.
  */
 static VALUE
 strio_eof(VALUE self)
 {
-    struct StringIO *ptr = readable(StringIO(self));
+    struct StringIO *ptr = readable(self);
     if (ptr->pos < RSTRING_LEN(ptr->string)) return Qfalse;
     return Qtrue;
 }
@@ -446,7 +623,8 @@ strio_copy(VALUE copy, VALUE orig)
 	strio_free(DATA_PTR(copy));
     }
     DATA_PTR(copy) = ptr;
-    OBJ_INFECT(copy, orig);
+    RBASIC(copy)->flags &= ~STRIO_READWRITE;
+    RBASIC(copy)->flags |= RBASIC(orig)->flags & STRIO_READWRITE;
     ++ptr->count;
     return copy;
 }
@@ -455,7 +633,7 @@ strio_copy(VALUE copy, VALUE orig)
  * call-seq:
  *   strio.lineno    -> integer
  *
- * Returns the current line number in *strio*. The stringio must be
+ * Returns the current line number. The stream must be
  * opened for reading. +lineno+ counts the number of times  +gets+ is
  * called, rather than the number of newlines  encountered. The two
  * values will differ if +gets+ is  called with a separator other than
@@ -481,16 +659,30 @@ strio_set_lineno(VALUE self, VALUE lineno)
     return lineno;
 }
 
-/* call-seq: strio.binmode -> true */
-#define strio_binmode strio_self
+/*
+ * call-seq:
+ *   strio.binmode    -> stringio
+ *
+ * Puts stream into binary mode. See IO#binmode.
+ *
+ */
+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;
+}
 
-/* call-seq: strio.fcntl */
 #define strio_fcntl strio_unimpl
 
-/* call-seq: strio.flush -> strio */
 #define strio_flush strio_self
 
-/* call-seq: strio.fsync -> 0 */
 #define strio_fsync strio_0
 
 /*
@@ -498,18 +690,17 @@ strio_set_lineno(VALUE self, VALUE lineno)
  *   strio.reopen(other_StrIO)     -> strio
  *   strio.reopen(string, mode)    -> strio
  *
- * Reinitializes *strio* with the given <i>other_StrIO</i> or _string_
+ * Reinitializes the stream with the given <i>other_StrIO</i> or _string_
  * and _mode_ (see StringIO#new).
  */
 static VALUE
 strio_reopen(int argc, VALUE *argv, VALUE self)
 {
     rb_io_taint_check(self);
-    if (argc == 1 && TYPE(*argv) != T_STRING) {
+    if (argc == 1 && !RB_TYPE_P(*argv, T_STRING)) {
 	return strio_copy(self, *argv);
     }
-    strio_init(argc, argv, StringIO(self));
-    return self;
+    return strio_init(argc, argv, StringIO(self), self);
 }
 
 /*
@@ -517,7 +708,7 @@ strio_reopen(int argc, VALUE *argv, VALUE self)
  *   strio.pos     -> integer
  *   strio.tell    -> integer
  *
- * Returns the current offset (in bytes) of *strio*.
+ * Returns the current offset (in bytes).
  */
 static VALUE
 strio_get_pos(VALUE self)
@@ -529,7 +720,7 @@ strio_get_pos(VALUE self)
  * call-seq:
  *   strio.pos = integer    -> integer
  *
- * Seeks to the given position (in bytes) in *strio*.
+ * Seeks to the given position (in bytes).
  */
 static VALUE
 strio_set_pos(VALUE self, VALUE pos)
@@ -547,7 +738,7 @@ strio_set_pos(VALUE self, VALUE pos)
  * call-seq:
  *   strio.rewind    -> 0
  *
- * Positions *strio* to the beginning of input, resetting
+ * Positions the stream to the beginning of input, resetting
  * +lineno+ to zero.
  */
 static VALUE
@@ -571,29 +762,30 @@ strio_seek(int argc, VALUE *argv, VALUE self)
 {
     VALUE whence;
     struct StringIO *ptr = StringIO(self);
-    long offset;
+    long amount, offset;
 
     rb_scan_args(argc, argv, "11", NULL, &whence);
-    offset = NUM2LONG(argv[0]);
-    if (CLOSED(ptr)) {
+    amount = 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 (offset < 0) {
+    if (amount > LONG_MAX - offset || amount + offset < 0) {
 	error_inval(0);
     }
-    ptr->pos = offset;
+    ptr->pos = amount + offset;
     return INT2FIX(0);
 }
 
@@ -610,16 +802,12 @@ strio_get_sync(VALUE self)
     return Qtrue;
 }
 
-/* call-seq: strio.sync = boolean -> boolean */
 #define strio_set_sync strio_first
 
 #define strio_tell strio_get_pos
 
 /*
  * call-seq:
- *   strio.bytes {|byte| block }      -> strio
- *   strio.bytes                      -> anEnumerator
- *
  *   strio.each_byte {|byte| block }  -> strio
  *   strio.each_byte                  -> anEnumerator
  *
@@ -628,7 +816,7 @@ strio_get_sync(VALUE self)
 static VALUE
 strio_each_byte(VALUE self)
 {
-    struct StringIO *ptr = readable(StringIO(self));
+    struct StringIO *ptr = readable(self);
 
     RETURN_ENUMERATOR(self, 0, 0);
 
@@ -640,6 +828,18 @@ strio_each_byte(VALUE self)
 }
 
 /*
+ *  This is a deprecated alias for #each_byte.
+ */
+static VALUE
+strio_bytes(VALUE self)
+{
+    rb_warn("StringIO#bytes is deprecated; use #each_byte instead");
+    if (!rb_block_given_p())
+	return rb_enumeratorize(self, ID2SYM(rb_intern("each_byte")), 0, 0);
+    return strio_each_byte(self);
+}
+
+/*
  * call-seq:
  *   strio.getc   -> string or nil
  *
@@ -648,18 +848,20 @@ strio_each_byte(VALUE self)
 static VALUE
 strio_getc(VALUE self)
 {
-    struct StringIO *ptr = readable(StringIO(self));
-    rb_encoding *enc = rb_enc_get(ptr->string);
+    struct StringIO *ptr = readable(self);
+    rb_encoding *enc = get_enc(ptr);
+    VALUE str = ptr->string;
+    long pos = ptr->pos;
     int len;
     char *p;
 
-    if (ptr->pos >= RSTRING_LEN(ptr->string)) {
+    if (pos >= RSTRING_LEN(str)) {
 	return Qnil;
     }
-    p = RSTRING_PTR(ptr->string)+ptr->pos;
-    len = rb_enc_mbclen(p, RSTRING_END(ptr->string), enc);
+    p = RSTRING_PTR(str)+pos;
+    len = rb_enc_mbclen(p, RSTRING_END(str), enc);
     ptr->pos += len;
-    return rb_enc_str_new(p, len, rb_enc_get(ptr->string));
+    return enc_subseq(str, pos, len, enc);
 }
 
 /*
@@ -671,7 +873,7 @@ strio_getc(VALUE self)
 static VALUE
 strio_getbyte(VALUE self)
 {
-    struct StringIO *ptr = readable(StringIO(self));
+    struct StringIO *ptr = readable(self);
     int c;
     if (ptr->pos >= RSTRING_LEN(ptr->string)) {
 	return Qnil;
@@ -685,6 +887,9 @@ 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) {
@@ -701,7 +906,7 @@ strio_extend(struct StringIO *ptr, long pos, long len)
  * call-seq:
  *   strio.ungetc(string)   -> nil
  *
- * Pushes back one character (passed as a parameter) onto *strio*
+ * Pushes back one character (passed as a parameter)
  * such that a subsequent buffered read will return it.  There is no
  * limitation for multiple pushbacks including pushing back behind the
  * beginning of the buffer string.
@@ -709,19 +914,20 @@ strio_extend(struct StringIO *ptr, long pos, long len)
 static VALUE
 strio_ungetc(VALUE self, VALUE c)
 {
-    struct StringIO *ptr = readable(StringIO(self));
-    long lpos, clen;
-    char *p, *pend;
+    struct StringIO *ptr = readable(self);
     rb_encoding *enc, *enc2;
 
+    check_modifiable(ptr);
     if (NIL_P(c)) return Qnil;
-    if (FIXNUM_P(c)) {
-	int cc = FIX2INT(c);
+    if (RB_INTEGER_TYPE_P(c)) {
+	int len, cc = NUM2INT(c);
 	char buf[16];
 
 	enc = rb_enc_get(ptr->string);
+	len = rb_enc_codelen(cc, enc);
+	if (len <= 0) rb_enc_uint_chr(cc, enc);
 	rb_enc_mbcput(cc, buf, enc);
-	c = rb_enc_str_new(buf, rb_enc_codelen(cc, enc), enc);
+	return strio_unget_bytes(ptr, buf, len);
     }
     else {
 	SafeStringValue(c);
@@ -730,29 +936,10 @@ 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;
 }
 
 /*
@@ -764,36 +951,56 @@ strio_ungetc(VALUE self, VALUE c)
 static VALUE
 strio_ungetbyte(VALUE self, VALUE c)
 {
-    struct StringIO *ptr = readable(StringIO(self));
-    char buf[1], *cp = buf;
-    long pos = ptr->pos, cl = 1;
-    VALUE str = ptr->string;
+    struct StringIO *ptr = readable(self);
 
+    check_modifiable(ptr);
     if (NIL_P(c)) return Qnil;
-    if (FIXNUM_P(c)) {
-	buf[0] = (char)FIX2INT(c);
+    if (RB_INTEGER_TYPE_P(c)) {
+        /* rb_int_and() not visible from exts */
+        VALUE v = rb_funcall(c, '&', 1, INT2FIX(0xff));
+        const char cc = NUM2INT(v) & 0xFF;
+        strio_unget_bytes(ptr, &cc, 1);
     }
     else {
+	long cl;
 	SafeStringValue(c);
-	cp = RSTRING_PTR(c);
 	cl = RSTRING_LEN(c);
-	if (cl == 0) return Qnil;
+	if (cl > 0) {
+	    strio_unget_bytes(ptr, RSTRING_PTR(c), cl);
+	    RB_GC_GUARD(c);
+	}
     }
-    rb_str_modify(str);
+    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;
     if (cl > pos) {
-	char *s;
-	long rest = RSTRING_LEN(str) - pos;
-	rb_str_resize(str, rest + cl);
+	long ex = (rest < 0 ? cl-pos : cl+rest);
+	rb_str_modify_expand(str, ex);
+	rb_str_set_len(str, len + ex);
 	s = RSTRING_PTR(str);
-	memmove(s + cl, s + pos, rest);
+	if (rest < 0) 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(RSTRING_PTR(str) + pos, cp, cl);
+    memcpy(s + pos, cp, cl);
     ptr->pos = pos;
-    RB_GC_GUARD(c);
     return Qnil;
 }
 
@@ -806,7 +1013,7 @@ strio_ungetbyte(VALUE self, VALUE c)
 static VALUE
 strio_readchar(VALUE self)
 {
-    VALUE c = strio_getc(self);
+    VALUE c = rb_funcallv(self, rb_intern("getc"), 0, 0);
     if (NIL_P(c)) rb_eof_error();
     return c;
 }
@@ -820,16 +1027,13 @@ strio_readchar(VALUE self)
 static VALUE
 strio_readbyte(VALUE self)
 {
-    VALUE c = strio_getbyte(self);
+    VALUE c = rb_funcallv(self, rb_intern("getbyte"), 0, 0);
     if (NIL_P(c)) rb_eof_error();
     return c;
 }
 
 /*
  * call-seq:
- *   strio.chars {|char| block }      -> strio
- *   strio.chars                      -> anEnumerator
- *
  *   strio.each_char {|char| block }  -> strio
  *   strio.each_char                  -> anEnumerator
  *
@@ -849,10 +1053,19 @@ strio_each_char(VALUE self)
 }
 
 /*
+ *  This is a deprecated alias for #each_char.
+ */
+static VALUE
+strio_chars(VALUE self)
+{
+    rb_warn("StringIO#chars is deprecated; use #each_char instead");
+    if (!rb_block_given_p())
+	return rb_enumeratorize(self, ID2SYM(rb_intern("each_char")), 0, 0);
+    return strio_each_char(self);
+}
+
+/*
  * call-seq:
- *   strio.codepoints {|c| block }      -> strio
- *   strio.codepoints                   -> anEnumerator
- *
  *   strio.each_codepoint {|c| block }  -> strio
  *   strio.each_codepoint               -> anEnumerator
  *
@@ -868,8 +1081,8 @@ strio_each_codepoint(VALUE self)
 
     RETURN_ENUMERATOR(self, 0, 0);
 
-    ptr = readable(StringIO(self));
-    enc = rb_enc_get(ptr->string);
+    ptr = readable(self);
+    enc = get_enc(ptr);
     for (;;) {
 	if (ptr->pos >= RSTRING_LEN(ptr->string)) {
 	    return self;
@@ -883,6 +1096,18 @@ strio_each_codepoint(VALUE self)
     return self;
 }
 
+/*
+ *  This is a deprecated alias for #each_codepoint.
+ */
+static VALUE
+strio_codepoints(VALUE self)
+{
+    rb_warn("StringIO#codepoints is deprecated; use #each_codepoint instead");
+    if (!rb_block_given_p())
+	return rb_enumeratorize(self, ID2SYM(rb_intern("each_codepoint")), 0, 0);
+    return strio_each_codepoint(self);
+}
+
 /* Boyer-Moore search: copied from regex.c */
 static void
 bm_init_skip(long *skip, const char *pat, long m)
@@ -916,25 +1141,29 @@ bm_search(const char *little, long llen, const char *big, long blen, const long
     return -1;
 }
 
-static VALUE
-strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
+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)
 {
-    const char *s, *e, *p;
-    long n, limit = 0;
-    VALUE str, lim;
+    VALUE str, lim, opts;
+    long limit = -1;
 
-    rb_scan_args(argc, argv, "02", &str, &lim);
+    argc = rb_scan_args(argc, argv, "02:", &str, &lim, &opts);
     switch (argc) {
       case 0:
 	str = rb_rs;
 	break;
 
       case 1:
-	if (!NIL_P(str) && TYPE(str) != T_STRING) {
+	if (!NIL_P(str) && !RB_TYPE_P(str, T_STRING)) {
 	    VALUE tmp = rb_check_string_type(str);
 	    if (NIL_P(tmp)) {
 		limit = NUM2LONG(str);
-		if (limit == 0) return rb_str_new(0,0);
 		str = rb_rs;
 	    }
 	    else {
@@ -945,9 +1174,42 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
 
       case 2:
 	if (!NIL_P(str)) StringValue(str);
-	limit = NUM2LONG(lim);
+	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;
+    rb_encoding *enc = get_enc(ptr);
 
     if (ptr->pos >= (n = RSTRING_LEN(ptr->string))) {
 	return Qnil;
@@ -955,15 +1217,19 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
     s = RSTRING_PTR(ptr->string);
     e = s + RSTRING_LEN(ptr->string);
     s += ptr->pos;
-    if (limit > 0 && s + limit < e) {
-	e = rb_enc_right_char_head(s, s + limit, e, rb_enc_get(ptr->string));
+    if (limit > 0 && (size_t)limit < (size_t)(e - s)) {
+	e = rb_enc_right_char_head(s, s + limit, e, get_enc(ptr));
     }
     if (NIL_P(str)) {
-	str = strio_substr(ptr, ptr->pos, e - s);
+	if (arg->chomp) {
+	    w = chomp_newline_width(s, e);
+	}
+	str = strio_substr(ptr, ptr->pos, e - s - w, enc);
     }
     else if ((n = RSTRING_LEN(str)) == 0) {
 	p = s;
-	while (*p == '\n') {
+	while (p[(p + 1 < e) && (*p == '\r') && 0] == '\n') {
+	    p += *p == '\r';
 	    if (++p == e) {
 		return Qnil;
 	    }
@@ -972,23 +1238,33 @@ strio_getline(int argc, VALUE *argv, 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;
 	    }
 	}
-	str = strio_substr(ptr, s - RSTRING_PTR(ptr->string), e - s);
+	if (!w && arg->chomp) {
+	    w = chomp_newline_width(s, e);
+	}
+	str = strio_substr(ptr, s - RSTRING_PTR(ptr->string), e - s - w, enc);
     }
     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);
+	str = strio_substr(ptr, ptr->pos, e - s - w, enc);
     }
     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 + n;
+			e = p + (arg->chomp ? 0 : n);
 			break;
 		    }
 		}
@@ -998,11 +1274,11 @@ strio_getline(int argc, VALUE *argv, 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 + n;
+		    e = s + pos + (arg->chomp ? 0 : n);
 		}
 	    }
 	}
-	str = strio_substr(ptr, ptr->pos, e - s);
+	str = strio_substr(ptr, ptr->pos, e - s - w, enc);
     }
     ptr->pos = e - RSTRING_PTR(ptr->string);
     ptr->lineno++;
@@ -1011,95 +1287,110 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
 
 /*
  * call-seq:
- *   strio.gets(sep=$/)     -> string or nil
- *   strio.gets(limit)      -> string or nil
- *   strio.gets(sep, limit) -> string or nil
+ *   strio.gets(sep=$/, chomp: false)     -> string or nil
+ *   strio.gets(limit, chomp: false)      -> string or nil
+ *   strio.gets(sep, limit, chomp: false) -> string or nil
  *
  * See IO#gets.
  */
 static VALUE
 strio_gets(int argc, VALUE *argv, VALUE self)
 {
-    VALUE str = strio_getline(argc, argv, readable(StringIO(self)));
+    struct getline_arg arg;
+    VALUE str;
+
+    if (prepare_getline_args(&arg, argc, argv)->limit == 0) {
+	struct StringIO *ptr = readable(self);
+	return rb_enc_str_new(0, 0, get_enc(ptr));
+    }
 
+    str = strio_getline(&arg, readable(self));
     rb_lastline_set(str);
     return str;
 }
 
 /*
  * call-seq:
- *   strio.readline(sep=$/)     -> string
- *   strio.readline(limit)      -> string or nil
- *   strio.readline(sep, limit) -> string or nil
+ *   strio.readline(sep=$/, chomp: false)     -> string
+ *   strio.readline(limit, chomp: false)      -> string or nil
+ *   strio.readline(sep, limit, chomp: false) -> string or nil
  *
  * See IO#readline.
  */
 static VALUE
 strio_readline(int argc, VALUE *argv, VALUE self)
 {
-    VALUE line = strio_gets(argc, argv, self);
+    VALUE line = rb_funcallv_kw(self, rb_intern("gets"), argc, argv, RB_PASS_CALLED_KEYWORDS);
     if (NIL_P(line)) rb_eof_error();
     return line;
 }
 
 /*
  * call-seq:
- *   strio.each(sep=$/) {|line| block }         -> strio
- *   strio.each(limit) {|line| block }          -> strio
- *   strio.each(sep, limit) {|line| block }     -> strio
- *   strio.each(...)                            -> anEnumerator
+ *   strio.each(sep=$/, chomp: false) {|line| block }         -> strio
+ *   strio.each(limit, chomp: false) {|line| block }          -> strio
+ *   strio.each(sep, limit, chomp: false) {|line| block }     -> strio
+ *   strio.each(...)                                          -> anEnumerator
  *
- *   strio.each_line(sep=$/) {|line| block }    -> strio
- *   strio.each_line(limit) {|line| block }     -> strio
- *   strio.each_line(sep,limit) {|line| block } -> strio
- *   strio.each_line(...)                       -> anEnumerator
- *
- *   strio.lines(sep=$/) {|line| block }        -> strio
- *   strio.lines(limit) {|line| block }         -> strio
- *   strio.lines(sep,limit) {|line| block }     -> strio
- *   strio.lines(...)                           -> anEnumerator
+ *   strio.each_line(sep=$/, chomp: false) {|line| block }     -> strio
+ *   strio.each_line(limit, chomp: false) {|line| block }      -> strio
+ *   strio.each_line(sep, limit, chomp: false) {|line| block } -> strio
+ *   strio.each_line(...)                                      -> anEnumerator
  *
  * See IO#each.
  */
 static VALUE
 strio_each(int argc, VALUE *argv, VALUE self)
 {
-    struct StringIO *ptr = StringIO(self);
     VALUE line;
+    struct getline_arg arg;
 
+    StringIO(self);
     RETURN_ENUMERATOR(self, argc, argv);
 
-    if (argc > 0 && !NIL_P(argv[argc-1]) && NIL_P(rb_check_string_type(argv[argc-1])) &&
-	NUM2LONG(argv[argc-1]) == 0) {
+    if (prepare_getline_args(&arg, argc, argv)->limit == 0) {
 	rb_raise(rb_eArgError, "invalid limit: 0 for each_line");
     }
 
-    while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
+    while (!NIL_P(line = strio_getline(&arg, readable(self)))) {
 	rb_yield(line);
     }
     return self;
 }
 
 /*
+ *  This is a deprecated alias for #each_line.
+ */
+static VALUE
+strio_lines(int argc, VALUE *argv, VALUE self)
+{
+    rb_warn("StringIO#lines is deprecated; use #each_line instead");
+    if (!rb_block_given_p())
+	return rb_enumeratorize(self, ID2SYM(rb_intern("each_line")), argc, argv);
+    return strio_each(argc, argv, self);
+}
+
+/*
  * call-seq:
- *   strio.readlines(sep=$/)    ->   array
- *   strio.readlines(limit)     ->   array
- *   strio.readlines(sep,limit) ->   array
+ *   strio.readlines(sep=$/, chomp: false)     ->   array
+ *   strio.readlines(limit, chomp: false)      ->   array
+ *   strio.readlines(sep, limit, chomp: false) ->   array
  *
  * See IO#readlines.
  */
 static VALUE
 strio_readlines(int argc, VALUE *argv, VALUE self)
 {
-    struct StringIO *ptr = StringIO(self);
-    VALUE ary = rb_ary_new(), line;
+    VALUE ary, line;
+    struct getline_arg arg;
 
-    if (argc > 0 && !NIL_P(argv[argc-1]) && NIL_P(rb_check_string_type(argv[argc-1])) &&
-	NUM2LONG(argv[argc-1]) == 0) {
+    StringIO(self);
+    ary = rb_ary_new();
+    if (prepare_getline_args(&arg, argc, argv)->limit == 0) {
 	rb_raise(rb_eArgError, "invalid limit: 0 for readlines");
     }
 
-    while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
+    while (!NIL_P(line = strio_getline(&arg, readable(self)))) {
 	rb_ary_push(ary, line);
     }
     return ary;
@@ -1107,47 +1398,62 @@ strio_readlines(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *   strio.write(string)    -> integer
- *   strio.syswrite(string) -> integer
+ *   strio.write(string, ...) -> integer
+ *   strio.syswrite(string)   -> integer
  *
- * Appends the given string to the underlying buffer string of *strio*.
+ * Appends the given string to the underlying buffer string.
  * The stream must be opened for writing.  If the argument is not a
  * string, it will be converted to a string using <code>to_s</code>.
  * Returns the number of bytes written.  See IO#write.
  */
 static VALUE
+strio_write_m(int argc, VALUE *argv, VALUE self)
+{
+    long len = 0;
+    while (argc-- > 0) {
+	/* StringIO can't exceed long limit */
+	len += strio_write(self, *argv++);
+    }
+    return LONG2NUM(len);
+}
+
+static long
 strio_write(VALUE self, VALUE str)
 {
-    struct StringIO *ptr = writable(StringIO(self));
+    struct StringIO *ptr = writable(self);
     long len, olen;
     rb_encoding *enc, *enc2;
+    rb_encoding *const ascii8bit = rb_ascii8bit_encoding();
 
-    RB_GC_GUARD(str);
-    if (TYPE(str) != T_STRING)
+    if (!RB_TYPE_P(str, T_STRING))
 	str = rb_obj_as_string(str);
-    enc = rb_enc_get(ptr->string);
+    enc = get_enc(ptr);
     enc2 = rb_enc_get(str);
-    if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
+    if (enc != enc2 && enc != ascii8bit) {
 	str = rb_str_conv_enc(str, enc2, enc);
     }
     len = RSTRING_LEN(str);
-    if (len == 0) return INT2FIX(0);
+    if (len == 0) return 0;
     check_modifiable(ptr);
     olen = RSTRING_LEN(ptr->string);
     if (ptr->flags & FMODE_APPEND) {
 	ptr->pos = olen;
     }
     if (ptr->pos == olen) {
-	rb_str_cat(ptr->string, RSTRING_PTR(str), len);
+	if (enc == ascii8bit || enc2 == ascii8bit) {
+	    rb_enc_str_buf_cat(ptr->string, RSTRING_PTR(str), len, enc);
+	}
+	else {
+	    rb_str_buf_append(ptr->string, str);
+	}
     }
     else {
 	strio_extend(ptr, ptr->pos, len);
 	memmove(RSTRING_PTR(ptr->string)+ptr->pos, RSTRING_PTR(str), len);
-	OBJ_INFECT(ptr->string, str);
     }
-    OBJ_INFECT(ptr->string, self);
+    RB_GC_GUARD(str);
     ptr->pos += len;
-    return LONG2NUM(len);
+    return len;
 }
 
 /*
@@ -1184,18 +1490,18 @@ strio_write(VALUE self, VALUE str)
 static VALUE
 strio_putc(VALUE self, VALUE ch)
 {
-    struct StringIO *ptr = writable(StringIO(self));
-    int c = NUM2CHR(ch);
-    long olen;
+    struct StringIO *ptr = writable(self);
+    VALUE str;
 
     check_modifiable(ptr);
-    olen = RSTRING_LEN(ptr->string);
-    if (ptr->flags & FMODE_APPEND) {
-	ptr->pos = olen;
+    if (RB_TYPE_P(ch, T_STRING)) {
+	str = rb_str_substr(ch, 0, 1);
+    }
+    else {
+	char c = NUM2CHR(ch);
+	str = rb_str_new(&c, 1);
     }
-    strio_extend(ptr, ptr->pos, 1);
-    RSTRING_PTR(ptr->string)[ptr->pos++] = c;
-    OBJ_INFECT(ptr->string, self);
+    strio_write(self, str);
     return ch;
 }
 
@@ -1209,18 +1515,19 @@ strio_putc(VALUE self, VALUE ch)
 
 /*
  * call-seq:
- *   strio.read([length [, buffer]])    -> string, buffer, or nil
+ *   strio.read([length [, outbuf]])    -> string, outbuf, or nil
  *
  * See IO#read.
  */
 static VALUE
 strio_read(int argc, VALUE *argv, VALUE self)
 {
-    struct StringIO *ptr = readable(StringIO(self));
+    struct StringIO *ptr = readable(self);
     VALUE str = Qnil;
     long len;
     int binary = 0;
 
+    rb_check_arity(argc, 0, 2);
     switch (argc) {
       case 2:
 	str = argv[1];
@@ -1228,6 +1535,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
 	    StringValue(str);
 	    rb_str_modify(str);
 	}
+	/* fall through */
       case 1:
 	if (!NIL_P(argv[0])) {
 	    len = NUM2LONG(argv[0]);
@@ -1245,24 +1553,24 @@ strio_read(int argc, VALUE *argv, VALUE self)
       case 0:
 	len = RSTRING_LEN(ptr->string);
 	if (len <= ptr->pos) {
+	    rb_encoding *enc = get_enc(ptr);
 	    if (NIL_P(str)) {
 		str = rb_str_new(0, 0);
 	    }
 	    else {
 		rb_str_resize(str, 0);
 	    }
+	    rb_enc_associate(str, enc);
 	    return str;
 	}
 	else {
 	    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);
-	if (binary) rb_enc_associate(str, rb_ascii8bit_encoding());
+	rb_encoding *enc = binary ? rb_ascii8bit_encoding() : get_enc(ptr);
+	str = strio_substr(ptr, ptr->pos, len, enc);
     }
     else {
 	long rest = RSTRING_LEN(ptr->string) - ptr->pos;
@@ -1281,6 +1589,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
 /*
  * call-seq:
  *   strio.sysread(integer[, outbuf])    -> string
+ *   strio.readpartial(integer[, outbuf])    -> string
  *
  * Similar to #read, but raises +EOFError+ at end of string instead of
  * returning +nil+, as well as IO#sysread does.
@@ -1288,31 +1597,63 @@ strio_read(int argc, VALUE *argv, VALUE self)
 static VALUE
 strio_sysread(int argc, VALUE *argv, VALUE self)
 {
-    VALUE val = strio_read(argc, argv, self);
+    VALUE val = rb_funcallv_kw(self, rb_intern("read"), argc, argv, RB_PASS_CALLED_KEYWORDS);
     if (NIL_P(val)) {
 	rb_eof_error();
     }
     return val;
 }
 
-#define strio_syswrite strio_write
-
 /*
  * call-seq:
- *   strio.isatty -> nil
- *   strio.tty? -> nil
+ *   strio.read_nonblock(integer[, outbuf [, opts]])    -> string
  *
+ * Similar to #read, but raises +EOFError+ at end of string unless the
+ * +exception: false+ option is passed in.
  */
+static VALUE
+strio_read_nonblock(int argc, VALUE *argv, VALUE self)
+{
+    VALUE opts = Qnil, val;
+
+    rb_scan_args(argc, argv, "11:", NULL, NULL, &opts);
+
+    if (!NIL_P(opts)) {
+	argc--;
+    }
+
+    val = strio_read(argc, argv, self);
+    if (NIL_P(val)) {
+	if (!NIL_P(opts) &&
+	      rb_hash_lookup2(opts, sym_exception, Qundef) == Qfalse)
+	    return Qnil;
+	else
+	    rb_eof_error();
+    }
+
+    return val;
+}
+
+#define strio_syswrite rb_io_write
+
+static VALUE
+strio_syswrite_nonblock(int argc, VALUE *argv, VALUE self)
+{
+    VALUE str;
+
+    rb_scan_args(argc, argv, "10:", &str, NULL);
+    return strio_syswrite(self, str);
+}
+
 #define strio_isatty strio_false
 
-/* call-seq: strio.pid -> nil */
 #define strio_pid strio_nil
 
-/* call-seq: strio.fileno -> nil */
 #define strio_fileno strio_nil
 
 /*
  * call-seq:
+ *   strio.length -> integer
  *   strio.size   -> integer
  *
  * Returns the size of the buffer string.
@@ -1331,17 +1672,17 @@ strio_size(VALUE self)
  * call-seq:
  *   strio.truncate(integer)    -> 0
  *
- * Truncates the buffer string to at most _integer_ bytes. The *strio*
+ * Truncates the buffer string to at most _integer_ bytes. The stream
  * must be opened for writing.
  */
 static VALUE
 strio_truncate(VALUE self, VALUE len)
 {
-    VALUE string = writable(StringIO(self))->string;
+    VALUE string = writable(self)->string;
     long l = NUM2LONG(len);
     long plen = RSTRING_LEN(string);
     if (l < 0) {
-	error_inval("negative legnth");
+	error_inval("negative length");
     }
     rb_str_resize(string, l);
     if (plen < l) {
@@ -1355,13 +1696,15 @@ strio_truncate(VALUE self, VALUE len)
  *     strio.external_encoding   => encoding
  *
  *  Returns the Encoding object that represents the encoding of the file.
- *  If strio is write mode and no encoding is specified, returns <code>nil</code>.
+ *  If the stream is write mode and no encoding is specified, returns
+ *  +nil+.
  */
 
 static VALUE
 strio_external_encoding(VALUE self)
 {
-    return rb_enc_from_encoding(rb_enc_get(StringIO(self)->string));
+    struct StringIO *ptr = StringIO(self);
+    return rb_enc_from_encoding(get_enc(ptr));
 }
 
 /*
@@ -1369,13 +1712,13 @@ strio_external_encoding(VALUE self)
  *     strio.internal_encoding   => encoding
  *
  *  Returns the Encoding of the internal string if conversion is
- *  specified.  Otherwise returns nil.
+ *  specified.  Otherwise returns +nil+.
  */
 
 static VALUE
 strio_internal_encoding(VALUE self)
 {
-     return Qnil;
+    return Qnil;
 }
 
 /*
@@ -1392,7 +1735,7 @@ static VALUE
 strio_set_encoding(int argc, VALUE *argv, VALUE self)
 {
     rb_encoding* enc;
-    VALUE str = StringIO(self)->string;
+    struct StringIO *ptr = StringIO(self);
     VALUE ext_enc, int_enc, opt;
 
     argc = rb_scan_args(argc, argv, "11:", &ext_enc, &int_enc, &opt);
@@ -1403,20 +1746,57 @@ strio_set_encoding(int argc, VALUE *argv, VALUE self)
     else {
 	enc = rb_to_encoding(ext_enc);
     }
-    rb_enc_associate(str, enc);
+    ptr->enc = enc;
+    if (WRITABLE(self)) {
+	rb_enc_associate(ptr->string, enc);
+    }
+
     return self;
 }
 
+static VALUE
+strio_set_encoding_by_bom(VALUE self)
+{
+    struct StringIO *ptr = StringIO(self);
+
+    if (ptr->enc) {
+	rb_raise(rb_eArgError, "encoding conversion is set");
+    }
+    if (!set_encoding_by_bom(ptr)) return Qnil;
+    return rb_enc_from_encoding(ptr->enc);
+}
+
 /*
- * Pseudo I/O on String object.
+ * Pseudo I/O on String object, with interface corresponding to IO.
+ *
+ * Commonly used to simulate <code>$stdio</code> or <code>$stderr</code>
+ *
+ * === Examples
+ *
+ *   require 'stringio'
+ *
+ *   # Writing stream emulation
+ *   io = StringIO.new
+ *   io.puts "Hello World"
+ *   io.string #=> "Hello World\n"
+ *
+ *   # Reading stream emulation
+ *   io = StringIO.new "first\nsecond\nlast\n"
+ *   io.getc #=> "f"
+ *   io.gets #=> "irst\n"
+ *   io.read #=> "second\nlast\n"
  */
 void
-Init_stringio()
+Init_stringio(void)
 {
+#undef rb_intern
     VALUE StringIO = rb_define_class("StringIO", rb_cData);
 
+    rb_define_const(StringIO, "VERSION", rb_str_new_cstr(STRINGIO_VERSION));
+
     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);
@@ -1427,6 +1807,8 @@ Init_stringio()
     rb_define_method(StringIO, "lineno", strio_get_lineno, 0);
     rb_define_method(StringIO, "lineno=", strio_set_lineno, 1);
 
+
+    /* call-seq: strio.binmode -> true */
     rb_define_method(StringIO, "binmode", strio_binmode, 0);
     rb_define_method(StringIO, "close", strio_close, 0);
     rb_define_method(StringIO, "close_read", strio_close_read, 0);
@@ -1436,52 +1818,54 @@ Init_stringio()
     rb_define_method(StringIO, "closed_write?", strio_closed_write, 0);
     rb_define_method(StringIO, "eof", strio_eof, 0);
     rb_define_method(StringIO, "eof?", strio_eof, 0);
+    /* call-seq: strio.fcntl */
     rb_define_method(StringIO, "fcntl", strio_fcntl, -1);
+    /* call-seq: strio.flush -> strio */
     rb_define_method(StringIO, "flush", strio_flush, 0);
+    /* call-seq: strio.fsync -> 0 */
     rb_define_method(StringIO, "fsync", strio_fsync, 0);
     rb_define_method(StringIO, "pos", strio_get_pos, 0);
     rb_define_method(StringIO, "pos=", strio_set_pos, 1);
     rb_define_method(StringIO, "rewind", strio_rewind, 0);
     rb_define_method(StringIO, "seek", strio_seek, -1);
     rb_define_method(StringIO, "sync", strio_get_sync, 0);
+    /* call-seq: strio.sync = boolean -> boolean */
     rb_define_method(StringIO, "sync=", strio_set_sync, 1);
     rb_define_method(StringIO, "tell", strio_tell, 0);
 
     rb_define_method(StringIO, "each", strio_each, -1);
     rb_define_method(StringIO, "each_line", strio_each, -1);
-    rb_define_method(StringIO, "lines", strio_each, -1);
+    rb_define_method(StringIO, "lines", strio_lines, -1);
     rb_define_method(StringIO, "each_byte", strio_each_byte, 0);
-    rb_define_method(StringIO, "bytes", strio_each_byte, 0);
+    rb_define_method(StringIO, "bytes", strio_bytes, 0);
     rb_define_method(StringIO, "each_char", strio_each_char, 0);
-    rb_define_method(StringIO, "chars", strio_each_char, 0);
+    rb_define_method(StringIO, "chars", strio_chars, 0);
     rb_define_method(StringIO, "each_codepoint", strio_each_codepoint, 0);
-    rb_define_method(StringIO, "codepoints", strio_each_codepoint, 0);
+    rb_define_method(StringIO, "codepoints", strio_codepoints, 0);
     rb_define_method(StringIO, "getc", strio_getc, 0);
     rb_define_method(StringIO, "ungetc", strio_ungetc, 1);
     rb_define_method(StringIO, "ungetbyte", strio_ungetbyte, 1);
-    rb_define_method(StringIO, "readchar", strio_readchar, 0);
     rb_define_method(StringIO, "getbyte", strio_getbyte, 0);
-    rb_define_method(StringIO, "readbyte", strio_readbyte, 0);
     rb_define_method(StringIO, "gets", strio_gets, -1);
-    rb_define_method(StringIO, "readline", strio_readline, -1);
     rb_define_method(StringIO, "readlines", strio_readlines, -1);
     rb_define_method(StringIO, "read", strio_read, -1);
-    rb_define_method(StringIO, "sysread", strio_sysread, -1);
-    rb_define_method(StringIO, "readpartial", strio_sysread, -1);
-    rb_define_method(StringIO, "read_nonblock", strio_sysread, -1);
-
-    rb_define_method(StringIO, "write", strio_write, 1);
-    rb_define_method(StringIO, "<<", strio_addstr, 1);
-    rb_define_method(StringIO, "print", strio_print, -1);
-    rb_define_method(StringIO, "printf", strio_printf, -1);
+
+    rb_define_method(StringIO, "write", strio_write_m, -1);
     rb_define_method(StringIO, "putc", strio_putc, 1);
-    rb_define_method(StringIO, "puts", strio_puts, -1);
-    rb_define_method(StringIO, "syswrite", strio_syswrite, 1);
-    rb_define_method(StringIO, "write_nonblock", strio_syswrite, 1);
 
+    /*
+     * call-seq:
+     *   strio.isatty -> nil
+     *   strio.tty? -> nil
+     *
+     */
     rb_define_method(StringIO, "isatty", strio_isatty, 0);
     rb_define_method(StringIO, "tty?", strio_isatty, 0);
+
+    /* call-seq: strio.pid -> nil */
     rb_define_method(StringIO, "pid", strio_pid, 0);
+
+    /* call-seq: strio.fileno -> nil */
     rb_define_method(StringIO, "fileno", strio_fileno, 0);
     rb_define_method(StringIO, "size", strio_size, 0);
     rb_define_method(StringIO, "length", strio_size, 0);
@@ -1490,4 +1874,28 @@ Init_stringio()
     rb_define_method(StringIO, "external_encoding", strio_external_encoding, 0);
     rb_define_method(StringIO, "internal_encoding", strio_internal_encoding, 0);
     rb_define_method(StringIO, "set_encoding", strio_set_encoding, -1);
+    rb_define_method(StringIO, "set_encoding_by_bom", strio_set_encoding_by_bom, 0);
+
+    {
+	VALUE mReadable = rb_define_module_under(rb_cIO, "generic_readable");
+	rb_define_method(mReadable, "readchar", strio_readchar, 0);
+	rb_define_method(mReadable, "readbyte", strio_readbyte, 0);
+	rb_define_method(mReadable, "readline", strio_readline, -1);
+	rb_define_method(mReadable, "sysread", strio_sysread, -1);
+	rb_define_method(mReadable, "readpartial", strio_sysread, -1);
+	rb_define_method(mReadable, "read_nonblock", strio_read_nonblock, -1);
+	rb_include_module(StringIO, mReadable);
+    }
+    {
+	VALUE mWritable = rb_define_module_under(rb_cIO, "generic_writable");
+	rb_define_method(mWritable, "<<", strio_addstr, 1);
+	rb_define_method(mWritable, "print", strio_print, -1);
+	rb_define_method(mWritable, "printf", strio_printf, -1);
+	rb_define_method(mWritable, "puts", strio_puts, -1);
+	rb_define_method(mWritable, "syswrite", strio_syswrite, 1);
+	rb_define_method(mWritable, "write_nonblock", strio_syswrite_nonblock, -1);
+	rb_include_module(StringIO, mWritable);
+    }
+
+    sym_exception = ID2SYM(rb_intern("exception"));
 }
diff --git a/ext/stringio/stringio.gemspec b/ext/stringio/stringio.gemspec
new file mode 100644
index 0000000000..a16c75753f
--- /dev/null
+++ b/ext/stringio/stringio.gemspec
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
+source_version = ["", "ext/stringio/"].find do |dir|
+  begin
+    break File.open(File.join(__dir__, "#{dir}stringio.c")) {|f|
+      f.gets("\n#define STRINGIO_VERSION ")
+      f.gets[/\s*"(.+)"/, 1]
+    }
+  rescue Errno::ENOENT
+  end
+end
+Gem::Specification.new do |s|
+  s.name = "stringio"
+  s.version = source_version
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 2.6")
+  s.require_paths = ["lib"]
+  s.authors = ["Nobu Nakada"]
+  s.description = "Pseudo `IO` class from/to `String`."
+  s.email = "nobu@ruby-lang.org"
+  s.extensions = ["ext/stringio/extconf.rb"]
+  s.files = ["README.md", "ext/stringio/extconf.rb", "ext/stringio/stringio.c"]
+  s.homepage = "https://github.com/ruby/stringio"
+  s.licenses = ["BSD-2-Clause"]
+  s.required_ruby_version = ">= 2.5"
+  s.rubygems_version = "2.6.11"
+  s.summary = "Pseudo IO on String"
+
+  # s.cert_chain  = %w[certs/nobu.pem]
+  # s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
+
+  s.add_development_dependency 'rake-compiler'
+end
diff --git a/ext/strscan/depend b/ext/strscan/depend
index 76f6e0b18b..212d386f83 100644
--- a/ext/strscan/depend
+++ b/ext/strscan/depend
@@ -1,2 +1,18 @@
-strscan.o: strscan.c $(hdrdir)/ruby.h $(hdrdir)/re.h $(hdrdir)/regex.h \
-	   $(hdrdir)/oniguruma.h $(topdir)/config.h $(hdrdir)/defines.h
+# AUTOGENERATED DEPENDENCIES START
+strscan.o: $(RUBY_EXTCONF_H)
+strscan.o: $(arch_hdrdir)/ruby/config.h
+strscan.o: $(hdrdir)/ruby/assert.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/onigmo.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: strscan.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/strscan/extconf.rb b/ext/strscan/extconf.rb
index 0d21966fc2..f0ecbf85d8 100644
--- a/ext/strscan/extconf.rb
+++ b/ext/strscan/extconf.rb
@@ -1,2 +1,5 @@
+# frozen_string_literal: true
 require 'mkmf'
+$INCFLAGS << " -I$(top_srcdir)" if $extmk
+have_func("onig_region_memsize", "ruby.h")
 create_makefile 'strscan'
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index dcad837a37..b6d17992c9 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -12,7 +12,17 @@
 #include "ruby/re.h"
 #include "ruby/encoding.h"
 
-#define STRSCAN_VERSION "0.7.0"
+#ifdef RUBY_EXTCONF_H
+#  include RUBY_EXTCONF_H
+#endif
+
+#ifdef HAVE_ONIG_REGION_MEMSIZE
+extern size_t onig_region_memsize(const struct re_registers *regs);
+#endif
+
+#include <stdbool.h>
+
+#define STRSCAN_VERSION "1.0.3"
 
 /* =======================================================================
                          Data Type Definitions
@@ -20,6 +30,7 @@
 
 static VALUE StringScanner;
 static VALUE ScanError;
+static ID id_byteslice;
 
 struct strscanner
 {
@@ -36,6 +47,12 @@ struct strscanner
 
     /* the regexp register; legal only when MATCHED_P(s) */
     struct re_registers regs;
+
+    /* regexp used for last scan */
+    VALUE regex;
+
+    /* anchor mode */
+    bool fixed_anchor_p;
 };
 
 #define MATCHED_P(s)          ((s)->flags & FLAG_MATCHED)
@@ -51,7 +68,7 @@ struct strscanner
 #define EOS_P(s) ((s)->curr >= RSTRING_LEN(p->str))
 
 #define GET_SCANNER(obj,var) do {\
-    Data_Get_Struct((obj), struct strscanner, (var));\
+    (var) = check_strscan(obj);\
     if (NIL_P((var)->str)) rb_raise(rb_eArgError, "uninitialized StringScanner object");\
 } while (0)
 
@@ -59,13 +76,14 @@ struct strscanner
                             Function Prototypes
    ======================================================================= */
 
-static VALUE infect _((VALUE str, struct strscanner *p));
+static inline long minl _((const long n, const long x));
 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));
 
-void check_strscan _((VALUE obj));
-static void strscan_mark _((struct strscanner *p));
-static void strscan_free _((struct strscanner *p));
+static struct strscanner *check_strscan _((VALUE obj));
+static void strscan_mark _((void *p));
+static void strscan_free _((void *p));
+static size_t strscan_memsize _((const void *p));
 static VALUE strscan_s_allocate _((VALUE klass));
 static VALUE strscan_initialize _((int argc, VALUE *argv, VALUE self));
 static VALUE strscan_init_copy _((VALUE vself, VALUE vorig));
@@ -120,13 +138,6 @@ static VALUE inspect2 _((struct strscanner *p));
    ======================================================================= */
 
 static VALUE
-infect(VALUE str, struct strscanner *p)
-{
-    OBJ_INFECT(str, p->str);
-    return str;
-}
-
-static VALUE
 str_new(struct strscanner *p, const char *ptr, long len)
 {
     VALUE str = rb_str_new(ptr, len);
@@ -134,22 +145,26 @@ 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;
-    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);
+    end_i = minl(end_i, S_LEN(p));
+    return str_new(p, S_PBEG(p) + beg_i, end_i - beg_i);
 }
 
 static VALUE
 extract_beg_len(struct strscanner *p, long beg_i, long len)
 {
     if (beg_i > S_LEN(p)) return Qnil;
-    if (beg_i + len > S_LEN(p))
-        len = S_LEN(p) - beg_i;
-    return infect(str_new(p, S_PBEG(p) + beg_i, len), p);
+    len = minl(len, S_LEN(p) - beg_i);
+    return str_new(p, S_PBEG(p) + beg_i, len);
 }
 
 /* =======================================================================
@@ -157,59 +172,95 @@ extract_beg_len(struct strscanner *p, long beg_i, long len)
    ======================================================================= */
 
 static void
-strscan_mark(struct strscanner *p)
+strscan_mark(void *ptr)
 {
+    struct strscanner *p = ptr;
     rb_gc_mark(p->str);
 }
 
 static void
-strscan_free(struct strscanner *p)
+strscan_free(void *ptr)
 {
+    struct strscanner *p = ptr;
     onig_region_free(&(p->regs), 0);
     ruby_xfree(p);
 }
 
+static size_t
+strscan_memsize(const void *ptr)
+{
+    const struct strscanner *p = ptr;
+    size_t size = sizeof(*p) - sizeof(p->regs);
+#ifdef HAVE_ONIG_REGION_MEMSIZE
+    size += onig_region_memsize(&p->regs);
+#endif
+    return size;
+}
+
+static const rb_data_type_t strscanner_type = {
+    "StringScanner",
+    {strscan_mark, strscan_free, strscan_memsize},
+    0, 0, 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 = ALLOC(struct strscanner);
-    MEMZERO(p, struct strscanner, 1);
     CLEAR_MATCH_STATUS(p);
     onig_region_init(&(p->regs));
     p->str = Qnil;
-    return Data_Wrap_Struct(klass, strscan_mark, strscan_free, p);
+    return obj;
 }
 
 /*
- * call-seq: StringScanner.new(string, dup = false)
+ * call-seq:
+ *    StringScanner.new(string, fixed_anchor: false)
+ *    StringScanner.new(string, dup = false)
  *
  * Creates a new StringScanner object to scan over the given +string+.
+ *
+ * If +fixed_anchor+ is +true+, +\A+ always matches the beginning of
+ * the string. Otherwise, +\A+ always matches the current position.
+ *
  * +dup+ argument is obsolete and not used now.
  */
 static VALUE
 strscan_initialize(int argc, VALUE *argv, VALUE self)
 {
     struct strscanner *p;
-    VALUE str, need_dup;
-
-    Data_Get_Struct(self, struct strscanner, p);
-    rb_scan_args(argc, argv, "11", &str, &need_dup);
+    VALUE str, options;
+
+    p = check_strscan(self);
+    rb_scan_args(argc, argv, "11", &str, &options);
+    options = rb_check_hash_type(options);
+    if (!NIL_P(options)) {
+        VALUE fixed_anchor;
+        ID keyword_ids[1];
+        keyword_ids[0] = rb_intern("fixed_anchor");
+        rb_get_kwargs(options, keyword_ids, 0, 1, &fixed_anchor);
+        if (fixed_anchor == Qundef) {
+            p->fixed_anchor_p = false;
+        }
+        else {
+            p->fixed_anchor_p = RTEST(fixed_anchor);
+        }
+    }
+    else {
+        p->fixed_anchor_p = false;
+    }
     StringValue(str);
     p->str = str;
 
     return self;
 }
 
-void
+static struct strscanner *
 check_strscan(VALUE obj)
 {
-    if (TYPE(obj) != T_DATA || RDATA(obj)->dmark != (RUBY_DATA_FUNC)strscan_mark) {
-        rb_raise(rb_eTypeError,
-                 "wrong argument type %s (expected StringScanner)",
-                 rb_obj_classname(obj));
-    }
+    return rb_check_typeddata(obj, &strscanner_type);
 }
 
 /*
@@ -224,15 +275,16 @@ strscan_init_copy(VALUE vself, VALUE vorig)
 {
     struct strscanner *self, *orig;
 
-    Data_Get_Struct(vself, struct strscanner, self);
-    check_strscan(vorig);
-    Data_Get_Struct(vorig, struct strscanner, orig);
+    self = check_strscan(vself);
+    orig = check_strscan(vorig);
     if (self != orig) {
 	self->flags = orig->flags;
 	self->str = orig->str;
 	self->prev = orig->prev;
 	self->curr = orig->curr;
-	onig_region_copy(&self->regs, &orig->regs);
+	if (rb_reg_region_copy(&self->regs, &orig->regs))
+	    rb_memerror();
+	RB_GC_GUARD(vorig);
     }
 
     return vself;
@@ -272,7 +324,7 @@ strscan_reset(VALUE self)
  *   terminate
  *   clear
  *
- * Set the scan pointer to the end of the string and clear matching data.
+ * Sets the scan pointer to the end of the string and clear matching data.
  */
 static VALUE
 strscan_terminate(VALUE self)
@@ -317,9 +369,8 @@ strscan_get_string(VALUE self)
 static VALUE
 strscan_set_string(VALUE self, VALUE str)
 {
-    struct strscanner *p;
+    struct strscanner *p = check_strscan(self);
 
-    Data_Get_Struct(self, struct strscanner, p);
     StringValue(str);
     p->str = str;
     p->curr = 0;
@@ -357,7 +408,7 @@ strscan_concat(VALUE self, VALUE str)
  * value is zero.  In the 'terminated' position (i.e. the string is exhausted),
  * this value is the bytesize of the string.
  *
- * In short, it's a 0-based index into the string.
+ * In short, it's a 0-based index into bytes of the string.
  *
  *   s = StringScanner.new('test string')
  *   s.pos               # -> 0
@@ -376,9 +427,35 @@ strscan_get_pos(VALUE self)
 }
 
 /*
+ * Returns the character position of the scan pointer.  In the 'reset' position, this
+ * value is zero.  In the 'terminated' position (i.e. the string is exhausted),
+ * this value is the size of the string.
+ *
+ * In short, it's a 0-based index into the string.
+ *
+ *   s = StringScanner.new("abcädeföghi")
+ *   s.charpos           # -> 0
+ *   s.scan_until(/ä/)   # -> "abcä"
+ *   s.pos               # -> 5
+ *   s.charpos           # -> 4
+ */
+static VALUE
+strscan_get_charpos(VALUE self)
+{
+    struct strscanner *p;
+    VALUE substr;
+
+    GET_SCANNER(self, p);
+
+    substr = rb_funcall(p->str, id_byteslice, 2, INT2FIX(0), INT2NUM(p->curr));
+
+    return rb_str_length(substr);
+}
+
+/*
  * call-seq: pos=(n)
  *
- * Set the byte position of the scan pointer.
+ * Sets the byte position of the scan pointer.
  *
  *   s = StringScanner.new('test string')
  *   s.pos = 7            # -> 7
@@ -399,64 +476,160 @@ strscan_set_pos(VALUE self, VALUE v)
     return INT2NUM(i);
 }
 
+static inline UChar *
+match_target(struct strscanner *p)
+{
+    if (p->fixed_anchor_p) {
+        return (UChar *)S_PBEG(p);
+    }
+    else
+    {
+        return (UChar *)CURPTR(p);
+    }
+}
+
+static inline void
+set_registers(struct strscanner *p, size_t length)
+{
+    const int at = 0;
+    OnigRegion *regs = &(p->regs);
+    onig_region_clear(regs);
+    if (onig_region_set(regs, at, 0, 0)) return;
+    if (p->fixed_anchor_p) {
+        regs->beg[at] = p->curr;
+        regs->end[at] = p->curr + length;
+    }
+    else
+    {
+        regs->end[at] = length;
+    }
+}
+
+static inline void
+succ(struct strscanner *p)
+{
+    if (p->fixed_anchor_p) {
+        p->curr = p->regs.end[0];
+    }
+    else
+    {
+        p->curr += p->regs.end[0];
+    }
+}
+
+static inline long
+last_match_length(struct strscanner *p)
+{
+    if (p->fixed_anchor_p) {
+        return p->regs.end[0] - p->prev;
+    }
+    else
+    {
+        return p->regs.end[0];
+    }
+}
+
+static inline long
+adjust_register_position(struct strscanner *p, long position)
+{
+    if (p->fixed_anchor_p) {
+        return position;
+    }
+    else {
+        return p->prev + position;
+    }
+}
+
 static VALUE
-strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
+strscan_do_scan(VALUE self, VALUE pattern, int succptr, int getstr, int headonly)
 {
-    regex_t *rb_reg_prepare_re(VALUE re, VALUE str);
     struct strscanner *p;
-    regex_t *re;
-    long ret;
-    int tmpreg;
 
-    Check_Type(regex, T_REGEXP);
+    if (headonly) {
+        if (!RB_TYPE_P(pattern, T_REGEXP)) {
+            StringValue(pattern);
+        }
+    }
+    else {
+        Check_Type(pattern, T_REGEXP);
+    }
     GET_SCANNER(self, p);
 
     CLEAR_MATCH_STATUS(p);
     if (S_RESTLEN(p) < 0) {
         return Qnil;
     }
-    re = rb_reg_prepare_re(regex, p->str);
-    tmpreg = re != RREGEXP(regex)->ptr;
-    if (!tmpreg) RREGEXP(regex)->usecnt++;
 
-    if (headonly) {
-        ret = onig_match(re, (UChar* )CURPTR(p),
-                         (UChar* )(CURPTR(p) + S_RESTLEN(p)),
-                         (UChar* )CURPTR(p), &(p->regs), ONIG_OPTION_NONE);
-    }
-    else {
-        ret = onig_search(re,
-                          (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
-                          (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
-                          &(p->regs), ONIG_OPTION_NONE);
-    }
-    if (!tmpreg) RREGEXP(regex)->usecnt--;
-    if (tmpreg) {
-        if (RREGEXP(regex)->usecnt) {
-            onig_free(re);
+    if (RB_TYPE_P(pattern, T_REGEXP)) {
+        regex_t *rb_reg_prepare_re(VALUE re, VALUE str);
+        regex_t *re;
+        long ret;
+        int tmpreg;
+
+        p->regex = pattern;
+        re = rb_reg_prepare_re(pattern, p->str);
+        tmpreg = re != RREGEXP_PTR(pattern);
+        if (!tmpreg) RREGEXP(pattern)->usecnt++;
+
+        if (headonly) {
+            ret = onig_match(re,
+                             match_target(p),
+                             (UChar* )(CURPTR(p) + S_RESTLEN(p)),
+                             (UChar* )CURPTR(p),
+                             &(p->regs),
+                             ONIG_OPTION_NONE);
         }
         else {
-            onig_free(RREGEXP(regex)->ptr);
-            RREGEXP(regex)->ptr = re;
+            ret = onig_search(re,
+                              match_target(p),
+                              (UChar* )(CURPTR(p) + S_RESTLEN(p)),
+                              (UChar* )CURPTR(p),
+                              (UChar* )(CURPTR(p) + S_RESTLEN(p)),
+                              &(p->regs),
+                              ONIG_OPTION_NONE);
+        }
+        if (!tmpreg) RREGEXP(pattern)->usecnt--;
+        if (tmpreg) {
+            if (RREGEXP(pattern)->usecnt) {
+                onig_free(re);
+            }
+            else {
+                onig_free(RREGEXP_PTR(pattern));
+                RREGEXP_PTR(pattern) = re;
+            }
         }
-    }
 
-    if (ret == -2) rb_raise(ScanError, "regexp buffer overflow");
-    if (ret < 0) {
-        /* not matched */
-        return Qnil;
+        if (ret == -2) rb_raise(ScanError, "regexp buffer overflow");
+        if (ret < 0) {
+            /* not matched */
+            return Qnil;
+        }
+    }
+    else {
+        rb_enc_check(p->str, pattern);
+        if (S_RESTLEN(p) < RSTRING_LEN(pattern)) {
+            return Qnil;
+        }
+        if (memcmp(CURPTR(p), RSTRING_PTR(pattern), RSTRING_LEN(pattern)) != 0) {
+            return Qnil;
+        }
+        set_registers(p, RSTRING_LEN(pattern));
     }
 
     MATCHED(p);
     p->prev = p->curr;
+
     if (succptr) {
-        p->curr += p->regs.end[0];
+        succ(p);
     }
-    if (getstr) {
-        return extract_beg_len(p, p->prev, p->regs.end[0]);
-    }
-    else {
-        return INT2FIX(p->regs.end[0]);
+    {
+        const long length = last_match_length(p);
+        if (getstr) {
+            return extract_beg_len(p, p->prev, length);
+        }
+        else {
+            return INT2FIX(length);
+        }
     }
 }
 
@@ -471,7 +644,8 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
  *   p s.scan(/\w+/)   # -> "test"
  *   p s.scan(/\w+/)   # -> nil
  *   p s.scan(/\s+/)   # -> " "
- *   p s.scan(/\w+/)   # -> "string"
+ *   p s.scan("str")   # -> "str"
+ *   p s.scan(/\w+/)   # -> "ing"
  *   p s.scan(/./)     # -> nil
  *
  */
@@ -490,6 +664,7 @@ strscan_scan(VALUE self, VALUE re)
  *   s = StringScanner.new('test string')
  *   p s.match?(/\w+/)   # -> 4
  *   p s.match?(/\w+/)   # -> 4
+ *   p s.match?("test")  # -> 4
  *   p s.match?(/\s+/)   # -> nil
  */
 static VALUE
@@ -511,7 +686,8 @@ strscan_match_p(VALUE self, VALUE re)
  *   p s.skip(/\w+/)   # -> 4
  *   p s.skip(/\w+/)   # -> nil
  *   p s.skip(/\s+/)   # -> 1
- *   p s.skip(/\w+/)   # -> 6
+ *   p s.skip("st")    # -> 2
+ *   p s.skip(/\w+/)   # -> 4
  *   p s.skip(/./)     # -> nil
  *
  */
@@ -655,7 +831,12 @@ static void
 adjust_registers_to_matched(struct strscanner *p)
 {
     onig_region_clear(&(p->regs));
-    onig_region_set(&(p->regs), 0, 0, (int)(p->curr - p->prev));
+    if (p->fixed_anchor_p) {
+        onig_region_set(&(p->regs), 0, (int)p->prev, (int)p->curr);
+    }
+    else {
+        onig_region_set(&(p->regs), 0, 0, (int)(p->curr - p->prev));
+    }
 }
 
 /*
@@ -684,15 +865,14 @@ strscan_getch(VALUE self)
         return Qnil;
 
     len = rb_enc_mbclen(CURPTR(p), S_PEND(p), rb_enc_get(p->str));
-    if (p->curr + len > S_LEN(p)) {
-        len = S_LEN(p) - p->curr;
-    }
+    len = minl(len, S_RESTLEN(p));
     p->prev = p->curr;
     p->curr += len;
     MATCHED(p);
     adjust_registers_to_matched(p);
-    return extract_range(p, p->prev + p->regs.beg[0],
-                            p->prev + p->regs.end[0]);
+    return extract_range(p,
+                         adjust_register_position(p, p->regs.beg[0]),
+                         adjust_register_position(p, p->regs.end[0]));
 }
 
 /*
@@ -725,8 +905,9 @@ strscan_get_byte(VALUE self)
     p->curr++;
     MATCHED(p);
     adjust_registers_to_matched(p);
-    return extract_range(p, p->prev + p->regs.beg[0],
-                            p->prev + p->regs.end[0]);
+    return extract_range(p,
+                         adjust_register_position(p, p->regs.beg[0]),
+                         adjust_register_position(p, p->regs.end[0]));
 }
 
 /*
@@ -761,10 +942,9 @@ strscan_peek(VALUE self, VALUE vlen)
 
     len = NUM2LONG(vlen);
     if (EOS_P(p))
-        return infect(str_new(p, "", 0), p);
+        return str_new(p, "", 0);
 
-    if (p->curr + len > S_LEN(p))
-        len = S_LEN(p) - p->curr;
+    len = minl(len, S_RESTLEN(p));
     return extract_beg_len(p, p->curr, len);
 }
 
@@ -780,7 +960,7 @@ strscan_peep(VALUE self, VALUE vlen)
 }
 
 /*
- * Set the scan pointer to the previous position.  Only one previous position is
+ * Sets the scan pointer to the previous position.  Only one previous position is
  * remembered, and it changes with each scanning operation.
  *
  *   s = StringScanner.new('test string')
@@ -905,8 +1085,9 @@ strscan_matched(VALUE self)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p)) return Qnil;
-    return extract_range(p, p->prev + p->regs.beg[0],
-                            p->prev + p->regs.end[0]);
+    return extract_range(p,
+                         adjust_register_position(p, p->regs.beg[0]),
+                         adjust_register_position(p, p->regs.end[0]));
 }
 
 /*
@@ -929,10 +1110,28 @@ strscan_matched_size(VALUE self)
     return INT2NUM(p->regs.end[0] - p->regs.beg[0]);
 }
 
+static int
+name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name, const char* name_end, rb_encoding *enc)
+{
+    int num;
+
+    num = onig_name_to_backref_number(RREGEXP_PTR(regexp),
+	(const unsigned char* )name, (const unsigned char* )name_end, regs);
+    if (num >= 1) {
+	return num;
+    }
+    else {
+	rb_enc_raise(enc, rb_eIndexError, "undefined group name reference: %.*s",
+					  rb_long2int(name_end - name), name);
+    }
+
+    UNREACHABLE;
+}
+
 /*
  * call-seq: [](n)
  *
- * Return the n-th subgroup in the most recent match.
+ * Returns the n-th subgroup in the most recent match.
  *
  *   s = StringScanner.new("Fri Dec 12 1975 14:39")
  *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
@@ -942,29 +1141,142 @@ strscan_matched_size(VALUE self)
  *   s[3]                               # -> "12"
  *   s.post_match                       # -> "1975 14:39"
  *   s.pre_match                        # -> ""
+ *
+ *   s.reset
+ *   s.scan(/(?<wday>\w+) (?<month>\w+) (?<day>\d+) /)       # -> "Fri Dec 12 "
+ *   s[0]                               # -> "Fri Dec 12 "
+ *   s[1]                               # -> "Fri"
+ *   s[2]                               # -> "Dec"
+ *   s[3]                               # -> "12"
+ *   s[:wday]                           # -> "Fri"
+ *   s[:month]                          # -> "Dec"
+ *   s[:day]                            # -> "12"
+ *   s.post_match                       # -> "1975 14:39"
+ *   s.pre_match                        # -> ""
  */
 static VALUE
 strscan_aref(VALUE self, VALUE idx)
 {
+    const char *name;
     struct strscanner *p;
     long i;
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p))        return Qnil;
 
-    i = NUM2LONG(idx);
+    switch (TYPE(idx)) {
+        case T_SYMBOL:
+            idx = rb_sym2str(idx);
+            /* fall through */
+        case T_STRING:
+            if (!p->regex) return Qnil;
+            RSTRING_GETMEM(idx, name, i);
+            i = name_to_backref_number(&(p->regs), p->regex, name, name + i, rb_enc_get(idx));
+            break;
+        default:
+            i = NUM2LONG(idx);
+    }
+
     if (i < 0)
         i += p->regs.num_regs;
     if (i < 0)                 return Qnil;
     if (i >= p->regs.num_regs) return Qnil;
     if (p->regs.beg[i] == -1)  return Qnil;
 
-    return extract_range(p, p->prev + p->regs.beg[i],
-                            p->prev + p->regs.end[i]);
+    return extract_range(p,
+                         adjust_register_position(p, p->regs.beg[i]),
+                         adjust_register_position(p, p->regs.end[i]));
 }
 
 /*
- * Return the <i><b>pre</b>-match</i> (in the regular expression sense) of the last scan.
+ * call-seq: size
+ *
+ * Returns the amount of subgroups in the most recent match.
+ * The full match counts as a subgroup.
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
+ *   s.size                             # -> 4
+ */
+static VALUE
+strscan_size(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    if (! MATCHED_P(p))        return Qnil;
+    return INT2FIX(p->regs.num_regs);
+}
+
+/*
+ * call-seq: captures
+ *
+ * Returns the subgroups in the most recent match (not including the full match).
+ * If nothing was priorly matched, it returns nil.
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
+ *   s.captures                         # -> ["Fri", "Dec", "12"]
+ *   s.scan(/(\w+) (\w+) (\d+) /)       # -> nil
+ *   s.captures                         # -> nil
+ */
+static VALUE
+strscan_captures(VALUE self)
+{
+    struct strscanner *p;
+    int   i, num_regs;
+    VALUE new_ary;
+
+    GET_SCANNER(self, p);
+    if (! MATCHED_P(p))        return Qnil;
+
+    num_regs = p->regs.num_regs;
+    new_ary  = rb_ary_new2(num_regs);
+
+    for (i = 1; i < num_regs; i++) {
+        VALUE str = extract_range(p,
+                                  adjust_register_position(p, p->regs.beg[i]),
+                                  adjust_register_position(p, p->regs.end[i]));
+        rb_ary_push(new_ary, str);
+    }
+
+    return new_ary;
+}
+
+/*
+ *  call-seq:
+ *     scanner.values_at( i1, i2, ... iN )   -> an_array
+ *
+ * Returns the subgroups in the most recent match at the given indices.
+ * If nothing was priorly matched, it returns nil.
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
+ *   s.values_at 0, -1, 5, 2            # -> ["Fri Dec 12 ", "12", nil, "Dec"]
+ *   s.scan(/(\w+) (\w+) (\d+) /)       # -> nil
+ *   s.values_at 0, -1, 5, 2            # -> nil
+ */
+
+static VALUE
+strscan_values_at(int argc, VALUE *argv, VALUE self)
+{
+    struct strscanner *p;
+    long i;
+    VALUE new_ary;
+
+    GET_SCANNER(self, p);
+    if (! MATCHED_P(p))        return Qnil;
+
+    new_ary = rb_ary_new2(argc);
+    for (i = 0; i<argc; i++) {
+        rb_ary_push(new_ary, strscan_aref(self, argv[i]));
+    }
+
+    return new_ary;
+}
+
+/*
+ * Returns the <i><b>pre</b>-match</i> (in the regular expression sense) of the last scan.
  *
  *   s = StringScanner.new('test string')
  *   s.scan(/\w+/)           # -> "test"
@@ -979,11 +1291,13 @@ strscan_pre_match(VALUE self)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p)) return Qnil;
-    return extract_range(p, 0, p->prev + p->regs.beg[0]);
+    return extract_range(p,
+                         0,
+                         adjust_register_position(p, p->regs.beg[0]));
 }
 
 /*
- * Return the <i><b>post</b>-match</i> (in the regular expression sense) of the last scan.
+ * Returns the <i><b>post</b>-match</i> (in the regular expression sense) of the last scan.
  *
  *   s = StringScanner.new('test string')
  *   s.scan(/\w+/)           # -> "test"
@@ -998,7 +1312,9 @@ strscan_post_match(VALUE self)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p)) return Qnil;
-    return extract_range(p, p->prev + p->regs.end[0], S_LEN(p));
+    return extract_range(p,
+                         adjust_register_position(p, p->regs.end[0]),
+                         S_LEN(p));
 }
 
 /*
@@ -1012,7 +1328,7 @@ strscan_rest(VALUE self)
 
     GET_SCANNER(self, p);
     if (EOS_P(p)) {
-        return infect(str_new(p, "", 0), p);
+        return str_new(p, "", 0);
     }
     return extract_range(p, p->curr, S_LEN(p));
 }
@@ -1030,7 +1346,7 @@ strscan_rest_size(VALUE self)
     if (EOS_P(p)) {
         return INT2FIX(0);
     }
-    i = S_LEN(p) - p->curr;
+    i = S_RESTLEN(p);
     return INT2FIX(i);
 }
 
@@ -1046,7 +1362,6 @@ strscan_restsize(VALUE self)
 }
 
 #define INSPECT_LENGTH 5
-#define BUFSIZE 256
 
 /*
  * Returns a string that represents the StringScanner object, showing:
@@ -1063,76 +1378,86 @@ static VALUE
 strscan_inspect(VALUE self)
 {
     struct strscanner *p;
-    char buf[BUFSIZE];
-    long len;
     VALUE a, b;
 
-    Data_Get_Struct(self, struct strscanner, p);
+    p = check_strscan(self);
     if (NIL_P(p->str)) {
-        len = snprintf(buf, BUFSIZE, "#<%s (uninitialized)>",
-                       rb_class2name(CLASS_OF(self)));
-        return infect(rb_str_new(buf, len), p);
+	a = rb_sprintf("#<%"PRIsVALUE" (uninitialized)>", rb_obj_class(self));
+	return a;
     }
     if (EOS_P(p)) {
-        len = snprintf(buf, BUFSIZE, "#<%s fin>",
-                       rb_class2name(CLASS_OF(self)));
-        return infect(rb_str_new(buf, len), p);
+	a = rb_sprintf("#<%"PRIsVALUE" fin>", rb_obj_class(self));
+	return a;
     }
     if (p->curr == 0) {
-        b = inspect2(p);
-        len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld @ %s>",
-                       rb_class2name(CLASS_OF(self)),
-                       p->curr, S_LEN(p),
-                       RSTRING_PTR(b));
-        return infect(rb_str_new(buf, len), p);
+	b = inspect2(p);
+	a = rb_sprintf("#<%"PRIsVALUE" %ld/%ld @ %"PRIsVALUE">",
+		       rb_obj_class(self),
+		       p->curr, S_LEN(p),
+		       b);
+	return a;
     }
     a = inspect1(p);
     b = inspect2(p);
-    len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld %s @ %s>",
-                   rb_class2name(CLASS_OF(self)),
-                   p->curr, S_LEN(p),
-                   RSTRING_PTR(a),
-                   RSTRING_PTR(b));
-    return infect(rb_str_new(buf, len), p);
+    a = rb_sprintf("#<%"PRIsVALUE" %ld/%ld %"PRIsVALUE" @ %"PRIsVALUE">",
+		   rb_obj_class(self),
+		   p->curr, S_LEN(p),
+		   a, b);
+    return a;
 }
 
 static VALUE
 inspect1(struct strscanner *p)
 {
-    char buf[BUFSIZE];
-    char *bp = buf;
+    VALUE str;
     long len;
 
     if (p->curr == 0) return rb_str_new2("");
     if (p->curr > INSPECT_LENGTH) {
-        strcpy(bp, "..."); bp += 3;
-        len = INSPECT_LENGTH;
+	str = rb_str_new_cstr("...");
+	len = INSPECT_LENGTH;
     }
     else {
-        len = p->curr;
+	str = rb_str_new(0, 0);
+	len = p->curr;
     }
-    memcpy(bp, CURPTR(p) - len, len); bp += len;
-    return rb_str_dump(rb_str_new(buf, bp - buf));
+    rb_str_cat(str, CURPTR(p) - len, len);
+    return rb_str_dump(str);
 }
 
 static VALUE
 inspect2(struct strscanner *p)
 {
-    char buf[BUFSIZE];
-    char *bp = buf;
+    VALUE str;
     long len;
 
     if (EOS_P(p)) return rb_str_new2("");
-    len = S_LEN(p) - p->curr;
+    len = S_RESTLEN(p);
     if (len > INSPECT_LENGTH) {
-        len = INSPECT_LENGTH;
-        memcpy(bp, CURPTR(p), len); bp += len;
-        strcpy(bp, "..."); bp += 3;
+	str = rb_str_new(CURPTR(p), INSPECT_LENGTH);
+	rb_str_cat2(str, "...");
     }
     else {
-        memcpy(bp, CURPTR(p), len); bp += len;
+	str = rb_str_new(CURPTR(p), len);
     }
-    return rb_str_dump(rb_str_new(buf, bp - buf));
+    return rb_str_dump(str);
+}
+
+/*
+ * call-seq:
+ *    scanner.fixed_anchor? -> true or false
+ *
+ * Whether +scanner+ uses fixed anchor mode or not.
+ *
+ * If fixed anchor mode is used, +\A+ always matches the beginning of
+ * the string. Otherwise, +\A+ always matches the current position.
+ */
+static VALUE
+strscan_fixed_anchor_p(VALUE self)
+{
+    struct strscanner *p;
+    p = check_strscan(self);
+    return p->fixed_anchor_p ? Qtrue : Qfalse;
 }
 
 /* =======================================================================
@@ -1243,11 +1568,14 @@ inspect2(struct strscanner *p)
  * There are aliases to several of the methods.
  */
 void
-Init_strscan()
+Init_strscan(void)
 {
+#undef rb_intern
     ID id_scanerr = rb_intern("ScanError");
     VALUE tmp;
 
+    id_byteslice = rb_intern("byteslice");
+
     StringScanner = rb_define_class("StringScanner", rb_cObject);
     ScanError = rb_define_class_under(StringScanner, "Error", rb_eStandardError);
     if (!rb_const_defined(rb_cObject, id_scanerr)) {
@@ -1273,6 +1601,7 @@ Init_strscan()
     rb_define_method(StringScanner, "<<",          strscan_concat,      1);
     rb_define_method(StringScanner, "pos",         strscan_get_pos,     0);
     rb_define_method(StringScanner, "pos=",        strscan_set_pos,     1);
+    rb_define_method(StringScanner, "charpos",     strscan_get_charpos, 0);
     rb_define_method(StringScanner, "pointer",     strscan_get_pos,     0);
     rb_define_method(StringScanner, "pointer=",    strscan_set_pos,     1);
 
@@ -1308,10 +1637,15 @@ Init_strscan()
     rb_define_method(StringScanner, "[]",          strscan_aref,        1);
     rb_define_method(StringScanner, "pre_match",   strscan_pre_match,   0);
     rb_define_method(StringScanner, "post_match",  strscan_post_match,  0);
+    rb_define_method(StringScanner, "size",        strscan_size,        0);
+    rb_define_method(StringScanner, "captures",    strscan_captures,    0);
+    rb_define_method(StringScanner, "values_at",   strscan_values_at,  -1);
 
     rb_define_method(StringScanner, "rest",        strscan_rest,        0);
     rb_define_method(StringScanner, "rest_size",   strscan_rest_size,   0);
     rb_define_method(StringScanner, "restsize",    strscan_restsize,    0);
 
     rb_define_method(StringScanner, "inspect",     strscan_inspect,     0);
+
+    rb_define_method(StringScanner, "fixed_anchor?", strscan_fixed_anchor_p, 0);
 }
diff --git a/ext/strscan/strscan.gemspec b/ext/strscan/strscan.gemspec
new file mode 100644
index 0000000000..4759c6c860
--- /dev/null
+++ b/ext/strscan/strscan.gemspec
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+Gem::Specification.new do |s|
+  s.name = "strscan"
+  s.version = '1.0.3'
+  s.summary = "Provides lexical scanning operations on a String."
+  s.description = "Provides lexical scanning operations on a String."
+
+  s.require_path = %w{lib}
+  s.files = %w{ext/strscan/extconf.rb ext/strscan/strscan.c}
+  s.extensions = %w{ext/strscan/extconf.rb}
+  s.required_ruby_version = ">= 2.4.0"
+
+  s.authors = ["Minero Aoki", "Sutou Kouhei"]
+  s.email = [nil, "kou@cozmixng.org"]
+  s.homepage = "https://github.com/ruby/strscan"
+  s.license = "BSD-2-Clause"
+
+  s.add_development_dependency "rake-compiler"
+  s.add_development_dependency "benchmark-driver"
+end
diff --git a/ext/syck/bytecode.c b/ext/syck/bytecode.c
deleted file mode 100644
index 3310713e5c..0000000000
--- a/ext/syck/bytecode.c
+++ /dev/null
@@ -1,1165 +0,0 @@
-/* Generated by re2c 0.9.10 on Mon Sep 19 23:21:26 2005 */
-#line 1 "bytecode.re"
-/*
- * bytecode.re
- *
- * $Author$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-#include "ruby/ruby.h"
-#include "syck.h"
-#include "gram.h"
-
-#define QUOTELEN 128
-
-/*
- * They do my bidding...
- */
-#define YYCTYPE     char
-#define YYCURSOR    parser->cursor
-#define YYMARKER    parser->marker
-#define YYLIMIT     parser->limit
-#define YYTOKEN     parser->token
-#define YYTOKTMP    parser->toktmp
-#define YYLINEPTR   parser->lineptr
-#define YYLINECTPTR parser->linectptr
-#define YYLINE      parser->linect
-#define YYFILL(n)   syck_parser_read(parser)
-
-extern SyckParser *syck_parser_ptr;
-
-char *get_inline( SyckParser *parser );
-
-/*
- * Repositions the cursor at `n' offset from the token start.
- * Only works in `Header' and `Document' sections.
- */
-#define YYPOS(n)    YYCURSOR = YYTOKEN + n
-
-/*
- * Track line numbers
- */
-#define CHK_NL(ptr)    if ( *( ptr - 1 ) == '\n' && ptr > YYLINECTPTR ) { YYLINEPTR = ptr; YYLINE++; YYLINECTPTR = YYLINEPTR; }
-
-/*
- * I like seeing the level operations as macros...
- */
-#define ADD_LEVEL(len, status)  syck_parser_add_level( parser, len, status )
-#define POP_LEVEL()     syck_parser_pop_level( parser )
-#define CURRENT_LEVEL() syck_parser_current_level( parser )
-
-/*
- * Force a token next time around sycklex()
- */
-#define FORCE_NEXT_TOKEN(tok)    parser->force_token = tok;
-
-/*
- * Adding levels in bytecode requires us to make sure
- * we've got all our tokens worked out.
- */
-#define ADD_BYTE_LEVEL(lvl, len, s ) \
-        switch ( lvl->status ) \
-        { \
-            case syck_lvl_seq: \
-                lvl->ncount++; \
-                ADD_LEVEL(len, syck_lvl_open); \
-                YYPOS(0); \
-            return '-'; \
-        \
-            case syck_lvl_map: \
-                lvl->ncount++; \
-                ADD_LEVEL(len, s); \
-            break; \
-        \
-            case syck_lvl_open: \
-                lvl->status = s; \
-            break; \
-        \
-            default: \
-                ADD_LEVEL(len, s); \
-            break; \
-        }
-
-/*
- * Nice little macro to ensure we're YAML_IOPENed to the current level.
- * * Only use this macro in the "Document" section *
- */
-#define ENSURE_YAML_IOPEN(last_lvl, lvl_type, to_len, reset) \
-        if ( last_lvl->spaces < to_len ) \
-        { \
-            if ( last_lvl->status == syck_lvl_iseq || last_lvl->status == syck_lvl_imap ) \
-            { \
-                goto Document; \
-            } \
-            else \
-            { \
-                ADD_LEVEL( to_len, lvl_type ); \
-                if ( reset == 1 ) YYPOS(0); \
-                return YAML_IOPEN; \
-            } \
-        }
-
-/*
- * Nice little macro to ensure closure of levels.
- * * Only use this macro in the "Document" section *
- */
-#define ENSURE_YAML_IEND(last_lvl, to_len) \
-        if ( last_lvl->spaces > to_len ) \
-        { \
-            syck_parser_pop_level( parser ); \
-            YYPOS(0); \
-            return YAML_IEND; \
-        }
-
-/*
- * Concatenates string items and manages allocation
- * to the string
- */
-#define CAT(s, c, i, l) \
-        { \
-            if ( i + 1 >= c ) \
-            { \
-                c += QUOTELEN; \
-                S_REALLOC_N( s, char, c ); \
-            } \
-            s[i++] = l; \
-            s[i] = '\0'; \
-        }
-
-/*
- * Parser for standard YAML Bytecode [UTF-8]
- */
-int
-sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
-{
-    SyckLevel *lvl;
-    syck_parser_ptr = parser;
-    if ( YYCURSOR == NULL )
-    {
-        syck_parser_read( parser );
-    }
-
-    if ( parser->force_token != 0 )
-    {
-        int t = parser->force_token;
-        parser->force_token = 0;
-        return t;
-    }
-
-#line 172 "bytecode.re"
-
-
-    lvl = CURRENT_LEVEL();
-    if ( lvl->status == syck_lvl_doc )
-    {
-        goto Document;
-    }
-
-/* Header: */
-
-    YYTOKEN = YYCURSOR;
-
-
-#line 165 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept = 0;
-	goto yy0;
-	++YYCURSOR;
-yy0:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy2;
-	case 'D':	goto yy3;
-	default:	goto yy5;
-	}
-yy2:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy4;
-	}
-yy3:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy6;
-	case 0x0D:	goto yy8;
-	default:	goto yy4;
-	}
-yy4:
-#line 199 "bytecode.re"
-{   YYPOS(0);
-            goto Document;
-        }
-#line 195 "<stdout>"
-yy5:	yych = *++YYCURSOR;
-	goto yy4;
-yy6:	++YYCURSOR;
-	goto yy7;
-yy7:
-#line 186 "bytecode.re"
-{   if ( lvl->status == syck_lvl_header )
-            {
-                CHK_NL(YYCURSOR);
-                goto Directive;
-            }
-            else
-            {
-                ENSURE_YAML_IEND(lvl, -1);
-                YYPOS(0);
-                return 0;
-            }
-        }
-#line 214 "<stdout>"
-yy8:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy6;
-	default:	goto yy2;
-	}
-}
-#line 203 "bytecode.re"
-
-
-Document:
-    {
-        lvl = CURRENT_LEVEL();
-        if ( lvl->status == syck_lvl_header )
-        {
-            lvl->status = syck_lvl_doc;
-        }
-
-        YYTOKEN = YYCURSOR;
-
-
-#line 235 "<stdout>"
-{
-	YYCTYPE yych;
-	goto yy9;
-	++YYCURSOR;
-yy9:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy30;
-	case 0x0A:	goto yy27;
-	case 0x0D:	goto yy29;
-	case 'A':	goto yy19;
-	case 'D':	goto yy12;
-	case 'E':	goto yy16;
-	case 'M':	goto yy14;
-	case 'P':	goto yy13;
-	case 'Q':	goto yy15;
-	case 'R':	goto yy21;
-	case 'S':	goto yy17;
-	case 'T':	goto yy23;
-	case 'c':	goto yy25;
-	default:	goto yy11;
-	}
-yy11:yy12:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy41;
-	case 0x0D:	goto yy44;
-	default:	goto yy11;
-	}
-yy13:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy41;
-	case 0x0D:	goto yy43;
-	default:	goto yy11;
-	}
-yy14:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy38;
-	case 0x0D:	goto yy40;
-	default:	goto yy11;
-	}
-yy15:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy35;
-	case 0x0D:	goto yy37;
-	default:	goto yy11;
-	}
-yy16:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy32;
-	case 0x0D:	goto yy34;
-	default:	goto yy11;
-	}
-yy17:	++YYCURSOR;
-	goto yy18;
-yy18:
-#line 288 "bytecode.re"
-{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str);
-            goto Scalar;
-        }
-#line 296 "<stdout>"
-yy19:	++YYCURSOR;
-	goto yy20;
-yy20:
-#line 292 "bytecode.re"
-{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
-            sycklval->name = get_inline( parser );
-            syck_hdlr_remove_anchor( parser, sycklval->name );
-            CHK_NL(YYCURSOR);
-            return YAML_ANCHOR;
-        }
-#line 307 "<stdout>"
-yy21:	++YYCURSOR;
-	goto yy22;
-yy22:
-#line 299 "bytecode.re"
-{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str);
-            sycklval->name = get_inline( parser );
-            POP_LEVEL();
-            if ( *( YYCURSOR - 1 ) == '\n' ) YYCURSOR--;
-            return YAML_ALIAS;
-        }
-#line 318 "<stdout>"
-yy23:	++YYCURSOR;
-	goto yy24;
-yy24:
-#line 306 "bytecode.re"
-{   char *qstr;
-            ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
-            qstr = get_inline( parser );
-            CHK_NL(YYCURSOR);
-            if ( qstr[0] == '!' )
-            {
-                size_t qidx = strlen( qstr );
-                if ( qstr[1] == '\0' )
-                {
-                    free( qstr );
-                    return YAML_ITRANSFER;
-                }
-
-                lvl = CURRENT_LEVEL();
-
-                /*
-                 * URL Prefixing
-                 */
-                if ( qstr[1] == '^' )
-                {
-                    sycklval->name = S_ALLOC_N( char, qidx + strlen( lvl->domain ) );
-                    sycklval->name[0] = '\0';
-                    strcat( sycklval->name, lvl->domain );
-                    strncat( sycklval->name, qstr + 2, qidx - 2 );
-                    free( qstr );
-                }
-                else
-                {
-                    char *carat = qstr + 1;
-                    char *qend = qstr + qidx;
-                    while ( (++carat) < qend )
-                    {
-                        if ( *carat == '^' )
-                            break;
-                    }
-
-                    if ( carat < qend )
-                    {
-                        free( lvl->domain );
-                        lvl->domain = syck_strndup( qstr + 1, carat - ( qstr + 1 ) );
-                        sycklval->name = S_ALLOC_N( char, ( qend - carat ) + strlen( lvl->domain ) );
-                        sycklval->name[0] = '\0';
-                        strcat( sycklval->name, lvl->domain );
-                        strncat( sycklval->name, carat + 1, ( qend - carat ) - 1 );
-                        free( qstr );
-                    }
-                    else
-                    {
-                        sycklval->name = S_ALLOC_N( char, strlen( qstr ) );
-                        sycklval->name[0] = '\0';
-                        S_MEMCPY( sycklval->name, qstr + 1, char, strlen( qstr ) );
-                        free( qstr );
-                    }
-                }
-                return YAML_TRANSFER;
-            }
-            sycklval->name = qstr;
-            return YAML_TAGURI;
-        }
-#line 382 "<stdout>"
-yy25:	++YYCURSOR;
-	goto yy26;
-yy26:
-#line 366 "bytecode.re"
-{   goto Comment; }
-#line 388 "<stdout>"
-yy27:	++YYCURSOR;
-	goto yy28;
-yy28:
-#line 368 "bytecode.re"
-{   CHK_NL(YYCURSOR);
-            if ( lvl->status == syck_lvl_seq )
-            {
-                return YAML_INDENT;
-            }
-            else if ( lvl->status == syck_lvl_map )
-            {
-                if ( lvl->ncount % 2 == 1 ) return ':';
-                else                        return YAML_INDENT;
-            }
-            goto Document;
-        }
-#line 405 "<stdout>"
-yy29:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy27;
-	default:	goto yy11;
-	}
-yy30:	++YYCURSOR;
-	goto yy31;
-yy31:
-#line 381 "bytecode.re"
-{   ENSURE_YAML_IEND(lvl, -1);
-            YYPOS(0);
-            return 0;
-        }
-#line 419 "<stdout>"
-yy32:	++YYCURSOR;
-	goto yy33;
-yy33:
-#line 252 "bytecode.re"
-{   if ( lvl->status == syck_lvl_seq && lvl->ncount == 0 )
-            {
-                lvl->ncount++;
-                YYPOS(0);
-                FORCE_NEXT_TOKEN( ']' );
-                return '[';
-            }
-            else if ( lvl->status == syck_lvl_map && lvl->ncount == 0 )
-            {
-                lvl->ncount++;
-                YYPOS(0);
-                FORCE_NEXT_TOKEN( '}' );
-                return '{';
-            }
-
-            POP_LEVEL();
-            lvl = CURRENT_LEVEL();
-            if ( lvl->status == syck_lvl_seq )
-            {
-                FORCE_NEXT_TOKEN(YAML_INDENT);
-            }
-            else if ( lvl->status == syck_lvl_map )
-            {
-                if ( lvl->ncount % 2 == 1 )
-                {
-                    FORCE_NEXT_TOKEN(':');
-                }
-                else
-                {
-                    FORCE_NEXT_TOKEN(YAML_INDENT);
-                }
-            }
-            CHK_NL(YYCURSOR);
-            return YAML_IEND;
-        }
-#line 459 "<stdout>"
-yy34:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy32;
-	default:	goto yy11;
-	}
-yy35:	++YYCURSOR;
-	goto yy36;
-yy36:
-#line 237 "bytecode.re"
-{   int complex = 0;
-            if ( lvl->ncount % 2 == 0 && ( lvl->status == syck_lvl_map || lvl->status == syck_lvl_seq ) )
-            {
-                complex = 1;
-            }
-            ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_seq);
-            CHK_NL(YYCURSOR);
-            if ( complex )
-            {
-                FORCE_NEXT_TOKEN( YAML_IOPEN );
-                return '?';
-            }
-            return YAML_IOPEN;
-        }
-#line 483 "<stdout>"
-yy37:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy35;
-	default:	goto yy11;
-	}
-yy38:	++YYCURSOR;
-	goto yy39;
-yy39:
-#line 222 "bytecode.re"
-{   int complex = 0;
-            if ( lvl->ncount % 2 == 0 && ( lvl->status == syck_lvl_map || lvl->status == syck_lvl_seq ) )
-            {
-                complex = 1;
-            }
-            ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_map);
-            CHK_NL(YYCURSOR);
-            if ( complex )
-            {
-                FORCE_NEXT_TOKEN( YAML_IOPEN );
-                return '?';
-            }
-            return YAML_IOPEN;
-        }
-#line 507 "<stdout>"
-yy40:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy38;
-	default:	goto yy11;
-	}
-yy41:	++YYCURSOR;
-	goto yy42;
-yy42:
-#line 217 "bytecode.re"
-{   ENSURE_YAML_IEND(lvl, -1);
-                YYPOS(0);
-                return 0;
-            }
-#line 521 "<stdout>"
-yy43:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy41;
-	default:	goto yy11;
-	}
-yy44:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy41;
-	default:	goto yy11;
-	}
-}
-#line 386 "bytecode.re"
-
-
-    }
-
-Directive:
-    {
-        YYTOKEN = YYCURSOR;
-
-
-#line 543 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept = 0;
-	goto yy45;
-	++YYCURSOR;
-yy45:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy47;
-	case 'V':	goto yy48;
-	default:	goto yy50;
-	}
-yy47:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy49;
-	}
-yy48:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	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 ']':
-	case '^':
-	case '_':	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':	goto yy51;
-	default:	goto yy49;
-	}
-yy49:
-#line 399 "bytecode.re"
-{   YYCURSOR = YYTOKEN;
-               return YAML_DOCSEP;
-           }
-#line 646 "<stdout>"
-yy50:	yych = *++YYCURSOR;
-	goto yy49;
-yy51:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy52;
-yy52:	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	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 ']':
-	case '^':
-	case '_':	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':	goto yy51;
-	case ':':	goto yy53;
-	default:	goto yy47;
-	}
-yy53:	yych = *++YYCURSOR;
-	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	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 ']':
-	case '^':
-	case '_':	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':	goto yy54;
-	default:	goto yy47;
-	}
-yy54:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy55;
-yy55:	switch(yych){
-	case 0x0A:	goto yy56;
-	case 0x0D:	goto yy58;
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	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 ']':
-	case '^':
-	case '_':	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':	goto yy54;
-	default:	goto yy47;
-	}
-yy56:	++YYCURSOR;
-	goto yy57;
-yy57:
-#line 396 "bytecode.re"
-{   CHK_NL(YYCURSOR);
-               goto Directive; }
-#line 899 "<stdout>"
-yy58:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy56;
-	default:	goto yy47;
-	}
-}
-#line 402 "bytecode.re"
-
-
-    }
-
-Comment:
-    {
-        YYTOKEN = YYCURSOR;
-
-
-#line 916 "<stdout>"
-{
-	YYCTYPE yych;
-	goto yy59;
-	++YYCURSOR;
-yy59:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy61;
-	case 0x0A:	goto yy62;
-	case 0x0D:	goto yy64;
-	default:	goto yy66;
-	}
-yy61:yy62:	++YYCURSOR;
-	goto yy63;
-yy63:
-#line 412 "bytecode.re"
-{   CHK_NL(YYCURSOR);
-                goto Document; }
-#line 936 "<stdout>"
-yy64:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy67;
-	default:	goto yy65;
-	}
-yy65:
-#line 415 "bytecode.re"
-{   goto Comment; }
-#line 945 "<stdout>"
-yy66:	yych = *++YYCURSOR;
-	goto yy65;
-yy67:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy63;
-}
-#line 417 "bytecode.re"
-
-
-    }
-
-Scalar:
-    {
-    int idx = 0;
-    int cap = 100;
-    char *str = S_ALLOC_N( char, cap );
-    char *tok;
-
-    str[0] = '\0';
-
-Scalar2:
-    tok = YYCURSOR;
-
-
-#line 970 "<stdout>"
-{
-	YYCTYPE yych;
-	goto yy68;
-	++YYCURSOR;
-yy68:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy74;
-	case 0x0A:	goto yy70;
-	case 0x0D:	goto yy72;
-	default:	goto yy76;
-	}
-yy70:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 'C':	goto yy78;
-	case 'N':	goto yy80;
-	case 'Z':	goto yy83;
-	default:	goto yy71;
-	}
-yy71:
-#line 461 "bytecode.re"
-{   YYCURSOR = tok;
-            goto ScalarEnd;
-        }
-#line 996 "<stdout>"
-yy72:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy77;
-	default:	goto yy73;
-	}
-yy73:
-#line 469 "bytecode.re"
-{   CAT(str, cap, idx, tok[0]);
-            goto Scalar2;
-        }
-#line 1007 "<stdout>"
-yy74:	++YYCURSOR;
-	goto yy75;
-yy75:
-#line 465 "bytecode.re"
-{   YYCURSOR = tok;
-            goto ScalarEnd;
-        }
-#line 1015 "<stdout>"
-yy76:	yych = *++YYCURSOR;
-	goto yy73;
-yy77:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'C':	goto yy78;
-	case 'N':	goto yy80;
-	case 'Z':	goto yy83;
-	default:	goto yy71;
-	}
-yy78:	++YYCURSOR;
-	goto yy79;
-yy79:
-#line 435 "bytecode.re"
-{   CHK_NL(tok+1);
-            goto Scalar2; }
-#line 1031 "<stdout>"
-yy80:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy81;
-yy81:	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy80;
-	default:	goto yy82;
-	}
-yy82:
-#line 438 "bytecode.re"
-{   CHK_NL(tok+1);
-            if ( tok + 2 < YYCURSOR )
-            {
-                char *count = tok + 2;
-                int total = strtod( count, NULL );
-                int i;
-                for ( i = 0; i < total; i++ )
-                {
-                    CAT(str, cap, idx, '\n');
-                }
-            }
-            else
-            {
-                CAT(str, cap, idx, '\n');
-            }
-            goto Scalar2;
-        }
-#line 1068 "<stdout>"
-yy83:	++YYCURSOR;
-	goto yy84;
-yy84:
-#line 456 "bytecode.re"
-{   CHK_NL(tok+1);
-            CAT(str, cap, idx, '\0');
-            goto Scalar2;
-        }
-#line 1077 "<stdout>"
-}
-#line 473 "bytecode.re"
-
-
-ScalarEnd:
-        {
-            SyckNode *n = syck_alloc_str();
-            n->data.str->ptr = str;
-            n->data.str->len = idx;
-            sycklval->nodeData = n;
-            POP_LEVEL();
-            if ( parser->implicit_typing == 1 )
-            {
-                try_tag_implicit( sycklval->nodeData, parser->taguri_expansion );
-            }
-            return YAML_PLAIN;
-        }
-    }
-
-}
-
-char *
-get_inline( SyckParser *parser )
-{
-    int idx = 0;
-    int cap = 100;
-    char *str = S_ALLOC_N( char, cap );
-    char *tok;
-
-    str[0] = '\0';
-
-Inline:
-    {
-        tok = YYCURSOR;
-
-
-#line 1114 "<stdout>"
-{
-	YYCTYPE yych;
-	goto yy85;
-	++YYCURSOR;
-yy85:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy91;
-	case 0x0A:	goto yy87;
-	case 0x0D:	goto yy89;
-	default:	goto yy93;
-	}
-yy87:	++YYCURSOR;
-	goto yy88;
-yy88:
-#line 508 "bytecode.re"
-{   CHK_NL(YYCURSOR);
-                return str; }
-#line 1134 "<stdout>"
-yy89:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy94;
-	default:	goto yy90;
-	}
-yy90:
-#line 515 "bytecode.re"
-{   CAT(str, cap, idx, tok[0]);
-                goto Inline;
-            }
-#line 1145 "<stdout>"
-yy91:	++YYCURSOR;
-	goto yy92;
-yy92:
-#line 511 "bytecode.re"
-{   YYCURSOR = tok;
-                return str;
-            }
-#line 1153 "<stdout>"
-yy93:	yych = *++YYCURSOR;
-	goto yy90;
-yy94:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy88;
-}
-#line 519 "bytecode.re"
-
-
-    }
-
-}
-
diff --git a/ext/syck/depend b/ext/syck/depend
deleted file mode 100644
index 3eec4de72a..0000000000
--- a/ext/syck/depend
+++ /dev/null
@@ -1,12 +0,0 @@
-ruby_headers = $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
-  $(hdrdir)/missing.h $(hdrdir)/intern.h $(hdrdir)/st.h
-bytecode.o: bytecode.c syck.h gram.h $(ruby_headers)
-emitter.o: emitter.c syck.h $(ruby_headers)
-gram.o: gram.c syck.h $(hdrdir)/st.h
-handler.o: handler.c syck.h $(ruby_headers)
-implicit.o: implicit.c syck.h $(ruby_headers)
-node.o: node.c syck.h $(ruby_headers)
-rubyext.o: rubyext.c syck.h $(ruby_headers)
-syck.o: syck.c syck.h $(ruby_headers)
-token.o: token.c syck.h gram.h $(ruby_headers)
-yaml2byte.o: yaml2byte.c syck.h yamlbyte.h $(ruby_headers)
diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c
deleted file mode 100644
index af0d7891f8..0000000000
--- a/ext/syck/emitter.c
+++ /dev/null
@@ -1,1247 +0,0 @@
-/*
- * emitter.c
- *
- * $Author$
- *
- * Copyright (C) 2003 why the lucky stiff
- *
- * All Base64 code from Ruby's pack.c.
- * Ruby is Copyright (C) 1993-2007 Yukihiro Matsumoto
- */
-#include "ruby/ruby.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include "syck.h"
-
-#define DEFAULT_ANCHOR_FORMAT "id%03d"
-
-const char hex_table[] =
-"0123456789ABCDEF";
-static char b64_table[] =
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-/*
- * Built-in base64 (from Ruby's pack.c)
- */
-char *
-syck_base64enc( char *s, long len )
-{
-    long i = 0;
-    int padding = '=';
-    char *buff = S_ALLOC_N(char, len * 4 / 3 + 6);
-
-    while (len >= 3) {
-        buff[i++] = b64_table[077 & (*s >> 2)];
-        buff[i++] = b64_table[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))];
-        buff[i++] = b64_table[077 & (((s[1] << 2) & 074) | ((s[2] >> 6) & 03))];
-        buff[i++] = b64_table[077 & s[2]];
-        s += 3;
-        len -= 3;
-    }
-    if (len == 2) {
-        buff[i++] = b64_table[077 & (*s >> 2)];
-        buff[i++] = b64_table[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))];
-        buff[i++] = b64_table[077 & (((s[1] << 2) & 074) | (('\0' >> 6) & 03))];
-        buff[i++] = padding;
-    }
-    else if (len == 1) {
-        buff[i++] = b64_table[077 & (*s >> 2)];
-        buff[i++] = b64_table[077 & (((*s << 4) & 060) | (('\0' >> 4) & 017))];
-        buff[i++] = padding;
-        buff[i++] = padding;
-    }
-    buff[i++] = '\n';
-    return buff;
-}
-
-char *
-syck_base64dec( char *s, long len )
-{
-    int a = -1,b = -1,c = 0,d;
-    static int first = 1;
-    static int b64_xtable[256];
-    char *ptr = syck_strndup( s, len );
-    char *end = ptr;
-    char *send = s + len;
-
-    if (first) {
-        int i;
-        first = 0;
-
-        for (i = 0; i < 256; i++) {
-        b64_xtable[i] = -1;
-        }
-        for (i = 0; i < 64; i++) {
-        b64_xtable[(int)b64_table[i]] = i;
-        }
-    }
-    while (s < send) {
-        while (s[0] == '\r' || s[0] == '\n') { s++; }
-        if ((a = b64_xtable[(int)s[0]]) == -1) break;
-        if ((b = b64_xtable[(int)s[1]]) == -1) break;
-        if ((c = b64_xtable[(int)s[2]]) == -1) break;
-        if ((d = b64_xtable[(int)s[3]]) == -1) break;
-        *end++ = a << 2 | b >> 4;
-        *end++ = b << 4 | c >> 2;
-        *end++ = c << 6 | d;
-        s += 4;
-    }
-    if (a != -1 && b != -1) {
-        if (s + 2 < send && s[2] == '=')
-        *end++ = a << 2 | b >> 4;
-        if (c != -1 && s + 3 < send && s[3] == '=') {
-        *end++ = a << 2 | b >> 4;
-        *end++ = b << 4 | c >> 2;
-        }
-    }
-    *end = '\0';
-    /*RSTRING_LEN(buf) = ptr - RSTRING_PTR(buf);*/
-    return ptr;
-}
-
-/*
- * Allocate an emitter
- */
-SyckEmitter *
-syck_new_emitter(void)
-{
-    SyckEmitter *e;
-    e = S_ALLOC( SyckEmitter );
-    e->headless = 0;
-    e->use_header = 0;
-    e->use_version = 0;
-    e->sort_keys = 0;
-    e->anchor_format = NULL;
-    e->explicit_typing = 0;
-    e->best_width = 80;
-    e->style = scalar_none;
-    e->stage = doc_open;
-    e->indent = 2;
-    e->level = -1;
-    e->anchors = NULL;
-    e->markers = NULL;
-    e->anchored = NULL;
-    e->bufsize = SYCK_BUFFERSIZE;
-    e->buffer = NULL;
-    e->marker = NULL;
-    e->bufpos = 0;
-    e->emitter_handler = NULL;
-    e->output_handler = NULL;
-    e->lvl_idx = 0;
-    e->lvl_capa = ALLOC_CT;
-    e->levels = S_ALLOC_N( SyckLevel, e->lvl_capa );
-    syck_emitter_reset_levels( e );
-    e->bonus = NULL;
-    return e;
-}
-
-int
-syck_st_free_anchors( char *key, char *name, char *arg )
-{
-    S_FREE( name );
-    return ST_CONTINUE;
-}
-
-void
-syck_emitter_st_free( SyckEmitter *e )
-{
-    /*
-     * Free the anchor tables
-     */
-    if ( e->anchors != NULL )
-    {
-        st_foreach( e->anchors, syck_st_free_anchors, 0 );
-        st_free_table( e->anchors );
-        e->anchors = NULL;
-    }
-
-    if ( e->anchored != NULL )
-    {
-        st_free_table( e->anchored );
-        e->anchored = NULL;
-    }
-
-    /*
-     * Free the markers tables
-     */
-    if ( e->markers != NULL )
-    {
-        st_free_table( e->markers );
-        e->markers = NULL;
-    }
-}
-
-SyckLevel *
-syck_emitter_current_level( SyckEmitter *e )
-{
-    return &e->levels[e->lvl_idx-1];
-}
-
-SyckLevel *
-syck_emitter_parent_level( SyckEmitter *e )
-{
-    return &e->levels[e->lvl_idx-2];
-}
-
-void
-syck_emitter_pop_level( SyckEmitter *e )
-{
-    ASSERT( e != NULL );
-
-    /* The root level should never be popped */
-    if ( e->lvl_idx <= 1 ) return;
-
-    e->lvl_idx -= 1;
-    free( e->levels[e->lvl_idx].domain );
-}
-
-void
-syck_emitter_add_level( SyckEmitter *e, int len, enum syck_level_status status )
-{
-    ASSERT( e != NULL );
-    if ( e->lvl_idx + 1 > e->lvl_capa )
-    {
-        e->lvl_capa += ALLOC_CT;
-        S_REALLOC_N( e->levels, SyckLevel, e->lvl_capa );
-    }
-
-    ASSERT( len > e->levels[e->lvl_idx-1].spaces );
-    e->levels[e->lvl_idx].spaces = len;
-    e->levels[e->lvl_idx].ncount = 0;
-    e->levels[e->lvl_idx].domain = syck_strndup( e->levels[e->lvl_idx-1].domain, strlen( e->levels[e->lvl_idx-1].domain ) );
-    e->levels[e->lvl_idx].status = status;
-    e->levels[e->lvl_idx].anctag = 0;
-    e->lvl_idx += 1;
-}
-
-void
-syck_emitter_reset_levels( SyckEmitter *e )
-{
-    while ( e->lvl_idx > 1 )
-    {
-        syck_emitter_pop_level( e );
-    }
-
-    if ( e->lvl_idx < 1 )
-    {
-        e->lvl_idx = 1;
-        e->levels[0].spaces = -1;
-        e->levels[0].ncount = 0;
-        e->levels[0].domain = syck_strndup( "", 0 );
-        e->levels[0].anctag = 0;
-    }
-    e->levels[0].status = syck_lvl_header;
-}
-
-void
-syck_emitter_handler( SyckEmitter *e, SyckEmitterHandler hdlr )
-{
-    e->emitter_handler = hdlr;
-}
-
-void
-syck_output_handler( SyckEmitter *e, SyckOutputHandler hdlr )
-{
-    e->output_handler = hdlr;
-}
-
-void
-syck_free_emitter( SyckEmitter *e )
-{
-    /*
-     * Free tables
-     */
-    syck_emitter_st_free( e );
-    syck_emitter_reset_levels( e );
-    S_FREE( e->levels[0].domain );
-    S_FREE( e->levels );
-    if ( e->buffer != NULL )
-    {
-        S_FREE( e->buffer );
-    }
-    S_FREE( e );
-}
-
-void
-syck_emitter_clear( SyckEmitter *e )
-{
-    if ( e->buffer == NULL )
-    {
-        e->buffer = S_ALLOC_N( char, e->bufsize );
-        S_MEMZERO( e->buffer, char, e->bufsize );
-    }
-    e->buffer[0] = '\0';
-    e->marker = e->buffer;
-    e->bufpos = 0;
-}
-
-/*
- * Raw write to the emitter buffer.
- */
-void
-syck_emitter_write( SyckEmitter *e, const char *str, long len )
-{
-    long at;
-    ASSERT( str != NULL );
-    if ( e->buffer == NULL )
-    {
-        syck_emitter_clear( e );
-    }
-
-    /*
-     * Flush if at end of buffer
-     */
-    at = e->marker - e->buffer;
-    if ( len + at >= (long)e->bufsize )
-    {
-        syck_emitter_flush( e, 0 );
-	for (;;) {
-	    long rest = e->bufsize - (e->marker - e->buffer);
-	    if (len <= rest) break;
-	    S_MEMCPY( e->marker, str, char, rest );
-	    e->marker += rest;
-	    str += rest;
-	    len -= rest;
-	    syck_emitter_flush( e, 0 );
-	}
-    }
-
-    /*
-     * Write to buffer
-     */
-    S_MEMCPY( e->marker, str, char, len );
-    e->marker += len;
-}
-
-/*
- * Write a chunk of data out.
- */
-void
-syck_emitter_flush( SyckEmitter *e, long check_room )
-{
-    /*
-     * Check for enough space in the buffer for check_room length.
-     */
-    if ( check_room > 0 )
-    {
-        if ( (long)e->bufsize > ( e->marker - e->buffer ) + check_room )
-        {
-            return;
-        }
-    }
-    else
-    {
-        check_room = e->bufsize;
-    }
-
-    /*
-     * Commit buffer.
-     */
-    if ( check_room > e->marker - e->buffer )
-    {
-        check_room = e->marker - e->buffer;
-    }
-    (e->output_handler)( e, e->buffer, check_room );
-    e->bufpos += check_room;
-    e->marker -= check_room;
-}
-
-/*
- * Start emitting from the given node, check for anchoring and then
- * issue the callback to the emitter handler.
- */
-void
-syck_emit( SyckEmitter *e, st_data_t n )
-{
-    SYMID oid;
-    char *anchor_name = NULL;
-    int indent = 0;
-    long x = 0;
-    SyckLevel *lvl = syck_emitter_current_level( e );
-
-    /*
-     * Determine headers.
-     */
-    if ( e->stage == doc_open && ( e->headless == 0 || e->use_header == 1 ) )
-    {
-        if ( e->use_version == 1 )
-        {
-            char *header = S_ALLOC_N( char, 64 );
-            S_MEMZERO( header, char, 64 );
-            sprintf( header, "--- %%YAML:%d.%d ", SYCK_YAML_MAJOR, SYCK_YAML_MINOR );
-            syck_emitter_write( e, header, strlen( header ) );
-            S_FREE( header );
-        }
-        else
-        {
-            syck_emitter_write( e, "--- ", 4 );
-        }
-        e->stage = doc_processing;
-    }
-
-    /* Add new level */
-    if ( lvl->spaces >= 0 ) {
-        indent = lvl->spaces + e->indent;
-    }
-    syck_emitter_add_level( e, indent, syck_lvl_open );
-    lvl = syck_emitter_current_level( e );
-
-    /* Look for anchor */
-    if ( e->anchors != NULL &&
-        st_lookup( e->markers, n, (st_data_t *)&oid ) &&
-        st_lookup( e->anchors, (st_data_t)oid, (void *)&anchor_name ) )
-    {
-        if ( e->anchored == NULL )
-        {
-            e->anchored = st_init_numtable();
-        }
-
-        if ( ! st_lookup( e->anchored, (st_data_t)anchor_name, (st_data_t *)&x ) )
-        {
-            char *an = S_ALLOC_N( char, strlen( anchor_name ) + 3 );
-            sprintf( an, "&%s ", anchor_name );
-            syck_emitter_write( e, an, strlen( anchor_name ) + 2 );
-            free( an );
-
-            x = 1;
-            st_insert( e->anchored, (st_data_t)anchor_name, (st_data_t)x );
-            lvl->anctag = 1;
-        }
-        else
-        {
-            char *an = S_ALLOC_N( char, strlen( anchor_name ) + 2 );
-            sprintf( an, "*%s", anchor_name );
-            syck_emitter_write( e, an, strlen( anchor_name ) + 1 );
-            free( an );
-
-            goto end_emit;
-        }
-    }
-
-    (e->emitter_handler)( e, n );
-
-    /* Pop the level */
-end_emit:
-    syck_emitter_pop_level( e );
-    if ( e->lvl_idx == 1 ) {
-        syck_emitter_write( e, "\n", 1 );
-        e->headless = 0;
-        e->stage = doc_open;
-    }
-}
-
-/*
- * Determine what tag needs to be written, based on the taguri of the node
- * and the implicit tag which would be assigned to this node.  If a tag is
- * required, write the tag.
- */
-void syck_emit_tag( SyckEmitter *e, const char *tag, const char *ignore )
-{
-    SyckLevel *lvl;
-    if ( tag == NULL ) return;
-    if ( ignore != NULL && syck_tagcmp( tag, ignore ) == 0 && e->explicit_typing == 0 ) return;
-    lvl = syck_emitter_current_level( e );
-
-    /* implicit */
-    if ( strlen( tag ) == 0 ) {
-        syck_emitter_write( e, "! ", 2 );
-
-    /* global types */
-    } else if ( strncmp( tag, "tag:", 4 ) == 0 ) {
-        int taglen = (int)strlen( tag );
-        syck_emitter_write( e, "!", 1 );
-        if ( strncmp( tag + 4, YAML_DOMAIN, strlen( YAML_DOMAIN ) ) == 0 ) {
-            int skip = 4 + strlen( YAML_DOMAIN ) + 1;
-            syck_emitter_write( e, tag + skip, taglen - skip );
-        } else {
-            const char *subd = tag + 4;
-            while ( *subd != ':' && *subd != '\0' ) subd++;
-            if ( *subd == ':' ) {
-                if ( subd - tag > ( (long)( strlen( YAML_DOMAIN ) + 5 )) &&
-                     strncmp( subd - strlen( YAML_DOMAIN ), YAML_DOMAIN, strlen( YAML_DOMAIN ) ) == 0 ) {
-                    syck_emitter_write( e, tag + 4, subd - strlen( YAML_DOMAIN ) - ( tag + 4 ) - 1 );
-                    syck_emitter_write( e, "/", 1 );
-                    syck_emitter_write( e, subd + 1, ( tag + taglen ) - ( subd + 1 ) );
-                } else {
-                    syck_emitter_write( e, tag + 4, subd - ( tag + 4 ) );
-                    syck_emitter_write( e, "/", 1 );
-                    syck_emitter_write( e, subd + 1, ( tag + taglen ) - ( subd + 1 ) );
-                }
-            } else {
-                /* TODO: Invalid tag (no colon after domain) */
-                return;
-            }
-        }
-        syck_emitter_write( e, " ", 1 );
-
-    /* private types */
-    } else if ( strncmp( tag, "x-private:", 10 ) == 0 ) {
-        syck_emitter_write( e, "!!", 2 );
-        syck_emitter_write( e, tag + 10, strlen( tag ) - 10 );
-        syck_emitter_write( e, " ", 1 );
-    }
-    lvl->anctag = 1;
-}
-
-/*
- * Emit a newline and an appropriately spaced indent.
- */
-void syck_emit_indent( SyckEmitter *e )
-{
-    int i;
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    if ( e->bufpos == 0 && ( e->marker - e->buffer ) == 0 ) return;
-    if ( lvl->spaces >= 0 ) {
-        char *spcs = S_ALLOC_N( char, lvl->spaces + 2 );
-
-        spcs[0] = '\n'; spcs[lvl->spaces + 1] = '\0';
-        for ( i = 0; i < lvl->spaces; i++ ) spcs[i+1] = ' ';
-        syck_emitter_write( e, spcs, lvl->spaces + 1 );
-        free( spcs );
-    }
-}
-
-/* Clear the scan */
-#define SCAN_NONE       0
-/* All printable characters? */
-#define SCAN_NONPRINT   1
-/* Any indented lines? */
-#define SCAN_INDENTED   2
-/* Larger than the requested width? */
-#define SCAN_WIDE       4
-/* Opens or closes with whitespace? */
-#define SCAN_WHITEEDGE  8
-/* Contains a newline */
-#define SCAN_NEWLINE    16
-/* Contains a single quote */
-#define SCAN_SINGLEQ    32
-/* Contains a double quote */
-#define SCAN_DOUBLEQ    64
-/* Starts with a token */
-#define SCAN_INDIC_S    128
-/* Contains a flow indicator */
-#define SCAN_INDIC_C    256
-/* Ends without newlines */
-#define SCAN_NONL_E     512
-/* Ends with many newlines */
-#define SCAN_MANYNL_E   1024
-/* Contains flow map indicators */
-#define SCAN_FLOWMAP    2048
-/* Contains flow seq indicators */
-#define SCAN_FLOWSEQ    4096
-/* Contains a valid doc separator */
-#define SCAN_DOCSEP     8192
-
-/*
- * Basic printable test for LATIN-1 characters.
- */
-int
-syck_scan_scalar( int req_width, const char *cursor, long len )
-{
-    long i = 0, start = 0;
-    int flags = SCAN_NONE;
-
-    if ( len < 1 )  return flags;
-
-    /* c-indicators from the spec */
-    if ( cursor[0] == '[' || cursor[0] == ']' ||
-         cursor[0] == '{' || cursor[0] == '}' ||
-         cursor[0] == '!' || cursor[0] == '*' ||
-         cursor[0] == '&' || cursor[0] == '|' ||
-         cursor[0] == '>' || cursor[0] == '\'' ||
-         cursor[0] == '"' || cursor[0] == '#' ||
-         cursor[0] == '%' || cursor[0] == '@' ||
-         cursor[0] == '&' ) {
-            flags |= SCAN_INDIC_S;
-    }
-    if ( ( cursor[0] == '-' || cursor[0] == ':' ||
-           cursor[0] == '?' || cursor[0] == ',' ) &&
-           ( len == 1 || cursor[1] == ' ' || cursor[1] == '\n' ) )
-    {
-            flags |= SCAN_INDIC_S;
-    }
-
-    /* whitespace edges */
-    if ( cursor[len-1] != '\n' ) {
-        flags |= SCAN_NONL_E;
-    } else if ( len > 1 && cursor[len-2] == '\n' ) {
-        flags |= SCAN_MANYNL_E;
-    }
-    if (
-        ( len > 0 && ( cursor[0] == ' ' || cursor[0] == '\t' || cursor[0] == '\n' || cursor[0] == '\r' ) ) ||
-        ( len > 1 && ( cursor[len-1] == ' ' || cursor[len-1] == '\t' ) )
-    ) {
-        flags |= SCAN_WHITEEDGE;
-    }
-
-    /* opening doc sep */
-    if ( len >= 3 && strncmp( cursor, "---", 3 ) == 0 )
-        flags |= SCAN_DOCSEP;
-
-    /* scan string */
-    for ( i = 0; i < len; i++ ) {
-
-        if ( ! ( cursor[i] == 0x9 ||
-                 cursor[i] == 0xA ||
-                 cursor[i] == 0xD ||
-               ( cursor[i] >= 0x20 && cursor[i] <= 0x7E ) )
-        ) {
-            flags |= SCAN_NONPRINT;
-        }
-        else if ( cursor[i] == '\n' ) {
-            flags |= SCAN_NEWLINE;
-            if ( len - i >= 3 && strncmp( &cursor[i+1], "---", 3 ) == 0 )
-                flags |= SCAN_DOCSEP;
-            if ( cursor[i+1] == ' ' || cursor[i+1] == '\t' )
-                flags |= SCAN_INDENTED;
-            if ( req_width > 0 && i - start > req_width )
-                flags |= SCAN_WIDE;
-            start = i;
-        }
-        else if ( cursor[i] == '\'' )
-        {
-            flags |= SCAN_SINGLEQ;
-        }
-        else if ( cursor[i] == '"' )
-        {
-            flags |= SCAN_DOUBLEQ;
-        }
-        else if ( cursor[i] == ']' )
-        {
-            flags |= SCAN_FLOWSEQ;
-        }
-        else if ( cursor[i] == '}' )
-        {
-            flags |= SCAN_FLOWMAP;
-        }
-        /* remember, if plain collections get implemented, to add nb-plain-flow-char */
-        else if ( ( cursor[i] == ' ' && cursor[i+1] == '#' ) ||
-                  ( cursor[i] == ':' &&
-                    ( cursor[i+1] == ' ' || cursor[i+1] == '\n' || i == len - 1 ) ) )
-        {
-            flags |= SCAN_INDIC_C;
-        }
-        else if ( cursor[i] == ',' &&
-                  ( cursor[i+1] == ' ' || cursor[i+1] == '\n' || i == len - 1 ) )
-        {
-            flags |= SCAN_FLOWMAP;
-            flags |= SCAN_FLOWSEQ;
-        }
-    }
-
-    /* printf( "---STR---\n%s\nFLAGS: %d\n", cursor, flags ); */
-    return flags;
-}
-/*
- * All scalars should be emitted through this function, which determines an appropriate style,
- * tag and indent.
- */
-void syck_emit_scalar( SyckEmitter *e, const char *tag, enum scalar_style force_style, int force_indent, int force_width,
-                       char keep_nl, const char *str, long len )
-{
-    enum scalar_style favor_style = scalar_literal;
-    SyckLevel *parent = syck_emitter_parent_level( e );
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    int scan = 0;
-    const char *match_implicit;
-    char *implicit;
-
-    if ( str == NULL ) str = "";
-
-    /* No empty nulls as map keys */
-    if ( len == 0 && ( parent->status == syck_lvl_map || parent->status == syck_lvl_imap ) &&
-         parent->ncount % 2 == 1 && syck_tagcmp( tag, "tag:yaml.org,2002:null" ) == 0 )
-    {
-        str = "~";
-        len = 1;
-    }
-
-    scan = syck_scan_scalar( force_width, str, len );
-    match_implicit = syck_match_implicit( str, len );
-
-    /* quote strings which default to implicits */
-    implicit = syck_taguri( YAML_DOMAIN, match_implicit, (int)strlen( match_implicit ) );
-    if ( syck_tagcmp( tag, implicit ) != 0 && syck_tagcmp( tag, "tag:yaml.org,2002:str" ) == 0 ) {
-        force_style = scalar_2quote;
-    } else {
-        /* complex key */
-        if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 &&
-             ( !( tag == NULL ||
-             ( implicit != NULL && syck_tagcmp( tag, implicit ) == 0 && e->explicit_typing == 0 ) ) ) )
-        {
-            syck_emitter_write( e, "? ", 2 );
-            parent->status = syck_lvl_mapx;
-        }
-        syck_emit_tag( e, tag, implicit );
-    }
-    S_FREE( implicit );
-
-    /* if still arbitrary, sniff a good block style. */
-    if ( force_style == scalar_none ) {
-        if ( scan & SCAN_NEWLINE ) {
-            force_style = scalar_literal;
-        } else {
-            force_style = scalar_plain;
-        }
-    }
-
-    if ( e->style == scalar_fold ) {
-        favor_style = scalar_fold;
-    }
-
-    /* Determine block style */
-    if ( scan & SCAN_NONPRINT ) {
-        force_style = scalar_2quote;
-    } else if ( scan & SCAN_WHITEEDGE ) {
-        force_style = scalar_2quote;
-    } else if ( force_style != scalar_fold && ( scan & SCAN_INDENTED ) ) {
-        force_style = scalar_literal;
-    } else if ( force_style == scalar_plain && ( scan & SCAN_NEWLINE ) ) {
-        force_style = favor_style;
-    } else if ( force_style == scalar_plain && parent->status == syck_lvl_iseq && ( scan & SCAN_FLOWSEQ ) ) {
-        force_style = scalar_2quote;
-    } else if ( force_style == scalar_plain && parent->status == syck_lvl_imap && ( scan & SCAN_FLOWMAP ) ) {
-        force_style = scalar_2quote;
-    /* } else if ( force_style == scalar_fold && ( ! ( scan & SCAN_WIDE ) ) ) {
-        force_style = scalar_literal; */
-    } else if ( force_style == scalar_plain && ( scan & SCAN_INDIC_S || scan & SCAN_INDIC_C ) ) {
-        if ( scan & SCAN_NEWLINE ) {
-            force_style = favor_style;
-        } else {
-            force_style = scalar_2quote;
-        }
-    }
-
-    if ( force_indent > 0 ) {
-        lvl->spaces = parent->spaces + force_indent;
-    } else if ( scan & SCAN_DOCSEP ) {
-        lvl->spaces = parent->spaces + e->indent;
-    }
-
-    /* For now, all ambiguous keys are going to be double-quoted */
-    if ( ( parent->status == syck_lvl_map || parent->status == syck_lvl_mapx ) && parent->ncount % 2 == 1 ) {
-        if ( force_style != scalar_plain ) {
-            force_style = scalar_2quote;
-        }
-    }
-
-    /* If the parent is an inline, double quote anything complex */
-    if ( parent->status == syck_lvl_imap || parent->status == syck_lvl_iseq ) {
-        if ( force_style != scalar_plain && force_style != scalar_1quote ) {
-            force_style = scalar_2quote;
-        }
-    }
-
-    /* Fix the ending newlines */
-    if ( scan & SCAN_NONL_E ) {
-        keep_nl = NL_CHOMP;
-    } else if ( scan & SCAN_MANYNL_E ) {
-        keep_nl = NL_KEEP;
-    }
-
-    /* Write the text node */
-    switch ( force_style )
-    {
-        case scalar_1quote:
-            syck_emit_1quoted( e, force_width, str, len );
-        break;
-
-        case scalar_none:
-        case scalar_2quote:
-            syck_emit_2quoted( e, force_width, str, len );
-        break;
-
-        case scalar_fold:
-            syck_emit_folded( e, force_width, keep_nl, str, len );
-        break;
-
-        case scalar_literal:
-            syck_emit_literal( e, keep_nl, str, len );
-        break;
-
-        case scalar_plain:
-            syck_emitter_write( e, str, len );
-        break;
-    }
-
-    if ( parent->status == syck_lvl_mapx )
-    {
-        syck_emitter_write( e, "\n", 1 );
-    }
-}
-
-void
-syck_emitter_escape( SyckEmitter *e, const char *src, long len )
-{
-    int i;
-    for( i = 0; i < len; i++ )
-    {
-        if( (src[i] < 0x20) || (0x7E < src[i]) )
-        {
-            syck_emitter_write( e, "\\", 1 );
-            if( '\0' == src[i] )
-                syck_emitter_write( e, "0", 1 );
-            else
-            {
-                syck_emitter_write( e, "x", 1 );
-                syck_emitter_write( e, (const char *)hex_table + ((src[i] & 0xF0) >> 4), 1 );
-                syck_emitter_write( e, (const char *)hex_table + (src[i] & 0x0F), 1 );
-            }
-        }
-        else
-        {
-            syck_emitter_write( e, src + i, 1 );
-            if( '\\' == src[i] )
-                syck_emitter_write( e, "\\", 1 );
-        }
-    }
-}
-
-/*
- * Outputs a single-quoted block.
- */
-void
-syck_emit_1quoted( SyckEmitter *e, int width, const char *str, long len )
-{
-    char do_indent = 0;
-    const char *mark = str;
-    const char *start = str;
-    const char *end = str;
-    syck_emitter_write( e, "'", 1 );
-    while ( mark < str + len ) {
-        if ( do_indent ) {
-            syck_emit_indent( e );
-            do_indent = 0;
-        }
-        switch ( *mark ) {
-            case '\'':  syck_emitter_write( e, "'", 1 ); break;
-
-            case '\n':
-                end = mark + 1;
-                if ( *start != ' ' && *start != '\n' && *end != '\n' && *end != ' ' ) {
-                    syck_emitter_write( e, "\n\n", 2 );
-                } else {
-                    syck_emitter_write( e, "\n", 1 );
-                }
-                do_indent = 1;
-                start = mark + 1;
-            break;
-
-            case ' ':
-                if ( width > 0 && *start != ' ' && mark - end > width ) {
-                    do_indent = 1;
-                    end = mark + 1;
-                } else {
-                    syck_emitter_write( e, " ", 1 );
-                }
-            break;
-
-            default:
-                syck_emitter_write( e, mark, 1 );
-            break;
-        }
-        mark++;
-    }
-    syck_emitter_write( e, "'", 1 );
-}
-
-/*
- * Outputs a double-quoted block.
- */
-void
-syck_emit_2quoted( SyckEmitter *e, int width, const char *str, long len )
-{
-    char do_indent = 0;
-    const char *mark = str;
-    const char *start = str;
-    const char *end = str;
-    syck_emitter_write( e, "\"", 1 );
-    while ( mark < str + len ) {
-        if ( do_indent > 0 ) {
-            if ( do_indent == 2 ) {
-                syck_emitter_write( e, "\\", 1 );
-            }
-            syck_emit_indent( e );
-            do_indent = 0;
-        }
-        switch ( *mark ) {
-
-            /* Escape sequences allowed within double quotes. */
-            case '"':  syck_emitter_write( e, "\\\"", 2 ); break;
-            case '\\': syck_emitter_write( e, "\\\\", 2 ); break;
-            case '\0': syck_emitter_write( e, "\\0",  2 ); break;
-            case '\a': syck_emitter_write( e, "\\a",  2 ); break;
-            case '\b': syck_emitter_write( e, "\\b",  2 ); break;
-            case '\f': syck_emitter_write( e, "\\f",  2 ); break;
-            case '\r': syck_emitter_write( e, "\\r",  2 ); break;
-            case '\t': syck_emitter_write( e, "\\t",  2 ); break;
-            case '\v': syck_emitter_write( e, "\\v",  2 ); break;
-            case 0x1b: syck_emitter_write( e, "\\e",  2 ); break;
-
-            case '\n':
-                end = mark + 1;
-                syck_emitter_write( e, "\\n", 2 );
-                do_indent = 2;
-                start = mark + 1;
-                if ( start < str + len && ( *start == ' ' || *start == '\n' ) ) {
-                    do_indent = 0;
-                }
-            break;
-
-            case ' ':
-                if ( width > 0 && *start != ' ' && mark - end > width ) {
-                    do_indent = 1;
-                    end = mark + 1;
-                } else {
-                    syck_emitter_write( e, " ", 1 );
-                }
-            break;
-
-            default:
-                syck_emitter_escape( e, mark, 1 );
-            break;
-        }
-        mark++;
-    }
-    syck_emitter_write( e, "\"", 1 );
-}
-
-/*
- * Outputs a literal block.
- */
-void
-syck_emit_literal( SyckEmitter *e, char keep_nl, const char *str, long len )
-{
-    const char *mark = str;
-    const char *start = str;
-    const char *end = str;
-    syck_emitter_write( e, "|", 1 );
-    if ( keep_nl == NL_CHOMP ) {
-        syck_emitter_write( e, "-", 1 );
-    } else if ( keep_nl == NL_KEEP ) {
-        syck_emitter_write( e, "+", 1 );
-    }
-    syck_emit_indent( e );
-    while ( mark < str + len ) {
-        if ( *mark == '\n' ) {
-            end = mark;
-            if ( *start != ' ' && *start != '\n' && *end != '\n' && *end != ' ' ) end += 1;
-            syck_emitter_write( e, start, end - start );
-            if ( mark + 1 == str + len ) {
-                if ( keep_nl != NL_KEEP ) syck_emitter_write( e, "\n", 1 );
-            } else {
-                syck_emit_indent( e );
-            }
-            start = mark + 1;
-        }
-        mark++;
-    }
-    end = str + len;
-    if ( start < end ) {
-        syck_emitter_write( e, start, end - start );
-    }
-}
-
-/*
- * Outputs a folded block.
- */
-void
-syck_emit_folded( SyckEmitter *e, int width, char keep_nl, const char *str, long len )
-{
-    const char *mark = str;
-    const char *start = str;
-    const char *end = str;
-    syck_emitter_write( e, ">", 1 );
-    if ( keep_nl == NL_CHOMP ) {
-        syck_emitter_write( e, "-", 1 );
-    } else if ( keep_nl == NL_KEEP ) {
-        syck_emitter_write( e, "+", 1 );
-    }
-    syck_emit_indent( e );
-    if ( width <= 0 ) width = e->best_width;
-    while ( mark < str + len ) {
-        switch ( *mark ) {
-            case '\n':
-                syck_emitter_write( e, end, mark - end );
-                end = mark + 1;
-                if ( *start != ' ' && *start != '\n' && *end != '\n' && *end != ' ' ) {
-                    syck_emitter_write( e, "\n", 1 );
-                }
-                if ( mark + 1 == str + len ) {
-                    if ( keep_nl != NL_KEEP ) syck_emitter_write( e, "\n", 1 );
-                } else {
-                    syck_emit_indent( e );
-                }
-                start = mark + 1;
-            break;
-
-            case ' ':
-                if ( *start != ' ' ) {
-                    if ( mark - end > width ) {
-                        syck_emitter_write( e, end, mark - end );
-                        syck_emit_indent( e );
-                        end = mark + 1;
-                    }
-                }
-            break;
-        }
-        mark++;
-    }
-    if ( end < mark ) {
-        syck_emitter_write( e, end, mark - end );
-    }
-}
-
-/*
- * Begins emission of a sequence.
- */
-void syck_emit_seq( SyckEmitter *e, const char *tag, enum seq_style style )
-{
-    SyckLevel *parent = syck_emitter_parent_level( e );
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    syck_emit_tag( e, tag, "tag:yaml.org,2002:seq" );
-    if ( style == seq_inline || ( parent->status == syck_lvl_imap || parent->status == syck_lvl_iseq ) ) {
-        syck_emitter_write( e, "[", 1 );
-        lvl->status = syck_lvl_iseq;
-    } else {
-        /* complex key */
-        if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 ) {
-            syck_emitter_write( e, "? ", 2 );
-            parent->status = syck_lvl_mapx;
-        }
-        lvl->status = syck_lvl_seq;
-    }
-}
-
-/*
- * Begins emission of a mapping.
- */
-void
-syck_emit_map( SyckEmitter *e, const char *tag, enum map_style style )
-{
-    SyckLevel *parent = syck_emitter_parent_level( e );
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    syck_emit_tag( e, tag, "tag:yaml.org,2002:map" );
-    if ( style == map_inline || ( parent->status == syck_lvl_imap || parent->status == syck_lvl_iseq ) ) {
-        syck_emitter_write( e, "{", 1 );
-        lvl->status = syck_lvl_imap;
-    } else {
-        /* complex key */
-        if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 ) {
-            syck_emitter_write( e, "? ", 2 );
-            parent->status = syck_lvl_mapx;
-        }
-        lvl->status = syck_lvl_map;
-    }
-}
-
-/*
- * Handles emitting of a collection item (for both
- * sequences and maps)
- */
-void syck_emit_item( SyckEmitter *e, st_data_t n )
-{
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    switch ( lvl->status )
-    {
-        case syck_lvl_seq:
-        {
-            SyckLevel *parent = syck_emitter_parent_level( e );
-
-            /* seq-in-map shortcut -- the lvl->anctag check should be unneccesary but
-             * there is a nasty shift/reduce in the parser on this point and
-             * i'm not ready to tickle it. */
-            if ( lvl->anctag == 0 && parent->status == syck_lvl_map && lvl->ncount == 0 ) {
-                lvl->spaces = parent->spaces;
-            }
-
-            /* seq-in-seq shortcut */
-            else if ( lvl->anctag == 0 && parent->status == syck_lvl_seq && lvl->ncount == 0 ) {
-                int spcs = ( lvl->spaces - parent->spaces ) - 2;
-                if ( spcs >= 0 ) {
-                    int i = 0;
-                    for ( i = 0; i < spcs; i++ ) {
-                        syck_emitter_write( e, " ", 1 );
-                    }
-                    syck_emitter_write( e, "- ", 2 );
-                    break;
-                }
-            }
-
-            syck_emit_indent( e );
-            syck_emitter_write( e, "- ", 2 );
-        }
-        break;
-
-        case syck_lvl_iseq:
-        {
-            if ( lvl->ncount > 0 ) {
-                syck_emitter_write( e, ", ", 2 );
-            }
-        }
-        break;
-
-        case syck_lvl_map:
-        {
-            SyckLevel *parent = syck_emitter_parent_level( e );
-
-            /* map-in-seq shortcut */
-            if ( lvl->anctag == 0 && parent->status == syck_lvl_seq && lvl->ncount == 0 ) {
-                int spcs = ( lvl->spaces - parent->spaces ) - 2;
-                if ( spcs >= 0 ) {
-                    int i = 0;
-                    for ( i = 0; i < spcs; i++ ) {
-                        syck_emitter_write( e, " ", 1 );
-                    }
-                    break;
-                }
-            }
-
-            if ( lvl->ncount % 2 == 0 ) {
-                syck_emit_indent( e );
-            } else {
-                syck_emitter_write( e, ": ", 2 );
-            }
-        }
-        break;
-
-        case syck_lvl_mapx:
-        {
-            if ( lvl->ncount % 2 == 0 ) {
-                syck_emit_indent( e );
-                lvl->status = syck_lvl_map;
-            } else {
-                int i;
-                if ( lvl->spaces > 0 ) {
-                    char *spcs = S_ALLOC_N( char, lvl->spaces + 1 );
-
-                    spcs[lvl->spaces] = '\0';
-                    for ( i = 0; i < lvl->spaces; i++ ) spcs[i] = ' ';
-                    syck_emitter_write( e, spcs, lvl->spaces );
-                    S_FREE( spcs );
-                }
-                syck_emitter_write( e, ": ", 2 );
-            }
-        }
-        break;
-
-        case syck_lvl_imap:
-        {
-            if ( lvl->ncount > 0 ) {
-                if ( lvl->ncount % 2 == 0 ) {
-                    syck_emitter_write( e, ", ", 2 );
-                } else {
-                    syck_emitter_write( e, ": ", 2 );
-                }
-            }
-        }
-        break;
-
-        default: break;
-    }
-    lvl->ncount++;
-
-    syck_emit( e, n );
-}
-
-/*
- * Closes emission of a collection.
- */
-void syck_emit_end( SyckEmitter *e )
-{
-    SyckLevel *lvl = syck_emitter_current_level( e );
-    SyckLevel *parent = syck_emitter_parent_level( e );
-    switch ( lvl->status )
-    {
-        case syck_lvl_seq:
-            if ( lvl->ncount == 0 ) {
-                syck_emitter_write( e, "[]\n", 3 );
-            } else if ( parent->status == syck_lvl_mapx ) {
-                syck_emitter_write( e, "\n", 1 );
-            }
-        break;
-
-        case syck_lvl_iseq:
-            syck_emitter_write( e, "]\n", 1 );
-        break;
-
-        case syck_lvl_map:
-            if ( lvl->ncount == 0 ) {
-                syck_emitter_write( e, "{}\n", 3 );
-            } else if ( lvl->ncount % 2 == 1 ) {
-                syck_emitter_write( e, ":\n", 1 );
-            } else if ( parent->status == syck_lvl_mapx ) {
-                syck_emitter_write( e, "\n", 1 );
-            }
-        break;
-
-        case syck_lvl_imap:
-            syck_emitter_write( e, "}\n", 1 );
-        break;
-
-        default: break;
-    }
-}
-
-/*
- * Fill markers table with emitter nodes in the
- * soon-to-be-emitted tree.
- */
-SYMID
-syck_emitter_mark_node( SyckEmitter *e, st_data_t n )
-{
-    SYMID oid = 0;
-    char *anchor_name = NULL;
-
-    /*
-     * Ensure markers table is initialized.
-     */
-    if ( e->markers == NULL )
-    {
-        e->markers = st_init_numtable();
-    }
-
-    /*
-     * Markers table initially marks the string position of the
-     * object.  Doesn't yet create an anchor, simply notes the
-     * position.
-     */
-    if ( ! st_lookup( e->markers, n, (st_data_t *)&oid ) )
-    {
-        /*
-         * Store all markers
-         */
-        oid = e->markers->num_entries + 1;
-        st_insert( e->markers, n, (st_data_t)oid );
-    }
-    else
-    {
-        if ( e->anchors == NULL )
-        {
-            e->anchors = st_init_numtable();
-        }
-
-        if ( ! st_lookup( e->anchors, (st_data_t)oid, (void *)&anchor_name ) )
-        {
-            int idx = 0;
-            const char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );
-
-            /*
-             * Second time hitting this object, let's give it an anchor
-             */
-            idx = (int)(e->anchors->num_entries + 1);
-            anchor_name = S_ALLOC_N( char, strlen( anc ) + 10 );
-            S_MEMZERO( anchor_name, char, strlen( anc ) + 10 );
-            sprintf( anchor_name, anc, idx );
-
-            /*
-             * Insert into anchors table
-             */
-            st_insert( e->anchors, (st_data_t)oid, (st_data_t)anchor_name );
-        }
-    }
-    return oid;
-}
-
diff --git a/ext/syck/extconf.rb b/ext/syck/extconf.rb
deleted file mode 100644
index 6c10448c70..0000000000
--- a/ext/syck/extconf.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'mkmf'
-
-have_header( "st.h" )
-create_makefile( "syck" )
-
diff --git a/ext/syck/gram.c b/ext/syck/gram.c
deleted file mode 100644
index 8fe4e4f3b5..0000000000
--- a/ext/syck/gram.c
+++ /dev/null
@@ -1,1894 +0,0 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 1
-
-/* Using locations.  */
-#define YYLSP_NEEDED 0
-
-/* If NAME_PREFIX is specified substitute the variables and functions
-   names.  */
-#define yyparse syckparse
-#define yylex   sycklex
-#define yyerror syckerror
-#define yylval  sycklval
-#define yychar  syckchar
-#define yydebug syckdebug
-#define yynerrs sycknerrs
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     YAML_ANCHOR = 258,
-     YAML_ALIAS = 259,
-     YAML_TRANSFER = 260,
-     YAML_TAGURI = 261,
-     YAML_ITRANSFER = 262,
-     YAML_WORD = 263,
-     YAML_PLAIN = 264,
-     YAML_BLOCK = 265,
-     YAML_DOCSEP = 266,
-     YAML_IOPEN = 267,
-     YAML_INDENT = 268,
-     YAML_IEND = 269
-   };
-#endif
-#define YAML_ANCHOR 258
-#define YAML_ALIAS 259
-#define YAML_TRANSFER 260
-#define YAML_TAGURI 261
-#define YAML_ITRANSFER 262
-#define YAML_WORD 263
-#define YAML_PLAIN 264
-#define YAML_BLOCK 265
-#define YAML_DOCSEP 266
-#define YAML_IOPEN 267
-#define YAML_INDENT 268
-#define YAML_IEND 269
-
-
-
-
-/* Copy the first part of user declarations.  */
-#line 14 "gram.y"
-
-
-#include "syck.h"
-
-void apply_seq_in_map( SyckParser *parser, SyckNode *n );
-
-#define YYPARSE_PARAM   parser
-#define YYLEX_PARAM     parser
-
-#define NULL_NODE(parser, node) \
-        SyckNode *node = syck_new_str( "", scalar_plain ); \
-        if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
-        { \
-            node->type_id = syck_taguri( YAML_DOMAIN, "null", 4 ); \
-        } \
-        else \
-        { \
-            node->type_id = syck_strndup( "null", 4 ); \
-        }
-
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 35 "gram.y"
-typedef union YYSTYPE {
-    SYMID nodeId;
-    SyckNode *nodeData;
-    char *name;
-} YYSTYPE;
-/* Line 191 of yacc.c.  */
-#line 140 "gram.c"
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-/* Copy the second part of user declarations.  */
-
-
-/* Line 214 of yacc.c.  */
-#line 152 "gram.c"
-
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
-
-# ifndef YYFREE
-#  define YYFREE free
-# endif
-# ifndef YYMALLOC
-#  define YYMALLOC malloc
-# endif
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   define YYSTACK_ALLOC alloca
-#  endif
-# else
-#  if defined (alloca) || defined (_ALLOCA_H)
-#   define YYSTACK_ALLOC alloca
-#  else
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
-#  endif
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-# endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
-
-
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short int yyss;
-  YYSTYPE yyvs;
-  };
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
-      + YYSTACK_GAP_MAXIMUM)
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  register YYSIZE_T yyi;		\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (0)
-#  endif
-# endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (0)
-
-#endif
-
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short int yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL  52
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   396
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  23
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  29
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  79
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  128
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   269
-
-#define YYTRANSLATE(YYX) 						\
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,    21,    15,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    16,     2,
-       2,     2,     2,    22,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    17,     2,    18,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    19,     2,    20,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14
-};
-
-#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const unsigned char yyprhs[] =
-{
-       0,     0,     3,     5,     8,     9,    11,    13,    15,    18,
-      21,    24,    28,    30,    32,    36,    37,    40,    43,    46,
-      49,    51,    54,    56,    58,    60,    63,    66,    69,    72,
-      75,    77,    79,    81,    85,    87,    89,    91,    93,    95,
-      99,   103,   106,   110,   113,   117,   120,   124,   127,   129,
-     133,   136,   140,   143,   145,   149,   151,   153,   157,   161,
-     165,   168,   172,   175,   179,   182,   184,   188,   190,   194,
-     196,   200,   204,   207,   211,   215,   218,   220,   224,   226
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yysigned_char yyrhs[] =
-{
-      24,     0,    -1,    25,    -1,    11,    27,    -1,    -1,    33,
-      -1,    26,    -1,    34,    -1,     5,    26,    -1,     6,    26,
-      -1,     3,    26,    -1,    29,    26,    32,    -1,    25,    -1,
-      28,    -1,    29,    28,    30,    -1,    -1,     7,    28,    -1,
-       5,    28,    -1,     6,    28,    -1,     3,    28,    -1,    12,
-      -1,    29,    13,    -1,    14,    -1,    13,    -1,    14,    -1,
-      31,    32,    -1,     5,    33,    -1,     6,    33,    -1,     7,
-      33,    -1,     3,    33,    -1,     4,    -1,     8,    -1,     9,
-      -1,    29,    33,    32,    -1,    10,    -1,    35,    -1,    39,
-      -1,    42,    -1,    49,    -1,    29,    37,    30,    -1,    29,
-      38,    30,    -1,    15,    27,    -1,     5,    31,    38,    -1,
-       5,    37,    -1,     6,    31,    38,    -1,     6,    37,    -1,
-       3,    31,    38,    -1,     3,    37,    -1,    36,    -1,    38,
-      31,    36,    -1,    38,    31,    -1,    17,    40,    18,    -1,
-      17,    18,    -1,    41,    -1,    40,    21,    41,    -1,    25,
-      -1,    48,    -1,    29,    43,    30,    -1,    29,    47,    30,
-      -1,     5,    31,    47,    -1,     5,    43,    -1,     6,    31,
-      47,    -1,     6,    43,    -1,     3,    31,    47,    -1,     3,
-      43,    -1,    33,    -1,    22,    25,    31,    -1,    27,    -1,
-      44,    16,    45,    -1,    46,    -1,    47,    31,    36,    -1,
-      47,    31,    46,    -1,    47,    31,    -1,    25,    16,    27,
-      -1,    19,    50,    20,    -1,    19,    20,    -1,    51,    -1,
-      50,    21,    51,    -1,    25,    -1,    48,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
-{
-       0,    56,    56,    60,    65,    70,    71,    74,    75,    80,
-      85,    94,   100,   101,   104,   109,   113,   121,   126,   131,
-     145,   146,   149,   152,   155,   156,   164,   169,   174,   182,
-     186,   194,   207,   208,   218,   219,   220,   221,   222,   228,
-     232,   238,   244,   249,   254,   259,   264,   268,   274,   278,
-     283,   292,   296,   302,   306,   313,   314,   320,   325,   332,
-     337,   342,   347,   352,   356,   362,   363,   369,   379,   396,
-     397,   409,   417,   426,   434,   438,   444,   445,   454,   461
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "YAML_ANCHOR", "YAML_ALIAS",
-  "YAML_TRANSFER", "YAML_TAGURI", "YAML_ITRANSFER", "YAML_WORD",
-  "YAML_PLAIN", "YAML_BLOCK", "YAML_DOCSEP", "YAML_IOPEN", "YAML_INDENT",
-  "YAML_IEND", "'-'", "':'", "'['", "']'", "'{'", "'}'", "','", "'?'",
-  "$accept", "doc", "atom", "ind_rep", "atom_or_empty", "empty",
-  "indent_open", "indent_end", "indent_sep", "indent_flex_end", "word_rep",
-  "struct_rep", "implicit_seq", "basic_seq", "top_imp_seq",
-  "in_implicit_seq", "inline_seq", "in_inline_seq", "inline_seq_atom",
-  "implicit_map", "top_imp_map", "complex_key", "complex_value",
-  "complex_mapping", "in_implicit_map", "basic_mapping", "inline_map",
-  "in_inline_map", "inline_map_atom", 0
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,    45,    58,    91,    93,   123,
-     125,    44,    63
-};
-# endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
-{
-       0,    23,    24,    24,    24,    25,    25,    26,    26,    26,
-      26,    26,    27,    27,    28,    28,    28,    28,    28,    28,
-      29,    29,    30,    31,    32,    32,    33,    33,    33,    33,
-      33,    33,    33,    33,    34,    34,    34,    34,    34,    35,
-      35,    36,    37,    37,    37,    37,    37,    37,    38,    38,
-      38,    39,    39,    40,    40,    41,    41,    42,    42,    43,
-      43,    43,    43,    43,    43,    44,    44,    45,    46,    47,
-      47,    47,    47,    48,    49,    49,    50,    50,    51,    51
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
-{
-       0,     2,     1,     2,     0,     1,     1,     1,     2,     2,
-       2,     3,     1,     1,     3,     0,     2,     2,     2,     2,
-       1,     2,     1,     1,     1,     2,     2,     2,     2,     2,
-       1,     1,     1,     3,     1,     1,     1,     1,     1,     3,
-       3,     2,     3,     2,     3,     2,     3,     2,     1,     3,
-       2,     3,     2,     1,     3,     1,     1,     3,     3,     3,
-       2,     3,     2,     3,     2,     1,     3,     1,     3,     1,
-       3,     3,     2,     3,     3,     2,     1,     3,     1,     1
-};
-
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const unsigned char yydefact[] =
-{
-       4,     0,    30,     0,     0,     0,    31,    32,    34,    15,
-      20,     0,     0,     0,     2,     6,     0,     5,     7,    35,
-      36,    37,    38,    10,    29,     8,    26,     9,    27,     0,
-       0,     0,     0,    28,    15,    15,    15,    15,    12,     3,
-      13,    15,    52,    55,     0,    53,    56,    75,    78,    79,
-       0,    76,     1,     0,     0,     0,    21,    15,     0,     0,
-      65,    48,     0,     0,     0,     0,    69,     0,     0,    19,
-      17,    18,    15,    15,    15,    16,    15,    15,    15,    15,
-       0,    15,    51,     0,    74,     0,    23,     0,    47,    64,
-       0,    43,    60,     0,    45,    62,    41,     0,    24,     0,
-      11,    33,    22,    39,    40,    50,    57,    15,    58,    72,
-      14,    73,    54,    77,    65,    46,    63,    42,    59,    44,
-      61,    66,    25,    49,    67,    68,    70,    71
-};
-
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yysigned_char yydefgoto[] =
-{
-      -1,    13,    38,    15,    39,    40,    16,   103,    99,   101,
-      17,    18,    19,    61,    62,    63,    20,    44,    45,    21,
-      64,    65,   125,    66,    67,    46,    22,    50,    51
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -97
-static const short int yypact[] =
-{
-     250,   318,   -97,   318,   318,   374,   -97,   -97,   -97,   335,
-     -97,   267,   232,     7,   -97,   -97,   192,   -97,   -97,   -97,
-     -97,   -97,   -97,   -97,   -97,   -97,   -97,   -97,   -97,   374,
-     374,   374,   352,   -97,   335,   335,   335,   384,   -97,   -97,
-     -97,   212,   -97,    10,     0,   -97,   -97,   -97,    10,   -97,
-      -4,   -97,   -97,   284,   284,   284,   -97,   335,   318,    30,
-      30,   -97,    -2,    36,    -2,    16,   -97,    36,    30,   -97,
-     -97,   -97,   384,   384,   384,   -97,   363,   301,   301,   301,
-      -2,   335,   -97,   318,   -97,   318,   -97,   158,   -97,   -97,
-     158,   -97,   -97,   158,   -97,   -97,   -97,    24,   -97,    30,
-     -97,   -97,   -97,   -97,   -97,    26,   -97,   335,   -97,   158,
-     -97,   -97,   -97,   -97,   -97,    24,    24,    24,    24,    24,
-      24,   -97,   -97,   -97,   -97,   -97,   -97,   -97
-};
-
-/* YYPGOTO[NTERM-NUM].  */
-static const yysigned_char yypgoto[] =
-{
-     -97,   -97,     8,    81,   -56,   109,    33,   -53,    74,   -54,
-      -1,   -97,   -97,   -96,   -31,   -32,   -97,   -97,   -44,   -97,
-      77,   -97,   -97,   -52,     9,    -6,   -97,   -97,   -29
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -1
-static const unsigned char yytable[] =
-{
-      24,    96,    26,    28,    33,   100,    49,    52,    14,   123,
-     104,   106,   102,   126,   108,    60,    84,    85,    82,    43,
-      48,    83,    88,    91,    94,   111,    81,   110,    24,    26,
-      28,    68,   107,    24,    26,    28,    33,    86,    32,   112,
-      60,    57,    41,    86,    98,   122,    88,    91,    94,    86,
-     102,   124,    24,    26,    28,   115,   113,   127,   117,     0,
-       0,   119,    32,    32,    32,    32,    97,    41,    41,    41,
-      76,    24,    26,    28,    41,    68,    24,    26,    28,    49,
-       0,     0,    23,     0,    25,    27,   114,     0,     0,   114,
-      41,    43,   114,    48,     0,     0,   116,    59,     0,   118,
-       0,     0,   120,     0,     0,    76,    76,    76,   114,    76,
-      41,    41,    41,     0,    41,    23,    25,    27,     0,     0,
-      32,     0,    59,    32,     0,     0,    32,    87,    90,    93,
-      89,    92,    95,     0,    23,    25,    27,   105,     0,     0,
-      41,   109,    32,    69,    70,    71,    75,     0,     0,     0,
-      80,    87,    90,    93,    89,    92,    95,     0,    23,    25,
-      27,    29,     2,    30,    31,     5,     6,     7,     0,     0,
-      10,   121,     0,    57,     0,     0,     0,     0,     0,     0,
-      58,    69,    70,    71,     0,    80,    69,    70,    71,   105,
-     109,   105,   109,   105,   109,    53,     2,    54,    55,     5,
-       6,     7,     8,     0,    10,    56,     0,    57,     0,    11,
-       0,    12,     0,     0,    58,    77,     2,    78,    79,    37,
-       6,     7,     8,     0,    10,    56,     0,    57,     0,    11,
-       0,    12,     0,     0,    58,     1,     2,     3,     4,     5,
-       6,     7,     8,     0,    10,     0,     0,     0,     0,    11,
-       0,    12,    47,     1,     2,     3,     4,     5,     6,     7,
-       8,     9,    10,     0,     0,     0,     0,    11,     0,    12,
-       1,     2,     3,     4,     5,     6,     7,     8,     0,    10,
-       0,     0,     0,     0,    11,    42,    12,    53,     2,    54,
-      55,     5,     6,     7,     8,     0,    10,    86,     0,     0,
-       0,    11,     0,    12,    77,     2,    78,    79,    37,     6,
-       7,     8,     0,    10,    86,     0,     0,     0,    11,     0,
-      12,     1,     2,     3,     4,     5,     6,     7,     8,     0,
-      10,     0,     0,     0,     0,    11,     0,    12,    34,     2,
-      35,    36,    37,     6,     7,     8,     0,    10,     0,     0,
-       0,     0,    11,     0,    12,    29,     2,    30,    31,     5,
-       6,     7,     0,     0,    10,    56,    72,     2,    73,    74,
-      37,     6,     7,     0,     0,    10,    56,    29,     2,    30,
-      31,     5,     6,     7,     0,     0,    10,    72,     2,    73,
-      74,    37,     6,     7,     0,     0,    10
-};
-
-static const yysigned_char yycheck[] =
-{
-       1,    57,     3,     4,     5,    59,    12,     0,     0,   105,
-      63,    64,    14,   109,    67,    16,    20,    21,    18,    11,
-      12,    21,    53,    54,    55,    81,    16,    80,    29,    30,
-      31,    32,    16,    34,    35,    36,    37,    13,     5,    83,
-      41,    15,     9,    13,    14,    99,    77,    78,    79,    13,
-      14,   107,    53,    54,    55,    87,    85,   109,    90,    -1,
-      -1,    93,    29,    30,    31,    32,    58,    34,    35,    36,
-      37,    72,    73,    74,    41,    76,    77,    78,    79,    85,
-      -1,    -1,     1,    -1,     3,     4,    87,    -1,    -1,    90,
-      57,    83,    93,    85,    -1,    -1,    87,    16,    -1,    90,
-      -1,    -1,    93,    -1,    -1,    72,    73,    74,   109,    76,
-      77,    78,    79,    -1,    81,    34,    35,    36,    -1,    -1,
-      87,    -1,    41,    90,    -1,    -1,    93,    53,    54,    55,
-      53,    54,    55,    -1,    53,    54,    55,    63,    -1,    -1,
-     107,    67,   109,    34,    35,    36,    37,    -1,    -1,    -1,
-      41,    77,    78,    79,    77,    78,    79,    -1,    77,    78,
-      79,     3,     4,     5,     6,     7,     8,     9,    -1,    -1,
-      12,    97,    -1,    15,    -1,    -1,    -1,    -1,    -1,    -1,
-      22,    72,    73,    74,    -1,    76,    77,    78,    79,   115,
-     116,   117,   118,   119,   120,     3,     4,     5,     6,     7,
-       8,     9,    10,    -1,    12,    13,    -1,    15,    -1,    17,
-      -1,    19,    -1,    -1,    22,     3,     4,     5,     6,     7,
-       8,     9,    10,    -1,    12,    13,    -1,    15,    -1,    17,
-      -1,    19,    -1,    -1,    22,     3,     4,     5,     6,     7,
-       8,     9,    10,    -1,    12,    -1,    -1,    -1,    -1,    17,
-      -1,    19,    20,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    -1,    -1,    -1,    -1,    17,    -1,    19,
-       3,     4,     5,     6,     7,     8,     9,    10,    -1,    12,
-      -1,    -1,    -1,    -1,    17,    18,    19,     3,     4,     5,
-       6,     7,     8,     9,    10,    -1,    12,    13,    -1,    -1,
-      -1,    17,    -1,    19,     3,     4,     5,     6,     7,     8,
-       9,    10,    -1,    12,    13,    -1,    -1,    -1,    17,    -1,
-      19,     3,     4,     5,     6,     7,     8,     9,    10,    -1,
-      12,    -1,    -1,    -1,    -1,    17,    -1,    19,     3,     4,
-       5,     6,     7,     8,     9,    10,    -1,    12,    -1,    -1,
-      -1,    -1,    17,    -1,    19,     3,     4,     5,     6,     7,
-       8,     9,    -1,    -1,    12,    13,     3,     4,     5,     6,
-       7,     8,     9,    -1,    -1,    12,    13,     3,     4,     5,
-       6,     7,     8,     9,    -1,    -1,    12,     3,     4,     5,
-       6,     7,     8,     9,    -1,    -1,    12
-};
-
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
-{
-       0,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    17,    19,    24,    25,    26,    29,    33,    34,    35,
-      39,    42,    49,    26,    33,    26,    33,    26,    33,     3,
-       5,     6,    29,    33,     3,     5,     6,     7,    25,    27,
-      28,    29,    18,    25,    40,    41,    48,    20,    25,    48,
-      50,    51,     0,     3,     5,     6,    13,    15,    22,    26,
-      33,    36,    37,    38,    43,    44,    46,    47,    33,    28,
-      28,    28,     3,     5,     6,    28,    29,     3,     5,     6,
-      28,    16,    18,    21,    20,    21,    13,    31,    37,    43,
-      31,    37,    43,    31,    37,    43,    27,    25,    14,    31,
-      32,    32,    14,    30,    30,    31,    30,    16,    30,    31,
-      30,    27,    41,    51,    33,    38,    47,    38,    47,    38,
-      47,    31,    32,    36,    27,    45,    36,    46
-};
-
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-
-#define YYFAIL		goto yyerrlab
-
-#define YYRECOVERING()  (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");\
-      YYERROR;							\
-    }								\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
-
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)		\
-   ((Current).first_line   = (Rhs)[1].first_line,	\
-    (Current).first_column = (Rhs)[1].first_column,	\
-    (Current).last_line    = (Rhs)[N].last_line,	\
-    (Current).last_column  = (Rhs)[N].last_column)
-#endif
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval)
-#endif
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (0)
-
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} while (0)
-
-# define YYDSYMPRINTF(Title, Token, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
-                  Token, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (0)
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_stack_print (short int *bottom, short int *top)
-#else
-static void
-yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
-#endif
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (0)
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_reduce_print (int yyrule)
-#else
-static void
-yy_reduce_print (yyrule)
-    int yyrule;
-#endif
-{
-  int yyi;
-  unsigned int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
-}
-
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (Rule);		\
-} while (0)
-
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
-yystrlen (const char *yystr)
-#   else
-yystrlen (yystr)
-     const char *yystr;
-#   endif
-{
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
-    continue;
-
-  return yys - yystr - 1;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-#   if defined (__STDC__) || defined (__cplusplus)
-yystpcpy (char *yydest, const char *yysrc)
-#   else
-yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
-{
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-#endif /* !YYERROR_VERBOSE */
-
-
-
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-
-  if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-    }
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
-  switch (yytype)
-    {
-      default:
-        break;
-    }
-  YYFPRINTF (yyoutput, ")");
-}
-
-#endif /* ! YYDEBUG */
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yytype, yyvaluep)
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-
-  switch (yytype)
-    {
-
-      default:
-        break;
-    }
-}
-
-
-/* Prevent warnings from -Wmissing-prototypes.  */
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM);
-# else
-int yyparse ();
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
-
-
-
-
-/*----------.
-| yyparse.  |
-`----------*/
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int
-yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
-{
-  /* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-
-/* Number of syntax errors so far.  */
-int yynerrs;
-
-  register int yystate;
-  register int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  register short int *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
-
-
-
-#define YYPOPSTACK   (yyvsp--, yyssp--)
-
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
-
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
-  int yylen;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss;
-  yyvsp = yyvs;
-
-
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
-
-  if (yyss + yystacksize - 1 <= yyssp)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      {
-	/* Give user a chance to reallocate the stack. Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
-
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-
-		    &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
-# else
-      /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-	goto yyoverflowlab;
-      yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
-
-      {
-	short int *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyoverflowlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
-#  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
-
-      if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
-    }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
-  goto yybackup;
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
-    }
-
-  if (yychar <= YYEOF)
-    {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
-    }
-
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-    goto yydefault;
-  yyn = yytable[yyn];
-  if (yyn <= 0)
-    {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-        case 2:
-#line 57 "gram.y"
-    {
-           ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
-        }
-    break;
-
-  case 3:
-#line 61 "gram.y"
-    {
-           ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
-        }
-    break;
-
-  case 4:
-#line 65 "gram.y"
-    {
-           ((SyckParser *)parser)->eof = 1;
-        }
-    break;
-
-  case 8:
-#line 76 "gram.y"
-    {
-            syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-            yyval.nodeData = yyvsp[0].nodeData;
-        }
-    break;
-
-  case 9:
-#line 81 "gram.y"
-    {
-            syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-            yyval.nodeData = yyvsp[0].nodeData;
-        }
-    break;
-
-  case 10:
-#line 86 "gram.y"
-    {
-           /*
-            * _Anchors_: The language binding must keep a separate symbol table
-            * for anchors.  The actual ID in the symbol table is returned to the
-            * higher nodes, though.
-            */
-           yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
-        }
-    break;
-
-  case 11:
-#line 95 "gram.y"
-    {
-           yyval.nodeData = yyvsp[-1].nodeData;
-        }
-    break;
-
-  case 14:
-#line 105 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 15:
-#line 109 "gram.y"
-    {
-                    NULL_NODE( parser, n );
-                    yyval.nodeData = n;
-                }
-    break;
-
-  case 16:
-#line 114 "gram.y"
-    {
-                   if ( ((SyckParser *)parser)->implicit_typing == 1 )
-                   {
-                      try_tag_implicit( yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                   }
-                   yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 17:
-#line 122 "gram.y"
-    {
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 18:
-#line 127 "gram.y"
-    {
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 19:
-#line 132 "gram.y"
-    {
-                   /*
-                    * _Anchors_: The language binding must keep a separate symbol table
-                    * for anchors.  The actual ID in the symbol table is returned to the
-                    * higher nodes, though.
-                    */
-                   yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 26:
-#line 165 "gram.y"
-    {
-               syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-               yyval.nodeData = yyvsp[0].nodeData;
-            }
-    break;
-
-  case 27:
-#line 170 "gram.y"
-    {
-               syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-               yyval.nodeData = yyvsp[0].nodeData;
-            }
-    break;
-
-  case 28:
-#line 175 "gram.y"
-    {
-               if ( ((SyckParser *)parser)->implicit_typing == 1 )
-               {
-                  try_tag_implicit( yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-               }
-               yyval.nodeData = yyvsp[0].nodeData;
-            }
-    break;
-
-  case 29:
-#line 183 "gram.y"
-    {
-               yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
-            }
-    break;
-
-  case 30:
-#line 187 "gram.y"
-    {
-               /*
-                * _Aliases_: The anchor symbol table is scanned for the anchor name.
-                * The anchor's ID in the language's symbol table is returned.
-                */
-               yyval.nodeData = syck_hdlr_get_anchor( (SyckParser *)parser, yyvsp[0].name );
-            }
-    break;
-
-  case 31:
-#line 195 "gram.y"
-    {
-               SyckNode *n = yyvsp[0].nodeData;
-               if ( ((SyckParser *)parser)->taguri_expansion == 1 )
-               {
-                   n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
-               }
-               else
-               {
-                   n->type_id = syck_strndup( "str", 3 );
-               }
-               yyval.nodeData = n;
-            }
-    break;
-
-  case 33:
-#line 209 "gram.y"
-    {
-               yyval.nodeData = yyvsp[-1].nodeData;
-            }
-    break;
-
-  case 39:
-#line 229 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 40:
-#line 233 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 41:
-#line 239 "gram.y"
-    {
-                    yyval.nodeId = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 42:
-#line 245 "gram.y"
-    {
-                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 43:
-#line 250 "gram.y"
-    {
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 44:
-#line 255 "gram.y"
-    {
-                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 45:
-#line 260 "gram.y"
-    {
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 46:
-#line 265 "gram.y"
-    {
-                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 47:
-#line 269 "gram.y"
-    {
-                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 48:
-#line 275 "gram.y"
-    {
-                    yyval.nodeData = syck_new_seq( yyvsp[0].nodeId );
-                }
-    break;
-
-  case 49:
-#line 279 "gram.y"
-    {
-                    syck_seq_add( yyvsp[-2].nodeData, yyvsp[0].nodeId );
-                    yyval.nodeData = yyvsp[-2].nodeData;
-				}
-    break;
-
-  case 50:
-#line 284 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-				}
-    break;
-
-  case 51:
-#line 293 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 52:
-#line 297 "gram.y"
-    {
-                    yyval.nodeData = syck_alloc_seq();
-                }
-    break;
-
-  case 53:
-#line 303 "gram.y"
-    {
-                    yyval.nodeData = syck_new_seq( syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
-                }
-    break;
-
-  case 54:
-#line 307 "gram.y"
-    {
-                    syck_seq_add( yyvsp[-2].nodeData, syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
-                    yyval.nodeData = yyvsp[-2].nodeData;
-				}
-    break;
-
-  case 57:
-#line 321 "gram.y"
-    {
-                    apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 58:
-#line 326 "gram.y"
-    {
-                    apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 59:
-#line 333 "gram.y"
-    {
-                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 60:
-#line 338 "gram.y"
-    {
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 61:
-#line 343 "gram.y"
-    {
-                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 62:
-#line 348 "gram.y"
-    {
-                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
-                    yyval.nodeData = yyvsp[0].nodeData;
-                }
-    break;
-
-  case 63:
-#line 353 "gram.y"
-    {
-                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 64:
-#line 357 "gram.y"
-    {
-                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
-                }
-    break;
-
-  case 66:
-#line 364 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 68:
-#line 380 "gram.y"
-    {
-                    yyval.nodeData = syck_new_map(
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ),
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
-                }
-    break;
-
-  case 70:
-#line 398 "gram.y"
-    {
-                    if ( yyvsp[-2].nodeData->shortcut == NULL )
-                    {
-                        yyvsp[-2].nodeData->shortcut = syck_new_seq( yyvsp[0].nodeId );
-                    }
-                    else
-                    {
-                        syck_seq_add( yyvsp[-2].nodeData->shortcut, yyvsp[0].nodeId );
-                    }
-                    yyval.nodeData = yyvsp[-2].nodeData;
-                }
-    break;
-
-  case 71:
-#line 410 "gram.y"
-    {
-                    apply_seq_in_map( (SyckParser *)parser, yyvsp[-2].nodeData );
-                    syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
-                    syck_free_node( yyvsp[0].nodeData );
-                    yyvsp[0].nodeData = NULL;
-                    yyval.nodeData = yyvsp[-2].nodeData;
-                }
-    break;
-
-  case 72:
-#line 418 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 73:
-#line 427 "gram.y"
-    {
-                    yyval.nodeData = syck_new_map(
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ),
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
-                }
-    break;
-
-  case 74:
-#line 435 "gram.y"
-    {
-                    yyval.nodeData = yyvsp[-1].nodeData;
-                }
-    break;
-
-  case 75:
-#line 439 "gram.y"
-    {
-                    yyval.nodeData = syck_alloc_map();
-                }
-    break;
-
-  case 77:
-#line 446 "gram.y"
-    {
-                    syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
-                    syck_free_node( yyvsp[0].nodeData );
-                    yyvsp[0].nodeData = NULL;
-                    yyval.nodeData = yyvsp[-2].nodeData;
-				}
-    break;
-
-  case 78:
-#line 455 "gram.y"
-    {
-                    NULL_NODE( parser, n );
-                    yyval.nodeData = syck_new_map(
-                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ),
-                        syck_hdlr_add_node( (SyckParser *)parser, n ) );
-                }
-    break;
-
-
-    }
-
-/* Line 1010 of yacc.c.  */
-#line 1651 "gram.c"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-
-
-  YY_STACK_PRINT (yyss, yyssp);
-
-  *++yyvsp = yyval;
-
-
-  /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
-
-  goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  int yytype = YYTRANSLATE (yychar);
-	  const char* yyprefix;
-	  char *yymsg;
-	  int yyx;
-
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yycount = 0;
-
-	  yyprefix = ", expecting ";
-	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      {
-		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
-		yycount += 1;
-		if (yycount == 5)
-		  {
-		    yysize = 0;
-		    break;
-		  }
-	      }
-	  yysize += (sizeof ("syntax error, unexpected ")
-		     + yystrlen (yytname[yytype]));
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
-
-	      if (yycount < 5)
-		{
-		  yyprefix = ", expecting ";
-		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			yyp = yystpcpy (yyp, yyprefix);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yyprefix = " or ";
-		      }
-		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
-    }
-
-
-
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
-
-      if (yychar <= YYEOF)
-        {
-          /* If at end of input, pop the error token,
-	     then the rest of the stack, then return failure.  */
-	  if (yychar == YYEOF)
-	     for (;;)
-	       {
-		 YYPOPSTACK;
-		 if (yyssp == yyss)
-		   YYABORT;
-		 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-		 yydestruct (yystos[*yyssp], yyvsp);
-	       }
-        }
-      else
-	{
-	  YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-	  yydestruct (yytoken, &yylval);
-	  yychar = YYEMPTY;
-
-	}
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
-
-
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-
-#ifdef __GNUC__
-  /* Pacify GCC when the user code never invokes YYERROR and the label
-     yyerrorlab therefore never appears in user code.  */
-  if (0)
-     goto yyerrorlab;
-#endif
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-  yystate = *yyssp;
-  goto yyerrlab1;
-
-
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
-
-  for (;;)
-    {
-      yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
-
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-	YYABORT;
-
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      YYPOPSTACK;
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
-    }
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
-  *++yyvsp = yylval;
-
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-#ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
-  yyresult = 2;
-  /* Fall through.  */
-#endif
-
-yyreturn:
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-  return yyresult;
-}
-
-
-#line 464 "gram.y"
-
-
-void
-apply_seq_in_map( SyckParser *parser, SyckNode *n )
-{
-    long map_len;
-    if ( n->shortcut == NULL )
-    {
-        return;
-    }
-
-    map_len = syck_map_count( n );
-    syck_map_assign( n, map_value, map_len - 1,
-        syck_hdlr_add_node( parser, n->shortcut ) );
-
-    n->shortcut = NULL;
-}
-
-
diff --git a/ext/syck/gram.h b/ext/syck/gram.h
deleted file mode 100644
index 547149ab4b..0000000000
--- a/ext/syck/gram.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     YAML_ANCHOR = 258,
-     YAML_ALIAS = 259,
-     YAML_TRANSFER = 260,
-     YAML_TAGURI = 261,
-     YAML_ITRANSFER = 262,
-     YAML_WORD = 263,
-     YAML_PLAIN = 264,
-     YAML_BLOCK = 265,
-     YAML_DOCSEP = 266,
-     YAML_IOPEN = 267,
-     YAML_INDENT = 268,
-     YAML_IEND = 269
-   };
-#endif
-#define YAML_ANCHOR 258
-#define YAML_ALIAS 259
-#define YAML_TRANSFER 260
-#define YAML_TAGURI 261
-#define YAML_ITRANSFER 262
-#define YAML_WORD 263
-#define YAML_PLAIN 264
-#define YAML_BLOCK 265
-#define YAML_DOCSEP 266
-#define YAML_IOPEN 267
-#define YAML_INDENT 268
-#define YAML_IEND 269
-
-
-
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 35 "gram.y"
-typedef union YYSTYPE {
-    SYMID nodeId;
-    SyckNode *nodeData;
-    char *name;
-} YYSTYPE;
-/* Line 1285 of yacc.c.  */
-#line 71 "gram.h"
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-
-
diff --git a/ext/syck/handler.c b/ext/syck/handler.c
deleted file mode 100644
index 40f5ef27d0..0000000000
--- a/ext/syck/handler.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * handler.c
- *
- * $Author$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-
-#include "ruby/ruby.h"
-#include "syck.h"
-
-SYMID
-syck_hdlr_add_node( SyckParser *p, SyckNode *n )
-{
-    SYMID id;
-
-    if ( ! n->id )
-    {
-        n->id = (p->handler)( p, n );
-    }
-    id = n->id;
-
-    if ( n->anchor == NULL )
-    {
-        syck_free_node( n );
-    }
-    return id;
-}
-
-SyckNode *
-syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
-{
-    SyckNode *ntmp = NULL;
-
-    n->anchor = a;
-    if ( p->bad_anchors != NULL )
-    {
-        SyckNode *bad;
-        if ( st_lookup( p->bad_anchors, (st_data_t)a, (void *)&bad ) )
-        {
-            if ( n->kind != syck_str_kind )
-            {
-                n->id = bad->id;
-                (p->handler)( p, n );
-            }
-        }
-    }
-    if ( p->anchors == NULL )
-    {
-        p->anchors = st_init_strtable();
-    }
-    if ( st_lookup( p->anchors, (st_data_t)a, (void *)&ntmp ) )
-    {
-        if ( ntmp != (void *)1 )
-        {
-            syck_free_node( ntmp );
-        }
-    }
-    st_insert( p->anchors, (st_data_t)a, (st_data_t)n );
-    return n;
-}
-
-void
-syck_hdlr_remove_anchor( SyckParser *p, char *a )
-{
-    char *atmp = a;
-    SyckNode *ntmp;
-    if ( p->anchors == NULL )
-    {
-        p->anchors = st_init_strtable();
-    }
-    if ( st_delete( p->anchors, (void *)&atmp, (void *)&ntmp ) )
-    {
-        if ( ntmp != (void *)1 )
-        {
-            syck_free_node( ntmp );
-        }
-    }
-    st_insert( p->anchors, (st_data_t)a, (st_data_t)1 );
-}
-
-SyckNode *
-syck_hdlr_get_anchor( SyckParser *p, char *a )
-{
-    SyckNode *n = NULL;
-
-    if ( p->anchors != NULL )
-    {
-        if ( st_lookup( p->anchors, (st_data_t)a, (void *)&n ) )
-        {
-            if ( n != (void *)1 )
-            {
-                S_FREE( a );
-                return n;
-            }
-            else
-            {
-                if ( p->bad_anchors == NULL )
-                {
-                    p->bad_anchors = st_init_strtable();
-                }
-                if ( ! st_lookup( p->bad_anchors, (st_data_t)a, (void *)&n ) )
-                {
-                    n = (p->bad_anchor_handler)( p, a );
-                    st_insert( p->bad_anchors, (st_data_t)a, (st_data_t)n );
-                }
-            }
-        }
-    }
-
-    if ( n == NULL )
-    {
-        n = (p->bad_anchor_handler)( p, a );
-    }
-
-    if ( n->anchor )
-    {
-        S_FREE( a );
-    }
-    else
-    {
-        n->anchor = a;
-    }
-
-    return n;
-}
-
-void
-syck_add_transfer( char *uri, SyckNode *n, int taguri )
-{
-    if ( n->type_id != NULL )
-    {
-        S_FREE( n->type_id );
-    }
-
-    if ( taguri == 0 )
-    {
-        n->type_id = uri;
-        return;
-    }
-
-    n->type_id = syck_type_id_to_uri( uri );
-    S_FREE( uri );
-}
-
-char *
-syck_xprivate( const char *type_id, int type_len )
-{
-    char *uri = S_ALLOC_N( char, type_len + 14 );
-    uri[0] = '\0';
-    strcat( uri, "x-private:" );
-    strncat( uri, type_id, type_len );
-    return uri;
-}
-
-char *
-syck_taguri( const char *domain, const char *type_id, int type_len )
-{
-    char *uri = S_ALLOC_N( char, strlen( domain ) + type_len + 14 );
-    uri[0] = '\0';
-    strcat( uri, "tag:" );
-    strcat( uri, domain );
-    strcat( uri, ":" );
-    strncat( uri, type_id, type_len );
-    return uri;
-}
-
-int
-syck_try_implicit( SyckNode *n )
-{
-    return 1;
-}
-
diff --git a/ext/syck/implicit.c b/ext/syck/implicit.c
deleted file mode 100644
index 6911e6175d..0000000000
--- a/ext/syck/implicit.c
+++ /dev/null
@@ -1,2990 +0,0 @@
-/* Generated by re2c 0.9.10 on Mon Sep 19 21:46:50 2005 */
-#line 1 "implicit.re"
-/*
- * implicit.re
- *
- * $Author$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-
-#include "ruby/ruby.h"
-#include "syck.h"
-
-#define YYCTYPE     char
-#define YYCURSOR    cursor
-#define YYMARKER    marker
-#define YYLIMIT     limit
-#define YYFILL(n)   (void)0
-
-void
-try_tag_implicit( SyckNode *n, int taguri )
-{
-    const char *tid = "";
-    switch ( n->kind )
-    {
-        case syck_str_kind:
-            tid = syck_match_implicit( n->data.str->ptr, n->data.str->len );
-        break;
-
-        case syck_seq_kind:
-            tid = "seq";
-        break;
-
-        case syck_map_kind:
-            tid = "map";
-        break;
-    }
-    if ( n->type_id != NULL ) S_FREE( n->type_id );
-    if ( taguri == 1 )
-    {
-        n->type_id = syck_taguri( YAML_DOMAIN, tid, (int)strlen( tid ) );
-    } else {
-        n->type_id = syck_strndup( tid, (int)strlen( tid ) );
-    }
-}
-
-const char *
-syck_match_implicit( const char *str, size_t len )
-{
-    const char *cursor, *limit, *marker = 0;
-    cursor = str;
-    limit = str + len;
-
-
-#line 55 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy0;
-	++YYCURSOR;
-yy0:
-	if((YYLIMIT - YYCURSOR) < 26) YYFILL(26);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy6;
-	case '+':	goto yy16;
-	case '-':	goto yy17;
-	case '.':	goto yy20;
-	case '0':	goto yy18;
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy19;
-	case '<':	goto yy22;
-	case '=':	goto yy21;
-	case 'F':	goto yy15;
-	case 'N':	goto yy5;
-	case 'O':	goto yy13;
-	case 'T':	goto yy11;
-	case 'Y':	goto yy9;
-	case 'f':	goto yy14;
-	case 'n':	goto yy4;
-	case 'o':	goto yy12;
-	case 't':	goto yy10;
-	case 'y':	goto yy8;
-	case '~':	goto yy2;
-	default:	goto yy23;
-	}
-yy2:	++YYCURSOR;
-	if((yych = *YYCURSOR) <= 0x00)	goto yy6;
-	goto yy3;
-yy3:
-#line 123 "implicit.re"
-{   return "str"; }
-#line 100 "<stdout>"
-yy4:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'o':	goto yy172;
-	case 'u':	goto yy200;
-	default:	goto yy3;
-	}
-yy5:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'O':	case 'o':	goto yy172;
-	case 'U':	goto yy195;
-	case 'u':	goto yy196;
-	default:	goto yy3;
-	}
-yy6:	++YYCURSOR;
-	goto yy7;
-yy7:
-#line 85 "implicit.re"
-{   return "null"; }
-#line 121 "<stdout>"
-yy8:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'e':	goto yy194;
-	default:	goto yy3;
-	}
-yy9:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'E':	goto yy192;
-	case 'e':	goto yy193;
-	default:	goto yy3;
-	}
-yy10:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'r':	goto yy190;
-	default:	goto yy3;
-	}
-yy11:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'R':	goto yy186;
-	case 'r':	goto yy187;
-	default:	goto yy3;
-	}
-yy12:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'f':	goto yy185;
-	case 'n':	goto yy182;
-	default:	goto yy3;
-	}
-yy13:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'F':	goto yy180;
-	case 'N':	case 'n':	goto yy182;
-	case 'f':	goto yy181;
-	default:	goto yy3;
-	}
-yy14:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'a':	goto yy177;
-	default:	goto yy3;
-	}
-yy15:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'A':	goto yy168;
-	case 'a':	goto yy169;
-	default:	goto yy3;
-	}
-yy16:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '.':	goto yy167;
-	case '0':	goto yy158;
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy47;
-	default:	goto yy3;
-	}
-yy17:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '.':	goto yy157;
-	case '0':	goto yy158;
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy47;
-	default:	goto yy3;
-	}
-yy18:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x00:	goto yy52;
-	case ',':	goto yy142;
-	case '.':	goto yy50;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':	goto yy140;
-	case '8':
-	case '9':	goto yy141;
-	case ':':	goto yy49;
-	case 'x':	goto yy144;
-	default:	goto yy3;
-	}
-yy19:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x00:	goto yy52;
-	case ',':	goto yy47;
-	case '.':	goto yy50;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy46;
-	case ':':	goto yy49;
-	default:	goto yy3;
-	}
-yy20:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 'I':	goto yy33;
-	case 'N':	goto yy31;
-	case 'i':	goto yy32;
-	case 'n':	goto yy30;
-	default:	goto yy3;
-	}
-yy21:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy28;
-	goto yy3;
-yy22:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '<':	goto yy24;
-	default:	goto yy3;
-	}
-yy23:	yych = *++YYCURSOR;
-	goto yy3;
-yy24:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy26;
-	goto yy25;
-yy25:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy3;
-	}
-yy26:	++YYCURSOR;
-	goto yy27;
-yy27:
-#line 121 "implicit.re"
-{   return "merge"; }
-#line 279 "<stdout>"
-yy28:	++YYCURSOR;
-	goto yy29;
-yy29:
-#line 119 "implicit.re"
-{   return "default"; }
-#line 285 "<stdout>"
-yy30:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'a':	goto yy45;
-	default:	goto yy25;
-	}
-yy31:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'A':	goto yy40;
-	case 'a':	goto yy41;
-	default:	goto yy25;
-	}
-yy32:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'n':	goto yy39;
-	default:	goto yy25;
-	}
-yy33:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'N':	goto yy34;
-	case 'n':	goto yy35;
-	default:	goto yy25;
-	}
-yy34:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'F':	goto yy36;
-	default:	goto yy25;
-	}
-yy35:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy36;
-	default:	goto yy25;
-	}
-yy36:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy37;
-yy37:	++YYCURSOR;
-	goto yy38;
-yy38:
-#line 105 "implicit.re"
-{   return "float#inf"; }
-#line 326 "<stdout>"
-yy39:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy36;
-	default:	goto yy25;
-	}
-yy40:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'N':	goto yy42;
-	default:	goto yy25;
-	}
-yy41:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'N':	goto yy42;
-	default:	goto yy25;
-	}
-yy42:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy43;
-yy43:	++YYCURSOR;
-	goto yy44;
-yy44:
-#line 109 "implicit.re"
-{   return "float#nan"; }
-#line 350 "<stdout>"
-yy45:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'n':	goto yy42;
-	default:	goto yy25;
-	}
-yy46:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy74;
-	default:	goto yy48;
-	}
-yy47:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy48;
-yy48:	switch(yych){
-	case 0x00:	goto yy52;
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy47;
-	case '.':	goto yy50;
-	case ':':	goto yy49;
-	default:	goto yy25;
-	}
-yy49:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':	goto yy66;
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	default:	goto yy25;
-	}
-yy50:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	goto yy51;
-yy51:	switch(yych){
-	case 0x00:	goto yy56;
-	case ',':	goto yy54;
-	case '.':	goto yy58;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy50;
-	case 'E':	case 'e':	goto yy60;
-	default:	goto yy25;
-	}
-yy52:	++YYCURSOR;
-	goto yy53;
-yy53:
-#line 97 "implicit.re"
-{   return "int"; }
-#line 432 "<stdout>"
-yy54:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy55;
-yy55:	switch(yych){
-	case 0x00:	goto yy56;
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy54;
-	default:	goto yy25;
-	}
-yy56:	++YYCURSOR;
-	goto yy57;
-yy57:
-#line 99 "implicit.re"
-{   return "float#fix"; }
-#line 456 "<stdout>"
-yy58:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	goto yy59;
-yy59:	switch(yych){
-	case '.':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy58;
-	case 'E':	case 'e':	goto yy60;
-	default:	goto yy25;
-	}
-yy60:	yych = *++YYCURSOR;
-	switch(yych){
-	case '+':	case '-':	goto yy61;
-	default:	goto yy25;
-	}
-yy61:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy25;
-	goto yy63;
-yy62:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy63;
-yy63:	switch(yych){
-	case 0x00:	goto yy64;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy62;
-	default:	goto yy25;
-	}
-yy64:	++YYCURSOR;
-	goto yy65;
-yy65:
-#line 101 "implicit.re"
-{   return "float#exp"; }
-#line 506 "<stdout>"
-yy66:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy70;
-	case '.':	goto yy68;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	case ':':	goto yy49;
-	default:	goto yy25;
-	}
-yy67:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy70;
-	case '.':	goto yy68;
-	case ':':	goto yy49;
-	default:	goto yy25;
-	}
-yy68:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy69;
-yy69:	switch(yych){
-	case 0x00:	goto yy72;
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy68;
-	default:	goto yy25;
-	}
-yy70:	++YYCURSOR;
-	goto yy71;
-yy71:
-#line 95 "implicit.re"
-{   return "int#base60"; }
-#line 558 "<stdout>"
-yy72:	++YYCURSOR;
-	goto yy73;
-yy73:
-#line 103 "implicit.re"
-{   return "float#base60"; }
-#line 564 "<stdout>"
-yy74:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy75;
-	default:	goto yy48;
-	}
-yy75:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy76;
-	default:	goto yy48;
-	}
-yy76:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy77;
-	default:	goto yy25;
-	}
-yy77:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy78;
-	default:	goto yy25;
-	}
-yy78:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy79;
-	default:	goto yy25;
-	}
-yy79:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy80;
-	default:	goto yy25;
-	}
-yy80:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy81;
-	default:	goto yy25;
-	}
-yy81:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy82;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy25;
-	case 'T':	goto yy84;
-	case 't':	goto yy85;
-	default:	goto yy87;
-	}
-yy82:	++YYCURSOR;
-	goto yy83;
-yy83:
-#line 111 "implicit.re"
-{   return "timestamp#ymd"; }
-#line 667 "<stdout>"
-yy84:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy126;
-	default:	goto yy25;
-	}
-yy85:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy108;
-	default:	goto yy25;
-	}
-yy86:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
-	yych = *YYCURSOR;
-	goto yy87;
-yy87:	switch(yych){
-	case 0x09:	case ' ':	goto yy86;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy88;
-	default:	goto yy25;
-	}
-yy88:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy89;
-	default:	goto yy25;
-	}
-yy89:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy90;
-	default:	goto yy25;
-	}
-yy90:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy91;
-	default:	goto yy25;
-	}
-yy91:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy92;
-	default:	goto yy25;
-	}
-yy92:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy93;
-	default:	goto yy25;
-	}
-yy93:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy94;
-	default:	goto yy25;
-	}
-yy94:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy95;
-	default:	goto yy25;
-	}
-yy95:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x09:	case ' ':	goto yy98;
-	case '.':	goto yy96;
-	default:	goto yy25;
-	}
-yy96:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy97;
-yy97:	switch(yych){
-	case 0x09:	case ' ':	goto yy98;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy96;
-	default:	goto yy25;
-	}
-yy98:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-	yych = *YYCURSOR;
-	goto yy99;
-yy99:	switch(yych){
-	case 0x09:	case ' ':	goto yy98;
-	case '+':	case '-':	goto yy101;
-	case 'Z':	goto yy100;
-	default:	goto yy25;
-	}
-yy100:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy105;
-	goto yy25;
-yy101:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy102;
-	default:	goto yy25;
-	}
-yy102:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy103;
-	default:	goto yy25;
-	}
-yy103:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy105;
-	case ':':	goto yy104;
-	default:	goto yy25;
-	}
-yy104:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy107;
-	default:	goto yy25;
-	}
-yy105:	++YYCURSOR;
-	goto yy106;
-yy106:
-#line 115 "implicit.re"
-{   return "timestamp#spaced"; }
-#line 884 "<stdout>"
-yy107:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy100;
-	default:	goto yy25;
-	}
-yy108:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy109;
-	default:	goto yy25;
-	}
-yy109:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy110;
-	default:	goto yy25;
-	}
-yy110:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy111;
-	default:	goto yy25;
-	}
-yy111:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy112;
-	default:	goto yy25;
-	}
-yy112:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy113;
-	default:	goto yy25;
-	}
-yy113:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy114;
-	default:	goto yy25;
-	}
-yy114:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy115;
-	default:	goto yy25;
-	}
-yy115:	yych = *++YYCURSOR;
-	switch(yych){
-	case '.':	goto yy116;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy25;
-	default:	goto yy117;
-	}
-yy116:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-	yych = *YYCURSOR;
-	goto yy117;
-yy117:	switch(yych){
-	case '+':	case '-':	goto yy119;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy116;
-	case 'Z':	goto yy118;
-	default:	goto yy25;
-	}
-yy118:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy123;
-	goto yy25;
-yy119:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy120;
-	default:	goto yy25;
-	}
-yy120:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy121;
-	default:	goto yy25;
-	}
-yy121:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy123;
-	case ':':	goto yy122;
-	default:	goto yy25;
-	}
-yy122:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy125;
-	default:	goto yy25;
-	}
-yy123:	++YYCURSOR;
-	goto yy124;
-yy124:
-#line 113 "implicit.re"
-{   return "timestamp#iso8601"; }
-#line 1069 "<stdout>"
-yy125:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy118;
-	default:	goto yy25;
-	}
-yy126:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy127;
-	default:	goto yy25;
-	}
-yy127:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy128;
-	default:	goto yy25;
-	}
-yy128:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy129;
-	default:	goto yy25;
-	}
-yy129:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy130;
-	default:	goto yy25;
-	}
-yy130:	yych = *++YYCURSOR;
-	switch(yych){
-	case ':':	goto yy131;
-	default:	goto yy25;
-	}
-yy131:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy132;
-	default:	goto yy25;
-	}
-yy132:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy133;
-	default:	goto yy25;
-	}
-yy133:	yych = *++YYCURSOR;
-	switch(yych){
-	case '.':	goto yy134;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy25;
-	case 'Z':	goto yy136;
-	default:	goto yy135;
-	}
-yy134:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-	yych = *YYCURSOR;
-	goto yy135;
-yy135:	switch(yych){
-	case '+':	case '-':	goto yy119;
-	case '0':	goto yy134;
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy138;
-	case 'Z':	goto yy118;
-	default:	goto yy25;
-	}
-yy136:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy137;
-yy137:	yych = *++YYCURSOR;
-	goto yy124;
-yy138:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-	yych = *YYCURSOR;
-	goto yy139;
-yy139:	switch(yych){
-	case '+':	case '-':	goto yy119;
-	case '0':	goto yy134;
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy138;
-	case 'Z':	goto yy136;
-	default:	goto yy25;
-	}
-yy140:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':	goto yy155;
-	case '8':
-	case '9':	goto yy153;
-	default:	goto yy143;
-	}
-yy141:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy153;
-	default:	goto yy152;
-	}
-yy142:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy143;
-yy143:	switch(yych){
-	case 0x00:	goto yy149;
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':	goto yy142;
-	case '.':	goto yy50;
-	case '8':
-	case '9':	goto yy151;
-	case ':':	goto yy49;
-	default:	goto yy25;
-	}
-yy144:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy25;
-	goto yy146;
-yy145:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy146;
-yy146:	switch(yych){
-	case 0x00:	goto yy147;
-	case ',':	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 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':	goto yy145;
-	default:	goto yy25;
-	}
-yy147:	++YYCURSOR;
-	goto yy148;
-yy148:
-#line 91 "implicit.re"
-{   return "int#hex"; }
-#line 1307 "<stdout>"
-yy149:	++YYCURSOR;
-	goto yy150;
-yy150:
-#line 93 "implicit.re"
-{   return "int#oct"; }
-#line 1313 "<stdout>"
-yy151:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy152;
-yy152:	switch(yych){
-	case ',':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy151;
-	case '.':	goto yy50;
-	case ':':	goto yy49;
-	default:	goto yy25;
-	}
-yy153:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy154;
-	default:	goto yy152;
-	}
-yy154:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy76;
-	default:	goto yy152;
-	}
-yy155:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':	goto yy156;
-	case '8':
-	case '9':	goto yy154;
-	default:	goto yy143;
-	}
-yy156:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy76;
-	default:	goto yy143;
-	}
-yy157:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'I':	goto yy160;
-	case 'i':	goto yy159;
-	default:	goto yy25;
-	}
-yy158:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy52;
-	case 'x':	goto yy144;
-	default:	goto yy143;
-	}
-yy159:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'n':	goto yy166;
-	default:	goto yy25;
-	}
-yy160:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'N':	goto yy161;
-	case 'n':	goto yy162;
-	default:	goto yy25;
-	}
-yy161:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'F':	goto yy163;
-	default:	goto yy25;
-	}
-yy162:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy163;
-	default:	goto yy25;
-	}
-yy163:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy164;
-yy164:	++YYCURSOR;
-	goto yy165;
-yy165:
-#line 107 "implicit.re"
-{   return "float#neginf"; }
-#line 1412 "<stdout>"
-yy166:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy163;
-	default:	goto yy25;
-	}
-yy167:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'I':	goto yy33;
-	case 'i':	goto yy32;
-	default:	goto yy25;
-	}
-yy168:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'L':	goto yy175;
-	default:	goto yy25;
-	}
-yy169:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy170;
-	default:	goto yy25;
-	}
-yy170:	yych = *++YYCURSOR;
-	switch(yych){
-	case 's':	goto yy171;
-	default:	goto yy25;
-	}
-yy171:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'e':	goto yy172;
-	default:	goto yy25;
-	}
-yy172:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy173;
-yy173:	++YYCURSOR;
-	goto yy174;
-yy174:
-#line 89 "implicit.re"
-{   return "bool#no"; }
-#line 1452 "<stdout>"
-yy175:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'S':	goto yy176;
-	default:	goto yy25;
-	}
-yy176:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'E':	goto yy172;
-	default:	goto yy25;
-	}
-yy177:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy178;
-	default:	goto yy25;
-	}
-yy178:	yych = *++YYCURSOR;
-	switch(yych){
-	case 's':	goto yy179;
-	default:	goto yy25;
-	}
-yy179:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'e':	goto yy172;
-	default:	goto yy25;
-	}
-yy180:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'F':	goto yy172;
-	default:	goto yy25;
-	}
-yy181:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy172;
-	default:	goto yy25;
-	}
-yy182:	yych = *++YYCURSOR;
-	if(yych >= 0x01)	goto yy25;
-	goto yy183;
-yy183:	++YYCURSOR;
-	goto yy184;
-yy184:
-#line 87 "implicit.re"
-{   return "bool#yes"; }
-#line 1496 "<stdout>"
-yy185:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'f':	goto yy172;
-	default:	goto yy25;
-	}
-yy186:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'U':	goto yy189;
-	default:	goto yy25;
-	}
-yy187:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'u':	goto yy188;
-	default:	goto yy25;
-	}
-yy188:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'e':	goto yy182;
-	default:	goto yy25;
-	}
-yy189:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'E':	goto yy182;
-	default:	goto yy25;
-	}
-yy190:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'u':	goto yy191;
-	default:	goto yy25;
-	}
-yy191:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'e':	goto yy182;
-	default:	goto yy25;
-	}
-yy192:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'S':	goto yy182;
-	default:	goto yy25;
-	}
-yy193:	yych = *++YYCURSOR;
-	switch(yych){
-	case 's':	goto yy182;
-	default:	goto yy25;
-	}
-yy194:	yych = *++YYCURSOR;
-	switch(yych){
-	case 's':	goto yy182;
-	default:	goto yy25;
-	}
-yy195:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'L':	goto yy199;
-	default:	goto yy25;
-	}
-yy196:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy197;
-	default:	goto yy25;
-	}
-yy197:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy198;
-	default:	goto yy25;
-	}
-yy198:	yych = *++YYCURSOR;
-	if(yych <= 0x00)	goto yy6;
-	goto yy25;
-yy199:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'L':	goto yy198;
-	default:	goto yy25;
-	}
-yy200:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'l':	goto yy201;
-	default:	goto yy25;
-	}
-yy201:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 'l':	goto yy198;
-	default:	goto yy25;
-	}
-}
-#line 125 "implicit.re"
-
-
-}
-
-/* Remove ending fragment and compare types */
-int
-syck_tagcmp( const char *tag1, const char *tag2 )
-{
-    if ( tag1 == tag2 ) return 1;
-    if ( tag1 == NULL || tag2 == NULL ) return 0;
-    else {
-        int i;
-        char *othorpe;
-        char *tmp1 = syck_strndup( tag1, strlen( tag1 ) );
-        char *tmp2 = syck_strndup( tag2, strlen( tag2 ) );
-        othorpe = strstr( tmp1, "#" );
-		if ( othorpe != NULL ) {
-            othorpe[0] = '\0';
-        }
-        othorpe = strstr( tmp2, "#" );
-		if ( othorpe != NULL ) {
-            othorpe[0] = '\0';
-        }
-        i = strcmp( tmp1, tmp2 );
-        S_FREE( tmp1 ); S_FREE( tmp2 );
-        return i;
-    }
-}
-
-char *
-syck_type_id_to_uri( const char *type_id )
-{
-    const char *cursor, *limit, *marker = 0;
-
-    cursor = type_id;
-    limit = type_id + strlen( type_id );
-
-
-#line 1620 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept = 0;
-	goto yy202;
-	++YYCURSOR;
-yy202:
-	if((YYLIMIT - YYCURSOR) < 11) YYFILL(11);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy204;
-	case '!':	goto yy208;
-	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 '_':	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 'u':
-	case 'v':
-	case 'w':	case 'y':
-	case 'z':	goto yy210;
-	case 't':	goto yy205;
-	case 'x':	goto yy207;
-	default:	goto yy211;
-	}
-yy204:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy206;
-	}
-yy205:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case ',':	goto yy216;
-	case '-':	goto yy212;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	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 '_':	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':	goto yy214;
-	case 'a':	goto yy246;
-	default:	goto yy206;
-	}
-yy206:
-#line 202 "implicit.re"
-{   return syck_taguri( YAML_DOMAIN, type_id, (int)strlen( type_id ) ); }
-#line 1768 "<stdout>"
-yy207:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case ',':	case '.':
-	case '/':
-	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 '_':	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':	goto yy215;
-	case '-':	goto yy236;
-	default:	goto yy206;
-	}
-yy208:	++YYCURSOR;
-	goto yy209;
-yy209:
-#line 176 "implicit.re"
-{   return syck_xprivate( type_id + 1, (int)strlen( type_id ) - 1 ); }
-#line 1842 "<stdout>"
-yy210:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case ',':	goto yy216;
-	case '-':	goto yy212;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	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 '_':	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':	goto yy214;
-	default:	goto yy206;
-	}
-yy211:	yych = *++YYCURSOR;
-	goto yy206;
-yy212:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy213;
-yy213:	switch(yych){
-	case '-':	goto yy212;
-	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 '_':	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':	goto yy214;
-	default:	goto yy204;
-	}
-yy214:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy215;
-yy215:	switch(yych){
-	case ',':	goto yy216;
-	case '-':	goto yy212;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	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 '_':	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':	goto yy214;
-	default:	goto yy204;
-	}
-yy216:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy224;
-	default:	goto yy204;
-	}
-yy217:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	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 '_':	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':	goto yy220;
-	default:	goto yy204;
-	}
-yy218:	++YYCURSOR;
-	goto yy219;
-yy219:
-#line 178 "implicit.re"
-{   char *domain = S_ALLOC_N( char, ( YYCURSOR - type_id ) + 15 );
-                    char *uri;
-
-                    domain[0] = '\0';
-                    strncat( domain, type_id, ( YYCURSOR - type_id ) - 1 );
-                    strcat( domain, "." );
-                    strcat( domain, YAML_DOMAIN );
-                    uri = syck_taguri( domain, YYCURSOR, (int)(YYLIMIT - YYCURSOR) );
-
-                    S_FREE( domain );
-                    return uri;
-                }
-#line 2149 "<stdout>"
-yy220:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
-	yych = *YYCURSOR;
-	goto yy221;
-yy221:	switch(yych){
-	case ',':	goto yy216;
-	case '-':	goto yy222;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	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 '_':	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':	goto yy220;
-	default:	goto yy204;
-	}
-yy222:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy223;
-yy223:	switch(yych){
-	case '-':	goto yy222;
-	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 '_':	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':	goto yy220;
-	default:	goto yy204;
-	}
-yy224:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy225;
-	default:	goto yy204;
-	}
-yy225:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy226;
-	default:	goto yy204;
-	}
-yy226:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy227;
-	default:	goto yy204;
-	}
-yy227:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy228;
-	case '/':	goto yy229;
-	default:	goto yy204;
-	}
-yy228:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy231;
-	default:	goto yy204;
-	}
-yy229:	++YYCURSOR;
-	goto yy230;
-yy230:
-#line 191 "implicit.re"
-{   char *domain = S_ALLOC_N( char, YYCURSOR - type_id );
-                               char *uri;
-
-                               domain[0] = '\0';
-                               strncat( domain, type_id, ( YYCURSOR - type_id ) - 1 );
-                               uri = syck_taguri( domain, YYCURSOR, (int)(YYLIMIT - YYCURSOR) );
-
-                               S_FREE( domain );
-                               return uri;
-                            }
-#line 2365 "<stdout>"
-yy231:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy232;
-	default:	goto yy204;
-	}
-yy232:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy233;
-	case '/':	goto yy229;
-	default:	goto yy204;
-	}
-yy233:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy234;
-	default:	goto yy204;
-	}
-yy234:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy235;
-	default:	goto yy204;
-	}
-yy235:	yych = *++YYCURSOR;
-	switch(yych){
-	case '/':	goto yy229;
-	default:	goto yy204;
-	}
-yy236:	yych = *++YYCURSOR;
-	switch(yych){
-	case 'p':	goto yy237;
-	default:	goto yy213;
-	}
-yy237:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'r':	goto yy238;
-	default:	goto yy213;
-	}
-yy238:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'i':	goto yy239;
-	default:	goto yy213;
-	}
-yy239:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'v':	goto yy240;
-	default:	goto yy213;
-	}
-yy240:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'a':	goto yy241;
-	default:	goto yy213;
-	}
-yy241:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 't':	goto yy242;
-	default:	goto yy213;
-	}
-yy242:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'e':	goto yy243;
-	default:	goto yy213;
-	}
-yy243:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case ':':	goto yy244;
-	default:	goto yy213;
-	}
-yy244:	++YYCURSOR;
-	goto yy245;
-yy245:
-#line 174 "implicit.re"
-{   return syck_strndup( type_id, strlen( type_id ) ); }
-#line 2485 "<stdout>"
-yy246:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case 'g':	goto yy247;
-	default:	goto yy213;
-	}
-yy247:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':	goto yy216;
-	case '.':	goto yy217;
-	case '/':	goto yy218;
-	case ':':	goto yy248;
-	default:	goto yy213;
-	}
-yy248:	yych = *++YYCURSOR;
-	switch(yych){
-	case ',':
-	case '-':
-	case '.':	goto yy204;
-	default:	goto yy250;
-	}
-yy249:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy250;
-yy250:	switch(yych){
-	case ',':	goto yy253;
-	case '-':	goto yy251;
-	case '.':	goto yy254;
-	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 '_':	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':	goto yy249;
-	default:	goto yy204;
-	}
-yy251:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy252;
-yy252:	switch(yych){
-	case '-':	goto yy251;
-	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 '_':	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':	goto yy249;
-	default:	goto yy204;
-	}
-yy253:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy259;
-	default:	goto yy204;
-	}
-yy254:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	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 '_':	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':	goto yy255;
-	default:	goto yy204;
-	}
-yy255:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
-	yych = *YYCURSOR;
-	goto yy256;
-yy256:	switch(yych){
-	case ',':	goto yy253;
-	case '-':	goto yy257;
-	case '.':	goto yy254;
-	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 '_':	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':	goto yy255;
-	default:	goto yy204;
-	}
-yy257:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy258;
-yy258:	switch(yych){
-	case '-':	goto yy257;
-	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 '_':	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':	goto yy255;
-	default:	goto yy204;
-	}
-yy259:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy260;
-	default:	goto yy204;
-	}
-yy260:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy261;
-	default:	goto yy204;
-	}
-yy261:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy262;
-	default:	goto yy204;
-	}
-yy262:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy263;
-	case ':':	goto yy264;
-	default:	goto yy204;
-	}
-yy263:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy266;
-	default:	goto yy204;
-	}
-yy264:	++YYCURSOR;
-	goto yy265;
-yy265:
-#line 172 "implicit.re"
-{   return syck_strndup( type_id, strlen( type_id ) ); }
-#line 2932 "<stdout>"
-yy266:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy267;
-	default:	goto yy204;
-	}
-yy267:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy268;
-	case ':':	goto yy264;
-	default:	goto yy204;
-	}
-yy268:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy269;
-	default:	goto yy204;
-	}
-yy269:	yych = *++YYCURSOR;
-	switch(yych){
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy270;
-	default:	goto yy204;
-	}
-yy270:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case ':':	goto yy264;
-	default:	goto yy204;
-	}
-}
-#line 204 "implicit.re"
-
-
-}
diff --git a/ext/syck/lib/syck.rb b/ext/syck/lib/syck.rb
deleted file mode 100644
index f8e3c0f8bc..0000000000
--- a/ext/syck/lib/syck.rb
+++ /dev/null
@@ -1,447 +0,0 @@
-# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
-# $Id$
-#
-# = yaml.rb: top-level module with methods for loading and parsing YAML documents
-#
-# Author:: why the lucky stiff
-#
-
-require 'yaml/syck'
-
-# == YAML
-#
-# YAML(tm) (rhymes with 'camel') is a
-# straightforward machine parsable data serialization format designed for
-# human readability and interaction with scripting languages such as Perl
-# and Python. YAML is optimized for data serialization, formatted
-# dumping, configuration files, log files, Internet messaging and
-# filtering. This specification describes the YAML information model and
-# serialization format. Together with the Unicode standard for characters, it
-# provides all the information necessary to understand YAML Version 1.0
-# and construct computer programs to process it.
-#
-# See http://yaml.org/ for more information.  For a quick tutorial, please
-# visit YAML In Five Minutes (http://yaml.kwiki.org/?YamlInFiveMinutes).
-#
-# == About This Library
-#
-# The YAML 1.0 specification outlines four stages of YAML loading and dumping.
-# This library honors all four of those stages, although data is really only
-# available to you in three stages.
-#
-# The four stages are: native, representation, serialization, and presentation.
-#
-# The native stage refers to data which has been loaded completely into Ruby's
-# own types. (See +YAML::load+.)
-#
-# The representation stage means data which has been composed into
-# +YAML::BaseNode+ objects.  In this stage, the document is available as a
-# tree of node objects.  You can perform YPath queries and transformations
-# at this level.  (See +YAML::parse+.)
-#
-# The serialization stage happens inside the parser.  The YAML parser used in
-# Ruby is called Syck.  Serialized nodes are available in the extension as
-# SyckNode structs.
-#
-# The presentation stage is the YAML document itself.  This is accessible
-# to you as a string.  (See +YAML::dump+.)
-#
-# For more information about the various information models, see Chapter
-# 3 of the YAML 1.0 Specification (http://yaml.org/spec/#id2491269).
-#
-# The YAML module provides quick access to the most common loading (YAML::load)
-# and dumping (YAML::dump) tasks.  This module also provides an API for registering
-# global types (YAML::add_domain_type).
-#
-# == Example
-#
-# A simple round-trip (load and dump) of an object.
-#
-#     require "yaml"
-#
-#     test_obj = ["dogs", "cats", "badgers"]
-#
-#     yaml_obj = YAML::dump( test_obj )
-#                         # -> ---
-#                              - dogs
-#                              - cats
-#                              - badgers
-#     ruby_obj = YAML::load( yaml_obj )
-#                         # => ["dogs", "cats", "badgers"]
-#     ruby_obj == test_obj
-#                         # => true
-#
-# To register your custom types with the global resolver, use +add_domain_type+.
-#
-#     YAML::add_domain_type( "your-site.com,2004", "widget" ) do |type, val|
-#         Widget.new( val )
-#     end
-#
-module Syck
-
-    DefaultResolver.use_types_at( @@tagged_classes )
-
-    # Returns a new default parser
-    def self.parser; Parser.new.set_resolver( self.resolver ); end
-
-    # Returns a new generic parser
-    def self.generic_parser
-        warn "#{caller[0]}: YAML.generic_parser is deprecated, switch to psych" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        Parser.new.set_resolver( GenericResolver )
-    end
-
-    # Returns the default resolver
-    def self.resolver
-        warn "#{caller[0]}: YAML.resolver is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        DefaultResolver
-    end
-
-    # Returns a new default emitter
-    def self.emitter
-        warn "#{caller[0]}: YAML.emitter is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        Emitter.new.set_resolver( self.resolver )
-    end
-
-    #
-    # Converts _obj_ to YAML and writes the YAML result to _io_.
-    #
-    #   File.open( 'animals.yaml', 'w' ) do |out|
-    #     YAML.dump( ['badger', 'elephant', 'tiger'], out )
-    #   end
-    #
-    # If no _io_ is provided, a string containing the dumped YAML
-    # is returned.
-    #
-    #   YAML.dump( :locked )
-    #      #=> "--- :locked"
-    #
-    def self.dump( obj, io = nil )
-        obj.to_yaml( io || io2 = StringIO.new )
-        io || ( io2.rewind; io2.read )
-    end
-
-    #
-    # Load a document from the current _io_ stream.
-    #
-    #   File.open( 'animals.yaml' ) { |yf| YAML::load( yf ) }
-    #      #=> ['badger', 'elephant', 'tiger']
-    #
-    # Can also load from a string.
-    #
-    #   YAML.load( "--- :locked" )
-    #      #=> :locked
-    #
-    def self.load( io )
-        parser.load( io )
-    end
-
-    #
-    # Load a document from the file located at _filepath_.
-    #
-    #   YAML.load_file( 'animals.yaml' )
-    #      #=> ['badger', 'elephant', 'tiger']
-    #
-    def self.load_file( filepath )
-        File.open( filepath ) do |f|
-            load( f )
-        end
-    end
-
-    #
-    # Parse the first document from the current _io_ stream
-    #
-    #   File.open( 'animals.yaml' ) { |yf| YAML::load( yf ) }
-    #      #=> #<YAML::Syck::Node:0x82ccce0
-    #           @kind=:seq,
-    #           @value=
-    #            [#<YAML::Syck::Node:0x82ccd94
-    #              @kind=:scalar,
-    #              @type_id="str",
-    #              @value="badger">,
-    #             #<YAML::Syck::Node:0x82ccd58
-    #              @kind=:scalar,
-    #              @type_id="str",
-    #              @value="elephant">,
-    #             #<YAML::Syck::Node:0x82ccd1c
-    #              @kind=:scalar,
-    #              @type_id="str",
-    #              @value="tiger">]>
-    #
-    # Can also load from a string.
-    #
-    #   YAML.parse( "--- :locked" )
-    #      #=> #<YAML::Syck::Node:0x82edddc
-    #            @type_id="tag:ruby.yaml.org,2002:sym",
-    #            @value=":locked", @kind=:scalar>
-    #
-    def self.parse( io )
-        generic_parser.load( io )
-    end
-
-    #
-    # Parse a document from the file located at _filepath_.
-    #
-    #   YAML.parse_file( 'animals.yaml' )
-    #      #=> #<YAML::Syck::Node:0x82ccce0
-    #           @kind=:seq,
-    #           @value=
-    #            [#<YAML::Syck::Node:0x82ccd94
-    #              @kind=:scalar,
-    #              @type_id="str",
-    #              @value="badger">,
-    #             #<YAML::Syck::Node:0x82ccd58
-    #              @kind=:scalar,
-    #              @type_id="str",
-    #              @value="elephant">,
-    #             #<YAML::Syck::Node:0x82ccd1c
-    #              @kind=:scalar,
-    #              @type_id="str",
-    #              @value="tiger">]>
-    #
-    def self.parse_file( filepath )
-        File.open( filepath ) do |f|
-            parse( f )
-        end
-    end
-
-    #
-    # Calls _block_ with each consecutive document in the YAML
-    # stream contained in _io_.
-    #
-    #   File.open( 'many-docs.yaml' ) do |yf|
-    #     YAML.each_document( yf ) do |ydoc|
-    #       ## ydoc contains the single object
-    #       ## from the YAML document
-    #     end
-    #   end
-    #
-    def self.each_document( io, &block )
-        warn "#{caller[0]}: YAML.each_document is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        parser.load_documents( io, &block )
-    end
-
-    #
-    # Calls _block_ with each consecutive document in the YAML
-    # stream contained in _io_.
-    #
-    #   File.open( 'many-docs.yaml' ) do |yf|
-    #     YAML.load_documents( yf ) do |ydoc|
-    #       ## ydoc contains the single object
-    #       ## from the YAML document
-    #     end
-    #   end
-    #
-    def self.load_documents( io, &doc_proc )
-        parser.load_documents( io, &doc_proc )
-    end
-
-    #
-    # Calls _block_ with a tree of +YAML::BaseNodes+, one tree for
-    # each consecutive document in the YAML stream contained in _io_.
-    #
-    #   File.open( 'many-docs.yaml' ) do |yf|
-    #     YAML.each_node( yf ) do |ydoc|
-    #       ## ydoc contains a tree of nodes
-    #       ## from the YAML document
-    #     end
-    #   end
-    #
-    def self.each_node( io, &doc_proc )
-        warn "#{caller[0]}: YAML.each_node is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        generic_parser.load_documents( io, &doc_proc )
-    end
-
-    #
-    # Calls _block_ with a tree of +YAML::BaseNodes+, one tree for
-    # each consecutive document in the YAML stream contained in _io_.
-    #
-    #   File.open( 'many-docs.yaml' ) do |yf|
-    #     YAML.parse_documents( yf ) do |ydoc|
-    #       ## ydoc contains a tree of nodes
-    #       ## from the YAML document
-    #     end
-    #   end
-    #
-    def self.parse_documents( io, &doc_proc )
-        warn "#{caller[0]}: YAML.parse_documents is deprecated, use load_stream" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        self.each_node( io, &doc_proc )
-    end
-
-    #
-    # Loads all documents from the current _io_ stream,
-    # returning a +YAML::Stream+ object containing all
-    # loaded documents.
-    #
-    def self.load_stream( io )
-        d = nil
-        parser.load_documents( io ) do |doc|
-            d = Stream.new if not d
-            d.add( doc )
-        end
-        return d
-    end
-
-    #
-    # Returns a YAML stream containing each of the items in +objs+,
-    # each having their own document.
-    #
-    #   YAML.dump_stream( 0, [], {} )
-    #     #=> --- 0
-    #         --- []
-    #         --- {}
-    #
-    def self.dump_stream( *objs )
-        d = Stream.new
-        objs.each do |doc|
-            d.add( doc )
-        end
-        d.emit
-    end
-
-    #
-    # Add a global handler for a YAML domain type.
-    #
-    def self.add_domain_type( domain, type_tag, &transfer_proc )
-        resolver.add_type( "tag:#{ domain }:#{ type_tag }", transfer_proc )
-    end
-
-    #
-    # Add a transfer method for a builtin type
-    #
-    def self.add_builtin_type( type_tag, &transfer_proc )
-        resolver.add_type( "tag:yaml.org,2002:#{ type_tag }", transfer_proc )
-    end
-
-    #
-    # Add a transfer method for a builtin type
-    #
-    def self.add_ruby_type( type_tag, &transfer_proc )
-        warn "#{caller[0]}: YAML.add_ruby_type is deprecated, use add_domain_type" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        resolver.add_type( "tag:ruby.yaml.org,2002:#{ type_tag }", transfer_proc )
-    end
-
-    #
-    # Add a private document type
-    #
-    def self.add_private_type( type_re, &transfer_proc )
-        warn "#{caller[0]}: YAML.add_private_type is deprecated, use add_domain_type" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        resolver.add_type( "x-private:" + type_re, transfer_proc )
-    end
-
-    #
-    # Detect typing of a string
-    #
-    def self.detect_implicit( val )
-        warn "#{caller[0]}: YAML.detect_implicit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        resolver.detect_implicit( val )
-    end
-
-    #
-    # Convert a type_id to a taguri
-    #
-    def self.tagurize( val )
-        warn "#{caller[0]}: YAML.tagurize is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        resolver.tagurize( val )
-    end
-
-    #
-    # Apply a transfer method to a Ruby object
-    #
-    def self.transfer( type_id, obj )
-        warn "#{caller[0]}: YAML.transfer is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        resolver.transfer( tagurize( type_id ), obj )
-    end
-
-    #
-    # Apply any implicit a node may qualify for
-    #
-    def self.try_implicit( obj )
-        warn "#{caller[0]}: YAML.try_implicit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        transfer( detect_implicit( obj ), obj )
-    end
-
-    #
-    # Method to extract colon-seperated type and class, returning
-    # the type and the constant of the class
-    #
-    def self.read_type_class( type, obj_class )
-        warn "#{caller[0]}: YAML.read_type_class is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        type, tclass = type.split( ':', 4 ).last(2)
-        tclass.split( "::" ).each { |c| obj_class = obj_class.const_get( c ) } if tclass
-        return [ type, obj_class ]
-    end
-
-    #
-    # Allocate blank object
-    #
-    def self.object_maker( obj_class, val )
-        warn "#{caller[0]}: YAML.object_maker is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        if Hash === val
-            o = obj_class.allocate
-            val.each_pair { |k,v|
-                o.instance_variable_set("@#{k}", v)
-            }
-            o
-        else
-            raise Error, "Invalid object explicitly tagged !ruby/Object: " + val.inspect
-        end
-    end
-
-    #
-    # Allocate an Emitter if needed
-    #
-    def self.quick_emit( oid, opts = {}, &e )
-        warn "#{caller[0]}: YAML.quick_emit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-        out =
-            if opts.is_a? Emitter
-                opts
-            else
-                emitter.reset( opts )
-            end
-        out.emit( oid, &e )
-    end
-
-end
-
-module Kernel
-    #
-    # ryan:: You know how Kernel.p is a really convenient way to dump ruby
-    #        structures?  The only downside is that it's not as legible as
-    #        YAML.
-    #
-    # _why:: (listening)
-    #
-    # ryan:: I know you don't want to urinate all over your users' namespaces.
-    #        But, on the other hand, convenience of dumping for debugging is,
-    #        IMO, a big YAML use case.
-    #
-    # _why:: Go nuts!  Have a pony parade!
-    #
-    # ryan:: Either way, I certainly will have a pony parade.
-    #
-
-    # Prints any supplied _objects_ out in YAML.  Intended as
-    # a variation on +Kernel::p+.
-    #
-    #   S = Struct.new(:name, :state)
-    #   s = S['dave', 'TX']
-    #   y s
-    #
-    # _produces:_
-    #
-    #   --- !ruby/struct:S
-    #   name: dave
-    #   state: TX
-    #
-    def y( object, *objects )
-        objects.unshift object
-        puts( if objects.length == 1
-                  YAML.dump( *objects )
-              else
-                  YAML.dump_stream( *objects )
-              end )
-    end
-    private :y
-end
-
-
diff --git a/ext/syck/lib/syck/baseemitter.rb b/ext/syck/lib/syck/baseemitter.rb
deleted file mode 100644
index 5e39e450de..0000000000
--- a/ext/syck/lib/syck/baseemitter.rb
+++ /dev/null
@@ -1,242 +0,0 @@
-#
-# BaseEmitter
-#
-
-require 'syck/constants'
-require 'syck/encoding'
-require 'syck/error'
-
-module Syck
-  module BaseEmitter
-    def options( opt = nil )
-      if opt
-        @options[opt] || DEFAULTS[opt]
-      else
-        @options
-      end
-    end
-
-    def options=( opt )
-      @options = opt
-    end
-
-    #
-    # Emit binary data
-    #
-    def binary_base64( value )
-      self << "!binary "
-      self.node_text( [value].pack("m"), '|' )
-    end
-
-    #
-    # Emit plain, normal flowing text
-    #
-    def node_text( value, block = nil )
-      @seq_map = false
-      valx = value.dup
-      unless block
-        block =
-          if options(:UseBlock)
-            '|'
-          elsif not options(:UseFold) and valx =~ /\n[ \t]/ and not valx =~ /#{ESCAPE_CHAR}/
-            '|'
-          else
-            '>'
-          end
-        indt = $&.to_i if block =~ /\d+/
-        if valx =~ /(\A\n*[ \t#]|^---\s+)/
-          indt = options(:Indent) unless indt.to_i > 0
-          block += indt.to_s
-        end
-
-        block +=
-          if valx =~ /\n\Z\n/
-            "+"
-          elsif valx =~ /\Z\n/
-            ""
-          else
-            "-"
-          end
-      end
-      block += "\n"
-      if block[0] == ?"
-        esc_skip = ( "\t\n" unless valx =~ /^[ \t]/ ) || ""
-        valx = fold( Syck.escape( valx, esc_skip ) + "\"" ).chomp
-        self << '"' + indent_text( valx, indt, false )
-      else
-        if block[0] == ?>
-          valx = fold( valx )
-        end
-        #p [block, indt]
-        self << block + indent_text( valx, indt )
-      end
-    end
-
-    #
-    # Emit a simple, unqouted string
-    #
-    def simple( value )
-      @seq_map = false
-      self << value.to_s
-    end
-
-    #
-    # Emit double-quoted string
-    #
-    def double( value )
-      "\"#{Syck.escape( value )}\""
-    end
-
-    #
-    # Emit single-quoted string
-    #
-    def single( value )
-      "'#{value}'"
-    end
-
-    #
-    # Write a text block with the current indent
-    #
-    def indent_text( text, mod, first_line = true )
-      return "" if text.to_s.empty?
-      spacing = indent( mod )
-      text = text.gsub( /\A([^\n])/, "#{ spacing }\\1" ) if first_line
-      return text.gsub( /\n^([^\n])/, "\n#{spacing}\\1" )
-    end
-
-    #
-    # Write a current indent
-    #
-    def indent( mod = nil )
-      #p [ self.id, level, mod, :INDENT ]
-      if level <= 0
-        mod ||= 0
-      else
-        mod ||= options(:Indent)
-        mod += ( level - 1 ) * options(:Indent)
-      end
-      return " " * mod
-    end
-
-    #
-    # Add indent to the buffer
-    #
-    def indent!
-      self << indent
-    end
-
-    #
-    # Folding paragraphs within a column
-    #
-    def fold( value )
-      value.gsub( /(^[ \t]+.*$)|(\S.{0,#{options(:BestWidth) - 1}})(?:[ \t]+|(\n+(?=[ \t]|\Z))|$)/ ) do
-        $1 || $2 + ( $3 || "\n" )
-      end
-    end
-
-    #
-    # Quick mapping
-    #
-    def map( type, &e )
-      val = Mapping.new
-      e.call( val )
-      self << "#{type} " if type.length.nonzero?
-
-      #
-      # Empty hashes
-      #
-      if val.length.zero?
-        self << "{}"
-        @seq_map = false
-      else
-        # FIXME
-        # if @buffer.length == 1 and options(:UseHeader) == false and type.length.zero?
-        #     @headless = 1
-        # end
-
-        defkey = @options.delete( :DefaultKey )
-        if defkey
-          seq_map_shortcut
-          self << "= : "
-          defkey.to_yaml( :Emitter => self )
-        end
-
-        #
-        # Emit the key and value
-        #
-        val.each { |v|
-          seq_map_shortcut
-          if v[0].is_complex_yaml?
-            self << "? "
-          end
-          v[0].to_yaml( :Emitter => self )
-          if v[0].is_complex_yaml?
-            self << "\n"
-            indent!
-          end
-          self << ": "
-          v[1].to_yaml( :Emitter => self )
-        }
-      end
-    end
-
-    def seq_map_shortcut
-      # FIXME: seq_map needs to work with the new anchoring system
-      # if @seq_map
-      #     @anchor_extras[@buffer.length - 1] = "\n" + indent
-      #     @seq_map = false
-      # else
-      self << "\n"
-      indent!
-      # end
-    end
-
-    #
-    # Quick sequence
-    #
-    def seq( type, &e )
-      @seq_map = false
-      val = Sequence.new
-      e.call( val )
-      self << "#{type} " if type.length.nonzero?
-
-      #
-      # Empty arrays
-      #
-      if val.length.zero?
-        self << "[]"
-      else
-        # FIXME
-        # if @buffer.length == 1 and options(:UseHeader) == false and type.length.zero?
-        #     @headless = 1
-        # end
-
-        #
-        # Emit the key and value
-        #
-        val.each { |v|
-          self << "\n"
-          indent!
-          self << "- "
-          @seq_map = true if v.class == Hash
-          v.to_yaml( :Emitter => self )
-        }
-      end
-    end
-  end
-
-  #
-  # Emitter helper classes
-  #
-  class Mapping < Array
-    def add( k, v )
-      push [k, v]
-    end
-  end
-
-  class Sequence < Array
-    def add( v )
-      push v
-    end
-  end
-end
diff --git a/ext/syck/lib/syck/basenode.rb b/ext/syck/lib/syck/basenode.rb
deleted file mode 100644
index 5dc27bfdfe..0000000000
--- a/ext/syck/lib/syck/basenode.rb
+++ /dev/null
@@ -1,222 +0,0 @@
-#
-# YAML::BaseNode class
-#
-
-module Syck
-
-    #
-    # YAML Generic Model container
-    #
-    module BaseNode
-
-        #
-        # Search for YPath entry and return
-        # qualified nodes.
-        #
-        def select( ypath_str )
-            warn "#{caller[0]}: select is deprecated" if $VERBOSE
-            matches = match_path( ypath_str )
-
-            #
-            # Create a new generic view of the elements selected
-            #
-            if matches
-                result = []
-                matches.each { |m|
-                    result.push m.last
-                }
-                Syck.transfer( 'seq', result )
-            end
-        end
-
-        #
-        # Search for YPath entry and return
-        # transformed nodes.
-        #
-        def select!( ypath_str )
-            warn "#{caller[0]}: select!() is deprecated" if $VERBOSE
-            matches = match_path( ypath_str )
-
-            #
-            # Create a new generic view of the elements selected
-            #
-            if matches
-                result = []
-                matches.each { |m|
-                    result.push m.last.transform
-                }
-                result
-            end
-        end
-
-        #
-        # Search for YPath entry and return a list of
-        # qualified paths.
-        #
-        def search( ypath_str )
-            warn "#{caller[0]}: search() is deprecated" if $VERBOSE
-            matches = match_path( ypath_str )
-
-            if matches
-                matches.collect { |m|
-                    path = []
-                    m.each_index { |i|
-                        path.push m[i] if ( i % 2 ).zero?
-                    }
-                    "/" + path.compact.join( "/" )
-                }
-            end
-        end
-
-        def at( seg )
-            warn "#{caller[0]}: at() is deprecated" if $VERBOSE
-            if Hash === @value
-                self[seg]
-            elsif Array === @value and seg =~ /\A\d+\Z/ and @value[seg.to_i]
-                @value[seg.to_i]
-            end
-        end
-
-        #
-        # YPath search returning a complete depth array
-        #
-        def match_path( ypath_str )
-            warn "#{caller[0]}: match_path is deprecated" if $VERBOSE
-            require 'syck/ypath'
-            matches = []
-            YPath.each_path( ypath_str ) do |ypath|
-                seg = match_segment( ypath, 0 )
-                matches += seg if seg
-            end
-            matches.uniq
-        end
-
-        #
-        # Search a node for a single YPath segment
-        #
-        def match_segment( ypath, depth )
-            warn "#{caller[0]}: match_segment is deprecated" if $VERBOSE
-            deep_nodes = []
-            seg = ypath.segments[ depth ]
-            if seg == "/"
-                unless String === @value
-                    idx = -1
-                    @value.collect { |v|
-                        idx += 1
-                        if Hash === @value
-                            match_init = [v[0].transform, v[1]]
-                            match_deep = v[1].match_segment( ypath, depth )
-                        else
-                            match_init = [idx, v]
-                            match_deep = v.match_segment( ypath, depth )
-                        end
-                        if match_deep
-                            match_deep.each { |m|
-                                deep_nodes.push( match_init + m )
-                            }
-                        end
-                    }
-                end
-                depth += 1
-                seg = ypath.segments[ depth ]
-            end
-            match_nodes =
-                case seg
-                when "."
-                    [[nil, self]]
-                when ".."
-                    [["..", nil]]
-                when "*"
-                    if @value.is_a? Enumerable
-                        idx = -1
-                        @value.collect { |h|
-                            idx += 1
-                            if Hash === @value
-                                [h[0].transform, h[1]]
-                            else
-                                [idx, h]
-                            end
-                        }
-                    end
-                else
-                    if seg =~ /^"(.*)"$/
-                        seg = $1
-                    elsif seg =~ /^'(.*)'$/
-                        seg = $1
-                    end
-                    if ( v = at( seg ) )
-                        [[ seg, v ]]
-                    end
-                end
-            return deep_nodes unless match_nodes
-            pred = ypath.predicates[ depth ]
-            if pred
-                case pred
-                when /^\.=/
-                    pred = $'   # '
-                    match_nodes.reject! { |n|
-                        n.last.value != pred
-                    }
-                else
-                    match_nodes.reject! { |n|
-                        n.last.at( pred ).nil?
-                    }
-                end
-            end
-            return match_nodes + deep_nodes unless ypath.segments.length > depth + 1
-
-            #puts "DEPTH: #{depth + 1}"
-            deep_nodes = []
-            match_nodes.each { |n|
-                if n[1].is_a? BaseNode
-                    match_deep = n[1].match_segment( ypath, depth + 1 )
-                    if match_deep
-                        match_deep.each { |m|
-                            deep_nodes.push( n + m )
-                        }
-                    end
-                else
-                    deep_nodes = []
-                end
-            }
-            deep_nodes = nil if deep_nodes.length == 0
-            deep_nodes
-        end
-
-        #
-        # We want the node to act like as Hash
-        # if it is.
-        #
-        def []( *key )
-            if Hash === @value
-                v = @value.detect { |k,| k.transform == key.first }
-                v[1] if v
-            elsif Array === @value
-                @value.[]( *key )
-            end
-        end
-
-        def children
-            if Hash === @value
-                @value.values.collect { |c| c[1] }
-            elsif Array === @value
-                @value
-            end
-        end
-
-        def children_with_index
-            warn "#{caller[0]}: children_with_index is deprecated, use children" if $VERBOSE
-            if Hash === @value
-                @value.keys.collect { |i| [self[i], i] }
-            elsif Array === @value
-                i = -1; @value.collect { |v| i += 1; [v, i] }
-            end
-        end
-
-        def emit
-            transform.to_yaml
-        end
-    end
-
-end
-
diff --git a/ext/syck/lib/syck/constants.rb b/ext/syck/lib/syck/constants.rb
deleted file mode 100644
index 19fe42ef85..0000000000
--- a/ext/syck/lib/syck/constants.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Constants used throughout the library
-#
-module Syck
-
-	#
-	# Constants
-	#
-	VERSION = '0.60'
-	SUPPORTED_YAML_VERSIONS = ['1.0']
-
-	#
-	# Parser tokens
-	#
-	WORD_CHAR = 'A-Za-z0-9'
-	PRINTABLE_CHAR = '-_A-Za-z0-9!?/()$\'". '
-	NOT_PLAIN_CHAR = '\x7f\x0-\x1f\x80-\x9f'
-	ESCAPE_CHAR = '[\\x00-\\x09\\x0b-\\x1f]'
-	INDICATOR_CHAR = '*&!|\\\\^@%{}[]='
-	SPACE_INDICATORS = '-#:,?'
-	RESTRICTED_INDICATORS = '#:,}]'
-	DNS_COMP_RE = "\\w(?:[-\\w]*\\w)?"
-	DNS_NAME_RE = "(?:(?:#{DNS_COMP_RE}\\.)+#{DNS_COMP_RE}|#{DNS_COMP_RE})"
-	ESCAPES = %w{\x00   \x01	\x02	\x03	\x04	\x05	\x06	\a
-			     \x08	\t		\n		\v		\f		\r		\x0e	\x0f
-				 \x10	\x11	\x12	\x13	\x14	\x15	\x16	\x17
-				 \x18	\x19	\x1a	\e		\x1c	\x1d	\x1e	\x1f
-			    }
-	UNESCAPES = {
-				'a' => "\x07", 'b' => "\x08", 't' => "\x09",
-				'n' => "\x0a", 'v' => "\x0b", 'f' => "\x0c",
-				'r' => "\x0d", 'e' => "\x1b", '\\' => '\\',
-			    }
-
-	#
-	# Default settings
-	#
-	DEFAULTS = {
-		:Indent => 2, :UseHeader => false, :UseVersion => false, :Version => '1.0',
-		:SortKeys => false, :AnchorFormat => 'id%03d', :ExplicitTypes => false,
-		:WidthType => 'absolute', :BestWidth => 80,
-		:UseBlock => false, :UseFold => false, :Encoding => :None
-	}
-
-end
diff --git a/ext/syck/lib/syck/encoding.rb b/ext/syck/lib/syck/encoding.rb
deleted file mode 100644
index dad062994c..0000000000
--- a/ext/syck/lib/syck/encoding.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Handle Unicode-to-Internal conversion
-#
-
-module Syck
-
-	#
-	# Escape the string, condensing common escapes
-	#
-	def self.escape( value, skip = "" )
-              warn "#{caller[0]}: YAML.escape is deprecated" if $VERBOSE
-		value.gsub( /\\/, "\\\\\\" ).
-              gsub( /"/, "\\\"" ).
-              gsub( /([\x00-\x1f])/ ) do
-                 skip[$&] || ESCAPES[ $&.unpack("C")[0] ]
-             end
-	end
-
-	#
-	# Unescape the condenses escapes
-	#
-	def self.unescape( value )
-              warn "#{caller[0]}: YAML.unescape is deprecated" if $VERBOSE
-		value.gsub( /\\(?:([nevfbart\\])|0?x([0-9a-fA-F]{2})|u([0-9a-fA-F]{4}))/ ) {
-			if $3
-				["#$3".hex ].pack('U*')
-			elsif $2
-				[$2].pack( "H2" )
-			else
-				UNESCAPES[$1]
-			end
-		}
-	end
-
-end
diff --git a/ext/syck/lib/syck/error.rb b/ext/syck/lib/syck/error.rb
deleted file mode 100644
index 0bac872411..0000000000
--- a/ext/syck/lib/syck/error.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Error messages and exception class
-#
-
-module Syck
-
-	#
-	# Error messages
-	#
-
-	ERROR_NO_HEADER_NODE = "With UseHeader=false, the node Array or Hash must have elements"
-	ERROR_NEED_HEADER = "With UseHeader=false, the node must be an Array or Hash"
-	ERROR_BAD_EXPLICIT = "Unsupported explicit transfer: '%s'"
-    ERROR_MANY_EXPLICIT = "More than one explicit transfer"
-	ERROR_MANY_IMPLICIT = "More than one implicit request"
-	ERROR_NO_ANCHOR = "No anchor for alias '%s'"
-	ERROR_BAD_ANCHOR = "Invalid anchor: %s"
-	ERROR_MANY_ANCHOR = "More than one anchor"
-	ERROR_ANCHOR_ALIAS = "Can't define both an anchor and an alias"
-	ERROR_BAD_ALIAS = "Invalid alias: %s"
-	ERROR_MANY_ALIAS = "More than one alias"
-	ERROR_ZERO_INDENT = "Can't use zero as an indentation width"
-	ERROR_UNSUPPORTED_VERSION = "This release of YAML.rb does not support YAML version %s"
-	ERROR_UNSUPPORTED_ENCODING = "Attempt to use unsupported encoding: %s"
-
-	#
-	# YAML Error classes
-	#
-
-	class Error < StandardError; end
-	class ParseError < Error; end
-    class TypeError < StandardError; end
-
-end
diff --git a/ext/syck/lib/syck/loader.rb b/ext/syck/lib/syck/loader.rb
deleted file mode 100644
index 925c9ee4b2..0000000000
--- a/ext/syck/lib/syck/loader.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# YAML::Loader class
-# .. type handling ..
-#
-module Syck
-    class Loader
-        TRANSFER_DOMAINS = {
-            'yaml.org,2002' => {},
-            'ruby.yaml.org,2002' => {}
-        }
-        PRIVATE_TYPES = {}
-        IMPLICIT_TYPES = [ 'null', 'bool', 'time', 'int', 'float' ]
-    end
-end
diff --git a/ext/syck/lib/syck/rubytypes.rb b/ext/syck/lib/syck/rubytypes.rb
deleted file mode 100644
index eeef156e27..0000000000
--- a/ext/syck/lib/syck/rubytypes.rb
+++ /dev/null
@@ -1,466 +0,0 @@
-# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
-require 'date'
-
-class Class
-	def to_yaml( opts = {} )
-		raise TypeError, "can't dump anonymous class %s" % self.class
-	end
-end
-
-class Object
-    yaml_as "tag:ruby.yaml.org,2002:object"
-    def to_yaml_style; end
-    undef to_yaml_properties rescue nil
-    def to_yaml_properties; instance_variables.sort; end
-	def to_yaml( opts = {} )
-		YAML::quick_emit( self, opts ) do |out|
-            out.map( taguri, to_yaml_style ) do |map|
-				to_yaml_properties.each do |m|
-                    map.add( m[1..-1], instance_variable_get( m ) )
-                end
-            end
-        end
-	end
-    alias :syck_to_yaml :to_yaml
-end
-
-class Hash
-    yaml_as "tag:ruby.yaml.org,2002:hash"
-    yaml_as "tag:yaml.org,2002:map"
-    def yaml_initialize( tag, val )
-        if Array === val
-            update Hash.[]( *val )		# Convert the map to a sequence
-        elsif Hash === val
-            update val
-        else
-            raise YAML::TypeError, "Invalid map explicitly tagged #{ tag }: " + val.inspect
-        end
-    end
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( self, opts ) do |out|
-            out.map( taguri, to_yaml_style ) do |map|
-                each do |k, v|
-                    map.add( k, v )
-                end
-            end
-        end
-	end
-end
-
-class Struct
-    yaml_as "tag:ruby.yaml.org,2002:struct"
-    def self.yaml_tag_class_name; self.name.gsub( "Struct::", "" ); end
-    def self.yaml_tag_read_class( name ); "Struct::#{ name }"; end
-    def self.yaml_new( klass, tag, val )
-        if Hash === val
-            struct_type = nil
-
-            #
-            # Use existing Struct if it exists
-            #
-            props = {}
-            val.delete_if { |k,v| props[k] = v if k =~ /^@/ }
-            begin
-                struct_type = YAML.read_type_class( tag, Struct ).last
-            rescue NameError
-            end
-            if not struct_type
-                struct_def = [ tag.split( ':', 4 ).last ]
-                struct_type = Struct.new( *struct_def.concat( val.keys.collect { |k| k.intern } ) )
-            end
-
-            #
-            # Set the Struct properties
-            #
-            st = YAML::object_maker( struct_type, {} )
-            st.members.each do |m|
-                st.send( "#{m}=", val[m.to_s] )
-            end
-            props.each do |k,v|
-                st.instance_variable_set(k, v)
-            end
-            st
-        else
-            raise YAML::TypeError, "Invalid Ruby Struct: " + val.inspect
-        end
-    end
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( self, opts ) do |out|
-			#
-			# Basic struct is passed as a YAML map
-			#
-            out.map( taguri, to_yaml_style ) do |map|
-				self.members.each do |m|
-                    map.add( m.to_s, self[m.to_s] )
-                end
-				self.to_yaml_properties.each do |m|
-                    map.add( m, instance_variable_get( m ) )
-                end
-            end
-        end
-	end
-end
-
-class Array
-    yaml_as "tag:ruby.yaml.org,2002:array"
-    yaml_as "tag:yaml.org,2002:seq"
-    def yaml_initialize( tag, val ); concat( val.to_a ); end
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( self, opts ) do |out|
-            out.seq( taguri, to_yaml_style ) do |seq|
-                each do |x|
-                    seq.add( x )
-                end
-            end
-        end
-	end
-end
-
-class Exception
-    yaml_as "tag:ruby.yaml.org,2002:exception"
-    def Exception.yaml_new( klass, tag, val )
-        o = YAML.object_maker( klass, { 'mesg' => val.delete( 'message' ) } )
-        val.each_pair do |k,v|
-            o.instance_variable_set("@#{k}", v)
-        end
-        o
-    end
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( self, opts ) do |out|
-            out.map( taguri, to_yaml_style ) do |map|
-                map.add( 'message', message )
-				to_yaml_properties.each do |m|
-                    map.add( m[1..-1], instance_variable_get( m ) )
-                end
-            end
-        end
-	end
-end
-
-class String
-    yaml_as "tag:ruby.yaml.org,2002:string"
-    yaml_as "tag:yaml.org,2002:binary"
-    yaml_as "tag:yaml.org,2002:str"
-    def is_complex_yaml?
-        to_yaml_style or not to_yaml_properties.empty? or self =~ /\n.+/
-    end
-    def is_binary_data?
-        self.count("\x00-\x7F", "^ -~\t\r\n").fdiv(self.size) > 0.3 || self.index("\x00") unless self.empty?
-    end
-    def String.yaml_new( klass, tag, val )
-        val = val.unpack("m")[0] if tag == "tag:yaml.org,2002:binary"
-        val = { 'str' => val } if String === val
-        if Hash === val
-            s = klass.allocate
-            # Thank you, NaHi
-            String.instance_method(:initialize).
-                  bind(s).
-                  call( val.delete( 'str' ) )
-            val.each { |k,v| s.instance_variable_set( k, v ) }
-            s
-        else
-            raise YAML::TypeError, "Invalid String: " + val.inspect
-        end
-    end
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( is_complex_yaml? ? self : nil, opts ) do |out|
-            if is_binary_data?
-                out.scalar( "tag:yaml.org,2002:binary", [self].pack("m"), :literal )
-            elsif to_yaml_properties.empty?
-                out.scalar( taguri, self, self =~ /^:/ ? :quote2 : to_yaml_style )
-            else
-                out.map( taguri, to_yaml_style ) do |map|
-                    map.add( 'str', "#{self}" )
-                    to_yaml_properties.each do |m|
-                        map.add( m, instance_variable_get( m ) )
-                    end
-                end
-            end
-        end
-	end
-end
-
-class Symbol
-    yaml_as "tag:ruby.yaml.org,2002:symbol"
-    yaml_as "tag:ruby.yaml.org,2002:sym"
-    def Symbol.yaml_new( klass, tag, val )
-        if String === val
-            val = YAML::load( val ) if val =~ /\A(["']).*\1\z/
-            val.intern
-        else
-            raise YAML::TypeError, "Invalid Symbol: " + val.inspect
-        end
-    end
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( nil, opts ) do |out|
-            out.scalar( "tag:yaml.org,2002:str", self.inspect, :plain )
-        end
-	end
-end
-
-class Range
-    yaml_as "tag:ruby.yaml.org,2002:range"
-    def Range.yaml_new( klass, tag, val )
-        inr = %r'(\w+|[+-]?\d+(?:\.\d+)?(?:e[+-]\d+)?|"(?:[^\\"]|\\.)*")'
-        opts = {}
-        if String === val and val =~ /^#{inr}(\.{2,3})#{inr}$/o
-            r1, rdots, r2 = $1, $2, $3
-            opts = {
-                'begin' => YAML.load( "--- #{r1}" ),
-                'end' => YAML.load( "--- #{r2}" ),
-                'excl' => rdots.length == 3
-            }
-            val = {}
-        elsif Hash === val
-            opts['begin'] = val.delete('begin')
-            opts['end'] = val.delete('end')
-            opts['excl'] = val.delete('excl')
-        end
-        if Hash === opts
-            r = YAML::object_maker( klass, {} )
-            # Thank you, NaHi
-            Range.instance_method(:initialize).
-                  bind(r).
-                  call( opts['begin'], opts['end'], opts['excl'] )
-            val.each { |k,v| r.instance_variable_set( k, v ) }
-            r
-        else
-            raise YAML::TypeError, "Invalid Range: " + val.inspect
-        end
-    end
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( self, opts ) do |out|
-            # if self.begin.is_complex_yaml? or self.begin.respond_to? :to_str or
-            #   self.end.is_complex_yaml? or self.end.respond_to? :to_str or
-            #   not to_yaml_properties.empty?
-                out.map( taguri, to_yaml_style ) do |map|
-                    map.add( 'begin', self.begin )
-                    map.add( 'end', self.end )
-                    map.add( 'excl', self.exclude_end? )
-                    to_yaml_properties.each do |m|
-                        map.add( m, instance_variable_get( m ) )
-                    end
-                end
-            # else
-            #     out.scalar( taguri ) do |sc|
-            #         sc.embed( self.begin )
-            #         sc.concat( self.exclude_end? ? "..." : ".." )
-            #         sc.embed( self.end )
-            #     end
-            # end
-        end
-	end
-end
-
-class Regexp
-    yaml_as "tag:ruby.yaml.org,2002:regexp"
-    def Regexp.yaml_new( klass, tag, val )
-        if String === val and val =~ /^\/(.*)\/([mixn]*)$/
-            val = { 'regexp' => $1, 'mods' => $2 }
-        end
-        if Hash === val
-            mods = nil
-            unless val['mods'].to_s.empty?
-                mods = 0x00
-                mods |= Regexp::EXTENDED if val['mods'].include?( 'x' )
-                mods |= Regexp::IGNORECASE if val['mods'].include?( 'i' )
-                mods |= Regexp::MULTILINE if val['mods'].include?( 'm' )
-                mods |= Regexp::NOENCODING if val['mods'].include?( 'n' )
-            end
-            val.delete( 'mods' )
-            r = YAML::object_maker( klass, {} )
-            Regexp.instance_method(:initialize).
-                  bind(r).
-                  call( val.delete( 'regexp' ), mods )
-            val.each { |k,v| r.instance_variable_set( k, v ) }
-            r
-        else
-            raise YAML::TypeError, "Invalid Regular expression: " + val.inspect
-        end
-    end
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( nil, opts ) do |out|
-            if to_yaml_properties.empty?
-                out.scalar( taguri, self.inspect, :plain )
-            else
-                out.map( taguri, to_yaml_style ) do |map|
-                    src = self.inspect
-                    if src =~ /\A\/(.*)\/([a-z]*)\Z/
-                        map.add( 'regexp', $1 )
-                        map.add( 'mods', $2 )
-                    else
-		                raise YAML::TypeError, "Invalid Regular expression: " + src
-                    end
-                    to_yaml_properties.each do |m|
-                        map.add( m, instance_variable_get( m ) )
-                    end
-                end
-            end
-        end
-	end
-end
-
-class Time
-    yaml_as "tag:ruby.yaml.org,2002:time"
-    yaml_as "tag:yaml.org,2002:timestamp"
-    def Time.yaml_new( klass, tag, val )
-        if Hash === val
-            t = val.delete( 'at' )
-            val.each { |k,v| t.instance_variable_set( k, v ) }
-            t
-        else
-            raise YAML::TypeError, "Invalid Time: " + val.inspect
-        end
-    end
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( self, opts ) do |out|
-            tz = "Z"
-            # from the tidy Tobias Peters <t-peters@gmx.de> Thanks!
-            unless self.utc?
-                utc_same_instant = self.dup.utc
-                utc_same_writing = Time.utc(year,month,day,hour,min,sec,usec)
-                difference_to_utc = utc_same_writing - utc_same_instant
-                if (difference_to_utc < 0)
-                    difference_sign = '-'
-                    absolute_difference = -difference_to_utc
-                else
-                    difference_sign = '+'
-                    absolute_difference = difference_to_utc
-                end
-                difference_minutes = (absolute_difference/60).round
-                tz = "%s%02d:%02d" % [ difference_sign, difference_minutes / 60, difference_minutes % 60]
-            end
-            standard = self.strftime( "%Y-%m-%d %H:%M:%S" )
-            standard += ".%06d" % [usec] if usec.nonzero?
-            standard += " %s" % [tz]
-            if to_yaml_properties.empty?
-                out.scalar( taguri, standard, :plain )
-            else
-                out.map( taguri, to_yaml_style ) do |map|
-                    map.add( 'at', standard )
-                    to_yaml_properties.each do |m|
-                        map.add( m, instance_variable_get( m ) )
-                    end
-                end
-            end
-        end
-	end
-end
-
-class Date
-    yaml_as "tag:yaml.org,2002:timestamp#ymd"
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( self, opts ) do |out|
-            out.scalar( "tag:yaml.org,2002:timestamp", self.to_s, :plain )
-        end
-	end
-end
-
-class Integer
-    yaml_as "tag:yaml.org,2002:int"
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( nil, opts ) do |out|
-            out.scalar( "tag:yaml.org,2002:int", self.to_s, :plain )
-        end
-	end
-end
-
-class Float
-    yaml_as "tag:yaml.org,2002:float"
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( nil, opts ) do |out|
-            str = self.to_s
-            if str == "Infinity"
-                str = ".Inf"
-            elsif str == "-Infinity"
-                str = "-.Inf"
-            elsif str == "NaN"
-                str = ".NaN"
-            end
-            out.scalar( "tag:yaml.org,2002:float", str, :plain )
-        end
-	end
-end
-
-class Rational
-	yaml_as "tag:ruby.yaml.org,2002:object:Rational"
-	def Rational.yaml_new( klass, tag, val )
-		if val.is_a? String
-			Rational( val )
-		else
-			Rational( val['numerator'], val['denominator'] )
-		end
-	end
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( self, opts ) do |out|
-			out.map( taguri, nil ) do |map|
-				map.add( 'denominator', denominator )
-				map.add( 'numerator', numerator )
-			end
-		end
-	end
-end
-
-class Complex
-	yaml_as "tag:ruby.yaml.org,2002:object:Complex"
-	def Complex.yaml_new( klass, tag, val )
-		if val.is_a? String
-			Complex( val )
-		else
-			Complex( val['real'], val['image'] )
-		end
-	end
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( self, opts ) do |out|
-			out.map( taguri, nil ) do |map|
-				map.add( 'image', imaginary )
-				map.add( 'real', real )
-			end
-		end
-	end
-end
-
-class TrueClass
-    yaml_as "tag:yaml.org,2002:bool#yes"
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( nil, opts ) do |out|
-            out.scalar( taguri, "true", :plain )
-        end
-	end
-end
-
-class FalseClass
-    yaml_as "tag:yaml.org,2002:bool#no"
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( nil, opts ) do |out|
-            out.scalar( taguri, "false", :plain )
-        end
-	end
-end
-
-class NilClass
-    yaml_as "tag:yaml.org,2002:null"
-	def to_yaml( opts = {} )
-        return super unless YAML::ENGINE.syck?
-		YAML::quick_emit( nil, opts ) do |out|
-            out.scalar( taguri, "", :plain )
-        end
-	end
-end
-
diff --git a/ext/syck/lib/syck/stream.rb b/ext/syck/lib/syck/stream.rb
deleted file mode 100644
index cd77a033c6..0000000000
--- a/ext/syck/lib/syck/stream.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-module Syck
-
-	#
-	# YAML::Stream -- for emitting many documents
-	#
-	class Stream
-
-		attr_accessor :documents, :options
-
-		def initialize( opts = {} )
-			@options = opts
-			@documents = []
-		end
-
-        def []( i )
-            @documents[ i ]
-        end
-
-		def add( doc )
-			@documents << doc
-		end
-
-		def edit( doc_num, doc )
-                  warn "#{caller[0]}: edit is deprecated" if $VERBOSE
-			@documents[ doc_num ] = doc
-		end
-
-		def emit( io = nil )
-            # opts = @options.dup
-			# opts[:UseHeader] = true if @documents.length > 1
-            out = Syck.emitter
-            out.reset( io || io2 = StringIO.new )
-            @documents.each { |v|
-                v.to_yaml( out )
-            }
-            io || ( io2.rewind; io2.read )
-		end
-
-	end
-
-end
diff --git a/ext/syck/lib/syck/stringio.rb b/ext/syck/lib/syck/stringio.rb
deleted file mode 100644
index 77a2b827e5..0000000000
--- a/ext/syck/lib/syck/stringio.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-warn "#{caller[0]}: yaml/stringio is deprecated" if $VERBOSE
-
-#
-# Limited StringIO if no core lib is available
-#
-begin
-require 'stringio'
-rescue LoadError
-    # StringIO based on code by MoonWolf
-    class StringIO
-        def initialize(string="")
-            @string=string
-            @pos=0
-            @eof=(string.size==0)
-        end
-        def pos
-            @pos
-        end
-        def eof
-            @eof
-        end
-        alias eof? eof
-        def readline(rs=$/)
-            if @eof
-                raise EOFError
-            else
-                if p = @string[@pos..-1]=~rs
-                    line = @string[@pos,p+1]
-                else
-                    line = @string[@pos..-1]
-                end
-                @pos+=line.size
-                @eof =true if @pos==@string.size
-                $_ = line
-            end
-        end
-        def rewind
-            seek(0,0)
-        end
-        def seek(offset,whence)
-            case whence
-            when 0
-                @pos=offset
-            when 1
-                @pos+=offset
-            when 2
-                @pos=@string.size+offset
-            end
-            @eof=(@pos>=@string.size)
-            0
-        end
-    end
-
-	#
-	# Class method for creating streams
-	#
-	def Syck.make_stream( io )
-        if String === io
-            io = StringIO.new( io )
-        elsif not IO === io
-            raise Syck::Error, "YAML stream must be an IO or String object."
-        end
-        if Syck::unicode
-            def io.readline
-                Syck.utf_to_internal( readline( @ln_sep ), @utf_encoding )
-            end
-            def io.check_unicode
-                @utf_encoding = Syck.sniff_encoding( read( 4 ) )
-                @ln_sep = Syck.enc_separator( @utf_encoding )
-                seek( -4, IO::SEEK_CUR )
-            end
-		    def io.utf_encoding
-		    	@utf_encoding
-		    end
-            io.check_unicode
-        else
-            def io.utf_encoding
-                :None
-            end
-        end
-        io
-	end
-
-end
-
diff --git a/ext/syck/lib/syck/syck.rb b/ext/syck/lib/syck/syck.rb
deleted file mode 100644
index 10e5023f46..0000000000
--- a/ext/syck/lib/syck/syck.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# YAML::Syck module
-# .. glues syck and yaml.rb together ..
-#
-require 'syck/basenode'
-
-module Syck
-
-  #
-  # Mixin BaseNode functionality
-  #
-  class Node
-    include Syck::BaseNode
-  end
-
-end
diff --git a/ext/syck/lib/syck/tag.rb b/ext/syck/lib/syck/tag.rb
deleted file mode 100644
index 9c6de57953..0000000000
--- a/ext/syck/lib/syck/tag.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
-# $Id$
-#
-# = yaml/tag.rb: methods for associating a taguri to a class.
-#
-# Author:: why the lucky stiff
-#
-module Syck
-    # A dictionary of taguris which map to
-    # Ruby classes.
-    @@tagged_classes = {}
-
-    #
-    # Associates a taguri _tag_ with a Ruby class _cls_.  The taguri is used to give types
-    # to classes when loading YAML.  Taguris are of the form:
-    #
-    #   tag:authorityName,date:specific
-    #
-    # The +authorityName+ is a domain name or email address.  The +date+ is the date the type
-    # was issued in YYYY or YYYY-MM or YYYY-MM-DD format.  The +specific+ is a name for
-    # the type being added.
-    #
-    # For example, built-in YAML types have 'yaml.org' as the +authorityName+ and '2002' as the
-    # +date+.  The +specific+ is simply the name of the type:
-    #
-    #  tag:yaml.org,2002:int
-    #  tag:yaml.org,2002:float
-    #  tag:yaml.org,2002:timestamp
-    #
-    # The domain must be owned by you on the +date+ declared.  If you don't own any domains on the
-    # date you declare the type, you can simply use an e-mail address.
-    #
-    #  tag:why@ruby-lang.org,2004:notes/personal
-    #
-    def self.tag_class( tag, cls )
-        if @@tagged_classes.has_key? tag
-            warn "class #{ @@tagged_classes[tag] } held ownership of the #{ tag } tag"
-        end
-        @@tagged_classes[tag] = cls
-    end
-
-    # Returns the complete dictionary of taguris, paired with classes.  The key for
-    # the dictionary is the full taguri.  The value for each key is the class constant
-    # associated to that taguri.
-    #
-    #  YAML.tagged_classes["tag:yaml.org,2002:int"] => Integer
-    #
-    def self.tagged_classes
-        @@tagged_classes
-    end
-end
-
-class Module
-    # :stopdoc:
-
-    # Adds a taguri _tag_ to a class, used when dumping or loading the class
-    # in YAML.  See YAML::tag_class for detailed information on typing and
-    # taguris.
-    def syck_yaml_as( tag, sc = true )
-        verbose, $VERBOSE = $VERBOSE, nil
-        class_eval <<-"END", __FILE__, __LINE__+1
-            attr_writer :taguri
-            def taguri
-                if respond_to? :to_yaml_type
-                    Syck.tagurize( to_yaml_type[1..-1] )
-                else
-                    return @taguri if defined?(@taguri) and @taguri
-                    tag = #{ tag.dump }
-                    if self.class.yaml_tag_subclasses? and self.class != Syck.tagged_classes[tag]
-                        tag = "\#{ tag }:\#{ self.class.yaml_tag_class_name }"
-                    end
-                    tag
-                end
-            end
-            def self.yaml_tag_subclasses?; #{ sc ? 'true' : 'false' }; end
-        END
-        Syck.tag_class tag, self
-    ensure
-        $VERBOSE = verbose
-    end
-    remove_method :yaml_as rescue nil
-    alias :yaml_as :syck_yaml_as
-
-    # Transforms the subclass name into a name suitable for display
-    # in a subclassed tag.
-    def yaml_tag_class_name
-        self.name
-    end
-    # Transforms the subclass name found in the tag into a Ruby
-    # constant name.
-    def yaml_tag_read_class( name )
-        name
-    end
-    # :startdoc:
-end
diff --git a/ext/syck/lib/syck/types.rb b/ext/syck/lib/syck/types.rb
deleted file mode 100644
index 5c129acba4..0000000000
--- a/ext/syck/lib/syck/types.rb
+++ /dev/null
@@ -1,192 +0,0 @@
-# -*- mode: ruby; ruby-indent-level: 4 -*- vim: sw=4
-#
-# Classes required by the full core typeset
-#
-
-module Syck
-
-    #
-    # Default private type
-    #
-    class PrivateType
-        def self.tag_subclasses?; false; end
-        verbose, $VERBOSE = $VERBOSE, nil
-        def initialize( type, val )
-            @type_id = type; @value = val
-            @value.taguri = "x-private:#{ @type_id }"
-        end
-        def to_yaml( opts = {} )
-            @value.to_yaml( opts )
-        end
-    ensure
-        $VERBOSE = verbose
-    end
-
-    #
-    # Default domain type
-    #
-    class DomainType
-        def self.tag_subclasses?; false; end
-        verbose, $VERBOSE = $VERBOSE, nil
-        def initialize( domain, type, val )
-            @domain = domain; @type_id = type; @value = val
-            @value.taguri = "tag:#{ @domain }:#{ @type_id }"
-        end
-        def to_yaml( opts = {} )
-            @value.to_yaml( opts )
-        end
-    ensure
-        $VERBOSE = verbose
-    end
-
-    #
-    # Unresolved objects
-    #
-    class Object
-        def self.tag_subclasses?; false; end
-        def to_yaml( opts = {} )
-            Syck.quick_emit( self, opts ) do |out|
-                out.map( "tag:ruby.yaml.org,2002:object:#{ @class }", to_yaml_style ) do |map|
-                    @ivars.each do |k,v|
-                        map.add( k, v )
-                    end
-                end
-            end
-        end
-    end
-
-    #
-    # YAML Hash class to support comments and defaults
-    #
-    class SpecialHash < ::Hash
-        attr_accessor :default
-        def inspect
-            self.default.to_s
-        end
-        def to_s
-            self.default.to_s
-        end
-        def update( h )
-            if Syck::SpecialHash === h
-                @default = h.default if h.default
-            end
-            super( h )
-        end
-        def to_yaml( opts = {} )
-            opts[:DefaultKey] = self.default
-            super( opts )
-        end
-    end
-
-    #
-    # Builtin collection: !omap
-    #
-    class Omap < ::Array
-        yaml_as "tag:yaml.org,2002:omap"
-        def yaml_initialize( tag, val )
-            if Array === val
-                val.each do |v|
-                    if Hash === v
-                        concat( v.to_a )		# Convert the map to a sequence
-                    else
-                        raise Syck::Error, "Invalid !omap entry: " + val.inspect
-                    end
-                end
-            else
-                raise Syck::Error, "Invalid !omap: " + val.inspect
-            end
-            self
-        end
-        def self.[]( *vals )
-            o = Omap.new
-            0.step( vals.length - 1, 2 ) do |i|
-                o[vals[i]] = vals[i+1]
-            end
-            o
-        end
-        def []( k )
-            self.assoc( k ).to_a[1]
-        end
-        def []=( k, *rest )
-            val, set = rest.reverse
-            if ( tmp = self.assoc( k ) ) and not set
-                tmp[1] = val
-            else
-                self << [ k, val ]
-            end
-            val
-        end
-        def has_key?( k )
-            self.assoc( k ) ? true : false
-        end
-        def is_complex_yaml?
-            true
-        end
-        def to_yaml( opts = {} )
-            Syck.quick_emit( self, opts ) do |out|
-                out.seq( taguri, to_yaml_style ) do |seq|
-                    self.each do |v|
-                        seq.add( Hash[ *v ] )
-                    end
-                end
-            end
-        end
-    end
-
-    #
-    # Builtin collection: !pairs
-    #
-    class Pairs < ::Array
-        yaml_as "tag:yaml.org,2002:pairs"
-        def yaml_initialize( tag, val )
-            if Array === val
-                val.each do |v|
-                    if Hash === v
-                        concat( v.to_a )		# Convert the map to a sequence
-                    else
-                        raise Syck::Error, "Invalid !pairs entry: " + val.inspect
-                    end
-                end
-            else
-                raise Syck::Error, "Invalid !pairs: " + val.inspect
-            end
-            self
-        end
-        def self.[]( *vals )
-            p = Pairs.new
-            0.step( vals.length - 1, 2 ) { |i|
-                p[vals[i]] = vals[i+1]
-            }
-            p
-        end
-        def []( k )
-            self.assoc( k ).to_a
-        end
-        def []=( k, val )
-            self << [ k, val ]
-            val
-        end
-        def has_key?( k )
-            self.assoc( k ) ? true : false
-        end
-        def is_complex_yaml?
-            true
-        end
-        def to_yaml( opts = {} )
-            Syck.quick_emit( self, opts ) do |out|
-                out.seq( taguri, to_yaml_style ) do |seq|
-                    self.each do |v|
-                        seq.add( Hash[ *v ] )
-                    end
-                end
-            end
-        end
-    end
-
-    #
-    # Builtin collection: !set
-    #
-    class Set < ::Hash
-        yaml_as "tag:yaml.org,2002:set"
-    end
-end
diff --git a/ext/syck/lib/syck/yamlnode.rb b/ext/syck/lib/syck/yamlnode.rb
deleted file mode 100644
index 2fa57b1f97..0000000000
--- a/ext/syck/lib/syck/yamlnode.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# YAML::YamlNode class
-#
-require 'syck/basenode'
-
-module Syck
-
-    #
-    # YAML Generic Model container
-    #
-    class YamlNode
-        include BaseNode
-        attr_accessor :kind, :type_id, :value, :anchor
-        def initialize(t, v)
-            @type_id = t
-            if Hash === v
-                @kind = 'map'
-                @value = {}
-                v.each {|key,val|
-                    @value[key.transform] = [key, val]
-                }
-            elsif Array === v
-                @kind = 'seq'
-                @value = v
-            elsif String === v
-                @kind = 'scalar'
-                @value = v
-            end
-        end
-
-        #
-        # Transform this node fully into a native type
-        #
-        def transform
-            t = nil
-            if @value.is_a? Hash
-                t = {}
-                @value.each { |k,v|
-                    t[ k ] = v[1].transform
-                }
-            elsif @value.is_a? Array
-                t = []
-                @value.each { |v|
-                    t.push v.transform
-                }
-            else
-                t = @value
-            end
-            Syck.transfer_method( @type_id, t )
-        end
-
-    end
-
-end
diff --git a/ext/syck/lib/syck/ypath.rb b/ext/syck/lib/syck/ypath.rb
deleted file mode 100644
index 024dcb7f4e..0000000000
--- a/ext/syck/lib/syck/ypath.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# YAML::YPath
-#
-
-warn "#{caller[0]}: YAML::YPath is deprecated" if $VERBOSE
-
-module Syck
-
-    class YPath
-        attr_accessor :segments, :predicates, :flags
-        def initialize( str )
-            @segments = []
-            @predicates = []
-            @flags = nil
-            while str =~ /^\/?(\/|[^\/\[]+)(?:\[([^\]]+)\])?/
-                @segments.push $1
-                @predicates.push $2
-                str = $'
-            end
-            unless str.to_s.empty?
-                @segments += str.split( "/" )
-            end
-            if @segments.length == 0
-                @segments.push "."
-            end
-        end
-        def self.each_path( str )
-            #
-            # Find choices
-            #
-            paths = []
-            str = "(#{ str })"
-            while str.sub!( /\(([^()]+)\)/, "\n#{ paths.length }\n" )
-                paths.push $1.split( '|' )
-            end
-
-            #
-            # Construct all possible paths
-            #
-            all = [ str ]
-            ( paths.length - 1 ).downto( 0 ) do |i|
-                all = all.collect do |a|
-                    paths[i].collect do |p|
-                        a.gsub( /\n#{ i }\n/, p )
-                    end
-                end.flatten.uniq
-            end
-            all.collect do |path|
-                yield YPath.new( path )
-            end
-        end
-    end
-
-end
diff --git a/ext/syck/lib/yaml/syck.rb b/ext/syck/lib/yaml/syck.rb
deleted file mode 100644
index 5b5d1c494e..0000000000
--- a/ext/syck/lib/yaml/syck.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# $Id$
-#
-# = yaml/syck.rb:
-#
-
-require 'stringio'
-require 'syck.so'
-require 'syck/error'
-require 'syck/syck'
-require 'syck/tag'
-require 'syck/stream'
-require 'syck/constants'
-require 'syck/rubytypes'
-require 'syck/types'
diff --git a/ext/syck/node.c b/ext/syck/node.c
deleted file mode 100644
index 35c1f45150..0000000000
--- a/ext/syck/node.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * node.c
- *
- * $Author$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-
-#include "ruby/ruby.h"
-#include "syck.h"
-
-/*
- * Node allocation functions
- */
-SyckNode *
-syck_alloc_node( enum syck_kind_tag type )
-{
-    SyckNode *s;
-
-    s = S_ALLOC( SyckNode );
-    s->kind = type;
-    s->id = 0;
-    s->type_id = NULL;
-    s->anchor = NULL;
-    s->shortcut = NULL;
-
-    return s;
-}
-
-void
-syck_free_node( SyckNode *n )
-{
-    syck_free_members( n );
-    if ( n->type_id != NULL )
-    {
-        S_FREE( n->type_id );
-        n->type_id = NULL;
-    }
-    if ( n->anchor != NULL )
-    {
-        S_FREE( n->anchor );
-        n->anchor = NULL;
-    }
-    S_FREE( n );
-}
-
-SyckNode *
-syck_alloc_map(void)
-{
-    SyckNode *n;
-    struct SyckMap *m;
-
-    m = S_ALLOC( struct SyckMap );
-    m->style = map_none;
-    m->idx = 0;
-    m->capa = ALLOC_CT;
-    m->keys = S_ALLOC_N( SYMID, m->capa );
-    m->values = S_ALLOC_N( SYMID, m->capa );
-
-    n = syck_alloc_node( syck_map_kind );
-    n->data.pairs = m;
-
-    return n;
-}
-
-SyckNode *
-syck_alloc_seq(void)
-{
-    SyckNode *n;
-    struct SyckSeq *s;
-
-    s = S_ALLOC( struct SyckSeq );
-    s->style = seq_none;
-    s->idx = 0;
-    s->capa = ALLOC_CT;
-    s->items = S_ALLOC_N( SYMID, s->capa );
-
-    n = syck_alloc_node( syck_seq_kind );
-    n->data.list = s;
-
-    return n;
-}
-
-SyckNode *
-syck_alloc_str(void)
-{
-    SyckNode *n;
-    struct SyckStr *s;
-
-    s = S_ALLOC( struct SyckStr );
-    s->len = 0;
-    s->ptr = NULL;
-    s->style = scalar_none;
-
-    n = syck_alloc_node( syck_str_kind );
-    n->data.str = s;
-
-    return n;
-}
-
-SyckNode *
-syck_new_str( const char *str, enum scalar_style style )
-{
-    return syck_new_str2( str, strlen( str ), style );
-}
-
-SyckNode *
-syck_new_str2( const char *str, long len, enum scalar_style style )
-{
-    SyckNode *n;
-
-    n = syck_alloc_str();
-    n->data.str->ptr = S_ALLOC_N( char, len + 1 );
-    n->data.str->len = len;
-    n->data.str->style = style;
-    memcpy( n->data.str->ptr, str, len );
-    n->data.str->ptr[len] = '\0';
-
-    return n;
-}
-
-void
-syck_replace_str( SyckNode *n, char *str, enum scalar_style style )
-{
-    syck_replace_str2( n, str, strlen( str ), style );
-}
-
-void
-syck_replace_str2( SyckNode *n, char *str, long len, enum scalar_style style )
-{
-    if ( n->data.str->ptr != NULL )
-    {
-        S_FREE( n->data.str->ptr );
-        n->data.str->ptr = NULL;
-        n->data.str->len = 0;
-    }
-    n->data.str->ptr = S_ALLOC_N( char, len + 1 );
-    n->data.str->len = len;
-    n->data.str->style = style;
-    memcpy( n->data.str->ptr, str, len );
-    n->data.str->ptr[len] = '\0';
-}
-
-void
-syck_str_blow_away_commas( SyckNode *n )
-{
-    char *go, *end;
-
-    go = n->data.str->ptr;
-    end = go + n->data.str->len;
-    while ( *(++go) != '\0' )
-    {
-        if ( *go == ',' )
-        {
-            n->data.str->len -= 1;
-            memmove( go, go + 1, end - go );
-            end -= 1;
-        }
-    }
-}
-
-char *
-syck_str_read( SyckNode *n )
-{
-    ASSERT( n != NULL );
-    return n->data.str->ptr;
-}
-
-SyckNode *
-syck_new_map( SYMID key, SYMID value )
-{
-    SyckNode *n;
-
-    n = syck_alloc_map();
-    syck_map_add( n, key, value );
-
-    return n;
-}
-
-void
-syck_map_empty( SyckNode *n )
-{
-    struct SyckMap *m;
-    ASSERT( n != NULL );
-    ASSERT( n->data.list != NULL );
-
-    S_FREE( n->data.pairs->keys );
-    S_FREE( n->data.pairs->values );
-    m = n->data.pairs;
-    m->idx = 0;
-    m->capa = ALLOC_CT;
-    m->keys = S_ALLOC_N( SYMID, m->capa );
-    m->values = S_ALLOC_N( SYMID, m->capa );
-}
-
-void
-syck_map_add( SyckNode *map, SYMID key, SYMID value )
-{
-    struct SyckMap *m;
-    long idx;
-
-    ASSERT( map != NULL );
-    ASSERT( map->data.pairs != NULL );
-
-    m = map->data.pairs;
-    idx = m->idx;
-    m->idx += 1;
-    if ( m->idx > m->capa )
-    {
-        m->capa += ALLOC_CT;
-        S_REALLOC_N( m->keys, SYMID, m->capa );
-        S_REALLOC_N( m->values, SYMID, m->capa );
-    }
-    m->keys[idx] = key;
-    m->values[idx] = value;
-}
-
-void
-syck_map_update( SyckNode *map1, SyckNode *map2 )
-{
-    struct SyckMap *m1, *m2;
-    long new_idx, new_capa;
-    ASSERT( map1 != NULL );
-    ASSERT( map2 != NULL );
-
-    m1 = map1->data.pairs;
-    m2 = map2->data.pairs;
-    if ( m2->idx < 1 ) return;
-
-    new_idx = m1->idx;
-    new_idx += m2->idx;
-    new_capa = m1->capa;
-    while ( new_idx > new_capa )
-    {
-        new_capa += ALLOC_CT;
-    }
-    if ( new_capa > m1->capa )
-    {
-        m1->capa = new_capa;
-        S_REALLOC_N( m1->keys, SYMID, m1->capa );
-        S_REALLOC_N( m1->values, SYMID, m1->capa );
-    }
-    for ( new_idx = 0; new_idx < m2->idx; m1->idx++, new_idx++ )
-    {
-        m1->keys[m1->idx] = m2->keys[new_idx];
-        m1->values[m1->idx] = m2->values[new_idx];
-    }
-}
-
-long
-syck_map_count( SyckNode *map )
-{
-    ASSERT( map != NULL );
-    ASSERT( map->data.pairs != NULL );
-    return map->data.pairs->idx;
-}
-
-void
-syck_map_assign( SyckNode *map, enum map_part p, long idx, SYMID id )
-{
-    struct SyckMap *m;
-
-    ASSERT( map != NULL );
-    m = map->data.pairs;
-    ASSERT( m != NULL );
-    if ( p == map_key )
-    {
-        m->keys[idx] = id;
-    }
-    else
-    {
-        m->values[idx] = id;
-    }
-}
-
-SYMID
-syck_map_read( SyckNode *map, enum map_part p, long idx )
-{
-    struct SyckMap *m;
-
-    ASSERT( map != NULL );
-    m = map->data.pairs;
-    ASSERT( m != NULL );
-    if ( p == map_key )
-    {
-        return m->keys[idx];
-    }
-    else
-    {
-        return m->values[idx];
-    }
-}
-
-SyckNode *
-syck_new_seq( SYMID value )
-{
-    SyckNode *n;
-
-    n = syck_alloc_seq();
-    syck_seq_add( n, value );
-
-    return n;
-}
-
-void
-syck_seq_empty( SyckNode *n )
-{
-    struct SyckSeq *s;
-    ASSERT( n != NULL );
-    ASSERT( n->data.list != NULL );
-
-    S_FREE( n->data.list->items );
-    s = n->data.list;
-    s->idx = 0;
-    s->capa = ALLOC_CT;
-    s->items = S_ALLOC_N( SYMID, s->capa );
-}
-
-void
-syck_seq_add( SyckNode *arr, SYMID value )
-{
-    struct SyckSeq *s;
-    long idx;
-
-    ASSERT( arr != NULL );
-    ASSERT( arr->data.list != NULL );
-
-    s = arr->data.list;
-    idx = s->idx;
-    s->idx += 1;
-    if ( s->idx > s->capa )
-    {
-        s->capa += ALLOC_CT;
-        S_REALLOC_N( s->items, SYMID, s->capa );
-    }
-    s->items[idx] = value;
-}
-
-long
-syck_seq_count( SyckNode *seq )
-{
-    ASSERT( seq != NULL );
-    ASSERT( seq->data.list != NULL );
-    return seq->data.list->idx;
-}
-
-void
-syck_seq_assign( SyckNode *seq, long idx, SYMID id )
-{
-    struct SyckSeq *s;
-
-    ASSERT( map != NULL );
-    s = seq->data.list;
-    ASSERT( m != NULL );
-    s->items[idx] = id;
-}
-
-SYMID
-syck_seq_read( SyckNode *seq, long idx )
-{
-    struct SyckSeq *s;
-
-    ASSERT( seq != NULL );
-    s = seq->data.list;
-    ASSERT( s != NULL );
-    return s->items[idx];
-}
-
-void
-syck_free_members( SyckNode *n )
-{
-    if ( n == NULL ) return;
-
-    switch ( n->kind  )
-    {
-        case syck_str_kind:
-            if ( n->data.str != NULL )
-            {
-                S_FREE( n->data.str->ptr );
-                n->data.str->ptr = NULL;
-                n->data.str->len = 0;
-                S_FREE( n->data.str );
-                n->data.str = NULL;
-            }
-        break;
-
-        case syck_seq_kind:
-            if ( n->data.list != NULL )
-            {
-                S_FREE( n->data.list->items );
-                S_FREE( n->data.list );
-                n->data.list = NULL;
-            }
-        break;
-
-        case syck_map_kind:
-            if ( n->data.pairs != NULL )
-            {
-                S_FREE( n->data.pairs->keys );
-                S_FREE( n->data.pairs->values );
-                S_FREE( n->data.pairs );
-                n->data.pairs = NULL;
-            }
-        break;
-    }
-}
-
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
deleted file mode 100644
index 2ab2e49482..0000000000
--- a/ext/syck/rubyext.c
+++ /dev/null
@@ -1,2328 +0,0 @@
-/* -*- indent-tabs-mode: nil -*- */
-/*
- * rubyext.c
- *
- * $Author$
- *
- * Copyright (C) 2003-2005 why the lucky stiff
- */
-
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
-#include "syck.h"
-#include <sys/types.h>
-#include <time.h>
-
-typedef struct RVALUE {
-    union {
-#if 0
-    struct {
-        unsigned long flags;    /* always 0 for freed obj */
-        struct RVALUE *next;
-    } free;
-#endif
-    struct RBasic  basic;
-    struct RObject object;
-    struct RClass  klass;
-    /*struct RFloat  flonum;*/
-    /*struct RString string;*/
-    struct RArray  array;
-    /*struct RRegexp regexp;*/
-    struct RHash   hash;
-    /*struct RData   data;*/
-    struct RStruct rstruct;
-    /*struct RBignum bignum;*/
-    /*struct RFile   file;*/
-    } as;
-} RVALUE;
-
-typedef struct {
-   long hash;
-   char *buffer;
-   long length;
-   long remaining;
-   int  printed;
-} bytestring_t;
-
-#define RUBY_DOMAIN   "ruby.yaml.org,2002"
-
-/*
- * symbols and constants
- */
-static ID s_new, s_utc, s_at, s_to_f, s_to_i, s_read, s_binmode, s_call, s_cmp, s_transfer, s_update, s_dup, s_haskey, s_match, s_keys, s_unpack, s_tr_bang, s_default_set, s_tag_read_class, s_tag_subclasses, s_resolver, s_push, s_emitter, s_level, s_detect_implicit, s_node_import, s_out, s_input, s_intern, s_transform, s_yaml_new, s_yaml_initialize, s_node_export, s_to_yaml, s_write, s_set_resolver, s_each;
-static ID s_tags, s_kind, s_name, s_options, s_type_id, s_type_id_set, s_style, s_style_set, s_value, s_value_set, s_parse;
-static VALUE sym_model, sym_generic, sym_input, sym_bytecode;
-static VALUE sym_scalar, sym_seq, sym_map;
-static VALUE sym_1quote, sym_2quote, sym_fold, sym_literal, sym_plain, sym_inline;
-static VALUE cDate, cNode, cMap, cSeq, cScalar, cOut, cParser, cResolver, cPrivateType, cDomainType, cYObject, cBadAlias, cDefaultKey, cMergeKey, cEmitter, cDateTime;
-static VALUE oDefaultResolver, oGenericResolver;
-
-/*
- * my private collection of numerical oddities.
- */
-static double S_zero(void)    { return 0.0; }
-static double S_one(void) { return 1.0; }
-static double S_inf(void) { return S_one() / S_zero(); }
-static double S_nan(void) { return S_zero() / S_zero(); }
-
-static VALUE syck_node_transform( VALUE );
-
-/*
- * handler prototypes
- */
-SYMID rb_syck_load_handler _((SyckParser *, SyckNode *));
-void rb_syck_err_handler _((SyckParser *, const char *));
-SyckNode * rb_syck_bad_anchor_handler _((SyckParser *, char *));
-void rb_syck_output_handler _((SyckEmitter *, char *, long));
-void rb_syck_emitter_handler _((SyckEmitter *, st_data_t));
-int syck_parser_assign_io _((SyckParser *, VALUE *));
-VALUE syck_scalar_alloc _((VALUE class));
-VALUE syck_seq_alloc _((VALUE class));
-VALUE syck_map_alloc _((VALUE class));
-
-struct parser_xtra {
-    VALUE data;  /* Borrowed this idea from marshal.c to fix [ruby-core:8067] problem */
-    VALUE proc;
-    VALUE resolver;
-    int taint;
-};
-
-struct emitter_xtra {
-    VALUE oid;
-    VALUE data;
-    VALUE port;
-};
-
-/*
- * Convert YAML to bytecode
- */
-VALUE
-rb_syck_compile(VALUE self, VALUE port)
-{
-    SYMID oid;
-    int taint;
-    char *ret;
-    VALUE bc;
-    bytestring_t *sav = NULL;
-    void *data = NULL;
-
-    SyckParser *parser = syck_new_parser();
-    taint = syck_parser_assign_io(parser, &port);
-    syck_parser_handler( parser, syck_yaml2byte_handler );
-    syck_parser_error_handler( parser, NULL );
-    syck_parser_implicit_typing( parser, 0 );
-    syck_parser_taguri_expansion( parser, 0 );
-    oid = syck_parse( parser );
-    if (!syck_lookup_sym( parser, oid, &data )) {
-	rb_raise(rb_eSyntaxError, "root node <%p> not found", (void *)oid);
-    }
-    sav = data;
-
-    ret = S_ALLOCA_N( char, strlen( sav->buffer ) + 3 );
-    ret[0] = '\0';
-    strcat( ret, "D\n" );
-    strcat( ret, sav->buffer );
-
-    syck_free_parser( parser );
-
-    bc = rb_str_new2( ret );
-    if ( taint )      OBJ_TAINT( bc );
-    return bc;
-}
-
-/*
- * read from io.
- */
-long
-rb_syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
-{
-    long len = 0;
-
-    ASSERT( str != NULL );
-    max_size -= skip;
-
-    if ( max_size <= 0 ) max_size = 0;
-    else
-    {
-        /*
-         * call io#read.
-         */
-        VALUE src = (VALUE)str->ptr;
-        VALUE n = LONG2NUM(max_size);
-        VALUE str2 = rb_funcall2(src, s_read, 1, &n);
-        if (!NIL_P(str2))
-        {
-            StringValue(str2);
-            len = RSTRING_LEN(str2);
-            memcpy( buf + skip, RSTRING_PTR(str2), len );
-        }
-    }
-    len += skip;
-    buf[len] = '\0';
-    return len;
-}
-
-/*
- * determine: are we reading from a string or io?
- * (returns tainted? boolean)
- */
-int
-syck_parser_assign_io(SyckParser *parser, VALUE *pport)
-{
-    int taint = Qtrue;
-    VALUE tmp, port = *pport;
-    if (!NIL_P(tmp = rb_check_string_type(port))) {
-        taint = OBJ_TAINTED(port); /* original taintedness */
-        port = tmp;
-        syck_parser_str( parser, RSTRING_PTR(port), RSTRING_LEN(port), NULL );
-    }
-    else if (rb_respond_to(port, s_read)) {
-        if (rb_respond_to(port, s_binmode)) {
-            rb_funcall2(port, s_binmode, 0, 0);
-        }
-        syck_parser_str( parser, (char *)port, 0, rb_syck_io_str_read );
-    }
-    else {
-        rb_raise(rb_eTypeError, "instance of IO needed");
-    }
-    *pport = port;
-    return taint;
-}
-
-/*
- * Get value in hash by key, forcing an empty hash if nil.
- */
-VALUE
-syck_get_hash_aref(VALUE hsh, VALUE key)
-{
-   VALUE val = rb_hash_aref( hsh, key );
-   if ( NIL_P( val ) )
-   {
-       val = rb_hash_new();
-       rb_hash_aset(hsh, key, val);
-   }
-   return val;
-}
-
-/*
- * creating timestamps
- */
-struct mktime_arg {
-    const char *str;
-    long len;
-};
-
-VALUE
-mktime_do(VALUE varg)
-{
-    struct mktime_arg *arg = (struct mktime_arg *)varg;
-    VALUE time;
-    const char *str = arg->str;
-    long len = arg->len;
-    const char *ptr = str;
-    VALUE year = INT2FIX(0);
-    VALUE mon = INT2FIX(0);
-    VALUE day = INT2FIX(0);
-    VALUE hour = INT2FIX(0);
-    VALUE min = INT2FIX(0);
-    VALUE sec = INT2FIX(0);
-    long usec;
-
-    /* Year*/
-    if ( ptr[0] != '\0' && len > 0 ) {
-        year = INT2FIX(strtol(ptr, NULL, 10));
-    }
-
-    /* Month*/
-    ptr += 4;
-    if ( ptr[0] != '\0' && len > ptr - str ) {
-        while ( !ISDIGIT( *ptr ) ) ptr++;
-        mon = INT2FIX(strtol(ptr, NULL, 10));
-    }
-
-    /* Day*/
-    ptr += 2;
-    if ( ptr[0] != '\0' && len > ptr - str ) {
-        while ( !ISDIGIT( *ptr ) ) ptr++;
-        day = INT2FIX(strtol(ptr, NULL, 10));
-    }
-
-    /* Hour*/
-    ptr += 2;
-    if ( ptr[0] != '\0' && len > ptr - str ) {
-        while ( !ISDIGIT( *ptr ) ) ptr++;
-        hour = INT2FIX(strtol(ptr, NULL, 10));
-    }
-
-    /* Minute */
-    ptr += 2;
-    if ( ptr[0] != '\0' && len > ptr - str ) {
-        while ( !ISDIGIT( *ptr ) ) ptr++;
-        min = INT2FIX(strtol(ptr, NULL, 10));
-    }
-
-    /* Second */
-    ptr += 2;
-    if ( ptr[0] != '\0' && len > ptr - str ) {
-        while ( !ISDIGIT( *ptr ) ) ptr++;
-        sec = INT2FIX(strtol(ptr, NULL, 10));
-    }
-
-    /* Millisecond */
-    ptr += 2;
-    if ( len > ptr - str && *ptr == '.' )
-    {
-        char padded[] = "000000";
-        const int padding = (int)(sizeof(padded) - 1);
-        const char *end = ptr + 1;
-        const char *begin = end;
-        ptrdiff_t length;
-        while ( isdigit( *end ) ) end++;
-        if ((length = (end - begin)) > padding) length = padding;
-        MEMCPY(padded, begin, char, length);
-        usec = strtol(padded, NULL, 10);
-    }
-    else
-    {
-        usec = 0;
-    }
-
-    /* Time Zone*/
-    while ( len > ptr - str && *ptr != 'Z' && *ptr != '+' && *ptr != '-' && *ptr != '\0' ) ptr++;
-    if ( len > ptr - str && ( *ptr == '-' || *ptr == '+' ) )
-    {
-        time_t tz_offset = strtol(ptr, NULL, 10) * 3600;
-        VALUE tmp;
-
-        while ( *ptr != ':' && *ptr != '\0' ) ptr++;
-        if ( *ptr == ':' )
-        {
-            ptr += 1;
-            if ( tz_offset < 0 )
-            {
-                tz_offset -= strtol(ptr, NULL, 10) * 60;
-            }
-            else
-            {
-                tz_offset += strtol(ptr, NULL, 10) * 60;
-            }
-        }
-
-        /* Make TZ time*/
-        time = rb_funcall(rb_cTime, s_utc, 6, year, mon, day, hour, min, sec);
-        tmp = rb_funcall(time, s_to_i, 0);
-        tmp = rb_funcall(tmp, '-', 1, LONG2FIX(tz_offset));
-        return rb_funcall(rb_cTime, s_at, 2, tmp, LONG2NUM(usec));
-    }
-    else
-    {
-        /* Make UTC time*/
-        return rb_funcall(rb_cTime, s_utc, 7, year, mon, day, hour, min, sec, LONG2NUM(usec));
-    }
-}
-
-VALUE
-mktime_r(VALUE varg)
-{
-    struct mktime_arg *arg = (struct mktime_arg *)varg;
-
-    if (!cDateTime) {
-        /*
-         * Load Date module
-         */
-        rb_require("date");
-        cDateTime = rb_const_get(rb_cObject, rb_intern("DateTime"));
-    }
-    return rb_funcall(cDateTime, s_parse, 1, rb_str_new(arg->str, arg->len));
-}
-
-VALUE
-rb_syck_mktime(const char *str, long len)
-{
-    struct mktime_arg a;
-
-    a.str = str;
-    a.len = len;
-    return rb_rescue2(mktime_do, (VALUE)&a, mktime_r, (VALUE)&a, rb_eArgError, NULL);
-}
-
-/*
- * handles merging of an array of hashes
- * (see http://www.yaml.org/type/merge/)
- */
-VALUE
-syck_merge_i(VALUE entry, VALUE hsh )
-{
-    VALUE tmp;
-    if ( !NIL_P(tmp = rb_check_convert_type(entry, T_HASH, "Hash", "to_hash")) )
-    {
-        entry = tmp;
-        rb_funcall( hsh, s_update, 1, entry );
-    }
-    return Qnil;
-}
-
-/*
- * default handler for ruby.yaml.org types
- */
-int
-yaml_org_handler( SyckNode *n, VALUE *ref )
-{
-    char *type_id = n->type_id;
-    int transferred = 0;
-    long i = 0;
-    VALUE obj = Qnil;
-
-    if ( type_id != NULL && strncmp( type_id, "tag:yaml.org,2002:", 18 ) == 0 )
-    {
-        type_id += 18;
-    }
-
-    switch (n->kind)
-    {
-        case syck_str_kind:
-            transferred = 1;
-            if ( type_id == NULL )
-            {
-                obj = rb_str_new( n->data.str->ptr, n->data.str->len );
-            }
-            else if ( strcmp( type_id, "null" ) == 0 )
-            {
-                obj = Qnil;
-            }
-            else if ( strcmp( type_id, "binary" ) == 0 )
-            {
-                VALUE arr;
-                obj = rb_str_new( n->data.str->ptr, n->data.str->len );
-                rb_funcall( obj, s_tr_bang, 2, rb_str_new2( "\n\t " ), rb_str_new2( "" ) );
-                arr = rb_funcall( obj, s_unpack, 1, rb_str_new2( "m" ) );
-                obj = rb_ary_shift( arr );
-            }
-            else if ( strcmp( type_id, "bool#yes" ) == 0 )
-            {
-                obj = Qtrue;
-            }
-            else if ( strcmp( type_id, "bool#no" ) == 0 )
-            {
-                obj = Qfalse;
-            }
-            else if ( strcmp( type_id, "int#hex" ) == 0 )
-            {
-                syck_str_blow_away_commas( n );
-                obj = rb_cstr2inum( n->data.str->ptr, 16 );
-            }
-            else if ( strcmp( type_id, "int#oct" ) == 0 )
-            {
-                syck_str_blow_away_commas( n );
-                obj = rb_cstr2inum( n->data.str->ptr, 8 );
-            }
-            else if ( strcmp( type_id, "int#base60" ) == 0 )
-            {
-                char *ptr, *end;
-                long sixty = 1;
-                long total = 0;
-                syck_str_blow_away_commas( n );
-                ptr = n->data.str->ptr;
-                end = n->data.str->ptr + n->data.str->len;
-                while ( end > ptr )
-                {
-                    long bnum = 0;
-                    char *colon = end - 1;
-                    while ( colon >= ptr && *colon != ':' )
-                    {
-                        colon--;
-                    }
-                    if ( colon >= ptr && *colon == ':' ) *colon = '\0';
-
-                    bnum = strtol( colon + 1, NULL, 10 );
-                    total += bnum * sixty;
-                    sixty *= 60;
-                    end = colon;
-                }
-                obj = INT2FIX(total);
-            }
-            else if ( strncmp( type_id, "int", 3 ) == 0 )
-            {
-                syck_str_blow_away_commas( n );
-                obj = rb_cstr2inum( n->data.str->ptr, 10 );
-            }
-            else if ( strcmp( type_id, "float#base60" ) == 0 )
-            {
-                char *ptr, *end;
-                long sixty = 1;
-                double total = 0.0;
-                syck_str_blow_away_commas( n );
-                ptr = n->data.str->ptr;
-                end = n->data.str->ptr + n->data.str->len;
-                while ( end > ptr )
-                {
-                    double bnum = 0;
-                    char *colon = end - 1;
-                    while ( colon >= ptr && *colon != ':' )
-                    {
-                        colon--;
-                    }
-                    if ( colon >= ptr && *colon == ':' ) *colon = '\0';
-
-                    bnum = strtod( colon + 1, NULL );
-                    total += bnum * sixty;
-                    sixty *= 60;
-                    end = colon;
-                }
-                obj = rb_float_new( total );
-            }
-            else if ( strcmp( type_id, "float#nan" ) == 0 )
-            {
-                obj = rb_float_new( S_nan() );
-            }
-            else if ( strcmp( type_id, "float#inf" ) == 0 )
-            {
-                obj = rb_float_new( S_inf() );
-            }
-            else if ( strcmp( type_id, "float#neginf" ) == 0 )
-            {
-                obj = rb_float_new( -S_inf() );
-            }
-            else if ( strncmp( type_id, "float", 5 ) == 0 )
-            {
-                double f;
-                syck_str_blow_away_commas( n );
-                f = strtod( n->data.str->ptr, NULL );
-                obj = rb_float_new( f );
-            }
-            else if ( strcmp( type_id, "timestamp#iso8601" ) == 0 )
-            {
-                obj = rb_syck_mktime( n->data.str->ptr, n->data.str->len );
-            }
-            else if ( strcmp( type_id, "timestamp#spaced" ) == 0 )
-            {
-                obj = rb_syck_mktime( n->data.str->ptr, n->data.str->len );
-            }
-            else if ( strcmp( type_id, "timestamp#ymd" ) == 0 )
-            {
-                char *ptr = n->data.str->ptr;
-                VALUE year, mon, day;
-
-                /* Year*/
-                ptr[4] = '\0';
-                year = INT2FIX(strtol(ptr, NULL, 10));
-
-                /* Month*/
-                ptr += 4;
-                while ( !ISDIGIT( *ptr ) ) ptr++;
-                mon = INT2FIX(strtol(ptr, NULL, 10));
-
-                /* Day*/
-                ptr += 2;
-                while ( !ISDIGIT( *ptr ) ) ptr++;
-                day = INT2FIX(strtol(ptr, NULL, 10));
-
-                if ( !cDate ) {
-                    /*
-                     * Load Date module
-                     */
-                    rb_require( "date" );
-                    cDate = rb_const_get( rb_cObject, rb_intern("Date") );
-                }
-
-                obj = rb_funcall( cDate, s_new, 3, year, mon, day );
-            }
-            else if ( strncmp( type_id, "timestamp", 9 ) == 0 )
-            {
-                obj = rb_syck_mktime( n->data.str->ptr, n->data.str->len );
-            }
-            else if ( strncmp( type_id, "merge", 5 ) == 0 )
-            {
-                obj = rb_funcall( cMergeKey, s_new, 0 );
-            }
-            else if ( strncmp( type_id, "default", 7 ) == 0 )
-            {
-                obj = rb_funcall( cDefaultKey, s_new, 0 );
-            }
-            else if ( n->data.str->style == scalar_plain &&
-                      n->data.str->len > 1 &&
-                      strncmp( n->data.str->ptr, ":", 1 ) == 0 )
-            {
-                obj = rb_funcall( oDefaultResolver, s_transfer, 2,
-                                  rb_str_new2( "tag:ruby.yaml.org,2002:sym" ),
-                                  rb_str_new( n->data.str->ptr + 1, n->data.str->len - 1 ) );
-            }
-            else if ( strcmp( type_id, "str" ) == 0 )
-            {
-                obj = rb_str_new( n->data.str->ptr, n->data.str->len );
-                rb_enc_associate(obj, rb_utf8_encoding());
-            }
-            else
-            {
-                transferred = 0;
-                obj = rb_str_new( n->data.str->ptr, n->data.str->len );
-            }
-        break;
-
-        case syck_seq_kind:
-            if ( type_id == NULL || strcmp( type_id, "seq" ) == 0 )
-            {
-                transferred = 1;
-            }
-            obj = rb_ary_new2( n->data.list->idx );
-            for ( i = 0; i < n->data.list->idx; i++ )
-            {
-                rb_ary_store( obj, i, syck_seq_read( n, i ) );
-            }
-        break;
-
-        case syck_map_kind:
-            if ( type_id == NULL || strcmp( type_id, "map" ) == 0 )
-            {
-                transferred = 1;
-            }
-            obj = rb_hash_new();
-            for ( i = 0; i < n->data.pairs->idx; i++ )
-            {
-                VALUE k = syck_map_read( n, map_key, i );
-                VALUE v = syck_map_read( n, map_value, i );
-                int skip_aset = 0;
-
-                /*
-                 * Handle merge keys
-                 */
-                if ( rb_obj_is_kind_of( k, cMergeKey ) )
-                {
-                    VALUE tmp;
-                    if ( !NIL_P(tmp = rb_check_convert_type(v, T_HASH, "Hash", "to_hash")) )
-                    {
-                        VALUE dup = rb_funcall( tmp, s_dup, 0 );
-                        rb_funcall( dup, s_update, 1, obj );
-                        obj = dup;
-                        skip_aset = 1;
-                    }
-                    else if ( !NIL_P(tmp = rb_check_array_type(v)) )
-                    {
-                        VALUE end = rb_ary_pop( tmp );
-                        VALUE tmph = rb_check_convert_type(end, T_HASH, "Hash", "to_hash");
-                        if ( !NIL_P(tmph) )
-                        {
-                            VALUE dup = rb_funcall( tmph, s_dup, 0 );
-                            tmp = rb_ary_reverse( tmp );
-                            rb_ary_push( tmp, obj );
-                            rb_block_call( tmp, s_each, 0, 0, syck_merge_i, dup );
-                            obj = dup;
-                            skip_aset = 1;
-                        }
-                    }
-                }
-                else if ( rb_obj_is_kind_of( k, cDefaultKey ) )
-                {
-                    rb_funcall( obj, s_default_set, 1, v );
-                    skip_aset = 1;
-                }
-
-                if ( ! skip_aset )
-                {
-                    rb_hash_aset( obj, k, v );
-                }
-            }
-        break;
-    }
-
-    *ref = obj;
-    return transferred;
-}
-
-static void syck_node_mark( SyckNode *n );
-
-/*
- * {native mode} node handler
- * - Converts data into native Ruby types
- */
-SYMID
-rb_syck_load_handler(SyckParser *p, SyckNode *n)
-{
-    VALUE obj = Qnil;
-    struct parser_xtra *bonus = (struct parser_xtra *)p->bonus;
-    VALUE resolver = bonus->resolver;
-    if ( NIL_P( resolver ) )
-    {
-        resolver = oDefaultResolver;
-    }
-
-    /*
-     * Create node,
-     */
-    obj = rb_funcall( resolver, s_node_import, 1, Data_Wrap_Struct( cNode, NULL, NULL, n ) );
-
-    /*
-     * ID already set, let's alter the symbol table to accept the new object
-     */
-    if (n->id > 0 && !NIL_P(obj))
-    {
-        MEMCPY((void *)n->id, (void *)obj, RVALUE, 1);
-        MEMZERO((void *)obj, RVALUE, 1);
-        obj = n->id;
-    }
-
-    if ( bonus->taint)      OBJ_TAINT( obj );
-    if ( bonus->proc != 0 ) rb_funcall(bonus->proc, s_call, 1, obj);
-
-    rb_hash_aset(bonus->data, INT2FIX(RHASH_SIZE(bonus->data)), obj);
-    return obj;
-}
-
-/*
- * friendly errors.
- */
-void
-rb_syck_err_handler(SyckParser *p, const char *msg)
-{
-    char *endl = p->cursor;
-
-    while ( *endl != '\0' && *endl != '\n' )
-        endl++;
-
-    endl[0] = '\0';
-    rb_raise(rb_eArgError, "%s on line %d, col %"PRIdPTRDIFF": `%s'",
-           msg,
-           p->linect,
-           p->cursor - p->lineptr,
-           p->lineptr);
-}
-
-/*
- * provide bad anchor object to the parser.
- */
-SyckNode *
-rb_syck_bad_anchor_handler(SyckParser *p, char *a)
-{
-    VALUE anchor_name = rb_str_new2( a );
-    SyckNode *badanc = syck_new_map( rb_str_new2( "name" ), anchor_name );
-    badanc->type_id = syck_strndup( "tag:ruby.yaml.org,2002:object:YAML::Syck::BadAlias", 53 );
-    return badanc;
-}
-
-/*
- * data loaded based on the model requested.
- */
-void
-syck_set_model(VALUE p, VALUE input, VALUE model)
-{
-    SyckParser *parser;
-    Data_Get_Struct(p, SyckParser, parser);
-    syck_parser_handler( parser, rb_syck_load_handler );
-    /* WARN: gonna be obsoleted soon!! */
-    if ( model == sym_generic )
-    {
-        rb_funcall( p, s_set_resolver, 1, oGenericResolver );
-    }
-    syck_parser_implicit_typing( parser, 1 );
-    syck_parser_taguri_expansion( parser, 1 );
-
-    if ( NIL_P( input ) )
-    {
-        input = rb_ivar_get( p, s_input );
-    }
-    if ( input == sym_bytecode )
-    {
-        syck_parser_set_input_type( parser, syck_bytecode_utf8 );
-    }
-    else
-    {
-        syck_parser_set_input_type( parser, syck_yaml_utf8 );
-    }
-    syck_parser_error_handler( parser, rb_syck_err_handler );
-    syck_parser_bad_anchor_handler( parser, rb_syck_bad_anchor_handler );
-}
-
-static int
-syck_st_mark_nodes( char *key, SyckNode *n, char *arg )
-{
-    if ( n != (void *)1 ) syck_node_mark( n );
-    return ST_CONTINUE;
-}
-
-/*
- * mark parser nodes
- */
-static void
-syck_mark_parser(SyckParser *parser)
-{
-    struct parser_xtra *bonus = (struct parser_xtra *)parser->bonus;
-    rb_gc_mark_maybe(parser->root);
-    rb_gc_mark_maybe(parser->root_on_error);
-    rb_gc_mark( bonus->data );
-    rb_gc_mark( bonus->proc );
-    rb_gc_mark( bonus->resolver );
-
-    if ( parser->anchors != NULL )
-    {
-        st_foreach( parser->anchors, syck_st_mark_nodes, 0 );
-    }
-    if ( parser->bad_anchors != NULL )
-    {
-        st_foreach( parser->bad_anchors, syck_st_mark_nodes, 0 );
-    }
-}
-
-/*
- * Free the parser and any bonus attachment.
- */
-void
-rb_syck_free_parser(SyckParser *p)
-{
-    S_FREE( p->bonus );
-    syck_free_parser(p);
-}
-
-/*
- * YAML::Syck::Parser.allocate
- */
-VALUE syck_parser_s_alloc _((VALUE));
-VALUE
-syck_parser_s_alloc(VALUE class)
-{
-    VALUE pobj;
-    SyckParser *parser = syck_new_parser();
-
-    parser->bonus = S_ALLOC( struct parser_xtra );
-    S_MEMZERO( parser->bonus, struct parser_xtra, 1 );
-
-    pobj = Data_Wrap_Struct( class, syck_mark_parser, rb_syck_free_parser, parser );
-
-    syck_parser_set_root_on_error( parser, Qnil );
-
-    return pobj;
-}
-
-/*
- * YAML::Syck::Parser.initialize( resolver, options )
- */
-static VALUE
-syck_parser_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE options;
-    if (rb_scan_args(argc, argv, "01", &options) == 0)
-    {
-        options = rb_hash_new();
-    }
-    else
-    {
-        Check_Type(options, T_HASH);
-    }
-    rb_ivar_set(self, s_options, options);
-    rb_ivar_set(self, s_input, Qnil);
-    return self;
-}
-
-/*
- * YAML::Syck::Parser.bufsize = Integer
- */
-static VALUE
-syck_parser_bufsize_set(VALUE self, VALUE size)
-{
-    SyckParser *parser;
-
-    if ( rb_respond_to( size, s_to_i ) ) {
-        int n = NUM2INT(rb_funcall(size, s_to_i, 0));
-        Data_Get_Struct(self, SyckParser, parser);
-        parser->bufsize = n;
-    }
-    return self;
-}
-
-/*
- * YAML::Syck::Parser.bufsize => Integer
- */
-static VALUE
-syck_parser_bufsize_get(VALUE self)
-{
-    SyckParser *parser;
-
-    Data_Get_Struct(self, SyckParser, parser);
-    return INT2FIX( parser->bufsize );
-}
-
-/*
- * YAML::Syck::Parser.load( IO or String )
- */
-VALUE
-syck_parser_load(int argc, VALUE *argv, VALUE self)
-{
-    VALUE port, proc, model, input;
-    SyckParser *parser;
-    struct parser_xtra *bonus;
-
-    rb_scan_args(argc, argv, "11", &port, &proc);
-
-    input = rb_hash_aref( rb_attr_get( self, s_options ), sym_input );
-    model = rb_hash_aref( rb_attr_get( self, s_options ), sym_model );
-    Data_Get_Struct(self, SyckParser, parser);
-    syck_set_model( self, input, model );
-
-    bonus = (struct parser_xtra *)parser->bonus;
-    bonus->taint = syck_parser_assign_io(parser, &port);
-    bonus->data = rb_hash_new();
-    bonus->resolver = rb_attr_get( self, s_resolver );
-    if ( NIL_P( proc ) ) bonus->proc = 0;
-    else                 bonus->proc = proc;
-
-    return syck_parse( parser );
-}
-
-/*
- * YAML::Syck::Parser.load_documents( IO or String ) { |doc| }
- */
-VALUE
-syck_parser_load_documents(int argc, VALUE *argv, VALUE self)
-{
-    VALUE port, proc, v, input, model;
-    SyckParser *parser;
-    struct parser_xtra *bonus;
-
-    rb_scan_args(argc, argv, "1&", &port, &proc);
-
-    input = rb_hash_aref( rb_attr_get( self, s_options ), sym_input );
-    model = rb_hash_aref( rb_attr_get( self, s_options ), sym_model );
-    Data_Get_Struct(self, SyckParser, parser);
-    syck_set_model( self, input, model );
-
-    bonus = (struct parser_xtra *)parser->bonus;
-    bonus->taint = syck_parser_assign_io(parser, &port);
-    bonus->resolver = rb_attr_get( self, s_resolver );
-    bonus->proc = 0;
-
-    while ( 1 )
-    {
-        /* Reset hash for tracking nodes */
-        bonus->data = rb_hash_new();
-
-        /* Parse a document */
-        v = syck_parse( parser );
-        if ( parser->eof == 1 )
-        {
-            break;
-        }
-
-        /* Pass document to block */
-        rb_funcall( proc, s_call, 1, v );
-    }
-
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Parser#set_resolver
- */
-VALUE
-syck_parser_set_resolver(VALUE self, VALUE resolver)
-{
-    rb_ivar_set( self, s_resolver, resolver );
-    return self;
-}
-
-/*
- * YAML::Syck::Resolver.initialize
- */
-static VALUE
-syck_resolver_initialize(VALUE self)
-{
-    rb_ivar_set(self, s_tags, rb_hash_new());
-    return self;
-}
-
-/*
- * YAML::Syck::Resolver#add_type
- */
-VALUE
-syck_resolver_add_type(VALUE self, VALUE taguri, VALUE cls)
-{
-    VALUE tags = rb_attr_get(self, s_tags);
-    rb_hash_aset( tags, taguri, cls );
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Resolver#use_types_at
- */
-VALUE
-syck_resolver_use_types_at(VALUE self, VALUE hsh)
-{
-    rb_ivar_set( self, s_tags, hsh );
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Resolver#detect_implicit
- */
-VALUE
-syck_resolver_detect_implicit(VALUE self, VALUE val)
-{
-    return rb_str_new2( "" );
-}
-
-/*
- * YAML::Syck::Resolver#node_import
- */
-VALUE
-syck_resolver_node_import(VALUE self, VALUE node)
-{
-    SyckNode *n;
-    VALUE obj = Qnil;
-    int i = 0;
-    Data_Get_Struct(node, SyckNode, n);
-
-    switch (n->kind)
-    {
-        case syck_str_kind:
-            obj = rb_str_new( n->data.str->ptr, n->data.str->len );
-        break;
-
-        case syck_seq_kind:
-            obj = rb_ary_new2( n->data.list->idx );
-            for ( i = 0; i < n->data.list->idx; i++ )
-            {
-                rb_ary_store( obj, i, syck_seq_read( n, i ) );
-            }
-        break;
-
-        case syck_map_kind:
-            obj = rb_hash_new();
-            for ( i = 0; i < n->data.pairs->idx; i++ )
-            {
-                VALUE k = syck_map_read( n, map_key, i );
-                VALUE v = syck_map_read( n, map_value, i );
-                int skip_aset = 0;
-
-                /*
-                 * Handle merge keys
-                 */
-                if ( rb_obj_is_kind_of( k, cMergeKey ) )
-                {
-                    if ( rb_obj_is_kind_of( v, rb_cHash ) )
-                    {
-                        VALUE dup = rb_funcall( v, s_dup, 0 );
-                        rb_funcall( dup, s_update, 1, obj );
-                        obj = dup;
-                        skip_aset = 1;
-                    }
-                    else if ( rb_obj_is_kind_of( v, rb_cArray ) )
-                    {
-                        VALUE end = rb_ary_pop( v );
-                        if ( rb_obj_is_kind_of( end, rb_cHash ) )
-                        {
-                            VALUE dup = rb_funcall( end, s_dup, 0 );
-                            v = rb_ary_reverse( v );
-                            rb_ary_push( v, obj );
-                            rb_block_call( v, s_each, 0, 0, syck_merge_i, dup );
-                            obj = dup;
-                            skip_aset = 1;
-                        }
-                    }
-                }
-                else if ( rb_obj_is_kind_of( k, cDefaultKey ) )
-                {
-                    rb_funcall( obj, s_default_set, 1, v );
-                    skip_aset = 1;
-                }
-
-                if ( ! skip_aset )
-                {
-                    rb_hash_aset( obj, k, v );
-                }
-            }
-        break;
-    }
-
-    if ( n->type_id != NULL )
-    {
-        obj = rb_funcall( self, s_transfer, 2, rb_str_new2( n->type_id ), obj );
-    }
-    return obj;
-}
-
-/*
- * Set instance variables
- */
-VALUE
-syck_set_ivars(VALUE vars, VALUE obj)
-{
-    VALUE ivname = rb_ary_entry( vars, 0 );
-    char *ivn;
-    StringValue( ivname );
-    ivn = S_ALLOCA_N( char, RSTRING_LEN(ivname) + 2 );
-    ivn[0] = '@';
-    ivn[1] = '\0';
-    strncat( ivn, RSTRING_PTR(ivname), RSTRING_LEN(ivname) );
-    rb_iv_set( obj, ivn, rb_ary_entry( vars, 1 ) );
-    return Qnil;
-}
-
-/*
- * YAML::Syck::Resolver#const_find
- */
-VALUE
-syck_const_find(VALUE const_name)
-{
-    VALUE tclass = rb_cObject;
-    VALUE tparts = rb_str_split( const_name, "::" );
-    int i = 0;
-    for ( i = 0; i < RARRAY_LEN(tparts); i++ ) {
-        VALUE tpart = rb_to_id( rb_ary_entry( tparts, i ) );
-        if ( !rb_const_defined( tclass, tpart ) ) return Qnil;
-        tclass = rb_const_get( tclass, tpart );
-    }
-    return tclass;
-}
-
-/*
- * YAML::Syck::Resolver#transfer
- */
-VALUE
-syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
-{
-    if (NIL_P(type) || RSTRING_LEN(StringValue(type)) == 0)
-    {
-        type = rb_funcall( self, s_detect_implicit, 1, val );
-    }
-
-    if ( ! (NIL_P(type) || RSTRING_LEN(StringValue(type)) == 0) )
-    {
-        VALUE str_xprivate = rb_str_new2( "x-private" );
-        VALUE colon = rb_str_new2( ":" );
-        VALUE tags = rb_attr_get(self, s_tags);
-        VALUE target_class = rb_hash_aref( tags, type );
-        VALUE subclass = target_class;
-        VALUE obj = Qnil;
-
-        /*
-         * Should no tag match exactly, check for subclass format
-         */
-        if ( NIL_P( target_class ) )
-        {
-            VALUE subclass_parts = rb_ary_new();
-            VALUE parts = rb_str_split( type, ":" );
-
-            while ( RARRAY_LEN(parts) > 1 )
-            {
-                VALUE partial;
-                rb_ary_unshift( subclass_parts, rb_ary_pop( parts ) );
-                partial = rb_ary_join( parts, colon );
-                target_class = rb_hash_aref( tags, partial );
-                if ( NIL_P( target_class ) )
-                {
-                    rb_str_append( partial, colon );
-                    target_class = rb_hash_aref( tags, partial );
-                }
-
-                /*
-                 * Possible subclass found, see if it supports subclassing
-                 */
-                if ( ! NIL_P( target_class ) )
-                {
-                    subclass = target_class;
-                    if ( RARRAY_LEN(subclass_parts) > 0 && rb_respond_to( target_class, s_tag_subclasses ) &&
-                         RTEST( rb_funcall( target_class, s_tag_subclasses, 0 ) ) )
-                    {
-                        VALUE subclass_v;
-                        subclass = rb_ary_join( subclass_parts, colon );
-                        subclass = rb_funcall( target_class, s_tag_read_class, 1, subclass );
-                        subclass_v = syck_const_find( subclass );
-
-                        if ( subclass_v != Qnil )
-                        {
-                            subclass = subclass_v;
-                        }
-                        else if ( rb_cObject == target_class && subclass_v == Qnil )
-                        {
-                            target_class = cYObject;
-                            type = subclass;
-                            subclass = cYObject;
-                        }
-                        else /* workaround for SEGV. real fix please */
-                        {
-                            rb_raise( rb_eTypeError, "invalid subclass" );
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-
-        /* rb_raise(rb_eTypeError, "invalid typing scheme: %s given",
-         *         scheme);
-         */
-
-        if ( rb_respond_to( target_class, s_call ) )
-        {
-            obj = rb_funcall( target_class, s_call, 2, type, val );
-        }
-        else
-        {
-            if ( rb_respond_to( target_class, s_yaml_new ) )
-            {
-                obj = rb_funcall( target_class, s_yaml_new, 3, subclass, type, val );
-            }
-            else if ( !NIL_P( target_class ) )
-            {
-                if ( subclass == rb_cBignum )
-                {
-                    obj = rb_str2inum( val, 10 ); /* for yaml dumped by 1.8.3 [ruby-core:6159] */
-                }
-                else
-                {
-                    obj = rb_obj_alloc( subclass );
-                }
-
-                if ( rb_respond_to( obj, s_yaml_initialize ) )
-                {
-                    rb_funcall( obj, s_yaml_initialize, 2, type, val );
-                }
-                else if ( !NIL_P( obj ) && rb_obj_is_instance_of( val, rb_cHash ) )
-                {
-                    rb_block_call( val, s_each, 0, 0, syck_set_ivars, obj );
-                }
-            }
-            else
-            {
-                VALUE parts = rb_str_split( type, ":" );
-                VALUE scheme = rb_ary_shift( parts );
-                if ( rb_str_cmp( scheme, str_xprivate ) == 0 )
-                {
-                    VALUE name = rb_ary_join( parts, colon );
-                    obj = rb_funcall( cPrivateType, s_new, 2, name, val );
-                }
-                else
-                {
-                    VALUE domain = rb_ary_shift( parts );
-                    VALUE name = rb_ary_join( parts, colon );
-                    obj = rb_funcall( cDomainType, s_new, 3, domain, name, val );
-                }
-            }
-        }
-        val = obj;
-    }
-
-    return val;
-}
-
-/*
- * YAML::Syck::Resolver#tagurize
- */
-VALUE
-syck_resolver_tagurize(VALUE self, VALUE val)
-{
-    VALUE tmp = rb_check_string_type(val);
-
-    if ( !NIL_P(tmp) )
-    {
-        char *taguri = syck_type_id_to_uri( RSTRING_PTR(tmp) );
-        val = rb_str_new2( taguri );
-        S_FREE( taguri );
-    }
-
-    return val;
-}
-
-/*
- * YAML::Syck::DefaultResolver#detect_implicit
- */
-VALUE
-syck_defaultresolver_detect_implicit(VALUE self, VALUE val)
-{
-    const char *type_id;
-    VALUE tmp = rb_check_string_type(val);
-
-    if ( !NIL_P(tmp) )
-    {
-        val = tmp;
-        type_id = syck_match_implicit( RSTRING_PTR(val), RSTRING_LEN(val) );
-        return rb_str_new2( type_id );
-    }
-
-    return rb_str_new2( "" );
-}
-
-/*
- * YAML::Syck::DefaultResolver#node_import
- */
-VALUE
-syck_defaultresolver_node_import(VALUE self, VALUE node)
-{
-    SyckNode *n;
-    VALUE obj;
-    Data_Get_Struct( node, SyckNode, n );
-    if ( !yaml_org_handler( n, &obj ) )
-    {
-        obj = rb_funcall( self, s_transfer, 2, rb_str_new2( n->type_id ), obj );
-    }
-    return obj;
-}
-
-/*
- * YAML::Syck::GenericResolver#node_import
- */
-VALUE
-syck_genericresolver_node_import(VALUE self, VALUE node)
-{
-    SyckNode *n;
-    int i = 0;
-    VALUE t = Qnil, obj = Qnil, v = Qnil, style = Qnil;
-    Data_Get_Struct(node, SyckNode, n);
-
-    if ( n->type_id != NULL )
-    {
-        t = rb_str_new2(n->type_id);
-    }
-
-    switch (n->kind)
-    {
-        case syck_str_kind:
-        {
-            v = rb_str_new( n->data.str->ptr, n->data.str->len );
-	    rb_enc_associate(v, rb_utf8_encoding());
-            if ( n->data.str->style == scalar_1quote )
-            {
-                style = sym_1quote;
-            }
-            else if ( n->data.str->style == scalar_2quote )
-            {
-                style = sym_2quote;
-            }
-            else if ( n->data.str->style == scalar_fold )
-            {
-                style = sym_fold;
-            }
-            else if ( n->data.str->style == scalar_literal )
-            {
-                style = sym_literal;
-            }
-            else if ( n->data.str->style == scalar_plain )
-            {
-                style = sym_plain;
-            }
-            obj = rb_funcall( cScalar, s_new, 3, t, v, style );
-        }
-        break;
-
-        case syck_seq_kind:
-            v = rb_ary_new2( syck_seq_count( n ) );
-            for ( i = 0; i < syck_seq_count( n ); i++ )
-            {
-                rb_ary_store( v, i, syck_seq_read( n, i ) );
-            }
-            if ( n->data.list->style == seq_inline )
-            {
-                style = sym_inline;
-            }
-            obj = rb_funcall( cSeq, s_new, 3, t, v, style );
-            rb_iv_set(obj, "@kind", sym_seq);
-        break;
-
-        case syck_map_kind:
-            v = rb_hash_new();
-            for ( i = 0; i < syck_map_count( n ); i++ )
-            {
-                rb_hash_aset( v, syck_map_read( n, map_key, i ), syck_map_read( n, map_value, i ) );
-            }
-            if ( n->data.pairs->style == map_inline )
-            {
-                style = sym_inline;
-            }
-            obj = rb_funcall( cMap, s_new, 3, t, v, style );
-            rb_iv_set(obj, "@kind", sym_map);
-        break;
-    }
-
-    return obj;
-}
-
-/*
- * YAML::Syck::BadAlias.initialize
- */
-VALUE
-syck_badalias_initialize(VALUE self, VALUE val)
-{
-    rb_iv_set( self, "@name", val );
-    return self;
-}
-
-/*
- * YAML::Syck::BadAlias.<=>
- */
-VALUE
-syck_badalias_cmp(VALUE alias1, VALUE alias2)
-{
-    VALUE str1 = rb_ivar_get( alias1, s_name );
-    VALUE str2 = rb_ivar_get( alias2, s_name );
-    VALUE val = rb_funcall( str1, s_cmp, 1, str2 );
-    return val;
-}
-
-/*
- * YAML::DomainType.initialize
- */
-VALUE
-syck_domaintype_initialize(VALUE self, VALUE domain, VALUE type_id, VALUE val)
-{
-    rb_iv_set( self, "@domain", domain );
-    rb_iv_set( self, "@type_id", type_id );
-    rb_iv_set( self, "@value", val );
-    return self;
-}
-
-/*
- * YAML::Object.initialize
- */
-VALUE
-syck_yobject_initialize(VALUE self, VALUE klass, VALUE ivars)
-{
-    rb_iv_set( self, "@class", klass );
-    rb_iv_set( self, "@ivars", ivars );
-    return self;
-}
-
-/*
- * YAML::PrivateType.initialize
- */
-VALUE
-syck_privatetype_initialize(VALUE self, VALUE type_id, VALUE val)
-{
-    rb_iv_set( self, "@type_id", type_id );
-    rb_iv_set( self, "@value", val );
-    return self;
-}
-
-/*
- * Mark node contents.
- */
-static void
-syck_node_mark(SyckNode *n)
-{
-    int i;
-    rb_gc_mark_maybe( n->id );
-    switch ( n->kind )
-    {
-        case syck_seq_kind:
-            for ( i = 0; i < n->data.list->idx; i++ )
-            {
-                rb_gc_mark( syck_seq_read( n, i ) );
-            }
-        break;
-
-        case syck_map_kind:
-            for ( i = 0; i < n->data.pairs->idx; i++ )
-            {
-                rb_gc_mark( syck_map_read( n, map_key, i ) );
-                rb_gc_mark( syck_map_read( n, map_value, i ) );
-            }
-        break;
-
-	case syck_str_kind:
-	default:
-	    /* nothing */
-	break;
-    }
-#if 0 /* maybe needed */
-    if ( n->shortcut ) syck_node_mark( n->shortcut ); /* caution: maybe cyclic */
-#endif
-}
-
-/*
- * YAML::Syck::Scalar.allocate
- */
-VALUE
-syck_scalar_alloc(VALUE class)
-{
-    SyckNode *node = syck_alloc_str();
-    VALUE obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
-    node->id = obj;
-    return obj;
-}
-
-/*
- * YAML::Syck::Scalar.initialize
- */
-VALUE
-syck_scalar_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
-{
-    rb_iv_set( self, "@kind", sym_scalar );
-    rb_funcall( self, s_type_id_set, 1, type_id );
-    rb_funcall( self, s_value_set, 1, val );
-    rb_funcall( self, s_style_set, 1, style );
-    return self;
-}
-
-/*
- * YAML::Syck::Scalar.style=
- */
-VALUE
-syck_scalar_style_set(VALUE self, VALUE style)
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( NIL_P( style ) )
-    {
-        node->data.str->style = scalar_none;
-    }
-    else if ( style == sym_1quote )
-    {
-        node->data.str->style = scalar_1quote;
-    }
-    else if ( style == sym_2quote )
-    {
-        node->data.str->style = scalar_2quote;
-    }
-    else if ( style == sym_fold )
-    {
-        node->data.str->style = scalar_fold;
-    }
-    else if ( style == sym_literal )
-    {
-        node->data.str->style = scalar_literal;
-    }
-    else if ( style == sym_plain )
-    {
-        node->data.str->style = scalar_plain;
-    }
-
-    rb_iv_set( self, "@style", style );
-    return self;
-}
-
-/*
- * YAML::Syck::Scalar.value=
- */
-VALUE
-syck_scalar_value_set(VALUE  self, VALUE val)
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    StringValue( val );
-    node->data.str->ptr = syck_strndup( RSTRING_PTR(val), RSTRING_LEN(val) );
-    node->data.str->len = RSTRING_LEN(val);
-    node->data.str->style = scalar_none;
-
-    rb_iv_set( self, "@value", val );
-    return val;
-}
-
-/*
- * YAML::Syck::Seq.allocate
- */
-VALUE
-syck_seq_alloc(VALUE class)
-{
-    SyckNode *node;
-    VALUE obj;
-    node = syck_alloc_seq();
-    obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
-    node->id = obj;
-    return obj;
-}
-
-/*
- * YAML::Syck::Seq.initialize
- */
-VALUE
-syck_seq_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    rb_iv_set( self, "@kind", sym_seq );
-    rb_funcall( self, s_type_id_set, 1, type_id );
-    rb_funcall( self, s_value_set, 1, val );
-    rb_funcall( self, s_style_set, 1, style );
-    return self;
-}
-
-/*
- * YAML::Syck::Seq.value=
- */
-VALUE
-syck_seq_value_set(VALUE self, VALUE val)
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    val = rb_check_array_type( val );
-    if ( !NIL_P( val ) ) {
-        int i;
-        syck_seq_empty( node );
-        for ( i = 0; i < RARRAY_LEN( val ); i++ )
-        {
-            syck_seq_add( node, rb_ary_entry(val, i) );
-        }
-    }
-
-    rb_iv_set( self, "@value", val );
-    return val;
-}
-
-/*
- * YAML::Syck::Seq.add
- */
-VALUE
-syck_seq_add_m(VALUE self, VALUE val)
-{
-    SyckNode *node;
-    VALUE emitter = rb_ivar_get( self, s_emitter );
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( rb_respond_to( emitter, s_node_export ) ) {
-        val = rb_funcall( emitter, s_node_export, 1, val );
-    }
-    syck_seq_add( node, val );
-    rb_ary_push( rb_ivar_get( self, s_value ), val );
-
-    return self;
-}
-
-/*
- * YAML::Syck::Seq.style=
- */
-VALUE
-syck_seq_style_set(VALUE self, VALUE style)
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( style == sym_inline )
-    {
-        node->data.list->style = seq_inline;
-    }
-    else
-    {
-        node->data.list->style = seq_none;
-    }
-
-    rb_iv_set( self, "@style", style );
-    return self;
-}
-
-/*
- * YAML::Syck::Map.allocate
- */
-VALUE
-syck_map_alloc(VALUE class)
-{
-    SyckNode *node;
-    VALUE obj;
-    node = syck_alloc_map();
-    obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
-    node->id = obj;
-    return obj;
-}
-
-/*
- * YAML::Syck::Map.initialize
- */
-VALUE
-syck_map_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( !NIL_P( val ) )
-    {
-        VALUE hsh = rb_check_convert_type(val, T_HASH, "Hash", "to_hash");
-        VALUE keys;
-        int i;
-        if ( NIL_P(hsh) )
-        {
-            rb_raise( rb_eTypeError, "wrong argument type" );
-        }
-
-        keys = rb_funcall( hsh, s_keys, 0 );
-        for ( i = 0; i < RARRAY_LEN(keys); i++ )
-        {
-            VALUE key = rb_ary_entry(keys, i);
-            syck_map_add( node, key, rb_hash_aref(hsh, key) );
-        }
-    }
-
-    rb_iv_set( self, "@kind", sym_seq );
-    rb_funcall( self, s_type_id_set, 1, type_id );
-    rb_funcall( self, s_value_set, 1, val );
-    rb_funcall( self, s_style_set, 1, style );
-    return self;
-}
-
-/*
- * YAML::Syck::Map.value=
- */
-VALUE
-syck_map_value_set(VALUE self, VALUE val)
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( !NIL_P( val ) )
-    {
-        VALUE hsh = rb_check_convert_type(val, T_HASH, "Hash", "to_hash");
-        VALUE keys;
-        int i;
-        if ( NIL_P(hsh) )
-        {
-            rb_raise( rb_eTypeError, "wrong argument type" );
-        }
-
-        syck_map_empty( node );
-        keys = rb_funcall( hsh, s_keys, 0 );
-        for ( i = 0; i < RARRAY_LEN(keys); i++ )
-        {
-            VALUE key = rb_ary_entry(keys, i);
-            syck_map_add( node, key, rb_hash_aref(hsh, key) );
-        }
-    }
-
-    rb_iv_set( self, "@value", val );
-    return val;
-}
-
-/*
- * YAML::Syck::Map.add
- */
-VALUE
-syck_map_add_m(VALUE self, VALUE key, VALUE val)
-{
-    SyckNode *node;
-    VALUE emitter = rb_ivar_get( self, s_emitter );
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( rb_respond_to( emitter, s_node_export ) ) {
-        key = rb_funcall( emitter, s_node_export, 1, key );
-        val = rb_funcall( emitter, s_node_export, 1, val );
-    }
-    syck_map_add( node, key, val );
-    rb_hash_aset( rb_ivar_get( self, s_value ), key, val );
-
-    return self;
-}
-
-/*
- * YAML::Syck::Map.style=
- */
-VALUE
-syck_map_style_set(VALUE self, VALUE style)
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    if ( style == sym_inline )
-    {
-        node->data.pairs->style = map_inline;
-    }
-    else
-    {
-        node->data.pairs->style = map_none;
-    }
-
-    rb_iv_set( self, "@style", style );
-    return self;
-}
-
-#if 0
-/*
- * Cloning method for all node types
- */
-VALUE
-syck_node_init_copy(VALUE copy, VALUE orig)
-{
-    SyckNode *copy_n;
-    SyckNode *orig_n;
-
-    if ( copy == orig )
-        return copy;
-
-    if ( TYPE( orig ) != T_DATA )
-    {
-        rb_raise( rb_eTypeError, "wrong argument type" );
-    }
-
-    Data_Get_Struct( orig, SyckNode, orig_n );
-    Data_Get_Struct( copy, SyckNode, copy_n );
-    MEMCPY( copy_n, orig_n, SyckNode, 1 );
-    return copy;
-}
-#endif
-
-/*
- * YAML::Syck::Node#type_id=
- */
-VALUE
-syck_node_type_id_set(VALUE self, VALUE type_id)
-{
-    SyckNode *node;
-    Data_Get_Struct( self, SyckNode, node );
-
-    S_FREE( node->type_id );
-
-    if ( !NIL_P( type_id ) ) {
-        StringValue( type_id );
-        node->type_id = syck_strndup( RSTRING_PTR(type_id), RSTRING_LEN(type_id) );
-    }
-
-    rb_iv_set( self, "@type_id", type_id );
-    return type_id;
-}
-
-/*
- * YAML::Syck::Node.transform
- */
-VALUE
-syck_node_transform(VALUE self)
-{
-    VALUE t;
-    SyckNode *n = NULL;
-    SyckNode *orig_n;
-    Data_Get_Struct(self, SyckNode, orig_n);
-    t = Data_Wrap_Struct( cNode, syck_node_mark, syck_free_node, 0 );
-
-    switch (orig_n->kind)
-    {
-        case syck_map_kind:
-            {
-                int i;
-                DATA_PTR(t) = n = syck_alloc_map();
-                for ( i = 0; i < orig_n->data.pairs->idx; i++ )
-                {
-                    syck_map_add( n, rb_funcall( syck_map_read( orig_n, map_key, i ), s_transform, 0 ),
-                                     rb_funcall( syck_map_read( orig_n, map_value, i ), s_transform, 0 ) );
-                }
-            }
-        break;
-
-        case syck_seq_kind:
-            {
-                int i;
-                DATA_PTR(t) = n = syck_alloc_seq();
-                for ( i = 0; i < orig_n->data.list->idx; i++ )
-                {
-                    syck_seq_add( n, rb_funcall( syck_seq_read( orig_n, i ), s_transform, 0 ) );
-                }
-            }
-        break;
-
-        case syck_str_kind:
-            DATA_PTR(t) = n = syck_new_str2( orig_n->data.str->ptr, orig_n->data.str->len, orig_n->data.str->style );
-        break;
-    }
-
-    if ( orig_n->type_id != NULL )
-    {
-        n->type_id = syck_strndup( orig_n->type_id, strlen( orig_n->type_id ) );
-    }
-    if ( orig_n->anchor != NULL )
-    {
-        n->anchor = syck_strndup( orig_n->anchor, strlen( orig_n->anchor ) );
-    }
-    n->id = t;
-    return rb_funcall( oDefaultResolver, s_node_import, 1, t );
-}
-
-/*
- * Emitter callback: assembles YAML document events from
- * Ruby symbols.  This is a brilliant way to do it.
- * No one could possibly object.
- */
-void
-rb_syck_emitter_handler(SyckEmitter *e, st_data_t data)
-{
-    SyckNode *n;
-    Data_Get_Struct((VALUE)data, SyckNode, n);
-
-    switch (n->kind)
-    {
-        case syck_map_kind:
-            {
-                int i;
-                syck_emit_map( e, n->type_id, n->data.pairs->style );
-                for ( i = 0; i < n->data.pairs->idx; i++ )
-                {
-                    syck_emit_item( e, syck_map_read( n, map_key, i ) );
-                    syck_emit_item( e, syck_map_read( n, map_value, i ) );
-                }
-                syck_emit_end( e );
-            }
-        break;
-
-        case syck_seq_kind:
-            {
-                int i;
-                syck_emit_seq( e, n->type_id, n->data.list->style );
-                for ( i = 0; i < n->data.list->idx; i++ )
-                {
-                    syck_emit_item( e, syck_seq_read( n, i ) );
-                }
-                syck_emit_end( e );
-            }
-        break;
-
-        case syck_str_kind:
-            {
-                syck_emit_scalar( e, n->type_id, n->data.str->style, 0, 0, 0, n->data.str->ptr, n->data.str->len );
-            }
-        break;
-    }
-}
-
-/*
- * Handle output from the emitter
- */
-void
-rb_syck_output_handler(SyckEmitter * emitter, char *str, long len)
-{
-    struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
-    VALUE dest = bonus->port;
-    if (TYPE(dest) == T_STRING) {
-        rb_str_cat( dest, str, len );
-    } else {
-        rb_io_write( dest, rb_str_new( str, len ) );
-    }
-}
-
-/*
- * Helper function for marking nodes in the anchor
- * symbol table.
- */
-void
-syck_out_mark(VALUE emitter, VALUE node)
-{
-    SyckEmitter *emitterPtr;
-    struct emitter_xtra *bonus;
-    Data_Get_Struct(emitter, SyckEmitter, emitterPtr);
-    bonus = (struct emitter_xtra *)emitterPtr->bonus;
-    rb_ivar_set( node, s_emitter, emitter );
-    /* syck_emitter_mark_node( emitterPtr, (st_data_t)node ); */
-    if ( !NIL_P( bonus->oid ) ) {
-        rb_hash_aset( bonus->data, bonus->oid, node );
-    }
-}
-
-/*
- * Mark emitter values.
- */
-static void
-syck_mark_emitter(SyckEmitter *emitter)
-{
-    struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
-    rb_gc_mark( bonus->oid  );
-    rb_gc_mark( bonus->data );
-    rb_gc_mark( bonus->port );
-}
-
-/*
- * Free the emitter and any bonus attachment.
- */
-void
-rb_syck_free_emitter(SyckEmitter *e)
-{
-    S_FREE( e->bonus );
-    syck_free_emitter(e);
-}
-
-/*
- * YAML::Syck::Emitter.allocate
- */
-VALUE syck_emitter_s_alloc _((VALUE));
-VALUE
-syck_emitter_s_alloc(VALUE class)
-{
-    VALUE pobj;
-    SyckEmitter *emitter = syck_new_emitter();
-
-    emitter->bonus = S_ALLOC( struct emitter_xtra );
-    S_MEMZERO( emitter->bonus, struct emitter_xtra, 1 );
-
-    pobj = Data_Wrap_Struct( class, syck_mark_emitter, rb_syck_free_emitter, emitter );
-    syck_emitter_handler( emitter, rb_syck_emitter_handler );
-    syck_output_handler( emitter, rb_syck_output_handler );
-
-    rb_ivar_set( pobj, s_out, rb_funcall( cOut, s_new, 1, pobj ) );
-    return pobj;
-}
-
-static VALUE
-id_hash_new(void)
-{
-    VALUE hash;
-    hash = rb_hash_new();
-    rb_funcall(hash, rb_intern("compare_by_identity"), 0);
-    return hash;
-}
-
-/*
- * YAML::Syck::Emitter.reset( options )
- */
-VALUE
-syck_emitter_reset(int argc, VALUE *argv, VALUE self)
-{
-    VALUE options, tmp;
-    SyckEmitter *emitter;
-    struct emitter_xtra *bonus;
-
-    Data_Get_Struct(self, SyckEmitter, emitter);
-    bonus = (struct emitter_xtra *)emitter->bonus;
-
-    bonus->oid = Qnil;
-    bonus->port = rb_str_new2( "" );
-    bonus->data = id_hash_new();
-
-    if (rb_scan_args(argc, argv, "01", &options) == 0)
-    {
-        options = rb_hash_new();
-        rb_ivar_set(self, s_options, options);
-    }
-    else if ( !NIL_P(tmp = rb_check_string_type(options)) )
-    {
-        bonus->port = tmp;
-    }
-    else if ( rb_respond_to( options, s_write ) )
-    {
-        bonus->port = options;
-    }
-    else
-    {
-        Check_Type(options, T_HASH);
-        rb_ivar_set(self, s_options, options);
-    }
-
-    emitter->headless = 0;
-    rb_ivar_set(self, s_level, INT2FIX(0));
-    rb_ivar_set(self, s_resolver, Qnil);
-    return self;
-}
-
-/*
- * YAML::Syck::Emitter.emit( object_id ) { |out| ... }
- */
-VALUE
-syck_emitter_emit(int argc, VALUE *argv, VALUE self)
-{
-    VALUE oid, proc;
-    SyckEmitter *emitter;
-    struct emitter_xtra *bonus;
-    SYMID symple;
-    int level = FIX2INT(rb_ivar_get(self, s_level)) + 1;
-    rb_ivar_set(self, s_level, INT2FIX(level));
-
-    rb_scan_args(argc, argv, "1&", &oid, &proc);
-    Data_Get_Struct(self, SyckEmitter, emitter);
-    bonus = (struct emitter_xtra *)emitter->bonus;
-
-    /* Calculate anchors, normalize nodes, build a simpler symbol table */
-    bonus->oid = oid;
-    if ( !NIL_P( oid ) && RTEST( rb_funcall( bonus->data, s_haskey, 1, oid ) ) ) {
-        symple = rb_hash_aref( bonus->data, oid );
-    } else {
-        symple = rb_funcall( proc, s_call, 1, rb_ivar_get( self, s_out ) );
-    }
-    syck_emitter_mark_node( emitter, (st_data_t)symple );
-
-    /* Second pass, build emitted string */
-    level -= 1;
-    rb_ivar_set(self, s_level, INT2FIX(level));
-    if ( level == 0 )
-    {
-        syck_emit(emitter, (st_data_t)symple);
-        syck_emitter_flush(emitter, 0);
-
-        return bonus->port;
-    }
-
-    return symple;
-}
-
-/*
- * YAML::Syck::Emitter#node_export
- */
-VALUE
-syck_emitter_node_export(VALUE self, VALUE node)
-{
-    return rb_funcall( node, s_to_yaml, 1, self );
-}
-
-/*
- * YAML::Syck::Emitter#set_resolver
- */
-VALUE
-syck_emitter_set_resolver(VALUE self, VALUE resolver)
-{
-    rb_ivar_set( self, s_resolver, resolver );
-    return self;
-}
-
-/*
- * YAML::Syck::Out::initialize
- */
-VALUE
-syck_out_initialize(VALUE self, VALUE emitter)
-{
-    rb_ivar_set( self, s_emitter, emitter );
-    return self;
-}
-
-/*
- * YAML::Syck::Out::map
- */
-VALUE
-syck_out_map(int argc, VALUE *argv, VALUE self)
-{
-    VALUE type_id, style, map;
-    if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
-        style = Qnil;
-    }
-    map = rb_funcall( cMap, s_new, 3, type_id, rb_hash_new(), style );
-    syck_out_mark( rb_ivar_get( self, s_emitter ), map );
-    rb_yield( map );
-    return map;
-}
-
-/*
- * YAML::Syck::Out::seq
- */
-VALUE
-syck_out_seq(int argc, VALUE *argv, VALUE self)
-{
-    VALUE type_id, style, seq;
-    if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
-        style = Qnil;
-    }
-    seq = rb_funcall( cSeq, s_new, 3, type_id, rb_ary_new(), style );
-    syck_out_mark( rb_ivar_get( self, s_emitter ), seq );
-    rb_yield( seq );
-    return seq;
-}
-
-/*
- * YAML::Syck::Out::scalar
-syck_out_scalar( self, type_id, str, style )
-    VALUE self, type_id, str, style;
- */
-VALUE
-syck_out_scalar(int argc, VALUE *argv, VALUE self)
-{
-    VALUE type_id, str, style, scalar;
-    rb_scan_args(argc, argv, "21", &type_id, &str, &style);
-    scalar = rb_funcall( cScalar, s_new, 3, type_id, str, style );
-    syck_out_mark( rb_ivar_get( self, s_emitter ), scalar );
-    return scalar;
-}
-
-/*
- * Initialize Syck extension
- */
-void
-Init_syck()
-{
-    VALUE rb_syck = rb_define_module_under( rb_cObject, "Syck" );
-    rb_define_module_function( rb_syck, "compile", rb_syck_compile, 1 );
-
-    /*
-     * Global symbols
-     */
-    s_new = rb_intern("new");
-    s_utc = rb_intern("utc");
-    s_at = rb_intern("at");
-    s_to_f = rb_intern("to_f");
-    s_to_i = rb_intern("to_i");
-    s_read = rb_intern("read");
-    s_binmode = rb_intern("binmode");
-    s_transfer = rb_intern("transfer");
-    s_call = rb_intern("call");
-    s_cmp = rb_intern("<=>");
-    s_intern = rb_intern("intern");
-    s_update = rb_intern("update");
-    s_detect_implicit = rb_intern("detect_implicit");
-    s_dup = rb_intern("dup");
-    s_default_set = rb_intern("default=");
-    s_match = rb_intern("match");
-    s_push = rb_intern("push");
-    s_haskey = rb_intern("has_key?");
-    s_keys = rb_intern("keys");
-    s_node_import = rb_intern("node_import");
-    s_tr_bang = rb_intern("tr!");
-    s_unpack = rb_intern("unpack");
-    s_write = rb_intern("write");
-    s_tag_read_class = rb_intern( "yaml_tag_read_class" );
-    s_tag_subclasses = rb_intern( "yaml_tag_subclasses?" );
-    s_emitter = rb_intern( "emitter" );
-    s_set_resolver = rb_intern( "set_resolver" );
-    s_node_export = rb_intern( "node_export" );
-    s_to_yaml = rb_intern( "to_yaml" );
-    s_transform = rb_intern( "transform" );
-    s_yaml_new = rb_intern("yaml_new");
-    s_yaml_initialize = rb_intern("yaml_initialize");
-    s_each = rb_intern("each");
-    s_parse = rb_intern("parse");
-
-    s_tags = rb_intern("@tags");
-    s_name = rb_intern("@name");
-    s_options = rb_intern("@options");
-    s_kind = rb_intern("@kind");
-    s_type_id = rb_intern("@type_id");
-    s_type_id_set = rb_intern("type_id=");
-    s_resolver = rb_intern("@resolver");
-    s_level = rb_intern( "@level" );
-    s_style = rb_intern("@style");
-    s_style_set = rb_intern("style=");
-    s_value = rb_intern("@value");
-    s_value_set = rb_intern("value=");
-    s_out = rb_intern("@out");
-    s_input = rb_intern("@input");
-
-    sym_model = ID2SYM(rb_intern("Model"));
-    sym_generic = ID2SYM(rb_intern("Generic"));
-    sym_bytecode = ID2SYM(rb_intern("bytecode"));
-    sym_map = ID2SYM(rb_intern("map"));
-    sym_scalar = ID2SYM(rb_intern("scalar"));
-    sym_seq = ID2SYM(rb_intern("seq"));
-    sym_1quote = ID2SYM(rb_intern("quote1"));
-    sym_2quote = ID2SYM(rb_intern("quote2"));
-    sym_fold = ID2SYM(rb_intern("fold"));
-    sym_literal = ID2SYM(rb_intern("literal"));
-    sym_plain = ID2SYM(rb_intern("plain"));
-    sym_inline = ID2SYM(rb_intern("inline"));
-
-    /*
-     * Define YAML::Syck::Resolver class
-     */
-    cResolver = rb_define_class_under( rb_syck, "Resolver", rb_cObject );
-    rb_define_attr( cResolver, "tags", 1, 1 );
-    rb_define_method( cResolver, "initialize", syck_resolver_initialize, 0 );
-    rb_define_method( cResolver, "add_type", syck_resolver_add_type, 2 );
-    rb_define_method( cResolver, "use_types_at", syck_resolver_use_types_at, 1 );
-    rb_define_method( cResolver, "detect_implicit", syck_resolver_detect_implicit, 1 );
-    rb_define_method( cResolver, "transfer", syck_resolver_transfer, 2 );
-    rb_define_method( cResolver, "node_import", syck_resolver_node_import, 1 );
-    rb_define_method( cResolver, "tagurize", syck_resolver_tagurize, 1 );
-
-    rb_global_variable( &oDefaultResolver );
-    oDefaultResolver = rb_funcall( cResolver, rb_intern( "new" ), 0 );
-    rb_define_singleton_method( oDefaultResolver, "node_import", syck_defaultresolver_node_import, 1 );
-    rb_define_singleton_method( oDefaultResolver, "detect_implicit", syck_defaultresolver_detect_implicit, 1 );
-    rb_define_const( rb_syck, "DefaultResolver", oDefaultResolver );
-    rb_global_variable( &oGenericResolver );
-    oGenericResolver = rb_funcall( cResolver, rb_intern( "new" ), 0 );
-    rb_define_singleton_method( oGenericResolver, "node_import", syck_genericresolver_node_import, 1 );
-    rb_define_const( rb_syck, "GenericResolver", oGenericResolver );
-
-    /*
-     * Define YAML::Syck::Parser class
-     */
-    cParser = rb_define_class_under( rb_syck, "Parser", rb_cObject );
-    rb_define_attr( cParser, "options", 1, 1 );
-    rb_define_attr( cParser, "resolver", 1, 1 );
-    rb_define_attr( cParser, "input", 1, 1 );
-    rb_define_alloc_func( cParser, syck_parser_s_alloc );
-    rb_define_method(cParser, "initialize", syck_parser_initialize, -1 );
-    rb_define_method(cParser, "bufsize=", syck_parser_bufsize_set, 1 );
-    rb_define_method(cParser, "bufsize", syck_parser_bufsize_get, 0 );
-    rb_define_method(cParser, "load", syck_parser_load, -1);
-    rb_define_method(cParser, "load_documents", syck_parser_load_documents, -1);
-    rb_define_method(cParser, "set_resolver", syck_parser_set_resolver, 1);
-
-    /*
-     * Define YAML::Syck::Node class
-     */
-    cNode = rb_define_class_under( rb_syck, "Node", rb_cObject );
-    rb_undef( cNode, rb_intern("initialize_copy") );
-    rb_define_attr( cNode, "emitter", 1, 1 );
-    rb_define_attr( cNode, "resolver", 1, 1 );
-    rb_define_attr( cNode, "kind", 1, 0 );
-    rb_define_attr( cNode, "type_id", 1, 0 );
-    rb_define_attr( cNode, "value", 1, 0 );
-    rb_define_method( cNode, "type_id=", syck_node_type_id_set, 1 );
-    rb_define_method( cNode, "transform", syck_node_transform, 0);
-
-    /*
-     * Define YAML::Syck::Scalar, YAML::Syck::Seq, YAML::Syck::Map --
-     *     all are the publicly usable variants of YAML::Syck::Node
-     */
-    cScalar = rb_define_class_under( rb_syck, "Scalar", cNode );
-    rb_define_alloc_func( cScalar, syck_scalar_alloc );
-    rb_define_method( cScalar, "initialize", syck_scalar_initialize, 3 );
-    rb_define_method( cScalar, "value=", syck_scalar_value_set, 1 );
-    rb_define_method( cScalar, "style=", syck_scalar_style_set, 1 );
-    cSeq = rb_define_class_under( rb_syck, "Seq", cNode );
-    rb_define_alloc_func( cSeq, syck_seq_alloc );
-    rb_define_method( cSeq, "initialize", syck_seq_initialize, 3 );
-    rb_define_method( cSeq, "value=", syck_seq_value_set, 1 );
-    rb_define_method( cSeq, "add", syck_seq_add_m, 1 );
-    rb_define_method( cSeq, "style=", syck_seq_style_set, 1 );
-    cMap = rb_define_class_under( rb_syck, "Map", cNode );
-    rb_define_alloc_func( cMap, syck_map_alloc );
-    rb_define_method( cMap, "initialize", syck_map_initialize, 3 );
-    rb_define_method( cMap, "value=", syck_map_value_set, 1 );
-    rb_define_method( cMap, "add", syck_map_add_m, 2 );
-    rb_define_method( cMap, "style=", syck_map_style_set, 1 );
-
-    /*
-     * Define YAML::PrivateType class
-     */
-    cPrivateType = rb_define_class_under( rb_syck, "PrivateType", rb_cObject );
-    rb_define_attr( cPrivateType, "type_id", 1, 1 );
-    rb_define_attr( cPrivateType, "value", 1, 1 );
-    rb_define_method( cPrivateType, "initialize", syck_privatetype_initialize, 2);
-
-    /*
-     * Define YAML::DomainType class
-     */
-    cDomainType = rb_define_class_under( rb_syck, "DomainType", rb_cObject );
-    rb_define_attr( cDomainType, "domain", 1, 1 );
-    rb_define_attr( cDomainType, "type_id", 1, 1 );
-    rb_define_attr( cDomainType, "value", 1, 1 );
-    rb_define_method( cDomainType, "initialize", syck_domaintype_initialize, 3);
-
-    /*
-     * Define YAML::Object class
-     */
-    cYObject = rb_define_class_under( rb_syck, "Object", rb_cObject );
-    rb_define_attr( cYObject, "class", 1, 1 );
-    rb_define_attr( cYObject, "ivars", 1, 1 );
-    rb_define_method( cYObject, "initialize", syck_yobject_initialize, 2);
-    rb_define_method( cYObject, "yaml_initialize", syck_yobject_initialize, 2);
-
-    /*
-     * Define YAML::Syck::BadAlias class
-     */
-    cBadAlias = rb_define_class_under( rb_syck, "BadAlias", rb_cObject );
-    rb_define_attr( cBadAlias, "name", 1, 1 );
-    rb_define_method( cBadAlias, "initialize", syck_badalias_initialize, 1);
-    rb_define_method( cBadAlias, "<=>", syck_badalias_cmp, 1);
-    rb_include_module( cBadAlias, rb_const_get( rb_cObject, rb_intern("Comparable") ) );
-
-    /*
-     * Define YAML::Syck::MergeKey class
-     */
-    cMergeKey = rb_define_class_under( rb_syck, "MergeKey", rb_cObject );
-
-    /*
-     * Define YAML::Syck::DefaultKey class
-     */
-    cDefaultKey = rb_define_class_under( rb_syck, "DefaultKey", rb_cObject );
-
-    /*
-     * Define YAML::Syck::Out classes
-     */
-    cOut = rb_define_class_under( rb_syck, "Out", rb_cObject );
-    rb_define_attr( cOut, "emitter", 1, 1 );
-    rb_define_method( cOut, "initialize", syck_out_initialize, 1 );
-    rb_define_method( cOut, "map", syck_out_map, -1 );
-    rb_define_method( cOut, "seq", syck_out_seq, -1 );
-    rb_define_method( cOut, "scalar", syck_out_scalar, -1 );
-
-    /*
-     * Define YAML::Syck::Emitter class
-     */
-    cEmitter = rb_define_class_under( rb_syck, "Emitter", rb_cObject );
-    rb_define_attr( cEmitter, "level", 1, 1 );
-    rb_define_alloc_func( cEmitter, syck_emitter_s_alloc );
-    rb_define_method( cEmitter, "initialize", syck_emitter_reset, -1 );
-    rb_define_method( cEmitter, "reset", syck_emitter_reset, -1 );
-    rb_define_method( cEmitter, "emit", syck_emitter_emit, -1 );
-    rb_define_method( cEmitter, "set_resolver", syck_emitter_set_resolver, 1);
-    rb_define_method( cEmitter, "node_export", syck_emitter_node_export, 1);
-}
-
diff --git a/ext/syck/syck.c b/ext/syck/syck.c
deleted file mode 100644
index 94e3992d3f..0000000000
--- a/ext/syck/syck.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/*
- * syck.c
- *
- * $Author$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-#include "ruby/ruby.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include "syck.h"
-
-void syck_parser_pop_level( SyckParser * );
-
-/*
- * Custom assert
- */
-void
-syck_assert( const char *file_name, unsigned line_num, const char *expr )
-{
-    fflush( NULL );
-    fprintf( stderr, "\nAssertion failed: %s, line %u: %s\n",
-             file_name, line_num, expr );
-    fflush( stderr );
-    abort();
-}
-
-/*
- * Allocates and copies a string
- */
-char *
-syck_strndup( const char *buf, long len )
-{
-    char *new = S_ALLOC_N( char, len + 1 );
-    S_MEMZERO( new, char, len + 1 );
-    S_MEMCPY( new, buf, char, len );
-    return new;
-}
-
-/*
- * Default FILE IO function
- */
-long
-syck_io_file_read( char *buf, SyckIoFile *file, long max_size, long skip )
-{
-    long len = 0;
-
-    ASSERT( file != NULL );
-
-    max_size -= skip;
-    len = fread( buf + skip, sizeof( char ), max_size, file->ptr );
-    len += skip;
-    buf[len] = '\0';
-
-    return len;
-}
-
-/*
- * Default string IO function
- */
-long
-syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
-{
-    char *beg;
-    long len = 0;
-
-    ASSERT( str != NULL );
-    beg = str->ptr;
-    if ( max_size >= 0 )
-    {
-        max_size -= skip;
-        if ( max_size <= 0 )  max_size = 0;
-        else                  str->ptr += max_size;
-
-        if ( str->ptr > str->end )
-        {
-            str->ptr = str->end;
-        }
-    }
-    else
-    {
-        /* Use exact string length */
-        while ( str->ptr < str->end ) {
-            if (*(str->ptr++) == '\n') break;
-        }
-    }
-    if ( beg < str->ptr )
-    {
-        len = ( str->ptr - beg );
-        S_MEMCPY( buf + skip, beg, char, len );
-    }
-    len += skip;
-    buf[len] = '\0';
-
-    return len;
-}
-
-void
-syck_parser_reset_levels( SyckParser *p )
-{
-    while ( p->lvl_idx > 1 )
-    {
-        syck_parser_pop_level( p );
-    }
-
-    if ( p->lvl_idx < 1 )
-    {
-        p->lvl_idx = 1;
-        p->levels[0].spaces = -1;
-        p->levels[0].ncount = 0;
-        p->levels[0].domain = syck_strndup( "", 0 );
-    }
-    p->levels[0].status = syck_lvl_header;
-}
-
-void
-syck_parser_reset_cursor( SyckParser *p )
-{
-    if ( p->buffer == NULL )
-    {
-        p->buffer = S_ALLOC_N( char, p->bufsize );
-        S_MEMZERO( p->buffer, char, p->bufsize );
-    }
-    p->buffer[0] = '\0';
-
-    p->cursor = NULL;
-    p->lineptr = NULL;
-    p->linectptr = NULL;
-    p->token = NULL;
-    p->toktmp = NULL;
-    p->marker = NULL;
-    p->limit = NULL;
-
-    p->root = 0;
-    p->root_on_error = 0;
-    p->linect = 0;
-    p->eof = 0;
-    p->last_token = 0;
-    p->force_token = 0;
-}
-
-/*
- * Value to return on a parse error
- */
-void
-syck_parser_set_root_on_error( SyckParser *p, SYMID roer )
-{
-    p->root_on_error = roer;
-}
-
-/*
- * Allocate the parser
- */
-SyckParser *
-syck_new_parser(void)
-{
-    SyckParser *p;
-    p = S_ALLOC( SyckParser );
-    S_MEMZERO( p, SyckParser, 1 );
-    p->lvl_capa = ALLOC_CT;
-    p->levels = S_ALLOC_N( SyckLevel, p->lvl_capa );
-    p->input_type = syck_yaml_utf8;
-    p->io_type = syck_io_str;
-    p->io.str = NULL;
-    p->syms = NULL;
-    p->anchors = NULL;
-    p->bad_anchors = NULL;
-    p->implicit_typing = 1;
-    p->taguri_expansion = 0;
-    p->bufsize = SYCK_BUFFERSIZE;
-    p->buffer = NULL;
-    p->lvl_idx = 0;
-    syck_parser_reset_levels( p );
-    return p;
-}
-
-int
-syck_add_sym( SyckParser *p, void *data )
-{
-    SYMID id = 0;
-    if ( p->syms == NULL )
-    {
-        p->syms = st_init_numtable();
-    }
-    id = p->syms->num_entries + 1;
-    st_insert( p->syms, id, (st_data_t)data );
-    return (int)id;
-}
-
-int
-syck_lookup_sym( SyckParser *p, SYMID id, void **datap )
-{
-    st_data_t data;
-    int ret;
-    if ( p->syms == NULL ) return 0;
-    ret = st_lookup( p->syms, id, &data );
-    if(ret) *datap = (void *)data;
-    return ret;
-}
-
-int
-syck_st_free_nodes( char *key, SyckNode *n, char *arg )
-{
-    if ( n != (void *)1 ) syck_free_node( n );
-    n = NULL;
-    return ST_CONTINUE;
-}
-
-void
-syck_st_free( SyckParser *p )
-{
-    /*
-     * Free the anchor tables
-     */
-    if ( p->anchors != NULL )
-    {
-        st_foreach( p->anchors, syck_st_free_nodes, 0 );
-        st_free_table( p->anchors );
-        p->anchors = NULL;
-    }
-
-    if ( p->bad_anchors != NULL )
-    {
-        st_foreach( p->bad_anchors, syck_st_free_nodes, 0 );
-        st_free_table( p->bad_anchors );
-        p->bad_anchors = NULL;
-    }
-}
-
-typedef struct {
-   long hash;
-   char *buffer;
-   long length;
-   long remaining;
-   int  printed;
-} bytestring_t;
-
-int
-syck_st_free_syms( void *key, bytestring_t *sav, void *dummy )
-{
-    S_FREE(sav->buffer);
-    S_FREE(sav);
-    return ST_CONTINUE;
-}
-
-void
-syck_free_parser( SyckParser *p )
-{
-    /*
-     * Free the adhoc symbol table
-     */
-    if ( p->syms != NULL )
-    {
-        st_foreach( p->syms, syck_st_free_syms, 0 );
-        st_free_table( p->syms );
-        p->syms = NULL;
-    }
-
-    /*
-     * Free tables, levels
-     */
-    syck_st_free( p );
-    syck_parser_reset_levels( p );
-    S_FREE( p->levels[0].domain );
-    S_FREE( p->levels );
-
-    if ( p->buffer != NULL )
-    {
-        S_FREE( p->buffer );
-    }
-    free_any_io( p );
-    S_FREE( p );
-}
-
-void
-syck_parser_handler( SyckParser *p, SyckNodeHandler hdlr )
-{
-    ASSERT( p != NULL );
-    p->handler = hdlr;
-}
-
-void
-syck_parser_implicit_typing( SyckParser *p, int flag )
-{
-    p->implicit_typing = ( flag == 0 ? 0 : 1 );
-}
-
-void
-syck_parser_taguri_expansion( SyckParser *p, int flag )
-{
-    p->taguri_expansion = ( flag == 0 ? 0 : 1 );
-}
-
-void
-syck_parser_error_handler( SyckParser *p, SyckErrorHandler hdlr )
-{
-    ASSERT( p != NULL );
-    p->error_handler = hdlr;
-}
-
-void
-syck_parser_bad_anchor_handler( SyckParser *p, SyckBadAnchorHandler hdlr )
-{
-    ASSERT( p != NULL );
-    p->bad_anchor_handler = hdlr;
-}
-
-void
-syck_parser_set_input_type( SyckParser *p, enum syck_parser_input input_type )
-{
-    ASSERT( p != NULL );
-    p->input_type = input_type;
-}
-
-void
-syck_parser_file( SyckParser *p, FILE *fp, SyckIoFileRead read )
-{
-    ASSERT( p != NULL );
-    free_any_io( p );
-	syck_parser_reset_cursor( p );
-    p->io_type = syck_io_file;
-    p->io.file = S_ALLOC( SyckIoFile );
-    p->io.file->ptr = fp;
-    if ( read != NULL )
-    {
-        p->io.file->read = read;
-    }
-    else
-    {
-        p->io.file->read = syck_io_file_read;
-    }
-}
-
-void
-syck_parser_str( SyckParser *p, char *ptr, long len, SyckIoStrRead read )
-{
-    ASSERT( p != NULL );
-    free_any_io( p );
-	syck_parser_reset_cursor( p );
-    p->io_type = syck_io_str;
-    p->io.str = S_ALLOC( SyckIoStr );
-    p->io.str->beg = ptr;
-    p->io.str->ptr = ptr;
-    p->io.str->end = ptr + len;
-    if ( read != NULL )
-    {
-        p->io.str->read = read;
-    }
-    else
-    {
-        p->io.str->read = syck_io_str_read;
-    }
-}
-
-void
-syck_parser_str_auto( SyckParser *p, char *ptr, SyckIoStrRead read )
-{
-    syck_parser_str( p, ptr, strlen( ptr ), read );
-}
-
-SyckLevel *
-syck_parser_current_level( SyckParser *p )
-{
-    return &p->levels[p->lvl_idx-1];
-}
-
-void
-syck_parser_pop_level( SyckParser *p )
-{
-    ASSERT( p != NULL );
-
-    /* The root level should never be popped */
-    if ( p->lvl_idx <= 1 ) return;
-
-    p->lvl_idx -= 1;
-    free( p->levels[p->lvl_idx].domain );
-}
-
-void
-syck_parser_add_level( SyckParser *p, int len, enum syck_level_status status )
-{
-    ASSERT( p != NULL );
-    if ( p->lvl_idx + 1 > p->lvl_capa )
-    {
-        p->lvl_capa += ALLOC_CT;
-        S_REALLOC_N( p->levels, SyckLevel, p->lvl_capa );
-    }
-
-    ASSERT( len > p->levels[p->lvl_idx-1].spaces );
-    p->levels[p->lvl_idx].spaces = len;
-    p->levels[p->lvl_idx].ncount = 0;
-    p->levels[p->lvl_idx].domain = syck_strndup( p->levels[p->lvl_idx-1].domain, strlen( p->levels[p->lvl_idx-1].domain ) );
-    p->levels[p->lvl_idx].status = status;
-    p->lvl_idx += 1;
-}
-
-void
-free_any_io( SyckParser *p )
-{
-    ASSERT( p != NULL );
-    switch ( p->io_type )
-    {
-        case syck_io_str:
-            if ( p->io.str != NULL )
-            {
-                S_FREE( p->io.str );
-                p->io.str = NULL;
-            }
-        break;
-
-        case syck_io_file:
-            if ( p->io.file != NULL )
-            {
-                S_FREE( p->io.file );
-                p->io.file = NULL;
-            }
-        break;
-    }
-}
-
-long
-syck_move_tokens( SyckParser *p )
-{
-    long count, skip;
-    ASSERT( p->buffer != NULL );
-
-    if ( p->token == NULL )
-        return 0;
-
-    skip = p->limit - p->token;
-    if ( ( count = p->token - p->buffer ) )
-    {
-	if (skip > 0)
-	    S_MEMMOVE( p->buffer, p->token, char, skip );
-        p->token = p->buffer;
-        p->marker -= count;
-        p->cursor -= count;
-        p->toktmp -= count;
-        p->limit -= count;
-        p->lineptr -= count;
-        p->linectptr -= count;
-    }
-    return skip;
-}
-
-void
-syck_check_limit( SyckParser *p, long len )
-{
-    if ( p->cursor == NULL )
-    {
-        p->cursor = p->buffer;
-        p->lineptr = p->buffer;
-        p->linectptr = p->buffer;
-        p->marker = p->buffer;
-    }
-    p->limit = p->buffer + len;
-}
-
-long
-syck_parser_read( SyckParser *p )
-{
-    long len = 0;
-    long skip = 0;
-    ASSERT( p != NULL );
-    switch ( p->io_type )
-    {
-        case syck_io_str:
-            skip = syck_move_tokens( p );
-            len = (p->io.str->read)( p->buffer, p->io.str, SYCK_BUFFERSIZE - 1, skip );
-            break;
-
-        case syck_io_file:
-            skip = syck_move_tokens( p );
-            len = (p->io.file->read)( p->buffer, p->io.file, SYCK_BUFFERSIZE - 1, skip );
-            break;
-    }
-    syck_check_limit( p, len );
-    return len;
-}
-
-long
-syck_parser_readlen( SyckParser *p, long max_size )
-{
-    long len = 0;
-    long skip = 0;
-    ASSERT( p != NULL );
-    switch ( p->io_type )
-    {
-        case syck_io_str:
-            skip = syck_move_tokens( p );
-            len = (p->io.str->read)( p->buffer, p->io.str, max_size, skip );
-            break;
-
-        case syck_io_file:
-            skip = syck_move_tokens( p );
-            len = (p->io.file->read)( p->buffer, p->io.file, max_size, skip );
-            break;
-    }
-    syck_check_limit( p, len );
-    return len;
-}
-
-SYMID
-syck_parse( SyckParser *p )
-{
-    ASSERT( p != NULL );
-
-    syck_st_free( p );
-    syck_parser_reset_levels( p );
-    syckparse( p );
-    return p->root;
-}
-
-void
-syck_default_error_handler( SyckParser *p, const char *msg )
-{
-    printf( "Error at [Line %d, Col %"PRIdPTRDIFF"]: %s\n",
-        p->linect,
-        p->cursor - p->lineptr,
-        msg );
-}
-
diff --git a/ext/syck/syck.h b/ext/syck/syck.h
deleted file mode 100644
index 8885b000de..0000000000
--- a/ext/syck/syck.h
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- * syck.h
- *
- * $Author$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-
-#ifndef SYCK_H
-#define SYCK_H
-
-#define SYCK_YAML_MAJOR 1
-#define SYCK_YAML_MINOR 0
-
-#define YAML_DOMAIN     "yaml.org,2002"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include "ruby/st.h"
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- * Memory Allocation
- */
-#if defined(HAVE_ALLOCA_H) && !defined(__GNUC__)
-#include <alloca.h>
-#endif
-
-#ifdef DEBUG
-void syck_assert( const char *, unsigned, const char * );
-# define ASSERT(f) \
-    (( f ) ? (void)0 : syck_assert( __FILE__, __LINE__, #f ))
-#else
-# define ASSERT(f) ((void)0)
-#endif
-
-#ifndef NULL
-# define NULL (void *)0
-#endif
-
-#define ALLOC_CT 8
-#define SYCK_BUFFERSIZE 4096
-#define S_ALLOC_N(type,n) (type*)malloc(sizeof(type)*(n))
-#define S_ALLOC(type) (type*)malloc(sizeof(type))
-#define S_REALLOC_N(var,type,n) (var)=(type*)realloc((char*)(var),sizeof(type)*(n))
-#define S_FREE(n) if (n) { free(n); n = NULL; }
-
-#define S_ALLOCA_N(type,n) (type*)alloca(sizeof(type)*(n))
-
-#define S_MEMZERO(p,type,n) memset((p), 0, sizeof(type)*(n))
-#define S_MEMCPY(p1,p2,type,n) memcpy((p1), (p2), sizeof(type)*(n))
-#define S_MEMMOVE(p1,p2,type,n) memmove((p1), (p2), sizeof(type)*(n))
-#define S_MEMCMP(p1,p2,type,n) memcmp((p1), (p2), sizeof(type)*(n))
-
-#define BLOCK_FOLD  10
-#define BLOCK_LIT   20
-#define BLOCK_PLAIN 30
-#define NL_CHOMP    40
-#define NL_KEEP     50
-
-/*
- * Node definitions
- */
-#ifndef ST_DATA_T_DEFINED
-typedef long st_data_t;
-#endif
-
-#define SYMID st_data_t
-
-typedef struct _syck_node SyckNode;
-
-enum syck_kind_tag {
-    syck_map_kind,
-    syck_seq_kind,
-    syck_str_kind
-};
-
-enum map_part {
-    map_key,
-    map_value
-};
-
-enum map_style {
-    map_none,
-    map_inline
-};
-
-enum seq_style {
-    seq_none,
-    seq_inline
-};
-
-enum scalar_style {
-    scalar_none,
-    scalar_1quote,
-    scalar_2quote,
-    scalar_fold,
-    scalar_literal,
-    scalar_plain
-};
-
-/*
- * Node metadata struct
- */
-struct _syck_node {
-    /* Symbol table ID */
-    SYMID id;
-    /* Underlying kind */
-    enum syck_kind_tag kind;
-    /* Fully qualified tag-uri for type */
-    char *type_id;
-    /* Anchor name */
-    char *anchor;
-    union {
-        /* Storage for map data */
-        struct SyckMap {
-            enum map_style style;
-            SYMID *keys;
-            SYMID *values;
-            long capa;
-            long idx;
-        } *pairs;
-        /* Storage for sequence data */
-        struct SyckSeq {
-            enum seq_style style;
-            SYMID *items;
-            long capa;
-            long idx;
-        } *list;
-        /* Storage for string data */
-        struct SyckStr {
-            enum scalar_style style;
-            char *ptr;
-            long len;
-        } *str;
-    } data;
-    /* Shortcut node */
-    void *shortcut;
-};
-
-/*
- * Parser definitions
- */
-typedef struct _syck_parser SyckParser;
-typedef struct _syck_file SyckIoFile;
-typedef struct _syck_str SyckIoStr;
-typedef struct _syck_level SyckLevel;
-
-typedef SYMID (*SyckNodeHandler)(SyckParser *, SyckNode *);
-typedef void (*SyckErrorHandler)(SyckParser *, const char *);
-typedef SyckNode * (*SyckBadAnchorHandler)(SyckParser *, char *);
-typedef long (*SyckIoFileRead)(char *, SyckIoFile *, long, long);
-typedef long (*SyckIoStrRead)(char *, SyckIoStr *, long, long);
-
-enum syck_io_type {
-    syck_io_str,
-    syck_io_file
-};
-
-enum syck_parser_input {
-    syck_yaml_utf8,
-    syck_yaml_utf16,
-    syck_yaml_utf32,
-    syck_bytecode_utf8
-};
-
-enum syck_level_status {
-    syck_lvl_header,
-    syck_lvl_doc,
-    syck_lvl_open,
-    syck_lvl_seq,
-    syck_lvl_map,
-    syck_lvl_block,
-    syck_lvl_str,
-    syck_lvl_iseq,
-    syck_lvl_imap,
-    syck_lvl_end,
-    syck_lvl_pause,
-    syck_lvl_anctag,
-    syck_lvl_mapx,
-    syck_lvl_seqx
-};
-
-/*
- * Parser structs
- */
-struct _syck_file {
-    /* File pointer */
-    FILE *ptr;
-    /* Function which FILE -> buffer */
-    SyckIoFileRead read;
-};
-
-struct _syck_str {
-    /* String buffer pointers */
-    char *beg, *ptr, *end;
-    /* Function which string -> buffer */
-    SyckIoStrRead read;
-};
-
-struct _syck_level {
-    /* Indent */
-    int spaces;
-    /* Counts nodes emitted at this level, useful for parsing
-     * keys and pairs in bytecode */
-    int ncount;
-    /* Does node have anchors or tags? */
-    int anctag;
-    /* Domain prefixing at the given level */
-    char *domain;
-    /* Keeps a node status */
-    enum syck_level_status status;
-};
-
-struct _syck_parser {
-    /* Root node */
-    SYMID root, root_on_error;
-    /* Implicit typing flag */
-    int implicit_typing, taguri_expansion;
-    /* Scripting language function to handle nodes */
-    SyckNodeHandler handler;
-    /* Error handler */
-    SyckErrorHandler error_handler;
-    /* InvalidAnchor handler */
-    SyckBadAnchorHandler bad_anchor_handler;
-    /* Parser input type */
-    enum syck_parser_input input_type;
-    /* IO type */
-    enum syck_io_type io_type;
-    /* Custom buffer size */
-    size_t bufsize;
-    /* Buffer pointers */
-    char *buffer, *linectptr, *lineptr, *toktmp, *token, *cursor, *marker, *limit;
-    /* Line counter */
-    int linect;
-    /* Last token from yylex() */
-    int last_token;
-    /* Force a token upon next call to yylex() */
-    int force_token;
-    /* EOF flag */
-    int eof;
-    union {
-        SyckIoFile *file;
-        SyckIoStr *str;
-    } io;
-    /* Symbol table for anchors */
-    st_table *anchors, *bad_anchors;
-    /* Optional symbol table for SYMIDs */
-    st_table *syms;
-    /* Levels of indentation */
-    SyckLevel *levels;
-    int lvl_idx;
-    int lvl_capa;
-    /* Pointer for extension's use */
-    void *bonus;
-};
-
-/*
- * Emitter definitions
- */
-typedef struct _syck_emitter SyckEmitter;
-typedef struct _syck_emitter_node SyckEmitterNode;
-
-typedef void (*SyckOutputHandler)(SyckEmitter *, char *, long);
-typedef void (*SyckEmitterHandler)(SyckEmitter *, st_data_t);
-
-enum doc_stage {
-    doc_open,
-    doc_processing
-};
-
-/*
- * Emitter struct
- */
-struct _syck_emitter {
-    /* Headerless doc flag */
-    int headless;
-    /* Force header? */
-    int use_header;
-    /* Force version? */
-    int use_version;
-    /* Sort hash keys */
-    int sort_keys;
-    /* Anchor format */
-    char *anchor_format;
-    /* Explicit typing on all collections? */
-    int explicit_typing;
-    /* Best width on folded scalars */
-    int best_width;
-    /* Use literal[1] or folded[2] blocks on all text? */
-    enum scalar_style style;
-    /* Stage of written document */
-    enum doc_stage stage;
-    /* Level counter */
-    int level;
-    /* Default indentation */
-    int indent;
-    /* Object ignore ID */
-    SYMID ignore_id;
-    /* Symbol table for anchors */
-    st_table *markers, *anchors, *anchored;
-    /* Custom buffer size */
-    size_t bufsize;
-    /* Buffer */
-    char *buffer, *marker;
-    /* Absolute position of the buffer */
-    long bufpos;
-    /* Handler for emitter nodes */
-    SyckEmitterHandler emitter_handler;
-    /* Handler for output */
-    SyckOutputHandler output_handler;
-    /* Levels of indentation */
-    SyckLevel *levels;
-    int lvl_idx;
-    int lvl_capa;
-    /* Pointer for extension's use */
-    void *bonus;
-};
-
-/*
- * Emitter node metadata struct
- */
-struct _syck_emitter_node {
-    /* Node buffer position */
-    long pos;
-    /* Current indent */
-    long indent;
-    /* Collection? */
-    int is_shortcut;
-};
-
-/*
- * Handler prototypes
- */
-SYMID syck_hdlr_add_node( SyckParser *, SyckNode * );
-SyckNode *syck_hdlr_add_anchor( SyckParser *, char *, SyckNode * );
-void syck_hdlr_remove_anchor( SyckParser *, char * );
-SyckNode *syck_hdlr_get_anchor( SyckParser *, char * );
-void syck_add_transfer( char *, SyckNode *, int );
-char *syck_xprivate( const char *, int );
-char *syck_taguri( const char *, const char *, int );
-int syck_tagcmp( const char *, const char * );
-int syck_add_sym( SyckParser *, void * );
-int syck_lookup_sym( SyckParser *, SYMID, void ** );
-int syck_try_implicit( SyckNode * );
-char *syck_type_id_to_uri( const char * );
-void try_tag_implicit( SyckNode *, int );
-const char *syck_match_implicit( const char *, size_t );
-
-/*
- * API prototypes
- */
-char *syck_strndup( const char *, long );
-long syck_io_file_read( char *, SyckIoFile *, long, long );
-long syck_io_str_read( char *, SyckIoStr *, long, long );
-char *syck_base64enc( char *, long );
-char *syck_base64dec( char *, long );
-SyckEmitter *syck_new_emitter(void);
-SYMID syck_emitter_mark_node( SyckEmitter *, st_data_t );
-void syck_emitter_ignore_id( SyckEmitter *, SYMID );
-void syck_output_handler( SyckEmitter *, SyckOutputHandler );
-void syck_emitter_handler( SyckEmitter *, SyckEmitterHandler );
-void syck_free_emitter( SyckEmitter * );
-void syck_emitter_clear( SyckEmitter * );
-void syck_emitter_write( SyckEmitter *, const char *, long );
-void syck_emitter_escape( SyckEmitter *, const char *, long );
-void syck_emitter_flush( SyckEmitter *, long );
-void syck_emit( SyckEmitter *, st_data_t );
-void syck_emit_scalar( SyckEmitter *, const char *, enum scalar_style, int, int, char, const char *, long );
-void syck_emit_1quoted( SyckEmitter *, int, const char *, long );
-void syck_emit_2quoted( SyckEmitter *, int, const char *, long );
-void syck_emit_folded( SyckEmitter *, int, char, const char *, long );
-void syck_emit_literal( SyckEmitter *, char, const char *, long );
-void syck_emit_seq( SyckEmitter *, const char *, enum seq_style );
-void syck_emit_item( SyckEmitter *, st_data_t );
-void syck_emit_map( SyckEmitter *, const char *, enum map_style );
-void syck_emit_end( SyckEmitter * );
-void syck_emit_tag( SyckEmitter *, const char *, const char * );
-void syck_emit_indent( SyckEmitter * );
-SyckLevel *syck_emitter_current_level( SyckEmitter * );
-SyckLevel *syck_emitter_parent_level( SyckEmitter * );
-void syck_emitter_pop_level( SyckEmitter * );
-void syck_emitter_add_level( SyckEmitter *, int, enum syck_level_status );
-void syck_emitter_reset_levels( SyckEmitter * );
-SyckParser *syck_new_parser(void);
-void syck_free_parser( SyckParser * );
-void syck_parser_set_root_on_error( SyckParser *, SYMID );
-void syck_parser_implicit_typing( SyckParser *, int );
-void syck_parser_taguri_expansion( SyckParser *, int );
-int syck_scan_scalar( int, const char *, long );
-void syck_parser_handler( SyckParser *, SyckNodeHandler );
-void syck_parser_error_handler( SyckParser *, SyckErrorHandler );
-void syck_parser_bad_anchor_handler( SyckParser *, SyckBadAnchorHandler );
-void syck_parser_set_input_type( SyckParser *, enum syck_parser_input );
-void syck_parser_file( SyckParser *, FILE *, SyckIoFileRead );
-void syck_parser_str( SyckParser *, char *, long, SyckIoStrRead );
-void syck_parser_str_auto( SyckParser *, char *, SyckIoStrRead );
-SyckLevel *syck_parser_current_level( SyckParser * );
-void syck_parser_add_level( SyckParser *, int, enum syck_level_status );
-void syck_parser_pop_level( SyckParser * );
-void free_any_io( SyckParser * );
-long syck_parser_read( SyckParser * );
-long syck_parser_readlen( SyckParser *, long );
-SYMID syck_parse( SyckParser * );
-void syck_default_error_handler( SyckParser *, const char * );
-SYMID syck_yaml2byte_handler( SyckParser *, SyckNode * );
-char *syck_yaml2byte( char * );
-
-/*
- * Allocation prototypes
- */
-SyckNode *syck_alloc_map(void);
-SyckNode *syck_alloc_seq(void);
-SyckNode *syck_alloc_str(void);
-void syck_free_node( SyckNode * );
-void syck_free_members( SyckNode * );
-SyckNode *syck_new_str( const char *, enum scalar_style );
-SyckNode *syck_new_str2( const char *, long, enum scalar_style );
-void syck_replace_str( SyckNode *, char *, enum scalar_style );
-void syck_replace_str2( SyckNode *, char *, long, enum scalar_style );
-void syck_str_blow_away_commas( SyckNode * );
-char *syck_str_read( SyckNode * );
-SyckNode *syck_new_map( SYMID, SYMID );
-void syck_map_empty( SyckNode * );
-void syck_map_add( SyckNode *, SYMID, SYMID );
-SYMID syck_map_read( SyckNode *, enum map_part, long );
-void syck_map_assign( SyckNode *, enum map_part, long, SYMID );
-long syck_map_count( SyckNode * );
-void syck_map_update( SyckNode *, SyckNode * );
-SyckNode *syck_new_seq( SYMID );
-void syck_seq_empty( SyckNode * );
-void syck_seq_add( SyckNode *, SYMID );
-void syck_seq_assign( SyckNode *, long, SYMID );
-SYMID syck_seq_read( SyckNode *, long );
-long syck_seq_count( SyckNode * );
-
-/*
- * Lexer prototypes
- */
-void syckerror( const char * );
-int syckparse( void * );
-union YYSTYPE;
-int sycklex( union YYSTYPE *, SyckParser * );
-
-#if defined(__cplusplus)
-}  /* extern "C" { */
-#endif
-
-#endif /* ifndef SYCK_H */
diff --git a/ext/syck/token.c b/ext/syck/token.c
deleted file mode 100644
index bea79c158a..0000000000
--- a/ext/syck/token.c
+++ /dev/null
@@ -1,2724 +0,0 @@
-/* Generated by re2c 0.9.10 on Tue Sep 20 17:46:17 2005 */
-#line 1 "token.re"
-/*
- * token.re
- *
- * $Author$
- *
- * Copyright (C) 2003 why the lucky stiff
- */
-#include "ruby/ruby.h"
-#include "syck.h"
-#include "gram.h"
-
-/*
- * Allocate quoted strings in chunks
- */
-#define QUOTELEN    1024
-
-/*
- * They do my bidding...
- */
-#define YYCTYPE     char
-#define YYCURSOR    parser->cursor
-#define YYMARKER    parser->marker
-#define YYLIMIT     parser->limit
-#define YYTOKEN     parser->token
-#define YYTOKTMP    parser->toktmp
-#define YYLINEPTR   parser->lineptr
-#define YYLINECTPTR parser->linectptr
-#define YYLINE      parser->linect
-#define YYFILL(n)   syck_parser_read(parser)
-
-/*
- * Repositions the cursor at `n' offset from the token start.
- * Only works in `Header' and `Document' sections.
- */
-#define YYPOS(n)    YYCURSOR = YYTOKEN + n
-
-/*
- * Track line numbers
- */
-#define NEWLINE(ptr)    YYLINEPTR = ptr + newline_len(ptr); if ( YYLINEPTR > YYLINECTPTR ) { YYLINE++; YYLINECTPTR = YYLINEPTR; }
-
-/*
- * I like seeing the level operations as macros...
- */
-#define ADD_LEVEL(len, status)  syck_parser_add_level( parser, len, status )
-#define POP_LEVEL()     syck_parser_pop_level( parser )
-#define CURRENT_LEVEL() syck_parser_current_level( parser )
-
-/*
- * Force a token next time around sycklex()
- */
-#define FORCE_NEXT_TOKEN(tok)    parser->force_token = tok;
-
-/*
- * Nice little macro to ensure we're YAML_IOPENed to the current level.
- * * Only use this macro in the "Document" section *
- */
-#define ENSURE_YAML_IOPEN(last_lvl, to_len, reset) \
-        if ( last_lvl->spaces < to_len ) \
-        { \
-            if ( last_lvl->status == syck_lvl_iseq || last_lvl->status == syck_lvl_imap ) \
-            { \
-                goto Document; \
-            } \
-            else \
-            { \
-                ADD_LEVEL( to_len, syck_lvl_doc ); \
-                if ( reset == 1 ) YYPOS(0); \
-                return YAML_IOPEN; \
-            } \
-        }
-
-/*
- * Nice little macro to ensure closure of levels.
- * * Only use this macro in the "Document" section *
- */
-#define ENSURE_YAML_IEND(last_lvl, to_len) \
-        if ( last_lvl->spaces > to_len ) \
-        { \
-            syck_parser_pop_level( parser ); \
-            YYPOS(0); \
-            return YAML_IEND; \
-        }
-
-/*
- * Concatenates quoted string items and manages allocation
- * to the quoted string
- */
-#define QUOTECAT(s, c, i, l) \
-        { \
-            if ( i + 1 >= c ) \
-            { \
-                c += QUOTELEN; \
-                S_REALLOC_N( s, char, c ); \
-            } \
-            s[i++] = l; \
-            s[i] = '\0'; \
-        }
-
-#define QUOTECATS(s, c, i, cs, cl) \
-        { \
-            while ( i + cl >= c ) \
-            { \
-                c += QUOTELEN; \
-                S_REALLOC_N( s, char, c ); \
-            } \
-            S_MEMCPY( s + i, cs, char, cl ); \
-            i += cl; \
-            s[i] = '\0'; \
-        }
-
-/*
- * Tags a plain scalar with a transfer method
- * * Use only in "Plain" section *
- */
-#define RETURN_IMPLICIT() \
-    { \
-        SyckNode *n = syck_alloc_str(); \
-        YYCURSOR = YYTOKEN; \
-        n->data.str->ptr = qstr; \
-        n->data.str->len = qidx; \
-        n->data.str->style = scalar_plain; \
-        sycklval->nodeData = n; \
-        if ( parser->implicit_typing == 1 ) \
-        { \
-            try_tag_implicit( sycklval->nodeData, parser->taguri_expansion ); \
-        } \
-        return YAML_PLAIN; \
-    }
-
-/* concat the inline characters to the plain scalar */
-#define PLAIN_NOT_INL() \
-    if ( *(YYCURSOR - 1) == ' ' || is_newline( YYCURSOR - 1 ) ) \
-    { \
-        YYCURSOR--; \
-    } \
-    QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN); \
-    goto Plain2;
-
-/* trim spaces off the end in case of indent */
-#define PLAIN_IS_INL() \
-    char *walker = qstr + qidx - 1; \
-    while ( walker > qstr && ( *walker == '\n' || *walker == ' ' || *walker == '\t' ) ) \
-    { \
-        qidx--; \
-        walker[0] = '\0'; \
-        walker--; \
-    }
-
-/*
- * Keep or chomp block?
- * * Use only in "ScalarBlock" section *
- */
-#define RETURN_YAML_BLOCK() \
-    { \
-        SyckNode *n = syck_alloc_str(); \
-        if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
-        { \
-            n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 ); \
-        } \
-        else \
-        { \
-            n->type_id = syck_strndup( "str", 3 ); \
-        } \
-        n->data.str->ptr = qstr; \
-        n->data.str->len = qidx; \
-        if ( blockType == BLOCK_LIT ) { \
-            n->data.str->style = scalar_literal; \
-        } else { \
-            n->data.str->style = scalar_fold; \
-        } \
-        if ( qidx > 0 ) \
-        { \
-            if ( nlDoWhat != NL_KEEP ) \
-            { \
-                char *fc = n->data.str->ptr + n->data.str->len - 1; \
-                while ( is_newline( fc ) ) fc--; \
-                if ( nlDoWhat != NL_CHOMP && fc < n->data.str->ptr + n->data.str->len - 1 ) \
-                    fc += 1; \
-                n->data.str->len = fc - n->data.str->ptr + 1; \
-            } \
-        } \
-        sycklval->nodeData = n; \
-        return YAML_BLOCK; \
-    }
-
-/*
- * Handles newlines, calculates indent
- */
-#define GOBBLE_UP_YAML_INDENT( ict, start ) \
-    char *indent = start; \
-    NEWLINE(indent); \
-    while ( indent < YYCURSOR ) \
-    { \
-        if ( is_newline( ++indent ) ) \
-        { \
-            NEWLINE(indent); \
-        } \
-    } \
-    ict = 0; \
-    if ( *YYCURSOR == '\0' ) \
-    { \
-        ict = -1; \
-        start = YYCURSOR - 1; \
-    } \
-    else if ( *YYLINEPTR == ' ' ) \
-    { \
-        ict = (int)(YYCURSOR - YYLINEPTR); \
-    }
-
-/*
- * If an indent exists at the current level, back up.
- */
-#define GET_TRUE_YAML_INDENT(indt_len) \
-    { \
-        SyckLevel *lvl_deep = CURRENT_LEVEL(); \
-        indt_len = lvl_deep->spaces; \
-        if ( lvl_deep->status == syck_lvl_seq || ( indt_len == YYCURSOR - YYLINEPTR && lvl_deep->status != syck_lvl_map )  ) \
-        { \
-            SyckLevel *lvl_over; \
-            parser->lvl_idx--; \
-            lvl_over = CURRENT_LEVEL(); \
-            indt_len = lvl_over->spaces; \
-            parser->lvl_idx++; \
-        } \
-    }
-
-/*
- * Argjh!  I hate globals!  Here for syckerror() only!
- */
-SyckParser *syck_parser_ptr = NULL;
-
-/*
- * Accessory funcs later in this file.
- */
-void eat_comments( SyckParser * );
-char escape_seq( char );
-int is_newline( char *ptr );
-int newline_len( char *ptr );
-int sycklex_yaml_utf8( YYSTYPE *, SyckParser * );
-int sycklex_bytecode_utf8( YYSTYPE *, SyckParser * );
-int syckwrap();
-
-/*
- * My own re-entrant sycklex() using re2c.
- * You really get used to the limited regexp.
- * It's really nice to not rely on backtracking and such.
- */
-int
-sycklex( YYSTYPE *sycklval, SyckParser *parser )
-{
-    switch ( parser->input_type )
-    {
-        case syck_yaml_utf8:
-        return sycklex_yaml_utf8( sycklval, parser );
-
-        case syck_yaml_utf16:
-            syckerror( "UTF-16 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
-        break;
-
-        case syck_yaml_utf32:
-            syckerror( "UTF-32 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
-        break;
-
-        case syck_bytecode_utf8:
-        return sycklex_bytecode_utf8( sycklval, parser );
-    }
-    return YAML_DOCSEP;
-}
-
-/*
- * Parser for standard YAML [UTF-8]
- */
-int
-sycklex_yaml_utf8( YYSTYPE *sycklval, SyckParser *parser )
-{
-    int doc_level = 0;
-    syck_parser_ptr = parser;
-    if ( YYCURSOR == NULL )
-    {
-        syck_parser_read( parser );
-    }
-
-    if ( parser->force_token != 0 )
-    {
-        int t = parser->force_token;
-        parser->force_token = 0;
-        return t;
-    }
-
-#line 315 "token.re"
-
-
-    if ( YYLINEPTR != YYCURSOR )
-    {
-        goto Document;
-    }
-
-Header:
-
-    YYTOKEN = YYCURSOR;
-
-
-#line 307 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy0;
-	++YYCURSOR;
-yy0:
-	if((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy7;
-	case 0x09:	case ' ':	goto yy12;
-	case 0x0A:	goto yy9;
-	case 0x0D:	goto yy11;
-	case '#':	goto yy5;
-	case '-':	goto yy2;
-	case '.':	goto yy4;
-	default:	goto yy14;
-	}
-yy2:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '-':	goto yy28;
-	default:	goto yy3;
-	}
-yy3:
-#line 374 "token.re"
-{   YYPOS(0);
-                        goto Document;
-                    }
-#line 337 "<stdout>"
-yy4:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '.':	goto yy21;
-	default:	goto yy3;
-	}
-yy5:	++YYCURSOR;
-	goto yy6;
-yy6:
-#line 356 "token.re"
-{   eat_comments( parser );
-                        goto Header;
-                    }
-#line 351 "<stdout>"
-yy7:	++YYCURSOR;
-	goto yy8;
-yy8:
-#line 360 "token.re"
-{   SyckLevel *lvl = CURRENT_LEVEL();
-                        ENSURE_YAML_IEND(lvl, -1);
-                        YYPOS(0);
-                        return 0;
-                    }
-#line 361 "<stdout>"
-yy9:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy18;
-yy10:
-#line 366 "token.re"
-{   GOBBLE_UP_YAML_INDENT( doc_level, YYTOKEN );
-                        goto Header;
-                    }
-#line 370 "<stdout>"
-yy11:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy17;
-	default:	goto yy3;
-	}
-yy12:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy16;
-yy13:
-#line 370 "token.re"
-{   doc_level = (int)(YYCURSOR - YYLINEPTR);
-                        goto Header;
-                    }
-#line 384 "<stdout>"
-yy14:	yych = *++YYCURSOR;
-	goto yy3;
-yy15:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy16;
-yy16:	switch(yych){
-	case 0x09:	case ' ':	goto yy15;
-	default:	goto yy13;
-	}
-yy17:	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy18;
-yy18:	switch(yych){
-	case 0x0A:	case ' ':	goto yy17;
-	case 0x0D:	goto yy19;
-	default:	goto yy10;
-	}
-yy19:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy17;
-	default:	goto yy20;
-	}
-yy20:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 1:	goto yy10;
-	case 0:	goto yy3;
-	}
-yy21:	yych = *++YYCURSOR;
-	switch(yych){
-	case '.':	goto yy22;
-	default:	goto yy20;
-	}
-yy22:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy23;
-	case 0x0D:	goto yy27;
-	case ' ':	goto yy25;
-	default:	goto yy20;
-	}
-yy23:	++YYCURSOR;
-	goto yy24;
-yy24:
-#line 342 "token.re"
-{   SyckLevel *lvl = CURRENT_LEVEL();
-                        if ( lvl->status == syck_lvl_header )
-                        {
-                            goto Header;
-                        }
-                        else
-                        {
-                            ENSURE_YAML_IEND(lvl, -1);
-                            YYPOS(0);
-                            return 0;
-                        }
-                        return 0;
-                    }
-#line 446 "<stdout>"
-yy25:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy26;
-yy26:	switch(yych){
-	case ' ':	goto yy25;
-	default:	goto yy24;
-	}
-yy27:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy23;
-	default:	goto yy20;
-	}
-yy28:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy29;
-	default:	goto yy20;
-	}
-yy29:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy30;
-	case 0x0D:	goto yy34;
-	case ' ':	goto yy32;
-	default:	goto yy20;
-	}
-yy30:	++YYCURSOR;
-	goto yy31;
-yy31:
-#line 328 "token.re"
-{   SyckLevel *lvl = CURRENT_LEVEL();
-                        if ( lvl->status == syck_lvl_header )
-                        {
-                            YYPOS(3);
-                            goto Directive;
-                        }
-                        else
-                        {
-                            ENSURE_YAML_IEND(lvl, -1);
-                            YYPOS(0);
-                            return 0;
-                        }
-                    }
-#line 489 "<stdout>"
-yy32:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy33;
-yy33:	switch(yych){
-	case ' ':	goto yy32;
-	default:	goto yy31;
-	}
-yy34:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy30;
-	default:	goto yy20;
-	}
-}
-#line 378 "token.re"
-
-
-Document:
-    {
-        SyckLevel *lvl = CURRENT_LEVEL();
-        if ( lvl->status == syck_lvl_header )
-        {
-            lvl->status = syck_lvl_doc;
-        }
-
-        YYTOKEN = YYCURSOR;
-
-
-#line 518 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy35;
-	++YYCURSOR;
-yy35:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy62;
-	case 0x09:	case ' ':	goto yy60;
-	case 0x0A:	goto yy37;
-	case 0x0D:	goto yy39;
-	case '!':	goto yy51;
-	case '"':	goto yy55;
-	case '#':	goto yy58;
-	case '&':	goto yy49;
-	case '\'':	goto yy53;
-	case '*':	goto yy50;
-	case ',':	case ':':	goto yy47;
-	case '-':	case '?':	goto yy48;
-	case '>':	case '|':	goto yy57;
-	case '[':	goto yy41;
-	case ']':	case '}':	goto yy45;
-	case '{':	goto yy43;
-	default:	goto yy64;
-	}
-yy37:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy92;
-yy38:
-#line 392 "token.re"
-{   /* Isolate spaces */
-                        int indt_len;
-                        GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
-                        lvl = CURRENT_LEVEL();
-                        doc_level = 0;
-
-                        /* XXX: Comment lookahead */
-                        if ( *YYCURSOR == '#' )
-                        {
-                            goto Document;
-                        }
-
-                        /* Ignore indentation inside inlines */
-                        if ( lvl->status == syck_lvl_iseq || lvl->status == syck_lvl_imap )
-                        {
-                            goto Document;
-                        }
-
-                        /* Check for open indent */
-                        ENSURE_YAML_IEND(lvl, indt_len);
-                        ENSURE_YAML_IOPEN(lvl, indt_len, 0);
-                        if ( indt_len == -1 )
-                        {
-                            return 0;
-                        }
-                        return YAML_INDENT;
-                    }
-#line 578 "<stdout>"
-yy39:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy91;
-	default:	goto yy40;
-	}
-yy40:
-#line 497 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        goto Plain;
-                    }
-#line 589 "<stdout>"
-yy41:	++YYCURSOR;
-	goto yy42;
-yy42:
-#line 420 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        lvl = CURRENT_LEVEL();
-                        ADD_LEVEL(lvl->spaces + 1, syck_lvl_iseq);
-                        return YYTOKEN[0];
-                    }
-#line 599 "<stdout>"
-yy43:	++YYCURSOR;
-	goto yy44;
-yy44:
-#line 426 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        lvl = CURRENT_LEVEL();
-                        ADD_LEVEL(lvl->spaces + 1, syck_lvl_imap);
-                        return YYTOKEN[0];
-                    }
-#line 609 "<stdout>"
-yy45:	++YYCURSOR;
-	goto yy46;
-yy46:
-#line 432 "token.re"
-{   POP_LEVEL();
-                        return YYTOKEN[0];
-                    }
-#line 617 "<stdout>"
-yy47:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy86;
-	case 0x0D:	goto yy90;
-	case ' ':	goto yy88;
-	default:	goto yy40;
-	}
-yy48:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy81;
-	case 0x0D:	goto yy85;
-	case ' ':	goto yy83;
-	default:	goto yy40;
-	}
-yy49:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	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 '_':	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':	goto yy78;
-	default:	goto yy40;
-	}
-yy50:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	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 '_':	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':	goto yy75;
-	default:	goto yy40;
-	}
-yy51:	++YYCURSOR;
-	goto yy52;
-yy52:
-#line 471 "token.re"
-{   goto TransferMethod; }
-#line 767 "<stdout>"
-yy53:	++YYCURSOR;
-	goto yy54;
-yy54:
-#line 473 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        goto SingleQuote; }
-#line 774 "<stdout>"
-yy55:	++YYCURSOR;
-	goto yy56;
-yy56:
-#line 476 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        goto DoubleQuote; }
-#line 781 "<stdout>"
-yy57:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy70;
-	case 0x0D:	goto yy74;
-	case ' ':	goto yy72;
-	case '+':	case '-':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	default:	goto yy40;
-	}
-yy58:	++YYCURSOR;
-	goto yy59;
-yy59:
-#line 486 "token.re"
-{   eat_comments( parser );
-                        goto Document;
-                    }
-#line 807 "<stdout>"
-yy60:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy66;
-yy61:
-#line 490 "token.re"
-{   goto Document; }
-#line 814 "<stdout>"
-yy62:	++YYCURSOR;
-	goto yy63;
-yy63:
-#line 492 "token.re"
-{   ENSURE_YAML_IEND(lvl, -1);
-                        YYPOS(0);
-                        return 0;
-                    }
-#line 823 "<stdout>"
-yy64:	yych = *++YYCURSOR;
-	goto yy40;
-yy65:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy66;
-yy66:	switch(yych){
-	case 0x09:	case ' ':	goto yy65;
-	default:	goto yy61;
-	}
-yy67:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy68;
-yy68:	switch(yych){
-	case 0x0A:	goto yy70;
-	case 0x0D:	goto yy74;
-	case ' ':	goto yy72;
-	case '+':	case '-':	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	default:	goto yy69;
-	}
-yy69:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy38;
-	case 1:	goto yy40;
-	}
-yy70:	++YYCURSOR;
-	goto yy71;
-yy71:
-#line 479 "token.re"
-{   if ( is_newline( YYCURSOR - 1 ) )
-                        {
-                            YYCURSOR--;
-                        }
-                        goto ScalarBlock;
-                    }
-#line 869 "<stdout>"
-yy72:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy73;
-yy73:	switch(yych){
-	case ' ':	goto yy72;
-	default:	goto yy71;
-	}
-yy74:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy70;
-	default:	goto yy69;
-	}
-yy75:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy76;
-yy76:	switch(yych){
-	case '-':	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 '_':	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':	goto yy75;
-	default:	goto yy77;
-	}
-yy77:
-#line 466 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
-                        return YAML_ALIAS;
-                    }
-#line 956 "<stdout>"
-yy78:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy79;
-yy79:	switch(yych){
-	case '-':	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 '_':	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':	goto yy78;
-	default:	goto yy80;
-	}
-yy80:
-#line 455 "token.re"
-{   sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
-
-                        /*
-                         * Remove previous anchors of the same name.  Since the parser will likely
-                         * construct deeper nodes first, we want those nodes to be placed in the
-                         * queue for matching at a higher level of indentation.
-                         */
-                        syck_hdlr_remove_anchor(parser, sycklval->name);
-                        return YAML_ANCHOR;
-                    }
-#line 1036 "<stdout>"
-yy81:	++YYCURSOR;
-	goto yy82;
-yy82:
-#line 441 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, (int)(YYTOKEN - YYLINEPTR), 1);
-                        FORCE_NEXT_TOKEN(YAML_IOPEN);
-                        if ( *YYCURSOR == '#' || is_newline( YYCURSOR ) || is_newline( YYCURSOR - 1 ) )
-                        {
-                            YYCURSOR--;
-                            ADD_LEVEL((int)((YYTOKEN + 1) - YYLINEPTR), syck_lvl_seq);
-                        }
-                        else /* spaces followed by content uses the space as indentation */
-                        {
-                            ADD_LEVEL((int)(YYCURSOR - YYLINEPTR), syck_lvl_seq);
-                        }
-                        return YYTOKEN[0];
-                    }
-#line 1054 "<stdout>"
-yy83:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy84;
-yy84:	switch(yych){
-	case ' ':	goto yy83;
-	default:	goto yy82;
-	}
-yy85:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy81;
-	default:	goto yy69;
-	}
-yy86:	++YYCURSOR;
-	goto yy87;
-yy87:
-#line 436 "token.re"
-{   if ( *YYTOKEN == ':' && lvl->status != syck_lvl_imap ) lvl->status = syck_lvl_map;
-                        YYPOS(1);
-                        return YYTOKEN[0];
-                    }
-#line 1076 "<stdout>"
-yy88:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy89;
-yy89:	switch(yych){
-	case ' ':	goto yy88;
-	default:	goto yy87;
-	}
-yy90:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy86;
-	default:	goto yy69;
-	}
-yy91:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy92;
-yy92:	switch(yych){
-	case 0x0A:	case ' ':	goto yy91;
-	case 0x0D:	goto yy93;
-	default:	goto yy38;
-	}
-yy93:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy91;
-	default:	goto yy69;
-	}
-}
-#line 501 "token.re"
-
-    }
-
-Directive:
-    {
-        YYTOKTMP = YYCURSOR;
-
-
-#line 1117 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept = 0;
-	goto yy94;
-	++YYCURSOR;
-yy94:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy96;
-	case 0x09:	case ' ':	goto yy99;
-	case '%':	goto yy97;
-	default:	goto yy101;
-	}
-yy96:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy98;
-	}
-yy97:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	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 ']':
-	case '^':
-	case '_':	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':	goto yy104;
-	default:	goto yy98;
-	}
-yy98:
-#line 514 "token.re"
-{   YYCURSOR = YYTOKTMP;
-                        return YAML_DOCSEP;
-                    }
-#line 1221 "<stdout>"
-yy99:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy103;
-yy100:
-#line 512 "token.re"
-{   goto Directive; }
-#line 1228 "<stdout>"
-yy101:	yych = *++YYCURSOR;
-	goto yy98;
-yy102:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy103;
-yy103:	switch(yych){
-	case 0x09:	case ' ':	goto yy102;
-	default:	goto yy100;
-	}
-yy104:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy105;
-yy105:	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	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 ']':
-	case '^':
-	case '_':	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':	goto yy104;
-	case ':':	goto yy106;
-	default:	goto yy96;
-	}
-yy106:	yych = *++YYCURSOR;
-	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	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 ']':
-	case '^':
-	case '_':	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':	goto yy107;
-	default:	goto yy96;
-	}
-yy107:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy108;
-yy108:	switch(yych){
-	case '.':
-	case '/':
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '?':
-	case '@':
-	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 ']':
-	case '^':
-	case '_':	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':	goto yy107;
-	default:	goto yy109;
-	}
-yy109:
-#line 510 "token.re"
-{   goto Directive; }
-#line 1484 "<stdout>"
-}
-#line 517 "token.re"
-
-
-    }
-
-Plain:
-    {
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-        SyckLevel *plvl;
-        int parentIndent;
-
-        YYCURSOR = YYTOKEN;
-        plvl = CURRENT_LEVEL();
-        GET_TRUE_YAML_INDENT(parentIndent);
-
-Plain2:
-        YYTOKEN = YYCURSOR;
-
-Plain3:
-
-
-#line 1509 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy110;
-	++YYCURSOR;
-yy110:
-	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy124;
-	case 0x09:	goto yy126;
-	case 0x0A:	goto yy112;
-	case 0x0D:	goto yy114;
-	case ' ':	goto yy122;
-	case ',':	goto yy117;
-	case ':':	goto yy116;
-	case ']':	goto yy120;
-	case '}':	goto yy118;
-	default:	goto yy127;
-	}
-yy112:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy142;
-yy113:
-#line 540 "token.re"
-{   int indt_len, nl_count = 0;
-                        SyckLevel *lvl;
-                        char *tok = YYTOKEN;
-                        GOBBLE_UP_YAML_INDENT( indt_len, tok );
-                        lvl = CURRENT_LEVEL();
-
-                        if ( indt_len <= parentIndent )
-                        {
-                            RETURN_IMPLICIT();
-                        }
-
-                        while ( YYTOKEN < YYCURSOR )
-                        {
-                            int nl_len = newline_len( YYTOKEN++ );
-                            if ( nl_len )
-                            {
-                                nl_count++;
-                                YYTOKEN += nl_len - 1;
-                            }
-                        }
-                        if ( nl_count <= 1 )
-                        {
-                            QUOTECAT(qstr, qcapa, qidx, ' ');
-                        }
-                        else
-                        {
-                            int i;
-                            for ( i = 0; i < nl_count - 1; i++ )
-                            {
-                                QUOTECAT(qstr, qcapa, qidx, '\n');
-                            }
-                        }
-
-                        goto Plain2;
-                    }
-#line 1570 "<stdout>"
-yy114:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy141;
-	default:	goto yy115;
-	}
-yy115:
-#line 627 "token.re"
-{   QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN);
-                        goto Plain2;
-                    }
-#line 1581 "<stdout>"
-yy116:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy136;
-	case 0x0D:	goto yy140;
-	case ' ':	goto yy138;
-	default:	goto yy115;
-	}
-yy117:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy130;
-	case 0x0D:	goto yy134;
-	case ' ':	goto yy132;
-	default:	goto yy115;
-	}
-yy118:	++YYCURSOR;
-	goto yy119;
-yy119:
-#line 589 "token.re"
-{   if ( plvl->status != syck_lvl_imap )
-                        {
-                            PLAIN_NOT_INL();
-                        }
-                        else
-                        {
-                            PLAIN_IS_INL();
-                        }
-                        RETURN_IMPLICIT();
-                    }
-#line 1612 "<stdout>"
-yy120:	++YYCURSOR;
-	goto yy121;
-yy121:
-#line 600 "token.re"
-{   if ( plvl->status != syck_lvl_iseq )
-                        {
-                            PLAIN_NOT_INL();
-                        }
-                        else
-                        {
-                            PLAIN_IS_INL();
-                        }
-                        RETURN_IMPLICIT();
-                    }
-#line 1627 "<stdout>"
-yy122:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case '#':	goto yy128;
-	default:	goto yy123;
-	}
-yy123:
-#line 617 "token.re"
-{   if ( qidx == 0 )
-                        {
-                            goto Plain2;
-                        }
-                        else
-                        {
-                            goto Plain3;
-                        }
-                    }
-#line 1644 "<stdout>"
-yy124:	++YYCURSOR;
-	goto yy125;
-yy125:
-#line 615 "token.re"
-{   RETURN_IMPLICIT(); }
-#line 1650 "<stdout>"
-yy126:	yych = *++YYCURSOR;
-	goto yy123;
-yy127:	yych = *++YYCURSOR;
-	goto yy115;
-yy128:	++YYCURSOR;
-	goto yy129;
-yy129:
-#line 611 "token.re"
-{   eat_comments( parser );
-                        RETURN_IMPLICIT();
-                    }
-#line 1662 "<stdout>"
-yy130:	++YYCURSOR;
-	goto yy131;
-yy131:
-#line 578 "token.re"
-{   if ( plvl->status != syck_lvl_iseq && plvl->status != syck_lvl_imap )
-                        {
-                            PLAIN_NOT_INL();
-                        }
-                        else
-                        {
-                            PLAIN_IS_INL();
-                        }
-                        RETURN_IMPLICIT();
-                    }
-#line 1677 "<stdout>"
-yy132:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy133;
-yy133:	switch(yych){
-	case ' ':	goto yy132;
-	default:	goto yy131;
-	}
-yy134:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy130;
-	default:	goto yy135;
-	}
-yy135:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy113;
-	case 1:	goto yy115;
-	}
-yy136:	++YYCURSOR;
-	goto yy137;
-yy137:
-#line 576 "token.re"
-{   RETURN_IMPLICIT(); }
-#line 1701 "<stdout>"
-yy138:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy139;
-yy139:	switch(yych){
-	case ' ':	goto yy138;
-	default:	goto yy137;
-	}
-yy140:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy136;
-	default:	goto yy135;
-	}
-yy141:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy142;
-yy142:	switch(yych){
-	case 0x0A:	case ' ':	goto yy141;
-	case 0x0D:	goto yy143;
-	default:	goto yy113;
-	}
-yy143:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy141;
-	default:	goto yy135;
-	}
-}
-#line 631 "token.re"
-
-    }
-
-SingleQuote:
-    {
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-
-SingleQuote2:
-        YYTOKEN = YYCURSOR;
-
-
-#line 1747 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy144;
-	++YYCURSOR;
-yy144:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy152;
-	case 0x0A:	goto yy146;
-	case 0x0D:	goto yy148;
-	case '\'':	goto yy150;
-	default:	goto yy153;
-	}
-yy146:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy157;
-yy147:
-#line 645 "token.re"
-{   int indt_len;
-                        int nl_count = 0;
-                        SyckLevel *lvl;
-                        GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status != syck_lvl_str )
-                        {
-                            ADD_LEVEL( indt_len, syck_lvl_str );
-                        }
-                        else if ( indt_len < lvl->spaces )
-                        {
-                            /* Error! */
-                        }
-
-                        while ( YYTOKEN < YYCURSOR )
-                        {
-                            int nl_len = newline_len( YYTOKEN++ );
-                            if ( nl_len )
-                            {
-                                nl_count++;
-                                YYTOKEN += nl_len - 1;
-                            }
-                        }
-                        if ( nl_count <= 1 )
-                        {
-                            QUOTECAT(qstr, qcapa, qidx, ' ');
-                        }
-                        else
-                        {
-                            int i;
-                            for ( i = 0; i < nl_count - 1; i++ )
-                            {
-                                QUOTECAT(qstr, qcapa, qidx, '\n');
-                            }
-                        }
-
-                        goto SingleQuote2;
-                    }
-#line 1807 "<stdout>"
-yy148:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy156;
-	default:	goto yy149;
-	}
-yy149:
-#line 712 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
-                        goto SingleQuote2;
-                    }
-#line 1818 "<stdout>"
-yy150:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case '\'':	goto yy154;
-	default:	goto yy151;
-	}
-yy151:
-#line 689 "token.re"
-{   SyckLevel *lvl;
-                        SyckNode *n = syck_alloc_str();
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status == syck_lvl_str )
-                        {
-                            POP_LEVEL();
-                        }
-                        if ( ((SyckParser *)parser)->taguri_expansion == 1 )
-                        {
-                            n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
-                        }
-                        else
-                        {
-                            n->type_id = syck_strndup( "str", 3 );
-                        }
-                        n->data.str->ptr = qstr;
-                        n->data.str->len = qidx;
-                        n->data.str->style = scalar_1quote;
-                        sycklval->nodeData = n;
-                        return YAML_PLAIN;
-                    }
-#line 1848 "<stdout>"
-yy152:	yych = *++YYCURSOR;
-	goto yy151;
-yy153:	yych = *++YYCURSOR;
-	goto yy149;
-yy154:	++YYCURSOR;
-	goto yy155;
-yy155:
-#line 685 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, '\'');
-                        goto SingleQuote2;
-                    }
-#line 1860 "<stdout>"
-yy156:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy157;
-yy157:	switch(yych){
-	case 0x0A:	case ' ':	goto yy156;
-	case 0x0D:	goto yy158;
-	default:	goto yy147;
-	}
-yy158:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy156;
-	default:	goto yy159;
-	}
-yy159:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy147;
-	}
-}
-#line 716 "token.re"
-
-
-    }
-
-
-DoubleQuote:
-    {
-        int keep_nl = 1;
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-
-DoubleQuote2:
-        YYTOKEN = YYCURSOR;
-
-
-
-#line 1901 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy160;
-	++YYCURSOR;
-yy160:
-	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy167;
-	case 0x0A:	goto yy162;
-	case 0x0D:	goto yy164;
-	case '"':	goto yy169;
-	case '\\':	goto yy166;
-	default:	goto yy170;
-	}
-yy162:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy184;
-yy163:
-#line 734 "token.re"
-{   int indt_len;
-                        int nl_count = 0;
-                        SyckLevel *lvl;
-                        GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status != syck_lvl_str )
-                        {
-                            ADD_LEVEL( indt_len, syck_lvl_str );
-                        }
-                        else if ( indt_len < lvl->spaces )
-                        {
-                            /* FIXME */
-                        }
-
-                        if ( keep_nl == 1 )
-                        {
-                            while ( YYTOKEN < YYCURSOR )
-                            {
-                                int nl_len = newline_len( YYTOKEN++ );
-                                if ( nl_len )
-                                {
-                                    nl_count++;
-                                    YYTOKEN += nl_len - 1;
-                                }
-                            }
-                            if ( nl_count <= 1 )
-                            {
-                                QUOTECAT(qstr, qcapa, qidx, ' ');
-                            }
-                            else
-                            {
-                                int i;
-                                for ( i = 0; i < nl_count - 1; i++ )
-                                {
-                                    QUOTECAT(qstr, qcapa, qidx, '\n');
-                                }
-                            }
-                        }
-
-                        keep_nl = 1;
-                        goto DoubleQuote2;
-                    }
-#line 1966 "<stdout>"
-yy164:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy183;
-	default:	goto yy165;
-	}
-yy165:
-#line 820 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
-                        goto DoubleQuote2;
-                    }
-#line 1977 "<stdout>"
-yy166:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case 0x0A:	goto yy174;
-	case 0x0D:	goto yy176;
-	case ' ':	goto yy171;
-	case '"':	case '0':	case '\\':	case 'a':
-	case 'b':	case 'e':
-	case 'f':	case 'n':	case 'r':	case 't':	case 'v':	goto yy178;
-	case 'x':	goto yy177;
-	default:	goto yy165;
-	}
-yy167:	++YYCURSOR;
-	goto yy168;
-yy168:
-#line 797 "token.re"
-{   SyckLevel *lvl;
-                        SyckNode *n = syck_alloc_str();
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status == syck_lvl_str )
-                        {
-                            POP_LEVEL();
-                        }
-                        if ( ((SyckParser *)parser)->taguri_expansion == 1 )
-                        {
-                            n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
-                        }
-                        else
-                        {
-                            n->type_id = syck_strndup( "str", 3 );
-                        }
-                        n->data.str->ptr = qstr;
-                        n->data.str->len = qidx;
-                        n->data.str->style = scalar_2quote;
-                        sycklval->nodeData = n;
-                        return YAML_PLAIN;
-                    }
-#line 2016 "<stdout>"
-yy169:	yych = *++YYCURSOR;
-	goto yy168;
-yy170:	yych = *++YYCURSOR;
-	goto yy165;
-yy171:	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	goto yy172;
-yy172:	switch(yych){
-	case 0x0A:	goto yy174;
-	case 0x0D:	goto yy176;
-	case ' ':	goto yy171;
-	default:	goto yy173;
-	}
-yy173:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy163;
-	case 1:	goto yy165;
-	}
-yy174:	++YYCURSOR;
-	goto yy175;
-yy175:
-#line 792 "token.re"
-{   keep_nl = 0;
-                        YYCURSOR--;
-                        goto DoubleQuote2;
-                    }
-#line 2044 "<stdout>"
-yy176:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy174;
-	default:	goto yy173;
-	}
-yy177:	yych = *++YYCURSOR;
-	switch(yych){
-	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 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':	goto yy180;
-	default:	goto yy173;
-	}
-yy178:	++YYCURSOR;
-	goto yy179;
-yy179:
-#line 778 "token.re"
-{   char ch = *( YYCURSOR - 1 );
-                        QUOTECAT(qstr, qcapa, qidx, escape_seq( ch ));
-                        goto DoubleQuote2;
-                    }
-#line 2082 "<stdout>"
-yy180:	yych = *++YYCURSOR;
-	switch(yych){
-	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 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':	goto yy181;
-	default:	goto yy173;
-	}
-yy181:	++YYCURSOR;
-	goto yy182;
-yy182:
-#line 783 "token.re"
-{   long ch;
-                        char *chr_text = syck_strndup( YYTOKEN, 4 );
-                        chr_text[0] = '0';
-                        ch = strtol( chr_text, NULL, 16 );
-                        free( chr_text );
-                        QUOTECAT(qstr, qcapa, qidx, ch);
-                        goto DoubleQuote2;
-                    }
-#line 2119 "<stdout>"
-yy183:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy184;
-yy184:	switch(yych){
-	case 0x0A:	case ' ':	goto yy183;
-	case 0x0D:	goto yy185;
-	default:	goto yy163;
-	}
-yy185:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy183;
-	default:	goto yy173;
-	}
-}
-#line 824 "token.re"
-
-    }
-
-TransferMethod:
-    {
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-
-TransferMethod2:
-        YYTOKTMP = YYCURSOR;
-
-
-#line 2152 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy186;
-	++YYCURSOR;
-yy186:
-	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy188;
-	case 0x0A:	goto yy190;
-	case 0x0D:	goto yy192;
-	case ' ':	goto yy191;
-	case '\\':	goto yy194;
-	default:	goto yy195;
-	}
-yy188:	++YYCURSOR;
-	goto yy189;
-yy189:
-#line 838 "token.re"
-{   SyckLevel *lvl;
-                        YYCURSOR = YYTOKTMP;
-                        if ( YYCURSOR == YYTOKEN + 1 )
-                        {
-                            free( qstr );
-                            return YAML_ITRANSFER;
-                        }
-
-                        lvl = CURRENT_LEVEL();
-
-                        /*
-                         * URL Prefixing
-                         */
-                        if ( *qstr == '^' )
-                        {
-                            sycklval->name = S_ALLOC_N( char, qidx + strlen( lvl->domain ) );
-                            sycklval->name[0] = '\0';
-                            strcat( sycklval->name, lvl->domain );
-                            strncat( sycklval->name, qstr + 1, qidx - 1 );
-                            free( qstr );
-                        }
-                        else
-                        {
-                            char *carat = qstr;
-                            char *qend = qstr + qidx;
-                            while ( (++carat) < qend )
-                            {
-                                if ( *carat == '^' )
-                                    break;
-                            }
-
-                            if ( carat < qend )
-                            {
-                                free( lvl->domain );
-                                lvl->domain = syck_strndup( qstr, carat - qstr );
-                                sycklval->name = S_ALLOC_N( char, ( qend - carat ) + strlen( lvl->domain ) );
-                                sycklval->name[0] = '\0';
-                                strcat( sycklval->name, lvl->domain );
-                                strncat( sycklval->name, carat + 1, ( qend - carat ) - 1 );
-                                free( qstr );
-                            }
-                            else
-                            {
-                                sycklval->name = qstr;
-                            }
-                        }
-
-                        return YAML_TRANSFER;
-                    }
-#line 2222 "<stdout>"
-yy190:	yych = *++YYCURSOR;
-	goto yy189;
-yy191:	yych = *++YYCURSOR;
-	goto yy204;
-yy192:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy188;
-	default:	goto yy193;
-	}
-yy193:
-#line 905 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
-                        goto TransferMethod2;
-                    }
-#line 2237 "<stdout>"
-yy194:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '"':	case '0':	case '\\':	case 'a':
-	case 'b':	case 'e':
-	case 'f':	case 'n':	case 'r':	case 't':	case 'v':	goto yy198;
-	case 'x':	goto yy196;
-	default:	goto yy193;
-	}
-yy195:	yych = *++YYCURSOR;
-	goto yy193;
-yy196:	yych = *++YYCURSOR;
-	switch(yych){
-	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 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':	goto yy200;
-	default:	goto yy197;
-	}
-yy197:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy193;
-	}
-yy198:	++YYCURSOR;
-	goto yy199;
-yy199:
-#line 891 "token.re"
-{  char ch = *( YYCURSOR - 1 );
-                        QUOTECAT(qstr, qcapa, qidx, escape_seq( ch ));
-                        goto TransferMethod2;
-                    }
-#line 2285 "<stdout>"
-yy200:	yych = *++YYCURSOR;
-	switch(yych){
-	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 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':	goto yy201;
-	default:	goto yy197;
-	}
-yy201:	++YYCURSOR;
-	goto yy202;
-yy202:
-#line 896 "token.re"
-{   long ch;
-                        char *chr_text = syck_strndup( YYTOKTMP, 4 );
-                        chr_text[0] = '0';
-                        ch = strtol( chr_text, NULL, 16 );
-                        free( chr_text );
-                        QUOTECAT(qstr, qcapa, qidx, ch);
-                        goto TransferMethod2;
-                    }
-#line 2322 "<stdout>"
-yy203:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy204;
-yy204:	switch(yych){
-	case ' ':	goto yy203;
-	default:	goto yy189;
-	}
-}
-#line 910 "token.re"
-
-    }
-
-ScalarBlock:
-    {
-        int qidx = 0;
-        int qcapa = 100;
-        char *qstr = S_ALLOC_N( char, qcapa );
-        int blockType = 0;
-        int nlDoWhat = 0;
-        int lastIndent = 0;
-        int forceIndent = -1;
-        char *yyt = YYTOKEN;
-        SyckLevel *lvl = CURRENT_LEVEL();
-        int parentIndent = -1;
-
-        switch ( *yyt )
-        {
-            case '|': blockType = BLOCK_LIT; break;
-            case '>': blockType = BLOCK_FOLD; break;
-        }
-
-        while ( ++yyt <= YYCURSOR )
-        {
-            if ( *yyt == '-' )
-            {
-                nlDoWhat = NL_CHOMP;
-            }
-            else if ( *yyt == '+' )
-            {
-                nlDoWhat = NL_KEEP;
-            }
-            else if ( isdigit( *yyt ) )
-            {
-                forceIndent = rb_long2int(strtol( yyt, NULL, 10 ));
-            }
-        }
-
-        qstr[0] = '\0';
-        YYTOKEN = YYCURSOR;
-
-ScalarBlock2:
-        YYTOKEN = YYCURSOR;
-
-
-#line 2378 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy205;
-	++YYCURSOR;
-yy205:
-	if((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy213;
-	case 0x0A:	goto yy207;
-	case 0x0D:	goto yy209;
-	case '#':	goto yy211;
-	case '-':	goto yy215;
-	default:	goto yy216;
-	}
-yy207:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy226;
-yy208:
-#line 956 "token.re"
-{   char *pacer;
-                        char *tok = YYTOKEN;
-                        int indt_len = 0, nl_count = 0, fold_nl = 0, nl_begin = 0;
-                        GOBBLE_UP_YAML_INDENT( indt_len, tok );
-                        lvl = CURRENT_LEVEL();
-
-                        if ( lvl->status != syck_lvl_block )
-                        {
-                            GET_TRUE_YAML_INDENT(parentIndent);
-                            if ( forceIndent > 0 ) forceIndent += parentIndent;
-                            if ( indt_len > parentIndent )
-                            {
-                                int new_spaces = forceIndent > 0 ? forceIndent : indt_len;
-                                ADD_LEVEL( new_spaces, syck_lvl_block );
-                                lastIndent = indt_len - new_spaces;
-                                nl_begin = 1;
-                                lvl = CURRENT_LEVEL();
-                            }
-                            else
-                            {
-                                YYCURSOR = YYTOKEN;
-                                RETURN_YAML_BLOCK();
-                            }
-                        }
-
-                        /*
-                         * Fold only in the event of two lines being on the leftmost
-                         * indentation.
-                         */
-                        if ( blockType == BLOCK_FOLD && lastIndent == 0 && ( indt_len - lvl->spaces ) == 0 )
-                        {
-                            fold_nl = 1;
-                        }
-
-                        pacer = YYTOKEN;
-                        while ( pacer < YYCURSOR )
-                        {
-                            int nl_len = newline_len( pacer++ );
-                            if ( nl_len )
-                            {
-                                nl_count++;
-                                pacer += nl_len - 1;
-                            }
-                        }
-
-                        if ( fold_nl == 1 || nl_begin == 1 )
-                        {
-                            nl_count--;
-                        }
-
-                        if ( nl_count < 1 && nl_begin == 0 )
-                        {
-                            QUOTECAT(qstr, qcapa, qidx, ' ');
-                        }
-                        else
-                        {
-                            int i;
-                            for ( i = 0; i < nl_count; i++ )
-                            {
-                                QUOTECAT(qstr, qcapa, qidx, '\n');
-                            }
-                        }
-
-                        lastIndent = indt_len - lvl->spaces;
-                        YYCURSOR -= lastIndent;
-
-                        if ( indt_len < lvl->spaces )
-                        {
-                            POP_LEVEL();
-                            YYCURSOR = YYTOKEN;
-                            RETURN_YAML_BLOCK();
-                        }
-                        goto ScalarBlock2;
-                    }
-#line 2474 "<stdout>"
-yy209:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy225;
-	default:	goto yy210;
-	}
-yy210:
-#line 1070 "token.re"
-{   QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
-                        goto ScalarBlock2;
-                    }
-#line 2485 "<stdout>"
-yy211:	++YYCURSOR;
-	goto yy212;
-yy212:
-#line 1032 "token.re"
-{   lvl = CURRENT_LEVEL();
-                        if ( lvl->status != syck_lvl_block )
-                        {
-                            eat_comments( parser );
-                            YYTOKEN = YYCURSOR;
-                        }
-                        else
-                        {
-                            QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
-                        }
-                        goto ScalarBlock2;
-                    }
-#line 2502 "<stdout>"
-yy213:	++YYCURSOR;
-	goto yy214;
-yy214:
-#line 1046 "token.re"
-{   YYCURSOR--;
-                        POP_LEVEL();
-                        RETURN_YAML_BLOCK();
-                    }
-#line 2511 "<stdout>"
-yy215:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '-':	goto yy217;
-	default:	goto yy210;
-	}
-yy216:	yych = *++YYCURSOR;
-	goto yy210;
-yy217:	yych = *++YYCURSOR;
-	switch(yych){
-	case '-':	goto yy219;
-	default:	goto yy218;
-	}
-yy218:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy208;
-	case 1:	goto yy210;
-	}
-yy219:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy220;
-	case 0x0D:	goto yy224;
-	case ' ':	goto yy222;
-	default:	goto yy218;
-	}
-yy220:	++YYCURSOR;
-	goto yy221;
-yy221:
-#line 1051 "token.re"
-{   if ( YYTOKEN == YYLINEPTR )
-                        {
-                            if ( blockType == BLOCK_FOLD && qidx > 0 )
-                            {
-                                qidx -= 1;
-                            }
-                            QUOTECAT(qstr, qcapa, qidx, '\n');
-                            POP_LEVEL();
-                            YYCURSOR = YYTOKEN;
-                            RETURN_YAML_BLOCK();
-                        }
-                        else
-                        {
-                            QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
-                            YYCURSOR = YYTOKEN + 1;
-                            goto ScalarBlock2;
-                        }
-                    }
-#line 2559 "<stdout>"
-yy222:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy223;
-yy223:	switch(yych){
-	case ' ':	goto yy222;
-	default:	goto yy221;
-	}
-yy224:	yych = *++YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy220;
-	default:	goto yy218;
-	}
-yy225:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy226;
-yy226:	switch(yych){
-	case 0x0A:	case ' ':	goto yy225;
-	case 0x0D:	goto yy227;
-	default:	goto yy208;
-	}
-yy227:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy225;
-	default:	goto yy218;
-	}
-}
-#line 1075 "token.re"
-
-    }
-
-    return 0;
-
-}
-
-void
-eat_comments( SyckParser *parser )
-{
-Comment:
-    {
-        YYTOKEN = YYCURSOR;
-
-
-#line 2607 "<stdout>"
-{
-	YYCTYPE yych;
-	unsigned int yyaccept;
-	goto yy228;
-	++YYCURSOR;
-yy228:
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x00:	goto yy230;
-	case 0x0A:	goto yy232;
-	case 0x0D:	goto yy233;
-	default:	goto yy235;
-	}
-yy230:	++YYCURSOR;
-	goto yy231;
-yy231:
-#line 1091 "token.re"
-{   YYCURSOR = YYTOKEN;
-                        return;
-                    }
-#line 2629 "<stdout>"
-yy232:	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy237;
-yy233:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case 0x0A:	goto yy236;
-	default:	goto yy234;
-	}
-yy234:
-#line 1095 "token.re"
-{   goto Comment;
-                    }
-#line 2642 "<stdout>"
-yy235:	yych = *++YYCURSOR;
-	goto yy234;
-yy236:	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy237;
-yy237:	switch(yych){
-	case 0x0A:	goto yy236;
-	case 0x0D:	goto yy238;
-	default:	goto yy231;
-	}
-yy238:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych){
-	case 0x0A:	goto yy236;
-	default:	goto yy239;
-	}
-yy239:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy231;
-	}
-}
-#line 1098 "token.re"
-
-
-    }
-
-}
-
-char
-escape_seq( char ch )
-{
-    switch ( ch )
-    {
-        case '0': return '\0';
-        case 'a': return 7;
-        case 'b': return '\010';
-        case 'e': return '\033';
-        case 'f': return '\014';
-        case 'n': return '\n';
-        case 'r': return '\015';
-        case 't': return '\t';
-        case 'v': return '\013';
-        default: return ch;
-    }
-}
-
-int
-is_newline( char *ptr )
-{
-    return newline_len( ptr );
-}
-
-int
-newline_len( char *ptr )
-{
-    if ( *ptr == '\n' )
-        return 1;
-
-    if ( *ptr == '\r' && *( ptr + 1 ) == '\n' )
-        return 2;
-
-    return 0;
-}
-
-int
-syckwrap()
-{
-    return 1;
-}
-
-void
-syckerror( const char *msg )
-{
-    if ( syck_parser_ptr->error_handler == NULL )
-        syck_parser_ptr->error_handler = syck_default_error_handler;
-
-    syck_parser_ptr->root = syck_parser_ptr->root_on_error;
-    (syck_parser_ptr->error_handler)(syck_parser_ptr, msg);
-}
-
diff --git a/ext/syck/yaml2byte.c b/ext/syck/yaml2byte.c
deleted file mode 100644
index e5cc4e0779..0000000000
--- a/ext/syck/yaml2byte.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * yaml2byte.c
- *
- * $Author$
- *
- * Copyright (C) 2003 why the lucky stiff, clark evans
- *
- *   WARNING WARNING WARNING  --- THIS IS *NOT JUST* PLAYING
- *   ANYMORE! -- WHY HAS EMBRACED THIS AS THE REAL THING!
- */
-#include "ruby/ruby.h"
-#include <syck.h>
-#include <assert.h>
-#define YAMLBYTE_UTF8
-#include "yamlbyte.h"
-
-#include <stdio.h>
-#define TRACE0(a)  \
-    do { printf(a); printf("\n"); fflush(stdout); } while(0)
-#define TRACE1(a,b) \
-    do { printf(a,b); printf("\n"); fflush(stdout); } while(0)
-#define TRACE2(a,b,c) \
-    do { printf(a,b,c); printf("\n"); fflush(stdout); } while(0)
-#define TRACE3(a,b,c,d) \
-    do { printf(a,b,c,d); printf("\n"); fflush(stdout); } while(0)
-
-/* Reinvent the wheel... */
-#define CHUNKSIZE 64
-#define HASH ((long)0xCAFECAFE)
-typedef struct {
-   long hash;
-   char *buffer;
-   long length;
-   long remaining;
-   int  printed;
-} bytestring_t;
-bytestring_t *bytestring_alloc(void) {
-    bytestring_t *ret;
-    /*TRACE0("bytestring_alloc()");*/
-    ret = S_ALLOC(bytestring_t);
-    ret->hash   = HASH;
-    ret->length = CHUNKSIZE;
-    ret->remaining = ret->length;
-    ret->buffer = S_ALLOC_N(char, ret->length + 1 );
-    ret->buffer[0] = 0;
-    ret->printed = 0;
-    return ret;
-}
-void bytestring_append(bytestring_t *str, char code,
-                       char *start, char *finish)
-{
-    long grow;
-    long length = 2;   /* CODE + LF */
-    char *curr;
-    assert(str && HASH == str->hash);
-    /*TRACE0("bytestring_append()");*/
-    if(start) {
-        if(!finish)
-            finish = start + strlen(start);
-        length += (finish-start);
-    }
-    if(length > str->remaining) {
-        grow = (length - str->remaining) + CHUNKSIZE;
-        str->remaining += grow;
-        str->length    += grow;
-        S_REALLOC_N( str->buffer, char, str->length + 1 );
-        assert(str->buffer);
-    }
-    curr = str->buffer + (str->length - str->remaining);
-    *curr = code;
-    curr += 1;
-    if(start)
-        while(start < finish)
-            *curr ++ = *start ++;
-    *curr = '\n';
-    curr += 1;
-    *curr = 0;
-    str->remaining = str->remaining - length;
-    assert( (str->buffer + str->length) - str->remaining );
-}
-void bytestring_extend(bytestring_t *str, bytestring_t *ext)
-{
-    char *from;
-    char *curr;
-    char *stop;
-    long grow;
-    long length;
-    assert(str && HASH == str->hash);
-    assert(ext && HASH == ext->hash);
-    if(ext->printed) {
-        assert(ext->buffer[0] ==YAMLBYTE_ANCHOR);
-        curr = ext->buffer;
-        while( '\n' != *curr)
-            curr++;
-        bytestring_append(str, YAMLBYTE_ALIAS, ext->buffer + 1, curr);
-    } else {
-        ext->printed = 1;
-        length  = (ext->length - ext->remaining);
-        if(length > str->remaining) {
-            grow = (length - str->remaining) + CHUNKSIZE;
-            str->remaining += grow;
-            str->length    += grow;
-            S_REALLOC_N( str->buffer, char, str->length + 1 );
-        }
-        curr = str->buffer + (str->length - str->remaining);
-        from = ext->buffer;
-        stop = ext->buffer + length;
-        while( from < stop )
-            *curr ++ = *from ++;
-        *curr = 0;
-        str->remaining = str->remaining - length;
-        assert( (str->buffer + str->length) - str->remaining );
-    }
-}
-
-/* convert SyckNode into yamlbyte_buffer_t objects */
-SYMID
-syck_yaml2byte_handler(p, n)
-    SyckParser *p;
-    SyckNode *n;
-{
-    SYMID oid;
-    long i;
-    char ch;
-    char nextcode;
-    char *start;
-    char *current;
-    char *finish;
-    bytestring_t *val = NULL;
-    bytestring_t *sav = NULL;
-    void *data;
-    /*TRACE0("syck_yaml2byte_handler()");*/
-    val = bytestring_alloc();
-    if(n->anchor) bytestring_append(val,YAMLBYTE_ANCHOR, n->anchor, NULL);
-    if ( n->type_id )
-    {
-        if ( p->taguri_expansion )
-        {
-            bytestring_append(val,YAMLBYTE_TRANSFER, n->type_id, NULL);
-        }
-        else
-        {
-            char *type_tag = S_ALLOC_N( char, strlen( n->type_id ) + 1 );
-            type_tag[0] = '\0';
-            strcat( type_tag, "!" );
-            strcat( type_tag, n->type_id );
-            bytestring_append( val, YAMLBYTE_TRANSFER, type_tag, NULL);
-	    S_FREE(type_tag);
-        }
-    }
-    switch (n->kind)
-    {
-        case syck_str_kind:
-            nextcode = YAMLBYTE_SCALAR;
-            start  = n->data.str->ptr;
-            finish = start + n->data.str->len - 1;
-            current = start;
-            /*TRACE2("SCALAR: %s %d", start, n->data.str->len); */
-            while(1) {
-                ch = *current;
-                if('\n' == ch || 0 == ch || current > finish) {
-                    if(current >= start) {
-                        bytestring_append(val, nextcode, start, current);
-                        nextcode = YAMLBYTE_CONTINUE;
-                    }
-                    start = current + 1;
-                    if(current > finish)
-                    {
-                        break;
-                    }
-                    else if('\n' == ch )
-                    {
-                        bytestring_append(val,YAMLBYTE_NEWLINE,NULL,NULL);
-                    }
-                    else if(0 == ch)
-                    {
-                        bytestring_append(val,YAMLBYTE_NULLCHAR,NULL,NULL);
-                    }
-                    else
-                    {
-                        assert("oops");
-                    }
-                }
-                current += 1;
-            }
-        break;
-        case syck_seq_kind:
-            bytestring_append(val,YAMLBYTE_SEQUENCE,NULL,NULL);
-            for ( i = 0; i < n->data.list->idx; i++ )
-            {
-                oid = syck_seq_read( n, i );
-                if (syck_lookup_sym( p, oid, &data )) sav = data;
-                bytestring_extend(val, sav);
-            }
-            bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
-        break;
-        case syck_map_kind:
-            bytestring_append(val,YAMLBYTE_MAPPING,NULL,NULL);
-            for ( i = 0; i < n->data.pairs->idx; i++ )
-            {
-                oid = syck_map_read( n, map_key, i );
-                if (syck_lookup_sym( p, oid, &data )) sav = data;
-                bytestring_extend(val, sav);
-                oid = syck_map_read( n, map_value, i );
-                if (syck_lookup_sym( p, oid, &data )) sav = data;
-                bytestring_extend(val, sav);
-            }
-            bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
-        break;
-    }
-    oid = syck_add_sym( p, (char *) val );
-    /*TRACE1("Saving: %s", val->buffer );*/
-    return oid;
-}
-
-char *
-syck_yaml2byte(char *yamlstr)
-{
-    SYMID oid;
-    char *ret;
-    bytestring_t *sav;
-    void *data;
-
-    SyckParser *parser = syck_new_parser();
-    syck_parser_str_auto( parser, yamlstr, NULL );
-    syck_parser_handler( parser, syck_yaml2byte_handler );
-    syck_parser_error_handler( parser, NULL );
-    syck_parser_implicit_typing( parser, 1 );
-    syck_parser_taguri_expansion( parser, 1 );
-    oid = syck_parse( parser );
-
-    if ( syck_lookup_sym( parser, oid, &data ) ) {
-	sav = data;
-        ret = S_ALLOC_N( char, strlen( sav->buffer ) + 3 );
-        ret[0] = '\0';
-        strcat( ret, "D\n" );
-        strcat( ret, sav->buffer );
-    }
-    else
-    {
-        ret = NULL;
-    }
-
-    syck_free_parser( parser );
-    return ret;
-}
-
-#ifdef TEST_YBEXT
-#include <stdio.h>
-int main() {
-   char *yaml = "test: 1\nand: \"with new\\nline\\n\"\nalso: &3 three\nmore: *3";
-   printf("--- # YAML \n");
-   printf(yaml);
-   printf("\n...\n");
-   printf(syck_yaml2byte(yaml));
-   return 0;
-}
-#endif
-
diff --git a/ext/syck/yamlbyte.h b/ext/syck/yamlbyte.h
deleted file mode 100644
index 16ca3d70de..0000000000
--- a/ext/syck/yamlbyte.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*  yamlbyte.h
- *
- *  The YAML bytecode "C" interface header file.   See the YAML bytecode
- *  reference for bytecode sequence rules and for the meaning of each
- *  bytecode.
- */
-
-#ifndef YAMLBYTE_H
-#define YAMLBYTE_H
-#include <stddef.h>
-
-/* define what a character is */
-typedef unsigned char yamlbyte_utf8_t;
-typedef unsigned short yamlbyte_utf16_t;
-#ifdef YAMLBYTE_UTF8
-  #ifdef YAMLBYTE_UTF16
-    #error Must only define YAMLBYTE_UTF8 or YAMLBYTE_UTF16
-  #endif
-  typedef yamlbyte_utf8_t yamlbyte_char_t;
-#else
-  #ifdef YAMLBYTE_UTF16
-    typedef yamlbyte_utf16_t yamlbyte_char_t;
-  #else
-    #error Must define YAMLBYTE_UTF8 or YAMLBYTE_UTF16
-  #endif
-#endif
-
-/* specify list of bytecodes */
-#define YAMLBYTE_FINISH          ((yamlbyte_char_t) 0)
-#define YAMLBYTE_DOCUMENT        ((yamlbyte_char_t)'D')
-#define YAMLBYTE_DIRECTIVE       ((yamlbyte_char_t)'V')
-#define YAMLBYTE_PAUSE           ((yamlbyte_char_t)'P')
-#define YAMLBYTE_MAPPING         ((yamlbyte_char_t)'M')
-#define YAMLBYTE_SEQUENCE        ((yamlbyte_char_t)'Q')
-#define YAMLBYTE_END_BRANCH      ((yamlbyte_char_t)'E')
-#define YAMLBYTE_SCALAR          ((yamlbyte_char_t)'S')
-#define YAMLBYTE_CONTINUE        ((yamlbyte_char_t)'C')
-#define YAMLBYTE_NEWLINE         ((yamlbyte_char_t)'N')
-#define YAMLBYTE_NULLCHAR        ((yamlbyte_char_t)'Z')
-#define YAMLBYTE_ANCHOR          ((yamlbyte_char_t)'A')
-#define YAMLBYTE_ALIAS           ((yamlbyte_char_t)'R')
-#define YAMLBYTE_TRANSFER        ((yamlbyte_char_t)'T')
-/* formatting bytecodes */
-#define YAMLBYTE_COMMENT         ((yamlbyte_char_t)'c')
-#define YAMLBYTE_INDENT          ((yamlbyte_char_t)'i')
-#define YAMLBYTE_STYLE           ((yamlbyte_char_t)'s')
-/* other bytecodes */
-#define YAMLBYTE_LINE_NUMBER     ((yamlbyte_char_t)'#')
-#define YAMLBYTE_WHOLE_SCALAR    ((yamlbyte_char_t)'<')
-#define YAMLBYTE_NOTICE          ((yamlbyte_char_t)'!')
-#define YAMLBYTE_SPAN            ((yamlbyte_char_t)')')
-#define YAMLBYTE_ALLOC           ((yamlbyte_char_t)'@')
-
-/* second level style bytecodes, ie "s>" */
-#define YAMLBYTE_FLOW            ((yamlbyte_char_t)'>')
-#define YAMLBYTE_LITERAL         ((yamlbyte_char_t)'|')
-#define YAMLBYTE_BLOCK           ((yamlbyte_char_t)'b')
-#define YAMLBYTE_PLAIN           ((yamlbyte_char_t)'p')
-#define YAMLBYTE_INLINE_MAPPING  ((yamlbyte_char_t)'{')
-#define YAMLBYTE_INLINE_SEQUENCE ((yamlbyte_char_t)'[')
-#define YAMLBYTE_SINGLE_QUOTED   ((yamlbyte_char_t)39)
-#define YAMLBYTE_DOUBLE_QUOTED   ((yamlbyte_char_t)'"')
-
-/*
- * The "C" API has two variants, one based on instructions,
- * with events delivered via pointers; and the other one
- * is character based where one or more instructions are
- * serialized into a buffer.
- *
- * Note: In the instruction based API, WHOLE_SCALAR does
- *       not have the '<here' marshalling stuff.
- */
-
-typedef void * yamlbyte_consumer_t;
-typedef void * yamlbyte_producer_t;
-
-/* push and pull APIs need a way to communicate results */
-typedef enum {
-    YAMLBYTE_OK          = 0,     /* proceed                        */
-    YAMLBYTE_E_MEMORY    = 'M',   /* could not allocate memory      */
-    YAMLBYTE_E_READ      = 'R',   /* input stream read error        */
-    YAMLBYTE_E_WRITE     = 'W',   /* output stream write error      */
-    YAMLBYTE_E_OTHER     = '?',   /* some other error condition     */
-    YAMLBYTE_E_PARSE     = 'P',   /* parse error, check bytecodes   */
-    YAMLBYTE_MAX
-} yamlbyte_result_t;
-
-typedef const yamlbyte_char_t *yamlbyte_buff_t;
-
-/*
- *  The "Instruction" API
- */
-
-typedef struct yaml_instruction {
-    yamlbyte_char_t bytecode;
-    yamlbyte_buff_t start;
-    yamlbyte_buff_t finish;  /* open range, *finish is _not_ part */
-} *yamlbyte_inst_t;
-
-/* producer pushes the instruction with one bytecode event to the
- * consumer; if the consumer's result is not YAMLBYTE_OK, then
- * the producer should stop */
-typedef
-  yamlbyte_result_t
-   (*yamlbyte_push_t)(
-     yamlbyte_consumer_t self,
-     yamlbyte_inst_t  inst
-   );
-
-/* consumer pulls a bytecode instruction from the producer; in this
- * case the instruction (and is buffer) are owned by the producer and
- * will remain valid till the pull function is called once again;
- * if the instruction is NULL, then there are no more results; and
- * it is important to call the pull function till it returns NULL so
- * that the producer can clean up its memory allocations */
-typedef
-   yamlbyte_result_t
-    (*yamlbyte_pull_t)(
-      yamlbyte_producer_t self,
-      yamlbyte_inst_t *inst   /* to be filled in by the producer */
-    );
-
-/*
- *  Buffer based API
- */
-
-/* producer pushes a null terminated buffer filled with one or more
- * bytecode events to the consumer; if the consumer's result is not
- * YAMLBYTE_OK, then the producer should stop */
-typedef
-  yamlbyte_result_t
-   (*yamlbyte_pushbuff_t)(
-     yamlbyte_consumer_t self,
-     yamlbyte_buff_t  buff
-   );
-
-/* consumer pulls bytecode events from the producer; in this case
- * the buffer is owned by the producer, and will remain valid till
- * the pull function is called once again; if the buffer pointer
- * is set to NULL, then there are no more results; it is important
- * to call the pull function till it returns NULL so that the
- * producer can clean up its memory allocations */
-typedef
-   yamlbyte_result_t
-    (*yamlbyte_pullbuff_t)(
-      yamlbyte_producer_t self,
-      yamlbyte_buff_t *buff   /* to be filled in by the producer */
-    );
-
-/* convert a pull interface to a push interface; the reverse process
- * requires threads and thus is language dependent */
-#define YAMLBYTE_PULL2PUSH(pull,producer,push,consumer,result)       \
-    do {                                                         \
-        yamlbyte_pullbuff_t _pull = (pull);                              \
-        yamlbyte_pushbuff_t _push = (push);                              \
-        yamlbyte_result_t _result = YAMLBYTE_OK;                         \
-        yamlbyte_producer_t _producer = (producer);                  \
-        yamlbyte_consumer_t _consumer = (consumer);                  \
-        while(1) {                                               \
-            yamlbyte_buff_t buff = NULL;                           \
-            _result = _pull(_producer,&buff);                    \
-            if(YAMLBYTE_OK != result || NULL == buff)                \
-                break;                                           \
-            _result = _push(_consumer,buff);                     \
-            if(YAMLBYTE_OK != result)                                \
-                break;                                           \
-        }                                                        \
-        (result) = _result;                                      \
-    } while(0)
-
-#endif
diff --git a/ext/syslog/depend b/ext/syslog/depend
index 45cbea293a..a3f7db8371 100644
--- a/ext/syslog/depend
+++ b/ext/syslog/depend
@@ -1,2 +1,14 @@
-syslog.o: syslog.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
-  $(hdrdir)/intern.h
+# AUTOGENERATED DEPENDENCIES START
+syslog.o: $(RUBY_EXTCONF_H)
+syslog.o: $(arch_hdrdir)/ruby/config.h
+syslog.o: $(hdrdir)/ruby/assert.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
diff --git a/ext/syslog/extconf.rb b/ext/syslog/extconf.rb
index 0fa0bc339b..1230a4d52e 100644
--- a/ext/syslog/extconf.rb
+++ b/ext/syslog/extconf.rb
@@ -1,8 +1,11 @@
+# frozen_string_literal: false
 # $RoughId: extconf.rb,v 1.3 2001/11/24 17:49:26 knu Exp $
 # $Id$
 
 require 'mkmf'
 
+have_library("log") # for Android
+
 have_header("syslog.h") &&
   have_func("openlog") &&
   have_func("setlogmask") &&
diff --git a/ext/syslog/lib/syslog/logger.rb b/ext/syslog/lib/syslog/logger.rb
new file mode 100644
index 0000000000..453ca2785c
--- /dev/null
+++ b/ext/syslog/lib/syslog/logger.rb
@@ -0,0 +1,209 @@
+# frozen_string_literal: false
+require 'syslog'
+require 'logger'
+
+##
+# Syslog::Logger is a Logger work-alike that logs via syslog instead of to a
+# file.  You can use Syslog::Logger to aggregate logs between multiple
+# machines.
+#
+# By default, Syslog::Logger uses the program name 'ruby', but this can be
+# changed via the first argument to Syslog::Logger.new.
+#
+# NOTE! You can only set the Syslog::Logger program name when you initialize
+# Syslog::Logger for the first time.  This is a limitation of the way
+# Syslog::Logger uses syslog (and in some ways, a limitation of the way
+# syslog(3) works).  Attempts to change Syslog::Logger's program name after
+# the first initialization will be ignored.
+#
+# === Example
+#
+# The following will log to syslogd on your local machine:
+#
+#   require 'syslog/logger'
+#
+#   log = Syslog::Logger.new 'my_program'
+#   log.info 'this line will be logged via syslog(3)'
+#
+# Also the facility may be set to specify the facility level which will be used:
+#
+#   log.info 'this line will be logged using Syslog default facility level'
+#
+#   log_local1 = Syslog::Logger.new 'my_program', Syslog::LOG_LOCAL1
+#   log_local1.info 'this line will be logged using local1 facility level'
+#
+#
+# You may need to perform some syslog.conf setup first.  For a BSD machine add
+# the following lines to /etc/syslog.conf:
+#
+#  !my_program
+#  *.*                                             /var/log/my_program.log
+#
+# Then touch /var/log/my_program.log and signal syslogd with a HUP
+# (killall -HUP syslogd, on FreeBSD).
+#
+# If you wish to have logs automatically roll over and archive, see the
+# newsyslog.conf(5) and newsyslog(8) man pages.
+
+class Syslog::Logger
+  # Default formatter for log messages.
+  class Formatter
+    def call severity, time, progname, msg
+      clean msg
+    end
+
+    private
+
+    ##
+    # Clean up messages so they're nice and pretty.
+
+    def clean message
+      message = message.to_s.strip
+      message.gsub!(/\e\[[0-9;]*m/, '') # remove useless ansi color codes
+      return message
+    end
+  end
+
+  ##
+  # The version of Syslog::Logger you are using.
+
+  VERSION = '2.1.0'
+
+  ##
+  # Maps Logger warning types to syslog(3) warning types.
+  #
+  # Messages from Ruby applications are not considered as critical as messages
+  # from other system daemons using syslog(3), so most messages are reduced by
+  # one level.  For example, a fatal message for Ruby's Logger is considered
+  # an error for syslog(3).
+
+  LEVEL_MAP = {
+    ::Logger::UNKNOWN => Syslog::LOG_ALERT,
+    ::Logger::FATAL   => Syslog::LOG_ERR,
+    ::Logger::ERROR   => Syslog::LOG_WARNING,
+    ::Logger::WARN    => Syslog::LOG_NOTICE,
+    ::Logger::INFO    => Syslog::LOG_INFO,
+    ::Logger::DEBUG   => Syslog::LOG_DEBUG,
+  }
+
+  ##
+  # Returns the internal Syslog object that is initialized when the
+  # first instance is created.
+
+  def self.syslog
+    @@syslog
+  end
+
+  ##
+  # Specifies the internal Syslog object to be used.
+
+  def self.syslog= syslog
+    @@syslog = syslog
+  end
+
+  ##
+  # Builds a methods for level +meth+.
+
+  def self.make_methods meth
+    level = ::Logger.const_get(meth.upcase)
+    eval <<-EOM, nil, __FILE__, __LINE__ + 1
+      def #{meth}(message = nil, &block)
+        add(#{level}, message, &block)
+      end
+
+      def #{meth}?
+        level <= #{level}
+      end
+    EOM
+  end
+
+  ##
+  # :method: unknown
+  #
+  # Logs a +message+ at the unknown (syslog alert) log level, or logs the
+  # message returned from the block.
+
+  ##
+  # :method: fatal
+  #
+  # Logs a +message+ at the fatal (syslog err) log level, or logs the message
+  # returned from the block.
+
+  ##
+  # :method: error
+  #
+  # Logs a +message+ at the error (syslog warning) log level, or logs the
+  # message returned from the block.
+
+  ##
+  # :method: warn
+  #
+  # Logs a +message+ at the warn (syslog notice) log level, or logs the
+  # message returned from the block.
+
+  ##
+  # :method: info
+  #
+  # Logs a +message+ at the info (syslog info) log level, or logs the message
+  # returned from the block.
+
+  ##
+  # :method: debug
+  #
+  # Logs a +message+ at the debug (syslog debug) log level, or logs the
+  # message returned from the block.
+
+  Logger::Severity::constants.each do |severity|
+    make_methods severity.downcase
+  end
+
+  ##
+  # Log level for Logger compatibility.
+
+  attr_accessor :level
+
+  # Logging formatter, as a +Proc+ that will take four arguments and
+  # return the formatted message. The arguments are:
+  #
+  # +severity+:: The Severity of the log message.
+  # +time+:: A Time instance representing when the message was logged.
+  # +progname+:: The #progname configured, or passed to the logger method.
+  # +msg+:: The _Object_ the user passed to the log message; not necessarily a
+  #         String.
+  #
+  # The block should return an Object that can be written to the logging
+  # device via +write+.  The default formatter is used when no formatter is
+  # set.
+  attr_accessor :formatter
+
+  ##
+  # The facility argument is used to specify what type of program is logging the message.
+
+  attr_accessor :facility
+
+  ##
+  # Fills in variables for Logger compatibility.  If this is the first
+  # instance of Syslog::Logger, +program_name+ may be set to change the logged
+  # program name. The +facility+ may be set to specify the facility level which will be used.
+  #
+  # Due to the way syslog works, only one program name may be chosen.
+
+  def initialize program_name = 'ruby', facility = nil
+    @level = ::Logger::DEBUG
+    @formatter = Formatter.new
+
+    @@syslog ||= Syslog.open(program_name)
+
+    @facility = (facility || @@syslog.facility)
+  end
+
+  ##
+  # Almost duplicates Logger#add.  +progname+ is ignored.
+
+  def add severity, message = nil, progname = nil, &block
+    severity ||= ::Logger::UNKNOWN
+    level <= severity and
+      @@syslog.log( (LEVEL_MAP[severity] | @facility), '%s', formatter.call(severity, Time.now, progname, (message || block.call)) )
+    true
+  end
+end
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index f7d622ef34..4c540fc9c7 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -13,7 +13,21 @@
 #include <syslog.h>
 
 /* Syslog class */
-static VALUE mSyslog, mSyslogConstants;
+static VALUE mSyslog;
+/*
+ * Module holding all Syslog constants.  See Syslog::log and
+ * Syslog::open for constant descriptions.
+ */
+static VALUE mSyslogConstants;
+/* Module holding Syslog option constants */
+static VALUE mSyslogOption;
+/* Module holding Syslog facility constants */
+static VALUE mSyslogFacility;
+/* Module holding Syslog level constants */
+static VALUE mSyslogLevel;
+/* Module holding Syslog utility macros */
+static VALUE mSyslogMacros;
+
 static const char *syslog_ident = NULL;
 static int syslog_options = -1, syslog_facility = -1, syslog_mask = -1;
 static int syslog_opened = 0;
@@ -23,7 +37,6 @@ static void syslog_write(int pri, int argc, VALUE *argv)
 {
     VALUE str;
 
-    rb_secure(4);
     if (argc < 1) {
         rb_raise(rb_eArgError, "no log message supplied");
     }
@@ -42,14 +55,13 @@ static void syslog_write(int pri, int argc, VALUE *argv)
  */
 static VALUE mSyslog_close(VALUE self)
 {
-    rb_secure(4);
     if (!syslog_opened) {
         rb_raise(rb_eRuntimeError, "syslog not opened");
     }
 
     closelog();
 
-    free((void *)syslog_ident);
+    xfree((void *)syslog_ident);
     syslog_ident = NULL;
     syslog_options = syslog_facility = syslog_mask = -1;
     syslog_opened = 0;
@@ -111,7 +123,7 @@ static VALUE mSyslog_close(VALUE self)
  * LOG_KERN:: A kernel message (not sendable by user processes, so not of
  *            much use to Ruby, but listed here for completeness).
  *
- * LOG_LRP:: Line printer subsystem.
+ * LOG_LPR:: Line printer subsystem.
  *
  * LOG_MAIL:: Mail delivery or transport subsystem.
  *
@@ -138,6 +150,7 @@ static VALUE mSyslog_close(VALUE self)
 static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
 {
     VALUE ident, opt, fac;
+    const char *ident_ptr;
 
     if (syslog_opened) {
         rb_raise(rb_eRuntimeError, "syslog already open");
@@ -148,8 +161,8 @@ static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
     if (NIL_P(ident)) {
         ident = rb_gv_get("$0");
     }
-    SafeStringValue(ident);
-    syslog_ident = strdup(RSTRING_PTR(ident));
+    ident_ptr = StringValueCStr(ident);
+    syslog_ident = strdup(ident_ptr);
 
     if (NIL_P(opt)) {
 	syslog_options = LOG_PID | LOG_CONS;
@@ -249,7 +262,6 @@ static VALUE mSyslog_get_mask(VALUE self)
  */
 static VALUE mSyslog_set_mask(VALUE self, VALUE mask)
 {
-    rb_secure(4);
     if (!syslog_opened) {
         rb_raise(rb_eRuntimeError, "must open syslog before setting log mask");
     }
@@ -284,24 +296,18 @@ static VALUE mSyslog_set_mask(VALUE self, VALUE mask)
  *   Syslog.log(Syslog::LOG_ALERT, "Out of memory")
  *   Syslog.alert("Out of memory")
  *
- * Format strings are as for printf/sprintf, except that in addition %m is
- * replaced with the error message string that would be returned by
- * strerror(errno).
- *
  */
 static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
 {
     VALUE pri;
 
-    if (argc < 2) {
-        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2+)", argc);
-    }
+    rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
 
     argc--;
     pri = *argv++;
 
     if (!FIXNUM_P(pri)) {
-      rb_raise(rb_eTypeError, "type mismatch: %s given", rb_class2name(CLASS_OF(pri)));
+	rb_raise(rb_eTypeError, "type mismatch: %"PRIsVALUE" given", rb_obj_class(pri));
     }
 
     syslog_write(FIX2INT(pri), argc, argv);
@@ -313,22 +319,17 @@ static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
  */
 static VALUE mSyslog_inspect(VALUE self)
 {
-    char buf[1024];
+    Check_Type(self, T_MODULE);
 
-    if (syslog_opened) {
-	snprintf(buf, sizeof(buf),
-	  "<#%s: opened=true, ident=\"%s\", options=%d, facility=%d, mask=%d>",
-	  rb_class2name(self),
-	  syslog_ident,
-	  syslog_options,
-	  syslog_facility,
-	  syslog_mask);
-    } else {
-	snprintf(buf, sizeof(buf),
-	  "<#%s: opened=false>", rb_class2name(self));
-    }
+    if (!syslog_opened)
+	return rb_sprintf("<#%"PRIsVALUE": opened=false>", self);
 
-    return rb_str_new2(buf);
+    return rb_sprintf("<#%"PRIsVALUE": opened=true, ident=\"%s\", options=%d, facility=%d, mask=%d>",
+		      self,
+		      syslog_ident,
+		      syslog_options,
+		      syslog_facility,
+		      syslog_mask);
 }
 
 /* Returns self, for backward compatibility.
@@ -376,7 +377,7 @@ define_syslog_shortcut_method(LOG_DEBUG, debug)
  *
  * Generates a mask bit for a priority level. See #mask=
  */
-static VALUE mSyslogConstants_LOG_MASK(VALUE klass, VALUE pri)
+static VALUE mSyslogMacros_LOG_MASK(VALUE mod, VALUE pri)
 {
     return INT2FIX(LOG_MASK(NUM2INT(pri)));
 }
@@ -387,11 +388,17 @@ static VALUE mSyslogConstants_LOG_MASK(VALUE klass, VALUE pri)
  * Generates a mask value for priority levels at or below the level specified.
  * See #mask=
  */
-static VALUE mSyslogConstants_LOG_UPTO(VALUE klass, VALUE pri)
+static VALUE mSyslogMacros_LOG_UPTO(VALUE mod, VALUE pri)
 {
     return INT2FIX(LOG_UPTO(NUM2INT(pri)));
 }
 
+static VALUE mSyslogMacros_included(VALUE mod, VALUE target)
+{
+    rb_extend_object(target, mSyslogMacros);
+    return mod;
+}
+
 /* The syslog package provides a Ruby interface to the POSIX system logging
  * facility.
  *
@@ -406,18 +413,17 @@ static VALUE mSyslogConstants_LOG_UPTO(VALUE klass, VALUE pri)
  *
  * The syslog protocol is standardized in RFC 5424.
  */
-void Init_syslog()
+void Init_syslog(void)
 {
+#undef rb_intern
     mSyslog = rb_define_module("Syslog");
 
-    /* Document-module: Syslog::Constants
-     *
-     * Module holding Syslog constants.  See Syslog::log and Syslog::open for
-     * constant descriptions.
-     */
-    mSyslogConstants = rb_define_module_under(mSyslog, "Constants");
+    mSyslogConstants    = rb_define_module_under(mSyslog, "Constants");
 
-    rb_include_module(mSyslog, mSyslogConstants);
+    mSyslogOption       = rb_define_module_under(mSyslog, "Option");
+    mSyslogFacility     = rb_define_module_under(mSyslog, "Facility");
+    mSyslogLevel        = rb_define_module_under(mSyslog, "Level");
+    mSyslogMacros       = rb_define_module_under(mSyslog, "Macros");
 
     rb_define_module_function(mSyslog, "open", mSyslog_open, -1);
     rb_define_module_function(mSyslog, "reopen", mSyslog_reopen, -1);
@@ -433,143 +439,150 @@ void Init_syslog()
     rb_define_module_function(mSyslog, "mask", mSyslog_get_mask, 0);
     rb_define_module_function(mSyslog, "mask=", mSyslog_set_mask, 1);
 
-    rb_define_module_function(mSyslog, "LOG_MASK", mSyslogConstants_LOG_MASK, 1);
-    rb_define_module_function(mSyslog, "LOG_UPTO", mSyslogConstants_LOG_UPTO, 1);
-
-    rb_define_module_function(mSyslog, "inspect", mSyslog_inspect, 0);
+    rb_define_singleton_method(mSyslog, "inspect", mSyslog_inspect, 0);
     rb_define_module_function(mSyslog, "instance", mSyslog_instance, 0);
 
-    rb_define_module_function(mSyslogConstants, "LOG_MASK", mSyslogConstants_LOG_MASK, 1);
-    rb_define_module_function(mSyslogConstants, "LOG_UPTO", mSyslogConstants_LOG_UPTO, 1);
+    /* Syslog options */
 
-#define rb_define_syslog_const(id) \
-    rb_define_const(mSyslogConstants, #id, INT2NUM(id))
+#define rb_define_syslog_option(c) \
+    rb_define_const(mSyslogOption, #c, INT2NUM(c))
 
-    /* Various options when opening log */
 #ifdef LOG_PID
-    rb_define_syslog_const(LOG_PID);
+    rb_define_syslog_option(LOG_PID);
 #endif
 #ifdef LOG_CONS
-    rb_define_syslog_const(LOG_CONS);
+    rb_define_syslog_option(LOG_CONS);
 #endif
 #ifdef LOG_ODELAY
-    rb_define_syslog_const(LOG_ODELAY); /* deprecated */
+    rb_define_syslog_option(LOG_ODELAY); /* deprecated */
 #endif
 #ifdef LOG_NDELAY
-    rb_define_syslog_const(LOG_NDELAY);
+    rb_define_syslog_option(LOG_NDELAY);
 #endif
 #ifdef LOG_NOWAIT
-    rb_define_syslog_const(LOG_NOWAIT); /* deprecated */
+    rb_define_syslog_option(LOG_NOWAIT); /* deprecated */
 #endif
 #ifdef LOG_PERROR
-    rb_define_syslog_const(LOG_PERROR);
+    rb_define_syslog_option(LOG_PERROR);
 #endif
 
-    /* Various syslog facilities */
+    /* Syslog facilities */
+
+#define rb_define_syslog_facility(c) \
+    rb_define_const(mSyslogFacility, #c, INT2NUM(c))
+
 #ifdef LOG_AUTH
-    rb_define_syslog_const(LOG_AUTH);
+    rb_define_syslog_facility(LOG_AUTH);
 #endif
 #ifdef LOG_AUTHPRIV
-    rb_define_syslog_const(LOG_AUTHPRIV);
+    rb_define_syslog_facility(LOG_AUTHPRIV);
 #endif
 #ifdef LOG_CONSOLE
-    rb_define_syslog_const(LOG_CONSOLE);
+    rb_define_syslog_facility(LOG_CONSOLE);
 #endif
 #ifdef LOG_CRON
-    rb_define_syslog_const(LOG_CRON);
+    rb_define_syslog_facility(LOG_CRON);
 #endif
 #ifdef LOG_DAEMON
-    rb_define_syslog_const(LOG_DAEMON);
+    rb_define_syslog_facility(LOG_DAEMON);
 #endif
 #ifdef LOG_FTP
-    rb_define_syslog_const(LOG_FTP);
+    rb_define_syslog_facility(LOG_FTP);
 #endif
 #ifdef LOG_KERN
-    rb_define_syslog_const(LOG_KERN);
+    rb_define_syslog_facility(LOG_KERN);
 #endif
 #ifdef LOG_LPR
-    rb_define_syslog_const(LOG_LPR);
+    rb_define_syslog_facility(LOG_LPR);
 #endif
 #ifdef LOG_MAIL
-    rb_define_syslog_const(LOG_MAIL);
+    rb_define_syslog_facility(LOG_MAIL);
 #endif
 #ifdef LOG_NEWS
-    rb_define_syslog_const(LOG_NEWS);
+    rb_define_syslog_facility(LOG_NEWS);
 #endif
 #ifdef LOG_NTP
-   rb_define_syslog_const(LOG_NTP);
+    rb_define_syslog_facility(LOG_NTP);
 #endif
 #ifdef LOG_SECURITY
-    rb_define_syslog_const(LOG_SECURITY);
+    rb_define_syslog_facility(LOG_SECURITY);
 #endif
 #ifdef LOG_SYSLOG
-    rb_define_syslog_const(LOG_SYSLOG);
+    rb_define_syslog_facility(LOG_SYSLOG);
 #endif
 #ifdef LOG_USER
-    rb_define_syslog_const(LOG_USER);
+    rb_define_syslog_facility(LOG_USER);
 #endif
 #ifdef LOG_UUCP
-    rb_define_syslog_const(LOG_UUCP);
+    rb_define_syslog_facility(LOG_UUCP);
 #endif
 #ifdef LOG_LOCAL0
-    rb_define_syslog_const(LOG_LOCAL0);
+    rb_define_syslog_facility(LOG_LOCAL0);
 #endif
 #ifdef LOG_LOCAL1
-    rb_define_syslog_const(LOG_LOCAL1);
+    rb_define_syslog_facility(LOG_LOCAL1);
 #endif
 #ifdef LOG_LOCAL2
-    rb_define_syslog_const(LOG_LOCAL2);
+    rb_define_syslog_facility(LOG_LOCAL2);
 #endif
 #ifdef LOG_LOCAL3
-    rb_define_syslog_const(LOG_LOCAL3);
+    rb_define_syslog_facility(LOG_LOCAL3);
 #endif
 #ifdef LOG_LOCAL4
-    rb_define_syslog_const(LOG_LOCAL4);
+    rb_define_syslog_facility(LOG_LOCAL4);
 #endif
 #ifdef LOG_LOCAL5
-    rb_define_syslog_const(LOG_LOCAL5);
+    rb_define_syslog_facility(LOG_LOCAL5);
 #endif
 #ifdef LOG_LOCAL6
-    rb_define_syslog_const(LOG_LOCAL6);
+    rb_define_syslog_facility(LOG_LOCAL6);
 #endif
 #ifdef LOG_LOCAL7
-    rb_define_syslog_const(LOG_LOCAL7);
+    rb_define_syslog_facility(LOG_LOCAL7);
 #endif
 
-#define rb_define_syslog_shortcut(name) \
-    rb_define_module_function(mSyslog, #name, mSyslog_##name, -1)
+    /* Syslog levels and the shortcut methods */
+
+#define rb_define_syslog_level(c, m)				\
+    rb_define_const(mSyslogLevel, #c, INT2NUM(c));		\
+    rb_define_module_function(mSyslog, #m, mSyslog_##m, -1)
 
-    /* Various syslog priorities and the shortcut methods */
 #ifdef LOG_EMERG
-    rb_define_syslog_const(LOG_EMERG);
-    rb_define_syslog_shortcut(emerg);
+    rb_define_syslog_level(LOG_EMERG, emerg);
 #endif
 #ifdef LOG_ALERT
-    rb_define_syslog_const(LOG_ALERT);
-    rb_define_syslog_shortcut(alert);
+    rb_define_syslog_level(LOG_ALERT, alert);
 #endif
 #ifdef LOG_CRIT
-    rb_define_syslog_const(LOG_CRIT);
-    rb_define_syslog_shortcut(crit);
+    rb_define_syslog_level(LOG_CRIT, crit);
 #endif
 #ifdef LOG_ERR
-    rb_define_syslog_const(LOG_ERR);
-    rb_define_syslog_shortcut(err);
+    rb_define_syslog_level(LOG_ERR, err);
 #endif
 #ifdef LOG_WARNING
-    rb_define_syslog_const(LOG_WARNING);
-    rb_define_syslog_shortcut(warning);
+    rb_define_syslog_level(LOG_WARNING, warning);
 #endif
 #ifdef LOG_NOTICE
-    rb_define_syslog_const(LOG_NOTICE);
-    rb_define_syslog_shortcut(notice);
+    rb_define_syslog_level(LOG_NOTICE, notice);
 #endif
 #ifdef LOG_INFO
-    rb_define_syslog_const(LOG_INFO);
-    rb_define_syslog_shortcut(info);
+    rb_define_syslog_level(LOG_INFO, info);
 #endif
 #ifdef LOG_DEBUG
-    rb_define_syslog_const(LOG_DEBUG);
-    rb_define_syslog_shortcut(debug);
+    rb_define_syslog_level(LOG_DEBUG, debug);
 #endif
+
+    /* Syslog macros */
+
+    rb_define_method(mSyslogMacros, "LOG_MASK", mSyslogMacros_LOG_MASK, 1);
+    rb_define_method(mSyslogMacros, "LOG_UPTO", mSyslogMacros_LOG_UPTO, 1);
+    rb_define_singleton_method(mSyslogMacros, "included", mSyslogMacros_included, 1);
+
+    rb_include_module(mSyslogConstants, mSyslogOption);
+    rb_include_module(mSyslogConstants, mSyslogFacility);
+    rb_include_module(mSyslogConstants, mSyslogLevel);
+    rb_funcall(mSyslogConstants, rb_intern("include"), 1, mSyslogMacros);
+
+    rb_define_singleton_method(mSyslogConstants, "included", mSyslogMacros_included, 1);
+    rb_funcall(mSyslog, rb_intern("include"), 1, mSyslogConstants);
 }
diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
deleted file mode 100644
index b4775c55fc..0000000000
--- a/ext/tk/ChangeLog.tkextlib
+++ /dev/null
@@ -1,949 +0,0 @@
-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 draggging)
-
-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
deleted file mode 100644
index 8ba202c06f..0000000000
--- a/ext/tk/MANUAL_tcltklib.eng
+++ /dev/null
@@ -1,473 +0,0 @@
-(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 taget events on 'do_one_event' methos.
-    : 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 occurence 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, doen'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 cannt 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 thead
-       : sleeps 'no_event_wait' mili-seconds).
-       : 'loop_max == 800' and 'no_event_tick == 10' are defalut.
-       : 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 warinig message but ignore the exception.
-       : If nil, no warning message and ignore the excepsion.
-       : 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 falsr 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 extention 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 regist the command once, after that, the
-       : command can be called by _invoke.
-
-    _cancel_eval(str)
-    _cancel_eval_unwind(str)
-       : (Tcl/Tk8.6 or later)
-       : Call Tcl_CancelEval() function, and cancel evaluation.
-
-    _toUTF8(str, encoding=nil)
-    _fromUTF8(str, encoding=nil)
-       : Call the function (which is internal function of Tcl/Tk) to
-       : 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 operateion for the current bindtag and
-  : starts the operation for the next buindtag for the current event).
-  : However, current tcltklib supports Ruby's 'break' and 'next' to
-  : get the same effect. That is, those classes are obsolete. Those
-  : exist for backward compatibility.
-
-(eof)
diff --git a/ext/tk/MANUAL_tcltklib.eucj b/ext/tk/MANUAL_tcltklib.eucj
deleted file mode 100644
index 1ff5dddde4..0000000000
--- a/ext/tk/MANUAL_tcltklib.eucj
+++ /dev/null
@@ -1,584 +0,0 @@
-(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
deleted file mode 100644
index 0179f4d526..0000000000
--- a/ext/tk/README.1st
+++ /dev/null
@@ -1,19 +0,0 @@
-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 directry, it will not
-work without Tcl/Tk libraries (e.g. libtcl8.4.so) on your environment.
-You must also check that your Tcl/Tk is installed properly.
-
---------------------------------------------
- ( the following is written in EUC-JP )
-
-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
deleted file mode 100644
index b7f023c91b..0000000000
--- a/ext/tk/README.ActiveTcl
+++ /dev/null
@@ -1,62 +0,0 @@
-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 extention).
-
-                                  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.fork b/ext/tk/README.fork
deleted file mode 100644
index c58d75883b..0000000000
--- a/ext/tk/README.fork
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 15630727ec..0000000000
--- a/ext/tk/README.macosx-aqua
+++ /dev/null
@@ -1,67 +0,0 @@
-
-  *** 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
deleted file mode 100644
index 0064586373..0000000000
--- a/ext/tk/README.tcltklib
+++ /dev/null
@@ -1,152 +0,0 @@
-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 libaray
-      (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 directry contains 'tcl.h'
- --with-tk-include=<dir>       the directry contains 'tk.h'
-
- --with-tcl-lib=<dir>          the directry contains 'libtcl<version>.so'
- --with-tk-lib=<dir>           the directry contains 'libtk<version>.so'
-
- --enable-mac-tcltk-framework  (MacOS X) use Tcl/Tk framework
-                               (Obsolete. Please use '--enable-tcltk-framework'.)
-
- --enable-tcltk-framework      use Tcl/Tk framework
-
- --with-tcltk-framework=<dir>  the directory 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 directry contais X11 header files
- --with-X11-lib=<dir>          the directry contais X11 libraries
-
-
-If you forgot to give the options when do 'configure' on toplevel
-directry 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
deleted file mode 100644
index 143a7b5df6..0000000000
--- a/ext/tk/config_list.in
+++ /dev/null
@@ -1,41 +0,0 @@
-##############################################
-# 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
deleted file mode 100644
index f7ba3229c1..0000000000
--- a/ext/tk/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 2f68d01e7f..0000000000
--- a/ext/tk/extconf.rb
+++ /dev/null
@@ -1,2032 +0,0 @@
-##############################################################
-# 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
-
-TkLib_Config['major_nums'] = '87'
-
-
-##############################################################
-# use old extconf.rb ?
-##############################################################
-if with_config('tk-old-extconf')
-  require File.join(File.dirname(__FILE__), 'old-extconf.rb')
-  exit
-end
-
-
-##############################################################
-# check configs
-##############################################################
-($cleanfiles ||= "") << 'config_list'
-config_list_file = 'config_list'
-config_list_file_source = File.join(File.dirname(__FILE__),'config_list.in')
-if !File.exist?(config_list_file) ||
-    File.ctime(config_list_file_source) > File.ctime(config_list_file)
-  old_config_list_file = config_list_file_source
-else
-  old_config_list_file = config_list_file
-end
-
-current_configs = {'with'=>{}, 'enable'=>{}}
-
-# setup keys by config_list.in
-IO.foreach(config_list_file_source){|line|
-  line.chomp!
-  line.lstrip!
-  next if line.empty? || line =~ /^\#/ #
-  mode, key, value = line.split(/\s+/, 3)
-  value ||= ""
-  current_configs[mode][key] = value rescue nil
-}
-
-# define current value of keys
-IO.foreach(old_config_list_file){|line|
-  line.chomp!
-  line.lstrip!
-  next if line.empty? || line =~ /^\#/ #
-  mode, key, value = line.split(/\s+/, 3)
-  value ||= ""
-  if current_configs[mode] && current_configs[mode].has_key?(key)
-    current_configs[mode][key] = value
-  end
-}
-
-update_flag = false
-current_configs['with'].each_key{|key|
-  if (value = with_config(key).to_s) != current_configs['with'][key]
-    update_flag = true
-    current_configs['with'][key] = value
-  end
-}
-current_configs['enable'].each_key{|key|
-  if (value = enable_config(key).to_s) != current_configs['enable'][key]
-    update_flag = true
-    current_configs['enable'][key] = value
-  end
-}
-
-# update current_configs
-if update_flag || !File.exist?(config_list_file)
-  open(config_list_file, 'w'){|fobj|
-    fobj.print("# values of current configure options (generated by extconf.rb)\n");
-    ['with', 'enable'].each{|mode|
-      current_configs[mode].each_key{|key|
-        fobj.print("#{mode} #{key} #{current_configs[mode][key]}\n")
-      }
-    }
-  }
-end
-
-if update_flag
-  puts "Configure options for Ruby/Tk may be updated."
-  puts "So, delete files which depend on old configs."
-  File.delete(*Dir.glob("*.#{CONFIG['DLEXT']}", File::FNM_CASEFOLD))
-  File.delete(*Dir.glob("*.#{$OBJEXT}", File::FNM_CASEFOLD))
-  File.delete('Makefile') rescue nil
-
-else
-  makefile = 'Makefile'
-  if File.exist?(makefile) &&
-      File.ctime(config_list_file) > File.ctime(makefile)
-    # no need to update Makefile
-    exit
-  end
-end
-
-
-##############################################################
-# fuctions
-##############################################################
-def is_win32?
-  /mswin|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
-end
-
-def is_macosx?
- /darwin/ =~ RUBY_PLATFORM
-end
-
-def maybe_64bit?
-  /64|universal/ =~ RUBY_PLATFORM
-end
-
-def check_tcltk_version(version)
-  return [nil, nil] unless version.kind_of? String
-
-  tclver, tkver = version.split(',')
-  tclver = tclver.strip
-  return [tclver, tkver.strip] if tkver
-
-  dot = major = minor_dot = minor = plvl_dot = plvl = ext = nil
-  if tclver =~ /^(\d)(\.?)(\d)(\.?)(\d*)(.*)$/
-    major = $1; minor_dot = $2; minor = $3; plvl_dot = $4; plvl = $5; ext = $6
-    dot = ! minor_dot.empty?
-    if plvl_dot.empty? && ! plvl.empty?
-      minor << plvl
-    end
-  elsif tclver =~ /^(\d)(\.?)(\d?)(.*)$/
-    major = $1; minor_dot = $2; minor = $3; ext = $4
-    dot = ! minor_dot.empty?
-  else # unknown -> believe user
-    return [tclver, tkver]
-  end
-
-  # check Tcl7.6 / Tk4.2 ?
-  if major == "7" # Tcl7.6 ( not support Tclversion < 7.6 )
-    # Tk4.2
-    tkver  = "4" + ((dot)? ".": "") + ((minor.empty)? "": "2") + ext
-  elsif major == "4" # Tk4.2 ( not support Tkversion < 4.2 )
-    # Tcl7.6
-    tkver = tclver
-    tclver = "7" + ((dot)? ".": "") + ((minor.empty)? "": "6") + ext
-  end
-
-  tkver = tclver unless tkver
-
-  [tclver, tkver]
-end
-
-def get_shlib_versions(major = 8, minor_max = 9, minor_min = 0, ext = "")
-  if tclcfg = TkLib_Config["tclConfig_info"]
-    major = tclcfg['TCL_MAJOR_VERSION'].to_i
-    minor_min = tclcfg['TCL_MINOR_VERSION'].to_i
-
-  elsif TkLib_Config["tcltkversion"]
-    tclver, tkver = TkLib_Config["tcltkversion"]
-    if tclver =~ /8\.?(\d)(.*)/
-      minor_min = $1.to_i
-      ext = $2
-    else
-      # unsupported version
-      return [""]
-    end
-  end
-
-  # if disable-stubs, version is fixed.
-  minor_max = minor_min unless TkLib_Config["tcltk-stubs"]
-
-  vers = []
-  minor_max.downto(minor_min){|minor|
-    vers << "#{major}.#{minor}#{ext}" unless ext.empty?
-    vers << "#{major}.#{minor}"
-  }
-
-  vers << ""
-end
-
-def get_shlib_path_head
-  path_head = []
-  path_dirs = []
-
-  if TkLib_Config["ActiveTcl"].kind_of?(String)  # glob path
-    # path_head << TkLib_Config["ActiveTcl"]
-    path_head.concat Dir.glob(TkLib_Config["ActiveTcl"], File::FNM_CASEFOLD).sort.reverse
-    # path_dirs.concat Dir.glob(File.join(TkLib_Config["ActiveTcl"], 'lib'), File::FNM_CASEFOLD).sort.reverse
-  end
-
-  if CROSS_COMPILING
-  elsif is_win32?
-    if TkLib_Config["ActiveTcl"]
-      path_head.concat ["c:/ActiveTcl", "c:/Program Files/ActiveTcl",
-                        "c:/Program Files (x86)/ActiveTcl"]
-    end
-    path_head.concat [
-      "c:/Tcl", "c:/Program Files/Tcl", "c:/Program Files (x86)/Tcl",
-      "/Tcl", "/Program Files/Tcl", "/Program Files (x86)/Tcl"
-    ]
-    path_head.uniq!
-    #path_head.each{|dir| path_dirs << dir.dup if File.directory? dir}
-    path_head.each{|dir| path_dirs << File.expand_path(dir) if File.directory? dir}
-
-    # for MinGW
-    ["/usr/local/lib64", "/usr/lib64", "/usr/local/lib", "/usr/lib"].each{|dir|
-      #path_dirs << dir if File.directory? dir
-      path_dirs << File.expand_path(dir) if File.directory? dir
-    }
-    path_dirs |= ENV['LIBRARY_PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['LIBRARY_PATH']
-    path_dirs |= ENV['PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['PATH']
-
-  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.directory?(tcldir = File.join(dir, "Tcl.framework"))
-    next unless File.directory?(tkdir  = File.join(dir, "Tk.framework"))
-    TkLib_Config["tcltk-framework"] = dir
-    return [tcldir, tkdir]
-  }
-
-  nil
-end
-
-def collect_tcltk_defs(tcl_defs_str, tk_defs_str)
-  conflicts = [
-    'PACKAGE_NAME', 'PACKAGE_TARNAME', 'PACKAGE_VERSION',
-    'PACKAGE_STRING', 'PACKAGE_BUGREPORT'
-  ]
-
-  begin
-    # Ruby 1.9.x or later
-    arch_config_h = RbConfig.expand($arch_hdrdir + "/ruby/config.h")
-    if File.exist?(arch_config_h)
-      keys = []
-      IO.foreach(arch_config_h){|line|
-        if line =~ /^#define +([^ ]+)/
-            keys << $1
-        end
-      }
-      conflicts = keys
-    end
-  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 lib) if is_win32?
-  exts.concat %w(bundle dylib) if is_macosx? || /nextstep|openstep|rhapsody/ =~ RUBY_PLATFORM
-
-  if enable_config("shared") == false
-    [CONFIG['LIBEXT'], "a"].concat exts
-  else
-    exts.concat [CONFIG['LIBEXT'], "a"]
-  end
-
-  if is_win32?
-    exts.map!{|ext| [ext.downcase, ext.upcase]}.flatten!
-  end
-
-  exts
-end
-
-def libcheck_for_tclConfig(tcldir, tkdir, tclconf, tkconf)
-  tcllib_ok = tklib_ok = false
-
-  if TkLib_Config["tcltk-stubs"]
-    stub = "stub"
-    tclfunc = "Tcl_InitStubs"
-    tkfunc  = "Tk_InitStubs"
-  else
-    stub = ""
-    tclfunc = "Tcl_FindExecutable"
-    tkfunc  = "Tk_Init"
-  end
-
-  incflags = ($INCFLAGS ||= "").dup
-  libpath = ($LIBPATH ||= []).dup
-  libs_param = ($libs ||= "").dup
-  tcllibs = nil
-  mkmf_param = nil
-
-  tclver, tkver = TkLib_Config["tcltkversion"]
-  exts = "(" + get_ext_list.join('|') + ")"
-
-  if tclver
-    tcl_glob = "*tcl#{stub}#{tclver}.*"
-    tcl_regexp = /^.*(tcl#{stub}#{tclver}.*)\.(#{exts}).*$/
-  elsif tclconf
-    tcl_glob = "*tcl#{stub}#{tclconf['TCL_MAJOR_VERSION']}{.,}#{tclconf['TCL_MINOR_VERSION']}*.*"
-    tcl_regexp = /^.*(tcl#{stub}#{tclconf['TCL_MAJOR_VERSION']}(?:\.|)#{tclconf['TCL_MINOR_VERSION']}.*)\.(#{exts}).*$/
-  end
-  if tkver
-    tk_glob = "*tk#{stub}#{tkver}.*"
-    tk_regexp = /^.*(tk#{stub}#{tkver}.*)\.(#{exts}).*$/
-  elsif tkconf
-    tk_glob = "*tk#{stub}#{tkconf['TK_MAJOR_VERSION']}{.,}#{tkconf['TK_MINOR_VERSION']}*.*"
-    tk_regexp = /^.*(tk#{stub}#{tkconf['TK_MAJOR_VERSION']}(?:\.|)#{tkconf['TK_MINOR_VERSION']}.*)\.#{exts}.*$/
-  end
-
-  tcllib_ok ||= !tclconf || Dir.glob(File.join(tcldir, tcl_glob), File::FNM_CASEFOLD).find{|file|
-    if file =~ tcl_regexp
-      libname = $1
-      ext = $2.downcase
-      begin
-        $INCFLAGS = incflags.dup << " " << tclconf["TCL_INCLUDE_SPEC"]
-        #puts "check #{file} #{$1} #{tclfunc} #{tcldir}"
-        #find_library($1, tclfunc, tcldir)
-        if (tclconf && tclconf["TCL_SHARED_BUILD"] == "0") ||
-            (ext != CONFIG['DLEXT'] && ext == CONFIG['LIBEXT']) || ext == "a"
-          # static link
-          tcllibs = $libs + " -DSTATIC_BUILD " + file.quote
-
-          # FIX ME: avoid pathname trouble (fail to find) on MinGW.
-          #   e.g. TCL_INCLUDE_SPEC describes "-I/usr/local/include",
-          #        but compiler can find "-IC:/msys/1.0/local/include" only.
-          $INCFLAGS << " -I" << File.join(File.dirname(File.dirname(file)),"include") if is_win32?
-        else
-          tcllibs = append_library($libs, libname)
-          tcllibs = "-L#{tcldir.quote} -Wl,-R#{tcldir.quote} " + tcllibs
-
-          # FIX ME: avoid pathname trouble (fail to find) on MinGW.
-          $INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32?
-        end
-
-        $LIBPATH = libpath | [tcldir]
-        try_func(tclfunc, tcllibs, ["tcl.h"]) ||
-          ( try_func(tclfunc, tcllibs << " " << tclconf['TCL_LIBS'], ["tcl.h"]) if tclconf['TCL_LIBS'] )
-
-      ensure
-        mkmf_param = {
-          'PATH' => file,
-          'LIBNAME' => libname,
-          'libs' => tcllibs.dup,
-          'INCFLAGS' => $INCFLAGS.dup,
-          'LIBPATH' => $LIBPATH.dup,
-        }
-        $LIBPATH = libpath.dup
-        $libs = libs_param.dup
-      end
-    end
-  }
-  tclconf['MKMF_PARAMS'] = mkmf_param if tclconf && tcllib_ok
-
-  tklib_ok ||= !tkconf || Dir.glob(File.join(tkdir, tk_glob), File::FNM_CASEFOLD).find{|file|
-    if file =~ tk_regexp
-      libname = $1
-      ext = $2.downcase
-      begin
-        #puts "check #{file} #{$1} #{tkfunc} #{tkdir}"
-        # find_library($1, tkfunc, tkdir)
-        if (tkconf && tkconf["TCL_SHARED_BUILD"] == "0") ||
-            (ext != CONFIG['DLEXT'] && ext == CONFIG['LIBEXT']) || ext == "a"
-          # static link
-          tklibs = " -DSTATIC_BUILD " + file.quote
-
-          # FIX ME: avoid pathname trouble (fail to find) on MinGW.
-          $INCFLAGS << " -I" << File.join(File.dirname(File.dirname(file)),"include") if is_win32?
-        else
-          tklibs = append_library("", libname)
-          #tklibs = append_library("", $1)
-          tklibs = "-L#{tkdir.quote} -Wl,-R#{tkdir.quote} " + tklibs
-
-          # FIX ME: avoid pathname trouble (fail to find) on MinGW.
-          $INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32?
-        end
-
-        tklibs << " " <<  tcllibs if tcllibs
-        tmp_tklibs = tklibs.dup
-        $LIBPATH = libpath | [tkdir]
-        try_func(tkfunc, tklibs, ["tcl.h", "tk.h"]) ||
-          ( try_func(tkfunc, tklibs << " " << tkconf['TK_LIBS'], ["tcl.h", "tk.h"]) if tkconf['TK_LIBS'] ) ||
-          ( try_func(tkfunc, (tklibs = tmp_tklibs.dup) << " " << tkconf['TK_XLIBSW'], ["tcl.h", "tk.h"]) if tkconf['TK_XLIBSW'] ) ||
-          ( try_func(tkfunc, tklibs << " " << tkconf['TK_LIBS'], ["tcl.h", "tk.h"]) if tkconf['TK_LIBS'] )
-
-      ensure
-        mkmf_param = {
-          'PATH' => file,
-          'LIBNAME' => libname,
-          'libs' => tklibs.dup,
-          'INCFLAGS' => $INCFLAGS.dup,
-          'LIBPATH' => $LIBPATH.dup,
-        }
-        $LIBPATH = libpath.dup
-        $libs = libs_param.dup
-      end
-    end
-  }
-
-  $INCFLAGS = incflags.dup
-  tkconf['MKMF_PARAMS'] = mkmf_param if tkconf && tklib_ok
-
-  [tcllib_ok, tklib_ok]
-end
-
-def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
-  TkLib_Config["tclConfig_paths"] = []
-
-  paths.compact!
-  if paths.empty?
-    config_dir = get_tclConfig_dirs
-  elsif paths.length == 1 && !paths[0][0] && !paths[0][1]
-    config_dir = get_tclConfig_dirs.map{|dir|
-      if dir.kind_of? Array
-        [ (paths[0][0] == false)? nil: dir[0],
-          (paths[0][1] == false)? nil: dir[1] ]
-      else
-        [ (paths[0][0] == false)? nil: dir,
-          (paths[0][1] == false)? nil: dir ]
-      end
-    }
-  else
-    # fixed tclConfig
-    config_dir = []
-    paths.each{|path|
-      if path.kind_of?(Array)
-        config_dir << path
-      else
-        dirs = Dir.glob(path, File::FNM_CASEFOLD)
-        config_dir.concat(dirs.zip(dirs))
-      end
-    }
-  end
-
-  tclver, tkver = TkLib_Config['tcltkversion']
-  if tclver && tclver =~ /^\D*(\d)\.?(\d)?/  # ignore PATCH_LEVEL
-    tclver_major = $1
-    tclver_minor = $2
-  else
-    tclver_major = nil
-    tclver_minor = nil
-  end
-  if tkver && tkver =~ /^\D*(\d)\.?(\d)?/  # ignore PATCH_LEVEL
-    tkver_major = $1
-    tkver_minor = $2
-  else
-    tkver_major = nil
-    tkver_minor = nil
-  end
-
-  conf = nil
-
-  config_dir.uniq!
-  config_dir.map{|dir|
-    if dir.kind_of? Array
-      [ (dir[0])? dir[0].strip.chomp('/'): nil,
-        (dir[1])? dir[1].strip.chomp('/'): nil ]
-    else
-      dir.strip.chomp('/')
-    end
-  }.each{|dir|
-    print(".") # progress
-    # print("check #{dir} ==>");
-    if dir.kind_of? Array
-      tcldir, tkdir = dir
-    else
-      tcldir = tkdir = dir
-    end
-
-    tails = ['Config-shared.sh', 'config-shared.sh', 'Config.sh', 'config.sh']
-
-    if tcldir
-      if File.file?(tcldir)
-        tclcfg_files = [tcldir] * tails.length
-      else
-        tclcfg_files = tails.map{|f| File.join(tcldir, 'tcl' << f)}
-      end
-    else
-      tclcfg_files = [nil] * tails.length
-    end
-
-    if tkdir
-      if File.file?(tkdir)
-        tkcfg_files = [tkdir] * tails.length
-      else
-        tkcfg_files = tails.map{|f| File.join(tkdir, 'tk' << f)}
-      end
-    else
-      tkcfg_files = [nil] * tails.length
-    end
-
-    tclcfg_files.zip(tkcfg_files).map{|tclpath, tkpath|
-      [ (tclpath && File.exist?(tclpath))? File.expand_path(tclpath): tclpath,
-        (tkpath && File.exist?(tkpath))? File.expand_path(tkpath): tkpath ]
-    }.uniq.each{|tclpath, tkpath|
-      next if tclpath && !File.exist?(tclpath)
-      next if tkpath && !File.exist?(tkpath)
-
-      # parse tclConfig.sh/tkConfig.sh
-      tclconf = (tclpath)? parse_tclConfig(tclpath): nil
-      next if tclconf && tclver && ((tclver_major && tclver_major != tclconf['TCL_MAJOR_VERSION']) || (tclver_minor && tclver_minor != tclconf['TCL_MINOR_VERSION']))
-
-      tkconf = (tkpath)? parse_tclConfig(tkpath): nil
-      next if tkconf && tkver && ((tkver_major && tkver_major != tkconf['TK_MAJOR_VERSION']) || (tkver_minor && tkver_minor != tkconf['TK_MINOR_VERSION']))
-
-      # nativethread check
-      if !TkLib_Config["ruby_with_thread"]
-        if tclconf
-          if tclconf['TCL_THREADS'] == '1'
-            puts "\nWARNING: found #{tclpath.inspect}, but it WITH nativethread-support under ruby WITHOUT nativethread-support. So, ignore it."
-            TkLib_Config["tcl-NG-path"] << File.dirname(tclpath)
-            next
-          end
-        else
-          puts "\nWARNING: When not refer tclConfig.sh, cannot check native-thread support on Tcl/Tk libraries. Ruby, which is used now, does NOT support native-thread. So, if Tcl/Tk libraries support native-thread, it will NOT work properly."
-        end
-      end
-
-      # find tclConfig.sh & tkConfig.sh
-      conf = [tclconf, tkconf] unless conf
-
-      # check Tcl library
-      if is_macosx? && TkLib_Config["tcltk-framework"]
-        # if use framework, not check (believe it is installed properly)
-        tcllib_ok = tklib_ok = true
-      else
-        tcllib_ok, tklib_ok =
-          libcheck_for_tclConfig((tclpath)? File.dirname(tclpath): nil,
-                                 (tkpath)? File.dirname(tkpath): nil,
-                                 tclconf, tkconf)
-      end
-
-      unless tcllib_ok && tklib_ok
-        unless tcllib_ok
-          puts "\nWARNING: found #{tclpath.inspect}, but cannot find valid Tcl library for the tclConfig.sh. So, ignore it."
-          TkLib_Config["tcl-NG-path"] << File.dirname(tclpath)
-        end
-        unless tklib_ok
-          puts "\nWARNING: found #{tkpath.inspect}, but cannot find valid Tk library for the tkConfig.sh. So, ignore it."
-          TkLib_Config["tk-NG-path"] << File.dirname(tkpath)
-        end
-        next
-      end
-
-      #return [tclpath, tkpath]
-      # print(" #{[tclpath, tkpath].inspect}");
-      TkLib_Config["tclConfig_paths"] << [tclpath, tkpath]
-    }
-
-    # print("\n");
-  }
-
-  if is_macosx? && TkLib_Config["tcltk-stubs"]
-    CONFIG['LDSHARED'] << " -Xlinker -bind_at_load"
-    if config_string('LDSHAREDXX')
-      config_string('LDSHAREDXX') << " -Xlinker -bind_at_load"
-    end
-  end
-
-  if TkLib_Config["tclConfig_paths"].empty?
-    [nil, nil]
-  else
-    # find tclConfig.sh and tkConfig.sh
-    TkLib_Config["tclConfig_info"], TkLib_Config["tkConfig_info"] = conf
-    TkLib_Config["tclConfig_paths"][0]
-  end
-end
-
-def get_tclConfig(tclConfig_file, tkConfig_file, tclConfig_dir, tkConfig_dir)
-  use_tclConfig = tclConfig_file != false && tclConfig_dir != false
-  use_tkConfig  = tkConfig_file  != false && tkConfig_dir  != false
-
-  unless use_tclConfig || use_tkConfig
-    puts("Don't use [tclConfig.sh, tkConfig.sh]")
-    return [nil, nil]
-  end
-
-  tclConfig_file = nil unless tclConfig_file.kind_of? String
-  tkConfig_file = nil unless tkConfig_file.kind_of? String
-  tclConfig_dir = nil unless tclConfig_dir.kind_of? String
-  tkConfig_dir = nil unless tkConfig_dir.kind_of? String
-
-  if use_tclConfig && !tclConfig_dir
-    if tclConfig_file
-      tclConfig_dir = File.dirname(tclConfig_file)
-    elsif tkConfig_dir
-      tclConfig_dir = tkConfig_dir
-    end
-  end
-  if use_tkConfig && !tkConfig_dir
-    if tkConfig_file
-      tkConfig_dir = File.dirname(tkConfig_file)
-    elsif tclConfig_dir
-      tkConfig_dir = tclConfig_dir
-    end
-  end
-  tkConfig_dir ||= tclConfig_dir
-
-  if use_tclConfig
-    TkLib_Config["tclConfig-file"] = tclConfig_file
-    TkLib_Config["tclConfig-dir"] = tclConfig_dir
-  else
-    tclConfig_file = false
-    tclConfig_dir = false
-  end
-  if use_tkConfig
-    TkLib_Config["tkConfig-file"] = tkConfig_file
-    TkLib_Config["tkConfig-dir"] = tkConfig_dir
-  else
-    tkConfig_file = false
-    tkConfig_dir = false
-  end
-
-  print ("Don't use tclConfig.sh (specified by configure option).\n") unless use_tclConfig
-  print ("Don't use tkConfig.sh (specified by configure option).\n") unless use_tkConfig
-  print("Search ")
-  print("tclConfig.sh", (tclConfig_dir)? " (in #{tclConfig_dir})": "") if use_tclConfig
-  print((use_tclConfig)? " and ": "", "tkConfig.sh", (tkConfig_dir)? " (in #{tkConfig_dir})": "") if use_tkConfig
-  print(".")
-
-  if tclConfig_dir || tkConfig_dir || !use_tclConfig || !use_tkConfig
-    tclConfig, tkConfig =
-      search_tclConfig([ ((tclConfig_file)? tclConfig_file: tclConfig_dir),
-                         ((tkConfig_file)?  tkConfig_file:  tkConfig_dir) ])
-  else
-    tclConfig, tkConfig = search_tclConfig()
-  end
-  print("\n")
-  # TclConfig_Info = TkLib_Config["tclConfig_info"]
-  # TkConfig_Info  = TkLib_Config["tkConfig_info"]
-
-  if tclConfig || tkConfig
-    dirs = TkLib_Config["tclConfig_paths"].map{|tclpath, tkpath|
-      [ (tclpath)? File.dirname(tclpath): nil,
-        (tkpath)? File.dirname(tkpath): nil ]
-    }
-    dirs |= dirs
-    puts("Valid [tclConfig.sh, tkConfig.sh] are found in #{dirs.inspect}")
-    puts("Use [tclConfig.sh, tkConfig.sh] == #{[tclConfig, tkConfig].inspect}")
-    $LIBPATH ||= []
-    $LIBPATH |= [File.dirname(tclConfig)] if tclConfig
-    $LIBPATH |= [File.dirname(tkConfig)]  if tkConfig
-    #TkLib_Config["tclConfig_paths"].each{|tclcfg, tkcfg|
-    #  $LIBPATH |= [File.dirname(tclcfg)] | [File.dirname(tkcfg)]
-    #}
-  else
-    puts("Fail to find [tclConfig.sh, tkConfig.sh]")
-  end
-
-  [tclConfig, tkConfig]
-end
-
-def check_tcl_NG_path(path_list)
-  path_list.find_all{|path| not TkLib_Config["tcl-NG-path"].include?(path) }
-end
-
-def check_tk_NG_path(path_list)
-  path_list.find_all{|path| not TkLib_Config["tk-NG-path"].include?(path) }
-end
-
-def check_NG_path(path_list)
-  path_list.find_all{|path|
-    not (TkLib_Config["tcl-NG-path"].include?(path) &&
-         TkLib_Config["tk-NG-path"].include?(path))
-  }
-end
-
-def check_shlib_search_path(paths)
-  if !paths || paths.empty?
-    path_list = []
-
-    #if TkLib_Config["ActiveTcl"]
-    #  path_list.concat Dir.glob(TkLib_Config["ActiveTcl"], File::FNM_CASEFOLD).sort.reverse
-    #end
-    if TkLib_Config["ActiveTcl"].kind_of?(String)  # glob path
-      path_list.concat Dir.glob(TkLib_Config["ActiveTcl"], File::FNM_CASEFOLD).sort.reverse
-    end
-
-    vers = get_shlib_versions
-    path_head, path_dirs = get_shlib_path_head
-
-    path_list.concat vers.map{|ver|
-      path_head.map{|head|
-        if ver.empty?
-          head + "/lib"
-        else
-          dirs = []
-
-          if Dir.glob(head, File::FNM_CASEFOLD).find{|dir| dir == head}
-            dirs << head + "/lib"
-          end
-
-          if !Dir.glob(head + "-*", File::FNM_CASEFOLD).empty?
-            dirs << head + "-#{ver}/lib" if !Dir.glob(head + "-[89].*", File::FNM_CASEFOLD).empty?
-            dirs << head + "-#{ver.delete('.')}/lib" if !Dir.glob(head + "-[89][0-9]*", File::FNM_CASEFOLD).empty?
-          end
-
-          if !Dir.glob(head + "[_-]*", File::FNM_CASEFOLD).empty?
-            dirs << head + "_#{ver}/lib" if !Dir.glob(head + "_[89].*", File::FNM_CASEFOLD).empty?
-            dirs << head + "-#{ver}/lib" if !Dir.glob(head + "-[89].*", File::FNM_CASEFOLD).empty?
-            dirs << head + "_#{ver.delete('.')}/lib" if !Dir.glob(head + "_[89][0-9]*", File::FNM_CASEFOLD).empty?
-            dirs << head + "-#{ver.delete('.')}/lib" if !Dir.glob(head + "-[89][0-9]*", File::FNM_CASEFOLD).empty?
-          end
-
-          dirs
-        end
-      }
-    }.flatten!
-
-    path_list.concat path_dirs
-
-  else
-    # paths is a string with PATH environment style
-    path_list = paths.split((is_win32?)? ';': ':')
-  end
-
-  path_list = check_NG_path(path_list)
-  path_list.map!{|path| path.strip}
-
-  if !CROSS_COMPILING and (is_win32? || is_macosx?)
-    # exist-dir only
-    path_list.delete_if{|path| Dir.glob(File.join(path, "*.{a,so,dll,lib}")).empty?}
-  end
-
-  # keep paths for searching dynamic libs
-  #$LIBPATH |= path_list
-  path_list.uniq
-end
-
-def search_vers_on_path(vers, path, *heads)
-  exts = get_ext_list.join(',')
-  files = Dir.glob(File.join(path, "*{#{heads.join(',')}}*.{#{exts}}"), File::FNM_CASEFOLD)
-  vers.find_all{|ver| files.find{|f| f =~ /(#{ver}|#{ver.delete('.')})/} }
-end
-
-def find_tcl(tcllib, stubs, version, *opt_paths)
-  if TclConfig_Info['MKMF_PARAMS']
-    # already checked existence of tcl library based on tclConfig.sh
-    ($INCFLAGS ||= "") << " " << TclConfig_Info['MKMF_PARAMS']['INCFLAGS']
-    $LIBPATH ||= []; $LIBPATH |= TclConfig_Info['MKMF_PARAMS']['LIBPATH']
-    ($libs ||= "") << " " << TclConfig_Info['MKMF_PARAMS']['libs']
-    return [true, nil, nil, nil]
-  end
-  # else, no available tclConfig.sh on the system
-
-  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, lib_w_sufx, nil, *inc]
-        end
-      else
-        sufx_list = ['', 't', 'g', 's', 'x']
-        search_vers_on_path(versions, path, lib, 'tcl').find{|ver|
-          dir_enum = Dir.foreach(path)
-          no_dot_ver = ver.delete('.')
-          libnames = ["#{lib}#{ver}", "#{lib}#{no_dot_ver}"]
-          libnames << "tcl#{ver}" << "tcl#{no_dot_ver}"  if lib != "tcl"
-          libnames.find{|libname|
-            sufx_list.find{|sufx|
-              print(".")
-              dir_enum.map{|fname|
-                if fname =~ /^.*(#{libname}.*#{sufx})\.(#{exts}).*$/
-                  [fname, $1, $2]
-                end
-              }.compact.find{|fname, lib_w_sufx, ext|
-                ext.downcase!
-                if (ext != CONFIG['DLEXT'] && ext == CONFIG['LIBEXT']) ||
-                    ext == "a"
-                  # static link
-                  tcllibs = libs_param + " -DSTATIC_BUILD " + fname.quote
-                else
-                  tcllibs = append_library($libs, lib_w_sufx)
-                  tcllibs = "-L#{path.quote} -Wl,-R#{path.quote} " + tcllibs
-                end
-                if try_func(func, tcllibs, ["tcl.h"])
-                  return [true, path, nil, tcllibs, *inc]
-                end
-              }
-            }
-          }
-        }
-        if (!version && (print(".");try_func(func, libs_param, ["tcl.h"])))
-          return [true, path, lib_w_sufx, nil, *inc]
-        end
-      end
-    ensure
-      $LIBPATH = libpath.dup
-      $libs = libs_param.dup
-      $INCFLAGS = incflags.dup
-    end
-  }
-
-  print("\n") # progress
-  [false, nil, nil, nil]
-end
-
-def parse_TK_LIBS(tklibs)
-  sfx = "lib|shlib|dll|so"
-  re = /(("|')[^"']+\.(#{sfx})\2|[^"' ]+\.(#{sfx})|-l("|')[^"']+\5|-l[^" ]+)/#'
-
-  tklibs.scan(re).map{|lib,|
-    if lib =~ /^("|')([^"]+)\.(#{sfx})\1/
-        "\"-l#{$2}\""
-    elsif lib =~ /([^" ]+)\.(#{sfx})/
-        "-l#{$1}"
-    else
-      lib
-    end
-  }.join(' ')
-end
-
-def find_tk(tklib, stubs, 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, lib_w_sufx, nil, *inc]
-        end
-      else
-        sufx_list = ['', 't', 'g', 's', 'x']
-        search_vers_on_path(versions, path, lib, 'tk').find{|ver|
-          dir_enum = Dir.foreach(path)
-          no_dot_ver = ver.delete('.')
-          libnames = ["#{lib}#{ver}", "#{lib}#{no_dot_ver}"]
-          libnames << "tk#{ver}" << "tk#{no_dot_ver}"  if lib != "tk"
-          libnames.find{|libname|
-            sufx_list.find{|sufx|
-              print(".")
-              dir_enum.map{|fname|
-                if fname =~ /^.*(#{libname}.*#{sufx})\.(#{exts}).*$/
-                  [fname, $1, $2]
-                end
-              }.compact.find{|fname, lib_w_sufx, ext|
-                if (ext != CONFIG['DLEXT'] && ext == CONFIG['LIBEXT']) ||
-                    ext == "a"
-                  # static link
-                  tklibs = libs_param + " -DSTATIC_BUILD " + fname.quote
-                else
-                  tklibs = append_library($libs, lib_w_sufx)
-                  tklibs = "-L#{path.quote} -Wl,-R#{path.quote} " + tklibs
-                end
-                if try_func(func, tklibs, ["tcl.h", "tk.h"])
-                  return [true, path, nil, tklibs, *inc]
-                end
-              }
-            }
-          }
-        }
-        if (!version && (print(".");try_func(func, libs_param, ["tcl.h", "tk.h"])))
-          return [true, path, lib_w_sufx, nil, *inc]
-        end
-      end
-    ensure
-      $LIBPATH = libpath
-      $libs = libs_param
-      $INCFLAGS = incflags.dup
-    end
-  }
-
-  print("\n") # progress
-  [false, nil, nil, nil]
-end
-
-def find_tcltk_library(tcllib, tklib, stubs, tclversion, tkversion,
-                       tcl_opt_paths, tk_opt_paths)
-  st,path,lib,libs,*inc = find_tcl(tcllib, stubs, tclversion, *tcl_opt_paths)
-  unless st
-    puts("Warning:: cannot find Tcl library. tcltklib will not be compiled (tcltklib is disabled on your Ruby. That is, Ruby/Tk will not work). Please check configure options.")
-    return false
-  else
-    ($LIBPATH ||= []; $LIBPATH |= [path]) if path
-    $libs = append_library($libs, lib) if lib
-    ($libs ||= "") << " " << libs if libs
-    $INCFLAGS ||= ""
-    inc.each{|f| $INCFLAGS << " -I" << f}
-  end
-
-  st,path,lib,libs,*inc = find_tk(tklib, stubs, tkversion, *tk_opt_paths)
-  unless st
-    puts("Warning:: cannot find Tk library. tcltklib will not be compiled (tcltklib is disabled on your Ruby. That is, Ruby/Tk will not work). Please check configure options.")
-    return false
-  else
-    ($LIBPATH ||= []; $LIBPATH |= [path]) if path
-    $libs = append_library($libs, lib) if lib && !lib.empty?
-    ($libs ||= "") << " " << libs if libs
-    $INCFLAGS ||= ""
-    inc.each{|f| $INCFLAGS << " -I" << f}
-  end
-
-  true
-end
-
-def find_tcltk_header(tclver, tkver)
-  base_dir = []
-
-  base_dir.concat [
-    File.join(RbConfig::CONFIG['prefix'], 'include'),
-    "/usr/local/include", "/usr/pkg/include", "/usr/contrib/include",
-    "/usr/include"
-  ].find_all{|dir| File.directory?(dir)}.map{|dir| File.expand_path(dir)}
-
-  if !CROSS_COMPILING && is_win32?
-    base_dir.concat [
-      "c:/Tcl/include","c:/Program Files/Tcl/include",
-      "c:/Program Files (x86)/Tcl/include",
-      "/Tcl/include","/Program Files/Tcl/include",
-      "/Program Files (x86)/Tcl/include"
-    ].find_all{|dir| File.directory?(dir)}.map{|dir| File.expand_path(dir)}
-
-    if ENV['CPATH']
-      base_dir |= ENV['CPATH'].split(';').find_all{|dir| File.directory?(dir)}.map{|dir| File.expand_path(dir)}
-    end
-  end
-
-  base_dir |= TkLib_Config["checked_shlib_dirs"]
-
-  unless TkLib_Config["space-on-tk-libpath"]
-    base_dir.delete_if{|path| path =~ / /}
-  end
-
-  # tcl.h
-  if TclConfig_Info['MKMF_PARAMS']
-    # already checked existence of tcl headers based on tclConfig.sh
-    have_tcl_h = true
-  else
-    print "\nSearch tcl.h"
-    if enable_config("tcl-h-ver-check", true) &&
-        tclver && tclver =~ /^\D*(\d)\.?(\d)/
-      major = $1; minor = $2
-    else
-      major = minor = nil
-    end
-    print(".") # progress
-    if major && minor
-      # version check on tcl.h
-      have_tcl_h = try_cpp("#include <tcl.h>\n#if TCL_MAJOR_VERSION != #{major} || TCL_MINOR_VERSION != #{minor}\n#error VERSION does not match\n#endif")
-    else
-      have_tcl_h = have_header('tcl.h')
-    end
-    unless have_tcl_h
-      if tclver && ! tclver.empty?
-        versions = [tclver]
-      else
-        versions = TkLib_Config['search_versions']
-      end
-      paths = base_dir.dup
-      (versions + [""]).each{|ver|
-        paths.concat(base_dir.map{|dir|
-                       [
-                        dir + '/tcl' + ver,
-                        dir + '/tcl' + ver + '/include',
-                        dir + '/tcl' + ver.delete('.'),
-                        dir + '/tcl' + ver.delete('.') + '/include'
-                       ]
-                     }.flatten)
-      }
-      paths = paths.map{|dir|
-        (File.directory?(dir))? File.expand_path(dir): nil
-      }.compact.uniq
-
-      code = "#include <tcl.h>\n"
-      code << "#if TCL_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
-      code << "#if TCL_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
-      have_tcl_h = paths.find{|path|
-        print(".") # progress
-        inc_opt = " -I#{path.quote}"
-        if try_cpp(code, inc_opt)
-          ($INCFLAGS ||= "") << inc_opt
-          true
-        else
-          false
-        end
-      }
-    end
-  end
-
-  # tk.h
-  if TkConfig_Info['MKMF_PARAMS']
-    # already checked existence of tk headers based on tkConfig.sh
-    have_tk_h = true
-  else
-    print "\nSearch tk.h"
-    if enable_config("tk-h-ver-check", true) &&
-        tkver && tkver =~ /^\D*(\d)\.?(\d)/
-      major = $1; minor = $2
-    else
-      major = minor = nil
-    end
-    print(".") # progress
-    if major && minor
-      # version check on tk.h
-      have_tk_h = try_cpp("#include <tk.h>\n#if TK_MAJOR_VERSION != #{major} || TK_MINOR_VERSION != #{minor}\n#error VERSION does not match\n#endif")
-    else
-      have_tk_h = have_header('tk.h')
-    end
-    unless have_tk_h
-      if tkver && ! tkver.empty?
-        versions = [tkver]
-      else
-        versions = TkLib_Config['search_versions']
-      end
-      paths = base_dir.dup
-      (versions + [""]).each{|ver|
-        paths.concat(base_dir.map{|dir|
-                       [
-                        dir + '/tk' + ver,
-                        dir + '/tk' + ver + '/include',
-                        dir + '/tk' + ver.delete('.'),
-                        dir + '/tk' + ver.delete('.') + '/include'
-                       ]
-                     }.flatten)
-      }
-      paths = paths.map{|dir|
-        (File.directory?(dir))? File.expand_path(dir): nil
-      }.compact.uniq
-
-      code = "#include <tcl.h>\n#include <tk.h>\n"
-      code << "#if TK_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
-      code << "#if TK_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
-      have_tk_h = paths.find{|path|
-        print(".") # progress
-        inc_opt = " -I#{path.quote}"
-        if try_cpp(code, inc_opt)
-          ($INCFLAGS ||= "") << inc_opt
-          true
-        else
-          false
-        end
-      }
-    end
-  end
-
-  puts "Can't find \"tcl.h\"." unless have_tcl_h
-  puts "Can't find \"tk.h\"."  unless have_tk_h
-  have_tcl_h && have_tk_h
-end
-
-def setup_for_macosx_framework(tclver, tkver)
-  # use framework, but no tclConfig.sh
-  unless $LDFLAGS && $LDFLAGS.include?('-framework')
-    ($LDFLAGS ||= "") << ' -framework Tk -framework Tcl'
-  end
-
-  if TkLib_Config["tcl-framework-header"]
-    TclConfig_Info['TCL_INCLUDE_SPEC'][0,0] =
-      " -I#{TkLib_Config["tcl-framework-header"].quote} "
-  else
-    tcl_base = File.join(TkLib_Config["tcltk-framework"], 'Tcl.framework')
-    if tclver
-      TclConfig_Info['TCL_INCLUDE_SPEC'] <<
-        " -I#{File.join(tcl_base, 'Versions', tclver, 'Headers').quote} "
-    end
-
-    TclConfig_Info['TCL_INCLUDE_SPEC'] << File.join(tcl_base, 'Headers')
-
-    unless tclver
-      dir = Dir.glob(File.join(tcl_base, 'Versions', '*', 'Headers'),
-                     File::FNM_CASEFOLD).sort.reverse[0]
-      TclConfig_Info['TCL_INCLUDE_SPEC'] << "-I#{dir.quote} " if dir
-    end
-  end
-
-  if TkLib_Config["tk-framework-header"]
-    TkConfig_Info['TK_INCLUDE_SPEC'][0,0] =
-      " -I#{TkLib_Config["tk-framework-header"].quote} "
-  else
-    tk_base  = File.join(TkLib_Config["tcltk-framework"], 'Tk.framework')
-    if tkver
-      TkConfig_Info['TK_INCLUDE_SPEC'] <<
-        " -I#{File.join(tk_base, 'Versions', tkver, 'Headers').quote} "
-    end
-
-    TkConfig_Info['TK_INCLUDE_SPEC'] << File.join(tk_base, 'Headers')
-
-    unless tkver
-      dir = Dir.glob(File.join(tk_base, 'Versions', '*', 'Headers'),
-                     File::FNM_CASEFOLD).sort.reverse[0]
-      TkConfig_Info['TK_INCLUDE_SPEC'] << "-I#{dir.quote} " if dir
-    end
-  end
-end
-
-def find_X11(*opt_paths)
-  defaults =
-    [ "/usr/X11*/lib", "/usr/lib/X11*", "/usr/local/X11*", "/usr/openwin/lib" ]
-  paths = []
-  opt_paths.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'), File::FNM_CASEFOLD))}
-  defaults.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'), File::FNM_CASEFOLD))}
-  st = find_library("X11", "XOpenDisplay", *paths)
-  unless st
-    puts("Warning:: cannot find X11 library. tcltklib will not be compiled (tcltklib is disabled on your Ruby. That is, Ruby/Tk will not work). Please check configure options. If your Tcl/Tk don't require X11, please try --without-X11.")
-  end
-  st
-end
-
-def search_X_libraries
-  use_tkConfig = false
-  if TkConfig_Info['config_file_path']
-    # use definitions on tkConfig.sh
-    if (TkConfig_Info['TK_XINCLUDES'] &&
-        !TkConfig_Info['TK_XINCLUDES'].strip.empty?) ||
-        (TkConfig_Info['TK_XLIBSW'] && !TkConfig_Info['TK_XLIBSW'].strip.empty?)
-      use_tkConfig = true
-      #use_X = true && with_config("X11", ! is_win32?)
-      use_X = with_config("X11", true)
-    else
-      #use_X = false || with_config("X11", false)
-      use_X = with_config("X11", false)
-    end
-  else
-    # depend on configure options
-    use_X = with_config("X11", !(is_win32? || TkLib_Config["tcltk-framework"]))
-  end
-
-  if TkConfig_Info['TK_XINCLUDES'] &&
-      !TkConfig_Info['TK_XINCLUDES'].strip.empty?
-    ($INCFLAGS ||= "") << " " << TkConfig_Info['TK_XINCLUDES'].strip
-  end
-
-  if use_X
-    puts("Use X11 libraries (or use TK_XINCLUDES/TK_XLIBSW information on tkConfig.sh).")
-    x11_idir, x11_ldir = dir_config("X11")
-    x11_ldir2 = with_config("X11-lib")
-    unless find_X11(x11_ldir2, x11_ldir)
-      puts("Can't find X11 libraries. ")
-      if use_tkConfig &&
-          TkConfig_Info['TK_XLIBSW'] && !TkConfig_Info['TK_XLIBSW'].strip.empty?
-        puts("But, try to use TK_XLIBSW information (believe tkCOnfig.sh).")
-        ($libs ||= "") << " " << TkConfig_Info['TK_XLIBSW'] << " "
-      else
-        puts("So, can't make tcltklib.so which is required by Ruby/Tk.")
-        exit
-      end
-    end
-  end
-
-  use_X
-end
-
-def pthread_check()
-  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.")
-have_func("ruby_native_thread_p", "ruby.h")
-print(".") # progress
-have_func("rb_errinfo", "ruby.h")
-print(".") # progress
-have_func("rb_safe_level", "ruby.h")
-print(".") # progress
-have_func("rb_hash_lookup", "ruby.h")
-print(".") # progress
-have_func("rb_proc_new", "ruby.h")
-print(".") # progress
-have_func("rb_obj_untrust", "ruby.h")
-print(".") # progress
-have_func("rb_obj_taint", "ruby.h")
-print(".") # progress
-have_func("rb_set_safe_level_force", "ruby.h")
-print(".") # progress
-have_func("rb_sourcefile", "ruby.h")
-print("\n") # progress
-
-print("check struct members.")
-have_struct_member("struct RArray", "ptr", "ruby.h")
-print(".") # progress
-have_struct_member("struct RArray", "len", "ruby.h")
-print("\n") # progress
-
-# 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 ||= "") << " -L#{TkLib_Config["tcl-build-dir"].quote} -Wl,-R#{TkLib_Config["tcl-build-dir"].quote}" if TkLib_Config["tcl-build-dir"]
-
-  if tcl_cfg_dir
-    TclConfig_Info['TCL_LIBS'] ||= ""
-    ($INCFLAGS ||= "") << ' ' << TclConfig_Info['TCL_INCLUDE_SPEC']
-    $LDFLAGS  << ' ' << TclConfig_Info['TCL_LIBS']
-    if stubs
-      if TkLib_Config["tcl-build-dir"] &&
-          TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC'] &&
-          !TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC'].strip.empty?
-        $LDFLAGS << ' ' << TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC']
-      else
-        $LDFLAGS << ' ' << TclConfig_Info['TCL_STUB_LIB_SPEC']
-      end
-    else
-      if TkLib_Config["tcl-build-dir"] &&
-          TclConfig_Info['TCL_BUILD_LIB_SPEC'] &&
-          !TclConfig_Info['TCL_BUILD_LIB_SPEC'].strip.empty?
-        $LDFLAGS << ' ' << TclConfig_Info['TCL_BUILD_LIB_SPEC']
-      else
-        $LDFLAGS << ' ' << TclConfig_Info['TCL_LIB_SPEC']
-      end
-    end
-  end
-
-  $LDFLAGS  << " -L#{TkLib_Config["tk-build-dir"].quote} -Wl,-R#{TkLib_Config["tk-build-dir"].quote}" if TkLib_Config["tk-build-dir"]
-
-  if tk_cfg_dir
-    TkConfig_Info['TK_LIBS'] ||= ""
-    ($INCFLAGS ||= "") << ' ' << TkConfig_Info['TK_INCLUDE_SPEC']
-    $LDFLAGS  << ' ' << TkConfig_Info['TK_LIBS']
-    if stubs
-      if TkLib_Config["tk-build-dir"] &&
-          TclConfig_Info['TK_BUILD_STUB_LIB_SPEC'] &&
-          !TclConfig_Info['TK_BUILD_STUB_LIB_SPEC'].strip.empty?
-        $LDFLAGS << ' ' << TkConfig_Info['TK_BUILD_STUB_LIB_SPEC']
-      else
-        $LDFLAGS << ' ' << TkConfig_Info['TK_STUB_LIB_SPEC']
-      end
-    else
-      if TkLib_Config["tk-build-dir"] &&
-          TclConfig_Info['TK_BUILD_LIB_SPEC'] &&
-          !TclConfig_Info['TK_BUILD_LIB_SPEC'].strip.empty?
-        $LDFLAGS << ' ' << TkConfig_Info['TK_BUILD_LIB_SPEC']
-      else
-        $LDFLAGS << ' ' << TkConfig_Info['TK_LIB_SPEC']
-      end
-    end
-  end
-  setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir
-end
-
-# name of  Tcl/Tk libraries
-tklib = with_config("tklib")
-tcllib = with_config("tcllib")
-
-# search X libraries
-use_X = search_X_libraries
-
-
-#---------------------------------------------------
-if (TkLib_Config["tcltk-framework"] ||
-      ( find_tcltk_header(tclver, tkver) &&
-          find_tcltk_library(tcllib, tklib, stubs, tclver, tkver,
-                             tcl_ldir_list, tk_ldir_list) ) ) &&
-    (stubs || pthread_check())
-  # create Makefile
-
-  # for SUPPORT_STATUS
-  $INSTALLFILES ||= []
-  $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
-
-  # create
-  $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
-  $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
-
-  # remove harmful definitions.
-  $defs.delete_if{|x|/^-Du?intptr_t=/ =~ x}
-
-  create_makefile("tcltklib")
-
-  puts "\nFind Tcl/Tk libraries. Make tcltklib.so which is required by Ruby/Tk."
-else
-  puts "\nCan't find proper Tcl/Tk libraries. So, can't make tcltklib.so which is required by Ruby/Tk."
-end
diff --git a/ext/tk/lib/README b/ext/tk/lib/README
deleted file mode 100644
index c076755756..0000000000
--- a/ext/tk/lib/README
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index b125c6e18e..0000000000
--- a/ext/tk/lib/multi-tk.rb
+++ /dev/null
@@ -1,3754 +0,0 @@
-#
-#               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 permited 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, &blk) # require a block for eval
-    if cmd
-      if cmd.kind_of?(Method)
-        _proc_on_safelevel{|*args| cmd.call(*args)}
-      else
-        _proc_on_safelevel(&cmd)
-      end
-    else
-      #Proc.new{|safe, *args| $SAFE=safe if $SAFE < safe; yield(*args)}
-      Proc.new{|safe, *args|
-        # avoid security error on Exception objects
-        untrust_proc = proc{|err|
-          begin
-            err.untrust if err.respond_to?(:untrust)
-          rescue SecurityError
-          end
-          err
-        }
-        $SAFE=safe if $SAFE < safe;
-        begin
-          yield(*args)
-        rescue Exception => e
-          fail untrust_proc.call(e)
-        end
-      }
-    end
-  end
-  def MultiTkIp._proc_on_safelevel(cmd=nil, &blk)
-    MultiTkIp.__getip._proc_on_safelevel(cmd, &blk)
-  end
-
-  def _proc_on_current_safelevel(cmd=nil, &blk) # require a block for eval
-    safe = $SAFE
-    cmd = _proc_on_safelevel(cmd, &blk)
-    Proc.new{|*args| cmd.call(safe, *args)}
-  end
-  def MultiTkIp._proc_on_current_safelevel(cmd=nil, &blk)
-    MultiTkIp.__getip._proc_on_current_safelevel(cmd, &blk)
-  end
-
-  ######################################
-  # instance method
-  def eval_proc_core(req_val, cmd, *args)
-    # check
-    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
deleted file mode 100644
index 443d66010c..0000000000
--- a/ext/tk/lib/remote-tk.rb
+++ /dev/null
@@ -1,530 +0,0 @@
-#
-#               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
deleted file mode 100644
index 2df3b2fd8c..0000000000
--- a/ext/tk/lib/tcltk.rb
+++ /dev/null
@@ -1,367 +0,0 @@
-# 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(): retuens 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()
-  #     destrying 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
deleted file mode 100644
index 5bac92e47c..0000000000
--- a/ext/tk/lib/tk.rb
+++ /dev/null
@@ -1,5761 +0,0 @@
-#
-#               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
deleted file mode 100644
index 8c58210331..0000000000
--- a/ext/tk/lib/tk/after.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-#   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
deleted file mode 100644
index f6ca261da9..0000000000
--- a/ext/tk/lib/tk/autoload.rb
+++ /dev/null
@@ -1,760 +0,0 @@
-#
-#  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
deleted file mode 100644
index c82a8e046b..0000000000
--- a/ext/tk/lib/tk/bgerror.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-#  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
deleted file mode 100644
index 23b4e0b7c3..0000000000
--- a/ext/tk/lib/tk/bindtag.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-#
-# 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
deleted file mode 100644
index 7f4f89f524..0000000000
--- a/ext/tk/lib/tk/busy.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# 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
deleted file mode 100644
index 65233c91b6..0000000000
--- a/ext/tk/lib/tk/button.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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
deleted file mode 100644
index 7d3d71675c..0000000000
--- a/ext/tk/lib/tk/canvas.rb
+++ /dev/null
@@ -1,841 +0,0 @@
-#
-#               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 paramters
-    end
-  end
-  private :tagid
-
-
-  # create a canvas item without creating a TkcItem object
-  def create(type, *args)
-    type = TkcItem.type2class(type.to_s) unless type.kind_of?(TkcItem)
-    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
deleted file mode 100644
index 495d92a9a8..0000000000
--- a/ext/tk/lib/tk/canvastag.rb
+++ /dev/null
@@ -1,459 +0,0 @@
-#
-# 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
deleted file mode 100644
index b7449541c5..0000000000
--- a/ext/tk/lib/tk/checkbutton.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# 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
deleted file mode 100644
index d4205a5c28..0000000000
--- a/ext/tk/lib/tk/clipboard.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# 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
deleted file mode 100644
index 4e9438f5ab..0000000000
--- a/ext/tk/lib/tk/clock.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# 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
deleted file mode 100644
index e267c7a22b..0000000000
--- a/ext/tk/lib/tk/composite.rb
+++ /dev/null
@@ -1,484 +0,0 @@
-#
-# 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
deleted file mode 100644
index 64e257594c..0000000000
--- a/ext/tk/lib/tk/console.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#   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
deleted file mode 100644
index 7ef7820699..0000000000
--- a/ext/tk/lib/tk/dialog.rb
+++ /dev/null
@@ -1,326 +0,0 @@
-#
-#   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
deleted file mode 100644
index 59fbb1911d..0000000000
--- a/ext/tk/lib/tk/encodedstr.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# 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
deleted file mode 100644
index d4aa03f2b6..0000000000
--- a/ext/tk/lib/tk/entry.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-#               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
deleted file mode 100644
index bf4e122322..0000000000
--- a/ext/tk/lib/tk/event.rb
+++ /dev/null
@@ -1,562 +0,0 @@
-#
-#  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
deleted file mode 100644
index 03db850f96..0000000000
--- a/ext/tk/lib/tk/font.rb
+++ /dev/null
@@ -1,2351 +0,0 @@
-#
-#  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
deleted file mode 100644
index 694c58a607..0000000000
--- a/ext/tk/lib/tk/fontchooser.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-#
-# 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
deleted file mode 100644
index 5118939732..0000000000
--- a/ext/tk/lib/tk/frame.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-#
-# 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
deleted file mode 100644
index e1e07c44fa..0000000000
--- a/ext/tk/lib/tk/grid.rb
+++ /dev/null
@@ -1,279 +0,0 @@
-#
-# 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
deleted file mode 100644
index 00bb440d6a..0000000000
--- a/ext/tk/lib/tk/image.rb
+++ /dev/null
@@ -1,395 +0,0 @@
-#
-# 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 rewrited 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
deleted file mode 100644
index 14396048ba..0000000000
--- a/ext/tk/lib/tk/itemconfig.rb
+++ /dev/null
@@ -1,1222 +0,0 @@
-#
-# 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
deleted file mode 100644
index b5da4fa1ef..0000000000
--- a/ext/tk/lib/tk/itemfont.rb
+++ /dev/null
@@ -1,327 +0,0 @@
-#
-# 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
deleted file mode 100644
index b63f756def..0000000000
--- a/ext/tk/lib/tk/kinput.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# 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
deleted file mode 100644
index 05e430e49b..0000000000
--- a/ext/tk/lib/tk/label.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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
deleted file mode 100644
index 6f679e55b5..0000000000
--- a/ext/tk/lib/tk/labelframe.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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
deleted file mode 100644
index 6742b2132c..0000000000
--- a/ext/tk/lib/tk/listbox.rb
+++ /dev/null
@@ -1,284 +0,0 @@
-#
-# 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
deleted file mode 100644
index 3ca7953c13..0000000000
--- a/ext/tk/lib/tk/macpkg.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-#   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
deleted file mode 100644
index bcd250026d..0000000000
--- a/ext/tk/lib/tk/menu.rb
+++ /dev/null
@@ -1,718 +0,0 @@
-#
-# 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
deleted file mode 100644
index 9d5571c470..0000000000
--- a/ext/tk/lib/tk/menubar.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-#
-# 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
deleted file mode 100644
index cb3597eec9..0000000000
--- a/ext/tk/lib/tk/menuspec.rb
+++ /dev/null
@@ -1,456 +0,0 @@
-#
-# 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
deleted file mode 100644
index 5f73b3066f..0000000000
--- a/ext/tk/lib/tk/message.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# 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
deleted file mode 100644
index a05fb94f8e..0000000000
--- a/ext/tk/lib/tk/mngfocus.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#   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
deleted file mode 100644
index 4abbcad85e..0000000000
--- a/ext/tk/lib/tk/msgcat.rb
+++ /dev/null
@@ -1,296 +0,0 @@
-#
-#   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)
-      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
-        eval(open(file){|f| f.read})
-      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
-        @namespace.eval(open(file){|f| f.read})
-      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(tk_call_without_enc('::msgcat::mcset',
-                                         locale,
-                                         _get_eval_string(src_str, true),
-                                         trans_str))
-    else
-      Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset',
-                                         locale,
-                                         _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{
-                       tk_call_without_enc('::msgcat::mcset',
-                                           locale,
-                                           _get_eval_string(src_str, true),
-                                           trans_str)
-                     })
-    else
-      Tk.UTF8_String(@namespace.eval{
-                       tk_call_without_enc('::msgcat::mcset',
-                                           locale,
-                                           _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_Stirng(_toUTF8(trans, enc))
-      else
-        list << _get_eval_string(src, true) << ''
-      end
-    }
-    number(tk_call_without_enc('::msgcat::mcmset', locale, 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)
-           })
-  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
deleted file mode 100644
index 4af891995e..0000000000
--- a/ext/tk/lib/tk/namespace.rb
+++ /dev/null
@@ -1,551 +0,0 @@
-#
-#   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|
-        if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-          obj = ScopeArgs.new(@fullname,*args)
-          ret = obj.instance_exec(obj, script)
-        else
-          ret = ScopeArgs.new(@fullname,*args).instance_eval(script)
-        end
-        id = ret.object_id
-        TkNamespace::Tk_NsCode_RetObjID_TBL[id] = ret
-        id
-      }
-    elsif script.kind_of?(Proc)
-      cmd = proc{|*args|
-        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
deleted file mode 100644
index 0f3be30ff7..0000000000
--- a/ext/tk/lib/tk/optiondb.rb
+++ /dev/null
@@ -1,377 +0,0 @@
-#
-# 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
deleted file mode 100644
index 29b06da0eb..0000000000
--- a/ext/tk/lib/tk/optionobj.rb
+++ /dev/null
@@ -1,212 +0,0 @@
-#
-# 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
deleted file mode 100644
index 220a38e524..0000000000
--- a/ext/tk/lib/tk/pack.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# 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
deleted file mode 100644
index 0c329732f5..0000000000
--- a/ext/tk/lib/tk/package.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# 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
deleted file mode 100644
index 9462bb0667..0000000000
--- a/ext/tk/lib/tk/palette.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-#   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
deleted file mode 100644
index 04407802ea..0000000000
--- a/ext/tk/lib/tk/panedwindow.rb
+++ /dev/null
@@ -1,260 +0,0 @@
-#
-# 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
deleted file mode 100644
index 109d866fda..0000000000
--- a/ext/tk/lib/tk/place.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# 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
deleted file mode 100644
index 627df6d9cf..0000000000
--- a/ext/tk/lib/tk/radiobutton.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# 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
deleted file mode 100644
index b4f0bd107f..0000000000
--- a/ext/tk/lib/tk/root.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# 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
deleted file mode 100644
index 0bdcead7f2..0000000000
--- a/ext/tk/lib/tk/scale.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# 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
deleted file mode 100644
index 96959b7a4b..0000000000
--- a/ext/tk/lib/tk/scrollable.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# 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
deleted file mode 100644
index c0ac201acb..0000000000
--- a/ext/tk/lib/tk/scrollbar.rb
+++ /dev/null
@@ -1,183 +0,0 @@
-#
-# 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
deleted file mode 100644
index d20742a666..0000000000
--- a/ext/tk/lib/tk/scrollbox.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#               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
deleted file mode 100644
index ba0a6f49f9..0000000000
--- a/ext/tk/lib/tk/selection.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# 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
deleted file mode 100644
index f2917d60ca..0000000000
--- a/ext/tk/lib/tk/spinbox.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-#               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
deleted file mode 100644
index a1807395d2..0000000000
--- a/ext/tk/lib/tk/tagfont.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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
deleted file mode 100644
index bc2aa0a293..0000000000
--- a/ext/tk/lib/tk/text.rb
+++ /dev/null
@@ -1,1604 +0,0 @@
-#
-#               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 paramters
-    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
deleted file mode 100644
index 99027a06fb..0000000000
--- a/ext/tk/lib/tk/textimage.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# 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
deleted file mode 100644
index d1888c5e54..0000000000
--- a/ext/tk/lib/tk/textmark.rb
+++ /dev/null
@@ -1,204 +0,0 @@
-#
-# 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
deleted file mode 100644
index 96692014e4..0000000000
--- a/ext/tk/lib/tk/texttag.rb
+++ /dev/null
@@ -1,321 +0,0 @@
-#
-# 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
deleted file mode 100644
index 49327b2c81..0000000000
--- a/ext/tk/lib/tk/textwindow.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-# 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
deleted file mode 100644
index ddfbfce9be..0000000000
--- a/ext/tk/lib/tk/timer.rb
+++ /dev/null
@@ -1,669 +0,0 @@
-#
-#   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
deleted file mode 100644
index 30ef009517..0000000000
--- a/ext/tk/lib/tk/toplevel.rb
+++ /dev/null
@@ -1,264 +0,0 @@
-#
-# 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
deleted file mode 100644
index cc9e9928cb..0000000000
--- a/ext/tk/lib/tk/ttk_selector.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-#  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
deleted file mode 100644
index 540f806d17..0000000000
--- a/ext/tk/lib/tk/txtwin_abst.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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
deleted file mode 100644
index 0ebd5c51b7..0000000000
--- a/ext/tk/lib/tk/validation.rb
+++ /dev/null
@@ -1,397 +0,0 @@
-#
-#  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
deleted file mode 100644
index 0487b034bd..0000000000
--- a/ext/tk/lib/tk/variable.rb
+++ /dev/null
@@ -1,1799 +0,0 @@
-#
-# 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
deleted file mode 100644
index c11e9692e7..0000000000
--- a/ext/tk/lib/tk/virtevent.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-#   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
deleted file mode 100644
index b10cfe6760..0000000000
--- a/ext/tk/lib/tk/winfo.rb
+++ /dev/null
@@ -1,392 +0,0 @@
-#
-# 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
deleted file mode 100644
index 80e0439ace..0000000000
--- a/ext/tk/lib/tk/winpkg.rb
+++ /dev/null
@@ -1,156 +0,0 @@
-#
-#   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
deleted file mode 100644
index b1a2ed886a..0000000000
--- a/ext/tk/lib/tk/wm.rb
+++ /dev/null
@@ -1,552 +0,0 @@
-#
-# 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', epath, value)
-        win
-      else
-        #procedure(tk_call('wm', 'command', epath))
-        tk_call('wm', 'command', epath)
-      end
-    end
-    def wm_command(value=nil)
-      Wm.command(self, value)
-    end
-    TOPLEVEL_METHODCALL_OPTKEYS['wm_command'] = 'wm_command'
-
-    def 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
deleted file mode 100644
index c0126c5175..0000000000
--- a/ext/tk/lib/tk/xim.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# 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
deleted file mode 100644
index f65945884c..0000000000
--- a/ext/tk/lib/tkafter.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkafter.rb - load tk/after.rb
-#
-require 'tk/timer'
diff --git a/ext/tk/lib/tkbgerror.rb b/ext/tk/lib/tkbgerror.rb
deleted file mode 100644
index deba7a57fa..0000000000
--- a/ext/tk/lib/tkbgerror.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkbgerror.rb - load tk/bgerror.rb
-#
-require 'tk/bgerror'
diff --git a/ext/tk/lib/tkcanvas.rb b/ext/tk/lib/tkcanvas.rb
deleted file mode 100644
index 9524614291..0000000000
--- a/ext/tk/lib/tkcanvas.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkcanvas.rb - load tk/canvas.rb
-#
-require 'tk/canvas'
diff --git a/ext/tk/lib/tkclass.rb b/ext/tk/lib/tkclass.rb
deleted file mode 100644
index 87f5acc453..0000000000
--- a/ext/tk/lib/tkclass.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#               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
deleted file mode 100644
index 9960ddb8ac..0000000000
--- a/ext/tk/lib/tkconsole.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkconsole.rb - load tk/console.rb
-#
-require 'tk/console'
diff --git a/ext/tk/lib/tkdialog.rb b/ext/tk/lib/tkdialog.rb
deleted file mode 100644
index bec5e5d29a..0000000000
--- a/ext/tk/lib/tkdialog.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkdialog.rb - load tk/dialog.rb
-#
-require 'tk/dialog'
diff --git a/ext/tk/lib/tkentry.rb b/ext/tk/lib/tkentry.rb
deleted file mode 100644
index 2dcfcab5da..0000000000
--- a/ext/tk/lib/tkentry.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   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
deleted file mode 100644
index 18d84c05e9..0000000000
--- a/ext/tk/lib/tkextlib/ICONS.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  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
deleted file mode 100644
index bd3180aa55..0000000000
--- a/ext/tk/lib/tkextlib/ICONS/icons.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-#  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
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/ICONS/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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
deleted file mode 100644
index 522039b11a..0000000000
--- a/ext/tk/lib/tkextlib/SUPPORT_STATUS
+++ /dev/null
@@ -1,198 +0,0 @@
-
-  [ 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 modifyed
-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 extention 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 oprations into the "setup.rb" file in the directory
-    of the wrapper libraries for the extention (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
-                        * see also tcltk-ext library on RAA
-                                (http://raa.ruby-lang.org/)
-                      ==> 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/
-                        * see also tcltk-ext library on RAA
-                                (http://raa.ruby-lang.org/)
-
-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
deleted file mode 100644
index 8b132e41a7..0000000000
--- a/ext/tk/lib/tkextlib/blt.rb
+++ /dev/null
@@ -1,189 +0,0 @@
-#
-#  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
deleted file mode 100644
index a86b91c959..0000000000
--- a/ext/tk/lib/tkextlib/blt/barchart.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-#  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
deleted file mode 100644
index 3254b63116..0000000000
--- a/ext/tk/lib/tkextlib/blt/bitmap.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-#  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
deleted file mode 100644
index b5287fb5b7..0000000000
--- a/ext/tk/lib/tkextlib/blt/busy.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-#  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
deleted file mode 100644
index a228a82246..0000000000
--- a/ext/tk/lib/tkextlib/blt/component.rb
+++ /dev/null
@@ -1,2218 +0,0 @@
-#
-#  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 paramters
-      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
deleted file mode 100644
index be05828d95..0000000000
--- a/ext/tk/lib/tkextlib/blt/container.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#  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
deleted file mode 100644
index 1cc39dfb94..0000000000
--- a/ext/tk/lib/tkextlib/blt/cutbuffer.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#  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
deleted file mode 100644
index aa5c5654c2..0000000000
--- a/ext/tk/lib/tkextlib/blt/dragdrop.rb
+++ /dev/null
@@ -1,269 +0,0 @@
-#
-#  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
deleted file mode 100644
index 0dba87a7cc..0000000000
--- a/ext/tk/lib/tkextlib/blt/eps.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  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
deleted file mode 100644
index 6bd4424065..0000000000
--- a/ext/tk/lib/tkextlib/blt/graph.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-#  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
deleted file mode 100644
index 878bd9982d..0000000000
--- a/ext/tk/lib/tkextlib/blt/htext.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-#  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
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/blt/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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
deleted file mode 100644
index 9f75a0b217..0000000000
--- a/ext/tk/lib/tkextlib/blt/spline.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#  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
deleted file mode 100644
index 74093f1868..0000000000
--- a/ext/tk/lib/tkextlib/blt/stripchart.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-#  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
deleted file mode 100644
index 205e29e6c5..0000000000
--- a/ext/tk/lib/tkextlib/blt/table.rb
+++ /dev/null
@@ -1,412 +0,0 @@
-#
-#  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
deleted file mode 100644
index 82936c67d3..0000000000
--- a/ext/tk/lib/tkextlib/blt/tabnotebook.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-#  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
deleted file mode 100644
index c4716c7304..0000000000
--- a/ext/tk/lib/tkextlib/blt/tabset.rb
+++ /dev/null
@@ -1,504 +0,0 @@
-#
-#  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
deleted file mode 100644
index 53ab9acdaa..0000000000
--- a/ext/tk/lib/tkextlib/blt/ted.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-#  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
deleted file mode 100644
index c67cafd8d6..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-#  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
deleted file mode 100644
index 2e0863cfbe..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/button.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#  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
deleted file mode 100644
index da230b5925..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#  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
deleted file mode 100644
index 5434af4b72..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/frame.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#  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
deleted file mode 100644
index f370c1403b..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/label.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#  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
deleted file mode 100644
index 814f9a5cc4..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#  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
deleted file mode 100644
index 2ae871d518..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#  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
deleted file mode 100644
index 76d5f86b1b..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/toplevel.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#  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
deleted file mode 100644
index da53a6ed04..0000000000
--- a/ext/tk/lib/tkextlib/blt/tree.rb
+++ /dev/null
@@ -1,1058 +0,0 @@
-#
-#  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 paramters
-      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
deleted file mode 100644
index 046cf7f837..0000000000
--- a/ext/tk/lib/tkextlib/blt/treeview.rb
+++ /dev/null
@@ -1,1287 +0,0 @@
-#
-#  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 paramters
-    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
deleted file mode 100644
index 8996f7c891..0000000000
--- a/ext/tk/lib/tkextlib/blt/unix_dnd.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-#  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
deleted file mode 100644
index 742e901d3e..0000000000
--- a/ext/tk/lib/tkextlib/blt/vector.rb
+++ /dev/null
@@ -1,256 +0,0 @@
-#
-#  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
deleted file mode 100644
index 292623ff58..0000000000
--- a/ext/tk/lib/tkextlib/blt/watch.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-#
-#  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
deleted file mode 100644
index 7ac6a0dcfc..0000000000
--- a/ext/tk/lib/tkextlib/blt/win_printer.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-#  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
deleted file mode 100644
index 03bdb60810..0000000000
--- a/ext/tk/lib/tkextlib/blt/winop.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-#  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
deleted file mode 100644
index 7a1eff51d8..0000000000
--- a/ext/tk/lib/tkextlib/bwidget.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-#
-#  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
deleted file mode 100644
index 13fe9e59bf..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-#  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
deleted file mode 100644
index 6cfde203e8..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/bitmap.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-#  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
deleted file mode 100644
index e139fb6708..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/button.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#  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
deleted file mode 100644
index a6de33c40c..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-#  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
deleted file mode 100644
index 16143dfbc6..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/combobox.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-#  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
deleted file mode 100644
index 3b0656f021..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/dialog.rb
+++ /dev/null
@@ -1,194 +0,0 @@
-#
-#  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
deleted file mode 100644
index 4d4de1780c..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/dragsite.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#  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
deleted file mode 100644
index e5e98fbc51..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/dropsite.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#  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
deleted file mode 100644
index 846e58062d..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-#  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
deleted file mode 100644
index 8dc4496123..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/entry.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-#  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
deleted file mode 100644
index e8d9352c62..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/label.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-#  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
deleted file mode 100644
index 16e7b46933..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/labelentry.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-#  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
deleted file mode 100644
index 0710f213f0..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/labelframe.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#  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
deleted file mode 100644
index 930491c869..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/listbox.rb
+++ /dev/null
@@ -1,361 +0,0 @@
-#
-#  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
deleted file mode 100644
index 92253bd8d3..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/mainframe.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-#
-#  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
deleted file mode 100644
index 7b62614737..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
+++ /dev/null
@@ -1,192 +0,0 @@
-#
-#  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
deleted file mode 100644
index ed28bcd86a..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/notebook.rb
+++ /dev/null
@@ -1,166 +0,0 @@
-#
-#  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
deleted file mode 100644
index 31bbf1fb8b..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-#  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
deleted file mode 100644
index 54cf06cbde..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-#  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
deleted file mode 100644
index 1cbf914425..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/panelframe.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-#  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
deleted file mode 100644
index ea50c87cef..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#  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
deleted file mode 100644
index 18eb67349b..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/progressbar.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  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
deleted file mode 100644
index 0c0c4540bc..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  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
deleted file mode 100644
index 5bd00d6870..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-#  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
deleted file mode 100644
index ea5a18cc66..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  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
deleted file mode 100644
index ab27bc91cf..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/scrollview.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-#  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
deleted file mode 100644
index 456175e87e..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-#  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
deleted file mode 100644
index 23419cb0fa..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/selectfont.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-#  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
deleted file mode 100644
index 6d92321210..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/separator.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  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
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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
deleted file mode 100644
index 0a45b045fb..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/spinbox.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-#  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
deleted file mode 100644
index 5c5dd43fe4..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/statusbar.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-#  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
deleted file mode 100644
index 71879111c1..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/titleframe.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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
deleted file mode 100644
index 089c482fe8..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/tree.rb
+++ /dev/null
@@ -1,500 +0,0 @@
-#
-#  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
deleted file mode 100644
index a93364b567..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/widget.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-#  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
deleted file mode 100644
index 1d6ecf04f2..0000000000
--- a/ext/tk/lib/tkextlib/itcl.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  [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
deleted file mode 100644
index 8f6bb33abe..0000000000
--- a/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-#
-#  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
deleted file mode 100644
index 70b38e4916..0000000000
--- a/ext/tk/lib/tkextlib/itcl/setup.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  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
deleted file mode 100644
index 7492bd3eb4..0000000000
--- a/ext/tk/lib/tkextlib/itk.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  [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
deleted file mode 100644
index 989585e33b..0000000000
--- a/ext/tk/lib/tkextlib/itk/incr_tk.rb
+++ /dev/null
@@ -1,446 +0,0 @@
-#
-#  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
deleted file mode 100644
index 544926efe0..0000000000
--- a/ext/tk/lib/tkextlib/itk/setup.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  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
deleted file mode 100644
index ebd4cf7507..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-#  [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
deleted file mode 100644
index 91e06d1b52..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-#  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
deleted file mode 100644
index a5478c7cc6..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/calendar.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-#  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
deleted file mode 100644
index 398eec3f1a..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-#  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
deleted file mode 100644
index e64d8154ca..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  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
deleted file mode 100644
index a7476c824e..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-#  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
deleted file mode 100644
index 82dcf25d0b..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/combobox.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-#  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
deleted file mode 100644
index 98a0051e55..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  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
deleted file mode 100644
index 50d5405a3b..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/datefield.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  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
deleted file mode 100644
index 2d554ca7b5..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/dialog.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  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
deleted file mode 100644
index e880594532..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-#  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
deleted file mode 100644
index 07ab025cdf..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-#  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
deleted file mode 100644
index 3e7149a662..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-#
-#  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
deleted file mode 100644
index e744fba91a..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-#  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
deleted file mode 100644
index 2ff15bb509..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#  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
deleted file mode 100644
index 509fdcf636..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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
deleted file mode 100644
index 29d04c8a5d..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/feedback.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  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
deleted file mode 100644
index a425b53b5f..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#  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
deleted file mode 100644
index ebcdaf8c0b..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  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
deleted file mode 100644
index 3d522e07c8..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-#  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
deleted file mode 100644
index cb9301d0c9..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
+++ /dev/null
@@ -1,365 +0,0 @@
-#
-#  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
deleted file mode 100644
index d4ea1aac65..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-#  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
deleted file mode 100644
index 6595398427..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#  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
deleted file mode 100644
index d36d42878d..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#  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
deleted file mode 100644
index ebf48021db..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-#  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
deleted file mode 100644
index f9a17d0b55..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/menubar.rb
+++ /dev/null
@@ -1,212 +0,0 @@
-#
-#  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
deleted file mode 100644
index 6adb53d941..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-#  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
deleted file mode 100644
index 9aa590056f..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  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
deleted file mode 100644
index 7ed4126a4d..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/notebook.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-#
-#  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
deleted file mode 100644
index 57a3cc7d2b..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-#  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
deleted file mode 100644
index 65463cc85a..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-#  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
deleted file mode 100644
index 7c7ff7ad62..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-#  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
deleted file mode 100644
index ae56788289..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  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
deleted file mode 100644
index 21181777b5..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-#  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
deleted file mode 100644
index 056cd85322..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#  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
deleted file mode 100644
index 935e04bbcc..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
+++ /dev/null
@@ -1,353 +0,0 @@
-#
-#  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 paramters
-    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
deleted file mode 100644
index 7b7b95df1c..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-#  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
deleted file mode 100644
index dc2966bd48..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  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
deleted file mode 100644
index 20a4cd1d36..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-#
-#  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
deleted file mode 100644
index 69b7d314fd..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
+++ /dev/null
@@ -1,568 +0,0 @@
-#
-#  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
deleted file mode 100644
index 5ecd2d72d2..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  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
deleted file mode 100644
index eb8fe3ad52..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-#  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
deleted file mode 100644
index 45aecf3266..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-#  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
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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
deleted file mode 100644
index c560e3ac29..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/shell.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  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
deleted file mode 100644
index b3de9ed989..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/spindate.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  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
deleted file mode 100644
index bede3bb1bf..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/spinint.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#  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
deleted file mode 100644
index d960996e22..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/spinner.rb
+++ /dev/null
@@ -1,169 +0,0 @@
-#
-#  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
deleted file mode 100644
index 20f8197a09..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/spintime.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  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
deleted file mode 100644
index f56efa9aaf..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-#
-#  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
deleted file mode 100644
index 501ead4964..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/tabset.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-#  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
deleted file mode 100644
index b0afb3afd9..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-#  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
deleted file mode 100644
index c34281d4ff..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/timefield.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  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
deleted file mode 100644
index 5b474c3816..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-#  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
deleted file mode 100644
index f10ec54cb2..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/watch.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#  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
deleted file mode 100755
index ecc6bfa131..0000000000
--- a/ext/tk/lib/tkextlib/pkg_checker.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/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 directry 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
deleted file mode 100644
index 79facc5ee3..0000000000
--- a/ext/tk/lib/tkextlib/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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
deleted file mode 100644
index 2831989759..0000000000
--- a/ext/tk/lib/tkextlib/tcllib.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-#  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
deleted file mode 100644
index 441918adce..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/README
+++ /dev/null
@@ -1,135 +0,0 @@
-
- [ 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
deleted file mode 100644
index 2def59bf73..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-#  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
deleted file mode 100644
index b6843df176..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/calendar.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-#  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
deleted file mode 100644
index ba87cd3aae..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  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
deleted file mode 100644
index f4ffb48ece..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-#  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
deleted file mode 100644
index ddb0340c31..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/chatwidget.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-#  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
deleted file mode 100644
index 49b5361e4f..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/crosshair.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-#  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
deleted file mode 100644
index 308847c233..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ctext.rb
+++ /dev/null
@@ -1,160 +0,0 @@
-#
-#  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
deleted file mode 100644
index 5c47f9709b..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/cursor.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-#  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
deleted file mode 100644
index 77038d95bc..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/dateentry.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-#  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
deleted file mode 100644
index 4c2eae741e..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/datefield.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#  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
deleted file mode 100644
index d24ba9d232..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/diagrams.rb
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-#  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
deleted file mode 100644
index 86a0ef2269..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/dialog.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-#  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
deleted file mode 100644
index 48711d3b66..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/getstring.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-#  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
deleted file mode 100644
index a01a4ebfcc..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/history.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-#  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
deleted file mode 100644
index 36a32c6b09..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ico.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-#
-#  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
deleted file mode 100644
index 4878cc3c23..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-#  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
deleted file mode 100644
index 5dc2130b35..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/khim.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-#  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
deleted file mode 100644
index f1eb2f295c..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/menuentry.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#  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
deleted file mode 100644
index 7888ed4871..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ntext.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-#
-#  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
deleted file mode 100644
index 020c51cbd1..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/panelframe.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-#  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
deleted file mode 100644
index 2f3d79d427..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/plotchart.rb
+++ /dev/null
@@ -1,1404 +0,0 @@
-#
-#  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::createHistgram'.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
deleted file mode 100644
index d22dafa053..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ruler.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#  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
deleted file mode 100644
index 75fa36b66d..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/screenruler.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-#  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
deleted file mode 100644
index c9488b4686..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/scrolledwindow.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#  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
deleted file mode 100644
index c9f6062fef..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-#  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
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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
deleted file mode 100644
index 46a4b9d8b6..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/statusbar.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-#  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
deleted file mode 100644
index dac6916e46..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/style.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-#  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
deleted file mode 100644
index adc9c4adbd..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/superframe.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-#  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
deleted file mode 100644
index 7698640534..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/swaplist.rb
+++ /dev/null
@@ -1,150 +0,0 @@
-#
-#  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
deleted file mode 100644
index bf5ab6620a..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tablelist.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#  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
deleted file mode 100644
index 2a5c415cc7..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
+++ /dev/null
@@ -1,1072 +0,0 @@
-#
-#  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
deleted file mode 100644
index 0a1458415e..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-#  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
deleted file mode 100644
index 2f6e4b44fc..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
+++ /dev/null
@@ -1,314 +0,0 @@
-#
-#  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
deleted file mode 100644
index 6eae4eb3e1..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/toolbar.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-#
-#  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
deleted file mode 100644
index 070e63a7b5..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tooltip.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-#  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
deleted file mode 100644
index 57fdf7a575..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/widget.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-#  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
deleted file mode 100644
index 3a4ff27644..0000000000
--- a/ext/tk/lib/tkextlib/tclx.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  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
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/tclx/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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
deleted file mode 100644
index 5a908fcd0b..0000000000
--- a/ext/tk/lib/tkextlib/tclx/tclx.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-#  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
deleted file mode 100644
index 6c11e212ae..0000000000
--- a/ext/tk/lib/tkextlib/tile.rb
+++ /dev/null
@@ -1,449 +0,0 @@
-#
-#  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
deleted file mode 100644
index b112e6152b..0000000000
--- a/ext/tk/lib/tkextlib/tile/dialog.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-#  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
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/tile/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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
deleted file mode 100644
index 9947e0d870..0000000000
--- a/ext/tk/lib/tkextlib/tile/sizegrip.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  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
deleted file mode 100644
index 108d81f88b..0000000000
--- a/ext/tk/lib/tkextlib/tile/style.rb
+++ /dev/null
@@ -1,336 +0,0 @@
-#
-#  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 imcompatible changes
-    # depend on the version of the extention. It requires modifying the
-    # Tcl/Tk scripts to define local styles. The rule for modification
-    # is a simple one. But, if users want to keep compatibility between
-    # versions of the extension, they will have to contrive to do that.
-    # It may be troublesome, especially for Ruby/Tk users.
-    # This method may help such work. This method make some definitions
-    # on the Tcl/Tk interpreter to work with different version of style
-    # command format. Please give attention to use this method. It may
-    # conflict with some definitions on Tcl/Tk scripts.
-    if Tk::Tile::TILE_SPEC_VERSION_ID < 7
-      def __define_wrapper_proc_for_compatibility__!
-        __define_themes_and_setTheme_proc__!
-
-        unless Tk.info(:commands, '::ttk::style').empty?
-          # fail RuntimeError,
-          #      "can't define '::ttk::style' command (already exist)"
-
-          # do nothing !!!
-          warn "Warning: can't define '::ttk::style' command (already exist)" if $DEBUG
-          return
-        end
-        TkCore::INTERP.add_tk_procs('::ttk::style', 'args', <<-'EOS')
-        if [string equal [lrange $args 0 1] {element create}] {
-          if [string equal [lindex $args 3] image] {
-            set spec [lindex $args 4]
-            set map  [lrange $spec 1 end]
-            if [llength $map] {
-              # return [eval [concat [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]]
-              return [uplevel 1 [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]
-            }
-          }
-        }
-        # return [eval "::style $args"]
-        return [uplevel 1 ::style $args]
-      EOS
-        #########################
-      end
-    else ### TILE_SPEC_VERSION_ID == 7
-      def __define_wrapper_proc_for_compatibility__!
-        __define_themes_and_setTheme_proc__!
-
-        unless Tk.info(:commands, '::ttk::style').empty?
-          # fail RuntimeError,
-          #     "can't define '::ttk::style' command (already exist)"
-
-          # do nothing !!!
-          warn "Warning: can't define '::ttk::style' command (already exist)" if $DEBUG
-          return
-        end
-        TkCore::INTERP.add_tk_procs('::ttk::style', 'args', <<-'EOS')
-        if [string equal [lrange $args 0 1] {element create}] {
-          if [string equal [lindex $args 3] image] {
-            set spec [lindex $args 4]
-            set map  [lrange $spec 1 end]
-            if [llength $map] {
-              # return [eval [concat [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]]
-              return [uplevel 1 [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]]
-            }
-          }
-        } elseif [string equal [lindex $args 0] default] {
-          # return [eval "::style [lreplace $args 0 0 configure]"]
-          return [uplevel 1 ::style [lreplace $args 0 0 configure]]
-        }
-        # return [eval "::style $args"]
-        return [uplevel 1 ::style $args]
-      EOS
-        #########################
-      end
-    end
-  else ### TILE_SPEC_VERSION_ID >= 8
-    TkCommandNames = ['::ttk::style'.freeze].freeze
-
-    def __define_wrapper_proc_for_compatibility__!
-      __define_themes_and_setTheme_proc__!
-
-      unless Tk.info(:commands, '::style').empty?
-        # fail RuntimeError, "can't define '::style' command (already exist)"
-
-        # do nothing !!!
-        warn "Warning: can't define '::style' command (already exist)" if $DEBUG
-        return
-      end
-      TkCore::INTERP.add_tk_procs('::style', 'args', <<-'EOS')
-        if [string equal [lrange $args 0 1] {element create}] {
-          if [string equal [lindex $args 3] image] {
-            set name [lindex $args 4]
-            set opts [lrange $args 5 end]
-            set idx [lsearch $opts -map]
-            if {$idx >= 0 && [expr $idx % 2 == 0]} {
-             # return [eval [concat [list ::ttk::style element create [lindex $args 2] image [concat $name [lindex $opts [expr $idx + 1]]]] [lreplace $opts $idx [expr $idx + 1]]]]
-              return [uplevel 1 [list ::ttk::style element create [lindex $args 2] image [concat $name [lindex $opts [expr $idx + 1]]]] [lreplace $opts $idx [expr $idx + 1]]]
-            }
-          }
-        } elseif [string equal [lindex $args 0] default] {
-          # return [eval "::ttk::style [lreplace $args 0 0 configure]"]
-          return [uplevel 1 ::ttk::style [lreplace $args 0 0 configure]]
-        }
-        # return [eval "::ttk::style $args"]
-        return [uplevel 1 ::ttk::style $args]
-      EOS
-      #########################
-    end
-  end
-
-  def __define_themes_and_setTheme_proc__!
-    TkCore::INTERP.add_tk_procs('::ttk::themes', '{ptn *}', <<-'EOS')
-      #set themes [list]
-      set themes [::ttk::style theme names]
-      foreach pkg [lsearch -inline -all -glob [package names] ttk::theme::$ptn] {
-          set theme [namespace tail $pkg]
-          if {[lsearch -exact $themes $theme] < 0} {
-              lappend themes $theme
-          }
-      }
-      foreach pkg [lsearch -inline -all -glob [package names] tile::theme::$ptn] {
-          set theme [namespace tail $pkg]
-          if {[lsearch -exact $themes $theme] < 0} {
-              lappend themes $theme
-          }
-      }
-      return $themes
-    EOS
-    #########################
-    TkCore::INTERP.add_tk_procs('::ttk::setTheme', 'theme', <<-'EOS')
-      variable currentTheme
-      if {[lsearch -exact [::ttk::style theme names] $theme] < 0} {
-          package require [lsearch -inline -regexp [package names] (ttk|tile)::theme::$theme]
-      }
-      ::ttk::style theme use $theme
-      set currentTheme $theme
-    EOS
-  end
-  private :__define_themes_and_setTheme_proc__!
-
-  def configure(style=nil, keys=nil)
-    if style.kind_of?(Hash)
-      keys = style
-      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
deleted file mode 100644
index c852024842..0000000000
--- a/ext/tk/lib/tkextlib/tile/tbutton.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#  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
deleted file mode 100644
index 01751ede0f..0000000000
--- a/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  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
deleted file mode 100644
index b5ab827e2d..0000000000
--- a/ext/tk/lib/tkextlib/tile/tcombobox.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-#  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
deleted file mode 100644
index 8d2633a774..0000000000
--- a/ext/tk/lib/tkextlib/tile/tentry.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-#  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
deleted file mode 100644
index d6d4312628..0000000000
--- a/ext/tk/lib/tkextlib/tile/tframe.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#  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
deleted file mode 100644
index 55b98acc68..0000000000
--- a/ext/tk/lib/tkextlib/tile/tlabel.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#  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
deleted file mode 100644
index a34c98583f..0000000000
--- a/ext/tk/lib/tkextlib/tile/tlabelframe.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  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
deleted file mode 100644
index 1cf553ec8c..0000000000
--- a/ext/tk/lib/tkextlib/tile/tmenubutton.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  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
deleted file mode 100644
index 9e27e2c1fd..0000000000
--- a/ext/tk/lib/tkextlib/tile/tnotebook.rb
+++ /dev/null
@@ -1,147 +0,0 @@
-#
-#  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
deleted file mode 100644
index d6ad234559..0000000000
--- a/ext/tk/lib/tkextlib/tile/tpaned.rb
+++ /dev/null
@@ -1,245 +0,0 @@
-#
-#  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
deleted file mode 100644
index 0c9d15e1b9..0000000000
--- a/ext/tk/lib/tkextlib/tile/tprogressbar.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#  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
deleted file mode 100644
index 5dbf260666..0000000000
--- a/ext/tk/lib/tkextlib/tile/tradiobutton.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  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
deleted file mode 100644
index 70db3d6d78..0000000000
--- a/ext/tk/lib/tkextlib/tile/treeview.rb
+++ /dev/null
@@ -1,1306 +0,0 @@
-#
-#  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
deleted file mode 100644
index 7eefcef731..0000000000
--- a/ext/tk/lib/tkextlib/tile/tscale.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#  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
deleted file mode 100644
index c6bba5810b..0000000000
--- a/ext/tk/lib/tkextlib/tile/tscrollbar.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-#  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
deleted file mode 100644
index ffd2f6f89f..0000000000
--- a/ext/tk/lib/tkextlib/tile/tseparator.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#  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
deleted file mode 100644
index 2f2d73c5ab..0000000000
--- a/ext/tk/lib/tkextlib/tile/tspinbox.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-#  ttk::spinbox widget  (Tcl/Tk 8.6b1 or later)
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TSpinbox < Tk::Tile::TEntry
-    end
-    Spinbox = TSpinbox
-  end
-end
-
-class Tk::Tile::TSpinbox < Tk::Tile::TEntry
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::spinbox'.freeze].freeze
-  else
-    TkCommandNames = ['::tspinbox'.freeze].freeze
-  end
-  WidgetClassName = 'TSpinbox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  class SpinCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?d, ?s, :direction ],
-        [ ?s, ?e, :current ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-
-        [ ?e, proc{|val|
-            #enc = Tk.encoding
-            enc = ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
-            if enc
-              Tk.fromUTF8(TkComm::string(val), enc)
-            else
-              TkComm::string(val)
-            end
-          }
-        ],
-
-        nil
-      ]
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        (val)? '1': '0'
-      end
-    end
-
-    def self._config_keys
-      ['command']
-    end
-  end
-
-  def __validation_class_list
-    super() << SpinCommand
-  end
-
-  Tk::ValidateConfigure.__def_validcmd(binding, SpinCommand)
-
-  def __boolval_optkeys
-    super() << 'wrap'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'buttonbackground' << 'format'
-  end
-  private :__strval_optkeys
-
-  def __listval_optkeys
-    super() << 'values'
-  end
-  private :__listval_optkeys
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-
-  def current
-    number(tk_send_without_enc('current'))
-  end
-  def current=(idx)
-    tk_send('current', idx)
-  end
-
-  def set(val)
-    tk_send('set', val)
-  end
-
-  alias identify ttk_identify
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Spinbox, :TkSpinbox)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tspinbox.rb',
-                                   :Ttk, Tk::Tile::Spinbox, :TkSpinbox)
diff --git a/ext/tk/lib/tkextlib/tile/tsquare.rb b/ext/tk/lib/tkextlib/tile/tsquare.rb
deleted file mode 100644
index a81cd7b98a..0000000000
--- a/ext/tk/lib/tkextlib/tile/tsquare.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#  tsquare widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TSquare < TkWindow
-    end
-    Square = TSquare
-  end
-end
-
-class Tk::Tile::TSquare < TkWindow
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::square'.freeze].freeze
-  else
-    TkCommandNames = ['::tsquare'.freeze].freeze
-  end
-  WidgetClassName = 'TSquare'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkDND.rb b/ext/tk/lib/tkextlib/tkDND.rb
deleted file mode 100644
index 5d52e34418..0000000000
--- a/ext/tk/lib/tkextlib/tkDND.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-#  TkDND (Tk Drag & Drop 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/tkDND/setup.rb'
-
-module Tk
-  module TkDND
-    autoload :DND,   'tkextlib/tkDND/tkdnd'
-    autoload :Shape, 'tkextlib/tkDND/shape'
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkDND/setup.rb b/ext/tk/lib/tkextlib/tkDND/setup.rb
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/tkDND/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/tkDND/shape.rb b/ext/tk/lib/tkextlib/tkDND/shape.rb
deleted file mode 100644
index d44068ed33..0000000000
--- a/ext/tk/lib/tkextlib/tkDND/shape.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-#  tkextlib/tkDND/shape.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/tkDND/setup.rb'
-
-# TkPackage.require('Shape', '0.3')
-TkPackage.require('Shape')
-
-module Tk
-  module TkDND
-    module Shape
-      extend TkCore
-
-      PACKAGE_NAME = 'Shape'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-=begin
-      def self.package_version
-        begin
-          TkPackage.require('Shape')
-        rescue
-          ''
-        end
-      end
-=end
-      class << self
-        def package_version
-          Tk.tk_call('set', 'shape_version')
-        end
-        alias shape_version package_version
-
-        def package_patchlevel
-          Tk.tk_call('set', 'shape_patchLevel')
-        end
-        alias shape_patchlevel package_patchlevel
-
-        def version
-          tk_call('shape', 'version')
-        end
-        alias xshape_version version
-      end
-
-      ############################
-
-      def shape_bounds(kind=nil)
-        if kind
-          ret = tk_call('shape', 'bounds', @path, "-#{kind}")
-        else
-          ret = tk_call('shape', 'bounds', @path)
-        end
-        if ret == ""
-          nil
-        else
-          list(ret)
-        end
-      end
-
-      def shape_get(kind=nil)
-        if kind
-          list(tk_call('shape', 'get', @path, "-#{kind}"))
-        else
-          list(tk_call('shape', 'get', @path))
-        end
-      end
-
-      def shape_offset(x, y, kind=nil)
-        if kind
-          tk_call('shape', 'get', @path, "-#{kind}", x, y)
-        else
-          tk_call('shape', 'get', @path, x, y)
-        end
-        self
-      end
-
-      def _parse_shapespec_param(args)
-        cmd = []
-
-        kind_keys    = ['bounding', 'clip', 'both']
-        offset_keys  = ['offset']
-        srckind_keys = ['bitmap', 'rectangles', 'reset', 'test', 'window']
-
-        cmd << "-#{args.shift}" if kind_keys.member?(args[0].to_s)
-
-        if offset_keys.member?(args[0].to_s)
-          cmd << "-#{args.shift}"
-          cmd << args.shift # xOffset
-          cmd << args.shift # yOffset
-        end
-
-        if srckind_keys.member?(args[0].to_s)
-          cmd << "-#{args.shift}"
-        end
-
-        cmd.concat(args)
-
-        cmd
-      end
-      private :_parse_shapespec_param
-
-      def shape_set(*args) # ?kind? ?offset <x> <y>? srckind ?arg ...?
-        tk_call('shape', 'set', @path, *(_parse_shapespec_param(args)))
-        self
-      end
-
-      def shape_update(op, *args) # ?kind? ?offset <x> <y>? srckind ?arg ...?
-        tk_call('shape', 'update', @path, op, *(_parse_shapespec_param(args)))
-        self
-      end
-    end
-  end
-end
-
-class TkWindow
-  include Tk::TkDND::Shape
-end
diff --git a/ext/tk/lib/tkextlib/tkDND/tkdnd.rb b/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
deleted file mode 100644
index 97cdfc7f1c..0000000000
--- a/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-#
-#  tkextlib/tkDND/tkdnd.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/tkDND/setup.rb'
-
-TkPackage.require('tkdnd')
-
-module Tk
-  module TkDND
-    PACKAGE_NAME = 'tkdnd'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('tkdnd')
-      rescue
-        ''
-      end
-    end
-
-    class DND_Subst < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?a, ?l, :actions ],
-        [ ?A, ?s, :action ],
-        [ ?b, ?L, :codes ],
-        [ ?c, ?s, :code ],
-        [ ?d, ?l, :descriptions ],
-        [ ?D, ?l, :data ],
-        [ ?L, ?l, :source_types ],
-        [ ?m, ?l, :modifiers ],
-        [ ?t, ?l, :types ],
-        [ ?T, ?s, :type ],
-        [ ?W, ?w, :widget ],
-        [ ?x, ?n, :x ],
-        [ ?X, ?n, :x_root ],
-        [ ?y, ?n, :y ],
-        [ ?Y, ?n, :y_root ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?n, TkComm.method(:num_or_str) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?l, TkComm.method(:list) ],
-        [ ?L, TkComm.method(:simplelist) ],
-        [ ?w, TkComm.method(:window) ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      # setup tables
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-    end
-
-    module DND
-      def self.version
-        begin
-          TkPackage.require('tkdnd')
-        rescue
-          ''
-        end
-      end
-
-      def dnd_bindtarget_info(type=nil, event=nil)
-        if event
-          procedure(tk_call('dnd', 'bindtarget', @path, type, event))
-        elsif type
-          procedure(tk_call('dnd', 'bindtarget', @path, type))
-        else
-          simplelist(tk_call('dnd', 'bindtarget', @path))
-        end
-      end
-
-      #def dnd_bindtarget(type, event, cmd=Proc.new, prior=50, *args)
-      #  event = tk_event_sequence(event)
-      #  if prior.kind_of?(Numeric)
-      #    tk_call('dnd', 'bindtarget', @path, type, event,
-      #            install_bind_for_event_class(DND_Subst, cmd, *args),
-      #            prior)
-      #  else
-      #    tk_call('dnd', 'bindtarget', @path, type, event,
-      #            install_bind_for_event_class(DND_Subst, cmd, prior, *args))
-      #  end
-      #  self
-      #end
-      def dnd_bindtarget(type, event, *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
-
-        prior = 50
-        prior = args.shift unless args.empty?
-
-        event = tk_event_sequence(event)
-        if prior.kind_of?(Numeric)
-          tk_call('dnd', 'bindtarget', @path, type, event,
-                  install_bind_for_event_class(DND_Subst, cmd, *args),
-                  prior)
-        else
-          tk_call('dnd', 'bindtarget', @path, type, event,
-                  install_bind_for_event_class(DND_Subst, cmd, prior, *args))
-        end
-        self
-      end
-
-      def dnd_cleartarget
-        tk_call('dnd', 'cleartarget', @path)
-        self
-      end
-
-      def dnd_bindsource_info(type=nil)
-        if type
-          procedure(tk_call('dnd', 'bindsource', @path, type))
-        else
-          simplelist(tk_call('dnd', 'bindsource', @path))
-        end
-      end
-
-      #def dnd_bindsource(type, cmd=Proc.new, prior=None)
-      #  tk_call('dnd', 'bindsource', @path, type, cmd, prior)
-      #  self
-      #end
-      def dnd_bindsource(type, *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
-
-        args = [None] if args.empty
-
-        tk_call('dnd', 'bindsource', @path, type, cmd, *args)
-        self
-      end
-
-      def dnd_clearsource()
-        tk_call('dnd', 'clearsource', @path)
-        self
-      end
-
-      def dnd_drag(keys=nil)
-        tk_call('dnd', 'drag', @path, *hash_kv(keys))
-        self
-      end
-    end
-  end
-end
-
-class TkWindow
-  include Tk::TkDND::DND
-end
diff --git a/ext/tk/lib/tkextlib/tkHTML.rb b/ext/tk/lib/tkextlib/tkHTML.rb
deleted file mode 100644
index 5fddde72ff..0000000000
--- a/ext/tk/lib/tkextlib/tkHTML.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  TkHtml 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/tkHTML/setup.rb'
-
-# load library
-require 'tkextlib/tkHTML/htmlwidget'
diff --git a/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb b/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
deleted file mode 100644
index b9ee90aace..0000000000
--- a/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
+++ /dev/null
@@ -1,453 +0,0 @@
-#
-#  tkextlib/tkHTML/htmlwidget.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/tkHTML/setup.rb'
-
-# TkPackage.require('Tkhtml', '2.0')
-TkPackage.require('Tkhtml')
-
-module Tk
-  class HTML_Widget < TkWindow
-    PACKAGE_NAME = 'Tkhtml'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('Tkhtml')
-      rescue
-        ''
-      end
-    end
-
-    class ClippingWindow < TkWindow
-    end
-  end
-end
-
-class Tk::HTML_Widget::ClippingWindow
-  WidgetClassName = 'HtmlClip'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  HtmlClip_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    HtmlClip_TBL.mutex.synchronize{ HtmlClip_TBL.clear }
-  }
-
-  def self.new(parent, keys={})
-    if parent.kind_of?(Hash)
-      keys = TkComm._symbolkey2str(parent)
-      parent = keys.delete('parent')
-    end
-
-    if parent.kind_of?(String)
-      ppath = parent.path
-    elsif parent
-      ppath = parent
-    else
-      ppath = ''
-    end
-    HtmlClip_TBL.mutex.synchronize{
-      return HtmlClip_TBL[ppath] if HtmlClip_TBL[ppath]
-    }
-
-    widgetname = keys.delete('widgetname')
-    if widgetname =~ /^(.*)\.[^.]+$/
-      ppath2 = $1
-      if ppath2[0] != ?.
-        ppath2 = ppath + '.' + ppath2
-      end
-      HtmlClip_TBL.mutex.synchronize{
-        return HtmlClip_TBL[ppath2] if HtmlClip_TBL[ppath2]
-      }
-
-      ppath = ppath2
-    end
-
-    parent = TkComm._genobj_for_tkwidget(ppath)
-    unless parent.kind_of?(Tk::HTML_Widget)
-      fail ArgumentError, "parent must be a Tk::HTML_Widget instance"
-    end
-
-    super(parent)
-  end
-
-  def initialize(parent)
-    @parent = parent
-    @ppath = parent.path
-    @path = @id = @ppath + '.x'
-    HtmlClip_TBL.mutex.synchronize{
-      HtmlClip_TBL[@ppath] = self
-    }
-  end
-
-  def method_missing(m, *args, &b)
-    @parent.__send__(m, *args, &b)
-  end
-end
-
-class Tk::HTML_Widget
-  include Scrollable
-
-  TkCommandNames = ['html'.freeze].freeze
-  WidgetClassName = 'Html'.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() << 'base' << 'selectioncolor' << 'unvisitedcolor' << 'visitedcolor'
-  end
-  private :__strval_optkeys
-
-  ###################################
-  #  class methods
-  ###################################
-  def self.reformat(src, dst, txt)
-    tk_call('html', 'reformat', src, dst, txt)
-  end
-
-  def self.url_join(*args) # args := sheme authority path query fragment
-    tk_call('html', 'urljoin', *args)
-  end
-
-  def self.url_split(uri)
-    tk_call('html', 'urlsplit', uri)
-  end
-
-  def self.lockcopy(src, dst)
-    tk_call('html', 'lockcopy', src, dst)
-  end
-
-  def self.gzip_file(file, dat)
-    tk_call('html', 'gzip', 'file', file, dat)
-  end
-
-  def self.gunzip_file(file, dat)
-    tk_call('html', 'gunzip', 'file', filet)
-  end
-
-  def self.gzip_data(dat)
-    tk_call('html', 'gzip', 'data', file, dat)
-  end
-
-  def self.gunzip_data(dat)
-    tk_call('html', 'gunzip', 'data', filet)
-  end
-
-  def self.base64_encode(dat)
-    tk_call('html', 'base64', 'encode', dat)
-  end
-
-  def self.base64_decode(dat)
-    tk_call('html', 'base64', 'encode', dat)
-  end
-
-  def self.text_format(dat, len)
-    tk_call('html', 'text', 'format', dat, len)
-  end
-
-  def self.xor(cmd, *args)
-    tk_call('html', 'xor', cmd, *args)
-  end
-
-  def self.stdchan(cmd, channel)
-    tk_call('html', 'stdchan', cmd, channel)
-  end
-
-  def self.crc32(data)
-    tk_call('html', 'crc32', data)
-  end
-
-  ###################################
-  #  instance methods
-  ###################################
-  def clipping_window
-    ClippingWindow.new(self)
-  end
-  alias clipwin  clipping_window
-  alias htmlclip clipping_window
-
-  def bgimage(image, tid=None)
-    tk_send('bgimage', image, tid)
-    self
-  end
-
-  def clear()
-    tk_send('clear')
-    self
-  end
-
-  def coords(index=None, percent=None)
-    tk_send('coords', index, percent)
-  end
-
-  def forminfo(*args)
-    tk_send('forminfo', *args)
-  end
-  alias form_info forminfo
-
-  def href(x, y)
-    simplelist(tk_send('href', x, y))
-  end
-
-  def image_add(id, img)
-    tk_send('imageadd', id, img)
-    self
-  end
-
-  def image_at(x, y)
-    tk_send('imageat', x, y)
-  end
-
-  def images()
-    list(tk_send('images'))
-  end
-
-  def image_set(id, num)
-    tk_send('imageset', id, num)
-    self
-  end
-
-  def image_update(id, imgs)
-    tk_send('imageupdate', id, imgs)
-    self
-  end
-
-  def index(idx, count=None, unit=None)
-    tk_send('index', idx, count, unit)
-  end
-
-  def insert_cursor(idx)
-    tk_send('insert', idx)
-  end
-
-  def names()
-    simple_list(tk_send('names'))
-  end
-
-  def on_screen(id, x, y)
-    bool(tk_send('onscreen', id, x, y))
-  end
-
-  def over(x, y)
-    list(tk_send('over', x, y))
-  end
-
-  def over_markup(x, y)
-    list(tk_send('over', x, y, '-muponly'))
-  end
-
-  def over_attr(x, y, attrs)
-    list(tk_send('overattr', x, y, attrs))
-  end
-
-  def parse(txt)
-    tk_send('parse', txt)
-    self
-  end
-
-  def resolver(*uri_args)
-    tk_send('resolver', *uri_args)
-  end
-
-  def selection_clear()
-    tk_send('selection', 'clear')
-    self
-  end
-
-  def selection_set(first, last)
-    tk_send('selection', 'set', first, last)
-    self
-  end
-
-  def refresh(*opts)
-    tk_send('refresh', *opts)
-  end
-
-  def layout()
-    tk_send('layout')
-  end
-
-  def sizewindow(*args)
-    tk_send('sizewindow', *args)
-  end
-
-  def postscript(*args)
-    tk_send('postscript', *args)
-  end
-
-  def source()
-    tk_send('source')
-  end
-
-  def plain_text(first, last)
-    tk_send('text', 'ascii', first, last)
-  end
-  alias ascii_text plain_text
-  alias text_ascii plain_text
-
-  def text_delete(first, last)
-    tk_send('text', 'delete', first, last)
-    self
-  end
-
-  def html_text(first, last)
-    tk_send('text', 'html', first, last)
-  end
-  alias text_html html_text
-
-  def text_insert(idx, txt)
-    tk_send('text', 'insert', idx, txt)
-    self
-  end
-
-  def break_text(idx)
-    tk_send('text', 'break', idx)
-  end
-  alias text_break break_text
-
-  def text_find(txt, *args)
-    tk_send('text', 'find', txt, *args)
-  end
-
-  def text_table(idx, imgs=None, attrs=None)
-    tk_send('text', 'table', idx, imgs, attrs)
-  end
-
-  def token_append(tag, *args)
-    tk_send('token', 'append', tag, *args)
-    self
-  end
-
-  def token_delete(first, last=None)
-    tk_send('token', 'delete', first, last)
-    self
-  end
-
-  def token_define(*args)
-    tk_send('token', 'defile', *args)
-    self
-  end
-
-  def token_find(tag, *args)
-    list(tk_send('token', 'find', tag, *args))
-  end
-
-  def token_get(first, last=None)
-    list(tk_send('token', 'get', first, last))
-  end
-
-  def token_list(first, last=None)
-    list(tk_send('token', 'list', first, last))
-  end
-
-  def token_markup(first, last=None)
-    list(tk_send('token', 'markup', first, last))
-  end
-
-  def token_DOM(first, last=None)
-    list(tk_send('token', 'domtokens', first, last))
-  end
-  alias token_dom token_DOM
-  alias token_domtokens token_DOM
-  alias token_dom_tokens token_DOM
-
-  def token_get_end(idx)
-    tk_send('token', 'getend', idx)
-  end
-  alias token_getend token_get_end
-
-  def token_offset(start, num1, num2)
-    list(tk_send('token', 'offset', start, num1, num2))
-  end
-
-  def token_get_attr(idx, name=None)
-    list(tk_send('token', 'attr', idx, name))
-  end
-
-  def token_set_attr(idx, name=None, val=None)
-    tk_send('token', 'attr', idx, name, val)
-    self
-  end
-
-  def token_handler(tag, cmd=nil, &b)
-    cmd = Proc.new(&b) if !cmd && b
-    if cmd
-      tk_send('token', 'handler', tag, cmd)
-      return self
-    else
-      return tk_send('token', 'handler', tag)
-    end
-  end
-
-  def token_insert(idx, tag, *args)
-    tk_send('token', 'insert', idx, tag, *args)
-    self
-  end
-
-  def token_attrs(*args)
-    list(tk_send('token', 'attrs', *args))
-  end
-
-  def token_unique(*args)
-    list(tk_send('token', 'unique', *args))
-  end
-
-  def token_on_events(*args)
-    list(tk_send('token', 'onEvents', *args))
-  end
-
-  def dom_nameidx(tag, name)
-    number(tk_send('dom', 'nameidx', tag, name))
-  end
-  alias dom_name_index dom_nameidx
-
-  def dom_radioidx(tag, name)
-    number(tk_send('dom', 'radioidx', tag, name))
-  end
-  alias dom_radio_index dom_radioidx
-
-  def dom_id(*spec)
-    tk_send('dom', 'id', *spec)
-  end
-
-  def dom_ids(*spec)
-    list(tk_send('dom', 'ids', *spec))
-  end
-
-  def dom_value(*spec)
-    list(tk_send('dom', 'value', *spec))
-  end
-
-  def dom_attr(idx)
-    tk_send('dom', 'attr', idx)
-  end
-
-  def dom_formel(name)
-    tk_send('dom', 'formel', name)
-  end
-  alias dom_form_element dom_formel
-
-  def dom_tree(idx, val)
-    list(tk_send('dom', 'tree', idx, val))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkHTML/setup.rb b/ext/tk/lib/tkextlib/tkHTML/setup.rb
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/tkHTML/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/tkimg.rb b/ext/tk/lib/tkextlib/tkimg.rb
deleted file mode 100644
index c01359d3ef..0000000000
--- a/ext/tk/lib/tkextlib/tkimg.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  TkImg 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/tkimg/setup.rb'
-
-# load all image format handlers
-#TkPackage.require('Img', '1.3')
-TkPackage.require('Img')
-
-module Tk
-  module Img
-    PACKAGE_NAME = 'Img'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('Img')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-# autoload
-autoload :TkPixmapImage, 'tkextlib/tkimg/pixmap'
diff --git a/ext/tk/lib/tkextlib/tkimg/README b/ext/tk/lib/tkextlib/tkimg/README
deleted file mode 100644
index f5981cb98c..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/README
+++ /dev/null
@@ -1,26 +0,0 @@
-
- [ Tcl/Tk Image formats (TkImg) support ]
-
-TkImg contains a collection of format handlers for the Tk photo
-image type, and a new image type, pixmaps.
-
-Supported formats of TkImg version 1.3 are
--------------------------------------------------------
-   bmp    : Windows Bitmap Format
-   gif    : Graphics Interchange Format
-   ico    : Windows Icon Format
-   jpeg   : Joint Picture Expert Group format
-   pcx    : Paintbrush Format
-   pixmap : Pixmap Image type
-   png    : Portable Network Graphics format
-   ppm    : Portable Pixmap format
-   ps     : Adobe PostScript Format
-   sgi    : SGI Native Format
-   sun    : Sun Raster Format
-   tga    : Truevision Targa Format
-   tiff   : Tagged Image File Format
-   window : Tk Windows
-   xbm    : X Window Bitmap Format
-   xpm    : X Window Pixmap Format
--------------------------------------------------------
-
diff --git a/ext/tk/lib/tkextlib/tkimg/bmp.rb b/ext/tk/lib/tkextlib/tkimg/bmp.rb
deleted file mode 100644
index ea90181aa3..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/bmp.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'bmp'
-#                               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/tkimg/setup.rb'
-
-#TkPackage.require('img::bmp', '1.3')
-TkPackage.require('img::bmp')
-
-module Tk
-  module Img
-    module BMP
-      PACKAGE_NAME = 'img::bmp'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::bmp')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/gif.rb b/ext/tk/lib/tkextlib/tkimg/gif.rb
deleted file mode 100644
index d542d47561..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/gif.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'gif'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::gif', '1.3')
-TkPackage.require('img::gif')
-
-module Tk
-  module Img
-    module GIF
-      PACKAGE_NAME = 'img::gif'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::gif')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/ico.rb b/ext/tk/lib/tkextlib/tkimg/ico.rb
deleted file mode 100644
index e79bdf45e9..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/ico.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'ico'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::ico', '1.3')
-TkPackage.require('img::ico')
-
-module Tk
-  module Img
-    module ICO
-      PACKAGE_NAME = 'img::ico'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::ico')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/jpeg.rb b/ext/tk/lib/tkextlib/tkimg/jpeg.rb
deleted file mode 100644
index 2126120161..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/jpeg.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'jpeg'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::jpeg', '1.3')
-TkPackage.require('img::jpeg')
-
-module Tk
-  module Img
-    module JPEG
-      PACKAGE_NAME = 'img::jpeg'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::jpeg')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/pcx.rb b/ext/tk/lib/tkextlib/tkimg/pcx.rb
deleted file mode 100644
index 6831f4d35b..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/pcx.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'pcx'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::pcx', '1.3')
-TkPackage.require('img::pcx')
-
-module Tk
-  module Img
-    module PCX
-      PACKAGE_NAME = 'img::pcx'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::pcx')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/pixmap.rb b/ext/tk/lib/tkextlib/tkimg/pixmap.rb
deleted file mode 100644
index bd1b870af7..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/pixmap.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#  TkImg - format 'pixmap'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::pixmap', '1.3')
-TkPackage.require('img::pixmap')
-
-module Tk
-  module Img
-    module PIXMAP
-      PACKAGE_NAME = 'img::pixmap'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::pixmap')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
-
-class TkPixmapImage<TkImage
-  def self.version
-    Tk::Img::PIXMAP.version
-  end
-
-  def initialize(*args)
-    @type = 'pixmap'
-    super(*args)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/png.rb b/ext/tk/lib/tkextlib/tkimg/png.rb
deleted file mode 100644
index 5c829f48d2..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/png.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'png'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::png', '1.3')
-TkPackage.require('img::png')
-
-module Tk
-  module Img
-    module PNG
-      PACKAGE_NAME = 'img::png'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::png')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/ppm.rb b/ext/tk/lib/tkextlib/tkimg/ppm.rb
deleted file mode 100644
index eacfae467d..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/ppm.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'ppm'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::ppm', '1.3')
-TkPackage.require('img::ppm')
-
-module Tk
-  module Img
-    module PPM
-      PACKAGE_NAME = 'img::ppm'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::ppm')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/ps.rb b/ext/tk/lib/tkextlib/tkimg/ps.rb
deleted file mode 100644
index 68e9178ac0..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/ps.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'ps'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::ps', '1.3')
-TkPackage.require('img::ps')
-
-module Tk
-  module Img
-    module PS
-      PACKAGE_NAME = 'img::ps'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::ps')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/setup.rb b/ext/tk/lib/tkextlib/tkimg/setup.rb
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/tkimg/sgi.rb b/ext/tk/lib/tkextlib/tkimg/sgi.rb
deleted file mode 100644
index ec7038bf0e..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/sgi.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'sgi'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::sgi', '1.3')
-TkPackage.require('img::sgi')
-
-module Tk
-  module Img
-    module SGI
-      PACKAGE_NAME = 'img::sgi'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::sgi')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/sun.rb b/ext/tk/lib/tkextlib/tkimg/sun.rb
deleted file mode 100644
index 651f946497..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/sun.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'sun'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::sun', '1.3')
-TkPackage.require('img::sun')
-
-module Tk
-  module Img
-    module SUN
-      PACKAGE_NAME = 'img::sun'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::sun')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/tga.rb b/ext/tk/lib/tkextlib/tkimg/tga.rb
deleted file mode 100644
index 1eae407c0a..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/tga.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'tga'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::tga', '1.3')
-TkPackage.require('img::tga')
-
-module Tk
-  module Img
-    module TGA
-      PACKAGE_NAME = 'img::tga'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::tga')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/tiff.rb b/ext/tk/lib/tkextlib/tkimg/tiff.rb
deleted file mode 100644
index ed271c2600..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/tiff.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'tiff'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::tiff', '1.3')
-TkPackage.require('img::tiff')
-
-module Tk
-  module Img
-    module TIFF
-      PACKAGE_NAME = 'img::tiff'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::tiff')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/window.rb b/ext/tk/lib/tkextlib/tkimg/window.rb
deleted file mode 100644
index 3b5906fab6..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/window.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'window'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::window', '1.3')
-TkPackage.require('img::window')
-
-module Tk
-  module Img
-    module WINDOW
-      PACKAGE_NAME = 'img::window'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::window')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/xbm.rb b/ext/tk/lib/tkextlib/tkimg/xbm.rb
deleted file mode 100644
index f4bea030be..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/xbm.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'xbm'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::xbm', '1.3')
-TkPackage.require('img::xbm')
-
-module Tk
-  module Img
-    module XBM
-      PACKAGE_NAME = 'img::xbm'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::xbm')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/xpm.rb b/ext/tk/lib/tkextlib/tkimg/xpm.rb
deleted file mode 100644
index 5119c8710b..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/xpm.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  TkImg - format 'xpm'
-#                               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/tkimg/setup.rb'
-
-# TkPackage.require('img::xpm', '1.3')
-TkPackage.require('img::xpm')
-
-module Tk
-  module Img
-    module XPM
-      PACKAGE_NAME = 'img::xpm'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::xpm')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tktable.rb b/ext/tk/lib/tkextlib/tktable.rb
deleted file mode 100644
index 385eb13497..0000000000
--- a/ext/tk/lib/tkextlib/tktable.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#  TkTable 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/tktable/setup.rb'
-
-# load library
-require 'tkextlib/tktable/tktable'
diff --git a/ext/tk/lib/tkextlib/tktable/setup.rb b/ext/tk/lib/tkextlib/tktable/setup.rb
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/tktable/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/tktable/tktable.rb b/ext/tk/lib/tkextlib/tktable/tktable.rb
deleted file mode 100644
index bc7a6c9a2e..0000000000
--- a/ext/tk/lib/tkextlib/tktable/tktable.rb
+++ /dev/null
@@ -1,966 +0,0 @@
-#
-#  tkextlib/tktable/tktable.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/validation'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tktable/setup.rb'
-
-# TkPackage.require('Tktable', '2.8')
-TkPackage.require('Tktable')
-
-module Tk
-  class TkTable < TkWindow
-    PACKAGE_NAME = 'Tktable'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('Tktable')
-      rescue
-        ''
-      end
-    end
-
-    class CellTag < TkObject
-    end
-
-    module ConfigMethod
-    end
-  end
-end
-
-module Tk::TkTable::ConfigMethod
-  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 __item_boolval_optkeys(id)
-    super(id) << 'multiline' << 'showtext' << 'wrap'
-  end
-  private :__item_boolval_optkeys
-
-  def __item_strval_optkeys(id)
-    super(id) << 'ellipsis'
-  end
-  private :__item_strval_optkeys
-
-  def __item_val2ruby_optkeys(id)  # { key=>method, ... }
-    super(id).update('window'=>proc{|v| window(v)})
-  end
-  private :__item_val2ruby_optkeys
-
-  def tag_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['tag', tagid(tagOrId)], option)
-  end
-  def tag_cget(tagOrId, option)
-    itemcget(['tag', tagid(tagOrId)], option)
-  end
-  def tag_cget_strict(tagOrId, option)
-    itemcget_strict(['tag', tagid(tagOrId)], option)
-  end
-  def tag_configure(tagOrId, slot, value=None)
-    itemconfigure(['tag', tagid(tagOrId)], slot, value)
-  end
-  def tag_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['tag', tagid(tagOrId)], slot)
-  end
-  def current_tag_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['tag', tagid(tagOrId)], slot)
-  end
-
-  def window_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['window', tagid(tagOrId)], option)
-  end
-  def window_cget(tagOrId, option)
-    itemcget(['window', tagid(tagOrId)], option)
-  end
-  def window_cget_strict(tagOrId, option)
-    itemcget_strict(['window', tagid(tagOrId)], option)
-  end
-  def window_configure(tagOrId, slot, value=None)
-    if slot == :window || slot == 'window'
-      value = _epath(value)
-    elsif slot.kind_of?(Hash)
-      if slot.key?(:window) || slot.key?('window')
-        slot = _symbolkey2str(slot)
-        slot['window'] = _epath(slot['window'])
-      end
-    end
-    itemconfigure(['window', tagid(tagOrId)], slot, value)
-  end
-  def window_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['window', tagid(tagOrId)], slot)
-  end
-  def current_window_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['window', tagid(tagOrId)], slot)
-  end
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-end
-
-#####################################################
-
-class Tk::TkTable::CellTag
-  include TkTreatTagFont
-
-  CellTagID_TBL = TkCore::INTERP.create_table
-
-  (CellTag_ID = ['tktbl:celltag'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    CellTagID_TBL.mutex.synchronize{ CellTagID_TBL.clear }
-  }
-
-  def self.id2obj(table, id)
-    tpath = table.path
-    CellTagID_TBL.mutex.synchronize{
-      if CellTagID_TBL[tpath]
-        CellTagID_TBL[tpath][id]? CellTagID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, keys=nil)
-    @parent = @t = parent
-    @tpath - parent.path
-    CellTag_ID.mutex.synchronize{
-      @path = @id = CellTag_ID.join(TkCore::INTERP._ip_id_)
-      CellTag_ID[1].succ!
-    }
-    CellTagID_TBL.mutex.synchronize{
-      CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-      CellTagID_TBL[@tpath][@id] = self
-    }
-    configure(keys) if keys
-  end
-
-  def id
-    @id
-  end
-
-  def destroy
-    tk_call(@tpath, 'tag', 'delete', @id)
-    CellTagID_TBL.mutex.synchronize{
-      CellTagID_TBL[@tpath].delete(@id) if CellTagID_TBL[@tpath]
-    }
-    self
-  end
-  alias delete destroy
-
-  def exist?
-    @t.tag_exist?(@id)
-  end
-  def include?(idx)
-    @t.tag_include?(@id, idx)
-  end
-
-  def add_cell(*args)
-    @t.tag_cell(@id, *args)
-  end
-  def add_col(*args)
-    @t.tag_col(@id, *args)
-  end
-  def add_row(*args)
-    @t.tag_row(@id, *args)
-  end
-
-  def raise(target=None)
-    @t.tag_raise(@id, target)
-  end
-  def lower(target=None)
-    @t.tag_lower(@id, target)
-  end
-
-  def cget_tkstring(key)
-    @t.tag_cget_tkstring(@id, key)
-  end
-  def cget(key)
-    @t.tag_cget(@id, key)
-  end
-  def cget_strict(key)
-    @t.tag_cget_strict(@id, key)
-  end
-  def configure(key, val=None)
-    @t.tag_configure(@id, key, val)
-  end
-  def configinfo(key=nil)
-    @t.tag_configinfo(@id, key)
-  end
-  def current_configinfo(key=nil)
-    @t.current_tag_configinfo(@id, key)
-  end
-end
-
-class Tk::TkTable::NamedCellTag < Tk::TkTable::CellTag
-  def self.new(parent, name, keys=nil)
-    obj = nil
-    CellTagID_TBL.mutex.synchronize{
-      if CellTagID_TBL[parent.path] && CellTagID_TBL[parent.path][name]
-        obj = CellTagID_TBL[parent.path][name]
-      else
-        #super(parent, name, keys)
-        (obj = self.allocate).instance_eval{
-          @parent = @t = parent
-          @tpath = parent.path
-          @path = @id = name
-          CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-          CellTagID_TBL[@tpath][@id] = self
-        }
-      end
-    }
-    obj.configure(keys) if keys && ! keys.empty?
-    obj
-  end
-
-  def initialize(parent, name, keys=nil)
-    # dummy:: not called by 'new' method
-    @parent = @t = parent
-    @tpath = parent.path
-    @path = @id = name
-    CellTagID_TBL.mutex.synchronize{
-      CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-      CellTagID_TBL[@tpath][@id] = self
-    }
-    configure(keys) if keys && ! keys.empty?
-  end
-end
-
-#####################################################
-
-class Tk::TkTable
-  TkCommandNames = ['table'.freeze].freeze
-  WidgetClassName = 'Table'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  include Scrollable
-  include Tk::TkTable::ConfigMethod
-  include Tk::ValidateConfigure
-
-  def __destroy_hook__
-    Tk::TkTable::CelTag::CellTagID_TBL.mutex.synchronize{
-      Tk::TkTable::CelTag::CellTagID_TBL.delete(@path)
-    }
-  end
-
-  def __boolval_optkeys
-    super() << 'autoclear' << 'flashmode' << 'invertselected' <<
-      'multiline' << 'selecttitle' << 'wrap'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'colseparator' << 'ellipsis' << 'rowseparator' << 'sparsearray'
-  end
-  private :__strval_optkeys
-
-
-  #################################
-
-  class BrowseCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?c, ?n, :column ],
-        [ ?C, ?s, :index ],
-        [ ?i, ?x, :cursor ],
-        [ ?r, ?n, :row ],
-        [ ?s, ?s, :last_index ],
-        [ ?S, ?s, :new_index ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?n, TkComm.method(:number) ],
-        [ ?x, TkComm.method(:num_or_str) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        val
-      end
-    end
-
-    def self._config_keys
-      ['browsecommand', 'browsecmd']
-    end
-  end
-  #--------------------------------
-  class CellCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?c, ?n, :column ],
-        [ ?C, ?s, :index ],
-        [ ?i, ?m, :rw_mode ],
-        [ ?r, ?n, :row ],
-        [ ?s, ?v, :value ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?n, TkComm.method(:number) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-        [ ?m, proc{|val| (val == '0')? (:r) : (:w)} ],
-        [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ],
-        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)
-        TkComm._get_eval_string(val)
-      end
-    end
-
-    def self._config_keys
-      ['command']
-    end
-  end
-  #--------------------------------
-  class SelectionCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?c, ?n, :sel_columns ],
-        [ ?C, ?s, :sel_area ],
-        [ ?i, ?n, :total ],
-        [ ?r, ?n, :sel_rows ],
-        [ ?s, ?s, :value ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?n, TkComm.method(:number) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        val.to_s
-      end
-    end
-
-    def self._config_keys
-      ['selectioncommand', 'selcmd']
-    end
-  end
-  #--------------------------------
-  class ValidateCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?c, ?n, :column ],
-        [ ?C, ?s, :index ],
-        [ ?i, ?x, :cursor ],
-        [ ?r, ?n, :row ],
-        [ ?s, ?v, :current_value ],
-        [ ?S, ?v, :new_value ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?n, TkComm.method(:number) ],
-        [ ?x, TkComm.method(:num_or_str) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-        [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ],
-        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
-      ['vcmd', 'validatecommand']
-    end
-  end
-
-  #################################
-
-  def __validation_class_list
-    super() <<
-      BrowseCommand << CellCommand << SelectionCommand << ValidateCommand
-  end
-
-  Tk::ValidateConfigure.__def_validcmd(binding, BrowseCommand)
-  Tk::ValidateConfigure.__def_validcmd(binding, CellCommand)
-  Tk::ValidateConfigure.__def_validcmd(binding, SelectionCommand)
-  Tk::ValidateConfigure.__def_validcmd(binding, ValidateCommand)
-
-  #################################
-
-  def activate(idx)
-    tk_send('activate', tagid(idx))
-  end
-
-  def bbox(idx)
-    list(tk_send('bbox', tagid(idx)))
-  end
-
-  def border_mark(x, y)
-    simplelist(tk_send('border', 'mark', x, y))
-  end
-  def border_mark_row(x, y)
-    tk_send('border', 'mark', x, y, 'row')
-  end
-  def border_mark_col(x, y)
-    tk_send('border', 'mark', x, y, 'col')
-  end
-  def border_dragto(x, y)
-    tk_send('border', 'dragto', x, y)
-  end
-
-  def clear_cache(first=None, last=None)
-    tk_send('clear', 'cache', tagid(first), tagid(last))
-    self
-  end
-  def clear_sizes(first=None, last=None)
-    tk_send('clear', 'sizes', tagid(first), tagid(last))
-    self
-  end
-  def clear_tags(first=None, last=None)
-    tk_send('clear', 'tags', tagid(first), tagid(last))
-    self
-  end
-  def clear_all(first=None, last=None)
-    tk_send('clear', 'all', tagid(first), tagid(last))
-    self
-  end
-
-  def curselection
-    simplelist(tk_send('curselection'))
-  end
-  def curselection=(val)
-    tk_send('curselection', val)
-    val
-  end
-
-  def curvalue
-    tk_tcl2ruby(tk_send('curvalue'), true, false)
-  end
-  def curvalue=(val)
-    tk_send('curvalue', val)
-    val
-  end
-
-  def delete_active(idx1, idx2=None)
-    tk_send('delete', 'active', tagid(idx1), tagid(idx2))
-    self
-  end
-  def delete_cols(*args) # ?switches_array?, index, ?count?
-    params = []
-    if args[0].kind_of?(Array)
-      switches = args.shift
-      switches.each{|k| params << "-#{k}"}
-    end
-    params << '--'
-    params << tagid(args.shift)
-    params.concat(args)
-    tk_send('delete', 'cols', *params)
-    self
-  end
-  def delete_rows(*args) # ?switches_array?, index, ?count?
-    params = []
-    if args[0].kind_of?(Array)
-      switches = args.shift
-      switches.each{|k| params << "-#{k}"}
-    end
-    params << '--'
-    params << tagid(args.shift)
-    params.concat(args)
-    tk_send('delete', 'rows', *params)
-    self
-  end
-
-  def get(idx)
-    tk_tcl2ruby(tk_send('get', tagid(idx)), true, false)
-  end
-  def get_area(idx1, idx2)
-    simplelist(tk_send('get', tagid(idx1), tagid(idx2))).collect{|v|
-      tk_tcl2ruby(v, true, false)
-    }
-  end
-
-  def height_list
-    list(tk_send('height'))
-  end
-  def height(row)
-    number(tk_send('height', row))
-  end
-  def set_height(*pairs)
-    tk_send('height', *(pairs.flatten))
-    self
-  end
-
-  def hidden_list
-    simplelist(tk_send('hidden'))
-  end
-  def hidden?(idx, *args)
-    if args.empty?
-      if (ret = tk_send('hidden', tagid(idx))) == ''
-        false
-      else
-        ret
-      end
-    else
-      bool(tk_send('hidden', tagid(idx), *(args.collect{|i| tagid(i)})))
-    end
-  end
-
-  def icursor
-    number(tk_send('icursor'))
-  end
-  def icursor_set(idx)
-    number(tk_send('icursor', tagid(idx)))
-  end
-
-  def index(idx)
-    tk_send('index', tagid(idx))
-  end
-  def row_index(idx)
-    number(tk_send('index', tagid(idx), 'row'))
-  end
-  def col_index(idx)
-    number(tk_send('index', tagid(idx), 'col'))
-  end
-
-  def insert_active(idx, val)
-    tk_send('insert', 'active', tagid(idx), val)
-    self
-  end
-  def insert_cols(*args) # ?switches_array?, index, ?count?
-    params = []
-    if args[0].kind_of?(Array)
-      switches = args.shift
-      switches.each{|k| params << "-#{k}"}
-    end
-    params << '--'
-    params.concat(args)
-    params << tagid(args.shift)
-    tk_send('insert', 'cols', *params)
-    self
-  end
-  def insert_rows(*args) # ?switches_array?, index, ?count?
-    params = []
-    if args[0].kind_of?(Array)
-      switches = args.shift
-      switches.each{|k| params << "-#{k}"}
-    end
-    params << '--'
-    params << tagid(args.shift)
-    params.concat(args)
-    tk_send('insert', 'rows', *params)
-    self
-  end
-
-  # def postscript(*args)
-  #   tk_send('postscript', *args)
-  # end
-
-  def reread
-    tk_send('reread')
-    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', tagid(idx))
-    self
-  end
-
-  def selection_anchor(idx)
-    tk_send('selection', 'anchor', tagid(idx))
-    self
-  end
-  def selection_clear(first, last=None)
-    tk_send('selection', 'clear', tagid(first), tagid(last))
-    self
-  end
-  def selection_clear_all
-    selection_clear('all')
-  end
-  def selection_include?(idx)
-    bool(tk_send('selection', 'includes', tagid(idx)))
-  end
-  def selection_present
-    bool(tk_send('selection', 'present'))
-  end
-  def selection_set(first, last=None)
-    tk_send('selection', 'set', tagid(first), tagid(last))
-    self
-  end
-
-  def set(*pairs) # idx, val, idx, val, ...
-    args = []
-    0.step(pairs.size-1, 2){|i|
-      args << tagid(pairs[i])
-      args << pairs[i+1]
-    }
-    tk_send('set', *args)
-    self
-  end
-  def set_row(*pairs) # idx, val, idx, val, ...
-    args = []
-    0.step(pairs.size-1, 2){|i|
-      args << tagid(pairs[i])
-      args << pairs[i+1]
-    }
-    tk_send('set', 'row', *args)
-    self
-  end
-  def set_col(*pairs) # idx, val, idx, val, ...
-    args = []
-    0.step(pairs.size-1, 2){|i|
-      args << tagid(pairs[i])
-      args << pairs[i+1]
-    }
-    tk_send('set', 'col', *args)
-    self
-  end
-=begin
-  def set(*pairs) # idx, val, idx, val, ...  OR [idx, val], [idx, val], ...
-    if pairs[0].kind_of?(Array)
-      # [idx, val], [idx, val], ...
-      args = []
-      pairs.each{|idx, val| args << tagid(idx) << val }
-      tk_send('set', *args)
-    else
-      # idx, val, idx, val, ...
-      args = []
-      0.step(pairs.size-1, 2){|i|
-        args << tagid(pairs[i])
-        args << pairs[i+1]
-      }
-      tk_send('set', *args)
-    end
-    self
-  end
-  def set_row(*pairs)
-    if pairs[0].kind_of?(Array)
-      # [idx, val], [idx, val], ...
-      args = []
-      pairs.each{|idx, val| args << tagid(idx) << val }
-      tk_send('set', 'row', *args)
-    else
-      # idx, val, idx, val, ...
-      args = []
-      0.step(pairs.size-1, 2){|i|
-        args << tagid(pairs[i])
-        args << pairs[i+1]
-      }
-      tk_send('set', 'row', *args)
-    end
-    self
-  end
-  def set_col(*pairs)
-    if pairs[0].kind_of?(Array)
-      # [idx, val], [idx, val], ...
-      args = []
-      pairs.each{|idx, val| args << idx << val }
-      tk_send('set', 'col', *args)
-    else
-      # idx, val, idx, val, ...
-      args = []
-      0.step(pairs.size-1, 2){|i|
-        args << tagid(pairs[i])
-        args << pairs[i+1]
-      }
-      tk_send('set', 'col', *args)
-    end
-    self
-  end
-=end
-
-  def spans
-    simplelist(tk_send('spans')).collect{|inf|
-      lst = simplelist(inf)
-      idx = lst[0]
-      rows, cols = lst[1].split(',').map!{|n| Integer(n)}
-      [idx [rows, cols]]
-    }
-  end
-  alias span_list spans
-  def span(idx)
-    lst = simplelist(tk_send('spans', tagid(idx)))
-    idx = lst[0]
-    rows, cols = lst[1].split(',').map!{|n| Integer(n)}
-    [idx [rows, cols]]
-  end
-  def set_spans(*pairs)
-    # idx, val, idx, val, ...
-    args = []
-    0.step(pairs.size-1, 2){|i|
-      args << tagid(pairs[i])
-      val = pairs[i+1]
-      if val.kind_of?(Array)
-        args << val.join(',')
-      else
-        args << val
-      end
-    }
-    tk_send('spans', *args)
-    self
-  end
-=begin
-  def set_spans(*pairs)
-    if pairs[0].kind_of?(Array)
-      # [idx, val], [idx, val], ...
-      args = []
-      pairs.each{|idx, val|
-        args << tagid(idx)
-        if val.kind_of?(Array)
-          args << val.join(',')
-        else
-          args << val
-        end
-      }
-      tk_send('spans', *args)
-    else
-      # idx, val, idx, val, ...
-      args = []
-      0.step(pairs.size-1, 2){|i|
-        args << tagid(pairs[i])
-        val = pairs[i+1]
-        if val.kind_of?(Array)
-          args << val.join(',')
-        else
-          args << val
-        end
-      }
-      tk_send('spans', *args)
-    end
-    self
-  end
-=end
-
-  def tagid(tag)
-    if tag.kind_of?(Tk::TkTable::CellTag)
-      tag.id
-    elsif tag.kind_of?(Array)
-      if tag[0].kind_of?(Integer) && tag[1].kind_of?(Integer)
-        # [row, col]
-        tag.join(',')
-      else
-        tag
-      end
-    else
-      tag
-    end
-  end
-
-  def tagid2obj(tagid)
-    Tk::TkTable::CellTag::CellTagID_TBL.mutex.synchronize{
-      if Tk::TkTable::CellTag::CellTagID_TBL.key?(@path)
-        if Tk::TkTable::CellTag::CellTagID_TBL[@path].key?(tagid)
-          Tk::TkTable::CellTag::CellTagID_TBL[@path][tagid]
-        else
-          tagid
-        end
-      else
-        tagid
-      end
-    }
-  end
-
-  def tag_cell(tag, *cells)
-    tk_send('tag', 'cell', tagid(tag), *(cells.collect{|idx| tagid(idx)}))
-    self
-  end
-  def tag_reset(*cells)
-    tk_send('tag', 'cell', '', *(cells.collect{|idx| tagid(idx)}))
-    self
-  end
-  def tag_col(tag, *cols)
-    tk_send('tag', 'col', tagid(tag), *cols)
-    self
-  end
-  def tag_col_reset(*cols)
-    tk_send('tag', 'col', '', *cols)
-    self
-  end
-  def tag_delete(tag)
-    tk_send('tag', 'delete', tagid(tag))
-    Tk::TkTable::CellTag::CellTagID_TBL.mutex.synchronize{
-      if Tk::TkTable::CellTag::CellTagID_TBL[@path]
-        if tag.kind_of? Tk::TkTable::CellTag
-          Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag.id)
-        else
-          Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag)
-        end
-      end
-    }
-    self
-  end
-  def tag_exist?(tag)
-    bool(tk_send('tag', 'exists', tagid(tag)))
-  end
-  def tag_include?(tag, idx)
-    bool(tk_send('tag', 'includes', tagid(tag), tagid(idx)))
-  end
-  def tag_lower(tag, target=None)
-    tk_send('tag', 'lower', tagid(tag), tagid(target))
-    self
-  end
-  def tag_names(pat=None)
-    simplelist(tk_send('tag', 'names', pat)).collect{|tag| tagid2obj(tag)}
-  end
-  def tag_raise(tag, target=None)
-    tk_send('tag', 'raise', tagid(tag), tagid(target))
-    self
-  end
-  def tag_row(tag, *rows)
-    tk_send('tag', 'row', tagid(tag), *rows)
-    self
-  end
-  def tag_row_reset(*rows)
-    tk_send('tag', 'row', '', *rows)
-    self
-  end
-
-  def validate(idx)
-    bool(tk_send('validate', tagid(idx)))
-  end
-
-  def width_list
-    list(tk_send('width'))
-  end
-  def width(row)
-    number(tk_send('width', row))
-  end
-  def set_width(*pairs)
-    tk_send('width', *(pairs.flatten))
-    self
-  end
-
-  def window_delete(*args)
-    tk_send('window', 'delete', *(args.collect{|idx| tagid(idx)}))
-    self
-  end
-  def window_move(from_idx, to_idx)
-    tk_send('window', 'move', tagid(from_idx), tagid(to_idx))
-    self
-  end
-  def window_names(pat=None)
-    simplelist(tk_send('window', 'names', pat))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tktrans.rb b/ext/tk/lib/tkextlib/tktrans.rb
deleted file mode 100644
index c5de5be5e6..0000000000
--- a/ext/tk/lib/tkextlib/tktrans.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#  TkTrans support (win32 only)
-#                               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/tktrans/setup.rb'
-
-# load library
-require 'tkextlib/tktrans/tktrans'
diff --git a/ext/tk/lib/tkextlib/tktrans/setup.rb b/ext/tk/lib/tkextlib/tktrans/setup.rb
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/tktrans/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/tktrans/tktrans.rb b/ext/tk/lib/tkextlib/tktrans/tktrans.rb
deleted file mode 100644
index e051c09211..0000000000
--- a/ext/tk/lib/tkextlib/tktrans/tktrans.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#  TkTrans support (win32 only)
-#                               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/tktrans/setup.rb'
-
-TkPackage.require('tktrans') rescue Tk.load_tcllibrary('tktrans')
-
-module Tk
-  module TkTrans
-    PACKAGE_NAME = 'tktrans'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('tktrans')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-class TkWindow
-  def tktrans_set_image(img)
-    tk_send('tktrans::setwidget', @path, img)
-    self
-  end
-  def tktrans_get_image()
-    tk_send('tktrans::setwidget', @path)
-  end
-end
-
-class Tk::Root
-  undef tktrans_set_image, tktrans_get_image
-
-  def tktrans_set_image(img)
-    tk_send('tktrans::settoplevel', @path, img)
-    self
-  end
-  def tktrans_get_image()
-    tk_send('tktrans::settoplevel', @path)
-  end
-end
-
-class Tk::Toplevel
-  undef tktrans_set_image, tktrans_get_image
-
-  def tktrans_set_image(img)
-    tk_send('tktrans::settoplevel', @path, img)
-    self
-  end
-  def tktrans_get_image()
-    tk_send('tktrans::settoplevel', @path)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/treectrl.rb b/ext/tk/lib/tkextlib/treectrl.rb
deleted file mode 100644
index 1944fb83e3..0000000000
--- a/ext/tk/lib/tkextlib/treectrl.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  TkTreeCtrl 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/treectrl/setup.rb'
-
-# load library
-require 'tkextlib/treectrl/tktreectrl'
diff --git a/ext/tk/lib/tkextlib/treectrl/setup.rb b/ext/tk/lib/tkextlib/treectrl/setup.rb
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/treectrl/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/treectrl/tktreectrl.rb b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
deleted file mode 100644
index 1879a531ae..0000000000
--- a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
+++ /dev/null
@@ -1,2522 +0,0 @@
-#
-#  tkextlib/treectrl/tktreectrl.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/treectrl/setup.rb'
-
-# TkPackage.require('treectrl', '1.0')
-# TkPackage.require('treectrl', '1.1')
-TkPackage.require('treectrl')
-
-module Tk
-  class TreeCtrl < TkWindow
-    BindTag_FileList = TkBindTag.new_by_name('TreeCtrlFileList')
-
-    PACKAGE_NAME = 'treectrl'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('treectrl')
-      rescue
-        ''
-      end
-    end
-
-    HasColumnCreateCommand =
-      (TkPackage.vcompare(self.package_version, '1.1') >= 0)
-
-    # dummy ::
-    #  pkgIndex.tcl of TreeCtrl-1.0 doesn't support auto_load for
-    #  'loupe' command (probably it is bug, I think).
-    #  So, calling a 'treectrl' command for loading the dll with
-    #  the auto_load facility.
-    begin
-      tk_call('treectrl')
-    rescue
-    end
-    def self.loupe(img, x, y, w, h, zoom)
-      # NOTE: platform == 'unix' only
-
-      # img  => TkPhotoImage
-      # x, y => screen coords
-      # w, h => magnifier width and height
-      # zoom => zooming rate
-      Tk.tk_call_without_enc('loupe', img, x, y, w, h, zoom)
-    end
-
-    def self.text_layout(font, text, keys={})
-      TkComm.list(Tk.tk_call_without_enc('textlayout', font, text, keys))
-    end
-
-    def self.image_tint(img, color, alpha)
-      Tk.tk_call_without_enc('imagetint', img, color, alpha)
-    end
-
-    class NotifyEvent < TkUtil::CallbackSubst
-    end
-
-    module ConfigMethod
-    end
-  end
-  TreeCtrl_Widget = TreeCtrl
-end
-
-##############################################
-
-class Tk::TreeCtrl::NotifyEvent
-  # [ <'%' subst-key char>, <proc type char>, <instance var (accessor) name>]
-  KEY_TBL = [
-    [ ?c, ?n, :item_num ],
-    [ ?d, ?s, :detail ],
-    [ ?D, ?l, :items ],
-    [ ?e, ?e, :event ],
-    [ ?I, ?n, :id ],
-    [ ?l, ?n, :lower_bound ],
-    [ ?p, ?n, :active_id ],
-    [ ?P, ?e, :pattern ],
-    [ ?S, ?l, :sel_items ],
-    [ ?T, ?w, :widget ],
-    [ ?u, ?n, :upper_bound ],
-    [ ?W, ?o, :object ],
-    [ ??, ?x, :parm_info ],
-    nil
-  ]
-
-  # [ <proc type char>, <proc/method to convert tcl-str to ruby-obj>]
-  PROC_TBL = [
-    [ ?n, TkComm.method(:num_or_str) ],
-    [ ?s, TkComm.method(:string) ],
-    [ ?l, TkComm.method(:list) ],
-    [ ?w, TkComm.method(:window) ],
-
-    [ ?e, proc{|val|
-        case val
-        when /^<<[^<>]+>>$/
-          TkVirtualEvent.getobj(val[1..-2])
-        when /^<[^<>]+>$/
-          val[1..-2]
-        else
-          val
-        end
-      }
-    ],
-
-    [ ?o, proc{|val| TkComm.tk_tcl2ruby(val)} ],
-
-    [ ?x, proc{|val|
-        begin
-          inf = {}
-          Hash[*(TkComm.list(val))].each{|k, v|
-            if keyinfo = KEY_TBL.assoc(k[0])
-              if cmd = PROC_TBL.assoc(keyinfo[1])
-                begin
-                  new_v = cmd.call(v)
-                  v = new_v
-                rescue
-                end
-              end
-            end
-            inf[k] = v
-          }
-          inf
-        rescue
-          val
-        end
-      } ],
-
-    nil
-  ]
-
-=begin
-  # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-  KEY_TBL.map!{|inf|
-    if inf.kind_of?(Array)
-      inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-      inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-    end
-    inf
-  }
-
-  PROC_TBL.map!{|inf|
-    if inf.kind_of?(Array)
-      inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-    end
-    inf
-  }
-=end
-
-  # setup tables to be used by scan_args, _get_subst_key, _get_all_subst_keys
-  #
-  #     _get_subst_key() and _get_all_subst_keys() generates key-string
-  #     which describe how to convert callback arguments to ruby objects.
-  #     When binding parameters are given, use _get_subst_key().
-  #     But when no parameters are given, use _get_all_subst_keys() to
-  #     create a Event class object as a callback parameter.
-  #
-  #     scan_args() is used when doing callback. It convert arguments
-  #     ( which are Tcl strings ) to ruby objects based on the key string
-  #     that is generated by _get_subst_key() or _get_all_subst_keys().
-  #
-  _setup_subst_table(KEY_TBL, PROC_TBL);
-end
-
-##############################################
-
-module Tk::TreeCtrl::ConfigMethod
-  include TkItemConfigMethod
-
-  def treectrl_tagid(key, obj)
-    if key.kind_of?(Array)
-      key = key.join(' ')
-    else
-      key = key.to_s
-    end
-
-    if (obj.kind_of?(Tk::TreeCtrl::Column) ||
-        obj.kind_of?(Tk::TreeCtrl::Element) ||
-        obj.kind_of?(Tk::TreeCtrl::Item) ||
-        obj.kind_of?(Tk::TreeCtrl::Style))
-      obj = obj.id
-    end
-
-    case key
-    when 'column'
-      obj
-
-    when 'debug'
-      None
-
-    when 'dragimage'
-      None
-
-    when 'element'
-      obj
-
-    when 'item element'
-      obj
-
-    when 'marquee'
-      None
-
-    when 'notify'
-      obj
-
-    when 'style'
-      obj
-
-    else
-      obj
-    end
-  end
-
-  def tagid(mixed_id)
-    if mixed_id == 'debug'
-      ['debug', None]
-    elsif mixed_id == 'dragimage'
-      ['dragimage', None]
-    elsif mixed_id == 'marquee'
-      ['marquee', None]
-    elsif mixed_id.kind_of?(Array)
-      [mixed_id[0], treectrl_tagid(*mixed_id)]
-    else
-      tagid(mixed_id.split(':'))
-    end
-  end
-
-  def __item_cget_cmd(mixed_id)
-    if mixed_id[0] == 'column' && mixed_id[1] == 'drag'
-      return [self.path, 'column', 'dragcget']
-    end
-
-    if mixed_id[1].kind_of?(Array)
-      id = mixed_id[1]
-    else
-      id = [mixed_id[1]]
-    end
-
-    if mixed_id[0].kind_of?(Array)
-      ([self.path].concat(mixed_id[0]) << 'cget').concat(id)
-    else
-      [self.path, mixed_id[0], 'cget'].concat(id)
-    end
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(mixed_id)
-    if mixed_id[0] == 'column' && mixed_id[1] == 'drag'
-      return [self.path, 'column', 'dragconfigure']
-    end
-
-    if mixed_id[1].kind_of?(Array)
-      id = mixed_id[1]
-    else
-      id = [mixed_id[1]]
-    end
-
-    if mixed_id[0].kind_of?(Array)
-      ([self.path].concat(mixed_id[0]) << 'configure').concat(id)
-    else
-      [self.path, mixed_id[0], 'configure'].concat(id)
-    end
-  end
-  private :__item_config_cmd
-
-  def __item_pathname(id)
-    if id.kind_of?(Array)
-      key = id[0]
-      if key.kind_of?(Array)
-        key = key.join(' ')
-      end
-
-      tag = id[1]
-      if tag.kind_of?(Array)
-        tag = tag.join(' ')
-      end
-
-      id = [key, tag].join(':')
-    end
-    [self.path, id].join(';')
-  end
-  private :__item_pathname
-
-  def __item_configinfo_struct(id)
-    if id.kind_of?(Array) && id[0].to_s == 'notify'
-      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
-        :default_value=>nil, :current_value=>1}
-    else
-      {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
-        :default_value=>3, :current_value=>4}
-    end
-  end
-  private :__item_configinfo_struct
-
-
-  def __item_font_optkeys(id)
-    if id.kind_of?(Array) && (id[0] == 'element' ||
-                              (id[0].kind_of?(Array) && id[0][1] == 'element'))
-      []
-    else
-      ['font']
-    end
-  end
-  private :__item_font_optkeys
-
-  def __item_numstrval_optkeys(id)
-    if id == 'debug'
-      ['displaydelay']
-    else
-      super(id)
-    end
-  end
-  private :__item_numstrval_optkeys
-
-  def __item_boolval_optkeys(id)
-    if id == 'debug'
-      ['data', 'display', 'enable', 'span', 'textlayout']
-    elsif id == 'dragimage'
-      ['visible']
-    elsif id == 'marquee'
-      ['visible']
-    elsif id.kind_of?(Array)
-      case id[0]
-      when 'item'
-        ['visible', 'wrap', 'open', 'returnid', 'visible']
-      when 'column'
-        if id[1] == 'drag'
-          ['enable']
-        else
-          ['button', 'expand', 'resize', 'squeeze', 'sunken',
-            'visible', 'widthhack']
-        end
-      when 'element'
-        ['draw', 'filled', 'showfocus', 'clip', 'destroy']
-      when 'notify'
-        ['active']
-      when 'style'
-        ['detach', 'indent', 'visible']
-      else
-        if id[0].kind_of?(Array) && id[0][1] == 'element'
-          ['filled', 'showfocus']
-        else
-          super(id)
-        end
-      end
-    else
-      super(id)
-    end
-  end
-  private :__item_boolval_optkeys
-
-  def __item_strval_optkeys(id)
-    if id == 'debug'
-      ['erasecolor']
-    elsif id.kind_of?(Array)
-      case id[0]
-      when 'column'
-        if id[1] == 'drag'
-          ['indicatorcolor']
-        else
-          super(id) << 'textcolor'
-        end
-      when 'element'
-        super(id) << 'fill' << 'outline' << 'format'
-      else
-        super(id)
-      end
-    else
-      super(id)
-    end
-  end
-  private :__item_strval_optkeys
-
-  def __item_listval_optkeys(id)
-    if id.kind_of?(Array)
-      case id[0]
-      when 'column'
-        ['itembackground']
-      when 'element'
-        ['relief']
-      when 'style'
-        ['union']
-      else
-        if id[0].kind_of?(Array) && id[0][1] == 'element'
-          ['relief']
-        else
-          []
-        end
-      end
-    else
-      []
-    end
-  end
-  private :__item_listval_optkeys
-
-  def __item_val2ruby_optkeys(id)
-    if id.kind_of?(Array)
-      case id[0]
-      when 'item'
-        { 'button' => proc{|id,val| (val == 'auto')? val: TkComm.bool(val)} }
-      else
-        []
-      end
-    else
-      []
-    end
-  end
-  private :__item_val2ruby_optkeys
-
-  def __item_keyonly_optkeys(id)  # { def_key=>(undef_key|nil), ... }
-    {
-      'notreally'=>nil,
-      'increasing'=>'decreasing',
-      'decreasing'=>'increasing',
-      'ascii'=>nil,
-      'dictionary'=>nil,
-      'integer'=>nil,
-      'real'=>nil
-    }
-  end
-  private :__item_keyonly_optkeys
-
-  def column_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['column', tagOrId], option)
-  end
-  def column_cget(tagOrId, option)
-    itemcget(['column', tagOrId], option)
-  end
-  def column_cget_strict(tagOrId, option)
-    itemcget_strict(['column', tagOrId], option)
-  end
-  def column_configure(tagOrId, slot, value=None)
-    itemconfigure(['column', tagOrId], slot, value)
-  end
-  def column_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['column', tagOrId], slot)
-  end
-  def current_column_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['column', tagOrId], slot)
-  end
-
-  def column_dragcget_tkstring(option)
-    itemcget_tkstring(['column', 'drag'], option)
-  end
-  def column_dragcget(option)
-    itemcget(['column', 'drag'], option)
-  end
-  def column_dragcget_strict(option)
-    itemcget_strict(['column', 'drag'], option)
-  end
-  def column_dragconfigure(slot, value=None)
-    itemconfigure(['column', 'drag'], slot, value)
-  end
-  def column_dragconfiginfo(slot=nil)
-    itemconfiginfo(['column', 'drag'], slot)
-  end
-  def current_column_dragconfiginfo(slot=nil)
-    current_itemconfiginfo(['column', 'drag'], slot)
-  end
-
-  def debug_cget_tkstring(option)
-    itemcget_tkstring('debug', option)
-  end
-  def debug_cget(option)
-    itemcget('debug', option)
-  end
-  def debug_cget_strict(option)
-    itemcget_strict('debug', option)
-  end
-  def debug_configure(slot, value=None)
-    itemconfigure('debug', slot, value)
-  end
-  def debug_configinfo(slot=nil)
-    itemconfiginfo('debug', slot)
-  end
-  def current_debug_configinfo(slot=nil)
-    current_itemconfiginfo('debug', slot)
-  end
-
-  def dragimage_cget_tkstring(option)
-    itemcget_tkstring('dragimage', option)
-  end
-  def dragimage_cget(option)
-    itemcget('dragimage', option)
-  end
-  def dragimage_cget_strict(option)
-    itemcget_strict('dragimage', option)
-  end
-  def dragimage_configure(slot, value=None)
-    itemconfigure('dragimage', slot, value)
-  end
-  def dragimage_configinfo(slot=nil)
-    itemconfiginfo('dragimage', slot)
-  end
-  def current_dragimage_configinfo(slot=nil)
-    current_itemconfiginfo('dragimage', slot)
-  end
-
-  def element_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['element', tagOrId], option)
-  end
-  def element_cget(tagOrId, option)
-    itemcget(['element', tagOrId], option)
-  end
-  def element_cget_strict(tagOrId, option)
-    itemcget_strict(['element', tagOrId], option)
-  end
-  def element_configure(tagOrId, slot, value=None)
-    itemconfigure(['element', tagOrId], slot, value)
-  end
-  def element_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['element', tagOrId], slot)
-  end
-  def current_element_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['element', tagOrId], slot)
-  end
-
-  def item_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['item', tagOrId], option)
-  end
-  def item_cget(tagOrId, option)
-    itemcget(['item', tagOrId], option)
-  end
-  def item_cget_strict(tagOrId, option)
-    itemcget_strict(['item', tagOrId], option)
-  end
-  def item_configure(tagOrId, slot, value=None)
-    itemconfigure(['item', tagOrId], slot, value)
-  end
-  def item_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['item', tagOrId], slot)
-  end
-  def current_item_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['item', tagOrId], slot)
-  end
-
-  def item_element_cget_tkstring(item, column, elem, option)
-    itemcget_tkstring([['item', 'element'], [item, column, elem]], option)
-  end
-  def item_element_cget(item, column, elem, option)
-    itemcget([['item', 'element'], [item, column, elem]], option)
-  end
-  def item_element_cget_strict(item, column, elem, option)
-    itemcget_strict([['item', 'element'], [item, column, elem]], option)
-  end
-  def item_element_configure(item, column, elem, slot, value=None)
-    itemconfigure([['item', 'element'], [item, column, elem]], slot, value)
-  end
-  def item_element_configinfo(item, column, elem, slot=nil)
-    itemconfiginfo([['item', 'element'], [item, column, elem]], slot)
-  end
-  def current_item_element_configinfo(item, column, elem, slot=nil)
-    current_itemconfiginfo([['item', 'element'], [item, column, elem]], slot)
-  end
-
-  def marquee_cget_tkstring(option)
-    itemcget_tkstring('marquee', option)
-  end
-  def marquee_cget(option)
-    itemcget('marquee', option)
-  end
-  def marquee_cget_strict(option)
-    itemcget_strict('marquee', option)
-  end
-  def marquee_configure(slot, value=None)
-    itemconfigure('marquee', slot, value)
-  end
-  def marquee_configinfo(slot=nil)
-    itemconfiginfo('marquee', slot)
-  end
-  def current_marquee_configinfo(slot=nil)
-    current_itemconfiginfo('marquee', slot)
-  end
-
-  def notify_cget_tkstring(win, pattern, option)
-    pattern = "<#{pattern}>"
-    # "notify" doesn't have cget subcommand.
-    tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(['notify', [win, pattern]])) << "-#{option}")), false, true)[-1]
-  end
-  def notify_cget(win, pattern, option)
-    pattern = "<#{pattern}>"
-    # "notify" doesn't have cget subcommand.
-    current_itemconfiginfo(['notify', [win, pattern]])[option.to_s]
-  end
-  def notify_cget_strict(win, pattern, option)
-    pattern = "<#{pattern}>"
-    # "notify" doesn't have cget subcommand.
-    info = current_itemconfiginfo(['notify', [win, pattern]])
-    option = option.to_s
-    unless info.has_key?(option)
-      fail RuntimeError, "unknown option \"#{option}\""
-    else
-      info[option]
-    end
-  end
-  def notify_configure(win, pattern, slot, value=None)
-    pattern = "<#{pattern}>"
-    itemconfigure(['notify', [win, pattern]], slot, value)
-  end
-  def notify_configinfo(win, pattern, slot=nil)
-    pattern = "<#{pattern}>"
-    itemconfiginfo(['notify', [win, pattern]], slot)
-  end
-  def current_notify_configinfo(tagOrId, slot=nil)
-    pattern = "<#{pattern}>"
-    current_itemconfiginfo(['notify', [win, pattern]], slot)
-  end
-
-  def style_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['style', tagOrId], option)
-  end
-  def style_cget(tagOrId, option)
-    itemcget(['style', tagOrId], option)
-  end
-  def style_cget_strict(tagOrId, option)
-    itemcget_strict(['style', tagOrId], option)
-  end
-  def style_configure(tagOrId, slot, value=None)
-    itemconfigure(['style', tagOrId], slot, value)
-  end
-  def style_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['style', tagOrId], slot)
-  end
-  def current_style_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['style', tagOrId], slot)
-  end
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-end
-
-##############################################
-
-class Tk::TreeCtrl
-  include Tk::TreeCtrl::ConfigMethod
-  include Scrollable
-
-  TkCommandNames = ['treectrl'.freeze].freeze
-  WidgetClassName = 'TreeCtrl'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  #########################
-
-  def __destroy_hook__
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.delete(@path)
-    }
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.delete(@path)
-    }
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.delete(@path)
-    }
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.delete(@path)
-    }
-  end
-
-  #########################
-
-  def __strval_optkeys
-    super() + [
-      'buttoncolor', 'columnprefix', 'itemprefix', 'linecolor'
-    ]
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    [
-      'itemwidthequal', 'usetheme',
-      'showbuttons', 'showheader', 'showlines', 'showroot',
-      'showrootbutton', 'showrootlines', 'showrootchildbuttons'
-    ]
-  end
-  private :__boolval_optkeys
-
-  def __listval_optkeys
-    [ 'defaultstyle' ]
-  end
-  private :__listval_optkeys
-
-  #########################
-
-  def install_bind(cmd, *args)
-    install_bind_for_event_class(Tk::TreeCtrl::NotifyEvent, cmd, *args)
-  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 activate(desc)
-    tk_send('activate', desc)
-    self
-  end
-
-  def canvasx(x)
-    number(tk_send('canvasx', x))
-  end
-
-  def canvasy(y)
-    number(tk_send('canvasy', y))
-  end
-
-  def collapse(*dsc)
-    tk_send_without_enc('collapse', *(dsc.map!{|d| _get_eval_string(d, true)}))
-    self
-  end
-
-  def collapse_recurse(*dsc)
-    tk_send_without_enc('collapse', '-recurse',
-                        *(dsc.map!{|d| _get_eval_string(d, true)}))
-    self
-  end
-
-  def column_bbox(idx)
-    list(tk_send('column', 'bbox', idx))
-  end
-
-  def column_compare(column1, op, column2)
-    bool(tk_send('column', 'compare', column1, op, column2))
-  end
-
-  def column_count
-    num_or_str(tk_send('column', 'count'))
-  end
-
-  def column_create(keys=nil)
-    if keys && keys.kind_of?(Hash)
-      num_or_str(tk_send('column', 'create', *hash_kv(keys)))
-    else
-      num_or_str(tk_send('column', 'create'))
-    end
-  end
-
-  def column_delete(idx)
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path]
-        Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path].delete(idx)
-      end
-    }
-    tk_send('column', 'delete', idx)
-    self
-  end
-
-  def column_index(idx)
-    num_or_str(tk_send('column', 'index', idx))
-  end
-
-  def column_id(idx)
-    tk_send('column', 'id', idx)
-  end
-
-  def column_list(visible=false)
-    if visible
-      simplelist(tk_send('column', 'list', '-visible'))
-    else
-      simplelist(tk_send('column', 'list'))
-    end
-  end
-  def column_visible_list
-    column_list(true)
-  end
-
-  def column_move(idx, before)
-    tk_send('column', 'move', idx, before)
-    self
-  end
-
-  def column_needed_width(idx)
-    num_or_str(tk_send('column', 'neededwidth', idx))
-  end
-  alias column_neededwidth column_needed_width
-
-  def column_order(column, visible=false)
-    if visible
-      num_or_str(tk_send('column', 'order', column, '-visible'))
-    else
-      num_or_str(tk_send('column', 'order', column))
-    end
-  end
-  def column_visible_order(column)
-    column_order(column, true)
-  end
-
-  def column_width(idx)
-    num_or_str(tk_send('column', 'width', idx))
-  end
-
-  def compare(item1, op, item2)
-    bool(tk_send('compare', item1, op, item2))
-  end
-
-  def contentbox()
-    list(tk_send('contentbox'))
-  end
-
-  def depth(item=None)
-    num_or_str(tk_send_without_enc('depth', _get_eval_string(item, true)))
-  end
-
-  def dragimage_add(item, *args)
-    tk_send('dragimage', 'add', item, *args)
-    self
-  end
-
-  def dragimage_clear()
-    tk_send('dragimage', 'clear')
-    self
-  end
-
-  def dragimage_offset(*args) # x, y
-    if args.empty?
-      list(tk_send('dragimage', 'offset'))
-    else
-      tk_send('dragimage', 'offset', *args)
-      self
-    end
-  end
-
-  def dragimage_visible(*args) # mode
-    if args..empty?
-      bool(tk_send('dragimage', 'visible'))
-    else
-      tk_send('dragimage', 'visible', *args)
-      self
-    end
-  end
-  def dragimage_visible?
-    dragimage_visible()
-  end
-
-  def debug_dinfo
-    tk_send('debug', 'dinfo')
-    self
-  end
-
-  def debug_scroll
-    tk_send('debug', 'scroll')
-  end
-
-  def element_create(elem, type, keys=nil)
-    if keys && keys.kind_of?(Hash)
-      tk_send('element', 'create', elem, type, *hash_kv(keys))
-    else
-      tk_send('element', 'create', elem, type)
-    end
-  end
-
-  def element_delete(*elems)
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path]
-        elems.each{|elem|
-          Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path].delete(elem)
-        }
-      end
-    }
-    tk_send('element', 'delete', *elems)
-    self
-  end
-
-  def element_names()
-    list(tk_send('element', 'names')).collect!{|elem|
-      Tk::TreeCtrl::Element.id2obj(self, elem)
-    }
-  end
-
-  def _conv_element_perstate_val(opt, val)
-    case opt
-    when 'background', 'foreground', 'fill', 'outline', 'format'
-      val
-    when 'draw', 'filled', 'showfocus', 'destroy'
-      bool(val)
-    else
-      tk_tcl2ruby(val)
-    end
-  end
-  private :_conv_element_perstate_val
-
-  def element_perstate(elem, opt, st_list)
-    tk_send('element', 'perstate', elem, "-{opt}", st_list)
-  end
-
-  def element_type(elem)
-    tk_send('element', 'type', elem)
-  end
-
-  def element_class(elem)
-    Tk::TreeCtrl::Element.type2class(element_type(elem))
-  end
-
-  def expand(*dsc)
-    tk_send('expand', *dsc)
-    self
-  end
-
-  def expand_recurse(*dsc)
-    tk_send('expand', '-recurse', *dsc)
-    self
-  end
-
-  def identify(x, y)
-    lst = list(tk_send('identify', x, y))
-
-    if lst[0] == 'item'
-      lst[1] = Tk::TreeCtrl::Item.id2obj(self, lst[1])
-      size = lst.size
-      i = 2
-      while i < size
-        case lst[i]
-        when 'line'
-          i += 1
-          lst[i] = Tk::TreeCtrl::Item.id2obj(self, lst[i])
-          i += 1
-
-        when 'button'
-          i += 1
-
-        when 'column'
-          i += 2
-
-        when 'elem'
-          i += 1
-          lst[i] = Tk::TreeCtrl::Element.id2obj(self, lst[i])
-          i += 1
-
-        else
-          i += 1
-        end
-      end
-    end
-
-    lst
-  end
-
-  def index(idx)
-    num_or_str(tk_send('index', idx))
-  end
-
-  def item_ancestors(item)
-    list(tk_send('item', 'ancestors', item)).collect!{|id|
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    }
-  end
-
-  def item_bbox(item, *args)
-    list(tk_send('item', 'bbox', item, *args))
-  end
-
-  def item_children(item)
-    list(tk_send('item', 'children', item)).collect!{|id|
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    }
-  end
-
-  def item_collapse(item)
-    tk_send_without_enc('item', 'collapse', _get_eval_string(item, true))
-    self
-  end
-
-  def item_collapse_recurse(item)
-    tk_send_without_enc('item', 'collapse',
-                        _get_eval_string(item, true), '-recurse')
-    self
-  end
-
-  def item_compare(item1, op, item2)
-    bool(tk_send('item', 'compare', item1, op, item2))
-  end
-
-  def item_complex(item, *args)
-    tk_send_without_enc('item', 'complex',
-                        _get_eval_string(item, true),
-                        *(args.map!{|arg| _get_eval_string(arg, true)}))
-    self
-  end
-
-  def item_count
-    num_or_str(tk_send('item', 'count'))
-  end
-
-  def item_create(keys={})
-    num_or_str(tk_send_without_enc('item', 'create', *hash_kv(keys, true)))
-  end
-
-  def _erase_children(item)
-    item_children(item).each{|i| _erase_children(i)}
-    # table is already locked
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].delete(item)
-  end
-  private :_erase_children
-
-  def item_delete(first, last=None)
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path]
-        if first == 'all' || first == :all || last == 'all' || last == :all
-          Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].clear
-        elsif last == None
-          _erase_children(first)
-        else
-          self.range(first, last).each{|id|
-            _erase_children(id)
-          }
-        end
-      end
-    }
-    tk_send('item', 'delete', first, last)
-    self
-  end
-
-  def item_dump(item)
-    list(tk_send('item', 'dump', item))
-  end
-
-  def item_dump_hash(item)
-    Hash[*list(tk_send('item', 'dump', item))]
-  end
-
-  def item_element_actual(item, column, elem, key)
-    tk_send('item', 'element', 'actual', item, column, elem, "-#{key}")
-  end
-
-  def item_element_perstate(elem, opt, st_list)
-    tk_send('item', 'element', 'perstate', elem, "-{opt}", st_list)
-  end
-
-  def item_expand(item)
-    tk_send('item', 'expand', item)
-    self
-  end
-
-  def item_expand_recurse(item)
-    tk_send('item', 'expand', item, '-recurse')
-    self
-  end
-
-  def item_firstchild(parent, child=nil)
-    if child
-      tk_send_without_enc('item', 'firstchild',
-                          _get_eval_string(parent, true),
-                          _get_eval_string(child, true))
-      self
-    else
-      id = num_or_str(tk_send_without_enc('item', 'firstchild',
-                                          _get_eval_string(parent, true)))
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    end
-  end
-  alias item_first_child item_firstchild
-
-  def item_hasbutton(item, st=None)
-    if st == None
-      bool(tk_send_without_enc('item', 'hasbutton',
-                               _get_eval_string(item, true)))
-    else
-      tk_send_without_enc('item', 'hasbutton',
-                          _get_eval_string(item, true),
-                          _get_eval_string(st))
-      self
-    end
-  end
-  alias item_has_button item_hasbutton
-
-  def item_hasbutton?(item)
-    item_hasbutton(item)
-  end
-  alias item_has_button? item_hasbutton?
-
-  def item_id(item)
-    tk_send('item', 'id', item)
-  end
-
-  def item_image(item, column=nil, *args)
-    if args.empty?
-      if column
-        img = tk_send('item', 'image', item, column)
-        TkImage::Tk_IMGTBL[img]? TkImage::Tk_IMGTBL[img] : img
-      else
-        simplelist(tk_send('item', 'image', item)).collect!{|img|
-          TkImage::Tk_IMGTBL[img]? TkImage::Tk_IMGTBL[img] : img
-        }
-      end
-    else
-      tk_send('item', 'image', item, column, *args)
-      self
-    end
-  end
-  def get_item_image(item, column=nil)
-    item_image(item, column)
-  end
-  def set_item_image(item, col, img, *args)
-    item_image(item, col, img, *args)
-  end
-
-  def item_index(item)
-    list(tk_send('item', 'index', item))
-  end
-
-  def item_isancestor(item, des)
-    bool(tk_send('item', 'isancestor', item, des))
-  end
-  alias item_is_ancestor  item_isancestor
-  alias item_isancestor?  item_isancestor
-  alias item_is_ancestor? item_isancestor
-
-  def item_isopen(item)
-    bool(tk_send('item', 'isopen', item))
-  end
-  alias item_is_open    item_isopen
-  alias item_isopen?    item_isopen
-  alias item_is_open?   item_isopen
-  alias item_isopened?  item_isopen
-  alias item_is_opened? item_isopen
-
-  def item_lastchild(parent, child=nil)
-    if child
-      tk_send_without_enc('item', 'lastchild',
-                          _get_eval_string(parent, true),
-                          _get_eval_string(child, true))
-      self
-    else
-      id = num_or_str(tk_send_without_enc('item', 'lastchild',
-                                          _get_eval_string(parent, true)))
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    end
-  end
-  alias item_last_child item_lastchild
-
-  def item_nextsibling(sibling, nxt=nil)
-    if nxt
-      tk_send('item', 'nextsibling', sibling, nxt)
-      self
-    else
-      id = num_or_str(tk_send('item', 'nextsibling', sibling))
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    end
-  end
-  alias item_next_sibling item_nextsibling
-
-  def item_numchildren(item)
-    number(tk_send_without_enc('item', 'numchildren',
-                               _get_eval_string(item, true)))
-  end
-  alias item_num_children  item_numchildren
-  alias item_children_size item_numchildren
-
-  def item_order(item, visible=false)
-    if visible
-      ret = num_or_str(tk_send('item', 'order', item, '-visible'))
-    else
-      ret = num_or_str(tk_send('item', 'order', item))
-    end
-
-    (ret.kind_of?(Fixnum) && ret < 0)? nil: ret
-  end
-  def item_visible_order(item)
-    item_order(item, true)
-  end
-
-  def item_parent(item)
-    id = num_or_str(tk_send('item', 'parent', item))
-    Tk::TreeCtrl::Item.id2obj(self, id)
-  end
-
-  def item_prevsibling(sibling, prev=nil)
-    if prev
-      tk_send('item', 'prevsibling', sibling, prev)
-      self
-    else
-      id = num_or_str(tk_send('item', 'prevsibling', sibling))
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    end
-  end
-  alias item_prev_sibling item_prevsibling
-
-  def item_range(first, last)
-    simplelist(tk_send('item', 'range', first, last))
-  end
-
-  def item_remove(item)
-    tk_send('item', 'remove', item)
-    self
-  end
-
-  def item_rnc(item)
-    list(tk_send('item', 'rnc', item))
-  end
-
-  def _item_sort_core(real_sort, item, *opts)
-    # opts ::= sort_param [, sort_param, ... ]
-    # sort_param ::= {key=>val, ...}
-    #                [type, desc, {key=>val, ...}]
-    #                param
-    opts = opts.collect{|param|
-      if param.kind_of?(Hash)
-        param = _symbolkey2str(param)
-        if param.key?('column')
-          key = '-column'
-          desc = param.delete('column')
-        elsif param.key?('element')
-          key = '-element'
-          desc = param.delete('element')
-        else
-          key = nil
-        end
-
-        if param.empty?
-          param = None
-        else
-          param = hash_kv(__conv_item_keyonly_opts(item, param))
-        end
-
-        if key
-          [key, desc].concat(param)
-        else
-          param
-        end
-
-      elsif param.kind_of?(Array)
-        if param[2].kind_of?(Hash)
-          param[2] = hash_kv(__conv_item_keyonly_opts(item, param[2]))
-        end
-        param
-
-      elsif param.kind_of?(String) && param =~ /\A[a-z]+\Z/
-        '-' << param
-
-      elsif param.kind_of?(Symbol)
-        '-' << param.to_s
-
-      else
-        param
-      end
-    }.flatten
-
-    if real_sort
-      tk_send('item', 'sort', item, *opts)
-      self
-    else
-      list(tk_send('item', 'sort', item, '-notreally', *opts))
-    end
-  end
-  private :_item_sort_core
-
-  def item_sort(item, *opts)
-    _item_sort_core(true, item, *opts)
-  end
-  def item_sort_not_really(item, *opts)
-    _item_sort_core(false, item, *opts)
-  end
-
-  def item_span(item, column=nil, *args)
-    if args.empty?
-      if column
-        list(tk_send('item', 'span', item, column))
-      else
-        simplelist(tk_send('item', 'span', item)).collect!{|elem| list(elem)}
-      end
-    else
-      tk_send('item', 'span', item, column, *args)
-      self
-    end
-  end
-  def get_item_span(item, column=nil)
-    item_span(item, column)
-  end
-  def set_item_span(item, col, num, *args)
-    item_span(item, col, num, *args)
-  end
-
-  def item_state_forcolumn(item, column, *args)
-    tk_send('item', 'state', 'forcolumn', item, column, *args)
-  end
-  alias item_state_for_column item_state_forcolumn
-
-  def item_state_get(item, *args)
-    if args.empty?
-      list(tk_send('item', 'state', 'get', item *args))
-    else
-      bool(tk_send('item', 'state', 'get', item))
-    end
-  end
-
-  def item_state_set(item, *args)
-    tk_send('item', 'state', 'set', item, *args)
-  end
-
-  def item_style_elements(item, column)
-    list(tk_send('item', 'style', 'elements', item, column)).collect!{|id|
-      Tk::TreeCtrl::Style.id2obj(self, id)
-    }
-  end
-
-  def item_style_map(item, column, style, map)
-    tk_send('item', 'style', 'map', item, column, style, map)
-    self
-  end
-
-  def item_style_set(item, column=nil, *args)
-    if args.empty?
-      if column
-        id = tk_send_without_enc('item', 'style', 'set',
-                                 _get_eval_string(item, true),
-                                 _get_eval_string(column, true))
-        Tk::TreeCtrl::Style.id2obj(self, id)
-      else
-        list(tk_send_without_enc('item', 'style', 'set',
-                                 _get_eval_string(item, true))).collect!{|id|
-          Tk::TreeCtrl::Style.id2obj(self, id)
-        }
-      end
-    else
-      tk_send_without_enc('item', 'style', 'set',
-                          _get_eval_string(item, true),
-                          _get_eval_string(column, true),
-                          *(args.flatten.map!{|arg|
-                              _get_eval_string(arg, true)
-                            }))
-      self
-    end
-  end
-
-  def item_text(item, column, txt=nil, *args)
-    if args.empty?
-      if txt
-        tk_send('item', 'text', item, column, txt)
-        self
-      else
-        tk_send('item', 'text', item, column)
-      end
-    else
-      tk_send('item', 'text', item, column, txt, *args)
-      self
-    end
-  end
-
-  def item_toggle(item)
-    tk_send('item', 'toggle', item)
-    self
-  end
-
-  def item_toggle_recurse(item)
-    tk_send('item', 'toggle', item, '-recurse')
-    self
-  end
-
-  def item_visible(item, st=None)
-    if st == None
-      bool(tk_send('item', 'visible', item))
-    else
-      tk_send('item', 'visible', item, st)
-      self
-    end
-  end
-  def item_visible?(item)
-    item_visible(item)
-  end
-
-  def marquee_anchor(*args)
-    if args.empty?
-      list(tk_send('marquee', 'anchor'))
-    else
-      tk_send('marquee', 'anchor', *args)
-      self
-    end
-  end
-
-  def marquee_coords(*args)
-    if args.empty?
-      list(tk_send('marquee', 'coords'))
-    else
-      tk_send('marquee', 'coords', *args)
-      self
-    end
-  end
-
-  def marquee_corner(*args)
-    if args.empty?
-      tk_send('marquee', 'corner')
-    else
-      tk_send('marquee', 'corner', *args)
-      self
-    end
-  end
-
-  def marquee_identify()
-    list(tk_send('marquee', 'identify')).collect!{|id|
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    }
-  end
-
-  def marquee_visible(st=None)
-    if st == None
-      bool(tk_send('marquee', 'visible'))
-    else
-      tk_send('marquee', 'visible', st)
-      self
-    end
-  end
-  def marquee_visible?()
-    marquee_visible()
-  end
-
-  #def notify_bind(obj, event, cmd=Proc.new, *args)
-  #  _bind([@path, 'notify', 'bind', obj], event, cmd, *args)
-  #  self
-  #end
-  def notify_bind(obj, event, *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, 'notify', 'bind', obj], event, cmd, *args)
-    self
-  end
-
-  #def notify_bind_append(obj, event, cmd=Proc.new, *args)
-  #  _bind_append([@path, 'notify', 'bind', obj], event, cmd, *args)
-  #  self
-  #end
-  def notify_bind_append(obj, event, *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, 'notify', 'bind', obj], event, cmd, *args)
-    self
-  end
-
-  def notify_bind_remove(obj, event)
-    _bind_remove([@path, 'notify', 'bind', obj], event)
-    self
-  end
-
-  def notify_bindinfo(obj, event=nil)
-    _bindinfo([@path, 'notify', 'bind', obj], event)
-  end
-
-  def notify_detailnames(event)
-    list(tk_send('notify', 'detailnames', event))
-  end
-
-  def notify_eventnames()
-    list(tk_send('notify', 'eventnames'))
-  end
-
-  def notify_generate(pattern, char_map=None, percents_cmd=None)
-    pattern = "<#{pattern}>"
-    tk_send('notify', 'generate', pattern, char_map, percents_cmd)
-    self
-  end
-
-  def notify_install(pattern, percents_cmd=nil, &b)
-    pattern = "<#{pattern}>"
-    percents_cmd = Proc.new(&b) if !percents_cmd && b
-    if percents_cmd
-      procedure(tk_send('notify', 'install', pattern, percents_cmd))
-    else
-      procedure(tk_send('notify', 'install', pattern))
-    end
-  end
-
-  def notify_install_detail(event, detail, percents_cmd=nil, &b)
-    percents_cmd = Proc.new(&b) if !percents_cmd && b
-    if percents_cmd
-      tk_send('notify', 'install', 'detail', event, detail, percents_cmd)
-    else
-      tk_send('notify', 'install', 'detail', event, detail)
-    end
-  end
-
-  def notify_install_event(event, percents_cmd=nil, &b)
-    percents_cmd = Proc.new(&b) if !percents_cmd && b
-    if percents_cmd
-      tk_send('notify', 'install', 'event', event, percents_cmd)
-    else
-      tk_send('notify', 'install', 'event', event)
-    end
-  end
-
-  def notify_linkage(pattern, detail=None)
-    if detail != None
-      tk_send('notify', 'linkage', pattern, detail)
-    else
-      begin
-        if pattern.to_s.index(?-)
-          # TreeCtrl 1.1 format?
-          begin
-            tk_send('notify', 'linkage', "<#{pattern}>")
-          rescue
-            # TreeCtrl 1.0?
-            tk_send('notify', 'linkage', pattern)
-          end
-        else
-          # TreeCtrl 1.0 format?
-          begin
-            tk_send('notify', 'linkage', pattern)
-          rescue
-            # TreeCtrl 1.1?
-            tk_send('notify', 'linkage', "<#{pattern}>")
-          end
-        end
-      end
-    end
-  end
-
-  def notify_unbind(pattern=nil)
-    if pattern
-      tk_send('notify', 'unbind', "<#{pattern}>")
-    else
-      tk_send('notify', 'unbind')
-    end
-    self
-  end
-
-  def notify_uninstall(pattern)
-    pattern = "<#{pattern}>"
-    tk_send('notify', 'uninstall', pattern)
-    self
-  end
-
-  def notify_uninstall_detail(event, detail)
-    tk_send('notify', 'uninstall', 'detail', event, detail)
-    self
-  end
-
-  def notify_uninstall_event(event)
-    tk_send('notify', 'uninstall', 'event', event)
-    self
-  end
-
-  def numcolumns()
-    num_or_str(tk_send('numcolumns'))
-  end
-  alias num_columns  numcolumns
-  alias columns_size numcolumns
-
-  def numitems()
-    num_or_str(tk_send('numitems'))
-  end
-  alias num_items  numitems
-  alias items_size numitems
-
-  def orphans()
-    list(tk_send('orphans')).collect!{|id|
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    }
-  end
-
-  def range(first, last)
-    list(tk_send('range', first, last)).collect!{|id|
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    }
-  end
-
-  def state_define(name)
-    tk_send('state', 'define', name)
-    self
-  end
-
-  def state_linkage(name)
-    tk_send('state', 'linkage', name)
-  end
-
-  def state_names()
-    list(tk_send('state', 'names'))
-  end
-
-  def state_undefine(*names)
-    tk_send('state', 'undefine', *names)
-    self
-  end
-
-  def see(item, column=None, keys={})
-    tk_send('see', item, column, *hash_kv(keys))
-    self
-  end
-
-  def selection_add(first, last=None)
-    tk_send('selection', 'add', first, last)
-    self
-  end
-
-  def selection_anchor(item=None)
-    id = num_or_str(tk_send('selection', 'anchor', item))
-    Tk::TreeCtrl::Item.id2obj(self, id)
-  end
-
-  def selection_clear(*args) # first, last
-    tk_send('selection', 'clear', *args)
-    self
-  end
-
-  def selection_count()
-    number(tk_send('selection', 'count'))
-  end
-
-  def selection_get()
-    list(tk_send('selection', 'get')).collect!{|id|
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    }
-  end
-
-  def selection_includes(item)
-    bool(tk_send('selection', 'includes', item))
-  end
-
-  def selection_modify(sel, desel)
-    tk_send('selection', 'modify', sel, desel)
-    self
-  end
-
-  def style_create(style, keys=None)
-    if keys && keys != None
-      tk_send('style', 'create', style, *hash_kv(keys))
-    else
-      tk_send('style', 'create', style)
-    end
-  end
-
-  def style_delete(*args)
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path]
-        args.each{|sty|
-          Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path].delete(sty)
-        }
-      end
-    }
-    tk_send('style', 'delete', *args)
-    self
-  end
-
-  def style_elements(style, *elems)
-    if elems.empty?
-      list(tk_send('style', 'elements', style)).collect!{|id|
-        Tk::TreeCtrl::Element.id2obj(self, id)
-      }
-    else
-      tk_send('style', 'elements', style, elems.flatten)
-      self
-    end
-  end
-
-  def _conv_style_layout_val(sty, val)
-    case sty.to_s
-    when 'padx', 'pady', 'ipadx', 'ipady'
-      lst = list(val)
-      (lst.size == 1)? lst[0]: lst
-    when 'detach', 'indent'
-      bool(val)
-    when 'union'
-      simplelist(val).collect!{|elem|
-        Tk::TreeCtrl::Element.id2obj(self, elem)
-      }
-    else
-      val
-    end
-  end
-  private :_conv_style_layout_val
-
-  def style_layout(style, elem, keys=None)
-    if keys && keys != None
-      if keys.kind_of?(Hash)
-        tk_send('style', 'layout', style, elem, *hash_kv(keys))
-        self
-      else
-        _conv_style_layout_val(keys,
-                               tk_send('style', 'layout',
-                                       style, elem, "-#{keys}"))
-      end
-    else
-      ret = Hash.new
-      Hash[*simplelist(tk_send('style', 'layout', style, elem))].each{|k, v|
-        k = k[1..-1]
-        ret[k] = _conv_style_layout_val(k, v)
-      }
-      ret
-    end
-  end
-  def get_style_layout(style, elem, opt=None)
-    style_layout(style, elem, opt)
-  end
-  def set_style_layout(style, elem, slot, value=None)
-    if slot.kind_of?(Hash)
-      style_layout(style, elem, slot)
-    else
-      style_layout(style, elem, {slot=>value})
-    end
-  end
-
-  def style_names()
-    list(tk_send('style', 'names')).collect!{|id|
-      Tk::TreeCtrl::Style.id2obj(self, id)
-    }
-  end
-
-  def toggle(*items)
-    tk_send('toggle', *items)
-    self
-  end
-
-  def toggle_recurse()
-    tk_send('toggle', '-recurse', *items)
-    self
-  end
-end
-
-#####################
-
-class Tk::TreeCtrl::Column < TkObject
-  TreeCtrlColumnID_TBL = TkCore::INTERP.create_table
-
-  (TreeCtrlColumnID = ['treectrl_column'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath]
-        Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id]? \
-                   Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, keys={})
-    @tree = parent
-    @tpath = parent.path
-
-    keys = _symbolkey2str(keys)
-
-    Tk::TreeCtrl::Column::TreeCtrlColumnID.mutex.synchronize{
-      @path = @id =
-        keys.delete('tag') ||
-        Tk::TreeCtrl::Column::TreeCtrlColumnID.join(TkCore::INTERP._ip_id_)
-      Tk::TreeCtrl::Column::TreeCtrlColumnID[1].succ!
-    }
-
-    keys['tag'] = @id
-
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath] ||= {}
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath][@id] = self
-    }
-
-    @tree.column_create(keys)
-  end
-
-  def id
-    @id
-  end
-
-  def to_s
-    @id.to_s.dup
-  end
-
-  def cget_tkstring(opt)
-    @tree.column_cget_tkstring(@tree.column_index(@id), opt)
-  end
-  def cget(opt)
-    @tree.column_cget(@tree.column_index(@id), opt)
-  end
-  def cget_strict(opt)
-    @tree.column_cget_strict(@tree.column_index(@id), opt)
-  end
-
-  def configure(*args)
-    @tree.column_configure(@tree.column_index(@id), *args)
-  end
-
-  def configinfo(*args)
-    @tree.column_configinfo(@tree.column_index(@id), *args)
-  end
-
-  def current_configinfo(*args)
-    @tree.current_column_configinfo(@tree.column_index(@id), *args)
-  end
-
-  def delete
-    @tree.column_delete(@tree.column_index(@id))
-    self
-  end
-
-  def index
-    @tree.column_index(@id)
-  end
-
-  def move(before)
-    @tree.column_move(@tree.column_index(@id), before)
-    self
-  end
-
-  def needed_width
-    @tree.column_needed_width(@tree.column_index(@id))
-  end
-  alias neededwidth needed_width
-
-  def current_width
-    @tree.column_width(@tree.column_index(@id))
-  end
-end
-
-#####################
-
-class Tk::TreeCtrl::Element < TkObject
-  TreeCtrlElementID_TBL = TkCore::INTERP.create_table
-
-  (TreeCtrlElementID = ['treectrl_element'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-  TreeCtrlElemTypeToClass = {}
-
-  TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.clear
-    }
-  }
-
-  def self.type2class(type)
-    TreeCtrlElemTypeToClass[type] || type
-  end
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath]
-        Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id]? \
-                 Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, type, keys=nil)
-    @tree = parent
-    @tpath = parent.path
-    @type = type.to_s
-    Tk::TreeCtrl::Element::TreeCtrlElementID.mutex.synchronize{
-      @path = @id =
-        Tk::TreeCtrl::Element::TreeCtrlElementID.join(TkCore::INTERP._ip_id_)
-      Tk::TreeCtrl::Element::TreeCtrlElementID[1].succ!
-    }
-
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath] ||= {}
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath][@id] = self
-    }
-
-    @tree.element_create(@id, @type, keys)
-  end
-
-  def id
-    @id
-  end
-
-  def to_s
-    @id.dup
-  end
-
-  def cget_tkstring(opt)
-    @tree.element_cget_tkstring(@id, opt)
-  end
-  def cget(opt)
-    @tree.element_cget(@id, opt)
-  end
-  def cget_strict(opt)
-    @tree.element_cget_strict(@id, opt)
-  end
-
-  def configure(*args)
-    @tree.element_configure(@id, *args)
-  end
-
-  def configinfo(*args)
-    @tree.element_configinfo(@id, *args)
-  end
-
-  def current_configinfo(*args)
-    @tree.current_element_configinfo(@id, *args)
-  end
-
-  def delete
-    @tree.element_delete(@id)
-    self
-  end
-
-  def element_type
-    @tree.element_type(@id)
-  end
-
-  def element_class
-    @tree.element_class(@id)
-  end
-end
-
-class Tk::TreeCtrl::BitmapElement < Tk::TreeCtrl::Element
-  TreeCtrlElemTypeToClass['bitmap'] = self
-
-  def initialize(parent, keys=nil)
-    super(parent, 'bitmap', keys)
-  end
-end
-
-class Tk::TreeCtrl::BorderElement < Tk::TreeCtrl::Element
-  TreeCtrlElemTypeToClass['border'] = self
-
-  def initialize(parent, keys=nil)
-    super(parent, 'border', keys)
-  end
-end
-
-class Tk::TreeCtrl::ImageElement < Tk::TreeCtrl::Element
-  TreeCtrlElemTypeToClass['image'] = self
-
-  def initialize(parent, keys=nil)
-    super(parent, 'image', keys)
-  end
-end
-
-class Tk::TreeCtrl::RectangleElement < Tk::TreeCtrl::Element
-  TreeCtrlElemTypeToClass['rect'] = self
-
-  def initialize(parent, keys=nil)
-    super(parent, 'rect', keys)
-  end
-end
-
-#####################
-
-class Tk::TreeCtrl::Item < TkObject
-  TreeCtrlItemID_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath]
-        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id]? \
-                        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, keys={})
-    @tree = parent
-    @tpath = parent.path
-    @path = @id = @tree.item_create(keys)
-
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath] ||= {}
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath][@id] = self
-    }
-  end
-
-  def id
-    @id
-  end
-
-  def to_s
-    @id.to_s.dup
-  end
-
-  def ancestors
-    @tree.item_ancestors(@id)
-  end
-
-  def bbox(*args)
-    @tree.item_bbox(@id, *args)
-  end
-
-  def children
-    @tree.item_children(@id)
-  end
-
-  def collapse
-    @tree.item_collapse(@id)
-    self
-  end
-
-  def collapse_recurse
-    @tree.item_collapse_recurse(@id)
-    self
-  end
-
-  def complex(*args)
-    @tree.item_complex(@id, *args)
-    self
-  end
-
-  def cget_tkstring(opt)
-    @tree.item_cget_tkstring(@id, opt)
-  end
-  def cget(opt)
-    @tree.item_cget(@id, opt)
-  end
-  def cget_strict(opt)
-    @tree.item_cget_strict(@id, opt)
-  end
-
-  def configure(*args)
-    @tree.item_configure(@id, *args)
-  end
-
-  def configinfo(*args)
-    @tree.item_configinfo(@id, *args)
-  end
-
-  def current_configinfo(*args)
-    @tree.current_item_configinfo(@id, *args)
-  end
-
-  def delete
-    @tree.item_delete(@id)
-    self
-  end
-
-  def element_dump
-    @tree.item_dump(@id)
-  end
-
-  def element_dump_hash
-    @tree.item_dump_hash(@id)
-  end
-
-  def element_actual(column, elem, key)
-    @tree.item_element_actual(@id, column, elem, key)
-  end
-
-  def element_cget_tkstring(opt)
-    @tree.item_element_cget(@id, opt)
-  end
-  def element_cget_tkstring(opt)
-    @tree.item_element_cget(@id, opt)
-  end
-  def element_cget_strict(opt)
-    @tree.item_element_cget_strict(@id, opt)
-  end
-
-  def element_configure(*args)
-    @tree.item_element_configure(@id, *args)
-  end
-
-  def element_configinfo(*args)
-    @tree.item_element_configinfo(@id, *args)
-  end
-
-  def current_element_configinfo(*args)
-    @tree.current_item_element_configinfo(@id, *args)
-  end
-
-  def expand
-    @tree.item_expand(@id)
-    self
-  end
-
-  def expand_recurse
-    @tree.item_expand_recurse(@id)
-    self
-  end
-
-  def firstchild(child=nil)
-    if child
-      @tree.item_firstchild(@id, child)
-      self
-    else
-      @tree.item_firstchild(@id)
-    end
-  end
-  alias first_child firstchild
-
-  def hasbutton(st=None)
-    if st == None
-      @tree.item_hasbutton(@id)
-    else
-      @tree.item_hasbutton(@id, st)
-      self
-    end
-  end
-  alias has_button hasbutton
-
-  def hasbutton?
-    @tree.item_hasbutton(@id)
-  end
-  alias has_button? hasbutton?
-
-  def index
-    @tree.item_index(@id)
-  end
-
-  def isancestor(des)
-    @tree.item_isancestor(@id, des)
-  end
-  alias is_ancestor  isancestor
-  alias isancestor?  isancestor
-  alias is_ancestor? isancestor
-  alias ancestor?    isancestor
-
-  def isopen
-    @tree.item_isopen(@id)
-  end
-  alias is_open    isopen
-  alias isopen?    isopen
-  alias is_open?   isopen
-  alias isopened?  isopen
-  alias is_opened? isopen
-  alias open?      isopen
-
-  def lastchild(child=nil)
-    if child
-      @tree.item_lastchild(@id, child)
-      self
-    else
-      @tree.item_lastchild(@id)
-    end
-  end
-  alias last_child lastchild
-
-  def nextsibling(nxt=nil)
-    if nxt
-      @tree.item_nextsibling(@id, nxt)
-      self
-    else
-      @tree.item_nextsibling(@id)
-    end
-  end
-  alias next_sibling nextsibling
-
-  def numchildren
-    @tree.item_numchildren(@id)
-  end
-  alias num_children  numchildren
-  alias children_size numchildren
-
-  def parent_index
-    @tree.item_parent(@id)
-  end
-
-  def prevsibling(nxt=nil)
-    if nxt
-      @tree.item_prevsibling(@id, nxt)
-      self
-    else
-      @tree.item_prevsibling(@id)
-    end
-  end
-  alias prev_sibling prevsibling
-
-  def remove
-    @tree.item_remove(@id)
-  end
-
-  def rnc
-    @tree.item_rnc(@id)
-  end
-
-  def sort(*opts)
-    @tree.item_sort(@id, *opts)
-  end
-  def sort_not_really(*opts)
-    @tree.item_sort_not_really(@id, *opts)
-    self
-  end
-
-  def state_forcolumn(column, *args)
-    @tree.item_state_forcolumn(@id, column, *args)
-    self
-  end
-  alias state_for_column state_forcolumn
-
-  def state_get(*args)
-    @tree.item_state_get(@id, *args)
-  end
-
-  def state_set(*args)
-    @tree.item_state_set(@id, *args)
-    self
-  end
-
-  def style_elements(column)
-    @tree.item_style_elements(@id, column)
-  end
-
-  def style_map(column, style, map)
-    @tree.item_style_map(@id, column, style, map)
-    self
-  end
-
-  def style_set(column=nil, *args)
-    if args.empty?
-      @tree.item_style_set(@id, column)
-    else
-      @tree.item_style_set(@id, column, *args)
-      self
-    end
-  end
-
-  def item_text(column, txt=nil, *args)
-    if args.empty?
-      if txt
-        @tree.item_text(@id, column, txt)
-        self
-      else
-        @tree.item_text(@id, column)
-      end
-    else
-      @tree.item_text(@id, column, txt, *args)
-      self
-    end
-  end
-
-  def toggle
-    @tree.item_toggle(@id)
-    self
-  end
-
-  def toggle_recurse
-    @tree.item_toggle_recurse(@id)
-    self
-  end
-
-  def visible(st=None)
-    if st == None
-      @tree.item_visible(@id)
-    else
-      @tree.item_visible(@id, st)
-      self
-    end
-  end
-end
-
-#####################
-
-class Tk::TreeCtrl::Style < TkObject
-  TreeCtrlStyleID_TBL = TkCore::INTERP.create_table
-
-  (TreeCtrlStyleID = ['treectrl_style'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath]
-        Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id]? \
-                     Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, keys=nil)
-    @tree = parent
-    @tpath = parent.path
-
-    Tk::TreeCtrl::Style::TreeCtrlStyleID.mutex.synchronize{
-      @path = @id =
-        Tk::TreeCtrl::Style::TreeCtrlStyleID.join(TkCore::INTERP._ip_id_)
-      Tk::TreeCtrl::Style::TreeCtrlStyleID[1].succ!
-    }
-
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath] ||= {}
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath][@id] = self
-    }
-
-    @tree.style_create(@id, keys)
-  end
-
-  def id
-    @id
-  end
-
-  def to_s
-    @id.dup
-  end
-
-  def cget_tkstring(opt)
-    @tree.style_cget_tkstring(@id, opt)
-  end
-  def cget(opt)
-    @tree.style_cget(@id, opt)
-  end
-  def cget_strict(opt)
-    @tree.style_cget_strict(@id, opt)
-  end
-
-  def configure(*args)
-    @tree.style_configure(@id, *args)
-  end
-
-  def configinfo(*args)
-    @tree.style_configinfo(@id, *args)
-  end
-
-  def current_configinfo(*args)
-    @tree.current_style_configinfo(@id, *args)
-  end
-
-  def delete
-    @tree.style_delete(@id)
-    self
-  end
-
-  def elements(*elems)
-    if elems.empty?
-      @tree.style_elements(@id)
-    else
-      @tree.style_elements(@id, *elems)
-      self
-    end
-  end
-
-  def layout(elem, keys=None)
-    if keys && keys != None && keys.kind_of?(Hash)
-      @tree.style_layout(@id, elem, keys)
-      self
-    else
-      @tree.style_layout(@id, elem, keys)
-    end
-  end
-end
-
-module Tk::TreeCtrl::BindCallback
-  include Tk
-  extend Tk
-end
-
-class << Tk::TreeCtrl::BindCallback
-  def percentsCmd(*args)
-    tk_call('::TreeCtrl::PercentsCmd', *args)
-  end
-  def cursorCheck(w, x, y)
-    tk_call('::TreeCtrl::CursorCheck', w, x, y)
-  end
-  def cursorCheckAux(w)
-    tk_call('::TreeCtrl::CursorCheckAux', w)
-  end
-  def cursorCancel(w)
-    tk_call('::TreeCtrl::CursorCancel', w)
-  end
-  def buttonPress1(w, x, y)
-    tk_call('::TreeCtrl::ButtonPress1', w, x, y)
-  end
-  def doubleButton1(w, x, y)
-    tk_call('::TreeCtrl::DoubleButton1', w, x, y)
-  end
-  def motion1(w, x, y)
-    tk_call('::TreeCtrl::Motion1', w, x, y)
-  end
-  def leave1(w, x, y)
-    tk_call('::TreeCtrl::Leave1', w, x, y)
-  end
-  def release1(w, x, y)
-    tk_call('::TreeCtrl::Release1', w, x, y)
-  end
-  def beginSelect(w, el)
-    tk_call('::TreeCtrl::BeginSelect', w, el)
-  end
-  def motion(w, le)
-    tk_call('::TreeCtrl::Motion', w, el)
-  end
-  def beginExtend(w, el)
-    tk_call('::TreeCtrl::BeginExtend', w, el)
-  end
-  def beginToggle(w, el)
-    tk_call('::TreeCtrl::BeginToggle', w, el)
-  end
-  def cancelRepeat
-    tk_call('::TreeCtrl::CancelRepeat')
-  end
-  def autoScanCheck(w, x, y)
-    tk_call('::TreeCtrl::AutoScanCheck', w, x, y)
-  end
-  def autoScanCheckAux(w)
-    tk_call('::TreeCtrl::AutoScanCheckAux', w)
-  end
-  def autoScanCancel(w)
-    tk_call('::TreeCtrl::AutoScanCancel', w)
-  end
-  def up_down(w, n)
-    tk_call('::TreeCtrl::UpDown', w, n)
-  end
-  def left_right(w, n)
-    tk_call('::TreeCtrl::LeftRight', w, n)
-  end
-  def setActiveItem(w, idx)
-    tk_call('::TreeCtrl::SetActiveItem', w, idx)
-  end
-  def extendUpDown(w, amount)
-    tk_call('::TreeCtrl::ExtendUpDown', w, amount)
-  end
-  def dataExtend(w, el)
-    tk_call('::TreeCtrl::DataExtend', w, el)
-  end
-  def cancel(w)
-    tk_call('::TreeCtrl::Cancel', w)
-  end
-  def selectAll(w)
-    tk_call('::TreeCtrl::selectAll', w)
-  end
-  def marqueeBegin(w, x, y)
-    tk_call('::TreeCtrl::MarqueeBegin', w, x, y)
-  end
-  def marqueeUpdate(w, x, y)
-    tk_call('::TreeCtrl::MarqueeUpdate', w, x, y)
-  end
-  def marqueeEnd(w, x, y)
-    tk_call('::TreeCtrl::MarqueeEnd', w, x, y)
-  end
-  def scanMark(w, x, y)
-    tk_call('::TreeCtrl::ScanMark', w, x, y)
-  end
-  def scanDrag(w, x, y)
-    tk_call('::TreeCtrl::ScanDrag', w, x, y)
-  end
-
-  # filelist-bindings
-  def fileList_button1(w, x, y)
-    tk_call('::TreeCtrl::FileListButton1', w, x, y)
-  end
-  def fileList_motion1(w, x, y)
-    tk_call('::TreeCtrl::FileListMotion1', w, x, y)
-  end
-  def fileList_motion(w, x, y)
-    tk_call('::TreeCtrl::FileListMotion', w, x, y)
-  end
-  def fileList_leave1(w, x, y)
-    tk_call('::TreeCtrl::FileListLeave1', w, x, y)
-  end
-  def fileList_release1(w, x, y)
-    tk_call('::TreeCtrl::FileListRelease1', w, x, y)
-  end
-  def fileList_edit(w, i, s, e)
-    tk_call('::TreeCtrl::FileListEdit', w, i, s, e)
-  end
-  def fileList_editCancel(w)
-    tk_call('::TreeCtrl::FileListEditCancel', w)
-  end
-  def fileList_autoScanCheck(w, x, y)
-    tk_call('::TreeCtrl::FileListAutoScanCheck', w, x, y)
-  end
-  def fileList_autoScanCheckAux(w)
-    tk_call('::TreeCtrl::FileListAutoScanCheckAux', w)
-  end
-
-  def entryOpen(w, item, col, elem)
-    tk_call('::TreeCtrl::EntryOpen', w, item, col, elem)
-  end
-  def entryExpanderOpen(w, item, col, elem)
-    tk_call('::TreeCtrl::EntryExpanderOpen', w, item, col, elem)
-  end
-  def entryClose(w, accept)
-    tk_call('::TreeCtrl::EntryClose', w, accept)
-  end
-  def entryExpanderKeypress(w)
-    tk_call('::TreeCtrl::EntryExpanderKeypress', w)
-  end
-  def textOpen(w, item, col, elem, width=0, height=0)
-    tk_call('::TreeCtrl::TextOpen', w, item, col, elem, width, height)
-  end
-  def textExpanderOpen(w, item, col, elem, width)
-    tk_call('::TreeCtrl::TextOpen', w, item, col, elem, width)
-  end
-  def textClose(w, accept)
-    tk_call('::TreeCtrl::TextClose', w, accept)
-  end
-  def textExpanderKeypress(w)
-    tk_call('::TreeCtrl::TextExpanderKeypress', w)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/trofs.rb b/ext/tk/lib/tkextlib/trofs.rb
deleted file mode 100644
index 5914e5165f..0000000000
--- a/ext/tk/lib/tkextlib/trofs.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  trofs 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/trofs/setup.rb'
-
-# load library
-require 'tkextlib/trofs/trofs.rb'
diff --git a/ext/tk/lib/tkextlib/trofs/setup.rb b/ext/tk/lib/tkextlib/trofs/setup.rb
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/trofs/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/trofs/trofs.rb b/ext/tk/lib/tkextlib/trofs/trofs.rb
deleted file mode 100644
index 7a2606a275..0000000000
--- a/ext/tk/lib/tkextlib/trofs/trofs.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-#  tkextlib/trofs/trofs.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/trofs/setup.rb'
-
-# TkPackage.require('trofs', '0.4')
-TkPackage.require('trofs')
-
-module Tk
-  module Trofs
-    extend TkCore
-
-    PACKAGE_NAME = 'trofs'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('trofs')
-      rescue
-        ''
-      end
-    end
-
-    ##############################################
-
-    def self.create_archive(dir, archive)
-      tk_call('::trofs::archive', dir, archive)
-      archive
-    end
-
-    def self.mount(archive, mountpoint=None)
-      # returns the normalized path to mountpoint
-      tk_call('::trofs::mount', archive, mountpoint)
-    end
-
-    def self.umount(mountpoint)
-      tk_call('::trofs::umount', mountpoint)
-      mountpoint
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/version.rb b/ext/tk/lib/tkextlib/version.rb
deleted file mode 100644
index 4bef78fe54..0000000000
--- a/ext/tk/lib/tkextlib/version.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# release date of tkextlib
-#
-module Tk
-  Tkextlib_RELEASE_DATE = '2010-02-01'.freeze
-end
diff --git a/ext/tk/lib/tkextlib/vu.rb b/ext/tk/lib/tkextlib/vu.rb
deleted file mode 100644
index d2234eb2a8..0000000000
--- a/ext/tk/lib/tkextlib/vu.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  The vu widget set 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/vu/setup.rb'
-
-# load package
-# TkPackage.require('vu', '2.1')
-TkPackage.require('vu')
-
-# autoload
-module Tk
-  module Vu
-    TkComm::TkExtlibAutoloadModule.unshift(self)
-
-    PACKAGE_NAME = 'vu'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('vu')
-      rescue
-        ''
-      end
-    end
-
-    ##########################################
-
-    autoload :Dial,          'tkextlib/vu/dial'
-
-    autoload :Pie,           'tkextlib/vu/pie'
-    autoload :PieSlice,      'tkextlib/vu/pie'
-    autoload :NamedPieSlice, 'tkextlib/vu/pie'
-
-    autoload :Spinbox,       'tkextlib/vu/spinbox'
-
-    autoload :Bargraph,      'tkextlib/vu/bargraph'
-  end
-end
diff --git a/ext/tk/lib/tkextlib/vu/bargraph.rb b/ext/tk/lib/tkextlib/vu/bargraph.rb
deleted file mode 100644
index b9fcf925f3..0000000000
--- a/ext/tk/lib/tkextlib/vu/bargraph.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-#  ::vu::bargraph widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# create module/class
-module Tk
-  module Vu
-    class Bargraph < TkWindow
-    end
-  end
-end
-
-
-# call setup script  --  <libdir>/tkextlib/vu.rb
-require 'tkextlib/vu.rb'
-
-class Tk::Vu::Bargraph < TkWindow
-  TkCommandNames = ['::vu::bargraph'.freeze].freeze
-  WidgetClassName = 'Bargraph'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ###############################
-
-  def __boolval_optkeys
-    ['showminmax', 'showvalue']
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() + [
-      'title',
-      'barbackground', 'barcolor', 'barcolour',
-      'tickcolor', 'tickcolour',
-      'textcolor', 'textcolour',
-    ]
-  end
-  private :__strval_optkeys
-
-  def __listval_optkeys
-    ['alabels', 'blabels']
-  end
-  private :__listval_optkeys
-
-  def __font_optkeys
-    ['alabfont', 'blabfont']
-  end
-  private :__font_optkeys
-
-  ###############################
-
-  def set(val = None)
-    tk_call_without_enc(@path, 'set', val)
-    self
-  end
-
-  def get()
-    num_or_str(tk_call_without_enc(@path, 'get'))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/vu/charts.rb b/ext/tk/lib/tkextlib/vu/charts.rb
deleted file mode 100644
index 8569ac5541..0000000000
--- a/ext/tk/lib/tkextlib/vu/charts.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-#  charts -- Create and manipulate canvas Add-On Items
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tk/canvas'
-
-# call setup script  --  <libdir>/tkextlib/vu.rb
-require 'tkextlib/vu.rb'
-
-module Tk
-  module Vu
-    module ChartsConfig
-      include TkItemConfigOptkeys
-      def __item_boolval_optkeys(id)
-        super(id) << 'lefttrunc' << 'autocolor'
-      end
-      private :__item_boolval_optkeys
-
-      def __item_strval_optkeys(id)
-        super(id) << 'bar' << 'color' << 'outline' <<
-          'fill' << 'scaleline' << 'stripline'
-      end
-      private :__item_strval_optkeys
-
-      def __item_listval_optkeys(id)
-        super(id) << 'values' << 'tags'
-      end
-      private :__item_listval_optkeys
-    end
-
-    class TkcSticker < TkcItem
-      include ChartsConfig
-
-      CItemTypeName = 'sticker'.freeze
-      CItemTypeToClass[CItemTypeName] = self
-    end
-
-    class TkcStripchart < TkcItem
-      include ChartsConfig
-
-      CItemTypeName = 'stripchart'.freeze
-      CItemTypeToClass[CItemTypeName] = self
-    end
-
-    class TkcBarchart < TkcItem
-      include ChartsConfig
-
-      CItemTypeName = 'barchart'.freeze
-      CItemTypeToClass[CItemTypeName] = self
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/vu/dial.rb b/ext/tk/lib/tkextlib/vu/dial.rb
deleted file mode 100644
index 4d04974a55..0000000000
--- a/ext/tk/lib/tkextlib/vu/dial.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-#  ::vu::dial widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# create module/class
-module Tk
-  module Vu
-    class Dial < TkWindow
-    end
-  end
-end
-
-# call setup script  --  <libdir>/tkextlib/vu.rb
-require 'tkextlib/vu.rb'
-
-# define module/class
-class Tk::Vu::Dial < TkWindow
-  TkCommandNames = ['::vu::dial'.freeze].freeze
-  WidgetClassName = 'Dial'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ###############################
-
-  def __methodcall_optkeys  # { key=>method, ... }
-    {'coords'=>'coords'}
-  end
-  private :__methodcall_optkeys
-
-  ###############################
-
-  def coords(val = nil)
-    if val
-      tk_send_without_enc('coords', val)
-      self
-    else
-      tk_split_list(tk_send_without_enc('coords'))
-    end
-  end
-
-  def constrain(val = None)
-    num_or_str(tk_call(@path, 'constrain', val))
-  end
-
-  def get(*args)
-    num_or_str(tk_call(@path, 'get', *args))
-  end
-
-  def identify(x, y)
-    tk_call(@path, 'identify', x, y)
-  end
-
-  def get_label(val=nil)
-    if val
-      tk_call(@path, 'label', val)
-    else
-      ret = []
-      lst = simplelist(tk_call(@path, 'label'))
-      while lst.size > 0
-        ret << ([num_or_str(lst.shift)] << lst.shift)
-      end
-    end
-  end
-
-  def set_label(val, str, *args)
-    tk_call(@path, 'label', val, str, *args)
-    self
-  end
-
-  def set_label_constrain(val, str, *args)
-    tk_call(@path, 'label', '-constrain', val, str, *args)
-    self
-  end
-
-  def get_tag(val=nil)
-    if val
-      tk_call(@path, 'tag', val)
-    else
-      ret = []
-      lst = simplelist(tk_call(@path, 'tag'))
-      while lst.size > 0
-        ret << ([num_or_str(lst.shift)] << lst.shift)
-      end
-    end
-  end
-
-  def set_tag(val, str, *args)
-    tk_call(@path, 'tag', val, str, *args)
-    self
-  end
-
-  def set_tag_constrain(val, str, *args)
-    tk_call(@path, 'tag', '-constrain', val, str, *args)
-    self
-  end
-
-  def set(val = None)
-    tk_call_without_enc(@path, 'set', val)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/vu/pie.rb b/ext/tk/lib/tkextlib/vu/pie.rb
deleted file mode 100644
index 6b0c485d8a..0000000000
--- a/ext/tk/lib/tkextlib/vu/pie.rb
+++ /dev/null
@@ -1,286 +0,0 @@
-#
-#  ::vu::pie widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# create module/class
-module Tk
-  module Vu
-    module PieSliceConfigMethod
-    end
-    class Pie < TkWindow
-    end
-    class PieSlice < TkObject
-    end
-    class NamedPieSlice < PieSlice
-    end
-  end
-end
-
-# call setup script  --  <libdir>/tkextlib/vu.rb
-require 'tkextlib/vu.rb'
-
-module Tk::Vu::PieSliceConfigMethod
-  include TkItemConfigMethod
-
-  def __item_pathname(tagOrId)
-    if tagOrId.kind_of?(Tk::Vu::PieSlice)
-      self.path + ';' + tagOrId.id.to_s
-    else
-      self.path + ';' + tagOrId.to_s
-    end
-  end
-  private :__item_pathname
-end
-
-class Tk::Vu::Pie < TkWindow
-  TkCommandNames = ['::vu::pie'.freeze].freeze
-  WidgetClassName = 'Pie'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __destroy_hook__
-    Tk::Vu::PieSlice::SliceID_TBL.delete(@path)
-  end
-
-  ###############################
-
-  include Tk::Vu::PieSliceConfigMethod
-
-  def tagid(tag)
-    if tag.kind_of?(Tk::Vu::PieSlice)
-      tag.id
-    else
-      # tag
-      _get_eval_string(tag)
-    end
-  end
-
-  ###############################
-
-  def delete(*glob_pats)
-    tk_call(@path, 'delete', *glob_pats)
-    self
-  end
-
-  def explode(slice, *args)
-    tk_call(@path, 'explode', slice, *args)
-    self
-  end
-
-  def explode_value(slice)
-    num_or_str(tk_call(@path, 'explode', slice))
-  end
-
-  def lower(slice, below=None)
-    tk_call(@path, 'lower', slice, below)
-    self
-  end
-
-  def names(*glob_pats)
-    simplelist(tk_call(@path, 'names', *glob_pats))
-  end
-  alias slices names
-
-  def order(*args)
-    tk_call(@path, 'order', *args)
-    self
-  end
-
-  def raise(slice, above=None)
-    tk_call(@path, 'raise', slice, above)
-    self
-  end
-
-  def swap(slice1, slice2)
-    tk_call(@path, 'swap', slice1, slice2)
-    self
-  end
-
-  def set(slice, *args)
-    num_or_str(tk_call(@path, 'set', slice, *args))
-  end
-  alias set_value  set
-  alias set_values set
-  alias create     set
-
-  def slice_value(slice)
-    num_or_str(tk_call(@path, 'set', slice))
-  end
-
-  def value(val = None)
-    num_or_str(tk_call_without_enc(@path, 'value'))
-  end
-  alias sum_value value
-end
-
-class Tk::Vu::PieSlice
-  SliceID_TBL = TkCore::INTERP.create_table
-
-  (Pie_Slice_ID = ['vu:pie'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    SliceID_TBL.mutex.synchronize{ SliceID_TBL.clear }
-  }
-
-  def self.id2obj(pie, id)
-    pie_path = pie.path
-    SliceID_TBL.mutex.synchronize{
-      if SliceID_TBL[pie_path]
-        SliceID_TBL[pie_path][id]? SliceID_TBL[pie_path][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, *args)
-    unless parent.kind_of?(Tk::Vu::Pie)
-      fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
-    end
-    @parent = @pie = parent
-    @ppath = parent.path
-    Pie_Slice_ID.mutex.synchronize{
-      @path = @id = Pie_Slice_ID.join(TkCore::INTERP._ip_id_)
-      Pie_Slice_ID[1].succ!
-    }
-    SliceID_TBL.mutex.synchronize{
-      SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
-      SliceID_TBL[@ppath][@id] = self
-    }
-
-    if args[-1].kind_of?(Hash)
-      keys = args.unshift
-    end
-    @pie.set(@id, *args)
-    configure(keys)
-  end
-
-  def id
-    @id
-  end
-
-  def [](key)
-    cget key
-  end
-
-  def []=(key,val)
-    configure key, val
-    val
-  end
-
-  def cget_tkstring(slot)
-    @pie.itemcget_tkstring(@id, slot)
-  end
-
-  def cget(slot)
-    @pie.itemcget(@id, slot)
-  end
-
-  def cget_strict(slot)
-    @pie.itemcget_strict(@id, slot)
-  end
-
-  def configure(*args)
-    @pie.itemconfigure(@id, *args)
-    self
-  end
-
-  def configinfo(*args)
-    @pie.itemconfiginfo(@id, *args)
-  end
-
-  def current_configinfo(*args)
-    @pie.current_itemconfiginfo(@id, *args)
-  end
-
-  def delete
-    @pie.delete(@id)
-  end
-
-  def explode(value)
-    @pie.explode(@id, value)
-    self
-  end
-
-  def explode_value
-    @pie.explode_value(@id)
-  end
-
-  def lower(other=None)
-    @pie.lower(@id, other)
-    self
-  end
-
-  def raise(other=None)
-    @pie.raise(@id, other)
-    self
-  end
-
-  def set(value)
-    @pie.set(@id, value)
-    self
-  end
-  alias set_value set
-
-  def value
-    @pie.set(@id)
-  end
-end
-
-class Tk::Vu::NamedPieSlice
-  def self.new(parent, name, *args)
-    obj = nil
-    SliceID_TBL.mutex.synchronize{
-      if SliceID_TBL[parent.path] && SliceID_TBL[parent.path][name]
-        obj = SliceID_TBL[parent.path][name]
-      else
-        #super(parent, name, *args)
-        unless parent.kind_of?(Tk::Vu::Pie)
-          fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
-        end
-        obj = self.allocate
-        obj.instance_eval{
-          @parent = @pie = parent
-          @ppath = parent.path
-          @path = @id = name.to_s
-          SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
-          SliceID_TBL[@ppath][@id] = self
-        }
-      end
-    }
-    obj.instance_eval{
-      if args[-1].kind_of?(Hash)
-        keys = args.unshift
-      end
-      @pie.set(@id, *args)
-      configure(keys)
-    }
-
-    obj
-  end
-
-  def initialize(parent, name, *args)
-    # dummy:: not called by 'new' method
-    unless parent.kind_of?(Tk::Vu::Pie)
-      fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
-    end
-    @parent = @pie = parent
-    @ppath = parent.path
-    @path = @id = name.to_s
-    SliceID_TBL.mutex.synchronize{
-      SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
-      SliceID_TBL[@ppath][@id] = self
-    }
-
-    if args[-1].kind_of?(Hash)
-      keys = args.unshift
-    end
-    @pie.set(@id, *args)
-    configure(keys)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/vu/setup.rb b/ext/tk/lib/tkextlib/vu/setup.rb
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/vu/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/vu/spinbox.rb b/ext/tk/lib/tkextlib/vu/spinbox.rb
deleted file mode 100644
index 7d6104f4d1..0000000000
--- a/ext/tk/lib/tkextlib/vu/spinbox.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-#  ::vu::spinbox widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#  a standard spinbox (<= 8.3)
-#  This is the same as the 8.4 core spinbox widget.
-#
-require 'tk'
-
-if (Tk::TK_MAJOR_VERSION < 8 ||
-    (Tk::TK_MAJOR_VERSION == 8 && Tk::TK_MINOR_VERSION < 4))
-  # call setup script  --  <libdir>/tkextlib/vu.rb
-  require 'tkextlib/vu.rb'
-
-  Tk.tk_call('namespace', 'import', '::vu::spinbox')
-end
-
-module Tk
-  module Vu
-    Spinbox = Tk::Spinbox
-  end
-end
diff --git a/ext/tk/lib/tkextlib/winico.rb b/ext/tk/lib/tkextlib/winico.rb
deleted file mode 100644
index ce7b8eac5c..0000000000
--- a/ext/tk/lib/tkextlib/winico.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#  winico -- Windows Icon 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/tktable/setup.rb'
-
-# load library
-require 'tkextlib/winico/winico'
diff --git a/ext/tk/lib/tkextlib/winico/setup.rb b/ext/tk/lib/tkextlib/winico/setup.rb
deleted file mode 100644
index ee406c6ca0..0000000000
--- a/ext/tk/lib/tkextlib/winico/setup.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  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/winico/winico.rb b/ext/tk/lib/tkextlib/winico/winico.rb
deleted file mode 100644
index 9160c2960f..0000000000
--- a/ext/tk/lib/tkextlib/winico/winico.rb
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-#  tkextlib/winico/winico.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/winico/setup.rb'
-
-# TkPackage.require('winico', '0.5')
-# TkPackage.require('winico', '0.6')
-TkPackage.require('winico')
-
-module Tk
-  class Winico < TkObject
-    PACKAGE_NAME = 'winico'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('winico')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-class Tk::Winico
-  WinicoID_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    WinicoID_TBL.mutex.synchronize{ WinicoID_TBL.clear }
-  }
-
-  def self.id2obj(id)
-    WinicoID_TBL.mutex.synchronize{
-      (WinicoID_TBL.key?(id))? WinicoID_TBL[id] : id
-    }
-  end
-
-  def self.info
-    simplelist(Tk.tk_call('winico', 'info')).collect{|id|
-      Tk::Winico.id2obj(id)
-    }
-  end
-
-  def self.icon_info(id)
-    simplelist(Tk.tk_call('winico', 'info', id)).collect{|inf|
-      h = Hash[*list(inf)]
-      h.keys.each{|k| h[k[1..-1]] = h.delete(k)}
-    }
-  end
-
-  #################################
-
-  def self.new_from_file(file_name)
-    self.new(file_name)
-  end
-
-  def self.new_from_resource(resource_name, file_name = nil)
-    self.new(file_name, resource_name)
-  end
-
-  def initialize(file_name, resource_name=nil, winico_id=nil)
-    if resource_name
-      # from resource
-      if file_name
-        @id = Tk.tk_call('winico', 'load', resource_name, file_name)
-      else
-        @id = Tk.tk_call('winico', 'load', resource_name)
-      end
-    elsif file_name
-      # from .ico file
-      @id = Tk.tk_call('winico', 'createfrom', file_name)
-    elsif winico_id
-      @id = winico_id
-    else
-      fail ArgumentError,
-           "must be given proper information from where loading icons"
-    end
-    @path = @id
-    WinicoID_TBL.mutex.synchronize{
-      WinicoID_TBL[@id] = self
-    }
-  end
-
-  def id
-    @id
-  end
-
-  def set_window(win_id, *opts) # opts := ?'big'|'small'?, ?pos?
-    # NOTE:: the window, which is denoted by win_id, MUST BE MAPPED.
-    #        If not, then this may fail or crash.
-    tk_call('winico', 'setwindow', win_id, @id, *opts)
-  end
-
-  def delete
-    tk_call('winico', 'delete', @id)
-    WinicoID_TBL.mutex.synchronize{
-      WinicoID_TBL.delete(@id)
-    }
-    self
-  end
-  alias destroy delete
-
-  def info
-    Tk::Winico.icon_info(@id)
-  end
-
-  #################################
-
-  class Winico_callback < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?m, ?s, :message ],
-        [ ?i, ?x, :icon ],
-        [ ?x, ?n, :x ],
-        [ ?y, ?n, :y ],
-        [ ?X, ?n, :last_x ],
-        [ ?Y, ?n, :last_y ],
-        [ ?t, ?n, :tickcount ],
-        [ ?w, ?n, :icon_idnum ],
-        [ ?l, ?n, :msg_idnum ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?n, TkComm.method(:number) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?x, proc{|id|
-            Tk::Winico::WinicoID_TBL.mutex.synchronize{
-              if Tk::Winico::WinicoID_TBL.key?(id)
-                obj = Tk::Winico::WinicoID_TBL[id]
-              else
-                # Tk::Winico.new(nil, nil, id)
-                obj = Tk::Winico.allocate
-                obj.instance_eval{ @path = @id = id }
-                Tk::Winico::WinicoID_TBL[id] = obj
-              end
-              obj
-            }
-          } ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        val
-      end
-    end
-
-    def self._config_keys
-      ['callback']
-    end
-  end
-
-  #################################
-
-  def add_to_taskbar(keys = {})
-    keys = _symbolkey2str(keys)
-    Winico_callback._config_keys.each{|k|
-      if keys[k].kind_of?(Array)
-        cmd, *args = keys[k]
-        #keys[k] = Winico_callback.new(cmd, args.join(' '))
-        keys[k] = Winico_callback.new(cmd, *args)
-       # elsif keys[k].kind_of?(Proc)
-      elsif TkComm._callback_entry?(keys[k])
-        keys[k] = Winico_callback.new(keys[k])
-      end
-    }
-    tk_call('winico', 'taskbar', 'add', @id, *(hash_kv(keys)))
-    self
-  end
-  alias taskbar_add add_to_taskbar
-
-  def modify_taskbar(keys = {})
-    keys = _symbolkey2str(keys)
-    Winico_callback._config_keys.each{|k|
-      if keys[k].kind_of?(Array)
-        cmd, *args = keys[k]
-        #keys[k] = Winico_callback.new(cmd, args.join(' '))
-        keys[k] = Winico_callback.new(cmd, *args)
-      # elsif keys[k].kind_of?(Proc)
-      elsif TkComm._callback_entry?(keys[k])
-        keys[k] = Winico_callback.new(keys[k])
-      end
-    }
-    tk_call('winico', 'taskbar', 'modify', @id, *(hash_kv(keys)))
-    self
-  end
-  alias taskbar_modify modify_taskbar
-
-  def delete_from_taskbar
-    tk_call('winico', 'taskbar', 'delete', @id)
-    self
-  end
-  alias taskbar_delete delete_from_taskbar
-end
diff --git a/ext/tk/lib/tkfont.rb b/ext/tk/lib/tkfont.rb
deleted file mode 100644
index 38a96633de..0000000000
--- a/ext/tk/lib/tkfont.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkfont.rb - load tk/font.rb
-#
-require 'tk/font'
diff --git a/ext/tk/lib/tkmacpkg.rb b/ext/tk/lib/tkmacpkg.rb
deleted file mode 100644
index 35560e78ce..0000000000
--- a/ext/tk/lib/tkmacpkg.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkmacpkg.rb - load tk/macpkg.rb
-#
-require 'tk/macpkg'
diff --git a/ext/tk/lib/tkmenubar.rb b/ext/tk/lib/tkmenubar.rb
deleted file mode 100644
index 70214fda1a..0000000000
--- a/ext/tk/lib/tkmenubar.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkmenubar.rb - load tk/menubar.rb
-#
-require 'tk/menubar'
diff --git a/ext/tk/lib/tkmngfocus.rb b/ext/tk/lib/tkmngfocus.rb
deleted file mode 100644
index fe70950e8e..0000000000
--- a/ext/tk/lib/tkmngfocus.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkmngfocus.rb - load tk/mngfocus.rb
-#
-require 'tk/mngfocus'
diff --git a/ext/tk/lib/tkpalette.rb b/ext/tk/lib/tkpalette.rb
deleted file mode 100644
index 56b203bbb9..0000000000
--- a/ext/tk/lib/tkpalette.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkpalette.rb - load tk/palette.rb
-#
-require 'tk/palette'
diff --git a/ext/tk/lib/tkscrollbox.rb b/ext/tk/lib/tkscrollbox.rb
deleted file mode 100644
index 6093b2e4e7..0000000000
--- a/ext/tk/lib/tkscrollbox.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkscrollbox.rb - load tk/scrollbox.rb
-#
-require 'tk/scrollbox'
diff --git a/ext/tk/lib/tktext.rb b/ext/tk/lib/tktext.rb
deleted file mode 100644
index 97ad62a3ea..0000000000
--- a/ext/tk/lib/tktext.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tktext.rb - load tk/text.rb
-#
-require 'tk/text'
diff --git a/ext/tk/lib/tkvirtevent.rb b/ext/tk/lib/tkvirtevent.rb
deleted file mode 100644
index f4fae19a0a..0000000000
--- a/ext/tk/lib/tkvirtevent.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkvirtevent.rb - load tk/virtevent.rb
-#
-require 'tk/virtevent'
diff --git a/ext/tk/lib/tkwinpkg.rb b/ext/tk/lib/tkwinpkg.rb
deleted file mode 100644
index 83371c546d..0000000000
--- a/ext/tk/lib/tkwinpkg.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#   tkwinpkg.rb - load tk/winpkg.rb
-#
-require 'tk/winpkg'
diff --git a/ext/tk/old-README.tcltklib.eucj b/ext/tk/old-README.tcltklib.eucj
deleted file mode 100644
index 1683629fcb..0000000000
--- a/ext/tk/old-README.tcltklib.eucj
+++ /dev/null
@@ -1,159 +0,0 @@
-(tof)
-                                    2003/06/19  Hidetoshi NAGAI
-
-�ܥɥ�����ȤˤϸŤ� tcltk �饤�֥�ꡤtcltklib �饤�֥�������
-���ޤޤ�Ƥ��ޤ��������ε������ƤϸŤ���ΤȤʤäƤ��ޤ���
-
-�ޤ������ߤ� Ruby/Tk ���濴�Ǥ��� tk.rb �� wish ��ƤӽФ�����Ϥ�
-����tcltklib �饤�֥��� wrap ����ư����ΤȤʤäƤ��ޤ�������
-���ᡤ�Ť��������ҤǽҤ٤��Ƥ���褦�ʥץ��������̿��ˤ�륪����
-�إåɤ�¸�ߤ��ޤ���
-
-���ߤ� tcltklib �饤�֥��Ǥ⡤Tcl/Tk �� C �饤�֥����󥯤���
-ľ�ܤ�ư�������Ȥǡ������Хإåɤ򲡤����Ĥ� Tcl/Tk ���󥿡��ץ꥿
-�Τۤ�����ǽ�ʳ�ĥ�饤�֥���ޤ�ˤ�Ȥ�������Ʊ���Ǥ�����������
-�������Ϥۤܡ�tk.rb �ʲ��Υ饤�֥������Ū��Ư�����뤿��Τ�Ρ�
-�ȸ��ʤ���Ƥ��ꡤ������Ū�ǥ��ƥʥ󥹤���Ƥ��ޤ���
-
-tk.rb �ιⵡǽ����ȼ�äơ�����Υ饤�֥��Ǥ��� tcltk �饤�֥��
-��tcltk.rb�ˤϤ���¸�߰յ��򸺤��Ƥ��ꡤ���ߤǤϥ��ƥʥ󥹤ϹԤ�
-��Ƥ��ޤ���
-
-�ʤ����Ť������ǤϥХ���ǥ��󥰤ˤ����륹����ץȤ��ɲäϤǤ��ʤ���
-�ȤȤʤäƤ��ޤ��������ߤ� tk.rb �ǤϤ�����ǽ�Ǥ��뤳�Ȥ�������
-�����ޤ���
-
-�ʲ����饤�֥��θŤ�����ʸ��Ǥ���
-==============================================================
-	tcltk �饤�֥��
-	tcltklib �饤�֥��
-		Sep. 19, 1997	Y. Shigehiro
-
-�ʲ�, ��tcl/tk�פȤ���ɽ����, tclsh �� wish ��¸����Ƥ���, ���̤Ǥ���
-�Ȥ����� tcl/tk ��ؤ��ޤ�. ��tcltk �饤�֥���, ��tcltklib �饤�֥�
-��פȤ���ɽ����, �ܥѥå������˴ޤޤ�� ruby �ѤΥ饤�֥���ؤ��ޤ�.
-
-[�ե�����ˤĤ���]
-
-README.euc : ���Υե�����(����, ��ħ, ���󥹥ȡ������ˡ).
-MANUAL.euc : �ޥ˥奢��.
-
-lib/, ext/ : �饤�֥��μ���.
-
-sample/ : �ޥ˥奢������Υ���ץ�ץ������.
-sample/sample0.rb : tcltklib �饤�֥��Υƥ���.
-sample/sample1.rb : tcltk �饤�֥��Υƥ���.
-    tcl/tk (wish) �ǤǤ������ʤ��Ȥ���̤�񤤤Ƥߤޤ���.
-sample/sample2.rb : tcltk �饤�֥��Υ���ץ�.
-    maeda shugo (shugo@po.aianet.ne.jp) ��ˤ��
-    (`rb.tk' �ǽ񤫤�Ƥ���) ruby �Υ���ץ�ץ������
-	http://www.aianet.or.jp/~shugo/ruby/othello.rb.gz
-    �� tcltk �饤�֥���Ȥ��褦��, ����Ū���ѹ����Ƥߤޤ���.
-
-demo/ : 100 �ܤ����� 100 �������ǥ�ץ������.
-    �ǽ�˶��롼�פλ��֤�¬�ꤷ, ³���Ƽºݤ�����������֤�¬�ꤷ�ޤ�.
-    tcl/tk ��(��)����ΤȤ��� backing store ��Ȥ鷺��Χ���� 10000 ��(?)
-    ��������Τ�, (��)�����Ϥ���, �ޥ��󤬤��ʤ�Ť��ʤ�ޤ�.
-demo/lines0.tcl : wish �ѤΥ�����ץ�.
-demo/lines1.rb : `tk.rb' �ѤΥ�����ץ�.
-demo/lines2.rb : tcltk �饤�֥���ѤΥ�����ץ�.
-
-[����]
-
-����ѥ���/�¹Ԥˤ�, tcl/tk �� C �饤�֥�꤬ɬ�פǤ�.
-
-���Υ饤�֥���,
-
-	ruby-1.0-970701, ruby-1.0-970911, ruby-1.0-970919
-	FreeBSD 2.2.2-RELEASE
-	����Ӥ��Υѥå����� jp-tcl-7.6.tgz, jp-tk-4.2.tgz
-
-�Ǻ���/ư���ǧ���ޤ���. ¾�δĶ��Ǥ�ư��뤫�ɤ����狼��ޤ���.
-
-TclTkLib.mainloop ��¹���� Control-C �������ʤ��Τ����ؤʤΤ�, ruby
-�Υ������򻲹ͤ�, #include "sig.h" ���� trap_immediate �����Ƥ���
-����, ruby �� README.EXT �ˤ�񤤤Ƥʤ��Τ�, ����ʤ��Ȥ򤷤��ɤ��Τ�
-�ɤ����狼��ޤ���.
-
--d ���ץ����ǥǥХå������ɽ�������뤿���, ruby �Υ������򻲹ͤ�,
-debug �Ȥ�������ѿ��򻲾Ȥ��Ƥ��ޤ���, ruby �� README.EXT �ˤ�񤤤�
-�ʤ��Τ�, ����ʤ��Ȥ򤷤��ɤ��Τ��ɤ����狼��ޤ���.
-
-extconf.rb �Ͻ񤭤ޤ�����, (���������ʰ�̣��)������ɤ��Τ��ɤ�ʬ����
-�ޤ���.
-
-[��ħ]
-
-ruby ���� tcl/tk �饤�֥������ѤǤ��ޤ�.
-
-tcl/tk ���󥿥ץ꥿�Υ�����ץȤ�, ����Ū�� tcltk �饤�֥���Ѥ� ruby
-������ץȤ��Ѵ��Ǥ��ޤ�.
-
-(`tk.rb' �Ȥΰ㤤)
-
-1. tcl/tk ���󥿥ץ꥿�Υ�����ץȤ�, �ɤΤ褦��, tcltk �饤�֥���Ѥ�
-   ruby ������ץȤ��Ѵ�����뤫������Ǥ����, �ޥ˥奢���ब̵������
-   ���� `tk.rb' �Ȥϰۤʤ�
-
-	tcl/tk �Υޥ˥奢��䥪��饤��ɥ�����Ȥ��Ѥ���
-
-   ��Ψ�ɤ��ץ�����ߥ󥰤�Ԥ����Ȥ��Ǥ��ޤ�.
-   ������ˡ���狼��ʤ�, ���ޥ�ɤ�Ϳ����ѥ�᡼�����狼��ʤ�...
-     - Canvas.new { ... } ��, �ʤ����ƥ졼���֥��å���񤱤��??
-     - Canvas �� bbox �Ͽ��ͤΥꥹ�Ȥ��֤��Τ�, xview ��ʸ������֤���??
-   ��, ��������, �饤�֥��Υ��������ɤ�������ɬ�פϤ���ޤ���.
-
-2. �ġ��ε�ǽ(���ץ����)����̽����ˤ�ꥵ�ݡ��Ȥ��Ƥ���, ���Τ��᥵
-   �ݡ��Ȥ��Ƥ��ʤ���ǽ�ϻȤ����Ȥ��Ǥ��ʤ�(�����ϻȤ��ʤ����Ȥ�ʤ���
-   �Ǥ���) `tk.rb' �Ȥϰۤʤ�, tcl/tk ���󥿥ץ꥿�ǲ�ǽ�ʤ��Ȥ�
-
-	�ۤȤ��
-
-   ruby �����¹ԤǤ��ޤ�. ����, ruby ����¹ԤǤ��ʤ����Ȥ���ǧ����
-   �Ƥ���Τ�,
-
-	bind ���ޥ�ɤǥ�����ץȤ��ɲä��빽ʸ
-	��bind tag sequence +script��
-                            ^
-
-   �ΤߤǤ�.
-     - `. configure -width' �򤷤褦�Ȥ���, `Tk.root.height()' �Ƚ�
-      ���Τ�, `undefined method `height'' ���ܤ��Ƥ��ޤä�. tk.rb ��
-      �ɤ�Ǥߤ�, ������. �Ǥ��ʤ��Τ�...
-   �Ȥ������ȤϤ���ޤ���.
-
-3. wish �ץ�������ư���ץ��������̿��� wish �����Ѥ��� `tk.rb' �Ȥ�
-   �ۤʤ�, tcl/tk �� C �饤�֥����󥯤�
-
-	����®�� (�Ȥ��äƤ�, �פä�����®���ʤ��Ǥ���)
-
-   ������Ԥ��ޤ�.
-
-4. `tk.rb' �ۤ�, ����ʥ��󥿡��ե������������Ƥ��ʤ�����, tcl/tk ��
-   �󥿥ץ꥿��������
-
-	�����鲿�ޤǼ�ʬ�ǵ���
-
-   ���ʤ���Фʤ�ޤ���(��������, tcl/tk �饤�֥��λ����̤�,
-   tcl/tk ���󥿥ץ꥿��ʣ���������뤳�Ȥ�Ǥ��ޤ���).
-   ���󥿡��ե�������(�����餯) ruby �λ��ۤ˱�ä���ΤǤϤ���ޤ���.
-   �ޤ�, ������ץȤε��Ҥ�
-
-	��������
-
-   �Ǥ�. ������ץȤ�, �츫, �ɤߤŤ餤��ΤȤʤ�ޤ�. ��, �񤯿ͤˤȤ�
-   �Ƥ�, ����ۤ��Ѥ路����ΤǤϤʤ��Ȼפ��ޤ�.
-
-[���󥹥ȡ������ˡ]
-
-0. ruby �Υ������ե�����(ruby-1.0-�ʤ󤿤�.tgz)��Ÿ�����Ƥ����ޤ�.
-
-1. ruby-1.0-�ʤ󤿤�/ext �� ext/tcltklib �򥳥ԡ����ޤ�.
-	cp -r ext/tcltklib ???/ruby-1.0-�ʤ󤿤�/ext/
-
-2. ruby �Υ��󥹥ȡ���ˡ�˽��� make ���򤷤ޤ�.
-
-3. ruby �Υ饤�֥���־�� lib/* �򥳥ԡ����ޤ�.
-	cp lib/* /usr/local/lib/ruby/
-
-(eof)
diff --git a/ext/tk/old-extconf.rb b/ext/tk/old-extconf.rb
deleted file mode 100644
index ebc83a0c0b..0000000000
--- a/ext/tk/old-extconf.rb
+++ /dev/null
@@ -1,440 +0,0 @@
-# extconf.rb for tcltklib
-
-require 'mkmf'
-
-is_win32 = (/mswin|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM)
-#is_macosx = (/darwin/ =~ RUBY_PLATFORM)
-
-have_func("ruby_native_thread_p", "ruby.h")
-have_func("rb_errinfo", "ruby.h")
-have_func("rb_safe_level", "ruby.h")
-have_struct_member("struct RArray", "ptr", "ruby.h")
-have_struct_member("struct RArray", "len", "ruby.h")
-
-def find_framework(tcl_hdr, tk_hdr)
-  if framework_dir = with_config("tcltk-framework")
-    paths = [framework_dir]
-  else
-    unless tcl_hdr || tk_hdr ||
-        enable_config("tcltk-framework", false) ||
-        enable_config("mac-tcltk-framework", false)
-      return false
-    end
-    paths = ["/Library/Frameworks", "/System/Library/Frameworks"]
-  end
-
-  checking_for('Tcl/Tk Framework') {
-    paths.find{|dir|
-      dir.strip!
-      dir.chomp!('/')
-      (tcl_hdr || FileTest.directory?(dir + "/Tcl.framework/") ) &&
-        (tk_hdr || FileTest.directory?(dir + "/Tk.framework/") )
-    }
-  }
-end
-
-tcl_framework_header = with_config("tcl-framework-header")
-tk_framework_header  = with_config("tk-framework-header")
-
-tcltk_framework = find_framework(tcl_framework_header, tk_framework_header)
-
-unless is_win32
-  have_library("nsl", "t_open")
-  have_library("socket", "socket")
-  have_library("dl", "dlopen")
-  have_library("m", "log")
-end
-
-tk_idir,  tk_ldir  = dir_config("tk")
-tcl_idir, tcl_ldir = dir_config("tcl")
-x11_idir, x11_ldir = dir_config("X11")
-
-tk_ldir2  = with_config("tk-lib")
-tcl_ldir2 = with_config("tcl-lib")
-x11_ldir2 = with_config("X11-lib")
-
-tk_ldir_list  = [tk_ldir2,  tk_ldir]
-tcl_ldir_list = [tcl_ldir2, tcl_ldir]
-
-tklib = with_config("tklib")
-tcllib = with_config("tcllib")
-stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
-
-tcltk_version = with_config("tcltkversion")
-
-use_X = with_config("X11", (! is_win32))
-
-def parse_tclConfig(file)
-  # check tclConfig.sh/tkConfig.sh
-  tbl = {}
-  IO.foreach(file){|line|
-    line.strip!
-    next if line !~ /^([^\#=][^=]*)=(['"]|)(.*)\2$/
-    key, val = $1, $3
-    tbl[key] = val.gsub(/\$\{([^}]+)\}/){|s| tbl[$1]} rescue nil
-  }
-  tbl
-end
-
-def check_tcltk_version(version)
-  return [nil, nil] unless version
-
-  version = version.strip
-
-  tclver = version.dup
-  tkver  = version.dup
-
-  major = dot = minor = dot = plvl = ext = nil
-
-  if version =~ /^(\d)(\.?)(\d)(\.?)(\d*)(.*)$/
-    major = $1; minor_dot = $2; minor = $3; plvl_dot  = $4; plvl = $5; ext = $6
-    dot = ! minor_dot.empty?
-    if plvl_dot.empty? && ! plvl.empty?
-      minor << plvl
-    end
-  elsif version =~ /^(\d)(\.?)(\d?)(.*)$/
-    major = $1; minor_dot = $2; minor = $3; ext = $4
-    dot = ! minor_dot.empty?
-  else # unknown -> believe user
-    return [tclver, tkver]
-  end
-
-  # check Tcl7.6 / Tk4.2 ?
-  if major == "7" # Tcl7.6 ( not support Tclversion < 7.6 )
-    # Tk4.2
-    tkver  = "4" + ((dot)? ".": "") + ((minor.empty)? "": "2") + ext
-  elsif major == "4" # Tk4.2 ( not support Tkversion < 4.2 )
-    # Tcl7.6
-    tclver = "7" + ((dot)? ".": "") + ((minor.empty)? "": "6") + ext
-  end
-
-  [tclver, tkver]
-end
-
-def find_tcl(tcllib, stubs, version, *opt_paths)
-  default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
-  default_paths << "/Tcl/lib"  # default for ActiveTcl
-
-  if (paths = opt_paths.compact).empty?
-    paths = default_paths
-  end
-
-  if stubs
-    func = "Tcl_InitStubs"
-    lib = "tclstub"
-  else
-    func = "Tcl_FindExecutable"
-    lib = "tcl"
-  end
-
-  if version && ! version.empty?
-    versions = [version]
-  else
-    versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6]
-  end
-
-  if tcllib
-    st = find_library(tcllib, func, *paths)
-  else
-    st = versions.find { |ver|
-           find_library("#{lib}#{ver}", func, *paths) or
-           find_library("#{lib}#{ver.delete('.')}", func, *paths) or
-           find_library("#{lib}#{ver}g", func, *paths) or
-           find_library("#{lib}#{ver.delete('.')}g", func, *paths) or
-           find_library("tcl#{ver}", func, *paths) or
-           find_library("tcl#{ver.delete('.')}", func, *paths) or
-           find_library("tcl#{ver}g", func, *paths) or
-           find_library("tcl#{ver.delete('.')}g", func, *paths)
-         } || (!version && find_library(lib, func, *paths))
-  end
-
-  unless st
-    puts("Warning:: cannot find Tcl library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
-  end
-  st
-end
-
-def find_tk(tklib, stubs, version, *opt_paths)
-  default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
-  default_paths << "/Tcl/lib"  # default for ActiveTcl
-
-  if (paths = opt_paths.compact).empty?
-    paths = default_paths
-  end
-
-  if stubs
-    func = "Tk_InitStubs"
-    lib = "tkstub"
-  else
-    func = "Tk_Init"
-    lib = "tk"
-  end
-
-  if version && ! version.empty?
-    versions = [version]
-  else
-    versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 4.2]
-  end
-
-  if tklib
-    st = find_library(tklib, func, *paths)
-  else
-    st = versions.find { |ver|
-           find_library("#{lib}#{ver}", func, *paths) or
-           find_library("#{lib}#{ver.delete('.')}", func, *paths) or
-           find_library("#{lib}#{ver}g", func, *paths) or
-           find_library("#{lib}#{ver.delete('.')}g", func, *paths) or
-           find_library("tk#{ver}", func, *paths) or
-           find_library("tk#{ver.delete('.')}", func, *paths) or
-           find_library("tk#{ver}g", func, *paths) or
-           find_library("tk#{ver.delete('.')}g", func, *paths)
-         } || (!version && find_library(lib, func, *paths))
-  end
-
-  unless st
-    puts("Warning:: cannot find Tk library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
-  end
-  st
-end
-
-def find_tcltk_header(tclver, tkver)
-  base_dir = ['/usr/local/include', '/usr/pkg/include', '/usr/include']
-  base_dir << '/Tcl/include' # default for ActiveTcl
-
-  unless have_tcl_h = have_header('tcl.h')
-    if tclver && ! tclver.empty?
-      versions = [tclver]
-    else
-      versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6]
-    end
-    paths = base_dir.dup
-    versions.each{|ver| paths.concat(base_dir.map{|dir| dir + '/tcl' + ver})}
-    have_tcl_h = find_header('tcl.h', *paths)
-  end
-
-  unless have_tk_h  = have_header("tk.h")
-    if tkver && ! tkver.empty?
-      versions = [tkver]
-    else
-      versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 4.2]
-    end
-    paths = base_dir.dup
-    versions.each{|ver| paths.concat(base_dir.map{|dir| dir + '/tk' + ver})}
-    have_tk_h = find_header('tk.h', *paths)
-  end
-
-  have_tcl_h && have_tk_h
-end
-
-def find_X11(*opt_paths)
-  default_paths =
-    [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib" ]
-  paths = opt_paths.compact.concat(default_paths)
-  st = find_library("X11", "XOpenDisplay", *paths)
-  unless st
-    puts("Warning:: cannot find X11 library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options. If your Tcl/Tk don't require X11, please try --without-X11.")
-  end
-  st
-end
-
-def pthread_check()
-  tcl_major_ver = nil
-  tcl_minor_ver = nil
-
-  # Is tcl-thread given by user ?
-  case enable_config("tcl-thread")
-  when true
-    tcl_enable_thread = true
-  when false
-    tcl_enable_thread = false
-  else
-    tcl_enable_thread = nil
-  end
-
-  if (tclConfig = with_config("tclConfig-file"))
-    if tcl_enable_thread == true
-      puts("Warning: --with-tclConfig-file option is ignored, because --enable-tcl-thread option is given.")
-    elsif tcl_enable_thread == false
-      puts("Warning: --with-tclConfig-file option is ignored, because --disable-tcl-thread option is given.")
-    else
-      # tcl-thread is unknown and tclConfig.sh is given
-      begin
-        tbl = parse_tclConfig(tclConfig)
-        if tbl['TCL_THREADS']
-          tcl_enable_thread = (tbl['TCL_THREADS'] == "1")
-        else
-          tcl_major_ver = tbl['TCL_MAJOR_VERSION'].to_i
-          tcl_minor_ver = tbl['TCL_MINOR_VERSION'].to_i
-          if tcl_major_ver < 8 || (tcl_major_ver == 8 && tcl_minor_ver == 0)
-            tcl_enable_thread = false
-          end
-        end
-
-        if tcl_enable_thread == nil
-          # cannot find definition
-          if tcl_major_ver
-            puts("Warning: '#{tclConfig}' doesn't include TCL_THREADS definition.")
-          else
-            puts("Warning: '#{tclConfig}' may not be a tclConfig file.")
-          end
-          tclConfig = false
-        end
-      rescue Exception
-        puts("Warning: fail to read '#{tclConfig}'!! --> ignore the file")
-        tclConfig = false
-      end
-    end
-  end
-
-  if tcl_enable_thread == nil && !tclConfig
-    # tcl-thread is unknown and tclConfig is unavailable
-    begin
-      try_run_available = try_run("int main() { exit(0); }")
-    rescue Exception
-      # cannot try_run. Is CROSS-COMPILE environment?
-      puts(%Q'\
-*****************************************************************************
-**
-** PTHREAD SUPPORT CHECK WARNING:
-**
-**   We cannot check the consistency of pthread support between Ruby
-**   and the Tcl/Tk library in your environment (are you perhaps
-**   cross-compiling?). If pthread support for these 2 packages is
-**   inconsistent you may find you get errors when running Ruby/Tk
-**   (e.g. hangs or segmentation faults).  We strongly recommend
-**   you to check the consistency manually.
-**
-*****************************************************************************
-')
-      return true
-    end
-  end
-
-  if tcl_enable_thread == nil
-    # tcl-thread is unknown
-    if try_run(<<EOF)
-#include <tcl.h>
-int main() {
-   Tcl_Interp *ip;
-   ip = Tcl_CreateInterp();
-   exit((Tcl_Eval(ip, "set tcl_platform(threaded)") == TCL_OK)? 0: 1);
-}
-EOF
-      tcl_enable_thread = true
-    elsif try_run(<<EOF)
-#include <tcl.h>
-static Tcl_ThreadDataKey dataKey;
-int main() { exit((Tcl_GetThreadData(&dataKey, 1) == dataKey)? 1: 0); }
-EOF
-      tcl_enable_thread = true
-    else
-      tcl_enable_thread = false
-    end
-  end
-
-  # check pthread mode
-  if (macro_defined?('HAVE_NATIVETHREAD', '#include "ruby.h"'))
-    # ruby -> enable
-    unless tcl_enable_thread
-      # ruby -> enable && tcl -> disable
-      puts(%Q'\
-*****************************************************************************
-**
-** PTHREAD SUPPORT MODE WARNING:
-**
-**   Ruby is compiled with --enable-pthread, but your Tcl/Tk library
-**   seems to be compiled without pthread support. Although you can
-**   create the tcltklib library, this combination may cause errors
-**   (e.g. hangs or segmentation faults). If you have no reason to
-**   keep the current pthread support status, we recommend you reconfigure
-**   and recompile the libraries so that both or neither support pthreads.
-**
-**   If you want change the status of pthread support, please recompile
-**   Ruby without "--enable-pthread" configure option or recompile Tcl/Tk
-**   with "--enable-threads" configure option (if your Tcl/Tk is later
-**   than or equal to Tcl/Tk 8.1).
-**
-*****************************************************************************
-')
-    end
-
-    # ruby -> enable && tcl -> enable/disable
-    if tcl_enable_thread
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
-    else
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
-    end
-
-    return true
-
-  else
-    # ruby -> disable
-    if tcl_enable_thread
-      # ruby -> disable && tcl -> enable
-      puts(%Q'\
-*****************************************************************************
-**
-** PTHREAD SUPPORT MODE ERROR:
-**
-**   Ruby is not compiled with --enable-pthread, but your Tcl/Tk
-**   library seems to be compiled with pthread support. This
-**   combination may cause frequent hang or segmentation fault
-**   errors when Ruby/Tk is working. We recommend that you NEVER
-**   create the library with such a combination of pthread support.
-**
-**   Please recompile Ruby with the "--enable-pthread" configure option
-**   or recompile Tcl/Tk with the "--disable-threads" configure option.
-**
-*****************************************************************************
-')
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
-      return false
-    else
-      # ruby -> disable && tcl -> disable
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
-      return true
-    end
-  end
-end
-
-tclver, tkver = check_tcltk_version(tcltk_version)
-
-if ( tcltk_framework ||
-       ( find_tcltk_header(tclver, tkver) &&
-           ( !use_X || find_X11(x11_ldir2, x11_ldir) ) &&
-           find_tcl(tcllib, stubs, tclver, *tcl_ldir_list) &&
-           find_tk(tklib, stubs, tkver, *tk_ldir_list) ) )
-  $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
-  $CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
-
-  if tcltk_framework
-    if tcl_framework_header
-      $CPPFLAGS += " -I#{tcl_framework_header}"
-    else
-      $CPPFLAGS += " -I#{tcltk_framework}/Tcl.framework/Headers"
-    end
-
-    if tk_framework_header
-      $CPPFLAGS += " -I#{tk_framework_header}"
-    else
-      $CPPFLAGS += " -I#{tcltk_framework}/Tk.framework/Headers"
-    end
-
-    $LDFLAGS += ' -framework Tk -framework Tcl'
-  end
-
-  if stubs or pthread_check
-    # create Makefile
-
-    # for SUPPORT_STATUS
-    $INSTALLFILES ||= []
-    $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
-
-    have_func("rb_hash_lookup", "ruby.h")
-
-    # create
-    $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
-    $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
-    create_makefile("tcltklib")
-  end
-end
diff --git a/ext/tk/sample/24hr_clock.rb b/ext/tk/sample/24hr_clock.rb
deleted file mode 100644
index 29f84e0b40..0000000000
--- a/ext/tk/sample/24hr_clock.rb
+++ /dev/null
@@ -1,286 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'tk'
-
-class Clock
-  def initialize(clock24 = true)
-    @clock = (clock24)? 24: 12
-
-    @size = 200
-    @cdot_size = 5
-
-    @cdot_color        = 'black'
-    @hour_hand_color   = 'black'
-    @minute_hand_color = 'gray25'
-    @second_hand_color = 'gray50'
-
-    @mark_font     = 'Helvetica -14'
-    @mark_width    = 3
-    @mark_color    = 'black'
-    @submark_color = 'gray50'
-
-    @c = TkCanvas.new(:width=>2*@size, :height=>2*@size,
-                     :scrollregion=>[-@size, -@size, @size, @size]
-                     ).pack(:fill=>:both, :expand=>true)
-
-    @tag = TkcTag.new(@c)
-    @hand_tag = TkcTag.new(@c)
-
-    @circle_coords = [[-0.9*@size, -0.9*@size], [0.9*@size, 0.9*@size]]
-    @oval = TkcOval.new(@c, @circle_coords, :fill=>'white', :tags=>[@tag])
-
-    f = TkFrame.new.pack
-    TkLabel.new(f, :text=>'CURRENT:').pack(:side=>:left)
-    @now = TkLabel.new(f, :text=>'00:00:00').pack(:side=>:left, :padx=>2)
-    TkLabel.new(f, :text=>'  ').pack(:side=>:left)
-    TkLabel.new(f, :text=>'  ').pack(:side=>:right)
-    @l = TkLabel.new(f, :text=>'00:00').pack(:side=>:right, :padx=>2)
-    TkLabel.new(f, :text=>'MOUSE-POINTER:').pack(:side=>:right)
-
-    cmd = proc{|x, y|
-      @l.text = '%02d:%02d' % coords_to_time(@c.canvasx(x), @c.canvasy(y))
-    }
-    @c.bind('Motion', cmd, '%x %y')
-    @tag.bind('Motion', cmd, '%x %y')
-
-    _create_hands
-    _create_marks
-
-    timer_proc = proc{
-      t = Time.now
-      @now.text = '%02d:%02d:%02d' % [t.hour, t.min, t.sec]
-      set_hands(t.hour, t.min, t.sec)
-    }
-
-    timer_proc.call
-    @timer = TkRTTimer.start(100, -1, timer_proc)
-  end
-
-  def _create_marks
-    @mark_tag = TkcTag.new(@c)
-
-    TkcLine.new(@c, 0, -0.90*@size, 0, -0.85*@size,
-                :tags=>[@tag, @mark_tag],
-                :width=>@mark_width, :fill=>@mark_color)
-    TkcLine.new(@c, 0.90*@size, 0, 0.85*@size, 0,
-                :tags=>[@tag, @mark_tag],
-                :width=>@mark_width, :fill=>@mark_color)
-    TkcLine.new(@c, 0, 0.90*@size, 0, 0.85*@size,
-                :tags=>[@tag, @mark_tag],
-                :width=>@mark_width, :fill=>@mark_color)
-    TkcLine.new(@c, -0.90*@size, 0, -0.85*@size, 0,
-                :tags=>[@tag, @mark_tag],
-                :width=>@mark_width, :fill=>@mark_color)
-
-    TkcText.new(@c, [0, -0.92*@size], :text=>0,
-                :anchor=>'s', :fill=>@mark_color)
-    TkcText.new(@c, [0.92*@size, 0], :text=>@clock.div(4),
-                :anchor=>'w', :fill=>@mark_color)
-    TkcText.new(@c, [0, 0.92*@size], :text=>@clock.div(2),
-                :anchor=>'n', :fill=>@mark_color)
-    TkcText.new(@c, [-0.92*@size, 0], :text=>@clock.div(4)*3,
-                :anchor=>'e', :fill=>@mark_color)
-
-    [30.0, 60.0].each{|angle|
-      rad = Math::PI * angle / 180.0
-      x_base = @size*Math::sin(rad)
-      y_base = @size*Math::cos(rad)
-
-      x1 = 0.90*x_base
-      y1 = 0.90*y_base
-
-      x2 = 0.85*x_base
-      y2 = 0.85*y_base
-
-      TkcLine.new(@c, x1, y1, x2, y2,
-                  :tags=>[@tag, @mark_tag],
-                  :width=>@mark_width, :fill=>@mark_color)
-      TkcLine.new(@c, x1, -y1, x2, -y2,
-                  :tags=>[@tag, @mark_tag],
-                  :width=>@mark_width, :fill=>@mark_color)
-      TkcLine.new(@c, -x1, y1, -x2, y2,
-                  :tags=>[@tag, @mark_tag],
-                  :width=>@mark_width, :fill=>@mark_color)
-      TkcLine.new(@c, -x1, -y1, -x2, -y2,
-                  :tags=>[@tag, @mark_tag],
-                  :width=>@mark_width, :fill=>@mark_color)
-
-      x3 = 0.92*x_base
-      y3 = 0.92*y_base
-
-      if @clock == 24
-        dh = angle.to_i/15
-      else # @clock == 12
-        dh = angle.to_i/30
-      end
-
-      TkcText.new(@c, x3, -y3, :text=>dh,
-                  :anchor=>'sw', :fill=>@mark_color)
-      TkcText.new(@c, x3, y3, :text=>@clock.div(2)-dh,
-                  :anchor=>'nw', :fill=>@mark_color)
-      TkcText.new(@c, -x3, y3, :text=>@clock.div(2)+dh,
-                  :anchor=>'ne', :fill=>@mark_color)
-      TkcText.new(@c, -x3, -y3, :text=>@clock-dh,
-                  :anchor=>'se', :fill=>@mark_color)
-    }
-
-    if @clock == 24
-      [15.0, 45.0, 75.0].each{|angle|
-        rad = Math::PI * angle / 180.0
-        x_base = @size*Math::sin(rad)
-        y_base = @size*Math::cos(rad)
-
-        x1 = 0.90*x_base
-        y1 = 0.90*y_base
-
-        x2 = 0.875*x_base
-        y2 = 0.875*y_base
-
-        TkcLine.new(@c, x1, y1, x2, y2,
-                    :tags=>[@tag, @mark_tag],
-                    :width=>@mark_width, :fill=>@submark_color)
-        TkcLine.new(@c, x1, -y1, x2, -y2,
-                    :tags=>[@tag, @mark_tag],
-                    :width=>@mark_width, :fill=>@submark_color)
-        TkcLine.new(@c, -x1, y1, -x2, y2,
-                    :tags=>[@tag, @mark_tag],
-                    :width=>@mark_width, :fill=>@submark_color)
-        TkcLine.new(@c, -x1, -y1, -x2, -y2,
-                    :tags=>[@tag, @mark_tag],
-                    :width=>@mark_width, :fill=>@submark_color)
-      }
-    end
-  end
-
-  def _create_hands
-    hour_hand_len   = 0.55*@size
-    minute_hand_len = 0.85*@size
-    second_hand_len = 0.88*@size
-
-    hour_hand_width   = 1.8*@cdot_size
-    minute_hand_width = 1.0*@cdot_size
-    second_hand_width = 1 # 0.4*@cdot_size
-
-    @hour_hand_coords = [
-      [0, -0.5*@cdot_size],
-      [hour_hand_width, -0.5*@cdot_size-hour_hand_width],
-      [hour_hand_width, -hour_hand_len+hour_hand_width],
-      [0, -hour_hand_len],
-      [-hour_hand_width, -hour_hand_len+hour_hand_width],
-      [-hour_hand_width, -0.5*@cdot_size-hour_hand_width],
-    ]
-    @minute_hand_coords = [
-      [0, -0.5*@cdot_size],
-      [minute_hand_width, -0.5*@cdot_size - minute_hand_width],
-      [minute_hand_width, -minute_hand_len+minute_hand_width],
-      [0, -minute_hand_len],
-      [-minute_hand_width, -minute_hand_len+minute_hand_width],
-      [-minute_hand_width, -0.5*@cdot_size-minute_hand_width],
-    ]
-    @second_hand_coords = [
-      [0, -0.5*@cdot_size],
-      [second_hand_width, -0.5*@cdot_size - second_hand_width],
-      [second_hand_width, -second_hand_len+second_hand_width],
-      [0, -second_hand_len],
-      [-second_hand_width, -second_hand_len+second_hand_width],
-      [-second_hand_width, -0.5*@cdot_size-second_hand_width],
-    ]
-
-    @hour_hand = TkcPolygon.new(@c, @hour_hand_coords,
-                                :tags=>[@tag, @hand_tag],
-                                :outline=>@hour_hand_color,
-                                :fill=>@hour_hand_color)
-
-    @minute_hand = TkcPolygon.new(@c, @minute_hand_coords,
-                                  :tags=>[@tag, @hand_tag],
-                                  :outline=>@minute_hand_color,
-                                  :fill=>@minute_hand_color)
-
-    @second_hand = TkcPolygon.new(@c, @second_hand_coords,
-                                  :tags=>[@tag, @hand_tag],
-                                  :outline=>@second_hand_color,
-                                  :fill=>@second_hand_color)
-
-    @center_dot = TkcOval.new(@c,
-                              [-@cdot_size, -@cdot_size],
-                              [@cdot_size, @cdot_size],
-                              :outline=>@cdot_color, :fill=>@cdot_color)
-  end
-  private :_create_hands
-
-  def _raise_hands
-    @hour_hand.raise
-    @minute_hand.raise
-    @second_hand.raise
-    @center_dot.raise
-  end
-  private :_raise_hands
-
-  def _raise_marks
-    @mark_tag.raise
-  end
-  private :_raise_marks
-
-  def set_hands(hh, mm, ss)
-    ss_angle = Math::PI * ss / 30.0
-    mm_angle = Math::PI * (mm + ss/60.0) / 30.0
-    hh_angle = Math::PI * (hh + (mm + ss/60.0)/60.0) / (@clock.div(2))
-
-    @second_hand.coords = @second_hand_coords.collect{|x, y|
-      r = Math::hypot(y, x)
-      a = Math::atan2(y, x) + ss_angle
-      [Math::cos(a) * r, Math::sin(a) * r]
-    }
-
-    @minute_hand.coords = @minute_hand_coords.collect{|x, y|
-      r = Math::hypot(y, x)
-      a = Math::atan2(y, x) + mm_angle
-      [Math::cos(a) * r, Math::sin(a) * r]
-    }
-
-    @hour_hand.coords = @hour_hand_coords.collect{|x, y|
-      r = Math::hypot(y, x)
-      a = Math::atan2(y, x) + hh_angle
-      [Math::cos(a) * r, Math::sin(a) * r]
-    }
-
-    _raise_hands
-    _raise_marks
-  end
-
-  def coords_to_time(x, y)
-    return ((y < 0)? [0, 0]: [@clock.div(2), 0])  if x == 0
-    if @clock == 24
-      offset = (x<0&&y<0)? 1800.0: 360.0
-      m_half = 720.0
-    else # @clock == 12
-      offset = (x<0&&y<0)? 900.0: 180.0
-      m_half = 360.0
-    end
-    (offset + m_half*Math.atan2(y,x)/Math::PI).round.divmod(60)
-  end
-
-  def create_pie(hh, mm, span, color='red')
-    if @clock == 24
-      start  = 90.0 - (hh*60 + mm)/4.0  # 360.0*(hh*60+mm)/(24*60)
-      extent = -span/4.0
-    else # @clock == 12
-      start  = 90.0 - (hh*60 + mm)/2.0  # 360.0*(hh*60+mm)/(12*60)
-      extent = -span/2.0
-    end
-
-    pie = TkcArc.new(@c, @circle_coords, :tags=>[@tag],
-                     :outline=>'black', 'fill'=>color,
-                     :start=>start, :extent=>extent)
-    _raise_hands
-    _raise_marks
-    pie
-  end
-end
-
-sched = Clock.new
-sched.create_pie(0,0, 60)            #  60 minutes from 00:00
-sched.create_pie(6,30, 280, 'green') # 280 minutes from 06:30
-sched.create_pie(15,20, 90, 'blue')  #  90 minutes from 15:20
-
-Tk.mainloop
diff --git a/ext/tk/sample/binding_sample.rb b/ext/tk/sample/binding_sample.rb
deleted file mode 100644
index 3c2eb5e1cb..0000000000
--- a/ext/tk/sample/binding_sample.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'tk'
-
-class Button_clone < TkLabel
-  def initialize(*args)
-    @command = nil
-
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-      @command = keys.delete('command')
-
-      keys['highlightthickness'] = 1 unless keys.key?('highlightthickness')
-      keys['padx'] = '3m' unless keys.key?('padx')
-      keys['pady'] = '1m' unless keys.key?('pady')
-      keys['relief'] = 'raised' unless keys.key?('relief')
-
-      args.push(keys)
-    end
-
-    super(*args)
-
-    @press = false
-
-    self.bind('Enter', proc{self.background(self.activebackground)})
-    self.bind('Leave', proc{
-                @press = false
-                self.background(self.highlightbackground)
-                self.relief('raised')
-              })
-
-    self.bind('ButtonPress-1', proc{@press = true; self.relief('sunken')})
-    self.bind('ButtonRelease-1', proc{
-                self.relief('raised')
-                @command.call if @press && @command
-                @press = false
-              })
-  end
-
-  def command(cmd = Proc.new)
-    @command = cmd
-  end
-
-  def invoke
-    if @command
-      @command.call
-    else
-      ''
-    end
-  end
-end
-
-TkLabel.new(:text=><<EOT).pack
-This is a sample of 'event binding'.
-The first button is a normal button widget.
-And the second one is a normal label widget
-but with some bindings like a button widget.
-EOT
-
-lbl = TkLabel.new(:foreground=>'red').pack(:pady=>3)
-
-v = TkVariable.new(0)
-
-TkFrame.new{|f|
-  TkLabel.new(f, :text=>'click count : ').pack(:side=>:left)
-  TkLabel.new(f, :textvariable=>v).pack(:side=>:left)
-}.pack
-
-TkButton.new(:text=>'normal Button widget',
-             :command=>proc{
-               puts 'button is clicked!!'
-               lbl.text 'button is clicked!!'
-               v.numeric += 1
-             }){
-  pack(:fill=>:x, :expand=>true)
-}
-
-Button_clone.new(:text=>'Label with Button binding',
-                 :command=>proc{
-                   puts 'label is clicked!!'
-                   lbl.text 'label is clicked!!'
-                   v.numeric += 1
-                 }){
-  pack(:fill=>:x, :expand=>true)
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/bindtag_sample.rb b/ext/tk/sample/bindtag_sample.rb
deleted file mode 100644
index b13364bb68..0000000000
--- a/ext/tk/sample/bindtag_sample.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-
-TkLabel.new(:text=><<EOT, :justify=>:left).pack
-This is a sample of bindtags and usage of
-Tk.callback_break/Tk.callback_continue.
-Please check the work of following buttons
-(attend the difference between before/after
- pressing the bottom button), and see the
-source code.
-EOT
-
-def set_class_bind
-  TkButton.bind('ButtonPress-1',
-                proc{puts 'bind "ButtonPress-1" of TkButton class'})
-  TkButton.bind('ButtonRelease-1',
-                proc{puts 'bind "ButtonRelease-1" of TkButton class'})
-end
-
-# set root binding
-r = TkRoot.new
-r.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of root widget'})
-r.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of root widget'})
-
-# set 'all' binding
-TkBindTag::ALL.bind('ButtonPress-1',
-                    proc{puts 'bind "ButtonPress-1" of the tag "all"'})
-TkBindTag::ALL.bind('ButtonRelease-1',
-                    proc{puts 'bind "ButtonRelease-1" of the tag "all"'})
-
-# create buttons
-b1 = TkButton.new(:text=>'button-1',
-                  :command=>proc{puts "command of button-1"}).pack
-b2 = TkButton.new(:text=>'button-2',
-                  :command=>proc{puts "command of button-2"}).pack
-b3 = TkButton.new(:text=>'button-3',
-                  :command=>proc{puts "command of button-3"}).pack
-b4 = TkButton.new(:text=>'button-4',
-                  :command=>proc{puts "command of button-4"}).pack
-b5 = TkButton.new(:text=>'button-5',
-                  :command=>proc{puts "command of button-5"}).pack
-
-# set button binding
-b1.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-1'})
-b1.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-1'})
-
-b2.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-2'})
-b2.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-2'})
-
-b3.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-3'})
-b3.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-3'})
-
-b4.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-4'})
-b4.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-4'})
-
-b5.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-5'})
-b5.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-5'})
-
-# create bindtag and set binding
-tag1 = TkBindTag.new
-tag1.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of tag1'})
-tag1.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of tag1'})
-
-tag2 = TkBindTag.new
-tag2.bind('ButtonPress-1',
-          proc{
-            puts 'bind "ButtonPress-1" of tag2'
-            puts 'call Tk.callback_continue'
-            Tk.callback_continue
-            puts 'never see this message'
-          })
-tag2.bind('ButtonRelease-1',
-          proc{
-            puts 'bind "ButtonRelease-1" of tag2'
-            puts 'call Tk.callback_continue'
-            Tk.callback_continue
-            puts 'never see this message'
-          })
-
-tag3 = TkBindTag.new
-tag3.bind('ButtonPress-1',
-          proc{
-            puts 'bind "ButtonPress-1" of tag3'
-            puts 'call Tk.callback_break'
-            Tk.callback_break
-            puts 'never see this message'
-          })
-tag3.bind('ButtonRelease-1',
-          proc{
-            puts 'bind "ButtonRelease-1" of tag3'
-            puts 'call Tk.callback_break'
-            Tk.callback_break
-            puts 'never see this message'
-          })
-
-# set bindtags
-p b1.bindtags
-
-tags = b2.bindtags
-tags[2,0] = tag1
-tags[0,0] = tag1
-b2.bindtags(tags)
-p b2.bindtags
-
-tags = b3.bindtags
-tags[2,0] = tag2
-tags[0,0] = tag2
-b3.bindtags(tags)
-p b3.bindtags
-
-tags = b4.bindtags
-tags[2,0] = tag3
-tags[0,0] = tag3
-b4.bindtags(tags)
-p b4.bindtags
-
-b5.bindtags([tag1, TkButton, tag2, b5])
-
-# create button to set button class binding
-TkButton.new(:text=>'set binding to TkButton class',
-             :command=>proc{
-               puts 'call "set_class_bind"'
-               set_class_bind
-             }).pack(:pady=>7)
-
-# start event-loop
-Tk.mainloop
diff --git a/ext/tk/sample/binstr_usage.rb b/ext/tk/sample/binstr_usage.rb
deleted file mode 100644
index fa81f98b5e..0000000000
--- a/ext/tk/sample/binstr_usage.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env ruby
-
-require "tk"
-
-TkMessage.new(:width=>360, :text=><<EOM).pack
-This sample shows how to use a binary sequence between Ruby and Tk. \
-This reads the image data from the file as the binary sequence.
-
-To treat the difference of encodings between on Ruby and on Tk seamlessly, \
-Ruby/Tk converts the encoding of string arguments automatically. \
-I think it is comfortable for users on almost all situations. \
-However, when treats a binary sequence, the convert process makes troubles.
-
-Tk::BinaryString class (subclass of Tk::EncodedString class) is the class \
-to avoid such troubles. Please see the source code of this sample. \
-A Tk::BinaryString instance is used to create the image for the center button.
-EOM
-
-ImgFile=[File.dirname(__FILE__), 'images','tcllogo.gif'].join(File::Separator)
-
-ph1 = TkPhotoImage.new(:file=>ImgFile)
-p ph1.configinfo
-
-b_str = Tk::BinaryString(IO.read(ImgFile))
-p [b_str, b_str.encoding]
-
-ph2 = TkPhotoImage.new(:data=>b_str)
-p ph2.configinfo
-p ph2.data(:grayscale=>true)
-
-ph3 = TkPhotoImage.new(:palette=>256)
-ph3.put(ph2.data)
-
-ph4 = TkPhotoImage.new()
-ph4.put(ph2.data(:grayscale=>true))
-
-#p [b_str.encoding, b_str.rb_encoding]
-
-f = TkFrame.new.pack
-TkButton.new(:parent=>f, :image=>ph1, :command=>proc{exit}).pack(:side=>:left)
-TkButton.new(:parent=>f, :image=>ph2, :command=>proc{exit}).pack(:side=>:left)
-TkButton.new(:parent=>f, :image=>ph3, :command=>proc{exit}).pack(:side=>:left)
-TkButton.new(:parent=>f, :image=>ph4, :command=>proc{exit}).pack(:side=>:left)
-
-Tk.mainloop
diff --git a/ext/tk/sample/btn_with_frame.rb b/ext/tk/sample/btn_with_frame.rb
deleted file mode 100644
index d04c95a289..0000000000
--- a/ext/tk/sample/btn_with_frame.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'tk'
-
-class Button_with_Frame < TkButton
-  def create_self(keys)
-    @frame = TkFrame.new('widgetname'=>@path, 'background'=>'yellow')
-    install_win(@path) # create new @path which is a daughter of old @path
-    super(keys)
-    TkPack(@path, :padx=>7, :pady=>7)
-    @epath = @frame.path
-  end
-  def epath
-    @epath
-  end
-end
-
-Button_with_Frame.new(:text=>'QUIT', :command=>proc{exit}) {
-  pack(:padx=>15, :pady=>5)
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/cd_timer.rb b/ext/tk/sample/cd_timer.rb
deleted file mode 100644
index e2611fbf23..0000000000
--- a/ext/tk/sample/cd_timer.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env ruby
-#
-#   countdown timer
-#     usage: cd_timer min [, min ... ]
-#            ( e.g. cd_timer 0.5 1 3 5 10 )
-#
-require 'tk'
-
-if ARGV.empty?
-  $stderr.puts 'Error:: No time arguments for counting down'
-  exit(1)
-end
-
-width = 10
-
-TkButton.new(:text=>'exit',
-             :command=>proc{exit}).pack(:side=>:bottom, :fill=>:x)
-
-b = TkButton.new(:text=>'start').pack(:side=>:top, :fill=>:x)
-
-f = TkFrame.new(:relief=>:ridge, :borderwidth=>2).pack(:fill=>:x)
-TkLabel.new(f, :relief=>:flat, :pady=>3,
-            :background=>'black', :foreground=>'white',
-            :text=>'  elapsed: ').pack(:fill=>:x, :side=>:left, :expand=>true)
-now = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w,
-                  :background=>'black', :foreground=>'white',
-                  :text=>'%4d:%02d.00' % [0, 0]).pack(:side=>:right)
-
-timers = [ TkRTTimer.new(10){|tm|
-    t = (tm.return_value || 0) + 1
-    s, u = t.divmod(100)
-    m, s = s.divmod(60)
-    now.text('%4d:%02d.%02d' % [m, s, u])
-    t
-  }.set_start_proc(0, proc{
-                     now.text('%4d:%02d.00' % [0,0])
-                     now.foreground('white')
-                     0
-                   })
-]
-
-ARGV.collect{|arg| (Float(arg) * 60).to_i}.sort.each_with_index{|time, idx|
-  f = TkFrame.new(:relief=>:ridge, :borderwidth=>2).pack(:fill=>:x)
-  TkLabel.new(f, :relief=>:flat, :pady=>3,
-              :text=>'  %4d:%02d  --> ' % (time.divmod(60))).pack(:side=>:left)
-  l = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w,
-                  :text=>'%4d:%02d' % (time.divmod(60))).pack(:side=>:right)
-  timers << TkRTTimer.new(1000){|tm|
-    t = (tm.return_value || time) - 1
-    if t < 0
-      l.text('%4d:%02d' % ((-t).divmod(60)))
-    else
-      l.text('%4d:%02d' % (t.divmod(60)))
-    end
-    if t.zero?
-      l.foreground('red')
-      idx.times{Tk.bell}
-    end
-    t
-  }.set_start_proc(0, proc{
-                     l.text('%4d:%02d' % (time.divmod(60)))
-                     l.foreground('black')
-                     time
-                   })
-}
-
-mode = :start
-b.command(proc{
-            if mode == :start
-              timers.each{|timer| timer.restart}
-              b.text('reset')
-              mode = :reset
-            else
-              timers.each{|timer| timer.stop.reset}
-              b.text('start')
-              mode = :start
-            end
-          })
-
-Tk.mainloop
-
diff --git a/ext/tk/sample/cmd_res_test.rb b/ext/tk/sample/cmd_res_test.rb
deleted file mode 100644
index 8df2e61af7..0000000000
--- a/ext/tk/sample/cmd_res_test.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'tk'
-TkOptionDB.readfile(File.expand_path('cmd_resource',
-                                     File.dirname(__FILE__)))
-f = TkFrame.new(:class=>'BtnFrame').pack
-b = TkButton.new(:parent=>f, :widgetname=>'hello').pack
-cmd1 = TkOptionDB.new_proc_class(b, [:show_msg, :bye_msg], 3)
-cmd2 = TkOptionDB.new_proc_class(:ZZZ, [:show_msg, :bye_msg], 3, false, cmd1)
-cmd3 = TkOptionDB.new_proc_class(:ZZZ, [:show_msg, :bye_msg], 3, false, b)
-cmd4 = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3){
-  def self.__check_proc_string__(str)
-    "{|arg| print [arg, $SAFE].inspect, ': '; Proc.new#{str}.call(arg)}"
-  end
-}
-cmd1.show_msg('cmd1')
-cmd2.show_msg('cmd2')
-cmd3.show_msg('cmd3')
-cmd4.show_msg('cmd4')
diff --git a/ext/tk/sample/cmd_resource b/ext/tk/sample/cmd_resource
deleted file mode 100644
index 9cc4915546..0000000000
--- a/ext/tk/sample/cmd_resource
+++ /dev/null
@@ -1,5 +0,0 @@
-*BtnFrame.hello.text: HELLO
-*BtnFrame.hello.command: ruby {puts "Hello World!!"}
-*BTN_CMD.show_msg: {|arg| print "Hello, #{arg}!!\n"}
-*hello.show_msg: {|arg| print "Hello, Hello, #{arg}!!\n"}
-*hello.ZZZ.show_msg: {|arg| print "Hello, Hello, ZZZ:#{arg}!!\n"}
diff --git a/ext/tk/sample/demos-en/ChangeLog b/ext/tk/sample/demos-en/ChangeLog
deleted file mode 100644
index c3f66cf409..0000000000
--- a/ext/tk/sample/demos-en/ChangeLog
+++ /dev/null
@@ -1,64 +0,0 @@
-2002-08-29 16:30  matt
-
-	* ChangeLog: ChangeLog is auto-generated *from* CVS log.
-
-2002-08-29 16:27  matt
-
-	* ChangeLog.prev: [no log message]
-
-2002-08-28 18:07  matt
-
-	* browse1, browse2, hello, ixset, rmt, rolodex, rolodex-j, square,
-	tcolor, timer, widget: Changed #! lines to the slightly more
-	portable '#!/usr/bin/env ruby'.
-
-2002-08-28 17:56  matt
-
-	* icon.rb, items.rb, label.rb, menu.rb, ruler.rb: Changed bitmap
-	file extensions from .bmp to .xbm.
-
-2002-08-28 17:55  matt
-
-	* images/: face.bmp, face.xbm, flagdown.bmp, flagdown.xbm,
-	flagup.bmp, flagup.xbm, gray25.bmp, gray25.xbm, letters.bmp,
-	letters.xbm, noletter.bmp, noletter.xbm, pattern.bmp, pattern.xbm:
-	Changed X bitmap file extensions from .bmp to the more intuitive
-	.xbm.
-
-2002-08-28 17:35  matt
-
-	* bitmap.rb, colors.rb, cscroll.rb, ctext.rb, hello, ixset,
-	menubu.rb, patch_1.1c1, rmt, style.rb, timer, ChangeLog, README,
-	README.tkencoding, arrow.rb, bind.rb, browse1, browse2, button.rb,
-	check.rb, clrpick.rb, dialog1.rb, dialog2.rb, entry1.rb, entry2.rb,
-	filebox.rb, floor.rb, form.rb, hscale.rb, icon.rb, image1.rb,
-	image2.rb, items.rb, label.rb, menu.rb, msgbox.rb, plot.rb,
-	puzzle.rb, radio.rb, rolodex, rolodex-j, ruler.rb, sayings.rb,
-	search.rb, square, states.rb, tcolor, text.rb, tkencoding.rb,
-	twind.rb, vscale.rb, widget, doc.org/README, doc.org/README.JP,
-	doc.org/README.tk80, doc.org/license.terms,
-	doc.org/license.terms.tk80, images/earth.gif, images/earthris.gif,
-	images/face.bmp, images/flagdown.bmp, images/flagup.bmp,
-	images/gray25.bmp, images/grey.25, images/grey.5,
-	images/letters.bmp, images/noletter.bmp, images/pattern.bmp,
-	images/tcllogo.gif, images/teapot.ppm: Initial revision
-
-2002-08-28 17:35  matt
-
-	* bitmap.rb, colors.rb, cscroll.rb, ctext.rb, hello, ixset,
-	menubu.rb, patch_1.1c1, rmt, style.rb, timer, ChangeLog, README,
-	README.tkencoding, arrow.rb, bind.rb, browse1, browse2, button.rb,
-	check.rb, clrpick.rb, dialog1.rb, dialog2.rb, entry1.rb, entry2.rb,
-	filebox.rb, floor.rb, form.rb, hscale.rb, icon.rb, image1.rb,
-	image2.rb, items.rb, label.rb, menu.rb, msgbox.rb, plot.rb,
-	puzzle.rb, radio.rb, rolodex, rolodex-j, ruler.rb, sayings.rb,
-	search.rb, square, states.rb, tcolor, text.rb, tkencoding.rb,
-	twind.rb, vscale.rb, widget, doc.org/README, doc.org/README.JP,
-	doc.org/README.tk80, doc.org/license.terms,
-	doc.org/license.terms.tk80, images/earth.gif, images/earthris.gif,
-	images/face.bmp, images/flagdown.bmp, images/flagup.bmp,
-	images/gray25.bmp, images/grey.25, images/grey.5,
-	images/letters.bmp, images/noletter.bmp, images/pattern.bmp,
-	images/tcllogo.gif, images/teapot.ppm: Taking over demo package
-	from Jonathan Conway.
-
diff --git a/ext/tk/sample/demos-en/ChangeLog.prev b/ext/tk/sample/demos-en/ChangeLog.prev
deleted file mode 100644
index ba808eca8b..0000000000
--- a/ext/tk/sample/demos-en/ChangeLog.prev
+++ /dev/null
@@ -1,9 +0,0 @@
-2001-07-26      <rise@leannan.knavery.net>
-
-	* Moved files to directory ruby-tk81-demos-english in tarball.
-
-2001-07-26      <rise@knavery.net>
-
-	* Added test to widget and hello versus Tk::TCL_VERSION & Tk::JAPANIZED_TK (per Guy Decoux in [ruby-talk:18559]) before requiring tkencoding.rb.
-
-
diff --git a/ext/tk/sample/demos-en/README b/ext/tk/sample/demos-en/README
deleted file mode 100644
index a6ea4fae8c..0000000000
--- a/ext/tk/sample/demos-en/README
+++ /dev/null
@@ -1,138 +0,0 @@
-Current Maintainer:
-	Jonathan Conway
-	rise@knavery.net
-
-	Please direct all bug reports/requests/suggestions to the above
-	address.
-
-
-Notes:
-
-* 	The files hello and widget have been changed to test Tk::TCL_VERSION
-	and Tk::JAPANIZED_TK before requiring tkencoding.rb to prevent an
-	infinite loop.  This test was taken from a message in
-	[ruby-talk:18559] by Guy Decoux.
-
-*	The .bmp files in the images directory are X bitmaps (i.e. XBM to many
-	graphics packages), not Windows bitmaps (.bmp).  You will not be
-	able to use images exported by a graphics program as Windows
-	bitmaps with this demo collection nor will you be able to edit the
-	included images without setting the file type correctly.
-
--- Jonathan Conway, 2001-07-26
-
-
-#------------------------------------------------------------------------------
-# ==== Introduction. ====
-#
-# To create this version of the Ruby/Tk widget demo, I took the
-# ruby-tk81-demos and removed all the Kanji strings and comments.  I
-# have tried to restore the original English strings and comments
-# using the Tcl/Tk8.2.2 version of the widget demo.
-#
-# When I tried running the Kanji version, all I got was a mostly blank
-# panel with a non-functional "File" button. I disovered that if all
-# non-ASCII characters were replaced with blanks, then I could get the
-# gutted stuff running.
-#
-# Since English Ruby/Tk documentation is lacking and I needed this
-# code to see how it worked and to use as the basis of my try-it
-# prototype (The Ruby Yielding Interactive Toolkit), plus the fact
-# that no help was forthcoming for making the Kanji version work (plus
-# the fact that I can't read Kanji anyway), I decided to embark on
-# this English restoration project.
-#
-# Thanks to everyone who worked on the original Ruby/Tk widget demo
-# (and the preceding Tcl/Tk version for that matter).  The
-# comparatively simple task of changing text strings and comments has
-# made me appreciate the great amount of original work that went into
-# this.
-#
-# -- Conrad Schneiker, 2000-07-23.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# ==== Known bugs. ====
-#
-# ^C-ing the demo gives Ruby interrupt and stack message; clean exit needed.
-# Font settings don't work correctly.
-# Dismissing the embedded windows demo (tkwind.rb) kills the widget demo.
-# Rerunning the canvas item demo from the code widow get errors.
-# The "press me" button in the canvas item demo doesn't time out.
-# The simple 2 d plot starts up extremely slow compared to the Tcl version.
-# The first item message on the icon menu on the menu and cascades demo doesn't work.
-#------------------------------------------------------------------------------
-
-
-###################### Original README ########################################
-
-  Ruby/Tk81 widget-demo			1999/08/13
-
-					��Φ��ü�����ʳظ����
-					Ω�� <ttate@jaist.ac.jp>
-
-Tcl/Tk8.1�Ǥ�unicode(UTF8)�����Ѥ��졢unicode���Ѵ����줿���ܸ�Ǥ����
-Widget��ɽ�������뤳�Ȥ���ǽ�Ǥ����ܥ��������֤ˤϰ����˱ʰ椵���濴��
-�ʤ��ƺ������줿Ruby/Tk�Υ���ץ�˽�����ä����ʲ��δĶ��ˤ����Ƥ�ư��
-���ǧ������ΤǤ���
-
-* ruby-1.3.7,ruby-1.4.0
-* tcl8.1, tk8.1
-* linux-2.2
-
-Windows(Cygwin)�ˤ����ơ�����ץ��ư�����ˤ�ruby��-Ke�Ȥ������ץ�������
-���Ƶ�ư��������ɤ������Ǥ���
-					�����󶡡����դ���
-					<eban@os.rim.or.jp>
-
-----------------------------------------------------------------------------
-  Ruby/Tk widget-demo
-                              version 1.1 ( 1998/07/24 )
-                              �ʰ����ǽ���幩�� (nagai@ai.kyutech.ac.jp)
-
-ɸ�����ۤ� Tcl/Tk ��ĥ�ѥå������������� Ruby (�ʲ� Ruby/Tk �ȸƤӤޤ�)
-�Ǥϡ�Tk widget ���Ѥ��� GUI �κ�����Ԥ����Ȥ��Ǥ��ޤ����ºݤ� GUI �����
-���Ƥ������ˤ��͡��ʼ��㤬����ץ�Ȥ���¸�ߤ���������ʤΤǤ�����Ruby/Tk
-�ˤϤ��Τ褦��Ŭ���ʥ���ץ륹����ץȽ����¸�ߤ��ޤ���Ǥ�����������Ф���
-��ĥ�ѥå������θ��Ǥ��� Tcl/Tk �ˤϡ�Tk widget ���Ѥ��ƤɤΤ褦�ʤ��Ȥ���
-���뤫�򼨤���ΤȤ��� widget-demo ��¸�ߤ����ꡤTcl/Tk ���Ѥ��� GUI �κ���
-��������ݤ���ɽŪ����ץ�ȤʤäƤ��ޤ����ܥ��������֤ϡ�Ruby/Tk �ν�����
-�������ɽŪ�ʥ���ץ륹����ץȤȤ��٤���Tcl/Tk �� widget-demo ��ܿ�������
-�ΤǤ���
-
-�ܥ��������֤˴ޤޤ�륹����ץȤ�¹Ԥ��뤿��ˤϡ�ruby-1.1c2 �ʾ�Ǥ��뤳
-�Ȥ�ɬ�פǤ���1.1c1 �ξ��ϡ��ܥ��������֤˴ޤޤ�� patck_1.1c1 �� Ruby ��
-�饤�֥��ˤ��ƤƤ����������Ȥ߹��� Tk �ΥС������ϡ�4.2 �Ǥ� 8.0 �Ǥ⽤
-���ʤ�ư������Ϥ��Ǥ��������������ܸ��ǤǤΰܿ��ȤʤäƤ��뤿�ᡤ���ܸ첽��
-�줿 Tk �����Ѥ���������������ץȤΥƥ��Ȥϡ�Tk4.2jp �� Tk8.0jp �ξ�ǹ�
-���ޤ��� (�����ˤǤϤʤ��Ǥ���)��
-
-�ܥ��������֤˴ޤޤ�륹����ץȤ�¿���ϡ����ȤʤäƤ��� Tcl/Tk �Ǥ����Ū��
-��������ץȵ��ҤȤʤ�褦�ˤ��Ƥ��ޤ������Τ��ᡤRuby/Tk �Υ���ץ�ȸ�����
-�ϡ����ޤ� Ruby �餷���ʤ��Ȥ������Ǥ��礦���ˤ⤫����餺�����Τ褦�ʵ���
-���äƤ�����ͳ�ϡ�Ruby/Tk �Υɥ���������ˤ���ޤ���
-
-Tcl/Tk �ˤ�Ŭ���ʻ��ͽ񤬲�����¸�ߤ��Ƥ��ޤ����顤Ruby/Tk ������ץȤ����
-����ݤϡ����Τ褦�� Tcl/Tk �λ��ͽ�Ǿ�����䤤�ʤ���������뤳�Ȥˤʤ�Ȼ�
-���ޤ����� widget �λ�����Ȥ��ơ�Tcl/Tk �� widget-demo �򻲾Ȥ��뤳�Ȥ⤢��
-�Ǥ��礦��Ruby/Tk �Ǥε��Ҥ� widget-demo �� Tcl/Tk �Ǥε��Ҥ˶ᤤ��Τˤ���
-�����С���������ˤ�äơ�Ruby/Tk ����������뤳�Ȥ��Ǥ���ȹͤ����ޤ���
-��ö Ruby/Tk �Ǥ� �� widget �λ�����ˡ�������Ƥ��ޤ��С�Ruby �餷��������
-�ץȤ�������뤳�Ȥ��񤷤��ʤ��Ǥ��礦���ܥ��������֤Υ�����ץȤϡ�Ruby/Tk
-��ǽ�˽�������ޤǤ�Ƨ��Ȥ������Ѥ��Ƥ���������й����Ǥ���
-
-widget-demo �ΰܿ��ˤ����äƤϡ��������ˤ�ܿ�����������ץȤ��󶡤��Ƥ�����
-���ޤ����������˴��դΰդ�ɽ���ޤ���
-
-    Ω�С�JAIST (ttate@jaist.ac.jp) ����
-    ʿ���ͻ� (hiramatu@cdrom.co.jp) ����
-
-ʿ������ˤ�� Ruby/Tk ����� Web page (http://www.cdrom.co.jp/~hiramatu/)
-�� Ruby/Tk �ν�����ͭ�ѤȻפ��ޤ��Τǡ����Ҥ����Ȥ���������
-
-�ޤ������� (maebashi@iij.ad.jp) �����Ϥ���Ȥ��ơ�widget-demo �ΰܿ��˺ݤ�
-��ɬ�פȤʤä� Ruby �� Tk ��Ϣ�饤�֥�꽤���ˤĤ��ơ����������Х��λ�Ŧ��
-�Ƥ��������������ˤⴶ���פ��ޤ���
-
-�����ƺǸ�˺���δ��դ� Ruby �߷׼Ԥ� �ޤĤ�� �椭�Ҥ� (matz@netlab.co.jp)
-��������������Ȼפ��ޤ���
diff --git a/ext/tk/sample/demos-en/README.1st b/ext/tk/sample/demos-en/README.1st
deleted file mode 100644
index 2ba1e275c8..0000000000
--- a/ext/tk/sample/demos-en/README.1st
+++ /dev/null
@@ -1,18 +0,0 @@
-There are Ruby/Tk demo scripts.
-
-Files with '.rb' extension are sub-scripts which are launched 'widget'
-script. Those files don't work independently. Please call them from
-'widget' script.
-
-If you want start some sub-scripts at same time when the launcher
-script tarts, please give the sub-script names as arguments.
-(e.g. /usr/local/bin/ruby widget button.rb entry1.rb text.rb )
-You can ommit '.rb' of the sub-scripts
-(e.g. /usr/local/bin/ruby widget button entry1 text )
-
-If you don't need launcher's main window, give -n option.
-(e.g. /usr/local/bin/ruby widget -n button.rb entry1.rb text.rb )
-
-Others (browse1, hello, and so on) are standalone scripts.
-
-          2004/04/14  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/sample/demos-en/README.tkencoding b/ext/tk/sample/demos-en/README.tkencoding
deleted file mode 100644
index 679b476a08..0000000000
--- a/ext/tk/sample/demos-en/README.tkencoding
+++ /dev/null
@@ -1,29 +0,0 @@
-This is a original document of 'tkencoding.rb'.
-The library 'tkencoding.rb' is obsolete.
-Functions of tkencoding.rb is already included into Ruby/Tk.
-
--------------------------------------------------
-tkencoding.rb���Ѥ������ܸ��ɽ���ˤĤ���
-
-Copyright (C) 1999/07, Takaaki Tateishi <ttate@jaist.ac.jp>
-
-
-1. tkencoding.rb�Ȥϡ�
-
-tkencoding.rb��Tcl/Tk8.1�����Ѥ���Ruby/Tk�Τ���Υ饤�֥��
-�Ǥ���tkencoding.rb��require���뤳�Ȥˤ�ä�Wedget��ɽ����
-���ƥ����Ȥ�����unicode(UTF8)���Ѵ�����ޤ���
-
-
-2. �Ȥ���
-
-tkencoding.rb��require����Tk.encoding�ǻ��Ѥ��Ƥ���ʸ��������
-����ꤷ�Ʋ��������㤨�аʲ��Τ褦�ʴ����ˤʤ�ޤ���
-
-----
-require 'tk'
-require 'tkencoding'
-
-Tk.encoding = "euc-jp"
-# Tk.encoding = "shiftjis"
----
diff --git a/ext/tk/sample/demos-en/anilabel.rb b/ext/tk/sample/demos-en/anilabel.rb
deleted file mode 100644
index ebd84accd2..0000000000
--- a/ext/tk/sample/demos-en/anilabel.rb
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-# animated label widget demo (called by 'widget')
-#
-# based on Tcl/Tk8.5a2 widget demos
-
-if defined?($anilabel_demo) && $anilabel_demo
-  $anilabel_demo.destroy
-  $anilabel_demo = nil
-end
-
-# demo toplevel widget
-$anilabel_demo = TkToplevel.new {|w|
-  title("Animated Label Demonstration")
-  iconname("anilabel")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($anilabel_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Four animated labels are displayed below; each of the labels on the left is animated by making the text message inside it appear to scroll, and the label on the right is animated by animating the image that it displays."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $anilabel_demo
-      $anilabel_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'anilabel'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# create frame for label demo
-f_left = TkLabelFrame.new(base_frame,  :text=>'Scrolling Texts')
-f_right = TkLabelFrame.new(base_frame, :text=>'GIF Image')
-Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both',
-        'padx'=>10, 'pady'=>10)
-
-# animated label
-class AnimatedTextLabel < TkLabel
-  def initialize(*args)
-    super(*args)
-    @timer = TkTimer.new{ _animation_callback }
-    @timer.loop_exec = -1
-    # bind('Destroy'){ @timer.stop }
-    @btag = TkBindTag.new('Destroy'){ @timer.stop }
-    self.bindtags_unshift(@btag)
-  end
-
-  def _animation_callback()
-    txt = self.text
-    self.text = (txt[1..-1] << txt[0])
-  end
-  private :_animation_callback
-
-  def start(interval)
-    @timer.set_interval(interval)
-    @timer.start
-  end
-
-  def stop
-    @timer.stop
-  end
-end
-
-# animated image
-class AnimatedImageLabel < AnimatedTextLabel
-  def initialize(*args)
-    super(*args)
-    @destroy_image = false
-    @btag.bind_append('Destroy'){
-      if @destroy_image
-        begin
-          self.image.delete
-        rescue
-        end
-      end
-    }
-  end
-  attr_accessor :destroy_image
-
-  def _animation_callback()
-    img = self.image
-
-    fmt = img.format
-    if fmt.kind_of?(Array)
-      if fmt[1].kind_of?(Hash)
-        # fmt == ['GIF', {'index'=>idx}]
-        idx = fmt[1]['index']
-      else
-        # fmt == ['GIF', '-index', idx]  :: Ruby1.8.2 returns this.
-        idx = fmt[2]
-      end
-    elsif fmt.kind_of?(String) && fmt =~ /GIF -index (\d+)/
-      idx = $1.to_i
-    else
-      idx = -1
-    end
-
-    begin
-      img.format("GIF -index #{idx + 1}")
-    rescue => e
-      img.format("GIF -index 0")
-    end
-  end
-  private :_animation_callback
-end
-
-# create labels
-l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge,
-                           :font=>{:family=>'Courier', :size=>10})
-l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove,
-                           :font=>{:family=>'Courier', :size=>10})
-l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat,
-                           :font=>{:family=>'Courier', :size=>10}, :width=>18)
-Tk.pack(l1, l2, l3,
-        :side=>:top, :expand=>true, :anchor=>:w, :padx=>10, :pady=>10)
-
-limg = AnimatedImageLabel.new(f_right, :borderwidth=>0)
-limg.pack(:side=>:top, :expand=>true, :padx=>10, :pady=>10)
-
-# base64-encoded animated GIF file
-tclPowerdData = <<EOD
-    R0lGODlhKgBAAPQAAP//////zP//AP/MzP/Mmf/MAP+Zmf+ZZv+ZAMz//8zM
-    zMyZmcyZZsxmZsxmAMwzAJnMzJmZzJmZmZlmmZlmZplmM5kzM2aZzGZmzGZm
-    mWZmZmYzZmYzMzNmzDMzZgAzmSH+IE1hZGUgd2l0aCBHSU1QIGJ5IExARGVt
-    YWlsbHkuY29tACH5BAVkAAEALAAAAAAqAEAAAAX+YCCOZEkyTKM2jOm66yPP
-    dF03bx7YcuHIDkGBR7SZeIyhTID4FZ+4Es8nQyCe2EeUNJ0peY2s9mi7PhAM
-    ngEAMGRbUpvzSxskLh1J+Hkg134OdDIDEB+GHxtYMEQMTjMGEYeGFoomezaC
-    DZGSHFmLXTQKkh8eNQVpZ2afmDQGHaOYSoEyhhcklzVmMpuHnaZmDqiGJbg0
-    qFqvh6UNAwB7VA+OwydEjgujkgrPNhbTI8dFvNgEYcHcHx0lB1kX2IYeA2G6
-    NN0YfkXJ2BsAMuAzHB9cZMk3qoEbRzUACsRCUBK5JxsC3iMiKd8GN088SIyT
-    0RAFSROyeEg38caDiB/+JEgqxsODrZJ1BkT0oHKSmI0ceQxo94HDpg0qsuDk
-    UmRAMgu8OgwQ+uIJgUMVeGXA+IQkzEeHGvD8cIGlDXsLiRjQ+EHroQhea7xY
-    8IQBSgYYDi1IS+OFBCgaDMGVS3fGi5BPJpBaENdQ0EomKGD56IHwO39EXiSC
-    Ysgxor5+Xfgq0qByYUpiXmwuoredB2aYH4gWWda0B7SeNENpEJHC1ghi+pS4
-    AJpIAwWvKPBi+8YEht5EriEqpFfMlhEdkBNpx0HUhwypx5T4IB1MBg/Ws2sn
-    wV3MSQOkzI8fUd48Aw3dOZto71x85hHtHijYv18Gf/3GqCdDCXHNoICBobSo
-    IqBqJLyCoH8JPrLgdh88CKCFD0CGmAiGYPgffwceZh6FC2ohIIklnkhehTNY
-    4CIHHGzgwYw01ujBBhvAqKOLLq5AAk9kuSPkkKO40NB+h1gnypJIIvkBf09a
-    N5QIRz5p5ZJXJpmlIVhOGQA2TmIJZZhKKmmll2BqyWSXWUrZpQtpatlmk1c2
-    KaWRHeTZEJF8SqLDn/hhsOeQgBbqAh6DGqronxeARUIIACH5BAUeAAAALAUA
-    LgAFAAUAAAUM4CeKz/OV5YmqaRkCACH5BAUeAAEALAUALgAKAAUAAAUUICCK
-    z/OdJVCaa7p+7aOWcDvTZwgAIfkEBR4AAQAsCwAuAAkABQAABRPgA4zP95zA
-    eZqoWqqpyqLkZ38hACH5BAUKAAEALAcALgANAA4AAAU7ICA+jwiUJEqeKau+
-    r+vGaTmac63v/GP9HM7GQyx+jsgkkoRUHJ3Qx0cK/VQVTKtWwbVKn9suNunc
-    WkMAIfkEBQoAAAAsBwA3AAcABQAABRGgIHzk842j+Yjlt5KuO8JmCAAh+QQF
-    CgAAACwLADcABwAFAAAFEeAnfN9TjqP5oOWziq05lmUIACH5BAUKAAAALA8A
-    NwAHAAUAAAUPoPCJTymS3yiQj4qOcPmEACH5BAUKAAAALBMANwAHAAUAAAUR
-    oCB+z/MJX2o+I2miKimiawgAIfkEBQoAAAAsFwA3AAcABQAABRGgIHzfY47j
-    Q4qk+aHl+pZmCAAh+QQFCgAAACwbADcABwAFAAAFEaAgfs/zCV9qPiNJouo7
-    ll8IACH5BAUKAAAALB8ANwADAAUAAAUIoCB8o0iWZggAOw==
-EOD
-
-l1.text('* Slow Animation *').start(300)
-l2.text('* Fast Animation *').start(80)
-l3.text('This is a longer scrolling text in a widget that will not show the whole message at once. ').start(150)
-
-limg.destroy_image = true
-limg.image(TkPhotoImage.new(:format=>'GIF', :data=>tclPowerdData)).start(100)
diff --git a/ext/tk/sample/demos-en/aniwave.rb b/ext/tk/sample/demos-en/aniwave.rb
deleted file mode 100644
index 57d58193f6..0000000000
--- a/ext/tk/sample/demos-en/aniwave.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# animated wave demo (called by 'widget')
-#
-# based on Tcl/Tk8.5a2 widget demos
-
-# destroy toplevel widget for this demo script
-if defined?($aniwave_demo) && $aniwave_demo
-  $aniwave_demo.destroy
-  $aniwave_demo = nil
-end
-
-# create toplevel widget
-$aniwave_demo = TkToplevel.new {|w|
-  title("Animated Wave Demonstration")
-  iconname("aniwave")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($aniwave_demo).pack(:fill=>:both, :expand=>true)
-
-# create label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text 'This demonstration contains a canvas widget with a line item inside it. The animation routines work by adjusting the coordinates list of the line.'
-}
-msg.pack('side'=>'top')
-
-# create frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $aniwave_demo
-      $aniwave_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'aniwave'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# animated wave
-class AnimatedWaveDemo
-  def initialize(frame, dir=:left)
-    @direction = dir
-
-    # create canvas widget
-    @c = TkCanvas.new(frame, :width=>300, :height=>200,
-                      :background=>'black')
-    @c.pack(:padx=>10, :pady=>10, :expand=>true)
-
-    # Creates a coordinates list of a wave.
-    @waveCoords = []
-    @backupCoords = []
-    n = 0
-    (-10..300).step(5){|n| @waveCoords << [n, 100]; @backupCoords << [n, 100] }
-    n = 305
-    @waveCoords << [n, 0]; @backupCoords << [n, 0]
-    @waveCoords << [n+5, 200]; @backupCoords << [n+5, 200]
-    @coordsLen = @waveCoords.length
-
-    # Create a smoothed line and arrange for its coordinates to be the
-    # contents of the variable waveCoords.
-    @line = TkcLine.new(@c, @waveCoords,
-                        :width=>1, :fill=>'green', :smooth=>true)
-
-    # Main animation "loop".
-    # Theoretically 100 frames-per-second (==10ms between frames)
-    @timer = TkTimer.new(10){ basicMotion; reverser }
-
-    # Arrange for the animation loop to stop when the canvas is deleted
-    @c.bindtags_unshift(TkBindTag.new('Destroy'){ @timer.stop })
-  end
-
-  # Basic motion handler. Given what direction the wave is travelling
-  # in, it advances the y coordinates in the coordinate-list one step in
-  # that direction.
-  def basicMotion
-    @backupCoords, @waveCoords = @waveCoords, @backupCoords
-    (0...@coordsLen).each{|idx|
-      if @direction == :left
-        @waveCoords[idx][1] = @backupCoords[(idx+1 == @coordsLen)? 0: idx+1][1]
-      else
-        @waveCoords[idx][1] = @backupCoords[(idx == 0)? -1: idx-1][1]
-      end
-    }
-    @line.coords(@waveCoords)
-  end
-
-  # Oscillation handler. This detects whether to reverse the direction
-  # of the wave by checking to see if the peak of the wave has moved off
-  # the screen (whose size we know already.)
-  def reverser
-    if @waveCoords[0][1] < 10
-      @direction = :right
-    elsif @waveCoords[-1][1] < 10
-      @direction = :left
-    end
-  end
-
-  # animation control
-  def move
-    @timer.start
-  end
-
-  def stop
-    @timer.stop
-  end
-end
-
-# Start the animation processing
-AnimatedWaveDemo.new(base_frame, :left).move
diff --git a/ext/tk/sample/demos-en/arrow.rb b/ext/tk/sample/demos-en/arrow.rb
deleted file mode 100644
index 452153d010..0000000000
--- a/ext/tk/sample/demos-en/arrow.rb
+++ /dev/null
@@ -1,249 +0,0 @@
-# arrow.rb
-#
-# This demonstration script creates a canvas widget that displays a
-# large line with an arrowhead whose shape can be edited interactively.
-#
-# arrowhead widget demo (called by 'widget')
-#
-
-# arrowSetup --
-# This method regenerates all the text and graphics in the canvas
-# window.  It's called when the canvas is initially created, and also
-# whenever any of the parameters of the arrow head are changed
-# interactively.
-#
-# Arguments:
-# c -           Name of the canvas widget.
-
-def arrowSetup(c)
-  v = $demo_arrowInfo
-
-  # Remember the current box, if there is one.
-  tags = c.gettags('current')
-  if tags != []
-    cur = tags.find{|t| t.kind_of?(String) && t =~ /^box[1-3]$/ }
-  else
-    cur = nil
-  end
-
-  # Create the arrow and outline.
-  c.delete('all')
-  TkcLine.new(c, v.x1, v.y, v.x2, v.y,
-              { 'width'=>10 * v.width,
-                'arrowshape'=>[10*v.a, 10*v.b, 10*v.c],
-                'arrow'=>'last'
-              }.update(v.bigLineStyle) )
-  xtip = v.x2 - 10*v.b
-  deltaY = 10*v.c + 5*v.width
-  TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY,
-              v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y,
-              'width'=>2, 'capstyle'=>'round', 'joinstyle'=>'round')
-
-  # Create the boxes for reshaping the line and arrowhead.
-  TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5,
-                   {'tags'=>['box1', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5,
-                   {'tags'=>['box2', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5,
-                   {'tags'=>['box3', $arrowTag_box]}.update(v.boxStyle) )
-  c.itemconfigure cur, v.activeStyle if cur
-
-  # Create three arrows in actual size with the same parameters
-  TkcLine.new(c, v.x2+50, 0, v.x2+50, 1000, 'width'=>2)
-  tmp = v.x2+100
-  TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width,
-              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width,
-              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width,
-              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-
-  # Create a bunch of other arrows and text items showing the
-  # current dimensions.
-  tmp = v.x2+10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2+15, v.y-deltaY+5*v.c, 'text'=>v.c, 'anchor'=>'w')
-  tmp = v.x1-10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x1-15, v.y, 'text'=>v.width, 'anchor'=>'e')
-  tmp = v.y+5*v.width+10*v.c+10
-  TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2-5*v.a, tmp+5, 'text'=>v.a, 'anchor'=>'n')
-  tmp = tmp+25
-  TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
-
-  if $tk_version =~ /^4.*/
-    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-    TkcText.new(c, v.x1, 330,
-                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",'anchor'=>'w',
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-  else
-    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
-                'font'=>'Helvetica 18')
-    TkcText.new(c, v.x1, 330,
-                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",
-                'anchor'=>'w', 'font'=>'Helvetica 18')
-  end
-
-  v.count += 1
-end
-
-# toplevel widget
-if defined?($arrow_demo) && $arrow_demo
-  $arrow_demo.destroy
-  $arrow_demo = nil
-end
-
-# demo toplevel widget
-$arrow_demo = TkToplevel.new {|w|
-  title("Arrowhead Editor Demonstration")
-  iconname("arrow")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($arrow_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
-            'text'=>"This widget allows you to experiment with different widths and arrowhead shapes for lines in canvases.  To change the line width or the shape of the arrowhead, drag any of the three boxes attached to the oversized arrow.  The arrows on the right give examples at normal scale.  The text at the bottom shows the configuration options as you'd enter them for a canvas line item."){
-  pack('side'=>'top')
-}
-
-# frame
-$arrow_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $arrow_demo
-      $arrow_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'arrow'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas
-$arrow_canvas = TkCanvas.new(base_frame, 'width'=>500, 'height'=>350,
-                             'relief'=>'sunken', 'borderwidth'=>2)
-$arrow_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-#
-unless Struct.const_defined?("ArrowInfo")
-  $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc,
-                               :x1, :x2, :y, :smallTips, :count,
-                               :bigLineStyle, :boxStyle, :activeStyle).new
-end
-$demo_arrowInfo.a = 8
-$demo_arrowInfo.b = 10
-$demo_arrowInfo.c = 3
-$demo_arrowInfo.width = 2
-$demo_arrowInfo.motionProc = proc{}
-$demo_arrowInfo.x1 = 40
-$demo_arrowInfo.x2 = 350
-$demo_arrowInfo.y = 150
-$demo_arrowInfo.smallTips = [5, 5, 2]
-$demo_arrowInfo.count = 0
-if TkWinfo.depth($arrow_canvas) > 1
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'SkyBlue1'}
-  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
-  $demo_arrowInfo.activeStyle = {'fill'=>'red', 'outline'=>'black', 'width'=>1}
-else
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'black',
-    'stipple'=>'@'+[$demo_dir,'..','images','grey.25'].join(File::Separator)}
-  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
-  $demo_arrowInfo.activeStyle = {'fill'=>'black','outline'=>'black','width'=>1}
-end
-$arrowTag_box = TkcTag.new($arrow_canvas)
-arrowSetup $arrow_canvas
-$arrowTag_box.bind('Enter', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.activeStyle)})
-$arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.boxStyle)})
-$arrowTag_box.bind('B1-Enter', proc{})
-$arrowTag_box.bind('B1-Leave', proc{})
-$arrow_canvas.itembind('box1', '1',
-                       proc{$demo_arrowInfo.motionProc \
-                         = proc{|x,y| arrowMove1 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box2', '1',
-                       proc{$demo_arrowInfo.motionProc \
-                         = proc{|x,y| arrowMove2 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box3', '1',
-                       proc{$demo_arrowInfo.motionProc \
-                         = proc{|x,y| arrowMove3 $arrow_canvas, x, y}})
-$arrowTag_box.bind('B1-Motion',
-                  proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
-$arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
-
-# arrowMove1 --
-# This method is called for each mouse motion event on box1 (the
-# one at the vertex of the arrow).  It updates the controlling parameters
-# for the line and arrowhead.
-#
-# Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
-
-def arrowMove1(c,x,y)
-  v = $demo_arrowInfo
-  newA = (v.x2+5-c.canvasx(x).round)/10
-  newA = 0 if newA < 0
-  newA = 25 if newA > 25
-  if newA != v.a
-    c.move('box1', 10*(v.a-newA), 0)
-    v.a = newA
-  end
-end
-
-# arrowMove2 --
-# This method is called for each mouse motion event on box2 (the
-# one at the trailing tip of the arrowhead).  It updates the controlling
-# parameters for the line and arrowhead.
-#
-# Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
-
-def arrowMove2(c,x,y)
-  v = $demo_arrowInfo
-  newB = (v.x2+5-c.canvasx(x).round)/10
-  newB = 0 if newB < 0
-  newB = 25 if newB > 25
-  newC = (v.y+5-c.canvasy(y).round-5*v.width)/10
-  newC = 0 if newC < 0
-  newC = 20 if newC > 20
-  if newB != v.b || newC != v.c
-    c.move('box2', 10*(v.b-newB), 10*(v.c-newC))
-    v.b = newB
-    v.c = newC
-  end
-end
-
-# arrowMove3 --
-# This method is called for each mouse motion event on box3 (the
-# one that controls the thickness of the line).  It updates the
-# controlling parameters for the line and arrowhead.
-#
-# Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
-
-def arrowMove3(c,x,y)
-  v = $demo_arrowInfo
-  newWidth = (v.y+2-c.canvasy(y).round)/5
-  newWidth = 0 if newWidth < 0
-  newWidth = 20 if newWidth > 20
-  if newWidth != v.width
-    c.move('box3', 0, 5*(v.width-newWidth))
-    v.width = newWidth
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/bind.rb b/ext/tk/sample/demos-en/bind.rb
deleted file mode 100644
index c291e4730a..0000000000
--- a/ext/tk/sample/demos-en/bind.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-# bind.rb
-#
-# This demonstration script creates a text widget with bindings set
-# up for hypertext-like effects.
-#
-# text (tag bindings) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($bind_demo) && $bind_demo
-  $bind_demo.destroy
-  $bind_demo = nil
-end
-
-# demo toplevel widget
-$bind_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Tag Bindings")
-  iconname("bind")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($bind_demo).pack(:fill=>:both, :expand=>true)
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $bind_demo
-      $bind_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'bind'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# bind
-def tag_binding_for_bind_demo(tag, enter_style, leave_style)
-  tag.bind('Any-Enter', proc{tag.configure enter_style})
-  tag.bind('Any-Leave', proc{tag.configure leave_style})
-end
-
-# text
-txt = TkText.new(base_frame){|t|
-  #
-  setgrid 'true'
-  #width  60
-  #height 24
-  font $font
-  wrap 'word'
-  TkScrollbar.new(base_frame) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  #
-  if TkWinfo.depth($root).to_i > 1
-    tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised',
-                     'borderwidth'=>1}
-    tagstyle_normal = {'background'=>'', 'relief'=>'flat'}
-  else
-    tagstyle_bold = {'foreground'=>'white', 'background'=>'black'}
-    tagstyle_normal = {'foreground'=>'', 'background'=>''}
-  end
-
-  # insert text
-  insert 'insert', "The same tag mechanism that controls display styles in text widgets can also be used to associate Tcl commands with regions of text, so that mouse or keyboard actions on the text cause particular Tcl commands to be invoked.  For example, in the text below the descriptions of the canvas demonstrations have been tagged.  When you move the mouse over a demo description the description lights up, and when you press button 1 over a description then that particular demonstration is invoked.
-
-"
-  insert('end', '1. Samples of all the different types of items that can be created in canvas widgets.', (d1 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '2. A simple two-dimensional plot that allows you to adjust the positions of the data points.', (d2 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '3. Anchoring and justification modes for text items.',
-         (d3 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '4. An editor for arrow-head shapes for line items.',
-         (d4 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '5. A ruler with facilities for editing tab stops.',
-         (d5 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end',
-         '6. A grid that demonstrates how canvases can be scrolled.',
-         (d6 = TkTextTag.new(t)) )
-
-  # binding
-  [d1, d2, d3, d4, d5, d6].each{|tag|
-    tag_binding_for_bind_demo(tag, tagstyle_bold, tagstyle_normal)
-  }
-  d1.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 'items.rb')
-          })
-  d2.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 'plot.rb')
-          })
-  d3.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 'ctext.rb')
-          })
-  d4.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 'arrow.rb')
-          })
-  d5.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 'ruler.rb')
-          })
-  d6.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 'cscroll.rb')
-          })
-
-  TkTextMarkInsert.new(t, '0.0')
-  configure('state','disabled')
-}
-
-txt.width  60
-txt.height 24
diff --git a/ext/tk/sample/demos-en/bitmap.rb b/ext/tk/sample/demos-en/bitmap.rb
deleted file mode 100644
index 858d067d0d..0000000000
--- a/ext/tk/sample/demos-en/bitmap.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# bitmap.rb
-#
-# This demonstration script creates a toplevel window that displays
-# all of Tk's built-in bitmaps.#
-# bitmap widget demo (called by 'widget')
-#
-
-# bitmapRow --
-# Create a row of bitmap items in a window.
-#
-# Arguments:
-# w -           The parent window that is to contain the row.
-# args -        The names of one or more bitmaps, which will be displayed
-#               in a new row across the bottom of w along with their
-#               names.
-
-def bitmapRow(w,*args)
-  TkFrame.new(w){|row|
-    pack('side'=>'top', 'fill'=>'both')
-    for bitmap in args
-      TkFrame.new(row){|base|
-        pack('side'=>'left', 'fill'=>'both', 'pady'=>'.25c', 'padx'=>'.25c')
-        TkLabel.new(base, 'text'=>bitmap, 'width'=>9).pack('side'=>'bottom')
-        Tk::Label.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
-      }
-    end
-  }
-end
-
-# toplevel widget
-if defined?($bitmap_demo) && $bitmap_demo
-  $bitmap_demo.destroy
-  $bitmap_demo = nil
-end
-
-# demo toplevel widget
-$bitmap_demo = TkToplevel.new {|w|
-  title("Bitmap Demonstration")
-  iconname("bitmap")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($bitmap_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"This window displays all of Tk's built-in bitmaps, along with the names you can use for them in Tcl scripts."){
-  pack('side'=>'top')
-}
-
-# frame
-$bitmap_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $bitmap_demo
-      $bitmap_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'bitmap'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-TkFrame.new(base_frame){|f|
-  bitmapRow(f,'error','gray25','gray50','hourglass')
-  bitmapRow(f,'info','question','questhead','warning')
-  pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-}
-
diff --git a/ext/tk/sample/demos-en/browse1 b/ext/tk/sample/demos-en/browse1
deleted file mode 100644
index 568892e4a8..0000000000
--- a/ext/tk/sample/demos-en/browse1
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env ruby
-
-# browse --
-# This script generates a directory browser, which lists the working
-# directory and allow you to open files or subdirectories by
-# double-clicking.
-
-require 'tk'
-
-# Create a scrollbar on the right side of the main window and a listbox
-# on the left side.
-
-listbox = TkListbox.new(nil, 'relief'=>'sunken',
-			'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
-  TkScrollbar.new(nil, 'command'=>proc{|*args| l.yview *args}) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    l.yscrollcommand(proc{|first,last| s.set(first,last)})
-  }
-
-  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-}
-
-root = TkRoot.new
-root.minsize(1,1)
-
-# The procedure below is invoked to open a browser on a given file;  if the
-# file is a directory then another instance of this program is invoked; if
-# the file is a regular file then the Mx editor is invoked to display
-# the file.
-
-def browse (dir, file)
-  file = dir + File::Separator + file if dir != '.'
-  type = File.ftype(file)
-  if type == 'directory'
-    system($0 + ' ' + file + ' &')
-  else
-    if type == 'file'
-      if ENV['EDITOR']
-	system(ENV['EDITOR'] + ' ' + file + ' &')
-      else
-	system('xedit ' + file + ' &')
-      end
-    else
-      STDOUT.print "\"#{file}\" isn't a directory or regular file"
-    end
-  end
-end
-
-# Fill the listbox with a list of all the files in the directory (run
-# the "ls" command to get that information).
-
-dir = ARGV[0] ?  ARGV[0] : '.'
-open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
-  listbox.insert('end', fname.chomp)
-}
-
-# Set up bindings for the browser.
-
-Tk.bind_all('Control-c', proc{root.destroy})
-listbox.bind('Double-Button-1',
-	     proc{TkSelection.get.each{|f| browse dir, f}})
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/browse2 b/ext/tk/sample/demos-en/browse2
deleted file mode 100644
index 1a511c8d29..0000000000
--- a/ext/tk/sample/demos-en/browse2
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-
-# browse --
-# This script generates a directory browser, which lists the working
-# directory and allow you to open files or subdirectories by
-# double-clicking.
-
-require 'tk'
-
-class Browse
-  BROWSE_WIN_COUNTER = TkVariable.new(0)
-
-  def initialize(dir)
-    BROWSE_WIN_COUNTER.value = BROWSE_WIN_COUNTER.to_i + 1
-
-    # create base frame
-    base = TkToplevel.new {
-      minsize(1,1)
-      title('Browse : ' + dir)
-    }
-
-    # Create a scrollbar on the right side of the main window and a listbox
-    # on the left side.
-    list = TkListbox.new(base, 'relief'=>'sunken',
-			 'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
-      TkScrollbar.new(base, 'command'=>proc{|*args| l.yview *args}) {|s|
-	pack('side'=>'right', 'fill'=>'y')
-	l.yscrollcommand(proc{|first,last| s.set(first,last)})
-      }
-
-      pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-
-      # Fill the listbox with a list of all the files in the directory (run
-      # the "ls" command to get that information).
-      open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
-	l.insert('end', fname.chomp)
-      }
-
-    }
-
-    # Set up bindings for the browser.
-    base.bind('Destroy', proc{
-		Browse::BROWSE_WIN_COUNTER.value = \
-		                Browse::BROWSE_WIN_COUNTER.to_i - 1
-	      })
-    base.bind('Control-c', proc{base.destroy})
-    list.bind('Double-Button-1',
-	 proc{TkSelection.get.each{|f| self.browse dir, f}})
-  end
-
-  # The method below is invoked to open a browser on a given file;  if the
-  # file is a directory then another instance of this program is invoked; if
-  # the file is a regular file then the Mx editor is invoked to display
-  # the file.
-  def browse (dir, file)
-    file = dir + File::Separator + file if dir != '.'
-    type = File.ftype(file)
-    if type == 'directory'
-      Browse.new(file)
-    else
-      if type == 'file'
-	if ENV['EDITOR']
-	  system(ENV['EDITOR'] + ' ' + file + ' &')
-	else
-	  system('xedit ' + file + ' &')
-	end
-      else
-	STDOUT.print "\"#{file}\" isn't a directory or regular file"
-      end
-    end
-  end
-
-end
-
-Browse.new(ARGV[0] ? ARGV[0] : '.')
-
-TkRoot.new {
-  withdraw
-  Browse::BROWSE_WIN_COUNTER.trace('w', proc{exit if Browse::BROWSE_WIN_COUNTER.to_i == 0})
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/button.rb b/ext/tk/sample/demos-en/button.rb
deleted file mode 100644
index f63a2f3b06..0000000000
--- a/ext/tk/sample/demos-en/button.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# button.rb
-#
-# This demonstration script creates a toplevel window containing
-# several button widgets.
-#
-# button widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($button_demo) && $button_demo
-  $button_demo.destroy
-  $button_demo = nil
-end
-
-# demo toplevel widget
-$button_demo = TkToplevel.new {|w|
-  title("Button Demonstration")
-  iconname("button")
-  positionWindow(w)
-}
-
-# label
-msg = TkLabel.new($button_demo) {
-  font $kanji_font
-  wraplength '4i'
-  justify 'left'
-  text "If you click on any of the four buttons below, the background of the button area will change to the color indicated in the button.  You can press Tab to move among the buttons, then press Space to invoke the current button."
-}
-msg.pack('side'=>'top')
-
-# frame
-$button_buttons = Tk::Frame.new($button_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $button_demo
-      $button_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'button'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# button
-TkButton.new($button_demo){
-  text "Peach Puff"
-  width 10
-  command proc{
-    $button_demo.configure('bg','PeachPuff1')
-    $button_buttons.configure('bg','PeachPuff1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Light Blue"
-  width 10
-  command proc{
-    $button_demo.configure('bg','LightBlue1')
-    $button_buttons.configure('bg','LightBlue1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Sea Green"
-  width 10
-  command proc{
-    $button_demo.configure('bg','SeaGreen2')
-    $button_buttons.configure('bg','SeaGreen2')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Yellow"
-  width 10
-  command proc{
-    $button_demo.configure('bg','Yellow1')
-    $button_buttons.configure('bg','Yellow1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
diff --git a/ext/tk/sample/demos-en/check.rb b/ext/tk/sample/demos-en/check.rb
deleted file mode 100644
index bf0b73476a..0000000000
--- a/ext/tk/sample/demos-en/check.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-# check.rb
-#
-# This demonstration script creates a toplevel window containing
-# several checkbuttons.
-#
-# checkbutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($check_demo) && $check_demo
-  $check_demo.destroy
-  $check_demo = nil
-end
-
-# demo toplevel widget
-$check_demo = TkToplevel.new {|w|
-  title("Checkbutton Demonstration")
-  iconname("check")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($check_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Three checkbuttons are displayed below.  If you click on a button, it will toggle the button's selection state and set a Tcl variable to a value indicating the state of the checkbutton.  Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.pack('side'=>'top')
-
-#
-wipers = TkVariable.new(0)
-brakes = TkVariable.new(0)
-sober  = TkVariable.new(0)
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $check_demo
-      $check_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'check'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-
-  TkButton.new(frame) {
-    text 'See Variables'
-    command proc{
-      showVars(base_frame,
-               ['wipers', wipers], ['brakes', brakes], ['sober', sober])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# checkbutton
-[ TkCheckButton.new(base_frame, 'text'=>'Wipers  OK', 'variable'=>wipers),
-  TkCheckButton.new(base_frame, 'text'=>'Brakes  OK', 'variable'=>brakes),
-  TkCheckButton.new(base_frame, 'text'=>'Driver Sober', 'variable'=>sober)
-].each{|w| w.relief('flat'); w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')}
-
diff --git a/ext/tk/sample/demos-en/check2.rb b/ext/tk/sample/demos-en/check2.rb
deleted file mode 100644
index 4f7b1f07bc..0000000000
--- a/ext/tk/sample/demos-en/check2.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# checkbutton widget demo2 (called by 'widget')
-#
-
-# delete old toplevel widget
-if defined?($check2_demo) && $check2_demo
-  $check2_demo.destroy
-  $check2_demo = nil
-end
-
-# create demo toplevel widget
-$check2_demo = TkToplevel.new {|w|
-  title("Checkbutton Demonstration 2")
-  iconname("check2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($check2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Four checkbuttons are displayed below.  If you click on a button, it will toggle the button's selection state and set a Tcl variable to a value indicating the state of the checkbutton.  The first button also follows the state of the other three.  If only some of the three are checked, the first button will display the tri-state mode. Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.pack('side'=>'top')
-
-# variable
-safety = TkVariable.new(0)
-wipers = TkVariable.new(0)
-brakes = TkVariable.new(0)
-sober  = TkVariable.new(0)
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
-         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         TkButton.new(frame, :text=>'See Variables',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{
-                        showVars($check2_demo,
-                                 ['safety', safety], ['wipers', wipers],
-                                 ['brakes', brakes], ['sober', sober])
-                      }),
-         TkButton.new(frame, :text=>'See Code',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{showCode 'check2'}),
-         TkButton.new(frame, :text=>'Dismiss',
-                      :image=>$image['delete'], :compound=>:left,
-                      :command=>proc{
-                        tmppath = $check2_demo
-                        $check2_demo = nil
-                        $showVarsWin[tmppath.path] = nil
-                        tmppath.destroy
-                      }),
-         :padx=>4, :pady=>4)
-  frame.grid_columnconfigure(0, :weight=>1)
-}.pack('side'=>'bottom', 'fill'=>'x')
-
-
-# checkbutton
-TkCheckButton.new(base_frame, :text=>'Safety Check', :variable=>safety,
-                  :relief=>:flat, :onvalue=>'all', :offvalue=>'none',
-                  :tristatevalue=>'partial'){
-  pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
-[ TkCheckButton.new(base_frame, 'text'=>'Wipers OK', 'variable'=>wipers),
-  TkCheckButton.new(base_frame, 'text'=>'Brakes OK', 'variable'=>brakes),
-  TkCheckButton.new(base_frame, 'text'=>'Driver Sober', 'variable'=>sober)
-].each{|w|
-  w.relief('flat')
-  w.pack('side'=>'top', 'padx'=>15, 'pady'=>2, 'anchor'=>'w')
-}
-
-# tristate check
-in_check = false
-tristate_check = proc{|n1,n2,op|
-  unless in_check
-    in_check = true
-    begin
-      if n1 == safety
-        if safety == 'none'
-          wipers.value = 0
-          brakes.value = 0
-          sober.value  = 0
-        elsif safety == 'all'
-          wipers.value = 1
-          brakes.value = 1
-          sober.value  = 1
-        end
-      else
-        if wipers == 1 && brakes == 1 && sober == 1
-          safety.value = 'all'
-        elsif wipers == 1 || brakes == 1 || sober == 1
-          safety.value = 'partial'
-        else
-          safety.value = 'none'
-        end
-      end
-    ensure
-      in_check = false
-    end
-  end
-}
-
-[wipers, brakes, sober, safety].each{|v| v.trace('w', tristate_check)}
diff --git a/ext/tk/sample/demos-en/clrpick.rb b/ext/tk/sample/demos-en/clrpick.rb
deleted file mode 100644
index 6da28cb112..0000000000
--- a/ext/tk/sample/demos-en/clrpick.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# clrpick.rb
-#
-# This demonstration script prompts the user to select a color.
-#
-# widget demo prompts the user to select a color (called by 'widget')
-#
-#  Note: don't support ttk_wrapper. work with standard widgets only.
-#
-
-# toplevel widget
-if defined?($clrpick_demo) && $clrpick_demo
-  $clrpick_demo.destroy
-  $clrpick_demo = nil
-end
-
-# demo toplevel widget
-$clrpick_demo = TkToplevel.new {|w|
-  title("Color Selection Dialogs")
-  iconname("colors")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($clrpick_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-#TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-Tk::Label.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"Press the buttons below to choose the foreground and background colors for the widgets in this window.").pack('side'=>'top')
-
-# frame
-#TkFrame.new($clrpick_demo) {|frame|
-Tk::Frame.new($clrpick_demo) {|frame|
-  # TkButton.new(frame) {
-  Tk::Button.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $clrpick_demo
-      $clrpick_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  # TkButton.new(frame) {
-  Tk::Button.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'clrpick'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# button
-# TkButton.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
-Tk::Button.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'background',
-              ['background', 'highlightbackground']})
-  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
-}
-
-# TkButton.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
-Tk::Button.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
-  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
-}
-
-def setColor(w,button,name,options)
-  w.grab
-  initialColor = button[name]
-  color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w,
-                         'initialcolor'=>initialColor)
-  if color != ""
-    setColor_helper(w,options,color)
-  end
-
-  w.grab('release')
-end
-
-def setColor_helper(w, options, color)
-  options.each{|opt|
-    begin
-      w[opt] = color
-    rescue
-    end
-  }
-  TkWinfo.children(w).each{|child|
-    setColor_helper child, options, color
-  }
-end
-
diff --git a/ext/tk/sample/demos-en/colors.rb b/ext/tk/sample/demos-en/colors.rb
deleted file mode 100644
index b0ef9590b9..0000000000
--- a/ext/tk/sample/demos-en/colors.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-# colors.rb
-#
-# This demonstration script creates a listbox widget that displays
-# many of the colors from the X color database.  You can click on
-# a color to change the application's palette.
-#
-# listbox widget demo 'colors' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($colors_demo) && $colors_demo
-  $colors_demo.destroy
-  $colors_demo = nil
-end
-
-# demo toplevel widget
-$colors_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (colors)")
-  iconname("colors")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($colors_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "A listbox containing several color names is displayed below, along with a scrollbar.  You can scan the list either using the scrollbar or by dragging in the listbox window with button 2 pressed.  If you double-click button 1 on a color, then the application's color palette will be set to match that color"
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $colors_demo
-      $colors_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'colors'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-colors_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
-  s = TkScrollbar.new(w)
-  colors_lbox = TkListbox.new(w) {
-    setgrid 1
-    width  10
-    height 12
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| colors_lbox.yview(*args)})
-  s.pack('side'=>'right', 'fill'=>'y')
-  colors_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-#colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
-colors_lbox.bind('Double-1', proc{
-                   begin
-                     TkPalette.setPalette TkSelection.get
-                   rescue => e
-                     p e
-                     Tk.tk_call_without_enc('destroy', '.___tk_set_palette')
-                   end
-                 })
-
-ins_data = [
-  'gray60','gray70','gray80','gray85','gray90','gray95',
-  'snow1','snow2','snow3','snow4','seashell1','seashell2',
-  'seashell3','seashell4','AntiqueWhite1','AntiqueWhite2',
-  'AntiqueWhite3','AntiqueWhite4','bisque1','bisque2',
-  'bisque3','bisque4','PeachPuff1','PeachPuff2',
-  'PeachPuff3','PeachPuff4','NavajoWhite1','NavajoWhite2',
-  'NavajoWhite3','NavajoWhite4','LemonChiffon1',
-  'LemonChiffon2','LemonChiffon3','LemonChiffon4',
-  'cornsilk1','cornsilk2','cornsilk3','cornsilk4',
-  'ivory1','ivory2','ivory3','ivory4','honeydew1',
-  'honeydew2','honeydew3','honeydew4','LavenderBlush1',
-  'LavenderBlush2','LavenderBlush3','LavenderBlush4',
-  'MistyRose1','MistyRose2','MistyRose3','MistyRose4',
-  'azure1','azure2','azure3','azure4','SlateBlue1',
-  'SlateBlue2','SlateBlue3','SlateBlue4','RoyalBlue1',
-  'RoyalBlue2','RoyalBlue3','RoyalBlue4','blue1','blue2',
-  'blue3','blue4','DodgerBlue1','DodgerBlue2',
-  'DodgerBlue3','DodgerBlue4','SteelBlue1','SteelBlue2',
-  'SteelBlue3','SteelBlue4','DeepSkyBlue1','DeepSkyBlue2',
-  'DeepSkyBlue3','DeepSkyBlue4','SkyBlue1','SkyBlue2',
-  'SkyBlue3','SkyBlue4','LightSkyBlue1','LightSkyBlue2',
-  'LightSkyBlue3','LightSkyBlue4','SlateGray1',
-  'SlateGray2','SlateGray3','SlateGray4',
-  'LightSteelBlue1','LightSteelBlue2','LightSteelBlue3',
-  'LightSteelBlue4','LightBlue1','LightBlue2',
-  'LightBlue3','LightBlue4','LightCyan1','LightCyan2',
-  'LightCyan3','LightCyan4','PaleTurquoise1',
-  'PaleTurquoise2','PaleTurquoise3','PaleTurquoise4',
-  'CadetBlue1','CadetBlue2','CadetBlue3','CadetBlue4',
-  'turquoise1','turquoise2','turquoise3','turquoise4',
-  'cyan1','cyan2','cyan3','cyan4','DarkSlateGray1',
-  'DarkSlateGray2','DarkSlateGray3','DarkSlateGray4',
-  'aquamarine1','aquamarine2','aquamarine3','aquamarine4',
-  'DarkSeaGreen1','DarkSeaGreen2','DarkSeaGreen3',
-  'DarkSeaGreen4','SeaGreen1','SeaGreen2','SeaGreen3',
-  'SeaGreen4','PaleGreen1','PaleGreen2','PaleGreen3',
-  'PaleGreen4','SpringGreen1','SpringGreen2',
-  'SpringGreen3','SpringGreen4','green1','green2',
-  'green3','green4','chartreuse1','chartreuse2',
-  'chartreuse3','chartreuse4','OliveDrab1','OliveDrab2',
-  'OliveDrab3','OliveDrab4','DarkOliveGreen1',
-  'DarkOliveGreen2','DarkOliveGreen3','DarkOliveGreen4',
-  'khaki1','khaki2','khaki3','khaki4','LightGoldenrod1',
-  'LightGoldenrod2','LightGoldenrod3','LightGoldenrod4',
-  'LightYellow1','LightYellow2','LightYellow3',
-  'LightYellow4','yellow1','yellow2','yellow3','yellow4',
-  'gold1','gold2','gold3','gold4','goldenrod1',
-  'goldenrod2','goldenrod3','goldenrod4','DarkGoldenrod1',
-  'DarkGoldenrod2','DarkGoldenrod3','DarkGoldenrod4',
-  'RosyBrown1','RosyBrown2','RosyBrown3','RosyBrown4',
-  'IndianRed1','IndianRed2','IndianRed3','IndianRed4',
-  'sienna1','sienna2','sienna3','sienna4','burlywood1',
-  'burlywood2','burlywood3','burlywood4','wheat1',
-  'wheat2','wheat3','wheat4','tan1','tan2','tan3','tan4',
-  'chocolate1','chocolate2','chocolate3','chocolate4',
-  'firebrick1','firebrick2','firebrick3','firebrick4',
-  'brown1','brown2','brown3','brown4','salmon1','salmon2',
-  'salmon3','salmon4','LightSalmon1','LightSalmon2',
-  'LightSalmon3','LightSalmon4','orange1','orange2',
-  'orange3','orange4','DarkOrange1','DarkOrange2',
-  'DarkOrange3','DarkOrange4','coral1','coral2','coral3',
-  'coral4','tomato1','tomato2','tomato3','tomato4',
-  'OrangeRed1','OrangeRed2','OrangeRed3','OrangeRed4',
-  'red1','red2','red3','red4','DeepPink1','DeepPink2',
-  'DeepPink3','DeepPink4','HotPink1','HotPink2',
-  'HotPink3','HotPink4','pink1','pink2','pink3','pink4',
-  'LightPink1','LightPink2','LightPink3','LightPink4',
-  'PaleVioletRed1','PaleVioletRed2','PaleVioletRed3',
-  'PaleVioletRed4','maroon1','maroon2','maroon3',
-  'maroon4','VioletRed1','VioletRed2','VioletRed3',
-  'VioletRed4','magenta1','magenta2','magenta3',
-  'magenta4','orchid1','orchid2','orchid3','orchid4',
-  'plum1','plum2','plum3','plum4','MediumOrchid1',
-  'MediumOrchid2','MediumOrchid3','MediumOrchid4',
-  'DarkOrchid1','DarkOrchid2','DarkOrchid3',
-  'DarkOrchid4','purple1','purple2','purple3','purple4',
-  'MediumPurple1','MediumPurple2','MediumPurple3',
-  'MediumPurple4','thistle1','thistle2','thistle3', 'thistle4'
-]
-
-colors_lbox.insert(0, *ins_data)
diff --git a/ext/tk/sample/demos-en/combo.rb b/ext/tk/sample/demos-en/combo.rb
deleted file mode 100644
index d77660095c..0000000000
--- a/ext/tk/sample/demos-en/combo.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# combo.rb --
-#
-# This demonstration script creates several combobox widgets.
-#
-# based on "Id: combo.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($combo_demo) && $combo_demo
-  $combo_demo.destroy
-  $combo_demo = nil
-end
-
-$combo_demo = TkToplevel.new {|w|
-  title("Combobox Demonstration")
-  iconname("combo")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($combo_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Three different combo-boxes are displayed below. \
-You can add characters to the first \
-one by pointing, clicking and typing, just as with an entry; pressing \
-Return will cause the current value to be added to the list that is \
-selectable from the drop-down list, and you can choose other values \
-by pressing the Down key, using the arrow keys to pick another one, \
-and pressing Return again. The second combo-box is fixed to a \
-particular value, and cannot be modified at all. The third one only \
-allows you to select values from its drop-down list of Australian \
-cities.
-EOL
-
-## variables
-firstValue  = TkVariable.new
-secondValue = TkVariable.new
-ozCity      = TkVariable.new
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Variables',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{
-                           showVars(base_frame,
-                                    ['firstVariable', firstValue],
-                                    ['secondVariable', secondValue],
-                                    ['ozCity', ozCity])
-                         }),
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'combo'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $combo_demo.destroy
-                           $combo_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-australianCities = [
-  'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide', 'Brisbane',
-  'Hobart', 'Darwin', 'Alice Springs'
-]
-
-
-secondValue.value = 'unchangable'
-ozCity.value = 'Sydney'
-
-Tk.pack(Ttk::Labelframe.new(frame, :text=>'Fully Editable'){|f|
-          Ttk::Combobox.new(f, :textvariable=>firstValue){|b|
-            b.bind('Return', '%W'){|w|
-              w.values <<= w.value unless w.values.include?(w.value)
-            }
-          }.pack(:pady=>5, :padx=>10)
-        },
-
-        Ttk::LabelFrame.new(frame, :text=>'Disabled'){|f|
-          Ttk::Combobox.new(f, :textvariable=>secondValue, :state=>:disabled) .
-            pack(:pady=>5, :padx=>10)
-        },
-
-        Ttk::LabelFrame.new(frame, :text=>'Defined List Only'){|f|
-          Ttk::Combobox.new(f, :textvariable=>ozCity, :state=>:readonly,
-                            :values=>australianCities) .
-            pack(:pady=>5, :padx=>10)
-        },
-
-        :side=>:top, :pady=>5, :padx=>10)
diff --git a/ext/tk/sample/demos-en/cscroll.rb b/ext/tk/sample/demos-en/cscroll.rb
deleted file mode 100644
index 40a3afc0ad..0000000000
--- a/ext/tk/sample/demos-en/cscroll.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-# cscroll.rb
-#
-# This demonstration script creates a simple canvas that can be
-# scrolled in two dimensions.
-#
-# simple scrollable canvas widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($cscroll_demo) && $cscroll_demo
-  $cscroll_demo.destroy
-  $cscroll_demo = nil
-end
-
-# demo toplevel widget
-$cscroll_demo = TkToplevel.new {|w|
-  title("Scrollable Canvas Demonstration")
-  iconname("cscroll")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($cscroll_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i',
-            'justify'=>'left', 'text'=>"This window displays a canvas widget that can be scrolled either using the scrollbars or by dragging with button 2 in the canvas.  If you click button 1 on one of the rectangles, its indices will be printed on stdout."){
-  pack('side'=>'top')
-}
-
-# frame
-$cscroll_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $cscroll_demo
-      $cscroll_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'cscroll'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-unless $tk_version =~ /^4\.[01]/
-  $cscroll_grid = TkFrame.new(base_frame) {
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-  }
-  TkGrid.rowconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
-  TkGrid.columnconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
-end
-
-# canvas
-$cscroll_canvas = TkCanvas.new(base_frame,
-                               'relief'=>'sunken', 'borderwidth'=>2,
-                               'scrollregion'=>['-11c', '-11c', '50c', '20c']
-                               ) {|c|
-  if $tk_version =~ /^4\.[01]/
-    pack('expand'=>'yes', 'fill'=>'both')
-  else
-    grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-         'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-  end
-
-  TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
-    c.yscrollcommand(proc{|first,last| vs.set first,last})
-    if $tk_version =~ /^4\.[01]/
-      pack('side'=>'right', 'fill'=>'y')
-    else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    end
-  }
-
-  TkScrollbar.new(base_frame, 'orient'=>'horiz',
-                  'command'=>proc{|*args| c.xview(*args)}) {|hs|
-    c.xscrollcommand(proc{|first,last| hs.set first,last})
-    if $tk_version =~ /^4\.[01]/
-      pack('side'=>'bottom', 'fill'=>'x')
-    else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    end
-  }
-}
-
-bg = $cscroll_canvas.configinfo('bg')[4]
-(0..19).each{|i|
-  x = -10+3*i
-  y = -10
-  (0..9).each{|j|
-    TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c",
-                     'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
-    TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c",
-                'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
-    y += 3
-  }
-}
-
-$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
-$cscroll_canvas.itembind('all', 'Any-Leave', proc{scrollLeave $cscroll_canvas})
-$cscroll_canvas.itembind('all', '1', proc{scrollButton $cscroll_canvas})
-$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
-$cscroll_canvas.bind('2', proc{|x,y| $cscroll_canvas.scan_mark(x,y)}, '%x %y')
-$cscroll_canvas.bind('B2-Motion',
-                     proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
-
-def scrollEnter(c)
-  id = c.find_withtag('current')[0].id
-  id -= 1 if c.gettags('current').include?('text')
-  $oldFill = c.itemconfiginfo(id, 'fill')[4]
-  if TkWinfo.depth(c) > 1
-    c.itemconfigure(id, 'fill'=>'SeaGreen1')
-  else
-    c.itemconfigure(id, 'fill'=>'black')
-    c.itemconfigure(id+1, 'fill'=>'white')
-  end
-end
-
-def scrollLeave(c)
-  id = c.find_withtag('current')[0].id
-  id -= 1 if c.gettags('current').include?('text')
-  c.itemconfigure(id, 'fill'=>$oldFill)
-  c.itemconfigure(id+1, 'fill'=>'black')
-end
-
-def scrollButton(c)
-  id = c.find_withtag('current')[0].id
-  id += 1 unless c.gettags('current').include?('text')
-  print "You buttoned at #{c.itemconfiginfo(id,'text')[4]}\n"
-end
-
diff --git a/ext/tk/sample/demos-en/ctext.rb b/ext/tk/sample/demos-en/ctext.rb
deleted file mode 100644
index e04cb283f0..0000000000
--- a/ext/tk/sample/demos-en/ctext.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-# ctext.rb
-#
-# This demonstration script creates a canvas widget with a text
-# item that can be edited and reconfigured in various ways.
-#
-# Canvas Text widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($ctext_demo) && $ctext_demo
-  $ctext_demo.destroy
-  $ctext_demo = nil
-end
-
-# demo toplevel widget
-$ctext_demo = TkToplevel.new {|w|
-  title("Canvas Text Demonstration")
-  iconname("Text")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ctext_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
-            'text'=>"This window displays a string of text to demonstrate the text facilities of canvas widgets.  You can click in the boxes to adjust the position of the text relative to its positioning point or change its justification.  The text also supports the following simple bindings for editing:
-  1. You can point, click, and type.
-  2. You can also select with button 1.
-  3. You can copy the selection to the mouse position with button 2.
-  4. Backspace and Control+h delete the selection if there is one;
-     otherwise they delete the character just before the insertion cursor.
-  5. Delete deletes the selection if there is one; otherwise it deletes
-     the character just after the insertion cursor."){
-  pack('side'=>'top')
-}
-
-# frame
-$ctext_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $ctext_demo
-      $ctext_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'ctext'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas
-$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat',
-                             'borderwidth'=>0, 'width'=>500, 'height'=>350)
-$ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-
-# font
-if $tk_version =~ /^4.*/
-  textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-else
-  textFont = 'Helvetica 24'
-end
-
-# canvas
-TkcRectangle.new($ctext_canvas, 245, 195, 255, 205,
-                 'outline'=>'black', 'fill'=>'red')
-
-ctag_text_param = {
-  'text'=>"This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been been defined to support editing (see above).",
-  'width'=>440, 'anchor'=>'n', 'justify'=>'left'
-}
-if $tk_version =~ /^4.*/
-  ctag_text_param['font'] = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-else
-  ctag_text_param['font'] = 'Helvetica 24'
-end
-
-$ctag_text = TkcTag.new($ctext_canvas)
-$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, ctag_text_param))
-
-$ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('Shift-1',
-        proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"},
-        "%x %y")
-$ctag_text.bind('Shift-B1-Motion',
-                proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
-$ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
-$ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
-$ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
-$ctag_text.bind('Delete', proc{textDel $ctext_canvas})
-$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"},
-                "%x %y")
-
-# Next, create some items that allow the text's anchor position
-# to be edited.
-
-def mkTextConfig(w,x,y,option,value,color)
-  item = TkcRectangle.new(w, x, y, x+30, y+30,
-                          'outline'=>'black', 'fill'=>color, 'width'=>1)
-  item.bind('1', proc{$ctag_text.configure option, value})
-  w.addtag_withtag('config', item)
-end
-
-x = 50
-y = 50
-color = 'LightSkyBlue1'
-mkTextConfig $ctext_canvas, x, y, 'anchor', 'se', color
-mkTextConfig $ctext_canvas, x+30, y, 'anchor', 's', color
-mkTextConfig $ctext_canvas, x+60, y, 'anchor', 'sw', color
-mkTextConfig $ctext_canvas, x, y+30, 'anchor', 'e', color
-mkTextConfig $ctext_canvas, x+30, y+30, 'anchor', 'center', color
-mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
-mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
-mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
-mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
-item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50,
-                        'outline'=>'black', 'fill'=>'red')
-item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
-if $tk_version =~ /^4.*/
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
-              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
-              'anchor'=>'s', 'fill'=>'brown')
-else
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
-              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
-end
-
-# Lastly, create some items that allow the text's justification to be
-# changed.
-
-x = 350
-y = 50
-color = 'SeaGreen2'
-mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
-mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
-mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
-if $tk_version =~ /^4.*/
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
-              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
-              'anchor'=>'s', 'fill'=>'brown')
-else
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
-              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
-end
-
-$ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
-$ctext_canvas.itembind('config', 'Leave',
-                       proc{$ctext_canvas\
-                             .itemconfigure('current',
-                                            'fill'=>$textConfigFill)})
-
-$textConfigFill = ''
-
-def textEnter(w)
-  $textConfigFill = (w.itemconfiginfo 'current', 'fill')[4]
-  w.itemconfigure 'current', 'fill', 'black'
-end
-
-def textInsert(w, string)
-  return if string == ""
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-  end
-  $ctag_text.insert 'insert', string
-end
-
-def textPaste(w, pos)
-  begin
-    $ctag_text.insert pos, TkSelection.get
-  rescue
-  end
-end
-
-def textB1Press(w,x,y)
-  w.icursor 'current', "@#{x},#{y}"
-  w.itemfocus 'current'
-  w.focus
-  w.select_from 'current', "@#{x},#{y}"
-end
-
-def textB1Move(w,x,y)
-  w.select_to 'current', "@#{x},#{y}"
-end
-
-def textBs(w)
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-    char = $ctag_text.index('insert').to_i - 1
-    $ctag_text.dchars(char) if char >= 0
-  end
-end
-
-def textDel(w)
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-    $ctag_text.dchars 'insert'
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/dialog1.rb b/ext/tk/sample/demos-en/dialog1.rb
deleted file mode 100644
index af476ecd05..0000000000
--- a/ext/tk/sample/demos-en/dialog1.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# a dialog box with a local grab (called by 'widget')
-#
-class TkDialog_Demo1 < TkDialog
-  ###############
-  private
-  ###############
-  def title
-    "Dialog with local grab"
-  end
-
-  def message
-    'This is a modal dialog box.  It uses Tk\'s "grab" command to create a "local grab" on the dialog box.  The grab prevents any pointer-related events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below.  However, you can still interact with other applications.'
-  end
-
-  def bitmap
-    'info'
-  end
-
-  def default_button
-    0
-  end
-
-  def buttons
-    # ["Dismiss", "", "Show Code"]
-    ["OK", "Cancel", "Show Code"]
-  end
-end
-
-ret =  TkDialog_Demo1.new('message_config'=>{'wraplength'=>'4i'}).value
-case ret
-when 0
-  print "You pressed OK\n"
-when 1
-  print "You pressed Cancel\n"
-when 2
-  showCode 'dialog1'
-end
diff --git a/ext/tk/sample/demos-en/dialog2.rb b/ext/tk/sample/demos-en/dialog2.rb
deleted file mode 100644
index efc4b714da..0000000000
--- a/ext/tk/sample/demos-en/dialog2.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# a dialog box with a global grab (called by 'widget')
-#
-class TkDialog_Demo2 < TkDialog
-  ###############
-  private
-  ###############
-  def title
-    "Dialog with global grab"
-  end
-
-  def message
-    "This dialog box uses a global grab, so it prevents you from interacting with anything on your display until you invoke one of the buttons below.  Global grabs are almost always a bad idea; don't use them unless you're truly desperate."
-  end
-
-  def bitmap
-    'info'
-  end
-
-  def default_button
-    0
-  end
-
-  def buttons
-    ["OK", "Cancel", "Show Code"]
-  end
-end
-
-ret =  TkDialog_Demo2.new('message_config'=>{'wraplength'=>'4i'},
-                          'prev_command'=>proc{|dialog|
-                            Tk.after 100, proc{dialog.grab('global')}
-                          }).value
-case ret
-when 0
-  print "\You pressed OK\n"
-when 1
-  print "You pressed Cancel\n"
-when 2
-  showCode 'dialog2'
-end
-
diff --git a/ext/tk/sample/demos-en/doc.org/README b/ext/tk/sample/demos-en/doc.org/README
deleted file mode 100644
index 90677d3316..0000000000
--- a/ext/tk/sample/demos-en/doc.org/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory contains a collection of demonstration programs that
-are translated into Japanese.  You need to use a Japanized "wish" to
-see these Japanese-translated demonstration programs.  You also need
-to put this directory ("demos.jp") at the next to "demos" since some
-of the programs refer to the image files at "demos".
-
-Please refer to the README file at "demos" for more detail.
diff --git a/ext/tk/sample/demos-en/doc.org/README.JP b/ext/tk/sample/demos-en/doc.org/README.JP
deleted file mode 100644
index 42b4929378..0000000000
--- a/ext/tk/sample/demos-en/doc.org/README.JP
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory contains "widget" demo for the Japanized Tcl7.6/Tk4.2.
-Most of the messages in the original are translated to Japanese.
-But other tools in this directory are not translated.
-
-Following 2 kanji fonts are defined at the beginning of the file "widget."
-
-	-*--24-*-jisx0208.1983-0
-	-*--16-*-jisx0208.1983-0
-
-These fonts are all part of the core distribution of X11R5, so
-if you are running X11R5, you don't have to modify the file.
-
-But if you don't have these fonts, replace them with appropriate ones.
-"-*--14-*-jisx0208.1983-0" will be a good choice.
diff --git a/ext/tk/sample/demos-en/doc.org/README.tk80 b/ext/tk/sample/demos-en/doc.org/README.tk80
deleted file mode 100644
index c71f977d74..0000000000
--- a/ext/tk/sample/demos-en/doc.org/README.tk80
+++ /dev/null
@@ -1,46 +0,0 @@
-This directory contains a collection of programs to demonstrate
-the features of the Tk toolkit.  The programs are all scripts for
-"wish", a windowing shell.  If wish has been installed in /usr/local
-then you can invoke any of the programs in this directory just
-by typing its file name to your command shell.  Otherwise invoke
-wish with the file as its first argument, e.g., "wish hello".
-The rest of this file contains a brief description of each program.
-Files with names ending in ".tcl" are procedure packages used by one
-or more of the demo programs;  they can't be used as programs by
-themselves so they aren't described below.
-
-hello -		Creates a single button;  if you click on it, a message
-		is typed and the application terminates.
-
-widget -	Contains a collection of demonstrations of the widgets
-		currently available in the Tk library.  Most of the .tcl
-		files are scripts for individual demos available through
-		the "widget" program.
-
-ixset -		A simple Tk-based wrapper for the "xset" program, which
-		allows you to interactively query and set various X options
-		such as mouse acceleration and bell volume.  Thanks to
-		Pierre David for contributing this example.
-
-rolodex -	A mock-up of a simple rolodex application.  It has much of
-		the user interface for such an application but no back-end
-		database.  This program was written in response to Tom
-		LaStrange's toolkit benchmark challenge.
-
-tcolor -	A color editor.  Allows you to edit colors in several
-		different ways, and will also perform automatic updates
-		using "send".
-
-rmt -		Allows you to "hook-up" remotely to any Tk application
-		on the display.  Select an application with the menu,
-		then just type commands:  they'll go to that application.
-
-timer -		Displays a seconds timer with start and stop buttons.
-		Control-c and control-q cause it to exit.
-
-browse -	A simple directory browser.  Invoke it with and argument
-		giving the name of the directory you'd like to browse.
-		Double-click on files or subdirectories to browse them.
-		Control-c and control-q cause the program to exit.
-
-sccs id = SCCS: @(#) README 1.3 96/02/16 10:49:14
diff --git a/ext/tk/sample/demos-en/doc.org/license.terms b/ext/tk/sample/demos-en/doc.org/license.terms
deleted file mode 100644
index c0a44d3fc2..0000000000
--- a/ext/tk/sample/demos-en/doc.org/license.terms
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/demos-en/doc.org/license.terms.tk80 b/ext/tk/sample/demos-en/doc.org/license.terms.tk80
deleted file mode 100644
index c0a44d3fc2..0000000000
--- a/ext/tk/sample/demos-en/doc.org/license.terms.tk80
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/demos-en/entry1.rb b/ext/tk/sample/demos-en/entry1.rb
deleted file mode 100644
index fac0afc243..0000000000
--- a/ext/tk/sample/demos-en/entry1.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# entry (no scrollbars) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($entry1_demo) && $entry1_demo
-  $entry1_demo.destroy
-  $entry1_demo = nil
-end
-
-# demo toplevel widget
-$entry1_demo = TkToplevel.new {|w|
-  title("Entry Demonstration (no scrollbars)")
-  iconname("entry1")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($entry1_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "Three different entries are displayed below.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries by dragging with mouse button2 pressed."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $entry1_demo
-      $entry1_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'entry1'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-#
-e1 = TkEntry.new(base_frame, 'relief'=>'sunken')
-e2 = TkEntry.new(base_frame, 'relief'=>'sunken')
-e3 = TkEntry.new(base_frame, 'relief'=>'sunken')
-[e1,e2,e3].each{|w| w.pack('side'=>'top', 'padx'=>10, 'pady'=>5, 'fill'=>'x')}
-
-#
-e1.insert(0, 'Initial value')
-e2.insert('end', "This entry contains a long value, much too long ")
-e2.insert('end', "to fit in the window at one time, so long in fact ")
-e2.insert('end', "that you'll have to scan or scroll to see the end.")
-e2.insert('end', "")
-
diff --git a/ext/tk/sample/demos-en/entry2.rb b/ext/tk/sample/demos-en/entry2.rb
deleted file mode 100644
index 05a6c83cfd..0000000000
--- a/ext/tk/sample/demos-en/entry2.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-# entry2.rb
-#
-# This demonstration script is the same as the entry1.tcl script
-# except that it creates scrollbars for the entries.
-#
-# entry (with scrollbars) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($entry2_demo) && $entry2_demo
-  $entry2_demo.destroy
-  $entry2_demo = nil
-end
-
-# demo toplevel widget
-$entry2_demo = TkToplevel.new {|w|
-  title("Entry Demonstration (with scrollbars)")
-  iconname("entry2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($entry2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "Three different entries are displayed below, with a scrollbar for each entry.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries with the scrollbars, or by dragging with mouse button2 pressed."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $entry2_demo
-      $entry2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'entry2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
-  # entry 1
-  s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e1 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s1.set first,last}
-  }
-  s1.command(proc{|*args| e1.xview(*args)})
-  e1.pack('side'=>'top', 'fill'=>'x')
-  s1.pack('side'=>'top', 'fill'=>'x')
-
-  # spacer
-  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
-
-  # entry 2
-  s2 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e2 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s2.set first,last}
-  }
-  s2.command(proc{|*args| e2.xview(*args)})
-  e2.pack('side'=>'top', 'fill'=>'x')
-  s2.pack('side'=>'top', 'fill'=>'x')
-
-  # spacer
-  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
-
-  # entry 3
-  s3 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e3 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s3.set first,last}
-  }
-  s3.command(proc{|*args| e3.xview(*args)})
-  e3.pack('side'=>'top', 'fill'=>'x')
-  s3.pack('side'=>'top', 'fill'=>'x')
-
-  #
-  e1.insert(0, 'Initial value')
-  e2.insert('end', "This entry contains a long value, much too long ")
-  e2.insert('end', "to fit in the window at one time, so long in fact ")
-  e2.insert('end', "that you'll have to scan or scroll to see the end.")
-  e2.insert('end', "")
-
-}.pack('side'=>'top', 'fill'=>'x', 'expand'=>'yes')
-
diff --git a/ext/tk/sample/demos-en/entry3.rb b/ext/tk/sample/demos-en/entry3.rb
deleted file mode 100644
index d3bc629fdf..0000000000
--- a/ext/tk/sample/demos-en/entry3.rb
+++ /dev/null
@@ -1,220 +0,0 @@
-# entry3.rb --
-#
-# This demonstration script creates several entry widgets whose
-# permitted input is constrained in some way.  It also shows off a
-# password entry.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($entry3_demo) && $entry3_demo
-  $entry3_demo.destroy
-  $entry3_demo = nil
-end
-
-$entry3_demo = TkToplevel.new {|w|
-  title("Constrained Entry Demonstration")
-  iconname("entry3")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($entry3_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'5i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-Four different entries are displayed below.  You can add characters \
-by pointing, clicking and typing, though each is constrained in what \
-it will accept.  The first only accepts integers or the empty string \
-(checking when focus leaves it) and will flash to indicate any \
-problem.  The second only accepts strings with fewer than ten \
-characters and sounds the bell when an attempt to go over the limit \
-is made.  The third accepts US phone numbers, mapping letters to \
-their digit equivalent and sounding the bell on encountering an \
-invalid character or if trying to type over a character that is not \
-a digit.  The fourth is a password field that accepts up to eight \
-characters (silently ignoring further ones), and displaying them as \
-asterisk characters.
-EOL
-
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $entry3_demo.destroy
-                 $entry3_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'entry3'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-# focusAndFlash --
-# Error handler for entry widgets that forces the focus onto the
-# widget and makes the widget flash by exchanging the foreground and
-# background colours at intervals of 200ms (i.e. at approximately
-# 2.5Hz).
-#
-# Arguments:
-# widget -      entry widget to flash
-# fg -          Initial foreground colour
-# bg -          Initial background colour
-# count -       Counter to control the number of times flashed
-def focusAndFlash(widget, fg, bg, count=5)
-  return if count <= 0
-  if fg && !fg.empty? && bg && !bg.empty?
-    TkTimer.new(200, count,
-                proc{widget.configure(:foreground=>bg, :background=>fg)},
-                proc{widget.configure(:foreground=>fg, :background=>bg)}
-                ).start
-  else
-    # TkTimer.new(150, 3){Tk.bell}.start
-    Tk.bell
-    TkTimer.new(200, count,
-                proc{widget.configure(:foreground=>'white',
-                                      :background=>'black')},
-                proc{widget.configure(:foreground=>'black',
-                                      :background=>'white')}
-                ).at_end{begin
-                           widget.configure(:foreground=>fg,
-                                            :background=>bg)
-                         rescue
-                           # ignore
-                         end}.start
-  end
-  widget.focus(true)
-end
-
-l1 = TkLabelFrame.new(base_frame, :text=>"Integer Entry")
-TkEntry.new(l1, :validate=>:focus,
-            :vcmd=>[
-              proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-            ]) {|e|
-  fg = e.foreground
-  bg = e.background
-  invalidcommand [proc{|w| focusAndFlash(w, fg, bg)}, '%W']
-  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-}
-
-l2 = TkLabelFrame.new(base_frame, :text=>"Length-Constrained Entry")
-TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell},
-            :vcmd=>[proc{|s| s.length < 10}, '%P']
-            ).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-
-### PHONE NUMBER ENTRY ###
-# Note that the source to this is quite a bit longer as the behaviour
-# demonstrated is a lot more ambitious than with the others.
-
-# Initial content for the third entry widget
-entry3content = TkVariable.new("1-(000)-000-0000")
-
-# Mapping from alphabetic characters to numbers.
-$phoneNumberMap = {}
-Hash[*(%w(abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9))].each{|chars, n|
-  chars.split('').each{|c|
-    $phoneNumberMap[c] = n
-    $phoneNumberMap[c.upcase] = n
-  }
-}
-
-# phoneSkipLeft --
-# Skip over fixed characters in a phone-number string when moving left.
-#
-# Arguments:
-# widget -      The entry widget containing the phone-number.
-def phoneSkipLeft(widget)
-  idx = widget.index('insert')
-  if idx == 8
-    # Skip back two extra characters
-    widget.cursor = idx - 2
-  elsif idx == 7 || idx == 12
-    # Skip back one extra character
-    widget.cursor = idx - 1
-  elsif idx <= 3
-    # Can't move any further
-    Tk.bell
-    Tk.callback_break
-  end
-end
-
-# phoneSkipRight --
-# Skip over fixed characters in a phone-number string when moving right.
-#
-# Arguments:
-# widget -      The entry widget containing the phone-number.
-# add - Offset to add to index before calculation (used by validation.)
-def phoneSkipRight(widget, add = 0)
-  idx = widget.index('insert')
-  if (idx + add == 5)
-    # Skip forward two extra characters
-    widget.cursor = idx + 2
-  elsif (idx + add == 6 || idx + add == 10)
-    # Skip forward one extra character
-    widget.cursor = idx + 1
-  elsif (idx + add == 15 && add == 0)
-    # Can't move any further
-    Tk.bell
-    Tk.callback_break
-  end
-end
-
-# validatePhoneChange --
-# Checks that the replacement (mapped to a digit) of the given
-# character in an entry widget at the given position will leave a
-# valid phone number in the widget.
-#
-# widget - entry widget to validate
-# vmode -  The widget's validation mode
-# idx -    The index where replacement is to occur
-# char -   The character (or string, though that will always be
-#          refused) to be overwritten at that point.
-
-def validatePhoneChange(widget, vmode, idx, char)
-  return true if idx == nil
-  Tk.after_idle(proc{widget.configure(:validate=>vmode,
-                                      :invcmd=>proc{Tk.bell})})
-  if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
-    widget.delete(idx)
-    widget.insert(idx, $phoneNumberMap[char] || char)
-    Tk.after_idle(proc{phoneSkipRight(widget, -1)})
-    return true
-    # Tk.update(true) # <- Don't work 'update' inter validation callback.
-                      #    It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1).
-  end
-  return false
-end
-
-
-l3 = TkLabelFrame.new(base_frame, :text=>"US Phone-Number Entry")
-TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
-            :textvariable=>entry3content,
-            :vcmd=>[
-              proc{|w,v,i,s| validatePhoneChange(w,v,i,s)},
-              "%W %v %i %S"
-            ]){|e|
-  # Click to focus goes to the first editable character...
-  bind('FocusIn', proc{|d,w|
-         if d != "NotifyAncestor"
-           w.cursor = 3
-           Tk.after_idle(proc{w.selection_clear})
-         end
-       }, '%d %W')
-  bind('Left',  proc{|w| phoneSkipLeft(w)},  '%W')
-  bind('Right', proc{|w| phoneSkipRight(w)}, '%W')
-  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-}
-
-l4 = TkLabelFrame.new(base_frame, :text=>"Password Entry")
-TkEntry.new(l4, :validate=>:key, :show=>'*',
-            :vcmd=>[
-              proc{|s| s.length <= 8},
-              '%P'
-            ]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-
-TkFrame.new(base_frame){|f|
-  lower
-  TkGrid.configure(l1, l2, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
-  TkGrid.configure(l3, l4, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
-  TkGrid.columnconfigure(f, [0,1], :uniform=>1)
-  pack(:fill=>:both, :expand=>true)
-}
diff --git a/ext/tk/sample/demos-en/filebox.rb b/ext/tk/sample/demos-en/filebox.rb
deleted file mode 100644
index 0c284c11d4..0000000000
--- a/ext/tk/sample/demos-en/filebox.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-# filebox.rb
-#
-# This demonstration script prompts the user to select a file.#
-# widget demo prompts the user to select a file (called by 'widget')
-#
-
-# toplevel widget
-if defined?($filebox_demo) && $filebox_demo
-  $filebox_demo.destroy
-  $filebox_demo = nil
-end
-
-# demo toplevel widget
-$filebox_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("filebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($filebox_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"Enter a file name in the entry box or click on the \"Browse\" buttons to select a file name using the file selection dialog.").pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $filebox_demo
-      $filebox_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'filebox'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-['open', 'save'].each{|type|
-  TkFrame.new(base_frame) {|f|
-    TkLabel.new(f, 'text'=>"Select a file to #{type}: ", 'anchor'=>'e')\
-    .pack('side'=>'left')
-
-    TkEntry.new(f, 'width'=>20) {|e|
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
-
-      TkButton.new(f, 'text'=>'Browse ...',
-                   'command'=>proc{fileDialog base_frame,e,type})\
-      .pack('side'=>'left')
-    }
-
-    pack('fill'=>'x', 'padx'=>'1c', 'pady'=>3)
-  }
-}
-
-$tk_strictMotif = TkVarAccess.new('tk_strictMotif')
-if ($tk_platform['platform'] == 'unix')
-  TkCheckButton.new(base_frame,
-                    'text'=>'Use Motif Style Dialog',
-                    'variable'=>$tk_strictMotif,
-                    'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
-end
-
-def fileDialog(w,ent,operation)
-  #    Type names         Extension(s)             Mac File Type(s)
-  #
-  #--------------------------------------------------------
-  types = [
-    ['Text files',       ['.txt','.doc']          ],
-    ['Text files',       [],                      'TEXT' ],
-    ['Ruby Scripts',     ['.rb'],                 'TEXT' ],
-    ['Tcl Scripts',      ['.tcl'],                'TEXT' ],
-    ['C Source Files',   ['.c','.h']              ],
-    ['All Source Files', ['.rb','.tcl','.c','.h'] ],
-    ['Image Files',      ['.gif']                 ],
-    ['Image Files',      ['.jpeg','.jpg']         ],
-    ['Image Files',      [],                      ['GIFF','JPEG']],
-    ['All files',        '*'                      ]
-  ]
-
-  if operation == 'open'
-    file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
-  else
-    file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w,
-                          'initialfile'=>'Untitled',
-                          'defaultextension'=>'.txt')
-  end
-  if file != ""
-    ent.delete 0, 'end'
-    ent.insert 0, file
-    # ent.xview 'end'
-    Tk.update_idletasks # need this for Tk::Tile::Entry
-                        # (to find right position of 'xview').
-    ent.xview(ent.index('end'))
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/floor.rb b/ext/tk/sample/demos-en/floor.rb
deleted file mode 100644
index eb8b23eb7d..0000000000
--- a/ext/tk/sample/demos-en/floor.rb
+++ /dev/null
@@ -1,1723 +0,0 @@
-# floor.rb
-#
-# This demonstration script creates a canvas widet that displays the
-# floorplan for DEC's Western Research Laboratory.
-#
-# floorDisplay widget demo (called by 'widget')
-#
-
-# floorDisplay --
-# Recreate the floorplan display in the canvas given by "w".  The
-# floor given by "active" is displayed on top with its office structure
-# visible.
-#
-# Arguments:
-# w -           Name of the canvas window.
-# active -      Number of active floor (1, 2, or 3).
-
-def floorDisplay(w,active)
-  return if $activeFloor == active
-
-  w.delete('all')
-  $activeFloor = active
-
-  # First go through the three floors, displaying the backgrounds for
-  # each floor.
-
-  floor_bg1(w,$floor_colors['bg1'],$floor_colors['outline1'])
-  floor_bg2(w,$floor_colors['bg2'],$floor_colors['outline2'])
-  floor_bg3(w,$floor_colors['bg3'],$floor_colors['outline3'])
-
-  # Raise the background for the active floor so that it's on top.
-
-  w.raise("floor#{active}")
-
-  # Create a dummy item just to mark this point in the display list,
-  # so we can insert highlights here.
-
-  TkcRectangle.new(w,0,100,1,101, 'fill'=>'', 'outline'=>'', 'tags'=>'marker')
-
-  # Add the walls and labels for the active floor, along with
-  # transparent polygons that define the rooms on the floor.
-  # Make sure that the room polygons are on top.
-
-  $floorLabels.clear
-  $floorItems.clear
-  send("floor_fg#{active}", w, $floor_colors['offices'])
-  w.raise('room')
-
-  # Offset the floors diagonally from each other.
-
-  w.move('floor1', '2c', '2c')
-  w.move('floor2', '1c', '1c')
-
-  # Create items for the room entry and its label.
-  TkcWindow.new(w, 600, 100, 'anchor'=>'w', 'window'=>$floor_entry)
-  TkcText.new(w, 600, 100, 'anchor'=>'e', 'text'=>"Room: ")
-  w['scrollregion'] = w.bbox('all')
-end
-
-# newRoom --
-# This method is invoked whenever the mouse enters a room
-# in the floorplan.  It changes tags so that the current room is
-# highlighted.
-#
-# Arguments:
-# w  -          The name of the canvas window.
-
-def newRoom(w)
-  id = w.find_withtag('current')[0]
-  $currentRoom.value = $floorLabels[id.id] if id != ""
-  Tk.update(true)
-end
-
-# roomChanged --
-# This method is invoked whenever the currentRoom variable changes.
-# It highlights the current room and unhighlights any previous room.
-#
-# Arguments:
-# w -           The canvas window displaying the floorplan.
-# args -        Not used.
-
-def roomChanged(w,*args)
-  w.delete('highlight')
-  item = $floorItems[$currentRoom.value]
-  return if item == nil
-  new = TkcPolygon.new(w, *(w.coords(item)))
-  new.configure('fill'=>$floor_colors['active'], 'tags'=>'highlight')
-  w.raise(new, 'marker')
-end
-
-# floor_bg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor_bg1(w,fill,outline)
-  TkcPolygon.new(w,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
-                 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
-                 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
-                 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
-                 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
-                 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
-                 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
-                 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
-                 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
-                 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
-                 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
-                 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
-                 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
-  TkcLine.new(w,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
-end
-
-# floor_bg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor_bg2(w,fill,outline)
-  TkcPolygon.new(w,559,129,484,129,484,162,398,162,398,129,315,129,
-                 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
-                 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
-                 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
-                 367,802,367,802,129,725,129,725,133,559,133,559,129,
-                 'tags'=>['floor2','bg'], 'fill'=>fill)
-  TkcLine.new(w,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-end
-
-# floor_bg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor_bg3(w,fill,outline)
-  TkcPolygon.new(w,159,300,107,300,107,248,159,248,159,129,96,129,96,
-                 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  TkcPolygon.new(w,258,370,258,329,350,329,350,311,399,311,399,129,
-                 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,107,300,159,300,159,248,107,248,107,300,
-              'fill'=>outline, 'tags'=>['floor3','bg'])
-end
-
-# floor_fg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the first
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '101'
-  $floorItems['101'] = i
-  TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Pub Lift1'
-  $floorItems['Pub Lift1'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Priv Lift1'
-  $floorItems['Priv Lift1'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '110'
-  $floorItems['110'] = i
-  TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '109'
-  $floorItems['109'] = i
-  TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '111'
-  $floorItems['111'] = i
-  TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117B'
-  $floorItems['117B'] = i
-  TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '112'
-  $floorItems['112'] = i
-  TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '113'
-  $floorItems['113'] = i
-  TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117A'
-  $floorItems['117A'] = i
-  TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117'
-  $floorItems['117'] = i
-  TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '114'
-  $floorItems['114'] = i
-  TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '115'
-  $floorItems['115'] = i
-  TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '116'
-  $floorItems['116'] = i
-  TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '118'
-  $floorItems['118'] = i
-  TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-                     163,91,163,112,149,112,149,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '120'
-  $floorItems['120'] = i
-  TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-                     156,192,156,169,175,169,175,246,79,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '122'
-  $floorItems['122'] = i
-  TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '121'
-  $floorItems['121'] = i
-  TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106A'
-  $floorItems['106A'] = i
-  TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '105'
-  $floorItems['105'] = i
-  TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106B'
-  $floorItems['106B'] = i
-  TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '104'
-  $floorItems['104'] = i
-  TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '108'
-  $floorItems['108'] = i
-  TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '107'
-  $floorItems['107'] = i
-  TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Smoking'
-  $floorItems['Smoking'] = i
-  TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '123'
-  $floorItems['123'] = i
-  TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '103'
-  $floorItems['103'] = i
-  TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '124'
-  $floorItems['124'] = i
-  TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '125'
-  $floorItems['125'] = i
-  TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '126'
-  $floorItems['126'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-                     486,253,486,239,474,239,474,209,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '127'
-  $floorItems['127'] = i
-  TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-                     490,188,490,204,476,204,476,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'MShower'
-  $floorItems['MShower'] = i
-  TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Closet'
-  $floorItems['Closet'] = i
-  TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'WShower'
-  $floorItems['WShower'] = i
-  TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
-                     697,166,697,275,553,275,531,254,515,254,
-                     515,174,503,174,503,161,486,161,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '130'
-  $floorItems['130'] = i
-  TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
-                     342,246,397,246,397,276,393,276,
-                     393,309,300,309,300,248,308,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '102'
-  $floorItems['102'] = i
-  TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '128'
-  $floorItems['128'] = i
-  TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
-                     552,277,561,277,561,325,510,325,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '129'
-  $floorItems['129'] = i
-  TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-                     642,389,561,389,561,277,696,277,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '133'
-  $floorItems['133'] = i
-  TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '132'
-  $floorItems['132'] = i
-  TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '134'
-  $floorItems['134'] = i
-  TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '135'
-  $floorItems['135'] = i
-  TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
-                     304,312,396,312,396,288,400,288,404,288,
-                     409,290,413,292,418,297,421,302,422,309,
-                     421,318,417,325,411,330,405,332,397,333,
-                     344,333,340,334,336,336,335,338,332,342,
-                     331,347,332,351,334,354,336,357,341,359,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Ramona Stair'
-  $floorItems['Ramona Stair'] = i
-  TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-                     122,28,123,32,123,68,220,68,220,87,90,87,90,23,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'University Stair'
-  $floorItems['University Stair'] = i
-  TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
-                     358,48,363,39,365,29,348,25,335,22,321,14,
-                     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-                     227,13,223,17,221,22,220,34,260,34,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Plaza Stair'
-  $floorItems['Plaza Stair'] = i
-  TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
-                     323,56,337,70,350,83,365,94,377,100,
-                     386,104,386,128,220,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Plaza Deck'
-  $floorItems['Plaza Deck'] = i
-  TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106'
-  $floorItems['106'] = i
-  TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
-                     95,128,114,128,114,151,157,151,157,153,112,153,
-                     112,130,97,130,97,168,175,168,175,131,146,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '119'
-  $floorItems['119'] = i
-  TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  TkcLine.new(w,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-end
-
-# floor_fg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the second
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor_fg2(w,color)
-  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-                     800,222,800,168,748,168,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '238'
-  $floorItems['238'] = i
-  TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '237'
-  $floorItems['237'] = i
-  TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
-                     643,324,643,291,641,291,641,205,696,205,
-                     696,291,694,291,694,314,715,314,715,291,
-                     715,205,755,205,755,190,724,190,724,187,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '246'
-  $floorItems['246'] = i
-  TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '247'
-  $floorItems['247'] = i
-  TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
-                     397,246,397,255,476,255,476,250,482,250,559,250,
-                     559,274,482,274,482,278,396,278,396,274,232,274,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '202'
-  $floorItems['202'] = i
-  TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
-                     306,196,306,180,175,180,175,169,156,169,
-                     156,196,176,196,176,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '206'
-  $floorItems['206'] = i
-  TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '212'
-  $floorItems['212'] = i
-  TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '245'
-  $floorItems['245'] = i
-  TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '244'
-  $floorItems['244'] = i
-  TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '243'
-  $floorItems['243'] = i
-  TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '242'
-  $floorItems['242'] = i
-  TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Barbecue Deck'
-  $floorItems['Barbecue Deck'] = i
-  TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '240'
-  $floorItems['240'] = i
-  TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '241'
-  $floorItems['241'] = i
-  TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '239'
-  $floorItems['239'] = i
-  TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '248'
-  $floorItems['248'] = i
-  TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '236'
-  $floorItems['236'] = i
-  TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '235'
-  $floorItems['235'] = i
-  TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-                     572,143,579,143,579,185,626,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '234'
-  $floorItems['234'] = i
-  TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-                     578,185,527,185,527,131,557,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '233'
-  $floorItems['233'] = i
-  TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '230'
-  $floorItems['230'] = i
-  TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '232'
-  $floorItems['232'] = i
-  TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '229'
-  $floorItems['229'] = i
-  TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '227'
-  $floorItems['227'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '228'
-  $floorItems['228'] = i
-  TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '226'
-  $floorItems['226'] = i
-  TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '225'
-  $floorItems['225'] = i
-  TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '224'
-  $floorItems['224'] = i
-  TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '223'
-  $floorItems['223'] = i
-  TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '222'
-  $floorItems['222'] = i
-  TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '221'
-  $floorItems['221'] = i
-  TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '204'
-  $floorItems['204'] = i
-  TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '205'
-  $floorItems['205'] = i
-  TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '207'
-  $floorItems['207'] = i
-  TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '208'
-  $floorItems['208'] = i
-  TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '209'
-  $floorItems['209'] = i
-  TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '217'
-  $floorItems['217'] = i
-  TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '217A'
-  $floorItems['217A'] = i
-  TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '216'
-  $floorItems['216'] = i
-  TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '215'
-  $floorItems['215'] = i
-  TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '214'
-  $floorItems['214'] = i
-  TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '213'
-  $floorItems['213'] = i
-  TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '210'
-  $floorItems['210'] = i
-  TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '211'
-  $floorItems['211'] = i
-  TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '203'
-  $floorItems['203'] = i
-  TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-                     154,198,154,192,109,192,109,169,99,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '220'
-  $floorItems['220'] = i
-  TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Priv Lift2'
-  $floorItems['Priv Lift2'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Pub Lift 2'
-  $floorItems['Pub Lift 2'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '218'
-  $floorItems['218'] = i
-  TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '219'
-  $floorItems['219'] = i
-  TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '201'
-  $floorItems['201'] = i
-  TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  TkcLine.new(w,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-end
-
-# floor_fg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the third
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor_fg3(w,color)
-  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316'
-  $floorItems['316'] = i
-  TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '309'
-  $floorItems['309'] = i
-  TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '308'
-  $floorItems['308'] = i
-  TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '307'
-  $floorItems['307'] = i
-  TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '305'
-  $floorItems['305'] = i
-  TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324B'
-  $floorItems['324B'] = i
-  TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324A'
-  $floorItems['324A'] = i
-  TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '320'
-  $floorItems['320'] = i
-  TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '310'
-  $floorItems['310'] = i
-  TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '312'
-  $floorItems['312'] = i
-  TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '313'
-  $floorItems['313'] = i
-  TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '314'
-  $floorItems['314'] = i
-  TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '315'
-  $floorItems['315'] = i
-  TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316B'
-  $floorItems['316B'] = i
-  TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316A'
-  $floorItems['316A'] = i
-  TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-                     174,198,174,226,101,226,101,179,97,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '319'
-  $floorItems['319'] = i
-  TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '311'
-  $floorItems['311'] = i
-  TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '318'
-  $floorItems['318'] = i
-  TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '317'
-  $floorItems['317'] = i
-  TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '323'
-  $floorItems['323'] = i
-  TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '325'
-  $floorItems['325'] = i
-  TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '321'
-  $floorItems['321'] = i
-  TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-                     264,181,264,135,314,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '322'
-  $floorItems['322'] = i
-  TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = 'Pub Lift3'
-  $floorItems['Pub Lift3'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = 'Priv Lift3'
-  $floorItems['Priv Lift3'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '303'
-  $floorItems['303'] = i
-  TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-                     244,230,244,221,252,221,252,203,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324'
-  $floorItems['324'] = i
-  TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '304'
-  $floorItems['304'] = i
-  TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '301'
-  $floorItems['301'] = i
-  TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '327'
-  $floorItems['327'] = i
-  TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '326'
-  $floorItems['326'] = i
-  TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-                     375,274,397,274,397,248,339,248,339,242,308,242,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '302'
-  $floorItems['302'] = i
-  TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
-                     272,193,263,180,242,180,175,180,175,169,156,169,
-                     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-                     107,248,160,248,160,301,107,301,107,275,70,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '306'
-  $floorItems['306'] = i
-  TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-end
-
-# Below is the "main program" that creates the floorplan demonstration.
-
-# toplevel widget
-if defined?($floor_demo) && $floor_demo
-  $floor_demo.destroy
-  $floor_demo = nil
-end
-
-# demo toplevel widget
-$floor_demo = TkToplevel.new {|w|
-  title("Floorplan Canvas Demonstration")
-  iconname("Floorplan")
-  positionWindow(w)
-  geometry('+20+20')
-  minsize(100,100)
-}
-
-base_frame = TkFrame.new($floor_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
-            'text'=>"This window contains a canvas widget showing the floorplan of Digital Equipment Corporation's Western Research Laboratory.  It has three levels.  At any given time one of the levels is active, meaning that you can see its room structure.  To activate a level, click the left mouse button anywhere on it.  As the mouse moves over the active level, the room under the mouse lights up and its room number appears in the \"Room:\" entry.  You can also type a room number in the entry and the room will light up."){
-  pack('side'=>'top')
-}
-
-# frame
-$floor_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $floor_demo
-      $floor_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'floor'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$floor_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-#
-$floorLabels = {}
-$floorItems = {}
-
-# canvas
-if $tk_version =~ /^4\.[01]/
-  $floor_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
-                                    'highlightthickness'=>2)
-  $floor_canvas = TkCanvas.new($floor_canvas_frame,
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0,
-                               'highlightthickness'=>0) {|c|
-    TkScrollbar.new(base_frame, 'orient'=>'horiz',
-                    'command'=>proc{|*args| c.xview(*args)}){|hs|
-      c.xscrollcommand(proc{|first,last| hs.set first,last})
-      pack('side'=>'bottom', 'fill'=>'x')
-    }
-    TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
-      c.yscrollcommand(proc{|first,last| vs.set first,last})
-      pack('side'=>'right', 'fill'=>'y')
-    }
-  }
-  $floor_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
-  $floor_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-else
-  TkFrame.new(base_frame) {|f|
-    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
-    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
-
-    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
-                                   'borderwidth'=>0,
-                                   'highlightthickness'=>0) {
-        xscrollcommand(proc{|first,last| h.set first,last})
-        yscrollcommand(proc{|first,last| v.set first,last})
-        pack('expand'=>'yes', 'fill'=>'both')
-      }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    }
-
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-    v.command(proc{|*args| $floor_canvas.yview(*args)})
-    h.command(proc{|*args| $floor_canvas.xview(*args)})
-  }
-end
-
-
-# Create an entry for displaying and typing in current room.
-
-$currentRoom = TkVariable.new
-$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken',
-                           'bd'=>2, 'textvariable'=>$currentRoom)
-
-# Choose colors, then fill in the floorplan.
-
-$floor_colors = {}
-if TkWinfo.depth($floor_canvas) > 1
-  $floor_colors['bg1'] = '#a9c1da'
-  $floor_colors['outline1'] = '#77889a'
-  $floor_colors['bg2'] = '#9ab0c6'
-  $floor_colors['outline2'] = '#687786'
-  $floor_colors['bg3'] = '#8ba0b3'
-  $floor_colors['outline3'] = '#596673'
-  $floor_colors['offices'] = 'Black'
-  $floor_colors['active'] = '#c4d1df'
-else
-  $floor_colors['bg1'] = 'white'
-  $floor_colors['outline1'] = 'black'
-  $floor_colors['bg2'] = 'white'
-  $floor_colors['outline2'] = 'black'
-  $floor_colors['bg3'] = 'white'
-  $floor_colors['outline3'] = 'black'
-  $floor_colors['offices'] = 'Black'
-  $floor_colors['active'] = 'black'
-end
-
-$activeFloor = ''
-floorDisplay $floor_canvas,3
-
-# Set up event bindings for canvas:
-
-$floor_canvas.itembind('floor1', '1', proc{floorDisplay $floor_canvas,1})
-$floor_canvas.itembind('floor2', '1', proc{floorDisplay $floor_canvas,2})
-$floor_canvas.itembind('floor3', '1', proc{floorDisplay $floor_canvas,3})
-$floor_canvas.itembind('room', 'Enter', proc{newRoom $floor_canvas})
-$floor_canvas.itembind('room', 'Leave', proc{$currentRoom.value = ''})
-$floor_canvas.bind('2', proc{|x,y| $floor_canvas.scan_mark x,y}, '%x %y')
-$floor_canvas.bind('B2-Motion',
-                   proc{|x,y| $floor_canvas.scan_dragto x,y}, '%x %y')
-$floor_canvas.bind('Destroy', proc{$currentRoom.unset})
-$currentRoom.value = ''
-$currentRoom.trace('w',proc{roomChanged $floor_canvas})
-
diff --git a/ext/tk/sample/demos-en/floor2.rb b/ext/tk/sample/demos-en/floor2.rb
deleted file mode 100644
index 3bfa89a920..0000000000
--- a/ext/tk/sample/demos-en/floor2.rb
+++ /dev/null
@@ -1,1722 +0,0 @@
-%# floor2.rb
-#
-# This demonstration script creates a canvas widet that displays the
-# floorplan for DEC's Western Research Laboratory.
-#
-# floorDisplay widget demo (called by 'widget')
-#
-
-# floorDisplay2 --
-# Recreate the floorplan display in the canvas given by "w".  The
-# floor given by "active" is displayed on top with its office structure
-# visible.
-#
-# Arguments:
-# w -           Name of the canvas window.
-# active -      Number of active floor (1, 2, or 3).
-
-def floorDisplay2(w,active)
-  return if $activeFloor2 == active
-
-  w.delete('all')
-  $activeFloor2 = active
-
-  # First go through the three floors, displaying the backgrounds for
-  # each floor.
-
-  floor2_bg1(w,$floor2_colors['bg1'],$floor2_colors['outline1'])
-  floor2_bg2(w,$floor2_colors['bg2'],$floor2_colors['outline2'])
-  floor2_bg3(w,$floor2_colors['bg3'],$floor2_colors['outline3'])
-
-  # Raise the background for the active floor so that it's on top.
-
-  w.raise("floor#{active}")
-
-  # Create a dummy item just to mark this point in the display list,
-  # so we can insert highlights here.
-
-  w.create(TkcRectangle,0,100,1,101,'fill'=>'','outline'=>'','tags'=>'marker')
-
-  # Add the walls and labels for the active floor, along with
-  # transparent polygons that define the rooms on the floor.
-  # Make sure that the room polygons are on top.
-
-  $floorLabels2.clear
-  $floorItems2.clear
-  send("floor2_fg#{active}", w, $floor2_colors['offices'])
-  w.raise('room')
-
-  # Offset the floors diagonally from each other.
-
-  w.move('floor1', '2c', '2c')
-  w.move('floor2', '1c', '1c')
-
-  # Create items for the room entry and its label.
-  w.create(TkcWindow, 600, 100, 'anchor'=>'w', 'window'=>$floor2_entry)
-  w.create(TkcText, 600, 100, 'anchor'=>'e', 'text'=>"Room: ")
-  w['scrollregion'] = w.bbox('all')
-end
-
-# newRoom2 --
-# This method is invoked whenever the mouse enters a room
-# in the floorplan.  It changes tags so that the current room is
-# highlighted.
-#
-# Arguments:
-# w  -          The name of the canvas window.
-
-def newRoom2(w)
-  id = w.find_withtag('current')[0]
-  $currentRoom2.value = $floorLabels2[id.id] if id != ""
-  Tk.update(true)
-end
-
-# roomChanged2 --
-# This method is invoked whenever the currentRoom variable changes.
-# It highlights the current room and unhighlights any previous room.
-#
-# Arguments:
-# w -           The canvas window displaying the floorplan.
-# args -        Not used.
-
-def roomChanged2(w,*args)
-  w.delete('highlight')
-  item = $floorItems2[$currentRoom2.value]
-  return if item == nil
-  new = TkcPolygon.new(w, *(w.coords(item)))
-  new.configure('fill'=>$floor2_colors['active'], 'tags'=>'highlight')
-  w.raise(new, 'marker')
-end
-
-# floor2_bg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor2_bg1(w,fill,outline)
-  w.create(TkcPolygon,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
-                 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
-                 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
-                 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
-                 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
-                 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
-                 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
-                 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
-                 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
-                 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
-                 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
-                 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
-                 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
-  w.create(TkcLine,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
-end
-
-# floor2_bg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor2_bg2(w,fill,outline)
-  w.create(TkcPolygon,559,129,484,129,484,162,398,162,398,129,315,129,
-                 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
-                 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
-                 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
-                 367,802,367,802,129,725,129,725,133,559,133,559,129,
-                 'tags'=>['floor2','bg'], 'fill'=>fill)
-  w.create(TkcLine,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-end
-
-# floor2_bg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor2_bg3(w,fill,outline)
-  w.create(TkcPolygon,159,300,107,300,107,248,159,248,159,129,96,129,96,
-                 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  w.create(TkcPolygon,258,370,258,329,350,329,350,311,399,311,399,129,
-                 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  w.create(TkcLine,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,107,300,159,300,159,248,107,248,107,300,
-              'fill'=>outline, 'tags'=>['floor3','bg'])
-end
-
-# floor2_fg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the first
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor2_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '101'
-  $floorItems2['101'] = i
-  w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Pub Lift1'
-  $floorItems2['Pub Lift1'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Priv Lift1'
-  $floorItems2['Priv Lift1'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '110'
-  $floorItems2['110'] = i
-  w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '109'
-  $floorItems2['109'] = i
-  w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '111'
-  $floorItems2['111'] = i
-  w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '117B'
-  $floorItems2['117B'] = i
-  w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '112'
-  $floorItems2['112'] = i
-  w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '113'
-  $floorItems2['113'] = i
-  w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '117A'
-  $floorItems2['117A'] = i
-  w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '117'
-  $floorItems2['117'] = i
-  w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '114'
-  $floorItems2['114'] = i
-  w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '115'
-  $floorItems2['115'] = i
-  w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '116'
-  $floorItems2['116'] = i
-  w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '118'
-  $floorItems2['118'] = i
-  w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-                     163,91,163,112,149,112,149,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '120'
-  $floorItems2['120'] = i
-  w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-                     156,192,156,169,175,169,175,246,79,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '122'
-  $floorItems2['122'] = i
-  w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '121'
-  $floorItems2['121'] = i
-  w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '106A'
-  $floorItems2['106A'] = i
-  w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '105'
-  $floorItems2['105'] = i
-  w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '106B'
-  $floorItems2['106B'] = i
-  w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '104'
-  $floorItems2['104'] = i
-  w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '108'
-  $floorItems2['108'] = i
-  w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '107'
-  $floorItems2['107'] = i
-  w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Smoking'
-  $floorItems2['Smoking'] = i
-  w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '123'
-  $floorItems2['123'] = i
-  w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '103'
-  $floorItems2['103'] = i
-  w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '124'
-  $floorItems2['124'] = i
-  w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '125'
-  $floorItems2['125'] = i
-  w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '126'
-  $floorItems2['126'] = i
-  w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-                     486,253,486,239,474,239,474,209,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '127'
-  $floorItems2['127'] = i
-  w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-                     490,188,490,204,476,204,476,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'MShower'
-  $floorItems2['MShower'] = i
-  w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Closet'
-  $floorItems2['Closet'] = i
-  w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'WShower'
-  $floorItems2['WShower'] = i
-  w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
-                     697,166,697,275,553,275,531,254,515,254,
-                     515,174,503,174,503,161,486,161,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '130'
-  $floorItems2['130'] = i
-  w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
-                     342,246,397,246,397,276,393,276,
-                     393,309,300,309,300,248,308,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '102'
-  $floorItems2['102'] = i
-  w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '128'
-  $floorItems2['128'] = i
-  w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
-                     552,277,561,277,561,325,510,325,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '129'
-  $floorItems2['129'] = i
-  w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-                     642,389,561,389,561,277,696,277,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '133'
-  $floorItems2['133'] = i
-  w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '132'
-  $floorItems2['132'] = i
-  w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '134'
-  $floorItems2['134'] = i
-  w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '135'
-  $floorItems2['135'] = i
-  w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
-                     304,312,396,312,396,288,400,288,404,288,
-                     409,290,413,292,418,297,421,302,422,309,
-                     421,318,417,325,411,330,405,332,397,333,
-                     344,333,340,334,336,336,335,338,332,342,
-                     331,347,332,351,334,354,336,357,341,359,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Ramona Stair'
-  $floorItems2['Ramona Stair'] = i
-  w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-                     122,28,123,32,123,68,220,68,220,87,90,87,90,23,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'University Stair'
-  $floorItems2['University Stair'] = i
-  w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
-                     358,48,363,39,365,29,348,25,335,22,321,14,
-                     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-                     227,13,223,17,221,22,220,34,260,34,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Plaza Stair'
-  $floorItems2['Plaza Stair'] = i
-  w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
-                     323,56,337,70,350,83,365,94,377,100,
-                     386,104,386,128,220,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Plaza Deck'
-  $floorItems2['Plaza Deck'] = i
-  w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '106'
-  $floorItems2['106'] = i
-  w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
-                     95,128,114,128,114,151,157,151,157,153,112,153,
-                     112,130,97,130,97,168,175,168,175,131,146,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '119'
-  $floorItems2['119'] = i
-  w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  w.create(TkcLine,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-end
-
-# floor2_fg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the second
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor2_fg2(w,color)
-  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-                     800,222,800,168,748,168,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '238'
-  $floorItems2['238'] = i
-  w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '237'
-  $floorItems2['237'] = i
-  w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
-                     643,324,643,291,641,291,641,205,696,205,
-                     696,291,694,291,694,314,715,314,715,291,
-                     715,205,755,205,755,190,724,190,724,187,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '246'
-  $floorItems2['246'] = i
-  w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '247'
-  $floorItems2['247'] = i
-  w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
-                     397,246,397,255,476,255,476,250,482,250,559,250,
-                     559,274,482,274,482,278,396,278,396,274,232,274,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '202'
-  $floorItems2['202'] = i
-  w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
-                     306,196,306,180,175,180,175,169,156,169,
-                     156,196,176,196,176,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '206'
-  $floorItems2['206'] = i
-  w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '212'
-  $floorItems2['212'] = i
-  w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '245'
-  $floorItems2['245'] = i
-  w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '244'
-  $floorItems2['244'] = i
-  w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '243'
-  $floorItems2['243'] = i
-  w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '242'
-  $floorItems2['242'] = i
-  w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = 'Barbecue Deck'
-  $floorItems2['Barbecue Deck'] = i
-  w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '240'
-  $floorItems2['240'] = i
-  w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '241'
-  $floorItems2['241'] = i
-  w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '239'
-  $floorItems2['239'] = i
-  w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '248'
-  $floorItems2['248'] = i
-  w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '236'
-  $floorItems2['236'] = i
-  w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '235'
-  $floorItems2['235'] = i
-  w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-                     572,143,579,143,579,185,626,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '234'
-  $floorItems2['234'] = i
-  w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-                     578,185,527,185,527,131,557,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '233'
-  $floorItems2['233'] = i
-  w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '230'
-  $floorItems2['230'] = i
-  w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '232'
-  $floorItems2['232'] = i
-  w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '229'
-  $floorItems2['229'] = i
-  w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '227'
-  $floorItems2['227'] = i
-  w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '228'
-  $floorItems2['228'] = i
-  w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '226'
-  $floorItems2['226'] = i
-  w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '225'
-  $floorItems2['225'] = i
-  w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '224'
-  $floorItems2['224'] = i
-  w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '223'
-  $floorItems2['223'] = i
-  w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '222'
-  $floorItems2['222'] = i
-  w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '221'
-  $floorItems2['221'] = i
-  w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '204'
-  $floorItems2['204'] = i
-  w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '205'
-  $floorItems2['205'] = i
-  w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '207'
-  $floorItems2['207'] = i
-  w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '208'
-  $floorItems2['208'] = i
-  w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '209'
-  $floorItems2['209'] = i
-  w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '217'
-  $floorItems2['217'] = i
-  w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '217A'
-  $floorItems2['217A'] = i
-  w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '216'
-  $floorItems2['216'] = i
-  w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '215'
-  $floorItems2['215'] = i
-  w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '214'
-  $floorItems2['214'] = i
-  w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '213'
-  $floorItems2['213'] = i
-  w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '210'
-  $floorItems2['210'] = i
-  w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '211'
-  $floorItems2['211'] = i
-  w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '203'
-  $floorItems2['203'] = i
-  w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-                     154,198,154,192,109,192,109,169,99,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '220'
-  $floorItems2['220'] = i
-  w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = 'Priv Lift2'
-  $floorItems2['Priv Lift2'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = 'Pub Lift 2'
-  $floorItems2['Pub Lift 2'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '218'
-  $floorItems2['218'] = i
-  w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '219'
-  $floorItems2['219'] = i
-  w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '201'
-  $floorItems2['201'] = i
-  w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  w.create(TkcLine,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-end
-
-# floor2_fg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the third
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor2_fg3(w,color)
-  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '316'
-  $floorItems2['316'] = i
-  w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '309'
-  $floorItems2['309'] = i
-  w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '308'
-  $floorItems2['308'] = i
-  w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '307'
-  $floorItems2['307'] = i
-  w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '305'
-  $floorItems2['305'] = i
-  w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '324B'
-  $floorItems2['324B'] = i
-  w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '324A'
-  $floorItems2['324A'] = i
-  w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '320'
-  $floorItems2['320'] = i
-  w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '310'
-  $floorItems2['310'] = i
-  w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '312'
-  $floorItems2['312'] = i
-  w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '313'
-  $floorItems2['313'] = i
-  w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '314'
-  $floorItems2['314'] = i
-  w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '315'
-  $floorItems2['315'] = i
-  w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '316B'
-  $floorItems2['316B'] = i
-  w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '316A'
-  $floorItems2['316A'] = i
-  w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-                     174,198,174,226,101,226,101,179,97,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '319'
-  $floorItems2['319'] = i
-  w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '311'
-  $floorItems2['311'] = i
-  w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '318'
-  $floorItems2['318'] = i
-  w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '317'
-  $floorItems2['317'] = i
-  w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '323'
-  $floorItems2['323'] = i
-  w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '325'
-  $floorItems2['325'] = i
-  w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '321'
-  $floorItems2['321'] = i
-  w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-                     264,181,264,135,314,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '322'
-  $floorItems2['322'] = i
-  w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = 'Pub Lift3'
-  $floorItems2['Pub Lift3'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = 'Priv Lift3'
-  $floorItems2['Priv Lift3'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '303'
-  $floorItems2['303'] = i
-  w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-                     244,230,244,221,252,221,252,203,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '324'
-  $floorItems2['324'] = i
-  w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '304'
-  $floorItems2['304'] = i
-  w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '301'
-  $floorItems2['301'] = i
-  w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '327'
-  $floorItems2['327'] = i
-  w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '326'
-  $floorItems2['326'] = i
-  w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-                     375,274,397,274,397,248,339,248,339,242,308,242,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '302'
-  $floorItems2['302'] = i
-  w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
-                     272,193,263,180,242,180,175,180,175,169,156,169,
-                     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-                     107,248,160,248,160,301,107,301,107,275,70,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '306'
-  $floorItems2['306'] = i
-  w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-end
-
-# Below is the "main program" that creates the floorplan demonstration.
-
-# toplevel widget
-if defined?($floor2_demo) && $floor2_demo
-  $floor2_demo.destroy
-  $floor2_demo = nil
-end
-
-# demo toplevel widget
-$floor2_demo = TkToplevel.new {|w|
-  title("Floorplan Canvas Demonstration 2")
-  iconname("Floorplan2")
-  positionWindow(w)
-  geometry('+20+20')
-  minsize(100,100)
-}
-
-base_frame = TkFrame.new($floor2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
-            'text'=>"This window contains a canvas widget showing the floorplan of Digital Equipment Corporation's Western Research Laboratory.  It has three levels.  At any given time one of the levels is active, meaning that you can see its room structure.  To activate a level, click the left mouse button anywhere on it.  As the mouse moves over the active level, the room under the mouse lights up and its room number appears in the \"Room:\" entry.  You can also type a room number in the entry and the room will light up."){
-  pack('side'=>'top')
-}
-
-# frame
-$floor2_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $floor2_demo
-      $floor2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'floor2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$floor2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-#
-$floorLabels2 = {}
-$floorItems2 = {}
-
-# canvas
-if $tk_version =~ /^4\.[01]/
-  $floor2_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
-                                    'highlightthickness'=>2)
-  $floor2_canvas = TkCanvas.new($floor2_canvas_frame,
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0,
-                               'highlightthickness'=>0) {|c|
-    TkScrollbar.new(base_frame, 'orient'=>'horiz',
-                    'command'=>proc{|*args| c.xview(*args)}){|hs|
-      c.xscrollcommand(proc{|first,last| hs.set first,last})
-      pack('side'=>'bottom', 'fill'=>'x')
-    }
-    TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
-      c.yscrollcommand(proc{|first,last| vs.set first,last})
-      pack('side'=>'right', 'fill'=>'y')
-    }
-  }
-  $floor2_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
-  $floor2_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-else
-  TkFrame.new(base_frame) {|f|
-    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
-    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
-
-    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
-                                   'borderwidth'=>0,
-                                   'highlightthickness'=>0) {
-        xscrollcommand(proc{|first,last| h.set first,last})
-        yscrollcommand(proc{|first,last| v.set first,last})
-        pack('expand'=>'yes', 'fill'=>'both')
-      }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    }
-
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-    v.command(proc{|*args| $floor2_canvas.yview(*args)})
-    h.command(proc{|*args| $floor2_canvas.xview(*args)})
-  }
-end
-
-
-# Create an entry for displaying and typing in current room.
-
-$currentRoom2 = TkVariable.new
-$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken',
-                           'bd'=>2, 'textvariable'=>$currentRoom2)
-
-# Choose colors, then fill in the floorplan.
-
-$floor2_colors = {}
-if TkWinfo.depth($floor2_canvas) > 1
-  $floor2_colors['bg1'] = '#a9c1da'
-  $floor2_colors['outline1'] = '#77889a'
-  $floor2_colors['bg2'] = '#9ab0c6'
-  $floor2_colors['outline2'] = '#687786'
-  $floor2_colors['bg3'] = '#8ba0b3'
-  $floor2_colors['outline3'] = '#596673'
-  $floor2_colors['offices'] = 'Black'
-  $floor2_colors['active'] = '#c4d1df'
-else
-  $floor2_colors['bg1'] = 'white'
-  $floor2_colors['outline1'] = 'black'
-  $floor2_colors['bg2'] = 'white'
-  $floor2_colors['outline2'] = 'black'
-  $floor2_colors['bg3'] = 'white'
-  $floor2_colors['outline3'] = 'black'
-  $floor2_colors['offices'] = 'Black'
-  $floor2_colors['active'] = 'black'
-end
-
-$activeFloor2 = ''
-floorDisplay2 $floor2_canvas,3
-
-# Set up event bindings for canvas:
-
-$floor2_canvas.itembind('floor1', '1', proc{floorDisplay2 $floor2_canvas,1})
-$floor2_canvas.itembind('floor2', '1', proc{floorDisplay2 $floor2_canvas,2})
-$floor2_canvas.itembind('floor3', '1', proc{floorDisplay2 $floor2_canvas,3})
-$floor2_canvas.itembind('room', 'Enter', proc{newRoom2 $floor2_canvas})
-$floor2_canvas.itembind('room', 'Leave', proc{$currentRoom2.value = ''})
-$floor2_canvas.bind('2', proc{|x,y| $floor2_canvas.scan_mark x,y}, '%x %y')
-$floor2_canvas.bind('B2-Motion',
-                   proc{|x,y| $floor2_canvas.scan_dragto x,y}, '%x %y')
-$floor2_canvas.bind('Destroy', proc{$currentRoom2.unset})
-$currentRoom2.value = ''
-$currentRoom2.trace('w',proc{roomChanged2 $floor2_canvas})
diff --git a/ext/tk/sample/demos-en/form.rb b/ext/tk/sample/demos-en/form.rb
deleted file mode 100644
index abb3e0e10e..0000000000
--- a/ext/tk/sample/demos-en/form.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# form widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($form_demo) && $form_demo
-  $form_demo.destroy
-  $form_demo = nil
-end
-
-# demo toplevel widget
-$form_demo = TkToplevel.new {|w|
-  title("Form Demonstration")
-  iconname("form")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($form_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This window contains a simple form where you can type in the various entries and use tabs to move circularly between the entries."
-}
-msg.pack('side'=>'top', 'fill'=>'x')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $form_demo
-      $form_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'form'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# entry
-form_data = []
-(1..5).each{|i|
-  f = TkFrame.new(base_frame, 'bd'=>2)
-  e = TkEntry.new(f, 'relief'=>'sunken', 'width'=>40)
-  l = TkLabel.new(f)
-  e.pack('side'=>'right')
-  l.pack('side'=>'left')
-  form_data[i] = {'frame'=>f, 'entry'=>e, 'label'=>l}
-}
-
-#
-form_data[1]['label'].text('Name:')
-form_data[2]['label'].text('Address:')
-form_data[5]['label'].text('Phone:')
-
-# pack
-(1..5).each{|i| form_data[i]['frame'].pack('side'=>'top', 'fill'=>'x')}
-
diff --git a/ext/tk/sample/demos-en/goldberg.rb b/ext/tk/sample/demos-en/goldberg.rb
deleted file mode 100644
index d3956ef78c..0000000000
--- a/ext/tk/sample/demos-en/goldberg.rb
+++ /dev/null
@@ -1,2006 +0,0 @@
-#
-# Ruby/Tk Goldverg demo (called by 'widget')
-#
-# Based on Tcl/Tk8.5a2 widget demos.
-# The following is the original comment of TkGoldberg.tcl.
-#
-#>>##+#################################################################
-#>>#
-#>># TkGoldberg.tcl
-#>># by Keith Vetter, March 13, 2003
-#>>#
-#>># "Man will always find a difficult means to perform a simple task"
-#>># Rube Goldberg
-#>>#
-#>># Reproduced here with permission.
-#>>#
-#>>##+#################################################################
-#>>#
-#>># Keith Vetter 2003-03-21: this started out as a simple little program
-#>># but was so much fun that it grew and grew. So I apologize about the
-#>># size but I just couldn't resist sharing it.
-#>>#
-#>># This is a whizzlet that does a Rube Goldberg type animation, the
-#>># design of which comes from an New Years e-card from IncrediMail.
-#>># That version had nice sound effects which I eschewed. On the other
-#>># hand, that version was in black and white (actually dark blue and
-#>># light blue) and this one is fully colorized.
-#>>#
-#>># One thing I learned from this project is that drawing filled complex
-#>># objects on a canvas is really hard. More often than not I had to
-#>># draw each item twice--once with the desired fill color but no
-#>># outline, and once with no fill but with the outline. Another trick
-#>># is erasing by drawing with the background color. Having a flood fill
-#>># command would have been extremely helpful.
-#>>#
-#>># Two wiki pages were extremely helpful: Drawing rounded rectangles
-#>># which I generalized into Drawing rounded polygons, and regular
-#>># polygons which allowed me to convert ovals and arcs into polygons
-#>># which could then be rotated (see Canvas Rotation). I also wrote
-#>># Named Colors to aid in the color selection.
-#>>#
-#>># I could comment on the code, but it's just 26 state machines with
-#>># lots of canvas create and move calls.
-
-if defined?($goldberg_demo) && $goldberg_demo
-  $goldberg_demo.destroy
-  $goldberg_demo = nil
-end
-
-# demo toplevel widget
-$goldberg_demo = TkToplevel.new {|w|
-  title("Tk Goldberg (demonstration)")
-  iconname("goldberg")
-#  positionWindow(w)
-}
-
-base_frame = TkFrame.new($goldberg_demo).pack(:fill=>:both, :expand=>true)
-
-=begin
-# label
-msg = TkLabel.new($goldberg_demo) {
-  font 'Arial 10'
-  wraplength '4i'
-  justify 'left'
-  text "This is a demonstration of just how complex you can make your animations become. Click the ball to start things moving!\n\n\"Man will always find a difficult means to perform a simple task\"\n - Rube Goldberg"
-}
-msg.pack('side'=>'top')
-=end
-
-=begin
-# frame
-TkFrame.new($goldberg_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $goldberg_demo
-      $goldberg_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'goldberg'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-=end
-
-#########################################
-
-class TkGoldberg_Demo
-  def initialize(parent)
-    @parent = parent
-
-    @S = {}
-    @S['title']   = 'Tk Goldberg'
-    @S['speed']   = TkVariable.new(5)
-    @S['cnt']     = TkVariable.new(0)
-    @S['message'] = TkVariable.new("\\nWelcome\\nto\\nRuby/Tk")
-    @S['pause']   = TkVariable.new
-    @S['details'] = TkVariable.new(true)
-
-    @S['mode'] = TkVariable.new(:MSTART, :symbol)
-    #            :MSTART, :MGO, :MPAUSE, :MSSTEP, :MBSTEP, :MDONE, :MDEBUG
-
-    #         0,  1,  2,  3,  4,  5,   6,   7,   8,   9,  10
-    @speed = [1, 10, 20, 50, 80, 100, 150, 200, 300, 400, 500]
-
-    # colors
-    @C = {}
-    @C['fg'] = 'black'
-    # @C['bg'] = 'gray75'
-    @C['bg'] = 'cornflowerblue'
-
-    @C['0'] = 'white';         @C['1a'] = 'darkgreen';   @C['1b'] = 'yellow'
-    @C['2'] = 'red';           @C['3a'] = 'green';       @C['3b'] = 'darkblue'
-    @C['4'] = @C['fg'];        @C['5a'] = 'brown';       @C['5b'] = 'white'
-    @C['6'] = 'magenta';       @C['7'] = 'green';        @C['8'] = @C['fg']
-    @C['9'] = 'blue4';         @C['10a'] = 'white';      @C['10b'] = 'cyan'
-    @C['11a'] = 'yellow';      @C['11b'] = 'mediumblue'; @C['12'] = 'tan2'
-    @C['13a'] = 'yellow';      @C['13b'] = 'red';        @C['14'] = 'white'
-    @C['15a'] = 'green';       @C['15b'] = 'yellow';     @C['16'] = 'gray65'
-    @C['17'] = '#A65353';     @C['18'] = @C['fg'];      @C['19'] = 'gray50'
-    @C['20'] = 'cyan';         @C['21'] = 'gray65';      @C['22'] = @C['20']
-    @C['23a'] = 'blue';        @C['23b'] = 'red';        @C['23c'] = 'yellow'
-    @C['24a'] = 'red';         @C['24b'] = 'white';
-
-    @STEP = TkVariable.new_hash
-    @STEP.default_value_type = :numeric
-
-    @XY = {}
-
-    @XY6 = {
-      '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192],
-      '-5'=>[340, 190], '-6'=>[349, 177], '-7'=>[366, 177], '-8'=>[380, 176],
-      '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164],
-      '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151],
-      '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219],
-      '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324],
-      '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346],
-      '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391],
-      '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456],
-      '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443],
-      '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437],
-      '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424],
-      '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412],
-      '13,15'=>[376, 410], '13,16'=>[360, 403]
-    }
-
-    @timer = TkTimer.new(@speed[@S['speed'].numeric]){|timer|
-      timer.set_interval(go)
-    }
-
-    do_display
-    reset
-
-    # Start everything going
-    @timer.start
-  end
-
-  def do_display()
-    @ctrl = TkFrame.new(@parent, :relief=>:ridge, :bd=>2, :padx=>5, :pady=>5)
-    @screen = TkFrame.new(@parent, :bd=>2,
-                         :relief=>:raised).pack(:side=>:left, :fill=>:both,
-                                                :expand=>true)
-
-    @canvas = TkCanvas.new(@parent, :width=>850, :height=>700,
-                          :bg=>@C['bg'], :highlightthickness=>0){
-      scrollregion([0, 0, 1000, 1000]) # Kludge to move everything up
-      yview_moveto(0.05)
-    }.pack(:in=>@screen, :side=>:top, :fill=>:both, :expand=>true)
-
-    @canvas.bind('3'){ @pause.invoke }
-    @canvas.bind('Destroy'){ @timer.stop }
-
-    do_ctrl_frame
-    do_detail_frame
-
-    # msg = TkLabel.new(@parent, :bg=>@C['bg'], :fg=>'white') {
-    msg = Tk::Label.new(@parent, :bg=>@C['bg'], :fg=>'white') {
-      font 'Arial 10'
-      wraplength 600
-      justify 'left'
-      text "This is a demonstration of just how complex you can make your animations become. Click the ball to start things moving!\n\"Man will always find a difficult means to perform a simple task\" - Rube Goldberg"
-    }
-    msg.place(:in=>@canvas, :relx=>0, :rely=>0, :anchor=>:nw)
-
-    frame = TkFrame.new(@parent, :bg=>@C['bg'])
-
-    # TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-    Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-      text 'Dismiss'
-      command proc{
-        tmppath = $goldberg_demo
-        $goldberg_demo = nil
-        tmppath.destroy
-      }
-    }.pack('side'=>'left')
-
-    # TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-    Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-      text 'See Code'
-      command proc{showCode 'goldberg'}
-    }.pack('side'=>'left', 'padx'=>5)
-
-    # @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl},
-    @show = Tk::Button.new(frame, :text=>'>>', :command=>proc{show_ctrl},
-                         :bg=>@C['bg'], :activebackground=>@C['bg'])
-    @show.pack('side'=>'left')
-    frame.place(:in=>@canvas, :relx=>1, :rely=>0, :anchor=>:ne)
-
-    Tk.update
-  end
-
-  def do_ctrl_frame
-    @start = Tk::Button.new(@parent, :text=>'Start', :bd=>6,
-                          :command=>proc{do_button(0)})
-    if font = @start['font']
-      @start.font(font.weight('bold'))
-    end
-
-    @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font,
-                               :command=>proc{do_button(1)}, :relief=>:raised,
-                               :variable=>@S['pause'])
-
-    @step  = TkButton.new(@parent, :text=>'Single Step', :font=>font,
-                          :command=>proc{do_button(2)})
-    @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font,
-                          :command=>proc{do_button(4)})
-    @reset = TkButton.new(@parent, :text=>'Reset', :font=>font,
-                          :command=>proc{do_button(3)})
-
-    @details = TkFrame.new(@parent, :bd=>2, :relief=>:ridge)
-    @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font,
-                               :relief=>:raised, :variable=>@S['details'])
-
-    @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'],
-                             :justify=>:center)
-    @speed_scale = TkScale.new(@parent, :orient=>:horizontal,
-                               :from=>1, :to=>10, :font=>font,
-                               :variable=>@S['speed'], :bd=>2,
-                               :relief=>:ridge, :showvalue=>false)
-    @about = TkButton.new(@parent, :text=>'About',
-                          :command=>proc{about}, :font=>font)
-
-    Tk.grid(@start, :in=>@ctrl, :row=>0, :sticky=>:ew)
-    @ctrl.grid_rowconfigure(1, :minsize=>10)
-    Tk.grid(@pause, :in=>@ctrl, :row=>2, :sticky=>:ew)
-    Tk.grid(@step,  :in=>@ctrl, :sticky=>:ew)
-    Tk.grid(@bstep, :in=>@ctrl, :sticky=>:ew)
-    Tk.grid(@reset, :in=>@ctrl, :sticky=>:ew)
-    @ctrl.grid_rowconfigure(10, :minsize=>20)
-    Tk.grid(@details, :in=>@ctrl, :row=>11, :sticky=>:ew)
-    Tk.grid(@detail, :in=>@details, :row=>0, :sticky=>:ew)
-    @ctrl.grid_rowconfigure(50, :weight=>1)
-
-    @S['mode'].trace('w', proc{|*args| active_GUI(*args)})
-    @S['details'].trace('w', proc{|*args| active_GUI(*args)})
-    @S['speed'].trace('w', proc{|*args| active_GUI(*args)})
-
-    Tk.grid(@msg_entry, :in=>@ctrl, :row=>98, :sticky=>:ew, :pady=>5)
-    Tk.grid(@speed_scale, :in=>@ctrl, :row=>99, :sticky=>:ew)
-    Tk.grid(@about, :in=>@ctrl, :row=>100, :sticky=>:ew)
-
-    @reset.bind('3'){@S['mode'].value = -1}  # Debugging
-  end
-
-  def do_detail_frame
-    @f_details = TkFrame.new(@details)
-
-    @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'],
-                         :bd=>1, :relief=>:solid, :bg=>'white')
-    Tk.grid(@label, '-', '-', '-', :sticky=>:ew, :row=>0)
-
-    idx = 1
-    loop {
-      break unless respond_to?("move#{idx}")
-      l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e,
-                      :width=>2, :bd=>1, :relief=>:solid, :bg=>'white')
-      @STEP[idx] = 0
-      ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx),
-                       :width=>5, :bd=>1, :relief=>:solid, :bg=>'white')
-      row = (idx + 1)/2
-      col = ((idx + 1) & 1) * 2
-      Tk.grid(l, :sticky=>:ew, :row=>row, :column=>col)
-      Tk.grid(ll, :sticky=>:ew, :row=>row, :column=>(col + 1))
-      idx += 1
-    }
-    @f_details.grid_columnconfigure(1, :weight=>1)
-  end
-
-  def show_ctrl
-    if @ctrl.winfo_mapped?
-      @ctrl.pack_forget
-      @show.text('>>')
-    else
-      @ctrl.pack(:side=>:right, :fill=>:both, :ipady=>5)
-      @show.text('<<')
-    end
-  end
-
-  def draw_all
-    reset_step
-    @canvas.delete(:all)
-    idx = 0
-    loop{
-      m = "draw#{idx}"
-      break unless respond_to?(m)
-      send(m)
-      idx += 1
-    }
-  end
-
-  def active_GUI(var1, var2, op)
-    st = {false=>:disabled, true=>:normal}
-
-    m = @S['mode'].to_sym
-    @S['pause'].value = (m == :MPAUSE)
-    @start.state(st[m != :MGO])
-    @pause.state(st[m != :MSTART && m != :MDONE])
-    @step.state(st[m != :MGO && m != :MDONE])
-    @bstep.state(st[m != :MGO && m != :MDONE])
-    @reset.state(st[m != :MSTART])
-
-    if @S['details'].bool
-      Tk.grid(@f_details, :in=>@details, :row=>2, :sticky=>:ew)
-    else
-      Tk.grid_forget(@f_details)
-    end
-    @speed_scale.label("Speed: #{@S['speed'].value}")
-  end
-
-  def start
-    @S['mode'].value = :MGO
-  end
-
-  def do_button(what)
-    case what
-    when 0  # Start
-      reset if @S['mode'].to_sym == :MDONE
-      @S['mode'].value = :MGO
-
-    when 1  # Pause
-      @S['mode'].value = ((@S['pause'].bool)? :MPAUSE: :MGO)
-
-    when 2  # Step
-      @S['mode'].value = :MSSTEP
-
-    when 3  # Reset
-      reset
-
-    when 4  # Big step
-      @S['mode'].value = :MBSTEP
-    end
-  end
-
-  def go(who = nil)
-    now = Tk::Clock.clicks(:miliseconds)
-    if who  # Start here for debugging
-      @S['active'] = [who]
-      @S['mode'].value = :MGO
-    end
-    return if @S['mode'].to_sym == :MDEBUG  # Debugging
-    # If not paused, do the next move
-    n = next_step if @S['mode'].to_sym != :MPAUSE
-    @S['mode'].value = :MPAUSE if @S['mode'].to_sym == :MSSTEP  # Single step
-    @S['mode'].value = :MSSTEP if @S['mode'].to_sym == :MBSTEP && n  # big step
-    elapsed = Tk::Clock.clicks(:miliseconds) - now
-    delay = @speed[@S['speed'].to_i] - elapsed
-    delay = 1 if delay <= 0
-    return delay
-  end
-
-  def next_step
-    retval = false   # Return value
-
-    if @S['mode'].to_sym != :MSTART && @S['mode'].to_sym != :MDONE
-      @S['cnt'].numeric += 1
-    end
-    alive = []
-    @S['active'].each{|who|
-      who = who.to_i
-      n = send("move#{who}")
-      if (n & 1).nonzero?          # This guy still alive
-        alive << who
-      end
-      if (n & 2).nonzero?          # Next guy is active
-        alive << (who + 1)
-        retval = true
-      end
-      if (n & 4).nonzero?          # End of puzzle flag
-        @S['mode'].value = :MDONE  # Done mode
-        @S['active'] = []          # No more animation
-        return true
-      end
-    }
-    @S['active'] = alive
-    return retval
-  end
-
-  def about
-    msg = "Ruby/Tk Version ::\nby Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)\n\n"
-    msg += "Original Version ::\n"
-    msg += "#{@S['title']}\nby Keith Vetter, March 2003\n(Reproduced by kind permission of the author)\n\n"
-    msg += "Man will always find a difficult means to perform a simple task"
-    msg += "\nRube Goldberg"
-    Tk.messageBox(:message=>msg, :title=>'About')
-  end
-
-  ################################################################
-  #
-  # All the drawing and moving routines
-  #
-
-  # START HERE! banner
-  def draw0
-    color = @C['0']
-    TkcText.new(@canvas, [579, 119], :text=>'START HERE!',
-                :fill=>color, :anchor=>:w,
-                :tag=>'I0', :font=>['Times Roman', 12, :italic, :bold])
-    TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color,
-                :width=>5, :arrow=>:last, :arrowshape=>[18, 18, 5])
-    @canvas.itembind('I0', '1'){ start }
-  end
-
-  def move0(step = nil)
-    step = get_step(0, step)
-
-    if @S['mode'].to_sym != :MSTART    # Start the ball rolling
-      move_abs('I0', [-100, -100])     # Hide the banner
-      return 2
-    end
-
-    pos = [
-      [673, 119], [678, 119], [683, 119], [688, 119],
-      [693, 119], [688, 119], [683, 119], [678, 119]
-    ]
-    step = step % pos.length
-    move_abs('I0', pos[step])
-    return 1
-  end
-
-  # Dropping ball
-  def draw1
-    color = @C['1a']
-    color2 = @C['1b']
-    TkcPolygon.new(@canvas,
-                   [ 844, 133, 800, 133, 800, 346, 820, 346,
-                     820, 168, 844, 168, 844, 133 ],
-                   :width=>3, :fill=>color, :outline=>'')
-    TkcPolygon.new(@canvas,
-                   [ 771, 133, 685, 133, 685, 168, 751, 168,
-                     751, 346, 771, 346, 771, 133 ],
-                   :width=>3, :fill=>color, :outline=>'')
-    TkcOval.new(@canvas, box(812, 122, 9),
-                :tag=>'I1', :fill=>color2, :outline=>'')
-
-    @canvas.itembind('I1', '1'){ start }
-  end
-
-  def move1(step = nil)
-    step = get_step(1, step)
-    pos = [
-      [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153],
-      [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438],
-      [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601],
-      [-100, -100]
-    ]
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I1', where)
-    move15a if where[2] == :y
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Lighting the match
-  def draw2
-    color = @C['2']
-
-    # Fulcrum
-    TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392],
-                   :fill=>@C['fg'], :outline=>@C['fg'])
-
-    # Strike box
-    TkcRectangle.new(@canvas, [628, 335, 660, 383],
-                     :fill=>'', :outline=>@C['fg'])
-    (0..2).each{|y|
-      yy = 335 + y*16
-      TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25',
-                    :anchor=>:nw, :foreground=>@C['fg'])
-      TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25',
-                    :anchor=>:nw, :foreground=>@C['fg'])
-    }
-
-    # Lever
-    TkcLine.new(@canvas, [702, 366, 798, 366],
-                :fill=>@C['fg'], :width=>6, :tag=>'I2_0')
-
-    # R strap
-    TkcLine.new(@canvas, [712, 363, 712, 355],
-                :fill=>@C['fg'], :width=>3, :tag=>'I2_1')
-
-    # L strap
-    TkcLine.new(@canvas, [705, 363, 705, 355],
-                :fill=>@C['fg'], :width=>3, :tag=>'I2_2')
-
-    # Match stick
-    TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356],
-                :fill=>@C['fg'], :width=>3, :tag=>'I2_3')
-
-    # Match head
-    TkcPolygon.new(@canvas,
-                   [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1,
-                     671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ],
-                   :fill=>color, :outline=>color, :tag=>'I2_4')
-  end
-
-  def move2(step = nil)
-    step = get_step(2, step)
-
-    stages = [0, 0, 1, 2, 0, 2, 1, 0, 1, 2, 0, 2, 1]
-    xy = []
-    xy[0] = [
-      686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307,
-      662, 318, 662, 328, 671, 336
-    ]
-    xy[1] = [
-      687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311,
-      661, 327, 671, 335
-    ]
-    xy[2] = [
-      686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298,
-      666, 309, 660, 324, 672, 336
-    ]
-
-    if step >= stages.length
-      @canvas.delete('I2')
-      return 0
-    end
-
-    if step == 0  # Rotate the match
-      beta = 20
-
-      ox, oy = anchor('I2_0', :s)  # Where to pivot
-
-      i = 0
-      until @canvas.find_withtag("I2_#{i}").empty?
-        rotate_item("I2_#{i}", ox, oy, beta)
-        i += 1
-      end
-
-      # For the flame
-      TkcPolygon.new(@canvas, [], :tag=>'I2', :smooth=>true, :fill=>@C['2'])
-
-      return 1
-    end
-    @canvas.coords('I2', xy[stages[step]])
-    return ((step == 7)? 3: 1)
-  end
-
-  # Weight and pulleys
-  def draw3
-    color = @C['3a']
-    color2 = @C['3b']
-
-    xy = [ [602, 296], [577, 174], [518, 174] ]
-    xy.each{|x, y| # 3 Pulleys
-      TkcOval.new(@canvas, box(x, y, 13),
-                  :fill=>color, :outline=>@C['fg'], :width=>3)
-      TkcOval.new(@canvas, box(x, y, 2), :fill=>@C['fg'], :outline=>@C['fg'])
-    }
-
-    # Wall to flame
-    TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s',
-                :width=>3, :fill=>@C['fg'], :smooth=>true)
-
-    # Flame to pulley 1
-    TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0',
-                :width=>3, :fill=>@C['fg'], :smooth=>true)
-    TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1',
-                :width=>3, :fill=>@C['fg'], :smooth=>true)
-
-    # Pulley 1 half way to 2
-    TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2',
-                :width=>3, :fill=>@C['fg'])
-
-    # Pulley 1 other half to 2
-    TkcLine.new(@canvas, [589, 235, 589, 174], :width=>3, :fill=>@C['fg'])
-
-    # Across the top
-    TkcLine.new(@canvas, [577, 161, 518, 161], :width=>3, :fill=>@C['fg'])
-
-    # Down to weight
-    TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w',
-                :width=>3, :fill=>@C['fg'])
-
-    # Draw the weight as 2 circles, two rectangles and 1 rounded rectangle
-    x1, y1, x2, y2 = [515, 207, 495, 207]
-    TkcOval.new(@canvas, box(x1, y1, 6),
-                :tag=>'I3_', :fill=>color2, :outline=>color2)
-    TkcOval.new(@canvas, box(x2, y2, 6),
-                :tag=>'I3_', :fill=>color2, :outline=>color2)
-    TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6,
-                     :tag=>'I3_', :fill=>color2, :outline=>color2)
-
-    TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15),
-                   :smooth=>true, :tag=>'I3_', :fill=>color2, :outline=>color2)
-
-    TkcLine.new(@canvas, [500, 217, 511, 217],
-                :tag=>'I3_', :fill=>color2, :width=>10)
-
-    # Bottom weight target
-    TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465],
-                :tag=>'I3__', :fill=>@C['fg'], :joinstyle=>:miter, :width=>10)
-  end
-
-  def move3(step = nil)
-    step = get_step(3, step)
-
-    pos = [ [505, 247], [505, 297], [505, 386.5], [505, 386.5] ]
-    rope = []
-    rope[0] = [750, 309, 729, 301, 711, 324, 690, 300]
-    rope[1] = [750, 309, 737, 292, 736, 335, 717, 315, 712, 320]
-    rope[2] = [750, 309, 737, 309, 740, 343, 736, 351, 725, 340]
-    rope[3] = [750, 309, 738, 321, 746, 345, 742, 356]
-
-    return 0 if step >= pos.length
-
-    @canvas.delete("I3_#{step}")        # Delete part of the rope
-    move_abs('I3_', pos[step])          # Move weight down
-    @canvas.coords('I3_s', rope[step])  # Flapping rope end
-    @canvas.coords('I3_w', [505, 174].concat(pos[step]))
-    if step == 2
-      @canvas.move('I3__', 0, 30)
-      return 2
-    end
-    return 1
-  end
-
-  # Cage and door
-  def draw4
-    color = @C['4']
-    x0, y0, x1, y1 = [527, 356, 611, 464]
-
-    # Horizontal bars
-    y0.step(y1, 12){|y|
-      TkcLine.new(@canvas, [x0, y, x1, y], :fill=>color, :width=>1)
-    }
-
-    # Vertical bars
-    x0.step(x1, 12){|x|
-      TkcLine.new(@canvas, [x, y0, x, y1], :fill=>color, :width=>1)
-    }
-
-    # Swing gate
-    TkcLine.new(@canvas, [518, 464, 518, 428],
-                :tag=>'I4', :fill=>color, :width=>1)
-  end
-
-  def move4(step = nil)
-    step = get_step(4, step)
-
-    angles = [-10, -20, -30, -30]
-    return 0 if step >= angles.length
-
-    rotate_item('I4', 518, 464, angles[step])
-    @canvas.raise('I4')
-
-    return((step == 3)? 3: 1)
-  end
-
-  # Mouse
-  def draw5
-    color  = @C['5a']
-    color2 = @C['5b']
-
-    xy = [377, 248, 410, 248, 410, 465, 518, 465]  # Mouse course
-    xy.concat [518, 428, 451, 428, 451, 212, 377, 212]
-
-    TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], :width=>3)
-
-    xy = [
-      534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446,
-      575, 452, 574, 454, 566, 456, 554, 456, 545, 456, 537, 454, 530, 452
-    ]
-    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_0'], :fill=>color)
-
-    TkcLine.new(@canvas, [573, 452, 592, 458, 601, 460, 613, 456], # Tail
-                :tag=>['I5', 'I5_1'], :fill=>color, :smooth=>true, :width=>3)
-
-    xy = box(540, 446, 2)   # Eye
-    xy = [540, 444, 541, 445, 541, 447, 540, 448, 538, 447, 538, 445]
-    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'],
-                   :outline=>'', :smooth=>true)
-
-    xy = [538, 454, 535, 461] # Front leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_3'], :fill=>color, :width=>2)
-
-    xy = [566, 455, 569, 462] # Back leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_4'], :fill=>color, :width=>2)
-
-    xy = [544, 455, 545, 460] # 2nd front leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_5'], :fill=>color, :width=>2)
-
-    xy = [560, 455, 558, 460] # 2nd back leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_6'], :fill=>color, :width=>2)
-  end
-
-  def move5(step = nil)
-    step = get_step(5, step)
-
-    pos = [
-      [553, 452], [533, 452], [513, 452], [493, 452], [473, 452],
-      [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414],
-      [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294],
-      [422, 274, -30], [422, 260.5, -30, :x], [422.5, 248.5, -28], [425, 237]
-    ]
-
-    return 0 if step >= pos.length
-
-    x, y, beta, nxt = pos[step]
-    move_abs('I5', [x, y])
-    if beta
-      ox, oy = centroid('I5_0')
-      (0..6).each{|id| rotate_item("I5_#{id}", ox, oy, beta) }
-    end
-    return 3 if nxt == :x
-    return 1
-  end
-
-  # Dropping gumballs
-  def draw6
-    color = @C['6']
-    xy = [324, 130, 391, 204] # Ball holder
-    xy = round_rect(xy, 10)
-    TkcPolygon.new(@canvas, xy, :smooth=>true,
-                   :outline=>@C['fg'], :width=>3, :fill=>color)
-    xy = [339, 204, 376, 253] # Below the ball holder
-    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
-                     :fill=>color, :tag=>'I6c')
-    xy = box(346, 339, 28)
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'') # Roter
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
-               :start=>80, :extent=>205)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
-               :start=>-41, :extent=>85)
-
-    xy = box(346, 339, 15) # Center of rotor
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['fg'], :tag=>'I6m')
-    xy = [352, 312, 352, 254, 368, 254, 368, 322] # Top drop to rotor
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'')
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
-
-    xy = [353, 240, 367, 300] # Poke bottom hole
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
-    xy = [341, 190, 375, 210] # Poke another hole
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
-
-    xy = [
-      368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403,
-      352, 403, 352, 366
-    ]
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'',
-                   :width=>2) # Below rotor
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
-    xy = box(275, 342, 7) # On/off rotor
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['fg'])
-    xy = [276, 334, 342, 325] # Fan belt top
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = [276, 349, 342, 353] # Fan belt bottom
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-
-    xy = [337, 212, 337, 247] # What the mouse pushes
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I6_')
-    xy = [392, 212, 392, 247]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I6_')
-    xy = [337, 230, 392, 230]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>7, :tag=>'I6_')
-
-    who = -1 # All the balls
-    colors = %w(red cyan orange green blue darkblue)
-    colors *= 3
-
-    (0..16).each{|i|
-      loc = -i
-      color = colors[i]
-      x, y = @XY6["#{loc}"]
-      TkcOval.new(@canvas, box(x, y, 5),
-                  :fill=>color, :outline=>color, :tag=>"I6_b#{i}")
-    }
-    draw6a(12) # The wheel
-  end
-
-  def draw6a(beta)
-    @canvas.delete('I6_0')
-    ox, oy = [346, 339]
-    (0..3).each{|i|
-      b = beta + i * 45
-      x, y = rotate_c(28, 0, 0, 0, b)
-      xy = [ox + x, oy + y, ox - x, oy - y]
-      TkcLine.new(@canvas, xy, :tag=>'I6_0', :fill=>@C['fg'], :width=>2)
-    }
-  end
-
-  def move6(step = nil)
-    step = get_step(6, step)
-
-    return 0 if step > 62
-
-    if step < 2  # Open gate for balls to drop
-      @canvas.move('I6_', -7, 0)
-      if step == 1  # Poke a hole
-        xy = [348, 226, 365, 240]
-        TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill),
-                         :outline=>'')
-      end
-      return 1
-    end
-
-    s = step - 1  # Do the gumball drop dance
-    (0..(((s - 1)/3).to_i)).each{|i|
-      tag = "I6_b#{i}"
-      break if @canvas.find_withtag(tag).empty?
-      loc = s - 3*i
-
-      if @XY6["#{loc},#{i}"]
-        move_abs(tag, @XY6["#{loc},#{i}"])
-      elsif @XY6["#{loc}"]
-        move_abs(tag, @XY6["#{loc}"])
-      end
-    }
-    if s % 3 == 1
-      first = (s + 2)/3
-      i = first
-      loop {
-        tag = "I6_b#{i}"
-        break if @canvas.find_withtag(tag).empty?
-        loc = first - i
-        move_abs(tag, @XY6["#{loc}"])
-        i += 1
-      }
-    end
-    if s >= 3  # Rotate the motor
-      idx = s % 3
-      draw6a(12 + s * 15)
-    end
-    return((s == 3)? 3 : 1)
-  end
-
-  # On/off switch
-  def draw7
-    color = @C['7']
-    xy = [198, 306, 277, 374]  # Box
-    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2,
-                     :fill=>color, :tag=>'I7z')
-    @canvas.lower('I7z')
-    xy = [275, 343, 230, 349]
-    TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last,
-                :arrowshape=>[23, 23, 8], :width=>6)
-    xy = [225, 324]  # On button
-    x, y = xy
-    TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
-    xy = [218, 323]  # On text
-    font = ['Times Roman', 8]
-    TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e,
-                :fill=>@C['fg'], :font=>font)
-    xy = [225, 350]  # Off button
-    x, y = xy
-    TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
-    xy = [218, 349]  # Off text
-    TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e,
-                :fill=>@C['fg'], :font=>font)
-  end
-
-  def move7(step = nil)
-    step = get_step(7, step)
-
-    numsteps = 30
-    return 0 if step > numsteps
-    beta = 30.0 / numsteps
-    rotate_item('I7', 275, 343, beta)
-
-    return((step == numsteps)? 3: 1)
-  end
-
-  # Electricity to the fan
-  def draw8
-    sine([271, 248, 271, 306], 5, 8, :tag=>'I8_s', :fill=>@C['8'], :width=>3)
-  end
-
-  def move8(step = nil)
-    step = get_step(8, step)
-
-    return 0 if step > 3
-    if step == 0
-      sparkle(anchor('I8_s', :s), 'I8')
-      return 1
-    elsif step == 1
-      move_abs('I8', anchor('I8_s', :c))
-    elsif step == 2
-      move_abs('I8', anchor('I8_s', :n))
-    else
-      @canvas.delete('I8')
-    end
-    return((step == 2)? 3: 1)
-  end
-
-  # Fan
-  def draw9
-    color = @C['9']
-    xy = [266, 194, 310, 220]
-    TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
-    xy = [280, 209, 296, 248]
-    TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
-    xy = [
-      288, 249, 252, 249, 260, 240, 280, 234,
-      296, 234, 316, 240, 324, 249, 288, 249
-    ]
-    TkcPolygon.new(@canvas, xy, :fill=>color, :smooth=>true)
-
-    xy = [248, 205, 265, 214, 264, 205, 265, 196]  # Spinner
-    TkcPolygon.new(@canvas, xy, :fill=>color)
-
-    xy = [255, 206, 265, 234]  # Fan blades
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>3, :tag=>'I9_0')
-    xy = [255, 176, 265, 204]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>3, :tag=>'I9_0')
-    xy = [255, 206, 265, 220]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>1, :tag=>'I9_1')
-    xy = [255, 190, 265, 204]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>1, :tag=>'I9_1')
-  end
-
-  def move9(step = nil)
-    step = get_step(9, step)
-
-    if (step & 1).nonzero?
-      @canvas.itemconfigure('I9_0', :width=>4)
-      @canvas.itemconfigure('I9_1', :width=>1)
-      @canvas.lower('I9_1', 'I9_0')
-    else
-      @canvas.itemconfigure('I9_0', :width=>1)
-      @canvas.itemconfigure('I9_1', :width=>4)
-      @canvas.lower('I9_0', 'I9_1')
-    end
-    return 3 if step == 0
-    return 1
-  end
-
-  # Boat
-  def draw10
-    color  = @C['10a']
-    color2 = @C['10b']
-    xy = [191, 230, 233, 230, 233, 178, 191, 178]  # Sail
-    TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'],
-                   :tag=>'I10')
-    xy = box(209, 204, 31)  # Front
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie,
-               :start=>120, :extent=>120, :tag=>'I10')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>120, :extent=>120, :tag=>'I10')
-    xy = box(249, 204, 31)  # Back
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3,
-               :style=>:pie, :start=>120, :extent=>120, :tag=>'I10')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>120, :extent=>120, :tag=>'I10')
-
-    xy = [200, 171, 200, 249]  # Mast
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I10')
-    xy = [159, 234, 182, 234]  # Bow sprit
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I10')
-    xy = [180, 234, 180, 251, 220, 251]  # Hull
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>6, :tag=>'I10')
-
-    xy = [92, 255, 221, 255]  # Waves
-    sine(xy, 2, 25, :fill=>color2, :width=>1, :tag=>'I10w')
-
-    xy = @canvas.coords('I10w')[4..-5]  # Water
-    xy.concat([222, 266, 222, 277, 99, 277])
-    TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>color2)
-    xy = [222, 266, 222, 277, 97, 277, 97, 266]  # Water bottom
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-
-    xy = box(239, 262, 17)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>95, :extent=>103)
-    xy = box(76, 266, 21)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :extent=>190)
-  end
-
-  def move10(step = nil)
-    step = get_step(10, step)
-
-    pos = [
-      [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212],
-      [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212],
-      [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212],
-      [116, 212], [111, 212]
-    ]
-
-    return 0 if step >= pos.length
-
-    where = pos[step]
-    move_abs('I10', where)
-
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # 2nd ball drop
-  def draw11
-    color  = @C['11a']
-    color2 = @C['11b']
-    xy = [23, 264, 55, 591]  # Color the down tube
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
-    xy = box(71, 460, 48)    # Color the outer loop
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
-
-    xy = [55, 264, 55, 458]  # Top right side
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = [55, 504, 55, 591]  # Bottom right side
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = box(71, 460, 48)    # Outer loop
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>110, :extent=>-290, :tag=>'I11i')
-    xy = box(71, 460, 16)    # Inner loop
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'',
-                :width=>3, :tag=>'I11i')
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['bg'], :width=>3)
-
-    xy = [23, 264, 23, 591]  # Left side
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = box(1, 266, 23)     # Top left curve
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
-               :style=>:arc, :extent=>90)
-
-    xy = box(75, 235, 9)     # The ball
-    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'',
-                :width=>3, :tag=>'I11')
-  end
-
-  def move11(step = nil)
-    step = get_step(11, step)
-
-    pos = [
-      [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266],
-      [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472],
-      [100, 437], [65, 423], [-100, -100], [38, 505], [38, 527, :x], [38, 591]
-    ]
-
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I11', where)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Hand
-  def draw12
-    xy = [
-      20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590,
-      60, 590, 60, 610, 60, 610
-    ]
-    xy.concat([60, 610, 65, 620, 60, 631])  # Thumb
-    xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669,
-                56, 669, 50, 669, 50, 662, 50, 637])
-
-    y0 = 637  # Bumps for fingers
-    y1 = 645
-    50.step(21, -10){|x|
-      x1 = x - 5
-      x2 = x - 10
-      xy << x << y0 << x1 << y1 << x2 << y0
-    }
-    TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'],
-                   :smooth=>true, :tag=>'I12', :width=>3)
-  end
-
-  def move12(step = nil)
-    step = get_step(12, step)
-
-    pos = [[42.5, 641, :x]]
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I12', where)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Fax
-  def draw13
-    color = @C['13a']
-    xy = [86, 663, 149, 663, 149, 704, 50, 704, 50, 681, 64, 681, 86, 671]
-    xy2 = [
-      784, 663, 721, 663, 721, 704, 820, 704, 820, 681, 806, 681, 784, 671
-    ]
-    radii = [2, 9, 9, 8, 5, 5, 2]
-
-    round_poly(@canvas, xy, radii, :width=>3,
-               :outline=>@C['fg'], :fill=>color)
-    round_poly(@canvas, xy2, radii, :width=>3,
-               :outline=>@C['fg'], :fill=>color)
-
-    xy = [56, 677]
-    x, y = xy
-    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
-                     :width=>3, :tag=>'I13')
-    xy = [809, 677]
-    x, y = xy
-    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
-                     :width=>3, :tag=>'I13R')
-
-    xy = [112, 687]  # Label
-    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
-                :font=>['Times Roman', 12, :bold])
-    xy = [762, 687]
-    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
-                :font=>['Times Roman', 12, :bold])
-
-    xy = [138, 663, 148, 636, 178, 636]  # Paper guide
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
-    xy = [732, 663, 722, 636, 692, 636]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
-
-    sine([149, 688, 720, 688], 5, 15,
-         :tag=>'I13_s', :fill=>@C['fg'],  :width=>3)
-  end
-
-  def move13(step = nil)
-    step = get_step(13, step)
-
-    numsteps = 7
-
-    if step == numsteps + 2
-      move_abs('I13_star', [-100, -100])
-      @canvas.itemconfigure('I13R', :fill=>@C['13b'], :width=>2)
-      return 2
-    end
-    if step == 0  # Button down
-      @canvas.delete('I13')
-      sparkle([-100, -100], 'I13_star')  # Create off screen
-      return 1
-    end
-    x0, y0 = anchor('I13_s', :w)
-    x1, y1 = anchor('I13_s', :e)
-    x = x0 + (x1 - x0) * (step - 1) / numsteps.to_f
-    move_abs('I13_star', [x, y0])
-    return 1
-  end
-
-  # Paper in fax
-  def draw14
-    color = @C['14']
-    xy = [102, 661, 113, 632, 130, 618]  # Left paper edge
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14L_0')
-    xy = [148, 629, 125, 640, 124, 662]  # Right paper edge
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14L_1')
-    draw14a('L')
-
-    xy = [
-      768.0, 662.5, 767.991316225, 662.433786215, 767.926187912, 662.396880171
-    ]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14R_0')
-    @canvas.lower('I14R_0')
-    # NB. these numbers are VERY sensitive, you must start with final size
-    # and shrink down to get the values
-    xy = [
-      745.947897349, 662.428358855, 745.997829056, 662.452239237, 746.0, 662.5
-    ]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14R_1')
-    @canvas.lower('I14R_1')
-  end
-
-  def draw14a(side)
-    color = @C['14']
-    xy = @canvas.coords("I14#{side}_0")
-    xy2 = @canvas.coords("I14#{side}_1")
-    x0, y0, x1, y1, x2, y2 = xy
-    x3, y3, x4, y4, x5, y5 = xy2
-
-    zz = [
-      x0, y0, x0, y0, xy, x2, y2, x2, y2,
-      x3, y3, x3, y3, xy2, x5, y5, x5, y5
-    ].flatten
-    @canvas.delete("I14#{side}")
-    TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true,
-                   :fill=>color, :outline=>color, :width=>3)
-    @canvas.lower("I14#{side}")
-  end
-
-  def move14(step = nil)
-    step = get_step(14, step)
-
-    # Paper going down
-    sc = 0.9 - 0.05*step
-    if sc < 0.3
-      @canvas.delete('I14L')
-      return 0
-    end
-
-    ox, oy = @canvas.coords('I14L_0')
-    @canvas.scale('I14L_0', ox, oy, sc, sc)
-    ox, oy = @canvas.coords('I14L_1')[-2..-1]
-    @canvas.scale('I14L_1', ox, oy, sc, sc)
-    draw14a('L')
-
-    # Paper going up
-    sc = 0.35 + 0.05*step
-    sc = 1/sc
-
-    ox, oy = @canvas.coords('I14R_0')
-    @canvas.scale('I14R_0', ox, oy, sc, sc)
-    ox, oy = @canvas.coords('I14R_1')[-2..-1]
-    @canvas.scale('I14R_1', ox, oy, sc, sc)
-    draw14a('R')
-
-    return((step == 10)? 3: 1)
-  end
-
-  # Light beam
-  def draw15
-    color = @C['15a']
-    xy = [824, 599, 824, 585, 820, 585, 829, 585]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I15a')
-    xy = [789, 599, 836, 643]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-    xy = [778, 610, 788, 632]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-    xy = [766, 617, 776, 625]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-
-    xy = [633, 600, 681, 640]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-    xy = [635, 567, 657, 599]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
-    xy = [765, 557, 784, 583]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
-
-    sine([658, 580, 765, 580], 3, 15,
-         :tag=>'I15_s', :fill=>@C['fg'], :width=>3)
-  end
-
-  def move15a
-    color = @C['15b']
-    @canvas.scale('I15a', 824, 599, 1, 0.3)  # Button down
-    xy = [765, 621, 681, 621]
-    TkcLine.new(@canvas, xy, :dash=>'-', :width=>3, :fill=>color, :tag=>'I15')
-  end
-
-  def move15(step = nil)
-    step = get_step(15, step)
-
-    numsteps = 6
-
-    if step == numsteps + 2
-      move_abs('I15_star', [-100, -100])
-      return 2
-    end
-    if step == 0  # Break the light beam
-      sparkle([-100, -100], 'I15_star')
-      xy = [765, 621, 745, 621]
-      @canvas.coords('I15', xy)
-      return 1
-    end
-    x0, y0 = anchor('I15_s', :w)
-    x1, y1 = anchor('I15_s', :e)
-    x = x0 + (x1 - x0) * (step - 1) / numsteps.to_f
-    move_abs('I15_star', [x, y0])
-    return 1
-  end
-
-  # Bell
-  def draw16
-    color = @C['16']
-    xy = [722, 485, 791, 556]
-    TkcRectangle.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>3)
-    xy = box(752, 515, 25)  # Bell
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black',
-                :tag=>'I16b', :width=>2)
-    xy = box(752, 515, 5)   # Bell button
-    TkcOval.new(@canvas, xy, :fill=>'black', :outline=>'black', :tag=>'I16b')
-
-    xy = [784, 523, 764, 549]  # Clapper
-    TkcLine.new(@canvas, xy, :width=>3, :tag=>'I16c', :fill=>@C['fg'])
-    xy = box(784, 523, 4)
-    TkcOval.new(@canvas, xy, :fill=>@C['fg'], :outline=>@C['fg'], :tag=>'I16d')
-  end
-
-  def move16(step = nil)
-    step = get_step(16, step)
-
-    # Note: we never stop
-    ox, oy = [760, 553]
-    if (step & 1).nonzero?
-      beta = 12
-      @canvas.move('I16b', 3, 0)
-    else
-      beta = -12
-      @canvas.move('I16b', -3, 0)
-    end
-    rotate_item('I16c', ox, oy, beta)
-    rotate_item('I16d', ox, oy, beta)
-
-    return ((step == 1)? 3: 1)
-  end
-
-  # Cat
-  def draw17
-    color = @C['17']
-
-    xy = [584, 556, 722, 556]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = [584, 485, 722, 485]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-
-    xy = [664, 523, 717, 549]  # Body
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3,
-               :style=>:chord, :start=>128, :extent=>260, :tag=>'I17')
-
-    xy = [709, 554, 690, 543]  # Paw
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
-                :width=>3, :tag=>'I17')
-    xy = [657, 544, 676, 555]
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
-                :width=>3, :tag=>'I17')
-
-    xy = box(660, 535, 15)     # Lower face
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>150, :extent=>240, :tag=>'I17_')
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:chord, :start=>150, :extent=>240, :tag=>'I17_')
-    xy = [674, 529, 670, 513, 662, 521, 658, 521, 650, 513, 647, 529]  # Ears
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1,
-                   :tag=>['I17_', 'I17_c'])
-    xy = [652, 542, 628, 539]  # Whiskers
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    xy = [652, 543, 632, 545]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    xy = [652, 546, 632, 552]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-
-    xy = [668, 543, 687, 538]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                :tag=>['I17_', 'I17_w'])
-    xy = [668, 544, 688, 546]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                :tag=>['I17_', 'I17_w'])
-    xy = [668, 547, 688, 553]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                :tag=>['I17_', 'I17_w'])
-
-    xy = [649, 530, 654, 538, 659, 530]  # Left eye
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
-                :smooth=>true, :tag=>'I17')
-    xy = [671, 530, 666, 538, 661, 530]  # Right eye
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
-                :smooth=>true, :tag=>'I17')
-    xy = [655, 543, 660, 551, 665, 543]  # Mouth
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
-                :smooth=>true, :tag=>'I17')
-  end
-
-  def move17(step = nil)
-    step = get_step(17, step)
-
-    if step == 0
-      @canvas.delete('I17')  # Delete most of the cat
-      xy = [655, 543, 660, 535, 665, 543]  # Mouth
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                  :smooth=>true, :tag=>'I17_')
-      xy = box(654, 530, 4)  # Left eye
-      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
-                  :tag=>'I17_')
-      xy = box(666, 530, 4)  # Right eye
-      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
-                  :tag=>'I17_')
-
-      @canvas.move('I17_', 0, -20) # Move face up
-      xy = [652, 528, 652, 554]    # Front leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-      xy = [670, 528, 670, 554]    # 2nd front leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-
-      xy = [ # Body
-        675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525,
-        716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527,
-        668, 527, 668, 527, 675, 522, 676, 517, 677, 512
-      ]
-      TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill),
-                     :outline=>@C['fg'], :width=>3, :smooth=>true,
-                     :tag=>'I17_')
-      xy = [716, 514, 716, 554]  # Back leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-      xy = [694, 532, 694, 554]  # 2nd back leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-      xy = [715, 514, 718, 506, 719, 495, 716, 488]  # Tail
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                  :smooth=>true, :tag=>'I17_')
-
-      @canvas.raise('I17w')       # Make whiskers visible
-      @canvas.move('I17_', -5, 0) # Move away from the wall a bit
-      return 2
-    end
-    return 0
-  end
-
-  # Sling shot
-  def draw18
-    color = @C['18']
-    xy = [721, 506, 627, 506]  # Sling hold
-    TkcLine.new(@canvas, xy, :width=>4, :fill=>@C['fg'], :tag=>'I18')
-
-    xy = [607, 500, 628, 513]  # Sling rock
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :tag=>'I18a')
-
-    xy = [526, 513, 606, 507, 494, 502]  # Sling band
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>4, :tag=>'I18b')
-    xy = [485, 490, 510, 540, 510, 575, 510, 540, 535, 491]  # Sling
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>6)
-  end
-
-  def move18(step = nil)
-    step = get_step(18, step)
-
-    pos = [
-      [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x],
-      [136, 506], [16, 506], [-100, -100]
-    ]
-
-    b = []
-    b[0] = [490, 502, 719, 507, 524, 512]  # Band collapsing
-    b[1] = [
-      491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525,
-      553, 536, 538, 534, 532, 519, 529, 499
-    ]
-    b[2] = [
-      491, 503, 508, 563, 542, 533, 551, 526, 561, 539, 549, 550, 530, 500
-    ]
-    b[3] = [
-      491, 503, 508, 563, 530, 554, 541, 562, 525, 568, 519, 544, 530, 501
-    ]
-
-    return 0 if step >= pos.length
-
-    if step == 0
-      @canvas.delete('I18')
-      @canvas.itemconfigure('I18b', :smooth=>true)
-    end
-    if b[step]
-      @canvas.coords('I18b', b[step])
-    end
-
-    where = pos[step]
-    move_abs('I18a', where)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Water pipe
-  def draw19
-    color = @C['19']
-    xx = [[249, 181], [155, 118], [86, 55], [22, 0]]
-    xx.each{|x1, x2|
-      TkcRectangle.new(@canvas, x1, 453, x2, 467,
-                       :fill=>color, :outline=>'', :tag=>'I19')
-      TkcLine.new(@canvas, x1, 453, x2, 453,
-                  :fill=>@C['fg'], :width=>1) # Pipe top
-      TkcLine.new(@canvas, x1, 467, x2, 467,
-                  :fill=>@C['fg'], :width=>1) # Pipe bottom
-    }
-    @canvas.raise('I11i')
-
-    xy = box(168, 460, 16)  # Bulge by the joint
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
-               :start=>21, :extent=>136)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
-               :start=>-21, :extent=>-130)
-
-    xy = [249, 447, 255, 473]  # First joint 26x6
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-
-    xy = box(257, 433, 34)     # Bend up
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:pie, :start=>0, :extent=>-91)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>-90)
-    xy = box(257, 433, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
-               :style=>:pie, :start=>0, :extent=>-92)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>-90)
-    xy = box(257, 421, 34)     # Bend left
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:pie, :start=>0, :extent=>91)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>90)
-    xy = box(257, 421, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
-               :style=>:pie, :start=>0, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>90)
-    xy = box(243, 421, 34)     # Bend down
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:pie, :start=>90, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>90, :extent=>90)
-    xy = box(243, 421, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
-               :style=>:pie, :start=>90, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>90, :extent=>90)
-
-    xy = [270, 427, 296, 433]  # 2nd joint bottom
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [270, 421, 296, 427]  # 2nd joint top
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [249, 382, 255, 408]  # Third joint right
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [243, 382, 249, 408]  # Third joint left
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [203, 420, 229, 426]  # Last joint
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-
-    xy = box(168, 460, 6)      # Handle joint
-    TkcOval.new(@canvas, xy, :fill=>@C['fg'], :outline=>'', :tag=>'I19a')
-    xy = [168, 460, 168, 512]  # Handle bar
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>5, :tag=>'I19b')
-  end
-
-  def move19(step = nil)
-    step = get_step(19, step)
-
-     angles = [30, 30, 30]
-    return 2 if step == angles.length
-    ox, oy = centroid('I19a')
-    rotate_item('I19b', ox, oy, angles[step])
-
-    return 1
-  end
-
-  # Water pouring
-  def draw20
-    # do nothing
-  end
-
-  def move20(step = nil)
-    step = get_step(20, step)
-
-    pos  = [451, 462, 473, 484, 496, 504, 513, 523, 532]
-    freq  = [20,  40,  40,  40,  40,  40,  40,  40,  40]
-    pos = [
-      [451, 20], [462, 40], [473, 40], [484, 40], [496, 40],
-      [504, 40], [513, 40], [523, 40], [532, 40, :x]
-    ]
-    return 0 if step >= pos.length
-
-    @canvas.delete('I20')
-    where = pos[step]
-    y, f = where
-    h20(y, f)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  def h20(y, f)
-    color = @C['20']
-    @canvas.delete('I20')
-
-    sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'],
-         :width=>3, :fill=>color, :smooth=>true)
-    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
-                :fill=>color, :smooth=>1, :tag=>['I20', 'I20a'])
-    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
-                :fill=>color, :smooth=>1, :tag=>['I20', 'I20b'])
-    @canvas.move('I20a', 8, 0)
-    @canvas.move('I20b', 16, 0)
-  end
-
-  # Bucket
-  def draw21
-    color = @C['21']
-    xy = [217, 451, 244, 490]  # Right handle
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21_a')
-    xy = [201, 467, 182, 490]  # Left handle
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21_a')
-
-    xy = [245, 490, 237, 535]  # Right side
-    xy2 = [189, 535, 181, 490] # Left side
-    TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'',
-                   :tag=>['I21', 'I21f'])
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21')
-    TkcLine.new(@canvas, xy2, :fill=>@C['fg'], :width=>2, :tag=>'I21')
-
-    xy = [182, 486, 244, 498]  # Top
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2,
-                :tag=>['I21', 'I21f'])
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2,
-                :tag=>['I21', 'I21t'])
-    xy = [189, 532, 237, 540]  # Bottom
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2,
-                :tag=>['I21', 'I21b'])
-  end
-
-  def move21(step = nil)
-    step = get_step(21, step)
-
-    numsteps = 30
-    return 0 if step >= numsteps
-
-    x1, y1, x2, y2 = @canvas.coords('I21b')
-    # lx1, ly1, lx2, ly2 = @canvas.coords('I21t')
-    lx1, ly1, lx2, ly2 = [183, 492, 243, 504]
-
-    f = step / numsteps.to_f
-    y2 = y2 - 3
-    xx1 = x1 + (lx1 - x1) * f
-    yy1 = y1 + (ly1 - y1) * f
-    xx2 = x2 + (lx2 - x2) * f
-    yy2 = y2 + (ly2 - y2) * f
-
-    @canvas.itemconfigure('I21b', :fill=>@C['20'])
-    @canvas.delete('I21w')
-    TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1,
-                   :tag=>['I21', 'I21w'], :outline=>'', :fill=>@C['20'])
-    @canvas.lower('I21w', 'I21')
-    @canvas.raise('I21b')
-    @canvas.lower('I21f')
-
-    return((step == numsteps - 1)? 3: 1)
-  end
-
-  # Bucket drop
-  def draw22
-    # do nothing
-  end
-
-  def move22(step = nil)
-    step = get_step(22, step)
-    pos = [[213, 513], [213, 523], [213, 543, :x], [213, 583], [213, 593]]
-
-    @canvas.itemconfigure('I21f', :fill=>@C['22']) if step == 0
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I21', where)
-    h20(where[1], 40)
-    @canvas.delete('I21_a')  # Delete handles
-
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Blow dart
-  def draw23
-    color  = @C['23a']
-    color2 = @C['23b']
-    color3 = @C['23c']
-
-    xy = [185, 623, 253, 650]  # Block
-    TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'],
-                     :width=>2, :tag=>'I23a')
-    xy = [187, 592, 241, 623]  # Balloon
-    TkcOval.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b',
-               :style=>:arc, :start=>12, :extent=>336)
-    xy = [239, 604, 258, 589, 258, 625, 239, 610]  # Balloon nozzle
-    TkcPolygon.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23b')
-
-    xy = [285, 611, 250, 603]  # Dart body
-    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'],
-                :width=>3, :tag=>'I23d')
-    xy = [249, 596, 249, 618, 264, 607, 249, 596]  # Dart tail
-    TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'],
-                   :width=>3, :tag=>'I23d')
-    xy = [249, 607, 268, 607]  # Dart detail
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
-    xy = [285, 607, 305, 607]  # Dart needle
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
-  end
-
-  def move23(step = nil)
-    step = get_step(23, step)
-
-    pos = [
-      [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607],
-      [487, 607], [587, 607], [687, 607], [787, 607], [-100, -100]
-    ]
-
-    return 0 if step >= pos.length
-    if step <= 1
-      ox, oy = anchor('I23a', :n)
-      @canvas.scale('I23b', ox, oy, 0.9, 0.5)
-    end
-    where = pos[step]
-    move_abs('I23d', where)
-
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Balloon
-  def draw24
-    color = @C['24a']
-    xy = [366, 518, 462, 665]  # Balloon
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
-                :width=>3, :tag=>'I24')
-    xy = [414, 666, 414, 729]  # String
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I24')
-    xy = [410, 666, 404, 673, 422, 673, 418, 666]  # Nozzle
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
-                   :width=>3, :tag=>'I24')
-
-    xy = [387, 567, 390, 549, 404, 542]  # Reflections
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-    xy = [395, 568, 399, 554, 413, 547]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-    xy = [403, 570, 396, 555, 381, 553]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-    xy = [408, 564, 402, 547, 386, 545]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-  end
-
-  def move24(step = nil)
-    step = get_step(24, step)
-
-    return 0 if step > 4
-    return 2 if step == 4
-
-    if step == 0
-      @canvas.delete('I24')  # Exploding balloon
-      xy = [
-        347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594,
-        259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738,
-        436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613,
-        548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508,
-        431, 441, 431, 440, 400, 502, 347, 465, 347, 465
-      ]
-      TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'],
-                     :outline=>@C['24a'], :width=>10, :smooth=>true)
-      msg = Tk.subst(@S['message'].value)
-      TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'],
-                  :justify=>:center, :font=>['Times Roman', 18, :bold])
-      return 1
-    end
-
-    @canvas.itemconfigure('I24t', :font=>['Times Roman', 18 + 6*step, :bold])
-    @canvas.move('I24', 0, -60)
-    ox, oy = centroid('I24')
-    @canvas.scale('I24', ox, oy, 1.25, 1.25)
-    return 1
-  end
-
-  # Displaying the message
-  def move25(step = nil)
-    step = get_step(25, step)
-
-    if step == 0
-      @XY['25'] = Tk::Clock.clicks(:miliseconds)
-      return 1
-    end
-    elapsed = Tk::Clock.clicks(:miliseconds) - @XY['25']
-    return 1 if elapsed < 5000
-    return 2
-  end
-
-  # Collapsing balloon
-  def move26(step = nil)
-    step = get_step(26, step)
-
-    if step >= 3
-      @canvas.delete('I24', 'I26')
-      TkcText.new(@canvas, 430, 740, :anchor=>:s, :tag=>'I26',
-                  :text=>'click to continue',
-                  :font=>['Times Roman', 24, :bold])
-      @canvas.bind('1', proc{reset})
-      return 4
-    end
-
-    ox, oy = centroid('I24')
-    @canvas.scale('I24', ox, oy, 0.8, 0.8)
-    @canvas.move('I24', 0, 60)
-    @canvas.itemconfigure('I24t', :font=>['Times Roman', 30 - 6*step, :bold])
-    return 1
-  end
-
-  ################################################################
-  #
-  # Helper functions
-  #
-  def box(x, y, r)
-    [x - r, y - r, x + r, y + r]
-  end
-
-  def move_abs(item, xy)
-    x, y = xy
-    ox, oy = centroid(item)
-    dx = x - ox
-    dy = y - oy
-    @canvas.move(item, dx, dy)
-  end
-
-  def rotate_item(item, ox, oy, beta)
-    xy = @canvas.coords(item)
-    xy2 = []
-    0.step(xy.length - 1, 2){|idx|
-      x, y = xy[idx, 2]
-      xy2.concat(rotate_c(x, y, ox, oy, beta))
-    }
-    @canvas.coords(item, xy2)
-  end
-
-  def rotate_c(x, y, ox, oy, beta)
-    # rotates vector (ox,oy)->(x,y) by beta degrees clockwise
-
-    x -= ox    # Shift to origin
-    y -= oy
-
-    beta = beta * Math.atan(1) * 4 / 180.0        # Radians
-    xx = x * Math.cos(beta) - y * Math.sin(beta)  # Rotate
-    yy = x * Math.sin(beta) + y * Math.cos(beta)
-
-    xx += ox  # Shift back
-    yy += oy
-
-    [xx, yy]
-  end
-
-  def reset
-    draw_all
-    @canvas.bind_remove('1')
-    @S['mode'].value = :MSTART
-    @S['active'] = [0]
-  end
-
-  # Each Move## keeps its state info in STEP, this retrieves and increments it
-  def get_step(who, step)
-    if step
-      @STEP[who] = step
-    else
-      if !@STEP.exist?(who) || @STEP[who] == ""
-        @STEP[who] = 0
-      else
-        @STEP[who] += 1
-      end
-    end
-    @STEP[who]
-  end
-
-  def reset_step
-    @S['cnt'].value = 0
-    @STEP.keys.each{|k| @STEP[k] = ''}
-  end
-
-  def sine(xy0, amp, freq, opts = {})
-    x0, y0, x1, y1 = xy0
-    step = 2
-    xy = []
-    if y0 == y1  # Horizontal
-      x0.step(x1, step){|x|
-        beta = (x - x0) * 2 * Math::PI / freq
-        y = y0 + amp * Math.sin(beta)
-        xy << x << y
-      }
-    else
-      y0.step(y1, step){|y|
-        beta = (y - y0) * 2 * Math::PI / freq
-        x = x0 + amp * Math.sin(beta)
-        xy << x << y
-      }
-    end
-    TkcLine.new(@canvas, xy, opts)
-  end
-
-  def round_rect(xy, radius, opts={})
-    x0, y0, x3, y3 = xy
-    r = @canvas.winfo_pixels(radius)
-    d = 2 * r
-
-    # Make sure that the radius of the curve is less than 3/8 size of the box!
-    maxr = 0.75
-    if d > maxr * (x3 - x0)
-      d = maxr * (x3 - x0)
-    end
-    if d > maxr * (y3 - y0)
-      d = maxr * (y3 - y0)
-    end
-
-    x1 = x0 + d
-    x2 = x3 - d
-    y1 = y0 + d
-    y2 = y3 - d
-
-    xy = [x0, y0, x1, y0, x2, y0, x3, y0, x3, y1, x3, y2]
-    xy.concat([x3, y3, x2, y3, x1, y3, x0, y3, x0, y2, x0, y1])
-    return xy
-  end
-
-  def round_poly(canv, xy, radii, opts)
-    lenXY = xy.length
-    lenR = radii.length
-    if lenXY != 2*lenR
-      raise "wrong number of vertices and radii"
-    end
-
-    knots = []
-    x0 = xy[-2]; y0 = xy[-1]
-    x1 = xy[0];  y1 = xy[1]
-    xy << xy[0] << xy[1]
-
-    0.step(lenXY - 1, 2){|i|
-      radius = radii[i/2]
-      r = canv.winfo_pixels(radius)
-
-      x2 = xy[i+2];  y2 = xy[i+3]
-      z = _round_poly2(x0, y0, x1, y1, x2, y2, r)
-      knots.concat(z)
-
-      x0 = x1;  y0 = y1
-      x1 = x2;  y1 = y2
-    }
-    TkcPolygon.new(canv, knots, {:smooth=>true}.update(opts))
-  end
-
-  def _round_poly2(x0, y0, x1, y1, x2, y2, radius)
-    d = 2 * radius
-    maxr = 0.75
-
-    v1x = x0 - x1
-    v1y = y0 - y1
-    v2x = x2 - x1
-    v2y = y2 - y1
-
-    vlen1 = Math.sqrt(v1x*v1x + v1y*v1y)
-    vlen2 = Math.sqrt(v2x*v2x + v2y*v2y)
-
-    if d > maxr * vlen1
-      d = maxr * vlen1
-    end
-    if d > maxr * vlen2
-      d = maxr * vlen2
-    end
-
-    xy = []
-    xy << (x1 + d * v1x / vlen1) << (y1 + d * v1y / vlen1)
-    xy << x1 << y1
-    xy << (x1 + d * v2x / vlen2) << (y1 + d * v2y / vlen2)
-
-    return xy
-  end
-
-  def sparkle(oxy, tag)
-    xy = [
-      [299, 283], [298, 302], [295, 314], [271, 331],
-      [239, 310], [242, 292], [256, 274], [281, 273]
-    ]
-    xy.each{|x, y|
-      TkcLine.new(@canvas, 271, 304, x, y,
-                  :fill=>'white', :width=>3, :tag=>tag)
-    }
-    move_abs(tag, oxy)
-  end
-
-  def centroid(item)
-    anchor(item, :c)
-  end
-
-  def anchor(item, where)
-    x1, y1, x2, y2 = @canvas.bbox(item)
-    case(where)
-    when :n
-      y = y1
-    when :s
-      y = y2
-    else
-      y = (y1 + y2) / 2.0
-    end
-    case(where)
-    when :w
-      x = x1
-    when :e
-      x = x2
-    else
-      x = (x1 + x2) / 2.0
-    end
-    return [x, y]
-  end
-end
-
-TkGoldberg_Demo.new(base_frame)
diff --git a/ext/tk/sample/demos-en/hello b/ext/tk/sample/demos-en/hello
deleted file mode 100644
index 5e86ad7e3e..0000000000
--- a/ext/tk/sample/demos-en/hello
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-
-#unless /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
-#  require 'tkencoding'
-#end
-
-TkButton.new(nil,
-	'text'=>"Hello Ruby world!",
-	'font'=>TkFont.new('k14'),
-	'command'=>proc{print "Hello Ruby world!\n"; exit}
-).pack
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/hscale.rb b/ext/tk/sample/demos-en/hscale.rb
deleted file mode 100644
index e660216967..0000000000
--- a/ext/tk/sample/demos-en/hscale.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require "tkcanvas"
-
-if defined?($hscale_demo) && $hscale_demo
-  $hscale_demo.destroy
-  $hscale_demo = nil
-end
-
-$hscale_demo = TkToplevel.new {|w|
-  title("Horizontal Scale Demonstration")
-  iconname("hscale")
-}
-positionWindow($hscale_demo)
-
-base_frame = TkFrame.new($hscale_demo).pack(:fill=>:both, :expand=>true)
-
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '3.5i'
-  justify 'left'
-  text "An arrow and a horizontal scale are displayed below.  If you click or drag mouse button 1 in the scale, you can change the length of the arrow."
-}
-msg.pack('side'=>'top')
-
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc {
-      tmppath = $hscale_demo
-      $hscale_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc { showCode 'hscale' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-def setWidth(w, width)
-  width = width + 21
-  x2 = width - 30
-  if x2 < 21
-    x2 = 21
-  end
-  w.coords 'poly',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-  w.coords 'line',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-end
-
-TkFrame.new(base_frame) {|frame|
-  canvas = TkCanvas.new(frame) {|c|
-    width 50
-    height 50
-    bd 0
-    highlightthickness 0
-    TkcPolygon.new(c, '0', '0', '1', '1', '2', '2') {
-      fill 'DeepSkyBlue'
-      tags 'poly'
-    }
-    TkcLine.new(c, '0', '0', '1', '1', '2', '2', '0', '0') {
-      fill 'black'
-      tags 'line'
-    }
-  }.pack('side'=>'top', 'expand'=>'yes', 'anchor'=>'s', 'fill'=>'x', 'padx'=>'15')
-  scale = TkScale.new(frame) {
-    orient 'horizontal'
-    length 284
-    from 0
-    to 250
-    command proc{|value| setWidth(canvas, value)}
-    tickinterval 50
-  }.pack('side'=>'bottom', 'expand'=>'yes', 'anchor'=>'n')
-  scale.set 75
-}.pack('side'=>'top', 'fill'=>'x')
diff --git a/ext/tk/sample/demos-en/icon.rb b/ext/tk/sample/demos-en/icon.rb
deleted file mode 100644
index bab40da214..0000000000
--- a/ext/tk/sample/demos-en/icon.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-# icon.rb
-#
-# This demonstration script creates a toplevel window containing
-# buttons that display bitmaps instead of text.
-#
-# iconic button widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($icon_demo) && $icon_demo
-  $icon_demo.destroy
-  $icon_demo = nil
-end
-
-# demo toplevel widget
-$icon_demo = TkToplevel.new {|w|
-  title("Iconic Button Demonstration")
-  iconname("icon")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($icon_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "This window shows three ways of using bitmaps or images in radiobuttons and checkbuttons.  On the left are two radiobuttons, each of which displays a bitmap and an indicator.  In the middle is a checkbutton that displays a different image depending on whether it is selected or not.  On the right is a checkbutton that displays a single bitmap but changes its background color to indicate whether or not it is selected. (This change is visible when the mouse pointer is not directy over the button.)"
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $icon_demo
-      $icon_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'icon'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# image
-flagup = \
-TkBitmapImage.new('file'=>[$demo_dir,'..',
-                           'images','flagup.xbm'].join(File::Separator),
-                  'maskfile'=>\
-                  [$demo_dir,'..','images','flagup.xbm'].join(File::Separator))
-flagdown = \
-TkBitmapImage.new('file'=>[$demo_dir,'..',
-                           'images','flagdown.xbm'].join(File::Separator),
-                  'maskfile'=>\
-                  [$demo_dir,'..',
-                    'images','flagdown.xbm'].join(File::Separator))
-
-# create variable
-letters = TkVariable.new
-
-# frame
-TkFrame.new(base_frame, 'borderwidth'=>10){|w|
-  TkFrame.new(w) {|f|
-    # TkRadioButton.new(f){
-    Tk::RadioButton.new(f){
-      bitmap '@' + [$demo_dir,'..',
-                    'images','letters.xbm'].join(File::Separator)
-      variable letters
-      value 'full'
-    }.pack('side'=>'top', 'expand'=>'yes')
-
-    # TkRadioButton.new(f){
-    Tk::RadioButton.new(f){
-      bitmap '@' + [$demo_dir,'..',
-                     'images','noletter.xbm'].join(File::Separator)
-      variable letters
-      value 'empty'
-    }.pack('side'=>'top', 'expand'=>'yes')
-
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-  # TkCheckButton.new(w) {
-  Tk::CheckButton.new(w) {
-    image flagdown
-    selectimage flagup
-    indicatoron 0
-    selectcolor self['background']
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-  # TkCheckButton.new(w) {
-  Tk::CheckButton.new(w) {
-    bitmap '@' + [$demo_dir,'..',
-                   'images','letters.xbm'].join(File::Separator)
-    indicatoron 0
-    selectcolor 'SeaGreen1'
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-}.pack('side'=>'top')
-
diff --git a/ext/tk/sample/demos-en/image1.rb b/ext/tk/sample/demos-en/image1.rb
deleted file mode 100644
index 233cb963d1..0000000000
--- a/ext/tk/sample/demos-en/image1.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-## image1.rb
-#
-# This demonstration script displays two image widgets.
-#
-# two image widgets demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($image1_demo) && $image1_demo
-  $image1_demo.destroy
-  $image1_demo = nil
-end
-
-# demo toplevel widget
-$image1_demo = TkToplevel.new {|w|
-  title('Image Demonstration #1')
-  iconname("Image1")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($image1_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This demonstration displays two images, each in a separate label widget."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $image1_demo
-      $image1_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'image1'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# image
-image1a = \
-TkPhotoImage.new('file'=>[$demo_dir,'..',
-                          'images','earth.gif'].join(File::Separator))
-image1b = \
-TkPhotoImage.new('file'=>[$demo_dir,'..',
-                          'images','earthris.gif'].join(File::Separator))
-
-# label
-#[ TkLabel.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-#  TkLabel.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
-#].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
-[ Tk::Label.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-  Tk::Label.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
-].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
-
diff --git a/ext/tk/sample/demos-en/image2.rb b/ext/tk/sample/demos-en/image2.rb
deleted file mode 100644
index 13098af1b6..0000000000
--- a/ext/tk/sample/demos-en/image2.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-# image2.rb
-#
-# This demonstration script creates a simple collection of widgets
-# that allow you to select and view images in a Tk label.
-#
-# widget demo 'load image' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($image2_demo) && $image2_demo
-  $image2_demo.destroy
-  $image2_demo = nil
-end
-
-# demo toplevel widget
-$image2_demo = TkToplevel.new {|w|
-  title('Image Demonstration #2')
-  iconname("Image2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($image2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This demonstration allows you to view images using a Tk \"photo\" image.  First type a directory name in the listbox, then press Enter to load the directory into the listbox.  Then double-click on a file name in the listbox to see that image."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $image2_demo
-      $image2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'image2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# create variable
-$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
-
-# image
-$image2a = TkPhotoImage.new
-
-#
-TkLabel.new(base_frame, 'text'=>'Directory:')\
-.pack('side'=>'top', 'anchor'=>'w')
-
-image2_e = TkEntry.new(base_frame) {
-  width 30
-  textvariable $dirName
-}.pack('side'=>'top', 'anchor'=>'w')
-
-TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20)\
-.pack('side'=>'top', 'anchor'=>'w')
-
-TkLabel.new(base_frame, 'text'=>'File:')\
-.pack('side'=>'top', 'anchor'=>'w')
-
-TkFrame.new(base_frame){|w|
-  s = TkScrollbar.new(w)
-  l = TkListbox.new(w) {
-    width 20
-    height 10
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| l.yview(*args)})
-  l.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
-  s.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
-  #l.insert(0,'earth.gif', 'earthris.gif', 'mickey.gif', 'teapot.ppm')
-  l.insert(0,'earth.gif', 'earthris.gif', 'teapot.ppm')
-  l.bind('Double-1', proc{|x,y| loadImage $image2a,l,x,y}, '%x %y')
-
-  image2_e.bind 'Return', proc{loadDir l}
-
-}.pack('side'=>'top', 'anchor'=>'w')
-
-# image
-[ TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20),
-  TkLabel.new(base_frame, 'text'=>'Image:'),
-  TkLabel.new(base_frame, 'image'=>$image2a)
-].each{|w| w.pack('side'=>'top', 'anchor'=>'w')}
-
-#
-def loadDir(w)
-  w.delete(0,'end')
-  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
-    w.insert('end',File.basename(f))
-  }
-end
-
-def loadImage(img,w,x,y)
-  img.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
-end
-
diff --git a/ext/tk/sample/demos-en/image3.rb b/ext/tk/sample/demos-en/image3.rb
deleted file mode 100644
index edb6d231bf..0000000000
--- a/ext/tk/sample/demos-en/image3.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-# image3.rb
-#
-# This demonstration script creates a simple collection of widgets
-# that allow you to select and view images in a Tk label.
-#
-# widget demo 'load image' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($image3_demo) && $image3_demo
-  $image3_demo.destroy
-  $image3_demo = nil
-end
-
-# demo toplevel widget
-$image3_demo = TkToplevel.new {|w|
-  title('Image Demonstration #3')
-  iconname("Image3")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
-
-#
-def loadDir3(w)
-  w.delete(0,'end')
-  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
-    w.insert('end',File.basename(f))
-  }
-end
-
-# selectAndLoadDir3 --
-# This procedure pops up a dialog to ask for a directory to load into
-# the listobx and (if the user presses OK) reloads the directory
-# listbox from the directory named in the demo's entry.
-#
-# Arguments:
-# w -                   Name of the toplevel window of the demo.
-def selectAndLoadDir3(w, lbox)
-  dir = Tk.chooseDirectory(:initialdir=>$dirName.value,
-                           :parent=>w, :mustexist=>true)
-  if dir.length > 0
-    $dirName.value = dir
-    loadDir3(lbox)
-  end
-end
-
-def loadImage(w,x,y)
-  $image3a.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
-end
-
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This demonstration allows you to view images using a Tk \"photo\" image.  First type a directory name in the listbox, then type Return to load the directory into the listbox.  Then double-click on a file name in the listbox to see that image."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $image3_demo
-      $image3_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'image3'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# variable
-$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
-
-# image
-begin
-  $image3a.delete
-rescue
-end
-$image3a = TkPhotoImage.new
-
-#
-image3_f = TkFrame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-image3_df = TkLabelFrame.new(base_frame, :text=>'Directory:')
-
-image3_ff = TkLabelFrame.new(base_frame, :text=>'File:',
-                             :padx=>'2m', :pady=>'2m')
-image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
-  pack(:side=>:left, :fill=>:y, :expand=>true)
-  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y,
-                                             :expand=>true))
-  insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
-  bind('Double-1', proc{|x,y| loadImage(self, x, y)}, '%x %y')
-}
-
-image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
-  pack(:side=>:left, :fill=>:both, :padx=>'2m', :pady=>'2m', :expand=>true)
-  bind('Return', proc{loadDir3(image3_lbx)})
-}
-
-TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"Select Dir.",
-             :command=>proc{selectAndLoadDir3(image3_ent, image3_lbx)}) {
-  pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
-}
-
-image3_if = TkLabelFrame.new(base_frame, :text=>'Image:') {|f|
-  # TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
-  Tk::Label.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
-}
-
-Tk.grid(image3_df,  '-',
-        :sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-Tk.grid(image3_ff, image3_if,
-        :sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-TkGrid.columnconfigure(image3_f, 1, :weight=>1)
-
diff --git a/ext/tk/sample/demos-en/items.rb b/ext/tk/sample/demos-en/items.rb
deleted file mode 100644
index 01a4072cb7..0000000000
--- a/ext/tk/sample/demos-en/items.rb
+++ /dev/null
@@ -1,381 +0,0 @@
-# items.rb
-#
-# This demonstration script creates a canvas that displays the
-# canvas item types.
-#
-# canvas item types widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($items_demo) && $items_demo
-  $items_demo.destroy
-  $items_demo = nil
-end
-
-# demo toplevel widget
-$items_demo = TkToplevel.new {|w|
-  title("Canvas Item Demonstration")
-  iconname("Items")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($items_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "This window contains a canvas widget with examples of the various kinds of items supported by canvases.  The following operations are supported:\n  Button-1 drag:\tmoves item under pointer.\n  Button-2 drag:\trepositions view.\n  Button-3 drag:\tstrokes out area.\n  Ctrl+f:\t\tprints items under area."
-}.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $items_demo
-      $items_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'items'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-cvs = nil
-TkFrame.new(base_frame) {|cf|
-  # canvas
-  cvs = TkCanvas.new(cf) {|c|
-    focus
-    scrollregion '0c 0c 30c 24c'
-    width  '15c'
-    height '10c'
-    relief 'sunken'
-    borderwidth 2
-
-    hs = TkScrollbar.new(cf) {|s|
-      orient 'horizontal'
-      command proc{|*args| c.xview(*args)}
-      c.xscrollcommand proc{|first,last| s.set first,last}
-    }
-
-    vs = TkScrollbar.new(cf) {|s|
-      command proc{|*args| c.yview(*args)}
-      c.yscrollcommand proc{|first,last| s.set first,last}
-    }
-
-    if $tk_version =~ /^4\.[01]/
-      hs.pack('side'=>'bottom', 'fill'=>'x')
-      vs.pack('side'=>'right', 'fill'=>'y')
-      c.pack('in'=>cf, 'expand'=>'yes', 'fill'=>'both')
-
-    else
-      c.grid('in'=>cf, 'row'=>0, 'column'=>0,
-             'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      vs.grid('row'=>0, 'column'=>1,
-              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      hs.grid('row'=>1, 'column'=>0,
-              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
-      TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
-
-    end
-
-  }
-}.pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-# Display a 3x3 rectangular grid
-TkcRectangle.new(cvs, '0c', '0c', '30c', '24c', 'width'=>2)
-TkcLine.new(cvs, '0c', '8c', '30c', '8c', 'width'=>2)
-TkcLine.new(cvs, '0c', '16c', '30c', '16c', 'width'=>2)
-TkcLine.new(cvs, '10c', '0c', '10c', '24c', 'width'=>2)
-TkcLine.new(cvs, '20c', '0c', '20c', '24c', 'width'=>2)
-
-if $tk_version =~ /^4.*/
-  font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-  font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
-else
-  font1 = 'Helvetica 12'
-  font2 = 'Helvetica 24 bold'
-end
-if TkWinfo.depth($root).to_i > 1
-  blue   = 'DeepSkyBlue3'
-  red    = 'red'
-  bisque = 'bisque3'
-  green  = 'SeaGreen3'
-else
-  blue   = 'black'
-  red    = 'black'
-  bisque = 'black'
-  green  = 'black'
-end
-
-# tag
-$tag_item = TkcGroup.new(cvs)
-
-# Set up demos within each of the areas of the grid.
-TkcText.new(cvs, '5c', '.2c', 'text'=>'Lines', 'anchor'=>'n')
-TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c',
-            'width'=>2, 'fill'=>blue, 'capstyle'=>'butt',
-            'join'=>'miter', 'tags'=>$tag_item )
-TkcLine.new(cvs, '4.67c','1c','4.67c','4c', 'arrow'=>'last', 'tags'=>$tag_item)
-TkcLine.new(cvs, '6.33c','1c','6.33c','4c', 'arrow'=>'both', 'tags'=>$tag_item)
-TkcLine.new(cvs, '5c','6c','9c','6c','9c','1c','8c','1c','8c','4.8c','8.8c',
-            '4.8c','8.8c','1.2c','8.2c','1.2c','8.2c','4.6c','8.6c','4.6c',
-            '8.6c','1.4c','8.4c','1.4c','8.4c','4.4c',
-            'width'=>3, 'fill'=>red, 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c',
-            'stipple'=>'@'+[$demo_dir,'..',
-                            'images','gray25.xbm'].join(File::Separator),
-            'arrow'=>'both', 'arrowshape'=>'15 15 7', 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
-            'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round',
-            'tags'=>$tag_item )
-
-TkcText.new(cvs, '15c', '.2c',
-            'text'=>'Curves (smoothed lines)', 'anchor'=>'n')
-TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c',
-            'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
-TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c',
-            'smooth'=>'on', 'arrow'=>'both', 'width'=>3, 'tags'=>$tag_item )
-TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c',
-            '16.5c','4.5c','13.5c','7.5c','12c','6c',
-            'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round',
-            'stipple'=>'@'+[$demo_dir, '..',
-                            'images', 'gray25.xbm'].join(File::Separator),
-            'fill'=>red, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '25c', '.2c', 'text'=>'Polygons', 'anchor'=>'n')
-TkcPolygon.new(cvs, '21c','1.0c','22.5c','1.75c','24c','1.0c','23.25c','2.5c',
-               '24c','4.0c','22.5c','3.25c','21c','4.0c','21.75c','2.5c',
-               'fill'=>'green', 'outline'=>'black', 'width'=>4,
-               'tags'=>$tag_item )
-TkcPolygon.new(cvs, '25c','4c','25c','4c','25c','1c','26c','1c','27c','4c',
-               '28c','1c','29c','1c','29c','4c','29c','4c',
-               'fill'=>red, 'smooth'=>'on', 'tags'=> $tag_item)
-TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
-               '28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
-               '7.5c','22c','7.5c',
-               'stipple'=>'@' + [$demo_dir, '..',
-                                 'images', 'gray25.xbm'].join(File::Separator),
-               'outline'=>'black', 'tags'=>$tag_item )
-
-TkcText.new(cvs, '5c', '8.2c', 'text'=>'Rectangles', 'anchor'=>'n')
-TkcRectangle.new(cvs, '1c','9.5c','4c','12.5c',
-                 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c',
-                 'fill'=>green, 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
-                 'stipple'=>'@'+[$demo_dir,'..',
-                                 'images','gray25.xbm'].join(File::Separator),
-                 'fill'=>blue, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '15c', '8.2c', 'text'=>'Ovals', 'anchor'=>'n')
-TkcOval.new(cvs, '11c','9.5c','14c','12.5c',
-                 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c',
-                 'fill'=>green, 'tags'=>$tag_item )
-TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
-                 'stipple'=>'@'+[$demo_dir,'..',
-                                 'images','gray25.xbm'].join(File::Separator),
-                 'fill'=>blue, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '25c', '8.2c', 'text'=>'Text', 'anchor'=>'n')
-TkcRectangle.new(cvs, '22.4c','8.9c','22.6c','9.1c')
-TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c',
-            'text'=>'A short string of text, word-wrapped, justified left, and anchored north (at the top).  The rectangles show the anchor points for each piece of text.', 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '25.4c','10.9c','25.6c','11.1c')
-TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue,
-            'text'=>"Several lines,\n each centered\nindividually,\nand all anchored\nat the left edge.", 'justify'=>'center', 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '24.9c','13.9c','25.1c','14.1c')
-if $tk_version =~ /^4\.[01]/
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
-              'stipple'=>'@' + [$demo_dir, '..',
-                                'images', 'grey.5'].join(File::Separator),
-              'text'=>'Stippled characters', 'tags'=>$tag_item )
-else
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
-              'stipple'=>'gray50', 'text'=>'Stippled characters',
-              'tags'=>$tag_item )
-end
-
-TkcText.new(cvs, '5c', '16.2c', 'text'=>'Arcs', 'anchor'=>'n')
-TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black',
-           'start'=>45, 'extent'=>270, 'style'=>'pieslice', 'tags'=>$tag_item)
-#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
-#          'outline'=>blue, 'start'=>135, 'extent'=>270,
-#          'outlinestipple'=>'@' + ['images', 'grey.25'].join(File::Separator),
-#          'tags'=>$tag_item)
-TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
-           'outline'=>blue, 'start'=>135, 'extent'=>270,
-           'outlinestipple'=>'@'+[$demo_dir, '..',
-                                  'images','gray25.xbm'].join(File::Separator),
-           'tags'=>$tag_item)
-TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice',
-           'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90,
-           'tags'=>$tag_item)
-TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
-           'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270,
-           'tags'=>$tag_item)
-
-TkcText.new(cvs, '15c', '16.2c', 'text'=>'Bitmaps', 'anchor'=>'n')
-#TkcBitmap.new(cvs, '13c','20c',
-#             'bitmap'=>'@' + ['images', 'face'].join(File::Separator),
-#             'tags'=>$tag_item)
-TkcBitmap.new(cvs, '13c','20c',
-              'bitmap'=>'@' + [$demo_dir, '..',
-                               'images', 'face.xbm'].join(File::Separator),
-              'tags'=>$tag_item)
-#TkcBitmap.new(cvs, '17c','18.5c',
-#             'bitmap'=>'@' + ['images', 'noletters'].join(File::Separator),
-#             'tags'=>$tag_item)
-TkcBitmap.new(cvs, '17c','18.5c',
-              'bitmap'=>'@' + [$demo_dir, '..',
-                               'images', 'noletter.xbm'].join(File::Separator),
-              'tags'=>$tag_item)
-#TkcBitmap.new(cvs, '17c','21.5c',
-#             'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
-#             'tags'=>$tag_item)
-#
-TkcBitmap.new(cvs, '17c','21.5c') {
-  bitmap '@' + [$demo_dir, '..', 'images', 'letters.xbm'].join(File::Separator)
-  tags $tag_item
-}
-#TkcBitmap.new(cvs, '17c','21.5c') {
-#  bitmap '@' + ['images', 'letters'].join(File::Separator)
-#  tags $tag_item
-#}
-
-TkcText.new(cvs, '25c', '16.2c', 'text'=>'Windows', 'anchor'=>'n')
-TkButton.new(cvs) {|b|
-  text 'Press Me'
-  command proc{butPress cvs, red}
-  TkcWindow.new(cvs, '21c','18c',
-                'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
-}
-TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
-  insert 'end', 'Edit this text'
-  TkcWindow.new(cvs, '21c','21c',
-                'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
-}
-TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c',
-            'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
-  TkcWindow.new(cvs, '28.5c','17.5c',
-                'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
-}
-TkcText.new(cvs, '21c', '17.9c', 'text'=>'Button:', 'anchor'=>'sw')
-TkcText.new(cvs, '21c', '20.9c', 'text'=>'Entry:', 'anchor'=>'sw')
-TkcText.new(cvs, '28.5c', '17.4c', 'text'=>'Scale:', 'anchor'=>'s')
-
-# Set up event bindings for canvas:
-cvs.itembind($tag_item, 'Any-Enter', proc{itemEnter cvs})
-cvs.itembind($tag_item, 'Any-Leave', proc{itemLeave cvs})
-cvs.bind('2', proc{|x,y| cvs.scan_mark x,y}, '%x %y')
-cvs.bind('B2-Motion', proc{|x,y| cvs.scan_dragto x,y}, '%x %y')
-cvs.bind('3', proc{|x,y| itemMark cvs,x,y}, '%x %y')
-cvs.bind('B3-Motion', proc{|x,y| itemStroke cvs,x,y}, '%x %y')
-cvs.bind('Control-f', proc{itemsUnderArea cvs})
-cvs.bind('1', proc{|x,y| itemStartDrag cvs,x,y}, '%x %y')
-cvs.bind('B1-Motion', proc{|x,y| itemDrag cvs,x,y}, '%x %y')
-# Utility methods for highlighting the item under the pointer
-
-$restoreCmd = nil
-def itemEnter (c)
-  if TkWinfo.depth(c).to_i == 1
-    $restoreCmd = nil
-    return
-  end
-  type = c.itemtype('current')
-  if type == TkcWindow
-    $restoreCmd = nil
-    return
-  end
-  if type == TkcBitmap
-    bg = (c.itemconfiginfo('current', 'background'))[4]
-    $restoreCmd = proc{c.itemconfigure 'current', 'background', bg}
-    c.itemconfigure 'current', 'background', 'SteelBlue2'
-    return
-  end
-  fill = (c.itemconfiginfo('current', 'fill'))[4]
-  if (type == TkcRectangle || type == TkcOval || type == TkcArc) && fill == []
-    outline = (c.itemconfiginfo('current', 'outline'))[4]
-    $restoreCmd = proc{c.itemconfigure 'current', 'outline', outline}
-    c.itemconfigure 'current', 'outline', 'SteelBlue2'
-  else
-    $restoreCmd = proc{c.itemconfigure 'current', 'fill', fill}
-    c.itemconfigure 'current', 'fill', 'SteelBlue2'
-  end
-end
-
-def itemLeave(c)
-  $restoreCmd.call if $restoreCmd
-end
-
-# Utility methods for stroking out a rectangle and printing what's
-# underneath the rectangle's area.
-
-def itemMark(c,x,y)
-  $areaX1 = c.canvasx(x)
-  $areaY1 = c.canvasy(y)
-  c.delete 'area'
-end
-
-def itemStroke(c,x,y)
-  x = c.canvasx(x)
-  y = c.canvasy(y)
-  if $areaX1 != x && $areaY1 != y
-    c.delete 'area'
-    c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y,
-                                              '-outline', 'black')
-    $areaX2 = x
-    $areaY2 = y
-  end
-end
-
-def itemsUnderArea(c)
-  area = c.find_withtag('area')
-  items = []
-  c.find_enclosed($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
-    items.push(i) if i.gettags.include?($tag_item)
-  }
-  print "Items enclosed by area: #{items.inspect}\n"; STDOUT.flush
-  items.clear
-  c.find_overlapping($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
-    items.push(i) if i.gettags.include?($tag_item)
-  }
-  print "Items overlapping area: #{items.inspect}\n"; STDOUT.flush
-end
-
-$areaX1 = 0
-$areaY1 = 0
-$areaX2 = 0
-$areaY2 = 0
-
-# Utility methods to support dragging of items.
-
-def itemStartDrag(c,x,y)
-  $lastX = c.canvasx(x)
-  $lastY = c.canvasy(y)
-end
-
-def itemDrag(c,x,y)
-  x = c.canvasx(x)
-  y = c.canvasy(y)
-  c.move 'current', x - $lastX, y - $lastY
-  $lastX = x
-  $lastY = y
-end
-
-# Method that's invoked when the button embedded in the canvas
-# is invoked.
-
-def butPress(w,color)
-  i = TkcText.new(w, '25c', '18.1c',
-                  'text'=>'Ouch!!', 'fill'=>color, 'anchor'=>'n')
-  Tk.after(500, proc{w.delete i})
-end
diff --git a/ext/tk/sample/demos-en/ixset b/ext/tk/sample/demos-en/ixset
deleted file mode 100644
index 40a77f487c..0000000000
--- a/ext/tk/sample/demos-en/ixset
+++ /dev/null
@@ -1,333 +0,0 @@
-#!/usr/bin/env ruby
-
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-
-require 'tk'
-
-class Xsettings
-  #
-  # Button actions
-  #
-  def quit
-    @root.destroy
-  end
-
-  def ok
-    writesettings
-    quit
-  end
-
-  def cancel
-    readsettings
-    dispsettings
-  end
-
-  # apply is just "writesettings"
-
-
-  #
-  # Read current settings
-  #
-  def readsettings
-    xfd = open("|xset q", 'r')
-    xfd.readlines.each{|line|
-      fields = line.chomp.strip.split(/\s+/)
-      case fields[0]
-      when "auto"
-	if fields[1] == 'repeat:'
-	  @kbdrep = fields[2]
-	  @w_kbdrep.set(@kbdrep)
-	  @kbdcli = fields[6]
-	end
-
-      when "bell"
-	@bellvol = fields[2]
-	@bellpit = fields[5]
-	@belldur = fields[8]
-
-      when "acceleration:"
-	@mouseacc = fields[1]
-	@mousethr = fields[3]
-
-      when "prefer"
-	if fields[2] == 'yes'
-	  @screenbla = 'blank'
-	else
-	  @screenbla = 'noblank'
-	end
-	@w_screenbla.set(@screenbla)
-
-      when "timeout:"
-	@screentim = fields[1]
-	@screencyc = fields[3]
-
-      end
-    }
-
-    xfd.close
-  end
-
-  #
-  # Write settings into the X server
-  #
-  def writesettings
-    @bellvol = @w_bellvol.get
-    @bellpit = @w_bellpit.get
-    @belldur = @w_belldur.get
-
-    @kbdrep = @w_kbdrep.get
-    if @kbdrep == 'on'
-      @kbdcli = @w_kbdcli.get
-    else
-      @kbdcli = 'off'
-    end
-
-    @mouseacc = @w_mouseacc.get
-    @mousethr = @w_mousethr.get
-
-    @screentim = @w_screentim.get
-    @screencyc = @w_screencyc.get
-    @screenbla = @w_screenbla.get
-
-    system("xset \
-            b #{@bellvol} #{@bellpit} #{@belldur} \
-            c #{@kbdcli} \
-            r #{@kbdrep} \
-            m #{@mouseacc} #{@mousethr} \
-            s #{@screentim} #{@screencyc} \
-            s #{@screenbla}")
-  end
-
-  #
-  # Sends all settings to the window
-  #
-  def dispsettings
-    @w_bellvol.set(@bellvol)
-    @w_bellpit.set(@bellpit)
-    @w_belldur.set(@belldur)
-
-    @w_kbdonoff.set(@w_kbdrep.get)
-    @w_kbdcli.set(@kbdcli)
-
-    @w_mouseacc.set(@mouseacc)
-    @w_mousethr.set(@mousethr)
-
-    @w_screenblank.set(@w_screenbla.get)
-    @w_screenpat.set(@w_screenbla.get)
-
-    @w_screentim.set(@screentim)
-    @w_screencyc.set(@screencyc)
-  end
-
-  #
-  # Create all windows, and pack them
-  #
-  class LabelEntry
-    def initialize(parent, text, length)
-      @frame = TkFrame.new(parent)
-      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left','expand'=>'y')
-      @entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken') {
-	pack('side'=>'left','expand'=>'y')
-      }
-    end
-    def pack(keys)
-      @frame.pack(keys)
-    end
-    def get
-      @entry.value
-    end
-    def set(value)
-      @entry.delete(0,'end')
-      @entry.insert(0, value)
-    end
-  end
-
-  def createwindows
-    win = self
-
-    #
-    # Buttons
-    #
-    buttons = TkFrame.new(@root) {|f|
-      [ TkButton.new(f, 'command'=>proc{win.ok}, 'text'=>'Ok'),
-	TkButton.new(f, 'command'=>proc{win.writesettings}, 'text'=>'Apply'),
-	TkButton.new(f, 'command'=>proc{win.cancel}, 'text'=>'Cancel'),
-	TkButton.new(f, 'command'=>proc{win.quit}, 'text'=>'Quit') ].each{|b|
-	b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5)
-      }
-    }
-
-    #
-    # Bell settings
-    #
-    bell = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(bell, 'text'=>'Bell Settings')
-    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
-			     'tickinterval'=>20, 'orient'=>'horizontal',
-			     'label'=>"Volume (%)")
-
-    f = TkFrame.new(bell)
-    @w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6)
-    @w_bellpit.pack('side'=>'left', 'padx'=>5)
-    @w_belldur = LabelEntry.new(f, "Duration (ms)", 6)
-    @w_belldur.pack('side'=>'right', 'padx'=>5)
-
-    l.pack('side'=>'top', 'expand'=>'yes')
-    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Keyboard settings
-    #
-    kbdonoff = nil
-    kbdcli = nil
-    kbd = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(kbd, 'text'=>'Keyboard Repeat Settings')
-    f = TkFrame.new(kbd)
-    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat',
-				    'onvalue'=>'on', 'offvalue'=>'off',
-				    'variable'=>@w_kbdrep ) {
-      def self.set(value)
-	if value == 'on'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
-    }
-    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
-			 'tickinterval'=>20, 'orient'=>'horizontal',
-			 'label'=>'Click Volume (%)')
-    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes')
-    l.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
-
-    #
-    # Mouse settings
-    #
-    mouse = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(mouse, 'text'=>'Mouse Settings')
-    f = TkFrame.new(mouse)
-    @w_mouseacc = LabelEntry.new(f, 'Acceleration', 3)
-    @w_mouseacc.pack('side'=>'left')
-    @w_mousethr = LabelEntry.new(f, 'Threshold (pixels)', 3)
-    @w_mousethr.pack('side'=>'right')
-    l.pack('side'=>'top')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Screen Saver settings
-    #
-    screen = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(screen, 'text'=>'Screen-saver Settings')
-    f = TkFrame.new(screen)
-    ff1 = TkFrame.new(f)
-    [ @w_screenblank = TkRadioButton.new(ff1, 'text'=>'Blank',
-					 'relief'=>'flat',
-					 'variable'=>@w_screenbla,
-					 'value'=>'blank') {
-	def self.set(value)
-	  if value == 'blank'
-	    self.select
-	  else
-	    self.deselect
-	  end
-	end
-      },
-      @w_screenpat = TkRadioButton.new(ff1, 'text'=>'Pattern',
-				       'relief'=>'flat',
-				       'variable'=>@w_screenbla,
-				       'value'=>'noblank') {
-	def self.set(value)
-	  if value != 'blank'
-	    self.select
-	  else
-	    self.deselect
-	  end
-	end
-      }
-    ].each {|w| w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w') }
-
-    ff2 = TkFrame.new(f)
-    [ @w_screentim = LabelEntry.new(ff2, 'Timeout (s)', 5),
-      @w_screencyc = LabelEntry.new(ff2, 'Cycle (s)', 5) ].each{|w|
-      w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'e')
-    }
-
-    ff1.pack('side'=>'left')
-    ff2.pack('side'=>'left')
-
-    l.pack('side'=>'top')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Main window
-    #
-    buttons.pack('side'=>'top', 'fill'=>'both')
-    bell.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    kbd.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    mouse.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    screen.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-
-    #
-    # Let the user resize our window
-    #
-    @root.minsize(10,10)
-  end
-
-  def initialize
-    @root = TkRoot.new
-
-    @kbdrep = 'on'
-    @w_kbdrep = TkVariable.new(@kbdrep)
-    def @w_kbdrep.get
-      self.value
-    end
-    def @w_kbdrep.set(val)
-      self.value=val
-    end
-
-    @kbdcli = 0
-
-    @bellvol = 100
-    @bellpit = 440
-    @belldur = 100
-
-    @mouseacc = "3/1"
-    @mousethr = 4
-
-    @screenbla = "blank"
-    @w_screenbla = TkVariable.new(@screenbla)
-    def @w_screenbla.get
-      self.value
-    end
-    def @w_screenbla.set(val)
-      self.value=val
-    end
-
-    @screentim = 600
-    @screencyc = 600
-
-    #
-    # Listen what "xset" tells us...
-    #
-    readsettings
-
-    #
-    # Create all windows
-    #
-    createwindows
-
-    #
-    # Write xset parameters
-    #
-    dispsettings
-  end
-end
-
-Xsettings.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/ixset2 b/ext/tk/sample/demos-en/ixset2
deleted file mode 100644
index cb99c60793..0000000000
--- a/ext/tk/sample/demos-en/ixset2
+++ /dev/null
@@ -1,367 +0,0 @@
-#!/usr/bin/env ruby
-#
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-
-require 'tk'
-
-class Xsettings
-  #
-  # Button actions
-  #
-  def quit
-    @root.destroy
-  end
-
-  def ok
-    writesettings
-    quit
-  end
-
-  def cancel
-    readsettings
-    dispsettings
-    @btn_APPLY.state(:disabled)
-    @btn_CANCEL.state(:disabled)
-  end
-
-  # apply is just "writesettings"
-  def apply
-    writesettings
-    @btn_APPLY.state(:disabled)
-    @btn_CANCEL.state(:disabled)
-  end
-
-  #
-  # Read current settings
-  #
-  def readsettings
-    xfd = open("|xset q", 'r')
-    xfd.readlines.each{|line|
-      fields = line.chomp.strip.split(/\s+/)
-      case fields[0]
-      when "auto"
-	if fields[1] == 'repeat:'
-	  @kbdrep = fields[2]
-	  @w_kbdrep.set(@kbdrep)
-	  @kbdcli = fields[6]
-	end
-
-      when "bell"
-	@bellvol = fields[2]
-	@bellpit = fields[5]
-	@belldur = fields[8]
-
-      when "acceleration:"
-	@mouseacc = fields[1]
-	@mousethr = fields[3]
-
-      when "prefer"
-	if fields[2] == 'yes'
-	  @screenbla = 'blank'
-	else
-	  @screenbla = 'noblank'
-	end
-	@w_screenbla.set(@screenbla)
-
-      when "timeout:"
-	@screentim = fields[1]
-	@screencyc = fields[3]
-
-      end
-    }
-
-    xfd.close
-  end
-
-  #
-  # Write settings into the X server
-  #
-  def writesettings
-    @bellvol = @w_bellvol.get
-    @bellpit = @w_bellpit.get
-    @belldur = @w_belldur.get
-
-    @kbdrep = @w_kbdrep.get
-    if @kbdrep == 'on'
-      @kbdcli = @w_kbdcli.get
-    else
-      @kbdcli = 'off'
-    end
-
-    @mouseacc = @w_mouseacc.get
-    @mousethr = @w_mousethr.get
-
-    @screentim = @w_screentim.get
-    @screencyc = @w_screencyc.get
-    @screenbla = @w_screenbla.get
-
-    system("xset \
-            b #{@bellvol} #{@bellpit} #{@belldur} \
-            c #{@kbdcli} \
-            r #{@kbdrep} \
-            m #{@mouseacc} #{@mousethr} \
-            s #{@screentim} #{@screencyc} \
-            s #{@screenbla}")
-  end
-
-  #
-  # Sends all settings to the window
-  #
-  def dispsettings
-    @w_bellvol.set(@bellvol)
-    @w_bellpit.set(@bellpit)
-    @w_belldur.set(@belldur)
-
-    @w_kbdonoff.set(@w_kbdrep.get)
-    @w_kbdcli.set(@kbdcli)
-
-    @w_mouseacc.set(@mouseacc)
-    @w_mousethr.set(@mousethr)
-
-    @w_screenblank.set(@w_screenbla.get)
-    @w_screenpat.set(@w_screenbla.get)
-
-    @w_screentim.set(@screentim)
-    @w_screencyc.set(@screencyc)
-  end
-
-  #
-  # Create all windows, and pack them
-  #
-  class LabelEntry
-    def initialize(parent, text, length, range=[])
-      @frame = TkFrame.new(parent)
-      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left')
-      if range.size > 0
-	@entry = TkSpinbox.new(@frame, 'width'=>length, 'relief'=>'sunken',
-			       'from'=>range[0], 'to'=>range[1])
-      else
-	@entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken')
-      end
-      @entry.pack('side'=>'right','expand'=>'y', 'fill'=>'x')
-    end
-    def epath
-      @frame
-    end
-    def pack(keys)
-      @frame.pack(keys)
-    end
-    def get
-      @entry.value
-    end
-    def set(value)
-      @entry.delete(0,'end')
-      @entry.insert(0, value)
-    end
-  end
-
-  def createwindows
-    win = self
-
-    #
-    # Buttons
-    #
-    btn_frame = TkFrame.new(@root)
-    buttons = [
-      @btn_OK = TkButton.new(btn_frame, 'command'=>proc{win.ok},
-			     'default'=>'active', 'text'=>'Ok'),
-      @btn_APPLY = TkButton.new(btn_frame, 'command'=>proc{win.writesettings},
-				'default'=>'normal', 'text'=>'Apply',
-				'state'=>'disabled'),
-      @btn_CANCEL = TkButton.new(btn_frame, 'command'=>proc{win.cancel},
-				 'default'=>'normal', 'text'=>'Cancel',
-				'state'=>'disabled'),
-      @btn_QUIT = TkButton.new(btn_frame, 'command'=>proc{win.quit},
-			       'default'=>'normal', 'text'=>'Quit')
-    ]
-    buttons.each{|b| b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5) }
-
-    @root.bind('Return', proc{@btn_OK.flash; @btn_OK.invoke})
-    @root.bind('Escape', proc{@btn_QUIT.flash; @btn_QUIT.invoke})
-    @root.bind('1', proc{|w|
-		 unless buttons.index(w)
-		   @btn_APPLY.state(:normal)
-		   @btn_CANCEL.state(:normal)
-		 end
-	       }, '%W')
-    @root.bind('Key', proc{|w, k|
-		 unless buttons.index(w)
-		   case k
-		   when 'Return', 'Escape', 'Tab', /.*Shift.*/
-		     # do nothing
-		   else
-		     @btn_APPLY.state(:normal)
-		     @btn_CANCEL.state(:normal)
-		   end
-		 end
-	       }, '%W %K')
-
-    #
-    # Bell settings
-    #
-    bell = TkLabelframe.new(@root, 'text'=>'Bell Settings',
-			    'padx'=>'1.5m', 'pady'=>'1.5m')
-    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
-			     'tickinterval'=>20, 'orient'=>'horizontal',
-			     'label'=>"Volume (%)")
-
-    f = TkFrame.new(bell)
-    @w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6, [25, 20000])
-    @w_bellpit.pack('side'=>'left', 'padx'=>5)
-    @w_belldur = LabelEntry.new(f, "Duration (ms)", 6, [1, 10000])
-    @w_belldur.pack('side'=>'right', 'padx'=>5)
-
-    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Keyboard settings
-    #
-    kbdonoff = nil
-    kbdcli = nil
-    kbd = TkLabelframe.new(@root, 'text'=>'Keyboard Repeat Settings',
-			   'padx'=>'1.5m', 'pady'=>'1.5m')
-    f = TkFrame.new(kbd)
-    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat',
-				    'onvalue'=>'on', 'offvalue'=>'off',
-				    'variable'=>@w_kbdrep ) {
-      def self.set(value)
-	if value == 'on'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x', 'padx'=>[0, '1m'])
-    }
-    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
-			 'tickinterval'=>20, 'orient'=>'horizontal',
-			 'label'=>'Click Volume (%)')
-    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes',
-		   'fill'=>'x', 'padx'=>['1m', 0])
-    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
-
-    #
-    # Mouse settings
-    #
-    mouse = TkLabelframe.new(@root, 'text'=>'Mouse Settings',
-			     'padx'=>'1.5m', 'pady'=>'1.5m')
-    f = TkFrame.new(mouse)
-    @w_mouseacc = LabelEntry.new(f, 'Acceleration', 5)
-    @w_mouseacc.pack('side'=>'left', 'padx'=>[0, '1m'])
-    @w_mousethr = LabelEntry.new(f, 'Threshold (pixels)', 3, [1, 2000])
-    @w_mousethr.pack('side'=>'right', 'padx'=>['1m', 0])
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Screen Saver settings
-    #
-    screen = TkLabelframe.new(@root, 'text'=>'Screen-saver Settings',
-			     'padx'=>'1.5m', 'pady'=>'1.5m')
-    @w_screenblank = TkRadioButton.new(screen, 'text'=>'Blank',
-				       'relief'=>'flat', 'anchor'=>'w',
-				       'variable'=>@w_screenbla,
-				       'value'=>'blank') {
-      def self.set(value)
-	if value == 'blank'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-    }
-
-    @w_screenpat = TkRadioButton.new(screen, 'text'=>'Pattern',
-				     'relief'=>'flat', 'anchor'=>'w',
-				     'variable'=>@w_screenbla,
-				     'value'=>'noblank') {
-      def self.set(value)
-	if value != 'blank'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-    }
-
-    @w_screentim = LabelEntry.new(screen, 'Timeout (s)', 5, [1, 100000])
-    @w_screencyc = LabelEntry.new(screen, 'Cycle (s)', 5, [1, 100000])
-
-    Tk.grid(@w_screenblank, @w_screentim, 'sticky'=>'e')
-    Tk.grid(@w_screenpat, @w_screencyc, 'sticky'=>'e')
-    TkGrid.configure(@w_screenblank, @w_screenpat, 'sticky'=>'ew')
-
-    #
-    # Main window
-    #
-    param = {
-      'side'=>'top', 'fill'=>'both', 'expand'=>'yes',
-      'padx'=>'1m', 'pady'=>'1m'
-    }
-    btn_frame.pack('side'=>'top', 'fill'=>'both')
-    bell.pack(param)
-    kbd.pack(param)
-    mouse.pack(param)
-    screen.pack(param)
-
-    #
-    # Let the user resize our window
-    #
-    @root.minsize(10,10)
-  end
-
-  def initialize(title)
-    @root = TkRoot.new('title'=>title)
-
-    @kbdrep = 'on'
-    @w_kbdrep = TkVariable.new(@kbdrep)
-    def @w_kbdrep.get
-      self.value
-    end
-    def @w_kbdrep.set(val)
-      self.value=val
-    end
-
-    @kbdcli = 0
-
-    @bellvol = 100
-    @bellpit = 440
-    @belldur = 100
-
-    @mouseacc = "3/1"
-    @mousethr = 4
-
-    @screenbla = "blank"
-    @w_screenbla = TkVariable.new(@screenbla)
-    def @w_screenbla.get
-      self.value
-    end
-    def @w_screenbla.set(val)
-      self.value=val
-    end
-
-    @screentim = 600
-    @screencyc = 600
-
-    #
-    # Listen what "xset" tells us...
-    #
-    readsettings
-
-    #
-    # Create all windows
-    #
-    createwindows
-
-    #
-    # Write xset parameters
-    #
-    dispsettings
-  end
-end
-
-Xsettings.new(File.basename($0,'.rb'))
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/knightstour.rb b/ext/tk/sample/demos-en/knightstour.rb
deleted file mode 100644
index 6f96a5be10..0000000000
--- a/ext/tk/sample/demos-en/knightstour.rb
+++ /dev/null
@@ -1,271 +0,0 @@
-# Based on the widget demo of Tcl/Tk8.5.2
-# The following is the original copyright text.
-#----------------------------------------------------------------------------
-# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
-#
-#	Calculate a Knight's tour of a chessboard.
-#
-#	This uses Warnsdorff's rule to calculate the next square each
-#	time. This specifies that the next square should be the one that
-#	has the least number of available moves.
-#
-#	Using this rule it is possible to get to a position where
-#	there are no squares available to move into. In this implementation
-#	this occurs when the starting square is d6.
-#
-#	To solve this fault an enhancement to the rule is that if we
-#	have a choice of squares with an equal score, we should choose
-#	the one nearest the edge of the board.
-#
-#	If the call to the Edgemost function is commented out you can see
-#	this occur.
-#
-#	You can drag the knight to a specific square to start if you wish.
-#	If you let it repeat then it will choose random start positions
-#	for each new tour.
-#----------------------------------------------------------------------------
-require 'tk'
-
-class Knights_Tour
-  # Return a list of accessible squares from a given square
-  def valid_moves(square)
-    moves = []
-    [
-      [-1,-2], [-2,-1], [-2,1], [-1,2], [1,2], [2,1], [2,-1], [1,-2]
-    ].each{|col_delta, row_delta|
-      col = (square % 8) + col_delta
-      row = (square.div(8)) + row_delta
-      moves << (row * 8 + col) if row > -1 && row < 8 && col > -1 && col < 8
-    }
-    moves
-  end
-
-  # Return the number of available moves for this square
-  def check_square(square)
-    valid_moves(square).find_all{|pos| ! @visited.include?(pos)}.length
-  end
-
-  # Select the next square to move to. Returns -1 if there are no available
-  # squares remaining that we can move to.
-  def next_square(square)
-    minimum = 9
-    nxt = -1
-    valid_moves(square).each{|pos|
-      unless @visited.include?(pos)
-        cnt = check_square(pos)
-        if cnt < minimum
-          minimum = cnt
-          nxt = pos
-        elsif cnt == minimum
-          nxt = edgemost(nxt, pos)
-        end
-      end
-    }
-    nxt
-  end
-
-  # Select the square nearest the edge of the board
-  def edgemost(nxt, pos)
-    col_A = 3 - ((3.5 - nxt % 8).abs.to_i)
-    col_B = 3 - ((3.5 - pos % 8).abs.to_i)
-    row_A = 3 - ((3.5 - nxt.div(8)).abs.to_i)
-    row_B = 3 - ((3.5 - pos.div(8)).abs.to_i)
-    (col_A * row_A < col_B * row_B)? nxt : pos
-  end
-
-  # Display a square number as a standard chess square notation.
-  def _N(square)
-    '%c%d' % [(97 + square % 8), (square.div(8) + 1)]
-  end
-
-  # Perform a Knight's move and schedule the next move.
-  def move_piece(last, square)
-    @log.insert(:end, "#{@visited.length}. #{_N last} -> #{_N square}\n", '')
-    @log.see(:end)
-    @board.itemconfigure(1+last, :state=>:normal, :outline=>'black')
-    @board.itemconfigure(1+square, :state=>:normal, :outline=>'red')
-    @knight.coords(@board.coords(1+square)[0..1])
-    @visited << square
-    if (nxt = next_square(square)) != -1
-      @after_id = Tk.after(@delay.numeric){move_piece(square, nxt) rescue nil}
-    else
-      @start_btn.state :normal
-      if @visited.length == 64
-        if @initial == square
-          @log.insert :end, 'Closed tour!'
-        else
-          @log.insert :end, "Success\n", {}
-          Tk.after(@delay.numeric * 2){tour(rand(64))} if @continuous.bool
-        end
-      else
-        @log.insert :end, "FAILED!\n", {}
-      end
-    end
-  end
-
-  # Begin a new tour of the board given a random start position
-  def tour(square = nil)
-    @visited.clear
-    @log.clear
-    @start_btn.state :disabled
-    1.upto(64){|n|
-      @board.itemconfigure(n, :state=>:disabled, :outline=>'black')
-    }
-    unless square
-      square = @board.find_closest(*(@knight.coords << 0 << 65))[0].to_i - 1
-    end
-    @initial = square
-    Tk.after_idle{ move_piece(@initial, @initial) rescue nil }
-  end
-
-  def _stop
-    Tk.after_cancel(@after_id) rescue nil
-  end
-
-  def _exit
-    _stop
-    $knightstour.destroy
-  end
-
-  def set_delay(new)
-    @delay.numeric = new.to_i
-  end
-
-  def drag_start(w, x, y)
-    w.dtag('selected')
-    w.addtag('selected', :withtag, 'current')
-    @dragging = [x, y]
-  end
-
-  def drag_motion(w, x, y)
-    return unless @dragging
-    w.move('selected', x - @dragging[0], y - @dragging[1])
-    @dragging = [x, y]
-  end
-
-  def drag_end(w, x, y)
-    square = w.find_closest(x, y, 0, 65)
-    w.coords('selected', w.coords(square)[0..1])
-    w.dtag('selected')
-    @dragging = nil
-  end
-
-  def make_SeeDismiss
-    ## See Code / Dismiss
-    frame = Ttk::Frame.new($knightstour)
-    sep = Ttk::Separator.new(frame)
-    Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-    TkGrid('x',
-           Ttk::Button.new(frame, :text=>'See Code',
-                           :image=>$image['view'], :compound=>:left,
-                           :command=>proc{showCode 'knightstour'}),
-           Ttk::Button.new(frame, :text=>'Dismiss',
-                           :image=>$image['delete'], :compound=>:left,
-                           :command=>proc{
-                             $knightstour.destroy
-                             $knightstour = nil
-                           }),
-           :padx=>4, :pady=>4)
-    frame.grid_columnconfigure(0, :weight=>1)
-    frame
-  end
-
-  def create_gui(parent = nil)
-    $knightstour.destroy rescue nil
-    $knightstour = Tk::Toplevel.new(parent, :title=>"Knight's tour")
-    $knightstour.withdraw
-    base_f = Ttk::Frame.new($knightstour)
-    @board = Tk::Canvas.new(base_f, :width=>240, :height=>240)
-    @log = Tk::Text.new(base_f, :width=>12, :height=>1,
-                        :font=>'Arial 8', :background=>'white')
-    scr = @log.yscrollbar(Ttk::Scrollbar.new(base_f))
-
-    @visited = []
-    @delay = TkVariable.new(600)
-    @continuous = TkVariable.new(false)
-
-    tool_f = Ttk::Frame.new($knightstour)
-    label = Ttk::Label.new(tool_f, :text=>'Speed')
-    scale = Ttk::Scale.new(tool_f, :from=>8, :to=>2000, :variable=>@delay,
-                           :command=>proc{|n| set_delay(n)})
-    check = Ttk::Checkbutton.new(tool_f, :text=>'Repeat',
-                                 :variable=>@continuous)
-    @start_btn = Ttk::Button.new(tool_f, :text=>'Start',
-                                 :command=>proc{tour()})
-    @exit_btn = Ttk::Button.new(tool_f, :text=>'Exit',
-                                :command=>proc{_exit()})
-
-    7.downto(0){|row|
-      0.upto(7){|col|
-        if ((col & 1) ^ (row & 1)).zero?
-          fill  = 'bisque'
-          dfill = 'bisque3'
-        else
-          fill  = 'tan3'
-          dfill = 'tan4'
-        end
-        coords = [col * 30 + 4, row * 30 + 4, col * 30 + 30, row * 30 + 30]
-        @board.create(TkcRectangle, coords,
-                      :fill=>fill, :disabledfill=>dfill,
-                      :width=>2, :state=>:disabled)
-      }
-    }
-
-    @knight_font = TkFont.new(:size=>-24)
-    @knight = TkcText.new(@board, 0, 0, :font=>@knight_font,
-                          :text=>Tk::UTF8_String.new('\u265e'),
-                          :anchor=>'nw', # :tags=>'knight',
-                          :fill=>'black', :activefill=>'#600000')
-    @knight.coords(@board.coords(rand(64)+1)[0..1])
-    @knight.bind('ButtonPress-1', '%W %x %y'){|w,x,y| drag_start(w,x,y)}
-    @knight.bind('Motion', '%W %x %y'){|w,x,y| drag_motion(w,x,y)}
-    @knight.bind('ButtonRelease-1', '%W %x %y'){|w,x,y| drag_end(w,x,y)}
-
-    Tk.grid(@board, @log, scr, :sticky=>'news')
-    base_f.grid_rowconfigure(0, :weight=>1)
-    base_f.grid_columnconfigure(0, :weight=>1)
-
-    Tk.grid(base_f, '-', '-', '-', '-', '-', :sticky=>'news')
-    widgets = [label, scale, check, @start_btn]
-    sg = nil
-    unless $RubyTk_WidgetDemo
-      widgets << @exit_btn
-      if Tk.windowingsystem != 'aqua'
-        #widgets.unshift(Ttk::SizeGrip.new(tool_f))
-        Ttk::SizeGrip.new(tool_f).pack(:side=>:right, :anchor=>'se')
-      end
-    end
-    Tk.pack(widgets, :side=>:right)
-    if Tk.windowingsystem == 'aqua'
-      TkPack.configure(widgets, :padx=>[4, 4], :pady=>[12, 12])
-      TkPack.configure(widgets[0], :padx=>[4, 24])
-      TkPack.configure(widgets[-1], :padx=>[16, 4])
-    end
-
-    Tk.grid(tool_f, '-', '-', '-', '-', '-', :sticky=>'ew')
-
-    if $RubyTk_WidgetDemo
-      Tk.grid(make_SeeDismiss(), '-', '-', '-', '-', '-', :sticky=>'ew')
-    end
-
-    $knightstour.grid_rowconfigure(0, :weight=>1)
-    $knightstour.grid_columnconfigure(0, :weight=>1)
-
-    $knightstour.bind('Control-F2'){TkConsole.show}
-    $knightstour.bind('Return'){@start_btn.invoke}
-    $knightstour.bind('Escape'){@exit_btn.invoke}
-    $knightstour.bind('Destroy'){ _stop }
-    $knightstour.protocol('WM_DELETE_WINDOW'){ _exit }
-
-    $knightstour.deiconify
-    $knightstour.tkwait_destroy
-  end
-
-  def initialize(parent = nil)
-    create_gui(parent)
-  end
-end
-
-Tk.root.withdraw unless $RubyTk_WidgetDemo
-Thread.new{Tk.mainloop} if __FILE__ == $0
-Knights_Tour.new
diff --git a/ext/tk/sample/demos-en/label.rb b/ext/tk/sample/demos-en/label.rb
deleted file mode 100644
index 5be06eafee..0000000000
--- a/ext/tk/sample/demos-en/label.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-# label.rb
-#
-# This demonstration script creates a toplevel window containing
-# several label widgets.
-#
-# label widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($label_demo) && $label_demo
-  $label_demo.destroy
-  $label_demo = nil
-end
-
-# demo toplevel widget
-$label_demo = TkToplevel.new {|w|
-  title("Label Demonstration")
-  iconname("label")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($label_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Five labels are displayed below: three textual ones on the left, and a bitmap label and a text label on the right.  Labels are pretty boring because you can't do anything with them."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $label_demo
-      $label_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'label'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# label demo
-f_left = TkFrame.new(base_frame)
-f_right = TkFrame.new(base_frame)
-[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes',
-                                  'padx'=>10, 'pady'=>10, 'fill'=>'both')}
-
-# label
-[ TkLabel.new(f_left, 'text'=>'First label'),
-  TkLabel.new(f_left, 'text'=>'Second label, raised',
-              'relief'=>'raised'),
-  TkLabel.new(f_left, 'text'=>'Third label, sunken', 'relief'=>'sunken')
-].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
-
-# TkLabel.new(f_right) {
-Tk::Label.new(f_right) {
-  bitmap('@' + [$demo_dir,'..','images','face.xbm'].join(File::Separator))
-  borderwidth 2
-  relief 'sunken'
-}.pack('side'=>'top')
-
-TkLabel.new(f_right) { text 'Tcl/Tk Proprietor' }.pack('side'=>'top')
-
diff --git a/ext/tk/sample/demos-en/labelframe.rb b/ext/tk/sample/demos-en/labelframe.rb
deleted file mode 100644
index ad968bc061..0000000000
--- a/ext/tk/sample/demos-en/labelframe.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# labelframe.rb
-#
-# This demonstration script creates a toplevel window containing
-# several labelframe widgets.
-#
-# based on "Id: labelframe.tcl,v 1.2 2001/10/30 11:21:50 dkf Exp"
-
-
-if defined?($labelframe_demo) && $labelframe_demo
-  $labelframe_demo.destroy
-  $labelframe_demo = nil
-end
-
-$labelframe_demo = TkToplevel.new {|w|
-  title("Labelframe Demonstration")
-  iconname("labelframe")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($labelframe_demo).pack(:fill=>:both, :expand=>true)
-
-# Some information
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-Labelframes are used to group related widgets together. \
-The label may be either plain text or another widget. \
-If your Tk library linked to Ruby doesn't include a 'labelframe' widget, \
-this demo doesn't work. Please use later version of Tk \
-which supports a 'labelframe' widget.
-EOL
-
-# The bottom buttons
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $labelframe_demo.destroy
-                 $labelframe_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'labelframe'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-# Demo area
-w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both,
-                                       :expand=>true)
-
-# A group of radiobuttons in a labelframe
-TkLabelFrame.new(w, :text=>'Value',
-                 :padx=>2, :pady=>2) {|f|
-  grid(:row=>0, :column=>0, :pady=>'2m', :padx=>'2m')
-
-  v = TkVariable.new
-  (1..4).each{|i|
-    TkRadiobutton.new(f, :text=>"This is value #{i}",
-                      :variable=>v, :value=>i) {
-      pack(:side=>:top, :fill=>:x, :pady=>2)
-    }
-  }
-}
-
-
-# Using a label window to control a group of options.
-$lfdummy = TkVariable.new(0)
-
-def lfEnableButtons(w)
-  TkWinfo.children(w).each{|child|
-    next if child.path =~ /\.cb$/
-    if $lfdummy == 1
-      child.state(:normal)
-    else
-      child.state(:disabled)
-    end
-  }
-end
-
-TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
-  TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy,
-                    :text=>"Use this option.", :padx=>0) {|cb|
-    command proc{lfEnableButtons(f)}
-    f.labelwidget(cb)
-  }
-  grid(:row=>0, :column=>1, :pady=>'2m', :padx=>'2m')
-
-  %w(Option1 Option2 Option3).each{|str|
-    TkCheckbutton.new(f, :text=>str).pack(:side=>:top, :fill=>:x, :pady=>2)
-  }
-
-  lfEnableButtons(f)
-}
-
-TkGrid.columnconfigure(w, [0,1], :weight=>1)
diff --git a/ext/tk/sample/demos-en/mclist.rb b/ext/tk/sample/demos-en/mclist.rb
deleted file mode 100644
index 17019bb15b..0000000000
--- a/ext/tk/sample/demos-en/mclist.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# mclist.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget configured as a multi-column listbox.
-#
-# based on "Id: mclist.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($mclist_demo) && $mclist_demo
-  $mclist_demo.destroy
-  $mclist_demo = nil
-end
-
-$mclist_demo = TkToplevel.new {|w|
-  title("Multi-Column List")
-  iconname("mclist")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($mclist_demo).pack(:fill=>:both, :expand=>true)
-
-## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
-               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
-               :text=><<EOL).pack(:fill=>:x)
-Ttk is the new Tk themed widget set. \
-One of the widgets it includes is a tree widget, \
-which can be configured to display multiple columns of informational data \
-without displaying the tree itself. \
-This is a simple way to build a listbox that has multiple columns. \
-Clicking on the heading for a column will sort the data by that column. \
-You can also change the width of the columns \
-by dragging the boundary between them.
-EOL
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'mclist'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $mclist_demo.destroy
-                           $mclist_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-container = Ttk::Frame.new(base_frame)
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency),
-                          :show=>:headings)
-if Tk.windowingsystem != 'aqua'
-  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
-else
-  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
-end
-
-container.pack(:fill=>:both, :expand=>true)
-Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
-Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
-container.grid_columnconfigure(0, :weight=>1)
-container.grid_rowconfigure(0, :weight=>1)
-
-## The data we're going to insert
-data = [
-  ['Argentina', 	'Buenos Aires', 	'ARS'],
-  ['Australia',		'Canberra',		'AUD'],
-  ['Brazil', 		'Brazilia', 		'BRL'],
-  ['Canada', 		'Ottawa', 		'CAD'],
-  ['China',		'Beijing', 		'CNY'],
-  ['France',		'Paris', 		'EUR'],
-  ['Germany', 		'Berlin',		'EUR'],
-  ['India', 		'New Delhi',		'INR'],
-  ['Italy', 		'Rome', 		'EUR'],
-  ['Japan', 		'Tokyo', 		'JPY'],
-  ['Mexico', 		'Mexico City', 		'MXN'],
-  ['Russia', 		'Moscow', 		'RUB'],
-  ['South Africa',	'Pretoria', 		'ZAR'],
-  ['United Kingdom', 	'London', 		'GBP'],
-  ['United States', 	'Washington, D.C.', 	'USD'],
-]
-
-## Code to insert the data nicely
-font = Ttk::Style.lookup(tree[:style], :font)
-cols = %w(country capital currency)
-cols.zip(%w(Country Capital Currency)).each{|col, name|
-  tree.heading_configure(col, :text=>name,
-                         :command=>proc{sort_by(tree, col, false)})
-  tree.column_configure(col, :width=>TkFont.measure(font, name))
-}
-
-data.each{|country, capital, currency|
-  #tree.insert('', :end, :values=>[country, capital, currency])
-  tree.insert(nil, :end, :values=>[country, capital, currency])
-  cols.zip([country, capital, currency]).each{|col, val|
-    len = TkFont.measure(font, "#{val}  ")
-    if tree.column_cget(col, :width) < len
-      tree.column_configure(col, :width=>len)
-    end
-  }
-}
-
-## Code to do the sorting of the tree contents when clicked on
-def sort_by(tree, col, direction)
-  tree.children(nil).map!{|row| [tree.get(row, col), row.id]} .
-    sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) .
-    each_with_index{|info, idx| tree.move(info[1], nil, idx)}
-
-  tree.heading_configure(col, :command=>proc{sort_by(tree, col, ! direction)})
-end
diff --git a/ext/tk/sample/demos-en/menu.rb b/ext/tk/sample/demos-en/menu.rb
deleted file mode 100644
index a458dbbc14..0000000000
--- a/ext/tk/sample/demos-en/menu.rb
+++ /dev/null
@@ -1,196 +0,0 @@
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($menu_demo) && $menu_demo
-  $menu_demo.destroy
-  $menu_demo = nil
-end
-
-# demo toplevel widget
-$menu_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("menu")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($menu_demo).pack(:fill=>:both, :expand=>true)
-
-# menu frame
-$menu_frame = TkFrame.new(base_frame, 'relief'=>'raised', 'bd'=>2)
-$menu_frame.pack('side'=>'top', 'fill'=>'x')
-
-begin
-  windowingsystem = Tk.windowingsystem()
-rescue
-  windowingsystem = ""
-end
-
-# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    text("This window contains a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by dragging outside of its bounds and releasing the mouse.")
-  else
-    text("This window contains a menubar with cascaded menus.  You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu.  You can then traverse among the menus using the arrow keys.  When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character.  If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu.")
-  end
-}.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $menu_demo
-      $menu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'menu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# menu
-TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|file_menu|
-    m.configure('menu'=>file_menu)
-    add('command', 'label'=>'Open...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Open..." entry'})
-    add('command', 'label'=>'New', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "New" entry'})
-    add('command', 'label'=>'Save', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save" entry'})
-    add('command', 'label'=>'Save As...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save As..." entry'})
-    add('separator')
-    add('command', 'label'=>'Print Setup...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print Setup..." entry'})
-    add('command', 'label'=>'Print...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print..." entry'})
-    add('separator')
-    add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu_demo.destroy})
-  }
-}
-
-if $tk_platform['platform'] == 'macintosh' ||
-    windowingsystem == "classic" || windowingsystem == "aqua"
-  modifier = 'Command'
-elsif $tk_platform['platform'] == 'windows'
-  modifier = 'Control'
-else
-  modifier = 'Meta'
-end
-
-TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
-    m.configure('menu'=>basic_menu)
-    add('command', 'label'=>'Long entry that does nothing')
-    ['A','B','C','D','E','F','G'].each{|c|
-      add('command', 'label'=>"Print letter \"#{c}\"",
-          'underline'=>14, 'accelerator'=>"Meta+#{c}",
-          'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-      $menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
-    m.configure('menu'=>cascade_menu)
-    add('command', 'label'=>'Print hello',
-        'command'=>proc{print "Hello\n"},
-        'accelerator'=>"#{modifier}+H", 'underline'=>6)
-    $menu_demo.bind("#{modifier}-h", proc{print "Hello\n"})
-    add('command', 'label'=>'Print goodbye',
-        'command'=>proc{print "Goodbye\n"},
-        'accelerator'=>"#{modifier}+G", 'underline'=>6)
-    $menu_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
-
-    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_check|
-      cascade_menu.add('cascade', 'label'=>'Check buttons',
-                       'menu'=>cascade_check, 'underline'=>0)
-      oil = TkVariable.new(0)
-      add('check', 'label'=>'Oil checked', 'variable'=>oil)
-      trans = TkVariable.new(0)
-      add('check', 'label'=>'Transmission checked', 'variable'=>trans)
-      brakes = TkVariable.new(0)
-      add('check', 'label'=>'Brakes checked', 'variable'=>brakes)
-      lights = TkVariable.new(0)
-      add('check', 'label'=>'Lights checked', 'variable'=>lights)
-      add('separator')
-      add('command', 'label'=>'Show current values',
-          'command'=>proc{showVars($menu_demo,
-                                   ['oil', oil],
-                                   ['trans', trans],
-                                   ['brakes', brakes],
-                                   ['lights', lights])} )
-      invoke 1
-      invoke 3
-    }
-
-    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_radio|
-      cascade_menu.add('cascade', 'label'=>'Radio buttons',
-                       'menu'=>cascade_radio, 'underline'=>0)
-      pointSize = TkVariable.new
-      add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
-      add('radio', 'label'=>'14 point', 'variable'=>pointSize, 'value'=>14)
-      add('radio', 'label'=>'18 point', 'variable'=>pointSize, 'value'=>18)
-      add('radio', 'label'=>'24 point', 'variable'=>pointSize, 'value'=>24)
-      add('radio', 'label'=>'32 point', 'variable'=>pointSize, 'value'=>32)
-      add('separator')
-      style = TkVariable.new
-      add('radio', 'label'=>'Roman', 'variable'=>style, 'value'=>'roman')
-      add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
-      add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
-      add('separator')
-      add('command', 'label'=>'Show current values',
-          'command'=>proc{showVars($menu_demo,
-                                   ['pointSize', pointSize],
-                                   ['style', style])} )
-      invoke 1
-      invoke 7
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
-    m.configure('menu'=>icon_menu)
-    add('command',
-        'bitmap'=>'@'+[$demo_dir,'..',
-                        'images','pattern.xbm'].join(File::Separator),
-        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
-                                     'text'=>'The menu entry you invoked displays a bitmap rather than a text string.  Other than this, it is just like any other menu entry.',
-                                     'bitmap'=>'', 'default'=>0,
-                                     'buttons'=>'Dismiss')} )
-    ['info', 'questhead', 'error'].each{|icon|
-      add('command', 'bitmap'=>icon,
-          'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|more_menu|
-    m.configure('menu'=>more_menu)
-    [ 'An entry','Another entry','Does nothing','Does almost nothing',
-      'Make life meaningful' ].each{|i|
-      add('command', 'label'=>i,
-          'command'=>proc{print "You invoked \"#{i}\"\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m) {|colors_menu|
-    m.configure('menu'=>colors_menu)
-    ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-      add('command', 'label'=>c, 'background'=>c,
-          'command'=>proc{print "You invoked \"#{c}\"\n"})
-    }
-  }
-}
diff --git a/ext/tk/sample/demos-en/menu84.rb b/ext/tk/sample/demos-en/menu84.rb
deleted file mode 100644
index 4fc53962e7..0000000000
--- a/ext/tk/sample/demos-en/menu84.rb
+++ /dev/null
@@ -1,215 +0,0 @@
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($menu84_demo) && $menu84_demo
-  $menu84_demo.destroy
-  $menu84_demo = nil
-end
-
-# demo toplevel widget
-$menu84_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("menu84")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($menu84_demo).pack(:fill=>:both, :expand=>true)
-
-begin
-  windowingsystem = Tk.windowingsystem()
-rescue
-  windowingsystem = ""
-end
-
-# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    text("This window contains a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by dragging outside of its bounds and releasing the mouse.")
-  else
-    text("This window contains a menubar with cascaded menus.  You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu.  You can then traverse among the menus using the arrow keys.  When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character.  If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu.")
-  end
-}.pack('side'=>'top')
-
-
-menustatus = TkVariable.new("    ")
-TkFrame.new(base_frame) {|frame|
-  TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken',
-              'bd'=>1, 'font'=>['Helvetica', '10'],
-              'anchor'=>'w').pack('side'=>'left', 'padx'=>2,
-                                  'expand'=>true, 'fill'=>'both')
-  pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-}
-
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $menu84_demo
-      $menu84_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'menu84'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# create menu frame
-$menu84_frame = TkMenu.new($menu84_demo, 'tearoff'=>false)
-
-# menu
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'File', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Open...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Open..." entry'})
-  add('command', 'label'=>'New', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "New" entry'})
-  add('command', 'label'=>'Save', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save" entry'})
-  add('command', 'label'=>'Save As...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save As..." entry'})
-  add('separator')
-  add('command', 'label'=>'Print Setup...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print Setup..." entry'})
-  add('command', 'label'=>'Print...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print..." entry'})
-  add('separator')
-  add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu84_demo.destroy})
-}
-
-if $tk_platform['platform'] == 'macintosh' ||
-    windowingsystem = "classic" || windowingsystem = "aqua"
-  modifier = 'Command'
-elsif $tk_platform['platform'] == 'windows'
-  modifier = 'Control'
-else
-  modifier = 'Meta'
-end
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Basic', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Long entry that does nothing')
-  ['A','B','C','D','E','F','G'].each{|c|
-    add('command', 'label'=>"Print letter \"#{c}\"",
-        'underline'=>14, 'accelerator'=>"Meta+#{c}",
-        'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-    $menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-  }
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Cascades', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Print hello',
-      'command'=>proc{print "Hello\n"},
-      'accelerator'=>"#{modifier}+H", 'underline'=>6)
-  $menu84_demo.bind("#{modifier}-h", proc{print "Hello\n"})
-  add('command', 'label'=>'Print goodbye',
-      'command'=>proc{print "Goodbye\n"},
-      'accelerator'=>"#{modifier}+G", 'underline'=>6)
-  $menu84_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-    m.add('cascade', 'label'=>'Check buttons',
-          'menu'=>cascade_check, 'underline'=>0)
-    oil = TkVariable.new(0)
-    add('check', 'label'=>'Oil checked', 'variable'=>oil)
-    trans = TkVariable.new(0)
-    add('check', 'label'=>'Transmission checked', 'variable'=>trans)
-    brakes = TkVariable.new(0)
-    add('check', 'label'=>'Brakes checked', 'variable'=>brakes)
-    lights = TkVariable.new(0)
-    add('check', 'label'=>'Lights checked', 'variable'=>lights)
-    add('separator')
-    add('command', 'label'=>'Show current values',
-        'command'=>proc{showVars($menu84_demo,
-                                 ['oil', oil],
-                                 ['trans', trans],
-                                 ['brakes', brakes],
-                                 ['lights', lights])} )
-    invoke 1
-    invoke 3
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-    m.add('cascade', 'label'=>'Radio buttons',
-          'menu'=>cascade_radio, 'underline'=>0)
-    pointSize = TkVariable.new
-    add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
-    add('radio', 'label'=>'14 point', 'variable'=>pointSize, 'value'=>14)
-    add('radio', 'label'=>'18 point', 'variable'=>pointSize, 'value'=>18)
-    add('radio', 'label'=>'24 point', 'variable'=>pointSize, 'value'=>24)
-    add('radio', 'label'=>'32 point', 'variable'=>pointSize, 'value'=>32)
-    add('separator')
-    style = TkVariable.new
-    add('radio', 'label'=>'Roman', 'variable'=>style, 'value'=>'roman')
-    add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
-    add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
-    add('separator')
-    add('command', 'label'=>'Show current values',
-        'command'=>proc{showVars($menu84_demo,
-                                 ['pointSize', pointSize],
-                                 ['style', style])} )
-    invoke 1
-    invoke 7
-  }
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Icons', 'menu'=>m, 'underline'=>0)
-  add('command', 'hidemargin'=>1,
-      'bitmap'=>'@'+[$demo_dir,'..',
-                      'images','pattern.xbm'].join(File::Separator),
-      'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
-                                   'text'=>'The menu entry you invoked displays a bitmap rather than a text string.  Other than this, it is just like any other menu entry.',
-                                   'bitmap'=>'', 'default'=>0,
-                                   'buttons'=>'Dismiss')} )
-  ['info', 'questhead', 'error'].each{|icon|
-    add('command', 'bitmap'=>icon, 'hidemargin'=>1,
-        'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-  }
-
-  entryconfigure(2, :columnbreak=>true)
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'More', 'menu'=>m, 'underline'=>0)
-  [ 'An entry','Another entry','Does nothing','Does almost nothing',
-    'Make life meaningful' ].each{|i|
-    add('command', 'label'=>i,
-        'command'=>proc{print "You invoked \"#{i}\"\n"})
-  }
-
-  m.entryconfigure('Does almost nothing',
-                   'bitmap'=>'questhead', 'compound'=>'left',
-                   'command'=>proc{
-                     TkDialog.new('title'=>'Compound Menu Entry',
-                                  'message'=>'The menu entry you invoked'+
-                                             'displays both a bitmap and '+
-                                             'a text string.  Other than '+
-                                             'this, it isjust like any '+
-                                             'other menu entry.',
-                                  'buttons'=>['OK'], 'bitmap'=>'')
-                   })
-}
-
-TkMenu.new($menu84_frame) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Colors', 'menu'=>m, 'underline'=>0)
-  ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-    add('command', 'label'=>c, 'background'=>c,
-        'command'=>proc{print "You invoked \"#{c}\"\n"})
-  }
-}
-
-$menu84_demo.menu($menu84_frame)
-
-TkMenu.bind('<MenuSelect>', proc{|w|
-              begin
-                label = w.entrycget('active', 'label')
-              rescue
-                label = "    "
-              end
-              menustatus.value = label
-              Tk.update(true)
-            }, '%W')
diff --git a/ext/tk/sample/demos-en/menubu.rb b/ext/tk/sample/demos-en/menubu.rb
deleted file mode 100644
index 6e28e813b3..0000000000
--- a/ext/tk/sample/demos-en/menubu.rb
+++ /dev/null
@@ -1,237 +0,0 @@
-# menubutton.rb
-#
-# This demonstration script creates a window with a bunch of menus
-# and cascaded menus using menubuttons.
-
-require "tkcanvas"
-
-def optionMenu(menubutton, varName, firstValue, *rest)
-  varName.value = firstValue
-  configoptions = {'textvariable'=>varName,'indicatoron'=>'on',
-    'relief'=>'raised','borderwidth'=>2,'highlightthickness'=>2,
-    'anchor'=>'c','direction'=>'flush'}
-  configoptions.each {|key, value|
-    menubutton.configure(key, value)
-  }
-  menu = TkMenu.new(menubutton) {
-    tearoff 'off'
-    add 'radio', 'label'=>firstValue, 'variable'=>varName
-  }
-  menubutton.menu(menu)
-  for i in rest
-    menu.add 'radio', 'label'=>i, 'variable'=>varName
-  end
-
-  return menu
-end
-
-if defined?($menubu_demo) && $menubu_demo
-  $menubu_demo.destroy
-  $menubu_demo = nil
-end
-
-$menubu_demo = TkToplevel.new {|w|
-  title("Menu Button Demonstration")
-  iconname("menubutton")
-}
-
-positionWindow($menubu_demo)
-
-base_frame = TkFrame.new($menubu_demo).pack(:fill=>:both, :expand=>true)
-
-# version check
-if $tk_version.to_f < 8.0
-
-# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-    text("This is a demonstration of menubuttons. The \"Below\" menubutton pops its menu below the button; the \"Right\" button pops to the right, etc. There are two option menus directly below this text; one is just a standard menu and the other is a 16-color palette.")
-}.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $menubu_demo
-      $menubu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'menubu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-else ; # Tk8.x
-
-body = TkFrame.new(base_frame)
-body.pack('expand'=>'yes', 'fill'=>'both')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-right = TkMenubutton.new(body) {
-  text "Right"
-  underline 0
-  direction 'right'
-  relief 'raised'
-}
-rightMenu = TkMenu.new(right) {
-  tearoff 0
-  add 'command', 'label'=>"Right menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
-  add 'command', 'label'=>"Right menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Right menu.\""}
-}
-right.menu(rightMenu)
-right.grid('row'=>1, 'column'=>0, 'sticky'=>'w')
-
-left = TkMenubutton.new(body) {
-  text "Left"
-  underline 0
-  direction 'left'
-  relief 'raised'
-}
-leftMenu = TkMenu.new(left) {
-  tearoff 0
-  add 'command', 'label'=>"Left menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
-  add 'command', 'label'=>"Left menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Left menu.\""}
-}
-left.menu(leftMenu)
-left.grid('row'=>1, 'column'=>2, 'sticky'=>'e')
-
-center = TkFrame.new(body) {
-  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
-}
-
-above = TkMenubutton.new(body) {
-  text "Above"
-  underline 0
-  direction 'above'
-  relief 'raised'
-}
-aboveMenu = TkMenu.new(above) {
-  tearoff 0
-  add 'command', 'label'=>"Above menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Above menu.\""}
-  add 'command', 'label'=>"Above menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Above menu.\""}
-}
-above.menu(aboveMenu)
-above.grid('row'=>2, 'column'=>1, 'sticky'=>'s')
-
-center = TkFrame.new(body) {
-  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
-}
-
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc {
-      tmppath = $menubu_demo
-      $menubu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc { showCode 'menubu' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x', 'pady'=>'2m')
-
-msg = TkLabel.new(center) {
-#  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This is a demonstration of menubuttons. The \"Below\" menubutton pops its menu below the button; the \"Right\" button pops to the right, etc. There are two option menus directly below this text; one is just a standard menu and the other is a 16-color palette."
-}
-msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
-
-TkFrame.new(center) {|f|
-  menubuttonoptions = TkVariable.new
-  mbutton = TkMenubutton.new(f)
-  options = optionMenu(mbutton, menubuttonoptions,
-                       'one', 'two', 'three')
-  mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
-  paletteColor = TkVariable.new
-  colors = ['Black','red4','DarkGreen','NavyBlue', 'gray75',
-    'Red','Green','Blue','gray50','Yellow','Cyan','Magenta',
-    'White','Brown','DarkSeaGreen','DarkViolet']
-  colorMenuButton = TkMenubutton.new(f)
-  m = optionMenu(colorMenuButton, paletteColor, *colors)
-  begin
-    windowingsystem = Tk.windowingsystem()
-  rescue
-    windowingsystem = ""
-  end
-  if windowingsystem == "classic" || windowingsystem == "aqua"
-    topBorderColor = 'Black'
-    bottomBorderColor = 'Black'
-  else
-    topBorderColor = 'gray50'
-    bottomBorderColor = 'gray75'
-  end
-  for i in 0..15
-    image = TkPhotoImage.new('height'=>16, 'width'=>16)
-    image.put(topBorderColor, 0, 0, 16, 1)
-    image.put(topBorderColor, 0, 1, 1, 16)
-    image.put(bottomBorderColor, 0, 15, 16, 16)
-    image.put(bottomBorderColor, 15, 1, 16, 16)
-    image.put(colors[i], 1, 1, 15, 15)
-
-    selectimage = TkPhotoImage.new('height'=>16, 'width'=>16)
-    selectimage.put('Black', 0, 0, 16, 2)
-    selectimage.put('Black', 0, 2, 2, 16)
-    selectimage.put('Black', 2, 14, 16, 16)
-    selectimage.put('Black', 14, 2, 16, 14)
-    selectimage.put(colors[i], 2, 2, 14, 14)
-
-    m.entryconfigure(i, 'image'=>image, 'selectimage'=>selectimage, 'hidemargin'=>'on')
-  end
-  m.configure('tearoff', 'on')
-  for c in ['Black', 'gray75', 'gray50', 'White']
-    m.entryconfigure(c, 'columnbreak'=>1)
-  end
-  colorMenuButton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
-  pack 'padx'=>25, 'pady'=>25
-}
-
-end ; # Tk8.x
diff --git a/ext/tk/sample/demos-en/msgbox.rb b/ext/tk/sample/demos-en/msgbox.rb
deleted file mode 100644
index d3d66bfeb0..0000000000
--- a/ext/tk/sample/demos-en/msgbox.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# msgbox.rb
-#
-# This demonstration script creates message boxes of various type
-#
-# message boxes widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($msgbox_demo) && $msgbox_demo
-  $msgbox_demo.destroy
-  $msgbox_demo = nil
-end
-
-# demo toplevel widget
-$msgbox_demo = TkToplevel.new {|w|
-  title("Message Box Demonstration")
-  iconname("messagebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($msgbox_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"Choose the icon and type option of the message box. Then press the \"Message Box\" button to see the message box.").pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $msgbox_demo
-      $msgbox_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'msgbox'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Message Box'
-    command proc{showMessageBox $msgbox_demo}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-$msgbox_leftframe  = TkFrame.new(base_frame)
-$msgbox_rightframe = TkFrame.new(base_frame)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-
-TkLabel.new($msgbox_leftframe, 'text'=>'Icon').pack('side'=>'top')
-TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxIcon = TkVariable.new('info')
-['error', 'info', 'question', 'warning'].each {|icon|
-  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
-                    'relief'=>'flat', 'value'=>icon, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-TkLabel.new($msgbox_rightframe, 'text'=>'Type').pack('side'=>'top')
-TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel',
-  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
-  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
-                    'relief'=>'flat', 'value'=>type, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-def showMessageBox(w)
-  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
-                         'title'=>'Message', 'parent'=>w,
-                         'message'=>"This is a \"#{$msgboxType.value}\" type messagebox with the \"#{$msgboxIcon.value}\" icon")
-
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
-                'message'=>"You have selected  \"#{button}\"")
-end
-
diff --git a/ext/tk/sample/demos-en/msgbox2.rb b/ext/tk/sample/demos-en/msgbox2.rb
deleted file mode 100644
index c227b59bb1..0000000000
--- a/ext/tk/sample/demos-en/msgbox2.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# msgbox2.rb
-#
-# This demonstration script creates message boxes of various type
-#
-# message boxes widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($msgbox2_demo) && $msgbox2_demo
-  $msgbox2_demo.destroy
-  $msgbox2_demo = nil
-end
-
-# demo toplevel widget
-$msgbox2_demo = TkToplevel.new {|w|
-  title("Message Box Demonstration")
-  iconname("messagebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($msgbox2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"Choose the icon and type option of the message box. Then press the \"Message Box\" button to see the message box with both of a message and a detail.").pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $msgbox2_demo
-      $msgbox2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'msgbox2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Message Box'
-    command proc{showMessageBox2 $msgbox2_demo}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-$msgbox_leftframe  = TkFrame.new(base_frame)
-$msgbox_rightframe = TkFrame.new(base_frame)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-
-TkLabel.new($msgbox_leftframe, 'text'=>'Icon').pack('side'=>'top')
-TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxIcon = TkVariable.new('info')
-['error', 'info', 'question', 'warning'].each {|icon|
-  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
-                    'relief'=>'flat', 'value'=>icon, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-TkLabel.new($msgbox_rightframe, 'text'=>'Type').pack('side'=>'top')
-TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel',
-  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
-  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
-                    'relief'=>'flat', 'value'=>type, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-def showMessageBox2(w)
-  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
-                         'title'=>'Message', 'parent'=>w,
-                         'message'=>"\"#{$msgboxType.value}\" Type MessageBox",
-                         'detail'=>"This is a \"#{$msgboxType.value}\" type messagebox with the \"#{$msgboxIcon.value}\" icon. Please click one of the following button.")
-
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
-                'message'=>"You have selected  \"#{button}\"")
-end
-
diff --git a/ext/tk/sample/demos-en/paned1.rb b/ext/tk/sample/demos-en/paned1.rb
deleted file mode 100644
index d3d66d1b16..0000000000
--- a/ext/tk/sample/demos-en/paned1.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# paned1.rb
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows horizontally.
-#
-# based on "Id: paned1.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
-
-if defined?($paned1_demo) && $paned1_demo
-  $paned1_demo.destroy
-  $paned1_demo = nil
-end
-
-$paned1_demo = TkToplevel.new {|w|
-  title("Horizontal Paned Window Demonstration")
-  iconname("paned1")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($paned1_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-The sash between the two coloured windows below can be used to divide the area between them.  Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)
-If your Tk library linked to Ruby doesn't include a 'panedwindow', this demo doesn't work. Please use later version of Tk which supports a 'panedwindow'.
-EOL
-
-# The bottom buttons
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $paned1_demo.destroy
-                 $paned1_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'paned1'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-TkPanedwindow.new(base_frame, :orient=>:horizontal){|f|
-  add(Tk::Label.new(f, :text=>"This is the\nleft side", :bg=>'yellow'),
-      Tk::Label.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
-
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
-}
diff --git a/ext/tk/sample/demos-en/paned2.rb b/ext/tk/sample/demos-en/paned2.rb
deleted file mode 100644
index 02293b0309..0000000000
--- a/ext/tk/sample/demos-en/paned2.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-# paned2.rb --
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows vertically.
-#
-# based on "Id: paned2.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
-
-if defined?($paned2_demo) && $paned2_demo
-  $paned2_demo.destroy
-  $paned2_demo = nil
-end
-
-$paned2_demo = TkToplevel.new {|w|
-  title("Vertical Paned Window Demonstration")
-  iconname("paned2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($paned2_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-The sash between the two scrolled windows below can be used to divide the area between them.  Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)
-If your Tk library linked to Ruby doesn't include a 'panedwindow', this demo doesn't work. Please use later version of Tk which supports a 'panedwindow'.
-EOL
-
-# The bottom buttons
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $paned2_demo.destroy
-                 $paned2_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'paned2'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-paneList = TkVariable.new  # define as normal variable (not array)
-paneList.value = [         # ruby's array --> tcl's list
-    'List of Ruby/Tk Widgets',
-    'TkButton',
-    'TkCanvas',
-    'TkCheckbutton',
-    'TkEntry',
-    'TkFrame',
-    'TkLabel',
-    'TkLabelframe',
-    'TkListbox',
-    'TkMenu',
-    'TkMenubutton',
-    'TkMessage',
-    'TkPanedwindow',
-    'TkRadiobutton',
-    'TkScale',
-    'TkScrollbar',
-    'TkSpinbox',
-    'TkText',
-    'TkToplevel'
-]
-
-# Create the pane itself
-TkPanedwindow.new(base_frame, :orient=>:vertical){|f|
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
-
-  add(TkFrame.new(f){|paned2_top|
-        TkListbox.new(paned2_top, :listvariable=>paneList) {
-          # Invert the first item to highlight it
-          itemconfigure(0, :background=>self.cget(:foreground),
-                           :foreground=>self.cget(:background) )
-          yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right,
-                                                      :fill=>:y))
-          pack(:fill=>:both, :expand=>true)
-        }
-      },
-
-      TkFrame.new(f, :height=>120) {|paned2_bottom|
-        # The bottom window is a text widget with scrollbar
-        paned2_xscr = TkScrollbar.new(paned2_bottom)
-        paned2_yscr = TkScrollbar.new(paned2_bottom)
-        paned2_text = TkText.new(paned2_bottom, :width=>30, :wrap=>:non) {
-          insert('1.0', "This is just a normal text widget")
-          xscrollbar(paned2_xscr)
-          yscrollbar(paned2_yscr)
-        }
-        Tk.grid(paned2_text, paned2_yscr, :sticky=>'nsew')
-        Tk.grid(paned2_xscr, :sticky=>'nsew')
-        TkGrid.columnconfigure(paned2_bottom, 0, :weight=>1)
-        TkGrid.rowconfigure(paned2_bottom, 0, :weight=>1)
-      } )
-}
diff --git a/ext/tk/sample/demos-en/pendulum.rb b/ext/tk/sample/demos-en/pendulum.rb
deleted file mode 100644
index 306ac94a21..0000000000
--- a/ext/tk/sample/demos-en/pendulum.rb
+++ /dev/null
@@ -1,240 +0,0 @@
-#
-# This demonstration illustrates how Tcl/Tk can be used to construct
-# simulations of physical systems.
-# (called by 'widget')
-#
-# based on Tcl/Tk8.5a2 widget demos
-
-# destroy toplevel widget for this demo script
-if defined?($pendulum_demo) && $pendulum_demo
-  $pendulum_demo.destroy
-  $pendulum_demo = nil
-end
-
-# create toplevel widget
-$pendulum_demo = TkToplevel.new {|w|
-  title("Pendulum Animation Demonstration")
-  iconname("pendulum")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($pendulum_demo).pack(:fill=>:both, :expand=>true)
-
-# create label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text 'This demonstration shows how Ruby/Tk can be used to carry out animations that are linked to simulations of physical systems. In the left canvas is a graphical representation of the physical system itself, a simple pendulum, and in the right canvas is a graph of the phase space of the system, which is a plot of the angle (relative to the vertical) against the angular velocity. The pendulum bob may be repositioned by clicking and dragging anywhere on the left canvas.'
-}
-msg.pack('side'=>'top')
-
-# create frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $pendulum_demo
-      $pendulum_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'pendulum'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# animated wave
-class PendulumAnimationDemo
-  def initialize(frame)
-    # Create some structural widgets
-    @pane = TkPanedWindow.new(frame, :orient=>:horizontal).pack(:fill=>:both, :expand=>true)
-#    @pane.add(@lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation'))
-#    @pane.add(@lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space'))
-    @lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation')
-    @lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space')
-
-    # Create the canvas containing the graphical representation of the
-    # simulated system.
-    @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white',
-                      :borderwidth=>2, :relief=>:sunken)
-    TkcText.new(@c, 5, 5, :anchor=>:nw,
-                :text=>'Click to Adjust Bob Start Position')
-    # Coordinates of these items don't matter; they will be set properly below
-    @plate = TkcLine.new(@c, 0, 25, 320, 25, :width=>2, :fill=>'grey50')
-    @rod = TkcLine.new(@c, 1, 1, 1, 1, :width=>3, :fill=>'black')
-    @bob = TkcOval.new(@c, 1, 1, 2, 2,
-                       :width=>3, :fill=>'yellow', :outline=>'black')
-    TkcOval.new(@c, 155, 20, 165, 30, :fill=>'grey50', :outline=>'')
-
-    # pack
-    @c.pack(:fill=>:both, :expand=>true)
-
-    # Create the canvas containing the phase space graph; this consists of
-    # a line that gets gradually paler as it ages, which is an extremely
-    # effective visual trick.
-    @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white',
-                      :borderwidth=>2, :relief=>:sunken)
-    @y_axis = TkcLine.new(@k, 160, 200, 160, 0, :fill=>'grey75', :arrow=>:last)
-    @x_axis = TkcLine.new(@k, 0, 100, 320, 100, :fill=>'grey75', :arrow=>:last)
-
-    @graph = {}
-    90.step(0, -10){|i|
-      # Coordinates of these items don't matter;
-      # they will be set properly below
-      @graph[i] = TkcLine.new(@k, 0, 0, 1, 1, :smooth=>true, :fill=>"grey#{i}")
-    }
-
-    # labels
-    @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne,
-                               :text=>'q', :font=>'Symbol 8')
-    @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne,
-                               :text=>'dq', :font=>'Symbol 8')
-
-    # pack
-    @k.pack(:fill=>:both, :expand=>true)
-
-    # Initialize some variables
-    @points = []
-    @theta = 45.0
-    @dTheta = 0.0
-    @length = 150
-
-    # animation loop
-    @timer = TkTimer.new(15){ repeat }
-
-    # binding
-    @c.bindtags_unshift(btag = TkBindTag.new)
-    btag.bind('Destroy'){ @timer.stop }
-    btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x.to_i, y.to_i)},
-              '%x %y')
-    btag.bind('B1-Motion', proc{|x, y| showPendulum(x.to_i, y.to_i)}, '%x %y')
-    btag.bind('ButtonRelease-1',
-              proc{|x, y| showPendulum(x.to_i, y.to_i); @timer.start },
-              '%x %y')
-
-    btag.bind('Configure', proc{|w| @plate.coords(0, 25, w.to_i, 25)}, '%w')
-
-    @k.bind('Configure', proc{|h, w|
-              h = h.to_i
-              w = w.to_i
-              @psh = h/2;
-              @psw = w/2
-              @x_axis.coords(2, @psh, w-2, @psh)
-              @y_axis.coords(@psw, h-2, @psw, 2)
-              @label_theta.coords(@psw-4, 6)
-              @label_dtheta.coords(w-6, @psh+4)
-            }, '%h %w')
-
-    # add
-    Tk.update
-    @pane.add(@lf1)
-    @pane.add(@lf2)
-
-    # init display
-    showPendulum
-
-    # animation start
-    @timer.start(500)
-  end
-
-  # This procedure makes the pendulum appear at the correct place on the
-  # canvas. If the additional arguments x, y are passed instead of computing
-  # the position of the pendulum from the length of the pendulum rod and its
-  # angle, the length and angle are computed in reverse from the given
-  # location (which is taken to be the centre of the pendulum bob.)
-  def showPendulum(x=nil, y=nil)
-    if x && y && (x != 160 || y != 25)
-      @dTheta = 0.0
-      x2 = x - 160
-      y2 = y - 25
-      @length = Math.hypot(x2, y2)
-      @theta = Math.atan2(x2,y2)*180/Math::PI
-    else
-      angle = @theta*Math::PI/180
-      x = 160 + @length*Math.sin(angle)
-      y = 25 + @length*Math.cos(angle)
-    end
-
-    @rod.coords(160, 25, x, y)
-    @bob.coords(x-15, y-15, x+15, y+15)
-  end
-
-  # Update the phase-space graph according to the current angle and the
-  # rate at which the angle is changing (the first derivative with
-  # respect to time.)
-  def showPhase
-    unless @psw && @psh
-      @psw = @k.width/2
-      @psh = @k.height/2
-    end
-    @points << @theta + @psw << -20*@dTheta + @psh
-    if @points.length > 100
-      @points = @points[-100..-1]
-    end
-    (0...100).step(10){|i|
-      first = - i
-      last = 11 - i
-      last = -1 if last >= 0
-      next if first > last
-      lst = @points[first..last]
-      @graph[i].coords(lst) if lst && lst.length >= 4
-    }
-  end
-
-  # This procedure is the "business" part of the simulation that does
-  # simple numerical integration of the formula for a simple rotational
-  # pendulum.
-  def recomputeAngle
-    scaling = 3000.0/@length/@length
-
-    # To estimate the integration accurately, we really need to
-    # compute the end-point of our time-step.  But to do *that*, we
-    # need to estimate the integration accurately!  So we try this
-    # technique, which is inaccurate, but better than doing it in a
-    # single step.  What we really want is bound up in the
-    # differential equation:
-    #       ..             - sin theta
-    #      theta + theta = -----------
-    #                         length
-    # But my math skills are not good enough to solve this!
-
-    # first estimate
-    firstDDTheta = -Math.sin(@theta * Math::PI/180) * scaling
-    midDTheta = @dTheta + firstDDTheta
-    midTheta = @theta + (@dTheta + midDTheta)/2
-    # second estimate
-    midDDTheta = -Math.sin(midTheta * Math::PI/180) * scaling
-    midDTheta = @dTheta + (firstDDTheta + midDDTheta)/2
-    midTheta = @theta + (@dTheta + midDTheta)/2
-    # Now we do a double-estimate approach for getting the final value
-    # first estimate
-    midDDTheta = -Math.sin(midTheta * Math::PI/180) * scaling
-    lastDTheta = midDTheta + midDDTheta
-    lastTheta = midTheta + (midDTheta+ lastDTheta)/2
-    # second estimate
-    lastDDTheta = -Math.sin(lastTheta * Math::PI/180) * scaling
-    lastDTheta = midDTheta + (midDDTheta + lastDDTheta)/2
-    lastTheta = midTheta + (midDTheta + lastDTheta)/2
-    # Now put the values back in our globals
-    @dTheta = lastDTheta
-    @theta = lastTheta
-  end
-
-  # This method ties together the simulation engine and the graphical
-  # display code that visualizes it.
-  def repeat
-    # Simulate
-    recomputeAngle
-
-    # Update the display
-    showPendulum
-    showPhase
-  end
-end
-
-# Start the animation processing
-PendulumAnimationDemo.new(base_frame)
diff --git a/ext/tk/sample/demos-en/plot.rb b/ext/tk/sample/demos-en/plot.rb
deleted file mode 100644
index f70daa3fb2..0000000000
--- a/ext/tk/sample/demos-en/plot.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-# plot.rb
-#
-# This demonstration script creates a canvas widget showing a 2-D
-# plot with data points that can be dragged with the mouse.
-#
-# 2-D plot widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($plot_demo) && $plot_demo
-  $plot_demo.destroy
-  $plot_demo = nil
-end
-
-# demo toplevel widget
-$plot_demo = TkToplevel.new {|w|
-  title("Plot Demonstration")
-  iconname("Plot")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($plot_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"This window displays a canvas widget containing a simple 2-dimensional plot.  You can doctor the data by dragging any of the points with mouse button 1."){
-  pack('side'=>'top')
-}
-
-# frame
-$plot_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $plot_demo
-      $plot_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'plot'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# font
-plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-
-# canvas
-$plot_canvas = TkCanvas.new(base_frame,'relief'=>'raised','width'=>450,'height'=>300)
-$plot_canvas.pack('side'=>'top', 'fill'=>'x')
-
-# plot
-TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
-TkcLine.new($plot_canvas, 100, 250, 100,  50, 'width'=>2)
-TkcText.new($plot_canvas, 225, 20,
-            'text'=>"A Simple Plot", 'font'=>plotFont, 'fill'=>'brown')
-
-(0..10).each {|i|
-  x = 100 + (i * 30)
-  TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
-  TkcText.new($plot_canvas, x, 254,
-              'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
-}
-(0..5).each {|i|
-  y = 250 - (i * 40)
-  TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
-  TkcText.new($plot_canvas, 96, y,
-              'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
-}
-
-for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-  x = 100 + (3*xx)
-  y = 250 - (4*yy)/5
-  item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6,
-                     'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-  item.addtag 'point'
-end
-
-$plot_canvas.itembind('point', 'Any-Enter',
-                      proc{$plot_canvas.itemconfigure 'current','fill','red'})
-$plot_canvas.itembind('point', 'Any-Leave',
-                      proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
-$plot_canvas.itembind('point', '1',
-                      proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
-$plot_canvas.itembind('point', 'ButtonRelease-1',
-                      proc{$plot_canvas.dtag 'selected'})
-$plot_canvas.bind('B1-Motion',
-                  proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
-
-$plot = {'lastX'=>0, 'lastY'=>0}
-
-# plotDown --
-# This method is invoked when the mouse is pressed over one of the
-# data points.  It sets up state to allow the point to be dragged.
-#
-# Arguments:
-# w -           The canvas window.
-# x, y -        The coordinates of the mouse press.
-
-def plotDown (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $plot['lastX'] = x
-  $plot['lastY'] = y
-end
-
-# plotMove --
-# This method is invoked during mouse motion events.  It drags the
-# current item.
-#
-# Arguments:
-# w -           The canvas window.
-# x, y -        The coordinates of the mouse.
-
-def plotMove (w, x, y)
-  w.move 'selected', x - $plot['lastX'], y - $plot['lastY']
-  $plot['lastX'] = x
-  $plot['lastY'] = y
-end
-
diff --git a/ext/tk/sample/demos-en/puzzle.rb b/ext/tk/sample/demos-en/puzzle.rb
deleted file mode 100644
index f16414aa4c..0000000000
--- a/ext/tk/sample/demos-en/puzzle.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-# puzzle.rb
-#
-# This demonstration script creates a 15-puzzle game using a collection
-# of buttons.
-#
-# widet demo 'puzzle' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($puzzle_demo) && $puzzle_demo
-  $puzzle_demo.destroy
-  $puzzle_demo = nil
-end
-
-# demo toplevel widget
-$puzzle_demo = TkToplevel.new {|w|
-  title("15-Puzzle Demonstration")
-  iconname("15-Puzzle")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($puzzle_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "A 15-puzzle appears below as a collection of buttons.  Click on any of the pieces next to the space, and that piece will slide over the space.  Continue this until the pieces are arranged in numerical order from upper-left to lower-right."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $puzzle_demo
-      $puzzle_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'puzzle'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-
-# Special trick: select a darker color for the space by creating a
-# scrollbar widget and using its trough color.
-begin
-  if Tk.windowingsystem() == 'aqua'
-    frameWidth  = 168
-    frameHeight = 168
-  elsif Tk.default_widget_set == :Ttk
-    frameWidth  = 148
-    frameHeight = 124
-  else
-    frameWidth  = 120
-    frameHeight = 120
-  end
-rescue
-  frameWidth  = 120
-  frameHeight = 120
-end
-
-# depend_on_button_width = true
-depend_on_button_width = false
-
-s = TkScrollbar.new(base_frame)
-base = TkFrame.new(base_frame) {
-  width  frameWidth
-  height frameHeight
-  borderwidth 2
-  relief 'sunken'
-  bg s['troughcolor']
-}
-s.destroy
-base.pack('side'=>'top', 'padx'=>'1c', 'pady'=>'1c')
-
-def def_puzzleswitch_proc(w, num)
-  proc{puzzleSwitch w, num}
-end
-
-$xpos = {}
-$ypos = {}
-order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
-(0..14).each{|i|
-  num = order[i]
-  $xpos[num] = (i % 4) * 0.25
-  $ypos[num] = (i / 4) * 0.25
-  TkButton.new(base) {|w|
-    relief 'raised'
-    text num
-    highlightthickness 0
-    command def_puzzleswitch_proc(w, num)
-    if depend_on_button_width && (w.winfo_reqwidth * 4 > base.width)
-      base.width = w.winfo_reqwidth * 4
-    end
-  }.place('relx'=>$xpos[num], 'rely'=>$ypos[num],
-          'relwidth'=>0.25, 'relheight'=>0.25)
-}
-$xpos['space'] = 0.75
-$ypos['space'] = 0.75
-
-
-# puzzleSwitch --
-# This procedure is invoked when the user clicks on a particular button;
-# if the button is next to the empty space, it moves the button into the
-# empty space.
-
-def puzzleSwitch(w, num)
-  if ( ($ypos[num] >= ($ypos['space'] - 0.01))     \
-      && ($ypos[num] <= ($ypos['space'] + 0.01))   \
-      && ($xpos[num] >= ($xpos['space'] - 0.26))   \
-      && ($xpos[num] <= ($xpos['space'] + 0.26)))  \
-    || (($xpos[num] >= ($xpos['space'] - 0.01))    \
-        && ($xpos[num] <= ($xpos['space'] + 0.01)) \
-        && ($ypos[num] >= ($ypos['space'] - 0.26)) \
-        && ($ypos[num] <= ($ypos['space'] + 0.26)))
-    tmp = $xpos['space']
-    $xpos['space'] = $xpos[num]
-    $xpos[num] = tmp
-    tmp = $ypos['space']
-    $ypos['space'] = $ypos[num]
-    $ypos[num] = tmp
-    w.place('relx'=>$xpos[num], 'rely'=>$ypos[num])
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/radio.rb b/ext/tk/sample/demos-en/radio.rb
deleted file mode 100644
index bde31508e1..0000000000
--- a/ext/tk/sample/demos-en/radio.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# radio.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio_demo) && $radio_demo
-  $radio_demo.destroy
-  $radio_demo = nil
-end
-
-# demo toplevel widget
-$radio_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration")
-  iconname("radio")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($radio_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Two groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.pack('side'=>'top')
-
-#
-size = TkVariable.new
-color = TkVariable.new
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $radio_demo
-      $radio_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'radio'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Variables'
-    command proc{
-      showVars(base_frame, ['size', size], ['color', color])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-f_left = TkFrame.new(base_frame)
-f_right = TkFrame.new(base_frame)
-f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-
-# radiobutton
-[10, 12, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "Point Size #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
-['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
-  TkRadioButton.new(f_right) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
diff --git a/ext/tk/sample/demos-en/radio2.rb b/ext/tk/sample/demos-en/radio2.rb
deleted file mode 100644
index 72fc2c610c..0000000000
--- a/ext/tk/sample/demos-en/radio2.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# radio2.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio2_demo) && $radio2_demo
-  $radio2_demo.destroy
-  $radio2_demo = nil
-end
-
-# demo toplevel widget
-$radio2_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration 2")
-  iconname("radio2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($radio2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "Three groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.pack('side'=>'top')
-
-#
-size = TkVariable.new
-color = TkVariable.new
-align = TkVariable.new
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $radio2_demo
-      $radio2_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'radio2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Variables'
-    command proc{
-      showVars(base_frame,
-               ['size', size], ['color', color], ['compound', align])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-f_left  = TkLabelFrame.new(base_frame, 'text'=>'Point Size',
-                           'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new(base_frame, 'text'=>'Color',
-                           'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'Alignment',
-                           'pady'=>2, 'padx'=>2)
-f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_mid.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-
-# radiobutton
-[10, 12, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "Point Size #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
-}
-
-['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
-  TkRadioButton.new(f_mid) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-    anchor 'w'
-  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
-}
-
-# label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
-label = Tk::Label.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
-                    'compound'=>'left')
-label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
-label.height(TkWinfo.reqheight(label))
-abtn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
-  lower = a.downcase
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
-                    'value'=>lower, 'indicatoron'=>0, 'width'=>7,
-                    'command'=>proc{label.compound(align.value)})
-}
-
-Tk.grid('x', abtn[0])
-Tk.grid(abtn[1], label, abtn[2])
-Tk.grid('x', abtn[3])
diff --git a/ext/tk/sample/demos-en/radio3.rb b/ext/tk/sample/demos-en/radio3.rb
deleted file mode 100644
index 8a147edda7..0000000000
--- a/ext/tk/sample/demos-en/radio3.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# radio3.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio3_demo) && $radio3_demo
-  $radio3_demo.destroy
-  $radio3_demo = nil
-end
-
-# demo toplevel widget
-$radio3_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration 3")
-  iconname("radio3")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($radio3_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "Three groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  When the 'Tristate' button is pressed, the radio buttons will display the tri-state mode. Selecting any radio button will return the buttons to their respective on/off state. Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.grid(:row=>0, :column=>0, :columnspan=>3, :sticky=>'nsew')
-
-# variable
-size = TkVariable.new
-color = TkVariable.new
-align = TkVariable.new
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
-         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         TkButton.new(frame, :text=>'See Variables',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{
-                        showVars(base_frame, ['size', size],
-                                 ['color', color], ['compound', align])
-                      }),
-         TkButton.new(frame, :text=>'See Code',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{showCode 'radio3'}),
-         TkButton.new(frame, :text=>'Dismiss',
-                      :image=>$image['delete'], :compound=>:left,
-                      :command=>proc{
-                        tmppath = $radio3_demo
-                        $radio3_demo = nil
-                        $showVarsWin[tmppath.path] = nil
-                        tmppath.destroy
-                      }),
-         :padx=>4, :pady=>4)
-  frame.grid_columnconfigure(0, :weight=>1)
-  TkGrid(frame, :row=>3, :column=>0, :columnspan=>3, :sticky=>'nsew')
-}
-
-# frame
-f_left  = TkLabelFrame.new(base_frame, 'text'=>'Point Size',
-                           'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new(base_frame, 'text'=>'Color',
-                           'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'Alignment',
-                           'pady'=>2, 'padx'=>2)
-f_left .grid('column'=>0, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
-f_mid  .grid('column'=>1, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
-f_right.grid('column'=>2, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c')
-
-TkButton.new(base_frame, 'text'=>'Tristate',
-             'command'=>proc{size.value = 'multi'; color.value = 'multi'}){
-  grid('column'=>2, 'row'=>2, 'pady'=>'.5c', 'padx'=>'.5c')
-}
-
-# radiobutton
-[10, 12, 14, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "Point Size #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-    tristatevalue 'multi'
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
-}
-
-['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
-  TkRadioButton.new(f_mid) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-    anchor 'w'
-    tristatevalue 'multi'
-    command proc{f_mid.fg(color.value)}
-  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
-}
-
-# label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
-label = Tk::Label.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
-                    'compound'=>'left')
-label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
-label.height(TkWinfo.reqheight(label))
-a_btn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
-                    'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7,
-                    'command'=>proc{label.compound(align.value)})
-}
-
-Tk.grid('x', a_btn[0])
-Tk.grid(a_btn[1], label, a_btn[2])
-Tk.grid('x', a_btn[3])
diff --git a/ext/tk/sample/demos-en/rmt b/ext/tk/sample/demos-en/rmt
deleted file mode 100644
index dcfb328fc8..0000000000
--- a/ext/tk/sample/demos-en/rmt
+++ /dev/null
@@ -1,268 +0,0 @@
-#!/usr/bin/env ruby
-
-# rmt --
-# This script implements a simple remote-control mechanism for
-# Tk applications.  It allows you to select an application and
-# then type commands to that application.
-
-require 'tk'
-
-class Rmt
-  def initialize(parent=nil)
-    win = self
-
-    unless parent
-      parent = TkRoot.new
-    end
-    root = TkWinfo.toplevel(parent)
-    root.minsize(1,1)
-
-    # The instance variable below keeps track of the remote application
-    # that we're sending to.  If it's an empty string then we execute
-    # the commands locally.
-    @app = 'local'
-    @mode = 'Ruby'
-
-    # The instance variable below keeps track of whether we're in the
-    # middle of executing a command entered via the text.
-    @executing = 0
-
-    # The instance variable below keeps track of the last command executed,
-    # so it can be re-executed in response to !! commands.
-    @lastCommand = ""
-
-    # Create menu bar.  Arrange to recreate all the information in the
-    # applications sub-menu whenever it is cascaded to.
-
-    TkFrame.new(root, 'relief'=>'raised', 'bd'=>2) {|f|
-      pack('side'=>'top', 'fill'=>'x')
-      TkMenubutton.new(f, 'text'=>'File', 'underline'=>0) {|mb|
-	TkMenu.new(mb) {|mf|
-	  mb.menu(mf)
-	  TkMenu.new(mf) {|ma|
-	    postcommand proc{win.fillAppsMenu ma}
-	    mf.add('cascade', 'label'=>'Select Application',
-		   'menu'=>ma, 'underline'=>0)
-	  }
-	  add('command', 'label'=>'Quit',
-	      'command'=>proc{root.destroy}, 'underline'=>0)
-	}
-	pack('side'=>'left')
-      }
-    }
-
-    # Create text window and scrollbar.
-
-    @txt = TkText.new(root, 'relief'=>'sunken', 'bd'=>2, 'setgrid'=>true) {
-      yscrollbar(TkScrollbar.new(root){pack('side'=>'right', 'fill'=>'y')})
-      pack('side'=>'left')
-    }
-
-    @promptEnd = TkTextMark.new(@txt, 'insert')
-
-    # Create a binding to forward commands to the target application,
-    # plus modify many of the built-in bindings so that only information
-    # in the current command can be deleted (can still set the cursor
-    # earlier in the text and select and insert;  just can't delete).
-
-    @txt.bindtags([@txt, TkText, root, 'all'])
-    @txt.bind('Return', proc{
-		@txt.set_insert('end - 1c')
-		@txt.insert('insert', "\n")
-		win.invoke
-		Tk.callback_break
-	      })
-    @txt.bind('Delete', proc{
-		begin
-		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
-		rescue
-		end
-		if @txt.tag_nextrange('sel', '1.0', 'end') == []
-		  if @txt.compare('insert', '<', @promptEnd)
-		    Tk.callback_break
-		  end
-		end
-	      })
-    @txt.bind('BackSpace', proc{
-		begin
-		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
-		rescue
-		end
-		if @txt.tag_nextrange('sel', '1.0', 'end') == []
-		  if @txt.compare('insert', '<', @promptEnd)
-		    Tk.callback_break
-		  end
-		end
-	      })
-    @txt.bind('Control-d', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Control-k', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  @txt.set_insert(@promptEnd)
-		end
-	      })
-    @txt.bind('Control-t', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Meta-d', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Meta-BackSpace', proc{
-		if @txt.compare('insert', '<=', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Control-h', proc{
-		if @txt.compare('insert', '<=', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-
-    @txt.tag_configure('bold', 'font'=>['Courier', 12, 'bold'])
-
-    @app = Tk.appname('rmt')
-    if (@app =~ /^rmt(.*)$/)
-      root.title("Tk Remote Controller#{$1}")
-      root.iconname("Tk Remote#{$1}")
-    end
-    prompt
-    @txt.focus
-    #@app = TkWinfo.appname(TkRoot.new)
-  end
-
-  def tkTextInsert(w,s)
-    return if s == ""
-    begin
-      if w.compare('sel.first','<=','insert') \
-	&& w.compare('sel.last','>=','insert')
-	w.tag_remove('sel', 'sel.first', @promptEnd)
-	w.delete('sel.first', 'sel.last')
-      end
-    rescue
-    end
-    w.insert('insert', s)
-    w.see('insert')
-  end
-
-  # The method below is used to print out a prompt at the
-  # insertion point (which should be at the beginning of a line
-  # right now).
-
-  def prompt
-    @txt.insert('insert', "#{@app}: ")
-    @promptEnd.set('insert')
-    @promptEnd.gravity = 'left'
-    @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
-  end
-
-  # The method below executes a command (it takes everything on the
-  # current line after the prompt and either sends it to the remote
-  # application or executes it locally, depending on "app".
-
-  def invoke
-    cmd = @txt.get(@promptEnd, 'insert')
-    @executing += 1
-    case (@mode)
-    when 'Tcl'
-      if Tk.info('complete', cmd)
-	if (cmd == "!!\n")
-	  cmd = @lastCommand
-	else
-	  @lastCommand = cmd
-	end
-	begin
-	  msg = Tk.appsend(@app, false, cmd)
-	rescue
-	  msg = "Error: #{$!}"
-	end
-	@txt.insert('insert', msg + "\n") if msg != ""
-	prompt
-	@promptEnd.set('insert')
-      end
-
-    when 'Ruby'
-      if (cmd == "!!\n")
-	cmd = @lastCommand
-      end
-      complete = true
-      begin
-	eval("proc{#{cmd}}")
-      rescue
-	complete = false
-      end
-      if complete
-	@lastCommand = cmd
-	begin
-#	  msg = Tk.appsend(@app, false,
-#			   'ruby',
-#			   '"(' + cmd.gsub(/[][$"]/, '\\\\\&') + ').to_s"')
-	  msg = Tk.rb_appsend(@app, false, cmd)
-	rescue
-	  msg = "Error: #{$!}"
-	end
-	@txt.insert('insert', msg + "\n") if msg != ""
-	prompt
-	@promptEnd.set('insert')
-      end
-    end
-
-    @executing -= 1
-    @txt.yview_pickplace('insert')
-  end
-
-  # The following method is invoked to change the application that
-  # we're talking to.  It also updates the prompt for the current
-  # command, unless we're in the middle of executing a command from
-  # the text item (in which case a new prompt is about to be output
-  # so there's no need to change the old one).
-
-  def newApp(appName, mode)
-    @app = appName
-    @mode = mode
-    if @executing == 0
-      @promptEnd.gravity = 'right'
-      @txt.delete("#{@promptEnd.path} linestart", @promptEnd)
-      @txt.insert(@promptEnd, "#{appName}: ")
-      @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
-      @promptEnd.gravity = 'left'
-    end
-  end
-
-  # The method below will fill in the applications sub-menu with a list
-  # of all the applications that currently exist.
-
-  def fillAppsMenu(menu)
-    win = self
-    begin
-      menu.delete(0,'last')
-    rescue
-    end
-    TkWinfo.interps.sort.each{|ip|
-      begin
-	if Tk.appsend(ip, false, 'info commands ruby') == ""
-	  mode = 'Tcl'
-	else
-	  mode = 'Ruby'
-	end
-	menu.add('command', 'label'=>format("%s    (#{mode}/Tk)", ip),
-		 'command'=>proc{win.newApp ip, mode})
-      rescue
-	menu.add('command', 'label'=>format("%s (unknown Tk)", ip),
-		 'command'=>proc{win.newApp ip, mode}, 'state'=>'disabled')
-      end
-    }
-    menu.add('command', 'label'=>format("local    (Ruby/Tk)"),
-	     'command'=>proc{win.newApp 'local', 'Ruby'})
-  end
-end
-
-Rmt.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/rolodex b/ext/tk/sample/demos-en/rolodex
deleted file mode 100644
index dfc4b2b245..0000000000
--- a/ext/tk/sample/demos-en/rolodex
+++ /dev/null
@@ -1,320 +0,0 @@
-#!/usr/bin/env ruby
-#
-# rolodex --
-# This script is a part of Tom LaStrange's rolodex
-#
-# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "03/08/02 06:23:06 nagai"
-#
-
-require "tk"
-
-
-def show_help(topic,x=0,y=0)
-  if( topic.is_a?(TkWindow) )
-    w = TkWinfo.containing(x,y)
-    if( TkWinfo.exist?(w) )
-      topic = w
-    end
-  end
-
-  if( $helpTopics.include?(topic) )
-    msg = $helpTopics[topic]
-  else
-    msg = "Sorry, but no help is available for this topic"
-  end
-  TkDialog.new("title"=>"Rolodex Help",
-	       "message"=>"Information on #{topic}:\n\n#{msg}",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-end
-
-def fillCard
-  clearAction
-  $root.frame.entry[1].insert(0,"Takaaki Tateishi")
-  $root.frame.entry[2].insert(0,"Japan Advanced Institute of Science and Techonology")
-  $root.frame.entry[3].insert(0,"1-1 Asahidai, Tatsunokuchi")
-  $root.frame.entry[4].insert(0,"Ishikawa 923-1292, Japan")
-  $root.frame.entry[5].insert(0,"private")
-    $root.frame.entry[6].insert(0,"***-***-****")
-  $root.frame.entry[7].insert(0,"***-***-****")
-end
-
-def addAction
-  for i in 1..7
-    STDERR.print format("%-12s %s\n",
-			RolodexFrame::LABEL[i],
-			$root.frame.entry[i].value)
-  end
-end
-
-def clearAction
-  for i in 1..7
-    $root.frame.entry[i].delete(0,"end")
-  end
-end
-
-def fileAction
-  TkDialog.new("title"=>"File Selection",
-	       "message"=>"This is a dummy file selection dialog box.\n",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-  STDERR.print "dummy file name\n"
-end
-
-def deleteAction
-  result = TkDialog.new("title"=>"Confirm Action",
-			"message"=>"Are you sure?",
-			"default_button"=>0,
-			"buttons"=>["Cancel"])
-  if( result.value == 0 )
-    clearAction
-  end
-end
-
-
-class RolodexFrame < TkFrame
-  attr_reader :entry, :label
-
-  LABEL = ["","Name:","Address:","","","Home Phone:","Work Phone:","Fax:"]
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    self["relief"] = "flat"
-
-    @i = []
-    @label = []
-    @entry = []
-    for i in 1..7
-      @i[i] = TkFrame.new(self)
-      @i[i].pack("side"=>"top",
-		 "pady"=>2,
-		 "anchor"=>"e")
-      @label[i] = TkLabel.new(@i[i],
-			      "text"=>LABEL[i],
-			      "anchor"=>"e")
-      @entry[i] = TkEntry.new(@i[i],
-			      "width"=>30,
-			      "relief"=>"sunken")
-      @entry[i].pack("side"=>"right")
-      @label[i].pack("side"=>"right")
-    end
-  end
-end
-
-class RolodexButtons < TkFrame
-  attr_reader :clear, :add, :search, :delete
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    @clear = TkButton.new(self,
-			  "text" => "Clear")
-    @add = TkButton.new(self,
-			"text" => "Add")
-    @search = TkButton.new(self,
-			   "text" => "Search")
-    @delete = TkButton.new(self,
-			   "text" => "Delete")
-    for w in [@clear,@add,@search,@delete]
-      w.pack("side"=>"left", "padx"=>2)
-    end
-  end
-end
-
-class RolodexMenuFrame < TkFrame
-  attr_reader :file_menu, :help_menu, :file, :help
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    configure("relief"=>"raised",
-	      "borderwidth"=>1)
-
-    @file = TkMenubutton.new(self,
-			     "text"=>"File",
-			     "underline"=>0)
-    @file_menu = TkMenu.new(@file)
-    @file_menu.add("command",
-		   "label" => "Load ...",
-		   "command" => proc{fileAction},
-		   "underline" => 0)
-    @file_menu.add("command",
-		   "label" => "Exit",
-		   "command" => proc{$root.destroy},
-		   "underline" => 0)
-    @file.menu(@file_menu)
-    @file.pack("side"=>"left")
-
-    @help = TkMenubutton.new(self,
-			     "text"=>"Help",
-			     "underline"=>0)
-    @help_menu = TkMenu.new(@help)
-    @help_menu.add("command",
-		   "label"=>"On Context...",
-		   "command"=>proc{show_help("context")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Help...",
-		   "command"=>proc{show_help("help")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Window...",
-		   "command"=>proc{show_help("window")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Keys...",
-		   "command"=>proc{show_help("keys")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On version...",
-		   "command"=>proc{show_help("version")},
-		   "underline"=>3)
-    @help.menu(@help_menu)
-    @help.pack("side"=>"right")
-  end
-end
-
-class Rolodex < TkRoot
-  attr_reader :frame, :buttons, :menu
-
-  def initialize(*args)
-    super(*args)
-    @frame = RolodexFrame.new(self)
-    @frame.pack("side"=>"top",
-		"fill"=>"y",
-		"anchor"=>"center")
-    @buttons = RolodexButtons.new(self)
-    @buttons.pack("side"=>"bottom",
-		  "pady"=>2,
-		  "anchor"=>"center")
-    @menu = RolodexMenuFrame.new(self)
-    @menu.pack("before"=>@frame,
-	       "side"=>"top",
-	       "fill"=>"x")
-  end
-end
-
-$root = Rolodex.new
-
-$root.buttons.delete.configure("command"=>proc{deleteAction})
-$root.buttons.add.configure("command"=>proc{addAction})
-$root.buttons.clear.configure("command"=>proc{clearAction})
-$root.buttons.search.configure("command"=>proc{addAction; fillCard})
-
-$root.buttons.clear.configure("text"=>"Clear   Ctrl+C")
-$root.bind("Control-c",proc{clearAction})
-
-$root.buttons.add.configure("text"=>"Add   Ctrl+A")
-$root.bind("Control-a",proc{addAction})
-
-$root.buttons.search.configure("text"=>"Search   Ctrl+S")
-$root.bind("Control-s",proc{addAction; fillCard})
-
-$root.buttons.delete.configure("text"=>"Delete...   Ctrl+D")
-$root.bind("Control-d",proc{deleteAction})
-
-$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
-$root.bind("Control-f",proc{fileAction})
-
-$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
-$root.bind("Control-q",proc{$root.destroy})
-
-$root.frame.entry[1].focus
-
-$root.bind("Any-F1",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-$root.bind("Any-Help",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-
-
-$helpTopics = {}
-
-$helpTopics[$root.menu.file] = <<EOF
-This is the "file" menu. It can be used to invoke\
-some overall operations on the rolodex applications,\
-such as loading a file or exiting.
-EOF
-
-$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
-The "Load" entry in the "File" menu posts a dialog box\
-that you can use to select a rolodex file
-EOF
-
-$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
-The "Exit" entry in the "File" menu causes the rolodex\
-application to terminate
-EOF
-
-$helpTopics[$root.frame.entry[1]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's name
-EOF
-
-$helpTopics[$root.frame.entry[2]] = <<EOF
-In this field of the rolodex entry you should\
-type the first line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[3]] = <<EOF
-In this field of the rolodex entry you should\
-type the second line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[4]] = <<EOF
-In this field of the rolodex entry you should\
-type the third line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[5]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's home phone number, or "private"\
-if the person doesn't want his or he number publicized
-EOF
-
-$helpTopics[$root.frame.entry[6]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's work phone number
-EOF
-
-$helpTopics[$root.frame.entry[7]] = <<EOF
-In this field of the rolodex entry you should\
-type the phone number for the person's FAX machine
-EOF
-
-$helpTopics["context"] = <<EOF
-Unfortunately, this application doesn't support context-sensitive\
-help in the usual way, because when this demo was written Ruby/Tk\
-didn't have a grab mechanism and this is needed for context-sensitive\
-help. Instead, you can achive much the same effect by simply moving\
-the mouse over the window you're curious about and pressing the\
-Help or F1 keys. You can do this anytime.
-EOF
-
-$helpTopics["help"] = <<EOF
-This application provides only very crude help. Besides the\
-entries in this menu, you can get help on individual windows\
-by moving the mouse cursor over the window and pressing the\
-Help or F1 keys.
-EOF
-
-$helpTopics["window"] = <<EOF
-This window is a dummy rolodex application created as part of\
-Tom LaStrange's toolkit benchmark. It doesn't really do anything\
-useful except to demonstrate a few features of the Ruby/Tk.
-EOF
-
-$helpTopics["keys"] = <<EOF
-The following accelerator keys are defined for this application\
-(in addition to those already available for the entry windows):
-Ctrl+A:		Add
-Ctrl+C:		Clear
-Ctrl+D:		Delete
-Ctrl+F:		Enter file name
-Ctrl+Q:		Exit application (quit)
-Ctrl+S:		Search (dummy operation)
-EOF
-
-$helpTopics["version"] = <<EOF
-This is version 1.0.1.
-EOF
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/ruler.rb b/ext/tk/sample/demos-en/ruler.rb
deleted file mode 100644
index a9773699f7..0000000000
--- a/ext/tk/sample/demos-en/ruler.rb
+++ /dev/null
@@ -1,205 +0,0 @@
-# ruler.rb
-#
-# This demonstration script creates a canvas widget that displays a ruler
-# with tab stops that can be set, moved, and deleted.
-#
-# ruler widget demo (called by 'widget')
-#
-
-# rulerMkTab --
-# This method creates a new triangular polygon in a canvas to
-# represent a tab stop.
-#
-# Arguments:
-# c -           The canvas window.
-# x, y -        Coordinates at which to create the tab stop.
-
-def rulerMkTab(c,x,y)
-  v = $demo_rulerInfo
-  TkcPolygon.new(c, x, y, x+v.size, y+v.size, x-v.size, y+v.size)
-end
-
-# toplevel widget
-if defined?($ruler_demo) && $ruler_demo
-  $ruler_demo.destroy
-  $ruler_demo = nil
-end
-
-# demo toplevel widget
-$ruler_demo = TkToplevel.new {|w|
-  title("Ruler Demonstration")
-  iconname("ruler")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ruler_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
-            'text'=>"This canvas widget shows a mock-up of a ruler.  You can create tab stops by dragging them out of the well to the right of the ruler.  You can also drag existing tab stops.  If you drag a tab stop far enough up or down so that it turns dim, it will be deleted when you release the mouse button."){
-  pack('side'=>'top')
-}
-
-# frame
-$ruler_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $ruler_demo
-      $ruler_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'ruler'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas
-$ruler_canvas = TkCanvas.new(base_frame, 'width'=>'14.8c', 'height'=>'2.5c')
-$ruler_canvas.pack('side'=>'top', 'fill'=>'x')
-
-#
-unless Struct.const_defined?("RulerInfo")
-  $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y,
-                               :top, :bottom, :size, :normalStyle,
-                               :activeStyle, :deleteStyle).new
-end
-$demo_rulerInfo.grid = '.25c'
-$demo_rulerInfo.left = TkWinfo.fpixels($ruler_canvas, '1c')
-$demo_rulerInfo.right = TkWinfo.fpixels($ruler_canvas, '13c')
-$demo_rulerInfo.top = TkWinfo.fpixels($ruler_canvas, '1c')
-$demo_rulerInfo.bottom = TkWinfo.fpixels($ruler_canvas, '1.5c')
-$demo_rulerInfo.size = TkWinfo.fpixels($ruler_canvas, '.2c')
-$demo_rulerInfo.normalStyle = {'fill'=>'black'}
-if TkWinfo.depth($ruler_canvas) > 1
-  $demo_rulerInfo.activeStyle = {'fill'=>'red', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'red',
-    'stipple'=>'@'+[$demo_dir, '..',
-                     'images', 'gray25.xbm'].join(File::Separator)}
-else
-  $demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'black',
-    'stipple'=>'@'+[$demo_dir, '..',
-                     'images', 'gray25.xbm'].join(File::Separator)}
-end
-
-TkcLine.new($ruler_canvas,
-            '1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
-(0..11).each{|i|
-  x = i+1
-  TkcLine.new($ruler_canvas, "#{x}c", '1c', "#{x}c", '0.6c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.25c", '1c', "#{x}.25c", '0.8c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.5c", '1c', "#{x}.5c", '0.7c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.75c", '1c', "#{x}.75c", '0.8c', 'width'=>1)
-  TkcText.new($ruler_canvas, "#{x}.15c", '0.75c', 'text'=>i, 'anchor'=>'sw')
-}
-
-$rulerTag_well = TkcTag.new($ruler_canvas)
-$ruler_canvas\
-.addtag_withtag($rulerTag_well,
-                TkcRectangle.new($ruler_canvas,
-                                 '13.2c', '1c', '13.8c', '0.5c',
-                                 'outline'=>'black',
-                                 'fill'=>($ruler_canvas\
-                                          .configinfo('background'))[4]) )
-$ruler_canvas\
-.addtag_withtag($rulerTag_well,
-                rulerMkTab($ruler_canvas,
-                           TkWinfo.pixels($ruler_canvas, '13.5c'),
-                           TkWinfo.pixels($ruler_canvas, '.65c') ) )
-
-$rulerTag_well.bind('1', proc{|x,y| rulerNewTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.itembind('tab', '1',
-                       proc{|x,y| rulerSelectTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('B1-Motion',
-                   proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
-
-# rulerNewTab --
-# Does all the work of creating a tab stop, including creating the
-# triangle object and adding tags to it to give it tab behavior.
-#
-# Arguments:
-# c -           The canvas window.
-# x, y -        The coordinates of the tab stop.
-
-def rulerNewTab(c,x,y)
-  v = $demo_rulerInfo
-  c.addtag_withtag('active', rulerMkTab(c,x,y))
-  c.addtag_withtag('tab', 'active')
-  v.x = x
-  v.y = y
-  rulerMoveTab(c,x,y)
-end
-
-# rulerSelectTab --
-# This method is invoked when mouse button 1 is pressed over
-# a tab.  It remembers information about the tab so that it can
-# be dragged interactively.
-#
-# Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse (identifies the point by
-#               which the tab was picked up for dragging).
-
-def rulerSelectTab(c,x,y)
-  v = $demo_rulerInfo
-  v.x = c.canvasx(x, v.grid)
-  v.y = v.top+2
-  c.addtag_withtag('active', 'current')
-  c.itemconfigure('active', v.activeStyle)
-  c.raise('active')
-end
-
-# rulerMoveTab --
-# This method is invoked during mouse motion events to drag a tab.
-# It adjusts the position of the tab, and changes its appearance if
-# it is about to be dragged out of the ruler.
-#
-# Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse.
-
-def rulerMoveTab(c,x,y)
-  v = $demo_rulerInfo
-  return if c.find_withtag('active') == []
-  cx = c.canvasx(x,v.grid)
-  cy = c.canvasy(y)
-  cx = v.left if cx < v.left
-  cx = v.right if cx > v.right
-  if (cy >= v.top && cy <= v.bottom)
-    cy = v.top+2
-    c.itemconfigure('active', v.activeStyle)
-  else
-    cy = cy-v.size-2
-    c.itemconfigure('active', v.deleteStyle)
-  end
-  c.move('active', cx-v.x, cy-v.y)
-  v.x = cx
-  v.y = cy
-end
-
-# rulerReleaseTab --
-# This method is invoked during button release events that end
-# a tab drag operation.  It deselects the tab and deletes the tab if
-# it was dragged out of the ruler.
-#
-# Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse.
-
-def rulerReleaseTab(c)
-  v = $demo_rulerInfo
-  return if c.find_withtag('active') == []
-  if v.y != v.top+2
-    c.delete('active')
-  else
-    c.itemconfigure('active', v.normalStyle)
-    c.dtag('active')
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/sayings.rb b/ext/tk/sample/demos-en/sayings.rb
deleted file mode 100644
index a4dcf37cdc..0000000000
--- a/ext/tk/sample/demos-en/sayings.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# sayings.rb
-#
-# This demonstration script creates a listbox that can be scrolled
-# both horizontally and vertically.  It displays a collection of
-# well-known sayings.
-#
-# listbox widget demo 'sayings' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($sayings_demo) && $sayings_demo
-  $sayings_demo.destroy
-  $sayings_demo = nil
-end
-
-# demo toplevel widget
-$sayings_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (well-known sayings)")
-  iconname("sayings")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($sayings_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "The listbox below contains a collection of well-known sayings.  You can scan the list using either of the scrollbars or by dragging in the listbox window with button 2 pressed."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $sayings_demo
-      $sayings_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'sayings'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-sayings_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
-  sv = TkScrollbar.new(w)
-  sh = TkScrollbar.new(w, 'orient'=>'horizontal')
-  sayings_lbox = TkListbox.new(w) {
-    setgrid 1
-    width  20
-    height 10
-    yscrollcommand proc{|first,last| sv.set first,last}
-    xscrollcommand proc{|first,last| sh.set first,last}
-  }
-  sv.command(proc{|*args| sayings_lbox.yview(*args)})
-  sh.command(proc{|*args| sayings_lbox.xview(*args)})
-
-  if $tk_version =~ /^4\.[01]/
-    sv.pack('side'=>'right', 'fill'=>'y')
-    sh.pack('side'=>'bottom', 'fill'=>'x')
-    sayings_lbox.pack('expand'=>'yes', 'fill'=>'y')
-
-  else
-    sayings_lbox.grid('row'=>0, 'column'=>0,
-                      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sv.grid('row'=>0, 'column'=>1,
-            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sh.grid('row'=>1, 'column'=>0,
-            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
-  end
-
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-sayings_lbox.insert(0,
-"Waste not, want not",
-"Early to bed and early to rise makes a man healthy, wealthy, and wise",
-"Ask not what your country can do for you, ask what you can do for your country",
-"I shall return",
-"NOT",
-"A picture is worth a thousand words",
-"User interfaces are hard to build",
-"Thou shalt not steal",
-"A penny for your thoughts",
-"Fool me once, shame on you;  fool me twice, shame on me",
-"Every cloud has a silver lining",
-"Where there's smoke there's fire",
-"It takes one to know one",
-"Curiosity killed the cat; but satisfaction brought it back",
-"Take this job and shove it",
-"Up a creek without a paddle",
-"I'm mad as hell and I'm not going to take it any more",
-"An apple a day keeps the doctor away",
-"Don't look a gift horse in the mouth"
-)
-
diff --git a/ext/tk/sample/demos-en/search.rb b/ext/tk/sample/demos-en/search.rb
deleted file mode 100644
index 7fb40d88b2..0000000000
--- a/ext/tk/sample/demos-en/search.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-# search.rb
-#
-# This demonstration script creates a collection of widgets that
-# allow you to load a file into a text widget, then perform searches
-# on that file.
-#
-# Text Search widget demo (called by 'widget')
-#
-
-# textLoadFile --
-# This method below loads a file into a text widget, discarding
-# the previous contents of the widget. Tags for the old widget are
-# not affected, however.
-#
-# Arguments:
-# w -           The window into which to load the file.  Must be a
-#               text widget.
-# file -        The name of the file to load.  Must be readable.
-
-def textLoadFile(w,file)
-  w.delete('1.0', 'end')
-  f = open(file, 'r')
-  while(!f.eof?)
-    w.insert('end', f.read(1000))
-  end
-  f.close
-end
-
-# textSearch --
-# Search for all instances of a given string in a text widget and
-# apply a given tag to each instance found.
-#
-# Arguments:
-# w -           The window in which to search.  Must be a text widget.
-# string -      The string to search for.  The search is done using
-#               exact matching only;  no special characters.
-# tag -         Tag to apply to each instance of a matching string.
-
-def textSearch(w, string, tag)
-  tag.remove('0.0', 'end')
-  return if string == ""
-  cur = '1.0'
-  loop {
-    cur, len = w.search_with_length(string, cur, 'end')
-    break if cur == ""
-    tag.add(cur, "#{cur} + #{len} char")
-    cur = w.index("#{cur} + #{len} char")
-  }
-end
-
-# textToggle --
-# This method is invoked repeatedly to invoke two commands at
-# periodic intervals.  It normally reschedules itself after each
-# execution but if an error occurs (e.g. because the window was
-# deleted) then it doesn't reschedule itself.
-#
-# Arguments:
-# cmd1 -        Command to execute when method is called.
-# sleep1 -      Ms to sleep after executing cmd1 before executing cmd2.
-# cmd2 -        Command to execute in the *next* invocation of this method.
-# sleep2 -      Ms to sleep after executing cmd2 before executing cmd1 again.
-
-def textToggle(cmd1,sleep1,cmd2,sleep2)
-  sleep_list = [sleep2, sleep1]
-  TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep},
-              -1, cmd1, cmd2).start(sleep1)
-end
-
-# toplevel widget
-if defined?($search_demo) && $search_demo
-  $search_demo.destroy
-  $search_demo = nil
-end
-
-# demo toplevel widget
-$search_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Search and Highlight")
-  iconname("search")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($search_demo).pack(:fill=>:both, :expand=>true)
-
-# frame
-$search_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $search_demo
-      $search_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'search'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-TkFrame.new(base_frame) {|f|
-  TkLabel.new(f, 'text'=>'File name:',
-              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
-  $search_fileName = TkVariable.new
-  TkEntry.new(f, 'width'=>40,
-              'textvariable'=>$search_fileName) {
-    pack('side'=>'left')
-    bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
-                        $search_string_entry.focus})
-    focus
-  }
-  TkButton.new(f, 'text'=>'Load File',
-               'command'=>proc{textLoadFile($search_text,
-                                            $search_fileName.value)})\
-  .pack('side'=>'left', 'pady'=>5, 'padx'=>10)
-}.pack('side'=>'top', 'fill'=>'x')
-
-TkFrame.new(base_frame) {|f|
-  TkLabel.new(f, 'text'=>'Search string:',
-              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
-  $search_searchString = TkVariable.new
-  $search_string_entry = TkEntry.new(f, 'width'=>40,
-                                     'textvariable'=>$search_searchString) {
-    pack('side'=>'left')
-    bind('Return', proc{textSearch($search_text, $search_searchString.value,
-                                   $search_Tag)})
-  }
-  TkButton.new(f, 'text'=>'Highlight',
-               'command'=>proc{textSearch($search_text,
-                                          $search_searchString.value,
-                                          $search_Tag)}) {
-    pack('side'=>'left', 'pady'=>5, 'padx'=>10)
-  }
-}.pack('side'=>'top', 'fill'=>'x')
-
-$search_text = TkText.new(base_frame, 'setgrid'=>true, 'wrap'=>'word') {|t|
-  $search_Tag = TkTextTag.new(t)
-  TkScrollbar.new(base_frame, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
-    t.yscrollcommand(proc{|first,last| sc.set first,last})
-    pack('side'=>'right', 'fill'=>'y')
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-}
-
-# Set up display styles for text highlighting.
-
-if TkWinfo.depth($search_demo) > 1
-  textToggle(proc{
-               $search_Tag.configure('background'=>'#ce5555',
-                                     'foreground'=>'white')
-             },
-             800,
-             proc{
-               $search_Tag.configure('background'=>'', 'foreground'=>'')
-             },
-             200 )
-else
-  textToggle(proc{
-               $search_Tag.configure('background'=>'black',
-                                     'foreground'=>'white')
-             },
-             800,
-             proc{
-               $search_Tag.configure('background'=>'', 'foreground'=>'')
-             },
-             200 )
-end
-$search_text.insert('1.0', "\
-This window demonstrates how to use the tagging facilities in text \
-widgets to implement a searching mechanism.  First, type a file name \
-in the top entry, then type <Return> or click on \"Load File\".  Then \
-type a string in the lower entry and type <Return> or click on \
-\"Load File\".  This will cause all of the instances of the string to \
-be tagged with the tag \"search\", and it will arrange for the tag\'s \
-display attributes to change to make all of the strings blink.")
-$search_text.insert('end', "\
-The current directory to load a file is \"#{Dir.pwd}\".\
-")
-$search_text.set_insert '0.0'
-
-$search_fileName.value = ''
-$search_searchString.value = ''
-
-$search_text.width = 60
-$search_text.height = 20
diff --git a/ext/tk/sample/demos-en/spin.rb b/ext/tk/sample/demos-en/spin.rb
deleted file mode 100644
index d51b7e6619..0000000000
--- a/ext/tk/sample/demos-en/spin.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# spin.rb --
-#
-# This demonstration script creates several spinbox widgets.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($spin_demo) && $spin_demo
-  $spin_demo.destroy
-  $spin_demo = nil
-end
-
-$spin_demo = TkToplevel.new {|w|
-  title("Spinbox Demonstration")
-  iconname("spin")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($spin_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'5i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-Three different spin-boxes are displayed below.  \
-You can add characters by pointing, clicking and typing.  \
-The normal Motif editing characters are supported, along with \
-many Emacs bindings.  For example, Backspace and Control-h \
-delete the character to the left of the insertion cursor and \
-Delete and Control-d delete the chararacter to the right of the \
-insertion cursor.  For values that are too large to fit in the \
-window all at once, you can scan through the value by dragging \
-with mouse button2 pressed.  Note that the first spin-box will \
-only permit you to type in integers, and the third selects from \
-a list of Australian cities.
-If your Tk library linked to Ruby doesn't include a 'spinbox' widget, \
-this demo doesn't work. Please use later version of Tk \
-which supports a 'spinbox' widget.
-EOL
-
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $spin_demo.destroy
-                 $spin_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'spin'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-australianCities = [
-    'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide',
-    'Brisbane', 'Hobart', 'Darwin', 'Alice Springs'
-]
-
-[
-  TkSpinbox.new(base_frame, :from=>1, :to=>10, :width=>10, :validate=>:key,
-                :validatecommand=>[
-                  proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-                ]),
-  TkSpinbox.new(base_frame, :from=>0, :to=>3, :increment=>0.5,
-                :format=>'%05.2f', :width=>10),
-  TkSpinbox.new(base_frame, :values=>australianCities, :width=>10)
-].each{|sbox| sbox.pack(:side=>:top, :pady=>5, :padx=>10)}
diff --git a/ext/tk/sample/demos-en/square b/ext/tk/sample/demos-en/square
deleted file mode 100644
index bb66282154..0000000000
--- a/ext/tk/sample/demos-en/square
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env ruby
-
-# square --
-# This script generates a demo application containing only
-# a "square" widget.  It's only usable if Tk has been compiled
-# with tkSquare.c and with the -DSQUARE_DEMO compiler switch.
-# This demo arranges the following bindings for the widget:
-#
-# Button-1 press/drag:          moves square to mouse
-# "a":                          toggle size animation on/off
-#
-
-require 'tk'
-require 'tkafter'
-
-class TkSquare<TkWindow
-  def create_self
-    begin
-      tk_call 'square', path
-    rescue
-      STDERR.print "\nSorry. Your Tk interpreter does not contain " +
-	'a "square" demonstration widget.' +
-	"\n ( See documents included the Tcl/Tk source archive. )\n\n"
-      exit
-    end
-  end
-  def size(amount=nil)
-    if amount
-      tk_send 'size', amount
-    else
-      number(tk_send('size'))
-    end
-  end
-  def position(x,y)
-    tk_send 'position', x, y
-  end
-end
-
-$s = TkSquare.new{
-  pack('expand'=>'yes', 'fill'=>'both')
-  bind('1', proc{|x,y| center(x,y)}, '%s %y')
-  bind('B1-Motion', proc{|x,y| center(x,y)}, '%s %y')
-  bind('a', proc{animate})
-  focus
-}
-TkRoot.new.minsize(1,1)
-
-# The procedure below centers the square on a given position.
-
-def center(x,y)
-  a = $s.size
-  $s.position(x-(a/2), y-(a/2))
-end
-
-# The procedures below provide a simple form of animation where
-# the box changes size in a pulsing pattern: larger, smaller, larger,
-# and so on.
-
-$inc = 0
-
-def timer_proc
-  a = $s.size
-  return if $inc == 0
-  $inc = -3 if a >= 40
-  $inc =  3 if a <= 10
-  $s.size(a+$inc)
-end
-
-$timer = TkAfter.new(30, -1, proc{timer_proc})
-
-def animate
-  if $inc == 0
-    $inc = 3
-    $timer.start
-  else
-    $inc = 0
-    $timer.stop
-  end
-end
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/states.rb b/ext/tk/sample/demos-en/states.rb
deleted file mode 100644
index a5c01a867c..0000000000
--- a/ext/tk/sample/demos-en/states.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# states.rb
-#
-# This demonstration script creates a listbox widget that displays
-# the names of the 50 states in the United States of America.
-#
-# listbox widget demo 'states' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($states_demo) && $states_demo
-  $states_demo.destroy
-  $states_demo = nil
-end
-
-# demo toplevel widget
-$states_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (states)")
-  iconname("states")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($states_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "A listbox containing the 50 states is displayed below, along with a scrollbar.  You can scan the list either using the scrollbar or by scanning.  To scan, press button 2 in the widget and drag up or down."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $states_demo
-      $states_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'states'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-states_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>'.5c') {|w|
-  s = TkScrollbar.new(w)
-  states_lbox = TkListbox.new(w) {
-    setgrid 1
-    height 12
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| states_lbox.yview(*args)})
-  s.pack('side'=>'right', 'fill'=>'y')
-  states_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-ins_data = [
-  'Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California',
-  'Colorado', 'Connecticut', 'Delaware', 'Florida', 'Georgia',
-  'Hawaii', 'Idaho', 'Illinois',
-  'Indiana', 'Iowa', 'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland',
-  'Massachusetts', 'Michigan', 'Minnesota', 'Mississippi', 'Missouri',
-  'Montana', 'Nebraska', 'Nevada', 'New_Hampshire', 'New_Jersey', 'New_Mexico',
-  'New_York', 'North_Carolina', 'North_Dakota',
-  'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania', 'Rhode_Island',
-  'South_Carolina', 'South_Dakota',
-  'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington',
-  'West_Virginia', 'Wisconsin', 'Wyoming'
-]
-
-states_lbox.insert(0, *ins_data)
-
diff --git a/ext/tk/sample/demos-en/style.rb b/ext/tk/sample/demos-en/style.rb
deleted file mode 100644
index 5c8777379e..0000000000
--- a/ext/tk/sample/demos-en/style.rb
+++ /dev/null
@@ -1,231 +0,0 @@
-# style.rb
-#
-# This demonstration script creates a text widget that illustrates the
-# various display styles that may be set for tags.
-#
-# text (display styles) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($style_demo) && $style_demo
-  $style_demo.destroy
-  $style_demo = nil
-end
-
-# demo toplevel widget
-$style_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Display Styles")
-  iconname("style")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($style_demo).pack(:fill=>:both, :expand=>true)
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $style_demo
-      $style_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'style'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# text
-txt = TkText.new(base_frame){|t|
-  #
-  setgrid 'true'
-  #width  70
-  #height 32
-  wrap 'word'
-  font $font
-  TkScrollbar.new(base_frame) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  #
-  family = 'Courier'
-
-  if $tk_version =~ /^4.*/
-    style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
-    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
-    style_tag_verybig = TkTextTag.new(t, 'font'=>'-*-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*')
-    #    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
-    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-  else
-    style_tag_bold = TkTextTag.new(t, 'font'=>[family, 12, :bold, :italic])
-    style_tag_big = TkTextTag.new(t, 'font'=>[family, 14, :bold])
-    style_tag_verybig = TkTextTag.new(t, 'font'=>['Helvetica', 24, :bold])
-    style_tag_small = TkTextTag.new(t, 'font'=>'Times 8 bold')
-  end
-###
-#  case($tk_version)
-#  when /^4.*/
-#    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
-#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
-#  when /^8.*/
-#    unless $style_demo_do_first
-#      $style_demo_do_first = true
-#      Tk.tk_call('font', 'create', '@bigascii',
-#                '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
-#      Tk.tk_call('font', 'create', '@smallascii',
-#                '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-#      Tk.tk_call('font', 'create', '@cBigFont',
-#                '-compound', '@bigascii @msg_knj')
-#      Tk.tk_call('font', 'create', '@cSmallFont',
-#                '-compound', '@smallascii @kanji')
-#    end
-#    style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
-#    style_tag_small = TkTextTag.new(t, 'font'=>'@cSmallFont')
-#  end
-
-  #
-  if TkWinfo.depth($root).to_i > 1
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'#a0b7ce')
-    style_tag_color2 = TkTextTag.new(t, 'foreground'=>'red')
-    style_tag_raised = TkTextTag.new(t, 'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
-  else
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'black',
-                                     'foreground'=>'white')
-    style_tag_color2 = TkTextTag.new(t, 'background'=>'black',
-                                     'foreground'=>'white')
-    style_tag_raised = TkTextTag.new(t, 'background'=>'white',
-                                     'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'background'=>'white',
-                                     'relief'=>'sunken', 'borderwidth'=>1)
-  end
-
-  #
-  if $tk_version =~ /^4\.[01]/
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
-                                        'borderwidth'=>0,
-                                        'bgstipple'=>'gray25')
-  else
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
-                                        'borderwidth'=>0,
-                                        'bgstipple'=>'gray12')
-  end
-  style_tag_fgstipple = TkTextTag.new(t, 'fgstipple'=>'gray50')
-  style_tag_underline = TkTextTag.new(t, 'underline'=>'on')
-  style_tag_overstrike = TkTextTag.new(t, 'overstrike'=>'on')
-  style_tag_right  = TkTextTag.new(t, 'justify'=>'right')
-  style_tag_center = TkTextTag.new(t, 'justify'=>'center')
-  if $tk_version =~ /^4.*/
-    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-  else
-    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>[family, 10])
-    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>[family, 10])
-  end
-  style_tag_margins = TkTextTag.new(t, 'lmargin1'=>'12m', 'lmargin2'=>'6m',
-                                    'rmargin'=>'10m')
-  style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
-                                    'lmargin1'=>'12m', 'lmargin2'=>'6m',
-                                    'rmargin'=>'10m')
-
-  #
-  insert('end', 'Text widgets like this one allow you to display information in a
-variety of styles.  Display styles are controlled using a mechanism
-called ')
-  insert('end', 'tags', style_tag_big)
-  insert('end', '. Tags are just textual names that you can apply to one
-or more ranges of characters within a text widget.  You can configure
-tags with various display styles.  If you do this, then the tagged
-characters will be displayed with the styles you chose.  The
-available display styles are:
-')
-  insert('end', "\n1. Font.", style_tag_big)
-  insert('end', "  You can choose any X font, ")
-  insert('end', "large", style_tag_verybig)
-  insert('end', " or ")
-  insert('end', "small", style_tag_small)
-  insert('end', ".\n")
-  insert('end', "\n2. Color.", style_tag_big)
-  insert('end', "  You can change either the ")
-  insert('end', "background", style_tag_color1)
-  insert('end', " or ")
-  insert('end', "foreground", style_tag_color2)
-  insert('end', "\ncolor, or ")
-  insert('end', "both", style_tag_color1, style_tag_color2)
-  insert('end', ".\n")
-  insert('end', "\n3. Stippling.", style_tag_big)
-  insert('end', "  You can cause either the ")
-  insert('end', "background", style_tag_bgstipple)
-  insert('end', " or ")
-  insert('end', "foreground", style_tag_fgstipple)
-  insert('end', "\ninformation to be drawn with a stipple fill instead of a solid fill.\n")
-  insert('end', "\n4. Underlining.", style_tag_big)
-  insert('end', "  You can ")
-  insert('end', "underline", style_tag_underline)
-  insert('end', " ranges of text.\n")
-  insert('end', "\n5. Overstrikes.", style_tag_big)
-  insert('end', "  You can ")
-  insert('end', "draw lines through", style_tag_overstrike)
-  insert('end', " ranges of text.\n")
-  insert('end', "\n6. 3-D effects.", style_tag_big)
-  insert('end', "  You can arrange for the background to be drawn\nwith a border that makes characters appear either\n")
-  insert('end', "raised", style_tag_raised)
-  insert('end', " or ")
-  insert('end', "sunken", style_tag_sunken)
-  insert('end', ".\n")
-  insert('end', "\n7. Justification.", style_tag_big)
-  insert('end', " You can arrange for lines to be displayed\n")
-  insert('end', "left-justified,\n")
-  insert('end', "right-justified, or\n", style_tag_right)
-  insert('end', "centered.\n", style_tag_center)
-  insert('end', "\n8. Superscripts and subscripts.", style_tag_big)
-  insert('end', " You can control the vertical\n")
-  insert('end', "position of text to generate superscript effects like 10")
-  insert('end', "n", style_tag_super)
-  insert('end', " or\nsubscript effects like X")
-  insert('end', "i", style_tag_sub)
-  insert('end', ".\n")
-  insert('end', "\n9. Margins.", style_tag_big)
-  insert('end', " You can control the amount of extra space left")
-  insert('end', " on\neach side of the text:\n")
-  insert('end', "This paragraph is an example of the use of ", style_tag_margins)
-  insert('end', "margins.  It consists of a single line of text ", style_tag_margins)
-  insert('end', "that wraps around on the screen.  There are two ", style_tag_margins)
-  insert('end', "separate left margin values, one for the first ", style_tag_margins)
-  insert('end', "display line associated with the text line, ", style_tag_margins)
-  insert('end', "and one for the subsequent display lines, which ", style_tag_margins)
-  insert('end', "occur because of wrapping.  There is also a ", style_tag_margins)
-  insert('end', "separate specification for the right margin, ", style_tag_margins)
-  insert('end', "which is used to choose wrap points for lines.\n", style_tag_margins)
-  insert('end', "\n10. Spacing.", style_tag_big)
-  insert('end', " You can control the spacing of lines with three\n")
-  insert('end', "separate parameters.  \"Spacing1\" tells how much ")
-  insert('end', "extra space to leave\nabove a line, \"spacing3\" ")
-  insert('end', "tells how much space to leave below a line,\nand ")
-  insert('end', "if a text line wraps, \"spacing2\" tells how much ")
-  insert('end', "space to leave\nbetween the display lines that ")
-  insert('end', "make up the text line.\n")
-  insert('end', "These indented paragraphs illustrate how spacing ", style_tag_spacing)
-  insert('end', "can be used.  Each paragraph is actually a ", style_tag_spacing)
-  insert('end', "single line in the text widget, which is ", style_tag_spacing)
-  insert('end', "word-wrapped by the widget.\n", style_tag_spacing)
-  insert('end', "Spacing1 is set to 10 points for this text, ", style_tag_spacing)
-  insert('end', "which results in relatively large gaps between ", style_tag_spacing)
-  insert('end', "the paragraphs.  Spacing2 is set to 2 points, ", style_tag_spacing)
-  insert('end', "which results in just a bit of extra space ", style_tag_spacing)
-  insert('end', "within a pararaph.  Spacing3 isn't used ", style_tag_spacing)
-  insert('end', "in this example.\n", style_tag_spacing)
-  insert('end', "To see where the space is, select ranges of ", style_tag_spacing)
-  insert('end', "text within these paragraphs.  The selection ", style_tag_spacing)
-  insert('end', "highlight will cover the extra space.", style_tag_spacing)
-
-}
-
-txt.width 70
-txt.height 32
diff --git a/ext/tk/sample/demos-en/tcolor b/ext/tk/sample/demos-en/tcolor
deleted file mode 100644
index 48cda6d1da..0000000000
--- a/ext/tk/sample/demos-en/tcolor
+++ /dev/null
@@ -1,526 +0,0 @@
-#!/usr/bin/env ruby
-#
-# tcolor --
-#   simple color editor which supports RGB, HSB and CYM color space
-#
-# Copyright (C) 1998 Takaaki Tateishi(ttate@jaist.ac.jp)
-# last update: Thu Jun 18 06:32:35 JST 1998
-#
-
-require "tk"
-
-
-# use TkVariable instance for the variable which is changed by Tk interpreter
-
-$colorSpace = TkVariable.new(:rgb)
-$master = nil
-$red = 65535
-$green = 0
-$blue = 0
-$color = "#ffff00000000"
-$updating = TkVariable.new(0)
-$autoUpdate = TkVariable.new(1)
-$name = TkVariable.new($color)
-$command = TkVariable.new("print(%%,\"\n\")")
-# $command = TkVariable.new("")
-$label1 = TkVariable.new("label1")
-$label2 = TkVariable.new("label2")
-$label3 = TkVariable.new("label3")
-
-
-# setup the entry of the resourc database
-if (TkVarAccess.new('tcl_platform')['platform'] == 'unix')
-  TkOptionDB.add('*Entry.background', 'white')
-end
-
-
-# methods for events
-
-def rgbToHsv(red,green,blue)
-
-  if ( red > green )
-    max = red
-    min = green
-  else
-    max = green
-    min = red
-  end
-
-  if ( blue > max )
-    max = blue
-  else
-    if ( blue < min )
-      min = blue
-    end
-  end
-
-  range = max - min
-
-  if ( max == 0 )
-    sat = 0.0
-  else
-    sat = (max-min)/max
-  end
-
-  if ( sat == 0 )
-    hue = 0.0
-  else
-    rc = (max-red)/range
-    gc = (max-green)/range
-    bc = (max-blue)/range
-    if ( red == max )
-      hue = 0.166667 * (bc - gc)
-    else
-      if ( green == max )
-	hue = 0.166667 * (2.0 + rc - bc)
-      else
-	hue = 0.166667 * (4.0 + gc - rc)
-      end
-    end
-    if ( hue < 0.0 )
-      hue = hue + 1.0
-    end
-  end
-
-  [hue,sat,max/65535]
-end
-
-
-def hsbToRgb(hue,sat,value)
-  v = 65535.0 * value
-  if( sat == 0 )
-    ans = [v,v,v]
-  else
-    hue = hue*6.0
-    if ( hue >= 6 )
-      hue = 0.0
-    end
-    i = hue.to_i
-    f = hue - i
-    p = 65535.0 * value * (1.0 - sat)
-    q = 65535.0 * value * (1.0 - (sat * f))
-    t = 65535.0 * value * (1.0 - (sat * (1.0 - f)))
-    case i
-    when 0
-      ans = [v,t,p]
-    when 1
-      ans = [q,v,p]
-    when 2
-      ans = [p,v,t]
-    when 3
-      ans = [p,q,v]
-    when 4
-      ans = [t,p,v]
-    when 5
-      ans = [v,p,q]
-    else
-      raise(eException,"i value #{i} is out of range")
-    end
-  end
-  return ans
-end
-
-
-def _null_binding
-  Module.new.instance_eval{binding}
-end
-private :_null_binding
-
-def doUpdate
-  newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
-  eval(newCmd, _null_binding)
-end
-
-
-def tc_scaleChanged
-  if( $updating.to_i == 1 )
-    return
-  end
-
-  $master = :scale if $master == nil
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-
-  case $colorSpace.value.intern
-  when :rgb
-    $red = (scale1.get * 65.535).to_i
-    $green = (scale2.get * 65.535).to_i
-    $blue = (scale3.get * 65.535).to_i
-  when :cmy
-    $red = (65535 - scale1.get * 65.535).to_i
-    $green = (65535 - scale2.get * 65.535).to_i
-    $blue = (65535 - scale3.get * 65.535).to_i
-  when :hsb
-    list = hsbToRgb(scale1.get / 1000.0,
-		    scale2.get / 1000.0,
-		    scale3.get / 1000.0)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-  $color = format("#%04x%04x%04x",$red.to_i,$green.to_i,$blue.to_i)
-  $name.value = $color if $master == :scale
-  $root.middle.right.set_color($color)
-  if( $autoUpdate.to_i == 1 )
-    doUpdate
-  end
-  Tk.update(true)
-  $master = nil if $master == :scale
-end
-
-
-def tc_setScales
-  $updating.value = 1
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-
-  case $colorSpace.value.intern
-  when :rgb
-    scale1.set($red / 65.535)
-    scale2.set($green / 65.535)
-    scale3.set($blue / 65.535)
-  when :cmy
-    scale1.set((65535 - $red) / 65.535)
-    scale2.set((65535 - $green) / 65.535)
-    scale3.set((65535 - $blue) / 65.535)
-  when :hsb
-    list = rgbToHsv($red,$green,$blue)
-    scale1.set( list[0] * 1000.0 )
-    scale2.set( list[1] * 1000.0 )
-    scale3.set( list[2] * 1000.0 )
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-
-  $updating.value = 0
-end
-
-
-def tc_loadNamedColor(name)
-  $name.value = name
-  $master = :name if $master == nil
-  if name[0,1] != "#"
-    list = TkWinfo.rgb($root.middle.right.swatch,name)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    case name.length
-    when 4
-      fmt = /#(.{1})(.{1})(.{1})/
-      shift = 12
-    when 7
-      fmt = /#(.{2})(.{2})(.{2})/
-      shift = 8
-    when 10
-      fmt = /#(.{3})(.{3})(.{3})/
-      shift = 4
-    when 13
-      fmt = /#(.{4})(.{4})(.{4})/
-      shift = 0
-    else
-      raise(eException,"syntax error in color name \"#{name}\"")
-    end
-    name.scan(fmt){|strlist|
-      if strlist.length != 3
-	raise(eException,"syntax error in color name \"#{name}\"")
-      end
-      $red = strlist[0].hex
-      $green = strlist[1].hex
-      $blue = strlist[2].hex
-    }
-    $red = $red << shift
-    $green = $green << shift
-    $blue = $blue << shift
-  end
-
-  tc_setScales
-  $color = format("#%04x%04x%04x",$red,$green,$blue)
-  $root.middle.right.set_color($color)
-  if $autoUpdate.to_i == 1
-    doUpdate
-  end
-  Tk.update(true)
-  $master = nil if $master == :name
-end
-
-
-def changeColorSpace(space)
-  case space
-  when :rgb
-    $label1.value = "Red"
-    $label2.value = "Green"
-    $label3.value = "Blue"
-  when :cmy
-    $label1.value = "Cyan"
-    $label2.value = "Magenta"
-    $label3.value = "Yellow"
-  when :hsb
-    $label1.value = "Hue"
-    $label2.value = "Saturation"
-    $label3.value = "Brightness"
-  end
-  tc_setScales
-end
-
-
-# menu
-
-class TkColorMenuFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=>"raised",
-	  "borderwidth"=>"2")
-
-    # File menubutton
-    @file = TkMenubutton.new(self){|button|
-
-      # File menu
-      @file_menu = TkMenu.new(button){
-	add "radio",
-	  "label" => "RGB color space",
-	  "variable" => $colorSpace,
-	  "value" => :rgb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:rgb)}
-	add "radio",
-	  "label" => "CMY color space",
-	  "variable" => $colorSpace,
-	  "value" => :cmy,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:cmy)}
-	add "radio",
-	  "label" => "HSB color space",
-	  "variable" => $colorSpace,
-	  "value" => :hsb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:hsb)}
-	add "separator"
-	add "radio",
-	  "label" => "Automatic updates",
-	  "variable" => $autoUpdate,
-	  "value" => "1",
-	  "underline" => "0"
-	add "radio",
-	  "label" => "Manual updates",
-	  "variable" => $autoUpdate,
-	  "value" => "0",
-	  "underline" => "0"
-	add "separator"
-	add "command",
-	  "label" => "Exit program",
-	  "underline" => "0",
-	  "command" => proc{exit}
-      }
-
-      # assign File menu to File button
-      menu @file_menu
-
-      text "File"
-      underline "0"
-    }.pack("side"=>"left")
-
-    self
-  end
-end
-
-
-# bottom frame
-class TkColorBotFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> 2)
-
-    @commandLabel = TkLabel.new(self,
-				"text"=> "Command:")
-    @command = TkEntry.new(self,
-			   "relief"=> "sunken",
-			   "borderwidth"=> "2",
-			   "textvariable"=> $command,
-			   "font"=> "-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @update = TkButton.new(self,
-			   "text"=> "Update",
-			   "command"=> proc{doUpdate})
-    @commandLabel.pack("side"=>"left")
-    @update.pack("side"=>"right","pady"=>".1c","padx"=>".25c")
-    @command.pack("expand"=>"yes","fill"=>"x","ipadx"=>".25c")
-
-    self
-  end
-end
-
-
-# left side frame of middle level
-class TkColorMiddleLeftFrame<TkFrame
-  def initialize(parent)
-    super(parent)
-
-    for i in ["/usr/local/lib/X11rgb.txt","/usr/lib/X11/rgb.txt",
-	"/X11/R5/lib/X11/rgb.txt","/X11/R4/lib/rgb/rgb.txt",
-	"/usr/openwin/lib/X11/rgb.txt"]
-      if !File.readable?(i)
-	next
-      end
-      f = File.open(i)
-      @scroll = TkScrollbar.new(self,
-				"orient"=>"vertical",
-				"relief"=>"sunken",
-				"borderwidth"=>"2")
-      @scroll.pack("side"=>"right","fill"=>"y")
-      @names = TkListbox.new(self,
-			     "width"=>"20",
-			     "height"=>"12",
-			     "yscrollcommand"=> proc{|first,last| @scroll.set first,last},
-			     "relief"=>"sunken",
-			     "borderwidth"=>"2",
-			     "exportselection"=>"false")
-      @scroll.command(proc{|*args| @names.yview(*args)})
-      @names.bind("Double-1",proc{
-		    tc_loadNamedColor(@names.get(@names.curselection))})
-      @names.pack("side"=>"left")
-      while (line = f.gets)
-	line.chop!
-	linelist = line.split(/[ \t]+/)
-	if linelist.length == 4
-	  @names.insert("end",linelist[3])
-	end
-      end
-      f.close
-      break
-    end
-
-    self
-  end
-end
-
-
-# middle frame of middle level
-class TkColorMiddleMiddleFrame<TkFrame
-  attr_reader :scale1, :scale2, :scale3
-
-  def initialize(parent)
-    super(parent)
-
-    @f1 = TkFrame.new(self)
-    @f2 = TkFrame.new(self)
-    @f3 = TkFrame.new(self)
-    @f4 = TkFrame.new(self)
-
-    for f in [@f1,@f2,@f3]
-      f.pack("side"=>"top","expand"=>"yes")
-    end
-    @f4.pack("side"=>"top","expand"=>"yes","fill"=>"x")
-
-    @label1 = TkLabel.new(self,"textvariable"=>$label1)
-    @scale1 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale1.pack("side"=>"top","anchor"=>"w")
-    @label1.pack("side"=>"top","anchor"=>"w")
-
-    @label2 = TkLabel.new(self,"textvariable"=>$label2)
-    @scale2 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale2.pack("side"=>"top","anchor"=>"w")
-    @label2.pack("side"=>"top","anchor"=>"w")
-
-    @label3 = TkLabel.new(self,"textvariable"=>$label3)
-    @scale3 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale3.pack("side"=>"top","anchor"=>"w")
-    @label3.pack("side"=>"top","anchor"=>"w")
-
-    @nameLabel = TkLabel.new(self,"text"=>"Name:")
-    @name = TkEntry.new(self,"relief"=>"sunken","borderwidth"=>"2",
-			"textvariable"=>$name,"width"=>"10",
-			"font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @nameLabel.pack("side"=>"left")
-    @name.pack("side"=>"right", "expand"=>"1", "fill"=>"x")
-    @name.bind("Return",proc{tc_loadNamedColor $name.to_s})
-
-    self
-  end
-end
-
-
-class TkColorMiddleRightFrame<TkFrame
-  attr_reader :swatch
-
-  def initialize(parent)
-    super(parent)
-    @swatch = TkFrame.new(self, "width"=>"2c", "height"=>"5c",
-			  "background"=>$color)
-    @value = TkLabel.new(self,
-			 "text"=>$color,
-			 "width"=>"13",
-			 "font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @swatch.pack("side"=>"top","expand"=>"yes","fill"=>"both")
-    @value.pack("side"=>"bottom","pady"=>".25c")
-
-    self
-  end
-
-  def set_color(color)
-    @swatch["background"] = color
-    @value["text"] = color
-  end
-end
-
-
-
-# middle level frame
-class TkColorMiddleFrame<TkFrame
-  attr_reader :left, :middle, :right
-
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> "2")
-
-    @left = TkColorMiddleLeftFrame.new(self)
-    @left.pack("side"=>"left","padx"=>".25c","pady"=>".25c")
-
-    @middle = TkColorMiddleMiddleFrame.new(self)
-    @middle.pack("side"=>"left","expand"=>"yes","fill"=>"y")
-
-    @right = TkColorMiddleRightFrame.new(self)
-    @right.pack("side"=>"left","padx"=>".25c","pady"=>".25c","anchor"=>"s")
-
-    self
-  end
-end
-
-
-class TkColor<TkRoot
-  attr_reader :menu, :bottom, :middle
-
-  def initialize(*args)
-    super(*args)
-    @menu = TkColorMenuFrame.new(self)
-    @menu.pack("side"=>"top", "fill"=>"x")
-
-    @bottom = TkColorBotFrame.new(self)
-    @bottom.pack("side"=>"bottom","fill"=>"x")
-
-    @middle = TkColorMiddleFrame.new(self)
-    @middle.pack("side"=>"top","fill"=>"both")
-
-    self
-  end
-end
-
-
-$root = TkColor.new
-changeColorSpace :rgb
-
-# start eventloop
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/text.rb b/ext/tk/sample/demos-en/text.rb
deleted file mode 100644
index 5794a85e87..0000000000
--- a/ext/tk/sample/demos-en/text.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-# text.rb
-#
-# This demonstration script creates a text widget that describes
-# the basic editing functions.
-#
-# text (basic facilities) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($text_demo) && $text_demo
-  $text_demo.destroy
-  $text_demo = nil
-end
-
-# demo toplevel widget
-$text_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Basic Facilities")
-  iconname("text")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($text_demo).pack(:fill=>:both, :expand=>true)
-
-# version check
-if ((Tk::TK_VERSION.split('.').collect{|n| n.to_i} <=> [8,4]) < 0)
-  undo_support = false
-else
-  undo_support = true
-end
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $text_demo
-      $text_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'text'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# text
-TkText.new(base_frame){|t|
-  relief 'sunken'
-  bd 2
-  setgrid 1
-  height 30
-  if undo_support
-    undo true
-    autoseparators true
-  end
-  TkScrollbar.new(base_frame) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  #
-  insert('0.0', <<EOT)
-This window is a text widget.  It displays one or more lines of text
-and allows you to edit the text.  Here is a summary of the things you
-can do to a text widget:
-
-1. Scrolling. Use the scrollbar to adjust the view in the text window.
-
-2. Scanning. Press mouse button 2 in the text window and drag up or down.
-This will drag the text at high speed to allow you to scan its contents.
-
-3. Insert text. Press mouse button 1 to set the insertion cursor, then
-type text.  What you type will be added to the widget.
-
-4. Select. Press mouse button 1 and drag to select a range of characters.
-Once you've released the button, you can adjust the selection by pressing
-button 1 with the shift key down.  This will reset the end of the
-selection nearest the mouse cursor and you can drag that end of the
-selection by dragging the mouse before releasing the mouse button.
-You can double-click to select whole words or triple-click to select
-whole lines.
-
-5. Delete and replace. To delete text, select the characters you'd like
-to delete and type Backspace or Delete.  Alternatively, you can type new
-text, in which case it will replace the selected text.
-
-6. Copy the selection. To copy the selection into this window, select
-what you want to copy (either here or in another application), then
-click button 2 to copy the selection to the point of the mouse cursor.
-
-7. Edit.  Text widgets support the standard Motif editing characters
-plus many Emacs editing characters.  Backspace and Control-h erase the
-character to the left of the insertion cursor.  Delete and Control-d
-erase the character to the right of the insertion cursor.  Meta-backspace
-deletes the word to the left of the insertion cursor, and Meta-d deletes
-the word to the right of the insertion cursor.  Control-k deletes from
-the insertion cursor to the end of the line, or it deletes the newline
-character if that is the only thing left on the line.  Control-o opens
-a new line by inserting a newline character to the right of the insertion
-cursor.  Control-t transposes the two characters on either side of the
-insertion cursor. #{
-      if undo_support
-        undo_text = "Control-z undoes the last editing action performed,\nand "
-        case $tk_platform['platform']
-        when "unix", "macintosh"
-          undo_text << "Control-Shift-z"
-        else # 'windows'
-          undo_text << "Control-y"
-        end
-        undo_text << "redoes undone edits."
-      else
-        ""
-      end
-}
-
-7. Resize the window.  This widget has been configured with the "setGrid"
-option on, so that if you resize the window it will always resize to an
-even number of characters high and wide.  Also, if you make the window
-narrow you can see that long lines automatically wrap around onto
-additional lines so that all the information is always visible.
-EOT
-
-  set_insert('0.0')
-}
diff --git a/ext/tk/sample/demos-en/textpeer.rb b/ext/tk/sample/demos-en/textpeer.rb
deleted file mode 100644
index 20192fcd05..0000000000
--- a/ext/tk/sample/demos-en/textpeer.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# text widget peering demo (called by 'widget')
-#
-# based on Tcl/Tk8.5.0 widget demos
-
-if defined?($textpeer_demo) && $textpeer_demo
-  $textpeer_demo.destroy
-  $textpeer_demo = nil
-end
-
-# demo toplevel widget
-$textpeer_demo = TkToplevel.new {|w|
-  title("Text Wdget Peering Demonstration")
-  iconname("textpeer")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($textpeer_demo).pack(:fill=>:both, :expand=>true)
-
-count = [0]
-
-## Define a widget that we peer from; it won't ever actually be shown though
-first = TkText.new(base_frame, :widgetname=>"text#{count[0] += 1}")
-first.insert :end,"This is a coupled pair of text widgets; they are peers to "
-first.insert :end,"each other. They have the same underlying data model, but "
-first.insert :end,"can show different locations, have different current edit "
-first.insert :end,"locations, and have different selections. You can also "
-first.insert :end,"create additional peers of any of these text widgets using "
-first.insert :end,"the Make Peer button beside the text widget to clone, and "
-first.insert :end,"delete a particular peer widget using the Delete Peer "
-first.insert :end,"button."
-
-Tk.update_idletasks  ## for 'first' widget
-
-## Procedures to make and kill clones; most of this is just so that the demo
-## looks nice...
-def makeClone(count, win, txt)
-  cnt = (count[0] += 1)
-  peer = TkText::Peer.new(txt, win, :widgetname=>"text#{cnt}")
-  sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
-  peer.yscrollbar sbar
-  b1 = TkButton.new(win, :widgetname=>"clone#{cnt}", :text=>'Make Peer',
-                    :command=>proc{makeClone(count, win, peer)})
-  b2 = TkButton.new(win, :widgetname=>"kill#{cnt}", :text=>'Delete Peer',
-                    :command=>proc{killClone(win, cnt)})
-  row = cnt * 2
-  TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
-  TkGrid.configure('^',  '^',  b2, :sticky=>'nsew', :row=>(row+=1))
-  TkGrid.configure(b1,  b2, :sticky=>'new')
-  TkGrid.rowconfigure(win,  b2, :weight=>1)
-end
-
-def killClone(win, cnt)
-  Tk.destroy("#{win.path}.text#{cnt}",  "#{win.path}.sb#{cnt}",
-             "#{win.path}.clone#{cnt}", "#{win.path}.kill#{cnt}")
-end
-
-## Now set up the GUI
-makeClone(count, base_frame, first)
-makeClone(count, base_frame, first)
-first.destroy
-
-## See Code / Dismiss buttons
-TkFrame.new(base_frame){|f|
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $textpeer_demo.destroy
-                 $textpeer_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'textpeer'
-               }).pack(:side=>:left, :expand=>true)
-
-  TkGrid.configure(f, '-', '-', :sticky=>'ew', :row=>5000)
-}
-TkGrid.columnconfigure(base_frame, 0, :weight=>1)
diff --git a/ext/tk/sample/demos-en/timer b/ext/tk/sample/demos-en/timer
deleted file mode 100644
index 6cb7c87e09..0000000000
--- a/ext/tk/sample/demos-en/timer
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env ruby
-#
-# timer --
-# This script generates a counter with start,stop and reset buttons.
-#
-# Copyright (C) 1998 Takaaki Tateishi (ttate@jaist.ac.jp)
-# last update: Sat Jun 27 12:24:14 JST 1998
-#
-
-require "tk"
-require "thread"
-require "tkafter"
-
-$time = "0.00"
-$m = Mutex.new
-$loop = false
-
-def timer_stop
-  $loop = false
-  $m.lock
-end
-
-def timer_start
-  $loop = true
-  $m.unlock
-end
-
-def timer_reset
-  $time = "0.00"
-  $root.countframe.counter['text'] = $time
-end
-
-def timer_loop
-  if $loop
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-  end
-  Tk.after(10,proc{timer_loop})
-end
-
-
-#
-# thread version
-#
-def timer_loop2
-  while true
-    $m.lock
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-    sleep(0.01)
-    $m.unlock
-  end
-end
-
-#
-# TkAfter
-#
-def timer_loop3
-  if $loop
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-  end
-end
-
-
-class CountFrame < TkFrame
-  attr_reader :counter
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    @counter = TkLabel.new(self,
-			   'text'=>$time,
-			   'relief'=>'raised')
-    @counter.pack('fill'=>'both')
-    self
-  end
-end
-
-
-class ButtonFrame < TkFrame
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-=begin
-    @stop = TkButton.new(self,
-			 'text'=>'Stop',
-			 'command'=>proc{timer_stop})
-    @start = TkButton.new(self,
-			  'text'=>'Start',
-			  'command'=>proc{timer_start})
-=end
-    @stop  = TkButton.new(self, :text=>'Stop',  :state=>:disabled)
-    @start = TkButton.new(self, :text=>'Start', :state=>:normal)
-
-    @stop.command proc{
-      timer_stop
-      @start.state(:normal)
-      @stop.state(:disabled)
-    }
-    @start.command proc{
-      timer_start
-      @stop.state(:normal)
-      @start.state(:disabled)
-    }
-
-    @reset = TkButton.new(self,
-			  'text'=>'Reset',
-			  'command'=>proc{timer_reset})
-    for b in [@stop,@start,@reset]
-      b.pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-    end
-  end
-end
-
-
-class Timer < TkRoot
-  attr_reader :countframe
-
-  def initialize(*args)
-    super(*args)
-    @countframe = CountFrame.new(self)
-    @buttonframe = ButtonFrame.new(self)
-    for f in [@buttonframe,@countframe]
-      f.pack('side'=>'top', 'fill'=>'both')
-    end
-    self
-  end
-end
-
-
-$root = Timer.new
-
-#$thread = Thread.start{timer_loop2}
-#timer_loop
-TkAfter.new(10,-1,proc{timer_loop3}).start
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/tkencoding.rb b/ext/tk/sample/demos-en/tkencoding.rb
deleted file mode 100644
index 727491a6ad..0000000000
--- a/ext/tk/sample/demos-en/tkencoding.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- ruby -*-
-#
-# tkencoding.rb
-# written by ttate@jaist.ac.jp
-
-class TclTkIp
-  alias __eval _eval
-  alias __invoke _invoke
-  private :__eval
-  private :__invoke
-
-  attr_accessor :encoding
-
-  def _eval(cmd)
-    if( @encoding )
-      _fromUTF8(__eval(_toUTF8(cmd,@encoding)),@encoding)
-    else
-      __eval(cmd)
-    end
-  end
-
-  def _invoke(*cmds)
-    if( @encoding )
-      cmds = cmds.collect{|cmd| _toUTF8(cmd,@encoding)}
-      _fromUTF8(__invoke(*cmds),@encoding)
-    else
-      __invoke(*cmds)
-    end
-  end
-end
-
-module Tk
-  INTERP = TkCore::INTERP
-
-  def encoding=(name)
-    INTERP.encoding = name
-  end
-
-  def encoding
-    INTERP.encoding
-  end
-end
diff --git a/ext/tk/sample/demos-en/toolbar.rb b/ext/tk/sample/demos-en/toolbar.rb
deleted file mode 100644
index e7cbeb4235..0000000000
--- a/ext/tk/sample/demos-en/toolbar.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-# toolbar.rb --
-#
-# This demonstration script creates a toolbar that can be torn off.
-#
-# based on "Id: toolbar.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($toolbar_demo) && $toolbar_demo
-  $toolbar_demo.destroy
-  $toolbar_demo = nil
-end
-
-$toolbar_demo = TkToplevel.new {|w|
-  title("Ttk Menu Buttons")
-  iconname("toolbar")
-  positionWindow(w)
-}
-
-base_frame = Ttk::Frame.new($toolbar_demo).pack(:fill=>:both, :expand=>true)
-
-if Tk.windowingsystem != 'aqua'
-  msg = Ttk::Label.new(base_frame, :wraplength=>'4i',
-                       :text=>Tk::UTF8_String.new(<<EOL))
-This is a demonstration of how to do \
-a toolbar that is styled correctly \
-and which can be torn off (this feature reqrires Tcl/Tk8.5). \
-The buttons are configured to be \\u201Ctoolbar style\\u201D buttons by \
-telling them that they are to use the Toolbutton style. At the left \
-end of the toolbar is a simple marker that the cursor changes to a \
-movement icon over; drag that away from the toolbar to tear off the \
-whole toolbar into a separate toplevel widget. When the dragged-off \
-toolbar is no longer needed, just close it like any normal toplevel \
-and it will reattach to the window it was torn off from.
-EOL
-else
-  msg = Ttk::Label.new(base_frame, :wraplength=>'4i',
-                       :text=>Tk::UTF8_String.new(<<EOL))
-This is a demonstration of how to do \
-a toolbar that is styled correctly. The buttons are configured to \
-be \\u201Ctoolbar style\\u201D buttons by telling them that they are \
-to use the Toolbutton style.
-EOL
-end
-
-## Set up the toolbar hull
-tbar_base = Tk::Frame.new(base_frame, # Must be a starndard Tk frame!
-                          :widgetname=>'toolbar') # for window title
-sep = Ttk::Separator.new(base_frame)
-to_base = Ttk::Frame.new(tbar_base, :cursor=>'fleur')
-if Tk.windowingsystem != 'aqua'
-  to  = Ttk::Separator.new(to_base, :orient=>:vertical)
-  to2 = Ttk::Separator.new(to_base, :orient=>:vertical)
-  to.pack(:fill=>:y, :expand=>true, :padx=>2, :side=>:left)
-  to2.pack(:fill=>:y, :expand=>true, :side=>:left)
-end
-
-contents = Ttk::Frame.new(tbar_base)
-Tk.grid(to_base, contents, :sticky=>'nsew')
-tbar_base.grid_columnconfigure(contents, :weight=>1)
-contents.grid_columnconfigure(1000, :weight=>1)
-
-if Tk.windowingsystem != 'aqua'
-  ## Bindings so that the toolbar can be torn off and reattached
-  to_base.bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  to.     bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  to2.    bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  def tbar_base.tearoff(w, x, y)
-    on_win = TkWinfo.containing(x, y)
-    return unless (on_win && on_win.path =~ /^#{@path}(\.|$)/)
-    self.grid_remove
-    w.grid_remove
-    self.wm_manage
-    # self.wm_title('Toolbar') # if you don't want to use its widget name as a window title.
-    self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(w) }
-  end
-  def tbar_base.untearoff(w)
-    self.wm_forget
-    w.grid
-    self.grid
-  end
-end
-
-## Some content for the rest of the toplevel
-text = TkText.new(base_frame, :width=>40, :height=>10)
-
-## Toolbar contents
-tb_btn = Ttk::Button.new(tbar_base, :text=>'Button', :style=>'Toolbutton',
-                         :command=>proc{text.insert(:end, "Button Pressed\n")})
-tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'Check', :style=>'Toolbutton',
-                              :variable=>(check = TkVariable.new),
-                              :command=>proc{
-                                text.insert(:end, "Check is #{check.value}\n")
-                              })
-tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'Menu')
-tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families,
-                             :state=>:readonly)
-tb_mbtn.menu(menu = Tk::Menu.new(tb_mbtn))
-menu.add(:command, :label=>'Just', :command=>proc{text.insert(:end, "Just\n")})
-menu.add(:command, :label=>'An', :command=>proc{text.insert(:end, "An\n")})
-menu.add(:command, :label=>'Example',
-         :command=>proc{text.insert(:end, "Example\n")})
-tb_combo.bind('<ComboboxSelected>'){ text.font.family = tb_combo.get }
-
-## Arrange contents
-Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo,
-        :in=>contents, :padx=>2, :sticky=>'ns')
-Tk.grid(tbar_base, :sticky=>'ew')
-Tk.grid(sep, :sticky=>'ew')
-Tk.grid(msg, :sticky=>'ew')
-Tk.grid(text, :sticky=>'nsew')
-base_frame.grid_rowconfigure(text, :weight=>1)
-base_frame.grid_columnconfigure(text, :weight=>1)
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'toolbar'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $toolbar_demo.destroy
-                           $toolbar_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  Tk.grid(frame, :sticky=>'ew')
-}
diff --git a/ext/tk/sample/demos-en/tree.rb b/ext/tk/sample/demos-en/tree.rb
deleted file mode 100644
index cd62ba8c9b..0000000000
--- a/ext/tk/sample/demos-en/tree.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# tree.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget.
-#
-# based on "Id: tree.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($tree_demo) && $tree_demo
-  $tree_demo.destroy
-  $tree_demo = nil
-end
-
-$tree_demo = TkToplevel.new {|w|
-  title("Directory Browser")
-  iconname("tree")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($tree_demo).pack(:fill=>:both, :expand=>true)
-
-## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
-               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
-               :text=><<EOL).pack(:fill=>:x)
-Ttk is the new Tk themed widget set. \
-One of the widgets it includes is a tree widget, \
-which allows the user to browse a hierarchical data-set such as a filesystem. \
-The tree widget not only allows for the tree part itself, \
-but it also supports an arbitrary number of additional columns \
-which can show additional data (in this case, the size of the files \
-found in your filesystem). \
-You can also change the width of the columns \
-by dragging the boundary between them.
-EOL
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'tree'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $tree_demo.destroy
-                           $tree_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-## Code to populate the roots of the tree (can be more than one on Windows)
-def populate_roots(tree)
-  TkComm.simplelist(Tk.tk_call('file', 'volumes')).sort.each{|dir|
-    populate_tree(tree, tree.insert(nil, :end, :text=>dir,
-                                    :values=>[dir, 'directory']))
-  }
-end
-
-## Code to populate a node of the tree
-def populate_tree(tree, node)
-  return if tree.get(node, :type) != 'directory'
-
-  path = tree.get(node, :fullpath)
-  tree.delete(tree.children(node))
-  Dir.glob("#{path}/*").sort.each{|f|
-    type = File.ftype(f)
-    id = tree.insert(node, :end,
-                     :text=>File.basename(f), :values=>[f, type]).id
-    if type == 'directory'
-      ## Make it so that this node is openable
-      tree.insert(id, 0, :text=>'dummy')
-      tree.itemconfigure(id, :text=>File.basename(f))
-    elsif type == 'file'
-      size = File.size(f)
-      if size >= 1024*1024*1024
-        size = '%.1f GB' % (size.to_f/1024/1024/1024)
-      elsif size >= 1024*1024
-        size = '%.1f MB' % (size.to_f/1024/1024)
-      elsif size >= 1024
-        size = '%.1f KB' % (size.to_f/1024)
-      else
-        size = '%.1f bytes' % (size.to_f/1024)
-      end
-      tree.set(id, :size, size)
-    end
-  }
-
-  # Stop this code from rerunning on the current node
-  tree.set(node, :type, 'processed_directory')
-end
-
-## Create the tree and set it up
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(fullpath type size),
-                         :displaycolumns=>['size'])
-if Tk.windowingsystem != 'aqua'
-  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
-else
-  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
-end
-
-tree.heading_configure('#0', :text=>'Directory Structure')
-tree.heading_configure('size', :text=>'File Size')
-tree.column_configure('size', :stretch=>0, :width=>70)
-populate_roots(tree)
-tree.bind('<TreeviewOpen>', '%W'){|w| populate_tree(w, w.focus_item)}
-
-## Arrange the tree and its scrollbars in the toplevel
-container = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-container.lower
-Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
-Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
-container.grid_columnconfigure(0, :weight=>1)
-container.grid_rowconfigure(0, :weight=>1)
diff --git a/ext/tk/sample/demos-en/ttkbut.rb b/ext/tk/sample/demos-en/ttkbut.rb
deleted file mode 100644
index a784efcc08..0000000000
--- a/ext/tk/sample/demos-en/ttkbut.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-# ttkbut.rb
-#
-# This demonstration script creates a toplevel window containing several
-# simple Ttk widgets, such as labels, labelframes, buttons, checkbuttons and
-# radiobuttons.
-#
-# based on "Id: ttkbut.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkbut_demo) && $ttkbut_demo
-  $ttkbut_demo.destroy
-  $ttkbut_demo = nil
-end
-
-$ttkbut_demo = TkToplevel.new {|w|
-  title("Simple Ttk Widgets")
-  iconname("ttkbut")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkbut_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttk is the new Tk themed widget set. This is a Ttk themed label, \
-and below are three groups of Ttk widgets in Ttk labelframes. \
-The first group are all buttons that set the current application theme \
-when pressed. The second group contains three sets of checkbuttons, \
-with a separator widget between the sets. Note that the "Enabled" \
-button controls whether all the other themed widgets in this toplevel are \
-in the disabled state. The third group has a collection of linked \
-radiobuttons.
-EOL
-
-## Add buttons for setting the theme
-buttons = Ttk::Labelframe.new(base_frame, :text=>'Buttons')
-# Ttk::Style.theme_names.each{|theme|
-#   Ttk::Button.new(buttons, :text=>theme,
-#                   :command=>proc{Ttk::Style.theme_use theme}).pack(:pady=>2)
-# }
-Ttk.themes.each{|theme|
-  Ttk::Button.new(buttons, :text=>theme,
-                  :command=>proc{Ttk.set_theme theme}).pack(:pady=>2)
-}
-
-## Helper procedure for the top checkbutton
-def setState(root, value, *excepts)
-  return if excepts.member?(root)
-
-  ## Non-Ttk widgets (e.g. the toplevel) will fail, so make it silent
-  begin
-    root.state = value
-  rescue
-  end
-
-  ## Recursively invoke on all children of this root that are in the same
-  ## toplevel widget
-  root.winfo_children.each{|w|
-    setState(w, value, *excepts) if w.winfo_toplevel == root.winfo_toplevel
-  }
-end
-
-## Set up the checkbutton group
-checks = Ttk::Labelframe.new(base_frame, :text=>'Checkbuttons')
-enabled = TkVariable.new(true)
-e = Ttk::Checkbutton.new(checks, :text=>'Enabled', :variable=>enabled,
-                         :command=>proc{
-                           setState($ttkbut_demo,
-                                    ((enabled.bool)? "!disabled" : "disabled"),
-                                    e)
-                         })
-
-## See ttk_widget(n) for other possible state flags
-sep1 = Ttk::Separator.new(checks)
-sep2 = Ttk::Separator.new(checks)
-
-cheese  = TkVariable.new
-tomato  = TkVariable.new
-basil   = TkVariable.new
-oregano = TkVariable.new
-
-c1 = Ttk::Checkbutton.new(checks, :text=>'Cheese',  :variable=>cheese)
-c2 = Ttk::Checkbutton.new(checks, :text=>'Tomato',  :variable=>tomato)
-c3 = Ttk::Checkbutton.new(checks, :text=>'Basil',   :variable=>basil)
-c4 = Ttk::Checkbutton.new(checks, :text=>'Oregano', :variable=>oregano)
-
-Tk.pack(e, sep1, c1, c2, sep2, c3, c4, :fill=>:x, :pady=>2)
-
-## Set up the radiobutton group
-radios = Ttk::Labelframe.new(base_frame, :text=>'Radiobuttons')
-
-happyness = TkVariable.new
-
-r1 = Ttk::Radiobutton.new(radios, :variable=>happyness,
-                          :text=>'Great', :value=>'great')
-r2 = Ttk::Radiobutton.new(radios, :variable=>happyness,
-                          :text=>'Good', :value=>'good')
-r3 = Ttk::Radiobutton.new(radios, :variable=>happyness,
-                          :text=>'Ok', :value=>'ok')
-r4 = Ttk::Radiobutton.new(radios, :variable=>happyness,
-                          :text=>'Poor', :value=>'poor')
-r5 = Ttk::Radiobutton.new(radios, :variable=>happyness,
-                          :text=>'Awful', :value=>'awful')
-
-Tk.pack(r1, r2, r3, r4, r5, :fill=>:x, :padx=>3, :pady=>2)
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Variables',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{
-                           showVars(base_frame, ['enabled', enabled],
-                                    ['cheese', cheese], ['tomato', tomato],
-                                    ['basil', basil], ['oregano', oregano],
-                                    ['happyness', happyness])
-                         }),
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkbut'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           tmppath = $ttkbut_demo
-                           $ttkbut_demo = nil
-                           $showVarsWin[tmppath.path] = nil
-                           tmppath.destroy
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x, :expand=>true)
-}
-
-## Arrange things neatly
-f = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-f.lower
-Tk.grid(buttons, checks, radios, :in=>f, :sticky=>'nwe', :pady=>2, :padx=>3)
-f.grid_columnconfigure([0, 1, 2], :weight=>1, :uniform=>:yes)
diff --git a/ext/tk/sample/demos-en/ttkmenu.rb b/ext/tk/sample/demos-en/ttkmenu.rb
deleted file mode 100644
index 9399568313..0000000000
--- a/ext/tk/sample/demos-en/ttkmenu.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# ttkmenu.rb --
-#
-# This demonstration script creates a toplevel window containing several Ttk
-# menubutton widgets.
-#
-# based on "Id: ttkmenu.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkmenu_demo) && $ttkmenu_demo
-  $ttkmenu_demo.destroy
-  $ttkmenu_demo = nil
-end
-
-$ttkmenu_demo = TkToplevel.new {|w|
-  title("Ttk Menu Buttons")
-  iconname("ttkmenu")
-  positionWindow(w)
-}
-
-base_frame = Ttk::Frame.new($ttkmenu_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttk is the new Tk themed widget set, \
-and one widget that is available in themed form is the menubutton. \
-Below are some themed menu buttons \
-that allow you to pick the current theme in use. \
-Notice how picking a theme changes the way \
-that the menu buttons themselves look, \
-and that the central menu button is styled differently \
-(in a way that is normally suitable for toolbars). \
-However, there are no themed menus; the standard Tk menus were judged \
-to have a sufficiently good look-and-feel on all platforms, \
-especially as they are implemented as native controls in many places.
-EOL
-
-Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
-
-## See Code / Dismiss
-Ttk::Frame.new($ttkmenu_demo) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkmenu'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttkmenu_demo.destroy
-                           $ttkmenu_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-b1 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:above)
-b2 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:left)
-b3 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:right)
-b4 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:flush,
-                         :style=>Ttk::Menubutton.style('Toolbutton'))
-b5 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:below)
-
-b1.menu(m1 = Tk::Menu.new(b1, :tearoff=>false))
-b2.menu(m2 = Tk::Menu.new(b2, :tearoff=>false))
-b3.menu(m3 = Tk::Menu.new(b3, :tearoff=>false))
-b4.menu(m4 = Tk::Menu.new(b4, :tearoff=>false))
-b5.menu(m5 = Tk::Menu.new(b5, :tearoff=>false))
-
-Ttk.themes.each{|theme|
-  m1.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m2.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m3.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m4.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m5.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-}
-
-f = Ttk::Frame.new(base_frame).pack(:fill=>:x)
-f1 = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-f.lower
-
-f.grid_anchor(:center)
-TkGrid('x', b1, 'x', :in=>f, :padx=>3, :pady=>2)
-TkGrid(b2,  b4, b3,  :in=>f, :padx=>3, :pady=>2)
-TkGrid('x', b5, 'x', :in=>f, :padx=>3, :pady=>2)
diff --git a/ext/tk/sample/demos-en/ttknote.rb b/ext/tk/sample/demos-en/ttknote.rb
deleted file mode 100644
index bc0c7b369a..0000000000
--- a/ext/tk/sample/demos-en/ttknote.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-# ttknote.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# notebook widget.
-#
-# based on "Id: ttknote.tcl,v 1.5 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttknote_demo) && $ttknote_demo
-  $ttknote_demo.destroy
-  $ttknote_demo = nil
-end
-
-$ttknote_demo = TkToplevel.new {|w|
-  title("Ttk Notebook Widget")
-  iconname("ttknote")
-  positionWindow(w)
-}
-
-## See Code / Dismiss
-Ttk::Frame.new($ttknote_demo) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttknote'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttknote_demo.destroy
-                           $ttknote_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-base_frame = Ttk::Frame.new($ttknote_demo).pack(:fill=>:both, :expand=>true)
-
-## Make the notebook and set up Ctrl+Tab traversal
-notebook = Ttk::Notebook.new(base_frame).pack(:fill=>:both, :expand=>true,
-                                              :padx=>2, :pady=>3)
-notebook.enable_traversal
-
-## Popuplate the first pane
-f_msg = Ttk::Frame.new(notebook)
-msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'4i',
-                       :justify=>:left, :anchor=>'n', :text=><<EOL)
-Ttk is the new Tk themed widget set. \
-One of the widgets it includes is the notebook widget, \
-which provides a set of tabs that allow the selection of a group of panels, \
-each with distinct content. \
-They are a feature of many modern user interfaces. \
-Not only can the tabs be selected with the mouse, \
-but they can also be switched between using Ctrl+Tab \
-when the notebook page heading itself is selected. \
-Note that the second tab is disabled, and cannot be selected.
-EOL
-neat = TkVariable.new
-after_id = nil
-msg_b = Ttk::Button.new(f_msg, :text=>'Neat!', :underline=>0,
-                        :command=>proc{
-                          neat.value = 'Yeah, I know...'
-                          Tk.after_cancel(after_id) if after_id
-                          after_id = Tk.after(500){neat.value = ''}
-                        })
-msg_b.winfo_toplevel.bind('Alt-n'){ msg_b.focus; msg_b.invoke }
-msg_l = Ttk::Label.new(f_msg, :textvariable=>neat)
-notebook.add(f_msg, :text=>'Description', :underline=>0, :padding=>2)
-Tk.grid(msg_m, '-', :sticky=>'new', :pady=>2)
-Tk.grid(msg_b, msg_l, :pady=>[2, 4])
-f_msg.grid_rowconfigure(1, :weight=>1)
-f_msg.grid_columnconfigure([0, 1], :weight=>1, :uniform=>1)
-
-## Populate the second pane. Note that the content doesn't really matter
-f_disabled = Ttk::Frame.new(notebook)
-notebook.add(f_disabled, :text=>'Disabled', :state=>:disabled)
-
-## Popuplate the third pane
-f_editor = Ttk::Frame.new(notebook)
-notebook.add(f_editor, :text=>'Text Editor', :underline=>0)
-editor_t = Tk::Text.new(f_editor, :width=>40, :height=>10, :wrap=>:char)
-if Tk.windowingsystem != 'aqua'
-  editor_s = editor_t.yscrollbar(Ttk::Scrollbar.new(f_editor))
-else
-  editor_s = editor_t.yscrollbar(Tk::Scrollbar.new(f_editor))
-end
-editor_s.pack(:side=>:right, :fill=>:y, :padx=>[0,2], :pady=>2)
-editor_t.pack(:fill=>:both, :expand=>true, :padx=>[2,0], :pady=>2)
diff --git a/ext/tk/sample/demos-en/ttkpane.rb b/ext/tk/sample/demos-en/ttkpane.rb
deleted file mode 100644
index 87c4dedeb2..0000000000
--- a/ext/tk/sample/demos-en/ttkpane.rb
+++ /dev/null
@@ -1,213 +0,0 @@
-# ttkpane.rb --
-#
-# This demonstration script creates a Ttk pane with some content.
-#
-# based on "Id: ttkpane.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkpane_demo) && $ttkpane_demo
-  $ttkpane_demo.destroy
-  $ttkpane_demo = nil
-end
-
-$ttkpane_demo = TkToplevel.new {|w|
-  title("Themed Nested Panes")
-  iconname("ttkpane")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkpane_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-This demonstration shows off a nested set of themed paned windows. \
-Their sizes can be changed by grabbing the area \
-between each contained pane and dragging the divider.
-EOL
-
-Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkpane'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttkpane_demo.destroy
-                           $ttkpane_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-outer = Ttk::Panedwindow.new(frame, :orient=>:horizontal)
-outer.add(in_left = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-outer.add(in_right = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-in_left.add(left_top = Ttk::Labelframe.new(in_left, :text=>'Button'))
-in_left.add(left_bot = Ttk::Labelframe.new(in_left, :text=>'Clocks'))
-in_right.add(right_top = Ttk::Labelframe.new(in_right, :text=>'Progress'))
-in_right.add(right_bot = Ttk::Labelframe.new(in_right, :text=>'Text'))
-if Tk.windowingsystem == 'aqua'
-  [left_top, left_bot, right_top, right_bot].each{|w| w.padding(3) }
-end
-
-# Fill the button pane
-Ttk::Button.new(left_top, :text=>'Press Me',
-                :command=>proc{
-                  Tk.messageBox(:type=>'ok', :icon=>'info', :message=>'Ouch!',
-                                :detail=>'That hurt...', :parent=>base_frame,
-                                :title=>'Button Pressed')
-                }).pack(:padx=>2, :pady=>5)
-
-
-zones_list = [
-  [':Europe/Berlin'],
-  [':America/Argentina/Buenos_Aires', ':America/Buenos_Aires'],
-  [':Africa/Johannesburg'],
-  [':Europe/London'],
-  [':America/Los_Angeles'],
-  [':Europe/Moscow'],
-  [':America/New_York'],
-  [':Asia/Singapore'],
-  [':Australia/Sydney'],
-  [':Asia/Tokyo'],
-]
-
-zones = []
-
-# Check tzinfo support
-if $tk_major_ver > 8 || ($tk_major_ver == 8 && $tk_minor_ver >= 5)
-  tzinfo = :tcl
-
-  # Force a pre-load of all the timezones needed; otherwise can end up
-  # poor-looking synch problems!
-  zones_list.each{|list|
-    list.each{|zone|
-      begin
-        Tk.tk_call('clock', 'format', '0', '-timezone', zone)
-      rescue RuntimeError
-        # ignore
-      else
-        zones << [zone, zone[%r<[^/:]+$>].tr('_', ' ')]
-        break
-      end
-    }
-  }
-
-else
-  begin
-    require 'tzinfo'
-    tzinfo = :tzinfo
-  rescue Exception
-    begin
-      require 'tzfile'
-      tzinfo = :tzfile
-    rescue Exception
-      tzinfo = nil
-    end
-  end
-
-  case tzinfo
-  when :tzinfo
-    zones_list.each{|list|
-      list.each{|zone|
-        begin
-          tz = TZInfo::Timezone.get(zone[%r<[^:]+$>])
-        rescue Exception
-          # ignore
-        else
-          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
-          break
-        end
-      }
-    }
-
-  when :tzfile
-    zones_list.each{|list|
-      list.each{|zone|
-        begin
-          tz = TZFile.create(zone[%r<[^:]+$>])
-        rescue Exception
-          # ignore
-        else
-          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
-          break
-        end
-      }
-    }
-
-  else
-    [ -7, -4, -2, -1, 0, +1, +3, +8, +9, +10 ].each{|zone|
-      zones << [zone, 'UTC%+03d00' % zone]
-    }
-  end
-end
-
-time = TkVariable.new_hash
-
-case tzinfo
-when :tcl
-  update_proc = proc{|now, tz, label|
-    time[label] = Tk.tk_call('clock', 'format', now.tv_sec,
-                             '-timezone', tz, '-format', '%T')
-  }
-when :tzinfo
-  update_proc = proc{|now, tz, label|
-    time[label] = tz.utc_to_local(now).strftime('%H:%M:%S')
-  }
-when :tzfile
-  update_proc = proc{|now, tz, label|
-    time[label] = tz.at(now.tv_sec).strftime('%H:%M:%S')
-  }
-else
-  update_proc = proc{|now, tz, label|
-    time[label] = (now + (tz * 3600)).strftime('%H:%M:%S')
-  }
-end
-
-# Fill the clocks pane
-zones.each_with_index{|(zone, label), idx|
-  Ttk::Separator.new(left_bot).pack(:fill=>:x) if idx > 0
-  Ttk::Label.new(left_bot, :text=>label, :anchor=>'w').pack(:fill=>:x)
-  Ttk::Label.new(left_bot, :textvariable=>time.ref(label),
-                 :anchor=>'w').pack(:fill=>:x)
-}
-
-# Timer start
-every = proc{
-  now = Time.now.utc
-  zones.each{|zone, label| update_proc.call(now, zone, label) }
-}
-TkRTTimer.new(1000, -1, every).start(0, every)
-
-# Fill the progress pane
-Ttk::Progressbar.new(right_top, :mode=>:indeterminate).pack(:fill=>:both, :expand=>true).start
-
-# Fill the text pane
-if Tk.windowingsystem != 'aqua'
-  # The trick with the ttk::frame makes the text widget look like it fits with
-  # the current Ttk theme despite not being a themed widget itself. It is done
-  # by styling the frame like an entry, turning off the border in the text
-  # widget, and putting the text widget in the frame with enough space to allow
-  # the surrounding border to show through (2 pixels seems to be enough).
-  f = Ttk::Frame.new(right_bot, :style=>Ttk::Entry)
-  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
-  txt.pack(:fill=>:both, :expand=>true, :in=>f, :pady=>2, :padx=>2)
-  scr = txt.yscrollbar(Ttk::Scrollbar.new(frame))
-  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
-  f.pack(:fill=>:both, :expand=>true)
-  outer.pack(:fill=>:both, :expand=>true)
-else
-  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
-  scr = txt.yscrollbar(TkScrollbar.new(frame))
-  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
-  txt.pack(:fill=>:both, :expand=>true, :in=>right_bot)
-  outer.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>[6, 10])
-end
diff --git a/ext/tk/sample/demos-en/ttkprogress.rb b/ext/tk/sample/demos-en/ttkprogress.rb
deleted file mode 100644
index c341a9385f..0000000000
--- a/ext/tk/sample/demos-en/ttkprogress.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# ttkprogress.rb --
-#
-# This demonstration script creates several progress bar widgets.
-#
-# based on "Id: ttkprogress.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkprogress_demo) && $ttkprogress_demo
-  $ttkprogress_demo.destroy
-  $ttkprogress_demo = nil
-end
-
-$ttkprogress_demo = TkToplevel.new {|w|
-  title("Progress Bar Demonstration")
-  iconname("ttkprogress")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkprogress_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=>Tk::UTF8_String.new(<<EOL)).pack(:side=>:top, :fill=>:x)
-Below are two progress bars. \
-The top one is a \\u201Cdeterminate\\u201D progress bar, \
-which is used for showing how far through a defined task the program has got. \
-The bottom one is an \\u201Cindeterminate\\u201D progress bar, \
-which is used to show that the program is busy \
-but does not know how long for. Both are run here in self-animated mode, \
-which can be turned on and off using the buttons underneath.
-EOL
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkprogress'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttkprogress_demo.destroy
-                           $ttkprogress_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-p1 = Ttk::Progressbar.new(frame, :mode=>:determinate)
-p2 = Ttk::Progressbar.new(frame, :mode=>:indeterminate)
-
-start = Ttk::Button.new(frame, :text=>'Start Progress',
-                        :command=>proc{ p1.start; p2.start })
-stop  = Ttk::Button.new(frame, :text=>'Stop Progress',
-                        :command=>proc{ p1.stop; p2.stop })
-
-Tk.grid(p1, '-', :pady=>5, :padx=>10)
-Tk.grid(p2, '-', :pady=>5, :padx=>10)
-Tk.grid(start, stop, :padx=>10, :pady=>5)
-start.grid_configure(:sticky=>'e')
-stop.grid_configure(:sticky=>'w')
-frame.grid_columnconfigure(:all, :weight=>1)
-
diff --git a/ext/tk/sample/demos-en/twind.rb b/ext/tk/sample/demos-en/twind.rb
deleted file mode 100644
index 60a345d0b4..0000000000
--- a/ext/tk/sample/demos-en/twind.rb
+++ /dev/null
@@ -1,291 +0,0 @@
-# twind.rb
-#
-# This demonstration script creates a text widget with a bunch of
-# embedded windows.
-#
-# text (embedded windows) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($twind_demo) && $twind_demo
-  $twind_demo.destroy
-  $twind_demo = nil
-end
-
-# demo toplevel widget
-$twind_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Embedded Windows")
-  iconname("Embedded Windows")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($twind_demo).pack(:fill=>:both, :expand=>true)
-
-# frame
-$twind_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $twind_demo
-      $twind_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'twind'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-$twind_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
-            'relief'=>'sunken') {|f|
-  $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font,
-                          'width'=>'70', 'height'=>35, 'wrap'=>'word',
-                          'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
-    TkScrollbar.new(f) {|s|
-      command proc{|*args| t.yview(*args)}
-      t.yscrollcommand proc{|first,last| s.set first,last}
-    }.pack('side'=>'right', 'fill'=>'y')
-  }.pack('expand'=>'yes', 'fill'=>'both')
-}.pack('expand'=>'yes', 'fill'=>'both')
-
-#
-$tag_center = TkTextTag.new($twind_text,
-                            'justify' =>'center',
-                            'spacing1'=>'5m',
-                            'spacing3'=>'5m'  )
-$tag_buttons = TkTextTag.new($twind_text,
-                             'lmargin1'=>'1c',
-                             'lmargin2'=>'1c',
-                             'rmargin' =>'1c',
-                             'spacing1'=>'3m',
-                             'spacing2'=>0,
-                             'spacing3'=>0 )
-
-$twind_text.insert('end', "A text widget can contain other widgets embedded ")
-$twind_text.insert('end', "it.  These are called \"embedded windows\", ")
-$twind_text.insert('end', "and they can consist of arbitrary widgets.  ")
-$twind_text.insert('end', "For example, here are two embedded button ")
-$twind_text.insert('end', "widgets.  You can click on the first button to ")
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   #text 'ON'
-                   text 'Turn On'
-                   command proc{textWindOn $twind_text,$twind_buttons}
-                   cursor 'top_left_arrow'
-                 })
-$twind_text.insert('end', " horizontal scrolling, which also turns off ")
-$twind_text.insert('end', "word wrapping.  Or, you can click on the second ")
-$twind_text.insert('end', "button to\n")
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   #text 'OFF'
-                   text 'Turn Off'
-                   command proc{textWindOff $twind_text}
-                   cursor 'top_left_arrow'
-                 })
-
-$twind_text.insert('end', " horizontal scrolling and turn back on word wrapping.\n\n")
-$twind_text.insert('end', "Or, here is another example.  If you ")
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   text 'Click Here'
-                   command proc{textWindPlot $twind_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind_text.insert('end', " a canvas displaying an x-y plot will appear right here.")
-$mark_plot = TkTextMark.new($twind_text, 'insert')
-$mark_plot.gravity='left'
-$twind_text.insert('end', "  You can drag the data points around with the mouse, ")
-$twind_text.insert('end', "or you can click here to ")
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   text 'Delete'
-                   command proc{textWindDel $twind_text}
-                   cursor 'top_left_arrow'
-                 })
-
-$twind_text.insert('end', " the plot again.\n\n")
-$twind_text.insert('end', "You may also find it useful to put embedded windows in ")
-$twind_text.insert('end', "a text without any actual text.  In this case the ")
-$twind_text.insert('end', "text widget acts like a geometry manager.  For ")
-$twind_text.insert('end', "example, here is a collection of buttons laid out ")
-$twind_text.insert('end', "neatly into rows by the text widget.  These buttons ")
-$twind_text.insert('end', "can be used to change the background color of the ")
-$twind_text.insert('end', "text widget (\"Default\" restores the color to ")
-$twind_text.insert('end', "its default).  If you click on the button labeled ")
-$twind_text.insert('end', "\"Short\", it changes to a longer string so that ")
-$twind_text.insert('end', "you can see how the text widget automatically ")
-$twind_text.insert('end', "changes the layout.  Click on the button again ")
-$twind_text.insert('end', "to restore the short string.\n")
-
-
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {|b|
-                   text 'Default'
-                   command proc{embDefBg $twind_text}
-                   cursor 'top_left_arrow'
-                   $tag_buttons.add('end')
-                 },
-                 'padx'=>3 )
-embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkCheckButton.new($twind_text) {
-                   textvariable embToggle
-                   indicatoron 0
-                   variable embToggle
-                   onvalue 'A much longer string'
-                   offvalue 'Short'
-                   cursor 'top_left_arrow'
-                   pady 5
-                   padx 2
-                 },
-                 'padx'=>3,
-                 'pady'=>2 )
-
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
-].each{|twind_color|
-  TkTextWindow.new($twind_text, 'end',
-                   'window'=>TkButton.new($twind_text) {
-                     text twind_color
-                     cursor 'top_left_arrow'
-                     command proc{$twind_text.bg twind_color}
-                   },
-                   'padx'=>3,
-                   'pady'=>2 )
-}
-
-#
-def textWindOn (w,f)
-  if defined? $twind_scroll
-    begin
-      $twind_scroll.destroy
-    rescue
-    end
-    $twind_scroll = nil
-  end
-
-  base = TkWinfo.parent( TkWinfo.parent(w) )
-  $twind_scroll = TkScrollbar.new(base) {|s|
-    orient 'horizontal'
-    command proc{|*args| w.xview(*args)}
-    w.xscrollcommand proc{|first,last| s.set first,last}
-    w.wrap 'none'
-    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
-  }
-
-  return nil
-end
-
-def textWindOff (w)
-  if defined? $twind_scroll
-    begin
-      $twind_scroll.destroy
-    rescue
-    end
-    $twind_scroll = nil
-  end
-  w.xscrollcommand ''
-  w.wrap 'word'
-end
-
-def textWindPlot (t)
-  if (defined? $twind_plot) && TkWinfo.exist?($twind_plot)
-    return
-  end
-
-  $twind_plot = TkCanvas.new(t) {
-    relief 'sunken'
-    width  450
-    height 300
-    cursor 'top_left_arrow'
-  }
-
-  if $tk_version =~ /^4.*/
-    font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  else
-    font = 'Helvetica 18'
-  end
-
-  TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
-  TkcLine.new($twind_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind_plot, 225, 20,
-              'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
-
-  (0..10).each {|i|
-    x = 100 + (i * 30)
-    TkcLine.new($twind_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind_plot, x, 254,
-                'text'=>10*i, 'font'=>font, 'anchor'=>'n')
-  }
-  (0..5).each {|i|
-    y = 250 - (i * 40)
-    TkcLine.new($twind_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind_plot, 96, y,
-                'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
-  }
-
-  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-    x = 100 + (3*xx)
-    y = 250 - (4*yy)/5
-    item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6,
-                       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-    item.addtag 'point'
-  end
-
-  $twind_plot.itembind('point', 'Any-Enter',
-                        proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind_plot.itembind('point', 'Any-Leave',
-                        proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind_plot.itembind('point', '1',
-                        proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
-  $twind_plot.itembind('point', 'ButtonRelease-1',
-                        proc{$twind_plot.dtag 'selected'})
-  $twind_plot.bind('B1-Motion',
-                    proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
-  while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
-    $twind_text.delete $mark_plot
-  end
-  $twind_text.insert $mark_plot,"\n"
-  TkTextWindow.new($twind_text, $mark_plot, 'window'=>$twind_plot)
-  $tag_center.add $mark_plot
-  $twind_text.insert $mark_plot,"\n"
-end
-
-$embPlot = {'lastX'=>0, 'lastY'=>0}
-
-def embPlotDown (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $embPlot['lastX'] = x
-  $embPlot['lastY'] = y
-end
-
-def embPlotMove (w, x, y)
-  w.move 'selected', x - $embPlot['lastX'], y - $embPlot['lastY']
-  $embPlot['lastX'] = x
-  $embPlot['lastY'] = y
-end
-
-def textWindDel (w)
-  if (defined? $twind_text) && TkWinfo.exist?($twind_plot)
-    $twind_text.delete $twind_plot
-    $twind_plot = nil
-    while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
-      $twind_text.delete $mark_plot
-    end
-    $twind_text.insert $mark_plot,"  "
-  end
-end
-
-def embDefBg (w)
-  w['background'] = w.configinfo('background')[3]
-end
diff --git a/ext/tk/sample/demos-en/twind2.rb b/ext/tk/sample/demos-en/twind2.rb
deleted file mode 100644
index af7313dd82..0000000000
--- a/ext/tk/sample/demos-en/twind2.rb
+++ /dev/null
@@ -1,384 +0,0 @@
-#
-# text (embedded windows) widget demo 2 (called by 'widget')
-#
-
-# delete toplevel widget
-if defined?($twind2_demo) && $twind2_demo
-  $twind2_demo.destroy
-  $twind2_demo = nil
-end
-
-# demo toplevel widget
-$twind2_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Embedded Windows 2")
-  iconname("Embedded Windows")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($twind2_demo).pack(:fill=>:both, :expand=>true)
-
-# frame
-$twind2_buttons = TkFrame.new(base_frame) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
-         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         TkButton.new(frame, :text=>'See Code',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{showCode 'twind2'}),
-         TkButton.new(frame, :text=>'Dismiss',
-                      :image=>$image['delete'], :compound=>:left,
-                      :command=>proc{
-                        tmppath = $twind2_demo
-                        $twind2_demo = nil
-                        $showVarsWin[tmppath.path] = nil
-                        tmppath.destroy
-                      }),
-         :padx=>4, :pady=>4)
-  frame.grid_columnconfigure(0, :weight=>1)
-}
-$twind2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-$twind2_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
-            'relief'=>'sunken') {|f|
-  $twind2_text = TkText.new(f, 'setgrid'=>true, 'font'=>$font,
-                            # 'width'=>'70', 'height'=>35, 'wrap'=>'word',
-                            'width'=>'70', 'height'=>35, 'wrap'=>'char',
-                            'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
-    TkScrollbar.new(f) {|s|
-      command proc{|*args| t.yview(*args)}
-      t.yscrollcommand proc{|first,last| s.set first,last}
-    }.pack('side'=>'right', 'fill'=>'y')
-  }.pack('expand'=>'yes', 'fill'=>'both')
-}.pack('expand'=>'yes', 'fill'=>'both')
-
-# text tags
-$tag2_center = TkTextTag.new($twind2_text,
-                            'justify' =>'center',
-                            'spacing1'=>'5m',
-                            'spacing3'=>'5m'  )
-$tag2_buttons = TkTextTag.new($twind2_text,
-                             'lmargin1'=>'1c',
-                             'lmargin2'=>'1c',
-                             'rmargin' =>'1c',
-                             'spacing1'=>'3m',
-                             'spacing2'=>0,
-                             'spacing3'=>0 )
-
-# insert text
-$twind2_text.insert('end',
-                  'A text widget can contain many different kinds of items, ')
-$twind2_text.insert('end',
-                  "both active and passive.  It can lay these out in various ")
-$twind2_text.insert('end',
-                   "ways, with wrapping, tabs, centering, etc.  In addition, ")
-$twind2_text.insert('end',
-                    "when the contents are too big for the window, smooth ")
-$twind2_text.insert('end', "scrolling in all directions is provided.\n\n")
-
-$twind2_text.insert('end', "A text widget can contain other widgets embedded ")
-$twind2_text.insert('end', "it.  These are called \"embedded windows\", ")
-$twind2_text.insert('end', "and they can consist of arbitrary widgets.  ")
-$twind2_text.insert('end', "For example, here are two embedded button ")
-$twind2_text.insert('end', "widgets.  You can click on the first button to ")
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   text 'ON'
-                   command proc{textWindOn2 $twind2_text,$twind2_buttons}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end', " horizontal scrolling, which also turns off ")
-$twind2_text.insert('end', "word wrapping.  Or, you can click on the second ")
-$twind2_text.insert('end', "button to\n")
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   text 'OFF'
-                   command proc{textWindOff2 $twind2_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end',
-                   " horizontal scrolling and turn back on word wrapping.\n\n")
-
-$twind2_text.insert('end', "Or, here is another example.  If you ")
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   text 'Click Here'
-                   command proc{textWindPlot2 $twind2_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end',
-                    " a canvas displaying an x-y plot will appear right here.")
-$mark2_plot = TkTextMark.new($twind2_text, 'insert')
-$mark2_plot.gravity='left'
-$twind2_text.insert('end',
-                    "  You can drag the data points around with the mouse, ")
-$twind2_text.insert('end', "or you can click here to ")
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   text 'Delete'
-                   command proc{textWindDel2 $twind2_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end', " the plot again.\n\n")
-
-$twind2_text.insert('end',
-                    "You may also find it useful to put embedded windows in ")
-$twind2_text.insert('end',
-                    "a text without any actual text.  In this case the ")
-$twind2_text.insert('end', "text widget acts like a geometry manager.  For ")
-$twind2_text.insert('end',
-                    "example, here is a collection of buttons laid out ")
-$twind2_text.insert('end',
-                    "neatly into rows by the text widget.  These buttons ")
-$twind2_text.insert('end',
-                    "can be used to change the background color of the ")
-$twind2_text.insert('end', "text widget (\"Default\" restores the color to ")
-$twind2_text.insert('end',
-                    "its default).  If you click on the button labeled ")
-$twind2_text.insert('end', "\"Short\", it changes to a longer string so that ")
-$twind2_text.insert('end', "you can see how the text widget automatically ")
-$twind2_text.insert('end', "changes the layout.  Click on the button again ")
-$twind2_text.insert('end', "to restore the short string.\n")
-
-btn_default = TkButton.new($twind2_text) {|b|
-  text 'Default'
-  command proc{embDefBg2 $twind2_text}
-  cursor 'top_left_arrow'
-}
-TkTextWindow.new($twind2_text, 'end', 'window'=>btn_default, 'padx'=>3)
-embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkCheckButton.new($twind2_text) {
-                   textvariable embToggle
-                   indicatoron 0
-                   variable embToggle
-                   onvalue 'A much longer string'
-                   offvalue 'Short'
-                   cursor 'top_left_arrow'
-                   pady 5
-                   padx 2
-                 },
-                 'padx'=>3,
-                 'pady'=>2 )
-
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
-].each{|twind_color|
-  TkTextWindow.new($twind2_text, 'end',
-                   'window'=>TkButton.new($twind2_text) {
-                     text twind_color
-                     cursor 'top_left_arrow'
-                     command proc{$twind2_text.bg twind_color}
-                   },
-                   'padx'=>3,
-                   'pady'=>2 )
-}
-
-$tag2_buttons.add(btn_default, 'end')
-
-$text_normal2 = {}
-$text_normal2['border'] = $twind2_text.cget('borderwidth')
-$text_normal2['highlight'] = $twind2_text.cget('highlightthickness')
-$text_normal2['pad'] = $twind2_text.cget('padx')
-
-$twind2_text.insert('end', "\nYou can also change the usual border width and ")
-$twind2_text.insert('end', "highlightthickness and padding.\n")
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Big borders",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinBigB2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Small borders",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinSmallB2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Big highlight",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinBigH2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Small highlight",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinSmallH2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Big pad",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinBigP2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Small pad",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinSmallP2 $twind2_text
-                                        }))
-
-$twind2_text.insert('end',
-                    "\n\nFinally, images fit comfortably in text widgets too:")
-
-TkTextImage.new($twind2_text, 'end',
-                'image'=>TkBitmapImage.new(:file=>[
-                                             $demo_dir, '..',
-                                             'images', 'face.xbm'
-                                           ].join(File::Separator)))
-
-# methods
-def textWinBigB2(w)
-  w.borderwidth 15
-end
-def textWinSmallB2(w)
-  w.borderwidth $text_normal2['border']
-end
-def textWinBigH2(w)
-  w.highlightthickness 15
-end
-def textWinSmallH2(w)
-  w.highlightthickness $text_normal2['highlight']
-end
-def textWinBigP2(w)
-  w.configure(:padx=>15, :pady=>15)
-end
-def textWinSmallP2(w)
-  w.configure(:padx=>$text_normal2['pad'], :pady=>$text_normal2['pad'])
-end
-
-def textWindOn2 (w,f)
-  if defined? $twind2_scroll
-    begin
-      $twind2_scroll.destroy
-    rescue
-    end
-    $twind2_scroll = nil
-  end
-
-  base = TkWinfo.parent( TkWinfo.parent(w) )
-  $twind2_scroll = TkScrollbar.new(base) {|s|
-    orient 'horizontal'
-    command proc{|*args| w.xview(*args)}
-    w.xscrollcommand proc{|first,last| s.set first,last}
-    w.wrap 'none'
-    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
-  }
-
-  return nil
-end
-
-def textWindOff2 (w)
-  if defined? $twind2_scroll
-    begin
-      $twind2_scroll.destroy
-    rescue
-    end
-    $twind2_scroll = nil
-  end
-  w.xscrollcommand ''
-  #w.wrap 'word'
-  w.wrap 'char'
-end
-
-def textWindPlot2 (t)
-  if (defined? $twind2_plot) && (TkWinfo.exist?($twind2_plot))
-    return
-  end
-
-  $twind2_plot = TkCanvas.new(t) {
-    relief 'sunken'
-    width  450
-    height 300
-    cursor 'top_left_arrow'
-  }
-
-  #font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  font = 'Helvetica 18'
-
-  TkcLine.new($twind2_plot, 100, 250, 400, 250, 'width'=>2)
-  TkcLine.new($twind2_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind2_plot, 225, 20,
-              'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
-
-  (0..10).each {|i|
-    x = 100 + (i * 30)
-    TkcLine.new($twind2_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind2_plot, x, 254,
-                'text'=>10*i, 'font'=>font, 'anchor'=>'n')
-  }
-  (0..5).each {|i|
-    y = 250 - (i * 40)
-    TkcLine.new($twind2_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind2_plot, 96, y,
-                'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
-  }
-
-  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-    x = 100 + (3*xx)
-    y = 250 - (4*yy)/5
-    item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6,
-                       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-    item.addtag 'point'
-  end
-
-  $twind2_plot.itembind('point', 'Any-Enter',
-                        proc{$twind2_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind2_plot.itembind('point', 'Any-Leave',
-                        proc{$twind2_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind2_plot.itembind('point', '1',
-                        proc{|x,y| embPlotDown2 $twind2_plot,x,y}, "%x %y")
-  $twind2_plot.itembind('point', 'ButtonRelease-1',
-                        proc{$twind2_plot.dtag 'selected'})
-  $twind2_plot.bind('B1-Motion',
-                    proc{|x,y| embPlotMove2 $twind2_plot,x,y}, "%x %y")
-  while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
-    $twind2_text.delete $mark2_plot
-  end
-  $twind2_text.insert $mark2_plot,"\n"
-  TkTextWindow.new($twind2_text, $mark2_plot, 'window'=>$twind2_plot)
-  $tag2_center.add $mark2_plot
-  $twind2_text.insert $mark2_plot,"\n"
-end
-
-$embPlot2 = {'lastX'=>0, 'lastY'=>0}
-
-def embPlotDown2 (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $embPlot2['lastX'] = x
-  $embPlot2['lastY'] = y
-end
-
-def embPlotMove2 (w, x, y)
-  w.move 'selected', x - $embPlot2['lastX'], y - $embPlot2['lastY']
-  $embPlot2['lastX'] = x
-  $embPlot2['lastY'] = y
-end
-
-def textWindDel2 (w)
-  if (defined? $twind2_text) && TkWinfo.exist?($twind2_plot)
-    $twind2_text.delete $twind2_plot
-    $twind2_plot = nil
-    while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
-      $twind2_text.delete $mark2_plot
-    end
-    $twind2_text.insert $mark2_plot,"  "
-  end
-end
-
-def embDefBg2 (w)
-  w['background'] = w.configinfo('background')[3]
-end
diff --git a/ext/tk/sample/demos-en/unicodeout.rb b/ext/tk/sample/demos-en/unicodeout.rb
deleted file mode 100644
index ee7b5afa15..0000000000
--- a/ext/tk/sample/demos-en/unicodeout.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-# unicodeout.rb --
-#
-# This demonstration script shows how you can produce output (in label
-# widgets) using many different alphabets.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($unicodeout_demo) && $unicodeout_demo
-  $unicodeout_demo.destroy
-  $unicodeout_demo = nil
-end
-
-$unicodeout_demo = TkToplevel.new {|w|
-  title("Unicode Label Demonstration")
-  iconname("unicodeout")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($unicodeout_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'5.4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-This is a sample of Tk's support for languages that use non-Western \
-character sets.  However, what you will actually see below depends \
-largely on what character sets you have installed, and what you see \
-for characters that are not present varies greatly between platforms as well. \
-Please try to click the 'See Code' button, \
-and click the 'Rerun Demo' button after editing \
-(the source file is not changed) \
-the definition of @@font on the Unicodeout_SampleFrame class.
-The strings are written in Tcl using UNICODE characters \
-using the \\uXXXX escape so as to do so in a portable fashion.
-
-ATTENTION:
-The strings are converted to the encoded string objects \
-(completed to rewrite Tcl's escapes) by Tk::UTF8_String method. \
-And the Tk::UTF8_String objects are passed to the label widgets.
-EOL
-
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $unicodeout_demo.destroy
-                 $unicodeout_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'unicodeout'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-wait_msg = TkLabel.new(base_frame,
-                       :text=>"Please wait while loading fonts...",
-                       :font=>"Helvetica 12 italic").pack
-
-class Unicodeout_SampleFrame < TkFrame
-  @@font = $font
-  # @@font = 'Helvetica 14'
-  # @@font = 'Courier 12'
-  # @@font = 'clearlyu 16'
-  # @@font = 'fixed 12'
-  # @@font = 'Times 12'
-  # @@font = 'Newspaper 12'
-  # @@font = '{New century schoolbook} 12'
-
-  def initialize(base)
-    super(base)
-    grid_columnconfig(1, :weight=>1)
-  end
-
-  def add_sample(lang, *args)
-    sample_txt = Tk::UTF8_String(args.join(''))
-    l = TkLabel.new(self, :font=>@@font, :text=>lang+':',
-                    :anchor=>:nw, :pady=>0)
-    #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt,
-    s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt,
-                    :anchor=>:nw, :width=>30, :pady=>0)
-    Tk.grid(l, s, :sticky=>:ew, :pady=>0)
-    l.grid_config(:padx, '1m')
-  end
-end
-f = Unicodeout_SampleFrame.new(base_frame)
-f.pack(:expand=>true, :fill=>:both, :padx=>'2m', :pady=>'1m')
-
-# Processing when some characters are missing might take a while, so make
-# sure we're displaying something in the meantime...
-
-oldCursor = $unicodeout_demo.cursor
-$unicodeout_demo.cursor('watch')
-Tk.update
-
-f.add_sample('Arabic',
-             '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94',
-             '\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
-f.add_sample('Trad. Chinese', '\u4E2D\u570B\u7684\u6F22\u5B57')
-f.add_sample('Simpl. Chinese', '\u6C49\u8BED')
-f.add_sample('Greek',
-             '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ',
-             '\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1')
-f.add_sample('Hebrew',
-             '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ',
-             '\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9')
-f.add_sample('Japanese',
-             '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ',
-             '\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA')
-f.add_sample('Korean', '\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00')
-f.add_sample('Russian',
-             '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ',
-             '\u044F\u0437\u044B\u043A')
-
-wait_msg.destroy
-$unicodeout_demo.cursor(oldCursor)
diff --git a/ext/tk/sample/demos-en/vscale.rb b/ext/tk/sample/demos-en/vscale.rb
deleted file mode 100644
index b05ed12072..0000000000
--- a/ext/tk/sample/demos-en/vscale.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# vscale.rb
-#
-# This demonstration script shows an example with a vertical scale.
-
-require "tkcanvas"
-
-if defined?($vscale_demo) && $vscale_demo
-  $vscale_demo.destroy
-  $vscale_demo = nil
-end
-
-$vscale_demo = TkToplevel.new {|w|
-  title("Vertical Scale Demonstration")
-  iconname("vscale")
-}
-positionWindow($vscale_demo)
-
-base_frame = TkFrame.new($vscale_demo).pack(:fill=>:both, :expand=>true)
-
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '3.5i'
-  justify 'left'
-  text "An arrow and a vertical scale are displayed below.  If you click or drag mouse button 1 in the scale, you can change the size of the arrow."
-}
-msg.pack('side'=>'top', 'padx'=>'.5c')
-
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc {
-      tmppath = $vscale_demo
-      $vscale_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc { showCode 'vscale' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-def setHeight(w, height)
-  height = height + 21
-  y2 = height - 30
-  if y2 < 21
-    y2 = 21
-  end
-  w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-  w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-end
-
-TkFrame.new(base_frame) {|frame|
-  borderwidth 10
-  canvas = TkCanvas.new(frame) {|c|
-    width 50
-    height 50
-    bd 0
-    highlightthickness 0
-    TkcPolygon.new(c, 0, 0, 1, 1, 2, 2) {
-      fill 'SeaGreen3'
-      tags 'poly'
-    }
-    TkcLine.new(c, 0, 0, 1, 1, 2, 2, 0, 0) {
-      fill 'black'
-      tags 'line'
-    }
-  }.pack('side'=>'left',  'anchor'=>'nw', 'fill'=>'y')
-  scale = TkScale.new(frame) {
-    orient 'vertical'
-    length 284
-    from 0
-    to 250
-    command proc{|value| setHeight(canvas, value)}
-    tickinterval 50
-  }.pack('side'=>'left', 'anchor'=>'ne')
-  scale.set 75
-}.pack
diff --git a/ext/tk/sample/demos-en/widget b/ext/tk/sample/demos-en/widget
deleted file mode 100644
index e6510c7e45..0000000000
--- a/ext/tk/sample/demos-en/widget
+++ /dev/null
@@ -1,1087 +0,0 @@
-#!/usr/bin/env ruby
-
-# widget --
-# This script demonstrates the various widgets provided by Tk,
-# along with many of the features of the Tk toolkit.  This file
-# only contains code to generate the main window for the
-# application, which invokes individual demonstrations.  The
-# code for the actual demonstrations is contained in separate
-# ".rb" files is this directory, which are sourced by this script
-# as needed.
-
-require 'tk'
-# require 'tkafter'
-
-### $DEBUG=1 ##########
-
-$RubyTk_WidgetDemo = true
-
-#----------------------------------------------------------------
-# The code below create the main window, consisting of a menu bar
-# and a text widget that explains how to use the program, plus lists
-# all of the demos as hypertext items.
-#----------------------------------------------------------------
-
-# widget demo directory
-# $demo_dir = File.dirname($0)
-$demo_dir = File.dirname(__FILE__)
-
-# root
-$root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
-
-# tk
-$tk_version = Tk::TK_VERSION
-$tk_major_ver, $tk_minor_ver = $tk_version.split('.').map{|n| n.to_i}
-$tk_patchlevel = Tk::TK_PATCHLEVEL
-
-# tcl_platform
-$tk_platform = TkVarAccess.new('tcl_platform')
-
-#
-case($tk_version)
-when /^4.*/
-  $font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
-else
-  $font = TkFont.new('Helvetica -12')
-end
-
-# images
-$image = {}
-
-if $tk_major_ver >= 8
-$image['refresh'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
-    R0lGODlhEAAQAPMAAMz/zCpnKdb/1z9mPypbKBtLGy9NMPL/9Or+6+P+4j1Y
-    PwQKBP7//xMLFAYBCAEBASH5BAEAAAAALAAAAAAQABAAAwR0EAD3Gn0Vyw0e
-    ++CncU7IIAezMA/nhUqSLJizvSdCEEjy2ZIV46AwDAoDHwPYGSoEiUJAAGJ6
-    EDHBNCFINW5OqABKSFk/B9lUa94IDwIFgewFMwQDQwCZQCztTgM9Sl8SOEMG
-    KSAthiaOjBMPDhQONBiXABEAOw==
-EOD
-end
-
-if $tk_major_ver >= 8
-$image['view'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
-    R0lGODlhEAAQAPMAAMz/zP///8DAwICAgH9/fwAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAwRIcMhJB7h3hM33
-    KFjWdQQYap1QrCaGBmrRrS4nj5b53jOgbwXBKGACoYLDIuAoHCmZyYvR1rT5
-    RMAq8LqcIYGsrjPsW1XOmFUEADs=
-EOD
-end
-
-if $tk_major_ver >= 8
-$image['delete'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
-    R0lGODlhEAAOAKEAAIQAAO/n3v///////yH5BAEKAAIALAAAAAAQAA4AAAIm
-    lI9pAKHbIHNoVhYhTdjlJ2AWKG2g+CldmB6rxo2uybYhbS80eRQAOw==
-EOD
-end
-
-if $tk_major_ver >= 8
-$image['print'] = TkPhotoImage.new(:height=>19, :format=>'GIF', :data=><<EOD)
-    R0lGODlhGgATAPcAACEQOTEpQjEpUkIpc0IxY0I5c0oxjEo5SlJCY1JCe1JK
-    UlpChFpCjFpGkFpSc1paa2NKc2NKnGNja2tapWtjc29KnHNanHNjc3NjrXNr
-    jHNrnHNzc3tjpXtrtXtzhICAgIRzvYSEjIZzqox7tYyEnIyMjJSEtZSEvZSM
-    lJyMtZyMvZyUlJyUrZyUvZycnKWctaWlpa2czq2lzrWtvbWtzrW1tb21xr21
-    1sa9zs693s7OztbO3tbO597W1t7W7+fe7+fn5////+/n7+/v7+/v9////wAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAACH5BAEAAEEALAAAAAAaABMAQAj/AIMIHBhkg0GC
-    CBMGIQEiQgseQT4oeCBBAokgRYYQ0JBixg8hRIiUUEBBYYmTByBwiCBCRYwH
-    CxY8cKFw4AogRXLqLAJkQ80gCBBg3BkxZswTNGh4MGqgQQUMJRHCwMkTSE+D
-    Pn8eCKBhxIMhO3ei2OHDBw6sWSlMMMoWgwwfMDZI8GBjx44NARZwEGGi5MkS
-    PcIWKRGz5YgLbAco+KkQBQoJIRgjdGEVq+SaJajqtNrzMgsPCmoIzqmDgmWE
-    KOBuUKAAwYabYTfs4OHjY0giGyhk4MAWRI4eKyRQqPgggYUXPH4A+XBAgwoK
-    DiIsCFxjA9sFEVQQCRJCAYAFDJxiKhAxvMTonEFimrhhYinTBgWiCvxLNX3M
-    DkkpsKV5OYhjBxCMYAICAigUEAA7
-EOD
-end
-
-#
-if $tk_major_ver >= 8
-  $root.add_menubar([[['File', 0],
-                        ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                        '---',
-                        ['Quit', proc{exit}, 0, 'Ctrl-Q']
-                      ]])
-else
-  TkMenubar.new($root,
-                [[['File', 0],
-                    ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                    '---',
-                    ['Quit', proc{exit}, 0, 'Ctrl-Q']
-                  ]]).pack('side'=>'top', 'fill'=>'x')
-end
-$root.bind('F1', proc{aboutBox})
-$root.bind('Control-q', proc{exit})
-
-=begin
-TkFrame.new($root){|frame|
-  TkMenubutton.new(frame){|button|
-    m = TkMenu.new(button) {
-      add 'command', 'label'=>'Quit', 'command'=>proc{exit}, 'underline'=>0
-    }
-    menu m
-    text 'File'
-    underline 0
-  }.pack('side'=>'left')
-}.pack('side'=>'top', 'fill'=>'x')
-=end
-
-#
-if $tk_version =~ /^4\.[01]/
-  scr = TkScrollbar.new($root, 'orient'=>'vertical')
-  txt = TkText.new($root) {
-    wrap 'word'
-    width 70
-    height 30
-    font $font
-    setgrid 'yes'
-    yscrollcommand proc{|first,last| scr.set first,last}
-  }
-  scr.command(proc{|*args| txt.yview(*args)})
-  scr.pack('side'=>'right', 'fill'=>'y')
-  txt.pack('expand'=>'yes', 'fill'=>'both')
-else
-  textFrame = TkFrame.new($root)
-  scr = TkScrollbar.new($root, 'orient'=>'vertical',
-                        'highlightthickness'=>0, 'takefocus'=>1) {
-    pack('in'=>textFrame, 'side'=>'right', 'fill'=>'y', 'padx'=>1)
-  }
-  txt = TkText.new($root) {
-    wrap 'word'
-    width 70
-    height 30
-    font $font
-    setgrid 'yes'
-    highlightthickness 0
-    padx 4
-    pady 2
-    takefocus 0
-    bd 1
-    yscrollcommand proc{|first,last| scr.set first,last}
-  }
-  scr.command(proc{|*args| txt.yview(*args)})
-#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both', 'padx'=>1)
-#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
-#  textFrame.pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>2)
-  textFrame.pack('expand'=>'yes', 'fill'=>'both')
-  #  $root.withdraw.deiconify
-  Tk.update_idletasks
-  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
-
-  statusBar = TkFrame.new($root) {|f|
-    if $tk_version =~ /^4.*/
-      statusfont = '-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-    else
-      statusfont = 'Helvetica 10'
-    end
-    $statusBarLabel = \
-    TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
-                'font'=>statusfont) \
-        .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
-    TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
-                'font'=>statusfont) \
-        .pack('side'=>'left', 'padx'=>2)
-  }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-end
-
-# Create a bunch of tags to use in the text widget, such as those for
-# section titles and demo descriptions.  Also define the bindings for
-# tags.
-
-if $tk_version =~ /^4.*/
-  tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
-else
-  tag_title = TkTextTag.new(txt, 'font'=>'Helvetica 18 bold')
-end
-
-# We put some "space" characters to the left and right of each demo description
-# so that the descriptions are highlighted only when the mouse cursor
-# is right over them (but not when the cursor is to their left or right)
-
-tag_demospace = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c')
-
-if TkWinfo.depth($root) == 1
-  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                           'underline'=>1)
-  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                              'underline'=>1)
-  tag_hot = TkTextTag.new(txt, 'background'=>'black', 'foreground'=>'white')
-else
-  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                           'foreground'=>'blue', 'underline'=>1)
-  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                              'foreground'=>'#303080', 'underline'=>1)
-#  tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1,
-#                         'background'=>'SeaGreen3')
-  tag_hot = TkTextTag.new(txt, 'borderwidth'=>1, 'foreground'=>'red')
-end
-
-#tag_demo.bind('Button-1', proc{invoke txt, txt.index('current')})
-tag_demo.bind('ButtonRelease-1',
-              proc{|x,y|invoke txt, txt.index("@#{x},#{y}")}, '%x %y')
-
-lastLine = TkVariable.new("")
-newLine  = TkVariable.new("")
-tag_demo.bind('Enter', proc{|x,y|
-                lastLine.value = txt.index("@#{x},#{y} linestart")
-                tag_hot.add(lastLine.value, "#{lastLine.value} lineend")
-                showStatus txt, txt.index("@#{x},#{y}")
-              },
-              '%x %y')
-tag_demo.bind('Leave',
-              proc{
-                tag_hot.remove('1.0','end')
-                txt.configure('cursor','xterm')
-                $statusBarLabel.configure('text'=>"")
-              })
-tag_demo.bind('Motion', proc{|x, y|
-                newLine.value = txt.index("@#{x},#{y} linestart")
-                if newLine.value != lastLine.value
-                  tag_hot.remove('1.0','end')
-                  lastLine.value = newLine.value
-                  if ( txt.tag_names("@#{x},#{y}").find{|t|
-                        t.kind_of?(String) && t =~ /^demo-/
-                      } )
-                    tag_hot.add(lastLine.value,
-                                "#{lastLine.value} lineend -1 chars")
-                  end
-                end
-                showStatus txt, txt.index("@#{x},#{y}")
-              },
-              '%x %y')
-
-# Create the text for the text widget.
-
-txt.insert('end', "Ruby/Tk Widget Demonstrations\n\n", tag_title)
-txt.insert('end', <<EOT)
-This application provides a front end for several short scripts that \
-demonstrate what you can do with Tk widgets.  Each of the numbered \
-lines below describes a demonstration;  you can click on it to invoke \
-the demonstration.  Once the demonstration window appears, you can \
-click the "See Code" button to see the Ruby/Tk code that created the \
-demonstration.  If you wish, you can edit the code and click the \
-"Rerun Demo" button in the code window to reinvoke the demonstration \
-with the modified code. \
-Don't worry about breaking the source code. \
-Your modifications are not reflected on the original file. \
-Please try many kind of changes.
-
-Some demo scripts require the recent version of Tk library \
-(e.g. Tk8.4 or later) \
-If your Tk library linked to Ruby doesn't support the functions \
-required by the demo script, the demo doesn't work. \
-In such a case, please re-compile tcltklib with the later Tk library \
-which supports the required functions.
-
-If your Tk supports Ttk (Tile) extension (included or installed), \
-please try the demo of Ttk extension (sample/tkextlib/tile/demo.rb) too.
-( Probably, Ttk extension \
-#{
-begin
-  require 'tkextlib/tile'
-  "is already installed on your environment"
-rescue
-  "is not installed on your environment yet"
-end
-}\
-. )
-Ttk extension is a standard feature of Tk8.5 or later.
-
-
-EOT
-
-txt.insert('end', "Labels, buttons, checkbuttons, and radiobuttons.\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Labels (text and bitmaps).\n", tag_demo, "demo-label")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Labels and UNICODE text. (if supported)\n", tag_demo, "demo-unicodeout")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Buttons.\n", tag_demo, "demo-button")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Checkbuttons (select any of a group).\n", tag_demo, "demo-check")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. Checkbuttons (if supported).\n", tag_demo, "demo-check2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. Radiobuttons (select one of a group).\n", tag_demo, "demo-radio")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. Radiobuttons (if supported 'compound' option).\n", tag_demo, "demo-radio2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. Radiobuttons (if supported).\n", tag_demo, "demo-radio3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. A 15-puzzle game made out of buttons.\n", tag_demo, "demo-puzzle")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "10. Iconic buttons that use bitmaps.\n", tag_demo, "demo-icon")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "11. Two labels displaying images.\n", tag_demo, "demo-image1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "12. A simple user interface for viewing images.\n", tag_demo, "demo-image2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "13. A simple user interface for viewing images. (if supported)\n", tag_demo, "demo-image3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "14. Labelled frames (if supported)\n", tag_demo, "demo-labelframe")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "15. The simple Themed Tk widgets (require Tile/Ttk extension)\n", tag_demo, "demo-ttkbut")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Listboxes\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. 50 states.\n", tag_demo, "demo-states")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Colors: change the color scheme for the application.\n", "#{tag_demo.id} demo-colors")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. A collection of famous sayings.\n", tag_demo, "demo-sayings")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. A multi-column list of contries. (require Tile/Ttk extension)\n", tag_demo, "demo-mclist")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. A directory browser tree. (require Tile/Ttk extension)\n", tag_demo, "demo-tree")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Entries and Spin-boxes\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Without scrollbars.\n", tag_demo, "demo-entry1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. With scrollbars.\n", tag_demo, "demo-entry2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end',
-           "3. Validated entries and password fields. (if supported)\n",
-           tag_demo, "demo-entry3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Spin-boxes. (if supported)\n", tag_demo, "demo-spin")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. Combo-boxes. (require Tile/Ttk extension)\n", tag_demo, "demo-combo")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. Simple Rolodex-like form.\n", tag_demo, "demo-form")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Text\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Basic editable text.\n", tag_demo, "demo-text")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Text display styles.\n", tag_demo, "demo-style")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Hypertext (tag bindings).\n", tag_demo, "demo-bind")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. A text widget with embedded windows.\n", tag_demo, "demo-twind")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. A text widget with embedded windows. (if supported)\n", tag_demo, "demo-twind2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. A search tool built with a text widget.\n", tag_demo, "demo-search")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. Peering text widgets. (if supported)\n", tag_demo, "demo-textpeer")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Canvases\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. The canvas item types.\n", tag_demo, "demo-items")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. A simple 2-D plot.\n", tag_demo, "demo-plot")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Text items in canvases.\n", tag_demo, "demo-ctext")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. An editor for arrowheads on canvas lines.\n", tag_demo, "demo-arrow")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. A ruler with adjustable tab stops.\n", tag_demo, "demo-ruler")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. A building floor plan.\n", tag_demo, "demo-floor")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. A building floor plan. (another way to create canvas items)\n", tag_demo, "demo-floor2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. A simple scrollable canvas.\n", tag_demo, "demo-cscroll")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. A Knight's tour of the chess board. (require Tile/Ttk extension)\n", tag_demo, "demo-knightstour")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Scales and Progress Bars\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Vertical scale.\n", tag_demo.id, "demo-vscale")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Horizontal scale.\n", tag_demo.id, "demo-hscale")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Progress bar. (require Tile/Ttk extension)\n", tag_demo.id, "demo-ttkprogress")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Paned Windows and Notebooks\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Horizontal paned window. (if supported)\n", tag_demo.id, "demo-paned1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Vertical paned window. (if supported)\n", tag_demo.id, "demo-paned2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Themed nested panes. (require Tile/Ttk extension)\n", tag_demo.id, "demo-ttkpane")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Notebook widget. (require Tile/Ttk extension)\n", tag_demo.id, "demo-ttknote")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Menus and Toolbars\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Menus and cascades.\n", tag_demo, "demo-menu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Menus and cascades. (if supported)\n", tag_demo, "demo-menu84")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Menubuttons.\n", tag_demo, "demo-menubu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Themed menu buttons. (require Tile/Ttk extension)\n", tag_demo, "demo-ttkmenu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. Themed toolbar. (require Tile/Ttk extension)\n", tag_demo, "demo-toolbar")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Common Dialogs\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Message boxes.\n", tag_demo, "demo-msgbox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Message boxes with detail text. (if supported)\n", tag_demo, "demo-msgbox2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. File selection dialog.\n", tag_demo, "demo-filebox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Color picker.\n", tag_demo, "demo-clrpick")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Animation\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Animated labels (if supported)\n", tag_demo, "demo-anilabel")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Animated wave (if supported)\n", tag_demo, "demo-aniwave")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Pendulum simulation (if supported)\n", tag_demo, "demo-pendulum")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. A celebration of Rube Goldberg (if supported)\n", tag_demo, "demo-goldberg")
-
-txt.insert('end', "\n")
-txt.insert('end', "Miscellaneous\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. The built-in bitmaps.\n", tag_demo, "demo-bitmap")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. A dialog box with a local grab.\n", tag_demo, "demo-dialog1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. A dialog box with a global grab.\n", tag_demo, "demo-dialog2")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.state('disabled')
-scr.focus
-
-# positionWindow --
-# This procedure is invoked by most of the demos to position a
-# new demo window.
-#
-# Arguments:
-# w -           The name of the window to position.
-
-def positionWindow(w)
-  w.geometry('+300+300')
-end
-
-# showVars --
-# Displays the values of one or more variables in a window, and
-# updates the display whenever any of the variables changes.
-#
-# Arguments:
-# w -           Name of new window to create for display.
-# args -        Any number of names of variables.
-
-$showVarsWin = {}
-def showVars1(parent, *args)
-  if $showVarsWin[parent.path]
-    begin
-      $showVarsWin[parent.path].destroy
-    rescue
-    end
-  end
-  w = TkToplevel.new(parent) {|w|
-    title "Variable values"
-    base = TkFrame.new(w).pack(:fill=>:both, :expand=>true)
-    TkLabel.new(base) {
-      text "Variable values:"
-      width 20
-      anchor 'center'
-      if $tk_version =~ /^4.*/
-        font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
-      else
-        font 'Helvetica 14'
-      end
-    }.pack('side'=>'top', 'fill'=>'x')
-    len = 1
-    args.each{|vnam,vbody|
-      len = vnam.to_s.length if vnam.to_s.length > len
-    }
-    args.each{|vnam,vbody|
-      TkFrame.new(w){|f|
-        #TkLabel.new(f, 'text'=>"#{vnam}: ").pack('side'=>'left')
-        TkLabel.new(f, 'text'=>"#{vnam}: ",'width'=>len+2).pack('side'=>'left')
-        TkLabel.new(f, 'textvariable'=>vbody, 'anchor'=>'w')\
-                   .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
-      }.pack('side'=>'top', 'anchor'=>'w', 'fill'=>'x')
-    }
-    TkButton.new(base) {
-      text "OK"
-      command proc{w.destroy}
-    }.pack('side'=>'bottom', 'pady'=>2)
-  }
-  $showVarsWin[parent.path] = w
-end
-
-def showVars2(parent, *args)
-  if $showVarsWin[parent.path]
-    begin
-      $showVarsWin[parent.path].destroy
-    rescue
-    end
-  end
-  $showVarsWin[parent.path] = TkToplevel.new(parent) {|top|
-    title "Variable values"
-
-    base = TkFrame.new(top).pack(:fill=>:both, :expand=>true)
-
-    TkLabelFrame.new(base, :text=>"Variable values:",
-                     :font=>{:family=>'Helvetica', :size=>14}){|f|
-      args.each{|vnam,vbody|
-        TkGrid(TkLabel.new(f, :text=>"#{vnam}: ", :anchor=>'w'),
-               TkLabel.new(f, :textvariable=>vbody, :anchor=>'w'),
-               :padx=>2, :pady=>2, :sticky=>'w')
-      }
-
-      f.grid(:sticky=>'news', :padx=>4)
-      f.grid_columnconfig(1, :weight=>1)
-      f.grid_rowconfig(100, :weight=>1)
-    }
-    TkButton.new(base, :text=>"OK", :width=>8, :default=>:active,
-                 :command=>proc{top.destroy}){|b|
-      top.bind('Return', proc{b.invoke})
-      top.bind('Escape', proc{b.invoke})
-
-      b.grid(:sticky=>'e', :padx=>4, :pady=>[6, 4])
-    }
-    base.grid_columnconfig(0, :weight=>1)
-    base.grid_rowconfig(0, :weight=>1)
-  }
-end
-
-if $tk_major_ver < 8
-  alias showVars showVars1
-elsif $tk_major_ver == 8 && $tk_minor_ver < 4
-  alias showVars showVars1
-else # ver >= 8.4
-  alias showVars showVars2
-end
-
-# Pseudo-Toplevel support
-module 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__ method_missing
-  private :__method_missing__
-
-  def method_missing(id, *args)
-    begin
-      has_top = (top = Thread.current[: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__(id, *args)
-    end
-  end
-end
-
-class Proc
-  def initialize(*args, &b)
-    super
-    @__pseudo_toplevel__ = Thread.current[:TOPLEVEL]
-  end
-
-  alias __call__ call
-  def call(*args, &b)
-    if top = @__pseudo_toplevel__
-      orig_top = Thread.current[:TOPLEVEL]
-      Thread.current[:TOPLEVEL] = top
-      begin
-        __call__(*args, &b)
-      ensure
-        Thread.current[:TOPLEVEL] = orig_top
-      end
-    else
-      __call__(*args, &b)
-    end
-  end
-end
-
-def proc(&b)
-  Proc.new(&b)
-end
-def lambda(&b)
-  Proc.new(&b)
-end
-
-def _null_binding
-  Module.new.instance_eval{extend PseudoToplevel_Evaluable}
-  # binding
-  # Module.new.instance_eval{binding}
-end
-private :_null_binding
-
-def eval_samplecode(code, file=nil)
-  #eval(code)
-  #_null_binding.pseudo_toplevel_eval{ eval(code) }
-  #Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }
-  Thread.new{
-    _null_binding.pseudo_toplevel_eval{
-      begin
-        if file
-          eval(code, binding, "(eval:#{file})")
-        else
-          eval(code)
-        end
-      rescue Exception=>e
-        #p e
-        TkBgError.show(e.class.inspect + ': ' + e.message + "\n" +
-                         "\n---< backtrace of Ruby side >-----\n" +
-                         e.backtrace.join("\n") +
-                         "\n---< backtrace of Tk side >-------")
-      end
-    }
-  }
-  Tk.update
-end
-
-# invoke --
-# This procedure is called when the user clicks on a demo description.
-# It is responsible for invoking the demonstration.
-#
-# Arguments:
-# txt -         Name of text widget
-# index -       The index of the character that the user clicked on.
-def invoke(txt, idx)
-  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  return unless tag
-
-  cursor = txt.cget('cursor')
-  txt.cursor('watch')
-  Tk.update
-  # eval(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, _null_binding)
-  # Tk.update
-  eval_samplecode(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, tag[5..-1] + '.rb')
-  txt.cursor(cursor)
-
-  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
-end
-=begin
-def invoke (txt, idx)
-  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  return unless tag
-  current_cursor = txt.cget('cursor')
-  txt.cursor('watch')
-  Tk.update
-#  eval `cat #{tag[5..-1]}.rb`
-#  eval `cat #{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb`
-  eval IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join
-  Tk.update
-#  txt.cursor('xterm')
-  txt.cursor(current_cursor)
-
-  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
-end
-=end
-# showStatus --
-#
-#       Show the name of the demo program in the status bar. This procedure
-#       is called when the user moves the cursor over a demo description.
-#
-
-def showStatus (txt, index)
-  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  cursor = txt.cget('cursor')
-  unless tag
-    $statusBarLabel.configure('text', " ")
-    newcursor = 'xterm'
-  else
-    demoname = tag[5..-1]
-    $statusBarLabel.configure('text',
-                             "Run the \"#{demoname}\" sample program")
-    newcursor = 'hand2'
-  end
-  txt.configure('cursor'=>newcursor) if cursor != newcursor
-end
-
-# showCode --
-# This procedure creates a toplevel window that displays the code for
-# a demonstration and allows it to be edited and reinvoked.
-#
-# Arguments:
-# demo -        The name of the demonstration's window, which can be
-#               used to derive the name of the file containing its code.
-
-def showCode1(demo)
-  file = "#{demo}.rb"
-  $code_window = nil unless defined? $code_window
-  if $code_window == nil || TkWinfo.exist?($code_window) == false
-    $code_window = TkToplevel.new(nil)
-    f = TkFrame.new($code_window)
-
-    TkButton.new(f) {
-      text "Dismiss"
-      command proc{
-        $code_window.destroy
-        $code_window = nil
-      }
-    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2, 'padx'=>25)
-    TkButton.new(f) {
-      text "Rerun Demo"
-      # command proc{eval($code_text.get('1.0','end'), _null_binding)}
-      command proc{eval_samplecode($code_text.get('1.0','end'), '<viewer>')}
-    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
-
-    TkLabel.new(f,'text'=>'line:').pack('side'=>'left')
-    linenum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
-    TkLabel.new(f,'text'=>'  pos:').pack('side'=>'left')
-    posnum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
-
-    $set_linenum = proc{|w|
-      line, pos = w.index('insert').split('.')
-      linenum.text = line
-      posnum.text  = pos
-    }
-
-    f.pack('side'=>'bottom', 'expand'=>'true', 'fill'=>'x')
-
-    if $tk_version =~ /^4\.[01]/
-      s = TkScrollbar.new($code_window, 'orient'=>'vertical')
-      $code_text = TkText.new($code_window) {
-        height 40
-        setgrid 'yes'
-        yscrollcommand proc{|first,last| s.set first,last}
-      }
-      s.command(proc{|*args| $code_text.yview(*args)})
-      s.pack('side'=>'right', 'fill'=>'y')
-      $code_text.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
-    else
-      TkFrame.new($code_window) {|f|
-        pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-        hs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
-                             'orient'=>'horizontal')
-        vs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
-                             'orient'=>'vertical')
-        $code_text = TkText.new($code_window) {|t|
-          height 40
-          wrap 'word'
-          xscrollcommand proc{|first,last| hs.set first,last}
-          yscrollcommand proc{|first,last| vs.set first,last}
-          setgrid 'yes'
-          highlightthickness 0
-          pady 2
-          padx 3
-          hs.command(proc{|*args| $code_text.xview(*args)})
-          vs.command(proc{|*args| $code_text.yview(*args)})
-        }
-
-        $code_text.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-                        'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-        vs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-                'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-#       xs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-#               'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-# JKC 2001-07-26: segfaults under 1.7.1 (2001-06-19) [i686-linux]
-        TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-        TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-      }
-    end
-
-    btag = TkBindTag.new
-
-    btag.bind('Key', $set_linenum, '%W')
-    btag.bind('Button', $set_linenum, '%W')
-
-    btags = $code_text.bindtags
-    btags.insert(btags.index($code_text.class) + 1, btag)
-    $code_text.bindtags = btags
-
-  else
-    $code_window.deiconify
-    $code_window.raise
-  end
-
-  $code_window.title("Demo code: #{file}")
-  $code_window.iconname(file)
-#  fid = open(file, 'r')
-  fid = open([$demo_dir, file].join(File::Separator), 'r')
-  $code_text.delete('1.0', 'end')
-  #$code_text.insert('1.0', `cat #{file}`)
-  $code_text.insert('1.0', fid.read)
-  #$code_mark = TkTextMark.new($code_text, '1.0')
-  #$code_text.set_insert('1.0')
-  TkTextMarkInsert.new($code_text,'1.0')
-
-  $set_linenum.call($code_text)
-
-  fid.close
-end
-
-def showCode2(demo)
-  file = "#{demo}.rb"
-  $code_window = nil unless defined? $code_window
-  if $code_window == nil || TkWinfo.exist?($code_window) == false
-    $code_window = TkToplevel.new(nil)
-    tf = TkFrame.new($code_window)
-    $code_text = TkText.new(tf, :font=>'Courier 10', :height=>30,
-                            :wrap=>'word', :bd=>1, :setgrid=>true,
-                            :highlightthickness=>0, :pady=>2, :padx=>3)
-    xscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
-    yscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
-    TkGrid($code_text, yscr, :sticky=>'news')
-    #TkGrid(xscr)
-    tf.grid_rowconfigure(0, :weight=>1)
-    tf.grid_columnconfigure(0, :weight=>1)
-
-    bf = TkFrame.new($code_window)
-
-    lf = TkFrame.new(bf)
-    TkLabel.new(lf, :text=>'line:').pack(:side=>:left)
-    linenum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
-    TkLabel.new(lf, :text=>'  pos:').pack(:side=>:left)
-    posnum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
-
-    $set_linenum = proc{|w|
-      line, pos = w.index('insert').split('.')
-      linenum.text = line
-      posnum.text  = pos
-    }
-
-    b_dis = TkButton.new(bf, :text=>'Dismiss', :default=>:active,
-                         :command=>proc{
-                           $code_window.destroy
-                           $code_window = nil
-                         },
-                         :image=>$image['delete'], :compound=>:left)
-    b_prn = TkButton.new(bf, :text=>'Print Code',
-                         :command=>proc{printCode($code_text, file)},
-                         :image=>$image['print'], :compound=>:left)
-    b_run = TkButton.new(bf, :text=>'Rerun Demo',
-                         :command=>proc{
-                           # eval($code_text.get('1.0','end'), _null_binding)
-                           eval_samplecode($code_text.get('1.0','end'), '<viewer>')
-                         },
-                         :image=>$image['refresh'], :compound=>:left)
-
-    TkGrid(lf, 'x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
-    bf.grid_columnconfigure(1, :weight=>1)
-
-    TkGrid(tf, :sticky=>'news')
-    TkGrid(bf, :sticky=>'ew')
-    $code_window.grid_columnconfigure(0, :weight=>1)
-    $code_window.grid_rowconfigure(0, :weight=>1)
-
-    $code_window.bind('Return', proc{|win|
-                        b_dis.invoke unless win.kind_of?(TkText)
-                      }, '%W')
-    $code_window.bindinfo('Return').each{|cmd, arg|
-      $code_window.bind_append('Escape', cmd, arg)
-    }
-
-    btag = TkBindTag.new
-
-    btag.bind('Key', $set_linenum, '%W')
-    btag.bind('Button', $set_linenum, '%W')
-    btag.bind('Configure', $set_linenum, '%W')
-
-    btags = $code_text.bindtags
-    btags.insert(btags.index($code_text.class) + 1, btag)
-    $code_text.bindtags = btags
-
-  else
-    $code_window.deiconify
-    $code_window.raise
-  end
-
-  $code_window.title("Demo code: #{file}")
-  $code_window.iconname(file)
-  fid = open([$demo_dir, file].join(File::Separator), 'r')
-  $code_text.delete('1.0', 'end')
-  $code_text.insert('1.0', fid.read)
-  TkTextMarkInsert.new($code_text,'1.0')
-
-  $set_linenum.call($code_text)
-
-  fid.close
-end
-
-if $tk_major_ver < 8
-  alias showCode showCode1
-elsif $tk_major_ver == 8 && $tk_minor_ver < 4
-  alias showCode showCode1
-else # ver >= 8.4
-  alias showCode showCode2
-end
-
-
-# printCode --
-# Prints the source code currently displayed in the See Code dialog.
-# Much thanks to Arjen Markus for this.
-#
-# Arguments:
-# txt -         Name of text widget containing code to print
-# file -        Name of the original file (implicitly for title)
-
-def printCode(txt, file)
-  code = txt.get('1.0', 'end - 1c')
-  dir = '.'
-  dir = ENV['HOME'] if ENV['HOME']
-  dir = ENV['TMP'] if ENV['TMP']
-  dir = ENV['TEMP'] if ENV['TEMP']
-
-  fname = [dir, 'tkdemo-' + file].join(File::Separator)
-  open(fname, 'w'){|fid| fid.print(code)}
-  begin
-    case Tk::TCL_PLATFORM('platform')
-    when 'unix'
-      msg = `lp -c #{fname}`
-      unless $?.exitstatus == 0
-        Tk.messageBox(:title=>'Print spooling failure',
-                      :message=>'Print spooling probably failed: ' + msg)
-      end
-    when 'windows'
-      begin
-        printTextWin32(fname)
-      rescue => e
-        Tk.messageBox(:title=>'Print spooling failure',
-                      :message=>'Print spooling probably failed: ' +
-                      e.message)
-      end
-    when 'macintosh'
-      Tk.messageBox(:title=>'Operation not Implemented',
-                    :message=>'Oops, sorry: not implemented yet!')
-    else
-      Tk.messageBox(:title=>'Operation not Implemented',
-                    :message=>'Wow! Unknown platform: ' +
-                    Tk::TCL_PLATFORM('platform'))
-    end
-  ensure
-    File.delete(fname)
-  end
-end
-
-# printTextWin32 --
-#    Print a file under Windows
-#
-# Arguments:
-# filename -            Name of the file
-#
-def printTextWin32(fname)
-  require 'win32/registry'
-  begin
-    app = Win32::Registry::HKEY_CLASSES_ROOT['.txt']
-    pcmd = nil
-    Win32::Registry::HKEY_CLASSES_ROOT.open("#{app}\\shell\\print"){|reg|
-      pcmd = reg['command']
-    }
-  rescue
-    app = Tk.tk_call('auto_execok', 'notepad.exe')
-    pcmd = "#{app} /p %1"
-  end
-
-  pcmd.gsub!('%1', fname)
-  puts pcmd
-  cmd = Tk.tk_call('auto_execok', 'start') + ' /min ' + pcmd
-
-  msg = `#{cmd}`
-  unless $?.exitstatus == 0
-    fail RuntimeError, msg
-  end
-end
-
-# aboutBox
-#
-#      Pops up a message box with an "about" message
-#
-def aboutBox
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo',
-                'message'=>"Ruby/Tk widget demonstration Ver.1.7.1-en\n\n" +
-                           "based on demos of Tk8.1 -- 8.5  " +
-                           "( Copyright of Tcl/Tk demos:: " +
-                           "(c) 1996-1997 Sun Microsystems, Inc. / " +
-                           "(c) 1997-2000 Ajuba Solutions, Inc. / " +
-                           "(c) 2001-2007 Donal K. Fellows / " +
-                           "(c) 2002-2007 Daniel A. Steffen )\n\n" +
-                           "Your Ruby & Tk Version ::\n" +
-                           "Ruby#{RUBY_VERSION}(#{RUBY_RELEASE_DATE})[#{RUBY_PLATFORM}] / Tk#{$tk_patchlevel}#{(Tk::JAPANIZED_TK)? '-jp': ''}\n\n" +
-                           "Ruby/Tk release date :: tcltklib #{TclTkLib::RELEASE_DATE}; tk #{Tk::RELEASE_DATE}")
-end
-
-#########################################
-# start demos if given at command line
-no_launcher = false
-if ARGV[0] == '-n'
-  ARGV.shift
-  no_launcher = true if ARGV.size > 0
-else
-  # show the root widget to make it lower then demo windows
-  Tk.update
-end
-ARGV.each{|cmd|
-  if cmd =~ /(.*).rb/
-    cmd = $1
-  end
-  #eval(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join,
-  #     _null_binding)
-  eval_samplecode(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join, cmd + '.rb')
-}
-if no_launcher
-  $root.withdraw  # hide root window
-  Thread.start{
-    loop do
-      count = 0
-      $root.winfo_children.each{|w|
-        count += 1 if w.kind_of?(TkToplevel)
-      }
-      $root.destroy if count == 0
-    end
-  }
-end
-
-#########################################
-# start eventloop
-Tk.mainloop
-
diff --git a/ext/tk/sample/demos-jp/README b/ext/tk/sample/demos-jp/README
deleted file mode 100644
index 6375800232..0000000000
--- a/ext/tk/sample/demos-jp/README
+++ /dev/null
@@ -1,54 +0,0 @@
-
-  Ruby/Tk widget-demo
-                              version 1.2 ( 2000/04/08 )
-                              �ʰ����ǽ���幩�� (nagai@ai.kyutech.ac.jp)
-
-ɸ�����ۤ� Tcl/Tk ��ĥ�ѥå������������� Ruby (�ʲ� Ruby/Tk �ȸƤӤޤ�)
-�Ǥϡ�Tk widget ���Ѥ��� GUI �κ�����Ԥ����Ȥ��Ǥ��ޤ����ºݤ� GUI �����
-���Ƥ������ˤ��͡��ʼ��㤬����ץ�Ȥ���¸�ߤ���������ʤΤǤ�����Ruby/Tk
-�ˤϤ��Τ褦��Ŭ���ʥ���ץ륹����ץȽ����¸�ߤ��ޤ���Ǥ�����������Ф���
-��ĥ�ѥå������θ��Ǥ��� Tcl/Tk �ˤϡ�Tk widget ���Ѥ��ƤɤΤ褦�ʤ��Ȥ���
-���뤫�򼨤���ΤȤ��� widget-demo ��¸�ߤ����ꡤTcl/Tk ���Ѥ��� GUI �κ���
-��������ݤ���ɽŪ����ץ�ȤʤäƤ��ޤ����ܥ��������֤ϡ�Ruby/Tk �ν�����
-�������ɽŪ�ʥ���ץ륹����ץȤȤ��٤���Tcl/Tk �� widget-demo ��ܿ�������
-�ΤǤ���
-
-����ΥС������� ruby-1.4.x ���б��Ȥ��Ƥ����ޤ�������С���������٤ơ�
-�ۤȤ���ѹ��Ϥ���ޤ���ruby-1.1c2 �ʾ�ʤ�ư���Ȼפ��ޤ���ruby-1.5.x �ˤ�
-���Ƥϥƥ��Ȥ��Ƥ��ޤ��󡥤��Τ��ᡤ��ߴ��αƶ����Ф뤳�Ȥ����뤫�⤷��ޤ�
-�󤬡����ξ��Ǥ⾯���ν�����ư������Ȼפ��ޤ����Ȥ߹��� Tk �ΥС������ϡ�
-4.2 �Ǥ� 8.0 �Ǥ⽤���ʤ�ư������Ϥ��Ǥ��������������ܸ��ǤǤΰܿ��Ȥʤä�
-���뤿�ᡤ���ܸ첽���줿 Tk �����Ѥ���������������ץȤΥƥ��Ȥϡ���С�����
-��κݤ� Tk4.2jp �� Tk8.0jp �ξ�ǹԤäƤ��ޤ� (�����ˤǤϤʤ��Ǥ���)������
-�ΥС������Ǥ� ruby-1.4.x + Tk8.0jp ��Ǥδ�ñ�ʥƥ��Ȥ����ԤäƤ��ޤ��󤬡�
-�����Ȥ����ۤɤν����Ϥ��Ƥ��ޤ���Τ�����Ϥʤ��ȹͤ��Ƥ��ޤ���
-
-�ܥ��������֤˴ޤޤ�륹����ץȤ�¿���ϡ����ȤʤäƤ��� Tcl/Tk �Ǥ����Ū��
-��������ץȵ��ҤȤʤ�褦�ˤ��Ƥ��ޤ������Τ��ᡤRuby/Tk �Υ���ץ�ȸ�����
-�ϡ����ޤ� Ruby �餷���ʤ��Ȥ������Ǥ��礦���ˤ⤫����餺�����Τ褦�ʵ���
-���äƤ�����ͳ�ϡ�Ruby/Tk �Υɥ���������ˤ���ޤ���
-
-Tcl/Tk �ˤ�Ŭ���ʻ��ͽ񤬲�����¸�ߤ��Ƥ��ޤ����顤Ruby/Tk ������ץȤ����
-����ݤϡ����Τ褦�� Tcl/Tk �λ��ͽ�Ǿ�����䤤�ʤ���������뤳�Ȥˤʤ�Ȼ�
-���ޤ����� widget �λ�����Ȥ��ơ�Tcl/Tk �� widget-demo �򻲾Ȥ��뤳�Ȥ⤢��
-�Ǥ��礦��Ruby/Tk �Ǥε��Ҥ� widget-demo �� Tcl/Tk �Ǥε��Ҥ˶ᤤ��Τˤ���
-�����С���������ˤ�äơ�Ruby/Tk ����������뤳�Ȥ��Ǥ���ȹͤ����ޤ���
-��ö Ruby/Tk �Ǥ� �� widget �λ�����ˡ�������Ƥ��ޤ��С�Ruby �餷��������
-�ץȤ�������뤳�Ȥ��񤷤��ʤ��Ǥ��礦���ܥ��������֤Υ�����ץȤϡ�Ruby/Tk
-��ǽ�˽�������ޤǤ�Ƨ��Ȥ������Ѥ��Ƥ���������й����Ǥ���
-
-widget-demo �ΰܿ��ˤ����äƤϡ��������ˤ�ܿ�����������ץȤ��󶡤��Ƥ�����
-���ޤ����������˴��դΰդ�ɽ���ޤ���
-
-    Ω�С�JAIST (ttate@jaist.ac.jp) ����
-    ʿ���ͻ� (hiramatu@cdrom.co.jp) ����
-
-ʿ������ˤ�� Ruby/Tk ����� Web page (http://www.cdrom.co.jp/~hiramatu/)
-�� Ruby/Tk �ν�����ͭ�ѤȻפ��ޤ��Τǡ����Ҥ����Ȥ���������
-
-�ޤ������� (maebashi@iij.ad.jp) �����Ϥ���Ȥ��ơ�widget-demo �ΰܿ��˺ݤ�
-��ɬ�פȤʤä� Ruby �� Tk ��Ϣ�饤�֥�꽤���ˤĤ��ơ����������Х��λ�Ŧ��
-�Ƥ��������������ˤⴶ���פ��ޤ���
-
-�����ƺǸ�˺���δ��դ� Ruby �߷׼Ԥ� �ޤĤ�� �椭�Ҥ� (matz@netlab.co.jp)
-��������������Ȼפ��ޤ���
diff --git a/ext/tk/sample/demos-jp/README.1st b/ext/tk/sample/demos-jp/README.1st
deleted file mode 100644
index 60b278d7b6..0000000000
--- a/ext/tk/sample/demos-jp/README.1st
+++ /dev/null
@@ -1,20 +0,0 @@
-���Υǥ��쥯�ȥ�ˤ� Ruby/Tk �Υǥ⥹����ץȤ�������Ƥ��ޤ���
-
-'.rb' �Ȥ�����ĥ�Ҥ���äƤ���ե�����ϡ������㨡������ץȤ�
-���� 'widget' ����ƤӽФ���륵�֥�����ץȤǤ������줾����Ω��
-��ư���ޤ���'widget' ������ץȤ���ƤӽФ��Ƥ���������
-
-�⤷�����㨡������ץ� 'widget' �ε�ư��Ʊ���ˤ����Ĥ��Υ��֥�
-����ץȤ�ư��������С����Υ��֥�����ץȤ�̾��������Ȥ���Ϳ
-���Ƥ���������
-( ��: /usr/local/bin/ruby widget button.rb entry1.rb text.rb )
-���֥�����ץȤγ�ĥ�� '.rb' �Ͼ�ά���뤳�Ȥ�Ǥ��ޤ���
-( ��: /usr/local/bin/ruby widget button entry1 text )
-
-�⤷�����㨡������ץȤΥ�����ɥ���ɬ�פʤ����ˤϡ�'-n' ��
-�ץ�����Ϳ���Ƥ���������
-( ��: /usr/local/bin/ruby widget -n button.rb entry1.rb text.rb )
-
-¾�Υե����� (browse1 �� hello �ʤ�) ��ñ�Ȥ�ư�������Ȥ���ǽ�Ǥ���
-
-          2004/04/14  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/sample/demos-jp/anilabel.rb b/ext/tk/sample/demos-jp/anilabel.rb
deleted file mode 100644
index d2f5b12041..0000000000
--- a/ext/tk/sample/demos-jp/anilabel.rb
+++ /dev/null
@@ -1,177 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# animated label widget demo (called by 'widget')
-#
-# based on Tcl/Tk8.5a2 widget demos
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($anilabel_demo) && $anilabel_demo
-  $anilabel_demo.destroy
-  $anilabel_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$anilabel_demo = TkToplevel.new {|w|
-  title("Animated Label Demonstration")
-  iconname("anilabel")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($anilabel_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���ˤ�4�ĤΥ��˥᡼������٥뤬ɽ������Ƥ��ޤ�����¦�ˤ����٥�ϡ������Υƥ����ȥ�å������򥹥������뤷���褦�˸����뤳�Ȥ�ư�����դ��Ƥ��ޤ�����¦�Υ�٥�ϡ�ɽ�����륤�᡼�����Ѳ������뤳�Ȥ�ư����Ϳ���Ƥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $anilabel_demo
-      $anilabel_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'anilabel'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# label demo �ѥե졼������
-f_left = TkLabelFrame.new(base_frame,  :text=>'Scrolling Texts')
-f_right = TkLabelFrame.new(base_frame, :text=>'GIF Image')
-Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both',
-        'padx'=>10, 'pady'=>10)
-
-# animated label
-class AnimatedTextLabel < TkLabel
-  def initialize(*args)
-    super(*args)
-    @timer = TkTimer.new{ _animation_callback }
-    @timer.loop_exec = -1
-    # bind('Destroy'){ @timer.stop }
-    @btag = TkBindTag.new('Destroy'){ @timer.stop }
-    self.bindtags_unshift(@btag)
-  end
-
-  def _animation_callback()
-    txt = self.text
-    self.text = (txt[1..-1] << txt[0])
-  end
-  private :_animation_callback
-
-  def start(interval)
-    @timer.set_interval(interval)
-    @timer.start
-  end
-
-  def stop
-    @timer.stop
-  end
-end
-
-# animated image
-class AnimatedImageLabel < AnimatedTextLabel
-  def initialize(*args)
-    super(*args)
-    @destroy_image = false
-    @btag.bind_append('Destroy'){
-      if @destroy_image
-        begin
-          self.image.delete
-        rescue
-        end
-      end
-    }
-  end
-  attr_accessor :destroy_image
-
-  def _animation_callback()
-    img = self.image
-
-    fmt = img.format
-    if fmt.kind_of?(Array)
-      if fmt[1].kind_of?(Hash)
-        # fmt == ['GIF', {'index'=>idx}]
-        idx = fmt[1]['index']
-      else
-        # fmt == ['GIF', '-index', idx]  :: Ruby1.8.2 returns this.
-        idx = fmt[2]
-      end
-    elsif fmt.kind_of?(String) && fmt =~ /GIF -index (\d+)/
-      idx = $1.to_i
-    else
-      idx = -1
-    end
-
-    begin
-      img.format("GIF -index #{idx + 1}")
-    rescue => e
-      img.format("GIF -index 0")
-    end
-  end
-  private :_animation_callback
-end
-
-# label ����
-l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge,
-                           :font=>{:family=>'Courier', :size=>10})
-l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove,
-                           :font=>{:family=>'Courier', :size=>10})
-l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat,
-                           :font=>{:family=>'Courier', :size=>10}, :width=>18)
-Tk.pack(l1, l2, l3,
-        :side=>:top, :expand=>true, :anchor=>:w, :padx=>10, :pady=>10)
-
-limg = AnimatedImageLabel.new(f_right, :borderwidth=>0)
-limg.pack(:side=>:top, :expand=>true, :padx=>10, :pady=>10)
-
-# base64-encoded animated GIF file
-tclPowerdData = <<EOD
-    R0lGODlhKgBAAPQAAP//////zP//AP/MzP/Mmf/MAP+Zmf+ZZv+ZAMz//8zM
-    zMyZmcyZZsxmZsxmAMwzAJnMzJmZzJmZmZlmmZlmZplmM5kzM2aZzGZmzGZm
-    mWZmZmYzZmYzMzNmzDMzZgAzmSH+IE1hZGUgd2l0aCBHSU1QIGJ5IExARGVt
-    YWlsbHkuY29tACH5BAVkAAEALAAAAAAqAEAAAAX+YCCOZEkyTKM2jOm66yPP
-    dF03bx7YcuHIDkGBR7SZeIyhTID4FZ+4Es8nQyCe2EeUNJ0peY2s9mi7PhAM
-    ngEAMGRbUpvzSxskLh1J+Hkg134OdDIDEB+GHxtYMEQMTjMGEYeGFoomezaC
-    DZGSHFmLXTQKkh8eNQVpZ2afmDQGHaOYSoEyhhcklzVmMpuHnaZmDqiGJbg0
-    qFqvh6UNAwB7VA+OwydEjgujkgrPNhbTI8dFvNgEYcHcHx0lB1kX2IYeA2G6
-    NN0YfkXJ2BsAMuAzHB9cZMk3qoEbRzUACsRCUBK5JxsC3iMiKd8GN088SIyT
-    0RAFSROyeEg38caDiB/+JEgqxsODrZJ1BkT0oHKSmI0ceQxo94HDpg0qsuDk
-    UmRAMgu8OgwQ+uIJgUMVeGXA+IQkzEeHGvD8cIGlDXsLiRjQ+EHroQhea7xY
-    8IQBSgYYDi1IS+OFBCgaDMGVS3fGi5BPJpBaENdQ0EomKGD56IHwO39EXiSC
-    Ysgxor5+Xfgq0qByYUpiXmwuoredB2aYH4gWWda0B7SeNENpEJHC1ghi+pS4
-    AJpIAwWvKPBi+8YEht5EriEqpFfMlhEdkBNpx0HUhwypx5T4IB1MBg/Ws2sn
-    wV3MSQOkzI8fUd48Aw3dOZto71x85hHtHijYv18Gf/3GqCdDCXHNoICBobSo
-    IqBqJLyCoH8JPrLgdh88CKCFD0CGmAiGYPgffwceZh6FC2ohIIklnkhehTNY
-    4CIHHGzgwYw01ujBBhvAqKOLLq5AAk9kuSPkkKO40NB+h1gnypJIIvkBf09a
-    N5QIRz5p5ZJXJpmlIVhOGQA2TmIJZZhKKmmll2BqyWSXWUrZpQtpatlmk1c2
-    KaWRHeTZEJF8SqLDn/hhsOeQgBbqAh6DGqronxeARUIIACH5BAUeAAAALAUA
-    LgAFAAUAAAUM4CeKz/OV5YmqaRkCACH5BAUeAAEALAUALgAKAAUAAAUUICCK
-    z/OdJVCaa7p+7aOWcDvTZwgAIfkEBR4AAQAsCwAuAAkABQAABRPgA4zP95zA
-    eZqoWqqpyqLkZ38hACH5BAUKAAEALAcALgANAA4AAAU7ICA+jwiUJEqeKau+
-    r+vGaTmac63v/GP9HM7GQyx+jsgkkoRUHJ3Qx0cK/VQVTKtWwbVKn9suNunc
-    WkMAIfkEBQoAAAAsBwA3AAcABQAABRGgIHzk842j+Yjlt5KuO8JmCAAh+QQF
-    CgAAACwLADcABwAFAAAFEeAnfN9TjqP5oOWziq05lmUIACH5BAUKAAAALA8A
-    NwAHAAUAAAUPoPCJTymS3yiQj4qOcPmEACH5BAUKAAAALBMANwAHAAUAAAUR
-    oCB+z/MJX2o+I2miKimiawgAIfkEBQoAAAAsFwA3AAcABQAABRGgIHzfY47j
-    Q4qk+aHl+pZmCAAh+QQFCgAAACwbADcABwAFAAAFEaAgfs/zCV9qPiNJouo7
-    ll8IACH5BAUKAAAALB8ANwADAAUAAAUIoCB8o0iWZggAOw==
-EOD
-
-l1.text('* Slow Animation *').start(300)
-l2.text('* Fast Animation *').start(80)
-l3.text('This is a longer scrolling text in a widget that will not show the whole message at once. ').start(150)
-
-limg.destroy_image = true
-limg.image(TkPhotoImage.new(:format=>'GIF', :data=>tclPowerdData)).start(100)
diff --git a/ext/tk/sample/demos-jp/aniwave.rb b/ext/tk/sample/demos-jp/aniwave.rb
deleted file mode 100644
index 973c1be1e9..0000000000
--- a/ext/tk/sample/demos-jp/aniwave.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# animated wave demo (called by 'widget')
-#
-# based on Tcl/Tk8.5a2 widget demos
-
-# destroy toplevel widget for this demo script
-if defined?($aniwave_demo) && $aniwave_demo
-  $aniwave_demo.destroy
-  $aniwave_demo = nil
-end
-
-# create toplevel widget
-$aniwave_demo = TkToplevel.new {|w|
-  title("Animated Wave Demonstration")
-  iconname("aniwave")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($aniwave_demo).pack(:fill=>:both, :expand=>true)
-
-# create label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text '���Υǥ�Ǥϡ��饤�󥢥��ƥब��Ĥ��������줿�����Х����������åȤ�ɽ������Ƥ��ޤ������˥᡼���������ϡ����Υ饤�󥢥��ƥ�κ�ɸ�ͤ��ѹ����뤳�ȤǼ¸����Ƥ��ޤ���'
-}
-msg.pack('side'=>'top')
-
-# create frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $aniwave_demo
-      $aniwave_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'aniwave'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# animated wave
-class AnimatedWaveDemo
-  def initialize(frame, dir=:left)
-    @direction = dir
-
-    # create canvas widget
-    @c = TkCanvas.new(frame, :width=>300, :height=>200,
-                      :background=>'black')
-    @c.pack(:padx=>10, :pady=>10, :expand=>true)
-
-    # Creates a coordinates list of a wave.
-    @waveCoords = []
-    @backupCoords = []
-    n = 0
-    (-10..300).step(5){|n| @waveCoords << [n, 100]; @backupCoords << [n, 100] }
-    n = 305
-    @waveCoords << [n, 0]; @backupCoords << [n, 0]
-    @waveCoords << [n+5, 200]; @backupCoords << [n+5, 200]
-    @coordsLen = @waveCoords.length
-
-    # Create a smoothed line and arrange for its coordinates to be the
-    # contents of the variable waveCoords.
-    @line = TkcLine.new(@c, @waveCoords,
-                        :width=>1, :fill=>'green', :smooth=>true)
-
-    # Main animation "loop".
-    # Theoretically 100 frames-per-second (==10ms between frames)
-    @timer = TkTimer.new(10){ basicMotion; reverser }
-
-    # Arrange for the animation loop to stop when the canvas is deleted
-    @c.bindtags_unshift(TkBindTag.new('Destroy'){ @timer.stop })
-  end
-
-  # Basic motion handler. Given what direction the wave is travelling
-  # in, it advances the y coordinates in the coordinate-list one step in
-  # that direction.
-  def basicMotion
-    @backupCoords, @waveCoords = @waveCoords, @backupCoords
-    (0...@coordsLen).each{|idx|
-      if @direction == :left
-        @waveCoords[idx][1] = @backupCoords[(idx+1 == @coordsLen)? 0: idx+1][1]
-      else
-        @waveCoords[idx][1] = @backupCoords[(idx == 0)? -1: idx-1][1]
-      end
-    }
-    @line.coords(@waveCoords)
-  end
-
-  # Oscillation handler. This detects whether to reverse the direction
-  # of the wave by checking to see if the peak of the wave has moved off
-  # the screen (whose size we know already.)
-  def reverser
-    if @waveCoords[0][1] < 10
-      @direction = :right
-    elsif @waveCoords[-1][1] < 10
-      @direction = :left
-    end
-  end
-
-  # animation control
-  def move
-    @timer.start
-  end
-
-  def stop
-    @timer.stop
-  end
-end
-
-# Start the animation processing
-AnimatedWaveDemo.new(base_frame, :left).move
diff --git a/ext/tk/sample/demos-jp/arrow.rb b/ext/tk/sample/demos-jp/arrow.rb
deleted file mode 100644
index a1694d019d..0000000000
--- a/ext/tk/sample/demos-jp/arrow.rb
+++ /dev/null
@@ -1,247 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# arrowhead widget demo (called by 'widget')
-#
-
-# arrowSetup --
-# This method regenerates all the text and graphics in the canvas
-# window.  It's called when the canvas is initially created, and also
-# whenever any of the parameters of the arrow head are changed
-# interactively.
-#
-# Arguments:
-# c -           Name of the canvas widget.
-
-def arrowSetup(c)
-  v = $demo_arrowInfo
-
-  # Remember the current box, if there is one.
-  tags = c.gettags('current')
-  if tags != []
-    cur = tags.find{|t| t.kind_of?(String) && t =~ /^box[1-3]$/ }
-  else
-    cur = nil
-  end
-
-  # Create the arrow and outline.
-  c.delete('all')
-  TkcLine.new(c, v.x1, v.y, v.x2, v.y,
-              { 'width'=>10 * v.width,
-                'arrowshape'=>[10*v.a, 10*v.b, 10*v.c],
-                'arrow'=>'last'
-              }.update(v.bigLineStyle) )
-  xtip = v.x2 - 10*v.b
-  deltaY = 10*v.c + 5*v.width
-  TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY,
-              v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y,
-              'width'=>2, 'capstyle'=>'round', 'joinstyle'=>'round')
-
-  # Create the boxes for reshaping the line and arrowhead.
-  TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5,
-                   {'tags'=>['box1', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5,
-                   {'tags'=>['box2', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5,
-                   {'tags'=>['box3', $arrowTag_box]}.update(v.boxStyle) )
-  c.itemconfigure cur, v.activeStyle if cur
-
-  # Create three arrows in actual size with the same parameters
-  TkcLine.new(c, v.x2+50, 0, v.x2+50, 1000, 'width'=>2)
-  tmp = v.x2+100
-  TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width,
-              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width,
-              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width,
-              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-
-  # Create a bunch of other arrows and text items showing the
-  # current dimensions.
-  tmp = v.x2+10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2+15, v.y-deltaY+5*v.c, 'text'=>v.c, 'anchor'=>'w')
-  tmp = v.x1-10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x1-15, v.y, 'text'=>v.width, 'anchor'=>'e')
-  tmp = v.y+5*v.width+10*v.c+10
-  TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2-5*v.a, tmp+5, 'text'=>v.a, 'anchor'=>'n')
-  tmp = tmp+25
-  TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
-
-  if $tk_version =~ /^4.*/
-    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-    TkcText.new(c, v.x1, 330,
-                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",'anchor'=>'w',
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-  else
-    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
-                'font'=>'Helvetica 18')
-    TkcText.new(c, v.x1, 330,
-                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",
-                'anchor'=>'w', 'font'=>'Helvetica 18')
-  end
-
-  v.count += 1
-end
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($arrow_demo) && $arrow_demo
-  $arrow_demo.destroy
-  $arrow_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$arrow_demo = TkToplevel.new {|w|
-  title("Arrowhead Editor Demonstration")
-  iconname("arrow")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($arrow_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
-            'text'=>"���� widget �ǡ������Х��ǻȤ���饤��ˤĤ����͡������������Ƭ�η����Ƥߤ뤳�Ȥ��Ǥ��ޤ���������������η����Ѥ���ˤϡ����礵�줿����ˤĤ��Ƥ��� 3�ĤλͳѤ�ɥ�å����Ƥ�����������¦����������̤��礭���ǤΥ���ץ�򼨤��Ƥ��ޤ������Υƥ����Ȥϥ饤�󥢥��ƥ���Ф������ꥪ�ץ����Ǥ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$arrow_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $arrow_demo
-      $arrow_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'arrow'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas ����
-$arrow_canvas = TkCanvas.new(base_frame, 'width'=>500, 'height'=>350,
-                             'relief'=>'sunken', 'borderwidth'=>2)
-$arrow_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-# ������
-unless Struct.const_defined?("ArrowInfo")
-  $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc,
-                               :x1, :x2, :y, :smallTips, :count,
-                               :bigLineStyle, :boxStyle, :activeStyle).new
-end
-$demo_arrowInfo.a = 8
-$demo_arrowInfo.b = 10
-$demo_arrowInfo.c = 3
-$demo_arrowInfo.width = 2
-$demo_arrowInfo.motionProc = proc{}
-$demo_arrowInfo.x1 = 40
-$demo_arrowInfo.x2 = 350
-$demo_arrowInfo.y = 150
-$demo_arrowInfo.smallTips = [5, 5, 2]
-$demo_arrowInfo.count = 0
-if TkWinfo.depth($arrow_canvas) > 1
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'SkyBlue1'}
-  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
-  $demo_arrowInfo.activeStyle = {'fill'=>'red', 'outline'=>'black', 'width'=>1}
-else
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'black',
-    'stipple'=>'@'+[$demo_dir,'..','images','grey.25'].join(File::Separator)}
-  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
-  $demo_arrowInfo.activeStyle = {'fill'=>'black','outline'=>'black','width'=>1}
-end
-$arrowTag_box = TkcTag.new($arrow_canvas)
-arrowSetup $arrow_canvas
-$arrowTag_box.bind('Enter', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.activeStyle)})
-$arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.boxStyle)})
-$arrowTag_box.bind('B1-Enter', proc{})
-$arrowTag_box.bind('B1-Leave', proc{})
-$arrow_canvas.itembind('box1', '1',
-                       proc{$demo_arrowInfo.motionProc \
-                         = proc{|x,y| arrowMove1 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box2', '1',
-                       proc{$demo_arrowInfo.motionProc \
-                         = proc{|x,y| arrowMove2 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box3', '1',
-                       proc{$demo_arrowInfo.motionProc \
-                         = proc{|x,y| arrowMove3 $arrow_canvas, x, y}})
-$arrowTag_box.bind('B1-Motion',
-                  proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
-$arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
-
-# arrowMove1 --
-# This method is called for each mouse motion event on box1 (the
-# one at the vertex of the arrow).  It updates the controlling parameters
-# for the line and arrowhead.
-#
-# Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
-
-def arrowMove1(c,x,y)
-  v = $demo_arrowInfo
-  newA = (v.x2+5-c.canvasx(x).round)/10
-  newA = 0 if newA < 0
-  newA = 25 if newA > 25
-  if newA != v.a
-    c.move('box1', 10*(v.a-newA), 0)
-    v.a = newA
-  end
-end
-
-# arrowMove2 --
-# This method is called for each mouse motion event on box2 (the
-# one at the trailing tip of the arrowhead).  It updates the controlling
-# parameters for the line and arrowhead.
-#
-# Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
-
-def arrowMove2(c,x,y)
-  v = $demo_arrowInfo
-  newB = (v.x2+5-c.canvasx(x).round)/10
-  newB = 0 if newB < 0
-  newB = 25 if newB > 25
-  newC = (v.y+5-c.canvasy(y).round-5*v.width)/10
-  newC = 0 if newC < 0
-  newC = 20 if newC > 20
-  if newB != v.b || newC != v.c
-    c.move('box2', 10*(v.b-newB), 10*(v.c-newC))
-    v.b = newB
-    v.c = newC
-  end
-end
-
-# arrowMove3 --
-# This method is called for each mouse motion event on box3 (the
-# one that controls the thickness of the line).  It updates the
-# controlling parameters for the line and arrowhead.
-#
-# Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
-
-def arrowMove3(c,x,y)
-  v = $demo_arrowInfo
-  newWidth = (v.y+2-c.canvasy(y).round)/5
-  newWidth = 0 if newWidth < 0
-  newWidth = 20 if newWidth > 20
-  if newWidth != v.width
-    c.move('box3', 0, 5*(v.width-newWidth))
-    v.width = newWidth
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/bind.rb b/ext/tk/sample/demos-jp/bind.rb
deleted file mode 100644
index 99e5c1718c..0000000000
--- a/ext/tk/sample/demos-jp/bind.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# text (tag bindings) widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($bind_demo) && $bind_demo
-  $bind_demo.destroy
-  $bind_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$bind_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Tag Bindings")
-  iconname("bind")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($bind_demo).pack(:fill=>:both, :expand=>true)
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $bind_demo
-      $bind_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'bind'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# bind �ѥ᥽�å�
-def tag_binding_for_bind_demo(tag, enter_style, leave_style)
-  tag.bind('Any-Enter', proc{tag.configure enter_style})
-  tag.bind('Any-Leave', proc{tag.configure leave_style})
-end
-
-# text ����
-txt = TkText.new(base_frame){|t|
-  # ����
-  setgrid 'true'
-  #width  60
-  #height 24
-  font $font
-  wrap 'word'
-  TkScrollbar.new(base_frame) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  # ������������
-  if TkWinfo.depth($root).to_i > 1
-    tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised',
-                     'borderwidth'=>1}
-    tagstyle_normal = {'background'=>'', 'relief'=>'flat'}
-  else
-    tagstyle_bold = {'foreground'=>'white', 'background'=>'black'}
-    tagstyle_normal = {'foreground'=>'', 'background'=>''}
-  end
-
-  # �ƥ���������
-  insert 'insert', "�ƥ�����widget��ɽ��������������椹��Τ�Ʊ�������Υᥫ�˥����Ȥäơ��ƥ����Ȥ�Tcl�Υ��ޥ�ɤ������Ƥ뤳�Ȥ��Ǥ��ޤ�������ˤ�ꡢ�ޥ����䥭���ܡ��ɤΥ��������������Tcl�Υ��ޥ�ɤ��¹Ԥ����褦�ˤʤ�ޤ����㤨�С����Υ����Х��Υǥ�ץ������ˤĤ��Ƥ�����ʸ�ˤϤ��Τ褦�ʥ������Ĥ��Ƥ��ޤ����ޥ���������ʸ�ξ�˻��äƤ���������ʸ�����ꡢ�ܥ���1�򲡤��Ȥ��������Υǥ⤬�Ϥޤ�ޤ���
-
-"
-  insert('end', '1. �����Х� widget �˺�뤳�ȤΤǤ��륢���ƥ�μ������Ƥ˴ؤ��륵��ץ롣', (d1 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '2. ��ñ�� 2�����Υץ��åȡ��ǡ�����ɽ������ư�������Ȥ��Ǥ��롣', (d2 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '3. �ƥ����ȥ����ƥ�Υ��󥫡��ȹ�·����',
-         (d3 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '4. �饤�󥢥��ƥ�Τ���������Ƭ�η��Υ��ǥ�����',
-         (d4 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '5. ���֥��ȥåפ��ѹ����뤿��ε�ǽ�Ĥ��Υ롼�顼��',
-         (d5 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end',
-         '6. �����Х����ɤ���äƥ��������뤹��Τ��򼨤�����åɡ�',
-         (d6 = TkTextTag.new(t)) )
-
-  # binding
-  [d1, d2, d3, d4, d5, d6].each{|tag|
-    tag_binding_for_bind_demo(tag, tagstyle_bold, tagstyle_normal)
-  }
-  d1.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 'items.rb')
-          })
-  d2.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 'plot.rb')
-          })
-  d3.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 'ctext.rb')
-          })
-  d4.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 'arrow.rb')
-          })
-  d5.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 'ruler.rb')
-          })
-  d6.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 'cscroll.rb')
-          })
-
-  TkTextMarkInsert.new(t, '0.0')
-  configure('state','disabled')
-}
-
-txt.width  60
-txt.height 24
diff --git a/ext/tk/sample/demos-jp/bitmap.rb b/ext/tk/sample/demos-jp/bitmap.rb
deleted file mode 100644
index 1193e8de24..0000000000
--- a/ext/tk/sample/demos-jp/bitmap.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# bitmap widget demo (called by 'widget')
-#
-
-# bitmapRow --
-# Create a row of bitmap items in a window.
-#
-# Arguments:
-# w -           The parent window that is to contain the row.
-# args -        The names of one or more bitmaps, which will be displayed
-#               in a new row across the bottom of w along with their
-#               names.
-
-def bitmapRow(w,*args)
-  TkFrame.new(w){|row|
-    pack('side'=>'top', 'fill'=>'both')
-    for bitmap in args
-      TkFrame.new(row){|base|
-        pack('side'=>'left', 'fill'=>'both', 'pady'=>'.25c', 'padx'=>'.25c')
-        TkLabel.new(base, 'text'=>bitmap, 'width'=>9).pack('side'=>'bottom')
-        Tk::Label.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
-      }
-    end
-  }
-end
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($bitmap_demo) && $bitmap_demo
-  $bitmap_demo.destroy
-  $bitmap_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$bitmap_demo = TkToplevel.new {|w|
-  title("Bitmap Demonstration")
-  iconname("bitmap")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($bitmap_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"���Υ�����ɥ��ˤϡ�Tk ���Ȥ߹��ޤ줿���٤ƤΥӥåȥޥåפ���������̾���ȶ���ɽ������Ƥ��ޤ���Tcl �Υ�����ץ���Ǥϡ����줾���̾�����Ѥ��ƻ��Ȥ��ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$bitmap_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $bitmap_demo
-      $bitmap_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'bitmap'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-TkFrame.new(base_frame){|f|
-  bitmapRow(f,'error','gray25','gray50','hourglass')
-  bitmapRow(f,'info','question','questhead','warning')
-  pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-}
-
diff --git a/ext/tk/sample/demos-jp/browse1 b/ext/tk/sample/demos-jp/browse1
deleted file mode 100644
index 568892e4a8..0000000000
--- a/ext/tk/sample/demos-jp/browse1
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env ruby
-
-# browse --
-# This script generates a directory browser, which lists the working
-# directory and allow you to open files or subdirectories by
-# double-clicking.
-
-require 'tk'
-
-# Create a scrollbar on the right side of the main window and a listbox
-# on the left side.
-
-listbox = TkListbox.new(nil, 'relief'=>'sunken',
-			'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
-  TkScrollbar.new(nil, 'command'=>proc{|*args| l.yview *args}) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    l.yscrollcommand(proc{|first,last| s.set(first,last)})
-  }
-
-  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-}
-
-root = TkRoot.new
-root.minsize(1,1)
-
-# The procedure below is invoked to open a browser on a given file;  if the
-# file is a directory then another instance of this program is invoked; if
-# the file is a regular file then the Mx editor is invoked to display
-# the file.
-
-def browse (dir, file)
-  file = dir + File::Separator + file if dir != '.'
-  type = File.ftype(file)
-  if type == 'directory'
-    system($0 + ' ' + file + ' &')
-  else
-    if type == 'file'
-      if ENV['EDITOR']
-	system(ENV['EDITOR'] + ' ' + file + ' &')
-      else
-	system('xedit ' + file + ' &')
-      end
-    else
-      STDOUT.print "\"#{file}\" isn't a directory or regular file"
-    end
-  end
-end
-
-# Fill the listbox with a list of all the files in the directory (run
-# the "ls" command to get that information).
-
-dir = ARGV[0] ?  ARGV[0] : '.'
-open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
-  listbox.insert('end', fname.chomp)
-}
-
-# Set up bindings for the browser.
-
-Tk.bind_all('Control-c', proc{root.destroy})
-listbox.bind('Double-Button-1',
-	     proc{TkSelection.get.each{|f| browse dir, f}})
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/browse2 b/ext/tk/sample/demos-jp/browse2
deleted file mode 100644
index 1a511c8d29..0000000000
--- a/ext/tk/sample/demos-jp/browse2
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-
-# browse --
-# This script generates a directory browser, which lists the working
-# directory and allow you to open files or subdirectories by
-# double-clicking.
-
-require 'tk'
-
-class Browse
-  BROWSE_WIN_COUNTER = TkVariable.new(0)
-
-  def initialize(dir)
-    BROWSE_WIN_COUNTER.value = BROWSE_WIN_COUNTER.to_i + 1
-
-    # create base frame
-    base = TkToplevel.new {
-      minsize(1,1)
-      title('Browse : ' + dir)
-    }
-
-    # Create a scrollbar on the right side of the main window and a listbox
-    # on the left side.
-    list = TkListbox.new(base, 'relief'=>'sunken',
-			 'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
-      TkScrollbar.new(base, 'command'=>proc{|*args| l.yview *args}) {|s|
-	pack('side'=>'right', 'fill'=>'y')
-	l.yscrollcommand(proc{|first,last| s.set(first,last)})
-      }
-
-      pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-
-      # Fill the listbox with a list of all the files in the directory (run
-      # the "ls" command to get that information).
-      open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
-	l.insert('end', fname.chomp)
-      }
-
-    }
-
-    # Set up bindings for the browser.
-    base.bind('Destroy', proc{
-		Browse::BROWSE_WIN_COUNTER.value = \
-		                Browse::BROWSE_WIN_COUNTER.to_i - 1
-	      })
-    base.bind('Control-c', proc{base.destroy})
-    list.bind('Double-Button-1',
-	 proc{TkSelection.get.each{|f| self.browse dir, f}})
-  end
-
-  # The method below is invoked to open a browser on a given file;  if the
-  # file is a directory then another instance of this program is invoked; if
-  # the file is a regular file then the Mx editor is invoked to display
-  # the file.
-  def browse (dir, file)
-    file = dir + File::Separator + file if dir != '.'
-    type = File.ftype(file)
-    if type == 'directory'
-      Browse.new(file)
-    else
-      if type == 'file'
-	if ENV['EDITOR']
-	  system(ENV['EDITOR'] + ' ' + file + ' &')
-	else
-	  system('xedit ' + file + ' &')
-	end
-      else
-	STDOUT.print "\"#{file}\" isn't a directory or regular file"
-      end
-    end
-  end
-
-end
-
-Browse.new(ARGV[0] ? ARGV[0] : '.')
-
-TkRoot.new {
-  withdraw
-  Browse::BROWSE_WIN_COUNTER.trace('w', proc{exit if Browse::BROWSE_WIN_COUNTER.to_i == 0})
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/button.rb b/ext/tk/sample/demos-jp/button.rb
deleted file mode 100644
index 87ced45810..0000000000
--- a/ext/tk/sample/demos-jp/button.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# button widget demo (called by 'widget')
-#
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($button_demo) && $button_demo
-  $button_demo.destroy
-  $button_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$button_demo = TkToplevel.new {|w|
-  title("Button Demonstration")
-  iconname("button")
-  positionWindow(w)
-}
-
-# label ����
-msg = TkLabel.new($button_demo) {
-  font $kanji_font
-  wraplength '4i'
-  justify 'left'
-  text "�ܥ���򥯥�å�����ȡ��ܥ�����طʿ������Υܥ���˽񤫤�Ƥ��뿧�ˤʤ�ޤ����ܥ��󤫤�ܥ���ؤΰ�ư�ϥ��֤򲡤����ȤǤ��ǽ�Ǥ����ޤ����ڡ����Ǽ¹Ԥ��뤳�Ȥ��Ǥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-$button_buttons = Tk::Frame.new($button_demo) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $button_demo
-      $button_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'button'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# button ����
-TkButton.new($button_demo){
-  text "Peach Puff"
-  width 10
-  command proc{
-    $button_demo.configure('bg','PeachPuff1')
-    $button_buttons.configure('bg','PeachPuff1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Light Blue"
-  width 10
-  command proc{
-    $button_demo.configure('bg','LightBlue1')
-    $button_buttons.configure('bg','LightBlue1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Sea Green"
-  width 10
-  command proc{
-    $button_demo.configure('bg','SeaGreen2')
-    $button_buttons.configure('bg','SeaGreen2')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Yellow"
-  width 10
-  command proc{
-    $button_demo.configure('bg','Yellow1')
-    $button_buttons.configure('bg','Yellow1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
diff --git a/ext/tk/sample/demos-jp/check.rb b/ext/tk/sample/demos-jp/check.rb
deleted file mode 100644
index 762b99778b..0000000000
--- a/ext/tk/sample/demos-jp/check.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# checkbutton widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($check_demo) && $check_demo
-  $check_demo.destroy
-  $check_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$check_demo = TkToplevel.new {|w|
-  title("Checkbutton Demonstration")
-  iconname("check")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($check_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���ˤ� 3 �ĤΥ����å��ܥ���ɽ������Ƥ��ޤ�������å�����ȥܥ����������֤��Ѥ�ꡢTcl �ѿ� ( TkVariable ���֥������Ȥǥ��������Ǥ��ޤ� ) �ˤ��Υܥ���ξ��֤򼨤��ͤ����ꤷ�ޤ������ߤ��ѿ����ͤ򸫤�ˤϡ��ѿ����ȡץܥ���򥯥�å����Ƥ���������"
-}
-msg.pack('side'=>'top')
-
-# �ѿ�����
-wipers = TkVariable.new(0)
-brakes = TkVariable.new(0)
-sober  = TkVariable.new(0)
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $check_demo
-      $check_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'check'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-
-  TkButton.new(frame) {
-    text '�ѿ�����'
-    command proc{
-      showVars(base_frame,
-               ['wipers', wipers], ['brakes', brakes], ['sober', sober])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# checkbutton ����
-[ TkCheckButton.new(base_frame, 'text'=>'�磻�ѡ� OK', 'variable'=>wipers),
-  TkCheckButton.new(base_frame, 'text'=>'�֥졼�� OK', 'variable'=>brakes),
-  TkCheckButton.new(base_frame, 'text'=>'��ž�� ����', 'variable'=>sober)
-].each{|w| w.relief('flat'); w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')}
-
diff --git a/ext/tk/sample/demos-jp/check2.rb b/ext/tk/sample/demos-jp/check2.rb
deleted file mode 100644
index 9f845183f3..0000000000
--- a/ext/tk/sample/demos-jp/check2.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# checkbutton widget demo2 (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($check2_demo) && $check2_demo
-  $check2_demo.destroy
-  $check2_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$check2_demo = TkToplevel.new {|w|
-  title("Checkbutton Demonstration 2")
-  iconname("check2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($check2_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���ˤϣ��ĤΥ����å��ܥ���ɽ������Ƥ��ޤ�������å�����ȥܥ����������֤��Ѥ�ꡢTcl�ѿ���TkVariable���֥������Ȥǥ��������Ǥ��ޤ��ˤˤ��Υܥ���ξ��֤򼨤��ͤ����ꤷ�ޤ����ǽ�Υܥ���ξ��֤�¾�Σ��ĤΥܥ���ξ��֤ˤ��¸�����Ѳ����ޤ����⤷���ĤΥܥ���ΰ��������˥����å����դ����Ƥ����硢�ǽ�Υܥ���ϥȥ饤���ơ��ȡʣ����֡˥⡼�ɤǤ�ɽ����Ԥ��ޤ������ߤ��ѿ����ͤ򸫤�ˤϡ��ѿ����ȡץܥ���򥯥�å����Ƥ���������"
-}
-msg.pack('side'=>'top')
-
-# �ѿ�����
-safety = TkVariable.new(0)
-wipers = TkVariable.new(0)
-brakes = TkVariable.new(0)
-sober  = TkVariable.new(0)
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
-         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         TkButton.new(frame, :text=>'�ѿ�����',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{
-                        showVars($check2_demo,
-                                 ['safety', safety], ['wipers', wipers],
-                                 ['brakes', brakes], ['sober', sober])
-                      }),
-         TkButton.new(frame, :text=>'�����ɻ���',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{showCode 'check2'}),
-         TkButton.new(frame, :text=>'�Ĥ���',
-                      :image=>$image['delete'], :compound=>:left,
-                      :command=>proc{
-                        tmppath = $check2_demo
-                        $check2_demo = nil
-                        $showVarsWin[tmppath.path] = nil
-                        tmppath.destroy
-                      }),
-         :padx=>4, :pady=>4)
-  frame.grid_columnconfigure(0, :weight=>1)
-}.pack('side'=>'bottom', 'fill'=>'x')
-
-
-# checkbutton ����
-TkCheckButton.new(base_frame, :text=>'����������', :variable=>safety,
-                  :relief=>:flat, :onvalue=>'all', :offvalue=>'none',
-                  :tristatevalue=>'partial'){
-  pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
-[ TkCheckButton.new(base_frame, 'text'=>'�磻�ѡ� OK', 'variable'=>wipers),
-  TkCheckButton.new(base_frame, 'text'=>'�֥졼�� OK', 'variable'=>brakes),
-  TkCheckButton.new(base_frame, 'text'=>'��ž�� ����', 'variable'=>sober)
-].each{|w|
-  w.relief('flat')
-  w.pack('side'=>'top', 'padx'=>15, 'pady'=>2, 'anchor'=>'w')
-}
-
-# tristate check
-in_check = false
-tristate_check = proc{|n1,n2,op|
-  unless in_check
-    in_check = true
-    begin
-      if n1 == safety
-        if safety == 'none'
-          wipers.value = 0
-          brakes.value = 0
-          sober.value  = 0
-        elsif safety == 'all'
-          wipers.value = 1
-          brakes.value = 1
-          sober.value  = 1
-        end
-      else
-        if wipers == 1 && brakes == 1 && sober == 1
-          safety.value = 'all'
-        elsif wipers == 1 || brakes == 1 || sober == 1
-          safety.value = 'partial'
-        else
-          safety.value = 'none'
-        end
-      end
-    ensure
-      in_check = false
-    end
-  end
-}
-
-[wipers, brakes, sober, safety].each{|v| v.trace('w', tristate_check)}
diff --git a/ext/tk/sample/demos-jp/clrpick.rb b/ext/tk/sample/demos-jp/clrpick.rb
deleted file mode 100644
index c188723c5a..0000000000
--- a/ext/tk/sample/demos-jp/clrpick.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# widget demo prompts the user to select a color (called by 'widget')
-#
-#  Note: don't support ttk_wrapper. work with standard widgets only.
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($clrpick_demo) && $clrpick_demo
-  $clrpick_demo.destroy
-  $clrpick_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$clrpick_demo = TkToplevel.new {|w|
-  title("Color Selection Dialogs")
-  iconname("colors")
-  positionWindow(w)
-}
-
-# label ����
-#TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-Tk::Label.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"�ʲ��Υܥ���򲡤��ơ����Υ�����ɥ���ˤ��륦�������åȤ����ʿ����طʿ������򤷤Ʋ�������").pack('side'=>'top')
-
-# frame ����
-# TkFrame.new($clrpick_demo) {|frame|
-Tk::Frame.new($clrpick_demo) {|frame|
-  # TkButton.new(frame) {
-  Tk::Button.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $clrpick_demo
-      $clrpick_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  # TkButton.new(frame) {
-  Tk::Button.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'clrpick'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# button ����
-# TkButton.new($clrpick_demo, 'text'=>'�طʿ������� ...') {|b|
-Tk::Button.new($clrpick_demo, 'text'=>'�طʿ������� ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'background',
-              ['background', 'highlightbackground']})
-  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
-}
-
-# TkButton.new($clrpick_demo, 'text'=>'���ʿ������� ...') {|b|
-Tk::Button.new($clrpick_demo, 'text'=>'���ʿ������� ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
-  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
-}
-
-def setColor(w,button,name,options)
-  w.grab
-  initialColor = button[name]
-  color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w,
-                         'initialcolor'=>initialColor)
-  if color != ""
-    setColor_helper(w,options,color)
-  end
-
-  w.grab('release')
-end
-
-def setColor_helper(w, options, color)
-  options.each{|opt|
-    begin
-      w[opt] = color
-    rescue
-    end
-  }
-  TkWinfo.children(w).each{|child|
-    setColor_helper child, options, color
-  }
-end
-
diff --git a/ext/tk/sample/demos-jp/colors.rb b/ext/tk/sample/demos-jp/colors.rb
deleted file mode 100644
index 9fcf0333b5..0000000000
--- a/ext/tk/sample/demos-jp/colors.rb
+++ /dev/null
@@ -1,155 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# listbox widget demo 'colors' (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($colors_demo) && $colors_demo
-  $colors_demo.destroy
-  $colors_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$colors_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (colors)")
-  iconname("colors")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($colors_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���ˤϿ���̾�������ä�����������С��դΥꥹ�ȥܥå�����ɽ������Ƥ��ޤ����ꥹ�Ȥ򥹥������뤵����Τϥ���������С��Ǥ�Ǥ��ޤ������ꥹ�ȥܥå�������ǥޥ����Υܥ���2(��ܥ���)�򲡤����ޤޥɥ�å����Ƥ�Ǥ��ޤ������뿧��ܥ���1(���ܥ���)�ǥ��֥륯��å�����ȥ��ץꥱ����������Τ����ο��ˤʤ�ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $colors_demo
-      $colors_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'colors'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-colors_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
-  s = TkScrollbar.new(w)
-  colors_lbox = TkListbox.new(w) {
-    setgrid 1
-    width  10
-    height 12
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| colors_lbox.yview(*args)})
-  s.pack('side'=>'right', 'fill'=>'y')
-  colors_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-#colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
-colors_lbox.bind('Double-1', proc{
-                   begin
-                     TkPalette.setPalette TkSelection.get
-                   rescue => e
-                     p e
-                     Tk.tk_call_without_enc('destroy', '.___tk_set_palette')
-                   end
-                   })
-
-ins_data = [
-  'gray60','gray70','gray80','gray85','gray90','gray95',
-  'snow1','snow2','snow3','snow4','seashell1','seashell2',
-  'seashell3','seashell4','AntiqueWhite1','AntiqueWhite2',
-  'AntiqueWhite3','AntiqueWhite4','bisque1','bisque2',
-  'bisque3','bisque4','PeachPuff1','PeachPuff2',
-  'PeachPuff3','PeachPuff4','NavajoWhite1','NavajoWhite2',
-  'NavajoWhite3','NavajoWhite4','LemonChiffon1',
-  'LemonChiffon2','LemonChiffon3','LemonChiffon4',
-  'cornsilk1','cornsilk2','cornsilk3','cornsilk4',
-  'ivory1','ivory2','ivory3','ivory4','honeydew1',
-  'honeydew2','honeydew3','honeydew4','LavenderBlush1',
-  'LavenderBlush2','LavenderBlush3','LavenderBlush4',
-  'MistyRose1','MistyRose2','MistyRose3','MistyRose4',
-  'azure1','azure2','azure3','azure4','SlateBlue1',
-  'SlateBlue2','SlateBlue3','SlateBlue4','RoyalBlue1',
-  'RoyalBlue2','RoyalBlue3','RoyalBlue4','blue1','blue2',
-  'blue3','blue4','DodgerBlue1','DodgerBlue2',
-  'DodgerBlue3','DodgerBlue4','SteelBlue1','SteelBlue2',
-  'SteelBlue3','SteelBlue4','DeepSkyBlue1','DeepSkyBlue2',
-  'DeepSkyBlue3','DeepSkyBlue4','SkyBlue1','SkyBlue2',
-  'SkyBlue3','SkyBlue4','LightSkyBlue1','LightSkyBlue2',
-  'LightSkyBlue3','LightSkyBlue4','SlateGray1',
-  'SlateGray2','SlateGray3','SlateGray4',
-  'LightSteelBlue1','LightSteelBlue2','LightSteelBlue3',
-  'LightSteelBlue4','LightBlue1','LightBlue2',
-  'LightBlue3','LightBlue4','LightCyan1','LightCyan2',
-  'LightCyan3','LightCyan4','PaleTurquoise1',
-  'PaleTurquoise2','PaleTurquoise3','PaleTurquoise4',
-  'CadetBlue1','CadetBlue2','CadetBlue3','CadetBlue4',
-  'turquoise1','turquoise2','turquoise3','turquoise4',
-  'cyan1','cyan2','cyan3','cyan4','DarkSlateGray1',
-  'DarkSlateGray2','DarkSlateGray3','DarkSlateGray4',
-  'aquamarine1','aquamarine2','aquamarine3','aquamarine4',
-  'DarkSeaGreen1','DarkSeaGreen2','DarkSeaGreen3',
-  'DarkSeaGreen4','SeaGreen1','SeaGreen2','SeaGreen3',
-  'SeaGreen4','PaleGreen1','PaleGreen2','PaleGreen3',
-  'PaleGreen4','SpringGreen1','SpringGreen2',
-  'SpringGreen3','SpringGreen4','green1','green2',
-  'green3','green4','chartreuse1','chartreuse2',
-  'chartreuse3','chartreuse4','OliveDrab1','OliveDrab2',
-  'OliveDrab3','OliveDrab4','DarkOliveGreen1',
-  'DarkOliveGreen2','DarkOliveGreen3','DarkOliveGreen4',
-  'khaki1','khaki2','khaki3','khaki4','LightGoldenrod1',
-  'LightGoldenrod2','LightGoldenrod3','LightGoldenrod4',
-  'LightYellow1','LightYellow2','LightYellow3',
-  'LightYellow4','yellow1','yellow2','yellow3','yellow4',
-  'gold1','gold2','gold3','gold4','goldenrod1',
-  'goldenrod2','goldenrod3','goldenrod4','DarkGoldenrod1',
-  'DarkGoldenrod2','DarkGoldenrod3','DarkGoldenrod4',
-  'RosyBrown1','RosyBrown2','RosyBrown3','RosyBrown4',
-  'IndianRed1','IndianRed2','IndianRed3','IndianRed4',
-  'sienna1','sienna2','sienna3','sienna4','burlywood1',
-  'burlywood2','burlywood3','burlywood4','wheat1',
-  'wheat2','wheat3','wheat4','tan1','tan2','tan3','tan4',
-  'chocolate1','chocolate2','chocolate3','chocolate4',
-  'firebrick1','firebrick2','firebrick3','firebrick4',
-  'brown1','brown2','brown3','brown4','salmon1','salmon2',
-  'salmon3','salmon4','LightSalmon1','LightSalmon2',
-  'LightSalmon3','LightSalmon4','orange1','orange2',
-  'orange3','orange4','DarkOrange1','DarkOrange2',
-  'DarkOrange3','DarkOrange4','coral1','coral2','coral3',
-  'coral4','tomato1','tomato2','tomato3','tomato4',
-  'OrangeRed1','OrangeRed2','OrangeRed3','OrangeRed4',
-  'red1','red2','red3','red4','DeepPink1','DeepPink2',
-  'DeepPink3','DeepPink4','HotPink1','HotPink2',
-  'HotPink3','HotPink4','pink1','pink2','pink3','pink4',
-  'LightPink1','LightPink2','LightPink3','LightPink4',
-  'PaleVioletRed1','PaleVioletRed2','PaleVioletRed3',
-  'PaleVioletRed4','maroon1','maroon2','maroon3',
-  'maroon4','VioletRed1','VioletRed2','VioletRed3',
-  'VioletRed4','magenta1','magenta2','magenta3',
-  'magenta4','orchid1','orchid2','orchid3','orchid4',
-  'plum1','plum2','plum3','plum4','MediumOrchid1',
-  'MediumOrchid2','MediumOrchid3','MediumOrchid4',
-  'DarkOrchid1','DarkOrchid2','DarkOrchid3',
-  'DarkOrchid4','purple1','purple2','purple3','purple4',
-  'MediumPurple1','MediumPurple2','MediumPurple3',
-  'MediumPurple4','thistle1','thistle2','thistle3', 'thistle4'
-]
-
-colors_lbox.insert(0, *ins_data)
diff --git a/ext/tk/sample/demos-jp/combo.rb b/ext/tk/sample/demos-jp/combo.rb
deleted file mode 100644
index 2059662d48..0000000000
--- a/ext/tk/sample/demos-jp/combo.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# combo.rb --
-#
-# This demonstration script creates several combobox widgets.
-#
-# based on "Id: combo.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($combo_demo) && $combo_demo
-  $combo_demo.destroy
-  $combo_demo = nil
-end
-
-$combo_demo = TkToplevel.new {|w|
-  title("Combobox Demonstration")
-  iconname("combo")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($combo_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-�ʲ��Ǥ�3����Υ���ܥܥå�����ɽ������Ƥ��ޤ���\
-�ǽ�Τ�Τϡ�����ȥꥦ�������åȤ�Ʊ���ͤˡ�\
-�ݥ���Ȥ����ꡤ����å������ꡤ�����פ����ꤹ�뤳�Ȥ��Ǥ��ޤ���\
-�ޤ���Return���������Ϥ���и��ߤ��ͤ��ꥹ�Ȥ��ɲä��졤\
-�ɥ��åץ�����ꥹ�Ȥ������򤹤뤳�Ȥ��Ǥ���褦�ˤʤ�ޤ���\
-��(���������)�����򲡤���ɽ�����줿�ꥹ�Ȥ���\
-���������¾�θ���������Return�����򲡤��С��ͤ�����Ǥ��ޤ���\
-2���ܤΥ���ܥܥå�����������ͤ˸��ꤵ��Ƥ��ꡤ�����ѹ��Ǥ��ޤ���\
-3���ܤΤ�Τϥ������ȥ�ꥢ���ԻԤΥɥ��åץ�����ꥹ�Ȥ���\
-���򤹤뤳�Ȥ�������ǽ�ȤʤäƤ��ޤ���
-EOL
-
-## variables
-firstValue  = TkVariable.new
-secondValue = TkVariable.new
-ozCity      = TkVariable.new
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'�ѿ�����',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{
-                           showVars(base_frame,
-                                    ['firstVariable', firstValue],
-                                    ['secondVariable', secondValue],
-                                    ['ozCity', ozCity])
-                         }),
-         Ttk::Button.new(frame, :text=>'�����ɻ���',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'combo'}),
-         Ttk::Button.new(frame, :text=>'�Ĥ���',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $combo_demo.destroy
-                           $combo_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-australianCities = [
-  '�����٥�', '���ɥˡ�', '���ܥ��', '�ѡ���', '���ǥ졼��',
-  '�֥ꥹ�١���', '�ۥС���', '����������', '���ꥹ ���ץ�󥰥�'
-]
-
-
-secondValue.value = '�ѹ��Բ�'
-ozCity.value = '���ɥˡ�'
-
-Tk.pack(Ttk::Labelframe.new(frame, :text=>'Fully Editable'){|f|
-          Ttk::Combobox.new(f, :textvariable=>firstValue){|b|
-            b.bind('Return', '%W'){|w|
-              w.values <<= w.value unless w.values.include?(w.value)
-            }
-          }.pack(:pady=>5, :padx=>10)
-        },
-
-        Ttk::LabelFrame.new(frame, :text=>'Disabled'){|f|
-          Ttk::Combobox.new(f, :textvariable=>secondValue, :state=>:disabled) .
-            pack(:pady=>5, :padx=>10)
-        },
-
-        Ttk::LabelFrame.new(frame, :text=>'Defined List Only'){|f|
-          Ttk::Combobox.new(f, :textvariable=>ozCity, :state=>:readonly,
-                            :values=>australianCities) .
-            pack(:pady=>5, :padx=>10)
-        },
-
-        :side=>:top, :pady=>5, :padx=>10)
diff --git a/ext/tk/sample/demos-jp/cscroll.rb b/ext/tk/sample/demos-jp/cscroll.rb
deleted file mode 100644
index 0a31f28b5e..0000000000
--- a/ext/tk/sample/demos-jp/cscroll.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# simple scrollable canvas widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($cscroll_demo) && $cscroll_demo
-  $cscroll_demo.destroy
-  $cscroll_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$cscroll_demo = TkToplevel.new {|w|
-  title("Scrollable Canvas Demonstration")
-  iconname("cscroll")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($cscroll_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i',
-            'justify'=>'left', 'text'=>"���Υ�����ɥ��ˤϥ���������С���ޥ����Υܥ���2 �ǥ���������Ǥ��륭���Х� widget ��ɽ������Ƥ��ޤ����ͳѤξ�ǥܥ���1 �򥯥�å�����ȡ����Υ���ǥå�����ɸ����Ϥ˽��Ϥ���ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$cscroll_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $cscroll_demo
-      $cscroll_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'cscroll'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-unless $tk_version =~ /^4\.[01]/
-  $cscroll_grid = TkFrame.new(base_frame) {
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-  }
-  TkGrid.rowconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
-  TkGrid.columnconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
-end
-
-# canvas ����
-$cscroll_canvas = TkCanvas.new(base_frame,
-                               'relief'=>'sunken', 'borderwidth'=>2,
-                               'scrollregion'=>['-11c', '-11c', '50c', '20c']
-                               ) {|c|
-  if $tk_version =~ /^4\.[01]/
-    pack('expand'=>'yes', 'fill'=>'both')
-  else
-    grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-         'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-  end
-
-  TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
-    c.yscrollcommand(proc{|first,last| vs.set first,last})
-    if $tk_version =~ /^4\.[01]/
-      pack('side'=>'right', 'fill'=>'y')
-    else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    end
-  }
-
-  TkScrollbar.new(base_frame, 'orient'=>'horiz',
-                  'command'=>proc{|*args| c.xview(*args)}) {|hs|
-    c.xscrollcommand(proc{|first,last| hs.set first,last})
-    if $tk_version =~ /^4\.[01]/
-      pack('side'=>'bottom', 'fill'=>'x')
-    else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    end
-  }
-}
-
-bg = $cscroll_canvas.configinfo('bg')[4]
-(0..19).each{|i|
-  x = -10+3*i
-  y = -10
-  (0..9).each{|j|
-    TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c",
-                     'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
-    TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c",
-                'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
-    y += 3
-  }
-}
-
-$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
-$cscroll_canvas.itembind('all', 'Any-Leave', proc{scrollLeave $cscroll_canvas})
-$cscroll_canvas.itembind('all', '1', proc{scrollButton $cscroll_canvas})
-$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
-$cscroll_canvas.bind('2', proc{|x,y| $cscroll_canvas.scan_mark(x,y)}, '%x %y')
-$cscroll_canvas.bind('B2-Motion',
-                     proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
-
-def scrollEnter(c)
-  id = c.find_withtag('current')[0].id
-  id -= 1 if c.gettags('current').include?('text')
-  $oldFill = c.itemconfiginfo(id, 'fill')[4]
-  if TkWinfo.depth(c) > 1
-    c.itemconfigure(id, 'fill'=>'SeaGreen1')
-  else
-    c.itemconfigure(id, 'fill'=>'black')
-    c.itemconfigure(id+1, 'fill'=>'white')
-  end
-end
-
-def scrollLeave(c)
-  id = c.find_withtag('current')[0].id
-  id -= 1 if c.gettags('current').include?('text')
-  c.itemconfigure(id, 'fill'=>$oldFill)
-  c.itemconfigure(id+1, 'fill'=>'black')
-end
-
-def scrollButton(c)
-  id = c.find_withtag('current')[0].id
-  id += 1 unless c.gettags('current').include?('text')
-  print "You buttoned at #{c.itemconfiginfo(id,'text')[4]}\n"
-end
-
diff --git a/ext/tk/sample/demos-jp/ctext.rb b/ext/tk/sample/demos-jp/ctext.rb
deleted file mode 100644
index 70c1cad1a7..0000000000
--- a/ext/tk/sample/demos-jp/ctext.rb
+++ /dev/null
@@ -1,204 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# Canvas Text widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($ctext_demo) && $ctext_demo
-  $ctext_demo.destroy
-  $ctext_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$ctext_demo = TkToplevel.new {|w|
-  title("Canvas Text Demonstration")
-  iconname("Text")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ctext_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
-            'text'=>"���Υ�����ɥ��ˤϥ����Х�widget�Υƥ����ȵ�ǽ��ǥ⤹�뤿��Υƥ�����ʸ����ɽ������Ƥ��ޤ����ޥ�����ͳѤ���˻��äƤ���������å�����Ȱ��֤����Ѥ�����������а��֤��Ѥ����ꡢ��·�����Ѥ����ꤹ�뤳�Ȥ��Ǥ��ޤ����ޤ��ʲ��Τ褦���Խ��Τ���δ�ñ�ʥХ���ǥ��󥰤򥵥ݡ��Ȥ��Ƥ��ޤ���
-
-  1. �ޥ�������äƤ���������å��������ϤǤ��ޤ���
-  2. �ܥ���1������Ǥ��ޤ���
-  3. �ޥ����ΰ��֤˥ܥ���2�����򤷤��ƥ����Ȥ򥳥ԡ��Ǥ��ޤ���
-  4.�Хå����ڡ����򥳥�ȥ�����-H���������������ľ����ʸ���������ޤ���
-  5. Delete�������������������ľ���ʸ���������ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$ctext_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $ctext_demo
-      $ctext_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'ctext'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas ����
-$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat',
-                             'borderwidth'=>0, 'width'=>500, 'height'=>350)
-$ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-
-# font ����
-if $tk_version =~ /^4.*/
-  textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-else
-  textFont = 'Helvetica 24'
-end
-
-# canvas ����
-TkcRectangle.new($ctext_canvas, 245, 195, 255, 205,
-                 'outline'=>'black', 'fill'=>'red')
-
-ctag_text_param = {
-  'text'=>"����ϥ����Х�widget�Υƥ����ȵ�ǽ��ǥ⤹�뤿���ʸ����Ǥ���\n��ǽҤ٤��褦���Խ����ǽ�Ȥ��뤿��ΥХ���ǥ��󥰤�ܤ��Ƥ��ޤ���",
-  'width'=>440, 'anchor'=>'n', 'justify'=>'left'
-}
-if $tk_version =~ /^4.*/
-  ctag_text_param['font'] = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-  ctag_text_param['kanjifont'] = '-*-r-*--24-*-jisx0208.1983-0'
-else
-  ctag_text_param['font'] = 'Helvetica 24'
-end
-$ctag_text = TkcTag.new($ctext_canvas)
-$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, ctag_text_param))
-
-$ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('Shift-1',
-        proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"},
-        "%x %y")
-$ctag_text.bind('Shift-B1-Motion',
-                proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
-$ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
-$ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
-$ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
-$ctag_text.bind('Delete', proc{textDel $ctext_canvas})
-$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"},
-                "%x %y")
-
-# Next, create some items that allow the text's anchor position
-# to be edited.
-
-def mkTextConfig(w,x,y,option,value,color)
-  item = TkcRectangle.new(w, x, y, x+30, y+30,
-                          'outline'=>'black', 'fill'=>color, 'width'=>1)
-  item.bind('1', proc{$ctag_text.configure option, value})
-  w.addtag_withtag('config', item)
-end
-
-x = 50
-y = 50
-color = 'LightSkyBlue1'
-mkTextConfig $ctext_canvas, x, y, 'anchor', 'se', color
-mkTextConfig $ctext_canvas, x+30, y, 'anchor', 's', color
-mkTextConfig $ctext_canvas, x+60, y, 'anchor', 'sw', color
-mkTextConfig $ctext_canvas, x, y+30, 'anchor', 'e', color
-mkTextConfig $ctext_canvas, x+30, y+30, 'anchor', 'center', color
-mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
-mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
-mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
-mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
-item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50,
-                        'outline'=>'black', 'fill'=>'red')
-item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
-if $tk_version =~ /^4.*/
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
-              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
-              'anchor'=>'s', 'fill'=>'brown')
-else
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
-              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
-end
-
-# Lastly, create some items that allow the text's justification to be
-# changed.
-
-x = 350
-y = 50
-color = 'SeaGreen2'
-mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
-mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
-mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
-if $tk_version =~ /^4.*/
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
-              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
-              'anchor'=>'s', 'fill'=>'brown')
-else
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
-              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
-end
-
-$ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
-$ctext_canvas.itembind('config', 'Leave',
-                       proc{$ctext_canvas\
-                             .itemconfigure('current',
-                                            'fill'=>$textConfigFill)})
-
-$textConfigFill = ''
-
-def textEnter(w)
-  $textConfigFill = (w.itemconfiginfo 'current', 'fill')[4]
-  w.itemconfigure 'current', 'fill', 'black'
-end
-
-def textInsert(w, string)
-  return if string == ""
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-  end
-  $ctag_text.insert 'insert', string
-end
-
-def textPaste(w, pos)
-  begin
-    $ctag_text.insert pos, TkSelection.get
-  rescue
-  end
-end
-
-def textB1Press(w,x,y)
-  w.icursor 'current', "@#{x},#{y}"
-  w.itemfocus 'current'
-  w.focus
-  w.select_from 'current', "@#{x},#{y}"
-end
-
-def textB1Move(w,x,y)
-  w.select_to 'current', "@#{x},#{y}"
-end
-
-def textBs(w)
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-    char = $ctag_text.index('insert').to_i - 1
-    $ctag_text.dchars(char) if char >= 0
-  end
-end
-
-def textDel(w)
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-    $ctag_text.dchars 'insert'
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/dialog1.rb b/ext/tk/sample/demos-jp/dialog1.rb
deleted file mode 100644
index 07e50306ab..0000000000
--- a/ext/tk/sample/demos-jp/dialog1.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# a dialog box with a local grab (called by 'widget')
-#
-class TkDialog_Demo1 < TkDialog
-  ###############
-  private
-  ###############
-  def title
-    "Dialog with local grab"
-  end
-
-  def message
-    '�⡼��������������ܥå����Ǥ���Tk �� "grab" ���ޥ�ɤ���Ѥ��ƥ����������ܥå����ǡ֥������륰��֡פ��Ƥ��ޤ������Τ����줫�Υܥ����¹Ԥ��뤳�Ȥˤ�äơ����Υ�����������������ޤǡ����Υ���֤ˤ�äƥ��ץꥱ��������¾�Υ�����ɥ��Ǥϡ��ݥ��󥿴ط��Υ��٥�Ȥ������뤳�Ȥ��Ǥ��ʤ��ʤäƤ��ޤ���'
-  end
-
-  def bitmap
-    'info'
-  end
-
-  def default_button
-    0
-  end
-
-  def buttons
-#    "λ�� ����󥻥� �����ɻ���"
-    ["λ��", "����󥻥�", "�����ɻ���"]
-  end
-end
-
-ret =  TkDialog_Demo1.new('message_config'=>{'wraplength'=>'4i'}).value
-case ret
-when 0
-  print "���ʤ��ϡ�λ��פ򲡤��ޤ����͡�\n"
-when 1
-  print "���ʤ��ϡ֥���󥻥�פ򲡤��ޤ����͡�\n"
-when 2
-  showCode 'dialog1'
-end
diff --git a/ext/tk/sample/demos-jp/dialog2.rb b/ext/tk/sample/demos-jp/dialog2.rb
deleted file mode 100644
index f747f8d6a8..0000000000
--- a/ext/tk/sample/demos-jp/dialog2.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# a dialog box with a global grab (called by 'widget')
-#
-class TkDialog_Demo2 < TkDialog
-  ###############
-  private
-  ###############
-  def title
-    "Dialog with global grab"
-  end
-
-  def message
-    '���Υ����������ܥå����ϥ������Х륰��֤���Ѥ��Ƥ��ޤ������Υܥ����¹Ԥ���ޤǡ��ǥ����ץ쥤��Τ����ʤ��ΤȤ����äǤ��ޤ��󡣥������Х륰��֤���Ѥ��뤳�Ȥϡ��ޤ��ɤ��ͤ��ǤϤ���ޤ��󡣤ɤ����Ƥ�ɬ�פˤʤ�ޤǻȤ����Ȼפ�ʤ��ǲ�������'
-  end
-
-  def bitmap
-    'info'
-  end
-
-  def default_button
-    0
-  end
-
-  def buttons
-#    "λ�� ����󥻥� �����ɻ���"
-    ["λ��", "����󥻥�", "�����ɻ���"]
-  end
-end
-
-ret =  TkDialog_Demo2.new('message_config'=>{'wraplength'=>'4i'},
-                          'prev_command'=>proc{|dialog|
-                            Tk.after 100, proc{dialog.grab('global')}
-                          }).value
-case ret
-when 0
-  print "���ʤ��ϡ�λ��פ򲡤��ޤ����͡�\n"
-when 1
-  print "���ʤ��ϡ֥���󥻥�פ򲡤��ޤ����͡�\n"
-when 2
-  showCode 'dialog2'
-end
-
diff --git a/ext/tk/sample/demos-jp/doc.org/README b/ext/tk/sample/demos-jp/doc.org/README
deleted file mode 100644
index 90677d3316..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory contains a collection of demonstration programs that
-are translated into Japanese.  You need to use a Japanized "wish" to
-see these Japanese-translated demonstration programs.  You also need
-to put this directory ("demos.jp") at the next to "demos" since some
-of the programs refer to the image files at "demos".
-
-Please refer to the README file at "demos" for more detail.
diff --git a/ext/tk/sample/demos-jp/doc.org/README.JP b/ext/tk/sample/demos-jp/doc.org/README.JP
deleted file mode 100644
index 42b4929378..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/README.JP
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory contains "widget" demo for the Japanized Tcl7.6/Tk4.2.
-Most of the messages in the original are translated to Japanese.
-But other tools in this directory are not translated.
-
-Following 2 kanji fonts are defined at the beginning of the file "widget."
-
-	-*--24-*-jisx0208.1983-0
-	-*--16-*-jisx0208.1983-0
-
-These fonts are all part of the core distribution of X11R5, so
-if you are running X11R5, you don't have to modify the file.
-
-But if you don't have these fonts, replace them with appropriate ones.
-"-*--14-*-jisx0208.1983-0" will be a good choice.
diff --git a/ext/tk/sample/demos-jp/doc.org/README.tk80 b/ext/tk/sample/demos-jp/doc.org/README.tk80
deleted file mode 100644
index c71f977d74..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/README.tk80
+++ /dev/null
@@ -1,46 +0,0 @@
-This directory contains a collection of programs to demonstrate
-the features of the Tk toolkit.  The programs are all scripts for
-"wish", a windowing shell.  If wish has been installed in /usr/local
-then you can invoke any of the programs in this directory just
-by typing its file name to your command shell.  Otherwise invoke
-wish with the file as its first argument, e.g., "wish hello".
-The rest of this file contains a brief description of each program.
-Files with names ending in ".tcl" are procedure packages used by one
-or more of the demo programs;  they can't be used as programs by
-themselves so they aren't described below.
-
-hello -		Creates a single button;  if you click on it, a message
-		is typed and the application terminates.
-
-widget -	Contains a collection of demonstrations of the widgets
-		currently available in the Tk library.  Most of the .tcl
-		files are scripts for individual demos available through
-		the "widget" program.
-
-ixset -		A simple Tk-based wrapper for the "xset" program, which
-		allows you to interactively query and set various X options
-		such as mouse acceleration and bell volume.  Thanks to
-		Pierre David for contributing this example.
-
-rolodex -	A mock-up of a simple rolodex application.  It has much of
-		the user interface for such an application but no back-end
-		database.  This program was written in response to Tom
-		LaStrange's toolkit benchmark challenge.
-
-tcolor -	A color editor.  Allows you to edit colors in several
-		different ways, and will also perform automatic updates
-		using "send".
-
-rmt -		Allows you to "hook-up" remotely to any Tk application
-		on the display.  Select an application with the menu,
-		then just type commands:  they'll go to that application.
-
-timer -		Displays a seconds timer with start and stop buttons.
-		Control-c and control-q cause it to exit.
-
-browse -	A simple directory browser.  Invoke it with and argument
-		giving the name of the directory you'd like to browse.
-		Double-click on files or subdirectories to browse them.
-		Control-c and control-q cause the program to exit.
-
-sccs id = SCCS: @(#) README 1.3 96/02/16 10:49:14
diff --git a/ext/tk/sample/demos-jp/doc.org/license.terms b/ext/tk/sample/demos-jp/doc.org/license.terms
deleted file mode 100644
index c0a44d3fc2..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/license.terms
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/demos-jp/doc.org/license.terms.tk80 b/ext/tk/sample/demos-jp/doc.org/license.terms.tk80
deleted file mode 100644
index c0a44d3fc2..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/license.terms.tk80
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/demos-jp/entry1.rb b/ext/tk/sample/demos-jp/entry1.rb
deleted file mode 100644
index eb71e87aec..0000000000
--- a/ext/tk/sample/demos-jp/entry1.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# entry (no scrollbars) widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($entry1_demo) && $entry1_demo
-  $entry1_demo.destroy
-  $entry1_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$entry1_demo = TkToplevel.new {|w|
-  title("Entry Demonstration (no scrollbars)")
-  iconname("entry1")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($entry1_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "3����ΰۤʤ륨��ȥ꤬ɽ������Ƥ��ޤ���ʸ�������Ϥ���ˤϥݥ��󥿤���äƹԤ�������å����Ƥ��饿���פ��Ƥ���������ɸ��Ū��Motif���Խ���ǽ����Emacs�Υ����Х���ɤȤȤ�ˡ����ݡ��Ȥ���Ƥ��ޤ����㤨�С��Хå����ڡ����ȥ���ȥ�����-H�ϥ�������κ���ʸ�����������ǥ꡼�ȥ����ȥ���ȥ�����-D�ϥ�������α�¦��ʸ���������ޤ���Ĺ�᤮�ƥ�����ɥ��������ڤ�ʤ���Τϡ��ޥ����Υܥ���2�򲡤����ޤޥɥ�å����뤳�Ȥǥ��������뤵���뤳�Ȥ��Ǥ��ޤ������ܸ�����Ϥ���Τϥ���ȥ�����-�Хå�����å���Ǥ���kinput2��ư���Ƥ�������Ϥ��뤳�Ȥ��Ǥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $entry1_demo
-      $entry1_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'entry1'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# entry ����
-e1 = TkEntry.new(base_frame, 'relief'=>'sunken')
-e2 = TkEntry.new(base_frame, 'relief'=>'sunken')
-e3 = TkEntry.new(base_frame, 'relief'=>'sunken')
-[e1,e2,e3].each{|w| w.pack('side'=>'top', 'padx'=>10, 'pady'=>5, 'fill'=>'x')}
-
-# ���������
-e1.insert(0, '�����')
-e2.insert('end', "���Υ���ȥ�ˤ�Ĺ��ʸ�������äƤ��ơ�")
-e2.insert('end', "Ĺ�����ƥ�����ɥ��ˤ������ڤ�ʤ��Τǡ�")
-e2.insert('end', "�ºݤν꽪��ޤǸ���ˤϥ��������뤵���ʤ����")
-e2.insert('end', "�ʤ�ʤ��Ǥ��礦��")
-
diff --git a/ext/tk/sample/demos-jp/entry2.rb b/ext/tk/sample/demos-jp/entry2.rb
deleted file mode 100644
index b5187ab508..0000000000
--- a/ext/tk/sample/demos-jp/entry2.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# entry (with scrollbars) widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($entry2_demo) && $entry2_demo
-  $entry2_demo.destroy
-  $entry2_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$entry2_demo = TkToplevel.new {|w|
-  title("Entry Demonstration (with scrollbars)")
-  iconname("entry2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($entry2_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "3����ΰۤʤ륨��ȥ꤬�ơ�����������С��դ�ɽ������Ƥ��ޤ���ʸ�������Ϥ���ˤϥݥ��󥿤���äƹԤ�������å����Ƥ��饿���פ��Ƥ���������ɸ��Ū��Motif���Խ���ǽ����Emacs�Υ����Х���ɤȤȤ�ˡ����ݡ��Ȥ���Ƥ��ޤ����㤨�С��Хå����ڡ����ȥ���ȥ�����-H�ϥ�������κ���ʸ�����������ǥ꡼�ȥ����ȥ���ȥ�����-D�ϥ�������α�¦��ʸ���������ޤ���Ĺ�᤮�ƥ�����ɥ��������ڤ�ʤ���Τϡ��ޥ����Υܥ���2�򲡤����ޤޥɥ�å����뤳�Ȥǥ��������뤵���뤳�Ȥ��Ǥ��ޤ������ܸ�����Ϥ���Τϥ���ȥ�����-�Хå�����å���Ǥ���kinput2��ư���Ƥ�������Ϥ��뤳�Ȥ��Ǥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $entry2_demo
-      $entry2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'entry2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
-  # entry 1
-  s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e1 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s1.set first,last}
-  }
-  s1.command(proc{|*args| e1.xview(*args)})
-  e1.pack('side'=>'top', 'fill'=>'x')
-  s1.pack('side'=>'top', 'fill'=>'x')
-
-  # spacer
-  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
-
-  # entry 2
-  s2 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e2 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s2.set first,last}
-  }
-  s2.command(proc{|*args| e2.xview(*args)})
-  e2.pack('side'=>'top', 'fill'=>'x')
-  s2.pack('side'=>'top', 'fill'=>'x')
-
-  # spacer
-  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
-
-  # entry 3
-  s3 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e3 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s3.set first,last}
-  }
-  s3.command(proc{|*args| e3.xview(*args)})
-  e3.pack('side'=>'top', 'fill'=>'x')
-  s3.pack('side'=>'top', 'fill'=>'x')
-
-  # ���������
-  e1.insert(0, '�����')
-  e2.insert('end', "���Υ���ȥ�ˤ�Ĺ��ʸ�������äƤ��ơ�")
-  e2.insert('end', "Ĺ�����ƥ�����ɥ��ˤ������ڤ�ʤ��Τǡ�")
-  e2.insert('end', "�ºݤν꽪��ޤǸ���ˤϥ��������뤵���ʤ����")
-  e2.insert('end', "�ʤ�ʤ��Ǥ��礦��")
-
-}.pack('side'=>'top', 'fill'=>'x', 'expand'=>'yes')
-
diff --git a/ext/tk/sample/demos-jp/entry3.rb b/ext/tk/sample/demos-jp/entry3.rb
deleted file mode 100644
index 2728de0b93..0000000000
--- a/ext/tk/sample/demos-jp/entry3.rb
+++ /dev/null
@@ -1,225 +0,0 @@
-# -*- coding: euc-jp -*-
-# entry3.rb --
-#
-# This demonstration script creates several entry widgets whose
-# permitted input is constrained in some way.  It also shows off a
-# password entry.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($entry3_demo) && $entry3_demo
-  $entry3_demo.destroy
-  $entry3_demo = nil
-end
-
-$entry3_demo = TkToplevel.new {|w|
-  title("Constrained Entry Demonstration")
-  iconname("entry3")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($entry3_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'5i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-�ʲ��ˤϣ�����Υ���ȥ�ܥå�����ɽ������Ƥ��ޤ����ƥ���ȥ�ܥå����ϡ�\
-�ޥ�������å�������ʸ�����Ǥ����ळ�Ȥ���ǽ�Ǥ��������줾�줬�ɤΤ褦��\
-���Ϥ�����դ��뤳�Ȥ��Ǥ��뤫�ˤ������ߤ����Ƥ��ޤ���\
-��Ĥ�Υ���ȥ�ܥå����������ȸ��ʤ����ʸ��������ʸ�����ʤ����ξ��֤�\
-�ξ�����������դ������꤬������ϥ���ȥ�ܥå��������Ǥ��ޤ�\
-�ʥե��������������˥����å�����ޤ��ˡ�\
-��Ĥ�Υ���ȥ�ܥå����ϡ����Ϥ��줿ʸ�����Ĺ����\
-����ʸ��̤���ξ�����������դ������¤�ۤ��ƽ񤭹��⤦�Ȥ����Ȥ��ˤ�\
-�٥���Ĥ餷���Τ餻�ޤ���\
-���Ĥ���ƹ�������ֹ������դ��륨��ȥ�ܥå����Ǥ���\
-����ե��٥åȤϡ����õ��Υ���������б��Ť����Ƥ���������Ѵ�����ޤ���\
-��Ŭ�ڤ�ʸ�������Ϥ��줿������ʳ���ʸ���ΰ��֤˿��������Ϥ��褦�Ȥ�����\
-�������ˤϷٹ�Υ٥뤬�Ĥ�ޤ���\
-�ͤĤ�Υ���ȥ�ܥå����ϡ���ʸ���ޤǤ����Ϥ�����դ���\
-�ѥ���ɥե�����ɤǤ��ʣ�ʸ���ʾ���ä˷ٹ��Ф����Ȥʤ�̵�뤵��ޤ��ˡ�\
-���Ϥ��줿ʸ���ϥ������ꥹ��������֤�������ɽ������ޤ���
-EOL
-
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
-                 $entry3_demo.destroy
-                 $entry3_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-                 showCode 'entry3'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-# focusAndFlash --
-# Error handler for entry widgets that forces the focus onto the
-# widget and makes the widget flash by exchanging the foreground and
-# background colours at intervals of 200ms (i.e. at approximately
-# 2.5Hz).
-#
-# Arguments:
-# widget -      entry widget to flash
-# fg -          Initial foreground colour
-# bg -          Initial background colour
-# count -       Counter to control the number of times flashed
-def focusAndFlash(widget, fg, bg, count=5)
-  return if count <= 0
-  if fg && !fg.empty? && bg && !bg.empty?
-    TkTimer.new(200, count,
-                proc{widget.configure(:foreground=>bg, :background=>fg)},
-                proc{widget.configure(:foreground=>fg, :background=>bg)}
-                ).start
-  else
-    # TkTimer.new(150, 3){Tk.bell}.start
-    Tk.bell
-    TkTimer.new(200, count,
-                proc{widget.configure(:foreground=>'white',
-                                      :background=>'black')},
-                proc{widget.configure(:foreground=>'black',
-                                      :background=>'white')}
-                ).at_end{begin
-                           widget.configure(:foreground=>fg,
-                                            :background=>bg)
-                         rescue
-                           # ignore
-                         end}.start
-  end
-  widget.focus(true)
-end
-
-l1 = TkLabelFrame.new(base_frame, :text=>"��������ȥ�")
-TkEntry.new(l1, :validate=>:focus,
-            :vcmd=>[
-              proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-            ]) {|e|
-  fg = e.foreground
-  bg = e.background
-  invalidcommand [proc{|w| focusAndFlash(w, fg, bg)}, '%W']
-  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-}
-
-l2 = TkLabelFrame.new(base_frame, :text=>"Ĺ�������դ�����ȥ�")
-TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell},
-            :vcmd=>[proc{|s| s.length < 10}, '%P']
-            ).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-
-### PHONE NUMBER ENTRY ###
-# Note that the source to this is quite a bit longer as the behaviour
-# demonstrated is a lot more ambitious than with the others.
-
-# Initial content for the third entry widget
-entry3content = TkVariable.new("1-(000)-000-0000")
-
-# Mapping from alphabetic characters to numbers.
-$phoneNumberMap = {}
-Hash[*(%w(abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9))].each{|chars, n|
-  chars.split('').each{|c|
-    $phoneNumberMap[c] = n
-    $phoneNumberMap[c.upcase] = n
-  }
-}
-
-# phoneSkipLeft --
-# Skip over fixed characters in a phone-number string when moving left.
-#
-# Arguments:
-# widget -      The entry widget containing the phone-number.
-def phoneSkipLeft(widget)
-  idx = widget.index('insert')
-  if idx == 8
-    # Skip back two extra characters
-    widget.cursor = idx - 2
-  elsif idx == 7 || idx == 12
-    # Skip back one extra character
-    widget.cursor = idx - 1
-  elsif idx <= 3
-    # Can't move any further
-    Tk.bell
-    Tk.callback_break
-  end
-end
-
-# phoneSkipRight --
-# Skip over fixed characters in a phone-number string when moving right.
-#
-# Arguments:
-# widget -      The entry widget containing the phone-number.
-# add - Offset to add to index before calculation (used by validation.)
-def phoneSkipRight(widget, add = 0)
-  idx = widget.index('insert')
-  if (idx + add == 5)
-    # Skip forward two extra characters
-    widget.cursor = idx + 2
-  elsif (idx + add == 6 || idx + add == 10)
-    # Skip forward one extra character
-    widget.cursor = idx + 1
-  elsif (idx + add == 15 && add == 0)
-    # Can't move any further
-    Tk.bell
-    Tk.callback_break
-  end
-end
-
-# validatePhoneChange --
-# Checks that the replacement (mapped to a digit) of the given
-# character in an entry widget at the given position will leave a
-# valid phone number in the widget.
-#
-# widget - entry widget to validate
-# vmode -  The widget's validation mode
-# idx -    The index where replacement is to occur
-# char -   The character (or string, though that will always be
-#          refused) to be overwritten at that point.
-
-def validatePhoneChange(widget, vmode, idx, char)
-  return true if idx == nil
-  Tk.after_idle(proc{widget.configure(:validate=>vmode,
-                                      :invcmd=>proc{Tk.bell})})
-  if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
-    widget.delete(idx)
-    widget.insert(idx, $phoneNumberMap[char] || char)
-    Tk.after_idle(proc{phoneSkipRight(widget, -1)})
-    # Tk.update(true)  # <- Don't work 'update' inter validation callback.
-                       #    It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1).
-    return true
-  end
-  return false
-end
-
-
-l3 = TkLabelFrame.new(base_frame, :text=>"�ƹ������ֹ楨��ȥ�")
-TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
-            :textvariable=>entry3content,
-            :vcmd=>[
-              proc{|w,v,i,s| validatePhoneChange(w,v,i,s)},
-              "%W %v %i %S"
-            ]){|e|
-  # Click to focus goes to the first editable character...
-  bind('FocusIn', proc{|d,w|
-         if d != "NotifyAncestor"
-           w.cursor = 3
-           Tk.after_idle(proc{w.selection_clear})
-         end
-       }, '%d %W')
-  bind('Left',  proc{|w| phoneSkipLeft(w)},  '%W')
-  bind('Right', proc{|w| phoneSkipRight(w)}, '%W')
-  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-}
-
-l4 = TkLabelFrame.new(base_frame, :text=>"�ѥ���ɥ���ȥ�")
-TkEntry.new(l4, :validate=>:key, :show=>'*',
-            :vcmd=>[
-              proc{|s| s.length <= 8},
-              '%P'
-            ]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-
-TkFrame.new(base_frame){|f|
-  lower
-  TkGrid.configure(l1, l2, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
-  TkGrid.configure(l3, l4, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
-  TkGrid.columnconfigure(f, [0,1], :uniform=>1)
-  pack(:fill=>:both, :expand=>true)
-}
diff --git a/ext/tk/sample/demos-jp/filebox.rb b/ext/tk/sample/demos-jp/filebox.rb
deleted file mode 100644
index ffe5fbc5c6..0000000000
--- a/ext/tk/sample/demos-jp/filebox.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# widget demo prompts the user to select a file (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($filebox_demo) && $entry2_demo
-  $filebox_demo.destroy
-  $filebox_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$filebox_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("filebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($filebox_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"����ȥ�˥ե�����̾��ľ�����Ϥ��뤫��\"Browse\" �ܥ���򲡤��ƥե����������������������ե�����̾������ǲ�������").pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $filebox_demo
-      $filebox_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'filebox'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-['����', '��¸'].each{|type|
-  TkFrame.new(base_frame) {|f|
-    TkLabel.new(f, 'text'=>"�ե������#{type}: ", 'anchor'=>'e')\
-    .pack('side'=>'left')
-
-    TkEntry.new(f, 'width'=>20) {|e|
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
-
-      TkButton.new(f, 'text'=>'Browse ...',
-                   'command'=>proc{fileDialog base_frame,e,type})\
-      .pack('side'=>'left')
-    }
-
-    pack('fill'=>'x', 'padx'=>'1c', 'pady'=>3)
-  }
-}
-
-$tk_strictMotif = TkVarAccess.new('tk_strictMotif')
-if ($tk_platform['platform'] == 'unix')
-  TkCheckButton.new(base_frame,
-                    'text'=>'Motif��������Υ������������Ѥ���',
-                    'variable'=>$tk_strictMotif,
-                    'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
-end
-
-def fileDialog(w,ent,operation)
-  #    Type names         Extension(s)             Mac File Type(s)
-  #
-  #--------------------------------------------------------
-  types = [
-    ['Text files',       ['.txt','.doc']          ],
-    ['Text files',       [],                      'TEXT' ],
-    ['Ruby Scripts',     ['.rb'],                 'TEXT' ],
-    ['Tcl Scripts',      ['.tcl'],                'TEXT' ],
-    ['C Source Files',   ['.c','.h']              ],
-    ['All Source Files', ['.rb','.tcl','.c','.h'] ],
-    ['Image Files',      ['.gif']                 ],
-    ['Image Files',      ['.jpeg','.jpg']         ],
-    ['Image Files',      [],                      ['GIFF','JPEG']],
-    ['All files',        '*'                      ]
-  ]
-
-  if operation == '����'
-    file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
-  else
-    file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w,
-                          'initialfile'=>'Untitled',
-                          'defaultextension'=>'.txt')
-  end
-  if file != ""
-    ent.delete 0, 'end'
-    ent.insert 0, file
-    # ent.xview 'end'
-    Tk.update_idletasks # need this for Tk::Tile::Entry
-                        # (to find right position of 'xview').
-    ent.xview(ent.index('end'))
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/floor.rb b/ext/tk/sample/demos-jp/floor.rb
deleted file mode 100644
index 78cc23a245..0000000000
--- a/ext/tk/sample/demos-jp/floor.rb
+++ /dev/null
@@ -1,1721 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# floorDisplay widget demo (called by 'widget')
-#
-
-# floorDisplay --
-# Recreate the floorplan display in the canvas given by "w".  The
-# floor given by "active" is displayed on top with its office structure
-# visible.
-#
-# Arguments:
-# w -           Name of the canvas window.
-# active -      Number of active floor (1, 2, or 3).
-
-def floorDisplay(w,active)
-  return if $activeFloor == active
-
-  w.delete('all')
-  $activeFloor = active
-
-  # First go through the three floors, displaying the backgrounds for
-  # each floor.
-
-  floor_bg1(w,$floor_colors['bg1'],$floor_colors['outline1'])
-  floor_bg2(w,$floor_colors['bg2'],$floor_colors['outline2'])
-  floor_bg3(w,$floor_colors['bg3'],$floor_colors['outline3'])
-
-  # Raise the background for the active floor so that it's on top.
-
-  w.raise("floor#{active}")
-
-  # Create a dummy item just to mark this point in the display list,
-  # so we can insert highlights here.
-
-  TkcRectangle.new(w,0,100,1,101, 'fill'=>'', 'outline'=>'', 'tags'=>'marker')
-
-  # Add the walls and labels for the active floor, along with
-  # transparent polygons that define the rooms on the floor.
-  # Make sure that the room polygons are on top.
-
-  $floorLabels.clear
-  $floorItems.clear
-  send("floor_fg#{active}", w, $floor_colors['offices'])
-  w.raise('room')
-
-  # Offset the floors diagonally from each other.
-
-  w.move('floor1', '2c', '2c')
-  w.move('floor2', '1c', '1c')
-
-  # Create items for the room entry and its label.
-  TkcWindow.new(w, 600, 100, 'anchor'=>'w', 'window'=>$floor_entry)
-  TkcText.new(w, 600, 100, 'anchor'=>'e', 'text'=>"�����ֹ�: ")
-  w['scrollregion'] = w.bbox('all')
-end
-
-# newRoom --
-# This method is invoked whenever the mouse enters a room
-# in the floorplan.  It changes tags so that the current room is
-# highlighted.
-#
-# Arguments:
-# w  -          The name of the canvas window.
-
-def newRoom(w)
-  id = w.find_withtag('current')[0]
-  $currentRoom.value = $floorLabels[id.id] if id != ""
-  Tk.update(true)
-end
-
-# roomChanged --
-# This method is invoked whenever the currentRoom variable changes.
-# It highlights the current room and unhighlights any previous room.
-#
-# Arguments:
-# w -           The canvas window displaying the floorplan.
-# args -        Not used.
-
-def roomChanged(w,*args)
-  w.delete('highlight')
-  item = $floorItems[$currentRoom.value]
-  return if item == nil
-  new = TkcPolygon.new(w, *(w.coords(item)))
-  new.configure('fill'=>$floor_colors['active'], 'tags'=>'highlight')
-  w.raise(new, 'marker')
-end
-
-# floor_bg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor_bg1(w,fill,outline)
-  TkcPolygon.new(w,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
-                 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
-                 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
-                 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
-                 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
-                 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
-                 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
-                 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
-                 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
-                 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
-                 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
-                 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
-                 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
-  TkcLine.new(w,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
-end
-
-# floor_bg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor_bg2(w,fill,outline)
-  TkcPolygon.new(w,559,129,484,129,484,162,398,162,398,129,315,129,
-                 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
-                 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
-                 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
-                 367,802,367,802,129,725,129,725,133,559,133,559,129,
-                 'tags'=>['floor2','bg'], 'fill'=>fill)
-  TkcLine.new(w,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-end
-
-# floor_bg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor_bg3(w,fill,outline)
-  TkcPolygon.new(w,159,300,107,300,107,248,159,248,159,129,96,129,96,
-                 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  TkcPolygon.new(w,258,370,258,329,350,329,350,311,399,311,399,129,
-                 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,107,300,159,300,159,248,107,248,107,300,
-              'fill'=>outline, 'tags'=>['floor3','bg'])
-end
-
-# floor_fg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the first
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '101'
-  $floorItems['101'] = i
-  TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Pub Lift1'
-  $floorItems['Pub Lift1'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Priv Lift1'
-  $floorItems['Priv Lift1'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '110'
-  $floorItems['110'] = i
-  TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '109'
-  $floorItems['109'] = i
-  TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '111'
-  $floorItems['111'] = i
-  TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117B'
-  $floorItems['117B'] = i
-  TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '112'
-  $floorItems['112'] = i
-  TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '113'
-  $floorItems['113'] = i
-  TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117A'
-  $floorItems['117A'] = i
-  TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117'
-  $floorItems['117'] = i
-  TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '114'
-  $floorItems['114'] = i
-  TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '115'
-  $floorItems['115'] = i
-  TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '116'
-  $floorItems['116'] = i
-  TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '118'
-  $floorItems['118'] = i
-  TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-                     163,91,163,112,149,112,149,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '120'
-  $floorItems['120'] = i
-  TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-                     156,192,156,169,175,169,175,246,79,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '122'
-  $floorItems['122'] = i
-  TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '121'
-  $floorItems['121'] = i
-  TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106A'
-  $floorItems['106A'] = i
-  TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '105'
-  $floorItems['105'] = i
-  TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106B'
-  $floorItems['106B'] = i
-  TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '104'
-  $floorItems['104'] = i
-  TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '108'
-  $floorItems['108'] = i
-  TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '107'
-  $floorItems['107'] = i
-  TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Smoking'
-  $floorItems['Smoking'] = i
-  TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '123'
-  $floorItems['123'] = i
-  TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '103'
-  $floorItems['103'] = i
-  TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '124'
-  $floorItems['124'] = i
-  TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '125'
-  $floorItems['125'] = i
-  TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '126'
-  $floorItems['126'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-                     486,253,486,239,474,239,474,209,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '127'
-  $floorItems['127'] = i
-  TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-                     490,188,490,204,476,204,476,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'MShower'
-  $floorItems['MShower'] = i
-  TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Closet'
-  $floorItems['Closet'] = i
-  TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'WShower'
-  $floorItems['WShower'] = i
-  TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
-                     697,166,697,275,553,275,531,254,515,254,
-                     515,174,503,174,503,161,486,161,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '130'
-  $floorItems['130'] = i
-  TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
-                     342,246,397,246,397,276,393,276,
-                     393,309,300,309,300,248,308,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '102'
-  $floorItems['102'] = i
-  TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '128'
-  $floorItems['128'] = i
-  TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
-                     552,277,561,277,561,325,510,325,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '129'
-  $floorItems['129'] = i
-  TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-                     642,389,561,389,561,277,696,277,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '133'
-  $floorItems['133'] = i
-  TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '132'
-  $floorItems['132'] = i
-  TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '134'
-  $floorItems['134'] = i
-  TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '135'
-  $floorItems['135'] = i
-  TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
-                     304,312,396,312,396,288,400,288,404,288,
-                     409,290,413,292,418,297,421,302,422,309,
-                     421,318,417,325,411,330,405,332,397,333,
-                     344,333,340,334,336,336,335,338,332,342,
-                     331,347,332,351,334,354,336,357,341,359,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Ramona Stair'
-  $floorItems['Ramona Stair'] = i
-  TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-                     122,28,123,32,123,68,220,68,220,87,90,87,90,23,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'University Stair'
-  $floorItems['University Stair'] = i
-  TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
-                     358,48,363,39,365,29,348,25,335,22,321,14,
-                     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-                     227,13,223,17,221,22,220,34,260,34,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Plaza Stair'
-  $floorItems['Plaza Stair'] = i
-  TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
-                     323,56,337,70,350,83,365,94,377,100,
-                     386,104,386,128,220,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Plaza Deck'
-  $floorItems['Plaza Deck'] = i
-  TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106'
-  $floorItems['106'] = i
-  TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
-                     95,128,114,128,114,151,157,151,157,153,112,153,
-                     112,130,97,130,97,168,175,168,175,131,146,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '119'
-  $floorItems['119'] = i
-  TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  TkcLine.new(w,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-end
-
-# floor_fg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the second
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor_fg2(w,color)
-  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-                     800,222,800,168,748,168,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '238'
-  $floorItems['238'] = i
-  TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '237'
-  $floorItems['237'] = i
-  TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
-                     643,324,643,291,641,291,641,205,696,205,
-                     696,291,694,291,694,314,715,314,715,291,
-                     715,205,755,205,755,190,724,190,724,187,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '246'
-  $floorItems['246'] = i
-  TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '247'
-  $floorItems['247'] = i
-  TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
-                     397,246,397,255,476,255,476,250,482,250,559,250,
-                     559,274,482,274,482,278,396,278,396,274,232,274,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '202'
-  $floorItems['202'] = i
-  TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
-                     306,196,306,180,175,180,175,169,156,169,
-                     156,196,176,196,176,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '206'
-  $floorItems['206'] = i
-  TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '212'
-  $floorItems['212'] = i
-  TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '245'
-  $floorItems['245'] = i
-  TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '244'
-  $floorItems['244'] = i
-  TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '243'
-  $floorItems['243'] = i
-  TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '242'
-  $floorItems['242'] = i
-  TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Barbecue Deck'
-  $floorItems['Barbecue Deck'] = i
-  TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '240'
-  $floorItems['240'] = i
-  TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '241'
-  $floorItems['241'] = i
-  TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '239'
-  $floorItems['239'] = i
-  TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '248'
-  $floorItems['248'] = i
-  TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '236'
-  $floorItems['236'] = i
-  TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '235'
-  $floorItems['235'] = i
-  TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-                     572,143,579,143,579,185,626,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '234'
-  $floorItems['234'] = i
-  TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-                     578,185,527,185,527,131,557,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '233'
-  $floorItems['233'] = i
-  TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '230'
-  $floorItems['230'] = i
-  TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '232'
-  $floorItems['232'] = i
-  TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '229'
-  $floorItems['229'] = i
-  TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '227'
-  $floorItems['227'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '228'
-  $floorItems['228'] = i
-  TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '226'
-  $floorItems['226'] = i
-  TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '225'
-  $floorItems['225'] = i
-  TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '224'
-  $floorItems['224'] = i
-  TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '223'
-  $floorItems['223'] = i
-  TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '222'
-  $floorItems['222'] = i
-  TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '221'
-  $floorItems['221'] = i
-  TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '204'
-  $floorItems['204'] = i
-  TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '205'
-  $floorItems['205'] = i
-  TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '207'
-  $floorItems['207'] = i
-  TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '208'
-  $floorItems['208'] = i
-  TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '209'
-  $floorItems['209'] = i
-  TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '217'
-  $floorItems['217'] = i
-  TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '217A'
-  $floorItems['217A'] = i
-  TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '216'
-  $floorItems['216'] = i
-  TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '215'
-  $floorItems['215'] = i
-  TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '214'
-  $floorItems['214'] = i
-  TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '213'
-  $floorItems['213'] = i
-  TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '210'
-  $floorItems['210'] = i
-  TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '211'
-  $floorItems['211'] = i
-  TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '203'
-  $floorItems['203'] = i
-  TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-                     154,198,154,192,109,192,109,169,99,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '220'
-  $floorItems['220'] = i
-  TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Priv Lift2'
-  $floorItems['Priv Lift2'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Pub Lift 2'
-  $floorItems['Pub Lift 2'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '218'
-  $floorItems['218'] = i
-  TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '219'
-  $floorItems['219'] = i
-  TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '201'
-  $floorItems['201'] = i
-  TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  TkcLine.new(w,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-end
-
-# floor_fg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the third
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor_fg3(w,color)
-  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316'
-  $floorItems['316'] = i
-  TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '309'
-  $floorItems['309'] = i
-  TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '308'
-  $floorItems['308'] = i
-  TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '307'
-  $floorItems['307'] = i
-  TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '305'
-  $floorItems['305'] = i
-  TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324B'
-  $floorItems['324B'] = i
-  TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324A'
-  $floorItems['324A'] = i
-  TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '320'
-  $floorItems['320'] = i
-  TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '310'
-  $floorItems['310'] = i
-  TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '312'
-  $floorItems['312'] = i
-  TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '313'
-  $floorItems['313'] = i
-  TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '314'
-  $floorItems['314'] = i
-  TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '315'
-  $floorItems['315'] = i
-  TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316B'
-  $floorItems['316B'] = i
-  TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316A'
-  $floorItems['316A'] = i
-  TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-                     174,198,174,226,101,226,101,179,97,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '319'
-  $floorItems['319'] = i
-  TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '311'
-  $floorItems['311'] = i
-  TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '318'
-  $floorItems['318'] = i
-  TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '317'
-  $floorItems['317'] = i
-  TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '323'
-  $floorItems['323'] = i
-  TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '325'
-  $floorItems['325'] = i
-  TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '321'
-  $floorItems['321'] = i
-  TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-                     264,181,264,135,314,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '322'
-  $floorItems['322'] = i
-  TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = 'Pub Lift3'
-  $floorItems['Pub Lift3'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = 'Priv Lift3'
-  $floorItems['Priv Lift3'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '303'
-  $floorItems['303'] = i
-  TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-                     244,230,244,221,252,221,252,203,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324'
-  $floorItems['324'] = i
-  TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '304'
-  $floorItems['304'] = i
-  TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '301'
-  $floorItems['301'] = i
-  TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '327'
-  $floorItems['327'] = i
-  TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '326'
-  $floorItems['326'] = i
-  TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-                     375,274,397,274,397,248,339,248,339,242,308,242,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '302'
-  $floorItems['302'] = i
-  TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
-                     272,193,263,180,242,180,175,180,175,169,156,169,
-                     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-                     107,248,160,248,160,301,107,301,107,275,70,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '306'
-  $floorItems['306'] = i
-  TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-end
-
-# Below is the "main program" that creates the floorplan demonstration.
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($floor_demo) && $floor_demo
-  $floor_demo.destroy
-  $floor_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$floor_demo = TkToplevel.new {|w|
-  title("Floorplan Canvas Demonstration")
-  iconname("Floorplan")
-  positionWindow(w)
-  geometry('+20+20')
-  minsize(100,100)
-}
-
-base_frame = TkFrame.new($floor_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
-            'text'=>"���Υ�����ɥ��ˤϥǥ������륨�����åץ��ȼҤΥ���������ꥵ������ܥ�ȥ� (DECWRL) �δּ�꤬�񤫤줿�����Х� widget �����äƤ��ޤ�������� 3�����Ƥǡ���ˤ��Τ�����1��ʬ�����򡢤Ĥޤꤽ�δּ�꤬ɽ�������褦�ˤʤäƤ��ޤ������볬�����򤹤�ˤϡ����ξ�ǥޥ����κ��ܥ���򥯥�å����Ƥ����������ޥ��������򤵤�Ƥ��볬�ξ��ư���ȡ����β��ˤ��������ο����Ѥ�ꡢ�����ֹ椬�������ֹ�:�ץ���ȥ��ɽ������ޤ����ޤ�������ȥ�������ֹ��񤯤Ȥ��������ο����Ѥ��ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$floor_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $floor_demo
-      $floor_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'floor'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$floor_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# �ѿ�����
-$floorLabels = {}
-$floorItems = {}
-
-# canvas ����
-if $tk_version =~ /^4\.[01]/
-  $floor_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
-                                    'highlightthickness'=>2)
-  $floor_canvas = TkCanvas.new($floor_canvas_frame,
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0,
-                               'highlightthickness'=>0) {|c|
-    TkScrollbar.new(base_frame, 'orient'=>'horiz',
-                    'command'=>proc{|*args| c.xview(*args)}){|hs|
-      c.xscrollcommand(proc{|first,last| hs.set first,last})
-      pack('side'=>'bottom', 'fill'=>'x')
-    }
-    TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
-      c.yscrollcommand(proc{|first,last| vs.set first,last})
-      pack('side'=>'right', 'fill'=>'y')
-    }
-  }
-  $floor_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
-  $floor_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-else
-  TkFrame.new(base_frame) {|f|
-    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
-    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
-
-    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
-                                   'borderwidth'=>0,
-                                   'highlightthickness'=>0) {
-        xscrollcommand(proc{|first,last| h.set first,last})
-        yscrollcommand(proc{|first,last| v.set first,last})
-        pack('expand'=>'yes', 'fill'=>'both')
-      }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    }
-
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-    v.command(proc{|*args| $floor_canvas.yview(*args)})
-    h.command(proc{|*args| $floor_canvas.xview(*args)})
-  }
-end
-
-
-# Create an entry for displaying and typing in current room.
-
-$currentRoom = TkVariable.new
-$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken',
-                           'bd'=>2, 'textvariable'=>$currentRoom)
-
-# Choose colors, then fill in the floorplan.
-
-$floor_colors = {}
-if TkWinfo.depth($floor_canvas) > 1
-  $floor_colors['bg1'] = '#a9c1da'
-  $floor_colors['outline1'] = '#77889a'
-  $floor_colors['bg2'] = '#9ab0c6'
-  $floor_colors['outline2'] = '#687786'
-  $floor_colors['bg3'] = '#8ba0b3'
-  $floor_colors['outline3'] = '#596673'
-  $floor_colors['offices'] = 'Black'
-  $floor_colors['active'] = '#c4d1df'
-else
-  $floor_colors['bg1'] = 'white'
-  $floor_colors['outline1'] = 'black'
-  $floor_colors['bg2'] = 'white'
-  $floor_colors['outline2'] = 'black'
-  $floor_colors['bg3'] = 'white'
-  $floor_colors['outline3'] = 'black'
-  $floor_colors['offices'] = 'Black'
-  $floor_colors['active'] = 'black'
-end
-
-$activeFloor = ''
-floorDisplay $floor_canvas,3
-
-# Set up event bindings for canvas:
-
-$floor_canvas.itembind('floor1', '1', proc{floorDisplay $floor_canvas,1})
-$floor_canvas.itembind('floor2', '1', proc{floorDisplay $floor_canvas,2})
-$floor_canvas.itembind('floor3', '1', proc{floorDisplay $floor_canvas,3})
-$floor_canvas.itembind('room', 'Enter', proc{newRoom $floor_canvas})
-$floor_canvas.itembind('room', 'Leave', proc{$currentRoom.value = ''})
-$floor_canvas.bind('2', proc{|x,y| $floor_canvas.scan_mark x,y}, '%x %y')
-$floor_canvas.bind('B2-Motion',
-                   proc{|x,y| $floor_canvas.scan_dragto x,y}, '%x %y')
-$floor_canvas.bind('Destroy', proc{$currentRoom.unset})
-$currentRoom.value = ''
-$currentRoom.trace('w',proc{roomChanged $floor_canvas})
-
diff --git a/ext/tk/sample/demos-jp/floor2.rb b/ext/tk/sample/demos-jp/floor2.rb
deleted file mode 100644
index 92ace6b51a..0000000000
--- a/ext/tk/sample/demos-jp/floor2.rb
+++ /dev/null
@@ -1,1719 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# floorDisplay widget demo 2 (called by 'widget')
-#
-
-# floorDisplay2 --
-# Recreate the floorplan display in the canvas given by "w".  The
-# floor given by "active" is displayed on top with its office structure
-# visible.
-#
-# Arguments:
-# w -           Name of the canvas window.
-# active -      Number of active floor (1, 2, or 3).
-
-def floorDisplay2(w,active)
-  return if $activeFloor2 == active
-
-  w.delete('all')
-  $activeFloor2 = active
-
-  # First go through the three floors, displaying the backgrounds for
-  # each floor.
-
-  floor2_bg1(w,$floor2_colors['bg1'],$floor2_colors['outline1'])
-  floor2_bg2(w,$floor2_colors['bg2'],$floor2_colors['outline2'])
-  floor2_bg3(w,$floor2_colors['bg3'],$floor2_colors['outline3'])
-
-  # Raise the background for the active floor so that it's on top.
-
-  w.raise("floor#{active}")
-
-  # Create a dummy item just to mark this point in the display list,
-  # so we can insert highlights here.
-
-  w.create(TkcRectangle,0,100,1,101,'fill'=>'','outline'=>'','tags'=>'marker')
-
-  # Add the walls and labels for the active floor, along with
-  # transparent polygons that define the rooms on the floor.
-  # Make sure that the room polygons are on top.
-
-  $floorLabels2.clear
-  $floorItems2.clear
-  send("floor2_fg#{active}", w, $floor2_colors['offices'])
-  w.raise('room')
-
-  # Offset the floors diagonally from each other.
-
-  w.move('floor1', '2c', '2c')
-  w.move('floor2', '1c', '1c')
-
-  # Create items for the room entry and its label.
-  w.create(TkcWindow, 600, 100, 'anchor'=>'w', 'window'=>$floor2_entry)
-  w.create(TkcText, 600, 100, 'anchor'=>'e', 'text'=>"�����ֹ�: ")
-  w['scrollregion'] = w.bbox('all')
-end
-
-# newRoom2 --
-# This method is invoked whenever the mouse enters a room
-# in the floorplan.  It changes tags so that the current room is
-# highlighted.
-#
-# Arguments:
-# w  -          The name of the canvas window.
-
-def newRoom2(w)
-  id = w.find_withtag('current')[0]
-  $currentRoom2.value = $floorLabels2[id.id] if id != ""
-  Tk.update(true)
-end
-
-# roomChanged2 --
-# This method is invoked whenever the currentRoom variable changes.
-# It highlights the current room and unhighlights any previous room.
-#
-# Arguments:
-# w -           The canvas window displaying the floorplan.
-# args -        Not used.
-
-def roomChanged2(w,*args)
-  w.delete('highlight')
-  item = $floorItems2[$currentRoom2.value]
-  return if item == nil
-  new = TkcPolygon.new(w, *(w.coords(item)))
-  new.configure('fill'=>$floor2_colors['active'], 'tags'=>'highlight')
-  w.raise(new, 'marker')
-end
-
-# floor2_bg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor2_bg1(w,fill,outline)
-  w.create(TkcPolygon,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
-                 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
-                 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
-                 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
-                 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
-                 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
-                 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
-                 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
-                 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
-                 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
-                 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
-                 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
-                 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
-  w.create(TkcLine,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
-end
-
-# floor2_bg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor2_bg2(w,fill,outline)
-  w.create(TkcPolygon,559,129,484,129,484,162,398,162,398,129,315,129,
-                 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
-                 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
-                 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
-                 367,802,367,802,129,725,129,725,133,559,133,559,129,
-                 'tags'=>['floor2','bg'], 'fill'=>fill)
-  w.create(TkcLine,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-end
-
-# floor2_bg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor2_bg3(w,fill,outline)
-  w.create(TkcPolygon,159,300,107,300,107,248,159,248,159,129,96,129,96,
-                 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  w.create(TkcPolygon,258,370,258,329,350,329,350,311,399,311,399,129,
-                 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  w.create(TkcLine,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,107,300,159,300,159,248,107,248,107,300,
-              'fill'=>outline, 'tags'=>['floor3','bg'])
-end
-
-# floor2_fg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the first
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor2_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '101'
-  $floorItems2['101'] = i
-  w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Pub Lift1'
-  $floorItems2['Pub Lift1'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Priv Lift1'
-  $floorItems2['Priv Lift1'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '110'
-  $floorItems2['110'] = i
-  w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '109'
-  $floorItems2['109'] = i
-  w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '111'
-  $floorItems2['111'] = i
-  w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '117B'
-  $floorItems2['117B'] = i
-  w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '112'
-  $floorItems2['112'] = i
-  w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '113'
-  $floorItems2['113'] = i
-  w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '117A'
-  $floorItems2['117A'] = i
-  w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '117'
-  $floorItems2['117'] = i
-  w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '114'
-  $floorItems2['114'] = i
-  w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '115'
-  $floorItems2['115'] = i
-  w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '116'
-  $floorItems2['116'] = i
-  w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '118'
-  $floorItems2['118'] = i
-  w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-                     163,91,163,112,149,112,149,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '120'
-  $floorItems2['120'] = i
-  w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-                     156,192,156,169,175,169,175,246,79,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '122'
-  $floorItems2['122'] = i
-  w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '121'
-  $floorItems2['121'] = i
-  w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '106A'
-  $floorItems2['106A'] = i
-  w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '105'
-  $floorItems2['105'] = i
-  w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '106B'
-  $floorItems2['106B'] = i
-  w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '104'
-  $floorItems2['104'] = i
-  w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '108'
-  $floorItems2['108'] = i
-  w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '107'
-  $floorItems2['107'] = i
-  w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Smoking'
-  $floorItems2['Smoking'] = i
-  w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '123'
-  $floorItems2['123'] = i
-  w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '103'
-  $floorItems2['103'] = i
-  w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '124'
-  $floorItems2['124'] = i
-  w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '125'
-  $floorItems2['125'] = i
-  w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '126'
-  $floorItems2['126'] = i
-  w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-                     486,253,486,239,474,239,474,209,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '127'
-  $floorItems2['127'] = i
-  w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-                     490,188,490,204,476,204,476,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'MShower'
-  $floorItems2['MShower'] = i
-  w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Closet'
-  $floorItems2['Closet'] = i
-  w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'WShower'
-  $floorItems2['WShower'] = i
-  w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
-                     697,166,697,275,553,275,531,254,515,254,
-                     515,174,503,174,503,161,486,161,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '130'
-  $floorItems2['130'] = i
-  w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
-                     342,246,397,246,397,276,393,276,
-                     393,309,300,309,300,248,308,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '102'
-  $floorItems2['102'] = i
-  w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '128'
-  $floorItems2['128'] = i
-  w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
-                     552,277,561,277,561,325,510,325,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '129'
-  $floorItems2['129'] = i
-  w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-                     642,389,561,389,561,277,696,277,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '133'
-  $floorItems2['133'] = i
-  w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '132'
-  $floorItems2['132'] = i
-  w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '134'
-  $floorItems2['134'] = i
-  w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '135'
-  $floorItems2['135'] = i
-  w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
-                     304,312,396,312,396,288,400,288,404,288,
-                     409,290,413,292,418,297,421,302,422,309,
-                     421,318,417,325,411,330,405,332,397,333,
-                     344,333,340,334,336,336,335,338,332,342,
-                     331,347,332,351,334,354,336,357,341,359,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Ramona Stair'
-  $floorItems2['Ramona Stair'] = i
-  w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-                     122,28,123,32,123,68,220,68,220,87,90,87,90,23,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'University Stair'
-  $floorItems2['University Stair'] = i
-  w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
-                     358,48,363,39,365,29,348,25,335,22,321,14,
-                     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-                     227,13,223,17,221,22,220,34,260,34,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Plaza Stair'
-  $floorItems2['Plaza Stair'] = i
-  w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
-                     323,56,337,70,350,83,365,94,377,100,
-                     386,104,386,128,220,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Plaza Deck'
-  $floorItems2['Plaza Deck'] = i
-  w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '106'
-  $floorItems2['106'] = i
-  w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
-                     95,128,114,128,114,151,157,151,157,153,112,153,
-                     112,130,97,130,97,168,175,168,175,131,146,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '119'
-  $floorItems2['119'] = i
-  w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  w.create(TkcLine,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-end
-
-# floor2_fg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the second
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor2_fg2(w,color)
-  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-                     800,222,800,168,748,168,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '238'
-  $floorItems2['238'] = i
-  w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '237'
-  $floorItems2['237'] = i
-  w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
-                     643,324,643,291,641,291,641,205,696,205,
-                     696,291,694,291,694,314,715,314,715,291,
-                     715,205,755,205,755,190,724,190,724,187,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '246'
-  $floorItems2['246'] = i
-  w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '247'
-  $floorItems2['247'] = i
-  w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
-                     397,246,397,255,476,255,476,250,482,250,559,250,
-                     559,274,482,274,482,278,396,278,396,274,232,274,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '202'
-  $floorItems2['202'] = i
-  w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
-                     306,196,306,180,175,180,175,169,156,169,
-                     156,196,176,196,176,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '206'
-  $floorItems2['206'] = i
-  w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '212'
-  $floorItems2['212'] = i
-  w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '245'
-  $floorItems2['245'] = i
-  w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '244'
-  $floorItems2['244'] = i
-  w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '243'
-  $floorItems2['243'] = i
-  w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '242'
-  $floorItems2['242'] = i
-  w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = 'Barbecue Deck'
-  $floorItems2['Barbecue Deck'] = i
-  w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '240'
-  $floorItems2['240'] = i
-  w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '241'
-  $floorItems2['241'] = i
-  w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '239'
-  $floorItems2['239'] = i
-  w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '248'
-  $floorItems2['248'] = i
-  w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '236'
-  $floorItems2['236'] = i
-  w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '235'
-  $floorItems2['235'] = i
-  w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-                     572,143,579,143,579,185,626,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '234'
-  $floorItems2['234'] = i
-  w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-                     578,185,527,185,527,131,557,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '233'
-  $floorItems2['233'] = i
-  w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '230'
-  $floorItems2['230'] = i
-  w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '232'
-  $floorItems2['232'] = i
-  w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '229'
-  $floorItems2['229'] = i
-  w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '227'
-  $floorItems2['227'] = i
-  w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '228'
-  $floorItems2['228'] = i
-  w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '226'
-  $floorItems2['226'] = i
-  w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '225'
-  $floorItems2['225'] = i
-  w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '224'
-  $floorItems2['224'] = i
-  w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '223'
-  $floorItems2['223'] = i
-  w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '222'
-  $floorItems2['222'] = i
-  w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '221'
-  $floorItems2['221'] = i
-  w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '204'
-  $floorItems2['204'] = i
-  w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '205'
-  $floorItems2['205'] = i
-  w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '207'
-  $floorItems2['207'] = i
-  w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '208'
-  $floorItems2['208'] = i
-  w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '209'
-  $floorItems2['209'] = i
-  w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '217'
-  $floorItems2['217'] = i
-  w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '217A'
-  $floorItems2['217A'] = i
-  w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '216'
-  $floorItems2['216'] = i
-  w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '215'
-  $floorItems2['215'] = i
-  w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '214'
-  $floorItems2['214'] = i
-  w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '213'
-  $floorItems2['213'] = i
-  w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '210'
-  $floorItems2['210'] = i
-  w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '211'
-  $floorItems2['211'] = i
-  w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '203'
-  $floorItems2['203'] = i
-  w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-                     154,198,154,192,109,192,109,169,99,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '220'
-  $floorItems2['220'] = i
-  w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = 'Priv Lift2'
-  $floorItems2['Priv Lift2'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = 'Pub Lift 2'
-  $floorItems2['Pub Lift 2'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '218'
-  $floorItems2['218'] = i
-  w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '219'
-  $floorItems2['219'] = i
-  w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '201'
-  $floorItems2['201'] = i
-  w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  w.create(TkcLine,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-end
-
-# floor2_fg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the third
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor2_fg3(w,color)
-  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '316'
-  $floorItems2['316'] = i
-  w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '309'
-  $floorItems2['309'] = i
-  w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '308'
-  $floorItems2['308'] = i
-  w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '307'
-  $floorItems2['307'] = i
-  w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '305'
-  $floorItems2['305'] = i
-  w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '324B'
-  $floorItems2['324B'] = i
-  w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '324A'
-  $floorItems2['324A'] = i
-  w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '320'
-  $floorItems2['320'] = i
-  w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '310'
-  $floorItems2['310'] = i
-  w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '312'
-  $floorItems2['312'] = i
-  w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '313'
-  $floorItems2['313'] = i
-  w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '314'
-  $floorItems2['314'] = i
-  w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '315'
-  $floorItems2['315'] = i
-  w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '316B'
-  $floorItems2['316B'] = i
-  w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '316A'
-  $floorItems2['316A'] = i
-  w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-                     174,198,174,226,101,226,101,179,97,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '319'
-  $floorItems2['319'] = i
-  w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '311'
-  $floorItems2['311'] = i
-  w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '318'
-  $floorItems2['318'] = i
-  w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '317'
-  $floorItems2['317'] = i
-  w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '323'
-  $floorItems2['323'] = i
-  w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '325'
-  $floorItems2['325'] = i
-  w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '321'
-  $floorItems2['321'] = i
-  w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-                     264,181,264,135,314,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '322'
-  $floorItems2['322'] = i
-  w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = 'Pub Lift3'
-  $floorItems2['Pub Lift3'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = 'Priv Lift3'
-  $floorItems2['Priv Lift3'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '303'
-  $floorItems2['303'] = i
-  w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-                     244,230,244,221,252,221,252,203,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '324'
-  $floorItems2['324'] = i
-  w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '304'
-  $floorItems2['304'] = i
-  w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '301'
-  $floorItems2['301'] = i
-  w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '327'
-  $floorItems2['327'] = i
-  w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '326'
-  $floorItems2['326'] = i
-  w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-                     375,274,397,274,397,248,339,248,339,242,308,242,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '302'
-  $floorItems2['302'] = i
-  w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
-                     272,193,263,180,242,180,175,180,175,169,156,169,
-                     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-                     107,248,160,248,160,301,107,301,107,275,70,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '306'
-  $floorItems2['306'] = i
-  w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-end
-
-# Below is the "main program" that creates the floorplan demonstration.
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($floor2_demo) && $floor2_demo
-  $floor2_demo.destroy
-  $floor2_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$floor2_demo = TkToplevel.new {|w|
-  title("Floorplan Canvas Demonstration 2")
-  iconname("Floorplan2")
-  positionWindow(w)
-  geometry('+20+20')
-  minsize(100,100)
-}
-
-base_frame = TkFrame.new($floor2_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
-            'text'=>"���Υ�����ɥ��ˤϥǥ������륨�����åץ��ȼҤΥ���������ꥵ������ܥ�ȥ� (DECWRL) �δּ�꤬�񤫤줿�����Х� widget �����äƤ��ޤ�������� 3�����Ƥǡ���ˤ��Τ�����1��ʬ�����򡢤Ĥޤꤽ�δּ�꤬ɽ�������褦�ˤʤäƤ��ޤ������볬�����򤹤�ˤϡ����ξ�ǥޥ����κ��ܥ���򥯥�å����Ƥ����������ޥ��������򤵤�Ƥ��볬�ξ��ư���ȡ����β��ˤ��������ο����Ѥ�ꡢ�����ֹ椬�������ֹ�:�ץ���ȥ��ɽ������ޤ����ޤ�������ȥ�������ֹ��񤯤Ȥ��������ο����Ѥ��ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$floor2_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $floor2_demo
-      $floor2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'floor2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$floor2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# �ѿ�����
-$floorLabels2 = {}
-$floorItems2 = {}
-
-# canvas ����
-if $tk_version =~ /^4\.[01]/
-  $floor2_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
-                                    'highlightthickness'=>2)
-  $floor2_canvas = TkCanvas.new($floor2_canvas_frame,
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0,
-                               'highlightthickness'=>0) {|c|
-    TkScrollbar.new(base_frame, 'orient'=>'horiz',
-                    'command'=>proc{|*args| c.xview(*args)}){|hs|
-      c.xscrollcommand(proc{|first,last| hs.set first,last})
-      pack('side'=>'bottom', 'fill'=>'x')
-    }
-    TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
-      c.yscrollcommand(proc{|first,last| vs.set first,last})
-      pack('side'=>'right', 'fill'=>'y')
-    }
-  }
-  $floor2_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
-  $floor2_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-else
-  TkFrame.new(base_frame) {|f|
-    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
-    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
-
-    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
-                                   'borderwidth'=>0,
-                                   'highlightthickness'=>0) {
-        xscrollcommand(proc{|first,last| h.set first,last})
-        yscrollcommand(proc{|first,last| v.set first,last})
-        pack('expand'=>'yes', 'fill'=>'both')
-      }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    }
-
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-    v.command(proc{|*args| $floor2_canvas.yview(*args)})
-    h.command(proc{|*args| $floor2_canvas.xview(*args)})
-  }
-end
-
-# Create an entry for displaying and typing in current room.
-
-$currentRoom2 = TkVariable.new
-$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken',
-                           'bd'=>2, 'textvariable'=>$currentRoom2)
-
-# Choose colors, then fill in the floorplan.
-
-$floor2_colors = {}
-if TkWinfo.depth($floor2_canvas) > 1
-  $floor2_colors['bg1'] = '#a9c1da'
-  $floor2_colors['outline1'] = '#77889a'
-  $floor2_colors['bg2'] = '#9ab0c6'
-  $floor2_colors['outline2'] = '#687786'
-  $floor2_colors['bg3'] = '#8ba0b3'
-  $floor2_colors['outline3'] = '#596673'
-  $floor2_colors['offices'] = 'Black'
-  $floor2_colors['active'] = '#c4d1df'
-else
-  $floor2_colors['bg1'] = 'white'
-  $floor2_colors['outline1'] = 'black'
-  $floor2_colors['bg2'] = 'white'
-  $floor2_colors['outline2'] = 'black'
-  $floor2_colors['bg3'] = 'white'
-  $floor2_colors['outline3'] = 'black'
-  $floor2_colors['offices'] = 'Black'
-  $floor2_colors['active'] = 'black'
-end
-
-$activeFloor2 = ''
-floorDisplay2 $floor2_canvas,3
-
-# Set up event bindings for canvas:
-
-$floor2_canvas.itembind('floor1', '1', proc{floorDisplay2 $floor2_canvas,1})
-$floor2_canvas.itembind('floor2', '1', proc{floorDisplay2 $floor2_canvas,2})
-$floor2_canvas.itembind('floor3', '1', proc{floorDisplay2 $floor2_canvas,3})
-$floor2_canvas.itembind('room', 'Enter', proc{newRoom2 $floor2_canvas})
-$floor2_canvas.itembind('room', 'Leave', proc{$currentRoom2.value = ''})
-$floor2_canvas.bind('2', proc{|x,y| $floor2_canvas.scan_mark x,y}, '%x %y')
-$floor2_canvas.bind('B2-Motion',
-                   proc{|x,y| $floor2_canvas.scan_dragto x,y}, '%x %y')
-$floor2_canvas.bind('Destroy', proc{$currentRoom2.unset})
-$currentRoom2.value = ''
-$currentRoom2.trace('w',proc{roomChanged2 $floor2_canvas})
diff --git a/ext/tk/sample/demos-jp/form.rb b/ext/tk/sample/demos-jp/form.rb
deleted file mode 100644
index 84ed94de88..0000000000
--- a/ext/tk/sample/demos-jp/form.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# form widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($form_demo) && $form_demo
-  $form_demo.destroy
-  $form_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$form_demo = TkToplevel.new {|w|
-  title("Form Demonstration")
-  iconname("form")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($form_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���Υ�����ɥ��ϴ�ñ�ʥե����������ѤˤʤäƤ��ơ����ޤ��ޤʥ���ȥ�����Ϥ��Ǥ��ޤ������֤ǥ���ȥ�����ؤ����Ǥ��ޤ���"
-}
-msg.pack('side'=>'top', 'fill'=>'x')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $form_demo
-      $form_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'form'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# entry ����
-form_data = []
-(1..5).each{|i|
-  f = TkFrame.new(base_frame, 'bd'=>2)
-  e = TkEntry.new(f, 'relief'=>'sunken', 'width'=>40)
-  l = TkLabel.new(f)
-  e.pack('side'=>'right')
-  l.pack('side'=>'left')
-  form_data[i] = {'frame'=>f, 'entry'=>e, 'label'=>l}
-}
-
-# ʸ��������
-form_data[1]['label'].text('̾��:')
-form_data[2]['label'].text('����:')
-form_data[5]['label'].text('����:')
-
-# pack
-(1..5).each{|i| form_data[i]['frame'].pack('side'=>'top', 'fill'=>'x')}
-
diff --git a/ext/tk/sample/demos-jp/goldberg.rb b/ext/tk/sample/demos-jp/goldberg.rb
deleted file mode 100644
index ea521b82ec..0000000000
--- a/ext/tk/sample/demos-jp/goldberg.rb
+++ /dev/null
@@ -1,2011 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# Ruby/Tk Goldverg demo (called by 'widget')
-#
-# Based on Tcl/Tk8.5a2 widget demos.
-# The following is the original comment of TkGoldberg.tcl.
-#
-#>>##+#################################################################
-#>>#
-#>># TkGoldberg.tcl
-#>># by Keith Vetter, March 13, 2003
-#>>#
-#>># "Man will always find a difficult means to perform a simple task"
-#>># Rube Goldberg
-#>>#
-#>># Reproduced here with permission.
-#>>#
-#>>##+#################################################################
-#>>#
-#>># Keith Vetter 2003-03-21: this started out as a simple little program
-#>># but was so much fun that it grew and grew. So I apologize about the
-#>># size but I just couldn't resist sharing it.
-#>>#
-#>># This is a whizzlet that does a Rube Goldberg type animation, the
-#>># design of which comes from an New Years e-card from IncrediMail.
-#>># That version had nice sound effects which I eschewed. On the other
-#>># hand, that version was in black and white (actually dark blue and
-#>># light blue) and this one is fully colorized.
-#>>#
-#>># One thing I learned from this project is that drawing filled complex
-#>># objects on a canvas is really hard. More often than not I had to
-#>># draw each item twice--once with the desired fill color but no
-#>># outline, and once with no fill but with the outline. Another trick
-#>># is erasing by drawing with the background color. Having a flood fill
-#>># command would have been extremely helpful.
-#>>#
-#>># Two wiki pages were extremely helpful: Drawing rounded rectangles
-#>># which I generalized into Drawing rounded polygons, and regular
-#>># polygons which allowed me to convert ovals and arcs into polygons
-#>># which could then be rotated (see Canvas Rotation). I also wrote
-#>># Named Colors to aid in the color selection.
-#>>#
-#>># I could comment on the code, but it's just 26 state machines with
-#>># lots of canvas create and move calls.
-
-if defined?($goldberg_demo) && $goldberg_demo
-  $goldberg_demo.destroy
-  $goldberg_demo = nil
-end
-
-# demo toplevel widget
-$goldberg_demo = TkToplevel.new {|w|
-  title("Tk Goldberg (demonstration)")
-  iconname("goldberg")
-#  positionWindow(w)
-}
-
-base_frame = TkFrame.new($goldberg_demo).pack(:fill=>:both, :expand=>true)
-
-=begin
-# label
-msg = TkLabel.new($goldberg_demo) {
-  font 'Arial 10'
-  wraplength '4i'
-  justify 'left'
-  text "����ϡ����ʤ�����ʬ�Υ��˥᡼�����򤤤��������Ȥ����ΤˤǤ��뤫�򼨤��Ȥ��������Τ���Υǥ�Ǥ����ܡ���򥯥�å������ʪ��ư���Ϥ�ޤ���\n\n\"Man will always find a difficult means to perform a simple task\"\n - Rube Goldberg"
-}
-msg.pack('side'=>'top')
-=end
-
-=begin
-# frame
-TkFrame.new($goldberg_demo) {|frame|
-  TkButton.new(frame) {
-    text '�Ĥ���'
-    command proc{
-      tmppath = $goldberg_demo
-      $goldberg_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'goldberg'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-=end
-
-#########################################
-
-class TkGoldberg_Demo
-  def initialize(parent)
-    @parent = parent
-
-    @S = {}
-    @S['title']   = 'Tk Goldberg'
-    @S['speed']   = TkVariable.new(5)
-    @S['cnt']     = TkVariable.new(0)
-    # @S['message'] = TkVariable.new("\\nWelcome\\nto\\nRuby/Tk")
-    @S['message'] = TkVariable.new("\\n �褦������\\nRuby/Tk\\n��\\n������")
-    @S['pause']   = TkVariable.new
-    @S['details'] = TkVariable.new(true)
-
-    @S['mode'] = TkVariable.new(:MSTART, :symbol)
-    #            :MSTART, :MGO, :MPAUSE, :MSSTEP, :MBSTEP, :MDONE, :MDEBUG
-
-    #         0,  1,  2,  3,  4,  5,   6,   7,   8,   9,  10
-    @speed = [1, 10, 20, 50, 80, 100, 150, 200, 300, 400, 500]
-
-    # colors
-    @C = {}
-    @C['fg'] = 'black'
-    # @C['bg'] = 'gray75'
-    @C['bg'] = 'cornflowerblue'
-
-    @C['0'] = 'white';         @C['1a'] = 'darkgreen';   @C['1b'] = 'yellow'
-    @C['2'] = 'red';           @C['3a'] = 'green';       @C['3b'] = 'darkblue'
-    @C['4'] = @C['fg'];        @C['5a'] = 'brown';       @C['5b'] = 'white'
-    @C['6'] = 'magenta';       @C['7'] = 'green';        @C['8'] = @C['fg']
-    @C['9'] = 'blue4';         @C['10a'] = 'white';      @C['10b'] = 'cyan'
-    @C['11a'] = 'yellow';      @C['11b'] = 'mediumblue'; @C['12'] = 'tan2'
-    @C['13a'] = 'yellow';      @C['13b'] = 'red';        @C['14'] = 'white'
-    @C['15a'] = 'green';       @C['15b'] = 'yellow';     @C['16'] = 'gray65'
-    @C['17'] = '#A65353';     @C['18'] = @C['fg'];      @C['19'] = 'gray50'
-    @C['20'] = 'cyan';         @C['21'] = 'gray65';      @C['22'] = @C['20']
-    @C['23a'] = 'blue';        @C['23b'] = 'red';        @C['23c'] = 'yellow'
-    @C['24a'] = 'red';         @C['24b'] = 'white';
-
-    @STEP = TkVariable.new_hash
-    @STEP.default_value_type = :numeric
-
-    @XY = {}
-
-    @XY6 = {
-      '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192],
-      '-5'=>[340, 190], '-6'=>[349, 177], '-7'=>[366, 177], '-8'=>[380, 176],
-      '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164],
-      '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151],
-      '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219],
-      '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324],
-      '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346],
-      '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391],
-      '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456],
-      '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443],
-      '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437],
-      '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424],
-      '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412],
-      '13,15'=>[376, 410], '13,16'=>[360, 403]
-    }
-
-    @timer = TkTimer.new(@speed[@S['speed'].numeric]){|timer|
-      timer.set_interval(go)
-    }
-
-    do_display
-    reset
-
-    # Start everything going
-    @timer.start
-  end
-
-  def do_display()
-    @ctrl = TkFrame.new(@parent, :relief=>:ridge, :bd=>2, :padx=>5, :pady=>5)
-    @screen = TkFrame.new(@parent, :bd=>2,
-                         :relief=>:raised).pack(:side=>:left, :fill=>:both,
-                                                :expand=>true)
-
-    @canvas = TkCanvas.new(@parent, :width=>850, :height=>700,
-                          :bg=>@C['bg'], :highlightthickness=>0){
-      scrollregion([0, 0, 1000, 1000]) # Kludge to move everything up
-      yview_moveto(0.05)
-    }.pack(:in=>@screen, :side=>:top, :fill=>:both, :expand=>true)
-
-    @canvas.bind('3'){ @pause.invoke }
-    @canvas.bind('Destroy'){ @timer.stop }
-
-    do_ctrl_frame
-    do_detail_frame
-
-    # msg = TkLabel.new(@parent, :bg=>@C['bg'], :fg=>'white') {
-    msg = Tk::Label.new(@parent, :bg=>@C['bg'], :fg=>'white') {
-      font 'Arial 10'
-      wraplength 600
-      justify 'left'
-      text "����ϡ����ʤ�����ʬ�Υ��˥᡼�����򤤤��������Ȥ����ΤˤǤ��뤫�򼨤��Ȥ��������Τ���Υǥ�Ǥ����ܡ���򥯥�å������ʪ��ư���Ϥ�ޤ���\n\"Man will always find a difficult means to perform a simple task\" - Rube Goldberg"
-    }
-    msg.place(:in=>@canvas, :relx=>0, :rely=>0, :anchor=>:nw)
-
-    frame = TkFrame.new(@parent, :bg=>@C['bg'])
-
-    # TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-    Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-      text '�Ĥ���'
-      command proc{
-        tmppath = $goldberg_demo
-        $goldberg_demo = nil
-        tmppath.destroy
-      }
-    }.pack('side'=>'left')
-
-    # TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-    Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-      text '�����ɻ���'
-      command proc{showCode 'goldberg'}
-    }.pack('side'=>'left', 'padx'=>5)
-
-    # @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl},
-    @show = Tk::Button.new(frame, :text=>'>>', :command=>proc{show_ctrl},
-                         :bg=>@C['bg'], :activebackground=>@C['bg'])
-    @show.pack('side'=>'left')
-    frame.place(:in=>@canvas, :relx=>1, :rely=>0, :anchor=>:ne)
-
-    Tk.update
-  end
-
-  def do_ctrl_frame
-    @start = Tk::Button.new(@parent, :text=>'Start', :bd=>6,
-                          :command=>proc{do_button(0)})
-    if font = @start['font']
-      @start.font(font.weight('bold'))
-    end
-
-    @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font,
-                               :command=>proc{do_button(1)}, :relief=>:raised,
-                               :variable=>@S['pause'])
-
-    @step  = TkButton.new(@parent, :text=>'Single Step', :font=>font,
-                          :command=>proc{do_button(2)})
-    @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font,
-                          :command=>proc{do_button(4)})
-    @reset = TkButton.new(@parent, :text=>'Reset', :font=>font,
-                          :command=>proc{do_button(3)})
-
-    @details = TkFrame.new(@parent, :bd=>2, :relief=>:ridge)
-    @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font,
-                               :relief=>:raised, :variable=>@S['details'])
-
-    @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'],
-                             :justify=>:center)
-    @speed_scale = TkScale.new(@parent, :orient=>:horizontal,
-                               :from=>1, :to=>10, :font=>font,
-                               :variable=>@S['speed'], :bd=>2,
-                               :relief=>:ridge, :showvalue=>false)
-    @about = TkButton.new(@parent, :text=>'About',
-                          :command=>proc{about}, :font=>font)
-
-    Tk.grid(@start, :in=>@ctrl, :row=>0, :sticky=>:ew)
-    @ctrl.grid_rowconfigure(1, :minsize=>10)
-    Tk.grid(@pause, :in=>@ctrl, :row=>2, :sticky=>:ew)
-    Tk.grid(@step,  :in=>@ctrl, :sticky=>:ew)
-    Tk.grid(@bstep, :in=>@ctrl, :sticky=>:ew)
-    Tk.grid(@reset, :in=>@ctrl, :sticky=>:ew)
-    @ctrl.grid_rowconfigure(10, :minsize=>20)
-    Tk.grid(@details, :in=>@ctrl, :row=>11, :sticky=>:ew)
-    Tk.grid(@detail, :in=>@details, :row=>0, :sticky=>:ew)
-    @ctrl.grid_rowconfigure(50, :weight=>1)
-
-    @S['mode'].trace('w', proc{|*args| active_GUI(*args)})
-    @S['details'].trace('w', proc{|*args| active_GUI(*args)})
-    @S['speed'].trace('w', proc{|*args| active_GUI(*args)})
-
-    Tk.grid(@msg_entry, :in=>@ctrl, :row=>98, :sticky=>:ew, :pady=>5)
-    Tk.grid(@speed_scale, :in=>@ctrl, :row=>99, :sticky=>:ew)
-    Tk.grid(@about, :in=>@ctrl, :row=>100, :sticky=>:ew)
-
-    @reset.bind('3'){@S['mode'].value = -1}  # Debugging
-  end
-
-  def do_detail_frame
-    @f_details = TkFrame.new(@details)
-
-    @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'],
-                         :bd=>1, :relief=>:solid, :bg=>'white')
-    Tk.grid(@label, '-', '-', '-', :sticky=>:ew, :row=>0)
-
-    idx = 1
-    loop {
-      break unless respond_to?("move#{idx}")
-      l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e,
-                      :width=>2, :bd=>1, :relief=>:solid, :bg=>'white')
-      @STEP[idx] = 0
-      ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx),
-                       :width=>5, :bd=>1, :relief=>:solid, :bg=>'white')
-      row = (idx + 1)/2
-      col = ((idx + 1) & 1) * 2
-      Tk.grid(l, :sticky=>:ew, :row=>row, :column=>col)
-      Tk.grid(ll, :sticky=>:ew, :row=>row, :column=>(col + 1))
-      idx += 1
-    }
-    @f_details.grid_columnconfigure(1, :weight=>1)
-  end
-
-  def show_ctrl
-    if @ctrl.winfo_mapped?
-      @ctrl.pack_forget
-      @show.text('>>')
-    else
-      @ctrl.pack(:side=>:right, :fill=>:both, :ipady=>5)
-      @show.text('<<')
-    end
-  end
-
-  def draw_all
-    reset_step
-    @canvas.delete(:all)
-    idx = 0
-    loop{
-      m = "draw#{idx}"
-      break unless respond_to?(m)
-      send(m)
-      idx += 1
-    }
-  end
-
-  def active_GUI(var1, var2, op)
-    st = {false=>:disabled, true=>:normal}
-
-    m = @S['mode'].to_sym
-    @S['pause'].value = (m == :MPAUSE)
-    @start.state(st[m != :MGO])
-    @pause.state(st[m != :MSTART && m != :MDONE])
-    @step.state(st[m != :MGO && m != :MDONE])
-    @bstep.state(st[m != :MGO && m != :MDONE])
-    @reset.state(st[m != :MSTART])
-
-    if @S['details'].bool
-      Tk.grid(@f_details, :in=>@details, :row=>2, :sticky=>:ew)
-    else
-      Tk.grid_forget(@f_details)
-    end
-    @speed_scale.label("Speed: #{@S['speed'].value}")
-  end
-
-  def start
-    @S['mode'].value = :MGO
-  end
-
-  def do_button(what)
-    case what
-    when 0  # Start
-      reset if @S['mode'].to_sym == :MDONE
-      @S['mode'].value = :MGO
-
-    when 1  # Pause
-      @S['mode'].value = ((@S['pause'].bool)? :MPAUSE: :MGO)
-
-    when 2  # Step
-      @S['mode'].value = :MSSTEP
-
-    when 3  # Reset
-      reset
-
-    when 4  # Big step
-      @S['mode'].value = :MBSTEP
-    end
-  end
-
-  def go(who = nil)
-    now = Tk::Clock.clicks(:miliseconds)
-    if who  # Start here for debugging
-      @S['active'] = [who]
-      @S['mode'].value = :MGO
-    end
-    return if @S['mode'].to_sym == :MDEBUG  # Debugging
-    # If not paused, do the next move
-    n = next_step if @S['mode'].to_sym != :MPAUSE
-    @S['mode'].value = :MPAUSE if @S['mode'].to_sym == :MSSTEP  # Single step
-    @S['mode'].value = :MSSTEP if @S['mode'].to_sym == :MBSTEP && n  # big step
-    elapsed = Tk::Clock.clicks(:miliseconds) - now
-    delay = @speed[@S['speed'].to_i] - elapsed
-    delay = 1 if delay <= 0
-    return delay
-  end
-
-  def next_step
-    retval = false   # Return value
-
-    if @S['mode'].to_sym != :MSTART && @S['mode'].to_sym != :MDONE
-      @S['cnt'].numeric += 1
-    end
-    alive = []
-    @S['active'].each{|who|
-      who = who.to_i
-      n = send("move#{who}")
-      if (n & 1).nonzero?          # This guy still alive
-        alive << who
-      end
-      if (n & 2).nonzero?          # Next guy is active
-        alive << (who + 1)
-        retval = true
-      end
-      if (n & 4).nonzero?          # End of puzzle flag
-        @S['mode'].value = :MDONE  # Done mode
-        @S['active'] = []          # No more animation
-        return true
-      end
-    }
-    @S['active'] = alive
-    return retval
-  end
-
-  def about
-    msg = "Ruby/Tk Version ::\nby Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)\n\n"
-    msg += "Original Version ::\n"
-    msg += "#{@S['title']}\nby Keith Vetter, March 2003\n(Reproduced by kind permission of the author)\n\n"
-    msg += "Man will always find a difficult means to perform a simple task"
-    msg += "\nRube Goldberg"
-    Tk.messageBox(:message=>msg, :title=>'About')
-  end
-
-  ################################################################
-  #
-  # All the drawing and moving routines
-  #
-
-  # START HERE! banner
-  def draw0
-    color = @C['0']
-    TkcText.new(@canvas,
-                # [579, 119], :text=>'START HERE!',
-                [558, 119], :text=>'�������饹�����ȡ�',
-                :fill=>color, :anchor=>:w,
-                :tag=>'I0', :font=>['Times Roman', 12, :italic, :bold])
-    TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color,
-                :width=>5, :arrow=>:last, :arrowshape=>[18, 18, 5])
-    @canvas.itembind('I0', '1'){ start }
-  end
-
-  def move0(step = nil)
-    step = get_step(0, step)
-
-    if @S['mode'].to_sym != :MSTART    # Start the ball rolling
-      move_abs('I0', [-100, -100])     # Hide the banner
-      return 2
-    end
-
-    pos = [
-      [673, 119], [678, 119], [683, 119], [688, 119],
-      [693, 119], [688, 119], [683, 119], [678, 119]
-    ]
-    step = step % pos.length
-    move_abs('I0', pos[step])
-    return 1
-  end
-
-  # Dropping ball
-  def draw1
-    color = @C['1a']
-    color2 = @C['1b']
-    TkcPolygon.new(@canvas,
-                   [ 844, 133, 800, 133, 800, 346, 820, 346,
-                     820, 168, 844, 168, 844, 133 ],
-                   :width=>3, :fill=>color, :outline=>'')
-    TkcPolygon.new(@canvas,
-                   [ 771, 133, 685, 133, 685, 168, 751, 168,
-                     751, 346, 771, 346, 771, 133 ],
-                   :width=>3, :fill=>color, :outline=>'')
-    TkcOval.new(@canvas, box(812, 122, 9),
-                :tag=>'I1', :fill=>color2, :outline=>'')
-
-    @canvas.itembind('I1', '1'){ start }
-  end
-
-  def move1(step = nil)
-    step = get_step(1, step)
-    pos = [
-      [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153],
-      [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438],
-      [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601],
-      [-100, -100]
-    ]
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I1', where)
-    move15a if where[2] == :y
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Lighting the match
-  def draw2
-    color = @C['2']
-
-    # Fulcrum
-    TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392],
-                   :fill=>@C['fg'], :outline=>@C['fg'])
-
-    # Strike box
-    TkcRectangle.new(@canvas, [628, 335, 660, 383],
-                     :fill=>'', :outline=>@C['fg'])
-    (0..2).each{|y|
-      yy = 335 + y*16
-      TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25',
-                    :anchor=>:nw, :foreground=>@C['fg'])
-      TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25',
-                    :anchor=>:nw, :foreground=>@C['fg'])
-    }
-
-    # Lever
-    TkcLine.new(@canvas, [702, 366, 798, 366],
-                :fill=>@C['fg'], :width=>6, :tag=>'I2_0')
-
-    # R strap
-    TkcLine.new(@canvas, [712, 363, 712, 355],
-                :fill=>@C['fg'], :width=>3, :tag=>'I2_1')
-
-    # L strap
-    TkcLine.new(@canvas, [705, 363, 705, 355],
-                :fill=>@C['fg'], :width=>3, :tag=>'I2_2')
-
-    # Match stick
-    TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356],
-                :fill=>@C['fg'], :width=>3, :tag=>'I2_3')
-
-    # Match head
-    TkcPolygon.new(@canvas,
-                   [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1,
-                     671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ],
-                   :fill=>color, :outline=>color, :tag=>'I2_4')
-  end
-
-  def move2(step = nil)
-    step = get_step(2, step)
-
-    stages = [0, 0, 1, 2, 0, 2, 1, 0, 1, 2, 0, 2, 1]
-    xy = []
-    xy[0] = [
-      686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307,
-      662, 318, 662, 328, 671, 336
-    ]
-    xy[1] = [
-      687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311,
-      661, 327, 671, 335
-    ]
-    xy[2] = [
-      686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298,
-      666, 309, 660, 324, 672, 336
-    ]
-
-    if step >= stages.length
-      @canvas.delete('I2')
-      return 0
-    end
-
-    if step == 0  # Rotate the match
-      beta = 20
-
-      ox, oy = anchor('I2_0', :s)  # Where to pivot
-
-      i = 0
-      until @canvas.find_withtag("I2_#{i}").empty?
-        rotate_item("I2_#{i}", ox, oy, beta)
-        i += 1
-      end
-
-      # For the flame
-      TkcPolygon.new(@canvas, [], :tag=>'I2', :smooth=>true, :fill=>@C['2'])
-
-      return 1
-    end
-    @canvas.coords('I2', xy[stages[step]])
-    return ((step == 7)? 3: 1)
-  end
-
-  # Weight and pulleys
-  def draw3
-    color = @C['3a']
-    color2 = @C['3b']
-
-    xy = [ [602, 296], [577, 174], [518, 174] ]
-    xy.each{|x, y| # 3 Pulleys
-      TkcOval.new(@canvas, box(x, y, 13),
-                  :fill=>color, :outline=>@C['fg'], :width=>3)
-      TkcOval.new(@canvas, box(x, y, 2), :fill=>@C['fg'], :outline=>@C['fg'])
-    }
-
-    # Wall to flame
-    TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s',
-                :width=>3, :fill=>@C['fg'], :smooth=>true)
-
-    # Flame to pulley 1
-    TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0',
-                :width=>3, :fill=>@C['fg'], :smooth=>true)
-    TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1',
-                :width=>3, :fill=>@C['fg'], :smooth=>true)
-
-    # Pulley 1 half way to 2
-    TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2',
-                :width=>3, :fill=>@C['fg'])
-
-    # Pulley 1 other half to 2
-    TkcLine.new(@canvas, [589, 235, 589, 174], :width=>3, :fill=>@C['fg'])
-
-    # Across the top
-    TkcLine.new(@canvas, [577, 161, 518, 161], :width=>3, :fill=>@C['fg'])
-
-    # Down to weight
-    TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w',
-                :width=>3, :fill=>@C['fg'])
-
-    # Draw the weight as 2 circles, two rectangles and 1 rounded rectangle
-    x1, y1, x2, y2 = [515, 207, 495, 207]
-    TkcOval.new(@canvas, box(x1, y1, 6),
-                :tag=>'I3_', :fill=>color2, :outline=>color2)
-    TkcOval.new(@canvas, box(x2, y2, 6),
-                :tag=>'I3_', :fill=>color2, :outline=>color2)
-    TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6,
-                     :tag=>'I3_', :fill=>color2, :outline=>color2)
-
-    TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15),
-                   :smooth=>true, :tag=>'I3_', :fill=>color2, :outline=>color2)
-
-    TkcLine.new(@canvas, [500, 217, 511, 217],
-                :tag=>'I3_', :fill=>color2, :width=>10)
-
-    # Bottom weight target
-    TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465],
-                :tag=>'I3__', :fill=>@C['fg'], :joinstyle=>:miter, :width=>10)
-  end
-
-  def move3(step = nil)
-    step = get_step(3, step)
-
-    pos = [ [505, 247], [505, 297], [505, 386.5], [505, 386.5] ]
-    rope = []
-    rope[0] = [750, 309, 729, 301, 711, 324, 690, 300]
-    rope[1] = [750, 309, 737, 292, 736, 335, 717, 315, 712, 320]
-    rope[2] = [750, 309, 737, 309, 740, 343, 736, 351, 725, 340]
-    rope[3] = [750, 309, 738, 321, 746, 345, 742, 356]
-
-    return 0 if step >= pos.length
-
-    @canvas.delete("I3_#{step}")        # Delete part of the rope
-    move_abs('I3_', pos[step])          # Move weight down
-    @canvas.coords('I3_s', rope[step])  # Flapping rope end
-    @canvas.coords('I3_w', [505, 174].concat(pos[step]))
-    if step == 2
-      @canvas.move('I3__', 0, 30)
-      return 2
-    end
-    return 1
-  end
-
-  # Cage and door
-  def draw4
-    color = @C['4']
-    x0, y0, x1, y1 = [527, 356, 611, 464]
-
-    # Horizontal bars
-    y0.step(y1, 12){|y|
-      TkcLine.new(@canvas, [x0, y, x1, y], :fill=>color, :width=>1)
-    }
-
-    # Vertical bars
-    x0.step(x1, 12){|x|
-      TkcLine.new(@canvas, [x, y0, x, y1], :fill=>color, :width=>1)
-    }
-
-    # Swing gate
-    TkcLine.new(@canvas, [518, 464, 518, 428],
-                :tag=>'I4', :fill=>color, :width=>1)
-  end
-
-  def move4(step = nil)
-    step = get_step(4, step)
-
-    angles = [-10, -20, -30, -30]
-    return 0 if step >= angles.length
-
-    rotate_item('I4', 518, 464, angles[step])
-    @canvas.raise('I4')
-
-    return((step == 3)? 3: 1)
-  end
-
-  # Mouse
-  def draw5
-    color  = @C['5a']
-    color2 = @C['5b']
-
-    xy = [377, 248, 410, 248, 410, 465, 518, 465]  # Mouse course
-    xy.concat [518, 428, 451, 428, 451, 212, 377, 212]
-
-    TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], :width=>3)
-
-    xy = [
-      534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446,
-      575, 452, 574, 454, 566, 456, 554, 456, 545, 456, 537, 454, 530, 452
-    ]
-    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_0'], :fill=>color)
-
-    TkcLine.new(@canvas, [573, 452, 592, 458, 601, 460, 613, 456], # Tail
-                :tag=>['I5', 'I5_1'], :fill=>color, :smooth=>true, :width=>3)
-
-    xy = box(540, 446, 2)   # Eye
-    xy = [540, 444, 541, 445, 541, 447, 540, 448, 538, 447, 538, 445]
-    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'],
-                   :outline=>'', :smooth=>true)
-
-    xy = [538, 454, 535, 461] # Front leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_3'], :fill=>color, :width=>2)
-
-    xy = [566, 455, 569, 462] # Back leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_4'], :fill=>color, :width=>2)
-
-    xy = [544, 455, 545, 460] # 2nd front leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_5'], :fill=>color, :width=>2)
-
-    xy = [560, 455, 558, 460] # 2nd back leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_6'], :fill=>color, :width=>2)
-  end
-
-  def move5(step = nil)
-    step = get_step(5, step)
-
-    pos = [
-      [553, 452], [533, 452], [513, 452], [493, 452], [473, 452],
-      [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414],
-      [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294],
-      [422, 274, -30], [422, 260.5, -30, :x], [422.5, 248.5, -28], [425, 237]
-    ]
-
-    return 0 if step >= pos.length
-
-    x, y, beta, nxt = pos[step]
-    move_abs('I5', [x, y])
-    if beta
-      ox, oy = centroid('I5_0')
-      (0..6).each{|id| rotate_item("I5_#{id}", ox, oy, beta) }
-    end
-    return 3 if nxt == :x
-    return 1
-  end
-
-  # Dropping gumballs
-  def draw6
-    color = @C['6']
-    xy = [324, 130, 391, 204] # Ball holder
-    xy = round_rect(xy, 10)
-    TkcPolygon.new(@canvas, xy, :smooth=>true,
-                   :outline=>@C['fg'], :width=>3, :fill=>color)
-    xy = [339, 204, 376, 253] # Below the ball holder
-    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
-                     :fill=>color, :tag=>'I6c')
-    xy = box(346, 339, 28)
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'') # Roter
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
-               :start=>80, :extent=>205)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
-               :start=>-41, :extent=>85)
-
-    xy = box(346, 339, 15) # Center of rotor
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['fg'], :tag=>'I6m')
-    xy = [352, 312, 352, 254, 368, 254, 368, 322] # Top drop to rotor
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'')
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
-
-    xy = [353, 240, 367, 300] # Poke bottom hole
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
-    xy = [341, 190, 375, 210] # Poke another hole
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
-
-    xy = [
-      368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403,
-      352, 403, 352, 366
-    ]
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'',
-                   :width=>2) # Below rotor
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
-    xy = box(275, 342, 7) # On/off rotor
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['fg'])
-    xy = [276, 334, 342, 325] # Fan belt top
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = [276, 349, 342, 353] # Fan belt bottom
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-
-    xy = [337, 212, 337, 247] # What the mouse pushes
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I6_')
-    xy = [392, 212, 392, 247]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I6_')
-    xy = [337, 230, 392, 230]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>7, :tag=>'I6_')
-
-    who = -1 # All the balls
-    colors = %w(red cyan orange green blue darkblue)
-    colors *= 3
-
-    (0..16).each{|i|
-      loc = -i
-      color = colors[i]
-      x, y = @XY6["#{loc}"]
-      TkcOval.new(@canvas, box(x, y, 5),
-                  :fill=>color, :outline=>color, :tag=>"I6_b#{i}")
-    }
-    draw6a(12) # The wheel
-  end
-
-  def draw6a(beta)
-    @canvas.delete('I6_0')
-    ox, oy = [346, 339]
-    (0..3).each{|i|
-      b = beta + i * 45
-      x, y = rotate_c(28, 0, 0, 0, b)
-      xy = [ox + x, oy + y, ox - x, oy - y]
-      TkcLine.new(@canvas, xy, :tag=>'I6_0', :fill=>@C['fg'], :width=>2)
-    }
-  end
-
-  def move6(step = nil)
-    step = get_step(6, step)
-
-    return 0 if step > 62
-
-    if step < 2  # Open gate for balls to drop
-      @canvas.move('I6_', -7, 0)
-      if step == 1  # Poke a hole
-        xy = [348, 226, 365, 240]
-        TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill),
-                         :outline=>'')
-      end
-      return 1
-    end
-
-    s = step - 1  # Do the gumball drop dance
-    (0..(((s - 1)/3).to_i)).each{|i|
-      tag = "I6_b#{i}"
-      break if @canvas.find_withtag(tag).empty?
-      loc = s - 3*i
-
-      if @XY6["#{loc},#{i}"]
-        move_abs(tag, @XY6["#{loc},#{i}"])
-      elsif @XY6["#{loc}"]
-        move_abs(tag, @XY6["#{loc}"])
-      end
-    }
-    if s % 3 == 1
-      first = (s + 2)/3
-      i = first
-      loop {
-        tag = "I6_b#{i}"
-        break if @canvas.find_withtag(tag).empty?
-        loc = first - i
-        move_abs(tag, @XY6["#{loc}"])
-        i += 1
-      }
-    end
-    if s >= 3  # Rotate the motor
-      idx = s % 3
-      draw6a(12 + s * 15)
-    end
-    return((s == 3)? 3 : 1)
-  end
-
-  # On/off switch
-  def draw7
-    color = @C['7']
-    xy = [198, 306, 277, 374]  # Box
-    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2,
-                     :fill=>color, :tag=>'I7z')
-    @canvas.lower('I7z')
-    xy = [275, 343, 230, 349]
-    TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last,
-                :arrowshape=>[23, 23, 8], :width=>6)
-    xy = [225, 324]  # On button
-    x, y = xy
-    TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
-    xy = [218, 323]  # On text
-    font = ['Times Roman', 8]
-    TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e,
-                :fill=>@C['fg'], :font=>font)
-    xy = [225, 350]  # Off button
-    x, y = xy
-    TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
-    xy = [218, 349]  # Off text
-    TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e,
-                :fill=>@C['fg'], :font=>font)
-  end
-
-  def move7(step = nil)
-    step = get_step(7, step)
-
-    numsteps = 30
-    return 0 if step > numsteps
-    beta = 30.0 / numsteps
-    rotate_item('I7', 275, 343, beta)
-
-    return((step == numsteps)? 3: 1)
-  end
-
-  # Electricity to the fan
-  def draw8
-    sine([271, 248, 271, 306], 5, 8, :tag=>'I8_s', :fill=>@C['8'], :width=>3)
-  end
-
-  def move8(step = nil)
-    step = get_step(8, step)
-
-    return 0 if step > 3
-    if step == 0
-      sparkle(anchor('I8_s', :s), 'I8')
-      return 1
-    elsif step == 1
-      move_abs('I8', anchor('I8_s', :c))
-    elsif step == 2
-      move_abs('I8', anchor('I8_s', :n))
-    else
-      @canvas.delete('I8')
-    end
-    return((step == 2)? 3: 1)
-  end
-
-  # Fan
-  def draw9
-    color = @C['9']
-    xy = [266, 194, 310, 220]
-    TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
-    xy = [280, 209, 296, 248]
-    TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
-    xy = [
-      288, 249, 252, 249, 260, 240, 280, 234,
-      296, 234, 316, 240, 324, 249, 288, 249
-    ]
-    TkcPolygon.new(@canvas, xy, :fill=>color, :smooth=>true)
-
-    xy = [248, 205, 265, 214, 264, 205, 265, 196]  # Spinner
-    TkcPolygon.new(@canvas, xy, :fill=>color)
-
-    xy = [255, 206, 265, 234]  # Fan blades
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>3, :tag=>'I9_0')
-    xy = [255, 176, 265, 204]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>3, :tag=>'I9_0')
-    xy = [255, 206, 265, 220]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>1, :tag=>'I9_1')
-    xy = [255, 190, 265, 204]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>1, :tag=>'I9_1')
-  end
-
-  def move9(step = nil)
-    step = get_step(9, step)
-
-    if (step & 1).nonzero?
-      @canvas.itemconfigure('I9_0', :width=>4)
-      @canvas.itemconfigure('I9_1', :width=>1)
-      @canvas.lower('I9_1', 'I9_0')
-    else
-      @canvas.itemconfigure('I9_0', :width=>1)
-      @canvas.itemconfigure('I9_1', :width=>4)
-      @canvas.lower('I9_0', 'I9_1')
-    end
-    return 3 if step == 0
-    return 1
-  end
-
-  # Boat
-  def draw10
-    color  = @C['10a']
-    color2 = @C['10b']
-    xy = [191, 230, 233, 230, 233, 178, 191, 178]  # Sail
-    TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'],
-                   :tag=>'I10')
-    xy = box(209, 204, 31)  # Front
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie,
-               :start=>120, :extent=>120, :tag=>'I10')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>120, :extent=>120, :tag=>'I10')
-    xy = box(249, 204, 31)  # Back
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3,
-               :style=>:pie, :start=>120, :extent=>120, :tag=>'I10')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>120, :extent=>120, :tag=>'I10')
-
-    xy = [200, 171, 200, 249]  # Mast
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I10')
-    xy = [159, 234, 182, 234]  # Bow sprit
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I10')
-    xy = [180, 234, 180, 251, 220, 251]  # Hull
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>6, :tag=>'I10')
-
-    xy = [92, 255, 221, 255]  # Waves
-    sine(xy, 2, 25, :fill=>color2, :width=>1, :tag=>'I10w')
-
-    xy = @canvas.coords('I10w')[4..-5]  # Water
-    xy.concat([222, 266, 222, 277, 99, 277])
-    TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>color2)
-    xy = [222, 266, 222, 277, 97, 277, 97, 266]  # Water bottom
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-
-    xy = box(239, 262, 17)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>95, :extent=>103)
-    xy = box(76, 266, 21)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :extent=>190)
-  end
-
-  def move10(step = nil)
-    step = get_step(10, step)
-
-    pos = [
-      [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212],
-      [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212],
-      [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212],
-      [116, 212], [111, 212]
-    ]
-
-    return 0 if step >= pos.length
-
-    where = pos[step]
-    move_abs('I10', where)
-
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # 2nd ball drop
-  def draw11
-    color  = @C['11a']
-    color2 = @C['11b']
-    xy = [23, 264, 55, 591]  # Color the down tube
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
-    xy = box(71, 460, 48)    # Color the outer loop
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
-
-    xy = [55, 264, 55, 458]  # Top right side
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = [55, 504, 55, 591]  # Bottom right side
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = box(71, 460, 48)    # Outer loop
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>110, :extent=>-290, :tag=>'I11i')
-    xy = box(71, 460, 16)    # Inner loop
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'',
-                :width=>3, :tag=>'I11i')
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['bg'], :width=>3)
-
-    xy = [23, 264, 23, 591]  # Left side
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = box(1, 266, 23)     # Top left curve
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
-               :style=>:arc, :extent=>90)
-
-    xy = box(75, 235, 9)     # The ball
-    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'',
-                :width=>3, :tag=>'I11')
-  end
-
-  def move11(step = nil)
-    step = get_step(11, step)
-
-    pos = [
-      [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266],
-      [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472],
-      [100, 437], [65, 423], [-100, -100], [38, 505], [38, 527, :x], [38, 591]
-    ]
-
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I11', where)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Hand
-  def draw12
-    xy = [
-      20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590,
-      60, 590, 60, 610, 60, 610
-    ]
-    xy.concat([60, 610, 65, 620, 60, 631])  # Thumb
-    xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669,
-                56, 669, 50, 669, 50, 662, 50, 637])
-
-    y0 = 637  # Bumps for fingers
-    y1 = 645
-    50.step(21, -10){|x|
-      x1 = x - 5
-      x2 = x - 10
-      xy << x << y0 << x1 << y1 << x2 << y0
-    }
-    TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'],
-                   :smooth=>true, :tag=>'I12', :width=>3)
-  end
-
-  def move12(step = nil)
-    step = get_step(12, step)
-
-    pos = [[42.5, 641, :x]]
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I12', where)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Fax
-  def draw13
-    color = @C['13a']
-    xy = [86, 663, 149, 663, 149, 704, 50, 704, 50, 681, 64, 681, 86, 671]
-    xy2 = [
-      784, 663, 721, 663, 721, 704, 820, 704, 820, 681, 806, 681, 784, 671
-    ]
-    radii = [2, 9, 9, 8, 5, 5, 2]
-
-    round_poly(@canvas, xy, radii, :width=>3,
-               :outline=>@C['fg'], :fill=>color)
-    round_poly(@canvas, xy2, radii, :width=>3,
-               :outline=>@C['fg'], :fill=>color)
-
-    xy = [56, 677]
-    x, y = xy
-    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
-                     :width=>3, :tag=>'I13')
-    xy = [809, 677]
-    x, y = xy
-    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
-                     :width=>3, :tag=>'I13R')
-
-    xy = [112, 687]  # Label
-    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
-                :font=>['Times Roman', 12, :bold])
-    xy = [762, 687]
-    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
-                :font=>['Times Roman', 12, :bold])
-
-    xy = [138, 663, 148, 636, 178, 636]  # Paper guide
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
-    xy = [732, 663, 722, 636, 692, 636]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
-
-    sine([149, 688, 720, 688], 5, 15,
-         :tag=>'I13_s', :fill=>@C['fg'],  :width=>3)
-  end
-
-  def move13(step = nil)
-    step = get_step(13, step)
-
-    numsteps = 7
-
-    if step == numsteps + 2
-      move_abs('I13_star', [-100, -100])
-      @canvas.itemconfigure('I13R', :fill=>@C['13b'], :width=>2)
-      return 2
-    end
-    if step == 0  # Button down
-      @canvas.delete('I13')
-      sparkle([-100, -100], 'I13_star')  # Create off screen
-      return 1
-    end
-    x0, y0 = anchor('I13_s', :w)
-    x1, y1 = anchor('I13_s', :e)
-    x = x0 + (x1 - x0) * (step - 1) / numsteps.to_f
-    move_abs('I13_star', [x, y0])
-    return 1
-  end
-
-  # Paper in fax
-  def draw14
-    color = @C['14']
-    xy = [102, 661, 113, 632, 130, 618]  # Left paper edge
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14L_0')
-    xy = [148, 629, 125, 640, 124, 662]  # Right paper edge
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14L_1')
-    draw14a('L')
-
-    xy = [
-      768.0, 662.5, 767.991316225, 662.433786215, 767.926187912, 662.396880171
-    ]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14R_0')
-    @canvas.lower('I14R_0')
-    # NB. these numbers are VERY sensitive, you must start with final size
-    # and shrink down to get the values
-    xy = [
-      745.947897349, 662.428358855, 745.997829056, 662.452239237, 746.0, 662.5
-    ]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14R_1')
-    @canvas.lower('I14R_1')
-  end
-
-  def draw14a(side)
-    color = @C['14']
-    xy = @canvas.coords("I14#{side}_0")
-    xy2 = @canvas.coords("I14#{side}_1")
-    x0, y0, x1, y1, x2, y2 = xy
-    x3, y3, x4, y4, x5, y5 = xy2
-
-    zz = [
-      x0, y0, x0, y0, xy, x2, y2, x2, y2,
-      x3, y3, x3, y3, xy2, x5, y5, x5, y5
-    ].flatten
-    @canvas.delete("I14#{side}")
-    TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true,
-                   :fill=>color, :outline=>color, :width=>3)
-    @canvas.lower("I14#{side}")
-  end
-
-  def move14(step = nil)
-    step = get_step(14, step)
-
-    # Paper going down
-    sc = 0.9 - 0.05*step
-    if sc < 0.3
-      @canvas.delete('I14L')
-      return 0
-    end
-
-    ox, oy = @canvas.coords('I14L_0')
-    @canvas.scale('I14L_0', ox, oy, sc, sc)
-    ox, oy = @canvas.coords('I14L_1')[-2..-1]
-    @canvas.scale('I14L_1', ox, oy, sc, sc)
-    draw14a('L')
-
-    # Paper going up
-    sc = 0.35 + 0.05*step
-    sc = 1/sc
-
-    ox, oy = @canvas.coords('I14R_0')
-    @canvas.scale('I14R_0', ox, oy, sc, sc)
-    ox, oy = @canvas.coords('I14R_1')[-2..-1]
-    @canvas.scale('I14R_1', ox, oy, sc, sc)
-    draw14a('R')
-
-    return((step == 10)? 3: 1)
-  end
-
-  # Light beam
-  def draw15
-    color = @C['15a']
-    xy = [824, 599, 824, 585, 820, 585, 829, 585]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I15a')
-    xy = [789, 599, 836, 643]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-    xy = [778, 610, 788, 632]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-    xy = [766, 617, 776, 625]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-
-    xy = [633, 600, 681, 640]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-    xy = [635, 567, 657, 599]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
-    xy = [765, 557, 784, 583]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
-
-    sine([658, 580, 765, 580], 3, 15,
-         :tag=>'I15_s', :fill=>@C['fg'], :width=>3)
-  end
-
-  def move15a
-    color = @C['15b']
-    @canvas.scale('I15a', 824, 599, 1, 0.3)  # Button down
-    xy = [765, 621, 681, 621]
-    TkcLine.new(@canvas, xy, :dash=>'-', :width=>3, :fill=>color, :tag=>'I15')
-  end
-
-  def move15(step = nil)
-    step = get_step(15, step)
-
-    numsteps = 6
-
-    if step == numsteps + 2
-      move_abs('I15_star', [-100, -100])
-      return 2
-    end
-    if step == 0  # Break the light beam
-      sparkle([-100, -100], 'I15_star')
-      xy = [765, 621, 745, 621]
-      @canvas.coords('I15', xy)
-      return 1
-    end
-    x0, y0 = anchor('I15_s', :w)
-    x1, y1 = anchor('I15_s', :e)
-    x = x0 + (x1 - x0) * (step - 1) / numsteps.to_f
-    move_abs('I15_star', [x, y0])
-    return 1
-  end
-
-  # Bell
-  def draw16
-    color = @C['16']
-    xy = [722, 485, 791, 556]
-    TkcRectangle.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>3)
-    xy = box(752, 515, 25)  # Bell
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black',
-                :tag=>'I16b', :width=>2)
-    xy = box(752, 515, 5)   # Bell button
-    TkcOval.new(@canvas, xy, :fill=>'black', :outline=>'black', :tag=>'I16b')
-
-    xy = [784, 523, 764, 549]  # Clapper
-    TkcLine.new(@canvas, xy, :width=>3, :tag=>'I16c', :fill=>@C['fg'])
-    xy = box(784, 523, 4)
-    TkcOval.new(@canvas, xy, :fill=>@C['fg'], :outline=>@C['fg'], :tag=>'I16d')
-  end
-
-  def move16(step = nil)
-    step = get_step(16, step)
-
-    # Note: we never stop
-    ox, oy = [760, 553]
-    if (step & 1).nonzero?
-      beta = 12
-      @canvas.move('I16b', 3, 0)
-    else
-      beta = -12
-      @canvas.move('I16b', -3, 0)
-    end
-    rotate_item('I16c', ox, oy, beta)
-    rotate_item('I16d', ox, oy, beta)
-
-    return ((step == 1)? 3: 1)
-  end
-
-  # Cat
-  def draw17
-    color = @C['17']
-
-    xy = [584, 556, 722, 556]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = [584, 485, 722, 485]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-
-    xy = [664, 523, 717, 549]  # Body
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3,
-               :style=>:chord, :start=>128, :extent=>260, :tag=>'I17')
-
-    xy = [709, 554, 690, 543]  # Paw
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
-                :width=>3, :tag=>'I17')
-    xy = [657, 544, 676, 555]
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
-                :width=>3, :tag=>'I17')
-
-    xy = box(660, 535, 15)     # Lower face
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>150, :extent=>240, :tag=>'I17_')
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:chord, :start=>150, :extent=>240, :tag=>'I17_')
-    xy = [674, 529, 670, 513, 662, 521, 658, 521, 650, 513, 647, 529]  # Ears
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1,
-                   :tag=>['I17_', 'I17_c'])
-    xy = [652, 542, 628, 539]  # Whiskers
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    xy = [652, 543, 632, 545]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    xy = [652, 546, 632, 552]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-
-    xy = [668, 543, 687, 538]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                :tag=>['I17_', 'I17_w'])
-    xy = [668, 544, 688, 546]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                :tag=>['I17_', 'I17_w'])
-    xy = [668, 547, 688, 553]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                :tag=>['I17_', 'I17_w'])
-
-    xy = [649, 530, 654, 538, 659, 530]  # Left eye
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
-                :smooth=>true, :tag=>'I17')
-    xy = [671, 530, 666, 538, 661, 530]  # Right eye
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
-                :smooth=>true, :tag=>'I17')
-    xy = [655, 543, 660, 551, 665, 543]  # Mouth
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
-                :smooth=>true, :tag=>'I17')
-  end
-
-  def move17(step = nil)
-    step = get_step(17, step)
-
-    if step == 0
-      @canvas.delete('I17')  # Delete most of the cat
-      xy = [655, 543, 660, 535, 665, 543]  # Mouth
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                  :smooth=>true, :tag=>'I17_')
-      xy = box(654, 530, 4)  # Left eye
-      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
-                  :tag=>'I17_')
-      xy = box(666, 530, 4)  # Right eye
-      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
-                  :tag=>'I17_')
-
-      @canvas.move('I17_', 0, -20) # Move face up
-      xy = [652, 528, 652, 554]    # Front leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-      xy = [670, 528, 670, 554]    # 2nd front leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-
-      xy = [ # Body
-        675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525,
-        716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527,
-        668, 527, 668, 527, 675, 522, 676, 517, 677, 512
-      ]
-      TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill),
-                     :outline=>@C['fg'], :width=>3, :smooth=>true,
-                     :tag=>'I17_')
-      xy = [716, 514, 716, 554]  # Back leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-      xy = [694, 532, 694, 554]  # 2nd back leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-      xy = [715, 514, 718, 506, 719, 495, 716, 488]  # Tail
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                  :smooth=>true, :tag=>'I17_')
-
-      @canvas.raise('I17w')       # Make whiskers visible
-      @canvas.move('I17_', -5, 0) # Move away from the wall a bit
-      return 2
-    end
-    return 0
-  end
-
-  # Sling shot
-  def draw18
-    color = @C['18']
-    xy = [721, 506, 627, 506]  # Sling hold
-    TkcLine.new(@canvas, xy, :width=>4, :fill=>@C['fg'], :tag=>'I18')
-
-    xy = [607, 500, 628, 513]  # Sling rock
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :tag=>'I18a')
-
-    xy = [526, 513, 606, 507, 494, 502]  # Sling band
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>4, :tag=>'I18b')
-    xy = [485, 490, 510, 540, 510, 575, 510, 540, 535, 491]  # Sling
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>6)
-  end
-
-  def move18(step = nil)
-    step = get_step(18, step)
-
-    pos = [
-      [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x],
-      [136, 506], [16, 506], [-100, -100]
-    ]
-
-    b = []
-    b[0] = [490, 502, 719, 507, 524, 512]  # Band collapsing
-    b[1] = [
-      491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525,
-      553, 536, 538, 534, 532, 519, 529, 499
-    ]
-    b[2] = [
-      491, 503, 508, 563, 542, 533, 551, 526, 561, 539, 549, 550, 530, 500
-    ]
-    b[3] = [
-      491, 503, 508, 563, 530, 554, 541, 562, 525, 568, 519, 544, 530, 501
-    ]
-
-    return 0 if step >= pos.length
-
-    if step == 0
-      @canvas.delete('I18')
-      @canvas.itemconfigure('I18b', :smooth=>true)
-    end
-    if b[step]
-      @canvas.coords('I18b', b[step])
-    end
-
-    where = pos[step]
-    move_abs('I18a', where)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Water pipe
-  def draw19
-    color = @C['19']
-    xx = [[249, 181], [155, 118], [86, 55], [22, 0]]
-    xx.each{|x1, x2|
-      TkcRectangle.new(@canvas, x1, 453, x2, 467,
-                       :fill=>color, :outline=>'', :tag=>'I19')
-      TkcLine.new(@canvas, x1, 453, x2, 453,
-                  :fill=>@C['fg'], :width=>1) # Pipe top
-      TkcLine.new(@canvas, x1, 467, x2, 467,
-                  :fill=>@C['fg'], :width=>1) # Pipe bottom
-    }
-    @canvas.raise('I11i')
-
-    xy = box(168, 460, 16)  # Bulge by the joint
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
-               :start=>21, :extent=>136)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
-               :start=>-21, :extent=>-130)
-
-    xy = [249, 447, 255, 473]  # First joint 26x6
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-
-    xy = box(257, 433, 34)     # Bend up
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:pie, :start=>0, :extent=>-91)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>-90)
-    xy = box(257, 433, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
-               :style=>:pie, :start=>0, :extent=>-92)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>-90)
-    xy = box(257, 421, 34)     # Bend left
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:pie, :start=>0, :extent=>91)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>90)
-    xy = box(257, 421, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
-               :style=>:pie, :start=>0, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>90)
-    xy = box(243, 421, 34)     # Bend down
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:pie, :start=>90, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>90, :extent=>90)
-    xy = box(243, 421, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
-               :style=>:pie, :start=>90, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>90, :extent=>90)
-
-    xy = [270, 427, 296, 433]  # 2nd joint bottom
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [270, 421, 296, 427]  # 2nd joint top
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [249, 382, 255, 408]  # Third joint right
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [243, 382, 249, 408]  # Third joint left
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [203, 420, 229, 426]  # Last joint
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-
-    xy = box(168, 460, 6)      # Handle joint
-    TkcOval.new(@canvas, xy, :fill=>@C['fg'], :outline=>'', :tag=>'I19a')
-    xy = [168, 460, 168, 512]  # Handle bar
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>5, :tag=>'I19b')
-  end
-
-  def move19(step = nil)
-    step = get_step(19, step)
-
-     angles = [30, 30, 30]
-    return 2 if step == angles.length
-    ox, oy = centroid('I19a')
-    rotate_item('I19b', ox, oy, angles[step])
-
-    return 1
-  end
-
-  # Water pouring
-  def draw20
-    # do nothing
-  end
-
-  def move20(step = nil)
-    step = get_step(20, step)
-
-    pos  = [451, 462, 473, 484, 496, 504, 513, 523, 532]
-    freq  = [20,  40,  40,  40,  40,  40,  40,  40,  40]
-    pos = [
-      [451, 20], [462, 40], [473, 40], [484, 40], [496, 40],
-      [504, 40], [513, 40], [523, 40], [532, 40, :x]
-    ]
-    return 0 if step >= pos.length
-
-    @canvas.delete('I20')
-    where = pos[step]
-    y, f = where
-    h20(y, f)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  def h20(y, f)
-    color = @C['20']
-    @canvas.delete('I20')
-
-    sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'],
-         :width=>3, :fill=>color, :smooth=>true)
-    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
-                :fill=>color, :smooth=>1, :tag=>['I20', 'I20a'])
-    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
-                :fill=>color, :smooth=>1, :tag=>['I20', 'I20b'])
-    @canvas.move('I20a', 8, 0)
-    @canvas.move('I20b', 16, 0)
-  end
-
-  # Bucket
-  def draw21
-    color = @C['21']
-    xy = [217, 451, 244, 490]  # Right handle
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21_a')
-    xy = [201, 467, 182, 490]  # Left handle
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21_a')
-
-    xy = [245, 490, 237, 535]  # Right side
-    xy2 = [189, 535, 181, 490] # Left side
-    TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'',
-                   :tag=>['I21', 'I21f'])
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21')
-    TkcLine.new(@canvas, xy2, :fill=>@C['fg'], :width=>2, :tag=>'I21')
-
-    xy = [182, 486, 244, 498]  # Top
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2,
-                :tag=>['I21', 'I21f'])
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2,
-                :tag=>['I21', 'I21t'])
-    xy = [189, 532, 237, 540]  # Bottom
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2,
-                :tag=>['I21', 'I21b'])
-  end
-
-  def move21(step = nil)
-    step = get_step(21, step)
-
-    numsteps = 30
-    return 0 if step >= numsteps
-
-    x1, y1, x2, y2 = @canvas.coords('I21b')
-    # lx1, ly1, lx2, ly2 = @canvas.coords('I21t')
-    lx1, ly1, lx2, ly2 = [183, 492, 243, 504]
-
-    f = step / numsteps.to_f
-    y2 = y2 - 3
-    xx1 = x1 + (lx1 - x1) * f
-    yy1 = y1 + (ly1 - y1) * f
-    xx2 = x2 + (lx2 - x2) * f
-    yy2 = y2 + (ly2 - y2) * f
-
-    @canvas.itemconfigure('I21b', :fill=>@C['20'])
-    @canvas.delete('I21w')
-    TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1,
-                   :tag=>['I21', 'I21w'], :outline=>'', :fill=>@C['20'])
-    @canvas.lower('I21w', 'I21')
-    @canvas.raise('I21b')
-    @canvas.lower('I21f')
-
-    return((step == numsteps - 1)? 3: 1)
-  end
-
-  # Bucket drop
-  def draw22
-    # do nothing
-  end
-
-  def move22(step = nil)
-    step = get_step(22, step)
-    pos = [[213, 513], [213, 523], [213, 543, :x], [213, 583], [213, 593]]
-
-    @canvas.itemconfigure('I21f', :fill=>@C['22']) if step == 0
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I21', where)
-    h20(where[1], 40)
-    @canvas.delete('I21_a')  # Delete handles
-
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Blow dart
-  def draw23
-    color  = @C['23a']
-    color2 = @C['23b']
-    color3 = @C['23c']
-
-    xy = [185, 623, 253, 650]  # Block
-    TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'],
-                     :width=>2, :tag=>'I23a')
-    xy = [187, 592, 241, 623]  # Balloon
-    TkcOval.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b',
-               :style=>:arc, :start=>12, :extent=>336)
-    xy = [239, 604, 258, 589, 258, 625, 239, 610]  # Balloon nozzle
-    TkcPolygon.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23b')
-
-    xy = [285, 611, 250, 603]  # Dart body
-    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'],
-                :width=>3, :tag=>'I23d')
-    xy = [249, 596, 249, 618, 264, 607, 249, 596]  # Dart tail
-    TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'],
-                   :width=>3, :tag=>'I23d')
-    xy = [249, 607, 268, 607]  # Dart detail
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
-    xy = [285, 607, 305, 607]  # Dart needle
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
-  end
-
-  def move23(step = nil)
-    step = get_step(23, step)
-
-    pos = [
-      [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607],
-      [487, 607], [587, 607], [687, 607], [787, 607], [-100, -100]
-    ]
-
-    return 0 if step >= pos.length
-    if step <= 1
-      ox, oy = anchor('I23a', :n)
-      @canvas.scale('I23b', ox, oy, 0.9, 0.5)
-    end
-    where = pos[step]
-    move_abs('I23d', where)
-
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Balloon
-  def draw24
-    color = @C['24a']
-    xy = [366, 518, 462, 665]  # Balloon
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
-                :width=>3, :tag=>'I24')
-    xy = [414, 666, 414, 729]  # String
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I24')
-    xy = [410, 666, 404, 673, 422, 673, 418, 666]  # Nozzle
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
-                   :width=>3, :tag=>'I24')
-
-    xy = [387, 567, 390, 549, 404, 542]  # Reflections
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-    xy = [395, 568, 399, 554, 413, 547]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-    xy = [403, 570, 396, 555, 381, 553]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-    xy = [408, 564, 402, 547, 386, 545]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-  end
-
-  def move24(step = nil)
-    step = get_step(24, step)
-
-    return 0 if step > 4
-    return 2 if step == 4
-
-    if step == 0
-      @canvas.delete('I24')  # Exploding balloon
-      xy = [
-        347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594,
-        259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738,
-        436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613,
-        548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508,
-        431, 441, 431, 440, 400, 502, 347, 465, 347, 465
-      ]
-      TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'],
-                     :outline=>@C['24a'], :width=>10, :smooth=>true)
-      msg = Tk.subst(@S['message'].value)
-      TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'],
-                  :justify=>:center, :font=>['Times Roman', 18, :bold])
-      return 1
-    end
-
-    @canvas.itemconfigure('I24t', :font=>['Times Roman', 18 + 6*step, :bold])
-    @canvas.move('I24', 0, -60)
-    ox, oy = centroid('I24')
-    @canvas.scale('I24', ox, oy, 1.25, 1.25)
-    return 1
-  end
-
-  # Displaying the message
-  def move25(step = nil)
-    step = get_step(25, step)
-
-    if step == 0
-      @XY['25'] = Tk::Clock.clicks(:miliseconds)
-      return 1
-    end
-    elapsed = Tk::Clock.clicks(:miliseconds) - @XY['25']
-    return 1 if elapsed < 5000
-    return 2
-  end
-
-  # Collapsing balloon
-  def move26(step = nil)
-    step = get_step(26, step)
-
-    if step >= 3
-      @canvas.delete('I24', 'I26')
-      TkcText.new(@canvas, 430, 735, :anchor=>:s, :tag=>'I26',
-                  #:text=>'click to continue',
-                  :text=>'����å��ǥꥻ�åȤ��ޤ�',
-                  :font=>['Times Roman', 20, :bold])
-      @canvas.bind('1', proc{reset})
-      return 4
-    end
-
-    ox, oy = centroid('I24')
-    @canvas.scale('I24', ox, oy, 0.8, 0.8)
-    @canvas.move('I24', 0, 60)
-    @canvas.itemconfigure('I24t', :font=>['Times Roman', 30 - 6*step, :bold])
-    return 1
-  end
-
-  ################################################################
-  #
-  # Helper functions
-  #
-  def box(x, y, r)
-    [x - r, y - r, x + r, y + r]
-  end
-
-  def move_abs(item, xy)
-    x, y = xy
-    ox, oy = centroid(item)
-    dx = x - ox
-    dy = y - oy
-    @canvas.move(item, dx, dy)
-  end
-
-  def rotate_item(item, ox, oy, beta)
-    xy = @canvas.coords(item)
-    xy2 = []
-    0.step(xy.length - 1, 2){|idx|
-      x, y = xy[idx, 2]
-      xy2.concat(rotate_c(x, y, ox, oy, beta))
-    }
-    @canvas.coords(item, xy2)
-  end
-
-  def rotate_c(x, y, ox, oy, beta)
-    # rotates vector (ox,oy)->(x,y) by beta degrees clockwise
-
-    x -= ox    # Shift to origin
-    y -= oy
-
-    beta = beta * Math.atan(1) * 4 / 180.0        # Radians
-    xx = x * Math.cos(beta) - y * Math.sin(beta)  # Rotate
-    yy = x * Math.sin(beta) + y * Math.cos(beta)
-
-    xx += ox  # Shift back
-    yy += oy
-
-    [xx, yy]
-  end
-
-  def reset
-    draw_all
-    @canvas.bind_remove('1')
-    @S['mode'].value = :MSTART
-    @S['active'] = [0]
-  end
-
-  # Each Move## keeps its state info in STEP, this retrieves and increments it
-  def get_step(who, step)
-    if step
-      @STEP[who] = step
-    else
-      if !@STEP.exist?(who) || @STEP[who] == ""
-        @STEP[who] = 0
-      else
-        @STEP[who] += 1
-      end
-    end
-    @STEP[who]
-  end
-
-  def reset_step
-    @S['cnt'].value = 0
-    @STEP.keys.each{|k| @STEP[k] = ''}
-  end
-
-  def sine(xy0, amp, freq, opts = {})
-    x0, y0, x1, y1 = xy0
-    step = 2
-    xy = []
-    if y0 == y1  # Horizontal
-      x0.step(x1, step){|x|
-        beta = (x - x0) * 2 * Math::PI / freq
-        y = y0 + amp * Math.sin(beta)
-        xy << x << y
-      }
-    else
-      y0.step(y1, step){|y|
-        beta = (y - y0) * 2 * Math::PI / freq
-        x = x0 + amp * Math.sin(beta)
-        xy << x << y
-      }
-    end
-    TkcLine.new(@canvas, xy, opts)
-  end
-
-  def round_rect(xy, radius, opts={})
-    x0, y0, x3, y3 = xy
-    r = @canvas.winfo_pixels(radius)
-    d = 2 * r
-
-    # Make sure that the radius of the curve is less than 3/8 size of the box!
-    maxr = 0.75
-    if d > maxr * (x3 - x0)
-      d = maxr * (x3 - x0)
-    end
-    if d > maxr * (y3 - y0)
-      d = maxr * (y3 - y0)
-    end
-
-    x1 = x0 + d
-    x2 = x3 - d
-    y1 = y0 + d
-    y2 = y3 - d
-
-    xy = [x0, y0, x1, y0, x2, y0, x3, y0, x3, y1, x3, y2]
-    xy.concat([x3, y3, x2, y3, x1, y3, x0, y3, x0, y2, x0, y1])
-    return xy
-  end
-
-  def round_poly(canv, xy, radii, opts)
-    lenXY = xy.length
-    lenR = radii.length
-    if lenXY != 2*lenR
-      raise "wrong number of vertices and radii"
-    end
-
-    knots = []
-    x0 = xy[-2]; y0 = xy[-1]
-    x1 = xy[0];  y1 = xy[1]
-    xy << xy[0] << xy[1]
-
-    0.step(lenXY - 1, 2){|i|
-      radius = radii[i/2]
-      r = canv.winfo_pixels(radius)
-
-      x2 = xy[i+2];  y2 = xy[i+3]
-      z = _round_poly2(x0, y0, x1, y1, x2, y2, r)
-      knots.concat(z)
-
-      x0 = x1;  y0 = y1
-      x1 = x2;  y1 = y2
-    }
-    TkcPolygon.new(canv, knots, {:smooth=>true}.update(opts))
-  end
-
-  def _round_poly2(x0, y0, x1, y1, x2, y2, radius)
-    d = 2 * radius
-    maxr = 0.75
-
-    v1x = x0 - x1
-    v1y = y0 - y1
-    v2x = x2 - x1
-    v2y = y2 - y1
-
-    vlen1 = Math.sqrt(v1x*v1x + v1y*v1y)
-    vlen2 = Math.sqrt(v2x*v2x + v2y*v2y)
-
-    if d > maxr * vlen1
-      d = maxr * vlen1
-    end
-    if d > maxr * vlen2
-      d = maxr * vlen2
-    end
-
-    xy = []
-    xy << (x1 + d * v1x / vlen1) << (y1 + d * v1y / vlen1)
-    xy << x1 << y1
-    xy << (x1 + d * v2x / vlen2) << (y1 + d * v2y / vlen2)
-
-    return xy
-  end
-
-  def sparkle(oxy, tag)
-    xy = [
-      [299, 283], [298, 302], [295, 314], [271, 331],
-      [239, 310], [242, 292], [256, 274], [281, 273]
-    ]
-    xy.each{|x, y|
-      TkcLine.new(@canvas, 271, 304, x, y,
-                  :fill=>'white', :width=>3, :tag=>tag)
-    }
-    move_abs(tag, oxy)
-  end
-
-  def centroid(item)
-    anchor(item, :c)
-  end
-
-  def anchor(item, where)
-    x1, y1, x2, y2 = @canvas.bbox(item)
-    case(where)
-    when :n
-      y = y1
-    when :s
-      y = y2
-    else
-      y = (y1 + y2) / 2.0
-    end
-    case(where)
-    when :w
-      x = x1
-    when :e
-      x = x2
-    else
-      x = (x1 + x2) / 2.0
-    end
-    return [x, y]
-  end
-end
-
-TkGoldberg_Demo.new(base_frame)
diff --git a/ext/tk/sample/demos-jp/hello b/ext/tk/sample/demos-jp/hello
deleted file mode 100644
index 08f154d499..0000000000
--- a/ext/tk/sample/demos-jp/hello
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: euc-jp -*-
-require 'tk'
-
-TkButton.new(nil,
-	'text'=>"����ˤ��ϡ�����",
-	'command'=>proc{print "����ˤ��ϡ�����\n"; exit}
-).pack
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/hscale.rb b/ext/tk/sample/demos-jp/hscale.rb
deleted file mode 100644
index 5615aa50bd..0000000000
--- a/ext/tk/sample/demos-jp/hscale.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: euc-jp -*-
-require "tkcanvas"
-
-if defined?($hscale_demo) && $hscale_deom
-  $hscale_demo.destroy
-  $hscale_demo = nil
-end
-
-$hscale_demo = TkToplevel.new {|w|
-  title("Horizontal Scale Demonstration")
-  iconname("hscale")
-}
-positionWindow($hscale_demo)
-
-base_frame = TkFrame.new($hscale_demo).pack(:fill=>:both, :expand=>true)
-
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '3.5i'
-  justify 'left'
-  text "���ˤ������1�Ĥȿ�ʿ�ʥ������뤬ɽ������Ƥ��ޤ���\
-���������ǥޥ����ܥ���1�򥯥�å����ޤ��ϥɥ�å������\
-�����Ĺ�����Ѥ��뤳�Ȥ��Ǥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc {
-      tmppath = $hscale_demo
-      $hscale_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc { showCode 'hscale' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-def setWidth(w, width)
-  width = width + 21
-  x2 = width - 30
-  if x2 < 21
-    x2 = 21
-  end
-  w.coords 'poly',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-  w.coords 'line',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-end
-
-TkFrame.new(base_frame) {|frame|
-  canvas = TkCanvas.new(frame) {|c|
-    width 50
-    height 50
-    bd 0
-    highlightthickness 0
-    TkcPolygon.new(c, '0', '0', '1', '1', '2', '2') {
-      fill 'DeepSkyBlue'
-      tags 'poly'
-    }
-    TkcLine.new(c, '0', '0', '1', '1', '2', '2', '0', '0') {
-      fill 'black'
-      tags 'line'
-    }
-  }.pack('side'=>'top', 'expand'=>'yes', 'anchor'=>'s', 'fill'=>'x', 'padx'=>'15')
-  scale = TkScale.new(frame) {
-    orient 'horizontal'
-    length 284
-    from 0
-    to 250
-    command proc{|value| setWidth(canvas, value)}
-    tickinterval 50
-  }.pack('side'=>'bottom', 'expand'=>'yes', 'anchor'=>'n')
-  scale.set 75
-}.pack('side'=>'top', 'fill'=>'x')
diff --git a/ext/tk/sample/demos-jp/icon.rb b/ext/tk/sample/demos-jp/icon.rb
deleted file mode 100644
index 935519435b..0000000000
--- a/ext/tk/sample/demos-jp/icon.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# iconic button widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($icon_demo) && $icon_demo
-  $icon_demo.destroy
-  $icon_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$icon_demo = TkToplevel.new {|w|
-  title("Iconic Button Demonstration")
-  iconname("icon")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($icon_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "���Υ�����ɥ��ˤϥ饸���ܥ���ȥ����å��ܥ����˥ӥåȥޥåפ������ɽ������ 3 �Ĥ���ˡ�򼨤��Ƥ��ޤ������ˤ���Τ�2�ĤΥ饸���ܥ���ǡ����줾�줬���ӥåȥޥåפ�����򼨤����󥸥������ǤǤ��Ƥ��ޤ�������ˤ���Τϡ�����Ѥߤ��ɤ����ˤ�äưۤʤ������ɽ����������å��ܥ���Ǥ�����¦�ˤ���Τ�����Ѥߤ��ɤ����ˤ�ä��طʿ����Ѥ��ӥåȥޥåפ�ɽ����������å��ܥ���Ǥ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $icon_demo
-      $icon_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'icon'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# image ����
-flagup = \
-TkBitmapImage.new('file'=>[$demo_dir,'..',
-                           'images','flagup.xbm'].join(File::Separator),
-                  'maskfile'=>\
-                  [$demo_dir,'..','images','flagup.xbm'].join(File::Separator))
-flagdown = \
-TkBitmapImage.new('file'=>[$demo_dir,'..',
-                           'images','flagdown.xbm'].join(File::Separator),
-                  'maskfile'=>\
-                  [$demo_dir,'..',
-                    'images','flagdown.xbm'].join(File::Separator))
-
-# �ѿ�����
-letters = TkVariable.new
-
-# frame ����
-TkFrame.new(base_frame, 'borderwidth'=>10){|w|
-  TkFrame.new(w) {|f|
-    # TkRadioButton.new(f){
-    Tk::RadioButton.new(f){
-      bitmap '@' + [$demo_dir,'..',
-                     'images','letters.xbm'].join(File::Separator)
-      variable letters
-      value 'full'
-    }.pack('side'=>'top', 'expand'=>'yes')
-
-    # TkRadioButton.new(f){
-    Tk::RadioButton.new(f){
-      bitmap '@' + [$demo_dir,'..',
-                     'images','noletter.xbm'].join(File::Separator)
-      variable letters
-      value 'empty'
-    }.pack('side'=>'top', 'expand'=>'yes')
-
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-  # TkCheckButton.new(w) {
-  Tk::CheckButton.new(w) {
-    image flagdown
-    selectimage flagup
-    indicatoron 0
-    selectcolor self['background']
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-  # TkCheckButton.new(w) {
-  Tk::CheckButton.new(w) {
-    bitmap '@' + [$demo_dir,'..',
-                   'images','letters.xbm'].join(File::Separator)
-    indicatoron 0
-    selectcolor 'SeaGreen1'
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-}.pack('side'=>'top')
-
diff --git a/ext/tk/sample/demos-jp/image1.rb b/ext/tk/sample/demos-jp/image1.rb
deleted file mode 100644
index 10078c6c22..0000000000
--- a/ext/tk/sample/demos-jp/image1.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# two image widgets demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($image1_demo) && $image1_demo
-  $image1_demo.destroy
-  $image1_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$image1_demo = TkToplevel.new {|w|
-  title('Image Demonstration #1')
-  iconname("Image1")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($image1_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���Υǥ�Ǥ�2�ĤΥ�٥��˲����򤽤줾��ɽ�����Ƥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $image1_demo
-      $image1_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'image1'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# image ����
-image1a = \
-TkPhotoImage.new('file'=>[$demo_dir,'..',
-                          'images','earth.gif'].join(File::Separator))
-image1b = \
-TkPhotoImage.new('file'=>[$demo_dir,'..',
-                          'images','earthris.gif'].join(File::Separator))
-
-# label ����
-#[ TkLabel.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-#  TkLabel.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
-#].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
-[ Tk::Label.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-  Tk::Label.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
-].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
-
diff --git a/ext/tk/sample/demos-jp/image2.rb b/ext/tk/sample/demos-jp/image2.rb
deleted file mode 100644
index 3e8b87461f..0000000000
--- a/ext/tk/sample/demos-jp/image2.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# widget demo 'load image' (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($image2_demo) && $image2_demo
-  $image2_demo.destroy
-  $image2_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$image2_demo = TkToplevel.new {|w|
-  title('Image Demonstration #2')
-  iconname("Image2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($image2_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���Υǥ�Ǥ�Tk�� photo image ����Ѥ��Ʋ����򸫤뤳�Ȥ��Ǥ��ޤ����ǽ�˥���ȥ���ˤ˥ǥ��쥯�ȥ�̾������Ʋ����������˲��Υꥹ�ȥܥå����ˤ��Υǥ��쥯�ȥ������ɤ��뤿�ᡢ�꥿����򲡤��Ƥ������������θ塢���������򤹤뤿��˥ꥹ�ȥܥå�������Υե�����̾����֥륯��å����Ʋ�������"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $image2_demo
-      $image2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'image2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# �ѿ�����
-$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
-
-# image ����
-$image2a = TkPhotoImage.new
-
-# �ե�����̾������
-TkLabel.new(base_frame, 'text'=>'�ǥ��쥯�ȥ�:')\
-.pack('side'=>'top', 'anchor'=>'w')
-
-image2_e = TkEntry.new(base_frame) {
-  width 30
-  textvariable $dirName
-}.pack('side'=>'top', 'anchor'=>'w')
-
-TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20)\
-.pack('side'=>'top', 'anchor'=>'w')
-
-TkLabel.new(base_frame, 'text'=>'�ե�����:')\
-.pack('side'=>'top', 'anchor'=>'w')
-
-TkFrame.new(base_frame){|w|
-  s = TkScrollbar.new(w)
-  l = TkListbox.new(w) {
-    width 20
-    height 10
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| l.yview(*args)})
-  l.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
-  s.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
-  #l.insert(0,'earth.gif', 'earthris.gif', 'mickey.gif', 'teapot.ppm')
-  l.insert(0,'earth.gif', 'earthris.gif', 'teapot.ppm')
-  l.bind('Double-1', proc{|x,y| loadImage $image2a,l,x,y}, '%x %y')
-
-  image2_e.bind 'Return', proc{loadDir l}
-
-}.pack('side'=>'top', 'anchor'=>'w')
-
-# image ����
-[ TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20),
-  TkLabel.new(base_frame, 'text'=>'����:'),
-  # TkLabel.new(base_frame, 'image'=>$image2a)
-  Tk::Label.new(base_frame, 'image'=>$image2a)
-].each{|w| w.pack('side'=>'top', 'anchor'=>'w')}
-
-# �᥽�å����
-def loadDir(w)
-  w.delete(0,'end')
-  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
-    w.insert('end',File.basename(f))
-  }
-end
-
-def loadImage(img,w,x,y)
-  img.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
-end
-
diff --git a/ext/tk/sample/demos-jp/image3.rb b/ext/tk/sample/demos-jp/image3.rb
deleted file mode 100644
index 625e69a21d..0000000000
--- a/ext/tk/sample/demos-jp/image3.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-# -*- coding: euc-jp -*-
-# image3.rb
-#
-# This demonstration script creates a simple collection of widgets
-# that allow you to select and view images in a Tk label.
-#
-# widget demo 'load image' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($image3_demo) && $image3_demo
-  $image3_demo.destroy
-  $image3_demo = nil
-end
-
-# demo toplevel widget
-$image3_demo = TkToplevel.new {|w|
-  title('Image Demonstration #3')
-  iconname("Image3")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
-
-#
-def loadDir3(w)
-  w.delete(0,'end')
-  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
-    w.insert('end',File.basename(f))
-  }
-end
-
-# selectAndLoadDir3 --
-# This procedure pops up a dialog to ask for a directory to load into
-# the listobx and (if the user presses OK) reloads the directory
-# listbox from the directory named in the demo's entry.
-#
-# Arguments:
-# w -                   Name of the toplevel window of the demo.
-def selectAndLoadDir3(w, lbox)
-  dir = Tk.chooseDirectory(:initialdir=>$dirName.value,
-                           :parent=>w, :mustexist=>true)
-  if dir.length > 0
-    $dirName.value = dir
-    loadDir3(lbox)
-  end
-end
-
-def loadImage3(w,x,y)
-  $image3a.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
-end
-
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���Υǥ�Ǥ�Tk�� photo image ����Ѥ��Ʋ����� ���뤳�Ȥ��Ǥ��ޤ����ǽ�˥���ȥ���ˤ˥ǥ��쥯�ȥ�̾������Ʋ����������˲��Υꥹ�ȥܥå����ˤ��Υǥ��쥯�ȥ������ɤ��뤿�ᡢ�꥿����򲡤��Ƥ������������θ塢���������򤹤뤿��˥ꥹ�ȥܥå�������Υե�����̾����֥륯��å����Ʋ�������"
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $image3_demo
-      $image3_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'image3'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# variable
-$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
-
-# image
-begin
-  $image3a.delete
-rescue
-end
-$image3a = TkPhotoImage.new
-
-#
-image3_f = TkFrame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-image3_df = TkLabelFrame.new(base_frame, :text=>'�ǥ��쥯�ȥ�:')
-
-image3_ff = TkLabelFrame.new(base_frame, :text=>'�ե�����:',
-                             :padx=>'2m', :pady=>'2m')
-image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
-  pack(:side=>:left, :fill=>:y, :expand=>true)
-  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y,
-                                             :expand=>true))
-  insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
-  bind('Double-1', proc{|x,y| loadImage3(self, x, y)}, '%x %y')
-}
-
-image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
-  pack(:side=>:left, :fill=>:both, :padx=>'2m', :pady=>'2m', :expand=>true)
-  bind('Return', proc{loadDir3(image3_lbx)})
-}
-
-TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"�ǥ��쥯�ȥ�����",
-             :command=>proc{selectAndLoadDir3(image3_ent, image3_lbx)}) {
-  pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
-}
-
-image3_if = TkLabelFrame.new(base_frame, :text=>'���᡼��:') {|f|
-  # TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
-  Tk::Label.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
-}
-
-Tk.grid(image3_df,  '-',
-        :sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-Tk.grid(image3_ff, image3_if,
-        :sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-TkGrid.columnconfigure(image3_f, 1, :weight=>1)
-
diff --git a/ext/tk/sample/demos-jp/items.rb b/ext/tk/sample/demos-jp/items.rb
deleted file mode 100644
index 4440905db8..0000000000
--- a/ext/tk/sample/demos-jp/items.rb
+++ /dev/null
@@ -1,379 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# canvas item types widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($items_demo) && $items_demo
-  $items_demo.destroy
-  $items_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$items_demo = TkToplevel.new {|w|
-  title("Canvas Item Demonstration")
-  iconname("Items")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($items_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "���Υ�����ɥ��ˤϥ����Х� widget �����äƤ��ꡢ������ˤϥ����Х� widget �����ݡ��Ȥ����͡��ʥ����פΥ����ƥ���㤬���äƤ��ޤ������Τ褦�����Ǥ��ޤ���\n  �ܥ���-1 �ɥ�å�:\t�����ƥ��ư������\n  �ܥ���-2 �ɥ�å�:\t�����Ƥ�����ʬ�򤺤餹��\n  �ܥ���-3 �ɥ�å�:\t�ΰ��Ϥ���\n  ����ȥ�����-F:\t�ΰ�β��Υ����ƥ��ɽ�����롣"
-}.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $items_demo
-      $items_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'items'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-cvs = nil
-TkFrame.new(base_frame) {|cf|
-  # canvas ����
-  cvs = TkCanvas.new(cf) {|c|
-    focus
-    scrollregion '0c 0c 30c 24c'
-    width  '15c'
-    height '10c'
-    relief 'sunken'
-    borderwidth 2
-
-    hs = TkScrollbar.new(cf) {|s|
-      orient 'horizontal'
-      command proc{|*args| c.xview(*args)}
-      c.xscrollcommand proc{|first,last| s.set first,last}
-    }
-
-    vs = TkScrollbar.new(cf) {|s|
-      command proc{|*args| c.yview(*args)}
-      c.yscrollcommand proc{|first,last| s.set first,last}
-    }
-
-    if $tk_version =~ /^4\.[01]/
-      hs.pack('side'=>'bottom', 'fill'=>'x')
-      vs.pack('side'=>'right', 'fill'=>'y')
-      c.pack('in'=>cf, 'expand'=>'yes', 'fill'=>'both')
-
-    else
-      c.grid('in'=>cf, 'row'=>0, 'column'=>0,
-             'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      vs.grid('row'=>0, 'column'=>1,
-              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      hs.grid('row'=>1, 'column'=>0,
-              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
-      TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
-
-    end
-
-  }
-}.pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-# Display a 3x3 rectangular grid
-TkcRectangle.new(cvs, '0c', '0c', '30c', '24c', 'width'=>2)
-TkcLine.new(cvs, '0c', '8c', '30c', '8c', 'width'=>2)
-TkcLine.new(cvs, '0c', '16c', '30c', '16c', 'width'=>2)
-TkcLine.new(cvs, '10c', '0c', '10c', '24c', 'width'=>2)
-TkcLine.new(cvs, '20c', '0c', '20c', '24c', 'width'=>2)
-
-if $tk_version =~ /^4.*/
-  font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-  font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
-else
-  font1 = 'Helvetica 12'
-  font2 = 'Helvetica 24 bold'
-end
-if TkWinfo.depth($root).to_i > 1
-  blue   = 'DeepSkyBlue3'
-  red    = 'red'
-  bisque = 'bisque3'
-  green  = 'SeaGreen3'
-else
-  blue   = 'black'
-  red    = 'black'
-  bisque = 'black'
-  green  = 'black'
-end
-
-# tag ���֥������Ȥ�����
-$tag_item = TkcGroup.new(cvs)
-
-# Set up demos within each of the areas of the grid.
-TkcText.new(cvs, '5c', '.2c', 'text'=>'�饤��', 'anchor'=>'n')
-TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c',
-            'width'=>2, 'fill'=>blue, 'capstyle'=>'butt',
-            'join'=>'miter', 'tags'=>$tag_item )
-TkcLine.new(cvs, '4.67c','1c','4.67c','4c', 'arrow'=>'last', 'tags'=>$tag_item)
-TkcLine.new(cvs, '6.33c','1c','6.33c','4c', 'arrow'=>'both', 'tags'=>$tag_item)
-TkcLine.new(cvs, '5c','6c','9c','6c','9c','1c','8c','1c','8c','4.8c','8.8c',
-            '4.8c','8.8c','1.2c','8.2c','1.2c','8.2c','4.6c','8.6c','4.6c',
-            '8.6c','1.4c','8.4c','1.4c','8.4c','4.4c',
-            'width'=>3, 'fill'=>red, 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c',
-            'stipple'=>'@'+[$demo_dir,'..',
-                            'images','gray25.xbm'].join(File::Separator),
-            'arrow'=>'both', 'arrowshape'=>'15 15 7', 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
-            'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round',
-            'tags'=>$tag_item )
-
-TkcText.new(cvs, '15c', '.2c',
-            'text'=>'���� (��餫�ˤĤʤ���ľ��)', 'anchor'=>'n')
-TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c',
-            'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
-TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c',
-            'smooth'=>'on', 'arrow'=>'both', 'width'=>3, 'tags'=>$tag_item )
-TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c',
-            '16.5c','4.5c','13.5c','7.5c','12c','6c',
-            'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round',
-            'stipple'=>'@'+[$demo_dir, '..',
-                            'images', 'gray25.xbm'].join(File::Separator),
-            'fill'=>red, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '25c', '.2c', 'text'=>'¿�ѷ�', 'anchor'=>'n')
-TkcPolygon.new(cvs, '21c','1.0c','22.5c','1.75c','24c','1.0c','23.25c','2.5c',
-               '24c','4.0c','22.5c','3.25c','21c','4.0c','21.75c','2.5c',
-               'fill'=>'green', 'outline'=>'black', 'width'=>4,
-               'tags'=>$tag_item )
-TkcPolygon.new(cvs, '25c','4c','25c','4c','25c','1c','26c','1c','27c','4c',
-               '28c','1c','29c','1c','29c','4c','29c','4c',
-               'fill'=>red, 'smooth'=>'on', 'tags'=> $tag_item)
-TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
-               '28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
-               '7.5c','22c','7.5c',
-               'stipple'=>'@' + [$demo_dir, '..',
-                                 'images', 'gray25.xbm'].join(File::Separator),
-               'outline'=>'black', 'tags'=>$tag_item )
-
-TkcText.new(cvs, '5c', '8.2c', 'text'=>'���', 'anchor'=>'n')
-TkcRectangle.new(cvs, '1c','9.5c','4c','12.5c',
-                 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c',
-                 'fill'=>green, 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
-                 'stipple'=>'@'+[$demo_dir,'..',
-                                 'images','gray25.xbm'].join(File::Separator),
-                 'fill'=>blue, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '15c', '8.2c', 'text'=>'�ʱ�', 'anchor'=>'n')
-TkcOval.new(cvs, '11c','9.5c','14c','12.5c',
-                 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c',
-                 'fill'=>green, 'tags'=>$tag_item )
-TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
-                 'stipple'=>'@'+[$demo_dir,'..',
-                                 'images','gray25.xbm'].join(File::Separator),
-                 'fill'=>blue, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '25c', '8.2c', 'text'=>'�ƥ�����', 'anchor'=>'n')
-TkcRectangle.new(cvs, '22.4c','8.9c','22.6c','9.1c')
-TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c',
-            'text'=>'û���ƥ����ȡ���ɥ�åס���·�������󥫡�����(��)�����ϳƥƥ����ȤΥ��󥫡��ݥ���Ȥ򼨤���', 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '25.4c','10.9c','25.6c','11.1c')
-TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue,
-            'text'=>"�����Ĥ��ιԡ�\n���줾����Ω��\n��·����\n���ƺ�ü�����󥫡�����Ƥ��롣", 'justify'=>'center', 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '24.9c','13.9c','25.1c','14.1c')
-if $tk_version =~ /^4\.[01]/
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
-              'stipple'=>'@' + [$demo_dir, '..',
-                                'images', 'grey.5'].join(File::Separator),
-              'text'=>'Stippled characters', 'tags'=>$tag_item )
-else
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
-              'stipple'=>'gray50', 'text'=>'Stippled characters',
-              'tags'=>$tag_item )
-end
-
-TkcText.new(cvs, '5c', '16.2c', 'text'=>'��', 'anchor'=>'n')
-TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black',
-           'start'=>45, 'extent'=>270, 'style'=>'pieslice', 'tags'=>$tag_item)
-#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
-#          'outline'=>blue, 'start'=>135, 'extent'=>270,
-#          'outlinestipple'=>'@' + ['images', 'grey.25'].join(File::Separator),
-#          'tags'=>$tag_item)
-TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
-           'outline'=>blue, 'start'=>135, 'extent'=>270,
-           'outlinestipple'=>'@'+[$demo_dir, '..',
-                                  'images','gray25.xbm'].join(File::Separator),
-           'tags'=>$tag_item)
-TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice',
-           'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90,
-           'tags'=>$tag_item)
-TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
-           'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270,
-           'tags'=>$tag_item)
-
-TkcText.new(cvs, '15c', '16.2c', 'text'=>'�ӥåȥޥå�', 'anchor'=>'n')
-#TkcBitmap.new(cvs, '13c','20c',
-#             'bitmap'=>'@' + ['images', 'face'].join(File::Separator),
-#             'tags'=>$tag_item)
-TkcBitmap.new(cvs, '13c','20c',
-              'bitmap'=>'@' + [$demo_dir, '..',
-                               'images', 'face.xbm'].join(File::Separator),
-              'tags'=>$tag_item)
-#TkcBitmap.new(cvs, '17c','18.5c',
-#             'bitmap'=>'@' + ['images', 'noletters'].join(File::Separator),
-#             'tags'=>$tag_item)
-TkcBitmap.new(cvs, '17c','18.5c',
-              'bitmap'=>'@' + [$demo_dir, '..',
-                               'images', 'noletter.xbm'].join(File::Separator),
-              'tags'=>$tag_item)
-#TkcBitmap.new(cvs, '17c','21.5c',
-#             'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
-#             'tags'=>$tag_item)
-# ���η����Ǥ��ǽ
-TkcBitmap.new(cvs, '17c','21.5c') {
-  bitmap '@' + [$demo_dir, '..', 'images', 'letters.xbm'].join(File::Separator)
-  tags $tag_item
-}
-#TkcBitmap.new(cvs, '17c','21.5c') {
-#  bitmap '@' + ['images', 'letters'].join(File::Separator)
-#  tags $tag_item
-#}
-
-TkcText.new(cvs, '25c', '16.2c', 'text'=>'������ɥ�', 'anchor'=>'n')
-TkButton.new(cvs) {|b|
-  text '�����Ƥ�'
-  command proc{butPress cvs, red}
-  TkcWindow.new(cvs, '21c','18c',
-                'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
-}
-TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
-  insert 'end', '�Խ����Ƥ�'
-  TkcWindow.new(cvs, '21c','21c',
-                'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
-}
-TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c',
-            'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
-  TkcWindow.new(cvs, '28.5c','17.5c',
-                'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
-}
-TkcText.new(cvs, '21c', '17.9c', 'text'=>'�ܥ���:', 'anchor'=>'sw')
-TkcText.new(cvs, '21c', '20.9c', 'text'=>'����ȥ�:', 'anchor'=>'sw')
-TkcText.new(cvs, '28.5c', '17.4c', 'text'=>'��������:', 'anchor'=>'s')
-
-# Set up event bindings for canvas:
-cvs.itembind($tag_item, 'Any-Enter', proc{itemEnter cvs})
-cvs.itembind($tag_item, 'Any-Leave', proc{itemLeave cvs})
-cvs.bind('2', proc{|x,y| cvs.scan_mark x,y}, '%x %y')
-cvs.bind('B2-Motion', proc{|x,y| cvs.scan_dragto x,y}, '%x %y')
-cvs.bind('3', proc{|x,y| itemMark cvs,x,y}, '%x %y')
-cvs.bind('B3-Motion', proc{|x,y| itemStroke cvs,x,y}, '%x %y')
-cvs.bind('Control-f', proc{itemsUnderArea cvs})
-cvs.bind('1', proc{|x,y| itemStartDrag cvs,x,y}, '%x %y')
-cvs.bind('B1-Motion', proc{|x,y| itemDrag cvs,x,y}, '%x %y')
-# Utility methods for highlighting the item under the pointer
-
-$restoreCmd = nil
-def itemEnter (c)
-  if TkWinfo.depth(c).to_i == 1
-    $restoreCmd = nil
-    return
-  end
-  type = c.itemtype('current')
-  if type == TkcWindow
-    $restoreCmd = nil
-    return
-  end
-  if type == TkcBitmap
-    bg = (c.itemconfiginfo('current', 'background'))[4]
-    $restoreCmd = proc{c.itemconfigure 'current', 'background', bg}
-    c.itemconfigure 'current', 'background', 'SteelBlue2'
-    return
-  end
-  fill = (c.itemconfiginfo('current', 'fill'))[4]
-  if (type == TkcRectangle || type == TkcOval || type == TkcArc) && fill == []
-    outline = (c.itemconfiginfo('current', 'outline'))[4]
-    $restoreCmd = proc{c.itemconfigure 'current', 'outline', outline}
-    c.itemconfigure 'current', 'outline', 'SteelBlue2'
-  else
-    $restoreCmd = proc{c.itemconfigure 'current', 'fill', fill}
-    c.itemconfigure 'current', 'fill', 'SteelBlue2'
-  end
-end
-
-def itemLeave(c)
-  $restoreCmd.call if $restoreCmd
-end
-
-# Utility methods for stroking out a rectangle and printing what's
-# underneath the rectangle's area.
-
-def itemMark(c,x,y)
-  $areaX1 = c.canvasx(x)
-  $areaY1 = c.canvasy(y)
-  c.delete 'area'
-end
-
-def itemStroke(c,x,y)
-  x = c.canvasx(x)
-  y = c.canvasy(y)
-  if $areaX1 != x && $areaY1 != y
-    c.delete 'area'
-    c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y,
-                                              '-outline', 'black')
-    $areaX2 = x
-    $areaY2 = y
-  end
-end
-
-def itemsUnderArea(c)
-  area = c.find_withtag('area')
-  items = []
-  c.find_enclosed($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
-    items.push(i) if i.gettags.include?($tag_item)
-  }
-  print "Items enclosed by area: #{items.inspect}\n"; STDOUT.flush
-  items.clear
-  c.find_overlapping($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
-    items.push(i) if i.gettags.include?($tag_item)
-  }
-  print "Items overlapping area: #{items.inspect}\n"; STDOUT.flush
-end
-
-$areaX1 = 0
-$areaY1 = 0
-$areaX2 = 0
-$areaY2 = 0
-
-# Utility methods to support dragging of items.
-
-def itemStartDrag(c,x,y)
-  $lastX = c.canvasx(x)
-  $lastY = c.canvasy(y)
-end
-
-def itemDrag(c,x,y)
-  x = c.canvasx(x)
-  y = c.canvasy(y)
-  c.move('current', x - $lastX, y - $lastY)
-  $lastX = x
-  $lastY = y
-end
-
-# Method that's invoked when the button embedded in the canvas
-# is invoked.
-
-def butPress(w,color)
-  i = TkcText.new(w, '25c', '18.1c',
-                  'text'=>'���Ƥ�!!', 'fill'=>color, 'anchor'=>'n')
-  Tk.after(500, proc{w.delete i})
-end
diff --git a/ext/tk/sample/demos-jp/ixset b/ext/tk/sample/demos-jp/ixset
deleted file mode 100644
index 40a77f487c..0000000000
--- a/ext/tk/sample/demos-jp/ixset
+++ /dev/null
@@ -1,333 +0,0 @@
-#!/usr/bin/env ruby
-
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-
-require 'tk'
-
-class Xsettings
-  #
-  # Button actions
-  #
-  def quit
-    @root.destroy
-  end
-
-  def ok
-    writesettings
-    quit
-  end
-
-  def cancel
-    readsettings
-    dispsettings
-  end
-
-  # apply is just "writesettings"
-
-
-  #
-  # Read current settings
-  #
-  def readsettings
-    xfd = open("|xset q", 'r')
-    xfd.readlines.each{|line|
-      fields = line.chomp.strip.split(/\s+/)
-      case fields[0]
-      when "auto"
-	if fields[1] == 'repeat:'
-	  @kbdrep = fields[2]
-	  @w_kbdrep.set(@kbdrep)
-	  @kbdcli = fields[6]
-	end
-
-      when "bell"
-	@bellvol = fields[2]
-	@bellpit = fields[5]
-	@belldur = fields[8]
-
-      when "acceleration:"
-	@mouseacc = fields[1]
-	@mousethr = fields[3]
-
-      when "prefer"
-	if fields[2] == 'yes'
-	  @screenbla = 'blank'
-	else
-	  @screenbla = 'noblank'
-	end
-	@w_screenbla.set(@screenbla)
-
-      when "timeout:"
-	@screentim = fields[1]
-	@screencyc = fields[3]
-
-      end
-    }
-
-    xfd.close
-  end
-
-  #
-  # Write settings into the X server
-  #
-  def writesettings
-    @bellvol = @w_bellvol.get
-    @bellpit = @w_bellpit.get
-    @belldur = @w_belldur.get
-
-    @kbdrep = @w_kbdrep.get
-    if @kbdrep == 'on'
-      @kbdcli = @w_kbdcli.get
-    else
-      @kbdcli = 'off'
-    end
-
-    @mouseacc = @w_mouseacc.get
-    @mousethr = @w_mousethr.get
-
-    @screentim = @w_screentim.get
-    @screencyc = @w_screencyc.get
-    @screenbla = @w_screenbla.get
-
-    system("xset \
-            b #{@bellvol} #{@bellpit} #{@belldur} \
-            c #{@kbdcli} \
-            r #{@kbdrep} \
-            m #{@mouseacc} #{@mousethr} \
-            s #{@screentim} #{@screencyc} \
-            s #{@screenbla}")
-  end
-
-  #
-  # Sends all settings to the window
-  #
-  def dispsettings
-    @w_bellvol.set(@bellvol)
-    @w_bellpit.set(@bellpit)
-    @w_belldur.set(@belldur)
-
-    @w_kbdonoff.set(@w_kbdrep.get)
-    @w_kbdcli.set(@kbdcli)
-
-    @w_mouseacc.set(@mouseacc)
-    @w_mousethr.set(@mousethr)
-
-    @w_screenblank.set(@w_screenbla.get)
-    @w_screenpat.set(@w_screenbla.get)
-
-    @w_screentim.set(@screentim)
-    @w_screencyc.set(@screencyc)
-  end
-
-  #
-  # Create all windows, and pack them
-  #
-  class LabelEntry
-    def initialize(parent, text, length)
-      @frame = TkFrame.new(parent)
-      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left','expand'=>'y')
-      @entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken') {
-	pack('side'=>'left','expand'=>'y')
-      }
-    end
-    def pack(keys)
-      @frame.pack(keys)
-    end
-    def get
-      @entry.value
-    end
-    def set(value)
-      @entry.delete(0,'end')
-      @entry.insert(0, value)
-    end
-  end
-
-  def createwindows
-    win = self
-
-    #
-    # Buttons
-    #
-    buttons = TkFrame.new(@root) {|f|
-      [ TkButton.new(f, 'command'=>proc{win.ok}, 'text'=>'Ok'),
-	TkButton.new(f, 'command'=>proc{win.writesettings}, 'text'=>'Apply'),
-	TkButton.new(f, 'command'=>proc{win.cancel}, 'text'=>'Cancel'),
-	TkButton.new(f, 'command'=>proc{win.quit}, 'text'=>'Quit') ].each{|b|
-	b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5)
-      }
-    }
-
-    #
-    # Bell settings
-    #
-    bell = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(bell, 'text'=>'Bell Settings')
-    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
-			     'tickinterval'=>20, 'orient'=>'horizontal',
-			     'label'=>"Volume (%)")
-
-    f = TkFrame.new(bell)
-    @w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6)
-    @w_bellpit.pack('side'=>'left', 'padx'=>5)
-    @w_belldur = LabelEntry.new(f, "Duration (ms)", 6)
-    @w_belldur.pack('side'=>'right', 'padx'=>5)
-
-    l.pack('side'=>'top', 'expand'=>'yes')
-    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Keyboard settings
-    #
-    kbdonoff = nil
-    kbdcli = nil
-    kbd = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(kbd, 'text'=>'Keyboard Repeat Settings')
-    f = TkFrame.new(kbd)
-    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat',
-				    'onvalue'=>'on', 'offvalue'=>'off',
-				    'variable'=>@w_kbdrep ) {
-      def self.set(value)
-	if value == 'on'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
-    }
-    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
-			 'tickinterval'=>20, 'orient'=>'horizontal',
-			 'label'=>'Click Volume (%)')
-    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes')
-    l.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
-
-    #
-    # Mouse settings
-    #
-    mouse = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(mouse, 'text'=>'Mouse Settings')
-    f = TkFrame.new(mouse)
-    @w_mouseacc = LabelEntry.new(f, 'Acceleration', 3)
-    @w_mouseacc.pack('side'=>'left')
-    @w_mousethr = LabelEntry.new(f, 'Threshold (pixels)', 3)
-    @w_mousethr.pack('side'=>'right')
-    l.pack('side'=>'top')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Screen Saver settings
-    #
-    screen = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(screen, 'text'=>'Screen-saver Settings')
-    f = TkFrame.new(screen)
-    ff1 = TkFrame.new(f)
-    [ @w_screenblank = TkRadioButton.new(ff1, 'text'=>'Blank',
-					 'relief'=>'flat',
-					 'variable'=>@w_screenbla,
-					 'value'=>'blank') {
-	def self.set(value)
-	  if value == 'blank'
-	    self.select
-	  else
-	    self.deselect
-	  end
-	end
-      },
-      @w_screenpat = TkRadioButton.new(ff1, 'text'=>'Pattern',
-				       'relief'=>'flat',
-				       'variable'=>@w_screenbla,
-				       'value'=>'noblank') {
-	def self.set(value)
-	  if value != 'blank'
-	    self.select
-	  else
-	    self.deselect
-	  end
-	end
-      }
-    ].each {|w| w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w') }
-
-    ff2 = TkFrame.new(f)
-    [ @w_screentim = LabelEntry.new(ff2, 'Timeout (s)', 5),
-      @w_screencyc = LabelEntry.new(ff2, 'Cycle (s)', 5) ].each{|w|
-      w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'e')
-    }
-
-    ff1.pack('side'=>'left')
-    ff2.pack('side'=>'left')
-
-    l.pack('side'=>'top')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Main window
-    #
-    buttons.pack('side'=>'top', 'fill'=>'both')
-    bell.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    kbd.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    mouse.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    screen.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-
-    #
-    # Let the user resize our window
-    #
-    @root.minsize(10,10)
-  end
-
-  def initialize
-    @root = TkRoot.new
-
-    @kbdrep = 'on'
-    @w_kbdrep = TkVariable.new(@kbdrep)
-    def @w_kbdrep.get
-      self.value
-    end
-    def @w_kbdrep.set(val)
-      self.value=val
-    end
-
-    @kbdcli = 0
-
-    @bellvol = 100
-    @bellpit = 440
-    @belldur = 100
-
-    @mouseacc = "3/1"
-    @mousethr = 4
-
-    @screenbla = "blank"
-    @w_screenbla = TkVariable.new(@screenbla)
-    def @w_screenbla.get
-      self.value
-    end
-    def @w_screenbla.set(val)
-      self.value=val
-    end
-
-    @screentim = 600
-    @screencyc = 600
-
-    #
-    # Listen what "xset" tells us...
-    #
-    readsettings
-
-    #
-    # Create all windows
-    #
-    createwindows
-
-    #
-    # Write xset parameters
-    #
-    dispsettings
-  end
-end
-
-Xsettings.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/ixset2 b/ext/tk/sample/demos-jp/ixset2
deleted file mode 100644
index 5011dfe640..0000000000
--- a/ext/tk/sample/demos-jp/ixset2
+++ /dev/null
@@ -1,369 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: euc-jp -*-
-#
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-
-require 'tk'
-
-class Xsettings
-  #
-  # Button actions
-  #
-  def quit
-    @root.destroy
-  end
-
-  def ok
-    writesettings
-    quit
-  end
-
-  def cancel
-    readsettings
-    dispsettings
-    @btn_APPLY.state(:disabled)
-    @btn_CANCEL.state(:disabled)
-  end
-
-  # apply is just "writesettings"
-  def apply
-    writesettings
-    @btn_APPLY.state(:disabled)
-    @btn_CANCEL.state(:disabled)
-  end
-
-  #
-  # Read current settings
-  #
-  def readsettings
-    xfd = open("|xset q", 'r')
-    xfd.readlines.each{|line|
-      fields = line.chomp.strip.split(/\s+/)
-      case fields[0]
-      when "auto"
-	if fields[1] == 'repeat:'
-	  @kbdrep = fields[2]
-	  @w_kbdrep.set(@kbdrep)
-	  @kbdcli = fields[6]
-	end
-
-      when "bell"
-	@bellvol = fields[2]
-	@bellpit = fields[5]
-	@belldur = fields[8]
-
-      when "acceleration:"
-	@mouseacc = fields[1]
-	@mousethr = fields[3]
-
-      when "prefer"
-	if fields[2] == 'yes'
-	  @screenbla = 'blank'
-	else
-	  @screenbla = 'noblank'
-	end
-	@w_screenbla.set(@screenbla)
-
-      when "timeout:"
-	@screentim = fields[1]
-	@screencyc = fields[3]
-
-      end
-    }
-
-    xfd.close
-  end
-
-  #
-  # Write settings into the X server
-  #
-  def writesettings
-    @bellvol = @w_bellvol.get
-    @bellpit = @w_bellpit.get
-    @belldur = @w_belldur.get
-
-    @kbdrep = @w_kbdrep.get
-    if @kbdrep == 'on'
-      @kbdcli = @w_kbdcli.get
-    else
-      @kbdcli = 'off'
-    end
-
-    @mouseacc = @w_mouseacc.get
-    @mousethr = @w_mousethr.get
-
-    @screentim = @w_screentim.get
-    @screencyc = @w_screencyc.get
-    @screenbla = @w_screenbla.get
-
-    system("xset \
-            b #{@bellvol} #{@bellpit} #{@belldur} \
-            c #{@kbdcli} \
-            r #{@kbdrep} \
-            m #{@mouseacc} #{@mousethr} \
-            s #{@screentim} #{@screencyc} \
-            s #{@screenbla}")
-  end
-
-  #
-  # Sends all settings to the window
-  #
-  def dispsettings
-    @w_bellvol.set(@bellvol)
-    @w_bellpit.set(@bellpit)
-    @w_belldur.set(@belldur)
-
-    @w_kbdonoff.set(@w_kbdrep.get)
-    @w_kbdcli.set(@kbdcli)
-
-    @w_mouseacc.set(@mouseacc)
-    @w_mousethr.set(@mousethr)
-
-    @w_screenblank.set(@w_screenbla.get)
-    @w_screenpat.set(@w_screenbla.get)
-
-    @w_screentim.set(@screentim)
-    @w_screencyc.set(@screencyc)
-  end
-
-  #
-  # Create all windows, and pack them
-  #
-  class LabelEntry
-    def initialize(parent, text, length, range=[])
-      @frame = TkFrame.new(parent)
-      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left')
-      if range.size > 0
-	@entry = TkSpinbox.new(@frame, 'width'=>length, 'relief'=>'sunken',
-			       'from'=>range[0], 'to'=>range[1])
-      else
-	@entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken')
-      end
-      @entry.pack('side'=>'right','expand'=>'y', 'fill'=>'x')
-    end
-    def epath
-      @frame
-    end
-    def pack(keys)
-      @frame.pack(keys)
-    end
-    def get
-      @entry.value
-    end
-    def set(value)
-      @entry.delete(0,'end')
-      @entry.insert(0, value)
-    end
-  end
-
-  def createwindows
-    win = self
-
-    #
-    # Buttons
-    #
-    btn_frame = TkFrame.new(@root)
-    buttons = [
-      @btn_OK = TkButton.new(btn_frame, 'command'=>proc{win.ok},
-			     'default'=>'active', 'text'=>'λ��'),
-      @btn_APPLY = TkButton.new(btn_frame, 'command'=>proc{win.writesettings},
-				'default'=>'normal', 'text'=>'Ŭ��',
-				'state'=>'disabled'),
-      @btn_CANCEL = TkButton.new(btn_frame, 'command'=>proc{win.cancel},
-				 'default'=>'normal', 'text'=>'���',
-				'state'=>'disabled'),
-      @btn_QUIT = TkButton.new(btn_frame, 'command'=>proc{win.quit},
-			       'default'=>'normal', 'text'=>'���')
-    ]
-    buttons.each{|b| b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5) }
-
-    @root.bind('Return', proc{@btn_OK.flash; @btn_OK.invoke})
-    @root.bind('Escape', proc{@btn_QUIT.flash; @btn_QUIT.invoke})
-    @root.bind('1', proc{|w|
-		 unless buttons.index(w)
-		   @btn_APPLY.state(:normal)
-		   @btn_CANCEL.state(:normal)
-		 end
-	       }, '%W')
-    @root.bind('Key', proc{|w, k|
-		 unless buttons.index(w)
-		   case k
-		   when 'Return', 'Escape', 'Tab', /.*Shift.*/
-		     # do nothing
-		   else
-		     @btn_APPLY.state(:normal)
-		     @btn_CANCEL.state(:normal)
-		   end
-		 end
-	       }, '%W %K')
-
-    #
-    # Bell settings
-    #
-    bell = TkLabelframe.new(@root, 'text'=>'�٥�����',
-			    'padx'=>'1.5m', 'pady'=>'1.5m')
-    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
-			     'tickinterval'=>20, 'orient'=>'horizontal',
-			     'label'=>"���� (%)")
-
-    f = TkFrame.new(bell)
-    @w_bellpit = LabelEntry.new(f, "���� (Hz)", 6, [25, 20000])
-    @w_bellpit.pack('side'=>'left', 'padx'=>5)
-    @w_belldur = LabelEntry.new(f, "��³���� (ms)", 6, [1, 10000])
-    @w_belldur.pack('side'=>'right', 'padx'=>5)
-
-    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Keyboard settings
-    #
-    kbdonoff = nil
-    kbdcli = nil
-    kbd = TkLabelframe.new(@root, 'text'=>'�����ܡ��ɥ�ԡ�������',
-			   'padx'=>'1.5m', 'pady'=>'1.5m')
-    f = TkFrame.new(kbd)
-    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'����å�������',
-				    'relief'=>'flat',
-				    'onvalue'=>'on', 'offvalue'=>'off',
-				    'variable'=>@w_kbdrep ) {
-      def self.set(value)
-	if value == 'on'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x', 'padx'=>[0, '1m'])
-    }
-    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
-			 'tickinterval'=>20, 'orient'=>'horizontal',
-			 'label'=>'����å����� (%)')
-    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes',
-		   'fill'=>'x', 'padx'=>['1m', 0])
-    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
-
-    #
-    # Mouse settings
-    #
-    mouse = TkLabelframe.new(@root, 'text'=>'�ޥ�������',
-			     'padx'=>'1.5m', 'pady'=>'1.5m')
-    f = TkFrame.new(mouse)
-    @w_mouseacc = LabelEntry.new(f, '��®��', 5)
-    @w_mouseacc.pack('side'=>'left', 'padx'=>[0, '1m'])
-    @w_mousethr = LabelEntry.new(f, '���� (pixels)', 3, [1, 2000])
-    @w_mousethr.pack('side'=>'right', 'padx'=>['1m', 0])
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Screen Saver settings
-    #
-    screen = TkLabelframe.new(@root, 'text'=>'�����꡼�󥻡�������',
-			     'padx'=>'1.5m', 'pady'=>'1.5m')
-    @w_screenblank = TkRadioButton.new(screen, 'text'=>'�֥��ɽ��',
-				       'relief'=>'flat', 'anchor'=>'w',
-				       'variable'=>@w_screenbla,
-				       'value'=>'blank') {
-      def self.set(value)
-	if value == 'blank'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-    }
-
-    @w_screenpat = TkRadioButton.new(screen, 'text'=>'�ѥ�����ɽ��',
-				     'relief'=>'flat', 'anchor'=>'w',
-				     'variable'=>@w_screenbla,
-				     'value'=>'noblank') {
-      def self.set(value)
-	if value != 'blank'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-    }
-
-    @w_screentim = LabelEntry.new(screen, '�����ॢ���� (s)', 5, [1, 100000])
-    @w_screencyc = LabelEntry.new(screen, '���� (s)', 5, [1, 100000])
-
-    Tk.grid(@w_screenblank, @w_screentim, 'sticky'=>'e')
-    Tk.grid(@w_screenpat, @w_screencyc, 'sticky'=>'e')
-    TkGrid.configure(@w_screenblank, @w_screenpat, 'sticky'=>'ew')
-
-    #
-    # Main window
-    #
-    param = {
-      'side'=>'top', 'fill'=>'both', 'expand'=>'yes',
-      'padx'=>'1m', 'pady'=>'1m'
-    }
-    btn_frame.pack('side'=>'top', 'fill'=>'both')
-    bell.pack(param)
-    kbd.pack(param)
-    mouse.pack(param)
-    screen.pack(param)
-
-    #
-    # Let the user resize our window
-    #
-    @root.minsize(10,10)
-  end
-
-  def initialize(title)
-    @root = TkRoot.new('title'=>title)
-
-    @kbdrep = 'on'
-    @w_kbdrep = TkVariable.new(@kbdrep)
-    def @w_kbdrep.get
-      self.value
-    end
-    def @w_kbdrep.set(val)
-      self.value=val
-    end
-
-    @kbdcli = 0
-
-    @bellvol = 100
-    @bellpit = 440
-    @belldur = 100
-
-    @mouseacc = "3/1"
-    @mousethr = 4
-
-    @screenbla = "blank"
-    @w_screenbla = TkVariable.new(@screenbla)
-    def @w_screenbla.get
-      self.value
-    end
-    def @w_screenbla.set(val)
-      self.value=val
-    end
-
-    @screentim = 600
-    @screencyc = 600
-
-    #
-    # Listen what "xset" tells us...
-    #
-    readsettings
-
-    #
-    # Create all windows
-    #
-    createwindows
-
-    #
-    # Write xset parameters
-    #
-    dispsettings
-  end
-end
-
-Xsettings.new(File.basename($0,'.rb'))
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/knightstour.rb b/ext/tk/sample/demos-jp/knightstour.rb
deleted file mode 100644
index ae0f13076e..0000000000
--- a/ext/tk/sample/demos-jp/knightstour.rb
+++ /dev/null
@@ -1,273 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# Based on the widget demo of Tcl/Tk8.5.2
-# The following is the original copyright text.
-#----------------------------------------------------------------------------
-# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
-#
-#	Calculate a Knight's tour of a chessboard.
-#
-#	This uses Warnsdorff's rule to calculate the next square each
-#	time. This specifies that the next square should be the one that
-#	has the least number of available moves.
-#
-#	Using this rule it is possible to get to a position where
-#	there are no squares available to move into. In this implementation
-#	this occurs when the starting square is d6.
-#
-#	To solve this fault an enhancement to the rule is that if we
-#	have a choice of squares with an equal score, we should choose
-#	the one nearest the edge of the board.
-#
-#	If the call to the Edgemost function is commented out you can see
-#	this occur.
-#
-#	You can drag the knight to a specific square to start if you wish.
-#	If you let it repeat then it will choose random start positions
-#	for each new tour.
-#----------------------------------------------------------------------------
-require 'tk'
-
-class Knights_Tour
-  # Return a list of accessible squares from a given square
-  def valid_moves(square)
-    moves = []
-    [
-      [-1,-2], [-2,-1], [-2,1], [-1,2], [1,2], [2,1], [2,-1], [1,-2]
-    ].each{|col_delta, row_delta|
-      col = (square % 8) + col_delta
-      row = (square.div(8)) + row_delta
-      moves << (row * 8 + col) if row > -1 && row < 8 && col > -1 && col < 8
-    }
-    moves
-  end
-
-  # Return the number of available moves for this square
-  def check_square(square)
-    valid_moves(square).find_all{|pos| ! @visited.include?(pos)}.length
-  end
-
-  # Select the next square to move to. Returns -1 if there are no available
-  # squares remaining that we can move to.
-  def next_square(square)
-    minimum = 9
-    nxt = -1
-    valid_moves(square).each{|pos|
-      unless @visited.include?(pos)
-        cnt = check_square(pos)
-        if cnt < minimum
-          minimum = cnt
-          nxt = pos
-        elsif cnt == minimum
-          nxt = edgemost(nxt, pos)
-        end
-      end
-    }
-    nxt
-  end
-
-  # Select the square nearest the edge of the board
-  def edgemost(nxt, pos)
-    col_A = 3 - ((3.5 - nxt % 8).abs.to_i)
-    col_B = 3 - ((3.5 - pos % 8).abs.to_i)
-    row_A = 3 - ((3.5 - nxt.div(8)).abs.to_i)
-    row_B = 3 - ((3.5 - pos.div(8)).abs.to_i)
-    (col_A * row_A < col_B * row_B)? nxt : pos
-  end
-
-  # Display a square number as a standard chess square notation.
-  def _N(square)
-    '%c%d' % [(97 + square % 8), (square.div(8) + 1)]
-  end
-
-  # Perform a Knight's move and schedule the next move.
-  def move_piece(last, square)
-    @log.insert(:end, "#{@visited.length}. #{_N last} -> #{_N square}\n", '')
-    @log.see(:end)
-    @board.itemconfigure(1+last, :state=>:normal, :outline=>'black')
-    @board.itemconfigure(1+square, :state=>:normal, :outline=>'red')
-    @knight.coords(@board.coords(1+square)[0..1])
-    @visited << square
-    if (nxt = next_square(square)) != -1
-      @after_id = Tk.after(@delay.numeric){move_piece(square, nxt) rescue nil}
-    else
-      @start_btn.state :normal
-      if @visited.length == 64
-        if @initial == square
-          @log.insert :end, '��ͷ(closed tour)������'
-        else
-          @log.insert :end, "����\n", {}
-          Tk.after(@delay.numeric * 2){tour(rand(64))} if @continuous.bool
-        end
-      else
-        @log.insert :end, "���ԡ�\n", {}
-      end
-    end
-  end
-
-  # Begin a new tour of the board given a random start position
-  def tour(square = nil)
-    @visited.clear
-    @log.clear
-    @start_btn.state :disabled
-    1.upto(64){|n|
-      @board.itemconfigure(n, :state=>:disabled, :outline=>'black')
-    }
-    unless square
-      square = @board.find_closest(*(@knight.coords << 0 << 65))[0].to_i - 1
-    end
-    @initial = square
-    Tk.after_idle{ move_piece(@initial, @initial) rescue nil }
-  end
-
-  def _stop
-    Tk.after_cancel(@after_id) rescue nil
-  end
-
-  def _exit
-    _stop
-    $knightstour.destroy
-  end
-
-  def set_delay(new)
-    @delay.numeric = new.to_i
-  end
-
-  def drag_start(w, x, y)
-    w.dtag('selected')
-    w.addtag('selected', :withtag, 'current')
-    @dragging = [x, y]
-  end
-
-  def drag_motion(w, x, y)
-    return unless @dragging
-    w.move('selected', x - @dragging[0], y - @dragging[1])
-    @dragging = [x, y]
-  end
-
-  def drag_end(w, x, y)
-    square = w.find_closest(x, y, 0, 65)
-    w.coords('selected', w.coords(square)[0..1])
-    w.dtag('selected')
-    @dragging = nil
-  end
-
-  def make_SeeDismiss
-    ## See Code / Dismiss
-    frame = Ttk::Frame.new($knightstour)
-    sep = Ttk::Separator.new(frame)
-    Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-    TkGrid('x',
-           Ttk::Button.new(frame, :text=>'�����ɻ���',
-                           :image=>$image['view'], :compound=>:left,
-                           :command=>proc{showCode 'knightstour'}),
-           Ttk::Button.new(frame, :text=>'�Ĥ���',
-                           :image=>$image['delete'], :compound=>:left,
-                           :command=>proc{
-                             $knightstour.destroy
-                             $knightstour = nil
-                           }),
-           :padx=>4, :pady=>4)
-    frame.grid_columnconfigure(0, :weight=>1)
-    frame
-  end
-
-  def create_gui(parent = nil)
-    $knightstour.destroy rescue nil
-    $knightstour = Tk::Toplevel.new(parent, :title=>"Knight's tour")
-    $knightstour.withdraw
-    base_f = Ttk::Frame.new($knightstour)
-    @board = Tk::Canvas.new(base_f, :width=>240, :height=>240)
-    @log = Tk::Text.new(base_f, :width=>12, :height=>1,
-                        :font=>'Arial 8', :background=>'white')
-    scr = @log.yscrollbar(Ttk::Scrollbar.new(base_f))
-
-    @visited = []
-    @delay = TkVariable.new(600)
-    @continuous = TkVariable.new(false)
-
-    tool_f = Ttk::Frame.new($knightstour)
-    label = Ttk::Label.new(tool_f, :text=>'�¹�®��')
-    scale = Ttk::Scale.new(tool_f, :from=>8, :to=>2000, :variable=>@delay,
-                           :command=>proc{|n| set_delay(n)})
-    check = Ttk::Checkbutton.new(tool_f, :text=>'ȿ��',
-                                 :variable=>@continuous)
-    @start_btn = Ttk::Button.new(tool_f, :text=>'����',
-                                 :command=>proc{tour()})
-    @exit_btn = Ttk::Button.new(tool_f, :text=>'��λ',
-                                :command=>proc{_exit()})
-
-    7.downto(0){|row|
-      0.upto(7){|col|
-        if ((col & 1) ^ (row & 1)).zero?
-          fill  = 'bisque'
-          dfill = 'bisque3'
-        else
-          fill  = 'tan3'
-          dfill = 'tan4'
-        end
-        coords = [col * 30 + 4, row * 30 + 4, col * 30 + 30, row * 30 + 30]
-        @board.create(TkcRectangle, coords,
-                      :fill=>fill, :disabledfill=>dfill,
-                      :width=>2, :state=>:disabled)
-      }
-    }
-
-    @knight_font = TkFont.new(:size=>-24)
-    @knight = TkcText.new(@board, 0, 0, :font=>@knight_font,
-                          :text=>Tk::UTF8_String.new('\u265e'),
-                          :anchor=>'nw', # :tags=>'knight',
-                          :fill=>'black', :activefill=>'#600000')
-    @knight.coords(@board.coords(rand(64)+1)[0..1])
-    @knight.bind('ButtonPress-1', '%W %x %y'){|w,x,y| drag_start(w,x,y)}
-    @knight.bind('Motion', '%W %x %y'){|w,x,y| drag_motion(w,x,y)}
-    @knight.bind('ButtonRelease-1', '%W %x %y'){|w,x,y| drag_end(w,x,y)}
-
-    Tk.grid(@board, @log, scr, :sticky=>'news')
-    base_f.grid_rowconfigure(0, :weight=>1)
-    base_f.grid_columnconfigure(0, :weight=>1)
-
-    Tk.grid(base_f, '-', '-', '-', '-', '-', :sticky=>'news')
-    widgets = [label, scale, check, @start_btn]
-    sg = nil
-    unless $RubyTk_WidgetDemo
-      widgets << @exit_btn
-      if Tk.windowingsystem != 'aqua'
-        #widgets.unshift(Ttk::SizeGrip.new(tool_f))
-        Ttk::SizeGrip.new(tool_f).pack(:side=>:right, :anchor=>'se')
-      end
-    end
-    Tk.pack(widgets, :side=>:right)
-    if Tk.windowingsystem == 'aqua'
-      TkPack.configure(widgets, :padx=>[4, 4], :pady=>[12, 12])
-      TkPack.configure(widgets[0], :padx=>[4, 24])
-      TkPack.configure(widgets[-1], :padx=>[16, 4])
-    end
-
-    Tk.grid(tool_f, '-', '-', '-', '-', '-', :sticky=>'ew')
-
-    if $RubyTk_WidgetDemo
-      Tk.grid(make_SeeDismiss(), '-', '-', '-', '-', '-', :sticky=>'ew')
-    end
-
-    $knightstour.grid_rowconfigure(0, :weight=>1)
-    $knightstour.grid_columnconfigure(0, :weight=>1)
-
-    $knightstour.bind('Control-F2'){TkConsole.show}
-    $knightstour.bind('Return'){@start_btn.invoke}
-    $knightstour.bind('Escape'){@exit_btn.invoke}
-    $knightstour.bind('Destroy'){ _stop }
-    $knightstour.protocol('WM_DELETE_WINDOW'){ _exit }
-
-    $knightstour.deiconify
-    $knightstour.tkwait_destroy
-  end
-
-  def initialize(parent = nil)
-    create_gui(parent)
-  end
-end
-
-Tk.root.withdraw unless $RubyTk_WidgetDemo
-Thread.new{Tk.mainloop} if __FILE__ == $0
-Knights_Tour.new
diff --git a/ext/tk/sample/demos-jp/label.rb b/ext/tk/sample/demos-jp/label.rb
deleted file mode 100644
index 19105e6f71..0000000000
--- a/ext/tk/sample/demos-jp/label.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# label widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($label_demo) && $label_demo
-  $label_demo.destroy
-  $label_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$label_demo = TkToplevel.new {|w|
-  title("Label Demonstration")
-  iconname("label")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($label_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���ˤ�5�ĤΥ�٥뤬ɽ������Ƥ��ޤ�����¦�ˤϥƥ����ȥ�٥뤬3�Ĥ��ꡢ��¦�ˤϥӥåȥޥåץ�٥�ȥƥ����ȥ�٥뤬����ޤ�����٥�Ȥ����ΤϤ��ޤ����򤤤�ΤǤϤ���ޤ��󡣤ʤ��ʤ�į���ʳ�����Ǥ��ʤ�����Ǥ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $label_demo
-      $label_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'label'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# label demo �ѥե졼������
-f_left = TkFrame.new(base_frame)
-f_right = TkFrame.new(base_frame)
-[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes',
-                                  'padx'=>10, 'pady'=>10, 'fill'=>'both')}
-
-# label ����
-[ TkLabel.new(f_left, 'text'=>'�ǽ�Υ�٥�'),
-  TkLabel.new(f_left, 'text'=>'2 ���ܡ�����ä��⤭�夬�餻�Ƥߤޤ���',
-              'relief'=>'raised'),
-  TkLabel.new(f_left, 'text'=>'3 ���ܡ�����Ǥ��ޤ� ', 'relief'=>'sunken')
-].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
-
-# TkLabel.new(f_right) {
-Tk::Label.new(f_right) {
-  bitmap('@' + [$demo_dir,'..','images','face.xbm'].join(File::Separator))
-  borderwidth 2
-  relief 'sunken'
-}.pack('side'=>'top')
-
-TkLabel.new(f_right) { text 'Tcl/Tk ��ͭ��' }.pack('side'=>'top')
diff --git a/ext/tk/sample/demos-jp/labelframe.rb b/ext/tk/sample/demos-jp/labelframe.rb
deleted file mode 100644
index cee504f4b6..0000000000
--- a/ext/tk/sample/demos-jp/labelframe.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# labelframe.rb
-#
-# This demonstration script creates a toplevel window containing
-# several labelframe widgets.
-#
-# based on "Id: labelframe.tcl,v 1.2 2001/10/30 11:21:50 dkf Exp"
-
-
-if defined?($labelframe_demo) && $labelframe_demo
-  $labelframe_demo.destroy
-  $labelframe_demo = nil
-end
-
-$labelframe_demo = TkToplevel.new {|w|
-  title("Labelframe Demonstration")
-  iconname("labelframe")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($labelframe_demo).pack(:fill=>:both, :expand=>true)
-
-# Some information
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-TkLabelFrame ���������åȤϴ�Ϣ���� widget
-����ޤȤ�Ƽ�갷��������Ѥ����ޤ�����
-�٥���̾��ʸ����Ǥⲿ�餫�Υ��������å�
-�Ǥ⤫�ޤ��ޤ��󡣤⤷���ʤ����ȤäƤ���
-Ruby �˥�󥯤���Ƥ��� Tk �饤�֥�꤬
-labelframe ���������åȤ�������Ƥ��ʤ�
-��硢���Υǥ�Ϥ��ޤ�ư���ʤ��Ϥ��Ǥ���
-���ξ��ˤ� labelframe ���������åȤ�����
-����Ƥ���褦�ʤ�꿷�����С������� Tk
-���Ȥ߹�碌�ƻ�褦�ˤ��Ƥ���������
-EOL
-
-# The bottom buttons
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
-                 $labelframe_demo.destroy
-                 $labelframe_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-                 showCode 'labelframe'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-# Demo area
-w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both,
-                                       :expand=>true)
-
-# A group of radiobuttons in a labelframe
-TkLabelFrame.new(w, :text=>'������',
-                 :padx=>2, :pady=>2) {|f|
-  grid(:row=>0, :column=>0, :pady=>'2m', :padx=>'2m')
-
-  v = TkVariable.new
-  (1..4).each{|i|
-    TkRadiobutton.new(f, :text=>"This is value #{i}",
-                      :variable=>v, :value=>i) {
-      pack(:side=>:top, :fill=>:x, :pady=>2)
-    }
-  }
-}
-
-
-# Using a label window to control a group of options.
-$lfdummy = TkVariable.new(0)
-
-def lfEnableButtons(w)
-  TkWinfo.children(w).each{|child|
-    next if child.path =~ /\.cb$/
-    if $lfdummy == 1
-      child.state(:normal)
-    else
-      child.state(:disabled)
-    end
-  }
-end
-
-TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
-  TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy,
-                    :text=>"���ץ��������", :padx=>0) {|cb|
-    command proc{lfEnableButtons(f)}
-    f.labelwidget(cb)
-  }
-  grid(:row=>0, :column=>1, :pady=>'2m', :padx=>'2m')
-
-  %w(���ץ����1 ���ץ����2 ���ץ����3).each{|str|
-    TkCheckbutton.new(f, :text=>str).pack(:side=>:top, :fill=>:x, :pady=>2)
-  }
-
-  lfEnableButtons(f)
-}
-
-TkGrid.columnconfigure(w, [0,1], :weight=>1)
diff --git a/ext/tk/sample/demos-jp/mclist.rb b/ext/tk/sample/demos-jp/mclist.rb
deleted file mode 100644
index 37f5dfa8eb..0000000000
--- a/ext/tk/sample/demos-jp/mclist.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# mclist.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget configured as a multi-column listbox.
-#
-# based on "Id: mclist.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($mclist_demo) && $mclist_demo
-  $mclist_demo.destroy
-  $mclist_demo = nil
-end
-
-$mclist_demo = TkToplevel.new {|w|
-  title("Multi-Column List")
-  iconname("mclist")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($mclist_demo).pack(:fill=>:both, :expand=>true)
-
-## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
-               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
-               :text=><<EOL).pack(:fill=>:x)
-Ttk�Ȥϡ��ơ��޻����ǽ�ʿ��������������åȽ���Ǥ���\
-Ttk::Treeview���������åȤ�\
-Ttk���������åȥ��åȤ˴ޤޤ�륦�������åȤΰ�Ĥǡ�\
-���줬�ݻ������ڹ�¤�Υǡ������Τ�ΤޤǤ�ɽ�����뤳�Ȥʤ���\
-�������������ޥ��������ɽ�������뤳�Ȥ��Ǥ��ޤ���
-���Υ���ץ�ϡ�ʣ���Υ�������ä��ꥹ�ȥܥå�������������ñ����Ǥ���
-�ƥ����Υ����ȥ�(heading)�򥯥�å�����С�\
-���Υ����ξ���˴�Ť��ƥꥹ�Ȥ��¤��ؤ����ʤ����Ϥ��Ǥ���\
-�ޤ��������Υ����ȥ�֤ζ��ڤ���ʬ��ɥ�å����뤳�Ȥǡ�\
-�����������ѹ����뤳�Ȥ��ǽ�Ǥ���
-EOL
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'�����ɻ���',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'mclist'}),
-         Ttk::Button.new(frame, :text=>'�Ĥ���',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $mclist_demo.destroy
-                           $mclist_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-container = Ttk::Frame.new(base_frame)
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency),
-                          :show=>:headings)
-if Tk.windowingsystem != 'aquq'
-  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
-else
-  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
-end
-
-container.pack(:fill=>:both, :expand=>true)
-Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
-Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
-container.grid_columnconfigure(0, :weight=>1)
-container.grid_rowconfigure(0, :weight=>1)
-
-## The data we're going to insert
-data = [
-  ['���를�����', 	'�֥��Υ������쥹', 	'ARS'],
-  ['�������ȥ�ꥢ',	'�����٥�',		'AUD'],
-  ['�֥饸��', 		'�֥饸�ꥢ', 		'BRL'],
-  ['���ʥ�', 		'������', 		'CAD'],
-  ['���',		'�̵�', 		'CNY'],
-  ['�ե��',		'�ѥ�', 		'EUR'],
-  ['�ɥ���', 		'�٥���',		'EUR'],
-  ['�����', 		'�˥塼�ǥ꡼',		'INR'],
-  ['�����ꥢ', 		'������', 		'EUR'],
-  ['����', 		'���', 		'JPY'],
-  ['�ᥭ����', 		'�ᥭ�������ƥ�', 	'MXN'],
-  ['������', 		'�⥹����', 		'RUB'],
-  ['��եꥫ',	'�ץ�ȥꥢ', 		'ZAR'],
-  ['�ѹ�', 		'����ɥ�', 		'GBP'],
-  ['����ꥫ', 		'�亮��ȥ� D.C.', 	'USD'],
-]
-
-## Code to insert the data nicely
-font = Ttk::Style.lookup(tree[:style], :font)
-cols = %w(country capital currency)
-cols.zip(%w(��̾ ���� �̲�)).each{|col, name|
-  tree.heading_configure(col, :text=>name,
-                         :command=>proc{sort_by(tree, col, false)})
-  tree.column_configure(col, :width=>TkFont.measure(font, name))
-}
-
-data.each{|country, capital, currency|
-  #tree.insert('', :end, :values=>[country, capital, currency])
-  tree.insert(nil, :end, :values=>[country, capital, currency])
-  cols.zip([country, capital, currency]).each{|col, val|
-    len = TkFont.measure(font, "#{val}  ")
-    if tree.column_cget(col, :width) < len
-      tree.column_configure(col, :width=>len)
-    end
-  }
-}
-
-## Code to do the sorting of the tree contents when clicked on
-def sort_by(tree, col, direction)
-  tree.children(nil).map!{|row| [tree.get(row, col), row.id]} .
-    sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) .
-    each_with_index{|info, idx| tree.move(info[1], nil, idx)}
-
-  tree.heading_configure(col, :command=>proc{sort_by(tree, col, ! direction)})
-end
diff --git a/ext/tk/sample/demos-jp/menu.rb b/ext/tk/sample/demos-jp/menu.rb
deleted file mode 100644
index e38a467000..0000000000
--- a/ext/tk/sample/demos-jp/menu.rb
+++ /dev/null
@@ -1,201 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($menu_demo) && $menu_demo
-  $menu_demo.destroy
-  $menu_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$menu_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("menu")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($menu_demo).pack(:fill=>:both, :expand=>true)
-
-# menu frame ����
-$menu_frame = TkFrame.new(base_frame, 'relief'=>'raised', 'bd'=>2)
-$menu_frame.pack('side'=>'top', 'fill'=>'x')
-
-begin
-  windowingsystem = Tk.windowingsystem()
-rescue
-  windowingsystem = ""
-end
-
-# label ����
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    text("���Υ�����ɥ����͡��ʥ�˥塼�ȥ��������ɥ�˥塼���鹽������Ƥ��ޤ���Command-X �����Ϥ���ȡ�X�����ޥ�ɥ��������³����ɽ������Ƥ���ʸ���ʤ�С���������졼����Ȥä����ܵ�ư��Ԥ����Ȥ��Ǥ��ޤ�����˥塼�����桢�Ǹ�Τ�Τϡ����Υ�˥塼�κǽ�ι��ܤ����򤹤뤳�Ȥ���Ω�����뤳�Ȥ��Ǥ��ޤ���")
-  else
-    text("���Υ�����ɥ����͡��ʥ�˥塼�ȥ��������ɥ�˥塼���鹽������Ƥ��ޤ���Alt-X �����Ϥ���ȡ�X����˥塼�˥�������饤���դ���ɽ������Ƥ���ʸ���ʤ�С������ܡ��ɤ���λ��꤬�Ǥ��ޤ�����������ǥ�˥塼�Υȥ�С������ǽ�Ǥ�����˥塼�����ꤵ�줿�ݤˤϡ����ڡ��������Ǽ¹Ԥ��뤳�Ȥ��Ǥ��ޤ������뤤�ϡ���������饤���դ���ʸ�������Ϥ��뤳�ȤǤ�¹ԤǤ��ޤ�����˥塼�Υ���ȥ꤬��������졼������äƤ�����ϡ����Υ�������졼�������Ϥ��뤳�Ȥǥ�˥塼����ꤹ�뤳�Ȥʤ��˼¹Ԥ��뤳�Ȥ��Ǥ��ޤ�����˥塼�����桢�Ǹ�Τ�Τϡ����Υ�˥塼�κǽ�ι��ܤ����򤹤뤳�Ȥ���Ω�����뤳�Ȥ��Ǥ��ޤ���")
-  end
-}.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $menu_demo
-      $menu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'menu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# menu ����
-TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|file_menu|
-    m.configure('menu'=>file_menu)
-    add('command', 'label'=>'���� ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"���� ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'����', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"����"���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'��¸', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"��¸"���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'��¸(����) ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"��¸(����) ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('separator')
-    add('command', 'label'=>'�ץ������� ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"�ץ������� ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'�ץ��� ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"�ץ��� ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('separator')
-    add('command', 'label'=>'��λ', 'command'=>proc{$menu_demo.destroy})
-  }
-}
-
-if $tk_platform['platform'] == 'macintosh' ||
-    windowingsystem == "classic" || windowingsystem == "aqua"
-  modifier = 'Command'
-elsif $tk_platform['platform'] == 'windows'
-  modifier = 'Control'
-else
-  modifier = 'Meta'
-end
-
-TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
-    m.configure('menu'=>basic_menu)
-    add('command', 'label'=>'���⤷�ʤ�Ĺ������ȥ�')
-    ['A','B','C','D','E','F','G'].each{|c|
-      # add('command', 'label'=>"ʸ�� \"#{c}\" �����", 'underline'=>4,
-      add('command', 'label'=>"Print letter \"#{c}\" (ʸ�� \"#{c}\" �����)",
-          'underline'=>14, 'accelerator'=>"Meta+#{c}",
-          'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-      $menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
-    m.configure('menu'=>cascade_menu)
-    add('command', 'label'=>'Print hello(����ˤ���)',
-        'command'=>proc{print "Hello(����ˤ���)\n"},
-        'accelerator'=>"#{modifier}+H", 'underline'=>6)
-    $menu_demo.bind("#{modifier}-h", proc{print "Hello(����ˤ���)\n"})
-    add('command', 'label'=>'Print goodbye(���褦�ʤ�)',
-        'command'=>proc{print "Goodbye(���褦�ʤ�)\n"},
-        'accelerator'=>"#{modifier}+G", 'underline'=>6)
-    $menu_demo.bind("#{modifier}-g", proc{print "Goodbye(���褦�ʤ�)\n"})
-
-    # TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_check|
-      cascade_menu.add('cascade', 'label'=>'Check buttons(�����å��ܥ���)',
-                       'menu'=>cascade_check, 'underline'=>0)
-      oil = TkVariable.new(0)
-      add('check', 'label'=>'����������', 'variable'=>oil)
-      trans = TkVariable.new(0)
-      add('check', 'label'=>'�ȥ�󥹥ߥå��������', 'variable'=>trans)
-      brakes = TkVariable.new(0)
-      add('check', 'label'=>'�֥졼������', 'variable'=>brakes)
-      lights = TkVariable.new(0)
-      add('check', 'label'=>'�饤������', 'variable'=>lights)
-      add('separator')
-      add('command', 'label'=>'���ߤ��ͤ�ɽ��',
-          'command'=>proc{showVars($menu_demo,
-                                   ['����������', oil],
-                                   ['�ȥ�󥹥ߥå��������', trans],
-                                   ['�֥졼������', brakes],
-                                   ['�饤������', lights])} )
-      invoke 1
-      invoke 3
-    }
-
-    #TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_radio|
-      cascade_menu.add('cascade', 'label'=>'Radio buttons(�饸���ܥ���)',
-                       'menu'=>cascade_radio, 'underline'=>0)
-      pointSize = TkVariable.new
-      add('radio', 'label'=>'10 �ݥ����', 'variable'=>pointSize, 'value'=>10)
-      add('radio', 'label'=>'14 �ݥ����', 'variable'=>pointSize, 'value'=>14)
-      add('radio', 'label'=>'18 �ݥ����', 'variable'=>pointSize, 'value'=>18)
-      add('radio', 'label'=>'24 �ݥ����', 'variable'=>pointSize, 'value'=>24)
-      add('radio', 'label'=>'32 �ݥ����', 'variable'=>pointSize, 'value'=>32)
-      add('separator')
-      style = TkVariable.new
-      add('radio', 'label'=>'�����ޥ�', 'variable'=>style, 'value'=>'roman')
-      add('radio', 'label'=>'�ܡ����', 'variable'=>style, 'value'=>'bold')
-      add('radio', 'label'=>'������å�', 'variable'=>style, 'value'=>'italic')
-      add('separator')
-      add('command', 'label'=>'���ߤ��ͤ�ɽ��',
-          'command'=>proc{showVars($menu_demo,
-                                   ['�ݥ���ȥ�����', pointSize],
-                                   ['��������', style])} )
-      invoke 1
-      invoke 7
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
-    m.configure('menu'=>icon_menu)
-    add('command',
-        'bitmap'=>'@'+[$demo_dir,'..',
-                        'images','pattern.xbm'].join(File::Separator),
-        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
-                                     'text'=>'�����ʤ������򤷤���˥塼�ι��ܤϥƥ����ȤǤϤʤ��ӥåȥޥåפ�ɽ�����Ƥ��ޤ���������ʳ������Ǥ�¾�Υ�˥塼���ܤ��Ѥ��ޤ���',
-                                     'bitmap'=>'', 'default'=>0,
-                                     'buttons'=>'λ��')} )
-    ['info', 'questhead', 'error'].each{|icon|
-      add('command', 'bitmap'=>icon,
-          'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|more_menu|
-    m.configure('menu'=>more_menu)
-    [ '����ȥ�','�̤Υ���ȥ�','���⤷�ʤ�','�ۤȤ�ɲ��⤷�ʤ�',
-      '������յ������Τ�' ].each{|i|
-      add('command', 'label'=>i,
-          'command'=>proc{print "You invoked \"#{i}\"\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m) {|colors_menu|
-    m.configure('menu'=>colors_menu)
-    ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-      add('command', 'label'=>c, 'background'=>c,
-          'command'=>proc{print "You invoked \"#{c}\"\n"})
-    }
-  }
-}
diff --git a/ext/tk/sample/demos-jp/menu84.rb b/ext/tk/sample/demos-jp/menu84.rb
deleted file mode 100644
index 094853a728..0000000000
--- a/ext/tk/sample/demos-jp/menu84.rb
+++ /dev/null
@@ -1,213 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($menu84_demo) && $menu84_demo
-  $menu84_demo.destroy
-  $menu84_demo = nil
-end
-
-# demo toplevel widget
-$menu84_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("menu84")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($menu84_demo).pack(:fill=>:both, :expand=>true)
-
-begin
-  windowingsystem = Tk.windowingsystem()
-rescue
-  windowingsystem = ""
-end
-
-# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    text("���Υ�����ɥ��ˤϥ��������ɥ�˥塼����ĥ�˥塼�С����դ����Ƥ��ޤ���Command+x ('x'�ϥ��ޥ�ɥ�������ܥ��³����ɽ������Ƥ���ʸ���Ǥ�) �ȥ����פ��뤳�Ȥˤ�äƤ���ܤε�ǽ��ƤӽФ����Ȥ��Ǥ��ޤ����Ǹ�Υ�˥塼�ϡ��ޥ����ǥ�����ɥ��γ��˥ɥ�å����뤳�Ȥˤ�äơ���Ω�����ѥ�åȤȤʤ�褦���ڤ��������Ȥ���ǽ�Ǥ���")
-  else
-    text("���Υ�����ɥ��ˤϥ��������ɥ�˥塼����ĥ�˥塼�С����դ����Ƥ��ޤ���Alt+x ('x'�ϥ�˥塼��ǲ����������줿ʸ���Ǥ�) �ȥ����פ��뤳�Ȥˤ�äƤ��˥塼��ƤӽФ����Ȥ��Ǥ��ޤ������������Ȥäơ���˥塼�֤��ư���뤳�Ȥ��ǽ�Ǥ�����˥塼��ɽ������Ƥ�����ˤϡ����߰��֤ι��ܤ򥹥ڡ������������򤷤��ꡢ�����������줿ʸ�������Ϥ��뤳�ȤǤ��ι��ܤ����򤷤��ꤹ�뤳�Ȥ��Ǥ��ޤ����⤷���ܤ˥�������졼���λ��꤬�ʤ���Ƥ����ʤ�С����λ��ꤵ�줿�������Ϥ�Ԥ����Ȥǡ���˥塼��ɽ�������뤳�Ȥʤ�ľ�ܤ��ι��ܤε�ǽ��ƤӽФ��ޤ����Ǹ�Υ�˥塼�ϡ���˥塼�κǽ�ι��ܤ����򤹤뤳�Ȥˤ�äơ���Ω�����ѥ�åȤȤʤ�褦���ڤ��������Ȥ���ǽ�Ǥ���")
-  end
-}.pack('side'=>'top')
-
-
-menustatus = TkVariable.new("    ")
-TkFrame.new(base_frame) {|frame|
-  TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken',
-              'bd'=>1, 'font'=>['Helvetica', '10'],
-              'anchor'=>'w').pack('side'=>'left', 'padx'=>2,
-                                  'expand'=>true, 'fill'=>'both')
-  pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-}
-
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $menu84_demo
-      $menu84_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'menu84'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# create menu frame
-$menu84_frame = TkMenu.new($menu84_demo, 'tearoff'=>false)
-
-# menu
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'File', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Open...', 'command'=>proc{fail '�����ñ�ʤ�ǥ�Ǥ����顢"Open..." ���ܤε�ǽ���ä��������ƤϤ��ޤ���'})
-  add('command', 'label'=>'New', 'command'=>proc{fail '�����ñ�ʤ�ǥ�Ǥ����顢"New" ���ܤε�ǽ���ä��������ƤϤ��ޤ���'})
-  add('command', 'label'=>'Save', 'command'=>proc{fail '�����ñ�ʤ�ǥ�Ǥ����顢"Save" ���ܤε�ǽ���ä��������ƤϤ��ޤ���'})
-  add('command', 'label'=>'Save As...', 'command'=>proc{fail '�����ñ�ʤ�ǥ�Ǥ����顢"Save As..." ���ܤε�ǽ���ä��������ƤϤ��ޤ���'})
-  add('separator')
-  add('command', 'label'=>'Print Setup...', 'command'=>proc{fail '�����ñ�ʤ�ǥ�Ǥ����顢"Print Setup..." ���ܤε�ǽ���ä��������ƤϤ��ޤ���'})
-  add('command', 'label'=>'Print...', 'command'=>proc{fail '�����ñ�ʤ�ǥ�Ǥ����顢"Print..." ���ܤε�ǽ���ä��������ƤϤ��ޤ���'})
-  add('separator')
-  add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu84_demo.destroy})
-}
-
-if $tk_platform['platform'] == 'macintosh' ||
-    windowingsystem = "classic" || windowingsystem = "aqua"
-  modifier = 'Command'
-elsif $tk_platform['platform'] == 'windows'
-  modifier = 'Control'
-else
-  modifier = 'Meta'
-end
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Basic', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Long entry that does nothing')
-  ['A','B','C','D','E','F','G'].each{|c|
-    add('command', 'label'=>"Print letter \"#{c}\"",
-        'underline'=>14, 'accelerator'=>"Meta+#{c}",
-        'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-    $menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-  }
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Cascades', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Print hello',
-      'command'=>proc{print "Hello\n"},
-      'accelerator'=>"#{modifier}+H", 'underline'=>6)
-  $menu84_demo.bind("#{modifier}-h", proc{print "Hello\n"})
-  add('command', 'label'=>'Print goodbye',
-      'command'=>proc{print "Goodbye\n"},
-      'accelerator'=>"#{modifier}+G", 'underline'=>6)
-  $menu84_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-    m.add('cascade', 'label'=>'Check button',
-          'menu'=>cascade_check, 'underline'=>0)
-    oil = TkVariable.new(0)
-    add('check', 'label'=>'�����븡��', 'variable'=>oil)
-    trans = TkVariable.new(0)
-    add('check', 'label'=>'�ȥ�󥹥ߥå���󸡺�', 'variable'=>trans)
-    brakes = TkVariable.new(0)
-    add('check', 'label'=>'�֥졼������', 'variable'=>brakes)
-    lights = TkVariable.new(0)
-    add('check', 'label'=>'�饤�ȸ���', 'variable'=>lights)
-    add('separator')
-    add('command', 'label'=>'Show current values',
-        'command'=>proc{showVars($menu84_demo,
-                                 ['������', oil],
-                                 ['�ȥ�󥹥ߥå����', trans],
-                                 ['�֥졼��', brakes],
-                                 ['�饤��', lights])} )
-    invoke 1
-    invoke 3
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-    m.add('cascade', 'label'=>'Radio buttons',
-          'menu'=>cascade_radio, 'underline'=>0)
-    pointSize = TkVariable.new
-    add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
-    add('radio', 'label'=>'14 point', 'variable'=>pointSize, 'value'=>14)
-    add('radio', 'label'=>'18 point', 'variable'=>pointSize, 'value'=>18)
-    add('radio', 'label'=>'24 point', 'variable'=>pointSize, 'value'=>24)
-    add('radio', 'label'=>'32 point', 'variable'=>pointSize, 'value'=>32)
-    add('separator')
-    style = TkVariable.new
-    add('radio', 'label'=>'Roman', 'variable'=>style, 'value'=>'roman')
-    add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
-    add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
-    add('separator')
-    add('command', 'label'=>'�����ͤ�ɽ��',
-        'command'=>proc{showVars($menu84_demo,
-                                 ['pointSize', pointSize],
-                                 ['style', style])} )
-    invoke 1
-    invoke 7
-  }
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Icons', 'menu'=>m, 'underline'=>0)
-  add('command', 'hidemargin'=>1,
-      'bitmap'=>'@'+[$demo_dir,'..',
-                      'images','pattern.xbm'].join(File::Separator),
-      'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
-                                   'text'=>'���ʤ������򤷤���˥塼���ܤϡ�ʸ���������˥ӥåȥޥåץ��᡼���ǹ��ܤ�ɽ��������ΤǤ�������ʳ������Ǥϡ��ۤ��Υ�˥塼���ܤȤδ֤��ä˰㤤������櫓�ǤϤ���ޤ���',
-                                   'bitmap'=>'', 'default'=>0,
-                                   'buttons'=>'�Ĥ���')} )
-  ['info', 'questhead', 'error'].each{|icon|
-    add('command', 'bitmap'=>icon, 'hidemargin'=>1,
-        'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-  }
-
-  entryconfigure(2, :columnbreak=>true)
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'More', 'menu'=>m, 'underline'=>0)
-  [ 'An entry','Another entry','Does nothing','Does almost nothing',
-    'Make life meaningful' ].each{|i|
-    add('command', 'label'=>i,
-        'command'=>proc{print "You invoked \"#{i}\"\n"})
-  }
-
-  m.entryconfigure('Does almost nothing',
-                   'bitmap'=>'questhead', 'compound'=>'left',
-                   'command'=>proc{
-                     TkDialog.new('title'=>'Compound Menu Entry',
-                                  'message'=>'���ʤ������򤷤���˥塼���ܤϡ��ӥåȥޥåץ��᡼����ʸ����Ȥ�Ʊ���˰�Ĥι��ܤ�ɽ������褦�ˤ�����ΤǤ�������ʳ������Ǥϡ��ۤ��Υ�˥塼���ܤȤδ֤��ä˰㤤������櫓�ǤϤ���ޤ���',
-                                  'buttons'=>['λ��'], 'bitmap'=>'')
-                   })
-}
-
-TkMenu.new($menu84_frame) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Colors', 'menu'=>m, 'underline'=>0)
-  ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-    add('command', 'label'=>c, 'background'=>c,
-        'command'=>proc{print "You invoked \"#{c}\"\n"})
-  }
-}
-
-$menu84_demo.menu($menu84_frame)
-
-TkMenu.bind('<MenuSelect>', proc{|w|
-              begin
-                label = w.entrycget('active', 'label')
-              rescue
-                label = "    "
-              end
-              menustatus.value = label
-              Tk.update(true)
-            }, '%W')
diff --git a/ext/tk/sample/demos-jp/menu8x.rb b/ext/tk/sample/demos-jp/menu8x.rb
deleted file mode 100644
index 49aca6786d..0000000000
--- a/ext/tk/sample/demos-jp/menu8x.rb
+++ /dev/null
@@ -1,233 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($menu8x_demo) && $menu8x_demo
-  $menu8x_demo.destroy
-  $menu8x_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$menu8x_demo = TkToplevel.new {|w|
-  title("Menu Demonstration (Tk8.x)")
-  iconname("menu")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($menu8x_demo).pack(:fill=>:both, :expand=>true)
-
-# version check
-if $tk_version.to_f < 8.0
-
-# label ����
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-    text("�¹Ԥ��褦�Ȥ���������ץȤ� Tk8.0 �ʾ�����ѤǤ��뵡ǽ�����Ѥ��Ƥ��뤿�ᡢ���ʤ��� Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} �Ǥ�����˼¹ԤǤ��ޤ��󡣤�äƥǥ�μ¹Ԥ���ߤ��ޤ����������������Υ����ɻ��ȥܥ���򲡤����Ȥǡ��¹Ԥ���ߤ��줿������ץȤΥ������򻲾Ȥ��뤳�Ȥϲ�ǽ�Ǥ���")
-}.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $menu8x_demo
-      $menu8x_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'menu8x'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-else ; # Tk8.x
-
-begin
-  windowingsystem = Tk.windowingsystem()
-rescue
-  windowingsystem = ""
-end
-
-# label ����
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    text("���Υ�����ɥ����͡��ʥ�˥塼�ȥ��������ɥ�˥塼���鹽������Ƥ��ޤ���Command-X �����Ϥ���ȡ�X�����ޥ�ɥ��������³����ɽ������Ƥ���ʸ���ʤ�С���������졼����Ȥä����ܵ�ư��Ԥ����Ȥ��Ǥ��ޤ�����˥塼�����桢�Ǹ�Τ�Τϡ����Υ�˥塼�κǽ�ι��ܤ����򤹤뤳�Ȥ���Ω�����뤳�Ȥ��Ǥ��ޤ���")
-  else
-    text("���Υ�����ɥ����͡��ʥ�˥塼�ȥ��������ɥ�˥塼���鹽������Ƥ��ޤ���Alt-X �����Ϥ���ȡ�X����˥塼�˥�������饤���դ���ɽ������Ƥ���ʸ���ʤ�С������ܡ��ɤ���λ��꤬�Ǥ��ޤ�����������ǥ�˥塼�Υȥ�С������ǽ�Ǥ�����˥塼�����ꤵ�줿�ݤˤϡ����ڡ��������Ǽ¹Ԥ��뤳�Ȥ��Ǥ��ޤ������뤤�ϡ���������饤���դ���ʸ�������Ϥ��뤳�ȤǤ�¹ԤǤ��ޤ�����˥塼�Υ���ȥ꤬��������졼������äƤ�����ϡ����Υ�������졼�������Ϥ��뤳�Ȥǥ�˥塼����ꤹ�뤳�Ȥʤ��˼¹Ԥ��뤳�Ȥ��Ǥ��ޤ�����˥塼�����桢�Ǹ�Τ�Τϡ����Υ�˥塼�κǽ�ι��ܤ����򤹤뤳�Ȥ���Ω�����뤳�Ȥ��Ǥ��ޤ���")
-  end
-}.pack('side'=>'top')
-
-# ����ɽ��������
-$menu8xstatus = TkVariable.new("    ")
-TkFrame.new(base_frame) {|frame|
-  TkLabel.new(frame, 'textvariable'=>$menu8xstatus, 'relief'=>'sunken',
-              'bd'=>1, 'font'=>['Helvetica', '10'], 'anchor'=>'w')\
-  .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $menu8x_demo
-      $menu8x_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'menu8x'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# menu ����
-TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
-  TkMenu.new(m, 'tearoff'=>false) {|file_menu|
-    m.add('cascade', 'label'=>'File', 'menu'=>file_menu, 'underline'=>0)
-    add('command', 'label'=>'���� ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"���� ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'����', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"����"���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'��¸', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"��¸"���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'��¸(����) ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"��¸(����) ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('separator')
-    add('command', 'label'=>'�ץ������� ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"�ץ������� ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('command', 'label'=>'�ץ��� ...', 'command'=>proc{fail '����ϡ��ǥ�Ǥ��Τ�"�ץ��� ..."���Ф��륢���������������Ƥ��ޤ���'})
-    add('separator')
-    add('command', 'label'=>'��λ', 'command'=>proc{$menu8x_demo.destroy})
-  }
-
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    modifier = 'Command'
-  elsif $tk_platform['platform'] == 'windows'
-    modifier = 'Control'
-  else
-    modifier = 'Meta'
-  end
-
-  TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
-    m.add('cascade', 'label'=>'Basic', 'menu'=>basic_menu, 'underline'=>0)
-    add('command', 'label'=>'���⤷�ʤ�Ĺ������ȥ�')
-    ['A','B','C','D','E','F','G'].each{|c|
-      # add('command', 'label'=>"ʸ�� \"#{c}\" �����", 'underline'=>4,
-      add('command', 'label'=>"Print letter \"#{c}\" (ʸ�� \"#{c}\" �����)",
-          'underline'=>14, 'accelerator'=>"Meta+#{c}",
-          'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-      $menu8x_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-    }
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
-    m.add('cascade', 'label'=>'Cascades', 'menu'=>cascade_menu, 'underline'=>0)
-    add('command', 'label'=>'Print hello(����ˤ���)',
-        'command'=>proc{print "Hello(����ˤ���)\n"},
-        'accelerator'=>"#{modifier}+H", 'underline'=>6)
-    $menu8x_demo.bind("#{modifier}-h", proc{print "Hello(����ˤ���)\n"})
-    add('command', 'label'=>'Print goodbye(���褦�ʤ�)',
-        'command'=>proc{print "Goodbye(���褦�ʤ�)\n"},
-        'accelerator'=>"#{modifier}+G", 'underline'=>6)
-    $menu8x_demo.bind("#{modifier}-g", proc{print "Goodbye(���褦�ʤ�)\n"})
-
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-      cascade_menu.add('cascade', 'label'=>'Check buttons(�����å��ܥ���)',
-                       'menu'=>cascade_check, 'underline'=>0)
-      oil = TkVariable.new(0)
-      add('check', 'label'=>'����������', 'variable'=>oil)
-      trans = TkVariable.new(0)
-      add('check', 'label'=>'�ȥ�󥹥ߥå��������', 'variable'=>trans)
-      brakes = TkVariable.new(0)
-      add('check', 'label'=>'�֥졼������', 'variable'=>brakes)
-      lights = TkVariable.new(0)
-      add('check', 'label'=>'�饤������', 'variable'=>lights)
-      add('separator')
-      add('command', 'label'=>'���ߤ��ͤ�ɽ��',
-          'command'=>proc{showVars($menu8x_demo,
-                                   ['����������', oil],
-                                   ['�ȥ�󥹥ߥå��������', trans],
-                                   ['�֥졼������', brakes],
-                                   ['�饤������', lights])} )
-      invoke 1
-      invoke 3
-    }
-
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-      cascade_menu.add('cascade', 'label'=>'Radio buttons(�饸���ܥ���)',
-                       'menu'=>cascade_radio, 'underline'=>0)
-      pointSize = TkVariable.new
-      add('radio', 'label'=>'10 �ݥ����', 'variable'=>pointSize, 'value'=>10)
-      add('radio', 'label'=>'14 �ݥ����', 'variable'=>pointSize, 'value'=>14)
-      add('radio', 'label'=>'18 �ݥ����', 'variable'=>pointSize, 'value'=>18)
-      add('radio', 'label'=>'24 �ݥ����', 'variable'=>pointSize, 'value'=>24)
-      add('radio', 'label'=>'32 �ݥ����', 'variable'=>pointSize, 'value'=>32)
-      add('separator')
-      style = TkVariable.new
-      add('radio', 'label'=>'�����ޥ�', 'variable'=>style, 'value'=>'roman')
-      add('radio', 'label'=>'�ܡ����', 'variable'=>style, 'value'=>'bold')
-      add('radio', 'label'=>'������å�', 'variable'=>style, 'value'=>'italic')
-      add('separator')
-      add('command', 'label'=>'���ߤ��ͤ�ɽ��',
-          'command'=>proc{showVars($menu8x_demo,
-                                   ['�ݥ���ȥ�����', pointSize],
-                                   ['��������', style])} )
-      invoke 1
-      invoke 7
-    }
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
-    m.add('cascade', 'label'=>'Icons', 'menu'=>icon_menu, 'underline'=>0)
-    add('command',
-        'bitmap'=>'@'+[$demo_dir,'..',
-                        'images','pattern.xbm'].join(File::Separator),
-        'hidemargin'=>1,
-        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
-                                     'text'=>'�����ʤ������򤷤���˥塼�ι��ܤϥƥ����ȤǤϤʤ��ӥåȥޥåפ�ɽ�����Ƥ��ޤ���������ʳ������Ǥ�¾�Υ�˥塼���ܤ��Ѥ��ޤ���',
-                                     'bitmap'=>'', 'default'=>0,
-                                     'buttons'=>'λ��')} )
-    ['info', 'questhead', 'error'].each{|icon|
-      add('command', 'bitmap'=>icon, 'hidemargin'=>1,
-          'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-    }
-
-    entryconfigure(2, 'columnbreak'=>1)
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|more_menu|
-    m.add('cascade', 'label'=>'More', 'menu'=>more_menu, 'underline'=>0)
-    [ '����ȥ�','�̤Υ���ȥ�','���⤷�ʤ�','�ۤȤ�ɲ��⤷�ʤ�',
-      '������յ������Τ�' ].each{|i|
-      add('command', 'label'=>i,
-          'command'=>proc{print "You invoked \"#{i}\"\n"})
-    }
-  }
-
-  TkMenu.new(m) {|colors_menu|
-    m.add('cascade', 'label'=>'Colors', 'menu'=>colors_menu, 'underline'=>1)
-    ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-      add('command', 'label'=>c, 'background'=>c,
-          'command'=>proc{print "You invoked \"#{c}\"\n"})
-    }
-  }
-
-  $menu8x_demo.configure('menu'=>m)
-}
-
-TkMenu.bind('<MenuSelect>',
-            proc{|w|
-              begin
-                label = w.entrycget('active', 'label')
-              rescue
-                label = '    '
-              end
-              $menu8xstatus.value = label
-              Tk.update('idletasks')
-            }, '%W')
-
-end ; # Tk 8.x
diff --git a/ext/tk/sample/demos-jp/menubu.rb b/ext/tk/sample/demos-jp/menubu.rb
deleted file mode 100644
index 78418ce3ea..0000000000
--- a/ext/tk/sample/demos-jp/menubu.rb
+++ /dev/null
@@ -1,238 +0,0 @@
-# -*- coding: euc-jp -*-
-require "tkcanvas"
-
-def optionMenu(menubutton, varName, firstValue, *rest)
-  varName.value = firstValue
-  configoptions = {'textvariable'=>varName,'indicatoron'=>'on',
-    'relief'=>'raised','borderwidth'=>2,'highlightthickness'=>2,
-    'anchor'=>'c','direction'=>'flush'}
-  configoptions.each {|key, value|
-    menubutton.configure(key, value)
-  }
-  menu = TkMenu.new(menubutton) {
-    tearoff 'off'
-    add 'radio', 'label'=>firstValue, 'variable'=>varName
-  }
-  menubutton.menu(menu)
-  for i in rest
-    menu.add 'radio', 'label'=>i, 'variable'=>varName
-  end
-
-  return menu
-end
-
-if defined?($menubu_demo) && $menubu_demo
-  $menubu_demo.destroy
-  $menubu_demo = nil
-end
-
-$menubu_demo = TkToplevel.new {|w|
-  title("Menu Button Demonstration")
-  iconname("menubutton")
-}
-
-positionWindow($menubu_demo)
-
-base_frame = TkFrame.new($menubu_demo).pack(:fill=>:both, :expand=>true)
-
-# version check
-if $tk_version.to_f < 8.0
-
-# label ����
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-    text("�¹Ԥ��褦�Ȥ���������ץȤ� Tk8.0 �ʾ�����ѤǤ��뵡ǽ�����Ѥ��Ƥ��뤿�ᡢ���ʤ��� Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} �Ǥ�����˼¹ԤǤ��ޤ��󡣤�äƥǥ�μ¹Ԥ���ߤ��ޤ����������������Υ����ɻ��ȥܥ���򲡤����Ȥǡ��¹Ԥ���ߤ��줿������ץȤΥ������򻲾Ȥ��뤳�Ȥϲ�ǽ�Ǥ���")
-}.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $menubu_demo
-      $menubu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'menubu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-else ; # Tk8.x
-
-body = TkFrame.new(base_frame)
-body.pack('expand'=>'yes', 'fill'=>'both')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-right = TkMenubutton.new(body) {
-  text "Right"
-  underline 0
-  direction 'right'
-  relief 'raised'
-}
-rightMenu = TkMenu.new(right) {
-  tearoff 0
-  add 'command', 'label'=>"Right menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
-  add 'command', 'label'=>"Right menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Right menu.\""}
-}
-right.menu(rightMenu)
-right.grid('row'=>1, 'column'=>0, 'sticky'=>'w')
-
-left = TkMenubutton.new(body) {
-  text "Left"
-  underline 0
-  direction 'left'
-  relief 'raised'
-}
-leftMenu = TkMenu.new(left) {
-  tearoff 0
-  add 'command', 'label'=>"Left menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
-  add 'command', 'label'=>"Left menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Left menu.\""}
-}
-left.menu(leftMenu)
-left.grid('row'=>1, 'column'=>2, 'sticky'=>'e')
-
-center = TkFrame.new(body) {
-  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
-}
-
-above = TkMenubutton.new(body) {
-  text "Above"
-  underline 0
-  direction 'above'
-  relief 'raised'
-}
-aboveMenu = TkMenu.new(above) {
-  tearoff 0
-  add 'command', 'label'=>"Above menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Above menu.\""}
-  add 'command', 'label'=>"Above menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Above menu.\""}
-}
-above.menu(aboveMenu)
-above.grid('row'=>2, 'column'=>1, 'sticky'=>'s')
-
-center = TkFrame.new(body) {
-  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
-}
-
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc {
-      tmppath = $menubu_demo
-      $menubu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc { showCode 'menubu' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x', 'pady'=>'2m')
-
-msg = TkLabel.new(center) {
-#  font $font
-  wraplength '4i'
-  justify 'left'
-  text "����ϥ�˥塼�ܥ���Υǥ�Ǥ���\"Below\"�Υܥ����\
-���˥�˥塼��Ф���\"Right\"�Υܥ���ϱ��˥�˥塼��Ф��ơ�\
-�ġĤȤʤ�ޤ�������ʸ�Ϥβ��ˤ�2�ĤΥ��ץ�����˥塼������ޤ���\
-1�Ĥ����̤Υ�˥塼�ǡ��⤦1�Ĥ�16���Υѥ�åȤǤ���"
-}
-msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
-
-TkFrame.new(center) {|f|
-  menubuttonoptions = TkVariable.new
-  mbutton = TkMenubutton.new(f)
-  options = optionMenu(mbutton, menubuttonoptions,
-                       'one', 'two', 'three')
-  mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
-  paletteColor = TkVariable.new
-  colors = ['Black','red4','DarkGreen','NavyBlue', 'gray75',
-    'Red','Green','Blue','gray50','Yellow','Cyan','Magenta',
-    'White','Brown','DarkSeaGreen','DarkViolet']
-  colorMenuButton = TkMenubutton.new(f)
-  m = optionMenu(colorMenuButton, paletteColor, *colors)
-  begin
-    windowingsystem = Tk.windowingsystem()
-  rescue
-    windowingsystem = ""
-  end
-  if windowingsystem == "classic" || windowingsystem == "aqua"
-    topBorderColor = 'Black'
-    bottomBorderColor = 'Black'
-  else
-    topBorderColor = 'gray50'
-    bottomBorderColor = 'gray75'
-  end
-  for i in 0..15
-    image = TkPhotoImage.new('height'=>16, 'width'=>16)
-    image.put(topBorderColor, 0, 0, 16, 1)
-    image.put(topBorderColor, 0, 1, 1, 16)
-    image.put(bottomBorderColor, 0, 15, 16, 16)
-    image.put(bottomBorderColor, 15, 1, 16, 16)
-    image.put(colors[i], 1, 1, 15, 15)
-
-    selectimage = TkPhotoImage.new('height'=>16, 'width'=>16)
-    selectimage.put('Black', 0, 0, 16, 2)
-    selectimage.put('Black', 0, 2, 2, 16)
-    selectimage.put('Black', 2, 14, 16, 16)
-    selectimage.put('Black', 14, 2, 16, 14)
-    selectimage.put(colors[i], 2, 2, 14, 14)
-
-    m.entryconfigure(i, 'image'=>image, 'selectimage'=>selectimage, 'hidemargin'=>'on')
-  end
-  m.configure('tearoff', 'on')
-  for c in ['Black', 'gray75', 'gray50', 'White']
-    m.entryconfigure(c, 'columnbreak'=>1)
-  end
-  colorMenuButton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
-  pack 'padx'=>25, 'pady'=>25
-}
-
-end ; # Tk8.x
diff --git a/ext/tk/sample/demos-jp/msgbox.rb b/ext/tk/sample/demos-jp/msgbox.rb
deleted file mode 100644
index ed5d01252e..0000000000
--- a/ext/tk/sample/demos-jp/msgbox.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# message boxes widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($msgbox_demo) && $msgbox_demo
-  $msgbox_demo.destroy
-  $msgbox_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$msgbox_demo = TkToplevel.new {|w|
-  title("Message Box Demonstration")
-  iconname("messagebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($msgbox_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"�ޤ�ɽ�����륢������ȥ�å������ܥå����μ��������ǲ����������θ��\"��å������ܥå���\"�ܥ���򲡤��ȡ����ꤷ����å������ܥå�����ɽ������ޤ���").pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $msgbox_demo
-      $msgbox_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'msgbox'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '��å������ܥå���'
-    command proc{showMessageBox $msgbox_demo}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-$msgbox_leftframe  = TkFrame.new(base_frame)
-$msgbox_rightframe = TkFrame.new(base_frame)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-
-TkLabel.new($msgbox_leftframe, 'text'=>'��������').pack('side'=>'top')
-TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxIcon = TkVariable.new('info')
-['error', 'info', 'question', 'warning'].each {|icon|
-  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
-                    'relief'=>'flat', 'value'=>icon, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-TkLabel.new($msgbox_rightframe, 'text'=>'����').pack('side'=>'top')
-TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel',
-  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
-  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
-                    'relief'=>'flat', 'value'=>type, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-def showMessageBox(w)
-  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
-                         'title'=>'Message', 'parent'=>w,
-                         'message'=>"�����\"#{$msgboxType.value}\"�Ȥ�������Υ�å������ܥå����ǡ�\"#{$msgboxIcon.value}\"�Υ�������ɽ������Ƥ��ޤ���")
-
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
-                'message'=>"���ʤ��� \"#{button}\" �򲡤��ޤ����͡�")
-end
-
diff --git a/ext/tk/sample/demos-jp/msgbox2.rb b/ext/tk/sample/demos-jp/msgbox2.rb
deleted file mode 100644
index 8c80e08d70..0000000000
--- a/ext/tk/sample/demos-jp/msgbox2.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# message boxes widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($msgbox2_demo) && $msgbox2_demo
-  $msgbox2_demo.destroy
-  $msgbox2_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$msgbox2_demo = TkToplevel.new {|w|
-  title("Message Box Demonstration")
-  iconname("messagebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($msgbox2_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"�ޤ�ɽ�����륢������ȥ�å������ܥå����μ��������ǲ����������θ��\"��å������ܥå���\"�ܥ���򲡤��ȡ����ꤵ�줿�����ǡ���å������Ⱦܺ٥ƥ����ȤȤ���ä���å������ܥå�����ɽ������ޤ���").pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $msgbox2_demo
-      $msgbox2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'msgbox2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '��å������ܥå���'
-    command proc{showMessageBox2 $msgbox2_demo}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-$msgbox_leftframe  = TkFrame.new(base_frame)
-$msgbox_rightframe = TkFrame.new(base_frame)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-
-TkLabel.new($msgbox_leftframe, 'text'=>'��������').pack('side'=>'top')
-TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxIcon = TkVariable.new('info')
-['error', 'info', 'question', 'warning'].each {|icon|
-  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
-                    'relief'=>'flat', 'value'=>icon, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-TkLabel.new($msgbox_rightframe, 'text'=>'����').pack('side'=>'top')
-TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel',
-  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
-  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
-                    'relief'=>'flat', 'value'=>type, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-def showMessageBox2(w)
-  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
-                         'title'=>'Message', 'parent'=>w,
-                         'message'=>"\"#{$msgboxType.value}\"�����פΥ�å������ܥå���",
-                         'detail'=>"�����\"#{$msgboxType.value}\"�Ȥ�������Υ�å������ܥå����ǡ�\"#{$msgboxIcon.value}\"�Υ�������ɽ������Ƥ��ޤ������Υܥ���Τ����줫�����򤷤ƥ���å����Ƥ���������")
-
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
-                'message'=>"���ʤ��� \"#{button}\" �򲡤��ޤ����͡�")
-end
-
diff --git a/ext/tk/sample/demos-jp/paned1.rb b/ext/tk/sample/demos-jp/paned1.rb
deleted file mode 100644
index 987a073086..0000000000
--- a/ext/tk/sample/demos-jp/paned1.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# paned1.rb
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows horizontally.
-#
-# based on "Id: paned1.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
-
-if defined?($paned1_demo) && $paned1_demo
-  $paned1_demo.destroy
-  $paned1_demo = nil
-end
-
-$paned1_demo = TkToplevel.new {|w|
-  title("Horizontal Paned Window Demonstration")
-  iconname("paned1")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($paned1_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-���ο��դ����줿��ĤΥ�����ɥ��δ֤λ��ڤ��Ȥϡ���Ĥ��ΰ�򤽤줾��Υ�����ɥ��Τ����ʬ�䤹�뤿��Τ�ΤǤ������ܥ���ǻ��ڤ������ȡ�ʬ�䥵�����ѹ����������ǤϺ�ɽ���Ϥʤ��줺�����ꤵ�����Ȥ���ɽ������������ޤ����ޥ����ˤ����ڤ�������ɿ路�ƥ��������ѹ�����ɽ�����ʤ���褦�ˤ��������ϡ��ޥ���������ܥ����ȤäƤ���������
-�⤷���ʤ����ȤäƤ��� Ruby �˥�󥯤���Ƥ��� Tk �饤�֥�꤬ panedwindow ��������Ƥ��ʤ�
-��硢���Υǥ�Ϥ��ޤ�ư���ʤ��Ϥ��Ǥ������ξ��ˤ� panedwindow ����������Ƥ���褦��
-��꿷�����С������� Tk ���Ȥ߹�碌�ƻ
-�褦�ˤ��Ƥ���������
-EOL
-
-# The bottom buttons
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
-                 $paned1_demo.destroy
-                 $paned1_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-                 showCode 'paned1'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-TkPanedwindow.new(base_frame, :orient=>:horizontal){|f|
-  add(Tk::Label.new(f, :text=>"This is the\nleft side", :bg=>'yellow'),
-      Tk::Label.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
-
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
-}
diff --git a/ext/tk/sample/demos-jp/paned2.rb b/ext/tk/sample/demos-jp/paned2.rb
deleted file mode 100644
index a1aee81690..0000000000
--- a/ext/tk/sample/demos-jp/paned2.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# paned2.rb --
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows vertically.
-#
-# based on "Id: paned2.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
-
-if defined?($paned2_demo) && $paned2_demo
-  $paned2_demo.destroy
-  $paned2_demo = nil
-end
-
-$paned2_demo = TkToplevel.new {|w|
-  title("Vertical Paned Window Demonstration")
-  iconname("paned2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($paned2_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-���Υ���������С��դ��Υ��������åȤ��֤��줿��ĤΥ�����ɥ��δ֤λ��ڤ��Ȥϡ���Ĥ��ΰ�򤽤줾��Υ�����ɥ��Τ����ʬ�䤹�뤿��Τ�ΤǤ������ܥ���ǻ��ڤ������ȡ�ʬ�䥵�����ѹ����������ǤϺ�ɽ���Ϥʤ��줺�����ꤵ�����Ȥ���ɽ������������ޤ����ޥ����ˤ����ڤ�������ɿ路�ƥ��������ѹ�����ɽ�����ʤ���褦�ˤ��������ϡ��ޥ���������ܥ����ȤäƤ���������
-�⤷���ʤ����ȤäƤ��� Ruby �˥�󥯤���Ƥ��� Tk �饤�֥�꤬ panedwindow ��������Ƥ��ʤ�
-��硢���Υǥ�Ϥ��ޤ�ư���ʤ��Ϥ��Ǥ������ξ��ˤ� panedwindow ����������Ƥ���褦��
-��꿷�����С������� Tk ���Ȥ߹�碌�ƻ
-�褦�ˤ��Ƥ���������
-EOL
-
-# The bottom buttons
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
-                 $paned2_demo.destroy
-                 $paned2_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-                 showCode 'paned2'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-paneList = TkVariable.new  # define as normal variable (not array)
-paneList.value = [         # ruby's array --> tcl's list
-    'Ruby/Tk �Υ��������åȰ���',
-    'TkButton',
-    'TkCanvas',
-    'TkCheckbutton',
-    'TkEntry',
-    'TkFrame',
-    'TkLabel',
-    'TkLabelframe',
-    'TkListbox',
-    'TkMenu',
-    'TkMenubutton',
-    'TkMessage',
-    'TkPanedwindow',
-    'TkRadiobutton',
-    'TkScale',
-    'TkScrollbar',
-    'TkSpinbox',
-    'TkText',
-    'TkToplevel'
-]
-
-# Create the pane itself
-TkPanedwindow.new(base_frame, :orient=>:vertical){|f|
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
-
-  add(TkFrame.new(f){|paned2_top|
-        TkListbox.new(paned2_top, :listvariable=>paneList) {
-          # Invert the first item to highlight it
-          itemconfigure(0, :background=>self.cget(:foreground),
-                           :foreground=>self.cget(:background) )
-          yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right,
-                                                      :fill=>:y))
-          pack(:fill=>:both, :expand=>true)
-        }
-      },
-
-      TkFrame.new(f, :height=>120) {|paned2_bottom|
-        # The bottom window is a text widget with scrollbar
-        paned2_xscr = TkScrollbar.new(paned2_bottom)
-        paned2_yscr = TkScrollbar.new(paned2_bottom)
-        paned2_text = TkText.new(paned2_bottom, :width=>30, :wrap=>:non) {
-          insert('1.0', '���������֤���Ƥ���Τϡ�' +
-                        '�������̤Υƥ����ȥ��������åȤǤ���')
-          xscrollbar(paned2_xscr)
-          yscrollbar(paned2_yscr)
-        }
-        Tk.grid(paned2_text, paned2_yscr, :sticky=>'nsew')
-        Tk.grid(paned2_xscr, :sticky=>'nsew')
-        TkGrid.columnconfigure(paned2_bottom, 0, :weight=>1)
-        TkGrid.rowconfigure(paned2_bottom, 0, :weight=>1)
-      } )
-}
diff --git a/ext/tk/sample/demos-jp/pendulum.rb b/ext/tk/sample/demos-jp/pendulum.rb
deleted file mode 100644
index 48839aa58a..0000000000
--- a/ext/tk/sample/demos-jp/pendulum.rb
+++ /dev/null
@@ -1,242 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# This demonstration illustrates how Tcl/Tk can be used to construct
-# simulations of physical systems.
-# (called by 'widget')
-#
-# based on Tcl/Tk8.5a2 widget demos
-
-# destroy toplevel widget for this demo script
-if defined?($pendulum_demo) && $pendulum_demo
-  $pendulum_demo.destroy
-  $pendulum_demo = nil
-end
-
-# create toplevel widget
-$pendulum_demo = TkToplevel.new {|w|
-  title("Pendulum Animation Demonstration")
-  iconname("pendulum")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($pendulum_demo).pack(:fill=>:both, :expand=>true)
-
-# create label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text '���Υǥ�ϡ�ʪ���ϤΥ��ߥ�졼�����˴ؤ��褦�ʥ��˥᡼�����¹Ԥ��뤿��� Ruby/Tk ��ɤΤ褦���Ѥ��뤳�Ȥ��Ǥ��뤫�򼨤��Ƥ��ޤ�����¦�Υ����Х���ñ��ʿ���ҤǤ���ʪ���ϼ��ΤΥ���ե�����ɽ���Ǥ���Τ��Ф�����¦�Υ����Х��ϷϤΰ�����֤Υ���աʳ�®�٤ȳ��٤Ȥ�ץ��åȤ�����ΡˤˤʤäƤ��ޤ�����¦�Υ����Х���ǥ���å�����ӥɥ�å���Ԥäƿ���ҤνŤ�ΰ��֤��Ѥ��ƤߤƤ���������'
-}
-msg.pack('side'=>'top')
-
-# create frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $pendulum_demo
-      $pendulum_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'pendulum'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# animated wave
-class PendulumAnimationDemo
-  def initialize(frame)
-    # Create some structural widgets
-    @pane = TkPanedWindow.new(frame, :orient=>:horizontal).pack(:fill=>:both, :expand=>true)
-#    @pane.add(@lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation'))
-#    @pane.add(@lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space'))
-    @lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation')
-    @lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space')
-
-    # Create the canvas containing the graphical representation of the
-    # simulated system.
-    @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white',
-                      :borderwidth=>2, :relief=>:sunken)
-    TkcText.new(@c, 5, 5, :anchor=>:nw,
-                :text=>'Click to Adjust Bob Start Position')
-    # Coordinates of these items don't matter; they will be set properly below
-    @plate = TkcLine.new(@c, 0, 25, 320, 25, :width=>2, :fill=>'grey50')
-    @rod = TkcLine.new(@c, 1, 1, 1, 1, :width=>3, :fill=>'black')
-    @bob = TkcOval.new(@c, 1, 1, 2, 2,
-                       :width=>3, :fill=>'yellow', :outline=>'black')
-    TkcOval.new(@c, 155, 20, 165, 30, :fill=>'grey50', :outline=>'')
-
-    # pack
-    @c.pack(:fill=>:both, :expand=>true)
-
-    # Create the canvas containing the phase space graph; this consists of
-    # a line that gets gradually paler as it ages, which is an extremely
-    # effective visual trick.
-    @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white',
-                      :borderwidth=>2, :relief=>:sunken)
-    @y_axis = TkcLine.new(@k, 160, 200, 160, 0, :fill=>'grey75', :arrow=>:last)
-    @x_axis = TkcLine.new(@k, 0, 100, 320, 100, :fill=>'grey75', :arrow=>:last)
-
-    @graph = {}
-    90.step(0, -10){|i|
-      # Coordinates of these items don't matter;
-      # they will be set properly below
-      @graph[i] = TkcLine.new(@k, 0, 0, 1, 1, :smooth=>true, :fill=>"grey#{i}")
-    }
-
-    # labels
-    @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne,
-                               :text=>'q', :font=>'Symbol 8')
-    @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne,
-                               :text=>'dq', :font=>'Symbol 8')
-
-    # pack
-    @k.pack(:fill=>:both, :expand=>true)
-
-    # Initialize some variables
-    @points = []
-    @theta = 45.0
-    @dTheta = 0.0
-    @length = 150
-
-    # animation loop
-    @timer = TkTimer.new(15){ repeat }
-
-    # binding
-    @c.bindtags_unshift(btag = TkBindTag.new)
-    btag.bind('Destroy'){ @timer.stop }
-    btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x.to_i, y.to_i)},
-              '%x %y')
-    btag.bind('B1-Motion', proc{|x, y| showPendulum(x.to_i, y.to_i)}, '%x %y')
-    btag.bind('ButtonRelease-1',
-              proc{|x, y| showPendulum(x.to_i, y.to_i); @timer.start },
-              '%x %y')
-
-    btag.bind('Configure', proc{|w| @plate.coords(0, 25, w.to_i, 25)}, '%w')
-
-    @k.bind('Configure', proc{|h, w|
-              h = h.to_i
-              w = w.to_i
-              @psh = h/2;
-              @psw = w/2
-              @x_axis.coords(2, @psh, w-2, @psh)
-              @y_axis.coords(@psw, h-2, @psw, 2)
-              @label_theta.coords(@psw-4, 6)
-              @label_dtheta.coords(w-6, @psh+4)
-            }, '%h %w')
-
-    # add
-    Tk.update
-    @pane.add(@lf1)
-    @pane.add(@lf2)
-
-    # init display
-    showPendulum
-
-    # animation start
-    @timer.start(500)
-  end
-
-  # This procedure makes the pendulum appear at the correct place on the
-  # canvas. If the additional arguments x, y are passed instead of computing
-  # the position of the pendulum from the length of the pendulum rod and its
-  # angle, the length and angle are computed in reverse from the given
-  # location (which is taken to be the centre of the pendulum bob.)
-  def showPendulum(x=nil, y=nil)
-    if x && y && (x != 160 || y != 25)
-      @dTheta = 0.0
-      x2 = x - 160
-      y2 = y - 25
-      @length = Math.hypot(x2, y2)
-      @theta = Math.atan2(x2,y2)*180/Math::PI
-    else
-      angle = @theta*Math::PI/180
-      x = 160 + @length*Math.sin(angle)
-      y = 25 + @length*Math.cos(angle)
-    end
-
-    @rod.coords(160, 25, x, y)
-    @bob.coords(x-15, y-15, x+15, y+15)
-  end
-
-  # Update the phase-space graph according to the current angle and the
-  # rate at which the angle is changing (the first derivative with
-  # respect to time.)
-  def showPhase
-    unless @psw && @psh
-      @psw = @k.width/2
-      @psh = @k.height/2
-    end
-    @points << @theta + @psw << -20*@dTheta + @psh
-    if @points.length > 100
-      @points = @points[-100..-1]
-    end
-    (0...100).step(10){|i|
-      first = - i
-      last = 11 - i
-      last = -1 if last >= 0
-      next if first > last
-      lst = @points[first..last]
-      @graph[i].coords(lst) if lst && lst.length >= 4
-    }
-  end
-
-  # This procedure is the "business" part of the simulation that does
-  # simple numerical integration of the formula for a simple rotational
-  # pendulum.
-  def recomputeAngle
-    scaling = 3000.0/@length/@length
-
-    # To estimate the integration accurately, we really need to
-    # compute the end-point of our time-step.  But to do *that*, we
-    # need to estimate the integration accurately!  So we try this
-    # technique, which is inaccurate, but better than doing it in a
-    # single step.  What we really want is bound up in the
-    # differential equation:
-    #       ..             - sin theta
-    #      theta + theta = -----------
-    #                         length
-    # But my math skills are not good enough to solve this!
-
-    # first estimate
-    firstDDTheta = -Math.sin(@theta * Math::PI/180) * scaling
-    midDTheta = @dTheta + firstDDTheta
-    midTheta = @theta + (@dTheta + midDTheta)/2
-    # second estimate
-    midDDTheta = -Math.sin(midTheta * Math::PI/180) * scaling
-    midDTheta = @dTheta + (firstDDTheta + midDDTheta)/2
-    midTheta = @theta + (@dTheta + midDTheta)/2
-    # Now we do a double-estimate approach for getting the final value
-    # first estimate
-    midDDTheta = -Math.sin(midTheta * Math::PI/180) * scaling
-    lastDTheta = midDTheta + midDDTheta
-    lastTheta = midTheta + (midDTheta+ lastDTheta)/2
-    # second estimate
-    lastDDTheta = -Math.sin(lastTheta * Math::PI/180) * scaling
-    lastDTheta = midDTheta + (midDDTheta + lastDDTheta)/2
-    lastTheta = midTheta + (midDTheta + lastDTheta)/2
-    # Now put the values back in our globals
-    @dTheta = lastDTheta
-    @theta = lastTheta
-  end
-
-  # This method ties together the simulation engine and the graphical
-  # display code that visualizes it.
-  def repeat
-    # Simulate
-    recomputeAngle
-
-    # Update the display
-    showPendulum
-    showPhase
-  end
-end
-
-# Start the animation processing
-PendulumAnimationDemo.new(base_frame)
diff --git a/ext/tk/sample/demos-jp/plot.rb b/ext/tk/sample/demos-jp/plot.rb
deleted file mode 100644
index a49ed00df8..0000000000
--- a/ext/tk/sample/demos-jp/plot.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# 2-D plot widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($plot_demo) && $plot_demo
-  $plot_demo.destroy
-  $plot_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$plot_demo = TkToplevel.new {|w|
-  title("Plot Demonstration")
-  iconname("Plot")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($plot_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"���Υ�����ɥ��ϴ�ñ��2�����Υץ��åȤ�ޤ�������Х� widget�Ǥ���ɽ�����줿����ޥ����ܥ���1�ǥɥ�å����ƥǡ����򤤤��뤳�Ȥ��Ǥ��ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$plot_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $plot_demo
-      $plot_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'plot'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# font ����
-  if $tk_version =~ /^4.*/
-    plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  else
-    font = 'Helvetica 18'
-  end
-
-# canvas ����
-$plot_canvas = TkCanvas.new(base_frame,'relief'=>'raised','width'=>450,'height'=>300)
-$plot_canvas.pack('side'=>'top', 'fill'=>'x')
-
-# plot ����
-TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
-TkcLine.new($plot_canvas, 100, 250, 100,  50, 'width'=>2)
-TkcText.new($plot_canvas, 225, 20,
-            'text'=>"��ñ�ʥץ��å�", 'font'=>plotFont, 'fill'=>'brown')
-
-(0..10).each {|i|
-  x = 100 + (i * 30)
-  TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
-  TkcText.new($plot_canvas, x, 254,
-              'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
-}
-(0..5).each {|i|
-  y = 250 - (i * 40)
-  TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
-  TkcText.new($plot_canvas, 96, y,
-              'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
-}
-
-for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-  x = 100 + (3*xx)
-  y = 250 - (4*yy)/5
-  item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6,
-                     'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-  item.addtag 'point'
-end
-
-$plot_canvas.itembind('point', 'Any-Enter',
-                      proc{$plot_canvas.itemconfigure 'current','fill','red'})
-$plot_canvas.itembind('point', 'Any-Leave',
-                      proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
-$plot_canvas.itembind('point', '1',
-                      proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
-$plot_canvas.itembind('point', 'ButtonRelease-1',
-                      proc{$plot_canvas.dtag 'selected'})
-$plot_canvas.bind('B1-Motion',
-                  proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
-
-$plot = {'lastX'=>0, 'lastY'=>0}
-
-# plotDown --
-# This method is invoked when the mouse is pressed over one of the
-# data points.  It sets up state to allow the point to be dragged.
-#
-# Arguments:
-# w -           The canvas window.
-# x, y -        The coordinates of the mouse press.
-
-def plotDown (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $plot['lastX'] = x
-  $plot['lastY'] = y
-end
-
-# plotMove --
-# This method is invoked during mouse motion events.  It drags the
-# current item.
-#
-# Arguments:
-# w -           The canvas window.
-# x, y -        The coordinates of the mouse.
-
-def plotMove (w, x, y)
-  w.move 'selected', x - $plot['lastX'], y - $plot['lastY']
-  $plot['lastX'] = x
-  $plot['lastY'] = y
-end
-
diff --git a/ext/tk/sample/demos-jp/puzzle.rb b/ext/tk/sample/demos-jp/puzzle.rb
deleted file mode 100644
index 16d7ce497c..0000000000
--- a/ext/tk/sample/demos-jp/puzzle.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# widet demo 'puzzle' (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($puzzle_demo) && $puzzle_demo
-  $puzzle_demo.destroy
-  $puzzle_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$puzzle_demo = TkToplevel.new {|w|
-  title("15-Puzzle Demonstration")
-  iconname("15-Puzzle")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($puzzle_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "����15-�ѥ���ϥܥ���򽸤�ƤǤ��Ƥ��ޤ��������Ƥ������٤Υԡ����򥯥�å�����ȡ����Υԡ��������ζ����Ƥ�����˥��饤�ɤ��ޤ�����������³�����ԡ��������ο��ν�˾夫�鲼�������鱦���¤֤褦�ˤ��Ƥ���������"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $puzzle_demo
-      $puzzle_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'puzzle'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-#
-# Special trick: scrollbar widget ���������Ƥ��� trough color ���Ѥ��뤳�Ȥ�
-#                ������ʬ�Τ���ΰſ������򤷡����ꤹ��
-#
-begin
-  if Tk.windowingsystem() == 'aqua'
-    frameWidth  = 168
-    frameHeight = 168
-  elsif Tk.default_widget_set == :Ttk
-    frameWidth  = 148
-    frameHeight = 124
-  else
-    frameWidth  = 120
-    frameHeight = 120
-  end
-rescue
-  frameWidth  = 120
-  frameHeight = 120
-end
-
-# depend_on_button_width = true
-depend_on_button_width = false
-
-s = TkScrollbar.new(base_frame)
-base = TkFrame.new(base_frame) {
-  width  frameWidth
-  height frameHeight
-  borderwidth 2
-  relief 'sunken'
-  bg s['troughcolor']
-}
-s.destroy
-base.pack('side'=>'top', 'padx'=>'1c', 'pady'=>'1c')
-
-# proc �Υ������פ��Ĥ��뤿�ᡤproc �����᥽�åɤ��Ѱ�
-# �������Ƥ����ͤС��롼������ͤ��Ѳ����� num �αƶ��������
-# puzzleSwitch ���� 2 �������Ѳ����Ƥ��ޤ��������̤�ˤϤʤ�ʤ���
-def def_puzzleswitch_proc(w, num)
-  proc{puzzleSwitch w, num}
-end
-
-$xpos = {}
-$ypos = {}
-order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
-(0..14).each{|i|
-  num = order[i]
-  $xpos[num] = (i % 4) * 0.25
-  $ypos[num] = (i / 4) * 0.25
-  TkButton.new(base) {|w|
-    relief 'raised'
-    text num
-    highlightthickness 0
-    command def_puzzleswitch_proc(w, num)
-    if depend_on_button_width && (w.winfo_reqwidth * 4 > base.width)
-      base.width = w.winfo_reqwidth * 4
-    end
-  }.place('relx'=>$xpos[num], 'rely'=>$ypos[num],
-          'relwidth'=>0.25, 'relheight'=>0.25)
-}
-$xpos['space'] = 0.75
-$ypos['space'] = 0.75
-
-############
-def puzzleSwitch(w, num)
-  if ( ($ypos[num] >= ($ypos['space'] - 0.01))     \
-      && ($ypos[num] <= ($ypos['space'] + 0.01))   \
-      && ($xpos[num] >= ($xpos['space'] - 0.26))   \
-      && ($xpos[num] <= ($xpos['space'] + 0.26)))  \
-    || (($xpos[num] >= ($xpos['space'] - 0.01))    \
-        && ($xpos[num] <= ($xpos['space'] + 0.01)) \
-        && ($ypos[num] >= ($ypos['space'] - 0.26)) \
-        && ($ypos[num] <= ($ypos['space'] + 0.26)))
-    tmp = $xpos['space']
-    $xpos['space'] = $xpos[num]
-    $xpos[num] = tmp
-    tmp = $ypos['space']
-    $ypos['space'] = $ypos[num]
-    $ypos[num] = tmp
-    w.place('relx'=>$xpos[num], 'rely'=>$ypos[num])
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/radio.rb b/ext/tk/sample/demos-jp/radio.rb
deleted file mode 100644
index 3355f25116..0000000000
--- a/ext/tk/sample/demos-jp/radio.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($radio_demo) && $radio_demo
-  $radio_demo.destroy
-  $radio_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$radio_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration")
-  iconname("radio")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($radio_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���ˤ�2�ĤΥ饸���ܥ��󥰥롼�פ�ɽ������Ƥ��ޤ����ܥ���򥯥�å�����ȡ����Υܥ�����������Υ��롼�פ�������򤵤�ޤ����ƥ��롼�פ��Ф��Ƥ��Υ��롼�פ���ΤɤΥܥ������򤵤�Ƥ��뤫�򼨤��ѿ���������Ƥ��Ƥ��ޤ������ߤ��ѿ����ͤ򸫤�ˤϡ��ѿ����ȡץܥ���򥯥�å����Ƥ���������"
-}
-msg.pack('side'=>'top')
-
-# �ѿ�����
-size = TkVariable.new
-color = TkVariable.new
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $radio_demo
-      $radio_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'radio'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�ѿ�����'
-    command proc{
-      showVars(base_frame, ['size', size], ['color', color])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-f_left = TkFrame.new(base_frame)
-f_right = TkFrame.new(base_frame)
-f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-
-# radiobutton ����
-[10, 12, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "�ݥ���ȥ����� #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
-['��', '��', '��', '��', '��', '��'].each {|col|
-  TkRadioButton.new(f_right) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
diff --git a/ext/tk/sample/demos-jp/radio2.rb b/ext/tk/sample/demos-jp/radio2.rb
deleted file mode 100644
index 91496beb6d..0000000000
--- a/ext/tk/sample/demos-jp/radio2.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# radio2.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio2_demo) && $radio2_demo
-  $radio2_demo.destroy
-  $radio2_demo = nil
-end
-
-# demo toplevel widget
-$radio2_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration 2")
-  iconname("radio2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($radio2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "���ˤ�3�ĤΥ饸���ܥ��󥰥롼�פ�ɽ������Ƥ��ޤ����ܥ���򥯥�å�����ȡ����Υܥ�����������Υ��롼�פ�������򤵤�ޤ����ƥ��롼�פ��Ф��Ƥ��Υ��롼�פ���ΤɤΥܥ������򤵤�Ƥ��뤫�򼨤��ѿ���������Ƥ��Ƥ��ޤ������ߤ��ѿ����ͤ򸫤�ˤϡ��ѿ����ȡץܥ���򥯥�å����Ƥ���������"
-}
-msg.pack('side'=>'top')
-
-#
-size = TkVariable.new
-color = TkVariable.new
-align = TkVariable.new
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $radio2_demo
-      $radio2_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'radio2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�ѿ�����'
-    command proc{
-      showVars(base_frame,
-               ['size', size], ['color', color], ['compound', align])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-f_left  = TkLabelFrame.new(base_frame, 'text'=>'ʸ��������',
-                           'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new(base_frame, 'text'=>'��',
-                           'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'�ӥåȥޥå�����',
-                           'pady'=>2, 'padx'=>2)
-f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_mid.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-
-# radiobutton
-[10, 12, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "�ݥ���ȥ����� #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
-}
-
-['��', '��', '��', '��', '��', '��'].each {|col|
-  TkRadioButton.new(f_mid) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-    anchor 'w'
-  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
-}
-
-# label = TkLabel.new(f_right, 'text'=>'��٥�', 'bitmap'=>'questhead',
-label = Tk::Label.new(f_right, 'text'=>'��٥�', 'bitmap'=>'questhead',
-                    'compound'=>'left')
-label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
-label.height(TkWinfo.reqheight(label))
-abtn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
-  lower = a.downcase
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
-                    'value'=>lower, 'indicatoron'=>0, 'width'=>7,
-                    'command'=>proc{label.compound(align.value)})
-}
-
-Tk.grid('x', abtn[0])
-Tk.grid(abtn[1], label, abtn[2])
-Tk.grid('x', abtn[3])
diff --git a/ext/tk/sample/demos-jp/radio3.rb b/ext/tk/sample/demos-jp/radio3.rb
deleted file mode 100644
index 763c522448..0000000000
--- a/ext/tk/sample/demos-jp/radio3.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# radio3.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio3_demo) && $radio3_demo
-  $radio3_demo.destroy
-  $radio3_demo = nil
-end
-
-# demo toplevel widget
-$radio3_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration 3")
-  iconname("radio3")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($radio3_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text '���ˤ�3�ĤΥ饸���ܥ��󥰥롼�פ�ɽ������Ƥ��ޤ����ܥ���򥯥�å�����ȡ����Υ��롼�פ�°���뤹�٤ƤΥܥ������ǥ���å������ܥ�����������򤵤줿���֤ˤʤ�ޤ����ƥ��롼�פˤϡ����Υ��롼�פ���ΤɤΥܥ������򤵤�Ƥ��뤫�򼨤��ѿ���������Ƥ��Ƥ��ޤ����֥ȥ饤���ơ��ȡץܥ��󤬲����줿�Ȥ��ˤϡ��饸���ܥ����ɽ�����ȥ饤���ơ��ȥ⡼�ɤˤʤ�ޤ��������줫�Υܥ�������򤹤�С��ܥ���ξ��֤ϸ��Τ褦�˸ġ��Υܥ����on/off���֤򼨤��褦�ˤʤ�ޤ������ߤ��ѿ����ͤ򸫤�ˤϡ��ѿ����ȡץܥ���򥯥�å����Ƥ���������'
-}
-msg.grid(:row=>0, :column=>0, :columnspan=>3, :sticky=>'nsew')
-
-# variable
-size = TkVariable.new
-color = TkVariable.new
-align = TkVariable.new
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
-         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         TkButton.new(frame, :text=>'�ѿ�����',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{
-                        showVars(base_frame, ['size', size],
-                                 ['color', color], ['compound', align])
-                      }),
-         TkButton.new(frame, :text=>'�����ɻ���',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{showCode 'radio3'}),
-         TkButton.new(frame, :text=>'�Ĥ���',
-                      :image=>$image['delete'], :compound=>:left,
-                      :command=>proc{
-                        tmppath = $radio3_demo
-                        $radio3_demo = nil
-                        $showVarsWin[tmppath.path] = nil
-                        tmppath.destroy
-                      }),
-         :padx=>4, :pady=>4)
-  frame.grid_columnconfigure(0, :weight=>1)
-  TkGrid(frame, :row=>3, :column=>0, :columnspan=>3, :sticky=>'nsew')
-}
-
-# frame
-f_left  = TkLabelFrame.new(base_frame, 'text'=>'ʸ��������',
-                           'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new(base_frame, 'text'=>'��',
-                           'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'�ӥåȥޥå�����',
-                           'pady'=>2, 'padx'=>2)
-f_left .grid('column'=>0, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
-f_mid  .grid('column'=>1, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
-f_right.grid('column'=>2, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c')
-
-TkButton.new(base_frame, 'text'=>'�ȥ饤���ơ���',
-             'command'=>proc{size.value = 'multi'; color.value = 'multi'}){
-  grid('column'=>2, 'row'=>2, 'pady'=>'.5c', 'padx'=>'.5c')
-}
-
-# radiobutton
-[10, 12, 14, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "�ݥ���ȥ����� #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-    tristatevalue 'multi'
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
-}
-
-['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
-  TkRadioButton.new(f_mid) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-    anchor 'w'
-    tristatevalue 'multi'
-    command proc{f_mid.fg(color.value)}
-  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
-}
-
-# label = TkLabel.new(f_right, 'text'=>'��٥�', 'bitmap'=>'questhead',
-label = Tk::Label.new(f_right, 'text'=>'��٥�', 'bitmap'=>'questhead',
-                    'compound'=>'left')
-label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
-label.height(TkWinfo.reqheight(label))
-a_btn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
-                    'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7,
-                    'command'=>proc{label.compound(align.value)})
-}
-
-Tk.grid('x', a_btn[0])
-Tk.grid(a_btn[1], label, a_btn[2])
-Tk.grid('x', a_btn[3])
diff --git a/ext/tk/sample/demos-jp/rmt b/ext/tk/sample/demos-jp/rmt
deleted file mode 100644
index dcfb328fc8..0000000000
--- a/ext/tk/sample/demos-jp/rmt
+++ /dev/null
@@ -1,268 +0,0 @@
-#!/usr/bin/env ruby
-
-# rmt --
-# This script implements a simple remote-control mechanism for
-# Tk applications.  It allows you to select an application and
-# then type commands to that application.
-
-require 'tk'
-
-class Rmt
-  def initialize(parent=nil)
-    win = self
-
-    unless parent
-      parent = TkRoot.new
-    end
-    root = TkWinfo.toplevel(parent)
-    root.minsize(1,1)
-
-    # The instance variable below keeps track of the remote application
-    # that we're sending to.  If it's an empty string then we execute
-    # the commands locally.
-    @app = 'local'
-    @mode = 'Ruby'
-
-    # The instance variable below keeps track of whether we're in the
-    # middle of executing a command entered via the text.
-    @executing = 0
-
-    # The instance variable below keeps track of the last command executed,
-    # so it can be re-executed in response to !! commands.
-    @lastCommand = ""
-
-    # Create menu bar.  Arrange to recreate all the information in the
-    # applications sub-menu whenever it is cascaded to.
-
-    TkFrame.new(root, 'relief'=>'raised', 'bd'=>2) {|f|
-      pack('side'=>'top', 'fill'=>'x')
-      TkMenubutton.new(f, 'text'=>'File', 'underline'=>0) {|mb|
-	TkMenu.new(mb) {|mf|
-	  mb.menu(mf)
-	  TkMenu.new(mf) {|ma|
-	    postcommand proc{win.fillAppsMenu ma}
-	    mf.add('cascade', 'label'=>'Select Application',
-		   'menu'=>ma, 'underline'=>0)
-	  }
-	  add('command', 'label'=>'Quit',
-	      'command'=>proc{root.destroy}, 'underline'=>0)
-	}
-	pack('side'=>'left')
-      }
-    }
-
-    # Create text window and scrollbar.
-
-    @txt = TkText.new(root, 'relief'=>'sunken', 'bd'=>2, 'setgrid'=>true) {
-      yscrollbar(TkScrollbar.new(root){pack('side'=>'right', 'fill'=>'y')})
-      pack('side'=>'left')
-    }
-
-    @promptEnd = TkTextMark.new(@txt, 'insert')
-
-    # Create a binding to forward commands to the target application,
-    # plus modify many of the built-in bindings so that only information
-    # in the current command can be deleted (can still set the cursor
-    # earlier in the text and select and insert;  just can't delete).
-
-    @txt.bindtags([@txt, TkText, root, 'all'])
-    @txt.bind('Return', proc{
-		@txt.set_insert('end - 1c')
-		@txt.insert('insert', "\n")
-		win.invoke
-		Tk.callback_break
-	      })
-    @txt.bind('Delete', proc{
-		begin
-		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
-		rescue
-		end
-		if @txt.tag_nextrange('sel', '1.0', 'end') == []
-		  if @txt.compare('insert', '<', @promptEnd)
-		    Tk.callback_break
-		  end
-		end
-	      })
-    @txt.bind('BackSpace', proc{
-		begin
-		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
-		rescue
-		end
-		if @txt.tag_nextrange('sel', '1.0', 'end') == []
-		  if @txt.compare('insert', '<', @promptEnd)
-		    Tk.callback_break
-		  end
-		end
-	      })
-    @txt.bind('Control-d', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Control-k', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  @txt.set_insert(@promptEnd)
-		end
-	      })
-    @txt.bind('Control-t', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Meta-d', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Meta-BackSpace', proc{
-		if @txt.compare('insert', '<=', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Control-h', proc{
-		if @txt.compare('insert', '<=', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-
-    @txt.tag_configure('bold', 'font'=>['Courier', 12, 'bold'])
-
-    @app = Tk.appname('rmt')
-    if (@app =~ /^rmt(.*)$/)
-      root.title("Tk Remote Controller#{$1}")
-      root.iconname("Tk Remote#{$1}")
-    end
-    prompt
-    @txt.focus
-    #@app = TkWinfo.appname(TkRoot.new)
-  end
-
-  def tkTextInsert(w,s)
-    return if s == ""
-    begin
-      if w.compare('sel.first','<=','insert') \
-	&& w.compare('sel.last','>=','insert')
-	w.tag_remove('sel', 'sel.first', @promptEnd)
-	w.delete('sel.first', 'sel.last')
-      end
-    rescue
-    end
-    w.insert('insert', s)
-    w.see('insert')
-  end
-
-  # The method below is used to print out a prompt at the
-  # insertion point (which should be at the beginning of a line
-  # right now).
-
-  def prompt
-    @txt.insert('insert', "#{@app}: ")
-    @promptEnd.set('insert')
-    @promptEnd.gravity = 'left'
-    @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
-  end
-
-  # The method below executes a command (it takes everything on the
-  # current line after the prompt and either sends it to the remote
-  # application or executes it locally, depending on "app".
-
-  def invoke
-    cmd = @txt.get(@promptEnd, 'insert')
-    @executing += 1
-    case (@mode)
-    when 'Tcl'
-      if Tk.info('complete', cmd)
-	if (cmd == "!!\n")
-	  cmd = @lastCommand
-	else
-	  @lastCommand = cmd
-	end
-	begin
-	  msg = Tk.appsend(@app, false, cmd)
-	rescue
-	  msg = "Error: #{$!}"
-	end
-	@txt.insert('insert', msg + "\n") if msg != ""
-	prompt
-	@promptEnd.set('insert')
-      end
-
-    when 'Ruby'
-      if (cmd == "!!\n")
-	cmd = @lastCommand
-      end
-      complete = true
-      begin
-	eval("proc{#{cmd}}")
-      rescue
-	complete = false
-      end
-      if complete
-	@lastCommand = cmd
-	begin
-#	  msg = Tk.appsend(@app, false,
-#			   'ruby',
-#			   '"(' + cmd.gsub(/[][$"]/, '\\\\\&') + ').to_s"')
-	  msg = Tk.rb_appsend(@app, false, cmd)
-	rescue
-	  msg = "Error: #{$!}"
-	end
-	@txt.insert('insert', msg + "\n") if msg != ""
-	prompt
-	@promptEnd.set('insert')
-      end
-    end
-
-    @executing -= 1
-    @txt.yview_pickplace('insert')
-  end
-
-  # The following method is invoked to change the application that
-  # we're talking to.  It also updates the prompt for the current
-  # command, unless we're in the middle of executing a command from
-  # the text item (in which case a new prompt is about to be output
-  # so there's no need to change the old one).
-
-  def newApp(appName, mode)
-    @app = appName
-    @mode = mode
-    if @executing == 0
-      @promptEnd.gravity = 'right'
-      @txt.delete("#{@promptEnd.path} linestart", @promptEnd)
-      @txt.insert(@promptEnd, "#{appName}: ")
-      @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
-      @promptEnd.gravity = 'left'
-    end
-  end
-
-  # The method below will fill in the applications sub-menu with a list
-  # of all the applications that currently exist.
-
-  def fillAppsMenu(menu)
-    win = self
-    begin
-      menu.delete(0,'last')
-    rescue
-    end
-    TkWinfo.interps.sort.each{|ip|
-      begin
-	if Tk.appsend(ip, false, 'info commands ruby') == ""
-	  mode = 'Tcl'
-	else
-	  mode = 'Ruby'
-	end
-	menu.add('command', 'label'=>format("%s    (#{mode}/Tk)", ip),
-		 'command'=>proc{win.newApp ip, mode})
-      rescue
-	menu.add('command', 'label'=>format("%s (unknown Tk)", ip),
-		 'command'=>proc{win.newApp ip, mode}, 'state'=>'disabled')
-      end
-    }
-    menu.add('command', 'label'=>format("local    (Ruby/Tk)"),
-	     'command'=>proc{win.newApp 'local', 'Ruby'})
-  end
-end
-
-Rmt.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/rolodex b/ext/tk/sample/demos-jp/rolodex
deleted file mode 100644
index 2cc73e128f..0000000000
--- a/ext/tk/sample/demos-jp/rolodex
+++ /dev/null
@@ -1,320 +0,0 @@
-#!/usr/bin/env ruby
-#
-# rolodex --
-# This script is a part of Tom LaStrange's rolodex
-#
-# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "03/08/02 12:45:21 nagai"
-#
-
-require "tk"
-
-
-def show_help(topic,x=0,y=0)
-  if( topic.is_a?(TkWindow) )
-    w = TkWinfo.containing(x,y)
-    if( TkWinfo.exist?(w) )
-      topic = w
-    end
-  end
-
-  if( $helpTopics.include?(topic) )
-    msg = $helpTopics[topic]
-  else
-    msg = "Sorry, but no help is available for this topic"
-  end
-  TkDialog.new("title"=>"Rolodex Help",
-	       "message"=>"Information on #{topic}:\n\n#{msg}",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-end
-
-def fillCard
-  clearAction
-  $root.frame.entry[1].insert(0,"Takaaki Tateishi")
-  $root.frame.entry[2].insert(0,"Japan Advanced Institute of Science and Techonology")
-  $root.frame.entry[3].insert(0,"1-1 Asahidai, Tatsunokuchi")
-  $root.frame.entry[4].insert(0,"Ishikawa 923-1292, Japan")
-  $root.frame.entry[5].insert(0,"private")
-    $root.frame.entry[6].insert(0,"***-***-****")
-  $root.frame.entry[7].insert(0,"***-***-****")
-end
-
-def addAction
-  for i in 1..7
-    STDERR.print format("%-12s %s\n",
-			RolodexFrame::LABEL[i],
-			$root.frame.entry[i].value)
-  end
-end
-
-def clearAction
-  for i in 1..7
-    $root.frame.entry[i].delete(0,"end")
-  end
-end
-
-def fileAction
-  TkDialog.new("title"=>"File Selection",
-	       "message"=>"This is a dummy file selection dialog box.\n",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-  STDERR.print "dummy file name\n"
-end
-
-def deleteAction
-  result = TkDialog.new("title"=>"Confirm Action",
-			"message"=>"Are you sure?",
-			"default_button"=>0,
-			"buttons"=>["Cancel"])
-  if( result.value == 0 )
-    clearAction
-  end
-end
-
-
-class RolodexFrame < TkFrame
-  attr_reader :entry, :label
-
-  LABEL = ["","Name:","Address:","","","Home Phone:","Work Phone:","Fax:"]
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    self["relief"] = "flat"
-
-    @i = []
-    @label = []
-    @entry = []
-    for i in 1..7
-      @i[i] = TkFrame.new(self)
-      @i[i].pack("side"=>"top",
-		 "pady"=>2,
-		 "anchor"=>"e")
-      @label[i] = TkLabel.new(@i[i],
-			      "text"=>LABEL[i],
-			      "anchor"=>"e")
-      @entry[i] = TkEntry.new(@i[i],
-			      "width"=>30,
-			      "relief"=>"sunken")
-      @entry[i].pack("side"=>"right")
-      @label[i].pack("side"=>"right")
-    end
-  end
-end
-
-class RolodexButtons < TkFrame
-  attr_reader :clear, :add, :search, :delete
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    @clear = TkButton.new(self,
-			  "text" => "Clear")
-    @add = TkButton.new(self,
-			"text" => "Add")
-    @search = TkButton.new(self,
-			   "text" => "Search")
-    @delete = TkButton.new(self,
-			   "text" => "Delete")
-    for w in [@clear,@add,@search,@delete]
-      w.pack("side"=>"left", "padx"=>2)
-    end
-  end
-end
-
-class RolodexMenuFrame < TkFrame
-  attr_reader :file_menu, :help_menu, :file, :help
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    configure("relief"=>"raised",
-	      "borderwidth"=>1)
-
-    @file = TkMenubutton.new(self,
-			     "text"=>"File",
-			     "underline"=>0)
-    @file_menu = TkMenu.new(@file)
-    @file_menu.add("command",
-		   "label" => "Load ...",
-		   "command" => proc{fileAction},
-		   "underline" => 0)
-    @file_menu.add("command",
-		   "label" => "Exit",
-		   "command" => proc{$root.destroy},
-		   "underline" => 0)
-    @file.menu(@file_menu)
-    @file.pack("side"=>"left")
-
-    @help = TkMenubutton.new(self,
-			     "text"=>"Help",
-			     "underline"=>0)
-    @help_menu = TkMenu.new(@help)
-    @help_menu.add("command",
-		   "label"=>"On Context...",
-		   "command"=>proc{show_help("context")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Help...",
-		   "command"=>proc{show_help("help")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Window...",
-		   "command"=>proc{show_help("window")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Keys...",
-		   "command"=>proc{show_help("keys")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On version...",
-		   "command"=>proc{show_help("version")},
-		   "underline"=>3)
-    @help.menu(@help_menu)
-    @help.pack("side"=>"right")
-  end
-end
-
-class Rolodex < TkRoot
-  attr_reader :frame, :buttons, :menu
-
-  def initialize(*args)
-    super(*args)
-    @frame = RolodexFrame.new(self)
-    @frame.pack("side"=>"top",
-		"fill"=>"y",
-		"anchor"=>"center")
-    @buttons = RolodexButtons.new(self)
-    @buttons.pack("side"=>"bottom",
-		  "pady"=>2,
-		  "anchor"=>"center")
-    @menu = RolodexMenuFrame.new(self)
-    @menu.pack("before"=>@frame,
-	       "side"=>"top",
-	       "fill"=>"x")
-  end
-end
-
-$root = Rolodex.new
-
-$root.buttons.delete.configure("command"=>proc{deleteAction})
-$root.buttons.add.configure("command"=>proc{addAction})
-$root.buttons.clear.configure("command"=>proc{clearAction})
-$root.buttons.search.configure("command"=>proc{addAction; fillCard})
-
-$root.buttons.clear.configure("text"=>"Clear   Ctrl+C")
-$root.bind("Control-c",proc{clearAction})
-
-$root.buttons.add.configure("text"=>"Add   Ctrl+A")
-$root.bind("Control-a",proc{addAction})
-
-$root.buttons.search.configure("text"=>"Search   Ctrl+S")
-$root.bind("Control-s",proc{addAction; fillCard})
-
-$root.buttons.delete.configure("text"=>"Delete...   Ctrl+D")
-$root.bind("Control-d",proc{deleteAction})
-
-$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
-$root.bind("Control-f",proc{fileAction})
-
-$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
-$root.bind("Control-q",proc{$root.destroy})
-
-$root.frame.entry[1].focus
-
-$root.bind("Any-F1",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-$root.bind("Any-Help",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-
-
-$helpTopics = {}
-
-$helpTopics[$root.menu.file] = <<EOF
-This is the "file" menu. It can be used to invoke\
-some overall operations on the rolodex applications,\
-such as loading a file or exiting.
-EOF
-
-$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
-The "Load" entry in the "File" menu posts a dialog box\
-that you can use to select a rolodex file
-EOF
-
-$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
-The "Exit" entry in the "File" menu causes the rolodex\
-application to terminate
-EOF
-
-$helpTopics[$root.frame.entry[1]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's name
-EOF
-
-$helpTopics[$root.frame.entry[2]] = <<EOF
-In this field of the rolodex entry you should\
-type the first line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[3]] = <<EOF
-In this field of the rolodex entry you should\
-type the second line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[4]] = <<EOF
-In this field of the rolodex entry you should\
-type the third line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[5]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's home phone number, or "private"\
-if the person doesn't want his or he number publicized
-EOF
-
-$helpTopics[$root.frame.entry[6]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's work phone number
-EOF
-
-$helpTopics[$root.frame.entry[7]] = <<EOF
-In this field of the rolodex entry you should\
-type the phone number for the person's FAX machine
-EOF
-
-$helpTopics["context"] = <<EOF
-Unfortunately, this application doesn't support context-sensitive\
-help in the usual way, because when this demo was written Ruby/Tk\
-didn't have a grab mechanism and this is needed for context-sensitive\
-help. Instead, you can achive much the same effect by simply moving\
-the mouse over the window you're curious about and pressing the\
-Help or F1 keys. You can do this anytime.
-EOF
-
-$helpTopics["help"] = <<EOF
-This application provides only very crude help. Besides the\
-entries in this menu, you can get help on individual windows\
-by moving the mouse cursor over the window and pressing the\
-Help or F1 keys.
-EOF
-
-$helpTopics["window"] = <<EOF
-This window is a dummy rolodex application created as part of\
-Tom LaStrange's toolkit benchmark. It doesn't really do anything\
-useful except to demonstrate a few features of the Ruby/Tk.
-EOF
-
-$helpTopics["keys"] = <<EOF
-The following accelerator keys are defined for this application\
-(in addition to those already available for the entry windows):
-Ctrl+A:		Add
-Ctrl+C:		Clear
-Ctrl+D:		Delete
-Ctrl+F:		Enter file name
-Ctrl+Q:		Exit application (quit)
-Ctrl+S:		Search (dummy operation)
-EOF
-
-$helpTopics["version"] = <<EOF
-This is version 1.0.1.
-EOF
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/rolodex-j b/ext/tk/sample/demos-jp/rolodex-j
deleted file mode 100644
index ee8dd110bc..0000000000
--- a/ext/tk/sample/demos-jp/rolodex-j
+++ /dev/null
@@ -1,300 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: euc-jp -*-
-#
-# rolodex --
-# ���Υ�����ץȤ� Tom LaStrange �� rolodex �ΰ����Ǥ���
-#
-# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "04/04/09 00:32:12 nagai"
-#
-
-require "tk"
-Tk.encoding = "euc-jp"
-
-def show_help(topic,x=0,y=0)
-  if( topic.is_a?(TkWindow) )
-    w = TkWinfo.containing(x,y)
-    if( w.is_a?(TkWindow) )
-      if( TkWinfo.exist?(w) )
-	topic = w
-      end
-    end
-  end
-
-  if( $helpTopics.include?(topic) )
-    msg = $helpTopics[topic]
-  else
-    msg = "���Υȥԥå��ˤĤ��ƤΥإ�פϤޤ����ѤǤ��ޤ���"
-  end
-  TkDialog.new("title"=>"Rolodex Help",
-	       "message"=>"��#{topic}��\n\n#{msg}",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-end
-
-def fillCard
-  clearAction
-  $root.frame.entry[1].insert(0, "Ω�� ����")
-  $root.frame.entry[2].insert(0, "923-1292 ���")
-  $root.frame.entry[3].insert(0, "ä��Į ���� 1-1")
-  $root.frame.entry[4].insert(0, "��Φ��ü�ʳص�����ر����")
-  $root.frame.entry[5].insert(0,"private")
-  $root.frame.entry[6].insert(0,"***-***-****")
-  $root.frame.entry[7].insert(0,"***-***-****")
-end
-
-def addAction
-  for i in 1..7
-    STDERR.print format("%-12s %s\n",
-			RolodexFrame::LABEL[i],
-			$root.frame.entry[i].value)
-  end
-end
-
-def clearAction
-  for i in 1..7
-    $root.frame.entry[i].delete(0,"end")
-  end
-end
-
-def fileAction
-  TkDialog.new("title"=>"File Selection",
-	       "message"=>"����ϥե�������������������Υ��ߡ��Ǥ���\n",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-  STDERR.print "dummy file name\n"
-end
-
-def deleteAction
-  result = TkDialog.new("title"=>"Confirm Action",
-			"message"=>"��������Ǥ�����",
-			"default_button"=>0,
-			"buttons"=>["����󥻥�"])
-  if( result.value == 0 )
-    clearAction
-  end
-end
-
-
-class RolodexFrame < TkFrame
-  attr_reader :entry, :label
-
-  LABEL = ["","̾��:","����","","","����(����):","����(���):","Fax:"]
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    self["relief"] = "flat"
-    @i = []
-    @label = []
-    @entry = []
-    for i in 1..7
-      @i[i] = TkFrame.new(self)
-      @i[i].pack("side"=>"top",
-		 "pady"=>2,
-		 "anchor"=>"e")
-      @label[i] = TkLabel.new(@i[i],
-			      "text"=>LABEL[i],
-			      "anchor"=>"e")
-      @entry[i] = TkEntry.new(@i[i],
-			      "width"=>30,
-			      "relief"=>"sunken")
-      @entry[i].pack("side"=>"right")
-      @label[i].pack("side"=>"right")
-    end
-  end
-end
-
-class RolodexButtons < TkFrame
-  attr_reader :clear, :add, :search, :delete
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    @clear = TkButton.new(self,"text" => "���ꥢ��")
-    @add = TkButton.new(self,  "text" => "�ɲ�")
-    @search = TkButton.new(self, "text" => "����")
-    @delete = TkButton.new(self,  "text" => "�õ�")
-    for w in [@clear,@add,@search,@delete]
-      w.pack("side"=>"left", "padx"=>2)
-    end
-  end
-end
-
-class RolodexMenuFrame < TkFrame
-  attr_reader :file_menu, :help_menu, :file, :help
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    configure("relief"=>"raised",
-	      "borderwidth"=>1)
-
-    @file = TkMenubutton.new(self,
-			     "text"=> "�ե�����",
-			     "underline"=>0)
-    @file_menu = TkMenu.new(@file)
-    @file_menu.add("command",
-		   "label" => "�ɤ߹��� ...",
-		   "command" => proc{fileAction},
-		   "underline" => 0)
-    @file_menu.add("command",
-		   "label" => "��λ",
-		   "command" => proc{$root.destroy},
-		   "underline" => 0)
-    @file.menu(@file_menu)
-    @file.pack("side"=>"left")
-
-    @help = TkMenubutton.new(self,
-			     "text"=> "�إ��",
-			     "underline"=>0)
-    @help_menu = TkMenu.new(@help)
-    @help_menu.add("command",
-		   "label"=> "����ƥ����ȤˤĤ���",
-		   "command"=>proc{show_help("����ƥ�����")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "�إ�פˤĤ���",
-		   "command"=>proc{show_help("�إ��")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "������ɥ��ˤĤ���",
-		   "command"=>proc{show_help("������ɥ�")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "�������ˤĤ���",
-		   "command"=>proc{show_help("�������")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "�С���������",
-		   "command"=>proc{show_help("�С���������")},
-		   "underline"=>3)
-    @help.menu(@help_menu)
-    @help.pack("side"=>"right")
-  end
-end
-
-class Rolodex < TkRoot
-  attr_reader :frame, :buttons, :menu
-
-  def initialize(*args)
-    super(*args)
-    @frame = RolodexFrame.new(self)
-    @frame.pack("side"=>"top",
-		"fill"=>"y",
-		"anchor"=>"center")
-    @buttons = RolodexButtons.new(self)
-    @buttons.pack("side"=>"bottom",
-		  "pady"=>2,
-		  "anchor"=>"center")
-    @menu = RolodexMenuFrame.new(self)
-    @menu.pack("before"=>@frame,
-	       "side"=>"top",
-	       "fill"=>"x")
-  end
-end
-
-$root = Rolodex.new
-
-$root.buttons.delete.configure("command"=>proc{deleteAction})
-$root.buttons.add.configure("command"=>proc{addAction})
-$root.buttons.clear.configure("command"=>proc{clearAction})
-$root.buttons.search.configure("command"=>proc{addAction; fillCard})
-
-$root.buttons.clear.configure("text"=> "���ꥢ��   Ctrl+C")
-$root.bind("Control-c",proc{clearAction})
-
-$root.buttons.add.configure("text"=> "�ɲ�   Ctrl+A")
-$root.bind("Control-a",proc{addAction})
-
-$root.buttons.search.configure("text"=> "����   Ctrl+S")
-$root.bind("Control-s",proc{addAction; fillCard})
-
-$root.buttons.delete.configure("text"=> "�õ�   Ctrl+D")
-$root.bind("Control-d",proc{deleteAction})
-
-$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
-$root.bind("Control-f",proc{fileAction})
-
-$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
-$root.bind("Control-q",proc{$root.destroy})
-
-$root.frame.entry[1].focus
-
-$root.bind("Any-F1",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-$root.bind("Any-Help",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-
-
-$helpTopics = {}
-
-$helpTopics[$root.menu.file] = <<EOF
-����ϡ֥ե�����ץ�˥塼�Ǥ������ɤ߹��ߡפ�ֽ�λ�פʤɤ�
-�Ԥʤ����Ȥ��Ǥ��ޤ���
-EOF
-
-$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
-�ե�������ɤ߹��ߤ�Ԥʤ��Ȥ��˻Ȥ��ޤ���
-EOF
-
-$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
-���ץꥱ��������λ����Ȥ��˻Ȥ��ޤ���
-EOF
-
-$helpTopics[$root.frame.entry[1]] = <<EOF
-̾���������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[2]] = <<EOF
-����������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[3]] = <<EOF
-����������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[4]] = <<EOF
-����������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[5]] = <<EOF
-����������ֹ�������륨��ȥ�Ǥ�������\
-�������ʤ��Ȥ��� private �ȵ������ޤ���
-EOF
-
-$helpTopics[$root.frame.entry[6]] = <<EOF
-��Ҥ������ֹ�������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics[$root.frame.entry[7]] = <<EOF
-FAX�ֹ�������륨��ȥ�Ǥ���
-EOF
-
-$helpTopics["����ƥ�����"] = <<EOF
-Ruby/Tk�Ǥ�grab�ε������ʤ����ᤳ�Υ��ץꥱ�������Ǥ�\
-����ƥ����ȥإ�פϥ��ݡ��Ȥ���Ƥ��ޤ���
-������Ʊ���褦�ʸ��̤�bind�ȥޥ����ΰ��֤�Wedget���Τ�\
-���Ȥ����뤳�Ȥ��Ǥ��ޤ���
-EOF
-
-$helpTopics["�إ��"] = <<EOF
-�ޥ����򥦥���ɥ��ˤ��碌��F1�����򲡤����Ȥˤ�ä�\
-���Υإ�פ򸫤뤳�Ȥ��Ǥ��ޤ���
-EOF
-
-$helpTopics["������ɥ�"] = <<EOF
-���Υ�����ɥ��ϥ��ߡ��Ǥ���
-EOF
-
-$helpTopics["�������"] = <<EOF
-Ctrl+A:		�ɲ�
-Ctrl+C:		���ꥢ��
-Ctrl+D:		�õ�
-Ctrl+F:		�ե���������
-Ctrl+Q:		��λ
-Ctrl+S:		����
-EOF
-
-$helpTopics["�С���������"] = <<EOF
-�С������� 1.0.1j �Ǥ���
-EOF
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/ruler.rb b/ext/tk/sample/demos-jp/ruler.rb
deleted file mode 100644
index a721b95a6a..0000000000
--- a/ext/tk/sample/demos-jp/ruler.rb
+++ /dev/null
@@ -1,203 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# ruler widget demo (called by 'widget')
-#
-
-# rulerMkTab --
-# This method creates a new triangular polygon in a canvas to
-# represent a tab stop.
-#
-# Arguments:
-# c -           The canvas window.
-# x, y -        Coordinates at which to create the tab stop.
-
-def rulerMkTab(c,x,y)
-  v = $demo_rulerInfo
-  TkcPolygon.new(c, x, y, x+v.size, y+v.size, x-v.size, y+v.size)
-end
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($ruler_demo) && $ruler_demo
-  $ruler_demo.destroy
-  $ruler_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$ruler_demo = TkToplevel.new {|w|
-  title("Ruler Demonstration")
-  iconname("ruler")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ruler_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
-            'text'=>"���Υ����Х�widget�ϥ롼�顼���Ϸ��Ǥ����롼�顼�α��ˤ���Τϥ��֥��ȥåפΰ�ͤǡ������������ĥ�äƤ��뤳�Ȥˤ�äƥ��֥��ȥåפ��뤳�Ȥ��Ǥ��ޤ����ޤ������Ǥˤ��륿�֥��ȥåפ�ư�������Ȥ�Ǥ��ޤ������֥��ȥåפ�����ޤ��ϲ����ˤ������ɽ�������ޤǥɥ�å�����ȡ��ޥ����ܥ����Υ�������ˤ��Υ��֥��ȥåפϾä��ޤ���"){
-  pack('side'=>'top')
-}
-
-# frame ����
-$ruler_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $ruler_demo
-      $ruler_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'ruler'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas ����
-$ruler_canvas = TkCanvas.new(base_frame, 'width'=>'14.8c', 'height'=>'2.5c')
-$ruler_canvas.pack('side'=>'top', 'fill'=>'x')
-
-# ������
-unless Struct.const_defined?("RulerInfo")
-  $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y,
-                               :top, :bottom, :size, :normalStyle,
-                               :activeStyle, :deleteStyle).new
-end
-$demo_rulerInfo.grid = '.25c'
-$demo_rulerInfo.left = TkWinfo.fpixels($ruler_canvas, '1c')
-$demo_rulerInfo.right = TkWinfo.fpixels($ruler_canvas, '13c')
-$demo_rulerInfo.top = TkWinfo.fpixels($ruler_canvas, '1c')
-$demo_rulerInfo.bottom = TkWinfo.fpixels($ruler_canvas, '1.5c')
-$demo_rulerInfo.size = TkWinfo.fpixels($ruler_canvas, '.2c')
-$demo_rulerInfo.normalStyle = {'fill'=>'black'}
-if TkWinfo.depth($ruler_canvas) > 1
-  $demo_rulerInfo.activeStyle = {'fill'=>'red', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'red',
-    'stipple'=>'@'+[$demo_dir, '..',
-                     'images', 'gray25.xbm'].join(File::Separator)}
-else
-  $demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'black',
-    'stipple'=>'@'+[$demo_dir, '..',
-                     'images', 'gray25.xbm'].join(File::Separator)}
-end
-
-TkcLine.new($ruler_canvas,
-            '1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
-(0..11).each{|i|
-  x = i+1
-  TkcLine.new($ruler_canvas, "#{x}c", '1c', "#{x}c", '0.6c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.25c", '1c', "#{x}.25c", '0.8c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.5c", '1c', "#{x}.5c", '0.7c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.75c", '1c', "#{x}.75c", '0.8c', 'width'=>1)
-  TkcText.new($ruler_canvas, "#{x}.15c", '0.75c', 'text'=>i, 'anchor'=>'sw')
-}
-
-$rulerTag_well = TkcTag.new($ruler_canvas)
-$ruler_canvas\
-.addtag_withtag($rulerTag_well,
-                TkcRectangle.new($ruler_canvas,
-                                 '13.2c', '1c', '13.8c', '0.5c',
-                                 'outline'=>'black',
-                                 'fill'=>($ruler_canvas\
-                                          .configinfo('background'))[4]) )
-$ruler_canvas\
-.addtag_withtag($rulerTag_well,
-                rulerMkTab($ruler_canvas,
-                           TkWinfo.pixels($ruler_canvas, '13.5c'),
-                           TkWinfo.pixels($ruler_canvas, '.65c') ) )
-
-$rulerTag_well.bind('1', proc{|x,y| rulerNewTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.itembind('tab', '1',
-                       proc{|x,y| rulerSelectTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('B1-Motion',
-                   proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
-
-# rulerNewTab --
-# Does all the work of creating a tab stop, including creating the
-# triangle object and adding tags to it to give it tab behavior.
-#
-# Arguments:
-# c -           The canvas window.
-# x, y -        The coordinates of the tab stop.
-
-def rulerNewTab(c,x,y)
-  v = $demo_rulerInfo
-  c.addtag_withtag('active', rulerMkTab(c,x,y))
-  c.addtag_withtag('tab', 'active')
-  v.x = x
-  v.y = y
-  rulerMoveTab(c,x,y)
-end
-
-# rulerSelectTab --
-# This method is invoked when mouse button 1 is pressed over
-# a tab.  It remembers information about the tab so that it can
-# be dragged interactively.
-#
-# Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse (identifies the point by
-#               which the tab was picked up for dragging).
-
-def rulerSelectTab(c,x,y)
-  v = $demo_rulerInfo
-  v.x = c.canvasx(x, v.grid)
-  v.y = v.top+2
-  c.addtag_withtag('active', 'current')
-  c.itemconfigure('active', v.activeStyle)
-  c.raise('active')
-end
-
-# rulerMoveTab --
-# This method is invoked during mouse motion events to drag a tab.
-# It adjusts the position of the tab, and changes its appearance if
-# it is about to be dragged out of the ruler.
-#
-# Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse.
-
-def rulerMoveTab(c,x,y)
-  v = $demo_rulerInfo
-  return if c.find_withtag('active') == []
-  cx = c.canvasx(x,v.grid)
-  cy = c.canvasy(y)
-  cx = v.left if cx < v.left
-  cx = v.right if cx > v.right
-  if (cy >= v.top && cy <= v.bottom)
-    cy = v.top+2
-    c.itemconfigure('active', v.activeStyle)
-  else
-    cy = cy-v.size-2
-    c.itemconfigure('active', v.deleteStyle)
-  end
-  c.move('active', cx-v.x, cy-v.y)
-  v.x = cx
-  v.y = cy
-end
-
-# rulerReleaseTab --
-# This method is invoked during button release events that end
-# a tab drag operation.  It deselects the tab and deletes the tab if
-# it was dragged out of the ruler.
-#
-# Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse.
-
-def rulerReleaseTab(c)
-  v = $demo_rulerInfo
-  return if c.find_withtag('active') == []
-  if v.y != v.top+2
-    c.delete('active')
-  else
-    c.itemconfigure('active', v.normalStyle)
-    c.dtag('active')
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/sayings.rb b/ext/tk/sample/demos-jp/sayings.rb
deleted file mode 100644
index b3bdbe0bc5..0000000000
--- a/ext/tk/sample/demos-jp/sayings.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# listbox widget demo 'sayings' (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($sayings_demo) && $sayings_demo
-  $sayings_demo.destroy
-  $sayings_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$sayings_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (well-known sayings)")
-  iconname("sayings")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($sayings_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���Υꥹ�ȥܥå����ˤϤ��������ʳʸ������äƤ��ޤ����ꥹ�Ȥ򥹥������뤵����Τϥ���������С��Ǥ�Ǥ��ޤ������ꥹ�ȥܥå�������ǥޥ����Υܥ���2(��ܥ���)�򲡤����ޤޥɥ�å����Ƥ�Ǥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $sayings_demo
-      $sayings_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'sayings'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-sayings_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
-  sv = TkScrollbar.new(w)
-  sh = TkScrollbar.new(w, 'orient'=>'horizontal')
-  sayings_lbox = TkListbox.new(w) {
-    setgrid 1
-    width  20
-    height 10
-    yscrollcommand proc{|first,last| sv.set first,last}
-    xscrollcommand proc{|first,last| sh.set first,last}
-  }
-  sv.command(proc{|*args| sayings_lbox.yview(*args)})
-  sh.command(proc{|*args| sayings_lbox.xview(*args)})
-
-  if $tk_version =~ /^4\.[01]/
-    sv.pack('side'=>'right', 'fill'=>'y')
-    sh.pack('side'=>'bottom', 'fill'=>'x')
-    sayings_lbox.pack('expand'=>'yes', 'fill'=>'y')
-
-  else
-    sayings_lbox.grid('row'=>0, 'column'=>0,
-                      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sv.grid('row'=>0, 'column'=>1,
-            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sh.grid('row'=>1, 'column'=>0,
-            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
-  end
-
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-sayings_lbox.insert(0,
-"Waste not, want not",
-"Early to bed and early to rise makes a man healthy, wealthy, and wise",
-"Ask not what your country can do for you, ask what you can do for your country",
-"I shall return",
-"NOT",
-"A picture is worth a thousand words",
-"User interfaces are hard to build",
-"Thou shalt not steal",
-"A penny for your thoughts",
-"Fool me once, shame on you;  fool me twice, shame on me",
-"Every cloud has a silver lining",
-"Where there's smoke there's fire",
-"It takes one to know one",
-"Curiosity killed the cat",
-"Take this job and shove it",
-"Up a creek without a paddle",
-"I'm mad as hell and I'm not going to take it any more",
-"An apple a day keeps the doctor away",
-"Don't look a gift horse in the mouth"
-)
-
diff --git a/ext/tk/sample/demos-jp/search.rb b/ext/tk/sample/demos-jp/search.rb
deleted file mode 100644
index 293ae83910..0000000000
--- a/ext/tk/sample/demos-jp/search.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# Text Search widget demo (called by 'widget')
-#
-
-# textLoadFile --
-# This method below loads a file into a text widget, discarding
-# the previous contents of the widget. Tags for the old widget are
-# not affected, however.
-#
-# Arguments:
-# w -           The window into which to load the file.  Must be a
-#               text widget.
-# file -        The name of the file to load.  Must be readable.
-
-def textLoadFile(w,file)
-  w.delete('1.0', 'end')
-  f = open(file, 'r')
-  while(!f.eof?)
-    w.insert('end', f.read(1000))
-  end
-  f.close
-end
-
-# textSearch --
-# Search for all instances of a given string in a text widget and
-# apply a given tag to each instance found.
-#
-# Arguments:
-# w -           The window in which to search.  Must be a text widget.
-# string -      The string to search for.  The search is done using
-#               exact matching only;  no special characters.
-# tag -         Tag to apply to each instance of a matching string.
-
-def textSearch(w, string, tag)
-  tag.remove('0.0', 'end')
-  return if string == ""
-  cur = '1.0'
-  loop {
-    cur, len = w.search_with_length(string, cur, 'end')
-    break if cur == ""
-    tag.add(cur, "#{cur} + #{len} char")
-    cur = w.index("#{cur} + #{len} char")
-  }
-end
-
-# textToggle --
-# This method is invoked repeatedly to invoke two commands at
-# periodic intervals.  It normally reschedules itself after each
-# execution but if an error occurs (e.g. because the window was
-# deleted) then it doesn't reschedule itself.
-#
-# Arguments:
-# cmd1 -        Command to execute when method is called.
-# sleep1 -      Ms to sleep after executing cmd1 before executing cmd2.
-# cmd2 -        Command to execute in the *next* invocation of this method.
-# sleep2 -      Ms to sleep after executing cmd2 before executing cmd1 again.
-
-def textToggle(cmd1,sleep1,cmd2,sleep2)
-  sleep_list = [sleep2, sleep1]
-  TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep},
-              -1, cmd1, cmd2).start(sleep1)
-end
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($search_demo) && $search_demo
-  $search_demo.destroy
-  $search_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$search_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Search and Highlight")
-  iconname("search")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($search_demo).pack(:fill=>:both, :expand=>true)
-
-# frame ����
-$search_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $search_demo
-      $search_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'search'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-TkFrame.new(base_frame) {|f|
-  TkLabel.new(f, 'text'=>'�ե�����̾:',
-              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
-  $search_fileName = TkVariable.new
-  TkEntry.new(f, 'width'=>40,
-              'textvariable'=>$search_fileName) {
-    pack('side'=>'left')
-    bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
-                        $search_string_entry.focus})
-    focus
-  }
-  TkButton.new(f, 'text'=>'�ɤ߹���',
-               'command'=>proc{textLoadFile($search_text,
-                                            $search_fileName.value)})\
-  .pack('side'=>'left', 'pady'=>5, 'padx'=>10)
-}.pack('side'=>'top', 'fill'=>'x')
-
-TkFrame.new(base_frame) {|f|
-  TkLabel.new(f, 'text'=>'����ʸ����:',
-              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
-  $search_searchString = TkVariable.new
-  $search_string_entry = TkEntry.new(f, 'width'=>40,
-                                     'textvariable'=>$search_searchString) {
-    pack('side'=>'left')
-    bind('Return', proc{textSearch($search_text, $search_searchString.value,
-                                   $search_Tag)})
-  }
-  TkButton.new(f, 'text'=>'ȿž',
-               'command'=>proc{textSearch($search_text,
-                                          $search_searchString.value,
-                                          $search_Tag)}) {
-    pack('side'=>'left', 'pady'=>5, 'padx'=>10)
-  }
-}.pack('side'=>'top', 'fill'=>'x')
-
-$search_text = TkText.new(base_frame, 'setgrid'=>true) {|t|
-  $search_Tag = TkTextTag.new(t)
-  TkScrollbar.new(base_frame, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
-    t.yscrollcommand(proc{|first,last| sc.set first,last})
-    pack('side'=>'right', 'fill'=>'y')
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-}
-
-# Set up display styles for text highlighting.
-
-if TkWinfo.depth($search_demo) > 1
-  textToggle(proc{
-               $search_Tag.configure('background'=>'#ce5555',
-                                     'foreground'=>'white')
-             },
-             800,
-             proc{
-               $search_Tag.configure('background'=>'', 'foreground'=>'')
-             },
-             200 )
-else
-  textToggle(proc{
-               $search_Tag.configure('background'=>'black',
-                                     'foreground'=>'white')
-             },
-             800,
-             proc{
-               $search_Tag.configure('background'=>'', 'foreground'=>'')
-             },
-             200 )
-end
-$search_text.insert('1.0', "\
-���Υ�����ɥ��ϸ���������¸�����Τ˥ƥ����� widget �Υ�����ǽ���ɤ� \
-�褦�˻Ȥ���Τ���ǥ⤹���ΤǤ����ޤ���Υ���ȥ�˥ե�����̾���� \
-�졢<�꥿����> �򲡤����֥����ɡץܥ���򲡤��Ƥ������������ˤ��β��� \
-����ȥ��ʸ��������Ϥ���<�꥿����> �򲡤�����ȿž�ץܥ���򲡤��Ƥ� \
-������������ȥե�������Ρ�����ʸ����Ȱ��פ�����ʬ������ \"search_Tag\" \
-�Ȥ����������Ĥ���졢������ɽ��°���Ȥ��Ƥ���ʸ�������Ǥ���褦�� \
-���ꤵ��ޤ���\n")
-$search_text.insert('end', "\
-�ե������ɤ߹��ߤΥ����ȥǥ��쥯�ȥ�� \"#{Dir.pwd}\" �Ǥ���\
-")
-$search_text.set_insert '0.0'
-
-$search_fileName.value = ''
-$search_searchString.value = ''
-
-$search_text.width = 60
-$search_text.height = 20
diff --git a/ext/tk/sample/demos-jp/spin.rb b/ext/tk/sample/demos-jp/spin.rb
deleted file mode 100644
index 2bcc3217e6..0000000000
--- a/ext/tk/sample/demos-jp/spin.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# spin.rb --
-#
-# This demonstration script creates several spinbox widgets.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($spin_demo) && $spin_demo
-  $spin_demo.destroy
-  $spin_demo = nil
-end
-
-$spin_demo = TkToplevel.new {|w|
-  title("Spinbox Demonstration")
-  iconname("spin")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($spin_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'5i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-���ˤϣ�����Υ��ԥ�ܥå�����ɽ������Ƥ��ޤ���
-���줾�졢�ޥ��������򤷤�ʸ�������Ϥ��뤳�Ȥ��Ǥ��ޤ���
-�Խ����Ȥ��Ƥϡ�Emacs ������¿���˲ä��ơ�����Ū��
-Motif �����Υ��������ݡ��Ȥ���Ƥ��ޤ������Ȥ��С�
-Backspace �� Control-h �Ȥ����ϥ�������κ�¦��ʸ����
-�������Delete �� Control-d �Ȥϱ�¦��ʸ���������ޤ���
-�����Ȥ�Ĺ����ۤ���褦��Ĺ��ʸ��������Ϥ������ˤϡ�
-�ޥ����Υܥ��󣲤򲡤��ƥɥ�å����뤳�Ȥǡ�����ʸ����
-�򥹥���󤹤뤳�Ȥ���ǽ�Ǥ���
-�ʤ����ǽ�Υ��ԥ�ܥå����ϡ������ͤȤߤʤ����褦��
-ʸ���󤷤����Ϥ�������ʤ����Ȥ����դ��Ƥ����������ޤ���
-�����ܤΥ��ԥ�ܥå������������˸����Τϥ������ȥ�
-�ꥢ���Ի�̾�Υꥹ�ȤȤʤäƤ��ޤ���
-�⤷���ʤ����ȤäƤ��� Ruby �˥�󥯤���Ƥ��� Tk �饤
-�֥�꤬ spinbox ���������åȤ�������Ƥ��ʤ���硢����
-�ǥ�Ϥ��ޤ�ư���ʤ��Ϥ��Ǥ������ξ��ˤ� spinbox ����
-�����åȤ���������Ƥ���褦�ʤ�꿷�����С������� Tk
-���Ȥ߹�碌�ƻ�褦�ˤ��Ƥ���������
-EOL
-
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
-                 $spin_demo.destroy
-                 $spin_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-                 showCode 'spin'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-australianCities = [
-    'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide',
-    'Brisbane', 'Hobart', 'Darwin', 'Alice Springs'
-]
-
-[
-  TkSpinbox.new(base_frame, :from=>1, :to=>10, :width=>10, :validate=>:key,
-                :validatecommand=>[
-                  proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-                ]),
-  TkSpinbox.new(base_frame, :from=>0, :to=>3, :increment=>0.5,
-                :format=>'%05.2f', :width=>10),
-  TkSpinbox.new(base_frame, :values=>australianCities, :width=>10)
-].each{|sbox| sbox.pack(:side=>:top, :pady=>5, :padx=>10)}
diff --git a/ext/tk/sample/demos-jp/square b/ext/tk/sample/demos-jp/square
deleted file mode 100644
index bb66282154..0000000000
--- a/ext/tk/sample/demos-jp/square
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env ruby
-
-# square --
-# This script generates a demo application containing only
-# a "square" widget.  It's only usable if Tk has been compiled
-# with tkSquare.c and with the -DSQUARE_DEMO compiler switch.
-# This demo arranges the following bindings for the widget:
-#
-# Button-1 press/drag:          moves square to mouse
-# "a":                          toggle size animation on/off
-#
-
-require 'tk'
-require 'tkafter'
-
-class TkSquare<TkWindow
-  def create_self
-    begin
-      tk_call 'square', path
-    rescue
-      STDERR.print "\nSorry. Your Tk interpreter does not contain " +
-	'a "square" demonstration widget.' +
-	"\n ( See documents included the Tcl/Tk source archive. )\n\n"
-      exit
-    end
-  end
-  def size(amount=nil)
-    if amount
-      tk_send 'size', amount
-    else
-      number(tk_send('size'))
-    end
-  end
-  def position(x,y)
-    tk_send 'position', x, y
-  end
-end
-
-$s = TkSquare.new{
-  pack('expand'=>'yes', 'fill'=>'both')
-  bind('1', proc{|x,y| center(x,y)}, '%s %y')
-  bind('B1-Motion', proc{|x,y| center(x,y)}, '%s %y')
-  bind('a', proc{animate})
-  focus
-}
-TkRoot.new.minsize(1,1)
-
-# The procedure below centers the square on a given position.
-
-def center(x,y)
-  a = $s.size
-  $s.position(x-(a/2), y-(a/2))
-end
-
-# The procedures below provide a simple form of animation where
-# the box changes size in a pulsing pattern: larger, smaller, larger,
-# and so on.
-
-$inc = 0
-
-def timer_proc
-  a = $s.size
-  return if $inc == 0
-  $inc = -3 if a >= 40
-  $inc =  3 if a <= 10
-  $s.size(a+$inc)
-end
-
-$timer = TkAfter.new(30, -1, proc{timer_proc})
-
-def animate
-  if $inc == 0
-    $inc = 3
-    $timer.start
-  else
-    $inc = 0
-    $timer.stop
-  end
-end
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/states.rb b/ext/tk/sample/demos-jp/states.rb
deleted file mode 100644
index f354d28d84..0000000000
--- a/ext/tk/sample/demos-jp/states.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# listbox widget demo 'states' (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($states_demo) && $states_demo
-  $states_demo.destroy
-  $states_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$states_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (states)")
-  iconname("states")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($states_demo).pack(:fill=>:both, :expand=>true)
-
-# label ����
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "���ˤ���Τ���ƻ�ܸ�̾�����ä�����������С��դΥꥹ�ȥܥå����Ǥ����ꥹ�Ȥ򥹥������뤵����Τϥ���������С��Ǥ�Ǥ��ޤ������ꥹ�ȥܥå�������ǥޥ����Υܥ���2(��ܥ���)�򲡤����ޤޥɥ�å����Ƥ�Ǥ��ޤ���"
-}
-msg.pack('side'=>'top')
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $states_demo
-      $states_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'states'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-states_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>'.5c') {|w|
-  s = TkScrollbar.new(w)
-  states_lbox = TkListbox.new(w) {
-    setgrid 1
-    height 12
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| states_lbox.yview(*args)})
-  s.pack('side'=>'right', 'fill'=>'y')
-  states_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-ins_data = [
-  '����','�Ŀ�','����','����','���','���','��ɲ',
-  '��ʬ','���','����','����','����','������','������',
-  '����','����','����','����','����','���','����',
-  '����','�Ų�','�纬','����','���','����','����',
-  'Ļ��','�ٻ�','Ĺ��','Ĺ��','����','����','ʼ��',
-  '����','ʡ��','ʡ��','ʡ��','�̳�ƻ','����','�ܾ�',
-  '�ܺ�','����','����','����','�²λ�'
-]
-
-states_lbox.insert(0, *ins_data)
-
diff --git a/ext/tk/sample/demos-jp/style.rb b/ext/tk/sample/demos-jp/style.rb
deleted file mode 100644
index 3189e1f6d8..0000000000
--- a/ext/tk/sample/demos-jp/style.rb
+++ /dev/null
@@ -1,270 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# text (display styles) widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($style_demo) && $style_demo
-  $style_demo.destroy
-  $style_demo = nil
-end
-
-
-# demo �Ѥ� toplevel widget ������
-$style_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Display Styles")
-  iconname("style")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($style_demo).pack(:fill=>:both, :expand=>true)
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $style_demo
-      $style_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'style'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# text ����
-txt = TkText.new(base_frame){|t|
-  # ����
-  setgrid 'true'
-  #width  70
-  #height 32
-  wrap 'word'
-  font $font
-  TkScrollbar.new(base_frame) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  # �ƥ����ȥ������� (�ե���ȴ�Ϣ)
-  family = 'Courier'
-
-  if $tk_version =~ /^4.*/
-    style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
-    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
-    style_tag_verybig = TkTextTag.new(t, 'font'=>'-*-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*')
-    # style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
-    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-  else
-    style_tag_bold = TkTextTag.new(t, 'font'=>[family, 12, :bold, :italic])
-    style_tag_big = TkTextTag.new(t, 'font'=>[family, 14, :bold])
-    style_tag_verybig = TkTextTag.new(t, 'font'=>['Helvetica', 24, :bold])
-    style_tag_small = TkTextTag.new(t, 'font'=>'Times 8 bold')
-  end
-###
-#  case($tk_version)
-#  when /^4.*/
-#    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
-#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
-#  when /^8.*/
-#    unless $style_demo_do_first
-#      $style_demo_do_first = true
-#      Tk.tk_call('font', 'create', '@bigascii',
-#                '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
-#      Tk.tk_call('font', 'create', '@smallascii',
-#                '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-#      Tk.tk_call('font', 'create', '@cBigFont',
-#                '-compound', '@bigascii @msg_knj')
-#      Tk.tk_call('font', 'create', '@cSmallFont',
-#                '-compound', '@smallascii @kanji')
-#    end
-#    style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
-#    style_tag_small = TkTextTag.new(t, 'font'=>'@cSmallFont')
-#  end
-
-  # �ƥ����ȥ������� (������꡼�մ�Ϣ)
-  if TkWinfo.depth($root).to_i > 1
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'#a0b7ce')
-    style_tag_color2 = TkTextTag.new(t, 'foreground'=>'red')
-    style_tag_raised = TkTextTag.new(t, 'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
-  else
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'black',
-                                     'foreground'=>'white')
-    style_tag_color2 = TkTextTag.new(t, 'background'=>'black',
-                                     'foreground'=>'white')
-    style_tag_raised = TkTextTag.new(t, 'background'=>'white',
-                                     'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'background'=>'white',
-                                     'relief'=>'sunken', 'borderwidth'=>1)
-  end
-
-  # �ƥ����ȥ������� (����¾)
-  if $tk_version =~ /^4\.[01]/
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
-                                        'borderwidth'=>0,
-                                        'bgstipple'=>'gray25')
-  else
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
-                                        'borderwidth'=>0,
-                                        'bgstipple'=>'gray12')
-  end
-  style_tag_fgstipple = TkTextTag.new(t, 'fgstipple'=>'gray50')
-  style_tag_underline = TkTextTag.new(t, 'underline'=>'on')
-  style_tag_overstrike = TkTextTag.new(t, 'overstrike'=>'on')
-  style_tag_right  = TkTextTag.new(t, 'justify'=>'right')
-  style_tag_center = TkTextTag.new(t, 'justify'=>'center')
-  if $tk_version =~ /^4.*/
-    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-  else
-    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>[family, 10])
-    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>[family, 10])
-  end
-  style_tag_margins = TkTextTag.new(t, 'lmargin1'=>'12m', 'lmargin2'=>'6m',
-                                    'rmargin'=>'10m')
-  style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
-                                    'lmargin1'=>'12m', 'lmargin2'=>'6m',
-                                    'rmargin'=>'10m')
-
-  # �ƥ���������
-  insert('end', '���Τ褦�˥ƥ����� widget �Ͼ�����͡��ʥ��������ɽ�����뤳��
-���Ǥ��ޤ���')
-  insert('end', '����', style_tag_big)
-  insert('end', '�Ȥ����ᥫ�˥���ǥ���ȥ����뤵��ޤ���
-�����Ȥϥƥ����� widget ��Τ���ʸ�� (���ϰ�)���Ф���Ŭ�ѤǤ���
-ñ�ʤ�̾���Τ��ȤǤ����������͡���ɽ���������������Ǥ��ޤ���
-���ꤹ��ȡ����Υ����ΤĤ���ʸ���ϻ��ꤷ�����������ɽ�������
-�褦�ˤʤ�ޤ������ѤǤ���ɽ����������ϼ����̤�Ǥ���
-')
-  insert('end', '
-1. �ե����', style_tag_big)
-  insert('end', '    �ɤ�� X �Υե���ȤǤ�Ȥ��ޤ���')
-  insert('end', 'large', style_tag_verybig)
-  insert('end', '
-�Ȥ�')
-#  insert('end', '������', style_tag_small)
-  insert('end', 'small', style_tag_small)
-  insert('end', '�Ȥ���
-')
-  insert('end', '
-2. ��', style_tag_big)
-  insert('end', '  ')
-  insert('end', '�طʿ�', style_tag_color1)
-  insert('end', '��')
-  insert('end', '���ʿ�', style_tag_color2)
-  insert('end', '��')
-  insert('end', 'ξ��', style_tag_color1, style_tag_color2)
-  insert('end', '�Ȥ��Ѥ��뤳�Ȥ��Ǥ��ޤ���
-')
-  insert('end', '
-3. �֤���', style_tag_big)
-  insert('end', '  ���Τ褦������κݤ�')
-  insert('end', '�طʤ�', style_tag_bgstipple)
-  insert('end', 'ʸ����', style_tag_fgstipple)
-  insert('end', 'ñ�ʤ��ɤ�Ĥ֤�
-�Ǥʤ����֤�����Ȥ����Ȥ��Ǥ��ޤ���
-')
-  insert('end', '
-4. ����', style_tag_big)
-  insert('end', '  ���Τ褦��')
-  insert('end', 'ʸ���˲��������', style_tag_underline)
-  insert('end', '���Ȥ��Ǥ��ޤ���
-')
-  insert('end', '
-5. �Ǥ��ä���', style_tag_big)
-  insert('end', '  ���Τ褦��')
-  insert('end', 'ʸ���˽Ťͤ��������', style_tag_overstrike)
-  insert('end', '���Ȥ��Ǥ��ޤ���
-')
-  insert('end', '
-6. 3D ����', style_tag_big)
-  insert('end', '  �طʤ��Ȥ�Ĥ��ơ�ʸ����')
-  insert('end', '���ӽФ�', style_tag_raised)
-  insert('end', '�褦�ˤ�����')
-  insert('end', '����', style_tag_sunken)
-  insert('end', '
-�褦�ˤǤ��ޤ���
-')
-  insert('end', '
-7. ��·��', style_tag_big)
-  insert('end', ' ���Τ褦�˹Ԥ�
-')
-  insert('end', '����·������
-')
-  insert('end', '����·������
-', style_tag_right)
-  insert('end', '�����·������Ǥ��ޤ���
-', style_tag_center)
-  insert('end', '
-8. ���դ�ʸ����ź��', style_tag_big)
-  insert('end', '  10')
-  insert('end', 'n', style_tag_super)
-  insert('end', ' �Τ褦�˸��դ�ʸ���θ��̤䡢')
-  insert('end', '
-X')
-  insert('end', 'i', style_tag_sub)
-  insert('end', '�Τ褦��ź���θ��̤�Ф����Ȥ��Ǥ��ޤ���
-')
-  insert('end', '
-9. �ޡ�����', style_tag_big)
-  insert('end', '�ƥ����Ȥκ�¦��;ʬ�ʶ�����֤����Ȥ��Ǥ��ޤ�:
-')
-  insert('end', '��������ϥޡ�����λ�����Ǥ��������꡼��',
-         style_tag_margins)
-  insert('end', '����ޤ��֤����ɽ������Ƥ���1�ԤΥƥ����ȤǤ���',
-         style_tag_margins)
-  insert('end', '��¦�ˤ�2����Υޡ����������ޤ���', style_tag_margins)
-  insert('end', '1���ܤ��Ф����Τȡ�', style_tag_margins)
-  insert('end', '2���ܰʹߤ�Ϣ³�����ޡ�����', style_tag_margins)
-  insert('end', '�Ǥ����ޤ���¦�ˤ�ޡ����󤬤���ޤ���', style_tag_margins)
-  insert('end', '�Ԥ��ޤ��֤����֤���뤿��˻��Ѥ��뤳�Ȥ��Ǥ��ޤ���
-', style_tag_margins)
-  insert('end', '
-10. ���ڡ�����', style_tag_big)
-  insert('end', '3�ĤΥѥ�᡼���ǹԤΥ��ڡ����󥰤�')
-  insert('end', '���椹
-�뤳�Ȥ��Ǥ��ޤ���Spacing1�ǡ��Ԥ�')
-  insert('end', '��ˤɤΤ��餤�ζ��֤��֤�����
-spacing3')
-  insert('end', '�ǹԤβ��ˤɤΤ��餤�ζ��֤��֤�����')
-  insert('end', '�Ԥ��ޤ��֤���Ƥ���ʤ�
-�С�spacing2�ǡ�')
-  insert('end', '�ƥ����ȹԤ��������Ƥ���Ԥδ֤ˤɤΤ��餤')
-  insert('end', '�ζ��֤���
-�����򼨤��ޤ���
-')
-  insert('end', '�����Υ���ǥ�Ȥ��줿����ϤɤΤ褦��',
-         style_tag_spacing)
-  insert('end', '���ڡ����󥰤����Ԥ���Τ��򼨤��ޤ���',
-         style_tag_spacing)
-  insert('end', '������ϼºݤϥƥ�����widget', style_tag_spacing)
-  insert('end', '��1�Ԥǡ�widget�ˤ�ä��ޤ���ޤ�Ƥ��ޤ���
-', style_tag_spacing)
-  insert('end', 'Spacing1�Ϥ��Υƥ����ȤǤ�10point��', style_tag_spacing)
-  insert('end', '���ꤵ��Ƥ��ޤ���', style_tag_spacing)
-  insert('end', '����ˤ�ꡢ����δ֤��礭�ʴֳ֤�', style_tag_spacing)
-  insert('end', '¸�ߤ��Ƥ��ޤ���', style_tag_spacing)
-  insert('end', 'Spacing2��2point�����ꤵ��Ƥ��ޤ���', style_tag_spacing)
-  insert('end', '������������ˤۤ�ξ����ֳ֤�¸�ߤ��Ƥ��ޤ���',
-         style_tag_spacing)
-  insert('end', 'Spacing3�Ϥ�����Ǥϻ��Ѥ���Ƥ��ޤ���
-', style_tag_spacing)
-  insert('end', '�ֳ֤��ɤ��ˤ��뤫�򸫤�����С������������',
-         style_tag_spacing)
-  insert('end', '�ʤ��ǥƥ����Ȥ����򤷤Ƥ��������������', style_tag_spacing)
-  insert('end', 'ȿž������ʬ�ˤ�;ʬ�ˤȤ�줿�ֳ֤�', style_tag_spacing)
-  insert('end', '�ޤޤ�Ƥ��ޤ���
-', style_tag_spacing)
-
-}
-
-txt.width 70
-txt.height 32
diff --git a/ext/tk/sample/demos-jp/tcolor b/ext/tk/sample/demos-jp/tcolor
deleted file mode 100644
index 1c83a4b10b..0000000000
--- a/ext/tk/sample/demos-jp/tcolor
+++ /dev/null
@@ -1,534 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: euc-jp -*-
-#
-# tcolor --
-# ���Υ�����ץȤ�RGB,HSB,CYM�����򥵥ݡ��Ȥ���
-# �ʰץ��顼���ǥ����Ǥ���
-#
-# Copyright (C) 1998 Takaaki Tateishi(ttate@jaist.ac.jp)
-# last update: Thu Jun 18 06:32:35 JST 1998
-#
-
-# �ޤ���tk.rb���ɤ߹��ࡣ
-
-require "tk"
-
-
-# Tk�ˤ�ä��ѹ�������ѿ���TkVariable�Υ��󥹥��󥹤�Ȥ���
-
-$colorSpace = TkVariable.new(:rgb)
-$master = nil
-$red = 65535
-$green = 0
-$blue = 0
-$color = "#ffff00000000"
-$updating = TkVariable.new(0)
-$autoUpdate = TkVariable.new(1)
-$name = TkVariable.new($color)
-$command = TkVariable.new("print(%%,\"\n\")")
-# $command = TkVariable.new("")
-$label1 = TkVariable.new("label1")
-$label2 = TkVariable.new("label2")
-$label3 = TkVariable.new("label3")
-
-
-# �꥽�����ǡ����١���������
-if (TkVarAccess.new('tcl_platform')['platform'] == 'unix')
-  TkOptionDB.add('*Entry.background', 'white')
-end
-
-
-# �ƥ��٥���ѤΥ᥽�å�
-
-def rgbToHsv(red,green,blue)
-
-  if ( red > green )
-    max = red
-    min = green
-  else
-    max = green
-    min = red
-  end
-
-  if ( blue > max )
-    max = blue
-  else
-    if ( blue < min )
-      min = blue
-    end
-  end
-
-  range = max - min
-
-  if ( max == 0 )
-    sat = 0.0
-  else
-    sat = (max-min)/max
-  end
-
-  if ( sat == 0 )
-    hue = 0.0
-  else
-    rc = (max-red)/range
-    gc = (max-green)/range
-    bc = (max-blue)/range
-    if ( red == max )
-      hue = 0.166667 * (bc - gc)
-    else
-      if ( green == max )
-	hue = 0.166667 * (2.0 + rc - bc)
-      else
-	hue = 0.166667 * (4.0 + gc - rc)
-      end
-    end
-    if ( hue < 0.0 )
-      hue = hue + 1.0
-    end
-  end
-
-  [hue,sat,max/65535]
-end
-
-
-def hsbToRgb(hue,sat,value)
-  v = 65535.0 * value
-  if( sat == 0 )
-    ans = [v,v,v]
-  else
-    hue = hue*6.0
-    if ( hue >= 6 )
-      hue = 0.0
-    end
-    i = hue.to_i
-    f = hue - i
-    p = 65535.0 * value * (1.0 - sat)
-    q = 65535.0 * value * (1.0 - (sat * f))
-    t = 65535.0 * value * (1.0 - (sat * (1.0 - f)))
-    case i
-    when 0
-      ans = [v,t,p]
-    when 1
-      ans = [q,v,p]
-    when 2
-      ans = [p,v,t]
-    when 3
-      ans = [p,q,v]
-    when 4
-      ans = [t,p,v]
-    when 5
-      ans = [v,p,q]
-    else
-      raise(eException,"i value #{i} is out of range")
-    end
-  end
-  return ans
-end
-
-
-def _null_binding
-  Module.new.instance_eval{binding}
-end
-private :_null_binding
-
-def doUpdate
-  newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
-  eval(newCmd, _null_binding)
-end
-
-
-def tc_scaleChanged
-  if( $updating.to_i == 1 )
-    return
-  end
-
-  $master = :scale if $master == nil
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-
-  case $colorSpace.value.intern
-  when :rgb
-    $red = (scale1.get * 65.535).to_i
-    $green = (scale2.get * 65.535).to_i
-    $blue = (scale3.get * 65.535).to_i
-  when :cmy
-    $red = (65535 - scale1.get * 65.535).to_i
-    $green = (65535 - scale2.get * 65.535).to_i
-    $blue = (65535 - scale3.get * 65.535).to_i
-  when :hsb
-    list = hsbToRgb(scale1.get / 1000.0,
-		    scale2.get / 1000.0,
-		    scale3.get / 1000.0)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-  $color = format("#%04x%04x%04x",$red.to_i,$green.to_i,$blue.to_i)
-  $name.value = $color if $master == :scale
-  $root.middle.right.set_color($color)
-  if( $autoUpdate.to_i == 1 )
-    doUpdate
-  end
-  Tk.update(true)
-  $master = nil if $master == :scale
-end
-
-
-def tc_setScales
-  $updating.value = 1
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-
-  case $colorSpace.value.intern
-  when :rgb
-    scale1.set($red / 65.535)
-    scale2.set($green / 65.535)
-    scale3.set($blue / 65.535)
-  when :cmy
-    scale1.set((65535 - $red) / 65.535)
-    scale2.set((65535 - $green) / 65.535)
-    scale3.set((65535 - $blue) / 65.535)
-  when :hsb
-    list = rgbToHsv($red,$green,$blue)
-    scale1.set( list[0] * 1000.0 )
-    scale2.set( list[1] * 1000.0 )
-    scale3.set( list[2] * 1000.0 )
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-
-  $updating.value = 0
-end
-
-
-def tc_loadNamedColor(name)
-  $name.value = name
-  $master = :name if $master == nil
-  if name[0,1] != "#"
-    list = TkWinfo.rgb($root.middle.right.swatch,name)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    case name.length
-    when 4
-      fmt = /#(.{1})(.{1})(.{1})/
-      shift = 12
-    when 7
-      fmt = /#(.{2})(.{2})(.{2})/
-      shift = 8
-    when 10
-      fmt = /#(.{3})(.{3})(.{3})/
-      shift = 4
-    when 13
-      fmt = /#(.{4})(.{4})(.{4})/
-      shift = 0
-    else
-      raise(eException,"syntax error in color name \"#{name}\"")
-    end
-    name.scan(fmt){|strlist|
-      if strlist.length != 3
-	raise(eException,"syntax error in color name \"#{name}\"")
-      end
-      $red = strlist[0].hex
-      $green = strlist[1].hex
-      $blue = strlist[2].hex
-    }
-    $red = $red << shift
-    $green = $green << shift
-    $blue = $blue << shift
-  end
-
-  tc_setScales
-  $color = format("#%04x%04x%04x",$red,$green,$blue)
-  $root.middle.right.set_color($color)
-  if $autoUpdate.to_i == 1
-    doUpdate
-  end
-  Tk.update(true)
-  $master = nil if $master == :name
-end
-
-
-def changeColorSpace(space)
-  case space
-  when :rgb
-    $label1.value = "Red"
-    $label2.value = "Green"
-    $label3.value = "Blue"
-  when :cmy
-    $label1.value = "Cyan"
-    $label2.value = "Magenta"
-    $label3.value = "Yellow"
-  when :hsb
-    $label1.value = "Hue"
-    $label2.value = "Saturation"
-    $label3.value = "Brightness"
-  end
-  tc_setScales
-end
-
-
-
-
-
-# tcolor�ѤΥ�˥塼
-
-class TkColorMenuFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=>"raised",
-	  "borderwidth"=>"2")
-
-    # File��˥塼�ܥ��������
-    @file = TkMenubutton.new(self){|button|
-
-      # File��˥塼�κ���
-      @file_menu = TkMenu.new(button){
-	add "radio",
-	  "label" => "RGB color space",
-	  "variable" => $colorSpace,
-	  "value" => :rgb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:rgb)}
-	add "radio",
-	  "label" => "CMY color space",
-	  "variable" => $colorSpace,
-	  "value" => :cmy,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:cmy)}
-	add "radio",
-	  "label" => "HSB color space",
-	  "variable" => $colorSpace,
-	  "value" => :hsb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:hsb)}
-	add "separator"
-	add "radio",
-	  "label" => "Automatic updates",
-	  "variable" => $autoUpdate,
-	  "value" => "1",
-	  "underline" => "0"
-	add "radio",
-	  "label" => "Manual updates",
-	  "variable" => $autoUpdate,
-	  "value" => "0",
-	  "underline" => "0"
-	add "separator"
-	add "command",
-	  "label" => "Exit program",
-	  "underline" => "0",
-	  "command" => proc{exit}
-      }
-
-      # File��˥塼��File�ܥ�����Ϣ�դ���
-      menu @file_menu
-
-      text "File"
-      underline "0"
-    }.pack("side"=>"left")
-
-    self
-  end
-end
-
-
-# �����Υե졼��Τ���Υ��饹
-class TkColorBotFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> 2)
-
-    @commandLabel = TkLabel.new(self,
-				"text"=> "Command:")
-    @command = TkEntry.new(self,
-			   "relief"=> "sunken",
-			   "borderwidth"=> "2",
-			   "textvariable"=> $command,
-			   "font"=> "-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @update = TkButton.new(self,
-			   "text"=> "Update",
-			   "command"=> proc{doUpdate})
-    @commandLabel.pack("side"=>"left")
-    @update.pack("side"=>"right","pady"=>".1c","padx"=>".25c")
-    @command.pack("expand"=>"yes","fill"=>"x","ipadx"=>".25c")
-
-    self
-  end
-end
-
-
-# ���ʺ��Υե졼��
-class TkColorMiddleLeftFrame<TkFrame
-  def initialize(parent)
-    super(parent)
-
-    for i in ["/usr/local/lib/X11rgb.txt","/usr/lib/X11/rgb.txt",
-	"/X11/R5/lib/X11/rgb.txt","/X11/R4/lib/rgb/rgb.txt",
-	"/usr/openwin/lib/X11/rgb.txt"]
-      if !File.readable?(i)
-	next
-      end
-      f = File.open(i)
-      @scroll = TkScrollbar.new(self,
-				"orient"=>"vertical",
-				"relief"=>"sunken",
-				"borderwidth"=>"2")
-      @scroll.pack("side"=>"right","fill"=>"y")
-      @names = TkListbox.new(self,
-			     "width"=>"20",
-			     "height"=>"12",
-			     "yscrollcommand"=> proc{|first,last| @scroll.set first,last},
-			     "relief"=>"sunken",
-			     "borderwidth"=>"2",
-			     "exportselection"=>"false")
-      @scroll.command(proc{|*args| @names.yview(*args)})
-      @names.bind("Double-1",proc{
-		    tc_loadNamedColor(@names.get(@names.curselection))})
-      @names.pack("side"=>"left")
-      while (line = f.gets)
-	line.chop!
-	linelist = line.split(/[ \t]+/)
-	if linelist.length == 4
-	  @names.insert("end",linelist[3])
-	end
-      end
-      f.close
-      break
-    end
-
-    self
-  end
-end
-
-
-# ��������Υե졼��
-class TkColorMiddleMiddleFrame<TkFrame
-  # @scale1,@scale2,@scale3�������黲�ȤΤߵ��Ĥ��롣(�ѹ��Բ�)
-  attr_reader :scale1, :scale2, :scale3
-
-  def initialize(parent)
-    super(parent)
-
-    @f1 = TkFrame.new(self)
-    @f2 = TkFrame.new(self)
-    @f3 = TkFrame.new(self)
-    @f4 = TkFrame.new(self)
-
-    for f in [@f1,@f2,@f3]
-      f.pack("side"=>"top","expand"=>"yes")
-    end
-    @f4.pack("side"=>"top","expand"=>"yes","fill"=>"x")
-
-    @label1 = TkLabel.new(self,"textvariable"=>$label1)
-    @scale1 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale1.pack("side"=>"top","anchor"=>"w")
-    @label1.pack("side"=>"top","anchor"=>"w")
-
-    @label2 = TkLabel.new(self,"textvariable"=>$label2)
-    @scale2 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale2.pack("side"=>"top","anchor"=>"w")
-    @label2.pack("side"=>"top","anchor"=>"w")
-
-    @label3 = TkLabel.new(self,"textvariable"=>$label3)
-    @scale3 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale3.pack("side"=>"top","anchor"=>"w")
-    @label3.pack("side"=>"top","anchor"=>"w")
-
-    @nameLabel = TkLabel.new(self,"text"=>"Name:")
-    @name = TkEntry.new(self,"relief"=>"sunken","borderwidth"=>"2",
-			"textvariable"=>$name,"width"=>"10",
-			"font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @nameLabel.pack("side"=>"left")
-    @name.pack("side"=>"right", "expand"=>"1", "fill"=>"x")
-    @name.bind("Return",proc{tc_loadNamedColor $name.to_s})
-
-    self
-  end
-end
-
-
-class TkColorMiddleRightFrame<TkFrame
-  attr_reader :swatch
-
-  def initialize(parent)
-    super(parent)
-    @swatch = TkFrame.new(self, "width"=>"2c", "height"=>"5c",
-			  "background"=>$color)
-    @value = TkLabel.new(self,
-			 "text"=>$color,
-			 "width"=>"13",
-			 "font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @swatch.pack("side"=>"top","expand"=>"yes","fill"=>"both")
-    @value.pack("side"=>"bottom","pady"=>".25c")
-
-    self
-  end
-
-  def set_color(color)
-    @swatch["background"] = color
-    @value["text"] = color
-  end
-end
-
-
-
-# ���ʤΥե졼��
-class TkColorMiddleFrame<TkFrame
-  attr_reader :left, :middle, :right
-
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> "2")
-
-    @left = TkColorMiddleLeftFrame.new(self)
-    @left.pack("side"=>"left","padx"=>".25c","pady"=>".25c")
-
-    @middle = TkColorMiddleMiddleFrame.new(self)
-    @middle.pack("side"=>"left","expand"=>"yes","fill"=>"y")
-
-    @right = TkColorMiddleRightFrame.new(self)
-    @right.pack("side"=>"left","padx"=>".25c","pady"=>".25c","anchor"=>"s")
-
-    self
-  end
-end
-
-
-class TkColor<TkRoot
-  attr_reader :menu, :bottom, :middle
-
-  def initialize(*args)
-    super(*args)
-    @menu = TkColorMenuFrame.new(self)
-    @menu.pack("side"=>"top", "fill"=>"x")
-
-    @bottom = TkColorBotFrame.new(self)
-    @bottom.pack("side"=>"bottom","fill"=>"x")
-
-    @middle = TkColorMiddleFrame.new(self)
-    @middle.pack("side"=>"top","fill"=>"both")
-
-    self
-  end
-end
-
-
-$root = TkColor.new
-
-# ���٥�Ȥ��Ԥİ٤˥롼�פ����롣
-changeColorSpace :rgb
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/text.rb b/ext/tk/sample/demos-jp/text.rb
deleted file mode 100644
index ea15064830..0000000000
--- a/ext/tk/sample/demos-jp/text.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# text (basic facilities) widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($text_demo) && $text_demo
-  $text_demo.destroy
-  $text_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$text_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Basic Facilities")
-  iconname("text")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($text_demo).pack(:fill=>:both, :expand=>true)
-
-# version check
-if ((Tk::TK_VERSION.split('.').collect{|n| n.to_i} <=> [8,4]) < 0)
-  undo_support = false
-else
-  undo_support = true
-end
-
-# frame ����
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $text_demo
-      $text_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'text'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# text ����
-TkText.new(base_frame){|t|
-  # ����
-  relief 'sunken'
-  bd 2
-  setgrid 1
-  height 30
-  TkScrollbar.new(base_frame) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  # �ƥ���������
-  insert('0.0', <<EOT)
-���Υ�����ɥ��ϥƥ����� widget �Ǥ���1�Ԥޤ��Ϥ���ʾ�Υƥ����Ȥ�ɽ
-�����Խ����뤳�Ȥ��Ǥ��ޤ����ʲ��ϥƥ����� widget �ǤǤ������ˤĤ���
-�ޤȤ᤿��ΤǤ���
-
-1. ���������롣����������С��ǥƥ����Ȥ�ɽ����ʬ��ư�������Ȥ��Ǥ��ޤ���
-
-2. ������˥󥰡��ƥ����ȤΥ�����ɥ��ǥޥ����ܥ���2 (��ܥ����) ��
-���ƾ岼�˥ɥ�å����Ƥ�����������������ȥƥ����Ȥ���®�ǥɥ�å����졢
-���Ƥ򤶤ä�į��뤳�Ȥ��Ǥ��ޤ���
-
-3. �ƥ����Ȥ��������ޥ����ܥ���1 (���ܥ���) �򲡤���������������򥻥�
-�Ȥ��Ƥ���ƥ����Ȥ����Ϥ��Ƥ������������Ϥ�����Τ� widget ������ޤ���
-
-4. ���򡣤����ϰϤ�ʸ�������򤹤�ˤϥޥ����ܥ���1 �򲡤����ɥ�å���
-�Ƥ������������٥ܥ����Υ�����顢���եȥ����򲡤��ʤ���ܥ���1 �򲡤�
-���Ȥ������ϰϤ�Ĵ�����Ǥ��ޤ�������������ϰϤκǸ��ޥ������������
-�Ǥ�ᤤ���֤˥ꥻ�åȤ����ܥ����Υ�����˥ޥ�����ɥ�å����뤳�ȤǤ�
-��������ϰϤ�Ĵ���Ǥ��ޤ������֥륯��å��ǥ�ɤ򡢤ޤ��ȥ�ץ륯���
-���ǹ����Τ����򤹤뤳�Ȥ��Ǥ��ޤ���
-
-5. �õ���ִ����ƥ����Ȥ�õ��ˤϡ��õ����ʸ�������򤷤ƥХå�
-���ڡ������ǥ꡼�ȥ��������Ϥ��Ƥ������������뤤�ϡ��������ƥ����Ȥ�
-���Ϥ�������򤵤줿�ƥ����Ȥ��ִ�����ޤ���
-
-6. ������ʬ�Υ��ԡ���������ʬ�򤳤Υ�����ɥ�����Τɤ����˥��ԡ�����
-�ˤϡ��ޤ����ԡ��������������(�����ǡ����뤤���̤Υ��ץꥱ��������)
-�����ܥ��� 2 �򥯥�å����ơ�������������ΰ��֤˥��ԡ����Ƥ���������
-
-7. �Խ����ƥ����� widget �� Emacs �Υ����Х���ɤ˲ä���ɸ��Ū�ʤ� Motif
-���Խ���ǽ�򥵥ݡ��Ȥ��Ƥ��ޤ����Хå����ڡ����ȥ���ȥ�����-H ������
-��������κ�¦��ʸ���������ޤ����ǥ꡼�ȥ����ȥ���ȥ�����-D ������
-��������α�¦��ʸ���������ޤ���Meta-�Хå����ڡ������������������
-��¦��ñ���������Meta-D ��������������κ�¦��ñ��������ޤ���
-����ȥ�����-K �������������뤫������ޤǤ����������ΰ��֤˲���
-�����ʤ��ä����ϡ����Ԥ������ޤ���#{
-      if undo_support
-        undo_text = "Control-z �ϺǸ�˹Ԥä��ѹ��μ��ä�(undo)��Ԥ���"
-        case $tk_platform['platform']
-        when "unix", "macintosh"
-          undo_text << "Control-Shift-z"
-        else # 'windows'
-          undo_text << "Control-y"
-        end
-        undo_text << "��undo�����ѹ��κ�Ŭ��(redo)��Ԥ��ޤ���"
-      else
-        ""
-      end
-}
-
-
-8. ������ɥ��Υꥵ���������� widget �� "setGrid" ���ץ����򥪥�ˤ�
-�Ƥ���ޤ��Τǡ�������ɥ���ꥵ����������ˤϹ⤵�����Ͼ��ʸ�����ʸ
-�����������ܤˤʤ�ޤ����ޤ���������ɥ��򶹤��������ˤ�Ĺ���Ԥ���ư
-Ū���ޤ��֤��졢������Ƥ����Ƥ�������褦�ˤʤäƤ��ޤ���
-EOT
-
-  set_insert('0.0')
-}
-
diff --git a/ext/tk/sample/demos-jp/textpeer.rb b/ext/tk/sample/demos-jp/textpeer.rb
deleted file mode 100644
index de604f1940..0000000000
--- a/ext/tk/sample/demos-jp/textpeer.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# text widget peering demo (called by 'widget')
-#
-# based on Tcl/Tk8.5.0 widget demos
-
-if defined?($textpeer_demo) && $textpeer_demo
-  $textpeer_demo.destroy
-  $textpeer_demo = nil
-end
-
-# demo toplevel widget
-$textpeer_demo = TkToplevel.new {|w|
-  title("Text Wdget Peering Demonstration")
-  iconname("textpeer")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($textpeer_demo).pack(:fill=>:both, :expand=>true)
-
-count = [0]
-
-## Define a widget that we peer from; it won't ever actually be shown though
-first = TkText.new(base_frame, :widgetname=>"text#{count[0] += 1}")
-first.insert :end,"���Υǥ�ϰ�Ĥ��Ȥ��������ƥ����ȥ��������åȤ򼨤��ޤ���"
-first.insert :end,"�����Υƥ����ȥ��������åȤ�����(�ԥ�;peer)�δط���"
-first.insert :end,"�ʤäƤ��ޤ���"
-first.insert :end,"�����ϡ����פȤʤ�ǡ�����ǥ�϶��̤Τ�Τ�����ޤ�����"
-first.insert :end,"����ɽ�����֡��Խ����֡������ϰ�(selection)�ˤĤ��Ƥ�"
-first.insert :end,"��Ω�˻��Ĥ��Ȥ��Ǥ��ޤ���"
-first.insert :end,"�ƥƥ����ȥ��������åȤ��Ƥˤ���"
-first.insert :end,"�֥ԥ�(peer)�κ����ץܥ����Ȥ��С�"
-first.insert :end,"�����ʥԥ����ɲä��뤳�Ȥ���ǽ�Ǥ���"
-first.insert :end,"�ޤ��֥ԥ�(peer)�ξõ�ץܥ����Ȥ��С�"
-first.insert :end,"����Υԥ����������åȤ�õ�뤳�Ȥ�Ǥ��ޤ���"
-
-Tk.update_idletasks  ## for 'first' widget
-
-## Procedures to make and kill clones; most of this is just so that the demo
-## looks nice...
-def makeClone(count, win, txt)
-  cnt = (count[0] += 1)
-  peer = TkText::Peer.new(txt, win, :widgetname=>"text#{cnt}")
-  sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
-  peer.yscrollbar sbar
-  b1 = TkButton.new(win, :widgetname=>"clone#{cnt}",
-                    :text=>'�ԥ�(peer)�κ���',
-                    :command=>proc{makeClone(count, win, peer)})
-  b2 = TkButton.new(win, :widgetname=>"kill#{cnt}",
-                    :text=>'�ԥ�(peer)�ξõ�',
-                    :command=>proc{killClone(win, cnt)})
-  row = cnt * 2
-  TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
-  TkGrid.configure('^',  '^',  b2, :sticky=>'nsew', :row=>(row+=1))
-  TkGrid.configure(b1,  b2, :sticky=>'new')
-  TkGrid.rowconfigure(win,  b2, :weight=>1)
-end
-
-def killClone(win, cnt)
-  Tk.destroy("#{win.path}.text#{cnt}",  "#{win.path}.sb#{cnt}",
-             "#{win.path}.clone#{cnt}", "#{win.path}.kill#{cnt}")
-end
-
-## Now set up the GUI
-makeClone(count, base_frame, first)
-makeClone(count, base_frame, first)
-first.destroy
-
-## See Code / Dismiss buttons
-TkFrame.new(base_frame){|f|
-  TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
-                 $textpeer_demo.destroy
-                 $textpeer_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-                 showCode 'textpeer'
-               }).pack(:side=>:left, :expand=>true)
-
-  TkGrid.configure(f, '-', '-', :sticky=>'ew', :row=>5000)
-}
-TkGrid.columnconfigure(base_frame, 0, :weight=>1)
diff --git a/ext/tk/sample/demos-jp/timer b/ext/tk/sample/demos-jp/timer
deleted file mode 100644
index 6cb7c87e09..0000000000
--- a/ext/tk/sample/demos-jp/timer
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env ruby
-#
-# timer --
-# This script generates a counter with start,stop and reset buttons.
-#
-# Copyright (C) 1998 Takaaki Tateishi (ttate@jaist.ac.jp)
-# last update: Sat Jun 27 12:24:14 JST 1998
-#
-
-require "tk"
-require "thread"
-require "tkafter"
-
-$time = "0.00"
-$m = Mutex.new
-$loop = false
-
-def timer_stop
-  $loop = false
-  $m.lock
-end
-
-def timer_start
-  $loop = true
-  $m.unlock
-end
-
-def timer_reset
-  $time = "0.00"
-  $root.countframe.counter['text'] = $time
-end
-
-def timer_loop
-  if $loop
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-  end
-  Tk.after(10,proc{timer_loop})
-end
-
-
-#
-# thread version
-#
-def timer_loop2
-  while true
-    $m.lock
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-    sleep(0.01)
-    $m.unlock
-  end
-end
-
-#
-# TkAfter
-#
-def timer_loop3
-  if $loop
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-  end
-end
-
-
-class CountFrame < TkFrame
-  attr_reader :counter
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    @counter = TkLabel.new(self,
-			   'text'=>$time,
-			   'relief'=>'raised')
-    @counter.pack('fill'=>'both')
-    self
-  end
-end
-
-
-class ButtonFrame < TkFrame
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-=begin
-    @stop = TkButton.new(self,
-			 'text'=>'Stop',
-			 'command'=>proc{timer_stop})
-    @start = TkButton.new(self,
-			  'text'=>'Start',
-			  'command'=>proc{timer_start})
-=end
-    @stop  = TkButton.new(self, :text=>'Stop',  :state=>:disabled)
-    @start = TkButton.new(self, :text=>'Start', :state=>:normal)
-
-    @stop.command proc{
-      timer_stop
-      @start.state(:normal)
-      @stop.state(:disabled)
-    }
-    @start.command proc{
-      timer_start
-      @stop.state(:normal)
-      @start.state(:disabled)
-    }
-
-    @reset = TkButton.new(self,
-			  'text'=>'Reset',
-			  'command'=>proc{timer_reset})
-    for b in [@stop,@start,@reset]
-      b.pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-    end
-  end
-end
-
-
-class Timer < TkRoot
-  attr_reader :countframe
-
-  def initialize(*args)
-    super(*args)
-    @countframe = CountFrame.new(self)
-    @buttonframe = ButtonFrame.new(self)
-    for f in [@buttonframe,@countframe]
-      f.pack('side'=>'top', 'fill'=>'both')
-    end
-    self
-  end
-end
-
-
-$root = Timer.new
-
-#$thread = Thread.start{timer_loop2}
-#timer_loop
-TkAfter.new(10,-1,proc{timer_loop3}).start
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/toolbar.rb b/ext/tk/sample/demos-jp/toolbar.rb
deleted file mode 100644
index 570d52704f..0000000000
--- a/ext/tk/sample/demos-jp/toolbar.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# toolbar.rb --
-#
-# This demonstration script creates a toolbar that can be torn off.
-#
-# based on "Id: toolbar.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($toolbar_demo) && $toolbar_demo
-  $toolbar_demo.destroy
-  $toolbar_demo = nil
-end
-
-$toolbar_demo = TkToplevel.new {|w|
-  title("Ttk Menu Buttons")
-  iconname("toolbar")
-  positionWindow(w)
-}
-
-base_frame = Ttk::Frame.new($toolbar_demo).pack(:fill=>:both, :expand=>true)
-
-if Tk.windowingsystem != 'aqua'
-  msg = Ttk::Label.new(base_frame, :wraplength=>'4i', :text=><<EOL)
-���Υǥ�Ǥϡ��ġ���С���ɤΤ褦�ˤ���Ŭ�ڤ˥ơ����б������뤫��\
-�ޤ����ɤΤ褦�ˤ����ڤ�Υ����ǽ�ˤ��뤫�򼨤��Ƥ��ޤ�\
-�ʤ��������ġ���С����ڤ�Υ���ˤ�Tcl/Tk8.5�ʾ�ε�ǽ��ɬ�פǤ��ˡ�\
-�ġ���С��Υܥ���ϡ�'Toolbutton'�����������Ѥ���褦���������뤳�Ȥǡ�\
-"toolbar style"�ܥ���Ȥʤ�褦��°�����ꤵ��Ƥ��ޤ���\
-�ġ���С��κ�ü�ˤϴ�ñ�ʥޡ��������֤���Ƥ��ޤ���\
-�ޡ�������˥ޥ����������뤬���Ȱ�ư��������˥������뤬�Ѳ����ޤ���\
-�����ǥġ���С���ư�����褦�˥ɥ�å�����ȡ�\
-�ġ���С����Τ��ڤ�Υ������Ω�����ȥåץ�٥륦�������åȤ�\
-���뤳�Ȥ��Ǥ��ޤ���\
-�ڤ�Υ�����ġ���С������פȤʤä����ˤϡ�\
-����Ū�ʥȥåץ�٥륦�������åȤ�Ʊ�ͤ�ñ����Ĥ��뤳�Ȥǡ�
-�ƤӸ��Υ�����ɥ���ĥ���դ�����Ǥ��礦��
-EOL
-else
-  msg = Ttk::Label.new(base_frame, :wraplength=>'4i', :text=><<EOL)
-���Υǥ�Ǥϡ��ġ���С���ɤΤ褦�ˤ���Ŭ�ڤ˥ơ����б������뤫��\
-�����Ƥ��ޤ���\
-�ġ���С��Υܥ���ϡ�'Toolbutton'�����������Ѥ���褦���������뤳�Ȥǡ�\
-"toolbar style"�ܥ���Ȥʤ�褦��°�����ꤵ��Ƥ��ޤ���
-EOL
-end
-
-## Set up the toolbar hull
-tbar_base = Tk::Frame.new(base_frame,  # Tk ɸ��� frame �Ǥʤ���Фʤ�ޤ���
-                          :widgetname=>'toolbar') # ������ɥ������ȥ�ʸ����Ȥ��뤿��ˡ����������å�̾���������Ƥ��ޤ���
-sep = Ttk::Separator.new(base_frame)
-to_base = Ttk::Frame.new(tbar_base, :cursor=>'fleur')
-if Tk.windowingsystem != 'aqua'
-  to  = Ttk::Separator.new(to_base, :orient=>:vertical)
-  to2 = Ttk::Separator.new(to_base, :orient=>:vertical)
-  to.pack(:fill=>:y, :expand=>true, :padx=>2, :side=>:left)
-  to2.pack(:fill=>:y, :expand=>true, :side=>:left)
-end
-
-contents = Ttk::Frame.new(tbar_base)
-Tk.grid(to_base, contents, :sticky=>'nsew')
-tbar_base.grid_columnconfigure(contents, :weight=>1)
-contents.grid_columnconfigure(1000, :weight=>1)
-
-if Tk.windowingsystem != 'aqua'
-  ## Bindings so that the toolbar can be torn off and reattached
-  to_base.bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  to.     bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  to2.    bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  def tbar_base.tearoff(w, x, y)
-    on_win = TkWinfo.containing(x, y)
-    return unless (on_win && on_win.path =~ /^#{@path}(\.|$)/)
-    self.grid_remove
-    w.grid_remove
-    self.wm_manage
-    # self.wm_title('Toolbar') # �⤷���������å�̾�򥦥���ɥ������ȥ�ˤ������ʤ��ʤ顤���������ꤷ�Ƥ�������
-    self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(w) }
-  end
-  def tbar_base.untearoff(w)
-    self.wm_forget
-    w.grid
-    self.grid
-  end
-end
-
-## Some content for the rest of the toplevel
-text = TkText.new(base_frame, :width=>40, :height=>10)
-
-## Toolbar contents
-tb_btn = Ttk::Button.new(tbar_base, :text=>'�ܥ���', :style=>'Toolbutton',
-                         :command=>proc{
-                           text.insert(:end, "�ܥ��󤬲�����ޤ�����\n")
-                         })
-tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'�����å��ܥ���',
-                              :style=>'Toolbutton',
-                              :variable=>(check = TkVariable.new),
-                              :command=>proc{
-                                text.insert(:end, "�����å��ܥ�����ͤ�#{check.value}�Ǥ���\n")
-                              })
-tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'��˥塼')
-tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families,
-                             :state=>:readonly)
-tb_mbtn.menu(menu = Tk::Menu.new(tb_mbtn))
-menu.add(:command, :label=>'Just', :command=>proc{text.insert(:end, "Just\n")})
-menu.add(:command, :label=>'An', :command=>proc{text.insert(:end, "An\n")})
-menu.add(:command, :label=>'Example',
-         :command=>proc{text.insert(:end, "Example\n")})
-tb_combo.bind('<ComboboxSelected>'){ text.font.family = tb_combo.get }
-
-## Arrange contents
-Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo,
-        :in=>contents, :padx=>2, :sticky=>'ns')
-Tk.grid(tbar_base, :sticky=>'ew')
-Tk.grid(sep, :sticky=>'ew')
-Tk.grid(msg, :sticky=>'ew')
-Tk.grid(text, :sticky=>'nsew')
-base_frame.grid_rowconfigure(text, :weight=>1)
-base_frame.grid_columnconfigure(text, :weight=>1)
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'�����ɻ���',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'toolbar'}),
-         Ttk::Button.new(frame, :text=>'�Ĥ���',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $toolbar_demo.destroy
-                           $toolbar_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  Tk.grid(frame, :sticky=>'ew')
-}
diff --git a/ext/tk/sample/demos-jp/tree.rb b/ext/tk/sample/demos-jp/tree.rb
deleted file mode 100644
index 00d715282b..0000000000
--- a/ext/tk/sample/demos-jp/tree.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# tree.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget.
-#
-# based on "Id: tree.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($tree_demo) && $tree_demo
-  $tree_demo.destroy
-  $tree_demo = nil
-end
-
-$tree_demo = TkToplevel.new {|w|
-  title("Directory Browser")
-  iconname("tree")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($tree_demo).pack(:fill=>:both, :expand=>true)
-
-## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
-               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
-               :text=><<EOL).pack(:fill=>:x)
-Ttk�Ȥϡ��ơ��޻����ǽ�ʿ��������������åȽ���Ǥ���\
-���Υ���ץ�ϡ��ե����륷���ƥ�Τ褦�ʳ���Ū�ʥǡ��������\
-���ȤǤ���褦�ˤ���Ttk::Treeview���������åȤ�ޤ�Ǥ��ޤ���\
-Ttk::Treeview���������åȤϡ��ڹ�¤���Τ�ɽ�����ǽ�ˤ�������Ǥʤ���\
-�ɲþ���(���Υ���ץ�ξ��ϥե����륵����)��ɽ�����뤿���\
-Ǥ�դθĿ����ɲå����ⰷ�����Ȥ�Ǥ��ޤ���\
-�ޤ��������Υ����ȥ�֤ζ��ڤ���ʬ��ɥ�å����뤳�Ȥǡ�\
-�����������ѹ����뤳�Ȥ��ǽ�Ǥ���
-EOL
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'�����ɻ���',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'tree'}),
-         Ttk::Button.new(frame, :text=>'�Ĥ���',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $tree_demo.destroy
-                           $tree_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-## Code to populate the roots of the tree (can be more than one on Windows)
-def populate_roots(tree)
-  TkComm.simplelist(Tk.tk_call('file', 'volumes')).sort.each{|dir|
-    populate_tree(tree, tree.insert(nil, :end, :text=>dir,
-                                    :values=>[dir, 'directory']))
-  }
-end
-
-## Code to populate a node of the tree
-def populate_tree(tree, node)
-  return if tree.get(node, :type) != 'directory'
-
-  path = tree.get(node, :fullpath)
-  tree.delete(tree.children(node))
-  Dir.glob("#{path}/*").sort.each{|f|
-    type = File.ftype(f)
-    id = tree.insert(node, :end,
-                     :text=>File.basename(f), :values=>[f, type]).id
-    if type == 'directory'
-      ## Make it so that this node is openable
-      tree.insert(id, 0, :text=>'dummy')
-      tree.itemconfigure(id, :text=>File.basename(f))
-    elsif type == 'file'
-      size = File.size(f)
-      if size >= 1024*1024*1024
-        size = '%.1f GB' % (size.to_f/1024/1024/1024)
-      elsif size >= 1024*1024
-        size = '%.1f MB' % (size.to_f/1024/1024)
-      elsif size >= 1024
-        size = '%.1f KB' % (size.to_f/1024)
-      else
-        size = '%.1f bytes' % (size.to_f/1024)
-      end
-      tree.set(id, :size, size)
-    end
-  }
-
-  # Stop this code from rerunning on the current node
-  tree.set(node, :type, 'processed_directory')
-end
-
-## Create the tree and set it up
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(fullpath type size),
-                         :displaycolumns=>['size'])
-if Tk.windowingsystem != 'aqua'
-  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
-else
-  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
-end
-
-tree.heading_configure('#0', :text=>'Directory Structure')
-tree.heading_configure('size', :text=>'File Size')
-tree.column_configure('size', :stretch=>0, :width=>70)
-populate_roots(tree)
-tree.bind('<TreeviewOpen>', '%W'){|w| populate_tree(w, w.focus_item)}
-
-## Arrange the tree and its scrollbars in the toplevel
-container = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-container.lower
-Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
-Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
-container.grid_columnconfigure(0, :weight=>1)
-container.grid_rowconfigure(0, :weight=>1)
diff --git a/ext/tk/sample/demos-jp/ttkbut.rb b/ext/tk/sample/demos-jp/ttkbut.rb
deleted file mode 100644
index 90ec3fce5b..0000000000
--- a/ext/tk/sample/demos-jp/ttkbut.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# ttkbut.rb
-#
-# This demonstration script creates a toplevel window containing several
-# simple Ttk widgets, such as labels, labelframes, buttons, checkbuttons and
-# radiobuttons.
-#
-# based on "Id: ttkbut.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkbut_demo) && $ttkbut_demo
-  $ttkbut_demo.destroy
-  $ttkbut_demo = nil
-end
-
-$ttkbut_demo = TkToplevel.new {|w|
-  title("Simple Ttk Widgets")
-  iconname("ttkbut")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkbut_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttk�Ȥϡ��ơ��޻����ǽ�ʿ��������������åȽ���Ǥ���\
-�������ʤ����ܤˤ��Ƥ���Τ�Ttk�Υơ��޲���٥�ǡ�\
-���ˤ�Ttk�Υ�٥�ե졼�����˻��ĤΥ��롼�פ�Ttk���������åȤ�\
-ɽ������Ƥ��ޤ���
-�ǽ�Υ��롼�פ����ƥܥ���Ǥ��ꡤ\
-���줾�쥯��å�����и��ߤΥ��ץꥱ�������Υơ��ޤ����ꤵ��ޤ���
-�����ܤΥ��롼�פϻ��ĤΥ����å��ܥ��󽸹�Ǥ���\
-�ƽ���δ֤ˤϡ����ѥ졼�����������åȤ��֤���Ƥ��ޤ���\
-�ʤ���ͭ�����ץܥ���ϡ����Υȥåץ�٥륦�������å����\
-¾�Τ��٤ƤΥơ��޲����������åȤξ���(state)��"disabled"���ɤ�����\
-����ȥ����뤹�뤳�Ȥ����դ��Ƥ���������
-�����ܤΥ��롼�פϴ�Ϣ�դ���줿�饸���ܥ��󽸹�ȤʤäƤ��ޤ���
-EOL
-
-## Add buttons for setting the theme
-buttons = Ttk::Labelframe.new(base_frame, :text=>'�ܥ���')
-# Ttk::Style.theme_names.each{|theme|
-#   Ttk::Button.new(buttons, :text=>theme,
-#                   :command=>proc{Ttk::Style.theme_use theme}).pack(:pady=>2)
-# }
-Ttk.themes.each{|theme|
-  Ttk::Button.new(buttons, :text=>theme,
-                  :command=>proc{Ttk.set_theme theme}).pack(:pady=>2)
-}
-
-## Helper procedure for the top checkbutton
-def setState(root, value, *excepts)
-  return if excepts.member?(root)
-
-  ## Non-Ttk widgets (e.g. the toplevel) will fail, so make it silent
-  begin
-    root.state = value
-  rescue
-  end
-
-  ## Recursively invoke on all children of this root that are in the same
-  ## toplevel widget
-  root.winfo_children.each{|w|
-    setState(w, value, *excepts) if w.winfo_toplevel == root.winfo_toplevel
-  }
-end
-
-## Set up the checkbutton group
-checks = Ttk::Labelframe.new(base_frame, :text=>'�����å��ܥ���')
-enabled = TkVariable.new(true)
-e = Ttk::Checkbutton.new(checks, :text=>'ͭ����', :variable=>enabled,
-                         :command=>proc{
-                           setState($ttkbut_demo,
-                                    ((enabled.bool)? "!disabled" : "disabled"),
-                                    e)
-                         })
-
-## See ttk_widget(n) for other possible state flags
-sep1 = Ttk::Separator.new(checks)
-sep2 = Ttk::Separator.new(checks)
-
-cheese  = TkVariable.new
-tomato  = TkVariable.new
-basil   = TkVariable.new
-oregano = TkVariable.new
-
-c1 = Ttk::Checkbutton.new(checks, :text=>'������',   :variable=>cheese)
-c2 = Ttk::Checkbutton.new(checks, :text=>'�ȥޥ�',   :variable=>tomato)
-c3 = Ttk::Checkbutton.new(checks, :text=>'�Х���',   :variable=>basil)
-c4 = Ttk::Checkbutton.new(checks, :text=>'���쥬��', :variable=>oregano)
-
-Tk.pack(e, sep1, c1, c2, sep2, c3, c4, :fill=>:x, :pady=>2)
-
-## Set up the radiobutton group
-radios = Ttk::Labelframe.new(base_frame, :text=>'�饸���ܥ���')
-
-happyness = TkVariable.new
-
-r1 = Ttk::Radiobutton.new(radios, :variable=>happyness,
-                          :text=>'Great', :value=>'great')
-r2 = Ttk::Radiobutton.new(radios, :variable=>happyness,
-                          :text=>'Good', :value=>'good')
-r3 = Ttk::Radiobutton.new(radios, :variable=>happyness,
-                          :text=>'Ok', :value=>'ok')
-r4 = Ttk::Radiobutton.new(radios, :variable=>happyness,
-                          :text=>'Poor', :value=>'poor')
-r5 = Ttk::Radiobutton.new(radios, :variable=>happyness,
-                          :text=>'Awful', :value=>'awful')
-
-Tk.pack(r1, r2, r3, r4, r5, :fill=>:x, :padx=>3, :pady=>2)
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'�ѿ�����',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{
-                           showVars(base_frame, ['ͭ����', enabled],
-                                    ['������', cheese], ['�ȥޥ�', tomato],
-                                    ['�Х���', basil], ['���쥬��', oregano],
-                                    ['��ʡ��', happyness])
-                         }),
-         Ttk::Button.new(frame, :text=>'�����ɻ���',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkbut'}),
-         Ttk::Button.new(frame, :text=>'�Ĥ���',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           tmppath = $ttkbut_demo
-                           $ttkbut_demo = nil
-                           $showVarsWin[tmppath.path] = nil
-                           tmppath.destroy
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x, :expand=>true)
-}
-
-## Arrange things neatly
-f = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-f.lower
-Tk.grid(buttons, checks, radios, :in=>f, :sticky=>'nwe', :pady=>2, :padx=>3)
-f.grid_columnconfigure([0, 1, 2], :weight=>1, :uniform=>:yes)
diff --git a/ext/tk/sample/demos-jp/ttkmenu.rb b/ext/tk/sample/demos-jp/ttkmenu.rb
deleted file mode 100644
index 9e78678c8e..0000000000
--- a/ext/tk/sample/demos-jp/ttkmenu.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# ttkmenu.rb --
-#
-# This demonstration script creates a toplevel window containing several Ttk
-# menubutton widgets.
-#
-# based on "Id: ttkmenu.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkmenu_demo) && $ttkmenu_demo
-  $ttkmenu_demo.destroy
-  $ttkmenu_demo = nil
-end
-
-$ttkmenu_demo = TkToplevel.new {|w|
-  title("Ttk Menu Buttons")
-  iconname("ttkmenu")
-  positionWindow(w)
-}
-
-base_frame = Ttk::Frame.new($ttkmenu_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttk�Ȥϡ��ơ��޻����ǽ�ʿ��������������åȽ���Ǥ���\
-����ˤ��ơ��ޤ��б����뤳�Ȥ��Ǥ���褦�ˤʤä����������åȤΤҤȤĤ�\
-��˥塼�ܥ��󤬤���ޤ���\
-�ʲ��Ǥϡ��ơ��ޤ��б�������˥塼�ܥ��󤬤����Ĥ�ɽ������Ƥ��ޤ���\
-������Ȥäơ����߻�����Υơ��ޤ��ѹ����뤳�Ȥ���ǽ�Ǥ���\
-�ơ��ޤ����򤬥�˥塼�ܥ��󼫿Ȥθ��ݤ����Ѳ��������ͻҤ䡤\
-����Υ�˥塼�ܥ���������ۤʤ륹������\
-(�ġ���С��Ǥΰ���Ū��ɽ����Ŭ�������)��ɽ������Ƥ����ͻҤ�\
-���ܤ��Ƥ���������\
-�ʤ�����˥塼�ܥ���ˤĤ��Ƥϥơ��ޤ��б��������������åȤ�����ޤ�����\
-��˥塼�ˤĤ��Ƥϥơ��ޤ��б��������������åȤϴޤޤ�Ƥ��ޤ���\
-������ͳ�ϡ�ɸ���Tk�Υ�˥塼���������åȤ�\
-���٤ƤΥץ�åȥۡ���ǽ�ʬ���ɹ��ʸ��ݤ������������äƤ��롤\
-�äˡ�¿���δĶ��Ǥ��δĶ����������ηϤȤʤ�褦�˼�������Ƥ����\
-Ƚ�Ǥ��줿���Ȥˤ��ޤ���
-EOL
-
-Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
-
-## See Code / Dismiss
-Ttk::Frame.new($ttkmenu_demo) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'�����ɻ���',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkmenu'}),
-         Ttk::Button.new(frame, :text=>'�Ĥ���',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttkmenu_demo.destroy
-                           $ttkmenu_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-b1 = Ttk::Menubutton.new(base_frame,:text=>'�ơ��ޤ�����',:direction=>:above)
-b2 = Ttk::Menubutton.new(base_frame,:text=>'�ơ��ޤ�����',:direction=>:left)
-b3 = Ttk::Menubutton.new(base_frame,:text=>'�ơ��ޤ�����',:direction=>:right)
-b4 = Ttk::Menubutton.new(base_frame,:text=>'�ơ��ޤ�����',:direction=>:flush,
-                         :style=>Ttk::Menubutton.style('Toolbutton'))
-b5 = Ttk::Menubutton.new(base_frame,:text=>'�ơ��ޤ�����',:direction=>:below)
-
-b1.menu(m1 = Tk::Menu.new(b1, :tearoff=>false))
-b2.menu(m2 = Tk::Menu.new(b2, :tearoff=>false))
-b3.menu(m3 = Tk::Menu.new(b3, :tearoff=>false))
-b4.menu(m4 = Tk::Menu.new(b4, :tearoff=>false))
-b5.menu(m5 = Tk::Menu.new(b5, :tearoff=>false))
-
-Ttk.themes.each{|theme|
-  m1.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m2.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m3.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m4.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m5.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-}
-
-f = Ttk::Frame.new(base_frame).pack(:fill=>:x)
-f1 = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-f.lower
-
-f.grid_anchor(:center)
-TkGrid('x', b1, 'x', :in=>f, :padx=>3, :pady=>2)
-TkGrid(b2,  b4, b3,  :in=>f, :padx=>3, :pady=>2)
-TkGrid('x', b5, 'x', :in=>f, :padx=>3, :pady=>2)
diff --git a/ext/tk/sample/demos-jp/ttknote.rb b/ext/tk/sample/demos-jp/ttknote.rb
deleted file mode 100644
index f0cd258893..0000000000
--- a/ext/tk/sample/demos-jp/ttknote.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# ttknote.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# notebook widget.
-#
-# based on "Id: ttknote.tcl,v 1.5 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttknote_demo) && $ttknote_demo
-  $ttknote_demo.destroy
-  $ttknote_demo = nil
-end
-
-$ttknote_demo = TkToplevel.new {|w|
-  title("Ttk Notebook Widget")
-  iconname("ttknote")
-  positionWindow(w)
-}
-
-## See Code / Dismiss
-Ttk::Frame.new($ttknote_demo) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'�����ɻ���',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttknote'}),
-         Ttk::Button.new(frame, :text=>'�Ĥ���',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttknote_demo.destroy
-                           $ttknote_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-base_frame = Ttk::Frame.new($ttknote_demo).pack(:fill=>:both, :expand=>true)
-
-## Make the notebook and set up Ctrl+Tab traversal
-notebook = Ttk::Notebook.new(base_frame).pack(:fill=>:both, :expand=>true,
-                                              :padx=>2, :pady=>3)
-notebook.enable_traversal
-
-## Popuplate the first pane
-f_msg = Ttk::Frame.new(notebook)
-msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'5i',
-                       :justify=>:left, :anchor=>'n', :text=><<EOL)
-Ttk�Ȥϡ��ơ��޻����ǽ�ʿ��������������åȽ���Ǥ���\
-������˴ޤޤ�륦�������åȤΤҤȤĤ˥Ρ��ȥ֥å����������åȤ�����ޤ���\
-�Ρ��ȥ֥å����������åȤϡ�\
-���̤����Ƥ���ä��ѥͥ뤫���������ǽ�ˤ���褦��\
-���֤ν���ʥ��֥��åȡˤ����ޤ���\
-���֥��åȤϺǶ��¿���Υ桼�����󥿡��ե������Ǹ����뵡ǽ�Ǥ���\
-���֤�����ϡ��ޥ����ˤ������Ǥʤ���\
-�Ρ��ȥ֥å����������åȤΥڡ����θ��Ф������򤵤�Ƥ�����Ǥ����\
-Ctrl+Tab���������Ϥˤ�äƤ�Ԥ����Ȥ��Ǥ��ޤ���\
-���Υǥ�Ǥϡ����Ф��ǲ����դ���ʸ���Υ�����Alt�����Ȥ��Ȥ߹�碌�뤳�Ȥ�\
-�ڡ��������򤹤뤳�Ȥ��Ǥ���褦�ˤ����ꤷ�Ƥ��ޤ���\
-�������������ܤΥ��֤�̵�������������Ǥ��ʤ��褦�ˤʤäƤ��뤳�Ȥˤ�\
-���դ��Ƥ���������
-EOL
-neat = TkVariable.new
-after_id = nil
-msg_b = Ttk::Button.new(f_msg, :text=>'���Ƥ�����(Neat!)', :underline=>6,
-                        :command=>proc{
-                          neat.value = '���������ΤȤ��ꤵ������'
-                          Tk.after_cancel(after_id) if after_id
-                          after_id = Tk.after(500){neat.value = ''}
-                        })
-msg_b.winfo_toplevel.bind('Alt-n'){ msg_b.focus; msg_b.invoke }
-msg_l = Ttk::Label.new(f_msg, :textvariable=>neat)
-notebook.add(f_msg, :text=>'����(Description)', :underline=>3, :padding=>2)
-Tk.grid(msg_m, '-', :sticky=>'new', :pady=>2)
-Tk.grid(msg_b, msg_l, :pady=>[2, 4], :padx=>20)
-msg_b.grid_configure(:sticky=>'e')
-msg_l.grid_configure(:sticky=>'w')
-f_msg.grid_rowconfigure(1, :weight=>1)
-f_msg.grid_columnconfigure([0, 1], :weight=>1, :uniform=>1)
-
-## Populate the second pane. Note that the content doesn't really matter
-f_disabled = Ttk::Frame.new(notebook)
-notebook.add(f_disabled, :text=>'̵�������줿����', :state=>:disabled)
-
-## Popuplate the third pane
-f_editor = Ttk::Frame.new(notebook)
-notebook.add(f_editor, :text=>'�ƥ����ȥ��ǥ���(Text Editor)', :underline=>9)
-editor_t = Tk::Text.new(f_editor, :width=>40, :height=>10, :wrap=>:char)
-if Tk.windowingsystem != 'aqua'
-  editor_s = editor_t.yscrollbar(Ttk::Scrollbar.new(f_editor))
-else
-  editor_s = editor_t.yscrollbar(Tk::Scrollbar.new(f_editor))
-end
-editor_s.pack(:side=>:right, :fill=>:y, :padx=>[0,2], :pady=>2)
-editor_t.pack(:fill=>:both, :expand=>true, :padx=>[2,0], :pady=>2)
diff --git a/ext/tk/sample/demos-jp/ttkpane.rb b/ext/tk/sample/demos-jp/ttkpane.rb
deleted file mode 100644
index a7b458a683..0000000000
--- a/ext/tk/sample/demos-jp/ttkpane.rb
+++ /dev/null
@@ -1,216 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# ttkpane.rb --
-#
-# This demonstration script creates a Ttk pane with some content.
-#
-# based on "Id: ttkpane.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkpane_demo) && $ttkpane_demo
-  $ttkpane_demo.destroy
-  $ttkpane_demo = nil
-end
-
-$ttkpane_demo = TkToplevel.new {|w|
-  title("Themed Nested Panes")
-  iconname("ttkpane")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkpane_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-���Υǥ�ϡ������ߴط��ˤ���ơ����դ��ڥ���ɥ�����ɥ��򼨤��Ƥ��ޤ���\
-���줾����礭���ϡ��ޤޤ�Ƥ���ڥ���δ֤ˤ��륨�ꥢ��Ĥ����\
-������ɥ�å����뤳�Ȥ��ѹ��Ǥ��ޤ���
-EOL
-
-Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'�����ɻ���',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkpane'}),
-         Ttk::Button.new(frame, :text=>'�Ĥ���',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttkpane_demo.destroy
-                           $ttkpane_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-outer = Ttk::Panedwindow.new(frame, :orient=>:horizontal)
-outer.add(in_left = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-outer.add(in_right = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-in_left.add(left_top = Ttk::Labelframe.new(in_left, :text=>'�ܥ���'))
-in_left.add(left_bot = Ttk::Labelframe.new(in_left, :text=>'����'))
-in_right.add(right_top = Ttk::Labelframe.new(in_right, :text=>'�ץ����쥹'))
-in_right.add(right_bot = Ttk::Labelframe.new(in_right, :text=>'�ƥ�����'))
-if Tk.windowingsystem == 'aqua'
-  [left_top, left_bot, right_top, right_bot].each{|w| w.padding(3) }
-end
-
-# Fill the button pane
-Ttk::Button.new(left_top, :text=>'�����Ƥ�',
-                :command=>proc{
-                  Tk.messageBox(:type=>'ok', :icon=>'info',
-                                :message=>'���Ƥơ�',
-                                :detail=>'That hurt...', :parent=>base_frame,
-                                :title=>'Button Pressed')
-                }).pack(:padx=>2, :pady=>5)
-
-
-zones_list = [
-  [':Europe/Berlin'],
-  [':America/Argentina/Buenos_Aires', ':America/Buenos_Aires'],
-  [':Africa/Johannesburg'],
-  [':Europe/London'],
-  [':America/Los_Angeles'],
-  [':Europe/Moscow'],
-  [':America/New_York'],
-  [':Asia/Singapore'],
-  [':Australia/Sydney'],
-  [':Asia/Tokyo'],
-]
-
-zones = []
-
-# Check tzinfo support
-if $tk_major_ver > 8 || ($tk_major_ver == 8 && $tk_minor_ver >= 5)
-  tzinfo = :tcl
-
-  zones_list.each{|list|
-    list.each{|zone|
-      begin
-        # Force a pre-load of all the timezones needed; otherwise can end up
-        # poor-looking synch problems!
-        Tk.tk_call('clock', 'format', '0', '-timezone', zone)
-      rescue RuntimeError
-        # ignore
-      else
-        zones << [zone, zone[%r<[^/:]+$>].tr('_', ' ')]
-        break
-      end
-    }
-  }
-
-else
-  begin
-    require 'tzinfo'
-    tzinfo = :tzinfo
-  rescue Exception
-    begin
-      require 'tzfile'
-      tzinfo = :tzfile
-    rescue Exception
-      tzinfo = nil
-    end
-  end
-
-  case tzinfo
-  when :tzinfo
-    zones_list.each{|list|
-      list.each{|zone|
-        begin
-          tz = TZInfo::Timezone.get(zone[%r<[^:]+$>])
-        rescue Exception
-          # ignore
-        else
-          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
-          break
-        end
-      }
-    }
-
-  when :tzfile
-    zones_list.each{|list|
-      list.each{|zone|
-        begin
-          tz = TZFile.create(zone[%r<[^:]+$>])
-        rescue Exception
-          # ignore
-        else
-          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
-          break
-        end
-      }
-    }
-
-  else
-    [ -7, -4, -2, -1, 0, +1, +3, +8, +9, +10 ].each{|zone|
-      zones << [zone, 'UTC%+03d00' % zone]
-    }
-  end
-end
-
-time = TkVariable.new_hash
-
-case tzinfo
-when :tcl
-  update_proc = proc{|now, tz, label|
-    time[label] = Tk.tk_call('clock', 'format', now.tv_sec,
-                             '-timezone', tz, '-format', '%T')
-  }
-when :tzinfo
-  update_proc = proc{|now, tz, label|
-    time[label] = tz.utc_to_local(now).strftime('%H:%M:%S')
-  }
-when :tzfile
-  update_proc = proc{|now, tz, label|
-    time[label] = tz.at(now.tv_sec).strftime('%H:%M:%S')
-  }
-else
-  update_proc = proc{|now, tz, label|
-    time[label] = (now + (tz * 3600)).strftime('%H:%M:%S')
-  }
-end
-
-# Fill the clocks pane
-zones.each_with_index{|(zone, label), idx|
-  Ttk::Separator.new(left_bot).pack(:fill=>:x) if idx > 0
-  Ttk::Label.new(left_bot, :text=>label, :anchor=>'w').pack(:fill=>:x)
-  Ttk::Label.new(left_bot, :textvariable=>time.ref(label),
-                 :anchor=>'w').pack(:fill=>:x)
-}
-
-# Timer start
-every = proc{
-  now = Time.now.utc
-  zones.each{|zone, label| update_proc.call(now, zone, label) }
-}
-TkRTTimer.new(1000, -1, every).start(0, every)
-
-# Fill the progress pane
-Ttk::Progressbar.new(right_top, :mode=>:indeterminate).pack(:fill=>:both, :expand=>true).start
-
-# Fill the text pane
-if Tk.windowingsystem != 'aqua'
-  # The trick with the ttk::frame makes the text widget look like it fits with
-  # the current Ttk theme despite not being a themed widget itself. It is done
-  # by styling the frame like an entry, turning off the border in the text
-  # widget, and putting the text widget in the frame with enough space to allow
-  # the surrounding border to show through (2 pixels seems to be enough).
-  f = Ttk::Frame.new(right_bot, :style=>Ttk::Entry)
-  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
-  txt.pack(:fill=>:both, :expand=>true, :in=>f, :pady=>2, :padx=>2)
-  scr = txt.yscrollbar(Ttk::Scrollbar.new(frame))
-  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
-  f.pack(:fill=>:both, :expand=>true)
-  outer.pack(:fill=>:both, :expand=>true)
-else
-  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
-  scr = txt.yscrollbar(TkScrollbar.new(frame))
-  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
-  txt.pack(:fill=>:both, :expand=>true, :in=>right_bot)
-  outer.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>[6, 10])
-end
diff --git a/ext/tk/sample/demos-jp/ttkprogress.rb b/ext/tk/sample/demos-jp/ttkprogress.rb
deleted file mode 100644
index 82898bf50e..0000000000
--- a/ext/tk/sample/demos-jp/ttkprogress.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# ttkprogress.rb --
-#
-# This demonstration script creates several progress bar widgets.
-#
-# based on "Id: ttkprogress.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkprogress_demo) && $ttkprogress_demo
-  $ttkprogress_demo.destroy
-  $ttkprogress_demo = nil
-end
-
-$ttkprogress_demo = TkToplevel.new {|w|
-  title("Progress Bar Demonstration")
-  iconname("ttkprogress")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkprogress_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-���ˤ���Τ���ĤΥץ����쥹�С��Ǥ���\
-��Τ�Τ�"determinate"�����פΥץ����쥹�С��ǡ�\
-�㤨�Хץ�����बͿ����줿��������λ����ޤǤˤɤΤ��餤�����뤫��\
-�����Ȥ��ʤɤ��Ѥ����ޤ���\
-���Τ�Τ�"indeterminate"�����פΥץ����쥹�С��ǡ�\
-�㤨�Хץ�����ब�¹���(busy)�Ǥ����Τ�\
-��λ�ޤǤˤɤ줯�餤�����뤫��ʬ����ʤ��Ȥ������֤�\
-�����Ȥ��ʤɤ��Ѥ����ޤ���\
-������Υץ����쥹�С��⡤�������ˤ���ܥ����Ȥ����Ȥ�\
-��ư���˥᡼�����⡼�ɤ�ON/OFF�����ؤ��뤳�Ȥ��Ǥ��ޤ���
-EOL
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'�����ɻ���',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkprogress'}),
-         Ttk::Button.new(frame, :text=>'�Ĥ���',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttkprogress_demo.destroy
-                           $ttkprogress_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-p1 = Ttk::Progressbar.new(frame, :mode=>:determinate)
-p2 = Ttk::Progressbar.new(frame, :mode=>:indeterminate)
-
-start = Ttk::Button.new(frame, :text=>'Start Progress',
-                        :command=>proc{ p1.start; p2.start })
-stop  = Ttk::Button.new(frame, :text=>'Stop Progress',
-                        :command=>proc{ p1.stop; p2.stop })
-
-Tk.grid(p1, '-', :pady=>5, :padx=>10)
-Tk.grid(p2, '-', :pady=>5, :padx=>10)
-Tk.grid(start, stop, :padx=>10, :pady=>5)
-start.grid_configure(:sticky=>'e')
-stop.grid_configure(:sticky=>'w')
-frame.grid_columnconfigure(:all, :weight=>1)
-
diff --git a/ext/tk/sample/demos-jp/twind.rb b/ext/tk/sample/demos-jp/twind.rb
deleted file mode 100644
index bd0b060754..0000000000
--- a/ext/tk/sample/demos-jp/twind.rb
+++ /dev/null
@@ -1,292 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# text (embedded windows) widget demo (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($twind_demo) && $twind_demo
-  $twind_demo.destroy
-  $twind_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$twind_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Embedded Windows")
-  iconname("Embedded Windows")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($twind_demo).pack(:fill=>:both, :expand=>true)
-
-# frame ����
-$twind_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc{
-      tmppath = $twind_demo
-      $twind_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc{showCode 'twind'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-$twind_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
-            'relief'=>'sunken') {|f|
-  $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font,
-                          'width'=>'70', 'height'=>35, 'wrap'=>'word',
-                          'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
-    TkScrollbar.new(f) {|s|
-      command proc{|*args| t.yview(*args)}
-      t.yscrollcommand proc{|first,last| s.set first,last}
-    }.pack('side'=>'right', 'fill'=>'y')
-  }.pack('expand'=>'yes', 'fill'=>'both')
-}.pack('expand'=>'yes', 'fill'=>'both')
-
-# ��������
-$tag_center = TkTextTag.new($twind_text,
-                            'justify' =>'center',
-                            'spacing1'=>'5m',
-                            'spacing3'=>'5m'  )
-$tag_buttons = TkTextTag.new($twind_text,
-                             'lmargin1'=>'1c',
-                             'lmargin2'=>'1c',
-                             'rmargin' =>'1c',
-                             'spacing1'=>'3m',
-                             'spacing2'=>0,
-                             'spacing3'=>0 )
-
-# �ƥ����Ȥ�����
-$twind_text.insert('end',
-                  '�ƥ�����widget���¾��widget���Ȥ߹��ळ�Ȥ��Ǥ��ޤ���')
-$twind_text.insert('end',
-                  '�Ȥ߹��ߥ�����ɥ��ȸƤФ졢Ǥ�դ�widget����ǽ�Ǥ���')
-$twind_text.insert('end',
-                  '�㤨�С�������2�ĤΥܥ���widget���Ȥ߹��ޤ�Ƥ��ޤ���')
-$twind_text.insert('end', '�ǽ�Υܥ���򥯥�å����ȿ�ʿ�����Υ����������')
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   #text 'ON'
-                   text '����'
-                   command proc{textWindOn $twind_text,$twind_buttons}
-                   cursor 'top_left_arrow'
-                 })
-$twind_text.insert('end', "�ˤ��ޤ����ޤ�2�Ĥ�Υܥ���򥯥�å������\n")
-$twind_text.insert('end', '��ʿ�����Υ����������')
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   #text 'OFF'
-                   text '����'
-                   command proc{textWindOff $twind_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind_text.insert('end', '�ˤ��ޤ���')
-
-$twind_text.insert('end', '�⤦�ҤȤĤ���Ǥ���')
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   text '�����򥯥�å�'
-                   command proc{textWindPlot $twind_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind_text.insert('end', '����ȡ�x-y�ץ��åȤ������˸���ޤ���')
-$mark_plot = TkTextMark.new($twind_text, 'insert')
-$mark_plot.gravity='left'
-$twind_text.insert('end', '�ޥ����ǥǡ��������褹�뤳�Ȥ��Ǥ��ޤ���')
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   text '�õ�'
-                   command proc{textWindDel $twind_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind_text.insert('end', '�򥯥�å�����ȸ������ޤ���
-
-')
-
-$twind_text.insert('end', '�Ȥ߹��ߥ�����ɥ�������ƥ�����widget��ˡ��ºݤ�')
-$twind_text.insert('end', '�ƥ����ȤϤʤ����Ȥ߹��ळ�Ȥ������Ǥ���')
-$twind_text.insert('end', '���ξ��ϡ��ƥ�����widget�ϥ�����ɥ��ޥ͡������')
-$twind_text.insert('end', '�褦��ư��ޤ����㤨�С������ˤϥƥ�����widget��')
-$twind_text.insert('end', '��äƥܥ��󤬤��줤���¤٤��Ƥ��ޤ���')
-$twind_text.insert('end', '�����Υܥ�����طʿ����Ѥ��뤳�Ȥ��Ǥ��ޤ�')
-$twind_text.insert('end', '("Default"�Ǹ��ο����᤹���Ȥ��Ǥ��ޤ�)��')
-$twind_text.insert('end', '"Short"�Ȥ����ܥ���򥯥�å������ʸ�����Ĺ����')
-$twind_text.insert('end', '�Ѥ��ޤ�������ȼ�ưŪ�˥ƥ�����widget��')
-$twind_text.insert('end', '�쥤�����Ȥ������Ƥ���ޤ���')
-$twind_text.insert('end', '�⤦����Ʊ���ܥ���򲡤��ȸ������ޤ���
-
-')
-
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {|b|
-                   text '�ǥե����'
-                   command proc{embDefBg $twind_text}
-                   cursor 'top_left_arrow'
-                   $tag_buttons.add('end')
-                 },
-                 'padx'=>3 )
-embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkCheckButton.new($twind_text) {
-                   textvariable embToggle
-                   indicatoron 0
-                   variable embToggle
-                   onvalue 'A much longer string'
-                   offvalue 'Short'
-                   cursor 'top_left_arrow'
-                   pady 5
-                   padx 2
-                 },
-                 'padx'=>3,
-                 'pady'=>2 )
-
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
-].each{|twind_color|
-  TkTextWindow.new($twind_text, 'end',
-                   'window'=>TkButton.new($twind_text) {
-                     text twind_color
-                     cursor 'top_left_arrow'
-                     command proc{$twind_text.bg twind_color}
-                   },
-                   'padx'=>3,
-                   'pady'=>2 )
-}
-
-# �᥽�å����
-def textWindOn (w,f)
-  if defined? $twind_scroll
-    begin
-      $twind_scroll.destroy
-    rescue
-    end
-    $twind_scroll = nil
-  end
-
-  base = TkWinfo.parent( TkWinfo.parent(w) )
-  $twind_scroll = TkScrollbar.new(base) {|s|
-    orient 'horizontal'
-    command proc{|*args| w.xview(*args)}
-    w.xscrollcommand proc{|first,last| s.set first,last}
-    w.wrap 'none'
-    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
-  }
-
-  return nil
-end
-
-def textWindOff (w)
-  if defined? $twind_scroll
-    begin
-      $twind_scroll.destroy
-    rescue
-    end
-    $twind_scroll = nil
-  end
-  w.xscrollcommand ''
-  w.wrap 'word'
-end
-
-def textWindPlot (t)
-  if (defined? $twind_plot) && (TkWinfo.exist?($twind_plot))
-    return
-  end
-
-  $twind_plot = TkCanvas.new(t) {
-    relief 'sunken'
-    width  450
-    height 300
-    cursor 'top_left_arrow'
-  }
-
-  if $tk_version =~ /^4.*/
-    font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  else
-    font = 'Helvetica 18'
-  end
-
-  TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
-  TkcLine.new($twind_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind_plot, 225, 20,
-              'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
-
-  (0..10).each {|i|
-    x = 100 + (i * 30)
-    TkcLine.new($twind_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind_plot, x, 254,
-                'text'=>10*i, 'font'=>font, 'anchor'=>'n')
-  }
-  (0..5).each {|i|
-    y = 250 - (i * 40)
-    TkcLine.new($twind_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind_plot, 96, y,
-                'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
-  }
-
-  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-    x = 100 + (3*xx)
-    y = 250 - (4*yy)/5
-    item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6,
-                       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-    item.addtag 'point'
-  end
-
-  $twind_plot.itembind('point', 'Any-Enter',
-                        proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind_plot.itembind('point', 'Any-Leave',
-                        proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind_plot.itembind('point', '1',
-                        proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
-  $twind_plot.itembind('point', 'ButtonRelease-1',
-                        proc{$twind_plot.dtag 'selected'})
-  $twind_plot.bind('B1-Motion',
-                    proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
-  while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
-    $twind_text.delete $mark_plot
-  end
-  $twind_text.insert $mark_plot,"\n"
-  TkTextWindow.new($twind_text, $mark_plot, 'window'=>$twind_plot)
-  $tag_center.add $mark_plot
-  $twind_text.insert $mark_plot,"\n"
-end
-
-$embPlot = {'lastX'=>0, 'lastY'=>0}
-
-def embPlotDown (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $embPlot['lastX'] = x
-  $embPlot['lastY'] = y
-end
-
-def embPlotMove (w, x, y)
-  w.move 'selected', x - $embPlot['lastX'], y - $embPlot['lastY']
-  $embPlot['lastX'] = x
-  $embPlot['lastY'] = y
-end
-
-def textWindDel (w)
-  if (defined? $twind_text) && TkWinfo.exist?($twind_plot)
-    $twind_text.delete $twind_plot
-    $twind_plot = nil
-    while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
-      $twind_text.delete $mark_plot
-    end
-    $twind_text.insert $mark_plot,"  "
-  end
-end
-
-def embDefBg (w)
-  w['background'] = w.configinfo('background')[3]
-end
diff --git a/ext/tk/sample/demos-jp/twind2.rb b/ext/tk/sample/demos-jp/twind2.rb
deleted file mode 100644
index 96000b0e14..0000000000
--- a/ext/tk/sample/demos-jp/twind2.rb
+++ /dev/null
@@ -1,384 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# text (embedded windows) widget demo 2 (called by 'widget')
-#
-
-# toplevel widget ��¸�ߤ���к������
-if defined?($twind2_demo) && $twind2_demo
-  $twind2_demo.destroy
-  $twind2_demo = nil
-end
-
-# demo �Ѥ� toplevel widget ������
-$twind2_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Embedded Windows 2")
-  iconname("Embedded Windows")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($twind2_demo).pack(:fill=>:both, :expand=>true)
-
-# frame ����
-$twind2_buttons = TkFrame.new(base_frame) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
-         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         TkButton.new(frame, :text=>'�����ɻ���',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{showCode 'twind2'}),
-         TkButton.new(frame, :text=>'�Ĥ���',
-                      :image=>$image['delete'], :compound=>:left,
-                      :command=>proc{
-                        tmppath = $twind2_demo
-                        $twind2_demo = nil
-                        $showVarsWin[tmppath.path] = nil
-                        tmppath.destroy
-                      }),
-         :padx=>4, :pady=>4)
-  frame.grid_columnconfigure(0, :weight=>1)
-}
-$twind2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame ����
-$twind2_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
-            'relief'=>'sunken') {|f|
-  $twind2_text = TkText.new(f, 'setgrid'=>true, 'font'=>$font,
-                            # 'width'=>'70', 'height'=>35, 'wrap'=>'word',
-                            'width'=>'70', 'height'=>35, 'wrap'=>'char',
-                            'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
-    TkScrollbar.new(f) {|s|
-      command proc{|*args| t.yview(*args)}
-      t.yscrollcommand proc{|first,last| s.set first,last}
-    }.pack('side'=>'right', 'fill'=>'y')
-  }.pack('expand'=>'yes', 'fill'=>'both')
-}.pack('expand'=>'yes', 'fill'=>'both')
-
-# ��������
-$tag2_center = TkTextTag.new($twind2_text,
-                            'justify' =>'center',
-                            'spacing1'=>'5m',
-                            'spacing3'=>'5m'  )
-$tag2_buttons = TkTextTag.new($twind2_text,
-                             'lmargin1'=>'1c',
-                             'lmargin2'=>'1c',
-                             'rmargin' =>'1c',
-                             'spacing1'=>'3m',
-                             'spacing2'=>0,
-                             'spacing3'=>0 )
-
-# �ƥ����Ȥ�����
-$twind2_text.insert('end', '�ƥ����ȥ��������åȤˤϿ����ʼ���Υ����ƥ�')
-$twind2_text.insert('end', '��ưŪ�ʤ�Τ���Ū�ʤ�Τ�ξ��������ޤ��ˤ�')
-$twind2_text.insert('end', '��¿���ޤ�뤳�Ȥ��Ǥ��ޤ����������������ƥ��')
-$twind2_text.insert('end', '���ؤ������֡����·���ʤɤ��͡�����ˡ��')
-$twind2_text.insert('end', '���֤��뤳�Ȥ��Ǥ��ޤ���')
-$twind2_text.insert('end', '�ä��ơ��ƥ����ȥ��������åȤ�����ʪ��')
-$twind2_text.insert('end', '������ɥ�����������٤��礭��������Ǥ�')
-$twind2_text.insert('end', '���٤Ƥ������˥��ࡼ���˥��������뤵����')
-$twind2_text.insert('end', '��ǧ���뤳�Ȥ���ǽ�Ǥ���')
-$twind2_text.insert('end', "\n\n")
-$twind2_text.insert('end', '�ƥ����ȥ��������åȾ�ˤ�¾�Υ��������åȤ�')
-$twind2_text.insert('end', '�ޤ�뤳�Ȥ�Ǥ��ޤ�������������Τ�')
-$twind2_text.insert('end', '�������ߥ�����ɥ��פȸƤФ졢�������')
-$twind2_text.insert('end', '�����ʤ륦�������åȤǤ�ͤ���ळ�Ȥ��Ǥ��ޤ���')
-$twind2_text.insert('end', '�㤨�С������ˤϣ��Ĥ�')
-$twind2_text.insert('end', '�ܥ��󥦥������åȤ������ޤ�Ƥ��ޤ���')
-$twind2_text.insert('end', '�ǽ�Υܥ���򥯥�å�����ȡ�')
-$twind2_text.insert('end', '��ʿ�����Υ���������� ')
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   #text 'ON'
-                   text '����'
-                   command proc{textWindOn2 $twind2_text,$twind2_buttons}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end', "�ˤ��ޤ����ޤ������Ĥ�Υܥ���򥯥�å������\n")
-$twind2_text.insert('end', '��ʿ�����Υ����������')
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   #text 'OFF'
-                   text '����'
-                   command proc{textWindOff2 $twind2_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end', "�ˤ��ޤ���\n\n")
-
-$twind2_text.insert('end', '���Ϥ⤦�ҤȤĤ���Ǥ���')
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   text '�����򥯥�å�'
-                   command proc{textWindPlot2 $twind2_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end', '����ȡ�x-y�ץ��åȤ������˸���ޤ���')
-$mark2_plot = TkTextMark.new($twind2_text, 'insert')
-$mark2_plot.gravity='left'
-$twind2_text.insert('end', '�ޥ����ǥɥ�å����뤳�Ȥǡ�')
-$twind2_text.insert('end', '�ץ��åȾ�Υǡ��������ư���뤳�Ȥ��Ǥ��ޤ���')
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   text '�õ�'
-                   command proc{textWindDel2 $twind2_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end', '�򥯥�å�����ȸ������ޤ���')
-$twind2_text.insert('end', "\n\n")
-
-$twind2_text.insert('end', 'ɽ������ƥ����Ȥʤ��������ߥ�����ɥ�������')
-$twind2_text.insert('end', '�ƥ����ȥ��������åȤ˴ޤ�뤳�Ȥ�ͭ�ѤǤ��礦��')
-$twind2_text.insert('end', '���ξ�硢�ƥ����ȥ��������åȤ�')
-$twind2_text.insert('end', '������ȥ�ޥ͡�����Τ褦��Ư���ޤ���')
-$twind2_text.insert('end', '�㤨�С������ˤϥƥ����ȥ��������åȤ�')
-$twind2_text.insert('end', '��äƥܥ��󤬤��줤�����󤷤����֤���Ƥ��ޤ���')
-$twind2_text.insert('end', '�����Υܥ���򥯥�å����뤳�Ȥǡ�')
-$twind2_text.insert('end', '���Υƥ����ȥ��������åȤ��طʿ���')
-$twind2_text.insert('end', '�Ѥ��뤳�Ȥ��Ǥ��ޤ�("�ǥե����"�ܥ����')
-$twind2_text.insert('end', '���ο����᤹���Ȥ��Ǥ��ޤ�)��')
-$twind2_text.insert('end', '"Short"�Ȥ����ܥ���򥯥�å������ʸ�����Ĺ����')
-$twind2_text.insert('end', '�Ѥ�ꡢ�ƥ����ȥ��������åȤ���ưŪ��')
-$twind2_text.insert('end', '�쥤�����Ȥ��������ͻҤ򸫤뤳�Ȥ��Ǥ��ޤ���')
-$twind2_text.insert('end', '�⤦����Ʊ���ܥ���򲡤��ȸ������ޤ���')
-$twind2_text.insert('end', "\n")
-
-btn_default = TkButton.new($twind2_text) {|b|
-  text '�ǥե����'
-  command proc{embDefBg2 $twind2_text}
-  cursor 'top_left_arrow'
-}
-TkTextWindow.new($twind2_text, 'end', 'window'=>btn_default, 'padx'=>3)
-embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkCheckButton.new($twind2_text) {
-                   textvariable embToggle
-                   indicatoron 0
-                   variable embToggle
-                   onvalue 'A much longer string'
-                   offvalue 'Short'
-                   cursor 'top_left_arrow'
-                   pady 5
-                   padx 2
-                 },
-                 'padx'=>3,
-                 'pady'=>2 )
-
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
-].each{|twind_color|
-  TkTextWindow.new($twind2_text, 'end',
-                   'window'=>TkButton.new($twind2_text) {
-                     text twind_color
-                     cursor 'top_left_arrow'
-                     command proc{$twind2_text.bg twind_color}
-                   },
-                   'padx'=>3,
-                   'pady'=>2 )
-}
-
-$tag2_buttons.add(btn_default, 'end')
-
-$text_normal2 = {}
-$text_normal2['border'] = $twind2_text.cget('borderwidth')
-$text_normal2['highlight'] = $twind2_text.cget('highlightthickness')
-$text_normal2['pad'] = $twind2_text.cget('padx')
-
-$twind2_text.insert('end', "\nborder width �� highlightthickness, ")
-$twind2_text.insert('end', "padding ���̾���ͤ����ѹ����뤳�Ȥ��ǽ�Ǥ���\n")
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Big borders",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinBigB2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Small borders",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinSmallB2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Big highlight",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinBigH2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Small highlight",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinSmallH2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Big pad",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinBigP2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Small pad",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinSmallP2 $twind2_text
-                                        }))
-
-$twind2_text.insert('end', "\n\n���˥��᡼����ƥ����ȥ��������åȤ�")
-$twind2_text.insert('end', "���ޤ����֤Ǥ��ޤ���")
-
-TkTextImage.new($twind2_text, 'end',
-                'image'=>TkBitmapImage.new(:file=>[
-                                             $demo_dir, '..',
-                                             'images', 'face.xbm'
-                                           ].join(File::Separator)))
-
-# �᥽�å����
-def textWinBigB2(w)
-  w.borderwidth 15
-end
-def textWinSmallB2(w)
-  w.borderwidth $text_normal2['border']
-end
-def textWinBigH2(w)
-  w.highlightthickness 15
-end
-def textWinSmallH2(w)
-  w.highlightthickness $text_normal2['highlight']
-end
-def textWinBigP2(w)
-  w.configure(:padx=>15, :pady=>15)
-end
-def textWinSmallP2(w)
-  w.configure(:padx=>$text_normal2['pad'], :pady=>$text_normal2['pad'])
-end
-
-def textWindOn2 (w,f)
-  if defined? $twind2_scroll
-    begin
-      $twind2_scroll.destroy
-    rescue
-    end
-    $twind2_scroll = nil
-  end
-
-  base = TkWinfo.parent( TkWinfo.parent(w) )
-  $twind2_scroll = TkScrollbar.new(base) {|s|
-    orient 'horizontal'
-    command proc{|*args| w.xview(*args)}
-    w.xscrollcommand proc{|first,last| s.set first,last}
-    w.wrap 'none'
-    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
-  }
-
-  return nil
-end
-
-def textWindOff2 (w)
-  if defined? $twind2_scroll
-    begin
-      $twind2_scroll.destroy
-    rescue
-    end
-    $twind2_scroll = nil
-  end
-  w.xscrollcommand ''
-  #w.wrap 'word'
-  w.wrap 'char'
-end
-
-def textWindPlot2 (t)
-  if (defined? $twind2_plot) && (TkWinfo.exist?($twind2_plot))
-    return
-  end
-
-  $twind2_plot = TkCanvas.new(t) {
-    relief 'sunken'
-    width  450
-    height 300
-    cursor 'top_left_arrow'
-  }
-
-  #font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  font = 'Helvetica 18'
-
-  TkcLine.new($twind2_plot, 100, 250, 400, 250, 'width'=>2)
-  TkcLine.new($twind2_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind2_plot, 225, 20,
-              'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
-
-  (0..10).each {|i|
-    x = 100 + (i * 30)
-    TkcLine.new($twind2_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind2_plot, x, 254,
-                'text'=>10*i, 'font'=>font, 'anchor'=>'n')
-  }
-  (0..5).each {|i|
-    y = 250 - (i * 40)
-    TkcLine.new($twind2_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind2_plot, 96, y,
-                'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
-  }
-
-  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-    x = 100 + (3*xx)
-    y = 250 - (4*yy)/5
-    item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6,
-                       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-    item.addtag 'point'
-  end
-
-  $twind2_plot.itembind('point', 'Any-Enter',
-                        proc{$twind2_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind2_plot.itembind('point', 'Any-Leave',
-                        proc{$twind2_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind2_plot.itembind('point', '1',
-                        proc{|x,y| embPlotDown2 $twind2_plot,x,y}, "%x %y")
-  $twind2_plot.itembind('point', 'ButtonRelease-1',
-                        proc{$twind2_plot.dtag 'selected'})
-  $twind2_plot.bind('B1-Motion',
-                    proc{|x,y| embPlotMove2 $twind2_plot,x,y}, "%x %y")
-  while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
-    $twind2_text.delete $mark2_plot
-  end
-  $twind2_text.insert $mark2_plot,"\n"
-  TkTextWindow.new($twind2_text, $mark2_plot, 'window'=>$twind2_plot)
-  $tag2_center.add $mark2_plot
-  $twind2_text.insert $mark2_plot,"\n"
-end
-
-$embPlot2 = {'lastX'=>0, 'lastY'=>0}
-
-def embPlotDown2 (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $embPlot2['lastX'] = x
-  $embPlot2['lastY'] = y
-end
-
-def embPlotMove2 (w, x, y)
-  w.move 'selected', x - $embPlot2['lastX'], y - $embPlot2['lastY']
-  $embPlot2['lastX'] = x
-  $embPlot2['lastY'] = y
-end
-
-def textWindDel2 (w)
-  if (defined? $twind2_text) && TkWinfo.exist?($twind2_plot)
-    $twind2_text.delete $twind2_plot
-    $twind2_plot = nil
-    while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
-      $twind2_text.delete $mark2_plot
-    end
-    $twind2_text.insert $mark2_plot,"  "
-  end
-end
-
-def embDefBg2 (w)
-  w['background'] = w.configinfo('background')[3]
-end
diff --git a/ext/tk/sample/demos-jp/unicodeout.rb b/ext/tk/sample/demos-jp/unicodeout.rb
deleted file mode 100644
index 4857cd131d..0000000000
--- a/ext/tk/sample/demos-jp/unicodeout.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# -*- coding: euc-jp -*-
-#
-# unicodeout.rb --
-#
-# This demonstration script shows how you can produce output (in label
-# widgets) using many different alphabets.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($unicodeout_demo) && $unicodeout_demo
-  $unicodeout_demo.destroy
-  $unicodeout_demo = nil
-end
-
-$unicodeout_demo = TkToplevel.new {|w|
-  title("Unicode Label Demonstration")
-  iconname("unicodeout")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($unicodeout_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'5.4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-����ϡ�Tk�ˤ���������ʸ��������Ѥ��������Ф��륵�ݡ��ȤˤĤ��Ƥ�\
-����ץ�Ǥ���������������ɽ���ˤ����Ƥ��ʤ����ºݤˤɤΤ褦��ɽ����\
-�ܤˤ��뤫�ϡ����ʤ��δĶ��ˤɤΤ褦��ʸ�����礬���󥹥ȡ��뤵��Ƥ��뤫��\
-�礭����¸���ޤ����ޤ����оݤȤʤ�ʸ�����礬���󥹥ȡ��뤵��Ƥ��ʤ�����\
-�ɤΤ褦��ɽ�����ʤ���뤫�⤢�ʤ��δĶ�����Ǥ���\
-�֥����ɻ��ȡץܥ���򲡤��ƥ�������ɽ������\
-Unicodeout_SampleFrame���饹��@@font�������񤭴�����\
-(�ե���������Ƥ��ѹ�����ޤ���)\
-�ֺƼ¹ԡץܥ���Υ���å����ƤߤƤ���������
-������ץȤ�����������Ĥ褦�ˡ�ʸ�����\\uXXXX�Ȥ���\
-Tcl�Υ���������ɽ�����Ѥ���UNICODEʸ����ǽ񤫤�Ƥ��ޤ���\
-ʸ����ϡ�Tk::UTF8_String�᥽�åɤˤ�äơ�\
-��UTF8������ʸ����Ǥ���פȤ���\
-���󥳡��ɾ����դ���ʸ���󥪥֥�������\
-(Tcl�Υ���������ɽ�����Ѵ��Ѥ�)���Ѵ�����\
-��٥륦�������åȤ��Ϥ��Ƥ����������դ��Ƥ���������
-EOL
-#'
-
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'�Ĥ���', :width=>15, :command=>proc{
-                 $unicodeout_demo.destroy
-                 $unicodeout_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'�����ɻ���', :width=>15, :command=>proc{
-                 showCode 'unicodeout'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-wait_msg = TkLabel.new(base_frame,
-                       :text=>"�ե�����ɤ߹��ߤδ�λ�ޤ�" +
-                              "���Ф餯���Ԥ�������������",
-                       :font=>"Helvetica 12 italic").pack
-
-class Unicodeout_SampleFrame < TkFrame
-  @@font = $font
-  # @@font = 'Helvetica 14'
-  # @@font = 'Courier 12'
-  # @@font = 'clearlyu 16'
-  # @@font = 'fixed 12'
-  # @@font = 'Times 12'
-  # @@font = 'Newspaper 12'
-  # @@font = '{New century schoolbook} 12'
-
-  def initialize(base)
-    super(base)
-    grid_columnconfig(1, :weight=>1)
-  end
-
-  def add_sample(lang, *args)
-    sample_txt = Tk::UTF8_String(args.join(''))
-    l = TkLabel.new(self, :font=>@@font, :text=>lang+':',
-                    :anchor=>:nw, :pady=>0)
-    #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt,
-    s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt,
-                    :anchor=>:nw, :width=>30, :pady=>0)
-    Tk.grid(l, s, :sticky=>:ew, :pady=>0)
-    l.grid_config(:padx, '1m')
-  end
-end
-f = Unicodeout_SampleFrame.new(base_frame)
-f.pack(:expand=>true, :fill=>:both, :padx=>'2m', :pady=>'1m')
-
-# Processing when some characters are missing might take a while, so make
-# sure we're displaying something in the meantime...
-
-oldCursor = $unicodeout_demo.cursor
-$unicodeout_demo.cursor('watch')
-Tk.update
-
-f.add_sample('Arabic',
-             '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94',
-             '\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
-f.add_sample('Trad. Chinese', '\u4E2D\u570B\u7684\u6F22\u5B57')
-f.add_sample('Simpl. Chinese', '\u6C49\u8BED')
-f.add_sample('Greek',
-             '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ',
-             '\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1')
-f.add_sample('Hebrew',
-             '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ',
-             '\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9')
-f.add_sample('Japanese',
-             '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ',
-             '\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA')
-f.add_sample('Korean', '\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00')
-f.add_sample('Russian',
-             '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ',
-             '\u044F\u0437\u044B\u043A')
-
-wait_msg.destroy
-$unicodeout_demo.cursor(oldCursor)
diff --git a/ext/tk/sample/demos-jp/vscale.rb b/ext/tk/sample/demos-jp/vscale.rb
deleted file mode 100644
index a1097fd77f..0000000000
--- a/ext/tk/sample/demos-jp/vscale.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: euc-jp -*-
-require "tkcanvas"
-
-if defined?($vscale_demo) && $vscale_demo
-  $vscale_demo.destroy
-  $vscale_demo = nil
-end
-
-$vscale_demo = TkToplevel.new {|w|
-  title("Vertical Scale Demonstration")
-  iconname("vscale")
-}
-positionWindow($vscale_demo)
-
-base_frame = TkFrame.new($vscale_demo).pack(:fill=>:both, :expand=>true)
-
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '3.5i'
-  justify 'left'
-#  text "���ˤ������1�ĤȾ�ľ�ʥ������뤬ɽ������Ƥ��ޤ���\
-#���������ǥޥ����ܥ���1�򥯥�å����ޤ��ϥɥ�å������\
-#�����Ĺ�����Ѥ��뤳�Ȥ��Ǥ��ޤ���"
-  text "�ˤϥС��Ƚķ��Υ������뤬ɽ������Ƥ��ޤ�����������ǥޥ����Υܥ���1 �򥯥�å����뤫�ɥ�å����ƥС��ι⤵���Ѥ��뤳�Ȥ��Ǥ��ޤ������ä����λ��ץܥ���򲡤��Ƥ���������"
-}
-msg.pack('side'=>'top', 'padx'=>'.5c')
-
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text 'λ��'
-    text '�Ĥ���'
-    command proc {
-      tmppath = $vscale_demo
-      $vscale_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '�����ɻ���'
-    command proc { showCode 'vscale' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-def setHeight(w, height)
-  height = height + 21
-  y2 = height - 30
-  if y2 < 21
-    y2 = 21
-  end
-  w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-  w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-end
-
-TkFrame.new(base_frame) {|frame|
-  borderwidth 10
-  canvas = TkCanvas.new(frame) {|c|
-    width 50
-    height 50
-    bd 0
-    highlightthickness 0
-    TkcPolygon.new(c, 0, 0, 1, 1, 2, 2) {
-      fill 'SeaGreen3'
-      tags 'poly'
-    }
-    TkcLine.new(c, 0, 0, 1, 1, 2, 2, 0, 0) {
-      fill 'black'
-      tags 'line'
-    }
-  }.pack('side'=>'left',  'anchor'=>'nw', 'fill'=>'y')
-  scale = TkScale.new(frame) {
-    orient 'vertical'
-    length 284
-    from 0
-    to 250
-    command proc{|value| setHeight(canvas, value)}
-    tickinterval 50
-  }.pack('side'=>'left', 'anchor'=>'ne')
-  scale.set 75
-}.pack
diff --git a/ext/tk/sample/demos-jp/widget b/ext/tk/sample/demos-jp/widget
deleted file mode 100644
index fc3c084e9a..0000000000
--- a/ext/tk/sample/demos-jp/widget
+++ /dev/null
@@ -1,1122 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: euc-jp -*-
-
-# �������������� ( tk.rb �Υ����ɻ��� encoding ����/����˻Ȥ��� )
-#if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!!!!
-unless defined?(::Encoding.default_external)
-  $KCODE = 'euc'
-else
-  DEFAULT_TK_ENCODING = 'EUC-JP'
-end
-
-# tk �ط��饤�֥����ɤ߹���
-require 'tk'
-# require 'tkafter'
-
-$RubyTk_WidgetDemo = true
-
-# widget demo directory ���֤γ���
-# $demo_dir = File.dirname($0)
-$demo_dir = File.dirname(__FILE__)
-
-# root ������
-$root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
-
-# tk �С������μ���
-$tk_version = Tk::TK_VERSION
-$tk_major_ver, $tk_minor_ver = $tk_version.split('.').map{|n| n.to_i}
-$tk_patchlevel = Tk::TK_PATCHLEVEL
-
-# tcl_platform ����ؤΥ����������֥�������
-$tk_platform = TkVarAccess.new('tcl_platform')
-
-# �ե��������
-#######
-case($tk_version)
-when /^4.*/
-  $font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
-  knjfont = '-*--16-*-jisx0208.1983-0'
-  $kanji_font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
-                           knjfont)
-  TkOption.add('*kanjiFont', knjfont, 'startupFile')
-  $msg_kanji_font=TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
-                             '-*--24-*-jisx0208.1983-0')
-
-#when '8.0'
-#  $font = TkFont.new('Helvetica -12')
-#  $kanji_font = TkFont.new('Helvetica -12', 'Mincho -12')
-#  TkOption.add('*kanjiFont', knjfont, 'startupFile')
-#  $msg_kanji_font=TkFont.new('Helvetica 16', 'Gothic 16 bold')
-
-when /^8.*/
-  $font = TkFont.new('Helvetica -12')
-  $kanji_font = TkFont.new('Helvetica -12', 'Mincho -12')
-  TkOption.add('*kanjiFont', knjfont, 'startupFile')
-  $msg_kanji_font=TkFont.new('Helvetica 14 bold', 'Gothic 14 bold')
-
-else
-  $font = TkFont.new('Helvetica 14', nil)
-  knjfont = '-*--16-*-jisx0208.1983-0'
-  $kanji_font = TkFont.new('Helvetic 14', knjfont)
-  TkOption.add('*kanjiFont', knjfont, 'startupFile')
-  $msg_kanji_font=TkFont.new('Helvetica 14',
-                             '-*--24-*-jisx0208.1983-0')
-end
-#######
-
-# ���᡼������
-$image = {}
-
-if $tk_major_ver >= 8
-$image['refresh'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
-    R0lGODlhEAAQAPMAAMz/zCpnKdb/1z9mPypbKBtLGy9NMPL/9Or+6+P+4j1Y
-    PwQKBP7//xMLFAYBCAEBASH5BAEAAAAALAAAAAAQABAAAwR0EAD3Gn0Vyw0e
-    ++CncU7IIAezMA/nhUqSLJizvSdCEEjy2ZIV46AwDAoDHwPYGSoEiUJAAGJ6
-    EDHBNCFINW5OqABKSFk/B9lUa94IDwIFgewFMwQDQwCZQCztTgM9Sl8SOEMG
-    KSAthiaOjBMPDhQONBiXABEAOw==
-EOD
-end
-
-if $tk_major_ver >= 8
-$image['view'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
-    R0lGODlhEAAQAPMAAMz/zP///8DAwICAgH9/fwAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAwRIcMhJB7h3hM33
-    KFjWdQQYap1QrCaGBmrRrS4nj5b53jOgbwXBKGACoYLDIuAoHCmZyYvR1rT5
-    RMAq8LqcIYGsrjPsW1XOmFUEADs=
-EOD
-end
-
-if $tk_major_ver >= 8
-$image['delete'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
-    R0lGODlhEAAOAKEAAIQAAO/n3v///////yH5BAEKAAIALAAAAAAQAA4AAAIm
-    lI9pAKHbIHNoVhYhTdjlJ2AWKG2g+CldmB6rxo2uybYhbS80eRQAOw==
-EOD
-end
-
-if $tk_major_ver >= 8
-$image['print'] = TkPhotoImage.new(:height=>19, :format=>'GIF', :data=><<EOD)
-    R0lGODlhGgATAPcAACEQOTEpQjEpUkIpc0IxY0I5c0oxjEo5SlJCY1JCe1JK
-    UlpChFpCjFpGkFpSc1paa2NKc2NKnGNja2tapWtjc29KnHNanHNjc3NjrXNr
-    jHNrnHNzc3tjpXtrtXtzhICAgIRzvYSEjIZzqox7tYyEnIyMjJSEtZSEvZSM
-    lJyMtZyMvZyUlJyUrZyUvZycnKWctaWlpa2czq2lzrWtvbWtzrW1tb21xr21
-    1sa9zs693s7OztbO3tbO597W1t7W7+fe7+fn5////+/n7+/v7+/v9////wAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAACH5BAEAAEEALAAAAAAaABMAQAj/AIMIHBhkg0GC
-    CBMGIQEiQgseQT4oeCBBAokgRYYQ0JBixg8hRIiUUEBBYYmTByBwiCBCRYwH
-    CxY8cKFw4AogRXLqLAJkQ80gCBBg3BkxZswTNGh4MGqgQQUMJRHCwMkTSE+D
-    Pn8eCKBhxIMhO3ei2OHDBw6sWSlMMMoWgwwfMDZI8GBjx44NARZwEGGi5MkS
-    PcIWKRGz5YgLbAco+KkQBQoJIRgjdGEVq+SaJajqtNrzMgsPCmoIzqmDgmWE
-    KOBuUKAAwYabYTfs4OHjY0giGyhk4MAWRI4eKyRQqPgggYUXPH4A+XBAgwoK
-    DiIsCFxjA9sFEVQQCRJCAYAFDJxiKhAxvMTonEFimrhhYinTBgWiCvxLNX3M
-    DkkpsKV5OYhjBxCMYAICAigUEAA7
-EOD
-end
-
-# ��˥塼����
-if $tk_major_ver >= 8
-  $root.add_menubar([[['File', 0],
-                        ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                        '---',
-                        ['Quit', proc{exit}, 0, 'Ctrl-Q']
-                      ]])
-else
-  TkMenubar.new($root,
-                [[['File', 0],
-                    ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                    '---',
-                    ['Quit', proc{exit}, 0, 'Ctrl-Q']
-                  ]]).pack('side'=>'top', 'fill'=>'x')
-end
-$root.bind('F1', proc{aboutBox})
-$root.bind('Control-q', proc{exit})
-
-=begin
-TkFrame.new($root){|frame|
-  TkMenubutton.new(frame){|button|
-    m = TkMenu.new(button) {
-      add 'command', 'label'=>'Quit', 'command'=>proc{exit}, 'underline'=>0
-    }
-    menu m
-    text 'File'
-    underline 0
-  }.pack('side'=>'left')
-}.pack('side'=>'top', 'fill'=>'x')
-=end
-
-# �ƥ����ȥܥå���������
-if $tk_version =~ /^4\.[01]/
-  scr = TkScrollbar.new($root, 'orient'=>'vertical')
-  txt = TkText.new($root) {
-    #wrap 'word'
-    wrap 'char'
-    width 70
-    height 30
-    font $font
-    setgrid 'yes'
-    yscrollcommand proc{|first,last| scr.set first,last}
-  }
-  scr.command(proc{|*args| txt.yview(*args)})
-  scr.pack('side'=>'right', 'fill'=>'y')
-  txt.pack('expand'=>'yes', 'fill'=>'both')
-else
-  textFrame = TkFrame.new($root)
-  scr = TkScrollbar.new($root, 'orient'=>'vertical',
-                        'highlightthickness'=>0, 'takefocus'=>1) {
-    pack('in'=>textFrame, 'side'=>'right', 'fill'=>'y', 'padx'=>1)
-  }
-  txt = TkText.new($root) {
-    #wrap 'word'
-    wrap 'char'
-    width 70
-    height 30
-    font $font
-    setgrid 'yes'
-    highlightthickness 0
-    padx 4
-    pady 2
-    takefocus 0
-    bd 1
-    yscrollcommand proc{|first,last| scr.set first,last}
-  }
-  scr.command(proc{|*args| txt.yview(*args)})
-
-#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both', 'padx'=>1)
-#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
-#  textFrame.pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>2)
-  textFrame.pack('expand'=>'yes', 'fill'=>'both')
-  #  $root.withdraw.deiconify
-  Tk.update_idletasks
-  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
-
-  statusBar = TkFrame.new($root) {|f|
-    if $tk_version =~ /^4.*/
-      statusfont = '-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-    else
-      statusfont = 'Helvetica 10'
-    end
-    $statusBarLabel = \
-    TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
-                'font'=>statusfont) \
-    .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
-    TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
-                'font'=>statusfont) \
-    .pack('side'=>'left', 'padx'=>2)
-  }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-end
-
-# �ƥ����ȥ�������
-if $tk_version =~ /^4.*/
-  tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
-else
-  tag_title = TkTextTag.new(txt, 'font'=>'Helvetica 18 bold')
-end
-#tag_kanji_title = TkTextTag.new(txt, 'kanjifont'=>$msg_kanji_font)
-#tag_middle = TkTextTag.new(txt, 'kanjifont'=>$kanji_font)
-tag_kanji_title = TkTextTag.new(txt, 'font'=>$msg_kanji_font)
-tag_middle = TkTextTag.new(txt, 'font'=>$kanji_font)
-tag_demospace = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c')
-
-if TkWinfo.depth($root) == 1
-  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                           'underline'=>1)
-  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                              'underline'=>1)
-  tag_hot = TkTextTag.new(txt, 'background'=>'black', 'foreground'=>'white')
-else
-  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                           'foreground'=>'blue', 'underline'=>1)
-  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                              'foreground'=>'#303080', 'underline'=>1)
-#  tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1,
-#                         'background'=>'SeaGreen3')
-  tag_hot = TkTextTag.new(txt, 'borderwidth'=>1, 'foreground'=>'red')
-end
-
-#tag_demo.bind('Button-1', proc{invoke txt, txt.index('current')})
-tag_demo.bind('ButtonRelease-1',
-              proc{|x,y|invoke txt, txt.index("@#{x},#{y}")}, '%x %y')
-
-lastLine = TkVariable.new("")
-newLine  = TkVariable.new("")
-tag_demo.bind('Enter', proc{|x,y|
-                lastLine.value = txt.index("@#{x},#{y} linestart")
-                tag_hot.add(lastLine.value, "#{lastLine.value} lineend")
-                showStatus txt, txt.index("@#{x},#{y}")
-              },
-              '%x %y')
-tag_demo.bind('Leave',
-              proc{
-                tag_hot.remove('1.0','end')
-                txt.configure('cursor','xterm')
-                $statusBarLabel.configure('text'=>"")
-              })
-tag_demo.bind('Motion', proc{|x, y|
-                newLine.value = txt.index("@#{x},#{y} linestart")
-                if newLine.value != lastLine.value
-                  tag_hot.remove('1.0','end')
-                  lastLine.value = newLine.value
-                  if ( txt.tag_names("@#{x},#{y}").find{|t|
-                        t.kind_of?(String) && t =~ /^demo-/
-                      } )
-                    tag_hot.add(lastLine.value,
-                                "#{lastLine.value} lineend -1 chars")
-                  end
-                end
-                showStatus txt, txt.index("@#{x},#{y}")
-              },
-              '%x %y')
-
-# �ƥ���������
-txt.insert('end', 'Ruby/Tk : Widget', tag_title)
-#txt.insert('end', "  �ǥ�󥹥ȥ졼�����\n", tag_middle)
-txt.insert('end', "  �ǥ�󥹥ȥ졼�����\n", tag_kanji_title)
-txt.insert('end', <<"EOT")
-
-���Υ��ץꥱ�������ϡ�Tk Widget ���Ѥ��ƤɤΤ褦�ʤ��Ȥ��Ǥ��뤫\
-�򼨤�����Ρ������Ĥ��ξ����ʥ�����ץȤ��Ф���ե���ȥ���ɤ���\
-�����Ƥ��ޤ����ʲ��˽��֤˵󤲤��Ƥ���ǥ�󥹥ȥ졼������¹�\
-����ˤϥޥ����ǥ���å����Ƥ����������ǥ�󥹥ȥ졼�����Υ�����\
-�ɥ��������ȡ��ǥ�󥹥ȥ졼�������������� Ruby/Tk �Υ����ɤ�\
-�뤿��ˡ�"�����ɻ���"�ܥ���򥯥�å����뤳�Ȥ��Ǥ��ޤ������ʤ���\
-˾��ʤ顢���Υ����ɤ������뤳�Ȥ��Ǥ��ޤ����������������ɤǥǥ�\
-�󥹥ȥ졼������Ƽ¹Ԥ��뤿��ˤϡ������ɤ��񤫤줿������ɥ���\
-����"�ǥ�Ƽ¹�" �ܥ���򥯥�å����Ƥ���������\
-�����ɤ������Ƥ⥪�ꥸ�ʥ�Υե����뤬�񤭴������뤳�Ȥ�\
-����ޤ��󤫤顢���ۤ����˿������ѹ����ƤߤƤ���������
-
-�����Υǥ�Ǥϡ����Ū�Ƕ�ΥС������� Tk �Ǥʤ���Х��ݡ��Ȥ���\
-���ʤ���ǽ��ȤäƼ������Ƥ��ޤ�(�㤨�� Tk8.4 �ʾ�ʤ�)�����Τ��ᡢ\
-����������ǽ������ʤ� Tk �饤�֥���ȤäƤ�����ˤϡ���������\
-�ǥ��������ư���ޤ��󡣤��Τ褦�ʵ�ǽ��ɬ�פǤ���С�����򥵥ݡ���\
-���Ƥ��� Tk �饤�֥���Ȥ��褦�� tcltklib �򥳥�ѥ��뤷�ʤ�����\
-����������
-
-�⤷���ʤ��� Tk �� (�ǽ餫��ޤफ���󥹥ȡ��뤷�����ˤ��) \
-Ttk (Tile) ��ĥ�����ѤǤ�����֤Ǥ���ʤ顢\
-Ttk ��ĥ�Υǥ� (sample/tkextlib/tile/demo.rb) �⤼�һ�ƤߤƤ���������
-( ¿ʬ�����ߤΤ��ʤ��δĶ��ˤ� Ttk ��ĥ��\
-#{
-begin
-  require 'tkextlib/tile'
-  "���Ǥ�Ƴ������Ƥ��ޤ�"
-rescue
-  "�ޤ����󥹥ȡ��뤵��Ƥ��ޤ���"
-end
-}\
-��)
-Ttk ��ĥ�ϡ�Tk8.5 �ʾ�Ǥ�ɸ��ε�ǽ�Ȥ����Ȥ߹��ޤ�Ƥ��ޤ���
-
-
-EOT
-
-#txt.insert('end',"��٥�, �ܥ���, �����å��ܥ���, �饸���ܥ���\n",tag_middle)
-txt.insert('end', "��٥�, �ܥ���, �����å��ܥ���, �饸���ܥ���\n",
-           tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��٥� (�ƥ�����, �ӥåȥޥå�)\n",
-           tag_demo, "demo-label")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ��٥��UNICODE�ƥ����� (��ǽ���б������С�������Tk��ɬ��)\n", tag_demo, "demo-unicodeout")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �ܥ��� \n", tag_demo, "demo-button")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. �����å��ܥ��� (ʣ���������ǽ)\n",
-           tag_demo, "demo-check")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. �����֥����å��ܥ��� (��ǽ���б������С�������Tk��ɬ��)\n",
-           tag_demo, "demo-check2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. �饸���ܥ��� (Ǥ�դΰ�Ĥ������ǽ)\n",
-           tag_demo, "demo-radio")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. �饸���ܥ��� (��ǽ���б������С�������Tk��ɬ��)\n",
-           tag_demo, "demo-radio2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. �����֥饸���ܥ��� (��ǽ���б������С�������Tk��ɬ��)\n",
-           tag_demo, "demo-radio3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. �ܥ���Ǻ��줿15-�ѥ��륲����\n",
-           tag_demo, "demo-puzzle")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "10. �ӥåȥޥåפ���Ѥ�����������ܥ���\n",
-           tag_demo, "demo-icon")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "11. ������ɽ��������ĤΥ�٥�\n",
-           tag_demo, "demo-image1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "12. �����򸫤뤿��δ�ñ�ʥ桼�����󥿡��ե�����\n",
-           tag_demo, "demo-image2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "13. �����򸫤뤿��δ�ñ�ʥ桼�����󥿡��ե����� (��ǽ���б������С�������Tk��ɬ��)\n",
-           tag_demo, "demo-image3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "14. ��٥��դ��ե졼�� (��ǽ���б������С�������Tk��ɬ��)\n",
-           tag_demo, "demo-labelframe")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "15. �ơ��ޤ��б��������������åȤδ�ñ���� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n",
-           tag_demo, "demo-ttkbut")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "�ꥹ�ȥܥå���\n", tag_middle)
-txt.insert('end', "�ꥹ�ȥܥå���\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��ƻ�ܸ�.\n", tag_demo, "demo-states")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ��: ���ץꥱ�������Τ�����ۿ����Ѥ���\n",
-           "#{tag_demo.id} demo-colors")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �ʸ���\n", tag_demo, "demo-sayings")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ��ˤĤ��ƤΥޥ�������ꥹ�� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n",
-           tag_demo, "demo-mclist")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. �ǥ��쥯�ȥ�֥饦�� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n",
-           tag_demo, "demo-tree")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "����ȥ�ȥ��ԥ�ܥå���\n", tag_middle)
-txt.insert('end', "����ȥ�\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ����������С��ʤ�\n", tag_demo, "demo-entry1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ����������С�����\n", tag_demo, "demo-entry2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ǧ�ڽ����դ��Υ���ȥ�ܥå����ȥѥ���ɥե������ (��ǽ���б������С�������Tk��ɬ��)\n",
-           tag_demo, "demo-entry3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ���ԥ�ܥå��� (��ǽ���б������С�������Tk��ɬ��)\n",
-           tag_demo, "demo-spin")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ����ܥܥå��� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n",
-           tag_demo, "demo-combo")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. ��ñ�ʥե�����\n", tag_demo, "demo-form")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "�ƥ�����\n", tag_middle)
-txt.insert('end', "�ƥ�����\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ����Ū�ʥƥ�����\n", tag_demo, "demo-text")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ɽ����������.\n", tag_demo, "demo-style")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �ϥ��ѡ��ƥ�����(�����Х����).\n",
-           tag_demo, "demo-bind")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ������ɥ�����������ƥ�����\n",
-           tag_demo, "demo-twind")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ������ɥ�����������ƥ����� (��ǽ���б������С�������Tk��ɬ��)\n",
-           tag_demo, "demo-twind2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. ����\n", tag_demo, "demo-search")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. �ƥ����ȥ��������åȤ�������(peering) (��ǽ���б������С�������Tk��ɬ��)\n", tag_demo, "demo-textpeer")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "�����Х�\n", tag_middle)
-txt.insert('end', "�����Х�\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. �����ƥ�η�\n", tag_demo, "demo-items")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 2 �����Υץ��å�\n", tag_demo, "demo-plot")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �ƥ�����\n", tag_demo, "demo-ctext")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ����η�\n", tag_demo, "demo-arrow")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. �롼�顼\n", tag_demo, "demo-ruler")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. �ե����ץ��\n", tag_demo, "demo-floor")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. �ե����ץ�� (�ۤʤ륭���Х������ƥ������ˡ�����)\n", tag_demo, "demo-floor2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. �����������ǽ�ʥ����Х�\n",
-           tag_demo, "demo-cscroll")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. �������ܡ��ɾ�ε��Τν�� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n",
-           tag_demo, "demo-knightstour")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "��������ȥץ����쥹�С�\n", tag_middle)
-txt.insert('end', "��������ȥץ����쥹�С�\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��ľ��������\n", tag_demo.id, "demo-vscale")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ��ʿ��������\n", tag_demo.id, "demo-hscale")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �ץ����쥹�С� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n", tag_demo.id, "demo-ttkprogress")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "�ڥ���ɥ�����ɥ��ȥΡ��ȥ֥å�\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��ʿ���� (��ǽ���б������С�������Tk��ɬ��)\n",
-           tag_demo.id, "demo-paned1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ��ľ���� (��ǽ���б������С�������Tk��ɬ��)\n",
-           tag_demo.id, "demo-paned2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �ơ��ޤ��б����������ߥڥ��� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n",
-           tag_demo.id, "demo-ttkpane")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. �Ρ��ȥ֥å����������å� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n",
-           tag_demo.id, "demo-ttknote")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "��˥塼�ȥġ���С�\n", tag_middle)
-txt.insert('end', "��˥塼�ȥġ���С�\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��˥塼�ȥ��������ɤ�ޤ��������ɥ�\n",
-           tag_demo, "demo-menu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ��˥塼�ȥ��������ɤ�ޤ��������ɥ� (Tk8.x ����)\n",
-           tag_demo, "demo-menu8x")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3.                 ��                (��ǽ���б������С�������Tk��ɬ��)\n",
-           tag_demo, "demo-menu84")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ��˥塼�ܥ��� (Tk8.x ����)\n",
-           tag_demo, "demo-menubu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. �ơ��ޤ��б�������˥塼�ܥ��� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n",
-           tag_demo.id, "demo-ttkmenu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. �ơ��ޤ��б������ġ���С� (Tile/Ttk��ĥ�ؤ��б���ɬ��)\n",
-           tag_demo.id, "demo-toolbar")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "����������������ɥ�\n", tag_middle)
-txt.insert('end', "����������������ɥ�\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ��å������ܥå���\n", tag_demo, "demo-msgbox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. �ܺ٥ƥ������դ��Υ�å������ܥå��� (��ǽ���б������С�������Tk��ɬ��)\n", tag_demo, "demo-msgbox2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �ե������������������\n", tag_demo, "demo-filebox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ���������������\n", tag_demo, "demo-clrpick")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "���˥᡼�����\n", tag_middle)
-txt.insert('end', "���˥᡼�����\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ���˥᡼������٥� (��ǽ���б������С�������Tk��ɬ��)\n", tag_demo, "demo-anilabel")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. �ȷ��Υ��˥᡼����� (��ǽ���б������С�������Tk��ɬ��)\n", tag_demo, "demo-aniwave")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ����ҤΥ��ߥ�졼����� (��ǽ���б������С�������Tk��ɬ��)\n", tag_demo, "demo-pendulum")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. A celebration of Rube Goldberg (��ǽ���б������С�������Tk��ɬ��)\n", tag_demo, "demo-goldberg")
-
-txt.insert('end', "\n")
-#txt.insert('end', "����¾\n", tag_middle)
-txt.insert('end', "����¾\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. �Ȥ߹��ߤΥӥåȥޥå�\n", tag_demo, "demo-bitmap")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. �⡼�������������(�������륰���)\n",
-           tag_demo, "demo-dialog1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. �⡼�������������(�������Х륰���)\n",
-           tag_demo, "demo-dialog2")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.state('disabled')
-scr.focus
-
-################################
-# method ���
-################################
-def positionWindow(w)
-  w.geometry('+300+300')
-end
-
-# �ƥ��������åȤȡ��ѿ�̾�� TkVariable �Ȥ���(����)���¤Ӥ��Ϥ�
-$showVarsWin = {}
-def showVars1(parent, *args)
-  if $showVarsWin[parent.path]
-    begin
-      $showVarsWin[parent.path].destroy
-    rescue
-    end
-  end
-  top = TkToplevel.new(parent) {|w|
-    title "Variable values"
-    base = TkFrame.new(w).pack(:fill=>:both, :expand=>true)
-    TkLabel.new(base) {
-      text "�ѿ���:"
-      width 20
-      anchor 'center'
-      if $tk_version =~ /^4.*/
-        font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
-      else
-        font 'Helvetica 14'
-      end
-    }.pack('side'=>'top', 'fill'=>'x')
-    len = 1
-    args.each{|vnam,vbody|
-      len = vnam.to_s.length if vnam.to_s.length > len
-    }
-    args.each{|vnam,vbody|
-      TkFrame.new(base){|f|
-        #TkLabel.new(f, 'text'=>"#{vnam}: ").pack('side'=>'left')
-        TkLabel.new(f, 'text'=>"#{vnam}: ",'width'=>len+2).pack('side'=>'left')
-        TkLabel.new(f, 'textvariable'=>vbody, 'anchor'=>'w')\
-                   .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
-      }.pack('side'=>'top', 'anchor'=>'w', 'fill'=>'x')
-    }
-    TkButton.new(base) {
-      text "λ��"
-      command proc{w.destroy}
-    }.pack('side'=>'bottom', 'pady'=>2)
-  }
-  $showVarsWin[parent.path] = top
-end
-
-def showVars2(parent, *args)
-  if $showVarsWin[parent.path]
-    begin
-      $showVarsWin[parent.path].destroy
-    rescue
-    end
-  end
-  $showVarsWin[parent.path] = TkToplevel.new(parent) {|top|
-    title "Variable values"
-
-    base = TkFrame.new(top).pack(:fill=>:both, :expand=>true)
-
-    TkLabelFrame.new(base, :text=>"�ѿ���:",
-                     :font=>{:family=>'Helvetica', :size=>14}){|f|
-      args.each{|vnam,vbody|
-        TkGrid(TkLabel.new(f, :text=>"#{vnam}: ", :anchor=>'w'),
-               TkLabel.new(f, :textvariable=>vbody, :anchor=>'w'),
-               :padx=>2, :pady=>2, :sticky=>'w')
-      }
-
-      f.grid(:sticky=>'news', :padx=>4)
-      f.grid_columnconfig(1, :weight=>1)
-      f.grid_rowconfig(100, :weight=>1)
-    }
-    TkButton.new(base, :text=>"λ��", :width=>8, :default=>:active,
-                 :command=>proc{top.destroy}){|b|
-      top.bind('Return', proc{b.invoke})
-      top.bind('Escape', proc{b.invoke})
-
-      b.grid(:sticky=>'e', :padx=>4, :pady=>[6, 4])
-    }
-    base.grid_columnconfig(0, :weight=>1)
-    base.grid_rowconfig(0, :weight=>1)
-  }
-end
-
-if $tk_major_ver < 8
-  alias showVars showVars1
-elsif $tk_major_ver == 8 && $tk_minor_ver < 4
-  alias showVars showVars1
-else # ver >= 8.4
-  alias showVars showVars2
-end
-
-# �����ȥåץ�٥륵�ݡ���
-module 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__ method_missing
-  private :__method_missing__
-
-  def method_missing(id, *args)
-    begin
-      has_top = (top = Thread.current[: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__(id, *args)
-    end
-  end
-end
-
-class Proc
-  def initialize(*args, &b)
-    super
-    @__pseudo_toplevel__ = Thread.current[:TOPLEVEL]
-  end
-
-  alias __call__ call
-  def call(*args, &b)
-    if top = @__pseudo_toplevel__
-      orig_top = Thread.current[:TOPLEVEL]
-      Thread.current[:TOPLEVEL] = top
-      begin
-        __call__(*args, &b)
-      ensure
-        Thread.current[:TOPLEVEL] = orig_top
-      end
-    else
-      __call__(*args, &b)
-    end
-  end
-end
-
-def proc(&b)
-  Proc.new(&b)
-end
-def lambda(&b)
-  Proc.new(&b)
-end
-
-def _null_binding
-  Module.new.instance_eval{extend PseudoToplevel_Evaluable}
-  # binding
-  # Module.new.instance_eval{binding}
-end
-private :_null_binding
-
-def eval_samplecode(code, file=nil)
-  #eval(code)
-  #_null_binding.pseudo_toplevel_eval{ eval(code) }
-  #Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }
-  Thread.new{
-    _null_binding.pseudo_toplevel_eval{
-      begin
-        if file
-          eval(code, binding, "(eval:#{file})")
-        else
-          eval(code)
-        end
-      rescue Exception=>e
-        #p e
-        TkBgError.show(e.message + "\n" +
-                         "\n---< backtrace of Ruby side >-----\n" +
-                         e.backtrace.join("\n") +
-                         "\n---< backtrace of Tk side >-------")
-      end
-    }
-  }
-  Tk.update
-end
-
-# �ƥ����Ⱦ�Ǥ� click ���Ф���ư��
-def invoke(txt, idx)
-  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  return unless tag
-
-  cursor = txt.cget('cursor')
-  txt.cursor('watch')
-  Tk.update
-  # eval(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, _null_binding)
-  # Tk.update
-  eval_samplecode(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, tag[5..-1] + '.rb')
-  txt.cursor(cursor)
-
-  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
-end
-=begin
-def invoke (txt, idx)
-  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  return unless tag
-  current_cursor = txt.cget('cursor')
-  txt.cursor('watch')
-  Tk.update
-#  eval `cat #{tag[5..-1]}.rb`
-#  eval `cat #{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb`
-  eval IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join
-  Tk.update
-#  txt.cursor('xterm')
-  txt.cursor(current_cursor)
-
-  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
-end
-=end
-
-# ����ɽ��
-def showStatus (txt, index)
-  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  cursor = txt.cget('cursor')
-  unless tag
-    $statusBarLabel.configure('text', " ")
-    newcursor = 'xterm'
-  else
-    demoname = tag[5..-1]
-    $statusBarLabel.configure('text',
-                             "����ץ�ץ������ \"#{demoname}\" �μ¹� ")
-    newcursor = 'hand2'
-  end
-  txt.configure('cursor'=>newcursor) if cursor != newcursor
-end
-
-# �����������ɤ�ɽ��
-def showCode1(demo)
-  file = "#{demo}.rb"
-  $code_window = nil unless defined? $code_window
-  if $code_window == nil || TkWinfo.exist?($code_window) == false
-    $code_window = TkToplevel.new(nil)
-    f = TkFrame.new($code_window)
-
-    TkButton.new(f) {
-      #text "λ��"
-      text "�Ĥ���"
-      command proc{
-        $code_window.destroy
-        $code_window = nil
-      }
-    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
-    TkButton.new(f) {
-      text "�Ƽ¹�"
-      # command proc{eval($code_text.get('1.0','end'), _null_binding)}
-      command proc{eval_samplecode($code_text.get('1.0','end'), '<viewer>')}
-    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
-
-    TkLabel.new(f,'text'=>'line:').pack('side'=>'left')
-    linenum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
-    TkLabel.new(f,'text'=>'  pos:').pack('side'=>'left')
-    posnum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
-
-    $set_linenum = proc{|w|
-      line, pos = w.index('insert').split('.')
-      linenum.text = line
-      posnum.text  = pos
-    }
-
-    f.pack('side'=>'bottom', 'expand'=>'true', 'fill'=>'x')
-
-    if $tk_version =~ /^4\.[01]/
-      s = TkScrollbar.new($code_window, 'orient'=>'vertical')
-      $code_text = TkText.new($code_window) {
-        height 40
-        setgrid 'yes'
-        yscrollcommand proc{|first,last| s.set first,last}
-      }
-      s.command(proc{|*args| $code_text.yview(*args)})
-      s.pack('side'=>'right', 'fill'=>'y')
-      $code_text.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
-    else
-      TkFrame.new($code_window) {|f|
-        pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-        hs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
-                             'orient'=>'horizontal')
-        vs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
-                             'orient'=>'vertical')
-        $code_text = TkText.new($code_window) {|t|
-          height 40
-          #wrap 'word'
-          wrap 'char'
-          xscrollcommand proc{|first,last| hs.set first,last}
-          yscrollcommand proc{|first,last| vs.set first,last}
-          setgrid 'yes'
-          highlightthickness 0
-          pady 2
-          padx 3
-          hs.command(proc{|*args| $code_text.xview(*args)})
-          vs.command(proc{|*args| $code_text.yview(*args)})
-        }
-
-        $code_text.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-                        'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-        vs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-                'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-#       xs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-#               'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-        TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-        TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-      }
-    end
-
-    btag = TkBindTag.new
-
-    btag.bind('Key', $set_linenum, '%W')
-    btag.bind('Button', $set_linenum, '%W')
-
-    btags = $code_text.bindtags
-    btags.insert(btags.index($code_text.class) + 1, btag)
-    $code_text.bindtags = btags
-
-  else
-    $code_window.deiconify
-    $code_window.raise
-  end
-
-  $code_window.title("Demo code: #{file}")
-  $code_window.iconname(file)
-  code = open([$demo_dir, file].join(File::Separator), 'r'){|fid| fid.read }
-  $code_text.delete('1.0', 'end')
-  code.force_encoding('EUC-JP') if defined?(::Encoding.default_external)
-  $code_text.insert('1.0', code)
-  TkTextMarkInsert.new($code_text,'1.0')
-  $set_linenum.call($code_text)
-end
-
-def showCode2(demo)
-  file = "#{demo}.rb"
-  $code_window = nil unless defined? $code_window
-  if $code_window == nil || TkWinfo.exist?($code_window) == false
-    $code_window = TkToplevel.new(nil)
-    tf = TkFrame.new($code_window)
-    $code_text = TkText.new(tf, :font=>'Courier 10', :height=>30,
-                           :wrap=>'word', :bd=>1, :setgrid=>true,
-                           :highlightthickness=>0, :pady=>2, :padx=>3)
-    xscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
-    yscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
-    TkGrid($code_text, yscr, :sticky=>'news')
-    #TkGrid(xscr)
-    tf.grid_rowconfigure(0, :weight=>1)
-    tf.grid_columnconfigure(0, :weight=>1)
-
-    bf = TkFrame.new($code_window)
-
-    lf = TkFrame.new(bf)
-    TkLabel.new(lf, :text=>'line:').pack(:side=>:left)
-    linenum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
-    TkLabel.new(lf, :text=>'  pos:').pack(:side=>:left)
-    posnum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
-
-    $set_linenum = proc{|w|
-      line, pos = w.index('insert').split('.')
-      linenum.text = line
-      posnum.text  = pos
-    }
-
-    #b_dis = TkButton.new(bf, :text=>'λ��', :default=>:active,
-    b_dis = TkButton.new(bf, :text=>'�Ĥ���', :default=>:active,
-                         :command=>proc{
-                           $code_window.destroy
-                           $code_window = nil
-                         },
-                         :image=>$image['delete'], :compound=>:left)
-    b_prn = TkButton.new(bf, :text=>'����',
-                         :command=>proc{printCode($code_text, file)},
-                         :image=>$image['print'], :compound=>:left)
-    b_run = TkButton.new(bf, :text=>'�Ƽ¹�',
-                         :command=>proc{
-                           # eval($code_text.get('1.0','end'), _null_binding)
-                           eval_samplecode($code_text.get('1.0','end'), '<viewer>')
-                         },
-                         :image=>$image['refresh'], :compound=>:left)
-
-    TkGrid(lf, 'x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
-    bf.grid_columnconfigure(1, :weight=>1)
-
-    TkGrid(tf, :sticky=>'news')
-    TkGrid(bf, :sticky=>'ew')
-    $code_window.grid_columnconfigure(0, :weight=>1)
-    $code_window.grid_rowconfigure(0, :weight=>1)
-
-    $code_window.bind('Return', proc{|win|
-                        b_dis.invoke unless win.kind_of?(TkText)
-                      }, '%W')
-    $code_window.bindinfo('Return').each{|cmd, arg|
-      $code_window.bind_append('Escape', cmd, arg)
-    }
-
-    btag = TkBindTag.new
-
-    btag.bind('Key', $set_linenum, '%W')
-    btag.bind('Button', $set_linenum, '%W')
-
-    btags = $code_text.bindtags
-    btags.insert(btags.index($code_text.class) + 1, btag)
-    $code_text.bindtags = btags
-
-  else
-    $code_window.deiconify
-    $code_window.raise
-  end
-
-  $code_window.title("Demo code: #{file}")
-  $code_window.iconname(file)
-  code = open([$demo_dir, file].join(File::Separator), 'r'){|fid| fid.read }
-  $code_text.delete('1.0', 'end')
-  code.force_encoding('EUC-JP') if defined?(::Encoding.default_external)
-  $code_text.insert('1.0', code)
-  TkTextMarkInsert.new($code_text,'1.0')
-  $set_linenum.call($code_text)
-end
-
-if $tk_major_ver < 8
-  alias showCode showCode1
-elsif $tk_major_ver == 8 && $tk_minor_ver < 4
-  alias showCode showCode1
-else # ver >= 8.4
-  alias showCode showCode2
-end
-
-
-# printCode --
-# Prints the source code currently displayed in the See Code dialog.
-# Much thanks to Arjen Markus for this.
-#
-# Arguments:
-# txt -         Name of text widget containing code to print
-# file -        Name of the original file (implicitly for title)
-
-def printCode(txt, file)
-  code = txt.get('1.0', 'end - 1c')
-  dir = '.'
-  dir = ENV['HOME'] if ENV['HOME']
-  dir = ENV['TMP'] if ENV['TMP']
-  dir = ENV['TEMP'] if ENV['TEMP']
-
-  fname = [dir, 'tkdemo-' + file].join(File::Separator)
-  open(fname, 'w'){|fid| fid.print(code)}
-  begin
-    case Tk::TCL_PLATFORM('platform')
-    when 'unix'
-      msg = `lp -c #{fname}`
-      unless $?.exitstatus == 0
-        Tk.messageBox(:title=>'Print spooling failure',
-                      :message=>'���顼��ȯ�����ޤ�����' +
-                                '�����˼��Ԥ�����ΤȻפ��ޤ� : ' + msg)
-      end
-    when 'windows'
-      begin
-        printTextWin32(fname)
-      rescue => e
-        Tk.messageBox(:title=>'Print spooling failure',
-                      :message=>'���顼��ȯ�����ޤ�����' +
-                                '�����˼��Ԥ�����ΤȻפ��ޤ� : ' +
-                                e.message)
-      end
-    when 'macintosh'
-      Tk.messageBox(:title=>'Operation not Implemented',
-                    :message=>'������ǽ�Ϥޤ���������Ƥ��ޤ���')
-    else
-      Tk.messageBox(:title=>'Operation not Implemented',
-                    :message=>'���Ф��줿�Ķ� ' +
-                              Tk::TCL_PLATFORM('platform') +
-                              ' ��̤�ΤδĶ��Ǥ��뤿�ᡤ' +
-                              '������ǽ�ϼ�������Ƥ��ޤ���: ')
-    end
-  ensure
-    File.delete(fname)
-  end
-end
-
-# printTextWin32 --
-#    Print a file under Windows
-#
-# Arguments:
-# filename -            Name of the file
-#
-def printTextWin32(fname)
-  require 'win32/registry'
-  begin
-    app = Win32::Registry::HKEY_CLASSES_ROOT['.txt']
-    pcmd = nil
-    Win32::Registry::HKEY_CLASSES_ROOT.open("#{app}\\shell\\print"){|reg|
-      pcmd = reg['command']
-    }
-  rescue
-    app = Tk.tk_call('auto_execok', 'notepad.exe')
-    pcmd = "#{app} /p %1"
-  end
-
-  pcmd.gsub!('%1', fname)
-  puts pcmd
-  cmd = Tk.tk_call('auto_execok', 'start') + ' /min ' + pcmd
-
-  msg = `#{cmd}`
-  unless $?.exitstatus == 0
-    fail RuntimeError, msg
-  end
-end
-
-# aboutBox
-#
-#      Pops up a message box with an "about" message
-#
-def aboutBox
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo',
-                'message'=>"Ruby/Tk ���������åȥǥ� Ver.1.7.1-jp\n\n" +
-                           "based on demos of Tk8.1 -- 8.5  " +
-                           "( Copyright of Tcl/Tk demos:: " +
-                           "(c) 1996-1997 Sun Microsystems, Inc. / " +
-                           "(c) 1997-2000 Ajuba Solutions, Inc. / " +
-                           "(c) 2001-2007 Donal K. Fellows / " +
-                           "(c) 2002-2007 Daniel A. Steffen )\n\n" +
-                           "Your Ruby & Tk Version ::\n" +
-                           "Ruby#{RUBY_VERSION}(#{RUBY_RELEASE_DATE})[#{RUBY_PLATFORM}] / Tk#{$tk_patchlevel}#{(Tk::JAPANIZED_TK)? '-jp': ''}\n\n" +
-                           "Ruby/Tk release date :: tcltklib #{TclTkLib::RELEASE_DATE}; tk #{Tk::RELEASE_DATE}")
-end
-
-####################################
-# �����ǻ��ꤵ�줿�ǥ��ư����
-no_launcher = false
-if ARGV[0] == '-n'
-  ARGV.shift
-  no_launcher = true if ARGV.size > 0
-else
-  # show the root widget to make it lower then demo windows
-  Tk.update
-end
-ARGV.each{|cmd|
-  if cmd =~ /(.*).rb/
-    cmd = $1
-  end
-  #eval(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join,
-  #     _null_binding)
-  eval_samplecode(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join, cmd + '.rb')
-}
-if no_launcher
-  $root.withdraw  # hide root window
-  Thread.start{
-    loop do
-      count = 0
-      $root.winfo_children.each{|w|
-        count += 1 if w.kind_of?(TkToplevel)
-      }
-      $root.destroy if count == 0
-    end
-  }
-end
-
-################################
-# ���٥���Ԥ�������
-Tk.mainloop
diff --git a/ext/tk/sample/editable_listbox.rb b/ext/tk/sample/editable_listbox.rb
deleted file mode 100644
index 890aec032e..0000000000
--- a/ext/tk/sample/editable_listbox.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-#
-# Tk::RbWidget::Editable_Listbox class
-#
-#   When "DoubleClick-1" on a listbox item, the entry box is opend on the
-#   item. And when hit "Return" key on the entry box after modifying the
-#   text, the entry box is closed and the item is changed. Or when hit
-#   "Escape" key, the entry box is closed without modification.
-#
-#                              by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-module Tk
-  module RbWidget
-    class Editable_Listbox < TkListbox
-    end
-  end
-end
-
-
-class Tk::RbWidget::Editable_Listbox < TkListbox
-  #------------------------------------
-  BindTag = TkBindTag.new_by_name(self.to_s.gsub(/::/, '#'))
-
-  BindTag.bind('FocusIn', :widget){|w|
-    w.instance_eval{
-      if idx = @ebox.pos
-        see(idx) if bbox(idx).empty?
-        @ebox.focus(true)
-      end
-    }
-  }
-
-  BindTag.bind('Double-1', :widget, :y){|w, y|
-    w.instance_eval{ _ebox_placer(nearest(y)) }
-  }
-
-  BindTag.bind('Return', :widget){|w|
-    w.instance_eval{
-      if idx = index(:active)
-        _ebox_placer(idx)
-      end
-    }
-  }
-  #------------------------------------
-
-  def configure(*args)
-    ret = super
-
-    case cget(:state)
-    when 'normal'
-      # do nothing
-    when 'disabled'
-      _ebox_erase
-    else # unknown
-      # do nothing
-
-    end
-
-    ret
-  end
-
-  def _ebox_move(idx)
-    return nil if cget(:state) == 'disabled'
-    x, y, w, h = bbox(idx)
-    return nil unless y && h
-    @ebox.place(:x => 0, :relwidth => 1.0,
-                :y => y - selectborderwidth,
-                :height => h + 2 * selectborderwidth)
-    @ebox.pos = idx
-    @ebox.focus
-  end
-
-  def _ebox_placer(idx)
-    return nil unless _ebox_move(idx)
-    @ebox.value = listvariable.list[idx]
-    @ebox.xview_moveto(self.xview[0])
-  end
-
-  def _ebox_erase
-    @ebox.place_forget
-    @ebox.pos = nil
-  end
-  private :_ebox_move, :_ebox_placer, :_ebox_erase
-
-  def _setup_ebox_bindings
-    # bindings for entry
-    @ebox.bind('Return'){
-      list = listvariable.list
-      list[@ebox.pos] = @ebox.value if @ebox.pos
-      listvariable.value = list
-      _ebox_erase
-      focus
-    }
-
-    @ebox.bind('Escape'){ _ebox_erase }
-  end
-  def _setup_listbox_bindings
-    # bindings for listbox
-    tags = bindtags
-    bindtags(tags.insert(tags.index(self) + 1, self.class::BindTag))
-  end
-  private :_setup_ebox_bindings,  :_setup_listbox_bindings
-
-  def yview(*args)
-    if !@ebox.pos || bbox(@ebox.pos).empty?
-      @ebox.place_forget
-    else
-      _ebox_move(@ebox.pos)
-    end
-    super
-  end
-
-  def create_self(keys)
-    super(keys)
-
-    unless self.listvariable
-      self.listvariable = TkVariable.new(self.get(0, :end))
-    end
-
-    @ebox = TkEntry.new(self){
-      @pos = nil
-      def self.pos; @pos; end
-      def self.pos=(idx); @pos = idx; end
-    }
-
-    _setup_ebox_bindings
-    _setup_listbox_bindings
-  end
-end
-
-if $0 == __FILE__
-  #lbox0 = TkListbox.new.pack(:side=>:left)
-  #lbox0.insert(:end,     0,1,2,3,4,5,6,7,8,9,0,1,2,3)
-
-  scr = TkScrollbar.new.pack(:side=>:right, :fill=>:y)
-
-  lbox1 = Tk::RbWidget::Editable_Listbox.new.pack(:side=>:left)
-  lbox2 = Tk::RbWidget::Editable_Listbox.new.pack(:side=>:left)
-
-  scr.assign(lbox1, lbox2)
-
-  lbox1.insert(:end, *%w(a b c d e f g h i j k l m n))
-  lbox2.insert(:end,     0,1,2,3,4,5,6,7,8,9,0,1,2,3)
-
-
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/encstr_usage.rb b/ext/tk/sample/encstr_usage.rb
deleted file mode 100644
index 39dc9c4018..0000000000
--- a/ext/tk/sample/encstr_usage.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'tk'
-
-TkMessage.new(:width=>400, :text=><<EOM).pack
-This sample shows how to use Tk::EncodedString class. \
-This reads 'iso2022-kr' text (from discription of \
-Korean language environment of GNU Emacs 20.7.2) \
-and inserts the text into the text widget.
-EOM
-
-t1 = TkText.new(:height=>5).pack
-t2 = TkText.new(:height=>5).pack
-t3 = TkText.new(:height=>5).pack
-
-src_str = IO.readlines(File.join(File.dirname(__FILE__),'iso2022-kr.txt')).join
-
-t1.insert('end',
-          "use neither Tk::EncodedString class nor Tk.encoding= method\n\n")
-t1.insert('end', src_str)
-
-enc_str = Tk::EncodedString(src_str, 'iso2022-kr')
-t2.insert('end',
-          "use Tk::EncodedString class (Tk.encoding => '#{Tk.encoding}')\n\n")
-t2.insert('end', enc_str)
-
-Tk.encoding = 'iso2022-kr'
-t3.insert('end', "use Tk.encoding = 'iso2022-kr' (Tk.force_default_encoding? == #{Tk.force_default_encoding?})\n\n")
-
-t3.insert('end', src_str)
-
-Tk.mainloop
diff --git a/ext/tk/sample/figmemo_sample.rb b/ext/tk/sample/figmemo_sample.rb
deleted file mode 100644
index 25ec618fe8..0000000000
--- a/ext/tk/sample/figmemo_sample.rb
+++ /dev/null
@@ -1,456 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-
-begin
-  # try to use Img extension
-  require 'tkextlib/tkimg'
-rescue Exception
-  # cannot use Img extention --> ignore
-end
-
-
-############################
-# scrolled_canvas
-class TkScrolledCanvas < TkCanvas
-  include TkComposite
-
-  def initialize_composite(keys={})
-    @h_scr = TkScrollbar.new(@frame)
-    @v_scr = TkScrollbar.new(@frame)
-
-    @canvas = TkCanvas.new(@frame)
-    @path = @canvas.path
-
-    @canvas.xscrollbar(@h_scr)
-    @canvas.yscrollbar(@v_scr)
-
-    TkGrid.rowconfigure(@frame, 0, :weight=>1, :minsize=>0)
-    TkGrid.columnconfigure(@frame, 0, :weight=>1, :minsize=>0)
-
-    @canvas.grid(:row=>0, :column=>0, :sticky=>'news')
-    @h_scr.grid(:row=>1, :column=>0, :sticky=>'ew')
-    @v_scr.grid(:row=>0, :column=>1, :sticky=>'ns')
-
-    delegate('DEFAULT', @canvas)
-    delegate('background', @canvas, @h_scr, @v_scr)
-    delegate('activebackground', @h_scr, @v_scr)
-    delegate('troughcolor', @h_scr, @v_scr)
-    delegate('repeatdelay', @h_scr, @v_scr)
-    delegate('repeatinterval', @h_scr, @v_scr)
-    delegate('borderwidth', @frame)
-    delegate('relief', @frame)
-
-    delegate_alias('canvasborderwidth', 'borderwidth', @canvas)
-    delegate_alias('canvasrelief', 'relief', @canvas)
-
-    delegate_alias('scrollbarborderwidth', 'borderwidth', @h_scr, @v_scr)
-    delegate_alias('scrollbarrelief', 'relief', @h_scr, @v_scr)
-
-    configure(keys) unless keys.empty?
-  end
-end
-
-############################
-class PhotoCanvas < TkScrolledCanvas
-
-USAGE = <<EOT
---- WHAT IS ---
-You can write comments on the loaded image, and save it as a Postscipt
-file (original image file is not modified). Each comment is drawn as a
-set of an indicator circle, an arrow, and a memo text. See the following
-how to write comments.
-This can save the list of memo texts to another file. It may useful to
-search the saved Postscript file by the comments on them.
-This may not support multibyte characters (multibyte texts are broken on
-a Postscript file). It depends on features of canvas widgets of Tcl/Tk
-libraries linked your Ruby/Tk. If you use Tcl/Tk8.0-jp (Japanized Tcl/Tk),
-you can (possibly) get a Japanese Postscript file.
-
---- BINDINGS ---
-* Button-1 : draw comments by following steps
-    1st - Set center of a indicator circle.
-    2nd - Set head position of an arrow.
-    3rd - Set tail position of an arrow, and show an entry box.
-          Input a memo text and hit 'Enter' key to entry the comment.
-
-* Button-2-drag : scroll the canvas
-
-* Button-3 : when drawing, cancel current drawing
-
-* Double-Button-3 : delete the clicked comment (text, arrow, and circle)
-EOT
-
-  def initialize(*args)
-    super(*args)
-
-    self.highlightthickness = 0
-    self.selectborderwidth = 0
-
-    @photo = TkPhotoImage.new
-    @img = TkcImage.new(self, 0, 0, :image=>@photo)
-
-    width  = self.width
-    height = self.height
-    @scr_region = [-width, -height, width, height]
-    self.scrollregion(@scr_region)
-    self.xview_moveto(0.25)
-    self.yview_moveto(0.25)
-
-    @col = 'red'
-    @font = 'Helvetica -12'
-
-    @memo_id_num = -1
-    @memo_id_head = 'memo_'
-    @memo_id_tag = nil
-    @overlap_d = 2
-
-    @state = TkVariable.new
-    @border = 2
-    @selectborder = 1
-    @delta = @border + @selectborder
-    @entry = TkEntry.new(self, :relief=>:ridge, :borderwidth=>@border,
-                         :selectborderwidth=>@selectborder,
-                         :highlightthickness=>0)
-    @entry.bind('Return'){@state.value = 0}
-
-    @mode = old_mode = 0
-
-    _state0()
-
-    bind('2', :x, :y){|x,y| scan_mark(x,y)}
-    bind('B2-Motion', :x, :y){|x,y| scan_dragto(x,y)}
-
-    bind('3'){
-      next if (old_mode = @mode) == 0
-      @items.each{|item| item.delete }
-      _state0()
-    }
-
-    bind('Double-3', :widget, :x, :y){|w, x, y|
-      next if old_mode != 0
-      x = w.canvasx(x)
-      y = w.canvasy(y)
-      tag = nil
-      w.find_overlapping(x - @overlap_d, y - @overlap_d,
-                         x + @overlap_d, y + @overlap_d).find{|item|
-        ! (item.tags.find{|name|
-             if name =~ /^(#{@memo_id_head}\d+)$/
-               tag = $1
-             end
-           }.empty?)
-      }
-      w.delete(tag) if tag
-    }
-  end
-
-  #-----------------------------------
-  private
-  def _state0() # init
-    @mode = 0
-
-    @memo_id_num += 1
-    @memo_id_tag = @memo_id_head + @memo_id_num.to_s
-
-    @target = nil
-    @items = []
-    @mark = [0, 0]
-    bind_remove('Motion')
-    bind('ButtonRelease-1', proc{|x,y| _state1(x,y)}, '%x', '%y')
-  end
-
-  def _state1(x,y) # set center
-    @mode = 1
-
-    @target = TkcOval.new(self,
-                          [canvasx(x), canvasy(y)], [canvasx(x), canvasy(y)],
-                          :outline=>@col, :width=>3, :tags=>[@memo_id_tag])
-    @items << @target
-    @mark = [x,y]
-
-    bind('Motion', proc{|x,y| _state2(x,y)}, '%x', '%y')
-    bind('ButtonRelease-1', proc{|x,y| _state3(x,y)}, '%x', '%y')
-  end
-
-  def _state2(x,y) # create circle
-    @mode = 2
-
-    r = Integer(Math.sqrt((x-@mark[0])**2 + (y-@mark[1])**2))
-    @target.coords([canvasx(@mark[0] - r), canvasy(@mark[1] - r)],
-                   [canvasx(@mark[0] + r), canvasy(@mark[1] + r)])
-  end
-
-  def _state3(x,y) # set line start
-    @mode = 3
-
-    @target = TkcLine.new(self,
-                          [canvasx(x), canvasy(y)], [canvasx(x), canvasy(y)],
-                          :arrow=>:first, :arrowshape=>[10, 14, 5],
-                          :fill=>@col, :tags=>[@memo_id_tag])
-    @items << @target
-    @mark = [x, y]
-
-    bind('Motion', proc{|x,y| _state4(x,y)}, '%x', '%y')
-    bind('ButtonRelease-1', proc{|x,y| _state5(x,y)}, '%x', '%y')
-  end
-
-  def _state4(x,y) # create line
-    @mode = 4
-
-    @target.coords([canvasx(@mark[0]), canvasy(@mark[1])],
-                   [canvasx(x), canvasy(y)])
-  end
-
-  def _state5(x,y) # set text
-    @mode = 5
-
-    if x - @mark[0] >= 0
-      justify = 'left'
-      dx = - @delta
-
-      if y - @mark[1] >= 0
-        anchor = 'nw'
-        dy = - @delta
-      else
-        anchor = 'sw'
-        dy = @delta
-      end
-    else
-      justify = 'right'
-      dx = @delta
-
-      if y - @mark[1] >= 0
-        anchor = 'ne'
-        dy = - @delta
-      else
-        anchor = 'se'
-        dy = @delta
-      end
-    end
-
-    bind_remove('Motion')
-
-    @entry.value = ''
-    @entry.configure(:justify=>justify, :font=>@font, :foreground=>@col)
-
-    ewin = TkcWindow.new(self, [canvasx(x)+dx, canvasy(y)+dy],
-                         :window=>@entry, :state=>:normal, :anchor=>anchor,
-                         :tags=>[@memo_id_tag])
-
-    @entry.focus
-    @entry.grab
-    @state.wait
-    @entry.grab_release
-
-    ewin.delete
-
-    @target = TkcText.new(self, [canvasx(x), canvasy(y)],
-                          :anchor=>anchor, :justify=>justify,
-                          :fill=>@col, :font=>@font, :text=>@entry.value,
-                          :tags=>[@memo_id_tag])
-
-    _state0()
-  end
-
-  #-----------------------------------
-  public
-  def load_photo(filename)
-    @photo.configure(:file=>filename)
-  end
-
-  def modified?
-    ! ((find_withtag('all') - [@img]).empty?)
-  end
-
-  def fig_erase
-    (find_withtag('all') - [@img]).each{|item| item.delete}
-  end
-
-  def reset_region
-    width = @photo.width
-    height = @photo.height
-
-    if width > @scr_region[2]
-      @scr_region[0] = -width
-      @scr_region[2] = width
-    end
-
-    if height > @scr_region[3]
-      @scr_region[1] = -height
-      @scr_region[3] = height
-    end
-
-    self.scrollregion(@scr_region)
-    self.xview_moveto(0.25)
-    self.yview_moveto(0.25)
-  end
-
-  def get_texts
-    ret = []
-    find_withtag('all').each{|item|
-      if item.kind_of?(TkcText)
-        ret << item[:text]
-      end
-    }
-    ret
-  end
-end
-############################
-
-# define methods for menu
-def open_file(canvas, fname)
-  if canvas.modified?
-    ret = Tk.messageBox(:icon=>'warning',:type=>'okcancel',:default=>'cancel',
-                        :message=>'Canvas may be modified. Realy erase? ')
-    return if ret == 'cancel'
-  end
-
-  filetypes = [
-    ['GIF Files', '.gif'],
-    ['GIF Files', [], 'GIFF'],
-    ['PPM Files', '.ppm'],
-    ['PGM Files', '.pgm']
-  ]
-
-  begin
-    if Tk::Img::package_version != ''
-      filetypes << ['JPEG Files', ['.jpg', '.jpeg']]
-      filetypes << ['PNG Files', '.png']
-      filetypes << ['PostScript Files', '.ps']
-      filetypes << ['PDF Files', '.pdf']
-      filetypes << ['Windows Bitmap Files', '.bmp']
-      filetypes << ['Windows Icon Files', '.ico']
-      filetypes << ['PCX Files', '.pcx']
-      filetypes << ['Pixmap Files', '.pixmap']
-      filetypes << ['SGI Files', '.sgi']
-      filetypes << ['Sun Raster Files', '.sun']
-      filetypes << ['TGA Files', '.tga']
-      filetypes << ['TIFF Files', '.tiff']
-      filetypes << ['XBM Files', '.xbm']
-      filetypes << ['XPM Files', '.xpm']
-    end
-  rescue
-  end
-
-  filetypes << ['ALL Files', '*']
-
-  fpath = Tk.getOpenFile(:filetypes=>filetypes)
-  return if fpath.empty?
-
-  begin
-    canvas.load_photo(fpath)
-  rescue => e
-    Tk.messageBox(:icon=>'error', :type=>'ok',
-                  :message=>"Fail to read '#{fpath}'.\n#{e.message}")
-  end
-
-  canvas.fig_erase
-  canvas.reset_region
-
-  fname.value = fpath
-end
-
-# --------------------------------
-def save_memo(canvas, fname)
-  initname = fname.value
-  if initname != '-'
-    initname = File.basename(initname, File.extname(initname))
-    fpath = Tk.getSaveFile(:filetypes=>[ ['Text Files', '.txt'],
-                                         ['ALL Files', '*'] ],
-                           :initialfile=>initname)
-  else
-    fpath = Tk.getSaveFile(:filetypes=>[ ['Text Files', '.txt'],
-                                         ['ALL Files', '*'] ])
-  end
-  return if fpath.empty?
-
-  begin
-    fid = open(fpath, 'w')
-  rescue => e
-    Tk.messageBox(:icon=>'error', :type=>'ok',
-                  :message=>"Fail to open '#{fname.value}'.\n#{e.message}")
-  end
-
-  begin
-    canvas.get_texts.each{|txt|
-      fid.print(txt, "\n")
-    }
-  ensure
-    fid.close
-  end
-end
-
-# --------------------------------
-def ps_print(canvas, fname)
-  initname = fname.value
-  if initname != '-'
-    initname = File.basename(initname, File.extname(initname))
-    fpath = Tk.getSaveFile(:filetypes=>[ ['Postscript Files', '.ps'],
-                                         ['ALL Files', '*'] ],
-                           :initialfile=>initname)
-  else
-    fpath = Tk.getSaveFile(:filetypes=>[ ['Postscript Files', '.ps'],
-                                         ['ALL Files', '*'] ])
-  end
-  return if fpath.empty?
-
-  bbox = canvas.bbox('all')
-  canvas.postscript(:file=>fpath, :x=>bbox[0], :y=>bbox[1],
-                    :width=>bbox[2] - bbox[0], :height=>bbox[3] - bbox[1])
-end
-
-# --------------------------------
-def quit(canvas)
-  ret = Tk.messageBox(:icon=>'warning', :type=>'okcancel',
-                      :default=>'cancel',
-                      :message=>'Realy quit? ')
-  exit if ret == 'ok'
-end
-
-# --------------------------------
-# setup root
-root = TkRoot.new(:title=>'Fig Memo')
-
-# create canvas frame
-canvas = PhotoCanvas.new(root).pack(:fill=>:both, :expand=>true)
-usage_frame = TkFrame.new(root, :relief=>:ridge, :borderwidth=>2)
-hide_btn = TkButton.new(usage_frame, :text=>'hide usage',
-                        :font=>{:size=>8}, :pady=>1,
-                        :command=>proc{usage_frame.unpack})
-hide_btn.pack(:anchor=>'e', :padx=>5)
-usage = TkLabel.new(usage_frame, :text=>PhotoCanvas::USAGE,
-                    :font=>'Helvetica 8', :justify=>:left).pack
-
-show_usage = proc{
-  usage_frame.pack(:before=>canvas, :fill=>:x, :expand=>true)
-}
-
-fname = TkVariable.new('-')
-f = TkFrame.new(root, :relief=>:sunken, :borderwidth=>1).pack(:fill=>:x)
-label = TkLabel.new(f, :textvariable=>fname,
-                    :font=>{:size=>-12, :weight=>:bold},
-                    :anchor=>'w').pack(:side=>:left, :fill=>:x, :padx=>10)
-
-# create menu
-mspec = [
-  [ ['File', 0],
-    ['Show Usage',      proc{show_usage.call}, 5],
-    '---',
-    ['Open Image File', proc{open_file(canvas, fname)}, 0],
-    ['Save Memo Texts', proc{save_memo(canvas, fname)}, 0],
-    '---',
-    ['Save Postscript', proc{ps_print(canvas, fname)}, 5],
-    '---',
-    ['Quit', proc{quit(canvas)}, 0]
-  ]
-]
-root.add_menubar(mspec)
-
-# manage wm_protocol
-root.protocol(:WM_DELETE_WINDOW){quit(canvas)}
-
-# show usage
-show_usage.call
-
-# --------------------------------
-# start eventloop
-Tk.mainloop
diff --git a/ext/tk/sample/images/earth.gif b/ext/tk/sample/images/earth.gif
deleted file mode 100644
index 2c229eb110..0000000000
--- a/ext/tk/sample/images/earth.gif
+++ /dev/null
diff --git a/ext/tk/sample/images/earthris.gif b/ext/tk/sample/images/earthris.gif
deleted file mode 100644
index c4ee473727..0000000000
--- a/ext/tk/sample/images/earthris.gif
+++ /dev/null
diff --git a/ext/tk/sample/images/face.xbm b/ext/tk/sample/images/face.xbm
deleted file mode 100644
index 03d829f4d1..0000000000
--- a/ext/tk/sample/images/face.xbm
+++ /dev/null
@@ -1,173 +0,0 @@
-#define face_width 108
-#define face_height 144
-#define face_x_hot 48
-#define face_y_hot 80
-static char face_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09,
-   0x20, 0x80, 0x24, 0x05, 0x00, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x88,
-   0x24, 0x20, 0x80, 0x24, 0x00, 0x00, 0x00, 0x10, 0x80, 0x04, 0x00, 0x01,
-   0x00, 0x01, 0x40, 0x0a, 0x09, 0x00, 0x92, 0x04, 0x80, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x10, 0x40, 0x12, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00, 0x84,
-   0x24, 0x40, 0x22, 0xa8, 0x02, 0x14, 0x84, 0x92, 0x40, 0x42, 0x12, 0x04,
-   0x10, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x52, 0x11, 0x00, 0x12, 0x00,
-   0x40, 0x02, 0x00, 0x20, 0x00, 0x08, 0x00, 0xaa, 0x02, 0x54, 0x85, 0x24,
-   0x00, 0x10, 0x12, 0x00, 0x00, 0x81, 0x44, 0x00, 0x90, 0x5a, 0x00, 0xea,
-   0x1b, 0x00, 0x80, 0x40, 0x40, 0x02, 0x00, 0x08, 0x00, 0x20, 0xa2, 0x05,
-   0x8a, 0xb4, 0x6e, 0x45, 0x12, 0x04, 0x08, 0x00, 0x00, 0x00, 0x10, 0x02,
-   0xa8, 0x92, 0x00, 0xda, 0x5f, 0x10, 0x00, 0x10, 0xa1, 0x04, 0x20, 0x41,
-   0x02, 0x00, 0x5a, 0x25, 0xa0, 0xff, 0xfb, 0x05, 0x41, 0x02, 0x04, 0x00,
-   0x00, 0x08, 0x40, 0x80, 0xec, 0x9b, 0xec, 0xfe, 0x7f, 0x01, 0x04, 0x20,
-   0x90, 0x02, 0x04, 0x00, 0x08, 0x20, 0xfb, 0x2e, 0xf5, 0xff, 0xff, 0x57,
-   0x00, 0x04, 0x02, 0x00, 0x00, 0x20, 0x01, 0xc1, 0x6e, 0xab, 0xfa, 0xff,
-   0xff, 0x05, 0x90, 0x20, 0x48, 0x02, 0x00, 0x04, 0x20, 0xa8, 0xdf, 0xb5,
-   0xfe, 0xff, 0xff, 0x0b, 0x01, 0x00, 0x01, 0x00, 0x80, 0x80, 0x04, 0xe0,
-   0xbb, 0xef, 0xff, 0xff, 0x7f, 0x01, 0x00, 0x04, 0x48, 0x02, 0x00, 0x20,
-   0x80, 0xf4, 0x6f, 0xfb, 0xff, 0xff, 0xff, 0x20, 0x90, 0x40, 0x02, 0x00,
-   0x00, 0x04, 0x08, 0xb8, 0xf6, 0xff, 0xff, 0xdf, 0xbe, 0x12, 0x45, 0x10,
-   0x90, 0x04, 0x90, 0x00, 0x22, 0xfa, 0xff, 0xff, 0xff, 0xbb, 0xd7, 0xe9,
-   0x3a, 0x02, 0x02, 0x00, 0x04, 0x90, 0x80, 0xfe, 0xdf, 0xf6, 0xb7, 0xef,
-   0xbe, 0x56, 0x57, 0x40, 0x48, 0x09, 0x00, 0x04, 0x00, 0xfa, 0xf5, 0xdf,
-   0xed, 0x5a, 0xd5, 0xea, 0xbd, 0x09, 0x00, 0x00, 0x40, 0x00, 0x92, 0xfe,
-   0xbf, 0x7d, 0xb7, 0x6a, 0x55, 0xbf, 0xf7, 0x02, 0x11, 0x01, 0x00, 0x91,
-   0x00, 0xff, 0xff, 0xaf, 0x55, 0x55, 0x5b, 0xeb, 0xef, 0x22, 0x04, 0x04,
-   0x04, 0x00, 0xa4, 0xff, 0xf7, 0xad, 0xaa, 0xaa, 0xaa, 0xbe, 0xfe, 0x03,
-   0x20, 0x00, 0x10, 0x44, 0x80, 0xff, 0x7f, 0x55, 0x12, 0x91, 0x2a, 0xeb,
-   0xbf, 0x0b, 0x82, 0x02, 0x00, 0x00, 0xd1, 0x7f, 0xdf, 0xa2, 0xa4, 0x54,
-   0x55, 0xfd, 0xfd, 0x47, 0x08, 0x08, 0x00, 0x21, 0xe4, 0xff, 0x37, 0x11,
-   0x09, 0xa5, 0xaa, 0xb6, 0xff, 0x0d, 0x80, 0x00, 0x00, 0x04, 0xd0, 0xff,
-   0x4f, 0x44, 0x20, 0x48, 0x55, 0xfb, 0xff, 0x27, 0x11, 0x02, 0x40, 0x40,
-   0xe2, 0xfb, 0x15, 0x11, 0x4a, 0x55, 0x4a, 0x7d, 0xf7, 0x0f, 0x00, 0x00,
-   0x04, 0x08, 0xf8, 0xdf, 0x52, 0x44, 0x01, 0x52, 0xb5, 0xfa, 0xff, 0x0f,
-   0x49, 0x02, 0x00, 0x02, 0xe9, 0xf6, 0x0a, 0x11, 0xa4, 0x88, 0x4a, 0x6d,
-   0xff, 0x5f, 0x00, 0x00, 0x10, 0x20, 0xf0, 0x2f, 0x21, 0x44, 0x10, 0x52,
-   0xb5, 0xfa, 0xff, 0x0f, 0x44, 0x04, 0x80, 0x08, 0xf8, 0xab, 0x8a, 0x00,
-   0x81, 0xa4, 0xd4, 0xd6, 0xfe, 0x2f, 0x00, 0x00, 0x04, 0x40, 0xb5, 0x2d,
-   0x21, 0x08, 0x04, 0x90, 0xaa, 0xfa, 0xff, 0x1f, 0x11, 0x01, 0x00, 0x04,
-   0xf0, 0x57, 0x0a, 0x22, 0x40, 0x4a, 0xda, 0x5e, 0xfb, 0x1f, 0x40, 0x00,
-   0x40, 0x20, 0xba, 0x95, 0x90, 0x00, 0x01, 0xa0, 0xaa, 0xea, 0xff, 0x5f,
-   0x02, 0x02, 0x00, 0x01, 0xe8, 0x57, 0x05, 0x00, 0x00, 0x12, 0xd5, 0xfe,
-   0xfd, 0x1f, 0x48, 0x00, 0x04, 0x48, 0x7a, 0x95, 0x08, 0x02, 0x10, 0x40,
-   0xaa, 0x55, 0xf7, 0x1f, 0x00, 0x09, 0x20, 0x00, 0xf8, 0x57, 0x22, 0x10,
-   0x00, 0x28, 0xa9, 0xfa, 0xff, 0x5f, 0x02, 0x00, 0x00, 0x49, 0xdd, 0x29,
-   0x01, 0x00, 0x80, 0x80, 0xaa, 0xd7, 0xff, 0x0f, 0x10, 0x00, 0x08, 0x00,
-   0xf8, 0x96, 0x08, 0x00, 0x00, 0x20, 0x54, 0xfa, 0xee, 0x3f, 0x81, 0x04,
-   0x40, 0x24, 0xfe, 0x55, 0x82, 0x00, 0x00, 0x82, 0xd2, 0xad, 0xff, 0x0f,
-   0x08, 0x00, 0x04, 0x80, 0x6c, 0x97, 0x00, 0x00, 0x02, 0x20, 0xa9, 0xf6,
-   0xdf, 0x5f, 0x00, 0x02, 0x20, 0x09, 0xfa, 0x49, 0x12, 0x00, 0x20, 0x84,
-   0x54, 0xdb, 0xfe, 0x1f, 0x91, 0x00, 0x00, 0x00, 0xf8, 0x2b, 0x00, 0x20,
-   0x00, 0x40, 0xa4, 0xf6, 0xbb, 0x1f, 0x04, 0x00, 0x44, 0x92, 0x7e, 0x95,
-   0x02, 0x00, 0x00, 0x89, 0xaa, 0xdd, 0xff, 0x1f, 0x20, 0x09, 0x10, 0x00,
-   0xf4, 0x57, 0x20, 0x01, 0x08, 0x20, 0xa9, 0x76, 0xff, 0x5f, 0x02, 0x00,
-   0x00, 0x21, 0xfc, 0x4a, 0x05, 0x00, 0x01, 0x80, 0x54, 0xdb, 0xff, 0x1e,
-   0x08, 0x02, 0x04, 0x08, 0xf9, 0x2b, 0x00, 0x00, 0x40, 0x28, 0xd2, 0xf6,
-   0xff, 0xbf, 0x80, 0x00, 0x90, 0x00, 0xbc, 0x92, 0x08, 0x10, 0x00, 0x82,
-   0x54, 0xdb, 0xff, 0x1f, 0x20, 0x00, 0x00, 0x44, 0xf9, 0x55, 0x02, 0x01,
-   0x00, 0x20, 0xaa, 0xbd, 0xfd, 0x3f, 0x08, 0x04, 0x04, 0x10, 0xf4, 0x2a,
-   0x01, 0x00, 0x22, 0x80, 0xd4, 0xf6, 0xff, 0x5f, 0x82, 0x00, 0x40, 0x02,
-   0xf8, 0x55, 0x20, 0x00, 0x00, 0x50, 0x6a, 0xdf, 0xfe, 0x3f, 0x00, 0x00,
-   0x00, 0x48, 0xe9, 0x4a, 0x05, 0x08, 0x00, 0xa5, 0xd5, 0xf5, 0xff, 0x3f,
-   0x10, 0x01, 0x10, 0x01, 0xb0, 0xab, 0x92, 0x02, 0x40, 0xf8, 0xbf, 0xde,
-   0xfe, 0x5f, 0x02, 0x04, 0x04, 0x48, 0xfa, 0xd4, 0x6f, 0x20, 0x84, 0xef,
-   0xff, 0xfb, 0xff, 0x1f, 0x20, 0x00, 0x00, 0x00, 0xe0, 0xed, 0xbf, 0x0b,
-   0xa1, 0x7e, 0xff, 0xbf, 0xfd, 0x5f, 0x04, 0x01, 0x20, 0x49, 0xd2, 0xfb,
-   0xfe, 0x55, 0xd4, 0xff, 0xff, 0xf6, 0xff, 0x07, 0x00, 0x04, 0x00, 0x00,
-   0xc0, 0xaa, 0xfb, 0x2b, 0xa2, 0xfe, 0xff, 0xdf, 0xee, 0x1f, 0x91, 0x00,
-   0x82, 0xa4, 0xa4, 0xf5, 0xff, 0x57, 0xd5, 0xff, 0xbf, 0xfd, 0xff, 0x4d,
-   0x00, 0x00, 0x20, 0x00, 0x88, 0x5b, 0xff, 0x2f, 0x69, 0xff, 0xff, 0xdb,
-   0xfe, 0x1f, 0x24, 0x02, 0x00, 0x49, 0xa2, 0xd6, 0xff, 0x5f, 0xea, 0xff,
-   0x7f, 0x7f, 0x7f, 0x0d, 0x00, 0x00, 0x10, 0x00, 0x40, 0xab, 0xf7, 0xbb,
-   0xf0, 0xdf, 0xff, 0xd5, 0xff, 0xbf, 0x82, 0x04, 0x42, 0x24, 0x91, 0xd5,
-   0xaa, 0xae, 0xd4, 0xaa, 0x52, 0x7b, 0xff, 0x15, 0x08, 0x00, 0x00, 0x01,
-   0x04, 0x55, 0xd5, 0x55, 0x70, 0x5b, 0x75, 0xdd, 0xdf, 0x1f, 0x40, 0x00,
-   0x08, 0x48, 0xa0, 0x4a, 0xa9, 0x56, 0xea, 0x56, 0xad, 0x6a, 0x7d, 0x9b,
-   0x04, 0x01, 0x00, 0x02, 0x42, 0x2a, 0xd5, 0xaa, 0xa8, 0xaa, 0xaa, 0xfa,
-   0xdf, 0x2f, 0x10, 0x04, 0x22, 0x48, 0x08, 0x45, 0x2a, 0x15, 0x68, 0x55,
-   0x55, 0xd7, 0x76, 0x1b, 0x00, 0x00, 0x00, 0x01, 0x40, 0x2a, 0x80, 0xa0,
-   0xb2, 0x09, 0x48, 0xb9, 0xdf, 0x17, 0x22, 0x01, 0x00, 0x24, 0x45, 0x8a,
-   0x24, 0x4a, 0x54, 0x51, 0x91, 0xf6, 0x6e, 0x4b, 0x00, 0x04, 0x90, 0x00,
-   0x80, 0x52, 0x00, 0x20, 0x69, 0x05, 0xa4, 0xaa, 0xff, 0x1e, 0x48, 0x00,
-   0x02, 0x92, 0x08, 0x05, 0x81, 0x94, 0xd4, 0x92, 0x40, 0xfd, 0xb6, 0x8b,
-   0x00, 0x01, 0x40, 0x00, 0x82, 0x54, 0x00, 0x48, 0x68, 0x05, 0x90, 0xa4,
-   0xef, 0x06, 0x24, 0x00, 0x08, 0x12, 0x10, 0x05, 0x00, 0x10, 0xb5, 0x01,
-   0x42, 0xfb, 0xbf, 0x43, 0x00, 0x09, 0x00, 0x40, 0x81, 0xa8, 0x08, 0x4a,
-   0xaa, 0x96, 0x90, 0xac, 0x6d, 0x15, 0x22, 0x00, 0x20, 0x09, 0x04, 0x15,
-   0x80, 0x28, 0xdc, 0x01, 0x24, 0xfb, 0xbf, 0x01, 0x80, 0x04, 0x09, 0x00,
-   0x40, 0x48, 0x02, 0x45, 0xb2, 0x2e, 0x41, 0x6d, 0xef, 0x05, 0x11, 0x00,
-   0x40, 0x52, 0x02, 0x15, 0x29, 0x2a, 0xac, 0x42, 0x54, 0xfb, 0x3b, 0x51,
-   0x84, 0x00, 0x08, 0x00, 0x20, 0x54, 0x80, 0x05, 0xb5, 0x3d, 0xa2, 0xb6,
-   0xdf, 0x00, 0x20, 0x04, 0x20, 0x49, 0x89, 0xa8, 0x6a, 0x29, 0xac, 0xd6,
-   0x54, 0xff, 0x3f, 0x84, 0x00, 0x01, 0x04, 0x10, 0x00, 0x94, 0xa8, 0x56,
-   0xda, 0x5f, 0xab, 0xd5, 0x1e, 0x10, 0x48, 0x00, 0x90, 0x82, 0x48, 0xa8,
-   0xb2, 0xac, 0xfd, 0x55, 0xd5, 0xfe, 0x9f, 0x80, 0x00, 0x0a, 0x02, 0x08,
-   0x02, 0x55, 0x5a, 0x75, 0xff, 0xaf, 0xb6, 0xf7, 0x2d, 0x12, 0x92, 0x00,
-   0x10, 0x20, 0x10, 0xa8, 0x54, 0xd5, 0xbf, 0x5d, 0xad, 0xdd, 0x0f, 0x00,
-   0x00, 0x04, 0x40, 0x09, 0x84, 0xa8, 0xaa, 0x5a, 0xed, 0xeb, 0x6a, 0xff,
-   0x9f, 0xa4, 0x24, 0x01, 0x02, 0xa0, 0x20, 0x50, 0x55, 0xd5, 0xbe, 0xae,
-   0xad, 0xfd, 0x16, 0x00, 0x10, 0x04, 0x20, 0x0a, 0x08, 0xb4, 0xaa, 0x95,
-   0xaa, 0x7b, 0xb7, 0xdb, 0x5f, 0x92, 0x04, 0x01, 0x84, 0x20, 0x21, 0x51,
-   0xd5, 0x2a, 0xa9, 0xee, 0xd5, 0xfe, 0x0d, 0x00, 0x20, 0x04, 0x10, 0x00,
-   0x08, 0x50, 0xe9, 0xd7, 0xd4, 0xfb, 0xb5, 0xff, 0x9f, 0x24, 0x09, 0x01,
-   0x42, 0x4a, 0xa2, 0x64, 0xd5, 0x55, 0x7b, 0x7f, 0xda, 0x7d, 0x4f, 0x00,
-   0x20, 0x04, 0x00, 0x80, 0x00, 0xa0, 0x2a, 0x13, 0x84, 0x6a, 0x55, 0xff,
-   0x1d, 0x48, 0x8a, 0x00, 0x94, 0x24, 0x8a, 0xc8, 0xaa, 0x42, 0x20, 0x5d,
-   0xf5, 0xff, 0x5f, 0x01, 0x00, 0x02, 0x01, 0x00, 0x20, 0xa2, 0x4a, 0x1a,
-   0x82, 0x56, 0xda, 0xbd, 0x3f, 0x92, 0x92, 0x00, 0x90, 0x92, 0x00, 0x40,
-   0x95, 0x6a, 0xf4, 0x55, 0x6d, 0xff, 0xd6, 0x00, 0x00, 0x0a, 0x04, 0x20,
-   0x14, 0x49, 0x4b, 0xaa, 0xaa, 0x56, 0xf5, 0xff, 0xbf, 0xab, 0xa4, 0x00,
-   0x20, 0x89, 0x40, 0x80, 0xaa, 0xaa, 0xaa, 0xaa, 0xde, 0xbf, 0xeb, 0x03,
-   0x00, 0x02, 0x04, 0x02, 0x0a, 0x10, 0x2b, 0x2a, 0x55, 0x5b, 0xf5, 0xff,
-   0xd7, 0x2f, 0x92, 0x00, 0x10, 0x28, 0x21, 0x01, 0x56, 0x95, 0xa0, 0x56,
-   0xdf, 0xef, 0xea, 0x87, 0x40, 0x0a, 0x42, 0x41, 0x00, 0x90, 0xaa, 0x52,
-   0xb6, 0xad, 0xfa, 0xff, 0xd5, 0x2f, 0x14, 0x00, 0x00, 0x04, 0x95, 0x04,
-   0xaa, 0xac, 0x55, 0x6b, 0xff, 0xb7, 0xea, 0x9f, 0x40, 0x02, 0x28, 0x51,
-   0x00, 0x40, 0x58, 0xd5, 0xda, 0xd6, 0x6e, 0x7f, 0xf9, 0x3f, 0x12, 0x04,
-   0x02, 0x04, 0x49, 0x25, 0x55, 0xaa, 0x77, 0xab, 0xff, 0x2b, 0xfd, 0x3f,
-   0x48, 0x01, 0x20, 0x41, 0x00, 0x00, 0x58, 0xa9, 0xda, 0xea, 0xfd, 0xaf,
-   0xfa, 0xff, 0x02, 0x04, 0x08, 0x14, 0x29, 0x49, 0x52, 0x55, 0x55, 0x55,
-   0xff, 0x8d, 0xfe, 0x3f, 0xa8, 0x00, 0x02, 0x41, 0x00, 0x02, 0xa0, 0xa2,
-   0xaa, 0xea, 0xff, 0x53, 0xfd, 0xff, 0x02, 0x04, 0x50, 0x04, 0x25, 0xa8,
-   0x54, 0x49, 0x52, 0xb5, 0xbf, 0x8a, 0xfe, 0xff, 0xa9, 0x08, 0x04, 0x50,
-   0x80, 0x02, 0xa1, 0x2a, 0x95, 0xea, 0xff, 0xa1, 0xff, 0xff, 0x03, 0x02,
-   0x90, 0x02, 0x09, 0x08, 0x44, 0x49, 0x52, 0xbd, 0x7f, 0xca, 0xff, 0xff,
-   0x2b, 0x09, 0x04, 0x48, 0x40, 0x82, 0x90, 0x56, 0xa9, 0xf6, 0xbf, 0xd0,
-   0xff, 0xff, 0x47, 0x00, 0x50, 0x02, 0x15, 0x11, 0x40, 0x95, 0xaa, 0xfd,
-   0x2f, 0xe9, 0xff, 0xff, 0x8f, 0x0a, 0x84, 0x50, 0x40, 0x84, 0x14, 0xaa,
-   0x6a, 0xff, 0x5f, 0xf2, 0xff, 0xff, 0x7f, 0x00, 0x10, 0x02, 0x09, 0x10,
-   0x40, 0x7d, 0xf7, 0xff, 0x0b, 0xfc, 0xff, 0xff, 0xaf, 0x02, 0x84, 0x50,
-   0x42, 0x85, 0x12, 0xd0, 0xdd, 0xff, 0xa7, 0xf2, 0xff, 0xff, 0xff, 0x04,
-   0x00, 0x0a, 0x08, 0x10, 0x48, 0xf8, 0xff, 0xff, 0x0a, 0xfe, 0xff, 0xff,
-   0x7f, 0x03, 0xa4, 0x80, 0xa2, 0x8a, 0x02, 0x68, 0xff, 0xff, 0x52, 0xfd,
-   0xff, 0xff, 0xff, 0x07, 0x00, 0x2a, 0x08, 0x20, 0x28, 0xdc, 0xff, 0x5f,
-   0x05, 0xff, 0xff, 0xff, 0xff, 0x0d, 0x92, 0x40, 0x22, 0x09, 0x02, 0xea,
-   0xfb, 0xaf, 0x48, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x12, 0x81, 0xa0,
-   0x48, 0x9c, 0x6e, 0x93, 0xa2, 0xff, 0xff, 0xff, 0xff, 0x07, 0xa8, 0x40,
-   0x28, 0x0a, 0x02, 0x74, 0xb5, 0x45, 0x81, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x02, 0x0a, 0x81, 0x20, 0x08, 0xae, 0xaa, 0x90, 0xe8, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0x90, 0x40, 0x28, 0x88, 0x12, 0x58, 0x15, 0x50, 0xd0, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x44, 0x0a, 0x41, 0x21, 0x08, 0xae, 0x04, 0x14,
-   0xf0, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x40, 0x14, 0x88, 0x04, 0xba,
-   0x02, 0x28, 0xe8, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x42, 0x15, 0x41, 0x21,
-   0x05, 0xad, 0x00, 0x05, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x40,
-   0x24, 0x8a, 0x0e, 0x36, 0x00, 0x0a, 0xf4, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x42, 0x25, 0x90, 0xd0, 0x8b, 0xc2, 0x41, 0x05, 0xfc, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0x10, 0x08, 0x05, 0xe8, 0x8e, 0x58, 0x80, 0x02, 0xfa, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x4a, 0x20, 0xa8, 0xba, 0x0b, 0x2b, 0x51, 0x01,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x8a, 0x02, 0xe8, 0xaf, 0x84,
-   0x90, 0x04, 0xfd, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x52, 0x21, 0x54, 0xbf,
-   0x1f, 0x15, 0xa5, 0x02, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x08,
-   0x01, 0xfa, 0xb6, 0xa4, 0x52, 0x40, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x4a, 0xa2, 0x54, 0xef, 0x5f, 0x4b, 0xa4, 0x80, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0x80, 0x10, 0x82, 0xfe, 0xbf, 0x92, 0x52, 0x42, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x12, 0x42, 0xa8, 0xbf, 0x1f, 0x24, 0x80, 0xa0,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x84, 0x28, 0x8a, 0xf7, 0x37, 0x80,
-   0x52, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x82, 0xe0, 0xff,
-   0x1f, 0x00, 0x20, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x84, 0x28,
-   0xca, 0xff, 0x1f, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x10, 0x42, 0xf0, 0xfd, 0x1b, 0x00, 0x50, 0xf0, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0xa4, 0x10, 0xc5, 0xff, 0x1f, 0x00, 0x00, 0xe0, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x00, 0x22, 0xf8, 0xff, 0x0e, 0x00, 0x00, 0xf0,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xaa, 0x88, 0xe2, 0xff, 0x0f, 0x10,
-   0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x25, 0xfa, 0xff,
-   0x0f, 0x01, 0x11, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xfb,
-   0xfb, 0xff, 0x7f, 0x5d, 0xd5, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f};
diff --git a/ext/tk/sample/images/flagdown.xbm b/ext/tk/sample/images/flagdown.xbm
deleted file mode 100644
index 55abc51825..0000000000
--- a/ext/tk/sample/images/flagdown.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define flagdown_width 48
-#define flagdown_height 48
-static char flagdown_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe1, 0x00, 0x00,
-   0x00, 0x00, 0x70, 0x80, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x03, 0x00,
-   0x00, 0x00, 0x0c, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x06, 0x04,
-   0x00, 0x00, 0x03, 0x00, 0x06, 0x06, 0x00, 0x80, 0x01, 0x00, 0x06, 0x07,
-   0x00, 0xc0, 0x1f, 0x00, 0x87, 0x07, 0x00, 0xe0, 0x7f, 0x80, 0xc7, 0x07,
-   0x00, 0x70, 0xe0, 0xc0, 0xe5, 0x07, 0x00, 0x38, 0x80, 0xe1, 0x74, 0x07,
-   0x00, 0x18, 0x80, 0x71, 0x3c, 0x07, 0x00, 0x0c, 0x00, 0x3b, 0x1e, 0x03,
-   0x00, 0x0c, 0x00, 0x1f, 0x0f, 0x00, 0x00, 0x86, 0x1f, 0x8e, 0x07, 0x00,
-   0x00, 0x06, 0x06, 0xc6, 0x05, 0x00, 0x00, 0x06, 0x00, 0xc6, 0x05, 0x00,
-   0x00, 0x06, 0x00, 0xc6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x06, 0x04, 0x00,
-   0x7f, 0x06, 0x00, 0x06, 0xe4, 0xff, 0x00, 0x06, 0x00, 0x06, 0x04, 0x00,
-   0x00, 0x06, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x00, 0x06, 0x06, 0x00,
-   0x00, 0x06, 0x00, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
-   0x00, 0x06, 0x00, 0xc6, 0x00, 0x00, 0x00, 0x06, 0x00, 0x66, 0x00, 0x00,
-   0x00, 0x06, 0x00, 0x36, 0x00, 0x00, 0x00, 0x06, 0x00, 0x3e, 0x00, 0x00,
-   0x00, 0xfe, 0xff, 0x2f, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x27, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0xf7, 0xbf, 0x8e, 0xfc, 0xdf, 0xf8, 0x9d, 0xeb, 0x9b, 0x76, 0xd2, 0x7a,
-   0x46, 0x30, 0xe2, 0x0f, 0xe1, 0x47, 0x55, 0x84, 0x48, 0x11, 0x84, 0x19};
diff --git a/ext/tk/sample/images/flagup.xbm b/ext/tk/sample/images/flagup.xbm
deleted file mode 100644
index 6eb0d846a3..0000000000
--- a/ext/tk/sample/images/flagup.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define flagup_width 48
-#define flagup_height 48
-static char flagup_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00,
-   0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xef, 0x6a, 0x00,
-   0x00, 0x00, 0xc0, 0x7b, 0x75, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0x6a, 0x00,
-   0x00, 0x00, 0x30, 0x60, 0x75, 0x00, 0x00, 0x00, 0x18, 0xe0, 0x7f, 0x00,
-   0x00, 0x00, 0x0c, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x06, 0xe0, 0x04, 0x00,
-   0x00, 0x00, 0x03, 0xe0, 0x04, 0x00, 0x00, 0x80, 0x01, 0xe0, 0x06, 0x00,
-   0x00, 0xc0, 0x1f, 0xe0, 0x07, 0x00, 0x00, 0xe0, 0x7f, 0xe0, 0x07, 0x00,
-   0x00, 0x70, 0xe0, 0xe0, 0x05, 0x00, 0x00, 0x38, 0x80, 0xe1, 0x04, 0x00,
-   0x00, 0x18, 0x80, 0xf1, 0x04, 0x00, 0x00, 0x0c, 0x00, 0xfb, 0x04, 0x00,
-   0x00, 0x0c, 0x00, 0xff, 0x04, 0x00, 0x00, 0x86, 0x1f, 0xee, 0x04, 0x00,
-   0x00, 0x06, 0x06, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0xe6, 0x04, 0x00,
-   0x00, 0x06, 0x00, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x66, 0x04, 0x00,
-   0x7f, 0x56, 0x52, 0x06, 0xe4, 0xff, 0x00, 0x76, 0x55, 0x06, 0x04, 0x00,
-   0x00, 0x56, 0x57, 0x06, 0x04, 0x00, 0x00, 0x56, 0x55, 0x06, 0x06, 0x00,
-   0x00, 0x56, 0xd5, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
-   0x54, 0x06, 0x00, 0xc6, 0x54, 0x55, 0xaa, 0x06, 0x00, 0x66, 0xaa, 0x2a,
-   0x54, 0x06, 0x00, 0x36, 0x55, 0x55, 0xaa, 0x06, 0x00, 0xbe, 0xaa, 0x2a,
-   0x54, 0xfe, 0xff, 0x6f, 0x55, 0x55, 0xaa, 0xfc, 0xff, 0xa7, 0xaa, 0x2a,
-   0x54, 0x01, 0x88, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x50, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa8, 0xaa, 0x2a,
-   0x54, 0x55, 0x95, 0x54, 0x55, 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a,
-   0x54, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ext/tk/sample/images/gray25.xbm b/ext/tk/sample/images/gray25.xbm
deleted file mode 100644
index b234b3cb0b..0000000000
--- a/ext/tk/sample/images/gray25.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44};
diff --git a/ext/tk/sample/images/grey.25 b/ext/tk/sample/images/grey.25
deleted file mode 100644
index b234b3cb0b..0000000000
--- a/ext/tk/sample/images/grey.25
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44};
diff --git a/ext/tk/sample/images/grey.5 b/ext/tk/sample/images/grey.5
deleted file mode 100644
index 37688893f0..0000000000
--- a/ext/tk/sample/images/grey.5
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
-   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
-   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa};
diff --git a/ext/tk/sample/images/letters.xbm b/ext/tk/sample/images/letters.xbm
deleted file mode 100644
index 0f12568d1a..0000000000
--- a/ext/tk/sample/images/letters.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define letters_width 48
-#define letters_height 48
-static char letters_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x02, 0x00, 0x00, 0x00, 0x20,
-   0x00, 0xfa, 0x00, 0x00, 0x00, 0x2e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2a,
-   0x00, 0x3a, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2e,
-   0xe0, 0xff, 0xff, 0xff, 0xff, 0x21, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21,
-   0xa0, 0x03, 0x00, 0x00, 0x70, 0x21, 0x20, 0x00, 0x00, 0x00, 0x50, 0x21,
-   0xa0, 0x1f, 0x00, 0x00, 0x50, 0x21, 0x20, 0x00, 0x00, 0x00, 0x70, 0x21,
-   0xfe, 0xff, 0xff, 0xff, 0x0f, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x21,
-   0xfa, 0x01, 0x00, 0x80, 0x0b, 0x21, 0x02, 0x00, 0x00, 0x80, 0x0a, 0x21,
-   0xba, 0x01, 0x00, 0x80, 0x0a, 0x21, 0x02, 0x00, 0x00, 0x80, 0x0b, 0x21,
-   0x3a, 0x00, 0x00, 0x00, 0x08, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x21,
-   0x02, 0xc0, 0xfb, 0x03, 0x08, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x3f,
-   0x02, 0xc0, 0xbd, 0x0f, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x01,
-   0x02, 0xc0, 0x7f, 0x7b, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x01,
-   0x02, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0xfe, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ext/tk/sample/images/noletter.xbm b/ext/tk/sample/images/noletter.xbm
deleted file mode 100644
index 5774124efe..0000000000
--- a/ext/tk/sample/images/noletter.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define noletters_width 48
-#define noletters_height 48
-static char noletters_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x07, 0x00,
-   0x00, 0xf0, 0x0f, 0xe0, 0x1f, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x7f, 0x00,
-   0x00, 0x3e, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x1f, 0x00, 0x00, 0xf0, 0x01,
-   0x80, 0x07, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0xe0, 0x07,
-   0xe0, 0x01, 0x00, 0x00, 0xf0, 0x0f, 0xe0, 0x00, 0x00, 0x00, 0x78, 0x0e,
-   0xf0, 0x00, 0x00, 0x00, 0x3c, 0x1e, 0x70, 0x00, 0x00, 0x00, 0x1e, 0x1c,
-   0x38, 0x00, 0x00, 0x00, 0x0f, 0x38, 0x38, 0x00, 0x00, 0x80, 0x07, 0x38,
-   0x3c, 0xfc, 0xff, 0xff, 0x7f, 0x78, 0x1c, 0x04, 0x00, 0xe0, 0x41, 0x70,
-   0x1c, 0x04, 0x00, 0xf0, 0x40, 0x70, 0x1c, 0x74, 0x00, 0x78, 0x4e, 0x70,
-   0x0e, 0x04, 0x00, 0x3c, 0x4a, 0xe0, 0x0e, 0x74, 0x03, 0x1e, 0x4a, 0xe0,
-   0x0e, 0x04, 0x00, 0x0f, 0x4e, 0xe0, 0x0e, 0x04, 0x80, 0x07, 0x40, 0xe0,
-   0x0e, 0x04, 0xf8, 0x0f, 0x40, 0xe0, 0x0e, 0x04, 0xe0, 0x01, 0x40, 0xe0,
-   0x0e, 0x04, 0xf8, 0x00, 0x40, 0xe0, 0x0e, 0x04, 0x78, 0x00, 0x40, 0xe0,
-   0x0e, 0x04, 0xfc, 0xf3, 0x40, 0xe0, 0x1c, 0x04, 0x1e, 0x00, 0x40, 0x70,
-   0x1c, 0x04, 0x0f, 0x00, 0x40, 0x70, 0x1c, 0x84, 0x07, 0x00, 0x40, 0x70,
-   0x3c, 0xfc, 0xff, 0xff, 0x7f, 0x78, 0x38, 0xe0, 0x01, 0x00, 0x00, 0x38,
-   0x38, 0xf0, 0x00, 0x00, 0x00, 0x38, 0x70, 0x78, 0x00, 0x00, 0x00, 0x1c,
-   0xf0, 0x3c, 0x00, 0x00, 0x00, 0x1e, 0xe0, 0x1e, 0x00, 0x00, 0x00, 0x0e,
-   0xe0, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x07, 0x00, 0x00, 0x80, 0x07,
-   0x80, 0x07, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x1f, 0x00, 0x00, 0xf0, 0x01,
-   0x00, 0x3e, 0x00, 0x00, 0xf8, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x7f, 0x00,
-   0x00, 0xf0, 0x0f, 0xe0, 0x1f, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x07, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00};
diff --git a/ext/tk/sample/images/pattern.xbm b/ext/tk/sample/images/pattern.xbm
deleted file mode 100644
index df31baf789..0000000000
--- a/ext/tk/sample/images/pattern.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define foo_width 16
-#define foo_height 16
-static char foo_bits[] = {
-   0x60, 0x06, 0x90, 0x09, 0x90, 0x09, 0xb0, 0x0d, 0x4e, 0x72, 0x49, 0x92,
-   0x71, 0x8e, 0x8e, 0x71, 0x8e, 0x71, 0x71, 0x8e, 0x49, 0x92, 0x4e, 0x72,
-   0xb0, 0x0d, 0x90, 0x09, 0x90, 0x09, 0x60, 0x06};
diff --git a/ext/tk/sample/images/tcllogo.gif b/ext/tk/sample/images/tcllogo.gif
deleted file mode 100644
index 4603d4ff41..0000000000
--- a/ext/tk/sample/images/tcllogo.gif
+++ /dev/null
diff --git a/ext/tk/sample/images/teapot.ppm b/ext/tk/sample/images/teapot.ppm
deleted file mode 100644
index b8ab85f3a5..0000000000
--- a/ext/tk/sample/images/teapot.ppm
+++ /dev/null
@@ -1,31 +0,0 @@
-P6
-256 256
-255
-\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�[7 eOLjQLmSMoTMnSMlRMhPL_9 \�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�nSMtVMzYN~[N~[N\N\O�\O�]O�]O�]O�]O�\O�\O}[NyYNtVM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�G-wXN}[N�]O�^O�_O�`O�`O�`O�`O�aO�aO�aO�aO�aO�aO�aO�aO�`O�_O�^O\N\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�aMLyYN�_O�aP�bP�cP�cP�dP�dP�dP�dP�dP�dP�dP�dP�dP�eP�eP�eP�eP�eP�dP�cP�_OpUM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�wXN�_O�dP�fP�gQ�hQ�hQ�iQ�iQ�iQ�iQ�iQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�iQ�fP�`O\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJiQL�bP�hQ�kQ�mR�nR�oR�oR�oR�oR�oR�oR�oR�oR�pR�pS�qS�qS�rS�rS�rS�qS�oR�jQ�]O\KK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�fOLrUM�cP�lR�qS�tS�uT�wT�xT�xT�yT�yT�zT�zU�zU�zU�zU�zU�yT�xT�wT�tS�mR�aOhPL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�a0	cNLqUM�\O�fQ�pS�wV�zV�|V�}V�V�VǀVɂW̅[Տe�w���ꪅĈg�qT�fQ{ZNYIK9\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�O1{G#�JkRMqUMtVN�iS�v\��d��b�zZ�vU�uT�sS�qS�nR�jQ�eP�^OrUM�Hh>!T4\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�G-V5wE"~I#�M%�U+�e7�l:�g2�b*�a(�`(�^(�])�^-�]1�S,qC$`9 R3G-\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�@)J/i>!pA"tD"wF$yH&xH&tE$wE#yG%}M+�T4S5mE*Z7!K/B*;'\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��aO�oR�{UǀVυX<(F-a: e<!h>!j@#k@$h>"d<!c=$hD-fF2[<)K0@);'5$˂VǀV�|U_LKYIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��_O�xTɂW����֒k�|X�>�f-�^(�Z'�W&�T&�N>)F-J/b; g>#nD(jB&c<!b=%jH2_A/I0!<(8&5$�J�Y�S%8&;'?)E,<:HA=HE?IJAISFJYIKXIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��nR�}Uܘqʊe�vU�e,�V&�V�C
-�@|>y<u:r9o7l6
-j5
-h4
-g3
-5$D,K/b; h>"wM1tK.e="a<#cA,U8&E-<(9&.!a0	b1	c1				
-
-+3#@)46G<:HMCIXHK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�U*�vT�~X�{Y�k+�W&�N$|>u:p8k5
-f3
-a0	_/	].	[-	�I�\*�_(�LkRMmSMmSMnSMnSMD,R3W5mA"|O0|P1j?"c<!a=%Y7"N1F,;'NCJNCJNDJODJODJODJh>!a: X/K%
-g3
-a0	Z-	\/T*Q(�H�m8kRMmSMnTMoTMpTMpUM15G15G05G04G04GpUMpTM5^9 d<!yF#�O+�N,rC#qB"pB#k?"a: Z7 6ODJPDJPEJQEJQEJREJREJREJRFJSFJSFJSFJSFJe<!X/
-^/	V+Q(L&I$r9�TlRMnSM46G47G47G46G46G46G46G46G36G36G25G25G15G04G/4F.3F
-
-�X&pUMuWMwXNxXN<:H<:H<:H<:H<;H<;H<;H<;H=;H=;H=;H=;H>;H>;H?<H@<HA=HC>HG@ILBIREJ[JKcNLjQL�pR�uT�zU�~VȁW˂X֎c�sҎe�{V�vT�pS�kR�gQ�bP�_O�^O�]O�\O�\O�\O�\O�]O�]O�]O�]O�]O�]O�]O�]O�]O�]O�]O�\O�\O~\N}[N|ZNxXN�T%H$
-�W&rVMvWNyYNzYN|ZN}[N}[N><H?<H?<H?<H?<H?<H@<H@<H@<HA=HA=HB=HC>HE?IG@IIAIKBIODJSFJWHK�hQ�lR�pR�b(�i*�n+�|7�|6�r,�q+�p-�l+�g)�b(�sS�pS�lR�iQ�gQ�eP�cP�aP�aO�`O�`O�_O�_O�_O�_O�_O�_O�_O�_O�_O�_O�^O�^O�^O�^O�]O�]O�\O~[N{ZN�T%
-
-	
-@%<-$G?@�pfdNLuWM\NdNL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�TFJvWN�aP./01�E}[N�]O�_O�`O�aP�bP�bP�cP�cP�cP�dP�dP�dP�eP�eP�eP�eP�fP�fQ�fQ�gQ�gQ�gQ�hQ�hQ�hQ�iQ�iQ�jQ�jQ�kQ�kR�lR�lR�Y&�\'�^'�^�b�c�e�i �g�c�b�a�`�^�]�X�['�Z'�Y&�mR�mR�mR�lR�lR�lR�kR�kQ�kQ�jQ�jQ�jQ�iQ�iQ�iQ�iQ�hQ�hQ�hQ�hQ�gQ�gQ�gQ�gQ�gQ�fQ�fQ�fQ�fP�eP�eP�dP�cP�aP�O
- B\�\�\�\�\�\�\�\�\�\�%7!!C*F#P){dY�ze��p�\OgPL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ`LKvWN�aPm6
-
-$5 �`(�e)�nR�jQ�^OJAI\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�XIK^KKdNLhPLuWM�]O�bP�fQ�eP
-m6
-�`O�cP�fQ�hQ�hQ�iQ�iQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�kQ�kQ�kQ�kR�kR�kR�kR�lR�lR�lR�lR�lR�lR�lR�mR�mR�mR�mR�g)�c(�c(�b(�V�c�e�i!�i!�d�b�`�`�_�_�^�Q�]'�_(�`(�f)�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�mR�mR�mR�mR�mR�mR�mR�mR�mR�nR�mR�mR�nR�mR�mR�mR�mR�kR�hQ�Ga0	�bP�mR�jQ�fQ�aP}[NrUMmSM�L$\�\�\�\�\�\�\�\� B B
-#C, 8&H.Z7 �pR�jQ{ZN\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�QEJ[JK`LKdNLhQLqUM{ZN�_O�cP�gQ�hQ
-�bP�eP�hQ�iQ�jQ�jQ�kQ�kQ�kR�kR�kR�lR�lR�lR�lR�lR�lR�lR�lR�lR�lR�mR�mR�mR�mR�mR�mR�mR�mR�mR�nR�nR�j*�g)�e)�d)�d�X�g�h�e�c�b�b�b�U�`(�a(�a(�c(�i*�oR�oR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�nR�mR�jQ�Q%Z-	�jQ�nR�lR�hQ�dP�_OuWMpTMnSMkRLa: \�\�\�\�\�\�\� B B&D2
-@*S6#G@IPDJ�hQmSM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�VGJ]KKbMLeOLiQLlRMvWN\O�aO�eP�hQ�jQ�gQ
-!C+E'0F.4F7%8%U/lG.SFJZIK]KKZIKB=H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�REJZJK`LKdNLgPLjQLlRMnSMpTMqUMtWMxXN{ZN~[N�]O�^O�`O�aO�bP�dP�gQ�iQ�kQ�lR�nR�pS�rS�sS�tT�uT�vT�wT�xT�yT�yT�yT�yT�yT�xT�vT�rS�nR�hQ�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�}U�}U�}U�}U�}U�}U�}U�~U�~U�~V�~V�VŀWƁX�a(�lR�rS�vT�yT�zU�|U�~V�XƂ[Ɇ_΋dӑjԓmԓnБlʌhĆd��_�{[�vW�sU�pS�nR�kR�iQ�hQ�gQ�fQ�eP�dP�bP�aO�_O�^O�\O|ZNxXNsVMpTMnTMmSMjQL�C B)D&/F-3F47G6%>"Y7 kA$YIK]KK^KKSFJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�VGJ\KKbMLeOLhPLkRLmSMnTMpTMrUMuWNyYN|ZN\N�]O�_O�`O�aP�bP�cP�eP�fP�hQ�jQ�lR�nR�oS�qT�sT�uU�vU�wV�xV�yV�yU�zU�zU�{U�{U�{U�|U�|U�|U�|U�|U�{U�{U�{U�zU�zT�yT�yT�xT�wT�vT�vT�vT�vT�wT�wT�wT�xT�yT�zT�zU�{U�{U�|U�|U�}U�VŀWǂYɄ\͈_ьdٔl�u�|쩂ﬅ명榁ޟ{՗sˎld�^�yZ�uW�qU�oS�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�aP�`O�^O�]O}[NyYNuWMpTMoTMmSMkRLgPL&D#.E,3F46G;'<(D"iB(VGJ]KK`LK[JKB>H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJYIK^LKcNLfOLiQLkRMmSMoTMqUMsVMvXNzYN}[N�\O�^O�_O�`O�aP�cP�dP�eP�fQ�gQ�hQ�iQ�kR�mS�oT�rU�tW�wY�zZ�}\�]��^��^��^^\��Z�Y�X�~W�~W�~V�~V�~V�~V�~U�~U�~U�~U�U�U�V�V�V�V�VƀVƀVǀWǁWȂXɃZ˅[͇^ЊaӍdؒiܗn�t�z�����������������驅�~֘vˏmÇf��`�z[�vX�rU�pT�oS�nS�lR�kR�kR�jQ�iQ�hQ�fQ�eP�dP�cP�bP�`O�_O�]O~[NzYNvWNpTMoTMnSMkRMhQLo7,2F36G99HC+@ ]8 nA"\JK`ML_LKSFJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ[JK`LKdNLgPLjQLlRMnSMpTMqUMtVMwXNzZN}[N�]O�^O�_O�aO�bP�cP�dP�eP�fQ�gQ�hQ�iQ�jR�lR�mS�oU�rW�vZ�{]��a��fŊjˏnГqӕsՖsՖrՖqՔoӒmяjύg͊cˈaɆ^Ȅ\ǂ[ƁYŀXŀW�W�W�V�V�WŀWƀWǁXȂYɃ[ʅ\͇_ϊaҍeՑhٕmݙq�v�z�}꧀멃몄騃奀ߠ|ٛwӕȑmƉh��c�~^�yZ�vX�tW�sV�qU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fP�eP�cP�bP�aO�_O�^O\N{ZNwXNsVMoTMnSMlRMiQL~I#26G99G?<HA*E$	i@$ZIKaMLbML[JK;:H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�WHJ]KKbMLeOLhPLjRLlSMnTMpTMrUMuWMxXN{ZN~\N�]O�^O�`O�aO�bP�cP�dP�eP�fQ�gQ�hQ�iQ�kR�lS�mT�oU�rW�uZ�y]�~a��fl˒sԚzܡ�㧆諉뮋������묈訄�~ߞyڙt֕oҐjΌfˈbȅ_ƃ\ŁZĀY�X�W�~W�~W�~W�XÀXĀYŁZƃ\ǅ^Ɇ`ˈb̊d͋f΍gΎiΎjΎj͎jˌiǉgÆd��a�^�}]�|\�{[�yZ�xY�vX�tW�sV�qU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fP�eP�dP�bP�aO�_O�^O�\O|ZNxXNtVMpTMnSMmSMjQLgPL99G?<HG-E&b;!YIK`MLdOM`LKNCJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��lR�yT�~UʂXʃY�X�{W�tU�W'�[(�hQ�lR�cP�\OhQL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJYIK^LKcNLfOLiQLkRLmSMoTMqUMrVMvWNyYN|ZN\N�]O�_O�`O�aP�bP�cP�dP�fP�gQ�hQ�iQ�jR�kR�lS�nT�pU�sW�vZ�z]�b��glɑsИy؞ޤ�㩊譍챐ﳑﳑ뭊穅⣀ݞzؘtғn΍iɉdƅ`Â]��[�~Y�}X�|W�|V�{V�{V�{V�{V�{V�|W�|W�}X�}Y�~Z�~Z�~Z�}[�}[�}[�~\�~\�~]�~]�~]�~]�}]�|\�z[�yZ�wY�vX�tW�sV�rU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�aP�`O�^O�]O}[NyYNuWNpTMnTMmSMkRLhPL|H$D>IQ2P+XHK_LLfQOcNLXIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��qS�yT�~VΈ`遲ޜv��]�qS�L�G|>g3
-S)?*%.�hQ�hQ�eP�`OuWM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ[JK`LKdNLgPLjQLlRMnSMoTMqUMsVMwXNzYN}[N�\O�^O�_O�`O�aP�bP�dP�eP�fP�gQ�hQ�iQ�jR�kR�lS�nT�pV�sX�vZ�z^�b��gËmʒsјz؟�ޤ�㩊譍ꯏ및ꯎ謋娇ं۞|֙wѓq̎lǉgÅb��_�\�}Z�{X�zW�yV�yU�xU�xU�xT�xT�xU�xU�xU�yV�yV�yW�zW�{X�{Y�|Z�}[�}[�}\�~\�~]�~]�}]�|\�{\�z[�yZ�wY�vX�tW�sV�rU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�bP�`O�_O�]O~[NzZNvWNrUMoTMmSMlRMiQLeOLJAIJ(h>!]KKfQOgQN_LKD>I\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��iQ�tS�yT�{U�YΌeרּ���՗u�|\�Z'�L�D
-|>
-
-
-&3#.$-% .% .& /&!,#,#@70A71XNHXNHWNHWNHZRLYQLYQLXQLWQLWPLUOLSNLQMKOLJMJJ0//.-.,,-&(+"(!'			
-%' %$#" ! !$
-						
diff --git a/ext/tk/sample/irbtk.rb b/ext/tk/sample/irbtk.rb
deleted file mode 100644
index 70dd33e4da..0000000000
--- a/ext/tk/sample/irbtk.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/local/bin/ruby
-#
-#   irbtk.rb - irb with Ruby/Tk
-#
-#   If you want to use 'multi-tk.rb', give option '--multi-tk'.
-#   And if you want to use 'remote-tk.rb', give option '--remote-tk'.
-#   If you want both, you don't need to give both options, because
-#   'remote-tk.rb' includes 'multi-tk.rb'.
-#   ( There is no trouble even if you give both options. )
-#
-require 'remote-tk' if ARGV.delete('--remote-tk')
-require 'multi-tk'  if ARGV.delete('--multi-tk')
-
-require "tk"
-module Tk
-  MAINLOOP = Thread.new{ mainloop }
-end
-
-require "irb"
-
-if __FILE__ == $0
-  IRB.start(__FILE__)
-else
-  # check -e option
-  if /^-e$/ =~ $0
-    IRB.start(__FILE__)
-  else
-    IRB.setup(__FILE__)
-  end
-end
diff --git a/ext/tk/sample/irbtkw.rbw b/ext/tk/sample/irbtkw.rbw
deleted file mode 100644
index b75ebca48d..0000000000
--- a/ext/tk/sample/irbtkw.rbw
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  irbtkw.rb : IRB console with Ruby/Tk
-#
-#                                 by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-release = '2008/03/08'
-
-require 'tk'
-begin
-  require 'tktextio'
-rescue LoadError
-  require File.join(File.dirname(File.expand_path(__FILE__)), 'tktextio.rb')
-end
-
-require 'irb'
-
-if TkCore::WITH_ENCODING
-else
-  # $KCODE setup
-  case Tk.encoding
-  when 'shiftjis', 'cp932'
-    $KCODE='SJIS'
-  when 'euc-jp'
-    $KCODE='EUC'
-  when 'utf-8', 'unicode'
-    $KCODE='UTF8'
-  else
-    # unknown
-  end
-end
-
-# console setup
-top = TkToplevel.new(:title=>'IRB console')
-top.protocol(:WM_DELETE_WINDOW){ Tk.exit }
-
-case (Tk.windowingsystem)
-when 'win32'
-  fnt = ['MS Gothic', '-12']
-else
-  fnt = ['courier', '-12']
-end
-
-console = TkTextIO.new(top, :mode=>:console,
-                       :width=>80).pack(:side=>:left,
-                                        :expand=>true, :fill=>:both)
-console.yscrollbar(TkScrollbar.new(top, :width=>10).pack(:before=>console,
-                                                         :side=>:right,
-                                                         :expand=>false,
-                                                         :fill=>:y))
-
-# save original I/O
-out = $stdout
-err = $stderr
-
-irb_thread = nil
-ev_loop = Thread.new{
-  begin
-    Tk.mainloop
-  ensure
-    $stdout = out
-    $stderr = err
-    irb_thread.kill if irb_thread
-  end
-}
-
-# window position control
-root = Tk.root
-
-r_x = root.winfo_rootx
-r_y = root.winfo_rooty
-r_w = root.winfo_width
-
-t_x = top.winfo_rootx
-t_y = top.winfo_rooty
-t_w = top.winfo_width
-
-delta = 10
-
-ratio = 0.8
-s_w = (ratio * root.winfo_screenwidth).to_i
-
-if r_x < t_x
-  r_x, t_x = t_x, r_x
-end
-if t_x + t_w + r_w + delta < s_w
-  r_x = t_x + t_w + delta
-elsif t_w + r_w + delta < s_w
-  r_x = s_w - r_w
-  t_x = r_x - t_w
-else
-  r_x = s_w - r_w
-  t_x = 0
-end
-
-root.geometry("+#{r_x}+#{r_y}")
-top.geometry("+#{t_x}+#{t_y}")
-
-root.raise
-console.focus
-
-# I/O setup
-$stdin  = console
-$stdout = console
-$stderr = console
-
-# dummy for rubyw.exe on Windows
-def STDIN.tty?
-  true
-end
-
-# IRB setup
-IRB.init_config(nil)
-IRB.conf[:USE_READLINE] = false
-IRB.init_error
-irb = IRB::Irb.new
-IRB.conf[:MAIN_CONTEXT] = irb.context
-
-class IRB::StdioInputMethod
-  def gets
-    prompt = "\n" << @prompt
-    $stdin.instance_eval{
-      flush
-      @prompt = prompt
-      _set_console_line
-      @prompt = nil
-      _see_pos
-    }
-
-    @line[@line_no += 1] = $stdin.gets
-  end
-end
-
-# IRB start
-$stdout.print("*** IRB console on Ruby/Tk (#{release})  ")
-irb_thread = Thread.new{
-  catch(:IRB_EXIT){
-    loop {
-      begin
-        irb.eval_input
-      rescue Exception
-      end
-    }
-  }
-}
-
-console.bind('Control-c'){
-  console.insert('end', "^C\n")
-  irb_thread.raise RubyLex::TerminateLineInput
-}
-
-irb_thread.join
-
-# exit
-ev_loop.kill
-Tk.exit
diff --git a/ext/tk/sample/iso2022-kr.txt b/ext/tk/sample/iso2022-kr.txt
deleted file mode 100644
index 2e3fe6ea2a..0000000000
--- a/ext/tk/sample/iso2022-kr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Sample text:
-$)C  Hangul (GQ1[)	>H3gGO<<?d, >H3gGO=J4O1n
diff --git a/ext/tk/sample/menubar1.rb b/ext/tk/sample/menubar1.rb
deleted file mode 100644
index a233c6e088..0000000000
--- a/ext/tk/sample/menubar1.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# menubar sample 1 : use frame and menubuttons
-#
-
-require 'tk'
-
-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, '', {:foreground=>'black'}],
-    ['Radio_Y', [radio_var, 'y'], 6],
-    ['Radio_Z', [radio_var, 'z'], 6],
-    '---',
-    ['cascade', [
-                   ['sss', proc{p 'sss'}, 0],
-                   ['ttt', proc{p 'ttt'}, 0],
-                   ['uuu', proc{p 'uuu'}, 0],
-                   ['vvv', proc{p 'vvv'}, 0],
-                ],
-      0, '',
-      {:font=>'Courier 16 italic',
-       :menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
-    '---',
-    ['Quit', proc{exit}, 0]],
-
-  [['Edit', 0],
-    ['Cut', proc{puts('Cut clicked')}, 2],
-    ['Copy', proc{puts('Copy clicked')}, 0],
-    ['Paste', proc{puts('Paste clicked')}, 0]],
-
-  [['Help', 0, {:menu_name=>'help'}],
-    ['About This', proc{puts('Ruby/Tk menubar sample 1')}, 6]]
-]
-
-menubar = TkMenubar.new(nil, menu_spec,
-                       'tearoff'=>false,
-                       'foreground'=>'grey40',
-                       'activeforeground'=>'red',
-                       'font'=>'Helvetia 12 bold')
-menubar.pack('side'=>'top', 'fill'=>'x')
-
-TkText.new(:wrap=>'word').pack.insert('1.0', 'Please read the sample source, and check how to override default configure options of menu entries on a menu_spec. Maybe, on windows, this menubar does not work properly about keyboard shortcuts. Then, please use "menu" option of root/toplevel widget (see sample/menubar2.rb).')
-
-Tk.mainloop
diff --git a/ext/tk/sample/menubar2.rb b/ext/tk/sample/menubar2.rb
deleted file mode 100644
index e3cd68eaef..0000000000
--- a/ext/tk/sample/menubar2.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# menubar sample 2 : use 'menu' option of root/toplevel widget
-#
-
-require 'tk'
-
-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, '', {:foreground=>'black'}],
-    ['Radio_Y', [radio_var, 'y'], 6],
-    ['Radio_Z', [radio_var, 'z'], 6],
-    '---',
-    ['cascade', [
-                   ['sss', proc{p 'sss'}, 0],
-                   ['ttt', proc{p 'ttt'}, 0],
-                   ['uuu', proc{p 'uuu'}, 0],
-                   ['vvv', proc{p 'vvv'}, 0],
-                ],
-      0, '',
-      {:font=>'Courier 16 italic',
-       :menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
-    '---',
-    ['Quit', proc{exit}, 0]],
-
-  [['Edit', 0],
-    ['Cut', proc{puts('Cut clicked')}, 2],
-    ['Copy', proc{puts('Copy clicked')}, 0],
-    ['Paste', proc{puts('Paste clicked')}, 0]],
-
-  [['Help', 0, {:menu_name=>'help'}],
-    ['About This', proc{puts('Ruby/Tk menubar sample 2')}, 6]]
-]
-
-mbar = Tk.root.add_menubar(menu_spec,
-                           # followings are default configure options
-                           'tearoff'=>'false',
-                           'foreground'=>'grey40',
-                           'activeforeground'=>'red',
-                           'font'=>'Helvetia 12 bold')
-# This (default configure options) is NOT same the following.
-#
-#  mbar = Tk.root.add_menubar(menu_spec)
-#  mbar.configure('foreground'=>'grey40', 'activeforeground'=>'red',
-#                 'font'=>'Helvetia 12 bold')
-
-TkText.new(:wrap=>'word').pack.insert('1.0', 'Please read the sample source, and check how to override default configure options of menu entries on a menu_spec.')
-
-Tk.mainloop
diff --git a/ext/tk/sample/menubar3.rb b/ext/tk/sample/menubar3.rb
deleted file mode 100644
index 4f42f81c88..0000000000
--- a/ext/tk/sample/menubar3.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# menubar sample 3 : vertical layout menubar; use frame and menubuttons
-#
-
-require 'tk'
-
-radio_var = TkVariable.new('y')
-
-menu_spec = [
-  [['&File', true], # when underline option is ture, '&' index is the position
-    {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
-    '---',
-    ['Check_A', TkVariable.new(true), 6],
-    {:type=>'checkbutton', :label=>'Check_B',
-                :variable=>TkVariable.new, :underline=>6},
-    '---',
-    ['Radio_X', [radio_var, 'x'], /[XYZ]/, '', {:foreground=>'black'}],
-    ['Radio_Y', [radio_var, 'y'], /[XYZ]/],
-    ['Radio_Z', [radio_var, 'z'], /[XYZ]/], # use Regexp for underline position
-    '---',
-    ['cascade', [
-                   ['sss', proc{p 'sss'}, 0],
-                   ['ttt', proc{p 'ttt'}, 0],
-                   ['uuu', proc{p 'uuu'}, 0],
-                   ['vvv', proc{p 'vvv'}, 0],
-                ],
-      0, '',
-      {:font=>'Courier 16 italic',
-       :menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
-    '---',
-    ['Quit', proc{exit}, 0]],
-
-  [['Edit', 0],
-    ['Cut', proc{puts('Cut clicked')}, 2],
-    ['Copy', proc{puts('Copy clicked')}, 0],
-    ['Paste', proc{puts('Paste clicked')}, 0]],
-
-  [['Help', 0, {:menu_name=>'help'}],
-    ['About This', proc{puts('Ruby/Tk menubar sample 3')}, "This"]]
-                                      # use string index for underline position
-]
-
-layout_proc = 'vertical'
-# The following procedure is same to 'layout_proc'=>'vertical'
-=begin
-layout_proc = proc{|parent, mbtn|
-  mbtn.direction :right
-  mbtn.pack(:side=>:top, :fill=>:x)
-
-  menu = mbtn.menu
-  cmd = proc{|m, dir|
-    Tk::Menu::TkInternalFunction.next_menu(m, dir) rescue nil
-    # ignore error when the internal function doesn't exist
-  }
-  menu.bind('Tab', cmd, :widget, 'forward')
-  menu.bind('Alt-Tab', cmd, :widget, 'backward')
-}
-=end
-
-menubar = TkMenubar.new(nil, menu_spec,
-                        'layout_proc'=>layout_proc,
-                        'tearoff'=>false,
-                        'foreground'=>'grey40',
-                        'activeforeground'=>'red',
-                        'font'=>'Helvetia 12 bold')
-menubar.pack('side'=>'left', 'fill'=>'y')
-
-TkText.new(:wrap=>'word').pack.insert('1.0', 'This sample script generates "Menu Sidebar".
-If "::tk::MenuNextMenuon" function is available  your Tcl/Tk library, you will be able to move to the next menu by Tab key on the posted menu, or the previous menu by Alt + Tab key.
-Please read the sample source, and check how to override default configure options of menu entries on a menu_spec. Maybe, on windows, this menubar does not work properly about keyboard shortcuts. Then, please use "menu" option of root/toplevel widget (see sample/menubar3.rb).')
-
-Tk.mainloop
diff --git a/ext/tk/sample/msgs_rb/README b/ext/tk/sample/msgs_rb/README
deleted file mode 100644
index 781dda93ef..0000000000
--- a/ext/tk/sample/msgs_rb/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Message catalogs in this directory depend on Tcl/Tk's message catalogs.
-Texts of each locale are copied from Tcl/Tk8.5a1 widget demos.
-Please refer to '../msgs_tk/README'.
diff --git a/ext/tk/sample/msgs_rb/cs.msg b/ext/tk/sample/msgs_rb/cs.msg
deleted file mode 100644
index 199f2a73bd..0000000000
--- a/ext/tk/sample/msgs_rb/cs.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    cs "Application Error", "Chyba programu"
-    cs "Blue", "Modr\341"
-    cs "Color", "Barva"
-    cs "Delete", "Smazat"
-    cs "Error", "Chyba"
-    cs "Exit", "Konec"
-    cs "Green", "Zelen\341"
-    cs "Red", "\\u010cerven\341"
-    cs "blue", "modr\341"
-    cs "green", "zelen\341"
-    cs "red", "\\u010derven\341"
-}
-
-TkMsgCatalog.new('::tk') {
-    cs "&Abort", "&P\\u0159eru\\u0161it"
-    cs "About...", "O programu..."
-    cs "All Files", "V\\u0161echny soubory"
-    cs "Application Error", "Chyba programu"
-    cs "&Blue", "&Modr\341"
-    cs "&Cancel", "&Zru\\u0161it"
-    cs "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Nemohu zm\\u011bnit atku\341ln\355 adres\341\\u0159 na \"%1\$s\".\nP\\u0159\355stup odm\355tnut."
-    cs "Choose Directory", "V\375b\\u011br adres\341\\u0159e"
-    cs "Clear", "Smazat"
-    cs "Color", "Barva"
-    cs "Console", "Konzole"
-    cs "Copy", "Kop\355rovat"
-    cs "Cut", "Vy\\u0159\355znout"
-    cs "Delete", "Smazat"
-    cs "Details >>", "Detaily >>"
-    cs "Directory \"%1\$s\" does not exist.", "Adres\341\\u0159 \"%1\$s\" neexistuje."
-    cs "&Directory:", "&Adres\341\\u0159:"
-    cs "Error: %1\$s", "Chyba: %1\$s"
-    cs "Exit", "Konec"
-    cs "File \"%1\$s\" already exists.\n\n", "Soubor \"%1\$s\" ji\\u017e existuje.\n\n"
-    cs "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Soubor \"%1\$s\" ji\\u017e existuje.\nChcete jej p\\u0159epsat?"
-    cs "File \"%1\$s\" does not exist.", "Soubor \"%1\$s\" neexistuje."
-    cs "File &name:", "&Jm\351no souboru:"
-    cs "File &names:", "&Jm\351na soubor\\u016f:"
-    cs "Files of &type:", "&Typy soubor\\u016f:"
-    cs "Fi&les:", "Sou&bory:"
-    cs "&Filter", "&Filtr"
-    cs "Fil&ter:", "Fil&tr:"
-    cs "&Green", "Ze&len\341"
-    cs "Hi"
-    cs "Hide Console", "Skr\375t konsolu"
-    cs "&Ignore", "&Ignorovat"
-    cs "Invalid file name \"%1\$s\".", "\\u0160patn\351 jm\351no souboru \"%1\$s\"."
-    cs "Log Files", "Log soubory"
-    cs "&No", "&Ne"
-    cs "&OK"
-    cs "Ok"
-    cs "Open", "Otev\\u0159\355t"
-    cs "&Open", "&Otev\\u0159\355t"
-    cs "Open Multiple Files", "Otev\\u0159\355t v\355ce soubor\\u016f"
-    cs "Paste", "Vlo\\u017eit"
-    cs "Quit", "Skon\\u010dit"
-    cs "&Red", " \\u010ce&rven\341"
-    cs "Replace existing file?", "Nahradit st\341vaj\355c\355 soubor?"
-    cs "&Retry", "Z&novu"
-    cs "&Save", "&Ulo\\u017eit"
-    cs "Save As", "Ulo\\u017eit jako"
-    cs "Save To Log", "Ulo\\u017eit do logu"
-    cs "Select Log File", "Vybrat log soubor"
-    cs "Select a file to source", "Vybrat soubor k nahr\341n\355"
-    cs "&Selection:", "&V\375b\\u011br:"
-    cs "Skip Messages", "P\\u0159esko\\u010dit zpr\341vy"
-    cs "Source...", "Nahr\341t..."
-    cs "Tcl Scripts", "Tcl skripty"
-    cs "Tcl for Windows", "Tcl pro Windows"
-    cs "Text Files", "Textov\351 soubory"
-    cs "&Yes", "&Ano"
-    cs "abort", "p\\u0159eru\\u0161it"
-    cs "blue", "modr\341"
-    cs "cancel", "zru\\u0161it"
-    cs "extension", "p\\u0159\355pona"
-    cs "extensions", "p\\u0159\355pony"
-    cs "green", "zelen\341"
-    cs "ignore", "ignorovat"
-    cs "ok"
-    cs "red", "\\u010derven\341"
-    cs "retry", "znovu"
-    cs "yes", "ano"
-}
diff --git a/ext/tk/sample/msgs_rb/de.msg b/ext/tk/sample/msgs_rb/de.msg
deleted file mode 100644
index 283874df42..0000000000
--- a/ext/tk/sample/msgs_rb/de.msg
+++ /dev/null
@@ -1,88 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    de "Application Error", "Applikationsfehler"
-    de "Blue", "Blau"
-    de "Color", "Farbe"
-    de "Delete", "L\\u00f6schen"
-    de "Error", "Fehler"
-    de "Exit", "Ende"
-    de "Green", "Gr\\u00fcn"
-    de "Red", "Rot"
-    de "blue", "blau"
-    de "green", "gr\\u00fcn"
-    de "red", "rot"
-}
-
-TkMsgCatalog.new('::tk') {
-    de "&Abort", "&Abbruch"
-    de "&About...", "&\\u00dcber..."
-    de "All Files", "Alle Dateien"
-    de "Application Error", "Applikationsfehler"
-    de "&Blue", "&Blau"
-    de "&Cancel", "&Abbruch"
-    de "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Kann nicht in das Verzeichnis \"%1\$s\" wechseln.\nKeine Rechte vorhanden."
-    de "Choose Directory", "W\\u00e4hle Verzeichnis"
-    de "&Clear", "&R\\u00fccksetzen"
-    de "&Clear Console", "&Konsole l\\u00f6schen"
-    de "Color", "Farbe"
-    de "Console", "Konsole"
-    de "&Copy", "&Kopieren"
-    de "Cu&t", "Aus&schneiden"
-    de "&Delete", "&L\\u00f6schen"
-    de "Details >>"
-    de "Directory \"%1\$s\" does not exist.", "Das Verzeichnis \"%1\$s\" existiert nicht."
-    de "&Directory:", "&Verzeichnis:"
-    de "&Edit", "&Bearbieten"
-    de "Error: %1\$s", "Fehler: %1\$s"
-    de "E&xit", "&Ende"
-    de "&File", "&Datei"
-    de "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Die Datei \"%1\$s\" ist bereits vorhanden.\nWollen sie diese Datei \\u00fcberschreiben ?"
-    de "File \"%1\$s\" already exists.\n\n", "Die Datei \"%1\$s\" ist bereits vorhanden.\n\n"
-    de "File \"%1\$s\" does not exist.", "Die Datei \"%1\$s\" existiert nicht."
-    de "File &name:", "Datei&name:"
-    de "File &names:", "Datei&namen:"
-    de "Files of &type:", "Dateien des &Typs:"
-    de "Fi&les:", "Dat&eien:"
-    de "&Filter"
-    de "Fil&ter:"
-    de "&Green", "&Gr\\u00fcn"
-    de "&Help", "&Hilfe"
-    de "Hi", "Hallo"
-    de "&Hide Console", "&Konsole unsichtbar machen"
-    de "&Ignore", "&Ignorieren"
-    de "Invalid file name \"%1\$s\".", "Ung\\u00fcltiger Dateiname \"%1\$s\"."
-    de "Log Files", "Protokolldatei"
-    de "&No", "&Nein"
-    de "OK"
-    de "Ok"
-    de "Open", "\\u00d6ffnen"
-    de "&Open", "\\u00d6&ffnen"
-    de "Open Multiple Files"
-    de "P&aste", "E&inf\\u00fcgen"
-    de "&Quit", "&Beenden"
-    de "&Red", "&Rot"
-    de "Replace existing file?", "Existierende Datei ersetzen?"
-    de "&Retry", "&Wiederholen"
-    de "&Save", "&Speichern"
-    de "Save As", "Speichern unter"
-    de "Save To Log", "In Protokoll speichern"
-    de "Select Log File", "Protokolldatei ausw\\u00e4hlen"
-    de "Select a file to source", "Auszuf\\u00fchrende Datei ausw\\u00e4hlen"
-    de "&Selection:", "Auswah&l:"
-    de "Skip Messages", "Weitere Nachrichten \\u00fcberspringen"
-    de "&Source...", "&Ausf\\u00fchren..."
-    de "Tcl Scripts", "Tcl-Skripte"
-    de "Tcl for Windows", "Tcl f\\u00fcr Windows"
-    de "Text Files", "Textdateien"
-    de "&Yes", "&Ja"
-    de "abort", "abbrechen"
-    de "blue", "blau"
-    de "cancel", "abbrechen"
-    de "extension", "Erweiterung"
-    de "extensions", "Erweiterungen"
-    de "green", "gr\\u00fcn"
-    de "ignore", "ignorieren"
-    de "ok"
-    de "red", "rot"
-    de "retry", "wiederholen"
-    de "yes", "ja"
-}
diff --git a/ext/tk/sample/msgs_rb/el.msg b/ext/tk/sample/msgs_rb/el.msg
deleted file mode 100644
index f314ae03eb..0000000000
--- a/ext/tk/sample/msgs_rb/el.msg
+++ /dev/null
@@ -1,98 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    el 'Application Error',  '\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2'
-    el 'Blue',     '\u039c\u03c0\u03bb\u03b5'
-    el 'Color',    '\u03a7\u03c1\u03ce\u03bc\u03b1'
-    el 'Delete',   '\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae'
-    el 'Error',    '\u039b\u03ac\u03b8\u03bf\u03c2'
-    el 'Exit',     '\u0388\u03be\u03bf\u03b4\u03bf\u03c2'
-    el 'Green',    '\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf'
-    el 'Red',      '\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf'
-    el 'blue',     '\u03bc\u03c0\u03bb\u03b5'
-    el 'green',    '\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf'
-    el 'red',      '\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf'
-}
-
-TkMsgCatalog.new('::tk') {
-    el '&Abort',             '\u03a4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2'
-    el 'About...',           '\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac...'
-    el 'All Files',          '\u038c\u03bb\u03b1 \u03c4\u03b1 \u0391\u03c1\u03c7\u03b5\u03af\u03b1'
-    el 'Application Error',  '\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2'
-    el '&Blue',              '\u039c\u03c0\u03bb\u03b5'
-    el '&Cancel',            '\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7'
-    el 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.', \
-          '\u0394\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03ba\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5 \u03c3\u03b5 "%1\$s".' \
-          "\n" \
-          '\u0397 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03b4\u03b5\u03bd \u03b5\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9.'
-    el 'Choose Directory',   '\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u039a\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5'
-    el 'Clear',              '\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2'
-    el 'Color',              '\u03a7\u03c1\u03ce\u03bc\u03b1'
-    el 'Console',            '\u039a\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1'
-    el 'Copy',               '\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae'
-    el 'Cut',                '\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae'
-    el 'Delete',             '\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae'
-    el 'Details >>',         '\u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03ad\u03c1\u03b5\u03b9\u03b5\u03c2 >>'
-    el 'Directory "%1\$s", does not exist.', \
-          '\u039f \u03ba\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2 \'%1\$s\' \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.'
-    el '&Directory:',        '&\u039a\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2:'
-    el 'Error: %1\$s',       '\u039b\u03ac\u03b8\u03bf\u03c2: %1\$s'
-    el 'Exit',               '\u0388\u03be\u03bf\u03b4\u03bf\u03c2'
-    el 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?', \
-          '\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf "%1\$s" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.' \
-          "\n" \
-          '\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03c0\u03b9\u03ba\u03b1\u03bb\u03c5\u03c6\u03b8\u03b5\u03af;'
-    el 'File "%1\$s" already exists.' "\n\n",  \
-          '\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf "%1\$s" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.' "\n\n"
-    el 'File "%1\$s" does not exist.', \
-          '\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf "%1\$s" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.'
-    el 'File &name:',        '\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5:'
-    el 'File &names:',       '\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd:'
-    el 'Files of &type:',    '\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u03c4\u03bf\u03c5 &\u03c4\u03cd\u03c0\u03bf\u03c5:'
-    el 'Fi&les:',            '\u0391\u03c1\u03c7\u03b5\u03af\u03b1:'
-    el '&Filter',            '\u03a6\u03af\u03bb\u03c4\u03c1\u03bf'
-    el 'Fil&ter:',           '\u03a6\u03af\u03bb\u03c4\u03c1\u03bf:'
-    el '&Green',             '\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf'
-    el 'Hi',                 '\u0393\u03b5\u03b9\u03b1'
-    el 'Hide Console',       '\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03ba\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1\u03c2'
-    el '&Ignore',            '\u0391\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7'
-    el 'Invalid file name "%1\$s".', \
-          '\u0386\u03ba\u03c5\u03c1\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 "%1\$s".'
-    el 'Log Files',          '\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2'
-    el '&No',                '\u038c\u03c7\u03b9'
-    el '&OK',                '\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9'
-    el '&Ok',                '\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9'
-    el 'Open',               '\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1'
-    el '&Open',              '\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1'
-    el 'Open Multiple Files', \
-          '\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1 \u03c0\u03bf\u03bb\u03bb\u03b1\u03c0\u03bb\u03ce\u03bd \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd'
-    el 'Paste',              '\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7'
-    el 'Quit',               '\u0388\u03be\u03bf\u03b4\u03bf\u03c2'
-    el '&Red',               '\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf'
-    el 'Replace existing file?', \
-          '\u0395\u03c0\u03b9\u03ba\u03ac\u03bb\u03c5\u03c8\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03bd\u03c4\u03bf\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5;'
-    el '&Retry',             '\u03a0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac'
-    el '&Save',              '\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7'
-    el 'Save As',            '\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03b1\u03bd'
-    el 'Save To Log',        '\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03c4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2'
-    el 'Select Log File',    '\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2'
-    el 'Select a file to source', \
-          '\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03b3\u03b9\u03b1 \u03b5\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7'
-    el '&Selection:',        '\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae:'
-    el 'Skip Messages',      '\u0391\u03c0\u03bf\u03c6\u03c5\u03b3\u03ae \u03bc\u03c5\u03bd\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd'
-    el 'Source...',          '\u0395\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7...'
-    el 'Tcl Scripts',        'Tcl Scripts'
-    el 'Tcl for Windows',    'Tcl \u03b3\u03b9\u03b1 Windows'
-    el 'Text Files',         '\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5'
-    el '&Yes',               '\u039d\u03b1\u03b9'
-    el 'abort',              '\u03c4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2'
-    el 'blue',               '\u03bc\u03c0\u03bb\u03b5'
-    el 'cancel',             '\u03b1\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7'
-    el 'extension',          '\u03b5\u03c0\u03ad\u03ba\u03c4\u03b1\u03c3\u03b7'
-    el 'extensions',         '\u03b5\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2'
-    el 'green',              '\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf'
-    el 'ignore',             '\u03b1\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7'
-    el 'ok',                 '\u03b5\u03bd\u03c4\u03ac\u03be\u03b5\u03b9'
-    el 'red',                '\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf'
-    el 'retry',              '\u03c0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac'
-    el 'yes',                '\u03bd\u03b1\u03b9'
-}
-
diff --git a/ext/tk/sample/msgs_rb/en.msg b/ext/tk/sample/msgs_rb/en.msg
deleted file mode 100644
index 9b70239511..0000000000
--- a/ext/tk/sample/msgs_rb/en.msg
+++ /dev/null
@@ -1,83 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    en "Application Error"
-    en "Blue"
-    en "Color"
-    en "Delete"
-    en "Error"
-    en "Green"
-    en "Red"
-    en "blue"
-    en "green"
-    en "red"
-}
-
-TkMsgCatalog.new('::tk') {
-    en "&Abort"
-    en "About..."
-    en "All Files"
-    en "Application Error"
-    en "&Blue"
-    en "&Cancel"
-    en "Cannot change to the directory \"%1\$s\".\nPermission denied."
-    en "Choose Directory"
-    en "Clear"
-    en "Color"
-    en "Console"
-    en "Copy"
-    en "Cut"
-    en "Delete"
-    en "Details >>"
-    en "Directory \"%1\$s\" does not exist."
-    en "&Directory:"
-    en "Error: %1\$s"
-    en "Exit"
-    en "File \"%1\$s\" already exists.\nDo you want to overwrite it?"
-    en "File \"%1\$s\" already exists.\n\n"
-    en "File \"%1\$s\" does not exist."
-    en "File &name:"
-    en "File &names:"
-    en "Files of &type:"
-    en "Fi&les:"
-    en "&Filter"
-    en "Fil&ter:"
-    en "&Green"
-    en "Hi"
-    en "Hide Console"
-    en "&Ignore"
-    en "Invalid file name \"%1\$s\"."
-    en "Log Files"
-    en "&No"
-    en "&OK"
-    en "Ok"
-    en "Open"
-    en "&Open"
-    en "Open Multiple Files"
-    en "Paste"
-    en "Quit"
-    en "&Red"
-    en "Replace existing file?"
-    en "&Retry"
-    en "&Save"
-    en "Save As"
-    en "Save To Log"
-    en "Select Log File"
-    en "Select a file to source"
-    en "&Selection:"
-    en "Skip Messages"
-    en "Source..."
-    en "Tcl Scripts"
-    en "Tcl for Windows"
-    en "Text Files"
-    en "&Yes"
-    en "abort"
-    en "blue"
-    en "cancel"
-    en "extension"
-    en "extensions"
-    en "green"
-    en "ignore"
-    en "ok"
-    en "red"
-    en "retry"
-    en "yes"
-}
diff --git a/ext/tk/sample/msgs_rb/en_gb.msg b/ext/tk/sample/msgs_rb/en_gb.msg
deleted file mode 100644
index 97c58959b1..0000000000
--- a/ext/tk/sample/msgs_rb/en_gb.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    en_gb 'Color', 'Colour'
-}
-
-TkMsgCatalog.new('::tk') {
-    en_gb 'Color', 'Colour'
-}
diff --git a/ext/tk/sample/msgs_rb/eo.msg b/ext/tk/sample/msgs_rb/eo.msg
deleted file mode 100644
index 1630df5e83..0000000000
--- a/ext/tk/sample/msgs_rb/eo.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    eo 'Application Error', 'Aplikoerraro'
-    eo 'Blue', 'Blua'
-    eo 'Color', 'Farbo'
-    eo 'Delete', 'Forprenu'
-    eo 'Error', 'Eraro'
-    eo 'Exit', 'Eliru'
-    eo 'Green', 'Verda'
-    eo 'Red', 'Rosa'
-    eo 'blue', 'blua'
-    eo 'green', 'verda'
-    eo 'red', 'ru\u011da'
-}
-
-TkMsgCatalog.new('::tk') {
-    eo '&Abort', '&\u0108esigo'
-    eo '&About...', 'Pri...'
-    eo 'All Files', '\u0108ioj dosieroj'
-    eo 'Application Error', 'Aplikoerraro'
-    eo '&Blue', '&Blua'
-    eo '&Cancel', '&Rezignu'
-    eo 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.', 'Neeble \u0109angi al dosierulon "%1\$s".' "\n" 'Vi ne rajtas tion.'
-    eo 'Choose Directory', 'Elektu Dosierujo'
-    eo '&Clear', '&Klaru'
-    eo '&Clear Console', '&Klaru konzolon'
-    eo 'Color', 'Farbo'
-    eo 'Console', 'Konzolo'
-    eo '&Copy', '&Kopiu'
-    eo 'Cu&t', '&Enpo\u015digu'
-    eo '&Delete', '&Forprenu'
-    eo 'Details >>', 'Detaloj >>'
-    eo 'Directory "%1\$s" does not exist.', 'La dosierujo "%1\$s" ne ekzistas.'
-    eo '&Directory:', '&Dosierujo:'
-    eo '&Edit', '&Redaktu'
-    eo 'Error: %1\$s', 'Eraro: %1\$s'
-    eo 'E&xit', '&Eliru'
-    eo '&File', '&Dosiero'
-    eo 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?', 'La dosiero "%1\$s" jam ekzistas.' "\n" '\u0108u vi volas anstata\u00fbigi la dosieron?'
-    eo 'File "%1\$s" already exists.' "\n\n", 'La dosiero "%1\$s" jam egzistas.' "\n\n"
-    eo 'File "%1\$s" does not exist.', 'La dosierp "%1\$s" ne estas.'
-    eo 'File &name:', 'Dosiero&nomo:'
-    eo 'File &names:', 'Dosiero&nomoj:'
-    eo 'Files of &type:', 'Dosieroj de &Typo:'
-    eo 'Fi&les:', 'Do&sieroj:'
-    eo '&Filter', '&Filtrilo'
-    eo 'Fil&ter:', '&Filtrilo:'
-    eo '&Green', '&Verda'
-    eo '&Help', '&Helpu'
-    eo 'Hi', 'Saluton'
-    eo '&Hide Console', '&Ka\u015du konzolon'
-    eo '&Ignore', '&Ignoru'
-    eo 'Invalid file name "%1\$s".', 'Malvalida dosieronomo "%1\$s".'
-    eo 'Log Files', 'Protokolo'
-    eo '&No', '&Ne'
-    eo 'OK'
-    eo 'Ok'
-    eo 'Open', 'Malfermu'
-    eo '&Open', '&Malfermu'
-    eo 'Open Multiple Files', 'Melfermu multan dosierojn'
-    eo 'P&aste', '&Elpo\u015digi'
-    eo '&Quit', '&Finigu'
-    eo '&Red', '&Rosa'
-    eo 'Replace existing file?', '\u0108u anstata\u00fbu ekzistantan dosieron?'
-    eo '&Retry', '&Ripetu'
-    eo '&Save', '&Savu'
-    eo 'Save As', 'Savu kiel'
-    eo 'Save To Log', 'Savu en protokolon'
-    eo 'Select Log File', 'Elektu prokolodosieron'
-    eo 'Select a file to source', 'Elektu dosieron por interpreti'
-    eo '&Selection:', '&Elekto:'
-    eo 'Skip Messages', 'transsaltu pluajn mesa\u011dojn'
-    eo '&Source...', '&Fontoprogramo...'
-    eo 'Tcl Scripts', 'Tcl-skriptoj'
-    eo 'Tcl for Windows', 'Tcl por vindoso'
-    eo 'Text Files', 'Tekstodosierojn'
-    eo '&Yes', '&Jes'
-    eo 'abort', '\u0109esigo'
-    eo 'blue', 'blua'
-    eo 'cancel', 'rezignu'
-    eo 'extension', 'ekspansio'
-    eo 'extensions', 'ekspansioj'
-    eo 'green', 'verda'
-    eo 'ignore', 'ignorieren'
-    eo 'red', 'ru\u011da'
-    eo 'retry', 'ripetu'
-    eo 'yes', 'jes'
-}
diff --git a/ext/tk/sample/msgs_rb/es.msg b/ext/tk/sample/msgs_rb/es.msg
deleted file mode 100644
index 38ca28fb8f..0000000000
--- a/ext/tk/sample/msgs_rb/es.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    es "Application Error", "Error de la aplicaci\\u00f3n"
-    es "Blue", "Azul"
-    es "Color", "Color"
-    es "Delete", "Borrar"
-    es "Error", "Error"
-    es "Exit", "Salir"
-    es "Green", "Verde"
-    es "Red", "Rojo"
-    es "blue", "azul"
-    es "green", "verde"
-    es "red", "rojo"
-}
-
-TkMsgCatalog.new('::tk') {
-    es "&Abort", "&Abortar"
-    es "About...", "Acerca de ..."
-    es "All Files", "Todos los archivos"
-    es "Application Error", "Error de la aplicaci\\u00f3n"
-    es "&Blue", "&Azul"
-    es "&Cancel", "&Cancelar"
-    es "Cannot change to the directory \"%1\$s\".\nPermission denied.", "No es posible acceder al directorio \"%1\$s\".\nPermiso denegado."
-    es "Choose Directory", "Elegir directorio"
-    es "Clear", "Borrar"
-    es "Color", "Color"
-    es "Console", "Consola"
-    es "Copy", "Copiar"
-    es "Cut", "Cortar"
-    es "Delete", "Borrar"
-    es "Details >>", "Detalles >>"
-    es "Directory \"%1\$s\" does not exist.", "El directorio \"%1\$s\" no existe."
-    es "&Directory:", "&Directorio:"
-    es "Error: %1\$s", "Error: %1\$s"
-    es "Exit", "Salir"
-    es "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "El archivo \"%1\$s\" ya existe.\nDesea sobreescribirlo?"
-    es "File \"%1\$s\" already exists.\n\n", "El archivo \"%1\$s\" ya existe.\n\n"
-    es "File \"%1\$s\" does not exist.", "El archivo \"%1\$s\" no existe."
-    es "File &name:", "&Nombre de archivo:"
-    es "File &names:", "&Nombres de archivo:"
-    es "Files of &type:", "Archivos de &tipo:"
-    es "Fi&les:", "&Archivos:"
-    es "&Filter", "&Filtro"
-    es "Fil&ter:", "Fil&tro:"
-    es "&Green", "&Verde"
-    es "Hi", "Hola"
-    es "Hide Console", "Esconder la consola"
-    es "&Ignore", "&Ignorar"
-    es "Invalid file name \"%1\$s\".", "Nombre de archivo inv\\u00e1lido \"%1\$s\"."
-    es "Log Files", "Ficheros de traza"
-    es "&No", "&No"
-    es "&OK", "&OK"
-    es "Ok", "Ok"
-    es "Open", "Abrir"
-    es "&Open", "&Abrir"
-    es "Open Multiple Files", "Abrir m\\u00faltiples archivos"
-    es "Paste", "Pegar"
-    es "Quit", "Abandonar"
-    es "&Red", "&Rojo"
-    es "Replace existing file?", "Reemplazar el archivo existente?"
-    es "&Retry", "&Reintentar"
-    es "&Save", "&Salvar"
-    es "Save As", "Salvar como"
-    es "Save To Log", "Salvar al archivo de traza"
-    es "Select Log File", "Elegir un archivo de traza"
-    es "Select a file to source", "Seleccionar un archivo a evaluar"
-    es "&Selection:", "&Selecci\\u00f3n:"
-    es "Skip Messages", "Omitir los mensajes"
-    es "Source...", "Evaluar..."
-    es "Tcl Scripts", "Scripts Tcl"
-    es "Tcl for Windows", "Tcl para Windows"
-    es "Text Files", "Archivos de texto"
-    es "&Yes", "&S\\u00ed"
-    es "abort", "abortar"
-    es "blue", "azul"
-    es "cancel", "cancelar"
-    es "extension", "extensi\\u00f3n"
-    es "extensions", "extensiones"
-    es "green", "verde"
-    es "ignore", "ignorar"
-    es "ok", "ok"
-    es "red", "rojo"
-    es "retry", "reintentar"
-    es "yes", "s\\u00ed"
-}
diff --git a/ext/tk/sample/msgs_rb/fr.msg b/ext/tk/sample/msgs_rb/fr.msg
deleted file mode 100644
index ea85cf1a39..0000000000
--- a/ext/tk/sample/msgs_rb/fr.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    fr 'Application Error', "Erreur d'application"
-    fr 'Blue', 'Bleu'
-    fr 'Color', 'Couleur'
-    fr 'Delete', 'Effacer'
-    fr 'Error', 'Erreur'
-    fr 'Exit', 'Quitter'
-    fr 'Green', 'Vert'
-    fr 'Red', 'Rouge'
-    fr 'blue', 'bleu'
-    fr 'green', 'vert'
-    fr 'red', 'rouge'
-}
-
-TkMsgCatalog.new('::tk') {
-    fr '&Abort', '&Annuler'
-    fr 'About...', '\u00c0 propos...'
-    fr 'All Files', 'Tous les fichiers'
-    fr 'Application Error', "Erreur d'application"
-    fr '&Blue', '&Bleu'
-    fr '&Cancel', '&Annuler'
-    fr 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.', 'Impossible d\'acc\u00e9der au r\u00e9pertoire "%1\$s".' "\n" 'Permission refus\u00e9e.'
-    fr 'Choose Directory', 'Choisir r\u00e9pertoire'
-    fr 'Clear', 'Effacer'
-    fr 'Color', 'Couleur'
-    fr 'Console'
-    fr 'Copy', 'Copier'
-    fr 'Cut', 'Couper'
-    fr 'Delete', 'Effacer'
-    fr 'Details >>', 'D\u00e9tails >>'
-    fr 'Directory "%1\$s" does not exist.', 'Le r\u00e9pertoire "%1\$s" n\'existe pas.'
-    fr '&Directory:', '&R\u00e9pertoire:'
-    fr 'Error: %1\$s', 'Erreur: %1\$s'
-    fr 'Exit', 'Quitter'
-    fr 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?', 'Le fichier "%1\$s" existe d\u00e9j\u00e0.' "\n" 'Voulez-vous l\'\u00e9craser?'
-    fr 'File "%1\$s" already exists.' "\n\n", 'Le fichier "%1\$s" existe d\u00e9j\u00e0.' "\n\n"
-    fr 'File "%1\$s" does not exist.', 'Le fichier "%1\$s" n\'existe pas.'
-    fr 'File &name:', '&Nom de fichier:'
-    fr 'File &names:', '&Noms de fichiers:'
-    fr 'Files of &type:', '&Type de fichiers:'
-    fr 'Fi&les:', 'Fich&iers:'
-    fr '&Filter', '&Filtre'
-    fr 'Fil&ter:', 'Fil&tre:'
-    fr '&Green', '&Vert'
-    fr 'Hi', 'Salut'
-    fr 'Hide Console', 'Cacher la Console'
-    fr '&Ignore', '&Ignorer'
-    fr 'Invalid file name "%1\$s".', 'Nom de fichier invalide "%1\$s".'
-    fr 'Log Files', 'Fichiers de trace'
-    fr '&No', '&Non'
-    fr '&OK'
-    fr 'Ok'
-    fr 'Open', 'Ouvrir'
-    fr '&Open', '&Ouvrir'
-    fr 'Open Multiple Files', 'Ouvrir plusieurs fichiers'
-    fr 'Paste', 'Coller'
-    fr 'Quit', 'Quitter'
-    fr '&Red', '&Rouge'
-    fr 'Replace existing file?', 'Remplacer le fichier existant?'
-    fr '&Retry', '&R\u00e9-essayer'
-    fr '&Save', '&Sauvegarder'
-    fr 'Save As', 'Sauvegarder sous'
-    fr 'Save To Log', 'Sauvegarde au fichier de trace'
-    fr 'Select Log File', 'Choisir un fichier de trace'
-    fr 'Select a file to source', 'Choisir un fichier \u00e0 \u00e9valuer'
-    fr '&Selection:', '&S\u00e9lection:'
-    fr 'Skip Messages', 'Omettre les messages'
-    fr 'Source...', '\u00c9valuer...'
-    fr 'Tcl Scripts', 'Scripts Tcl'
-    fr 'Tcl for Windows', 'Tcl pour Windows'
-    fr 'Text Files', 'Fichiers texte'
-    fr '&Yes', '&Oui'
-    fr 'abort', 'abandonner'
-    fr 'blue', 'bleu'
-    fr 'cancel', 'annuler'
-    fr 'extension'
-    fr 'extensions'
-    fr 'green', 'vert'
-    fr 'ignore', 'ignorer'
-    fr 'ok'
-    fr 'red', 'rouge'
-    fr 'retry', 'r\u00e9essayer'
-    fr 'yes', 'oui'
-}
diff --git a/ext/tk/sample/msgs_rb/it.msg b/ext/tk/sample/msgs_rb/it.msg
deleted file mode 100644
index a180bdbd99..0000000000
--- a/ext/tk/sample/msgs_rb/it.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    it "Application Error", "Errore dell' applicazione"
-    it "Blue", "Blu"
-    it "Color", "Colore"
-    it "Delete", "Incolla"
-    it "Error", "Errore"
-    it "Exit", "Esci"
-    it "Green", "Verde"
-    it "Red", "Rosso"
-    it "blue", "blu"
-    it "green", "verde"
-    it "red", "rosso"
-}
-
-TkMsgCatalog.new('::tk') {
-    it "&Abort", "&Interrompi"
-    it "About...", "Informazioni ..."
-    it "All Files", "Tutti i file"
-    it "Application Error", "Errore dell' applicazione"
-    it "&Blue", "&Blu"
-    it "&Cancel", "&Annulla"
-    it "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Impossibile accedere alla directory \"%1\$s\".\nPermesso negato."
-    it "Choose Directory", "Scegli directory"
-    it "Clear", "Azzera"
-    it "Color", "Colore"
-    it "Console"
-    it "Copy", "Copia"
-    it "Cut", "Taglia"
-    it "Delete", "Incolla"
-    it "Details >>", "Dettagli >>"
-    it "Directory \"%1\$s\" does not exist.", "La directory \"%1\$s\" non esiste."
-    it "&Directory:"
-    it "Error: %1\$s", "Errore: %1\$s"
-    it "Exit", "Esci"
-    it "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Il file \"%1\$s\" esiste gi\\u00e0.\nVuoi sovrascriverlo?"
-    it "File \"%1\$s\" already exists.\n\n", "Il file \"%1\$s\" esiste gi\\u00e0.\n\n"
-    it "File \"%1\$s\" does not exist.", "Il file \"%1\$s\" non esiste."
-    it "File &name:", "&Nome del file:"
-    it "File &names:", "&Nomi dei file:"
-    it "Files of &type:", "File di &tipo:"
-    it "Fi&les:", "Fi&le:"
-    it "&Filter", "&Filtro"
-    it "Fil&ter:", "Fil&tro:"
-    it "&Green", "&Verde"
-    it "Hi", "Salve"
-    it "Hide Console", "Nascondi la console"
-    it "&Ignore", "&Ignora"
-    it "Invalid file name \"%1\$s\".", "Nome di file non valido \"%1\$s\"."
-    it "Log Files", "File di log"
-    it "&No"
-    it "&OK"
-    it "Ok"
-    it "&Open", "A&pri"
-    it "Open", "Apri"
-    it "Open Multiple Files", "Apri file multipli"
-    it "Paste", "Incolla"
-    it "Quit", "Esci"
-    it "&Red", "&Rosso"
-    it "Replace existing file?", "Sostituisci il file esistente?"
-    it "&Retry", "&Riprova"
-    it "&Save", "&Salva"
-    it "Save As", "Salva come"
-    it "Save To Log", "Salva il log"
-    it "Select Log File", "Scegli un file di log"
-    it "Select a file to source", "Scegli un file da eseguire"
-    it "&Selection:", "&Selezione:"
-    it "Skip Messages", "Salta i messaggi"
-    it "Source...", "Esegui..."
-    it "Tcl Scripts", "Scripts Tcl"
-    it "Tcl for Windows", "Tcl per Windows"
-    it "Text Files", "File di testo"
-    it "&Yes", "&Si"
-    it "abort", "interrompi"
-    it "blue", "blu"
-    it "cancel", "annulla"
-    it "extension", "estensione"
-    it "extensions", "estensioni"
-    it "green", "verde"
-    it "ignore", "ignora"
-    it "ok"
-    it "red", "rosso"
-    it "retry", "riprova"
-    it "yes", "si"
-}
diff --git a/ext/tk/sample/msgs_rb/ja.msg b/ext/tk/sample/msgs_rb/ja.msg
deleted file mode 100644
index 40587c1f1d..0000000000
--- a/ext/tk/sample/msgs_rb/ja.msg
+++ /dev/null
@@ -1,13 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    ja 'Application Error', '\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30A8\u30E9\u30FC'
-    ja 'Blue',   '\u9752'
-    ja 'Color',  '\u80CC\u666F\u8272'
-    ja 'Delete', '\u6D88\u53BB'
-    ja 'Error',  '\u30A8\u30E9\u30FC'
-    ja 'Exit',   '\u7D42\u4E86'
-    ja 'Green',  '\u7DD1'
-    ja 'Red',    '\u8D64'
-    ja 'blue',   '\u9752'
-    ja 'green',  '\u7DD1'
-    ja 'red',    '\u8D64'
-}
diff --git a/ext/tk/sample/msgs_rb/nl.msg b/ext/tk/sample/msgs_rb/nl.msg
deleted file mode 100644
index 24e41dae86..0000000000
--- a/ext/tk/sample/msgs_rb/nl.msg
+++ /dev/null
@@ -1,123 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    nl "Application Error", "Toepassingsfout"
-    nl "Blue", "Blauw"
-    nl "Color", "Kleur"
-    nl "Delete", "Wissen"
-    nl "Error", "Fout"
-    nl "Exit", "Be\\u00ebindigen"
-    nl "Green", "Groen"
-    nl "Red", "Rood"
-    nl "blue", "blauw"
-    nl "green", "groen"
-    nl "red", "rood"
-}
-
-TkMsgCatalog.new('::tk') {
-    nl "\"%1\$s\" must be an absolute pathname", "\"%1\$s\" moet een absolute pad-naam zijn"
-    nl "%1\$s is not a toplevel window", "%1\$s is geen toplevel window"
-    nl ", or", ", of"
-    nl "-default, -icon, -message, -parent, -title, or -type", "-default, -icon, -message, -parent, -title, of -type"
-    nl "-initialdir, -mustexist, -parent, or -title", "-initialdir, -mustexist, -parent, of -title"
-    nl "&Abort", "&Afbreken"
-    nl "About...", "Over..."
-    nl "All Files", "Alle Bestanden"
-    nl "Application Error", "Toepassingsfout"
-    nl "&Blue", "&Blauw"
-    nl "&Cancel", "&Annuleren"
-    nl "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Kan niet naar map \"%1\$s\" gaan.\nU heeft hiervoor geen toestemming."
-    nl "Choose Directory", "Kies map"
-    nl "Clear", "Wissen"
-    nl "Clear entry, Press OK; Enter %1\$s, press OK", "Wis veld, Druk op OK; typ %1\$s in, druk op OK"
-    nl "&Clear Console", "&Wis Console"
-    nl "Color", "Kleur"
-    nl "Console"
-    nl "Copy", "Kopi\\u00ebren"
-    nl "Cut", "Knippen"
-    nl "Delete", "Wissen"
-    nl "Details"
-    nl "Details >>"
-    nl "Directory \"%1\$s\" does not exist.", "Map \"%1\$s\" bestaat niet."
-    nl "&Directory:", "&Map:"
-    nl "Edit", "Bewerken"
-    nl "Enter \"%1\$s\", press OK", "Typ \"%1\$s\", druk op OK"
-    nl "Enter \"%1\$s\", press OK, enter \"%2\$s\", press OK", "Typ \"%1\$s\", druk op OK, typ \"%2\$s\", druk op OK"
-    nl "Error: %1\$s", "Fout: %1\$s"
-    nl "Exit", "Be\\u00ebindigen"
-    nl "File", "Bestand"
-    nl "File \"%1\$s\" already exists.\n\n", "Bestand \"%1\$s\" bestaat al.\n\n"
-    nl "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Bestand \"%1\$s\" bestaat al.\nWilt u het overschrijven?"
-    nl "File \"%1\$s\" does not exist.", "Bestand \"%1\$s\" bestaat niet."
-    nl "File &name:", "Bestands&naam:"
-    nl "File &names:", "Bestands&namen:"
-    nl "Files of &type:", "Bestanden van het &type:"
-    nl "Fi&les:", "&Bestanden:"
-    nl "&Filter"
-    nl "Fil&ter:"
-    nl "&Green", "&Groen"
-    nl "Hi", "H\\u00e9"
-    nl "Hide Console", "Verberg Console"
-    nl "&Ignore", "&Negeren"
-    nl "Invalid file name \"%1\$s\".", "Ongeldige bestandsnaam \"%1\$s\"."
-    nl "Log Files", "Log Bestanden"
-    nl "&No", "&Nee"
-    nl "&OK"
-    nl "Ok"
-    nl "&Open", "&Openen"
-    nl "Open", "Openen"
-    nl "Open Multiple Files", "Open meerdere bestanden"
-    nl "Paste", "Plakken"
-    nl "Please press %1\$s", "Druk op %1\$s, A.U.B."
-    nl "Please press ok", "Druk op ok, A.U.B."
-    nl "Press Cancel", "Druk op Annuleren"
-    nl "Press Ok", "Druk op Ok"
-    nl "Quit", "Stoppen"
-    nl "&Red", "&Rood"
-    nl "Replace existing file?", "Vervang bestaand bestand?"
-    nl "&Retry", "&Herhalen"
-    nl "&Save", "Op&slaan"
-    nl "Save As", "Opslaan als"
-    nl "Save To Log", "Opslaan naar Log"
-    nl "Select Log File", "Selecteer Log bestand"
-    nl "Select a file to source", "Selecteer bronbestand"
-    nl "&Selection:", "&Selectie:"
-    nl "Skip Messages", "Berichten overslaan"
-    nl "Source...", "Bron..."
-    nl "Tcl Scripts"
-    nl "Tcl for Windows", "Tcl voor Windows"
-    nl "Text Files", "Tekstbestanden"
-    nl "&Yes", "&Ja"
-    nl "abort", "afbreken"
-    nl "abort, retry, ignore, ok, cancel, no, or yes", "afbreken, opnieuw, negeren, ok, annuleren, nee, of ja"
-    nl "abortretryignore, ok, okcancel, retrycancel, yesno, or yesnocancel", "abortretryignore, ok, okcancel, retrycancel, yesno, of yesnocancel"
-    nl "bad %1\$s value \"%2\$s\": must be %3\$s", "verkeerde %1\$s waarde \"%2\$s\": moet zijn %3\$s"
-    nl "bad file type \"%1\$s\", should be", "verkeerd bestandstype \"%1\$s\", moet zijn"
-    nl "bad option \"%1\$s\": should be %2\$s", "verkeerde optie \"%1\$s\": moet zijn %2\$s"
-    nl "bad window path name \"%1\$s\"", "verkeerde window-padnaam \"%1\$s\""
-    nl "blue", "blauw"
-    nl "can't post %1\$s:  it isn't a descendant of %2\$s (this is a new requirement in Tk versions 3.0 and later)", "kan %1\$s niet verzenden:  het is geen afstammeling van %2\$s (dit is een nieuwe eis in Tk versies 3.0 en later)"
-    nl "cancel", "annuleren"
-    nl "default button index greater than number of buttons specified for tk_dialog", "default knop index is groter dan het aantal knoppen beschikbaar voor tk_dialog"
-    nl "display name to use (current one otherwise)", "te gebruiken schermnaam (anders huidige scherm)"
-    nl "error, info, question, or warning", "error, info, question, of warning"
-    nl "extension"
-    nl "extensions"
-    nl "focus group \"%1\$s\" doesn't exist", "focusgroep \"%1\$s\" bestaat niet"
-    nl "green", "groen"
-    nl "history event %1\$s"
-    nl "ignore", "negeren"
-    nl "invalid default button \"%1\$s\"", "ongeldige default knop \"%1\$s\""
-    nl "macType"
-    nl "macTypes"
-    nl "must specify a background color", "een achtergrondkleur is verplicht"
-    nl "name of the slave interpreter", "naam van de slaaf-interpreter"
-    nl "no winfo screen . nor env(DISPLAY)", "geen winfo scherm . noch env(DISPLAY)"
-    nl "ok"
-    nl "red", "rood"
-    nl "retry", "opnieuw"
-    nl "should contain 5 or 4 elements", "moet 4 of 5 elementen bevatten"
-    nl "spec"
-    nl "tk_chooseDirectory command", "tk_chooseDirectory opdracht"
-    nl "tk_chooseDirectory command, cancel gives null", "tk_chooseDirectory opdracht, annuleren geeft lege waarde"
-    nl "tk_chooseDirectory command, initialdir", "tk_chooseDirectory opdracht, initi\\u00eble map"
-    nl "yes", "ja"
-}
diff --git a/ext/tk/sample/msgs_rb/pl.msg b/ext/tk/sample/msgs_rb/pl.msg
deleted file mode 100644
index 0b3b4445c2..0000000000
--- a/ext/tk/sample/msgs_rb/pl.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    pl 'Application Error', 'Bl\u0105d w Programie'
-    pl 'Blue', 'Niebieski'
-    pl 'Color', 'Kolor'
-    pl 'Delete', 'Usu\u0144'
-    pl 'Error', 'B\u0142\u0105d'
-    pl 'Exit', 'Zako\u0144cz'
-    pl 'Green', 'Zielony'
-    pl 'Red', 'Czerwonz'
-    pl 'blue', 'niebieski'
-    pl 'green', 'zielony'
-    pl 'red', 'czerwony'
-}
-
-TkMsgCatalog.new('::tk') {
-    pl '&Abort', '&Anuluj'
-    pl '&About...', 'O Programie...'
-    pl 'All Files', 'Wszystkie pliki'
-    pl 'Application Error', 'Bl\u0105d w Programie'
-    pl '&Blue', '&Niebieski'
-    pl '&Cancel', '&Anuluj'
-    pl 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.', 'Katalog "%1\$s" nie mo\u017ce zosta\u0107 odczytany lub nie istnieje.'
-    pl 'Choose Directory', 'Wybierz katalog'
-    pl '&Clear', '&Wyczy\u015b\u0107'
-    pl '&Clear Console', '&Wyczy\u015b\u0107 konsol\u0119'
-    pl 'Color', 'Kolor'
-    pl 'Console', 'Konsola'
-    pl '&Copy', '&Kopiuj'
-    pl 'Cu&t', '&Wytnij'
-    pl '&Delete', '&Usu\u0144'
-    pl 'Details >>', 'Detale >>'
-    pl 'Directory "%1\$s" does not exist.', 'Katalog "%1\$s" nie istniej.'
-    pl '&Directory:', '&Katalog:'
-    pl '&Edit', '&Edytuj'
-    pl 'Error: %1\$s', 'B\u0142\u0105d: %1\$s'
-    pl 'E&xit', '&Zako\u0144cz'
-    pl '&File', '&Plik'
-    pl 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?', 'Plik "%1\$s" ju\u017c istnieje.' "\n" 'Czy chcesz go zast\u0105pi\u0107?'
-    pl 'File "%1\$s" already exists.' "\n\n", 'Plik "%1\$s" ju\u017c istnieje. ' "\n\n"
-    pl 'File "%1\$s" does not exist.', 'Plik "%1\$s" nie istnieje.'
-    pl 'File &name:', 'Nazwa &pliku:'
-    pl 'File &names:', 'Nazwy &plik\u00f3w:'
-    pl 'Files of &type:', 'Pliki &typu:'
-    pl 'Fi&les:', 'Pli&ki:'
-    pl '&Filter', '&Filter'
-    pl 'Fil&ter:', '&Filter:'
-    pl '&Green', '&Zielony'
-    pl '&Help', '&Pomoc'
-    pl 'Hi', 'Witaj'
-    pl '&Hide Console', '&Schowaj konsol\u0119'
-    pl '&Ignore', '&Ignoruj'
-    pl 'Invalid file name "%1\$s".', 'Niew\u0142a\u015bciwa nazwa pliku "%1\$s".'
-    pl 'Log Files', 'Protoko\u0142uj'
-    pl '&No', '&Nie'
-    pl 'OK'
-    pl 'Ok'
-    pl 'Open', 'Wczytaj'
-    pl '&Open', '&Wczytaj'
-    pl 'Open Multiple Files', 'Wczytuj wiele plik\u00f3w'
-    pl 'P&aste', '&Wklej'
-    pl '&Quit', '&Zako\u0144cz'
-    pl '&Red', '&Czerwonz'
-    pl 'Replace existing file?', 'Czy zost\u0105pi\u0107 instniej\u0105cy plik?'
-    pl '&Retry', '&Powt\u00f3rz'
-    pl '&Save', '&Zapisz'
-    pl 'Save As', 'Zapisz jako'
-    pl 'Save To Log', 'Wpisz do protoko\u0142u'
-    pl 'Select Log File', 'Wybierz plik proko\u0142u'
-    pl 'Select a file to source', 'Wybierz plik do wykonania'
-    pl '&Selection:', '&Wyb\u00f3r:'
-    pl 'Skip Messages', 'Omi\u0144 pozosta\u0142e komunikaty'
-    pl '&Source...', '&Kod \u017ar\u00f3d\u0142owy...'
-    pl 'Tcl Scripts', 'Tcl-skrypty'
-    pl 'Tcl for Windows', 'Tcl dla Okienek (Windows)'
-    pl 'Text Files', 'Pliki Tekstowe'
-    pl '&Yes', '&Tak'
-    pl 'abort', 'zako\u0144cz'
-    pl 'blue', 'niebieski'
-    pl 'cancel', 'anuluj'
-    pl 'extension', 'rozszerzenie'
-    pl 'extensions', 'rozszerzenia'
-    pl 'green', 'zielony'
-    pl 'ignore', 'ignoruj'
-    pl 'red', 'czerwony'
-    pl 'retry', 'potw\u00f3rz'
-    pl 'yes', 'tak'
-}
diff --git a/ext/tk/sample/msgs_rb/ru.msg b/ext/tk/sample/msgs_rb/ru.msg
deleted file mode 100644
index 752cd42619..0000000000
--- a/ext/tk/sample/msgs_rb/ru.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    ru 'Application Error', '\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435'
-    ru 'Blue', ' \u0413\u043e\u043b\u0443\u0431\u043e\u0439'
-    ru 'Color', '\u0426\u0432\u0435\u0442'
-    ru 'Delete', '\u0423\u0434\u0430\u043b\u0438\u0442\u044c'
-    ru 'Error', '\u041e\u0448\u0438\u0431\u043a\u0430'
-    ru 'Exit', '\u0412\u044b\u0445\u043e\u0434'
-    ru 'Green', '\u0417\u0435\u043b\u0435\u043d\u044b\u0439'
-    ru 'Red', '\u041a\u0440\u0430\u0441\u043d\u044b\u0439'
-    ru 'blue', ' \u0433\u043e\u043b\u0443\u0431\u043e\u0439'
-    ru 'green', ' \u0437\u0435\u043b\u0435\u043d\u044b\u0439'
-    ru 'red', ' \u043a\u0440\u0430\u0441\u043d\u044b\u0439'
-}
-
-TkMsgCatalog.new('::tk') {
-    ru '&Abort', '&\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c'
-    ru 'About...', '\u041f\u0440\u043e...'
-    ru 'All Files', '\u0412\u0441\u0435 \u0444\u0430\u0439\u043b\u044b'
-    ru 'Application Error', '\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435'
-    ru '&Blue', ' &\u0413\u043e\u043b\u0443\u0431\u043e\u0439'
-    ru '&Cancel', '\u041e\u0442&\u043c\u0435\u043d\u0430'
-    ru 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.' \
-                        '\u041d\u0435 \u043c\u043e\u0433\u0443 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 "%1\$s".' "\n" '\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0440\u0430\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u0430'
-    ru 'Choose Directory', '\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433'
-    ru 'Clear', '\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c'
-    ru 'Color', '\u0426\u0432\u0435\u0442'
-    ru 'Console', '\u041a\u043e\u043d\u0441\u043e\u043b\u044c'
-    ru 'Copy', '\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c'
-    ru 'Cut', '\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c'
-    ru 'Delete', '\u0423\u0434\u0430\u043b\u0438\u0442\u044c'
-    ru 'Details >>', '\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 >>'
-    ru 'Directory "%1\$s" does not exist.', '\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 "%1\$s" \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.'
-    ru '&Directory:', '&\u041a\u0430\u0442\u0430\u043b\u043e\u0433:'
-    ru 'Error: %1\$s', '\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s'
-    ru 'Exit', '\u0412\u044b\u0445\u043e\u0434'
-    ru 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?' \
-                            '\u0424\u0430\u0439\u043b "%1\$s" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.' "\n" '\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?'
-    ru 'File "%1\$s" already exists.' "\n\n", '\u0424\u0430\u0439\u043b "%1\$s" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.' "\n\n"
-    ru 'File "%1\$s" does not exist.', '\u0424\u0430\u0439\u043b "%1\$s" \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d.'
-    ru 'File &name:', '&\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430:'
-    ru 'File &names:', '&\u0418\u043c\u0435\u043d\u0430 \u0444\u0430\u0439\u043b\u043e\u0432:'
-    ru 'Files of &type:', '&\u0422\u0438\u043f \u0444\u0430\u0439\u043b\u043e\u0432:'
-    ru 'Fi&les:', '\u0424\u0430\u0439&\u043b\u044b:'
-    ru '&Filter', '&\u0424\u0438\u043b\u044c\u0442\u0440'
-    ru 'Fil&ter:', '\u0424\u0438\u043b\u044c&\u0442\u0440:'
-    ru '&Green', ' &\u0417\u0435\u043b\u0435\u043d\u044b\u0439'
-    ru 'Hi', '\u041f\u0440\u0438\u0432\u0435\u0442'
-    ru 'Hide Console', '\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c'
-    ru '&Ignore', '&\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c'
-    ru 'Invalid file name "%1\$s".', '\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 "%1\$s".'
-    ru 'Log Files', '\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430'
-    ru '&No', '&\u041d\u0435\u0442'
-    ru '&OK', '&\u041e\u041a'
-    ru 'Ok', '\u0414\u0430'
-    ru 'Open', '\u041e\u0442\u043a\u0440\u044b\u0442\u044c'
-    ru '&Open', '&\u041e\u0442\u043a\u0440\u044b\u0442\u044c'
-    ru 'Open Multiple Files', '\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0444\u0430\u0439\u043b\u043e\u0432'
-    ru 'Paste', '\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c'
-    ru 'Quit', '\u0412\u044b\u0445\u043e\u0434'
-    ru '&Red', ' &\u041a\u0440\u0430\u0441\u043d\u044b\u0439'
-    ru 'Replace existing file?', '\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b?'
-    ru '&Retry', '&\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c'
-    ru '&Save', '&\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c'
-    ru 'Save As', '\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a'
-    ru 'Save To Log', '\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432 \u0436\u0443\u0440\u043d\u0430\u043b'
-    ru 'Select Log File', '\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0436\u0443\u0440\u043d\u0430\u043b'
-    ru 'Select a file to source', '\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0430\u0446\u0438\u0438'
-    ru '&Selection:', '&Selection:'
-    ru 'Skip Messages', '\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f'
-    ru 'Source...', '\u0418\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0430\u0439\u043b...'
-    ru 'Tcl Scripts', '\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430 \u043d\u0430 \u044f\u0437\u044b\u043a\u0435 TCL'
-    ru 'Tcl for Windows', 'TCL \u0434\u043b\u044f Windows'
-    ru 'Text Files', '\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0435 \u0444\u0430\u0439\u043b\u044b'
-    ru '&Yes', '&\u0414\u0430'
-    ru 'abort', '\u043e\u0442\u043c\u0435\u043d\u0430'
-    ru 'blue', ' \u0433\u043e\u043b\u0443\u0431\u043e\u0439'
-    ru 'cancel', '\u043e\u0442\u043c\u0435\u043d\u0430'
-    ru 'extension', '\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435'
-    ru 'extensions', '\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f'
-    ru 'green', ' \u0437\u0435\u043b\u0435\u043d\u044b\u0439'
-    ru 'ignore', '\u043f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c'
-    ru 'ok', '\u043e\u043a'
-    ru 'red', ' \u043a\u0440\u0430\u0441\u043d\u044b\u0439'
-    ru 'retry', '\u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c'
-    ru 'yes', '\u0434\u0430'
-}
-
diff --git a/ext/tk/sample/msgs_rb2/README b/ext/tk/sample/msgs_rb2/README
deleted file mode 100644
index f6a904b3b6..0000000000
--- a/ext/tk/sample/msgs_rb2/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Message catalogs in this directory are written in encodings except
-UTF-8. As if you have a trouble to edit UTF-8 text, you can write
-message catalogs in your familier encoding.
-
-Please see '../msgs_rb/README' too.
diff --git a/ext/tk/sample/msgs_rb2/de.msg b/ext/tk/sample/msgs_rb2/de.msg
deleted file mode 100644
index 0d6c82d9e5..0000000000
--- a/ext/tk/sample/msgs_rb2/de.msg
+++ /dev/null
@@ -1,88 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    de 'Application Error', 'Applikationsfehler'
-    de 'Blue', 'Blau'
-    de 'Color', 'Farbe'
-    de 'Delete', 'L�schen', 'iso8859-1'
-    de 'Error', 'Fehler'
-    de 'Exit', 'Ende'
-    de 'Green', 'Gr�n', 'iso8859-1'
-    de 'Red', 'Rot'
-    de 'blue', 'blau'
-    de 'green', 'gr�n', 'iso8859-1'
-    de 'red', 'rot'
-}
-
-TkMsgCatalog.new('::tk') {
-    de "&Abort", "&Abbruch"
-    de "&About...", "&�ber...", 'iso8859-1'
-    de "All Files", "Alle Dateien"
-    de "Application Error", "Applikationsfehler"
-    de "&Blue", "&Blau"
-    de "&Cancel", "&Abbruch"
-    de "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Kann nicht in das Verzeichnis \"%1\$s\" wechseln.\nKeine Rechte vorhanden."
-    de "Choose Directory", "W�hle Verzeichnis", 'iso8859-1'
-    de "&Clear", "&R�cksetzen", 'iso8859-1'
-    de "&Clear Console", "&Konsole l�schen", 'iso8859-1'
-    de "Color", "Farbe"
-    de "Console", "Konsole"
-    de "&Copy", "&Kopieren"
-    de "Cu&t", "Aus&schneiden"
-    de '&Delete', '&L�schen', 'iso8859-1'
-    de "Details >>"
-    de "Directory \"%1\$s\" does not exist.", "Das Verzeichnis \"%1\$s\" existiert nicht."
-    de "&Directory:", "&Verzeichnis:"
-    de "&Edit", "&Bearbieten"
-    de "Error: %1\$s", "Fehler: %1\$s"
-    de "E&xit", "&Ende"
-    de "&File", "&Datei"
-    de "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Die Datei \"%1\$s\" ist bereits vorhanden.\nWollen sie diese Datei �berschreiben ?", 'iso8859-1'
-    de "File \"%1\$s\" already exists.\n\n", "Die Datei \"%1\$s\" ist bereits vorhanden.\n\n"
-    de "File \"%1\$s\" does not exist.", "Die Datei \"%1\$s\" existiert nicht."
-    de "File &name:", "Datei&name:"
-    de "File &names:", "Datei&namen:"
-    de "Files of &type:", "Dateien des &Typs:"
-    de "Fi&les:", "Dat&eien:"
-    de "&Filter"
-    de "Fil&ter:"
-    de '&Green', '&Gr�n', 'iso8859-1'
-    de "&Help", "&Hilfe"
-    de "Hi", "Hallo"
-    de "&Hide Console", "&Konsole unsichtbar machen"
-    de "&Ignore", "&Ignorieren"
-    de "Invalid file name \"%1\$s\".", "Ung�ltiger Dateiname \"%1\$s\".", 'iso8859-1'
-    de "Log Files", "Protokolldatei"
-    de "&No", "&Nein"
-    de "OK"
-    de "Ok"
-    de "Open", "�ffnen", 'iso8859-1'
-    de "&Open", "�&ffnen", 'iso8859-1'
-    de "Open Multiple Files"
-    de "P&aste", "E&inf�gen", 'iso8859-1'
-    de "&Quit", "&Beenden"
-    de "&Red", "&Rot"
-    de "Replace existing file?", "Existierende Datei ersetzen?"
-    de "&Retry", "&Wiederholen"
-    de "&Save", "&Speichern"
-    de "Save As", "Speichern unter"
-    de "Save To Log", "In Protokoll speichern"
-    de "Select Log File", "Protokolldatei ausw�hlen", 'iso8859-1'
-    de "Select a file to source", "Auszuf�hrende Datei ausw�hlen", 'iso8859-1'
-    de "&Selection:", "Auswah&l:"
-    de "Skip Messages", "Weitere Nachrichten �berspringen", 'iso8859-1'
-    de "&Source...", "&Ausf�hren...", 'iso8859-1'
-    de "Tcl Scripts", "Tcl-Skripte"
-    de "Tcl for Windows", "Tcl f�r Windows", 'iso8859-1'
-    de "Text Files", "Textdateien"
-    de "&Yes", "&Ja"
-    de "abort", "abbrechen"
-    de "blue", "blau"
-    de "cancel", "abbrechen"
-    de "extension", "Erweiterung"
-    de "extensions", "Erweiterungen"
-    de 'green', 'gr�n', 'iso8859-1'
-    de "ignore", "ignorieren"
-    de "ok"
-    de "red", "rot"
-    de "retry", "wiederholen"
-    de "yes", "ja"
-}
diff --git a/ext/tk/sample/msgs_rb2/ja.msg b/ext/tk/sample/msgs_rb2/ja.msg
deleted file mode 100644
index 84e89aa6ef..0000000000
--- a/ext/tk/sample/msgs_rb2/ja.msg
+++ /dev/null
@@ -1,85 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    ja 'Application Error', '���ץꥱ������󥨥顼', 'euc-jp'
-    ja 'Blue',   '��',     'euc-jp'
-    ja 'Color',  '������', 'euc-jp'
-    ja 'Delete', '�õ�',   'euc-jp'
-    ja 'Error',  '���顼', 'euc-jp'
-    ja 'Exit',   '��λ',   'euc-jp'
-    ja 'Green',  '��',     'euc-jp'
-    ja 'Red',    '��',     'euc-jp'
-    ja 'blue',   '��',     'euc-jp'
-    ja 'green',  '��',     'euc-jp'
-    ja 'red',    '��',     'euc-jp'
-}
-
-TkMsgCatalog.new('::tk') {
-    ja "&Abort", '���', 'euc-jp'
-    ja "About..."
-    ja "All Files", '���٤ƤΥե�����', 'euc-jp'
-    ja "Application Error", '���ץꥱ������󥨥顼', 'euc-jp'
-    ja "&Blue", '��', 'euc-jp'
-    ja "&Cancel", '���ä�', 'euc-jp'
-    ja "Cannot change to the directory \"%1\$s\".\nPermission denied.", "�ǥ��쥯�ȥ� \"%1\$s\" ���ѹ��Ǥ��ޤ���\n���Ĥ�����ޤ���", 'euc-jp'
-    ja "Choose Directory", '�ǥ��쥯�ȥ������', 'euc-jp'
-    ja "Clear", '�õ�', 'euc-jp'
-    ja "Color", '��', 'euc-jp'
-    ja "Console", '���󥽡���', 'euc-jp'
-    ja "Copy", '���ԡ�', 'euc-jp'
-    ja "Cut", '�ڤ���', 'euc-jp'
-    ja "Delete", '�õ�', 'euc-jp'
-    ja "Details >>", '�ܺ� >>', 'euc-jp'
-    ja "Directory \"%1\$s\" does not exist.", '"%1$s" �Ȥ����ǥ��쥯�ȥ��¸�ߤ��ޤ���', 'euc-jp'
-    ja "&Directory:", '�ǥ��쥯�ȥ�', 'euc-jp'
-    ja "Error: %1\$s"
-    ja "Exit", '��λ', 'euc-jp'
-    ja "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "\"%1\$s\" �Ȥ����ե�����ϴ���¸�ߤ��Ƥ��ޤ���\n�񤭴����ޤ�����", 'euc-jp'
-    ja "File \"%1\$s\" already exists.\n\n", "\"%1\$s\" �Ȥ����ե�����ϴ���¸�ߤ��Ƥ��ޤ���\n\n", 'euc-jp'
-    ja "File \"%1\$s\" does not exist.", '"%1$s" �Ȥ����ե������¸�ߤ��ޤ���', 'euc-jp'
-    ja "File &name:", '�ե�����̾', 'euc-jp'
-    ja "File &names:", '�ե�����̾', 'euc-jp'
-    ja "Files of &type:", '�ե��������', 'euc-jp'
-    ja "Fi&les:", '�ե�����', 'euc-jp'
-    ja "&Filter", '�ե��륿��', 'euc-jp'
-    ja "Fil&ter:", '�ե��륿��', 'euc-jp'
-    ja "&Green", '��', 'euc-jp'
-    ja "Hi", '����ˤ���', 'euc-jp'
-    ja "Hide Console", '���󥽡���򱣤�', 'euc-jp'
-    ja "&Ignore", '̵��', 'euc-jp'
-    ja "Invalid file name \"%1\$s\".", '"%1$s" �������ʥե�����̾�Ǥ���', 'euc-jp'
-    ja "Log Files", '�����ե�����', 'euc-jp'
-    ja "&No", '������', 'euc-jp'
-    ja "&OK", 'λ��', 'euc-jp'
-    ja "OK", 'λ��', 'euc-jp'
-    ja "Ok", 'λ��', 'euc-jp'
-    ja "Open", '����', 'euc-jp'
-    ja "&Open", '����', 'euc-jp'
-    ja "Open Multiple Files", 'ʣ���Υե�����򳫤�', 'euc-jp'
-    ja "Paste", 'Ž���դ�', 'euc-jp'
-    ja "Quit", '��λ', 'euc-jp'
-    ja "&Red", '��', 'euc-jp'
-    ja "Replace existing file?", '��¸�Υե�������֤������ޤ�����', 'euc-jp'
-    ja "&Retry", '�Ƽ¹�', 'euc-jp'
-    ja "&Save", '��¸', 'euc-jp'
-    ja "Save As", '̾�����դ�����¸', 'euc-jp'
-    ja "Save To Log", '��������¸', 'euc-jp'
-    ja "Select Log File", '�����ե����������', 'euc-jp'
-    ja "Select a file to source", '�������ե����������', 'euc-jp'
-    ja "&Selection:", '����', 'euc-jp'
-    ja "Skip Messages", '��å�������ȤФ�', 'euc-jp'
-    ja "Source...", '������...', 'euc-jp'
-    ja "Tcl Scripts", 'Tcl ������ץ�', 'euc-jp'
-    ja "Tcl for Windows"
-    ja "Text Files", '�ƥ����ȥե�����', 'euc-jp'
-    ja "&Yes", '�Ϥ�', 'euc-jp'
-    ja "abort", '���', 'euc-jp'
-    ja "blue", '��', 'euc-jp'
-    ja "cancel", '���ä�', 'euc-jp'
-    ja "extension", '��ĥ��', 'euc-jp'
-    ja "extensions", '��ĥ��', 'euc-jp'
-    ja "green", '��', 'euc-jp'
-    ja "ignore", '̵��', 'euc-jp'
-    ja "ok", 'λ��', 'euc-jp'
-    ja "red", '��', 'euc-jp'
-    ja "retry", '�Ƽ¹�', 'euc-jp'
-    ja "yes", '�Ϥ�', 'euc-jp'
-}
diff --git a/ext/tk/sample/msgs_tk/README b/ext/tk/sample/msgs_tk/README
deleted file mode 100644
index 062ec20cf8..0000000000
--- a/ext/tk/sample/msgs_tk/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Almost all of Message-Catalog files in this directory are quoted
-from Tcl/Tk8.5a1 source archive (only a little are modified for
-'tkmsgcat-load_tk.rb'). Please read the file 'license.terms' in
-this directry (That was included in demo directory of Tcl/Tk8.5a1).
diff --git a/ext/tk/sample/msgs_tk/cs.msg b/ext/tk/sample/msgs_tk/cs.msg
deleted file mode 100644
index 697070985e..0000000000
--- a/ext/tk/sample/msgs_tk/cs.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset cs "Application Error" "Chyba programu"
-    ::msgcat::mcset cs "Blue" "Modr\341"
-    ::msgcat::mcset cs "Color" "Barva"
-    ::msgcat::mcset cs "Delete" "Smazat"
-    ::msgcat::mcset cs "Error" "Chyba"
-    ::msgcat::mcset cs "Exit" "Konec"
-    ::msgcat::mcset cs "Green" "Zelen\341"
-    ::msgcat::mcset cs "Red" "\u010cerven\341"
-    ::msgcat::mcset cs "blue" "modr\341"
-    ::msgcat::mcset cs "green" "zelen\341"
-    ::msgcat::mcset cs "red" "\u010derven\341"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset cs "&Abort" "&P\u0159eru\u0161it"
-    ::msgcat::mcset cs "About..." "O programu..."
-    ::msgcat::mcset cs "All Files" "V\u0161echny soubory"
-    ::msgcat::mcset cs "Application Error" "Chyba programu"
-    ::msgcat::mcset cs "&Blue" "&Modr\341"
-    ::msgcat::mcset cs "&Cancel" "&Zru\u0161it"
-    ::msgcat::mcset cs "Cannot change to the directory \"%1\$s\".\nPermission denied." "Nemohu zm\u011bnit atku\341ln\355 adres\341\u0159 na \"%1\$s\".\nP\u0159\355stup odm\355tnut."
-    ::msgcat::mcset cs "Choose Directory" "V\375b\u011br adres\341\u0159e"
-    ::msgcat::mcset cs "Clear" "Smazat"
-    ::msgcat::mcset cs "Color" "Barva"
-    ::msgcat::mcset cs "Console" "Konzole"
-    ::msgcat::mcset cs "Copy" "Kop\355rovat"
-    ::msgcat::mcset cs "Cut" "Vy\u0159\355znout"
-    ::msgcat::mcset cs "Delete" "Smazat"
-    ::msgcat::mcset cs "Details >>" "Detaily >>"
-    ::msgcat::mcset cs "Directory \"%1\$s\" does not exist." "Adres\341\u0159 \"%1\$s\" neexistuje."
-    ::msgcat::mcset cs "&Directory:" "&Adres\341\u0159:"
-    ::msgcat::mcset cs "Error: %1\$s" "Chyba: %1\$s"
-    ::msgcat::mcset cs "Exit" "Konec"
-    ::msgcat::mcset cs "File \"%1\$s\" already exists.\n\n" "Soubor \"%1\$s\" ji\u017e existuje.\n\n"
-    ::msgcat::mcset cs "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Soubor \"%1\$s\" ji\u017e existuje.\nChcete jej p\u0159epsat?"
-    ::msgcat::mcset cs "File \"%1\$s\" does not exist." "Soubor \"%1\$s\" neexistuje."
-    ::msgcat::mcset cs "File &name:" "&Jm\351no souboru:"
-    ::msgcat::mcset cs "File &names:" "&Jm\351na soubor\u016f:"
-    ::msgcat::mcset cs "Files of &type:" "&Typy soubor\u016f:"
-    ::msgcat::mcset cs "Fi&les:" "Sou&bory:"
-    ::msgcat::mcset cs "&Filter" "&Filtr"
-    ::msgcat::mcset cs "Fil&ter:" "Fil&tr:"
-    ::msgcat::mcset cs "&Green" "Ze&len\341"
-    ::msgcat::mcset cs "Hi"
-    ::msgcat::mcset cs "Hide Console" "Skr\375t konsolu"
-    ::msgcat::mcset cs "&Ignore" "&Ignorovat"
-    ::msgcat::mcset cs "Invalid file name \"%1\$s\"." "\u0160patn\351 jm\351no souboru \"%1\$s\"."
-    ::msgcat::mcset cs "Log Files" "Log soubory"
-    ::msgcat::mcset cs "&No" "&Ne"
-    ::msgcat::mcset cs "&OK"
-    ::msgcat::mcset cs "Ok"
-    ::msgcat::mcset cs "Open" "Otev\u0159\355t"
-    ::msgcat::mcset cs "&Open" "&Otev\u0159\355t"
-    ::msgcat::mcset cs "Open Multiple Files" "Otev\u0159\355t v\355ce soubor\u016f"
-    ::msgcat::mcset cs "Paste" "Vlo\u017eit"
-    ::msgcat::mcset cs "Quit" "Skon\u010dit"
-    ::msgcat::mcset cs "&Red" " \u010ce&rven\341"
-    ::msgcat::mcset cs "Replace existing file?" "Nahradit st\341vaj\355c\355 soubor?"
-    ::msgcat::mcset cs "&Retry" "Z&novu"
-    ::msgcat::mcset cs "&Save" "&Ulo\u017eit"
-    ::msgcat::mcset cs "Save As" "Ulo\u017eit jako"
-    ::msgcat::mcset cs "Save To Log" "Ulo\u017eit do logu"
-    ::msgcat::mcset cs "Select Log File" "Vybrat log soubor"
-    ::msgcat::mcset cs "Select a file to source" "Vybrat soubor k nahr\341n\355"
-    ::msgcat::mcset cs "&Selection:" "&V\375b\u011br:"
-    ::msgcat::mcset cs "Skip Messages" "P\u0159esko\u010dit zpr\341vy"
-    ::msgcat::mcset cs "Source..." "Nahr\341t..."
-    ::msgcat::mcset cs "Tcl Scripts" "Tcl skripty"
-    ::msgcat::mcset cs "Tcl for Windows" "Tcl pro Windows"
-    ::msgcat::mcset cs "Text Files" "Textov\351 soubory"
-    ::msgcat::mcset cs "&Yes" "&Ano"
-    ::msgcat::mcset cs "abort" "p\u0159eru\u0161it"
-    ::msgcat::mcset cs "blue" "modr\341"
-    ::msgcat::mcset cs "cancel" "zru\u0161it"
-    ::msgcat::mcset cs "extension" "p\u0159\355pona"
-    ::msgcat::mcset cs "extensions" "p\u0159\355pony"
-    ::msgcat::mcset cs "green" "zelen\341"
-    ::msgcat::mcset cs "ignore" "ignorovat"
-    ::msgcat::mcset cs "ok"
-    ::msgcat::mcset cs "red" "\u010derven\341"
-    ::msgcat::mcset cs "retry" "znovu"
-    ::msgcat::mcset cs "yes" "ano"
-}
diff --git a/ext/tk/sample/msgs_tk/de.msg b/ext/tk/sample/msgs_tk/de.msg
deleted file mode 100644
index 437f2ed9e7..0000000000
--- a/ext/tk/sample/msgs_tk/de.msg
+++ /dev/null
@@ -1,88 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset de "Application Error" "Applikationsfehler"
-    ::msgcat::mcset de "Blue" "Blau"
-    ::msgcat::mcset de "Color" "Farbe"
-    ::msgcat::mcset de "Delete" "L\u00f6schen"
-    ::msgcat::mcset de "Error" "Fehler"
-    ::msgcat::mcset de "Exit" "Ende"
-    ::msgcat::mcset de "Green" "Gr\u00fcn"
-    ::msgcat::mcset de "Red" "Rot"
-    ::msgcat::mcset de "blue" "blau"
-    ::msgcat::mcset de "green" "gr\u00fcn"
-    ::msgcat::mcset de "red" "rot"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset de "&Abort" "&Abbruch"
-    ::msgcat::mcset de "&About..." "&\u00dcber..."
-    ::msgcat::mcset de "All Files" "Alle Dateien"
-    ::msgcat::mcset de "Application Error" "Applikationsfehler"
-    ::msgcat::mcset de "&Blue" "&Blau"
-    ::msgcat::mcset de "&Cancel" "&Abbruch"
-    ::msgcat::mcset de "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kann nicht in das Verzeichnis \"%1\$s\" wechseln.\nKeine Rechte vorhanden."
-    ::msgcat::mcset de "Choose Directory" "W\u00e4hle Verzeichnis"
-    ::msgcat::mcset de "&Clear" "&R\u00fccksetzen"
-    ::msgcat::mcset de "&Clear Console" "&Konsole l\u00f6schen"
-    ::msgcat::mcset de "Color" "Farbe"
-    ::msgcat::mcset de "Console" "Konsole"
-    ::msgcat::mcset de "&Copy" "&Kopieren"
-    ::msgcat::mcset de "Cu&t" "Aus&schneiden"
-    ::msgcat::mcset de "&Delete" "&L\u00f6schen"
-    ::msgcat::mcset de "Details >>"
-    ::msgcat::mcset de "Directory \"%1\$s\" does not exist." "Das Verzeichnis \"%1\$s\" existiert nicht."
-    ::msgcat::mcset de "&Directory:" "&Verzeichnis:"
-    ::msgcat::mcset de "&Edit" "&Bearbieten"
-    ::msgcat::mcset de "Error: %1\$s" "Fehler: %1\$s"
-    ::msgcat::mcset de "E&xit" "&Ende"
-    ::msgcat::mcset de "&File" "&Datei"
-    ::msgcat::mcset de "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Die Datei \"%1\$s\" ist bereits vorhanden.\nWollen sie diese Datei \u00fcberschreiben ?"
-    ::msgcat::mcset de "File \"%1\$s\" already exists.\n\n" "Die Datei \"%1\$s\" ist bereits vorhanden.\n\n"
-    ::msgcat::mcset de "File \"%1\$s\" does not exist." "Die Datei \"%1\$s\" existiert nicht."
-    ::msgcat::mcset de "File &name:" "Datei&name:"
-    ::msgcat::mcset de "File &names:" "Datei&namen:"
-    ::msgcat::mcset de "Files of &type:" "Dateien des &Typs:"
-    ::msgcat::mcset de "Fi&les:" "Dat&eien:"
-    ::msgcat::mcset de "&Filter"
-    ::msgcat::mcset de "Fil&ter:"
-    ::msgcat::mcset de "&Green" "&Gr\u00fcn"
-    ::msgcat::mcset de "&Help" "&Hilfe"
-    ::msgcat::mcset de "Hi" "Hallo"
-    ::msgcat::mcset de "&Hide Console" "&Konsole unsichtbar machen"
-    ::msgcat::mcset de "&Ignore" "&Ignorieren"
-    ::msgcat::mcset de "Invalid file name \"%1\$s\"." "Ung\u00fcltiger Dateiname \"%1\$s\"."
-    ::msgcat::mcset de "Log Files" "Protokolldatei"
-    ::msgcat::mcset de "&No" "&Nein"
-    ::msgcat::mcset de "OK"
-    ::msgcat::mcset de "Ok"
-    ::msgcat::mcset de "Open" "\u00d6ffnen"
-    ::msgcat::mcset de "&Open" "\u00d6&ffnen"
-    ::msgcat::mcset de "Open Multiple Files"
-    ::msgcat::mcset de "P&aste" "E&inf\u00fcgen"
-    ::msgcat::mcset de "&Quit" "&Beenden"
-    ::msgcat::mcset de "&Red" "&Rot"
-    ::msgcat::mcset de "Replace existing file?" "Existierende Datei ersetzen?"
-    ::msgcat::mcset de "&Retry" "&Wiederholen"
-    ::msgcat::mcset de "&Save" "&Speichern"
-    ::msgcat::mcset de "Save As" "Speichern unter"
-    ::msgcat::mcset de "Save To Log" "In Protokoll speichern"
-    ::msgcat::mcset de "Select Log File" "Protokolldatei ausw\u00e4hlen"
-    ::msgcat::mcset de "Select a file to source" "Auszuf\u00fchrende Datei ausw\u00e4hlen"
-    ::msgcat::mcset de "&Selection:" "Auswah&l:"
-    ::msgcat::mcset de "Skip Messages" "Weitere Nachrichten \u00fcberspringen"
-    ::msgcat::mcset de "&Source..." "&Ausf\u00fchren..."
-    ::msgcat::mcset de "Tcl Scripts" "Tcl-Skripte"
-    ::msgcat::mcset de "Tcl for Windows" "Tcl f\u00fcr Windows"
-    ::msgcat::mcset de "Text Files" "Textdateien"
-    ::msgcat::mcset de "&Yes" "&Ja"
-    ::msgcat::mcset de "abort" "abbrechen"
-    ::msgcat::mcset de "blue" "blau"
-    ::msgcat::mcset de "cancel" "abbrechen"
-    ::msgcat::mcset de "extension" "Erweiterung"
-    ::msgcat::mcset de "extensions" "Erweiterungen"
-    ::msgcat::mcset de "green" "gr\u00fcn"
-    ::msgcat::mcset de "ignore" "ignorieren"
-    ::msgcat::mcset de "ok"
-    ::msgcat::mcset de "red" "rot"
-    ::msgcat::mcset de "retry" "wiederholen"
-    ::msgcat::mcset de "yes" "ja"
-}
diff --git a/ext/tk/sample/msgs_tk/el.msg b/ext/tk/sample/msgs_tk/el.msg
deleted file mode 100644
index ee75af3ced..0000000000
--- a/ext/tk/sample/msgs_tk/el.msg
+++ /dev/null
@@ -1,103 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset el "Application Error"  "\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2"
-    ::msgcat::mcset el "Blue"     "\u039c\u03c0\u03bb\u03b5"
-    ::msgcat::mcset el "Color"    "\u03a7\u03c1\u03ce\u03bc\u03b1"
-    ::msgcat::mcset el "Delete"   "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae"
-    ::msgcat::mcset el "Error"	  "\u039b\u03ac\u03b8\u03bf\u03c2"
-    ::msgcat::mcset el "Exit"     "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
-    ::msgcat::mcset el "Green"    "\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "Red"      "\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "blue"     "\u03bc\u03c0\u03bb\u03b5"
-    ::msgcat::mcset el "green"    "\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "red"      "\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
-}
-
-
-# followings are same to original file included into Tk8.5a1's widget demos.
-
-## Messages for the Greek (Hellenic - "el") language.
-## Please report any changes/suggestions to:
-##    petasis@iit.demokritos.gr
-
-namespace eval ::tk {
-    ::msgcat::mcset el "&Abort"              "\u03a4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2"
-    ::msgcat::mcset el "About..."           "\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac..."
-    ::msgcat::mcset el "All Files"          "\u038c\u03bb\u03b1 \u03c4\u03b1 \u0391\u03c1\u03c7\u03b5\u03af\u03b1"
-    ::msgcat::mcset el "Application Error"  "\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2"
-    ::msgcat::mcset el "&Blue"               "\u039c\u03c0\u03bb\u03b5"
-    ::msgcat::mcset el "&Cancel"             "\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7"
-    ::msgcat::mcset el \
-"Cannot change to the directory \"%1\$s\".\nPermission denied." \
-"\u0394\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03ba\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5 \u03c3\u03b5 \"%1\$s\".\n\u0397 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03b4\u03b5\u03bd \u03b5\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9."
-    ::msgcat::mcset el "Choose Directory"   "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u039a\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5"
-    ::msgcat::mcset el "Clear"              "\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2"
-    ::msgcat::mcset el "Color"              "\u03a7\u03c1\u03ce\u03bc\u03b1"
-    ::msgcat::mcset el "Console"            "\u039a\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1"
-    ::msgcat::mcset el "Copy"               "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae"
-    ::msgcat::mcset el "Cut"                "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae"
-    ::msgcat::mcset el "Delete"             "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae"
-    ::msgcat::mcset el "Details >>"         "\u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03ad\u03c1\u03b5\u03b9\u03b5\u03c2 >>"
-    ::msgcat::mcset el "Directory \"%1\$s\" does not exist." \
-                                        "\u039f \u03ba\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2 \"%1\$s\" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9."
-    ::msgcat::mcset el "&Directory:"         "&\u039a\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2:"
-    ::msgcat::mcset el "Error: %1\$s"       "\u039b\u03ac\u03b8\u03bf\u03c2: %1\$s"
-    ::msgcat::mcset el "Exit"               "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
-    ::msgcat::mcset el \
-               "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \
-               "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.\n\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03c0\u03b9\u03ba\u03b1\u03bb\u03c5\u03c6\u03b8\u03b5\u03af;"
-    ::msgcat::mcset el "File \"%1\$s\" already exists.\n\n" \
-                   "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.\n\n"
-    ::msgcat::mcset el "File \"%1\$s\" does not exist." \
-                   "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9."
-    ::msgcat::mcset el "File &name:"         "\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5:"
-    ::msgcat::mcset el "File &names:"        "\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd:"
-    ::msgcat::mcset el "Files of &type:"     "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u03c4\u03bf\u03c5 &\u03c4\u03cd\u03c0\u03bf\u03c5:"
-    ::msgcat::mcset el "Fi&les:"             "\u0391\u03c1\u03c7\u03b5\u03af\u03b1:"
-    ::msgcat::mcset el "&Filter"             "\u03a6\u03af\u03bb\u03c4\u03c1\u03bf"
-    ::msgcat::mcset el "Fil&ter:"            "\u03a6\u03af\u03bb\u03c4\u03c1\u03bf:"
-    ::msgcat::mcset el "&Green"              "\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "Hi"                 "\u0393\u03b5\u03b9\u03b1"
-    ::msgcat::mcset el "Hide Console"       "\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03ba\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1\u03c2"
-    ::msgcat::mcset el "&Ignore"             "\u0391\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7"
-    ::msgcat::mcset el "Invalid file name \"%1\$s\"." \
-                   "\u0386\u03ba\u03c5\u03c1\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \"%1\$s\"."
-    ::msgcat::mcset el "Log Files"          "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
-    ::msgcat::mcset el "&No"                 "\u038c\u03c7\u03b9"
-    ::msgcat::mcset el "&OK"                 "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "&Ok"                 "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "Open"               "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1"
-    ::msgcat::mcset el "&Open"               "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1"
-    ::msgcat::mcset el "Open Multiple Files" \
-                                        "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1 \u03c0\u03bf\u03bb\u03bb\u03b1\u03c0\u03bb\u03ce\u03bd \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd"
-    ::msgcat::mcset el "Paste"              "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7"
-    ::msgcat::mcset el "Quit"               "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
-    ::msgcat::mcset el "&Red"                "\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "Replace existing file?" \
-                                        "\u0395\u03c0\u03b9\u03ba\u03ac\u03bb\u03c5\u03c8\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03bd\u03c4\u03bf\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5;"
-    ::msgcat::mcset el "&Retry"              "\u03a0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac"
-    ::msgcat::mcset el "&Save"               "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7"
-    ::msgcat::mcset el "Save As"            "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03b1\u03bd"
-    ::msgcat::mcset el "Save To Log"        "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03c4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
-    ::msgcat::mcset el "Select Log File"    "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
-    ::msgcat::mcset el "Select a file to source" \
-                                        "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03b3\u03b9\u03b1 \u03b5\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7"
-    ::msgcat::mcset el "&Selection:"         "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae:"
-    ::msgcat::mcset el "Skip Messages"      "\u0391\u03c0\u03bf\u03c6\u03c5\u03b3\u03ae \u03bc\u03c5\u03bd\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd"
-    ::msgcat::mcset el "Source..."          "\u0395\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7..."
-    ::msgcat::mcset el "Tcl Scripts"        "Tcl Scripts"
-    ::msgcat::mcset el "Tcl for Windows"    "Tcl \u03b3\u03b9\u03b1 Windows"
-    ::msgcat::mcset el "Text Files"         "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5"
-    ::msgcat::mcset el "&Yes"                "\u039d\u03b1\u03b9"
-    ::msgcat::mcset el "abort"              "\u03c4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2"
-    ::msgcat::mcset el "blue"               "\u03bc\u03c0\u03bb\u03b5"
-    ::msgcat::mcset el "cancel"             "\u03b1\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7"
-    ::msgcat::mcset el "extension"          "\u03b5\u03c0\u03ad\u03ba\u03c4\u03b1\u03c3\u03b7"
-    ::msgcat::mcset el "extensions"         "\u03b5\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2"
-    ::msgcat::mcset el "green"              "\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "ignore"             "\u03b1\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7"
-    ::msgcat::mcset el "ok"                 "\u03b5\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "red"                "\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "retry"              "\u03c0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac"
-    ::msgcat::mcset el "yes"                "\u03bd\u03b1\u03b9"
-}
-
diff --git a/ext/tk/sample/msgs_tk/en.msg b/ext/tk/sample/msgs_tk/en.msg
deleted file mode 100644
index de586d195e..0000000000
--- a/ext/tk/sample/msgs_tk/en.msg
+++ /dev/null
@@ -1,83 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset en "Application Error"
-    ::msgcat::mcset en "Blue"
-    ::msgcat::mcset en "Color"
-    ::msgcat::mcset en "Delete"
-    ::msgcat::mcset en "Error"
-    ::msgcat::mcset en "Green"
-    ::msgcat::mcset en "Red"
-    ::msgcat::mcset en "blue"
-    ::msgcat::mcset en "green"
-    ::msgcat::mcset en "red"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset en "&Abort"
-    ::msgcat::mcset en "About..."
-    ::msgcat::mcset en "All Files"
-    ::msgcat::mcset en "Application Error"
-    ::msgcat::mcset en "&Blue"
-    ::msgcat::mcset en "&Cancel"
-    ::msgcat::mcset en "Cannot change to the directory \"%1\$s\".\nPermission denied."
-    ::msgcat::mcset en "Choose Directory"
-    ::msgcat::mcset en "Clear"
-    ::msgcat::mcset en "Color"
-    ::msgcat::mcset en "Console"
-    ::msgcat::mcset en "Copy"
-    ::msgcat::mcset en "Cut"
-    ::msgcat::mcset en "Delete"
-    ::msgcat::mcset en "Details >>"
-    ::msgcat::mcset en "Directory \"%1\$s\" does not exist."
-    ::msgcat::mcset en "&Directory:"
-    ::msgcat::mcset en "Error: %1\$s"
-    ::msgcat::mcset en "Exit"
-    ::msgcat::mcset en "File \"%1\$s\" already exists.\nDo you want to overwrite it?"
-    ::msgcat::mcset en "File \"%1\$s\" already exists.\n\n"
-    ::msgcat::mcset en "File \"%1\$s\" does not exist."
-    ::msgcat::mcset en "File &name:"
-    ::msgcat::mcset en "File &names:"
-    ::msgcat::mcset en "Files of &type:"
-    ::msgcat::mcset en "Fi&les:"
-    ::msgcat::mcset en "&Filter"
-    ::msgcat::mcset en "Fil&ter:"
-    ::msgcat::mcset en "&Green"
-    ::msgcat::mcset en "Hi"
-    ::msgcat::mcset en "Hide Console"
-    ::msgcat::mcset en "&Ignore"
-    ::msgcat::mcset en "Invalid file name \"%1\$s\"."
-    ::msgcat::mcset en "Log Files"
-    ::msgcat::mcset en "&No"
-    ::msgcat::mcset en "&OK"
-    ::msgcat::mcset en "Ok"
-    ::msgcat::mcset en "Open"
-    ::msgcat::mcset en "&Open"
-    ::msgcat::mcset en "Open Multiple Files"
-    ::msgcat::mcset en "Paste"
-    ::msgcat::mcset en "Quit"
-    ::msgcat::mcset en "&Red"
-    ::msgcat::mcset en "Replace existing file?"
-    ::msgcat::mcset en "&Retry"
-    ::msgcat::mcset en "&Save"
-    ::msgcat::mcset en "Save As"
-    ::msgcat::mcset en "Save To Log"
-    ::msgcat::mcset en "Select Log File"
-    ::msgcat::mcset en "Select a file to source"
-    ::msgcat::mcset en "&Selection:"
-    ::msgcat::mcset en "Skip Messages"
-    ::msgcat::mcset en "Source..."
-    ::msgcat::mcset en "Tcl Scripts"
-    ::msgcat::mcset en "Tcl for Windows"
-    ::msgcat::mcset en "Text Files"
-    ::msgcat::mcset en "&Yes"
-    ::msgcat::mcset en "abort"
-    ::msgcat::mcset en "blue"
-    ::msgcat::mcset en "cancel"
-    ::msgcat::mcset en "extension"
-    ::msgcat::mcset en "extensions"
-    ::msgcat::mcset en "green"
-    ::msgcat::mcset en "ignore"
-    ::msgcat::mcset en "ok"
-    ::msgcat::mcset en "red"
-    ::msgcat::mcset en "retry"
-    ::msgcat::mcset en "yes"
-}
diff --git a/ext/tk/sample/msgs_tk/en_gb.msg b/ext/tk/sample/msgs_tk/en_gb.msg
deleted file mode 100644
index 1aa5b49380..0000000000
--- a/ext/tk/sample/msgs_tk/en_gb.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset en_gb Color Colour
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset en_gb Color Colour
-}
diff --git a/ext/tk/sample/msgs_tk/eo.msg b/ext/tk/sample/msgs_tk/eo.msg
deleted file mode 100644
index e683cef297..0000000000
--- a/ext/tk/sample/msgs_tk/eo.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset eo "Application Error" "Aplikoerraro"
-    ::msgcat::mcset eo "Blue" "Blua"
-    ::msgcat::mcset eo "Color" "Farbo"
-    ::msgcat::mcset eo "Delete" "Forprenu"
-    ::msgcat::mcset eo "Error" "Eraro"
-    ::msgcat::mcset eo "Exit" "Eliru"
-    ::msgcat::mcset eo "Green" "Verda"
-    ::msgcat::mcset eo "Red" "Rosa"
-    ::msgcat::mcset eo "blue" "blua"
-    ::msgcat::mcset eo "green" "verda"
-    ::msgcat::mcset eo "red" "ru\u011da"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset eo "&Abort" "&\u0108esigo"
-    ::msgcat::mcset eo "&About..." "Pri..."
-    ::msgcat::mcset eo "All Files" "\u0108ioj dosieroj"
-    ::msgcat::mcset eo "Application Error" "Aplikoerraro"
-    ::msgcat::mcset eo "&Blue" "&Blua"
-    ::msgcat::mcset eo "&Cancel" "&Rezignu"
-    ::msgcat::mcset eo "Cannot change to the directory \"%1\$s\".\nPermission denied." "Neeble \u0109angi al dosierulon \"%1\$s\".\nVi ne rajtas tion."
-    ::msgcat::mcset eo "Choose Directory" "Elektu Dosierujo"
-    ::msgcat::mcset eo "&Clear" "&Klaru"
-    ::msgcat::mcset eo "&Clear Console" "&Klaru konzolon"
-    ::msgcat::mcset eo "Color" "Farbo"
-    ::msgcat::mcset eo "Console" "Konzolo"
-    ::msgcat::mcset eo "&Copy" "&Kopiu"
-    ::msgcat::mcset eo "Cu&t" "&Enpo\u015digu"
-    ::msgcat::mcset eo "&Delete" "&Forprenu"
-    ::msgcat::mcset eo "Details >>" "Detaloj >>"
-    ::msgcat::mcset eo "Directory \"%1\$s\" does not exist." "La dosierujo \"%1\$s\" ne ekzistas."
-    ::msgcat::mcset eo "&Directory:" "&Dosierujo:"
-    ::msgcat::mcset eo "&Edit" "&Redaktu"
-    ::msgcat::mcset eo "Error: %1\$s" "Eraro: %1\$s"
-    ::msgcat::mcset eo "E&xit" "&Eliru"
-    ::msgcat::mcset eo "&File" "&Dosiero"
-    ::msgcat::mcset eo "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "La dosiero \"%1\$s\" jam ekzistas.\n\u0108u vi volas anstata\u00fbigi la dosieron?"
-    ::msgcat::mcset eo "File \"%1\$s\" already exists.\n\n" "La dosiero \"%1\$s\" jam egzistas. \n\n"
-    ::msgcat::mcset eo "File \"%1\$s\" does not exist." "La dosierp \"%1\$s\" ne estas."
-    ::msgcat::mcset eo "File &name:" "Dosiero&nomo:"
-    ::msgcat::mcset eo "File &names:" "Dosiero&nomoj:"
-    ::msgcat::mcset eo "Files of &type:" "Dosieroj de &Typo:"
-    ::msgcat::mcset eo "Fi&les:" "Do&sieroj:"
-    ::msgcat::mcset eo "&Filter" "&Filtrilo"
-    ::msgcat::mcset eo "Fil&ter:" "&Filtrilo:"
-    ::msgcat::mcset eo "&Green" "&Verda"
-    ::msgcat::mcset eo "&Help" "&Helpu"
-    ::msgcat::mcset eo "Hi" "Saluton"
-    ::msgcat::mcset eo "&Hide Console" "&Ka\u015du konzolon"
-    ::msgcat::mcset eo "&Ignore" "&Ignoru"
-    ::msgcat::mcset eo "Invalid file name \"%1\$s\"." "Malvalida dosieronomo \"%1\$s\"."
-    ::msgcat::mcset eo "Log Files" "Protokolo"
-    ::msgcat::mcset eo "&No" "&Ne"
-    ::msgcat::mcset eo "OK"
-    ::msgcat::mcset eo "Ok"
-    ::msgcat::mcset eo "Open" "Malfermu"
-    ::msgcat::mcset eo "&Open" "&Malfermu"
-    ::msgcat::mcset eo "Open Multiple Files" "Melfermu multan dosierojn"
-    ::msgcat::mcset eo "P&aste" "&Elpo\u015digi"
-    ::msgcat::mcset eo "&Quit" "&Finigu"
-    ::msgcat::mcset eo "&Red" "&Rosa"
-    ::msgcat::mcset eo "Replace existing file?" "\u0108u anstata\u00fbu ekzistantan dosieron?"
-    ::msgcat::mcset eo "&Retry" "&Ripetu"
-    ::msgcat::mcset eo "&Save" "&Savu"
-    ::msgcat::mcset eo "Save As" "Savu kiel"
-    ::msgcat::mcset eo "Save To Log" "Savu en protokolon"
-    ::msgcat::mcset eo "Select Log File" "Elektu prokolodosieron"
-    ::msgcat::mcset eo "Select a file to source" "Elektu dosieron por interpreti"
-    ::msgcat::mcset eo "&Selection:" "&Elekto:"
-    ::msgcat::mcset eo "Skip Messages" "transsaltu pluajn mesa\u011dojn"
-    ::msgcat::mcset eo "&Source..." "&Fontoprogramo..."
-    ::msgcat::mcset eo "Tcl Scripts" "Tcl-skriptoj"
-    ::msgcat::mcset eo "Tcl for Windows" "Tcl por vindoso"
-    ::msgcat::mcset eo "Text Files" "Tekstodosierojn"
-    ::msgcat::mcset eo "&Yes" "&Jes"
-    ::msgcat::mcset eo "abort" "\u0109esigo"
-    ::msgcat::mcset eo "blue" "blua"
-    ::msgcat::mcset eo "cancel" "rezignu"
-    ::msgcat::mcset eo "extension" "ekspansio"
-    ::msgcat::mcset eo "extensions" "ekspansioj"
-    ::msgcat::mcset eo "green" "verda"
-    ::msgcat::mcset eo "ignore" "ignorieren"
-    ::msgcat::mcset eo "red" "ru\u011da"
-    ::msgcat::mcset eo "retry" "ripetu"
-    ::msgcat::mcset eo "yes" "jes"
-}
diff --git a/ext/tk/sample/msgs_tk/es.msg b/ext/tk/sample/msgs_tk/es.msg
deleted file mode 100644
index 62ce33d5cc..0000000000
--- a/ext/tk/sample/msgs_tk/es.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset es "Application Error" "Error de la aplicaci\u00f3n"
-    ::msgcat::mcset es "Blue" "Azul"
-    ::msgcat::mcset es "Color" "Color"
-    ::msgcat::mcset es "Delete" "Borrar"
-    ::msgcat::mcset es "Error" "Error"
-    ::msgcat::mcset es "Exit" "Salir"
-    ::msgcat::mcset es "Green" "Verde"
-    ::msgcat::mcset es "Red" "Rojo"
-    ::msgcat::mcset es "blue" "azul"
-    ::msgcat::mcset es "green" "verde"
-    ::msgcat::mcset es "red" "rojo"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset es "&Abort" "&Abortar"
-    ::msgcat::mcset es "About..." "Acerca de ..."
-    ::msgcat::mcset es "All Files" "Todos los archivos"
-    ::msgcat::mcset es "Application Error" "Error de la aplicaci\u00f3n"
-    ::msgcat::mcset es "&Blue" "&Azul"
-    ::msgcat::mcset es "&Cancel" "&Cancelar"
-    ::msgcat::mcset es "Cannot change to the directory \"%1\$s\".\nPermission denied." "No es posible acceder al directorio \"%1\$s\".\nPermiso denegado."
-    ::msgcat::mcset es "Choose Directory" "Elegir directorio"
-    ::msgcat::mcset es "Clear" "Borrar"
-    ::msgcat::mcset es "Color" "Color"
-    ::msgcat::mcset es "Console" "Consola"
-    ::msgcat::mcset es "Copy" "Copiar"
-    ::msgcat::mcset es "Cut" "Cortar"
-    ::msgcat::mcset es "Delete" "Borrar"
-    ::msgcat::mcset es "Details >>" "Detalles >>"
-    ::msgcat::mcset es "Directory \"%1\$s\" does not exist." "El directorio \"%1\$s\" no existe."
-    ::msgcat::mcset es "&Directory:" "&Directorio:"
-    ::msgcat::mcset es "Error: %1\$s" "Error: %1\$s"
-    ::msgcat::mcset es "Exit" "Salir"
-    ::msgcat::mcset es "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "El archivo \"%1\$s\" ya existe.\nDesea sobreescribirlo?"
-    ::msgcat::mcset es "File \"%1\$s\" already exists.\n\n" "El archivo \"%1\$s\" ya existe.\n\n"
-    ::msgcat::mcset es "File \"%1\$s\" does not exist." "El archivo \"%1\$s\" no existe."
-    ::msgcat::mcset es "File &name:" "&Nombre de archivo:"
-    ::msgcat::mcset es "File &names:" "&Nombres de archivo:"
-    ::msgcat::mcset es "Files of &type:" "Archivos de &tipo:"
-    ::msgcat::mcset es "Fi&les:" "&Archivos:"
-    ::msgcat::mcset es "&Filter" "&Filtro"
-    ::msgcat::mcset es "Fil&ter:" "Fil&tro:"
-    ::msgcat::mcset es "&Green" "&Verde"
-    ::msgcat::mcset es "Hi" "Hola"
-    ::msgcat::mcset es "Hide Console" "Esconder la consola"
-    ::msgcat::mcset es "&Ignore" "&Ignorar"
-    ::msgcat::mcset es "Invalid file name \"%1\$s\"." "Nombre de archivo inv\u00e1lido \"%1\$s\"."
-    ::msgcat::mcset es "Log Files" "Ficheros de traza"
-    ::msgcat::mcset es "&No" "&No"
-    ::msgcat::mcset es "&OK" "&OK"
-    ::msgcat::mcset es "Ok" "Ok"
-    ::msgcat::mcset es "Open" "Abrir"
-    ::msgcat::mcset es "&Open" "&Abrir"
-    ::msgcat::mcset es "Open Multiple Files" "Abrir m\u00faltiples archivos"
-    ::msgcat::mcset es "Paste" "Pegar"
-    ::msgcat::mcset es "Quit" "Abandonar"
-    ::msgcat::mcset es "&Red" "&Rojo"
-    ::msgcat::mcset es "Replace existing file?" "Reemplazar el archivo existente?"
-    ::msgcat::mcset es "&Retry" "&Reintentar"
-    ::msgcat::mcset es "&Save" "&Salvar"
-    ::msgcat::mcset es "Save As" "Salvar como"
-    ::msgcat::mcset es "Save To Log" "Salvar al archivo de traza"
-    ::msgcat::mcset es "Select Log File" "Elegir un archivo de traza"
-    ::msgcat::mcset es "Select a file to source" "Seleccionar un archivo a evaluar"
-    ::msgcat::mcset es "&Selection:" "&Selecci\u00f3n:"
-    ::msgcat::mcset es "Skip Messages" "Omitir los mensajes"
-    ::msgcat::mcset es "Source..." "Evaluar..."
-    ::msgcat::mcset es "Tcl Scripts" "Scripts Tcl"
-    ::msgcat::mcset es "Tcl for Windows" "Tcl para Windows"
-    ::msgcat::mcset es "Text Files" "Archivos de texto"
-    ::msgcat::mcset es "&Yes" "&S\u00ed"
-    ::msgcat::mcset es "abort" "abortar"
-    ::msgcat::mcset es "blue" "azul"
-    ::msgcat::mcset es "cancel" "cancelar"
-    ::msgcat::mcset es "extension" "extensi\u00f3n"
-    ::msgcat::mcset es "extensions" "extensiones"
-    ::msgcat::mcset es "green" "verde"
-    ::msgcat::mcset es "ignore" "ignorar"
-    ::msgcat::mcset es "ok" "ok"
-    ::msgcat::mcset es "red" "rojo"
-    ::msgcat::mcset es "retry" "reintentar"
-    ::msgcat::mcset es "yes" "s\u00ed"
-}
diff --git a/ext/tk/sample/msgs_tk/fr.msg b/ext/tk/sample/msgs_tk/fr.msg
deleted file mode 100644
index ebbba48ca1..0000000000
--- a/ext/tk/sample/msgs_tk/fr.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset fr "Application Error" "Erreur d'application"
-    ::msgcat::mcset fr "Blue" "Bleu"
-    ::msgcat::mcset fr "Color" "Couleur"
-    ::msgcat::mcset fr "Delete" "Effacer"
-    ::msgcat::mcset fr "Error" "Erreur"
-    ::msgcat::mcset fr "Exit" "Quitter"
-    ::msgcat::mcset fr "Green" "Vert"
-    ::msgcat::mcset fr "Red" "Rouge"
-    ::msgcat::mcset fr "blue" "bleu"
-    ::msgcat::mcset fr "green" "vert"
-    ::msgcat::mcset fr "red" "rouge"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset fr "&Abort" "&Annuler"
-    ::msgcat::mcset fr "About..." "\u00c0 propos..."
-    ::msgcat::mcset fr "All Files" "Tous les fichiers"
-    ::msgcat::mcset fr "Application Error" "Erreur d'application"
-    ::msgcat::mcset fr "&Blue" "&Bleu"
-    ::msgcat::mcset fr "&Cancel" "&Annuler"
-    ::msgcat::mcset fr "Cannot change to the directory \"%1\$s\".\nPermission denied." "Impossible d'acc\u00e9der au r\u00e9pertoire \"%1\$s\".\nPermission refus\u00e9e."
-    ::msgcat::mcset fr "Choose Directory" "Choisir r\u00e9pertoire"
-    ::msgcat::mcset fr "Clear" "Effacer"
-    ::msgcat::mcset fr "Color" "Couleur"
-    ::msgcat::mcset fr "Console"
-    ::msgcat::mcset fr "Copy" "Copier"
-    ::msgcat::mcset fr "Cut" "Couper"
-    ::msgcat::mcset fr "Delete" "Effacer"
-    ::msgcat::mcset fr "Details >>" "D\u00e9tails >>"
-    ::msgcat::mcset fr "Directory \"%1\$s\" does not exist." "Le r\u00e9pertoire \"%1\$s\" n'existe pas."
-    ::msgcat::mcset fr "&Directory:" "&R\u00e9pertoire:"
-    ::msgcat::mcset fr "Error: %1\$s" "Erreur: %1\$s"
-    ::msgcat::mcset fr "Exit" "Quitter"
-    ::msgcat::mcset fr "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Le fichier \"%1\$s\" existe d\u00e9j\u00e0.\nVoulez-vous l'\u00e9craser?"
-    ::msgcat::mcset fr "File \"%1\$s\" already exists.\n\n" "Le fichier \"%1\$s\" existe d\u00e9j\u00e0.\n\n"
-    ::msgcat::mcset fr "File \"%1\$s\" does not exist." "Le fichier \"%1\$s\" n'existe pas."
-    ::msgcat::mcset fr "File &name:" "&Nom de fichier:"
-    ::msgcat::mcset fr "File &names:" "&Noms de fichiers:"
-    ::msgcat::mcset fr "Files of &type:" "&Type de fichiers:"
-    ::msgcat::mcset fr "Fi&les:" "Fich&iers:"
-    ::msgcat::mcset fr "&Filter" "&Filtre"
-    ::msgcat::mcset fr "Fil&ter:" "Fil&tre:"
-    ::msgcat::mcset fr "&Green" "&Vert"
-    ::msgcat::mcset fr "Hi" "Salut"
-    ::msgcat::mcset fr "Hide Console" "Cacher la Console"
-    ::msgcat::mcset fr "&Ignore" "&Ignorer"
-    ::msgcat::mcset fr "Invalid file name \"%1\$s\"." "Nom de fichier invalide \"%1\$s\"."
-    ::msgcat::mcset fr "Log Files" "Fichiers de trace"
-    ::msgcat::mcset fr "&No" "&Non"
-    ::msgcat::mcset fr "&OK"
-    ::msgcat::mcset fr "Ok"
-    ::msgcat::mcset fr "Open" "Ouvrir"
-    ::msgcat::mcset fr "&Open" "&Ouvrir"
-    ::msgcat::mcset fr "Open Multiple Files" "Ouvrir plusieurs fichiers"
-    ::msgcat::mcset fr "Paste" "Coller"
-    ::msgcat::mcset fr "Quit" "Quitter"
-    ::msgcat::mcset fr "&Red" "&Rouge"
-    ::msgcat::mcset fr "Replace existing file?" "Remplacer le fichier existant?"
-    ::msgcat::mcset fr "&Retry" "&R\u00e9-essayer"
-    ::msgcat::mcset fr "&Save" "&Sauvegarder"
-    ::msgcat::mcset fr "Save As" "Sauvegarder sous"
-    ::msgcat::mcset fr "Save To Log" "Sauvegarde au fichier de trace"
-    ::msgcat::mcset fr "Select Log File" "Choisir un fichier de trace"
-    ::msgcat::mcset fr "Select a file to source" "Choisir un fichier \u00e0 \u00e9valuer"
-    ::msgcat::mcset fr "&Selection:" "&S\u00e9lection:"
-    ::msgcat::mcset fr "Skip Messages" "Omettre les messages"
-    ::msgcat::mcset fr "Source..." "\u00c9valuer..."
-    ::msgcat::mcset fr "Tcl Scripts" "Scripts Tcl"
-    ::msgcat::mcset fr "Tcl for Windows" "Tcl pour Windows"
-    ::msgcat::mcset fr "Text Files" "Fichiers texte"
-    ::msgcat::mcset fr "&Yes" "&Oui"
-    ::msgcat::mcset fr "abort" "abandonner"
-    ::msgcat::mcset fr "blue" "bleu"
-    ::msgcat::mcset fr "cancel" "annuler"
-    ::msgcat::mcset fr "extension"
-    ::msgcat::mcset fr "extensions"
-    ::msgcat::mcset fr "green" "vert"
-    ::msgcat::mcset fr "ignore" "ignorer"
-    ::msgcat::mcset fr "ok"
-    ::msgcat::mcset fr "red" "rouge"
-    ::msgcat::mcset fr "retry" "r\u00e9essayer"
-    ::msgcat::mcset fr "yes" "oui"
-}
diff --git a/ext/tk/sample/msgs_tk/it.msg b/ext/tk/sample/msgs_tk/it.msg
deleted file mode 100644
index b144fcc073..0000000000
--- a/ext/tk/sample/msgs_tk/it.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset it "Application Error" "Errore dell' applicazione"
-    ::msgcat::mcset it "Blue" "Blu"
-    ::msgcat::mcset it "Color" "Colore"
-    ::msgcat::mcset it "Delete" "Incolla"
-    ::msgcat::mcset it "Error" "Errore"
-    ::msgcat::mcset it "Exit" "Esci"
-    ::msgcat::mcset it "Green" "Verde"
-    ::msgcat::mcset it "Red" "Rosso"
-    ::msgcat::mcset it "blue" "blu"
-    ::msgcat::mcset it "green" "verde"
-    ::msgcat::mcset it "red" "rosso"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset it "&Abort" "&Interrompi"
-    ::msgcat::mcset it "About..." "Informazioni ..."
-    ::msgcat::mcset it "All Files" "Tutti i file"
-    ::msgcat::mcset it "Application Error" "Errore dell' applicazione"
-    ::msgcat::mcset it "&Blue" "&Blu"
-    ::msgcat::mcset it "&Cancel" "&Annulla"
-    ::msgcat::mcset it "Cannot change to the directory \"%1\$s\".\nPermission denied." "Impossibile accedere alla directory \"%1\$s\".\nPermesso negato."
-    ::msgcat::mcset it "Choose Directory" "Scegli directory"
-    ::msgcat::mcset it "Clear" "Azzera"
-    ::msgcat::mcset it "Color" "Colore"
-    ::msgcat::mcset it "Console"
-    ::msgcat::mcset it "Copy" "Copia"
-    ::msgcat::mcset it "Cut" "Taglia"
-    ::msgcat::mcset it "Delete" "Incolla"
-    ::msgcat::mcset it "Details >>" "Dettagli >>"
-    ::msgcat::mcset it "Directory \"%1\$s\" does not exist." "La directory \"%1\$s\" non esiste."
-    ::msgcat::mcset it "&Directory:"
-    ::msgcat::mcset it "Error: %1\$s" "Errore: %1\$s"
-    ::msgcat::mcset it "Exit" "Esci"
-    ::msgcat::mcset it "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Il file \"%1\$s\" esiste gi\u00e0.\nVuoi sovrascriverlo?"
-    ::msgcat::mcset it "File \"%1\$s\" already exists.\n\n" "Il file \"%1\$s\" esiste gi\u00e0.\n\n"
-    ::msgcat::mcset it "File \"%1\$s\" does not exist." "Il file \"%1\$s\" non esiste."
-    ::msgcat::mcset it "File &name:" "&Nome del file:"
-    ::msgcat::mcset it "File &names:" "&Nomi dei file:"
-    ::msgcat::mcset it "Files of &type:" "File di &tipo:"
-    ::msgcat::mcset it "Fi&les:" "Fi&le:"
-    ::msgcat::mcset it "&Filter" "&Filtro"
-    ::msgcat::mcset it "Fil&ter:" "Fil&tro:"
-    ::msgcat::mcset it "&Green" "&Verde"
-    ::msgcat::mcset it "Hi" "Salve"
-    ::msgcat::mcset it "Hide Console" "Nascondi la console"
-    ::msgcat::mcset it "&Ignore" "&Ignora"
-    ::msgcat::mcset it "Invalid file name \"%1\$s\"." "Nome di file non valido \"%1\$s\"."
-    ::msgcat::mcset it "Log Files" "File di log"
-    ::msgcat::mcset it "&No"
-    ::msgcat::mcset it "&OK"
-    ::msgcat::mcset it "Ok"
-    ::msgcat::mcset it "&Open" "A&pri"
-    ::msgcat::mcset it "Open" "Apri"
-    ::msgcat::mcset it "Open Multiple Files" "Apri file multipli"
-    ::msgcat::mcset it "Paste" "Incolla"
-    ::msgcat::mcset it "Quit" "Esci"
-    ::msgcat::mcset it "&Red" "&Rosso"
-    ::msgcat::mcset it "Replace existing file?" "Sostituisci il file esistente?"
-    ::msgcat::mcset it "&Retry" "&Riprova"
-    ::msgcat::mcset it "&Save" "&Salva"
-    ::msgcat::mcset it "Save As" "Salva come"
-    ::msgcat::mcset it "Save To Log" "Salva il log"
-    ::msgcat::mcset it "Select Log File" "Scegli un file di log"
-    ::msgcat::mcset it "Select a file to source" "Scegli un file da eseguire"
-    ::msgcat::mcset it "&Selection:" "&Selezione:"
-    ::msgcat::mcset it "Skip Messages" "Salta i messaggi"
-    ::msgcat::mcset it "Source..." "Esegui..."
-    ::msgcat::mcset it "Tcl Scripts" "Scripts Tcl"
-    ::msgcat::mcset it "Tcl for Windows" "Tcl per Windows"
-    ::msgcat::mcset it "Text Files" "File di testo"
-    ::msgcat::mcset it "&Yes" "&Si"
-    ::msgcat::mcset it "abort" "interrompi"
-    ::msgcat::mcset it "blue" "blu"
-    ::msgcat::mcset it "cancel" "annulla"
-    ::msgcat::mcset it "extension" "estensione"
-    ::msgcat::mcset it "extensions" "estensioni"
-    ::msgcat::mcset it "green" "verde"
-    ::msgcat::mcset it "ignore" "ignora"
-    ::msgcat::mcset it "ok"
-    ::msgcat::mcset it "red" "rosso"
-    ::msgcat::mcset it "retry" "riprova"
-    ::msgcat::mcset it "yes" "si"
-}
diff --git a/ext/tk/sample/msgs_tk/ja.msg b/ext/tk/sample/msgs_tk/ja.msg
deleted file mode 100644
index 44a25839db..0000000000
--- a/ext/tk/sample/msgs_tk/ja.msg
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset ja "Application Error"  "\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30A8\u30E9\u30FC"
-    ::msgcat::mcset ja "Blue"    "\u9752"
-    ::msgcat::mcset ja "Color"   "\u80CC\u666F\u8272"
-    ::msgcat::mcset ja "Delete"  "\u6D88\u53BB"
-    ::msgcat::mcset ja "Error"   "\u30A8\u30E9\u30FC"
-    ::msgcat::mcset ja "Exit"    "\u7D42\u4E86"
-    ::msgcat::mcset ja "Green"   "\u7DD1"
-    ::msgcat::mcset ja "Red"     "\u8D64"
-    ::msgcat::mcset ja "blue"    "\u9752"
-    ::msgcat::mcset ja "green"   "\u7DD1"
-    ::msgcat::mcset ja "red"     "\u8D64"
-}
diff --git a/ext/tk/sample/msgs_tk/license.terms b/ext/tk/sample/msgs_tk/license.terms
deleted file mode 100644
index c0a44d3fc2..0000000000
--- a/ext/tk/sample/msgs_tk/license.terms
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/msgs_tk/nl.msg b/ext/tk/sample/msgs_tk/nl.msg
deleted file mode 100644
index d9642e808c..0000000000
--- a/ext/tk/sample/msgs_tk/nl.msg
+++ /dev/null
@@ -1,123 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset nl "Application Error" "Toepassingsfout"
-    ::msgcat::mcset nl "Blue" "Blauw"
-    ::msgcat::mcset nl "Color" "Kleur"
-    ::msgcat::mcset nl "Delete" "Wissen"
-    ::msgcat::mcset nl "Error" "Fout"
-    ::msgcat::mcset nl "Exit" "Be\u00ebindigen"
-    ::msgcat::mcset nl "Green" "Groen"
-    ::msgcat::mcset nl "Red" "Rood"
-    ::msgcat::mcset nl "blue" "blauw"
-    ::msgcat::mcset nl "green" "groen"
-    ::msgcat::mcset nl "red" "rood"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset nl "\"%1\$s\" must be an absolute pathname" "\"%1\$s\" moet een absolute pad-naam zijn"
-    ::msgcat::mcset nl "%1\$s is not a toplevel window" "%1\$s is geen toplevel window"
-    ::msgcat::mcset nl ", or" ", of"
-    ::msgcat::mcset nl "-default, -icon, -message, -parent, -title, or -type" "-default, -icon, -message, -parent, -title, of -type"
-    ::msgcat::mcset nl "-initialdir, -mustexist, -parent, or -title" "-initialdir, -mustexist, -parent, of -title"
-    ::msgcat::mcset nl "&Abort" "&Afbreken"
-    ::msgcat::mcset nl "About..." "Over..."
-    ::msgcat::mcset nl "All Files" "Alle Bestanden"
-    ::msgcat::mcset nl "Application Error" "Toepassingsfout"
-    ::msgcat::mcset nl "&Blue" "&Blauw"
-    ::msgcat::mcset nl "&Cancel" "&Annuleren"
-    ::msgcat::mcset nl "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kan niet naar map \"%1\$s\" gaan.\nU heeft hiervoor geen toestemming."
-    ::msgcat::mcset nl "Choose Directory" "Kies map"
-    ::msgcat::mcset nl "Clear" "Wissen"
-    ::msgcat::mcset nl "Clear entry, Press OK; Enter %1\$s, press OK" "Wis veld, Druk op OK; typ %1\$s in, druk op OK"
-    ::msgcat::mcset nl "&Clear Console" "&Wis Console"
-    ::msgcat::mcset nl "Color" "Kleur"
-    ::msgcat::mcset nl "Console"
-    ::msgcat::mcset nl "Copy" "Kopi\u00ebren"
-    ::msgcat::mcset nl "Cut" "Knippen"
-    ::msgcat::mcset nl "Delete" "Wissen"
-    ::msgcat::mcset nl "Details"
-    ::msgcat::mcset nl "Details >>"
-    ::msgcat::mcset nl "Directory \"%1\$s\" does not exist." "Map \"%1\$s\" bestaat niet."
-    ::msgcat::mcset nl "&Directory:" "&Map:"
-    ::msgcat::mcset nl "Edit" "Bewerken"
-    ::msgcat::mcset nl "Enter \"%1\$s\", press OK" "Typ \"%1\$s\", druk op OK"
-    ::msgcat::mcset nl "Enter \"%1\$s\", press OK, enter \"%2\$s\", press OK" "Typ \"%1\$s\", druk op OK, typ \"%2\$s\", druk op OK"
-    ::msgcat::mcset nl "Error: %1\$s" "Fout: %1\$s"
-    ::msgcat::mcset nl "Exit" "Be\u00ebindigen"
-    ::msgcat::mcset nl "File" "Bestand"
-    ::msgcat::mcset nl "File \"%1\$s\" already exists.\n\n" "Bestand \"%1\$s\" bestaat al.\n\n"
-    ::msgcat::mcset nl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Bestand \"%1\$s\" bestaat al.\nWilt u het overschrijven?"
-    ::msgcat::mcset nl "File \"%1\$s\" does not exist." "Bestand \"%1\$s\" bestaat niet."
-    ::msgcat::mcset nl "File &name:" "Bestands&naam:"
-    ::msgcat::mcset nl "File &names:" "Bestands&namen:"
-    ::msgcat::mcset nl "Files of &type:" "Bestanden van het &type:"
-    ::msgcat::mcset nl "Fi&les:" "&Bestanden:"
-    ::msgcat::mcset nl "&Filter"
-    ::msgcat::mcset nl "Fil&ter:"
-    ::msgcat::mcset nl "&Green" "&Groen"
-    ::msgcat::mcset nl "Hi" "H\u00e9"
-    ::msgcat::mcset nl "Hide Console" "Verberg Console"
-    ::msgcat::mcset nl "&Ignore" "&Negeren"
-    ::msgcat::mcset nl "Invalid file name \"%1\$s\"." "Ongeldige bestandsnaam \"%1\$s\"."
-    ::msgcat::mcset nl "Log Files" "Log Bestanden"
-    ::msgcat::mcset nl "&No" "&Nee"
-    ::msgcat::mcset nl "&OK"
-    ::msgcat::mcset nl "Ok"
-    ::msgcat::mcset nl "&Open" "&Openen"
-    ::msgcat::mcset nl "Open" "Openen"
-    ::msgcat::mcset nl "Open Multiple Files" "Open meerdere bestanden"
-    ::msgcat::mcset nl "Paste" "Plakken"
-    ::msgcat::mcset nl "Please press %1\$s" "Druk op %1\$s, A.U.B."
-    ::msgcat::mcset nl "Please press ok" "Druk op ok, A.U.B."
-    ::msgcat::mcset nl "Press Cancel" "Druk op Annuleren"
-    ::msgcat::mcset nl "Press Ok" "Druk op Ok"
-    ::msgcat::mcset nl "Quit" "Stoppen"
-    ::msgcat::mcset nl "&Red" "&Rood"
-    ::msgcat::mcset nl "Replace existing file?" "Vervang bestaand bestand?"
-    ::msgcat::mcset nl "&Retry" "&Herhalen"
-    ::msgcat::mcset nl "&Save" "Op&slaan"
-    ::msgcat::mcset nl "Save As" "Opslaan als"
-    ::msgcat::mcset nl "Save To Log" "Opslaan naar Log"
-    ::msgcat::mcset nl "Select Log File" "Selecteer Log bestand"
-    ::msgcat::mcset nl "Select a file to source" "Selecteer bronbestand"
-    ::msgcat::mcset nl "&Selection:" "&Selectie:"
-    ::msgcat::mcset nl "Skip Messages" "Berichten overslaan"
-    ::msgcat::mcset nl "Source..." "Bron..."
-    ::msgcat::mcset nl "Tcl Scripts"
-    ::msgcat::mcset nl "Tcl for Windows" "Tcl voor Windows"
-    ::msgcat::mcset nl "Text Files" "Tekstbestanden"
-    ::msgcat::mcset nl "&Yes" "&Ja"
-    ::msgcat::mcset nl "abort" "afbreken"
-    ::msgcat::mcset nl "abort, retry, ignore, ok, cancel, no, or yes" "afbreken, opnieuw, negeren, ok, annuleren, nee, of ja"
-    ::msgcat::mcset nl "abortretryignore, ok, okcancel, retrycancel, yesno, or yesnocancel" "abortretryignore, ok, okcancel, retrycancel, yesno, of yesnocancel"
-    ::msgcat::mcset nl "bad %1\$s value \"%2\$s\": must be %3\$s" "verkeerde %1\$s waarde \"%2\$s\": moet zijn %3\$s"
-    ::msgcat::mcset nl "bad file type \"%1\$s\", should be" "verkeerd bestandstype \"%1\$s\", moet zijn"
-    ::msgcat::mcset nl "bad option \"%1\$s\": should be %2\$s" "verkeerde optie \"%1\$s\": moet zijn %2\$s"
-    ::msgcat::mcset nl "bad window path name \"%1\$s\"" "verkeerde window-padnaam \"%1\$s\""
-    ::msgcat::mcset nl "blue" "blauw"
-    ::msgcat::mcset nl "can't post %1\$s:  it isn't a descendant of %2\$s (this is a new requirement in Tk versions 3.0 and later)" "kan %1\$s niet verzenden:  het is geen afstammeling van %2\$s (dit is een nieuwe eis in Tk versies 3.0 en later)"
-    ::msgcat::mcset nl "cancel" "annuleren"
-    ::msgcat::mcset nl "default button index greater than number of buttons specified for tk_dialog" "default knop index is groter dan het aantal knoppen beschikbaar voor tk_dialog"
-    ::msgcat::mcset nl "display name to use (current one otherwise)" "te gebruiken schermnaam (anders huidige scherm)"
-    ::msgcat::mcset nl "error, info, question, or warning" "error, info, question, of warning"
-    ::msgcat::mcset nl "extension"
-    ::msgcat::mcset nl "extensions"
-    ::msgcat::mcset nl "focus group \"%1\$s\" doesn't exist" "focusgroep \"%1\$s\" bestaat niet"
-    ::msgcat::mcset nl "green" "groen"
-    ::msgcat::mcset nl "history event %1\$s"
-    ::msgcat::mcset nl "ignore" "negeren"
-    ::msgcat::mcset nl "invalid default button \"%1\$s\"" "ongeldige default knop \"%1\$s\""
-    ::msgcat::mcset nl "macType"
-    ::msgcat::mcset nl "macTypes"
-    ::msgcat::mcset nl "must specify a background color" "een achtergrondkleur is verplicht"
-    ::msgcat::mcset nl "name of the slave interpreter" "naam van de slaaf-interpreter"
-    ::msgcat::mcset nl "no winfo screen . nor env(DISPLAY)" "geen winfo scherm . noch env(DISPLAY)"
-    ::msgcat::mcset nl "ok"
-    ::msgcat::mcset nl "red" "rood"
-    ::msgcat::mcset nl "retry" "opnieuw"
-    ::msgcat::mcset nl "should contain 5 or 4 elements" "moet 4 of 5 elementen bevatten"
-    ::msgcat::mcset nl "spec"
-    ::msgcat::mcset nl "tk_chooseDirectory command" "tk_chooseDirectory opdracht"
-    ::msgcat::mcset nl "tk_chooseDirectory command, cancel gives null" "tk_chooseDirectory opdracht, annuleren geeft lege waarde"
-    ::msgcat::mcset nl "tk_chooseDirectory command, initialdir" "tk_chooseDirectory opdracht, initi\u00eble map"
-    ::msgcat::mcset nl "yes" "ja"
-}
diff --git a/ext/tk/sample/msgs_tk/pl.msg b/ext/tk/sample/msgs_tk/pl.msg
deleted file mode 100644
index 2699e42bdf..0000000000
--- a/ext/tk/sample/msgs_tk/pl.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset pl "Application Error" "Bl\u0105d w Programie"
-    ::msgcat::mcset pl "Blue" "Niebieski"
-    ::msgcat::mcset pl "Color" "Kolor"
-    ::msgcat::mcset pl "Delete" "Usu\u0144"
-    ::msgcat::mcset pl "Error" "B\u0142\u0105d"
-    ::msgcat::mcset pl "Exit" "Zako\u0144cz"
-    ::msgcat::mcset pl "Green" "Zielony"
-    ::msgcat::mcset pl "Red" "Czerwonz"
-    ::msgcat::mcset pl "blue" "niebieski"
-    ::msgcat::mcset pl "green" "zielony"
-    ::msgcat::mcset pl "red" "czerwony"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset pl "&Abort" "&Anuluj"
-    ::msgcat::mcset pl "&About..." "O Programie..."
-    ::msgcat::mcset pl "All Files" "Wszystkie pliki"
-    ::msgcat::mcset pl "Application Error" "Bl\u0105d w Programie"
-    ::msgcat::mcset pl "&Blue" "&Niebieski"
-    ::msgcat::mcset pl "&Cancel" "&Anuluj"
-    ::msgcat::mcset pl "Cannot change to the directory \"%1\$s\".\nPermission denied." "Katalog \"%1\$s\" nie mo\u017ce zosta\u0107 odczytany lub nie istnieje."
-    ::msgcat::mcset pl "Choose Directory" "Wybierz katalog"
-    ::msgcat::mcset pl "&Clear" "&Wyczy\u015b\u0107"
-    ::msgcat::mcset pl "&Clear Console" "&Wyczy\u015b\u0107 konsol\u0119"
-    ::msgcat::mcset pl "Color" "Kolor"
-    ::msgcat::mcset pl "Console" "Konsola"
-    ::msgcat::mcset pl "&Copy" "&Kopiuj"
-    ::msgcat::mcset pl "Cu&t" "&Wytnij"
-    ::msgcat::mcset pl "&Delete" "&Usu\u0144"
-    ::msgcat::mcset pl "Details >>" "Detale >>"
-    ::msgcat::mcset pl "Directory \"%1\$s\" does not exist." "Katalog \"%1\$s\" nie istniej."
-    ::msgcat::mcset pl "&Directory:" "&Katalog:"
-    ::msgcat::mcset pl "&Edit" "&Edytuj"
-    ::msgcat::mcset pl "Error: %1\$s" "B\u0142\u0105d: %1\$s"
-    ::msgcat::mcset pl "E&xit" "&Zako\u0144cz"
-    ::msgcat::mcset pl "&File" "&Plik"
-    ::msgcat::mcset pl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Plik \"%1\$s\" ju\u017c istnieje.\nCzy chcesz go zast\u0105pi\u0107?"
-    ::msgcat::mcset pl "File \"%1\$s\" already exists.\n\n" "Plik \"%1\$s\" ju\u017c istnieje. \n\n"
-    ::msgcat::mcset pl "File \"%1\$s\" does not exist." "Plik \"%1\$s\" nie istnieje."
-    ::msgcat::mcset pl "File &name:" "Nazwa &pliku:"
-    ::msgcat::mcset pl "File &names:" "Nazwy &plik\u00f3w:"
-    ::msgcat::mcset pl "Files of &type:" "Pliki &typu:"
-    ::msgcat::mcset pl "Fi&les:" "Pli&ki:"
-    ::msgcat::mcset pl "&Filter" "&Filter"
-    ::msgcat::mcset pl "Fil&ter:" "&Filter:"
-    ::msgcat::mcset pl "&Green" "&Zielony"
-    ::msgcat::mcset pl "&Help" "&Pomoc"
-    ::msgcat::mcset pl "Hi" "Witaj"
-    ::msgcat::mcset pl "&Hide Console" "&Schowaj konsol\u0119"
-    ::msgcat::mcset pl "&Ignore" "&Ignoruj"
-    ::msgcat::mcset pl "Invalid file name \"%1\$s\"." "Niew\u0142a\u015bciwa nazwa pliku \"%1\$s\"."
-    ::msgcat::mcset pl "Log Files" "Protoko\u0142uj"
-    ::msgcat::mcset pl "&No" "&Nie"
-    ::msgcat::mcset pl "OK"
-    ::msgcat::mcset pl "Ok"
-    ::msgcat::mcset pl "Open" "Wczytaj"
-    ::msgcat::mcset pl "&Open" "&Wczytaj"
-    ::msgcat::mcset pl "Open Multiple Files" "Wczytuj wiele plik\u00f3w"
-    ::msgcat::mcset pl "P&aste" "&Wklej"
-    ::msgcat::mcset pl "&Quit" "&Zako\u0144cz"
-    ::msgcat::mcset pl "&Red" "&Czerwonz"
-    ::msgcat::mcset pl "Replace existing file?" "Czy zost\u0105pi\u0107 instniej\u0105cy plik?"
-    ::msgcat::mcset pl "&Retry" "&Powt\u00f3rz"
-    ::msgcat::mcset pl "&Save" "&Zapisz"
-    ::msgcat::mcset pl "Save As" "Zapisz jako"
-    ::msgcat::mcset pl "Save To Log" "Wpisz do protoko\u0142u"
-    ::msgcat::mcset pl "Select Log File" "Wybierz plik proko\u0142u"
-    ::msgcat::mcset pl "Select a file to source" "Wybierz plik do wykonania"
-    ::msgcat::mcset pl "&Selection:" "&Wyb\u00f3r:"
-    ::msgcat::mcset pl "Skip Messages" "Omi\u0144 pozosta\u0142e komunikaty"
-    ::msgcat::mcset pl "&Source..." "&Kod \u017ar\u00f3d\u0142owy..."
-    ::msgcat::mcset pl "Tcl Scripts" "Tcl-skrypty"
-    ::msgcat::mcset pl "Tcl for Windows" "Tcl dla Okienek (Windows)"
-    ::msgcat::mcset pl "Text Files" "Pliki Tekstowe"
-    ::msgcat::mcset pl "&Yes" "&Tak"
-    ::msgcat::mcset pl "abort" "zako\u0144cz"
-    ::msgcat::mcset pl "blue" "niebieski"
-    ::msgcat::mcset pl "cancel" "anuluj"
-    ::msgcat::mcset pl "extension" "rozszerzenie"
-    ::msgcat::mcset pl "extensions" "rozszerzenia"
-    ::msgcat::mcset pl "green" "zielony"
-    ::msgcat::mcset pl "ignore" "ignoruj"
-    ::msgcat::mcset pl "red" "czerwony"
-    ::msgcat::mcset pl "retry" "potw\u00f3rz"
-    ::msgcat::mcset pl "yes" "tak"
-}
diff --git a/ext/tk/sample/msgs_tk/ru.msg b/ext/tk/sample/msgs_tk/ru.msg
deleted file mode 100644
index db009a4a52..0000000000
--- a/ext/tk/sample/msgs_tk/ru.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset ru "Application Error" "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435"
-    ::msgcat::mcset ru "Blue" " \u0413\u043e\u043b\u0443\u0431\u043e\u0439"
-    ::msgcat::mcset ru "Color" "\u0426\u0432\u0435\u0442"
-    ::msgcat::mcset ru "Delete" "\u0423\u0434\u0430\u043b\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Error" "\u041e\u0448\u0438\u0431\u043a\u0430"
-    ::msgcat::mcset ru "Exit" "\u0412\u044b\u0445\u043e\u0434"
-    ::msgcat::mcset ru "Green" "\u0417\u0435\u043b\u0435\u043d\u044b\u0439"
-    ::msgcat::mcset ru "Red" "\u041a\u0440\u0430\u0441\u043d\u044b\u0439"
-    ::msgcat::mcset ru "blue" " \u0433\u043e\u043b\u0443\u0431\u043e\u0439"
-    ::msgcat::mcset ru "green" " \u0437\u0435\u043b\u0435\u043d\u044b\u0439"
-    ::msgcat::mcset ru "red" " \u043a\u0440\u0430\u0441\u043d\u044b\u0439"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset ru "&Abort" "&\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c"
-    ::msgcat::mcset ru "About..." "\u041f\u0440\u043e..."
-    ::msgcat::mcset ru "All Files" "\u0412\u0441\u0435 \u0444\u0430\u0439\u043b\u044b"
-    ::msgcat::mcset ru "Application Error" "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435"
-    ::msgcat::mcset ru "&Blue" " &\u0413\u043e\u043b\u0443\u0431\u043e\u0439"
-    ::msgcat::mcset ru "&Cancel" "\u041e\u0442&\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "Cannot change to the directory \"%1\$s\".\nPermission denied." \
-			"\u041d\u0435 \u043c\u043e\u0433\u0443 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \"%1\$s\".\n\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0440\u0430\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u0430"
-    ::msgcat::mcset ru "Choose Directory" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433"
-    ::msgcat::mcset ru "Clear" "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Color" "\u0426\u0432\u0435\u0442"
-    ::msgcat::mcset ru "Console" "\u041a\u043e\u043d\u0441\u043e\u043b\u044c"
-    ::msgcat::mcset ru "Copy" "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c"
-    ::msgcat::mcset ru "Cut" "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c"
-    ::msgcat::mcset ru "Delete" "\u0423\u0434\u0430\u043b\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Details >>" "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 >>"
-    ::msgcat::mcset ru "Directory \"%1\$s\" does not exist." "\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \"%1\$s\" \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442."
-    ::msgcat::mcset ru "&Directory:" "&\u041a\u0430\u0442\u0430\u043b\u043e\u0433:"
-    ::msgcat::mcset ru "Error: %1\$s" "\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s"
-    ::msgcat::mcset ru "Exit" "\u0412\u044b\u0445\u043e\u0434"
-    ::msgcat::mcset ru "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \
-			    "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?"
-    ::msgcat::mcset ru "File \"%1\$s\" already exists.\n\n" "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\n"
-    ::msgcat::mcset ru "File \"%1\$s\" does not exist." "\u0424\u0430\u0439\u043b \"%1\$s\" \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d."
-    ::msgcat::mcset ru "File &name:" "&\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430:"
-    ::msgcat::mcset ru "File &names:" "&\u0418\u043c\u0435\u043d\u0430 \u0444\u0430\u0439\u043b\u043e\u0432:"
-    ::msgcat::mcset ru "Files of &type:" "&\u0422\u0438\u043f \u0444\u0430\u0439\u043b\u043e\u0432:"
-    ::msgcat::mcset ru "Fi&les:" "\u0424\u0430\u0439&\u043b\u044b:"
-    ::msgcat::mcset ru "&Filter" "&\u0424\u0438\u043b\u044c\u0442\u0440"
-    ::msgcat::mcset ru "Fil&ter:" "\u0424\u0438\u043b\u044c&\u0442\u0440:"
-    ::msgcat::mcset ru "&Green" " &\u0417\u0435\u043b\u0435\u043d\u044b\u0439"
-    ::msgcat::mcset ru "Hi" "\u041f\u0440\u0438\u0432\u0435\u0442"
-    ::msgcat::mcset ru "Hide Console" "\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c"
-    ::msgcat::mcset ru "&Ignore" "&\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c"
-    ::msgcat::mcset ru "Invalid file name \"%1\$s\"." "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \"%1\$s\"."
-    ::msgcat::mcset ru "Log Files" "\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430"
-    ::msgcat::mcset ru "&No" "&\u041d\u0435\u0442"
-    ::msgcat::mcset ru "&OK" "&\u041e\u041a"
-    ::msgcat::mcset ru "Ok" "\u0414\u0430"
-    ::msgcat::mcset ru "Open" "\u041e\u0442\u043a\u0440\u044b\u0442\u044c"
-    ::msgcat::mcset ru "&Open" "&\u041e\u0442\u043a\u0440\u044b\u0442\u044c"
-    ::msgcat::mcset ru "Open Multiple Files" "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0444\u0430\u0439\u043b\u043e\u0432"
-    ::msgcat::mcset ru "Paste" "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Quit" "\u0412\u044b\u0445\u043e\u0434"
-    ::msgcat::mcset ru "&Red" " &\u041a\u0440\u0430\u0441\u043d\u044b\u0439"
-    ::msgcat::mcset ru "Replace existing file?" "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b?"
-    ::msgcat::mcset ru "&Retry" "&\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c"
-    ::msgcat::mcset ru "&Save" "&\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Save As" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a"
-    ::msgcat::mcset ru "Save To Log" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432 \u0436\u0443\u0440\u043d\u0430\u043b"
-    ::msgcat::mcset ru "Select Log File" "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0436\u0443\u0440\u043d\u0430\u043b"
-    ::msgcat::mcset ru "Select a file to source" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0430\u0446\u0438\u0438"
-    ::msgcat::mcset ru "&Selection:" "&Selection:"
-    ::msgcat::mcset ru "Skip Messages" "\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f"
-    ::msgcat::mcset ru "Source..." "\u0418\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0430\u0439\u043b..."
-    ::msgcat::mcset ru "Tcl Scripts" "\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430 \u043d\u0430 \u044f\u0437\u044b\u043a\u0435 TCL"
-    ::msgcat::mcset ru "Tcl for Windows" "TCL \u0434\u043b\u044f Windows"
-    ::msgcat::mcset ru "Text Files" "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0435 \u0444\u0430\u0439\u043b\u044b"
-    ::msgcat::mcset ru "&Yes" "&\u0414\u0430"
-    ::msgcat::mcset ru "abort" "\u043e\u0442\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "blue" " \u0433\u043e\u043b\u0443\u0431\u043e\u0439"
-    ::msgcat::mcset ru "cancel" "\u043e\u0442\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "extension" "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435"
-    ::msgcat::mcset ru "extensions" "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f"
-    ::msgcat::mcset ru "green" " \u0437\u0435\u043b\u0435\u043d\u044b\u0439"
-    ::msgcat::mcset ru "ignore" "\u043f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c"
-    ::msgcat::mcset ru "ok" "\u043e\u043a"
-    ::msgcat::mcset ru "red" " \u043a\u0440\u0430\u0441\u043d\u044b\u0439"
-    ::msgcat::mcset ru "retry" "\u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c"
-    ::msgcat::mcset ru "yes" "\u0434\u0430"
-}
-
diff --git a/ext/tk/sample/multi-ip_sample.rb b/ext/tk/sample/multi-ip_sample.rb
deleted file mode 100644
index eccf0201f8..0000000000
--- a/ext/tk/sample/multi-ip_sample.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env ruby
-# This script is a sample of MultiTkIp class
-
-require "multi-tk"
-
-# create slave interpreters
-trusted_slave = MultiTkIp.new_slave
-safe_slave1   = MultiTkIp.new_safeTk
-safe_slave2   = MultiTkIp.new_safeTk('fill'=>:none, 'expand'=>false)
-#safe_slave2   = MultiTkIp.new_safeTk('fill'=>:none)
-#safe_slave2   = MultiTkIp.new_safeTk('expand'=>false)
-
-cmd = Proc.new{|txt|
-  #####################
-  ## from TkTimer2.rb
-
-  if TkCore::INTERP.safe?
-    # safeTk doesn't have permission to call 'wm' command
-  else
-    root = TkRoot.new(:title=>'timer sample')
-  end
-  label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
-                  .pack(:side=>:bottom, :fill=>:both)
-
-  tick = proc{|aobj|
-    cnt = aobj.return_value + 5
-    label.text format("%d.%02d", *(cnt.divmod(100)))
-    cnt
-  }
-
-  timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
-
-=begin
-  TkButton.new(:text=>'Start') {
-    command proc{ timer.continue unless timer.running? }
-    pack(:side=>:left, :fill=>:both, :expand=>true)
-  }
-  TkButton.new(:text=>'Restart') {
-    command proc{ timer.restart(0, proc{ label.text('0.00'); 0 }) }
-    pack('side'=>'right','fill'=>'both','expand'=>'yes')
-  }
-  TkButton.new(:text=>'Stop') {
-    command proc{ timer.stop if timer.running? }
-    pack('side'=>'right','fill'=>'both','expand'=>'yes')
-  }
-=end
-  b_start = TkButton.new(:text=>'Start', :state=>:disabled) {
-    pack(:side=>:left, :fill=>:both, :expand=>true)
-  }
-
-  b_stop  = TkButton.new(:text=>'Stop', :state=>:normal) {
-    pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-  }
-
-  b_start.command {
-    timer.continue
-    b_stop.state(:normal)
-    b_start.state(:disabled)
-  }
-
-  b_stop.command {
-    timer.stop
-    b_start.state(:normal)
-    b_stop.state(:disabled)
-  }
-
-  TkButton.new(:text=>'Reset', :state=>:normal) {
-    command { timer.reset }
-    pack('side'=>'right', 'fill'=>'both', 'expand'=>'yes')
-  }
-
-  ev_quit = TkVirtualEvent.new('Control-c', 'Control-q')
-  Tk.root.bind(ev_quit, proc{Tk.exit}).focus
-}
-
-# call on the default master interpreter
-trusted_slave.eval_proc(cmd, 'trusted')  # label -> .w00012
-safe_slave1.eval_proc(cmd, 'safe1')      # label -> .w00016
-safe_slave2.eval_proc(cmd, 'safe2')      # label -> .w00020
-cmd.call('master')                       # label -> .w00024
-
-#second_master = MultiTkIp.new(&cmd)
-#second_master = MultiTkIp.new(:safe=>2){p [:second_master, $SAFE]}
-
-TkTimer.new(2000, -1, proc{p ['safe1', safe_slave1.deleted?]}).start
-TkTimer.new(2000, -1, proc{p ['safe2', safe_slave2.deleted?]}).start
-TkTimer.new(2000, -1, proc{p ['trusted', trusted_slave.deleted?]}).start
-
-TkTimer.new(5000, 1,
-            proc{
-              safe_slave1.eval_proc{Tk.root.destroy}
-              safe_slave1.delete
-              print "*** The safe_slave1 is deleted by the timer.\n"
-            }).start
-
-TkTimer.new(10000, 1,
-            proc{
-              trusted_slave.eval_proc{Tk.root.destroy}
-              trusted_slave.delete
-              print "*** The trusted_slave is deleted by the timer.\n"
-            }).start
-
-Tk.mainloop
diff --git a/ext/tk/sample/multi-ip_sample2.rb b/ext/tk/sample/multi-ip_sample2.rb
deleted file mode 100644
index 79c78dec4a..0000000000
--- a/ext/tk/sample/multi-ip_sample2.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'multi-tk.rb'
-
-th = Thread.new{Tk.mainloop}
-
-TkLabel.new(:text=>'this is a primary master').pack
-
-ip1 = MultiTkIp.new_slave(:safe=>1)
-ip2 = MultiTkIp.new_slave(:safe=>2)
-
-cmd = proc{|s|
-  require 'tk'
-
-  TkButton.new(:text=>'b1: p self', :command=>proc{p self}).pack(:fill=>:x)
-  sleep s
-  TkButton.new(:text=>'b2: p $SAFE', :command=>proc{p $SAFE}).pack(:fill=>:x)
-  sleep s
-  TkButton.new(:text=>'b3: p MultiTkIp.ip_name',
-               :command=>proc{p MultiTkIp.ip_name}).pack(:fill=>:x)
-  sleep s
-  TkButton.new(:text=>'EXIT', :command=>proc{exit}).pack(:fill=>:x)
-
-  Tk.mainloop
-}
-
-Thread.new{ip1.eval_proc(cmd, 1.1)}
-Thread.new{ip2.eval_proc(cmd, 0.3)}
-cmd.call(0.7)
-
-th.join
diff --git a/ext/tk/sample/optobj_sample.rb b/ext/tk/sample/optobj_sample.rb
deleted file mode 100644
index a781254a28..0000000000
--- a/ext/tk/sample/optobj_sample.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  sample script of Tk::OptionObj
-#
-require "tk"
-
-optobj = Tk::OptionObj.new('foreground'=>'red', 'background'=>'black')
-
-f = TkFrame.new.pack(:side=>:left, :anchor=>:n, :padx=>5, :pady=>30)
-
-b1 = TkButton.new(f, :text=>'AAA').pack(:fill=>:x)
-b2 = TkButton.new(f, :text=>'BBB').pack(:fill=>:x)
-b3 = TkButton.new(f, :text=>'CCC').pack(:fill=>:x)
-
-optobj.assign( b1,
-              [ b2, 'configure',
-                { 'foreground'=>'background',
-                  'background'=>'foreground' } ],
-              [ b3, nil,
-                { 'foreground'=>'background',
-                  'activeforeground'=>nil,
-                  'background'=>['foreground', 'activeforeground'] } ] )
-
-optobj.update('activeforeground'=>'yellow')
-
-TkButton.new(f){
-  configure( optobj.assign(self) + {:text=>'DDD'} )
-  pack(:fill=>:x)
-}
-
-TkButton.new(f){
-  configure( optobj.assign([self, nil,
-                             {'foreground'=>'activeforeground',
-                              'background'=>'foreground',
-                              'activeforeground'=>'background'}]) \
-             + {:text=>'EEE', :relief=>:groove, :borderwidth=>5} )
-  pack(:fill=>:x)
-}
-
-optobj.notify  # To apply the convert_key ( 3rd element of widget info
-               # (that is, {'foreground'=>'activeforeground', ,,, } )
-               # of the 'EEE' button
-
-TkButton.new(f, :text=>'toggle',
-             :command=>proc{
-               fg = optobj['foreground']
-               bg = optobj['background']
-               optobj.configure('foreground'=>bg, 'background'=>fg)
-             }).pack(:fill=>:x, :pady=>10)
-
-TkButton.new(f, :text=>'exit',
-                :command=>proc{exit}).pack(:fill=>:x, :pady=>10)
-
-TkFrame.new{|f|
-  pack(:side=>:right, :expand=>true, :fill=>:both)
-  TkLabel.new(f, :text=>'source::').pack(:anchor=>:w)
-  TkFrame.new(f){|ff|
-    TkText.new(ff){
-      yscrollbar(TkScrollbar.new(ff){pack(:fill=>:y, :side=>:right)})
-      insert('end', File.read(__FILE__))
-      pack(:side=>:left, :expand=>true, :fill=>:both)
-    }
-    pack(:expand=>true, :fill=>:both)
-  }
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/propagate.rb b/ext/tk/sample/propagate.rb
deleted file mode 100644
index 66f14aeb72..0000000000
--- a/ext/tk/sample/propagate.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-
-TkLabel.new(:text=>"Please click the bottom frame").pack
-
-f = TkFrame.new(:width=>400, :height=>100, :background=>'yellow',
-                :relief=>'ridge', :borderwidth=>5).pack
-
-# TkPack.propagate(f, false) # <== important!!
-f.pack_propagate(false)      # <== important!!
-
-list = (1..3).collect{|n|
-  TkButton.new(f, :text=>"button#{'-X'*n}"){
-    command proc{
-      puts "button#{'-X'*n}"
-      self.unpack
-    }
-  }
-}
-
-list.unshift(nil)
-
-f.bind('1', proc{
-         w = list.shift
-         w.unpack if w
-         list.push(w)
-         list[0].pack(:expand=>true, :anchor=>:center) if list[0]
-       })
-
-Tk.mainloop
diff --git a/ext/tk/sample/remote-ip_sample.rb b/ext/tk/sample/remote-ip_sample.rb
deleted file mode 100644
index f6eed9e985..0000000000
--- a/ext/tk/sample/remote-ip_sample.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-require 'remote-tk'
-
-puts <<EOM
-This sample controls the other Tk interpreter (Ruby/Tk, Tcl/Tk, and so on)
-which running on the other process. For this purpose, Ruby/Tk uses Tcl/Tk's
-'send' command. Availability of the command depends on your GUI environment.
-If this script doesn't work, please check your environment (see Tcl/Tk FAQ).
-EOM
-#'
-
-unless (wish = TkWinfo.interps.find{|ip| ip =~ /^wish/})
-  puts ''
-  puts 'Please start "wish" (Tcl/Tk shell) before running this sample script.'
-  exit 1
-end
-
-ip = RemoteTkIp.new(wish)
-ip.eval_proc{TkButton.new(:command=>proc{puts 'This procesure is on the controller-ip (Ruby/Tk)'}, :text=>'print on Ruby/Tk (controller-ip)').pack(:fill=>:x)}
-ip.eval_proc{TkButton.new(:command=>'puts {This procesure is on the remote-ip (wish)}', :text=>'print on wish (remote-ip)').pack(:fill=>:x)}
-
-# If your remote-ip is Ruby/Tk, you can control the remote Ruby by
-# 'ruby' or 'ruby_eval' or 'ruby_cmd' on the Tk interpreter.
-if ip.is_rubytk?
-  ip.eval_proc{TkButton.new(:command=>'ruby {p 111; p Array.new(3,"ruby")}', :text=>'ruby cmd on the remote-ip').pack(:fill=>:x)}
-end
-
-ip.eval_proc{TkButton.new(:command=>'exit', :text=>'QUIT').pack(:fill=>:x)}
-
-TkButton.new(:command=>proc{exit}, :text=>'QUIT',
-             :padx=>10, :pady=>7).pack(:padx=>10, :pady=>7)
-
-Tk.mainloop
diff --git a/ext/tk/sample/remote-ip_sample2.rb b/ext/tk/sample/remote-ip_sample2.rb
deleted file mode 100644
index d8cf3c7650..0000000000
--- a/ext/tk/sample/remote-ip_sample2.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'remote-tk'
-
-# start sub-process
-ip_name = 'remote_ip'
-ip_list = TkWinfo.interps
-fork{
-  exec "/usr/bin/env ruby -r tk -e \"Tk.appname('#{ip_name}');Tk.mainloop\""
-}
-sleep 1 until (app = (TkWinfo.interps - ip_list)[0]) && app =~ /^#{ip_name}/
-p TkWinfo.interps
-
-# create RemoteTkIp object
-ip = RemoteTkIp.new(app)
-
-# setup remote-ip window
-btns = []
-ip.eval_proc{
-  btns <<
-    TkButton.new(:command=>proc{
-                   puts 'This procesure is on the controller-ip (Ruby-side)'
-                 },
-                 :text=>'print on controller-ip (Ruby-side)').pack(:fill=>:x)
-
-  btns <<
-    TkButton.new(:command=>
-                   'puts {This procesure is on the remote-ip (Tk-side)}',
-                 :text=>'print on remote-ip (Tk-side)').pack(:fill=>:x)
-
-  btns <<
-    TkButton.new(:command=>
-                   'ruby {
-                     puts "This procedure is on the remote-ip (Ruby-side)"
-                     p Array.new(3,"ruby")
-                    }',
-                 :text=>'ruby cmd on the remote-ip').pack(:fill=>:x)
-
-  TkButton.new(:command=>'exit', :text=>'QUIT').pack(:fill=>:x)
-}
-
-# setup controller-ip window
-btns.each_with_index{|btn, idx|
-  # The scope of the eval-block of 'eval_proc' method is different from
-  # the enternal. If you want to pass local values to the eval-block,
-  # use arguments of eval_proc method. They are passed to block-arguments.
-  TkButton.new(:command=>proc{ip.eval_proc(btn){|b| b.flash}},
-               :text=>"flash button-#{idx}",
-               :padx=>10).pack(:padx=>10, :pady=>2)
-}
-
-TkButton.new(:command=>proc{exit}, :text=>'QUIT',
-             :padx=>10, :pady=>7).pack(:padx=>10, :pady=>7)
-
-# start eventloop
-Tk.mainloop
diff --git a/ext/tk/sample/resource.en b/ext/tk/sample/resource.en
deleted file mode 100644
index 39b4013971..0000000000
--- a/ext/tk/sample/resource.en
+++ /dev/null
@@ -1,13 +0,0 @@
-!
-!  see Tcl/Tk's "options" manual for "Database Name" and "Database Class"
-!
-*BtnFrame.borderWidth: 5
-*BtnFrame.relief: ridge
-*BtnFrame.Button.background: wheat
-*BtnFrame.Button.foreground: red
-*hello.text: HELLO
-*quit.text: QUIT
-*BTN_CMD.show_msg: {|arg| print "($SAFE=#{$SAFE}) ";\
-                          print "Hello!! This is a sample of #{arg}.";\
-                          print "(<<< $SAFE=#{$SAFE})\n"}
-*BTN_CMD.bye_msg:  {print "($SAFE=#{$SAFE} >>>) Good-bye��(<<< $SAFE=#{$SAFE})\n"}
diff --git a/ext/tk/sample/resource.ja b/ext/tk/sample/resource.ja
deleted file mode 100644
index a61390f95d..0000000000
--- a/ext/tk/sample/resource.ja
+++ /dev/null
@@ -1,13 +0,0 @@
-!
-!  see Tcl/Tk's "options" manual for "Database Name" and "Database Class"
-!
-*BtnFrame.borderWidth: 5
-*BtnFrame.relief: ridge
-*BtnFrame.Button.background: wheat
-*BtnFrame.Button.foreground: red
-*hello.text: ����ˤ���
-*quit.text: ��λ
-*BTN_CMD.show_msg: {|arg| print "($SAFE=#{$SAFE} >>>) ";\
-                          print "����ˤ��ϡ��� #{arg} �Υ���ץ�Ǥ���";\
-                          print "(<<< $SAFE=#{$SAFE})\n"}
-*BTN_CMD.bye_msg:  {print "($SAFE=#{$SAFE} >>>) ���褦�ʤ顥(<<< $SAFE=#{$SAFE})\n"}
diff --git a/ext/tk/sample/safe-tk.rb b/ext/tk/sample/safe-tk.rb
deleted file mode 100644
index 38131c0155..0000000000
--- a/ext/tk/sample/safe-tk.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env ruby
-# This script is a sample of MultiTkIp class
-
-require "multi-tk"
-
-###############################
-
-TkLabel.new(:text=>'This is the Default Master Ipnterpreter').pack(:padx=>5, :pady=>3)
-TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack(:pady=>3)
-TkFrame.new(:borderwidth=>2, :height=>3,
-            :relief=>:sunken).pack(:fill=>:x, :expand=>true,
-                                   :padx=>10, :pady=>7)
-
-safe0_p = proc{|*args| p args}
-
-###############################
-
-puts "---- create a safe slave IP with Ruby's safe-level == 1 ----------"
-ip = MultiTkIp.new_safe_slave(1){|*args| safe0_p["safe_slave safe_level == #{$SAFE}", args]}
-
-puts "\n---- create procs ----------"
-puts 'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}'
-#x = proc{p ['proc x', "$SAFE==#{$SAFE}"]; exit}
-x = proc{p ['proc x', "$SAFE==#{$SAFE}"]; exit}
-TkLabel.new(:text=>'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}',
-            :anchor=>:w).pack(:fill=>:x)
-
-puts 'y = proc{|label| p [\'proc y\', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}'
-y = proc{|label| p ['proc y', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}
-TkLabel.new(:text=>'y = proc{|label| p [\'proc y\', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}',
-            :anchor=>:w).pack(:fill=>:x)
-
-puts 'z = proc{p [\'proc z\', "$SAFE==#{$SAFE}"]; exit}'
-z = proc{p ['proc z', "$SAFE==#{$SAFE}"]; exit}
-TkLabel.new(:text=>'z = proc{p [\'proc z\', "$SAFE==#{$SAFE}"]; exit}',
-            :anchor=>:w).pack(:fill=>:x)
-
-puts "\n---- call 1st eval_proc ----------"
-print 'lbl = '
-p lbl = ip.eval_proc{
-  TkLabel.new(:text=>"1st eval_proc : $SAFE == #{$SAFE}").pack
-
-  f = TkFrame.new.pack
-  TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
-  # TkLabel.new(f, :text=>" (<-- 'lbl' widget is here)").pack(:side=>:right)
-  l = TkLabel.new(f).pack(:side=>:right)
-
-  TkButton.new(:text=>':command=>proc{l.text($SAFE)}',
-               :command=>proc{l.text($SAFE)}).pack(:fill=>:x, :padx=>5)
-  TkButton.new(:text=>':command=>x', :command=>x).pack(:fill=>:x, :padx=>5)
-  TkButton.new(:text=>':command=>proc{exit}',
-               :command=>proc{
-                 safe0_p["'exit' is called at $SAFE=#{$SAFE}"];exit}
-               ).pack(:fill=>:x, :padx=>5)
-  TkFrame.new(:borderwidth=>2, :height=>3,
-              :relief=>:sunken).pack(:fill=>:x, :expand=>true,
-                                     :padx=>10, :pady=>7)
-  l # return the label widget
-}
-
-puts "\n---- change the safe slave IP's safe-level ==> 3 ----------"
-ip.safe_level = 3
-
-puts "\n---- call 2nd eval_proc ----------"
-p ip.eval_proc(proc{
-                 TkLabel.new(:text=>"2nd eval_proc : $SAFE == #{$SAFE}").pack
-                 f = TkFrame.new.pack
-                 TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
-                 l = TkLabel.new(f, :text=>$SAFE).pack(:side=>:right)
-                 TkButton.new(:text=>':command=>proc{l.text($SAFE)}',
-                              :command=>proc{l.text($SAFE)}).pack(:fill=>:x,
-                                                                  :padx=>5)
-                 TkButton.new(:text=>':command=>proc{y.call(l)}',
-                              :command=>proc{y.call(l)}).pack(:fill=>:x,
-                                                              :padx=>5)
-                 TkButton.new(:text=>':command=>proc{Proc.new(&y).call(l)}',
-                              :command=>proc{
-                                Proc.new(&y).call(l)
-                              }).pack(:fill=>:x, :padx=>5)
-                 TkButton.new(:text=>':command=>proc{MultiTkIp._proc_on_current_safelevel(y).call(l)}',
-                              :command=>proc{
-                                MultiTkIp._proc_on_current_safelevel(y).call(l)
-                              }).pack(:fill=>:x, :padx=>5)
-if false && Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
-                 TkButton.new(:text=>':command=>proc{Thread.new(l, &y).value}',
-                              :command=>proc{
-                                Thread.new(l, &y).value
-                              }).pack(:fill=>:x, :padx=>5)
-else
-  # KNOWN BUG::
-  #   Current multi-tk.rb cannot support long term threads on callbacks.
-  #   Such a thread freezes the Ruby/Tk process.
-end
-                 TkButton.new(:text=>':command=>proc{z.call}',
-                              :command=>proc{z.call}).pack(:fill=>:x, :padx=>5)
-                 TkFrame.new(:borderwidth=>2, :height=>3,
-                             :relief=>:sunken).pack(:fill=>:x, :expand=>true,
-                                                    :padx=>10, :pady=>7)
-               })
-
-puts "\n---- call 1st and 2nd eval_str ----------"
-p bind = ip.eval_str('
-  TkLabel.new(:text=>"1st and 2nd eval_str : $SAFE == #{$SAFE}").pack
-  f = TkFrame.new.pack
-  TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
-  l = TkLabel.new(f, :text=>$SAFE).pack(:side=>:right)
-  TkButton.new(:text=>":command=>proc{y.call(l)}",
-               :command=>proc{y.call(l)}).pack(:fill=>:x, :padx=>5)
-  binding
-', binding)
-
-p ip.eval_str("
-  TkButton.new(:text=>':command=>proc{ l.text = $SAFE }',
-               :command=>proc{ l.text = $SAFE }).pack(:fill=>:x, :padx=>5)
-  TkFrame.new(:borderwidth=>2, :height=>3,
-              :relief=>:sunken).pack(:fill=>:x, :expand=>true,
-                                     :padx=>10, :pady=>7)
-", bind)
-
-puts "\n---- change the safe slave IP's safe-level ==> 4 ----------"
-ip.safe_level = 4
-
-puts "\n---- call 3rd and 4th eval_proc ----------"
-p ip.eval_proc{
-  TkLabel.new(:text=>"3rd and 4th eval_proc : $SAFE == #{$SAFE}").pack
-}
-p ip.eval_proc{
-  TkButton.new(:text=>':command=>proc{ lbl.text = $SAFE }',
-               :command=>proc{ lbl.text = $SAFE }).pack(:fill=>:x, :padx=>5)
-}
-
-puts "\n---- start event-loop ( current $SAFE == #{$SAFE} ) ----------"
-
-Tk.mainloop
diff --git a/ext/tk/sample/scrollframe.rb b/ext/tk/sample/scrollframe.rb
deleted file mode 100644
index e340e1da3c..0000000000
--- a/ext/tk/sample/scrollframe.rb
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-#  Tk::RbWidget::ScrollFrame class
-#
-#    This widget class is a frame widget with scrollbars.
-#    The ScrollFrame doesn't propagate the size of embedded widgets.
-#    When it is configured, scrollregion of the container is changed.
-#
-#    Scrollbars can be toggled by Tk::RbWidget::ScrollFrame#vscroll & hscroll.
-#    If horizontal or virtical scrollbar is turned off, the horizontal
-#    or virtical size of embedded widgets is propagated.
-#
-#                         Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-class Tk::RbWidget::ScrollFrame < TkFrame
-  include TkComposite
-
-  DEFAULT_WIDTH  = 200
-  DEFAULT_HEIGHT = 200
-
-  def initialize_composite(keys={})
-    @frame.configure(:width=>DEFAULT_WIDTH, :height=>DEFAULT_HEIGHT)
-
-    # create scrollbars
-    @h_scroll = TkScrollbar.new(@frame, 'orient'=>'horizontal')
-    @v_scroll = TkScrollbar.new(@frame, 'orient'=>'vertical')
-
-    # create a canvas widget
-    @canvas = TkCanvas.new(@frame,
-                           :borderwidth=>0, :selectborderwidth=>0,
-                           :highlightthickness=>0)
-
-    # allignment
-    TkGrid.rowconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
-    @canvas.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
-    @frame.grid_propagate(false)
-
-    # assign scrollbars
-    @canvas.xscrollbar(@h_scroll)
-    @canvas.yscrollbar(@v_scroll)
-
-    # convert hash keys
-    keys = _symbolkey2str(keys)
-
-    # check options for the frame
-    framekeys = {}
-    if keys.key?('classname')
-       keys['class'] = keys.delete('classname')
-    end
-    if @classname = keys.delete('class')
-      framekeys['class'] = @classname
-    end
-    if @colormap  = keys.delete('colormap')
-      framekeys['colormap'] = @colormap
-    end
-    if @container = keys.delete('container')
-      framekeys['container'] = @container
-    end
-    if @visual    = keys.delete('visual')
-      framekeys['visual'] = @visual
-    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
-
-    # create base frame
-    @base = TkFrame.new(@canvas, framekeys)
-
-    # embed base frame
-    @cwin = TkcWindow.new(@canvas, [0, 0], :window=>@base, :anchor=>'nw')
-    @canvas.scrollregion(@cwin.bbox)
-
-    # binding to reset scrollregion
-    @base.bind('Configure'){ _reset_scrollregion(nil, nil) }
-
-    # set default receiver of method calls
-    @path = @base.path
-
-    # scrollbars ON
-    vscroll(keys.delete('vscroll'){true})
-    hscroll(keys.delete('hscroll'){true})
-
-    # please check the differences of the following definitions
-    option_methods(
-      :scrollbarwidth
-    )
-
-    # set receiver widgets for configure methods (with alias)
-    delegate_alias('scrollbarrelief', 'relief', @h_scroll, @v_scroll)
-
-    # set receiver widgets for configure methods
-    delegate('DEFAULT', @base)
-    delegate('background', @frame, @base, @canvas, @h_scroll, @v_scroll)
-    delegate('width', @frame)
-    delegate('height', @frame)
-    delegate('activebackground', @h_scroll, @v_scroll)
-    delegate('troughcolor', @h_scroll, @v_scroll)
-    delegate('repeatdelay', @h_scroll, @v_scroll)
-    delegate('repeatinterval', @h_scroll, @v_scroll)
-    delegate('borderwidth', @frame)
-    delegate('relief', @frame)
-
-    # do configure
-    configure keys unless keys.empty?
-  end
-
-  # callback for Configure event
-  def _reset_scrollregion(h_mod=nil, v_mod=nil)
-    cx1, cy1, cx2, cy2 = @canvas.scrollregion
-    x1, y1, x2, y2 = @cwin.bbox
-    @canvas.scrollregion([x1, y1, x2, y2])
-
-    if h_mod.nil? && v_mod.nil?
-      if x2 != cx2 && TkGrid.info(@h_scroll).size == 0
-        @frame.grid_propagate(true)
-        @canvas.width  = x2
-        Tk.update_idletasks
-        @frame.grid_propagate(false)
-      end
-      if y2 != cy2 && TkGrid.info(@v_scroll).size == 0
-        @frame.grid_propagate(true)
-        @canvas.height = y2
-        Tk.update_idletasks
-        @frame.grid_propagate(false)
-      end
-    else
-      @h_scroll.ungrid if h_mod == false
-      @v_scroll.ungrid if v_mod == false
-
-      h_flag = (TkGrid.info(@h_scroll).size == 0)
-      v_flag = (TkGrid.info(@v_scroll).size == 0)
-
-      @frame.grid_propagate(true)
-
-      @canvas.width  = (h_flag)? x2: @canvas.winfo_width
-      @canvas.height = (v_flag)? y2: @canvas.winfo_height
-
-      @h_scroll.grid('row'=>1, 'column'=>0, 'sticky'=>'ew') if h_mod
-      @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns') if v_mod
-
-      Tk.update_idletasks
-
-      @frame.grid_propagate(false)
-    end
-  end
-  private :_reset_scrollregion
-
-  # forbid to change binding of @base frame
-  def bind(*args)
-    @frame.bind(*args)
-  end
-  def bind_append(*args)
-    @frame.bind_append(*args)
-  end
-  def bind_remove(*args)
-    @frame.bind_remove(*args)
-  end
-  def bindinfo(*args)
-    @frame.bindinfo(*args)
-  end
-
-  # set width of scrollbar
-  def scrollbarwidth(width = nil)
-    if width
-      @h_scroll.width(width)
-      @v_scroll.width(width)
-    else
-      @h_scroll.width
-    end
-  end
-
-  # vertical scrollbar : ON/OFF
-  def vscroll(mode)
-    Tk.update_idletasks
-    st = TkGrid.info(@v_scroll)
-    if mode && st.size == 0 then
-      @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns')
-      _reset_scrollregion(nil, true)
-    elsif !mode && st.size != 0 then
-      _reset_scrollregion(nil, false)
-    else
-      _reset_scrollregion(nil, nil)
-    end
-    self
-  end
-
-  # horizontal scrollbar : ON/OFF
-  def hscroll(mode)
-    Tk.update_idletasks
-    st = TkGrid.info(@h_scroll)
-    if mode && st.size == 0 then
-      _reset_scrollregion(true, nil)
-    elsif !mode && st.size != 0 then
-      _reset_scrollregion(false, nil)
-    else
-      _reset_scrollregion(nil, nil)
-    end
-    self
-  end
-end
-
-# test
-if __FILE__ == $0
-  f = Tk::RbWidget::ScrollFrame.new(:scrollbarwidth=>10,
-                                    :width=>300, :height=>200)
-  f.pack(:expand=>true, :fill=>:both)
-
-  TkButton.new(f, :text=>'foo button', :command=>proc{puts 'foo'}).pack
-  TkButton.new(f, :text=>'baaar button', :command=>proc{puts 'baaar'}).pack
-  TkButton.new(f, :text=>'baz button', :command=>proc{puts 'baz'}).pack
-  TkButton.new(f, :text=>'hoge hoge button',
-               :command=>proc{puts 'hoge hoge'}).pack(:side=>:bottom)
-
-  # f.hscroll(false)
-
-  # add a text widget
-  Tk.after(3000){
-    t = TkText.new(f).pack(:expand=>true, :fill=>:both)
-    t.insert(:end, "An example of Tk::RbWidget::ScrollFrame widget.\n\n")
-    t.insert(:end, "Here is a text widget.\n")
-    t.insert(:end, "Please resize the application window, ")
-    t.insert(:end, "and try the scrollbars ")
-    t.insert(:end, "to move the view of packed widgets.\n")
-  }
-
-  # remove a vertical scrollbar, and then the scrollframe is not scrollable.
-  Tk.after(6000){ f.vscroll(false) }
-
-  # add a vertical scrollbar, and make the scrollframe scrollable.
-  Tk.after(9000){ f.vscroll(true) }
-
-  # remove a horizontal scrollbar, and then the scrollframe is not scrollable.
-  Tk.after(12000){ f.hscroll(false) }
-
-  # add a horizontal scrollbar, and make the scrollframe scrollable.
-  Tk.after(15000){ f.hscroll(true) }
-
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/tcltklib/batsu.gif b/ext/tk/sample/tcltklib/batsu.gif
deleted file mode 100644
index 880cc73e09..0000000000
--- a/ext/tk/sample/tcltklib/batsu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tcltklib/lines0.tcl b/ext/tk/sample/tcltklib/lines0.tcl
deleted file mode 100644
index 8ed3c5e1c1..0000000000
--- a/ext/tk/sample/tcltklib/lines0.tcl
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/local/bin/wish
-
-proc drawlines {} {
-    puts [clock format [clock seconds]]
-
-    for {set j 0} {$j < 100} {incr j} {
-	puts -nonewline "*"
-	flush stdout
-	if {$j & 1} {
-	    set c "blue"
-	} {
-	    set c "red"
-	}
-	for {set i 0} {$i < 100} {incr i} {
-#	    .a create line $i 0 0 [expr 500 - $i] -fill $c
-	}
-    }
-
-    puts [clock format [clock seconds]]
-
-    for {set j 0} {$j < 100} {incr j} {
-	puts -nonewline "*"
-	flush stdout
-	if {$j & 1} {
-	    set c "blue"
-	} {
-	    set c "red"
-	}
-	for {set i 0} {$i < 100} {incr i} {
-	    .a create line $i 0 0 [expr 500 - $i] -fill $c
-	}
-    }
-
-    puts [clock format [clock seconds]]
-#    destroy .
-}
-
-canvas .a -height 500 -width 500
-button .b -text draw -command drawlines
-pack .a .b -side left
-
-# eof
diff --git a/ext/tk/sample/tcltklib/lines1.rb b/ext/tk/sample/tcltklib/lines1.rb
deleted file mode 100644
index 9f21ae6377..0000000000
--- a/ext/tk/sample/tcltklib/lines1.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /usr/local/bin/ruby
-
-require "tcltk"
-
-def drawlines()
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-#      $a.e("create line", i, 0, 0, 500 - i, "-fill", col)
-    end
-  end
-
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-      $a.e("create line", i, 0, 0, 500 - i, "-fill", col)
-    end
-  end
-
-  print Time.now, "\n"
-#  $ip.commands()["destroy"].e($root)
-end
-
-$ip = TclTkInterpreter.new()
-$root = $ip.rootwidget()
-$a = TclTkWidget.new($ip, $root, "canvas", "-height 500 -width 500")
-$c = TclTkCallback.new($ip, proc{drawlines()})
-$b = TclTkWidget.new($ip, $root, "button", "-text draw -command", $c)
-
-$ip.commands()["pack"].e($a, $b, "-side left")
-
-TclTk.mainloop
-
-# eof
diff --git a/ext/tk/sample/tcltklib/lines2.rb b/ext/tk/sample/tcltklib/lines2.rb
deleted file mode 100644
index e459589f50..0000000000
--- a/ext/tk/sample/tcltklib/lines2.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /usr/local/bin/ruby
-
-require "tk"
-
-def drawlines()
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-#      TkcLine.new($a, i, 0, 0, 500 - i, "-fill", col)
-    end
-  end
-
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-      TkcLine.new($a, i, 0, 0, 500 - i, "-fill", col)
-    end
-  end
-
-  print Time.now, "\n"
-#  Tk.root.destroy
-end
-
-$a = TkCanvas.new{
-  height(500)
-  width(500)
-}
-
-$b = TkButton.new{
-  text("draw")
-  command(proc{drawlines()})
-}
-
-TkPack.configure($a, $b, {"side"=>"left"})
-
-Tk.mainloop
-
-# eof
diff --git a/ext/tk/sample/tcltklib/lines3.rb b/ext/tk/sample/tcltklib/lines3.rb
deleted file mode 100644
index caa50f92e7..0000000000
--- a/ext/tk/sample/tcltklib/lines3.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /usr/local/bin/ruby
-
-require "tk"
-
-def drawlines()
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-#      $a.create(TkcLine, i, 0, 0, 500 - i, "fill"=>col)
-    end
-  end
-
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-      $a.create(TkcLine, i, 0, 0, 500 - i, "fill"=>col)
-    end
-  end
-
-  print Time.now, "\n"
-#  Tk.root.destroy
-end
-
-$a = TkCanvas.new{
-  height(500)
-  width(500)
-}
-
-$b = TkButton.new{
-  text("draw")
-  command(proc{drawlines()})
-}
-
-TkPack.configure($a, $b, {"side"=>"left"})
-
-Tk.mainloop
-
-# eof
diff --git a/ext/tk/sample/tcltklib/lines4.rb b/ext/tk/sample/tcltklib/lines4.rb
deleted file mode 100644
index 7a1175bce0..0000000000
--- a/ext/tk/sample/tcltklib/lines4.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /usr/local/bin/ruby
-
-require "tk"
-
-def drawlines()
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-#      TkCore::INTERP.__invoke($a.path, "create", "line", i.to_s, '0', '0', (500 - i).to_s, "-fill", col)
-    end
-  end
-
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-      TkCore::INTERP.__invoke($a.path, "create", "line", i.to_s, '0', '0', (500 - i).to_s, "-fill", col)
-    end
-  end
-
-  print Time.now, "\n"
-#  Tk.root.destroy
-end
-
-$a = TkCanvas.new{
-  height(500)
-  width(500)
-}
-
-$b = TkButton.new{
-  text("draw")
-  command(proc{drawlines()})
-}
-
-TkPack.configure($a, $b, {"side"=>"left"})
-
-Tk.mainloop
-
-# eof
diff --git a/ext/tk/sample/tcltklib/maru.gif b/ext/tk/sample/tcltklib/maru.gif
deleted file mode 100644
index 2c0202892e..0000000000
--- a/ext/tk/sample/tcltklib/maru.gif
+++ /dev/null
diff --git a/ext/tk/sample/tcltklib/safeTk.rb b/ext/tk/sample/tcltklib/safeTk.rb
deleted file mode 100644
index 5d2c60e700..0000000000
--- a/ext/tk/sample/tcltklib/safeTk.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-require 'tcltklib'
-
-master = TclTkIp.new
-slave_name = 'slave0'
-slave = master.create_slave(slave_name, true)
-master._eval("::safe::interpInit #{slave_name}")
-master._eval("::safe::loadTk #{slave_name}")
-
-master._invoke('label', '.l1', '-text', 'master')
-master._invoke('pack', '.l1', '-padx', '30', '-pady', '50')
-master._eval('label .l2 -text {root widget of master-ip}')
-master._eval('pack .l2 -padx 30 -pady 50')
-
-slave._invoke('label', '.l1', '-text', 'slave')
-slave._invoke('pack', '.l1', '-padx', '30', '-pady', '50')
-slave._eval('label .l2 -text {root widget of slave-ip}')
-slave._eval('pack .l2 -padx 30 -pady 20')
-slave._eval('label .l3 -text {( container frame widget of master-ip )}')
-slave._eval('pack .l3 -padx 30 -pady 20')
-
-TclTkLib.mainloop
diff --git a/ext/tk/sample/tcltklib/sample0.rb b/ext/tk/sample/tcltklib/sample0.rb
deleted file mode 100644
index cd4c8069b4..0000000000
--- a/ext/tk/sample/tcltklib/sample0.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/local/bin/ruby -vd
-
-# tcltklib �饤�֥��Υƥ���
-
-require "tcltklib"
-
-def test
-  # ���󥿥ץ꥿����������
-  ip1 = TclTkIp.new()
-
-  # ɾ�����Ƥߤ�
-  print ip1._return_value().inspect, "\n"
-  print ip1._eval("puts {abc}").inspect, "\n"
-
-  # �ܥ�����äƤߤ�
-  print ip1._return_value().inspect, "\n"
-  print ip1._eval("button .lab -text exit -command \"destroy .\"").inspect,
-    "\n"
-  print ip1._return_value().inspect, "\n"
-  print ip1._eval("pack .lab").inspect, "\n"
-  print ip1._return_value().inspect, "\n"
-
-  # ���󥿥ץ꥿���� ruby ���ޥ�ɤ�ɾ�����Ƥߤ�
-#  print ip1._eval(%q/ruby {print "print by ruby\n"}/).inspect, "\n"
-  print ip1._eval(%q+puts [ruby {print "print by ruby\n"; "puts by tcl/tk"}]+).inspect, "\n"
-  print ip1._return_value().inspect, "\n"
-
-  # �⤦��ĥ��󥿥ץ꥿���������Ƥߤ�
-  ip2 = TclTkIp.new()
-  ip2._eval("button .lab -text test -command \"puts test ; destroy .\"")
-  ip2._eval("pack .lab")
-
-  TclTkLib.mainloop
-end
-
-test
-GC.start
-
-print "exit\n"
diff --git a/ext/tk/sample/tcltklib/sample1.rb b/ext/tk/sample/tcltklib/sample1.rb
deleted file mode 100644
index 1965781533..0000000000
--- a/ext/tk/sample/tcltklib/sample1.rb
+++ /dev/null
@@ -1,634 +0,0 @@
-#! /usr/local/bin/ruby -d
-# -*- encoding: euc-jp -*-
-# -d ���ץ������դ����, �ǥХå������ɽ������.
-
-# tcltk �饤�֥��Υ���ץ�
-
-# �ޤ�, �饤�֥��� require ����.
-require "tcltk"
-
-# �ʲ���, Test1 �Υ��󥹥��󥹤� initialize() ��,
-# tcl/tk �˴ؤ��������Ԥ���Ǥ���.
-# ɬ�����⤽�Τ褦�ˤ���ɬ�פ�̵��,
-# (�⤷, �������������) class �γ��� tcl/tk �˴ؤ��������ԤäƤ��ɤ�.
-
-class Test1
-  # �����(���󥿥ץ꥿���������ƥ��������åȤ���������).
-  def initialize()
-
-    #### �Ȥ����Τ��ޤ��ʤ�
-
-    # ���󥿥ץ꥿������.
-    ip = TclTkInterpreter.new()
-    # ���ޥ�ɤ��б����륪�֥������Ȥ� c �����ꤷ�Ƥ���.
-    c = ip.commands()
-    # ���Ѥ��륳�ޥ�ɤ��б����륪�֥������Ȥ��ѿ�������Ƥ���.
-    append, bind, button, destroy, incr, info, label, place, set, wm =
-      c.values_at(
-      "append", "bind", "button", "destroy", "incr", "info", "label", "place",
-      "set", "wm")
-
-    #### tcl/tk �Υ��ޥ�ɤ��б����륪�֥�������(TclTkCommand)�����
-
-    # �¹Ԥ������, e() �᥽�åɤ�Ȥ�.
-    # (�ʲ���, tcl/tk �ˤ����� info command r* ��¹�.)
-    print info.e("command", "r*"), "\n"
-    # ������, �ޤȤ᤿ʸ����ˤ��Ƥ�Ʊ��.
-    print info.e("command r*"), "\n"
-    # �ѿ����Ѥ��ʤ��Ȥ�¹ԤǤ��뤬, �����᤬����.
-    print c["info"].e("command", "r*"), "\n"
-    # ���󥿥ץ꥿�Υ᥽�åɤȤ��Ƥ�¹ԤǤ��뤬, ��Ψ������.
-    print ip.info("command", "r*"), "\n"
-
-    ####
-
-    # �ʲ�, �����������֥������Ȥ��ѿ����������Ƥ����ʤ���
-    # GC ���оݤˤʤäƤ��ޤ�.
-
-    #### tcl/tk ���ѿ����б����륪�֥�������(TclTkVariable)�����
-
-    # ������Ʊ�����ͤ����ꤹ��.
-    v1 = TclTkVariable.new(ip, "20")
-    # �ɤ߽Ф��� get �᥽�åɤ�Ȥ�.
-    print v1.get(), "\n"
-    # ����� set �᥽�åɤ�Ȥ�.
-    v1.set(40)
-    print v1.get(), "\n"
-    # set ���ޥ�ɤ�Ȥä��ɤ߽Ф�, ����ϲ�ǽ���������᤬����.
-    # e() �᥽�å����ΰ�����ľ�� TclTkObject ����ͤ�񤤤Ƥ��ɤ�.
-    set.e(v1, 30)
-    print set.e(v1), "\n"
-    # tcl/tk �Υ��ޥ�ɤ��ѿ������Ǥ���.
-    incr.e(v1)
-    print v1.get(), "\n"
-    append.e(v1, 10)
-    print v1.get(), "\n"
-
-    #### tcl/tk �Υ��������åȤ��б����륪�֥�������(TclTkWidget)�����
-
-    # �롼�ȥ��������åȤ���Ф�.
-    root = ip.rootwidget()
-    # ���������åȤ����.
-    root.e("configure -height 300 -width 300")
-    # �����ȥ���դ���Ȥ��� wm ��Ȥ�.
-    wm.e("title", root, $0)
-    # �ƥ��������åȤȥ��ޥ�ɤ���ꤷ��, ���������åȤ���.
-    l1 = TclTkWidget.new(ip, root, label, "-text {type `x' to print}")
-    # place �����ɽ�������.
-    place.e(l1, "-x 0 -rely 0.0 -relwidth 1 -relheight 0.1")
-    # ���ޥ��̾��ʸ����ǻ��ꤷ�Ƥ��ɤ���, �����᤬����.
-    # (���ޥ��̾����Ω���������Ǥʤ���Фʤ�ʤ�.)
-    l2 = TclTkWidget.new(ip, root, "label")
-    # ���������åȤ����.
-    l2.e("configure -text {type `q' to exit}")
-    place.e(l2, "-x 0 -rely 0.1 -relwidth 1 -relheight 0.1")
-
-    #### tcl/tk �Υ�����Хå����б����륪�֥�������(TclTkCallback)�����
-
-    # ������Хå�����������.
-    c1 = TclTkCallback.new(ip, proc{sample(ip, root)})
-    # ������Хå�����ĥ��������åȤ���������.
-    b1 = TclTkWidget.new(ip, root, button, "-text sample -command", c1)
-    place.e(b1, "-x 0 -rely 0.2 -relwidth 1 -relheight 0.1")
-    # ���٥�ȥ롼�פ�ȴ����ˤ� destroy.e(root) ����.
-    c2 = TclTkCallback.new(ip, proc{destroy.e(root)})
-    b2 = TclTkWidget.new(ip, root, button, "-text exit -command", c2)
-    place.e(b2, "-x 0 -rely 0.3 -relwidth 1 -relheight 0.1")
-
-    #### ���٥�ȤΥХ����
-    # script ���ɲ� (bind tag sequence +script) �Ϻ��ΤȤ����Ǥ��ʤ�.
-    # (���ƥ졼���ѿ������꤬���ޤ������ʤ�.)
-
-    # ����Ū�ˤϥ��������åȤ��Ф��륳����Хå���Ʊ��.
-    c3 = TclTkCallback.new(ip, proc{print("q pressed\n"); destroy.e(root)})
-    bind.e(root, "q", c3)
-    # bind ���ޥ�ɤ� % �ִ��ˤ��ѥ�᡼���������ꤿ���Ȥ���,
-    # proc{} �θ����ʸ����ǻ��ꤹ���,
-    # �ִ���̤򥤥ƥ졼���ѿ����̤��Ƽ�����뤳�Ȥ��Ǥ���.
-    # ������ proc{} �θ����ʸ�����,
-    # bind ���ޥ�ɤ�Ϳ���륳����Хå��ʳ��ǻ��ꤷ�ƤϤ����ʤ�.
-    c4 = TclTkCallback.new(ip, proc{|i| print("#{i} pressed\n")}, "%A")
-    bind.e(root, "x", c4)
-    # TclTkCallback �� GC ���оݤˤ��������,
-    # dcb() (�ޤ��� deletecallbackkeys()) ����ɬ�פ�����.
-    cb = [c1, c2, c3, c4]
-    c5 = TclTkCallback.new(ip, proc{|w| TclTk.dcb(cb, root, w)}, "%W")
-    bind.e(root, "<Destroy>", c5)
-    cb.push(c5)
-
-    #### tcl/tk �Υ��᡼�����б����륪�֥�������(TclTkImage)�����
-
-    # �ǡ�������ꤷ����������.
-    i1 = TclTkImage.new(ip, "photo", "-file maru.gif")
-    # ��٥��ĥ���դ��Ƥߤ�.
-    l3 = TclTkWidget.new(ip, root, label, "-relief raised -image", i1)
-    place.e(l3, "-x 0 -rely 0.4 -relwidth 0.2 -relheight 0.2")
-    # ���Υ��᡼�����������Ƹ������.
-    i2 = TclTkImage.new(ip, "photo")
-    # ���᡼��������.
-    i2.e("copy", i1)
-    i2.e("configure -gamma 0.5")
-    l4 = TclTkWidget.new(ip, root, label, "-relief raised -image", i2)
-    place.e(l4, "-relx 0.2 -rely 0.4 -relwidth 0.2 -relheight 0.2")
-
-    ####
-  end
-
-  # ����ץ�Τ���Υ��������åȤ���������.
-  def sample(ip, parent)
-    bind, button, destroy, grid, toplevel, wm = ip.commands().values_at(
-      "bind", "button", "destroy", "grid", "toplevel", "wm")
-
-    ## toplevel
-
-    # ������������ɥ��򳫤��ˤ�, toplevel ��Ȥ�.
-    t1 = TclTkWidget.new(ip, parent, toplevel)
-    # �����ȥ���դ��Ƥ���
-    wm.e("title", t1, "sample")
-
-    # ���������åȤ��˲����줿�Ȥ�, ������Хå��� GC ���оݤˤʤ�褦�ˤ���.
-    cb = []
-    cb.push(c = TclTkCallback.new(ip, proc{|w| TclTk.dcb(cb, t1, w)}, "%W"))
-    bind.e(t1, "<Destroy>", c)
-
-    # �ܥ��������.
-    wid = []
-    # toplevel ���������åȤ��˲�����ˤ� destroy ����.
-    cb.push(c = TclTkCallback.new(ip, proc{destroy.e(t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text close -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_label(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text label -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_button(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text button -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_checkbutton(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text checkbutton -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_radiobutton(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text radiobutton -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_scale(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text scale -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_entry(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text entry -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_text(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text text -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_raise(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text raise/lower -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_modal(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text message/modal -command",
-      c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_menu(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text menu -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_listbox(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text listbox/scrollbar",
-      "-command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_canvas(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text canvas -command", c))
-
-    # grid ��ɽ������.
-    ro = co = 0
-    wid.each{|w|
-      grid.e(w, "-row", ro, "-column", co, "-sticky news")
-      ro += 1
-      if ro == 7
-        ro = 0
-        co += 1
-      end
-    }
-  end
-
-  # inittoplevel(ip, parent, title)
-  #   �ʲ��ν�����ޤȤ�ƹԤ�.
-  #       1. toplevel ���������åȤ��������.
-  #       2. ������Хå�����Ͽ����������Ѱդ�, toplevel ���������åȤ�
-  #         <Destroy> ���٥�Ȥ˥�����Хå����������³������Ͽ����.
-  #       3. ���������ܥ������.
-  #     �������� toplevel ���������å�, ���������ܥ���, ������Хå���Ͽ���ѿ�
-  #     ���֤�.
-  #   ip: ���󥿥ץ꥿
-  #   parent: �ƥ��������å�
-  #   title: toplevel ���������åȤΥ�����ɥ��Υ����ȥ�
-  def inittoplevel(ip, parent, title)
-    bind, button, destroy, toplevel, wm = ip.commands().values_at(
-      "bind", "button", "destroy", "toplevel", "wm")
-
-    # ������������ɥ��򳫤��ˤ�, toplevel ��Ȥ�.
-    t1 = TclTkWidget.new(ip, parent, toplevel)
-    # �����ȥ���դ��Ƥ���
-    wm.e("title", t1, title)
-
-    # ���������åȤ��˲����줿�Ȥ�, ������Хå��� GC ���оݤˤʤ�褦�ˤ���.
-    cb = []
-    cb.push(c = TclTkCallback.new(ip, proc{|w| TclTk.dcb(cb, t1, w)}, "%W"))
-    bind.e(t1, "<Destroy>", c)
-    # close �ܥ�����äƤ���.
-    # toplevel ���������åȤ��˲�����ˤ� destroy ����.
-    cb.push(c = TclTkCallback.new(ip, proc{destroy.e(t1)}))
-    b1 = TclTkWidget.new(ip, t1, button, "-text close -command", c)
-
-    return t1, b1, cb
-  end
-
-  # label �Υ���ץ�.
-  def test_label(ip, parent)
-    button, global, label, pack = ip.commands().values_at(
-      "button", "global", "label", "pack")
-    t1, b1, cb = inittoplevel(ip, parent, "label")
-
-    ## label
-
-    # ���������ʷ��Υ�٥�.
-    l1 = TclTkWidget.new(ip, t1, label, "-text {default(flat)}")
-    l2 = TclTkWidget.new(ip, t1, label, "-text raised -relief raised")
-    l3 = TclTkWidget.new(ip, t1, label, "-text sunken -relief sunken")
-    l4 = TclTkWidget.new(ip, t1, label, "-text groove -relief groove")
-    l5 = TclTkWidget.new(ip, t1, label, "-text ridge -relief ridge")
-    l6 = TclTkWidget.new(ip, t1, label, "-bitmap error")
-    l7 = TclTkWidget.new(ip, t1, label, "-bitmap questhead")
-
-    # pack ���Ƥ�ɽ�������.
-    pack.e(b1, l1, l2, l3, l4, l5, l6, l7, "-pady 3")
-
-    ## -textvariable
-
-    # tcltk �饤�֥��μ����Ǥ�, ������Хå��� tcl/tk ��``��³��''���̤���
-    # �ƤФ��. �������ä�, ������Хå������(���)�ѿ��˥�����������Ȥ���,
-    # global ����ɬ�פ�����.
-    # global ���������ѿ����ͤ����ꤷ�Ƥ��ޤ��ȥ��顼�ˤʤ�Τ�,
-    # tcl/tk �ˤ�����ɽ����������������, �ºݤ��ͤ����ꤷ�ʤ��褦��,
-    # 2 ���ܤΰ����ˤ� nil ��Ϳ����.
-    v1 = TclTkVariable.new(ip, nil)
-    global.e(v1)
-    v1.set(100)
-    # -textvariable ���ѿ������ꤹ��.
-    l6 = TclTkWidget.new(ip, t1, label, "-textvariable", v1)
-    # ������Хå����椫���ѿ�������.
-    cb.push(c = TclTkCallback.new(ip, proc{
-      global.e(v1); v1.set(v1.get().to_i + 10)}))
-    b2 = TclTkWidget.new(ip, t1, button, "-text +10 -command", c)
-    cb.push(c = TclTkCallback.new(ip, proc{
-      global.e(v1); v1.set(v1.get().to_i - 10)}))
-    b3 = TclTkWidget.new(ip, t1, button, "-text -10 -command", c)
-    pack.e(l6, b2, b3)
-  end
-
-  # button �Υ���ץ�.
-  def test_button(ip, parent)
-    button, pack = ip.commands().values_at("button", "pack")
-    t1, b1, cb = inittoplevel(ip, parent, "button")
-
-    ## button
-
-    # ������Хå���ǻ��Ȥ����ѿ������������Ƥ����ʤ���Фʤ�ʤ�.
-    b3 = b4 = nil
-    cb.push(c = TclTkCallback.new(ip, proc{b3.e("flash"); b4.e("flash")}))
-    b2 = TclTkWidget.new(ip, t1, button, "-text flash -command", c)
-    cb.push(c = TclTkCallback.new(ip, proc{b2.e("configure -state normal")}))
-    b3 = TclTkWidget.new(ip, t1, button, "-text normal -command", c)
-    cb.push(c = TclTkCallback.new(ip, proc{b2.e("configure -state disabled")}))
-    b4 = TclTkWidget.new(ip, t1, button, "-text disable -command", c)
-    pack.e(b1, b2, b3, b4)
-  end
-
-  # checkbutton �Υ���ץ�.
-  def test_checkbutton(ip, parent)
-    checkbutton, global, pack = ip.commands().values_at(
-      "checkbutton", "global", "pack")
-    t1, b1, cb = inittoplevel(ip, parent, "checkbutton")
-
-    ## checkbutton
-
-    v1 = TclTkVariable.new(ip, nil)
-    global.e(v1)
-    # -variable ���ѿ������ꤹ��.
-    ch1 = TclTkWidget.new(ip, t1, checkbutton, "-onvalue on -offvalue off",
-      "-textvariable", v1, "-variable", v1)
-    pack.e(b1, ch1)
-  end
-
-  # radiobutton �Υ���ץ�.
-  def test_radiobutton(ip, parent)
-    global, label, pack, radiobutton = ip.commands().values_at(
-      "global", "label", "pack", "radiobutton")
-    t1, b1, cb = inittoplevel(ip, parent, "radiobutton")
-
-    ## radiobutton
-
-    v1 = TclTkVariable.new(ip, nil)
-    global.e(v1)
-    # �̥륹�ȥ�󥰤� "{}" �ǻ��ꤹ��.
-    v1.set("{}")
-    l1 = TclTkWidget.new(ip, t1, label, "-textvariable", v1)
-    # -variable ��Ʊ���ѿ�����ꤹ���Ʊ�����롼�פˤʤ�.
-    ra1 = TclTkWidget.new(ip, t1, radiobutton,
-      "-text radio1 -value r1 -variable", v1)
-    ra2 = TclTkWidget.new(ip, t1, radiobutton,
-      "-text radio2 -value r2 -variable", v1)
-    cb.push(c = TclTkCallback.new(ip, proc{global.e(v1); v1.set("{}")}))
-    ra3 = TclTkWidget.new(ip, t1, radiobutton,
-      "-text clear -value r3 -variable", v1, "-command", c)
-    pack.e(b1, l1, ra1, ra2, ra3)
-  end
-
-  # scale �Υ���ץ�.
-  def test_scale(ip, parent)
-    global, pack, scale = ip.commands().values_at(
-      "global", "pack", "scale")
-    t1, b1, cb = inittoplevel(ip, parent, "scale")
-
-    ## scale
-
-    v1 = TclTkVariable.new(ip, nil)
-    global.e(v1)
-    v1.set(219)
-    # ������Хå���ǻ��Ȥ����ѿ������������Ƥ����ʤ���Фʤ�ʤ�.
-    sca1 = nil
-    cb.push(c = TclTkCallback.new(ip, proc{global.e(v1); v = v1.get();
-      sca1.e("configure -background", format("#%02x%02x%02x", v, v, v))}))
-    sca1 = TclTkWidget.new(ip, t1, scale,
-      "-label scale -orient h -from 0 -to 255 -variable", v1, "-command", c)
-    pack.e(b1, sca1)
-  end
-
-  # entry �Υ���ץ�.
-  def test_entry(ip, parent)
-    button, entry, global, pack = ip.commands().values_at(
-      "button", "entry", "global", "pack")
-    t1, b1, cb = inittoplevel(ip, parent, "entry")
-
-    ## entry
-
-    v1 = TclTkVariable.new(ip, nil)
-    global.e(v1)
-    # �̥륹�ȥ�󥰤� "{}" �ǻ��ꤹ��.
-    v1.set("{}")
-    en1 = TclTkWidget.new(ip, t1, entry, "-textvariable", v1)
-    cb.push(c = TclTkCallback.new(ip, proc{
-      global.e(v1); print(v1.get(), "\n"); v1.set("{}")}))
-    b2 = TclTkWidget.new(ip, t1, button, "-text print -command", c)
-    pack.e(b1, en1, b2)
-  end
-
-  # text �Υ���ץ�.
-  def test_text(ip, parent)
-    button, pack, text = ip.commands().values_at(
-      "button", "pack", "text")
-    t1, b1, cb = inittoplevel(ip, parent, "text")
-
-    ## text
-
-    te1 = TclTkWidget.new(ip, t1, text)
-    cb.push(c = TclTkCallback.new(ip, proc{
-      # 1 ���ܤ� 0 ʸ���ܤ���Ǹ�ޤǤ�ɽ����, �������.
-      print(te1.e("get 1.0 end")); te1.e("delete 1.0 end")}))
-    b2 = TclTkWidget.new(ip, t1, button, "-text print -command", c)
-    pack.e(b1, te1, b2)
-  end
-
-  # raise/lower �Υ���ץ�.
-  def test_raise(ip, parent)
-    button, frame, lower, pack, raise = ip.commands().values_at(
-      "button", "frame", "lower", "pack", "raise")
-    t1, b1, cb = inittoplevel(ip, parent, "raise/lower")
-
-    ## raise/lower
-
-    # button �򱣤��ƥ��ȤΤ����, frame ��Ȥ�.
-    f1 = TclTkWidget.new(ip, t1, frame)
-    # ������Хå���ǻ��Ȥ����ѿ������������Ƥ����ʤ���Фʤ�ʤ�.
-    b2 = nil
-    cb.push(c = TclTkCallback.new(ip, proc{raise.e(f1, b2)}))
-    b2 = TclTkWidget.new(ip, t1, button, "-text raise -command", c)
-    cb.push(c = TclTkCallback.new(ip, proc{lower.e(f1, b2)}))
-    b3 = TclTkWidget.new(ip, t1, button, "-text lower -command", c)
-    lower.e(f1, b3)
-
-    pack.e(b2, b3, "-in", f1)
-    pack.e(b1, f1)
-  end
-
-  # modal �ʥ��������åȤΥ���ץ�.
-  def test_modal(ip, parent)
-    button, frame, message, pack, tk_chooseColor, tk_getOpenFile,
-      tk_messageBox = ip.commands().values_at(
-      "button", "frame", "message", "pack", "tk_chooseColor",
-      "tk_getOpenFile", "tk_messageBox")
-    # �ǽ�� load ����Ƥ��ʤ��饤�֥��� ip.commands() ��¸�ߤ��ʤ��Τ�,
-    # TclTkLibCommand ����������ɬ�פ�����.
-    tk_dialog = TclTkLibCommand.new(ip, "tk_dialog")
-    t1, b1, cb = inittoplevel(ip, parent, "message/modal")
-
-    ## message
-
-    mes = "����� message ���������åȤΥƥ��ȤǤ�."
-    mes += "�ʲ��� modal �ʥ��������åȤΥƥ��ȤǤ�."
-    me1 = TclTkWidget.new(ip, t1, message, "-text {#{mes}}")
-
-    ## modal
-
-    # tk_messageBox
-    cb.push(c = TclTkCallback.new(ip, proc{
-      print tk_messageBox.e("-type yesnocancel -message messageBox",
-      "-icon error -default cancel -title messageBox"), "\n"}))
-    b2 = TclTkWidget.new(ip, t1, button, "-text messageBox -command", c)
-    # tk_dialog
-    cb.push(c = TclTkCallback.new(ip, proc{
-      # ���������å�̾���������뤿��˥��ߡ��� frame ������.
-      print tk_dialog.e(TclTkWidget.new(ip, t1, frame),
-      "dialog dialog error 2 yes no cancel"), "\n"}))
-    b3 = TclTkWidget.new(ip, t1, button, "-text dialog -command", c)
-    # tk_chooseColor
-    cb.push(c = TclTkCallback.new(ip, proc{
-      print tk_chooseColor.e("-title chooseColor"), "\n"}))
-    b4 = TclTkWidget.new(ip, t1, button, "-text chooseColor -command", c)
-    # tk_getOpenFile
-    cb.push(c = TclTkCallback.new(ip, proc{
-      print tk_getOpenFile.e("-defaultextension .rb",
-      "-filetypes {{{Ruby Script} {.rb}} {{All Files} {*}}}",
-      "-title getOpenFile"), "\n"}))
-    b5 = TclTkWidget.new(ip, t1, button, "-text getOpenFile -command", c)
-
-    pack.e(b1, me1, b2, b3, b4, b5)
-  end
-
-  # menu �Υ���ץ�.
-  def test_menu(ip, parent)
-    global, menu, menubutton, pack = ip.commands().values_at(
-      "global", "menu", "menubutton", "pack")
-    tk_optionMenu = TclTkLibCommand.new(ip, "tk_optionMenu")
-    t1, b1, cb = inittoplevel(ip, parent, "menu")
-
-    ## menu
-
-    # menubutton ����������.
-    mb1 = TclTkWidget.new(ip, t1, menubutton, "-text menu")
-    # menu ����������.
-    me1 = TclTkWidget.new(ip, mb1, menu)
-    # mb1 ���� me1 ����ư�����褦�ˤ���.
-    mb1.e("configure -menu", me1)
-
-    # cascade �ǵ�ư����� menu ����������.
-    me11 = TclTkWidget.new(ip, me1, menu)
-    # radiobutton �Υ���ץ�.
-    v1 = TclTkVariable.new(ip, nil); global.e(v1); v1.set("r1")
-    me11.e("add radiobutton -label radio1 -value r1 -variable", v1)
-    me11.e("add radiobutton -label radio2 -value r2 -variable", v1)
-    me11.e("add radiobutton -label radio3 -value r3 -variable", v1)
-    # cascade �ˤ�� mb11 ����ư�����褦�ˤ���.
-    me1.e("add cascade -label cascade -menu", me11)
-
-    # checkbutton �Υ���ץ�.
-    v2 = TclTkVariable.new(ip, nil); global.e(v2); v2.set("none")
-    me1.e("add checkbutton -label check -variable", v2)
-    # separator �Υ���ץ�.
-    me1.e("add separator")
-    # command �Υ���ץ�.
-    v3 = nil
-    cb.push(c = TclTkCallback.new(ip, proc{
-      global.e(v1, v2, v3); print "v1: ", v1.get(), ", v2: ", v2.get(),
-      ", v3: ", v3.get(), "\n"}))
-    me1.e("add command -label print -command", c)
-
-    ## tk_optionMenu
-
-    v3 = TclTkVariable.new(ip, nil); global.e(v3); v3.set("opt2")
-    om1 = TclTkWidget.new(ip, t1, tk_optionMenu, v3, "opt1 opt2 opt3 opt4")
-
-    pack.e(b1, mb1, om1, "-side left")
-  end
-
-  # listbox �Υ���ץ�.
-  def test_listbox(ip, parent)
-    clipboard, frame, grid, listbox, lower, menu, menubutton, pack, scrollbar,
-      selection = ip.commands().values_at(
-      "clipboard", "frame", "grid", "listbox", "lower", "menu", "menubutton",
-      "pack", "scrollbar", "selection")
-    t1, b1, cb = inittoplevel(ip, parent, "listbox")
-
-    ## listbox/scrollbar
-
-    f1 = TclTkWidget.new(ip, t1, frame)
-    # ������Хå���ǻ��Ȥ����ѿ������������Ƥ����ʤ���Фʤ�ʤ�.
-    li1 = sc1 = sc2 = nil
-    # �¹Ի���, ����˥ѥ�᡼�����Ĥ�������Хå���,
-    # ���ƥ졼���ѿ��Ǥ��Υѥ�᡼���������뤳�Ȥ��Ǥ���.
-    # (ʣ���Υѥ�᡼���ϤҤȤĤ�ʸ����ˤޤȤ����.)
-    cb.push(c1 = TclTkCallback.new(ip, proc{|i| li1.e("xview", i)}))
-    cb.push(c2 = TclTkCallback.new(ip, proc{|i| li1.e("yview", i)}))
-    cb.push(c3 = TclTkCallback.new(ip, proc{|i| sc1.e("set", i)}))
-    cb.push(c4 = TclTkCallback.new(ip, proc{|i| sc2.e("set", i)}))
-    # listbox
-    li1 = TclTkWidget.new(ip, f1, listbox,
-      "-xscrollcommand", c3, "-yscrollcommand", c4,
-      "-selectmode extended -exportselection true")
-    for i in 1..20
-      li1.e("insert end {line #{i} line #{i} line #{i} line #{i} line #{i}}")
-    end
-    # scrollbar
-    sc1 = TclTkWidget.new(ip, f1, scrollbar, "-orient horizontal -command", c1)
-    sc2 = TclTkWidget.new(ip, f1, scrollbar, "-orient vertical -command", c2)
-
-    ## selection/clipboard
-
-    mb1 = TclTkWidget.new(ip, t1, menubutton, "-text edit")
-    me1 = TclTkWidget.new(ip, mb1, menu)
-    mb1.e("configure -menu", me1)
-    cb.push(c = TclTkCallback.new(ip, proc{
-      # clipboard �򥯥ꥢ.
-      clipboard.e("clear")
-      # selection ����ʸ������ɤ߹��� clipboard ���ɲä���.
-      clipboard.e("append {#{selection.e('get')}}")}))
-    me1.e("add command -label {selection -> clipboard} -command",c)
-    cb.push(c = TclTkCallback.new(ip, proc{
-      # li1 �򥯥ꥢ.
-      li1.e("delete 0 end")
-      # clipboard ����ʸ�������Ф�, 1 �Ԥ���
-      selection.e("get -selection CLIPBOARD").split(/\n/).each{|line|
-        # li1 ����������.
-        li1.e("insert end {#{line}}")}}))
-    me1.e("add command -label {clipboard -> listbox} -command",c)
-
-    grid.e(li1, "-row 0 -column 0 -sticky news")
-    grid.e(sc1, "-row 1 -column 0 -sticky ew")
-    grid.e(sc2, "-row 0 -column 1 -sticky ns")
-    grid.e("rowconfigure", f1, "0 -weight 100")
-    grid.e("columnconfigure", f1, "0 -weight 100")
-    f2 = TclTkWidget.new(ip, t1, frame)
-    lower.e(f2, b1)
-    pack.e(b1, mb1, "-in", f2, "-side left")
-    pack.e(f2, f1)
-  end
-
-  # canvas �Υ���ץ�.
-  def test_canvas(ip, parent)
-    canvas, lower, pack = ip.commands().values_at("canvas", "lower", "pack")
-    t1, b1, cb = inittoplevel(ip, parent, "canvas")
-
-    ## canvas
-
-    ca1 = TclTkWidget.new(ip, t1, canvas, "-width 400 -height 300")
-    lower.e(ca1, b1)
-    # rectangle ����.
-    idr = ca1.e("create rectangle 10 10 20 20")
-    # oval ����.
-    ca1.e("create oval 60 10 100 50")
-    # polygon ����.
-    ca1.e("create polygon 110 10 110 30 140 10")
-    # line ����.
-    ca1.e("create line 150 10 150 30 190 10")
-    # arc ����.
-    ca1.e("create arc 200 10 250 50 -start 0 -extent 90 -style pieslice")
-    # i1 ��������, �ɤ������˲����ʤ���Фʤ�ʤ���, ���ݤʤΤ����äƤ���.
-    i1 = TclTkImage.new(ip, "photo", "-file maru.gif")
-    # image ����.
-    ca1.e("create image 100 100 -image", i1)
-    # bitmap ����.
-    ca1.e("create bitmap 260 50 -bitmap questhead")
-    # text ����.
-    ca1.e("create text 320 50 -text {drag rectangle}")
-    # window ����(���������ܥ���).
-    ca1.e("create window 200 200 -window", b1)
-
-    # bind �ˤ�� rectangle �� drag �Ǥ���褦�ˤ���.
-    cb.push(c = TclTkCallback.new(ip, proc{|i|
-      # i �� x �� y ��������Τ�, ���Ф�.
-      x, y = i.split(/ /); x = x.to_f; y = y.to_f
-      # ��ɸ���ѹ�����.
-      ca1.e("coords current #{x - 5} #{y - 5} #{x + 5} #{y + 5}")},
-      # x, y ��ɸ�����Ƕ��ڤä���Τ򥤥ƥ졼���ѿ����Ϥ��褦�˻���.
-      "%x %y"))
-    # rectangle �� bind ����.
-    ca1.e("bind", idr, "<B1-Motion>", c)
-
-    pack.e(ca1)
-  end
-end
-
-# test driver
-
-if ARGV.size == 0
-  print "#{$0} n ��, n �ĤΥ��󥿥ץ꥿��ư���ޤ�.\n"
-  n = 1
-else
-  n = ARGV[0].to_i
-end
-
-print "start\n"
-ip = []
-
-# ���󥿥ץ꥿, ���������å���������.
-for i in 1 .. n
-  ip.push(Test1.new())
-end
-
-# �Ѱդ��Ǥ����饤�٥�ȥ롼�פ�����.
-TclTk.mainloop()
-print "exit from mainloop\n"
-
-# ���󥿥ץ꥿�� GC ����뤫�Υƥ���.
-ip = []
-print "GC.start\n" if $DEBUG
-GC.start() if $DEBUG
-print "end\n"
-
-exit
-
-# end
diff --git a/ext/tk/sample/tcltklib/sample2.rb b/ext/tk/sample/tcltklib/sample2.rb
deleted file mode 100644
index f187d6ce1d..0000000000
--- a/ext/tk/sample/tcltklib/sample2.rb
+++ /dev/null
@@ -1,451 +0,0 @@
-#!/usr/local/bin/ruby
-#----------------------> pretty simple othello game <-----------------------
-# othello.rb
-#
-# version 0.3
-# maeda shugo (shuto@po.aianet.ne.jp)
-#---------------------------------------------------------------------------
-
-#       Sep. 17, 1997   modified by Y. Shigehiro for tcltk library
-#          maeda shugo (shugo@po.aianet.ne.jp) ��ˤ��
-#          (ruby/tk �ǽ񤫤�Ƥ���) ruby �Υ���ץ�ץ������
-#               http://www.aianet.or.jp/~shugo/ruby/othello.rb.gz
-#          �� tcltk �饤�֥���Ȥ��褦��, ����Ū���ѹ����Ƥߤޤ���.
-#
-#          �ʤ�٤����ꥸ�ʥ��Ʊ���ˤʤ�褦�ˤ��Ƥ���ޤ�.
-
-require "observer"
-require "tcltk"
-$ip = TclTkInterpreter.new()
-$root = $ip.rootwidget()
-$button, $canvas, $checkbutton, $frame, $label, $pack, $update, $wm =
-   $ip.commands().values_at(
-   "button", "canvas", "checkbutton", "frame", "label", "pack", "update", "wm")
-
-class Othello
-
-   EMPTY = 0
-   BLACK = 1
-   WHITE = - BLACK
-
-   attr :in_com_turn
-   attr :game_over
-
-   class Board
-
-      include Observable
-
-      DIRECTIONS = [
-         [-1, -1], [-1, 0], [-1, 1],
-         [ 0, -1],          [ 0, 1],
-         [ 1, -1], [ 1, 0], [ 1, 1]
-      ]
-
-      attr_accessor :com_disk
-
-      def initialize(othello)
-         @othello = othello
-         reset
-      end
-
-      def notify_observers(*arg)
-         if @observer_peers != nil
-            super(*arg)
-         end
-      end
-
-      def reset
-         @data = [
-            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, WHITE, BLACK, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, BLACK, WHITE, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY]
-         ]
-         changed
-         notify_observers
-      end
-
-      def man_disk
-         return - @com_disk
-      end
-
-      def other_disk(disk)
-         return - disk
-      end
-
-      def get_disk(row, col)
-         return @data[row][col]
-      end
-
-      def reverse_to(row, col, my_disk, dir_y, dir_x)
-         y = row
-         x = col
-         begin
-            y += dir_y
-            x += dir_x
-            if y < 0 || x < 0 || y > 7 || x > 7 ||
-                  @data[y][x] == EMPTY
-               return
-            end
-         end until @data[y][x] == my_disk
-         begin
-            @data[y][x] = my_disk
-            changed
-            notify_observers(y, x)
-            y -= dir_y
-            x -= dir_x
-         end until y == row && x == col
-      end
-
-      def put_disk(row, col, disk)
-         @data[row][col] = disk
-         changed
-         notify_observers(row, col)
-         DIRECTIONS.each do |dir|
-            reverse_to(row, col, disk, *dir)
-         end
-      end
-
-      def count_disk(disk)
-         num = 0
-         @data.each do |rows|
-            rows.each do |d|
-               if d == disk
-                  num += 1
-               end
-            end
-         end
-         return num
-      end
-
-      def count_point_to(row, col, my_disk, dir_y, dir_x)
-         return 0 if @data[row][col] != EMPTY
-         count = 0
-         loop do
-            row += dir_y
-            col += dir_x
-            break if row < 0 || col < 0 || row > 7 || col > 7
-            case @data[row][col]
-            when my_disk
-               return count
-            when other_disk(my_disk)
-               count += 1
-            when EMPTY
-               break
-            end
-         end
-         return 0
-      end
-
-      def count_point(row, col, my_disk)
-         count = 0
-         DIRECTIONS.each do |dir|
-            count += count_point_to(row, col, my_disk, *dir)
-         end
-         return count
-      end
-
-      def corner?(row, col)
-         return (row == 0 && col == 0) ||
-            (row == 0 && col == 7) ||
-            (row == 7 && col == 0) ||
-            (row == 7 && col == 7)
-      end
-
-      def search(my_disk)
-         max = 0
-         max_row = nil
-         max_col = nil
-         for row in 0 .. 7
-            for col in 0 .. 7
-               buf = count_point(row, col, my_disk)
-               if (corner?(row, col) && buf > 0) || max < buf
-                  max = buf
-                  max_row = row
-                  max_col = col
-               end
-            end
-         end
-         return max_row, max_col
-      end
-   end #--------------------------> class Board ends here
-
-   class BoardView < TclTkWidget
-
-      BACK_GROUND_COLOR = "DarkGreen"
-      HILIT_BG_COLOR = "green"
-      BORDER_COLOR = "black"
-      BLACK_COLOR = "black"
-      WHITE_COLOR = "white"
-      STOP_COLOR = "red"
-
-      attr :left
-      attr :top
-      attr :right
-      attr :bottom
-
-      class Square
-
-         attr :oval, TRUE
-         attr :row
-         attr :col
-
-         def initialize(view, row, col)
-            @view = view
-            @id = @view.e("create rectangle",
-                          *(view.tk_rect(view.left + col,
-                                         view.top + row,
-                                         view.left + col + 1,
-                                         view.top + row + 1) \
-                            << "-fill #{BACK_GROUND_COLOR}") )
-            @row = row
-            @col = col
-            @view.e("itemconfigure", @id,
-              "-width 0.5m -outline #{BORDER_COLOR}")
-            @view.e("bind", @id, "<Any-Enter>", TclTkCallback.new($ip, proc{
-               if @oval == nil
-                  view.e("itemconfigure", @id, "-fill #{HILIT_BG_COLOR}")
-               end
-            }))
-            @view.e("bind", @id, "<Any-Leave>", TclTkCallback.new($ip, proc{
-               view.e("itemconfigure", @id, "-fill #{BACK_GROUND_COLOR}")
-            }))
-            @view.e("bind", @id, "<ButtonRelease-1>", TclTkCallback.new($ip,
-               proc{
-               view.click_square(self)
-            }))
-         end
-
-         def blink(color)
-            @view.e("itemconfigure", @id, "-fill #{color}")
-            $update.e()
-            sleep(0.1)
-            @view.e("itemconfigure", @id, "-fill #{BACK_GROUND_COLOR}")
-         end
-      end #-----------------------> class Square ends here
-
-      def initialize(othello, board)
-         super($ip, $root, $canvas)
-         @othello = othello
-         @board = board
-         @board.add_observer(self)
-
-         @squares = Array.new(8)
-         for i in 0 .. 7
-            @squares[i] = Array.new(8)
-         end
-         @left = 1
-         @top = 0.5
-         @right = @left + 8
-         @bottom = @top + 8
-
-         i = self.e("create rectangle", *tk_rect(@left, @top, @right, @bottom))
-         self.e("itemconfigure", i,
-            "-width 1m -outline #{BORDER_COLOR} -fill #{BACK_GROUND_COLOR}")
-
-         for row in 0 .. 7
-            for col in 0 .. 7
-               @squares[row][col] = Square.new(self, row, col)
-            end
-         end
-
-         update
-      end
-
-      def tk_rect(left, top, right, bottom)
-         return left.to_s + "c", top.to_s + "c",
-            right.to_s + "c", bottom.to_s + "c"
-      end
-
-      def clear
-         each_square do |square|
-            if square.oval != nil
-               self.e("delete", square.oval)
-               square.oval = nil
-            end
-         end
-      end
-
-      def draw_disk(row, col, disk)
-         if disk == EMPTY
-            if @squares[row][col].oval != nil
-               self.e("delete", @squares[row][col].oval)
-               @squares[row][col].oval = nil
-            end
-            return
-         end
-
-         $update.e()
-         sleep(0.05)
-         oval = @squares[row][col].oval
-         if oval == nil
-            oval = self.e("create oval", *tk_rect(@left + col + 0.2,
-                                           @top + row + 0.2,
-                                           @left + col + 0.8,
-                                           @top + row + 0.8))
-            @squares[row][col].oval = oval
-         end
-         case disk
-         when BLACK
-            color = BLACK_COLOR
-         when WHITE
-            color = WHITE_COLOR
-         else
-            fail format("Unknown disk type: %d", disk)
-         end
-         self.e("itemconfigure", oval, "-outline #{color} -fill #{color}")
-      end
-
-      def update(row = nil, col = nil)
-         if row && col
-            draw_disk(row, col, @board.get_disk(row, col))
-         else
-            each_square do |square|
-               draw_disk(square.row, square.col,
-                         @board.get_disk(square.row, square.col))
-            end
-         end
-         @othello.show_point
-      end
-
-      def each_square
-         @squares.each do |rows|
-            rows.each do |square|
-               yield(square)
-            end
-         end
-      end
-
-      def click_square(square)
-         if @othello.in_com_turn || @othello.game_over ||
-               @board.count_point(square.row,
-                                  square.col,
-                                  @board.man_disk) == 0
-            square.blink(STOP_COLOR)
-            return
-         end
-         @board.put_disk(square.row, square.col, @board.man_disk)
-         @othello.com_turn
-      end
-
-      private :draw_disk
-      public :update
-   end #----------------------> class BoardView ends here
-
-   def initialize
-      @msg_label = TclTkWidget.new($ip, $root, $label)
-      $pack.e(@msg_label)
-
-      @board = Board.new(self)
-      @board_view = BoardView.new(self, @board)
-      #### added by Y. Shigehiro
-      ## board_view ���礭�������ꤹ��.
-      x1, y1, x2, y2 = @board_view.e("bbox all").split(/ /).collect{|i| i.to_f}
-      @board_view.e("configure -width", x2 - x1)
-      @board_view.e("configure -height", y2 - y1)
-      ## scrollregion �����ꤹ��.
-      @board_view.e("configure -scrollregion {", @board_view.e("bbox all"),
-         "}")
-      #### �����ޤ�
-      $pack.e(@board_view, "-fill both -expand true")
-
-      panel = TclTkWidget.new($ip, $root, $frame)
-
-      @play_black = TclTkWidget.new($ip, panel, $checkbutton,
-        "-text {com is black} -command", TclTkCallback.new($ip, proc{
-         switch_side
-      }))
-      $pack.e(@play_black, "-side left")
-
-      quit = TclTkWidget.new($ip, panel, $button, "-text Quit -command",
-         TclTkCallback.new($ip, proc{
-         exit
-      }))
-      $pack.e(quit, "-side right -fill x")
-
-      reset = TclTkWidget.new($ip, panel, $button, "-text Reset -command",
-         TclTkCallback.new($ip, proc{
-         reset_game
-      }))
-      $pack.e(reset, "-side right -fill x")
-
-      $pack.e(panel, "-side bottom -fill x")
-
-#      root = Tk.root
-      $wm.e("title", $root, "Othello")
-      $wm.e("iconname", $root, "Othello")
-
-      @board.com_disk = WHITE
-      @game_over = FALSE
-
-      TclTk.mainloop
-   end
-
-   def switch_side
-      if @in_com_turn
-         @play_black.e("toggle")
-      else
-         @board.com_disk = @board.man_disk
-         com_turn unless @game_over
-      end
-   end
-
-   def reset_game
-      if @board.com_disk == BLACK
-         @board.com_disk = WHITE
-         @play_black.e("toggle")
-      end
-      @board_view.clear
-      @board.reset
-      $wm.e("title", $root, "Othello")
-      @game_over = FALSE
-   end
-
-   def com_turn
-      @in_com_turn = TRUE
-      $update.e()
-      sleep(0.5)
-      begin
-         com_disk = @board.count_disk(@board.com_disk)
-         man_disk = @board.count_disk(@board.man_disk)
-         if @board.count_disk(EMPTY) == 0
-            if man_disk == com_disk
-               $wm.e("title", $root, "{Othello - Draw!}")
-            elsif man_disk > com_disk
-               $wm.e("title", $root, "{Othello - You Win!}")
-            else
-               $wm.e("title", $root, "{Othello - You Loose!}")
-            end
-            @game_over = TRUE
-            break
-         elsif com_disk == 0
-            $wm.e("title", $root, "{Othello - You Win!}")
-            @game_over = TRUE
-            break
-         elsif man_disk == 0
-            $wm.e("title", $root, "{Othello - You Loose!}")
-            @game_over = TRUE
-            break
-         end
-         row, col = @board.search(@board.com_disk)
-         break if row == nil || col == nil
-         @board.put_disk(row, col, @board.com_disk)
-      end while @board.search(@board.man_disk) == [nil, nil]
-      @in_com_turn = FALSE
-   end
-
-   def show_point
-      black = @board.count_disk(BLACK)
-      white = @board.count_disk(WHITE)
-      @msg_label.e("configure -text",
-         %Q/{#{format("BLACK: %.2d    WHITE: %.2d", black, white)}}/)
-   end
-end #----------------------> class Othello ends here
-
-Othello.new
-
-#----------------------------------------------> othello.rb ends here
diff --git a/ext/tk/sample/tkalignbox.rb b/ext/tk/sample/tkalignbox.rb
deleted file mode 100644
index f3d083c33d..0000000000
--- a/ext/tk/sample/tkalignbox.rb
+++ /dev/null
@@ -1,235 +0,0 @@
-#
-#  tkalignbox.rb : align widgets with same width/height
-#
-#                                            by Hidetoshi NAGAI
-#
-#  The box size depends on 'reqheight' and 'reqwidth' of contained widgets.
-#  If you want to give the box size when those requested sizes are 0,
-#  please set box.propagate = false (See the test routine at the tail of
-#  this file).
-
-require 'tk'
-
-module Tk
-  module RbWidget
-    class AlignBox < TkFrame
-    end
-  end
-end
-
-class Tk::RbWidget::AlignBox < TkFrame
-  def initialize(*args)
-    if self.class == Tk::RbWidget::AlignBox
-      fail RuntimeError, "Tk::AlignBox is an abstract class"
-    end
-    @padx = 0
-    @pady = 0
-    if args[-1].kind_of? Hash
-      keys = _symbolkey2str(args.pop)
-      @padx = keys.delete('padx') || 0
-      @pady = keys.delete('pady') || 0
-      args.push(keys)
-    end
-    super(*args)
-    @max_width = 0
-    @max_height = 0
-    @propagate = true
-    @widgets = []
-  end
-
-  def _set_framesize
-    fail RuntimeError, "Tk::AlignBox is an abstract class"
-  end
-  private :_set_framesize
-
-  def _place_config(widget, idx, cnt)
-    fail RuntimeError, "Tk::AlignBox is an abstract class"
-  end
-  private :_place_config
-
-  def align
-    widgets = []
-    @widgets.each{|w| widgets << w if w.winfo_exist?}
-    @widgets = widgets
-    cnt = @widgets.size.to_f
-    @widgets.each_with_index{|w, idx| _place_config(w, idx, cnt)}
-    @widgets = widgets
-    _set_framesize if @propagate
-    self
-  end
-
-  def add(*widgets)
-    widgets.each{|w|
-      unless w.kind_of? TkWindow
-        fail RuntimeError, "#{w.inspect} is not a widget instance."
-      end
-      @widgets.delete(w)
-      @widgets << w
-      sz = w.winfo_reqwidth
-      @max_width = sz if @max_width < sz
-      sz = w.winfo_reqheight
-      @max_height = sz if @max_height < sz
-    }
-    align
-  end
-
-  def <<(widget)
-    add(widget)
-  end
-
-  def insert(idx, widget)
-    unless widget.kind_of? TkWindow
-      fail RuntimeError, "#{widget.inspect} is not a widget instance."
-    end
-    @widgets.delete(widget)
-    @widgets[idx,0] = widget
-    sz = widget.winfo_reqwidth
-    @max_width = sz if @max_width < sz
-    sz = widget.winfo_reqheight
-    @max_height = sz if @max_height < sz
-    align
-  end
-
-  def delete(idx)
-    ret = @widgets.delete_at(idx)
-    @req_size = 0
-    @widget.each{|w|
-      sz = w.winfo_reqwidth
-      @max_width = sz if @max_width < sz
-      sz = w.winfo_reqheight
-      @max_height = sz if @max_height < sz
-    }
-    align
-    ret
-  end
-
-  def padx(size = nil)
-    if size
-      @padx = size
-      align
-    else
-      @padx
-    end
-  end
-
-  def pady(size = nil)
-    if size
-      @pady = size
-      align
-    else
-      @pady
-    end
-  end
-
-  attr_accessor :propagate
-end
-
-class Tk::RbWidget::HBox < Tk::RbWidget::AlignBox
-  def _set_framesize
-    bd = self.borderwidth
-    self.width((@max_width + 2*@padx) * @widgets.size + 2*bd)
-    self.height(@max_height + 2*@pady + 2*bd)
-  end
-  private :_set_framesize
-
-  def _place_config(widget, idx, cnt)
-    widget.place_in(self,
-                    'relx'=>idx/cnt, 'x'=>@padx,
-                    'rely'=>0, 'y'=>@pady,
-                    'relwidth'=>1.0/cnt, 'width'=>-2*@padx,
-                    'relheight'=>1.0, 'height'=>-2*@pady)
-  end
-  private :_place_config
-end
-Tk::RbWidget::HLBox = Tk::RbWidget::HBox
-
-class Tk::RbWidget::HRBox < Tk::RbWidget::HBox
-  def _place_config(widget, idx, cnt)
-    widget.place_in(self,
-                    'relx'=>(cnt - idx - 1)/cnt, 'x'=>@padx,
-                    'rely'=>0, 'y'=>@pady,
-                    'relwidth'=>1.0/cnt, 'width'=>-2*@padx,
-                    'relheight'=>1.0, 'height'=>-2*@pady)
-  end
-  private :_place_config
-end
-
-class Tk::RbWidget::VBox < Tk::RbWidget::AlignBox
-  def _set_framesize
-    bd = self.borderwidth
-    self.width(@max_width + 2*@padx + 2*bd)
-    self.height((@max_height + 2*@pady) * @widgets.size + 2*bd)
-  end
-  private :_set_framesize
-
-  def _place_config(widget, idx, cnt)
-    widget.place_in(self,
-                    'relx'=>0, 'x'=>@padx,
-                    'rely'=>idx/cnt, 'y'=>@pady,
-                    'relwidth'=>1.0, 'width'=>-2*@padx,
-                    'relheight'=>1.0/cnt, 'height'=>-2*@pady)
-  end
-  private :_place_config
-end
-Tk::RbWidget::VTBox = Tk::RbWidget::VBox
-
-class Tk::RbWidget::VBBox < Tk::RbWidget::VBox
-  def _place_config(widget, idx, cnt)
-    widget.place_in(self,
-                    'relx'=>0, 'x'=>@padx,
-                    'rely'=>(cnt - idx - 1)/cnt, 'y'=>@pady,
-                    'relwidth'=>1.0, 'width'=>-2*@padx,
-                    'relheight'=>1.0/cnt, 'height'=>-2*@pady)
-  end
-  private :_place_config
-end
-
-################################################
-# test
-################################################
-if __FILE__ == $0
-  f = Tk::RbWidget::HBox.new(:borderwidth=>3, :relief=>'ridge').pack
-  f.add(TkButton.new(f, :text=>'a'),
-        TkButton.new(f, :text=>'aa', :font=>'Helvetica 16'),
-        TkButton.new(f, :text=>'aaa'),
-        TkButton.new(f, :text=>'aaaa'))
-
-  f = Tk::RbWidget::HBox.new(:borderwidth=>3, :relief=>'ridge',
-                             :padx=>7, :pady=>3, :background=>'yellow').pack
-  f.add(TkButton.new(f, :text=>'a'),
-        TkButton.new(f, :text=>'aa', :font=>'Helvetica 16'),
-        TkButton.new(f, :text=>'aaa'),
-        TkButton.new(f, :text=>'aaaa'))
-
-  f = Tk::RbWidget::VBox.new(:borderwidth=>5,
-                             :relief=>'groove').pack(:fill=>:y, :expand=>true)
-  f.add(TkButton.new(f, :text=>'a'),
-        TkButton.new(f, :text=>'aa', :font=>'Helvetica 30'),
-        TkButton.new(f, :text=>'aaa'),
-        TkButton.new(f, :text=>'aaaa'))
-
-  f = Tk::RbWidget::HRBox.new(:borderwidth=>3,
-                              :relief=>'raised').pack(:fill=>:x)
-  f.add(TkButton.new(f, :text=>'a'),
-        TkButton.new(f, :text=>'aa'),
-        TkButton.new(f, :text=>'aaa'))
-
-  f = Tk::RbWidget::VBBox.new(:borderwidth=>3,
-                              :relief=>'ridge').pack(:fill=>:x)
-  f.propagate = false
-  f.height 100
-  f.add(TkFrame.new(f){|ff|
-          TkButton.new(ff, :text=>'a').pack(:pady=>4, :padx=>6,
-                                            :fill=>:both, :expand=>true)
-        },
-        TkFrame.new(f){|ff|
-          TkButton.new(ff, :text=>'aa').pack(:pady=>4, :padx=>6,
-                                             :fill=>:both, :expand=>true)
-        },
-        TkFrame.new(f){|ff|
-          TkButton.new(ff, :text=>'aaaa').pack(:pady=>4, :padx=>6,
-                                               :fill=>:both, :expand=>true)
-        })
-
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/tkballoonhelp.rb b/ext/tk/sample/tkballoonhelp.rb
deleted file mode 100644
index 2daa522601..0000000000
--- a/ext/tk/sample/tkballoonhelp.rb
+++ /dev/null
@@ -1,220 +0,0 @@
-#
-# tkballoonhelp.rb : simple balloon help widget
-#                       by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# Add a balloon help to a widget.
-# This widget has only poor featureas. If you need more useful features,
-# please try to use the Tix extension of Tcl/Tk under Ruby/Tk.
-#
-# The interval time to display a balloon help is defined 'interval' option
-# (default is 750ms).
-#
-require 'tk'
-
-module Tk
-  module RbWidget
-    class BalloonHelp<TkLabel
-    end
-  end
-end
-class Tk::RbWidget::BalloonHelp<TkLabel
-  DEFAULT_FOREGROUND = 'black'
-  DEFAULT_BACKGROUND = 'white'
-  DEFAULT_INTERVAL   = 750
-
-  def _balloon_binding(interval)
-    @timer = TkAfter.new(interval, 1, proc{show})
-    def @timer.interval(val)
-      @sleep_time = val
-    end
-    @bindtag = TkBindTag.new
-    @bindtag.bind('Enter',  proc{@timer.start})
-    @bindtag.bind('Motion', proc{@timer.restart; erase})
-    @bindtag.bind('Any-ButtonPress', proc{@timer.restart; erase})
-    @bindtag.bind('Leave',  proc{@timer.stop; erase})
-    tags = @parent.bindtags
-    idx = tags.index(@parent)
-    unless idx
-      ppath = TkComm.window(@parent.path)
-      idx = tags.index(ppath) || 0
-    end
-    tags[idx,0] = @bindtag
-    @parent.bindtags(tags)
-  end
-  private :_balloon_binding
-
-  def initialize(parent=nil, keys={})
-    @parent = parent || Tk.root
-
-    @frame = TkToplevel.new(@parent)
-    @frame.withdraw
-    @frame.overrideredirect(true)
-    @frame.transient(TkWinfo.toplevel(@parent))
-    @epath = @frame.path
-
-    if keys
-      keys = _symbolkey2str(keys)
-    else
-      keys = {}
-    end
-
-    @command = keys.delete('command')
-
-    @interval = keys.delete('interval'){DEFAULT_INTERVAL}
-    _balloon_binding(@interval)
-
-    # @label = TkLabel.new(@frame, 'background'=>'bisque').pack
-    @label = TkLabel.new(@frame,
-                         'foreground'=>DEFAULT_FOREGROUND,
-                         'background'=>DEFAULT_BACKGROUND).pack
-    @label.configure(_symbolkey2str(keys)) unless keys.empty?
-    @path = @label
-  end
-
-  def epath
-    @epath
-  end
-
-  def interval(val)
-    if val
-      @timer.interval(val)
-    else
-      @interval
-    end
-  end
-
-  def command(cmd = Proc.new)
-    @command = cmd
-    self
-  end
-
-  def show
-    x = TkWinfo.pointerx(@parent)
-    y = TkWinfo.pointery(@parent)
-    @frame.geometry("+#{x+1}+#{y+1}")
-
-    if @command
-      case @command.arity
-      when 0
-        @command.call
-      when 2
-        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent))
-      when 3
-        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent),
-                      self)
-      else
-        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent),
-                      self, @parent)
-      end
-    end
-
-    @frame.deiconify
-    @frame.raise
-
-    begin
-      @org_cursor = @parent.cget('cursor')
-    rescue
-      @org_cursor = @parent['cursor']
-    end
-    begin
-      @parent.configure('cursor', 'crosshair')
-    rescue
-      @parent.cursor('crosshair')
-    end
-  end
-
-  def erase
-    begin
-      @parent.configure('cursor', @org_cursor)
-    rescue
-      @parent.cursor(@org_cursor)
-    end
-    @frame.withdraw
-  end
-
-  def destroy
-    @frame.destroy
-  end
-end
-
-################################################
-# test
-################################################
-if __FILE__ == $0
-  TkButton.new('text'=>'This button has a balloon help') {|b|
-    pack('fill'=>'x')
-    Tk::RbWidget::BalloonHelp.new(b, 'text'=>' Message ')
-  }
-  TkButton.new('text'=>'This button has another balloon help') {|b|
-    pack('fill'=>'x')
-    Tk::RbWidget::BalloonHelp.new(b,
-                        'text'=>"CONFIGURED MESSAGE\nchange colors, and so on",
-                        'interval'=>200, 'font'=>'courier',
-                        'background'=>'gray', 'foreground'=>'red')
-  }
-
-  sb = TkScrollbox.new.pack(:fill=>:x)
-  sb.insert(:end, *%w(aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm))
-=begin
-  # CASE1 : command takes no arguemnt
-  bh = Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
-                           :relief=>:ridge, :background=>'white',
-                           :command=>proc{
-                             y = TkWinfo.pointery(sb) - TkWinfo.rooty(sb)
-                             bh.text "current index == #{sb.nearest(y)}"
-                           })
-=end
-=begin
-  # CASE2 : command takes 2 arguemnts
-  bh = Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
-                           :relief=>:ridge, :background=>'white',
-                           :command=>proc{|x, y|
-                             bh.text "current index == #{sb.nearest(y)}"
-                           })
-=end
-=begin
-  # CASE3 : command takes 3 arguemnts
-  Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
-                      :relief=>:ridge, :background=>'white',
-                      :command=>proc{|x, y, bhelp|
-                        bhelp.text "current index == #{sb.nearest(y)}"
-                      })
-=end
-=begin
-  # CASE4a : command is a Proc object and takes 4 arguemnts
-  cmd = proc{|x, y, bhelp, parent|
-    bhelp.text "current index == #{parent.nearest(y)}"
-  }
-
-  Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
-                      :relief=>:ridge, :background=>'white',
-                      :command=>cmd)
-
-  sb2 = TkScrollbox.new.pack(:fill=>:x)
-  sb2.insert(:end, *%w(AAA BBB CCC DDD EEE FFF GGG HHH III JJJ KKK LLL MMM))
-  Tk::RbWidget::BalloonHelp.new(sb2, :interval=>500,
-                      :padx=>5, :relief=>:raised,
-                      :background=>'gray25', :foreground=>'white',
-                      :command=>cmd)
-=end
-#=begin
-  # CASE4b : command is a Method object and takes 4 arguemnts
-  def set_msg(x, y, bhelp, parent)
-    bhelp.text "current index == #{parent.nearest(y)}"
-  end
-  cmd = self.method(:set_msg)
-
-  Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
-                                :relief=>:ridge, :background=>'white',
-                                :command=>cmd)
-
-  sb2 = TkScrollbox.new.pack(:fill=>:x)
-  sb2.insert(:end, *%w(AAA BBB CCC DDD EEE FFF GGG HHH III JJJ KKK LLL MMM))
-  Tk::RbWidget::BalloonHelp.new(sb2, :interval=>500,
-                                :padx=>5, :relief=>:raised,
-                                :background=>'gray25', :foreground=>'white',
-                                :command=>cmd)
-#=end
-
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/tkbiff.rb b/ext/tk/sample/tkbiff.rb
deleted file mode 100644
index c0953a1b1b..0000000000
--- a/ext/tk/sample/tkbiff.rb
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/usr/bin/env ruby
-
-if ARGV[0] != '-d'
-  unless $DEBUG
-    exit if fork
-  end
-else
-  ARGV.shift
-end
-
-if ARGV.length == 0
-  if ENV['MAIL']
-    $spool = ENV['MAIL']
-  else
-    $spool = '/var/spool/mail/' + ENV['USER']
-  end
-else
-  $spool = ARGV[0]